Fixed merge related compile errors

7034 files changed, 153701 insertions, 173295 deletions

diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index db0eb62bdc0..94716b20ace 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,3 +1,75 @@
+Thu Mar 30 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/NamespaceSupport.cpp:
+          Fixed value might be unitialized warnings
+
+Tue Mar 14 20:58:12 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * ACEXML/common/FileCharStream.cpp
+        * ACEXML/common/HttpCharStream.cpp
+        * ACEXML/common/Transcode.cpp
+        * ACEXML/common/XML_Macros.h
+        * ACEXML/parser/parser/Parser.cpp
+        * ACEXML/parser/parser/Parser.i
+          Updated these files to solve the warnings when setting up "VC level 4 warnings"
+          on Windows. These warnings include "unreachable code", "assignment within
+          conditional expression", "conversion from some type to another type, possible
+          loss of data", "local variable may be used without having been initialized" and
+          so on.
+          Thanks to Lukas Gruetzmacher <gruetzmacher at ais-dresden dot de> for
+          motivating the fix to these "VC level 4 warnings".
+
+Fri Feb 10 23:45:14 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * common/NamespaceSupport.cpp: Add missing template instantiations to
+          match change below.
+
+Fri Feb 10 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/NamespaceSupport.cpp:
+          Fixed compile error in unicode build
+
+Thu Feb  9 22:49:18 UTC 2006  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * common/NamespaceSupport.h:
+        * common/NamespaceSupport.cpp:  Use a normal ACE_Unbounded_Stack
+          instead of yet another custom stack.
+
+        * parser/parser/Parser.h:
+        * parser/parser/Parser.cpp:
+
+          Fixed a mismatched push/pop of the namespace context due to
+          popping namespace contexts without matching the end of the
+          element that caused a push.  This resulted in more pops that
+          push and corrupting the memory.  Also fixed an indirection into
+          a pointer that might have been corrupt when calling
+          startNamespacePrefix().
+
+Tue Jan 24 23:09:08 UTC 2006  Krishnakumar B  <kitty@nospam.invalid.domain>
+
+        * apps/svcconf/Svcconf.cpp:
+        * apps/svcconf/Svcconf.h:
+
+          Removed the overridden operator new/delete.  I don't think that
+          they serve any purpose, and end up hiding the default variations.
+
+Mon Jan 23 14:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/ZipCharStream.h:
+          Updated include of zziplib.h to zzip/zzip.h to get rid of deprecated
+          warnings
+
+Wed Jan  4 22:44:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Untabify.
+          Delete-trailing-whitespace.
+
+          Changed "add-log-time-format" to a really ugly lambda expression
+          that formats changelog timestamps in UTC and works with both GNU
+          Emacs and XEmacs.
+
 Thu May 26 07:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * common/XML_Util.h:
@@ -5,13 +77,13 @@ Thu May 26 07:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue May 24 18:39:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* common/Makefile.am:
+        * common/Makefile.am:
 
-	  Regenerate.
+          Regenerate.
 
-	* common/common.mpc:
+        * common/common.mpc:
 
-	  Added XML_Util.h to Header_Files section.
+          Added XML_Util.h to Header_Files section.
 
 Tue May 24 09:18:34 2005  Justin Michel  <michel_j@ociweb.com>
 
@@ -42,47 +114,47 @@ Mon May 23 13:02:25 2005  Justin Michel  <michel_j@ociweb.com>
 
 Fri Apr 22 21:34:19 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* parser/parser/Parser.cpp (parse_entity_decl):
+        * parser/parser/Parser.cpp (parse_entity_decl):
 
-	  Fixed "variable may be used uninitialized" warning.
+          Fixed "variable may be used uninitialized" warning.
 
 Fri Apr 22 11:09:59 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* parser/parser/Makefile.am:
-	* common/Makefile.am:
+        * parser/parser/Makefile.am:
+        * common/Makefile.am:
 
-	  Regenerated.
+          Regenerated.
 
-	* parser/parser/parser.mpc:
-	* common/common.mpc:
+        * parser/parser/parser.mpc:
+        * common/common.mpc:
 
-	  Add Pkgconfig_Files section.
+          Add Pkgconfig_Files section.
 
 Wed Apr 20 12:20:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* common/Attributes.h:
-	* common/ContentHandler.h:
-	* common/DTDHandler.h:
-	* common/EntityResolver.h:
-	* common/ErrorHandler.h:
-	* common/Locator.h:
-	* common/XMLReader.h:
+        * common/Attributes.h:
+        * common/ContentHandler.h:
+        * common/DTDHandler.h:
+        * common/EntityResolver.h:
+        * common/ErrorHandler.h:
+        * common/Locator.h:
+        * common/XMLReader.h:
 
-	  Added virtual destructors to address g++ 4.0 warnings.
+          Added virtual destructors to address g++ 4.0 warnings.
 
-	* common/Attributes.cpp:
-	* common/ContentHandler.cpp:
-	* common/DTDHandler.cpp:
-	* common/EntityResolver.cpp:
-	* common/ErrorHandler.cpp:
-	* common/Locator.cpp:
-	* common/XMLReader.cpp:
+        * common/Attributes.cpp:
+        * common/ContentHandler.cpp:
+        * common/DTDHandler.cpp:
+        * common/EntityResolver.cpp:
+        * common/ErrorHandler.cpp:
+        * common/Locator.cpp:
+        * common/XMLReader.cpp:
 
-	  New files containing destructors.
+          New files containing destructors.
 
-	* common/NamespaceSupport.cpp (getURI):
+        * common/NamespaceSupport.cpp (getURI):
 
-	  Fixed "variable may be used uninitialized" warning.
+          Fixed "variable may be used uninitialized" warning.
 
 Mon Apr 18 14:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -94,10 +166,10 @@ Mon Apr 18 14:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Feb 13 23:54:25 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	From Lothar Werzinger <lothar at xcerla dot com>
-	* apps/svcconf/Svcconf_Handler.cpp:
+        From Lothar Werzinger <lothar at xcerla dot com>
+        * apps/svcconf/Svcconf_Handler.cpp:
 
-	  Enhanced error messages.
+          Enhanced error messages.
 
 Wed Jan  5 14:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -112,12 +184,12 @@ Wed Jan  5 14:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Aug 17 19:07:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* common/NamespaceSupport.cpp:
+        * common/NamespaceSupport.cpp:
 
-	  Changed ACE_NEW_RETURN to use "NS_Node_T" instead of "struct
-	  NS_Node_T" --- the latter triggers a gcc 3.3 parser bug when
-	  used with the "new (std::nothrow)" version of ACE_NEW_RETURN.
-	  Fortunately, the "struct" is unnecessary.
+          Changed ACE_NEW_RETURN to use "NS_Node_T" instead of "struct
+          NS_Node_T" --- the latter triggers a gcc 3.3 parser bug when
+          used with the "new (std::nothrow)" version of ACE_NEW_RETURN.
+          Fortunately, the "struct" is unnecessary.
 
 Sat Feb 21 23:51:25 2004  .  <.@isis.vanderbilt.edu>
 
@@ -897,5 +969,7 @@ Wed Oct 23 17:27:14 2002  Krishnakumar B  <kitty@cs.wustl.edu>
           references().
 
 Local Variables:
-add-log-time-format: current-time-string
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
 End:
diff --git a/ACEXML/apps/svcconf/Svcconf.cpp b/ACEXML/apps/svcconf/Svcconf.cpp
index 3ceb602e788..482970b1515 100644
--- a/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACEXML/apps/svcconf/Svcconf.cpp
@@ -46,17 +46,6 @@ ACEXML_Svcconf_Parser::~ACEXML_Svcconf_Parser ()
 
 }
 
-void *
-ACEXML_Svcconf_Parser::operator new (size_t s)
-{
-  return ::new char[s];
-}
-
-void
-ACEXML_Svcconf_Parser::operator delete (void *p)
-{
-  delete[] (char*)p;
-}
 
 int
 ACEXML_Svcconf_Parser::parse_file (const ACE_TCHAR file[])
diff --git a/ACEXML/apps/svcconf/Svcconf.h b/ACEXML/apps/svcconf/Svcconf.h
index 9c9d88bde37..9879776fce5 100644
--- a/ACEXML/apps/svcconf/Svcconf.h
+++ b/ACEXML/apps/svcconf/Svcconf.h
@@ -32,10 +32,6 @@ public:
 
   virtual int parse_string (const ACE_TCHAR str[]);
 
-  void * operator new (size_t bytes);
-
-  void operator delete (void *ptr);
-
 protected:
   ACEXML_Parser parser_;
   ACEXML_Svcconf_Handler svcconf_handler_;
diff --git a/ACEXML/common/AttributesImpl.cpp b/ACEXML/common/AttributesImpl.cpp
index b0bcd32515d..a11d34c52e2 100644
--- a/ACEXML/common/AttributesImpl.cpp
+++ b/ACEXML/common/AttributesImpl.cpp
@@ -291,12 +291,3 @@ ACEXML_AttributesImpl::setValue (size_t index,
   return -1;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<ACEXML_Attribute>;
-template class ACE_Array<ACEXML_Attribute>;
-template class ACE_Array_Iterator<ACEXML_Attribute>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<ACEXML_Attribute>
-#pragma instantiate ACE_Array<ACEXML_Attribute>
-#pragma instantiate ACE_Array_Iterator<ACEXML_Attribute>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/Attributes_Def_Builder.cpp b/ACEXML/common/Attributes_Def_Builder.cpp
index b8017bc0db2..8b748dce3ce 100644
--- a/ACEXML/common/Attributes_Def_Builder.cpp
+++ b/ACEXML/common/Attributes_Def_Builder.cpp
@@ -12,22 +12,3 @@ ACEXML_Attributes_Def_Builder::~ACEXML_Attributes_Def_Builder ()
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<ACEXML_Attribute_Def_Builder>;
-template class auto_ptr<ACEXML_Attributes_Def_Builder>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACEXML_Attribute_Def_Builder>;
-template class ACE_Auto_Basic_Ptr<ACEXML_Attributes_Def_Builder>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACEXML_Attribute_Def_Builder>
-#pragma instantiate auto_ptr<ACEXML_Attributes_Def_Builder>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attribute_Def_Builder>
-#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Attributes_Def_Builder>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/Element_Def_Builder.cpp b/ACEXML/common/Element_Def_Builder.cpp
index 77a593c110d..2bcef84f16d 100644
--- a/ACEXML/common/Element_Def_Builder.cpp
+++ b/ACEXML/common/Element_Def_Builder.cpp
@@ -7,19 +7,3 @@ ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder ()
 
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<ACEXML_Element_Def_Builder>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACEXML_Element_Def_Builder>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACEXML_Element_Def_Builder>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_Element_Def_Builder>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index 2e3fc8abc5c..cafc0696b5c 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -130,7 +130,7 @@ ACEXML_FileCharStream::close (void)
 int
 ACEXML_FileCharStream::getchar_i (char& ch)
 {
-  ch = ACE_OS::fgetc (this->infile_);
+  ch = static_cast<char> (ACE_OS::fgetc (this->infile_));
   return (feof(this->infile_) ? -1 : 0);
 }
 
@@ -166,7 +166,7 @@ ACEXML_FileCharStream::peek (void)
   return this->peek_i();
 #else
 
-  ACEXML_Char ch = ACE_OS::fgetc (this->infile_);
+  ACEXML_Char ch = static_cast<ACEXML_Char> (ACE_OS::fgetc (this->infile_));
   ::ungetc (ch, this->infile_);
   return ch;
 #endif /* ACE_USES_WCHAR */
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index cc94764c191..731676d7f94 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -321,7 +321,7 @@ ACEXML_HttpCharStream::determine_encoding (void)
   char input[4] = {0, 0, 0, 0};
   int i = 0;
   for (; i < 4 && input[i] != (char)-1; ++i)
-    input[i] = this->stream_->peek_char(i);
+    input[i] = static_cast<char> (this->stream_->peek_char(i));
   if (i < 4)
     return -1;
   const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input);
diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index c66d01f563d..306641cb177 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -262,14 +262,3 @@ ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void)
   delete this->svc_handler_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Connector_Base <Svc_Handler>;
-template class ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<Svc_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Connector_Base <Svc_Handler>
-#pragma instantiate ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Svc_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index 2f99ba13495..5f337eca2ba 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -15,7 +15,6 @@ static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name;
 
 ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void)
-  : head_ (0)
 {
 }
 
@@ -27,31 +26,54 @@ ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack (void)
 int
 ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc)
 {
-  struct NS_Node_T *temp = 0;
-  ACE_NEW_RETURN (temp, NS_Node_T, -1);
-
-  temp->item_ = nsc;
-  temp->next_ = this->head_;
-
-  this->head_ = temp;
-  return 0;
+  return (this->stack_.push (nsc) < 0);
 }
 
 ACEXML_NS_CONTEXT *
 ACEXML_Namespace_Context_Stack::pop (void)
 {
-  if (this->head_ != 0)
-    {
-      struct NS_Node_T *temp = this->head_;
-      this->head_ = temp->next_;
+  if (this->stack_.size() <= 0)
+    return 0;
 
-      ACEXML_NS_CONTEXT* retv = temp->item_;
-      delete temp;
-      return retv;
+  ACEXML_NS_CONTEXT* temp = 0;
+  int retval = this->stack_.pop (temp);
+  if (retval != 0)
+    {
+      ACE_ERROR ((LM_ERROR, "Unable to pop Namespace context from stack\n"));
+      return 0;
     }
+  return temp;
+}
+
+int
+ACEXML_NamespaceSupport::popContext (void)
+{
+  delete this->effective_context_;
+
+  if ((this->effective_context_ = this->ns_stack_.pop ()) == 0)
+    return -1;
   return 0;
 }
 
+int
+ACEXML_NamespaceSupport::pushContext (void)
+{
+  ACEXML_NS_CONTEXT *temp = this->effective_context_;
+  ACE_NEW_RETURN (this->effective_context_,
+                  ACEXML_NS_CONTEXT (),
+                  -1);
+
+  // @@ Copy everything from the old context to the new one.
+  ACEXML_NS_CONTEXT_ENTRY *entry = 0;
+
+  for (ACEXML_NS_CONTEXT_ITER iter (*temp);
+       iter.next (entry) != 0;
+       iter.advance ())
+    this->effective_context_->bind (entry->ext_id_,
+                                    entry->int_id_);
+  this->ns_stack_.push (temp);
+  return 0;
+}
 
 ACEXML_NamespaceSupport::ACEXML_NamespaceSupport (void)
   : ns_stack_ (),
@@ -96,7 +118,7 @@ ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix,
 int
 ACEXML_NamespaceSupport::getDeclaredPrefixes (ACEXML_STR_LIST &prefixes) const
 {
-  ACEXML_NS_CONTEXT_ENTRY *entry;
+  ACEXML_NS_CONTEXT_ENTRY *entry = 0;
 
   // The prefix for default namespace (empty string) is included in
   // the return list.
@@ -114,7 +136,7 @@ ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const
   if (!uri || *uri == 0)
     return 0;
 
-  ACEXML_NS_CONTEXT_ENTRY *entry;
+  ACEXML_NS_CONTEXT_ENTRY *entry = 0;
 
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
@@ -128,7 +150,7 @@ ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const
 int
 ACEXML_NamespaceSupport::getPrefixes (ACEXML_STR_LIST &prefixes) const
 {
-  ACEXML_NS_CONTEXT_ENTRY *entry;
+  ACEXML_NS_CONTEXT_ENTRY *entry = 0;
 
   // The prefix for default namespace (empty string) is not included
   // in the return list.
@@ -146,7 +168,7 @@ ACEXML_NamespaceSupport::getPrefixes (const ACEXML_Char *uri,
   if (!uri)
     return -1;
 
-  ACEXML_NS_CONTEXT_ENTRY *entry;
+  ACEXML_NS_CONTEXT_ENTRY *entry = 0;
 
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
@@ -175,37 +197,6 @@ ACEXML_NamespaceSupport::getURI (const ACEXML_Char *prefix) const
 }
 
 int
-ACEXML_NamespaceSupport::popContext (void)
-{
-  delete this->effective_context_;
-
-  if ((this->effective_context_ = this->ns_stack_.pop ()) == 0)
-    return -1;
-  return 0;
-}
-
-int
-ACEXML_NamespaceSupport::pushContext (void)
-{
-  ACEXML_NS_CONTEXT *temp = this->effective_context_;
-  ACE_NEW_RETURN (this->effective_context_,
-                  ACEXML_NS_CONTEXT (),
-                  -1);
-
-  // @@ Copy everything from the old context to the new one.
-  ACEXML_NS_CONTEXT_ENTRY *entry;
-
-  for (ACEXML_NS_CONTEXT_ITER iter (*temp);
-       iter.next (entry) != 0;
-       iter.advance ())
-    this->effective_context_->bind (entry->ext_id_,
-                                    entry->int_id_);
-  this->ns_stack_.push (temp);
-  return 0;
-}
-
-
-int
 ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
                                       const ACEXML_Char *&uri,
                                       const ACEXML_Char *&name,
@@ -220,7 +211,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
         break;
       }
 
-  ACEXML_String prefix;
+  ACEXML_String prefix (ACE_TEXT(""),0,0);
   if (len == -1)
       name = qName;
   else
@@ -254,22 +245,3 @@ ACEXML_NamespaceSupport::reset (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String>;
-template class ACE_Hash_Map_Manager_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Unbounded_Queue<const ACEXML_Char *>;
-template class ACE_Unbounded_Queue_Iterator<const ACEXML_Char *>;
-template class ACE_Node<const ACEXML_Char *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Unbounded_Queue<const ACEXML_Char *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<const ACEXML_Char *>
-#pragma instantiate ACE_Node<const ACEXML_Char *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h
index 4299b57ddcf..d81f9303d70 100644
--- a/ACEXML/common/NamespaceSupport.h
+++ b/ACEXML/common/NamespaceSupport.h
@@ -76,13 +76,7 @@ public:
 
 private:
   /// Internal stack structure to hold namespace context.
-  struct NS_Node_T {
-    ACEXML_NS_CONTEXT *item_;
-    struct NS_Node_T *next_;
-  };
-
-  /// Anchor point for head of stack.
-  NS_Node_T *head_;
+  ACE_Unbounded_Stack<ACEXML_NS_CONTEXT*> stack_;
 };
 
 /**
diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp
index e43a407d2e3..f94d93bba32 100644
--- a/ACEXML/common/Transcode.cpp
+++ b/ACEXML/common/Transcode.cpp
@@ -26,8 +26,8 @@ ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src,
       if (len < 2)
         return ACEXML_DESTINATION_TOO_SHORT;
 
-      *dst = 0xc0 | (src / 0x40);
-      *(dst+1) = 0x80 | (src % 0x40);
+      *dst = 0xc0 | (static_cast<ACEXML_UTF8> (src) / 0x40);
+      *(dst+1) = 0x80 | (static_cast<ACEXML_UTF8> (src) % 0x40);
       return 2;
     }
   else
@@ -39,13 +39,12 @@ ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src,
       if (src >= 0xD800 && src < 0xE000)
         return ACEXML_IS_SURROGATE;
 
-      *dst = 0xe0 | (src / 0x1000);
-      *(dst+1) = 0x80 | ((src % 0x1000) / 0x40);
-      *(dst+2) = 0x80 | (src % 0x40);
+      *dst = 0xe0 | (static_cast<ACEXML_UTF8> (src) / 0x1000);
+      *(dst+1) = 0x80 | ((static_cast<ACEXML_UTF8> (src) % 0x1000) / 0x40);
+      *(dst+2) = 0x80 | (static_cast<ACEXML_UTF8> (src) % 0x40);
       return 3;
     }
-  ACE_NOTREACHED (return ACEXML_NON_UNICODE;)
-    }
+}
 
 int
 ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src,
@@ -67,10 +66,10 @@ ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src,
       if (dst == 0)
         return ACEXML_INVALID_ARGS;
 
-      *dst = 0xf0 | (src / 0x40000);
-      *(dst+1) = 0x80 | ((src % 0x40000) / 0x1000);
-      *(dst+2) = 0x80 | ((src % 0x1000) / 0x40);
-      *(dst+3) = 0x80 | (src % 0x40);
+      *dst = 0xf0 | (static_cast<ACEXML_UTF8> (src / 0x40000));
+      *(dst+1) = 0x80 | ((static_cast<ACEXML_UTF8> (src % 0x40000)) / 0x1000);
+      *(dst+2) = 0x80 | ((static_cast<ACEXML_UTF8> (src % 0x1000)) / 0x40);
+      *(dst+3) = 0x80 | (static_cast<ACEXML_UTF8> (src % 0x40));
       return 4;
     }
   return ACEXML_NON_UNICODE;
@@ -102,8 +101,8 @@ ACEXML_Transcoder::ucs42utf16 (ACEXML_UCS4 src,
       if (len < 2)
         return ACEXML_DESTINATION_TOO_SHORT;
 
-      *dst = 0xD800 | (src / 0x400);
-      *(dst+1) = 0xDC00 | (src % 0x400);
+      *dst = 0xD800 | (static_cast<ACEXML_UTF16> (src) / 0x400);
+      *(dst+1) = 0xDC00 | (static_cast<ACEXML_UTF16> (src) % 0x400);
       return 2;
     }
 
@@ -125,8 +124,8 @@ ACEXML_Transcoder::surrogate2utf8 (ACEXML_UTF16 high,
     return ACEXML_INVALID_ARGS;
 
   ACEXML_UCS4 src = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000;
-  *dst = 0xD800 | (src / 0x400);
-  *(dst+1) = 0xDC00 | (src % 0x400);
+  *dst = static_cast<ACEXML_UTF8> (0xD800 | (src / 0x400));
+  *(dst+1) = static_cast<ACEXML_UTF8> (0xDC00 | (src % 0x400));
   return 2;
 }
 
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index b157424d077..3bec4ae6ec4 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -175,8 +175,3 @@ ACEXML_URL_Addr::~ACEXML_URL_Addr (void)
   this->path_name_ = 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<ACEXML_Char>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACEXML_Char>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/XML_Codecs.cpp b/ACEXML/common/XML_Codecs.cpp
index 737e23e6bc8..9566158ddfd 100644
--- a/ACEXML/common/XML_Codecs.cpp
+++ b/ACEXML/common/XML_Codecs.cpp
@@ -92,8 +92,3 @@ ACEXML_Base64::decode (const ACEXML_Char* input,
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<ACE_Byte>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_Byte>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/ZipCharStream.h b/ACEXML/common/ZipCharStream.h
index e65d7f640b6..2c3ee5fb775 100644
--- a/ACEXML/common/ZipCharStream.h
+++ b/ACEXML/common/ZipCharStream.h
@@ -24,15 +24,15 @@
 
 #include "ACEXML/common/CharStream.h"
 #include "ACEXML/common/Encoding.h"
-#include "zziplib.h"
+#include "zzip/zzip.h"
 
-// Ugly wart to get aroung a macro version of read defined in zziplib.h. Evil...
+// Ugly wart to get aroung a macro version of read defined in zzip.h. Evil...
 #ifdef read
 #undef read
 #endif
 
 /**
- * @class ACEXML_ZipCharStream ZipCharStream.h "ACEXML/common/ZipCharStream.h"
+ * @class ACEXML_ZipCharStream
  *
  * An implementation of ACEXML_CharStream for reading input from a ZIP archive.
  */
diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc
index 9702a48220a..bd496a82123 100644
--- a/ACEXML/common/common.mpc
+++ b/ACEXML/common/common.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(ACEXML): acelib, codecs, core {
+  avoids       += ace_for_tao
   sharedname    = ACEXML
   dynamicflags += ACEXML_BUILD_DLL
 
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp
index effe044e5a9..f5eb2625125 100644
--- a/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACEXML/examples/SAXPrint/main.cpp
@@ -204,8 +204,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<ACEXML_DefaultHandler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_DefaultHandler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/parser/parser/Entity_Manager.cpp b/ACEXML/parser/parser/Entity_Manager.cpp
index 1a5780a75f8..cbc20c00fec 100644
--- a/ACEXML/parser/parser/Entity_Manager.cpp
+++ b/ACEXML/parser/parser/Entity_Manager.cpp
@@ -18,27 +18,3 @@ ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void)
   this->reset();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  // Instantiations for the Hash Map
-template class ACE_Equal_To<ACEXML_String>;
-template class ACE_Hash<ACEXML_String>;
-template class ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String>;
-template class ACE_Hash_Map_Manager_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Equal_To<ACEXML_String>
-#pragma instantiate ACE_Hash<ACEXML_String>
-#pragma instantiate ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACEXML_String, ACEXML_String, ACE_Hash<ACEXML_String>, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index 5989bd14de9..a65937acba7 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -868,7 +868,7 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
             this->xml_namespace_.processName(startname, ns_uri,
                                              ns_lname, 0);
             this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri),
-                                  ns_uri, ns_lname, 1
+                                  ns_uri, 1
                                   ACEXML_ENV_ARG_PARAMETER);
             ACEXML_CHECK;
             this->content_handler_->startElement(ns_uri, ns_lname,
@@ -879,7 +879,7 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
                                                 ACEXML_ENV_ARG_PARAMETER);
             ACEXML_CHECK;
             this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri),
-                                  ns_uri, ns_lname, 0
+                                  ns_uri, 0
                                   ACEXML_ENV_ARG_PARAMETER);
             ACEXML_CHECK;
             if (ns_flag)
@@ -892,7 +892,7 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
             this->xml_namespace_.processName (startname, ns_uri,
                                               ns_lname, 0);
             this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri),
-                                  ns_uri, ns_lname, 1
+                                  ns_uri, 1
                                   ACEXML_ENV_ARG_PARAMETER);
             ACEXML_CHECK;
             this->content_handler_->startElement(ns_uri, ns_lname, startname,
@@ -982,15 +982,15 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
             break;
         }
     }
-  if (this->parse_content (startname, ns_uri, ns_lname
+  if (this->parse_content (startname, ns_uri, ns_lname, ns_flag
                            ACEXML_ENV_ARG_PARAMETER) != 0)
     return;
 }
 
 int
 ACEXML_Parser::parse_content (const ACEXML_Char* startname,
-                              const ACEXML_Char* ns_uri,
-                              const ACEXML_Char* ns_lname ACEXML_ENV_ARG_DECL)
+                              const ACEXML_Char*& ns_uri,
+                              const ACEXML_Char*& ns_lname, int ns_flag ACEXML_ENV_ARG_DECL)
   ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   ACEXML_Char *cdata;
@@ -1076,14 +1076,17 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname,
                                                         ACEXML_ENV_ARG_PARAMETER);
                     ACEXML_CHECK_RETURN (-1);
                     this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri),
-                                          ns_uri, ns_lname, 0
+                                          ns_uri, 0
                                           ACEXML_ENV_ARG_PARAMETER);
                     ACEXML_CHECK_RETURN (-1);
+                    if (this->namespaces_ && ns_flag)
+                      {
                     if (this->nested_namespace_ >= 1)
                       {
                         this->xml_namespace_.popContext ();
                         this->nested_namespace_--;
                       }
+                      }
                     return 0;
                   }
                 default:              // a new nested element?
@@ -2900,13 +2903,12 @@ ACEXML_Parser::parse_sddecl (ACEXML_Char*& str)
 void
 ACEXML_Parser::prefix_mapping (const ACEXML_Char* prefix,
                                const ACEXML_Char* uri,
-                               const ACEXML_Char* name,
                                int start ACEXML_ENV_ARG_DECL)
   ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   if (this->namespaces_)
     {
-      const ACEXML_Char* temp = (name == 0) ? empty_string : prefix;
+      const ACEXML_Char* temp = (prefix == 0) ? empty_string : prefix;
       if (start) {
         this->content_handler_->startPrefixMapping (temp, uri
                                                     ACEXML_ENV_ARG_PARAMETER);
@@ -3159,7 +3161,7 @@ void
 ACEXML_Parser::parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((ACEXML_SAXException))
 {
-  ACEXML_Char* astring;
+  ACEXML_Char* astring = 0;
   if ((this->parse_token (ACE_TEXT("ncoding")) < 0)
       || this->skip_equal () != 0
       || this->parse_encname (astring) != 0)
@@ -3393,22 +3395,3 @@ ACEXML_Parser::reset (void)
   this->internal_dtd_ = 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Unbounded_Stack<ACEXML_Parser_Context*>;
-template class ACE_Unbounded_Set_Iterator<ACEXML_Parser_Context*>;
-template class ACE_Node<ACEXML_Parser_Context*>;
-template class ACE_Unbounded_Stack<ACEXML_Char *>;
-template class ACE_Node<ACEXML_Char *>;
-template class ACE_Unbounded_Set_Iterator<ACEXML_Char*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Unbounded_Stack<ACEXML_Parser_Context*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACEXML_Parser_Context*>;
-#pragma instantiate ACE_Node<ACEXML_Parser_Context*>
-#pragma instantiate ACE_Unbounded_Stack<ACEXML_Char*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACEXML_Char*>;
-#pragma instantiate ACE_Node<ACEXML_Char *>
-
-#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/ACEXML/parser/parser/Parser.h b/ACEXML/parser/parser/Parser.h
index 69fc7ec21a9..0fbbcb31fc6 100644
--- a/ACEXML/parser/parser/Parser.h
+++ b/ACEXML/parser/parser/Parser.h
@@ -215,8 +215,8 @@ protected:
    *  Parse a content declaration.
    *
    */
-  int parse_content (const ACEXML_Char* startname, const ACEXML_Char* ns_uri,
-                     const ACEXML_Char* ns_lname
+  int parse_content (const ACEXML_Char* startname, const ACEXML_Char*& ns_uri,
+                     const ACEXML_Char*& ns_lname, int ns_flag
                      ACEXML_ENV_ARG_DECL)
     ACE_THROW_SPEC ((ACEXML_SAXException));
 
@@ -692,9 +692,8 @@ private:
    * @param start 1 => startPrefixMapping 0 => endPrefixMapping
    */
   void prefix_mapping (const ACEXML_Char* prefix,
-                              const ACEXML_Char* uri,
-                              const ACEXML_Char* name,
-                              int start ACEXML_ENV_ARG_DECL)
+                       const ACEXML_Char* uri,
+                       int start ACEXML_ENV_ARG_DECL)
     ACE_THROW_SPEC ((ACEXML_SAXException));
   /**
    *  Parse a keyword.
diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i
index 0857aa37835..97896a68388 100644
--- a/ACEXML/parser/parser/Parser.i
+++ b/ACEXML/parser/parser/Parser.i
@@ -238,7 +238,7 @@ ACEXML_Parser::peek (void)
   ACEXML_Char ch = 0;
   const ACEXML_InputSource* ip = this->current_->getInputSource();
   ACEXML_CharStream* instream = ip->getCharStream();
-  ch = instream->peek ();
+  ch = static_cast<ACEXML_Char> (instream->peek ());
   return (ch > 0 ? ch : 0);
 }
 
diff --git a/ACEXML/parser/parser/ParserContext.cpp b/ACEXML/parser/parser/ParserContext.cpp
index 77592dc13cb..663ae1ef1ac 100644
--- a/ACEXML/parser/parser/ParserContext.cpp
+++ b/ACEXML/parser/parser/ParserContext.cpp
@@ -14,11 +14,3 @@ ACEXML_Parser_Context::~ACEXML_Parser_Context()
   this->locator_ = 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Swap <ACEXML_InputSource*>; 
-template class ACE_Swap <ACEXML_LocatorImpl*>; 
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate ACE_Swap <ACEXML_InputSource*>
-#  pragma instantiate ACE_Swap <ACEXML_LocatorImpl*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc
index 859882e838d..9732f03fe76 100644
--- a/ACEXML/parser/parser/parser.mpc
+++ b/ACEXML/parser/parser/parser.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(ACEXML_Parser): acelib, core {
+  avoids       += ace_for_tao
   sharedname    = ACEXML_Parser
   after        += ACEXML
   libs         += ACEXML
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 5d6e2c4cff4..a2fc9832377 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,3 +1,30 @@
+Wed Mar  8 10:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * asnmp/*.h:
+          Converted to doxygen style of documentation
+
+Wed Jan  4 22:47:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Untabify.
+          Delete-trailing-whitespace.
+
+          Added "Local Variables" section defining "add-log-time-format"
+          to a really ugly lambda expression that formats changelog
+          timestamps in UTC and works with both GNU Emacs and XEmacs.
+
+Fri Dec 30 11:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * asnmp/transaction.cpp:
+          Updated because the ACE_Time_Value constructors are now explicit
+
+Fri Dec 23 09:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * asnmp/address.{h,cpp}:
+          Added LEN as postfix for HASH0, HASH1 and HASH2. VxWorks 6.1 PPC
+          defines HASH1 and HASH2
+
 Wed Oct  5 10:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * asnmp/asn1.cpp:
@@ -6,70 +33,70 @@ Wed Oct  5 10:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Jul 15 10:12:19 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* Removed the asnmp.mwc file so that it can be regenerated by MPC
- 	  automatically.  Thanks to Sam Mesh <sam.mesh@gmail.com> for
- 	  reporting this.  This fixes bugid 2190.
+        * Removed the asnmp.mwc file so that it can be regenerated by MPC
+          automatically.  Thanks to Sam Mesh <sam.mesh@gmail.com> for
+          reporting this.  This fixes bugid 2190.
 
 Sun Oct  3 20:12:43 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* asnmp/oid.cpp:
+        * asnmp/oid.cpp:
 
-	  Fixed a double deletion problem reported by  Shlomi Yaakobovich.
+          Fixed a double deletion problem reported by  Shlomi Yaakobovich.
 
 Thu Sep 30 10:54:39 2004  Steve Huston  <shuston@riverace.com>
 
-	* examples/get/get.cpp:
-	* examples/get/get_async.cpp:
-	* examples/next/next.cpp:
-	* examples/set/set.cpp:
-	* examples/trap/trap.cpp:
-	* examples/walk/walk.cpp: Added #include "ace/Argv_Type_Converter.h".
+        * examples/get/get.cpp:
+        * examples/get/get_async.cpp:
+        * examples/next/next.cpp:
+        * examples/set/set.cpp:
+        * examples/trap/trap.cpp:
+        * examples/walk/walk.cpp: Added #include "ace/Argv_Type_Converter.h".
 
 Wed Sep 29 15:33:29 2004  Steve Huston  <shuston@riverace.com>
 
-	* asnmp/sagent.cpp:
-	* agent/snmp_agent.cpp:
-	* examples/get/get.cpp:
-	* examples/get/get_async.cpp:
-	* examples/next/next.cpp:
-	* examples/set/set.cpp:
-	* examples/trap/trap.cpp:
-	* examples/walk/walk.cpp:
-	* tests/test_config.h:
-	* tests/Address_Test.cpp:
-	* tests/Counter64_Test.cpp:
-	* tests/Counter_Test.cpp:
-	* tests/Gauge_Test.cpp:
-	* tests/Integer_Test.cpp:
-	* tests/Octet_Test.cpp:
-	* tests/Oid_Test.cpp:
-	* tests/Target_Test.cpp:
-	* tests/Varbind_Test.cpp: Adjustments to build with wide-char.
+        * asnmp/sagent.cpp:
+        * agent/snmp_agent.cpp:
+        * examples/get/get.cpp:
+        * examples/get/get_async.cpp:
+        * examples/next/next.cpp:
+        * examples/set/set.cpp:
+        * examples/trap/trap.cpp:
+        * examples/walk/walk.cpp:
+        * tests/test_config.h:
+        * tests/Address_Test.cpp:
+        * tests/Counter64_Test.cpp:
+        * tests/Counter_Test.cpp:
+        * tests/Gauge_Test.cpp:
+        * tests/Integer_Test.cpp:
+        * tests/Octet_Test.cpp:
+        * tests/Oid_Test.cpp:
+        * tests/Target_Test.cpp:
+        * tests/Varbind_Test.cpp: Adjustments to build with wide-char.
 
 Fri Aug  6 08:14:12 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* asnmp/transaction.{h,cpp}: Added a get_handle() call to
-	  session.  Thanks to Geo Sebastian <geosebastian@onmobile.com>
- 	  for this fix.
+        * asnmp/transaction.{h,cpp}: Added a get_handle() call to
+          session.  Thanks to Geo Sebastian <geosebastian@onmobile.com>
+          for this fix.
 
 Fri May  7 14:42:22 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tests/Counter_Test.cpp (TestCounter):
-	* tests/Gauge_Test.cpp (TestGuage):
-	* tests/Integer_Test.cpp (TestUnsignedInteger32):
+        * tests/Counter_Test.cpp (TestCounter):
+        * tests/Gauge_Test.cpp (TestGuage):
+        * tests/Integer_Test.cpp (TestUnsignedInteger32):
 
-	  More "comparison between signed and unsigned integer"
-	  warning fixes.
+          More "comparison between signed and unsigned integer"
+          warning fixes.
 
 Thu May  6 11:03:26 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tests/Counter_Test.cpp (TestCounter):
-	* tests/Counter64_Test.cpp (TestCounter64):
-	* tests/Gauge_Test.cpp (TestGuage):
-	* tests/Integer_Test.cpp (TestUnsignedInteger32):
+        * tests/Counter_Test.cpp (TestCounter):
+        * tests/Counter64_Test.cpp (TestCounter64):
+        * tests/Gauge_Test.cpp (TestGuage):
+        * tests/Integer_Test.cpp (TestUnsignedInteger32):
 
-	  Fixed "comparison between signed and unsigned integer"
-	  warnings.
+          Fixed "comparison between signed and unsigned integer"
+          warnings.
 
 Mon Apr 26 18:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -92,60 +119,60 @@ Thu Apr 22 20:45:27 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
         * tests/Octet_Test.cpp:
         * tests/Oid_Test.cpp:
 
-	  Changed all return types for equality, relational and logical
-	  operators to "bool", as is the norm for modern C++.
+          Changed all return types for equality, relational and logical
+          operators to "bool", as is the norm for modern C++.
 
 Fri Apr 16 16:53:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tests/Gauge_Test.cpp (TestGuage):
-	* tests/Integer_Test.cpp (TestInteger32, TestUnsignedInteger32):
+        * tests/Gauge_Test.cpp (TestGuage):
+        * tests/Integer_Test.cpp (TestInteger32, TestUnsignedInteger32):
 
-	  Fixed some "comparison between signed and unsigned integer"
-	  warnings.
+          Fixed some "comparison between signed and unsigned integer"
+          warnings.
 
 Mon Mar 29 06:56:11 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* tests/Integer_Test.cpp:
-	  Fixed a warning in Win32 builds.
+        * tests/Integer_Test.cpp:
+          Fixed a warning in Win32 builds.
 
 Fri Mar 26 09:49:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* tests/Integer_Test.cpp:
+        * tests/Integer_Test.cpp:
 
-	  Fixed a warning in Win32 builds.
+          Fixed a warning in Win32 builds.
 
 Fri Aug 29 07:56:19 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* tests/Octet_Test.cpp (TestOctet):
+        * tests/Octet_Test.cpp (TestOctet):
 
-	  Fixed "string literal converted to char *" warning.  String
-	  literals are now considered "const" by standard C++.
+          Fixed "string literal converted to char *" warning.  String
+          literals are now considered "const" by standard C++.
 
 Sun Nov 24 17:04:33 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* agent/main.cpp (main): Added ACE::init() to the beginning of
-	  main() to prevent crashes on Windows.  Thanks to Huseyin Calgin
- 	  <calgin@yahoo.com> for reporting this.
+        * agent/main.cpp (main): Added ACE::init() to the beginning of
+          main() to prevent crashes on Windows.  Thanks to Huseyin Calgin
+          <calgin@yahoo.com> for reporting this.
 
 Fri Feb  8 04:42:21 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* asnmp/transaction.cpp (run): Changed the code to use ACE_Reactor::instance ()
-	  rather than a local ACE_Reactor on the stack.  Thanks to Paresh
- 	  Raote <p_raote@yahoo.com> for reporting this.
+        * asnmp/transaction.cpp (run): Changed the code to use ACE_Reactor::instance ()
+          rather than a local ACE_Reactor on the stack.  Thanks to Paresh
+          Raote <p_raote@yahoo.com> for reporting this.
 
 Thu Jan 25 12:48:33 2001  Craig Rodrigues <crodrigu@bbn.com>
 
-	* agent/Makefile.orig
-	  asnmp/address.h.orig
-	  examples/next/next.cpp
-	  examples/trap/trap.cpp
-	  examples/walk/walk.cpp
-	  tests/test_config.h
-	  tests/Varbind_Test.cpp
-	  tests/Counter64_Test.cpp
-	  tests/run_tests.sh
+        * agent/Makefile.orig
+          asnmp/address.h.orig
+          examples/next/next.cpp
+          examples/trap/trap.cpp
+          examples/walk/walk.cpp
+          tests/test_config.h
+          tests/Varbind_Test.cpp
+          tests/Counter64_Test.cpp
+          tests/run_tests.sh
 
-	  New agent Makefile, and compilation fixes.
+          New agent Makefile, and compilation fixes.
 
 Sun Jun  4 14:51:33 2000  Darrell Brunsch <brunsch@uci.edu>
 
@@ -503,3 +530,9 @@ Sat Jul  5 19:13:30 1997  Mike MacFaden  (mrm@mrm-ss20)
 
         * convert cmu code to use C++ new/delete from malloc/free so
           entire library uses C++ new constructor
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/ASNMP/asnmp/ChangeLog b/ASNMP/asnmp/ChangeLog
index d517b1480bf..8d82c1aa36c 100644
--- a/ASNMP/asnmp/ChangeLog
+++ b/ASNMP/asnmp/ChangeLog
@@ -1,52 +1,63 @@
+Wed Jan  4 22:50:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Untabify.
+          Delete-trailing-whitespace.
+
+          Added "Local Variables" section defining "add-log-time-format"
+          to a really ugly lambda expression that formats changelog
+          timestamps in UTC and works with both GNU Emacs and XEmacs.
+
 Fri May  7 11:40:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* pdu.cpp (agent_error_reason):
+        * pdu.cpp (agent_error_reason):
 
-	  Really fixed mismatched sprintf() format specifiers this time
-	  around.
+          Really fixed mismatched sprintf() format specifiers this time
+          around.
 
 Thu May  6 11:13:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* oid.cpp (operator+=, OidToStr):
-	* pdu.cpp (agent_error_reason):
+        * oid.cpp (operator+=, OidToStr):
+        * pdu.cpp (agent_error_reason):
 
-	  Fixed warnings regarding mismatch format specifiers and
-	  arguments to sprintf().
+          Fixed warnings regarding mismatch format specifiers and
+          arguments to sprintf().
 
 Thu May  6 11:05:01 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* gauge.h:
+        * gauge.h:
 
-	  Nuked trailing white space.
+          Nuked trailing white space.
 
 Fri Apr 23 11:23:21 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* oid.cpp:
+        * oid.cpp:
 
-	  Missed some bool return types for equality operators.
+          Missed some bool return types for equality operators.
 
 Thu Apr 22 23:03:48 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* address.cpp:
-	* address.h:
-	* octet.cpp:
-	* octet.h:
-	* oid.cpp:
-	* oid.h:
-	* target.cpp:
-	* target.h:
-	* vb.cpp:
-	* vb.h:
+        * address.cpp:
+        * address.h:
+        * octet.cpp:
+        * octet.h:
+        * oid.cpp:
+        * oid.h:
+        * target.cpp:
+        * target.h:
+        * vb.cpp:
+        * vb.h:
 
-	  Changed all return types for equality, relational and logical
-	  operators to "bool", as is the norm for modern C++.
+          Changed all return types for equality, relational and logical
+          operators to "bool", as is the norm for modern C++.
 
 Fri Aug 29 07:57:05 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* octet.cpp (to_string_hex):
+        * octet.cpp (to_string_hex):
 
-	  Fixed "string literal converted to char *" warning.  String
-	  literals are now considered "const" by standard C++.
+          Fixed "string literal converted to char *" warning.  String
+          literals are now considered "const" by standard C++.
 
 Tue Mar 16 16:28:14 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -208,3 +219,9 @@ Fri Aug  1 19:23:52 1997  Mike MacFaden  (mrm@mrm-ss20)
         * transaction class:
           - implement get/getnext timeout and retry logic using ACE
           Reactor class, ACE_Time_Value
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp
index 2442ea50550..8231868bd89 100644
--- a/ASNMP/asnmp/address.cpp
+++ b/ASNMP/asnmp/address.cpp
@@ -1975,9 +1975,9 @@ addr_type MacAddress::get_type() const
 
 unsigned int MacAddress::hashFunction() const
 {
-        return ((((address_buffer[0] << 8) + address_buffer[1]) * HASH0)
-                + (((address_buffer[2] << 8) + address_buffer[3]) * HASH1)
-                + (((address_buffer[4] << 8) + address_buffer[5]) * HASH2));
+        return ((((address_buffer[0] << 8) + address_buffer[1]) * HASH0LEN)
+                + (((address_buffer[2] << 8) + address_buffer[3]) * HASH1LEN)
+                + (((address_buffer[4] << 8) + address_buffer[5]) * HASH2LEN));
 }
 
 void MacAddress::to_octet(OctetStr& octet) const
diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h
index 1db8adbbd6e..f8131c19485 100644
--- a/ASNMP/asnmp/address.h
+++ b/ASNMP/asnmp/address.h
@@ -1,25 +1,21 @@
-// -*-C++-*-
 
-// $Id$
 
 #ifndef ADDRESS_
 #define ADDRESS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    address.h
-//
-// = DESCRIPTION
-//  Address class definition. Encapsulates various network
-//  addresses into easy to use, safe and portable classes.
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    address.h
+ *
+ *  $Id$
+ *
+ *  Address class definition. Encapsulates various network
+ *  addresses into easy to use, safe and portable classes.
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 
 /*===================================================================
   Copyright (c) 1996
@@ -62,9 +58,9 @@ enum address_lengths {
    APPLETKLEN=3,
    DECNETLEN=2,
    MACLEN=6,
-   HASH0=19,
-   HASH1=13,
-   HASH2=7,
+   HASH0LEN=19,
+   HASH1LEN=13,
+   HASH2LEN=7,
    MAX_ADDR_SZ=20,
    MAX_DISPLAY_SZ=MAXHOSTNAMELEN+1
 };
@@ -102,201 +98,207 @@ class SIPAddress; // aka ipv6
 //--------------------------------------------------------------------
 //----[ Address class ]-----------------------------------------------
 //--------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the abstract base class
+ * Address. An Address is a unique network endpoint.
+ */
 class  ASNMP_Export Address: public  SnmpSyntax
-  // = TITLE
-  //     Defines the member functions for the abstract base class
-  //     Address. An Address is a unique network endpoint.
 {
 
 public:
+   /// allow destruction of derived classes
    virtual ~Address();
-   // allow destruction of derived classes
 
+   /// overloaded equivlence operator, are two addresses equal?
    friend ASNMP_Export bool operator==( const Address &lhs,const Address &rhs);
-   // overloaded equivlence operator, are two addresses equal?
 
+   /// overloaded not equivlence operator, are two addresses not equal?
    friend ASNMP_Export bool operator!=( const Address &lhs,const Address &rhs);
-   // overloaded not equivlence operator, are two addresses not equal?
 
+   /// overloaded > operator, is a1 > a2
    friend ASNMP_Export bool operator>( const Address &lhs,const Address &rhs);
-   // overloaded > operator, is a1 > a2
 
+   /// overloaded >= operator, is a1 >= a2
    friend ASNMP_Export bool operator>=( const Address &lhs,const Address &rhs);
-   // overloaded >= operator, is a1 >= a2
 
+   /// overloaded < operator, is a1 < a2
    friend ASNMP_Export bool operator<( const Address &lhs,const Address &rhs);
-   // overloaded < operator, is a1 < a2
 
+   /// overloaded <= operator, is a1 <= a2
    friend ASNMP_Export bool operator<=( const Address &lhs,const Address &rhs);
-   // overloaded <= operator, is a1 <= a2
 
+   /// equivlence operator overloaded, are an address and a string equal?
    friend ASNMP_Export bool operator==( const Address &lhs,const char *rhs);
-   // equivlence operator overloaded, are an address and a string equal?
 
+   /// overloaded not equivlence operator, are an address and string not equal?
    friend ASNMP_Export bool operator!=( const Address &lhs,const char *rhs);
-   // overloaded not equivlence operator, are an address and string not equal?
 
+   /// overloaded < , is an address greater than a string?
    friend ASNMP_Export bool operator>( const Address &lhs,const char *rhs);
-   // overloaded < , is an address greater than a string?
 
+   /// overloaded >=, is an address greater than or equal to a string?
    friend ASNMP_Export bool operator>=( const Address &lhs,const char *rhs);
-   // overloaded >=, is an address greater than or equal to a string?
 
+   /// overloaded < , is an address less than a string?
    friend ASNMP_Export bool operator<( const Address &lhs,const char *rhs);
-   // overloaded < , is an address less than a string?
 
+   /// overloaded <=, is an address less than or equal to a string?
    friend ASNMP_Export bool operator<=( const Address &lhs,const char *rhs);
-   // overloaded <=, is an address less than or equal to a string?
 
+   /// overloaded const char * cast
    virtual operator const char *() const = 0;
-   // overloaded const char * cast
 
+  /// verify the is the address object constructed ok
   virtual int valid() const;
-  // verify the is the address object constructed ok
 
+  /// return a suitable buffer to contain the address
   virtual void to_octet(OctetStr& octet) const = 0;
-  // return a suitable buffer to contain the address
 
+  /// (pure virtual) syntax type
   virtual SmiUINT32 get_syntax() = 0;
-  // (pure virtual) syntax type
 
+  /// for non const [], allows reading and writing
   unsigned char& operator[]( const int position);
-  // for non const [], allows reading and writing
 
+  /// get a printable ASCII value
   virtual const char *to_string() = 0;
-  // get a printable ASCII value
 
+  /// create a new instance of this Value
   virtual SnmpSyntax *clone() const = 0;
-  // create a new instance of this Value
 
+  /// return the type of address
   virtual addr_type get_type() const = 0;
-  // return the type of address
 
+  /// overloaded assignment operator
   virtual SnmpSyntax& operator=( SnmpSyntax &val) = 0;
-  // overloaded assignment operator
 
+  /// return a hash key
   virtual unsigned int hashFunction() const { return 0;};
-  // return a hash key
 
 
 protected:
+  /// state of constructed object (1/0)
+  /// addr internal representation
   int valid_flag;
-  // state of constructed object (1/0)
   unsigned char address_buffer[MAX_ADDR_SZ];
-  // addr internal representation
 
+  /// parse the address string
+  /// redefined for each specific address subclass
   virtual int parse_address( const char * inaddr) =0;
-  // parse the address string
-  // redefined for each specific address subclass
 
+  /// format the output
+  /// redefined for each specific address subclass
   virtual void format_output() =0;
-  // format the output
-  // redefined for each specific address subclass
 
+  /// a reused trimm white space method
   void trim_white_space( char * ptr);
-  // a reused trimm white space method
 };
 
 
 //-----------------------------------------------------------------------
 //---------[ IPv4 Address Class ]----------------------------------------
 //-----------------------------------------------------------------------
+/**
+ * @class IpAddress
+ *
+ * @brief Defines the member functions for the concrete class IpAddress
+ * An IP Version 4 Address is 4 bytes long and consists of a
+ * Network, Sub Network, and host component.
+ */
 class ASNMP_Export IpAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class IpAddress
-  //     An IP Version 4 Address is 4 bytes long and consists of a
-  //     Network, Sub Network, and host component.
 {
 public:
+  /// default construct an IP address with a string
   IpAddress( const char *inaddr = "");
-  // default construct an IP address with a string
 
+  /// construct an IP address with another IP address
   IpAddress( const IpAddress  &ipaddr);
-  // construct an IP address with another IP address
 
+  /// construct an IP address with a GenAddress
   IpAddress( const GenAddress &genaddr);
-  // construct an IP address with a GenAddress
 
+  /// destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
   ~IpAddress();
-  // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// assignment to another IpAddress object overloaded
   IpAddress& operator=( const IpAddress &ipaddress);
-  // assignment to another IpAddress object overloaded
 
   // TODO: add ability to set addr given long
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// return the DNS Fully Qualified Domain Name (host.domain)
+  /// on failure returns dotted_quad string
   const char *resolve_hostname(int& was_found);
-  // return the DNS Fully Qualified Domain Name (host.domain)
-  // on failure returns dotted_quad string
 
+  /// return string representation of object (dotted quad returned)
   virtual const char *to_string() ;
-  // return string representation of object (dotted quad returned)
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// logically AND two IPaddresses and
+  /// return the new one
   void mask( const IpAddress& ipaddr);
-  // logically AND two IPaddresses and
-  // return the new one
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
+  /// syntax type
   virtual SmiUINT32 get_syntax();
-  // syntax type
 
+  /// is this the loopback address? 127.0.0.1/loopback/1.0.0.127.in-addr.arpa
   int is_loopback() const;
-  // is this the loopback address? 127.0.0.1/loopback/1.0.0.127.in-addr.arpa
 
+  /// determine if this is a multicast address
   int is_multicast() const;
-  // determine if this is a multicast address
 
+  /// determine if this a broadcast address
   int is_broadcast() const;
-  // determine if this a broadcast address
 
+  /// per RFC 1597,  private addresses are:: 10, 172.16, and 192.168.0
   int is_private() const;
-  // per RFC 1597,  private addresses are:: 10, 172.16, and 192.168.0
 
+  /// convert address into octet string format in network byte order
   virtual void to_octet(OctetStr& octet) const;
-  // convert address into octet string format in network byte order
 
 protected:
   char output_buffer[MAX_DISPLAY_SZ];           // output buffer
 
+  /// friendly name storage
   char iv_friendly_name_[MAX_DISPLAY_SZ];
-  // friendly name storage
 
+  /// did resolver call work? some addrs won't resolve
   int  iv_friendly_name_status_;
-  // did resolver call work? some addrs won't resolve
 
+  /// redefined parse address
+  /// specific to IP addresses
   virtual int parse_address( const char *inaddr);
-  // redefined parse address
-  // specific to IP addresses
 
+  /// redefined format output
+  /// specific to IP addresses
   virtual void format_output();
-  // redefined format output
-  // specific to IP addresses
 
+  /// parse a dotted string
   int parse_dotted_ipstring( const char *inaddr);
-  // parse a dotted string
 
+  /// using the currently defined address, do a gethostbyname()
+  /// and try to fill up the name
   int addr_to_friendly();
-  // using the currently defined address, do a gethostbyname()
-  // and try to fill up the name
 
+  /// thread safe routine to lookup ip address given hostname
+  /// return <> 0 on error
   static int resolve_to_address(const char *hostname, in_addr& quad_addr);
-  // thread safe routine to lookup ip address given hostname
-  // return <> 0 on error
 
+  /// thread safe routine to lookup name given ip address
+  /// return <> 0 on error
   static int resolve_to_hostname(const in_addr& quad_addr, char *hostname);
-  // thread safe routine to lookup name given ip address
-  // return <> 0 on error
 
 };
 
@@ -304,22 +306,25 @@ protected:
 //--------------[ DNS Iterator Class ]------------------------------------
 //------------------------------------------------------------------------
 
+/**
+ * @class Address_Iter
+ *
+ * @brief Defines routines to obtain information on a hostname/FQDN
+ * such as multiple addresses
+ */
 class ASNMP_Export Address_Iter
-  // = TITLE
-  //     Defines routines to obtain information on a hostname/FQDN
-  //     such as multiple addresses
 {
 public:
   Address_Iter(const char *hostname); // fully qualified domain name, hostname
 
+  /// did hostname resolve via DNS?
   int valid() const;
-  // did hostname resolve via DNS?
 
+  /// how many addresses associated with this hostname
   int how_many_addresses();
-  // how many addresses associated with this hostname
 
+  /// return next address
   int next(IpAddress& addr);
-  // return next address
 
 private:
   Address_Iter(const Address_Iter&);
@@ -334,152 +339,161 @@ private:
 //------------------------------------------------------------------------
 //---------[ UDP/IPv4 Address Class ]-------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the concrete class UdpAddress
+ * A Udp Address consists of an IP Version 4 Address (IpAddress)
+ * and a 2 byte unsigned port number.  (see /etc/services file)
+ * User Datagram Protocol (UDP) is a best effort transport
+ */
 class  ASNMP_Export UdpAddress : public IpAddress
-  // = TITLE
-  //     Defines the member functions for the concrete class UdpAddress
-  //     A Udp Address consists of an IP Version 4 Address (IpAddress)
-  //     and a 2 byte unsigned port number.  (see /etc/services file)
-  //     User Datagram Protocol (UDP) is a best effort transport
 {
 public:
+  /// default constructor with a dotted string in the form of addr:port
   UdpAddress( const char *inaddr = "");
-  // default constructor with a dotted string in the form of addr:port
 
+  /// construct an Udp address with another Udp address
   UdpAddress( const UdpAddress &udpaddr);
-  // construct an Udp address with another Udp address
 
+  /// construct a Udp address with a GenAddress
   UdpAddress( const GenAddress &genaddr);
-  // construct a Udp address with a GenAddress
 
+  /// construct a Udp address with an IpAddress
+  /// default port # to zero
   UdpAddress( const IpAddress &ipaddr);
-  // construct a Udp address with an IpAddress
-  // default port # to zero
 
+  /// destructor
   ~UdpAddress();
-  // destructor
 
+  /// syntax type
   SmiUINT32 get_syntax();
-  // syntax type
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// assignment to another IpAddress object overloaded
   UdpAddress& operator=( const UdpAddress &udpaddr);
-  // assignment to another IpAddress object overloaded
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// output in the form of address:port
   virtual const char *to_string() ;
-  // output in the form of address:port
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// set the port number
   void set_port( const unsigned short p);
-  // set the port number
 
+  /// get the port number
   unsigned short get_port() const;
-  // get the port number
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
 protected:
+  /// output buffer
   char output_buffer[MAX_DISPLAY_SZ];
-  // output buffer
 
+  /// redefined parse address
+  /// specific to IP addresses
   virtual int parse_address( const char *inaddr);
-  // redefined parse address
-  // specific to IP addresses
 
+  /// redefined format output
+  /// specific to IP addresses
   virtual void format_output();
-  // redefined format output
-  // specific to IP addresses
 };
 
 
 //-------------------------------------------------------------------------
 //---------[ 802.3 MAC Address Class ]-------------------------------------
 //-------------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the concrete class MacAddress.
+ * A Media Access Control Address consists of 48 bits as defined
+ * in IEEE 802.3 specifications.
+ */
 class  ASNMP_Export MacAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class MacAddress.
-  //     A Media Access Control Address consists of 48 bits as defined
-  //     in IEEE 802.3 specifications.
 {
 public:
+  /// constructor with a string argument
   MacAddress( const char  *inaddr = "");
-  // constructor with a string argument
 
+  /// constructor with another MAC object
   MacAddress( const MacAddress  &macaddr);
-  // constructor with another MAC object
 
+  /// construct a MacAddress with a GenAddress
   MacAddress( const GenAddress &genaddr);
-  // construct a MacAddress with a GenAddress
 
+  /// destructor
   ~MacAddress();
-  // destructor
 
+  /// syntax type
   SmiUINT32 get_syntax();
-  // syntax type
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// assignment to another IpAddress object overloaded
   MacAddress& operator=( const MacAddress &macaddress);
-  // assignment to another IpAddress object overloaded
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// create a string to internal class storage representing object
   virtual const char *to_string();
-  // create a string to internal class storage representing object
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
+  /// return a hash key
   unsigned int hashFunction() const;
-  // return a hash key
 
+  /// return byte array of the mac address
   virtual void to_octet(OctetStr& octet) const;
-  // return byte array of the mac address
 
 protected:
+  /// output buffer containing string representation of object
   char output_buffer[MAX_DISPLAY_SZ];
-  // output buffer containing string representation of object
 
+  /// redefined parse address for macs
   virtual int parse_address( const char *inaddr);
-  // redefined parse address for macs
 
+  /// redefined format output for MACs
   virtual void format_output();
-  // redefined format output for MACs
 };
 
 //------------------------------------------------------------------------
 //---------[ Netbios Address Class ]--------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the concrete class NetbiosAddress.
+ * The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport.
+ */
 class  ASNMP_Export NetbiosAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class NetbiosAddress.
-  //     The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport.
 {
 public:
 
+   /// default constructor with string arg
    NetbiosAddress( const char *inaddr = "");
-   // default constructor with string arg
 
+   /// set name and service type
    NetbiosAddress( const char *inaddr, nb_service svc);
-   // set name and service type
 
+   /// copy constructor
    NetbiosAddress( const NetbiosAddress& nbaddr);
-   // copy constructor
 
+   /// construct with a GenAddress
    NetbiosAddress( const GenAddress& genaddr);
-   // construct with a GenAddress
 
    ~NetbiosAddress();
 
@@ -487,33 +501,33 @@ public:
 
    NetbiosAddress& operator=( const NetbiosAddress &nbaddr);
 
+   /// retrieve the network service type
    nb_service get_service_type() const;
-   // retrieve the network service type
 
+   /// set the service type (workstation, server, etc)
    void set_service_type(nb_service nbservice);
-   // set the service type (workstation, server, etc)
 
+   /// const char * operator overloaded for streaming output
    virtual operator const char *() const;
-   // const char * operator overloaded for streaming output
 
+   /// syntax type
    virtual SmiUINT32 get_syntax();
-   // syntax type
 
+   /// copy an instance of this Value
    SnmpSyntax& operator=( SnmpSyntax &val);
-   // copy an instance of this Value
 
+   /// create a new instance of this Value
    SnmpSyntax *clone() const;
-   // create a new instance of this Value
 
+   /// output byte buffer containing netbios name
    virtual void to_octet(OctetStr& octet) const;
-   // output byte buffer containing netbios name
 
 protected:
   void InitNBAddr(const char *inaddr);
   char output_buffer[MAX_DISPLAY_SZ];
 
+  /// output buffer to hold string representation
   virtual void format_output();
-  // output buffer to hold string representation
   virtual int parse_address( const char  *inaddr);
   virtual addr_type get_type() const;
 };
@@ -521,20 +535,23 @@ protected:
 //------------------------------------------------------------------------
 //---------[ DecNet Address Class ]---------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the concrete class DecNetAddress.
+ * DecNet Phase ? address consists of two octets (CISCO-TC.my)
+ */
 class  ASNMP_Export DecNetAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class DecNetAddress.
-  //     DecNet Phase ? address consists of two octets (CISCO-TC.my)
 {
   public:
+   /// default constructor with string arg
    DecNetAddress( const char *inaddr = "");
-   // default constructor with string arg
 
+   /// copy constructor
    DecNetAddress( const DecNetAddress& decaddr);
-   // copy constructor
 
+   /// construct with a GenAddress
    DecNetAddress( const GenAddress& genaddr);
-   // construct with a GenAddress
 
    ~DecNetAddress();
 
@@ -542,20 +559,20 @@ class  ASNMP_Export DecNetAddress : public Address
 
    DecNetAddress& operator=( const DecNetAddress &decaddr);
 
+   /// convert address into octet string format 2 bytes of decnet address
    virtual void to_octet(OctetStr& octet) const;
-   // convert address into octet string format 2 bytes of decnet address
 
+   /// const char * operator overloaded for streaming output
    virtual operator const char *() const;
-   // const char * operator overloaded for streaming output
 
+   /// syntax type
    virtual SmiUINT32 get_syntax();
-   // syntax type
 
+   /// copy an instance of this Value
    SnmpSyntax& operator=( SnmpSyntax &val);
-   // copy an instance of this Value
 
+   /// create a new instance of this Value
    SnmpSyntax *clone() const;
-   // create a new instance of this Value
 
    protected:
    virtual int parse_address( const char *inaddr);
@@ -567,20 +584,23 @@ class  ASNMP_Export DecNetAddress : public Address
 //------------------------------------------------------------------------
 //---------[ AppleTalk Address Class ]------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class 
+ *
+ * @brief Defines the member functions for the concrete class DecNetAddress.
+ * DecNet Phase ? address consists of two octets (CISCO-TC.my)
+ */
 class  ASNMP_Export AppleTalkAddress :  public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class DecNetAddress.
-  //     DecNet Phase ? address consists of two octets (CISCO-TC.my)
 {
   public:
+   /// default constructor with string arg
   AppleTalkAddress( const char *inaddr = "");
-   // default constructor with string arg
 
+   /// copy constructor
    AppleTalkAddress( const AppleTalkAddress& atkaddr);
-   // copy constructor
 
+   /// construct with a GenAddress
    AppleTalkAddress( const GenAddress& genaddr);
-   // construct with a GenAddress
 
    ~AppleTalkAddress();
 
@@ -588,32 +608,32 @@ class  ASNMP_Export AppleTalkAddress :  public Address
 
    AppleTalkAddress& operator=( const AppleTalkAddress &atkaddr);
 
+   /// convert address into octet string format 3 bytes of atk address
    virtual void to_octet(OctetStr& octet) const;
-   // convert address into octet string format 3 bytes of atk address
 
+   /// get the host part of the address
    char get_host_address() const;
-   // get the host part of the address
 
+   /// set the host part of the address
    void set_host_address(const char);
-   // set the host part of the address
 
+   /// get the 2 byte atk network address
    short get_net_address() const;
-   // get the 2 byte atk network address
 
+   /// set the host 2 byte atk  network address
    void set_net_address(const short atknet);
-   // set the host 2 byte atk  network address
 
+   /// const char * operator overloaded for streaming output
    virtual operator const char *() const;
-   // const char * operator overloaded for streaming output
 
+   /// syntax type
    virtual SmiUINT32 get_syntax();
-   // syntax type
 
+   /// copy an instance of this Value
    SnmpSyntax& operator=( SnmpSyntax &val);
-   // copy an instance of this Value
 
+   /// create a new instance of this Value
    SnmpSyntax *clone() const;
-   // create a new instance of this Value
 
    private:
    virtual int parse_address( const char *inaddr);
@@ -625,64 +645,67 @@ class  ASNMP_Export AppleTalkAddress :  public Address
 //------------------------------------------------------------------------
 //---------[ IPX Address Class ]------------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class IpxAddress
+ *
+ * @brief Defines the member functions for the concrete class IpxAddress.
+ * Novell's IPX (version ?) network protocol endpoint
+ */
 class ASNMP_Export IpxAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class IpxAddress.
-  //     Novell's IPX (version ?) network protocol endpoint
 {
 public:
+  /// default constructor with a string arg
   IpxAddress( const char  *inaddr = "");
-  // default constructor with a string arg
 
+  /// constructor with another ipx object
   IpxAddress( const IpxAddress  &ipxaddr);
-  // constructor with another ipx object
 
+  /// construct with a GenAddress
   IpxAddress( const GenAddress &genaddr);
-  // construct with a GenAddress
 
+  /// destructor
   ~IpxAddress();
-  // destructor
 
+  /// syntax type
   virtual SmiUINT32 get_syntax();
-  // syntax type
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// assignment to another IpxAddress object overloaded
   IpxAddress& operator=( const IpxAddress &ipxaddress);
-  // assignment to another IpxAddress object overloaded
 
+  /// get the host id portion of an ipx address
   int get_hostid( MacAddress& mac);
-  // get the host id portion of an ipx address
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// create string represtation of object value
   virtual const char *to_string();
-  // create string represtation of object value
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
+  /// return byte sequence containing ipx address
   virtual void to_octet(OctetStr& octet) const;
-  // return byte sequence containing ipx address
 
 protected:
+  /// ipx format separator {:,/}
   char separator;
-  // ipx format separator {:,/}
 
+  /// output buffer to hold string representation
   char output_buffer[MAX_DISPLAY_SZ];
-  // output buffer to hold string representation
 
+  /// redefined parse address for ipx strings
   virtual int parse_address( const char  *inaddr);
-  // redefined parse address for ipx strings
 
+  /// redefined format output for ipx strings
+  /// uses same separator as when constructed
   virtual void format_output();
-  // redefined format output for ipx strings
-  // uses same separator as when constructed
 };
 
 
@@ -690,127 +713,133 @@ protected:
 //------------------------------------------------------------------------
 //---------[ IpxSock Address Class ]--------------------------------------
 //------------------------------------------------------------------------
+/**
+ * @class IpxSockAddress
+ *
+ * @brief Defines the member functions for the concrete class IpxAddress.
+ * Novell's IPX (version ?) network protocol endpoint
+ */
 class ASNMP_Export IpxSockAddress : public IpxAddress
-  // = TITLE
-  //     Defines the member functions for the concrete class IpxAddress.
-  //     Novell's IPX (version ?) network protocol endpoint
 {
 public:
+  /// constructor with a dotted string
   IpxSockAddress( const char *inaddr = "");
-  // constructor with a dotted string
 
+  /// construct an Udp address with another Udp address
   IpxSockAddress( const IpxSockAddress &ipxaddr);
-  // construct an Udp address with another Udp address
 
+  ///constructor with a GenAddress
   IpxSockAddress( const GenAddress &genaddr);
-  //constructor with a GenAddress
 
+  ///constructor with a IpxAddress
+  /// default socket # is 0
   IpxSockAddress( const IpxAddress &ipxaddr);
-  //constructor with a IpxAddress
-  // default socket # is 0
 
+  /// destructor
   ~IpxSockAddress();
-  // destructor
 
+  /// syntax type
   virtual SmiUINT32 get_syntax();
-  // syntax type
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// assignment to another IpxAddress object overloaded
   IpxSockAddress& operator=( const IpxSockAddress &ipxaddr);
-  // assignment to another IpxAddress object overloaded
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// set the socket number
   void set_socket( const unsigned short s);
-  // set the socket number
 
+  /// get the socket number
   unsigned short get_socket() const;
-  // get the socket number
 
+  /// create string representation of object value
   virtual const char *to_string();
-  // create string representation of object value
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
 protected:
+  /// output buffer to hold string representation of object
   char output_buffer[MAX_DISPLAY_SZ];
-  // output buffer to hold string representation of object
 
+  /// redefined parse address for ipx strings
   virtual int parse_address( const char  *inaddr);
-  // redefined parse address for ipx strings
 
+  /// redefined format output
+  /// specific to IP addresses
   virtual void format_output();
-  // redefined format output
-  // specific to IP addresses
 };
 
 //-------------------------------------------------------------------------
 //--------[ Generic Address ]----------------------------------------------
 //-------------------------------------------------------------------------
+/**
+ * @class GenAddress
+ *
+ * @brief Defines the member functions for the concrete class GenAddress.
+ * This class attempts to determine an address type given a char string.
+ */
 class ASNMP_Export GenAddress : public Address
-  // = TITLE
-  //     Defines the member functions for the concrete class GenAddress.
-  //     This class attempts to determine an address type given a char string.
 {
 public:
+  /// constructor with a string argument
   GenAddress( const char  *addr = "");
-  // constructor with a string argument
 
+  /// constructor with an Address
   GenAddress( const Address &addr);
-  // constructor with an Address
 
+  /// constructor with another GenAddress
   GenAddress( const GenAddress &addr);
-  // constructor with another GenAddress
 
+  /// destructor
   ~GenAddress();
-  // destructor
 
+  /// get the snmp syntax of the contained address
   SmiUINT32 get_syntax();
-  // get the snmp syntax of the contained address
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// assignment of a GenAddress
   GenAddress& operator=( const GenAddress &addr);
-  // assignment of a GenAddress
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// string representation of object value
   virtual const char *to_string();
-  // string representation of object value
 
+  /// const char * operator overloaded for streaming output
   virtual operator const char *() const;
-  // const char * operator overloaded for streaming output
 
+  /// return the type
   virtual addr_type get_type() const;
-  // return the type
 
+  /// return the address as a octet sequence
   virtual void to_octet(OctetStr& octet) const;
-  // return the address as a octet sequence
 
 protected:
+  /// pointer to a a concrete address
   Address *address;
-  // pointer to a a concrete address
 
+  /// output buffer of objects value
   char output_buffer[MAX_DISPLAY_SZ];
-  // output buffer of objects value
 
+  /// redefined parse address for macs
   virtual int parse_address( const char *addr);
-  // redefined parse address for macs
 
+  /// format output for a generic address
   virtual void format_output();
-  // format output for a generic address
 
+  /// initialize smi data structure
   void init_smi();
-  // initialize smi data structure
 };
 
 #endif  //_ADDRESS
diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h
index 0c141c188d2..3be7e3925ef 100644
--- a/ASNMP/asnmp/asn1.h
+++ b/ASNMP/asnmp/asn1.h
@@ -1,25 +1,22 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef ASN1
 #define ASN1
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    asn1.h
-//
-// = DESCRIPTION
-// Abstract Syntax Notation One, ASN.1
-// As defined in ISO/IS 8824 and ISO/IS 8825
-// This implements a subset of the above International Standards that
-// is sufficient to implement SNMP.
-//
-// = AUTHOR
-//   Steve Waldbusser/CMU ?
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    asn1.h
+ *
+ *  $Id$
+ *
+ * Abstract Syntax Notation One, ASN.1
+ * As defined in ISO/IS 8824 and ISO/IS 8825
+ * This implements a subset of the above International Standards that
+ * is sufficient to implement SNMP.
+ *
+ *
+ *  @author Steve Waldbusser/CMU ?
+ */
+//=============================================================================
+
 
 /**********************************************************************
         Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University
@@ -161,10 +158,13 @@ struct counter64 {
 };
 
 // CMU Interface class for ASN.1 routines
+/**
+ * @class asn1
+ *
+ * @brief Defines the member functions for the asn1 concrete interface class
+ * CMU routines for performing ASN.1 data marshalling / representation
+ */
 class ASNMP_Export asn1
-  // = TITLE
-  //     Defines the member functions for the asn1 concrete interface class
-  //     CMU routines for performing ASN.1 data marshalling / representation
 
 {
 public:
@@ -271,10 +271,13 @@ static unsigned char * build_unsigned_int64( unsigned char *data,
 
 
 // CMU Interface class for SNMPv1, SNMPv2c routines
+/**
+ * @class cmu_snmp
+ *
+ * @brief Defines the static functions for the cmu_snmp concrete class.
+ * These routine create cmu pdu's that can be sent/received on/from agents
+ */
 class ASNMP_Export cmu_snmp
-  // = TITLE
-  //    Defines the static functions for the cmu_snmp concrete class.
-  //    These routine create cmu pdu's that can be sent/received on/from agents
 {
  public:
   static struct snmp_pdu *pdu_create( int command);
diff --git a/ASNMP/asnmp/counter.h b/ASNMP/asnmp/counter.h
index 7cffb132a48..36fda2f84ce 100644
--- a/ASNMP/asnmp/counter.h
+++ b/ASNMP/asnmp/counter.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef COUNTER_
 #define COUNTER_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    counter.h
-//
-// = DESCRIPTION
-//  Class definition for SMI Counter32 class.
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    counter.h
+ *
+ *  $Id$
+ *
+ *  Class definition for SMI Counter32 class.
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -44,36 +41,39 @@
 // This class does not behave as defined by the abstract model
 // in RFC 1155 section 3.2.3.3
 
-class ASNMP_Export Counter32: public SnmpUInt32
-  // = TITLE
-  //     Defines the member functions for the Counter32 concrete class
-  //     This class implements RFC 1155 Counter Object and is named
-  //     Counter32 after the RFC1902 redefinition of V1 SMI datatypes
+/**
+ * @class Counter32
+ *
+ * @brief Defines the member functions for the Counter32 concrete class
+ * This class implements RFC 1155 Counter Object and is named
+ * Counter32 after the RFC1902 redefinition of V1 SMI datatypes
+ */
+class ASNMP_Export Counter32 : public SnmpUInt32
 {
   public:
+     /// constructor with a value
      Counter32( const unsigned long i = 0);
-     // constructor with a value
 
+     /// copy constructor
      Counter32( const Counter32 &c);
-     // copy constructor
 
+     /// syntax type
      SmiUINT32 get_syntax();
-     // syntax type
 
+     /// create a new instance of this Value
      SnmpSyntax *clone() const;
-     // create a new instance of this Value
 
+     /// copy an instance of this Value
      SnmpSyntax& operator=( SnmpSyntax &val);
-     // copy an instance of this Value
 
+     /// overloaded assignment
      Counter32& operator=( const Counter32 &uli);
-     // overloaded assignment
 
+     /// overloaded assignment
      Counter32& operator=( const unsigned long i);
-     // overloaded assignment
 
+     /// otherwise, behave like an unsigned long int
      operator unsigned long();
-     // otherwise, behave like an unsigned long int
 };
 
 #endif // COUNTER_
diff --git a/ASNMP/asnmp/ctr64.h b/ASNMP/asnmp/ctr64.h
index 7f166932430..6b97b9966f2 100644
--- a/ASNMP/asnmp/ctr64.h
+++ b/ASNMP/asnmp/ctr64.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef CTR64_
 #define CTR64_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    ctr64.h
-//
-// = DESCRIPTION
-//  SNMP Counter64 class definition.
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    ctr64.h
+ *
+ *  $Id$
+ *
+ *  SNMP Counter64 class definition.
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -44,65 +41,68 @@
 // a single entity. This type has is available in SNMPv2 but
 // may be used anywhere where needed.
 //
-class ASNMP_Export Counter64: public  SnmpSyntax
-  // = TITLE
-  //     Defines the member functions for the Counter64 concrete class
-  //     This class implements RFC 1902 64 bit Counter Object.
+/**
+ * @class Counter64
+ *
+ * @brief Defines the member functions for the Counter64 concrete class
+ * This class implements RFC 1902 64 bit Counter Object.
+ */
+class ASNMP_Export Counter64 : public  SnmpSyntax
 {
 public:
+  /// default constructor
   Counter64( ACE_UINT64 llw = 0);
-  // default constructor
 
+  /// constructor with values
   Counter64( unsigned long hiparm, unsigned long loparm);
-  // constructor with values
 
+  /// copy constructor
   Counter64( const Counter64 &ctr64);
-  // copy constructor
 
+  /// destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
   ~Counter64();
-  // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
+  /// syntax type
   SmiUINT32 get_syntax();
-  // syntax type
 
+  /// return a long double representation
   long double to_long_double() const;
-  // return a long double representation
 
+  /// assign a long double to a counter64
   Counter64& assign( long double ld);
-  // assign a long double to a counter64
 
+  /// return the high part
   unsigned long high() const;
-  // return the high part
 
+  /// return the low part
   unsigned long low() const;
-  // return the low part
 
+  /// set the high part
   void set_high( const unsigned long h);
-  // set the high part
 
+  /// set the low part
   void set_low( const unsigned long l);
-  // set the low part
 
+  /// overloaded assignment
   Counter64& operator=( const ACE_UINT64 rhs);
-  // overloaded assignment
 
+  /// overloaded assignment
   Counter64& operator=( const Counter64 &rhs);
-  // overloaded assignment
 
+  /// get a printable ASCII representation
   const char *to_string();
-  // get a printable ASCII representation
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
+  /// general validity test, always true
   int valid() const;
-  // general validity test, always true
 
+  /// otherwise, behave like an ACE_UINT64
   operator ACE_UINT64();
-  // otherwise, behave like an ACE_UINT64
 
 protected:
   char output_buffer[CTR64OUTBUF];
diff --git a/ASNMP/asnmp/enttraps.h b/ASNMP/asnmp/enttraps.h
index 460c2bae121..433538eb258 100644
--- a/ASNMP/asnmp/enttraps.h
+++ b/ASNMP/asnmp/enttraps.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef ENTTRAPS_
 #define ENTTRAPS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//     enttraps.cpp
-//
-// = DESCRIPTION
-//   constants for Enterprise Traps
-//
-// = AUTHOR
-//   Peter E Mellquist
-//   Michael R MacFaden  mrm@cisco.com - rework & ACE port
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     enttraps.h
+ *
+ *  $Id$
+ *
+ * constants for Enterprise Traps
+ *
+ *
+ *  @author Peter E MellquistMichael R MacFaden  mrm@cisco.com - rework & ACE port
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -36,46 +33,61 @@
 #include "asnmp/asn1.h"                       // ASN.1 header file
 
 //--------------[ well known trap ids ]-----------------------------------
-class ASNMP_Export snmpTrapsOid: public Oid
-  // = TITLE
-  //     Defines the member functions for the snmpTrapsOid base class
-  //     to implement the traps defined in RFC 1215
+/**
+ * @class snmpTrapsOid
+ *
+ * @brief Defines the member functions for the snmpTrapsOid base class
+ * to implement the traps defined in RFC 1215
+ */
+class ASNMP_Export snmpTrapsOid : public Oid
 {
    public:
    snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}
    SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
-class ASNMP_Export snmpTrapEnterpriseOid: public Oid
-  // = TITLE
-  //     Defines the default Enterprise Oid for this software package
+/**
+ * @class snmpTrapEnterpriseOid
+ *
+ * @brief Defines the default Enterprise Oid for this software package
+ */
+class ASNMP_Export snmpTrapEnterpriseOid : public Oid
 {
    public:
    snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { }
    SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
-class ASNMP_Export coldStartOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 agent cold start generic trap  (system reboot)
+/**
+ * @class coldStartOid
+ *
+ * @brief Defines the RFC 1215 agent cold start generic trap  (system reboot)
+ */
+class ASNMP_Export coldStartOid : public snmpTrapsOid
 {
    public:
    coldStartOid( void){*this+=".1";}
    SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
-class ASNMP_Export warmStartOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 agent warm start generic trap  (agent reboot)
+/**
+ * @class warmStartOid
+ *
+ * @brief Defines the RFC 1215 agent warm start generic trap  (agent reboot)
+ */
+class ASNMP_Export warmStartOid : public snmpTrapsOid
 {
    public:
    warmStartOid( void){*this+=".2";}
    SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
-class ASNMP_Export linkDownOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 interface (link) down trap
+/**
+ * @class linkDownOid
+ *
+ * @brief Defines the RFC 1215 interface (link) down trap
+ */
+class ASNMP_Export linkDownOid : public snmpTrapsOid
 {
    public:
    linkDownOid( void){*this+=".3";}
@@ -84,27 +96,36 @@ class ASNMP_Export linkDownOid: public snmpTrapsOid
 
 
 // SMI LinkUp Oid
-class ASNMP_Export linkUpOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 interface (link) up trap
+/**
+ * @class linkUpOid
+ *
+ * @brief Defines the RFC 1215 interface (link) up trap
+ */
+class ASNMP_Export linkUpOid : public snmpTrapsOid
 {
    public:
    linkUpOid( void){*this+=".4";}
    SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
-class ASNMP_Export authenticationFailureOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 device/agent invalid access trap
+/**
+ * @class authenticationFailureOid
+ *
+ * @brief Defines the RFC 1215 device/agent invalid access trap
+ */
+class ASNMP_Export authenticationFailureOid : public snmpTrapsOid
 {
    public:
    authenticationFailureOid( void){*this+=".5";}
    SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
-class ASNMP_Export egpNeighborLossOid: public snmpTrapsOid
-  // = TITLE
-  //     Defines the RFC 1215 Exterior Gateway Protocol neighbor loss trap
+/**
+ * @class egpNeighborLossOid
+ *
+ * @brief Defines the RFC 1215 Exterior Gateway Protocol neighbor loss trap
+ */
+class ASNMP_Export egpNeighborLossOid : public snmpTrapsOid
 {
    public:
    egpNeighborLossOid( void){*this+=".6";}
diff --git a/ASNMP/asnmp/gauge.h b/ASNMP/asnmp/gauge.h
index 882a6f87c93..202edaf98bf 100644
--- a/ASNMP/asnmp/gauge.h
+++ b/ASNMP/asnmp/gauge.h
@@ -1,24 +1,21 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef GAUGE_
 #define GAUGE_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    gauge32.cpp
-//
-// = DESCRIPTION
-//  Class definition for SMI Gauge32 class.
-//  This class currently does not behave as defined by the abstract model
-//  in RFC 1155 section 3.2.3.4 (ie the value doesn't latch on the max value)
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    gauge.h
+ *
+ *  $Id$
+ *
+ *  Class definition for SMI Gauge32 class.
+ *  This class currently does not behave as defined by the abstract model
+ *  in RFC 1155 section 3.2.3.4 (ie the value doesn't latch on the max value)
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -43,37 +40,40 @@
 // objects may be set or get into Vb objects.
 //
 
+/**
+ * @class Gauge32:
+ *
+ * @brief Define RFC1902 Gauge datatype from RFC 1155 section 3.2.3.4
+ * Note that this datatype does not behave exactly (acts like a long)
+ */
 class ASNMP_Export Gauge32: public SnmpUInt32
-  // = TITLE
-  //     Define RFC1902 Gauge datatype from RFC 1155 section 3.2.3.4
-  //     Note that this datatype does not behave exactly (acts like a long)
 {
   public:
+     /// constructor with a value
      Gauge32( const unsigned long i = 0);
-     // constructor with a value
 
+     /// copy constructor
      Gauge32 ( const Gauge32 &g);
-     // copy constructor
 
+     /// destructor for a Gauge32 (ensure that Value::~Value() is overridden)
      ~Gauge32();
-     // destructor for a Gauge32 (ensure that Value::~Value() is overridden)
 
+     /// syntax type
      SmiUINT32 get_syntax();
-     // syntax type
 
+     /// create a new instance of this Value
      SnmpSyntax *clone() const;
-     // create a new instance of this Value
 
+     /// overloaded assignment
      Gauge32& operator=( const Gauge32 &uli);
-     // overloaded assignment
 
+     /// overloaded assignment
      Gauge32& operator=( const unsigned long i);
-     // overloaded assignment
 
+     /// otherwise, behave like an unsigned int
      operator unsigned long();
-     // otherwise, behave like an unsigned int
 
+     /// copy an instance of this Value
      SnmpSyntax& operator=( SnmpSyntax &val);
-     // copy an instance of this Value
 };
 #endif //GAUGE_
diff --git a/ASNMP/asnmp/integer.h b/ASNMP/asnmp/integer.h
index 9d21228837b..d120684c095 100644
--- a/ASNMP/asnmp/integer.h
+++ b/ASNMP/asnmp/integer.h
@@ -1,22 +1,18 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SNMPINTEGER_
 #define SNMPINTEGER_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    integer.cpp
-//
-// = DESCRIPTION
-//  Class definition for Integer classes convertable to SMI.
-//
-// = AUTHOR
-//  Jeff Meyer
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    integer.h
+ *
+ *  $Id$
+ *
+ *  Class definition for Integer classes convertable to SMI.
+ *
+ *
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -46,95 +42,101 @@
 //
 
 // 32 bit unsigned integer class
-class ASNMP_Export SnmpUInt32: public SnmpSyntax
-  // = TITLE
-  //      Implement RFC 1920 Unsigned Integer SMI datatype
+/**
+ * @class SnmpUInt32
+ *
+ * @brief Implement RFC 1920 Unsigned Integer SMI datatype
+ */
+class ASNMP_Export SnmpUInt32 : public SnmpSyntax
 {
 
   public:
+     /// default constructor
      SnmpUInt32 (const unsigned long i = 0);
-     // default constructor
 
+     /// copy constructor
      SnmpUInt32( const SnmpUInt32 &c);
-     // copy constructor
 
+     /// destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
      virtual ~SnmpUInt32();
-     // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
+     /// syntax type
      virtual SmiUINT32 get_syntax();
-     // syntax type
 
+     /// overloaded assignment
      SnmpUInt32& operator=( const unsigned long i);
-     // overloaded assignment
 
+     /// overloaded assignment
      SnmpUInt32& operator=( const SnmpUInt32 &uli);
-     // overloaded assignment
 
+     /// otherwise, behave like an unsigned long int
      operator unsigned long();
-     // otherwise, behave like an unsigned long int
 
+     /// get a printable ASCII value
      virtual const char *to_string();
-     // get a printable ASCII value
 
+     /// create a new instance of this Value
      virtual SnmpSyntax *clone() const;
-     // create a new instance of this Value
 
+     /// copy an instance of this Value
      SnmpSyntax& operator=( SnmpSyntax &val);
-     // copy an instance of this Value
 
+     /// did object construct properly
      int valid() const;
-     // did object construct properly
 
   protected:
+    /// contain string representation of object
     int valid_flag;
     char output_buffer[INTOUTBUF];
-    // contain string representation of object
 };
 
 
 // 32 bit signed integer class
-class ASNMP_Export SnmpInt32: public SnmpSyntax
+  /**
+   * @class SnmpInt32
+   *
+   * @brief Implement RFC 1902 32 bit Integer SMI data object
+   */
+class ASNMP_Export SnmpInt32 : public SnmpSyntax
 {
-  // = TITLE
-  //      Implement RFC 1902 32 bit Integer SMI data object
   public:
+     /// constructor with value
      SnmpInt32 (const long i = 0);
-     // constructor with value
 
+     /// constructor with value
      SnmpInt32 (const SnmpInt32 &c);
-     // constructor with value
 
+     /// destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
      virtual ~SnmpInt32();
-     // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
 
+     /// syntax type
      virtual SmiUINT32 get_syntax();
-     // syntax type
 
+     /// overloaded assignment
      SnmpInt32& operator=( const long i);
-     // overloaded assignment
 
+     /// overloaded assignment
      SnmpInt32& operator=( const SnmpInt32 &li);
-     // overloaded assignment
 
+     /// otherwise, behave like a long int
      operator long();
-     // otherwise, behave like a long int
 
+     /// create a new instance of this Value
      SnmpSyntax *clone() const;
-     // create a new instance of this Value
 
+     /// copy an instance of this Value
      SnmpSyntax& operator=( SnmpSyntax &val);
-     // copy an instance of this Value
 
+     /// get a printable ASCII value
      const char *to_string();
-     // get a printable ASCII value
 
+     /// logical state of object
      int valid() const;
-     // logical state of object
 
  protected:
+    /// contain string representation of object
     int valid_flag;
     char output_buffer[INTOUTBUF];
-    // contain string representation of object
 };
 
 #endif
diff --git a/ASNMP/asnmp/octet.h b/ASNMP/asnmp/octet.h
index bb0a68432d1..5e8c8d63d98 100644
--- a/ASNMP/asnmp/octet.h
+++ b/ASNMP/asnmp/octet.h
@@ -1,27 +1,22 @@
-// -*-C++-*-
 
-// $Id$
 
 #ifndef OCTET_CLS_
 #define OCTET_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    octet.h
-//
-// = DESCRIPTION
-// This class is fully contained and does not rely on or any other
-// SNMP libraries. This class is portable across any platform
-// which supports C++.
-//
-// = AUTHOR
-//    Peter E Mellquist  / design/original code
-//    Michael R. MacFaden / modified for ACE, added suboid(),collapse ctor's
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    octet.h
+ *
+ *  $Id$
+ *
+ * This class is fully contained and does not rely on or any other
+ * SNMP libraries. This class is portable across any platform
+ * which supports C++.
+ *
+ *
+ *  @author Peter E Mellquist  / design/original code Michael R. MacFaden / modified for ACE
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -41,107 +36,112 @@
 //------------------------------------------------------------------------
 #include "asnmp/smival.h"
 
-class ASNMP_Export OctetStr: public  SnmpSyntax
-  // = TITLE
-  //      Implement RFC1155 Octet SMI data object
+/**
+ * @class OctetStr
+ *
+ * @brief Implement RFC1155 Octet SMI data object
+ */
+class ASNMP_Export OctetStr : public  SnmpSyntax
 
 {
 public:
+  /// construct octet from byte buffer, assume c style string if size == -1
   OctetStr( const char *string = "", long size = -1);
-  // construct octet from byte buffer, assume c style string if size == -1
 
+  /// constructor using another octet object
   OctetStr ( const OctetStr &octet);
-  // constructor using another octet object
 
+  /// destructor
   ~OctetStr();
-  // destructor
 
+  /// syntax type
   SmiUINT32 get_syntax();
-  // syntax type
 
+  /// set octet from byte buffer, assume c style string if size == -1
   void set_data( const SmiBYTE* string, long int size = -1);
-  // set octet from byte buffer, assume c style string if size == -1
 
+  /// assignment to a string operator overloaded
   OctetStr& operator=( const char *string);
-  // assignment to a string operator overloaded
 
+  /// assignment to another oid object overloaded
   OctetStr& operator=( const OctetStr &octet);
-  // assignment to another oid object overloaded
 
+  /// equivlence operator overloaded
   friend ASNMP_Export bool operator==( const OctetStr &lhs, const OctetStr &rhs);
-  // equivlence operator overloaded
 
+  /// not equivlence operator overloaded
   friend ASNMP_Export bool operator!=( const OctetStr &lhs, const OctetStr &rhs);
-  // not equivlence operator overloaded
 
+  /// less than < overloaded
   friend ASNMP_Export bool operator<( const OctetStr &lhs, const OctetStr &rhs);
-  // less than < overloaded
 
+  /// less than <= overloaded
   friend ASNMP_Export bool operator<=( const OctetStr &lhs,const OctetStr &rhs);
-  // less than <= overloaded
 
+  /// greater than > overloaded
   friend ASNMP_Export bool operator>( const OctetStr &lhs, const OctetStr &rhs);
-  // greater than > overloaded
 
+  /// greater than >= overloaded
   friend ASNMP_Export bool operator>=( const OctetStr &lhs, const OctetStr &rhs);
-  // greater than >= overloaded
 
+  /// equivlence operator overloaded
   friend ASNMP_Export bool operator==( const OctetStr &lhs,const char *rhs);
-  // equivlence operator overloaded
 
+  /// not equivlence operator overloaded
   friend ASNMP_Export bool operator!=( const OctetStr &lhs,const char  *rhs);
-  // not equivlence operator overloaded
 
+  /// less than < operator overloaded
   friend ASNMP_Export bool operator<( const OctetStr &lhs,const char  *rhs);
-  // less than < operator overloaded
 
+  /// less than <= operator overloaded
   friend ASNMP_Export bool operator<=( const OctetStr &lhs,char  *rhs);
-  // less than <= operator overloaded
 
+  /// greater than > operator overloaded
   friend ASNMP_Export bool operator>( const OctetStr &lhs,const char  *rhs);
-  // greater than > operator overloaded
 
+  /// greater than >= operator overloaded
   friend ASNMP_Export bool operator>=( const OctetStr &lhs,const char  *rhs);
-  // greater than >= operator overloaded
 
+  /// append operator, appends a string
   OctetStr& operator+=( const char  *a);
-  // append operator, appends a string
 
+  /// appends an int
   OctetStr& operator+=( const char c);
-  // appends an int
 
+  /// append one octetStr to another
   OctetStr& operator+=( const OctetStr& octetstr);
-  // append one octetStr to another
 
+  /// for non const [], allows reading and writing
   SmiBYTE& operator[]( int position);
-  // for non const [], allows reading and writing
 
+  /**
+   * compare the n leftmost bytes (left-to-right)
+   * returns 0, equal
+   * returns -1, <
+   * returns 1 , >
+   */
   int left_comparison( const long n, const OctetStr &o) const;
-  // compare the n leftmost bytes (left-to-right)
-  // returns 0, equal
-  // returns -1, <
-  // returns 1 , >
 
+  /// return the len of the oid
   size_t length() const ;
-  // return the len of the oid
 
+  /// returns validity
   int valid() const;
-  // returns validity
 
+  /// returns pointer to internal data
   SmiBYTE *data() const;
-  // returns pointer to internal data
 
+  /// get a printable ASCII value
   const char *to_string();
-  // get a printable ASCII value
 
+  /// get an ASCII formattted hex dump of the contents
   const char *to_string_hex();
-  // get an ASCII formattted hex dump of the contents
 
+  /// create a new instance of this Value
   SnmpSyntax  *clone() const;
-  // create a new instance of this Value
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
 protected:
   //----[ instance variables ]
diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h
index 7de02013ef4..77118b518f0 100644
--- a/ASNMP/asnmp/oid.h
+++ b/ASNMP/asnmp/oid.h
@@ -1,29 +1,25 @@
-// -*-C++-*-
 
-// $Id$
 
 #ifndef OID_CLS_
 #define OID_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    oid.h
-//
-// = DESCRIPTION
-// This class is fully contained and does not rely on or any other
-// SNMP libraries. This class is portable across any platform
-// which supports C++. Ported to ACE by Mike MacFaden mrm@cisco.com
-// and modified for MT. Some API cleanup: collapse constructors,
-// add suboid() method remove unnecessary overload, and update a few
-// names and types to improve clarity.
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    oid.h
+ *
+ *  $Id$
+ *
+ * This class is fully contained and does not rely on or any other
+ * SNMP libraries. This class is portable across any platform
+ * which supports C++. Ported to ACE by Mike MacFaden mrm@cisco.com
+ * and modified for MT. Some API cleanup: collapse constructors,
+ * add suboid() method remove unnecessary overload, and update a few
+ * names and types to improve clarity.
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -49,122 +45,129 @@
 
 #include "asnmp/smival.h"                // derived class for all values
 
-class ASNMP_Export Oid: public  SnmpSyntax
-  // = TITLE
-  //      Implement RFC 1155 Object Identifier (OID) datatype
+/**
+ * @class Oid
+ *
+ * @brief Implement RFC 1155 Object Identifier (OID) datatype
+ */
+class ASNMP_Export Oid : public  SnmpSyntax
 {
 public:
+  /// constructor using a dotted string
   Oid( const char * dotted_oid_string = "", size_t size = unsigned(-1) );
-  // constructor using a dotted string
 
+  /// constructor using another oid object
   Oid ( const Oid &oid);
-  // constructor using another oid object
 
+  /// constructor from raw form
   Oid(const unsigned long *raw_oid, size_t oid_len);
-  // constructor from raw form
 
+  /// destructor
   ~Oid();
-  // destructor
 
+  /// syntax type
   SmiUINT32 get_syntax();
-  // syntax type
 
+  /// assignment to another oid object overloaded
   Oid& operator=( const Oid &oid);
-  // assignment to another oid object overloaded
 
+  /// equal operator overloaded
   friend ASNMP_Export bool operator==( const Oid &lhs,const Oid &rhs);
-  // equal operator overloaded
 
+  /// not equal operator overloaded
   friend ASNMP_Export bool operator!=( const Oid &lhs,const Oid &rhs);
-  // not equal operator overloaded
 
+  /// less than < overloaded
   friend ASNMP_Export bool operator<( const Oid &lhs,const Oid &rhs);
-  // less than < overloaded
 
+  /// less than <= overloaded
   friend ASNMP_Export bool operator<=( const Oid &lhs,const Oid &rhs);
-  // less than <= overloaded
 
+  /// greater than > overloaded
   friend ASNMP_Export bool operator>( const Oid &lhs,const Oid &rhs);
-  // greater than > overloaded
 
+  /// greater than >= overloaded
   friend ASNMP_Export bool operator>=( const Oid &lhs,const Oid &rhs);
-  // greater than >= overloaded
 
+  /// append operator, appends a string
   Oid& operator+=( const char *a);
-  // append operator, appends a string
 
+  /// appends an int
   Oid& operator+=( const unsigned long i);
-  // appends an int
 
+  /// appends an Oid
   Oid& operator+=( const Oid &o);
-  // appends an Oid
 
+  /// allows element access
   unsigned long & operator[]( size_t position);
-  // allows element access
 
+  /// return the WinSnmp oid part
   SmiLPOID oidval();
-  // return the WinSnmp oid part
 
+  /// reset the data from raw 1 byte format
   void set_data( const char *dotted_oid_string);
-  // reset the data from raw 1 byte format
 
+  /// reset the data from raw 4byte integer format
   void set_data( const unsigned long *raw_oid, const size_t oid_len);
-  // reset the data from raw 4byte integer format
 
+  /// return the len of the oid
   size_t length() const;
-  // return the len of the oid
 
+  /// trim off the n rightmost values of an oid
   void trim( const size_t how_many = 1);
-  // trim off the n rightmost values of an oid
 
+  /// the equivalent of a substr(new_str, 0, 1)
   int suboid(Oid& oid, size_t start = 0, size_t how_many = size_t (-1));
-  // the equivalent of a substr(new_str, 0, 1)
 
+  /**
+   * compare the n leftmost bytes (left-to-right)
+   * returns 0, equal
+   * returns -1, <
+   * returns 1 , >
+   */
   int left_comparison( const unsigned long n, const Oid &o) const;
-  // compare the n leftmost bytes (left-to-right)
-  // returns 0, equal
-  // returns -1, <
-  // returns 1 , >
 
 
+  /**
+   * compare the n rightmost bytes (right-to-left)
+   * returns 0, equal
+   * returns -1, <
+   * returns 1 , >
+   */
   int right_comparison( const unsigned long n, const Oid &o) const;
-  // compare the n rightmost bytes (right-to-left)
-  // returns 0, equal
-  // returns -1, <
-  // returns 1 , >
 
+  /// is the Oid object valid
   int valid() const;
-  // is the Oid object valid
 
+  /// return dotted string value from the right
+  /// where the user specifies how many positions to print
   const char *to_string();
-  // return dotted string value from the right
-  // where the user specifies how many positions to print
 
+  /// create a new instance of this Value
   SnmpSyntax *clone() const;
-  // create a new instance of this Value
 
+  /// copy an instance of this Value
   SnmpSyntax& operator=( SnmpSyntax &val);
-  // copy an instance of this Value
 
 protected:
+  /// used for returning oid string
   char *iv_str;
-  // used for returning oid string
 
+  /// convert a string to an smi oid
   int StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many_bytes);
-  // convert a string to an smi oid
 
+  /// clone an smi oid
   int OidCopy(  SmiLPOID srcOid, SmiLPOID dstOid, size_t& how_many_bytes);
-  // clone an smi oid
 
+  /// convert an smi oid to its string representation
   int OidToStr(SmiLPOID srcOid, SmiUINT32 size, char *string,  size_t& how_many_bytes);
-  // convert an smi oid to its string representation
 
   private:
+    /// release memory, re-init data members
     void set_invalid();
-    // release memory, re-init data members
 
+    /// initialize object data members
     void set_null();
-    // initialize object data members
     void init_value( const SmiLPOID srcOid, size_t len);
     void init_value(const unsigned long *raw_oid, size_t oid_len);
 };
diff --git a/ASNMP/asnmp/oid_def.h b/ASNMP/asnmp/oid_def.h
index bdf46ec4f88..31ccbfa3e4a 100644
--- a/ASNMP/asnmp/oid_def.h
+++ b/ASNMP/asnmp/oid_def.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef OID_DEF
 #define OID_DEF
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    address.cpp
-//
-// = DESCRIPTION
-//   Well known Oids defined in RFC 1215
-//
-// = AUTHOR
-//    Peter E Mellquist
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    oid_def.h
+ *
+ *  $Id$
+ *
+ * Well known Oids defined in RFC 1215
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
 
   Copyright (c) 1996
diff --git a/ASNMP/asnmp/pdu.h b/ASNMP/asnmp/pdu.h
index cf2f3ee8aaf..a2d84388da0 100644
--- a/ASNMP/asnmp/pdu.h
+++ b/ASNMP/asnmp/pdu.h
@@ -1,23 +1,21 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef PDU_CLS_
 #define PDU_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//     pdu.h
-//
-// = DESCRIPTION
-// Pdu class definition. Encapsulation of an SMI Protocol
-// Data Unit (PDU) aka Packet in C++.
-//
-// = AUTHOR
-//    Peter E Mellquist  original code
-//    Michael MacFaden  mrm@cisco.com  ACE port, add iterator class for pdus
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     pdu.h
+ *
+ *  $Id$
+ *
+ * Pdu class definition. Encapsulation of an SMI Protocol
+ * Data Unit (PDU) aka Packet in C++.
+ *
+ *
+ *  @author Peter E Mellquist  original code Michael MacFaden  mrm@cisco.com  ACE port
+ *  @author add iterator class for pdus
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -40,173 +38,181 @@
 #define MAX_VBS 25
 #include "asnmp/vb.h"         // include Vb class definition
 
+/**
+ * @class Pdu
+ *
+ * @brief Protocol Data Unit (PDU) concrete class. An abstraction of the
+ * data packet used to by two SNMP sessions to communicate.
+ */
 class ASNMP_Export Pdu
-  // = TITLE
-  //      Protocol Data Unit (PDU) concrete class. An abstraction of the
-  //      data packet used to by two SNMP sessions to communicate.
 {
 public:
+  /// constructor no args
   Pdu( void);
-  // constructor no args
 
+  /// constructor with vbs and count
   Pdu( Vb* pvbs, const int pvb_count);
-  // constructor with vbs and count
 
+  /// constructor with another Pdu instance
   Pdu( const Pdu &pdu);
-  // constructor with another Pdu instance
 
+  /// destructor
   ~Pdu();
-  // destructor
 
+  /// assignment to another Pdu object overloaded
   Pdu& operator=( const Pdu &pdu);
-  // assignment to another Pdu object overloaded
 
+  /// append a vb to the pdu
   Pdu& operator+=( Vb &vb);
-  // append a vb to the pdu
 
   // TODO: add Pdu& operator-=(const Vb &vb);
 
+  /// extract all Vbs from Pdu
   int get_vblist( Vb* pvbs, const int pvb_count);
-  // extract all Vbs from Pdu
 
+  /// deposit all Vbs to Pdu
   int set_vblist( Vb* pvbs, const int pvb_count);
-  // deposit all Vbs to Pdu
 
+  /// get a particular vb
+  /// where 0 is the first vb
   int get_vb( Vb &vb, const int index = 0) const;
-  // get a particular vb
-  // where 0 is the first vb
 
+  /// set a particular vb
+  /// where 0 is the first vb
   int set_vb( Vb &vb, const int index);
-  // set a particular vb
-  // where 0 is the first vb
 
+  /// return number of vbs
   int get_vb_count() const;
-  // return number of vbs
 
+  /// return the error status
   int get_error_status() const;
-  // return the error status
 
+  /// return the complete error info from this pdu
   const char *agent_error_reason();
-  // return the complete error info from this pdu
 
+  /// set the error status
   friend ASNMP_Export void set_error_status( Pdu *pdu, const int status);
-  // set the error status
 
+  /// return the error index
   int get_error_index() const;
-  // return the error index
 
+  /// set the error index
   friend ASNMP_Export void set_error_index( Pdu *pdu, const int index);
-  // set the error index
 
+  /// clear error status
   friend ASNMP_Export void clear_error_status( Pdu *pdu);
-  // clear error status
 
+  /// clear error index
   friend ASNMP_Export void clear_error_index( Pdu *pdu);
-  // clear error index
 
+  /// return the request id
   unsigned long get_request_id() const;
-  // return the request id
 
+  /// set the request id
   friend void set_request_id( Pdu *pdu, const unsigned long rid);
-  // set the request id
 
+  /// get the pdu type
   unsigned short get_type() const;
-  // get the pdu type
 
+  /// set the pdu type
   void set_type( unsigned short type);
-  // set the pdu type
 
+  /// returns validity of Pdu instance
   int valid() const;
-  // returns validity of Pdu instance
 
+  /// trim off count vbs from the end of the vb list
   int trim(const int count=1);
-  // trim off count vbs from the end of the vb list
 
+  /// delete a Vb anywhere within the Pdu
   int delete_vb( const int position);
-  // delete a Vb anywhere within the Pdu
 
+  /// delete_all vbs in pdu
   void delete_all_vbs();
-  // delete_all vbs in pdu
 
+  /// set notify timestamp
   void set_notify_timestamp( const TimeTicks & timestamp);
-  // set notify timestamp
 
+  /// get notify timestamp
   void get_notify_timestamp( TimeTicks & timestamp) const;
-  // get notify timestamp
 
+  /// set the notify id
   void set_notify_id( const Oid id);
-  // set the notify id
 
+  /// get the notify id
   void get_notify_id( Oid &id) const;
-  // get the notify id
 
+  /// set the notify enterprise
   void set_notify_enterprise( const Oid &enterprise);
-  // set the notify enterprise
 
+  /// get the notify enterprise
   void get_notify_enterprise( Oid & enterprise) const;
-  // get the notify enterprise
 
+  /// return fomatted version of this object
   const char *to_string();
-  // return fomatted version of this object
 
 
   protected:
+    /// pointer to array of Vbs
     Vb *vbs_[MAX_VBS];
-    // pointer to array of Vbs
 
+    /// count of Vbs
     int vb_count_;
-    // count of Vbs
 
+    /// SMI error status
     int error_status_;
-    // SMI error status
 
+    /// SMI error index
     int error_index_;
-    // SMI error index
 
+    /// valid boolean status of object construction
+    /// SMI request id
     int validity_;
-    // valid boolean status of object construction
     unsigned long request_id_;
-    // SMI request id
 
+    /// derived at run time based on request type
     unsigned short pdu_type_;
-    // derived at run time based on request type
 
+    /**
+     * a timestamp associated with an infor
+     * for notify Pdu objects only
+     * traps & notifies
+     */
     TimeTicks notify_timestamp_;
-    // a timestamp associated with an infor
-    // for notify Pdu objects only
-    // traps & notifies
 
+    /// an id
     Oid notify_id_;
-    // an id
 
     Oid notify_enterprise_;
 
    private:
+   /// buffer for to_string()
    char *output_;
-   // buffer for to_string()
 };
 
 
+/**
+ * @class VbIter
+ *
+ * @brief Utility class to iterate once through a PDU varbind list
+ */
 class ASNMP_Export VbIter
-  // = TITLE
-  //      Utility class to iterate once through a PDU varbind list
 {
    public:
+   /// default constructor
    VbIter(Pdu& pdu);
-   // default constructor
 
+   /// returns 1 if ok, else 0 if none left
    int next(Vb& vb);
-   // returns 1 if ok, else 0 if none left
 
   private:
+   /// disallow copy constructor use
    VbIter(const VbIter&);
-   // disallow copy constructor use
 
+   /// current object in list
    int idx_;
-   // current object in list
 
+   /// ptr to pdu being interated over
    Pdu *pdu_;
-   // ptr to pdu being interated over
 };
 
 #endif //PDU_CLS_
diff --git a/ASNMP/asnmp/sagent.h b/ASNMP/asnmp/sagent.h
index ced6bb4fff5..d220c3ed459 100644
--- a/ASNMP/asnmp/sagent.h
+++ b/ASNMP/asnmp/sagent.h
@@ -1,24 +1,20 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SAGENT_CLS_
 #define SAGENT_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    sagent.h
-//
-// = DESCRIPTION
-//   SNMP agent class defintion. The sagent class provides an object oriented
-//   approach for creating SNMP Agents. The sagent class is an encapsulation of SNMP
-//   sessions, gets, sets, etc.
-//
-// = AUTHOR
-//    Michael R. MacFaden
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    sagent.h
+ *
+ *  $Id$
+ *
+ * SNMP agent class defintion. The sagent class provides an object oriented
+ * approach for creating SNMP Agents. The sagent class is an encapsulation of SNMP
+ * sessions, gets, sets, etc.
+ *
+ *  @author Michael R. MacFaden
+ */
+//=============================================================================
+
 #include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -39,10 +35,13 @@
 
 #define DEF_AGENT_PORT (161)
 
+/**
+ * @class sagent
+ *
+ * @brief Concrete class sagent defines the session and interface to
+ * communicate with another SNMP Version 1 manager
+ */
 class ASNMP_Export sagent : public ACE_Event_Handler, private Snmp
-  // = TITLE
-  //      Concrete class sagent defines the session and interface to
-  //      communicate with another SNMP Version 1 manager
 {
  public:
 
@@ -50,24 +49,24 @@ class ASNMP_Export sagent : public ACE_Event_Handler, private Snmp
     // override the next three methods (callbacks) to implment your agent
     //
 
+    /// retrieve data from a peer agent for a given list of oid values
     virtual int handle_get( Pdu &pdu, UdpTarget &target) = 0;
-    // retrieve data from a peer agent for a given list of oid values
 
+    /// retrieve data lexically adjacent to the oids specified in the pdu
+    /// from the peer agent
     virtual int handle_get_next( Pdu &pdu, UdpTarget &target) = 0;
-    // retrieve data lexically adjacent to the oids specified in the pdu
-    // from the peer agent
 
+    /// set data in the agent from the list of oids in the pdu
     virtual int handle_set( Pdu &pdu, UdpTarget &target) = 0;
-    // set data in the agent from the list of oids in the pdu
 
+    /// new pdu received from mgr (reactor calls this)
     virtual int handle_input(ACE_HANDLE);
-    // new pdu received from mgr (reactor calls this)
 
+    /// retrieve io descriptor (reactor uses this)
     virtual ACE_HANDLE get_handle() const;
-    // retrieve io descriptor (reactor uses this)
 
+    /// send a response pdu to the mgr
     int respond(Pdu& pdu, UdpTarget& tgt);
-    // send a response pdu to the mgr
 
  protected:
     sagent(unsigned short port = DEF_AGENT_PORT);
diff --git a/ASNMP/asnmp/smi.h b/ASNMP/asnmp/smi.h
index 4fac7f8c1bc..3e505c64cb8 100644
--- a/ASNMP/asnmp/smi.h
+++ b/ASNMP/asnmp/smi.h
@@ -1,23 +1,17 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SMIDEF_
 #define SMIDEF_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    smi.h
-//
-// = DESCRIPTION
-// Address class definition. Encapsulates various network
-// addresses into easy to use, safe and portable classes.
-//
-// = AUTHOR
-//    ??
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    smi.h
+ *
+ *  $Id$
+ *
+ * Address class definition. Encapsulates various network
+ * addresses into easy to use, safe and portable classes.
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
diff --git a/ASNMP/asnmp/smival.h b/ASNMP/asnmp/smival.h
index c8bd6b8a5c9..e754206f506 100644
--- a/ASNMP/asnmp/smival.h
+++ b/ASNMP/asnmp/smival.h
@@ -1,24 +1,20 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SMIVALUE_
 #define SMIVALUE_
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    smival.h
-//
-// = DESCRIPTION
-// SMIValue class definition. Superclass for the various types
-// of SNMP values (Address, Oid, Octet, etc.).  Provides
-// only a few functions, most info is in subclass.
-//
-// = AUTHOR
-// Jeff Meyer
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    smival.h
+ *
+ *  $Id$
+ *
+ * SMIValue class definition. Superclass for the various types
+ * of SNMP values (Address, Oid, Octet, etc.).  Provides
+ * only a few functions, most info is in subclass.
+ *
+ *
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
diff --git a/ASNMP/asnmp/snmp.h b/ASNMP/asnmp/snmp.h
index c46e9d078ce..5bae232baa0 100644
--- a/ASNMP/asnmp/snmp.h
+++ b/ASNMP/asnmp/snmp.h
@@ -1,26 +1,23 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SNMP_CLS_
 #define SNMP_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    snmp.h
-//
-// = DESCRIPTION
-//   SNMP class defintion. The Snmp class provides an object oriented
-//   approach to SNMP. The SNMP class is an encapsulation of SNMP
-//   sessions, gets, sets, etc. The class manages all SNMP
-//   resources and provides complete retry and timeout capability.
-//
-// = AUTHOR
-//    Peter E Mellquist  design, first implementation
-//    Michael R. MacFaden port to ACE / use Reactor pattern
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    snmp.h
+ *
+ *  $Id$
+ *
+ * SNMP class defintion. The Snmp class provides an object oriented
+ * approach to SNMP. The SNMP class is an encapsulation of SNMP
+ * sessions, gets, sets, etc. The class manages all SNMP
+ * resources and provides complete retry and timeout capability.
+ *
+ *
+ *  @author Peter E Mellquist  design
+ *  @author first implementation Michael R. MacFaden port to ACE / use Reactor pattern
+ */
+//=============================================================================
+
 /*===================================================================
    Copyright (c) 1996
    Hewlett-Packard Company
@@ -63,10 +60,13 @@ class ASNMP_Export Snmp_Result
 };
 
 // Snmp session class - supports Version 1 operations in blocking mode
+/**
+ * @class Snmp
+ *
+ * @brief Concrete class Snmp defined the session and interface to
+ * communicate with another SNMP Version 1 agent
+ */
 class ASNMP_Export Snmp : public transaction_result
-  // = TITLE
-  //      Concrete class Snmp defined the session and interface to
-  //      communicate with another SNMP Version 1 agent
 {
   Snmp_Result * result_;
   Pdu * pdu_;
@@ -75,39 +75,41 @@ public:
   Snmp(unsigned short port = INADDR_ANY);
   virtual ~Snmp();
 
+  /// retrieve data from a peer agent for a given list of oid values
+  /// default port 161
   int get( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0);
-  // retrieve data from a peer agent for a given list of oid values
-  // default port 161
 
+  /**
+   * retrieve data lexically adjacent to the oids specified in the pdu
+   * from the peer agent
+   * default port 161
+   */
   int get_next( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0);
-  // retrieve data lexically adjacent to the oids specified in the pdu
-  // from the peer agent
-  // default port 161
 
+  /// set data in the agent from the list of oids in the pdu
+  /// default port 161
   int set( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0);
-  // set data in the agent from the list of oids in the pdu
-  // default port 161
 
+  /// send an SNMPv1 trap (unreliable) to a remote system (def port 162)
   int trap( Pdu &pdu, UdpTarget &target);
-  // send an SNMPv1 trap (unreliable) to a remote system (def port 162)
 
+  /// status of object after construction
   int valid() const;
-  // status of object after construction
 
+  /// given error code, return string reason
   static const char * error_string(int code);
-  // given error code, return string reason
 
+  /// retrieve a reason string if any of the above commands fail
   const char * error_string();
-  // retrieve a reason string if any of the above commands fail
 
+  /// for async transaction results
   void result(transaction * t, int rc);
-  // for async transaction results
 
+  /// allow the host name to be overriden
   static void override_host_name(const char* name);
-  // allow the host name to be overriden
 
+  /// returns the overriden host name
   static void get_host_name(char* name, int len);
-  // returns the overriden host name
 
 protected:
   void check_default_port(UdpTarget& target,unsigned short port=DEF_AGENT_PORT);
@@ -117,17 +119,17 @@ protected:
 
   Snmp(const Snmp&);
 
+  /// io object
   ACE_SOCK_Dgram iv_snmp_session_;
-  // io object
 
+  /// status of construction
   int construct_status_;
-  // status of construction
 
+  /// result code from last transaction
   int last_transaction_status_;
-  // result code from last transaction
 
+  /// transaction request id
   unsigned req_id_;
-  // transaction request id
 
   static char host_name_[MAXHOSTNAMELEN];
 };
diff --git a/ASNMP/asnmp/snmperrs.h b/ASNMP/asnmp/snmperrs.h
index 08a4997217e..7aafdc0619a 100644
--- a/ASNMP/asnmp/snmperrs.h
+++ b/ASNMP/asnmp/snmperrs.h
@@ -1,22 +1,18 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef SNMPERRS_H_
 #define SNMPERRS_H_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    snmperrs.h
-//
-// = DESCRIPTION
-// Definition of error macros and error strings
-//
-// = AUTHOR
-//  Jeff Meyer
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    snmperrs.h
+ *
+ *  $Id$
+ *
+ * Definition of error macros and error strings
+ *
+ *
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
diff --git a/ASNMP/asnmp/target.h b/ASNMP/asnmp/target.h
index 1a42cb75b37..084088e5f4f 100644
--- a/ASNMP/asnmp/target.h
+++ b/ASNMP/asnmp/target.h
@@ -1,23 +1,19 @@
-// -*-C++-*-
 
-// $Id$
 
 #ifndef TARGET_
 #define TARGET_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    target.h
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//    Peter E Mellquist
-//    Michael R. MacFaden (ported to ACE)
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    target.h
+ *
+ *  $Id$
+ *
+ *  @brief
+ *
+ *  @author Peter E Mellquist Michael R. MacFaden (ported to ACE)
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -70,173 +66,183 @@ enum ASNMP_Defs {
 
 // Abstract class used to provide a virtual interface into Targets
 //
+/**
+ * @class SnmpTarget
+ *
+ * @brief Abstract Base class SnmpTarget is used to Collect all transmission
+ * details to communicate with an SNMP
+ */
 class ASNMP_Export SnmpTarget
-  // = TITLE
-  //      Abstract Base class SnmpTarget is used to Collect all transmission
-  //      details to communicate with an SNMP
 {
  public:
 
+    /// allow destruction of derived classes
     virtual ~SnmpTarget();
-    // allow destruction of derived classes
 
+    /// return validity of target
     int valid() const;
-    // return validity of target
 
+    /// set the retry value
     void set_retry( const int r);
-    // set the retry value
 
+    /// set the object's timeout (in seconds)
     void set_timeout( const unsigned long t);
-    // set the object's timeout (in seconds)
 
+    /// set the instance version
     void set_version( const snmp_version v);
-    // set the instance version
 
+    /// all classes constructed will have this write community string
     void set_max_pdu_size(const unsigned long max_pdu_sz);
-    // all classes constructed will have this write community string
 
+    /// change the "class" default default timeout (in seconds)
     void set_default_timeout( const unsigned long t);
-    // change the "class" default default timeout (in seconds)
 
+    /// change the default send retries
     void set_default_retry( const int r);
-    // change the default send retries
 
+    /// all classes constructed will have this write community string
     void set_default_max_pdu_size(const unsigned long max_pdu_sz);
-    // all classes constructed will have this write community string
 
+    /// change class default
     void set_default_version( const snmp_version v);
-    // change class default
 
     // *** get methods ***
 
+    /// get the retry value
     int get_default_retry() const;
-    // get the retry value
 
+    /// get the timeout (seconds)
     unsigned long get_timeout() const;
-    // get the timeout (seconds)
 
+    /// get instance max buffer size
     unsigned long get_max_pdu_size() const;
-    // get instance max buffer size
 
+    /// all classes constructed will have this write community string
     void get_default_max_pdu_size(const unsigned long max_pdu_sz);
-    // all classes constructed will have this write community string
 
+    /// get the version
     snmp_version get_version() const;
-    // get the version
 
     snmp_version get_default_version() const;
 
+    /// return send retry number for this instancd
     int get_retry() const;
-    // return send retry number for this instancd
 
+    /**
+     * virtual clone operation for creating a new SnmpTarget from an existing
+     * SnmpTarget.  The caller MUST use the delete operation on the return
+     * value when done.
+     */
     virtual SnmpTarget *clone() const = 0;
-    // virtual clone operation for creating a new SnmpTarget from an existing
-    // SnmpTarget.  The caller MUST use the delete operation on the return
-    // value when done.
 
+   /// manipulate the base part
    friend bool operator==(const SnmpTarget& lhs, const SnmpTarget& rhs);
-   // manipulate the base part
 
    SnmpTarget& operator=(const SnmpTarget& lhs);
 
    protected:
+     ///     SnmpTarget(const SnmpTarget &);
      SnmpTarget();
-     //     SnmpTarget(const SnmpTarget &);
 
+    /// used by derived class instances
     int validity_;
-    // used by derived class instances
 
+    /// instance value xmit timeout in milli secs
     unsigned long timeout_;
-    // instance value xmit timeout in milli secs
 
+    /// instance value number of retries
     int retries_;
-    // instance value number of retries
 
+    /// size of pdu
     unsigned max_pdu_size_;
-    // size of pdu
 
+    /// instance value the snmp version
     snmp_version version_;
-    // instance value the snmp version
 
     // class wide default values
+    /// xmit timeout in secs
     static unsigned long default_timeout_;
-    // xmit timeout in secs
 
+    /// number of retries
     static int default_retries_;
-    // number of retries
 
+    /// snmp protocol version
     static unsigned long default_max_pdu_size_;
     static snmp_version default_version_;
-    // snmp protocol version
 };
 
 //----[  UdpTarget class ]----------------------------------------------
 // UDP/IP transport using "community string" based agents  (targets)
 //
-class ASNMP_Export UdpTarget: public SnmpTarget
-  // = TITLE
-  //      Concrete class UdpTarget contains all Details for communicating
-  //      with a SNMPv1 agent over UDP/IPv4 transport
+/**
+ * @class UdpTarget
+ *
+ * @brief Concrete class UdpTarget contains all Details for communicating
+ * with a SNMPv1 agent over UDP/IPv4 transport
+ */
+class ASNMP_Export UdpTarget : public SnmpTarget
 {
   public:
     UdpTarget();
 
+    /**
+     * constructor with only address
+     * assumes default as public, public
+     * can be constructed with IP address object
+     */
     UdpTarget( const UdpAddress& udp);
-    // constructor with only address
-    // assumes default as public, public
-    // can be constructed with IP address object
 
+    /// can be constructed with Udp address object TODO: merge addresses
     UdpTarget( ACE_INET_Addr& ace_inet_addr);
-    // can be constructed with Udp address object TODO: merge addresses
 
+    /// destructor
     ~UdpTarget();
-    // destructor
 
     // ** set ***
 
+    /// set the read community using an OctetStr
     void set_read_community( const OctetStr& new_read_community);
-    // set the read community using an OctetStr
 
+    /// set the write community using an OctetStr
     void set_write_community( const OctetStr& write_community);
-    // set the write community using an OctetStr
 
+    /// set the address
     int set_address( UdpAddress &udp_address);
-    // set the address
 
     // ** get ***
 
+    /// get the read community as an Octet Str object
     void get_read_community( OctetStr& read_community_oct) const;
-    // get the read community as an Octet Str object
 
+    /// get the write community as an OctetStr
     void get_write_community( OctetStr &write_community_oct) const;
-    // get the write community as an OctetStr
 
+    /// get the address
     void get_address( UdpAddress& address) const;
-    // get the address
 
+    /// all classes constructed will have this read community string
     void set_default_read_community(const OctetStr& rd_community);
-    // all classes constructed will have this read community string
 
+    /// all classes constructed will have this write community string
     void set_default_write_community(const OctetStr& wr_community);
-    // all classes constructed will have this write community string
 
+    /// all classes constructed will have this read community string
     void get_default_read_community(OctetStr& rd_community) const;
-    // all classes constructed will have this read community string
 
+    /// all classes constructed will have this write community string
     void get_default_write_community(OctetStr& wr_community) const;
-    // all classes constructed will have this write community string
 
+    /// overloaded assignment
     UdpTarget& operator=( const UdpTarget& target);
-    // overloaded assignment
 
+    /// compare two C targets
     friend bool operator==( const UdpTarget &lhs, const UdpTarget &rhs);
-    // compare two C targets
 
+    /// string representation of object
     const char *to_string();
-    // string representation of object
 
+    /// clone from existing UdpTarget
     SnmpTarget *clone() const;
-    // clone from existing UdpTarget
 
   protected:
     static OctetStr default_rd_community_;
@@ -246,8 +252,8 @@ class ASNMP_Export UdpTarget: public SnmpTarget
     UdpAddress udp_address_;
     snmp_version version_;
 
+    /// to_string() rep of data
     char output_buffer_[MAX_TARGET_STRING_REP];
-    // to_string() rep of data
 };
 
 
diff --git a/ASNMP/asnmp/timetick.h b/ASNMP/asnmp/timetick.h
index 9de4687a832..ca52a3e1d9d 100644
--- a/ASNMP/asnmp/timetick.h
+++ b/ASNMP/asnmp/timetick.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef TIMETICKS_
 #define TIMETICKS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//     timetick.h
-//
-// = DESCRIPTION
-//   Class definition for SMI Timeticks class.
-//
-// = AUTHOR
-//    Michael R. MacFaden <mrm@cisco.com>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     timetick.h
+ *
+ *  $Id$
+ *
+ * Class definition for SMI Timeticks class.
+ *
+ *
+ *  @author Michael R. MacFaden <mrm@cisco.com>
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -42,44 +39,47 @@
 // integers but is recognized as a distinct SMI type. TimeTicks
 // objects may be get or set into Vb objects.
 //
-class ASNMP_Export TimeTicks: public SnmpUInt32
-  // = TITLE
-  //      Define RFC1155 TimeTicks Data object
+/**
+ * @class TimeTicks
+ *
+ * @brief Define RFC1155 TimeTicks Data object
+ */
+class ASNMP_Export TimeTicks : public SnmpUInt32
 
 {
 
   public:
      TimeTicks( const unsigned long i = 0);
 
+     /// copy constructor
      TimeTicks( const TimeTicks &t);
-     // copy constructor
 
+     /// destructor
      ~TimeTicks();
-     // destructor
 
+     /// syntax type
      SmiUINT32 get_syntax();
-     // syntax type
 
+     /// get a printable ASCII value
      const char *to_string();
-     // get a printable ASCII value
 
+     /// create a new instance of this Value
      SnmpSyntax *clone() const;
-     // create a new instance of this Value
 
+     /// copy an instance of this Value
      SnmpSyntax& operator=(SnmpSyntax &val);
-     // copy an instance of this Value
 
+     /// overloaded assignment
      TimeTicks& operator=( const TimeTicks &uli);
-     // overloaded assignment
 
+     /// overloaded assignment
      TimeTicks& operator=( const unsigned long int i);
-     // overloaded assignment
 
+     /// otherwise, behave like an unsigned long
      operator unsigned long();
-     // otherwise, behave like an unsigned long
 
   protected:
+    /// for storing printed form
     char output_buffer[TICKOUTBUF];
-    // for storing printed form
 };
 #endif // TIMETICKS_
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp
index 2964ff8a1f2..2f29cf79544 100644
--- a/ASNMP/asnmp/transaction.cpp
+++ b/ASNMP/asnmp/transaction.cpp
@@ -106,7 +106,7 @@ int transaction::run(transaction_result * r)
     retry_counter_ = 0;
 
     // register a time handler and a socket with this
-    ACE_Time_Value to = params_.get_timeout();
+    ACE_Time_Value to (params_.get_timeout());
     if (reactor->schedule_timer(this, 0, to, to) < 0)
         return SNMP_CLASS_INTERNAL_ERROR;
 
@@ -122,19 +122,18 @@ int transaction::handle_input (ACE_HANDLE)
   delete [] (char*) receive_iovec_.iov_base;
   reset_receive_buffer(receive_iovec_);
   int rc = session_.recv(&receive_iovec_, receive_addr_, 0);
-  if (rc == -1) {
+  if (rc == -1)
+    {
       delete [] (char*) receive_iovec_.iov_base;
       reset_receive_buffer(receive_iovec_);
       if (result_)
-          result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL);
+        result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL);
       return SNMP_CLASS_RESOURCE_UNAVAIL;
-  }
+    }
   if (result_)
-  {
-      result_->result(this, rc);
-      return 0;
-  }
-  return rc;
+    result_->result(this, rc);
+
+  return 0;
 }
 
 int transaction::handle_timeout(const ACE_Time_Value &,
@@ -201,8 +200,8 @@ int transaction::send()
 
 transaction_result::~transaction_result() {}
 
-ACE_HANDLE 
-transaction::get_handle () const 
+ACE_HANDLE
+transaction::get_handle () const
 {
   return session_.get_handle ();
 }
diff --git a/ASNMP/asnmp/transaction.h b/ASNMP/asnmp/transaction.h
index 98d5890913e..d114bd40d1f 100644
--- a/ASNMP/asnmp/transaction.h
+++ b/ASNMP/asnmp/transaction.h
@@ -1,21 +1,18 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef TRANSACTION_
 #define TRANSACTION_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    transaction.h
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//    Michael R. MacFaden port to ACE / use Reactor pattern
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    transaction.h
+ *
+ *  $Id$
+ *
+ *  @brief 
+ *
+ *  @author Michael R. MacFaden port to ACE / use Reactor pattern
+ */
+//=============================================================================
+
 
 #include "ace/Event_Handler.h"
 
@@ -29,48 +26,51 @@
 #include "asnmp/wpdu.h"         // cmu adapter class
 #include "ace/SOCK_Dgram.h"
 
+/**
+ * @class transaction
+ *
+ * @brief Used to manage the details of a particular transaction betwen
+ * two SNMP agents. Uses SnmpTarget class to implement retry/timeout
+ */
 class ASNMP_Export transaction : public ACE_Event_Handler
-  // = TITLE
-  //      Used to manage the details of a particular transaction betwen
-  //       two SNMP agents. Uses SnmpTarget class to implement retry/timeout
 
 {
   int retry_counter_;
   transaction_result * result_;
 
 public:
+  /// constructor
+  /// destructor
   transaction(const Pdu& pdu, const UdpTarget& target, ACE_SOCK_Dgram& io);
   transaction(ACE_SOCK_Dgram& io);
-  // constructor
   ~transaction();
-  // destructor
 
+  /// begin polling for values
   int run();
   int run(transaction_result *r); // Async interface, with callback object
-  // begin polling for values
 
+  /// return pdu with result from agent after run() is completed rc = 0
+  /// optionally get community str
   int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0);
-  // return pdu with result from agent after run() is completed rc = 0
-  // optionally get community str
 
+  /// called by reactor when data is ready to be read in from OS memory
+  /// used for resend in asynchronous run()
   virtual int handle_input (ACE_HANDLE fd);
-  // called by reactor when data is ready to be read in from OS memory
   virtual int handle_timeout (const ACE_Time_Value &, const void *);
-  // used for resend in asynchronous run()
 
+  /// transmit buffer command to network...
   int send();
-  // transmit buffer command to network...
 
+  /// pre: handle_input called
+  /// retrieve the sender's from address from the last pkt
   const ACE_INET_Addr& get_from_addr() const;
-  // pre: handle_input called
-  // retrieve the sender's from address from the last pkt
 
+  /// Return session_ handle.
   ACE_HANDLE get_handle () const;
-  // Return session_ handle.
 
 private:
+  /// disallow copy construction
   transaction(const transaction&);
-  // disallow copy construction
 
   wpdu wp_;                     // wire pdu
   UdpTarget params_;            // params
diff --git a/ASNMP/asnmp/transaction_result.h b/ASNMP/asnmp/transaction_result.h
index 7968572d19b..9ea94c60e8e 100644
--- a/ASNMP/asnmp/transaction_result.h
+++ b/ASNMP/asnmp/transaction_result.h
@@ -1,22 +1,19 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef TRANSACTION_RESULT_H_
 #define TRANSACTION_RESULT_H_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    transaction_result.h
-//
-// = DESCRIPTION
-//  An object respresenting a request/reply operation between mgr/agent
-//
-// = AUTHOR
-//    Michael R. MacFaden
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    transaction_result.h
+ *
+ *  $Id$
+ *
+ *  An object respresenting a request/reply operation between mgr/agent
+ *
+ *
+ *  @author Michael R. MacFaden
+ */
+//=============================================================================
+
 
 class transaction;
 class ASNMP_Export transaction_result
diff --git a/ASNMP/asnmp/vb.h b/ASNMP/asnmp/vb.h
index be6bdabfd37..b82adb2bc0e 100644
--- a/ASNMP/asnmp/vb.h
+++ b/ASNMP/asnmp/vb.h
@@ -1,27 +1,24 @@
-// -*-C++-*-
 
-// $Id$
 
 #ifndef VB_CLS_
 #define VB_CLS_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//     vb.h
-//
-// = DESCRIPTION
-// This module contains the class definition for the variable binding (VB)
-// class. The VB class is an encapsulation of a SNMP VB. A VB object is
-// composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid
-// objects and thus requires the Oid class. To use this class,
-// set oid, value then call valid() to be sure object was constructed correctly.
-//
-// = AUTHOR
-//   Peter E Mellquist
-// ============================================================================
+//=============================================================================
+/**
+ *  @file     vb.h
+ *
+ *  $Id$
+ *
+ * This module contains the class definition for the variable binding (VB)
+ * class. The VB class is an encapsulation of a SNMP VB. A VB object is
+ * composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid
+ * objects and thus requires the Oid class. To use this class,
+ * set oid, value then call valid() to be sure object was constructed correctly.
+ *
+ *
+ *  @author Peter E Mellquist
+ */
+//=============================================================================
+
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
@@ -65,139 +62,144 @@
 // The vb class keeps its own memory for objects and does not
 // utilize pointers to external data structures.
 //
+/**
+ * @class Vb
+ *
+ * @brief Implement the concrete Variable Bindings aka Varbind
+ * composite type. Varbinds hold 1 Oid and 1 Value (Any SMI value)
+ */
 class ASNMP_Export Vb
-  // = TITLE
-  //      Implement the concrete Variable Bindings aka Varbind
-  //      composite type. Varbinds hold 1 Oid and 1 Value (Any SMI value)
 {
 public:
+  /// constructor with no arguments
+  /// makes an vb, unitialized (does not make object valid)
   Vb( void);
-  // constructor with no arguments
-  // makes an vb, unitialized (does not make object valid)
 
+  /// constructor to initialize the oid
+  /// makes a vb with oid portion initialized (does not make object valid)
   Vb( const Oid &oid);
-  // constructor to initialize the oid
-  // makes a vb with oid portion initialized (does not make object valid)
 
+  /// constructor to initialize the oid
+  /// makes a vb with oid portion and value portion initialized, (valid)
   Vb( const Oid& vb, const SnmpSyntax &val, const SmiUINT32=SNMP_CLASS_SUCCESS);
-  // constructor to initialize the oid
-  // makes a vb with oid portion and value portion initialized, (valid)
 
+  /// copy constructor
   Vb( const Vb &vb);
-  // copy constructor
 
+  /**
+   * destructor
+   * if the vb has a oid or an octect string then
+   * the associated memory needs to be freed
+   */
   ~Vb();
-  // destructor
-  // if the vb has a oid or an octect string then
-  // the associated memory needs to be freed
 
+  /// return validity of Vb object (both oid and value set return 1 else 0)
   int valid() const;
-  // return validity of Vb object (both oid and value set return 1 else 0)
 
+  /// assignment to another Vb object overloaded
   Vb& operator=( const Vb &vb);
-  // assignment to another Vb object overloaded
 
+  /// equivlence operator overloaded
   friend ASNMP_Export bool operator==( const Vb &lhs, const Vb &rhs);
-  // equivlence operator overloaded
 
   //-----[ set oid / get oid part]------------------------------------------
 
+  /// set value oid only with another oid
   void set_oid( const Oid& oid);
-  // set value oid only with another oid
 
+  /// get oid portion
   void get_oid( Oid &oid) const;
-  // get oid portion
 
   //-----[ set value part]--------------------------------------------------
 
+  /// set a Vb null, if its not already
   void set_null();
-  // set a Vb null, if its not already
 
+  /// returns 0 on success and a value
   void set_value( const TimeTicks& ticks);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const Oid& oid);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const Counter32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const Counter64& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const Gauge32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const SnmpUInt32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   void set_value( const SnmpInt32& ctr);
-  // returns 0 on success and a value
 
+  /// get an octet string object
   void set_value( const OctetStr& oct_str);
-  // get an octet string object
 
   //----[ get value ]------------------------------------------------
 
+  /// returns 0 on success and a value
   int get_value( TimeTicks& ticks);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( Oid& oid);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( Counter32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( Counter64& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( Gauge32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( SnmpUInt32& ctr);
-  // returns 0 on success and a value
 
+  /// returns 0 on success and a value
   int get_value( SnmpInt32& ctr);
-  // returns 0 on success and a value
 
+  /// get an octet string object
   int get_value( OctetStr& oct_str);
-  // get an octet string object
 
   // escape hatch
+  /// for other derived types  that can be casted
   void set_value( const SnmpSyntax &val);
-  // for other derived types  that can be casted
 
+  /// gets a general value
   int get_value( SnmpSyntax &val);
-  // gets a general value
 
+  /// return the current syntax
+  /// Or.. if a V2 VB exception is present then return the exception value
   SmiUINT32 get_syntax();
-  // return the current syntax
-  // Or.. if a V2 VB exception is present then return the exception value
 
+  /// set the exception status
   friend ASNMP_Export void set_exception_status( Vb *vb, const SmiUINT32 status);
-  // set the exception status
 
+  /// return fomatted version of this object
   const char *to_string();
-  // return fomatted version of this object
 
+  /// returns a formatted version of the value
   const char *to_string_value();
-  // returns a formatted version of the value
 
+  /// returns a formatted version of the value
   const char *to_string_oid();
-  // returns a formatted version of the value
 
 protected:
+  /// display vb as  [ oid / value ]
   char *output_;
-  // display vb as  [ oid / value ]
 
+  /// a vb is made up of a oid
   Oid iv_vb_oid_;
-  // a vb is made up of a oid
 
+  /// and a value...
   SnmpSyntax *iv_vb_value_;
-  // and a value...
 
+  /// are there any vb exceptions??
   SmiUINT32 exception_status_;
-  // are there any vb exceptions??
 
   void free_vb();
 };
diff --git a/ASNMP/asnmp/wpdu.h b/ASNMP/asnmp/wpdu.h
index 1485560baeb..7feec356bc8 100644
--- a/ASNMP/asnmp/wpdu.h
+++ b/ASNMP/asnmp/wpdu.h
@@ -1,24 +1,21 @@
 /* -*-C++-*- */
-// $Id$
 #ifndef WPDU_H_
 #define WPDU_H_
-// ============================================================================
-//
-// = LIBRARY
-//    asnmp
-//
-// = FILENAME
-//    wpdu.h
-//
-// = DESCRIPTION
-//  Adapter class. Converts a Pdu and GenTarget into a format
-//  that can be stuffed out a I/O port
-//
-// = AUTHOR
-//   Michael R. MacFaden re-worked api, use ACE API
-//   Peter E Mellquist wrote original class snmpmsg
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    wpdu.h
+ *
+ *  $Id$
+ *
+ *  Adapter class. Converts a Pdu and GenTarget into a format
+ *  that can be stuffed out a I/O port
+ *
+ *
+ *  @author Michael R. MacFaden re-worked api
+ *  @author use ACE APIPeter E Mellquist wrote original class snmpmsg
+ */
+//=============================================================================
+
 
 #include "ace/config-all.h"
 
@@ -34,32 +31,34 @@
 // PDU / Target -> iovec buffer
 // iovec buffer -> PDU / Target
 struct snmp_pdu;
+/**
+ * @class wpdu
+ *
+ * @brief Implement an Adapter pattern between CMU SNMP and HP SNMP++
+ */
 class ASNMP_Export wpdu
-  // = TITLE
-  //      Implement an Adapter pattern between CMU SNMP and HP SNMP++
-  //
 {
 public:
 
+  /// construct CMU data from HP SNMP++ objects
+  /// construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes
   wpdu(const Pdu& pdu, const UdpTarget& target);
-  // construct CMU data from HP SNMP++ objects
   wpdu(const iovec& buffer);
-  // construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes
   wpdu(); // same as using iovec?
 
   ~wpdu();
 
+  /// constructor completed ok? rc = 1 else 0
   int valid() const;
-  // constructor completed ok? rc = 1 else 0
 
+  /// return raw data stream via CMU code
   const iovec& get_buffer() const;
-  // return raw data stream via CMU code
 
+  /// return HP SNMP++ pdu
   int get_pdu(Pdu& pdu, snmp_version& version);
-  // return HP SNMP++ pdu
 
+  /// return community strptr
   const unsigned char *get_community() const;
-  // return community strptr
 
 private:
   int convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival );
@@ -69,14 +68,14 @@ private:
   static void copy_iovec(iovec& dest, const iovec& src);
   int set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const;
 
+  /// raw format
   iovec iovec_;
-  // raw format
 
+  /// object construction state
   int valid_flag_;
-  // object construction state
 
+  /// snmp version
   snmp_version version_;
-  // snmp version
 
   unsigned char community_name[MAX_COMM_STR_LEN];
   unsigned long comm_len; // = MAX_COMM_STR_LEN;
diff --git a/COPYING b/COPYING
index 41eecbf0fc3..35b26e8f8b7 100644
--- a/COPYING
+++ b/COPYING
@@ -8,11 +8,11 @@
    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-2005, all rights reserved. Since DOC software is
-   open-source, free 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,
+   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.
    
@@ -67,9 +67,16 @@
    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.
+   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
+   2005," which established new daylight savings times (DST) rules for
+   the United States that expand DST as of March 2007. Since DOC software
+   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
diff --git a/ChangeLog b/ChangeLog
index 7479896ee5a..9c210d62fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5669 +1,300 @@
-Tue Oct 18 22:24:11 2005  Olli Savia  <ops@iki.fi>
+Mon Apr 24 17:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/TTY_IO.h:
-          Changed type of readmincharacters from int to unsigned int.
-          Fixes compile time warning.
-
-Tue Oct 18 09:53:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        From Mickael P. Golovin <migel at garant dot ru>
-        * ace/Argv_Type_Converter.cpp:
-
-          Fixed strdup()/operator delete() mismatches.  Strings allocated
-          by strdup() should be deallocated using free().
-
-Mon Oct 17 22:05:37 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Removed :: qualifiers from terminal interface
-          function calls. This should fix compile problems
-          on Cygwin.
-
-Mon Oct 17 13:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/notifytest.mpb:
-          Added notication_serv as base project, needed for collocated
-          tests
-
-Mon Oct 17 10:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FILE_IO.inl:
-          Removed some not needed c-style casts
-
-        * tests/CDR_File_Test.cpp:
-          Explicitly initialise memory with 0 when we are using a
-          profiler.
-
-Mon Oct 17 09:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Time_Value.{h,inl}:
-        * ace/UUID.cpp:
-          Fixed 64bit conversion problems. Added a to_usec method
-          to ACE_Time_Value that returns the total of sec and usec
-          as ACE_UINT64 and use that in UUID.cpp.
-          Thanks to James Megquier <jmegq at radiance dot com>.
-          This fixes bugzilla 2263
-
-Sun Oct 16 13:01:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-
-          Fix typo in last change.
-
-Sun Oct 16 12:05:45 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-netbsd.h:
-
-          Define ACE_HAS_TERMIOS.
-
-Sun Oct 16 11:59:05 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Updated tty feature checks to define ACE_HAS_TERMIO and/or
-          ACE_HAS_TERMIOS.
-
-Sun Oct 16 19:39:10 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.h:
-          Fixed Doxygen tags.
-
-Sun Oct 16 09:27:25 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * protocols/ace/RMCast/Acknowledge.{h,cpp}
-        * protocols/ace/RMCast/Parameters.h:
-          Added some fixes so that the default size of the hash map won't
-          be so huge.  Thanks to Felix Li <fengli at gmail dot com> for
-          these fixes.
-
-Sun Oct 16 17:17:50 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/OS.h:
-        * ace/config-cray.h:
-        * ace/config-cygwin32.h:
-        * ace/config-dgux-4.11-epc.h:
-        * ace/config-dgux-4.x-ghs.h:
-        * ace/config-freebsd.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-        * ace/config-lynxos.h:
-        * ace/config-m88k.h:
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx-tiger.h:
-        * ace/config-macosx.h:
-        * ace/config-openbsd.h:
-        * ace/config-qnx-neutrino.h:
-        * ace/config-qnx-rtp-62x.h:
-        * ace/config-qnx-rtp-pre62x.h:
-        * ace/config-rtems.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sco-5.0.0.h:
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem.h:
-        * ace/config-unixware-2.01-g++.h:
-        * ace/config-unixware-2.1.2-g++.h:
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-        * ace/config-win32-interix.h:
-          Replaced old TTY_IO related macros with the new
-          ACE_HAS_TERMIOS macro.
-
-        * ace/TTY_IO.cpp:
-          Added include "ace/config-lite.h" to pull feature macro
-          definitions.
-
-Sun Oct 16 16:14:48 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/README:
-        * ace/TTY_IO.cpp:
-          Introduce new macros ACE_HAS_TERMIO and ACE_HAS_TERMIOS to
-          select between old ioctl based interface and POSIX terminal
-          interface. The old macros ACE_HAS_TERM_IOCTLS and
-          ACE_HAS_NEW_TERMIOS_STRUCT are not used anymore. Thanks
-          to J.T. Conklin for motivating this change.
-
-Sun Oct 16 12:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Don't run Big_AMI test in minimum builds
-
-Sat Oct 15 00:57:19 2005  Steve Totten  <totten_s@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Added TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl to
-          the nightly tests.
-
-Fri Oct 14 22:30:40 2005  Krishnakumar B  <kitty@nospam.invalid.domain>
-
-        * ace/config-macosx-tiger.h (ACE_HAS_NEW_TERMIOS_STRUCT): Defined
-          the macro ACE_HAS_NEW_TERMIOS_STRUCT to fix compilation errors
-          on Mac OS X Tiger.
-
-Fri Oct 14 14:56:16 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/ACE.cpp:
-        * ace/SOCK_Connector.cpp:
-
-          Reverted the change from Fri Sep  2 15:08:27 2005  Justin Michel
-          due to suspicions that it might be inadvertently responsible for
-          observed additional jitter in TAO performance tests.  The
-          motivation for the original change and a patch to restore the
-          original change is documented in Bugzilla #2246.
-
-Fri Oct 14 11:49:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ACEXML/apps/svcconf/Makefile.am:
-
-          Tweak to use pkgconfigdir and @libdir@/pkgconfig instead of
-          pkgconfdatadir and ${prefix}/lib/pkgconfig to be consistent with
-          all our other Makefile.am's.  This will hold until we regenerate
-          all the ACE Makefile.am's from MPC.  [Bug 2266]
-
-Fri Oct 14 14:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-         Reverted the change below, causes compile problems
-
-          Fri Oct 14 10:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-          * ace/SSL/SSL_Asynch_BIO.{h,cpp}:
-          Fixed 64bit conversion warnings
-
-Fri Oct 14 12:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/soreduce/Library.cpp:
-          Fixed 64bit problem
-
-Fri Oct 14 11:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SOCK_IO.{h,inl}:
-          64bit fix
-
-Fri Oct 14 10:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SSL/SSL_Asynch_BIO.{h,cpp}:
-          Fixed 64bit conversion warnings
-
-        * ace/OS_NS_unistd.{h,inl}:
-          Let getpagesize return a long
-
-Fri Oct 14 08:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * protocols/ace/HTBP/HTBP_Session.cpp:
-          Fixed signed/unsigned warning
-
-Thu Oct 13 17:39:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/TTY_IO.cpp: Changed ACE_TTY_IO_{ODD EVEN MARK SPACE} to
-          char* from ACE_TCHAR* since the strings they're compared to (from
-          Serial_Params) are char* always.
-
-        * ace/config-win32-common.h: Removed the check for UNDER_CE >= 0x400
-          && UNDER_CE < 0x500 when deciding whether or not to define E...
-          symbols. Windows Mobile 5 requires them as well.
-
-Thu Oct 13 13:58:44 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/config-g++-common.h (ACE_IMPORT_SINGLETON_DECLARE):
-          (ACE_IMPORT_SINGLETON_DECLARATION):
-
-          Suppress "-pedantic" error caused by use of g++ "extern
-          template" extension by preceding the expression with
-          "__extension__".
-
-Thu Oct 13 15:38:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/RB_Tree.{cpp h}: Follow-up to:
-          Fri Jul  9 21:23:13 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-          Don't include a tree pointer in each RB_Tree_Node just to be able to
-          get back to the tree to retrieve the allocator. Leave the allocator
-          pointer in ACE_RB_Tree_Base, and add a ACE_RB_Tree::remove_children_i
-          method that uses the allocator to release memory. Thank you to
-          Sergei Kuchin <skuchin at mqsoftware dot com> for this improvement.
-
-Thu Oct 13 20:42:00 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Enable noncanonical input processing on POSIX systems.
-
-Thu Oct 13 19:18:44 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Oops. Use tcsetattr() instead of tcgetattr() to set terminal
-          parameters.
-
-Thu Oct 13 18:49:15 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          TTY_IO class now uses POSIX terminal interface if it is
-          available. Should fix compile problems on various
-          platforms.
-
-Thu Oct 13 15:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Threads/task_four.cpp:
-        * examples/Reactor/Proactor/post_completions.cpp:
-          Fixed warning in MinGW build
-
-Thu Oct 13 17:51:04 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Fixed wchar issues.
+        * tests/run_test.lst:
+          Added Signal_Test. Thanks to Martin Corino for notificing that
+          we don't run this test on any platform.
 
-Thu Oct 13 14:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Apr 24 10:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
-          Don't run the Hang_Shutdown test in a single threaded build
-
-Thu Oct 13 14:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_arpa_inet.cpp:
-        * ace/Pipe.cpp:
-          64bit fixes
-
-Thu Oct 13 13:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Threads/tss2.cpp:
-          Fixed warning in MinGW build
-
-Thu Oct 13 13:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added tests/DLL_Test_Parent
-
-Thu Oct 13 13:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration.{h,cpp}:
-        * ace/FILE_IO.cpp:
-          64bit fixes
-
-Thu Oct 13 13:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Message_Queue.{h,cpp,inl}:
-        * ace/Message_Queue_T.{h,cpp}:
-          Changed message_count to be a size_t to fix 64bit conversion warnings
-          in code that uses this.
-
-Thu Oct 13 13:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.{h,inl}:
-          Changed return type of priority_control from int to long to fix
-          64bit issues.
-
-        * ace/Mem_Map.{h,inl}:
-        * ace/OS_NS_sys_shm.{h,inl}:
-          Fixed 64bit conversion warnings
-
-Thu Oct 13 11:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdlib.{h,cpp,inl}:
-          Let readline return ssize_t instead of int to fix 64bit
-          conversion issues
-
-Thu Oct 13 07:49:37 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Include OS_NS_string.h to fix compile error on various platforms.
-
-Wed Oct 12 23:55:23 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-          Rearranged includes to fix compile error on LynxOS.
-
-Wed Oct 12 23:08:43 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/CDR_Stream.inl:
-        * ace/CDR_Stream.cpp:
-        * ace/SString.cpp:
-          Fixed might be unitialized warning in FC4 build.
-
-Wed Oct 12 22:50:39 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.cpp:
-        * ace/config-freebsd.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-        * ace/config-openbsd.h:
-        * ace/config-win32-interix.h:
-          Changed ACE_USES_NEW_TERMIOS_STRUCT to ACE_HAS_NEW_TERMIOS_STRUCT
-          to better follow ACE naming conventions.
-
-Wed Oct 12 22:32:33 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/TTY_IO.h:
-        * ace/TTY_IO.cpp:
-          TTY_IO class overhaul. See NEWS for more information.
-
-        * NEWS:
-          Added TTY_IO changes.
-
-Wed Oct 12 12:02:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Based_Pointer_Test.cpp:
-        * tests/dll_test_parent_lib.mpb:
-        * tests/tests.mpc:
-
-          Fixed project dependencies for tests with an accompanying shared
-          library.
-
-Wed Oct 12 12:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Sockets/Basic.cpp:
-        * examples/APG/Streams/Util.h:
-        * examples/APG/Streams/CommandTasks.cpp:
-        * examples/APG/Threads/Message_Queue.cpp:
-        * examples/Reactor/Misc/notification.cpp:
-        * examples/Reactor/Misc/test_timer_queue.cpp:
-        * examples/Reactor/Multicast/server.cpp:
-          Fixed 64bit conversion warnings
-
-Wed Oct 12 09:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ipv6.mpb:
-          Also for cbx we need to add an extra lib
-
-Wed Oct 12 08:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added TAO/tests/Bug_1676_Regression
 
-        * bin/fuzz.pl:
-          Also raised the level for the rir check
-
-Wed Oct 12 08:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Raised the level for the environment macro check to >= 6. This way
-          the check is there but we don't run it by default in our daily
-          fuzz build
-
-Wed Oct 12 08:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Apr 24 09:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Changed the default for exceptions to 1
-
-Tue Oct 11 17:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Stream.cpp (skip_wchar):
-          When having a 1.1 stream, we must use
-          ACE_OutputCDR::wchar_maxbytes_ instead of sizeof (ACE_CDR::WChar)
-          to determine whether we have to read 2 or 4 bytes for a
-          ACE_CDR::WChar. This fixes the failing of the TAO Codec test
-          under fe linux
-
-Tue Oct 11 08:28:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/INET_Addr{.h .inl}:
-          Added additional "is_xx' method for IPv6 address testing.
-
-Tue Oct 11 01:17:10 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        From James Megquier <jmegq at radiance dot com>
-        * tests/DLL_Test.cpp (basic_test):
-        * tests/tests.mpc:
-
-          Rename DLL_Test library to avoid MPC name conflict with DLL_Test
-          executable.  [Bug 2258]
-
-        * ace/config-g++-common.h:
-
-          Sadly, G++ 4.x silently ignores visibility attributes on
-          template instantiations, which breaks singletons.  As a
-          workaround, we use the GCC visibility pragmas.  And to make them
-          fit in a macro, we use C99's _Pragma() (see
-          http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17470).  [Bug 2260]
-
-        * ace/Based_Pointer_Repository.h:
-        * ace/Obstack.h:
-        * ace/Timeprobe.h:
-        * examples/Export/dll.h:
-
-          Declare exported (i.e. default visibility) singleton templates
-          prior to typedefs that reference  them.  Prevents g++ 4.0 from
-          silently making their visibility hidden.  [Bug 2260]
-
-        * include/makeinclude/platform_g++_common.GNU:
-
-          Added "no_hidden_visibility" make flag/variable.  Setting to "1"
-          in a platform_macros.GNU file will disable g++ 4.0 visibility
-          attribute support.  [Bug 2259]
-
-Tue Oct 11 06:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Guard_T.cpp:
-          When ACE_HAS_DUMP is defined include Log_Msg.h to get ACE_DEBUG.
-          Thanks to James Megquier <jmegq at radiance dot com> for reporting
-          this. This fixes bugzilla bug 2257
-
-        * ACE-INSTALL.html:
-          Updated Remedy IT support platforms and added
-          Borland C++ Builder 2006 as new support platform. This is now
-          publicly announced by Borland.
-
-Mon Oct 10 15:45:17 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb:
-
-          Updated to reflect changes in config handles.
-
-Mon Oct 10 19:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_dirent.cpp:
-          Fixed 64bit conversion
-
-Mon Oct 10 13:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Reactor_Timer_Test.cpp:
-          Timers are of type long, so update this test to use long for timer
-          ids, not int.
-
-Mon Oct 10 10:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new Big_AMI test
-
-Sun Oct  9 21:34:08 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/config-lynxos.h:
-          Do not define ACE_LACKS_SETREGID ACE_LACKS_SETREUID
-          on LynxOS 4.x
-
-Fri Oct  7 17:52:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
-
-          Fix typo in recently added TAO_IDL_DEP definition.
-
-Fri Oct  7 17:35:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Service_Configurator/IPC-tests/server/Makefile.am:
-        * tests/Makefile.am:
-
-          Regenerate to account for recent changes.
-
-Fri Oct  7 13:31:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-
-          Changed to add -Sa and -St flags to idlflags variable instead of
-          tao_idlflags.  This ensures they will be emitted (unless they're
-          suppressed by anytypecode.mpb) in the automake build, where the
-          value of TAO_IDLFLAGS is set in AutomakeWorkspaceHelper.pm.
-
-          This would have cought recent problems I introduced in TAO when
-          splitting out IDL compilation into separate projects.
-
-Fri Oct  7 09:32:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
-
-          Define TAO_IDL_DEP if TAO_IDL is found in the any per-project
-          Makefile.am as they are aggregated into the final Makefile.am.
-
-Fri Oct  7 12:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Upgradable_RW_Test.cpp:
-          Fixed might be unitialized warning in MinGW build
-
-Fri Oct  7 08:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-borland.h:
-          Removed ACE_LACKS_MODE_MASKS, it is in config-win32-common.h.
-
-Fri Oct  7 07:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * protocols/ace/HTBP/HTBP_Stream.{h,cpp,inl}:
-        * protocols/ace/HTBP/HTBP_Notifier.{h,cpp,inl}:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.{h,cpp,i}:
-        * apps/JAWS/clients/Caching/URL_Locator.{h,cpp,i}:
-          Removed empty inline files
-
-        * protocols/ace/HTBP/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/server/Makefile.am:
-        * apps/JAWS/clients/Caching/Makefile.am:
-          Removed inline files we zapped above
-
-Thu Oct  6 15:42:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test.h:
-        * tests/DLL_Test_Impl.cpp:
-        * tests/DLL_Test_Parent.cpp:
-        * tests/DLL_Test_Parent.h:
-        * tests/DLL_Test_Parent_Export.h:
-        * tests/dll_test_parent_lib.mpb:
-
-          Moved "Parent" base class to a separate DSO/DLL to break a
-          cyclic dependency, in turn allowing its virtual methods to be
-          moved out of line.  Addresses dynamic_cast<> failures in g++ 4.0
-          builds.  Thanks to Carlos for suggesting this change. [Bug 2143]
-
-          Moved "Child" subclass virtual methods out of line to address
-          RTTI related problems when using g++ 4.0's
-          -fvisibility-inlines-hidden command line option.      [Bug 2143]
-
-        * tests/tests.mpc:
-
-          Added new DLL_Test_Parent_Lib project.
-
-          Updated DLL_Test project dependencies to reflect new DLL test
-          library layout.
-
-          Corrected MPC "dynamicflags" variable for "Based Pointer Test
-          Lib" and "DLL Test Lib" projects. "ACE_SVC_BUILD_DLL" not
-          "ACE_BUILD_SVC_DLL".
-
-Thu Oct  6 17:56:19 2005  Steve Huston  <shuston@riverace.com>
-
-        Added support for Windows Mobile 5 and Pocket PC 2003 using
-        Visual Studio 2005 (Beta 2). Reorganized some of the config-win32-*
-        files to ensure OS things are in config-win32-common.h and compiler
-        things are in the various compiler files.
-
-        * ace/config-win32-common.h: Now #includes config-WinCE.h. It's
-          possible that config-WinCE.h may get chopped down further and/or
-          subsumed into config-win32-common.h as config-WinCE.h gets refined.
-
-          Added ACE_LACKS_MODE_MASKS. It's needed on all variants of
-          Windows and all compilers.
-
-          Turn on both ACE_USES_WCHAR and UNICODE if either is set. Removed
-          this setting from config-WinCE.h.
-
-        * ace/config-win32-borland.h:
-        * ace/config-win32-dmc.h:
-        * ace/config-win32-ghs.h:
-        * ace/config-win32-mingw.h:
-        * ace/config-win32-msvc-6.h:
-        * ace/config-win32-msvc-7.h:
-        * ace/config-win32-msvc-8.h:
-        * ace/config-win32-visualage.h: Removed ACE_LACKS_MODE_MASKS.
-          Removed ACE_ENDTHREADEX (moved to config-win32-msvc.h).
-
-        * ace/config-win32-msvc.h: Added ACE_ENDTHREADEX with proper
-          setting depending on Windows PC vs. Mobile.
-
-        * ace/config-win32.h: Doesn't include config-WinCE.h any longer.
-
-        * ace/config-WinCE.h: Moved the errno value definitions to
-          config-win32-msvc-6.h. They're only needed for the eVC 3 and 4
-          compilers, which report themselves using the same versions as
-          MSVC 6.
-
-        * ace/Object_Manager.cpp (init): Only act on config.h's
-          ACE_DISABLE_WIN32_ERROR_WINDOWS setting if on Windows, but not CE.
-
-        * ace/OS_NS_time.h: Only define struct tm for WinCE if compiling
-          on something less than Visual Studio 2005.
-
-        * ace/OS_NS_unistd.inl (rmdir, unlink):
-        * ace/OS_NS_sys_stat.inl (mkdir, stat): For wchar_t version on WinCE,
-          specify the ...W() form of the system call rather than assume
-          the call maps to the W form. WinCE can do either A or W now.
-
-        * ace/OS_NS_time.(cpp h) (day_of_week_name[], month_name[]):
-        * ace/OS_NS_sys_socket.cpp (socket_init, socket_fini):
-          Changed char array from wchar_t to ACE_TCHAR. WinCE can do either
-          narrow or wide and this allows it to adjust. Everything was
-          initialized using ACE_LIB_TEXT already.
-
-        * ace/OS_NS_stdio.inl (fdopen, rename, freopen): For WinCE, need to
-          convert the ACE_TCHAR string to wchar always. There's no char*
-          version of fdopen, et al that I can see.
-
-        * ace/Service_Config.(h inl): Only define the alternate
-          intialize/resume/suspend/remove methods for WinCE if ACE_USES_WCHAR
-          is set. Else there's already a char* version.
-
-        * ace/TSS_T.cpp (ctor): Use ACE_LIB_TEXT around strings for the
-          MessageBox() call on CE. This resolves properly depending on the
-          build. CE doesn't always use unicode any more.
-
-        * tests/Logging_Strategy_Test.cpp (get_statistics): Use time_t
-          instead of int to return the modified time. Makes it portable to
-          64 bits.
-
-Thu Oct  6 10:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Extended empty inline files to also ignore lines starting
-          with /* as real contents. Will propobly reveal another few files
-          we should zap
-
-Thu Oct  6 08:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * netsvcs/lib/Base_Optimizer.h:
-        * netsvcs/lib/Client_Logging_Handler.h:
-        * netsvcs/lib/Log_Message_Receiver.h:
-        * netsvcs/lib/Name_Handler.h:
-        * netsvcs/lib/Server_Logging_Handler.h:
-        * netsvcs/lib/Server_Logging_Handler_T.h:
-        * netsvcs/lib/Token_Handler.h:
-        * netsvcs/lib/TS_Clerk_Handler.h:
-        * netsvcs/lib/TS_Server_Handler.h:
-          Converted documentation to doxygen style
-
-Thu Oct  6 08:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Message_Queue_Test.cpp:
-        * tests/Message_Queue_Test_Ex.cpp:
-          Fixed might be unitialized warning in MinGW build
-
-Thu Oct  6 08:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * netsvcs/ACE-netsvcs.html:
-          Fixed small typo
-
-Wed Oct  5 22:07:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add check for ACE_HAS_PTHREAD_GETCONCURRENCY and
-          ACE_HAS_PTHREAD_SETCONCURRENCY.
-
-        * ace/OS_NS_Thread.inl:
-
-          Changed ACE_OS::getconcurrency () to use ::pthread_getconcurrency()
-          if ACE_HAS_PTHREAD_GETCONCURRENCY is set.
-
-          Changed ACE_OS::setconcurrency () to use ::pthread_setconcurrency()
-          if ACE_HAS_PTHREAD_SETCONCURRENCY is set.
-
-        * ace/README:
-
-          Define ACE_HAS_PTHREAD_GETCONCURRENCY and
-          ACE_HAS_PTHREAD_SETCONCURRENCY feature test macros.
-
-Wed Oct  5 13:18:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * examples/Shared_Malloc/Malloc.cpp:
-        * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp:
-        * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp:
-        * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp:
-        * tests/SV_Shared_Memory_Test.cpp:
-
-          More include directive additions/fixes.
-
-Wed Oct  5 13:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Base.h:
-          Doxygen fixes and removed some checks for very old msvc and borland
-          versions
-
-Wed Oct  5 12:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/svcconf.mpb:
-          Replaced some spaces with a tab, should fix our Cygwin build
-
-Wed Oct  5 10:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Processes/Spawn.cpp:
-          Fixed 64bit conversion warnings
-
-Wed Oct  5 11:11:21 2005  Simon McQueen  <sm@prismtech.com>
-
-        *  bin/MakeProjectCreator/config/core_anytypecode.mpb:
-
-           Add new base MPC base project that links with the TAO_AnyTypeCode
-           library but does not inherit from taoidldefaults or set any IDL
-           compiler flags. To be used as an alternative to anytypecode.mpb
-           for all projects under $ACE_ROOT/TAO/tao.
-
-Wed Oct  5 02:11:28 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Increase template depth to resolve compile errors when building
+          TAO with the new sequence implementation
 
-        * ace/ace_os.mpc:
+Mon Apr 24 09:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed this file.  It was inadvertently committed.
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T for LynxOS. Thanks to Simon Massey for delivering
+          the patch
 
-Wed Oct  5 01:57:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Fri Apr 21 16:28:26 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * apps/JAWS2/JAWS/Cache_Manager.cpp:
-        * examples/APG/Active_Objects/AO.cpp:
-        * examples/APG/Active_Objects/AO2.cpp:
-        * examples/APG/Shared_Memory/Hash_Map.cpp:
-        * tests/Bound_Ptr_Test.cpp:
+         Merge from ARMS Escher repository.
 
-          Include appropriate headers to address incomplete type
-          definition related compile-time errors.  Necessitated by header
-          dependency reductions in ACE.
+        * ace/OS_NS_Thread.cpp
 
-Wed Oct  5 08:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Updated sched_params() to not ignore the process id passed in.
+          Also enhanced the Windows implementation to get a handle to the
+          process specified before applying the priority class changes.
 
-        * ace/SSL/SSL_Asynch_Stream.cpp:
-          Fixed bug 1770 and 1805. Yoav Borer
-          Thanks to <yoav dot borer at data-pod dot com> for reporting
-          these.
+        * ace/Process_Manager.cpp
+        * ace/Process_Manager.h
 
-Wed Oct  5 00:41:18 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Activation_Queue.cpp:
-        * ace/Activation_Queue.h:
-
-          Moved "ace/Method_Request.h" include directive to implementation
-          file.  A forward request in the header will suffice.
-
-        * ace/SOCK_CODgram.h:
-
-          Support export macros specific to ACE subset libraries.
-
-        * ace/ace.mwc:
-
-          Added missing "ace_for_tao" subset MPC files.
-
-        * ace/ace_memory_for_tao.mpc:
-        * ace/ace_reactor_for_tao.mpc:
-        * ace/ace_sockets_for_tao.mpc:
-        * ace/ace_threads_for_tao.mpc:
-
-          New TAO-specific ACE subset MPC files that were not committed
-          in initial "ace_for_tao" commit.
-
-Tue Oct  4 14:21:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * netsvcs/lib/TS_Clerk_Handler.h:
-
-          More include directive fixes/additions now necessary due to
-          header dependency reductions in ACE.
-
-Tue Oct  4 11:12:31 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * apps/JAWS2/JAWS/Cache_Object.h:
-        * apps/JAWS2/JAWS/Cache_Object.cpp:
-
-          Include appropriate headers to address incomplete type
-          definition related compile-time errors.  Necessitated by header
-          dependency reductions in ACE.
-
-          Declare lock members that are meant to be mutable in all cases
-          as "mutable", and remove casts that worked around the
-          unnecessary "constness" of those members.
-
-Tue Oct  4 10:39:24 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Service_Config.cpp:
-
-          Include "ace/Signal.h" when ACE_LACKS_UNIX_SIGNALS is
-          undefined.  Addresses build errors in non-Windows builds.
-          Necessitated by header dependency reductions in ACE.
-
-Tue Oct  4 10:00:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * ace/Obstack_T.h:
-
-          Fix warning about nested comments.
-
-Mon Oct  3 13:30:58 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * examples/APG/Containers/Hash_Map.cpp:
-        * examples/APG/Shared_Memory/Malloc.cpp:
-        * examples/APG/Shared_Memory/PI_Malloc.cpp:
-        * examples/APG/Shared_Memory/Pool_Growth.cpp:
-        * examples/Shared_Malloc/Malloc.cpp:
-        * examples/Shared_Malloc/Malloc.h:
-        * examples/Shared_Malloc/test_malloc.cpp:
-        * examples/Shared_Malloc/test_multiple_mallocs.cpp:
-        * examples/Shared_Malloc/test_persistence.cpp:
-        * examples/Shared_Malloc/test_position_independent_malloc.cpp :
-
-          Include appropriate headers to address incomplete type
-          definition related compile-time errors.  Necessitated by header
-          dependency reductions in ACE.
-
-Mon Oct  3 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SSL/SSL_Context.cpp:
-          Use prefix increment/decrement instead of postfix
-
-Mon Oct  3 10:48:23 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ACE_Memory_export.h:
-        * ace/ACE_Reactor_export.h:
-        * ace/ACE_Sockets_export.h:
-        * ace/ACE_Threads_export.h:
-
-          New export headers for a number of ACE subset libraries.
-
-        * ace/Activation_Queue.cpp:
-        * ace/Configuration.h:
-        * ace/Malloc.cpp:
-        * ace/Obstack_T.h:
-        * ace/Obstack_T.cpp:
-        * ace/Svc_Conf_l.cpp:
-        * ace/Timer_Hash_T.cpp:
-        * tests/Based_Pointer_Test.cpp:
-        * tests/Malloc_Test.cpp:
-        * tests/Message_Block_Test.cpp:
-
-          Include appropriate headers to address incomplete type
-          definition related compile-time errors.  Necessitated by header
-          dependency reductions in ACE.
-
-        * ace/Activation_Queue.h:
-        * ace/Barrier.h:
-        * ace/Based_Pointer_Repository.h:
-        * ace/Dev_Poll_Reactor.h:
-        * ace/File_Lock.h:
-        * ace/LSOCK.h:
-        * ace/LSOCK_Acceptor.h:
-        * ace/LSOCK_CODgram.h:
-        * ace/LSOCK_Connector.h:
-        * ace/LSOCK_Dgram.h:
-        * ace/LSOCK_Stream.h:
-        * ace/MEM_Acceptor.h:
-        * ace/MEM_Addr.h:
-        * ace/MEM_Connector.h:
-        * ace/MEM_IO.h:
-        * ace/MEM_SAP.h:
-        * ace/MEM_Stream.h:
-        * ace/MMAP_Memory_Pool.h:
-        * ace/Mem_Map.h:
-        * ace/Method_Request.h:
-        * ace/Msg_WFMO_Reactor.h:
-        * ace/Multihomed_INET_Addr.h:
-        * ace/PI_Malloc.h:
-        * ace/Pagefile_Memory_Pool.h:
-        * ace/Priority_Reactor.h:
-        * ace/Process.h:
-        * ace/Process_Manager.h:
-        * ace/Process_Semaphore.h:
-        * ace/RW_Process_Mutex.h:
-        * ace/SOCK_Dgram_Bcast.h:
-        * ace/SOCK_Dgram_Mcast.h:
-        * ace/SOCK_SEQPACK_Acceptor.h:
-        * ace/SOCK_SEQPACK_Association.h:
-        * ace/SOCK_SEQPACK_Connector.h:
-        * ace/SV_Shared_Memory.h:
-        * ace/Sbrk_Memory_Pool.h:
-        * ace/Shared_Memory.h:
-        * ace/Shared_Memory_MM.h:
-        * ace/Shared_Memory_Pool.h:
-        * ace/Shared_Memory_SV.h:
-        * ace/Thread_Semaphore.h:
-        * ace/UNIX_Addr.h:
-
-          Support export macros specific to ACE subset libraries.
-
-        * ace/Array_Map.h:
-
-          Comment cleanup.
-
-        * ace/High_Res_Timer.h:
-
-          Removed trailing whitespace.
-
-        * ace/Malloc.h:
-
-          Removed extraneous headers unnecessary for the types declared in
-          this header.
-
-        * ace/OS_NS_Thread.inl (ACE_Thread_ID):
-
-          Prefer initialization of thread_id_ member in base member
-          initializer list rather than constructor body.
-
-        * ace/ace.mpc:
-        * ace/ace.mwc:
-        * ace/ace_for_tao.mpc:
-        * ace/ace_os.mpc:
-
-          Add support ACE subsets (predominantly TAO-specific).
-
-        * ace/svcconf.mpb:
-
-          Moved Svc_Conf parser and lexer generation Make rules to this
-          MPC base project.  Allows subset projects to inherit these
-          rules.
-
-        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
-        * bin/MakeProjectCreator/config/acememorylib_for_tao.mpb:
-        * bin/MakeProjectCreator/config/acenosubsets.mpb:
-        * bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb:
-        * bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb:
-        * bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb:
-
-          New TAO-specific ACE subset MPC support.  Enabled when
-          "ace_for_tao" is set to "1" in an MPC features file.
-
-        * bin/MakeProjectCreator/config/aceexe.mpb:
-        * bin/MakeProjectCreator/config/acelib.mpb:
-
-          Support "ace_for_tao" subset.
-
-        * bin/MakeProjectCreator/config/global.features:
-
-          Disabled "ace_for_tao" feature by default.
-
-        * bin/MakeProjectCreator/config/taolib.mpb:
-
-          Inherit "ace_for_tao" feature project.  Causes TAO-based
-          projects to use the "ace_for_tao" subset libraries when that
-          feature is enabled.
-
-Mon Oct  3 12:50:00 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * ace/Asynch_IO.h:
-
-          Remove some more Doxygen warnings from the scoreboard.
-
-Mon Oct  3 13:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
-          Fixed might be unitialized warning in Cygwin build
-
-Mon Oct  3 12:50:00 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * ace/ACE.h:
-        * ace/Acceptor.h:
-        * ace/Stats.h:
-        * ace/Containers_T.h:
-
-          Remove some Doxygen warnings from the scoreboard.
-
-Mon Oct  3 11:27:13 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Scheduled TAO/orbsvcs/tests/Bug_2248_Regression.
-
-Mon Oct  3 09:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          Changed the default of exceptions to be 1
-
-Mon Oct  3 06:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.{h,cpp}:
-          Changed type of msg_off_ from int to long to fix 64bit
-          conversion warnings
-
-Sun Oct  2 19:18:01 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/config-lynxos.h:
-          Added contents from config-lynxos4.0.0.h to this file.
-          config-lynxos4.0.0.h is no longer needed.
-
-        * ace/config-lynxos4.0.0.h:
-          Removed this file.
-
-Sat Oct  1 11:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.cpp:
-          Fixed _open_osfhandle call
-
-Fri Sep 30 14:00:36 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Added a new test, check_for_refcountservantbase, that will
-          report occurrences of PortableServer::RefCountServantBase in
-          code.  This is good because the default is now changed in TAO to
-          reflect the change in the CORBA spec.
-
-          Changed all error and warning messages to be consistently
-          printed with the keyword "Error: " or "Warning: " followed by
-          the filename and line number where the problem occurred, then
-          followed by a text description of the problem.  This makes the
-          messages' format consistent with that output by grep and
-          compilers so that one can use tools like emacs' 'compile' mode
-          to step through the fuzz errors and easily fix things.
-
-Fri Sep 30 10:34:24 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add feature checks for ACE_LACKS_INTMAX_T, ACE_LACKS_INTPTR_T,
-          ACE_LACKS_UINTMAX_T, and ACE_LACKS_UINTPTR_T.
-
-        * ace/README:
-
-          Define ACE_LACKS_INTMAX_T, ACE_LACKS_UINTMAX_T, and
-          ACE_LACKS_UINTPTR_T feature test macros.
-
-Fri Sep 30 13:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
-          Corrected the directory changing code to take 2 or more deep
-          relative paths into account. Merged this fix from the MPC
-          templates bmake. Thanks to Chad Elliott for fixing these.
-
-Fri Sep 30 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-borland.h:
-        * ace/config-win32-msvc-6.h:
-        * ace/OS_NS_stdio.cpp:
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_unistd.inl:
-        * ace/README:
-          Added new ACE_LACKS_INTPTR_T and use this. This type is used to call
-          _open_osfhandle on windows. It seems not to be available with BCB6
-          and earlier and msvc6. Thanks to Simon McQueen for notifying me that
-          msvc6 also lacks this.
-
-Fri Sep 30 07:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SOCK_IO.cpp:
-        * ace/SOCK_Dgram_Bcast.cpp:
-        * ace/SOCK_Dgram.cpp:
-        * ace/OS_NS_unistd.inl:
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_stdio.cpp:
-        * ace/MEM_IO.cpp:
-        * ace/ACE.cpp:
-          Fixed 64bit conversion warnings when building on win32 with 64bit
-          warnings enabled
-
-Thu Sep 29 16:07:02 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
-
-        * bin/FOCUS:
-          Directory where FOCUS related work will be added.
-
-        * bin/FOCUS/ChangeLog:
-        * bin/FOCUS/FOCUS.pl:
-        * bin/FOCUS/NEWS:
-        * bin/FOCUS/PROBLEM-REPORT-FORM:
-        * bin/FOCUS/Parser:
-        * bin/FOCUS/README:
-        * bin/FOCUS/VERSION:
-        * bin/FOCUS/docs:
-        * bin/FOCUS/specializations:
-
-          FOCUS related files and directories. Please read the Changelog
-          in FOCUS for more details on each component.
-
-        * bin/FOCUS/specializations/Context-Specific-Optimizations:
-        * bin/FOCUS/specializations/Flushing_Strategy:
-        * bin/FOCUS/specializations/Messaging_Strategy:
-        * bin/FOCUS/specializations/Protocol_Family:
-        * bin/FOCUS/specializations/README:
-        * bin/FOCUS/specializations/Reactor_Family:
-        * bin/FOCUS/specializations/Wait_Strategy:
-
-          Specializations for the different components in ACE+TAO. Each
-          directory contains the specialization files for specializing the
-          appropriate component/strategy.
-
-        * bin/FOCUS/Parser/FOCUSParser.pm:
-
-          Parser/weaver that reads the specialization description and
-          performs the transformations.
-
-        * bin/FOCUS/docs/FOCUS.html:
-
-          Start at the documentation effort.
-
-          The Changelogs within the FOCUS directory will capture the
-          different changes henceforth.
-
-Thu Sep 29 13:28:29 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * bin/fuzz.pl (check_for_refcountservantbase):
-
-          Added a new fuzz check to catch derivations to
-          PortableServer::RefCountServantBase.  Obviously, this check only
-          applied to TAO, and the test itself isn't very discriminating as
-          it simply looks for the presence of
-          "PortableServer::RefCountServantBase" in a file and doesn't
-          attempt to detect derivation.  There are also no means to turn
-          off the check in comments.  But it's better than nothing.
-
-Thu Sep 29 15:18:24 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Scheduled TAO/orbsvcs/tests/Bug_2247_Regression.
-
-Thu Sep 29 12:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/footprint_stats.sh:
-          Fixed codeset library name
-
-Thu Sep 29 09:03:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * apps/JAWS2/JAWS/IO_Acceptor.cpp:
-          Fixed unused parameters
-
-Thu Sep 29 09:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/footer.html:
-        * html/Stats/configuration.shtml:
-        * html/Stats/navigation.html:
-        * html/Stats/index.shtml:
-        * html/Stats/detailed_footprint.shtml:
-          I have taken the files currently on the webserver and updated
-          cvs with these versions. This way we can update these files
-          in cvs and update the webserver automatically. I will reconfigure
-          the stats build to copy all the files in this directory to
-          the webserver when the build is ready
-
-        * html/Stats/footprint.shtml:
-        * html/Stats/img.html:
-        * html/Stats/simple_footprint.shtml:
-        * html/Stats/performance.shtml:
-        * html/Stats/compilation.shtml:
-          New files
-
-        * bin/footprint_stats.sh:
-          Also generate the footprint of the new core TAO libs we added
-          the last months
-
-Thu Sep 29 08:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/index.html:
-          Fixed typo
-
-Thu Sep 29 07:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_fcntl.cpp:
-          Use C++ cast instead of c-style cast
-
-        * ace/FILE_Connector.cpp:
-          Small layout fix
-
-Wed Sep 28 11:38:07 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        Committing the following change on behalf of Wallace Zhang
-        <zhang_w@ociweb.com>.
-
-        * bin/tao_orb_tests.lst:
-
-          Enabled a new Smart Proxy test,i.e.,
-          $TAO_ROOT/tests/Smart_Proxies/dtor/run_test.pl
-
-Wed Sep 28 07:46:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Atomic_Op.cpp:
-        * ace/Atomic_Op.h:
-        * ace/Atomic_Op.inl:
-        * ace/Object_Manager.cpp:
-
-          Revert change:
-          Fri Sep 16 19:54:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-          As the new ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
-          template specialization was not found responsible for the
-          TAO performance regressions.
-
-Wed Sep 28 11:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Small updates to Borland documentation
-
-Wed Sep 28 07:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/compiler.bor:
-          At the moment BCBVER is not set, we default to BCB6.
-
-Tue Sep 27 13:40:45 2005  William Otte  <wotte@dre.vanderbilt.edu>
+           Added methods set_scheduler and set_scheduler_all
+           to set scheduling parameters for process(es) managed by this
+           class.
 
         * bin/MakeProjectCreator/config/ciao_config_handlers.mpb
-        * bin/MakeProjectCreator/config/ciao_xml_utils.mpb
-
-        Added files that should have been part of the previous commit.
-
-Tue Sep 27 13:12:28 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_client.mpb
-
-        Removed another obsolete ciao base project.
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb
-        * bin/MakeProjectCreator/config/ciao_component_dnc.mpb
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb
-
-        Revamped the CIAO base project structure to fix deficiencies
-        exposed by the especially strict linker on MacOS.
-
-Tue Sep 27 10:29:49 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_component.mpb
-        * bin/MakeProjectCreator/config/ciao_servant.mpb
-        * bin/MakeProjectCreator/config/ciao_server.mpb
-
-        Removed obsolete CIAO base projects.
-
-Tue Sep 27 13:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/ciao_DAnCE.doxygen:
-          Removed zapped XML_Helpers directory
-
-Tue Sep 27 10:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Also detect ACE_THROW in an ACE_TRY block
-
-Mon Sep 26 10:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Extended fuzz check to detect ACE_THROW_RETURN in an ACE_TRY block,
-          in that case ACE_TRY_THROW should be used.
-
-Mon Sep 26 10:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/ciao_xml_helpers.doxygen:
-        * etc/ciao_config_handlers.doxygen:
-          Renamed ciao_xml_helpers to ciao_config_handlers. Corrected also
-          paths, fixes errors in the doxygen build
-
-        * bin/generate_doxygen.pl:
-          Updated change above
-
-Sat Sep 24 12:56:20 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
-
-        * ace/Acceptor.cpp:
-        * ace/Strategies_T.cpp (accept_svc_handler):
-
-          Errno of failed accept() call is potentially not preserved due
-          to unguarded call of svc_handler->close().  Thus when
-          accept_svc_handler() returns -1 the errno value may be due to a
-          subsequent failure in the svc_handler->close() method rather
-          than the original accept() failure,  making handling of the
-          accept() failures difficult. Thanks to Russell Mora
-          <russell_mora at symantec dot com> for the patch.
-
-Fri Sep 23 10:07:25 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/config-macosx-tiger.h
-        * include/makeinclude/platform_macosx_tiger_gcc4.GNU
-
-          Updates for Tiger compatibility. Thanks to Michael van der
-          Westhuizen (r1mikey at gmail dot com) for help with tracking
-          down some troublesome issues in the platform_macros.
-
-Thu Sep 22 12:40:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/ace.m4:
-
-          Set BUILD_TAO_FLRESOURCE, BUILD_TAO_QTRESOURCE,
-          BUILD_TAO_TKRESOURCE, and BUILD_TAO_XTRESOURCE automake
-          conditionals if --enable-fl-reactor, --enable-qt-reactor,
-          --enable-tk-reactor, or --enable-xt-reactor are specified
-          at configure time.
-
-Thu Sep 22 08:40:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * tests/run_test.lst:
-          Stop based_pointer_test running on VxWorks and Static builds.
 
-Thu Sep 22 08:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fixed build ordering problem in CIAO.
 
-        * examples/ASX/Event_Server/Event_Server/event_server.cpp:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h:
-          64bit fix
+Fri Apr 21 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/fuzz.pl:
-          Extended fuzz check to detect several corba calls without an
-          ACE_CHECK in between
-
-        * ace/SOCK_Dgram.cpp:
-          Small layout fixes
-
-        * ace/Service_Config.h:
-          Added missing ACE_LIB_TEXT to some macros
-
-Tue Sep 20 10:37:24 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Pipe.inl: Added #include of "ace/ACE.h" to get the
-          right class definition for the ACE:: methods.  Thanks to Simon
-          Massey for reporting this.
-
-Tue Sep 20 15:20:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new TAO/tests/CallbackTest/*.pl tests.
-
-Tue Sep 20 10:10:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * tests/Based_Pointer_Test.cpp:
-          Attempt to fix bug 2232 (Implimented the diffs found there).
-
-Tue Sep 20 08:43:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Added new IPV6 specific tests.
-
-Tue Sep 20 08:29:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new TAO/tests/BiDirectional/run_test_ipv6.pl
-          IPV6 test.
-
-Mon Sep 19 11:43:59 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: Added a guideline that disallows the use of
-          assert() macros et al. in core ACE, TAO, and CIAO
-          library/framework code.  Thanks to Dave Giovannini <giovanninid
-          at ociweb dot com> and Carlos O'Ryan for motivating this.
-
-        * protocols/ace/RMCast/Socket.cpp: Replaced the use of ACE_OS::write()
-          and ACE_OS::read() with the new ACE_Pipe::send() and
-          ACE_Pipe::recv() methods thanks to Felix's enhancements.
-
-        * ace/Pipe.{h,inl,cpp}: Added a full complement of send*() and recv*()
-          methods so that the code is portable across different operating
-          systems without requiring user-level #ifdefs.  Thanks to Felix
-          Li <fengli@gmail.com> for submitting these enhancements.
-
-Mon Sep 19 12:35:39 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * tests/MT_SOCK_Test.cpp:
-
-          Fix use of ACE_static_cast from my  Fri Sep 2 checkin.
-
-Mon Sep 19 10:51:26 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/generate_doxygen.pl
-
-          Removed obsolete CIAO projects from Doxygen generation.
-
-        * etc/ciao_xml_helpers.doxygen
-
-          Updated path to new config_handlers.
-
-        * etc/ciao_assembly_deployer.doxygen
-        * etc/ciao_componentserver.doxygen
-        * etc/ciao_daemon.doxygen
-        * etc/ciao_serveractivator.doxygen
-
-          Removed obsolete ciao doxygen files.
-
-Sun Sep 18 17:28:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/INET_Addr.cpp:
-          Fixed bug in ACE_INET_Addr::string_to_addr().
-
-Sun Sep 18 17:26:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+        * ace/Caching_Utility_T.cpp:
+          Removed invalid added const
 
-        * ace/Log_Msg.cpp:
-          Fixed compile error in latest addition to code.
+Thu Apr 20 19:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Sep 18 10:08:05 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T for the BSD variants, thanks to J.T. Conklin
+          for delivering the patch
 
-        * ace/Log_Msg.cpp (log): Check for passing of NULL pointers to %s
-          formatting strings and replace them with "(null") to avoid
-          crashes.  Thanks to Steven Xie <steven.xie@mpathix.com> for
-          reporting this and to J.T. for suggesting the fix.
+Thu Apr 20 18:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * protocols/ace/RMCast/Acknowledge.cpp (ACE_RMCast):
-          made the default ACE_Hash_Map_Manager size be 10 rather than
-          1024.  Thanks to Felix Li <fengli@gmail.com> for reporting
+        * ace/config-macros.h:
+          Removed setting of ACE_ANY_OPS_USE_NAMESPACE again. This causes
+          problems when building CIAO. Thanks to Jeff Parsons for finding
           this.
 
-Fri Sep 16 19:54:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Atomic_Op.cpp:
-        * ace/Atomic_Op.h:
-        * ace/Atomic_Op.inl:
-        * ace/Object_Manager.cpp:
-
-          #if 0 ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
-          specialization to see if it's responsible for recent
-          TAO performance degradation.
-
-Fri Sep 16 10:57:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-
-          Added new TAO/tests/IPV6 test to runlist (only when config
-          IPV6 defined).
-
-Thu Sep 15 12:35:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * THANKS:
-
-          Added Jin Zhi Ye.
+Thu Apr 20 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/os_include/os_stdio.h:
+        * tests/ACE_Init_Test.rc:
+          Removed another msvc specific part
 
-          #undef fgetc and fputc if they are defined, as macro expansion
-          conflicts with our use of the same names in the ACE_OS wrapper
-          functions.  Reported by Jin Zhi Ye <jinzhiye at kedacom dot com>.
+Thu Apr 20 11:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep 15 18:55:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Atomic_Op.inl:
-
-          Small fix to get rid of annoying warning on Windows concerning
-          unary '-'.
-
-Wed Sep 14 13:36:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Changed ACE_HAS_MEMCPY_LOOP_UNROLL feature test code such that
-          smemcpy() correctly returns it's first argument.
-
-          Added third argument to ACE_HAS_MEMCPY_LOOP_UNROLL's AC_DEFINE
-          to provide the description for config.h.
-
-Tue Sep 13 14:38:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+        * bin/fuzz.pl:
+          Added a check for deprecated macros, first one to check is
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
+        * tests/*.cpp:
+        * protocols/*.cpp:
+        * ACEXML/*.cpp:
+        * performance-tests/*.cpp
+        * netsvcs/*.cpp
+          Removed all explicit template instantiations
 
-          Changed munching step for VxWorks SIMPC builds to generate asm
-          output to circumvent compiler output problem in certain files.
+        * ace/os_include/sys/os_types.h:
+          Added ACE_LOFF_T typedef for VxWorks 6.2 and newer
 
-        * include/makeinclude/rules.lib.GNU:
+Thu Apr 20 07:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Small change to make output of prelink step visible for static
-          libraries build for VxWorks with -frepo.
+        * ace/os_include/sys/os_types.h:
+          Always define ACE_LOFF_T so that we can use it in the sendfile
+          wrapper
 
-Tue Sep 13 09:30:03 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+Thu Apr 20 07:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_string.{h,cpp,inl}:
-          Updated the loop unrolled memcpy version name to fast_memcpy
-          rather than smemcpy.
+        * ace/svcconf.mpb:
+          Removed Service_Templates.cpp
 
-Tue Sep 13 09:18:54 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+Wed Apr 19 19:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * ace/*:
+          Removed explicit template support
 
-          Fixed the autoconf test that checks for memcpy loop unrolling
-          optimization, by (1) removing the testit function and replacing
-          it with a function pointer, (2) by properly setting the right
-          ACE macro when the test succeeds and (3) enabling the flag only
-          when the test produces a result > 10% for all sizes between
-          1..16.
+Wed Apr 19 15:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Sep 13 14:10:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+        * tests/Bug_2368_Regression_Test.cpp:
+          Fixed compile error and compile warning
 
-        * tests/Cached_Accept_Conn_Test.cpp:
-        * tests/Cached_Conn_Test.cpp:
-        * tests/Message_Block_Test.cpp:
+Wed Apr 19 14:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed problems with explicit template instantiations and
-          VxWorks builds.
+        * ace/OS_NS_sys_sendfile.h:
+          Updated include to get size_t and ACE_LOFF_T to fix compile
+          errors on Solaris
 
-Tue Sep 13 11:52:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+Wed Apr 19 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * apps/JAWS2/JAWS/Cache_Manager_T.cpp:
-        * examples/APG/Logging/LogManager.h:
         * examples/APG/Logging/Use_Multiple_Sinks.cpp:
         * examples/APG/Logging/Use_Ostream.cpp:
-        * examples/C++NPv1/Logging_Client.cpp:
-        * examples/C++NPv2/Select_Reactor_Logging_Server.cpp:
-        * examples/C++NPv2/Server_Shutdown.cpp:
-        * examples/C++NPv2/TP_Reactor_Logging_Server.cpp:
-        * examples/Export/test.cpp:
-
-          Fixed for environments defining ACE_USES_OLD_IOSTREAMS
-          (which unfortunately is the case for Windows x64 at the
-          moment due to shortcomings in the Platform SDK).
-
-Tue Sep 13 10:30:00 UTC 2005  Simon Massey  <sma@prismtech.com>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2234_Regression test.
-
-Tue Sep 13 10:11:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Excluded a few tests based on 'IPV6' configuration because
-          they use features which are not IPv6 compatible (yet) like
-          SHMIOP.
-
-Fri Sep  9 18:57:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Sock_Connect.cpp (bind_port): Replace variable s_addr with
-          addr_p. s_addr is a macro on some systems (in this case, Solaris 8)
-          and caused problems.
-
-Fri Sep  9 11:05:27 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/config-lynxos4.0.0.h:
-          Added new config file to accomodate new version of LynxOS.
-
-Thu Sep  8 16:33:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/tls.m4:
-
-          Added support for --with-openssl, --with-openssl-include, and
-          --with-openssl-libdir options so users can select or override
-          the location of the OpenSSL libraries.
-
-Thu Sep  8 18:43:12 2005  Steve Huston  <shuston@riverace.com>
-
-        * tests/Based_Pointer_Test.cpp (mmap_remap_test): Don't keep increasing
-          the allocation until the base pointer changes without checking for
-          an allocation failure. This caused all memory to be absorbed on AIX
-          without remapping the base, then the log file was so big that
-          the log processor for the scoreboard ran out of memory processing it.
-
-Thu Sep  8 06:47:11 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
-
-          Allow files with .. in the path to count in the VPATH setting.
-
-Wed Sep  7 14:44:58 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/SSL/Makefile.am:
-        * examples/C++NPv2/Makefile.am:
-        * examples/IPC_SAP/SSL_SAP/Makefile.am:
-
-          Regenerated.
-
-        * bin/MakeProjectCreator/config/ace_openssl.mpb:
-
-          Use 'compile_flags' instead of 'includes' to set compile flags
-          to @ACE_TLS_CPPFLAGS@.  Thanks to Chad Elliot for this hint.
-
-          Uncomment automake "specific" block.
-
-Tue Sep  6 22:02:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/ace_openssl.mpb:
-
-          Subtract /usr/kerberos/includes from includes for automake
-          builds.
-
-          Changed ${ACE_TLS_FOO} to @ACE_TLS_FOO@ so variables will be
-          substituted by the values obtained by the configure script.
-
-Tue Sep  6 21:56:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/tls.m4:
-
-          Changed to substitute ACE_TLS_CPPFLAGS and ACE_TLS_LDFLAGS like
-          was done with ACE_TLS_LIBS.
-
-Tue Sep  6 19:43:47 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/automake.features:
-
-          New features file for automake build.
-
-Tue Sep  6 17:37:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/ssl.mpb:
-        * ace/SSL/ssl.mpc:
-
-          Changed to inherit from ace_openssl.mpb instead of openssl.mpb.
-
-        * bin/MakeProjectCreator/config/ace_openssl.mpb:
-
-          New file, similar to other ace_*.mpb files, so we can
-          override values inherited from MPC's openssl.mpb.
-
-Tue Sep  6 12:20:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Object_Manager.cpp:
-
-          Changed to invoke ACE_Atomic_Op<ACE_Thread_Mutex, unsigned
-          long>::init_functions () to initialize function pointers.
-
-        * ace/Atomic_Op.cpp:
-        * ace/Atomic_Op.h:
-        * ace/Atomic_Op.inl:
-
-          Added ACE_Atomic_Op<ACE_Thread_mutex, unsigned long> template
-          specialization using the existing atomic operations for longs
-          with judicious use of casts.  The implementation isn't ideal,
-          since two sets of function pointers need to be set.  This can
-          be revisited when we add specializations for int and unsigned
-          int.
-
-Tue Sep  6 10:32:23 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Change the position of the use of custom 'output_option' setting.
-          Ensure that the input file is the last thing on the command line.
-
-Tue Sep  6 12:51:19 UTC 2005  Don Sharp  <Donald.Sharp@prismtech.com>
-
-        * apps/JAWS2/JAWS/IO.h
-          Small fix to counter LynxOS' defining ERROR_MESSAGE
-
-Tue Sep  6 08:46:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Small fix for '-frepo' builds with shared libs.
-
-Mon Sep  5 14:56:53 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Socket.cpp:
-
-        Reverted this change: "Replaced calls to read/write with
-        recv_n/send_n to make things work with BCB on Windows".
-        It breaks VC6.
-
-Sun Sep  4 22:27:19 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Link.cpp:
-
-        Aligned receiving buffer manually. This is necessary because
-        some of the broken compilers (like BCB) do not adhere to the
-        standard when it some to the alignment of the buffers returned
-        by operator new. Thanks to Vladislav Zverev <vladislav at gtss
-        dot spb dot ru> for reporting this.
-
-        * protocols/ace/RMCast/Socket.cpp:
-        * protocols/ace/RMCast/Socket.h:
-
-        Added the from argument to the recv() function. Made the Reactor
-        interface code executed only when it is actually used. Replaced
-        calls to read/write with recv_n/send_n to make things work with
-        BCB on Windows. Thanks to Vladislav Zverev <vladislav at gtss
-        dot spb dot ru> for suggestions.
-
-Fri Sep  2 08:29:38 2005  Arvind S. Krishna  <arvindk@tango.dre.vanderbilt.edu>
-
-        * ace/OS_NS_string.h:
-        * ace/OS_NS_string.cpp:
-        * ace/OS_NS_string.inl:
-
-          Updated the ACE_OS::memcpy optimization to factor out the loop
-          unrolled code into a separate function. This should enable
-          memcpy function itself to be inlined. Thanks to JT jtc at
-          acorntoolworks dot com.
-
-Fri Sep  2 10:44:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/SOCK_Dgram{.h .cpp}:
-        * ace/SOCK_Dgram_Mcast{.h .cpp}:
-          Added IPv6 multicast support for Win32 (>= XP Pro/Server 2003).
-
-        * tests/Multicast_Test_IPV6.cpp:
-          Changed to do IPv6 multicast for non-linux systems as well.
-
-        * bin/MakeProjectCreator/config/ipv6.mpb:
-          Added new feature config for IPv6 support.
-          Adds additional link library Iphlpapi.lib for windows projects
-          (MPC types vc6, vc7, vc71, vc8, nmake, borland and bmake)
-          and sets macro ACE_HAS_IPV6.
-
-        * bin/MakeProjectCreator/config/global.features:
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-          Introduced 'ipv6' feature.
-
-Fri Sep  2 15:08:27 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/ACE.cpp:
-
-          The code that waited for connections to complete had problems
-          with some Windows machines. The code now doesn't trust the write
-          bit in select() to indicate an accepted connection.
-
-        * ace/SOCK_Connector.cpp:
-
-          There was a workaround for ACE_WIN32 that would wait 35ms and
-          retry after the first connection failure. It wouldn't retry the
-          connect(), but would just retry select(). This workaround
-          appears to be unnecessary for current Windows machines, so I
-          changed the #ifdef ACE_WIN32 to #ifdef ACE_HAS_NON_BLOCKING_BUG.
-
-        * ace/config-win32-common.h:
-
-          ACE would always default to a ACE_DEFAULT_BACKLOG of 5. Changed
-          to default to SOMAXCONN on Win32. This special value is used by
-          Winsock listen() to indicate that the machine should
-          automatically pick a suitable default.
-
-        * tests/MT_SOCK_Test.cpp:
-
-          This test is really to verify that the listen() backlog feature
-          works correctly.  Updated the code to make this testable and
-          consistent. The code now sleeps in the server thread to give the
-          30 client threads time to attempt to connect. Only 5-9 clients
-          should succeed, because the Acceptor is created with a listen()
-          backlog=5.
-
-Thu Sep  1 17:28:25 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Atomic_Op.cpp:
-        * ace/Atomic_Op.h:
-
-          Added ACE_Atomic_Op<ACE_Thread_Mutex, long> template
-          specialization for AMD64 when compiled with GCC.
-
-Thu Sep  1 17:38:10 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/ciao_tests.lst
-
-        Corrected the path to the hello test.
-
-Thu Sep  1 18:00:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * tests/Based_Pointer_Test.cpp: Corrected to build on MSVC 6,
-          lacking template typedefs. Thanks to Johnny Willemsen for
-          this fix.
-
-Thu Sep  1 15:05:55 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
-
-        Updates to support the CIAO reorganization.
-
-Thu Sep  1 19:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          For MPC projects that are custom_only and only have IDL
-          build rules the install target didn't work anymore. If the project
-          is not an dll or exe, we generate an include of install.bor
-          and set the install types to includes. This way the install
-          target works for the generate borland makefiles
-
-Thu Sep  1 11:55:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/OS_NS_unistd.cpp (num_processors, num_processors_online):
-
-          Provide implementation for *BSD and MacOSX.
-
-Thu Sep 01 10:42:17 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * ace/config-tandem-nsk-mips-v3.h:
-          Defined ACE_SIZEOF_WCHAR
-
-Thu Sep  1 15:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SV_Message_Queue.h:
-          Fixed copy/paste error
-
-Thu Sep  1 14:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/POSIX_Proactor.cpp:
-        * ace/SV_Message_Queue.{h,inl}:
-          Fixed 64bit warnings
-
-        * ace/UPIPE_Connector.cpp:
-          Fixed formatting
-
-Thu Sep  1 14:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Timer_Heap_T.cpp:
-          Fixed 64bit conversion error
-
-Thu Sep  1 10:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.cpp:
-        * ace/LSOCK.{h,cpp}:
-          Fixed 64bit conversion problems
-
-Thu Sep  1 10:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Suppress warning 1684 with Intel 9. This is:
-          Conversion from pointer to same-sized integral type
-          (potential portability problem)
-
-Thu Sep  1 09:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_socket.{h,inl}:
-          Updated return value of send/recv methods from int to ssize_t to
-          fix problems on 64bit systems. On 32bit systems int is size of
-          ssize_t so no backward compatibility issues. This is part of
-          bug 2203
-
-        * ace/OS_NS_unistd.inl:
-          Replaced c-style cast with C++ cast
-
-Thu Sep  1 08:20:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Added missing library searchpath for '-frepo' builds.
-
-Thu Sep  1 07:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Config.h:
-          Added ACE_REMOVE_SERVICE_DIRECTIVE that works with plain svc.conf
-          and the xml version. Thanks to
-          Lothar Werzinger <lothar at xcerla dot com> for creating this new
-          macro
-
-Wed Aug 31 14:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.cpp:
-          Initialize pointer to zero
-
-Wed Aug 31 14:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MEM_Stream.{h,inl}:
-        * ace/OS_NS_sys_msg.{h,inl}:
-          64bit fixes
-
-        * ace/Framework_Component.cpp:
-          Initialize pointer to zero
-
-Wed Aug 31 08:48:19 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
-
-        * configure.ac:
-          Added a test to see if memcpy unrolling improves performance as
-          opposted to a vanilla memcpy. This optimization is thanks to
-          Mike Martinez martinez_m at oci dot com.
-
-        * OS_NS_string.inl:
-          Updated ACE_OS::memcpy to use the corresponding loop unrolling
-          based on a flag set by configure.
-
-Wed Aug 31 10:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Get_Opt.cpp:
-          Fixed 64bit conversion warning
-
-Wed Aug 31 10:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/LSOCK.{h,cpp} (recv_handle):
-          Changed the type of the len argument from int to ssize_t to
-          fix 64bit conversion problems
-
-Wed Aug 31 10:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
-        * ace/Log_Record.{h,inl}:
-          Fixed 64bit conversion problems
-
-Wed Aug 31 10:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Timer_Heap_T.{h,cpp}:
-          Fixed 64bit conversion problems
-
-Wed Aug 31 07:39:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Fixed WChar problem.
-
-Wed Aug 31 06:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test_Lib.cpp:
-          Fixed GCC 4 error
-
-Tue Aug 30 14:50:18 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.inl (ACE_Thread_ID):
-
-          Moved small functions out-of-line.  Reduces footprint and
-          improves performance slightly.
-
-        From Patrick Bennett <Patrick.Bennett@inin.com>
-        * ace/OS_NS_Thread.cpp (operator==):
-        * ace/Thread_Manager.inl (operator=-):
-
-        Corrected thread id/handle equality logic.  It was previously
-        inverted.
-
-Tue Aug 30 18:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-          Corrected remap test, some platforms grow the mmap area
-          downwards. This fixes bugzilla bug 2226. Thanks to
-          James Megquier <jmegquier at gmail dot com> for reporting this and
-          Steve Williams <steve at telxio dot com> for validating this.
-
-Tue Aug 30 18:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Use -fPIC instead -KPIC
-
-Tue Aug 30 18:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-          Some more wchar fixes
-
-Tue Aug 30 18:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.{h,cpp}:
-          Made the methods id, handle and to_string of the ACE_Thread_Id
-          class const. Thanks to Felix Wyss <FelixW at inin dot com>
-          for reporting this.
-
-Tue Aug 30 18:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Use icpc as C++ compiler.
-
-Tue Aug 30 14:49:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/README:
-          Added description for new ACE_HAS_IPV6_V6ONLY macro.
-
-Tue Aug 30 13:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_win32_icc.GNU:
-          First version of Intel C++ compiler on Windows using GNU make
-
-        * ace/config-win32-msvc-7.h:
-          Only define ACE_HAS_EXCEPTIONS when it is not defined yet
-
-Tue Aug 30 12:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Array_Map.h:
-          The 64bit version of the Intel C++ compiler can only work together
-          with the latest Platform SDK (June 2005). This SDK ships with an
-          old version of the system header files, this is not the same as
-          shipped with Visual C++ 2003. This SDK has the old STL implementation
-          as shipped with VC6, so we need the workaround for the VC6 compiler
-          also with the latest SDK. It seems newer system header files define
-          _CPPLIB_VER, when this is not defined we have old header file, so
-          made another check, when _MSC_VER is defined, but not _CPPLIB_VER
-          we assume older header files and use the vc6 way of reverse
-          iterator usage. Hopefully Microsoft ships a platform SDK soon which
-          has updated header files
-
-Tue Aug 30 12:22:17 2005  Simon McQueen  <sm@prismtech.com>
-
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/IO.h:
-
-          Removed mispelled message type 'CONFORMATION'.
-
-Tue Aug 30 10:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Process_Manager.cpp:
-        * ace/WFMO_Reactor.cpp:
-          Fixed incorrect checks for MSC_VER, it should be _MSC_VER
-
-Tue Aug 30 10:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-          Fixed compile error
-
-Tue Aug 30 09:00:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Default_Constants.h:
-          Added some new default macros for IPv6.
-
-        * ace/INET_Addr{.cpp .h .inl}:
-          Added more (IPv6 specific) functionality (is_xxx methods).
-          Changed get_host_addr() to return IPv6 formatted string for
-          IPv4 mapped IPv6 addresses (argumentation inside:).
-          Changed string_to_addr() to recognize and handle extended
-          IPv6 textual address format, i.e. '[' <ipv6> ']'.
-
-        * ace/Sock_Connect.cpp:
-          Added support for retrieval of IPv6 local interfaces to
-          ACE::get_ip_interfaces().
-          Supported for Windows XP (and newer) and Linux (possibly other
-          *nixes as well).
-
-Tue Aug 30 06:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          When inlining is disabled, add -fno-inline to the compiler flags.
-          This should fix the assembler errors the Intel 9 compiler on
-          linux gives
-
-Mon Aug 29 17:26:49 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Reactor_Token_T.h: Set the default queueing policy to
-          ACE_Token::FIFO, instead of ACE_TOKEN_TYPE::FIFO to work around
-          MSVC 6's inability to deal with the definition inside a
-          template class argument. This hack can be removed after
-          ACE 5.5 is released.
-
-Mon Aug 29 19:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-          Wchar fixes
-
-Mon Aug 29 14:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Based_Pointer_Test.cpp:
-          Fixed GCC compile error
-
-Mon Aug 29 14:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Object_Manager.cpp:
-          Also for Intel C++ call the _CrtSetReportMode
-
-Mon Aug 29 10:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/nmake.features:
-          New features file for the nmake project type
-
-Mon Aug 29 09:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.cpp:
-          Fixed bugzilla bug 2218, when an ACE_MMAP_Memory_Pool memory
-          segment base address is moved due to a remapping operation,
-          the ACE_Based_Pointer_Repository is updated with the new
-          base address, but the old mapping was not removed.
-
-          Thanks to Steve Williams <steve at telxio dot com> for reporting
-          this and supplying the fix and regression test below.
-
-Mon Aug 29 09:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.cpp:
-          Fixed bugzilla bug 2216, when an ACE_MMAP_Memory_Pool is created
-          using an existing backing store, the ACE_Based_Pointer_repository
-          was not updated with the mapped segment information.
-
-          Thanks to Steve Williams <steve at telxio dot com> for reporting
-          this and supplying the fix and regression test below.
-
-Mon Aug 29 09:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Based_Pointer_Repository.h:
-          Export the based pointer repository from the dll as singleton.
-          Fixes bugzilla bug 1919.
-
-        * tests/Based_Pointer_Test.cpp:
-        * tests/Based_Pointer_Test_Lib.cpp:
-          New test for bugzilla bug 1919. Thanks to Steve Williams
-          <steve at telxio dot com> for creating this test
-
-        * tests/run_test.lst:
-          Added Based_Pointer_Test
-
-        * tests/tests.mpc:
-          Added Based_Pointer_Test
-
-Sun Aug 28 14:25:07 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
-
-        * ace/Reactor.h:
-        * ace/Reactor.cpp:
-        * ace/Reactor.inl:
-        * ace/Select_Reactor.h:
-        * ace/Select_Reactor_Base.h:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Select_Reactor_T.h:
-        * ace/TP_Reactor.cpp:
-
-          The reactor framework in ACE allows plug and play of different
-          reactors such as Select, TP, Devpoll etc. The TAO middleware
-          implementation and applications that run atop TAO typically use
-          one particular implementation of the Reactor. For example, a
-          single-threaded application might use select_* reactors. The
-          Reactor framework uses the bridge pattern to transparently
-          invoke operations on the right reactors. When the concrete
-          Reactor is known, it should be possible to specialize the
-          framework to use the concrete reactor directly rather than use
-          the bridge.
-
-          As a part of the Feature Oriented Customizer (FOCUS) tool being
-          developed in my research, we are trying to specialize frameworks
-          when the concrete implementation type is known a priori. FOCUS
-          provides an XML based transformation engine, where the
-          specialization transformations are captured in XML file and a
-          weaver specializes the code.
-
-          To help in this transformation process, this commit adds markers
-          within the source code. These markers are added as special
-          comments. For example, //@@
-          REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK represents a hook
-          where forward declarations and include files are added by the
-          weaver. As these markers are comments therefore should not
-          affect normal applications in *any* manner. Additionally,
-          applications that use multiple reactor implementations not be
-          affected/do not need any change. Currently, these
-          specializations are targeted for TAO middleware, where
-          applications know the target reactor a priori and want to
-          leverage the specialization to improve performance.
-
-Sun Aug 28 14:13:25 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
-
-        * ace/Object_Manager.cpp:
-        * ace/Naming_Context.cpp:
-        * ace/Log_Msg.cpp:
-
-          When ACE_HAS_TRACE flag is defined, the aforementioned files did
-          not include the Trace.h include. This commit fixes the
-          resulting compilation problems.
-
-Fri Aug 26 18:01:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Select_Reactor.cpp:
-        * ace/Select_Reactor_Base.h:
-        * ace/Select_Reactor_T.(h cpp):
-        * ace/Reactor_Token_T.(h cpp): Moved the definition/implementation of
-          ACE_Select_Reactor_Token_T and its associated token-type selection
-          macros to new file Reactor_Token_T.(h cpp); retargeted
-          ACE_Select_Reactor_Token_T to call the ACE_Reactor_Impl interface
-          rather than ACE_Select_Reactor. Renamed the class
-          ACE_Reactor_Token_T to reflect this refactoring. This allows the
-          token to be used in reactor implementations that are not derived
-          from ACE_Select_Reactor.
-
-        * ace/ace.mpc:
-        * ace/Makefile.am: Added the new files Reactor_Token_T.cpp and .h.
-
-        * ace/Dev_Poll_Reactor.(h cpp): Replace the use of ACE_SYNCH_MUTEX with
-          ACE_Reactor_Token_T for the reactor's internal-protecting lock.
-          Allows threads wishing to twiddle with the registrations or run the
-          event loop to properly notify and synchronize with another thread
-          that's already running the event loop.
-          Also Clarified documentation on the queue-type members of
-          ACE_Dev_Poll_Reactor_Notify.
-
-        * ace/POSIX_Proactor.cpp (ACE_POSIX_SIG_Proactor::handle_events_i):
-          Retry the wait on EINTR. Previous comments said this automatically
-          happened because ACE_OSCALL_RETURN did it; it no longer does that,
-          so explicit EINTR check code was added here.
-
-        * apps/JAWS3/jaws3/Event_Dispatcher.h: Correct for the new reactor
-          token type defined, above.
-
-        * tests/MT_Reference_Counted_Event_Handler_Test.cpp: Added ACE_TEXT
-          where needed for ACE_DEBUG statements.
-
-        * tests/Multicast_Test.cpp: After stopping the reactor loop on test
-          timeout, wait for the task's thread(s) to exit or there's a race
-          between thread exit and deleting the task's memory.
-
-Fri Aug 26 10:52:38 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * ace/Array_Map.inl:
-
-          In operator[], broke complex statement into two statements.
-          Compiler got confused by the original statement and generated
-          incorrect code.
-
-Fri Aug 26 11:43:01 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.inl:
-        * ace/CDR_Stream.cpp:
-
-          Add a new simple class using RAII to call reset on an output CDR
-          when it goes out of scope. This is used to implement a new TAO
-          option that will reset() output CDRs after sending each request.
-
-          Add an optional ACE_Lock* to one of the input CDR
-          constructors. This is used by one of the TAO Any_Impl derived
-          classes to provide thread safety for its internal CDR.
-
-Fri Aug 26 11:02:21 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Enhanced the check_for_ace_check function to detect the use of
-          ACE_CHECK/ACE_CHECK_RETURN from within an ACE_TRY block.
-
-Fri Aug 26 09:40:08 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/OS_NS_Thread.cpp:
-
-          Add missing ACE_ADAPT_RETVAL functions for calls to ::pthread*
-          routines.  This allows the caller to check the errno to find out
-          what went wrong.
-
-Fri Aug 26 09:06:32 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Fixed the detection of missing ACE_CHECK/ACE_TRY_CHECK.  It was
-          missing most ACE_ENV_ARG_PARAMETER's due to a fouled up regular
-          expression.
-
-Fri Aug 26 13:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Reactor.cpp (schedule_timer):
-          Fixed implicit conversion from long to int to long, found
-          by 64bit warnings
-
-        * ace/POSIX_Asynch_IO.cpp:
-          Fixed 64bit bit conversion warning
-
-Thu Aug 25 18:53:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * tests/Array_Map_Test.cpp: Don't attempt to build this test if
-          using explicit template instantiation. It's hopeless trying STL
-          code with explicit templates, especially portably.
-
-        * tests/Time_Value_Test.cpp: Fixed typo.
-
-Thu Aug 25 11:40:36 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/Task.cpp (activate): Corrected misuse of the argument
-          'grp_id' rather than the data member 'grp_id_'.  This prevented
-          activate() from being able to join existing group.  Thanks to
-          Kevin Heifner <heifner_k at ociweb dot com> for catching this.
-
-Thu Aug 25 12:32:18 2005  Steve Huston  <shuston@riverace.com>
-
-        * tests/Process_Manual_Event_Test.cpp: Removed #if0 block put in
-          for testing and fixed compile error.
-
-Wed Aug 24 19:09:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac: Copied in updated copyright paragraph from COPYING.
-
-        * ace/OS_NS_Thread.cpp: Formatting fixes.
-
-        * tests/Process_Manual_Event_Test.cpp: ACE_ERROR formatting
-          corrections (%p needs a string); code format fixes.
-
-Wed Aug 24 17:15:28 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Stream_Modules.h: Added some info about ACE_Stream_Head so
-          I don't have to keep looking it up ;-)
-
-Wed Aug 24 12:39:04 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Fixed this script to work with the ACE_ENV_ARG_PARAMTER and
-          ACE_ENV_SINGLE_ARG_PARAMETER macros.  This will begin to check all
-          of the missing ACE_CHECK/ACE_TRY_CHECK's again.
-
-Wed Aug 24 08:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_Base.cpp:
-          Fixed possible unitialized used warning
-
-Tue Aug 23 22:56:33 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Dev_Poll_Reactor.cpp (close):
-
-          Removed unnecessary zeroing of underlying epoll data structure
-          array.
-
-          Deallocate epoll event data structure array and /dev/poll event
-          handler file descriptor array after closing the epoll and
-          /dev/poll file descriptor, respectively, to ensure consistent
-          finalization of resources, to prevent potential destruction of
-          event resources while waiting for events in another thread.
-          It's not clear whether such a scenario will occur since a lock
-          is currently held but better to be consistent.
-
-Tue Aug 23 22:35:00 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Array_Map_Test.cpp (reference_count_test):
-
-          Added some assertions to further verify correct ACE_Array_Map
-          operation.
-
-        * tests/Dev_Poll_Reactor_Test.cpp (handle_input):
-
-          Fixed loop variable increment.  A for-scope variable was
-          shadowing the "bytes_read" value, preventing the loop variable
-          from being updated correctly.
-
-Tue Aug 23 22:24:16 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Atomic_Op_T.cpp:
-        * ace/Atomic_Op_T.inl:
-
-          Moved inlined constructor to the ".inl" inline source file.
-
-Tue Aug 23 22:17:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * apps/JAWS2/JAWS/JAWS.h:
-
-          Fixed '"JAWS_NTRACE" is not defined' g++ 4.0 preprocessor symbol
-          warning.
-
-Tue Aug 23 19:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/IO_Handler.{h,cpp}:
-          Tried to fix gcc4 errors
-
-Tue Aug 23 18:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration.cpp:
-          Explicitly initialize local variables
-
-        * ace/OS_NS_sys_socket.inl:
-          Removed not needed c-style casts that caused 64bit warnings
-
-Mon Aug 22 09:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/bmake.features
-        * bin/MakeProjectCreator/config/borland.features
-        * bin/MakeProjectCreator/config/em3.features
-        * bin/MakeProjectCreator/config/gnuace.features
-        * bin/MakeProjectCreator/config/vc6.features
-        * bin/MakeProjectCreator/config/vc71.features
-        * bin/MakeProjectCreator/config/vc8.features
-          New features file for each project type we ship in the release.
-          This files are read by MPC for the correct type when generating
-          makefiles.
-
-        * bin/make_release:
-          No need to generate multiple default.features file in the
-          release proces, this is now handled in the features file
-          per project type
-
-Mon Aug 22 08:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-unixware-7.1.0.udk.h:
-          Removed commented out define
-
-Mon Aug 22 08:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-msvc-8.h:
-          Disable warning 4290 again
-
-Mon Aug 22 08:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Configuration.{h,cpp}:
-          Moved operator != out of header file to cpp file
-
-Mon Aug 22 11:09:07 2005  Olli Savia  <ops@iki.fi>
-
-        * include/makeinclude/platform_lynxos.GNU:
-          Improved shared library support for LynxOS 4.0
-
-Sun Aug 21 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_T.cpp (check_handles):
-          Pass select_handles as 0 on Win32, this was now just done for
-          Win64, but it is not needed on Win32 and also causes conversion
-          warnings when 64bit checks are enabled on win32.
-
-Sun Aug 21 11:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added the new core libs
-
-Fri Aug 19 14:15:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Reverted IPv6 related to accomodate some TAO builds which have
-          ACE_HAS_IPV6 but do not have my TAO IPv6 changes yet.
-          Will commit all at a later moment.
-
-Fri Aug 19 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Name_Request_Reply.cpp:
-          Fixed conversion warning
-
-Fri Aug 19 13:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.cpp
-        * ace/Log_Msg.cpp
-        * ace/MEM_Acceptor.cpp
-        * ace/MEM_IO.inl
-        * ace/Select_Reactor_Base.cpp
-        * ace/SV_Semaphore_Complex.cpp
-        * ace/UUID.cpp
-        * ace/WIN32_Asynch_IO.cpp
-          Fixed conversion warnings given by Visual C++ 2003 at warning
-          level 4. Used the correct types for intermediate variables, no
-          casts are needed.
-
-Fri Aug 19 12:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CORBA_macros.h:
-          For HP aCC use the special ACE_THROW_RETURN to fix the warnings
-          that the compiler gives
-
-Fri Aug 19 09:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/tao_pi.doxygen:
-        * etc/tao_pi_server.doxygen:
-        * etc/tao_anytypecode.doxygen:
-          New config files
-
-        * etc/tao_portableserver.doxygen:
-          Cleanup
-
-        * html/index.html:
-          Added new libs
-
-        * bin/generate_doxygen.pl:
-          Also generate documentation for the new projects
-
-Fri Aug 19 09:04:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Added include of OS_NS_stdio.h since some builds otherwise miss out
-          on things like ACE_OS::fopen() and such (now for real).
-
-        * ace/SOCK_Connector.cpp:
-          Reverted change which was meant for Sock_Connect.cpp:-(
-
-Fri Aug 19 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-msvc-7.h:
-          Disable 4290 again, a scoreboard build showed that we need to
-          disable it, but didn't had that problem on my local systme
-
-Fri Aug 19 08:33:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Added include of OS_NS_stdio.h since some builds otherwise miss out
-          on things like ACE_OS::fopen() and such.
-
-Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged changes from the AnyRefactor branch as below
-
-        Wed Aug 17 07:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/anytypecode.mpb:
-        * bin/MakeProjectCreator/config/taoclient.mpb:
-        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
-          By default we now suppress Any and Typecode generation with -Sa
-          and -St but when the AnyTypeCode library is used, then these
-          options are removed from the idl flags. This way simple apps
-          don't get this lib by default
-
-        Tue Aug 16 19:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-msvc-7.h:
-        * ace/config-win32-msvc-8.h:
-          Removed disabling of warning 4290
-
-        * ace/CORBA_macros.h:
-          Removed special ACE_THROW_RETURN for win32 and HP aCC, this
-          is not needed and only gives a lot of warnings at level 4
-          with msvc
-
-        Thu Aug 11 10:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/orbsvcsexe.mpb:
-          Added AnyTypeCode
-
-        Wed Aug 10 11:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
-          Added AnyTypeCode as base project.
-
-        Wed Aug 10 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/valuetype.mpb:
-          Added AnyTypeCode as base project
-
-        Wed Aug 10 08:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/taoclient.mpb:
-          Just for short, added anytypecode to the client. This should really be
-          dependent on the idl compiler flags
-
-        Fri Jul 29 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/codecfactory.mpb
-        * bin/MakeProjectCreator/config/dynamicany.mpb
-        * bin/MakeProjectCreator/config/ifr_client.mpb
-        * bin/MakeProjectCreator/config/iormanip.mpb
-        * bin/MakeProjectCreator/config/strategies.mpb
-          Added AnyTypeCode as base project
-
-        Thu Jul 28 12:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/anytypecode.mpb:
-          New base project
-
-Thu Aug 18 09:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Added support for retrieval of IPv6 local interfaces to
-          ACE::get_ip_interfaces().
-          Supported for Windows XP (and newer) and Linux (possibly other
-          *nixes as well).
-
-Wed Aug 17 18:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Message_Block.{h,cpp,inl}:
-          In case a locking strategy is used, also make sure we use the
-          lock when accessing the reference count of the ACE_Data_Block.
-          Thanks to Viktor Chernenko
-          <viktor dot chernenko at med dot ge dot com> for reporting this
-          and supplying some patches to start with. This should fix
-          according to Viktor some crashes in the notificaion service
-          under high load.
-
-Wed Aug 17 15:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Recursive_Thread_Mutex.{h,cpp}:
-          Moved ACE_Condition_Recursive_Thread_Mutex constructor
-          implementation from header to cpp file
-
-Wed Aug 17 15:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Waiter.cpp:
-          Call find_by_index instead of find
-
-Tue Aug 16 19:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Assoc_Array.{h,cpp}:
-        * apps/JAWS2/JAWS/Concurrency.cpp:
-          Changed find(int) to find_by_index (int), to resolve
-          ambiguity warnings of the HP aCC compiler
-
-Tue Aug 16 11:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Pipeline_Handler_T.cpp:
-          Replaced c-style cast with reinterpret cast
-
-Tue Aug 16 11:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Added ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-Tue Aug 16 06:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Assoc_Array.cpp:
-          Removed pragma once
-
-Mon Aug 15 21:55:00 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * apps/JAWS2/JAWS/IO_Handler.cpp: #include "JAWS/Filecach.h"
-          to get the definition of JAWS_Cached_FILE.  Thanks to
-          Simon Massey and Steve Huston for reporting this.
-
-Mon Aug 15 11:03:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/dslogadmin_serv.mpb:
-
-          Changed to inherit from utils.
-
-Mon Aug 15 09:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.cpp:
-          We first try to find the file using the decorator so that when a
-          filename with and without decorator is used, we get the file with
-          the same decorator as the ACE dll has and then as last resort
-          the one without. For example with msvc, the debug build has a "d"
-          decorator, but the release build has none and we really want to get
-          the debug version of the library in a debug application instead
-          of the release one.
-
-          Thanks to Vitaly Belekhov <vitaly at megasignal dot com> for
-          reporting this and supply the patches. This fixed bugzilla
-          2210
-
-Sun Aug 14 11:27:54 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * apps/JAWS2/JAWS/IO_Handler.cpp (handle_transmit_file): Fixed
-          a bug where
-
-            delete (ACE_Filecache_Handle *) result.act ();
-
-          should have been
-
-            delete (JAWS_Cached_FILE *) result.act ();
-
-          Thanks to Anand Rathi <anandprathi@yahoo.co.in> for reporting
-          this.
-
-Fri Aug 12 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Parse_Headers.{h,cpp}:
-          Changed STATUS_CODE enum to fix compile errors with VxWorks
-
-Thu Aug 11 16:04:30 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/OS_NS_stdio.inl (ACE_HAS_WCHAR vsnprintf): This is an
-          actively edited file today!  Fixed the name of the last
-          argument in the call so that it actually matches the name
-          of the argument in the arg list.
-
-Thu Aug 11 14:13:22 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-
-          ACE will not compile with SunCC 5.6 or 5.7 if native exceptions
-          are disabled unless STLPort is used.
-
-Thu Aug 11 12:29:39 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Time_Value.inl (msec): When moving tv_sec to ACE_UINT64,
-          static cast it to the desired ACE_UINT64, not ACE_UINT32.
-
-        * ace/ace_wchar.inl (convert):
-        * ace/OS_NS_unistd.inl (read):
-        * ace/OS_NS_stdio.inl (fread, fwrite):
-        * ace/OS_NS_sys_socket.inl (sendto): Use proper types portable to
-          64 bits.
-
-        * ace/Functor.inl (ACE_Hash<ACE_UINT64>): If unsigned long is
-          not 4 bytes, don't try to cast 64 bits down to 4 bytes.
-
-        * ace/OS_NS_stdio.inl (ACE_HAS_WCHAR vsnprintf): This is the same
-          situation as ACE_OS::vsprintf - the X/Open/XPG folks got it right
-          and added the maxlen argument when defining wide-char *printf
-          functions, so just use vswprintf() - there's no such thing as
-          vswnprintf().
-
-Thu Aug 11 06:44:44 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/depgen.pl:
-        * bin/DependencyGenerator/DependencyWriterFactory.pm:
-        * bin/DependencyGenerator/MakeDependencyWriter.pm:
-        * bin/DependencyGenerator/MakeObjectGenerator.pm:
-        * bin/DependencyGenerator/ObjectGeneratorFactory.pm:
-
-          Added a generic make dependency generator.
-
-        * bin/MakeProjectCreator/config/smart_proxies.mpb:
-
-          Switched orbsvcslib with taolib_with_idl since Smart Proxies have
-          nothing to do with orbsvcs.
-
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
-
-          Added support for CIAO and a hook for correctly modifying the
-          library path to account for differences with the automake layout
-          of ACE and TAO.
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          If static_libs_only is set to 1, build up a list of libraries upon
-          which the BIN target will be dependent.  This will cause binaries
-          to re-link in the event that a static library is updated.
-
-Thu Aug 11 09:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.inl:
-          Made the wchar vsnprintf a notsup, linux doesn't support this and
-          I don't have time to fix this.
-
-Thu Aug 11 07:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Concurrency.cpp:
-          Fixed single threaded build
-
-Thu Aug 11 07:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.inl:
-          Added wchar vsnprintf version, was declared but not implemented
-
-Wed Aug 10 15:43:37 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tests/run_test.lst:
-          Excluded tests inappropriate for HP-NSK platform
-
-Wed Aug 10 11:27:01 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_stdio.inl (vsnprintf):
-
-          Fixed "no return statement in function returning non-void"
-          warning.
-
-          Removed uses of deprecated ACE_OSCALL macro.
-
-Wed Aug 10 10:03:40 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * ace/OS_NS_stdio.inl:
-        * ace/Process.cpp
-
-          Regarding change:
-          Fri Jul 22 13:29:32 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-          use vsnprintf only if the platform supports it.
-
-Wed Aug 10 07:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/IO_Acceptor.cpp:
-        * apps/JAWS2/JAWS/IO_Handler.h:
-          Fixed compile errors in Cygwin build
-
-Wed Aug 10 07:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Reaper.h:
-          Fixed compile error in single threaded builds
-
-Tue Aug  9 16:57:09 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/MakeProjectCreator/config/taolib.mpb:
-          Added the codeset project to the "after" list to ensure the
-          codeset library is built for any project that also depends on
-          TAO. This is necessary because there are some executables that
-          depend on libTAO and may therefore depend on libTAO_Codeset, but
-          do not include taoexe in the MPC base project list. For example
-          some of the CIAO executables have no need for the build elements
-          brought in by taoidldefaults base project.
-
-Tue Aug  9 11:11:50 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/MakeProjectCreator/config/negotiate_codesets.mpb:
-          Removed unused compiler macro.
-
-        * bin/MakeProjectCreator/config/orbsvcsexe.mpb:
-        * bin/MakeProjectCreator/config/rt_client.mpb:
-        * bin/MakeProjectCreator/config/rt_server.mpb:
-          Added dependency on negotiate_codesets feature so that the
-          TAO_Codeset library will be added in the correct order,
-          if desired.
-
-        * bin/MakeProjectCreator/config/taoexe.mpb:
-          Added Codeset project to the After list to ensure that the
-          Codeset library is available for dynamic linking for those
-          applications that require it.
-
-Tue Aug  9 10:48:39 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/OS_NS_stdio.cpp (snprintf): Added a wchar_t version of
-          snprintf().  Thanks to Simon Massey for reporting this.
-
-Tue Aug  9 13:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release:
-          Added sxd to files that should not get crlf conversion
-
-Tue Aug  9 13:18:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Global_Macros.h:
-
-          Added missing '#' before a 'define'.
-
-Tue Aug  9 11:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-msvc-6.h:
-          Added ACE_HAS_NO_THROW_SPEC
-
-        * ace/Global_Macros.h:
-          Simplified ACE_THROW_SPEC specificiation. This way with vc71 and vc8
-          we get exception specifications.
-
-Tue Aug  9 10:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Svc_Conf_l.cpp:
-          Forced a commit of this file, will probably solve the regeneration
-          errors
-
-        * apps/JAWS2/JAWS/Waiter.h:
-          Added missing include
-
-Mon Aug  8 12:54:51 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Msg.cpp (open): Reverted these changes:
-          Fri Apr 22 18:02:37 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-          * ace/Log_Msg.cpp (open): Fixed a problem with LOGGER and logger_key
-            and the backend_->open() call.  Thanks to Jerry D. De Master
-            <jdemaste at rite-solutions dot com> for reporting this.
-
-          Tue Jan 18 08:17:10 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-          * ace/Log_Msg.cpp (open): Fixed the logic to pass prog_name
-            rather than logger_key, which fixes a bug with syslog.  Thanks
-            to Robert Iakobashvili <roberti@GoNetworks.com> for this fix.
-
-          They broke a fix from:
-          Sat Dec  1 19:39:22 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Msg.h: Improved the documentation for open() to note the
-          role of the logger_key argument when LOGGER and SYSLOG are set in
-          flags.
-          To get the progr_name used as the syslog/event log source ID, pass
-          a 0 logger_key.
-
-        * ace/SOCK_Dgram_Mcast.h: Clarified that instead of using set_option,
-          use ACE_SOCK::set_option().
-
-        * ace/DEV_Addr.{h inl cpp}: Fix non-0-terminated name possibility
-          when setting a new name. Thanks to James Damour
-          <james dot damour at request dot com> for this fix.
-          Also introduced a private enum to define the length of the name
-          buffer and use the new value to limit string copy sizes.
-
-        * THANKS: Added James Damour to the Hall of Fame.
-
-Mon Aug  8 10:44:16 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/OS_NS_stdio.inl
-        * ace/Process.cpp
-
-        Fixed a compilation problem from:
-
-        Fri Jul 22 13:29:32 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-Mon Aug  8 09:57:15 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/config-macosx-tiger.h
-        * include/makeinclude/platform_macosx_tiger_gcc4.GNU
-
-        Adding preliminary support for OS X 10.4
-
-Mon Aug  8 13:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/Concurrency.{h,cpp}:
-          Fixed compile problems in single threaded build
-
-Sat Aug  6 17:25:04 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Svc_Conf.l: Removed the ' and " characters to avoid
-          problems with Lex.  Thanks to Rohini Madhavan <ro_madhavan at
-          sify dot com> and Brian Buesker <bbuesker at qualcomm dot com>
-          for helping with this.
-
-Wed Aug  3 12:35:23 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Asynch_Acceptor.{h,cpp}:
-        * ace/Asynch_Connector.{h,cpp}: Fixed the code so it doesn't try
-          to build on Windows CE.  Thanks to Alan Anderson
-          <Alan.Anderson@sdsmt.edu> for reporting this.
-
-        * ace/DEV_Addr.cpp (set): NULL-terminate the devname_ string.
-          Thanks to James Damour <james.damour@request.com> for reporting
-          this problem.
-
-Tue Aug  2 14:01:39 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * THANKS: Added Abdel Rigumye <rigumyea at ociweb dot com>,
-          who is the 2000th contributor to ACE+TAO+CIAO!!!!
-
-Fri Jul 22 13:29:32 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Process.cpp (command_line): Changed the use of
-          ACE_OS::vsprintf() to use the new ACE_OS::vsnprintf().  Thanks
-          to Xue for this suggestion, as well.
-
-        * ace/OS_NS_stdio.{h,inl}: Added support for ACE_OS::vsnprintf().
-          Thanks to Xue Yong Zhi <seclib at seclib dot com> for this
-          suggestion.
-
-Mon Aug  8 08:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added two new collocation tests
-
-        * apps/JAWS2/JAWS/jaws2.mpc:
-          New MPC file
-
-Fri Aug 05 07:37:20 2005  Simon Massey  <sma@prismtech.com>
-
-        * ACE version 5.4.7 released.
-
-Fri Aug  5 13:19:33 2005  Simon McQueen  <sm@prismtech.com>
-
-        * Release:
-
-          Remove tagging of man/* files.
-
-Thu Aug  4 16:10:24 BST 2005  Donald Sharp   <Donald.Sharp@prismtech.com>
-
-        * tests/Array_Map_Test.cpp:
-          Some compilers, like SunCC5.5 on Solaris, do not delete their
-          temporaries in expression scope. Placing the expressions in an
-          inner block ensures that the reference count is as expected
-
-Wed Aug 03 09:35:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Process_Manual_Event_Test.cpp:
-          Added additional tests for lacking PSHARED support.
-
-Sat Jul 30 10:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_other_tests.lst:
-          Added missing semi colon for CosEvent basic test
-
-Fri Jul 29 14:25:12 2005  Steve Huston  <shuston@riverace.com>
-
-      * ace/config-aix-5.x.h: Disable ACE_HAS_POSIX_SEM if the Posix
-        flags indicate its presence but _XOPEN_SOURCE is not >= 500.
-
-      * tests/run_test.pl: When looking for sub-log files, match the program
-        name only at the start. Prevents finding, for example,
-        Process_Manual_Event_Test-child.log when looking for
-        Manual_Event_Test-*.log.
-
-Fri Jul 29 14:26:37 2005  Simon McQueen  <sm@prismtech.com>
-
-        *  bin/tao_other_tests.lst:
-
-           Scheduled TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl to be
-           run on all not minimum or single threaded builds.
-
-Fri Jul 29 09:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/JAWS/Filecache.cpp:
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/IO_Handler.cpp:
-          Fixed compile errors when building with Borland C++. I have created
-          an MPC file but find it too risky to add that just before the
-          release, will do that when the release is out.
-
-        * ace/Global_Macros.h:
-          When ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS is defined, define
-          a special version of ACE_DES_FREE_TEMPLATE3 and
-          ACE_DES_FREE_TEMPLATE4 just as we do for ACE_DES_FREE_TEMPLATE and
-          ACE_DES_FREE_TEMPLATE2.
-
-          Thanks to Olivier Gu�in <guerin35 at hotmail dot com>
-          for reporting this.
-
-Fri Jul 29 07:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_cray.GNU:
-        * include/makeinclude/platform_freebsd.GNU:
-        * include/makeinclude/platform_hpux.GNU:
-        * include/makeinclude/platform_hpux_gcc.GNU:
-        * include/makeinclude/platform_irix5.3_g++.GNU:
-        * include/makeinclude/platform_irix6.x_g++.GNU:
-        * include/makeinclude/platform_irix6.x_kcc.GNU:
-        * include/makeinclude/platform_linux_borland.GNU:
-        * include/makeinclude/platform_m88k.GNU:
-        * include/makeinclude/platform_mvs.GNU:
-        * include/makeinclude/platform_netbsd.GNU:
-        * include/makeinclude/platform_openbsd.GNU:
-        * include/makeinclude/platform_osf1_3.2_cxx.GNU:
-        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
-        * include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU:
-        * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU:
-        * include/makeinclude/platform_sco5.0.0-mit-pthread.GNU:
-        * include/makeinclude/platform_sco5.0.0-nothread.GNU:
-        * include/makeinclude/platform_tandem.GNU:
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-        * include/makeinclude/platform_win32_interix.GNU:
-          Updated location for libraries from $ACE_ROOT/ace to
-          $ACE_ROOT/lib. Thanks to Ian Zagorskih
-          <ianzag at megasignal dot com> for reporting this.
-          This fixes bugzilla 2202
-
-Thu Jul 28 13:59:11 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Added !MINIMUM to Bug_1630_Regression test. It needs the IFR.
-
-Thu Jul 28 01:46:40 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Cache_Map_Manager_T.cpp:
-        * ace/Cache_Map_Manager_T.inl:
-        * ace/MEM_SAP.cpp:
-        * ace/MEM_SAP.inl:
-        * ace/Map_T.cpp:
-        * ace/Map_T.inl:
-        * ace/Signal.cpp:
-        * ace/Signal.inl:
-
-          Moved virtual destructors in exported classes out of line.
-          Addresses RTTI problems when the using g++ 4.0 hidden visibility
-          for inline functions feature.
-
-Thu Jul 28 00:28:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.cpp:
-        * ace/Array_Map.h:
-        * ace/Array_Map.inl:
-
-          Added third equality functor template parameter.  Defaults to
-          std::equal_to<> if unspecified.  Necessary for cases where
-          operator==() is not suitable or available for a given key type.
-
-          (erase):
-
-          Explicitly destroy the tail element by assigning a default
-                constructed value_type instance to it.  Prevents duplicate
-          instances of erase()d elements from existing.  Some applications
-          may assume that erased elements no longer exist.  This
-          essentially disables the lazy destruction behavior of
-          ACE_Array_Map.  Note that this change also applies to the case
-          of a map of size 1.
-
-        * ace/Refcountable.cpp:
-        * ace/Refcountable.inl:
-
-          Moved ~ACE_Refcountable() virtual destructor out of line.
-          Addresses RTTI issues when g++ 4.0 hidden visibility of inlined
-          functions is enabled.
-
-        * ace/config-lite.h:
-
-          Disable use of ACE_RCSIDs by default.  Most users never need to
-          determine the RCS ID of a given object file in an ACE-based
-          binary so optimize for the common case.  Also reduces
-          footprint.
-
-        * tests/Array_Map_Test.cpp:
-
-          Added reference count test to verify that the number of
-          references/copies of a given data element drop by the same
-          amount as was increased during insertion.
-
-Wed Jul 27 16:33:46 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * ace/config-tandem-nsk-mips-v3.h:
-
-          Add #define for ACE_ANY_OPS_USE_NAMESPACE
-
-Mon Jul 25 19:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Naming_Test.cpp:
-          Initialise pointer with 0
-
-Mon Jul 25 15:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Timer_Hash_T.cpp:
-          Initialise some pointers with 0
-
-        * ace/Refcountable.h:
-          Removed some empty doxygen tags
-
-        * ace/Naming_Context.cpp:
-          Removed not needed ACE_UNUSED_ARG
-
-Sat Jul 23 16:36:36 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * bin/ciao_tests.lst:
-
-          enabled running CIAO NodeApplicationTest again.
-
-Fri Jul 22 16:31:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Basic_Types.h: The change from:
-          Fri Jul 8 15:42:18 2005 Steve Huston <shuston@riverace.com>
-          turned a previous warning into an error on newer g++ versions.
-          Instead, moved the __hi_lo struct definition out of the
-          anonymous union and renamed it to not be a compiler-private name
-          (with 2 leading underscores). This should resolve all the
-          issues. Thanks to Simon Massey for figuring this out.
-
-Fri Jul 22 11:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
-          Add naming as base project, CIAO_DnC_Server has this
-          also
-
-Fri Jul 22 09:30:00 UTC 2005  Simon Massey  <sma@prismtech.com>
-
-        * tests/run_test.lst:
-          Don't run Process_Manual_Event_Test on HPUX
-
-Thu Jul 21 10:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Don't run Bug_2174_Regression in a minimum corba build
-
-Thu Jul 21 09:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Atomic_Op_T.h:
-          Use deprecate tag for deprecated methods
-
-Thu Jul 21 09:24:58 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/ciao_tests.lst:
-
-          Descheduled the 3 TAO/CIAO/DAnCE/tests/NodeApplicationTest
-          tests. They fail and there have been no responses to
-          requests that they be fixed.
-
-Wed Jul 20 06:45:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/msvc_static_order.lst:
-
-          Added Ds{Event,Notify}LogAdmin_{IDL,Skel,Serv} --- just to
-          be safe.
-
-Wed Jul 20 09:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * protocols/ace/RMCast/Makefile.am:
-          Added new files
-
-Wed Jul 20 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Check for result != 0 instead of result > 0. It seems that when
-          a run_test.pl has been added from a windows box that it sometimes
-          doesn't get execute permission and then the script can't be
-          executed on Unix systems. The return value is then -1 and this
-          wasn't detected by the scripts
-
-Wed Jul 20 07:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added DsLogAdmin_IDL
-
-Tue Jul 19 14:24:47 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * bin/PerlACE/Process_Unix.pm:
-
-          Append command line arguments based on ACE_RUNTEST_ARGS
-          environment variable.
-
-        * ace/config-tandem-nsk-mips-v3.h:
-
-          Adjust platform specific macros
-
-Tue Jul 19 19:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Record.cpp:
-          Reverted part of the change below. Not all platforms have snprintf,
-          just use sprintf, all platforms have that. Fixes problems with
-          VxWorks
-          Thu Jul 14 12:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-Tue Jul 19 14:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new Register_Initial_References test. This will fail in
-          all builds, it seems we have some bugs to fix
-
-Tue Jul 19 12:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new recursive ORBInitializer test
-
-Tue Jul 19 11:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Enable Bug_2088, rewrote this test to test the current functionality
-          which matches the draft 3.1 spec. The Corba 3.0.3 seems to be not
-          usable.
-
-Tue Jul 19 10:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_fcntl.cpp:
-        * ace/OS_NS_sys_mman.inl:
-          When returning an ACE_HANDLE return ACE_INVALID_HANDLE instead
-          of -1 as error
-
-Mon Jul 18 18:21:20 2005  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Added ACE_OS::closesocket() and Solaris 10 notes.
-
-Mon Jul 18 12:11:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/msvc_static_order.lst:
-
-          Add CosNaming_IDL, CosTrading_IDL, and CosNotification_IDL
-          projects to list.
-
-Mon Jul 18 11:42:09 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Revived the old style where each GNUmakefile has individual
-          targets that contain the necessary dependencies.  To utilize this
-          you must set the MPC_GNUACE_NAMED_TARGETS environment variable.
-
-Mon Jul 18 09:08:01 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Added OBV/ValueBox the list of tests. This is a new test
-          to exercise boxed value types.
-
-Mon Jul 18 15:51:04 2005  Simon McQueen  <sm@prismtech.com>
-
-        * ace/OS_NS_Thread.cpp:
-
-          Removed unreachable statements identified by HP non stop
-          MIPS build warnings.
-
-Mon Jul 18 09:21:14 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-
-          Took out TAO-specific comments.
-
-Mon Jul 18 13:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Mem_Map.cpp:
-
-          Reverted the change below, it causes problems on AIX and Solaris. It
-          seems that on AIX we now use ACE_OS::open for shared memory, with the
-          change below we use ACE_OS::shm_open but this fails for strange
-          reasons and I have no idea what the problem is at this moment. So
-          revert this until Martin is back from his vacation
-
-          Tue Jul 05 21:40:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-          Changed to consistently use ACE_OS::shm_open/ACE_OS::shm_unlink.
-
-Mon Jul 18 13:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/index.html:
-          Update link for DAnCE
-
-Mon Jul 18 15:02:58 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Fragment.cpp:
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Reassemble.cpp:
-
-          Fixed a bunch of warnings.
-
-Mon Jul 18 08:00:35 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-
-          Added comments regarding TAG_ALTERNATE_IIOP_ADDRESS and
-          refactored codeset negotiation support.
-
-Mon Jul 18 10:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.cpp (init_acquire):
-          Added class name to the error messages and print the method
-          name.
-
-        * ace/SString.cpp:
-          Initialise pointers with 0
-
-Mon Jul 18 11:33:23 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * NEWS:
-
-          Updated with the latest achievements in RMCast.
-
-Mon Jul 18 08:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release:
-          Removed exclude of asnmp.mwc, this file has been zapped
-
-Fri Jul 15 16:35:37 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/MakeProjectCreator/config/global.features:
-        * bin/MakeProjectCreator/config/negotiate_codesets.mpb:
-        * bin/MakeProjectCreator/config/taoclient.mpb:
-        * bin/MakeProjectCreator/config/taoserver.mpb:
-
-          Added a new feature, negotiate_codesets. Disabled by default,
-          but when enabled in default.features or on the mpc/mwc command
-          line adds TAO_Codeset to the project's libs list. Dynamically
-          linked applications do not need to do anything, the libary will
-          be dynamically loaded if needed by the ORB. Static applications
-          must enable this feature. Merely enabling is not sufficient, to
-          actually make use of the codeset code, they must also include
-          tao/Codeset/Codeset.h somewhere in their application. Enabling
-          the mpc feature without including the header will not cause any
-          code to be statically linked. Enabling the feature with dynamic
-          applications will add a dependency on the TAO_Codeset library
-          regardless of the use of the code.
-
-Fri Jul 15 08:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release:
-          Also exclude ASNMP/asnmp.mwc when generating the em3 project files.
-          Thanks to Sam Mesh <sam dot mesh at gmail dot com> for reporting
-          this. This fixes bugzilla bug 2190.
-
-Thu Jul 14 12:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Record.cpp:
-          Fixed compile error in previous committed caused when merging
-          changes from one system to another
-
-Thu Jul 14 12:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.cpp (sprintf wchar):
-          ULONG_MAX was passed, this caused vswprintf to return always -1
-          because ULONG_MAX is of course really large on a 64bit system.
-          Pass 4096 instead, just as done with the other vswprintf in
-          OS_NS_stdio.inl.
-
-        * ace/Log_Record.cpp:
-          Use snprintf because we know the sizes of the buffer, this way
-          we don't call the method above that caused problems on 64bit
-          systems. This fixes bugzilla 2176.
-
-Thu Jul 14 09:31:55 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Flow.cpp:
-
-          Fixed fuzz error over math.h inclusion.
-
-Wed Jul 13 22:12:12 UTC 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * etc/ciao_DAnCE.doxygen
-
-          Added "RECURSIVE=YES" so source files could be found correctly
-          Also added excluded path option for CIAO examples and tests.
-
-Wed Jul 13 17:10:45 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/MakeProjectCreator/config/codeset.mpb:
-
-          A new base project for use when creating codeset translators or
-          any other code that must depend on the new library, TAO_Codeset.
-
-Wed Jul 13 12:42:57 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Due to the way that the ORB is coded such that it does not require
-          the IFR_Client library at link time, the InterfaceRepo/Application
-          test can not run on static builds (even though the client has the
-          IFR_Client library linked in).
-
-Wed Jul 13 12:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Process_Semaphore_Test.cpp:
-          Fixed compile error in previous change
-
-Wed Jul 13 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Process_Semaphore_Test.cpp:
-          Only test timeouts when ACE_HAS_POSIX_SEM_TIMEOUT is defined
-
-Wed Jul 13 07:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.5.h:
-          Added include of config-posix.h, let this file try to sort out
-          which posix parts Sun delivers
-
-        * ace/config-sunos5.6.h:
-          Sun 5.6 incorrectly reports that it has shm_open
-
-Wed Jul 13 07:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Process_Semaphore.cpp:
-          Removed commented out explicit template instantiations
-
-        * ace/Containers_T.h:
-          Small doxygen fix
-
-Tue Jul 12 22:59:12 UTC 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * html/index.html:
-
-          Fixed a typo which was introduced in this HTML file for
-          my earlier checkin.
-
-Tue Jul 12 16:17:38 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu> t
-
-        * Updated all the COPYING files to reflect the revised DOC
-          software open-source license.  Thanks to Angela Ziegenhorn
-          <Angela.Ziegenhorn@veritas.com> for these modifications.
-
-Tue Jul 12 18:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Manager.cpp (remove_thr_all):
-          Don't just delete each Thread_Descriptor, but call remove_thr
-          for each Thread_Descriptor, this method will add the descriptor
-          to the freelist and handle all other cleanup actions. Fixes
-          some invalid reads we found in some RTCorba tests
-
-Tue Jul 12 17:15:00 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Flow.cpp:
-        * protocols/ace/RMCast/Protocol.h:
-
-        Added missing includes.
-
-Tue Jul 12 14:46:53 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Parameters.h:
-
-        Forgot to add this file for Mon Jul 11 20:08:51 2005.
-
-Mon Jul 11 12:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-msvc-8.h:
-          Only define ACE_HAS_SIG_ATOMIC_T when not building for WinCE.
-          Thanks to Mitscher Dubreus <ofup at voila dot fr> for reporting
-          this.
-
-Mon Jul 11 12:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Manager.inl:
-          Initialise pointer with 0
-
-Mon Jul 11 20:08:51 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Flow.cpp:
-        * protocols/ace/RMCast/Flow.h:
-
-        Implemented flow control stack element.
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Acknowledge.h:
-        * protocols/ace/RMCast/Fragment.cpp:
-        * protocols/ace/RMCast/Fragment.h:
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Link.h:
-        * protocols/ace/RMCast/Protocol.h:
-        * protocols/ace/RMCast/Reassemble.cpp:
-        * protocols/ace/RMCast/Reassemble.h:
-        * protocols/ace/RMCast/Retransmit.cpp:
-        * protocols/ace/RMCast/Retransmit.h:
-        * protocols/ace/RMCast/Socket.cpp:
-        * protocols/ace/RMCast/Socket.h:
-
-        Made protocol parameters configurable on a per-instance
-        basis.
-
-        * protocols/examples/RMCast/Send_Msg/Protocol.h:
-        * protocols/examples/RMCast/Send_Msg/Receiver.cpp:
-
-        Made receiver print throughput information.
-
-Mon Jul 11 08:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.h:
-          Doxygen improvements
-
-Mon Jul 11 08:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added Bug_2174_Regression to the list of tests. It will fail
-          until the fix for this bug is in the archive
-
-Sun Jul  10 23:24:12 UTC 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * etc/DAnCE.doxygen:
-
-          Added doxygen configuration file for DAnCE.
-
-Sat Jul  9 06:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.h:
-          Doxygen improvements
-
-Sat Jul  9 06:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.inl (thr_cancel):
-          Fixed VxWorks implementation.  Thanks to Abhijit Sachdev <abhi
-          at qualcomm dot com> for motivating this fix.
-
-Fri Jul  8 15:42:18 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Array_Map.h: Extended the range of Sun C++ compilers not
-          providing a fully standards-compliant STL to include C++ 5.7
-          (Studio 10). To include a compliant STL would break backward
-          binary compatibility with C++ 5.0 - 5.6, so Sun won't (yet)
-          do it. They do, however, include Stlport 4 with C++ 5.7. You can
-          enable this by building ACE with stlport=1.
-
-        * ace/Basic_Types.h (ACE_ULongLong): Added a name to the anonymous
-          struct declared in the anonymous union. Silences a warning from
-          Sun Studio 10.
-          Added __amd64 to the "little endian" machine indicators. Corrects
-          this check for Solaris 10 x86.
-
-        * ace/config-sunos5.10.h: Noted that Studio 10 (C++ 5.7) works
-          as well.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: If -fast is required,
-          be sure it goes to the left of any -xarch options on the command
-          line, else it'll override -xarch. Also, added support for building
-          with stlport=1 on Studio 10 (C++ 5.7).
-
-        * tests/CDR_Array_Test.cpp: When saying "Data OK", print type
-          name (%s), not truncated pointer (%d).
-
-Fri Jul  8 12:37:15 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp (subscribe): Added checks
-          to guard against cases where the qos_session is NULL.  Thanks to
-          Dom Monteiro <d dot monteiro at netia dot net> and Yamuna for
-          isolating the problem.
-
-Fri Jul  8 09:52:02 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
-
-          Utilize the MakeProjectBase to minimize the code in this module.
-
-Fri Jul  8 11:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.inl (thr_cancel):
-          Added implementation for VxWorks.
-
-Fri Jul  8 08:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_string.cpp:
-          Added include of OS_NS_stdio.h when ACE_LACKS_STRERROR is not
-          defined
-
-Thu Jul  7 18:11:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * configure.ac:
-        * ace/README:
-        * ace/config-WinCE.h:
-        * ace/config-mvs.h:
-        * ace/config-openvms.h:
-        * ace/config-psos-diab.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-psos-diab-ppc.h:
-        * ace/config-psos-tm.h:
-        * ace/config-psosim-g++.h:
-        * ace/config-rtems.h:
-        * ace/config-sunos5.7.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem-nsk-mips-v3.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-win32-interix.h:
-        * ace/config-win32-visualage.h:
-        * ace/OS_NS_string.{h cpp}:
-        * m4/config_h.m4: Removed all references to sys_nerr and
-          ACE_LACKS_SYS_NERR. These are old, hacky ways to check things
-          that can be done better (see below).
-
-        * ace/OS_NS_string.{h cpp} (strerror): Check for an invalid errnum
-          value by checking the return value of strerror(); supply a
-          "Unknown error %d" message if it's bad, and set errno to EINVAL.
-
-        * ace/Log_Msg.cpp (log): Use ACE_OS::strerror() and its new return
-          value to check for the need to try another way to format 'p' and
-          'm' messages. Windows is now the only special case.
-
-        * ace/Select_Reactor_Base.cpp: Include "Timer_Queue.h" instead of
-          "Timer_Heap.h" to get the appropriate definitions and inclusion of
-          other needed headers; in this case, Recursive_Thread_Mutex.h. Fixes
-          compile errors on Solaris 10.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: Changed -xarch= from
-          v9 to generic64 when using "buildbits=64" on Sun Studio 10
-          (C++ 5.7). This works for both Sparc and x86 architectures.
-
-Thu Jul  7 17:24:21 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Scheduled regression test for bugzilla #2183.
-
-Thu Jul  7 09:27:56 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Modified the template code to avoid generating lines that end in
-          spaces.
-
-Thu Jul  7 09:11:23 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Message_Block.cpp: Changed the order of the #includes
-          to work around a problem when ACE is used with STLport.  Thanks
-          to Alvin Lee for reporting this.  This fixes another part of
-          bugid 2185.
-
-Tue Jul  5 22:05:19 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/DLL.cpp: Fixed a problem with ACE_DLL::close() where
-          the dll_name_ might not be deleted if dll_handle_ was 0.  Thanks
-          to Alvin Lee <alvin.msg@gmail.com> for reporting this.  This
-          fixes the first part of bugid 2185.
-
-Tue Jul  5 18:13:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Removed Windows CE from the platforms Riverace
-          supports and added links to some Riverace pages.
-
-Tue Jul 05 21:40:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Mem_Map.cpp:
-          Changed to consistently use ACE_OS::shm_open/ACE_OS::shm_unlink.
-
-Tue Jul 05 21:15:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread{.h .inl .cpp}:
-          Fixes for compile problems in MACOS_X_Panther build.
-
-          Outlined ACE_OS::cond_init() to gain some footprint reduction.
-
-Tue Jul  5 18:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_netdb.cpp (getmacaddress): Some layout fixes and
-          also fixed a handle leak in the Sun part. Thanks to
-          <likemartinma at 163 dot com> for reportint this. This fixes
-          bugid 1875
-
-Tue Jul  5 08:30:07 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/OS_NS_netdb.cpp (getmacaddress): Call close() to avoid
-          a handle leak.  Thanks to W.M. van den Boogaard <wim dot vd dot
-          boogaard at meco dot nl> for reporting this fix.  This fixes
-          bugid 2182.
-
-Mon Jul 04 21:08:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/INET_Addr.h:
-        * ace/INET_Addr.cpp:
-          Added support for specifying interface ids for IPv6 Link Local
-          addresses either as part of the address (<ip>'%'<interface id>)
-          separately through ACE_INET_Address::set_interface().
-          Straightened out differences between Windows and Linux.
-          ACE_INET_Address::get_host_addr() now returns <ip>'%'<interface
-          id> formatted address when appropriate both on Windows
-          (natively) and Linux (ACE).  Thanks to Srikanth Gopal
-          <sriki_666@yahoo.com> for reporting this problem.
-
-Mon Jul  4 04:21:53 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.h (ACE_Array_Map):
-
-          Work around non-standard compliant Sun C++
-          std::reverse_iterator<> template arguments.  Define a typedef
-          specific to Sun C++ 5.5 or earlier.
-
-Sun Jul  3 14:59:25 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/APG/Config/Makefile.am:
-
-          Regenerate.
-
-Sun Jul 03 18:40:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/rules.lib.GNU:
-          Addition for VxWorks shared lib build.
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Some cleanup and changes for shared lib builds.
-
-Fri Jul 01 14:40:25 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * ace/config-tandem-nsk-mips-v3.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-          Defined platform specific format specifiers for 64 bit integers
-
-Fri Jul  1 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-doxygen.h:
-          Added ACE_HAS_IPV6
-
-Fri Jul  1 11:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/interceptors.mpb
-          Don't use pi as base lib.
-
-        * bin/MakeProjectCreator/config/iorinterceptor.mpb
-        * bin/MakeProjectCreator/config/loadbalancing.mpb
-        * bin/MakeProjectCreator/config/rtscheduling.mpb:
-        * bin/MakeProjectCreator/config/fault_tolerance.mpb
-        * bin/MakeProjectCreator/config/ftclientorb.mpb
-          Added pi and pi_server as base projects when needed
-
-Fri Jul  1 10:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Added support for StackReserveSize and StackCommitSize
-          template variables.
-
-Wed Jun 29 13:58:17 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/OS_NS_Thread.cpp:
-
-          Somehow my previous checkin had many other differences besides the
-          simple change that I made. I've remerged the corresponding code
-          from the previous version, but I have no idea how the change
-          happened.
-
-Wed Jun 29 18:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Default_Constants.h:
-          Removed ACE_CONNECTOR_HANDLER_MAP_SIZE, it is not used at all
-          anywhere in the repo. Found this when solving a problem with
-          OpenVMS
-
-Wed Jun 29 12:33:18 2005  Steve Huston  <shuston@riverace.com>
-
-        * examples/APG/Config/config.mpc:
-        * examples/APG/Config/Makefile.am:
-        * examples/APG/Config/HA_Status.cpp: Simplify greatly to build
-          HA_Status as a simple executable, not a DLL. Thanks to Gavin Yu
-          <songtaoyu at lucent dot com> for noticing this problem.
-
-        * examples/APG/Config/HA_Status.h: Removed.
-
-        * THANKS: Added Gavin Yu to the Hall of Fame.
-
-        * ace/Timer_Heap_T.cpp (dtor): When cleaning out the timer nodes,
-          free_node() before doing the deletion() upcall. Prevents a user's
-          handle_close() from doing a cancel_timer() and ripping the current
-          timer node out from under us and causing free_node() to assert().
-
-Wed Jun 29 10:43:11 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/OS_NS_Thread.cpp:
-
-          Port the ACE_DISABLE_WIN32_INCREASE_PRIORITY feature from earlier
-          OCI versions of ACE, so that a user can disable the setting of a
-          thread to the realtime priority class. This prevents hard lockups
-          of Windows machines when running as an administrator, and allows
-          many tests to function when not running as an admin.
-
-Tue Jun 28 20:58:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/core.mpb:
-
-          inherit from new install base project for backwards compatibility.
-
-        * bin/MakeProjectCreator/config/conv_lib.mpb:
-        * bin/MakeProjectCreator/config/install.mpb:
-        * bin/MakeProjectCreator/config/install_bin.mpb:
-        * bin/MakeProjectCreator/config/install_headers.mpb:
-        * bin/MakeProjectCreator/config/install_lib.mpb:
-
-          New new base projects to offer more flexibility on what parts of
-          a project are installed.  install_bin, install_lib, and install_
-          headers install binaries, libraries, and header files.  install
-          installs everything.  conv_lib is for "convenience libraries", a
-          set of objects that is packaged as a library for the developer's
-          convenience.  For most builds it builds a shared library that is
-          installed without the cooresponding headers; but the automake
-          build uses automake's native convenience library support --- a
-          static library is built and linked into the executable(s).
-
-Tue Jun 28 08:41:03 2005  Ming Xiong  <mxiong@tango.dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/global.features
-
-          Added a new feature ziparchive which is needed by
-          CIAO/DAnCE/ComponentPackager
-
-Mon Jun 27 09:38:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/README:
-          Added documentation for ACE_USES_FIFO_SEM, ACE_HAS_LINUX_NPTL
-          and ACE_HAS_POSIX_SEM_TIMEOUT.
-
-Mon Jun 27 22:22:00 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.h (ACE_Array_Map):
-
-          Added missing "const_pointer" typedef/trait.
-
-        * tests/Array_Map_Test.cpp (index_operator_test):
-
-          Work around compiler / STL implementations that cannot handle
-          implicit conversions from iterator to const_iterator (e.g. due
-          to missing template constructor) by accessing the iterators
-          through a reference to const a Map. We don't strictly need a
-          const Map for this test but having one allows us to exercise
-          const iterators.
-
-Mon Jun 27 21:54:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-linux-common.h:
-          Made inclusion of config-posix.h user selectable by defining
-          ACE_HAS_LINUX_NPTL rather than including it by default since
-          there are too many problems with that with the differences
-          in the various Linux distros.
-          Only with a Linux distro having the latest NPTL implemented
-          (SuSE 9.3) have I been able to effectively use POSIX macros.
-
-Mon Jun 27 20:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Codecs.cpp:
-        * ace/Configuration.cpp:
-        * ace/DLL_Manager.cpp:
-        * ace/Multihomed_INET_Addr.cpp:
-        * ace/OS_NS_stdlib.cpp:
-        * ace/Service_Config.cpp:
-          Within the ACE lib ACE_LIB_TEXT must be used instead of ACE_TEXT
-
-Mon Jun 27 12:26:15 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Malloc_T.h: Updated the ACE_Malloc_T documentation to
-          mention the limitations with find()/bind().  Thanks to Hanson Lu
-          <suf_lu@yahoo.com> for reporting this.
-
-Mon Jun 27 10:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/rtcosscheduling.mpb:
-          Added requires dummy_label. The RTCosScheduling library uses
-          a non compliant way to register its interceptors. This is
-          causing problems with the PI refactory so disable the building
-          of this lib until that has been fixed. See also bugzilla 2163.
-
-Mon Jun 27 08:21:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.cpp:
-          Change to protect against race condition in sema based Event
-          implementation.
-
-        * ace/OS_NS_Thread.inl:
-          Change in errno (EINTR) handling with FIFO based sema timedwait.
-
-Mon Jun 27 06:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Message_Queue_T.{h,cpp}:
-          Initialise pointers with 0 and removed work around for Sun CC 5.1,
-          we don't support that compiler already for years
-
-Mon Jun 27 01:03:12 2005 Stoyan Paunov <s.paunov@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/global.features:
-        * MPC/config/global.features:
-        * MPC/config/ZIP_Wrapper.mpb:
-
-          Added a new feature to MPC regarding the ZIP_Wrappers used by
-          the Repository Manager. I added this feature to make sure the RM
-          would not be compiled unless the proper ZIP libraries are in place.
-          Please check the README in CIAO/DAnCE/new_RepositoryManager
-
-
-Sun Jun 26 22:29:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-posix.h:
-          Made test for POSIX_SEM TIMEOUTS more specific.
-
-        * ace/config-linux-common.h:
-          Added check to fix detection of POSIX_SEM TIMEOUTS for Linux
-          >= 2.6 because of crippled POSIX macros (moved here from
-          config-posix.h).
-          Made implementation of FIFO based Semaphores for Linux < 2.6
-          user selectable instead of default (default now back to
-          situation before I added FIFO based Semaphores).
-
-        * ace/OS_NS_Thread{.h .cpp .inl}:
-          Added support for Process shared Events when Process shared
-          pthread mutexes are not supported but FIFO Sems are configured.
-          Fixed several issues concerning correct errno handling in
-          case of timeouts.
-
-        * tests/run_test.lst:
-          Added missing Manual_Event_Test.
-
-        * tests/Process_Manual_Event_Test.cpp:
-        * tests/Process_Semaphore_Test.cpp:
-          Improved protection against non-supporting builds.
-
-        * tests/Dirent_Test.cpp:
-          Made this test a little less braindead so it does not recognize
-          FIFOs and PIPEs as directories anymore and tries chdir() on
-          them which is quite annoying.
-
-Sat Jun 25 01:42:22 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.h:
-
-          MSVC++ 6's reverse_iterator adapter implementation is not
-          standard's compliant.  Adjusted reverse_iterator template
-          parameters accordingly for this one case (i.e. _MSC_VER <=
-          1200).
-
-        * ace/Array_Map.cpp (insert):
-
-          MSVC++ 6 doesn't like the "typename" qualification in the first
-          template argument to the std::pair<> return type.  Removed it in
-          for the _MSC_VER <= 1200 case.
-
-        * tests/Array_Map_Test.cpp:
-
-          MSVC++ 6 doesn't pick up the const rbegin/rend() methods without
-          making the map object const, despite the fact the return value
-          is assigned to a const_reverse_iterator.  Work around the
-          problem by casting the non-const map instance to a reference to
-          a const map when _MSC_VER <= 1200.
-
-Fri Jun 24 22:49:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/ace/RMCast/Makefile.am:
-
-          Regenerated.
-
-Fri Jun 23 19:58:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-          Added include for non-inline builds.
-
-Fri Jun 23 19:38:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.h:
-          Removed extra semi-colon.
-
-Fri Jun 23 19:36:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Process_Manual_Event_Test.cpp:
-        * tests/Process_Semaphore_Test.cpp:
-          Added protection for singlethread builds.
-
-Fri Jun 24 11:42:43 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ACE-INSTALL.html:
-
-          Added notes about testing and developing autotool support, and
-          how to bootstrap that support into a workspace.
-
-Fri Jun 24 11:36:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.cpp:
-        * ace/Array_Map.inl:
-
-          Added missing "typename" keyword before template parameter
-          dependent types.  Addresses VC++ 7.1/8 and Sun CC++ compile-time
-          warnings and errors.
-
-Fri Jun 24 11:02:06 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/PerlACE/Process_Win32.pm:
-
-          Fixed this module to work with the ACE_TEST_WINDOW environment
-          variable that I added some time back.
-
-Fri Jun 23 13:36:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.cpp:
-          Fixed unused 'result' variable in ACE_OS::event_init().
-
-Fri Jun 23 13:00:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Process_Manual_Event_Test.cpp:
-        * tests/Process_Semaphore_Test.cpp:
-          Fixes for compile errors on Linux 64bit.
-
-Fri Jun 23 10:20:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-          Made sure ETIME is always returned on timeouts of
-          ACE_OS::sema_timedwait and not ETIMEDOUT.
+        * examples/APG/Logging/LogManager.h:
+          Removed vc6 workarounds
 
-        * tests/Semaphore_Test.cpp:
-          Extended platform coverage of timeout tests.
+Wed Apr 19 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Auto_Event_Test.cpp:
-        * tests/Manual_Event_Test.cpp:
-        * tests/Process_Manual_Event_Test.cpp:
-        * tests/Process_Semaphore_Test.cpp:
+        * tests/Bug_2368_Regression_Test.cpp:
         * tests/run_test.lst:
         * tests/tests.mpc:
-          Added new tests.
-
-Fri Jun 23 09:17:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/INET_Addr_Test_IPV6.cpp:
-        * tests/Multihomed_INET_Addr_Test_IPV6.cpp:
-        * tests/SOCK_Send_Recv_Test_IPV6.cpp:
-        * tests/SOCK_Test_IPV6.cpp:
-          Fixed WCHAR compile problems.
-
-Fri Jun 23 08:49:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread{.h .cpp .inl}:
-          Extended ACE_OS::event_xxx implementation to support platforms
-          having either PThread support with Process Shared condition
-          variables or POSIX semaphores with named (process shared)
-          semaphore support or using the new FIFO based semaphores.
-          Fixed manual_reset implementation of condition based events
-          (event_pulse() did not work).
-
-Fri Jun 23 08:49:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-aix-4.x.h:
-          Fixed problems by incorrectly reported ACE_HAS_POSIX_SEM_TIMEOUT
-          by config-posix.h.
-
-Fri Jun 24 07:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.h:
-          Removed extra semi-colon.
+          Added regression for bug 2368, this will fail because this bug
+          isn't addressed yet
 
-Thu Jun 23 22:24:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+Wed Apr 19 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-linux-common.h:
-          Fixed typo (ACE_HAS_SHMOPEN should be ACE_HAS_SHM_OPEN).
+        * include/makeinclude/platform_sunos5_g++.GNU:
+          Use -shared instead of -G when building shared libraries. Thanks to
+          Alan L Batongbacal <alanlb at vt dot edu> for reporting this. This
+          fixes bugzilla bug 1848.
 
-Thu Jun 23 17:14:39 2005  Steve Huston  <shuston@riverace.com>
+Wed Apr 19 12:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Dev_Poll_Reactor.cpp (schedule_timer, reset_timer_interval):
-        * ace/Select_Reactor_T.cpp (schedule_timer, reset_timer_interval):
-        * ace/WFMO_Reactor.inl (cancel_timer, schedule_timer, reset_timer_interval):
-          If timer_queue_ is 0, don't attempt to call through it. Instead,
-          return -1 with errno ESHUTDOWN for scheduling; return 0 for cancel.
+        * tests/ACE_Init_Test.rc:
+          Removed msvc specific lines
 
-Thu Jun 23 12:10:16 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Array_Map.h:
-        * ace/Array_Map.inl:
-        * ace/Array_Map.cpp:
-
-          Map implementation that focuses on small footprint and fast
-                iteration.  Search times are, however, linear (O(n)) meaning
-          that this map isn't suitable for large data sets that will be
-          searched in performance critical areas of code.  Iteration over
-          large data sets, however, is faster than linked list-based maps,
-          for example, since spatial locality is maximized through the use
-          of contiguous arrays as the underlying storage.
-
-        * ace/Makefile.am:
-        * ace/ace.mpc:
-
-          Added new Array_Map.* source files.
-
-        * tests/Array_Map_Test.cpp:
-
-          Regression test for ACE_Array_Map.
-
-        * tests/Makefile.am:
-        * tests/run_test.lst:
         * tests/tests.mpc:
+          The ACE_Init_Test should use its resource file. Fixes bugzilla
+          2495
 
-          Added new Array_Map_Test regression test.
-
-Thu Jun 23 07:49:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Logging_Strategy.cpp (init):
-
-          Changed to not delete output stream when wipeout_logfile_ is
-          set, as that may result in a double delete when ownership of
-          the new stream is transferred to this->log_msg_.
-
-          Changed to not delete existing output stream if a new one is
-          not been created.
-
-          Thanks to Mark Callaghan and Ossama Othman for assistance.
-
-Thu Jun 23 12:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-posix.h:
-          Fixed problems for single threading builds.
-
-Thu Jun 23 10:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * man/Makefile.am:
-        * man/man3/Makefile.am:
-          Removed these files because are also not part of the release
-
-Wed Jun 22 20:29:39 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/OS_NS_Thread.h:
-
-          Removed extra semi-colon.  Fixes g++ 4.0 builds.
-
-Wed Jun 22 19:11:23 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * THANKS:
-
-          Added Mark Callaghan to the Hall of Fame.
-
-        * ace/Log_Msg.cpp (msg_ostream):
-
-          Close, do not delete, the file stream in the
-          ACE_LACKS_IOSTREAM_TOTALLY case, as is done in the
-          ~ACE_Log_Msg() destructor. Addresses memory management issues.
-          Thanks to J.T. Conklin and Mark Callaghan for pointing out the
-          problem and suggesting the fix.
-
-          Do not reset the ostream_ and delete_ostream_ attributes if
-          the pointer to ostream_ is equal to the ostream argument passed
-          to this method.  Prevents premature destruction of the ostream.
-          Thanks to Mark Callaghan for suggesting this fix.
-
-Wed Jun 22 19:55:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread{.h .inl}:
-          Oops, fixed some more wchar problems.
-
-Wed Jun 22 19:16:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_sys_mman.inl:
-        * ace/OS_NS_Thread{.h .inl .cpp}:
-        * ace/INET_Addr.cpp:
-        * ace/SOCK_Dgram_Mcast.cpp:
-          Fixed wchar problems in arguments and variables.
-
-        * ace/config-linux-common.h:
-          Undef ACE_HAS_SHMOPEN after having included config-posix.h as
-          there are some things to check out here before really using
-          ::shm_open()!
-
-Wed Jun 22 09:25:12 2005  Gary Maxey  <gary.maxey@hp.com>
-
-        * ace/config-lite.h:
-          Added __TANDEM platform to ACE_UNUSED_ARG macro
-
-Wed Jun 22 12:24:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-posix.h:
-          Added test to set new macro ACE_HAS_POSIX_SEM_TIMEOUT when supported.
-
-        * ace/config-linux-common.h:
-          Added include for config-posix.h to test for more supported POSIX
-          functionality.
-          Added special test for Linux kernels < 2.6 because these falsely
-          report certain POSIX support while not having that in reality
-          (f.i. ACE_HAS_POSIX_SEM with ACE_HAS_POSIX_SEM_TIMEOUT).
-
-        * ace/config-lite.h:
-          Added test to undef (new) macro ACE_USES_FIFO_SEM (see below) when
-          other macro settings invalidate this one.
-
-        * ace/os_include/os_pthread.h:
-          Extended test to prevent definition of ACE_sema_t when ACE_USES_FIFO_SEM
-          is defined.
-
-        * ace/OS_NS_Thread{.h .inl .cpp}:
-          Added new implementation of ACE_OS::sema_XXX methods based on FIFOs
-          (derived from W. Richard Stevens, UNIX Network Programming V2)
-          active when !ACE_HAS_POSIX_SEM && ACE_USES_FIFO_SEM.
-          Offshoot of customer request for process shareable solution for Linux
-          2.4.xx kernels.
-
-          Outlined most ACE_OS::mutex_XXX and ACE_OS::event_XXX methods resulting
-          in a) ~7 Kb footprint reduction (Linux 2.6) and b) lessened dependency
-          complexities allowing later introduction of another Event platform
-          emulation.
-
-
-Wed Jun 22 08:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/build_core_exe.bor:
-        * include/makeinclude/build_core_library.bor:
-          Removed these files, not used anymore
-
-Wed Jun 22 08:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/SOCK_Test_IPv6.cpp:
-          Fixed compile errors on Linux when ACE_HAS_IPV6 has been defined
-
-Wed Jun 22 07:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-          Fixed compile errors on Linux when ACE_HAS_IPV6 has been defined
-
-        * include/makeinclude/compiler.bor:
-          No need anymore to include ace_flags.bor
-
-        * include/makeinclude/ace_flags.bor:
-          Removed this file, not needed anymore
-
-Tue Jun 21 18:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/compiler.bor:
-          Removed -a8 and -b from the compiler flags, this are the defaults
-          for the compiler, so no need to explicitly specify them. Thanks to
-          Chad about informing me that -b is the default.
-
-Tue Jun 21 07:30:58 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/global.mpb:
-
-          Set libpaths to '.' since libout is set to '.' as well.
-
-Mon Jun 20 20:07:45 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Support for the bug fix where the 'postcommand' wouldn't be
-          applied if there was more than one output file per input file.
-
-Mon Jun 20 16:45:39 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Asynch_IO.cpp: Added explicit template instantiations for
-          ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX>.
-
-Mon Jun 20 11:36:21 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_sys_socket.inl (closesocket): Removed the
-          ACE_OS::shutdown() call in an HP-UX block. Calling shutdown breaks
-          an often-used idiom in UNIX programming of forking a new process
-          to handle a connection and closing the handle in the parent. Doing
-          a shutdown() before close() initiates a TCP close even though there
-          are multiple handles to the same socket. Thanks to Doug Schmidt
-          and Howard Finer for the exchange that led to this change. This
-          reverts a change made earlier:
-          Thu Jan  1 17:56:31 2004  Steve Huston  <shuston@riverace.com>
-
-Mon Jun 20 09:46:24 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Fixed a long standing bug where the libpath set in a Define_Custom
-          was not utilized.
-
-Mon Jun 20 15:35:42 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Fragment.cpp:
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Protocol.h:
-        * protocols/ace/RMCast/Reassemble.cpp:
-
-          Made code VC6-compatible.
-
-Mon Jun 20 11:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/bidir_giop.mpb:
-          Added pi as base project, this was implicitly in the past because
-          portableserver was based on pi.
-
-Mon Jun 20 10:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/portableserver.mpb:
-          The portableserver library is not dependent on pi anymore.
-          The new pi_server library is dependent.
-
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/ftrteventchannel.mpb:
-        * bin/MakeProjectCreator/config/ifrservice.mpb:
-          These projects use functionality of pi_server, so added that
-          as base project
-
-        * bin/MakeProjectCreator/config/rtportableserver.mpb:
-        * bin/MakeProjectCreator/config/messaging.mpb:
-          Added pi as base project, this was implicitly in the past because
-          portableserver was based on pi.
-
-Fri Jun 17 17:37:53 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
-
-          Added header_outputext to clean up the generated header files on
-          request.
-
-Fri Jun 17 17:22:13 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Acknowledge.h:
-        * protocols/ace/RMCast/Fragment.cpp:
-        * protocols/ace/RMCast/Fragment.h:
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Protocol.cpp:
-        * protocols/ace/RMCast/Protocol.h:
-        * protocols/ace/RMCast/Reassemble.cpp:
-        * protocols/ace/RMCast/Reassemble.h:
-        * protocols/ace/RMCast/Retransmit.cpp:
-        * protocols/ace/RMCast/Retransmit.h:
-        * protocols/ace/RMCast/Simulator.h:
-        * protocols/ace/RMCast/Socket.cpp:
-        * protocols/ace/RMCast/Socket.h:
-
-          Implemented message fragmentation.
-
-        * protocols/examples/RMCast/Send_Msg/Protocol.h:
-        * protocols/tests/RMCast/Protocol.h:
-        * protocols/tests/RMCast/Sender.cpp:
-
-          Changed to send messages that would require fragmentation.
-
-Fri Jun 17 09:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/pi_server.mpb:
-          New base project for pi_server. Will contain all needed portable
-          interceptor functionality specific for the server side
+        * ace/Capabilities.{h,cpp}:
+          Prefix increment instead of postfix
 
-Fri Jun 17 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Hash_Map_Manager_T.{h,cpp}:
+          Removed workaround for suncc 4.2
 
-        * ace/Object_Manager.cpp:
-          Removed comment about very old gcc version
-
-        * ace/Service_Config.h:
-          Added new ACE_DYNAMIC_SERVICE_DIRECTIVE macro that makes it possible
-          to load a service using a process_directive call that works with the
-          normal service configurator and the xml based one. Thanks to
-          Lothar Werzinger <lothar at xcerla dot com> for providing this
-          new macro. We will use it then in TAO to load the services on
-          demand.
-
-Thu Jun 16 07:38:57 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/SOCK_Stream.cpp (close): Removed the call to this->close_writer()
-          since that functionality was done by ACE_SOCK::close(), which
-          delegates to ACE_OS::closesocket(), which handles this
-          automatically.
-
-        * ace/Process.cpp (running): Only try to "kill" a process if
-          the PID is valid.  Thanks to Howard Finer <hfiner at sonusnet
-          dot com> for contributing this.
-
-        * ace/Pipe.h (ACE_Pipe): Updated the documentation for this class
-          to clarify why it uses sockets on Windows.  Thanks to Dave
-          Varnell <Dave.Varvell@ni.com> for prompting this.
-
-        * ace/INET_Addr.cpp (set): Changed the test of
-
-          if (port_number < 0)
-
-          to
-
-          if (port_number == -1)
-
-          to fix problems reported by Vemund Handeland
-          <vemund.handeland@fantoft.no>
-
-Wed Jun 15 12:36:04 MST 2005  Trevor Fields  <fields_t@ociweb.com>
-
-        * bin/PerlACE/Run_Test.pm:
-
-          Adding method to add a library path dynamically for the run test
-          scripts.
-
-Wed Jun 15 17:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          reverse the libs, this solves a lot of problems in our static builds.
-
-Wed Jun 15 07:46:16 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/rules.bin.GNU:
-
-          Resurrected rules.bin.GNU as it may be required by old
-          hand-written makefiles.
-
-Wed Jun 15 07:36:14 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-
-          Removed the use of uniq for libpaths.  This was a work-around for
-          a bug in MPC which has been fixed.
-
-Wed Jun 15 11:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Removed reverse, with this no static initializers where called
-
-Wed Jun 15 09:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Use uniq for libpaths so that we don't generate things twice
-
-Wed Jun 15 09:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Reversed the order in which the libs are generated. This make sure
-          we first get the static created for ACE, then for TAO, etc. Fixes
-          the problems in the CBX static build
-
-Tue Jun 14 17:52:39 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Thread_Manager.h: Improved documentation for the task_list()
-          and task_all_list() methods.
-
-Tue Jun 14 14:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated Borland build instructions
-
-Tue Jun 14 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Reactor_Timer_Interface.{h,cpp}:
-          Moved destructor to a new cpp file to fix Cygwin warnings
-
-        * ace/ace.mpc:
-        * ace/Makefile.am:
-          Added Reactor_Timer_Interface.cpp
-
-Tue Jun 14 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/IO_Cntl_Msg.{h,cpp,inl}:
-          Moved methods implemented in the header file to a new inl file.
-          Fixes warnings in the Cygwin build
-
-        * ace/ace.mpc:
-        * ace/Makefile.am:
-          Added IO_Cntl_Msg.cpp
-
-Tue Jun 14 11:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Fixed typo in comment
-
-Tue Jun 14 08:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/interceptors.mpb:
-        * bin/MakeProjectCreator/config/portableserver.mpb:
-        * bin/MakeProjectCreator/config/rtcorba.mpb:
-        * bin/MakeProjectCreator/config/utils.mpb:
-          Added pi as base project
-
-Mon Jun 13 13:50:53 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * bin/ciao_tests.lst:
-
-          Added the node application tests to the autobuilds.
-
-Mon Jun 13 18:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
-          Fixed compile errors
-
-Mon Jun 13 13:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release:
-          Don't do LF->CRLF conversion for xls files, that are Microsoft
-          Excel files. The RTCorba tests have such a file.
-
-Mon Jun 13 13:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/pi.mpb:
-          New base project for the new PI library we will add soon to the
-          archive. This PortableInterceptor libray will contain the
-          ORBInitializer Registry, Policy Factory Registry and ORBInitInfo
-          in the first version
-
-Mon Jun 13 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/SCTP/hist.{h,cpp}:
-        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
-        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
-          Moved the hist struct with associated methods to the ACE_SCTP
-          namespace. This should fix the last compile errors in Irix.
-          Thanks to Doug McCorkle <mccdo at iastate dot edu> for providing
-          the patches
-
-Mon Jun 13 10:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb:
-        * bin/MakeProjectCreator/config/kokyu_dsrt_scheduler.mpb:
-          Moved the codecfactory from the server to the normal project,
-          also the clients need it
-
-Sun Jun 12 14:53:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Logging_Strategy.cpp (parse_args):
-
-          Update comment to make it clear value is being converted from
-          number of KB to number of bytes.
-
-Sun Jun 12 12:48:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_g++_common.GNU:
-          Fixed problem with GXX version detection when default Make
-          shell is CMD.EXE and problems with different version reports
-          with non-standard GCC implementations (like VxWorks:-).
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Fixed problem with ACE version detection when default Make
-          shell is CMD.EXE.
-
-        * include/makeinclude/rules.local.GNU:
-          Fixed problem with creation of .depend files when default Make
-          shell is CMD.EXE.
-
-        * include/makeinclude/rules.lib.GNU:
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Changed to implement support for creation of shared libs for
-          VxWorks targets.
-
-Sat Jun 11 11:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb:
-          Added codecfactory as base
-
-Fri Jun 10 18:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/rtcosscheduling.mpb:
-          Added missing base projexts. Thanks for JT for reporting this
-
-Fri Jun 10 16:03:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/DLL_Test.cpp:
-          Updated to use new 'ACE_HAS_DYNAMIC_LINKING' macro.
-
-Fri Jun 10 16:00:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-lite.h:
-          Introduced new macro 'ACE_HAS_DYNAMIC_LINKING' to enable more
-          generalized testing for platforms supporting dynamic linking
-          than 'ACE_HAS_SVR4_DYNAMIC_LINKING' supports (which excludes
-          WIN32, VxWorks and HPUX which *do* support dynamic linking).
-
-Fri Jun 10 15:53:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_main.h:
-        * ace/OS_main.cpp:
-          Changed implementation of 'ace_main' entrypoints for VxWorks to
-          support shared library builds without resulting in 'undefined symbol'
-          messages for 'ace_main_i'.
-
-Fri Jun 10 15:47:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_dlfcn.inl:
-          Fixed VxWorks implementation of dlopen().
-
-Fri Jun 10 07:55:32 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added new test for Alternate IIOP addresses.
-
-Fri Jun 10 13:16:53 2005  Simon McQueen  <sm@prismtech.com>
-
-        * ace/Reactor.cpp (register_handler):
-
-          Backed out Thu Jun  9 11:12:39 2005  Steve Huston.
-          It was causing test failures on Linux.
-
-Fri Jun 10 06:43:25 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Interpret flag_overrides of the custom_types->dependent setting
-          as an array instead of a string.  This makes things consistent
-          with non-overridden values of dependent.
-
-        * bin/create_ace_build:
-        * bin/create_ace_build.pl:
-
-          Inform users about using $MPC_ROOT/clone_build_tree.pl instead of
-          these scripts.
-
-        * bin/depgen.pl:
-
-          Simplified/collapsed duplicated code from the VMS additions.
-
-Thu Jun  9 18:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Event.h:
+        * ace/Object_Manager.h:
+        * ace/Parse_Node.h:
+        * ace/POSIX_Proactor.h:
+        * ace/Thread_Mutex.h:
           Doxygen improvements
 
-        * bin/MakeProjectCreator/config/codecfactory.mpb:
-          New base project for the new codecfactory for TAO
-
-Thu Jun  9 18:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added tao/tests/POA/Reference_Counting
-
-Thu Jun  9 11:47:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * tests/Pipe_Test.cpp: Fixed wide-char text issues.
-
-Thu Jun  9 11:12:39 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Reactor.cpp (register_handler): When registering for one or more
-          signals, set the event handler's reactor() pointer to the registered
-          reactor. Makes this behavior consistent with all other registration
-          types.
-
-Thu Jun  9 16:18:32 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Socket.cpp:
-        * protocols/ace/RMCast/Socket.h:
-
-          Implemented timed recv() and size().
-
-Thu Jun  9 13:16:53 2005  Simon McQueen  <sm@prismtech.com>
-
-        * bin/tao_other_tests.lst:
-
-          Added Bug_2137_Regression test.
-
-Thu Jun  9 09:31:28 2005  Simon McQueen  <sm@prismtech.com>
-
-        * NEWS:
-
-          Updated with late release note submissions.
-
-Wed Jun 08 08:43:59 2005  Simon McQueen  <sm@prismtech.com>
-
-        * ACE version 5.4.6 released.
-
-Wed Jun  8 11:21:50 2005  Simon McQueen  <sm@prismtech.com>
-
-        * NEWS:
+        * ace/Parse_Node.cpp:
+          Use prefix increment, initialise pointers with 0 and don't print
+          an error message when we can't a dll, this gives false messages
+          when using TAO. This fixes bugzilla 2383. Thanks to Ming Xiong
+          for making a patch.
 
-          Updated with release note entries.
+        * ace/Proactor.h:
+          Removed all virtual keywords, not needed for this class. Fixes
+          bugzilla 2178.
 
-Fri Jun  3 13:42:18 2005  Steve Huston  <shuston@riverace.com>
+        * ace/Thread_Manager.h:
+          Removed virtual keywords, not needed and safes footprint. Fixes
+          bugzilla 2179.
 
-        * ace/String_Base.h: Removed ACE_INLINE from the operator+ functions.
-          The functions are defined in String_Base.cpp. Fixes compile errors
-          on Solaris autoconf build.
-
-        * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Added missing
-          #include for ace/Null_Mutex.h and ace/Null_Condition.h since this
-          example uses ACE_Task<ACE_NULL_SYNCH>.
-
-        * Kokyu/DSRT_Sched_Queue_T.h: Added missing #include "ace/Null_Mutex.h"
-
-Thu Jun  2 13:58:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Local_Tokens.cpp (~ACE_TSS_TPQ_Entry): Replaced missing '}' from:
-          Mon May 30 18:10:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-Wed Jun  1 18:33:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Reordered some
-          #include directives so files needed by ace/Connector.h are in before
-          ace/Connector.h. Fixes optimized autoconf build on AIX.
-
-Wed Jun  1 12:19:27 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_signal.inl: Reverted:
-          Tue May 31 18:51:31 2005  Steve Huston  <shuston@riverace.com>
-          It broke builds on Linux and BSD, at least, with compile errors like:
-          `::' does not have a class or union named `sigaction'
-          I think this is probably an issue of including files in the wrong
-          order and it only trips up HP-UX, but I'm not sure.
-
-Wed Jun  1 07:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Removed bug 2088 test for the time being, the fix isn't the correct one
-          and now the test has wrong expectations
-
-Tue May 31 18:51:31 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_signal.inl (sigaction): Added "::" qualifier to references
-          to "struct sigaction" to distinguish it from sigaction in the
-          ACE_OS namespace. This was tripping up HP aC++ in certain use cases.
-
-Tue May 31 18:46:29 2005  Steve Huston  <shuston@riverace.com>
+        * bin/fuzz.pl:
+          Added more msvc checks to detect code constructors for vc6 or
+          vc7.0
 
-        * ace/INET_Addr.cpp (set_address): When needing to plug in an
-          IPv4-mapped IPv6 address, avoid any possibility of compiler struct
-          member non-contiguous alignment. Use the ip6 address type and
-          plug the values in where they go. Thanks to Robert Iakobashvili
-          <coroberti at gmail dot com> for this idea.
+Wed Apr 19 11:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue May 31 21:45:10 2005  Boris Kolpackov  <boris@kolpackov.net>
+        Merged ACE changes from sendfile branch. Also made a lot of const
+        improvements throughout ACE.
 
-        * NEWS:
+        Tue Apr  4 10:20:36 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Updated RMCast-related information.
+        * ace/Mem_Map.cpp (open):
 
-Tue May 31 11:49:23 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        Only copy the filename to the ACE_Mem_Map::filename_ member
+        if the call to open() succeeds.
 
-        * ace/Free_List.inl:
-        * ace/Message_Queue_T.inl:
-        * ace/POSIX_CB_Proactor.inl:
-        * ace/SUN_Proactor.inl:
+        * ace/PI_Malloc.h (ACE_Malloc_Header):
 
-          Removed these empty inline files.
+        Added missing private and undefined copy constructor.  The
+        corresponding assignment operator was already there.
 
-        * ace/Free_List.cpp:
-        * ace/Free_List.h:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_T.h:
-        * ace/POSIX_CB_Proactor.cpp:
-        * ace/POSIX_CB_Proactor.h:
-        * ace/SUN_Proactor.cpp:
-        * ace/SUN_Proactor.h:
+        Wed Mar 29 14:51:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed include directives for removed inline files.
+        * ace/config-sunos5.8.h:
+        Solaris 8 and newer also support sendfile. It seems HPUX also
+        supports it but with a different signature and semantics, so just
+        don't try it there yet.
 
-        * ace/Timer_Queue_Adapters.cpp (activate):
+        Wed Mar 29 13:06:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Moved method definition out of ACE_HAS_DEFERRED_TIMER_COMMANDS
-          block.  Fixes "unresolved symbol" link-time errors.
+        * ace/MMAP_Memory_Pool.{h,cpp,inl}:
+        Added new .inl file to implement the new mmap accessors, include
+        this new file in the header and implementation file
 
-        * ace/Makefile.am (nobase_include_HEADERS):
+        Wed Mar 29 08:00:12 2006  Ossama Othman <ossama@dre.vanderbilt.edu>
 
-          Removed newly removed inline file.
+        * ace/OS_NS_sys_sendfile.cpp
+        * ace/OS_NS_sys_sendfile.h
+        * ace/OS_NS_sys_sendfile.inl
+        New sendfile wrapper
 
-Tue May 31 10:39:10 2005  Justin Michel  <michel_j@ociweb.com>
+        * ace/MMAP_Memory_Pool.h:
+        Added accessors for mmap
 
-        * ace/String_Base.inl:
-        * ace/String_Base.cpp:
+        * ace/ace.mpc
+        Added OS_NS_sys_sendfile
 
-          Move operator+=() methods from .inl to .cpp in an effort to
-          reduce footprint.
+        * ace/config-linux-common.h
+        Added ACE_HAS_SENDFILE
 
-Mon May 30 18:10:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Addr.cpp:
-        * ace/Addr.inl:
-        * ace/Event_Handler_T.cpp:
-        * ace/Event_Handler_T.inl:
-        * ace/Free_List.cpp:
-        * ace/Free_List.inl:
-        * ace/Hashable.cpp:
-        * ace/Hashable.inl:
-        * ace/IOStream_T.cpp:
-        * ace/IOStream_T.inl:
-        * ace/Local_Tokens.cpp:
-        * ace/Local_Tokens.inl:
-        * ace/Lock_Adapter_T.cpp:
-        * ace/Lock_Adapter_T.inl:
-        * ace/Malloc_T.cpp:
-        * ace/Malloc_T.inl:
-        * ace/Map_T.cpp:
-        * ace/Map_T.inl:
-        * ace/Message_Block.cpp:
-        * ace/Message_Block.inl:
-        * ace/Message_Queue.cpp:
-        * ace/Message_Queue.inl:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_T.inl:
-        * ace/POSIX_CB_Proactor.cpp:
-        * ace/POSIX_CB_Proactor.inl:
-        * ace/POSIX_Proactor.cpp:
-        * ace/POSIX_Proactor.inl:
-        * ace/Refcounted_Auto_Ptr.h:
-        * ace/Refcounted_Auto_Ptr.inl:
-        * ace/Refcounted_Auto_Ptr.cpp:
-        * ace/Remote_Tokens.cpp:
-        * ace/Remote_Tokens.inl:
-        * ace/Reverse_Lock_T.cpp:
-        * ace/Reverse_Lock_T.inl:
-        * ace/SUN_Proactor.cpp:
-        * ace/SUN_Proactor.inl:
-        * ace/Shared_Memory_MM.cpp:
-        * ace/Shared_Memory_MM.inl:
-        * ace/Shared_Memory_SV.cpp:
-        * ace/Shared_Memory_SV.inl:
-        * ace/Strategies_T.cpp:
-        * ace/Strategies_T.inl:
-        * ace/Task.cpp:
-        * ace/Task.inl:
-        * ace/Thread_Manager.cpp:
-        * ace/Thread_Manager.inl:
-        * ace/Timer_Queue_Adapters.cpp:
-        * ace/Timer_Queue_Adapters.inl:
-        * ace/Timer_Queue_T.inl:
+        Merged ACE changes from sequpdate3 branch
 
-          Moved inlined virtual methods out of line.  Addresses
-          RTTI-related problems when using g++ 4.0's
-          "-fvisibility-inlines-hidden" command line option.
+        * ace/config-osf1-3.2.h:
+          Removed, very old
 
-        * ace/String_Base.cpp:
+        * ace/config-tru64.h:
+          Removed include of config-osf1-3.2.h
 
-          Removed "ACE_INLINE" macros.  They should not be used in this
-          out-of-line source file.
+        * ace/OS_Dirent.cpp:
+        * ace/OS_Memory.{cpp,inl}:
+        * ace/OS_String.{cpp,inl}:
+        * ace/Sync.cpp:
+          Removed these files, where not build for a long time already
 
-        * ace/Makefile.am:
         * ace/ace.mpc:
+          Removed files above
 
-          Added Refcounted_Auto_Ptr.cpp to the list of template files.
-
-Mon May 30 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Task.cpp:
-          The Borland preview compiler is the only Borland compiler capable
-          of handling the reinterpret cast
-
-Mon May 30 13:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
+        * ace/OS_Memory.h:
+        * ace/OS_String.h:
+          Removed include of inline files
 
-Mon May 30 09:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+        * ace/config-win32-msvc6.h:
+        * ace/config-kcc-common.h:
+          Removed these files, vc6 and kcc are deprecated
 
-        * include/makeinclude/platform_vxworks5.x_diab.GNU:
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
+        * ace/config-irix6.x-kcc.h:
+        * ace/config-osf1-4.0.h:
+        * ace/config-sunos5.5.h:
+          Removed support for KCC
 
-          Removed these files since these platform configurations are
-          not supported anymore with the current ACE/TAO releases.
-          The currently supported platform configuration is the
-          'platform_vxworks5.5.x.GNU'.
+        * ace/Asynch_IO_Impl.h:
+          Removed workarounds for KCC
 
-Mon May 30 09:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-win32-msvc.h:
+          Removed support for vc6 and vc7.0
 
         * ace/Array_Base.cpp:
-          Initialise pointer with 0
-
-Mon May 30 08:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_aix_ibm.GNU:
-          Don't use -qstaticinline in a 64bit build with Visual Age 6. When
-          this option is specified TAO crashes strangely. Seems a problem
-          in the Visual Age compiler in 64bit mode.
-
-Sun May 29 17:49:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/compiler.m4:
-
-          Disable the use of gcc's symbol visibility on MacOSX, since it
-          requires features of the ELF object file format not present in
-          Mach-O.  Longer term we need a feature check that explicitly
-          tests for proper operation of symbol visibility instead of a
-          list of systems where it's disabled.
-
-Fri May 27 15:32:15 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/ACE.h:
-        * ace/ACE.cpp:
-
-          Added a new ACE::wild_match() function which is used to support the
-          TAO -ORBPreferredInterfaces option. wild_match was contributed by
-          Kevin Heifner <heifner_k@ociweb.com>.
-
-        * ace/SOCK_SEQPACK_Association.h:
-        * ace/SOCK_SEQPACK_Connector.h:
-        * apps/drwho/Protocol_Manager.cpp:
-        * examples/APG/Reactor/Timers.cpp:
-        * tests/Network_Adapters_Test.cpp:
-
-          These files #included config.h which isn't safe, because it
-          won't necessarilly pick up the correct symbols. For example, I
-          caught this by trying to build ACE on Windows with
-          __ACE_INLINE__ = 0.  The files that #included config.h directly
-          saw that it was defined as 0, but changing them to #include
-          config-all.h instead, correctly saw that the symbol was
-          undefined.
-
-Fri May 27 10:26:34 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Interpret custom_types->dependent as an array instead of a string.
-          This is completely backward compatible since a string is just a
-          one element array in the template language.
-
-Fri May 27 12:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_aix_ibm.GNU:
-          When building for 64bit, make sure we enable the 64bit warnings
-
-Fri May 27 08:49:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-
-          Fixed possible NULL-pointer assignment for VxWorks implementation
-          of ACE_OS::thr_sigsetmask().
-
-Fri May 27 00:40:19 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * bin/tao_orb_tests.lst:
-
-          Added new recursive type Any insertion/extraction test to the
-          test suite.
-
-Thu May 26 17:07:34 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/String_Base.inl:
-        * ace/String_Base.cpp:
-
-          Move all non-trivial functions out of the .inl file. Hopefully this
-          will cause a net improvement to the footprint.
-
-Thu May 26 16:13:34 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/config-win32-msvc-6.h:
-
-          The standard library that comes with vc6 is pre-standard c++,
-          but it's close enough for many things. Enabling its use should
-          be more portable. This was done long ago for the OCI versions of
-          TAO (Since 1.2a), and was apparently overlooked until now.
-
-Thu May 26 15:22:10 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * Release:
-
-          Added the contrib directory into the Release script.
-
-Thu May 26 18:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Manager.{h,cpp}:
-          Added thr_state method to ACE_Thread_Manager so that we are able
-          to retrieve the state of a certain thread.
-
-Thu May 26 07:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_cygwin32.GNU:
-        * include/makeinclude/platform_freebsd.GNU:
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-        * include/makeinclude/platform_osf1_3.2_cxx.GNU:
-        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
-        * include/makeinclude/platform_osf1_4.x_g++.GNU:
-        * include/makeinclude/platform_qnx_neutrino.GNU:
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Simplified these files by using the ?= operator
-
-Wed May 25 15:51:03 2005  Steve Totten  <totten_s@ociweb.com>
-
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_stdio.cpp:
-        * ace/OS_TLI.inl:
-        * ace/config-aix-4.x.h:
-        * ace/config-posix.h:
-          These files were using improper syntax to compare the value of
-          _XOPEN_SOURCE against a constant that caused compilation errors on
-          HP-UX 11.23 with HP aC++/ANSI C B3910B A.06.00.  For example:
-          #if defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-          was changed to:
-          #if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)
-
-          Thanks to Paul Koch <paul dot koch at mci dot com> for reporting
-          this problem and providing the solution.
-
-Wed May 25 20:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_static_order.lst:
-          Added new RTEvent_Skel and RTEvent_Serv libraries and removed
-          RTOldEvent
-
-Tue May 24 20:09:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/time.mpb:
-
-          Inherit from svc_utils.mpb.
-
-Tue May 24 20:46:28 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-          Changed incorrect define ACE_USES_NEW_TERMIOS to
-          ACE_USES_NEW_TERMIOS_STRUCT.
-
-Tue May 24 09:31:42 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-
-          Use $(ILIBMODIFIER) instead of $(LIBMODIFIER).
-
-        * tests/Pipe_Test.cpp:
-        * tests/Process_Mutex_Test.cpp:
-
-          Added missing ACE_TEXT () around option strings.  This was causing
-          a very strange file to show up after the Process_Mutex_Test was
-          run in the Borland unicode build and the Pipe_Test didn't run at
-          all.
-
-Tue May 24 00:17:09 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/cidlc.mpb:
-
-          Created a base project for cidlc & ccf project files.
-
-Tue May 24 07:58:09 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/SSL/SSL_SOCK_Stream.h:
-          Added include "ace/os_include/os_stdio.h" to fix compile
-          problem on LynxOS. Thanks to Christine Ballard
-          <christine.ballard at lmco dot com> for reporting the problem.
-
-Mon May 23 23:11:14 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * contrib/utility/*:
-
-          Added the utility library.
-
-Mon May 23 16:38:13 2005  Steve Huston  <shuston@riverace.com>
-
-        * examples/Reactor/Proactor/post_completions.cpp: Made use of the
-          ACE_POSIX_SIG_Proactor-based test dependent on
-          ACE_HAS_POSIX_REALTIME_SIGNALS, not ACE_POSIX_SIG_PROACTOR.
-          ACE_POSIX_SIG_PROACTOR indicates a preference for that proactor
-          implementation when one is not specified; it's not a capability
-          indicator. The presence of the ACE_POSIX_SIG_Proactor implementation
-          is based on the ACE_HAS_POSIX_REALTIME_SIGNALS setting, so that's
-          what's used to decide whether to explicitly use
-          ACE_POSIX_SIG_Proactor. This fixes a build error on Mac OS X Tiger
-          with autoconfigure, as well as any other platform with AIO
-          support that doesn't declare a Proactor implementation preference.
-          Thanks to J.T. Conklin for raising this issue and working on testing
-          fixes.
-
-Mon May 23 14:52:19 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ACEXML/tests/util/util.mpc:
-
-          Add missing $ Id tag.
-
-Mon May 23 13:02:25 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/String_Base.h:
-        * ace/String_Base.inl:
-        * ace/String_Base.cpp:
-
-          Fixed some documentation bugs, and added some new features to
-          this class.  New efficient overloads for string concatenation.
-          Fixed clear(1) to work as documented.  Used a more optimal
-          string growth when concatenating strings.  Performance
-          optimizations for string concatenation.
-
-        * tests/SString_Test.cpp:
-
-          Test the new string concatenation overloads.
-
-        * bin/tao_other_tests.lst:
-
-          Enabled new ImR tests, and grouped all ImR tests together.
-
-Mon May 23 12:26:19 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/Thread.h: Doxygen-ized the join() comments.
-
-Mon May 23 13:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Lib_Find.cpp:
-          Reverted change below, causes compile errors with some compilers
-
-Mon May 23 12:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Lib_Find.cpp:
-          Small const fix
-
-Mon May 23 10:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/rtcorbaevent.mpb:
-          Use rtevent_serv as base project. These projects use some rtevent
-          implementation stuff so just the client side stubs are not enough.
-
-        * bin/MakeProjectCreator/config/rteventexe.mpb:
-          Use rtevent_skel as base project
-
-Mon May 23 10:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/rtevent_serv.mpb:
-        * bin/MakeProjectCreator/config/rtevent_skel.mpb:
-          New files, the RTEvent service is being split in 3 libs so
-          we need some new base projects
-
-Mon May 23 05:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/rtoldevent.mpb:
-          Removed this file
-
-        * bin/MakeProjectCreator/config/rteventlogadmin.mpb:
-          Removed rtoldevent as base project
-
-Sun May 22 12:01:46 2005  Olli Savia  <ops@iki.fi>
-
-        * ace/High_Res_Timer.cpp:
-
-          Fixed a typo in comment.
-
-Fri May 20 21:11:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/DLL.cpp (~ACE_DLL):
-
-          Explicitly delete() this->dll_name_.  It is normally delete()d
-          in ACE_DLL::close().  However, that may not occur if full
-          ACE_DLL initialization is interruepted due to errors
-          (e.g. attempting to open a DSO/DLL that does not exist).  Fixes
-          a memory leak.
-
-        * ace/Log_Msg.cpp (msg_ostream):
-
-          Delete the previously allocated ostream prior to setting the new
-          one, if necessary.  Fixes a memory leak.
-
-        * ace/Logging_Strategy.h (ACE_Logging_Strategy):
-
-          Converted integer fields that are really booleans to be of type
-          "bool", and reordered fields to avoid excessive alignment
-          padding.  Reduces size of this class by 8 bytes on most
-          platforms.
-
-        * ace/Logging_Strategy.cpp:
-
-          Initialize fields in base member initializer list to prevent
-          accidental use of uninitialized fields.
-
-          Use C++ "true" and "false" instead of "1" and "0", respectively,
-          when setting boolean field values.
-
-        * ace/SString.h (ACE_Auto_String_Free):
-
-          Corrected documentation suggesting use of
-          ACE_Auto_Array_Ptr<char *>.  The correct template argument is
-          "char", not "char *".
-
-        * tests/CDR_Test.cpp:
-        * tests/Multicast_Test.cpp:
-
-          Fixed memory leaks.
-
-        * tests/Logging_Strategy_Test.cpp:
-
-          Updated to be consistent with boolean field changes in
-          ACE_Logging_Strategy class.
-
-        * tests/TP_Reactor_Test.cpp (delete_reactor):
-
-          Reordered finalization code to prevent memory leak.
-
-Fri May 20 19:05:22 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Thread.h (ACE_Thread): Updated the documentation of
-          ACE_Thread::join().  Thanks to Alan Balasuar
-          <balasuar@gmail.com> for motivating this fix.
-
-Sat May 21 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/HTBP/Reactor_Tests/server.cpp:
-          Fixed value computed is not used warning in GCC IA64 build
-
-Fri May 20 15:28:00 2005  Gary Maxey  <gary.maxey@hp.com>
-
-        * ace/config-lite.h
-
-          Added TANDEM platform for ACE_NOTREACHED macro.
-
-Thu May 19 19:10:30 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
-          (handle_output):
-
-          Removed
-
-            ACE_ASSERT (errno == EWOULDBLOCK);
-
-          since errno may have been changed by this point.  Thanks to Ro
-          Madhavan <ro_madhavan@sify.com> for reporting this.
-
-Thu May 19 18:50:23 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/ICMP_Socket.{h cpp inl}:
-        * ace/Ping_Socket.{h cpp inl}:
-        * tests/Network_Adapters_Test.{cpp, h}: Moved ICMP_Socket and
-          Ping_Socket out of the ACE namespace and changed names to
-          ACE_ICMP_Socket and ACE_Ping_Socket, respectively. Also fixed up
-          some text strings with ACE_TEXT.
-          ACE_ICMP_Socket now does not check for root euid - allow the OS to
-          do whatever checks it requires/implements.
-          Improved implementation of ACE_Ping_Socket.
-          Thanks to Robert Iakobashvili for these improvements and changes.
-
-Thu May 19 15:59:38 2005  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK.h: Clarified doc on close() - it sets the object's
-          handle to ACE_INVALID_HANDLE.
-
-Thu May 19 08:58:48 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/INET_Addr.cpp:
-        * ace/INET_Addr.inl:
-
-          Moved remaining virtual methods out of line.  See "Wed May 18
-          16:19:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>" for
-          details.
-
-Thu May 19 15:21:00 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb:
-
-          Added line
-
-          after += TAO_IDL3_TO_IDL2_EXE
-
-          to the config file to make sure that the executable is built
-          before being used in a test, example or application. Thanks to
-          Chad Elliott <elliott_c@ociweb.com> for suggesting the change.
-
-Thu May 19 14:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * netsvcs/clients/Logger/indirect_logging.cpp:
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-          When we can't open the logger print out an error and exit with -1.
-
-Thu May 19 00:38:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * config-g++-common.h:
-        * config-lite.h:
-
-          Removed ACE_EXPORT_SINGLETON_{DECLARATION,DECLARE} macro
-          definitions.  They do not provide the expected behavior in g++
-          4.0 configurations, as they do in VC++ configurations.
-
-Wed May 18 16:19:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/ATM_Addr.cpp:
-        * ace/ATM_Addr.inl:
-        * ace/DEV_Addr.cpp:
-        * ace/DEV_Addr.inl:
-        * ace/FILE_Addr.cpp:
-        * ace/FILE_Addr.inl:
-        * ace/INET_Addr.cpp:
-        * ace/INET_Addr.inl:
-        * ace/MEM_Addr.cpp:
-        * ace/MEM_Addr.inl:
-        * ace/SPIPE_Addr.cpp:
-        * ace/SPIPE_Addr.inl:
-        * ace/Service_Types.cpp:
-        * ace/Service_Types.inl:
-        * ace/UNIX_Addr.cpp:
-        * ace/UNIX_Addr.inl:
-
-          Moved virtual method implementation out-of-line.  Since the
-          classes to which they belong are exported, inlining them will
-          cause problems when attempting to perform a dynamic_cast<> in
-          binaries built with g++ 4.0's -fvisibility-inlines-hidden
-          command line option.
-
-        * ace/Strategies_T.cpp (dump):
-
-          Removed ACE_INLINE from this out of line method.
-
-Wed May 18 15:44:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Semaphore.cpp:
-
-          Removed check for missing shm_open() since this causes problems
-          for platforms supporting POSIX_SEM (and thus not using
-          shm_open/open).  Thanks to Raoul Gough <Raoul dot Gough at liffe
-          dot com> for reporting this.
-
-        * ace/config-openvms.h:
-          Added ACE_LACKS_UNNAMED_SEMAPHORE to compensate for above
-          change.
-
-Wed May 18 14:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/ASX/Message_Queue/buffer_stream.cpp:
-          Initialise all pointers with 0
-
-Wed May 18 09:25:35 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-        * include/makeinclude/rules.lib.GNU:
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-
-          Fixed a problem that I introduced in a previous change.  Resource
-          files were not being handled properly and the
-          platform_gnuwin32_common.GNU file was referencing $(VSHOBJS1)
-          which I removed.
-
-        * include/makeinclude/all_in_one.GNU:
-        * include/makeinclude/wrapper_macros.GNU:
-        * include/makeinclude/rules.bin.GNU:
-
-          Removed the file rules.bin.GNU and all references to it.
-
-Tue May 17 20:58:46 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb:
-
-          New file, a base project for the tao_idl3_to_idl2 executable,
-          so it can be executed automatically in a test or example.
-
-Tue May 17 18:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/ASX/Message_Queue/ASX_Message_Queue.mpc:
-          Don't build the buffer_stream exe when wchar is enabled, this
-          example expects just char.
-
-Tue May 17 09:32:01 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Collection_Test.cpp:
-
-          Avoid casting between a pointer to a function and a pointer to
-          an object.  ISO C++ forbids such casts.  Fixes a g++ 4.0
-          warning.
-
-Tue May 17 07:50:07 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * ace/Cache_Map_Manager_T.cpp:
-        * ace/Cached_Connect_Strategy_T.cpp:
-        * ace/Caching_Strategies_T.cpp:
-        * ace/Caching_Utility_T.cpp:
-        * ace/Cleanup_Strategies_T.cpp:
-        * ace/Hash_Cache_Map_Manager_T.h:
-        * ace/Hash_Cache_Map_Manager_T.cpp:
-        * ace/QoS/QoS_Manager.h:
-
-          Fix incorrect use of #pragma once.
+        * ace/Array_Map.{h,cpp}:
+        * ace/Base_Thread_Adapter.h:
+        * ace/Cleanup.h:
+        * ace/Log_Msg.h:
+        * ace/Versioned_Namespace.h:
+        * ace/Get_Opt.cpp:
+        * ace/WIN32_Proactor.cpp:
+        * ace/Message_Queue.cpp:
+        * ace/CDR_Base.h:
+          Removed work arounds for vc6
 
-        * ace/Functor.h:
-        * ace/Functor.inl:
+        * ace/README
+        * ace/config-win32-msvc6.h:
         * ace/Global_Macros.h:
-        * ace/ace_wchar.h:
-        * ace/config-win32-msvc.h:
-
-          Add a new ACE_LACKS_NATIVE_WCHAR_T macro, which can be used to
-          check whether a platform supports overloading on wchar_t without
-          conflict.  The existing ACE_WSTRING_HAS_USHORT_SUPPORT was
-          incorrectly being used for two purposes. This setting should let
-          us enable native wchar_t support on VC7+.
-
-        * ace/OS_NS_time.inl:
-
-          Add a static_cast<long> because time_t is 64bit on some platforms
-          where long is 32 bit.
-
-        * ace/OS_NS_unistd.inl:
-
-          Mask out the X_OK(6) bit for the amode parameter of the access()
-          function because this bit is illegal on Win32 and will assert.
-
-        * ace/config-win32-msvc-7.h:
-
-          Clarify comment on ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT.
-
-        * ace/config-win32-msvc-8.h:
-
-          Disable deprecation warning 4996, because the
-          _CRT_SECURE_NO_DEPRECATE macro doesn't appear to work
-          correctly.
-
-        * ace/streams.h:
-
-          Add missing "using std::ios_base".
-
-Mon May 16 21:39:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * ace/Ping_Socket.h (Ping_Socket):
-
-          Corrected class name in Doxygen documentation.
-
-Mon May 16 19:18:14 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-        * examples/Makefile.am:
-        * protocols/Makefile.am:
-        * protocols/examples/Makefile.am:
-
-          Adapt autoconf build to adjust to relocation of RMCast examples.
-
-Mon May 16 15:58:29 2005  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Corrected the names of the Sun compilers supported.
-          Thanks to Nick Todd <nicholas dot todd at gs dot com> for
-          bringing this error to our attention.
-
-        * THANKS: Added Nick Todd to the Hall of Fame.
-
-Mon May 16 12:33:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * THANKS:
-
-          Added Mario Di Giacomo to the Hall of Fame.
-
-        * ace/Service_Templates.cpp:
-
-          Include "ace/SString.h" to pull in ACE_TString declaration.
-          Thanks to Mario Di Giacomo <mdigiacomo at anteon dot com> for
-          reporting the problem.
-
-        * tests/Cache_Map_Manager_Test.cpp (find_test_cache):
-
-          Fixed "variable may be used uninitialized" warning.
-
-Mon May 16 19:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Malloc.h:
-          Doxygen improvement
-
-Mon May 16 10:57:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Reset DEFAULT_INCLUDES to address ambiguity between system's
-          signal.h and semaphore.h headers and ACE's Signal.h and
-          Semaphore.h headers on case insensitive file systems.
-
-          This may be the best setting for all ACE/TAO Makefile.am's,
-          but this is the only one that requires it.
+          Deprecated ACE_HAS_BROKEN_NAMESPACES, we drop msvc6 and I am
+          removing the workarounds for this compiler one by one as part of the
+          new sequence implementation. Because we deprecate this also
+          ACE_NESTED_CLASS is deprecated
 
-Mon May 16 10:56:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-win32-msvc6.h:
+        * ace/config-win32-msvc7.h:
+        * ace/config-win32-msvc8.h:
+          Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST, not used in ACE
 
-        * configure.ac:
-
-          Add ACE_LD_SEARCH_PATH and ACE_DLL_SUFFIX settings for
-          darwin/MacOSX.
-
-          Add ACE_HAS_NANOSLEEP feature test check.
-
-Mon May 16 10:49:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/POSIX_CB_Proactor.h:
-
-          Add defined(__APPLE__) to conditional wrapping sigval_t type
-          definition.
-
-Mon May 16 10:45:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
-
-          Changed *win* patterns to *win32* to avoid matching darwin,
-          the MacOSX kernel.
-
-Mon May 16 15:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_mingw32.GNU:
-        * include/makeinclude/platform_sco5.0.0-nothread.GNU:
-        * include/makeinclude/platform_sunos4_g++.GNU:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-        * include/makeinclude/platform_unixware_g++.GNU:
-        * include/makeinclude/platform_unixware_udk.GNU:
-        * include/makeinclude/platform_win32_dmc.GNU:
-        * include/makeinclude/platform_win32_interix.GNU:
-          Simplified these files by using the ?= operator. This sets a value
-          only when it is not set yet.
+        * ace/config-win32-msvc6.h:
+        * ace/config-win32-visualage.h:
+        * ace/Registry.h
+          Removed ACE_HAS_BROKEN_NESTED_TEMPLATES, only used for msvc6 and
+          visual age, both are being dropped
 
-Mon May 16 09:24:29 2005  Chad Elliott  <elliott_c@ociweb.com>
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
+          Added Bug_2503_Regression
 
-          Enabled the Exposed_Policies test on Linux.
-
-        * bin/tao_other_tests.lst:
-
-          Added a !NO_IFR configuration to each IFR related test.
-          The IFR_Service will not run on MacOS X unless TAO is built
-          statically due to gcc's in ability to deal with template
-          instantiated singletons correctly.
-
-          Added a NO_LOADAVG configuration to avoid running the load average
-          based test on platforms that do not have support for obtaining the
-          load average from the system.
-
-          Added a configuration for NO_MCAST for machines that do not have
-          multicast capabilities or the multicast implementation is broken.
-
-          Added !STATIC to two LoadManager tests to support static builds on
-          Windows.
-
-Mon May 16 14:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Active_Map_Manager.h:
-        * ace/Base_Thread_Adapter.h:
-        * ace/Process.h:
-        * ace/QtReactor.h:
-          Doxygen improvement
-
-        * ace/QtReactor.cpp:
-          Fixed compile problems with msvc6
-
-        * examples/ASX/Message_Queue/buffer_stream.cpp:
-          Use ACE_SIZE_T_FORMAT_SPECIFIER to print out an size_t variable
-          with ACE_OS::sprintf
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-        * include/makeinclude/platform_hpux_gcc.GNU:
-        * include/makeinclude/platform_irix6.x_g++.GNU:
-        * include/makeinclude/platform_irix6.x_sgic++.GNU:
-        * include/makeinclude/platform_linux.GNU:
-        * include/makeinclude/platform_linux_borland.GNU:
-        * include/makeinclude/platform_linux_cxx.GNU:
-        * include/makeinclude/platform_macosx.GNU:
-          Simplified these files by using the ?= operator. This sets a value
-          only when it is not set yet. Also set some variables using ?= so
-          that our users can easily define their own values.
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Disable warning 1572 (floating point warning), correct name of Qt
-          library and only set several variables when they are not set yet
-
-Mon May 16 09:01:07 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Conn_Test.cpp:
-
-          Force this test to use threads (instead of fork) on MacOS X.
-
-        * tests/FIFO_Test.cpp:
-
-          Sleep 1 second (as is done on AIX and HP-UX) before attempting to
-          receive from the fifo.
-
-        * tests/MT_Reference_Counted_Event_Handler_Test.cpp:
-
-          Set global_event_loop_thread_variable before activating the thread
-          that may use it.
-
-        * tests/Naming_Test.cpp:
-
-          Allow the user to determine the location of the context file by
-          the TMPDIR, TEMP and TMP environment variables.
-
-        * tests/Pipe_Test.cpp:
-        * tests/Process_Mutex_Test.cpp:
-
-          Use the value from argv[0] instead of hardcoding the exe name.
-          The hardcoded name does not work on Windows Release builds.
-
-        * tests/Process_Strategy_Test.cpp:
-
-          Use threads by default on HP-UX instead of fork.
-          Added a timeout for the recv() call in
-          Counting_Service::handle_input() for HP-UX only.
-
-        * tests/run_test.lst:
-
-          Added a configuration for NO_MCAST for machines that do not have
-          multicast capabilities or the multicast implementation is broken.
-
-        * tests/SSL/aix_hack_for_main.cpp:
-        * tests/aix_hack_for_main.cpp:
-
-          Removed these files.  They are no longer needed due to MPC.
-
-Mon May 16 08:52:11 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/crosscompile.mpb:
-
-          Added lib_warning, require_warning and avoid_warning to the list
-          of targets in the CROSS-COMPILE portion.
-
-        * bin/MakeProjectCreator/config/rtcorbaevent.mpb:
-
-          The RTCORBAEvent library requires the CosNaming library.
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Support the MPC feature that will allow users to specify arbitrary
-          input file dependencies.
-
-          Changed the OBJS setting to use $(notdir) only if the source file
-          contains ../ and added explicit rules for source files that are
-          located in subdirectories.
-
-        * include/makeinclude/platform_macosx_panther.GNU:
-
-          Explicitly default the threads variable to threads=1.  This
-          was preventing ACE_TMCast from building.
-          Change the optimization option to -O2.  -O3 was causing some
-          link problems in the IDL compiler.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-
-          Allow users to override the inline and exceptions settings.
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-        * include/makeinclude/rules.local.GNU:
-
-          Provide better support for building for VxWorks on a Windows host
-          without Cygwin.
-
-        * include/makeinclude/rules.lib.GNU:
-
-          Changed the SHOBJS setting to be consistent with the OBJS setting.
-          Also, removed VLOBJS and SHOBJS1 which were redundant and set
-          exactly as SHOBJS was.
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Set ec_typed_events to 1 by default.  This matches the default for
-          MPC features.
-
-        * bin/pch_cmd.pl:
-
-          Removed this file.  It is no longer necessary.
-
-Mon May 16 08:44:14 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/ACE.cpp:
-        * ace/config-irix6.x-sgic++.h:
-        * ace/config-qnx-neutrino.h:
-        * ace/config-qnx-rtp-common.h:
-        * ace/config-sunos5.5.h:
-
-          Put ACE_LIB_TEXT around all ACE_CC_NAME definitions to support
-          wide character builds on Solaris, QNX and IRIX.
-
-        * ace/ACE_export.h:
-
-          Added support for SunCC 5.6.
-
-        * ace/Multihomed_INET_Addr.h:
-        * ace/Multihomed_INET_Addr.cpp:
-
-          Added an explicit constructor that takes a const char* for
-          symmetry with the ACE_INET_Addr class.
-
-        * ace/Naming_Context.cpp:
-
-          Removed a bug workaround for aCC A.03.04.  It is no longer a
-          problem to specify other mmap base addresses when running
-          64-bit HP-UX applications.
-
-        * ace/OS_NS_Thread.inl:
-        * ace/config-macosx-panther.h:
-        * ace/Sched_Params.cpp:
-
-          MacOS X has pthread_getschedparam but has the ACE_LACKS_SETSCHED
-          macro defined.  I have added a new macro,
-          ACE_HAS_PTHREAD_SCHEDPARAM, that can be defined to use
-          pthread_getschedparam and pthread_setschedparam even when
-          ACE_LACKS_SETSCHED is defined.
-
-
-        * ace/OS_NS_Thread.cpp:
-
-          Fixed an issue that arose within the static builds on Windows.
-          The ACE_Thread_Mutex static data member of the
-          TSS_Cleanup_Instance class was being used (in the
-          TSS_Cleanup_Instance constructor) before it was statically
-          initialized.  I have switched it (and the condition variable
-          associated with it) to a pointer that is allocated the first
-          time into the TSS_Cleanup_Instance constructor.
-
-        * ace/Process_Manager.cpp:
-
-          Committing a change from Justin Michel <michel_j@ociweb.com>.
-          The close() method failed to unregister the reactor on Windows.
-
-        * ace/ace.mpc:
-
-          Removed an unnecessary 'install' setting.
-
-        * ace/config-sunos5.10.h:
-
-          SunOS 5.10 has scandir (ACE_HAS_SCANDIR).
-
-        * ace/os_include/sys/os_socket.h:
-
-          When using LKSCTP, include <netinet/in.h> before <netinet/sctp.h>
-          to avoid macro problems.
-
-Sun May 15 11:57:56 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/INET_Addr.cpp (set): Changed the test from
-
-          if (port_number < 0)
-
-          to
-
-          if (port_number == -1)
-
-          to work around problems when (port_number & 0x80 != 0).  Thanks
-          to Vemund Handeland <vemund.handeland@fantoft.no> for reporting
-          this.
-
-Mon May 16 11:35:00 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/tests/tests.mwc:
-        * protocols/tests/RMCast/Protocol.h:
-        * protocols/tests/RMCast/RMCast.mpc:
-        * protocols/tests/RMCast/Receiver.cpp:
-        * protocols/tests/RMCast/Sender.cpp:
-        * protocols/tests/RMCast/run_test.pl:
-
-          Added regression test with loss and reordering simulator
-          for RMCast.
-
-Mon May 16 11:26:14 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * examples/RMCast/Makefile.am:
-        * examples/RMCast/Send_Msg/Makefile.am:
-        * examples/RMCast/Send_Msg/Protocol.h:
-        * examples/RMCast/Send_Msg/README:
-        * examples/RMCast/Send_Msg/Receiver.cpp:
-        * examples/RMCast/Send_Msg/Send_Msg.mpc:
-        * examples/RMCast/Send_Msg/Sender.cpp:
-
-          Removed as part of the moving all RMCast-related
-          code to protocols/.
-
-Mon May 16 11:22:09 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/examples/example_base.mpb:
-        * protocols/examples/examples.mwc:
-        * protocols/examples/RMCast/Makefile.am:
-        * protocols/examples/RMCast/Send_Msg/Makefile.am:
-        * protocols/examples/RMCast/Send_Msg/Protocol.h:
-        * protocols/examples/RMCast/Send_Msg/README:
-        * protocols/examples/RMCast/Send_Msg/Receiver.cpp:
-        * protocols/examples/RMCast/Send_Msg/Send_Msg.mpc:
-        * protocols/examples/RMCast/Send_Msg/Sender.cpp:
-
-          Copyied from examples/RMCast as part of the moving
-          all RMCast-related code to protocols/.
-
-
-Mon May 16 11:05:26 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * examples/RMCast/Send_Msg/Receiver.cpp:
-        * examples/RMCast/Send_Msg/Sender.cpp:
-
-          Showcase new features (see below).
-
-Mon May 16 10:58:43 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * protocols/ace/RMCast/Acknowledge.cpp:
-        * protocols/ace/RMCast/Link.cpp:
-        * protocols/ace/RMCast/Link.h:
-        * protocols/ace/RMCast/Protocol.cpp:
-        * protocols/ace/RMCast/Protocol.h:
-        * protocols/ace/RMCast/Retransmit.cpp:
-        * protocols/ace/RMCast/Socket.cpp:
-        * protocols/ace/RMCast/Socket.h:
-
-          Implemented message aging and unavailability reporting,
-          reactor-compatible interface, and message size query
-          interface.
-
-        * protocols/ace/RMCast/README:
-
-          Protocol documentation.
-
-Sat May 14 06:05:55 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Apr 18 20:49:16 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * ACE version 5.4.5 released.
+        * ACE version 5.5.1 released.
 
 Local Variables:
-add-log-time-format: current-time-string
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
 End:
diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp
index 491e59fda40..25ae499ec68 100644
--- a/Kokyu/Dispatcher_Task.cpp
+++ b/Kokyu/Dispatcher_Task.cpp
@@ -11,7 +11,7 @@
 
 ACE_RCSID(Kokyu, Dispatcher_Task, "$Id$")
 
-namespace 
+namespace
 //anonymous namespace - use this to avoid polluting the global namespace
 {
   const int ALLOC_POOL_CHUNKS = 200;
@@ -20,7 +20,7 @@ namespace
 namespace Kokyu
 {
 
-typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX> 
+typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
 Dispatch_Queue_Item_Allocator;
 
 int
@@ -150,7 +150,7 @@ Dispatcher_Task::enqueue (const Dispatch_Command* cmd,
                                    this->allocator_);
 
   this->putq (mb);
-  
+
   return 0;
 }
 
@@ -187,21 +187,3 @@ void Dispatch_Queue_Item::init_i (const QoSDescriptor& qos_info)
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> >;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>, ACE_SYNCH_MUTEX>;
-template class ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> >
-#pragma instantiate ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/Kokyu/Kokyu_defs.cpp b/Kokyu/Kokyu_defs.cpp
index dd99b6b7064..33ebae25f31 100644
--- a/Kokyu/Kokyu_defs.cpp
+++ b/Kokyu/Kokyu_defs.cpp
@@ -34,7 +34,7 @@ int Dispatcher_Attributes::thread_creation_flags () const
 
    switch (sched_policy_)
    {
-      case ACE_SCHED_FIFO: 
+      case ACE_SCHED_FIFO:
          thread_creation_flags |= THR_SCHED_FIFO;
          break;
 
@@ -54,22 +54,13 @@ int Dispatcher_Attributes::thread_creation_flags () const
          thread_creation_flags |= THR_SCOPE_PROCESS;
          break;
 
-      case ACE_SCOPE_THREAD: 
-      default:        
+      case ACE_SCOPE_THREAD:
+      default:
          thread_creation_flags |= THR_SCOPE_SYSTEM;
          break;
    }
-   return thread_creation_flags;   
+   return thread_creation_flags;
 }
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array<Kokyu::ConfigInfo>;
-template class ACE_Array_Base<Kokyu::ConfigInfo>;
-template class ACE_Array_Iterator<Kokyu::ConfigInfo>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array<Kokyu::ConfigInfo>
-#pragma instantiate ACE_Array_Base<Kokyu::ConfigInfo>
-#pragma instantiate ACE_Array_Iterator<Kokyu::ConfigInfo>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/Kokyu/Kokyu_defs.h b/Kokyu/Kokyu_defs.h
index 281b0ac42c0..c2b83af847a 100644
--- a/Kokyu/Kokyu_defs.h
+++ b/Kokyu/Kokyu_defs.h
@@ -24,8 +24,6 @@
 
 #include "kokyu_export.h"
 
-class ACE_Allocator;
-
 namespace Kokyu
 {
   typedef long Priority_t;
diff --git a/Kokyu/README b/Kokyu/README
index 2cd0f79a6f4..9db0e95225b 100644
--- a/Kokyu/README
+++ b/Kokyu/README
@@ -6,7 +6,7 @@ context of higher-level middleware. Kokyu currently provides real-time
 scheduling and dispatching services for TAO's real-time Event Service
 which mediates supplier-consumer relationships between application
 operations. Kokyu also provides a scheduling and dispatching framework
-for threads. This is being used by the TAO RTCORBA 2.0 scheduler
+for threads. This is being used by the TAO RTCORBA 1.2 scheduler
 implementations. For more information, see
 
 ACE_wrappers/Kokyu/docs/Kokyu.html
diff --git a/Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc b/Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc
index 3a0b0dd4185..62da58ed055 100644
--- a/Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc
+++ b/Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project: kokyu {
+  avoids += ace_for_tao
   exename = MIF
 }
diff --git a/Kokyu/tests/DSRT_MIF/MIF.cpp b/Kokyu/tests/DSRT_MIF/MIF.cpp
index 17aee89687e..4c943533ad6 100644
--- a/Kokyu/tests/DSRT_MIF/MIF.cpp
+++ b/Kokyu/tests/DSRT_MIF/MIF.cpp
@@ -183,72 +183,3 @@ int ACE_TMAIN (int,ACE_TCHAR**)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Kokyu::DSRT_Dispatcher_Factory<mif_scheduler_traits>;
-template class Kokyu::DSRT_Dispatcher<mif_scheduler_traits>;
-template class Kokyu::DSRT_Dispatcher_Impl<mif_scheduler_traits>;
-template class Kokyu::DSRT_Direct_Dispatcher_Impl<mif_scheduler_traits>;
-template class Kokyu::DSRT_CV_Dispatcher_Impl<mif_scheduler_traits>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>;
-template class Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>;
-template class Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *>;
-
-template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> >;
-
-template class Kokyu::MIF_Comparator<mif_scheduler_traits::QoSDescriptor_t>;
-
-template class ACE_Hash_Map_Iterator_Base_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Array_Iterator<Kokyu::ConfigInfo>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatcher<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>
-#pragma instantiate Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>
-
-#pragma instantiate Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Koky\
-u::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<\
-mif_scheduler_traits> >
-
-#pragma instantiate ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *>
-
-#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> >
-
-#pragma instantiate Kokyu::MIF_Comparator<mif_scheduler_traits::QoSDescriptor_t>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Array_Iterator<Kokyu::ConfigInfo>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/Makefile.am b/Makefile.am
index 40e551bbca6..340e2a53ff1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,18 @@ SUBDIRS += \
         apps \
         bin \
         netsvcs \
-        performance-tests \
-        protocols \
-        examples \
-        tests \
+        protocols 
+
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
+
+if BUILD_TESTS
+SUBDIRS += performance-tests
+SUBDIRS += tests
+endif
+
+SUBDIRS += \
         websvcs \
 	@KOKYU@ \
 	@TAO@
@@ -31,4 +39,3 @@ SUBDIRS += \
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
-
diff --git a/NEWS b/NEWS
index f0c8d3b5caf..0594dde491a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,114 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
-PLANNED MAJOR CHANGES TARGETED FOR ACE-5.4.8
+. (Remedy) VxWorks 6.2 support
+
+USER VISIBLE CHANGES BETWEEN ACE-5.5.1 and ACE-5.5.2
 ====================================================
 
-. Subset ACE for TAO and TAO Services
+. Explicit template instantiations support has been removed
+
+. Visual C++ 6.0 and 7.0 support has been removed
+
+. Added a wrapper for the sendfile API
+
+USER VISIBLE CHANGES BETWEEN ACE-5.5 and ACE-5.5.1
+====================================================
+
+. Added support for the --enable-symbol-visibility configure option
+  to the autoconf build infrastructure instead of solely relying on
+  feature tests to enable/disable symbol visibility support.  This
+  avoids build problems with icc, etc.
+
+. Added support for the --enable-fl-reactor configure option to the
+  autoconf build infrastructure to build the ACE_FlReactor library.
+
+. Added support for the --enable-qt-reactor configure option to the
+  autoconf build infrastructure to build the ACE_QtReactor library.
+
+. Added support for the --enable-xt-reactor configure option to the
+  autoconf build infrastructure to build the ACE_XtReactor library.
+
+. Fixed a bug that would cause timer IDs from ACE_Timer_Heap to be
+  improperly duplicated under certain conditions (Bugzilla #2447).
+
+. Fixed ACE_SSL_Context::private_key(), context(), and dh_params() methods
+  to allow retrying a file load after a failed call.
+
+. Fixed ACE_SSL_Asynch_Stream so it can be instantiated; also moved the
+  declarations for ACE_SSL_Asynch_Read_Stream_Result,
+  ACE_SSL_Asynch_Write_Stream_Result, and ACE_SSL_Asynch_Result classes
+  to the ace/SSL/SSL_Asynch_Stream.h file so applications can see them.
+
+. The ACE_Task class's internal lock_ member was changed from an
+  ACE_Thread_Mutex to ACE_Recursive_Thread_Mutex. Additionally, the lock
+  is now held by ACE across the call to a task's close() hook when a thread
+  is shutting down to prevent a race condition where multiple threads may
+  think they are the last thread (Bugzilla #2339).
+
+USER VISIBLE CHANGES BETWEEN ACE-5.4.10 and ACE-5.5
+====================================================
+
+. Added a platform macros option "templates=manual", currently only
+  applies to AIX 5.3 with XL 7 compiler.  It allows the user to tell the
+  compiler to set -qnotempinc and -qnotemplateregistry and works well
+  in static builds.
+
+. ACE and its tests compile error free with GCC 4.1 pre release.
+
+. ACE_Recursive_Thread_Mutex::get_nesting_level() fixed for 64-bit Windows
+  XP on amd64/EM64T hardware.
+
+. Many build-time fixes for Windows Mobile 5 and Windows PocketPC 2003 using
+  Visual Studio .NET 2005 (VC8).
+
+. Added support for the --enable-tk-reactor configure option to the
+  autoconf build infrastructure to build the ACE_TkReactor library.
+
+USER VISIBLE CHANGES BETWEEN ACE-5.4.9 and ACE-5.4.10
+====================================================
+
+. Fixed a bug in ACE_Timer_Heap_T::cancel().
+
+. Improved ACE_Time_Value support for boundary conditions.
+
+. Fixed problems with operator placement delete on certain C++ compilers.
+
+. Fixed a bug with the ACE_SPIPE_Acceptor on Windows.
+
+. Correctly set sockaddr_in.sin_len and sockaddr_in6.sin6_len on
+  platforms that have these fields.
+
+. Avoided problems with namespace pollution for max() macros.
+
+. Many fixes for ACE_LACKS* and ACE_HAS* macros for autoconfig.
+
+USER VISIBLE CHANGES BETWEEN ACE-5.4.8 and ACE-5.4.9
+====================================================
+
+. Added dozens of new ACE_LACKS and ACE_HAS defines which are used to
+  simplify the ACE_OS layer
+
+. Constructors of ACE_Time_Value have been made explicit to prevent
+  implicit conversions.
+
+. Added a shutdown() method to ACE_Barrier. The new method aborts the
+  wait by all threads.
+
+. Changed the behavior of ACE_Message_Queue::enqueue_head() and
+  enqueue_tail(). If the enqueued message block has other blocks
+  chained to it via its next() pointer, the entire chain of blocks
+  will be enqueued at once.
+
+. Improved the support for high-resolution timers with
+  ACE_Timer_Queue_Adapter.
+
+. Make it possible to disable file caching in JAWS.
+
+. Improved ACE_Pipe implementation so that it uses localhost to avoid
+  firewall problems.
+
+. Added Unicode support to the Service Configurator.
 
 USER VISIBLE CHANGES BETWEEN ACE-5.4.7 and ACE-5.4.8
 ====================================================
@@ -16,9 +120,51 @@ USER VISIBLE CHANGES BETWEEN ACE-5.4.7 and ACE-5.4.8
 . TTY_IO overhaul
   - Improved documentation.
   - It is now possible to request infinite timeout in portable manner.
-    This can be achived by setting negative value to readtimeoutmsec.
+    This can be achieved by setting negative value to readtimeoutmsec.
   - Various bugs fixed and portability issues resolved.
 
+. Subset ACE for TAO and TAO Services
+
+. Support for Intel C++ 9.0 on Windows and Linux
+
+. Support for Microsoft Visual Studio 2005 (aka VC8) for Win32 as well
+  as the Windows CE platforms Pocket PC 2003 and Windows Mobile 5.
+  Solution/project files are generated with an appended "_vc8" for
+  Win32 and "_WinCE" for the CE platforms. See
+  ACE_wrappers/docs/CE-status.txt for more information.
+
+. Completed implementation of ACE_Dev_Poll_Reactor using the Linux epoll
+  facility; tested on Red Hat Enterprise Linux 4.
+
+. The in-memory size of an ACE_RB_Tree will be smaller due to rearranged
+  placement of pointers.
+
+. Added an optimization to CDR stream to ignores alignment when marshaling
+  data.  Use this new ACE_LACKS_CDR_ALIGNMENT compile-time option only
+  when the ACE_DISABLE_SWAP_ON_READ macro is enabled.  This new option
+  requires ACE CDR engine to do both marshaling and demarshaling, and
+  when this option is enabled the encoded streams are no longer
+  compliant with the CORBA CDR specification.
+
+. Developed Feature Oriented Customizer (FOCUS) tool to enable
+  specialization of middleware frameworks such as Reactor and Protocol
+  framework.  FOCUS provides an XML based transformation engine, where
+  the transformations to specialize the components are captured in XML
+  file and a weaver specializes the code.
+
+. Added support for unrolling ACE_OS::memcpy copy loop where
+  applicable to improve performance. Autoconf tests empirically
+  determine whether loop unrolling is at least 10% better than default
+  version.
+
+. Added support for an ACE "versioned" namespace.  When enabled, ACE
+  library sources will be placed within a namespace of the user's
+  choice or a namespace of the form ACE_5_4_7 by default, where
+  "5_4_7" is the ACE major, minor and beta versions.  The default may
+  be overridden by defining the ACE_VERSIONED_NAMESPACE_NAME
+  preprocessor symbol.  Enable overall versioned namespace support by
+  adding "versioned_namespace=1" to your MPC default.features file.
+
 USER VISIBLE CHANGES BETWEEN ACE-5.4.6 and ACE-5.4.7
 ====================================================
 
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 3b9bc39c14b..6f2bbc4757e 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.4.7
+    ACE VERSION: 5.5.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -88,3 +88,4 @@ transcript if at all possible.  ]
 
     SAMPLE FIX/WORKAROUND:
 [If available ]
+
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
index d16c5ce3ec1..521602ac70f 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
@@ -15,7 +15,7 @@ namespace CCF
     {
       struct Composition;
       struct HomeExecutor;
-      
+
       struct Factory : virtual IDL3::SemanticAction::Factory
       {
         virtual Composition&
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
index 82220fe9bb7..349f1854786 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
index daede420625..b7451969555 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
@@ -6,6 +6,7 @@
 #define CCF_CODE_GENERATION_KIT_INDENTATION_CXX_HPP
 
 #include <deque>
+#include <stack>
 
 #include "CCF/CodeGenerationKit/IndentationBuffer.hpp"
 
@@ -34,10 +35,12 @@ namespace Indentation
   public:
     Cxx (Buffer<C>& out)
         : out_ (out),
-          indentation_ (0),
+          position_ (0),
+          paren_balance_ (0),
           spaces_ (2),
           construct_ (OTHER)
     {
+      indentation_.push (0);
     }
 
     virtual
@@ -52,11 +55,30 @@ namespace Indentation
       try
       {
         bool defaulting = false;
+
+        if (!hold_.empty () && hold_.back () == '(')
+        {
+          unbuffer (); // We don't need to hold it any more.
+
+          if (c == '\n')
+            indentation_.push (indentation_.top () + spaces_);
+          else
+            indentation_.push (position_);
+        }
+
         switch (c)
         {
         case '\n':
           {
             hold_.push_back (c);
+            position_ = 0; // Starting a new line.
+
+            if (construct_ == CXX_COMMENT)
+            {
+              //std::cerr << "end comment" << endl;
+              construct_ = OTHER;
+            }
+
             break;
           }
         case '{':
@@ -65,12 +87,15 @@ namespace Indentation
             output_indentation ();
             result = write (c);
             ensure_new_line ();
-            indentation_++;
+
+            indentation_.push (indentation_.top () + spaces_);
+
             break;
           }
         case '}':
           {
-            if (indentation_ > 0) indentation_--;
+            if (indentation_.size () > 1)
+              indentation_.pop ();
 
             // Reduce multiple newlines to one.
             while (hold_.size () > 1)
@@ -85,65 +110,82 @@ namespace Indentation
 
             hold_.push_back (c);
 
-            // result = write (c);
-
-            //ensure_new_line ();
 
             // Add double newline after '}'.
             //
             hold_.push_back ('\n');
             hold_.push_back ('\n');
-
+            position_ = 0;
 
             break;
           }
         case ';':
           {
-            // Handling '};' case.
-            //
-
-            bool brace (false);
-
-            if (hold_.size () > 1 && hold_.back () == '\n')
+            if (paren_balance_ != 0)
+            {
+              // We are inside for (;;) statement. Nothing to do here.
+              //
+              defaulting = true;
+            }
+            else
             {
-              bool pop_nl (false);
+              // Handling '};' case.
+              //
+
+              bool brace (false);
 
-              for (typename Hold::reverse_iterator
-                     i (hold_.rbegin ()), e (hold_.rend ()); i != e; ++i)
+              if (hold_.size () > 1 && hold_.back () == '\n')
               {
-                if (*i != '\n')
+                bool pop_nl (false);
+
+                for (typename Hold::reverse_iterator
+                       i (hold_.rbegin ()), e (hold_.rend ()); i != e; ++i)
                 {
-                  if (*i == '}') brace = pop_nl = true;
-                  break;
+                  if (*i != '\n')
+                  {
+                    if (*i == '}') brace = pop_nl = true;
+                    break;
+                  }
                 }
+
+                if (pop_nl) while (hold_.back () == '\n') hold_.pop_back ();
               }
 
-              if (pop_nl) while (hold_.back () == '\n') hold_.pop_back ();
-            }
+              output_indentation ();
+              result = write (c);
+              position_++;
 
-            output_indentation ();
-            result = write (c);
+              if (brace)
+              {
+                hold_.push_back ('\n');
+                hold_.push_back ('\n');
+              }
 
-            if (brace)
-            {
-              hold_.push_back ('\n');
-              hold_.push_back ('\n');
+              if (construct_ != STRING_LITERAL && construct_ != CHAR_LITERAL)
+              {
+                ensure_new_line ();
+              }
             }
 
-            if (construct_ != STRING_LITERAL && construct_ != CHAR_LITERAL)
-            {
-              ensure_new_line ();
-            }
             break;
           }
         case '\\':
           {
-            hold_.push_back (c);
+            if (construct_ != CXX_COMMENT)
+            {
+              output_indentation ();
+              hold_.push_back (c);
+              position_++;
+            }
+            else
+              defaulting = true;
+
             break;
           }
         case '\"':
           {
-            if (hold_.empty () || hold_.back () != '\\')
+            if (construct_ != CXX_COMMENT &&
+                (hold_.empty () || hold_.back () != '\\'))
             {
               // not escape sequence
               if (construct_ == STRING_LITERAL) construct_ = OTHER;
@@ -155,16 +197,76 @@ namespace Indentation
           }
         case '\'':
           {
-            if (hold_.empty () || hold_.back () != '\\')
+            if (construct_ != CXX_COMMENT &&
+                (hold_.empty () || hold_.back () != '\\'))
             {
               // not escape sequence
               if (construct_ == CHAR_LITERAL) construct_ = OTHER;
-              else construct_ = CHAR_LITERAL;
+              else
+                {
+                  //std::cerr << "char literal" << endl;
+                  construct_ = CHAR_LITERAL;
+                }
+
+            }
+
+            defaulting = true;
+            break;
+          }
+        case '(':
+          {
+            if (construct_ == OTHER)
+            {
+              // Hold it so that we can see what's coming next.
+              //
+              output_indentation ();
+              hold_.push_back (c);
+              position_++;
+              paren_balance_++;
+            }
+            else
+              defaulting = true;
+
+            break;
+          }
+        case ')':
+          {
+            if (construct_ == OTHER)
+            {
+              if (indentation_.size () > 1)
+                indentation_.pop ();
+
+              if (paren_balance_ > 0)
+                paren_balance_--;
             }
 
             defaulting = true;
             break;
           }
+        case '/':
+          {
+            if (construct_ == OTHER)
+            {
+              if (!hold_.empty () && hold_.back () == '/')
+              {
+                construct_ = CXX_COMMENT;
+                //std::cerr << "start comment" << endl;
+                defaulting = true;
+              }
+              else
+              {
+                output_indentation ();
+                hold_.push_back (c);
+                position_++;
+              }
+            }
+            else
+            {
+              defaulting = true;
+            }
+
+            break;
+          }
         default:
           {
             defaulting = true;
@@ -176,6 +278,7 @@ namespace Indentation
         {
           output_indentation ();
           result = write (c);
+          position_++;
         }
       }
       catch (Full const&)
@@ -214,6 +317,7 @@ namespace Indentation
       if (hold_.empty () || hold_.back () != '\n')
       {
         hold_.push_back ('\n');
+        position_ = 0; // Starting a new line.
       }
     }
 
@@ -223,10 +327,10 @@ namespace Indentation
     {
       if (!hold_.empty () && hold_.back () == '\n')
       {
-        for (unsigned long i = 0; i < indentation_ * spaces_; i++)
-        {
+        for (unsigned long i = 0; i < indentation_.top (); i++)
           write (' ');
-        }
+
+        position_ += indentation_.top ();
       }
     }
 
@@ -241,7 +345,8 @@ namespace Indentation
       {
         result = out_.put (hold_.front ());
 
-        if (result == traits_type::eof ()) throw Full ();
+        if (result == traits_type::eof ())
+          throw Full ();
 
         hold_.pop_front ();
       }
@@ -252,7 +357,9 @@ namespace Indentation
 
   private:
     Buffer<C>& out_;
-    unsigned long indentation_;
+    unsigned long position_; // Current position on the line.
+    unsigned long paren_balance_; // ( ) balance.
+    std::stack<unsigned long> indentation_;
     unsigned long spaces_;
 
     bool suppress_nl_;
@@ -260,6 +367,7 @@ namespace Indentation
     enum Construct
     {
       OTHER,
+      CXX_COMMENT,
       STRING_LITERAL,
       CHAR_LITERAL
     };
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
index 57dcf02af4a..40259a694f6 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
@@ -77,7 +77,7 @@ namespace Indentation
 
     virtual int_type
     put (char_type c) throw (Exception, ExH::System::Exception)
-    {  
+    {
       return buffer_.sputc (c);
     }
 
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
index 8b5a14cbf22..be0bd3827e0 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
@@ -46,7 +46,7 @@ namespace regex
     if (e.empty ()) return src;
 
     wchar_t delimiter (e[0]);
-    
+
     std::wstring::size_type first = e.find (delimiter);
     std::wstring::size_type middle = e.find (delimiter, first + 1);
     std::wstring::size_type last = e.find (delimiter, middle + 1);
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
index feb4e10190f..e52750ba74e 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
@@ -178,23 +178,34 @@ namespace CCF
         {
         }
 
-        PreprocessorImpl (TokenStream<char>& is)
+        PreprocessorImpl (TokenStream<char>& is, Symbols const& symbols)
             : loc_ ("C"),
               state_ (State::preprocessing),
               ln_ (1),
               is_ (is),
-              dsa_ (copy_)
+              dsa_ (copy_),
+              symbols_ (symbols),
+              balance_ (0),
+              skip_balance_ (0)
         {
         }
 
         virtual Token
         next ()
         {
-          if (line_.empty ()) scan_line ();
+          while (true)
+          {
+            if (line_.empty ())
+              scan_line ();
 
-          Token t (line_.front ());
-          line_.pop_front ();
-          return t;
+            Token t (line_.front ());
+            line_.pop_front ();
+
+            if (skip_balance_ != 0 && t != Token::eos)
+              continue;
+
+            return t;
+          }
         }
 
       private:
@@ -299,7 +310,15 @@ namespace CCF
             }
           }
 
-          if (eos) line_.push_back (Token::eos);
+          if (eos)
+          {
+            if (balance_ > 0)
+            {
+              cerr << "missing endif directive at the end of file" << endl;
+            }
+
+            line_.push_back (Token::eos);
+          }
         }
 
 
@@ -312,7 +331,8 @@ namespace CCF
 
           if (std::isalpha<char> (t, loc_))
           {
-            for (;std::isalpha<char> (t, loc_); t = ls_get ()) lexeme += t;
+            for (;std::isalpha<char> (t, loc_); t = ls_get ())
+              lexeme += t;
 
             ls_ret (t);
           }
@@ -322,11 +342,91 @@ namespace CCF
           if (lexeme == "include")
           {
             scan_include ();
+            return;
           }
-          else
+          else if (lexeme == "if")
+          {
+            ++balance_;
+          }
+          else if (lexeme == "ifdef" || lexeme == "ifndef")
+          {
+            ++balance_;
+
+            string symbol;
+            Token t (ls_get_ns ());
+
+
+            if (is_first_id_char (t))
+            {
+              for (;is_id_char (t); t = ls_get ())
+                symbol += t;
+              ls_ret (t);
+            }
+
+            if (!symbol.empty ())
+            {
+              //cerr << "symbol " << symbol << endl;
+
+              if (skip_balance_ == 0) // Unless we are already skipping.
+              {
+                bool defined (symbols_.find (symbol) != symbols_.end ());
+
+                if ((!defined && lexeme == "ifdef") ||
+                    (defined && lexeme == "ifndef"))
+                  skip_balance_ = balance_;
+              }
+            }
+            else
+            {
+              cerr << t.line () << ": no symbol specified for " << lexeme
+                   << " directive" << endl;
+              throw EOS (); //@@ tmp
+            }
+          }
+          else if (lexeme == "elif" || lexeme == "else")
           {
-            // Ingnore any other directive.
+            // For now we treat elif just like else.
             //
+            if (skip_balance_ == balance_)
+              skip_balance_ = 0;
+            else if (skip_balance_ == 0) // Unless we are already skipping.
+              skip_balance_ = balance_;  // Start skipping now.
+          }
+          else if (lexeme == "endif")
+          {
+            if (skip_balance_ == balance_)
+              skip_balance_ = 0;
+
+            if (balance_ > 0)
+              --balance_;
+            else
+            {
+              cerr << t.line () << ": extraneous endif directive" << endl;
+              throw EOS (); //@@ tmp
+            }
+          }
+          else if (lexeme == "error")
+          {
+            if (skip_balance_ == 0)
+            {
+              string msg;
+              Token t (ls_get_ns ());
+
+              if (t != '\n')
+              {
+                for (;t != '\n'; t = ls_get ())
+                  msg += t;
+                ls_ret (t);
+              }
+
+              cerr << t.line () << ": error: " << msg << endl;
+              throw EOS (); //@@ tmp
+            }
+          }
+
+          // By default we replace this directive with a newline.
+          //
+          {
             Token t ('\n', line_.front ().line ());
             line_.clear ();
             line_.push_back (t);
@@ -784,6 +884,18 @@ namespace CCF
           return t == ' ' || t == '\t';
         }
 
+        bool
+        is_first_id_char (Token const& t)
+        {
+          return std::isalpha<char> (t, loc_) || t == '_';
+        }
+
+        bool
+        is_id_char (Token const& t)
+        {
+          return std::isalnum<char> (t, loc_) || t == '_';
+        }
+
       private:
         struct State
         {
@@ -810,6 +922,12 @@ namespace CCF
         std::deque<Token> copy_;
         DequeStreamAdapter dsa_;
         std::deque<Token> ls_buffer_;
+
+        Symbols symbols_;
+        unsigned long balance_;      // Current #if*/#endif balance.
+        unsigned long skip_balance_; // #if*/#endif balance at which we began
+                                     // skipping. 0 indicates no skipping.
+
       };
 
 
@@ -822,8 +940,8 @@ namespace CCF
       }
 
       Preprocessor::
-      Preprocessor (TokenStream<char>& is)
-          : impl_ (new PreprocessorImpl (is))
+      Preprocessor (TokenStream<char>& is, Symbols const& symbols)
+          : impl_ (new PreprocessorImpl (is, symbols))
       {
       }
 
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
index 105fca3cc0f..994c889a3f8 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
@@ -6,6 +6,8 @@
 #define CCF_COMPILER_ELEMENTS_PREPROCESSOR_HPP
 
 #include <memory>
+#include <string>
+#include <set>
 
 #include "CCF/CompilerElements/TokenStream.hpp"
 #include "CCF/CompilerElements/PreprocessorToken.hpp"
@@ -16,13 +18,17 @@ namespace CCF
   {
     namespace CPP
     {
+      typedef
+      std::set<std::string>
+      Symbols;
+
       class Preprocessor : public TokenStream<Token>
       {
       public:
         virtual
         ~Preprocessor ();
 
-        Preprocessor (TokenStream<char>& is);
+        Preprocessor (TokenStream<char>& is, Symbols const&);
 
         virtual Token
         next ();
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
index d3132eea980..f1d3ab4fb8c 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
@@ -16,6 +16,10 @@ namespace CCF
     class TokenStream
     {
     public:
+      // (JP 06-04-06) Not required by C++ spec, but it
+      // eliminates buggy GCC warnings.
+      virtual ~TokenStream () {}
+
       virtual Token
       next () = 0;
     };
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp b/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
index 3f87695c812..bfc725d4d36 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
@@ -356,8 +356,11 @@ namespace CCF
           act_typedef_begin (
             f.typedef_ (), &SemanticAction::Typedef::begin),
 
-          act_typedef_begin_seq (
-            f.typedef_ (), &SemanticAction::Typedef::begin_seq),
+          act_typedef_begin_unbounded_seq (
+            f.typedef_ (), &SemanticAction::Typedef::begin_unbounded_seq),
+
+          act_typedef_begin_bounded_seq (
+            f.typedef_ (), &SemanticAction::Typedef::begin_bounded_seq),
 
           act_typedef_begin_bounded_string (
             f.typedef_ (), &SemanticAction::Typedef::begin_bounded_string),
@@ -365,6 +368,12 @@ namespace CCF
           act_typedef_begin_bounded_wstring (
             f.typedef_ (), &SemanticAction::Typedef::begin_bounded_wstring),
 
+          act_typedef_begin_array (
+            f.typedef_ (), &SemanticAction::Typedef::begin_array),
+
+          act_typedef_bound (
+            f.typedef_ (), &SemanticAction::Typedef::bound),
+
           act_typedef_declarator (
             f.typedef_ (), &SemanticAction::Typedef::declarator),
 
@@ -1145,11 +1154,16 @@ namespace CCF
         ;
 
       typedef_declarator =
-           simple_identifier[act_typedef_declarator]
-        >> *(    LSBRACE[act_const_expr_flush] // flush expression stacks
-              >> numeric_const_expr
-              >> RSBRACE
-            )
+        (    simple_identifier
+          >> !(    LSBRACE[act_typedef_begin_array][act_const_expr_flush]
+                >> numeric_const_expr[act_typedef_bound]
+                >> RSBRACE
+              )
+          >> *(    LSBRACE[act_const_expr_flush]
+                >> numeric_const_expr[act_typedef_bound]
+                >> RSBRACE
+              )
+        )[act_typedef_declarator]
         ;
 
       typedef_type_spec =
@@ -1158,12 +1172,17 @@ namespace CCF
           (
                SEQUENCE
             >> LT
-            >> identifier[act_typedef_begin_seq]
-            >> !(
-                     COMMA[act_const_expr_flush] // flush expression stacks
-                  >> numeric_const_expr
-                )
-            >> GT
+            >>
+               (
+                   (identifier >> GT)[act_typedef_begin_unbounded_seq]
+                 |
+                   (
+                        identifier[act_typedef_begin_bounded_seq]
+                     >> COMMA[act_const_expr_flush] // flush expression stacks
+                     >> numeric_const_expr[act_typedef_bound]
+                     >> GT
+                   )
+               )
           )
         |
           (
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
index 29ee5da0426..b0e307024c5 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
@@ -734,7 +734,10 @@ namespace CCF
       act_typedef_begin;
 
       OneArgAction<IdentifierPtr, SemanticAction::Typedef>
-      act_typedef_begin_seq;
+      act_typedef_begin_unbounded_seq;
+
+      OneArgAction<IdentifierPtr, SemanticAction::Typedef>
+      act_typedef_begin_bounded_seq;
 
       NoArgAction<SemanticAction::Typedef>
       act_typedef_begin_bounded_string;
@@ -742,6 +745,12 @@ namespace CCF
       NoArgAction<SemanticAction::Typedef>
       act_typedef_begin_bounded_wstring;
 
+      NoArgAction<SemanticAction::Typedef>
+      act_typedef_begin_array;
+
+      NoArgAction<SemanticAction::Typedef>
+      act_typedef_bound;
+
       OneArgAction<SimpleIdentifierPtr, SemanticAction::Typedef>
       act_typedef_declarator;
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
index a87d87470b2..5e846d90211 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
@@ -55,6 +55,7 @@ namespace CCF
           {
             Enumerator& e (ctx.tu ().new_node<Enumerator> ());
             ctx.tu ().new_edge<Belongs> (e, *type_);
+            ctx.tu ().new_edge<Defines> (ctx.scope (), e, name);
           }
         }
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
index 054f49ab815..b68f3251f48 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
@@ -41,7 +41,11 @@ namespace CCF
           {
             try
             {
-              type_ = &resolve<Type> (from, name, Flags::complete);
+              // With introduction of CORBA 3.1 we have a new beast:
+              // struct with incoplete members which itself becomes
+              // incomplete.
+              //
+              type_ = &resolve<Type> (from, name/*, Flags::complete*/);
             }
             catch (Resolve const&)
             {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
index a615e2c5ea3..315b69d0e51 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
@@ -5,7 +5,10 @@
 #include "CCF/IDL2/SemanticAction/Impl/Typedef.hpp"
 
 #include "CCF/IDL2/SemanticGraph/Elements.hpp"
+
+#include "CCF/IDL2/SemanticGraph/Array.hpp"
 #include "CCF/IDL2/SemanticGraph/Sequence.hpp"
+#include "CCF/IDL2/SemanticGraph/String.hpp"
 
 #include <iostream>
 
@@ -39,6 +42,7 @@ namespace CCF
 
           define_ = false;
           type_ = 0;
+          array_type_ = 0;
 
           Name name (id->lexeme ());
           ScopedName from (ctx.scope ().scoped_name ());
@@ -70,12 +74,13 @@ namespace CCF
         }
 
         void Typedef::
-        begin_seq (IdentifierPtr const& id)
+        begin_unbounded_seq (IdentifierPtr const& id)
         {
-          if (ctx.trace ()) cerr << "typedef sequence<" << id << ">" << endl;
+          if (ctx.trace ()) cerr << "typedef u-sequence<" << id << ">" << endl;
 
           define_ = true;
           type_ = 0;
+          array_type_ = 0;
 
           Name name (id->lexeme ());
           ScopedName from (ctx.scope ().scoped_name ());
@@ -87,7 +92,7 @@ namespace CCF
               Type& t (resolve<Type> (from, name));
 
               UnboundedSequence& s (ctx.tu ().new_node<UnboundedSequence> ());
-              ctx.tu ().new_edge<Specialized> (s, t);
+              ctx.tu ().new_edge<ArgumentsWithType> (t, s);
 
               type_ = &s;
             }
@@ -113,29 +118,122 @@ namespace CCF
         }
 
         void Typedef::
-        begin_bounded_string ()
+        begin_bounded_seq (IdentifierPtr const& id)
         {
-          if (ctx.trace ()) cerr << "typedef string<" << ">" << endl;
+          if (ctx.trace ()) cerr << "typedef b-sequence<" << id << ">" << endl;
 
-          define_ = false; // this should actually be true
+          define_ = true;
+          type_ = 0;
+          array_type_ = 0;
 
-          Name name ("::string");
+          Name name (id->lexeme ());
           ScopedName from (ctx.scope ().scoped_name ());
 
-          type_ = &resolve<Type> (from, name);
+          try
+          {
+            try
+            {
+              Type& t (resolve<Type> (from, name));
+
+              BoundedSequence& s (ctx.tu ().new_node<BoundedSequence> ());
+              ctx.tu ().new_edge<ArgumentsWithType> (t, s);
+
+              type_ = &s;
+            }
+            catch (Resolve const&)
+            {
+              cerr << "error: invalid sequence declaration" << endl;
+              throw;
+            }
+          }
+          catch (NotFound const&)
+          {
+            cerr << "no type with name \'" << name
+                 << "\' visible from scope \'" << from << "\'" << endl;
+          }
+          catch (WrongType const&)
+          {
+            cerr << "declaration with name \'" << name
+                 << "\' visible from scope \'" << from
+                 << "\' is not a type declaration" << endl;
+            cerr << "using non-type in sequence specialization is illegal"
+                 << endl;
+          }
+        }
+
+        void Typedef::
+        begin_bounded_string ()
+        {
+          if (ctx.trace ()) cerr << "typedef b-string" << endl;
+
+          define_ = true;
+          type_ = 0;
+          array_type_ = 0;
+
+          type_ = &ctx.tu ().new_node<BoundedString> ();
+          bound ();
         }
 
         void Typedef::
         begin_bounded_wstring ()
         {
-          if (ctx.trace ()) cerr << "typedef wstring<" << ">" << endl;
+          if (ctx.trace ()) cerr << "typedef b-wstring" << endl;
 
-          define_ = false; // this should actually be true
+          define_ = true;
+          type_ = 0;
+          array_type_ = 0;
 
-          Name name ("::wstring");
-          ScopedName from (ctx.scope ().scoped_name ());
+          type_ = &ctx.tu ().new_node<BoundedWideString> ();
+          bound ();
+        }
 
-          type_ = &resolve<Type> (from, name);
+        void Typedef::
+        begin_array ()
+        {
+          if (ctx.trace ()) cerr << "array" << endl;
+
+          define_ = true;
+          array_type_ = 0;
+
+          if (type_ == 0)
+            return;
+
+          if (type_->named_begin () == type_->named_end ())
+          {
+            cerr << "error: anonymous types in array declarations "
+                 << "are not supported" << endl;
+
+            cerr << "use another typedef to name this type" << endl;
+
+            return;
+          }
+
+          Array& a (ctx.tu ().new_node<Array> ());
+          ctx.tu ().new_edge<ArgumentsWithType> (*type_, a);
+
+          array_type_ = &a;
+        }
+
+        void Typedef::
+        bound ()
+        {
+          if (ctx.trace ()) cerr << "bound" << endl;
+
+          if (ctx.int_exp_size () < 1)
+            return;
+
+          IntExpression& expr (ctx.int_exp_pop ());
+
+          if (array_type_ != 0)
+          {
+            Specialization& s (dynamic_cast<Specialization&> (*array_type_));
+            ctx.tu ().new_edge<ArgumentsWithValue> (expr, s);
+          }
+          else if (type_ != 0)
+          {
+            Specialization& s (dynamic_cast<Specialization&> (*type_));
+            ctx.tu ().new_edge<ArgumentsWithValue> (expr, s);
+          }
         }
 
         void Typedef::
@@ -149,7 +247,16 @@ namespace CCF
           {
             if (lookup (ctx.tu (), ctx.scope (), name) == 0)
             {
-              if (type_ != 0)
+              if (array_type_ != 0)
+              {
+                assert (define_);
+
+                ctx.tu ().new_edge<Defines> (ctx.scope (), *array_type_, name);
+
+                define_ = false;
+                array_type_ = 0;
+              }
+              else if (type_ != 0)
               {
                 if (define_)
                 {
@@ -170,6 +277,8 @@ namespace CCF
 
           cerr << "error: invalid typedef declaration" << endl;
           cerr << "error: redeclaration of name " << name << endl;
+
+          array_type_ = 0;
         }
 
         void Typedef::
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
index faeea36fd2a..904a04ee56b 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
@@ -25,7 +25,10 @@ namespace CCF
           begin (IdentifierPtr const& id);
 
           virtual void
-          begin_seq (IdentifierPtr const& id);
+          begin_unbounded_seq (IdentifierPtr const& id);
+
+          virtual void
+          begin_bounded_seq (IdentifierPtr const& id);
 
           virtual void
           begin_bounded_string ();
@@ -34,6 +37,12 @@ namespace CCF
           begin_bounded_wstring ();
 
           virtual void
+          begin_array ();
+
+          virtual void
+          bound ();
+
+          virtual void
           declarator (SimpleIdentifierPtr const& id);
 
           virtual void
@@ -42,6 +51,7 @@ namespace CCF
         private:
           bool define_;
           SemanticGraph::Type* type_;
+          SemanticGraph::Type* array_type_;
         };
       }
     }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp
index b7c3d93eba8..b11d10e4f45 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp
@@ -96,7 +96,7 @@ namespace CCF
                 throw WrongType (type_->scoped_name ());
               }
 
-              ctx.tu ().new_edge<Specialized> (now (), *type_);
+              ctx.tu ().new_edge<ArgumentsWithType> (*type_, now ());
             }
             catch (Resolve const&)
             {
@@ -140,7 +140,11 @@ namespace CCF
           {
             try
             {
-              member_type_ = &resolve<Type> (from, name, Flags::complete);
+              // With introduction of CORBA 3.1 we have a new beast:
+              // union with incoplete members which itself becomes
+              // incomplete.
+              //
+              member_type_ = &resolve<Type> (from, name/*, Flags::complete*/);
             }
             catch (Resolve const&)
             {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
index 1c8d7bdadae..a716961bbf0 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
@@ -22,7 +22,7 @@ namespace CCF
         end () = 0;
       };
 
-      
+
       struct TypePrefix
       {
         virtual void
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
index d7c59168fea..d1782591270 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
@@ -19,7 +19,10 @@ namespace CCF
         begin (IdentifierPtr const& id) = 0;
 
         virtual void
-        begin_seq (IdentifierPtr const& id) = 0;
+        begin_unbounded_seq (IdentifierPtr const& id) = 0;
+
+        virtual void
+        begin_bounded_seq (IdentifierPtr const& id) = 0;
 
         virtual void
         begin_bounded_string () = 0;
@@ -28,6 +31,12 @@ namespace CCF
         begin_bounded_wstring () = 0;
 
         virtual void
+        begin_array () = 0;
+
+        virtual void
+        bound () = 0;
+
+        virtual void
         declarator (SimpleIdentifierPtr const& id) = 0;
 
         virtual void
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp
index fcb798887ce..224b0abb7df 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp
@@ -7,6 +7,7 @@
 
 #include "CCF/IDL2/SemanticGraph/Elements.hpp"
 
+#include "CCF/IDL2/SemanticGraph/Array.hpp"
 #include "CCF/IDL2/SemanticGraph/Attribute.hpp"
 #include "CCF/IDL2/SemanticGraph/Enum.hpp"
 #include "CCF/IDL2/SemanticGraph/Exception.hpp"
@@ -20,6 +21,7 @@
 #include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
 #include "CCF/IDL2/SemanticGraph/Operation.hpp"
 #include "CCF/IDL2/SemanticGraph/Sequence.hpp"
+#include "CCF/IDL2/SemanticGraph/String.hpp"
 #include "CCF/IDL2/SemanticGraph/Struct.hpp"
 #include "CCF/IDL2/SemanticGraph/Translation.hpp"
 #include "CCF/IDL2/SemanticGraph/TypeId.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
index ef1c8892b9a..cae24c8a60f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
@@ -352,47 +352,109 @@ namespace CCF
       static_type_info () { return belongs_; }
 
 
-      // TypeTemplateSpecialization
+      // Specialization
       //
       //
       namespace
       {
         TypeInfo
-        type_template_specialization_init_ ()
+        specialization_init_ ()
         {
-          TypeInfo ti (typeid (TypeTemplateSpecialization));
+          TypeInfo ti (typeid (Specialization));
           ti.add_base (Access::PUBLIC, true, Type::static_type_info ());
           return ti;
         }
 
-        TypeInfo type_template_specialization_ (
-          type_template_specialization_init_ ());
+        TypeInfo specialization_ (
+          specialization_init_ ());
       }
 
-      TypeInfo const& TypeTemplateSpecialization::
-      static_type_info () { return type_template_specialization_; }
+      TypeInfo const& Specialization::
+      static_type_info () { return specialization_; }
 
+      void Specialization::
+      add_edge_right (ArgumentsWithType& e)
+      {
+        arguments_.push_back (&e);
+      }
+
+      void Specialization::
+      add_edge_right (ArgumentsWithValue& e)
+      {
+        arguments_.push_back (&e);
+      }
 
-      // Specialized
+      // Arguments
       //
       //
       namespace
       {
         TypeInfo
-        specialized_init_ ()
+        arguments_init_ ()
         {
-          TypeInfo ti (typeid (Specialized));
+          TypeInfo ti (typeid (Arguments));
           ti.add_base (Access::PUBLIC, true, Edge::static_type_info ());
           return ti;
         }
 
-        TypeInfo specialized_ (specialized_init_ ());
+        TypeInfo arguments_ (arguments_init_ ());
+      }
+
+      TypeInfo const& Arguments::
+      static_type_info () { return arguments_; }
+
+
+      // ArgumentsWithType
+      //
+      //
+      namespace
+      {
+        TypeInfo
+        arguments_with_type_init_ ()
+        {
+          TypeInfo ti (typeid (ArgumentsWithType));
+          ti.add_base (Access::PUBLIC, true, Arguments::static_type_info ());
+          return ti;
+        }
+
+        TypeInfo arguments_with_type_ (arguments_with_type_init_ ());
       }
 
-      TypeInfo const& Specialized::
-      static_type_info () { return specialized_; }
+      TypeInfo const& ArgumentsWithType::
+      static_type_info () { return arguments_with_type_; }
 
 
+      // ArgumentsWithValue
+      //
+      //
+      namespace
+      {
+        TypeInfo
+        arguments_with_value_init_ ()
+        {
+          TypeInfo ti (typeid (ArgumentsWithValue));
+          ti.add_base (Access::PUBLIC, true, Arguments::static_type_info ());
+          return ti;
+        }
+
+        TypeInfo arguments_with_value_ (arguments_with_value_init_ ());
+      }
+
+      TypeInfo const& ArgumentsWithValue::
+      static_type_info () { return arguments_with_value_; }
+
+      Expression& ArgumentsWithValue::
+      value () const
+      {
+        return dynamic_cast<Expression&> (argument ());
+      }
+
+      void ArgumentsWithValue::
+      set_left_node (Expression& n)
+      {
+        Arguments::set_left_node (n);
+      }
+
       // IsA
       //
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
index 05d11f5057f..24a18fd3205 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
@@ -479,7 +479,7 @@ namespace CCF
       //
       //
       class Belongs;
-      class Specialized;
+      class ArgumentsWithType;
 
       //@@ I can make an alias Classifies for Belongs?
       //
@@ -510,7 +510,7 @@ namespace CCF
         }
 
         void
-        add_edge_right (Specialized&)
+        add_edge_left (ArgumentsWithType&)
         {
         }
 
@@ -602,15 +602,33 @@ namespace CCF
       };
 
 
-      //@@ Maybe rename it to just Specialization
       //
-      class TypeTemplateSpecialization : public virtual Type
+      //
+      class Arguments;
+      class ArgumentsWithType;
+      class ArgumentsWithValue;
+
+      class Specialization: public virtual Type
       {
+        typedef
+        std::vector<Arguments*>
+        Arguments_;
+
       public:
-        Specialized&
-        specialized () const
+        typedef
+        Arguments_::const_iterator
+        ArgumentsIterator;
+
+        ArgumentsIterator
+        arguments_begin () const
+        {
+          return arguments_.begin ();
+        }
+
+        ArgumentsIterator
+        arguments_end () const
         {
-          return *specialized_;
+          return arguments_.end ();
         }
 
         static Introspection::TypeInfo const&
@@ -619,34 +637,35 @@ namespace CCF
       protected:
         friend class Graph<Node, Edge>;
 
-        TypeTemplateSpecialization ()
+        Specialization ()
         {
           type_info (static_type_info ());
         }
 
         void
-        add_edge_left (Specialized& e)
-        {
-          specialized_ = &e;
-        }
+        add_edge_right (ArgumentsWithType& e);
+
+        void
+        add_edge_right (ArgumentsWithValue& e);
 
       private:
-        Specialized* specialized_;
+        Arguments_ arguments_;
       };
 
-      class Specialized : public virtual Edge
+
+      class Arguments: public virtual Edge
       {
       public:
-        TypeTemplateSpecialization&
+        Specialization&
         specialization () const
         {
           return *specialization_;
         }
 
-        Type&
-        type () const
+        Node&
+        argument () const
         {
-          return *type_;
+          return *argument_;
         }
 
         static Introspection::TypeInfo const&
@@ -655,28 +674,77 @@ namespace CCF
       protected:
         friend class Graph<Node, Edge>;
 
-        Specialized ()
+        Arguments ()
         {
           type_info (static_type_info ());
         }
 
         void
-        set_left_node (TypeTemplateSpecialization& n)
+        set_left_node (Node& n)
         {
-          specialization_ = &n;
+          argument_ = &n;
         }
 
         void
-        set_right_node (Type& n)
+        set_right_node (Specialization& n)
         {
-          type_ = &n;
+          specialization_ = &n;
         }
 
       private:
-        TypeTemplateSpecialization* specialization_;
-        Type* type_;
+        Specialization* specialization_;
+        Node* argument_;
+      };
+
+      class ArgumentsWithType: public virtual Arguments
+      {
+      public:
+        Type&
+        type () const
+        {
+          return dynamic_cast<Type&> (argument ());
+        }
+
+        static Introspection::TypeInfo const&
+        static_type_info ();
+
+      protected:
+        friend class Graph<Node, Edge>;
+
+        ArgumentsWithType ()
+        {
+          type_info (static_type_info ());
+        }
+
+        void
+        set_left_node (Type& n)
+        {
+          Arguments::set_left_node (n);
+        }
       };
 
+      class Expression;
+
+      class ArgumentsWithValue: public virtual Arguments
+      {
+      public:
+        Expression&
+        value () const;
+
+        static Introspection::TypeInfo const&
+        static_type_info ();
+
+      protected:
+        friend class Graph<Node, Edge>;
+
+        ArgumentsWithValue ()
+        {
+          type_info (static_type_info ());
+        }
+
+        void
+        set_left_node (Expression& n);
+      };
 
       //
       //
@@ -816,6 +884,11 @@ namespace CCF
         add_edge_left (Initializes&)
         {
         }
+
+        void
+        add_edge_left (ArgumentsWithValue&)
+        {
+        }
       };
 
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
index 8399fecc6b0..6e3d2ee723d 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
@@ -5,7 +5,7 @@
 #ifndef CCF_IDL2_SEMANTIC_GRAPH_ENUM_HPP
 #define CCF_IDL2_SEMANTIC_GRAPH_ENUM_HPP
 
-#include "CCF/IDL2/SemanticGraph/Elements.hpp"
+#include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
 
 namespace CCF
 {
@@ -35,7 +35,7 @@ namespace CCF
       };
 
 
-      class Enumerator : public virtual Nameable, public virtual Instance
+      class Enumerator : public virtual Nameable, public virtual IntConst
       {
       public:
         static Introspection::TypeInfo const&
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
index 84ca130cafa..9ed3a7e494b 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
index b57bb0fe764..597be660772 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
index 46e24ae9c76..b2c29fe2881 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
index 697751f14cd..83ed23ffe40 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       // Receives
       //
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp
index a9d135b2d33..578c87361d4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp
@@ -1,8 +1,8 @@
-// file      : CCF/IDL2/SemanticGraph/Sequence.cpp
+// file      : CCF/IDL2/SemanticGraph/String.cpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-#include "CCF/IDL2/SemanticGraph/Sequence.hpp"
+#include "CCF/IDL2/SemanticGraph/String.hpp"
 
 namespace CCF
 {
@@ -12,47 +12,47 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
-      // Sequence
+
+      // BoundedString
       //
       //
       namespace
       {
         TypeInfo
-        sequence_init_ ()
+        bounded_string_init_ ()
         {
-          TypeInfo ti (typeid (Sequence));
-          ti.add_base (Access::PUBLIC,
-                       true,
-                       TypeTemplateSpecialization::static_type_info ());
+          TypeInfo ti (typeid (BoundedString));
+          ti.add_base (
+            Access::PUBLIC, true, Specialization::static_type_info ());
           return ti;
         }
 
-        TypeInfo sequence_ (sequence_init_ ());
+        TypeInfo bounded_string_ (bounded_string_init_ ());
       }
 
-      TypeInfo const& Sequence::
-      static_type_info () { return sequence_; }
+      TypeInfo const& BoundedString::
+      static_type_info () { return bounded_string_; }
 
 
-      // UnboundedSequence
+      // BoundedWideString
       //
       //
       namespace
       {
         TypeInfo
-        unbounded_sequence_init_ ()
+        bounded_wide_string_init_ ()
         {
-          TypeInfo ti (typeid (UnboundedSequence));
-          ti.add_base (Access::PUBLIC, true, Sequence::static_type_info ());
+          TypeInfo ti (typeid (BoundedWideString));
+          ti.add_base (
+            Access::PUBLIC, true, Specialization::static_type_info ());
           return ti;
         }
 
-        TypeInfo unbounded_sequence_ (unbounded_sequence_init_ ());
+        TypeInfo bounded_wide_string_ (bounded_wide_string_init_ ());
       }
 
-      TypeInfo const& UnboundedSequence::
-      static_type_info () { return unbounded_sequence_; }
+      TypeInfo const& BoundedWideString::
+      static_type_info () { return bounded_wide_string_; }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
index aa4b563b356..f32c3d3b1b6 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
@@ -5,8 +5,8 @@
 #ifndef CCF_IDL2_SEMANTIC_GRAPH_SEQUENCE_HPP
 #define CCF_IDL2_SEMANTIC_GRAPH_SEQUENCE_HPP
 
-
 #include "CCF/IDL2/SemanticGraph/Elements.hpp"
+#include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
 
 namespace CCF
 {
@@ -17,13 +17,20 @@ namespace CCF
       //
       //
       //
-      class Sequence : public virtual TypeTemplateSpecialization
+      class Sequence : public virtual Specialization
       {
       public:
+        Type&
+        type () const
+        {
+          return
+            dynamic_cast<ArgumentsWithType&> (**arguments_begin ()).type ();
+        }
+
         virtual bool
         complete () const
         {
-          return specialized ().type ().complete ();
+          return type ().complete ();
         }
 
         static Introspection::TypeInfo const&
@@ -36,8 +43,6 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
-
-        using TypeTemplateSpecialization::add_edge_right;
       };
 
 
@@ -58,6 +63,37 @@ namespace CCF
           type_info (static_type_info ());
         }
       };
+
+
+      //
+      //
+      //
+      class BoundedSequence : public virtual Sequence
+      {
+      public:
+        IntExpression&
+        bound () const
+        {
+          ArgumentsIterator i (arguments_begin ());
+
+          ++i; // Bound is always second to the type.
+
+          return
+            dynamic_cast<IntExpression&> (
+              dynamic_cast<ArgumentsWithValue&> (**i).value ());
+        }
+
+        static Introspection::TypeInfo const&
+        static_type_info ();
+
+      protected:
+        friend class Graph<Node, Edge>;
+
+        BoundedSequence ()
+        {
+          type_info (static_type_info ());
+        }
+      };
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
index fd933464b03..46fd9b9ef3a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "CCF/IDL2/SemanticGraph/Struct.hpp"
+#include "CCF/IDL2/SemanticGraph/Member.hpp"
 
 namespace CCF
 {
@@ -30,6 +31,37 @@ namespace CCF
       TypeInfo const& Struct::
       static_type_info () { return struct_; }
 
+      bool Struct::
+      complete () const
+      {
+        if (defined ())
+        {
+          CompilerElements::Context& ctx (
+            const_cast<CompilerElements::Context&> (context ()));
+
+          if (ctx.count ("struct-complete-test"))
+            return true;
+
+          ctx.set ("struct-complete-test", true);
+          bool c (true);
+
+          for (Scope::NamesIterator i (names_begin ());
+               c && i != names_end ();
+               ++i)
+          {
+            Member const& m (dynamic_cast<Member&> ((*i)->named ()));
+            Type const& t (m.belongs ().type ());
+
+            if (!t.complete ())
+              c = false;
+          }
+
+          ctx.remove ("struct-complete-test");
+          return c;
+        }
+
+        return false;
+      }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp
index fd6762e83b3..67419a4cd00 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp
@@ -17,10 +17,7 @@ namespace CCF
       {
       public:
         virtual bool
-        complete () const
-        {
-          return defined ();
-        }
+        complete () const;
 
         static Introspection::TypeInfo const&
         static_type_info ();
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
index 25b692648b9..28c673a94f3 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
@@ -124,9 +124,8 @@ namespace CCF
         {
           TypeInfo ti (typeid (Union));
 
-          ti.add_base (Access::PUBLIC,
-                       true,
-                       TypeTemplateSpecialization::static_type_info ());
+          ti.add_base (
+            Access::PUBLIC, true, Specialization::static_type_info ());
 
           ti.add_base (Access::PUBLIC, true, Scope::static_type_info ());
           return ti;
@@ -137,6 +136,38 @@ namespace CCF
 
       TypeInfo const& Union::
       static_type_info () { return union_; }
+
+      bool Union::
+      complete () const
+      {
+        if (defined ())
+        {
+          CompilerElements::Context& ctx (
+            const_cast<CompilerElements::Context&> (context ()));
+
+          if (ctx.count ("union-complete-test"))
+            return true;
+
+          ctx.set ("union-complete-test", true);
+          bool c (true);
+
+          for (Scope::NamesIterator i (names_begin ());
+               c && i != names_end ();
+               ++i)
+          {
+            Member const& m (dynamic_cast<Member&> ((*i)->named ()));
+            Type const& t (m.belongs ().type ());
+
+            if (!t.complete ())
+              c = false;
+          }
+
+          ctx.remove ("union-complete-test");
+          return c;
+        }
+
+        return false;
+      }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
index 46b75a6be65..9cb70897a20 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
@@ -121,15 +121,12 @@ namespace CCF
         }
       };
 
-      class Union : public virtual TypeTemplateSpecialization,
+      class Union : public virtual Specialization,
                     public virtual Scope
       {
       public:
         virtual bool
-        complete () const
-        {
-          return defined ();
-        }
+        complete () const;
 
         static Introspection::TypeInfo const&
         static_type_info ();
@@ -142,9 +139,10 @@ namespace CCF
           type_info (static_type_info ());
         }
 
-        using TypeTemplateSpecialization::add_edge_left;
-        using TypeTemplateSpecialization::add_edge_right;
+        using Specialization::add_edge_left;
+        using Specialization::add_edge_right;
         using Scope::add_edge_left;
+        using Scope::add_edge_right;
       };
     }
   }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
index 506224ad255..2c56e2b3f2b 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
@@ -7,10 +7,12 @@
 
 #include "CCF/IDL2/Traversal/Elements.hpp"
 
+#include "CCF/IDL2/Traversal/Array.hpp"
 #include "CCF/IDL2/Traversal/Attribute.hpp"
 #include "CCF/IDL2/Traversal/Enum.hpp"
 #include "CCF/IDL2/Traversal/Exception.hpp"
 #include "CCF/IDL2/Traversal/Fundamental.hpp"
+#include "CCF/IDL2/Traversal/IntExpression.hpp"
 #include "CCF/IDL2/Traversal/Interface.hpp"
 #include "CCF/IDL2/Traversal/Member.hpp"
 #include "CCF/IDL2/Traversal/Module.hpp"
@@ -18,6 +20,7 @@
 #include "CCF/IDL2/Traversal/Operation.hpp"
 #include "CCF/IDL2/Traversal/Struct.hpp"
 #include "CCF/IDL2/Traversal/Sequence.hpp"
+#include "CCF/IDL2/Traversal/String.hpp"
 #include "CCF/IDL2/Traversal/Struct.hpp"
 #include "CCF/IDL2/Traversal/Translation.hpp"
 #include "CCF/IDL2/Traversal/TypeId.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
index 1318ef3c5ef..03793aafeef 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
@@ -356,15 +356,32 @@ namespace CCF
       };
 
 
-      struct Specialized : Edge<SemanticGraph::Specialized>
+      struct Arguments : Edge<SemanticGraph::Arguments>
       {
         virtual void
-        traverse (Type& e)
+        traverse (Type& a)
         {
-          node_traverser ().traverse (e.type ());
+          node_traverser ().traverse (a.argument ());
+        }
+      };
+
+      struct ArgumentsWithType : Edge<SemanticGraph::ArgumentsWithType>
+      {
+        virtual void
+        traverse (Type& a)
+        {
+          node_traverser ().traverse (a.type ());
         }
       };
 
+      struct ArgumentsWithValue : Edge<SemanticGraph::ArgumentsWithValue>
+      {
+        virtual void
+        traverse (Type& a)
+        {
+          node_traverser ().traverse (a.value ());
+        }
+      };
 
       struct Inherits : Edge<SemanticGraph::Inherits>
       {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
index bc06e04a8fe..c781cdcfb97 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
@@ -11,11 +11,14 @@ namespace CCF
     namespace Traversal
     {
 
+      // UnboundedSequence
+      //
+
       void UnboundedSequence::
       traverse (Type& us)
       {
         pre (us);
-        specialized (us);
+        arguments_with_type (us);
         name (us);
         post (us);
       }
@@ -26,15 +29,15 @@ namespace CCF
       }
 
       void UnboundedSequence::
-      specialized (Type& us, EdgeDispatcherBase& d)
+      arguments_with_type (Type& us, EdgeDispatcherBase& d)
       {
-        d.traverse (us.specialized ());
+        d.traverse (**us.arguments_begin ());
       }
 
       void UnboundedSequence::
-      specialized (Type& us)
+      arguments_with_type (Type& us)
       {
-        specialized (us, edge_traverser ());
+        arguments_with_type (us, edge_traverser ());
       }
 
       void UnboundedSequence::
@@ -46,6 +49,63 @@ namespace CCF
       post (Type&)
       {
       }
+
+
+      // BoundedSequence
+      //
+
+      void BoundedSequence::
+      traverse (Type& bs)
+      {
+        pre (bs);
+        arguments_with_type (bs);
+        arguments_with_value (bs);
+        name (bs);
+        post (bs);
+      }
+
+      void BoundedSequence::
+      pre (Type&)
+      {
+      }
+
+      void BoundedSequence::
+      arguments_with_type (Type& bs, EdgeDispatcherBase& d)
+      {
+        d.traverse (**bs.arguments_begin ());
+      }
+
+      void BoundedSequence::
+      arguments_with_type (Type& bs)
+      {
+        arguments_with_type (bs, edge_traverser ());
+      }
+
+      void BoundedSequence::
+      arguments_with_value (Type& bs, EdgeDispatcherBase& d)
+      {
+        Type::ArgumentsIterator i (bs.arguments_begin ());
+
+        ++i; // Bound is always second to the type.
+
+        d.traverse (**i);
+      }
+
+      void BoundedSequence::
+      arguments_with_value (Type& bs)
+      {
+        arguments_with_value (bs, edge_traverser ());
+      }
+
+      void BoundedSequence::
+      name (Type&)
+      {
+      }
+
+      void BoundedSequence::
+      post (Type&)
+      {
+      }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp
index 14a44aa68f0..8011ff85c38 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp
@@ -24,10 +24,37 @@ namespace CCF
         pre (Type&);
 
         virtual void
-        specialized (Type&, EdgeDispatcherBase&);
+        arguments_with_type (Type&, EdgeDispatcherBase&);
 
         virtual void
-        specialized (Type&);
+        arguments_with_type (Type&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        post (Type&);
+      };
+
+      struct BoundedSequence : Node<SemanticGraph::BoundedSequence>
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        arguments_with_type (Type&, EdgeDispatcherBase&);
+
+        virtual void
+        arguments_with_type (Type&);
+
+        virtual void
+        arguments_with_value (Type&, EdgeDispatcherBase&);
+
+        virtual void
+        arguments_with_value (Type&);
 
         virtual void
         name (Type&);
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
index d440907ed4c..b14f518983e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
@@ -49,7 +49,7 @@ namespace CCF
       {
       }
 
-      
+
       // Union
       //
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
index 0237be5016d..2bcad1eb4ea 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
@@ -38,7 +38,7 @@ namespace CCF
         post (Type&);
       };
 
-      
+
       //
       //
       //
@@ -52,7 +52,7 @@ namespace CCF
 
         virtual void
         name (Type&);
-        
+
         virtual void
         post (Type&);
       };
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
index d992a2016ad..3f565eac47c 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
@@ -204,7 +204,11 @@ namespace CCF
 
             //@@ this code is highly experimental
             CompilerElements::InputStreamAdapter isa (ifs);
-            CompilerElements::CPP::Preprocessor pp (isa);
+
+            CompilerElements::CPP::Symbols const& symbols (
+              context_.get<CompilerElements::CPP::Symbols> ("cpp-symbols"));
+            CompilerElements::CPP::Preprocessor pp (isa, symbols);
+
             IDL3::LexicalAnalyzer lexer (pp);
 
             TokenList token_stream;
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
index 4d3b325f5fd..ab49a698842 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html
index b4b0998694d..94415303afe 100644
--- a/TAO/CIAO/CCF/Documentation/Build.html
+++ b/TAO/CIAO/CCF/Documentation/Build.html
@@ -12,7 +12,7 @@ cvs-id    : $Id$
 
 <head>
 
-  <title>Building CCF Libraries</title>
+  <title>Building CORBA Compiler Framework (CCF) Libraries</title>
 
   <meta name="author" content="Boris Kolpackov"/>
   <meta name="keywords" content="build,compile,make,CCF,CORBA,compiler,framework,library"/>
@@ -22,7 +22,6 @@ cvs-id    : $Id$
   <style type="text/css">
   body {
     font-family      : sans-serif;
-
     color            : black;
     background       : white;
 
@@ -36,9 +35,10 @@ cvs-id    : $Id$
     font-weight      : 500;
   }
 
-  h1 { font-size     : 170%; }
-  h2 { font-size     : 125%; }
-
+  h1 { font-size         : 170%; }
+  h2 { font-size         : 125%;
+       text-decoration : underline
+  }
   ul.toc li {
     padding          : .4em 0em 0em 0em;
   }
@@ -53,37 +53,42 @@ cvs-id    : $Id$
 </head>
 
 <body>
-
+<h1>Building CORBA Compiler Framework (CCF) Libraries</h1>
+<h2>Table of Contents</h2>
+<ol>
+<li><a href="#prereqs">Prerequisite Libraries</a></li>
 <ul class="toc">
 <li><a href="#debian">Debian GNU/Linux [i386.deb]</a></li>
 
 <li><a href="#redhat">RedHat OS family [i386.rpm]</a></li>
 
-<li><a href="#linux">Other GNU/Linux or UNIX Distributions</a>
+<li><a href="#other_platforms">Other GNU/Linux or UNIX Distributions &amp; Windows</a>
 <ul>
-<li><a href="#linux_cxx">C++</a></li>
-<li><a href="#linux_boost">Boost Libraries</a></li>
-<li><a href="#linux_utility">Utility Library</a></li>
-<li><a href="#linux_build">Building CCF</a></li>
+<li><a href="#cxx">C++</a></li>
+<li><a href="#boost">Boost Libraries</a></li>
+<li><a href="#utility">Utility Library</a></li>
 </ul></li>
 
-<li><a href="#windows">Windows</a>
+<!--li><a href="#windows">Windows</a>
 <ul>
 <li><a href="#windows_cxx">C++</a></li>
 <li><a href="#windows_boost">Boost Libraries</a></li>
 <li><a href="#windows_utility">Utility Library</a></li>
-<li><a href="#windows_build">Building CCF</a></li>
-</ul></li>
+</ul></li -->
 </ul>
 
+<li><a href="#initial_setup">Configuring the Build Environment</a></li>
+<li><a href="#building_ccf">Building CORBA Compiler Framework (CCF)</a></li>
+</ol>
 
-<!-- Debian -->
+<hr />
+<h1><a name="prereqs">Prerequisite Libraries</a></h1>
 
+<!-- Debian -->
 
-<h1><a name="debian">Debian GNU/Linux [i386.deb]</a></h1>
+<h2><a name="debian">Debian GNU/Linux [i386.deb]</a></h2>
 
-<p>You will need to install the following packages from the
-Debian package repository:
+<p>You will need to install the following packages from the Debian package repository:
 
 <ol>
 <li><code>libboost-dev-1.30.2-2</code> or better</li>
@@ -107,16 +112,9 @@ $ dpkg -i libutility*.deb
 </pre>
 </p>
 
-<p>Now you are ready to build CCF libraries:</p>
-<pre>$ cd $CIAO_ROOT/CCF/CCF
-$ make
-</pre>
-
-
 <!-- RedHat -->
 
-
-<h1><a name="redhat">RedHat OS family [i386.rpm]</a></h1>
+<h2><a name="redhat">RedHat OS family [i386.rpm]</a></h2>
 
 <p>You will need to install the following RedHat packages:</p>
 
@@ -138,16 +136,9 @@ $ rpm -Uhv Utility-1.2.2-3.i386.rpm
 </pre>
 </p>
 
-<p>Now you are ready to build CCF libraries:</p>
-<pre>$ cd $CIAO_ROOT/CCF/CCF
-$ make
-</pre>
-
-
 <!-- Linux -->
 
-
-<h1><a name="linux">Other GNU/Linux or UNIX Distributions</a></h1>
+<h2><a name="other_platforms">Other GNU/Linux or UNIX Distributions &amp; Windows</a></h2>
 
 <!--
 
@@ -176,11 +167,16 @@ you will need to upgrade.</p>
 
 -->
 
-<h2><a name="linux_cxx">C++</a></h2>
-<p>You can use any standard-conformant C++ compiler.
-<a href="http://gcc.gnu.org">GNU G++</a> 3.3 is known to work.</p>
+<h3><a name="cxx">C++</a></h3>
+<p>On the Lunix/UNIX platforms, you can use any standard-conformant C++ compiler.
+We recommend you use the lastest stable release of the <a href="http://gcc.gnu.org">GNU C++</a>
+
+compiler.</p>
 
-<h2><a name="linux_boost">Boost Libraries</a></h2>
+<p>On the Windows platform, VC++ 7.1 or better is required to build CCF. We do not
+support VC++ 6 or VC++ 7.0.</p>
+
+<h3><a name="boost">Boost Libraries</a></h3>
 <p>In order to build CCF you will need the following libraries from the
 <a href="http://www.boost.org">Boost distribution</a>:</p>
 
@@ -198,82 +194,37 @@ section.</p>
 
 </p>If you choose to compile Boost Libraries yourself please refer to the
 <a href="http://www.boost.org/more/getting_started.html">Boost Building
-Instructions</a>.<p>
+Instructions</a>. Please remember the install locations of the boost libraries
+because they will be needed to properly configure your environment for building
+CCF.<p>
 
-<p>After you have successfully compiled necessary libraries in the boost
+<!--p>After you have successfully compiled necessary libraries in the boost
 distribution you need to do one more thing. Inside the boost distribution
 directory (e.g. <code>boost-1.30.2</code>) create a directory with the name
 <code>lib</code> and copy (or soft link) <code>libboost_filesystem.a</code>
-and <code>libboost_regex.a</code> into it.</p>
-
+and <code>libboost_regex.a</code> into it.</p-->
 
-<h2><a name="linux_utility">Utility Library</a></h2>
+<h3><a name="utility">Utility Library</a></h3>
 
 <p>Another prerequisite for CCF is the Utility Library. You don't need
 to build anything in this library. The Utility library is available in
-the following two different forms for convinience:
+the following two different forms for convinience:</p>
 
 <ol>
-<li><a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2"> A bz2 package </a> for unix based platforms including Unix.</li>
-<li><ahref="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.zip"> A zip package</a> for Win32 based platforms. </li>
+<li>A <a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2">bz2 package</a> for unix based platforms including Unix.</li>
+<li>A <a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.zip">zip package</a> for Win32 based platforms. </li>
 </ol>
 
-Just unpack it to some convenient place. </p>
-
-<h2><a name="linux_build">Building CCF</a></h2>
-
-<p>Before you can start building CCF you need to specify the location
-of Boost Libraries and Utility Library. There are two ways you can do
-this. The first way is to specify environment variables <code>BOOST_ROOT,
-</code> <code>BOOST_INCLUDE,</code> <code>BOOST_LIB</code> and
-<code>UTILITY_ROOT</code>. If <code>BOOST_INCLUDE</code> and
-<code>BOOST_LIB</code> are not initialized then their values are derived
-from <code>BOOST_ROOT</code> as follows:<p>
-
-<pre>
-BOOST_LIB     := $(BOOST_ROOT)/lib
-BOOST_INCLUDE := $(BOOST_ROOT)
-</pre>
-
-<p>Below are some examples of how you may do that.</p>
-
-<p>If you would like to use Boost/Utility from the build directory:</p>
-
-<pre>$ export BOOST_ROOT=~/build/boost-1.30.2
-$ export UTILITY_ROOT=~/build/Utility-1.2.2
-</pre>
-
-<p>If Boost was installed in <code>/usr/local</code> and compiler doesn't
-search there by default:</p>
-
-<pre>$ export BOOST_LIB=/usr/local/lib
-$ export BOOST_INCLUDE=/usr/local/include
-$ export UTILITY_ROOT=~/build/Utility-1.2.2
-</pre>
-
-<p>If Boost was installed in let's say <code>/usr/{include,lib}</code> and
-compiler searches there by default you may leave <code>BOOST_*</code>
-uninitialized.</p>
-
-<p>Alternatively, you can specify values for <code>BOOST_*</code> and
-<code>UTILITY_*</code> in <code>$CIAO_ROOT/CCF/Config.rules</code></p>
-
-<p>Finally, you can start the build process:</p>
-
-<pre>$ cd CCF/CCF
-$ make</pre>
-
+<p>Just unpack it to some convenient place and remember its location because it will be need
+to properly configure the build environment for CCF.</p>
 
 <!-- Windows -->
 
+<!--h2><a name="windows">Windows</a></h2>
 
-<h1><a name="windows">Windows</a></h1>
-
-<h2><a name="windows_cxx">C++</a></h2>
-<p>VC++ 7.1 is required to build CCF on Windows. Note that neither
-VC++ 6 nor VC++ 7.0 is supported. </p>
+<h3><a name="windows_cxx">C++</a></h3>
 
-<h2><a name="windows_boost">Boost Libraries</a></h2>
+<h3><a name="windows_boost">Boost Libraries</a></h3>
 <p>In order to build CCF you will need the following libraries from
 the <a href="http://www.boost.org">Boost distribution</a>:
 
@@ -292,9 +243,9 @@ an example, I assume that the installation directory is <code>D:\lib</code>.
 <li>Download boost source distribution version <code>1.30.2</code> (<code>boost-1.30.2.zip</code>)
 from the <a href="http://sourceforge.net/project/showfiles.php?group_id=7586">Boost web site</a>.
 After downloading unzip the file in <code>D:\lib</code> so that you get
-<code>D:\lib\boost-1.30.2</code>. Note that boost version <code>1.31.0</code> 
-will not work.</li>
+<code>D:\lib\boost-1.30.2</code>. Note that boost version <code>1.31.0</code>
 
+will not work.</li>
 
 <li>Download the latest pre-built
 <a href="http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941">
@@ -333,8 +284,7 @@ search list.</li>
 <a href="http://www.boost.org/more/getting_started.html">Boost Building
 Instructions</a> if you have any questions.<p>
 
-
-<h2><a name="windows_utility">Utility Library</a></h2>
+<h3><a name="windows_utility">Utility Library</a></h3>
 
 <p>Another prerequisite for CCF is
 <a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2">Utility
@@ -342,12 +292,111 @@ Library</a>. You don't need to build anything in this library. Just unpack
 it to some convenient place and add it to your VC7.1 include directory search
 list. For example if you unpacked <code>Utility-1.2.2.tar.bz2</code> in
 <code>D:\lib</code> then add <code>D:\lib\Utility-1.2.2</code> to your
-search list.</p>
+search list.</p -->
+
+<hr />
+
+<!-- Configuring the Build Environment -->
+
+<h1><a name="initial_setup">Configuring the Build Environment</a></h1>
+
+<p>Before you can start building CCF you need to specify the location
+of Boost Libraries and Utility Library. There are two ways you can do
+this. The first way is to specify the environment variables
+
+<code>BOOST_ROOT, BOOST_INCLUDE, BOOST_LIB, BOOST_VERSION, BOOST_CFG</code>
+and <code>UTILITY_ROOT</code>.
+
+<p>To configure <code>BOOST_ROOT</code> and <code>UTILITY_ROOT</code>,
+
+set both enviroment variables to the root directory for the respective
+libraries as follows:</p>
+<ul>
+<li>On Linux/UNIX
+<pre>
+%> export BOOST_ROOT=&lt;path_to_boost&gt;
+%> export UTILITY_ROOT=&lt;path_to_utility&gt;
+</pre>
+</li>
+<li>On Windows
+<pre>
+%> set BOOST_ROOT=&lt;path_to_boost&gt;
+%> set UTILITY_ROOT=&lt;path_to_utility&gt;
+</pre>
+</li>
+</ul>
+
+<p>If <code>BOOST_INCLUDE</code> and <code>BOOST_LIB</code> are not initialized,
+
+then their values are derived from <code>BOOST_ROOT</code> as follows:<p>
+
+<pre>
+BOOST_LIB     := $(BOOST_ROOT)/lib
+BOOST_INCLUDE := $(BOOST_ROOT)
+</pre>
+
+<p><code>BOOST_VERSION</code> and <code>BOOST_CFG</code> are two environment variables that
+depend on the version and configuration of Boost that you are using. <code>BOOST_VERSION</code>
+is initialized as follows:</p>
+<ol>
+<li>Look in <code>$BOOST_ROOT/include/boost</code> directory</li>
+<li>If there is another boost directory, e.g. <code>boost-1_32</code> for building boost-1.32, then this is your version
+  <ul>
+    <li>On Linux/UNIX:
+
+      <pre><code>%> export BOOST_VERSION=boost-1_32</code></pre></li>
+    <li>On Windows:
+
+      <pre><code>%> set BOOST_VERSION=boost-1_32</code></pre></li>
+  </ul>
+</li>
+</ol>
+<p>
+<code>BOOST_CFG</code> depends on which configuration of the boost libraries you want use for CCF. If
+you look in <code>$BOOST_ROOT/lib</code>, you will notice all the Boost libraries. Each library has
+the compiler and threading support, e.g. <code>-vc71-mt</code> for VC++ 7.1 and multi-threaded, as part
+
+of the filename. If this is not the case for your libraries, then you can
+
+<a href="#building_ccf">skip</a> this section and continue at
+
+<a href="#building_ccf">Building CORBA Compiler Framework (CCF)</a>. This part of
+
+the filename is known as the <code>BOOST_CFG</code> and needs to be specified. For example, if you are
+
+using VC++ 7.1 and want to use the multi-threaded version of the libraries for CCF, your would do the
+following:
+<blockquote><code>%> set BOOST_CFG=-vc71-mt</code></blockquote>
+This can be done similarly on the Linux/UNIX platforms depending on your compiler version and the
+
+Boost configuration you want to use.</p>
+
+<p>Alternatively, you can specify all values for <code>BOOST_*</code> and
+<code>UTILITY_*</code> in <code>$CIAO_ROOT/CCF/Config.rules</code></p>
+
+<!-- Building CORBA Compiler Framework (CCF) -->
+
+<hr />
+<h1><a name="building_ccf">Building CORBA Compiler Framework (CCF)</a></h1>
+
+Now that you have built and installed the required libraries, you are now ready
+to build the CCF libraries. If there are any makefiles or project solutions
+in the CCF directory we recommend that you disgard those and regenerate
+all the projects files using MPC. To build all project files and CCF, please use the
+following steps:
+<ol>
+<li><code>%> cd $CIAO_ROOT/CCF/CCF</code></li>
+<li><code>%> $ACE_ROOT/bin/mwc.pl -type &lt;project-type&gt; -static -features cidl=1, exceptions=1, boost=1</code></li>
+</ol>
+On Linux/UNIX, if you are building with a make utility, e.g., gmake, use the following command
+to build CCF:
 
+<pre>%> gmake cidl=1 exceptions=1 boost=1</pre>
+<p>If you are building on Windows, just open the generated solution file.</p>
 
-<h2><a name="windows_build">Building CCF</a></h2>
+<p><b>Note:</b> If you are building CCF on a Windows platform, use <code>%ACE_ROOT%\bin\mwc.pl</code> instead
 
-<p>Now you are ready to build CCF libraries. Just open VC7.1 solution file
-in <code>CCF\CCF\</code> and proceed as usual.</p>
+<code>of $ACE_ROOT/bin/mwc.pl</code>. Also, for a list of project types and other command-line options
+supported by MPC, type <code>$ACE_ROOT/bin/mwc.pl --help</code>.</p>
 </body>
 </html>
diff --git a/TAO/CIAO/CCF/Documentation/DesignNotes b/TAO/CIAO/CCF/Documentation/DesignNotes
index b81778b5ba4..1cf74e88400 100644
--- a/TAO/CIAO/CCF/Documentation/DesignNotes
+++ b/TAO/CIAO/CCF/Documentation/DesignNotes
@@ -1,14 +1,14 @@
 
 Note: this file is somewhat outdated
 
-Intention of this file is to capture and document CIDL complier design 
+Intention of this file is to capture and document CIDL complier design
 ideas/decisions.
 
 Conceptual parts of CIDL compiler design
 ----------------------------------------
 
 Option Parser                       Consists of option parser and option
-                                    database. 
+                                    database.
 
 C Preprocessor Interfacing          Represents mechanism of preprocessing
                                     cidl files.
@@ -30,10 +30,10 @@ Semantic Analyzer                   Traverses Syntax Tree and performs
                                     semantic expansions.
 
 
-Code Generation Stream              Stream to output generated code to. Used 
+Code Generation Stream              Stream to output generated code to. Used
                                     by concrete Code Generators
 
-Code Generators 
+Code Generators
 {
 
   Executor Mapping Generator          Generator for local executor mapping.
@@ -48,7 +48,7 @@ Code Generators
 }
 
 Compiler driver                     Establishes order of execution of
-                                    different components as part of 
+                                    different components as part of
                                     compilation process.
 
 
@@ -63,8 +63,8 @@ How everything works together
     cidl file and generates Syntax Tree by means of semantic rules.
 
 (4) At this point we have Syntax Tree corresponding to the original cidl
-    file. Compiler Driver executes Executor Mapping Generator, 
-    Executor Implementation Generator and Skeleton Thunk Generator on 
+    file. Compiler Driver executes Executor Mapping Generator,
+    Executor Implementation Generator and Skeleton Thunk Generator on
     Syntax Tree.
 
 
@@ -72,7 +72,7 @@ How everything works together
 General Design Ideas/Decision
 -------------
 
-[IDEA]: There is an effort to use autoconf/automake in ACE/TAO. Maybe it's 
+[IDEA]: There is an effort to use autoconf/automake in ACE/TAO. Maybe it's
         a good idea to start using it with CIDLC? There is one side advantage
         of this approach: if we decide to embed GCC CPP then we will have to
         use configure (or otherwise ACE-ify the code which doesn't sound like
@@ -81,7 +81,7 @@ General Design Ideas/Decision
 [IDEA]: CIDLC is a prototype for a new IDLC, PSDLC and IfR model. Here are
         basic concepts:
 
-          - use common IDL grammar, semantic rules and syntax tree nodes 
+          - use common IDL grammar, semantic rules and syntax tree nodes
             for IDLC, CIDLC, PSDLC and IfR. Possibly have several libraries
             for example ast_idl-2.so, ast_idl-3.so, scaner_idl-2.so
             scaner_idl-3.so, parser_idl-2.so, parser_idl-3.so. Dependency
@@ -102,16 +102,16 @@ General Design Ideas/Decision
                        ---------parser_idl-3.so---------
 
             Same idea applies for CIDL and PSDL.
-                                             
 
-          - use the same internal representation (syntax tree) in all 
+
+          - use the same internal representation (syntax tree) in all
             compilers and IfR. This way at some stage if we will need
             to make one of the compilers IfR-integrated (import keyword?)
             then it will be a much easier task than it's now. This internal
-            representation may also be usable in typecodes 
+            representation may also be usable in typecodes
+
+            @@ boris: not clear to me.
 
-            @@ boris: not clear to me. 
-            
             @@ jeff: A typecode is like a piece of the Syntax Tree with these
                exceptions -
 
@@ -125,44 +125,44 @@ General Design Ideas/Decision
                different classes than used to compose the ST itself.
 
             @@ boris: Ok, let me see if I got it right. So when typecode
-               is kept in parsed state (as opposite to binary) (btw, when 
+               is kept in parsed state (as opposite to binary) (btw, when
                does it happen?) it makes sense to apply the same techniques
                (if in fact not the same ST nodes and traversal mechs) as
                for XIDL compilation.
 
 [IDEA]: We should be consistent with the way external compilers that we call
         report errors. For now those are CPP and IDLC.
-                       
+
 Option Parser
 -------------
 
 [IDEA]: Use Spirit parser framework to generate option parser.
 
-[IDEA]: Option Database is probably a singleton. 
+[IDEA]: Option Database is probably a singleton.
 
-        @@ jeff: This is a good idea, especially when passing some of the 
-           options to a preprocessor or spawned IDL compier. But I think we 
-           will still need 'state' classes for the front and back ends (to 
-           hold values set by command line options and default values) so 
+        @@ jeff: This is a good idea, especially when passing some of the
+           options to a preprocessor or spawned IDL compier. But I think we
+           will still need 'state' classes for the front and back ends (to
+           hold values set by command line options and default values) so
            we can keep them decoupled).
 
 
-        @@ boris: I understand what you mean. Though I think we will be 
+        @@ boris: I understand what you mean. Though I think we will be
            able to do with one 'runtime database'. Each 'compiler module'
            will be able to populate its 'namespace' with (1) default
-           values, (2) with module-specific options and (3) arbitrary 
+           values, (2) with module-specific options and (3) arbitrary
            runtime information. I will present prototopy design shortly.
-           
+
 
 [IDEA]: It seems we will have to execute at least two external programs
         as part of CIDLC execution: CPP and IDLC. Why wouldn't we follow
         GCC specs model (gcc -dumpspecs). Here are candidates to be put into
-        specs:        
+        specs:
 
           - default CPP name and options
           - default  IDLC name and options
           - default file extensions and formats for different mappings
-          - other ideas? 
+          - other ideas?
 
 [IDEA]: Provide short and long option names (e.g. -o and --output-dir)
         for every option (maybe except -I, -D, etc).
@@ -188,9 +188,9 @@ C Preprocessor Interfacing
 IDL Compiler Interfacing
 ------------------------
 
-[IDEA]: Same as for CPP: Can we use pipes? 
+[IDEA]: Same as for CPP: Can we use pipes?
 
-        @@ jeff: check with Nanbor on this. I think there may be CCM/CIAO 
+        @@ jeff: check with Nanbor on this. I think there may be CCM/CIAO
            use cases where we need the intermediate IDL file.
 
 [IDEA]: Will need a mechanism to pass options to IDLC from CIDLC command
@@ -207,7 +207,7 @@ Scanner
         iterator"-based scanner. So this basically mean that we may have to
         keep the whole sequence in memory. BTW, this is another good reason
         to have scanner: if we manage to make scanner a predictable parser
-        (i.e. no backtracking) then we don't have to keep the whole 
+        (i.e. no backtracking) then we don't have to keep the whole
         preprocessed cidl file in memory.
 
 
@@ -221,17 +221,17 @@ Parser
         much easier to reuse/inherit even dynamically. Need to elaborate
         this idea.
 
-[IDEA]: Use functors as semantic actions. This way we can specify (via 
+[IDEA]: Use functors as semantic actions. This way we can specify (via
         functor's data member) on which Syntax Tree they are working.
         Bad side: semantic rules are defined during grammar construction.
         However we can use a modification of the factory method pattern.
-        Better ideas? 
+        Better ideas?
 
         @@ jeff: I think ST node creation with a factory
            is a good idea - another ST implementation could be plugged in,
            as long as it uses a factory with the same method names.
 
-        @@ boris: Right. In fact it's our 'improved' way of handling 'BE' 
+        @@ boris: Right. In fact it's our 'improved' way of handling 'BE'
            usecases.
 
 
@@ -242,23 +242,23 @@ Syntax Tree
 [IDEA]: Use interface repository model as a base for Syntax Tree hierarchy.
 
 [IDEA]: Currently (in IDLC) symbol lookup is accomplished by AST navigation,
-        and is probably the biggest single bottleneck in performance. Perhaps 
-        a separate symbol table would be preferable. Also, lookups could be 
-        specialized, e.g., for declaration, for references, and perhaps a 
+        and is probably the biggest single bottleneck in performance. Perhaps
+        a separate symbol table would be preferable. Also, lookups could be
+        specialized, e.g., for declaration, for references, and perhaps a
         third type for argument-related lookups.
 
 [NOTE]: If we are to implement symbol tables then we need to think how we
         are going to inherit (extend) this tables.
 
 [NOTE]: Inheritance/supports graphs: these graphs need to be traversed at
-        several points in the back end. Currently they are rebuilt for each 
-        use, using an n-squared algorithm. We could at least build them only 
-        once for each interface/valuetype, perhaps even with a better 
-        algorithm. It could be integrated into inheritance/supports error 
-        checking at node creation time, which also be streamlined. 
-
-        @@ boris: Well, I think we should design our Syntax Tree so that 
-           every interface/valuetype has a list (flat?) of interfaces it 
+        several points in the back end. Currently they are rebuilt for each
+        use, using an n-squared algorithm. We could at least build them only
+        once for each interface/valuetype, perhaps even with a better
+        algorithm. It could be integrated into inheritance/supports error
+        checking at node creation time, which also be streamlined.
+
+        @@ boris: Well, I think we should design our Syntax Tree so that
+           every interface/valuetype has a list (flat?) of interfaces it
            inherits from/supports.
 
 [IDEA]: We will probably want to use factories to instantiate Syntax Tree
@@ -272,19 +272,19 @@ Common Syntax Tree traversal Design Ideas/Decision
 
 [IDEA] If we specify Syntax Tree traversal facility then we will be able
        to specify (or even plug dynamically) Syntax Tree traversal agents
-       that may not only generate something but also annotate or modify 
+       that may not only generate something but also annotate or modify
        Syntax Tree. We are already using this technique for a number of
        features (e.g. AMI, IDL3 extension, what else?) but all these agents
        are hardwired inside TAO IDLC. If we have this facility then we will
        be able to produce modular and highly extensible design. Notes:
 
        - Some traversal agents can change Syntax Tree so that it will be
-         unusable by some later traversal agents. So maybe the more 
-         generic approach would be to produce new Syntax Tree? 
+         unusable by some later traversal agents. So maybe the more
+         generic approach would be to produce new Syntax Tree?
 
-         @@ jeff: Yes, say for example that we were using a common ST 
-            representation for the IDL compiler and the IFR. We would not 
-            want to send the extra AMI nodes to the IFR so in that case 
+         @@ jeff: Yes, say for example that we were using a common ST
+            representation for the IDL compiler and the IFR. We would not
+            want to send the extra AMI nodes to the IFR so in that case
             simple modification of the ST might not be best.
 
 [IDEA] Need a generic name for "Syntax Tree Traversal Agents". What about
@@ -306,16 +306,16 @@ Code Generation Stream
 	will result in a generated code like this:
 
        namespace N
-       {      
-         ...         
+       {
+         ...
 
          long foo (long arg0,
                    long arg1)
          {
            return arg0 + arg1;
          }
-             
-         ...      
+
+         ...
        }
 
        Note that no special actions were taken to ensure proper indentation.
@@ -336,34 +336,34 @@ Code Generators
        @@ boris: I would say may not always be correct
 
 
-       However, for purposes of type coercion and other checking (such as 
-       for positive integer values in string, array and sequence bounds) 
+       However, for purposes of type coercion and other checking (such as
+       for positive integer values in string, array and sequence bounds)
        evaluation must be done internally.
-       
+
        @@ boris: note that evaluation is needed to only verify that things
-          are correct. You don't have to (shouldn't?) substitute original 
+          are correct. You don't have to (shouldn't?) substitute original
           (const) expression with what's been evaluated.
 
 
-       @@ jeff: it may be necessary in some cases to append 'f' or 'U' to 
+       @@ jeff: it may be necessary in some cases to append 'f' or 'U' to
           a generated number to avoid a C++ compiler warning.
 
        @@ boris: shouldn't this 'f' and 'U' be in IDL as well?
 
 [IDEA] I wonder if it's a good idea to use a separate pass over syntax tree
-       for semantic checking (e.g. type coercion, positive values for 
-       sequence bounds). 
+       for semantic checking (e.g. type coercion, positive values for
+       sequence bounds).
 
-       @@ jeff: This may hurt performance a little - more lookups - but it 
+       @@ jeff: This may hurt performance a little - more lookups - but it
           will improve error reporting.
-      
+
        @@ boris:  As we dicussed earlier this pass could be used to do
           'semantic expansions' (e.g. calculate a flat list of interface's
           children, etc). Also I don't think we should worry about speed
           very much here (of course I don't say we have to be stupid ;-)
           In fact if we are trading better design vs faster compilation
           at this stage we should always go for better design.
-      
+
 
 Executor Mapping Generator
 --------------------------
@@ -394,66 +394,66 @@ Vault
 Some thoughts from Jeff that I are not directly related to CIDLC and are
 rather current IDLC design defects:
 
-* AMI/AMH implied IDL: more can be done in the BE preprocessing pass, 
-  hopefully eliminating a big chunk of the huge volume of AMI/AMH visitor 
-  code. The implied IDL generated for CCM types, for example, leaves almost 
+* AMI/AMH implied IDL: more can be done in the BE preprocessing pass,
+  hopefully eliminating a big chunk of the huge volume of AMI/AMH visitor
+  code. The implied IDL generated for CCM types, for example, leaves almost
   nothing extra for the visitors to do.
 
-* Fwd decl redefinition: forward declaration nodes all initially contain a 
-  heap-allocated dummy full-definition member, later replaced by a copy 
+* Fwd decl redefinition: forward declaration nodes all initially contain a
+  heap-allocated dummy full-definition member, later replaced by a copy
   of the full definition. This needs to be streamlined.
 
-* Memory leaks: inconsistent copying/passing policies make it almost 
-  impossible to eliminate the huge number of leaks. The front end will be 
-  more and more reused, and it may be desirable to make it executable as a 
-  function call, in which case it will important to eliminate the leaks. 
-  Perhaps copying of AST nodes can be eliminated with reference counting or 
+* Memory leaks: inconsistent copying/passing policies make it almost
+  impossible to eliminate the huge number of leaks. The front end will be
+  more and more reused, and it may be desirable to make it executable as a
+  function call, in which case it will important to eliminate the leaks.
+  Perhaps copying of AST nodes can be eliminated with reference counting or
   just with careful management, similarly for string identifiers and literals.
-  Destroy() methods have been put in all the node classes, and are called 
-  recursively from the AST root at destruction time, but they are far from 
+  Destroy() methods have been put in all the node classes, and are called
+  recursively from the AST root at destruction time, but they are far from
   doing a complete job.
 
-* Visitor instantiation: the huge visitor factory has already been much 
-  reduced, and the huge enum of context state values is being reduced. 
-  However there will still be an abundance of switch statements at nearly 
-  every instance of visitor creation at scope nesting. We could make better 
+* Visitor instantiation: the huge visitor factory has already been much
+  reduced, and the huge enum of context state values is being reduced.
+  However there will still be an abundance of switch statements at nearly
+  every instance of visitor creation at scope nesting. We could make better
   use of polymorphism to get rid of them.
 
 * Node narrowing: instead of the impenetrable macros we use now, we
-  could either generate valuetype-like downcast methods for the (C)IDL 
+  could either generate valuetype-like downcast methods for the (C)IDL
   types, or we could just use dynamic_cast.
 
 * Error reporting: making error messages more informative, and error recovery
-  could both be a lot better, as they are in most other IDL compilers. If a 
-  recursive descent parser is used (such as Spirit), there is a simple 
+  could both be a lot better, as they are in most other IDL compilers. If a
+  recursive descent parser is used (such as Spirit), there is a simple
   generic algorithm for error recovery.
 
 
-* FE/BE node classes: if BE node classes are implemented at all, there should 
-  be a complete separation of concerns - BE node classes should contain only 
-  info related to code generation, and FE node classes should contain only 
-  info related to the AST representation. As the front end becomes more 
-  modular and reusable, this will become more and more necessary. 
+* FE/BE node classes: if BE node classes are implemented at all, there should
+  be a complete separation of concerns - BE node classes should contain only
+  info related to code generation, and FE node classes should contain only
+  info related to the AST representation. As the front end becomes more
+  modular and reusable, this will become more and more necessary.
 
   @@ boris: It doesn't seem we will need two separate and parallel hierarhies.
 
 * Undefined fwd decls: now that we have dropped support for platforms without
-  namespaces, the code generated for fwd declarations not defined in the same 
-  translation unit can be much improved, most likely by the elimination of 
+  namespaces, the code generated for fwd declarations not defined in the same
+  translation unit can be much improved, most likely by the elimination of
   generated flat-name global methods, and perhaps other improvements as well.
 
-* Strategized code generation: many places now have either lots of 
-  duplication, or an explosion of branching in a single visitor. Adding code 
-  generation for use cases incrementally may give us an opportunity to 
+* Strategized code generation: many places now have either lots of
+  duplication, or an explosion of branching in a single visitor. Adding code
+  generation for use cases incrementally may give us an opportunity to
   refactor and strategize it better.
 
-* Node generator: this class does nothing more than call 'new' and pass 
-  unchanged the arguments it gets to the appropriate constructor - it can be 
+* Node generator: this class does nothing more than call 'new' and pass
+  unchanged the arguments it gets to the appropriate constructor - it can be
   eliminated.
 
-* Virtual methods: there are many member functions in the IDL compiler that 
+* Virtual methods: there are many member functions in the IDL compiler that
   are needlessly virtual.
 
-* Misc. leveraging: redesign of mechanisms listed above can have an effect 
+* Misc. leveraging: redesign of mechanisms listed above can have an effect
   on other mechanisms, such as the handling of pragma prefix, typeprefix, and
   reopened modules.
diff --git a/TAO/CIAO/CCF/Documentation/TODO b/TAO/CIAO/CCF/Documentation/TODO
index 7a70b99f513..879602513df 100644
--- a/TAO/CIAO/CCF/Documentation/TODO
+++ b/TAO/CIAO/CCF/Documentation/TODO
@@ -10,7 +10,7 @@ Legend:
 
 ------------------------------------------------------------------------
 
-@@ In operation comma member function is used both for parameters and 
+@@ In operation comma member function is used both for parameters and
    exceptions. As a result one can get unexpected extra commas.
 
 @@ Make CCF buildable with MPC.
@@ -21,7 +21,7 @@ Legend:
 
 @@ Typedef.hpp TypeId.hpp: naming inconsistency.
 
-@@ Need ICE mechanism (search for abort ()) 
+@@ Need ICE mechanism (search for abort ())
 
 @@ Need evolution of semantic action error handling/reporting.
 
@@ -31,17 +31,17 @@ Legend:
 @@+++ Currently character stream is scanned completely before parsing. The
       better approach would be scanning on demand (1).
 
-@@+++ IDL2::Parsing::parse () should be eliminated (or terminated if you 
+@@+++ IDL2::Parsing::parse () should be eliminated (or terminated if you
       like ;-). This item depends on (1).
 
 @@++ 'using namespace' cleanup.
-   
+
 @@ Replace all i++ with ++i.
 
-@@ It seems that SyntaxTree::Node origin in terms of file:line should be 
-   preserved for subsequent diagnostic implemented as separate paths 
+@@ It seems that SyntaxTree::Node origin in terms of file:line should be
+   preserved for subsequent diagnostic implemented as separate paths
    (see repository id generator for example).
- 
+
 @@++++ Diagnostic evolution
 
 @%++ XML indentation buffer
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
index c87639ea62e..a933f2bd6bb 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
@@ -1498,7 +1498,7 @@ generate (CommandLine const& cl,
     string suffix (cl.get_value ("lem-file-suffix", "E.idl"));
 
     string expr (cl.get_value (
-                   "lem-file-regex", "/(\\.(idl|cidl))?$/" + suffix + "/"));
+                   "lem-file-regex", "/^(.+?)(\\.(idl|cidl))?$/$1" + suffix + "/"));
 
     string lem_file_name (regex::perl_s (file_name, expr));
 
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
index cba2229b654..3c50f4acdd2 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
@@ -4,17 +4,17 @@
 
 module Empty
 {
-  interface I 
+  interface I
   {
   };
 };
 
 module M
-{ 
+{
   interface I {};
-  
+
   typedef I Internal;
-  
+
   //local interface CCM_I : I {};
 };
 
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
index 2140367480c..0a437cb0320 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
@@ -9,13 +9,13 @@ module M1
 {
   interface Blah;
   interface Fool {};
-  
-  component C1 
+
+  component C1
   {
     provides M::I i;
     readonly attribute long l;
   };
-  
+
   home H1 manages C1
   {
     attribute M::I i;
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
index 8d6ccd7ad6b..51bf3d88a4b 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
@@ -27,7 +27,7 @@ module M2
   {
     provides Goof pg;
     uses Goof ug;
-    
+
     publishes E pe;
     emits E me;
     consumes E ce;
@@ -40,34 +40,34 @@ module M2
     long l;
     OctetSeq octet_seq;
   };
-  
+
   typedef sequence<S> S_Seq;
-  
-  exception Ex1 
+
+  exception Ex1
   {
     string descr;
   };
-  
+
   exception Ex2
   {
   };
-  
+
   home H2 : M1::H1 supports I, J manages C2
   {
     readonly attribute long rl;
     readonly attribute M::I rai;
     attribute OctetSeq seq;
     attribute S_Seq a_s_seq;
-    
-    void 
-    foo (in long l, 
-         inout boolean b, 
-	 out long ol, 
-	 in M::I i, 
-	 out unsigned long long ull, 
-	 inout S_Seq s_seq,
-	 in V v) raises (Ex1, Ex2);
-	 	 
+
+    void
+      foo (in long l,
+           inout boolean b,
+           out long ol,
+           in M::I i,
+           out unsigned long long ull,
+           inout S_Seq s_seq,
+           in V v) raises (Ex1, Ex2);
+
     factory new (in long l, in OctetSeq s) raises (Ex2, Ex1);
     finder find (in long l, in OctetSeq s) raises (Ex1, Ex2);
   };
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
index b65389ca306..f244249c69b 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
@@ -17,7 +17,7 @@ main ()
 
   cout << "<?xml version=\"1.0\"?>" << endl;
   cout << "<!DOCTYPE corbacomponent SYSYEM \"corbacomponent.dtd\">" << endl << endl;
-  
+
   cout << "<atag>whatever</atag>" << endl;
 
   cout << "<open>" << endl;
diff --git a/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl b/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
index 1d18e7118fe..737a729524b 100644
--- a/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
@@ -22,11 +22,11 @@ module InterfaceTest
   abstract interface AI;
   local interface LI;
   interface I;
-  
+
   abstract interface AI
   {
   };
-  
+
   interface I : AI
   {
   };
@@ -42,7 +42,7 @@ module InterfaceTest
 module MemberTest
 {
   typedef long Id;
-  
+
   struct S
   {
     Id id;
@@ -62,12 +62,12 @@ module ModuleTest
       typedef long L;
     };
   };
-  
+
   module M
   {
     typedef N::L L;
   };
-  
+
   module N
   {
     typedef M::N::L L;
@@ -95,7 +95,7 @@ module Sequence
   typedef sequence<octet> OctetSeq;
 
   typedef OctetSeq RawSeq;
-  
+
   typedef sequence<string> StringSeq, StrSeq;
 };
 
@@ -106,12 +106,12 @@ module Sequence
 module StructTest
 {
   struct S;
-  
+
   struct S
   {
     long m; // Struct cannot be empty.
   };
-  
+
 };
 
 // Typeid
@@ -120,7 +120,7 @@ module StructTest
 module TypeidTest
 {
   interface I;
-  
+
   typeid I "Foo";
   typeprefix TypeidTest "Bar";
 };
@@ -133,7 +133,7 @@ module TypeidTest
 module TypedefTest
 {
   interface I;
-  
+
   typedef I J;
 
   interface I
diff --git a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
index dc1aa225336..a29dde465d2 100644
--- a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
@@ -2,7 +2,7 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-// This file is supposed to cover an IDL2 lexical structure and intended 
+// This file is supposed to cover an IDL2 lexical structure and intended
 // for IDL2 lexer regression testing.
 //
 
diff --git a/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp b/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
index 5125e62d580..91e3ab3cb49 100644
--- a/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
+++ b/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
@@ -516,9 +516,9 @@ namespace IDL3
       concrete_event_type.edge_traverser (inherits);
 
       //--
-      
+
       supports.node_traverser (type_name);
-      
+
       component_defines.node_traverser (attribute);
       component_defines.node_traverser (provider);
       component_defines.node_traverser (user);
diff --git a/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl b/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
index e85e86a610d..a7e1cfb1d5a 100644
--- a/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
+++ b/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
@@ -21,7 +21,7 @@ module ComponentTest
   interface J
   {
   };
-  
+
   component A : B supports I, J
   {
   };
@@ -83,11 +83,11 @@ module HomeTest
   interface J
   {
   };
-  
+
   component A
   {
   };
-  
+
   home AH manages A
   {
   };
@@ -103,14 +103,14 @@ module HomeTest
 
 
 // HomeFactory
-// 
+//
 //
 module HomeFactoryTest
 {
   component A
   {
   };
-  
+
   home AH manages A
   {
     factory new (in long size);
@@ -126,7 +126,7 @@ module ProvidesTest
   interface I
   {
   };
-  
+
   component C
   {
     provides I i;
@@ -158,7 +158,7 @@ module UsesTest
   interface I
   {
   };
-  
+
   component C
   {
     uses I i;
diff --git a/TAO/CIAO/CIAO-INSTALL.html b/TAO/CIAO/CIAO-INSTALL.html
index 17b6fd46597..6e1b8a5a612 100644
--- a/TAO/CIAO/CIAO-INSTALL.html
+++ b/TAO/CIAO/CIAO-INSTALL.html
@@ -104,68 +104,56 @@
         1.90GHZ CPU, please be patient).
       </li>
     </ul>
-    <p>There are 2 ways to build the CIDL compiler on <strong>Windows</strong>:
+    <p><A href="../../MPC/README">MPC</A> is used to build the CIDL compiler on <strong>
+        Windows</strong>. The procedure is outlined below.
     </p>
-    <ol>
+    <ul>
       <li>
-        Use the provided Visual Studio solution/project file. For detail please see <A href="./CCF/Documentation/Build.html">
-          Build.html</A>. Since MPC is now supported to build the CIDL compiler on 
-      Windows, these solution/project files may be removed in the future.
+        If you have not created it already, create the file <code>%ACE_ROOT%/bin/MakeProjectCreator/config/default.features</code>
+        and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own 
+        line. An easy way to do this is to copy the file <code>global.features</code> (in the 
+        same directory) as <code>default.features</code>
+        and modify the appropriate lines in the new file, leaving everything else the 
+        same.
       <li>
-        Use <A href="../../MPC/README">MPC</A>. The procedure is outlined below.
+        Install the <a href="http://www.boost.org">Boost</a>
+      libraries on your machine. For Windows, you can download either the 
+      Windows-specific .exe file or the platform-independent .zip file. Use version 
+      1.32.0 or later. The accompanying documentation on how to build and install 
+      Boost is pretty straightforward.
+      <li>
+        Set the following environment variables:
         <ul>
           <li>
-            If you have not created it already, create the file <code>%ACE_ROOT%/bin/MakeProjectCreator/config/default.features</code>
-            and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own 
-            line. An easy way to do this is to copy the file <code>global.features</code> (in the 
-            same directory) as <code>default.features</code>
-            and modify the appropriate lines in the new file, leaving everything else the 
-            same.
-          <li>
-            Install the <a href="http://www.boost.org">Boost</a>
-          libraries on your machine. For Windows, you can download either the 
-          Windows-specific .exe file or the platform-independent .zip file. Use version 
-          1.32.0 or later. The accompanying documentation on how to build and install 
-          Boost is pretty straightforward.
+            <code>ACE_ROOT</code>
+          - [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be 
+          set if you're using CIAO)
           <li>
-            Set the following environment variables:
-            <ul>
-              <li>
-                <code>ACE_ROOT</code>
-              - [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be 
-              set if you're using CIAO)
-              <li>
-                <code>BOOST_CFG</code> - <code>_vc7_mdsd</code>
-              <li>
-                <code>BOOST_ROOT</code>
-              - [path ending with Boost directory]
-              <li>
-                <code>BOOST_VERSION</code> - [name of the directory under <code>%BOOST_ROOT%\include</code>, 
-                for ex. <code>boost-1_32</code>, for Boost vesrion 1.32.0]
-              <LI>
-                <code>UTILITY_ROOT</code> - <code>%ACE_ROOT%\contrib\utility</code>
-              </LI>
-            </ul>
+            <code>BOOST_CFG</code> - <code>_vc7_mdsd</code>
           <li>
-            In <code>%CIAO_ROOT%\CIDLC</code> run <code>%ACE_ROOT%\bin\mwc.pl -type vc71 
-              CIDLC.mwc</code>
+            <code>BOOST_ROOT</code>
+          - [path ending with Boost directory]
           <li>
-            Open <code>CIDLC.sln</code> and build as usual. Within the solution, the CIDLC 
-            project is the top-level one, which depends on all the other projects, and 
-            produces <code>cidlc.exe</code> in <code>%CIAO_ROOT%\bin</code>.
-          </li>
+            <code>BOOST_VERSION</code> - [name of the directory under <code>%BOOST_ROOT%\include</code>, 
+            for ex. <code>boost-1_32</code>, for Boost version 1.32.0]
         </ul>
+      <li>
+        In <code>%CIAO_ROOT%\CIDLC</code> run <code>%ACE_ROOT%\bin\mwc.pl -type vc71 
+          CIDLC.mwc</code>
+      <li>
+        Open <code>CIDLC.sln</code> and build as usual. Within the solution, the CIDLC 
+        project is the top-level one, which depends on all the other projects, and 
+        produces <code>cidlc.exe</code> in <code>%CIAO_ROOT%\bin</code>.
       </li>
-    </ol>
+    </ul>
     <hr>
     <h3>Obtaining and Installing Xerces-C
     </h3>
     <p>The Xerces-C XML parsing library is a necessary component to build parts of 
       DAnCE that need to process XML based descriptor files, which include the <b>Plan 
         Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C 
-      version supported by the DOC group is version 2.6 compiled with RTTI support. 
-      Earlier versions of the Xerces-C library may work, but only if they were built 
-      with RTTI support.
+      version supported by the DOC group is version 2.6 or later.
+      Earlier versions of the Xerces-C library may work.
     </p>
     <h4>Building Xerces-C
     </h4>
@@ -182,12 +170,6 @@
       inconsistant library decorators onto the end of the Xerces-C libraries. The MPC 
       build tool will expect these libraries to be named xerces-c for non debug 
       versions, and xerces-cd for debug versions.
-      <li>
-        <strong>NOTE</strong>: RTTI is not enabled on most Win32 targets by default. If 
-        you are building your own libraries, please make sure that you enable RTTI 
-        support.<br>
-        <br>
-      </li>
     </ul>
     <h4>Xerces-C Environment Settings
     </h4>
@@ -275,10 +257,10 @@
       <li>
       Remove all the GNUmakefiles or project files that are shipped with the release.
       <li>
-        Open up <code>$CIAO_ROOT/CIAOTAO.mwc</code>
+        Open up <code>$CIAO_ROOT/CIAO_TAO.mwc</code>
       .
       <li>
-        Run <code>$ACE_ROOT/bin/mwc.pl CIAOTAO.mwc</code> from <code>$CIAO_ROOT</code>
+        Run <code>$ACE_ROOT/bin/mwc.pl CIAO_TAO.mwc</code> from <code>$CIAO_ROOT</code>
       .
       <li>
       Type 'make'
diff --git a/TAO/CIAO/CIAO.mwc b/TAO/CIAO/CIAO.mwc
index 71765646cf0..dd297256b34 100644
--- a/TAO/CIAO/CIAO.mwc
+++ b/TAO/CIAO/CIAO.mwc
@@ -2,7 +2,4 @@
 // $Id$
 
 workspace {
-  ciao
-  tools
-  DAnCE
 }
diff --git a/TAO/CIAO/CIAOTAO.mwc b/TAO/CIAO/CIAOTAO.mwc
deleted file mode 100644
index c13d3e7353e..00000000000
--- a/TAO/CIAO/CIAOTAO.mwc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  ../../ace
-  ../../apps/gperf/src
-  ../../ACEXML
-  ../tao
-  ../TAO_IDL
-  ../orbsvcs/orbsvcs/CosNaming.mpc
-  ../orbsvcs/orbsvcs/Svc_Utils.mpc
-  ../orbsvcs/orbsvcs/Security.mpc
-  ../orbsvcs/orbsvcs/IFRService.mpc
-  DAnCE
-  ciao
-  tools
-  tests
-  examples
-}
diff --git a/TAO/CIAO/CIDLC/CIDLC.mpc b/TAO/CIAO/CIDLC/CIDLC.mpc
index 9a153b3858f..034bf35a71b 100644
--- a/TAO/CIAO/CIDLC/CIDLC.mpc
+++ b/TAO/CIAO/CIDLC/CIDLC.mpc
@@ -7,20 +7,10 @@ project(CIDLC): cidlc {
   libs += CIDL IDL3 IDL2 CodeGenerationKit CompilerElements
 
   Source_Files {
-    ExecutorMappingGenerator.cpp
-    DescriptorGenerator.cpp
-    ExecImplGenerator.cpp
-    ExecImplHeaderGenerator.cpp
-    ExecImplSourceGenerator.cpp
-    ExecutorMappingGenerator.cpp
-    RepositoryIdGenerator.cpp
-    SizeTypeCalculator.cpp
-    ServantGenerator.cpp
-    ServantHeaderGenerator.cpp
-    ServantSourceGenerator.cpp
-    TypeNameEmitter.cpp
-    Literals.cpp
-    cidlc.cpp
+    *.cpp
   }
 
+  Header_Files {
+    *.hpp
+  }
 }
diff --git a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
index 7b5b41933c2..f7b5912f3fa 100644
--- a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
+++ b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
@@ -56,7 +56,7 @@ namespace
       virtual void
       traverse (Type& c)
       {
-        os << "<componentrepid repid=\"" 
+        os << "<componentrepid repid=\""
            << c.context ().get<string> (STRS[REPO_ID])
            << "\"/>"
            << endl;
@@ -72,7 +72,7 @@ namespace
       virtual void
       traverse (Type& h)
       {
-        os << "<homerepid repid=\"" 
+        os << "<homerepid repid=\""
            << h.context ().get<string> (STRS[REPO_ID])
            << "\"/>"
            << endl;
@@ -90,7 +90,7 @@ namespace
       {
         os << "<homefeatures" << endl
            << "name=\"" << h.name () << "\"" << endl
-           << "repid=\"" 
+           << "repid=\""
            << h.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
@@ -116,7 +116,7 @@ namespace
         virtual void
         traverse (Type& h)
         {
-          os << "<inheritshome repid=\"" 
+          os << "<inheritshome repid=\""
              << h.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -135,7 +135,7 @@ namespace
       {
         os << "<componentfeatures" << endl
            << "name=\"" << c.name () << "\"" << endl
-           << "repid=\"" 
+           << "repid=\""
            << c.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
@@ -175,7 +175,7 @@ namespace
         virtual void
         traverse (Type& c)
         {
-          os << "<inheritscomponent repid=\"" 
+          os << "<inheritscomponent repid=\""
              << c.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -191,7 +191,7 @@ namespace
         virtual void
         traverse (Type& i)
         {
-          os << "<supportsinterface repid=\"" 
+          os << "<supportsinterface repid=\""
              << i.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -285,23 +285,23 @@ namespace
              << "</publishes>" << endl;
         }
 
-        struct TypeNameEmitter : Traversal::Type, EmitterBase
+        struct FullTypeNameEmitter : Traversal::Type, EmitterBase
         {
-          TypeNameEmitter (fs::ofstream& ofs)
+          FullTypeNameEmitter (fs::ofstream& ofs)
             : EmitterBase (ofs)
           {}
 
           virtual void
           traverse (SemanticGraph::Type& t)
           {
-            os << '\"' 
+            os << '\"'
                << t.context ().get<string> (STRS[REPO_ID])
                << '\"';
           }
         };
 
       private:
-        TypeNameEmitter type_name_emitter_;
+        FullTypeNameEmitter type_name_emitter_;
         unsigned long facettag_;
         Traversal::Belongs belongs_;
       };
@@ -328,7 +328,7 @@ namespace
           os << "<interface" << endl
              << "name=\"" << i.name ()
              << "\"" << endl
-             << "repid=\"" 
+             << "repid=\""
              << i.context ().get<string> (STRS[REPO_ID])
              << "\">" << endl;
 
@@ -354,7 +354,7 @@ namespace
       virtual void
       traverse (Type& i)
       {
-        os << "<inheritsinterface repid=\"" 
+        os << "<inheritsinterface repid=\""
            << i.context ().get<string> (STRS[REPO_ID])
            << "\"/>" << endl;
       }
diff --git a/TAO/CIAO/CIDLC/ExecImplGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
index e68bc5a6206..a1b9fc992e7 100644
--- a/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
@@ -144,7 +144,7 @@ ExecImplGenerator::compute_export_macro (const fs::path& file_path)
     // Replace the suffix.
     export_macro_ =
       regex::perl_s (export_macro_,
-                     "/(\\.(IDL|CIDL|CDL))?$/_EXEC_Export/");
+                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1_EXEC_Export/");
 
     // Replace any remaining '.' in the string with '_'.
     export_macro_ = regex::perl_s (export_macro_,
@@ -164,7 +164,7 @@ ExecImplGenerator::configure_stream (string const& suffix_option,
                                         default_suffix);
     string file_expr =
       cl_.get_value (regex_option,
-                     "/(\\.(idl|cidl|cdl))?$/" + file_suffix + "/");
+                     "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + file_suffix + "/");
 
     string file_name = regex::perl_s (file_name_, file_expr);
 
diff --git a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index 6ab0814e449..30c6ae09566 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -3,8 +3,16 @@
 // cvs-id    : $Id$
 
 #include "ExecImplHeaderGenerator.hpp"
-#include "TypeNameEmitter.hpp"
+#include "CorbaTypeNameEmitters.hpp"
+#include "UtilityTypeNameEmitters.hpp"
+#include "AttributeHeaderEmitters.hpp"
+#include "OperationHeaderEmitters.hpp"
+#include "ParameterEmitter_T.hpp"
+#include "CompositionEmitter.hpp"
+#include "ModuleEmitter.hpp"
+#include "InterfaceEmitter.hpp"
 #include "Literals.hpp"
+#include "Upcase.hpp"
 
 #include <ostream>
 
@@ -18,351 +26,6 @@ using namespace CCF::CIDL::SemanticGraph;
 
 namespace
 {
-  // On some platforms toupper can be something other than a
-  // function.
-  int
-  upcase (int c)
-  {
-    return std::toupper (c);
-  }
-}
-
-namespace
-{
-  class Context
-  {
-  public:
-    Context (std::ostream& os,
-             string export_macro)
-        : os_ (os),
-          export_macro_ (export_macro)
-    {
-    }
-
-  std::ostream&
-  os ()
-  {
-    return os_;
-  }
-
-  string
-  export_macro ()
-  {
-    return export_macro_;
-  }
-
-  private:
-    std::ostream& os_;
-    string export_macro_;
-  };
-
-  class EmitterBase
-  {
-  public:
-    EmitterBase (Context& c)
-      : ctx (c),
-        os (ctx.os ())
-    {
-    }
-
-  protected:
-    Context& ctx;
-    std::ostream& os;
-  };
-
-  struct ModuleEmitter : Traversal::Module, EmitterBase
-  {
-    ModuleEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << "namespace " << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-
-  struct CompositionEmitter : Traversal::Composition, EmitterBase
-  {
-    CompositionEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << STRS[CIDL_NS] << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-
-  struct OperationEmitter : Traversal::Operation, EmitterBase
-  {
-    OperationEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    virtual void
-    pre (Type&)
-    {
-      os << "virtual ";
-    }
-
-    virtual void
-    name (Type& o)
-    {
-      os << endl << o.name ();
-    }
-
-    virtual void
-    receives_pre (Type&)
-    {
-      os << " (" << endl;
-    }
-
-    virtual void
-    receives_none (Type&)
-    {
-      os << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    receives_post (Type&)
-    {
-      os << endl << STRS[ENV_HDR] << ")" << endl;
-    }
-
-    virtual void
-    raises_pre (Type&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_none (Type&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_post (Type&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << ";" << endl;
-    }
-
-    virtual void
-    comma (Type&)
-    {
-      os << "," << endl;
-    }
-  };
-
-  // For generating parameter names.
-  template <typename T>
-  struct ParameterEmitter : T
-  {
-    ParameterEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    name (typename T::Type& p)
-    {
-      os << " " << p.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic scoped typename emitter used by various other emitters.
-  struct TypeNameEmitter : Traversal::Type
-  {
-    TypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic local typename emitter used by various other emitters.
-  struct SimpleTypeNameEmitter : Traversal::Type
-  {
-    SimpleTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generate name of type's enclosing scope.
-  struct EnclosingTypeNameEmitter : Traversal::Type
-  {
-    EnclosingTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ().scope_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Emits typename minus the leading double colon.
-  struct StrippedTypeNameEmitter : Traversal::Type
-  {
-    StrippedTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      ScopedName scoped (t.scoped_name ());
-      os << Name (scoped.begin () + 1, scoped.end ());
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generates operations associated with attributes.
-  // @@@ (JP) Need to support exceptions.
-  struct AttributeEmitter : Traversal::ReadWriteAttribute,
-                            EmitterBase
-  {
-    AttributeEmitter (Context& c)
-      : EmitterBase (c),
-        write_type_name_emitter_ (c.os ()),
-        read_type_name_emitter_ (c.os ())
-    {
-      write_belongs_.node_traverser (write_type_name_emitter_);
-      read_belongs_.node_traverser (read_type_name_emitter_);
-    }
-
-    virtual void traverse (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << "virtual ";
-
-      Traversal::ReadWriteAttribute::belongs (a, read_belongs_);
-
-      os << endl
-         << a.name () << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
-
-      os << "virtual void" << endl
-         << a.name () << " (" << endl;
-
-      Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-
-      os << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
-    }
-
-  private:
-    INArgTypeNameEmitter write_type_name_emitter_;
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    Traversal::Belongs write_belongs_;
-    Traversal::Belongs read_belongs_;
-  };
-
-  // Generates operations associated with readonly attributes.
-  // @@@ (JP) Need to support exceptions.
-  struct ReadOnlyAttributeEmitter : Traversal::ReadAttribute,
-                                    EmitterBase
-  {
-    ReadOnlyAttributeEmitter (Context& c)
-      : EmitterBase (c),
-        read_type_name_emitter_ (c.os ())
-    {
-      read_belongs_.node_traverser (read_type_name_emitter_);
-    }
-
-    virtual void traverse (SemanticGraph::ReadAttribute& a)
-    {
-      os << "virtual ";
-
-      Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-      os << endl
-         << a.name () << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
-    }
-
-  private:
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    Traversal::Belongs read_belongs_;
-  };
-
-  struct InterfaceEmitter : Traversal::UnconstrainedInterface,
-                            EmitterBase
-  {
-    InterfaceEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    bool
-    add (UnconstrainedInterface& i)
-    {
-      return interfaces_.insert (&i).second;
-    }
-
-    virtual void
-    traverse (UnconstrainedInterface& i)
-    {
-      if (add (i))
-      {
-        Traversal::UnconstrainedInterface::traverse (i);
-      }
-    }
-
-  private:
-    std::set<UnconstrainedInterface*> interfaces_;
-  };
-
   struct FacetEmitter : Traversal::UnconstrainedInterface,
                         EmitterBase
   {
@@ -375,12 +38,12 @@ namespace
     traverse (UnconstrainedInterface& i)
     {
       if (i.context ().count ("facet_impl_hdr_gen")) return;
-    
+
       os << "class " << ctx.export_macro () << " "
          << i.name () << "_exec_i" << endl
-         << ": public virtual " << i.scoped_name ().scope_name ()
+         << "  : public virtual " << i.scoped_name ().scope_name ()
          << "::CCM_" << i.name () << "," << endl
-         << "public virtual TAO_Local_RefCounted_Object" << endl
+         << "    public virtual TAO_Local_RefCounted_Object" << endl
          << "{"
          << "public:" << endl
          << i.name () << "_exec_i (void);"
@@ -395,10 +58,8 @@ namespace
         interface_emitter.edge_traverser (defines_);
         interface_emitter.edge_traverser (inherits_);
 
-        AttributeEmitter attribute_emitter (ctx);
-        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines_.node_traverser (attribute_emitter);
-        defines_.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines_.node_traverser (operation_emitter);
@@ -411,15 +72,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -428,9 +89,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -438,9 +99,9 @@ namespace
         inherits (i, inherits_);
         names (i, defines_);
       }
-      
+
       os << "};";
-      
+
       i.context ().set ("facet_impl_hdr_gen", true);
     }
   };
@@ -451,9 +112,9 @@ namespace
   {
     ExecPortsEmitter (Context& c)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c.os ()),
-        simple_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ())
+        enclosing_type_name_emitter_ (c),
+        simple_type_name_emitter_ (c),
+        type_name_emitter_ (c)
     {
       enclosing_belongs_.node_traverser (enclosing_type_name_emitter_);
       simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -466,37 +127,34 @@ namespace
       os << "virtual ";
 
       Traversal::ProviderData::belongs (p, enclosing_belongs_);
-      
+
       os << "::CCM_";
 
       Traversal::ProviderData::belongs (p, simple_belongs_);
-      
+
       os << "_ptr" << endl
-          << "get_" << p.name () << " (" << endl
-          << STRS[ENV_SNGL_HDR] << ")" << endl
-          << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_" << p.name () << " (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
     }
 
     virtual void
     traverse (SemanticGraph::Consumer& c)
     {
-      // @@@ (JP) May need to generate this for the eventtype's ancestors
-      // as well (the spec is vague on this point). If so, we need the
-      // CIDL compiler to support valuetype/eventtype inheritance.
       os << "virtual void" << endl
-          << "push_" << c.name () << " (" << endl;
+         << "push_" << c.name () << " (" << endl;
 
       Traversal::ConsumerData::belongs (c, belongs_);
 
       os << " *ev" << endl
-          << STRS[ENV_HDR] << ")" << endl
-          << STRS[EXCP_SNGL] << ";" << endl;
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
    }
 
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
+    FullTypeNameEmitter type_name_emitter_;
     Traversal::Belongs enclosing_belongs_;
     Traversal::Belongs simple_belongs_;
     Traversal::Belongs belongs_;
@@ -538,8 +196,8 @@ namespace
 
       os << "class " << ctx.export_macro () << " "
          << t.name () << "_exec_i" << endl
-         << ": public virtual " << exec_.name () << "," << endl
-         << "public virtual TAO_Local_RefCounted_Object" << endl
+         << "  : public virtual " << exec_.name () << "," << endl
+         << "    public virtual TAO_Local_RefCounted_Object" << endl
          << "{"
          << "public:" << endl
          << t.name () << "_exec_i (void);"
@@ -564,10 +222,8 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter attribute_emitter (ctx);
-        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines.node_traverser (operation_emitter);
@@ -580,15 +236,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -597,9 +253,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -620,16 +276,14 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        AttributeEmitter attribute_emitter (ctx);
-        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         component_emitter.traverse (t);
       }
 
       os << "// Port operations." << endl << endl;
-      
+
       {
         Traversal::Component component_emitter;
 
@@ -646,7 +300,7 @@ namespace
 
         component_emitter.traverse (t);
       }
-      
+
       os << "// Operations from Components::SessionComponent" << endl << endl;
 
       os << "virtual void" << endl
@@ -700,7 +354,7 @@ namespace
          << t.name () << "_Context *context_;" << endl
          << "};";
     }
-    
+
   private:
     ComponentExecutor& exec_;
   };
@@ -716,193 +370,14 @@ namespace
     implements (Type& i)
     {
       Traversal::ComponentExecutor component_executor;
-      
+
       Traversal::Implements implements;
       component_executor.edge_traverser (implements);
-      
+
       ComponentExecImplEmitter component_exec_impl_emitter (ctx, i);
       implements.node_traverser (component_exec_impl_emitter);
-      
-      component_executor.traverse (i);
-    }
-  };
-  
-  // HomeFactory and HomeFinder are tied to Operation in
-  // the front end. Since we want to treat them differently
-  // than regular operations in a home (we want to generate
-  // base class factory operations returning the base component,
-  // for example), we use this class for regular home operations
-  // that overrides HomeFactory and HomeFinder traversals
-  // to do nothing.
-  struct HomeOperationEmitter : OperationEmitter,
-                                Traversal::HomeFactory,
-                                Traversal::HomeFinder
-  {
-    HomeOperationEmitter (Context& c)
-      : OperationEmitter (c)
-    {}
 
-    virtual void
-    traverse (SemanticGraph::HomeFactory&)
-    {
-    }
-
-    virtual void
-    traverse (SemanticGraph::HomeFinder&)
-    {
-    }
-  };
-
-  struct FactoryOperationEmitter : Traversal::HomeFactory,
-                                   Traversal::Home,
-                                   EmitterBase
-  {
-    FactoryOperationEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    virtual void
-    pre (SemanticGraph::HomeFactory&)
-    {
-      os << "virtual ";
-    }
-
-    virtual void
-    returns (SemanticGraph::HomeFactory&)
-    {
-      os << STRS[COMP_EC] << "_ptr" << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::HomeFactory& hf)
-    {
-      os << hf.name ();
-    }
-
-    virtual void
-    receives_none (SemanticGraph::HomeFactory&)
-    {
-      os << " (" << endl
-          << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    receives_pre (SemanticGraph::HomeFactory&)
-    {
-      os << " (" << endl;
-    }
-
-    virtual void
-    receives_post (SemanticGraph::HomeFactory&)
-    {
-      os << endl << STRS[ENV_HDR] << ")" << endl;
-    }
-
-    virtual void
-    raises_none (SemanticGraph::HomeFactory&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_pre (SemanticGraph::HomeFactory&)
-    {
-      os << STRS[EXCP_START] << endl
-          << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_post (SemanticGraph::HomeFactory&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    post (SemanticGraph::HomeFactory&)
-    {
-      os << ";" << endl;
-    }
-
-    virtual void
-    comma (SemanticGraph::HomeFactory&)
-    {
-      os << "," << endl;
-    }
-  };
-
-  struct FinderOperationEmitter : Traversal::HomeFinder,
-                                  EmitterBase
-  {
-    FinderOperationEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    virtual void
-    pre (SemanticGraph::HomeFinder&)
-    {
-      os << "virtual ";
-    }
-
-    virtual void
-    returns (SemanticGraph::HomeFinder&)
-    {
-      os << STRS[COMP_EC] << "_ptr" << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::HomeFinder& t)
-    {
-      os << t.name ();
-    }
-
-    virtual void
-    receives_none (SemanticGraph::HomeFinder&)
-    {
-      os << " (" << endl
-          << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    receives_pre (SemanticGraph::HomeFinder&)
-    {
-      os << " (" << endl;
-    }
-
-    virtual void
-    receives_post (SemanticGraph::HomeFinder&)
-    {
-      os << endl << STRS[ENV_HDR] << ")" << endl;
-    }
-
-    virtual void
-    raises_none (SemanticGraph::HomeFinder&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_pre (SemanticGraph::HomeFinder&)
-    {
-      os << STRS[EXCP_START] << endl
-          << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_post (SemanticGraph::HomeFinder&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    post (SemanticGraph::HomeFinder&)
-    {
-      os << ";" << endl << endl;
-    }
-
-    virtual void
-    comma (SemanticGraph::HomeFinder&)
-    {
-      os << "," << endl;
+      component_executor.traverse (i);
     }
   };
 
@@ -919,8 +394,8 @@ namespace
     {
       os << "class " << ctx.export_macro () << " "
          << t.name () << "_exec_i" << endl
-         << ": public virtual " << exec_.name () << "," << endl
-         << "public virtual TAO_Local_RefCounted_Object" << endl
+         << "  : public virtual " << exec_.name () << "," << endl
+         << "    public virtual TAO_Local_RefCounted_Object" << endl
          << "{"
          << "public:" << endl
          << t.name () << "_exec_i (void);"
@@ -945,10 +420,8 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter attribute_emitter (ctx);
-        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines.node_traverser (operation_emitter);
@@ -961,15 +434,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -978,9 +451,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1010,15 +483,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1027,9 +500,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1052,8 +525,9 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        FactoryOperationEmitter factory_operation_emitter (ctx);
-        FinderOperationEmitter finder_operation_emitter (ctx);
+        bool for_exec = true;
+        FactoryOperationEmitter factory_operation_emitter (ctx, for_exec);
+        FinderOperationEmitter finder_operation_emitter (ctx, for_exec);
         defines.node_traverser (factory_operation_emitter);
         defines.node_traverser (finder_operation_emitter);
 
@@ -1067,15 +541,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1084,9 +558,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1107,10 +581,8 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        AttributeEmitter attribute_emitter (ctx);
-        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         home_emitter.traverse (t);
       }
@@ -1131,13 +603,15 @@ namespace
 
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::Components::HomeExecutorBase_ptr" << endl
-         << "create" << t.name () << "_Impl (void);" << endl;
+         << "create"
+         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
+         << "_Impl (void);" << endl;
     }
-    
+
   private:
     HomeExecutor& exec_;
   };
-  
+
   struct HomeExecutorEmitter : Traversal::HomeExecutor, EmitterBase
   {
     HomeExecutorEmitter (Context& c)
@@ -1149,13 +623,13 @@ namespace
     implements (Type& i)
     {
       Traversal::HomeExecutor home_executor;
-      
+
       Traversal::Implements implements;
       home_executor.edge_traverser (implements);
-      
+
       HomeExecImplEmitter home_exec_impl_emitter (ctx, i);
       implements.node_traverser (home_exec_impl_emitter);
-      
+
       home_executor.traverse (i);
     }
   };
@@ -1201,7 +675,9 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
   string guard =
     "CIAO_"
     + regex::perl_s (uc_file_name,
-                       "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
+                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
+                     + uc_file_suffix
+                     + "/");
 
   // Replace any remaining '.' with '_'.
   guard = regex::perl_s (guard, "/\\./_/");
@@ -1214,7 +690,7 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
                                       "_svnt.h");
 
   string svnt_file_name = regex::perl_s (file_name,
-                                         "/(\\.(idl|cidl|cdl))?$/"
+                                         "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
                                          + file_suffix
                                          + "/");
 
@@ -1223,10 +699,10 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
   os << "#if !defined (ACE_LACKS_PRAGMA_ONCE)" << endl
      << "# pragma once" << endl
      << "#endif /* ACE_LACKS_PRAGMA_ONCE */" << endl << endl;
-     
+
   string default_export_include =
     regex::perl_s (file_name,
-                   "/(\\.(idl|cidl|cdl))?$/_exec_export.h/");
+                   "/^(.+?)(\\.(idl|cidl|cdl))?$/$1_exec_export.h/");
 
   string export_include = cl_.get_value ("exec-export-include",
                                          default_export_include);
@@ -1244,7 +720,7 @@ ExecImplHeaderEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_);
+  Context c (os, export_macro_, cl_);
 
   Traversal::TranslationUnit unit;
 
@@ -1303,7 +779,7 @@ void
 ExecImplHeaderEmitter::post (TranslationUnit&)
 {
   if (file_.empty ()) return;
-  
+
   string uc_file_name = file_.leaf ();
 
   std::transform (uc_file_name.begin (),
@@ -1322,7 +798,7 @@ ExecImplHeaderEmitter::post (TranslationUnit&)
   string guard =
     "CIAO_"
     + regex::perl_s (uc_file_name,
-                     "/(\\.(IDL|CIDL))?$/" +  uc_file_suffix + "/");
+                     "/^(.+?)(\\.(IDL|CIDL))?$/$1" +  uc_file_suffix + "/");
 
   guard = regex::perl_s (guard, "/\\./_/");
 
diff --git a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
index 9ebe0cd300c..0cc8127cc76 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
@@ -19,7 +19,7 @@ public:
                          CommandLine const& cl,
                          string export_macro,
                          fs::path const& file);
-                        
+
   virtual ~ExecImplHeaderEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index f9975a08afb..34bb6866061 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -3,100 +3,25 @@
 // cvs-id    : $Id$
 
 #include "ExecImplSourceGenerator.hpp"
+#include "CorbaTypeNameEmitters.hpp"
+#include "UtilityTypeNameEmitters.hpp"
+#include "ParameterEmitter_T.hpp"
+#include "AttributeSourceEmitters_T.hpp"
+#include "CompositionEmitter.hpp"
+#include "ModuleEmitter.hpp"
+#include "InterfaceEmitter.hpp"
 #include "Literals.hpp"
-#include "TypeNameEmitter.hpp"
-
-#include "CCF/CodeGenerationKit/Regex.hpp"
 
 #include <ostream>
 
+#include "CCF/CodeGenerationKit/Regex.hpp"
+
 using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 using namespace StringLiterals;
 
 namespace
 {
-  class Context
-  {
-  public:
-    Context (std::ostream& os,
-             string export_macro)
-      : os_ (os),
-        export_macro_ (export_macro)
-    {
-    }
-
-  std::ostream&
-  os ()
-  {
-    return os_;
-  }
-
-  string
-  export_macro ()
-  {
-    return export_macro_;
-  }
-
-  private:
-    std::ostream& os_;
-    string export_macro_;
-  };
-
-  class EmitterBase
-  {
-  public:
-    EmitterBase (Context& c)
-      : ctx (c),
-        os (ctx.os ())
-    {
-    }
-
-  protected:
-    Context& ctx;
-    std::ostream& os;
-  };
-
-  struct ModuleEmitter : Traversal::Module, EmitterBase
-  {
-    ModuleEmitter (Context& c)
-        : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << "namespace " << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-
-  struct CompositionEmitter : Traversal::Composition, EmitterBase
-  {
-    CompositionEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << STRS[CIDL_NS] << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-  
   template <typename T>
   struct OperationEmitter : Traversal::Operation, EmitterBase
   {
@@ -134,7 +59,7 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << endl
+      os << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -161,7 +86,7 @@ namespace
       Traversal::Belongs returns;
       operation_emitter.edge_traverser (returns);
 
-      NullReturnEmitter return_emitter (os);
+      NullReturnEmitter return_emitter (ctx);
       returns.node_traverser (return_emitter);
 
       operation_emitter.traverse (o);
@@ -179,222 +104,6 @@ namespace
     T& scope_;
   };
 
-  // For generating parameter names.
-  template <typename T>
-  struct ParameterEmitter : T
-  {
-    ParameterEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    name (typename T::Type& p)
-    {
-      os << " /* " << p.name () << " */";
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic scoped typename emitter used by various other emitters.
-  struct TypeNameEmitter : Traversal::Type
-  {
-    TypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic local typename emitter used by various other emitters.
-  struct SimpleTypeNameEmitter : Traversal::Type
-  {
-    SimpleTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generate name of type's enclosing scope.
-  struct EnclosingTypeNameEmitter : Traversal::Type
-  {
-    EnclosingTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ().scope_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Emits typename minus the leading double colon.
-  struct StrippedTypeNameEmitter : Traversal::Type
-  {
-    StrippedTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      ScopedName scoped (t.scoped_name ());
-      os << Name (scoped.begin () + 1, scoped.end ());
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generates operations associated with attributes.
-  // @@@ (JP) Need to support exceptions.
-  template <typename T>
-  struct AttributeEmitter : Traversal::ReadWriteAttribute,
-                            EmitterBase
-  {
-    AttributeEmitter (Context& c, T& scope)
-      : EmitterBase (c),
-        scope_ (scope),
-        write_type_name_emitter_ (c.os ()),
-        read_type_name_emitter_ (c.os ()),
-        return_emitter_ (c.os ())
-    {
-      write_belongs_.node_traverser (write_type_name_emitter_);
-      read_belongs_.node_traverser (read_type_name_emitter_);
-      return_belongs_.node_traverser (return_emitter_);
-    }
-
-    virtual void traverse (SemanticGraph::ReadWriteAttribute& a)
-    {
-      Traversal::ReadWriteAttribute::belongs (a, read_belongs_);
-
-      os << endl
-         << scope_.name () << "_exec_i::" << a.name ()
-         << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << STRS[YCH] << endl;
-         
-      Traversal::ReadWriteAttribute::belongs (a, return_belongs_);
-
-      os << "}";
-
-      os << "void" << endl
-         << scope_.name () << "_exec_i::" << a.name ()
-         << " (" << endl;
-
-      Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-
-      os << " /* " << a.name () << " */" << endl
-         << STRS[ENV_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << STRS[YCH]
-         << "}";
-    }
-
-  protected:
-    T& scope_;
-
-  private:
-    INArgTypeNameEmitter write_type_name_emitter_;
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    NullReturnEmitter return_emitter_;
-    Traversal::Belongs write_belongs_;
-    Traversal::Belongs read_belongs_;
-    Traversal::Belongs return_belongs_;
-  };
-
-  // Generates operations associated with readonly attributes.
-  // @@@ (JP) Need to support exceptions.
-  template <typename T>
-  struct ReadOnlyAttributeEmitter : Traversal::ReadAttribute,
-                                    EmitterBase
-  {
-    ReadOnlyAttributeEmitter (Context& c, T& scope)
-      : EmitterBase (c),
-        scope_ (scope),
-        read_type_name_emitter_ (c.os ()),
-        return_emitter_ (c.os ())
-    {
-      read_belongs_.node_traverser (read_type_name_emitter_);
-      return_belongs_.node_traverser (return_emitter_);
-    }
-
-    virtual void traverse (SemanticGraph::ReadAttribute& a)
-    {
-      Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-      os << endl
-         << scope_.name () << "_exec_i::" << a.name ()
-         << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << STRS[YCH] << endl;
-         
-      Traversal::ReadAttribute::belongs (a, return_belongs_);
-
-      os << "}";
-    }
-
-  protected:
-    T& scope_;
-
-  private:
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    NullReturnEmitter return_emitter_;
-    Traversal::Belongs read_belongs_;
-    Traversal::Belongs return_belongs_;
-  };
-
-  struct InterfaceEmitter : Traversal::UnconstrainedInterface,
-                            EmitterBase
-  {
-    InterfaceEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    bool
-    add (UnconstrainedInterface& i)
-    {
-      return interfaces_.insert (&i).second;
-    }
-
-    virtual void
-    traverse (UnconstrainedInterface& i)
-    {
-      if (add (i))
-      {
-        Traversal::UnconstrainedInterface::traverse (i);
-      }
-    }
-
-  private:
-    std::set<UnconstrainedInterface*> interfaces_;
-  };
-
   struct FacetEmitter : Traversal::UnconstrainedInterface,
                         EmitterBase
   {
@@ -407,17 +116,17 @@ namespace
     traverse (UnconstrainedInterface& i)
     {
       if (i.context ().count ("facet_impl_src_gen")) return;
-      
+
       os << STRS[SEP] << endl
          << "// Facet Executor Implementation Class:   "
          << i.name () << "_exec_i" << endl
          << STRS[SEP] << endl << endl;
-    
-      os << i.name () << "_exec_i::" 
+
+      os << i.name () << "_exec_i::"
          << i.name () << "_exec_i (void)" << endl
          << "{"
          << "}"
-         << i.name () << "_exec_i::~" 
+         << i.name () << "_exec_i::~"
          << i.name () << "_exec_i (void)" << endl
          << "{"
          << "}"
@@ -431,10 +140,13 @@ namespace
         interface_emitter.edge_traverser (defines_);
         interface_emitter.edge_traverser (inherits_);
 
-        AttributeEmitter<UnconstrainedInterface> attribute_emitter (ctx, i);
-        ReadOnlyAttributeEmitter<UnconstrainedInterface> read_only_attribute_emitter (ctx, i);
+        bool exec_src = true;
+        AttributeSourceEmitter<UnconstrainedInterface> attribute_emitter (
+            ctx,
+            i,
+            exec_src
+          );
         defines_.node_traverser (attribute_emitter);
-        defines_.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<UnconstrainedInterface> operation_emitter (ctx, i);
         defines_.node_traverser (operation_emitter);
@@ -447,15 +159,25 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        bool for_exec_src = true;
+        ParameterEmitter<Traversal::InParameter> in_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::InOutParameter> inout_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::OutParameter> out_param (
+            ctx,
+            for_exec_src
+          );
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -464,9 +186,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -474,7 +196,7 @@ namespace
         inherits (i, inherits_);
         names (i, defines_);
       }
-      
+
       i.context ().set ("facet_impl_src_gen", true);
     }
   };
@@ -485,9 +207,9 @@ namespace
   {
     ExecPortsEmitter (Context& c, SemanticGraph::Component& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c.os ()),
-        simple_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ()),
+        enclosing_type_name_emitter_ (c),
+        simple_type_name_emitter_ (c),
+        type_name_emitter_ (c),
         scope_ (scope)
     {
       enclosing_belongs_.node_traverser (enclosing_type_name_emitter_);
@@ -499,13 +221,13 @@ namespace
     traverse (SemanticGraph::Provider& p)
     {
       Traversal::ProviderData::belongs (p, enclosing_belongs_);
-      
+
       os << "::CCM_";
 
       Traversal::ProviderData::belongs (p, simple_belongs_);
-      
+
       os << "_ptr" << endl
-         << scope_.name () << "_exec_i::get_" 
+         << scope_.name () << "_exec_i::get_"
          << p.name () << " (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_SNGL] << endl
@@ -514,11 +236,11 @@ namespace
          << "return ";
 
       Traversal::ProviderData::belongs (p, enclosing_belongs_);
-      
+
       os << "::CCM_";
 
       Traversal::ProviderData::belongs (p, simple_belongs_);
-      
+
       os << "::_nil ();" << endl
          << "}";
     }
@@ -526,11 +248,8 @@ namespace
     virtual void
     traverse (SemanticGraph::Consumer& c)
     {
-      // @@@ (JP) May need to generate this for the eventtype's ancestors
-      // as well (the spec is vague on this point). If so, we need the
-      // CIDL compiler to support valuetype/eventtype inheritance.
       os << "void" << endl
-         << scope_.name () << "_exec_i::push_" 
+         << scope_.name () << "_exec_i::push_"
          << c.name () << " (" << endl;
 
       Traversal::ConsumerData::belongs (c, belongs_);
@@ -546,7 +265,7 @@ namespace
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
+    FullTypeNameEmitter type_name_emitter_;
     Traversal::Belongs enclosing_belongs_;
     Traversal::Belongs simple_belongs_;
     Traversal::Belongs belongs_;
@@ -590,12 +309,12 @@ namespace
          << "// Component Executor Implementation Class:   "
          << t.name () << "_exec_i" << endl
          << STRS[SEP] << endl << endl;
-    
-      os << t.name () << "_exec_i::" 
+
+      os << t.name () << "_exec_i::"
          << t.name () << "_exec_i (void)" << endl
          << "{"
          << "}"
-         << t.name () << "_exec_i::~" 
+         << t.name () << "_exec_i::~"
          << t.name () << "_exec_i (void)" << endl
          << "{"
          << "}";
@@ -619,10 +338,13 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
-        ReadOnlyAttributeEmitter<SemanticGraph::Component> read_only_attribute_emitter (ctx, t);
+        bool exec_src = true;
+        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (
+            ctx,
+            t,
+            exec_src
+          );
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<SemanticGraph::Component> operation_emitter (ctx, t);
         defines.node_traverser (operation_emitter);
@@ -635,15 +357,25 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        bool for_exec_src = true;
+        ParameterEmitter<Traversal::InParameter> in_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::InOutParameter> inout_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::OutParameter> out_param (
+            ctx,
+            for_exec_src
+          );
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -652,9 +384,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -675,16 +407,19 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
-        ReadOnlyAttributeEmitter<SemanticGraph::Component> read_only_attribute_emitter (ctx, t);
+        bool exec_src = true;
+        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (
+            ctx,
+            t,
+            exec_src
+          );
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         component_emitter.traverse (t);
       }
 
       os << "// Port operations." << endl << endl;
-      
+
       {
         Traversal::Component component_emitter;
 
@@ -701,33 +436,33 @@ namespace
 
         component_emitter.traverse (t);
       }
-      
+
       os << "// Operations from Components::SessionComponent" << endl << endl;
 
       os << "void" << endl
          << t.name () << "_exec_i::set_session_context (" << endl
          << STRS[COMP_SC] << "_ptr ctx" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
          << "this->context_ =" << endl
-         << t.name () << "_Context::_narrow (" << endl
-         << "ctx" << endl
-         << STRS[ENV_ARG] <<");"
+         << "  " << t.name () << "_Context::_narrow (" << endl
+         << "  ctx" << endl
+         << "  " << STRS[ENV_ARG] <<");"
          << "ACE_CHECK;" << endl;
 
       os << "if (this->context_ == 0)" << endl
          << "{"
-         << "ACE_THROW (CORBA::INTERNAL ());"
+         << "ACE_THROW ( ::CORBA::INTERNAL ());"
          << "}"
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_preactivate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -737,7 +472,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ciao_postactivate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -747,7 +482,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_activate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -757,7 +492,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_passivate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -767,7 +502,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_remove (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -812,8 +547,8 @@ namespace
   {
     FactoryOperationEmitter (Context& c, SemanticGraph::Home& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c.os ()),
-        simple_type_name_emitter_ (c.os ()),
+        enclosing_type_name_emitter_ (c),
+        simple_type_name_emitter_ (c),
         scope_ (scope)
     {
       enclosing_returns_.node_traverser (enclosing_type_name_emitter_);
@@ -860,7 +595,7 @@ namespace
     virtual void
     raises_pre (SemanticGraph::HomeFactory&)
     {
-      os << STRS[EXCP_START] << endl
+      os << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -876,13 +611,13 @@ namespace
       os << "{"
          << STRS[YCH] << endl
          << "return ";
-         
+
       Traversal::HomeFactory::returns (hf, enclosing_returns_);
-      
+
       os << "::CCM_";
-      
+
       Traversal::HomeFactory::returns (hf, simple_returns_);
-      
+
       os << "::_nil ();"
          << "}";
     }
@@ -892,7 +627,7 @@ namespace
     {
       os << "," << endl;
     }
-    
+
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -906,8 +641,8 @@ namespace
   {
     FinderOperationEmitter (Context& c, SemanticGraph::Home& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c.os ()),
-        simple_type_name_emitter_ (c.os ()),
+        enclosing_type_name_emitter_ (c),
+        simple_type_name_emitter_ (c),
         scope_ (scope)
     {
       enclosing_returns_.node_traverser (enclosing_type_name_emitter_);
@@ -954,7 +689,7 @@ namespace
     virtual void
     raises_pre (SemanticGraph::HomeFinder&)
     {
-      os << STRS[EXCP_START] << endl
+      os << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -970,13 +705,13 @@ namespace
       os << "{"
          << STRS[YCH] << endl
          << "return ";
-         
+
       Traversal::HomeFinder::returns (hf, enclosing_returns_);
-      
+
       os << "::CCM_";
-      
+
       Traversal::HomeFinder::returns (hf, simple_returns_);
-      
+
       os << "::_nil ();"
          << "}";
     }
@@ -986,7 +721,7 @@ namespace
     {
       os << "," << endl;
     }
-    
+
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -1009,12 +744,12 @@ namespace
          << "// Home Executor Implementation Class:   "
          << t.name () << "_exec_i" << endl
          << STRS[SEP] << endl << endl;
-    
-      os << t.name () << "_exec_i::" 
+
+      os << t.name () << "_exec_i::"
          << t.name () << "_exec_i (void)" << endl
          << "{"
          << "}"
-         << t.name () << "_exec_i::~" 
+         << t.name () << "_exec_i::~"
          << t.name () << "_exec_i (void)" << endl
          << "{"
          << "}";
@@ -1038,10 +773,13 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
-        ReadOnlyAttributeEmitter<SemanticGraph::Home> read_only_attribute_emitter (ctx, t);
+        bool exec_src = true;
+        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (
+            ctx,
+            t,
+            exec_src
+          );
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<SemanticGraph::Home> operation_emitter (ctx, t);
         defines.node_traverser (operation_emitter);
@@ -1054,15 +792,25 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        bool for_exec_src = true;
+        ParameterEmitter<Traversal::InParameter> in_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::InOutParameter> inout_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::OutParameter> out_param (
+            ctx,
+            for_exec_src
+          );
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1071,9 +819,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1103,15 +851,25 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        bool for_exec_src = true;
+        ParameterEmitter<Traversal::InParameter> in_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::InOutParameter> inout_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::OutParameter> out_param (
+            ctx,
+            for_exec_src
+          );
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1120,9 +878,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1160,15 +918,25 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        bool for_exec_src = true;
+        ParameterEmitter<Traversal::InParameter> in_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::InOutParameter> inout_param (
+            ctx,
+            for_exec_src
+          );
+        ParameterEmitter<Traversal::OutParameter> out_param (
+            ctx,
+            for_exec_src
+          );
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1177,9 +945,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1200,10 +968,13 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
-        ReadOnlyAttributeEmitter<SemanticGraph::Home> read_only_attribute_emitter (ctx, t);
+        bool exec_src = true;
+        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (
+            ctx,
+            t,
+            exec_src
+          );
         defines.node_traverser (attribute_emitter);
-        defines.node_traverser (read_only_attribute_emitter);
 
         home_emitter.traverse (t);
       }
@@ -1212,42 +983,44 @@ namespace
          << STRS[COMP_EC] << "_ptr" << endl
          << t.name () << "_exec_i::create (" << endl
          << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[COMP_EC] << "_ptr retval =" << endl
-         << STRS[COMP_EC] << "::_nil ();" << endl
+         << "  " << STRS[COMP_EC] << "::_nil ();" << endl
          << "ACE_NEW_THROW_EX (" << endl
          << "retval," << endl;
-         
+
        Traversal::Home home_emitter;
-       
+
        Traversal::Manages manages_;
        home_emitter.edge_traverser (manages_);
-       
-       SimpleTypeNameEmitter manages_emitter (os);
+
+       SimpleTypeNameEmitter manages_emitter (ctx);
        manages_.node_traverser (manages_emitter);
-       
+
        home_emitter.traverse (t);
-       
+
        os << "_exec_i," << endl
-          << "CORBA::NO_MEMORY ());"
+          << "::CORBA::NO_MEMORY ());"
           << STRS[ACE_CR] << " (" << STRS[COMP_EC]
           << "::_nil ());" << endl
-          << "return retval;" 
+          << "return retval;"
           << "}";
     }
-    
+
     virtual void
     post (Type& t)
     {
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::Components::HomeExecutorBase_ptr" << endl
-         << "create" << t.name () << "_Impl (void)" << endl
+         << "create"
+         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
+         << "_Impl (void)" << endl
          << "{"
          << "::Components::HomeExecutorBase_ptr retval =" << endl
-         << "::Components::HomeExecutorBase::_nil ();" << endl
+         << "  ::Components::HomeExecutorBase::_nil ();" << endl
          << "ACE_NEW_RETURN (" << endl
          << "retval," << endl
          << t.name () << "_exec_i," << endl
@@ -1284,7 +1057,7 @@ ExecImplSourceEmitter::pre (TranslationUnit&)
                                       "_exec.h");
 
   file_name = regex::perl_s (file_name,
-                             "/(\\.(idl|cidl|cdl))?$/"
+                             "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
                              + file_suffix
                              + "/");
 
@@ -1297,7 +1070,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_);
+  Context c (os, export_macro_, cl_);
 
   Traversal::TranslationUnit unit;
 
@@ -1346,7 +1119,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
   Traversal::Implements implements;
   component_executor.edge_traverser (implements);
   home_executor.edge_traverser (implements);
-  
+
   //--
   ComponentExecImplEmitter component_exec_impl_emitter (c);
   HomeExecImplEmitter home_exec_impl_emitter (c);
@@ -1354,7 +1127,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
   implements.node_traverser (home_exec_impl_emitter);
 
   unit.traverse (u);
-  
+
   post (u);
 }
 
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
index efac70d2543..bf70a53870a 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
@@ -19,7 +19,7 @@ public:
                          CommandLine const& cl,
                          string export_macro,
                          fs::path const& file);
-                        
+
   virtual ~ExecImplSourceEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
index ac12e34fa8c..ca62ef3d3a2 100644
--- a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
@@ -290,11 +290,11 @@ namespace
   //
   //
   //
-  struct TypeNameEmitter : Traversal::FundamentalType,
+  struct FullTypeNameEmitter : Traversal::FundamentalType,
                            Traversal::Type,
                            Emitter
   {
-    TypeNameEmitter (Context& c, ostream& os)
+    FullTypeNameEmitter (Context& c, ostream& os)
         : Emitter (c, os)
     {
     }
@@ -462,7 +462,7 @@ namespace
   private:
     Traversal::GetRaises get_raises_;
     Traversal::SetRaises set_raises_;
-    TypeNameEmitter type_name_;
+    FullTypeNameEmitter type_name_;
   };
 
 
@@ -634,7 +634,7 @@ namespace
     Traversal::Belongs belongs;
     Traversal::Belongs provider_belongs;
 
-    TypeNameEmitter type_name_emitter;
+    FullTypeNameEmitter type_name_emitter;
   };
 
 
@@ -1713,7 +1713,7 @@ generate (CommandLine const& cl,
 
     string expr (cl.get_value (
                    "lem-file-regex",
-                   "/(\\.(idl|cidl|cdl))?$/" + suffix + "/"));
+                   "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + suffix + "/"));
 
     string lem_file_name (regex::perl_s (file_name, expr));
 
@@ -2046,7 +2046,7 @@ generate (CommandLine const& cl,
     home_explicit.edge_traverser (home_explicit_defines);
 
     //--
-    TypeNameEmitter type (ctx, os);
+    FullTypeNameEmitter type (ctx, os);
 
     ComponentContextEmitter session_component_context (ctx, os);
     ComponentExecutorEmitter session_component_executor (ctx, os);
diff --git a/TAO/CIAO/CIDLC/Literals.cpp b/TAO/CIAO/CIDLC/Literals.cpp
index af9a3d5e809..b318288a22c 100644
--- a/TAO/CIAO/CIDLC/Literals.cpp
+++ b/TAO/CIAO/CIDLC/Literals.cpp
@@ -28,7 +28,7 @@ namespace StringLiterals
     "//    http://www.dre.vanderbilt.edu/CIAO"
     "\n\n";
 
-  char const* const STRS[SIZE] =
+  char const* const STRS[LIT_SIZE] =
   {
     // ACE Environment portability macros.
     "ACE_ENV_ARG_DECL_WITH_DEFAULTS",                     // ENV_HDR
@@ -41,9 +41,10 @@ namespace StringLiterals
     "ACE_ENV_SINGLE_ARG_PARAMETER",                       // ENV_SNGL_ARG
 
     // Common CORBA and all Components exceptions.
-    "ACE_THROW_SPEC ((CORBA::SystemException))",          // EXCP_SNGL
+    "ACE_THROW_SPEC (( ::CORBA::SystemException))",       // EXCP_SNGL
     "ACE_THROW_SPEC ((",                                  // EXCP_START
     "::CORBA::SystemException",                           // EXCP_SYS
+    "::CORBA::BAD_PARAM ()",                              // EXCP_BP
     "::Components::IllegalState",                         // EXCP_IS
     "::Components::AlreadyConnected",                     // EXCP_AC
     "::Components::InvalidConnection",                    // EXCP_IC
@@ -64,6 +65,9 @@ namespace StringLiterals
     "::Components::EnterpriseComponent",                  // COMP_EC
     "::Components::SessionContext",                       // COMP_SC
     "::Components::ConsumerDescriptions",                 // COMP_CD
+    "::Components::ReceptacleDescriptions",               // COMP_RD
+    "::Components::PublisherDescriptions",                // COMP_PD
+    "::Components::EmitterDescriptions",                  // COMP_ED
 
     // This could change - don't want it scattered all over.
     "namespace CIDL_",                                    // CIDL_NS
@@ -79,9 +83,11 @@ namespace StringLiterals
     "variable-size",                                      // VAR_SIZE
     "_ciao_extract_val",                                  // EXTRACT
     "_ciao_extract_tmp",                                  // EXTRACT_TMP
-	  "ACE_UNUSED_ARG",                                     // ACE_UA
-	  "ACE_CHECK_RETURN",                                   // ACE_CR
-	  "ACE_THROW_RETURN"                                    // ACE_TR
+    "ACE_UNUSED_ARG",                                     // ACE_UA
+    "ACE_CHECK",                                          // ACE_CK
+    "ACE_CHECK_RETURN",                                   // ACE_CR
+    "ACE_THROW",                                          // ACE_TH
+    "ACE_THROW_RETURN"                                    // ACE_TR
   };
 }
 
diff --git a/TAO/CIAO/CIDLC/Literals.hpp b/TAO/CIAO/CIDLC/Literals.hpp
index 84f70e1a4c2..9d20978dfcc 100644
--- a/TAO/CIAO/CIDLC/Literals.hpp
+++ b/TAO/CIAO/CIDLC/Literals.hpp
@@ -23,6 +23,7 @@ namespace StringLiterals
     EXCP_SNGL,
     EXCP_START,
     EXCP_SYS,
+    EXCP_BP,
     EXCP_IS,
     EXCP_AC,
     EXCP_IC,
@@ -41,6 +42,9 @@ namespace StringLiterals
     COMP_EC,
     COMP_SC,
     COMP_CD,
+    COMP_RD,
+    COMP_PD,
+    COMP_ED,
     CIDL_NS,
     TYPE_ID,
     TYPE_PREFIX,
@@ -50,13 +54,15 @@ namespace StringLiterals
     VAR_SIZE,
     EXTRACT,
     EXTRACT_TMP,
-	  ACE_UA,
-	  ACE_CR,
-	  ACE_TR,
-    SIZE
+    ACE_UA,
+    ACE_CK,
+    ACE_CR,
+    ACE_TH,
+    ACE_TR,
+    LIT_SIZE
   };
 
-  extern char const* const STRS[SIZE];
+  extern char const* const STRS[LIT_SIZE];
 }
 
 #endif  // LITERALS_HPP
diff --git a/TAO/CIAO/CIDLC/README.html b/TAO/CIAO/CIDLC/README.html
index 0561c7afa1c..22a8e44de6b 100644
--- a/TAO/CIAO/CIDLC/README.html
+++ b/TAO/CIAO/CIDLC/README.html
@@ -52,24 +52,42 @@ cvs-id    : $Id$
 </head>
 
 <body>
-<p>
-The C++ source files in this directory are compiled into the
-code generators and driver for the CIAO CIDL compiler. CORBA
-Compiler Framework (CCF) provides the front-end for the compiler.</p>
+<h1>CIAO CIDL compiler README</h1>
+<p>Before continuing, please note that
 
-<p><a href="http://www.dre.vanderbilt.edu/cidlc/binary/">Pre-built binary
+<a href="http://www.dre.vanderbilt.edu/cidlc/binary/">pre-built binary
 executables of CIDL compiler</a> are available for different platforms.</p>
 
-<p>To build CIDL compiler you will need to compile CCF libraries
+<p>The C++ source files in this directory are compiled into the
+code generators and driver for the CIAO CIDL compiler. CORBA
+Compiler Framework (CCF) provides the front-end for the compiler.
+To build CIDL compiler you will need to compile CCF libraries
 first. Please refer to <a href="../CCF/Documentation/Build.html">
 instructions for building CCF libraries</a>.</p>
 
-<p>After you have CCF libraries compiled you can build CIDL compiler
-with makefiles on UNIX</p>
-
-<code> $ make -f Makefile.alt</code>
-
-<p>or by using VC 7.1 project on Windows.</p>
+<p>After you have compiled the CCF libraries, you are ready to build the
+CIDLC compiler. In order to build the compiler, you must generate the
+appropriate project files. If there are makefiles, or project solutions,
+already in the directory, please disgard them since because they can be
+out-of-date, or invalid. To regenerate all project files, type the following
+command:
+<pre>
+%> $ACE_ROOT/bin/mwc.pl -type &lt;project-type&gt; -static -features cidl=1,exceptions=1,boost=1 CIDLC.mwc
+</pre>
+
+Once MPC finishes generating the project files, you can now build CIDLC.
+
+<ul>
+<li>On Linux/UNIX:
+<p>If you are building with a make utility, e.g., gmake, use the following command to build CCF:
+
+<pre>%> gmake cidl=1 exceptions=1 boost=1</pre></p></li>
+<li>On Windows: <p>Just open the generated solution file.</p></li>
+</ul>
+<p><b>Note:</b> If you are building CCF on a Windows platform, use <code>%ACE_ROOT%\bin\mwc.pl</code> instead
+
+<code>of $ACE_ROOT/bin/mwc.pl</code>. Also, for a list of project types and other command-line options
+supported by MPC, type <code>$ACE_ROOT/bin/mwc.pl --help</code>.</p>
 
 </body>
 </html>
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
index 073aa844f77..f3915422cde 100644
--- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
+++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
@@ -38,7 +38,7 @@ namespace
 
     return 0;
   }
-  
+
   void
   compute_new_repo_id (Nameable& d)
   {
@@ -177,7 +177,7 @@ namespace
         {
           SemanticGraph::TypePrefix* prev =
             ctx.get<SemanticGraph::TypePrefix*> (STRS[TYPE_PREFIX]);
-        
+
           if (prev->prefix () != tp.prefix ())
           {
             //@@ Seems tp should contain filename and line
@@ -200,7 +200,7 @@ namespace
         else
         {
           decl->context ().set (STRS[TYPE_PREFIX], &tp);
-          
+
           // A typeprefix declaration could appear after the IDL
           // type declaration, so we want to update the repo id
           // every time.
@@ -213,7 +213,7 @@ namespace
     Diagnostic::Stream& dout_;
     SemanticGraph::TranslationUnit& tu_;
   };
-  
+
   class RepoIdGenerator : public Traversal::Interface,
                           public Traversal::EventType,
                           public Traversal::Home,
@@ -224,19 +224,19 @@ namespace
     {
       compute_repo_id (i);
     }
-    
+
     virtual void
     traverse (SemanticGraph::EventType& e)
     {
       compute_repo_id (e);
     }
-    
+
     virtual void
     traverse (SemanticGraph::Home& h)
     {
       compute_repo_id (h);
     }
-    
+
     virtual void
     traverse (SemanticGraph::Component& c)
     {
@@ -264,11 +264,11 @@ bool RepositoryIdGenerator::generate (TranslationUnit& u)
 
   Traversal::ContainsRoot contains_root;
   Traversal::Includes includes;
-  
+
   region.edge_traverser (includes);
   region.edge_traverser (contains_root);
-  
-  Traversal::Root root;  
+
+  Traversal::Root root;
   includes.node_traverser (region);
   contains_root.node_traverser (root);
 
@@ -276,17 +276,17 @@ bool RepositoryIdGenerator::generate (TranslationUnit& u)
   root.edge_traverser (defines);
 
   Traversal::Module module;
-  
+
   defines.node_traverser (module);
   defines.node_traverser (type_id);
   defines.node_traverser (type_prefix);
   defines.node_traverser (repo_id);
-  
+
   module.edge_traverser (defines);
-  
+
   Traversal::Interface iface;
   defines.node_traverser (iface);
-  
+
   unit.traverse (u);
 
   if (dout.error_count () != 0) return false;
diff --git a/TAO/CIAO/CIDLC/ServantGenerator.cpp b/TAO/CIAO/CIDLC/ServantGenerator.cpp
index ca55ca2938f..1f85a107600 100644
--- a/TAO/CIAO/CIDLC/ServantGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantGenerator.cpp
@@ -154,7 +154,7 @@ ServantGenerator::compute_export_macro (const fs::path& file_path)
     // Replace the suffix.
     export_macro_ =
       regex::perl_s (export_macro_,
-                     "/(\\.(IDL|CIDL|CDL))?$/_SVNT_Export/");
+                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1_SVNT_Export/");
 
     // Replace any remaining '.' in the string with '_'.
     export_macro_ = regex::perl_s (export_macro_,
@@ -176,7 +176,7 @@ ServantGenerator::configure_stream (string const& suffix_option,
                                         default_suffix);
     string file_expr =
       cl_.get_value (regex_option,
-                     "/(\\.(idl|cidl|cdl))?$/" + file_suffix + "/");
+                     "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + file_suffix + "/");
 
     string file_name = regex::perl_s (file_name_, file_expr);
 
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 58b73386c0f..795fd3dfd5b 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -3,8 +3,16 @@
 // cvs-id    : $Id$
 
 #include "ServantHeaderGenerator.hpp"
-#include "TypeNameEmitter.hpp"
+#include "CorbaTypeNameEmitters.hpp"
+#include "UtilityTypeNameEmitters.hpp"
+#include "AttributeHeaderEmitters.hpp"
+#include "OperationHeaderEmitters.hpp"
+#include "ParameterEmitter_T.hpp"
+#include "CompositionEmitter.hpp"
+#include "ModuleEmitter.hpp"
+#include "InterfaceEmitter.hpp"
 #include "Literals.hpp"
+#include "Upcase.hpp"
 
 #include <ostream>
 
@@ -17,475 +25,8 @@ using namespace StringLiterals;
 using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 
-using std::string;
-
-namespace
-{
-  // On some platforms toupper can be something other than a
-  // function.
-  int
-  upcase (int c)
-  {
-    return std::toupper (c);
-  }
-}
-
 namespace
 {
-  class Context
-  {
-  public:
-    Context (std::ostream& os,
-             string export_macro)
-        : os_ (os),
-          export_macro_ (export_macro)
-    {
-    }
-
-  std::ostream&
-  os ()
-  {
-    return os_;
-  }
-
-  string
-  export_macro ()
-  {
-    return export_macro_;
-  }
-
-  private:
-    std::ostream& os_;
-    string export_macro_;
-  };
-
-  class EmitterBase
-  {
-  public:
-    EmitterBase (Context& c)
-      : ctx (c),
-        os (ctx.os ())
-    {
-    }
-
-  protected:
-    Context& ctx;
-    std::ostream& os;
-  };
-
-  struct ModuleEmitter : Traversal::Module, EmitterBase
-  {
-    ModuleEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << "namespace " << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-
-  struct OperationEmitter : Traversal::Operation, EmitterBase
-  {
-    OperationEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    virtual void
-    pre (Type&)
-    {
-      os << "virtual ";
-    }
-
-    virtual void
-    name (Type& o)
-    {
-      os << endl << o.name ();
-    }
-
-    virtual void
-    receives_pre (Type&)
-    {
-      os << " (" << endl;
-    }
-
-    virtual void
-    receives_none (Type&)
-    {
-      os << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    receives_post (Type&)
-    {
-      os << endl << STRS[ENV_HDR] << ")" << endl;
-    }
-
-    virtual void
-    raises_pre (Type&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    raises_none (Type&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    raises_post (Type&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << ";" << endl << endl;
-    }
-
-    virtual void
-    comma (Type&)
-    {
-      os << "," << endl;
-    }
-  };
-
-  // For generating parameter names.
-  template <typename T>
-  struct ParameterEmitter : T
-  {
-    ParameterEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    name (typename T::Type& p)
-    {
-      os << " " << p.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic scoped typename emitter used by various other emitters.
-  struct TypeNameEmitter : Traversal::Type
-  {
-    TypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic local typename emitter used by various other emitters.
-  struct SimpleTypeNameEmitter : Traversal::Type
-  {
-    SimpleTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generate name of type's enclosing scope.
-  struct EnclosingTypeNameEmitter : Traversal::Type
-  {
-    EnclosingTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ().scope_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Emits typename minus the leading double colon.
-  struct StrippedTypeNameEmitter : Traversal::Type
-  {
-    StrippedTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      ScopedName scoped (t.scoped_name ());
-      os << Name (scoped.begin () + 1, scoped.end ());
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generates the set operation of a ReadWriteAttribute.
-  struct WriteAttributeEmitter : Traversal::ReadWriteAttribute,
-                                 EmitterBase
-  {
-    WriteAttributeEmitter (Context& c)
-      : EmitterBase (c),
-        write_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ())
-    {
-      write_belongs_.node_traverser (write_type_name_emitter_);
-
-      edge_traverser (set_raises_);
-      set_raises_.node_traverser (type_name_emitter_);
-    }
-
-    virtual void
-    pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "virtual void" << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << a.name () << " (" << endl;
-
-      Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-
-      os << " " << a.name () << endl
-         << STRS[ENV_HDR] << ")" << endl;
-    }
-
-    virtual void
-    get_raises (SemanticGraph::ReadWriteAttribute&)
-    {
-    }
-
-    virtual void
-    set_raises_none (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    set_raises_pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    set_raises_post (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    post (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << ";" << endl << endl;
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "," << endl;
-    }
-
-  private:
-    INArgTypeNameEmitter write_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
-    Traversal::Belongs write_belongs_;
-    Traversal::SetRaises set_raises_;
-  };
-
-  // Generates operations associated with attributes.
-  struct AttributeEmitter : Traversal::ReadAttribute,
-                            Traversal::ReadWriteAttribute,
-                            EmitterBase
-  {
-    AttributeEmitter (Context& c)
-      : EmitterBase (c),
-        read_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ())
-    {
-      read_belongs_.node_traverser (read_type_name_emitter_);
-
-      edge_traverser (get_raises_);
-      get_raises_.node_traverser (type_name_emitter_);
-    }
-
-    // ReadWriteAttribute
-    //
-    virtual void
-    pre (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << "virtual ";
-
-      Traversal::ReadWriteAttribute::belongs (a, read_belongs_);
-
-      os << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << a.name () << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    get_raises_none (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    get_raises_pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    get_raises_post (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    set_raises (SemanticGraph::ReadWriteAttribute&)
-    {
-    }
-
-    virtual void
-    post (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << ";" << endl << endl;
-
-      WriteAttributeEmitter write_attribute_emitter (ctx);
-      write_attribute_emitter.traverse (a);
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "," << endl;
-    }
-
-    // ReadAttribute
-    //
-    virtual void
-    pre (SemanticGraph::ReadAttribute& a)
-    {
-      os << "virtual ";
-
-      Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-      os << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::ReadAttribute& a)
-    {
-      os << a.name () << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl;
-    }
-
-    virtual void
-    get_raises_none (SemanticGraph::ReadAttribute&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-
-    virtual void
-    get_raises_pre (SemanticGraph::ReadAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-
-    virtual void
-    get_raises_post (SemanticGraph::ReadAttribute&)
-    {
-      os << "))";
-    }
-
-    virtual void
-    set_raises (SemanticGraph::ReadAttribute&)
-    {
-    }
-
-    virtual void
-    post (SemanticGraph::ReadAttribute&)
-    {
-      os << ";" << endl << endl;
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadAttribute&)
-    {
-      os << "," << endl;
-    }
-
-  private:
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
-    Traversal::Belongs read_belongs_;
-    Traversal::GetRaises get_raises_;
-  };
-
-  struct InterfaceEmitter : Traversal::Interface,
-                            EmitterBase
-  {
-    InterfaceEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    bool
-    add (Interface& i)
-    {
-      return interfaces_.insert (&i).second;
-    }
-
-    virtual void
-    traverse (Interface& i)
-    {
-      if (add (i))
-      {
-        Traversal::Interface::traverse (i);
-      }
-    }
-
-  private:
-    std::set<Interface*> interfaces_;
-  };
-
   struct FacetEmitter : Traversal::UnconstrainedInterface,
                         EmitterBase
   {
@@ -522,7 +63,7 @@ namespace
         interface_emitter.edge_traverser (inherits_);
 
         // Works for both read/write and readonly attributes.
-        AttributeEmitter attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines_.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -536,15 +77,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -553,9 +94,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -569,7 +110,6 @@ namespace
          << "_get_component (" << endl
          << STRS[ENV_SNGL_HDR] << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl
-         << endl
          << "protected:" << endl
          << "// Facet executor." << endl
          << i.scoped_name ().scope_name ()<< "::CCM_" << i.name ()
@@ -602,7 +142,7 @@ namespace
     {
       PortsEmitterPublic (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -672,7 +212,7 @@ namespace
     {
       PortsEmitterProtected (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -687,9 +227,9 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl << endl;
+           << STRS[EXCP_AC] << "));" << endl;
 
         os << "virtual ";
 
@@ -698,9 +238,9 @@ namespace
         os << "Consumer_ptr" << endl
            << "disconnect_" << e.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl << endl;
+           << STRS[EXCP_NC] << "));" << endl;
       }
 
       virtual void
@@ -713,10 +253,10 @@ namespace
 
         os << "_ptr" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual ";
 
@@ -725,9 +265,9 @@ namespace
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl << endl;
+           << STRS[EXCP_NC] << "));" << endl;
       }
 
       virtual void
@@ -740,10 +280,10 @@ namespace
 
         os << "_ptr" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual ";
 
@@ -753,9 +293,9 @@ namespace
            << "disconnect_" << u.name () << " (" << endl
            << "::Components::Cookie * ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
       }
 
       virtual void
@@ -768,18 +308,18 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl << endl;
+           << STRS[EXCP_ECL] << "));" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl << endl;
+           << STRS[EXCP_ECL] << "));" << endl;
 
         os << "virtual ";
 
@@ -789,13 +329,13 @@ namespace
            << "unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -807,7 +347,7 @@ namespace
     {
       PortsEmitterMembers (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -819,7 +359,7 @@ namespace
 
         os << "Consumer_var" << endl
            << "ciao_emits_" << e.name () << "_consumer_;"
-           << endl << endl;
+           << endl;
       }
 
       virtual void
@@ -830,7 +370,7 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_var" << endl
-           << "ciao_uses_" << u.name () << "_;" << endl << endl;
+           << "ciao_uses_" << u.name () << "_;" << endl;
      }
 
       virtual void
@@ -842,7 +382,7 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_var>" << endl
-           << "ciao_uses_" << u.name () << "_;" << endl << endl;
+           << "ciao_uses_" << u.name () << "_;" << endl;
      }
 
       virtual void
@@ -854,16 +394,16 @@ namespace
 
         os << "Consumer_var>" << endl
            << "ciao_publishes_" << p.name () << "_map_;"
-           << endl << endl;
+           << endl;
 
         os << "ACE_Active_Map_Manager<" << endl
            << STRS[COMP_ECB] << "_var>" << endl
            << "ciao_publishes_" << p.name () << "_generic_map_;"
-           << endl << endl;
+           << endl;
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1063,9 +603,9 @@ namespace
     {
       PortsEmitterPublic (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          stripped_type_name_emitter_ (c.os ())
+          type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
+          stripped_type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -1082,7 +622,7 @@ namespace
         os << "_ptr" << endl
            << "provide_" << p.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1095,10 +635,10 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual ";
 
@@ -1107,9 +647,9 @@ namespace
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl << endl;
+           << STRS[EXCP_NC] << "));" << endl;
 
         os << "virtual ";
 
@@ -1118,7 +658,7 @@ namespace
         os << "_ptr" << endl
            << "get_connection_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1131,10 +671,10 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual ";
 
@@ -1144,14 +684,14 @@ namespace
            << "disconnect_" << u.name () << " (" << endl
            << "::Components::Cookie * ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1181,18 +721,15 @@ namespace
            << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
-           << "_Context_ptr c);" << endl << endl;
+           << "_Context_ptr c);" << endl;
 
         os << "virtual ~";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
         os << "Consumer_"
-           << c.name () << "_Servant (void);" << endl << endl;
+           << c.name () << "_Servant (void);" << endl;
 
-        // @@@ (JP) May need to generate this for the eventtype's ancestors
-        // as well (the spec is vague on this point). If so, we need the
-        // CIDL compiler to support valuetype/eventtype inheritance.
         os << "virtual void" << endl
            << "push_";
 
@@ -1204,39 +741,39 @@ namespace
 
         os << " *evt" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "virtual void" << endl
-           << "push_event (::Components::EventBase *ev" << endl
+           << "push_event ( ::Components::EventBase *ev" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl << endl;
+           << STRS[EXCP_BET] << "));" << endl;
 
         os << "// CIAO-specific in " << STRS[COMP_ECB] << "." << endl
            << "virtual CORBA::Boolean" << endl
            << "ciao_is_substitutable (" << endl
            << "const char *event_repo_id" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "// Get component implementation." << endl
            << "virtual CORBA::Object_ptr" << endl
            << "_get_component (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "protected:" << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
            << "_var" << endl
-           << "executor_;" << endl << endl;
+           << "executor_;" << endl;
 
         os << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
            << "_Context_var" << endl
-           << "ctx_;" << endl << endl;
+           << "ctx_;" << endl;
 
         os << "};";
 
@@ -1247,7 +784,7 @@ namespace
         os << "Consumer_ptr" << endl
            << "get_consumer_" << c.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1260,9 +797,9 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl << endl;
+           << STRS[EXCP_AC] << "));" << endl;
 
         os << "virtual ";
 
@@ -1271,9 +808,9 @@ namespace
         os << "Consumer_ptr" << endl
            << "disconnect_" << e.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl << endl;
+           << STRS[EXCP_NC] << "));" << endl;
       }
 
       virtual void
@@ -1286,18 +823,18 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl << endl;
+           << STRS[EXCP_ECL] << "));" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl << endl;
+           << STRS[EXCP_ECL] << "));" << endl;
 
         os << "virtual ";
 
@@ -1307,13 +844,13 @@ namespace
            << "unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl << endl;
+           << STRS[EXCP_IC] << "));" << endl;
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       StrippedTypeNameEmitter stripped_type_name_emitter_;
       Traversal::Belongs belongs_;
@@ -1327,7 +864,7 @@ namespace
     {
       PortsEmitterProtected (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1338,7 +875,7 @@ namespace
         Traversal::ProviderData::belongs (p, belongs_);
 
         os << "_var" << endl
-           << "provide_" << p.name () << "_;" << endl << endl;
+           << "provide_" << p.name () << "_;" << endl;
       }
 
       virtual void
@@ -1347,11 +884,11 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer_var" << endl
-           << "consumes_" << c.name () << "_;" << endl << endl;
+           << "consumes_" << c.name () << "_;" << endl;
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1365,9 +902,9 @@ namespace
     {
       PortsEmitterPrivate (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          stripped_type_name_emitter_ (c.os ())
+          type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
+          stripped_type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -1380,7 +917,7 @@ namespace
         os << "::CORBA::Object_ptr" << endl
            << "provide_" << p.name () << "_i (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1399,7 +936,7 @@ namespace
         os << "::Components::EventConsumerBase_ptr" << endl
            << "get_consumer_" << c.name () << "_i (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl << endl;
+           << STRS[EXCP_SNGL] << ";" << endl;
       }
 
       virtual void
@@ -1413,7 +950,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       StrippedTypeNameEmitter stripped_type_name_emitter_;
       Traversal::Belongs belongs_;
@@ -1449,7 +986,7 @@ namespace
          << "    " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
          << "    " << t.name () << "_Context" << endl
-         << "  > comp_svnt_base;" << endl << endl;
+         << "  > comp_svnt_base;" << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
@@ -1457,15 +994,14 @@ namespace
          << "::Components::CCMHome_ptr h," << endl
          << "const char *ins_name," << endl
          << "::CIAO::Home_Servant_Impl_Base *hs," << endl
-         << "::CIAO::Session_Container *c);" << endl << endl;
+         << "::CIAO::Session_Container *c);" << endl;
 
-      os << "virtual ~" << t.name () << "_Servant (void);"
-         << endl << endl;
+      os << "virtual ~" << t.name () << "_Servant (void);" << endl;
 
       os << "virtual void" << endl
          << "set_attributes (" << endl
          << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC] << ");" << endl << endl;
+         << STRS[ENV_SRC] << ");" << endl;
 
       os << "// Supported operations." << endl << endl;
 
@@ -1488,7 +1024,7 @@ namespace
         interface_emitter.edge_traverser (interface_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeEmitter attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -1502,15 +1038,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1519,9 +1055,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1563,7 +1099,7 @@ namespace
         component_emitter.edge_traverser (component_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeEmitter attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         component_emitter.traverse (t);
@@ -1576,24 +1112,29 @@ namespace
          << "const char *name," << endl
          << "CORBA::Object_ptr connection" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl << endl;
+         << STRS[EXCP_ECL] << "));" << endl;
 
       os << "virtual CORBA::Object_ptr" << endl
          << "disconnect (" << endl
          << "const char *name," << endl
          << STRS[COMP_CK] << " *ck" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl << endl;
+         << STRS[EXCP_NC] << "));" << endl;
+
+      os << "virtual " << STRS[COMP_RD] << " *" << endl
+         << "get_all_receptacles (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
 
       os << "// Operations for Events interface." << endl << endl;
 
@@ -1602,40 +1143,59 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_ECB] << "_ptr subscriber" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl << endl;
+         << STRS[EXCP_ECL] << "));" << endl;
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
          << "unsubscribe (" << endl
          << "const char *publisher_name," << endl
          << STRS[COMP_CK] << " *ck" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl << endl;
+         << STRS[EXCP_IC] << "));" << endl;
 
       os << "virtual void" << endl
          << "connect_consumer (" << endl
          << "const char *emitter_name," << endl
          << STRS[COMP_ECB] << "_ptr consumer" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl << endl;
+         << STRS[EXCP_IC] << "));" << endl;
 
-      os << "// CIAO specific operations on the servant " << endl
+      os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
+         << "disconnect_consumer (" << endl
+         << "const char *source_name" << endl
+         << STRS[ENV_HDR] << ")" << endl
+         << STRS[EXCP_START] << " "
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "," << endl
+         << STRS[EXCP_NC] << "));" << endl;
+
+      os << "virtual " << STRS[COMP_PD] << " *" << endl
+         << "get_all_publishers (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
+
+      os << "virtual " << STRS[COMP_ED] << " *" << endl
+         << "get_all_emitters (" << endl
+         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[EXCP_SNGL] << ";" << endl;
+
+      os << "// CIAO specific operations on the servant. " << endl
          << "CORBA::Object_ptr" << endl
          << "get_facet_executor (" << endl
          << "const char *name" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS]<< "));" << endl << endl;
+         << STRS[EXCP_START] << " "
+         << STRS[EXCP_SYS]<< "));" << endl;
 
       os << "private:" << endl << endl;
 
@@ -1656,13 +1216,13 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "const char *ins_name_;" << endl << endl;
+      os << "const char *ins_name_;" << endl;
 
       os << "private:" << endl << endl
          << "void" << endl
          << "populate_port_tables (" << endl
          << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
+         << STRS[EXCP_SNGL] << ";" << endl;
 
       // Generate private operations for ports.
       {
@@ -1695,211 +1255,15 @@ namespace
     HomeEmitter (Context& c, CommandLine const& cl)
       : EmitterBase (c),
         cl_ (cl),
-        type_name_emitter_ (c.os ()),
-        simple_type_name_emitter_ (c.os ()),
-        enclosing_type_name_emitter_ (c.os ())
+        type_name_emitter_ (c),
+        simple_type_name_emitter_ (c),
+        enclosing_type_name_emitter_ (c)
     {
       manages_.node_traverser (type_name_emitter_);
       simple_manages_.node_traverser (simple_type_name_emitter_);
       enclosing_manages_.node_traverser (enclosing_type_name_emitter_);
     }
 
-  // Nested classes used by this emitter.
-  private:
-    // HomeFactory and HomeFinder are tied to Operation in
-    // the front end. Since we want to treat them differently
-    // than regular operations in a home (we want to generate
-    // base class factory operations returning the base component,
-    // for example), we use this class for regular home operations
-    // that overrides HomeFactory and HomeFinder traversals
-    // to do nothing.
-    struct HomeOperationEmitter : OperationEmitter,
-                                  Traversal::HomeFactory,
-                                  Traversal::HomeFinder
-    {
-      HomeOperationEmitter (Context& c)
-        : OperationEmitter (c)
-      {}
-
-      virtual void
-      traverse (SemanticGraph::HomeFactory&)
-      {
-      }
-
-      virtual void
-      traverse (SemanticGraph::HomeFinder&)
-      {
-      }
-    };
-
-    struct FactoryOperationEmitter : Traversal::HomeFactory,
-                                     EmitterBase
-    {
-      FactoryOperationEmitter (Context& c)
-        : EmitterBase (c)
-      {}
-
-      virtual void
-      pre (SemanticGraph::HomeFactory&)
-      {
-        os << "virtual ";
-      }
-
-      virtual void
-      returns (SemanticGraph::HomeFactory& t)
-      {
-        ReturnTypeNameEmitter returns_emitter (os);
-        Traversal::Returns returns_;
-        returns_.node_traverser (returns_emitter);
-
-        Traversal::HomeFactory::returns (t, returns_);
-
-        os << endl;
-      }
-
-      virtual void
-      name (SemanticGraph::HomeFactory& t)
-      {
-        os << t.name ();
-      }
-
-      virtual void
-      receives_none (SemanticGraph::HomeFactory&)
-      {
-        os << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl;
-      }
-
-      virtual void
-      receives_pre (SemanticGraph::HomeFactory&)
-      {
-        os << " (" << endl;
-      }
-
-      virtual void
-      receives_post (SemanticGraph::HomeFactory&)
-      {
-        os << endl << STRS[ENV_HDR] << ")" << endl;
-      }
-
-      virtual void
-      raises_none (SemanticGraph::HomeFactory&)
-      {
-        os << STRS[EXCP_SNGL];
-      }
-
-      virtual void
-      raises_pre (SemanticGraph::HomeFactory&)
-      {
-        os << STRS[EXCP_START] << endl
-           << STRS[EXCP_SYS] << "," << endl;
-      }
-
-      virtual void
-      raises_post (SemanticGraph::HomeFactory&)
-      {
-        os << "))";
-      }
-
-      virtual void
-      post (SemanticGraph::HomeFactory&)
-      {
-        os << ";" << endl << endl;
-      }
-
-      virtual void
-      comma (SemanticGraph::HomeFactory&)
-      {
-        os << "," << endl;
-      }
-    };
-
-    struct FinderOperationEmitter : Traversal::HomeFinder,
-                                    EmitterBase
-    {
-      FinderOperationEmitter (Context& c)
-        : EmitterBase (c),
-          returns_emitter_ (c.os ())
-      {
-        returns_.node_traverser (returns_emitter_);
-      }
-
-      virtual void
-      pre (SemanticGraph::HomeFinder&)
-      {
-        os << "virtual ";
-      }
-
-      virtual void
-      returns (SemanticGraph::HomeFinder& t)
-      {
-        Traversal::HomeFinder::returns (t, returns_);
-
-        os << endl;
-      }
-
-      virtual void
-      name (SemanticGraph::HomeFinder& t)
-      {
-        os << t.name ();
-      }
-
-      virtual void
-      receives_none (SemanticGraph::HomeFinder&)
-      {
-        os << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl;
-      }
-
-      virtual void
-      receives_pre (SemanticGraph::HomeFinder&)
-      {
-        os << " (" << endl;
-      }
-
-      virtual void
-      receives_post (SemanticGraph::HomeFinder&)
-      {
-        os << endl << STRS[ENV_HDR] << ")" << endl;
-      }
-
-      virtual void
-      raises_none (SemanticGraph::HomeFinder&)
-      {
-        os << STRS[EXCP_SNGL];
-      }
-
-      virtual void
-      raises_pre (SemanticGraph::HomeFinder&)
-      {
-        os << STRS[EXCP_START] << endl
-           << STRS[EXCP_SYS] << "," << endl;
-      }
-
-      virtual void
-      raises_post (SemanticGraph::HomeFinder&)
-      {
-        os << "))";
-      }
-
-      virtual void
-      post (SemanticGraph::HomeFinder&)
-      {
-        os << ";" << endl << endl;
-      }
-
-      virtual void
-      comma (SemanticGraph::HomeFinder&)
-      {
-        os << "," << endl;
-      }
-
-    private:
-      ReturnTypeNameEmitter returns_emitter_;
-      Traversal::Returns returns_;
-    };
-
-  public:
     virtual void pre (Type& t)
     {
       os << "class " << ctx.export_macro () << " " << t.name ()
@@ -1995,19 +1359,18 @@ namespace
       Traversal::Home::manages (t, simple_manages_);
 
       os << "_Servant" << endl
-         << "  > home_svnt_base;" << endl << endl;
+         << "  > home_svnt_base;" << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
          << "const char *ins_name," << endl
-         << "::CIAO::Session_Container *c);" << endl << endl;
+         << "::CIAO::Session_Container *c);" << endl;
 
-      os << "virtual ~" << t.name () << "_Servant (void);"
-         << endl << endl;
+      os << "virtual ~" << t.name () << "_Servant (void);" << endl;
 
       // Generate home operations.
-      os << "// Home operations." << endl << endl;
+      os << "// Home operations." << endl;
 
       {
         Traversal::Home home_emitter;
@@ -2029,15 +1392,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -2046,9 +1409,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -2086,15 +1449,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -2103,9 +1466,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -2127,7 +1490,7 @@ namespace
         home_emitter.edge_traverser (home_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeEmitter attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         home_emitter.traverse (t);
@@ -2153,7 +1516,7 @@ namespace
         interface_emitter.edge_traverser (inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeEmitter attribute_emitter (ctx);
+        AttributeHeaderEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -2167,15 +1530,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -2184,9 +1547,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -2199,7 +1562,9 @@ namespace
 
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::PortableServer::Servant" << endl
-         << "create" << t.name () << "_Servant (" << endl
+         << "create"
+         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
+         << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "CIAO::Session_Container *c," << endl
          << "const char *ins_name" << endl
@@ -2208,7 +1573,7 @@ namespace
 
   private:
     CommandLine const& cl_;
-    TypeNameEmitter type_name_emitter_;
+    FullTypeNameEmitter type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     Traversal::Manages manages_;
@@ -2216,26 +1581,6 @@ namespace
     Traversal::Manages enclosing_manages_;
   };
 
-  struct CompositionEmitter : Traversal::Composition, EmitterBase
-  {
-    CompositionEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      os << STRS[CIDL_NS] << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
-
   struct IncludesEmitter : Traversal::QuoteIncludes,
                            Traversal::BracketIncludes,
                            EmitterBase
@@ -2250,7 +1595,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (qi.file ().string (),
-                           "/(\\.(idl|cidl|cdl))?$/S.h/")
+                           "/^(.+?)(\\.(idl|cidl|cdl))?$/$1S.h/")
          << "\"" << endl << endl;
     }
 
@@ -2259,7 +1604,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (bi.file ().string (),
-                           "/(\\.(idl|cidl|cdl))?$/S.h/")
+                           "/^(.+?)(\\.(idl|cidl|cdl))?$/$1S.h/")
          << "\""
          << endl;
     }
@@ -2306,7 +1651,9 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   string guard =
       "CIAO_GLUE_SESSION_"
       + regex::perl_s (uc_file_name,
-                       "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
+                       "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
+                       + uc_file_suffix
+                       + "/");
 
   // Replace any remaining '.' with '_'.
   guard = regex::perl_s (guard, "/\\./_/");
@@ -2327,8 +1674,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   // @@@ (JP) I guess it's a safe assumption that the tail of the
   // suffix will be .idl.
   string suffix = cl_.get_value ("lem-file-suffix", "E.idl");
-  suffix = regex::perl_s (suffix,
-                          "/(\\.idl)?$//");
+  suffix = regex::perl_s (suffix, "/^(.+?)(\\.idl)?$/$1/");
 
   // @@@ (JP) No way of knowing if the IDL compiler had command line
   // option(s) to change C.h and/or S.h. We could add command line options
@@ -2336,7 +1682,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   // they are in synch with the IDL compiler's options.
   os << "#include \""
      << regex::perl_s (file_name,
-                       "/(\\.(idl|cidl|cdl))?$/" + suffix + "C.h/")
+                       "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + suffix + "C.h/")
      << "\""
      << endl << endl;
 
@@ -2358,8 +1704,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
      << "#include \"ciao/"
      << (swapping ? "Swapping_Servant_Home_Impl_T.h"
                   : "Home_Servant_Impl_T.h")
-     << "\"" << endl
-     << "#include \"ace/Active_Map_Manager_T.h\"" << endl << endl;
+     << "\"" << endl << endl;
 }
 
 void
@@ -2367,7 +1712,7 @@ ServantHeaderEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_);
+  Context c (os, export_macro_, cl_);
 
   Traversal::TranslationUnit unit;
 
@@ -2474,7 +1819,9 @@ ServantHeaderEmitter::post (TranslationUnit&)
   string guard =
     "CIAO_GLUE_SESSION_"
     + regex::perl_s (uc_file_name,
-                     "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
+                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
+                     + uc_file_suffix
+                     + "/");
 
   guard = regex::perl_s (guard, "/\\./_/");
 
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
index 47fc1acf369..b81625b6b80 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
@@ -20,7 +20,7 @@ public:
                         CommandLine const& cl,
                         std::string export_macro,
                         fs::path const& file);
-                        
+
   virtual ~ServantHeaderEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 249d51308a2..3a48975c443 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -3,13 +3,19 @@
 // cvs-id    : $Id$
 
 #include "ServantSourceGenerator.hpp"
+#include "CorbaTypeNameEmitters.hpp"
+#include "UtilityTypeNameEmitters.hpp"
+#include "ParameterEmitter_T.hpp"
+#include "AttributeSourceEmitters_T.hpp"
+#include "CompositionEmitter.hpp"
+#include "ModuleEmitter.hpp"
+#include "InterfaceEmitter.hpp"
 #include "Literals.hpp"
-#include "TypeNameEmitter.hpp"
-
-#include "CCF/CodeGenerationKit/Regex.hpp"
 
 #include <ostream>
 
+#include "CCF/CodeGenerationKit/Regex.hpp"
+
 using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 using namespace StringLiterals;
@@ -18,137 +24,51 @@ using std::string;
 
 namespace
 {
-  class Context
-  {
-  public:
-    Context (std::ostream& os,
-             string export_macro,
-             CommandLine const& cl)
-        : os_ (os),
-          export_macro_ (export_macro),
-          cl_ (cl)
-    {
-    }
-
-  std::ostream&
-  os ()
-  {
-    return os_;
-  }
-
-  string
-  export_macro ()
-  {
-    return export_macro_;
-  }
-
-  CommandLine const&
-  cl ()
-  {
-    return cl_;
-  }
-  
-  string
-  composition_name ()
-  {
-    return composition_name_;
-  }
-  
-  void
-  composition_name (const string& name)
-  {
-    composition_name_ = name;
-  }
-
-  private:
-    std::ostream& os_;
-    string export_macro_;
-    CommandLine const& cl_;
-    string composition_name_;
-  };
-
-  class EmitterBase
+  struct RepoIdEmitter : Traversal::Type,
+                         EmitterBase
   {
-  public:
-    EmitterBase (Context& c)
-      : ctx (c),
-        os (ctx.os ())
+    RepoIdEmitter (Context& c)
+      : EmitterBase (c)
     {
     }
 
-  protected:
-    Context& ctx;
-    std::ostream& os;
-  };
-
-  struct RepoIdEmitter : Traversal::Type
-  {
-    RepoIdEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
     virtual void
     traverse (SemanticGraph::Type& t)
     {
       os << "\"" << t.context ().get<string> (STRS[REPO_ID]) << "\"";
     }
-
-  private:
-    std::ostream& os;
   };
-  
-  struct ModuleEmitter : Traversal::Module, EmitterBase
+
+  struct ConsumerRepoIdEmitter : Traversal::Type,
+                                 EmitterBase
   {
-    ModuleEmitter (Context& c)
+    ConsumerRepoIdEmitter (Context& c)
       : EmitterBase (c)
     {
     }
 
     virtual void
-    pre (Type& t)
-    {
-      os << "namespace " << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
+    traverse (SemanticGraph::Type& t)
     {
-      os << "}";
+      string holder (t.context ().get<string> (STRS[REPO_ID]));
+      os << "\"" << holder.substr (0, holder.rfind (':'))
+         << "Consumer:1.0\"";
     }
   };
 
-  struct FlatNameEmitter : Traversal::Type
+  struct FlatNameEmitter : Traversal::Type,
+                           EmitterBase
   {
-    FlatNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-    
-    virtual void
-    traverse (SemanticGraph::Type& t)
+    FlatNameEmitter (Context& c)
+      : EmitterBase (c)
     {
-      os << regex::perl_s (t.scoped_name ().str (), "/::/_/");
     }
 
-  private:
-    std::ostream& os;
-  };
-
-  struct ConsumerRepoIdEmitter : Traversal::Type
-  {
-    ConsumerRepoIdEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
     virtual void
     traverse (SemanticGraph::Type& t)
     {
-      string holder (t.context ().get<string> (STRS[REPO_ID]));
-      os << "\"" << holder.substr (0, holder.rfind (':'))
-         << "Consumer:1.0\"";
+      os << regex::perl_s (t.scoped_name ().str (), "/::/_/");
     }
-
-  private:
-    std::ostream& os;
   };
 
   struct OperationExecEmitter : Traversal::Operation,
@@ -224,24 +144,6 @@ namespace
     std::ostream& os;
   };
 
-  // For generating parameter names.
-  template <typename T>
-  struct ParameterEmitter : T
-  {
-    ParameterEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    name (typename T::Type& p)
-    {
-      os << " " << p.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
   // For generating parameter names in operation delegation.
   template <typename T>
   struct ParameterExecEmitter : T
@@ -267,26 +169,26 @@ namespace
                       T& scope)
       : EmitterBase (c),
         scope_ (scope),
-        ace_check_return_emitter_ (c.os ())
+        ace_check_return_emitter_ (c)
     {
       ace_check_returns_.node_traverser (ace_check_return_emitter_);
     }
-    
+
     // Overridden by facet and home operation emitters to do nothing.
     virtual void
     gen_swap_related (Type& o)
     {
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
-      
+
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-        
-        Traversal::Operation::returns (o, ace_check_returns_);
-        
-        os << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
+
+          Traversal::Operation::returns (o, ace_check_returns_);
+
+          os << endl;
+        }
     }
 
     virtual void
@@ -318,7 +220,7 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << endl
+      os << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -339,7 +241,7 @@ namespace
     {
       os << "{";
 
-      this->gen_swap_related (o);      
+      this->gen_swap_related (o);
 
       OperationExecEmitter operation_emitter (ctx);
 
@@ -371,457 +273,6 @@ namespace
     Traversal::Returns ace_check_returns_;
   };
 
-  // Generic scoped typename emitter used by various other emitters.
-  struct TypeNameEmitter : Traversal::Type
-  {
-    TypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generic local typename emitter used by various other emitters.
-  struct SimpleTypeNameEmitter : Traversal::Type
-  {
-    SimpleTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  // Generate name of type's enclosing scope.
-  struct EnclosingTypeNameEmitter : Traversal::Type
-  {
-    EnclosingTypeNameEmitter (std::ostream& os_)
-      : os (os_)
-    {}
-
-    virtual void
-    traverse (SemanticGraph::Type& t)
-    {
-      os << t.scoped_name ().scope_name ();
-    }
-
-  private:
-    std::ostream& os;
-  };
-
-  struct InterfaceEmitter : Traversal::Interface,
-                            EmitterBase
-  {
-    InterfaceEmitter (Context& c)
-      : EmitterBase (c)
-    {}
-
-    bool
-    add (Interface& i)
-    {
-      return interfaces_.insert (&i).second;
-    }
-
-    virtual void
-    traverse (Interface& i)
-    {
-      if (add (i))
-      {
-        Traversal::Interface::traverse (i);
-      }
-    }
-
-  private:
-    std::set<Interface*> interfaces_;
-  };
-
-  // Generates the set operation of a ReadWriteAttribute.
-  template <typename T>
-  struct WriteAttributeEmitter : Traversal::ReadWriteAttribute,
-                                 EmitterBase
-  {
-    WriteAttributeEmitter (Context& c, T& scope, bool swapping)
-      : EmitterBase (c),
-        scope_ (scope),
-        write_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ()),
-        swapping_ (swapping)
-    {
-      write_belongs_.node_traverser (write_type_name_emitter_);
-      
-      edge_traverser (set_raises_);      
-      set_raises_.node_traverser (type_name_emitter_);
-    }
-    
-    virtual void
-    gen_swapping_set ()
-    {
-      os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_CHECK;" << endl;
-    }
-    
-    virtual void
-    pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "void" << endl;
-    }
-    
-    virtual void
-    name (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << scope_.name () << "_Servant::" << a.name () << " (" << endl;
- 
-      Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-      
-      os << " " << a.name () << endl
-         << STRS[ENV_SRC] << ")" << endl;
-    }
-    
-    virtual void
-    get_raises (SemanticGraph::ReadWriteAttribute&)
-    {
-    }
-    
-    virtual void
-    set_raises_none (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_SNGL];
-    }
-    
-    virtual void
-    set_raises_pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-    
-    virtual void
-    set_raises_post (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "))" << endl;
-    }
-    
-    virtual void
-    post (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << "{";
-    
-      if (swapping_)
-      {
-        this->gen_swapping_set ();
-      }
-               
-      os << "this->executor_->" << a.name () << " (" << endl
-         << a.name () << endl
-         << STRS[ENV_ARG] << ");" << endl
-         << "}";
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "," << endl;
-    }
-    
-  protected:
-    T& scope_;
-    Traversal::Belongs write_belongs_;
-
-  private:
-    INArgTypeNameEmitter write_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
-    Traversal::SetRaises set_raises_;
-    bool swapping_;
-  };
-
-  // Generates operations associated with attributes.
-  template <typename T>
-  struct AttributeEmitter : Traversal::ReadAttribute,
-                            Traversal::ReadWriteAttribute,
-                            EmitterBase
-  {
-    AttributeEmitter (Context& c, T& scope)
-      : EmitterBase (c),
-        scope_ (scope),
-        read_type_name_emitter_ (c.os ()),
-        type_name_emitter_ (c.os ()),
-        ace_check_return_emitter_ (c.os ())
-    {
-      read_belongs_.node_traverser (read_type_name_emitter_);
-      ace_check_return_belongs_.node_traverser (ace_check_return_emitter_);
-      
-      edge_traverser (get_raises_);      
-      get_raises_.node_traverser (type_name_emitter_);
-    }
-    
-    // ReadWriteAttribute
-    //
-
-    // Overridden by facet attribute emitter.    
-    virtual void
-    gen_swapping_get (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-
-      Traversal::ReadWriteAttribute::belongs (a, ace_check_return_belongs_);
-      
-      os << endl;
-    }
-    
-    // Overridden by facet attribute emitter.    
-    virtual void
-    gen_write_operation (SemanticGraph::ReadWriteAttribute& a,
-                         bool swapping)
-    {
-      WriteAttributeEmitter<T> write_attribute_emitter (ctx,
-                                                        scope_,
-                                                        swapping);
-      write_attribute_emitter.traverse (a);
-    }
-    
-    virtual void
-    pre (SemanticGraph::ReadWriteAttribute& a)
-    {
-      Traversal::ReadWriteAttribute::belongs (a, read_belongs_);
-
-      os << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << scope_.name () << "_Servant::" << a.name () << " (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl;
-    }
-    
-    virtual void
-    get_raises_none (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_SNGL] << endl;
-    }
-    
-    virtual void
-    get_raises_pre (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-    
-    virtual void
-    get_raises_post (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "))" << endl;
-    }
-    
-    virtual void
-    set_raises (SemanticGraph::ReadWriteAttribute&)
-    {
-    }
-
-    virtual void
-    post (SemanticGraph::ReadWriteAttribute& a)
-    {
-      os << "{";
-         
-      string swap_option = ctx.cl ().get_value ("custom-container", "");
-      bool swapping = (swap_option == "upgradeable");
-      
-      if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
-               
-      os << "return this->executor_->" << a.name () << " (" << endl
-         << STRS[ENV_SNGL_ARG] << ");" << endl
-         << "}";
-
-      this->gen_write_operation (a, swapping);
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadWriteAttribute&)
-    {
-      os << "," << endl;
-    }
-    
-    // ReadAttribute
-    //
-
-    // Overridden by facet attribute emitter to do nothing.    
-    virtual void
-    gen_swapping_get (SemanticGraph::ReadAttribute& a)
-    {
-      os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-
-      Traversal::ReadAttribute::belongs (a, ace_check_return_belongs_);
-      
-      os << endl;
-    }
-
-    virtual void
-    pre (SemanticGraph::ReadAttribute& a)
-    {
-      Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-      os << endl;
-    }
-
-    virtual void
-    name (SemanticGraph::ReadAttribute& a)
-    {
-      os << scope_.name () << "_Servant::" << a.name () << " (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl;
-    }
-    
-    virtual void
-    get_raises_none (SemanticGraph::ReadAttribute&)
-    {
-      os << STRS[EXCP_SNGL] << endl;
-    }
-    
-    virtual void
-    get_raises_pre (SemanticGraph::ReadAttribute&)
-    {
-      os << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl;
-    }
-    
-    virtual void
-    get_raises_post (SemanticGraph::ReadAttribute&)
-    {
-      os << "))" << endl;
-    }
-    
-    virtual void
-    set_raises (SemanticGraph::ReadAttribute&)
-    {
-    }
-
-    virtual void
-    post (SemanticGraph::ReadAttribute& a)
-    {
-      os << "{";
-         
-      string swap_option = ctx.cl ().get_value ("custom-container", "");
-      bool swapping = (swap_option == "upgradeable");
-      
-      if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
-               
-      os << "return this->executor_->" << a.name () << " (" << endl
-         << STRS[ENV_SNGL_ARG] << ");" << endl
-         << "}";
-    }
-
-    virtual void
-    comma (SemanticGraph::ReadAttribute&)
-    {
-      os << "," << endl;
-    }
-
-  protected:
-    T& scope_;
-
-  private:
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    TypeNameEmitter type_name_emitter_;
-    AceCheckReturnEmitter ace_check_return_emitter_;
-    Traversal::Belongs read_belongs_;
-    Traversal::Belongs ace_check_return_belongs_;
-    Traversal::GetRaises get_raises_;
-  };
-
-  // Generates operations associated with readonly attributes.
-  // @@@ (JP) Need to support exceptions.
-  template <typename T>
-  struct ReadOnlyAttributeEmitter : Traversal::ReadAttribute,
-                                    EmitterBase
-  {
-    ReadOnlyAttributeEmitter (Context& c,
-                              T& scope)
-      : EmitterBase (c),
-        scope_ (scope),
-        read_type_name_emitter_ (c.os ()),
-        ace_check_return_emitter_ (c.os ())
-    {
-      read_belongs_.node_traverser (read_type_name_emitter_);
-      ace_check_return_belongs_.node_traverser (ace_check_return_emitter_);
-    }
-    
-    // Overridden by facet attribute emitter to do nothing.
-
-    virtual void
-    gen_swapping_get (SemanticGraph::ReadAttribute& a)
-    {
-      os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-
-      Traversal::ReadAttribute::belongs (a, ace_check_return_belongs_);
-      
-      os << endl;
-    }
-    
-    virtual void
-    name (SemanticGraph::ReadAttribute& a)
-    {
-      os << scope_.name () << "_Servant::" << a.name ();
-    }
-
-    virtual void
-    traverse (SemanticGraph::ReadAttribute& a)
-    {
-      // Does nothing here, overridden for facet attributes.
-      this->pre (a);
-
-      Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-      os << endl;
-
-      // Overridden for facet attributes.
-      this->name (a);
-
-      os << " (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{";
-         
-      string swap_option = ctx.cl ().get_value ("custom-container", "");
-      bool swapping = (swap_option == "upgradeable");
-      
-      if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
-               
-      os << "return this->executor_->" << a.name () << " (" << endl
-         << STRS[ENV_SNGL_ARG] << ");" << endl
-         << "}";
-    }
-
-  protected:
-    T& scope_;
-
-  private:
-    ReturnTypeNameEmitter read_type_name_emitter_;
-    AceCheckReturnEmitter ace_check_return_emitter_;
-    Traversal::Belongs read_belongs_;
-    Traversal::Belongs ace_check_return_belongs_;
-  };
-
   struct FacetEmitter : Traversal::UnconstrainedInterface,
                         EmitterBase
   {
@@ -844,7 +295,7 @@ namespace
       gen_swap_related (Type&)
       {
       }
-      
+
       virtual void
       pre (Type&)
       {
@@ -858,22 +309,25 @@ namespace
            << scope_.name () << "_Servant_T<T>::" << o.name ();
       }
     };
-    
+
     struct FacetWriteAttributeEmitter
-      : WriteAttributeEmitter<SemanticGraph::Interface>
+      : WriteAttributeSourceEmitter<SemanticGraph::Interface>
     {
       // Since swapping does not affect facets, we can just pass 'false'
       // to the base class constructor, and not override gen_swapping_set().
       FacetWriteAttributeEmitter (Context& c, SemanticGraph::Interface& i)
-        : WriteAttributeEmitter<SemanticGraph::Interface> (c, i, false)
+        : WriteAttributeSourceEmitter<SemanticGraph::Interface> (c,
+                                                                 i,
+                                                                 false,
+                                                                 false)
       {}
-    
+
       virtual void
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         os << "template <typename T>" << endl;
-        
-        WriteAttributeEmitter<SemanticGraph::Interface>::pre (a);
+
+        WriteAttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -881,27 +335,27 @@ namespace
       {
         os << scope_.name () << "_Servant_T<T>::"
            << a.name () << " (" << endl;
-   
+
         Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-        
+
         os << " " << a.name () << endl
            << STRS[ENV_SRC] << ")" << endl;
       }
     };
 
     struct FacetAttributeEmitter
-      : AttributeEmitter<SemanticGraph::Interface>
+      : AttributeSourceEmitter<SemanticGraph::Interface>
     {
       FacetAttributeEmitter (Context& c,
                              SemanticGraph::Interface& i)
-        : AttributeEmitter<SemanticGraph::Interface> (c, i)
+        : AttributeSourceEmitter<SemanticGraph::Interface> (c, i)
       {}
-      
+
       // ReadWriteAttribute
       //
-      
+
       // No-op override because we don't want to generate any swapping
-      // code for facets.      
+      // code for facets.
       virtual void gen_swapping_get (SemanticGraph::ReadWriteAttribute&)
       {
       }
@@ -913,13 +367,13 @@ namespace
         FacetWriteAttributeEmitter write_attribute_emitter (ctx, scope_);
         write_attribute_emitter.traverse (a);
       }
-    
+
       virtual void
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         os << "template <typename T>" << endl;
-        
-        AttributeEmitter<SemanticGraph::Interface>::pre (a);
+
+        AttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -932,19 +386,19 @@ namespace
 
       // ReadAttribute
       //
-      
+
       // No-op override because we don't want to generate any swapping
-      // code for facets.      
+      // code for facets.
       virtual void gen_swapping_get (SemanticGraph::ReadAttribute&)
       {
       }
-    
+
       virtual void
       pre (SemanticGraph::ReadAttribute& a)
       {
         os << "template <typename T>" << endl;
-        
-        AttributeEmitter<SemanticGraph::Interface>::pre (a);
+
+        AttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -967,9 +421,9 @@ namespace
          << i.scoped_name ().scope_name () << "::CCM_" << i.name ()
          << "_ptr executor," << endl
          << "::Components::CCMContext_ptr c)" << endl
-         << ": executor_ (" << i.scoped_name ().scope_name () << "::CCM_"
+         << "  : executor_ ( " << i.scoped_name ().scope_name () << "::CCM_"
          << i.name () << "::_duplicate (executor))," << endl
-         << "ctx_ (::Components::CCMContext::_duplicate (c))" << endl
+         << "    ctx_ ( ::Components::CCMContext::_duplicate (c))" << endl
          << "{"
          << "}";
 
@@ -1001,15 +455,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1018,9 +472,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1030,32 +484,32 @@ namespace
       }
 
       os << "template <typename T>" << endl
-         << "CORBA::Object_ptr" << endl
+         << "::CORBA::Object_ptr" << endl
          << i.name () << "_Servant_T<T>::_get_component (" << endl
          << STRS[ENV_SNGL_SRC] << ")" << endl
-         << "ACE_THROW_SPEC ((CORBA::SystemException))" << endl
+         << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[COMP_SC] << "_var sc =" << endl
-         << STRS[COMP_SC] << "::_narrow (" << endl
-         << "this->ctx_.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl
-         << "if (! CORBA::is_nil (sc.in ()))" << endl
+         << "  " << STRS[COMP_SC] << "::_narrow (" << endl
+         << "  this->ctx_.in ()" << endl
+         << "  " << STRS[ENV_ARG] << ");"
+         << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+         << "if (! ::CORBA::is_nil (sc.in ()))" << endl
          << "{"
          << "return sc->get_CCM_object (" << endl
-         << STRS[ENV_SNGL_ARG] << ");" << endl
+         << STRS[ENV_SNGL_ARG] << ");"
          << "}"
          << "::Components::EntityContext_var ec =" << endl
          << "::Components::EntityContext::_narrow (" << endl
          << "this->ctx_.in ()" << endl
          << STRS[ENV_ARG] << ");"
-         << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl
-         << "if (! CORBA::is_nil (ec.in ()))" << endl
+         << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+         << "if (! ::CORBA::is_nil (ec.in ()))" << endl
          << "{"
          << "return ec->get_CCM_object (" << endl
-         << STRS[ENV_SNGL_ARG] << ");" << endl
+         << STRS[ENV_SNGL_ARG] << ");"
          << "}"
-         << STRS[ACE_TR] << " (CORBA::INTERNAL (), 0);" << endl
+         << STRS[ACE_TR] << " ( ::CORBA::INTERNAL (), 0);" << endl
          << "}" << endl;
 
       i.context ().set ("facet_src_gen", true);
@@ -1068,18 +522,18 @@ namespace
       : EmitterBase (c)
     {}
 
-  // Nested classes used by ContextEmitter.
+    // Nested classes used by ContextEmitter.
   private:
     struct ContextPortsEmitter : Traversal::SingleUserData,
-                                 Traversal::MultiUserData,
-                                 Traversal::PublisherData,
-                                 Traversal::EmitterData,
-                                 EmitterBase
+    Traversal::MultiUserData,
+    Traversal::PublisherData,
+    Traversal::EmitterData,
+    EmitterBase
     {
       ContextPortsEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1114,21 +568,22 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "if (!CORBA::is_nil (this->ciao_uses_"
+           << "if (! ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
            << "{"
-           << "ACE_THROW (" << STRS[EXCP_AC] << " ());" << endl
+           << "ACE_THROW ( " << STRS[EXCP_AC] << " ());"
            << "}"
-           << "if (CORBA::is_nil (c))" << endl
+           << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << "ACE_THROW (" << STRS[EXCP_IC] << " ());" << endl
+           << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
            << "}"
-           << "this->ciao_uses_" << u.name () << "_ =" << endl;
+           << "this->ciao_uses_" << u.name () << "_ =" << endl
+           << "  ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
@@ -1141,14 +596,14 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (this->ciao_uses_"
+           << "if ( ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_NC] << " ()," << endl;
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -1170,27 +625,29 @@ namespace
            << STRS[EXCP_SNGL] << endl
            << "{"
            << u.scoped_name () << "Connections *tmp_retv = 0;"
-           << "ACE_NEW_THROW_EX (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "tmp_retv," << endl
            << u.scoped_name () << "Connections (" << endl
            << "this->ciao_uses_"
            << u.name () << "_.current_size ())," << endl
-           << "CORBA::NO_MEMORY ());" << endl << endl
+           << "::CORBA::NO_MEMORY ());" << endl
            << u.scoped_name () << "Connections_var retv"
            << " = tmp_retv;" << endl
            << "retv->length (this->ciao_uses_" << u.name ()
            << "_.current_size ());" << endl;
 
-        os << "CORBA::ULong i = 0;" << endl;
+        os << "::CORBA::ULong i = 0;" << endl;
 
-        os << "for (ACE_Active_Map_Manager< " << endl;
+        os << "for (ACE_Active_Map_Manager< " << endl
+           << "  ";
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_var>::iterator iter =" << endl
-           << "       this->ciao_uses_" << u.name () << "_.begin ();"
-           << "     iter != this->ciao_uses_" << u.name () << "_.end ();"
-           << "     ++iter)" << endl
+           << "    this->ciao_uses_" << u.name () << "_.begin ();" << endl
+           << "iter != this->ciao_uses_" << u.name () << "_.end ();"
+           << endl
+           << "++iter)" << endl
            << "{"
            << "ACE_Active_Map_Manager< " << endl;
 
@@ -1206,10 +663,10 @@ namespace
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl;
 
-        os << "ACE_NEW_THROW_EX (" << endl
-           << "retv[i].ck," << endl
-           << "CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
-           << "CORBA::NO_MEMORY ());" << 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
            << "}";
 
@@ -1224,14 +681,15 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (c))" << endl
+           << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);" << endl
+           << STRS[ACE_TR] << " ( "
+           << STRS[EXCP_IC] << " (), 0);" << endl
            << "}";
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -1246,17 +704,18 @@ namespace
         os << "if (this->ciao_uses_" << u.name ()
            << "_.bind (conn.in (), key) == -1)" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);" << endl
+           << STRS[ACE_TR] << " ( "
+           << STRS[EXCP_IC] << " (), 0);" << endl
            << "}";
 
         os << "conn._retn ();" << endl;
 
         os << STRS[COMP_CK] << " * ck = 0;"
-           << "ACE_NEW_THROW_EX (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "ck," << endl
-           << "CIAO::Map_Key_Cookie (key)," << endl
-           << "CORBA::NO_MEMORY ());" << endl;
-           
+           << "::CIAO::Map_Key_Cookie (key)," << endl
+           << "::CORBA::NO_MEMORY ());" << endl;
+
 
         os << "return ck;" << endl
            << "}";
@@ -1268,7 +727,7 @@ namespace
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{";
@@ -1278,10 +737,10 @@ namespace
         os << "_var retv;"
            << "ACE_Active_Map_Manager_Key key;" << endl;
 
-        os << "if (ck == 0 || ! CIAO::Map_Key_Cookie::extract (ck, key))"
+        os << "if (! CIAO::Map_Key_Cookie::extract (ck, key))"
            << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -1292,7 +751,7 @@ namespace
         os << "if (this->ciao_uses_" << u.name ()
            << "_.unbind (key, retv) != 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -1317,15 +776,16 @@ namespace
            << STRS[ENV_SRC] << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
-           << "for (ACE_Active_Map_Manager< " << endl; //@@ gcc bug
+           << "for (ACE_Active_Map_Manager< " << endl
+           << "  ";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var>::iterator iter =" << endl
-           << "this->ciao_publishes_" << p.name ()
-           << "_map_.begin ();"
+           << "    this->ciao_publishes_" << p.name ()
+           << "_map_.begin ();" << endl
            << "iter != this->ciao_publishes_" << p.name ()
-           << "_map_.end ();"
+           << "_map_.end ();" << endl
            << "++iter)" << endl
            << "{"
            << "(*iter).int_id_->push_";
@@ -1337,13 +797,13 @@ namespace
            << STRS[ENV_ARG] << ");"
            << "ACE_CHECK;" << endl
            << "}";
-           
+
         os << "for (ACE_Active_Map_Manager< " << endl
-           << STRS[COMP_ECB] << "_var>::iterator giter =" << endl
-           << "this->ciao_publishes_" << p.name ()
-           << "_generic_map_.begin ();"
+           << "  " << STRS[COMP_ECB] << "_var>::iterator giter =" << endl
+           << "    this->ciao_publishes_" << p.name ()
+           << "_generic_map_.begin ();" << endl
            << "giter != this->ciao_publishes_" << p.name ()
-           << "_generic_map_.end ();"
+           << "_generic_map_.end ();" << endl
            << "++giter)" << endl
            << "{"
            << "(*giter).int_id_->push_event" << " (" << endl
@@ -1361,18 +821,19 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (c))" << endl
+           << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " (CORBA::BAD_PARAM (), 0);" << endl
+           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), 0);" << endl
            << "}";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os<< "Consumer_var sub =" << endl;
+        os << "Consumer_var sub =" << endl
+           << "  ";
 
         Traversal::PublisherData::belongs (p, belongs_);
 
@@ -1382,10 +843,10 @@ namespace
            << "_map_.bind (sub.in (), key);"
            << "sub._retn ();" << endl
            << STRS[COMP_CK] << " * retv = 0;"
-           << "ACE_NEW_THROW_EX (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "retv," << endl
            << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "CORBA::NO_MEMORY ());" << endl
+           << "::CORBA::NO_MEMORY ());" << endl
            << "return retv;" << endl
            << "}";
 
@@ -1394,26 +855,26 @@ namespace
            << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (c))" << endl
+           << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << STRS[ACE_TR] << " (CORBA::BAD_PARAM (), 0);" << endl
+           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), 0);" << endl
            << "}";
 
         os << STRS[COMP_ECB] << "_var sub =" << endl
-           << STRS[COMP_ECB] << "::_duplicate (c);" << 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 (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "retv," << endl
            << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "CORBA::NO_MEMORY ());" << endl
+           << "::CORBA::NO_MEMORY ());" << endl
            << "return retv;" << endl
            << "}";
 
@@ -1424,7 +885,7 @@ namespace
            << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
@@ -1432,14 +893,14 @@ namespace
            << "if (ck == 0 || ::CIAO::Map_Key_Cookie::extract (ck, key) == false)"
            << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer::_nil ());" << endl
            << "}";
-           
+
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var retv;"
@@ -1448,13 +909,13 @@ namespace
            << "{"
            << "return retv._retn ();" << endl
            << "}";
-           
+
         os << STRS[COMP_ECB] << "_var ecb;" << endl;
-        
+
         os << "if (this->ciao_publishes_" << p.name ()
            << "_generic_map_.unbind (key, ecb) != 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::PublisherData::belongs (p, belongs_);
@@ -1500,19 +961,19 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (c))" << endl
+           << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << "ACE_THROW (CORBA::BAD_PARAM ());" << endl
-           << "}" << endl
-           << "if (! CORBA::is_nil (this->ciao_emits_" << e.name ()
+           << "ACE_THROW ( ::CORBA::BAD_PARAM ());" << endl
+           << "}"
+           << "if (! ::CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
            << "{"
-           << "ACE_THROW (" << STRS[EXCP_AC] << " ());" << endl
-           << "}" << endl
+           << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" << endl
+           << "}"
            << "this->ciao_emits_" << e.name ()
            << "_consumer_ = " << endl;
 
@@ -1527,44 +988,44 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << e.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
-           << "if (CORBA::is_nil (this->ciao_emits_" << e.name ()
+           << "if ( ::CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << endl
+           << STRS[ACE_TR] << " ( "
            << STRS[EXCP_NC] << " ()," << endl;
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer::_nil ());" << endl
-           << "}" << endl
+           << "}"
            << "return this->ciao_emits_" << e.name ()
            << "_consumer_._retn ();" << endl
            << "}";
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       Traversal::Belongs belongs_;
       Traversal::Belongs simple_belongs_;
       SemanticGraph::Component& scope_;
     };
-    
+
     struct SwappableGetConsumersEmitter : Traversal::PublisherData,
                                           Traversal::EmitterData,
                                           EmitterBase
     {
       SwappableGetConsumersEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
-      
+
       virtual void
       traverse (SemanticGraph::Publisher& p)
       {
@@ -1573,54 +1034,55 @@ namespace
            << "{"
            << "_ciao_size = this->ciao_publishes_" << p.name ()
            << "_map_.current_size ();" << endl
-           << "ACE_NEW_THROW_EX (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "tmp," << endl
            << STRS[COMP_CD] << " (_ciao_size)," << endl
-           << "CORBA::NO_MEMORY ());" << 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;
-          
+           << "for (ACE_Active_Map_Manager<" << endl
+           << "  ";
+
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var>::iterator iter =" << endl
-           << "  this->ciao_publishes_" << p.name ()
+           << "    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
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl
-           << "if (CORBA::is_nil (c.in ()))"
+           << "if ( ::CORBA::is_nil (c.in ()))"
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);"
+           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
            << "}"
            << "::Components::ConsumerDescription *cd = 0;"
-           << "ACE_NEW_THROW_EX (" << endl
+           << "ACE_NEW_THROW_EX ("
            << "cd," << endl
            << "OBV_Components::ConsumerDescription ()," << endl
-           << "CORBA::NO_MEMORY ());" << endl
+           << "::CORBA::NO_MEMORY ());" << endl
            << "::Components::ConsumerDescription_var safe = cd;"
            << "safe->name (\"\");"
            << "safe->type_id (\"\");"
@@ -1638,7 +1100,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1677,22 +1139,22 @@ namespace
          << "::Components::CCMHome_ptr h," << endl
          << "::CIAO::Session_Container *c," << endl
          << t.name () << "_Servant *sv)" << endl
-         << "  : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (h, c)), " << endl
+         << "  : CIAO::Context_Impl_Base (h, c), " << endl
          << "    ctx_svnt_base (h, c, sv)";
-         
+
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
-      
+
       if (swapping)
-      {
-        os << "," << endl
-           << "    ug_ctx_svnt_base (h, c, sv)" << endl;
-      }
+        {
+          os << "," << endl
+             << "    ug_ctx_svnt_base (h, c, sv)" << endl;
+        }
       else
-      {
-        os << endl;
-      }
-         
+        {
+          os << endl;
+        }
+
       os << "{"
          << "}";
 
@@ -1736,24 +1198,24 @@ namespace
            << t.name () << "_Context::get_registered_consumers (" << endl
            << "const char *publisher_name" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << 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);"
+           << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
            << "}"
            << STRS[COMP_CD] << " *tmp = 0;"
            << STRS[COMP_CD] << "_var retval;"
            << "CORBA::ULong _ciao_index = 0;"
            << "CORBA::ULong _ciao_size = 0;"
-		       << STRS[ACE_UA] << " (tmp);"
-		       << STRS[ACE_UA] << " (retval);"
-		       << STRS[ACE_UA] << " (_ciao_index);"
-		       << STRS[ACE_UA] << " (_ciao_size);" << endl;
-           
+           << STRS[ACE_UA] << " (tmp);"
+           << STRS[ACE_UA] << " (retval);"
+           << STRS[ACE_UA] << " (_ciao_index);"
+           << STRS[ACE_UA] << " (_ciao_size);" << endl;
+
         // Generate IF block for each event sources.
         {
           Traversal::Component component_emitter;
@@ -1771,10 +1233,10 @@ namespace
           component_emitter.traverse (t);
         }
 
-        os << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);"
+        os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
            << "}";
       }
-                 
+
       os << "// CIAO-specific." << endl << endl;
 
       os << t.name () << "_Context *" << endl
@@ -1794,14 +1256,15 @@ namespace
       : EmitterBase (c)
     {}
 
-  // Nested classes used by ServantEmitter.
+    // Nested classes used by ServantEmitter.
   private:
-    struct NavigationEmitsEmitter : Traversal::EmitterData,
-                                    EmitterBase
+    struct EmitsConnectEmitter : Traversal::EmitterData,
+                                 EmitterBase
+
     {
-      NavigationEmitsEmitter (Context& c)
+      EmitsConnectEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1815,17 +1278,18 @@ namespace
 
         Traversal::EmitterData::belongs (t, belongs_);
 
-        os << "Consumer_var _ciao_consumer =" << endl;
+        os << "Consumer_var _ciao_consumer =" << endl
+           << "  ";
 
         Traversal::EmitterData::belongs (t, belongs_);
 
         os << "Consumer::_narrow (" << endl
-           << "consumer" << endl
-           << STRS[ENV_ARG] << ");"
+           << "  consumer" << endl
+           << "  " << STRS[ENV_ARG] << ");"
            << "ACE_CHECK;" << endl
-           << "if (::CORBA::is_nil (_ciao_consumer.in ()))" << endl
+           << "if ( ::CORBA::is_nil (_ciao_consumer.in ()))" << endl
            << "{"
-           << "ACE_THROW (" << STRS[EXCP_IC] << " ());"
+           << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
            << endl
            << "}"
            << "this->connect_" << t.name ()
@@ -1837,10 +1301,30 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
+    struct EmitsDisconnectEmitter : Traversal::EmitterData,
+                                    EmitterBase
+    {
+      EmitsDisconnectEmitter (Context& c)
+        : EmitterBase (c)
+      {
+      }
+
+      virtual void
+      traverse (Type& t)
+      {
+        os << "if (ACE_OS::strcmp (source_name, \""
+           << t.name () << "\") == 0)" << endl
+           << "{"
+           << "return this->disconnect_" << t.name ()
+           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << "}";
+      }
+    };
+
     struct NavigationGetFacetExecEmitter : Traversal::ProviderData,
                                            EmitterBase
     {
@@ -1866,7 +1350,7 @@ namespace
       PublishesEmitter (Context& c,
                         SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1883,20 +1367,20 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
            << "{";
-           
+
         string swap_option = ctx.cl ().get_value ("custom-container", "");
         bool swapping = (swap_option == "upgradeable");
-      
+
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
-        }
-        
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (0);" << endl;
+          }
+
         os << "return this->context_->subscribe_" << p.name ()
            << " (" << endl
            << "c" << endl
@@ -1908,17 +1392,17 @@ namespace
            << "_Servant::subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
            << "{";
-           
+
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
-        }
-        
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (0);" << endl;
+          }
+
         os << "return this->context_->subscribe_" << p.name ()
            << "_generic (" << endl
            << "c" << endl
@@ -1932,21 +1416,21 @@ namespace
            << "_Servant::unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{";
-           
+
         if (swapping)
         {
           os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (";
+             << STRS[ACE_CR] << " ( ";
 
-          Traversal::PublisherData::belongs (p, belongs_);
+            Traversal::PublisherData::belongs (p, belongs_);
+
+            os << "Consumer::_nil ());" << endl;
+          }
 
-          os << "Consumer::_nil ());" << endl;
-        }
-        
         os << "return this->context_->unsubscribe_"
            << p.name () << " (" << endl
            << "ck" << endl
@@ -1955,7 +1439,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
@@ -1966,7 +1450,7 @@ namespace
     {
       UsesConnectEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1988,9 +1472,9 @@ namespace
            << "connection" << endl
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl
-           << "if (::CORBA::is_nil (_ciao_conn.in ()))" << endl
+           << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);"
+           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
            << endl
            << "}"
            << "// Simplex connect." << endl
@@ -2019,9 +1503,9 @@ namespace
            << "connection" << endl
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl
-           << "if (::CORBA::is_nil (_ciao_conn.in ()))" << endl
+           << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);"
+           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
            << endl
            << "}"
            << "// Multiplex connect." << endl
@@ -2032,7 +1516,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -2064,6 +1548,12 @@ namespace
            << u.name () << "\") == 0)" << endl
            << "{"
            << "// Multiplex disconnect." << endl
+           << "if (ck == 0)" << endl
+           << "{"
+           << STRS[ACE_TR] << " ( "
+           << STRS[EXCP_CR] << " ()," << endl
+           << "::CORBA::Object::_nil ());" << endl
+           << "}"
            << "return this->disconnect_" << u.name () << " (" << endl
            << "ck" << endl
            << STRS[ENV_ARG] << ");" << endl
@@ -2077,7 +1567,7 @@ namespace
     {
       UsesEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2094,7 +1584,7 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -2103,6 +1593,8 @@ namespace
            << endl
            << "c" << endl
            << STRS[ENV_ARG] << ");" << endl
+           << "this->add_receptacle (\"" << u.name ()
+           << "\", c, 0);" << endl
            << "}";
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -2111,7 +1603,7 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
@@ -2146,15 +1638,19 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "return this->context_->connect_" << u.name () << " ("
+           << "::Components::Cookie * cookie = "
+          "this->context_->connect_" << u.name () << " ("
            << endl
            << "c" << endl
            << STRS[ENV_ARG] << ");" << endl
+           << "this->add_receptacle (\"" << u.name ()
+           << "\", c, cookie);" << endl
+           << "return cookie;" << endl
            << "}";
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -2164,7 +1660,7 @@ namespace
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
@@ -2188,7 +1684,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
@@ -2198,7 +1694,7 @@ namespace
     {
       PublishesSubscribeEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -2209,29 +1705,31 @@ namespace
         os << "if (ACE_OS::strcmp (publisher_name, \""
            << p.name () << "\") == 0)" << endl
            << "{";
-           
+
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_var sub =" << endl;
+        os << "Consumer_var sub =" << endl
+           << "  ";
 
         Traversal::PublisherData::belongs (p, belongs_);
-        
+
         os << "Consumer::_narrow (" << endl
            << "subscribe" << endl
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl;
-           
-        os << "if (CORBA::is_nil (sub.in ()))" << endl
+
+        os << "if ( ::CORBA::is_nil (sub.in ()))" << endl
            << "{"
-           << "CORBA::Boolean substitutable =" << endl
-           << "subscribe->ciao_is_substitutable (" << endl;         
+           << "::CORBA::Boolean substitutable =" << endl
+           << "  subscribe->ciao_is_substitutable (" << endl
+           << "  ";
 
         Traversal::PublisherData::belongs (p, belongs_);
-        
+
         os << "::_tao_obv_static_repository_id ()" << endl
-           << STRS[ENV_ARG] << ");"
+           << "  " << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl;
-           
+
         os << "if (substitutable)" << endl
            << "{"
            << "return this->subscribe_" << p.name () << "_generic (" << endl
@@ -2240,7 +1738,7 @@ namespace
            << "}"
            << "else" << endl
            << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);" << endl
+           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);" << endl
            << "}"
            << "}"
            << "else" << endl
@@ -2249,11 +1747,11 @@ namespace
            << "sub.in ()" << endl
            << STRS[ENV_ARG] << ");" << endl
            << "}"
-           << "}";      
+           << "}";
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -2283,7 +1781,7 @@ namespace
     {
       EmitsEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2300,7 +1798,7 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "))" << endl
            << "{"
@@ -2316,7 +1814,7 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << e.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
@@ -2327,25 +1825,24 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
 
-    struct ServantTypeNameEmitter : Traversal::Type
+    struct ServantTypeNameEmitter : Traversal::Type,
+                                    EmitterBase
     {
-      ServantTypeNameEmitter (std::ostream& os_)
-        : os (os_)
-      {}
+      ServantTypeNameEmitter (Context& c)
+        : EmitterBase (c)
+      {
+      }
 
       virtual void
       traverse (SemanticGraph::Type& t)
       {
         os << t.name () << "_Servant";
       }
-
-    private:
-      std::ostream& os;
     };
 
     struct FacetProvidesEmitter : Traversal::ProviderData,
@@ -2354,11 +1851,11 @@ namespace
       FacetProvidesEmitter (Context& c,
                             SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          servant_type_name_emitter_ (c.os ()),
-          enclosing_type_name_emitter_ (c.os ()),
-          repo_id_emitter_ (c.os ()),
+          type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
+          servant_type_name_emitter_ (c),
+          enclosing_type_name_emitter_ (c),
+          repo_id_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2379,20 +1876,21 @@ namespace
            << STRS[ENV_SNGL_SRC] << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{";
-           
+
         string swap_option = ctx.cl ().get_value ("custom-container", "");
         bool swapping = (swap_option == "upgradeable");
-        
+
         if (swapping)
+
         {
           os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (";
-        
-          Traversal::ProviderData::belongs (p, belongs_);
-          
-          os << "::_nil ());" << endl;
-        }
-      
+             << STRS[ACE_CR] << " ( ";
+
+            Traversal::ProviderData::belongs (p, belongs_);
+
+            os << "::_nil ());" << endl;
+          }
+
         os << "if (! ::CORBA::is_nil (this->provide_"
            << p.name () << "_.in ()))" << endl
            << "{"
@@ -2404,9 +1902,9 @@ namespace
            << "}";
 
         os << "::CORBA::Object_var obj =" << endl
-           << "this->provide_" << p.name () << "_i ("
+           << "  this->provide_" << p.name () << "_i ("
            << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -2417,14 +1915,15 @@ namespace
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "_var fo =" << endl;
+        os << "_var fo =" << endl
+           << "  ";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "::_narrow (" << endl
+        os << "::_narrow ("
            << "obj.in ()" << endl
            << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -2447,7 +1946,7 @@ namespace
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "::CORBA::Object_ptr ret =" << endl
-           << "this->lookup_facet (\"" << p.name () << "\");" << endl;
+           << "  this->lookup_facet (\"" << p.name () << "\");" << endl;
 
         os << "if (! ::CORBA::is_nil (ret))" << endl
            << "{"
@@ -2491,26 +1990,26 @@ namespace
            << "    " << scope_.name () << "_Servant" << endl
            << "  >" << endl
            << "MACRO_MADNESS_TYPEDEF;" << endl;
-           
+
         os << "ACE_CString obj_id (this->ins_name_);"
            << "obj_id += \"_" << p.name () << "\";" << endl;
-           
-        os << "ACE_NEW_THROW_EX ( " << endl
-           << "  tmp," << endl
-           << "  MACRO_MADNESS_TYPEDEF (" << endl
-           << "    obj_id.c_str ()," << endl
-           << "    \"" << p.name () << "\"," << endl
-           << "    CIAO::Port_Activator::Facet," << endl
-           << "    0," << endl
-           << "    this->context_," << endl
-           << "    this)," << endl
-           << "  CORBA::NO_MEMORY ());" << endl;
-
-        os << "CIAO::Servant_Activator *sa = " << endl
+
+        os << "ACE_NEW_THROW_EX ("
+           << "tmp," << endl
+           << "MACRO_MADNESS_TYPEDEF (" << endl
+           << "obj_id.c_str ()," << endl
+           << "\"" << p.name () << "\"," << endl
+           << "::CIAO::Port_Activator::Facet," << endl
+           << "0," << endl
+           << "this->context_," << endl
+           << "this)," << endl
+           << "::CORBA::NO_MEMORY ());" << endl;
+
+        os << "::CIAO::Servant_Activator *sa = " << endl
            << "this->container_->ports_servant_activator ();" << endl
            << "if (!sa->register_port_activator (tmp))" << endl
            << "{"
-           << "return ";           
+           << "return ";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -2519,29 +2018,34 @@ namespace
 
         os << "::CORBA::Object_var obj =" << endl
            << "  this->container_->generate_reference (" << endl
-           << "    obj_id.c_str ()," << endl
-           << "    ";
+           << "  obj_id.c_str ()," << endl
+           << "  ";
 
         Traversal::ProviderData::belongs (p, repo_id_belongs_);
 
         os << "," << endl
-           << "    CIAO::Container::Facet_Consumer" << endl
-           << "    " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << "  ::CIAO::Container::Facet_Consumer" << endl
+           << "  " << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
         os << "::_nil ());" << endl
-           << "this->add_facet (" << endl
-           << "\"" << p.name () << "\"," << endl
-           << "obj.in ());" << endl;
+           << "this->add_facet (\"" << p.name () << "\"," << endl
+           << "obj.in ()" << endl
+           << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
+
+        Traversal::ProviderData::belongs (p, belongs_);
+
+        os << "::_nil ());" << endl;
 
         os << "return obj._retn ();" << endl
            << "}";
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       ServantTypeNameEmitter servant_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
@@ -2559,9 +2063,9 @@ namespace
     {
       ConsumesEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          repo_id_emitter_ (c.os ()),
+          type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
+          repo_id_emitter_ (c),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2590,10 +2094,10 @@ namespace
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name  ()
            << "_Context_ptr c)" << endl
-           << ": executor_ (" << c.scoped_name ().scope_name ().scope_name ()
+           << "  : executor_ ( " << c.scoped_name ().scope_name ().scope_name ()
            << "::CCM_" << c.scoped_name ().scope_name ().simple_name  ()
            << "::_duplicate (executor))," << endl
-           << "ctx_ (" << c.scoped_name ().scope_name ().scope_name ()
+           << "    ctx_ ( " << c.scoped_name ().scope_name ().scope_name ()
            << "::CCM_" << c.scoped_name ().scope_name ().simple_name  ()
            << "_Context::_duplicate (c))" << endl
            << "{"
@@ -2613,7 +2117,7 @@ namespace
            << "{"
            << "}";
 
-        os << "CORBA::Object_ptr" << endl
+        os << "::CORBA::Object_ptr" << endl
            << scope_.name  () << "_Servant::";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
@@ -2661,14 +2165,15 @@ namespace
            << "_Servant::push_event (" << endl
            << "::Components::EventBase *ev" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
+           << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_BET] << "))" << endl
            << "{";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << "_var ev_type =" << endl;
+        os << "_var ev_type =" << endl
+           << "  ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
@@ -2684,11 +2189,11 @@ namespace
            << STRS[ENV_ARG] << ");" << endl
            << "return;" << endl
            << "}"
-           << "ACE_THROW (" << STRS[EXCP_BET] << " ());" << endl
+           << "ACE_THROW ( " << STRS[EXCP_BET] << " ());" << endl
            << "}";
-           
+
         os << "CORBA::Boolean" << endl
-           << scope_.name () << "_Servant::";        
+           << scope_.name () << "_Servant::";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
@@ -2700,42 +2205,42 @@ namespace
            << "{"
            << "if (event_repo_id == 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " (CORBA::BAD_PARAM (), false);" << endl
+           << STRS[ACE_TR] << " ( ::CORBA::BAD_PARAM (), false);" << endl
            << "}"
            << scope_.name () << "_Context *ctx =" << endl
-           << scope_.name () << "_Context::_narrow (" << endl
-           << "this->ctx_.in ()" << endl
-           << STRS[ENV_ARG] << ");"
+           << "  " << scope_.name () << "_Context::_narrow (" << endl
+           << "  this->ctx_.in ()" << endl
+           << "  " << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (false);" << 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
-           << STRS[ENV_ARG] << ");"
+           << "  orb->lookup_value_factory (" << endl
+           << "  event_repo_id" << endl
+           << "  " << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (false);" << endl;
-           
+
         os << "if (f == 0)" << endl
            << "{"
            << "return false;" << endl
            << "}"
            << "CORBA::ValueBase_var v =" << endl
-           << "f->create_for_unmarshal (" << STRS[ENV_SNGL_ARG] << ");"
+           << "  f->create_for_unmarshal (" << STRS[ENV_SNGL_ARG] << ");"
            << STRS[ACE_CR] << " (false);" << endl;
-           
+
         os << "f->_remove_ref ();" << endl;
-           
+
         os << "if (v.in () == 0)" << endl
            << "{"
            << "return false;" << endl
            << "}";
-           
+
         os << "return dynamic_cast< ";
-           
+
         Traversal::ConsumerData::belongs (c, belongs_);
-        
+
         os << " *> (v.in ()) != 0;" << endl
            << "}" << endl;
 
@@ -2759,9 +2264,9 @@ namespace
            << "}";
 
         os << "::Components::EventConsumerBase_var obj =" << endl
-           << "this->get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << "  this->get_consumer_" << c.name () << "_i (" << endl
+           << "  " << STRS[ENV_SNGL_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
@@ -2769,14 +2274,15 @@ namespace
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << "Consumer_var eco =" << endl;
+        os << "Consumer_var eco =" << endl
+           << "  ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer::_narrow (" << endl
-           << "obj.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << "  obj.in ()" << endl
+           << "  " << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
@@ -2799,14 +2305,14 @@ namespace
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "::Components::EventConsumerBase_ptr ret =" << endl
-           << "this->lookup_consumer (\"" << c.name () << "\");" << endl;
+           << "  this->lookup_consumer (\"" << c.name () << "\");" << endl;
 
         os << "if (! ::CORBA::is_nil (ret))" << endl
            << "{"
            << "return ret;"
            << "}";
 
-        os << "CIAO::Port_Activator_T<" << endl;
+        os << "::CIAO::Port_Activator_T<" << endl;
 
         os << scope_.name  () << "_Servant::";
 
@@ -2841,23 +2347,23 @@ namespace
            << "    " << scope_.name () << "_Servant" << endl
            << "  >" << endl
            << "MACRO_MADNESS_TYPEDEF;" << endl;
-           
+
         os << "ACE_CString obj_id (this->ins_name_);"
            << "obj_id += \"_" << c.name () << "\";" << endl;
-           
-        os << "ACE_NEW_THROW_EX ( " << endl
-           << "  tmp," << endl
-           << "  MACRO_MADNESS_TYPEDEF (" << endl
-           << "    obj_id.c_str ()," << endl
-           << "    \"" << c.name () << "\"," << endl
-           << "    CIAO::Port_Activator::Sink," << endl
-           << "    this->executor_.in ()," << endl
-           << "    this->context_," << endl
-           << "    this)," << endl
-           << "  CORBA::NO_MEMORY ());" << endl;
-
-        os << "CIAO::Servant_Activator *sa = " << endl
-           << "this->container_->ports_servant_activator ();" <<endl
+
+        os << "ACE_NEW_THROW_EX (" << endl
+           << "tmp," << endl
+           << "MACRO_MADNESS_TYPEDEF ("
+           << "obj_id.c_str ()," << endl
+           << "\"" << c.name () << "\"," << endl
+           << "::CIAO::Port_Activator::Sink," << endl
+           << "this->executor_.in ()," << endl
+           << "this->context_," << endl
+           << "this)," << endl
+           << "::CORBA::NO_MEMORY ());" << endl;
+
+        os << "::CIAO::Servant_Activator *sa =" << endl
+           << "  this->container_->ports_servant_activator ();" << endl
            << "if (!sa->register_port_activator (tmp))" << endl
            << "{"
            << "return ";
@@ -2869,40 +2375,45 @@ namespace
 
         os << "::CORBA::Object_var obj =" << endl
            << "  this->container_->generate_reference (" << endl
-           << "    obj_id.c_str ()," << endl
-           << "    ";
+           << "  obj_id.c_str ()," << endl
+           << "  ";
 
         Traversal::ConsumerData::belongs (c, repo_id_belongs_);
 
         os << "," << endl
-           << "    CIAO::Container::Facet_Consumer" << endl
-           << "    " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << "  ::CIAO::Container::Facet_Consumer" << endl
+           << "  " << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer::_nil ());" << endl;
 
         os << "::Components::EventConsumerBase_var ecb =" << endl
-           << "::Components::EventConsumerBase::_narrow (" << endl
-           << "obj.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (";
+           << "  ::Components::EventConsumerBase::_narrow (" << endl
+           << "  obj.in ()" << endl
+           << "  " << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer::_nil ());" << endl;
 
-        os << "this->add_consumer (" << endl
-           << "\"" << c.name () << "\"," << endl
-           << "ecb.in ());" << endl;
+        os << "this->add_consumer (\"" << c.name () << "\"," << endl
+           << "ecb.in ()" << endl
+           << STRS[ENV_ARG] << ");"
+           << STRS[ACE_CR] << " ( ";
+
+        Traversal::ConsumerData::belongs (c, belongs_);
+
+        os << "Consumer::_nil ());" << endl;
 
         os << "return ecb._retn ();" << endl
            << "}";
-     }
+      }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       ConsumerRepoIdEmitter repo_id_emitter_;
       Traversal::Belongs belongs_;
@@ -2918,8 +2429,9 @@ namespace
     {
       RegisterValueFactoryEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          cerr_type_name_emitter_ (cerr),
+          c_ (cerr, c.export_macro (), c.cl ()),
+          type_name_emitter_ (c),
+          cerr_type_name_emitter_ (c_),
           gen_factory_ (true)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2951,14 +2463,14 @@ namespace
           Traversal::Inherits inherits;
           inherits.node_traverser (event_type_operations);
           event_type_operations.edge_traverser (inherits);
-          
+
           Traversal::Defines include_inherit_defines;
-          event_type_operations.edge_traverser (include_inherit_defines);        
+          event_type_operations.edge_traverser (include_inherit_defines);
           OperationExistsEmitter op_emitter (this);
           include_inherit_defines.node_traverser (op_emitter);
-          
+
           Traversal::Supports supports;
-          event_type_operations.edge_traverser (supports);          
+          event_type_operations.edge_traverser (supports);
           Traversal::Interface iface;
           supports.node_traverser (iface);
           inherits.node_traverser (iface);
@@ -2976,34 +2488,35 @@ namespace
         }
 
         if (gen_factory_)
-        {
-          os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
+          {
+            os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
 
-          Traversal::ConsumerData::belongs (c, belongs_);
+            Traversal::ConsumerData::belongs (c, belongs_);
 
-          os << "_init," << endl;
+            os << "_init," << endl;
 
-          Traversal::ConsumerData::belongs (c, belongs_);
+            Traversal::ConsumerData::belongs (c, belongs_);
 
-          os << ");" << endl;
-        }
+            os << ");" << endl;
+          }
         else
-        {
-          cerr << "    " << endl
-               << "event type ";
-
-          Traversal::ConsumerData::belongs (c, cerr_belongs_);
-          
-          cerr << " consumed by " << c.scoped_name () << endl
-               << "has an operation, factory declaration,"
-               << " or private member. "
-               << "ORB registration of default factory not generated" << endl;
-        }
+          {
+            cerr << "    " << endl
+                 << "event type ";
+
+            Traversal::ConsumerData::belongs (c, cerr_belongs_);
+
+            cerr << " consumed by " << c.scoped_name () << endl
+                 << "has an operation, factory declaration,"
+                 << " or private member. "
+                 << "ORB registration of default factory not generated" << endl;
+          }
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
-      TypeNameEmitter cerr_type_name_emitter_;
+      Context c_;
+      FullTypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter cerr_type_name_emitter_;
       Traversal::Belongs belongs_;
       Traversal::Belongs cerr_belongs_;
       bool gen_factory_;
@@ -3054,14 +2567,14 @@ namespace
     private:
       RegisterValueFactoryEmitter* r_;
     };
-    
+
     struct PrivateExistsEmitter : Traversal::ValueTypePrivateMember
     {
       PrivateExistsEmitter (RegisterValueFactoryEmitter* r)
         : r_ (r)
       {
       }
-      
+
       virtual void
       traverse (Type&)
       {
@@ -3088,8 +2601,8 @@ namespace
       traverse (SemanticGraph::Provider& p)
       {
         os << "obj_var =" << endl
-           << "this->provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
+           << "  this->provide_" << p.name () << "_i (" << endl
+           << "  " << STRS[ENV_SNGL_ARG] << ");"
            << "ACE_CHECK;" << endl;
       }
 
@@ -3112,8 +2625,8 @@ namespace
       traverse (SemanticGraph::Consumer& p)
       {
         os << "ecb_var =" << endl
-           << "this->get_consumer_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_ARG] << ");"
+           << "  this->get_consumer_" << p.name () << "_i (" << endl
+           <<  "  " << STRS[ENV_SNGL_ARG] << ");"
            << "ACE_CHECK;" << endl;
       }
     };
@@ -3130,14 +2643,233 @@ namespace
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         Traversal::Belongs delegate_belongs;
-        
-        SetAttributeDelegationEmitter delegater (ctx.os (), a);
+
+        SetAttributeDelegationEmitter delegater (ctx, a);
         delegate_belongs.node_traverser (delegater);
 
         Traversal::ReadWriteAttribute::belongs (a, delegate_belongs);
       }
     };
 
+    struct UsesSizeCalculator : Traversal::SingleUserData,
+                                Traversal::MultiUserData,
+                                EmitterBase
+    {
+      UsesSizeCalculator (Context& c, unsigned long& size)
+        : EmitterBase (c),
+          size_ (size)
+      {
+      }
+
+      virtual void
+      traverse (SemanticGraph::SingleUser&)
+      {
+        ++size_;
+      }
+
+      virtual void
+      traverse (SemanticGraph::MultiUser&)
+      {
+        ++size_;
+      }
+
+    private:
+      unsigned long& size_;
+    };
+
+    struct UsesGetAllEmitter : Traversal::SingleUserData,
+                               Traversal::MultiUserData,
+                               EmitterBase
+    {
+      UsesGetAllEmitter (Context& c)
+        : EmitterBase (c),
+          type_name_emitter_ (c),
+          repo_id_emitter_ (c),
+          slot_ (0UL)
+      {
+        belongs_.node_traverser (type_name_emitter_);
+        repo_id_belongs_.node_traverser (repo_id_emitter_);
+      }
+
+      virtual void
+      traverse (SemanticGraph::SingleUser& u)
+      {
+        os << "::CIAO::Servant_Impl_Base::describe_simplex_receptacle<"
+           << endl
+           << "    ";
+
+        Traversal::SingleUserData::belongs (u, belongs_);
+
+        os << "_var" << endl
+           << "  > (\"" << u.name () << "\"," << endl;
+
+        Traversal::SingleUserData::belongs (u, repo_id_belongs_);
+
+        os << "," << endl
+           << "this->context_->ciao_uses_" << u.name () << "_," << endl
+           << "safe_retval," << endl
+           << slot_ << "UL);" << endl;
+
+        ++slot_;
+      }
+
+      virtual void
+      traverse (SemanticGraph::MultiUser& u)
+      {
+        os << "::CIAO::Servant_Impl_Base::describe_multiplex_receptacle<"
+           << endl
+           << "    ";
+
+        Traversal::MultiUserData::belongs (u, belongs_);
+
+        os << "_var" << endl
+           << "  > (\"" << u.name () << "\"," << endl;
+
+        Traversal::MultiUserData::belongs (u, repo_id_belongs_);
+
+        os << "," << endl
+           << "this->context_->ciao_uses_" << u.name () << "_," << endl
+           << "safe_retval," << endl
+           << slot_ << "UL);" << endl;
+
+        ++slot_;
+      }
+
+    private:
+      FullTypeNameEmitter type_name_emitter_;
+      RepoIdEmitter repo_id_emitter_;
+      Traversal::Belongs belongs_;
+      Traversal::Belongs repo_id_belongs_;
+      unsigned long slot_;
+    };
+
+    struct PublishesSizeCalculator : Traversal::PublisherData,
+                                     EmitterBase
+    {
+      PublishesSizeCalculator (Context& c, unsigned long& size)
+        : EmitterBase (c),
+          size_ (size)
+      {
+      }
+
+      virtual void
+      traverse (SemanticGraph::Publisher&)
+      {
+        ++size_;
+      }
+
+    private:
+      unsigned long& size_;
+    };
+
+    struct PublishesGetAllEmitter : Traversal::PublisherData,
+                                    EmitterBase
+    {
+      PublishesGetAllEmitter (Context& c)
+        : EmitterBase (c),
+          type_name_emitter_ (c),
+          repo_id_emitter_ (c),
+          slot_ (0UL)
+      {
+        belongs_.node_traverser (type_name_emitter_);
+        repo_id_belongs_.node_traverser (repo_id_emitter_);
+      }
+
+      virtual void
+      traverse (SemanticGraph::Publisher& p)
+      {
+        os << "::CIAO::Servant_Impl_Base::describe_pub_event_source<"
+           << endl
+           << "    ";
+
+        Traversal::PublisherData::belongs (p, belongs_);
+
+        os << "Consumer_var" << endl
+           << "  > (\"" << p.name () << "\"," << endl;
+
+        Traversal::PublisherData::belongs (p, repo_id_belongs_);
+
+        os << "," << endl
+           << "this->context_->ciao_publishes_" << p.name ()
+           << "_map_," << endl
+           << "safe_retval," << endl
+           << slot_ << "UL);" << endl;
+
+        ++slot_;
+      }
+
+    private:
+      FullTypeNameEmitter type_name_emitter_;
+      RepoIdEmitter repo_id_emitter_;
+      Traversal::Belongs belongs_;
+      Traversal::Belongs repo_id_belongs_;
+      unsigned long slot_;
+    };
+
+    struct EmitsSizeCalculator : Traversal::EmitterData,
+                                 EmitterBase
+    {
+      EmitsSizeCalculator (Context& c, unsigned long& size)
+        : EmitterBase (c),
+          size_ (size)
+
+      {
+      }
+
+      virtual void
+      traverse (SemanticGraph::Emitter&)
+      {
+        ++size_;
+      }
+
+    private:
+      unsigned long& size_;
+    };
+
+    struct EmitsGetAllEmitter : Traversal::EmitterData,
+                                EmitterBase
+    {
+      EmitsGetAllEmitter (Context& c)
+        : EmitterBase (c),
+          type_name_emitter_ (c),
+          repo_id_emitter_ (c),
+          slot_ (0UL)
+      {
+        belongs_.node_traverser (type_name_emitter_);
+        repo_id_belongs_.node_traverser (repo_id_emitter_);
+      }
+
+      virtual void
+      traverse (SemanticGraph::Emitter& e)
+      {
+        os << "::CIAO::Servant_Impl_Base::describe_emit_event_source<"
+           << endl
+           << "    ";
+
+        Traversal::EmitterData::belongs (e, belongs_);
+
+        os << "Consumer_var" << endl
+           << "  > (\"" << e.name () << "\"," << endl;
+
+        Traversal::EmitterData::belongs (e, repo_id_belongs_);
+
+        os << "," << endl
+           << "this->context_->ciao_emits_" << e.name ()
+           << "_consumer_," << endl
+           << "safe_retval," << endl
+           << slot_ << "UL);" << endl;
+
+        ++slot_;
+      }
+
+    private:
+      FullTypeNameEmitter type_name_emitter_;
+      RepoIdEmitter repo_id_emitter_;
+      Traversal::Belongs belongs_;
+      Traversal::Belongs repo_id_belongs_;
+      unsigned long slot_;
+    };
+
   public:
     virtual void
     pre (Type& t)
@@ -3154,40 +2886,45 @@ namespace
          << "const char *ins_name," << endl
          << "::CIAO::Home_Servant_Impl_Base *hs," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base "
-         << "(h, hs, c))," << endl
+         << "  : CIAO::Servant_Impl_Base "
+         << "(h, hs, c)," << endl
          << "    comp_svnt_base (exe, h, hs, c)," << endl
          << "    ins_name_ (ins_name)" << endl
          << "{"
-         << "ACE_NEW (" << endl
+         << "ACE_NEW ("
          << "this->context_," << endl
          << t.name () << "_Context (h, c, this));" << endl;
 
+      os << "// Set the instance id of the component on the context" << endl
+         << endl
+         << "this->context_->_ciao_instance_id (this->ins_name_);" << endl;
+
+
       // Generate the macro to register a value factory for each
       // eventtype consumed.
       if (!ctx.cl ().get_value ("suppress-register-factory", false))
-      {
-        Traversal::Component component_emitter;
+        {
+          Traversal::Component component_emitter;
 
-        Traversal::Inherits inherits;
-        inherits.node_traverser (component_emitter);
+          Traversal::Inherits inherits;
+          inherits.node_traverser (component_emitter);
 
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (inherits);
+          Traversal::Defines defines;
+          component_emitter.edge_traverser (defines);
+          component_emitter.edge_traverser (inherits);
 
-        RegisterValueFactoryEmitter factory_emitter (ctx);
-        defines.node_traverser (factory_emitter);
+          RegisterValueFactoryEmitter factory_emitter (ctx);
+          defines.node_traverser (factory_emitter);
 
-        component_emitter.traverse (t);
-      }
+          component_emitter.traverse (t);
+        }
 
       os << "ACE_TRY_NEW_ENV" << endl
          << "{"
          << "::Components::SessionComponent_var scom =" << endl
-         << "::Components::SessionComponent::_narrow (" << endl
-         << "exe" << endl
-         << STRS[ENV_ARG] << ");"
+         << "  ::Components::SessionComponent::_narrow (" << endl
+         << "  exe" << endl
+         << "  " << STRS[ENV_ARG] << ");"
          << "ACE_TRY_CHECK;" << endl
          << "if (! ::CORBA::is_nil (scom.in ()))" << endl
          << "{"
@@ -3219,17 +2956,17 @@ namespace
          << STRS[ENV_SRC] << ")" << endl
          << "{"
          << "ACE_ENV_EMIT_CODE (ACE_UNUSED_ARG (ACE_TRY_ENV));" << endl;
-         
+
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
-      
+
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
-      }
-      
-      os << "for (CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << "ACE_CHECK;" << endl;
+        }
+
+      os << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
          << "{"
          << "const char *descr_name = descr[i]->name ();"
          << "::CORBA::Any &descr_value = descr[i]->value ();" << endl;
@@ -3314,26 +3051,26 @@ namespace
          << "const char *name," << endl
          << "::CORBA::Object_ptr connection" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_AC] << "," << endl
          << STRS[EXCP_ECL] << "))" << endl
          << "{";
-               
+
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
-      }
-        
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (0);" << endl;
+        }
+
       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
+         << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
          << "}";
 
       // Generate IF block in connect operation for each receptacle.
@@ -3353,32 +3090,33 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);" << endl
+      os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
          << "}";
 
-      os << "CORBA::Object_ptr" << endl
+      os << "::CORBA::Object_ptr" << endl
          << t.name () << "_Servant::disconnect (" << endl
          << "const char *name," << endl
          << STRS[COMP_CK] << " * ck" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << 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[ACE_UA] << " (ck);" << endl;
+
       if (swapping)
       {
         os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
+           << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
       }
-        
+
       os << "if (name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " (" << endl
-         << STRS[EXCP_IN] << " ()," << endl
+         << STRS[ACE_TR] << " ( "
+         << STRS[EXCP_BP] << "," << endl
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
@@ -3399,10 +3137,61 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " (" << endl
+      os << STRS[ACE_TR] << " ( "
          << STRS[EXCP_IN] << " ()," << endl
-         << "::CORBA::Object::_nil ());" << endl
-         << STRS[ACE_UA] << " (ck);" << endl
+         << "::CORBA::Object::_nil ());"
+         << "}";
+
+      os << STRS[COMP_RD] << " *" << endl
+         << t.name () << "_Servant::get_all_receptacles (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << STRS[COMP_RD] << " *retval = 0;"
+         << "ACE_NEW_RETURN (retval," << endl
+         << STRS[COMP_RD] << "," << endl
+         << "0);"
+         << STRS[COMP_RD] << "_var safe_retval = retval;";
+
+      unsigned long size = 0;
+
+      // Calculate the number of uses ports.
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        UsesSizeCalculator size_calculator (ctx, size);
+        defines.node_traverser (size_calculator);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "safe_retval->length (" << size << "UL);" << endl;
+
+      // Generate a sequence element assignment for each uses port.
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        UsesGetAllEmitter get_all_emitter (ctx);
+        defines.node_traverser (get_all_emitter);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "return safe_retval._retn ();"
          << "}";
 
       // Generate generic operations for receptacles.
@@ -3428,22 +3217,22 @@ namespace
          << "const char * emitter_name," << endl
          << STRS[COMP_ECB] << "_ptr consumer" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_AC] << "," << endl
          << STRS[EXCP_IC] << "))" << endl
          << "{";
-         
+
       if (swapping)
       {
         os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
+           << STRS[ACE_CK] << ";" << endl;
       }
-        
+
       os << "if (emitter_name == 0)" << endl
          << "{"
-         << "ACE_THROW (::CORBA::BAD_PARAM ());" << endl
+         << STRS[ACE_TH] << " ( " << STRS[EXCP_BP] << ");" << endl
          << "}";
 
       // Generate an IF block for each 'emits' declaration.
@@ -3457,40 +3246,185 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (inherits);
 
-        NavigationEmitsEmitter navigation_emits_emitter (ctx);
-        defines.node_traverser (navigation_emits_emitter);
+        EmitsConnectEmitter emits_connect_emitter (ctx);
+        defines.node_traverser (emits_connect_emitter);
 
         component_emitter.traverse (t);
       }
 
       os << STRS[ACE_UA] << " (consumer);"
-         << "ACE_THROW ("
+         << STRS[ACE_TH] << " ( "
          << STRS[EXCP_IN] << " ());" << endl
          << "}";
 
+      os << STRS[COMP_ECB] << "_ptr" << endl
+         << t.name () << "_Servant::disconnect_consumer (" << endl
+         << "const char *source_name" << endl
+         << STRS[ENV_SRC] << ")" << endl
+         << STRS[EXCP_START] << " "
+         << STRS[EXCP_SYS] << "," << endl
+         << STRS[EXCP_IN] << "," << endl
+         << STRS[EXCP_NC] << "))" << endl
+         << "{";
+
+      if (swapping)
+      {
+        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+           << STRS[ACE_CR] << " ( "
+           << STRS[COMP_ECB] << "::_nil ());" << endl;
+      }
+
+      os << "if (source_name == 0)" << endl
+         << "{"
+         << STRS[ACE_TR] << " ( " << STRS[EXCP_BP] << "," << endl
+         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "}";
+
+      // Generate an IF block for each 'emits' declaration.
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        EmitsDisconnectEmitter emits_disconnect_emitter (ctx);
+        defines.node_traverser (emits_disconnect_emitter);
+
+        component_emitter.traverse (t);
+      }
+
+      os << STRS[ACE_TR] << " ( "
+         << STRS[EXCP_IN] << " ()," << endl
+         << STRS[COMP_ECB] << "::_nil ());" << endl
+         << "}";
+
+      os << STRS[COMP_PD] << " *" << endl
+         << t.name () << "_Servant::get_all_publishers (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << STRS[COMP_PD] << " *retval = 0;"
+         << "ACE_NEW_RETURN (retval," << endl
+         << STRS[COMP_PD] << "," << endl
+         << "0);"
+         << STRS[COMP_PD] << "_var safe_retval = retval;";
+
+      size = 0UL;
+
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        PublishesSizeCalculator publishes_size_calculator (ctx, size);
+        defines.node_traverser (publishes_size_calculator);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "safe_retval->length (" << size << "UL);" << endl;
+
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        PublishesGetAllEmitter publishes_get_all_emitter (ctx);
+        defines.node_traverser (publishes_get_all_emitter);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "return safe_retval._retn ();"
+         << "}";
+
+      os << STRS[COMP_ED] << " *" << endl
+         << t.name () << "_Servant::get_all_emitters (" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[EXCP_SNGL] << endl
+         << "{"
+         << STRS[COMP_ED] << " *retval = 0;"
+         << "ACE_NEW_RETURN (retval," << endl
+         << STRS[COMP_ED] << "," << endl
+         << "0);"
+         << STRS[COMP_ED] << "_var safe_retval = retval;";
+
+      size = 0UL;
+
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        EmitsSizeCalculator emits_size_calculator (ctx, size);
+        defines.node_traverser (emits_size_calculator);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "safe_retval->length (" << size << "UL);" << endl;
+
+      {
+        Traversal::Component component_emitter;
+
+        Traversal::Inherits inherits;
+        inherits.node_traverser (component_emitter);
+
+        Traversal::Defines defines;
+        component_emitter.edge_traverser (defines);
+        component_emitter.edge_traverser (inherits);
+
+        EmitsGetAllEmitter emits_get_all_emitter (ctx);
+        defines.node_traverser (emits_get_all_emitter);
+
+        component_emitter.traverse (t);
+      }
+
+      os << "return safe_retval._retn ();"
+         << "}";
+
       os << STRS[COMP_CK] << " *" << endl
          << t.name () << "_Servant::subscribe (" << endl
          << "const char *publisher_name," << endl
          << STRS[COMP_ECB] << "_ptr subscribe" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_ECL] << "))" << endl
          << "{";
-         
+
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
-      }
-        
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (0);" << 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);"
+         << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);"
          << endl
          << "}";
 
@@ -3511,7 +3445,7 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);" << endl
+      os << STRS[ACE_TR] << " ( " << STRS[EXCP_IN] << " (), 0);" << endl
          << "}";
 
       os << STRS[COMP_ECB] << "_ptr" << endl
@@ -3520,24 +3454,24 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_CK] << " *ck" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "))" << endl
          << "{";
-         
+
       if (swapping)
       {
         os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (" << STRS[COMP_ECB]
+           << STRS[ACE_CR] << " ( " << STRS[COMP_ECB]
            << "::_nil ());" << endl;
       }
-        
+
       os << "// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (ck);" << endl
          << "if (publisher_name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " (" << endl
+         << STRS[ACE_TR] << " ( "
          << STRS[EXCP_IN] << " ()," << endl
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
@@ -3559,7 +3493,7 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " (" << endl
+      os << STRS[ACE_TR] << " ( "
          << STRS[EXCP_IN] << " ()," << endl
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
@@ -3581,28 +3515,28 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "CORBA::Object_ptr" << endl
+      os << "::CORBA::Object_ptr" << endl
          << t.name ()
          << "_Servant::get_facet_executor (" << endl
          << "const char *name" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
+         << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "))" << endl
          << "{";
-         
+
       if (swapping)
       {
         os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
+           << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
       }
-        
+
       os << "if (name == 0)" << endl
          << "{"
-         << STRS[ACE_TR] << " (" << endl
-         << "::CORBA::BAD_PARAM ()," << endl
+         << STRS[ACE_TR] << " ( " << STRS[EXCP_BP] << "," << endl
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
+
       // Generate an IF block for each facet inside provide_facet().
       {
         Traversal::Component component_emitter;
@@ -3620,8 +3554,9 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << " return CORBA::Object::_nil ();"
+      os << "return ::CORBA::Object::_nil ();"
          << "}";
+
       os << "// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
@@ -3643,7 +3578,7 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter<SemanticGraph::Component> operation_emitter (ctx, t);
@@ -3657,15 +3592,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -3674,9 +3609,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -3697,7 +3632,7 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         component_emitter.traverse (t);
@@ -3739,14 +3674,14 @@ namespace
   {
     HomeEmitter (Context& c)
       : EmitterBase (c),
-        repo_id_emitter_ (c.os ()),
-        flat_name_emitter_ (c.os ())
+        repo_id_emitter_ (c),
+        flat_name_emitter_ (c)
     {
       repo_id_manages_.node_traverser (repo_id_emitter_);
       flat_name_manages_.node_traverser (flat_name_emitter_);
     }
 
-  // Nested classes used by this emitter.
+    // Nested classes used by this emitter.
   private:
     struct HomeOpExecReturnEmitter : Traversal::Type
     {
@@ -3786,7 +3721,7 @@ namespace
       gen_swap_related (SemanticGraph::Operation&)
       {
       }
-      
+
       virtual void
       traverse (SemanticGraph::HomeFactory&)
       {
@@ -3804,10 +3739,10 @@ namespace
     {
       FactoryOperationEmitter (Context& c, SemanticGraph::Home& home)
         : EmitterBase (c),
-          return_type_name_emitter_ (c.os ()),
-          enclosing_type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
-          type_name_emitter_ (c.os ()),
+          return_type_name_emitter_ (c),
+          enclosing_type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
+          type_name_emitter_ (c),
           scope_ (home)
       {
         returns_.node_traverser (return_type_name_emitter_);
@@ -3858,7 +3793,7 @@ namespace
       virtual void
       raises_pre (SemanticGraph::HomeFactory&)
       {
-        os << STRS[EXCP_START] << endl
+        os << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl;
       }
 
@@ -3894,7 +3829,7 @@ namespace
           operation_emitter.traverse (hf);
         }
 
-        os << STRS[ACE_CR] << " (";
+        os << STRS[ACE_CR] << " ( ";
 
         Traversal::Home::manages (scope_, manages_);
 
@@ -3918,7 +3853,7 @@ namespace
            << "_ciao_ec.in ()" << endl
            << STRS[ENV_ARG] << ");" << endl;
 
-        os << STRS[ACE_CR] << " (";
+        os << STRS[ACE_CR] << " ( ";
 
         Traversal::Home::manages (scope_, manages_);
 
@@ -3941,7 +3876,7 @@ namespace
       ReturnTypeNameEmitter return_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       Traversal::Returns returns_;
       Traversal::Manages enclosing_manages_;
       Traversal::Manages simple_manages_;
@@ -3955,10 +3890,10 @@ namespace
     {
       FinderOperationEmitter (Context& c, SemanticGraph::Home& home)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ()),
-          return_type_name_emitter_ (c.os ()),
-          enclosing_type_name_emitter_ (c.os ()),
-          simple_type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c),
+          return_type_name_emitter_ (c),
+          enclosing_type_name_emitter_ (c),
+          simple_type_name_emitter_ (c),
           scope_ (home)
       {
         returns_.node_traverser (return_type_name_emitter_);
@@ -4009,7 +3944,7 @@ namespace
       virtual void
       raises_pre (SemanticGraph::HomeFinder&)
       {
-        os << STRS[EXCP_START] << endl
+        os << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl;
       }
 
@@ -4023,8 +3958,7 @@ namespace
       post (SemanticGraph::HomeFinder& hf)
       {
         os << "{"
-           << STRS[ACE_TR] << " (" << endl
-           << "::CORBA::NO_IMPLEMENT ()," << endl;
+           << STRS[ACE_TR] << " ( ::CORBA::NO_IMPLEMENT ()," << endl;
 
         Traversal::HomeFinder::returns (hf, simple_returns_);
 
@@ -4039,7 +3973,7 @@ namespace
       }
 
     private:
-      TypeNameEmitter type_name_emitter_;
+      FullTypeNameEmitter type_name_emitter_;
       ReturnTypeNameEmitter return_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -4060,23 +3994,23 @@ namespace
          << "_ptr exe," << endl
          << "const char *ins_name," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c))," << endl
+         << "  : CIAO::Home_Servant_Impl_Base (c)," << endl
          << "    home_svnt_base (exe, c, ins_name";
-         
+
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
-        
+
       if (swapping)
-      {   
-        os << ", \"" << ctx.composition_name ();
-           
-        Traversal::Home::manages (t, flat_name_manages_);
-        
-        os << "\", ";
-           
-        Traversal::Home::manages (t, repo_id_manages_);
-      }
-         
+        {
+          os << ", \"" << ctx.composition_name ();
+
+          Traversal::Home::manages (t, flat_name_manages_);
+
+          os << "\", ";
+
+          Traversal::Home::manages (t, repo_id_manages_);
+        }
+
       os << ")" << endl
          << "{"
          << "}";
@@ -4108,15 +4042,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4125,9 +4059,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4155,7 +4089,7 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter<SemanticGraph::Home> operation_emitter (ctx, t);
@@ -4169,15 +4103,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4186,9 +4120,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4223,15 +4157,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (os);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
-        ParameterEmitter<Traversal::OutParameter> out_param (os);
+        ParameterEmitter<Traversal::InParameter> in_param (ctx);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
+        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (os);
-        TypeNameEmitter type_name_emitter (os);
+        ReturnTypeNameEmitter return_type_emitter (ctx);
+        FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4240,9 +4174,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (os);
-        INOUTArgTypeNameEmitter inout_arg_emitter (os);
-        OUTArgTypeNameEmitter out_arg_emitter (os);
+        INArgTypeNameEmitter in_arg_emitter (ctx);
+        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
+        OUTArgTypeNameEmitter out_arg_emitter (ctx);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4263,7 +4197,7 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         home_emitter.traverse (t);
@@ -4276,9 +4210,11 @@ namespace
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::PortableServer::Servant"
          << endl
-         << "create" << t.name () << "_Servant (" << endl
+         << "create"
+         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
+         << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
-         << "CIAO::Session_Container *c," << endl
+         << "::CIAO::Session_Container *c," << endl
          << "const char *ins_name" << endl
          << STRS[ENV_SRC] << ")" << endl
          << "{"
@@ -4312,30 +4248,6 @@ namespace
     Traversal::Manages repo_id_manages_;
     Traversal::Manages flat_name_manages_;
   };
-
-  //@@ There is exactly the same code in header generator.
-  //
-  struct CompositionEmitter : Traversal::Composition, EmitterBase
-  {
-    CompositionEmitter (Context& c)
-      : EmitterBase (c)
-    {
-    }
-
-    virtual void
-    pre (Type& t)
-    {
-      ctx.composition_name (t.name ().str ());
-    
-      os << STRS[CIDL_NS] << t.name () << "{";
-    }
-
-    virtual void
-    post (Type&)
-    {
-      os << "}";
-    }
-  };
 }
 
 ServantSourceEmitter::ServantSourceEmitter (std::ostream& os_,
@@ -4356,21 +4268,21 @@ ServantSourceEmitter::pre (TranslationUnit&)
   string file_name ("");
 
   if (! file_.empty ())
-  {
-    file_name = file_.leaf ();
-  }
+    {
+      file_name = file_.leaf ();
+    }
 
   string file_suffix = cl_.get_value ("svnt-hdr-file-suffix",
                                       "_svnt.h");
 
   file_name = regex::perl_s (file_name,
-                             "/(\\.(idl|cidl|cdl))?$/"
+                             "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
                              + file_suffix
                              + "/");
 
   string swap_option = cl_.get_value ("custom-container", "");
   bool swapping = (swap_option == "upgradeable");
-      
+
   os << "#include \"" << file_name << "\"" << endl
      << "#include \"Cookies.h\"" << endl
      << "#include \"ciao/Servant_Activator.h\"" << endl
@@ -4407,7 +4319,7 @@ ServantSourceEmitter::generate (TranslationUnit& u)
 
   //--
   Traversal::Root root;
-//  includes.node_traverser (region);
+  //  includes.node_traverser (region);
   contains_root.node_traverser (root);
 
   // Layer 3
@@ -4451,9 +4363,3 @@ ServantSourceEmitter::generate (TranslationUnit& u)
   unit.traverse (u);
 }
 
-/*
- * Local Variables:
- * mode: C++
- * c-basic-offset: 2
- * End:
- */
diff --git a/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp b/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
index 509f9a187bf..b8f44e879ed 100644
--- a/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
+++ b/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
@@ -70,9 +70,13 @@ namespace
     virtual void
     traverse (SemanticGraph::Struct& s)
     {
+      std::string n (s.scoped_name ().str ());
       if (s.context ().count (STRS[VAR_SIZE]))
       {
-        top () = s.context ().get<bool> (STRS[VAR_SIZE]);
+        // Never set 'top' to false (except in pre() above),
+        // so a 'true' value will propagate up the scopes.
+        bool r = s.context ().get<bool> (STRS[VAR_SIZE]);
+        if (r) top () = r;
       }
       else
       {
@@ -83,13 +87,8 @@ namespace
     virtual void
     post (SemanticGraph::Struct& s)
     {
-      bool r (top ());
-
-      s.context ().set (STRS[VAR_SIZE], r);
-
-      pop ();
-
-      if (r) top () = r;
+      // Set our context to the result of nested scope traversal.
+      s.context ().set (STRS[VAR_SIZE], top ());
     }
 
     virtual void
@@ -103,7 +102,10 @@ namespace
     {
       if (u.context ().count (STRS[VAR_SIZE]))
       {
-        top () = u.context ().get<bool> (STRS[VAR_SIZE]);
+        // Never set 'top' to false (except in pre() above),
+        // so a 'true' value will propagate up the scopes.
+        bool r = u.context ().get<bool> (STRS[VAR_SIZE]);
+        if (r) top () = r;
       }
       else
       {
@@ -114,13 +116,8 @@ namespace
     virtual void
     post (SemanticGraph::Union& u)
     {
-      bool r (top ());
-
-      u.context ().set (STRS[VAR_SIZE], r);
-
-      pop ();
-
-      if (r) top () = r;
+      // Set our context to the result of nested scope traversal.
+      u.context ().set (STRS[VAR_SIZE], top ());
     }
 
   private:
@@ -166,12 +163,12 @@ calculate (SemanticGraph::TranslationUnit& u)
   //
   Traversal::ContainsRoot contains_root;
   Traversal::Includes includes;
-  
+
   region.edge_traverser (includes);
   region.edge_traverser (contains_root);
-  
+
   //--
-  Traversal::Root root;  
+  Traversal::Root root;
   includes.node_traverser (region);
   contains_root.node_traverser (root);
 
@@ -186,15 +183,15 @@ calculate (SemanticGraph::TranslationUnit& u)
   Traversal::UnconstrainedInterface uinterface;
   Traversal::ValueType vtype;
   Traversal::Home component_home;
-  
+
   Calculator calculator;
-  
+
   defines.node_traverser (module);
   defines.node_traverser (uinterface);
   defines.node_traverser (vtype);
   defines.node_traverser (component_home);
   defines.node_traverser (calculator);
-  
+
   // Layer 4
   //
   Traversal::Defines struct_defines;
@@ -203,16 +200,16 @@ calculate (SemanticGraph::TranslationUnit& u)
   vtype.edge_traverser (defines);
   component_home.edge_traverser (defines);
   calculator.edge_traverser (struct_defines);
-  
+
   //--
   Traversal::Member member;
   struct_defines.node_traverser (member);
-  
+
   // Layer 5
   //
   Traversal::Belongs belongs;
   member.edge_traverser (belongs);
-  
+
   //--
   belongs.node_traverser (calculator);
 
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
deleted file mode 100644
index 6c3d31ff69c..00000000000
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
+++ /dev/null
@@ -1,1973 +0,0 @@
-// file      : CIDLC/TypeNameEmitter.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "TypeNameEmitter.hpp"
-#include "Literals.hpp"
-
-#include <ostream>
-
-using namespace std;
-using namespace StringLiterals;
-
-TypeNameEmitter::TypeNameEmitter (ostream& os_)
-  : os (os_)
-{
-}
-
-void
-TypeNameEmitter::traverse (Void&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Boolean&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Octet&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Char&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Wchar&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Short&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedShort&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Long&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (LongLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (UnsignedLongLong&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Float&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Double&)
-{
-}
-
-void
-TypeNameEmitter::traverse (String&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Wstring&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Object&)
-{
-}
-
-void
-TypeNameEmitter::traverse (ValueBase&)
-{
-}
-
-void
-TypeNameEmitter::traverse (Any&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Enum&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Struct&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Union&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Interface&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::ValueType&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::EventType&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Component&)
-{
-}
-
-void
-TypeNameEmitter::traverse (SemanticGraph::Home&)
-{
-}
-
-// ====================================================================
-
-ReturnTypeNameEmitter::ReturnTypeNameEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-ReturnTypeNameEmitter::traverse (Void&)
-{
-  os << "void";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short";
-}
-
-void
-ReturnTypeNameEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long";
-}
-
-void
-ReturnTypeNameEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong";
-}
-
-void
-ReturnTypeNameEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong";
-}
-
-void
-ReturnTypeNameEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double";
-}
-
-void
-ReturnTypeNameEmitter::traverse (String&)
-{
-  os << "char *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_ptr";
-}
-
-void
-ReturnTypeNameEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Any&)
-{
-  os << "::CORBA::Any *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name ();
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  os << s.scoped_name ();
-  
-  if (var_size)
-  {
-    os << " *";
-  }
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  os << u.scoped_name ();
-  
-  if (var_size)
-  {
-    os << " *";
-  }
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << s.scoped_name () << " *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_ptr";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << " *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << " *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_ptr";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr";
-}
-
-// ===============================================================
-
-INArgTypeNameEmitter::INArgTypeNameEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-INArgTypeNameEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean";
-}
-
-void
-INArgTypeNameEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet";
-}
-
-void
-INArgTypeNameEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char";
-}
-
-void
-INArgTypeNameEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar";
-}
-
-void
-INArgTypeNameEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short";
-}
-
-void
-INArgTypeNameEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort";
-}
-
-void
-INArgTypeNameEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long";
-}
-
-void
-INArgTypeNameEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong";
-}
-
-void
-INArgTypeNameEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong";
-}
-
-void
-INArgTypeNameEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong";
-}
-
-void
-INArgTypeNameEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float";
-}
-
-void
-INArgTypeNameEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double";
-}
-
-void
-INArgTypeNameEmitter::traverse (String&)
-{
-  os << "const char *";
-}
-
-void
-INArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "const ::CORBA::WChar *";
-}
-
-void
-INArgTypeNameEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_ptr";
-}
-
-void
-INArgTypeNameEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase *";
-}
-
-void
-INArgTypeNameEmitter::traverse (Any&)
-{
-  os << "const ::CORBA::Any &";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name ();
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Struct& s)
-{
-  os << "const " << s.scoped_name () << " &";;
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Union& u)
-{
-  os << "const " << u.scoped_name () << " &";;
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << "const " << s.scoped_name () << " &";;
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_ptr";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << " *";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << " *";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_ptr";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr";
-}
-
-// ===============================================================
-
-INOUTArgTypeNameEmitter::INOUTArgTypeNameEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (String&)
-{
-  os << "char *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_ptr &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Any&)
-{
-  os << "::CORBA::Any &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << " &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Struct& s)
-{
-  os << s.scoped_name () << " &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Union& u)
-{
-  os << u.scoped_name () << " &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << s.scoped_name () << " &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_ptr &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << " *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << " *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_ptr &";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr";
-}
-
-// =================================================================
-
-OUTArgTypeNameEmitter::OUTArgTypeNameEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (String&)
-{
-  os << "::CORBA::String_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WString_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Any&)
-{
-  os << "::CORBA::Any_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Struct& s)
-{
-  os << s.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Union& u)
-{
-  os << u.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << s.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr";
-}
-
-// ====================================================================
-
-NullReturnEmitter::NullReturnEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-NullReturnEmitter::traverse (Boolean&)
-{
-  os << "return false;";
-}
-
-void
-NullReturnEmitter::traverse (Octet&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Char&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Wchar&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Short&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (UnsignedShort&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Long&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (UnsignedLong&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (LongLong&)
-{
-  os << "return ACE_CDR_LONGLONG_INITIALIZER;";
-}
-
-void
-NullReturnEmitter::traverse (UnsignedLongLong&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Float&)
-{
-  os << "return 0.0f;";
-}
-
-void
-NullReturnEmitter::traverse (Double&)
-{
-  os << "return 0.0;";
-}
-
-void
-NullReturnEmitter::traverse (String&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Wstring&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Object&)
-{
-  os << "return ::CORBA::Object::_nil ();";
-}
-
-void
-NullReturnEmitter::traverse (ValueBase&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Any&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << " retval;" << endl
-     << "return retval;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "return 0;";
-  }
-  else
-  {
-    os << s.scoped_name () << " retval;" << endl
-       << "return retval;";
-  }
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "return 0;";
-  }
-  else
-  {
-    os << u.scoped_name () << " retval;" << endl
-       << "return retval;";
-  }
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << "return " << i.scoped_name () << "::_nil ();";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << "return " << c.scoped_name () << "::_nil ();";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << "return " << h.scoped_name () << "::_nil ();";
-}
-
-// ====================================================================
-
-AceCheckReturnEmitter::AceCheckReturnEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-AceCheckReturnEmitter::traverse (Void&)
-{
-  os << "ACE_CHECK;";
-}
-
-void
-AceCheckReturnEmitter::traverse (Boolean&)
-{
-  os << STRS[ACE_CR] << " (false);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Octet&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Char&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Wchar&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Short&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedShort&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Long&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedLong&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (LongLong&)
-{
-  os << STRS[ACE_CR] << " (ACE_CDR_LONGLONG_INITIALIZER);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedLongLong&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Float&)
-{
-  os << STRS[ACE_CR] << " (0.0f);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Double&)
-{
-  os << STRS[ACE_CR] << " (0.0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (String&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Wstring&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Object&)
-{
-  os << STRS[ACE_CR] << " (::CORBA::Object::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (ValueBase&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Any&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << " retval;"
-     << STRS[ACE_UA] << " (retval);"
-     << STRS[ACE_CR] << " (retval);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << STRS[ACE_CR] << " (0);";
-  }
-  else
-  {
-    os << s.scoped_name () << " retval;"
-       << STRS[ACE_UA] << " (retval);"
-       << STRS[ACE_CR] << " (retval);";
-  }
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << STRS[ACE_CR] << " (0);";
-  }
-  else
-  {
-    os << u.scoped_name () << " retval;"
-       << STRS[ACE_UA] << " (retval);"
-       << STRS[ACE_CR] << " (retval);";
-  }
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << STRS[ACE_CR] << " (" << i.scoped_name () << "::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << STRS[ACE_CR] << " (" << c.scoped_name () << "::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << STRS[ACE_CR] << " (" << h.scoped_name () << "::_nil ());";
-}
-
-// ====================================================================
-
-NullRHSEmitter::NullRHSEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-NullRHSEmitter::traverse (Boolean&)
-{
-  os << "= false;";
-}
-
-void
-NullRHSEmitter::traverse (Octet&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Char&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Wchar&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Short&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedShort&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Long&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedLong&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (LongLong&)
-{
-  os << "= ACE_CDR_LONGLONG_INITIALIZER;";
-}
-
-void
-NullRHSEmitter::traverse (UnsignedLongLong&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Float&)
-{
-  os << "= 0.0f;";
-}
-
-void
-NullRHSEmitter::traverse (Double&)
-{
-  os << "= 0.0;";
-}
-
-void
-NullRHSEmitter::traverse (String&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Wstring&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Object&)
-{
-  os << "= ::CORBA::Object::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (ValueBase&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Any&)
-{
-  // This will hopefully work both if the lhs is a pointer (for example
-  // RetunrTypeNameEmitter) or not (for example INArgTypeNameEmitter).
-  os << ";";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Enum&)
-{
-  os << ";";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "= 0;";
-  }
-  else
-  {
-    os << ";";
-  }
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (var_size)
-  {
-    os << "= 0;";
-  }
-  else
-  {
-    os << ";";
-  }
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << "= " << i.scoped_name () << "::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << "= " << c.scoped_name () << "::_nil ();";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << "= " << h.scoped_name () << "::_nil ();";
-}
-
-// ====================================================================
-
-ExtractedTypeDeclEmitter::ExtractedTypeDeclEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Boolean&)
-{
-  os << "::CORBA::Boolean " << STRS[EXTRACT_TMP] << " = false;"
-     << "::CORBA::Any::to_boolean " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Octet&)
-{
-  os << "::CORBA::Octet " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_octet " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Char&)
-{
-  os << "::CORBA::Char " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_char " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Wchar&)
-{
-  os << "::CORBA::WChar " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_wchar " << STRS[EXTRACT] 
-     << " (" << STRS[EXTRACT_TMP] << ");";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Short&)
-{
-  os << "::CORBA::Short " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedShort&)
-{
-  os << "::CORBA::UShort " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Long&)
-{
-  os << "::CORBA::Long " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedLong&)
-{
-  os << "::CORBA::ULong " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (LongLong&)
-{
-  os << "::CORBA::LongLong " << STRS[EXTRACT] 
-     << " = ACE_CDR_LONGLONG_INITIALIZER;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (UnsignedLongLong&)
-{
-  os << "::CORBA::ULongLong " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Float&)
-{
-  os << "::CORBA::Float " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Double&)
-{
-  os << "::CORBA::Double " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (String&)
-{
-  os << "const char * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Object&)
-{
-  os << "::CORBA::Object_ptr " << STRS[EXTRACT] 
-     << " = ::CORBA::Object::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (ValueBase&)
-{
-  os << "::CORBA::ValueBase * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Any&)
-{
-  os << "::CORBA::Any * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << " " << STRS[EXTRACT] << ";";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Struct& s)
-{
-  os << s.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Union& u)
-{
-  os << u.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::UnboundedSequence& s)
-{
-  os << s.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << i.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << i.scoped_name () << "::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::ValueType& v)
-{
-  os << v.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::EventType& e)
-{
-  os << e.scoped_name () << " * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << c.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << c.scoped_name () << "::_nil ();";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << h.scoped_name () << "_ptr " << STRS[EXTRACT] << " = "
-     << h.scoped_name () << "::_nil ();";
-}
-
-// ====================================================================
-
-AssignFromExtractedEmitter::AssignFromExtractedEmitter (ostream& os_)
-  : TypeNameEmitter (os_)
-{
-}
-
-void
-AssignFromExtractedEmitter::traverse (Boolean&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Octet&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Char&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Wchar&)
-{
-  os << STRS[EXTRACT] << ".ref_";
-}
-
-void
-AssignFromExtractedEmitter::traverse (Short&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedShort&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Long&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (LongLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (UnsignedLongLong&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Float&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Double&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (String&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Wstring&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Object&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (ValueBase&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Any&)
-{
-  os << "*" << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Enum&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (!var_size)
-  {
-    os << "*";
-  }
-  
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
-  if (!var_size)
-  {
-    os << "*";
-  }
-  
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << "*" << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Interface&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Component&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::Home&)
-{
-  os << STRS[EXTRACT];
-}
-
-// ====================================================================
-
-SetAttributeDelegationEmitter::SetAttributeDelegationEmitter (
-    ostream& os,
-    SemanticGraph::ReadWriteAttribute& a
-  )
-  : TypeNameEmitter (os),
-    attr_ (a),
-    assign_emitter_ (os),
-    extract_emitter_ (os)
-{
-  assign_belongs_.node_traverser (assign_emitter_);
-  extract_belongs_.node_traverser (extract_emitter_);
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Boolean&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Octet&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Char&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Wchar&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Short&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (UnsignedShort&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Long&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (UnsignedLong&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (LongLong&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (UnsignedLongLong&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Float&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Double&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (String&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Wstring&)
-{
-  emit_error ("wstring");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Object&)
-{
-  emit_error ("CORBA::Object");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (ValueBase&)
-{
-  emit_error ("CORBA::ValueBase");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Any&)
-{
-  emit_error ("CORBA::Any");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Enum&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Struct& s)
-{
-  emit_error ("struct");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Union& u)
-{
-  emit_error ("union");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  emit_error ("sequence");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Interface&)
-{
-  emit_error ("interface");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::ValueType&)
-{
-  emit_error ("valuetype");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::EventType&)
-{
-  emit_error ("eventtype");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Component&)
-{
-  emit_error ("component");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Home&)
-{
-  emit_error ("home");
-}
-
-void
-SetAttributeDelegationEmitter::emit_delegation (void)
-{
-  open_if_block ();
-  
-  Traversal::ReadWriteAttribute::belongs (attr_, extract_belongs_);
-
-  os << "descr_value >>= " << STRS[EXTRACT] << ";"
-     << "this->" << attr_.name () << " (";
-  
-  Traversal::ReadWriteAttribute::belongs (attr_, assign_belongs_);
-   
-  os << ");";
-  
-  close_if_block ();
-}
-
-void
-SetAttributeDelegationEmitter::emit_error (const char *corba_kind)
-{
-  open_if_block ();
-  
-  os << "ACE_ERROR ((" << endl
-     << "    LM_ERROR," << endl
-     << "    \"Component attributes of " << corba_kind << "\"" << endl
-     << "    \"IDL type are not yet supported by CIAO\\n\"" << endl
-     << "  ));";
-     
-  close_if_block ();
-}
-
-void
-SetAttributeDelegationEmitter::open_if_block (void)
-{
-  os << "if (ACE_OS::strcmp (descr_name, \""
-     << attr_.name () << "\") == 0)" << endl
-     << "{";
-}
-
-void
-SetAttributeDelegationEmitter::close_if_block (void)
-{
-  os << "continue;"
-     << "}";
-}
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
deleted file mode 100644
index 90ff4931e53..00000000000
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
+++ /dev/null
@@ -1,458 +0,0 @@
-// file      : CIDLC/TypeNameEmitter.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TYPENAME_EMITTER_HPP
-#define TYPENAME_EMITTER_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-// Base class that holds the ostream member
-// common to every other class in this file,
-// and collects the ancestors in one place.
-//
-class TypeNameEmitter : public Traversal::Void,
-                        public Traversal::Boolean,
-                        public Traversal::Octet,
-                        public Traversal::Char,
-                        public Traversal::Wchar,
-                        public Traversal::Short,
-                        public Traversal::UnsignedShort,
-                        public Traversal::Long,
-                        public Traversal::UnsignedLong,
-                        public Traversal::LongLong,
-                        public Traversal::UnsignedLongLong,
-                        public Traversal::Float,
-                        public Traversal::Double,
-                        public Traversal::String,
-                        public Traversal::Wstring,
-                        public Traversal::Object,
-                        public Traversal::ValueBase,
-                        public Traversal::Any,
-                        public Traversal::Enum,
-                        public Traversal::Struct,
-                        public Traversal::Union,
-                        public Traversal::UnboundedSequence,
-                        public Traversal::Interface,
-                        public Traversal::ValueType,
-                        public Traversal::EventType,
-                        public Traversal::Component,
-                        public Traversal::Home
-{
-public:
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-  
-protected:
-  TypeNameEmitter (std::ostream&);
-
-  std::ostream& os;
-};
-
-// Generates the name of an operation's return type.
-//
-//
-class ReturnTypeNameEmitter : public TypeNameEmitter
-{
-public:
-  ReturnTypeNameEmitter (std::ostream&);
-
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the typename of an IN argument.
-//
-//
-class INArgTypeNameEmitter : public TypeNameEmitter
-{
-public:
-  INArgTypeNameEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the typename of an INOUT argument.
-//
-//
-class INOUTArgTypeNameEmitter : public TypeNameEmitter
-{
-public:
-  INOUTArgTypeNameEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the typename of an OUT argument.
-//
-//
-class OUTArgTypeNameEmitter : public TypeNameEmitter
-{
-public:
-  OUTArgTypeNameEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates 'return' plus the appropriate NULL return value,
-// including no output for Void.
-//
-//
-class NullReturnEmitter : public TypeNameEmitter
-{
-public:
-  NullReturnEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates 'return' plus the appropriate NULL return value,
-// including no output for Void.
-//
-//
-class AceCheckReturnEmitter : public TypeNameEmitter
-{
-public:
-  AceCheckReturnEmitter (std::ostream&);
-
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the appropriate NULL value, including the assignment operator,
-// if needed, for the rhs of an assignment statement.
-//
-//
-class NullRHSEmitter : public TypeNameEmitter
-{
-public:
-  NullRHSEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class ExtractedTypeDeclEmitter : public TypeNameEmitter
-{
-public:
-  ExtractedTypeDeclEmitter (std::ostream&);
-  
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class AssignFromExtractedEmitter : public TypeNameEmitter
-{
-public:
-  AssignFromExtractedEmitter (std::ostream&);
-  
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-class SetAttributeDelegationEmitter : public TypeNameEmitter,
-                                      public Traversal::ReadWriteAttribute
-{
-public:
-  SetAttributeDelegationEmitter (std::ostream&,
-                                 SemanticGraph::ReadWriteAttribute&);
-  
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-  
-private:  
-  void emit_delegation (void);
-  void emit_error (const char *);
-  void open_if_block (void);
-  void close_if_block (void);
-  
-private:
-  SemanticGraph::ReadWriteAttribute& attr_;
-  AssignFromExtractedEmitter assign_emitter_;
-  ExtractedTypeDeclEmitter extract_emitter_;
-  Traversal::Belongs assign_belongs_;
-  Traversal::Belongs extract_belongs_;
-};
-
-#endif /* TYPENAME_EMITTER_HPP */
diff --git a/TAO/CIAO/CIDLC/Version b/TAO/CIAO/CIDLC/Version
index 99d85ecdbb7..1750564f270 100644
--- a/TAO/CIAO/CIDLC/Version
+++ b/TAO/CIAO/CIDLC/Version
@@ -1 +1 @@
-0.0.6
\ No newline at end of file
+0.0.6
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index aea178da6a5..d3a1ed91885 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -187,7 +187,37 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       : static_cast<std::istream&> (std::cin);
 
     InputStreamAdapter isa (is);
-    CPP::Preprocessor pp (isa);
+
+
+    // Extract preprocessor symbol definitions (-D). We are not
+    // interested in the values, just symbols.
+    //
+    CPP::Symbols symbols;
+
+    for (CommandLine::OptionsIterator
+           i (cl.options_begin ()), e (cl.options_end ()); i != e; ++i)
+    {
+      if (i->name () == "D")
+      {
+        std::string def (i->value ());
+
+        // Get rid of '=value' in 'symbol=value' definitions.
+        //
+        std::size_t p (def.find ('='));
+        if (p != std::string::npos)
+          symbols.insert (std::string (def, 0, p));
+        else
+          symbols.insert (def);
+      }
+      else if (i->name ()[0] == 'D')
+      {
+        std::string opt (i->name ());
+        std::string def (opt.begin () + 1, opt.end ());
+        symbols.insert (def);
+      }
+    }
+
+    CPP::Preprocessor pp (isa, symbols);
 
     if (cl.get_value ("preprocess-only", false))
     {
@@ -232,6 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     context.set ("file-path", file_path);
     context.set ("trace-semantic-action",
                  cl.get_value ("trace-semantic-actions", false));
+    context.set ("cpp-symbols", symbols);
 
 
     // Extract include search paths.
@@ -242,16 +273,29 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     for (CommandLine::OptionsIterator
            i (cl.options_begin ()), e (cl.options_end ()); i != e; ++i)
     {
+      std::string path;
+
       if (i->name () == "I")
       {
-        include_paths.push_back (fs::path (i->value (), fs::native));
+        path = i->value ();
       }
       else if (i->name ()[0] == 'I')
       {
         std::string opt (i->name ());
-        std::string path (opt.begin () + 1, opt.end ());
+        path = std::string (opt.begin () + 1, opt.end ());
+      }
+
+      try
+      {
         include_paths.push_back (fs::path (path, fs::native));
       }
+      catch (fs::filesystem_error const&)
+      {
+        cerr << "error: invalid filesystem path '" << path << "' "
+             << "provided with the -I option" << endl;
+
+        return 1;
+      }
     }
 
     context.set ("include-search-paths", include_paths);
diff --git a/TAO/CIAO/COPYING b/TAO/CIAO/COPYING
index 41eecbf0fc3..35b26e8f8b7 100644
--- a/TAO/CIAO/COPYING
+++ b/TAO/CIAO/COPYING
@@ -8,11 +8,11 @@
    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-2005, all rights reserved. Since DOC software is
-   open-source, free 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,
+   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.
    
@@ -67,9 +67,16 @@
    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.
+   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
+   2005," which established new daylight savings times (DST) rules for
+   the United States that expand DST as of March 2007. Since DOC software
+   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
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index b32f54ab9f7..76e0c4ecf02 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,5237 +1,2044 @@
-Mon Oct 17 13:21:59 2005  William Otte  <wotte@dre.vanderbilt.edu>
+Tue Apr 11 12:39:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* docs/schema/ccd.xsd
+        * tools/Config_Handlers/Utils/Utils.mpc:
+          Use exceptions as base project
 
-	Updated to work with expected format for Repoman/ComponentPackager
-
-Fri Oct 14 17:22:59 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Basic_Deployment_Data.cpp
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-	* tools/Config_Handlers/Deployment.cpp
-	* tools/Config_Handlers/Deployment.hpp
-	* tools/Config_Handlers/ccd.cpp
-	* tools/Config_Handlers/ccd.hpp
-	* tools/Config_Handlers/cdd.cpp
-	* tools/Config_Handlers/cdd.hpp
-	* tools/Config_Handlers/cdp.cpp
-	* tools/Config_Handlers/cdp.hpp
-	* tools/Config_Handlers/cid.cpp
-	* tools/Config_Handlers/cid.hpp
-	* tools/Config_Handlers/cpd.cpp
-	* tools/Config_Handlers/cpd.hpp
-	* tools/Config_Handlers/iad.cpp
-	* tools/Config_Handlers/iad.hpp
-	* tools/Config_Handlers/pcd.cpp
-	* tools/Config_Handlers/pcd.hpp
-	* tools/Config_Handlers/toplevel.cpp
-	* tools/Config_Handlers/toplevel.hpp
-
-	Regerated with new version of XSC which implements some heavy
-	optimizations. 
-	
-Fri Oct 14 14:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp:
-          Removed not needed ;
-
-Thu Oct 13 15:42:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-       * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-       * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-       * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
-
-       Various compile fixes for Borland.
-
-       * tools/Config_Handlers/XMLSchema/Types.hpp
-
-       Modified to use ACE typedefs for number types.
-
-       * tools/Config_Handlers/XSCRT/Elements.hpp
-
-       Removed unneeded non-const conversion operator which was causing
-       errors in Borland.
-
-Wed Oct 12 14:13:09 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* examples/Hello/Sender/Sender.idl
-	* examples/Hello/Sender/Sender_exec.cpp
-	* examples/Hello/Sender/Sender_exec.h
-	* examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
-
-	Example of initializing enumerated attributes.
-
-Wed Oct 12 15:08:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/Config_Handlers/RT-CCM/TP_Handler.cpp:
-
-          Changed the types of some static_casts on the rhs of
-          assignments to match the types on the lhs, eliminating
-          warnings from MSVC 7.1.
-
-Wed Oct 12 13:17:58 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/TypeNameEmitter.cpp:
-
-          Removed generation of error message with code that attempts
-          to set an enum attribute value, and replace it with code
-          that extracts the enum value from the Any arguement.
-
-Wed Oct 12 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h:
-          Fixed fuzz check
-
-Tue Oct 11 16:37:01 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Basic_Deployment_Data.cpp
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-	* tools/Config_Handlers/Deployment.cpp
-	* tools/Config_Handlers/Deployment.hpp
-	* tools/Config_Handlers/ccd.cpp
-	* tools/Config_Handlers/ccd.hpp
-	* tools/Config_Handlers/cdd.cpp
-	* tools/Config_Handlers/cdd.hpp
-	* tools/Config_Handlers/cdp.cpp
-	* tools/Config_Handlers/cdp.hpp
-	* tools/Config_Handlers/cid.cpp
-	* tools/Config_Handlers/cid.hpp
-	* tools/Config_Handlers/cpd.cpp
-	* tools/Config_Handlers/cpd.hpp
-	* tools/Config_Handlers/iad.cpp
-	* tools/Config_Handlers/iad.hpp
-	* tools/Config_Handlers/pcd.cpp
-	* tools/Config_Handlers/pcd.hpp
-	* tools/Config_Handlers/toplevel.cpp
-	* tools/Config_Handlers/toplevel.hpp
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-
-	Fixed a bug which broke the gaurantee that element order in the
-	XSC type would be the same as the element order in the instance
-	document.
-
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
-
-	Fixed a runtime error and removed some debugging information.
-
-Mon Oct 10 17:37:20 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu
-
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
-
-	reverted a change we made earlier to accomodate older verisons of ZZIPLIB
-
-
-Mon Oct 10 15:46:57 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
-
-	Trivial corrections for portability problems.
-
-	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
-
-	Updated to properlly use base projects.
-
-Mon Oct 10 20:07:39 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc:
-        * tools/Config_Handlers/DynAny_Handler.mpc:
-
-          Add export files to projects, and removed redundant
-          base projects.
-
-        * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp:
-
-          Changed some static casts on the rhs of assignments to types
-          corresponding to the lhs, elminating warnings on MSVC 7.1.
-
-Mon Oct 10 15:05:00 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* docs/schema/Basic_Deployment_Data.xsd
-	* docs/schema/cdd.xsd
-
-	Checking in some updated schema for domain information.
-
-Mon Oct 10 13:53:15 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-	* tools/Config_Handlers/Config_Handlers.mpc
-	* tools/Config_Handlers/Deployment.hpp
-	* tools/Config_Handlers/DynAny_Handler.mpc
-	* tools/Config_Handlers/IDREF_Base.h
-	* tools/Config_Handlers/XSC_XML_Handlers_Export.h
-	* tools/Config_Handlers/ccd.hpp
-	* tools/Config_Handlers/cdd.hpp
-	* tools/Config_Handlers/cdp.hpp
-	* tools/Config_Handlers/cid.hpp
-	* tools/Config_Handlers/cpd.hpp
-	* tools/Config_Handlers/iad.hpp
-	* tools/Config_Handlers/pcd.hpp
-	* tools/Config_Handlers/toplevel.hpp
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
-	* tools/Config_Handlers/RT-CCM/CB_Handler.h
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-	* tools/Config_Handlers/RT-CCM/CLA_Handler.h
-	* tools/Config_Handlers/RT-CCM/OC_Handler.h
-	* tools/Config_Handlers/RT-CCM/OR_Handler.h
-	* tools/Config_Handlers/RT-CCM/PM_Handler.h
-	* tools/Config_Handlers/RT-CCM/PS_Handler.h
-	* tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
-	* tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
-	* tools/Config_Handlers/RT-CCM/TPL_Handler.h
-	* tools/Config_Handlers/RT-CCM/TP_Handler.h
-	* tools/Config_Handlers/RT-CCM/input.csr
-	* tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h
-	* tools/Config_Handlers/Utils/Utils.mpc
-	* tools/Config_Handlers/Utils/XML_Error_Handler.h
-	* tools/Config_Handlers/Utils/XML_Helper.h
-	* tools/Config_Handlers/Utils/XML_Schema_Resolver.h
-
-	Fixed messy export macro usage.  This will clean up builds on
-	Windows.
-
-Sun Oct 9 19:22:44 CDT 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu
-
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
-	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
-
-	Fixing a few includes after Will Otte's latest changes.
-
-
-Sun Oct  9 09:51:41 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/DynAny_Handler.mpc
-
-	Moved this file down a level to make MPC stop complaining.
-
-Fri Oct  7 18:22:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Any_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
-
-	*Hopefully* fix compile problem on Windows.
-
-Fri Oct  7 18:25:11 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/ADD_Handler.cpp
-	* tools/Config_Handlers/DP_Handler.cpp
-	* tools/Config_Handlers/IDD_Handler.cpp
-	* tools/Config_Handlers/MDD_Handler.cpp
-
-	Fix runtime error.
-
-Fri Oct  7 16:18:40 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Config_Handlers.mpc
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
-
-	Fix for a compile problem.
-
-Fri Oct  7 14:25:09 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
-	* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
-	* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
-	* tools/Config_Handlers/Any_Handler.cpp
-
-	Add support for using Dynamic Any.  This will evolve in the coming
-	weeks into more complete support for complex types.
-
-	* tools/Config_Handlers/ADD_Handler.cpp
-	* tools/Config_Handlers/ADD_Handler.h
-	* tools/Config_Handlers/Basic_Deployment_Data.cpp
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-	* tools/Config_Handlers/CCD_Handler.cpp
-	* tools/Config_Handlers/CCD_Handler.h
-	* tools/Config_Handlers/CEPE_Handler.cpp
-	* tools/Config_Handlers/CEPE_Handler.h
-	* tools/Config_Handlers/DP_Handler.cpp
-	* tools/Config_Handlers/DP_PCD_Handler.cpp
-	* tools/Config_Handlers/DP_PCD_Handler.h
-	* tools/Config_Handlers/ERE_Handler.cpp
-	* tools/Config_Handlers/ERE_Handler.h
-	* tools/Config_Handlers/ADD_Handler.cpp
-	* tools/Config_Handlers/IDD_Handler.h
-	* tools/Config_Handlers/MDD_Handler.cpp
-	* tools/Config_Handlers/MDD_Handler.h
-	* tools/Config_Handlers/PCD_Handler.cpp
-	* tools/Config_Handlers/PSPE_Handler.cpp
-	* tools/Config_Handlers/PSPE_Handler.h
-
-	Optimization made possible by improvements in XSC.
-
-Fri Oct  7 14:20:36 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-        *
-          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Added more debug statements.
-
-Fri Oct  7 19:14:29 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIAO-INSTALL.html:
-        
-          Updated CIDL compiler section with instructions for building
-          the CIDL compiler using MPC.
-
-Fri Oct  7 18:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.{h,inl}:
-          Removed inl file, it is empty
-
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.inl:
-          Removed, empty
-
-Thu Oct  6 16:52:21 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        *
-          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Added more debug statements and comments.
-
-Thu Oct  6 16:11:56 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        *
-          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Added more debug statements and also comments in the code.
-
-Thu Oct  6 15:32:41 CDT 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu
-
-	* DAnCE/spec_RepositoryManager/PC_Updater.cpp
-	* DAnCE/spec_RepositoryManager/PC_Updater.h
-	* DAnCE/spec_RepositoryManager/PC_Updater_T.cpp
-	* DAnCE/spec_RepositoryManager/PC_Updater_T.h
-
-	Added these files which implement a PackageConfiguration visitor.
-	The visitor helps deal with the internal complexity of the PackageConfiguration
-	and helps preseve my sanity ;)
-
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.h
-
-	Some more code. With this the package distribution part of the RM
-	is ready. I still need to clean up a few details. This is coming soon.
-
-
-Thu Oct  6 15:05:30 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-
-          Added debug statements and comments.
-
-Thu Oct  6 14:26:31 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/DAM_Map.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/Plan_Launcher/DAM_Map.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-        * ciao/Container_Impl.cpp:
-        * ciao/NodeApplication_Impl.cpp:
-        * ciao/Servant_Activator.cpp:
-
-          Fixed the debug statements to look for critical levels
-          no more than 9.
-
-Thu Oct  6 14:00:16 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+Tue Apr 11 12:43:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Container_Base.cpp:
-        * ciao/Container_Impl.cpp:
-
-          Added debug messages and comments.
-
-Thu Oct  6 12:30:40 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * ciao/NodeApplication_Impl.cpp:
-
-          Added debug messages and comments.
-
-Thu Oct  6 08:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Fixed compile problems
-
-Wed Oct  5 17:42:24 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Any_Handler.cpp
-
-	Part of previous commit.
-
-Wed Oct  5 17:07:07 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* docs/schema/Basic_Deployment_Data.xsd
-	* docs/schema/cdd.xsd
-
-	Moved recursive Domain data into cdd.xsd.  This will hopefully
-	lessen the time required to compile.
-
-	* tools/Config_Handlers/CPD_Handler.cpp
-	* tools/Config_Handlers/DataType_Handler.cpp
-
-	Fixed some potential run-time bugs in Borland.  Style
-	corrections.
-
-	* tools/Config_Handlers/Basic_Deployment_Data.cpp
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-	* tools/Config_Handlers/Deployment.cpp
-	* tools/Config_Handlers/Deployment.hpp
-	* tools/Config_Handlers/ccd.cpp
-	* tools/Config_Handlers/ccd.hpp
-	* tools/Config_Handlers/cdd.cpp
-	* tools/Config_Handlers/cdd.hpp
-	* tools/Config_Handlers/cdp.cpp
-	* tools/Config_Handlers/cdp.hpp
-	* tools/Config_Handlers/cid.cpp
-	* tools/Config_Handlers/cid.hpp
-	* tools/Config_Handlers/iad.cpp
-	* tools/Config_Handlers/iad.hpp
-	* tools/Config_Handlers/pcd.cpp
-	* tools/Config_Handlers/pcd.hpp
-	* tools/Config_Handlers/test.cdp
-	* tools/Config_Handlers/toplevel.cpp
-	* tools/Config_Handlers/toplevel.hpp
-
-	Regerated with new version of XSC.  Major changes:
-	  * Now only one accessor and one mutator per document element
-	  * Changes in schema above.
-
-Wed Oct  5 14:44:31 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-        *
-          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-
-          Added some debug statements and some optimization choices.
-
-Tue Oct  4 14:08:24 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* docs/schema/Basic_Deployment_Data.xsd
-	* docs/schema/unused_elements.xsd
-	* tools/Config_Handlers/Basic_Deployment_Data.cpp
-	* tools/Config_Handlers/Basic_Deployment_Data.hpp
-
-	Updated to include domain information (ie, bridge, interconnect).
-
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
+          Small simplification
+
+Tue Apr 11 12:22:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc:
+        * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc:
+          Updated base projects to get correct build order
+
+Tue Apr 11 08:43:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+          Initialise pointers with 0
+
+Tue Apr 11 06:54:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Minimum/Minimum_Base/Minimum.mpc:
+        * tests/IDL3/Lookup/lookup_test.mpc:
+        * tests/IDL3/ImpliedIDL/Homes/Homes.mpc:
+        * tests/IDL3/ImpliedIDL/Events/Events.mpc:
+        * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc:
+        * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc:
+        * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc:
+        * tests/IDL3/Homes/Inheritance/Inheritance.mpc:
+        * tests/IDL3/Homes/Finder/Finder.mpc:
+        * tests/IDL3/Homes/Factory/Factory.mpc:
+        * tests/IDL3/Homes/Basic/Basic.mpc:
+        * tests/IDL3/Homes/Attributes/HomeAttributes.mpc:
+        * tests/IDL3/Events/Regular/Regular.mpc:
+        * tests/IDL3/Events/Abstract/Abstract.mpc:
+        * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc:
+        * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc:
+        * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc:
+        * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc:
+        * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc:
+        * tests/CIDL/CodeGen/CodeGen.mpc:
+        * tests/Bug_2130_Regression/interfaces/ENW.mpc:
+        * performance-tests/Protocols/common/Protocols.mpc:
+        * examples/Swapping/Hello_Base/Hello_Base.mpc:
+        * examples/Hello/Hello_Base/Hello_Base.mpc:
+        * examples/Display/HUDisplay.mpc:
+        * examples/BasicSP/BasicSP.mpc:
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc:
+          Updated base projects to get correct build order
 
-	Cosmetic changes.
+Tue Apr 11 06:35:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Oct  3 14:27:39 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
+          Use base projects to set dependencies
 
-	* CIAO-INSTALL.html
+Mon Apr 10 18:48:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	Updated install documentation to reflect the restructuring.
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+          Fixed base project
 
-Mon Oct  3 12:48:26 2005  William Otte  <wotte@dre.vanderbilt.edu>
+Mon Apr 10 14:29:13 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
 
-	Commented out some debugging information.
+          Modified to make _narrow to be called at the first step
+          when connecting supplier and config. Also modified to
+          make debug statements debug_level controlled.
 
-Mon Oct  3 15:44:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Apr 10 12:31:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/Purify.html:
+        * ciao/CCM_Core.mpc:
+          Removed commented out line
 
-          Updated doc file with installation info and more info about
-          Purifying a spawned child process.
+        * DAnCE/ExecutionManager/ExecutionManager.mpc:
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+        * DAnCE/NodeManager/NodeManager.mpc:
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
+          Updated base projects
 
-Mon Oct  3 10:14:19 2005  William Otte  <wotte@dre.vanderbilt.edu>
+Mon Apr 10 11:51:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+          Readded ciao_container_dnc
 
-	Corrected a bug in parameter checking.
+        * ciao/CCM_Core.mpc:
+          Use more base projects
 
-	* DAnCE/NodeManager/Node_Manager.cpp
+        * DAnCE/Interfaces/Interfaces.mpc:
+        * DAnCE/ExecutionManager/ExecutionManager.mpc:
+          Use other base projects to get correct build order
 
-	Added documentation for the -d command line options.
+Mon Apr 10 10:00:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+          Removed ciao_container_dnc
 
-	New functionality in the Config_Handlers.
+Mon Apr 10 09:38:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Oct  3 10:00:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_Events.mpc:
+          Use ciao_rtevent_dnc as base
 
-	* bin/valgrind_nodedaemon.py
+Mon Apr 10 09:18:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	Script to help launch nodemanager/nodeapplication under Valgrind.
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
+        * ciaosvcs/Events/CIAO_Events.mpc:
+          Use ciao_events_base_dnc as base project
 
-Mon Oct  3 000:31:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Apr 10 09:15:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/Purify.html:
+        * ciao/CCM_Core.mpc:
+          For Deployment_Stub use ciao_events_base_dnc and ciao_client_dnc
+          as base projects
 
-          New file, documenting the use of Purify with CIAO and DAnCE.
+Mon Apr 10 08:50:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Oct  2 22:24:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_Events.mpc:
+          Removed ciao_events_dnc as base project, we are building
+          this lib right now
 
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+          Use base projects instead of libs
 
-          Added include of RT-CCM/CIAOServerResources.hpp.
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
+          Remvoed ciao_events_dnc
 
-        * tools/Config_Handlers/DP_Handler.cpp:
+Sat Apr  8 15:39:14 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-          Added export macros to friend function declarations.
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
 
-Sat Oct 1 15:38:23  2005  William Otte <wotte@dre.vanderbilt.edu>
+          Fixed a linking error in SuSE_CP_Static build.
 
-        * tools/Config_Handlers/Config_Handlers.mpc
-        * tools/Config_Handlers/test.cpp
+Fri Apr  7 04:09:33 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        Corrected the config handler test to properly test the handlers.
-
-        * tools/Config_Handlers/PSPE_Handler.cpp
-
-        Fixed a run-time bug that was causing corrupted plans in Borland
-        builds.
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
 
-Friday Sep 30 15:12:43 2005  William Otte <wotte@dre.vanderbilt.edu>
+          Fixed a bug in detecting External connection and Internal
+          connections. Earlier when an external component is detected,
+          not *all* connections associated with this components are
+          purged from the to-be-removed connections list. Added another
+          helper method <purge_connections> to accomplish this task.
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-        * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
-        * RACE/Planner_Manager/Component/Planner_Manager.mpc
-        * tests/IDL3/ImpliedIDL/All/all.mpc
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+          Modified to enforce passivation occured on all components
+          before any connections are removed.
 
-        Fixes for compile problems in Borland6
+Fri Apr  7 03:55:46 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Fri Sep 30 15:11:47 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-	* NEWS
+          Fixed a bug when redeploying components using the same set
+          of NodeManagers. Earlier when destroying applications or
+          components, internal components and external/shared components
+          are not all unbinded from the map, which causes duplicate
+          instance exception thrown.
 
-	  Updated the NEWS file.
+Thu Apr  6 16:01:30 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Fri Sep 30 07:53:47 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * CCF/CCF/CompilerElements/TokenStream.hpp:
 
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+          Added empty virtual destructor to template base class, to
+          eliminate bogus GCC warnings.
 
-	Should have been part of the previous commit.
+Thu Apr  6 15:22:31 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Thu Sep 29 18:11:25 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_Events.mpc
 
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-	* ciao/Container_Impl.cpp
-	* ciao/NodeApplication_Impl.cpp
-	* ciao/Upgradeable_Context_Impl_T.cpp
+          Fixed linking errors on WinXP_BCB6_Pro_Dynamic_Release build.
 
-	Fuzz errors.
+        * examples/Hello/descriptors_shared_components/deploymentplan.cdp
+        * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
 
-	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-	* tools/Config_Handlers/RT-CCM/Config_Handlers_Export.h
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
-	* tools/Config_Handlers/Utils/Config_Handlers_Export.h
+          Modified to illustrate the shared components scenario.
 
-	Correction for a emulated exception error.
+Thu Apr  6 14:54:59 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Thu Sep 29 13:01:23 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
 
-	* ciao/Version.h
+          Some cosmestic changes.
 
-	Corrected the version number.
+Thu Apr  6 08:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep 29 11:34:55 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * ciao/CCM_Component.idl:
+          Removed the forward declaration of IRObject and just include
+          ciao/CCM_Component.idl. The forward declaration is causing
+          problems with the versioned namespace support, will investigate
+          this later
 
-	* ciao/Swapping_Servant_Home_Impl_T.cpp
+Wed Apr  5 20:57:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	Fixed build problem on non-exception systems.
+        * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
 
-Thu Sep 29 07:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Make debug statement debug_level controlled.
 
-        * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp:
-          Fixed not used argument warning
+Wed Apr  5 18:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep 29 06:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+          Fixed compile errors
 
-        * tools/Config_Handlers/Utils/XML_Schema_Resolver.h:
-          Added missing pre.h
+Wed Apr  5 13:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep 28 16:44:39 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
+          Fixed pragma once warning
 
-	* docs/schema/CIAOServerResources.xsd
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+          Fixed conversion warning
 
-	  Updated to support RT-CCM.
+Wed Apr  5 12:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep 28 14:44:39 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+          Fixed compile errors
 
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+Tue Apr  4 18:11:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	New version of the XSC including additional features needed for
-	RT-CCM.
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
 
-Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Fixed an warning in WinXP_BCB6_Pro_Dynamic_Debug build
+          by modifying the name of the original "init" method.
 
-	* tools/Config_Handlers/Utils/Utils.mpc
-	* tools/Config_Handlers/Utils/XML_Helper.cpp
-	* tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp
-	* tools/Config_Handlers/Utils/XML_Schema_Resolver.h
+Tue Apr  4 17:27:52 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-	Implemented a schema resolver so that the XML parser till grab the
-	schemata from $CIAO_ROOT/docs/schema.
+        * tools/Config_Handlers/CIAO_Events/test.cpp
 
-	* docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd
-	* docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd
-	* examples/BasicSP/descriptors/Deployment.xsd
-	* examples/Display/descriptors/Deployment.xsd
-	* examples/Display/descriptors/Modified_Deployment.xsd
-	* examples/Hello/descriptors/Deployment.xsd
-	* examples/Hello/descriptors/Modified_Deployment.xsd
-	* examples/Hello/descriptors/XMI.xsd
-	* examples/Hello/descriptors/Deployment.xsd
-	* examples/Hello/descriptors/Modified_Deployment.xsd
-	* examples/Hello/descriptors/XMI.xsd
+          Fixed an warning.
 
-	Removed obsolete schemata.
+Mon Apr  3 20:00:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	* examples/Display/descriptors/flattened_deploymentplan.cdp
-	* examples/Hello/descriptors/flattened_deploymentplan.cdp
-	* examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
-	* docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
+        * CIDLC/Literals.hpp:
+        * CIDLC/Literals.cpp:
 
-	Migrated these deployment plans to use Deployment.xsd and friends,
-	instead of Modified_Deployment.xsd.
+          Changed an enum value 'SIZE' to 'LIT_SIZE' to avoid an
+          apparent conflict with something in WinDef.h on
+          Windows.
 
-	* NEWS
+Thu Mar 30 18:28:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	Updated the NEWS to include this feature.
+        * ciao/Deployment_Events.idl
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
 
-Tue Sep 27 13:16:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Fixed fuzz errors.
 
-	* DAnCE/ExecutionManager/ExecutionManager.mpc
-	* DAnCE/NodeApplication/NodeApplication.mpc
-	* DAnCE/NodeManager/NodeManager.mpc
-	* DAnCE/Old_Config_Handlers/Config_Handlers.mpc
-	* DAnCE/Plan_Launcher/Plan_Launcher.mpc
-	* DAnCE/RTNodeApplication/RTNodeApplication.mpc
-	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
-	* RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
-	* RACE/Output_Adapters/Base/Output_Adapter.mpc
-	* RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
-	* ciao/CCM_Core.mpc
-	* examples/BasicSP/BasicSP.mpc
+Thu Mar 30 17:16:17 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	Fixed a large number of deficiencies in our build structure.
-	More changes to come later.
+        * ciaosvcs/Events/CIAO_Direct/*
 
-Tue Sep 27 11:10:37 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Removed all files under this directory since they are
+          no longer used.
 
-	* NEWS
+Thu Mar 30 17:23:12 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	Updated the news file.
+        * tools/Config_Handlers/Config_Handlers.mpc
 
-Tue Sep 27 10:51:20 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Added link dependency to CIAO_Events_Handler project.
 
-	* bin/generate_component_mpc.pl
+Thu Mar 30 16:38:25 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	Updated this script to bring it in line with modern CIAO. This
-	includes:
+        * CIAO_DAnCE.mwc
+        * CIAO_TAO.mwc
+        * CIAO_TAO_DAnCE.mwc
 
-	  - Base projects are now the _dnc variants
-	  - Export files are now automatically generated.
+          Added "ciaosvcs" into the workspace.
 
-Tue Sep 27 14:26:44 2005  Boris Kolpackov  <boris@kolpackov.net>
+        * ciao/CCM_Core.mpc
+        * ciao/CCM_Event.idl
+        * ciao/Container_Base.cpp
+        * ciao/Container_Base.h
+        * ciao/Deployment_Core.idl
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_Events.idl
 
-	* CCF/CCF/IDL2/LexicalAnalyzer.cpp:
-	* CCF/CCF/IDL2/Parser.cpp:
-	* CCF/CCF/IDL2/Parser.hpp:
-	* CCF/CCF/IDL2/SemanticAction.hpp:
-	* CCF/CCF/IDL2/SemanticGraph.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Const.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Factory.hpp:
-	* CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/Const.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp:
-	* CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp:
-	* CCF/CCF/IDL2/SemanticGraph/Elements.cpp:
-	* CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-	* CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp:
-	* CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp:
-	* CCF/CCF/IDL3/Parser.cpp:
-	* CCF/CCF/CIDL/Parser.cpp:
+          Added an "CIAO_DnC_Events" project. Enhanced Deployment_Core.idl
+          to support configuring and deploying pub/sub services.
 
-	Implemented first part of the const expression support. This
-	includes parser rules, semantic graph types and semantic
-	actions. Traversal types are still to be implemented.
-
-Tue Sep 27 06:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeApplication/NodeApplication_Impl.inl
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Fixed compile problem
+          Enhanced DAnCE to support pub/sub services integration.
+
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+        * ciaosvcs/Events/CIAO_Events.idl
+        * ciaosvcs/Events/CIAO_Events.mpc
+        * ciaosvcs/Events/CIAO_Events_Export.h
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Export.h
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
+
+          Added CIAO_Event_Service support, which are some reusable
+          libraries and CORBA services that could be configured and
+          installed on demand through the DAnCE toolchain.
 
-        * tools/Config_Handlers/XMLSchema/TypeInfo.tpp:
-          Removed using std::make_pair, this causes a crash of the BCB6
-          compiler. It doesn't seem to cause issues with CBX, but it
-          seems the code wasn't really needed and now BCB6 is also happy
+        * docs/schema/Basic_Deployment_Data.xsd
+        * docs/schema/CIAOEvents.xsd
+        * docs/schema/cdp.xsd
 
-Mon Sep 26 11:06:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Enhanced XML schema to capture metadata information for
+          configuring and deploying pub/sub services.
 
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp
         * tools/Config_Handlers/Basic_Deployment_Data.hpp
-
-        Updates for compile problems in Borland.
-
-Mon Sep 26 11:06:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-	* DAnCE/NodeManager/NodeManager_Impl.cpp
-
-	Cleared up some scoreboard errors.
-
-Sat Sep 24 20:44:20 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-	* tools/Config_Handlers/Config_Handlers.mpc
-
-	  Fixed linking errors.
-
-Sat Sep 24 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc:
-          Added Id tag
-
-Sat Sep 24 02:37:20 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* ciao/Deployment.idl
-	* ciao/Deployment_Core.idl
-	* ciao/ServerResources.idl
-
-	  Enhanced to support RT-CCM feature.
-
-	* DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-	* DAnCE/NodeApplicationManager/ImplementationInfo.h
-	* DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-	* DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-	* DAnCE/NodeApplicationManager/Containers_Info_Map.h
-
-	  Refactor the NodeApplicationManager to populate the correct
-	  node level deployment plan info, while taking into account
-	  of the RT-CCM feature.
-
-	* ciao/NodeApplication_Impl.cpp
-	* ciao/NodeApplication_Impl.h
-
-	  Modified to accomodate the change in IDL files.
-
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
-
-	  Fixed these tests to make them run with the modified IDL
-	  files.
-
-	* DAnCE/examples/Hello/descriptors/rt-config-example.csr
-	* DAnCE/examples/Hello/descriptors/rt-config-example.cdp
-
-	  An example descriptor files to describe server resource,
-	  and associate server resources and policy set defs with
-	  the deployment plan.
-
-	  NOTE: All above code are tested working fine with the existing
-	  examples.
-
-Fri Sep 23 10:05:18 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
-	* tools/Config_Handlers/Config_Handlers.mpc
-
-	  fixes for build problems.
-
-Thu Sep 22 16:21:12 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* DAnCE/NodeManager/NodeManager_Impl.cpp
-
-	  Added error report message from the tool.
-
-	* ciao/Container_Base.cpp
-
-	  Cosmetic change.
-
-Thu Sep 22 14:45:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/Config_Handlers.mpc
-	* tools/Config_Handlers/STD_CID_Handler.cpp
-	* tools/Config_Handlers/STD_CID_Handler.h
-	* tools/Config_Handlers/STD_CPD_Handler.cpp
-	* tools/Config_Handlers/STD_CPD_Handler.h
-	* tools/Config_Handlers/STD_PCD_Handler.cpp
-	* tools/Config_Handlers/STD_PCD_Handler.h
-	* tools/Config_Handlers/STD_PC_Intf.cpp
-	* tools/Config_Handlers/XML_File_Intf.cpp
-	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
-	* tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
-
-	Made these files consistent with the new Utils directory.
-
-	* tools/Config_Handlers/Utils/Utils.mpc
-	* tools/Config_Handlers/Utils/XML_Error_Handler.cpp
-	* tools/Config_Handlers/Utils/XML_Error_Handler.h
-	* tools/Config_Handlers/Utils/XML_Helper.cpp
-	* tools/Config_Handlers/Utils/XML_Helper.h
-	* tools/Config_Handlers/Utils/XercesString.cpp
-	* tools/Config_Handlers/Utils/XercesString.h
-
-	Moved common XML  utilities to a separate directory.
-
-Thu Sep 22 13:21:12 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* ciao/CCM_Core.mpc
-	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-	* tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
-
-	  Put the ServerResources.idl into Deployment_stub project. Modified
-	  other MPC project files to reflect this change.
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-
-	  Pass the infoProperty which contains the entire server resource
-	  definitions to each individual child deployment plans.
-
-	* DAnCE/NodeManager/NodeManager_Impl.cpp
-	* DAnCE/NodeManager/NodeManager_Impl.h
-
-	  NodeManager now validates the correctness of the individual local
-	  dpeloyment plan. In particular,  it tries to verify that all the
-	  component instances within this child deployment plan have the same
-	  "server_resource_id" assigned.
-
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
-
-	  Added a NodeApplication test case, where multiple components could
-	  be installed one-by-one through a serious of "install" invocations.
-
-	* examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
-
-	  Fixed a typo.
-
-
-
-Thu Sep 22 12:26:45 CDT 2005 Stoyan spaunov@isis.vanderbilt.edu
-
-	* DAnCE/spec_RepositoryManager/
-	* DAnCE/new_RepositoryManager/
-
-	Added the former, removed the latter.
-
-
-Thu Sep 22 10:50:45 CDT 2005 Stoyan spaunov@isis.vanderbilt.edu
-
-
-	* DAnCE/spec_RepositoryManager/HTTP_Client.cpp
-	* DAnCE/spec_RepositoryManager/HTTP_Client.h
-	* DAnCE/spec_RepositoryManager/HTTP_Handler.cpp
-	* DAnCE/spec_RepositoryManager/HTTP_Handler.h
-	* DAnCE/spec_RepositoryManager/Options.cpp
-	* DAnCE/spec_RepositoryManager/Options.h
-	* DAnCE/spec_RepositoryManager/README.txt
-	* DAnCE/spec_RepositoryManager/RepositoryManager.cpp
-	* DAnCE/spec_RepositoryManager/RepositoryManager.idl
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
-	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h
-	* DAnCE/spec_RepositoryManager/RMadmin.cpp
-	* DAnCE/spec_RepositoryManager/RM_Helper.cpp
-	* DAnCE/spec_RepositoryManager/RM_Helper.h
-	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
-	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.ncb
-	* DAnCE/spec_RepositoryManager/URL_Parser.cpp
-	* DAnCE/spec_RepositoryManager/URL_Parser.h
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
-	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.h
-
-
-	Checked in these file and cleaned up *some* of the underlying mess due to previous
-	mix-ups. Many of the files are new. Some are newer versions of older files.
-	Previously there were 2 RM directories spec_RepositoryManager and
-	new_RepositoryManager. Someone had removed the spec* verion and checked in the
-	wrong files in the new* version (which used to be a non-spec compilent impl).
-	Apparently on top of that the two directories have been linked somehow! I will
-	check on what the reason for this is later.
-
-
-Thu Sep 22 13:15:28 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-
-          Fixed typo.
-
-Wed Sep 21 15:32:38 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-	* DAnCE/ExecutionManager/Execution_Manager.cpp
-	* DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-	* DAnCE/NodeApplication/NodeApplication.cpp
-	* DAnCE/RTNodeApplication/NodeApplication_Task.cpp
-	* DAnCE/RepositoryManager/Repository_Manager.cpp
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
-	* DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
-	* ciao/Container_Base.cpp
-	* ciao/Container_Impl.cpp
-	* ciao/Servant_Activator.cpp
-	* ciao/Servant_Impl_T.cpp
-	* ciao/Swapping_Container.cpp
-	* ciao/Swapping_Servant_Home_Impl_T.cpp
-	* ciao/Upgradeable_Context_Impl_T.cpp
-	* docs/templates/CIAO_Glue_Session_Template.cpp
-	* examples/Hello/Sender/Sender_exec.cpp
-	* examples/Swapping/Receiver/Receiver_exec.cpp
-	* examples/Swapping/Sender/Sender_exec.cpp
-	* examples/Swapping/Sender/Sender_exec_1.cpp
-	* examples/Swapping/Sender/Sender_exec_2.cpp
-
-	Fixed numerous emulated exception errors.
-
-	* DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
-	* DAnCE/ExecutionManager/ExecutionManager_Impl.h
-
-	removed obsolete EM implementation.
-
-Wed Sep 21 13:34:28 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/RT-CCM/test.cpp
-
-	  Modified so the output XML file is based on the XSC dom document
-	  instead from the input file directly.
-
-Tue Sep 20 21:58:23 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL3/ImpliedIDL/All/convert.idl:
-
-          Modified valuetype declartion used as a primary key to
-          conform to the CCM spec section 61.7.2.1 listing
-          constraints on primary key types.
-
-Tue Sep 20 02:25:34 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
+        * tools/Config_Handlers/CPD_Handler.cpp
         * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/ESD_Handler.cpp
+        * tools/Config_Handlers/ESD_Handler.h
+        * tools/Config_Handlers/PSPE_Handler.cpp
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
+        * tools/Config_Handlers/CIAO_Events/test.cpp
 
-          Quick fix for a build problem on Windows.  A better solution
- 	  will follow when I check in my CIAO build system revamp.
-
-Tue Sep 20 10:19:46 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/test.cdp
-
-	A test deployment plan file that contains odd constructs.
-	Used for testing.
-
-Tue Sep 20 10:07:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
-
-	Added a missing library.
-
-Tue Sep 20 09:50:28 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-
-	  Modified to kill all NodeApplication processes when the deployment fails.
-
-Tue Sep 20 09:35:28 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Plan_Launcher/Plan_Launcher.mpc
-
-	Added a missing library.
-
-Mon Sep 19 16:29:57 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* ADD_Handler.cpp
-	* Common.h
-	* IDD_Handler.cpp
-	* IDD_Handler.h
-	* IDREF_Base.cpp
-	* IDREF_Base.h
-	* IRDD_Handler.cpp
-	* IRDD_Handler.h
-	* MDD_Handler.cpp
-	* PSPE_Handler.cpp
-	* STD_CID_Handler.cpp
-	* XML_Error_Handler.cpp
-
-	Added some improved error handling/reporting. Much more to come.
-
-	* test.cpp
-	* RT-CCM/RT-CCM-Handlers.mpc
-	* RT-CCM/SRD_Handler.cpp
-	* RT-CCM/SRD_Handler.h
-	* Config_Handlers.mpc
-	* DP_Handler.cpp
-
-	Added hooks for parsing ServerResources document into a deployment
-	plan.
-
-	This is activated by adding an InfoProperty with name
-	"CIAOServerResources" with a value of a valid CSR file.
-
-	Also enabled parsing of deployRequirements and infoProperties.
-
-Mon Sep 19 10:55:05 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* RACE/Input_Adapters/Base/Input_Adapter.mpc
-	* RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
-	* RACE/Output_Adapters/Base/Output_Adapter.mpc
-	* RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
-	* RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
-	* RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
-	* RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
-	* RACE/Planner_Manager/Component/Planner_Manager.mpc
-	* RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
-	* RACE/Planners/Base/Planner.mpc
-	* RACE/Planners/Interface/Planner_Interface.mpc
-	* RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
-	* RACE/common/RACE_common.mpc
-	* tools/Config_Handlers/RT-CCM/CLA_Handler.h
-	* tools/Config_Handlers/RT-CCM/OC_Handler.cpp
-	* tools/Config_Handlers/RT-CCM/OR_Handler.cpp
-	* tools/Config_Handlers/RT-CCM/OR_Handler.h
-
-	Misc fuzz fixes.
-
-Fri Sep 16 09:54:44 2005  William Otte  <wotte@william-ottes-powerbook-g4-15.local>
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-	Emulated exception fixes.
-
-Thu Sep 15 07:29:03 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat: Make sure
-	  there's a newline at the end of this file.  Thanks to Zachi
- 	  Klopman <zklopman@gmail.com> for reporting this.
-
-Thu Sep 15 11:20:20 2005 CSET William Otte  <wotte@dre.vanderbilt.edu>
-
-
-	* ciao/Container_Base.cpp
-
-	Fix for compile error on platforms with emulated exceptions.
-
-Wed Sep 14 13:25:00 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
-
-	Fix for a library ordering problem.
-
-Wed Sep 14 11:18:42 2005 CEST William Otte  <wotte@william-ottes-powerbook-g4-15.local>
-
-	* tools/Config_Handlers/CIAOServerResources.cpp
-	* tools/Config_Handlers/CIAOServerResources.hpp
-
-	Removed these from the repo to avoid confusion.
-
-	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-
-	Ported patches from:
-	Tue Sep 13 17:18:12 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	which were made against the wrong file.  Thanks to Gan Deng for
-	pointing this out.
-
-Wed Sep 14 13:28:14 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-	* examples/Hello/descriptors/run_NodeDaemons.pl
-
-	  Modified the relevant path due to the recent CIAO directory
-	  reorganization.
-
-	* examples/Hello/Sender/Sender.idl
-	* examples/Hello/Sender_exec.cpp
-	* examples/Hello/starter.cpp
-
-	  Added test for "readonly" attribute.
-	  Fixed a bug of setting attribute through command line options
-	  through the "starter" executable. Also, make the default ior
-	  file name to be "Sender.ior" to make it consistent with the
-	  output generated by DAnCE. Thanks Zacki
-	  <zklopman at gmail dot com> for reporting these.
-
-	* examples/Hello/step-by-step.html
-
-	  Updated the documentation to run the example.
-
-Tue Sep 13 17:18:12 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/CIAOServerResources.hpp
-
-	Fixes for compile errors in:
-	.  Especially strict C++ compilers
-	.  Windows VC71 (hopefully)
-
-Tue Sep 13 17:05:31 2005 CEST William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-	* DAnCE/NodeManager/NodeManager_Impl.cpp
-	* DAnCE/NodeManager/NodeManager_Impl.h
-	* DAnCE/NodeManager/Node_Manager.cpp
-	* DAnCE/Plan_Launcher/Plan_Launcher.cpp
-	* DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-	* DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-	* ciao/Container_Base.cpp
-	* ciao/NodeApplication_Impl.cpp
-
-	Folding in some of the error reporting work that I have been
-	working on for the past couple weeks. Most common deployment
-	errors are now reported through the plan_launcher.
-
-Tue Sep 13 16:55:15 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/IDD_Handler.cpp
-	* tools/Config_Handlers/MDD_Handler.cpp
-	* tools/Config_Handlers/PSPE_Handler.cpp
-	* tools/Config_Handlers/STD_CID_Handler.cpp
-
-	Fixes for compile errors on both:
-	.  64 bit platforms
-	.  GCC4
-
-Tue Sep 13 16:01:35 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/XMLSchema/Traversal.hpp
-	* tools/Config_Handlers/XMLSchema/TypeInfo.hpp
-	* tools/Config_Handlers/XMLSchema/Types.hpp
-	* tools/Config_Handlers/XMLSchema/Writer.hpp
-	* tools/Config_Handlers/XSCRT/Elements.hpp
-	* tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
-	* tools/Config_Handlers/XSCRT/Parser.hpp
-	* tools/Config_Handlers/XSCRT/Traversal.hpp
-	* tools/Config_Handlers/XSCRT/Writer.hpp
-	* tools/Config_Handlers/XSCRT/XML.hpp
-	* tools/Config_Handlers/XSCRT/XMLSchema.hpp
-
-	Rolled back Stoyan's changes from the previous commit.  The proper
-	fix for this problem would be to update the include paths in the
-	affected MPC files, which has the virtue of not breaking
-	builds on platforms with case-sensitive filesystems.
-
-	* DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
-
-	Updated the include path to include the new config handlers directory.
-
-Mon Sep 12 17:34:47 CDT 2005 Stoyan Paunov <spaunov@isis.vanderbilt.edu>
-
-	* tools/Config_Handlers/XMLSchema/Traversal.hpp
-	* tools/Config_Handlers/XMLSchema/TypeInfo.hpp
-	* tools/Config_Handlers/XMLSchema/Types.hpp
-	* tools/Config_Handlers/XMLSchema/Writer.hpp
-	* tools/Config_Handlers/XSCRT/Elements.hpp
-	* tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
-	* tools/Config_Handlers/XSCRT/Parser.hpp
-	* tools/Config_Handlers/XSCRT/Traversal.hpp
-	* tools/Config_Handlers/XSCRT/Writer.hpp
-	* tools/Config_Handlers/XSCRT/XML.hpp
-	* tools/Config_Handlers/XSCRT/XMLSchema.hpp
-
-	Fixed a number of problems related to Will's changes. The XSC_Config_Handler_Tests
-	project was not compiling. I had the same problem in RepositoryManager. Will had
-	changed the directory structure, but did not update any of the include paths.
-	Needless to say there were like 30-40 of those in the XSCRT and XMLSchema directories
-
-Fri Sep  9 12:35:20 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* tools/Config_Handlers/STD_IAD_Handler.cpp
-	* tools/Config_Handlers/STD_PCD_Handler.cpp
-	* tools/Config_Handlers/STD_PC_Intf.cpp
-
-	Changed to comform with new refactoring.
-
-Fri Sep  9 12:32:14 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* ciao/CCM_Core.mpc
-	* ciao/Container_Base.cpp
-	* ciao/Deployment.idl
-	* ciao/Deployment_Core.idl
-	* ciao/Deployment_Data.idl
-	* ciao/Packaging_Data.idl
-
-	Refactoring to support cidl compilation of deployment structures.
-	This refactoring should solve compilation errors in the config handlers.
-
-Wed Sep  7 16:31:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-
-          Removed generation of export macro in the typedef of the
-          template class instantiation that defines a facet servant.
-          Thanks to Ossama Othman <ossama@dre.vanderbilt.edu> for
-          pointing out that typedefs need not be exported.
-
-Tue Sep  6 11:39:15 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* ciao/Deployment_Data.idl
-
-	Commented out IDL that is unsupported by CIDLC.
-
-	* RACE
-
-	Added IDL for RACE.
-
-Tue Sep  6 09:58:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* examples/Hello/descriptors/run_test.pl
-
-	Modified the script to fix the absolute path to the naming service
-	with a relative path.
-
-Fri Sep  2 17:38:31 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* performance-tests/Protocols/Controller/Controller.mpc
-	* performance-tests/Protocols/Receiver/Receiver.mpc
-	* performance-tests/Protocols/Sender/Sender.mpc
-	* performance-tests/Protocols/common/Protocols.mpc
-	* tests/CIDL/CodeGen/CodeGen.mpc
+          Added config handler support to accomodate the above changes.
 
-	Migrated to modern CIAO base projects.
+        * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
+        * examples/Hello/descriptors_events/ciao-events-example.ced
+        * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
+        * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
 
-Fri Sep  2 16:41:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Added several examples to showcase the capability of CIAO
+          pub/sub services.
 
-	* performance-tests/Benchmark/Benchmark.mpc
-	* performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
-	* performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
-	* performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
-	* performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
+Thu Mar 30 14:43:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	Migrated to modern CIAO projects.
+        * CIDLC/AttributeSourceEmitters_T.hpp:
 
-Fri Sep  2 15:10:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
+          Added 'using namespace StringLiterals;' to this file. Thanks
+          to Nanbor Wang <nanbor@txcorp.com> for pointing out that
+          this line is also necessary on some platforms, in addition
+          to the change of
 
-	* docs/tutorial
+          Wed Mar 29 20:29:40 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	Removed the obsolete hello tutorial.
+Wed Mar 29 20:29:40 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Fri Sep  2 15:04:00 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * CIDLC/AttributeSourceEmitters_T.hpp:
 
-	* tests/tests.mwc
-	* tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
-	* tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
-	* tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
-	* tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
-	* tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
-	* tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
-	* tests/IDL3/Events/Abstract/Abstract.mpc
-	* tests/IDL3/Events/Regular/Regular.mpc
-	* tests/IDL3/Homes/Attributes/HomeAttributes.mpc
-	* tests/IDL3/Homes/Basic/Basic.mpc
-	* tests/IDL3/Homes/Factory/Factory.mpc
-	* tests/IDL3/Homes/Finder/Finder.mpc
-	* tests/IDL3/Homes/Inheritance/Inheritance.mpc
-	* tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
-	* tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
-	* tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
-	* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
-	* tests/IDL3/ImpliedIDL/Events/Events.mpc
-	* tests/IDL3/ImpliedIDL/Homes/Homes.mpc
-	* tests/IDL3/Lookup/lookup_test.mpc
+          Added #include of Literals.hpp. Some platforms are picking up
+          the declarations  in this file without the explicit include,
+          others are not.
 
-	Updated to use dnc ciao base project.
+Wed Mar 29 19:52:54 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
 
-	* tests/RTCCM
+        * examples/Hello/descriptors_RTCCM/rt-config-example.csr:
+          Updated <cmdline> and <svcconf> element with more realistic
+          values.
 
-	Removed this test.
+Wed Mar 29 04:40:58 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Thu Sep  1 10:20:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-	CIAO Reorganization.  Plese see tag before_ciao_reorg
-	to obtain the old version.
+          Added the functionality to honor command line arguments
+          and service configuration file options defined through
+          RT-CCM descriptors.
 
-Wed Aug 31 15:16:23 2005  William Otte  <wotte@dre.vanderbilt.edu>
-	* DAnCE/Config_Handlers/RT-CCM/CB_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/PM_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/TPL_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/TP_Handler.cpp
+Mon Mar 27 19:56:51 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
 
-	Fixes to satisfy a tempramental Borland compiler.
+        * DAnCE/NodeApplication/NodeApplication.cpp (main): Added code to
+          print out commandline options of the NodeApplicaion.  The print
+          out is available for CIAO_DEBUG_LEVEL > 9.
 
-Wed Aug 31 13:28:46 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeApplication/Configuration_Factory.h:
+        * DAnCE/NodeApplication/Configuration_Factory.cpp: Changed
+          parse_args function to pass "argc" as reference to be consistent
+          with Arg_Shifter's signature.
 
-	* DAnCE/Config_Handlers/ADD_Handler.cpp
-	* DAnCE/Config_Handlers/ADD_Handler.h
-	* DAnCE/Config_Handlers/IDD_Handler.cpp
-	* DAnCE/Config_Handlers/IDD_Handler.h
-	* DAnCE/Config_Handlers/IDREF_Base.cpp
-	* DAnCE/Config_Handlers/IDREF_Base.h
-	* DAnCE/Config_Handlers/MDD_Handler.cpp
-	* DAnCE/Config_Handlers/MDD_Handler.h
-	* DAnCE/Config_Handlers/STD_CID_Handler.cpp
-	* DAnCE/Config_Handlers/STD_CID_Handler.h
+          Double-check the "-o" flag first with exact string comparison
+          before extracting the parameter to avoid mistaking any of the
+          "-ORBxxx" command line flags as the "-o" flag.  Thanks to Sandro
+          Andrade <sandro @dcc.ufba.br> for reporting the bug.
 
-	Simple refactoring to make the IDREF interface more generic.
+Mon Mar 20 22:35:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	* DAnCE/Config_Handlers/XML_Helper.cpp
-	* DAnCE/Config_Handlers/XML_Helper.h
+        * ciao/Servant_Impl_Utils_T.cpp:
 
-	Made empty document creation more generic.
+          - Added 'typename' qualifier when declaring instances
+            of an iterator for a templatized hash map, since gcc
+            reminds us that leaving the compiler to implicitly
+            determine if the scoped name denotes a member or a
+            type is deprecated.
 
-	* DAnCE/Config_Handlers/RT-CCM/CB_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/CB_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-	* DAnCE/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-	* DAnCE/Config_Handlers/RT-CCM/CLA_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/CLA_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/OC_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/OC_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/OR_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/OR_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/PM_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/PM_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/PS_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/PS_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
-	* DAnCE/Config_Handlers/RT-CCM/SRD_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/SRD_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/TPL_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/TPL_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/TP_Handler.cpp
-	* DAnCE/Config_Handlers/RT-CCM/TP_Handler.h
-	* DAnCE/Config_Handlers/RT-CCM/input.csr
-	* DAnCE/Config_Handlers/RT-CCM/test.cpp
-
-	The new RT-CCM handlers.  These have yet to be integrated into the
-	main config_handler path.
-
-	* DAnCE/ciao/CCM_Core.mpc
-	* DAnCE/ciao/ServerResources.idl
-
-	Updates to the support the RT-CCM Handlers.
-
-	* docs/schema/CIAOServerResources.xsd
-
-	Corrected a few oversights.
-
-Wed Aug 31 09:49:28 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp
-
-	Workaround for a buggy Borland compiler.
-
-Tue Aug 30 14:33:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-
-	Slight handcrafting to remove commas from the end of enumerator lists.
-
-Tue Aug 30 11:59:14 CDT 2005  William Otte <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/IRDD_Handler.h
-	* DAnCE/Config_Handlers/PCD_Handler.h
+          - Added an #include of Cookies.h, which is need by compilers
+            that don't require the template sourced to be included in
+            the header file.
 
-	Fixed a class/struct mismatch.
+Sun Mar 19 20:37:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Tue Aug 30 11:51:32 CDT 2005  William Otte <wotte@dre.vanderbilt.edu>
+        * CIDLC/TypeNameEmitter.cpp:
+        * CIDLC/TypeNameEmitter.hpp:
 
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-	* DAnCE/Config_Handlers/CIAOServerResources.cpp
-	* DAnCE/Config_Handlers/CIAOServerResources.hpp
-	* DAnCE/Config_Handlers/Deployment.cpp
-	* DAnCE/Config_Handlers/Deployment.hpp
-	* DAnCE/Config_Handlers/ccd.cpp
-	* DAnCE/Config_Handlers/ccd.hpp
-	* DAnCE/Config_Handlers/cdd.cpp
-	* DAnCE/Config_Handlers/cdd.hpp
-	* DAnCE/Config_Handlers/cdp.cpp
-	* DAnCE/Config_Handlers/cdp.hpp
-	* DAnCE/Config_Handlers/cid.cpp
-	* DAnCE/Config_Handlers/cid.hpp
-	* DAnCE/Config_Handlers/cpd.cpp
-	* DAnCE/Config_Handlers/cpd.hpp
-	* DAnCE/Config_Handlers/iad.cpp
-	* DAnCE/Config_Handlers/iad.hpp
-	* DAnCE/Config_Handlers/pcd.cpp
-	* DAnCE/Config_Handlers/pcd.hpp
-	* DAnCE/Config_Handlers/toplevel.cpp
-	* DAnCE/Config_Handlers/toplevel.hpp
+          Removed these files, their former contents are now divided
+          between CorbaTypenameEmitters.{hpp,cpp} and
+          UtilityTypeNameEmitters.{hpp,cpp}.
 
-	Fixes a large number of compiler warnings in Borland.
-
-Thu Aug 25 15:26:25 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-	* DAnCE/ciao/ServerResources.idl: Added the missing <stacksize>
-	  attribute to ORS_ThreadpoolWithLanes struct.  Thanks to Will
-	  Otte for catching this.
+Fri Mar 17 14:23:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Wed Aug 24 20:41:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * ciao/CCM_Core.mpc:
+        * ciao/Servant_Impl_Base.cpp:
+        * ciao/Servant_Impl_Base.h
+
+          - Changed port table types from
+            ACE_Hash_Map_Manager_Ex<> to ACE_Array_Map<>,
+            which is more lightweight and makes no
+            allocations if no entries are added to
+            the table.
+
+          - Implemented spec-defined methods
+            get_all_receptacles(), get_all_publishers(),
+            and disconnect_consumer().
+
+        * ciao/Servant_Impl_Utils_T.cpp:
+
+          New file, containing implementations of new
+          static template methods added to class
+          Servant_Impl_Base, which are called in
+          generated code as part of the implementation
+          of the spec-defined methods mentioned above.
+
+        * CIDLC/AttributeHeaderEmitters.cpp:
+        * CIDLC/AttributeHeaderEmitters.hpp:
+        * CIDLC/AttributeSourceEmitters_T.hpp:
+        * CIDLC/CompositionEmitter.cpp:
+        * CIDLC/CompositionEmitter.hpp:
+        * CIDLC/CorbaTypeNameEmitters.cpp:
+        * CIDLC/CorbaTypeNameEmitters.hpp:
+        * CIDLC/EmitterBase.cpp:
+        * CIDLC/EmitterBase.hpp:
+        * CIDLC/EmitterContext.cpp:
+        * CIDLC/EmitterContext.hpp:
+        * CIDLC/InterfaceEmitter.cpp:
+        * CIDLC/InterfaceEmitter.hpp:
+        * CIDLC/ModuleEmitter.cpp:
+        * CIDLC/ModuleEmitter.hpp:
+        * CIDLC/OperationHeaderEmitters.cpp:
+        * CIDLC/OperationHeaderEmitters.hpp:
+        * CIDLC/ParameterEmitter_T.hpp:
+        * CIDLC/Upcase.hpp:
+        * CIDLC/UtilityTypeNameEmitters.cpp:
+        * CIDLC/UtilityTypeNameEmitters.hpp:
+
+          New files, containing common code factored
+          out of the C++ source files below.
 
+        * CIDLC/CIDLC.mpc:
+        * CIDLC/DescriptorGenerator.cpp:
         * CIDLC/ExecImplHeaderGenerator.cpp:
         * CIDLC/ExecImplSourceGenerator.cpp:
+        * CIDLC/ExecutorMappingGenerator.cpp:
+        * CIDLC/Literals.cpp:
+        * CIDLC/Literals.hpp:
         * CIDLC/ServantHeaderGenerator.cpp:
         * CIDLC/ServantSourceGenerator.cpp:
 
-          Removed commented-out code.
-
-Tue Aug 23 20:09:59 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* DAnCE/Old_Config_Handlers/DT_Handler.h:
-	* DAnCE/RTNodeApplication/RTServer_Impl.h:
-	* DAnCE/ciao/Container_Base.h:
-	* DAnCE/ciao/Context_Impl_Base.h:
-	* DAnCE/ciao/NodeApplication_Impl.h:
-
-	  Reordered include directives to make sure all necessary
-	  non-dependent names are parsed before the templates that use
-	  them.  Addresses g++ 3.4.x or better compile-time errors.
-
-Tue Aug 23 19:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DeploymentManager/DeploymentManager.mpc:
-          Add dummy_label to all projects, this don't build, this is
-          the fast way to get the scoreboard green. Already one project
-          had this in the file.
-
-Mon Aug 22 10:59:18 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/DeploymentManager/DeploymentManager.cidl
-	* DAnCE/DeploymentManager/DeploymentManager.idl
-	* DAnCE/DeploymentManager/DeploymentManager.mpc
-	* DAnCE/DeploymentManager/DeploymentManager_Impl.cpp
-	* DAnCE/DeploymentManager/DeploymentManager_Impl.h
-	* DAnCE/DeploymentManager/DeploymentManager_exec_export.h
-	* DAnCE/DeploymentManager/DeploymentManager_stub_export.h
-	* DAnCE/DeploymentManager/DeploymentManager_svnt_export.h
-
-	Preliminary skeleton for the DeploymentManager.
-
-Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp:
-        * DAnCE/Config_Handlers/DataType_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/DT_Handler.cpp:
-        * DAnCE/ciao/ComponentsC.h:
-        * ciao/ComponentsC.h:
-          Updated for AnyTypeCode refactoring
-
-Tue Aug 16 15:16:10 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-	* docs/schema/CIAOServerResources.xsd: Changed to define most of
-	  the RT policy details with "element"s instead of "attribute"s
-	  since "attribute"s  can be optional.  Thanks to Will Otte for
-	  pointing this out.
-
-Tue Aug 16 09:46:45 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/Config_Handlers.mpc
-
-	Moved some changes in from the branch to correct errors from:
-	Mon Aug 15 12:03:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-Mon Aug 15 12:03:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/ADD_Handler.cpp
-	* DAnCE/Config_Handlers/ADD_Handler.h
-	* DAnCE/Config_Handlers/CCD_Handler.cpp
-	* DAnCE/Config_Handlers/CCD_Handler.h
-	* DAnCE/Config_Handlers/CRDD_Handler.h
-	* DAnCE/Config_Handlers/DP_Handler.cpp
-	* DAnCE/Config_Handlers/DP_Handler.h
-	* DAnCE/Config_Handlers/DP_PCD_Handler.cpp
-	* DAnCE/Config_Handlers/DP_PCD_Handler.h
-	* DAnCE/Config_Handlers/IDD_Handler.cpp
-	* DAnCE/Config_Handlers/IDD_Handler.h
-	* DAnCE/Config_Handlers/IDREF_Base.cpp
-	* DAnCE/Config_Handlers/ID_Handler.h
-	* DAnCE/Config_Handlers/IRDD_Handler.cpp
-	* DAnCE/Config_Handlers/MDD_Handler.cpp
-	* DAnCE/Config_Handlers/MDD_Handler.h
-	* DAnCE/Config_Handlers/PCD_Handler.cpp
-	* DAnCE/Config_Handlers/PCD_Handler.h
-	* DAnCE/Config_Handlers/PSPE_Handler.cpp
-	* DAnCE/Config_Handlers/Req_Handler.cpp
-	* DAnCE/Config_Handlers/XML_Helper.cpp
-	* DAnCE/Config_Handlers/XML_Helper.h
-	* DAnCE/Config_Handlers/XercesString.cpp
-	* DAnCE/Config_Handlers/XercesString.h
-	* DAnCE/Config_Handlers/test.cpp
-
-	Checked in support for IDL->XSC->XML mapping.  Thanks to Lucas
-	Seibert <heynonynony at yahoo dot com> for completing this work.
-
-Mon Aug 15 00:01:01 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-	* CIDLC/cidlc.cpp: Made ErrorHandler auto-detach itself
-	from the stream when it is destroyed. This fixes the
-	segmentation fault on Solaris in libstdc++ termination code.
-
-Wed Aug 10 09:39:41 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-	* DAnCE/Config_Handlers/CIAOServerResources.cpp
-	* DAnCE/Config_Handlers/CIAOServerResources.hpp
-	* DAnCE/Config_Handlers/Deployment.cpp
-	* DAnCE/Config_Handlers/Deployment.hpp
-	* DAnCE/Config_Handlers/ccd.cpp
-	* DAnCE/Config_Handlers/ccd.hpp
-	* DAnCE/Config_Handlers/cdd.cpp
-	* DAnCE/Config_Handlers/cdd.hpp
-	* DAnCE/Config_Handlers/cdp.cpp
-	* DAnCE/Config_Handlers/cdp.hpp
-	* DAnCE/Config_Handlers/cid.cpp
-	* DAnCE/Config_Handlers/cid.hpp
-	* DAnCE/Config_Handlers/cpd.cpp
-	* DAnCE/Config_Handlers/cpd.hpp
-	* DAnCE/Config_Handlers/iad.cpp
-	* DAnCE/Config_Handlers/iad.hpp
-	* DAnCE/Config_Handlers/pcd.cpp
-	* DAnCE/Config_Handlers/pcd.hpp
-	* DAnCE/Config_Handlers/toplevel.cpp
-	* DAnCE/Config_Handlers/toplevel.hpp
-
-	Regenerated with the latest CVS-head version of XSC. These support
-	a couple improvements that will aid in optimizing the config
-	handlers.
-
-Tue Aug  9 11:55:13 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * docs/imgs/component-basic.png
-        * docs/imgs/CCM.vsd
-
-        Updated CCM diagram to fix a interface naming error.
-
-
-Tue Aug  9 10:02:13 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * DAnCE/ComponentPackager/README.html: Improved the
-          documentation to point to the right directory for the Quoter
-          example.  Thanks to Aldo Texier <aldo.texier@oktal.fr> for
-          reporting this.
-
-Tue Aug  9 13:11:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc:
-
-          Updated dependencies to reflect the recent name change from
-          NodeDaemon_stub to NodeManager_stub.
-
-        * DAnCE/RepositoryManager/Repository_Manager.cpp:
-
-          Updated identifier names to match the change from NodeDaemon
-          to ModeManager.
-
-Mon  Aug 08 22:02:43 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * docs/EnvVars.html
-        * docs/index.html
-        * docs/Trace.html
-        * docs/imgs/DAnCE-Dynamic.png
-        * docs/imgs/DAnCE-Dynamic.sxd
-
-          Beefed up the CIAO documentation page. These files are
-          checked in on behalf of Ming. Thanks Friedhelm Wolf
-          <Friedhelm.wolf at gmx.de> for contributing the DAnCE
-          interaction diagram.
-
-Mon Aug  8 18:50:36 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NAM_Map.h
-        * DAnCE/NodeManager/NodeManager.idl
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.inl
-        * DAnCE/NodeManager/NodeManager_stub_export.h
-        * DAnCE/NodeManager/Node_Manager.cpp
-        * DAnCE/NodeManager/README
-        * DAnCE/RTNodeApplication/README
-
-        Changed all references to Node_Daemon to NodeManager to avoid
-        confusion, since these phrases are used interchangeably.
-
-        * DAnCE/NodeManager/NodeDaemon.idl
-        * DAnCE/NodeManager/NodeDaemon.mpc
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp
-        * DAnCE/NodeManager/NodeDaemon_Impl.h
-        * DAnCE/NodeManager/NodeDaemon_Impl.inl
-        * DAnCE/NodeManager/NodeDaemon_stub_export.h
-        * DAnCE/NodeManager/Node_Daemon.cpp
-
-        Removed these files to support the change above.
-
-        * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
-        * DAnCE/examples/Display/descriptors/basicNodeDaemon.pl
-        * DAnCE/examples/Hello/step-by-step.html
-        * DAnCE/examples/Hello/descriptors/run_NodeDaemons.pl
-        * DAnCE/examples/Hello/descriptors/run_test.pl
-        * DAnCE/examples/Hello/descriptors/run_test_without_ns.pl
-        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
-        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
-
-        Updated these scripts to call NodeManager instead of NodeDaemon.
-
-Fri Aug  5 11:45:13 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/CIAOServerResources.cpp
-        * DAnCE/Config_Handlers/CIAOServerResources.hpp
+          - Added new generated code as part of the
+            implementation of the spec-defined methods
+            mentioned above.
 
-        XSC code generated from CIAOServerResources.xsd for RT-CCM
-        properties.
+          - Added support for attribute exceptions in
+            code optionally generated for the stencil
+            executor implementation classes.
 
-        * docs/schema/CIAOServerResources.xsd
+Thu Mar 16 16:31:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        Fixed some namespace errors.
+        * ciao/CCM_Component.idl:
 
-Fri Aug 05 08:00:08 2005  Simon Massey  <sma@prismtech.com>
+          Added "omg.org" prefix to the recently added opening of the
+          CORBA module in this file.
 
-        * CIAO version 0.4.7 released.
+Tue Mar 14 10:10:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
 
-Wed Aug  3 12:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeManager/MonitorController.h:
+          Reverting back to previous version to avoid conflicts
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-          Corrected order of the libraries to resolve static link
-          errors
+Tue Mar 14 09:46:25 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
 
-Tue Aug  2 08:36:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeManager/MonitorController.cpp:
+          Reverting back to previous version. Mistakenly added conflicted version.
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
+Thu Mar  9 09:18:58 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-          Possiible fix for borlan build problem.
+        * COPYING: Updated the date to include 2006.
+          Thanks to Alan Kierstead <ackierstead at fedex dot com> for
+          motivating the fix to this oversight.
 
-Mon Aug 01 16:01:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
+Thu Mar 09 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ChangeLog
+        * DAnCE/Interfaces/ExecutionManagerDaemon.idl:
+        * DAnCE/Interfaces/NodeManagerDaemon.idl:
+          New idl files, these are the same as there are now in the directory
+          but then just renamed to match the interfaces in these files and
+          then don't conflict with the ones I created in ciao.
 
-          Fixed several incorrect checkin date
+        * DAnCE/Interfaces/ExecutionManager.idl:
+        * DAnCE/Interfaces/NodeManager.idl:
+          Removed, file names where not correct and now conflict with files in
+          the ciao directory
 
-Mon Aug 01 14:55:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
+        * DAnCE/Interfaces/Interfaces.mpc:
+          Updated because of file renames
 
-        * DAnCE/new_RepositoryManager/RepositoryManager_Impl.cpp
+        * ciao/CCM_Base.idl:
+          Removed old comment
 
-          Fixed a C4715 warning under MSVC7.1
+        * ciao/CCM_Component.idl:
+          Forward declare CORBA::IRObject instead of including the IFR_Client
+          idl file
 
-Mon Aug  1 19:39:30 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * ciao/Deployment_Base.idl:
+          Removed not needed include
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+        * ciao/Dynamic_Component_Activator.h:
+          Reordered includes
 
-          Removed duplicate 'after' and 'libs' items, and added the
-          new export macro definition file (see below) to
-          Header_Files.
+        * ciao/Swapping_Servant_Home_Impl_Base.h:
+        * ciao/Upgradeable_Context_Impl_T.h:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+          Added ciao/ as prefix for the includes
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
+        * ciao/Upgradeable_Context_Impl_T.h:
+          Added private default constructor
 
-          Added export macro to class declaration and include of export
-          macro definitin file.
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h:
-
-          New file to define the export macro for the Plan_Launcher_Impl
-          library.
-
-Sun Jul 31 21:56:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/Options.h
-
-          Improved documentation to meet the requirement of Doxygen
-
-Sun Jul 31 21:45:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-
-          Fixed C4101 warnings in MSVC
-
-Sun Jul 31 21:26:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-
-          Updated RMadmin.cpp to merge latest changes
-
-Fri Jul 29 15:02:43 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
-        * DAnCE/examples/Hello/descriptors/run_test_without_ns.pl
-
-          Added a flattened deployment plan and test script which
-          doesn't use naming service.
-
-        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
-
-          Documented the above another available test in the file.
-
-Fri Jul 29 09:30:43 2005  Nishanth Shanakran  <nshankar@dre.vanderbilt.edu>
-
-        * NEWS:
-
-          Added a brief description about Resource Allocation and Control
-          Engine (RACE).
-
-Fri Jul 29 06:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc:
-          Fixed fuzz error
-
-Thu Jul 28 23:00:11 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/Options.cpp
-        * DAnCE/new_RepositoryManager/Options.h
-        * DAnCE/new_RepositoryManager/README.txt
-        * DAnCE/new_RepositoryManager/RepositoryManager.cpp
-        * DAnCE/new_RepositoryManager/RepositoryManager.idl
-        * DAnCE/new_RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/new_RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.h
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
-
-        Checked in the changes to new_RepositoryManager
-
-Fri Jul 29 03:52:11 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-
-        Made is such that Plan_Launcher_Impl library gets generated
-        and installed.
-
-Wed Jul 28 15:18:14 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * docs\schema\Modified_Deployment.xsd
-
-          Change the XML element order of IAD to conform to spec
-
-Wed Jul 27 19:20:14 2005 Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * NEWS
-
-          Added news about naming service integration.
-
-Wed Jul 27 07:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/cid.cpp:
-        * DAnCE/Config_Handlers/cpd.cpp:
-        * DAnCE/Config_Handlers/iad.cpp:
-          Explicitly initialise base class
-
-Wed Jul 27 07:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/STD_IAD_Handler.h:
-          Fixed fuzz error
-
-Tue Jul 26 21:22:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
-
-          Added 'CIDL_' prefix to the scoped name of the exec impl class's
-          base class, in the impl class declaration inheritance list. This
-          file was overlooked when making similar changes to other exec
-          impl classes in CIAO tests and examples.
-
-Mon Jul 26 13:54:12 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * docs/schema/cid.xsd
-        * docs/schema/cpd.xsd
-        * docs/schema/iad.xsd
-        * docs/schema/Modified_Deployment.xsd
-
-        Added <xsd:attribute name="href"> for cid/cpd/iad(.xsd) and changed Modified_Deployment.xsd
-        accordingly.We will need href attribute in the repository manager process.
-
-        * DAnCE/Config_Handlers/iad.cpp
-        * DAnCE/Config_Handlers/iad.hpp
-        * DAnCE/Config_Handlers/cid.cpp
-        * DAnCE/Config_Handlers/cid.hpp
-        * DAnCE/Config_Handlers/cpd.cpp
-        * DAnCE/Config_Handlers/cpd.hpp
-
-        Regenerated xsc codes for updated schemas in CIAO/docs/schema/
-
-        * DAnCE/Config_Handlers/STD_CID_Handler.cpp
-        * DAnCE/Config_Handlers/STD_CID_Handler.h
-        * DAnCE/Config_Handlers/STD_CPD_Handler.cpp
-        * DAnCE/Config_Handlers/STD_CPD_Handler.h
-        * DAnCE/Config_Handlers/STD_IAD_Handler.cpp
-        * DAnCE/Config_Handlers/STD_IAD_Handler.h
-        * DAnCE/Config_Handlers/STD_PC_Intf.cpp
-        * DAnCE/Config_Handlers/STD_PC_Intf.h
-        * DAnCE/Config_Handlers/STD_PCD_Handler.cpp
-        * DAnCE/Config_Handlers/STD_PCD_Handler.h
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-
-        Added new handlers for mapping Config_Handlers::PackageConfiguration to Deployment:PackageConfiguration.
-        Updated Config_Handlers.mpc accordingly
-
-Tue Jul 26 12:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp:
-          Fixed vc71 warnings
-
-Tue Jul 26 10:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-          Added some missing CORBA::string_dup calls, this fixes these
-          tests on Windows
-
-Tue Jul 26 07:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeDaemon_Impl.{h,cpp}:
-          Fixed warning and use doxygen comment style
-
-Mon Jul 25 22:14:20 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/SizeTypeCalculator.cpp:
-
-          Fixed visitor to handle types declared inside the scope of
-          an interface, valuetype, or home. Thanks to Friedhelm Wolf
-          <Friedhelm.wolf@gmx.de> for reporting a CIDL compiler
-          problem with a struct declared inside an interface.
-
-Mon Jul 25 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-          Corrected NodeApplication path
-
-Mon Jul 25 08:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-          Made these tests independent of setting of CIAO_ROOT
-
-Sun Jul 24 07:45:19 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp
-
-          Fixed an exception emulation warning in Debian_Full_Reactor
-          build.
-
-Sun Jul 24 07:40:19 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-
-          Enhanced error output information a little bit by
-          adding process ID and thread ID.
-
-        * DAnCE/ciao/Container_Impl.cpp
-
-          Fixed exception emulation warnings in Debian_Full_Reactor
-          build.
-
-Sun Jul 24 01:19:21 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-
-          Fixed a bug (memory problem) in the plan_launcher which caused
-          the "tearing down" assembly failure.
-
-        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
-        * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
-
-          Added a UUID tag to the flattened deployment plan.
-
-Sat Jul 23 23:11:21 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/tests/Minimum/Receiver/Receiver.mpc
-        * DAnCE/tests/Minimum/Sender/Sender.mpc
-
-          Modified shared library names to fix some linking erros
-          on build scoreboard.
-
-        * DAnCE/examples/Hello/descriptors/run_test.pl
-
-          Fixed the script so naming service could be started
-          correctly.
-
-        * DAnCE/examples/Hello/step-by-step.html
-
-          Simple instruction about using naming service.
-
-Sat Jul 23 14:53:22 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Port_Activator.cpp:
-        * DAnCE/ciao/Port_Activator.h:
-        * DAnCE/ciao/Servant_Activator.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-
-          Added a method in Port_Activator to set the name of
-          port activator. The port activator is used to activate
-          the ports of the component.
-
-          Fixed a incorrect delete call in the update_port_activator
-          function in Servant_Activator.cpp. This will fix the core
-          dump in the CIAO tests.
-
-          Modified the calling sequence to deactivate ports when we
-          deactivate the component.
-
-Sat Jul 23 12:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-          Added several missing ACE_TRY_CHECK macros.
-
-Mon Jul 18 22:31:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Impl.cpp
-
-          Fixed some compilation error about using NamingContextEx.
-
-        * DAnCE/examples/Hello/descriptors/run_test.pl
-
-          Fixed this script so naming service will be started
-          explicitly. Thanks Simon McQueen <sm@prismtech.com>
-          for pointing the error.
-
-Mon Jul 18 22:31:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Impl.cpp
-        * DAnCE/ciao/Container_Impl.h
-        * DAnCE/ciao/CCM_Core.mpc
-        * DAnCE/ciao/NodeApplication_Impl.cpp
-
-          Added support for registering components with naming service.
-          A system deployer could config such capability through XML tag
-
-        * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
-        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
-
-          Added a couple of examples for using naming service by adding
-          some <ConfigProperty> tag to the deployment plan descriptor.
-
-Fri Jul 15 23:50:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * NEWS:
-          Updated the NEWS file to include the result of our latest
-          discussion/plan about DAnCE.
-
-Fri Jul 15 10:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NAM_Map.h:
-          Fixed fuzz error
-
-Tue Jul  12 00:03:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * docs/tutorials/Quoter/Simple/README.html
-
-        Updated some directory information in this file since the quoter example has been
-        moved to new directory.
-
-Mon Jul  11 11:44:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * TAO/CIAO/DAnCE/examples/Quoter/README.html
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.cidl
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.cpp
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.idl
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.mpc
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.cpp
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_stub_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_svnt_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.cidl
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.cpp
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.idl
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.mpc
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_stub_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_svnt_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base.idl
-        * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base.mpc
-        * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base_stub_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base_svnt_export.h
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.ccd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.cid
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.cpd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Exec.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Stub.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Svnt.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Deployment.xsd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.ccd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.cid
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.cpd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Exec.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Stub.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Svnt.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Domain.cdd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Libraries.iad
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cdp
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cid
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cpd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.dat
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.pcd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/XMI.xsd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/package.tpd
-        * TAO/CIAO/DAnCE/examples/Quoter/descriptors/runNodeDaemons.pl
-        * TAO/CIAO/DAnCE/examples/Quoter/images/quoter.jpg
-
-        Removed Quoter example in DAnCE/examples/ directory to avoid duplicate. The orignal
-        example could be found in CIAO/docs/tutorials/Quoter/Simple.
-
-Fri Jul  8 17:42:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
-        * CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
-        * CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.idl
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cidl
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_svnt_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_stub_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.idl
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_svnt_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_stub_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec_export.h
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Domain.cdd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Libraries.iad
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/package.tpd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Stock.cdp
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Stock.cid
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Stock.cpd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Stock.dat
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/Stock.pcd
-        * CIAO/docs/tutorials/Quoter/Simple/descriptors/XMI.xsd
-
-        Created a new directory tutorials to hold multiple tutorial examples, added quoter
-        to this directory as simple quoter example. Will add a multiple receptacle quoter
-        example soon.
-
-
-Fri Jul  8 17:13:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp
-
-        Updated the plan so that it includes the base libraries as artifact. This
-        will help ComponentPackager to wrap up everything in the archive.
-
-
-Fri Jul  8 15:49:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/ComponentPackager/Base_Packager.h
-        * DAnCE/ComponentPackager/ComponentPackager.mpc
-        * DAnCE/ComponentPackager/CPK_Packager.cpp
-        * DAnCE/ComponentPackager/Package.xsd
-        * DAnCE/ComponentPackager/pdl.cpp
-        * DAnCE/ComponentPackager/pdl.hpp
-        * DAnCE/ComponentPackager/PDL_Handler.cpp
-        * DAnCE/ComponentPackager/PDL_Handler.h
-        * DAnCE/ComponentPackager/README.html
-        * DAnCE/ComponentPackager/Sample.pdl
-
-        Updated ComponentPackager to support XSC, eliminating the coupling with
-        Old_Config_Handlers.Move the schema for .pdl file from Deployment.xsd to
-        Package.xsd so that it's independently helpful by itself.
-
-Fri Jul  8 09:43:57 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-
-        Fixed a compile error on Debian Core.
-
-Thu Jul  7 23:38:32 UTC 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * docs/index.html
-
-          Modofied this page a little bit to include our work in DAnCE.
-
-Wed Jul  6 17:21:58 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp:
-
-          Fixed incorrect syntax in ACE_THROW macro.
-
-Tue Jul  5 11:16:44 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NAM_Map.h
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-
-        Fixed some misc fuzz errors.
-
-Tue Jul  5 16:01:39 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/TypeNameEmitter.cpp:
-
-          Small change to the checkin of
-
-          Mon Jul  4 22:50:17 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          to emit an error message when attempting to set a wstring
-          attribute from a CCM property value, since wstrings are
-          not yet supported for this activity.
-
-Mon Jul  4 22:50:17 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
-
-          Created a new code emitter that knows which types CIAO
-          supports as component attribute types (basic types) and
-          which it does not (everything else). In the former case,
-          when DAnCE is assigning attribute values from XML properties -
-          in set_attributes () - it emits the usual code delegating
-          the assignment to the specific attribute mutator method
-          based on a string compare of the given attribute name to
-          the known attribute names of that component. In the latter
-          case, it emits an error message, stating that this particular
-          IDL kind is not supported by CIAO as a component attribute
-          type. Thanks to Sunil Rottoo <srottoo@airsage.com> for
-          pointing out that trying to set the value of an unsupported
-          component attribute type from a DnC property value in XML
-          caused a crash.
-
-Mon Jul  4 09:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ciao/Deployment.idl:
+        * ciao/DomainApplicationManager.idl:
+        * ciao/ExecutionManager.idl:
+        * ciao/NodeApplication_Callback.idl:
+        * ciao/NodeApplicationManager.idl:
+        * ciao/NodeManager.idl:
+        * ciao/RepositoryManager.idl:
+        * ciao/CCM_Core.mpc:
+          Splitted Deployment.idl in multiple files so that the linker
+          can decide not to link in a set of object files we don't need.
+          This will reduce footprint for several applications
 
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.h:pp:
-        * CIDLC/ServantHeaderGenerator.cpp:
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
         * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
         * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
+        * DAnCE/ExecutionManager/DAM_Map.cpp:
         * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-        * DAnCE/NodeManager/NodeDaemon_Impl.h:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/ciao/Container_Impl.h:
-        * DAnCE/ciao/Home_Servant_Impl_T.h:
-        * DAnCE/ciao/NodeApp_CB_Impl.h:
-        * DAnCE/ciao/NodeApplication_Impl.h:
-        * DAnCE/ciao/Servant_Impl_T.h:
-        * DAnCE/ciao/StandardConfigurator_Impl.h:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h:
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h:
-        * ciao/ComponentInstallation_Impl.h:
-        * ciao/ComponentServer_Impl.h:
-        * ciao/Container_Impl.h:
-        * ciao/HomeRegistrar_i.h:
-        * ciao/Home_Servant_Impl_T.h:
-        * ciao/Servant_Impl_T.h:
-        * ciao/ServerActivator_Impl.h:
-        * ciao/StandardConfigurator_Impl.h:
-        * docs/templates/CIAO_Glue_Session_Template.h:
-        * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h:
-        * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h:
-        * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h:
-        * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h:
-        * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h:
-        * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h:
-        * performance-tests/Benchmark/LatencyTest.h:
-        * performance-tests/Benchmark/RoundTripServer/LatencyTest.h:
-        * tools/Assembly_Deployer/Assembly_Impl.h:
-        * tools/Assembly_Deployer/Assembly_Service_Impl.h:
-        * tools/Daemon/Daemon_Impl.h:
-        * tools/Simple_Component_Server/Simple_Server_i.h:
-          All servants are reference counted by default, no need anymore to
-          derive the servant from RefCountServantBase
-
-Sat Jul  2 12:16:49 2005  Cassia Tatibana  <cassia@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp:
-
-        Added CIAO_TRACE messages.
-
-Fri Jul  1 08:42:27 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp
-
-        Fixed compile errors with emulated exceptions turned on.
-
-Thu Jun 30 23:34:40 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/tests/Minimum/Receiver/Receiver_exec.cpp:
-        * DAnCE/tests/Minimum/Receiver/Receiver_exec.h:
-        * DAnCE/tests/Minimum/Sender/Sender_exec.cpp:
-        * DAnCE/tests/Minimum/Sender/Sender_exec.h:
-
-          More overlooked changes to exec files corresponding to
-          CIDL compiler code generation changes of
-
-          Wed Jun 22 23:20:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Thu Jun 30 12:36:06 2005  William Otte  <wotte@atl.lmco.com>
-
-        * DAnCE/Plan_Launcher/DAM_Map.cpp
-        * DAnCE/Plan_Launcher/DAM_Map.h
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-
-        Added DAM_Map to the Plan_Launcher directory, as make wouldn't
-        handle the relative reference properly.
-
-Thu Jun 30 09:29:24 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-        * DAnCE/new_RepositoryManager/RepositoryManager.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.h
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h
-
-        Fixed Doxygen documentation tags, fixed some indenting,
-        removed tabs.
-
-Thu Jun 30 09:59:17 2005  William Otte  <wotte@atl.lmco.com>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-
-        Factored out the plan launcher capability into a shared library so
-        applications can use its functionality.
-
-Thu Jun 30 04:33:35 2005 ming xiong <mxiong@dre.vanderbilt.edu>
-
-       * DAnCE/ComponentPackager/Base_Packager.h
-       * DAnCE/ComponentPackager/CPK_Packager.cpp
-       * DAnCE/ComponentPackager/CPK_Packager.h
-       * DAnCE/ComponentPackager/PDL_Handler.cpp
-       * DAnCE/ComponentPackager/PDL_Handler.h
-       * DAnCE/ComponentPackager/Base_Packager.cpp
-
-       Added a release operation for destructor of PDL_Handler;Changed the
-       definition of input parameter for CPK_Packager::createPackager to const
-       to indicate it can not be changed
-
-Thu Jun 30 00:37:35 EDT 2005 Stoyan Paunov <s.paunov@vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-        * DAnCE/new_RepositoryManager/RepositoryManager.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.h
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h
-
-        removed the "@file" comments which apparently confuse Doxygen.
-
-
-Wed Jun 29 17:00:57 2005  Cassia Tatibana  <cassia@dre.vanderbilt.edu>
-
-       * DAnCE/ExecutionManager/DAM_Map.cpp:
-       * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-
-         Added CIAO_TRACE messages.
-
-Wed Jun 29 16:38:42 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/ComponentPackager/Base_Packager.h
-        * DAnCE/ComponentPackager/CPK_Packager.h
-        * DAnCE/ComponentPackager/CPK_Packager.h
-
-        Changed a couplfe of places to meet the Doxygen test and TChar test for
-        bin/fuzz.pl
-
-Wed Jun 29 16:28:52 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeManager/NAM_Map.cpp
-        * DAnCE/NodeManager/NAM_Map.h
-        * DAnCE/NodeManager/NodeDaemon.mpc
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp
-        * DAnCE/NodeManager/NodeDaemon_Impl.h
-        * DAnCE/NodeManager/Node_Daemon.cpp
-        * DAnCE/ciao/Deployment.idl
-
-        Merged dance_multiple_assemblies to main.  This merge
-        contains code necessary to be able to deploy multiple assemblies
-        into a single NodeManager.
-
-Wed Jun 29 18:09:11 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-          Added check for successful opening of target file, which prevents
-          a crash when the file open is unsuccessful, for example when
-          write permissions are denied in the directory. Thanks to Will
-          Otte <wotte@dre.vanderbilt.edu> for pointing out the problem.
-
-Tue Jun 28 08:55:12 EDT 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/ComponentPackager/Base_Packager.cpp
-        * DAnCE/ComponentPackager/Base_Packager.h
-        * DAnCE/ComponentPackager/CPK_Packager.cpp
-        * DAnCE/ComponentPackager/CPK_Packager.h
-        * DAnCE/ComponentPackager/ComponentPackager.mpc
-        * DAnCE/ComponentPackager/Component_Packager.cpp
-        * DAnCE/ComponentPackager/Modified_Deployment.xsd
-        * DAnCE/ComponentPackager/PDL_Handler.cpp
-        * DAnCE/ComponentPackager/PDL_Handler.h
-        * DAnCE/ComponentPackager/README.html
-        * DAnCE/ComponentPackager/Sample.pdl
-        * DAnCE/ComponentPackager/XercesString.cpp
-        * DAnCE/ComponentPackager/XercesString.h
-
-        Added the files implementing ComponentPackager, for details
-        please read README.html
-
-Tue Jun 28 01:03:12 EDT 2005 Stoyan Paunov <s.paunov@vanderbilt.edu>
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+        * DAnCE/NodeManager/Node_Manager.cpp:
+        * DAnCE/NodeManager/NodeManager.mpc:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.{h.cpp}:
+        * DAnCE/TargetManager/Deployment_Configuration.h:
+          Updated for the idl subsetting of ciao/Deployment.idl. Also add ciao/
+          prefix to several includes and try to cleanup a little.
+
+        * DAnCE/RepositoryManager/RepositoryManager.idl:
+        * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl:
+          Renamed the first file to the second, matches the interface name.
 
-        * TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp
-        * TAO/CIAO/DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp
+        * DAnCE/RepositoryManager/RepositoryManager.mpc:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/PC_Updater.{h,cpp}:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+          Updated because of rename above
 
-        removed the _O_* flags to ACE_OS::open ();
+        * DAnCE/RTNodeApplication/senv.sh:
+          Removed this file, no need here.
 
-Mon Jun 27 16:25:52 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * DAnCE/RTNodeApplication/NodeApplication_Task.h:
+          No need for virtual inheritance, that consumes more footprint then
+          needed.
 
-        * DAnCE/examples/Swapping/Sender/Sender_exec.cpp:
-
-          Fixed cut-and-paste error.
-
-Mon Jun 27 07:04:01 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc:
-        * DAnCE/new_RepositoryManager/README.txt:
-
-          Switch to using the existing zlib and zzip base projects.
-
-Sun Jun 26 23:53:23 EDT 2005 Stoyan Paunov <s.paunov@vanderbilt.edu>
-
-        * DAnCE/new_RepositoryManager/Modified_Deployment.xsd
-        * DAnCE/new_RepositoryManager/Options.cpp
-        * DAnCE/new_RepositoryManager/Options.h
-        * DAnCE/new_RepositoryManager/README.txt
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-        * DAnCE/new_RepositoryManager/RepositoryManager.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.h
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.idl
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h
-        * DAnCE/new_RepositoryManager/packages/inconsistent.cpk
-        * DAnCE/new_RepositoryManager/packages/package.cpk
-
-        Added these files to the head. The files are implementing the repository
-        manager.
-
-        * DAnCE/new_RepositoryManager/Modified_Deployment.xsd
-        needed for the retrievePlan function that retrieves the Deployment plan
-
-        * DAnCE/new_RepositoryManager/Options.cpp
-        * DAnCE/new_RepositoryManager/Options.h
-        options class for the RMadmin.cpp
-
-        * DAnCE/new_RepositoryManager/README.txt
-
-        * DAnCE/new_RepositoryManager/RMadmin.cpp
-        a sample client program. You can use it as an example on how to use the RM
-
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp
-        * DAnCE/new_RepositoryManager/ZIP_Wrapper.h
-        The ZIP Wrapper class that allows read access to ZIP packages and CCM packages
-        that have the cpk extension.
-
-        * DAnCE/new_RepositoryManager/RepositoryManager.cpp
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.idl
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp
-        * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h
-        The Repository Manager implementation files
-
-        * DAnCE/new_RepositoryManager/packages/inconsistent.cpk
-        * DAnCE/new_RepositoryManager/packages/package.cpk
-        couple of sample packages that I created manually to test the RM.
-
-
-Fri Jun 24 14:36:02 2005  Cassia Tatibana  <cassia@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/CIAO_common.h:
-
-          Added definition for CIAO_TRACE.
-
-Fri Jun 24 14:21:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/tutorial/Hello/hello_exec.cpp:
-        * docs/tutorial/Hello/hello_exec.h:
-        * examples/Hello/Receiver/Receiver_exec.cpp:
-        * examples/Hello/Receiver/Receiver_exec.h:
-        * examples/Hello/Sender/Sender_exec.cpp:
-        * examples/Hello/Sender/Sender_exec.h:
-        * performance-tests/Protocols/Receiver/Receiver_exec.cpp:
-        * performance-tests/Protocols/Receiver/Receiver_exec.h:
-        * performance-tests/Protocols/Sender/Sender_exec.cpp:
-        * performance-tests/Protocols/Sender/Sender_exec.h:
-        * tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp:
-        * tests/RTCCM/DiffServ/Receiver/Receiver_exec.h:
-        * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
-        * tests/RTCCM/DiffServ/Sender/Sender_exec.h:
-
-          More fixes to hand-written executor code to bring the file up
-          to date with the recent changes in generated code. These were
-          overlooked in
-
-          Wed Jun 22 23:20:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Jun 22 23:20:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIAO/CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIAO/CIDLC/ExecImplSourceGenerator.cpp:
-        * CIAO/CIDLC/ExecutorMappingGenerator.cpp:
-        * CIAO/CIDLC/Literals.cpp:
-        * CIAO/CIDLC/Literals.hpp:
-        * CIAO/CIDLC/ServantHeaderGenerator.cpp:
-        * CIAO/CIDLC/ServantSourceGenerator.cpp:
-        * CIAO/DAnCE/examples/Display/NavDisplay/NavDisplay_exec.h:
-        * CIAO/DAnCE/examples/Display/RateGen/RateGen_exec.h:
-        * CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp:
-        * CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.h:
-        * CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp:
-        * CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h:
-        * CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.cpp:
-        * CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.h:
-        * CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp:
-        * CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.h:
-        * CIAO/DAnCE/examples/Swapping/Receiver/Receiver_exec.cpp:
-        * CIAO/DAnCE/examples/Swapping/Receiver/Receiver_exec.h:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec.cpp:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec.h:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec_1.h:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp:
-        * CIAO/DAnCE/examples/Swapping/Sender/Sender_exec_2.h:
-        * CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp:
-        * CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
-        * CIAO/docs/releasenotes/index.html:
-
-          Eliminated generation of the CIAO_GLUE_-prefixed namespace
-          and replaced it with a namespace constructed from the
-          composition local name and a CIDL_ prefix. Whereas the
-          previos namespace was always at global scope, the new one
-          will be generated inside namespaces mapped from IDL module
-          declarations, if the composition is declared inside any.
-          These changes were motivated by an example sent in by
-          Will Otte <wotte@dre.vanderbilt.edu>, where the composition
-          was declared inside several nested modules, and the generated
-          code would not compile. The new namespace encloses
-
-            - the component servant
-            - the home servant
-            - the facet servants, if any
-            - the executor interface in the executor IDL file
-            - optionally generated executor impl classes
-
-          Minor changes were required to existing executor impl
-          files as a result of the changes to generated code.
-
-Wed Jun 22 10:59:00 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
-          Updated visitor for valuebox support.
-
-Mon Jun 20 18:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/MapView_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel_moc.cpp:
-          Removed these files, these are generated and shouldn't be in the
-          archive
-
-Mon Jun 20 09:29:00 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
-          Add visitor for valuebox support.
-
-Sun Jun 19 20:18:50 2005  Ming Xiong  <mxiong@tango.dre.vanderbilt.edu>
+        * DAnCE/RTNodeApplication/NodeApplication_Task.cpp:
+          Reordered includes
 
-        * NEWS:
+Wed Mar 08 15:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Updated NEWS on upcoming support for Component Packaging
+        * ciao/ServerResources.idl:
+          Fixed incorrect file header
 
-Thu Jun 16 21:46:10 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+Wed Mar 08 14:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/examples/Display/descriptors/Modified_Deployment.xsd
-        * DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd
-        * docs/schema/Modified_Deployment.xsd
+        * rules.ciao.GNU:
+          Added $(CIAO_ROOT)/ciao to LDFLAGS and $(CIAO) to INCLDIRS
+          as we do in rules.tao.GNU, this improves the footprint stats
 
-          Modified the <InstanceDeploymentDescription> element type
-          to allow having unbounded number of <configProperty> elements.
-          Thanks Will Chai <willchai@126.com> to report this problem.
+Mon Mar 06 16:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Jun 15 14:46:00 2005  Gautam Thaker  <gthaker@atl.lmco.com>
+        * ciao/Swapping_Container.{h,cpp}:
+          Made serial_number_ unsigned and documented why it is static
 
-        * DAnCE/examples/Hello/step-by-step.html:
+        * performance-tests/Benchmark/LatencyTest.h:
+          Removed not needed msvc pragma push/pop
 
-          Fixed a typo regarding name of script "run_NodeDaemons.pl" and
-          one other sentence fragement.
+Sun Mar 05 11:16:46 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-Mon Jun 13 13:44:41 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * CIAO version 0.5 released.
 
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
+Thu Mar  2 17:50:36 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
 
-          Fixed a typo.
+        * CCF/CCF/IDL2/SemanticGraph/Struct.cpp:
+        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
 
-Thu Jun  4 14:36:00 UTC 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
+          Fixed a bug in the logic that determines completeness of recursive
+          structs and unions.
 
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.h
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp
+Thu Mar  2 08:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed a virtual hiding warning reported on WinXP_BCB6_Pro_Dynamic_Debug
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+          Replaced NULL with 0
 
-Thu Jun  9 09:31:28 2005  Simon McQueen  <sm@prismtech.com>
+Thu Mar  2 01:33:09 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * NEWS:
 
-          Updated with late release note submissions.
-
-Wed Jun 08 08:50:35 2005  Simon McQueen  <sm@prismtech.com>
+          Updated this file with info from Ming Xiong and Gan Deng.
 
-        * CIAO version 0.4.6 released.
-
-Wed Jun  8 11:21:50 2005  Simon McQueen  <sm@prismtech.com>
+Wed Mar  1 22:34:52 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * NEWS:
 
-          Updated with release note entries.
-
-Mon Jun  6 12:33:16 2005  Simon McQueen  <sm@prismtech.com>
-
-        * DAnCE/examples/Display/GPS/GPS.mpc:
-
-          Added HUDisplay_DnC_svnt to after tag for project GPS_DnC_svnt
-          to fix build error on BCB 6 dynamic build.
-
-
-Thu Jun  2 22:56:11 UTC 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/examples/Quoter/README.html
-
-          Added a link to the CoSMIC quoter tutorial page hosted by
-          Ming Xiong.
-
-        * NEWS
-
-          Updated NEWS file.
-
-Tue May 31 22:46:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ExecutorMappingGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-
-          Eliminated unused arguments.
-
-Mon May 30 15:22:16 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/XML_File_Intf.h:
-        * DAnCE/Config_Handlers/DP_Handler.h:
-
-          auto_ptr is changed with ACE_Auto_Ptr, auto_ptr does not have
-          reset in VC6.
-
-Mon May 30 17:59:28 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Updated the file with info from Ming Xiong.
 
-        * CIDLC/TypeNameEmitter.cpp:
-
-          Fixed incorrect code generation in *_svnt.cpp file for
-          attribute assignment of sequence types. Thanks to Sunil Rottoo
-          <srottoo@adacelcanada.com> for reporting the problem.
-
-Mon May 30 12:19:42 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Port_Activator_T.cpp:
-        * DAnCE/ciao/Servant_Activator.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-
-          Made use of ACE_ENV macros to fix Debian Full Reactor
-          build errors.
-
-Fri May 27 23:35:23 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Impl.cpp:
-        * DAnCE/ciao/Container_Impl.h:
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_T.h:
-
-        Changed the structure of the utility maps that maintain
-        the component references, to use "_var" instead of "_ptr"
-        in order to facilitate effective memory destructions.
+Wed Mar  1 19:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri May 27 20:26:33 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * CCF/CCF/CCF.sln:
-        * CCF/Example/Example.sln:
-        * CIDLC/CIDLC.sln:
-        * CCF/CCF/CIDL/CIDL.vcproj:
-        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj:
-        * CCF/CCF/CompilerElements/CompilerElements.vcproj:
-        * CCF/CCF/IDL2/IDL2.vcproj:
-        * CCF/CCF/IDL3/IDL3.vcproj:
-        * CCF/Example/CIDL/LocalExecutorMapping/LocalExecutorMapping.vcproj:
-        * CCF/Example/CodeGenerationKit/Indentation/IDL/IDL.vcproj:
-        * CIDLC/CIDLC.vcproj:
-
-          Deleted MSVC solution and project files, these are generated by the
-          mwc.
-
-Fri May 27 13:41:20 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Port_Activator.h:
-        * DAnCE/ciao/Port_Activator_T.cpp:
-        * DAnCE/ciao/Port_Activator_T.h:
-        * DAnCE/ciao/Servant_Activator.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
+        * CIAO-INSTALL.html:
+          Updated rename of CIAOTAO.mwc to CIAO_TAO.mwc
 
-        Added support for deactivating facets and event consumers
-        when a component is getting deactivated. This fixes
-        couple of memory leaks in the DAnCE deployment scenarios.
+Wed Mar  1 15:02:10 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
+        * DAnCE/NodeApplication/Container_Impl.h
+        * DAnCE/NodeApplication/Container_Impl.cpp
 
-Thu May 26 22:55:26 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        Added codes to unregister with naming service when removing
+        components
 
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
+Tue Feb 28 18:46:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-          Added code to deactivate facets when component
-          is getting removed.
+        * DAnCE/Deployment.xsd
+        * DAnCE/Deployment.xsd.orig
+        * DAnCE/XMI.xsd
+        * DAnCE/XMI.xsd.orig
 
-Thu May 26 20:41:04 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+          Removed these schema files.  They were misleading and useless.
 
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_T.h:
+Fri Feb 24 21:21:02 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-        Added support for the component servants to inherit
-        from RefCountServantBase, to allow freeing up of
-        servants in a more standard and effective manner.
+        * tools/Config_Handlers/Config_Handlers.mpc
 
-        Added support functions in Servant_Impl_T class to
-        clean up the component executor memory.
+          Added a verbatim to disable hidden_visibility for Config_Handlers
 
-        Added support functions in Home_Servant_Impl_T and
-        Servant_Impl_Base classes to uninstall components
-        by executing operations like ccm_remove () in the
-        right order.
+Fri Feb 24 18:54:52 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
 
-        Finally fixed couple of memory leaks with respect
-        to cleaning up component servants and component
-        executors.
+        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+          some cosmetic changes
 
-        Thanks to Steve Baker <Steve_D_Baker@Raytheon.com>
-        for reporting the problem.
+        * DAnCE/RepositoryManager/URL_Parser.h:
+          made the constructor protected and made the ACE_Singleton a friend
 
-Thu May 26 21:09:22 2005  Gan Deng <gan.deng@vanderbilt.edu>
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+          fixed a bug and improved the robustness of the code
 
-        * tools/Simple_Component_Server/Simple_Component_Server.mpc
+Fri Feb 24 09:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Put an empty IDL_Files segment in the
-          "Simple_Component_Server" project so the IDL
-          file is not picked up automatically. Thanks to Will Chai
-          <willchai@126.com> for reporting this.
+        * CIAO-INSTALL.html:
+          Fixed typo
 
-        * NEWS
-        * DAnCE/NEWS
-
-          Merged these two files and deleted the DAnCE/NEWS file,
-          since these two files serve similar purposes.
-
-Thu May 26 14:46:53 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp
-
-        Fixed a memory leak which would cause NodeManagers to leak
-        when destroyed.
-
-Thu May 26 07:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/examples/Quoter/Broker/Broker.cpp:
-          Fixed doxygen file tag
-
-Wed May 25 11:05:05 2005  Ming Xiong  <mxiong@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Quoter/Stock_Base/Stock_Base.mpc:
-        * DAnCE/examples/Quoter/Stock_Base/Stock_Base.idl:
-        * DAnCE/examples/Quoter/Stock_Base/Stock_Base_svnt_export.h:
-        * DAnCE/examples/Quoter/Stock_Base/Stock_Base_stub_export.h:
-        * DAnCE/examples/Quoter/Broker/Broker.mpc:
-        * DAnCE/examples/Quoter/Broker/Broker.idl:
-        * DAnCE/examples/Quoter/Broker/Broker.cidl:
-        * DAnCE/examples/Quoter/Broker/Broker.cpp:
-        * DAnCE/examples/Quoter/Broker/Broker_exec.h:
-        * DAnCE/examples/Quoter/Broker/Broker_exec.cpp:
-        * DAnCE/examples/Quoter/Broker/Broker_svnt_export.h:
-        * DAnCE/examples/Quoter/Broker/Broker_stub_export.h:
-        * DAnCE/examples/Quoter/Broker/Broker_exec_export.h:
-        * DAnCE/examples/Quoter/Distributor/Distributor.mpc:
-        * DAnCE/examples/Quoter/Distributor/Distributor.idl:
-        * DAnCE/examples/Quoter/Distributor/Distributor.cidl:
-        * DAnCE/examples/Quoter/Distributor/Distributor.cpp:
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.h:
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp:
-        * DAnCE/examples/Quoter/Distributor/Distributor_svnt_export.h:
-        * DAnCE/examples/Quoter/Distributor/Distributor_stub_export.h:
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec_export.h:
-        * DAnCE/examples/Quoter/descriptors/Broker.ccd:
-        * DAnCE/examples/Quoter/descriptors/Broker.cid:
-        * DAnCE/examples/Quoter/descriptors/Broker.cpd:
-        * DAnCE/examples/Quoter/descriptors/Broker_Exec.iad:
-        * DAnCE/examples/Quoter/descriptors/Broker_Stub.iad:
-        * DAnCE/examples/Quoter/descriptors/Broker_Svnt.iad:
-        * DAnCE/examples/Quoter/descriptors/Deployment.xsd:
-        * DAnCE/examples/Quoter/descriptors/Distributor.ccd:
-        * DAnCE/examples/Quoter/descriptors/Distributor.cid:
-        * DAnCE/examples/Quoter/descriptors/Distributor.cpd:
-        * DAnCE/examples/Quoter/descriptors/Distributor_Exec.iad:
-        * DAnCE/examples/Quoter/descriptors/Distributor_Stub.iad:
-        * DAnCE/examples/Quoter/descriptors/Distributor_Svnt.iad:
-        * DAnCE/examples/Quoter/descriptors/Domain.cdd:
-        * DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp:
-        * DAnCE/examples/Quoter/descriptors/Libraries.iad:
-        * DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd:
-        * DAnCE/examples/Quoter/descriptors/package.tpd:
-        * DAnCE/examples/Quoter/descriptors/runNodeDaemons.pl:
-        * DAnCE/examples/Quoter/descriptors/Stock.cdp:
-        * DAnCE/examples/Quoter/descriptors/Stock.cid:
-        * DAnCE/examples/Quoter/descriptors/Stock.cpd:
-        * DAnCE/examples/Quoter/descriptors/Stock.dat:
-        * DAnCE/examples/Quoter/descriptors/Stock.pcd:
-        * DAnCE/examples/Quoter/descriptors/XMI.xsd:
-
-          Added a Quoter example for DAnCE
-
-Wed May 25 11:13:19 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-
-          Added code to call ccm_remove () on the executor
-          before removing the component.
-
-          Thanks to Steven Baker <Steven_D_Baker@raytheon.com> for
-          identifying the problem.
-
-Wed May 25 10:52:39 2005  Cassia Tatibana  <cassia@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Display/HUDisplay.idl:
-        * DAnCE/examples/Display/HUDisplay.mpc:
-        * DAnCE/examples/Display/HUDisplay_stub_export.h:
-        * DAnCE/examples/Display/HUDisplay_svnt_export.h:
-        * DAnCE/examples/Display/README.html:
-        * DAnCE/examples/Display/GPS/GPS.cidl:
-        * DAnCE/examples/Display/GPS/GPS.idl:
-        * DAnCE/examples/Display/GPS/GPS.mpc:
-        * DAnCE/examples/Display/GPS/GPSEI.idl:
-        * DAnCE/examples/Display/GPS/GPS_exec.cpp:
-        * DAnCE/examples/Display/GPS/GPS_exec.h:
-        * DAnCE/examples/Display/GPS/GPS_exec_export.h:
-        * DAnCE/examples/Display/GPS/GPS_stub_export.h:
-        * DAnCE/examples/Display/GPS/GPS_svnt_export.h:
-        * DAnCE/examples/Display/GPS/GPS_tracing_exec.cpp:
-        * DAnCE/examples/Display/GPS/GPS_tracing_exec.h:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay.cidl:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay.idl:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay.mpc:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.cpp:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.h:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_exec_export.h:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_stub_export.h:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_svnt_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/Command.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/MapView.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/MapView.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/MapView_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_exec_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_stub_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_svnt_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_stub_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_svnt_export.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavUnit.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NavUnit.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/QuitCmd.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel_moc.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/Worker.cpp:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/Worker.h:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/trolltech.gif:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/worldmap1.gif:
-        * DAnCE/examples/Display/NavDisplayGUI_exec/worldmap1.xpm:
-        * DAnCE/examples/Display/RateGen/RateGen.cidl:
-        * DAnCE/examples/Display/RateGen/RateGen.idl:
-        * DAnCE/examples/Display/RateGen/RateGen.mpc:
-        * DAnCE/examples/Display/RateGen/RateGen_exec.cpp:
-        * DAnCE/examples/Display/RateGen/RateGen_exec.h:
-        * DAnCE/examples/Display/RateGen/RateGen_exec_export.h:
-        * DAnCE/examples/Display/RateGen/RateGen_stub_export.h:
-        * DAnCE/examples/Display/RateGen/RateGen_svnt_export.h:
-        * DAnCE/examples/Display/RateGen/controller.cpp:
-        * DAnCE/examples/Display/descriptors/Deployment.xsd:
-        * DAnCE/examples/Display/descriptors/EM.ior:
-        * DAnCE/examples/Display/descriptors/GPS.ior:
-        * DAnCE/examples/Display/descriptors/Modified_Deployment.xsd:
-        * DAnCE/examples/Display/descriptors/NavDisplay.ior:
-        * DAnCE/examples/Display/descriptors/NavDisplayGUI.ior:
-        * DAnCE/examples/Display/descriptors/NodeManagerMap.dat:
-        * DAnCE/examples/Display/descriptors/RateGen.ior:
-        * DAnCE/examples/Display/descriptors/XMI.xsd:
-        * DAnCE/examples/Display/descriptors/basicNodeDaemon.pl:
-        * DAnCE/examples/Display/descriptors/flattened_deploymentplan.cdp:
-
-        Ported the Display example in CIAO to DAnCE.
-
-Tue May 24 22:23:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/examples/Hello/step-by-step.html
-
-          Fixed a typo in the command line option.  Thanks to Will Chai
-          <willchai@126.com> for reporting this.
-
-Tue May 24 00:23:26 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * CCF/CCF/CIDL/CIDL.mpc:
-        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc:
-        * CCF/CCF/CompilerElements/CompilerElements.mpc:
-        * CCF/CCF/IDL2/IDL2.mpc:
-        * CCF/CCF/IDL3/IDL3.mpc:
-
-          Changed the mpc files to use the cidlc.mpb.
-
-Sun May 22 21:23:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
-
-          Modified the operation from <_ciao_passivate> to <ciao_passivate>
-          due to my earlier interface changes.
-
-Sun May 22 11:29:36 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Base.cpp:
-
-          Fixed a memory leak in the container code to
-          delete the ServantActivator pointer.
-
-Sat May 21 16:08:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ciao/Deployment_Core.idl
-
-          Added <ciao_passivate> operation on the NodeApplication interface,
-          which is useful for enforce the correct component deactivation
-          sequence.
-
-        * DAnCE/ciao/Deployment.idl
-
-          Moved the StopError exception definition and put into the
-          Deployment_Core.idl, since <ciao_passviate> operation needs
-          such exception declaration.
-
-        * DAnCE/ciao/CCM_Component.idl
-
-          Added <ciao_passivate> operation to the CCM_Object interface.
-
-        * DAnCE/ciao/NodeApplication_Impl.cpp
-        * DAnCE/ciao/NodeApplication_Impl.h
-
-          Implementation of the above added operation <ciao_passivate>.
+Thu Feb 23 23:35:59 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * examples/Swapping/Receiver/Receiver.mpc:
+        * examples/Swapping/Sender/Sender.mpc:
 
-          Modified to call <ciao_passivate> before calling <destroyApplication>.
+          I was over zealous in my previous change.  I shortened too many
+          project names (those that are defined in projects outside of these
+          mpc files).
 
-        * DAnCE/RepositoryManager/Repository_Manager.cpp
+Wed Feb 22 16:38:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
-          Modified the Repository_Manager/executor to invoke <start>
-          separately from invoking finishLaunch.
+        * CIAO-INSTALL.html:
 
-        * DAnCE/ciao/Servant_Impl_Base.cpp
+          Updated the documentation on how to build cidlc on Windows.
 
-          Removed the call of <ciao_passivate> from the
-          Servant_Impl_Base::remove() function since this will be
-          called separately on the whole assembly, i.e. passivate ALL
-          components in the assembly before removing components.
+        * examples/Swapping/Receiver/Receiver.mpc:
+        * examples/Swapping/Sender/Sender.mpc:
 
-        * DAnCE/ciao/Servant_Impl_T.cpp
-        * DAnCE/ciao/Servant_Impl_T.h
+          Shortened the project names in these MPC files to avoid fuzz
+          warnings.
 
-          Changed the operation name from "_ciao_passivate" to
-          "ciao_passivate", in order to make it to be the implementation
-          of the <ciao_passivate> operation added on the CCM_Object
-          interface.
+Wed Feb 22 01:11:59 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Sat May 21 14:39:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
+        * DAnCE/NodeApplication/Container_Impl.cpp
 
-        * DAnCE/ciao/Deployment_Core.idl
+          Fixed a bug about naming service registration.
+          Thanks Sandro Andrade <sandro @dcc.ufba.br> for reporting
+          a bug about removing component error.
 
-          Added <ciao_preactivate> and <ciao_postactivate>
-          operations on the NodeApplication interface, which is useful
-          for enforce the correct component activation operation
-          sequence.
+Tue Feb 21 23:59:05 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * DAnCE/ciao/NodeApplication_Impl.cpp
-        * DAnCE/ciao/NodeApplication_Impl.h
+        * ciao/Deployment.idl
 
-          Implemented the above operations.
+          Added a parameter to the perform_redeployment() operation
+          to the NodeApplicationManager interface to separate the
+          "installation of new components" from the "removal of
+          existing components".
 
         * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-
-          Modified it to call ciao_preactivate and ciao_postactivate
-          on NodeApplications accordingly
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-
-          Modified to disable the "start" while "finishLaunch", since
-          it is the application developer's control to invoke start
-          operation in the whole assembly.
-
-        * DAnCE/ciao/Container_Base.cpp
-        * DAnCE/ciao/Container_Impl.cpp
-
-          Put some debug output into the CIAO_DebugLevel control
-
-        * DAnCE/examples/Hello/Sender/Sender_exec.cpp
-
-          Cosmetic changes.
-
-Tue May 17 20:49:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * CIAO/tests/IDL3/ImpliedIDL/All/all.mpc:
-        * CIAO/tests/IDL3/ImpliedIDL/All/convert.idl:
-        * CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl:
-        * CIAO/tests/IDL3/ImpliedIDL/All/include.idl:
-        * CIAO/tests/IDL3/ImpliedIDL/All/README:
+          Modified the logic of perform_redeployment() functionality
+          to enforce correct order of ReDaC, which is:
+          (1) Install new components,
+          (2) Set up new connections,
+          (3) Remove old connections, and
+          (4) Remove old components.
 
-          New files comprising a test for the tao_idl3_to_idl2
-          executable. The test executes tao_idl3_to_idl2 on the
-          listed IDL files, then executes the TAO IDL compiler on
-          the resulting IDL files. The resulting C++ code is compiled,
-          and if there are no errors or warnings in this last step,
-          the test is a success.
-
-Tue May 17 07:51:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/Process_Element.h:
-        * DAnCE/Old_Config_Handlers/Process_Element.cpp:
-
-          Fixed unresolved symbol link error.
-
-Mon May 16 21:29:49 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/Process_Element.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp (remove_component):
-
-          Fixed syntax errors.
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
 
-Mon May 16 12:06:51 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Fixed a bug about removing components when using ReDaC.
+          In NodeApplicationManager, after the perform_redeployment()
+          call calls the remove_components() method to actually
+          destroy components from the component server, DAnCE NAM doesn't
+          unbind those components from the cached component_map_, hence
+          when the create_connections() method is called afterwords,
+          NAM tries to access the destroyed components to get
+          their port information, which causes the Object_Not_Exist
+          exception thrown.
+
+          The fix will unbind the removed components from the
+          cached component map. However, the trick is that after
+          we unbind these components,  the port iinformation of
+          these components are also lost, then the
+          DomainApplicaitonManager could not handle the
+          "removal" of connections correctly.
+
+          The Right Fix is to enforce correct call sequence, which
+          are illustrated above.
+          Thanks Sandro Andrade <sandro @dcc.ufba.br> for reporting
+          a bug about removing component error.
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+
+          Added a component state map to keep track of component state
+          information. With this map, components will be activated
+          only when they are newly created, and will be passivated
+          only when they are currently active. This will also fix
+          a bug about the component initialization sequence. Earlier,
+          when components are installed, they are immediately activated
+          by explicitly calling ciao_preactivate, ciao_activate, and
+          ciao_postactivate on the comopnent object reference,
+          which is not compliant to the Spec defined semantics.
+          This fix shall ensure that the components are activated AFTER
+          their connections have been setup.
+
+        * DAnCE/NodeApplication/Container_Impl.cpp
+
+          Fixed a bug when passing object reference to a local function.
+          Earlier the memory of the object reference is released by
+          the callee, which causes the object reference becomes invalid
+          after the function returns.
+
+Tue Feb 21 19:43:11 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+        * performance-tests/Protocols/Controller/Controller.mpc
 
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp (~IndentityProvider):
-        * DAnCE/Old_Config_Handlers/Process_Element.h (Process_Function):
-        * DAnCE/Old_Config_Handlers/Process_Element.cpp
-          (~Process_Function):
-        * tests/RTCCM/Priority_Test/Controllers/Pulser.h (Pulse_Handler):
-        * tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
-          (~Pulse_Handler):
+          Added avoids+= ace_for_tao to two additional projects.
 
-          Added missing virtual destructor.  Fixes g++ 4.0 "class with
-          virtual functions but no virtual destructor" warnings.
+        * examples/Display/descriptors/EM.ior
+        * examples/Display/descriptors/GPS.ior
+        * examples/Display/descriptors/NavDisplay.ior
+        * examples/Display/descriptors/NavDisplayGUI.ior
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp (mode):
+          Removed these ior files.
 
-          Fixed "non-local variable uses anonymous type" g++ 4.0 warning.
+Tue Feb 21 17:40:20 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp (remove_component):
-        * tools/RTComponentServer/RTConfig_Manager.cpp
-          (find_threadpool_by_name):
-        * tools/XML_Helpers/RTConfig_Handlers.cpp (add_threadpoollane):
-          (add_priorityband):
+        * DAnCE/NodeManager/MonitorController.cpp:
 
-          Fixed "variable may be used uninitialized" warnings.
+        Fixed ACE_TRACE compilation error.
 
-        * tools/Assembly_Deployer/Assembly_Deployer.cpp
-          (teardown_assembly):
+Mon Feb 20 15:08:49 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-          Fixed format specifier mismatch.
+        * CIAO version 0.4.10 released.
 
-Mon May 16 11:27:30 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Feb 20 19:48:12 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-        * CIAO-INSTALL.html:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd
 
-          Added line to table about availability of binaries for MacOS
-          and Solaris.
+          Removed this file because it is generated
 
-Sat May 14 06:12:44 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Feb 17 19:22:21 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * CIAO version 0.4.5 released.
+        * NEWS:
 
-Thu May 12 10:20:55 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+          Updated this file with more inputs.
 
-        * Updated the COPYING file to clarify some ambiguity about
-          proprietary usage of CIAO.
+Thu Feb 16 15:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue May 10 21:12:47 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+        * CIAO_DAnCE.mwc:
+          Fixed typo in this file
 
-        * docs/releasenotes/dance.html: Updated this page to clearly
-          point out which OMG D&C specification DAnCE implements.
-          Thanks to Gary Duzan <gduzan@bbn.com> for requesting this.
+Thu Feb 16 04:14:15 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Tue May 10 07:49:47 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+        * performance-tests/Protocols/Receiver/Receiver.mpc
+        * performance-tests/Protocols/Sender/Sender.mpc
 
-        * DAnCE/examples/Hello/descriptors: Changed the name of
-          ruNodeDaemons.pl to run_NodeDaemons.pl.  Thanks to Arno Wilhelm
-          <arno.wilhelm@profile.co.at> for reporting this.
+          Disabled building some project when ace_for_tao is set.
 
-Sun May  8 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Feb 15 19:24:31 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * tests/CIDL/CodeGen/CodeGen.mpc:
-          Removed requires+=cidl
+        * CIAO.mwc
 
-Sat May  7 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          This file now builds all of CIAO.
 
-        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-          Removed requires+=cidl for the NodeAppTest_RoundTrip_svnt project.
-          It should not be there. Thanks for Jaiganesh B
-          <jai@dre.vanderbilt.edu> for finding out that this caused the
-          problems in the gcc4 build
+        * CIAODAnCE.mwc
+        * CIAO_DAnCE.mwc
 
-Fri May  6 08:15:43 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Renamed this file to CIAO_DAnCE.mwc
 
-        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
+        * CIAOTAO.mwc
+        * CIAO_TAO.mwc
 
-          Changed base project lists and added explicit lists (sometimes
-          empty) for header and inline files.
+          Renamed this file to CIAO_TAO.mwc.
 
-Wed May  4 19:27:01 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Thanks to Chad Elliott (elliott_c at ociweb dot com) for suggesting
+          these changes.
 
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+        * CIAO_TAO_DAnCE.mwc
 
-          Fixed typo in generated code - changed "provides_" prefix
-          in component facet access operation to the correct
-          "provide_". Thanks to Don Busch <busch_d@ociweb.com> for
-          pointing out the mistake.
+          Removed the DAnCE/tests/Config_Handlers exclusion, as it no
+          longer exists.
 
-Tue May 03 22:42:47 2005  Nanbor Wang  <nanbor@gauss.txcorp.com>
+Wed Feb 15 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * NEWS: Updated news on upcoming real-time extension on Gan Deng's
-          behalf.
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
+          Replaced ACE cast macros with their C++ versions
 
-Tue May  3 13:05:44 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed Feb 15 07:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * CIDLC/ServantSourceGenerator.cpp:
+          Fixed generation so that it compiles with Borland
 
-          Changed the generated string (used for object id) which is passed
-          to the port activator constructor and to generate_reference() to
-          be a concatentation of the component instance name and the port
-          name, to ensure uniqueness in any use case.
+Tue Feb 14 23:01:46 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Mon May 2 07:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
 
-        * tools/RTComponentServer/RTConfig_Manager.cpp:
-        * tools/Assembly_Deployer/Assembly_Impl.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp:
-        * DAnCE/ciao/Dynamic_Component_Servant_T.cpp:
-          Fixed gcc 4 warnings
-
-Sat May 1 03:11:17 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * ciao/tools/Simple_Component_Server/Simple_Component_Server.cpp:
+          Fixed a bug when removing ReDaC components from the container.
+          This bug was caused by the container set indexing error when
+          handling newly installed components.
+          Thanks Sandro Andrade <sandro @dcc.ufba.br> for reporting
+          this issue.
 
-          Made a change to fix compile errors.
-
-Sat Apr 30 20:02:10 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-        * ciao/Container_Impl.cpp:
+          Some cosmetic changes.
 
-          Made a change to fix compile errors.
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+        * DAnCE/NodeApplicationManager/ImplementationInfo.h
 
-Sat Apr 30 09:58:05 2005  Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
+          Added a const modifier in the constructor to ensure safety.
 
-        * ciao/Container_Base.cpp:
-        * ciao/Container_Base.h:
-        * ciao/Home_Servant_Impl_T.cpp:
-        * ciao/Home_Servant_Impl_T.h:
-
-          Made changes to the old CIAO infrastructure to support
-          passing and storing of the component instance name from the
-          descriptor XML file and into the component instance.
-
-Thu Apr 28 14:50:05 2005  Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Dynamic_Component_Servant_T.cpp:
-        * DAnCE/ciao/Dynamic_Component_Servant_T.h:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h:
-
-          Made changes to the CIAO infrastructure that allows the
-          swapping capability to make use of the component instance
-          name when we create object references.
-
-Wed Apr 27 11:15:12 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Container_Base.h:
-        * DAnCE/ciao/Container_Impl.cpp:
-        * DAnCE/ciao/Deployment_Core.idl:
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_T.h:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.h:
-
-          Some cosmetic changes and changes by Jaiganesh Balasubramanian
-          <jai@dre.vanderbilt.edu> to support the passing and storing of
-          the component instance name (from the descriptor XML file) in
-          the component instance. Also removed the gen_UUID() static
-          method from class Servant_Impl_Base, since it is no longer
-          used.
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
 
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
+          Fixed a bug when detecting whether a component is shared
+          by multiple assemblies. Earlier, when ReDaC is used, existing
+          components are wrongly treated as shared components.
 
-          Changes to servant code generation corresponding with the
-          changes above.
+Tue Feb 14 22:02:59 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Tue Apr 26 18:14:01 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * CIAO_TAO_DAnCE.mwc
 
-        * docs/releasenotes/index.html:
+          Added naming service and Config_Handlers.
 
-          Updated CIDL compiler documentation, and added item about the
-          existing IDL3-to-IDL2 coverter.
+        * DAnCE/NodeManager/NodeManager.mpc
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
 
-        * tools/IDL3_to_IDL2/README:
+          Fixed link time warnings on OS X.
 
-          Updated documentation file.
+Tue Feb 14 19:57:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Tue Apr 26 11:34:52 2005  Nanbor Wang  <nanbor@tesla.txcorp.com>
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
 
-        * docs/schema/CIAOServerResources.xsd: Changed some of the XML
-          element and type names to be more consistent with the rest of
-          RTCORBA spec that the following new IDL file follows.
+          Fixed a bug about when a component has a name with "Exec"
+          string in it, the _stub library could be picked up
+          incorrectly.
 
-        * DAnCE/ciao/ServerResources.idl: First cut of server
-          configuration information set in IDL.
+Mon Feb 13 20:53:58 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Mon Apr 25 11:07:28 2005  Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
 
-        * DAnCE/ciao/Container_Base.cpp:
+          Fixed a bug about removing existing components. Earlier
+          the logic in detecting "to-be-removed" components has
+          a bug.
 
-          Fixed compiler warnings in the Debian Full_Reactor build.
+Mon Feb 13 20:11:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Sun Apr 24 02:47:22 2005  Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
 
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Container_Base.h:
-        * DAnCE/ciao/Swapping_Container.cpp:
-        * DAnCE/ciao/Swapping_Container.h:
+          Changed ACE_const_cast to c++ native const_cast since the
+          former one is deprecated. Also changed the implementation of
+          the acquireSession() logic, so the deadlock bug could
+          be reproduced.
 
-          Made changes to fix compile errors.
+Mon Feb 13 20:01:38 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Sat Apr 23 13:54:10 2005  Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
 
-        * DAnCE/example/Swapping/Sender/Sender_exec_1.cpp:
+          Cosmetics change.
 
-          Made a modification to the example to reflect changes made
-          in the infrastructure code.
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
 
-Sat Apr 23 13:43:22 2005  Jai Balasubramanian  <jai@dre.vanderbilt.edu>
+          Enhanced to call ccm_activate, ciao_preactivate, and
+          ciao_postactivate when installing new components.
+          Thanks Sandro Andrade <sandro @dcc.ufba.br> for reporting
+          this issue.
 
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/UpgradeableContext.idl:
-        * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp:
-        * DAnCE/ciao/Upgradeable_Context_Impl_T.h:
+          Also added the logic for remove_existing_components into
+          the class, which has not been integrated yet.
 
-          Made some changes to the CIAO infrastructure to efficiently
-          handle updating the facets when the component is swapped.
+          Refactor the code by putting these logics into separate
+          methods to enhance readability.
 
-Thu Apr 21 18:10:13 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Feb 13 17:12:09 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * DAnCE/examples/Hello/Hello_Base/Hello_Base.idl:
-        * DAnCE/examples/HelloHello_Base/Hello_Base.mpc:
-        * DAnCE/examples/HelloReceiver/Receiver.idl:
-        * DAnCE/examples/HelloReceiver/Receiver.mpc:
-        * DAnCE/examples/HelloSender/Sender.idl:
-        * DAnCE/examples/HelloSender/Sender.mpc:
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
 
-          Made cosmetic changes to all files, and added explicit
-          specification of header and inline files in MPC
-          projects. Also added -Sc command line option to the
-          IDL compiler, to suppress generation of the TIE
-          classes.
+          Fixed a bug about registering EM with naming service, originally
+          an invalid naming context is specified.  Also allowed EM to both
+          register to naming service AND dump and IOR file. Thanks Sandro
+          Andrade <sandro at dcc dot ufba dot br> for reporting this bug.
 
-Thu Apr 21 17:40:12 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Feb 13 15:41:21 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * CCF/CCF/CIDL/Traversal/Elements.cpp:
-        * CCF/CCF/IDL3/Traversal/EventType.cpp:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
 
-          Removed these files, since they contain nothing but
-          empty namespaces.
+          Fixed a warning about "deprecated conversion from string
+          constant to `char*' on RHEL_Static_GCC-3.4.2 build.
 
-        * CCF/CCF/CIDL/CIDL.vcproj:
-        * CCF/CCF/IDL3/IDL3.vcproj:
+Mon Feb 13 11:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed the above files from the appropriate projects.
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
+          Removed not allowed semicolon
 
-Thu Apr 21 14:31:21 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Feb 13 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
+          Fixed compile error in single threaded builds
 
-          Changes to eliminate some warnings in the Debian LInux build.
+Mon Feb 13 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Apr 21 09:06:58 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * ciao/Server_init.cpp:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
+          Fixed conversion warnings
 
-        * Added UUID generation for the object id when creating
-          event consumers, similar to that already added for facets.
-          This change eliminates the error of repeated connection
-          to the same event consumer instance when multiple
-          instances and connections are intended. Thanks to
-          Steve Baker <steven_d_baker@raytheon.com> for reporting
-          the problem.
+Sat Feb 11 21:39:54 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Thu Apr 21 09:04:32 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h
 
-        * DAnCE/examples/Hello/descriptors/TestNodeManagerMap.dat
-        * DAnCE/examples/Hello/descriptors/run_test.pl
+          Fixed fuzz build erros.
 
-        Added a NodeManagerMap specific to the test and changed the ports
-        that the node managers invoked by the test listen on to avoid
-        test failures.
+Sat Feb 11 21:26:08 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Wed Apr 20 16:14:26 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+        * tests/Bug_2130_Regression/descriptors/run_test.pl
 
-        * docs/schema/CIAOServerResources.xsd
+          Fixed the command line option to start the NodeApplication
+          to enable real-time support.
+          Thanks Roland Schimmack <Roland.Schimmack @ gmx.de> for
+          reporting this error.
 
-        Fixed syntax and semantic errors.
+Sat Feb 11 21:00:00 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-Wed Apr 20 12:43:53 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * ciao/Server_init.cpp
 
-        * DAnCE/examples/Hello/descriptors/run_test.pl:
+          Removed an extra explicit qualification
 
-          Not all the test platforms has CIAO_ROOT environment variable
-          defined. Changed that dependency to ACE_ROOT in the script.
+Sat Feb 11 18:49:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 20 13:11:28 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * ciaosvcs/Events/CIAO_Events.mpc
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
+          Removed these files to get at least our builds running again
 
-        * CIDLC/ServantSourceGenerator.cpp:
+Fri Feb 10 16:11:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-          Added full scoping to a generated method call on
-          Servant_Impl_Base, to eliminate a warning from the
-          Borland compiler.
+        * ciaosvcs/Events/CIAO_Events.mpc
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
 
-Wed Apr 20 13:05:23 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+          Temporarily disable the build of these projects before
+          the integration effort is complete to avoid pollute
+          the scoreboard.
 
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
-        * DAnCE/RepositoryManager/Update_Plan.cpp
+Fri Feb 10 14:28:14 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-        Fixed compile errors in Borland.
+        * docs/tutorials/CoSMIC/01.html
+        * docs/tutorials/CoSMIC/02.html
+        * docs/tutorials/CoSMIC/index.html
+        * docs/tutorials/CoSMIC/Images/fig10.jpg
+        * docs/tutorials/CoSMIC/Images/fig11.jpg
+        * docs/tutorials/CoSMIC/Images/fig2.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/Quoter.xme
 
-Wed Apr 20 08:09:17 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+          Updated  the CoSMIC tutorial so that it is consistent with
+          the latest GME and CoSMIC.
 
-        * DAnCE/ciao/Servant_Impl_T.cpp
+Fri Feb 10 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Fixed a compile error with emulated exceptions.
+        * ciao/Port_Activator.h:
+          Doxygen improvements
 
-Wed Apr 20 08:03:23 2005 CDT  Will Otte  <wotte@dre.vanderbilt.edu>
+        * ciao/NodeApp_CB_Impl.h:
+          Made destructor protected
 
-        * DAnCE/Config_Handlers/DP_Handler.cpp
+        * ciao/Container_Base.{h,cpp}:
+          Made the refcount unsigned long, addressed several comments and
+          improved documentation
 
-        Silenced some compile errors in VC6.
+Fri Feb 10 04:56:26 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Tue Apr 19 23:41:02 2005 CDT  Will Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeApplication/Container_Impl.cpp
+        * DAnCE/NodeApplication/Container_Impl.h
+        * ciao/Server_init.cpp
+        * ciao/Server_init.h
 
-        * DAnCE/Config_Handlers/XML_File_Intf.cpp
+          Added support for creating multicomponent naming context through
+          the deployment plan. Thanks Dipa Suri <dipa.suri @ lmco.com> for
+          contributing a NameUtility class implementation.
 
-          Silenced some compile errors in VC6.
+        * ciaosvcs/Events/CIAO_Events.idl
+        * ciaosvcs/Events/CIAO_Events.mpc
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.cpp
+        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h
 
-Tue Apr 19 16:46:00 2005 CDT  Gan Deng  <dengg@dre.vanderbilt.edu>
+          Added some files for event channel integration for CIAO.
+          More file check-ins are on the way.
 
-        * CIAO-INSTALL.html
+Thu Feb  9 23:38:19 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
 
-          Fixed this page to direct people where to download CIDLC.
+        * TAO/CIAO/CIAOTAO.mwc
 
-Tue Apr 19 17:33:55 2005  Nanbor Wang  <nanbor@tesla.txcorp.com>
+        Updated mwc to include some dependencies required by tests
+        and examples.
 
-        * docs/schema/ServerResourceUsage.txt:
-        * docs/schema/CIAOServerResources.xsd: Added the first draft
-          schema for DAnCE RT extension, and a file to document how I
-          foresee the extension can be used.
+        * tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
+        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+        * tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp
+        * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat
+        * tests/Bug_2130_Regression/descriptors/rt-config-example.csr
+        * tests/Bug_2130_Regression/descriptors/run_test.pl
+        * tests/Bug_2130_Regression/interfaces/ENW.idl
+        * tests/Bug_2130_Regression/interfaces/ENW.mpc
+        * tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
+        * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
+
+        Added a new tests for Bug_2130.
+        Thanks Roland Schimmack <Roland.Schimmack @ gmx.de> for
+        providing this test case.
+
+Thu Feb  9 16:48:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/be_global.h:
+        * tools/IDL3_to_IDL2/be_init.cpp:
+        * tools/IDL3_to_IDL2/be_sunsoft.cpp:
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
+
+          Removed all usage of internal 'idl_bool' typedef in the
+          IDL3 to IDL2 converter, consistently with the changes to
+          the TAO IDL compiler front end, which is used by this
+          tool.
+
+Thu Feb  9 16:33:45 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/ADD_Handler.cpp
+        * tools/Config_Handlers/Any_Handler.cpp
+        * tools/Config_Handlers/CCD_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.cpp
+        * tools/Config_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/CRDD_Handler.cpp
+        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+        * tools/Config_Handlers/DD_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/DP_PCD_Handler.cpp
+        * tools/Config_Handlers/DataType_Handler.cpp
+        * tools/Config_Handlers/ERE_Handler.cpp
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp
+        * tools/Config_Handlers/ID_Handler.cpp
+        * tools/Config_Handlers/IRDD_Handler.cpp
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/PSPE_Handler.cpp
+        * tools/Config_Handlers/Property_Handler.cpp
+        * tools/Config_Handlers/RDD_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.cpp
+        * tools/Config_Handlers/STD_PC_Intf.cpp
+        * tools/Config_Handlers/XML_File_Intf.cpp
 
-Tue Apr 19 12:16:00 2005 CDT  Will Otte  <wotte@dre.vanderbilt.edu>
+          Added CIAO_TRACE statements to aid in debugging.
 
-        * DAnCE/Config_Handlers/IDREF_Base.h
+Wed Feb 08 15:53:31 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-          Fixed a compile error on VC71.
+        * CIAO version 0.4.9 released.
 
-Mon Apr 18 12:50:51 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Feb  7 16:10:10 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * CIDLC/ServantSourceGenerator.cpp:
+        * DAnCE/NodeManager/NodeManager.mpc
 
-          Added '.in ()' to some _var type arguments in generated code.
+          Fixed an ordering problem.
 
-Mon Apr 18 08:38:14 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+Mon Feb  6 19:13:13 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
 
-        * CIDLC/ServantSourceGenerator.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
 
-          Changed all instances of 'FALSE' to 'false'.
+          Fixed an export problem manifesting in VC8.
 
-Sun Apr 17 21:57:52 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * performance-tests/Benchmark/Benchmark.mpc
 
-        * CIDLC/ServantSourceGenerator.cpp:
+          Added an empty IDL_Files section to the servant to prevent
+          nmake from regenerating from the IDL file.
 
-          Removed unnecessary _narrow() and local variable from generated
-          event push operations.
+Mon Feb  6 13:54:39 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-Sun Apr 17 16:05:57 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
+        * ciao/ComponentsC.h:
 
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp
+          Place TAO namespace in this pre-generated stub header within a
+          TAO versioned namespace, as TAO_IDL does for all stubs.  Fixes
+          build errors in versioned-namespace enabled builds.
 
-          Fixed a compile error on platforms using emulated exceptions.
+Mon Feb  6 13:33:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Sun Apr 17 12:46:51 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * DAnCE/NodeApplication/NoOp_Configurator.h
 
-        * ciao/CCM_Event.idl:
-        * DAnCE/ciao/CCM_Event.idl:
+          Case sensitivity error from previous commit.
 
-          Added operation ciao_is_substitutable() to EventConsumerBase,
-          so we can check if there is an inheritance relationship
-          when a base class event consumer is passed to the subscribe()
-          operation for a derived eventtype. Thanks to Boris Kolpackov
-          <boris@dre.vanderbilt.edu> for suggesting this approach.
+Mon Feb  6 00:39:41 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
 
-        * CIDLC/Literals.cpp:
+        * DAnCE/NodeApplication/Configurator_Factory.cpp
+        * DAnCE/NodeApplication/Configurator_Factory.h
+        * DAnCE/NodeApplication/NodeApplication.mpc
+        * DAnCE/NodeApplication/NodeApplication_Core.h
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/NodeManager/NodeManager.mpc
+        * DAnCE/NodeApplication/NoOp_Configurator.cpp
+        * DAnCE/NodeApplication/NoOp_Configurator.h
+        * DAnCE/NodeApplication/NoOp_Configurator_export.h
 
-          Cosmetic changes.
+          Fixed linking errors on Borland 6. Mostly involved improper
+          symbol export control.
 
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
 
-          Added code generation to take advantage of the new
-          EventConsumerBase operation described above.
+          Added a fix for a broken <string> include in Borland 6.
 
-Sat Apr 16 20:17:38 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+Fri Feb  3 24:30:19  UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
-        * DAnCE/examples/Hello/descriptors/run_test.pl:
+        * ciao/CIAO_common.h:
 
-          Fixed some perl errors.
+          Removed extraneous "#" in "#  #error" preprocessor directive.
 
-Sat Apr 16 18:31:40 2005 CDT  Will Otte <wotte@dre.vanderbilt.edu>
+        * ciao/Client_init.h:
 
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
+          Moved CIAO namespace out of TAO-versioned namespace block.  It
+          shouldn't have been there.  Fixes namespace clashes in versioned
+          namespace enabled builds.
 
-          Removed typecodefactory fromt the base projects.
+Thu Feb  2 23:55:01 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Sat Apr 16 17:24:40 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * NEWS
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+          Updated the release notes.
 
-          Added a missing include file.
+Thu Feb  2 22:59:23 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Sat Apr 16 17:22:42 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
 
-        * DAnCE/examples/Hello/descriptors/run_test.pl:
+          Updated include from zziplib.h to zzip/zzip.h, as the former
+          is deprecated and absent in the most recent release.
 
-          Added code to ensure killing open processes on failure.
+Thu Feb  2 15:49:31 2006  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-Sat Apr 16 16:38:09 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * docs/tutorials/CoSMIC/01.html: Commited a fix for a typo detected by
+          Abdullah Sowayan <abdullah dot sowayan at lmco dot com> and
+          fixed by Ming Xiong.
 
-        * DAnCE/examples/Hello/descriptors/run_test.pl:
+Thu Feb  2 16:58:15 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added perl script running all the steps for deploying an application.
+        * CIAO_TAO_DAnCE.mwc:
+        * CIAODAnCE.mwc:
+          Removed Old_Config_Handlers and spec_RepositoryManager
 
-Sat Apr 16 16:10:10 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+Thu Feb  2 16:31:15 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+        * DAnCE/NodeManager/BaseMonitor.h
+        * DAnCE/NodeManager/CIAO_Monitor.h
+        * DAnCE/NodeManager/MonitorCB.h
+        * DAnCE/NodeManager/MonitorController.cpp
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/TargetManager/DomainDataManager.h
 
-          Added two command line options to plan_launcher to easily use in
-          scripts. Now the launch and destruction of the application can be
-          done in two steps.
+          Removed extra ';' after closing braces on namespaces.
+          Was causing errors on GCC4 builds.
 
-Sat Apr 16 15:00:31 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+        * DAnCE/NodeManager/MonitorController.inl
 
-        * DAnCE/examples/Hello/step-by-step.html:
+          Removed this file, as it is no longer used.
 
-          Fixed typo on the documentation.
+Wed Feb  1 21:21:35 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Fri Apr 15 12:54:46 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeManager/BaseMonitor.h
+        * DAnCE/NodeManager/CIAO_Monitor.cpp
+        * DAnCE/NodeManager/CIAO_Monitor.h
+        * DAnCE/NodeManager/MonitorCB.cpp
+        * DAnCE/NodeManager/MonitorCB.h
+        * DAnCE/NodeManager/MonitorController.cpp
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/TargetManager/DomainDataManager.cpp
+        * DAnCE/TargetManager/DomainDataManager.h
+        * DAnCE/TargetManager/TargetManager_exec.cpp
+        * DAnCE/TargetManager/TargetManager_exec.h
 
-        * DAnCE/Config_Handlers/Req_Handler.h
+        Wraps the TargetManager/Monitors inside the CIAO namespace.
+        Thanks to  Nilabja Roy (nilabjar@dre.vanderbilt.edu) for
+        making these changes and thanks to Johnny for noticing this!
 
-        Fixed a compile error on builds using -pendantic.
+Wed Feb  1 20:42:42 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-Fri Apr 15 10:46:56 CDT 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+        * CIDLC/ServantSourceGenerator.cpp
 
-        * DAnCE/ciao/Container_Impl.cpp
+          Fixed a code generation problem caused by careless merging.
 
-          Added a condition to check whether call standard configurator.
+Mon Apr 24 18:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RepositoryManager/Repository_Manager.cpp
+        * tools/Config_Handlers/ADD_Handler.cpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/ID_Handler.h:
+          Removed incorrect semi colons
 
-          Modified to make it work by using ORBDebugLevel.
+Mon Apr 24 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/examples/Hello/Sender/Sender_exec.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp:
+          Removed not needed semi colon that caused compile errors in some
+          builds
 
-          Fixed a warning message.
+Sun Apr 23 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h:
+          Fixed compile error
 
-          This should fix the warning message on Dynamic_Hash_Op_Lookup
-          build.
+Sat Apr 22 21:13:10 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Thu Apr 14 10:54:56 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/toplevel.hpp
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
 
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+        Compile errors.
 
-        Fixed a warning due to ambiguous conversion.
+Fri Apr 21 16:24:46 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Thu Apr 143 10:21:58 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
+        * Merge from the ARMS Escher repository.
 
-        * DAnCE/examples/Hello/Sender/Sender.idl
-        * DAnCE/examples/Hello/Sender/Sender_exec.cpp
-        * DAnCE/examples/Hello/Sender/Sender_exec.h
-        * DAnCE/examples/Hello/Sender/starter.cpp
-        * DAnCE/examples/Hello/descriptors/Hello.cid
-        * DAnCE/examples/Hello/descriptors/Receiver.cid
-        * DAnCE/examples/Hello/descriptors/Sender.cid
+          Changelog entries to follow:
 
-          Modified the Hello example to showcase the feature of setting
-          attributes through XML. "string" and "long" type attributes
-          are put into the test.
+   Tue Apr 11 09:29:12 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
 
-        * DAnCE/ciao/Container_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.h
+        * DAnCE/NodeManager/Node_Manager.cpp
 
-          Cleaned up a little bit.
+        Additional debugging/compile fixes.
 
-Thu Apr 14 10:14:44 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+  Tue Apr 11 08:30:42 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
+        * ciao/Deployment_Core.idl
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
 
-        Added 'naming' to the list of base projects to fix a compile
-        error
+          Modified to passivate (and reactivate later) shared components
+          when tearing down an assembly.
 
-Thu Apr 14 02:02:13 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+  Sun Apr  9 01:03:19 UTC 2006    <wotte@blade35.isislab.vanderbilt.edu>
 
+        * M APRIL_DEMO.mwc
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
         * DAnCE/ExecutionManager/Execution_Manager.cpp
-        * DAnCE/ciao/Context_Impl_T.cpp
-        * DAnCE/ciao/Dynamic_Component_Servant_Base.h
-        * DAnCE/ciao/Dynamic_Component_Servant_T.cpp
-        * DAnCE/ciao/Dynamic_Component_Servant_T.h
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp
-        * DAnCE/ciao/Servant_Impl_T.cpp
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
-        * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp
-
-        Fixed a number of mistakes with emulated exceptions.
-
-Wed Apr 13 18:55:58 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/CCM_Component.idl
-        * DAnCE/ciao/Container_Impl.cpp
-        * DAnCE/ciao/Servant_Impl_Base.cpp
-        * DAnCE/ciao/Servant_Impl_Base.h
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeManager/MonitorCB.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+        * DAnCE/NodeManager/Node_Manager.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
 
-          Added support for configuring component attributes through
-          XML <configProperty> tags.
+          Various compile/runtime fixes.
 
-        * DAnCE/RepositoryManager/Update_Plan.cpp
-        * DAnCE/RepositoryManager/Update_Plan.h
+  Fri Apr  7 15:47:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-          Fixed to make sure correct component attributes are
-          populated. Thanks Jai <jai@dre.vanderbilt.edu> for the fix.
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
 
-Wed Apr 13 15:14:58 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+          Modified to enforce passivation occured on all components
+          before any connections are removed.
 
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
+  Fri Apr  7 03:28:03 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
 
-          Deleted typecodefactory base project to the mpc files.
+        * tools/Config_Handlers/Utils/XML_Helper.cpp:
 
-Wed Apr 13 11:39:58 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
+          Replaced "throw;" (which Stroustrup tells us causes an abort)
+          with "throw 0;" (kind of like an unnamed exception, which is
+          clearly what the author of this code intended).
 
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-
-          Added typecodefactory base project to the mpc files.
+        * ciao/Packaging_Data.idl:
 
-Tue Apr 12 17:12:35 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+          I've had occasion to use this file with the IFR Service, and
+          I've found that the IFR Service backend chokes on a bunch of
+          stuff here.  The stuff that it chokes on has been protected with
+          "#ifndef AVOID_IFR_CRASH" so that you can protect the backend
+          from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr.
 
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.h:
         * ciao/Servant_Impl_Base.cpp:
         * ciao/Servant_Impl_Base.h:
 
-          Added a static method to generate a UUID. This method is
-          called by the generated servant class to create unique
-          object ids for port object references. Thanks to Steve
-          Baker <steven_d_baker@raytheon.com> for reporting the
-          problem of connecting to facets on multiple instances
-          of the same component type.
-
-        * CIDLC/ServantSourceGenerator.cpp:
-
-          Changed code generation for provide_*_i() to use the
-          new method described above.
-
-Tus Apr 12 16:04:21 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/IAD_Handler.cpp
-
-          Modified to ignore the <dependsOn> tag, since this might
-          cause a problem where multiple _svnt or multiple _exec
-          libraries to be specified as implArtifacts of a component
-          type.
-
-Tue Apr 12 14:35:58 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * CIAO-INSTALL.html
-
-        Updated to include Xerces information.  Also cleaned up the
-        file a bit and made it XHTML compliant.
-
-Tue Apr 12 11:56:26 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Dynamic_Component_Activator.cpp
-        * DAnCE/ciao/Servant_Activator.cpp
-        * DAnCE/ciao/Servant_Impl_Base.cpp
-
-        Fixed some more compile errors with emulated exceptions.
-
-Tue Apr 12 11:11:41 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Servant_Impl_Base.cpp
-
-        Fixed some compile errors with emulated exceptions.
-
-Mon Apr 11 23:54:21 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-
-          Fixed a bug where multiple "_svnt" and "_exec" libs for
-          a given MonolithicDeploymentDescription could cause
-          chaos while pupulating ImplementationInfo stuct. This
-          fix now only consides the first "_svnt" and "_exec"
-          libs, and ignore remaining ones. A better solution will
-          be enforcing any MonolithicDeploymentDescription could
-          only have exactly one _svnt and one _exec lib. This
-          will be achieved through the flattened deployment plan.
-
-Mon Apr 11 17:56:22 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-
-          Added typecodefactory to the list of project files.
-
-Mon Apr 11 13:43:47 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-
-        Corrected the ExecutionManager narrow operation.
-
-Mon Apr 11 08:29:50 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Impl.cpp:
-        * DAnCE/ciao/Dynamic_Component_Activator.cpp:
-        * DAnCE/ciao/Dynamic_Component_Activator.h:
-        * DAnCE/ciao/NodeApplication_Impl.cpp:
-        * DAnCE/ciao/NodeApplication_Impl.h:
-        * DAnCE/ciao/Swapping_Container.cpp:
-        * DAnCE/ciao/Swapping_Container.h:
-
-          Fixed various glitches with environment variables, unused variables,
-          and ACE_TRY macros.
-
-Mon Apr 11 07:12:54 CDT 2005  Will Otte <wotte@dre.vanderbit.edu>
+          Implemented the add_receptacle operation.
 
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-
-        Fixed a compile error.
-
-Sun Apr 10 18:44:22 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-        * DAnCE/Config_Handlers/ccd.cpp
-        * DAnCE/Config_Handlers/ccd.hpp
-
-        Regenerated the handlers to reflect the changes in the previous
-        commit.
-
-Sat Apr 09 18:35:23 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/Basic_Deployment_Data.xsd
-        * docs/schema/ccd.xsd
-
-          Updated schemas to reflect changes made to Modified_Deployment
-          in conformance to the spec.
-
-Sat Apr 09 17:15:23 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-
-          Changed the after clause to point to the XSC_Config_Handlers
-          instad of the old config handlers.
-
-Sat Apr 09 23:59:40 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+  Fri Apr  7 02:55:37 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
 
-          Fixed a bug where duplicated CORBALOC specified in the
-          NodeManagerMap could cause undetected exception. This fix
-          will allow such duplication IOR error to be detected explicitly
-          and error message will be printed out. Thanks Steve Baker
-          <Steven_D_Baker@raytheon.com> for report this bug.
-
-Fri Apr  8 14:30:52 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/cdp.cpp
-        * DAnCE/Config_Handlers/cdp.hpp
-
-        Regenerated handlers to reflect schema changes.
-
-        * docs/schema/cdp.xsd
-
-        Updated schema to allow 0 on the realizes element.
-
-Fri Apr  8 13:33:24 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-
-          Added backend support for attribute exceptions.
-
-Thu Apr 07 14:49:40 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Hello/descriptors/basicNodeDaemon.pl
-        * DAnCE/examples/Hello/descriptors/runNodeDaemons.pl
-
-          Removed the first file and added the second file since
-          the name of the first file doens't make any sense. These
-          two files are the same.
-
-        * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp
-        * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
-
-          Removed the first file and added the second file since
-          the name of the first file contained a typo.
-
-        * DAnCE/examples/Hello/descriptor/Modified_Deployment.xsd
-
-          Changed the <deploymentPlan> tag to allow zero <realizes>
-          tag in the XML.
-
-        * DAnCE/Config_Handlers/DP_Handler.cpp
-        * DAnCE/Config_Handlers/cdp.cpp
-        * DAnCE/Config_Handlers/cdp.hpp
-
-          Modified handlers to accomodate the above change.
-
-        * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
-
-          Added this file in, which is a flattened deployment plan for
-          for the Hello example. I will come back to remove the <realizes>
-          tag some time later since it is useless.
-
-        * DAnCE/examples/Hello/step-by-step.html
-
-          Bring the documentation page up to date.
-
-Wed Apr 06 11:12:40 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp
-
-          Cleaned this a little bit. Removed most <SupportedType> and
-          <port> tags from the <realizes> tag.
-
-Wed Apr 06 10:30:40 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat
-
-          Modified virtual node names to make them more meaningful.
-
-        * DAnCE/examples/BasicSP/descriptors/DeploymentPlan.cdp
-
-          Added this file, which is a copy of the old HUDisplay.cdp
-          file. This is the old version deployment plan XML metadata.
-
-        * DAnCE/examples/BasicSP/descriptors/BasicSP.cdp
-        * DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp
-
-          Removed these two files since they are redundant. The
-          former one now is "flattern_deploymentplan.cdp",
-          the latter one is "DeploymentPlan.cdp".
-
-        * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp
-
-          Fixed this file, which contains a invalid connection, i.e.,
-          connecting a EventPublisher to a SimplexReceptacle. The root
-          of this problem is that "data_read" is a Facet instead of
-          a EventPublisher.
-
-Tue Apr 05 19:29:40 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-
-          Fixed project dependency.
-
-        * DAnCE/ciao/Container_Impl.cpp
-
-          Fixed a compilation error caused by specifying a
-          wrong exception name.
-
-        * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat
-
-          Fixed a wrong string to specify the vitual node name.
-
-Tue Apr  5 14:37:16 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-
-        Updated Gary's fix to work in Borland 6.
-
-Tue Apr  5 14:13:10 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-
-        Incorporated a fix to the Any handler from Gary Duzan.
-
-Tue Apr  5 11:34:32 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-        * DAnCE/Config_Handlers/Deployment.cpp
-        * DAnCE/Config_Handlers/Deployment.hpp
-        * DAnCE/Config_Handlers/ccd.cpp
-        * DAnCE/Config_Handlers/ccd.hpp
-        * DAnCE/Config_Handlers/cdd.cpp
-        * DAnCE/Config_Handlers/cdd.hpp
-        * DAnCE/Config_Handlers/cdp.cpp
-        * DAnCE/Config_Handlers/cdp.hpp
-        * DAnCE/Config_Handlers/cid.cpp
-        * DAnCE/Config_Handlers/cid.hpp
-        * DAnCE/Config_Handlers/cpd.cpp
-        * DAnCE/Config_Handlers/cpd.hpp
-        * DAnCE/Config_Handlers/iad.cpp
-        * DAnCE/Config_Handlers/iad.hpp
-        * DAnCE/Config_Handlers/pcd.cpp
-        * DAnCE/Config_Handlers/pcd.hpp
-        * DAnCE/Config_Handlers/toplevel.cpp
-        * DAnCE/Config_Handlers/toplevel.hpp
-        * DAnCE/Config_Handlers/XMLSchema/Types.hpp
-
-        New version of the generated XSC handlers fixing the following problems:
-          - Use ACE_TCHAR instead of char as the character type
-          - Export macros for the generated classes.
-          - Borland 6 support
-          - Misc VC6 warnings.
-
-Sun Apr  3 23:52:50 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * examples/BasicSP/descriptors/flattern_deploymentplan.cdp
-
-        Fixed a mistake in the descriptor.
-
-Sun Apr  3 18:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.h:
-        * ciao/ServerActivator_Impl.h:
-          Added missing include of ace/Hash_Map_Manager_T.h
-
-Sat Apr 02 13:12:40 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/examples/BasicSP/README.html: Brought the documentation a
-          bit more up-to-date.
-
-Sat Apr  2 13:06:02 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/ciao/Container_Base.cpp: Added more debug print out
-          statements in install_home method.
-
-Sat Apr 02 11:45:52 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp: Merged from xsc_handler_1
-          branch.  Added a missing break statement, otherwise, it will not
-          run.
-
-Thu Mar 31 20:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ciao/NodeApplication_Impl.h:
-        * DAnCE/ciao/Container_Base.h:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-          Added missing include of ace/Hash_Map_Manager_T.h
-
-Thu Mar 31 09:45:07 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/LexicalAnalyzer.cpp:
-        * CCF/CCF/IDL2/Parser.cpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Attribute.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp:
-        * CCF/CCF/IDL2/Traversal/Attribute.cpp:
-        * CCF/CCF/IDL2/Traversal/Attribute.hpp:
-        * CIDLC/ExecutorMappingGenerator.cpp:
-
-        Added support for raises-specification in attributes.
-
-Wed Mar 30 21:48:14 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * DAnCE/Config_Handlers/Deployment.hpp: Made the function
-          deploymentPlan an export function since it will be accessed
-          externally.  The handler test program needed this change to
-          compile on Win32.
-
-        * DAnCE/Config_Handlers/Config_Handlers.mpc: Changed to source in
-          the Xerces library settings from the latest xerces MPC template
-          that Kitty suggested.
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
-        * DAnCE/Config_Handlers/ccd.hpp:
-        * DAnCE/Config_Handlers/cdd.hpp:
-        * DAnCE/Config_Handlers/cdp.hpp:
-        * DAnCE/Config_Handlers/cid.hpp:
-        * DAnCE/Config_Handlers/cpd.hpp:
-        * DAnCE/Config_Handlers/iad.hpp:
-        * DAnCE/Config_Handlers/pcd.hpp:
-        * DAnCE/Config_Handlers/toplevel.hpp:
-        * DAnCE/Config_Handlers/XMLSchema/Types.hpp:
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp:
-        * DAnCE/Config_Handlers/XSCRT/Parser.hpp:
-        * DAnCE/Config_Handlers/XSCRT/Traversal.hpp:
-        * DAnCE/Config_Handlers/XSCRT/Writer.hpp:
-        * DAnCE/Config_Handlers/XSCRT/XML.hpp: Changed all local include
-          files to use the right syntax.  I.e., they should be in the form
-          of:
-
-            #include "foo/bar.h"
-
-          instead of
-
-            #include <foo/bar.h>
-
-Wed Mar 30 22:03:23 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/xsc-banner.cpp
-        * docs/schema/xsc-banner.h
-
-        These files are the banners that should be included at
-        the top of XSC generated code.
-
-Wed Mar 30 13:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/ComponentsC.h:
-        * DAnCE/ciao/ComponentsC.h:
-          Fixed include of Typecode.h to TypeCode.h
-
-Wed Mar 30 13:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/DataType_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/DT_Handler.cpp:
-          Fixed include of Typecode.h to TypeCode.h
-
-Thu Mar 24 17:02:34  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
-        * DAnCE/Config_Handlers/Deployment.hpp
-        * DAnCE/Config_Handlers/ccd.hpp
-        * DAnCE/Config_Handlers/cdd.hpp
-        * DAnCE/Config_Handlers/cdp.hpp
-        * DAnCE/Config_Handlers/cid.hpp
-        * DAnCE/Config_Handlers/cpd.hpp
-        * DAnCE/Config_Handlers/iad.hpp
-        * DAnCE/Config_Handlers/pcd.hpp
-        * DAnCE/Config_Handlers/toplevel.hpp
-        * DAnCE/Config_Handlers/XSCRT/XML.hpp
-        * DAnCE/Config_Handlers/vc6-4786.h
-
-        Finally beat a big warning problem in VC6.
-
-Thu Mar 24 15:19:21 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp
-        * DAnCE/Config_Handlers/XSCRT/XML.hpp
-
-        Moved a pragma disable from Elements.hpp to XML.hpp to
-        attempt to silence more warnings in VC6.
-
-Thu Mar 24 14:52:03 2005  Will Otte <wotte@dre.vanderilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-
-        Fixed a compile error for 64bit arch that resulted from
-        the earlier VC6 fix.
-
-Thu Mar 24 09:21:59 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
-
-          Added the "after" clause in the MPC file to fix a
-          linker error.
-
-Thu Mar 24 08:46:07 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
 
-          - Added generation of ACE_UNUSED_ARG macros for local variables in
-            the get_registered_consumers() method for upgradeable components,
-            to avoid unused argument warnings if the component has no
-            event consumers.
+          Added ACE_CATCHANY and ACE_CATCHALL blocks in
+          Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA
+          fault.
 
-          - Added predefined string literals for "ACE_UNUSED_ARG",
-            "ACE_CHECK_RETURN", and "ACE_THROW_RETURN".
+  Fri Apr  7 02:54:29 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
 
-Wed Mar 23 19:45:32 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * DAnCE/NodeApplication/Configurator_Factory.cpp:
 
-        * CCF/CCF/IDL2/IDL2.vcpoj:
+          Options beginning with "-ORB" are explicitly ignored.  This
+          avoids having an "-ORB" option mistakenly parsed as being a
+          "-o <ior_output_file>" option.
 
-          Added more new files to the project, ValueTypeMember.hpp and
-          ValueTypeMember.tpp in IDL2/Traversal.
+  Fri Apr  7 02:51:31 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
 
         * CIDLC/ServantSourceGenerator.cpp:
 
-          Restored backend code that was commented out until frontend
-          support for traversal of valuetype/eventtype members was added.
-
-Wed Mar 23 13:00:32 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-
-        Fixed compile errors for VC6.
-
-Wed Mar 23 12:39:43 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
-
-          Added a missing library include.
+        Added code to support "get_all_receptacles" operation.
 
-Wed Mar 23 11:19:32 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+  Fri Apr  7 02:47:02 UTC 2006  Edward R. Mulholland  <emulholl@atl.lmco.com>
 
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1_export.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2_export.h:
+        * CCF/CCF/IDL2/SemanticGraph/Enum.hpp:
+        * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp:
 
-          Added new export macros to fix compiler problems in Windows
-          builds.
+        Made a couple small changes that keep the CIDLC from coughing on
+        enums
 
-Wed Mar 23 11:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
-          Fixed compile errors
-
-Wed Mar 23 11:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp:
-        * DAnCE/Config_Handlers/DP_Handler.cpp:
-          Fixed compile errors with Borland
-
-Tue Mar 22 21:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
-          Fixed fuzz error
+  Fri Apr  7 02:37:34 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-Tue Mar 22 13:08:32 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.h
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.h
-
-        Silence some Fuzz errors.
-
-Tue Mar 22 11:45:57 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/ADD_Handler.cpp
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-        * DAnCE/Config_Handlers/CCD_Handler.cpp
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp
-
-        Changes to accomodate broken compilers (VC6).
-
-Tue Mar 22 10:40:21 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Swapping/Sender/Sender_exec.cpp:
-
-          Made changes to fix compiler warnings.
-
-Tue Mar 22 10:26:18 2005  Will Otte <wotte@dre.vanderbilt.edu>
-        * DAnCE/Config_Handlers/CCD_Handler.cpp
-
-        Silenced an error in VC6 that occured because it couldn't obey
-        some simple scope rules.
-
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp
-
-        Silenced a warning in VC6 debug builds relating to debug identifiers being
-        too long.
-
-Tue Mar 22 08:44:03 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/Container_Base.cpp
-
-        Silenced a warning.
-
-Tue Mar 22 08:05:57 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CCF/CCF/IDL2/IDL2.vcproj:
-
-          Added new ValueTypeFactory files to SemanticAction and new
-          ValueTypeMember files to SemanticGraph.
-
-Tue Mar 22 00:13:56 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp
-
-        Silenced warnings present in GCC >3 builds.
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
 
-        * DAnCE/Config_Handlers/CCD_Handler.h
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-        * DAnCE/Config_Handlers/IDD_Handler.cpp
-        * DAnCE/Config_Handlers/Property_Handler.h
-        * DAnCE/Config_Handlers/Req_Handler.h
-        * DAnCE/Config_Handlers/XML_Error_Handler.h
-        * DAnCE/Config_Handlers/XML_File_Intf.h
+          Fixed a bug in detecting External connection and Internal
+          connections. Earlier when an external component is detected,
+          not *all* connections associated with this components are
+          purged from the to-be-removed connections list. Added another
+          helper method <purge_connections> to accomplish this task.
 
-        Silenced a few warnings present in the Fuzz build.
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
 
-Mon Mar 21 08:47:44 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Modified to reuse rebind() instead of bind() to avoid
+          redeployment duplicate instance errors.
 
-        * CCF/CCF/IDL2/IDL2.vcproj:
+  Thu Apr  6 15:02:59 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-          Added the new ValuetypeMember files in SemanticAction to
-          the project.
+        * DAnCE/NodeApplication/NodeApplication.cpp:
 
-Mon Mar 21 16:25:07 2005  Boris Kolpackov  <boris@kolpackov.net>
+        Modified the NodeApplications to up at OS priority 20 instead of
+        50.
 
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.hpp:
+  Thu Apr  6 00:35:35 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
-        Finished "full support" for valuetype members. It also
-        adds "full support" for eventtype members since it just
-        re-uses valuetype's rules.
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
 
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-        * CCF/CCF/IDL2/Parser.cpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.hpp:
-        * CCF/CCF/IDL2/SemanticAction.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Factory.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp:
+          Fixed the TM component removal problem. Changed/Removed
+          debug messages.
 
-        Added support for valuetype factories.
+  Wed Apr  5 16:54:20 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
+        * tools/Config_Handlers/Any_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
 
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp:
-        * CCF/CCF/IDL2/Traversal/ValueType.tpp:
+          Improvements to output more information in the reverse handler.
 
-        Implemented support for valuetype inheritance and
-        support of interfaces.
 
+  Thu Mar 30 22:10:53 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp:
-        * CCF/CCF/IDL3/Traversal/EventType.tpp:
+        * DAnCE/NodeApplication/Container_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * ciao/Home_Servant_Impl_T.cpp
+        * ciao/Servant_Activator.cpp
+        * tools/Config_Handlers/DD_Handler.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
 
-        Implemented support for eventtype inheritance and
-        support of interfaces.
+        Disabled excessive debugging.
 
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
 
-        * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp:
+        Disabled RT-CCM support.
 
-        Minor cleanups.
+        * DAnCE/TargetManager/DomainDataManager.cpp
 
-Sun Mar 20 21:35:04 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        Added error messages.
 
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
+  Wed Mar 29 21:34:07 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
-          Made a change to link to the right library.
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+          Fixed a Access Error in the monitor.
 
-Sun Mar 20 21:12:55 2005  Will Otte <wotte@dre.vanderbilt.edu>
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Added to have graceful termination.
 
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Update to turn off monitors at the end.
 
-          Disabled the build of the test.  There is no need for
-          this to build for the most part - as it is not a great test -
-          and appears to be lighting up the scoreboard for some reason.
+  Mon Mar 27 22:39:25 UTC 2006  William R. Otte    <wotte@dre.vanderbilt.edu>
 
-Sun Mar 20 14:05:08 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        * tools/Config_Handlers/Utils/XML_Helper.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
 
-        * DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/Handler_Test.h:
-        * DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp:
-        * DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp:
+  Mon Mar 27 20:10:09 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-          Made changed to include the "right" config handlers
-          to fix the compilation errors.
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+          (get_node_manager):
 
-Sun Mar 20 13:57:55 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+          Modified this method to re-throw the caught exception.
 
-        * DAnCE/Config_Handlers/XercesString.cpp:
-        * DAnCE/Config_Handlers/XercesString.h:
+  Sun Mar 26 22:10:16 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-          Added these new files from the old config handlers
-          directory to the new config handlers directory
-          to fix missing includes.
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
 
-Sun Mar 20 13:54:17 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        Added code to handle exceptions while trying to connect to the
+        node managers in get_node_manager ().
 
-        * DAnCE/Old_Config_Handlers/Process_Element_T.cpp:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
 
-          Changed a #include to fix a compilation error.
+        Added debug messages.
 
-Sun Mar 20 17:39:18 2005  Jaiganesh B <jai@dre.vanderbilt.edu>
-        * ciao/Servant_Impl_Base.h:
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_T.h:
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Home_Servant_Impl_T.cpp:
-
-          Made changes to the older version of the ciao
-          infrastructure to reflect changes made in the
-          newer version of ciao, which is DaNCE.
-
-Sun Mar 20 10:09:14 2005  Will Otte <wotte@dre.vanderbilt.edu>
-        * DAnCE/Config_Handlers/Basic_Handler.cpp
-        * DAnCE/Config_Handlers/Basic_Handler.h
-        * DAnCE/Config_Handlers/CAD_Handler.cpp
-        * DAnCE/Config_Handlers/CAD_Handler.h
-        * DAnCE/Config_Handlers/CPK_Handler.cpp
-        * DAnCE/Config_Handlers/CPK_Handler.h
-        * DAnCE/Config_Handlers/CPR_Handler.cpp
-        * DAnCE/Config_Handlers/CPR_Handler.h
-        * DAnCE/Config_Handlers/Cap_Handler.cpp
-        * DAnCE/Config_Handlers/Cap_Handler.h
-        * DAnCE/Config_Handlers/CompImplDesc_Handler.cpp
-        * DAnCE/Config_Handlers/CompImplDesc_Handler.h
-        * DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp
-        * DAnCE/Config_Handlers/CompIntrDesc_Handler.h
-        * DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp
-        * DAnCE/Config_Handlers/CompPkgDesc_Handler.h
-        * DAnCE/Config_Handlers/Config.h
-        * DAnCE/Config_Handlers/Config_Error_Handler.cpp
-        * DAnCE/Config_Handlers/Config_Error_Handler.h
-        * DAnCE/Config_Handlers/Config_Handler_export.h
-        * DAnCE/Config_Handlers/DT_Handler.cpp
-        * DAnCE/Config_Handlers/DT_Handler.h
-        * DAnCE/Config_Handlers/Domain_Handler.cpp
-        * DAnCE/Config_Handlers/Domain_Handler.h
-        * DAnCE/Config_Handlers/IAD_Handler.cpp
-        * DAnCE/Config_Handlers/IAD_Handler.h
-        * DAnCE/Config_Handlers/IR_Handler.cpp
-        * DAnCE/Config_Handlers/IR_Handler.h
-        * DAnCE/Config_Handlers/MID_Handler.cpp
-        * DAnCE/Config_Handlers/MID_Handler.h
-        * DAnCE/Config_Handlers/NIA_Handler.cpp
-        * DAnCE/Config_Handlers/NIA_Handler.h
-        * DAnCE/Config_Handlers/PCI_Handler.cpp
-        * DAnCE/Config_Handlers/PCI_Handler.h
-        * DAnCE/Config_Handlers/PC_Handler.cpp
-        * DAnCE/Config_Handlers/PC_Handler.h
-        * DAnCE/Config_Handlers/Plan_Handler.cpp
-        * DAnCE/Config_Handlers/Plan_Handler.h
-        * DAnCE/Config_Handlers/Process_Element.cpp
-        * DAnCE/Config_Handlers/Process_Element.h
-        * DAnCE/Config_Handlers/Process_Element_T.cpp
-        * DAnCE/Config_Handlers/Process_Element_T.h
-        * DAnCE/Config_Handlers/RS_Handler.cpp
-        * DAnCE/Config_Handlers/RS_Handler.h
-        * DAnCE/Config_Handlers/RUK_Handler.cpp
-        * DAnCE/Config_Handlers/RUK_Handler.h
-        * DAnCE/Config_Handlers/Requirement_Handler.cpp
-        * DAnCE/Config_Handlers/Requirement_Handler.h
-        * DAnCE/Config_Handlers/SPK_Handler.cpp
-        * DAnCE/Config_Handlers/SPK_Handler.h
-        * DAnCE/Config_Handlers/SP_Handler.cpp
-        * DAnCE/Config_Handlers/SP_Handler.h
-        * DAnCE/Config_Handlers/TPD_Handler.cpp
-        * DAnCE/Config_Handlers/TPD_Handler.h
-        * DAnCE/Config_Handlers/Utils.cpp
-        * DAnCE/Config_Handlers/Utils.h
-        * DAnCE/Config_Handlers/XercesString.cpp
-        * DAnCE/Config_Handlers/XercesString.h
-
-          Removed files unused by the new config handlers.
-
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-
-          Enabled the config handlers build.
-
-Sat Mar 19 18:19:34 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/XMLSchema/Traversal.hpp
-        * DAnCE/Config_Handlers/XMLSchema/Traversal.ipp
-        * DAnCE/Config_Handlers/XMLSchema/Traversal.tpp
-        * DAnCE/Config_Handlers/XMLSchema/TypeInfo.hpp
-        * DAnCE/Config_Handlers/XMLSchema/TypeInfo.ipp
-        * DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp
-        * DAnCE/Config_Handlers/XMLSchema/Types.hpp
-        * DAnCE/Config_Handlers/XMLSchema/Types.ipp
-        * DAnCE/Config_Handlers/XMLSchema/Types.tpp
-        * DAnCE/Config_Handlers/XMLSchema/Writer.hpp
-        * DAnCE/Config_Handlers/XMLSchema/Writer.ipp
-        * DAnCE/Config_Handlers/XMLSchema/Writer.tpp
-        * DAnCE/Config_Handlers/XSCRT/Elements.hpp
-        * DAnCE/Config_Handlers/XSCRT/Elements.ipp
-        * DAnCE/Config_Handlers/XSCRT/Elements.tpp
-        * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
-        * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
-        * DAnCE/Config_Handlers/XSCRT/Parser.hpp
-        * DAnCE/Config_Handlers/XSCRT/Parser.ipp
-        * DAnCE/Config_Handlers/XSCRT/Parser.tpp
-        * DAnCE/Config_Handlers/XSCRT/Traversal.hpp
-        * DAnCE/Config_Handlers/XSCRT/Traversal.ipp
-        * DAnCE/Config_Handlers/XSCRT/Traversal.tpp
-        * DAnCE/Config_Handlers/XSCRT/Writer.hpp
-        * DAnCE/Config_Handlers/XSCRT/Writer.ipp
-        * DAnCE/Config_Handlers/XSCRT/Writer.tpp
-        * DAnCE/Config_Handlers/XSCRT/XML.hpp
-        * DAnCE/Config_Handlers/XSCRT/XML.ipp
-        * DAnCE/Config_Handlers/XSCRT/XML.tpp
-        * DAnCE/Config_Handlers/XSCRT/XMLSchema.ipp
-        * DAnCE/Config_Handlers/XSCRT/XMLSchema.tpp
-
-        Completed the merge of xsc_handler_1 into main.
-
-Sat Mar 19 17:29:50 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+        * RACE/Controller/Component/RACE_common.h:
 
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        Added a new file to define the RACE_DEBUG and RACE_ERROR macros.
 
-          Fixed compiler errors.
-
-Sat Mar 19 16:57:41 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/Any_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Any_Handler.h:
-        * DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp:
-        * DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp:
-        * DAnCE/Old_Config_Handlers/Basic_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Basic_Handler.h:
-        * DAnCE/Old_Config_Handlers/CAD_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CAD_Handler.h:
-        * DAnCE/Old_Config_Handlers/CEPE_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CEPE_Handler.h:
-        * DAnCE/Old_Config_Handlers/CPK_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CPK_Handler.h:
-        * DAnCE/Old_Config_Handlers/CPR_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CPR_Handler.h:
-        * DAnCE/Old_Config_Handlers/Cap_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Cap_Handler.h:
-        * DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h:
-        * DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h:
-        * DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h:
-        * DAnCE/Old_Config_Handlers/Config.h:
-        * DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Config_Error_Handler.h:
-        * DAnCE/Old_Config_Handlers/Config_Handler_export.h:
-        * DAnCE/Old_Config_Handlers/Config_Handlers.mpc:
-        * DAnCE/Old_Config_Handlers/DT_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/DT_Handler.h:
-        * DAnCE/Old_Config_Handlers/Deployment.cpp:
-        * DAnCE/Old_Config_Handlers/Deployment.hpp:
-        * DAnCE/Old_Config_Handlers/DnC_Dump.cpp:
-        * DAnCE/Old_Config_Handlers/DnC_Dump.h:
-        * DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp:
-        * DAnCE/Old_Config_Handlers/DnC_Dump_T.h:
-        * DAnCE/Old_Config_Handlers/Domain_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Domain_Handler.h:
-        * DAnCE/Old_Config_Handlers/Dump_Obj.cpp:
-        * DAnCE/Old_Config_Handlers/Dump_Obj.h:
-        * DAnCE/Old_Config_Handlers/ERE_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/ERE_Handler.h:
-        * DAnCE/Old_Config_Handlers/IAD_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/IAD_Handler.h:
-        * DAnCE/Old_Config_Handlers/ID_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/ID_Handler.h:
-        * DAnCE/Old_Config_Handlers/IR_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/MID_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/MID_Handler.h:
-        * DAnCE/Old_Config_Handlers/NIA_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/NIA_Handler.h:
-        * DAnCE/Old_Config_Handlers/PCI_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/PCI_Handler.h:
-        * DAnCE/Old_Config_Handlers/PC_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/PC_Handler.h:
-        * DAnCE/Old_Config_Handlers/Plan_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Plan_Handler.h:
-        * DAnCE/Old_Config_Handlers/Process_Element.cpp:
-        * DAnCE/Old_Config_Handlers/Process_Element.h:
-        * DAnCE/Old_Config_Handlers/Process_Element_T.cpp:
-        * DAnCE/Old_Config_Handlers/Process_Element_T.h:
-        * DAnCE/Old_Config_Handlers/Property_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Property_Handler.h:
-        * DAnCE/Old_Config_Handlers/RS_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/RS_Handler.h:
-        * DAnCE/Old_Config_Handlers/RUK_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/RUK_Handler.h:
-        * DAnCE/Old_Config_Handlers/Requirement_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/Requirement_Handler.h:
-        * DAnCE/Old_Config_Handlers/SPK_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/SPK_Handler.h:
-        * DAnCE/Old_Config_Handlers/SP_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/SP_Handler.h:
-        * DAnCE/Old_Config_Handlers/TPD_Handler.cpp:
-        * DAnCE/Old_Config_Handlers/TPD_Handler.h:
-        * DAnCE/Old_Config_Handlers/Utils.cpp:
-        * DAnCE/Old_Config_Handlers/Utils.h:
-        * DAnCE/Old_Config_Handlers/XercesString.cpp:
-        * DAnCE/Old_Config_Handlers/XercesString.h:
-        * DAnCE/Old_Config_Handlers/ccd.cpp:
-        * DAnCE/Old_Config_Handlers/ccd.hpp:
-        * DAnCE/Old_Config_Handlers/cdd.cpp:
-        * DAnCE/Old_Config_Handlers/cdd.hpp:
-        * DAnCE/Old_Config_Handlers/cdp.cpp:
-        * DAnCE/Old_Config_Handlers/cdp.hpp:
-        * DAnCE/Old_Config_Handlers/cid.cpp:
-        * DAnCE/Old_Config_Handlers/cid.hpp:
-        * DAnCE/Old_Config_Handlers/cpd.cpp:
-        * DAnCE/Old_Config_Handlers/cpd.hpp:
-        * DAnCE/Old_Config_Handlers/iad.cpp:
-        * DAnCE/Old_Config_Handlers/iad.hpp:
-        * DAnCE/Old_Config_Handlers/pcd.cpp:
-        * DAnCE/Old_Config_Handlers/pcd.hpp:
-        * DAnCE/Old_Config_Handlers/toplevel.cpp:
-        * DAnCE/Old_Config_Handlers/toplevel.hpp:
-
-        Older version of config handlers.
-
-
-Sat Mar 19 16:14:20 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/ccd.cpp:
-        * DAnCE/Config_Handlers/ccd.hpp:
-        * DAnCE/Config_Handlers/cdd.cpp:
-        * DAnCE/Config_Handlers/cdd.hpp:
-        * DAnCE/Config_Handlers/cdp.cpp:
-        * DAnCE/Config_Handlers/cdp.hpp:
-        * DAnCE/Config_Handlers/cid.cpp:
-        * DAnCE/Config_Handlers/cid.hpp:
-        * DAnCE/Config_Handlers/cpd.cpp:
-        * DAnCE/Config_Handlers/cpd.hpp:
-        * DAnCE/Config_Handlers/iad.cpp:
-        * DAnCE/Config_Handlers/iad.hpp:
-        * DAnCE/Config_Handlers/pcd.cpp:
-        * DAnCE/Config_Handlers/pcd.hpp:
-        * DAnCE/Config_Handlers/toplevel.cpp:
-        * DAnCE/Config_Handlers/toplevel.hpp:
-        * DAnCE/Config_Handlers/ERE_Handler.cpp:
-        * DAnCE/Config_Handlers/ERE_Handler.h:
-        * DAnCE/Config_Handlers/IDD_Handler.cpp:
-        * DAnCE/Config_Handlers/IDD_Handler.h:
-        * DAnCE/Config_Handlers/IDREF_Base.cpp:
-        * DAnCE/Config_Handlers/IDREF_Base.h:
-        * DAnCE/Config_Handlers/ID_Handler.cpp:
-        * DAnCE/Config_Handlers/ID_Handler.h:
-        * DAnCE/Config_Handlers/IRDD_Handler.cpp:
-        * DAnCE/Config_Handlers/IRDD_Handler.h:
-        * DAnCE/Config_Handlers/MDD_Handler.cpp:
-        * DAnCE/Config_Handlers/MDD_Handler.h:
-        * DAnCE/Config_Handlers/PCD_Handler.cpp:
-        * DAnCE/Config_Handlers/PCD_Handler.h:
-        * DAnCE/Config_Handlers/PSPE_Handler.cpp:
-        * DAnCE/Config_Handlers/PSPE_Handler.h:
-        * DAnCE/Config_Handlers/Property_Handler.cpp:
-        * DAnCE/Config_Handlers/Property_Handler.h:
-        * DAnCE/Config_Handlers/RDD_Handler.cpp:
-        * DAnCE/Config_Handlers/RDD_Handler.h:
-        * DAnCE/Config_Handlers/Req_Handler.cpp:
-        * DAnCE/Config_Handlers/Req_Handler.h:
-        * DAnCE/Config_Handlers/XML_Error_Handler.cpp:
-        * DAnCE/Config_Handlers/XML_Error_Handler.h:
-        * DAnCE/Config_Handlers/XML_File_Intf.cpp:
-        * DAnCE/Config_Handlers/XML_File_Intf.h:
-        * DAnCE/Config_Handlers/XML_Helper.cpp:
-        * DAnCE/Config_Handlers/XML_Helper.h:
-        * DAnCE/Config_Handlers/XercesString.cpp:
-        * DAnCE/Config_Handlers/XercesString.h:
-        * DAnCE/Config_Handlers/ADD_Handler.cpp:
-        * DAnCE/Config_Handlers/ADD_Handler.h:
-        * DAnCE/Config_Handlers/Any_Handler.cpp:
-        * DAnCE/Config_Handlers/Any_Handler.h:
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp:
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
-        * DAnCE/Config_Handlers/CCD_Handler.cpp:
-        * DAnCE/Config_Handlers/CCD_Handler.h:
-        * DAnCE/Config_Handlers/CEPE_Handler.cpp:
-        * DAnCE/Config_Handlers/CEPE_Handler.h:
-        * DAnCE/Config_Handlers/CPD_Handler.cpp:
-        * DAnCE/Config_Handlers/CPD_Handler.h:
-        * DAnCE/Config_Handlers/CRDD_Handler.cpp:
-        * DAnCE/Config_Handlers/CRDD_Handler.h:
-        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp:
-        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h:
-        * DAnCE/Config_Handlers/Config_Handlers.mpc:
-        * DAnCE/Config_Handlers/Config_Handlers_Export.h:
-        * DAnCE/Config_Handlers/DP_Handler.cpp:
-        * DAnCE/Config_Handlers/DP_Handler.h:
-        * DAnCE/Config_Handlers/DP_PCD_Handler.cpp:
-        * DAnCE/Config_Handlers/DP_PCD_Handler.h:
-        * DAnCE/Config_Handlers/DataType_Handler.cpp:
-        * DAnCE/Config_Handlers/DataType_Handler.h:
-        * DAnCE/Config_Handlers/Deployment.cpp:
-        * DAnCE/Config_Handlers/Deployment.hpp:
-        * DAnCE/Config_Handlers/DnC_Dump.cpp:
-        * DAnCE/Config_Handlers/DnC_Dump.h:
-        * DAnCE/Config_Handlers/DnC_Dump_T.cpp:
-        * DAnCE/Config_Handlers/DnC_Dump_T.h:
-        * DAnCE/Config_Handlers/Dump_Obj.cpp:
-        * DAnCE/Config_Handlers/Dump_Obj.h:
-
-          Merged branch xsc_handler_1 to main.
-
-Sat Mar 19 15:36:55 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/RDD_Handler.cpp:
-        * DAnCE/Config_Handlers/RDD_Handler.h:
-        * DAnCE/Config_Handlers/Req_Handler.cpp:
-        * DAnCE/Config_Handlers/Req_Handler.h:
-        * DAnCE/Config_Handlers/XML_Error_Handler.cpp:
-        * DAnCE/Config_Handlers/XML_Error_Handler.h:
-        * DAnCE/Config_Handlers/XML_File_Intf.cpp:
-        * DAnCE/Config_Handlers/XML_File_Intf.h:
-        * DAnCE/Config_Handlers/XML_Helper.cpp:
-        * DAnCE/Config_Handlers/XML_Helper.h:
-
-          More XSC config handlers.
-
-Sat Mar 19 15:29:45 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.h:
-        * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp:
-        * DAnCE/Config_Handlers/CEPE_Handler.cpp:
-        * DAnCE/Config_Handlers/CEPE_Handler.h:
-        * DAnCE/Config_Handlers/Deployment.cpp:
-        * DAnCE/Config_Handlers/DnC_Dump.cpp:
-        * DAnCE/Config_Handlers/DnC_Dump.h:
-        * DAnCE/Config_Handlers/DnC_Dump_T.cpp:
-        * DAnCE/Config_Handlers/DnC_Dump_T.h:
-        * DAnCE/Config_Handlers/Dump_Obj.cpp:
-        * DAnCE/Config_Handlers/Dump_Obj.h:
-        * DAnCE/Config_Handlers/ERE_Handler.cpp:
-        * DAnCE/Config_Handlers/ERE_Handler.h:
-        * DAnCE/Config_Handlers/IDD_Handler.cpp:
-        * DAnCE/Config_Handlers/IDD_Handler.h:
-        * DAnCE/Config_Handlers/IDREF_Base.cpp:
-        * DAnCE/Config_Handlers/IDREF_Base.h:
-        * DAnCE/Config_Handlers/ID_Handler.cpp:
-        * DAnCE/Config_Handlers/ID_Handler.h:
-        * DAnCE/Config_Handlers/IRDD_Handler.cpp:
-        * DAnCE/Config_Handlers/IRDD_Handler.h:
-        * DAnCE/Config_Handlers/MDD_Handler.cpp:
-        * DAnCE/Config_Handlers/MDD_Handler.h:
-        * DAnCE/Config_Handlers/Modified_Deployment.xsd:
-        * DAnCE/Config_Handlers/PCD_Handler.cpp:
-        * DAnCE/Config_Handlers/PCD_Handler.h:
-        * DAnCE/Config_Handlers/PSPE_Handler.cpp:
-        * DAnCE/Config_Handlers/PSPE_Handler.h:
-
-          More XML config handlers.
-
-Sat Mar 19 15:25:17 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/ADD_Handler.cpp:
-        * DAnCE/Config_Handlers/ADD_Handler.h:
-        * DAnCE/Config_Handlers/BasicSP.cdp:
-        * DAnCE/Config_Handlers/CCD_Handler.cpp:
-        * DAnCE/Config_Handlers/CCD_Handler.h:
-        * DAnCE/Config_Handlers/CPD_Handler.cpp:
-        * DAnCE/Config_Handlers/CPD_Handler.h:
-        * DAnCE/Config_Handlers/CRDD_Handler.cpp:
-        * DAnCE/Config_Handlers/CRDD_Handler.h:
-        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp:
-        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h:
-        * DAnCE/Config_Handlers/Config_Handlers_Export.h:
-        * DAnCE/Config_Handlers/DP_Handler.cpp:
-        * DAnCE/Config_Handlers/DP_Handler.h:
-        * DAnCE/Config_Handlers/DP_PCD_Handler.cpp:
-        * DAnCE/Config_Handlers/DP_PCD_Handler.h:
-        * DAnCE/Config_Handlers/DataType_Handler.cpp:
-        * DAnCE/Config_Handlers/DataType_Handler.h:
-
-          Added a XSC compiler compliant config handlers.
-
-Sat Mar 19 15:22:54 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+  Mon Mar 27 00:22:02 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * DAnCE/ExecutionManager/DAM_Map.cpp:
-        * DAnCE/ExecutionManager/DAM_Map.h:
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h:
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
 
-          Fixed some more compiler errors.
+          Modified to allow ccm_passicate to be called on all components
+          before actually deactivating any components.
 
-Sat Mar 19 15:06:37 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+  Thu Mar 23 23:18:56 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * DAnCE/ExecutionManager/DAM_Map.cpp:
-        * DAnCE/ExecutionManager/DAM_Map.h:
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
-        * DAnCE/NodeApplication/NodeApplication.cpp:
-        * DAnCE/NodeManager/NodeDaemon_Impl.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp (svc):
 
-          Made changes to fix compile errors.
+        Removed an unwanted debug statement.
 
-Sat Mar 19 15:02:03 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+  Thu Mar 23 22:54:25 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
 
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-        *
-          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Made changes to reflect changes made to the CIAO
-          infrastructure to support NodeApplication instantiate
-          multiple containers.
-
-          Thanks to Gan Deng <dengg@dre.vanderbilt.edu> for making this
-          change.
-
-Sat Mar 19 14:54:15 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/BasicSP/descriptors/BasicSP.cdp:
-        * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat:
-        * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl:
-        * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp:
-
-          Added a flattened deployment plan for testing the DaNCE
-          infrastructure.
-
-          Thanks to Will Otte <w.otte@vanderbilt.edu> for helping
-          out with this project.
-
-Sat Mar 19 14:23:49 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base.idl:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base.mpc:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base_stub_export.h:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base_svnt_export.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver.mpc:
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
-
-          Fixed few minor compiler errors.
-
-Sat Mar 19 13:40:30 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base.idl:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base.mpc:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base_stub_export.h:
-        * DAnCE/examples/Swapping/Hello_Base/Hello_Base_svnt_export.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver.cidl:
-        * DAnCE/examples/Swapping/Receiver/Receiver.idl:
-        * DAnCE/examples/Swapping/Receiver/Receiver.mpc:
-        * DAnCE/examples/Swapping/Receiver/Receiver_exec.cpp:
-        * DAnCE/examples/Swapping/Receiver/Receiver_exec.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver_exec_export.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver_stub_export.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver_svnt_export.h:
-        * DAnCE/examples/Swapping/Sender/Sender.cidl:
-        * DAnCE/examples/Swapping/Sender/Sender.idl:
-        * DAnCE/examples/Swapping/Sender/Sender.mpc:
-        * DAnCE/examples/Swapping/Sender/Sender_exec.cpp:
-        * DAnCE/examples/Swapping/Sender/Sender_exec.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_1.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_2.h:
-        * DAnCE/examples/Swapping/Sender/Sender_exec_export.h:
-        * DAnCE/examples/Swapping/Sender/Sender_stub_export.h:
-        * DAnCE/examples/Swapping/Sender/Sender_svnt_export.h:
-        * DAnCE/examples/Swapping/Sender/starter.cpp:
-
-          Added a "HelloWorld" example that can test the dynamic
-          swapping of component implementation capability.
-
-          Thanks to Bala Natarajan <bala@dre.vanderbilt.edu>
-          for helping me with this project.
-
-Sat Mar 19 13:17:37 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-
-          Made changes to reflect changes made to the infrastructure
-          to provide the capability in the NodeApplication
-          to support multiple containers.
-
-Sat Mar 19 13:13:13 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
         * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
 
-          Changes to reflect the infrasrtuctural changes related
-          to providing capability in the NodeApplication
-          to support multiple containers.
-
-          Thanks to Gan Deng <dengg@dre.vanderbilt.edu> for
-          architecting and implementing this project.
-
-Sat Mar 19 13:08:18 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/NodeApplication_Impl.inl:
-
-          Made some changes to fix compiler errors.
-
-Sat Mar 19 12:48:44 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
-
-        * DAnCE/ciao/CCM_Core.mpc:
-        * DAnCE/ciao/CIAO_Config.h:
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Container_Base.h:
-        * DAnCE/ciao/Container_Impl.cpp:
-        * DAnCE/ciao/Container_Impl.h:
-        * DAnCE/ciao/Container_Impl.inl:
-        * DAnCE/ciao/Context_Impl_T.cpp:
-        * DAnCE/ciao/Deployment.idl:
-        * DAnCE/ciao/Deployment_Core.idl:
-        * DAnCE/ciao/Dynamic_Component_Activator.cpp:
-        * DAnCE/ciao/Dynamic_Component_Activator.h:
-        * DAnCE/ciao/Dynamic_Component_Servant_Base.cpp:
-        * DAnCE/ciao/Dynamic_Component_Servant_Base.h:
-        * DAnCE/ciao/Dynamic_Component_Servant_T.cpp:
-        * DAnCE/ciao/Dynamic_Component_Servant_T.h:
-        * DAnCE/ciao/Home_Servant_Impl_Base.h:
-        * DAnCE/ciao/Home_Servant_Impl_T.cpp:
-        * DAnCE/ciao/Home_Servant_Impl_T.h:
-        * DAnCE/ciao/NodeApplication_Impl.cpp:
-        * DAnCE/ciao/NodeApplication_Impl.h:
-        * DAnCE/ciao/NodeApplication_Impl.inl:
-        * DAnCE/ciao/Object_Set_T.cpp:
-        * DAnCE/ciao/Object_Set_T.h:
-        * DAnCE/ciao/Object_Set_T.inl:
-        * DAnCE/ciao/Port_Activator_T.cpp:
-        * DAnCE/ciao/Servant_Activator.cpp:
-        * DAnCE/ciao/Servant_Activator.h:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * DAnCE/ciao/Servant_Impl_Base.h:
-        * DAnCE/ciao/Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_T.h:
-        * DAnCE/ciao/SwapExec.idl:
-        * DAnCE/ciao/Swapping_Container.cpp:
-        * DAnCE/ciao/Swapping_Container.h:
-        * DAnCE/ciao/Swapping_Container.inl:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp:
-        * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h:
-        * DAnCE/ciao/UpgradeableContext.idl:
-        * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp:
-        * DAnCE/ciao/Upgradeable_Context_Impl_T.h:
-
-          Added CIAO infrastructure changes to allow NodeApplications
-          to support multi container instantiation.
-
-          Added CIAO infrastructure changes to allow dynamic
-          swapping of component implementations.
-
-          Thanks to Gan Deng <dengg@dre.vanderbilt.edu> and
-          Bala Natarajan <bala@dre.vanderbilt.edu> for their
-          help in architecting and implementing these changes.
-
-Fri Mar 18 18:34:20 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/Parser.cpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/SemanticAction.hpp:
-        * CCF/CCF/IDL2/SemanticGraph.hpp:
-        * CCF/CCF/IDL2/Traversal.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Factory.hpp:
-        * CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp:
-        * CCF/CCF/IDL2/Traversal/ValueTypeMember.hpp:
-        * CCF/CCF/IDL2/Traversal/ValueTypeMember.tpp:
-
-        First part of the "full" support for members in valuetypes.
-
-
-Thu Mar 17 10:18:33 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+        Removed an unwanted debug statement.
 
-        * CIDLC/ExecutorMappingGenerator.cpp:
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
+  Thu Mar 23 19:40:54 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
 
-          Added command line option 'custom-container' to the CIDL
-          compiler backend, and code generation to execute if the
-          argument to the new option is 'upgradeable'. CIAO
-          infrastructure changes to support dynamic component
-          swapping will be merged from a branch shortly - these
-          CIDL compiler changes will not affect any existing builds
-          or tests since they don't use the new command line option.
+        * APRIL_DEMO.mwc:
+        * CIAO.mwc:
+        * CIAODAnCE.mwc:
+        * CIAOTAO.mwc:
+        * CIAO_TAO_DAnCE.mwc:
 
-Fri Mar 11 10:33:28 2005  Will Otte <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/cdp.xsd
-
-        Corrected an incorrect element in the schema.
-
-Fri Mar 11 12:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/ComponentsC.h:
-        * ciao/ComponentsS.h:
-        * DAnCE/ciao/ComponentsC.h:
-        * DAnCE/ciao/ComponentsS.h:
-        * DAnCE/NodeManager/NodeDaemon_Impl.h:
-        * performance-tests/Benchmark/LatencyTest.h:
-        * performance-tests/Benchmark/RoundTripServer/LatencyTest.h:
-          Changed _MSC_VER check
+        Modified the mwc files so that they exclude the RACE/hog_string
+        directory.
 
-Fri Mar  4 17:13:16 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+  Thu Mar 23 18:04:58 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-        * examples/Hello/Hello_Base/Hello_Base.idl:
-        * examples/Hello/Hello_Base/Hello_Base.mpc:
-        * examples/Hello/Receiver/Receiver.idl:
-        * examples/Hello/Receiver/Receiver.mpc:
-        * examples/Hello/Sender/Sender.mpc:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
 
-          Cosmetic changes to IDL files and changes to MPC files to
-          eliminate unnecessary files in a given project and bring
-          in missing export header files.
+        Fixed a bug in set_priority method.
 
-Thu Mar  3 10:31:10 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+  Wed Mar 22 19:32:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * CIDLC/ExecImplGenerator.cpp:
-        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
 
-          - Added support for .cdl file extension similar to
-            support already in the servant generators.
+        Modified to make debug statements debug_level controlled.
 
-          - Fixed bug in export include generation.
+  Wed Mar 22 00:51:11 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-          Thanks to Matt Emerson <mjemerson@isis.vanderbilt.edu>,
-          Ming Xiong <xiongm@isi.vanderbilt.edu>, James Hill
-          <jhill@isis.vanderbilt.edu> and Stoyan Paunov
-          <spaunov@isis.vanderbilt.edu> for reporting these
-          problems.
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
 
-        * CIDLC/ServantSourceGenerator.cpp:
+        Modified to find the corresponding NAM when given a plan_uuid.
 
-          - Replaced remaining instances of generation of 'new' with
-            'ACE_NEW' and changed code generation to reduce line
-            lengths.
+  Wed Mar 22 02:12:58 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
-          - Changed code generation of Cookie_var for multiplex
-            receptacles to pass a Cookie* to ACE_NEW, then
-            assign to the _var, instead of passing in _var.out(),
-            which causes the allocation to fail on some platforms.
-            Thanks to Don Busch <busch_d@ociweb.com> for reporting
-            the problem.
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.cpp:
 
-Mon Mar 03 09:37:23 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        Removed some of the debug statements
 
-        * DAnCE/examples/Hello/descriptors/Hello.cdp
-        * DAnCE/examples/Hello/descriptors/hello.dat
+  Tue Mar 21 19:12:57 UTC 2006  Nishanth Shankarn  <nshankar@dre.vanderbilt.edu>
 
-          Remove these two files because the file name is bad.
+        * RACE/hog_string/hog.cdp:
 
-        * DAnCE/examples/Hello/descriptors/DeploymentPlan.cdp
-        * DAnCE/examples/Hello/descriptors/NodeManagerMap.dat
+        Fixed the plan id.
 
-          Added these two files.
+  Mon Mar 20 21:07:50 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
 
-        * DAnCE/examples/Hello/step-by-step.html
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
 
-          Fixed this page to reflex the above change.
+          turning off the HTTP capability for Linux until I figure out why
+          it affects the loading of libraries.
 
-Mon Mar 03 08:59:23 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+  Mon Mar 20 20:40:37 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
 
-        * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
 
-          Fixed the Hello_Base_DnC_svnt project settings which
-          caused comilation errors.
+          Changed loader path delimiter on Unix-like systems from ';' to ':'
 
-Wed Mar 02 11:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * performance-tests/Protocols/Controller/Controller.mpc
-        * performance-tests/Protocols/Receiver/Receiver.mpc
-        * performance-tests/Protocols/Sender/Sender.mpc
-        * tests/RTCCM/DiffServ/Controller/Controller.mpc
-          Use exceptions as base project instead of requires exceptions
+  Mon Mar 20 17:22:22 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
 
-Mon Mar 02 18:30:25 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/HTTP_Client.h:
+        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
+        * DAnCE/NodeApplicationManager/URL_Parser.h:
+        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
 
-        * examples/Hello/step-by-step.html
-        * DAnCE/examples/Hello/step-by-step.html
+          Oops. Forgot to add the actual HTTP code.
 
-          Modified these two documentation page to fix some errors.
+  Mon Mar 20 04:27:48 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
 
-        * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
 
-          Fixed wrong shared library names and project names.
+          Adding HTTP capability to DAnCE.
+
+        * DAnCE/RepositoryManager/HTTP_Client.h:
+        * DAnCE/RepositoryManager/HTTP_Client.cpp:
+        * DAnCE/RepositoryManager/HTTP_Handler.h:
+        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
+        * DAnCE/RepositoryManager/Options.h:
+        * DAnCE/RepositoryManager/Options.cpp:
+        * DAnCE/RepositoryManager/PC_Updater.h:
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+        * DAnCE/RepositoryManager/PC_Updater_T.h:
+        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
+        * DAnCE/RepositoryManager/RM_Helper.h:
+        * DAnCE/RepositoryManager/RM_Helper.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager.mpc:
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * DAnCE/RepositoryManager/URL_Parser.h:
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
 
-Sat Feb 26 14:38:46 2005  Arvind S. Krishna  <arvindk@tango.dre.vanderbilt.edu>
+          Porting the RepositoryManager to the newest XML config handlers.
+          Also migrating the code from the DOC repository to ensure the gap
+          between the code in this repository and that in cvs.doc.wustl.edu
+          repo is closed.
 
-        * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc:
-        * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc:
-        * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc:
-        * examples/handcrafted/BasicSP_EC/EC/EC.mpc:
-        * examples/handcrafted/BasicSP_EC/BasicSP.mpc:
-        * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc:
-        * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc:
-        * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc:
-        * examples/handcrafted/BasicSP_EC2/EC/EC.mpc:
-        * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc:
-        * examples/handcrafted/BasicSP_EC2/BasicSP.mpc:
 
-          Replaced all occurances of "dummy" with "dummy_label"
+          NOTE: I still have some testing left, but before that I need to
+          compile the CoSMIC version from this repository and regenerate
+          a bunch of descriptors because all the example descriptors are
+          broken.
 
-        * bin/replace_dummy_with_dummylabel.sh:
+  Sat Mar 18 22:33:10 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
-          Shell script that can be used to do this. In case people find it
-          useful.
+        * DAnCE/Interfaces/NodeManager.idl
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.h
+        * ciao/Deployment.idl
 
+          Put the struct Sched_Params definition outside of the NAM
+          interface.
+          Cleaned up the code a bit.
 
-Tue Feb 22 09:55:51 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+  Sun Mar 19 16:52:54 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
-        * CIDLC/TypeNameEmitter.cpp:
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Updated to implement the commitResource and releaseResource
+          function
 
-          Fixed typos in code generation that were omitting a space
-          between the type name and '_ciao_extract_val' for enums,
-          structs and unions when used as component or home attributes.
-          Thanks to Steve Baker <steven_d_baker@raytheon.com> for
-          reporting the bug with enums.
+  Sat Mar 18 19:01:18 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplication/NodeApplication.cpp:
 
-        * DAnCE/ciao/Servant_Activator.h:
-        * ciao/Servant_Activator.h:
-          Added missing includes because of POA refactoring
+        Enhanced the NodeApplication to run in realtime priority mode.
 
-Thu Feb 17 14:04:12 UTC 2005 Johnny Willemsen  <jwillemsen@remedy.nl>
+  Fri Mar 17 06:36:18 UTC 2006  Nilabja Roy  <roy_n@dre.vanderbilt.edu>
 
-        * ciao/Component_Base.idl:
-          Fixed typo in include of orb.idl. Thanks to Roland Schimmack
-          <Roland dot Schimmack at gmx dot de> for reporting this
+        * DAnCE/Interfaces/NodeManager.idl:
 
-Tue Feb 15 22:43:34 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
 
-        * DAnCE/examples/BasicSP/BMDisplay_exec.h:
+        * DAnCE/NodeManager/MonitorCB.cpp:
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+        * ciao/Deployment.idl:
 
-          Added missing export file to make things compile on Windows
-          platforms. Thanks to Diana Ukleja <Diana_Ukleja@raytheon.com>
-          for pointing this out.
+          Implemented the set_priority method on the NodeManager
+          and NodeApplicationManager interface. Removed some of the debug
+          messages
 
-Mon Feb 14 14:52:32 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+  Thu Mar 16 03:54:39 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
 
-        * DAnCE/NEWS
+        * tools/Config_Handlers/DD_Handler.cpp:
+          Updated the handler to handle optional parameters
 
-          Updated the NEWS file by adding support for parsing
-          hierarchical assembly of component descriptors.
+  Tue Mar 14 07:01:28 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-Sun Feb 13 13:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
 
-        * Release:
-          Removed CIAO-INSTALL from the release files. It is already
-          picked up because we include the complete CIAO directory
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+          Updated to make it portable in windows
 
-Fri Feb 11 11:12:21 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp:
+          Fixed the entry point.
 
-        * DAnCE/NEWS
+  Mon Mar 13 23:04:32 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-          Updated the NEWS file by adding support for setting up
-          attribute in component configuration.
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/ID_Handler.h
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/SatisfierProperty_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
+        * tools/Config_Handlers/Utils/XercesString.h
 
-Fri Feb 11 11:10:54 2005  Will Otte <wotte@dre.vanderbilt.edu>
+          Fixed linking/warnings on Windows.
 
-        * docs/schema/Modified_Deployment.xsd:
+  Mon Mar 13 18:27:27 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-          Corrected a couple mistakes in the schema.
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Changed the projects to depend on NodeManager_Stub. This will fix the
+          linking errors in Windows.
 
-Thu Feb 10 07:11:04 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Mon Mar 13 17:36:28 UTC 2006  Krishnakumar B  <kitty@dre.vanderbilt.edu>
 
-        * CIAO version 0.4.4 released.
+        * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the
+          generated code to set the component id on the component context
+          class to allow retrieving the id at run-time from an executor
+          implementation.
 
-Tue Feb 08 10:04:21 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+  Mon Mar 13 17:28:44 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-        * DAnCE/NEWS
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
 
-          Updated the NEWS file for the coming 0.4.4 release.
+          Fixes for nameservice discovery of EM.
 
-Mon Feb  7 09:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * docs/schema/toplevel.xsd
 
-        * Release:
-          Added CIAO-INSTALL to the release files
+          Minor correction to schema.
 
-Fri Feb  4 09:35:00 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
+  Fri Mar 10 17:03:26 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-        * DAnCE/examples/Hello/descriptors/basicNodeDaemon.pl:
-          The perl script to create node daemons created.
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
 
-        * DAnCE/examples/Hello/step-by-step.html:
-          Step by step tutorial for the DAnCE.
+          Fixed minor bug in URI interface.
 
-Fri Feb  4 12:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Thu Mar  9 22:26:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tools/RTComponentServer/RTConfig_Manager.h:
-          Include SString.h instead of SStringfwd.h to fix compile errors with
-          CBuilderX
+        * ciao/Context_Impl_Base.cpp:
+        * ciao/Context_Impl_Base.h:
 
-Thu Feb  3 20:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added CORBA::String_var member to store the component instance
+          id, also added a pair of set/get methods called _ciao_instance_id.
 
-        * tools/Segment_Timer/Segment_Timer.mpc:
-          Removed TAO_ROOT again, the gnu template has been changed so that
-          when CIAO is detected, also TAO_ROOT is set
+  Wed Mar  8 19:07:31 UTC 2006    <wotte@mako.isislab.vanderbilt.edu>
 
-Thu Feb  3 12:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
 
-        * DAnCE/ciao/NodeApplication_Impl.h:
-          Added include of ace/SString.h to fix compile errors with CBuilderX
+          Add error message for connection failure.
 
-Thu Feb  3 10:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
 
-        * tools/Segment_Timer/Segment_Timer.mpc:
-          Added $(TAO_ROOT) so that MPC creates a correct GNU makefile
+          Disabled this project.
 
-Wed Feb  2 19:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/TargetManager/TargetManager_exec.cpp
+        * DAnCE/TargetManager/TargetManager_exec.h
 
-        * rules.ciao.GNU:
-          Fixed error in this file
+          Fix entry point problems.
 
-Wed Feb  2 09:39:25 2005  Chad Elliott  <elliott_c@ociweb.com>
+  Wed Mar  8 19:29:20 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-        * CCF/CCF/CIDL/CIDL.mpc:
-        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc:
-        * CCF/CCF/CompilerElements/CompilerElements.mpc:
-        * CCF/CCF/IDL2/IDL2.mpc:
-        * CCF/CCF/IDL3/IDL3.mpc:
-        * CIDLC/CIDLC.mpc:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Added the structure in the TMExt interface to maintain the
+          mapping between hostname to NM refs.
 
-          Converted includes to incorporate $(CIAO_ROOT).  This allows the
-          GNUACEProjectCreator to recognize these projects as CIAO projects.
+  Wed Mar  8 14:40:41 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/ciao/CCM_Core.mpc:
-        * ciao/CCM_Core.mpc:
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-        * tools/Segment_Timer/Segment_Timer.mpc:
+        * tools//Config_Handlers/Deployment.cpp
+        * tools//Config_Handlers/Deployment.hpp
+        * tools//Config_Handlers/GNUmakefile
+        * tools//Config_Handlers/cdd.cpp
+        * tools//Config_Handlers/cdd.hpp
+        * tools//Config_Handlers/pcd.cpp
+        * tools//Config_Handlers/pcd.hpp
+        * tools//Config_Handlers/toplevel.cpp
+        * tools//Config_Handlers/toplevel.hpp
+        * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools//Config_Handlers/Package_Handlers/PCD_Handler.h
 
-          Added a bogus include of $(CIAO_ROOT).  This allows the
-          GNUACEProjectCreator to recognize these projects as CIAO projects.
+        New generated code.
 
-Wed Feb  2 14:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+  Wed Mar  8 03:11:02 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-        * rules.ciao.GNU:
-          New rules file to set the correct SOVERSION and SONAME values
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Implement the Signal Handler for the process NodeManager. And
+          set the option avoid_zombies=0
 
-Wed Feb  2 10:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ciao/Port_Activator_T.cpp:
-          Added include of OS_NS_string.h to get ACE_OS::strcmp
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
 
-Tue Feb  1 18:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Implement ComponentID to Process Id mapping
 
-        * ciao/CCM_Core.mpc:
-        * DAnCE/ciao/CCM_Core.mpc:
-          Removed some ciaoversion based projects I missed during my checkin
-          below
+  Tue Mar  7 23:26:41 UTC 2006  Nilabja Roy  <nilabjar@localhost.localdomain>
 
-Tue Feb  1 13:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * DAnCE/TargetManager/DomainDataManager.cpp
+        * DAnCE/TargetManager/TargetManagerExt.idl
+        * DAnCE/TargetManager/TargetManager.mpc:
+        Changed to depend on the NodeManager_Stub, so that
+        CIAO::NodeManager can be used.
 
-        * ciao/CCM_Core.mpc:
-        * DAnCE/ciao/CCM_Core.mpc:
-          Removed ciaoversion as base project. This will be removed because it
-          results in the fact that each generated GNU makefile will get the
-          version number generated. We want that the GNU make rules get the
-          version number from Version.h
-
-Mon Jan 31 21:00:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp (pre):
-
-          Generate '#include "ace/OS_NS_string.h"' directive.  CIAO CIDL
-          servant sources call ACE_OS::strcmp(), the prototype of which is
-          found in that header.  Necessitated by inter-header dependency
-          reductions in ACE.
-
-Mon Jan 31 11:59:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * DAnCE/Config_Handlers/Any_Handler.cpp:
-        * DAnCE/Config_Handlers/CPK_Handler.cpp:
-        * DAnCE/Config_Handlers/DT_Handler.cpp:
-        * DAnCE/Config_Handlers/Property_Handler.cpp:
-        * DAnCE/Config_Handlers/RS_Handler.cpp:
-        * DAnCE/Config_Handlers/Requirement_Handler.cpp:
-        * DAnCE/Config_Handlers/SP_Handler.cpp:
-        * DAnCE/ciao/Port_Activator_T.cpp:
-        * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
-        * ciao/Container_Impl.cpp:
-        * performance-tests/Protocols/Controller/Controller.cpp:
-        * tools/RTComponentServer/RTConfig_Manager.cpp:
-        * tools/RTComponentServer/RTConfig_Manager.h:
-        * tools/RTComponentServer/RTServer_Impl.cpp:
-
-          Added missing header include directives that are necessary due
-          to inter-header dependency reductions in ACE.
-
-Sun Jan 30 20:30:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h:
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+  Tue Mar  7 03:14:50 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
         * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/NodeApplication_Impl.cpp:
-        * ciao/Container_Base.cpp:
-        * ciao/ServerActivator_Impl.h:
-        * docs/tutorial/Hello/hello_exec.cpp:
-        * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp:
-        * tests/RTCCM/Priority_Test/Controllers/client.cpp:
-        * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp:
-        * tools/Assembly_Deployer/Deployment_Configuration.h:
-        * tools/RTComponentServer/RTServer_Impl.cpp:
-
-          Added missing header include directives that are necessary due
-          to inter-header dependency reductions in ACE.
-
-Sun Jan 23 01:49:51 2005  Marek Brudka  <mbrudka@aster.pl>
-
-        * examples/OEP/Display/NavDisplayGUI_exec/README (Module):
-        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
-        Changes related with separation of GUI reactors.
-        The additional information is avalaible in ChangeLog at REACTOR_SEPARATION branch (below).
-
-        Mon Dec  6 00:39:19 2004  Marek Brudka  <mbrudka@aster.pl>
-
-        * examples/OEP/Display/NavDisplayGUI_exec/README (Module):
-        Remove reference to ACE_HAS_QT.
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
-        Removed deprecated qt_moc base project.
+        * DAnCE/NodeManager/CIAO_Monitor.h:
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+          Changed to add the percentage cpu same as vmstat
 
-Fri Jan 21 17:27:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Changed to add the Comp_id to Proc_id mapping
 
-          Fixed dependency relationship by making
-          NodeAppTest_RoundTrip_stub depending on CIAO_DnC_Container.
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+          Changed to add interface to RACE
 
-        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Changed to add interface to RACE
 
-          Fixed warning on Debian_Full_Reactor build. The warning is
-          caused because of assigning "const char*" to a "char *" type.
+        * DAnCE/TargetManager/descriptors/Domain.cdd:
+          Updated to the latest xsd
 
-          Thanks Johnny Willemsen <jwillemsen@remedy.nl> for pointing
-          these.
 
-Thu Jan 20 18:29:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * docs/schema/cdd.xsd:
+          Changed the Domain definations
 
-        * DAnCE/Config_Handlers/Any_Handler.cpp:
-        * DAnCE/Config_Handlers/Utils.cpp:
-        * performance-tests/Protocols/Sender/Sender_exec.cpp:
-        * tools/Daemon/Daemon_Impl.cpp:
+  Mon Mar  6 19:46:54 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-          Converted all ACE_{static,dynamic,reinterpret,const}_cast macros
-          calls to their standard C++ counterparts using new
-          bin/ACE-casts-convert script.  The ACE cast macros were
-          deprecated back in ACE 5.4.2.
+        * DAnCE/Interfaces/NodeManager.idl
+        * DAnCE/NodeManager/NodeManager_Impl.h
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
 
-Thu Jan 20 09:54:04 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
+        Added the set_priority method to modify the priority of
+        NodeApplication process.
 
-        * examples/OEP/Display/descriptors/NOTE.txt:
-        * examples/OEP/Display/descriptors/NOTE-win.txt:
+  Wed Mar  1 20:56:16 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
-          Fixed the discrepancy on using Assembly_Deployer. Thanks to
-          Martina Yen <martina_h_yen@raytheon.com> for reporting this.
+        * DAnCE/TargetManager/TargetManager_exec.h
+        * DAnCE/TargetManager/TargetManager_exec.cpp
+        * DAnCE/TargetManager/TargetManagerExt.idl:
 
-Wed Jan 19 09:39:14 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        Added method to TargetManagerExt interface to obtain references to
+        the NodeManagers.
 
-        * DAnCE/examples/BasicSP/BasicSP.mpc
-        * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc
-        * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc
-        * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc
-        * DAnCE/examples/BasicSP/EC/EC.mpc
 
-          Changed the shared component library name from
-          <what_ever_component>_DnC_<stub> to <What_ever_component>_<stub>,
-          since it doesn't make sense to let the modelers to put _DnC
-          trailing a component name.
+  Fri Feb 24 22:55:51 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-          The same change applied to _svnt and _exec libraries.
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/CEPE_Handler.cpp
+        * tools/Config_Handlers/CEPE_Handler.h
+        * tools/Config_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/CRDD_Handler.cpp
+        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/DP_Handler.cpp
+        * tools/Config_Handlers/DP_Handler.h
+        * tools/Config_Handlers/DataType_Handler.cpp
+        * tools/Config_Handlers/DataType_Handler.h
+        * tools/Config_Handlers/DnC_Dump.cpp
+        * tools/Config_Handlers/ERE_Handler.h
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/IDREF_Base.cpp
+        * tools/Config_Handlers/IDREF_Base.h
+        * tools/Config_Handlers/ID_Handler.cpp
+        * tools/Config_Handlers/ID_Handler.h
+        * tools/Config_Handlers/IRDD_Handler.cpp
+        * tools/Config_Handlers/IRDD_Handler.h
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/Config_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/RDD_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.cpp
+        * tools/Config_Handlers/Req_Handler.h
+        * tools/Config_Handlers/STD_PCD_Handler.h
+        * tools/Config_Handlers/ccd.cpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cid.cpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.cpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.cpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.cpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/test.cdp
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CID_Handler.h
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/IAD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/PCD_Handler.h
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+        * tools/Config_Handlers/Package_Handlers/PC_Intf.h
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+        * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
+        * tools/Config_Handlers/Package_Handlers/test.cpp
+        * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd
+        * tools/Config_Handlers/Utils/Exceptions.h
+        * tools/Config_Handlers/Utils/Functors.h
+        * tools/Config_Handlers/Utils/XML_Error_Handler.cpp
+        * tools/Config_Handlers/Utils/XML_Helper.h
+        * tools/Config_Handlers/XMLSchema/Writer.hpp
+
+          Package handlers and changes necessary to support them.
+
+Fri Apr 21 08:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
+        * CIDLC/ServantSourceGenerator.cpp:
+          Removed usage of ACE_NESTED_CLASS
 
-          Fixed this script since Some earlier cosmetic change make
-          this perl script broken.
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+          Fixed compile errors
 
-          Thanks Steven Baker <Steven_D_Baker@raytheon.com> and
-          Sam Abbe <sam_abbe@raytheon.com> to pointing errors to
-          run this example.
+Thu Apr 20 13:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sat Jan 15 15:16:14 2005  Gan Deng  <gan.deng@vanderbilt.edu>
+        * tools/Config_Handlers/DnC_Dump.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+          Fixed compile error
 
-        * DAnCE/examples/BasicSP/README.html
+Thu Apr 20 09:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Updated this README file for instructions on running the BasicSP
-          example by using DAnCE. Thanks Sam Abbe <sam_abbe@raytheon.com>
-          for pointing errors on this document page.  This fixes bugid
-          2031.
+        * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp:
+          Fixed compile error
 
-Mon Jan 10 09:45:14 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
+Wed Apr 19 19:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RTNodeApplication/RTServer_Impl.h:
-        * DAnCE/RTNodeApplication/RTServer_Impl.cpp: Removed init method
-          altogether.  VC6 can't handle the syntax and we'll deal with
-          later.
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Fixed usage of sequences. The sequences now return
+          a pointer on the subscript operators, not _var which was not according
+          to the spec.
 
-Fri Jan  7 10:02:02 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
+Wed Apr 19 14:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RTNodeApplication/RTServer_Impl.cpp (init): Changed to
-          call the virtual function defined by the parent explicitly with
-          this pointer to work around a VC6 bug.
+        * tools/Config_Handlers/XMLSchema/Types.hpp:
+          Removed vc6 workaround
 
-Wed Jan  5 15:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 19 13:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.inl:
-        * DAnCE/tests/Config_Handlers/Handler_Test.i:
-          Removed inl/i file, updated h,cpp
+        * docs/schema/xsc-banner.h:
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+          Removed include of vc6-4786.h
 
-Wed Jan  5 14:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 19 13:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tools/Assembly_Deployer/Deployment_Configuration.{h,cpp,inl}:
-        * tools/XML_Helpers/XML_Utils.{h,cpp,inl}:
-          Removed inl file, updated h,cpp
+        * tools/Config_Handlers/STD_PC_Intf.cpp:
+        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
+        * tools/Config_Handlers/XSCRT/Elements.hpp:
+        * tools/Config_Handlers/XSCRT/XML.hpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+        * tools/Config_Handlers/DP_Handler.cpp:
+          Removed vc6 workarounds
 
-Wed Jan  5 10:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Apr 19 11:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/RTNodeApplication/RTServer_Impl.h:
-          Fixed compile problem in emulated exception builds due to
-          incorrect environment macro
+        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
+          Updated for string manager change in TAO
 
-Mon Jan  3 10:01:09 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
+        * ciao/Servant_Impl_Base.cpp:
+          Updated for sequence change
 
-        * DAnCE/RTNodeApplication/README:
-        * DAnCE/RTNodeApplication/NodeApplication_Task.cpp:
-        * DAnCE/RTNodeApplication/NodeApplication_Task.h:
-        * DAnCE/RTNodeApplication/NodeApplication_Task.inl:
-        * DAnCE/RTNodeApplication/RTNodeApplication.cpp:
-        * DAnCE/RTNodeApplication/RTNodeApplication.mpc:
-        * DAnCE/RTNodeApplication/RTServer_Impl.cpp:
-        * DAnCE/RTNodeApplication/RTServer_Impl.h:
-        * DAnCE/RTNodeApplication/RTServer_Impl.inl:
-        * DAnCE/RTNodeApplication/senv.sh: Added a minimal
-          real-time-enabled NodeApplication server.
+Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Jan  3 12:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp
+        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/ccd.hpp
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
+        * tools/Config_Handlers/cid.hpp
+        * tools/Config_Handlers/cpd.hpp
+        * tools/Config_Handlers/iad.hpp
+        * tools/Config_Handlers/pcd.hpp
+        * tools/Config_Handlers/toplevel.hpp
+          Removed vc6 workarounds
 
-        * ciao/CCM_Core.mpc:
-        * DAnCE/ciao/CCM_Core.mpc:
-          Added ciaoversion as base project to all projects so that SOVERSION
-          is set to the correct version number in the GNU makefiles
+        * tools/Config_Handlers/vc6-4786.h
+          Removed
 
-Thu Dec 30 13:24:16 2004  Chris Cleeland  <cleeland@ociweb.com>
+Tue Apr 18 20:55:05 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * CIAO version 0.4.3 released.
+        * CIAO version 0.5.1 released.
 
 Local Variables:
-add-log-time-format: current-time-string
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
 End:
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp
deleted file mode 100644
index ff25c68a9d5..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-#include "Base_Packager.h"
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-  Base_Packager::Base_Packager (const char *pkg_url,
-                                const char *cdp_url,
-                                const char *pdl_url,
-                                bool include_std_desc)
-
-    :pkg_url_ (pkg_url),
-     cdp_url_ (cdp_url),
-     pdl_url_ (pdl_url),
-     include_std_desc_ (include_std_desc)
-  {}
-
-  int
-  Base_Packager::preparePackage (PACKAGE_PLAN &pkg_plan)
-  {
-    return 0;
-  }
-
-  int
-  Base_Packager::createPackage (const PACKAGE_PLAN &pkg_plan)
-  {
-    return 0;
-  }
-
-  }
-}
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.h b/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.h
deleted file mode 100644
index dc8e0b1f238..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//==================================================================
-/**
- *  @file  Base_Packager.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef BASE_PACKAGER_H
-#define BASE_PACKAGER_H
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <map>
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-
-  typedef std::map <ACE_TString, ACE_TString>::const_iterator DESC_PLAN_CONST_ITER;
-  typedef std::map <ACE_TString, ACE_TString>::const_iterator IMPL_PLAN_CONST_ITER;
-
-  struct packageplan
-  {
-    std::map <ACE_TString, ACE_TString> descriptors;
-    std::map <ACE_TString, ACE_TString> implementations;
-  };
-
-  /**
-   * @class Base_Package
-   *
-   * @brief Base class for ComponentPackager
-   *
-   */
-  class Base_Packager
-  {
-  public:
-    typedef packageplan  PACKAGE_PLAN;
-
-    /// constructor
-    Base_Packager (const char *pkg_url,
-                   const char *cdp_url,
-                   const char *pdl_url = 0,
-                   bool include_std_desc = true);
-
-    /// Prepare the package plan
-    int preparePackage (PACKAGE_PLAN &pkg_plan);
-
-    /// Create the archive
-    int createPackage (const PACKAGE_PLAN &pkg_plan);
-
-  protected:
-    // URL for package
-    const char *pkg_url_;
-
-    // URL for flattened_deploymentplan
-    const char *cdp_url_;
-
-    // URL for PackageDescriptorsList file
-    const char *pdl_url_;
-
-    // Indicate whether to include separate descriptors
-    bool include_std_desc_;
-  };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* BASE_PACKAGER_H */
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.cpp
deleted file mode 100644
index fff849d1247..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-
-#include "Config_Handlers/XML_File_Intf.h"
-#include "ciao/DeploymentC.h"
-#include "ciao/CIAO_common.h"
-
-#include "CPK_Packager.h"
-#include "PDL_Handler.h"
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-  int
-  CPK_Packager::preparePackage (PACKAGE_PLAN &pkg_plan)
-  {
-    ACE_TString impl_inzip_path ("implementations");
-    impl_inzip_path += ACE_DIRECTORY_SEPARATOR_STR;
-
-    ACE_TString desc_inzip_path ("descriptors");
-    desc_inzip_path += ACE_DIRECTORY_SEPARATOR_STR;
-
-
-    CIAO::Config_Handlers::XML_File_Intf intf (this->cdp_url_);
-    Deployment::DeploymentPlan_var obj_plan = intf.get_plan ();
-
-    const Deployment::DeploymentPlan &plan = obj_plan;
-
-    //@@ Prepare package plan for implementations
-    for (CORBA::ULong i = 0;
-         i < plan.implementation.length ();
-         i++)
-    {
-       ACE_TString name (plan.implementation[i].name);
-
-       this->desc_mf_ << name << " " << ACE_PLATFORM << "\n";
-       this->desc_mf_ << "{\n";
-
-       CORBA::ULong artifact_len = plan.implementation[i].artifactRef.length ();
-
-       ACE_TCHAR dll_pathname[MAXPATHLEN + 1];
-
-       for (CORBA::ULong iter = 0;
-            iter < artifact_len;
-            iter++)
-       {
-         // Transform the pathname into the appropriate dynamic link library
-         // by searching the ACE_LD_SEARCH_PATH.
-         int result = ACE::ldfind (plan.artifact[plan.implementation[i].artifactRef[iter]].location[0],
-                                   dll_pathname,
-                                   (sizeof (dll_pathname) / sizeof (ACE_TCHAR)));
-
-         if (result != 0)
-         {
-           ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("Resource not available!")
-                      ACE_TEXT ("Please make sure you have compiled the component.\n")));
-           return -1;
-         }
-
-         ACE_TString path (dll_pathname);
-         ACE_TString base (ACE::basename (dll_pathname));
-
-         ACE_TString inzip_path = impl_inzip_path + base;
-
-         // store the plan info to predefined struct
-         Component_Packager::DESC_PLAN_CONST_ITER plan_iter =
-           pkg_plan.implementations.find (inzip_path);
-         if (plan_iter != pkg_plan.descriptors.end ())
-         {
-           pkg_plan.implementations[inzip_path] = path;
-         }
-         this->desc_mf_ << " " << base << "\n";
-       }
-       this->desc_mf_ << "}\n";
-    }
-
-    //@@ prepare package plan for descriptors
-    ACE_TString cdp_path (this->cdp_url_);
-    ACE_TString cdp_inzip_path = desc_inzip_path +
-                                 ACE::basename (cdp_path.c_str ());
-    pkg_plan.descriptors[cdp_inzip_path] = cdp_path;
-
-    // return if separated descriptors are not required to be inluded
-    // in the package
-    if (!this->include_std_desc_ ) return 0;
-
-    //@@ retrieve location information for standard descriptors
-    PDL_Handler pdl_handler;
-    PDL_Handler::DESC_LIST desc_list;
-
-    if (-1 == pdl_handler.process_pdl (this->pdl_url_,
-                                       desc_list))
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  ACE_TEXT ("Error processing the .pdl file\n")));
-      return -1;
-    }
-
-    for (PDL_Handler::DESC_LIST::iterator iter = desc_list.begin ();
-         iter != desc_list.end ();
-         iter++)
-    {
-      ACE_TString path ((*iter).c_str ());
-      ACE_TString inzip_path = desc_inzip_path + path;
-      pkg_plan.descriptors [inzip_path] = path;
-    }
-
-    return 0;
-  }
-
-  int
-  CPK_Packager::createPackage (const PACKAGE_PLAN &pkg_plan)
-  {
-    this->cpk_zip_.Open (this->cpk_file_,
-                         CZipArchive::zipCreate);
-
-    //@@ :Archive description
-    ACE_DEBUG ((LM_INFO,
-               ACE_TEXT ("ComponentPackager: Adding description ....")));
-
-    //@@ Write the description file to the archive
-    if (this->cpk_zip_.AddNewFile (this->desc_mf_, "description"))
-    {
-      ACE_DEBUG ((LM_INFO,
-                 ACE_TEXT ("[Done]\n")));
-    }
-    else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("\nfail to add description, operation aborted.")));
-      return -1;
-    }
-
-
-
-    //@@ Archive descriptors
-    for (Component_Packager::DESC_PLAN_CONST_ITER iter = pkg_plan.descriptors.begin ();
-         iter != pkg_plan.descriptors.end ();
-         iter++)
-    {
-      ACE_TString inzip_path ((*iter).first);
-      ACE_TString path ((*iter).second);
-
-
-      CZipAddNewFileInfo desc_info (path.c_str (),
-                                    inzip_path.c_str ());
-
-      ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("ComponentPackager: Adding %s ...."),
-                  inzip_path.c_str ()));
-
-      if (this->cpk_zip_.AddNewFile (desc_info))
-      {
-        ACE_DEBUG ((LM_INFO,
-                   ACE_TEXT ("[Done]\n")));
-      }
-      else
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("\nfail to add %s, the target file")
-                    ACE_TEXT ("may be corrupted or does not exist,operation aborted.\n"),
-                    inzip_path.c_str ()));
-        return -1;
-      }
-    }
-
-    //@@ Archive implementations
-    for (Component_Packager::IMPL_PLAN_CONST_ITER iter = pkg_plan.implementations.begin ();
-         iter != pkg_plan.implementations.end ();
-         iter++)
-    {
-      ACE_TString inzip_path ((*iter).first);
-      ACE_TString path ((*iter).second);
-
-      CZipAddNewFileInfo impl_info (path.c_str (),
-                                    inzip_path.c_str ());
-
-      ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("ComponentPackager: Adding %s ...."),
-                  inzip_path.c_str ()));
-
-      if (this->cpk_zip_.AddNewFile (impl_info))
-      {
-        ACE_DEBUG ((LM_INFO,
-                   ACE_TEXT ("[Done]\n")));
-      }
-      else
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("\nfail to add %s, the target file")
-                    ACE_TEXT ("may be corrupted or does not exist,operation aborted.\n"),
-                    inzip_path.c_str ()));
-        return -1;
-      }
-    }
-
-    this->cpk_zip_.Close ();
-    return 0;
-  }
-
-
-  // overloaded std::out operator
-  CZipMemFile& operator << (CZipMemFile &mf,
-                            const ACE_TCHAR *str)
-  {
-    mf.Write (str, ACE_OS::strlen (str));
-    return mf;
-  }
-
-  // overloaded std::out operator
-  CZipMemFile& operator << (CZipMemFile &mf,
-                            const ACE_TString &str)
-  {
-    mf.Write (str.c_str (), str.length ());
-    return mf;
-  }
-
-
-  }
-}
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.h b/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.h
deleted file mode 100644
index 638afe33e08..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//==================================================================
-/**
- *  @file  CPK_Packager.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef CPK_PACKAGE_H
-#define CPK_PACKAGE_H
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include "Base_Packager.h"
-
-#ifdef __GNUC__
-    #include "ZipArchive.h"
-    #include "ZipPlatform.h"
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <dirent.h>
-    #include <fnmatch.h>
-    #include <unistd.h>
-#else
-    #include "ZipArchive.h"
-    #include "ZipPlatform.h"
-#endif
-
-#include <set>
-#include "Base_Packager.h"
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-   using namespace CIAO::Component_Packager;
-
-  /**
-   * @class CPK_Package
-   *
-   * @brief This class defines operations
-   *        for creating DAnCE component
-   *        package
-   *
-   */
-  class CPK_Packager : public Base_Packager
-  {
-  public:
-    /// constructor
-    CPK_Packager (const char *pkg_url,
-                  const char *cdp_url,
-                  const char *pdl_url,
-                  bool include_std_desc)
-     :Base_Packager (pkg_url, cdp_url, pdl_url, include_std_desc),
-      cpk_file_ (this->pkg_url_) { }
-
-    /// Collect the information for files to be archived
-    int preparePackage (PACKAGE_PLAN &pkg_plan);
-
-    /// Create a zip archive
-    int createPackage (const PACKAGE_PLAN &pkg_plan);
-
-  protected:
-    // A memory buffer to store package description
-    CZipMemFile desc_mf_;
-
-    // The actualy archive in zip format
-    CZipArchive cpk_zip_;
-
-    // String format used by CZipArchive
-    CZipString cpk_file_;
-  };
-
-  // overloaded std::out operator
-  CZipMemFile& operator << (CZipMemFile &mf,
-                            const ACE_TCHAR *str);
-  // overloaded std::out operator
-  CZipMemFile& operator << (CZipMemFile &mf,
-                            const ACE_TString &str);
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CPK_PACKAGE_H */
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/ComponentPackager.mpc b/TAO/CIAO/DAnCE/ComponentPackager/ComponentPackager.mpc
deleted file mode 100644
index e877479af32..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/ComponentPackager.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(ComponentPackager): naming, ciao_server_dnc, xerces, taoexe, ziparchive {
-  exename = Component_Packager
-  requires += exceptions ziparchive
-  after += XSC_Config_Handlers NodeDaemon_stub
-
-  libs     += XSC_Config_Handlers
-  includes += $(CIAO_ROOT)/DAnCE/Config_Handlers
-
-  Source_Files {
-    Component_Packager.cpp
-    CPK_Packager.cpp
-    Base_Packager.cpp
-    PDL_Handler.cpp
-    pdl.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp b/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp
deleted file mode 100644
index 1691a91cded..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "PDL_Handler.h"
-#include "Config_Handlers/XML_Helper.h"
-#include "xercesc/dom/DOM.hpp"
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-  using namespace CIAO::Config_Handlers;
-  using xercesc::DOMDocument;
-
-  PDL_Handler::PDL_Handler ()
-  {
-  }
-
-  PDL_Handler::~PDL_Handler()
-  {
-  }
-
-
-  int 
-  PDL_Handler::process_pdl (const char *pdl_url,
-                   DESC_LIST &desc_list)
-  {
-    //@@ retrieve location information for standard descriptors
-    XML_Helper pdl_helper;
-
-    if (!pdl_helper.is_initialized ())
-      return -1;
-
-    xercesc::DOMDocument* pdl_dom =
-      pdl_helper.create_dom (pdl_url);
-
-    if (!pdl_dom)
-      return -1;
-
-    Package::PackageDescriptorsList list = 
-      Package::packageDescriptorsList (pdl_dom);
-
-    this->get_DescriptorsList (list,
-                               desc_list);
-    return 0;
-  }
-
-  void 
-  PDL_Handler::get_DescriptorsList (Package::PackageDescriptorsList &list,
-                                    DESC_LIST &desc_list)
-  {
-    for (Package::PackageDescriptorsList::desc_const_iterator iter = list.begin_desc ();
-         iter != list.end_desc ();
-         iter++)
-    {
-      ACE_TString value((*iter).c_str ());
-      if (value.length () != 0)
-        desc_list.push_back (value);
-    }
-    return;    
-  }
-
-  }
-}
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.h b/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.h
deleted file mode 100644
index f828b22cd60..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  PDL_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef PDL_HANDLER_H
-#define PDL_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-#include <list>
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "pdl.hpp"
-
-namespace CIAO
-{
-  namespace Component_Packager
-  {
-  /**
-   * @class PDL_Handler
-   *
-   * @brief Handler class for PackageDescriptionList
-   *
-   * This class defines handler methods to parse the
-   * PackageDescriptionList descriptor file
-   */
-  class PDL_Handler
-  {
-  public:
-    typedef std::list<ACE_TString>  DESC_LIST;
-
-    PDL_Handler ();
-    virtual ~PDL_Handler (void);
-
-    /// Process the pdl file and get the descriptors list
-    int process_pdl (const char *pdl_url,
-                     DESC_LIST &desc_list);
-
-    static void get_DescriptorsList (Package::PackageDescriptorsList &list,
-                                     DESC_LIST &desc_list);
-  };
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* PDL_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Package.xsd b/TAO/CIAO/DAnCE/ComponentPackager/Package.xsd
deleted file mode 100644
index 11515bf328e..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/Package.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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:Package="http://www.dre.vanderbilt.edu/Package"
-            targetNamespace="http://www.dre.vanderbilt.edu/Package">
-
-  <xsd:complexType name="PackageDescriptorsList">
-   <xsd:sequence>
-     <xsd:element name="desc" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:element name="packageDescriptorsList" type="Package:PackageDescriptorsList"/>
-
-</xsd:schema>
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/README.html b/TAO/CIAO/DAnCE/ComponentPackager/README.html
deleted file mode 100644
index db235e9ccf0..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/README.html
+++ /dev/null
@@ -1,186 +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 and Installing ComponentPackager</title> 
-		<!-- $Id$  -->
-		<link rev="made" href="mailto:schmidt@cs.wustl.edu">
-	</head>
-	<body style="COLOR: rgb(0,0,0); BACKGROUND-COLOR: rgb(255,255,255)" link="#000fff" vlink="#ff0f0f">
-		<hr>
-		<h3>Building and Using ComponentPackager
-		</h3>
-		<p><span style="FONT-WEIGHT: bold"></span>To successfully build 
-			CIAO::ComponentPackager, you will need ZipArchive, a free zip compression and 
-			decompression library developed by 
-			artpol-software.(http://www.artpol-software.com/) . This file explains how to 
-			set up the building of ZipArchive under different OS platforms such that the 
-			CIAO::ComponentPackager can be compiled successfully. If this file does not 
-			solve all the problems you might encounter compiling ComponentPackager, please 
-			also check out <a href="http://www.artpol-software.com/zipdoc/pageSyst.html">ZipArchive 
-				Compiling and Integration</a>&nbsp; for more information. If you are still 
-			having problems, please feel free to contact me at <A href="mailto:mxiong@dre.vanderbilt.edu">
-				mxiong@dre.vanderbilt.edu</A> .
-			<br>
-		</p>
-		<p>Currently, the ZipArchive version supported by ComponentPackager is 2.4.4. So 
-			unless otherwise specified, please stay with this version. The following 
-			explains how to build ZipArchive under <a href="#Windows">Windows </a>and <a href="#Linux">
-				Linux</a>.<br>
-		</p>
-		<h3><span style="FONT-WEIGHT: bold">Table of&nbsp; Contents</span></h3>
-		<ul>
-			<li>
-				&nbsp;<a href="#Windows">Building under Windows</a>
-			<li>
-				&nbsp;<a href="#Linux">Building under Linux</a>
-			<li>
-				&nbsp;<a href="#Using">Creating packages using ComponentPackager</a></li>
-		</ul>
-		<br>
-		<hr>
-		<h3><a name="Windows">Windows </a>
-		</h3>
-		<p><a name="Windows"> To obtain and build ZipArchive under windows, please do:</a></p>
-		<p><a name="Windows">1. Download the ZipArchive source from </a><a href="http://www.artpol-software.com/cgi-bin/download.cgi?ziparchive.zip">
-				here</a> , unzip it to a local direcoty, e.g. E:\ZipArchive<br>
-			2. Navigate to ZipArchive\Windows directory, copy all the files into 
-			ZipArchive\<br>
-			3. Navigate to ZipArchive\stl directory, copy all the files (except zippie 
-			folder) into ZipArchive\<br>
-			4. Open ZipArchive_STL.dsw, click yes to convert it to solution file.<br>
-			5. Change the output file property of ZipArchive_STL.dsw to \lib\ziparchd.lib 
-			(originally it's \debug\ZipArchive_STL.lib).
-			<br>
-			6. Build the solution, and you should be able to compile the ziparchive.<br>
-			7. Add a environment variable ZIPARCHIVEROOT such that it contains the root 
-			directory of ZipArchive. In this case, it would be E:\ZipArchive<br>
-			<br>
-			Now you should be able to build CIAO:Component_Packager.<br>
-			<br>
-		</p>
-		<hr>
-		<h3><a name="Linux">Linux</a></h3>
-		<a name="Linux">To obtain and build ZipArchive, do:<br>
-			1. Obtains&nbsp; the&nbsp; ZipArchive
-			<br>
-			&nbsp;&nbsp;&nbsp; &gt;wget 
-			http://www.artpol-software.com/cgi-bin/download.cgi?ziparchive.zip<br>
-			<br>
-			2. Create a&nbsp; directory&nbsp; for ziparchive&nbsp; and decompressed the 
-			ziparchive.zip<br>
-			&nbsp;&nbsp; &gt;mkdir ziplib<br>
-			&nbsp;&nbsp; &gt;unzip ziparchive.zip -d ziplib<br>
-			<br>
-			3. Copy the necessary files for linux OS<br>
-			&nbsp;&nbsp; &gt;cd ziplib<br>
-			&nbsp;&nbsp; &gt;cp ./Linux/* .<br>
-			&nbsp;&nbsp; &gt;cp ./stl/* .<br>
-			<br>
-			4. Edit the Makefile in the ./ziplib directory, do the following:<br>
-		</a>
-		<ul>
-			<a name="Linux">
-				<li>
-					&nbsp;&nbsp;&nbsp; uncomment the first OBJSZLIB variable which points to zlib 
-					library object files, and comment the second OBJSZLIB, this step is very 
-					important if you do not want to build zlib separately<br>
-				<li>
-					&nbsp;&nbsp;&nbsp; change prefix to the root directory of ziplib, e.g. 
-					~/ziplib. You may choose not to proceed this step if you would like to install 
-					ZipArchive to system include and library paths.<br>
-			</a></LI>
-		</ul>
-		<a name="Linux">5. Build ZipArchive by typing
-			<span style="FONT-STYLE: italic">make</span><br>
-			6. Install the ZipArchive by typing
-			<span style="FONT-STYLE: italic">make
-install<span style="FONT-STYLE: italic"></span></span>
-		</a>
-		<p><a name="Linux">7. Set up the environment variable
-				<br>
-				&nbsp;&nbsp;&nbsp; If you have installed the ziparchive into the system include 
-				and library paths, you may skip this step. Otherwise, you might want to add an 
-				environment variable ZIPARCHIVEROOT that contains the root directory of the 
-				ZipArchive. For instance, in my ./.bash_profile i have the following entry:<br>
-			</a>
-		</p>
-		<p><a name="Linux">&nbsp;&nbsp;&nbsp; ZIPARCHIVEROOT=~/ziplib<br>
-				&nbsp;&nbsp;&nbsp; export ZIPARCHIVEROOT<br>
-			</a>
-		</p>
-		<p><a name="Linux">Now you should be able to successfully build the 
-				CIAO::Component_Packager.<br>
-			</a>
-		</p>
-		<hr>
-		<h3 name="Using"><a name="Using">Create Component Package using ComponentPackager</a></h3>
-		<P>
-			<a name="Linux">To create a package, ComponentPackager need the 
-				flattened_deploymentplan to obtain the information about component 
-				implementations.  For instance, in the
-                <A HREF="../../docs/tutorials/Quoter/">Quoter
-                example</A>, here are the steps to
-				create a package:<br>
-				<br>
-				(assuming windows platform)<br>
-				1. cd descriptors<br>
-				2. %CIAO_ROOT%/DAnCE/ComponentPackager/Component_Packager.exe -p 
-				flattened_deploymentplan.cdp<br>
-				&nbsp;&nbsp;&nbsp; (2552|3524) Initializing the Xerces runtime
-				<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding description ....[Done]
-				<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				descriptors\flattened_deploymentplan.cdp ....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding implementations\Broker_execd.dll 
-				....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding implementations\Broker_stubd.dll 
-				....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding implementations\Broker_svntd.dll 
-				....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				implementations\Distributor_execd.dll ....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				implementations\Distributor_stubd.dll ....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				implementations\Distributor_svntd.dll ....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				implementations\Stock_Base_stubd.dll ....[Done]<br>
-				&nbsp;&nbsp;&nbsp; ComponentPackager: Adding 
-				implementations\Stock_Base_svntd.dll ....[Done]<br>
-				&nbsp; &nbsp; (2552|3524)[success] The Component Package has been created!<br>
-				<br>
-				Now you will be able to find a ComponentPackager.cpk file under ./descriptors 
-				directory.Note that&nbsp;you can change the output package name by 
-				using&nbsp;-o option, e.g.<br>
-			</a><a name="Linux">&nbsp;%CIAO_ROOT%/DAnCE/ComponentPackager/Component_Packager.exe 
-				-o Quoter.cpk -p flattened_deploymentplan.cdp</a></P>
-		<P><Blockquote><hr>
-				<STRONG>Note: </STRONG>To make sure the package has every implementation 
-				artifact required, including the base library, e.g.Stock_Base_stub, you might 
-				want to check your flattened_deploymentplan to make sure the base libraries are 
-				also included as artifacts in the
-                                implementation descriptions.Please check the Quoter example's 
-				<A HREF="../../docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp">
-                                flattened_deploymentplan.cdp</A> for details.<hr>
-			</Blockquote>
-		If you also want to archive&nbsp;separated descriptors other than 
-		flattened_deploymentplan.cdp (.cid, .cpd, .iad etc ) into your package, you 
-		will need to create a PackageDescriptorsList XML file which specifies what 
-		files to include in your package.&nbsp; There is a sample .pdl file Sample.pdl 
-		in the root directory of&nbsp; ComponentPackager. Please follow the same 
-		pattern to create your own .pdl file. Along with the .pdl file is a standalone 
-		xml schema file package.xsd which you will need to validate Sample.pdl. So make 
-		sure you have this schema file along with the .pdl file you need to use. To 
-		create a package that includes separated descriptors
-		<P></P>
-		<P>
-			1. cd descriptors<br>
-			2. copy %COPY_ROOT%/ComponentPackager/Sample.pdl .\<br>
-			3. copy %COPY_ROOT%/ComponentPackager/Package.xsd .\<br>
-			4. %CIAO_ROOT%/DAnCE/ComponentPackager/Component_Packager.exe -p 
-			flattened_deploymentplan.cdp -i Sample.pdl<br>
-			<br>
-		</P>
-	</body>
-</html>
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Sample.pdl b/TAO/CIAO/DAnCE/ComponentPackager/Sample.pdl
deleted file mode 100644
index 2ec6e496c67..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/Sample.pdl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Package:packageDescriptorsList
- xmlns:Package="http://www.dre.vanderbilt.edu/Package"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.dre.vanderbilt.edu/Package Package.xsd">
-    <desc>package.tpd</desc>
-    <desc>Stock.pcd</desc>
-    <desc>Stock.cid</desc>
-    <desc>Stock.cpd</desc>
-    <desc>Broker.cid</desc>
-    <desc>Broker.ccd</desc>
-    <desc>Broker.cpd</desc>
-    <desc>Broker_Stub.iad</desc>
-    <desc>Broker_Svnt.iad</desc>
-    <desc>Broker_Exec.iad</desc>
-    <desc>Distributor.cid</desc>
-    <desc>Distributor.ccd</desc>
-    <desc>Distributor.cpd</desc>
-    <desc>Distributor_Stub.iad</desc>
-    <desc>Distributor_Svnt.iad</desc>
-    <desc>Distributor_Exec.iad</desc>
-</Package:packageDescriptorsList>
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/pdl.cpp b/TAO/CIAO/DAnCE/ComponentPackager/pdl.cpp
deleted file mode 100644
index 74707fb9149..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/pdl.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/* $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>
- */
-
-#include "pdl.hpp"
-
-
-namespace Package
-{
-  // PackageDescriptorsList
-  // 
-
-  PackageDescriptorsList::
-  PackageDescriptorsList ()
-  :
-  regulator__ ()
-  {
-  }
-
-  PackageDescriptorsList::
-  PackageDescriptorsList (::Package::PackageDescriptorsList const& s)
-  :
-  regulator__ ()
-  {
-    desc_.reserve (s.desc_.size ());
-    {
-      for (desc_const_iterator i (s.desc_.begin ());
-      i != s.desc_.end ();
-      ++i) add_desc (*i);
-    }
-  }
-
-  ::Package::PackageDescriptorsList& PackageDescriptorsList::
-  operator= (::Package::PackageDescriptorsList const& s)
-  {
-    desc_.clear ();
-    desc_.reserve (s.desc_.size ());
-    {
-      for (desc_const_iterator i (s.desc_.begin ());
-      i != s.desc_.end ();
-      ++i) add_desc (*i);
-    }
-
-    return *this;
-  }
-
-
-  // PackageDescriptorsList
-  // 
-  PackageDescriptorsList::desc_iterator PackageDescriptorsList::
-  begin_desc ()
-  {
-    return desc_.begin ();
-  }
-
-  PackageDescriptorsList::desc_iterator PackageDescriptorsList::
-  end_desc ()
-  {
-    return desc_.end ();
-  }
-
-  PackageDescriptorsList::desc_const_iterator PackageDescriptorsList::
-  begin_desc () const
-  {
-    return desc_.begin ();
-  }
-
-  PackageDescriptorsList::desc_const_iterator PackageDescriptorsList::
-  end_desc () const
-  {
-    return desc_.end ();
-  }
-
-  void PackageDescriptorsList::
-  add_desc (::XMLSchema::string< ACE_TCHAR > const& e)
-  {
-    if (desc_.capacity () < desc_.size () + 1)
-    {
-      ::std::vector< ::XMLSchema::string< ACE_TCHAR > > v;
-      v.reserve (desc_.size () + 1);
-
-      while (desc_.size ())
-      {
-        //@@ VC6
-        ::XMLSchema::string< ACE_TCHAR >& t = desc_.back ();
-        t.container (0);
-        v.push_back (t);
-        v.back ().container (this);
-        desc_.pop_back ();
-      }
-
-      desc_.swap (v);
-    }
-
-    desc_.push_back (e);
-    desc_.back ().container (this);
-  }
-}
-
-namespace Package
-{
-  // PackageDescriptorsList
-  //
-
-  PackageDescriptorsList::
-  PackageDescriptorsList (::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 == "desc")
-      {
-        ::XMLSchema::string< ACE_TCHAR > t (e);
-        add_desc (t);
-      }
-
-      else 
-      {
-      }
-    }
-  }
-}
-
-namespace Package
-{
-  ::Package::PackageDescriptorsList
-  packageDescriptorsList (xercesc::DOMDocument const* d)
-  {
-    ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-    if (e.name () == "packageDescriptorsList")
-    {
-      ::Package::PackageDescriptorsList r (e);
-      return r;
-    }
-
-    else
-    {
-      throw 1;
-    }
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/pdl.hpp b/TAO/CIAO/DAnCE/ComponentPackager/pdl.hpp
deleted file mode 100644
index df8f5c3443f..00000000000
--- a/TAO/CIAO/DAnCE/ComponentPackager/pdl.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
-// Fix for Borland compilers, which seem to have a broken
-// <string> include.
-#ifdef __BORLANDC__
-# include <string.h>
-#endif
-
-
-#include "ace/config-all.h"
-
-#ifndef PDL_HPP
-#define PDL_HPP
-
-// Forward declarations.
-//
-namespace Package
-{
-  class PackageDescriptorsList;
-}
-
-#include <memory>
-#include <vector>
-#include <XMLSchema/Types.hpp>
-
-namespace Package
-{
-  class PackageDescriptorsList : public ::XSCRT::Type
-  {
-    //@@ VC6 anathema
-    typedef ::XSCRT::Type Base__;
-
-    // desc
-    // 
-    public:
-    typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::iterator desc_iterator;
-    typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::const_iterator desc_const_iterator;
-    desc_iterator begin_desc ();
-    desc_iterator end_desc ();
-    desc_const_iterator begin_desc () const;
-    desc_const_iterator end_desc () const;
-    void add_desc (::XMLSchema::string< ACE_TCHAR > const& );
-
-    protected:
-    ::std::vector< ::XMLSchema::string< ACE_TCHAR > > desc_;
-
-    public:
-    PackageDescriptorsList ();
-
-    PackageDescriptorsList (::XSCRT::XML::Element< ACE_TCHAR > const&);
-    PackageDescriptorsList (PackageDescriptorsList const& s);
-
-    PackageDescriptorsList&
-    operator= (PackageDescriptorsList const& s);
-
-    private:
-    char regulator__;
-  };
-}
-
-namespace Package
-{
-  ::Package::PackageDescriptorsList
-  packageDescriptorsList (xercesc::DOMDocument const*);
-}
-
-#endif // PDL_HPP
diff --git a/TAO/CIAO/DAnCE/Deployment.xsd b/TAO/CIAO/DAnCE/Deployment.xsd
deleted file mode 100644
index c8a6399730b..00000000000
--- a/TAO/CIAO/DAnCE/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/TAO/CIAO/DAnCE/Deployment.xsd.orig b/TAO/CIAO/DAnCE/Deployment.xsd.orig
deleted file mode 100644
index a59a47f1360..00000000000
--- a/TAO/CIAO/DAnCE/Deployment.xsd.orig
+++ /dev/null
@@ -1,897 +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"/>
-  <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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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="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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element ref="xmi:Extension"/>
-    </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:element name="Deployment">
-  <xsd:complexType>
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element ref="Deployment:Any"/>
-      <xsd:element ref="Deployment:DataType"/>
-      <xsd:element ref="Deployment:DataValue"/>
-      <xsd:element ref="Deployment:EnumType"/>
-      <xsd:element ref="Deployment:ObjrefType"/>
-      <xsd:element ref="Deployment:BoundedStringType"/>
-      <xsd:element ref="Deployment:FixedType"/>
-      <xsd:element ref="Deployment:ArrayType"/>
-      <xsd:element ref="Deployment:SequenceType"/>
-      <xsd:element ref="Deployment:AliasType"/>
-      <xsd:element ref="Deployment:StructType"/>
-      <xsd:element ref="Deployment:StructMemberType"/>
-      <xsd:element ref="Deployment:ValueType"/>
-      <xsd:element ref="Deployment:ValueMemberType"/>
-      <xsd:element ref="Deployment:UnionType"/>
-      <xsd:element ref="Deployment:UnionMemberType"/>
-      <xsd:element ref="Deployment:NamedValue"/>
-      <xsd:element ref="Deployment:Bridge"/>
-      <xsd:element ref="Deployment:Interconnect"/>
-      <xsd:element ref="Deployment:Node"/>
-      <xsd:element ref="Deployment:Resource"/>
-      <xsd:element ref="Deployment:SharedResource"/>
-      <xsd:element ref="Deployment:Domain"/>
-      <xsd:element ref="Deployment:PlanPropertyMapping"/>
-      <xsd:element ref="Deployment:PlanSubcomponentPropertyReference"/>
-      <xsd:element ref="Deployment:PlanSubcomponentPortEndpoint"/>
-      <xsd:element ref="Deployment:PlanConnectionDescription"/>
-      <xsd:element ref="Deployment:InstanceDeploymentDescription"/>
-      <xsd:element ref="Deployment:MonolithicDeploymentDescription"/>
-      <xsd:element ref="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element ref="Deployment:DeploymentPlan"/>
-      <xsd:element ref="Deployment:ResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:InstanceResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:ConnectionResourceDeploymentDescription"/>
-      <xsd:element ref="Deployment:Capability"/>
-      <xsd:element ref="Deployment:ComponentPropertyDescription"/>
-      <xsd:element ref="Deployment:ComponentPortDescription"/>
-      <xsd:element ref="Deployment:ComponentInterfaceDescription"/>
-      <xsd:element ref="Deployment:ImplementationArtifactDescription"/>
-      <xsd:element ref="Deployment:MonolithicImplementationDescription"/>
-      <xsd:element ref="Deployment:AssemblyPropertyMapping"/>
-      <xsd:element ref="Deployment:SubcomponentPropertyReference"/>
-      <xsd:element ref="Deployment:SubcomponentPortEndpoint"/>
-      <xsd:element ref="Deployment:AssemblyConnectionDescription"/>
-      <xsd:element ref="Deployment:SubcomponentInstantiationDescription"/>
-      <xsd:element ref="Deployment:ComponentAssemblyDescription"/>
-      <xsd:element ref="Deployment:ComponentImplementationDescription"/>
-      <xsd:element ref="Deployment:ComponentPackageReference"/>
-      <xsd:element ref="Deployment:ComponentPackageDescription"/>
-      <xsd:element ref="Deployment:PackageConfiguration"/>
-      <xsd:element ref="Deployment:PackagedComponentImplementation"/>
-      <xsd:element ref="Deployment:NamedImplementationArtifact"/>
-      <xsd:element ref="Deployment:ImplementationRequirement"/>
-      <xsd:element ref="Deployment:RequirementSatisfier"/>
-      <xsd:element ref="Deployment:SatisfierProperty"/>
-      <xsd:element ref="Deployment:Requirement"/>
-      <xsd:element ref="Deployment:Property"/>
-      <xsd:element ref="Deployment:ExternalReferenceEndpoint"/>
-      <xsd:element ref="Deployment:ComponentExternalPortEndpoint"/>
-      <xsd:element ref="Deployment:ImplementationDependency"/>
-      <xsd:element ref="Deployment:TopLevelPackageDescription"/>
-      <xsd:element ref="xmi:Extension"/>
-    </xsd:choice>
-    <xsd:attribute ref="xmi:id" use="optional"/>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-  </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index 6b5325e840c..a7123da88b4 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -23,14 +23,14 @@ CIAO::Deployment_Configuration::init (const char *filename)
 
   if (filename == 0)
     {
-      ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp"
+      ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp"
                             ": Unable to identify the file name \n"));
       return -1;
     }
 
   FILE *inf = ACE_OS::fopen (filename, "r");
 
-  if (inf == NULL)
+  if (inf == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "DAnCE (%P|%t) Deployment_Configuration.cpp:"
@@ -48,11 +48,10 @@ CIAO::Deployment_Configuration::init (const char *filename)
       //
       if (this->deployment_info_.bind (destination, ior) != 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                             "Failed to bind destination [%s] : \n",
-                             destination),
-                             -1);
+          ACE_DEBUG ((LM_ERROR,
+                      "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                      "Reuse existing node in the cached map: [%s]\n",
+                      destination));
         }
 
       if (first)
@@ -61,11 +60,12 @@ CIAO::Deployment_Configuration::init (const char *filename)
           first = 0;
         }
     }
+  ACE_OS::fclose (inf);
   return 0;
 }
 
 const char *
-CIAO::Deployment_Configuration::get_node_manager_ior (const char *name)
+CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const
 {
   if (name == 0)
     return get_default_node_manager_ior ();
@@ -88,7 +88,7 @@ CIAO::Deployment_Configuration::get_node_manager_ior (const char *name)
 }
 
 const char *
-CIAO::Deployment_Configuration::get_default_node_manager_ior (void)
+CIAO::Deployment_Configuration::get_default_node_manager_ior (void) const
 {
   if (this->default_node_manager_.IOR_.length () == 0)
     return 0;
@@ -118,14 +118,25 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name
 
   if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
     {
-      CORBA::Object_var temp = this->orb_->string_to_object
-        (entry->int_id_.IOR_.c_str ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_TRY
+        {
 
-      entry->int_id_.node_manager_ =
-        ::Deployment::NodeManager::_narrow (temp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var temp = this->orb_->string_to_object
+                                   (entry->int_id_.IOR_.c_str ()
+                                    ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          entry->int_id_.node_manager_ =
+            ::Deployment::NodeManager::_narrow (temp.in ()
+                                                ACE_ENV_ARG_PARAMETER);
+        }
+      ACE_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp: "
+                      "Error while contacting NodeManager %s\n", name));
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
     }
   return ::Deployment::NodeManager::_duplicate
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index 07fa26df036..f4b828b3f20 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DeploymentC.h"
+#include "ciao/NodeManagerC.h"
 #include "DomainApplicationManager/DomainApplicationManager_Export.h"
 #include "ace/SString.h"
 #include "tao/Valuetype/ValueBase.h"
@@ -82,7 +82,7 @@ namespace CIAO
      * @retval 0 if no valid name were found.  When @c name = 0, then
      * this function behave exactly as get_default_activator_ior.
      */
-    virtual const char *get_node_manager_ior (const char *name);
+    virtual const char *get_node_manager_ior (const char *name) const;
 
     /**
      * Return the default NodeManager the DomainApplicationManager
@@ -92,7 +92,7 @@ namespace CIAO
      *
      * @retval 0 if no valid daemon is configured.
      */
-    virtual const char *get_default_node_manager_ior ();
+    virtual const char *get_default_node_manager_ior () const;
 
     /**
      * @retval nil if no valid name were found.
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index 3e4d270f760..263fb68e16e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -2,14 +2,20 @@
 // $Id$
 
 project (DomainApplicationManager): ciao_deployment_svnt  {
-  after += NodeManager_stub 
   sharedname = DomainApplicationManager
+  after += ExecutionManager_stub
 
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
-  
+
   Source_Files {
     DomainApplicationManager_Impl.cpp
     Deployment_Configuration.cpp
   }
+
+  Header_Files {
+    DomainApplicationManager_Impl.h
+    Deployment_Configuration.h
+    DomainApplicationManager_Export.h
+  }
 }
 
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index da5182be40e..bfa44c5ba6e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
 #include "DomainApplicationManager_Impl.h"
-#include "NodeManager/NodeManagerC.h"
+#include "ExecutionManager/Execution_Manager_Impl.h"
+#include "ciao/NodeApplicationManagerC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
-//#include "DnC_Dump.h"
-//#include "Config_Handlers/RT-CCM/SRD_Handler.h"
-//#include "Config_Handlers/Utils/XML_Helper.h"
-//#include "Config_Handlers/RT-CCM/CIAOServerResources.hpp"
+#include "ace/Assert.h"
 
 #if !defined (__ACE_INLINE__)
 # include "DomainApplicationManager_Impl.inl"
@@ -18,12 +16,14 @@ CIAO::DomainApplicationManager_Impl::
 DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
                                PortableServer::POA_ptr poa,
                                Deployment::TargetManager_ptr manager,
+                               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)),
-    target_manager_ (Deployment::TargetManager::_duplicate (manager)),
+    execution_manager_ (em), // a plain C++ pointer
+    target_manager_ (Deployment::TargetManager::_duplicate (manager)), // object ref
     plan_ (plan),
     num_child_plans_ (0),
   // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet
@@ -36,13 +36,36 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
   // Need to initialize chained artifacts here.
   //
     deployment_file_ (CORBA::string_dup (deployment_file)),
-    deployment_config_ (orb)
+    deployment_config_ (orb),
+    is_redeployment_ (false),
+    esd_ (0)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_NEW_THROW_EX (this->all_connections_,
                     Deployment::Connections (),
                     CORBA::NO_MEMORY ());
+
+  ACE_NEW_THROW_EX (this->shared_,
+                    Deployment::ComponentPlans (),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  ACE_NEW_THROW_EX (this->esd_,
+                    CIAO::DAnCE::EventServiceDeploymentDescriptions (),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK;
+
+  for (CORBA::ULong i = 0; i < this->plan_.infoProperty.length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->plan_.infoProperty[i].name.in (),
+                          "CIAOEvents") != 0)
+        continue;
+
+      // Note, we should do a sanity check here to make
+      // sure we didn't pick up the wrong infoProperty!!
+      this->plan_.infoProperty[0].value >>= this->esd_;
+      break;
+    }
 }
 
 CIAO::DomainApplicationManager_Impl::~DomainApplicationManager_Impl ()
@@ -53,6 +76,32 @@ 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))
+{
+  // Get the NodeApplication object reference.
+  ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+
+  if (this->artifact_map_.find (node_name,
+                                entry) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
+                  "CIAO::DomainApplicationManager_Impl::get_node_app -"
+                  "ERROR while finding the node application "
+                  "for the node [%s] \n",
+                  node_name));
+      ACE_THROW (Deployment::NoSuchName ());
+    }
+
+  return
+    Deployment::NodeApplication::_duplicate (
+      entry->int_id_.node_application_.in ());
+}
+
 void
 CIAO::DomainApplicationManager_Impl::
 init (ACE_ENV_SINGLE_ARG_DECL)
@@ -72,16 +121,16 @@ init (ACE_ENV_SINGLE_ARG_DECL)
       {
         CIAO::DAnCE::ServerResource *sr = 0;
         this->plan_.infoProperty[0].value >>= sr;
-      
+
         Config_Handlers::SRD_Handler reverse_handler (sr);
-          
+
         Config_Handlers::XML_Helper the_helper;
-        xercesc::DOMDocument *the_xsc 
+        xercesc::DOMDocument *the_xsc
               (the_helper.create_dom ("CIAO:ServerResources",
                "http://www.dre.vanderbilt.edu/ServerResources"));
-        
+
         ServerResources (*reverse_handler.srd_xsc (), the_xsc);
-        
+
         // write out the result
         the_helper.write_DOM (the_xsc, "output.srd");
       }
@@ -96,7 +145,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           ACE_ERROR ((LM_ERROR,
                       "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
                       "CIAO::DomainApplicationManager_Impl::init -"
-                      "ERROR while calling get_plan_info () \n"));             
+                      "ERROR while calling get_plan_info () \n"));
           ACE_TRY_THROW (Deployment::PlanError ());
         }
 
@@ -106,11 +155,11 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           ACE_ERROR ((LM_ERROR,
                       "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
                       "CIAO::DomainApplicationManager_Impl::init -"
-                      "ERROR while calling split_plan () \n"));             
+                      "ERROR while calling split_plan () \n"));
           ACE_TRY_THROW (Deployment::PlanError ());
         }
 
-      // Invoke preparePlan for each child deployment plan.
+      // Invoke preparePlan on each NodeManager by giving child plan.
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeManager object reference.
@@ -135,9 +184,6 @@ init (ACE_ENV_SINGLE_ARG_DECL)
 
           Chained_Artifacts & artifacts = entry->int_id_;
 
-          // The dump() function is broken.
-          //Deployment::DnC_Dump::dump (artifacts.child_plan_);
-
           // Call preparePlan() method on the NodeManager with the
           // corresponding child plan as input, which returns a
           // NodeApplicationManager object reference.
@@ -147,7 +193,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           ACE_TRY_CHECK;
 
           Deployment::NodeApplicationManager_var app_manager =
-            Deployment::NodeApplicationManager::_narrow 
+            Deployment::NodeApplicationManager::_narrow
               (tmp_app_manager.in ()
                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -163,9 +209,9 @@ init (ACE_ENV_SINGLE_ARG_DECL)
 
               ACE_CString error ("DomainAppMgr::init () received a nil \
                                  reference for NodeApplicationManager\n");
-              
+
               ACE_DEBUG ((LM_DEBUG, error.c_str ()));
-              ACE_TRY_THROW 
+              ACE_TRY_THROW
                  (Deployment::StartError ("DomainApplicationManager_Impl:init",
                                           error.c_str ()));
             }
@@ -190,7 +236,7 @@ CIAO::DomainApplicationManager_Impl::
 get_plan_info (void)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_plan_info");
-  
+
   // Read the deployment.dat file and get to know the different nodes
   // that are present in the deployment domain.
   // We should be able to replace this way, by parsing the domain
@@ -230,11 +276,13 @@ get_plan_info (void)
   // node_manager_map.
   //
   int num_plans = 0;
+  this->node_manager_names_.clear ();
+
   for (CORBA::ULong index = 0; index < length; index ++)
     {
       bool matched = false;
 
-      const CORBA::ULong number_node_managers = 
+      const CORBA::ULong number_node_managers =
            this->node_manager_names_.size ();
 
       for (CORBA::ULong i = 0; i < number_node_managers; ++i)
@@ -257,13 +305,13 @@ get_plan_info (void)
                (this->plan_.instance [index].node.in ());
 
           if (CORBA::is_nil (mgr.in ()))
-            return 0; /* Failure */
+            return false; /* Failure */
 
           // Add this unique node_name to the list of NodeManager names
           this->node_manager_names_.push_back (this->plan_.instance [index].node.in ());
 
           // Increment the number of plans
-          ++ num_plans;
+          ++num_plans;
         }
     }
 
@@ -295,12 +343,13 @@ split_plan (void)
     ACE_NEW_RETURN (tmp_plan,
                     ::Deployment::DeploymentPlan,
                     0);
-    
-    // Construct the UUID for the child plan.  
+
+    // Construct the UUID for the child plan.
     // Currently, this UUID consists of:
     // The global UUID for the parent plan + the name of the node the
-    // child plan is to be installed on. 
+    // child plan is to be installed on.
     ACE_CString child_uuid (this->plan_.UUID.in ());
+    child_uuid += "@";
     child_uuid += this->node_manager_names_[i];
 
     tmp_plan->UUID = CORBA::string_dup (child_uuid.c_str ());
@@ -328,7 +377,19 @@ split_plan (void)
       this->deployment_config_.get_node_manager
               (this->node_manager_names_[i].c_str ());
 
-    this->artifact_map_.bind (node_manager_names_[i], artifacts);
+    ACE_Hash_Map_Entry
+      <ACE_CString,
+      Chained_Artifacts> *entry = 0;
+
+    if (this->artifact_map_.find
+        (node_manager_names_[i], entry) == 0)
+      artifacts.old_child_plan_ = (entry->int_id_).child_plan_;
+    else
+      artifacts.old_child_plan_ = 0;
+
+    // In case we are doing redeployment, rebind will help replace the
+    // old child plan with the new child plan.
+    this->artifact_map_.rebind (node_manager_names_[i], artifacts);
   }
 
   // (1) Iterate over the <instance> field of the global DeploymentPlan
@@ -337,7 +398,12 @@ split_plan (void)
   //     plans one by one.
   for ( i = 0; i < (this->plan_.instance).length (); ++i)
     {
-      // Fill in the child deployment plan in the map.
+      // @@TODO Fill in the child deployment plan in the map.
+      // If the component instance already exists in the child plan,
+      // then we overwrite the existing instance, since the new instance
+      // might have different resource usage requirements.
+
+
 
       // Get the instance deployment description
       const ::Deployment::InstanceDeploymentDescription & my_instance =
@@ -357,7 +423,7 @@ split_plan (void)
       // Get the child plan.
       ::Deployment::DeploymentPlan_var &child_plan =
           (entry->int_id_).child_plan_;
-      
+
       // Fill in the contents of the child plan entry.
 
       // Append the "MonolithicDeploymentDescriptions implementation"
@@ -427,7 +493,7 @@ add_connections (const Deployment::Connections & incoming_conn)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::add_connections");
 
-  CORBA::ULong old_len = this->all_connections_->length ();
+  CORBA::ULong const old_len = this->all_connections_->length ();
 
   // Expand the length of the <all_connection_> sequence.
   this->all_connections_->length (old_len + incoming_conn.length ());
@@ -455,14 +521,17 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
   ACE_TRY
     {
+      // Clean up all cached connections first
+      this->all_connections_->length (0);
+
       // Invoke startLaunch() operations on each cached NodeApplicationManager
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeApplicationManager object reference.
           ACE_Hash_Map_Entry
             <ACE_CString,
-            Chained_Artifacts> *entry;
-          
+            Chained_Artifacts> *entry = 0;
+
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
             {
@@ -473,19 +542,19 @@ startLaunch (const ::Deployment::Properties & configProperty,
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
+              ACE_CString error
                  ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
-              
-              ACE_TRY_THROW 
-                 (Deployment::StartError 
+
+              ACE_TRY_THROW
+                 (Deployment::StartError
                     ("DomainApplicationManager_Impl:startLaunch",
                      error.c_str ()));
             }
-          
+
           ::Deployment::NodeApplicationManager_ptr my_nam =
             (entry->int_id_).node_application_manager_.in ();
-          
+
           if (CORBA::is_nil (my_nam))
             {
               ACE_ERROR ((LM_ERROR,
@@ -495,13 +564,13 @@ startLaunch (const ::Deployment::Properties & configProperty,
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
+              ACE_CString error
                  ("While starting launch, the DomainApplicationManager\
                   has a nil reference for NodeApplicationManager\n");
               ACE_DEBUG ((LM_DEBUG, error.c_str ()));
-                                     
-              ACE_TRY_THROW 
-                (Deployment::StartError 
+
+              ACE_TRY_THROW
+                (Deployment::StartError
                    ("DomainApplicationManager_Impl::startLaunch",
                      error.c_str ()));
             }
@@ -512,10 +581,28 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
           // Obtained the returned NodeApplication object reference
           // and the returned Connections variable.
-          ::Deployment::Application_var temp_application =
-            my_nam->startLaunch (configProperty,
-                                 retn_connections.out (),
-                                 0);
+          ::Deployment::Application_var temp_application;
+          if (!is_redeployment_)
+            {
+              temp_application =
+                my_nam->startLaunch (configProperty,
+                                     retn_connections.out (),
+                                     0);
+            }
+          else
+            {
+              //=============================================================
+              //                  Add New Components Logic
+              //=============================================================
+              // Let's add new components only now, the to-be-removed
+              // components should be removed AFTER the connections
+              // are removed.
+              temp_application =
+                my_nam->perform_redeployment (configProperty,
+                                              retn_connections.out (),
+                                              true, // add new components only now
+                                              0);
+            }
 
           // Narrow down to NodeApplication object reference
           ::Deployment::NodeApplication_var my_na =
@@ -532,14 +619,14 @@ startLaunch (const ::Deployment::Properties & configProperty,
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
-                ("The DomainApplicationManager receives a nil\
-                 reference of NodeApplication after calling\
-                 startLaunch on NodeApplicationManager.\n");
+              ACE_CString error
+                ("The DomainApplicationManager receives a nil "
+                 "reference of NodeApplication after calling "
+                 "startLaunch on NodeApplicationManager.\n");
               ACE_ERROR ((LM_ERROR, error.c_str ()));
-              
-              ACE_TRY_THROW 
-                (Deployment::StartError 
+
+              ACE_TRY_THROW
+                (Deployment::StartError
                    ("DomainApplicationManager_Impl::startLaunch",
                      error.c_str ()));
             }
@@ -552,6 +639,14 @@ startLaunch (const ::Deployment::Properties & configProperty,
           // the hash table.
           (entry->int_id_).node_application_ = my_na._retn ();
         }
+
+      this->synchronize_shared_components_with_node_managers ();
+    }
+  ACE_CATCH (Deployment::StartError,ex)
+    {
+      ACE_DEBUG ((LM_DEBUG, "DAM_Impl:StartError: %s, %s\n",
+      ex.name.in (),
+      ex.reason.in ()));
     }
   ACE_CATCHANY
     {
@@ -564,9 +659,105 @@ startLaunch (const ::Deployment::Properties & configProperty,
   ACE_CHECK;
 }
 
+
+void
+CIAO::DomainApplicationManager_Impl::
+install_all_es (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      for (CORBA::ULong j = 0; j < this->esd_->length (); ++j)
+        {
+          // Construct the ESInstallationInfos data
+          Deployment::ESInstallationInfos_var es_infos;
+          ACE_NEW (es_infos,
+                   Deployment::ESInstallationInfos);
+
+          es_infos->length (1);
+          (*es_infos)[0].id = this->esd_[j].name.in ();
+          (*es_infos)[0].type = CIAO::RTEC;  //only RTEC is supported so far
+          (*es_infos)[0].svcconf = this->esd_[j].svc_cfg_file.in ();
+
+          // Find NA, and then invoke operation on it
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+
+          if (this->artifact_map_.find (this->esd_[j].node.in (),
+                                        entry) != 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
+                          "CIAO::DomainApplicationManager_Impl::install_all_es -"
+                          "ERROR while finding the node specific plan "
+                          "for the node [%s] \n",
+                           this->esd_[j].node.in ()));
+
+              ACE_CString error
+                ("Unable to resolve a reference to NodeManager: ");
+              error += this->esd_[j].node.in ();
+
+              ACE_TRY_THROW
+                (Deployment::StartError
+                  ("DomainApplicationManager_Impl::install_all_es",
+                    error.c_str ()));
+            }
+
+          // Invoke install_es () operation on each cached NodeApplication object.
+          ::Deployment::NodeApplication_ptr my_na =
+              (entry->int_id_).node_application_.in ();
+
+          ::Deployment::CIAO_Event_Services_var event_services =
+              my_na->install_es (es_infos);
+
+          // Add these returned ES objects into the cached map
+          this->add_es_to_map (es_infos, event_services);
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::post_finishLaunch.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
+add_es_to_map (Deployment::ESInstallationInfos * es_infos,
+               Deployment::CIAO_Event_Services * event_services)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      CORBA::ULong es_length = event_services->length ();
+
+      for (CORBA::ULong i = 0; i < es_length; ++i)
+        {
+          this->es_map_.bind (
+            (*es_infos)[i].id.in (),
+            CIAO::CIAO_Event_Service::_duplicate ((*event_services)[i]));
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::add_es_to_map.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
+
 void
 CIAO::DomainApplicationManager_Impl::
-finishLaunch (::CORBA::Boolean start
+finishLaunch (CORBA::Boolean start,
+              CORBA::Boolean is_ReDaC
               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
@@ -574,7 +765,14 @@ finishLaunch (::CORBA::Boolean start
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::finishLaunch");
   ACE_TRY
     {
+      // Install all the CIAO_Event_Services within the Deployment Plan
+      this->install_all_es ();
+
       // Invoke finishLaunch() operation on each cached NodeApplication object.
+      // This will establish bindings for only those internal components, but
+      // NOT for those external/shared components, which requires special
+      // handling, since these components are outside the control of this
+      // DomainApplicationManager.
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeApplication object reference.
@@ -590,34 +788,40 @@ finishLaunch (::CORBA::Boolean start
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
+              ACE_CString error
                  ("Unable to resolve a reference to NodeManager: ");
               error += this->node_manager_names_[i];
-              
-              ACE_TRY_THROW 
-                (Deployment::StartError 
+
+              ACE_TRY_THROW
+                (Deployment::StartError
                    ("DomainApplicationManager_Impl::finishLaunch",
                      error.c_str ()));
             }
-          
 
           //@@ Note: Don't delete the below debugging helpers.
           // Dump the connections for debug purpose.
           if (CIAO::debug_level () > 9)
             {
-              ACE_DEBUG ((LM_DEBUG, 
+              ACE_DEBUG ((LM_DEBUG,
                  "==============================================\n"));
-              ACE_DEBUG ((LM_DEBUG, 
-                 "dump incoming connections for child plan:%d\n", i));
+              ACE_DEBUG ((LM_DEBUG,
+                 "dump incoming connections for child plan:%s\n",
+                 (entry->int_id_).child_plan_->UUID.in ()));
               dump_connections (this->all_connections_.in ());
-              ACE_DEBUG ((LM_DEBUG, 
+              ACE_DEBUG ((LM_DEBUG,
                   "==============================================\n"));
             }
 
-          // Get the Connections variable.
+          // Get the Connections variable, if ReDaC is true, then we get
+          // those new connections only. NOTE: get_outgoing_connections
+          // by default will get *all* connections.
           Deployment::Connections * my_connections =
-            this->get_outgoing_connections ((entry->int_id_).child_plan_.in ()
-					    ACE_ENV_ARG_PARAMETER);
+            this->get_outgoing_connections (
+              (entry->int_id_).child_plan_.in (),
+              !is_ReDaC,
+              true,  // we search *new* plan
+              DomainApplicationManager_Impl::Internal_Connections
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (my_connections == 0)
@@ -629,34 +833,129 @@ finishLaunch (::CORBA::Boolean start
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_TRY_THROW 
-                (Deployment::StartError 
-                   ("DomainApplicationManager_Impl::finish_launch",
+              ACE_TRY_THROW
+                (Deployment::StartError
+                  ("DomainApplicationManager_Impl::finish_launch",
                     "There was some error establishing connections."));
             }
 
-          Deployment::Connections_var safe (my_connections);
-
           // Dump the connections for debug purpose.
           if (CIAO::debug_level () > 1)
             {
-              ACE_DEBUG ((LM_DEBUG, 
+              ACE_DEBUG ((LM_DEBUG,
                   "==============================================\n"));
-              ACE_DEBUG ((LM_DEBUG, 
-                  "dump outgoing connections for child plan:%d\n", i));
-              dump_connections (safe.in ());
-              ACE_DEBUG ((LM_DEBUG, 
+              ACE_DEBUG ((LM_DEBUG,
+                  "dump outgoing connections for child plan:%s\n",
+                 (entry->int_id_).child_plan_->UUID.in ()));
+              dump_connections (*my_connections);
+              ACE_DEBUG ((LM_DEBUG,
                   "==============================================\n"));
             }
 
           // Invoke finishLaunch() operation on NodeApplication.
-          entry->int_id_.node_application_->finishLaunch 
-             (safe.in (),
-              start
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          if (my_connections->length () != 0)
+            {
+              entry->int_id_.node_application_->finishLaunch
+                 (*my_connections,
+                  start,
+                  true // "true" => establish new connections only
+                  ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+
+          //=============================================================
+          //                  Remove Old Connections Logic
+          //=============================================================
+
+          if (is_ReDaC) // We should also *REMOVE* unnecessary connections
+            {
+              // If this is a brand new child plan, then continue.
+              if ((entry->int_id_).old_child_plan_ == 0)
+                continue;
+
+              // Get all the connections in the old deployment plan
+              Deployment::Connections * connections_in_old_plan =
+                this->get_outgoing_connections (
+                        (entry->int_id_).old_child_plan_.in (),
+                        true, // yes, get *all* the connections
+                        false, // search in the *old* plan
+                        DomainApplicationManager_Impl::Internal_Connections
+                                                      ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              // Pass in the "false" parameter to get *all* the connections in
+              // the new deployment plan, regardless those in old plan
+              Deployment::Connections * connections_in_new_plan =
+                this->get_outgoing_connections (
+                        (entry->int_id_).child_plan_.in (),
+                        true, // yes, get *all* the connections
+                        true,  // search in the *new* plan
+                        DomainApplicationManager_Impl::Internal_Connections
+                                                      ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              Deployment::Connections * unnecessary_connections =
+                this->subtract_connections (*connections_in_old_plan,
+                                            *connections_in_new_plan);
+
+              delete connections_in_old_plan;
+              delete connections_in_new_plan;
+
+              // Dump the connections for debug purpose.
+              if (CIAO::debug_level () > 1)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                      "==============================================\n"));
+                  ACE_DEBUG ((LM_DEBUG,
+                      "dump to-be-removed connections for child plan:%s\n",
+                      (entry->int_id_).child_plan_->UUID.in ()));
+                  dump_connections (*unnecessary_connections);
+                  ACE_DEBUG ((LM_DEBUG,
+                      "==============================================\n"));
+                }
+
+              // Invoke finishLaunch() operation on NodeApplication.
+              if (unnecessary_connections->length () != 0)
+                {
+                  if (CORBA::is_nil (entry->int_id_.node_application_.in ()))
+                    throw Deployment::StartError ();
+
+                  entry->int_id_.node_application_->finishLaunch
+                    (*unnecessary_connections,
+                     start,
+                     false  // false ==> remove unnecessary connections
+                     ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                }
+
+              //=============================================================
+              //                  Remove Old Components
+              //=============================================================
+              // Finally we need to remove those to-be-removed components
+              ::Deployment::Properties_var configProperty;
+              ACE_NEW (configProperty,
+                       Deployment::Properties);
+
+              ::Deployment::Connections_var retn_connections;
+
+              Deployment::Application_var temp_application =
+                entry->int_id_.node_application_manager_->
+                   perform_redeployment (configProperty,
+                                         retn_connections.out (),
+                                         false, // remove old components only
+                                         false);// do not "start"
+            }
         }
+
+      // Establish bindings on external/shared components of this deployment plan.
+      this->post_finishLaunch ();
     }
+  ACE_CATCH (Deployment::StartError, ex)
+    {
+      ACE_ERROR ((LM_ERROR, "DAM_Impl::finishLaunch - StartError: %s, %s\n",
+      ex.name.in (),
+      ex.reason.in ()));
+   }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
@@ -668,16 +967,16 @@ finishLaunch (::CORBA::Boolean start
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeManager and NodeApplicationManager object references.
-          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry;
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry = 0;
           this->artifact_map_.find (this->node_manager_names_[i],entry);
 
-          ::Deployment::NodeApplicationManager_ptr 
+          ::Deployment::NodeApplicationManager_ptr
               my_node_application_manager =
                   (entry->int_id_).node_application_manager_.in ();
 
           // Invoke destoryApplication() operation on the NodeApplicationManger.
           // Since we have the first arg is not used by NAM anyway.
-          my_node_application_manager->destroyApplication 
+          my_node_application_manager->destroyApplication
              (0
               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -691,6 +990,480 @@ finishLaunch (::CORBA::Boolean start
 
 void
 CIAO::DomainApplicationManager_Impl::
+post_finishLaunch (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      // For each "external" component...
+      CORBA::ULong length = this->shared_->length ();
+      for (CORBA::ULong j = 0; j < length; ++j)
+        {
+          // Construct <Component_Binding_Info> struct for the component
+          CIAO::Component_Binding_Info *
+              binding = this->populate_binding_info (
+                this->shared_[j].name.in (),
+                this->shared_[j].plan_uuid.in ());
+
+          // Invoke <finalize_global_binding> on ExecutionManager
+          this->execution_manager_->finalize_global_binding (
+            *binding, true);
+
+          delete binding;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::post_finishLaunch.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
+
+CIAO::Component_Binding_Info *
+CIAO::DomainApplicationManager_Impl::
+populate_binding_info (const ACE_CString& name,
+                       const ACE_CString& child_uuid)
+{
+  CIAO::Component_Binding_Info * retv;
+  ACE_NEW_RETURN (retv,
+                  CIAO::Component_Binding_Info (),
+                  0);
+
+  retv->name_ = name;
+
+  // Parse the child_uuid string and populate the "node" name and "plan_uuid" fields.
+  // Our protocol here is searching for the "@", the substring *before* that is the
+  // global plan uuid, and the substring *after* that is the node name.
+  size_t pos = child_uuid.find ('@');
+
+  retv->plan_uuid_ =
+    child_uuid.substring (0, pos);
+
+  retv->node_ =
+    child_uuid.substring (pos+1, -1); // get the rest of the string
+
+  Deployment::Connections_var connections;
+  ACE_NEW_RETURN (connections,
+                  Deployment::Connections,
+                  0);
+
+  this->get_outgoing_connections_i (name.c_str (),
+                                    connections.inout (),
+                                    false,  // get *all* connections
+                                    true);  // search current plan
+
+  retv->providedReference_ = connections._retn ();
+
+  return retv;
+}
+
+CIAO::Component_Binding_Info *
+CIAO::DomainApplicationManager_Impl::
+populate_binding_info (const ACE_CString& name)
+{
+  CIAO::Component_Binding_Info * retv;
+  ACE_NEW_RETURN (retv,
+                  CIAO::Component_Binding_Info (),
+                  0);
+
+  // Looking for the child plan uuid through the shared compoonent list
+  for (CORBA::ULong i = 0; i < this->shared_->length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->shared_[i].name.in (),
+                          name.c_str ()) == 0)
+        {
+          ACE_CString child_uuid = this->shared_[i].plan_uuid.in ();
+          retv = this->populate_binding_info (name, child_uuid);
+          return retv;
+        }
+    }
+
+  return 0; // If no matching is found (should never happen).
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
+add_shared_components (const Deployment::ComponentPlans & shared)
+{
+  for (CORBA::ULong i = 0; i < shared.length (); ++i)
+    {
+      CORBA::ULong curr_len = this->shared_->length ();
+      this->shared_->length (curr_len + 1);
+      this->shared_[curr_len] = shared[i];
+    }
+}
+
+bool
+CIAO::DomainApplicationManager_Impl::
+is_shared_component (const char * name)
+{
+  for (CORBA::ULong i = 0; i < this->shared_->length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->shared_[i].name.in (),
+                          name) == 0)
+        return true;
+    }
+
+  return false;
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
+synchronize_shared_components_with_node_managers (void)
+{
+  for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+    {
+      // Get the NodeManager object reference.
+      ACE_Hash_Map_Entry
+        <ACE_CString,
+        Chained_Artifacts> *entry = 0;
+
+      if (this->artifact_map_.find (this->node_manager_names_[i],
+                                    entry) != 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
+                      "CIAO::DomainApplicationManager_Impl::startLaunch -"
+                      "ERROR while finding the node specific plan "
+                      "for the node [%s] \n",
+                      this->node_manager_names_[i].c_str ()));
+
+          ACE_CString error
+              ("Unable to resolve a reference to node manager: ");
+          error += this->node_manager_names_[i];
+
+          ACE_TRY_THROW
+              (Deployment::StartError
+                ("DomainApplicationManager_Impl:startLaunch",
+                  error.c_str ()));
+        }
+
+      // Update the shared components  list
+      ::Deployment::NodeManager_ptr
+          my_node_manager = (entry->int_id_).node_manager_.in ();
+
+      Deployment::ComponentPlans_var
+        shared = my_node_manager->get_shared_components ();
+
+      this->add_shared_components (shared.in ());
+    }
+}
+
+
+Deployment::Connections *
+CIAO::DomainApplicationManager_Impl::
+get_outgoing_connections (const Deployment::DeploymentPlan &plan,
+                          bool is_getting_all_connections,
+                          bool is_search_new_plan,
+                          Connection_Search_Type t
+                          ACE_ENV_ARG_DECL)
+{
+  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outgoing_connections");
+  Deployment::Connections_var connections;
+  ACE_NEW_RETURN (connections,
+                  Deployment::Connections,
+                  0);
+
+  // For each component instance in the child plan ...
+  CORBA::ULong number = plan.instance.length ();
+  for (CORBA::ULong i = 0; i < number; ++i)
+  {
+
+    if (t == Internal_Connections &&
+        this->is_shared_component (plan.instance[i].name.in ()))
+      continue;
+
+    // Get the outgoing connections of the component
+    if (!get_outgoing_connections_i (plan.instance[i].name.in (),
+                                     connections.inout (),
+                                     is_getting_all_connections,
+                                     is_search_new_plan
+                                     ACE_ENV_ARG_PARAMETER))
+      return 0;
+  }
+  return connections._retn ();
+}
+
+
+// Get outgoing connections for particular instance
+bool
+CIAO::DomainApplicationManager_Impl::
+get_outgoing_connections_i (const char * instname,
+                            Deployment::Connections & retv,
+                            bool is_getting_all_connections,
+                            bool is_search_new_plan
+                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((Deployment::StartError))
+{
+  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i");
+
+  Deployment::DeploymentPlan tmp_plan;
+  if (is_search_new_plan)
+    tmp_plan = this->plan_;
+  else
+    tmp_plan = this->old_plan_;
+
+  // Search for all the bindings in the plan.
+  const CORBA::ULong total_length = tmp_plan.connection.length();
+  for (CORBA::ULong i = 0; i < total_length; ++i)
+    {
+      // Current binding that we are looking at.
+      const Deployment::PlanConnectionDescription & binding =
+        tmp_plan.connection[i];
+
+      // If this is a ReDaC case, then we ignore the connection if it
+      // already exists in the old_plan
+      if (already_exists (binding) &&
+          !is_getting_all_connections)
+        continue;
+
+      this->populate_connection_for_binding (instname,
+                                             binding,
+                                             tmp_plan,
+                                             retv);
+    }
+  return true;
+}
+
+// Search the current binding to see whether a connection of this
+// component needs to be populated
+bool
+CIAO::DomainApplicationManager_Impl::
+populate_connection_for_binding (
+     const char * instname,
+     const Deployment::PlanConnectionDescription & binding,
+     const Deployment::DeploymentPlan & plan,
+     Deployment::Connections & retv)
+  ACE_THROW_SPEC ((Deployment::StartError))
+{
+  const CORBA::ULong binding_len = binding.internalEndpoint.length ();
+
+  // If only 1 internalEndpoint, then we know it's through event service.
+  if (binding_len == 1)
+    {
+      return
+        this->handle_es_connection (instname,
+                                    binding,
+                                    plan,
+                                    retv);
+    }
+  else if (binding_len == 2)
+    {
+      return this->handle_direct_connection (instname,
+                                             binding,
+                                             plan,
+                                             retv);
+    }
+  else // invalid binding encounted...
+    return false;
+}
+
+bool
+CIAO::DomainApplicationManager_Impl::
+handle_es_connection (
+     const char * instname,
+     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 ();
+
+  const Deployment::PlanSubcomponentPortEndpoint & endpoint =
+    binding.internalEndpoint[0];
+
+  // If the instance name does NOT match one of the names in the binding
+  // Then thsi binding has nothing related to myself (an instance)
+  if (ACE_OS::strcmp (instname,
+                      plan.instance[endpoint.instanceRef].name.in ()) != 0)
+    return false;
+
+  if (binding.externalReference.length () != 1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
+                  "CIAO::DomainApplicationManager_Impl::"
+                  "handle_publisher_es_connection -"
+                  "externalReference must have length of 1.\n"));
+      return false;
+    }
+
+  retv.length (len+1);
+  retv[len].instanceName = instname;
+  retv[len].portName = endpoint.portName.in ();
+  retv[len].kind = endpoint.kind;
+
+  ACE_CString es_id = binding.externalReference[0].location.in ();
+
+  retv[len].endpointInstanceName = es_id.c_str ();
+  retv[len].endpointPortName = "CIAO_ES";
+
+  // We need to populate the actual filter and store it into
+  // the <connection.config> field
+  if (binding.deployRequirement.length () != 0)
+    {
+      retv[len].config =
+        this->get_connection_QoS_configuration (binding.deployRequirement[0]);
+    }
+
+  // If we didnt find the objref of the connection ...
+  CIAO::CIAO_Event_Service_var es;
+
+  if (this->es_map_.find (es_id.c_str (), es) != 0)
+    {
+      ACE_CString error ("Creating connections for ");
+      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);
+    }
+
+  retv[len].event_service = es._retn ();
+
+  // One more thing needs to be done if this is a es_consumer connection
+  // We need to populate the <endpoint> field of this connection, which
+  // is the object reference of this event consumer port.
+  if (endpoint.kind == Deployment::EventConsumer)
+    {
+      // Now we search in the received connections to get the objRef of event sink
+      bool found = false;
+      const CORBA::ULong all_conn_len = this->all_connections_->length ();
+      for (CORBA::ULong j = 0; j < all_conn_len; ++j)
+        {
+          const Deployment::Connection & curr_recv_conn =
+              this->all_connections_[j];
+
+          // We need to look at the instance name and the port name to confirm.
+          if (ACE_OS::strcmp (curr_recv_conn.instanceName.in (),
+                              instname) == 0 &&
+              ACE_OS::strcmp (curr_recv_conn.portName.in (),
+                              endpoint.portName.in ()) == 0)
+            {
+              retv[len].endpoint =
+                  CORBA::Object::_duplicate(curr_recv_conn.endpoint.in ());
+              found = true;
+            }
+        } // End of searching received connections
+
+      if (!found)
+        {
+          ACE_CString error ("Creating connections for ");
+          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);
+        }
+    }
+
+  return true;
+}
+
+bool
+CIAO::DomainApplicationManager_Impl::
+handle_direct_connection (
+     const char * instname,
+     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 ();
+
+  const CORBA::ULong binding_len = binding.internalEndpoint.length ();
+  for (CORBA::ULong i = 0; i < binding_len; ++i)
+    {
+      const Deployment::PlanSubcomponentPortEndpoint & endpoint =
+        binding.internalEndpoint[i];
+
+      // If the instance name does NOT match one of the names in the binding
+      if (ACE_OS::strcmp (instname,
+                          plan.instance[endpoint.instanceRef].name.in ()) != 0)
+        continue;
+
+      // We are only interested when we are the "client" of the endpoint objref
+      if (endpoint.kind == Deployment::EventPublisher ||
+          endpoint.kind == Deployment::EventEmitter ||
+          endpoint.kind == Deployment::SimplexReceptacle ||
+          endpoint.kind == Deployment::MultiplexReceptacle )
+        {
+          // Obtain the index of the "real" endpoint which has an objref. It
+          // is the opposite side of myself.
+          CORBA::ULong e_index = (i + 1) % 2;
+
+          ACE_CString source_port =
+            binding.internalEndpoint[i].portName.in ();
+
+          ACE_CString endpoint_inst =
+            plan.instance[binding.internalEndpoint[e_index]
+              .instanceRef].name.in ();
+
+          ACE_CString endpoint_port =
+            binding.internalEndpoint[e_index].portName.in ();
+
+          bool found = false;
+
+          // Now we search in the received connections to get the objRef.
+          const CORBA::ULong all_conn_len = this->all_connections_->length ();
+          for (CORBA::ULong j = 0; j < all_conn_len; ++j)
+            {
+              const Deployment::Connection & curr_recv_conn =
+                  this->all_connections_[j];
+
+              // We need to look at the instance name and the port name to confirm.
+              if (ACE_OS::strcmp (curr_recv_conn.instanceName.in (),
+                                  endpoint_inst.c_str ()) == 0 &&
+                  ACE_OS::strcmp (curr_recv_conn.portName.in (),
+                                  endpoint_port.c_str ()) == 0)
+                  {
+                    retv.length (len+1);
+                    retv[len].instanceName = instname;
+                    retv[len].portName = source_port.c_str ();
+                    retv[len].endpointInstanceName = endpoint_inst.c_str ();
+                    retv[len].endpointPortName = endpoint_port.c_str ();
+
+                    retv[len].endpoint =
+                      CORBA::Object::_duplicate(curr_recv_conn.endpoint.in ());
+                    retv[len].kind = binding.internalEndpoint[i].kind;
+
+                    ++len;
+                    found = true;
+                    break;
+                  }
+              } // End of searching received connections
+
+          // We didnt find the objref of the connection ...
+          if (!found)
+            {
+              ACE_CString error ("Creating connections for ");
+              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);
+            }
+          break;
+        }
+    }
+  return true;
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
 start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Deployment::StartError))
@@ -716,11 +1489,11 @@ start (ACE_ENV_SINGLE_ARG_DECL)
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
+              ACE_CString error
                 ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
-              
-              ACE_TRY_THROW (Deployment::StartError 
+
+              ACE_TRY_THROW (Deployment::StartError
                 ("DomainApplicationManager_Impl:startLaunch",
                   error.c_str ()));
             }
@@ -757,8 +1530,8 @@ start (ACE_ENV_SINGLE_ARG_DECL)
           my_na->start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-      
-     // Invoke ciao_postctivate () operation on each 
+
+     // Invoke ciao_postctivate () operation on each
      // cached NodeApplication object.
 
       for (i = 0; i < this->num_child_plans_; ++i)
@@ -776,11 +1549,11 @@ start (ACE_ENV_SINGLE_ARG_DECL)
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_CString error 
+              ACE_CString error
                 ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
-              
-              ACE_TRY_THROW (Deployment::StartError 
+
+              ACE_TRY_THROW (Deployment::StartError
                   ("DomainApplicationManager_Impl:startLaunch",
                     error.c_str ()));
             }
@@ -812,65 +1585,124 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication");
   ACE_TRY
     {
-      CORBA::ULong i;
+      // Passivate shared components also, which should delegate to EM to handle
+      this->passivate_shared_components ();
 
-      // Invoke ciao_passivate () operation on each cached NodeApplication object.
-      for (i = 0; i < this->num_child_plans_; ++i)
+      // Passivate all components associated with the plan
+      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
-          // Get the NodeApplication object references.
-          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)
             {
               ACE_ERROR ((LM_ERROR,
                           "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
-                    "CIAO::DomainApplicationManager_Impl::destroyApplication -"
+                          "CIAO::DomainApplicationManager_Impl::destroyApplication -"
                           "ERROR while finding the node specific plan "
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_TRY_THROW (Deployment::StopError ());
+              ACE_CString error
+                 ("Unable to resolve a reference to NodeManager: ");
+              error += this->node_manager_names_[i];
+
+              ACE_TRY_THROW
+                (Deployment::StopError
+                   ("DomainApplicationManager_Impl::destroyApplication",
+                     error.c_str ()));
             }
-          
+      ACE_DEBUG ((LM_DEBUG, "DAM_Impl: Invoking passivate on %s\n",
+                  this->node_manager_names_[i].c_str ()));
+
+          // Invoke ciao_passivate () operation on each cached NodeApplication object.
           ::Deployment::NodeApplication_ptr my_na =
               (entry->int_id_).node_application_.in ();
 
           my_na->ciao_passivate ();
-          ACE_TRY_CHECK;
         }
 
-      // Invoke destroyManager() operation on each cached
-      // NodeManager object.
-      for (i = 0; i < this->num_child_plans_; ++i)
+      // Remove all connections associated with the plan
+      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
-          // Get the NodeManager and NodeApplicationManager object references.
-          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)
+          this->artifact_map_.find (this->node_manager_names_[i], entry);
+
+          Deployment::Connections_var connections =
+            this->get_outgoing_connections (
+              (entry->int_id_).child_plan_.in (),
+              true,  // yes, get *all* the connections
+              true,  // yes, we search the current plan
+              DomainApplicationManager_Impl::External_Connections
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          // Invoke finishLaunch() on NodeApplication to remove bindings.
+          // If this NodeApplication is not within the control of this DAM,
+          // then we should delegate the call to the correct DAM through EM.
+
+          // Iterave over the returned connection list in <connections>,
+          // (1) If this is a shared component, then we remove this connection
+          //     from <connections> list, and then populate a "Component_Binding_Info"
+          //     struct for it and send to EM for remove.
+          // (2) For the rest of the connections, we send them to the NAs
+          //     managed by the local DAM to remove.
+
+          for (CORBA::ULong j = 0; j < connections->length (); ++j)
             {
-              ACE_ERROR ((LM_ERROR,
-                          "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
-                    "CIAO::DomainApplicationManager_Impl::destroyApplication -"
-                          "ERROR while finding the node specific plan "
-                          "for the node [%s] \n",
-                          this->node_manager_names_[i].c_str ()));
+              if (this->is_shared_component (connections[j].instanceName.in ()))
+                {
+                  // ask EM to remove the binding for us
+                  ACE_CString inst_name = connections[j].instanceName.in ();
+                  CIAO::Component_Binding_Info *
+                    binding = this->populate_binding_info (inst_name.c_str ());
+
+                  this->execution_manager_->finalize_global_binding (
+                    *binding, false);
+
+                  // Remove all the connections whose "source" component
+                  // is this component instance from the <connections> list
+                  this->purge_connections (connections,
+                                           inst_name.c_str ());
+                }
+            }
 
-              ACE_TRY_THROW (Deployment::StopError ());
+          if (connections->length () > 0)
+            {
+              entry->int_id_.node_application_->finishLaunch
+                (connections.in (),
+                 true, // "true" ==> start the components
+                 false // "false" => remove connections
+                 ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
             }
 
-          ::Deployment::NodeApplicationManager_ptr 
-              my_node_application_manager =
-                  (entry->int_id_).node_application_manager_.in ();
+        }
 
-          // Invoke destoryApplication() operation on the NodeApplicationManger.
-          // Since we have the first arg is not used by NAM anyway.
-          my_node_application_manager->destroyApplication 
-              (0
-               ACE_ENV_ARG_PARAMETER);
+      // After all the connections are removed, we actually destroy
+      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+        {
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+
+          this->artifact_map_.find (this->node_manager_names_[i], entry);
+
+          // Invoke destroyPlan() operation on the NodeManager
+          Deployment::NodeManager_var
+              my_node_manager = (entry->int_id_).node_manager_;
+
+          my_node_manager->destroyPlan ((entry->int_id_).child_plan_
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
+
+      // ??
+      // Shall we invoke destroyManager () operation on the NodeManager, since we need
+      // to clean up all the NodeApplicationManagers associated with this deployment
+      // plan (one NodeApplicationManager per Node per plan).
+
+      // We should again activate those shared components
+      this->activate_shared_components ();
     }
   ACE_CATCHANY
     {
@@ -897,7 +1729,7 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
           // Get the NodeManager and NodeApplicationManager object references.
           ACE_Hash_Map_Entry
             <ACE_CString,
-            Chained_Artifacts> *entry;
+            Chained_Artifacts> *entry = 0;
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
@@ -905,10 +1737,10 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
 
           ::Deployment::NodeManager_var my_node_manager =
              (entry->int_id_).node_manager_;
-          
-          ::Deployment::NodeApplicationManager_var my_nam = 
+
+          ::Deployment::NodeApplicationManager_var my_nam =
               (entry->int_id_).node_application_manager_;
-          
+
           my_node_manager->destroyManager (my_nam.in ()
                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -925,6 +1757,67 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
+void
+CIAO::DomainApplicationManager_Impl::
+perform_redeployment (
+  const Deployment::DeploymentPlan & plan
+  ACE_ENV_ARG_DECL)
+  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,
+  // which allows the user to specify the new NodeManagerMap data file.
+  this->old_plan_ = this->plan_;
+  this->is_redeployment_ = true;
+  this->plan_ = plan;
+
+  ACE_TRY
+    {
+      // Call init() on the myself, which will validate/split the plan and
+      // call preparePlan on each NodeManager, by this, we shall get
+      // all the object references of NM and NAM associated with each
+      // component instance populated.
+      this->init ();
+
+      // Call startLaunch on each NM for each child plan, this should not only
+      // install all the new components specified, but should also remove
+      // the components that are no longer in the new deployment plan.
+      // Meanwhile, we should set up the container configurations appropriately,
+      // whose information is fully captured in the node-level deployment plan.
+      ::Deployment::Properties_var properties;
+      ACE_NEW (properties,
+               Deployment::Properties);
+
+      this->startLaunch (properties.in (), false);
+
+      // finishLaunch will (1) establish new connections, and (2)
+      // get rid of those non-existing connections. As we know, in the
+      // node level, the connections are cached within the NodeApplication *and*
+      // Container, then we should modify the implementation of the
+      // <finishLaunch> on the NodeApplication to accomplish this.
+      this->finishLaunch (true, true);  // true means start activation also.
+                                        // ture means "ReDaC" is desired
+
+      this->start ();
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::perform_redeployment\t\n");
+      this->plan_ = this->old_plan_;
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+}
+
+
 // Returns the DeploymentPlan associated with this ApplicationManager.
 ::Deployment::DeploymentPlan *
 CIAO::DomainApplicationManager_Impl::
@@ -942,187 +1835,278 @@ getPlan (ACE_ENV_SINGLE_ARG_DECL)
   return plan._retn ();
 }
 
-Deployment::Connections *
+void
 CIAO::DomainApplicationManager_Impl::
-get_outgoing_connections (const Deployment::DeploymentPlan &plan
-			  ACE_ENV_ARG_DECL)
+dump_connections (const ::Deployment::Connections & connections)
 {
-  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outgoing_connections");
-  Deployment::Connections_var connections;
-  ACE_NEW_RETURN (connections,
-                  Deployment::Connections,
-                  0);
+  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::dump_connections");
+  const CORBA::ULong conn_len = connections.length ();
+  for (CORBA::ULong i = 0; i < conn_len; ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "instanceName: %s\n", connections[i].instanceName.in ()));
 
-  // For each component instance in the child plan ...
-  for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
-  {
-    // Get the component instance name
-    if (!get_outgoing_connections_i (plan.instance[i].name.in (),
-                                     connections.inout ()
-				     ACE_ENV_ARG_PARAMETER))
-      return 0;
-  }
-  return connections._retn ();
+      ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connections[i].portName.in ()));
+
+      ACE_DEBUG ((LM_DEBUG, "portkind: "));
+
+      switch (connections[i].kind)
+        {
+          case Deployment::Facet:
+
+            ACE_DEBUG ((LM_DEBUG, "Facet\n"));
+            break;
+
+          case Deployment::SimplexReceptacle:
+
+            ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n"));
+            break;
+
+          case Deployment::MultiplexReceptacle:
+
+            ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n"));
+            break;
+
+          case Deployment::EventEmitter:
+
+            ACE_DEBUG ((LM_DEBUG, "EventEmitter\n"));
+            break;
+
+          case Deployment::EventPublisher:
+
+            ACE_DEBUG ((LM_DEBUG, "EventPublisher\n"));
+            break;
+
+          case Deployment::EventConsumer:
+
+            ACE_DEBUG ((LM_DEBUG, "EventConsumer\n"));
+            break;
+
+          case Deployment::rtecEventPublisher:
+
+            ACE_DEBUG ((LM_DEBUG, "rtecEventPublisher\n"));
+            break;
+
+          case Deployment::rtecEventConsumer:
+
+            ACE_DEBUG ((LM_DEBUG, "rtecEventConsumer\n"));
+            break;
+
+        default:
+          ACE_DEBUG ((LM_DEBUG, "Unknown port kind.\n"));
+        }
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "endpointInstanceName: %s\n",
+                  connections[i].endpointInstanceName.in ()));
+
+      ACE_DEBUG ((LM_DEBUG,
+                 "endpointPortName: %s\n",
+                 connections[i].endpointPortName.in ()));
+      ACE_DEBUG ((LM_DEBUG, "---------------------\n"));
+    }
 }
 
 bool
 CIAO::DomainApplicationManager_Impl::
-get_outgoing_connections_i (const char * instname,
-                            Deployment::Connections & retv
-			    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((Deployment::StartError))
+already_exists (const Deployment::PlanConnectionDescription & conn)
 {
-  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i");
-
-  // Search in all the connections in the plan.
-  for (CORBA::ULong i = 0; i < this->plan_.connection.length(); ++i)
-  {
-    CORBA::ULong len = retv.length ();
-
-    // Current connection that we are looking at.
-    const Deployment::PlanConnectionDescription & curr_conn =
-      this->plan_.connection[i];
-
-    //The modeling tool should make sure there are always 2 endpoints
-    //in a connection.
-    const CORBA::ULong curr_conn_len = curr_conn.internalEndpoint.length ();
-    for (CORBA::ULong p_index = 0;
-         p_index < curr_conn_len;
-         ++p_index)
+  const CORBA::ULong conn_len = this->old_plan_.connection.length();
+  for(CORBA::ULong i = 0; i < conn_len; ++i)
     {
-      const Deployment::PlanSubcomponentPortEndpoint & endpoint =
-        curr_conn.internalEndpoint[p_index];
-
-      // If the component name matches the name of one of the
-      // endpoints in the connection.
-      if (ACE_OS::strcmp (this->plan_.instance[endpoint.instanceRef].name.in (),
-                          instname) == 0 )
-      {
-        //Look at the port kind to make sure it's what we are interested in.
-        if (endpoint.kind != Deployment::Facet &&
-            endpoint.kind != Deployment::EventConsumer)
-          {
-            // The other endpoints in this connection is what we want.
-            CORBA::ULong index = (p_index +1)%2;
-
-            //Cache the name of the other component for later usage (search).
-            ACE_CString name =
-              this->plan_.instance[curr_conn.internalEndpoint[index].
-                 instanceRef].name.in ();
-
-            // Cache the name of the port from the 
-            // other component for searching later.
-
-            ACE_CString port_name =
-              curr_conn.internalEndpoint[index].portName.in ();
-            
-            ACE_DEBUG ((LM_ERROR, "Looking: %s,%s \n",
-                        name.c_str (),
-                        port_name.c_str ()));
-            
-            bool found = false;
-
-            // Now we have to search in the received 
-            // connections to get the objRef.
-
-            const CORBA::ULong all_conn_len = this->all_connections_->length ();
-            for (CORBA::ULong conn_index = 0;
-                conn_index < all_conn_len;
-                ++conn_index)
-              {
-                const Deployment::Connection curr_rev_conn = 
-                    this->all_connections_[conn_index];
-
-                // We need to look at the instance name and the 
-                // port name to confirm.
-                if (ACE_OS::strcmp (curr_rev_conn.instanceName.in (),
-                                    name.c_str ()) == 0 &&
-                    ACE_OS::strcmp (curr_rev_conn.portName.in (),
-                                    port_name.c_str ()) == 0)
-                  {
-                    //ACE_DEBUG ((LM_DEBUG, "step5\n"));
+      if (ACE_OS::strcmp (this->old_plan_.connection[i].name.in (),
+                          conn.name.in ()) == 0)
+        return true;
+    }
 
-                    retv.length (len+1);
-                    retv[len].instanceName = instname;
-                    retv[len].portName = endpoint.portName.in ();
-                    retv[len].kind = endpoint.kind;
-                    retv[len].endpoint = 
-                       CORBA::Object::_duplicate(curr_rev_conn.endpoint.in ());
-                    ++len;
-                    found = true;
-                    break;
-                  }
-              }
+  return false;
+}
 
-              // We didnt find the counter part connection even 
-              // we are sure there must be 1.
+Deployment::Connections *
+CIAO::DomainApplicationManager_Impl::
+subtract_connections (const Deployment::Connections & left,
+                      const Deployment::Connections & right)
+{
+  Deployment::Connections_var retv;
+  ACE_NEW_RETURN (retv,
+                  Deployment::Connections,
+                  0);
 
-              if (!found) 
-                {
-                  ACE_CString error ("Creating connections for ");
-                  error += instname;
-                  error += ": unable to find object reference for connection ";
-                  error += curr_conn.name.in ();
-                  ACE_THROW_RETURN (Deployment::StartError 
-                    ("DomainApplicationManager_Impl::create_connections_i",
-		      error.c_str ()),
-		      false);
-                }
-                  
+  CORBA::ULong left_length = left.length ();
+  CORBA::ULong right_length = right.length ();
+  for (CORBA::ULong i = 0; i < left_length; ++i)
+    {
+      bool found = false;
+      for (CORBA::ULong j = 0; j < right_length; ++j)
+        {
+          if (ACE_OS::strcmp (left[i].instanceName.in (),
+                              right[j].instanceName.in ()) == 0 &&
+              ACE_OS::strcmp (left[i].portName.in (),
+                              right[j].portName.in ()) == 0 &&
+              left[i].kind == right[j].kind &&
+              left[i].endpoint->_is_equivalent (right[j].endpoint.in ()))
+            {
+              found = true;
               break;
+            }
+        }
+
+        if (!found)
+          {
+            CORBA::ULong curr_length = retv->length ();
+            retv->length (curr_length + 1);
+            retv[curr_length] = left[i];
           }
-      }
     }
-  }
-  return 1;
+  return retv._retn ();
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
-dump_connections (const ::Deployment::Connections & connections)
+passivate_shared_components (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
 {
-  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::dump_connections");
-  const CORBA::ULong conn_len = connections.length ();
-  for (CORBA::ULong i = 0; i < conn_len; ++i)
-  {
-    ACE_DEBUG ((LM_DEBUG, 
-                "instanceName: %s\n", connections[i].instanceName.in ()));
+  ACE_TRY
+    {
+      // For each "external" component...
+      CORBA::ULong length = this->shared_->length ();
+      for (CORBA::ULong j = 0; j < length; ++j)
+        {
+          // Construct <Component_Binding_Info> struct for the component
+          CIAO::Component_Binding_Info *
+              binding = this->populate_binding_info (
+                this->shared_[j].name.in (),
+                this->shared_[j].plan_uuid.in ());
+
+          // Invoke <finalize_global_binding> on ExecutionManager
+          this->execution_manager_->passivate_shared_components (
+            *binding);
+
+          delete binding;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::passivate_shared_components.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
 
-    ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connections[i].portName.in ()));
+  ACE_CHECK;
+}
 
-    ACE_DEBUG ((LM_DEBUG, "portkind: "));
+void
+CIAO::DomainApplicationManager_Impl::
+activate_shared_components (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      // For each "external" component...
+      CORBA::ULong length = this->shared_->length ();
+      for (CORBA::ULong j = 0; j < length; ++j)
+        {
+          // Construct <Component_Binding_Info> struct for the component
+          CIAO::Component_Binding_Info *
+              binding = this->populate_binding_info (
+                this->shared_[j].name.in (),
+                this->shared_[j].plan_uuid.in ());
 
-    switch (connections[i].kind) 
-      {
-        case Deployment::Facet: 
+          // Invoke <finalize_global_binding> on ExecutionManager
+          this->execution_manager_->activate_shared_components (
+            *binding);
+
+          delete binding;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::activate_shared_components.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
 
-           ACE_DEBUG ((LM_DEBUG, "Facet\n")); 
-           break;
+  ACE_CHECK;
+}
 
-        case Deployment::SimplexReceptacle: 
+void
+CIAO::DomainApplicationManager_Impl::
+purge_connections (Deployment::Connections_var & connections,
+                   const char * inst)
+{
+  CORBA::ULong total_len = connections->length ();
 
-           ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); 
-           break;
+  for (CORBA::ULong i = 0; i < total_len; ++i)
+    {
+      bool found = false;
 
-        case Deployment::MultiplexReceptacle: 
+      // Remove all the connections whose "source" component
+      // name is <inst>
+      if (ACE_OS::strcmp (connections[i].instanceName.in (),
+                          inst) == 0)
+        {
+          found = true;
 
-           ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); 
-           break;
+          for (CORBA::ULong j = i; j < total_len - 1; ++j)
+            {
+              connections[j] = connections[j + 1];
+            }
+          connections->length (total_len - 1);
+        }
 
-        case Deployment::EventEmitter: 
+      if (found)
+        this->purge_connections (connections, inst);
+    }
+}
 
-           ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); 
-           break;
+const Deployment::Properties &
+CIAO::DomainApplicationManager_Impl::
+get_connection_QoS_configuration (const Deployment::Requirement & requirement)
+{
+  // Get the name/identifier of the filter associated with
+  // this connection
+  Deployment::Properties_var retv;
+  ACE_NEW_NORETURN (retv, Deployment::Properties);
 
-        case Deployment::EventPublisher: 
+  CORBA::ULong len = retv->length ();
 
-           ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); 
-           break;
+  for (CORBA::ULong i = 0;
+       i < requirement.property.length ();
+       ++i)
+    {
+      const char *filter_name;
+      if (ACE_OS::strcmp ("EventFilter",
+                          requirement.property[i].name) == 0)
+        {
 
-        case Deployment::EventConsumer: 
+          if ((requirement.property[i].value >>= filter_name) == false)
+            ACE_ERROR ((LM_ERROR,
+                        "ERROR: DomainApplicationManager_Impl::"
+                        "get_connection_QoS_configuration unable to "
+                        "extract event filter information\n"));
+        }
 
-           ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); 
-           break;
-      }
-  }
+      // Search for the desired filter
+      for (CORBA::ULong j = 0; j < this->esd_->length (); ++j)
+        {
+          // Populate the "filters" info, in case this CIAO_Event_Service has
+          // one or more filters specified through descriptors
+          for (CORBA::ULong k = 0; k < this->esd_[j].filters.length (); ++k)
+            {
+              if (ACE_OS::strcmp (this->esd_[j].filters[k].name.in (),
+                                  filter_name) == 0)
+                {
+                  retv->length (len + 1);
+                  retv[len].name =  CORBA::string_dup ("EventFilter");
+                  retv[len].value <<= this->esd_[j].filters[k];
+                  break;
+                }
+            }
+        }
+    }
+  return retv.inout ();
 }
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index df5432602a5..49e52ee7d37 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -28,7 +28,8 @@
 #include "ace/Vector_T.h"
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
-#include "DeploymentS.h"
+#include "ciao/DomainApplicationManagerS.h"
+#include "ciao/Deployment_common.h"
 
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -36,9 +37,15 @@
 #include "Deployment_Configuration.h"
 #include "DomainApplicationManager_Export.h"
 #include "ciao/CIAO_common.h"
+#include "ciao/Deployment_EventsC.h"
 
 namespace CIAO
 {
+  namespace Execution_Manager
+  {
+    class Execution_Manager_Impl;
+  }
+
   /**
    * @class DomainApplicationManager_Impl
    *
@@ -51,6 +58,16 @@ namespace CIAO
     : public virtual POA_Deployment::DomainApplicationManager
   {
   public:
+
+    // External_Connections means we search all the connections including
+    // the connectiosn for external/shared components of this plan which hold
+    // port objrefs of components within this plan
+    enum Connection_Search_Type
+      {
+        External_Connections,
+        Internal_Connections
+      };
+
     /// Define the type which contains a list of DnC artifacts.
     /// @@ Assumption: Each NodeApplicationManager create only one
     /// NodeApplication when the startLaunch() operation is invoked,
@@ -62,12 +79,14 @@ namespace CIAO
       ::Deployment::DeploymentPlan_var child_plan_;
       ::Deployment::NodeApplicationManager_var node_application_manager_;
       ::Deployment::NodeApplication_var node_application_;
+      ::Deployment::DeploymentPlan_var old_child_plan_;
     } Chained_Artifacts;
 
     /// Constructor
     DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
                                    PortableServer::POA_ptr poa,
                                    Deployment::TargetManager_ptr manager,
+                                   Execution_Manager::Execution_Manager_Impl * em,
                                    const Deployment::DeploymentPlan &plan,
                                    const char * deployment_file)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -79,6 +98,8 @@ namespace CIAO
      *============================================================*/
     /**
      * Initialize the DomainApplicationManager.
+     * @para em A pointer to the ExecutionManager servant C++ object.
+     *
      * (1) Set the total number of child plans.
      * (2) Set the list of NodeManager names, which is an array of strings.
      *     The <node_manager_names> is a pointer to an array of ACE_CString
@@ -115,6 +136,16 @@ namespace CIAO
      *============================================================*/
 
     /**
+     * Fetch the NodeApplication object reference based on the NodeManager name.
+     */
+    virtual Deployment::NodeApplication_ptr get_node_app (
+        const char * node_name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::Deployment::NoSuchName));
+
+    /**
      * Executes the application, but does not start it yet. Users can
      * optionally provide launch-time configuration properties to
      * override properties that are part of the plan. Raises the
@@ -140,12 +171,34 @@ namespace CIAO
      * is started as well.  Raises the StartError exception if
      * launching or starting the application fails.
      */
-    virtual void finishLaunch (::CORBA::Boolean start
+    virtual void finishLaunch (CORBA::Boolean start,
+                               CORBA::Boolean is_ReDAC
                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::StartError));
 
     /**
+     * The last step in launching an application in the
+     * domain-level.  We establish connection bindings
+     * for external/shared components of this deployment plan
+     * components.
+     * 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 passivate_shared_components (void)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+    virtual void activate_shared_components (void)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+
+    /**
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
      */
@@ -180,6 +233,20 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError));
 
+    // 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_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                        Deployment::PlanError,
+                        Deployment::InstallationFailure,
+                        Deployment::UnknownImplId,
+                        Deployment::ImplEntryPointNotFound,
+                        Deployment::InvalidConnection,
+                        ::Components::RemoveFailure));
+
   protected:
     /// Destructor
     virtual ~DomainApplicationManager_Impl (void);
@@ -202,6 +269,47 @@ namespace CIAO
      */
     int split_plan (void);
 
+    /**
+     * Construct <Component_Binding_Info> struct for the component instance.
+     *
+     * @para name component instance name
+     * @para child_uuid child plan uuid string
+     */
+    CIAO::Component_Binding_Info *
+      populate_binding_info (const ACE_CString& name,
+                             const ACE_CString& child_uuid);
+
+    /**
+     * Construct <Component_Binding_Info> struct for the component instance.
+     * Fetch the plan_uuid info from the internally cached shared component
+     * list.
+     *
+     * @para name component instance name
+     */
+    CIAO::Component_Binding_Info *
+      populate_binding_info (const ACE_CString& name);
+
+    /**
+     * Contact each NodeManager to get shared compnents information
+     * and then update its internal cache.
+     */
+    void synchronize_shared_components_with_node_managers (void);
+
+    /**
+     * A helper function to add a list of shared components into
+     * the cached shared component list.
+     *
+     * @para shared A list of shared components to be added.
+     */
+    void add_shared_components (const Deployment::ComponentPlans & shared);
+
+    /**
+     * A private function to check whether a component is in the shared
+     * component list.
+     *
+     * @para name The name of a component instance.
+     */
+    bool is_shared_component (const char * name);
 
     /**
      * Cache the incoming connections, which is a sequence of Connections,
@@ -213,21 +321,97 @@ namespace CIAO
      * Given a child deployment plan, find the <Connections> sequence
      * of the "providedReference" for the component instances in the
      * child deployment plan as Receiver side.
+     * By default, we search in the new plan.
+     *
+     * If <is_getting_all_connections> is false, then we only
+     * search for "new connections" (valid for ReDaC case only).
+     * Otherwise, we will search for both new connections and those
+     * already existing connections.
      */
     Deployment::Connections *
-    get_outgoing_connections (const Deployment::DeploymentPlan &plan
-			      ACE_ENV_ARG_DECL);
+    get_outgoing_connections (const Deployment::DeploymentPlan &plan,
+                              bool is_getting_all_connections = true,
+                              bool is_search_new_plan = true,
+                              Connection_Search_Type t = Internal_Connections
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// This is a helper function to find the connection for a component.
     bool
     get_outgoing_connections_i (const char * instname,
-                                Deployment::Connections & retv
-				ACE_ENV_ARG_DECL)
+                                Deployment::Connections & retv,
+                                bool is_ReDAC,
+                                bool is_search_new_plan
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((Deployment::StartError));
+
+    bool
+    populate_connection_for_binding (
+        const char * instname,
+        const Deployment::PlanConnectionDescription & binding,
+        const Deployment::DeploymentPlan & plan,
+        Deployment::Connections & retv)
+      ACE_THROW_SPEC ((Deployment::StartError));
+
+    bool
+    handle_es_connection (
+        const char * instname,
+        const Deployment::PlanConnectionDescription & binding,
+        const Deployment::DeploymentPlan & plan,
+        Deployment::Connections & retv)
+      ACE_THROW_SPEC ((Deployment::StartError));
+
+    bool
+    handle_direct_connection (
+        const char * instname,
+        const Deployment::PlanConnectionDescription & binding,
+        const Deployment::DeploymentPlan & plan,
+        Deployment::Connections & retv)
       ACE_THROW_SPEC ((Deployment::StartError));
 
     /// Dump connections, a static method
     void dump_connections (const ::Deployment::Connections & connections);
 
+    /// Check whether a connection already exists in the cached old plan
+    bool already_exists (const Deployment::PlanConnectionDescription & conn);
+
+    /// Remove those appeared in <right> from the <left>
+    Deployment::Connections *
+    subtract_connections (const Deployment::Connections & left,
+                          const Deployment::Connections & right);
+
+    void
+    purge_connections (Deployment::Connections_var & connections,
+                       const char * inst);
+                       
+    /**
+     * The first step in finish_launching an application in the
+     * domain-level.  We install all the CIAO_Event_Service objects
+     * as specified in the DeploymentPlan.
+     * 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));
+
+    /**
+     * Add all CIAO_Event_Service objects into the cached map.
+     */
+    virtual void
+    add_es_to_map (Deployment::ESInstallationInfos * es_infos,
+                   Deployment::CIAO_Event_Services * event_services)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+    /**
+     * Get the actual event connection QoS properties based on the
+     * deployment requirement. The deployment requirement only specifies
+     * an identifier/reference to the EventServiceDeploymentDescriptions.
+     */
+    virtual const Deployment::Properties &
+    get_connection_QoS_configuration (
+      const Deployment::Requirement & requirement);
+
   protected:
     /// location of the Domainapplication
     CORBA::String_var domainapp_path_;
@@ -238,8 +422,14 @@ namespace CIAO
     /// Keep a pointer to the managing POA.
     PortableServer::POA_var poa_;
 
-    /// Cache a object reference to this servant.
-    /// Deployment::DomainApplicationManager_var objref_;
+    /// Pointer to the ExecutionManager_Impl "singleton" servant object
+    /// We could do this because ExecutionManager and DomainApplicationManager
+    /// are always collocated in the same process, so we don't have
+    /// to pass CORBA object reference back and forth.
+    Execution_Manager::Execution_Manager_Impl * execution_manager_;
+
+    /// Cache a list of shared components
+    Deployment::ComponentPlans_var shared_;
 
     /// Cache the ior of the previous reference
     CORBA::String_var ior_;
@@ -251,6 +441,9 @@ namespace CIAO
     /// The plan will be initialized when init is called.
     Deployment::DeploymentPlan plan_;
 
+    /// Cached old deployment plan, i.e., before redeployment
+    Deployment::DeploymentPlan old_plan_;
+
     /// Cached child plans.
     //Deployment::DeploymentPlan * child_plan_;
 
@@ -273,6 +466,18 @@ namespace CIAO
 
     Chained_Artifacts_Table artifact_map_;
 
+    /// Cached information of all the CIAO_Event_Service objects within
+    /// the deployment plan
+    /// Key: the string identifier of the CIAO_Event_Service
+    /// Value: the object reference of the CIAO_Event_Service
+    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                    CIAO::CIAO_Event_Service_var,
+                                    ACE_Hash<ACE_CString>,
+                                    ACE_Equal_To<ACE_CString>,
+                                    ACE_Null_Mutex> Event_Service_Table;
+
+    Event_Service_Table es_map_;
+
     /// The deployment information data file.
     const char * deployment_file_;
 
@@ -286,6 +491,13 @@ namespace CIAO
     /// calling the startLaunch() method on the NodeApplicationManager object.
     ::Deployment::Connections_var all_connections_;
 
+    /// This variable is used to control the execution path of some
+    /// member function implementations. The reason is because we want
+    /// to avoid unnecessary code duplicate. The default value is "false".
+    bool is_redeployment_;
+
+    /// Cache the CIAO_Event_Service deployment description
+    CIAO::DAnCE::EventServiceDeploymentDescriptions_var esd_;
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
index 10a85560237..c3a87aec44f 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
@@ -15,6 +15,12 @@ namespace CIAO
     {
     }
 
+    size_t
+    DAM_Map::size (void)
+    {
+      return this->map_.current_size ();
+    }
+
     bool
     DAM_Map::is_plan_available (const ACE_CString &str)
     {
@@ -57,7 +63,7 @@ namespace CIAO
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::bind_dam_reference");
       int retval =
-        this->map_.bind (str,
+        this->map_.rebind (str,
                          dam);
 
       if (retval != 0)
@@ -71,7 +77,7 @@ namespace CIAO
     DAM_Map::get_dams (ACE_ENV_SINGLE_ARG_DECL)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
-      CORBA::ULong sz =
+      CORBA::ULong const sz =
         this->map_.current_size ();
 
       // Initialize the list of DomainApplication Managers
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index 21d8dee5de9..1e6914db7f3 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -13,17 +13,16 @@
 #define CIAO_DAM_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Null_Mutex.h"
+#include "ciao/DomainApplicationManagerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager.h"
-#include "ciao/DeploymentC.h"
 #include "ace/SString.h"
 
-
 namespace CIAO
 {
   namespace Execution_Manager
@@ -53,6 +52,8 @@ namespace CIAO
 
       bool unbind_dam (const ACE_CString &str);
 
+      size_t size (void);
+
     private:
       typedef
       ACE_Hash_Map_Manager_Ex < ACE_CString,
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.idl b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.idl
deleted file mode 100644
index cdd47c24d1b..00000000000
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file ExecutionManager.idl
- *
- * @brief Simple interface to control the ExecutionManager. This
- * interface currently provides an additional method called shutdown
- * to terminate the process cleanly.
- *
- */
-
-#include "Deployment.idl"
-
-module CIAO
-{
-  /**
-   * @brief CIAO Execution Manager Program
-   *
-   * This feature addition is added using inheritance mechanism currently
-   */
-  interface ExecutionManagerDaemon : Deployment::ExecutionManager
-  {
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 0fdbba65698..7e5ffea6540 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,37 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project (ExecutionManager_stub): ciao_server_dnc {
-
-  sharedname = ExecutionManager_stub
-
-  idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export 
-  idlflags += -Wb,stub_export_include=ExecutionManager_stub_export.h
-
-  dynamicflags = EXECUTIONMANAGER_STUB_BUILD_DLL
-
-  IDL_Files {
-   ExecutionManager.idl
-  }
-
-  Source_Files {
-   ExecutionManagerC.cpp
-  }
-}
-
-project(ExecutionManager): ciao_component_dnc, ciao_config_handlers {
-
+project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc {
   exename = Execution_Manager
 
-  after += DomainApplicationManager ExecutionManager_stub
-
-  libs += DomainApplicationManager ExecutionManager_stub
+  after += ExecutionManager_stub
+  libs += ExecutionManager_stub
 
   IDL_Files {
   }
 
   Source_Files {
-    ExecutionManagerS.cpp
+    ../Interfaces/ExecutionManagerDaemonS.cpp
     Execution_Manager.cpp
     Execution_Manager_Impl.cpp
     DAM_Map.cpp
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_stub_export.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_stub_export.h
deleted file mode 100644
index f32c91c5e6e..00000000000
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_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 ExecutionManager_stub
-// ------------------------------
-#ifndef EXECUTIONMANAGER_STUB_EXPORT_H
-#define EXECUTIONMANAGER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (EXECUTIONMANAGER_STUB_HAS_DLL)
-#  define EXECUTIONMANAGER_STUB_HAS_DLL 1
-#endif /* ! EXECUTIONMANAGER_STUB_HAS_DLL */
-
-#if defined (EXECUTIONMANAGER_STUB_HAS_DLL) && (EXECUTIONMANAGER_STUB_HAS_DLL == 1)
-#  if defined (EXECUTIONMANAGER_STUB_BUILD_DLL)
-#    define ExecutionManager_stub_Export ACE_Proper_Export_Flag
-#    define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EXECUTIONMANAGER_STUB_BUILD_DLL */
-#    define ExecutionManager_stub_Export ACE_Proper_Import_Flag
-#    define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EXECUTIONMANAGER_STUB_BUILD_DLL */
-#else /* EXECUTIONMANAGER_STUB_HAS_DLL == 1 */
-#  define ExecutionManager_stub_Export
-#  define EXECUTIONMANAGER_STUB_SINGLETON_DECLARATION(T)
-#  define EXECUTIONMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EXECUTIONMANAGER_STUB_HAS_DLL == 1 */
-
-// Set EXECUTIONMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EXECUTIONMANAGER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EXECUTIONMANAGER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EXECUTIONMANAGER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EXECUTIONMANAGER_STUB_NTRACE */
-
-#if (EXECUTIONMANAGER_STUB_NTRACE == 1)
-#  define EXECUTIONMANAGER_STUB_TRACE(X)
-#else /* (EXECUTIONMANAGER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EXECUTIONMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EXECUTIONMANAGER_STUB_NTRACE == 1) */
-
-#endif /* EXECUTIONMANAGER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index f4850968e10..c3c675aaab6 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -1,5 +1,6 @@
 //--*C++*--
 // $Id$
+
 #include "Execution_Manager_Impl.h"
 
 // Include Name Service header
@@ -18,13 +19,14 @@ namespace CIAO
   {
     const char *ior_file_name_ = "executionManager.ior";
     const char *init_file_name = "deployment.dat";
-
-    bool register_with_ns_ = 0;
+    const char *pid_file_name_ = 0;
+    static bool register_with_ns_ = false;
+    static bool write_to_ior_ = false;
 
     bool
     parse_args (int argc, char *argv[])
     {
-      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:m:i:n");
+      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:m:i:n:p");
       int c;
       while ((c = get_opts ()) != -1)
         switch (c)
@@ -38,6 +40,9 @@ namespace CIAO
           case 'n':
             register_with_ns_ = 1;
             break;
+          case 'p':
+            pid_file_name_ = get_opts.opt_arg ();
+            break;
           case '?':  // display help for use of the server.
           default:
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,6 +84,23 @@ namespace CIAO
       return true;
     }
 
+    void
+    write_pid (void)
+    {
+      if (pid_file_name_ == 0)
+        return;
+
+      FILE* pid_file = ACE_OS::fopen (pid_file_name_, "w");
+
+      if (pid_file)
+        {
+          ACE_OS::fprintf (pid_file,
+                           "%i",
+                           ACE_OS::getpid ());
+          ACE_OS::fclose (pid_file);
+        }
+    }
+
     bool
     register_with_ns (CORBA::ORB_ptr orb,
                       CIAO::ExecutionManagerDaemon_ptr obj
@@ -102,10 +124,16 @@ namespace CIAO
       name[1].id = CORBA::string_dup ("ExecutionManager");
 
       // Register the servant with the Naming Service
-      naming_context->bind (name,
-                            obj
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      try
+        {
+          // Register the servant with the Naming Service
+          naming_context->bind (name, obj);
+        }
+      catch (CosNaming::NamingContext::AlreadyBound &)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Execution_Manager.cpp: Name already bound, rebinding....\n"));
+          naming_context->rebind (name, obj);
+        }
 
       return true;
     }
@@ -141,9 +169,9 @@ namespace CIAO
 
           if (poa.in () == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%P|%t) CIAO_ExecutionManager: "
+                               "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA panic error, returning \n"),
-                               -1);
+                              -1);
 
           // Create and install the CIAO Daemon servant
           Execution_Manager_Impl *daemon_servant = 0;
@@ -160,7 +188,7 @@ namespace CIAO
             daemon_servant->_this ();
 
           TAO::Utils::Implicit_Deactivator de (daemon_servant);
-                                               
+
           ACE_TRY_CHECK;
 
           bool retval = false;
@@ -194,7 +222,7 @@ namespace CIAO
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA Manager error, returning \n"),
-                               -1);
+                              -1);
 
           mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -203,6 +231,8 @@ namespace CIAO
           ACE_DEBUG ((LM_DEBUG,
                       "CIAO_ExecutionManager is running...\n"));
 
+          write_pid ();
+
           // Run the main event loop for the ORB.
           orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -239,5 +269,5 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return CIAO::Execution_Manager::run_main (argc,
-                                           argv);
+                                            argv);
 }
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index ee9a8153fe9..e56c6fcf9c5 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 #include "Execution_Manager_Impl.h"
 #include "ciao/CIAO_common.h"
 #include "DomainApplicationManager/DomainApplicationManager_Impl.h"
@@ -48,11 +49,17 @@ namespace CIAO
       // No need to create a new DAM. Hence pass the
       // reference that is already created.
       //
-      if (this->map_.is_plan_available (plan.UUID.in ()))
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) calling this->man_.is_plan_available()...\n"));
+      if (this->map_.is_plan_available (plan.UUID.in ())) {
+  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Plan is already available; "
+        "calling this->man_.fetch_dam_reference()...\n"));
+
         return this->map_.fetch_dam_reference (plan.UUID.in ());
+      }
+      else
+  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Plan wasn't already available\n"));
 
-      // We are about to begin working on a new
-      // DeploymentPlan.
+      // We are about to begin working on a new DeploymentPlan.
       // Create a DAM servant, which will be populated
       // to be sent back to the PlanLauncher.
       //
@@ -61,15 +68,18 @@ namespace CIAO
       // Create a new Domain Application Manager servant
       // to be sent back to the Plan Launcher.
       //
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to instantiate CIAO::DomainApplicationManager_Impl\n"));
       ACE_NEW_THROW_EX (
         dam_servant,
         CIAO::DomainApplicationManager_Impl (
           this->orb_.in (),
           this->poa_.in (),
           ::Deployment::TargetManager::_nil (),
+          this, // a plain C++ pointer
           plan,
           this->init_file_.c_str ()),
           CORBA::NO_MEMORY ());
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Instantiated CIAO::DomainApplicationManager_Impl\n"));
 
       // Sanity check for NULL pointer
       // Should we throw an exception here?
@@ -88,6 +98,7 @@ namespace CIAO
       // plans, so that those plans can be sent off to individual
       // Node Application Managers.
       //
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to init...\n"));
       dam_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // This is a wrong exception to be thrown here.
@@ -97,10 +108,7 @@ namespace CIAO
       //
       ACE_CHECK_RETURN (::Deployment::DomainApplicationManager::_nil ());
 
-      /// @@ Can be removed -- Bala
-      /// Gan, have you addressed this comment by Bala?
-      /// Do we still need this code lying around?
-      ///
+      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 =
@@ -111,6 +119,7 @@ namespace CIAO
       this->map_.bind_dam_reference (
         plan.UUID.in (),
         Deployment::DomainApplicationManager::_duplicate (dam.in ()));
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Bound DAM reference...\n"));
 
       // Return the ApplicationManager instance
       return dam._retn ();
@@ -127,6 +136,14 @@ namespace CIAO
       return this->map_.get_dams (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
 
+    Deployment::DomainApplicationManager_ptr
+    Execution_Manager_Impl::getManager (const char * plan_uuid
+                                        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist))
+    {
+      return this->map_.fetch_dam_reference (plan_uuid);
+    }
+
     void
     Execution_Manager_Impl::destroyManager (
       Deployment::DomainApplicationManager_ptr manager
@@ -141,6 +158,8 @@ namespace CIAO
               manager->getPlan (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          // What if we still have components running within this plan?
+          //
           (void) this->map_.unbind_dam (plan->UUID.in ());
 
           // Where does the POA deactivate happen?
@@ -169,6 +188,70 @@ namespace CIAO
       ACE_CHECK;
     }
 
+
+    void
+    Execution_Manager_Impl::destroyManagerByPlan (
+      const char * plan_uuid
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::StopError))
+    {
+      CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagerByPlan");
+      ACE_TRY
+        {
+          // Get DomainApplicationManager first
+          if (! this->map_.is_plan_available (plan_uuid))
+            {
+              ACE_DEBUG ((LM_ERROR,
+                          "Execution_Manager_Impl::destroyManagerByPlan - "
+                          "Invalid plan uuid [%s]\n", plan_uuid));
+              ACE_THROW (Deployment::StopError ());
+            }
+
+          Deployment::DomainApplicationManager_var
+            dam = this->map_.fetch_dam_reference (plan_uuid);
+
+          // Get the plan
+          Deployment::DeploymentPlan_var plan = dam->getPlan ();
+
+          // If any component is still running, then we return.
+          CORBA::ULong inst_lenth = plan->instance.length ();
+          for (CORBA::ULong i = 0; i < inst_lenth; ++i)
+            {
+              if (this->is_component_running (plan->instance[i].name.in (),
+                                              plan_uuid))
+                return;
+            }
+
+          (void) this->map_.unbind_dam (plan->UUID.in ());
+
+          // Where does the POA deactivate happen?
+          //
+          dam->destroyManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+#if 0
+          PortableServer::ObjectId_var oid =
+            this->poa_->reference_to_id (manager
+                                         ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          this->poa_->deactivate_object (oid.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+#endif /*if 0*/
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::destroyManager\t\n");
+          ACE_THROW (Deployment::StopError ());
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+
+
     void
     Execution_Manager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
@@ -178,5 +261,275 @@ namespace CIAO
       this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
+
+    void
+    Execution_Manager_Impl::perform_redeployment (
+      const Deployment::DeploymentPlan & plan
+      ACE_ENV_ARG_DECL)
+      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");
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "CIAO (%P|%t) Dynamic Redeployment: "
+                  "invoked CIAO::Execution_Manager_Impl::perform_redeployment \n"));
+
+      Deployment::DomainApplicationManager_var dam;
+
+      if (this->map_.is_plan_available (plan.UUID.in ()))
+        dam = this->map_.fetch_dam_reference (plan.UUID.in ());
+      else
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
+                      "CIAO::Execution_Manager_Impl::perform_redeployment -"
+                      "Invalid plan uuid: %s\n", plan.UUID.in ()));
+          ACE_THROW (Deployment::PlanError (
+                        "Execution_Manager_Impl::perform_redeployment",
+                        "Invalid plan uuid specified."));
+        }
+
+      ACE_TRY
+        {
+          // Call perform_redeployment() on the DAM, which will do the
+          // actual redeployment and reconfiguration on the dommain level.
+          dam->perform_redeployment (plan);
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::perform_redeployment\t\n");
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+
+    Deployment::DeploymentPlan *
+    Execution_Manager_Impl::getPlan (const char * plan_uuid
+                                     ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((::CORBA::SystemException))
+    {
+      Deployment::DomainApplicationManager_var dam;
+
+      if (this->map_.is_plan_available (plan_uuid))
+        dam = this->map_.fetch_dam_reference (plan_uuid);
+      else
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
+                      "CIAO::Execution_Manager_Impl::getPlan -"
+                      "Invalid plan uuid: %s\n", plan_uuid));
+          ACE_THROW (::CORBA::BAD_PARAM ());
+        }
+
+      ACE_TRY
+        {
+          return dam->getPlan ();
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::getPlan\t\n");
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+
+    void
+    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_ERROR,
+                  "Execution_Manage::finalizing  global bindings.\n"));
+
+      // Find the NodeApplication hosting the component, and then call
+      // <finishLaunch> on it
+      ACE_TRY
+      {
+        Deployment::NodeApplication_var
+          node_app = this->find_node_application (binding);
+
+        if (CORBA::is_nil (node_app.in ()))
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "Execution_Manager_Impl::finalize_global_binding - "
+                        "nil NodeApplication object reference.\n"));
+            ACE_THROW (Deployment::InvalidConnection ());
+          }
+
+        node_app->finishLaunch (binding.providedReference_.in (),
+                                true, // start
+                                add_or_remove);
+
+        // Update the internal shared component list
+        if (add_or_remove)
+          this->add_shared_component (binding);
+        else
+          this->remove_shared_component (binding);
+      }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::finalize_global_binding\t\n");
+          ACE_THROW (Deployment::InvalidConnection ());
+        }
+      ACE_ENDTRY;
+    }
+
+    void
+    Execution_Manager_Impl::passivate_shared_components (
+          const Component_Binding_Info & binding)
+        ACE_THROW_SPEC ((
+          ::CORBA::SystemException,
+          Deployment::StartError))
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "Execution_Manage::passivate shared components.\n"));
+
+      // Find the NodeApplication hosting the component, and then call
+      // <finishLaunch> on it
+      ACE_TRY
+      {
+        Deployment::NodeApplication_var
+          node_app = this->find_node_application (binding);
+
+        if (CORBA::is_nil (node_app.in ()))
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "Execution_Manager_Impl::passivate_shared_components - "
+                        "nil NodeApplication object reference.\n"));
+            ACE_THROW (Deployment::StartError ());
+          }
+
+        node_app->passivate_component (binding.name_.c_str ());
+      }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::passivate_shared_components\t\n");
+          ACE_THROW (Deployment::StartError ());
+        }
+      ACE_ENDTRY;
+    }
+
+    void
+    Execution_Manager_Impl::activate_shared_components (
+          const Component_Binding_Info & binding)
+        ACE_THROW_SPEC ((
+          ::CORBA::SystemException,
+          Deployment::StartError))
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "Execution_Manage::activate shared components.\n"));
+
+      // Find the NodeApplication hosting the component, and then call
+      // <ciao_activate> on it
+      ACE_TRY
+      {
+        Deployment::NodeApplication_var
+          node_app = this->find_node_application (binding);
+
+        if (CORBA::is_nil (node_app.in ()))
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "Execution_Manager_Impl::activate_shared_components - "
+                        "nil NodeApplication object reference.\n"));
+            ACE_THROW (Deployment::StartError ());
+          }
+
+        node_app->activate_component (binding.name_.c_str ());
+      }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::passivate_shared_components\t\n");
+          ACE_THROW (Deployment::StartError ());
+        }
+      ACE_ENDTRY;
+    }
+
+
+    Deployment::NodeApplication_ptr
+
+    Execution_Manager_Impl::
+    find_node_application (const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::Deployment::InvalidConnection))
+    {
+      // Find the DAM based on plan_UUID
+      Deployment::DomainApplicationManager_var dam;
+
+      if (this->map_.is_plan_available (binding.plan_uuid_))
+        dam = this->map_.fetch_dam_reference (binding.plan_uuid_);
+      else
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
+                      "CIAO::Execution_Manager_Impl::find_node_application -"
+                      "Invalid plan uuid: %s\n", binding.plan_uuid_.c_str ()));
+          ACE_THROW (::CORBA::BAD_PARAM ());
+        }
+
+      // 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 ());
+
+      if (CORBA::is_nil (node_app.in ()))
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
+                      "CIAO::Execution_Manager_Impl::find_node_application -"
+                      "Invalid node name: %s!\n", binding.node_.c_str ()));
+          ACE_THROW (::CORBA::BAD_PARAM ());
+        }
+
+      return node_app._retn ();
+    }
+
+    void
+    Execution_Manager_Impl::
+    add_shared_component (const Component_Binding_Info & comp)
+    {
+      this->shared_components_.insert (comp);
+    }
+
+    void
+    Execution_Manager_Impl::
+    remove_shared_component (const Component_Binding_Info & comp)
+    {
+      this->shared_components_.remove (comp);
+    }
+
+    bool
+    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 ();
+           iter != this->shared_components_.end ();
+           ++iter)
+        {
+          if (ACE_OS::strcmp ((*iter).name_.c_str (), name) == 0 &&
+              ACE_OS::strcmp ((*iter).plan_uuid_.c_str (), plan_uuid) == 0)
+            return true;
+        }
+
+      return false;
+    }
   }
 }
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index 8d596c03835..174fc793c99 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -16,7 +16,7 @@
 #define CIAO_EXECUTION_MANAGER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "ExecutionManagerS.h"
+#include "Interfaces/ExecutionManagerDaemonS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,11 +24,7 @@
 
 #include "DAM_Map.h"
 #include "ace/SString.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "ciao/Deployment_common.h"
 
 namespace CIAO
 {
@@ -47,6 +43,7 @@ namespace CIAO
       : public virtual POA_CIAO::ExecutionManagerDaemon
     {
     public:
+      /// Constructor
       Execution_Manager_Impl (CORBA::ORB_ptr orb,
                               PortableServer::POA_ptr poa,
                               const char * init_file);
@@ -56,7 +53,7 @@ namespace CIAO
       virtual Deployment::DomainApplicationManager_ptr
       preparePlan (const Deployment::DeploymentPlan & plan,
                    CORBA::Boolean commitResources
-                   ACE_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::ResourceNotAvailable,
                          Deployment::PlanError,
@@ -66,18 +63,101 @@ namespace CIAO
       getManagers (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
+      // Below method is CIAO specific extension
+      virtual Deployment::DomainApplicationManager_ptr
+      getManager (const char * plan_uuid
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist));
+
       virtual void
       destroyManager (Deployment::DomainApplicationManager_ptr manager
-                      ACE_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::StopError));
 
-      virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+      // Below method is CIAO specific extension, please see the IDL
+      // definition for more details.
+      virtual void
+      destroyManagerByPlan (const char * plan_uuid
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((::CORBA::SystemException,
+                         ::Deployment::StopError));
+
+      virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
+      // 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_ENV_ARG_DECL_WITH_DEFAULTS)
+        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_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((::CORBA::SystemException));
+
+    /// ****************** C++ Methods *************************
+
+    /// If input <add_connection> is true, then it will add new
+    /// connections which are across different assemblies. Otherwise
+    /// it will remove the specified connections of this component.
+    ///
+    /// @@GD: Later we can add another method which could accept
+    /// 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));
+
+    virtual void passivate_shared_components (
+        const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+    virtual void activate_shared_components (
+        const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+      /// Add shared component information.
+      /// This call will be made by DomainApplicationManager.
+      virtual void
+        add_shared_component (const Component_Binding_Info & binding);
+
+      /// Remove shared component
+      virtual void
+        remove_shared_component (const Component_Binding_Info & binding);
+
+      /// If the input component <name> was found in the internal
+      /// cached shared component list, and the plan_uuid also matches,
+      /// then this member function returns <true>, otherwise it
+      /// returns <false>.
+      virtual bool
+        is_component_running (const char * name, const char * plan_uuid);
+
+    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));
+
     protected:
       /// Destructor.
-      ~Execution_Manager_Impl (void);
+      virtual ~Execution_Manager_Impl (void);
 
       /// Cached ORB pointer
       CORBA::ORB_var orb_;
@@ -85,17 +165,17 @@ namespace CIAO
       /// Cached POA pointer
       PortableServer::POA_var poa_;
 
-      // Path to the initialization file
+      /// Path to the initialization file
       const ACE_CString init_file_;
 
+      /// A map which caches the DomainApplicationManager object ref.
       DAM_Map map_;
+
+      /// A set of shared components and their location info.
+      ACE_Unbounded_Set<Component_Binding_Info> shared_components_;
     };
   }
 }
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 #endif /* EXECUTIONMANAGER_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 4bb0fc03df2..442581f0795 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -1,194 +1,58 @@
 // $Id$
-#include "NodeApplication_Impl.h"
-#include "NodeApplication_CallBackC.h"
-#include "ciao/Server_init.h"
-#include "ciao/CIAO_common.h"
-#include "ace/SString.h"
-#include "ace/Get_Opt.h"
-#include "ace/Env_Value_T.h"
+
+#include "NodeApplication_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ciao/CIAO_common.h"
 
-const char *ior_file_name = 0;
-const char *callback_ior = 0;
-int use_callback = 1;
 
-int
-parse_args (int argc, char *argv[])
+void print_arg (int argc, char *argv[])
 {
-  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "nk:o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'n':
-        use_callback = 0;
-        break;
-
-
-      case 'o':  // get the file name to write to
-        ior_file_name = get_opts.opt_arg ();
-        break;
-
-      case 'k':  // get the activator callback IOR
-       callback_ior = get_opts.opt_arg ();
-       break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s\n"
-                           "-n Do not use Callback (for testing)\n"
-                           "-o <ior_output_file>\n"
-                           "-k <NodeApplicationManager_callback_ior>\n"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  if (use_callback && callback_ior == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Callback IOR to NodeApplicationManager is required.\n"),
-                      -1);
-
-  return 0;
+  for (int i = 0; i < argc; ++i)
+    ACE_DEBUG ((LM_DEBUG, "NodeApplication ARGV[%d] = %s\n", i, argv [i]));
 }
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+   int priority = 20;
+   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
-  ACE_TRY
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_RR,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
     {
-      // Initialize orb
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CIAO::Server_init (orb.in ());
-
-      if (parse_args (argc, argv) != 0)
-        return -1;
-
-      // Get reference to Root POA.
-      CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Activate POA manager
-      PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CIAO::NodeApplication_Impl *nodeapp_servant;
-
-      ACE_NEW_RETURN (nodeapp_servant,
-                      CIAO::NodeApplication_Impl (orb.in (),
-                                                  poa.in ()),
-                      -1);
-
-      PortableServer::ServantBase_var safe_servant (nodeapp_servant);
-
-      // CONFIGURING NodeApplication
-      PortableServer::ObjectId_var nodeapp_oid
-        = poa->activate_object (nodeapp_servant
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj = poa->id_to_reference (nodeapp_oid.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Deployment::NodeApplication_var nodeapp_obj =
-        Deployment::NodeApplication::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (nodeapp_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to activate NodeApplication object\n"),
-                          -1);
-
-
-      Deployment::NodeApplicationManager_var nodeapp_man;
-      Deployment::Properties_var prop = new Deployment::Properties;
-
-      if (use_callback)
+      if (errno == EPERM)
         {
-          obj = orb->string_to_object (callback_ior
-                                       ACE_ENV_ARG_PARAMETER);
-	      ACE_TRY_CHECK;
-	
-	      CIAO::NodeApplication_Callback_var nam_callback
-	        = CIAO::NodeApplication_Callback::_narrow (obj.in ()
-	                                                   ACE_ENV_ARG_PARAMETER);
-	      ACE_TRY_CHECK;
-	
-	      Deployment::Properties_out properties_out (prop.out ());
-	
-	      nodeapp_man
-	        = nam_callback->register_node_application (nodeapp_obj.in (),
-	                                                   properties_out
-	                                                   ACE_ENV_ARG_PARAMETER);
-	      ACE_TRY_CHECK;
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
         }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
 
-      /** @@ We need to call NodeApplication servant's init method.
-       * But it's not sure to me where exactly we can get the
-       * Properties needed by the init method at this moment. There are two
-       * ways to set the property of the NodeApplication:
-       * 1. call init remotely from NodeApplicationManager
-       * 2. call init locally on the servant of NodeApplication.
-       */
-      bool result = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      if (result)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
-                               initializing the session container!"));
-        return 1;
-      }
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "*** Starting NodeApplication\n"));
 
-      CORBA::String_var str = orb->object_to_string (nodeapp_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CIAO::Utility::write_IOR (ior_file_name,
-                                str.in ());
+      CIAO::NodeApplication_Options nodeapp_options;
 
-      // End Deployment part
-      if (CIAO::debug_level () > 10)
-        {
-          ACE_DEBUG ((LM_INFO, "NodeApplication IOR: %s\n", str.in ()));
+      if (CIAO::debug_level () > 9)
+        print_arg (argc, argv);
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "Running NodeApplication...\n"));
-        }
+      if (nodeapp_options.parse_args (argc, argv) != 0)
+        return -1;
 
-      // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CIAO::NodeApplication_Core nodeapp_core (nodeapp_options);
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      if (nodeapp_core.startup (argc, argv) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to start up the NodeApplication_Core\n"), -1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // Run the main event loop for the ORB.
+      nodeapp_core.run_orb ();
     }
   ACE_CATCHANY
     {
@@ -198,6 +62,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG, "This NodeApplication is quitting now!\n"));
+  if (CIAO::debug_level () > 1)
+    ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n"));
+
   return 0;
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index e258358d5eb..5837ca5692d 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,13 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplication): ciao_component_dnc {
+project(NodeApplication): ciao_server_dnc {
+  after += NoOp_Configurator
+  libs  += CIAO_NoOp_Configurator
   exename   = NodeApplication
 
-    IDL_Files {
+  Source_Files {
+    Configurator_Factory.cpp
+    Container_Impl.cpp
+    NodeApplication_Core.cpp
+    NodeApplication_Impl.cpp
+    NodeApplication.cpp
   }
+}
+
+project(NoOp_Configurator): ciao_deployment_stub {
+  sharedname   = CIAO_NoOp_Configurator
+  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
 
   Source_Files {
-    NodeApplication.cpp
+    NoOp_Configurator.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/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 0cd1d7954b2..5edb7a51b3a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -413,13 +413,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
                   "CIAO::NodeApplication_Impl::passivate_component, "
                   "invalid instance [%s] \n",
                    name));
-      ACE_TRY_THROW (Components::RemoveFailure ());
+      ACE_TRY_THROW (Deployment::StartError ());
     }
 
   if (CORBA::is_nil (comp_state.objref_.in ()))
     {
       ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
-      throw Components::RemoveFailure ();
+      throw Deployment::StartError ();
     }
 
   comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -430,7 +430,7 @@ void
 CIAO::NodeApplication_Impl::activate_component (const char * name
                                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::StartError))
+                   ::Components::RemoveFailure))
 {
   Component_State_Info comp_state;
 
@@ -438,7 +438,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
     {
       ACE_ERROR ((LM_ERROR,
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::activate_component, "
+                  "CIAO::NodeApplication_Impl::passivate_component, "
                   "invalid instance [%s] \n",
                    name));
       ACE_TRY_THROW (Deployment::StartError ());
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index ee1878ff07d..8a08e3456c5 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -183,7 +183,7 @@ namespace CIAO
     virtual void activate_component (const char * name
                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::StartError));
+                       ::Components::RemoveFailure));
 
     virtual void passivate_component (const char * name
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index 9f790eb4d45..df31c704651 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -1,19 +1,53 @@
 // $Id$
+
 #include "Containers_Info_Map.h"
 #include "ciao/CIAO_Config.h"
 #include "ciao/CIAO_common.h"
 
+//Added for HTTP
+#include "URL_Parser.h"              //for parsing the URL
+#include "HTTP_Client.h"             //the HTTP client class to downloading packages
+#include "ace/Message_Block.h"       //for ACE_Message_Block
+#include "ace/OS_NS_fcntl.h"         //for open
+#include "ace/OS_NS_unistd.h"        //for close
+#include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
+#include "ace/OS_NS_string.h"        //for string functions
+
+
 namespace CIAO
 {
   Containers_Info_Map::
-  Containers_Info_Map (const Deployment::DeploymentPlan & plan)
+  Containers_Info_Map (const Deployment::DeploymentPlan & plan,
+          const Deployment::ComponentPlans & shared_components)
     : map_ (CIAO_DEFAULT_MAP_SIZE),
-      plan_ (plan)
+      plan_ (plan),
+      shared_components_ (shared_components),
+      HTTP_DOWNLOAD_PATH ()
   {
+    char* temp = ACE_OS::getenv ("CIAO_ROOT");
+    HTTP_DOWNLOAD_PATH += temp;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    HTTP_DOWNLOAD_PATH += "\\";
+#else
+    HTTP_DOWNLOAD_PATH += "/";
+#endif
+
+    HTTP_DOWNLOAD_PATH += "HTTP_DOWNLOADED_LIBS";
+
+    ACE_OS::mkdir(HTTP_DOWNLOAD_PATH.c_str ());
+    //if dir already exists a -1 is returned
+    //we ignore this, just need to make sure the directory exists
+
+    //now lets update the loader path to include
+    //the HTTP_DOWNLOAD_PATH
+    this->update_loader_path ();
+
+
     this->initialize_map ();
     this->build_map ();
   }
-  
+
   Deployment::ContainerImplementationInfos *
   Containers_Info_Map::containers_info (void)
   {
@@ -21,7 +55,7 @@ namespace CIAO
     // and return the corresponding sequence
     Deployment::ContainerImplementationInfos_var retv;
 
-    ACE_NEW_RETURN (retv, 
+    ACE_NEW_RETURN (retv,
                     Deployment::ContainerImplementationInfos,
                     0);
 
@@ -39,7 +73,7 @@ namespace CIAO
       }
     return retv._retn ();
   }
-  
+
   void
   Containers_Info_Map::
   initialize_map (void)
@@ -49,82 +83,111 @@ namespace CIAO
     // Iterate over the instance list and look at the policy set id of each
     // 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 ""
     for (CORBA::ULong i = 0; i < instance_len; ++i)
       {
-        const char * my_resource_id = "";
-        const char * my_policy_set_id = "";
+        CORBA::String_var my_resource_id ("");
+        const char *my_policy_set_id = "";
 
         if (this->plan_.instance[i].deployedResource.length () != 0)
           {
-            my_resource_id = 
+            /*
+            my_resource_id =
               this->plan_.instance[i].deployedResource[0].resourceName.in ();
 
             this->plan_.instance[i].deployedResource[0].resourceValue >>=
               my_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."));
           }
 
-        // If we find a different policy_set_id, then we bind it.
+        // If we find a existing policy_set_id, then do nothing.
         if (this->map_.find (my_policy_set_id) == 0)
           continue;
-        else if (ACE_OS::strcmp (my_policy_set_id, "") == 0)
+        if (ACE_OS::strcmp (my_policy_set_id, "") == 0)
           {
-            // empty policy_set_id
+            // no policy set id has been specified
             Deployment::ContainerImplementationInfo * info;
             ACE_NEW (info, Deployment::ContainerImplementationInfo);
             this->map_.bind (my_policy_set_id, info);
             continue;
           }
         else
-          {
-            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;
-            for (j = 0; 
-                  j < this->plan_.infoProperty.length (); 
-                  ++j)
-              {
-                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) == 0)
-                  {
-                    // Iterate over the policy_sets
-                    CORBA::ULong k;
-                    for (k = 0;
-                          k < (*server_resource_def).orb_config.policy_set.length ();
-                          ++k)
-                      {
-                        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 <<= 
-                              (*server_resource_def).orb_config.policy_set[k];
-                          }
-                      }
-                    if (k == (*server_resource_def).orb_config.policy_set.length ())
-                      {
-                        // No Server Resource Def found?
-                        ACE_DEBUG ((LM_DEBUG, "No matching policy set def found!\n"));
-                      }
-                  }
-              } // end of for loop for fetching policy_set_def
+    {
+      Deployment::ContainerImplementationInfo * info;
+      ACE_NEW (info, Deployment::ContainerImplementationInfo);
 
-            if (j == this->plan_.infoProperty.length ()) 
-              {
-                // No Server Resource Def found?! Inconsistent descriptor files.
-                ACE_DEBUG ((LM_ERROR, "(%P|%t) Descriptor error: "
-                  "No matching server resrouce def found for component: %s!\n",
-                  this->plan_.instance[i].name.in ()));
-              }
-            this->map_.bind (my_policy_set_id, info);
-          }
+      // 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;
+
+          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_DEBUG ((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);
+    }
       }
   }
 
@@ -139,6 +202,12 @@ namespace CIAO
         const Deployment::InstanceDeploymentDescription & instance =
           this->plan_.instance[i];
 
+        // If this component instance happens to be in the "shared components
+        // list", then we ignore it, otherwise we shall install it.
+        ACE_CString name (instance.name.in ());
+        if (this->is_shared_component (name))
+          continue;
+
         if (! this->insert_instance_into_map (instance))
           return false;
       }
@@ -155,17 +224,18 @@ namespace CIAO
     const char * policy_set_id = "";
     if (instance.deployedResource.length () != 0)
       {
-        instance.deployedResource[0].resourceValue >>= 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."));
       }
 
     // Find the ContainerImplementationInfo entry from the map
-    MAP::ENTRY *entry;
+    MAP::ENTRY *entry = 0;
     if (this->map_.find (policy_set_id, entry) != 0)
       return false; //should never happen
     else
       {
         this->insert_instance_into_container (
-                instance, 
+                instance,
                 entry->int_id_->impl_infos);
       }
 
@@ -199,12 +269,41 @@ namespace CIAO
     bool svnt_found = false;
     bool exec_found = false;
 
-    // For svnt artifact
+    // For svnt/exec artifacts
     for (CORBA::ULong j = 0; j < artifact_num; ++j)
       {
         const Deployment::ArtifactDeploymentDescription & arti =
           this->plan_.artifact[ impl.artifactRef[j] ];
 
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+        for (size_t loc_num = 0;
+             loc_num < arti.location.length ();
+             ++loc_num)
+          {
+            if (ACE_OS::strstr (arti.location[loc_num], "http://"))
+              {
+                ACE_CString path;
+                if (!this->resolve_http_reference (arti.location[loc_num],
+                                                   path))
+                  {
+                    ACE_ERROR
+                         ((LM_ERROR,
+                         "CIAO (%P|%t) Containers_Info_Map.cpp -"
+                         "Containers_Info_Map::insert_instance_into_container -"
+                         "ERROR: Unable to resolve HTTP ref to location[%d] of %s\n",
+                         loc_num, arti.name.in ()));
+
+                    arti.location[loc_num] = CORBA::string_dup ("HTTP_failure");
+                  }
+                else
+                  {
+                    arti.location[loc_num] = CORBA::string_dup (arti.name.in ());
+                    //enque for cleanup
+                  }
+              }
+          }
+#endif
+
         ACE_CString tmp = arti.name.in ();
         ssize_t pos;
 
@@ -212,9 +311,13 @@ namespace CIAO
         //         the modeling tool should make sure of
         //         uniqueness, i.e., one component implementation
         //         should have only 1 _svnt and 1 _exec libs.
+        if ((pos  = tmp.find ("_stub")) != ACE_CString::npos ||
+            (pos  = tmp.find ("_Stub")) != ACE_CString::npos)
+          continue; // We ignore _stub artifact since it's not used.
+
         if (!svnt_found &&
                 ((pos  = tmp.find ("_svnt")) != ACE_CString::npos ||
-                (pos  = tmp.find ("_Svnt")) != ACE_CString::npos))
+                 (pos  = tmp.find ("_Svnt")) != ACE_CString::npos))
           {
             if (arti.location.length() < 1 )
               {
@@ -225,20 +328,20 @@ namespace CIAO
             svnt_found = true;
             // Copy the servant dll/so name.
             // @@ Note: I ignore all the other locations except the first one.
-            impl_infos[i].servant_dll = 
-              CORBA::string_dup (arti.location[0].in ());
+            impl_infos[i].servant_dll =
+              CORBA::string_dup (arti.location[0]);
 
             // Get the entry point.
-		        const CORBA::ULong prop_length = arti.execParameter.length ();
+            const CORBA::ULong prop_length = arti.execParameter.length ();
 
             for (CORBA::ULong prop_num = 0;
-                prop_num < prop_length;
-                ++prop_num)
+                 prop_num < prop_length;
+                 ++prop_num)
               {
                 ACE_CString name (arti.execParameter[prop_num].name.in ());
                 if (name == ACE_CString ("entryPoint"))
                   {
-                    const char * entry;
+                    const char * entry = 0;
                     (arti.execParameter[prop_num].value) >>= entry;
                     impl_infos[i].servant_entrypt = CORBA::string_dup (entry);
                   }
@@ -248,13 +351,15 @@ namespace CIAO
                     ACE_DEBUG ((LM_DEBUG, "We only support entrypoint at this point in CIAO.\n"));
                   }
               }
+
+            continue; // continue for the next artifact
           }
 
         // As one can see, code is duplicated here. I will come back for this later.
         // For exec artifact
         if (!exec_found &&
                 ((pos  = tmp.find ("_exec")) != ACE_CString::npos ||
-                (pos  = tmp.find ("_Exec")) != ACE_CString::npos))
+                 (pos  = tmp.find ("_Exec")) != ACE_CString::npos))
           {
             if (arti.location.length() < 1 )
               {
@@ -263,22 +368,22 @@ namespace CIAO
               }
 
             exec_found = true;
-            // Cpoy the servant dll/so name.
+            // Copy the servant dll/so name.
             // @@ Note: I ignore all the other locations except the first one.
             exec_found = true;
-            impl_infos[i].executor_dll = 
-              CORBA::string_dup (arti.location[0].in ());
+            impl_infos[i].executor_dll =
+              CORBA::string_dup (arti.location[0]);
 
             // Get the entry point.
             const CORBA::ULong prop_length = arti.execParameter.length ();
             for (CORBA::ULong prop_num = 0;
-                prop_num < prop_length;
-                ++prop_num)
+                 prop_num < prop_length;
+                 ++prop_num)
               {
                 ACE_CString name (arti.execParameter[prop_num].name.in ());
                 if (name == ACE_CString ("entryPoint"))
                   {
-                    const char * entry;
+                    const char * entry = 0;
                     (arti.execParameter[prop_num].value) >>= entry;
                     impl_infos[i].executor_entrypt = CORBA::string_dup (entry);
                   }
@@ -296,3 +401,193 @@ namespace CIAO
     return true;
   }
 }
+
+bool
+CIAO::Containers_Info_Map::
+is_shared_component (ACE_CString & name)
+{
+  for (CORBA::ULong i = 0; i < this->shared_components_.length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->shared_components_[i].name.in (),
+                          name.c_str ()) == 0)
+        return true;
+    }
+
+  return false;
+}
+
+
+/*---------------------------------------------------------------------
+ * functions to support HTTP capabilities of the NodeApplicationManager
+ * @author Stoyan Paunov
+ *
+ * Purpose: Adding the HTTP access code which will resove
+ * any references to HTTP URLs
+ */
+
+  // This function checks if the HTTP_DOWNLOAD_PATH is
+  // in the library load path
+  void
+  CIAO::Containers_Info_Map::update_loader_path (void)
+  {
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    char* path = ACE_OS::getenv ("PATH");
+#else
+    char* path = ACE_OS::getenv ("LD_LIBRARY_PATH");
+#endif
+
+    if (ACE_OS::strstr (path, this->HTTP_DOWNLOAD_PATH.c_str ()))
+       return;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    ACE_CString new_path = "PATH=";
+#else
+    ACE_CString new_path = "LD_LIBRARY_PATH=";
+#endif
+
+    new_path += this->HTTP_DOWNLOAD_PATH;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    new_path += ";";
+#else
+    new_path += ":";
+#endif
+
+    new_path += path;
+
+//turn off the HTTP feature for Linux until
+//I discover what the problem with Linux is
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    ACE_OS::putenv (new_path.c_str ());
+#endif
+
+  }
+
+  //This function resolves any http location references
+  //in the name of the implementation artifacts
+  //It returns true on success and false on failure
+
+  bool
+  CIAO::Containers_Info_Map::resolve_http_reference (const char* location,
+                                                     ACE_CString &path)
+  {
+
+    ACE_DEBUG ((LM_INFO,
+               "Attempting to download %s\n",
+               location));
+
+    //figure out the file name
+    char* name = const_cast<char*> (location);
+    char* p = NULL;
+    while (1)
+    {
+      if (p = ACE_OS::strstr (name, "/"))
+      {
+        name = ++p;
+        continue;
+      }
+      else if (p = ACE_OS::strstr (name, "\\"))
+      {
+        name = ++p;
+        continue;
+      }
+      else
+        break;
+    }
+
+    //get the file
+    ACE_Message_Block* mb = 0;
+    ACE_NEW_RETURN (mb, ACE_Message_Block (0,0), false);
+
+    if (!this->retrieve_via_HTTP (location, *mb))
+    {
+      mb->release ();
+      return false;
+    }
+
+    path = HTTP_DOWNLOAD_PATH;
+    path += "/";
+    path += name;
+
+    if (!this->write_to_disk (path.c_str (), *mb))
+    {
+      mb->release ();
+      return false;
+    }
+
+    mb->release ();
+    return true;
+  }
+
+  //function to retvieve a file via HTTP
+  //stores the file in the passed preallocated ACE_Message_Block
+  //returns 1 on success
+  //        0 on error
+
+  bool
+  CIAO::Containers_Info_Map::retrieve_via_HTTP (const char* URL,
+                                                ACE_Message_Block &mb)
+  {
+    URL_Parser *parser = TheURL_Parser::instance ();
+    if (!parser->parseURL (const_cast<char*> (URL)))
+    return false;
+
+    // Create a client
+    HTTP_Client client;
+
+    // Open the client
+    if (client.open (parser->filename_,
+                     parser->hostname_,
+                     parser->port_) == -1)
+    {
+        client.close ();
+        return false;
+    }
+
+    // Read from it
+    if (client.read (&mb) <= 0)
+    {
+        client.close ();
+        return false;
+    }
+
+    return true;
+  }
+
+  //This function attempts to write a sequence of bytes from an
+  //ACE_Message_Block to a specified location. A 0 is returned
+  //in the case of an error and a 1 upon success
+
+  bool
+  CIAO::Containers_Info_Map::write_to_disk (const char* full_path,
+                                            ACE_Message_Block& mb,
+                                            bool replace)
+  {
+    ACE_stat stat;
+
+    if (ACE_OS::stat(full_path, &stat) != -1 && !replace)
+       return false;
+
+    // Open a file handle to the local filesystem
+    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
+    if (handle == ACE_INVALID_HANDLE)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("[CIAO::Containers_Info_Map::write_to_disk]"),
+                           ACE_TEXT (" file creation error")),
+                           false);
+
+    //write the data to the file
+    for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
+    if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("[CIAO::Containers_Info_Map::write_to_disk]"),
+                           ACE_TEXT (" write error")),
+                           false);
+
+    // Close the file handle
+    ACE_OS::close (handle);
+
+    return true;
+  }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 253a1f7e767..4fb23a46f19 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * @file Containers_Info_Map.h
  * @author Gan Deng <dengg@dre.vanderbilt.edu>
  *
@@ -15,8 +15,14 @@
 
 #include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager.h"
+
+//added for the HTTP support
+#include "ace/Message_Block.h"      //for ACE_Message_Block
+
 #include "ciao/DeploymentC.h"
 #include "ace/SString.h"
+#include "CIAO_NAM_Export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -30,17 +36,34 @@ namespace CIAO
    * This is a helper class to populate the NodeImplementationInfo struct from
    * a deployment plan..
    */
-  class Containers_Info_Map
+  class CIAO_NAM_Export Containers_Info_Map
   {
   public:
 
-    Containers_Info_Map (const Deployment::DeploymentPlan & plan);
+    Containers_Info_Map (const Deployment::DeploymentPlan & plan,
+            const Deployment::ComponentPlans & shared_components);
 
     Deployment::ContainerImplementationInfos *
       containers_info (void);
 
   private:
-    typedef 
+    void initialize_map (void);
+    bool build_map (void);
+
+    bool insert_instance_into_map (
+      const Deployment::InstanceDeploymentDescription & instance);
+
+    bool insert_instance_into_container (
+      const Deployment::InstanceDeploymentDescription & instance,
+      Deployment::ComponentImplementationInfos & impl_infos);
+
+    /// Helper function to check wheather a component instance
+    /// is in the "shared components list".
+    bool is_shared_component (ACE_CString & name);
+
+    //Deployment::ContainerImplementationInfos_var containers_info_;
+
+    typedef
     ACE_Hash_Map_Manager_Ex <ACE_CString,
                             Deployment::ContainerImplementationInfo *,
                             ACE_Hash<ACE_CString>,
@@ -48,24 +71,61 @@ namespace CIAO
                             ACE_Null_Mutex> MAP;
 
     typedef MAP::iterator Iterator;
-
     MAP map_;
 
     const Deployment::DeploymentPlan & plan_;
 
-    //Deployment::ContainerImplementationInfos_var containers_info_;
-
-  private:
+    /// shared components list, passed in from NodeImplementationInfoHandler
+    /// class.
+    Deployment::ComponentPlans shared_components_;
+
+    /**-------------------------------------------------------------------
+     * HTTP capability
+     * @author Stoyan Paunov
+     *
+     * Purpose: Adding the HTTP access code which will resove
+     * any references to HTTP URLs
+     */
+  protected:
+
+    //directory in which to download the libraries obtained via HTTP
+    ACE_CString HTTP_DOWNLOAD_PATH;
+
+    /// This function checks if the HTTP_DOWNLOAD_PATH is
+    /// in the library load path
+    void
+    update_loader_path (void);
+
+    /// This function resolves any http location references
+    /// in the name of the implementation artifacts
+    /// It returns true on success and false on failure
+
+    bool
+    resolve_http_reference (const char* location,
+                            ACE_CString &name);
+
+    /// function to retvieve a file via HTTP
+    /// stores the file in the passed preallocated ACE_Message_Block
+    /// returns 1 on success
+    ///         0 on error
+
+    bool
+    retrieve_via_HTTP (const char* URL,
+                       ACE_Message_Block &mb);
+
+    /// function that writes out a file to a specified location on the hand disk
+    /// returns 1 on success
+    ///         0 on already exists and replace == false
+    ///         0 on error
+
+    bool
+    write_to_disk (const char* full_path,
+                   ACE_Message_Block& mb,
+                   bool replace = true);
+
+    /// TODO: Fuction to remove the downloaded library to ensure
+    ///       consisterncy in future runs
 
-    void initialize_map (void);
-    bool build_map (void);
-
-    bool insert_instance_into_map (
-      const Deployment::InstanceDeploymentDescription & instance);
-
-    bool insert_instance_into_container (
-      const Deployment::InstanceDeploymentDescription & instance,
-      Deployment::ComponentImplementationInfos & impl_infos);
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 1075d2d217a..03e2f530251 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -6,27 +6,28 @@
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
-NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan) : 
+NodeImplementationInfoHandler (const ::Deployment::DeploymentPlan & plan,
+                               const Deployment::ComponentPlans & shared_components) :
   plan_ (plan),
   node_info_ (0),
-  containers_info_map_ (plan)
+  containers_info_map_ (plan, shared_components)
 {
   ACE_NEW (node_info_, ::Deployment::NodeImplementationInfo);
   this->populate_server_resource_def ();
   this->populate_container_impl_infos ();
 }
 
-Deployment::NodeImplementationInfo * 
+Deployment::NodeImplementationInfo *
 CIAO::NodeImplementationInfoHandler::node_impl_info (void) const
 {
   Deployment::NodeImplementationInfo_var retv;
-  ACE_NEW_RETURN (retv, 
+  ACE_NEW_RETURN (retv,
                   Deployment::NodeImplementationInfo (this->node_info_.in ()),
                   0);
   return retv._retn ();
 }
 
-void 
+void
 CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 {
   const CORBA::ULong instance_len = plan_.instance.length ();
@@ -36,51 +37,51 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 
   // Iterate over the instance list to find whether any server resource
   // has been specified
+  // TODO: We shoud do some sanity check here, since all the component
+  // instance in this NodeApplication should have the same "server_resource_def"
+  // defined. Since currently we ignored this sanity check, then will allow
+  // users to specify some self-conflicting configuration in the descriptor.
   for (i = 0; i < instance_len; ++i)
     {
-      if (this->plan_.instance[i].deployedResource.length () != 0)
+      if (false && this->plan_.instance[i].deployedResource.length () != 0)
         {
-          target_resource_id = 
+          target_resource_id =
             this->plan_.instance[i].deployedResource[0].resourceName.in ();
-          break;
-        }
-    }
 
-  if (i != instance_len)
-    {
-      // Some component instance has server resource usage defined, so we
-      // set the <nodeapp_config> field of the NodeImplementationInfo struct.
-      for (CORBA::ULong j = 0; j < this->plan_.infoProperty.length (); ++j)
-        {
-          CIAO::DAnCE::ServerResource *server_resource_def = 0;
-          this->plan_.infoProperty[j].value >>= server_resource_def;
-
-          if (ACE_OS::strcmp ((*server_resource_def).Id, 
-                              target_resource_id) == 0)
+          // Some component instance has server resource usage defined, so we
+          // set the <nodeapp_config> field of the NodeImplementationInfo struct.
+          for (CORBA::ULong j = 0; j < this->plan_.infoProperty.length (); ++j)
             {
-              // Found the target server resource def, and store it.
-              this->node_info_->nodeapp_config.length (1);
+              CIAO::DAnCE::ServerResource *server_resource_def = 0;
+              this->plan_.infoProperty[j].value >>= server_resource_def;
+
+              if (ACE_OS::strcmp ((*server_resource_def).Id,
+                                  target_resource_id) == 0)
+                {
+                  // Found the target server resource def, and store it.
+                  this->node_info_->nodeapp_config.length (1);
 
-              this->node_info_->nodeapp_config[0].name = 
-                CORBA::string_dup ("CIAOServerResource");
+                  this->node_info_->nodeapp_config[0].name =
+                    CORBA::string_dup ("CIAOServerResource");
 
-              this->node_info_->nodeapp_config[0].value <<= 
-                server_resource_def;
-              break;
+                  this->node_info_->nodeapp_config[0].value <<=
+                    *server_resource_def;
+                  break;
+                }
             }
         }
     }
 }
 
-void 
+void
 CIAO::NodeImplementationInfoHandler::populate_container_impl_infos (void)
 {
-  CORBA::ULong curr_len = 
+  CORBA::ULong curr_len =
     this->containers_info_map_.containers_info ()->length ();
   ACE_UNUSED_ARG (curr_len);
-  
+
   // assignment operation
-  this->node_info_->impl_infos = 
+  this->node_info_->impl_infos =
     *(this->containers_info_map_.containers_info ());
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
index 1c4825064a6..475802f3d1a 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
@@ -25,7 +25,7 @@
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Containers_Info_Map.h"
-
+#include "CIAO_NAM_Export.h"
 
 //@@ I wish we could have precompiled header support soon!!!
 
@@ -34,12 +34,14 @@
 
 namespace CIAO
 {
-  class NodeImplementationInfoHandler
+  class CIAO_NAM_Export NodeImplementationInfoHandler
   {
   public:
-    NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan);
+    NodeImplementationInfoHandler (
+        const ::Deployment::DeploymentPlan & plan,
+        const Deployment::ComponentPlans & shared_components);
 
-    Deployment::NodeImplementationInfo * 
+    Deployment::NodeImplementationInfo *
       node_impl_info (void) const;
 
   private:
@@ -51,20 +53,11 @@ namespace CIAO
 
     void populate_container_impl_infos (void);
 
-    /// Helper class that helps populate the container_impl_infos 
+    /// Helper class that helps populate the container_impl_infos
     /// field.
     Containers_Info_Map containers_info_map_;
   };
 }
 
-//#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-//#include "ImplementationInfo.cpp"
-//#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-//#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-//#pragma implementation ("ImplementationInfo.cpp")
-//#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
 #include /**/ "ace/post.h"
 #endif /* IMPLEMENTATIONIFO_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index f4c2b0dd4e7..647de59bb17 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,15 +1,40 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub {
+project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub {
 
   sharedname   = NodeApplicationManager
+  after       += NodeManager_stub CIAO_TargetManager_stub
   idlflags    += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
   dynamicflags = CIAO_NAM_BUILD_DLL
+  dynamicflags += NOOP_CONFIGURATOR_BUILD_DLL
 
+// @@TODO: This ../NodeApplication business need to go.  It would be better
+// to factor that stuff into a separate lib, ie. NodeApplication_Impl
+// and link it in.  For the time being, since the release is so close,
+// i will leave it the way it is.
   Source_Files {
     NodeApplicationManager_Impl.cpp
     ImplementationInfo.cpp
     Containers_Info_Map.cpp
+    URL_Parser.cpp
+    HTTP_Handler.cpp
+    HTTP_Client.cpp
+    ../NodeApplication/NodeApplication_Core.cpp
+    ../NodeApplication/NodeApp_Configurator.cpp
+    ../NodeApplication/NodeApplication_Impl.cpp
+    ../NodeApplication/Container_Impl.cpp
+    ../NodeApplication/Configurator_Factory.cpp
+    ../NodeApplication/NoOp_Configurator.cpp
+  }
+
+  Header_Files {
+    NodeApplicationManager_Impl.h
+    ImplementationInfo.h
+    Containers_Info_Map.h
+    URL_Parser.h
+    HTTP_Handler.h
+    HTTP_Client.h
+    NodeApplicationManager_Export.h
   }
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 0a5a85eb72f..89db1aa27b5 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -2,25 +2,848 @@
 
 #include "NodeApplicationManager_Impl.h"
 #include "ace/Process.h"
+#include "ace/Process_Manager.h"
+#include "ace/Reactor.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Sched_Params.h"
+#include "ace/Vector_T.h"
+#include "ciao/Container_Base.h"
+#include "NodeApplication/NodeApplication_Impl.h"
+#include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplicationManager_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 
+bool
+CIAO::NodeApplicationManager_Impl_Base::
+is_shared_component (ACE_CString & name)
+{
+  for (CORBA::ULong i = 0; i < this->shared_components_.length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->shared_components_[i].name.in (),
+                          name.c_str ()) == 0)
+        return true;
+    }
+
+  return false;
+}
+
+bool
+CIAO::NodeApplicationManager_Impl_Base::
+is_external_component (ACE_CString & name)
+{
+  for (CORBA::ULong i = 0; i < this->external_components_.length (); ++i)
+    {
+      if (ACE_OS::strcmp (this->external_components_[i].name.in (),
+                          name.c_str ()) == 0 &&
+          ACE_OS::strcmp (this->external_components_[i].plan_uuid.in (),
+                          this->plan_.UUID.in ()))
+        return true;
+    }
+
+  return false;
+}
+
+Deployment::Connections *
+CIAO::NodeApplicationManager_Impl_Base::
+create_connections (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::ResourceNotAvailable,
+                   Deployment::StartError,
+                   Deployment::InvalidProperty))
+{
+  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_connections");
+  Deployment::Connections_var retv;
+
+  ACE_NEW_THROW_EX (retv,
+                    Deployment::Connections (),
+                    CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  CORBA::ULong len = retv->length ();
+
+  const Component_Iterator end (this->component_map_.end ());
+  for (Component_Iterator iter (this->component_map_.begin ());
+       iter != end;
+       ++iter)
+    {
+      // If this component is in the "shared components list", then we
+      // should just simply fetch the port object references from the
+      // NodeManager.
+      ACE_CString comp_name ((*iter).ext_id_.c_str ());
+
+      // Get all the facets first
+      Components::FacetDescriptions_var facets;
+
+      if (is_shared_component (comp_name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+                      comp_name.c_str ()));
+          facets = this->node_manager_->get_all_facets (comp_name);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
+                      "all facets\n",
+                      comp_name.c_str ()));
+          facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->node_manager_->set_all_facets (comp_name, facets);
+        }
+      
+      if (CIAO::debug_level () > 9)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::create_connections -"
+                      "success getting facets for the component "
+                      "instance [%s] \n",
+                      comp_name.c_str ()));
+        }
+
+      // Get all the event consumers
+      Components::ConsumerDescriptions_var consumers;
+
+      if (is_shared_component (comp_name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+                      comp_name.c_str ()));
+          consumers = this->node_manager_->get_all_consumers (comp_name);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
+                      "all facets\n",
+                      comp_name.c_str ()));
+          consumers =
+            ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->node_manager_->set_all_consumers (comp_name, consumers);
+        }
+
+      if (CIAO::debug_level () > 9)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::create_connections -"
+                      "success getting consumers for the component "
+                      "instance [%s] \n",
+                      comp_name.c_str ()));
+        }
+
+      CORBA::ULong facet_len = facets->length ();
+      CORBA::ULong consumer_len = consumers->length ();
+
+      CORBA::ULong curr_len = retv->length ();
+      retv->length (curr_len + facet_len + consumer_len);
+
+      CORBA::ULong i = 0;
+      for (i = 0; i < facet_len; ++i)
+        {
+          Deployment::Connection & conn = retv[len];
+          conn.instanceName = (*iter).ext_id_.c_str ();
+          conn.portName = facets[i]->name ();
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                          "CIAO::NodeApplicationManager_Impl::create_connections -"
+                          "adding connection for facet [%s] in instance [%s] \n",
+                          conn.portName.in (), conn.instanceName.in ()));
+            }
+          conn.kind = Deployment::Facet;
+          conn.endpoint = CORBA::Object::_duplicate (facets[i]->facet_ref ());
+          ++len;
+        }
+
+      for (i = 0; i < consumer_len; ++i)
+        {
+          Deployment::Connection & conn = retv[len];
+          conn.instanceName = (*iter).ext_id_.c_str ();
+          conn.portName = consumers[i]->name ();
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                          "CIAO::NodeApplicationManager_Impl::create_connections -"
+                          "adding connection for consumer [%s] in instance [%s] \n",
+                          conn.portName.in (), conn.instanceName.in ()));
+            }
+          conn.kind = Deployment::EventConsumer;
+          conn.endpoint = CORBA::Object::_duplicate (consumers[i]->consumer ());
+          ++len;
+        }
+    }
+  return retv._retn ();
+}
+
+Deployment::Application_ptr
+CIAO::NodeApplicationManager_Impl_Base::
+startLaunch (const Deployment::Properties & configProperty,
+             Deployment::Connections_out providedReference,
+             CORBA::Boolean start
+             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::ResourceNotAvailable,
+                   Deployment::StartError,
+                   Deployment::InvalidProperty))
+{
+  ACE_TRY
+    {
+      CIAO_TRACE("CIAO::NodeApplicationManager_Impl::startLaunch");
+      ACE_UNUSED_ARG (configProperty);
+      ACE_UNUSED_ARG (start);
+
+      // In this step, we know all the "shared components" are
+      // the external components to ourself.
+      this->external_components_ = this->shared_components_;
+
+      // If no additional components need to be installed, then we simply
+      // create a NA, but doesn't install any components on it.
+      if (this->plan_.instance.length () == this->shared_components_.length ())
+        {
+          ACE_DEBUG ((LM_DEBUG, "Prespawn a NodeApplication process without "
+                      "installing any components.\n"));
+        }
+
+      /**
+       *  1. First Map properties to TAO/CIAO specific property/configurations
+       *  2. Necessary property checking (needed?)
+       *  3. Call create_nade_application to spawn new process.
+       *  4. Initialize the NodeApplication.
+       *  5. get the provided connection endpoints back and return them.
+       */
+
+      NodeImplementationInfoHandler handler (this->plan_, this->shared_components_);
+
+      Deployment::NodeImplementationInfo * node_info =
+        handler.node_impl_info ();
+
+      if (!node_info)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "DAnCE (%P|%t) NodeApplicationManager.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::startLaunch -"
+                      "Failed to create Node Implementation Infos!\n"));
+
+          ACE_TRY_THROW
+            (Deployment::StartError ("NodeApplicationManager_Imp::startLaunch",
+                                     "Unable to get node level infos"));
+        }
+
+      CIAO::DAnCE::ServerResource *server_resource = 0;
+      for (CORBA::ULong k = 0; k < node_info->nodeapp_config.length (); ++k)
+        {
+          if (ACE_OS::strcmp (node_info->nodeapp_config[k].name.in (),
+                              "CIAOServerResources") == 0)
+            {
+              node_info->nodeapp_config[0].value >>= server_resource;
+              break; // Ignore the rest of the NodeApp_Config values
+            }
+        }
+
+      // Now spawn the NodeApplication process.
+      // @@TODO: we need to pass arguments to the nodeapplication, ie
+      // naming service endpoints, if necessary
+      // (will)
+      ACE_CString cmd_option (this->nodeapp_command_op_.in ());
+
+      if (server_resource)
+        {
+          // If command line options are specified through RTCCM descriptors,
+          // then we should honor these command line options as well.
+          for (CORBA::ULong arg_i = 0;
+               arg_i < (*server_resource).args.length ();
+               ++arg_i)
+            {
+              cmd_option += " "; // space between command line args
+              cmd_option += (*server_resource).args[arg_i];
+            }
+
+          // If service configuration file is specified through RTCCM
+          // descriptors, then we should honor it as well.
+          if (ACE_OS::strcmp ((*server_resource).svcconf.in (),
+                              "") != 0)
+            {
+              cmd_option += " -ORBSvcConf ";
+              cmd_option += (*server_resource).svcconf;
+            }
+        }
+
+      Deployment::NodeApplication_var tmp =
+        create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CIAO::debug_level () > 9)
+        {
+          CORBA::ULong curr_len = node_info->impl_infos.length ();
+          ACE_UNUSED_ARG (curr_len);
+
+          Deployment::ComponentImplementationInfos infos =
+            ((node_info->impl_infos)[0]).impl_infos;
+
+          const CORBA::ULong info_len = infos.length ();
+          for (CORBA::ULong i = 0; i < info_len; ++i)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) NodeApplicationManager.cpp -"
+                          "CIAO::NodeApplicationManager_Impl::startLaunch -"
+                          "The info for installation: "
+                          "\n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
+                          infos[i].component_instance_name.in (),
+                          infos[i].executor_dll.in (),
+                          infos[i].executor_entrypt.in (),
+                          infos[i].servant_dll.in (),
+                          infos[i].servant_entrypt.in () ));
+            }
+        }
+
+      // This is what we will get back, a sequence of component object refs.
+      Deployment::ComponentInfos_var comp_info;
+
+      // This will install all homes and components.
+      comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+
+      // Now fill in the map we have for the "newly installed" components.
+      const CORBA::ULong comp_len = comp_info->length ();
+      for (CORBA::ULong len = 0;
+           len < comp_len;
+           ++len)
+        {
+          //Since we know the type ahead of time...narrow is omitted here.
+          if (this->component_map_.
+              bind (comp_info[len].component_instance_name.in(),
+                    Components::CCMObject::_duplicate
+                    (comp_info[len].component_ref.in())))
+            {
+              ACE_CString error ("Duplicate component instance name ");
+              error += comp_info[len].component_instance_name.in();
+
+              ACE_TRY_THROW
+                (Deployment::StartError
+                 ("NodeApplicationManager_Impl::startLaunch",
+                  error.c_str ()));
+            }
+        }
+
+      // Also, we need to fill in the map about those "shared components"
+      // For now, we could use "NIL" component object reference for these
+      // shared components since they are not used anyway.
+      CORBA::ULong shared_comp_length = this->shared_components_.length ();
+      for (CORBA::ULong j = 0; j < shared_comp_length; ++j)
+        {
+          if (this->component_map_.
+              bind (this->shared_components_[j].name.in (),
+                    Components::CCMObject::_nil ()))
+            {
+              ACE_CString error ("Duplicate component instance name ");
+              error += this->shared_components_[j].name.in();
+
+              ACE_TRY_THROW
+                (Deployment::StartError
+                 ("NodeApplicationManager_Impl::startLaunch",
+                  error.c_str ()));
+            }
+        }
+
+
+      providedReference =
+        this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (providedReference == 0)
+        {
+          ACE_TRY_THROW
+            (Deployment::StartError
+             ("NodeApplicationManager_Impl::startLaunch",
+              "Error creating connections for components during startLaunch."));
+        }
+    }
+  ACE_CATCH (Deployment::UnknownImplId, e)
+    {
+      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
+    {
+      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_CATCH (Deployment::InstallationFailure,e)
+    {
+      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (Deployment::Application::_nil());
+
+  return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
+}
+
+
+Deployment::Application_ptr
+CIAO::NodeApplicationManager_Impl_Base::
+perform_redeployment (const Deployment::Properties & configProperty,
+                      Deployment::Connections_out providedReference,
+                      CORBA::Boolean /*add_or_remove*/, // true means "add" only
+                      CORBA::Boolean start
+                      ACE_ENV_ARG_DECL)
+  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.
+  //        We also got a copy of <plan_> as well as all the installed components
+  //        in the <component_map_>.
+  //    (2) Then we should call <install> operation on the NA, but in order to do this,
+  //        we must pack all the to-be-added components into some appropriate
+  //        data structure called "NodeImplementationInfo".
+  //    (3) We should also call <remove> operation on the NA to remove those
+  //        to-be-removed components, and the "comp_inst_name" could be as input.
+  //    (4) We should also consider removing all the unneeded "connections", but
+  //        this should be driven by the DAM, so it looks like that we need to
+  //        add another operation on the NA interface which is a counterpart of
+  //        <finishLaunch>, something like <finishLaunch_remove_only>.
+  //
+  //
+  //
+  //    (1) If this is an brand new NAM, then only new installation is needed.
+  //    (2) Then we could pretty much replicate the "startLaunch" implementation.
+  //        This capability is useful to install a set of new components into
+  //        some totally new nodes.
+
+  ACE_UNUSED_ARG (configProperty);
+  ACE_UNUSED_ARG (start);
+
+  CIAO_TRACE ("CIAO::NodeApplicationManager_Impl_Base::perform_redeployment");
+
+  ACE_DEBUG ((LM_DEBUG,
+              "CIAO (%P|%t) NodeApplicationManager_Impl_Base: "
+              "invoked CIAO::NodeApplicationManager_Impl_Base::perform_redeployment \n"));
+  ACE_TRY
+    {
+      if (! CORBA::is_nil (this->nodeapp_.in ()))
+        {
+          // We ignored those components that are already in the <component_map_>, for
+          // the rest ones, we pack them into NodeImplementationInfo.
+          Deployment::DeploymentPlan tmp_plan = this->plan_;
+          tmp_plan.instance.length (0);
+
+          CORBA::ULong const length = this->plan_.instance.length ();
+          for (CORBA::ULong i = 0; i <  length; ++i)
+            {
+              // add the new components into the tmp_plan
+              if (this->component_map_.find (this->plan_.instance[i].name.in ()) != 0)
+                {
+                  CORBA::ULong cur_len = tmp_plan.instance.length ();
+                  tmp_plan.instance.length (cur_len + 1);
+                  tmp_plan.instance[cur_len] = this->plan_.instance[i];
+                }
+            }
+
+          // package the components
+          NodeImplementationInfoHandler handler (tmp_plan,
+                                                 this->shared_components_);
+          Deployment::NodeImplementationInfo * node_info =
+            handler.node_impl_info ();
+
+          if (!node_info)
+            {
+              this->add_new_components ();
+            }
+
+          // Install the components
+          // This is what we will get back, a sequence of compoent object refs.
+          Deployment::ComponentInfos_var comp_info;
+          comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          // Now fill in the map we have for the components.
+          const CORBA::ULong comp_len = comp_info->length ();
+          for (CORBA::ULong len = 0;
+               len < comp_len;
+               ++len)
+            {
+              //Since we know the type ahead of time...narrow is omitted here.
+              if (this->component_map_.
+                  bind (comp_info[len].component_instance_name.in(),
+                        Components::CCMObject::_duplicate
+                        (comp_info[len].component_ref.in())))
+                {
+                  ACE_CString error ("Duplicate component instance name ");
+                  error += comp_info[len].component_instance_name.in();
+
+                  ACE_TRY_THROW
+                    (Deployment::PlanError
+                     ("NodeApplicationManager_Impl::startLaunch",
+                      error.c_str ()));
+                }
+            }
+
+          // NOTE: We are propogating back "all" the facets/consumers object
+          // references to the DAM, including the previous existing ones.
+          providedReference =
+            this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (providedReference == 0)
+            {
+              ACE_TRY_THROW
+                (Deployment::InstallationFailure
+                  ("NodeApplicationManager_Impl::startLaunch",
+                    "Error creating connections during startLaunch."));
+            }
+        }
+      else // This is a new NodeApplication process, then we need to install
+           // all the components. We should try to reuse much of the above code.
+        {
+          this->startLaunch (configProperty,
+                             providedReference,
+                             start
+                             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCH (Deployment::UnknownImplId, e)
+    {
+      ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (),
+                                                   e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
+    {
+      ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (),
+                                                            e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_CATCH (Deployment::InstallationFailure,e)
+    {
+      ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (),
+                                                         e.reason.in ()),
+                        Deployment::Application::_nil());
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (Deployment::Application::_nil());
+
+  return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
+}
+
+
+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))
+{
+  ACE_TRY
+    {
+      // We ignored those components that are already in the <component_map_>, for
+      // the rest ones, we pack them into NodeImplementationInfo.
+      Deployment::DeploymentPlan tmp_plan = this->plan_;
+      tmp_plan.instance.length (0);
+
+      const CORBA::ULong length = this->plan_.instance.length ();
+      for (CORBA::ULong i = 0; i < length; ++i)
+        {
+          // add the new components into the tmp_plan
+          if (this->component_map_.find (this->plan_.instance[i].name.in ()) != 0)
+            {
+              CORBA::ULong cur_len = tmp_plan.instance.length ();
+              tmp_plan.instance.length (cur_len + 1);
+              tmp_plan.instance[cur_len] = this->plan_.instance[i];
+            }
+        }
+
+      // If there are no new components to be installed ...
+      if (tmp_plan.instance.length () == 0)
+        return;
+
+      // package the components
+      NodeImplementationInfoHandler handler (tmp_plan,
+                                             this->shared_components_);
+      Deployment::NodeImplementationInfo * node_info =
+        handler.node_impl_info ();
+
+      if (!node_info)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "DAnCE (%P|%t) NodeApplicationManager.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::perform_redeployment -"
+                      "Failed to create Node Implementation Infos!\n"));
+
+          ACE_TRY_THROW
+            (Deployment::PlanError ("NodeApplicationManager_Imp::perform_redeployment",
+                                    "Unable to get node level infos"));
+        }
+
+      // Install the components
+      // This is what we will get back, a sequence of component object refs.
+      Deployment::ComponentInfos_var comp_info;
+      comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Now fill in the map we have for the components.
+      const CORBA::ULong comp_len = comp_info->length ();
+      for (CORBA::ULong len = 0;
+          len < comp_len;
+          ++len)
+        {
+          //Since we know the type ahead of time...narrow is omitted here.
+          if (this->component_map_.
+              bind (comp_info[len].component_instance_name.in(),
+                    Components::CCMObject::_duplicate
+                      (comp_info[len].component_ref.in())))
+            {
+              ACE_CString error ("Duplicate component instance name ");
+              error += comp_info[len].component_instance_name.in();
+
+              ACE_TRY_THROW
+                (Deployment::PlanError
+                  ("NodeApplicationManager_Impl::startLaunch",
+                    error.c_str ()));
+            }
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_DEBUG ((LM_ERROR, "NodeApplicationManager_Impl_Base::"
+                  "add_new_components () exception caught.\n"));
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+}
+
+
+void
+CIAO::NodeApplicationManager_Impl_Base::
+remove_existing_components ()
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   ::Deployment::PlanError,
+                   ::Components::RemoveFailure))
+{
+  ACE_TRY
+    {
+      ACE_Vector<ACE_CString> gone_component_list;
+
+      for (Component_Iterator iter (this->component_map_.begin ());
+           iter != this->component_map_.end ();
+           ++iter)
+        {
+          ACE_CString comp_name ((*iter).ext_id_.c_str ());
+
+          // If this component is not in the new deployment plan, then we
+          // should destroy this component and unbind from the map.
+          if (this->is_to_be_removed (comp_name.c_str ()))
+            {
+              ((*iter).int_id_)->ciao_passivate ();
+              this->nodeapp_->remove_component (comp_name.c_str ());
+              gone_component_list.push_back (comp_name);
+            }
+        }
+
+        for (size_t i = 0; i < gone_component_list.size (); ++i)
+          this->component_map_.unbind (gone_component_list[i]);
+    }
+  ACE_CATCHANY
+    {
+      ACE_DEBUG ((LM_ERROR, "NodeApplicationManager_Impl_Base::"
+                  "remove_existing_components () exception caught.\n"));
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+}
+
+bool
+CIAO::NodeApplicationManager_Impl_Base::
+is_to_be_removed (const char * name)
+{
+  const CORBA::ULong length = this->plan_.instance.length ();
+  for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      if (ACE_OS::strcmp (name,
+             this->plan_.instance[i].name.in ()) == 0)
+        {
+          // If we have found it in the new plan, then this component
+          // needs to be kept, and should not be removed.
+          return false;
+        }
+    }
+  return true;
+}
+
+void
+CIAO::NodeApplicationManager_Impl_Base::
+set_shared_components (const Deployment::ComponentPlans & shared
+                       ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+{
+  this->shared_components_ = shared;
+}
+
+void
+CIAO::NodeApplicationManager_Impl_Base::
+destroyApplication (Deployment::Application_ptr app
+                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StopError))
+{
+  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::destroyApplication");
+  ACE_UNUSED_ARG (app);
+
+  ACE_DEBUG ((LM_DEBUG, "NAM: entering DA\n"));
+  //ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
+  //@@ Since we know there is only 1 nodeapp so the passed in
+  //   parameter is ignored for now.
+  if (CORBA::is_nil (this->nodeapp_.in () ))
+    ACE_THROW (Deployment::StopError ());
+
+  // Iterate over all the components within this NAM, and if it's
+  // not a shared component, then remove it. If all the components
+  // are removed, then we shall kill the NA totally.
+  for (CORBA::ULong i = 0; i < this->plan_.instance.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "NAM: first for loop: %s\n",
+                  this->plan_.instance[i].name.in ()));
+      ACE_CString name = plan_.instance[i].name.in ();
+      if (this->is_shared_component (name))
+        {
+          this->component_map_.unbind (name);
+          continue;
+        }
+
+      // If this is not a shared component and is installed within
+      // this NAM, then remove it. Otherwise, we do nothing.
+      // Ideally, we should ask NM to remove this component for
+      // us even if this is not within this NAM.
+      if (! this->is_external_component (name))
+        {
+          this->nodeapp_->remove_component (name.c_str ());
+          this->component_map_.unbind (name);
+        }
+    }
+
+  // Call remove on NodeApplication, if all the components are removed,
+  // then the NodeApplication will kill itself.
+  ACE_DEBUG ((LM_DEBUG, "NAM: calling remove\n"));
+  this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DEBUG ((LM_DEBUG, "NAM: remove returned\n"));
+  ACE_CHECK;
+
+  return;
+}
+
+// The set priority method
+::CORBA::Long
+CIAO::NodeApplicationManager_Impl_Base::set_priority (
+                                                      const char * cid,
+                                                      const ::Deployment::Sched_Params & params
+                                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+{
+  if (CIAO::debug_level () > 20)
+    {
+      ACE_DEBUG ((LM_DEBUG , "NAM::The component Id received [%s]", cid));
+
+      ACE_DEBUG ((LM_DEBUG ,
+                  "NAM::The params are policy [%d], priority [%d], "
+                  "scope [%d], time [%d]\n",
+                  params.policy_ ,
+                  params.priority_,
+                  params.scope_, params.msec_));
+    }
+
+  // First validate the values coming in ....
+  ACE_Sched_Params::Policy policy = params.policy_;
+
+  if (policy != ACE_SCHED_FIFO &&
+      policy != ACE_SCHED_RR &&
+      policy != ACE_SCHED_OTHER)
+    return -1;
+
+  ACE_Sched_Priority priority = params.priority_;
+
+  // check the scope ..
+  if (params.scope_ != ACE_SCOPE_PROCESS &&
+      params.scope_ != ACE_SCOPE_THREAD &&
+      params.scope_ != ACE_SCOPE_LWP)
+    {
+      return -1;
+    }
+
+  // Here form the ACE_Sched_Params structure and pass it on to the Process
+  // manager with the current process id.
+  // @@ TODO: Right now we are ignoring params.msec_ value since
+  // ACE_OS::sched_params fails setting errno = EINVAL if
+  // scope = ACE_PROCESS_SCOPE and quantun != ACE_Time_Value:zero.
+  ACE_Sched_Params sched_params (policy ,
+                                 priority,
+                                 params.scope_,
+                                 ACE_Time_Value::zero);
+
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+  if (node_app_process_manager_.set_scheduler (sched_params, process_id_) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "User is not superuser, therefore cannot modify the "
+                      "priority of the component\n"));
+        }
+      else if (ACE_OS::last_error () == ESRCH)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "No process with PID: %d was found!\n",
+                      process_id_));
+        }
+      else if (ACE_OS::last_error () == EINVAL)
+        {
+          ACE_DEBUG ((LM_DEBUG, "\nGiven sched_params does not make sence "
+                      "for the current scheduling policy\n"));
+        }
+      ACE_ERROR ((LM_ERROR, "NodeApplicationManager  (%P|%t): sched_params "
+                  "failed\n"));
+      return -1;
+    }
+  return 1;
+}
+
+
 CIAO::NodeApplicationManager_Impl::~NodeApplicationManager_Impl (void)
 {
 }
 
+CIAO::NodeApplicationManager_Impl::
+NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                             PortableServer::POA_ptr p)
+  : NodeApplicationManager_Impl_Base (o, p)
+{
+}
+
 PortableServer::ObjectId
 CIAO::NodeApplicationManager_Impl::init (
-    const char *nodeapp_location,
-    const char *nodeapp_op,
-    const CORBA::ULong delay,
-    const Deployment::DeploymentPlan & plan,
-    const PortableServer::POA_ptr callback_poa
-    ACE_ENV_ARG_DECL)
+                                         const char *nodeapp_location,
+                                         const char *nodeapp_op,
+                                         const CORBA::ULong delay,
+                                         const Deployment::DeploymentPlan & plan,
+                                         const PortableServer::POA_ptr callback_poa,
+                                         NodeManager_Impl_Base * nm
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
@@ -36,21 +859,21 @@ CIAO::NodeApplicationManager_Impl::init (
                       "NULL NodeApplication location. \n"));
           ACE_TRY_THROW (CORBA::BAD_PARAM ());
         }
-      
-      
+
       if (delay == 0)
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
                       "CIAO::NodeApplicationManager_Impl::init -"
                       "NodeManager must be started with a -d "
                       "of greter than zero.\n"));
           ACE_TRY_THROW (CORBA::BAD_PARAM ());
         }
-      
+
       this->nodeapp_path_.set (nodeapp_location);
       this->spawn_delay_ = delay;
       this->nodeapp_command_op_ = CORBA::string_dup (nodeapp_op);
+      this->node_manager_ = nm;
 
       // Make a copy of the plan for later usage.
       this->plan_ =  plan;
@@ -73,11 +896,26 @@ CIAO::NodeApplicationManager_Impl::init (
         Deployment::NodeApplicationManager::_narrow (obj.in ()
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      // add the signal handler to the ACE_REACTOR
+
+      /*
+        if (orb_->orb_core ()->reactor ()->
+        register_handler (SIGCHLD,
+        &child_handler_) == -1)
+
+        if (ACE_Reactor::instance ()->register_handler (SIGCHLD,
+        &child_handler_) == -1)
+        {
+        ACE_DEBUG ((LM_DEBUG, "Error in registering Handler\n\n"));
+        }
+      */
     }
+
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplicationManager_Impl::init\t\n");
+                           "NodeApplicationManager_Impl_Base::init\t\n");
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
@@ -87,19 +925,6 @@ CIAO::NodeApplicationManager_Impl::init (
   return oid.in ();
 }
 
-void
-CIAO::NodeApplicationManager_Impl::
-parse_config_value (ACE_CString & str
-                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidProperty))
-{
-  // The unused arg is for future improvemnts.
-  ACE_UNUSED_ARG (str);
-
-  ACE_THROW ( CORBA::NO_IMPLEMENT() );
-}
-
 Deployment::NodeApplication_ptr
 CIAO::NodeApplicationManager_Impl::
 create_node_application (const ACE_CString & options
@@ -122,10 +947,10 @@ create_node_application (const ACE_CString & options
   CIAO::NodeApplication_Callback_Impl * callback_servant = 0;
   ACE_NEW_THROW_EX (callback_servant,
                     CIAO::NodeApplication_Callback_Impl (this->orb_.in (),
-                                                    this->callback_poa_.in (),
-                                                    this->objref_.in (),
-                                                    prop.in ()),
-                                                    CORBA::NO_MEMORY ());
+                                                         this->callback_poa_.in (),
+                                                         this->objref_.in (),
+                                                         prop.in ()),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   PortableServer::ServantBase_var servant_var (callback_servant);
@@ -134,8 +959,10 @@ create_node_application (const ACE_CString & options
                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
-  ACE_Process node_application;
   ACE_Process_Options p_options;
+  ACE_Process_Manager process_manager;
+
+  process_manager.open (10, ACE_Reactor::instance ());
 
   ACE_TRY
     {
@@ -155,35 +982,37 @@ create_node_application (const ACE_CString & options
       ACE_TRY_CHECK;
 
       // spawn the new NodeApplication.
-      p_options.command_line ("%s -k %s"
+      p_options.command_line ("%s -k %s "
                               "%s",
                               this->nodeapp_path_.c_str (),
                               cb_ior.in (),
                               options.c_str ());
 
-      p_options.avoid_zombies (1);
+      p_options.avoid_zombies (0);
+
+      process_id_ = node_app_process_manager_.spawn (p_options,
+                                                     &child_handler_);
 
-      if (node_application.spawn (p_options) == -1)
+      if (process_id_ ==  ACE_INVALID_PID)
         {
           if (CIAO::debug_level () > 1)
             {
-              ACE_DEBUG ((LM_ERROR, 
+              ACE_DEBUG ((LM_ERROR,
                           "Fail to spawn a NodeApplication process\n"));
             }
 
-          ACE_TRY_THROW 
-            (Deployment::ResourceNotAvailable 
-               ("Failed to spawn process",
-                "NodeApplication",
-                "",
-                "",
-                ""));
+          ACE_TRY_THROW
+            (Deployment::ResourceNotAvailable
+             ("Failed to spawn process",
+              "NodeApplication",
+              "",
+              "",
+              ""));
         }
 
       // wait for nodeApp to pass back its object reference. with a
       // timeout value. using perform_work and stuff.
-
-      int looping = 1;
+      bool looping = true;
 
       ACE_Time_Value timeout (this->spawn_delay_, 0);
 
@@ -196,14 +1025,14 @@ create_node_application (const ACE_CString & options
           retval = callback_servant->get_nodeapp_ref ();
 
           if (timeout == ACE_Time_Value::zero || !CORBA::is_nil (retval.in ()))
-            looping = 0;
+            looping = false;
         }
 
       if (CORBA::is_nil (retval.in ()))
         {
           if (CIAO::debug_level () > 1)
             {
-              ACE_ERROR ((LM_ERROR, 
+              ACE_ERROR ((LM_ERROR,
                           "Fail to acquire the NodeApplication object\n"));
             }
 
@@ -212,8 +1041,8 @@ create_node_application (const ACE_CString & options
 
       {
         //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-        this->nodeapp_ = 
-            Deployment::NodeApplication::_duplicate (retval.in ());
+        this->nodeapp_ =
+          Deployment::NodeApplication::_duplicate (retval.in ());
       }
     }
   ACE_CATCHANY
@@ -231,289 +1060,161 @@ create_node_application (const ACE_CString & options
 
   if (CIAO::debug_level () > 1)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-            "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
     }
 
+  // push the component info and the process id to the
+  // NodeManager
+  push_component_info (process_id_);
+
+
   return retval._retn ();
 }
 
-Deployment::Connections *
+
+void
 CIAO::NodeApplicationManager_Impl::
-create_connections (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
+push_component_info (pid_t process_id)
 {
-  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_connections");
-  Deployment::Connections_var retv;
+  CIAO::NodeManager_Impl_Base::Component_Ids comp;
 
-  ACE_NEW_THROW_EX (retv,
-                    Deployment::Connections (),
-                    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+  for (unsigned int i=0;i < plan_.instance.length ();i++)
+    {
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_DEBUG, "The component id is [%s]",
+                      plan_.instance[i].name.in ()));
+        }
+      comp.cid_seq_.insert (plan_.instance[i].name.in ());
+    }
 
-  CORBA::ULong len = retv->length ();
+  comp.process_id_ = process_id;
 
-  const Component_Iterator end (this->component_map_.end ());
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    // Get all the facets first
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "getting facets for the component "
-                  "instance [%s] \n",
-                  (*iter).ext_id_.c_str ()));
-      }
+  node_manager_->push_component_id_info (comp);
+}
 
-    Components::FacetDescriptions_var facets =
-      ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
 
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "success getting facets for the component "
-                  "instance [%s] \n",
-                  (*iter).ext_id_.c_str ()));
-      }
+CIAO::Static_NodeApplicationManager_Impl::~Static_NodeApplicationManager_Impl (void)
+{
+}
 
-    // Get all the event consumers
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "getting consumers for the component "
-                  "instance [%s] \n",
-                  (*iter).ext_id_.c_str ()));
-      }
+CIAO::Static_NodeApplicationManager_Impl::
+Static_NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                    PortableServer::POA_ptr p,
+                                    Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
+  : NodeApplicationManager_Impl_Base (o, p),
+    static_config_entrypoints_maps_ (static_config_entrypoints_maps)
+{
+}
 
-    Components::ConsumerDescriptions_var consumers =
-      ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+PortableServer::ObjectId
+CIAO::Static_NodeApplicationManager_Impl::init (
+                                                const char *nodeapp_location,
+                                                const char *nodeapp_op,
+                                                const CORBA::ULong delay,
+                                                const Deployment::DeploymentPlan & plan,
+                                                const PortableServer::POA_ptr callback_poa,
+                                                NodeManager_Impl_Base * nm
+                                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::InvalidProperty))
+{
+  PortableServer::ObjectId_var oid;
 
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "success getting consumers for the component "
-                  "instance [%s] \n",
-                  (*iter).ext_id_.c_str ()));
-      }
+  ACE_UNUSED_ARG (nodeapp_location);
+  ACE_UNUSED_ARG (nodeapp_op);
+  ACE_UNUSED_ARG (delay);
+  ACE_UNUSED_ARG (callback_poa);
+  ACE_UNUSED_ARG (nm);
+
+  ACE_TRY
+    {
+      // Make a copy of the plan for later usage.
+      this->plan_ =  plan;
 
-    const CORBA::ULong facet_len = facets->length ();
-    const CORBA::ULong consumer_len = consumers->length ();
+      // Activate the ourself.
+      oid = this->poa_->activate_object (this
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    CORBA::ULong curr_len = retv->length ();
-    retv->length (curr_len + facet_len + consumer_len);
+      CORBA::Object_var obj =
+        this->poa_->id_to_reference (oid.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    CORBA::ULong i = 0;
-    for (i = 0; i < facet_len; ++i)
-    {
-      Deployment::Connection & conn = retv[len];
-      conn.instanceName = (*iter).ext_id_.c_str ();
-      conn.portName = facets[i]->name ();
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                    "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                    "CIAO::NodeApplicationManager_Impl::create_connections -"
-                    "adding connection for facet [%s] in instance [%s] \n",
-                    conn.portName.in (), conn.instanceName.in ()));
-        }
-      conn.kind = Deployment::Facet;
-      conn.endpoint = CORBA::Object::_duplicate (facets[i]->facet_ref ());
-      ++len;
+      // And cache the object reference.
+      this->objref_ =
+        Deployment::NodeApplicationManager::_narrow (obj.in ()
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
-
-    for (i = 0; i < consumer_len; ++i)
+  ACE_CATCHANY
     {
-      Deployment::Connection & conn = retv[len];
-      conn.instanceName = (*iter).ext_id_.c_str ();
-      conn.portName = consumers[i]->name ();
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                    "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                    "CIAO::NodeApplicationManager_Impl::create_connections -"
-                    "adding connection for consumer [%s] in instance [%s] \n",
-                    conn.portName.in (), conn.instanceName.in ()));
-        }
-      conn.kind = Deployment::EventConsumer;
-      conn.endpoint = CORBA::Object::_duplicate (consumers[i]->consumer ());
-      ++len;
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NodeApplicationManager_Impl_Base::init\t\n");
+      ACE_RE_THROW;
     }
-  }
-  return retv._retn ();
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (0);
+
+  //return this object reference
+  return oid.in ();
 }
 
-Deployment::Application_ptr
-CIAO::NodeApplicationManager_Impl::
-startLaunch (const Deployment::Properties & configProperty,
-             Deployment::Connections_out providedReference,
-             CORBA::Boolean start
-             ACE_ENV_ARG_DECL)
+Deployment::NodeApplication_ptr
+CIAO::Static_NodeApplicationManager_Impl::
+create_node_application (const ACE_CString & options
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
                    Deployment::InvalidProperty))
 {
-  ACE_TRY
-    {
-
-      CIAO_TRACE("CIAO::NodeApplicationManager_Impl::startLaunch");
-      ACE_UNUSED_ARG (configProperty);
-      ACE_UNUSED_ARG (start);
-      /**
-       *  1. First Map properties to TAO/CIAO specific property/configurations
-       *  2. Necessary property checking (needed?)
-       *  3. Call create_nade_application to spawn new process.
-       *  4. Initialize the NodeApplication.
-       *  5. get the provided connection endpoints back and return them.
-       */
-
-      NodeImplementationInfoHandler handler (this->plan_);
-
-      Deployment::NodeImplementationInfo * node_info =
-        handler.node_impl_info ();
-
-      if (!node_info)
-        {
-          ACE_ERROR ((LM_ERROR, 
-                      "DAnCE (%P|%t) NodeApplicationManager.cpp -"
-                      "CIAO::NodeApplicationManager_Impl::startLaunch -"
-                      "Failed to create Node Implementation Infos!\n"));
-
-          ACE_TRY_THROW 
-            (Deployment::StartError ("NodeApplicationManager_Imp::startLaunch",
-                                     "Unable to get node level infos"));
-        }
-
-      // Now spawn the NodeApplication process.
-      // @@TODO: we need to pass arguments to the nodeapplication, ie naming service endpoints, if necessary
-      // (will)
-      ACE_CString cmd_option (this->nodeapp_command_op_.in ());
-      Deployment::NodeApplication_var tmp =
-        create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CIAO::debug_level () > 9)
-        {
-          CORBA::ULong curr_len = node_info->impl_infos.length ();
-          ACE_UNUSED_ARG (curr_len);
+  ACE_UNUSED_ARG(options);
 
-          Deployment::ComponentImplementationInfos infos =
-            ((node_info->impl_infos)[0]).impl_infos;
-
-          const CORBA::ULong info_len = infos.length ();
-          for (CORBA::ULong i = 0; i < info_len; ++i)
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "DAnCE (%P|%t) NodeApplicationManager.cpp -"
-                          "CIAO::NodeApplicationManager_Impl::startLaunch -"
-                          "The info for installation: "
-                          "\n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
-                          infos[i].component_instance_name.in (),
-                          infos[i].executor_dll.in (),
-                          infos[i].executor_entrypt.in (),
-                          infos[i].servant_dll.in (),
-                          infos[i].servant_entrypt.in () ));
-            }
-        }
+  CIAO::NodeApplication_Impl *nodeapp_servant;
 
-      // This is what we will get back, a sequence of compoent object refs.
-      Deployment::ComponentInfos_var comp_info;
+  ACE_DEBUG ((LM_DEBUG, "create_static_node_application\n"));
 
-      // This will install all homes and components.
-      comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  ACE_NEW_RETURN (nodeapp_servant,
+                  CIAO::NodeApplication_Impl (orb_.in (),
+                                              poa_.in (),
+                                              configurator_,
+                                              this->static_config_entrypoints_maps_),
+                  Deployment::NodeApplication::_nil ()
+                  );
+  if (nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER))
+    {
+      ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+                               initializing the session container!"));
+      return Deployment::NodeApplication::_nil ();
+    }
+  ACE_TRY_CHECK;
 
-      // Now fill in the map we have for the components.
-      const CORBA::ULong comp_len = comp_info->length ();
-      for (CORBA::ULong len = 0;
-           len < comp_len;
-           ++len)
-        {
-          //Since we know the type ahead of time...narrow is omitted here.
-          if (this->component_map_.
-              bind (comp_info[len].component_instance_name.in(),
-                    Components::CCMObject::_duplicate 
-                       (comp_info[len].component_ref.in())))
-            {
-              ACE_CString error ("Duplicate component instance name ");
-              error += comp_info[len].component_instance_name.in();
+  // CONFIGURING NodeApplication
+  PortableServer::ObjectId_var nodeapp_oid
+    = poa_->activate_object (nodeapp_servant
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
 
-              ACE_TRY_THROW 
-                (Deployment::StartError 
-                   ("NodeApplicationManager_Impl::startLaunch",
-                     error.c_str ()));
-            }
-        }
+  CORBA::Object_var
+    obj = poa_->id_to_reference (nodeapp_oid.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
 
-      providedReference = 
-        this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  Deployment::NodeApplication_var nodeapp_obj =
+    Deployment::NodeApplication::_narrow (obj.in ()
+                                          ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
 
-      if (providedReference == 0)
-        {
-          ACE_TRY_THROW 
-            (Deployment::StartError 
-               ("NodeApplicationManager_Impl::startLaunch",
-                "Error creating connections during startLaunch."));
-        }
-    }
-  ACE_CATCH (Deployment::UnknownImplId, e)
-    {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
-    }
-  ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
+  if (CORBA::is_nil (nodeapp_obj.in ()))
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
-    }
-  ACE_CATCH (Deployment::InstallationFailure,e)
-    {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+      ACE_ERROR ((LM_ERROR, "Unable to activate NodeApplication object\n"));
+      return Deployment::NodeApplication::_nil ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::Application::_nil());
 
-  return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
-}
+  this->nodeapp_ = Deployment::NodeApplication::_duplicate (nodeapp_obj.in ());
 
-void
-CIAO::NodeApplicationManager_Impl::
-destroyApplication (Deployment::Application_ptr app
-                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
-{
-  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::destroyApplication");
-  ACE_UNUSED_ARG (app);
-
-  //ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  //@@ Since we know there is only 1 nodeapp so the passed in
-  //   parameter is ignored for now.
-  if (CORBA::is_nil (this->nodeapp_.in () ))
-    ACE_THROW (Deployment::StopError ());
-
-  this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  return;
+  return nodeapp_obj._retn ();
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 241747d6e26..498069f0299 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -1,4 +1,5 @@
-//$Id$
+// $Id$
+
 // -*- C++ -*-
 
 //=============================================================================
@@ -6,6 +7,7 @@
  *  @file    NodeApplicationManager_Impl.h
  *
  *  @author  Tao Lu <lu@dre.vanderbilt.edu>
+ *  @author  Gan Deng <dengg@dre.vanderbilt.edu>
  *
  *  This file contains implementation for the servant of
  *  Deployment::NodeApplicationManager.
@@ -25,36 +27,45 @@
 
 #include "ace/SString.h"
 #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/DeploymentS.h"
+#include "ciao/NodeApplicationManagerS.h"
 #include "ciao/CIAO_common.h"
 #include "CIAO_NAM_Export.h"
 #include "ImplementationInfo.h"
+#include "NodeManager/NodeManager_Impl.h"
+#include "NodeApplication/NodeApplication_Core.h"
 
 namespace CIAO
 {
+
   /**
-   * @class NodeApplicationManager_Impl
+   * @class NodeApplicationManager_Impl_Base
    */
-  class CIAO_NAM_Export NodeApplicationManager_Impl
+  class CIAO_NAM_Export NodeApplicationManager_Impl_Base
     : public virtual POA_Deployment::NodeApplicationManager
   {
   public:
     /// Constructor
-    NodeApplicationManager_Impl (CORBA::ORB_ptr o,
-                                 PortableServer::POA_ptr p);
+    NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
+                                      PortableServer::POA_ptr p);
 
     /*===========================================================
      * Below are operations from the NodeApplicationManager
      *
      *============================================================*/
 
-    //@@ The return type is NodeApplication_ptr actually.
+    /// The return type is NodeApplication_ptr actually.
+    /// For "external/shared" components of this child plan, they are
+    /// not actaully installed, however, the object references
+    /// of the ports of these external components are returned
+    /// through <providedReference>.
     virtual Deployment::Application_ptr
     startLaunch (const Deployment::Properties & configProperty,
-                    Deployment::Connections_out providedReference,
-                                 CORBA::Boolean start
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                 Deployment::Connections_out providedReference,
+                 CORBA::Boolean start
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                               Deployment::ResourceNotAvailable,
                               Deployment::StartError,
@@ -66,6 +77,31 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                               Deployment::StopError));
 
+    virtual Deployment::Application_ptr
+    perform_redeployment (const Deployment::Properties & configProperty,
+                          Deployment::Connections_out providedReference,
+                          CORBA::Boolean add_or_remove,
+                          CORBA::Boolean start
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException,
+                       ::Deployment::PlanError,
+                       ::Deployment::InstallationFailure,
+                       ::Deployment::UnknownImplId,
+                       ::Deployment::ImplEntryPointNotFound,
+                       ::Deployment::InvalidConnection,
+                       ::Deployment::InvalidProperty,
+                       ::Components::RemoveFailure));
+
+    virtual void
+    reset_plan (const ::Deployment::DeploymentPlan & plan
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
+
+    virtual void
+    set_shared_components (const Deployment::ComponentPlans & shared
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
+
     /**
      * A factory operation to create NodeApplicationManager interface, and return
      * the object reference.
@@ -81,7 +117,7 @@ namespace CIAO
      *
      * @param nodeapp_options A null-terminated char * string
      * containing command line options to be passed to the
-     * NodeApplication. 
+     * NodeApplication.
      *
      * @param delay instructs how long (in second) a CIAO_NodeApplicationManager
      *   should wait for a newly spawned NodeApplication to pass back
@@ -93,6 +129,8 @@ namespace CIAO
      *
      * @param callback_poa contains child poa created for the callback interface.
      *
+     * @para nm Pointer to the NodeManager_Impl servant object
+     *
      * @return NodeApplicationManager_ptr.
      **/
     virtual PortableServer::ObjectId
@@ -100,28 +138,59 @@ namespace CIAO
           const char *nodeapp_options,
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
-          const PortableServer::POA_ptr callback_poa
+          const PortableServer::POA_ptr callback_poa,
+          NodeManager_Impl_Base * nm
           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty));
+                       Deployment::InvalidProperty))=0;
 
-    //@@ Note: This method doesn't do duplicate.
+    /// @note This method doesn't do duplicate.
     Deployment::NodeApplicationManager_ptr get_nodeapp_manager (void);
 
+    /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException ));
+
   protected:
     /// Destructor
-    virtual ~NodeApplicationManager_Impl (void);
+    virtual ~NodeApplicationManager_Impl_Base (void);
 
-    // Internal help function to create new NodeApplicationProcess
+    /// 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));
+
+    /// Remove existing components
+    virtual void
+    remove_existing_components (void)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                   ::Deployment::PlanError,
+                   ::Components::RemoveFailure));
+
+    /// Determine whether a component is absent in the new_plan
+    /// Return true if absent
+    virtual bool
+    is_to_be_removed (const char * name);
+
+    /// Internal help function to create new NodeApplicationProcess
     virtual Deployment::NodeApplication_ptr
     create_node_application (const ACE_CString & options
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
-                       Deployment::InvalidProperty));
+                       Deployment::InvalidProperty))=0;
 
-    // Helper function to get the connection.
+    /// Helper function to get the connection.
     virtual Deployment::Connections *
     create_connections (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
@@ -138,38 +207,58 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::InvalidProperty));
 
+    /// Helper function to check wheather a component instance
+    /// is in the "shared components list".
+    bool is_shared_component (ACE_CString & name);
+
+    /// Helper function to check wheather a component instance
+    /// is in the "shared components list".
+    bool is_external_component (ACE_CString & name);
+
   protected:
-    // location of the Nodeapplication
+    /// location of the Nodeapplication
     ACE_CString nodeapp_path_;
 
-    // Keep a pointer to the managing ORB serving this servant.
+    /// Keep a pointer to the managing ORB serving this servant.
     CORBA::ORB_var orb_;
 
-    // Keep a pointer to the managing POA.
+    /// Keep a pointer to the managing POA.
     PortableServer::POA_var poa_;
 
-    // ObjectRef of ourself which will be needed by the callback
+    /// Pointer to the NodeManager_Impl servant object
+    /// We could do this because NodeManager and NodeApplicationManager
+    /// are always collocated in the same process, so we don't have
+    /// to pass CORBA object reference back and forth.
+    NodeManager_Impl_Base * node_manager_;
+
+    /// ObjectRef of ourself which will be needed by the callback
     Deployment::NodeApplicationManager_var objref_;
 
-    // Child poa that uses active object map.
+    /// Child poa that uses active object map.
     PortableServer::POA_var callback_poa_;
 
-    // Cache a object reference of the underlying NodeApplication
-    // Since I have decided to have only 1 NA in NAM so no map is needed.
+    /// Cache a object reference of the underlying NodeApplication
+    /// Since I have decided to have only 1 NA in NAM so no map is needed.
     Deployment::NodeApplication_var nodeapp_;
 
-    // Cached plan (This should be the part of the whole plan local to this node)
-    // The plan will be initialized when init is called.
+    /// Cached plan (This should be the part of the whole plan local to this node)
+    /// The plan will be initialized when init is called.
     Deployment::DeploymentPlan plan_;
 
-    // Specify the time in second NodeApplicationManager will wait for a
-    // child NodeApplication to callback.  Default is 5 second.
+    /// Specify the time in second NodeApplicationManager will wait for a
+    /// child NodeApplication to callback.  Default is 5 second.
     CORBA::ULong spawn_delay_;
 
-    // Extracted commandline options to pass to the NodeApplication.
+    /// Extracted commandline options to pass to the NodeApplication.
     CORBA::String_var nodeapp_command_op_;
 
-    // A map of the component created on this node.
+    /// A list of components shared across deployment plans
+    Deployment::ComponentPlans shared_components_;
+
+    /// A list of components that are "external" to this plan
+    Deployment::ComponentPlans external_components_;
+
+    /// A map of the component created on this node.
     typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                     Components::CCMObject_var,
                                     ACE_Hash<ACE_CString>,
@@ -178,8 +267,146 @@ namespace CIAO
     typedef CCMComponent_Map::iterator Component_Iterator;
     CCMComponent_Map component_map_;
 
-    // Synchronize access to the object set.
+    /// Synchronize access to the object set.
     TAO_SYNCH_MUTEX lock_;
+
+    /// The Process Manager for this NodeApplicationManager
+    ACE_Process_Manager node_app_process_manager_;
+
+    /// The process id of the NA associated with the NAM,
+    /// Each NAM will only have one NA associated with it,
+    /// so we have only one process associated with it.
+
+    // this is UNIX specific .... not portable
+    pid_t process_id_;
+  };
+
+
+  /**
+   * @class NAM_Handler
+   * @brief The signal handler class for the SIGCHLD
+   * handling to avoid zombies
+   *
+   */
+  class NAM_Handler : public ACE_Event_Handler
+    {
+    public:
+      virtual int handle_signal (int sig,
+                                 siginfo_t *,
+                                 ucontext_t *)
+        {
+          ACE_UNUSED_ARG (sig);
+
+          // @@ Note that this code is not portable to all OS platforms
+          // since it uses print statements within signal handler context.
+          //ACE_DEBUG ((LM_DEBUG,
+          //            "Executed ACE signal handler for signal %S \n",
+          //            sig));
+
+          ACE_exitcode status;
+          // makes a claal to the underlying os system call
+          // -1 to wait for any child process
+          // and WNOHANG so that it retuurns immediately
+          ACE_OS::waitpid (-1 ,&status, WNOHANG, 0);
+
+          return 0;
+        }
+    };
+
+
+  /**
+   * @class NodeApplicationManager_Impl
+   */
+  class CIAO_NAM_Export NodeApplicationManager_Impl
+    : public virtual NodeApplicationManager_Impl_Base
+  {
+  public:
+    /// Constructor
+    NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                 PortableServer::POA_ptr p);
+
+    virtual PortableServer::ObjectId
+    init (const char *nodeapp_location,
+          const char *nodeapp_options,
+          const CORBA::ULong delay,
+          const Deployment::DeploymentPlan & plan,
+          const PortableServer::POA_ptr callback_poa,
+          NodeManager_Impl_Base * nm
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::InvalidProperty));
+
+  protected:
+    /// Destructor
+    virtual ~NodeApplicationManager_Impl (void);
+
+    // 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_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::ResourceNotAvailable,
+                       Deployment::StartError,
+                       Deployment::InvalidProperty));
+
+
+    /**
+     * @operation push_component_info
+     * @brief pushes component info to the NodeManager
+     *
+     * @param process_id The id of the process of NodeApplication
+     */
+    void push_component_info (pid_t process_id);
+
+    /// The signal handler
+    NAM_Handler child_handler_;
+  };
+
+
+
+  struct Static_Config_EntryPoints_Maps;
+
+  /**
+   * @class Static_NodeApplicationManager_Impl
+   */
+  class CIAO_NAM_Export Static_NodeApplicationManager_Impl
+    : public virtual NodeApplicationManager_Impl_Base
+  {
+  public:
+    /// Constructor
+    Static_NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                        PortableServer::POA_ptr p,
+                                        Static_Config_EntryPoints_Maps* static_config_entrypoints_maps);
+
+    virtual PortableServer::ObjectId
+    init (const char *nodeapp_location,
+          const char *nodeapp_options,
+          const CORBA::ULong delay,
+          const Deployment::DeploymentPlan & plan,
+          const PortableServer::POA_ptr callback_poa,
+          NodeManager_Impl_Base * nm
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::InvalidProperty));
+
+  protected:
+    /// Destructor
+    virtual ~Static_NodeApplicationManager_Impl (void);
+
+    // 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_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::ResourceNotAvailable,
+                       Deployment::StartError,
+                       Deployment::InvalidProperty));
+
+    Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
+
+    CIAO::NoOp_Configurator configurator_;
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index 24908a047a4..5bf4e642a0e 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -2,12 +2,13 @@
 // $Id$
 
 ACE_INLINE
-CIAO::NodeApplicationManager_Impl::
-NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+CIAO::NodeApplicationManager_Impl_Base::
+NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
                              PortableServer::POA_ptr p)
   : orb_ (CORBA::ORB::_duplicate (o)),
     poa_ (PortableServer::POA::_duplicate (p)),
     callback_poa_ (PortableServer::POA::_nil ()),
+    nodeapp_ (Deployment::NodeApplication::_nil ()),
     spawn_delay_ (5)
   // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet
   //         large.  The maximum size of an ACE_Hash_Map_Manager is
@@ -19,8 +20,37 @@ NodeApplicationManager_Impl (CORBA::ORB_ptr o,
 }
 
 ACE_INLINE
+CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
+{
+}
+
+ACE_INLINE
+void
+CIAO::NodeApplicationManager_Impl_Base::
+parse_config_value (ACE_CString & str
+                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::InvalidProperty))
+{
+  // The unused arg is for future improvemnts.
+  ACE_UNUSED_ARG (str);
+
+  ACE_THROW ( CORBA::NO_IMPLEMENT() );
+}
+
+ACE_INLINE
 Deployment::NodeApplicationManager_ptr
-CIAO::NodeApplicationManager_Impl::get_nodeapp_manager (void)
+CIAO::NodeApplicationManager_Impl_Base::get_nodeapp_manager (void)
 {
   return this->objref_.in ();
 }
+
+ACE_INLINE void
+CIAO::NodeApplicationManager_Impl_Base::
+reset_plan (const ::Deployment::DeploymentPlan & plan
+            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+{
+  this->plan_ = plan;
+}
+
diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
index b4f5f55cd31..d082a5ecd3c 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
@@ -3,7 +3,7 @@
 
 // MPC file for the Monitor
 
-project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc {
+project(*monitorlib): ciao_client_dnc{
   after += CIAO_TargetManager_stub
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
   sharedname = ciaomonlib
diff --git a/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp b/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp
index d14efc9829b..07d145f5752 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp
@@ -9,35 +9,35 @@ namespace CIAO
     : map_ (CIAO_DEFAULT_MAP_SIZE)
   {
   }
-  
+
   bool
   NAM_Map::is_available (const ACE_CString &str)
   {
     if (this->map_.find (str) == 0)
       return true;
-    
+
     return false;
   }
-  
+
   bool
   NAM_Map::insert_nam (const ACE_CString &str,
                        const PortableServer::ObjectId &oid)
   {
     return (this->map_.bind (str, oid) == 0);
   }
-  
+
   ::PortableServer::ObjectId
   NAM_Map::get_nam (const ACE_CString &str)
   {
-    MAP::ENTRY *entry;
-    
+    MAP::ENTRY *entry = 0;
+
     if (this->map_.find (str, entry) != 0)
       return ::PortableServer::ObjectId ();
-    
+
     return entry->int_id_.in ();
   }
-  
-  bool 
+
+  bool
   NAM_Map::remove_nam (const PortableServer::ObjectId &oid)
   {
     for (Iterator i = this->map_.begin ();
@@ -51,6 +51,6 @@ namespace CIAO
   }
 }
 
-      
-  
+
+
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/NAM_Map.h b/TAO/CIAO/DAnCE/NodeManager/NAM_Map.h
index 1a2dc80f054..a3a6a7def5f 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NAM_Map.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NAM_Map.h
@@ -1,4 +1,4 @@
-/**
+  /**
  * @file NAM_Map.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
  *
@@ -13,15 +13,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Null_Mutex.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ciao/DeploymentC.h"
-#include "ace/SString.h"
 #include "tao/PortableServer/PortableServer.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Null_Mutex.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/SString.h"
+
 namespace CIAO
 {
   /**
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.idl b/TAO/CIAO/DAnCE/NodeManager/NodeManager.idl
deleted file mode 100644
index ea964a4e14b..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-/**
- * @file NodeManager.idl
- *
- * @brief Controling interface for managing and controling CIAO daemon.
- */
-
-#include "ciao/Deployment.idl"
-
-module CIAO
-{
-  /**
-   * @brief CIAO daemon process control program.
-   *
-   * @@The Inheritage might cause binary code bloating but
-   * it's an easy way of combining features. In the future we could
-   * move this definition into Deployment.idl.
-   */
-  interface NodeManager : Deployment::NodeManager
-  {
-    // Canonical name of this daemon
-    readonly attribute string name;
-
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index e068d31c6fb..d5338b6c140 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -1,32 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project (NodeManager_stub): ciao_component_dnc {
-  sharedname = NodeManager_stub
-  idlflags += -Wb,stub_export_macro=NodeManager_stub_Export -Wb,stub_export_include=NodeManager_stub_export.h
-  dynamicflags = NODEMANAGER_STUB_BUILD_DLL
+//For static D&C, the NodeManager should be available as a linkable library
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub  {
+  sharedname = NodeManager
+  after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
+  libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
+  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager
+  dynamicflags = NODEMANAGER_SVNT_BUILD_DLL
 
   IDL_Files {
-   NodeManager.idl
   }
 
   Source_Files {
-   NodeManagerC.cpp
+    ../Interfaces/NodeManagerDaemonS.cpp
+    NodeManager_Impl.cpp
+    NAM_Map.cpp
+    MonitorController.cpp
+    MonitorCB.cpp
   }
 }
 
-project(NodeManager): ciao_component_dnc, iortable, ifr_client {
-  after += NodeApplicationManager NodeManager_stub
-  libs += NodeManager_stub NodeApplicationManager
+project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub  {
+  after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt
+  libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
+  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager
   exename = NodeManager
 
   IDL_Files {
   }
 
   Source_Files {
-    NodeManagerS.cpp
-    NodeManager_Impl.cpp
     Node_Manager.cpp
-    NAM_Map.cpp
   }
 }
+
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index c040b75859f..3028dd3171d 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -2,31 +2,32 @@
 
 #include "NodeManager_Impl.h"
 #include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
-
-CIAO::NodeManager_Impl::NodeManager_Impl (const char *name,
-                                          CORBA::ORB_ptr orb,
-                                          PortableServer::POA_ptr poa,
-                                          const char * nodeapp_loc,
-                                          const char * nodeapp_options,
-                                          int spawn_delay)
+#include "ace/Log_Msg.h"
+#include <errno.h>
+
+CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
+                                                    CORBA::ORB_ptr orb,
+                                                    PortableServer::POA_ptr poa,
+                                                    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)),
-    nodeapp_location_ (CORBA::string_dup (nodeapp_loc)),
-    nodeapp_options_ (CORBA::string_dup (nodeapp_options)),
-    callback_poa_ (PortableServer::POA::_nil ()),
-    spawn_delay_ (spawn_delay)
+    : orb_ (CORBA::ORB::_duplicate (orb)),
+      poa_ (PortableServer::POA::_duplicate (poa)),
+      name_ (CORBA::string_dup (name)),
+      nodeapp_location_ (CORBA::string_dup (nodeapp_loc)),
+      nodeapp_options_ (CORBA::string_dup (nodeapp_options)),
+      callback_poa_ (PortableServer::POA::_nil ()),
+      spawn_delay_ (spawn_delay)
 {
 }
 
-CIAO::NodeManager_Impl::~NodeManager_Impl ()
+CIAO::NodeManager_Impl_Base::~NodeManager_Impl_Base ()
 {
-
 }
 
 void
-CIAO::NodeManager_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -42,7 +43,6 @@ CIAO::NodeManager_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
                                 0
                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
     }
   ACE_CATCHANY
     {
@@ -55,49 +55,182 @@ CIAO::NodeManager_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableServer::POA_ptr
-CIAO::NodeManager_Impl::_default_POA (void)
+CIAO::NodeManager_Impl_Base::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 
 char *
-CIAO::NodeManager_Impl::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeManager_Impl_Base::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-CIAO::NodeManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CIAO::NodeManager_Impl::joinDomain (const Deployment::Domain & ,
-                                   Deployment::TargetManager_ptr ,
-                                   Deployment::Logger_ptr
-                                   ACE_ENV_ARG_DECL)
+CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
+                                         Deployment::TargetManager_ptr target,
+                                         Deployment::Logger_ptr
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  //  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // Here start the Monitor
+  CIAO_TRACE("CIAO::NodeManager_Impl_Base::joinDomain");
+
+  ::Deployment::Domain this_domain = domain;
+
+  monitor_controller_.reset (
+                             new MonitorController (orb_.in (),
+                                                    this_domain,
+                                                    target,
+                                                    this));
+
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Before Activate\n"));
+    }
+  /// Activate the Monitor Controller to
+  //start the monitoring
+  monitor_controller_->activate ();
+
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Monitor Activated\n"));
+    }
 }
 
 void
-CIAO::NodeManager_Impl::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  //Implementation undefined.
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // Delete the monitor , this will also terminate the thread
+  monitor_controller_.reset ();
+}
+
+CORBA::Long
+CIAO::NodeManager_Impl_Base::set_priority (
+                                           const char * plan_id,
+                                           const char * cid,
+                                           const ::Deployment::Sched_Params & nm_params
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS
+                                           )
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+
+{
+  ACE_CString key (plan_id);
+  key += "@";
+  key += this->name_.in ();
+
+  if (CIAO::debug_level () > 10)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Inside the set_priority\n"));
+      ACE_DEBUG ((LM_DEBUG , "pid = [%s] , cid = [%s]\n", key.c_str () , cid));
+    }
+
+  try {
+    CORBA::Object_var obj =
+      this->poa_->id_to_reference (this->map_.get_nam (key));
+
+    Deployment::NodeApplicationManager_var nam =
+      Deployment::NodeApplicationManager::_narrow (obj.in ());
+
+    return nam->set_priority (cid, nm_params);
+  }
+  catch (CORBA::Exception& ex)
+    {
+
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "(%P|%t) NodeManager_Impl::set_priority ()\t\n");
+      ACE_RE_THROW;
+    }
+}
+
+::Components::FacetDescriptions *
+CIAO::NodeManager_Impl_Base::
+get_all_facets (ACE_CString & name)
+{
+  Component_Facets_Map::ENTRY *entry = 0;
+
+  if (this->comp_facets_map_.find (name.c_str (), entry) != 0)
+    ACE_DEBUG ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
+                "No component with name [%s] was found in the NodeManager\n", name.c_str ()));
+
+  CORBA::ULong facet_len = entry->int_id_->length ();
+
+  Components::FacetDescriptions_var retv;
+  ACE_NEW_RETURN (retv,
+                  Components::FacetDescriptions,
+                  0);
+
+  retv->length (facet_len);
+
+  for (CORBA::ULong i = 0; i < facet_len; ++i)
+    {
+      retv[i] = entry->int_id_[i];
+    }
+
+  return retv._retn ();
+}
+
+::Components::ConsumerDescriptions *
+CIAO::NodeManager_Impl_Base::
+get_all_consumers (ACE_CString & name)
+{
+  Component_Consumers_Map::ENTRY *entry = 0;
+
+  if (this->comp_consumers_map_.find (name.c_str (), entry) != 0)
+    ACE_DEBUG ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
+                "Component [%s] was not found in the NodeManager\n", name.c_str ()));
+
+  CORBA::ULong consumer_len = entry->int_id_->length ();
+
+  Components::ConsumerDescriptions_var retv;
+  ACE_NEW_RETURN (retv,
+                  Components::ConsumerDescriptions,
+                  0);
+
+  retv->length (consumer_len);
+
+  for (CORBA::ULong i = 0; i < consumer_len; ++i)
+    {
+      retv[i] = entry->int_id_[i];
+    }
+
+  return retv._retn ();
+}
+
+void
+CIAO::NodeManager_Impl_Base::
+set_all_facets (ACE_CString &name,
+                const ::Components::FacetDescriptions_var & facets)
+{
+  this->comp_facets_map_.rebind (name, facets);
+}
+
+void
+CIAO::NodeManager_Impl_Base::
+set_all_consumers (ACE_CString &name,
+                   const ::Components::ConsumerDescriptions_var & consumers)
+{
+  this->comp_consumers_map_.rebind (name, consumers);
 }
 
 
 Deployment::NodeApplicationManager_ptr
-CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
-                                     ACE_ENV_ARG_DECL)
+CIAO::NodeManager_Impl_Base::
+preparePlan (const Deployment::DeploymentPlan &plan
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::PlanError))
@@ -106,16 +239,45 @@ CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
 
   if (! this->validate_plan (plan))
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) NodeManager <%s>:prepare_plan:Plan_Error.\n", 
-        plan.instance[0].node.in ()));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) NodeManager <%s>:prepare_plan:Plan_Error.\n",
+                  plan.instance[0].node.in ()));
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) All component instances hosted in the "
-        "same component server must have the "
-        "same \"resourceName\" defined.\n"));
+                  "same component server must have the "
+                  "same \"resourceName\" defined.\n"));
 
       ACE_THROW_RETURN (Deployment::PlanError (),
                         Deployment::NodeApplicationManager::_nil ());
     }
 
+  // Update the reference count map based on the deployment plan input
+  for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
+    {
+      Reference_Count_Map::ENTRY *entry = 0;
+      if (this->ref_count_map_.find (plan.instance[i].name.in (), entry) != 0)
+        {
+          // Create a new entry, set the initial ref count "1", and insert to the map.
+          Ref_Count_Info new_entry;
+          new_entry.plan_uuid_ = plan.UUID.in ();
+          new_entry.count_ = 1;
+          this->ref_count_map_.bind (plan.instance[i].name.in (), new_entry);
+        }
+      else
+        {
+          // If the instance is  within the same deployment plan, e.g.,
+          // when ReDaC service is used, then just do nothing since it is NOT
+          // actually a shared component at all.
+          if (ACE_OS::strcmp (plan.UUID.in (),
+                              entry->int_id_.plan_uuid_.c_str ()) == 0)
+            continue;
+
+          // Otherwise, it is really a shared component, so let's increase
+          // the ref count by 1
+          this->shared_components_.insert (plan.instance[i].name.in ());
+          ++ entry->int_id_.count_;
+        }
+    }
+
+  // Create/find NodeApplicationManager and set/reset plan on it
   ACE_TRY
     {
       if (!this->map_.is_available (plan.UUID.in ()))
@@ -128,28 +290,45 @@ CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
             }
 
           //Implementation undefined.
-          CIAO::NodeApplicationManager_Impl *app_mgr;
-          ACE_NEW_THROW_EX (app_mgr,
-                            CIAO::NodeApplicationManager_Impl (this->orb_.in (),
-                                                               this->poa_.in ()),
-                            CORBA::NO_MEMORY ());
+          CIAO::NodeApplicationManager_Impl_Base *node_app_mgr;
+          node_app_mgr =
+            this->create_node_app_manager (this->orb_.in (), this->poa_.in ()
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          PortableServer::ServantBase_var safe (app_mgr);
+          PortableServer::ServantBase_var safe (node_app_mgr);
 
           //@@ Note: after the init call the servant ref count would
           //   become 2. so we can leave the safeservant along and be
           //   dead. Also note that I added
           PortableServer::ObjectId_var oid  =
-            app_mgr->init (this->nodeapp_location_,
-                           this->nodeapp_options_.in (),
-                           this->spawn_delay_,
-                           plan,
-                           this->callback_poa_.in ()
-                           ACE_ENV_ARG_PARAMETER);
+            node_app_mgr->init (this->nodeapp_location_.in (),
+                                this->nodeapp_options_.in (),
+                                this->spawn_delay_,
+                                plan,
+                                this->callback_poa_.in (),
+                                this // pass in a copy of ourself (servant object)
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->map_.insert_nam (plan.UUID.in (), oid.in ());
+
+          CORBA::Object_var obj =
+            this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
+          ACE_TRY_CHECK;
+
+          // We should inform NAM about "shared" components, so they
+          // won't be instantiated again
+          Deployment::NodeApplicationManager_var nam =
+            Deployment::NodeApplicationManager::_narrow (obj.in ());
+
+          // Convert the ACE Set into CORBA sequence, and make the remote invocation
+          Deployment::ComponentPlans_var shared =
+            this->get_shared_components_i ();
+          nam->set_shared_components (shared.in ());
+
+          // narrow should return a nil reference if it fails.
+          return Deployment::NodeApplicationManager::_narrow (nam.in ());
         }
       else
         {
@@ -159,16 +338,28 @@ CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
                           "with UUID: %s\n",
                           plan.UUID.in ()));
             }
-        }
 
+          CORBA::Object_var obj =
+            this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
+          ACE_TRY_CHECK;
 
-      CORBA::Object_var obj =
-        this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
-      ACE_TRY_CHECK;
+          Deployment::NodeApplicationManager_var nam =
+            Deployment::NodeApplicationManager::_narrow (obj.in ());
+          ACE_TRY_CHECK;
+
+          nam->reset_plan (plan);
+          ACE_TRY_CHECK;
 
-      // narrow should return a nil reference if it fails.
-      return
-        Deployment::NodeApplicationManager::_narrow (obj.in ());
+          // Similarly, we should inform NAM about "shared" components, so
+          // they won't be instantiated again
+          Deployment::ComponentPlans_var shared =
+            this->get_shared_components_i ();
+          nam->set_shared_components (shared.in ());
+
+          // Potentially we could reset many other configuration settings
+          // such as command line options, service configuration file, etc.
+          return nam._retn ();
+        }
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
     {
@@ -188,9 +379,9 @@ CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
 }
 
 void
-CIAO::NodeManager_Impl::destroyManager
-        (Deployment::NodeApplicationManager_ptr manager
-         ACE_ENV_ARG_DECL)
+CIAO::NodeManager_Impl_Base::destroyManager
+(Deployment::NodeApplicationManager_ptr manager
+ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError,
                    Deployment::InvalidReference))
@@ -204,7 +395,7 @@ CIAO::NodeManager_Impl::destroyManager
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (!this->map_.remove_nam (id))
+      if (!this->map_.remove_nam (id.in ()))
         {
           ACE_ERROR ((LM_ERROR,
                       "NodeManager_Impl::destroyManager: "
@@ -217,10 +408,10 @@ CIAO::NodeManager_Impl::destroyManager
     }
   ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
     {
-      ACE_ERROR ((LM_ERROR, 
+      ACE_ERROR ((LM_ERROR,
                   "NodeManager_Impl::destroyManager: EXCEPTION -  "
                   "Invalid reference passed to destroyManager\n"));
-      
+
       ACE_THROW (::Deployment::InvalidReference ());
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -239,12 +430,156 @@ CIAO::NodeManager_Impl::destroyManager
   ACE_ENDTRY;
 }
 
+void
+CIAO::NodeManager_Impl_Base::
+destroyPlan (const Deployment::DeploymentPlan & plan
+             ACE_ENV_ARG_DECL)
+  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,
+  // we should remove the necesary bindings on this component specified
+  // in the deployment plan.
+
+  // Clean up the cached "Facets" and "Consumers" map of the components
+  // if their ref count become 0
+  CORBA::ULong const length = plan.instance.length ();
+  for (CORBA::ULong i = 0; i <  length; ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "NM_DP - forloop instance %s\n",
+                  plan.instance[i].name.in ()));
+
+      Reference_Count_Map::ENTRY *entry = 0;
+      if (this->ref_count_map_.find (plan.instance[i].name.in (), entry) == 0)
+        {
+          --entry->int_id_.count_; // decrease ref count by 1
+
+          if (entry->int_id_.count_ == 0)
+            {
+              // Remove this component from the shared set
+              ACE_DEBUG ((LM_DEBUG, "\tremoving shared...\n"));
+              this->shared_components_.remove (plan.instance[i].name.in ());
+              ACE_DEBUG ((LM_DEBUG, "\tunbinding from the ref count map\n"));
+              // Unbind this component from the ref_count_map_
+              this->ref_count_map_.unbind (plan.instance[i].name.in ());
+
+              ACE_DEBUG ((LM_DEBUG, "\tunbinding from the facet/consumer maps\n"));
+              // Unbind this component from the facet/consumer maps
+              if (this->comp_facets_map_.unbind (
+                                                 plan.instance[i].name.in ()) != 0 ||
+                  this->comp_consumers_map_.unbind (
+                                                    plan.instance[i].name.in ()) != 0)
+                {
+                  ACE_TRY_THROW
+                    (Deployment::StopError ("NodeManager_Impl_Base::destroyPlan ",
+                                            "Unable to find component instance"));
+                }
+            }
+        }
+    }
+
+  // Find the NAM from the map and invoke the destroyPlan() operation on
+  // it, which will actuall remove components and connections in this plan.
+  // If
+  CORBA::Object_var obj =
+    this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
+
+  Deployment::NodeApplicationManager_var nam =
+    Deployment::NodeApplicationManager::_narrow (obj.in ());
+
+
+  // Reset each NAM about the shared components information
+  Deployment::ComponentPlans_var shared = this->get_shared_components_i ();
+  nam->set_shared_components (shared.in ());
+
+  nam->destroyApplication (0);
+
+  // @@ The problem is that we should NOT actually kill the NA process if
+  // there are some components that are shared by other plans.
+}
+
+Deployment::ComponentPlans *
+CIAO::NodeManager_Impl_Base::
+get_shared_components (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+{
+  return this->get_shared_components_i ();
+}
+
+Deployment::ComponentPlans *
+CIAO::NodeManager_Impl_Base::get_shared_components_i (void)
+{
+  Deployment::ComponentPlans_var retv;
+  ACE_NEW_RETURN (retv,
+                  Deployment::ComponentPlans,
+                  0);
+  retv->length (0);
+
+  ACE_Unbounded_Set<ACE_CString>::iterator
+    end = this->shared_components_.end ();
+
+  for (ACE_Unbounded_Set<ACE_CString>::iterator
+         iter = this->shared_components_.begin ();
+       iter != end;
+       ++iter)
+    {
+      CORBA::ULong curr_len = retv->length ();
+      retv->length (curr_len + 1);
+      (*retv)[curr_len].name = (*iter).c_str ();
+
+      // Fill in the plan_uuid information about this component, by
+      // searching in the ref_count_map_
+      Reference_Count_Map::ENTRY *entry = 0;
+      if (this->ref_count_map_.find ((*iter).c_str (), entry) == 0)
+        {
+          // Get the plan_uuid_ info and populate the field
+          (*retv)[curr_len].plan_uuid = entry->int_id_.plan_uuid_.c_str ();
+        }
+      else
+        {
+          // should never happen
+          ACE_DEBUG ((LM_ERROR, "Component [%s] in the list of shared component, "
+                      "was not found in the NodeManager ref count map.\n",
+                      (*iter).c_str ()));
+        }
+    }
+
+  return retv._retn ();
+}
+
+
+CORBA::StringSeq *
+CIAO::NodeManager_Impl_Base::shared_components_seq (void)
+{
+  CORBA::StringSeq * retv;
+  ACE_NEW_RETURN (retv, CORBA::StringSeq, 0);
+  retv->length (0);
+
+  ACE_Unbounded_Set<ACE_CString>::iterator end = this->shared_components_.end ();
+  for (ACE_Unbounded_Set<ACE_CString>::iterator
+         iter = this->shared_components_.begin ();
+       iter != end;
+       ++iter)
+    {
+      CORBA::ULong curr_len = retv->length ();
+      retv->length (curr_len + 1);
+      (*retv)[curr_len] = (*iter).c_str ();
+    }
+
+  return retv;
+}
+
 bool
-CIAO::NodeManager_Impl::validate_plan (const Deployment::DeploymentPlan &plan)
+CIAO::NodeManager_Impl_Base::
+validate_plan (const Deployment::DeploymentPlan &plan)
 {
   const char * resource_id = 0;
   CORBA::ULong i = 0;
 
+  // Update the name of ourself
+  this->name_ = plan.instance[0].node.in ();
+
   for (i = 0; i < plan.instance.length (); ++i)
     {
       if (plan.instance[i].deployedResource.length () != 0)
@@ -253,9 +588,10 @@ CIAO::NodeManager_Impl::validate_plan (const Deployment::DeploymentPlan &plan)
           // the "resourceValue" field represents the policy_set_id, so we
           // are checking to make sure that all component instances have
           // the same server_resource_id.
-          resource_id = 
-            plan.instance[i].deployedResource[0].resourceName.in ();
-          break;
+
+          //resource_id =
+          //  plan.instance[i].deployedResource[0].resourceName.in ();
+          //break;
         }
     }
   if (i == plan.instance.length ()) // No server resource id has been set for any instance
@@ -264,13 +600,13 @@ CIAO::NodeManager_Impl::validate_plan (const Deployment::DeploymentPlan &plan)
   for (i = 0; i < plan.instance.length (); ++i)
     {
       const char * my_resource_id;
-      if (plan.instance[i].deployedResource.length () == 0)
+      if (true || plan.instance[i].deployedResource.length () == 0)
         {
           continue;
         }
       else
         {
-          my_resource_id = 
+          my_resource_id =
             plan.instance[i].deployedResource[0].resourceName.in ();;
           if (ACE_OS::strcmp (resource_id, my_resource_id) != 0)
             {
@@ -281,3 +617,110 @@ CIAO::NodeManager_Impl::validate_plan (const Deployment::DeploymentPlan &plan)
     }
   return true;
 }
+
+
+void CIAO::NodeManager_Impl_Base::
+push_component_id_info (Component_Ids comps)
+{
+  components_ = comps;
+}
+
+CIAO::NodeManager_Impl_Base::Component_Ids
+CIAO::NodeManager_Impl_Base::
+get_component_detail ()
+{
+  return components_;
+}
+
+CIAO::NodeManager_Impl::~NodeManager_Impl ()
+{
+}
+
+CIAO::NodeManager_Impl::
+NodeManager_Impl (const char *name,
+                  CORBA::ORB_ptr orb,
+                  PortableServer::POA_ptr poa,
+                  const char * nodeapp_loc,
+                  const char * nodeapp_options,
+                  int spawn_delay)
+  : NodeManager_Impl_Base (name, orb, poa, nodeapp_loc, nodeapp_options, spawn_delay)
+{}
+
+
+::CIAO::NodeApplicationManager_Impl_Base *
+CIAO::NodeManager_Impl::
+create_node_app_manager (CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa
+                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CIAO::NodeApplicationManager_Impl_Base *app_mgr;
+  ACE_NEW_THROW_EX (app_mgr,
+                    CIAO::NodeApplicationManager_Impl (orb,
+                                                       poa),
+                    CORBA::NO_MEMORY ());
+  return app_mgr;
+}
+
+CIAO::Static_NodeManager_Impl::~Static_NodeManager_Impl ()
+{
+}
+
+CIAO::Static_NodeManager_Impl::
+Static_NodeManager_Impl (const char *name,
+                         CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa,
+                         const char * nodeapp_loc,
+                         const char * nodeapp_options,
+                         int spawn_delay,
+                         Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
+  : NodeManager_Impl_Base (name, orb, poa, nodeapp_loc, nodeapp_options, spawn_delay),
+    static_config_entrypoints_maps_ (static_config_entrypoints_maps)
+{}
+
+::CIAO::NodeApplicationManager_Impl_Base *
+CIAO::Static_NodeManager_Impl::
+create_node_app_manager (CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa
+                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n"));
+
+  CIAO::NodeApplicationManager_Impl_Base *app_mgr;
+  ACE_NEW_THROW_EX (app_mgr,
+                    CIAO::Static_NodeApplicationManager_Impl (orb,
+                                                              poa,
+                                                              this->static_config_entrypoints_maps_),
+                    CORBA::NO_MEMORY ());
+  return app_mgr;
+}
+
+void
+CIAO::Static_NodeManager_Impl::destroyManager
+(Deployment::NodeApplicationManager_ptr manager
+ ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StopError,
+                   Deployment::InvalidReference))
+{
+  CIAO_TRACE("CIAO::Static_NodeManager_Impl::destroyManager");
+  ACE_TRY
+    {
+      CIAO::NodeManager_Impl_Base::destroyManager (manager ACE_ENV_ARG_PARAMETER);
+
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Static_NodeManager_Impl::destroyManager\t\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index 3dff06a20f2..6881a53c1e2 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -6,13 +6,14 @@
  *  $Id$
  *
  *  This file contains servant implementation for Deployment:NodeManager
- *  interface. In the current design of the NodeManager, as with the
- *  legacy  implementation of CIAO, Each NodeManager corresponds to
- *  ONE NodeApplication Manager. Though, the name intuitively suggests
+ *  interface. In the current design of the NodeManager, each NodeManager
+ *  could manage one or more NodeApplication Managers.
+ *  Though, the name intuitively suggests
  *  that there be one NodeManager  for every node, our design, allows
  *  the end-user to have multiple components run on the same node.
  *
  *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
+ *  @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -21,7 +22,7 @@
 #define CIAO_NODEMANAGER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "NodeManagerS.h"
+#include "Interfaces/NodeManagerDaemonS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,26 +33,39 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+#include "NodeManager_svnt_export.h"
 #include "NAM_Map.h"
+#include "MonitorController.h"
+#include "ace/Vector_T.h"
 
 namespace CIAO
 {
+  class NodeApplicationManager_Impl_Base;
+
   /**
    * @class NodeManager_Impl
    *
    * @brief Servant implementation CIAO's daemon process control
    * interface
    *
-   * This class implements the CIAO:NodeManager interface.
+   * This class implements the CIAO:NodeManagerDaemon interface.
    *
    */
-  class NodeManager_Impl
-    : public virtual POA_CIAO::NodeManager
+  class NodeManager_svnt_Export NodeManager_Impl_Base
+    : public virtual POA_CIAO::NodeManagerDaemon
   {
   public:
+    /// A struct that tracks the reference count of a particular
+    /// component as well as the "child_plan_uuid" where the component is
+    /// actually installed
+    typedef struct _ref_count_info
+    {
+      ACE_CString plan_uuid_;
+      size_t count_;
+    } Ref_Count_Info;
 
     /// Constructor
-    NodeManager_Impl (const char *name,
+    NodeManager_Impl_Base (const char *name,
                       CORBA::ORB_ptr orb,
                       PortableServer::POA_ptr p,
                       const char * nodeapp_loc,
@@ -97,6 +111,58 @@ namespace CIAO
                        Deployment::StopError,
                        Deployment::InvalidReference));
 
+    /// CIAO specific extension, which is particularly useful for dealing with
+    /// shared components issue
+    virtual void destroyPlan (const Deployment::DeploymentPlan & plan
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException,
+                       ::Deployment::StopError));
+
+    /// CIAO specific extension, return a set of shared components
+    virtual ::Deployment::ComponentPlans *
+    get_shared_components (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
+
+    /// RACE specific extension. Modify the priority of a node application
+    /// process.
+
+    virtual ::CORBA::Long
+    set_priority (
+        const char * plan_id,
+        const char * cid,
+        const ::Deployment::Sched_Params & nm_params
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
+
+    // ********* CIAO Specific Helper functions ************
+
+    virtual ::Components::FacetDescriptions *
+    get_all_facets (ACE_CString & name);
+
+    virtual ::Components::ConsumerDescriptions *
+    get_all_consumers (ACE_CString & name);
+
+    virtual void
+    set_all_facets (ACE_CString &name,
+                   const ::Components::FacetDescriptions_var & facets);
+
+    virtual void
+    set_all_consumers (ACE_CString &name,
+                       const ::Components::ConsumerDescriptions_var & consumers);
+
+    // ********* Function added for getting component ids...
+
+    struct Component_Ids
+    {
+      ACE_Unbounded_Set <ACE_CString> cid_seq_;
+      pid_t process_id_;
+    };
+
+    virtual void push_component_id_info (Component_Ids comps);
+
+
+    Component_Ids get_component_detail ();
+
   private:
     /// Validate the child deployment plan. In particular, we are
     /// trying to verify that all the component instances within this
@@ -110,7 +176,20 @@ namespace CIAO
     /// through the reference counting mechanism (i.e. to
     /// disallow calling operator delete() on an instance of
     /// this class.
-    virtual ~NodeManager_Impl (void);
+    virtual ~NodeManager_Impl_Base (void);
+
+    virtual ::CIAO::NodeApplicationManager_Impl_Base *
+    create_node_app_manager (CORBA::ORB_ptr orb,
+                             PortableServer::POA_ptr poa
+                             ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))=0;
+
+    /// Actual implementation of the <get_shared_components> IDL operation
+    virtual ::Deployment::ComponentPlans *
+    get_shared_components_i (void);
+
+    /// A helper method that convert ACE_Unbounded_Set to CORBA StringSeq
+    CORBA::StringSeq * shared_components_seq (void);
 
     /// Keep a pointer to the managing ORB serving this servant.
     CORBA::ORB_var orb_;
@@ -133,11 +212,134 @@ namespace CIAO
     /// Spawn delay for the NodeAppMgr
     int spawn_delay_;
 
-    // Cache reference of last NodeAppManager
-    // Deployment::NodeApplicationManager_var manager_;
-
+    /// Cache reference of last NodeAppManager
+    /// Deployment::NodeApplicationManager_var manager_;
     NAM_Map map_;
+
+    /// A reference count map for the components installed on this node
+    /// @@TODO We should also keep the information about *where* the
+    /// component is installed
+    typedef
+    ACE_Hash_Map_Manager_Ex <ACE_CString,
+                             Ref_Count_Info,
+                             ACE_Hash<ACE_CString>,
+                             ACE_Equal_To<ACE_CString>,
+                             ACE_Null_Mutex> Reference_Count_Map;
+    typedef Reference_Count_Map::iterator Ref_Count_Iterator;
+
+    Reference_Count_Map ref_count_map_;
+
+    /// A set to track the names of shared component instances
+    ACE_Unbounded_Set<ACE_CString> shared_components_;
+
+    /// Cached object references of ports (facets/consumers) of
+    /// all components. This is useful for getting the port object
+    /// references of "shared components". The key in the map
+    /// is the component instance name.
+    typedef
+    ACE_Hash_Map_Manager_Ex <ACE_CString,
+                             Components::FacetDescriptions_var,
+                             ACE_Hash<ACE_CString>,
+                             ACE_Equal_To<ACE_CString>,
+                             ACE_Null_Mutex> Component_Facets_Map;
+
+    Component_Facets_Map comp_facets_map_;
+
+    typedef
+    ACE_Hash_Map_Manager_Ex <ACE_CString,
+                             Components::ConsumerDescriptions_var,
+                             ACE_Hash<ACE_CString>,
+                             ACE_Equal_To<ACE_CString>,
+                             ACE_Null_Mutex> Component_Consumers_Map;
+
+    Component_Consumers_Map comp_consumers_map_;
+
+    /// The MonitorController pointer
+    auto_ptr <MonitorController> monitor_controller_;
+
+    /// The set of Components
+    Component_Ids components_;
   };
+
+
+  /**
+   * @class NodeManager_Impl
+   *
+   */
+  class NodeManager_svnt_Export NodeManager_Impl
+    : public virtual NodeManager_Impl_Base
+  {
+  public:
+
+    /// Constructor
+    NodeManager_Impl (const char *name,
+                     CORBA::ORB_ptr orb,
+                     PortableServer::POA_ptr p,
+                     const char * nodeapp_loc,
+                     const char * nodeapp_options,
+                     int spawn_delay);
+
+  protected:
+    /// Since this class is reference counted, making this
+    /// destructor protected to enforce proper memory managment
+    /// through the reference counting mechanism (i.e. to
+    /// disallow calling operator delete() on an instance of
+    /// this class.
+    virtual ~NodeManager_Impl (void);
+
+    virtual ::CIAO::NodeApplicationManager_Impl_Base *
+    create_node_app_manager (CORBA::ORB_ptr orb,
+                             PortableServer::POA_ptr poa
+                             ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+  };
+
+  class NodeApplicationManager_Impl;
+  struct Static_Config_EntryPoints_Maps;
+
+  /**
+   * @class Static_NodeManager_Impl
+   *
+   */
+  class NodeManager_svnt_Export Static_NodeManager_Impl
+    : public virtual NodeManager_Impl_Base
+  {
+  public:
+
+    /// Constructor
+    Static_NodeManager_Impl (const char *name,
+                            CORBA::ORB_ptr orb,
+                            PortableServer::POA_ptr p,
+                            const char * nodeapp_loc,
+                            const char * nodeapp_options,
+                            int spawn_delay,
+                            Static_Config_EntryPoints_Maps* static_config_entrypoints_maps
+                            );
+
+    void destroyManager
+    (Deployment::NodeApplicationManager_ptr manager
+     ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::StopError,
+                       Deployment::InvalidReference));
+
+  protected:
+    /// Since this class is reference counted, making this
+    /// destructor protected to enforce proper memory managment
+    /// through the reference counting mechanism (i.e. to
+    /// disallow calling operator delete() on an instance of
+    /// this class.
+    virtual ~Static_NodeManager_Impl (void);
+
+    virtual ::CIAO::NodeApplicationManager_Impl_Base *
+    create_node_app_manager (CORBA::ORB_ptr orb,
+                             PortableServer::POA_ptr poa
+                             ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
+  };
+
 }
 
 #if defined(_MSC_VER)
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_stub_export.h b/TAO/CIAO/DAnCE/NodeManager/NodeManager_stub_export.h
deleted file mode 100644
index 3e708b0ab1f..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_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 NodeManager_stub
-// ------------------------------
-#ifndef NODEMANAGER_STUB_EXPORT_H
-#define NODEMANAGER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (NODEMANAGER_STUB_HAS_DLL)
-#  define NODEMANAGER_STUB_HAS_DLL 1
-#endif /* ! NODEMANAGER_STUB_HAS_DLL */
-
-#if defined (NODEMANAGER_STUB_HAS_DLL) && (NODEMANAGER_STUB_HAS_DLL == 1)
-#  if defined (NODEMANAGER_STUB_BUILD_DLL)
-#    define NodeManager_stub_Export ACE_Proper_Export_Flag
-#    define NODEMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NODEMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NODEMANAGER_STUB_BUILD_DLL */
-#    define NodeManager_stub_Export ACE_Proper_Import_Flag
-#    define NODEMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NODEMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NODEMANAGER_STUB_BUILD_DLL */
-#else /* NODEMANAGER_STUB_HAS_DLL == 1 */
-#  define NodeManager_stub_Export
-#  define NODEMANAGER_STUB_SINGLETON_DECLARATION(T)
-#  define NODEMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NODEMANAGER_STUB_HAS_DLL == 1 */
-
-// Set NODEMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NODEMANAGER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NODEMANAGER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NODEMANAGER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NODEMANAGER_STUB_NTRACE */
-
-#if (NODEMANAGER_STUB_NTRACE == 1)
-#  define NODEMANAGER_STUB_TRACE(X)
-#else /* (NODEMANAGER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NODEMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NODEMANAGER_STUB_NTRACE == 1) */
-
-#endif /* NODEMANAGER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 78d63ebd770..d835d8b9ba6 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -17,6 +17,7 @@ char *default_svcconf_ = 0;
 char *svcconf_config_ = 0;
 char *nodeapp_location_ = 0;
 char *nodeapp_options_ = 0;
+const char *pid_file_name_ = 0;
 int write_to_ior_ = 0;
 int register_with_ns_ = 0;
 int nodeapp_loc_ = 0;
@@ -25,41 +26,49 @@ int spawn_delay = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:n");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:na:p:z:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'z':
+        nodeapp_options_ = "-ORBDebugLevel 10";
+        break;
+
       case 'o':  // get the file name to write to
-       ior_file_name_ = get_opts.opt_arg ();
-       write_to_ior_ = 1;
-      break;
+        ior_file_name_ = get_opts.opt_arg ();
+        write_to_ior_ = 1;
+        break;
 
       case 'c':  // get the default svc.conf filename
         default_svcconf_ = get_opts.opt_arg ();
-      break;
+        break;
 
       case 'm':  // get the svc.conf map configuration filename
         svcconf_config_ = get_opts.opt_arg ();
-      break;
+        break;
 
       case 's': //get the location to spawn the NodeApplication
         nodeapp_location_ = get_opts.opt_arg ();
         nodeapp_loc_ = 1;
-      break;
-      
+        break;
+
       case 'a': // Nodeapplication arguments
         nodeapp_options_ = get_opts.opt_arg ();
         break;
-        
+
       case 'd': //get the spawn delay argument
         spawn_delay = ACE_OS::atoi (get_opts.opt_arg ());
-      break;
+        break;
 
       case 'n':
         register_with_ns_ = 1;
-      break;
+        break;
+
+      case 'p':
+        pid_file_name_ = get_opts.opt_arg ();
+        break;
 
       case '?':  // display help for use of the server.
       default:
@@ -69,7 +78,9 @@ parse_args (int argc, char *argv[])
                            "-c <svc.conf file>\n"
                            "-n <use naming service>\n"
                            "-s <NodeApplication executable path>\n"
+                           "-a <arguments to NodeApplication>\n"
                            "-d <spawn delay for nodeapplication>\n"
+                           "-p <pid file>\n"
                            "\n",
                            argv [0]),
                           -1);
@@ -95,10 +106,27 @@ write_IOR(const char* ior)
   return 0;
 }
 
+void
+write_pid (void)
+{
+  if (pid_file_name_ == 0)
+    return;
+
+  FILE* pid_file = ACE_OS::fopen (pid_file_name_, "w");
+
+  if (pid_file)
+    {
+      ACE_OS::fprintf (pid_file,
+                       "%i",
+                       ACE_OS::getpid ());
+      ACE_OS::fclose (pid_file);
+    }
+}
+
 bool
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
-                  CIAO::NodeManager_ptr obj
+                  CIAO::NodeManagerDaemon_ptr obj
                   ACE_ENV_ARG_DECL)
 {
   // Naming Service related operations
@@ -115,8 +143,16 @@ register_with_ns (const char * name_context,
   name.length (1);
   name[0].id = name_context;
 
-  // Register the servant with the Naming Service
-  naming_context->bind (name, obj);
+  try
+    {
+      // Register the servant with the Naming Service
+      naming_context->bind (name, obj);
+    }
+  catch (CosNaming::NamingContext::AlreadyBound &)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Node_Manager.cpp: Name already bound, rebinding....\n"));
+      naming_context->rebind (name, obj);
+    }
 
   return true;
 }
@@ -169,12 +205,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (adapter.in ()))
-          ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
 
-
-      // Create and install the CIAO Daemon servant
-      CIAO::NodeManager_Impl *daemon_servant = 0;
-      ACE_NEW_RETURN (daemon_servant,
+      // Create and install the CIAO NodeManager servant
+      CIAO::NodeManager_Impl *node_manager_servant = 0;
+      ACE_NEW_RETURN (node_manager_servant,
                       CIAO::NodeManager_Impl("NodeManager",
                                              orb.in (),
                                              poa.in (),
@@ -182,16 +217,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                              nodeapp_options_,
                                              spawn_delay),
                       -1);
-      PortableServer::ServantBase_var safe_daemon (daemon_servant);
-      
-      daemon_servant->init ();
-      
+
+      PortableServer::ServantBase_var safe_daemon (node_manager_servant);
+
+      node_manager_servant->init ();
+
       // Implicit activation
-      CIAO::NodeManager_var daemon =
-        daemon_servant->_this ();
+      CIAO::NodeManagerDaemon_var node_manager =
+        node_manager_servant->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (daemon.in ()
+        orb->object_to_string (node_manager.in ()
                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -215,7 +251,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           // Register this name with the Naming Service
           (void) register_with_ns (name,
                                    orb.in (),
-                                   daemon.in ()
+                                   node_manager.in ()
                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
@@ -230,10 +266,22 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // End Deployment part
+      // Here start the Monitor
+      /*
+        MonitorController* monitor_controller
+        = new MonitorController (orb);
+
+        ACE_DEBUG ((LM_DEBUG , "Before Activate"));
+        monitor_controller->activate ();
+        ACE_DEBUG ((LM_DEBUG , "After Activate"));
+      */
+
+      // Finishing Deployment part
       ACE_DEBUG ((LM_DEBUG,
                   "CIAO_NodeManager is running...\n"));
 
+      write_pid ();
+
       // Run the main event loop for the ORB.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/DAnCE/NodeManager/README b/TAO/CIAO/DAnCE/NodeManager/README
index 2b6553863eb..09f407f6a65 100644
--- a/TAO/CIAO/DAnCE/NodeManager/README
+++ b/TAO/CIAO/DAnCE/NodeManager/README
@@ -9,5 +9,5 @@ some port of all the hosts that have NodeApplication install to
 function properly. The port to run this daemon can be set by using the
 TAO ORB options command of -ORBEndpoint <port>. This replaces the
 earlier CIAO_Daemon  implementation of CIAO as defined in the CCM
-specification. 
-*/
\ No newline at end of file
+specification.
+*/
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp
deleted file mode 100644
index 55efb468266..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-//$Id$
-
-#include "Any_Handler.h"
-#include "DT_Handler.h"
-#include "Utils.h"
-
-#include "tao/Exception.h"
-
-#include "ace/OS_NS_string.h"
-
-void
-CIAO::Config_Handler::Any_Handler::validate_ValueNode (DOMNodeIterator * iter,
-                                                       const char * name)
-{
-  DOMNode * node = iter->nextNode ();
-  XStr temp_name (node->getNodeName ());
-  if (temp_name != XStr (ACE_TEXT (name)))
-    {
-      ACE_DEBUG ((LM_DEBUG, "CIAO::Config_Handler::Any_Handler::validate\
-                             valueNode (), element mismatch expected \
-                             <%s> \n", name));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
-                                                ::CORBA::Any &any_obj)
-{
-  // Process the name value definitions within the Any
-  DOMNode * node = iter->nextNode ();
-
-  // Get name of the current element
-  XStr name (node->getNodeName ());
-
-  // Initialize the ORB so that CORBA::Any will work
-  int argc = 0;
-  char ** argv = 0;
-  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
-
-  if (name == XStr (ACE_TEXT ("type")))
-    {
-      // Process DataType
-      ::CORBA::TypeCode_var type;
-      DT_Handler::process_DataType (iter, type.out (), orb);
-
-      //Switch on the type of the BasicType
-      switch (type->kind ())
-        {
-        case CORBA::tk_short:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "short");
-          // Process the short value
-          any_obj <<= static_cast<CORBA::Short> (Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ushort:
-
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ushort");
-          // Process the ushort value
-          any_obj <<= static_cast<CORBA::UShort> (Utils::parse_ulong (iter));
-          break;
-
-        case CORBA::tk_long:
-
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <long> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "long");
-          // Process the long value
-          any_obj <<= static_cast<CORBA::Long> (Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ulong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <ulong> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ulong");
-          // Process the ulong value
-          any_obj <<= static_cast<CORBA::ULong> (Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_float:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <float> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "float");
-          // Process the float value
-          any_obj <<= static_cast<CORBA::Float> (Utils::parse_float (iter));
-          break;
-
-        case CORBA::tk_double:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "double");
-          // Process the double value
-          any_obj <<= static_cast<CORBA::Double> (Utils::parse_double (iter));
-          break;
-
-        case CORBA::tk_boolean:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "bool");
-          // Process the bool value
-          any_obj <<= CORBA::Any::from_boolean (Utils::parse_bool (iter));
-          break;
-
-        case CORBA::tk_char:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "char");
-          // Process the char value
-          any_obj <<= CORBA::Any::from_char (Utils::parse_char (iter));
-          break;
-
-        case CORBA::tk_octet:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "octet");
-          // Process the octet value
-          any_obj <<= CORBA::Any::from_octet (Utils::parse_octet (iter));
-          break;
-
-        case CORBA::tk_string:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "string");
-          // Process the string value
-          {
-            char * temp = Utils::parse_string (iter);
-            any_obj <<= temp;
-            XMLString::release (&temp);
-          }
-          break;
-
-        case CORBA::tk_longlong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "longlong");
-          // Process the longlong value
-          any_obj <<= static_cast<CORBA::LongLong> (Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ulonglong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ulonglong");
-          // Process the longlong value
-          any_obj <<= static_cast<CORBA::ULongLong> (Utils::parse_ulong (iter));
-          break;
-
-        case CORBA::tk_longdouble:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "longdouble");
-          // Process the longlong value -- Create a scope to define the
-          // lifetime for the ret_val object created within the case statement.
-          {
-#if ACE_SIZEOF_LONG_DOUBLE == 16
-            CORBA::LongDouble ret_str = Utils::parse_double (iter);
-#else
-            CORBA::LongDouble ret_str;
-            char * ret_val = Utils::parse_string (iter);
-            ACE_OS::memcpy (&ret_str.ld, ret_val, 16);
-            XMLString::release (&ret_val);
-#endif
-            any_obj <<= ret_str;
-          }
-          break;
-
-        default:
-          ACE_DEBUG ((LM_DEBUG, "Currently the DnC handlers support only \
-                                basic types, complex and recusive type \
-                                support will be added\n"));
-        }
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Any_Handler::process_ \
-                         Any element mismatch expected <type>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-    // Release ORB resource
-    CORBA::release (orb);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.h
deleted file mode 100644
index be6dbcd591f..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//==================================================================
-/**
- *  @file  Any_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ANY_HANDLER_H
-#define ANY_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Any_Handler
-     *
-     * @brief Handler class for <Deployment:Any> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Any_Handler
-    {
-    public:
-      static void process_Any (DOMNodeIterator * iter,
-                               ::CORBA::Any &any_obj);
-      // process elements of type Deployment:Any in the descriptor files
-
-    private:
-      static void validate_ValueNode (DOMNodeIterator * iter,
-                                      const char * name);
-      // validate <value> .. </value> node present in the XML schema
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp
deleted file mode 100644
index 062be4de64c..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp
+++ /dev/null
@@ -1,6257 +0,0 @@
-// $Id$
-#include "Basic_Deployment_Data.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // TCKind
-    // 
-
-    TCKind::
-    TCKind ()
-    {
-    }
-
-    TCKind::Value TCKind::
-    integral () const
-    {
-      return v_;
-    }
-
-    bool
-    operator== (::CIAO::Config_Handlers::TCKind const& a, ::CIAO::Config_Handlers::TCKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
-
-    bool
-    operator!= (::CIAO::Config_Handlers::TCKind const& a, ::CIAO::Config_Handlers::TCKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
-
-    TCKind::
-    TCKind (TCKind::Value v)
-    : v_ (v)
-    {
-    }
-
-    // DataType
-    // 
-
-    DataType::
-    DataType ()
-    :
-    regulator__ ()
-    {
-    }
-
-    DataType::
-    DataType (::CIAO::Config_Handlers::DataType const& s)
-    :
-    kind_ (s.kind_.get () ? new ::CIAO::Config_Handlers::TCKind (*s.kind_) : 0),
-    regulator__ ()
-    {
-      if (kind_.get ()) kind_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::DataType& DataType::
-    operator= (::CIAO::Config_Handlers::DataType const& s)
-    {
-      if (s.kind_.get ()) kind (*(s.kind_));
-      else kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (0);
-
-      return *this;
-    }
-
-
-    // DataType
-    // 
-    bool DataType::
-    kind_p () const
-    {
-      return kind_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::TCKind const& DataType::
-    kind () const
-    {
-      return *kind_;
-    }
-
-    ::CIAO::Config_Handlers::TCKind& DataType::
-    kind ()
-    {
-      return *kind_;
-    }
-
-    void DataType::
-    kind (::CIAO::Config_Handlers::TCKind const& e)
-    {
-      if (kind_.get ())
-      {
-        *kind_ = e;
-      }
-
-      else
-      {
-        kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
-        kind_->container (this);
-      }
-    }
-
-
-    // DataValue
-    // 
-
-    DataValue::
-    DataValue ()
-    :
-    regulator__ ()
-    {
-    }
-
-    DataValue::
-    DataValue (::CIAO::Config_Handlers::DataValue const& s)
-    :
-    short__ (s.short__.get () ? new ::XMLSchema::short_ (*s.short__) : 0),
-    long__ (s.long__.get () ? new ::XMLSchema::int_ (*s.long__) : 0),
-    ushort_ (s.ushort_.get () ? new ::XMLSchema::unsignedShort (*s.ushort_) : 0),
-    ulong_ (s.ulong_.get () ? new ::XMLSchema::unsignedInt (*s.ulong_) : 0),
-    float__ (s.float__.get () ? new ::XMLSchema::float_ (*s.float__) : 0),
-    double__ (s.double__.get () ? new ::XMLSchema::double_ (*s.double__) : 0),
-    boolean_ (s.boolean_.get () ? new ::XMLSchema::boolean (*s.boolean_) : 0),
-    octet_ (s.octet_.get () ? new ::XMLSchema::unsignedByte (*s.octet_) : 0),
-    objref_ (s.objref_.get () ? new ::XMLSchema::string< char > (*s.objref_) : 0),
-    enum__ (s.enum__.get () ? new ::XMLSchema::string< char > (*s.enum__) : 0),
-    string_ (s.string_.get () ? new ::XMLSchema::string< char > (*s.string_) : 0),
-    longlong_ (s.longlong_.get () ? new ::XMLSchema::long_ (*s.longlong_) : 0),
-    ulonglong_ (s.ulonglong_.get () ? new ::XMLSchema::unsignedLong (*s.ulonglong_) : 0),
-    longdouble_ (s.longdouble_.get () ? new ::XMLSchema::double_ (*s.longdouble_) : 0),
-    fixed_ (s.fixed_.get () ? new ::XMLSchema::string< char > (*s.fixed_) : 0),
-    typecode_ (s.typecode_.get () ? new ::CIAO::Config_Handlers::DataType (*s.typecode_) : 0),
-    regulator__ ()
-    {
-      if (short__.get ()) short__->container (this);
-      if (long__.get ()) long__->container (this);
-      if (ushort_.get ()) ushort_->container (this);
-      if (ulong_.get ()) ulong_->container (this);
-      if (float__.get ()) float__->container (this);
-      if (double__.get ()) double__->container (this);
-      if (boolean_.get ()) boolean_->container (this);
-      if (octet_.get ()) octet_->container (this);
-      if (objref_.get ()) objref_->container (this);
-      if (enum__.get ()) enum__->container (this);
-      if (string_.get ()) string_->container (this);
-      if (longlong_.get ()) longlong_->container (this);
-      if (ulonglong_.get ()) ulonglong_->container (this);
-      if (longdouble_.get ()) longdouble_->container (this);
-      if (fixed_.get ()) fixed_->container (this);
-      if (typecode_.get ()) typecode_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::DataValue& DataValue::
-    operator= (::CIAO::Config_Handlers::DataValue const& s)
-    {
-      if (s.short__.get ()) short_ (*(s.short__));
-      else short__ = ::std::auto_ptr< ::XMLSchema::short_ > (0);
-
-      if (s.long__.get ()) long_ (*(s.long__));
-      else long__ = ::std::auto_ptr< ::XMLSchema::int_ > (0);
-
-      if (s.ushort_.get ()) ushort (*(s.ushort_));
-      else ushort_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (0);
-
-      if (s.ulong_.get ()) ulong (*(s.ulong_));
-      else ulong_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (0);
-
-      if (s.float__.get ()) float_ (*(s.float__));
-      else float__ = ::std::auto_ptr< ::XMLSchema::float_ > (0);
-
-      if (s.double__.get ()) double_ (*(s.double__));
-      else double__ = ::std::auto_ptr< ::XMLSchema::double_ > (0);
-
-      if (s.boolean_.get ()) boolean (*(s.boolean_));
-      else boolean_ = ::std::auto_ptr< ::XMLSchema::boolean > (0);
-
-      if (s.octet_.get ()) octet (*(s.octet_));
-      else octet_ = ::std::auto_ptr< ::XMLSchema::unsignedByte > (0);
-
-      if (s.objref_.get ()) objref (*(s.objref_));
-      else objref_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.enum__.get ()) enum_ (*(s.enum__));
-      else enum__ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.string_.get ()) string (*(s.string_));
-      else string_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.longlong_.get ()) longlong (*(s.longlong_));
-      else longlong_ = ::std::auto_ptr< ::XMLSchema::long_ > (0);
-
-      if (s.ulonglong_.get ()) ulonglong (*(s.ulonglong_));
-      else ulonglong_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (0);
-
-      if (s.longdouble_.get ()) longdouble (*(s.longdouble_));
-      else longdouble_ = ::std::auto_ptr< ::XMLSchema::double_ > (0);
-
-      if (s.fixed_.get ()) fixed (*(s.fixed_));
-      else fixed_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.typecode_.get ()) typecode (*(s.typecode_));
-      else typecode_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (0);
-
-      return *this;
-    }
-
-
-    // DataValue
-    // 
-    bool DataValue::
-    short_p () const
-    {
-      return short__.get () != 0;
-    }
-
-    ::XMLSchema::short_ const& DataValue::
-    short_ () const
-    {
-      return *short__;
-    }
-
-    ::XMLSchema::short_& DataValue::
-    short_ ()
-    {
-      return *short__;
-    }
-
-    void DataValue::
-    short_ (::XMLSchema::short_ const& e)
-    {
-      if (short__.get ())
-      {
-        *short__ = e;
-      }
-
-      else
-      {
-        short__ = ::std::auto_ptr< ::XMLSchema::short_ > (new ::XMLSchema::short_ (e));
-        short__->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    long_p () const
-    {
-      return long__.get () != 0;
-    }
-
-    ::XMLSchema::int_ const& DataValue::
-    long_ () const
-    {
-      return *long__;
-    }
-
-    ::XMLSchema::int_& DataValue::
-    long_ ()
-    {
-      return *long__;
-    }
-
-    void DataValue::
-    long_ (::XMLSchema::int_ const& e)
-    {
-      if (long__.get ())
-      {
-        *long__ = e;
-      }
-
-      else
-      {
-        long__ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
-        long__->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    ushort_p () const
-    {
-      return ushort_.get () != 0;
-    }
-
-    ::XMLSchema::unsignedShort const& DataValue::
-    ushort () const
-    {
-      return *ushort_;
-    }
-
-    ::XMLSchema::unsignedShort& DataValue::
-    ushort ()
-    {
-      return *ushort_;
-    }
-
-    void DataValue::
-    ushort (::XMLSchema::unsignedShort const& e)
-    {
-      if (ushort_.get ())
-      {
-        *ushort_ = e;
-      }
-
-      else
-      {
-        ushort_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (new ::XMLSchema::unsignedShort (e));
-        ushort_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    ulong_p () const
-    {
-      return ulong_.get () != 0;
-    }
-
-    ::XMLSchema::unsignedInt const& DataValue::
-    ulong () const
-    {
-      return *ulong_;
-    }
-
-    ::XMLSchema::unsignedInt& DataValue::
-    ulong ()
-    {
-      return *ulong_;
-    }
-
-    void DataValue::
-    ulong (::XMLSchema::unsignedInt const& e)
-    {
-      if (ulong_.get ())
-      {
-        *ulong_ = e;
-      }
-
-      else
-      {
-        ulong_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (new ::XMLSchema::unsignedInt (e));
-        ulong_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    float_p () const
-    {
-      return float__.get () != 0;
-    }
-
-    ::XMLSchema::float_ const& DataValue::
-    float_ () const
-    {
-      return *float__;
-    }
-
-    ::XMLSchema::float_& DataValue::
-    float_ ()
-    {
-      return *float__;
-    }
-
-    void DataValue::
-    float_ (::XMLSchema::float_ const& e)
-    {
-      if (float__.get ())
-      {
-        *float__ = e;
-      }
-
-      else
-      {
-        float__ = ::std::auto_ptr< ::XMLSchema::float_ > (new ::XMLSchema::float_ (e));
-        float__->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    double_p () const
-    {
-      return double__.get () != 0;
-    }
-
-    ::XMLSchema::double_ const& DataValue::
-    double_ () const
-    {
-      return *double__;
-    }
-
-    ::XMLSchema::double_& DataValue::
-    double_ ()
-    {
-      return *double__;
-    }
-
-    void DataValue::
-    double_ (::XMLSchema::double_ const& e)
-    {
-      if (double__.get ())
-      {
-        *double__ = e;
-      }
-
-      else
-      {
-        double__ = ::std::auto_ptr< ::XMLSchema::double_ > (new ::XMLSchema::double_ (e));
-        double__->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    boolean_p () const
-    {
-      return boolean_.get () != 0;
-    }
-
-    ::XMLSchema::boolean const& DataValue::
-    boolean () const
-    {
-      return *boolean_;
-    }
-
-    ::XMLSchema::boolean& DataValue::
-    boolean ()
-    {
-      return *boolean_;
-    }
-
-    void DataValue::
-    boolean (::XMLSchema::boolean const& e)
-    {
-      if (boolean_.get ())
-      {
-        *boolean_ = e;
-      }
-
-      else
-      {
-        boolean_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
-        boolean_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    octet_p () const
-    {
-      return octet_.get () != 0;
-    }
-
-    ::XMLSchema::unsignedByte const& DataValue::
-    octet () const
-    {
-      return *octet_;
-    }
-
-    ::XMLSchema::unsignedByte& DataValue::
-    octet ()
-    {
-      return *octet_;
-    }
-
-    void DataValue::
-    octet (::XMLSchema::unsignedByte const& e)
-    {
-      if (octet_.get ())
-      {
-        *octet_ = e;
-      }
-
-      else
-      {
-        octet_ = ::std::auto_ptr< ::XMLSchema::unsignedByte > (new ::XMLSchema::unsignedByte (e));
-        octet_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    objref_p () const
-    {
-      return objref_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DataValue::
-    objref () const
-    {
-      return *objref_;
-    }
-
-    ::XMLSchema::string< char >& DataValue::
-    objref ()
-    {
-      return *objref_;
-    }
-
-    void DataValue::
-    objref (::XMLSchema::string< char > const& e)
-    {
-      if (objref_.get ())
-      {
-        *objref_ = e;
-      }
-
-      else
-      {
-        objref_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        objref_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    enum_p () const
-    {
-      return enum__.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DataValue::
-    enum_ () const
-    {
-      return *enum__;
-    }
-
-    ::XMLSchema::string< char >& DataValue::
-    enum_ ()
-    {
-      return *enum__;
-    }
-
-    void DataValue::
-    enum_ (::XMLSchema::string< char > const& e)
-    {
-      if (enum__.get ())
-      {
-        *enum__ = e;
-      }
-
-      else
-      {
-        enum__ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        enum__->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    string_p () const
-    {
-      return string_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DataValue::
-    string () const
-    {
-      return *string_;
-    }
-
-    ::XMLSchema::string< char >& DataValue::
-    string ()
-    {
-      return *string_;
-    }
-
-    void DataValue::
-    string (::XMLSchema::string< char > const& e)
-    {
-      if (string_.get ())
-      {
-        *string_ = e;
-      }
-
-      else
-      {
-        string_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        string_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    longlong_p () const
-    {
-      return longlong_.get () != 0;
-    }
-
-    ::XMLSchema::long_ const& DataValue::
-    longlong () const
-    {
-      return *longlong_;
-    }
-
-    ::XMLSchema::long_& DataValue::
-    longlong ()
-    {
-      return *longlong_;
-    }
-
-    void DataValue::
-    longlong (::XMLSchema::long_ const& e)
-    {
-      if (longlong_.get ())
-      {
-        *longlong_ = e;
-      }
-
-      else
-      {
-        longlong_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
-        longlong_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    ulonglong_p () const
-    {
-      return ulonglong_.get () != 0;
-    }
-
-    ::XMLSchema::unsignedLong const& DataValue::
-    ulonglong () const
-    {
-      return *ulonglong_;
-    }
-
-    ::XMLSchema::unsignedLong& DataValue::
-    ulonglong ()
-    {
-      return *ulonglong_;
-    }
-
-    void DataValue::
-    ulonglong (::XMLSchema::unsignedLong const& e)
-    {
-      if (ulonglong_.get ())
-      {
-        *ulonglong_ = e;
-      }
-
-      else
-      {
-        ulonglong_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
-        ulonglong_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    longdouble_p () const
-    {
-      return longdouble_.get () != 0;
-    }
-
-    ::XMLSchema::double_ const& DataValue::
-    longdouble () const
-    {
-      return *longdouble_;
-    }
-
-    ::XMLSchema::double_& DataValue::
-    longdouble ()
-    {
-      return *longdouble_;
-    }
-
-    void DataValue::
-    longdouble (::XMLSchema::double_ const& e)
-    {
-      if (longdouble_.get ())
-      {
-        *longdouble_ = e;
-      }
-
-      else
-      {
-        longdouble_ = ::std::auto_ptr< ::XMLSchema::double_ > (new ::XMLSchema::double_ (e));
-        longdouble_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    fixed_p () const
-    {
-      return fixed_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DataValue::
-    fixed () const
-    {
-      return *fixed_;
-    }
-
-    ::XMLSchema::string< char >& DataValue::
-    fixed ()
-    {
-      return *fixed_;
-    }
-
-    void DataValue::
-    fixed (::XMLSchema::string< char > const& e)
-    {
-      if (fixed_.get ())
-      {
-        *fixed_ = e;
-      }
-
-      else
-      {
-        fixed_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        fixed_->container (this);
-      }
-    }
-
-    // DataValue
-    // 
-    bool DataValue::
-    typecode_p () const
-    {
-      return typecode_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::DataType const& DataValue::
-    typecode () const
-    {
-      return *typecode_;
-    }
-
-    ::CIAO::Config_Handlers::DataType& DataValue::
-    typecode ()
-    {
-      return *typecode_;
-    }
-
-    void DataValue::
-    typecode (::CIAO::Config_Handlers::DataType const& e)
-    {
-      if (typecode_.get ())
-      {
-        *typecode_ = e;
-      }
-
-      else
-      {
-        typecode_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-        typecode_->container (this);
-      }
-    }
-
-
-    // Any
-    // 
-
-    Any::
-    Any ()
-    :
-    type_ (new ::CIAO::Config_Handlers::DataType ()),
-    value_ (new ::CIAO::Config_Handlers::DataValue ()),
-    regulator__ ()
-    {
-      type_->container (this);
-      value_->container (this);
-    }
-
-    Any::
-    Any (::CIAO::Config_Handlers::Any const& s)
-    :
-    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-    value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
-    regulator__ ()
-    {
-      type_->container (this);
-      value_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Any& Any::
-    operator= (::CIAO::Config_Handlers::Any const& s)
-    {
-      type (s.type ());
-
-      value (s.value ());
-
-      return *this;
-    }
-
-
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataType const& Any::
-    type () const
-    {
-      return *type_;
-    }
-
-    ::CIAO::Config_Handlers::DataType& Any::
-    type ()
-    {
-      return *type_;
-    }
-
-    void Any::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
-
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataValue const& Any::
-    value () const
-    {
-      return *value_;
-    }
-
-    ::CIAO::Config_Handlers::DataValue& Any::
-    value ()
-    {
-      return *value_;
-    }
-
-    void Any::
-    value (::CIAO::Config_Handlers::DataValue const& e)
-    {
-      *value_ = e;
-    }
-
-
-    // Property
-    // 
-
-    Property::
-    Property ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    value_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      value_->container (this);
-    }
-
-    Property::
-    Property (::CIAO::Config_Handlers::Property const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      value_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Property& Property::
-    operator= (::CIAO::Config_Handlers::Property const& s)
-    {
-      name (s.name ());
-
-      value (s.value ());
-
-      return *this;
-    }
-
-
-    // Property
-    // 
-    ::XMLSchema::string< char > const& Property::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& Property::
-    name ()
-    {
-      return *name_;
-    }
-
-    void Property::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // Property
-    // 
-    ::CIAO::Config_Handlers::Any const& Property::
-    value () const
-    {
-      return *value_;
-    }
-
-    ::CIAO::Config_Handlers::Any& Property::
-    value ()
-    {
-      return *value_;
-    }
-
-    void Property::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
-
-
-    // Node
-    // 
-
-    Node::
-    Node ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    label_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      label_->container (this);
-    }
-
-    Node::
-    Node (::CIAO::Config_Handlers::Node const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    label_ (new ::XMLSchema::string< char > (*s.label_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      label_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Node& Node::
-    operator= (::CIAO::Config_Handlers::Node const& s)
-    {
-      name (s.name ());
-
-      label (s.label ());
-
-      return *this;
-    }
-
-
-    // Node
-    // 
-    ::XMLSchema::string< char > const& Node::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& Node::
-    name ()
-    {
-      return *name_;
-    }
-
-    void Node::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // Node
-    // 
-    ::XMLSchema::string< char > const& Node::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& Node::
-    label ()
-    {
-      return *label_;
-    }
-
-    void Node::
-    label (::XMLSchema::string< char > const& e)
-    {
-      *label_ = e;
-    }
-
-
-    // SatisfierPropertyKind
-    // 
-
-    SatisfierPropertyKind::
-    SatisfierPropertyKind ()
-    {
-    }
-
-    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_;
-    }
-
-    bool
-    operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
-
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (SatisfierPropertyKind::Value v)
-    : v_ (v)
-    {
-    }
-
-    // SatisfierProperty
-    // 
-
-    SatisfierProperty::
-    SatisfierProperty ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind ()),
-    value_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
-
-    SatisfierProperty::
-    SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
-    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
-    operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
-    {
-      name (s.name ());
-
-      kind (s.kind ());
-
-      value (s.value ());
-
-      return *this;
-    }
-
-
-    // SatisfierProperty
-    // 
-    ::XMLSchema::string< char > const& SatisfierProperty::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& SatisfierProperty::
-    name ()
-    {
-      return *name_;
-    }
-
-    void SatisfierProperty::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
-    kind () const
-    {
-      return *kind_;
-    }
-
-    ::CIAO::Config_Handlers::SatisfierPropertyKind& SatisfierProperty::
-    kind ()
-    {
-      return *kind_;
-    }
-
-    void SatisfierProperty::
-    kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
-    {
-      *kind_ = e;
-    }
-
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::Any const& SatisfierProperty::
-    value () const
-    {
-      return *value_;
-    }
-
-    ::CIAO::Config_Handlers::Any& SatisfierProperty::
-    value ()
-    {
-      return *value_;
-    }
-
-    void SatisfierProperty::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
-
-
-    // Resource
-    // 
-
-    Resource::
-    Resource ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
-
-    Resource::
-    Resource (::CIAO::Config_Handlers::Resource const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Resource& Resource::
-    operator= (::CIAO::Config_Handlers::Resource const& s)
-    {
-      name (s.name ());
-
-      resourceType (s.resourceType ());
-
-      property (s.property ());
-
-      return *this;
-    }
-
-
-    // Resource
-    // 
-    ::XMLSchema::string< char > const& Resource::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& Resource::
-    name ()
-    {
-      return *name_;
-    }
-
-    void Resource::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // Resource
-    // 
-    ::XMLSchema::string< char > const& Resource::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
-
-    ::XMLSchema::string< char >& Resource::
-    resourceType ()
-    {
-      return *resourceType_;
-    }
-
-    void Resource::
-    resourceType (::XMLSchema::string< char > const& e)
-    {
-      *resourceType_ = e;
-    }
-
-    // Resource
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& Resource::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::SatisfierProperty& Resource::
-    property ()
-    {
-      return *property_;
-    }
-
-    void Resource::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
-
-
-    // SharedResource
-    // 
-
-    SharedResource::
-    SharedResource ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    node_ (new ::CIAO::Config_Handlers::Node ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      node_->container (this);
-      property_->container (this);
-    }
-
-    SharedResource::
-    SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< char > (*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 ());
-
-      resourceType (s.resourceType ());
-
-      node (s.node ());
-
-      property (s.property ());
-
-      return *this;
-    }
-
-
-    // SharedResource
-    // 
-    ::XMLSchema::string< char > const& SharedResource::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& SharedResource::
-    name ()
-    {
-      return *name_;
-    }
-
-    void SharedResource::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // SharedResource
-    // 
-    ::XMLSchema::string< char > const& SharedResource::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
-
-    ::XMLSchema::string< char >& SharedResource::
-    resourceType ()
-    {
-      return *resourceType_;
-    }
-
-    void SharedResource::
-    resourceType (::XMLSchema::string< char > const& e)
-    {
-      *resourceType_ = e;
-    }
-
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::Node const& SharedResource::
-    node () const
-    {
-      return *node_;
-    }
-
-    ::CIAO::Config_Handlers::Node& SharedResource::
-    node ()
-    {
-      return *node_;
-    }
-
-    void SharedResource::
-    node (::CIAO::Config_Handlers::Node const& e)
-    {
-      *node_ = e;
-    }
-
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::SatisfierProperty& SharedResource::
-    property ()
-    {
-      return *property_;
-    }
-
-    void SharedResource::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
-
-
-    // Requirement
-    // 
-
-    Requirement::
-    Requirement ()
-    :
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    name_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::Property ()),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
-
-    Requirement::
-    Requirement (::CIAO::Config_Handlers::Requirement const& s)
-    :
-    resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Requirement& Requirement::
-    operator= (::CIAO::Config_Handlers::Requirement const& s)
-    {
-      resourceType (s.resourceType ());
-
-      name (s.name ());
-
-      property (s.property ());
-
-      return *this;
-    }
-
-
-    // Requirement
-    // 
-    ::XMLSchema::string< char > const& Requirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
-
-    ::XMLSchema::string< char >& Requirement::
-    resourceType ()
-    {
-      return *resourceType_;
-    }
-
-    void Requirement::
-    resourceType (::XMLSchema::string< char > const& e)
-    {
-      *resourceType_ = e;
-    }
-
-    // Requirement
-    // 
-    ::XMLSchema::string< char > const& Requirement::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& Requirement::
-    name ()
-    {
-      return *name_;
-    }
-
-    void Requirement::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // Requirement
-    // 
-    ::CIAO::Config_Handlers::Property const& Requirement::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::Property& Requirement::
-    property ()
-    {
-      return *property_;
-    }
-
-    void Requirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
-
-
-    // ResourceDeploymentDescription
-    // 
-
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription ()
-    :
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-    :
-    requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-    {
-      requirementName (s.requirementName ());
-
-      resourceName (s.resourceName ());
-
-      resourceValue (s.resourceValue ());
-
-      return *this;
-    }
-
-
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
-
-    ::XMLSchema::string< char >& ResourceDeploymentDescription::
-    requirementName ()
-    {
-      return *requirementName_;
-    }
-
-    void ResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< char > const& e)
-    {
-      *requirementName_ = e;
-    }
-
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
-
-    ::XMLSchema::string< char >& ResourceDeploymentDescription::
-    resourceName ()
-    {
-      return *resourceName_;
-    }
-
-    void ResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< char > const& e)
-    {
-      *resourceName_ = e;
-    }
-
-    // ResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
-
-    ::CIAO::Config_Handlers::Any& ResourceDeploymentDescription::
-    resourceValue ()
-    {
-      return *resourceValue_;
-    }
-
-    void ResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
-
-
-    // ArtifactDeploymentDescription
-    // 
-
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-    }
-
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    source_ (new ::XMLSchema::string< char > (*s.source_)),
-    node_ (s.node_.get () ? new ::XMLSchema::string< char > (*s.node_) : 0),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::ResourceDeploymentDescription (*s.deployedResource_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< char > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-      if (node_.get ()) node_->container (this);
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
-
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      if (deployedResource_.get ()) deployedResource_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-    {
-      name (s.name ());
-
-      source (s.source ());
-
-      if (s.node_.get ()) node (*(s.node_));
-      else node_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      location_.clear ();
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
-
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceDeploymentDescription > (0);
-
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (0);
-
-      return *this;
-    }
-
-
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ArtifactDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& ArtifactDeploymentDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void ArtifactDeploymentDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ArtifactDeploymentDescription::
-    source () const
-    {
-      return *source_;
-    }
-
-    ::XMLSchema::string< char >& ArtifactDeploymentDescription::
-    source ()
-    {
-      return *source_;
-    }
-
-    void ArtifactDeploymentDescription::
-    source (::XMLSchema::string< char > const& e)
-    {
-      *source_ = e;
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    node_p () const
-    {
-      return node_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ArtifactDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
-
-    ::XMLSchema::string< char >& ArtifactDeploymentDescription::
-    node ()
-    {
-      return *node_;
-    }
-
-    void ArtifactDeploymentDescription::
-    node (::XMLSchema::string< char > const& e)
-    {
-      if (node_.get ())
-      {
-        *node_ = e;
-      }
-
-      else
-      {
-        node_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        node_->container (this);
-      }
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
-
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
-
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
-
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
-
-    void ArtifactDeploymentDescription::
-    add_location (::XMLSchema::string< char > const& e)
-    {
-      if (location_.capacity () < location_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::string< char > > v;
-        v.reserve (location_.size () + 1);
-
-        while (location_.size ())
-        {
-          //@@ VC6
-          ::XMLSchema::string< char >& t = location_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          location_.pop_back ();
-        }
-
-        location_.swap (v);
-      }
-
-      location_.push_back (e);
-      location_.back ().container (this);
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ArtifactDeploymentDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ArtifactDeploymentDescription::
-    execParameter ()
-    {
-      return *execParameter_;
-    }
-
-    void ArtifactDeploymentDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& ArtifactDeploymentDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& ArtifactDeploymentDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void ArtifactDeploymentDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    deployedResource_p () const
-    {
-      return deployedResource_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ResourceDeploymentDescription const& ArtifactDeploymentDescription::
-    deployedResource () const
-    {
-      return *deployedResource_;
-    }
-
-    ::CIAO::Config_Handlers::ResourceDeploymentDescription& ArtifactDeploymentDescription::
-    deployedResource ()
-    {
-      return *deployedResource_;
-    }
-
-    void ArtifactDeploymentDescription::
-    deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
-    {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
-
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceDeploymentDescription > (new ::CIAO::Config_Handlers::ResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
-    }
-
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
-
-    ::XMLSchema::ID< char > const& ArtifactDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
-
-    ::XMLSchema::ID< char >& ArtifactDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
-
-    void ArtifactDeploymentDescription::
-    id (::XMLSchema::ID< char > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
-
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (new ::XMLSchema::ID< char > (e));
-        id_->container (this);
-      }
-    }
-
-
-    // MonolithicDeploymentDescription
-    // 
-
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-    }
-
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    source_ (new ::XMLSchema::string< char > (*s.source_)),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< char > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-      artifact_.reserve (s.artifact_.size ());
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
-
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-    {
-      name (s.name ());
-
-      source (s.source ());
-
-      artifact_.clear ();
-      artifact_.reserve (s.artifact_.size ());
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
-
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (0);
-
-      return *this;
-    }
-
-
-    // MonolithicDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& MonolithicDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& MonolithicDeploymentDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void MonolithicDeploymentDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // MonolithicDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& MonolithicDeploymentDescription::
-    source () const
-    {
-      return *source_;
-    }
-
-    ::XMLSchema::string< char >& MonolithicDeploymentDescription::
-    source ()
-    {
-      return *source_;
-    }
-
-    void MonolithicDeploymentDescription::
-    source (::XMLSchema::string< char > const& e)
-    {
-      *source_ = e;
-    }
-
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    begin_artifact ()
-    {
-      return artifact_.begin ();
-    }
-
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    end_artifact ()
-    {
-      return artifact_.end ();
-    }
-
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    begin_artifact () const
-    {
-      return artifact_.begin ();
-    }
-
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    end_artifact () const
-    {
-      return artifact_.end ();
-    }
-
-    void MonolithicDeploymentDescription::
-    add_artifact (::XMLSchema::IDREF< char > const& e)
-    {
-      if (artifact_.capacity () < artifact_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::IDREF< char > > v;
-        v.reserve (artifact_.size () + 1);
-
-        while (artifact_.size ())
-        {
-          //@@ VC6
-          ::XMLSchema::IDREF< char >& t = artifact_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          artifact_.pop_back ();
-        }
-
-        artifact_.swap (v);
-      }
-
-      artifact_.push_back (e);
-      artifact_.back ().container (this);
-    }
-
-    // MonolithicDeploymentDescription
-    // 
-    bool MonolithicDeploymentDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& MonolithicDeploymentDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
-
-    ::CIAO::Config_Handlers::Property& MonolithicDeploymentDescription::
-    execParameter ()
-    {
-      return *execParameter_;
-    }
-
-    void MonolithicDeploymentDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
-
-    // MonolithicDeploymentDescription
-    // 
-    bool MonolithicDeploymentDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& MonolithicDeploymentDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& MonolithicDeploymentDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void MonolithicDeploymentDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-    // MonolithicDeploymentDescription
-    // 
-    bool MonolithicDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
-
-    ::XMLSchema::ID< char > const& MonolithicDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
-
-    ::XMLSchema::ID< char >& MonolithicDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
-
-    void MonolithicDeploymentDescription::
-    id (::XMLSchema::ID< char > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
-
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (new ::XMLSchema::ID< char > (e));
-        id_->container (this);
-      }
-    }
-
-
-    // ResourceUsageKind
-    // 
-
-    ResourceUsageKind::
-    ResourceUsageKind ()
-    {
-    }
-
-    ResourceUsageKind::Value ResourceUsageKind::
-    integral () const
-    {
-      return v_;
-    }
-
-    bool
-    operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
-
-    bool
-    operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
-
-    ResourceUsageKind::
-    ResourceUsageKind (ResourceUsageKind::Value v)
-    : v_ (v)
-    {
-    }
-
-    // InstanceResourceDeploymentDescription
-    // 
-
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription ()
-    :
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()),
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-    :
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-    requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-    {
-      resourceUsage (s.resourceUsage ());
-
-      requirementName (s.requirementName ());
-
-      resourceName (s.resourceName ());
-
-      resourceValue (s.resourceValue ());
-
-      return *this;
-    }
-
-
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
-
-    ::CIAO::Config_Handlers::ResourceUsageKind& InstanceResourceDeploymentDescription::
-    resourceUsage ()
-    {
-      return *resourceUsage_;
-    }
-
-    void InstanceResourceDeploymentDescription::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
-
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& InstanceResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
-
-    ::XMLSchema::string< char >& InstanceResourceDeploymentDescription::
-    requirementName ()
-    {
-      return *requirementName_;
-    }
-
-    void InstanceResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< char > const& e)
-    {
-      *requirementName_ = e;
-    }
-
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& InstanceResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
-
-    ::XMLSchema::string< char >& InstanceResourceDeploymentDescription::
-    resourceName ()
-    {
-      return *resourceName_;
-    }
-
-    void InstanceResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< char > const& e)
-    {
-      *resourceName_ = e;
-    }
-
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& InstanceResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
-
-    ::CIAO::Config_Handlers::Any& InstanceResourceDeploymentDescription::
-    resourceValue ()
-    {
-      return *resourceValue_;
-    }
-
-    void InstanceResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
-
-
-    // InstanceDeploymentDescription
-    // 
-
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    node_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    implementation_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-      source_->container (this);
-      implementation_->container (this);
-    }
-
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    node_ (new ::XMLSchema::string< char > (*s.node_)),
-    source_ (new ::XMLSchema::string< char > (*s.source_)),
-    implementation_ (new ::XMLSchema::IDREF< char > (*s.implementation_)),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    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< char > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-      source_->container (this);
-      implementation_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (deployedResource_.get ()) deployedResource_->container (this);
-      if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-    {
-      name (s.name ());
-
-      node (s.node ());
-
-      source (s.source ());
-
-      implementation (s.implementation ());
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
-
-      if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
-      else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
-
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (0);
-
-      return *this;
-    }
-
-
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& InstanceDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& InstanceDeploymentDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void InstanceDeploymentDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& InstanceDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
-
-    ::XMLSchema::string< char >& InstanceDeploymentDescription::
-    node ()
-    {
-      return *node_;
-    }
-
-    void InstanceDeploymentDescription::
-    node (::XMLSchema::string< char > const& e)
-    {
-      *node_ = e;
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& InstanceDeploymentDescription::
-    source () const
-    {
-      return *source_;
-    }
-
-    ::XMLSchema::string< char >& InstanceDeploymentDescription::
-    source ()
-    {
-      return *source_;
-    }
-
-    void InstanceDeploymentDescription::
-    source (::XMLSchema::string< char > const& e)
-    {
-      *source_ = e;
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::IDREF< char > const& InstanceDeploymentDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
-
-    ::XMLSchema::IDREF< char >& InstanceDeploymentDescription::
-    implementation ()
-    {
-      return *implementation_;
-    }
-
-    void InstanceDeploymentDescription::
-    implementation (::XMLSchema::IDREF< char > const& e)
-    {
-      *implementation_ = e;
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& InstanceDeploymentDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& InstanceDeploymentDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void InstanceDeploymentDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedResource_p () const
-    {
-      return deployedResource_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedResource () const
-    {
-      return *deployedResource_;
-    }
-
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceDeploymentDescription::
-    deployedResource ()
-    {
-      return *deployedResource_;
-    }
-
-    void InstanceDeploymentDescription::
-    deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
-
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedSharedResource_p () const
-    {
-      return deployedSharedResource_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedSharedResource () const
-    {
-      return *deployedSharedResource_;
-    }
-
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceDeploymentDescription::
-    deployedSharedResource ()
-    {
-      return *deployedSharedResource_;
-    }
-
-    void InstanceDeploymentDescription::
-    deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedSharedResource_.get ())
-      {
-        *deployedSharedResource_ = e;
-      }
-
-      else
-      {
-        deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedSharedResource_->container (this);
-      }
-    }
-
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
-
-    ::XMLSchema::ID< char > const& InstanceDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
-
-    ::XMLSchema::ID< char >& InstanceDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
-
-    void InstanceDeploymentDescription::
-    id (::XMLSchema::ID< char > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
-
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (new ::XMLSchema::ID< char > (e));
-        id_->container (this);
-      }
-    }
-
-
-    // CCMComponentPortKind
-    // 
-
-    CCMComponentPortKind::
-    CCMComponentPortKind ()
-    {
-    }
-
-    CCMComponentPortKind::Value CCMComponentPortKind::
-    integral () const
-    {
-      return v_;
-    }
-
-    bool
-    operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
-
-    bool
-    operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
-
-    CCMComponentPortKind::
-    CCMComponentPortKind (CCMComponentPortKind::Value v)
-    : v_ (v)
-    {
-    }
-
-    // ComponentPortDescription
-    // 
-
-    ComponentPortDescription::
-    ComponentPortDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    specificType_ (new ::XMLSchema::string< char > ()),
-    supportedType_ (new ::XMLSchema::string< char > ()),
-    provider_ (new ::XMLSchema::string< char > ()),
-    exclusiveProvider_ (new ::XMLSchema::string< char > ()),
-    exclusiveUser_ (new ::XMLSchema::string< char > ()),
-    optional_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
-
-    ComponentPortDescription::
-    ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    specificType_ (new ::XMLSchema::string< char > (*s.specificType_)),
-    supportedType_ (new ::XMLSchema::string< char > (*s.supportedType_)),
-    provider_ (new ::XMLSchema::string< char > (*s.provider_)),
-    exclusiveProvider_ (new ::XMLSchema::string< char > (*s.exclusiveProvider_)),
-    exclusiveUser_ (new ::XMLSchema::string< char > (*s.exclusiveUser_)),
-    optional_ (new ::XMLSchema::string< char > (*s.optional_)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    {
-      name (s.name ());
-
-      specificType (s.specificType ());
-
-      supportedType (s.supportedType ());
-
-      provider (s.provider ());
-
-      exclusiveProvider (s.exclusiveProvider ());
-
-      exclusiveUser (s.exclusiveUser ());
-
-      optional (s.optional ());
-
-      kind (s.kind ());
-
-      return *this;
-    }
-
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void ComponentPortDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    specificType () const
-    {
-      return *specificType_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    specificType ()
-    {
-      return *specificType_;
-    }
-
-    void ComponentPortDescription::
-    specificType (::XMLSchema::string< char > const& e)
-    {
-      *specificType_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    supportedType () const
-    {
-      return *supportedType_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    supportedType ()
-    {
-      return *supportedType_;
-    }
-
-    void ComponentPortDescription::
-    supportedType (::XMLSchema::string< char > const& e)
-    {
-      *supportedType_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    provider () const
-    {
-      return *provider_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    provider ()
-    {
-      return *provider_;
-    }
-
-    void ComponentPortDescription::
-    provider (::XMLSchema::string< char > const& e)
-    {
-      *provider_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    exclusiveProvider () const
-    {
-      return *exclusiveProvider_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    exclusiveProvider ()
-    {
-      return *exclusiveProvider_;
-    }
-
-    void ComponentPortDescription::
-    exclusiveProvider (::XMLSchema::string< char > const& e)
-    {
-      *exclusiveProvider_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    exclusiveUser () const
-    {
-      return *exclusiveUser_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    exclusiveUser ()
-    {
-      return *exclusiveUser_;
-    }
-
-    void ComponentPortDescription::
-    exclusiveUser (::XMLSchema::string< char > const& e)
-    {
-      *exclusiveUser_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPortDescription::
-    optional () const
-    {
-      return *optional_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPortDescription::
-    optional ()
-    {
-      return *optional_;
-    }
-
-    void ComponentPortDescription::
-    optional (::XMLSchema::string< char > const& e)
-    {
-      *optional_ = e;
-    }
-
-    // ComponentPortDescription
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
-    kind () const
-    {
-      return *kind_;
-    }
-
-    ::CIAO::Config_Handlers::CCMComponentPortKind& ComponentPortDescription::
-    kind ()
-    {
-      return *kind_;
-    }
-
-    void ComponentPortDescription::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
-
-
-    // ComponentPropertyDescription
-    // 
-
-    ComponentPropertyDescription::
-    ComponentPropertyDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    type_ (new ::CIAO::Config_Handlers::DataType ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      type_->container (this);
-    }
-
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      type_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-    {
-      name (s.name ());
-
-      type (s.type ());
-
-      return *this;
-    }
-
-
-    // ComponentPropertyDescription
-    // 
-    ::XMLSchema::string< char > const& ComponentPropertyDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPropertyDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void ComponentPropertyDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // ComponentPropertyDescription
-    // 
-    ::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
-    type () const
-    {
-      return *type_;
-    }
-
-    ::CIAO::Config_Handlers::DataType& ComponentPropertyDescription::
-    type ()
-    {
-      return *type_;
-    }
-
-    void ComponentPropertyDescription::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
-
-
-    // ComponentExternalPortEndpoint
-    // 
-
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint ()
-    :
-    portName_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
-
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    :
-    portName_ (new ::XMLSchema::string< char > (*s.portName_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
-    operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    {
-      portName (s.portName ());
-
-      return *this;
-    }
-
-
-    // ComponentExternalPortEndpoint
-    // 
-    ::XMLSchema::string< char > const& ComponentExternalPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
-
-    ::XMLSchema::string< char >& ComponentExternalPortEndpoint::
-    portName ()
-    {
-      return *portName_;
-    }
-
-    void ComponentExternalPortEndpoint::
-    portName (::XMLSchema::string< char > const& e)
-    {
-      *portName_ = e;
-    }
-
-
-    // PlanSubcomponentPortEndpoint
-    // 
-
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint ()
-    :
-    portName_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()),
-    instance_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-      kind_->container (this);
-      instance_->container (this);
-    }
-
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-    :
-    portName_ (new ::XMLSchema::string< char > (*s.portName_)),
-    provider_ (s.provider_.get () ? new ::XMLSchema::string< char > (*s.provider_) : 0),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    instance_ (new ::XMLSchema::IDREF< char > (*s.instance_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-      if (provider_.get ()) provider_->container (this);
-      kind_->container (this);
-      instance_->container (this);
-    }
-
-    ::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< char > > (0);
-
-      kind (s.kind ());
-
-      instance (s.instance ());
-
-      return *this;
-    }
-
-
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::string< char > const& PlanSubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
-
-    ::XMLSchema::string< char >& PlanSubcomponentPortEndpoint::
-    portName ()
-    {
-      return *portName_;
-    }
-
-    void PlanSubcomponentPortEndpoint::
-    portName (::XMLSchema::string< char > const& e)
-    {
-      *portName_ = e;
-    }
-
-    // PlanSubcomponentPortEndpoint
-    // 
-    bool PlanSubcomponentPortEndpoint::
-    provider_p () const
-    {
-      return provider_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& PlanSubcomponentPortEndpoint::
-    provider () const
-    {
-      return *provider_;
-    }
-
-    ::XMLSchema::string< char >& PlanSubcomponentPortEndpoint::
-    provider ()
-    {
-      return *provider_;
-    }
-
-    void PlanSubcomponentPortEndpoint::
-    provider (::XMLSchema::string< char > const& e)
-    {
-      if (provider_.get ())
-      {
-        *provider_ = e;
-      }
-
-      else
-      {
-        provider_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        provider_->container (this);
-      }
-    }
-
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
-    kind () const
-    {
-      return *kind_;
-    }
-
-    ::CIAO::Config_Handlers::CCMComponentPortKind& PlanSubcomponentPortEndpoint::
-    kind ()
-    {
-      return *kind_;
-    }
-
-    void PlanSubcomponentPortEndpoint::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
-
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< char > const& PlanSubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
-
-    ::XMLSchema::IDREF< char >& PlanSubcomponentPortEndpoint::
-    instance ()
-    {
-      return *instance_;
-    }
-
-    void PlanSubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< char > const& e)
-    {
-      *instance_ = e;
-    }
-
-
-    // ExternalReferenceEndpoint
-    // 
-
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint ()
-    :
-    location_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      location_->container (this);
-    }
-
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-    :
-    location_ (new ::XMLSchema::string< char > (*s.location_)),
-    regulator__ ()
-    {
-      location_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
-    operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-    {
-      location (s.location ());
-
-      return *this;
-    }
-
-
-    // ExternalReferenceEndpoint
-    // 
-    ::XMLSchema::string< char > const& ExternalReferenceEndpoint::
-    location () const
-    {
-      return *location_;
-    }
-
-    ::XMLSchema::string< char >& ExternalReferenceEndpoint::
-    location ()
-    {
-      return *location_;
-    }
-
-    void ExternalReferenceEndpoint::
-    location (::XMLSchema::string< char > const& e)
-    {
-      *location_ = e;
-    }
-
-
-    // ConnectionResourceDeploymentDescription
-    // 
-
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription ()
-    :
-    targetName_ (new ::XMLSchema::string< char > ()),
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-    :
-    targetName_ (new ::XMLSchema::string< char > (*s.targetName_)),
-    requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-    {
-      targetName (s.targetName ());
-
-      requirementName (s.requirementName ());
-
-      resourceName (s.resourceName ());
-
-      resourceValue (s.resourceValue ());
-
-      return *this;
-    }
-
-
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ConnectionResourceDeploymentDescription::
-    targetName () const
-    {
-      return *targetName_;
-    }
-
-    ::XMLSchema::string< char >& ConnectionResourceDeploymentDescription::
-    targetName ()
-    {
-      return *targetName_;
-    }
-
-    void ConnectionResourceDeploymentDescription::
-    targetName (::XMLSchema::string< char > const& e)
-    {
-      *targetName_ = e;
-    }
-
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ConnectionResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
-
-    ::XMLSchema::string< char >& ConnectionResourceDeploymentDescription::
-    requirementName ()
-    {
-      return *requirementName_;
-    }
-
-    void ConnectionResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< char > const& e)
-    {
-      *requirementName_ = e;
-    }
-
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< char > const& ConnectionResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
-
-    ::XMLSchema::string< char >& ConnectionResourceDeploymentDescription::
-    resourceName ()
-    {
-      return *resourceName_;
-    }
-
-    void ConnectionResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< char > const& e)
-    {
-      *resourceName_ = e;
-    }
-
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ConnectionResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
-
-    ::CIAO::Config_Handlers::Any& ConnectionResourceDeploymentDescription::
-    resourceValue ()
-    {
-      return *resourceValue_;
-    }
-
-    void ConnectionResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
-
-
-    // PlanConnectionDescription
-    // 
-
-    PlanConnectionDescription::
-    PlanConnectionDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
-
-    PlanConnectionDescription::
-    PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    source_ (s.source_.get () ? new ::XMLSchema::string< char > (*s.source_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription (*s.deployedResource_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (source_.get ()) source_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      externalEndpoint_.reserve (s.externalEndpoint_.size ());
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
-
-      internalEndpoint_.reserve (s.internalEndpoint_.size ());
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
-
-      externalReference_.reserve (s.externalReference_.size ());
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
-
-      if (deployedResource_.get ()) deployedResource_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
-    operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-    {
-      name (s.name ());
-
-      if (s.source_.get ()) source (*(s.source_));
-      else source_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      externalEndpoint_.clear ();
-      externalEndpoint_.reserve (s.externalEndpoint_.size ());
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
-
-      internalEndpoint_.clear ();
-      internalEndpoint_.reserve (s.internalEndpoint_.size ());
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
-
-      externalReference_.clear ();
-      externalReference_.reserve (s.externalReference_.size ());
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
-
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > (0);
-
-      return *this;
-    }
-
-
-    // PlanConnectionDescription
-    // 
-    ::XMLSchema::string< char > const& PlanConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& PlanConnectionDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void PlanConnectionDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // PlanConnectionDescription
-    // 
-    bool PlanConnectionDescription::
-    source_p () const
-    {
-      return source_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& PlanConnectionDescription::
-    source () const
-    {
-      return *source_;
-    }
-
-    ::XMLSchema::string< char >& PlanConnectionDescription::
-    source ()
-    {
-      return *source_;
-    }
-
-    void PlanConnectionDescription::
-    source (::XMLSchema::string< char > const& e)
-    {
-      if (source_.get ())
-      {
-        *source_ = e;
-      }
-
-      else
-      {
-        source_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        source_->container (this);
-      }
-    }
-
-    // PlanConnectionDescription
-    // 
-    bool PlanConnectionDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& PlanConnectionDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& PlanConnectionDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void PlanConnectionDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    begin_externalEndpoint ()
-    {
-      return externalEndpoint_.begin ();
-    }
-
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    end_externalEndpoint ()
-    {
-      return externalEndpoint_.end ();
-    }
-
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    begin_externalEndpoint () const
-    {
-      return externalEndpoint_.begin ();
-    }
-
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    end_externalEndpoint () const
-    {
-      return externalEndpoint_.end ();
-    }
-
-    void PlanConnectionDescription::
-    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-    {
-      if (externalEndpoint_.capacity () < externalEndpoint_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > v;
-        v.reserve (externalEndpoint_.size () + 1);
-
-        while (externalEndpoint_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& t = externalEndpoint_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          externalEndpoint_.pop_back ();
-        }
-
-        externalEndpoint_.swap (v);
-      }
-
-      externalEndpoint_.push_back (e);
-      externalEndpoint_.back ().container (this);
-    }
-
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    begin_internalEndpoint ()
-    {
-      return internalEndpoint_.begin ();
-    }
-
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    end_internalEndpoint ()
-    {
-      return internalEndpoint_.end ();
-    }
-
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    begin_internalEndpoint () const
-    {
-      return internalEndpoint_.begin ();
-    }
-
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    end_internalEndpoint () const
-    {
-      return internalEndpoint_.end ();
-    }
-
-    void PlanConnectionDescription::
-    add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
-    {
-      if (internalEndpoint_.capacity () < internalEndpoint_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > v;
-        v.reserve (internalEndpoint_.size () + 1);
-
-        while (internalEndpoint_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& t = internalEndpoint_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          internalEndpoint_.pop_back ();
-        }
-
-        internalEndpoint_.swap (v);
-      }
-
-      internalEndpoint_.push_back (e);
-      internalEndpoint_.back ().container (this);
-    }
-
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    begin_externalReference ()
-    {
-      return externalReference_.begin ();
-    }
-
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    end_externalReference ()
-    {
-      return externalReference_.end ();
-    }
-
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    begin_externalReference () const
-    {
-      return externalReference_.begin ();
-    }
-
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    end_externalReference () const
-    {
-      return externalReference_.end ();
-    }
-
-    void PlanConnectionDescription::
-    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-    {
-      if (externalReference_.capacity () < externalReference_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > v;
-        v.reserve (externalReference_.size () + 1);
-
-        while (externalReference_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint& t = externalReference_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          externalReference_.pop_back ();
-        }
-
-        externalReference_.swap (v);
-      }
-
-      externalReference_.push_back (e);
-      externalReference_.back ().container (this);
-    }
-
-    // PlanConnectionDescription
-    // 
-    bool PlanConnectionDescription::
-    deployedResource_p () const
-    {
-      return deployedResource_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& PlanConnectionDescription::
-    deployedResource () const
-    {
-      return *deployedResource_;
-    }
-
-    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& PlanConnectionDescription::
-    deployedResource ()
-    {
-      return *deployedResource_;
-    }
-
-    void PlanConnectionDescription::
-    deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
-    {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
-
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > (new ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
-    }
-
-
-    // ImplementationDependency
-    // 
-
-    ImplementationDependency::
-    ImplementationDependency ()
-    :
-    requiredType_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
-
-    ImplementationDependency::
-    ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    :
-    requiredType_ (new ::XMLSchema::string< char > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
-    operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    {
-      requiredType (s.requiredType ());
-
-      return *this;
-    }
-
-
-    // ImplementationDependency
-    // 
-    ::XMLSchema::string< char > const& ImplementationDependency::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationDependency::
-    requiredType ()
-    {
-      return *requiredType_;
-    }
-
-    void ImplementationDependency::
-    requiredType (::XMLSchema::string< char > const& e)
-    {
-      *requiredType_ = e;
-    }
-
-
-    // Capability
-    // 
-
-    Capability::
-    Capability ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
-
-    Capability::
-    Capability (::CIAO::Config_Handlers::Capability const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Capability& Capability::
-    operator= (::CIAO::Config_Handlers::Capability const& s)
-    {
-      name (s.name ());
-
-      resourceType (s.resourceType ());
-
-      property (s.property ());
-
-      return *this;
-    }
-
-
-    // Capability
-    // 
-    ::XMLSchema::string< char > const& Capability::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& Capability::
-    name ()
-    {
-      return *name_;
-    }
-
-    void Capability::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // Capability
-    // 
-    ::XMLSchema::string< char > const& Capability::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
-
-    ::XMLSchema::string< char >& Capability::
-    resourceType ()
-    {
-      return *resourceType_;
-    }
-
-    void Capability::
-    resourceType (::XMLSchema::string< char > const& e)
-    {
-      *resourceType_ = e;
-    }
-
-    // Capability
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& Capability::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::SatisfierProperty& Capability::
-    property ()
-    {
-      return *property_;
-    }
-
-    void Capability::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
-
-
-    // ImplementationRequirement
-    // 
-
-    ImplementationRequirement::
-    ImplementationRequirement ()
-    :
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()),
-    resourcePort_ (new ::XMLSchema::string< char > ()),
-    componentPort_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    name_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::Property ()),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
-
-    ImplementationRequirement::
-    ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    :
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-    resourcePort_ (new ::XMLSchema::string< char > (*s.resourcePort_)),
-    componentPort_ (new ::XMLSchema::string< char > (*s.componentPort_)),
-    resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
-    operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    {
-      resourceUsage (s.resourceUsage ());
-
-      resourcePort (s.resourcePort ());
-
-      componentPort (s.componentPort ());
-
-      resourceType (s.resourceType ());
-
-      name (s.name ());
-
-      property (s.property ());
-
-      return *this;
-    }
-
-
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
-
-    ::CIAO::Config_Handlers::ResourceUsageKind& ImplementationRequirement::
-    resourceUsage ()
-    {
-      return *resourceUsage_;
-    }
-
-    void ImplementationRequirement::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
-
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< char > const& ImplementationRequirement::
-    resourcePort () const
-    {
-      return *resourcePort_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationRequirement::
-    resourcePort ()
-    {
-      return *resourcePort_;
-    }
-
-    void ImplementationRequirement::
-    resourcePort (::XMLSchema::string< char > const& e)
-    {
-      *resourcePort_ = e;
-    }
-
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< char > const& ImplementationRequirement::
-    componentPort () const
-    {
-      return *componentPort_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationRequirement::
-    componentPort ()
-    {
-      return *componentPort_;
-    }
-
-    void ImplementationRequirement::
-    componentPort (::XMLSchema::string< char > const& e)
-    {
-      *componentPort_ = e;
-    }
-
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< char > const& ImplementationRequirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationRequirement::
-    resourceType ()
-    {
-      return *resourceType_;
-    }
-
-    void ImplementationRequirement::
-    resourceType (::XMLSchema::string< char > const& e)
-    {
-      *resourceType_ = e;
-    }
-
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< char > const& ImplementationRequirement::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationRequirement::
-    name ()
-    {
-      return *name_;
-    }
-
-    void ImplementationRequirement::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::Property const& ImplementationRequirement::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ImplementationRequirement::
-    property ()
-    {
-      return *property_;
-    }
-
-    void ImplementationRequirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
-
-
-    // ComponentPackageReference
-    // 
-
-    ComponentPackageReference::
-    ComponentPackageReference ()
-    :
-    requiredUUID_ (new ::XMLSchema::string< char > ()),
-    requiredName_ (new ::XMLSchema::string< char > ()),
-    requiredType_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
-
-    ComponentPackageReference::
-    ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    :
-    requiredUUID_ (new ::XMLSchema::string< char > (*s.requiredUUID_)),
-    requiredName_ (new ::XMLSchema::string< char > (*s.requiredName_)),
-    requiredType_ (new ::XMLSchema::string< char > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
-    operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    {
-      requiredUUID (s.requiredUUID ());
-
-      requiredName (s.requiredName ());
-
-      requiredType (s.requiredType ());
-
-      return *this;
-    }
-
-
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< char > const& ComponentPackageReference::
-    requiredUUID () const
-    {
-      return *requiredUUID_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageReference::
-    requiredUUID ()
-    {
-      return *requiredUUID_;
-    }
-
-    void ComponentPackageReference::
-    requiredUUID (::XMLSchema::string< char > const& e)
-    {
-      *requiredUUID_ = e;
-    }
-
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< char > const& ComponentPackageReference::
-    requiredName () const
-    {
-      return *requiredName_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageReference::
-    requiredName ()
-    {
-      return *requiredName_;
-    }
-
-    void ComponentPackageReference::
-    requiredName (::XMLSchema::string< char > const& e)
-    {
-      *requiredName_ = e;
-    }
-
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< char > const& ComponentPackageReference::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageReference::
-    requiredType ()
-    {
-      return *requiredType_;
-    }
-
-    void ComponentPackageReference::
-    requiredType (::XMLSchema::string< char > const& e)
-    {
-      *requiredType_ = e;
-    }
-
-
-    // SubcomponentPortEndpoint
-    // 
-
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint ()
-    :
-    portName_ (new ::XMLSchema::string< char > ()),
-    instance_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-      instance_->container (this);
-    }
-
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-    :
-    portName_ (new ::XMLSchema::string< char > (*s.portName_)),
-    instance_ (new ::XMLSchema::IDREF< char > (*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< char > const& SubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
-
-    ::XMLSchema::string< char >& SubcomponentPortEndpoint::
-    portName ()
-    {
-      return *portName_;
-    }
-
-    void SubcomponentPortEndpoint::
-    portName (::XMLSchema::string< char > const& e)
-    {
-      *portName_ = e;
-    }
-
-    // SubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< char > const& SubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
-
-    ::XMLSchema::IDREF< char >& SubcomponentPortEndpoint::
-    instance ()
-    {
-      return *instance_;
-    }
-
-    void SubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< char > const& e)
-    {
-      *instance_ = e;
-    }
-
-
-    // AssemblyConnectionDescription
-    // 
-
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
-
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      externalEndpoint_.reserve (s.externalEndpoint_.size ());
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
-
-      internalEndpoint_.reserve (s.internalEndpoint_.size ());
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
-
-      externalReference_.reserve (s.externalReference_.size ());
-      {
-        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 ());
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      externalEndpoint_.clear ();
-      externalEndpoint_.reserve (s.externalEndpoint_.size ());
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
-
-      internalEndpoint_.clear ();
-      internalEndpoint_.reserve (s.internalEndpoint_.size ());
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
-
-      externalReference_.clear ();
-      externalReference_.reserve (s.externalReference_.size ());
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
-
-      return *this;
-    }
-
-
-    // AssemblyConnectionDescription
-    // 
-    ::XMLSchema::string< char > const& AssemblyConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& AssemblyConnectionDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void AssemblyConnectionDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // AssemblyConnectionDescription
-    // 
-    bool AssemblyConnectionDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& AssemblyConnectionDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& AssemblyConnectionDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void AssemblyConnectionDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-    // 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)
-    {
-      if (externalEndpoint_.capacity () < externalEndpoint_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > v;
-        v.reserve (externalEndpoint_.size () + 1);
-
-        while (externalEndpoint_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& t = externalEndpoint_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          externalEndpoint_.pop_back ();
-        }
-
-        externalEndpoint_.swap (v);
-      }
-
-      externalEndpoint_.push_back (e);
-      externalEndpoint_.back ().container (this);
-    }
-
-    // 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)
-    {
-      if (internalEndpoint_.capacity () < internalEndpoint_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > v;
-        v.reserve (internalEndpoint_.size () + 1);
-
-        while (internalEndpoint_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::SubcomponentPortEndpoint& t = internalEndpoint_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          internalEndpoint_.pop_back ();
-        }
-
-        internalEndpoint_.swap (v);
-      }
-
-      internalEndpoint_.push_back (e);
-      internalEndpoint_.back ().container (this);
-    }
-
-    // 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)
-    {
-      if (externalReference_.capacity () < externalReference_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > v;
-        v.reserve (externalReference_.size () + 1);
-
-        while (externalReference_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint& t = externalReference_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          externalReference_.pop_back ();
-        }
-
-        externalReference_.swap (v);
-      }
-
-      externalReference_.push_back (e);
-      externalReference_.back ().container (this);
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // TCKind
-    //
-
-    TCKind::
-    TCKind (::XSCRT::XML::Element< char > const& e)
-    : Type (e)
-    {
-      ::std::basic_string< char > 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< char > const& a)
-    : Type (a)
-    {
-      ::std::basic_string< char > 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< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "kind")
-        {
-          ::CIAO::Config_Handlers::TCKind t (e);
-          kind (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // DataValue
-    //
-
-    DataValue::
-    DataValue (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "short")
-        {
-          ::XMLSchema::short_ t (e);
-          short_ (t);
-        }
-
-        else if (n == "long")
-        {
-          ::XMLSchema::int_ t (e);
-          long_ (t);
-        }
-
-        else if (n == "ushort")
-        {
-          ::XMLSchema::unsignedShort t (e);
-          ushort (t);
-        }
-
-        else if (n == "ulong")
-        {
-          ::XMLSchema::unsignedInt t (e);
-          ulong (t);
-        }
-
-        else if (n == "float")
-        {
-          ::XMLSchema::float_ t (e);
-          float_ (t);
-        }
-
-        else if (n == "double")
-        {
-          ::XMLSchema::double_ t (e);
-          double_ (t);
-        }
-
-        else if (n == "boolean")
-        {
-          ::XMLSchema::boolean t (e);
-          boolean (t);
-        }
-
-        else if (n == "octet")
-        {
-          ::XMLSchema::unsignedByte t (e);
-          octet (t);
-        }
-
-        else if (n == "objref")
-        {
-          ::XMLSchema::string< char > t (e);
-          objref (t);
-        }
-
-        else if (n == "enum")
-        {
-          ::XMLSchema::string< char > t (e);
-          enum_ (t);
-        }
-
-        else if (n == "string")
-        {
-          ::XMLSchema::string< char > t (e);
-          string (t);
-        }
-
-        else if (n == "longlong")
-        {
-          ::XMLSchema::long_ t (e);
-          longlong (t);
-        }
-
-        else if (n == "ulonglong")
-        {
-          ::XMLSchema::unsignedLong t (e);
-          ulonglong (t);
-        }
-
-        else if (n == "longdouble")
-        {
-          ::XMLSchema::double_ t (e);
-          longdouble (t);
-        }
-
-        else if (n == "fixed")
-        {
-          ::XMLSchema::string< char > t (e);
-          fixed (t);
-        }
-
-        else if (n == "typecode")
-        {
-          ::CIAO::Config_Handlers::DataType t (e);
-          typecode (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Any
-    //
-
-    Any::
-    Any (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    type_ (new ::CIAO::Config_Handlers::DataType ()),
-    value_ (new ::CIAO::Config_Handlers::DataValue ()),
-    regulator__ ()
-    {
-      type_->container (this);
-      value_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "type")
-        {
-          ::CIAO::Config_Handlers::DataType t (e);
-          type (t);
-        }
-
-        else if (n == "value")
-        {
-          ::CIAO::Config_Handlers::DataValue t (e);
-          value (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Property
-    //
-
-    Property::
-    Property (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    value_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      value_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "value")
-        {
-          ::CIAO::Config_Handlers::Any t (e);
-          value (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Node
-    //
-
-    Node::
-    Node (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    label_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      label_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // SatisfierPropertyKind
-    //
-
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (::XSCRT::XML::Element< char > const& e)
-    : Type (e)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (::XSCRT::XML::Attribute< char > const& a)
-    : Type (a)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    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);
-
-    // SatisfierProperty
-    //
-
-    SatisfierProperty::
-    SatisfierProperty (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind ()),
-    value_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "kind")
-        {
-          ::CIAO::Config_Handlers::SatisfierPropertyKind t (e);
-          kind (t);
-        }
-
-        else if (n == "value")
-        {
-          ::CIAO::Config_Handlers::Any t (e);
-          value (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Resource
-    //
-
-    Resource::
-    Resource (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "resourceType")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceType (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::SatisfierProperty t (e);
-          property (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // SharedResource
-    //
-
-    SharedResource::
-    SharedResource (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    node_ (new ::CIAO::Config_Handlers::Node ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      node_->container (this);
-      property_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "resourceType")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceType (t);
-        }
-
-        else if (n == "node")
-        {
-          ::CIAO::Config_Handlers::Node t (e);
-          node (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::SatisfierProperty t (e);
-          property (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Requirement
-    //
-
-    Requirement::
-    Requirement (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    name_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::Property ()),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "resourceType")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceType (t);
-        }
-
-        else if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          property (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ResourceDeploymentDescription
-    //
-
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "requirementName")
-        {
-          ::XMLSchema::string< char > t (e);
-          requirementName (t);
-        }
-
-        else if (n == "resourceName")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceName (t);
-        }
-
-        else if (n == "resourceValue")
-        {
-          ::CIAO::Config_Handlers::Any t (e);
-          resourceValue (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ArtifactDeploymentDescription
-    //
-
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "source")
-        {
-          ::XMLSchema::string< char > t (e);
-          source (t);
-        }
-
-        else if (n == "node")
-        {
-          ::XMLSchema::string< char > t (e);
-          node (t);
-        }
-
-        else if (n == "location")
-        {
-          ::XMLSchema::string< char > t (e);
-          add_location (t);
-        }
-
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
-          deployedResource (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< char > a (p.next_attribute ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< char > t (a);
-          id (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // MonolithicDeploymentDescription
-    //
-
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      source_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "source")
-        {
-          ::XMLSchema::string< char > t (e);
-          source (t);
-        }
-
-        else if (n == "artifact")
-        {
-          ::XMLSchema::IDREF< char > t (e);
-          add_artifact (t);
-        }
-
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< char > a (p.next_attribute ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< char > t (a);
-          id (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ResourceUsageKind
-    //
-
-    ResourceUsageKind::
-    ResourceUsageKind (::XSCRT::XML::Element< char > const& e)
-    : Type (e)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    ResourceUsageKind::
-    ResourceUsageKind (::XSCRT::XML::Attribute< char > const& a)
-    : Type (a)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    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);
-
-    // InstanceResourceDeploymentDescription
-    //
-
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()),
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "resourceUsage")
-        {
-          ::CIAO::Config_Handlers::ResourceUsageKind t (e);
-          resourceUsage (t);
-        }
-
-        else if (n == "requirementName")
-        {
-          ::XMLSchema::string< char > t (e);
-          requirementName (t);
-        }
-
-        else if (n == "resourceName")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceName (t);
-        }
-
-        else if (n == "resourceValue")
-        {
-          ::CIAO::Config_Handlers::Any t (e);
-          resourceValue (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // InstanceDeploymentDescription
-    //
-
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    node_ (new ::XMLSchema::string< char > ()),
-    source_ (new ::XMLSchema::string< char > ()),
-    implementation_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-      source_->container (this);
-      implementation_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "node")
-        {
-          ::XMLSchema::string< char > t (e);
-          node (t);
-        }
-
-        else if (n == "source")
-        {
-          ::XMLSchema::string< char > t (e);
-          source (t);
-        }
-
-        else if (n == "implementation")
-        {
-          ::XMLSchema::IDREF< char > t (e);
-          implementation (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedResource (t);
-        }
-
-        else if (n == "deployedSharedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedSharedResource (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< char > a (p.next_attribute ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< char > t (a);
-          id (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // CCMComponentPortKind
-    //
-
-    CCMComponentPortKind::
-    CCMComponentPortKind (::XSCRT::XML::Element< char > const& e)
-    : Type (e)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    CCMComponentPortKind::
-    CCMComponentPortKind (::XSCRT::XML::Attribute< char > const& a)
-    : Type (a)
-    {
-      ::std::basic_string< char > 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 
-      {
-      }
-    }
-
-    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);
-
-    // ComponentPortDescription
-    //
-
-    ComponentPortDescription::
-    ComponentPortDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    specificType_ (new ::XMLSchema::string< char > ()),
-    supportedType_ (new ::XMLSchema::string< char > ()),
-    provider_ (new ::XMLSchema::string< char > ()),
-    exclusiveProvider_ (new ::XMLSchema::string< char > ()),
-    exclusiveUser_ (new ::XMLSchema::string< char > ()),
-    optional_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "specificType")
-        {
-          ::XMLSchema::string< char > t (e);
-          specificType (t);
-        }
-
-        else if (n == "supportedType")
-        {
-          ::XMLSchema::string< char > t (e);
-          supportedType (t);
-        }
-
-        else if (n == "provider")
-        {
-          ::XMLSchema::string< char > t (e);
-          provider (t);
-        }
-
-        else if (n == "exclusiveProvider")
-        {
-          ::XMLSchema::string< char > t (e);
-          exclusiveProvider (t);
-        }
-
-        else if (n == "exclusiveUser")
-        {
-          ::XMLSchema::string< char > t (e);
-          exclusiveUser (t);
-        }
-
-        else if (n == "optional")
-        {
-          ::XMLSchema::string< char > t (e);
-          optional (t);
-        }
-
-        else if (n == "kind")
-        {
-          ::CIAO::Config_Handlers::CCMComponentPortKind t (e);
-          kind (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentPropertyDescription
-    //
-
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    type_ (new ::CIAO::Config_Handlers::DataType ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      type_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "type")
-        {
-          ::CIAO::Config_Handlers::DataType t (e);
-          type (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentExternalPortEndpoint
-    //
-
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    portName_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "portName")
-        {
-          ::XMLSchema::string< char > t (e);
-          portName (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // PlanSubcomponentPortEndpoint
-    //
-
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    portName_ (new ::XMLSchema::string< char > ()),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()),
-    instance_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-      kind_->container (this);
-      instance_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "portName")
-        {
-          ::XMLSchema::string< char > t (e);
-          portName (t);
-        }
-
-        else if (n == "provider")
-        {
-          ::XMLSchema::string< char > t (e);
-          provider (t);
-        }
-
-        else if (n == "kind")
-        {
-          ::CIAO::Config_Handlers::CCMComponentPortKind t (e);
-          kind (t);
-        }
-
-        else if (n == "instance")
-        {
-          ::XMLSchema::IDREF< char > t (e);
-          instance (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ExternalReferenceEndpoint
-    //
-
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    location_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      location_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "location")
-        {
-          ::XMLSchema::string< char > t (e);
-          location (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ConnectionResourceDeploymentDescription
-    //
-
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    targetName_ (new ::XMLSchema::string< char > ()),
-    requirementName_ (new ::XMLSchema::string< char > ()),
-    resourceName_ (new ::XMLSchema::string< char > ()),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any ()),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "targetName")
-        {
-          ::XMLSchema::string< char > t (e);
-          targetName (t);
-        }
-
-        else if (n == "requirementName")
-        {
-          ::XMLSchema::string< char > t (e);
-          requirementName (t);
-        }
-
-        else if (n == "resourceName")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceName (t);
-        }
-
-        else if (n == "resourceValue")
-        {
-          ::CIAO::Config_Handlers::Any t (e);
-          resourceValue (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // PlanConnectionDescription
-    //
-
-    PlanConnectionDescription::
-    PlanConnectionDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "source")
-        {
-          ::XMLSchema::string< char > t (e);
-          source (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          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);
-          deployedResource (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ImplementationDependency
-    //
-
-    ImplementationDependency::
-    ImplementationDependency (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    requiredType_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "requiredType")
-        {
-          ::XMLSchema::string< char > t (e);
-          requiredType (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // Capability
-    //
-
-    Capability::
-    Capability (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "resourceType")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceType (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::SatisfierProperty t (e);
-          property (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ImplementationRequirement
-    //
-
-    ImplementationRequirement::
-    ImplementationRequirement (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()),
-    resourcePort_ (new ::XMLSchema::string< char > ()),
-    componentPort_ (new ::XMLSchema::string< char > ()),
-    resourceType_ (new ::XMLSchema::string< char > ()),
-    name_ (new ::XMLSchema::string< char > ()),
-    property_ (new ::CIAO::Config_Handlers::Property ()),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "resourceUsage")
-        {
-          ::CIAO::Config_Handlers::ResourceUsageKind t (e);
-          resourceUsage (t);
-        }
-
-        else if (n == "resourcePort")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourcePort (t);
-        }
-
-        else if (n == "componentPort")
-        {
-          ::XMLSchema::string< char > t (e);
-          componentPort (t);
-        }
-
-        else if (n == "resourceType")
-        {
-          ::XMLSchema::string< char > t (e);
-          resourceType (t);
-        }
-
-        else if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          property (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentPackageReference
-    //
-
-    ComponentPackageReference::
-    ComponentPackageReference (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    requiredUUID_ (new ::XMLSchema::string< char > ()),
-    requiredName_ (new ::XMLSchema::string< char > ()),
-    requiredType_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "requiredUUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          requiredUUID (t);
-        }
-
-        else if (n == "requiredName")
-        {
-          ::XMLSchema::string< char > t (e);
-          requiredName (t);
-        }
-
-        else if (n == "requiredType")
-        {
-          ::XMLSchema::string< char > t (e);
-          requiredType (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // SubcomponentPortEndpoint
-    //
-
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    portName_ (new ::XMLSchema::string< char > ()),
-    instance_ (new ::XMLSchema::IDREF< char > ()),
-    regulator__ ()
-    {
-      portName_->container (this);
-      instance_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "portName")
-        {
-          ::XMLSchema::string< char > t (e);
-          portName (t);
-        }
-
-        else if (n == "instance")
-        {
-          ::XMLSchema::IDREF< char > t (e);
-          instance (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // AssemblyConnectionDescription
-    //
-
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      name_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "externalEndpoint")
-        {
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-          add_externalEndpoint (t);
-        }
-
-        else if (n == "internalEndpoint")
-        {
-          ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
-          add_internalEndpoint (t);
-        }
-
-        else if (n == "externalReference")
-        {
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-          add_externalReference (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp
deleted file mode 100644
index 9113806e87e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp
+++ /dev/null
@@ -1,1928 +0,0 @@
-//$Id$
-#ifndef BASIC_DEPLOYMENT_DATA_HPP
-#define BASIC_DEPLOYMENT_DATA_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class TCKind;
-    class DataType;
-    class DataValue;
-    class Any;
-    class Property;
-    class Node;
-    class SatisfierPropertyKind;
-    class SatisfierProperty;
-    class Resource;
-    class SharedResource;
-    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>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class TCKind : public ::XSCRT::Type
-    {
-      public:
-      TCKind ();
-      TCKind (::XSCRT::XML::Element< char > const&);
-      TCKind (::XSCRT::XML::Attribute< char > 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
-      operator== (TCKind const& a, TCKind const& b);
-
-      friend bool
-      operator!= (TCKind const& a, TCKind const& b);
-
-      private:
-      TCKind (Value v);
-
-      Value v_;
-    };
-
-    class DataType : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // kind
-      //
-      public:
-      bool kind_p () const;
-      ::CIAO::Config_Handlers::TCKind const& kind () const;
-      ::CIAO::Config_Handlers::TCKind& kind ();
-      void kind (::CIAO::Config_Handlers::TCKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
-
-      public:
-      DataType ();
-      DataType (::XSCRT::XML::Element< char > const&);
-      DataType (DataType const& s);
-
-      DataType&
-      operator= (DataType const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class DataValue : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // short
-      //
-      public:
-      bool short_p () const;
-      ::XMLSchema::short_ const& short_ () const;
-      ::XMLSchema::short_& short_ ();
-      void short_ (::XMLSchema::short_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::short_ > short__;
-
-      // long
-      //
-      public:
-      bool long_p () const;
-      ::XMLSchema::int_ const& long_ () const;
-      ::XMLSchema::int_& long_ ();
-      void long_ (::XMLSchema::int_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::int_ > long__;
-
-      // ushort
-      //
-      public:
-      bool ushort_p () const;
-      ::XMLSchema::unsignedShort const& ushort () const;
-      ::XMLSchema::unsignedShort& ushort ();
-      void ushort (::XMLSchema::unsignedShort const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::unsignedShort > ushort_;
-
-      // ulong
-      //
-      public:
-      bool ulong_p () const;
-      ::XMLSchema::unsignedInt const& ulong () const;
-      ::XMLSchema::unsignedInt& ulong ();
-      void ulong (::XMLSchema::unsignedInt const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::unsignedInt > ulong_;
-
-      // float
-      //
-      public:
-      bool float_p () const;
-      ::XMLSchema::float_ const& float_ () const;
-      ::XMLSchema::float_& float_ ();
-      void float_ (::XMLSchema::float_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::float_ > float__;
-
-      // double
-      //
-      public:
-      bool double_p () const;
-      ::XMLSchema::double_ const& double_ () const;
-      ::XMLSchema::double_& double_ ();
-      void double_ (::XMLSchema::double_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::double_ > double__;
-
-      // boolean
-      //
-      public:
-      bool boolean_p () const;
-      ::XMLSchema::boolean const& boolean () const;
-      ::XMLSchema::boolean& boolean ();
-      void boolean (::XMLSchema::boolean const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::boolean > boolean_;
-
-      // octet
-      //
-      public:
-      bool octet_p () const;
-      ::XMLSchema::unsignedByte const& octet () const;
-      ::XMLSchema::unsignedByte& octet ();
-      void octet (::XMLSchema::unsignedByte const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::unsignedByte > octet_;
-
-      // objref
-      //
-      public:
-      bool objref_p () const;
-      ::XMLSchema::string< char > const& objref () const;
-      ::XMLSchema::string< char >& objref ();
-      void objref (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > objref_;
-
-      // enum
-      //
-      public:
-      bool enum_p () const;
-      ::XMLSchema::string< char > const& enum_ () const;
-      ::XMLSchema::string< char >& enum_ ();
-      void enum_ (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > enum__;
-
-      // string
-      //
-      public:
-      bool string_p () const;
-      ::XMLSchema::string< char > const& string () const;
-      ::XMLSchema::string< char >& string ();
-      void string (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > string_;
-
-      // longlong
-      //
-      public:
-      bool longlong_p () const;
-      ::XMLSchema::long_ const& longlong () const;
-      ::XMLSchema::long_& longlong ();
-      void longlong (::XMLSchema::long_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::long_ > longlong_;
-
-      // ulonglong
-      //
-      public:
-      bool ulonglong_p () const;
-      ::XMLSchema::unsignedLong const& ulonglong () const;
-      ::XMLSchema::unsignedLong& ulonglong ();
-      void ulonglong (::XMLSchema::unsignedLong const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::unsignedLong > ulonglong_;
-
-      // longdouble
-      //
-      public:
-      bool longdouble_p () const;
-      ::XMLSchema::double_ const& longdouble () const;
-      ::XMLSchema::double_& longdouble ();
-      void longdouble (::XMLSchema::double_ const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::double_ > longdouble_;
-
-      // fixed
-      //
-      public:
-      bool fixed_p () const;
-      ::XMLSchema::string< char > const& fixed () const;
-      ::XMLSchema::string< char >& fixed ();
-      void fixed (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > fixed_;
-
-      // typecode
-      //
-      public:
-      bool typecode_p () const;
-      ::CIAO::Config_Handlers::DataType const& typecode () const;
-      ::CIAO::Config_Handlers::DataType& typecode ();
-      void typecode (::CIAO::Config_Handlers::DataType const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > typecode_;
-
-      public:
-      DataValue ();
-      DataValue (::XSCRT::XML::Element< char > const&);
-      DataValue (DataValue const& s);
-
-      DataValue&
-      operator= (DataValue const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Any : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // type
-      //
-      public:
-      ::CIAO::Config_Handlers::DataType const& type () const;
-      ::CIAO::Config_Handlers::DataType& type ();
-      void type (::CIAO::Config_Handlers::DataType const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
-
-      // value
-      //
-      public:
-      ::CIAO::Config_Handlers::DataValue const& value () const;
-      ::CIAO::Config_Handlers::DataValue& value ();
-      void value (::CIAO::Config_Handlers::DataValue const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
-
-      public:
-      Any ();
-      Any (::XSCRT::XML::Element< char > const&);
-      Any (Any const& s);
-
-      Any&
-      operator= (Any const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Property : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // value
-      //
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      ::CIAO::Config_Handlers::Any& value ();
-      void value (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
-
-      public:
-      Property ();
-      Property (::XSCRT::XML::Element< char > const&);
-      Property (Property const& s);
-
-      Property&
-      operator= (Property const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Node : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // label
-      //
-      public:
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      public:
-      Node ();
-      Node (::XSCRT::XML::Element< char > const&);
-      Node (Node const& s);
-
-      Node&
-      operator= (Node const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class SatisfierPropertyKind : public ::XSCRT::Type
-    {
-      public:
-      SatisfierPropertyKind ();
-      SatisfierPropertyKind (::XSCRT::XML::Element< char > const&);
-      SatisfierPropertyKind (::XSCRT::XML::Attribute< char > 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
-      operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
-
-      friend bool
-      operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
-
-      private:
-      SatisfierPropertyKind (Value v);
-
-      Value v_;
-    };
-
-    class SatisfierProperty : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // kind
-      //
-      public:
-      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
-      ::CIAO::Config_Handlers::SatisfierPropertyKind& kind ();
-      void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
-
-      // value
-      //
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      ::CIAO::Config_Handlers::Any& value ();
-      void value (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
-
-      public:
-      SatisfierProperty ();
-      SatisfierProperty (::XSCRT::XML::Element< char > const&);
-      SatisfierProperty (SatisfierProperty const& s);
-
-      SatisfierProperty&
-      operator= (SatisfierProperty const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Resource : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // resourceType
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceType () const;
-      ::XMLSchema::string< char >& resourceType ();
-      void resourceType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
-
-      // property
-      //
-      public:
-      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-      ::CIAO::Config_Handlers::SatisfierProperty& property ();
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      Resource ();
-      Resource (::XSCRT::XML::Element< char > const&);
-      Resource (Resource const& s);
-
-      Resource&
-      operator= (Resource const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class SharedResource : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // resourceType
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceType () const;
-      ::XMLSchema::string< char >& resourceType ();
-      void resourceType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
-
-      // node
-      //
-      public:
-      ::CIAO::Config_Handlers::Node const& node () const;
-      ::CIAO::Config_Handlers::Node& node ();
-      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;
-      ::CIAO::Config_Handlers::SatisfierProperty& property ();
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      SharedResource ();
-      SharedResource (::XSCRT::XML::Element< char > const&);
-      SharedResource (SharedResource const& s);
-
-      SharedResource&
-      operator= (SharedResource const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Requirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceType
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceType () const;
-      ::XMLSchema::string< char >& resourceType ();
-      void resourceType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // property
-      //
-      public:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      ::CIAO::Config_Handlers::Property& property ();
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      Requirement ();
-      Requirement (::XSCRT::XML::Element< char > const&);
-      Requirement (Requirement const& s);
-
-      Requirement&
-      operator= (Requirement const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requirementName
-      //
-      public:
-      ::XMLSchema::string< char > const& requirementName () const;
-      ::XMLSchema::string< char >& requirementName ();
-      void requirementName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
-
-      // resourceName
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceName () const;
-      ::XMLSchema::string< char >& resourceName ();
-      void resourceName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
-
-      // resourceValue
-      //
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      ::CIAO::Config_Handlers::Any& resourceValue ();
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ResourceDeploymentDescription ();
-      ResourceDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
-
-      ResourceDeploymentDescription&
-      operator= (ResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ArtifactDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // source
-      //
-      public:
-      ::XMLSchema::string< char > const& source () const;
-      ::XMLSchema::string< char >& source ();
-      void source (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > source_;
-
-      // node
-      //
-      public:
-      bool node_p () const;
-      ::XMLSchema::string< char > const& node () const;
-      ::XMLSchema::string< char >& node ();
-      void node (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > node_;
-
-      // location
-      //
-      public:
-      typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
-      typedef ::std::vector< ::XMLSchema::string< char > >::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< char > const& );
-
-      protected:
-      ::std::vector< ::XMLSchema::string< char > > location_;
-
-      // execParameter
-      //
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // deployedResource
-      //
-      public:
-      bool deployedResource_p () const;
-      ::CIAO::Config_Handlers::ResourceDeploymentDescription const& deployedResource () const;
-      ::CIAO::Config_Handlers::ResourceDeploymentDescription& deployedResource ();
-      void deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
-
-      // id
-      //
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< char > const& id () const;
-      ::XMLSchema::ID< char >& id ();
-      void id (::XMLSchema::ID< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< char > > id_;
-
-      public:
-      ArtifactDeploymentDescription ();
-      ArtifactDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
-
-      ArtifactDeploymentDescription&
-      operator= (ArtifactDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class MonolithicDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // source
-      //
-      public:
-      ::XMLSchema::string< char > const& source () const;
-      ::XMLSchema::string< char >& source ();
-      void source (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > source_;
-
-      // artifact
-      //
-      public:
-      typedef ::std::vector< ::XMLSchema::IDREF< char > >::iterator artifact_iterator;
-      typedef ::std::vector< ::XMLSchema::IDREF< char > >::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< char > const& );
-
-      protected:
-      ::std::vector< ::XMLSchema::IDREF< char > > artifact_;
-
-      // execParameter
-      //
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // id
-      //
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< char > const& id () const;
-      ::XMLSchema::ID< char >& id ();
-      void id (::XMLSchema::ID< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< char > > id_;
-
-      public:
-      MonolithicDeploymentDescription ();
-      MonolithicDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s);
-
-      MonolithicDeploymentDescription&
-      operator= (MonolithicDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ResourceUsageKind : public ::XSCRT::Type
-    {
-      public:
-      ResourceUsageKind ();
-      ResourceUsageKind (::XSCRT::XML::Element< char > const&);
-      ResourceUsageKind (::XSCRT::XML::Attribute< char > 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
-      operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
-
-      friend bool
-      operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
-
-      private:
-      ResourceUsageKind (Value v);
-
-      Value v_;
-    };
-
-    class InstanceResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceUsage
-      //
-      public:
-      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-      ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
-      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
-
-      // requirementName
-      //
-      public:
-      ::XMLSchema::string< char > const& requirementName () const;
-      ::XMLSchema::string< char >& requirementName ();
-      void requirementName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
-
-      // resourceName
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceName () const;
-      ::XMLSchema::string< char >& resourceName ();
-      void resourceName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
-
-      // resourceValue
-      //
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      ::CIAO::Config_Handlers::Any& resourceValue ();
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      InstanceResourceDeploymentDescription ();
-      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s);
-
-      InstanceResourceDeploymentDescription&
-      operator= (InstanceResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class InstanceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // node
-      //
-      public:
-      ::XMLSchema::string< char > const& node () const;
-      ::XMLSchema::string< char >& node ();
-      void node (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > node_;
-
-      // source
-      //
-      public:
-      ::XMLSchema::string< char > const& source () const;
-      ::XMLSchema::string< char >& source ();
-      void source (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > source_;
-
-      // implementation
-      //
-      public:
-      ::XMLSchema::IDREF< char > const& implementation () const;
-      ::XMLSchema::IDREF< char >& implementation ();
-      void implementation (::XMLSchema::IDREF< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< char > > implementation_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // deployedResource
-      //
-      public:
-      bool deployedResource_p () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& deployedResource ();
-      void deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
-
-      // deployedSharedResource
-      //
-      public:
-      bool deployedSharedResource_p () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& deployedSharedResource ();
-      void deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
-
-      // id
-      //
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< char > const& id () const;
-      ::XMLSchema::ID< char >& id ();
-      void id (::XMLSchema::ID< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< char > > id_;
-
-      public:
-      InstanceDeploymentDescription ();
-      InstanceDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
-
-      InstanceDeploymentDescription&
-      operator= (InstanceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class CCMComponentPortKind : public ::XSCRT::Type
-    {
-      public:
-      CCMComponentPortKind ();
-      CCMComponentPortKind (::XSCRT::XML::Element< char > const&);
-      CCMComponentPortKind (::XSCRT::XML::Attribute< char > 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
-      operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
-
-      friend bool
-      operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
-
-      private:
-      CCMComponentPortKind (Value v);
-
-      Value v_;
-    };
-
-    class ComponentPortDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // specificType
-      //
-      public:
-      ::XMLSchema::string< char > const& specificType () const;
-      ::XMLSchema::string< char >& specificType ();
-      void specificType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
-
-      // supportedType
-      //
-      public:
-      ::XMLSchema::string< char > const& supportedType () const;
-      ::XMLSchema::string< char >& supportedType ();
-      void supportedType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
-
-      // provider
-      //
-      public:
-      ::XMLSchema::string< char > const& provider () const;
-      ::XMLSchema::string< char >& provider ();
-      void provider (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
-
-      // exclusiveProvider
-      //
-      public:
-      ::XMLSchema::string< char > const& exclusiveProvider () const;
-      ::XMLSchema::string< char >& exclusiveProvider ();
-      void exclusiveProvider (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveProvider_;
-
-      // exclusiveUser
-      //
-      public:
-      ::XMLSchema::string< char > const& exclusiveUser () const;
-      ::XMLSchema::string< char >& exclusiveUser ();
-      void exclusiveUser (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveUser_;
-
-      // optional
-      //
-      public:
-      ::XMLSchema::string< char > const& optional () const;
-      ::XMLSchema::string< char >& optional ();
-      void optional (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > optional_;
-
-      // kind
-      //
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
-
-      public:
-      ComponentPortDescription ();
-      ComponentPortDescription (::XSCRT::XML::Element< char > const&);
-      ComponentPortDescription (ComponentPortDescription const& s);
-
-      ComponentPortDescription&
-      operator= (ComponentPortDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentPropertyDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // type
-      //
-      public:
-      ::CIAO::Config_Handlers::DataType const& type () const;
-      ::CIAO::Config_Handlers::DataType& type ();
-      void type (::CIAO::Config_Handlers::DataType const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
-
-      public:
-      ComponentPropertyDescription ();
-      ComponentPropertyDescription (::XSCRT::XML::Element< char > const&);
-      ComponentPropertyDescription (ComponentPropertyDescription const& s);
-
-      ComponentPropertyDescription&
-      operator= (ComponentPropertyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentExternalPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // portName
-      //
-      public:
-      ::XMLSchema::string< char > const& portName () const;
-      ::XMLSchema::string< char >& portName ();
-      void portName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
-
-      public:
-      ComponentExternalPortEndpoint ();
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< char > const&);
-      ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
-
-      ComponentExternalPortEndpoint&
-      operator= (ComponentExternalPortEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class PlanSubcomponentPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // portName
-      //
-      public:
-      ::XMLSchema::string< char > const& portName () const;
-      ::XMLSchema::string< char >& portName ();
-      void portName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
-
-      // provider
-      //
-      public:
-      bool provider_p () const;
-      ::XMLSchema::string< char > const& provider () const;
-      ::XMLSchema::string< char >& provider ();
-      void provider (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
-
-      // kind
-      //
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
-
-      // instance
-      //
-      public:
-      ::XMLSchema::IDREF< char > const& instance () const;
-      ::XMLSchema::IDREF< char >& instance ();
-      void instance (::XMLSchema::IDREF< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< char > > instance_;
-
-      public:
-      PlanSubcomponentPortEndpoint ();
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char > const&);
-      PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
-
-      PlanSubcomponentPortEndpoint&
-      operator= (PlanSubcomponentPortEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ExternalReferenceEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // location
-      //
-      public:
-      ::XMLSchema::string< char > const& location () const;
-      ::XMLSchema::string< char >& location ();
-      void location (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > location_;
-
-      public:
-      ExternalReferenceEndpoint ();
-      ExternalReferenceEndpoint (::XSCRT::XML::Element< char > const&);
-      ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
-
-      ExternalReferenceEndpoint&
-      operator= (ExternalReferenceEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ConnectionResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // targetName
-      //
-      public:
-      ::XMLSchema::string< char > const& targetName () const;
-      ::XMLSchema::string< char >& targetName ();
-      void targetName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > targetName_;
-
-      // requirementName
-      //
-      public:
-      ::XMLSchema::string< char > const& requirementName () const;
-      ::XMLSchema::string< char >& requirementName ();
-      void requirementName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
-
-      // resourceName
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceName () const;
-      ::XMLSchema::string< char >& resourceName ();
-      void resourceName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
-
-      // resourceValue
-      //
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      ::CIAO::Config_Handlers::Any& resourceValue ();
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ConnectionResourceDeploymentDescription ();
-      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char > const&);
-      ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
-
-      ConnectionResourceDeploymentDescription&
-      operator= (ConnectionResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class PlanConnectionDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // source
-      //
-      public:
-      bool source_p () const;
-      ::XMLSchema::string< char > const& source () const;
-      ::XMLSchema::string< char >& source ();
-      void source (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > source_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // externalEndpoint
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-      // internalEndpoint
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
-
-      // externalReference
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-      // deployedResource
-      //
-      public:
-      bool deployedResource_p () const;
-      ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& deployedResource () const;
-      ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& deployedResource ();
-      void deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_;
-
-      public:
-      PlanConnectionDescription ();
-      PlanConnectionDescription (::XSCRT::XML::Element< char > const&);
-      PlanConnectionDescription (PlanConnectionDescription const& s);
-
-      PlanConnectionDescription&
-      operator= (PlanConnectionDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ImplementationDependency : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requiredType
-      //
-      public:
-      ::XMLSchema::string< char > const& requiredType () const;
-      ::XMLSchema::string< char >& requiredType ();
-      void requiredType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requiredType_;
-
-      public:
-      ImplementationDependency ();
-      ImplementationDependency (::XSCRT::XML::Element< char > const&);
-      ImplementationDependency (ImplementationDependency const& s);
-
-      ImplementationDependency&
-      operator= (ImplementationDependency const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Capability : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // resourceType
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceType () const;
-      ::XMLSchema::string< char >& resourceType ();
-      void resourceType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
-
-      // property
-      //
-      public:
-      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-      ::CIAO::Config_Handlers::SatisfierProperty& property ();
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      Capability ();
-      Capability (::XSCRT::XML::Element< char > const&);
-      Capability (Capability const& s);
-
-      Capability&
-      operator= (Capability const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ImplementationRequirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceUsage
-      //
-      public:
-      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-      ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
-      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
-
-      // resourcePort
-      //
-      public:
-      ::XMLSchema::string< char > const& resourcePort () const;
-      ::XMLSchema::string< char >& resourcePort ();
-      void resourcePort (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourcePort_;
-
-      // componentPort
-      //
-      public:
-      ::XMLSchema::string< char > const& componentPort () const;
-      ::XMLSchema::string< char >& componentPort ();
-      void componentPort (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > componentPort_;
-
-      // resourceType
-      //
-      public:
-      ::XMLSchema::string< char > const& resourceType () const;
-      ::XMLSchema::string< char >& resourceType ();
-      void resourceType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // property
-      //
-      public:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      ::CIAO::Config_Handlers::Property& property ();
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      ImplementationRequirement ();
-      ImplementationRequirement (::XSCRT::XML::Element< char > const&);
-      ImplementationRequirement (ImplementationRequirement const& s);
-
-      ImplementationRequirement&
-      operator= (ImplementationRequirement const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentPackageReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requiredUUID
-      //
-      public:
-      ::XMLSchema::string< char > const& requiredUUID () const;
-      ::XMLSchema::string< char >& requiredUUID ();
-      void requiredUUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requiredUUID_;
-
-      // requiredName
-      //
-      public:
-      ::XMLSchema::string< char > const& requiredName () const;
-      ::XMLSchema::string< char >& requiredName ();
-      void requiredName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requiredName_;
-
-      // requiredType
-      //
-      public:
-      ::XMLSchema::string< char > const& requiredType () const;
-      ::XMLSchema::string< char >& requiredType ();
-      void requiredType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > requiredType_;
-
-      public:
-      ComponentPackageReference ();
-      ComponentPackageReference (::XSCRT::XML::Element< char > const&);
-      ComponentPackageReference (ComponentPackageReference const& s);
-
-      ComponentPackageReference&
-      operator= (ComponentPackageReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class SubcomponentPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // portName
-      //
-      public:
-      ::XMLSchema::string< char > const& portName () const;
-      ::XMLSchema::string< char >& portName ();
-      void portName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
-
-      // instance
-      //
-      public:
-      ::XMLSchema::IDREF< char > const& instance () const;
-      ::XMLSchema::IDREF< char >& instance ();
-      void instance (::XMLSchema::IDREF< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< char > > instance_;
-
-      public:
-      SubcomponentPortEndpoint ();
-      SubcomponentPortEndpoint (::XSCRT::XML::Element< char > const&);
-      SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
-
-      SubcomponentPortEndpoint&
-      operator= (SubcomponentPortEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class AssemblyConnectionDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // externalEndpoint
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-      // internalEndpoint
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
-
-      // externalReference
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-      public:
-      AssemblyConnectionDescription ();
-      AssemblyConnectionDescription (::XSCRT::XML::Element< char > const&);
-      AssemblyConnectionDescription (AssemblyConnectionDescription const& s);
-
-      AssemblyConnectionDescription&
-      operator= (AssemblyConnectionDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // BASIC_DEPLOYMENT_DATA_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.cpp
deleted file mode 100644
index 205ad62a83a..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "Basic_Handler.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-Basic_Handler::Basic_Handler (DOMDocument* doc, unsigned long filter)
-  : traverse_ (doc),
-    doc_ (doc),
-    root_ (doc->getDocumentElement()),
-    filter_ (filter),
-    iter_ (traverse_->createNodeIterator (this->root_,
-                                          this->filter_,
-                                          0,
-                                          true)),
-    release_ (true),
-    index_ (0)
-{
-}
-
-Basic_Handler::Basic_Handler (DOMNodeIterator* iter, bool release)
-  : traverse_ (0), doc_ (0), root_ (0), filter_ (0), iter_ (iter),
-    release_ (release)
-{
-}
-
-Basic_Handler::Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, 
-                              bool release)
-  : traverse_ (0), doc_ (doc), root_ (0), filter_ (0), iter_ (iter),
-    release_ (release)
-{
-}
-
-Basic_Handler::~Basic_Handler()
-{
-  if (this->release_)
-    this->iter_->release();
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.h
deleted file mode 100644
index a8d31ea54f1..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//==================================================================
-/**
- *  @file  Basic_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef BASIC_HANDLER_H
-#define BASIC_HANDLER_H
-
-#include "Config.h"
-
-#include "ace/SString.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Hash_Map_Manager.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/dom/DOM.hpp>
-
-using xercesc::DOMDocument;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNode;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Basic_Handler
- *
- * @brief The base class for all the Handler classes
- *
- * This class provides the functionalities common to all handler classes.
- * Keeps variables for basic XML document handling,
- *       initialization/uninitialization,
- *       and required get/set methods.
- */
-
-class Config_Handler_Export Basic_Handler {
-public:
-  typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-  typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER;
-  typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP;
-
-  Basic_Handler (DOMDocument* doc, unsigned long filter_);
-
-  Basic_Handler (DOMNodeIterator* iter, bool release = false);
-
-  Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, 
-                 bool release = false);
-
-  ~Basic_Handler (void);
-
-  REF_MAP& id_map()
-  {
-    return this->id_map_;
-  }
-
-  void set_iter (DOMNodeIterator* iter)
-    {
-      iter_ = iter;
-    }
-
-  void set_doc (DOMDocument* doc)
-    {
-      doc_ = doc;
-    }
-
-protected:
-  DOMDocumentTraversal* traverse_;
-
-  DOMDocument* doc_;
-
-  DOMNode* root_;
-
-  unsigned long filter_;
-
-  DOMNodeIterator* iter_;
-
-  bool release_;
-
-  int index_;
-
-  REF_MAP id_map_;
-
-  IDREF_MAP idref_map_;
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif // BASIC_HANDLER_H
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.cpp
deleted file mode 100644
index 1f6464e6102..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ERE_Handler.h"
-#include "CEPE_Handler.h"
-#include "CPR_Handler.h"
-#include "CAD_Handler.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the connection resource deployment description and populate it
-void CAD_Handler::process_ComponentAssemblyDescription
-           (::Deployment::ComponentAssemblyDescription& cad)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-            (ACE_TEXT ("Deployment:ComponentAssemblyDescription")))
-        {
-        }
-      else if
-        (process_sequence_local
-           <Deployment::SubcomponentInstantiationDescription>
-              (this->doc_, this->iter_, node,
-               node_name, "instance", cad.instance,
-               this, &CAD_Handler::process_instance));
-      else if
-        (process_sequence_local<Deployment::AssemblyConnectionDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "connection", cad.connection,
-            this, &CAD_Handler::process_connection));
-      else if
-        (process_sequence_local<Deployment::AssemblyPropertyMapping>
-           (this->doc_, this->iter_, node,
-            node_name, "externalProperty", cad.externalProperty,
-            this, &CAD_Handler::process_property));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-
-  this->update_spe_refs (cad);
-  this->update_spr_refs (cad);
-
-  return;
-}
-
-void CAD_Handler::update_spe_refs (Deployment::
-                                   ComponentAssemblyDescription& cad)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < cad.connection.length (); ++x)
-    {
-      for (y = 0; y < cad.connection[x].internalEndpoint.length (); ++y)
-        {
-          ref_value = cad.connection[x].internalEndpoint[y].instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, value) == 0)
-                {
-                  cad.connection[x].internalEndpoint[y].instanceRef= value;
-                }
-            }
-        }
-    }
-}
-
-void CAD_Handler::update_spr_refs (Deployment::
-                                   ComponentAssemblyDescription& cad)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < cad.externalProperty.length (); ++x)
-    {
-      for (y = 0; y < cad.externalProperty[x].delegatesTo.length (); ++y)
-        {
-          ref_value = cad.externalProperty[x].delegatesTo[y].instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, value) == 0)
-                {
-                  cad.externalProperty[x].delegatesTo[y].instanceRef = value;
-                }
-            }
-        }
-    }
-}
-
-void CAD_Handler::process_instance (DOMNodeIterator* iter,
-                                    Deployment::
-                                    SubcomponentInstantiationDescription& sid)
-{
-  char* root_node_name_ch = XMLString::transcode
-    (this->doc_->getDocumentElement ()->getNodeName ());
-  ACE_TString root_node_name (root_node_name_ch);
-
-  XMLString::release (&root_node_name_ch);
-
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentInstantiationDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-                 (iter, node_name, "name", sid.name));
-      else if
-        (process_sequence_remote<Deployment::ComponentPackageDescription, 
-                                 CompPkgDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "package", sid.package,
-            &CompPkgDesc_Handler::process_ComponentPackageDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", sid.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (this->doc_, this->iter_, node,
-            node_name, "selectRequirement", sid.selectRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ComponentPackageReference, 
-                                 CPR_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "reference", sid.reference,
-            &CPR_Handler::process_ComponentPackageReference, this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_connection (DOMNodeIterator* iter,
-                                      Deployment::
-                                      AssemblyConnectionDescription& acd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:AssemblyConnectionDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "name", acd.name));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployRequirement", acd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ComponentExternalPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalEndpoint", acd.externalEndpoint,
-            &CEPE_Handler::process_ComponentExternalPortEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::SubcomponentPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "internalEndpoint", acd.internalEndpoint,
-            this, &CAD_Handler::process_spe));
-      else if
-        (process_sequence_common<Deployment::ExternalReferenceEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalReference", acd.externalReference,
-            &ERE_Handler::process_ExternalReferenceEndpoint,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-      
-void CAD_Handler::process_spe (DOMNodeIterator* iter,
-                               Deployment::SubcomponentPortEndpoint& spe)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentPortEndpoint")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "portName", spe.portName));
-      else if
-        (process_reference(node, node_name, "instance",
-                           spe.instanceRef,
-                           this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_spr (DOMNodeIterator* iter,
-                               Deployment::SubcomponentPropertyReference& spr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentPropertyReference")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "propertyName", spr.propertyName));
-      else if
-        (process_reference(node, node_name, "instance",
-                           spr.instanceRef,
-                           this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_property(DOMNodeIterator* iter,
-                                   Deployment::AssemblyPropertyMapping& apm)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:AssemblyPropertyMapping")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", apm.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "externalName", apm.externalName));
-      else if
-        (process_sequence_local<Deployment::SubcomponentPropertyReference>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "delegatesTo", apm.delegatesTo,
-            this, &CAD_Handler::process_spr));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-      
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.h
deleted file mode 100644
index 515a59d70c2..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//==================================================================
-/**
- *  @file  CAD_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CAD_HANDLER_H
-#define CAD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CAD_Handler
- *
- * @brief Handler class for <ComponentAssemblyDescription> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CAD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CAD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CAD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component assembly description
-  void process_ComponentAssemblyDescription (::Deployment::ComponentAssemblyDescription &cad);
-  
-  /// process instance
-  void process_instance (DOMNodeIterator* iter,
-                         Deployment::SubcomponentInstantiationDescription& sid);
-
-  /// process connection element
-  void process_connection (DOMNodeIterator* iter,
-                           Deployment::AssemblyConnectionDescription& acd);
-
-  /// process property element
-  void process_property (DOMNodeIterator* iter,
-                         Deployment::AssemblyPropertyMapping& acd);
-
-  /// process spe element
-  void process_spe (DOMNodeIterator* iter,
-                    Deployment::SubcomponentPortEndpoint& spe);
-
-  /// process spr element
-  void process_spr (DOMNodeIterator* iter,
-                    Deployment::SubcomponentPropertyReference& spr);
-
-  /// process CPD
-  void process_package (DOMNodeIterator* iter,
-                        Deployment::ComponentPackageDescription& sid_package);
-
-  /// update spe refs
-  void update_spe_refs (Deployment::ComponentAssemblyDescription& cad);
-
-  /// update spr refs
-  void update_spr_refs (Deployment::ComponentAssemblyDescription& cad);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CAD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.cpp
deleted file mode 100644
index 27152ba8c1d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//$Id$
-
-#include "CEPE_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::CEPE_Handler::
-process_ComponentExternalPortEndpoint (DOMNodeIterator * iter,
-                                       Deployment::ComponentExternalPortEndpoint
-                                       &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("portName")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers:: \
-                   CEPE_Handler::process_ComponentExtPortEndPoint \
-                   element mismatch expected <portName>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.portName = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.h
deleted file mode 100644
index 18eabeff80e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//==================================================================
-/**
- *  @file  CEPE_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CEPE_HANDLER_H
-#define CEPE_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ID_Handler
-     *
-     * @brief Handler class for <ComponentExternalPortEndpoint> type
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL type for this
-     * element is returned.
-     */
-
-    class Config_Handler_Export CEPE_Handler
-    {
-    public:
-      static void
-        process_ComponentExternalPortEndpoint (DOMNodeIterator * iter,
-                                               Deployment::ComponentExternalPortEndpoint &ret_struct);
-      // process <ComponentExternalPortEndPoint> definitions in the descriptor
-      // files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CEPE_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.cpp
deleted file mode 100644
index 0326581ff18..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//$Id$
-
-#include "CPK_Handler.h"
-#include "Utils.h"
-#include "tao/Exception.h"
-#include "ace/OS_NS_string.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::CPK_Handler::
-process_CCMComponentPortKind (DOMNodeIterator * iter,
-                              Deployment::CCMComponentPortKind &kind)
-{
-  char* facet = XMLString::transcode (XStr ("Facet"));
-  char* simplex_receptacle = XMLString::transcode (XStr ("SimplexReceptacle"));
-  char* multiplex_receptacle = XMLString::transcode
-                                 (XStr ("MultiplexReceptacle"));
-  char* event_emitter = XMLString::transcode (XStr ("EventEmitter"));
-  char* event_publisher = XMLString::transcode (XStr ("EventPublisher"));
-  char* event_consumer = XMLString::transcode (XStr ("EventConsumer"));
-  char * temp = Utils::parse_string (iter);
-  XStr kind_str = XStr (temp);
-  XMLString::release (&temp);
-
-  char* kind_str_tr = XMLString::transcode (kind_str);
-
-  if ((ACE_OS::strcmp (kind_str_tr, facet)) == 0)
-    {
-      kind = Deployment::Facet;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, simplex_receptacle)) == 0)
-    {
-      kind = Deployment::SimplexReceptacle;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, multiplex_receptacle)) == 0)
-    {
-      kind = Deployment::MultiplexReceptacle;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_emitter)) == 0)
-    {
-      kind = Deployment::EventEmitter;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_publisher)) == 0)
-    {
-      kind = Deployment::EventPublisher;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_consumer)) == 0)
-    {
-      kind = Deployment::EventConsumer;
-    }
-  else
-    {
-      // Something wrong here.. Throw exception
-      XMLString::release (&kind_str_tr);
-      XMLString::release (&facet);
-      XMLString::release (&simplex_receptacle);
-      XMLString::release (&multiplex_receptacle);
-      XMLString::release (&event_emitter);
-      XMLString::release (&event_publisher);
-      XMLString::release (&event_consumer);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handler::CPK_Handler::process_CCMComponentPortKing \
-                   illegal <CCMComponentPortKind> value found \n"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  XMLString::release (&kind_str_tr);
-  XMLString::release (&facet);
-  XMLString::release (&simplex_receptacle);
-  XMLString::release (&multiplex_receptacle);
-  XMLString::release (&event_emitter);
-  XMLString::release (&event_publisher);
-  XMLString::release (&event_consumer);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.h
deleted file mode 100644
index 2c34055e08e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  CPK_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CPK_HANDLER_H
-#define CPK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class CPK_Handler
-     *
-     * @brief Handler class for <CCMComponentPortKind> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export CPK_Handler
-    {
-    public:
-      static void process_CCMComponentPortKind (DOMNodeIterator * iter,
-                                                Deployment::CCMComponentPortKind &kind);
-      // process elements of type CCMComponentPortKind definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CPK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.cpp
deleted file mode 100644
index 424e6246e28..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "CPR_Handler.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the connection resource deployment description and populate it
-void CPR_Handler::process_ComponentPackageReference
-(::Deployment::ComponentPackageReference &cpr)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (false);
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredUUID", 
-                        cpr.requiredUUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredName", cpr.requiredName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredType", cpr.requiredType));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.h
deleted file mode 100644
index 8e9c8132f17..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  CPR_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CPR_HANDLER_H
-#define CPR_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CPR_Handler
- *
- * @brief Handler class for <ComponentPackageReference> type 
- *
- * This class is within the Execution Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CPR_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CPR_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CPR_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CPR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package reference
-  void process_ComponentPackageReference (::Deployment::ComponentPackageReference &cpr);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CPR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.cpp
deleted file mode 100644
index d357bc03ec8..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  Cap_Handler.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#include "Cap_Handler.h"
-#include "SP_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-void
-CAP_Handler::process_Capability (Deployment::Capability &cap)
-{
-  //Check if the Schema IDs for both the elements match
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Capability")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", cap.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (this->iter_, node_name, "resourceType", 
-                             cap.resourceType));
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (this->doc_, this->iter_, node,
-            node_name, "property", cap.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          break;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.h
deleted file mode 100644
index f680961f75d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//==================================================================
-/**
- *  @file  Cap_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef CAP_HANDLER_H
-#define CAP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CAP_Handler
- *
- * @brief Handler class for <Capability> type
- *
- * This class defines handler methods to parse Capability
- * types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-class Config_Handler_Export CAP_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CAP_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CAP_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CAP_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  void process_Capability (Deployment::Capability &ret_struct);
-  // process elements of type Capability definitions in
-  // the descriptor files
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp
deleted file mode 100644
index afccc0c5f0b..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CAD_Handler.h"
-#include "MID_Handler.h"
-#include "ID_Handler.h"
-#include "Cap_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "CompImplDesc_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the component implementation description and populate it
-void CompImplDesc_Handler::process_ComponentImplementationDescription
-                   (::Deployment::ComponentImplementationDescription &cid)
-{
-  char* root_node_name_ch = XMLString::transcode
-    (this->doc_->getDocumentElement ()->getNodeName ());
-  ACE_TString root_node_name (root_node_name_ch);
-  XMLString::release (&root_node_name_ch);
-
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:ComponentImplementationDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "label", cid.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "UUID", cid.UUID));
-      else if
-        (process_element_remote<Deployment::ComponentInterfaceDescription, 
-                                CompIntrDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "implements", cid.implements,
-            &CompIntrDesc_Handler::process_ComponentInterfaceDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ComponentAssemblyDescription, 
-                                 CAD_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "assemblyImpl", cid.assemblyImpl,
-            &CAD_Handler::process_ComponentAssemblyDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::
-                                 MonolithicImplementationDescription, 
-                                 MID_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "monolithicImpl", cid.monolithicImpl,
-            &MID_Handler::process_MonolithicImplementationDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", cid.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::Capability, CAP_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "capability", cid.capability,
-            &CAP_Handler::process_Capability, this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ImplementationDependency>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", cid.dependsOn,
-            &ID_Handler::process_ImplementationDependency,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", cid.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h
deleted file mode 100644
index c7918732628..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  CompImplDesc_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CompImplDesc_HANDLER_H
-#define CompImplDesc_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CompImplDesc_Handler
- *
- * @brief Handler class for <ComponentImplementationDescription> type
- *
- * This class is within the Execution Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CompImplDesc_Handler: public Basic_Handler
-{
- public:
-
-  /// constructor
-  CompImplDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompImplDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CompImplDesc_Handler (DOMDocument* doc,
-                        DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the monolithic deployment description
-  void process_ComponentImplementationDescription (::Deployment::ComponentImplementationDescription &cid);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CompImplDesc_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp
deleted file mode 100644
index 25ca99733fc..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//$Id$
-
-#ifndef CompIntrDesc_HANDLER_C
-#define CompIntrDesc_HANDLER_C
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include "Property_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "DT_Handler.h"
-#include "CPK_Handler.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void CompIntrDesc_Handler::process_ComponentInterfaceDescription
-(::Deployment::ComponentInterfaceDescription &ccd)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentInterfaceDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "label", ccd.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "UUID", ccd.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "specificType", 
-                        ccd.specificType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-              (this->iter_, node_name, "supportedType", 
-                            ccd.supportedType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-              (this->iter_, node_name, "idlFile", ccd.idlFile));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", ccd.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ComponentPortDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "port", ccd.port,
-            this, &CompIntrDesc_Handler::process_port));
-      else if
-        (process_sequence_local<Deployment::ComponentPropertyDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "property", ccd.property,
-            this, &CompIntrDesc_Handler::process_comp_property));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", ccd.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-/// process component property element
-void CompIntrDesc_Handler::process_comp_property (DOMNodeIterator* iter,
-                                                  Deployment::
-                                                  ComponentPropertyDescription&
-                                                  property)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentPropertyDescription")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string
-                  (iter, node_name, "name", property.name));
-      else if (node_name == XStr (ACE_TEXT ("type")))
-        {
-          int argc = 0;
-          char ** argv = 0;
-          CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
-          DT_Handler::process_DataType (iter, property.type.out (), orb);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-/// process port element
-void CompIntrDesc_Handler::process_port (DOMNodeIterator* iter,
-                                         Deployment::
-                                         ComponentPortDescription& port)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentPortDescription")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string
-                   (iter, node_name, "name", port.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-                   (iter, node_name, "specificType", port.specificType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-                   (iter, node_name, "supportedType", port.supportedType));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                   (iter, node_name, "provider", port.provider));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                   (iter, node_name, "exclusiveProvider", 
-                         port.exclusiveProvider));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                  (iter, node_name, "exclusiveUser", port.exclusiveUser));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                 (iter, node_name, "optional", port.optional));
-      else if (node_name == XStr(ACE_TEXT("kind")))
-        {
-          CPK_Handler::process_CCMComponentPortKind (iter, port.kind);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif /* CompIntrDesc_HANDLER_C */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h
deleted file mode 100644
index 7c4e2e22898..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//$Id$
-
-#ifndef COMPINTRDESC_HANDLER_H
-#define COMPINTRDESC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-class Config_Handler_Export CompIntrDesc_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CompIntrDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompIntrDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { };
-
-  /// constructor
-  CompIntrDesc_Handler (DOMDocument* doc, 
-                        DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { };
-
-  /// Process the component package description
-  void process_ComponentInterfaceDescription (::Deployment::ComponentInterfaceDescription &CompIntrDesc);
-
-protected:
-  /// process port element
-  void process_port (DOMNodeIterator* iter,
-                     Deployment::ComponentPortDescription& port);
-
-  /// process component property element
-  void process_comp_property (DOMNodeIterator* iter,
-                              Deployment::ComponentPropertyDescription& property);
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif // COMPINTRDESC_HANDLER_H
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp
deleted file mode 100644
index c60201535cb..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-#ifndef COMPPKGDESC_HANDLER_C
-#define COMPPKGDESC_HANDLER_C
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Utils.h"
-#include "CompPkgDesc_Handler.h"
-#include "Property_Handler.h"
-#include "PCI_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void CompPkgDesc_Handler::process_ComponentPackageDescription
-(::Deployment::ComponentPackageDescription &comppkgdesc)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:ComponentPackageDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "label", comppkgdesc.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "UUID", comppkgdesc.UUID));
-      else if
-        (process_element_remote<Deployment::ComponentInterfaceDescription, 
-                                CompIntrDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "realizes", comppkgdesc.realizes,
-            &CompIntrDesc_Handler::process_ComponentInterfaceDescription,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", comppkgdesc.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::PackagedComponentImplementation, 
-                                 PCI_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "implementation", comppkgdesc.implementation,
-            &PCI_Handler::process_PackagedComponentImplementation,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", comppkgdesc.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif /* COMPPKGDESC_HANDLER_C */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h
deleted file mode 100644
index 9cd81ffa5f5..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//==================================================================
-/**
- *  @file  CompPkgDesc_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef COMPPKGDESC_HANDLER_H
-#define COMPPKGDESC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CompPkgDesc_Handler
- *
- * @brief Handler class for <ComponentPackageDescription> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CompPkgDesc_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CompPkgDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompPkgDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CompPkgDesc_Handler (DOMDocument* doc, 
-                       DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package description
-  void process_ComponentPackageDescription (::Deployment::ComponentPackageDescription &comppkgdesc);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* COMPPKGDESC_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config.h
deleted file mode 100644
index 524679335cf..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//==================================================================
-/**
- *  @file  Config.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CIAO_DANCE_CONFIG_H
-#define CIAO_DANCE_CONFIG_H
-
-#define BEGIN_DEPLOYMENT_NAMESPACE namespace CIAO { namespace Config_Handler {
-#define END_DEPLOYMENT_NAMESPACE } }
-
-#endif // CIAO_DANCE_CONFIG_H
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp
deleted file mode 100644
index de938a2ce0e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/dom/DOMLocator.hpp>
-#include "Config_Error_Handler.h"
-#include "XercesString.h"
-
-using xercesc::XMLString;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    Config_Error_Handler::Config_Error_Handler()
-      : errors_ (false)
-    {}
-
-    Config_Error_Handler::~Config_Error_Handler()
-    {}
-
-
-    bool Config_Error_Handler::handleError (const DOMError& domError)
-    {
-      this->errors_ = true;
-      if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING)
-        {
-          ACE_ERROR ((LM_ERROR, "Warning "));
-        }
-      else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR)
-        {
-          ACE_ERROR ((LM_ERROR, "Error "));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "FatalError "));
-        }
-
-      char *msg = XMLString::transcode(domError.getMessage());
-      char *url = XMLString::transcode (domError.getLocation()->getURI());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg);
-      ACE_ERROR ((LM_ERROR, "while processing resource '%s', "
-                  "Line %d, Position %d : %s\n",
-                  url,
-                  domError.getLocation()->getLineNumber(),
-                  domError.getLocation()->getColumnNumber(),
-                  msg));
-      return true;
-    }
-
-    void Config_Error_Handler::resetErrors()
-    {
-      this->errors_ = false;
-    }
-
-    bool Config_Error_Handler::getErrors() const
-    {
-      return this->errors_;
-    }
-  }
-
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h
deleted file mode 100644
index ba1b8b5514c..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#ifndef CONFIG_ERROR_HANDLER_H
-#define CONFIG_ERROR_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/dom/DOMErrorHandler.hpp>
-#include "Config_Handler_export.h"
-
-using xercesc::DOMErrorHandler;
-using xercesc::DOMError;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    class Config_Handler_Export Config_Error_Handler : public DOMErrorHandler
-    {
-    public:
-
-      Config_Error_Handler ();
-
-      ~Config_Error_Handler ();
-
-      bool handleError (const DOMError& domError);
-
-      void resetErrors ();
-
-      bool getErrors() const;
-
-    private :
-      // Disallow copying
-      Config_Error_Handler (const Config_Error_Handler&);
-      Config_Error_Handler& operator= (const Config_Error_Handler&);
-
-      bool errors_;
-
-    };
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CONFIG_ERROR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handler_export.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handler_export.h
deleted file mode 100644
index 0c9beba35b9..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handler_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 -s Config_Handler
-// ------------------------------
-#ifndef CONFIG_HANDLER_EXPORT_H
-#define CONFIG_HANDLER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIG_HANDLER_HAS_DLL)
-#  define CONFIG_HANDLER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CONFIG_HANDLER_HAS_DLL */
-
-#if !defined (CONFIG_HANDLER_HAS_DLL)
-#  define CONFIG_HANDLER_HAS_DLL 1
-#endif /* ! CONFIG_HANDLER_HAS_DLL */
-
-#if defined (CONFIG_HANDLER_HAS_DLL) && (CONFIG_HANDLER_HAS_DLL == 1)
-#  if defined (CONFIG_HANDLER_BUILD_DLL)
-#    define Config_Handler_Export ACE_Proper_Export_Flag
-#    define CONFIG_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONFIG_HANDLER_BUILD_DLL */
-#    define Config_Handler_Export ACE_Proper_Import_Flag
-#    define CONFIG_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONFIG_HANDLER_BUILD_DLL */
-#else /* CONFIG_HANDLER_HAS_DLL == 1 */
-#  define Config_Handler_Export
-#  define CONFIG_HANDLER_SINGLETON_DECLARATION(T)
-#  define CONFIG_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONFIG_HANDLER_HAS_DLL == 1 */
-
-// Set CONFIG_HANDLER_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONFIG_HANDLER_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONFIG_HANDLER_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONFIG_HANDLER_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONFIG_HANDLER_NTRACE */
-
-#if (CONFIG_HANDLER_NTRACE == 1)
-#  define CONFIG_HANDLER_TRACE(X)
-#else /* (CONFIG_HANDLER_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONFIG_HANDLER_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONFIG_HANDLER_NTRACE == 1) */
-
-#endif /* CONFIG_HANDLER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handlers.mpc
deleted file mode 100644
index 143154079cd..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handlers.mpc
+++ /dev/null
@@ -1,46 +0,0 @@
-//$Id$
-
-project (Config_Handlers) : ciao_component_dnc, ifr_client, valuetype, xerces, exceptions {
-
-  after     += CIAO_DnC_Server
-  sharedname = Config_Handlers
-  dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  libs     += CIAO_DnC_Server
-
-  Source_Files {
-    Utils.cpp
-    Any_Handler.cpp
-    Basic_Handler.cpp
-    CAD_Handler.cpp
-    Cap_Handler.cpp
-    CEPE_Handler.cpp
-    CompImplDesc_Handler.cpp
-    CompIntrDesc_Handler.cpp
-    CompPkgDesc_Handler.cpp
-    Config_Error_Handler.cpp
-    CPK_Handler.cpp
-    CPR_Handler.cpp
-    DnC_Dump.cpp
-    Dump_Obj.cpp
-    Domain_Handler.cpp
-    DT_Handler.cpp
-    ERE_Handler.cpp
-    IAD_Handler.cpp
-    ID_Handler.cpp
-    IR_Handler.cpp
-    MID_Handler.cpp
-    NIA_Handler.cpp
-    PC_Handler.cpp
-    PCI_Handler.cpp
-    Plan_Handler.cpp
-    Process_Element.cpp
-    Property_Handler.cpp
-    Requirement_Handler.cpp
-    RS_Handler.cpp
-    RUK_Handler.cpp
-    SP_Handler.cpp
-    SPK_Handler.cpp
-    TPD_Handler.cpp
-    XercesString.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
deleted file mode 100644
index b5515fa225c..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//$Id$
-
-#include "DT_Handler.h"
-#include "Utils.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-void
-CIAO::Config_Handler::DT_Handler::process_basic_tc (DOMNodeIterator * iter,
-                                                    ::CORBA::TypeCode_ptr &type)
-{
-
-    // For all types defined return the appropriate typecode
-    char * code_value = Utils::parse_string (iter);
-    auto_ptr<char> cleanup_char (code_value);
-
-    // For this piece of code to work, it is necessary that ORB_init
-    // be called by the top level handler which calls the
-    // process_DataType common handler.
-    if (ACE_OS::strcmp (code_value,
-                        "tk_null") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_short") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_long") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ushort") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ulong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_float") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_double") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_boolean") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_char") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_octet") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_string") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_longlong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ulonglong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_longdouble") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_wchar") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_wstring") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_any") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_TypeCode") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_Object") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);
-    else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Config_Handlers::DT_Handler::process_Datatype \
-                            unsupported TCkind value %s encountered \
-                            abortingi\n", type));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-CIAO::Config_Handler::DT_Handler::process_DataType (DOMNodeIterator * iter,
-                                                    ::CORBA::TypeCode_ptr &type,
-                                                    ::CORBA::ORB_ptr )
-{
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-  if (name == XStr (ACE_TEXT ("kind")))
-    DT_Handler::process_basic_tc (iter, type);
-  else
-  {
-    ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::process_ \
-                           DataType supports only TCKind types\
-                           support for recursive types will be added later\n"));
-    ACE_THROW (CORBA::INTERNAL ());
-
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
deleted file mode 100644
index 54ab924355a..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//==================================================================
-/**
- *  @file  DT_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef DT_HANDLER_H
-#define DT_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "Config_Handler_export.h"
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CORBA
-{
-  class ORB;
-  typedef ORB* ORB_ptr;
-}
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class DT_Handler
-     *
-     * @brief Handler class for <type> tag
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL mapped type in this
-     * a CORBA::Typecode is created and returned. Dynamic creation of typecodes
-     * also requires operations defined on the ORB interface, hence the
-     * process_DataType requires an ORB_ptr as a formal parameter.
-     */
-
-    class Config_Handler_Export DT_Handler
-    {
-    public:
-      static void process_DataType (DOMNodeIterator * iter,
-                                    ::CORBA::TypeCode_ptr &type,
-                                    ::CORBA::ORB_ptr orb);
-      // process <type> definitions in the descriptor files
-    private:
-      static void process_basic_tc (DOMNodeIterator * iter,
-                                    ::CORBA::TypeCode_ptr &type);
-      // process <Deployment:TCKind> definitions in the descriptor
-      // files
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* DT_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.cpp
deleted file mode 100644
index be15143889d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id$
-#include "Deployment.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    ::CIAO::Config_Handlers::Domain
-    domain (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "domain")
-      {
-        ::CIAO::Config_Handlers::Domain r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "deploymentPlan")
-      {
-        ::CIAO::Config_Handlers::DeploymentPlan r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription
-    implementationArtifactDescription (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "implementationArtifactDescription")
-      {
-        ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription
-    componentInterfaceDescription (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "componentInterfaceDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::ComponentImplementationDescription
-    componentImplementationDescription (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "componentImplementationDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageDescription
-    componentPackageDescription (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "componentPackageDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::PackageConfiguration
-    packageConfiguration (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "packageConfiguration")
-      {
-        ::CIAO::Config_Handlers::PackageConfiguration r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-
-    ::CIAO::Config_Handlers::TopLevelPackageDescription
-    topLevelPackageDescription (xercesc::DOMDocument const* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () == "topLevelPackageDescription")
-      {
-        ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
-        return r;
-      }
-
-      else
-      {
-        throw 1;
-      }
-    }
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.hpp
deleted file mode 100644
index 575ea151800..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-#ifndef DEPLOYMENT_HPP
-#define DEPLOYMENT_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-#include "cpd.hpp"
-
-#include "cdd.hpp"
-
-#include "cdp.hpp"
-
-#include "pcd.hpp"
-
-#include "toplevel.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    ::CIAO::Config_Handlers::Domain
-    domain (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription
-    implementationArtifactDescription (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription
-    componentInterfaceDescription (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::ComponentImplementationDescription
-    componentImplementationDescription (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::ComponentPackageDescription
-    componentPackageDescription (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::PackageConfiguration
-    packageConfiguration (xercesc::DOMDocument const*);
-
-    ::CIAO::Config_Handlers::TopLevelPackageDescription
-    topLevelPackageDescription (xercesc::DOMDocument const*);
-  }
-}
-
-#endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.cpp
deleted file mode 100644
index 2763d3390b5..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.cpp
+++ /dev/null
@@ -1,972 +0,0 @@
-// $Id$
-
-#include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
-#include "DnC_Dump.h"
-#include "DnC_Dump_T.h"
-#include <iostream>
-
-using namespace ::Deployment::DnC_Dump_T;
-namespace Deployment
-{
-  void
-  DnC_Dump::dump (const char* caption, const ::CORBA::StringSeq &str_seq)
-  {
-    CORBA::ULong size = str_seq.length ();
-
-    if (size != 0)
-      {
-        Dump_Obj dump_obj (caption);
-
-        for (CORBA::ULong i = 0; i < size; ++i)
-          {
-            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].in ()));
-          }
-      }
-  }
-
-  // Dumps a string
-  void DnC_Dump::dump (const char* caption, const TAO_String_Manager& str)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(),
-                caption, str.in()));
-  }
-
-  // Dumps a boolean
-  void DnC_Dump::dump (const char* caption, const CORBA::Boolean& val)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(),
-                caption, val ? "true" : "false"));
-  }
-
-  /*
-   *  Object dump methods
-   */
-
-  // SatisfierProperty
-  void DnC_Dump::dump (const Deployment::SatisfierProperty& sp)
-  {
-    Dump_Obj dump_obj("SatisfierProperty");
-    dump ("name", sp.name);
-
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (sp.kind) {
-    case Quantity: ACE_DEBUG ((LM_DEBUG, "Quantity\n")); break;
-    case Capacity: ACE_DEBUG ((LM_DEBUG, "Capacity\n")); break;
-    case Minimum: ACE_DEBUG ((LM_DEBUG, "Minimum\n")); break;
-    case Maximum: ACE_DEBUG ((LM_DEBUG, "Maximum\n")); break;
-    case Attribute: ACE_DEBUG ((LM_DEBUG, "Attribute\n")); break;
-    case Selection: ACE_DEBUG ((LM_DEBUG, "Selection\n")); break;
-    }
-
-    ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent()));
-    dump (sp.value);
-  }
-
-  // SharedResource
-  void DnC_Dump::dump (const Deployment::SharedResource& sr)
-  {
-    Dump_Obj dump_obj("SharedResource");
-    dump ("name", sr.name);
-    dump ("resourceType", sr.resourceType);
-#if 0
-    dump_ref_seq<Deployment::Domain> ("nodeRef",
-                                      sr.nodeRef,
-                                      "Domain",
-                                      &Domain::node);
-#endif /*if 0*/
-    dump_sequence ("property",
-                   sr.property);
-  }
-
-  // Resource
-  void DnC_Dump::dump (const Deployment::Resource& resource)
-  {
-    Dump_Obj dump_obj("Resource");
-    dump ("name", resource.name);
-    dump ("resourceType", resource.resourceType);
-    dump_sequence ("property",
-                   resource.property);
-  }
-
-  // Node
-  void DnC_Dump::dump (const Deployment::Node& node)
-  {
-    Dump_Obj dump_obj("Node");
-    dump ("name", node.name);
-    dump ("label", node.label);
-
-#if (_MSC_VER > 1200)
-    dump_ref_seq<Deployment::Domain> (
-      "sharedResourceRef",
-      node.sharedResourceRef, "Domain",
-      &Domain::sharedResource);
-
-    dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      node.connectionRef,
-      "Domain",
-      &Domain::interconnect);
-#endif /* _MSC_VER */
-    dump_sequence ("resource",
-                   node.resource);
-
-  }
-
-  // Interconnect
-  void DnC_Dump::dump (const Deployment::Interconnect& conn)
-  {
-    Dump_Obj dump_obj("Interconnect");
-    dump ("name", conn.name);
-    dump ("label", conn.label);
-
-#if (_MSC_VER > 1200)
-    dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      conn.connectionRef,
-      "Domain",
-      &Domain::bridge);
-
-    dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      conn.connectRef,
-      "Domain",
-      &Domain::node);
-#endif /*_MSC_VER*/
-
-    dump_sequence ("resource",
-                   conn.resource);
-  }
-
-  // Bridge
-  void
-  DnC_Dump::dump (const Deployment::Bridge& bridge)
-  {
-    Dump_Obj dump_obj("Bridge");
-    dump ("name", bridge.name);
-    dump ("label", bridge.label);
-#if (_MSC_VER > 1200)
-
-    dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      bridge.connectRef,
-      "Domain",
-      &Domain::interconnect);
-#endif /*_MSC_VER*/
-
-    dump_sequence ("resource", bridge.resource);
-  }
-
-  void DnC_Dump::dump (const ::Deployment::Domain &domain)
-  {
-    CORBA::Any val;
-    val <<= domain;
-
-    Dump_Obj dump_obj ("Domain",
-                       val);
-
-    dump ("UUID",
-          domain.UUID);
-    dump ("label",
-          domain.label);
-
-    dump_sequence ("sharedResource",
-                   domain.sharedResource);
-    dump_sequence ("node",
-                   domain.node);
-    dump_sequence ("interconnect",
-                   domain.interconnect);
-    dump_sequence ("bridge",
-                   domain.bridge);
-
-    dump_sequence ("infoProperty",
-                   domain.infoProperty);
-  }
-
-  // ComponentPortDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPortDescription
-                         &compportdesc)
-  {
-    Dump_Obj dump_obj("ComponentPortDescription");
-
-    dump ("name", compportdesc.name);
-    dump ("specificType", compportdesc.specificType);
-    dump ("supportedType", compportdesc.supportedType);
-    dump ("provider", compportdesc.provider);
-    dump ("exclusiveProvider", compportdesc.exclusiveProvider);
-    dump ("exclusiveUser", compportdesc.exclusiveUser);
-    dump ("optional", compportdesc.optional);
-
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (compportdesc.kind) {
-    case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
-    case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
-    case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
-    case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
-    case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
-    case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
-    }
-  }
-
-  // ComponentPropertyDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPropertyDescription &comppropdesc)
-  {
-    Dump_Obj dump_obj("ComponentPropertyDescription");
-
-    dump ("name", comppropdesc.name);
-
-    ACE_DEBUG ((LM_DEBUG, "%stype: ", Dump_Obj::indent()));
-    switch (comppropdesc.type.in()->kind()) {
-    case ::CORBA::tk_null: ACE_DEBUG ((LM_DEBUG, "tk_null\n")); break;
-    case ::CORBA::tk_void: ACE_DEBUG ((LM_DEBUG, "tk_void\n")); break;
-    case ::CORBA::tk_short: ACE_DEBUG ((LM_DEBUG, "tk_short\n")); break;
-    case ::CORBA::tk_long: ACE_DEBUG ((LM_DEBUG, "tk_long\n")); break;
-    case ::CORBA::tk_ushort: ACE_DEBUG ((LM_DEBUG, "tk_ushort\n")); break;
-    case ::CORBA::tk_ulong: ACE_DEBUG ((LM_DEBUG, "tk_ulong\n")); break;
-    case ::CORBA::tk_float: ACE_DEBUG ((LM_DEBUG, "tk_float\n")); break;
-    case ::CORBA::tk_double: ACE_DEBUG ((LM_DEBUG, "tk_double\n")); break;
-    case ::CORBA::tk_boolean: ACE_DEBUG ((LM_DEBUG, "tk_boolean\n")); break;
-    case ::CORBA::tk_char: ACE_DEBUG ((LM_DEBUG, "tk_char\n")); break;
-    case ::CORBA::tk_octet: ACE_DEBUG ((LM_DEBUG, "tk_octet\n")); break;
-    case ::CORBA::tk_any: ACE_DEBUG ((LM_DEBUG, "tk_any\n")); break;
-    case ::CORBA::tk_TypeCode: ACE_DEBUG ((LM_DEBUG, "tk_TypeCode\n")); break;
-    case ::CORBA::tk_Principal: ACE_DEBUG ((LM_DEBUG, "tk_Principal\n")); break;
-    case ::CORBA::tk_objref: ACE_DEBUG ((LM_DEBUG, "tk_objref\n")); break;
-    case ::CORBA::tk_struct: ACE_DEBUG ((LM_DEBUG, "tk_struct\n")); break;
-    case ::CORBA::tk_union: ACE_DEBUG ((LM_DEBUG, "tk_union\n")); break;
-    case ::CORBA::tk_enum: ACE_DEBUG ((LM_DEBUG, "tk_enum\n")); break;
-    case ::CORBA::tk_string: ACE_DEBUG ((LM_DEBUG, "tk_string\n")); break;
-    case ::CORBA::tk_sequence: ACE_DEBUG ((LM_DEBUG, "tk_sequence\n")); break;
-    case ::CORBA::tk_array: ACE_DEBUG ((LM_DEBUG, "tk_array\n")); break;
-    case ::CORBA::tk_alias: ACE_DEBUG ((LM_DEBUG, "tk_alias\n")); break;
-    case ::CORBA::tk_except: ACE_DEBUG ((LM_DEBUG, "tk_except\n")); break;
-    case ::CORBA::tk_longlong: ACE_DEBUG ((LM_DEBUG, "tk_longlong\n")); break;
-    case ::CORBA::tk_ulonglong: ACE_DEBUG ((LM_DEBUG, "tk_ulonglong\n")); break;
-    case ::CORBA::tk_longdouble: ACE_DEBUG ((LM_DEBUG, "tk_longdouble\n")); break;
-    case ::CORBA::tk_wchar: ACE_DEBUG ((LM_DEBUG, "tk_wchar\n")); break;
-    case ::CORBA::tk_wstring: ACE_DEBUG ((LM_DEBUG, "tk_wstring\n")); break;
-    case ::CORBA::tk_fixed: ACE_DEBUG ((LM_DEBUG, "tk_fixed\n")); break;
-    case ::CORBA::tk_value: ACE_DEBUG ((LM_DEBUG, "tk_value\n")); break;
-    case ::CORBA::tk_value_box: ACE_DEBUG ((LM_DEBUG, "tk_value_box\n")); break;
-    case ::CORBA::tk_native: ACE_DEBUG ((LM_DEBUG, "tk_native\n")); break;
-    case ::CORBA::tk_abstract_interface: ACE_DEBUG ((LM_DEBUG, "tk_abstract_interface\n")); break;
-    case ::CORBA::tk_local_interface: ACE_DEBUG ((LM_DEBUG, "tk_local_interface\n")); break;
-    case ::CORBA::tk_component: ACE_DEBUG ((LM_DEBUG, "tk_component\n")); break;
-    case ::CORBA::tk_home: ACE_DEBUG ((LM_DEBUG, "tk_home\n")); break;
-    case ::CORBA::tk_event: ACE_DEBUG ((LM_DEBUG, "tk_event\n")); break;
-    default:
-      break;
-    };
-  }
-
-  // ComponentInterfaceDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentInterfaceDescription &cid)
-  {
-    Dump_Obj dump_obj("ComponentInterfaceDescription");
-    dump ("label", cid.label);
-    dump ("UUID", cid.UUID);
-    dump ("specificType", cid.specificType);
-    dump ("supportedType", cid.supportedType);
-    dump ("idlFile", cid.idlFile);
-    dump_sequence ("configProperty", cid.configProperty);
-    dump_sequence ("port", cid.port);
-    dump_sequence ("property", cid.property);
-    dump_sequence ("infoProperty", cid.infoProperty);
-  }
-
-  // Requirement
-
-  void DnC_Dump::dump (const ::Deployment::Requirement &req)
-  {
-    Dump_Obj dump_obj("Requirement");
-
-    dump ("resourceType", req.resourceType);
-    dump ("name", req.name);
-    dump_sequence ("property", req.property);
-  }
-
-  // MonolithicDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::MonolithicDeploymentDescription &mdd)
-  {
-    Dump_Obj dump_obj("MonolithicDeploymentDescription");
-
-    dump ("name", mdd.name);
-    dump ("source", mdd.source);
-#if (_MSC_VER > 1200)
-
-    dump_ref_seq<Deployment::DeploymentPlan> ("artifactRef", mdd.artifactRef,
-                                              "DeploymentPlan",
-                                              &DeploymentPlan::artifact);
-#endif /*_MSC_VER*/
-    dump_sequence ("execParameter", mdd.execParameter);
-    dump_sequence ("deployRequirement", mdd.deployRequirement);
-  }
-
-  // ResourceUsageKind
-
-  void DnC_Dump::dump(const Deployment::ResourceUsageKind &ruk)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%sresourceUsage: ", Dump_Obj::indent()));
-    switch (ruk) {
-    case None: ACE_DEBUG ((LM_DEBUG, "None\n")); break;
-    case InstanceUsesResource: ACE_DEBUG ((LM_DEBUG, "InstanceUsesResource\n")); break;
-    case ResourceUsesInstance: ACE_DEBUG ((LM_DEBUG, "ResourceUsesInstance\n")); break;
-    case PortUsesResource: ACE_DEBUG ((LM_DEBUG, "PortUsesResource\n")); break;
-    case ResourceUsesPort: ACE_DEBUG ((LM_DEBUG, "ResourceUsesPort\n")); break;
-    }
-  }
-
-  // InstanceResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::InstanceResourceDeploymentDescription &irdd)
-  {
-    Dump_Obj dump_obj("InstanceResourceDeploymentDescription");
-
-    dump (irdd.resourceUsage);
-    dump ("requirementName", irdd.requirementName);
-    dump ("resourceName", irdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (irdd.resourceValue);
-  }
-
-  // InstanceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::InstanceDeploymentDescription &idd)
-  {
-    Dump_Obj dump_obj("InstanceDeploymentDescription");
-
-    dump ("name", idd.name);
-    dump ("node", idd.node);
-    dump ("source", idd.source);
-
-#if (_MSC_VER > 1200)
-    dump_ref<Deployment::DeploymentPlan> ("implementationRef",
-                                          idd.implementationRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::implementation);
-#endif /*_MSC_VER*/
-    dump_sequence ("configProperty", idd.configProperty);
-    dump_sequence ("deployedResource", idd.deployedResource);
-    dump_sequence ("deployedSharedResource", idd.deployedSharedResource);
-  }
-
-  // ComponentExternalPortEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::ComponentExternalPortEndpoint &cepe)
-  {
-    Dump_Obj dump_obj("ComponentExternalPortEndpoint");
-
-    dump ("portName", cepe.portName);
-  }
-
-  // PlanSubcomponentPortEndpoint
-
-  void DnC_Dump::dump(const Deployment::PlanSubcomponentPortEndpoint &pspe)
-  {
-    Dump_Obj dump_obj("PlanSubcomponentPortEndpoint");
-
-    dump ("portName", pspe.portName);
-    dump ("provider", pspe.provider);
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (pspe.kind) {
-    case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
-    case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
-    case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
-    case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
-    case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
-    case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
-    }
-#if (_MSC_VER > 1200)
-    dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::instance);
-#endif /*_MSC_VER*/
-  }
-
-  // ExternalReferenceEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::ExternalReferenceEndpoint &ere)
-  {
-    Dump_Obj dump_obj("ExternalReferenceEndpoint");
-
-    dump ("location", ere.location);
-  }
-
-  // ConnectionResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ConnectionResourceDeploymentDescription &crdd)
-  {
-    Dump_Obj dump_obj("ConnectionResourceDeploymentDescription");
-
-    dump ("targetName", crdd.targetName);
-    dump ("requirementName", crdd.requirementName);
-    dump ("resourceName", crdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (crdd.resourceValue);
-  }
-
-  // PlanConnectionDescription
-
-  void DnC_Dump::dump(const Deployment::PlanConnectionDescription &pcd)
-  {
-    Dump_Obj dump_obj("PlanConnectionDescription");
-
-    dump ("name", pcd.name);
-    dump ("source", pcd.source);
-    dump_sequence ("deployRequirement", pcd.deployRequirement);
-    dump_sequence ("externalEndpoint", pcd.externalEndpoint);
-    dump_sequence ("internalEndpoint", pcd.internalEndpoint);
-    dump_sequence ("externalReference", pcd.externalReference);
-    dump_sequence ("deployedResource", pcd.deployedResource);
-  }
-
-  // PlanSubcomponentPropertyReference
-
-  void DnC_Dump::dump(const Deployment::PlanSubcomponentPropertyReference &pspr)
-  {
-    Dump_Obj dump_obj("PlanSubcomponentPropertyReference");
-
-    dump ("propertyName", pspr.propertyName);
-
-#if (_MSC_VER > 1200)
-    dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspr.instanceRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::instance);
-#endif /*_MSC_VER*/
-  }
-
-  // PlanPropertyMapping
-
-  void DnC_Dump::dump(const Deployment::PlanPropertyMapping &ppm)
-  {
-    Dump_Obj dump_obj("PlanPropertyMapping");
-
-    dump ("name", ppm.name);
-    dump ("source", ppm.source);
-    dump ("externalName", ppm.externalName);
-    dump_sequence ("delegatesTo", ppm.delegatesTo);
-  }
-
-  // ImplementationDependency
-
-  void DnC_Dump::dump(const Deployment::ImplementationDependency &id)
-  {
-    Dump_Obj dump_obj("ImplementationDependency");
-
-    dump ("requiredType", id.requiredType);
-  }
-
-  // ResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ResourceDeploymentDescription &rdd)
-  {
-    Dump_Obj dump_obj("ResourceDeploymentDescription");
-
-    dump ("requirementName", rdd.requirementName);
-    dump ("resourceName", rdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (rdd.resourceValue);
-  }
-
-  // ArtifactDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ArtifactDeploymentDescription &add)
-  {
-    Dump_Obj dump_obj("ArtifactDeploymentDescription");
-
-    dump ("name", add.name);
-    dump ("location", add.location);
-    dump ("node", add.node);
-    dump ("source", add.source);
-    dump_sequence ("execParameter", add.execParameter);
-    dump_sequence ("deployRequirement", add.deployRequirement);
-    dump_sequence ("deployedResource", add.deployedResource);
-  }
-
-  void DnC_Dump::dump(const Deployment::DeploymentPlan &plan)
-  {
-    CORBA::Any val;
-
-    val <<= plan;
-
-    Dump_Obj dump_obj("DeploymentPlan", val);
-
-    dump ("label", plan.label);
-    dump ("UUID", plan.UUID);
-    dump (plan.realizes);
-    dump_sequence ("implementation", plan.implementation);
-    dump_sequence ("instance", plan.instance);
-    dump_sequence ("connection", plan.connection);
-    dump_sequence ("externalProperty", plan.externalProperty);
-    dump_sequence ("dependsOn", plan.dependsOn);
-    dump_sequence ("artifact", plan.artifact);
-    dump_sequence ("infoProperty", plan.infoProperty);
-  }
-
-  // ComponentPackageReference
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPackageReference &cpr)
-  {
-    Dump_Obj dump_obj("ComponentPackageReference");
-
-    dump ("requiredUUID", cpr.requiredUUID);
-    dump ("requiredName", cpr.requiredName);
-    dump ("requiredType", cpr.requiredType);
-  }
-
-  // SubcomponentInstantiationDescription
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentInstantiationDescription &sid)
-  {
-    Dump_Obj dump_obj("SubcomponentInstantiationDescription");
-
-    dump ("name", sid.name);
-    dump_sequence ("package", sid.package);
-    dump_sequence ("configProperty", sid.configProperty);
-    dump_sequence ("selectRequirement", sid.selectRequirement);
-    dump_sequence ("reference", sid.reference);
-  }
-
-  // SubcomponentPortEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentPortEndpoint& spe)
-  {
-    Dump_Obj dump_obj("SubcomponentPortEndpoint");
-
-    dump ("portName", spe.portName);
-    int value = spe.instanceRef;
-    ::Deployment::ComponentAssemblyDescription *v;
-    const CORBA::Any &a =
-      Dump_Obj::desc ("ComponentAssemblyDescription");
-
-    a >>= v;
-
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                v->instance[value].name.in ()));
-  }
-
-  // AssemblyConnectionDescription
-
-  void DnC_Dump::dump (const ::Deployment::AssemblyConnectionDescription &acd)
-  {
-    Dump_Obj dump_obj("AssemblyConnectionDescription");
-
-    dump ("name", acd.name);
-    dump_sequence ("deployRequirement", acd.deployRequirement);
-    dump_sequence ("externalEndpoint", acd.externalEndpoint);
-    dump_sequence ("internalEndpoint", acd.internalEndpoint);
-    dump_sequence ("externalReference", acd.externalReference);
-  }
-
-  // SubcomponentPropertyReference
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentPropertyReference &spr)
-  {
-    Dump_Obj dump_obj("SubcomponentPropertyReference");
-
-    dump ("propertyName", spr.propertyName);
-    int value = spr.instanceRef;
-
-    ::Deployment::ComponentAssemblyDescription *v;
-
-    const CORBA::Any &a =
-      Dump_Obj::desc ("ComponentAssemblyDescription");
-
-    a >>= v;
-
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                v->instance[value].name.in ()));
-  }
-
-  void
-  DnC_Dump::dump (const ::Deployment::AssemblyPropertyMapping &apm)
-  {
-    Dump_Obj dump_obj("AssemblyPropertyMapping");
-
-    dump ("name", apm.name);
-    dump ("externalName", apm.externalName);
-    dump_sequence ("delegatesTo", apm.delegatesTo);
-  }
-
-  // ComponentAssemblyDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentAssemblyDescription& cad)
-  {
-    CORBA::Any a;
-    a <<= cad;
-
-    Dump_Obj dump_obj ("ComponentAssemblyDescription",
-                       a);
-
-    dump_sequence ("instance", cad.instance);
-    dump_sequence ("connection", cad.connection);
-    dump_sequence ("externalProperty", cad.externalProperty);
-  }
-
-  // ImplementationArtifactDescription
-
-  void DnC_Dump::dump (const ::Deployment::ImplementationArtifactDescription &iad)
-  {
-    Dump_Obj dump_obj("ImplementationArtifactDescription");
-
-    dump ("label", iad.label);
-    dump ("UUID", iad.UUID);
-    dump ("location", iad.location);
-    dump_sequence ("execParameter", iad.execParameter);
-    dump_sequence ("deployRequirement", iad.deployRequirement);
-    dump_sequence ("dependsOn", iad.dependsOn);
-    dump_sequence ("infoProperty", iad.infoProperty);
-  }
-
-  // NamedImplementationArtifact
-
-  void DnC_Dump::dump (const ::Deployment::NamedImplementationArtifact &nia)
-  {
-    Dump_Obj dump_obj("NamedImplementationArtifact");
-
-    dump ("name", nia.name);
-    dump (nia.referencedArtifact);
-  }
-
-  // ImplementationRequirement
-
-  void DnC_Dump::dump (const ::Deployment::ImplementationRequirement &ir)
-  {
-    Dump_Obj dump_obj("ImplementationRequirement");
-
-    dump_sequence ("resourceUsage", ir.resourceUsage);
-    dump ("resourcePort", ir.resourcePort);
-    dump ("componentPort", ir.componentPort);
-    dump ("resourceType", ir.resourceType);
-    dump ("name", ir.name);
-    dump_sequence ("property", ir.property);
-  }
-
-  // MonolithicImplementationDescription
-
-  void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription
-                         &mid)
-  {
-    Dump_Obj dump_obj("MonolithicImplementationDescription");
-
-    dump_sequence ("execParameter", mid.execParameter);
-    dump_sequence ("primaryArtifact", mid.primaryArtifact);
-    dump_sequence ("deployRequirement", mid.deployRequirement);
-  }
-
-  void
-  DnC_Dump::dump (const ::Deployment::Capability &capability)
-  {
-    Dump_Obj dump_obj("Capability");
-
-    dump ("name", capability.name);
-    DnC_Dump::dump ("resourceType", capability.resourceType);
-    dump_sequence ("property",
-                   capability.property);
-  }
-
-  // ComponentImplementationDescription
-
-  void DnC_Dump::dump (
-        const ::Deployment::ComponentImplementationDescription &cid)
-  {
-    Dump_Obj dump_obj("ComponentImplementationDescription");
-
-    dump ("label", cid.label);
-    dump ("UUID", cid.UUID);
-    ACE_DEBUG ((LM_DEBUG, "%sImplements:\n", Dump_Obj::indent()));
-    dump (cid.implements);
-    dump_sequence ("assemblyImpl", cid.assemblyImpl);
-    dump_sequence ("monolithicImpl", cid.monolithicImpl);
-    dump_sequence ("configProperty", cid.configProperty);
-    dump_sequence ("capability", cid.capability);
-    dump_sequence ("dependsOn", cid.dependsOn);
-    dump_sequence ("infoProperty", cid.infoProperty);
-  }
-
-  // PackagedComponentImplementation
-
-  void DnC_Dump::dump (const ::Deployment::PackagedComponentImplementation &pci)
-  {
-    Dump_Obj dump_obj("PackagedComponentImplementation");
-
-    dump ("Name", pci.name);
-    ACE_DEBUG ((LM_DEBUG,
-                "%sreferencedImplementation: \n", Dump_Obj::indent()));
-    DnC_Dump::dump (pci.referencedImplementation);
-  }
-
-  // ComponentPackageDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription
-                         &comppkgdesc)
-  {
-    Dump_Obj dump_obj("ComponentPackageDescription");
-
-    dump ("label", comppkgdesc.label);
-    dump ("UUID", comppkgdesc.UUID);
-    ACE_DEBUG ((LM_DEBUG, "%srealizes: \n", Dump_Obj::indent ()));
-    DnC_Dump::dump (comppkgdesc.realizes); // ComponentInterfaceDescription
-    dump_sequence ("configProperty", comppkgdesc.configProperty);
-    dump_sequence ("implementation", comppkgdesc.implementation);
-    dump_sequence ("infoProperty", comppkgdesc.infoProperty);
-  }
-
-  // PackageConfiguration
-
-  void DnC_Dump::dump (const ::Deployment::PackageConfiguration &pc)
-  {
-    Dump_Obj dump_obj("PackageConfiguration");
-
-    dump ("label", pc.label);
-    dump ("UUID", pc.UUID);
-    dump_sequence ("specializedConfig", pc.specializedConfig);
-    dump_sequence ("basePackage", pc.basePackage);
-    dump_sequence ("reference", pc.reference);
-    dump_sequence ("selectRequirement", pc.selectRequirement);
-    dump_sequence ("configProperty", pc.configProperty);
-  }
-
-  // Requirement Satisfier
-  void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs)
-  {
-    Dump_Obj dump_obj("RequirementSatisfier");
-
-    dump ("name", rs.name);
-    dump ("resourceType", rs.resourceType);
-    dump_sequence ("property", rs.property);
-  }
-
-  // Property
-  void DnC_Dump::dump (const Deployment::Property& property)
-  {
-    Dump_Obj dump_obj("Property");
-    dump ("name", property.name);
-    ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent()));
-    dump (property.value);
-  }
-
-  // CORBA::Any
-
-  void DnC_Dump::dump (const ::CORBA::Any &any)
-  {
-    ::CORBA::TypeCode * type = any.type ();
-    switch (type->kind ())
-      {
-      case CORBA::tk_short:
-        {
-          CORBA::Short temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\
-                                  encoded different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_null:
-        ACE_DEBUG ((LM_DEBUG, "%sAny value: null value encoded\n",
-                    Dump_Obj::indent ()));
-        break;
-
-      case CORBA::tk_void:
-        ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded \n"));
-        break;
-      case CORBA::tk_long:
-        {
-          CORBA::Long temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_ushort:
-        {
-          CORBA::UShort temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\
-                                   encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_ulong:
-        {
-          CORBA::ULong temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_float:
-        {
-          CORBA::Float temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_double:
-        {
-          CORBA::Double temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_boolean:
-        {
-          CORBA::Boolean temp;
-          if (! (any >>= CORBA::Any::to_boolean (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-
-          if (temp)
-            ACE_DEBUG ((LM_DEBUG, "Any value: True \n"));
-          else
-            ACE_DEBUG ((LM_DEBUG, "Any value: False \n"));
-        }
-        break;
-
-      case CORBA::tk_char:
-        {
-          CORBA::Char temp;
-          if (! (any >>= CORBA::Any::to_char (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_octet:
-        {
-          CORBA::Octet temp;
-          if (! (any >>= CORBA::Any::to_octet (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_string:
-        {
-          const char * temp = 0;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_longlong:
-        {
-          CORBA::LongLong temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_longdouble:
-        {
-          CORBA::LongDouble temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-
-        break;
-      case CORBA::tk_wchar:
-        {
-          CORBA::WChar temp;
-          if (! (any >>= CORBA::Any::to_wchar (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_wstring:
-        {
-          const CORBA::WChar * temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      default:
-        ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n"));
-        ACE_THROW (CORBA::INTERNAL ());
-      }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h
deleted file mode 100644
index 1c504e57133..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h
+++ /dev/null
@@ -1,153 +0,0 @@
-//==================================================================
-/**
- *  @file  DnC_Dump.h
- *
- *  $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef DNC_DUMP_H
-#define DNC_DUMP_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace Deployment
-{
-  /**
-   * @class DnC_Dump
-   *
-   * @brief This class defines a set of overloaded "dump" methods to print
-   * the contents of various IDL data types, which passed as input.
-   */
-  class Config_Handler_Export DnC_Dump
-  {
-  public:
-    /// Dump functions for CORBA sequences
-    static void dump (const char* caption,
-                      const ::CORBA::StringSeq &str_seq);
-
-    static void dump (const char* caption, const TAO_String_Manager& str);
-
-    static void dump (const char* caption, const CORBA::Boolean& val);
-
-    /// A whole slew of overloaded dump routines for different IDL
-    /// data types.
-
-    static void dump(const Deployment::SatisfierProperty &sp);
-
-    static void dump (const Deployment::SharedResource& sr);
-
-    static void dump (const Deployment::Node& node);
-
-    static void dump (const Deployment::Resource& resource);
-
-    static void dump (const Deployment::Interconnect& conn);
-
-    static void dump (const Deployment::Bridge& bridge);
-
-    static void dump (const ::Deployment::Property &property);
-
-    static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
-
-    static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
-
-    static void dump (const ::Deployment::ComponentPackageDescription
-                      &comppkgdesc);
-
-    static void dump (const ::Deployment::ComponentPortDescription
-                      &compportdesc);
-
-    static void dump (const ::Deployment::ComponentPropertyDescription
-                      &comppropdesc);
-
-    static void dump (const ::Deployment::MonolithicImplementationDescription
-                      &mid);
-
-    static void dump (const ::Deployment::PackageConfiguration &pc);
-
-    static void dump (const ::Deployment::PackagedComponentImplementation
-                      &pci);
-
-    static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
-
-    static void dump (const ::Deployment::Requirement &requirement);
-
-    static void dump (const ::Deployment::ComponentExternalPortEndpoint
-                      &cepe);
-
-    static void dump (const ::Deployment::ComponentPackageReference &cpr);
-
-    static void dump (const ::Deployment::ComponentImplementationDescription
-                             &cid);
-
-    static void dump (const ::Deployment::SubcomponentInstantiationDescription
-                             &sid);
-
-    static void dump (const ::Deployment::NamedImplementationArtifact
-                      &named_implementation);
-
-    static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
-
-    static void dump (const ::Deployment::SubcomponentPropertyReference
-                      &scpr);
-
-    static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
-
-    static void dump (const ::Deployment::Domain &domain);
-
-    static void dump (const ::Deployment::Capability &capability);
-
-    static void dump (const ::Deployment::ImplementationArtifactDescription
-                             &iad);
-
-    static void dump (const ::Deployment::ImplementationRequirement &ir);
-
-    static void dump(const Deployment::ResourceUsageKind &ruk);
-
-    static void dump(const Deployment::DeploymentPlan &plan);
-
-    static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
-
-    static void dump(const Deployment::InstanceDeploymentDescription &idd);
-
-    static void dump(const Deployment::PlanConnectionDescription &pcd);
-
-    static void dump(const Deployment::PlanPropertyMapping &ppm);
-
-    static void dump(const Deployment::ImplementationDependency &id);
-
-    static void dump(const Deployment::ArtifactDeploymentDescription &add);
-
-    static void dump(const Deployment::InstanceResourceDeploymentDescription
-                     &irdd);
-
-    static void dump(const PlanSubcomponentPortEndpoint &pspe);
-
-    static void dump(const ConnectionResourceDeploymentDescription &crdd);
-
-    static void dump(const PlanSubcomponentPropertyReference &pspr);
-
-    static void dump(const ResourceDeploymentDescription &rdd);
-
-    static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
-
-    static void dump (const Deployment::RequirementSatisfier& rs);
-
-  private:
-    static void dump (const ::CORBA::Any &any);
-    // Helper function to print an Any
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* DNC_DUMP_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp
deleted file mode 100644
index d02492c82e9..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-#ifndef DNC_DUMP_T_C
-#define DNC_DUMP_T_C
-#include "DnC_Dump_T.h"
-#include "Dump_Obj.h"
-
-ACE_RCSID (Config_Handlers,
-           DnC_Dump_T,
-           "$Id$")
-namespace Deployment
-{
-  namespace DnC_Dump_T
-  {
-    // Dumps a reference
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref (const char* caption, REFERENCE& ref,
-              const char* root, DATA_TYPE CLASS::*data)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                  Dump_Obj::indent(), caption));
-
-      const CORBA::Any &val = Dump_Obj::desc (root);
-
-      ROOT *t = 0;
-
-      val >>= t;
-
-      const ROOT &root_obj = *t;
-
-      int value = ref;
-      ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
-                  Dump_Obj::indent(), caption,
-                  (root_obj.*data)[value].name.in()));
-    }
-
-    // Dumps a reference sequence
-    template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref_seq (const char* caption, SEQUENCE& seq, 
-                  const char* root, DATA_TYPE CLASS::*data)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s%s:\n",
-                  Dump_Obj::indent(), caption));
-
-      CORBA::Any val;
-      val <<= root;
-
-      for (size_t i = 0; i < seq.length(); ++i)
-        {
-          const CORBA::Any &val = Dump_Obj::desc (root);
-
-          ROOT *t = 0;
-
-          val >>= t;
-
-          const ROOT &root_obj = *t;
-          int value = seq[i];
-          ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
-                      Dump_Obj::indent(), caption, i,
-                      (root_obj.*data)[value].name.in()));
-        }
-    }
-
-    // Dumps a sequence
-    template <typename SEQUENCE>
-    void
-    dump_sequence (const char* caption, const SEQUENCE &seq)
-    {
-      CORBA::ULong size = seq.length ();
-
-      if (size != 0)
-        {
-          Dump_Obj dump_obj(caption);
-
-          for (CORBA::ULong i = 0; i < size; ++i)
-            {
-              ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
-                          caption, i));
-              DnC_Dump::dump (seq[i]);
-            }
-        }
-    }
-  }
-}
-#endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.h
deleted file mode 100644
index 065c6275705..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//==================================================================
-/**
- *  @file  DnC_Dump_T.h
- *
- *  $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_DNC_DUMP_T_H
-#define CIAO_CONFIG_HANDLERS_DNC_DUMP_T_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-lite.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-  namespace DnC_Dump_T
-  {
-    template <typename SEQUENCE>
-    static void dump_sequence (const char* caption, const SEQUENCE &seq);
-
-    template <typename ROOT, typename SEQUENCE,
-              typename DATA_TYPE, typename CLASS>
-    static void dump_ref_seq (const char* caption, SEQUENCE& seq,
-                              const char* root, DATA_TYPE CLASS::*data);
-
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    static void dump_ref (const char* caption, REFERENCE& ref,
-                          const char* root, DATA_TYPE CLASS::*data);
-  }
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DnC_Dump_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DnC_Dump_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-#endif /*CIAO_CONFIG_HANDLERS_DNC_DUMP_T_H*/
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.cpp
deleted file mode 100644
index 5d6d1456e07..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Domain_Handler.h"
-#include "Property_Handler.h"
-#include "SP_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the Domain type and populate the IDL structure
-void Domain_Handler::process_domain (Deployment::Domain& domain)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-      if (node_name == XStr (ACE_TEXT ("Deployment:Domain")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (this->iter_, node_name, "UUID", domain.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (this->iter_, node_name, "label", domain.label));
-      else if
-        (process_sequence_local<Deployment::SharedResource>
-           (this->doc_, this->iter_, node,
-            node_name, "sharedResource", domain.sharedResource,
-            this, &Domain_Handler::process_sr));
-      else if
-        (process_sequence_local<Deployment::Node>
-           (this->doc_, this->iter_, node,
-            node_name, "node", domain.node,
-            this, &Domain_Handler::process_node));
-      else if
-        (process_sequence_local<Deployment::Interconnect>
-           (this->doc_, this->iter_, node,
-            node_name, "interconnect", domain.interconnect,
-            this, &Domain_Handler::process_interconnect));
-      else if
-        (process_sequence_local<Deployment::Bridge>
-           (this->doc_, this->iter_, node,
-            node_name, "bridge", domain.bridge,
-            this, &Domain_Handler::process_bridge));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", domain.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          // ??? How did we get here ???
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-
-  this->update_node_refs (domain);
-  this->update_ic_refs (domain);
-  this->update_bridge_refs (domain);
-  this->update_sr_refs (domain);
-
-  return;
-}
-
-void Domain_Handler::process_node (DOMNodeIterator* iter,
-                                   Deployment::Node& domain_node)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Node")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "name", domain_node.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "label", domain_node.label));
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_node.resource,
-            this, &Domain_Handler::process_resource));
-      else if
-        (process_reference_seq (node, node_name, "connection",
-                                domain_node.connectionRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_reference_seq (node, node_name, "sharedResource",
-                                domain_node.sharedResourceRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Domain_Handler::process_resource (DOMNodeIterator* iter,
-                                       Deployment::Resource& domain_resource)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Resource")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (iter, node_name, "name", domain_resource.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-           (iter, node_name, "resourceType", domain_resource.resourceType));
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "property", domain_resource.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          node = iter->previousNode ();
-          break;
-        }
-    }
-}
-
-void Domain_Handler::process_bridge (DOMNodeIterator* iter,
-                                     Deployment::Bridge& domain_bridge)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-          
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Bridge")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "name", domain_bridge.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "label", domain_bridge.label));
-      else if
-        (process_reference_seq (node, node_name, "connect",
-                                domain_bridge.connectRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_bridge.resource,
-            this, &Domain_Handler::process_resource));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-
-void Domain_Handler::process_interconnect (DOMNodeIterator* iter,
-                                           Deployment::Interconnect& domain_ic)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Interconnect")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", domain_ic.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "label", domain_ic.label));
-      else if
-        (process_reference_seq (node, node_name, "connect",
-                                domain_ic.connectRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_reference_seq (node, node_name, "connection",
-                                domain_ic.connectionRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_ic.resource,
-            this, &Domain_Handler::process_resource));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-
-void Domain_Handler::process_sr (DOMNodeIterator* iter,
-                                 Deployment::SharedResource& domain_sr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-          
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:SharedResource")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", domain_sr.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "resourceType", 
-               domain_sr.resourceType));
-      else if
-        (process_reference_seq (node, node_name, "node",
-                                domain_sr.nodeRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "property", domain_sr.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Domain_Handler::update_node_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.node.length (); ++x)
-    {
-      for (y = 0; y < domain.node[x].connectionRef.length (); ++y)
-        {
-          ref_value =  domain.node[x].connectionRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.node[x].connectionRef[y] = orig_value;
-                }
-            }
-        }
-
-      for (y = 0; y < domain.node[x].sharedResourceRef.length (); ++y)
-        {
-          ref_value = domain.node[x].sharedResourceRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.node[x].sharedResourceRef[y] = orig_value;
-                }
-            }
-        }
-
-    }
-}
-
-void Domain_Handler::update_ic_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.interconnect.length (); ++x)
-    {
-      for (y = 0; y < domain.interconnect[x].connectionRef.length (); ++y)
-        {
-          ref_value = domain.interconnect[x].connectionRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.interconnect[x].connectionRef[y] = orig_value;
-                }
-            }
-        }
-
-      for (y = 0; y < domain.interconnect[x].connectRef.length (); ++y)
-        {
-          ref_value = domain.interconnect[x].connectRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.interconnect[x].connectRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Domain_Handler::update_bridge_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.bridge.length (); ++x)
-    {
-      for (y = 0; y < domain.bridge[x].connectRef.length (); ++y)
-        {
-          ref_value = domain.bridge[x].connectRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.bridge[x].connectRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Domain_Handler::update_sr_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.sharedResource.length (); ++x)
-    {
-      for (y = 0; y < domain.sharedResource[x].nodeRef.length (); ++y)
-        {
-          ref_value = domain.sharedResource[x].nodeRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.sharedResource[x].nodeRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h
deleted file mode 100644
index 327bfe54bba..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h
+++ /dev/null
@@ -1,127 +0,0 @@
-//==================================================================
-/**
- *  @file  Domain_Handler.h
- *
- *  $Id$
- *
- *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef DOMAIN_HANDLER_H
-#define DOMAIN_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-#include "XercesString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Domain_Handler
- *
- * @brief Handler class for <Domain> type
- *
- * This class is within the Target Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export Domain_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  Domain_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  Domain_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  Domain_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the Domain type
-  void process_domain (Deployment::Domain& domain);
-
-  /// process the node attribute
-  void process_node (DOMNodeIterator* iter,
-                     Deployment::Node& domain_node);
-
-  /// process the node attribute
-  void process_bridge (DOMNodeIterator* iter,
-                       Deployment::Bridge& domain_bridge);
-
-  /// process the node attribute
-  void process_interconnect (DOMNodeIterator* iter,
-                             Deployment::Interconnect& domain_ic);
-
-  /// process the resource attribute
-  void process_resource (DOMNodeIterator* iter,
-                         Deployment::Resource& domain_resource);
-
-  /// process the node attribute
-  void process_sr (DOMNodeIterator* iter,
-                   Deployment::SharedResource& domain_sr);
-
-  /// update node refs
-  void update_node_refs (Deployment::Domain& domain);
-
-  /// update ic refs
-  void update_ic_refs (Deployment::Domain& domain);
-
-  /// update bridge refs
-  void update_bridge_refs (Deployment::Domain& domain);
-
-  /// update sr refs
-  void update_sr_refs (Deployment::Domain& domain);
-
-  /// process IDREFs
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* DOMAIN_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.cpp
deleted file mode 100644
index 18dde6aa39f..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-#include "Dump_Obj.h"
-
-ACE_RCSID (Config_Handlers,
-           Dump_Obj,
-           "$Id$")
-
-namespace Deployment
-{
-  // static member initialization
-  std::string Dump_Obj::indent_ = "-";
-  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-  Dump_Obj::Dump_Obj(const char* caption)
-    : desc_()
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-    indent_.append("  ");
-  }
-
-
-  Dump_Obj::Dump_Obj(const char* caption,
-                     CORBA::Any &val)
-    : desc_(caption)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                indent_.c_str(),
-                caption));
-
-    indent_.append("   ");
-
-    if (desc_map_.find (std::string (caption)) != desc_map_.end())
-      {
-        ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                      The item with name %s is already in \
-                      the node map.\n", caption));
-        throw Node_Exist();
-      }
-    else
-      {
-        desc_map_[std::string(caption)] = val;
-      }
-  }
-
-  Dump_Obj::~Dump_Obj()
-  {
-    indent_.erase(indent_.size() - 2, 2);
-    if (desc_.size() != 0)
-      {
-        if (desc_map_.find(desc_) != desc_map_.end())
-          {
-            desc_map_.erase(desc_map_.find(desc_));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                          The item with name %s is not in the node map.\n",
-                        desc_.c_str()));
-            throw Node_Not_Exist();
-          }
-      }
-  }
-
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.h
deleted file mode 100644
index a3667376589..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//==================================================================
-/**
- *  @file  Dump_Obj.h
- *
- *  $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CIAO_DUMP_OBJ_H
-#define CIAO_DUMP_OBJ_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include <string>
-#include <map>
-
-namespace Deployment
-{
-  /*
-   *  @brief class Dump_Obj handles the indentation and keeps a map of
-   * structures for reference look-up.
-   */
-  class Config_Handler_Export Dump_Obj
-  {
-  public:
-    /// Exception thrown when there is a node with the same name in the
-    /// map
-    class Node_Exist { };
-
-    /// Exception thrown when there is no node with the name given in
-    /// the map
-    class Node_Not_Exist { };
-
-    /// Constructors prints out the caption and increases indent
-    Dump_Obj (const char *caption);
-
-    /// Additionally insets <val> into the map
-    Dump_Obj (const char* caption,
-              CORBA::Any &val);
-
-    // Destructor
-    ~Dump_Obj (void);
-    // return the indent string
-    static const char* indent()
-    {
-      return indent_.c_str();
-    }
-
-    static CORBA::Any& desc(const char* caption)
-    {
-      return desc_map_[caption];
-    }
-
-  private:
-    // indent string
-    static std::string indent_;
-
-    // map for reference lookup
-    static std::map<std::string, CORBA::Any> desc_map_;
-
-    // descriptor - used by destructor for deleting the
-    // correct descriptor from the map
-    std::string desc_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*CIAO_DUMP_OBJ_H*/
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.cpp
deleted file mode 100644
index 9251ab3adb5..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//$Id$
-
-#include "ERE_Handler.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::ERE_Handler::
-process_ExternalReferenceEndpoint (DOMNodeIterator * iter,
-                                   Deployment::ExternalReferenceEndpoint &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("location")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers::ERE_Handler::process_ExternalRefEndPoint \
-                   element mismatch expected <location>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.location = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.h
deleted file mode 100644
index 272bd8ecc63..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-//==================================================================
-/**
- *  @file  ERE_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ERE_HANDLER_H
-#define ERE_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ERE_Handler
-     *
-     * @brief Handler class for <ExternalReferenceEndpoint> tag
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL type for this
-     * element is returned.
-     */
-
-    class Config_Handler_Export ERE_Handler
-    {
-    public:
-      static void  
-        process_ExternalReferenceEndpoint (DOMNodeIterator * iter,
-                                           Deployment::ExternalReferenceEndpoint &ret_struct);
-      // process <ExternalReferenceEndpoint> definitions in the descriptor
-      // files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ERE_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp
deleted file mode 100644
index e75292e2fcb..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//$Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "NIA_Handler.h"
-#include "IAD_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-#include <string>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void IAD_Handler::process_ImplementationArtifactDescription
-(::Deployment::ImplementationArtifactDescription &iad)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:ImplementationArtifactDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "label", iad.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "UUID", iad.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (this->iter_, node_name, "location", 
-               iad.location));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "execParameter", iad.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", iad.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if (iad.dependsOn.length () == 0)
-        ;
-      /*
-      else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
-                                 NIA_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", iad.dependsOn,
-            &NIA_Handler::process_NamedImplementationArtifact, this->id_map_));
-      */
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", iad.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.h
deleted file mode 100644
index 8cbfabd510e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//==================================================================
-/**
- *  @file  IAD_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef IAD_HANDLER_H
-#define IAD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class IAD_Handler
- *
- * @brief Handler class for <ImplementationArtifactDescription> tag
- *
- * This class defines handler methods to parse the
- * ImplementationArtifactDescription type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export IAD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  IAD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  IAD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  IAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package description
-  void process_ImplementationArtifactDescription
-    (::Deployment::ImplementationArtifactDescription &iad);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* IAD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.cpp
deleted file mode 100644
index 71f700f596e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//$Id$
-
-#include "ID_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::ID_Handler::
-process_ImplementationDependency (DOMNodeIterator * iter,
-                                  Deployment::ImplementationDependency &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("elementType")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers::ID_Handler::process_ImplDependency \
-                   element mismatch expected <elementType>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.requiredType = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.h
deleted file mode 100644
index c2142cfb706..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//==================================================================
-/**
- *  @file  ID_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ID_HANDLER_H
-#define ID_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ID_Handler
-     *
-     * @brief Handler class for <ImplementationDependency> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     * KNOWN ISSUE:
-     * The IDL mapping for this type defines a struct containing a
-     * string type. However, the schema defines an unbounded string.
-     * Currently, this Handler handles what the IDL requires as this is
-     * valid via the schema definition also.
-     *
-     */
-    class Config_Handler_Export ID_Handler
-    {
-    public:
-      static void
-        process_ImplementationDependency (DOMNodeIterator * iter,
-                                          Deployment::ImplementationDependency &ret_struct);
-      // process elements of type Implementation Dependency definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.cpp
deleted file mode 100644
index d4255b5555e..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//$Id$
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "IAD_Handler.h"
-#include "IR_Handler.h"
-#include "RUK_Handler.h"
-#include "Utils.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include "Property_Handler.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void IR_Handler::process_ImplementationRequirement
-(::Deployment::ImplementationRequirement &ir)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-        (ACE_TEXT ("Deployment:ImplementationRequirement")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "resourcePort", 
-              ir.resourcePort));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "componentPort", 
-               ir.componentPort));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "resourceType", 
-               ir.resourceType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", ir.name));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "Property", ir.property,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.h
deleted file mode 100644
index d7ff20f1c99..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//==================================================================
-/**
- *  @file  IR_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef IR_HANDLER_H
-#define IR_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "RUK_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class IR_Handler
- *
- * @brief Handler class for <ImplementationRequirement> type
- *
- * This class defines handler methods to parse Implementation
- * Requirement types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export IR_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  IR_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  IR_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  IR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_ImplementationRequirement (::Deployment::ImplementationRequirement &ir);
-
-protected:
-  /// Process the resourceUsage attribute
-  void process_resourceUsage (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the resourcePort attribute
-  void process_resourcePort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the componentPort attribute
-  void process_componentPort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /*
-   * Derived from Requirement
-   */
-
-  /// Process the label attribute
-  void process_name (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the label attribute
-  void process_resourceType (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* IR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.cpp
deleted file mode 100644
index bce6afd2e7a..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "NIA_Handler.h"
-#include "MID_Handler.h"
-#include "IR_Handler.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-void MID_Handler::process_MonolithicImplementationDescription
-              (::Deployment::MonolithicImplementationDescription &mid)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-               (ACE_TEXT ("Deployment:MonolithicImplementationDescription")))
-        {
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "execParameter", mid.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
-                                 NIA_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "primaryArtifact", mid.primaryArtifact,
-            &NIA_Handler::process_NamedImplementationArtifact, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ImplementationRequirement, 
-                                 IR_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "deployRequirement", mid.deployRequirement,
-            &IR_Handler::process_ImplementationRequirement, this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.h
deleted file mode 100644
index 4c99ef81621..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-
-#ifndef MID_HANDLER_H
-#define MID_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class MID_Handler
- *
- * @brief Handler class for <MonolithicImplementationDescription> type
- *
- * This class defines handler methods to parse Monolithic Implementation
- * Descroption types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export MID_Handler: public Basic_Handler
-{
-public:
-
-  MID_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  MID_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  MID_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  void process_MonolithicImplementationDescription (::Deployment::MonolithicImplementationDescription &mid);
-
-protected:
-  /// process exec parameter element
-  void process_exec_parameter_element (DOMNode* node,
-                                       DOMDocument* doc, DOMNodeIterator* iter,
-                                       Deployment::MonolithicImplementationDescription& mid);
-
-  /// process attributes for property element
-  void process_attributes_for_property (DOMNamedNodeMap* named_node_map,
-                                        DOMDocument* doc,
-                                        DOMNodeIterator* iter,
-                                        int value,
-                                        Deployment::Property& ccd_property);
-
-  /// process attributes for deploy requirement
-  void process_attributes_for_deploy_requirement (DOMNamedNodeMap* nm,
-                                                  DOMDocument* doc,
-                                                  DOMNodeIterator* iter,
-                                                  int value,
-                                                  Deployment::ImplementationRequirement& req);
-
-  /// process attributes for NIA
-  void process_attributes_for_nia (DOMNamedNodeMap* nm,
-                                   DOMDocument* doc,
-                                   DOMNodeIterator* iter,
-                                   int value,
-                                   Deployment::NamedImplementationArtifact& nia);
-
-  /// process IDREFS
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* MID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.cpp
deleted file mode 100644
index 11db8839207..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//$Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "IAD_Handler.h"
-#include "NIA_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void NIA_Handler::process_NamedImplementationArtifact
-(::Deployment::NamedImplementationArtifact &nia)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-               (ACE_TEXT ("Deployment:NamedImplementationArtifact")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (this->iter_, node_name, "name", nia.name));
-      else if
-        (process_element_remote<Deployment::ImplementationArtifactDescription,
-                                IAD_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "referencedArtifact", nia.referencedArtifact,
-            &IAD_Handler::process_ImplementationArtifactDescription, 
-            this->id_map_));
-      else
-       {
-         this->iter_->previousNode ();
-         return;
-       }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.h
deleted file mode 100644
index cc3b1fd2a11..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//==================================================================
-/**
- *  @file  NIA_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef NIA_HANDLER_H
-#define NIA_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class NIA_Handler
- *
- * @brief Handler class for <NamedImplementationArtifact> type
- *
- * This class defines handler methods to parse Named Implementation
- * Artifact types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export NIA_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  NIA_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  NIA_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  NIA_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_NamedImplementationArtifact (::Deployment::NamedImplementationArtifact &nia);
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* NIA_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.cpp
deleted file mode 100644
index e26a73dab27..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "CompImplDesc_Handler.h"
-#include "PCI_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void PCI_Handler::process_PackagedComponentImplementation
-                      (::Deployment::PackagedComponentImplementation &pci)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PackagedComponentImplementation")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", pci.name));
-      else if
-        (process_element_remote<Deployment::ComponentImplementationDescription,
-                                CompImplDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "referencedImplementation", 
-            pci.referencedImplementation,
-            &CompImplDesc_Handler::process_ComponentImplementationDescription, 
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.h
deleted file mode 100644
index 95cefcf5a90..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  PCI_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PCI_HANDLER_H
-#define PCI_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class PCI_Handler
- *
- * @brief Handler class for <PackagedComponentImplementation> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export PCI_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  PCI_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  PCI_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  PCI_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_PackagedComponentImplementation (::Deployment::PackagedComponentImplementation &pci);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PCI_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.cpp
deleted file mode 100644
index 25804bd71c3..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CPR_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "PC_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void PC_Handler::process_PackageConfiguration
-                    (::Deployment::PackageConfiguration &pc)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-                    (ACE_TEXT ("Deployment:PackageConfiguration")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string 
-                  (this->iter_, node_name, "label", pc.label))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string 
-                  (this->iter_, node_name, "UUID", pc.UUID))
-        {
-        }
-      else if (process_sequence_remote
-                 <Deployment::ComponentPackageDescription,
-                  CompPkgDesc_Handler>
-                     (this->doc_, this->iter_, node,
-                      node_name, "basePackage", pc.basePackage,
-                     &CompPkgDesc_Handler::process_ComponentPackageDescription,
-                      this->id_map_))
-        {
-        }
-      else if (process_sequence_remote
-                <Deployment::ComponentPackageReference, CPR_Handler>
-                   (this->doc_, this->iter_, node,
-                    node_name, "reference", pc.reference,
-                    &CPR_Handler::process_ComponentPackageReference,
-                    this->id_map_))
-        {
-        }
-      else if (process_sequence_common
-             <Deployment::Requirement>
-                (this->doc_, this->iter_, node,
-                 node_name, "selectRequirement", pc.selectRequirement,
-                 &Requirement_Handler::process_Requirement,this->id_map_))
-        {
-        }
-      else if (process_sequence_common<Deployment::Property>
-            (this->doc_, this->iter_, node,
-             node_name, "configProperty", pc.configProperty,
-             &Property_Handler::process_Property, this->id_map_))
-        {
-        }
-      else
-        {
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-    return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h
deleted file mode 100644
index 9dfa24dd354..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//==================================================================
-/**
- *  @file  PC_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PC_HANDLER_H
-#define PC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class PC_Handler
- *
- * @brief Handler class for <PackageConfiguration> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export PC_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  PC_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  PC_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  PC_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_PackageConfiguration (::Deployment::PackageConfiguration &pc);
-
-  /// Process the specializedConfig attribute
-  void process_specializedConfig
-  (const XMLCh* specializedConfig, ::Deployment::PackageConfiguration &pc);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PC_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.cpp
deleted file mode 100644
index 2b3e5bd3a28..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.cpp
+++ /dev/null
@@ -1,624 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Plan_Handler.h"
-#include "ID_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "Property_Handler.h"
-#include "SP_Handler.h"
-#include "Requirement_Handler.h"
-#include "Any_Handler.h"
-#include "RUK_Handler.h"
-#include "CEPE_Handler.h"
-#include "ERE_Handler.h"
-#include "CPK_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the DeploymentPlan type and populate the IDL structure
-void Plan_Handler::process_plan(Deployment::DeploymentPlan& plan)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:DeploymentPlan")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "label", plan.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "UUID", plan.UUID));
-      else if
-        (process_element<Deployment::ComponentInterfaceDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "realizes", plan.realizes,
-            this, &Plan_Handler::process_ccd,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::MonolithicDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "implementation", plan.implementation,
-            this, &Plan_Handler::process_mdd));
-      else if
-        (process_sequence_local<Deployment::InstanceDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "instance", plan.instance,
-            this, &Plan_Handler::process_idd));
-      else if
-        (process_sequence_local<Deployment::PlanConnectionDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "connection", plan.connection,
-            this, &Plan_Handler::process_pcd));
-      else if
-        (process_sequence_local<Deployment::PlanPropertyMapping>
-           (this->doc_, this->iter_, node,
-            node_name, "externalProperty", plan.externalProperty,
-            this, &Plan_Handler::process_ppm));
-      else if
-        (process_sequence_common<Deployment::ImplementationDependency>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", plan.dependsOn,
-            &ID_Handler::process_ImplementationDependency, this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ArtifactDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "artifact", plan.artifact,
-            this, &Plan_Handler::process_add));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", plan.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          // ??? How did we get here ???
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-
-  this->update_mdd_refs (plan);
-  this->update_idd_refs (plan);
-  this->update_pspe_refs (plan);
-  this->update_pspr_refs (plan);
-  return;
-}
-
-void Plan_Handler::process_rdd (DOMNodeIterator* iter,
-                                Deployment::
-                                ResourceDeploymentDescription& rdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                  (ACE_TEXT ("Deployment:ResourceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "requirementName", 
-               rdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "resourceName", rdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, rdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_irdd (DOMNodeIterator* iter,
-                                 Deployment::
-                                 InstanceResourceDeploymentDescription &irdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                (ACE_TEXT ("Deployment:InstanceResourceDeploymentDescription")))
-        {
-        }
-      else if (node_name == XStr ("resourceUsage"))
-        {
-          RUK_Handler::process_ResourceUsageKind (iter, irdd.resourceUsage);
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "requirementName", 
-             irdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "resourceName", irdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, irdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_add (DOMNodeIterator* iter,
-                                Deployment::ArtifactDeploymentDescription& add)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-          (ACE_TEXT ("Deployment:ArtifactDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (iter, node_name, "name", add.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-               (iter, node_name, "location", add.location));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (iter, node_name, "node", add.node));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-               (iter, node_name, "source", add.source));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "execParameter", add.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployRequirement", add.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", add.deployedResource,
-            this, &Plan_Handler::process_rdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_idd (DOMNodeIterator* iter,
-                                Deployment::InstanceDeploymentDescription& idd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                    (ACE_TEXT ("Deployment:InstanceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", idd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "node", idd.node));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", idd.source));
-      else if
-        (process_reference (node, node_name, "implementation",
-                            idd.implementationRef, 
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "configProperty", idd.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::
-                                InstanceResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", idd.deployedResource,
-            this, &Plan_Handler::process_irdd));
-      else if
-        (process_sequence_local<Deployment::
-                                InstanceResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedSharedResource", idd.deployedSharedResource,
-            this, &Plan_Handler::process_irdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_mdd (DOMNodeIterator* iter,
-                                Deployment::MonolithicDeploymentDescription&
-                                mdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                 (ACE_TEXT ("Deployment:MonolithicDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "name", mdd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-             (iter, node_name, "source", mdd.source));
-      else if
-        (process_reference_seq (node, node_name, "artifact",
-                                mdd.artifactRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "execParameter", mdd.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", mdd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_ccd (DOMNodeIterator* iter,
-                                Deployment::ComponentInterfaceDescription&
-                                cid)
-{
-  CompIntrDesc_Handler handler (iter, false);
-  handler.process_ComponentInterfaceDescription (cid);
-}
-
-void Plan_Handler::process_pspr (DOMNodeIterator* iter,
-                                 Deployment::PlanSubcomponentPropertyReference&                                  pspr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:PlanSubcomponentPropertyReference")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "propertyName", pspr.propertyName));
-      else if
-        (process_reference (node, node_name, "instance", pspr.instanceRef, 
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_pspe (DOMNodeIterator* iter,
-                                 Deployment::PlanSubcomponentPortEndpoint& pspe)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PlanSubcomponentPortEndpoint")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "portName", pspe.portName));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean 
-              (iter, node_name, "provider", pspe.provider));
-      else if (node_name == XStr (ACE_TEXT ("kind")))
-        {
-          CPK_Handler::process_CCMComponentPortKind (iter, pspe.kind);
-        }
-      else if
-        (process_reference (node, node_name, "instance",
-                            pspe.instanceRef,
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-    
-void Plan_Handler::process_ppm(DOMNodeIterator* iter,
-                               Deployment::PlanPropertyMapping& ppm)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PlanPropertyMapping")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", ppm.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", ppm.source));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "externalName", ppm.externalName));
-      else if
-        (process_sequence_local<Deployment::PlanSubcomponentPropertyReference>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "delegatesTo", ppm.delegatesTo,
-            this, &Plan_Handler::process_pspr));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_crdd (DOMNodeIterator* iter,
-                                 Deployment::
-                                 ConnectionResourceDeploymentDescription& crdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:ConnectionResourceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "targetName", crdd.targetName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "requirementName", 
-              crdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "resourceName", crdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, crdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_pcd (DOMNodeIterator* iter,
-                                Deployment::PlanConnectionDescription& pcd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:PlanConnectionDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", pcd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", pcd.source));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", pcd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ComponentExternalPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalEndpoint", pcd.externalEndpoint,
-            &CEPE_Handler::process_ComponentExternalPortEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::PlanSubcomponentPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "internalEndpoint", pcd.internalEndpoint,
-            this, &Plan_Handler::process_pspe));
-      else if
-        (process_sequence_common<Deployment::ExternalReferenceEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalReference", pcd.externalReference,
-            &ERE_Handler::process_ExternalReferenceEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::
-                                ConnectionResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", pcd.deployedResource,
-            this, &Plan_Handler::process_crdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::update_mdd_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.implementation.length (); ++x)
-    {
-      for (y = 0; y < plan.implementation[x].artifactRef.length (); ++y)
-        {
-          ref_value = plan.implementation[x].artifactRef[y];
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in ADD is %d \n", ref_value));
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.implementation[x].artifactRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_idd_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.instance.length (); ++x)
-    {
-      ref_value = plan.instance[x].implementationRef;
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in MDD is %d \n", ref_value));
-      if (idref_map_.find (ref_value, ref_name) == 0)
-        {
-          if (id_map_.find (ref_name, orig_value) == 0)
-            {
-              plan.instance[x].implementationRef = orig_value;
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_pspe_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.connection.length (); ++x)
-    {
-      for (y = 0; y < plan.connection[x].internalEndpoint.length (); ++y)
-        {
-          ref_value = plan.connection[x].internalEndpoint[y].
-            instanceRef;
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in IDD is %d \n", ref_value));
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.connection[x].internalEndpoint[y].
-                    instanceRef = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_pspr_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.externalProperty.length (); ++x)
-    {
-      for (y = 0; y < plan.externalProperty[x].delegatesTo.length (); ++y)
-        {
-          ref_value = plan.externalProperty[x].delegatesTo[y].
-            instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.externalProperty[x].delegatesTo[y].
-                    instanceRef = orig_value;
-                }
-            }
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h
deleted file mode 100644
index c4994e4255d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h
+++ /dev/null
@@ -1,251 +0,0 @@
-//==================================================================
-/**
- *  @file  Plan_Handler.h
- *
- *  $Id$
- *
- *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef PLAN_HANDLER_H
-#define PLAN_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Plan_Handler
- *
- * @brief Handler class for <DeploymentPlan> type
- *
- */
-
-class Config_Handler_Export Plan_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  Plan_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  Plan_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  Plan_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the plan type
-  void process_plan (Deployment::DeploymentPlan& plan);
-
-  /// process cid
-  void process_ccd (DOMNodeIterator* iter,
-                    Deployment::ComponentInterfaceDescription& cid);
-
-  /// process pspr
-  void process_pspr (DOMNodeIterator* iter,
-                     Deployment::PlanSubcomponentPropertyReference& pspr);
-
-  /// process pspe
-  void process_pspe (DOMNodeIterator* iter,
-                     Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process add
-  void process_add (DOMNodeIterator* iter,
-                    Deployment::ArtifactDeploymentDescription& add);
-
-  /// process con
-  void process_pcd (DOMNodeIterator* iter,
-                    Deployment::PlanConnectionDescription& con);
-
-  /// process external property
-  void process_ppm (DOMNodeIterator* iter,
-                    Deployment::PlanPropertyMapping& ppm);
-
-  /// process idd
-  void process_idd (DOMNodeIterator* iter,
-                    Deployment::InstanceDeploymentDescription& idd);
-
-  /// process mdd
-  void process_mdd (DOMNodeIterator* iter,
-                    Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process rdd
-  void process_rdd (DOMNodeIterator* iter,
-                    Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process crdd
-  void process_crdd (DOMNodeIterator* iter,
-                     Deployment::ConnectionResourceDeploymentDescription& crdd);
-  /// process irdd
-  void process_irdd (DOMNodeIterator* iter,
-                     Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the add name
-  void process_add_name (const XMLCh* name,
-                         Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the pspr property name
-  void process_pspr_prop_name (const XMLCh* name,
-                               Deployment::PlanSubcomponentPropertyReference& pspr);
-
-  /// process the pspe port name
-  void process_pspe_port_name (const XMLCh* name,
-                               Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process the pspe provider
-  void process_pspe_provider (const XMLCh* value,
-                              Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process the idd name
-  void process_idd_name (const XMLCh* name,
-                         Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the ppm  name
-  void process_ppm_name (const XMLCh* name,
-                         Deployment::PlanPropertyMapping& ppm);
-
-  /// process the ppm external name
-  void process_ppm_ext_name (const XMLCh* name,
-                             Deployment::PlanPropertyMapping& ppm);
-
-  /// process the idd node
-  void process_idd_node (const XMLCh* node,
-                         Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the idd source
-  void process_idd_source (const XMLCh* source,
-                           Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the add location
-  void process_add_location (const XMLCh* location,
-                             Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the add source
-  void process_add_source (const XMLCh* source,
-                           Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the add node
-  void process_add_node (const XMLCh* node,
-                         Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the mdd source
-  void process_mdd_source (const XMLCh* source,
-                           Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process the ppm source
-  void process_ppm_source (const XMLCh* source,
-                           Deployment::PlanPropertyMapping& ppm);
-
-  /// process the pcd source
-  void process_pcd_source (const XMLCh* source,
-                           Deployment::PlanConnectionDescription& pcd);
-
-  /// process the pcd name
-  void process_pcd_name (const XMLCh* name,
-                         Deployment::PlanConnectionDescription& pcd);
-
-  /// process the add node
-  void process_mdd_name (const XMLCh* name,
-                         Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process the rdd req name
-  void process_rdd_req_name (const XMLCh* name,
-                             Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process the rdd res name
-  void process_rdd_res_name (const XMLCh* name,
-                             Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process the irdd res name
-  void process_irdd_res_name (const XMLCh* name,
-                              Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the crdd res name
-  void process_crdd_res_name (const XMLCh* name,
-                              Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the crdd req name
-  void process_crdd_req_name (const XMLCh* name,
-                              Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the crdd target name
-  void process_crdd_target_name (const XMLCh* name,
-                                 Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the irdd req name
-  void process_irdd_req_name (const XMLCh* name,
-                              Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the irdd res usage
-  void process_irdd_res_usage (const XMLCh* name,
-                               Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process references
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-  /// update mdd refs
-  void update_mdd_refs (Deployment::DeploymentPlan& plan);
-
-  /// update idd refs
-  void update_idd_refs (Deployment::DeploymentPlan& plan);
-
-  /// update pspe refs
-  void update_pspe_refs (Deployment::DeploymentPlan& plan);
-
-  /// update pspr refs
-  void update_pspr_refs (Deployment::DeploymentPlan& plan);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PLAN_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.cpp
deleted file mode 100644
index 76f2681189d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Element.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#include "Process_Element.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/*
- *  Process references
- */
-
-void
-process_refs(DOMNode*& node,
-             CORBA::ULongSeq& seq,
-             int& index,
-             IDREF_MAP& idref_map)
-{
-  CORBA::ULong i (seq.length ());
-  seq.length (i + 1);
-  seq[i] = index;
-  if (node->hasAttributes())
-    {
-      DOMNamedNodeMap* named_node_map = node->getAttributes ();
-      //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map);
-
-      int length = named_node_map->getLength ();
-
-      for (int j = 0; j < length; j++)
-        {
-          DOMNode* attribute_node = named_node_map->item (j);
-          XStr strattrnodename (attribute_node->getNodeName ());
-          char* aceattrnodevalue_ch = XMLString::transcode
-            (attribute_node->getNodeValue ());
-          ACE_TString aceattrnodevalue = aceattrnodevalue_ch;
-          XMLString::release (&aceattrnodevalue_ch);
-          if (strattrnodename == XStr (ACE_TEXT ("xmi:idref")))
-            {
-              //index = index + 1;
-              idref_map.bind (index, aceattrnodevalue);
-            }
-        }
-    }
-}
-
-void
-process_ref(DOMNode*& node,
-            CORBA::ULong& ref,
-            int& index,
-            IDREF_MAP& idref_map)
-{
-  ref = index;
-  if (node->hasAttributes ())
-    {
-      DOMNamedNodeMap* named_node_map = node->getAttributes ();
-      //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map);
-
-      int length = named_node_map->getLength ();
-
-      for (int j = 0; j < length; j++)
-        {
-          DOMNode* attribute_node = named_node_map->item (j);
-          XStr strattrnodename (attribute_node->getNodeName ());
-          char* aceattrnodevalue_ch = XMLString::transcode
-            (attribute_node->getNodeValue ());
-          ACE_TString aceattrnodevalue = aceattrnodevalue_ch;
-          XMLString::release (&aceattrnodevalue_ch);
-          if (strattrnodename == XStr (ACE_TEXT ("xmi:idref")))
-            {
-              //index = index + 1;
-              idref_map.bind (index, aceattrnodevalue);
-            }
-        }
-    }
-}
-
-/*
- *  Process function for references
- */
-
-bool
-process_reference_seq (DOMNode* node,
-                      XStr& node_name, const char* name,
-                      CORBA::ULongSeq& seq,
-                      int& index,
-                      IDREF_MAP& idref_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-      process_refs (node, seq, index, idref_map);
-
-  return result;
-}
-
-// Process reference
-bool
-process_reference (DOMNode* node,
-                   XStr& node_name, const char* name,
-                   CORBA::ULong& ref,
-                   int& index,
-                   IDREF_MAP& idref_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    process_ref (node, ref, index, idref_map);
-
-  return result;
-}
-
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.h
deleted file mode 100644
index 42f37c4e319..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-
-//==================================================================
-/**
- *  @file Process_Element.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- *          Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PROCESS_ELEMENT_H
-#define PROCESS_ELEMENT_H
-
-#include "ciao/DeploymentC.h"
-#include "Config.h"
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-// ID map type definition
-typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER;
-typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP;
-
-template <typename DATA>
-class Process_Function 
-{
-public:
-  /// Destructor.
-  virtual ~Process_Function (void) {};
-
-  virtual void call (DOMDocument*, DOMNodeIterator*, DATA&) = 0;
-
-  void operator() (DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    call (doc, iter, data);
-  }
-};
-
-/*
- *  Wrapper class for the process member functions.
- */
-
-template <typename OBJ, typename DATA>
-class Process_Member_Function: public Process_Function<DATA> 
-{
-public:
-  typedef void (OBJ::*func_type) (DOMNodeIterator*, DATA&);
-  typedef DATA data_type;
-
-  Process_Member_Function(OBJ& obj, func_type f)
-    : obj_(&obj), f_(f)
-  {
-  }
-
-  Process_Member_Function(OBJ* obj, func_type f)
-    : obj_(obj), f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    obj_->set_doc (doc);
-    obj_->set_iter (iter);
-    (obj_->*f_) (iter, data);
-  }
-
-private:
-  OBJ* obj_;
-  func_type f_;
-};
-
-/*
- *  Wrapper class for the process member functions which does not have 
-    DOMNodeIterator parameter
- */
-
-template <typename OBJ, typename DATA>
-class Process_Member_Function_Remote: public Process_Function<DATA> 
-{
-public:
-  typedef void (OBJ::*func_type) (DATA&);
-  typedef DATA data_type;
-
-  Process_Member_Function_Remote(OBJ& obj, func_type f)
-    : obj_(&obj), f_(f)
-  {
-  }
-
-  Process_Member_Function_Remote(OBJ* obj, func_type f)
-    : obj_(obj), f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    obj_->set_iter(iter);
-    obj_->set_doc(doc);
-    (obj_->*f_) (data);
-  }
-
-private:
-  OBJ* obj_;
-  func_type f_;
-};
-
-/*
- *  Wrapper class for the static process member functions.
- */
-
-template <typename DATA>
-class Process_Static_Function: public Process_Function<DATA> 
-{
-public:
-  typedef void (*func_type) (DOMNodeIterator*, DATA&);
-  typedef DATA data_type;
-
-  Process_Static_Function(func_type f)
-    : f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument*, DOMNodeIterator* iter, DATA& data)
-  {
-    (*f_) (iter, data);
-  }
-
-private:
-  func_type f_;
-};
-
-// Processes reference sequences
-bool
-process_reference_seq (DOMNode* node,
-                       XStr& node_name, const char* name,
-                       CORBA::ULongSeq& seq,
-                       int& index,
-                       IDREF_MAP& idref_map);
-
-// Process reference
-bool
-process_reference (DOMNode* node,
-                   XStr& node_name, const char* name,
-                   CORBA::ULong& ref,
-                   int& index,
-                   IDREF_MAP& idref_map);
-
-END_DEPLOYMENT_NAMESPACE
-
-#include "Process_Element_T.h"
-
-#endif // PROCESS_ELEMENT_H
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.cpp
deleted file mode 100644
index 420f38ed884..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//=====================================================================
-/**
- *  @file Process_Element_T.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- *          Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#include "Process_Element_T.h"
-#include "Old_Config_Handlers/Config_Error_Handler.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-#include <iostream>
-#include <memory>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-class parser_error { };
-
-template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                       XStr& node_name, const char* name,
-                       SEQUENCE& seq, OBJECT* obj, FUNCTION func)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      Process_Member_Function<OBJECT, DATA>
-        pf(obj, func);
-      process_sequential_element (node, doc, iter, seq, &pf, obj->id_map());
-    }
-
-  return result;
-}
-
-template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode*
-node,
-                        XStr& node_name, const char* name,
-                        SEQUENCE& seq, FUNCTION func,
-                        REF_MAP& id_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      OBJECT obj (doc, iter, false);
-
-      Process_Member_Function_Remote<OBJECT, DATA>
-        pf(obj, func);
-      process_sequential_element (node, doc, iter, seq, &pf, id_map);
-    }
-
-  return result;
-}
-
-template<typename DATA, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_common(DOMDocument* doc, DOMNodeIterator* iter, DOMNode*
-node,
-                        XStr& node_name, const char* name,
-                        SEQUENCE& seq, FUNCTION func,
-                        REF_MAP& id_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      Process_Static_Function<DATA>
-        pf(func);
-      process_sequential_element (node, doc, iter, seq, &pf, id_map);
-    }
-
-  return result;
-}
-
-template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-bool
-process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                XStr& node_name, const char* name,
-                ELEMENT& elem, OBJECT* obj, FUNCTION func,
-                REF_MAP& id_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      if (node->hasAttributes ())
-        {
-          DOMNamedNodeMap* named_node_map = node->getAttributes ();
-          int length = named_node_map->getLength ();
-
-          Process_Member_Function<OBJECT, DATA>
-            pf(obj, func);
-
-          if (length == 1)
-              pf(doc, iter, elem);
-          else
-              process_element_attributes(named_node_map, doc, iter, 0, elem,
-&pf, id_map);
-        }
-    }
-
-  return result;
-}
-
-template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-bool
-process_element_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                       XStr& node_name, const char *name,
-                       ELEMENT& elem, FUNCTION func,
-                       REF_MAP& id_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      OBJECT obj (iter, false);
-
-      if (node->hasAttributes ())
-        {
-          DOMNamedNodeMap* named_node_map = node->getAttributes ();
-          int length = named_node_map->getLength ();
-
-          Process_Member_Function_Remote<OBJECT, DATA>
-            pf(&obj, func);
-
-          if (length == 1)
-              pf(doc, iter, elem);
-          else
-              process_element_attributes(named_node_map, doc, iter, 0, elem,
-&pf, id_map);
-        }
-    }
-
-  return result;
-}
-
-template <typename VALUE, typename DATA>
-void process_element_attributes(DOMNamedNodeMap* named_node_map,
-                                DOMDocument* doc,
-                                DOMNodeIterator* iter,
-                                VALUE value,
-                                DATA& data,
-                                Process_Function <DATA>* func,
-                                REF_MAP& id_map)
-{
-  char* final_url_ch;
-  try
-    {
-      // the number of attributes
-      int length = named_node_map->getLength();
-      // iterate the attributes
-      for (int j = 0; j < length; ++j)
-        {
-          DOMNode* attribute_node = named_node_map->item (j);
-          XStr strattrnodename (attribute_node->getNodeName ());
-          char* aceattrnodevalue_ch =
-            XMLString::transcode (attribute_node->getNodeValue ());
-          ACE_TString aceattrnodevalue = aceattrnodevalue_ch;
-          XMLString::release (&aceattrnodevalue_ch);
-
-          // if xmi::id is given process the element and bind the value
-          if (strattrnodename == XStr (ACE_TEXT ("xmi:id")))
-            {
-              (*func) (doc, iter, data);
-              id_map.bind (aceattrnodevalue, value);
-            }
-          // if href is given find out the referenced position
-          // and process the element
-          else if (strattrnodename == XStr (ACE_TEXT ("href")))
-            {
-              XMLURL xml_url (aceattrnodevalue.c_str ());
-              XMLURL result (aceattrnodevalue.c_str ());
-              std::string url_string = aceattrnodevalue.c_str ();
-              char* doc_path_ch =
-                XMLString::transcode ( doc->getDocumentURI ());
-              ACE_TString doc_path = doc_path_ch;
-              XMLString::release (&doc_path_ch);
-              XMLCh* rel_str =
-                (XMLString::transcode (doc_path.c_str ()));
-              result.makeRelativeTo
-                (rel_str);
-              final_url_ch =
-                XMLString::transcode (result.getURLText ());
-              ACE_TString final_url = final_url_ch;
-              XMLString::release (&final_url_ch);
-              XMLString::release (&rel_str);
-
-              DOMDocument* href_doc;
-
-              std::auto_ptr<DOMBuilder> parser (
-                      CIAO::Config_Handler::Utils::create_parser  ());
-
-              CIAO::Config_Handler::Config_Error_Handler handler;
-              parser->setErrorHandler(&handler);
-                      
-              if (xml_url.isRelative ())
-                {
-                  href_doc = parser->parseURI (final_url.c_str ());
-                  if (handler.getErrors ())
-                    {
-                      ACE_DEBUG ((LM_DEBUG, "XML descriptor error\n"));
-                      //throw parser_error ();
-                      throw DOMException ();
-                    }
-                }
-              else
-                {
-                  href_doc = parser->parseURI (url_string.c_str ());
-                  if (handler.getErrors ())
-                    {
-                      ACE_DEBUG ((LM_DEBUG, "XML descriptor error\n"));
-                      //throw parser_error ();
-                      throw DOMException ();
-                    }
-                }
-
-              DOMDocumentTraversal* traverse = href_doc;
-              DOMNode* root = (href_doc->getDocumentElement ());
-              unsigned long filter = DOMNodeFilter::SHOW_ELEMENT |
-                DOMNodeFilter::SHOW_TEXT;
-              DOMNodeIterator* href_iter = traverse->createNodeIterator
-                (root,
-                 filter,
-                 0,
-                 true);
-              href_iter->nextNode ();
-              (*func) (href_doc, href_iter, data);
-            }
-        }
-    }
-  catch (const DOMException& e)
-    {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
-
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
-                  \n",final_url_ch));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      ACE_ERROR ((LM_ERROR, "Caught DOM exception\n\n"));
-      return;
-    }
-  catch (...)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Caught unknown exception\n\n"));
-      return;
-    }
-}
-
-template <typename SEQUENCE, typename DATA>
-void
-process_sequential_element (DOMNode* node,
-                            DOMDocument* doc,
-                            DOMNodeIterator* iter,
-                            SEQUENCE& seq,
-                            Process_Function <DATA>* func,
-                            REF_MAP& id_map)
-{
-  if (node->hasAttributes ())
-    {
-      // the size of the sequence
-      CORBA::ULong i = seq.length ();
-
-      // add 1 to the size of the sequence
-      seq.length (i + 1);
-
-      // fetch attributes
-      DOMNamedNodeMap* named_node_map = node->getAttributes ();
-
-      // the number of attributes the element have
-      int length = named_node_map->getLength();
-      // if there is no other attribute but 'version'
-
-      if (length == 1) // call directly the static process_ method
-        (*func) (doc, iter, seq[i]);
-      else             // Check the xmi::id & href attributes
-        process_element_attributes(named_node_map, doc, iter, i, seq[i], func, id_map);
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.h
deleted file mode 100644
index 693f0338a47..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Element_T.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- *          Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PROCESS_ELEMENT_T_H
-#define PROCESS_ELEMENT_T_H
-
-#include "Process_Element.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-// processes sequence - not for common elements, process function is a 
-// member of "this" -
-template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_local(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                      XStr& node_name, const char* name,
-                      SEQUENCE& seq, OBJECT* obj, FUNCTION func);
-
-// processes sequence - not for common elements, process function is not a 
-// member of "this" -
-template<typename DATA, typename OBJECT, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                        XStr& node_name, const char* name,
-                        SEQUENCE& seq, FUNCTION func,
-                        REF_MAP& id_map);
-
-// Processes sequence - common elements -
-template<typename DATA, typename SEQUENCE, typename FUNCTION>
-bool
-process_sequence_common(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                        XStr& node_name, const char* name,
-                        SEQUENCE& seq, FUNCTION func,
-                        REF_MAP& id_map);
-
-//  Process function for non-sequential elements
-template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-bool
-process_element(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                XStr& node_name, const char* name,
-                ELEMENT& elem, OBJECT* obj, FUNCTION func,
-                REF_MAP& id_map);
-
-// Process function for non-sequential non-local elements
-template<typename DATA, typename OBJECT, typename ELEMENT, typename FUNCTION>
-bool
-process_element_remote(DOMDocument* doc, DOMNodeIterator* iter, DOMNode* node,
-                       XStr& node_name, const char* name,
-                       ELEMENT& elem, OBJECT* obj, FUNCTION func,
-                       REF_MAP& id_map);
-
-template <typename SEQUENCE, typename DATA>
-void
-process_sequential_element (DOMNode* node,
-                            DOMDocument* doc,
-                            DOMNodeIterator* iter,
-                            SEQUENCE& seq,
-                            Process_Function <DATA>* func,
-                            REF_MAP& id_map);
-
-template <typename VALUE, typename DATA>
-void process_element_attributes (DOMNamedNodeMap* named_node_map,
-                                 DOMDocument* doc, DOMNodeIterator* iter,
-                                 VALUE value, DATA& data,
-                                 Process_Function <DATA>* func,
-                                 REF_MAP& id_map);
-
-END_DEPLOYMENT_NAMESPACE
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Process_Element_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Process_Element_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif // PROCESS_ELEMENT_H
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.cpp
deleted file mode 100644
index 0260921be11..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//$Id$
-
-#include "Property_Handler.h"
-#include "Any_Handler.h"
-#include "Utils.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
-
-
-using CIAO::Config_Handler::Utils;
-using CIAO::Config_Handler::Any_Handler;
-
-void
-CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter,
-                                                          Deployment::Property &property)
-{
-  int valid_name = 0, valid_value = 0;
-  for (DOMNode * node = iter->nextNode (); node != 0; node = iter->nextNode ())
-    {
-      //Check if the Schema IDs for both the elements match
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("name")))
-        {
-          valid_name = 1;
-          property.name = Utils::parse_string (iter);
-        }
-      else if (name == XStr (ACE_TEXT ("value")))
-        {
-          valid_value = 1;
-          if (node->hasAttributes ())
-            {
-              xercesc::DOMNamedNodeMap * named_node_map =
-                node->getAttributes ();
-              int length = named_node_map->getLength ();
-              if (length > 1)
-                {
-                  for (int j = 0; j < length; j++)
-                    {
-                      DOMNode * attr_node = named_node_map->item (j);
-                      XStr attr_node_name = attr_node->getNodeName ();
-                      char*  attr_node_value_ch =
-                        XMLString::transcode (attr_node->getNodeValue ());
-                      ACE_TString attr_node_value = attr_node_value_ch;
-                      XMLString::release (&attr_node_value_ch);
-                      if (attr_node_name = XStr (ACE_TEXT ("href")))
-                        {
-                          XMLURL url (attr_node_value.c_str ());
-                          DOMNodeIterator * value_iter =
-                            Utils::parse_href_tag (url,
-                                                   node->getOwnerDocument ());
-                          // Get to the root-node
-                          value_iter->nextNode ();
-
-                          // Process the value node present there
-                          Any_Handler::process_Any (value_iter,
-                                                    property.value);
-                        }
-                    }
-                }
-              else if (length == 1)
-                Any_Handler::process_Any (iter, property.value);
-            }
-          else
-            // Process the value associated
-            Any_Handler::process_Any (iter, property.value);
-        }
-      else
-        {
-          if (! valid_name || ! valid_value)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::\
-                          process_Property element mismatch expected <name> \
-                          or <value>"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-
-          // Processed one element more go back one and exit
-          iter->previousNode ();
-          break;
-        }
-    }/* End Outer for */
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.h
deleted file mode 100644
index 1e392aea185..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//==================================================================
-/**
- *  @file  Property_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//===================================================================
-
-#ifndef PROPERTY_HANDLER_H
-#define PROPERTY_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Property_Handler
-     *
-     * @brief Handler class for <Property> type
-     *
-     * This class defines handler methods to parse Property
-     * types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Property_Handler
-    {
-    public:
-      static void process_Property (DOMNodeIterator * iter,
-                                    Deployment::Property &property);
-      // process elements of type Property definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* PROPERTY_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.cpp
deleted file mode 100644
index 0d385e759c1..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//$Id$
-
-#include "RS_Handler.h"
-#include "SP_Handler.h"
-#include "Utils.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
-
-
-void
-CIAO::Config_Handler::RS_Handler::
-process_RequirementSatisfier (DOMNodeIterator * iter,
-                              Deployment::RequirementSatisfier &ret_struct)
-{
-  // boolean to represent valid <RequirementSatisfier> definition
-  int valid_name = 0, valid_resourceType = 0, valid_property  = 0;
-
-  for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ())
-    {
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("name")))
-        {
-          ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter);
-          valid_name = 1;
-        }
-      else if (name == XStr (ACE_TEXT ("resourceType")))
-        {
-          valid_resourceType = 1;
-          // Requirement: Atleast one <resourceType> definition present
-          ::CORBA::StringSeq_var res_seq = 0;
-          ACE_NEW_THROW_EX (res_seq,
-                            ::CORBA::StringSeq (1),
-                            CORBA::NO_MEMORY ());
-          res_seq->length (0);
-
-          while (name == XStr (ACE_TEXT ("resourceType")))
-            {
-              ::CORBA::ULong index = res_seq->length ();
-              res_seq->length (res_seq->length () + 1);
-              res_seq [index] =
-                CIAO::Config_Handler::Utils::parse_string (iter);
-              name = node->getNodeName ();
-            }
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Assign this sequence to the Return Structure
-          ret_struct.resourceType = res_seq;
-        }
-
-      else if (name == XStr (ACE_TEXT ("property")))
-        {
-          valid_property = 1;
-          Deployment::SatisfierProperties_var property_seq = 0;
-          DOMNodeIterator * property_iter = 0;
-          ACE_NEW_THROW_EX (property_seq,
-                            Deployment::SatisfierProperties,
-                            CORBA::NO_MEMORY ());
-          property_seq->length (0);
-          while (name == XStr (ACE_TEXT ("property")))
-            {
-              // Check for <href> tags
-              if (node->hasAttributes ())
-                {
-                  xercesc::DOMNamedNodeMap * named_node_map =
-                    node->getAttributes ();
-                  int length = named_node_map->getLength ();
-                  if (length > 1)
-                    {
-                      for (int j = 0; j < length; j++)
-                        {
-                          DOMNode * attr_node = named_node_map->item (j);
-                          XStr attr_node_name = attr_node->getNodeName ();
-                          char*  attr_node_value_ch =
-                            XMLString::transcode (attr_node->getNodeValue ());
-                          ACE_TString attr_node_value = attr_node_value_ch;
-                          XMLString::release (&attr_node_value_ch);
-                          if (attr_node_name = XStr (ACE_TEXT ("href")))
-                            {
-                              XMLURL url (attr_node_value.c_str ());
-                              DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url,
-                                                       node->getOwnerDocument ());
-                              // Get to the root-node
-                              value_iter->nextNode ();
-
-                              // Process the property href tag
-                              property_iter = value_iter;
-                            }
-                        }
-                    }
-                }
-              else
-                property_iter = iter;
-
-              // Copy the property onto the sequence
-              ::CORBA::ULong index = property_seq->length ();
-              property_seq->length (property_seq->length () + 1);
-              CIAO::Config_Handler::SP_Handler::
-                process_SatisfierProperty (property_iter,
-                                           property_seq [index]);
-
-              // Get next node
-              iter->nextNode ();
-              name = node->getNodeName ();
-            }
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Copy the sequence to return structure
-          ret_struct.property = property_seq;
-        }
-      else
-        {
-          if (! valid_name || ! valid_resourceType || ! valid_property)
-            ACE_DEBUG ((LM_DEBUG, "Config_Handlers::RS_Handler::process_ \
-                        RequirementSatisfier element mismatch expected <name>,\
-                        <resourceType> <property>\n"));
-          // On exit go one step back as one might have processed the next
-          // valid tag
-          iter->previousNode ();
-
-          // Exit out of the for loop
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.h
deleted file mode 100644
index dff3a6e149d..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  RS_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef RS_HANDLER_H
-#define RS_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class RS_Handler
-     *
-     * @brief Handler class for <RequirementSatisfier> type
-     *
-     * This class defines handler methods to parse RequirementSatisfier
-     * types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export RS_Handler
-    {
-    public:
-      static void
-        process_RequirementSatisfier (DOMNodeIterator * iter,
-                                      Deployment::RequirementSatisfier &ret_struct);
-      // process elements of type RequirementSatisfier definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.cpp
deleted file mode 100644
index 08f390824dc..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//==================================================================
-/**
- *  @file  RUK_Handler.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-
-#include "IAD_Handler.h"
-#include "RUK_Handler.h"
-#include "Utils.h"
-
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /*
-     * Class ResourceUsageKind_Handler
-     */
-
-     void RUK_Handler::process_ResourceUsageKind
-        (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind)
-     {
-       // -- ResourceUsageKind enum
-       XStr none                    ("None");
-       XStr instance_uses_resource  ("InstanceUsesResource");
-       XStr resource_uses_instance  ("ResourceUsesInstance");
-       XStr port_uses_resource      ("PortUsesResource");
-       XStr resource_uses_port      ("ResourceUsesPort");
-       
-       XStr kind_str = XStr (Utils::parse_string (iter));
-       if (kind_str == none)
-	 kind = Deployment::None;
-       else if (kind_str = instance_uses_resource)
-	 kind = Deployment::InstanceUsesResource;
-       else if (kind_str == resource_uses_instance)
-	 kind = Deployment::ResourceUsesInstance;
-       else if (kind_str == port_uses_resource)
-	 kind = Deployment::PortUsesResource;
-       else if (kind_str == resource_uses_port)
-	 kind = Deployment::ResourceUsesPort;
-       
-       // Something wrong here.. Throw exception
-       ACE_DEBUG ((LM_DEBUG,
-		   "Config_Handler::RUK_Handler::process_ResourceUsageKind \
-                    illegal <ResourceUsageKind> value found \n"));
-       ACE_THROW (CORBA::INTERNAL ());
-     }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.h
deleted file mode 100644
index b988eead549..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//==================================================================
-/**
- *  @file  RUK_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef RUK_HANDLER_H
-#define RUK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-namespace CIAO 
-{
-  namespace Config_Handler
-  {
-
-    /**
-     * @class RUK_Handler
-     *
-     * @brief Handler class for <ResourceUsageKind> type
-     *
-     * This class defines handler methods to parse ResourceUsage
-     * Kind types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-
-    class Config_Handler_Export RUK_Handler {
-    public:
-
-      /// Process elements of type ResourceUsageKind definitions in
-      /// the description files.
-      static void
-	process_ResourceUsageKind (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind);
-    };
-    
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* RUK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.cpp
deleted file mode 100644
index 2b6eb94fb9c..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//$Id$
-
-#include "Requirement_Handler.h"
-#include "Property_Handler.h"
-#include "Utils.h"
-#include "tao/Exception.h"
-#include "ace/SString.h"
-
-
-using CIAO::Config_Handler::Property_Handler;
-
-void
-CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator * iter,
-                                                                Deployment::Requirement &ret_struct)
-{
-  int valid_resourceType = 0, valid_property = 0, valid_name = 0;
-  for (DOMNode * node = iter->nextNode ();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("resourceType")))
-        {
-          valid_resourceType = 1;
-          // Populate the structure
-          ret_struct.resourceType =
-            CIAO::Config_Handler::Utils::parse_string (iter);
-        }
-      else if (name == XStr (ACE_TEXT ("property")))
-        {
-          Deployment::Properties_var properties = 0;
-          ACE_NEW_THROW_EX (properties,
-                            Deployment::Properties,
-                            CORBA::NO_MEMORY ());
-          properties->length (0);
-
-          for (node = iter->nextNode ();
-               name == XStr (ACE_TEXT ("property"));
-               iter->nextNode ())
-            {
-              // Increment length of sequence
-              ::CORBA::ULong index = properties->length ();
-              properties->length (properties->length () + 1);
-              DOMNodeIterator * property_iter = 0;
-
-              // Check for <href> tags
-              if (node->hasAttributes ())
-                {
-                  xercesc::DOMNamedNodeMap * named_node_map =
-                    node->getAttributes ();
-                  int length = named_node_map->getLength ();
-
-                  if (length > 1)
-                    {
-                      for (int j = 0; j < length; j++)
-                        {
-                          DOMNode * attr_node = named_node_map->item (j);
-                          XStr attr_node_name = attr_node->getNodeName ();
-                          char*  attr_node_value_ch =
-                            XMLString::transcode (attr_node->getNodeValue ());
-                          ACE_TString attr_node_value = attr_node_value_ch;
-                          auto_ptr<char> cleanup_char (attr_node_value_ch);
-                          if (attr_node_name = XStr (ACE_TEXT ("href")))
-                            {
-                              XMLURL url (attr_node_value.c_str ());
-                              DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url,
-                                                       node->getOwnerDocument ());
-                              // Get to the root-node
-                              value_iter->nextNode ();
-
-                              // Process the property href tag
-                              property_iter = value_iter;
-                            }
-                        }
-                    }
-                  else
-                    property_iter = iter;
-
-                  // Deep copy the value
-                  CIAO::Config_Handler::Property_Handler::
-                    process_Property (property_iter, properties [index]);
-                }
-            }
-          valid_property = 1;
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Copy sequence on to return struct
-          ret_struct.property = properties;
-        }
-      else if (name == XStr (ACE_TEXT ("name")))
-        {
-          valid_name = 1;
-          ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter);
-        }
-      else
-        {
-          if (! valid_resourceType ||
-              ! valid_property     ||
-              ! valid_name)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Config_Handlers::Requirement_Handler::process_\
-                          Requirement element mismatch expected <resourceType>\
-                          , <property> or <name>"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          // On exit go one step back as we have read one too many
-          iter->previousNode ();
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.h
deleted file mode 100644
index c01ead11cab..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  Requirement_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef REQUIREMENT_HANDLER_H
-#define REQUIREMENT_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Requirement_Handler
-     *
-     * @brief Handler class for <ImplementationDependency> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Requirement_Handler
-    {
-    public:
-      static void
-        process_Requirement (DOMNodeIterator * iter,
-                             Deployment::Requirement &ret_struct);
-      // process elements of type Requirement in the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* REQUIREMENT_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.cpp
deleted file mode 100644
index e7731252994..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//$Id$
-
-#include "SPK_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::SPK_Handler::
-process_SatisfierPropertyKind (DOMNodeIterator * iter,
-                               Deployment::SatisfierPropertyKind &kind)
-{
-  // -- SatisfierPropertyKind enum
-  XStr quantity  ("Quantity");
-  XStr capacity  ("Capacity");
-  XStr minimum   ("Minimum");
-  XStr maximum   ("Maximum");
-  XStr attribute ("Attribute");
-  XStr selection ("Selection");
-
-  XStr kind_str = XStr (Utils::parse_string (iter));
-  if (kind_str == quantity)
-     kind = Deployment::Quantity;
-  else if (kind_str = capacity)
-     kind = Deployment::Capacity;
-  else if (kind_str == minimum)
-     kind = Deployment::Minimum;
-  else if (kind_str == maximum)
-     kind = Deployment::Maximum;
-  else if (kind_str == attribute)
-     kind = Deployment::Attribute;
-  else if (kind_str == selection)
-     kind = Deployment::Selection;
-
-  // Something wrong here.. Throw exception
-  ACE_DEBUG ((LM_DEBUG,
-              "Config_Handler::SPK_Handler::process_SPK \
-               illegal <SatisfierPropertyKind> value found \n"));
-  ACE_THROW (CORBA::INTERNAL ());
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.h
deleted file mode 100644
index 7a9caa3c2a0..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  SPK_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef SPK_HANDLER_H
-#define SPK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class SPK_Handler
-     *
-     * @brief Handler class for <SatisfierPropertyKind> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export SPK_Handler
-    {
-    public:
-      static void process_SatisfierPropertyKind (DOMNodeIterator * iter,
-                                                 Deployment::SatisfierPropertyKind &kind);
-      // process elements of type SatisfierPropertyKind definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* SPK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.cpp
deleted file mode 100644
index f741b93e701..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//$Id$
-
-#include "SP_Handler.h"
-#include "Any_Handler.h"
-#include "SPK_Handler.h"
-#include "Utils.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
-
-
-using CIAO::Config_Handler::Utils;
-using CIAO::Config_Handler::Any_Handler;
-
-void
-CIAO::Config_Handler::SP_Handler::
-process_SatisfierProperty (DOMNodeIterator * iter,
-                           Deployment::SatisfierProperty &property)
-{
-  for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ())
-    {
-      // Get name of the current element
-      XStr name (node->getNodeName ());
-
-      if (name == XStr (ACE_TEXT ("name")))
-        property.name = Utils::parse_string (iter);
-      else if (name == XStr (ACE_TEXT ("kind")))
-        SPK_Handler::process_SatisfierPropertyKind (iter, property.kind);
-      else if (name == XStr (ACE_TEXT ("value")))
-        {
-          // Check for <href> tags
-          if (node->hasAttributes ())
-            {
-              xercesc::DOMNamedNodeMap * named_node_map =
-                node->getAttributes ();
-              int length = named_node_map->getLength ();
-              if (length > 1)
-                {
-                  for (int j = 0; j < length; j++)
-                    {
-                      DOMNode * attr_node = named_node_map->item (j);
-                      XStr attr_node_name = attr_node->getNodeName ();
-                      char*  attr_node_value_ch =
-                        XMLString::transcode (attr_node->getNodeValue ());
-                      ACE_TString attr_node_value = attr_node_value_ch;
-                      XMLString::release (&attr_node_value_ch);
-                      if (attr_node_name = XStr (ACE_TEXT ("href")))
-                        {
-                          XMLURL url (attr_node_value.c_str ());
-                          DOMNodeIterator * value_iter =
-                            Utils::parse_href_tag (url,
-                                                   node->getOwnerDocument ());
-
-                          // Get to the root-node
-                          value_iter->nextNode ();
-
-                          // Process the property href tag
-                          Any_Handler::process_Any (value_iter,
-                                                    property.value);
-                        }
-                    }
-                }
-            }
-          else
-            // Populate value for the Property
-            Any_Handler::process_Any (iter, property.value);
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Config_Handlers::SP_Handler::process_ \
-                      RequirementSatisfier element mismatch expected <name> \
-                      or <PropertyKind> <Deployment:Any>"));
-
-          // Get the previous iterator
-          iter->previousNode ();
-
-          // Exit from the for loop
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.h
deleted file mode 100644
index a45dcf7d508..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//==================================================================
-/**
- *  @file  SP_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef SP_HANDLER_H
-#define SP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class SP_Handler
-     *
-     * @brief Handler class for <SatisfierProperty> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export SP_Handler
-    {
-    public:
-      static void process_SatisfierProperty (DOMNodeIterator * iter,
-                                             Deployment::SatisfierProperty &property);
-      // process elements of type SatisfierProperty definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.cpp
deleted file mode 100644
index d145106bae5..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CPR_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "TPD_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-ACE_TString TPD_Handler::process_TopLevelPackageDescription()
-{
-  for (DOMNode* node = this->iter_->nextNode ();
-       node != 0;
-       node = this->iter_->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr
-              (ACE_TEXT ("Deployment:TopLevelPackageDescription")))
-        {
-        }
-      else if (node_name == XStr(ACE_TEXT ("package")))
-        {
-          if (node->hasAttributes ())
-            {
-              DOMNamedNodeMap* named_node_map = node->getAttributes ();
-
-              // the number of attributes
-              int length = named_node_map->getLength();
-              // iterate the attributes
-              for (int j = 0; j < length; ++j)
-                {
-                  DOMNode* attribute_node = named_node_map->item (j);
-                  XStr strattrnodename (attribute_node->getNodeName ());
-
-                  char * temp =
-                    XMLString::transcode (attribute_node->getNodeValue ());
-                  ACE_TString aceattrnodevalue = temp;
-                  XMLString::release (&temp);
-
-                  // if href is given find out the referenced position
-                  // and process the element
-                  if (strattrnodename == XStr (ACE_TEXT ("href")))
-                    {
-                      XMLURL xml_url (aceattrnodevalue.c_str ());
-                      XMLURL result (aceattrnodevalue.c_str ());
-                      ACE_TString url_string = aceattrnodevalue.c_str ();
-
-                      char * temp =
-                        XMLString::transcode ( doc_->getDocumentURI ());
-                      ACE_TString doc_path = temp;
-                      XMLString::release (&temp);
-
-                      XMLCh * relative_path =
-                        XMLString::transcode (doc_path.c_str ());
-                      result.makeRelativeTo (relative_path);
-                      XMLString::release (&relative_path);
-
-                      temp = XMLString::transcode (result.getURLText ());
-                      ACE_TString final_url = temp;
-                      XMLString::release (&temp);
-
-                      if (xml_url.isRelative ())
-                        {
-                          return final_url;
-                        }
-                      else
-                        {
-                          return url_string;
-                        }
-                    }
-                }
-            }
-        }
-      else
-        {
-          break;
-        }
-    }
-  ACE_THROW (CORBA::INTERNAL());
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.h
deleted file mode 100644
index 20b7020bd58..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  TPD_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef TPD_HANDLER_H
-#define TPD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class TPD_Handler
- *
- * @brief Handler class for <TopLevelPackageConfiguration> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export TPD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  TPD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  TPD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  TPD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  ACE_TString process_TopLevelPackageDescription ();
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* TPD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.cpp
deleted file mode 100644
index 02068be58ad..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-//$Id$
-
-#include "Utils.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
-
-#include "XercesString.h"
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::XMLUni;
-using xercesc::DOMImplementation;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationLS;
-
-char *
-CIAO::Config_Handler::Utils::parse_string (DOMNodeIterator * iter)
-{
-  DOMNode * node = iter->nextNode();
-  DOMText* text = reinterpret_cast<DOMText*> (node);
-  return XMLString::transcode (text->getNodeValue ());
-}
-
-CORBA::Short
-CIAO::Config_Handler::Utils::parse_short (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::Short ret_val = ACE_OS::atoi (temp);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::ULong
-CIAO::Config_Handler::Utils::parse_ulong (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::ULong ret_val = ACE_OS::strtoul (temp, 0, 10);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Long
-CIAO::Config_Handler::Utils::parse_long (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::ULong ret_val = ACE_OS::strtol (temp, 0, 10);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Double
-CIAO::Config_Handler::Utils::parse_double (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::Double ret_val = ACE_OS::strtod (temp, 0);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Float
-CIAO::Config_Handler::Utils::parse_float (DOMNodeIterator * iter)
-{
-  return static_cast<CORBA::Float> (Utils::parse_double (iter));
-}
-
-CORBA::Boolean
-CIAO::Config_Handler::Utils::parse_bool (DOMNodeIterator * iter)
-{
-  XStr true_val ("true");
-  XStr true_cap_val ("TRUE");
-
-  DOMText * text = reinterpret_cast<DOMText *> (iter->nextNode ());
-  XStr value (text->getNodeValue ());
-
-  if (value == true_val || value == true_cap_val)
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Char
-CIAO::Config_Handler::Utils::parse_char (DOMNodeIterator * iter)
-{
-  DOMText * text = reinterpret_cast<DOMText *> (iter->nextNode ());
-  char * temp_string = XMLString::transcode (text->getNodeValue ());
-
-  // Should be non-null
-  ACE_ASSERT (temp_string != 0);
-
-  // Return the first character in the node as char value
-  char ret_char = temp_string [0];
-  XMLString::release (&temp_string);
-  return ret_char;
-}
-
-CORBA::Octet
-CIAO::Config_Handler::Utils::parse_octet (DOMNodeIterator * iter)
-{
-  return Utils::parse_char (iter);
-}
-
-bool
-CIAO::Config_Handler::Utils::process_string (DOMNodeIterator* iter,
-                const XStr& node_name, const char* name,
-                TAO_String_Manager& var)
-{
-  bool result = (node_name == XStr(ACE_TEXT (name)));
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode();
-      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue
-();
-      if (text)
-        var = XMLString::transcode (text);
-    }
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_string_seq (DOMNodeIterator* iter,
-                    const XStr& node_name, const char* name,
-                    CORBA::StringSeq& seq)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::ULong i (seq.length ());
-          seq.length (i + 1);
-          seq[i] = XMLString::transcode (text);
-        }
-    }
-
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_ulong (DOMNodeIterator* iter,
-               const XStr& node_name, const char* name,
-               CORBA::ULong& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = static_cast<CORBA::ULong> (ACE_OS::strtol (temp.in (),
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_boolean (DOMNodeIterator* iter,
-                 const XStr& node_name, const char* name,
-                 CORBA::Boolean& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = static_cast<CORBA::Boolean> (ACE_OS::strtol (temp.in (),
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
-
-DOMDocument*
-CIAO::Config_Handler::Utils::create_document (const char * url)
-{
-  xercesc::XMLPlatformUtils::Initialize();
-  static const XMLCh gLS[] = { xercesc::chLatin_L,
-                               xercesc::chLatin_S,
-                               xercesc::chNull };
-
-  DOMImplementation* impl
-    = DOMImplementationRegistry::getDOMImplementation(gLS);
-  //auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-  DOMBuilder* parser =
-    ((DOMImplementationLS*)impl)->
-    createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-  //auto_ptr<DOMBuilder> cleanup_parser (parser);
-
-  // Discard comment nodes in the document
-  parser->setFeature (XMLUni::fgDOMComments, false);
-
-  // Disable datatype normalization. The XML 1.0 attribute value
-  // normalization always occurs though.
-  parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-  // Do not create EntityReference nodes in the DOM tree. No
-  // EntityReference nodes will be created, only the nodes
-  // corresponding to their fully expanded sustitution text will be
-  // created.
-  parser->setFeature (XMLUni::fgDOMEntities, false);
-
-  // Perform Namespace processing.
-  parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-  // Perform Validation
-  parser->setFeature (XMLUni::fgDOMValidation, true);
-
-  // Do not include ignorable whitespace in the DOM tree.
-  parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-  // Enable the parser's schema support.
-  parser->setFeature (XMLUni::fgXercesSchema, true);
-
-  // Enable full schema constraint checking, including checking which
-  // may be time-consuming or memory intensive. Currently, particle
-  // unique attribution constraint checking and particle derivation
-  // restriction checking are controlled by this option.
-  parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-  // The parser will treat validation error as fatal and will exit.
-  parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-
-  DOMDocument* doc = parser->parseURI (url);
-  //auto_ptr<DOMDocument> cleanup_doc (doc);
-
-  return doc;
-}
-
-DOMBuilder*
-CIAO::Config_Handler::Utils::create_parser ()
-{
-  xercesc::XMLPlatformUtils::Initialize();
-  static const XMLCh gLS[] = { xercesc::chLatin_L,
-                               xercesc::chLatin_S,
-                               xercesc::chNull };
-
-  DOMImplementation* impl
-    = DOMImplementationRegistry::getDOMImplementation(gLS);
-  //auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-  DOMBuilder* parser =
-    ((DOMImplementationLS*)impl)->
-    createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-  //auto_ptr<DOMBuilder> cleanup_parser (parser);
-
-  // Discard comment nodes in the document
-  parser->setFeature (XMLUni::fgDOMComments, false);
-
-  // Disable datatype normalization. The XML 1.0 attribute value
-  // normalization always occurs though.
-  parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-  // Do not create EntityReference nodes in the DOM tree. No
-  // EntityReference nodes will be created, only the nodes
-  // corresponding to their fully expanded sustitution text will be
-  // created.
-  parser->setFeature (XMLUni::fgDOMEntities, false);
-
-  // Perform Namespace processing.
-  parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-  // Perform Validation
-  parser->setFeature (XMLUni::fgDOMValidation, true);
-
-  // Do not include ignorable whitespace in the DOM tree.
-  parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-  // Enable the parser's schema support.
-  parser->setFeature (XMLUni::fgXercesSchema, true);
-
-  // Enable full schema constraint checking, including checking which
-  // may be time-consuming or memory intensive. Currently, particle
-  // unique attribution constraint checking and particle derivation
-  // restriction checking are controlled by this option.
-  parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-  // The parser will treat validation error as fatal and will exit.
-  parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-
-  //DOMDocument* doc = parser->parseURI (url);
-  //auto_ptr<DOMDocument> cleanup_doc (doc);
-
-  return parser;
-}
-
-DOMNodeIterator *
-CIAO::Config_Handler::Utils::parse_href_tag (XMLURL url, DOMDocument * doc)
-{
-  char * document_path = 0;
-  if (url.isRelative ())
-  {
-    char * doc_path = XMLString::transcode (doc->getDocumentURI ());
-    XMLCh * temp = XMLString::transcode (doc_path);
-    url.makeRelativeTo (temp);
-    document_path = XMLString::transcode (url.getURLText ());
-
-    // Release allocated memory
-    XMLString::release (&doc_path);
-    XMLString::release (&temp);
-  }
-  else
-  {
-    document_path = XMLString::transcode (url.getURLText ());
-
-  }
-
-  DOMDocument* href_doc =
-    CIAO::Config_Handler::Utils::create_document (document_path);
-  //auto_ptr<DOMDocument> cleanup_doc (href_doc);
-
-  DOMDocumentTraversal* traverse = href_doc;
-  DOMNode* root = (href_doc->getDocumentElement ());
-  unsigned long filter = DOMNodeFilter::SHOW_ELEMENT |
-                         DOMNodeFilter::SHOW_TEXT;
-
-  // release allocated memory
-  XMLString::release (&document_path);
-
-  return traverse->createNodeIterator (root,
-                                       filter,
-                                       0,
-                                       true);
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.h
deleted file mode 100644
index fd77fa947c9..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//====================================================================
-/**
- *  @file  Utils.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- *  @author Tao Lu <lu@dre.vanderbilt.edu>,
- *  @author Boris <boris@dre.vanderbilt.edu>
- *
- */
-//=====================================================================
-
-#ifndef UTILS_H
-#define UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "Config_Handler_export.h"
-#include "ciao/DeploymentC.h"
-
-#include "tao/Basic_Types.h"
-#include "XercesString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-
-using xercesc::XMLURL;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMText;
-using xercesc::DOMBuilder;
-using xercesc::XMLString;
-using xercesc::DOMDocument;
-using Config_Handler::XStr;
-
-namespace CIAO {
-
-  namespace Config_Handler
-  {
-
-    /**
-     * @class Utils
-     *
-     * @brief Utility class for parsing basic types such as string float
-     * double etc.
-     *
-     * Helper methods for each type are defined as parse_<type> where type
-     * equals string, float, double etc. The corresponding C++ types are
-     * returned. These follow the IDL to C++ mapping defined by the CORBA
-     * specification.
-     *
-     */
-
-    class Config_Handler_Export Utils
-    {
-    public:
-      static char * parse_string (DOMNodeIterator * iter);
-      // Parse string type
-
-      static CORBA::ULong parse_ulong (DOMNodeIterator * iter);
-      // Parse ulong type
-
-      static CORBA::Long parse_long (DOMNodeIterator * iter);
-      // Parse long type
-
-      static CORBA::Short parse_short (DOMNodeIterator * iter);
-      // Parse short type
-
-      static CORBA::Float parse_float (DOMNodeIterator * iter);
-      // Parse float type
-
-      static CORBA::Double parse_double (DOMNodeIterator * iter);
-      // Parse double type
-
-      static CORBA::Boolean parse_bool (DOMNodeIterator * iter);
-      // Parse bool type
-
-      static CORBA::Char parse_char (DOMNodeIterator * iter);
-      // Parse char type
-
-      static CORBA::Octet parse_octet (DOMNodeIterator * iter);
-      // Parse octect type
-
-      static DOMDocument* create_document (const char * url);
-      // Create a document from the URL
-
-      static DOMBuilder* create_parser ();
-      // Create a parser from the URL
-
-      static bool process_string (DOMNodeIterator* iter, const XStr& node_name,
-                                  const char* name, TAO_String_Manager& var);
-      // process strings
-
-      static bool process_string_seq (DOMNodeIterator* iter,
-                                      const XStr& node_name,
-                                      const char* name, CORBA::StringSeq& seq);
-      // process string sequence
-
-      static bool process_boolean (DOMNodeIterator* iter,
-                                   const XStr& node_name,
-                                   const char* name, CORBA::Boolean& var);
-      // process strings
-
-      static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name,
-                                 const char* name, CORBA::ULong& var);
-      // process ulong
-
-
-      static DOMNodeIterator * parse_href_tag (XMLURL xml_url,
-                                               DOMDocument * doc);
-      // Process the <href = "URL"> and return an iterator to the
-      // new document
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* UTILS_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.cpp
deleted file mode 100644
index 877f9639d51..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include <ostream>
-
-#include "XercesString.h"
-using xercesc::XMLString;
-
-namespace Config_Handler
-{
-
-  XStr::XStr (const char* str)
-    : _wstr(0)
-  {
-    _wstr = XMLString::transcode(str);
-  }
-
-  XStr::XStr (XMLCh *wstr)
-    : _wstr(wstr)
-  {
-
-  }
-
-  XStr::XStr (const XMLCh* wstr)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(wstr);
-  }
-
-  XStr::XStr (const XStr &right)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(right._wstr);
-  }
-
-  XStr& XStr::operator= (const XStr& rhs)
-  {
-    if (&rhs == this)
-      return *this;
-    XStr temp (rhs);
-    ACE_Swap<XMLCh*>::swap (this->_wstr, temp._wstr);
-    return *this;
-  }
-
-  XStr::~XStr ()
-  {
-    if (_wstr)
-      XMLString::release(&_wstr);
-  }
-
-  const XMLCh* XStr::begin () const
-  {
-    return _wstr;
-  }
-
-  const XMLCh* XStr::end () const
-  {
-    return _wstr + size();
-  }
-
-  bool XStr::append(const XMLCh *tail)
-  {
-    int iTailLen = XMLString::stringLen(tail);
-    int iWorkLen = XMLString::stringLen(_wstr);
-    XMLCh *result = new XMLCh[ iWorkLen + iTailLen + 1 ];
-    bool bOK = result != 0;
-    if (bOK)
-      {
-        XMLCh *target = result;
-        XMLString::moveChars(target, _wstr, iWorkLen);
-        target += iWorkLen;
-        XMLString::moveChars(target, tail, iTailLen);
-        target += iTailLen;
-        *target++ = 0;
-        XMLString::release(&_wstr);
-        _wstr = result;
-      }
-    return bOK;
-  }
-
-  bool XStr::erase(const XMLCh *head, const XMLCh *tail)
-  {
-    bool bOK = head <= tail && head >= begin() && tail <= end();
-    if (bOK)
-      {
-        XMLCh *result = new XMLCh[ size() - (tail - head) + 1 ];
-        XMLCh *target = result;
-        bOK = target != NULL;
-        if (bOK)
-          {
-            const XMLCh *cursor = begin();
-
-            while (cursor != head) *target++ = *cursor++;
-            cursor = tail;
-            while ( cursor != end() ) *target++ = *cursor++;
-            *target ++ = 0;
-            XMLString::release(&_wstr);
-            _wstr = result;
-          }
-      }
-    return bOK;
-  }
-
-  int XStr::size () const
-  {
-    return XMLString::stringLen(_wstr);
-  }
-
-  XMLCh XStr::operator [] (const int i)
-  {
-    return _wstr[i];
-  }
-
-  const XMLCh XStr::operator [] (const int i) const
-  {
-    return _wstr[i];
-  }
-
-  bool operator== (const XStr& lhs, const XStr& rhs)
-  {
-    return XMLString::compareIString (lhs,rhs) == 0;
-  }
-
-  bool operator!= (const XStr& lhs, const XStr& rhs)
-  {
-    return !operator==(lhs, rhs);
-  }
-
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str)
-  {
-    char* s = XMLString::transcode (str);
-
-    o << s;
-
-    XMLString::release (&s); // idiots?
-    return o;
-  }
-
-}
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.h
deleted file mode 100644
index 7ac692d34de..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#ifndef _XERCESSTRING_H
-#define _XERCESSTRING_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Swap.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <iosfwd>
-
-#include <xercesc/util/XMLString.hpp>
-
-// Utility class that provides a std::string like facade to XMLString.
-// Doesn't implement all of the methods of std::string.
-
-namespace Config_Handler
-{
-
-  class XStr
-  {
-  public:
-    XStr() : _wstr(0L) { };
-
-    XStr (const char* str);
-
-    XStr (XMLCh* wstr);
-
-    XStr (const XMLCh* wstr);
-
-    XStr (const XStr& copy);
-
-    XStr& operator= (const XStr& rhs);
-
-    ~XStr();
-
-    const XMLCh* begin() const;
-
-    const XMLCh* end() const;
-
-    bool append(const XMLCh* tail);
-
-    bool erase (const XMLCh* head, const XMLCh* tail);
-
-    int size() const;
-
-    XMLCh operator [] (const int i);
-
-    const XMLCh operator [] (const int i) const;
-
-    operator const XMLCh* () const { return _wstr; };
-
-  private:
-
-    XMLCh* _wstr; // Internal representation
-
-  };
-
-  bool operator== (const XStr& lhs, const XStr& rhs);
-  bool operator!= (const XStr& lhs, const XStr& rhs);
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str);
-  
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* _XERCESSTRING_H */
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.cpp
deleted file mode 100644
index 2721776e2fd..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-// $Id$
-#include "ccd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // ComponentInterfaceDescription
-    // 
-
-    ComponentInterfaceDescription::
-    ComponentInterfaceDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    ComponentInterfaceDescription::
-    ComponentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
-    specificType_ (s.specificType_.get () ? new ::XMLSchema::string< char > (*s.specificType_) : 0),
-    supportedType_ (s.supportedType_.get () ? new ::XMLSchema::string< char > (*s.supportedType_) : 0),
-    idlFile_ (s.idlFile_.get () ? new ::XMLSchema::string< char > (*s.idlFile_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    property_ (s.property_.get () ? new ::CIAO::Config_Handlers::ComponentPropertyDescription (*s.property_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (specificType_.get ()) specificType_->container (this);
-      if (supportedType_.get ()) supportedType_->container (this);
-      if (idlFile_.get ()) idlFile_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      port_.reserve (s.port_.size ());
-      {
-        for (port_const_iterator i (s.port_.begin ());
-        i != s.port_.end ();
-        ++i) add_port (*i);
-      }
-
-      if (property_.get ()) property_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentInterfaceDescription::
-    operator= (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.specificType_.get ()) specificType (*(s.specificType_));
-      else specificType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.supportedType_.get ()) supportedType (*(s.supportedType_));
-      else supportedType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.idlFile_.get ()) idlFile (*(s.idlFile_));
-      else idlFile_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      port_.clear ();
-      port_.reserve (s.port_.size ());
-      {
-        for (port_const_iterator i (s.port_.begin ());
-        i != s.port_.end ();
-        ++i) add_port (*i);
-      }
-
-      if (s.property_.get ()) property (*(s.property_));
-      else property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPropertyDescription > (0);
-
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      return *this;
-    }
-
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    label ()
-    {
-      return *label_;
-    }
-
-    void ComponentInterfaceDescription::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void ComponentInterfaceDescription::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    specificType_p () const
-    {
-      return specificType_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    specificType () const
-    {
-      return *specificType_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    specificType ()
-    {
-      return *specificType_;
-    }
-
-    void ComponentInterfaceDescription::
-    specificType (::XMLSchema::string< char > const& e)
-    {
-      if (specificType_.get ())
-      {
-        *specificType_ = e;
-      }
-
-      else
-      {
-        specificType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        specificType_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    supportedType_p () const
-    {
-      return supportedType_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    supportedType () const
-    {
-      return *supportedType_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    supportedType ()
-    {
-      return *supportedType_;
-    }
-
-    void ComponentInterfaceDescription::
-    supportedType (::XMLSchema::string< char > const& e)
-    {
-      if (supportedType_.get ())
-      {
-        *supportedType_ = e;
-      }
-
-      else
-      {
-        supportedType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        supportedType_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    idlFile_p () const
-    {
-      return idlFile_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    idlFile () const
-    {
-      return *idlFile_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    idlFile ()
-    {
-      return *idlFile_;
-    }
-
-    void ComponentInterfaceDescription::
-    idlFile (::XMLSchema::string< char > const& e)
-    {
-      if (idlFile_.get ())
-      {
-        *idlFile_ = e;
-      }
-
-      else
-      {
-        idlFile_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        idlFile_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentInterfaceDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentInterfaceDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void ComponentInterfaceDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    ComponentInterfaceDescription::port_iterator ComponentInterfaceDescription::
-    begin_port ()
-    {
-      return port_.begin ();
-    }
-
-    ComponentInterfaceDescription::port_iterator ComponentInterfaceDescription::
-    end_port ()
-    {
-      return port_.end ();
-    }
-
-    ComponentInterfaceDescription::port_const_iterator ComponentInterfaceDescription::
-    begin_port () const
-    {
-      return port_.begin ();
-    }
-
-    ComponentInterfaceDescription::port_const_iterator ComponentInterfaceDescription::
-    end_port () const
-    {
-      return port_.end ();
-    }
-
-    void ComponentInterfaceDescription::
-    add_port (::CIAO::Config_Handlers::ComponentPortDescription const& e)
-    {
-      if (port_.capacity () < port_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription > v;
-        v.reserve (port_.size () + 1);
-
-        while (port_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ComponentPortDescription& t = port_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          port_.pop_back ();
-        }
-
-        port_.swap (v);
-      }
-
-      port_.push_back (e);
-      port_.back ().container (this);
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    property_p () const
-    {
-      return property_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPropertyDescription const& ComponentInterfaceDescription::
-    property () const
-    {
-      return *property_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentInterfaceDescription::
-    property ()
-    {
-      return *property_;
-    }
-
-    void ComponentInterfaceDescription::
-    property (::CIAO::Config_Handlers::ComponentPropertyDescription const& e)
-    {
-      if (property_.get ())
-      {
-        *property_ = e;
-      }
-
-      else
-      {
-        property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPropertyDescription > (new ::CIAO::Config_Handlers::ComponentPropertyDescription (e));
-        property_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentInterfaceDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentInterfaceDescription::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
-
-    void ComponentInterfaceDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
-
-    // ComponentInterfaceDescription
-    // 
-    bool ComponentInterfaceDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentInterfaceDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< char >& ComponentInterfaceDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
-
-    void ComponentInterfaceDescription::
-    contentLocation (::XMLSchema::string< char > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        contentLocation_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // ComponentInterfaceDescription
-    //
-
-    ComponentInterfaceDescription::
-    ComponentInterfaceDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          UUID (t);
-        }
-
-        else if (n == "specificType")
-        {
-          ::XMLSchema::string< char > t (e);
-          specificType (t);
-        }
-
-        else if (n == "supportedType")
-        {
-          ::XMLSchema::string< char > t (e);
-          supportedType (t);
-        }
-
-        else if (n == "idlFile")
-        {
-          ::XMLSchema::string< char > t (e);
-          idlFile (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          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);
-          property (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< char > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.hpp
deleted file mode 100644
index 684dd24a4d3..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//$Id$
-#ifndef CCD_HPP
-#define CCD_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // specificType
-      //
-      public:
-      bool specificType_p () const;
-      ::XMLSchema::string< char > const& specificType () const;
-      ::XMLSchema::string< char >& specificType ();
-      void specificType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
-
-      // supportedType
-      //
-      public:
-      bool supportedType_p () const;
-      ::XMLSchema::string< char > const& supportedType () const;
-      ::XMLSchema::string< char >& supportedType ();
-      void supportedType (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
-
-      // idlFile
-      //
-      public:
-      bool idlFile_p () const;
-      ::XMLSchema::string< char > const& idlFile () const;
-      ::XMLSchema::string< char >& idlFile ();
-      void idlFile (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > idlFile_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // port
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
-
-      // property
-      //
-      public:
-      bool property_p () const;
-      ::CIAO::Config_Handlers::ComponentPropertyDescription const& property () const;
-      ::CIAO::Config_Handlers::ComponentPropertyDescription& property ();
-      void property (::CIAO::Config_Handlers::ComponentPropertyDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
-
-      // infoProperty
-      //
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      //
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< char > const& contentLocation () const;
-      ::XMLSchema::string< char >& contentLocation ();
-      void contentLocation (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > contentLocation_;
-
-      public:
-      ComponentInterfaceDescription ();
-      ComponentInterfaceDescription (::XSCRT::XML::Element< char > const&);
-      ComponentInterfaceDescription (ComponentInterfaceDescription const& s);
-
-      ComponentInterfaceDescription&
-      operator= (ComponentInterfaceDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // CCD_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.cpp
deleted file mode 100644
index 1fac6f758af..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-//$Id$
-#include "cdd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // Domain
-    // 
-
-    Domain::
-    Domain ()
-    :
-    label_ (new ::XMLSchema::string< char > ()),
-    UUID_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      label_->container (this);
-      UUID_->container (this);
-    }
-
-    Domain::
-    Domain (::CIAO::Config_Handlers::Domain const& s)
-    :
-    label_ (new ::XMLSchema::string< char > (*s.label_)),
-    UUID_ (new ::XMLSchema::string< char > (*s.UUID_)),
-    sharedResource_ (s.sharedResource_.get () ? new ::CIAO::Config_Handlers::SharedResource (*s.sharedResource_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    regulator__ ()
-    {
-      label_->container (this);
-      UUID_->container (this);
-      if (sharedResource_.get ()) sharedResource_->container (this);
-      node_.reserve (s.node_.size ());
-      {
-        for (node_const_iterator i (s.node_.begin ());
-        i != s.node_.end ();
-        ++i) add_node (*i);
-      }
-
-      if (infoProperty_.get ()) infoProperty_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::Domain& Domain::
-    operator= (::CIAO::Config_Handlers::Domain const& s)
-    {
-      label (s.label ());
-
-      UUID (s.UUID ());
-
-      if (s.sharedResource_.get ()) sharedResource (*(s.sharedResource_));
-      else sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (0);
-
-      node_.clear ();
-      node_.reserve (s.node_.size ());
-      {
-        for (node_const_iterator i (s.node_.begin ());
-        i != s.node_.end ();
-        ++i) add_node (*i);
-      }
-
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      return *this;
-    }
-
-
-    // Domain
-    // 
-    ::XMLSchema::string< char > const& Domain::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& Domain::
-    label ()
-    {
-      return *label_;
-    }
-
-    void Domain::
-    label (::XMLSchema::string< char > const& e)
-    {
-      *label_ = e;
-    }
-
-    // Domain
-    // 
-    ::XMLSchema::string< char > const& Domain::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& Domain::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void Domain::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      *UUID_ = e;
-    }
-
-    // Domain
-    // 
-    bool Domain::
-    sharedResource_p () const
-    {
-      return sharedResource_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::SharedResource const& Domain::
-    sharedResource () const
-    {
-      return *sharedResource_;
-    }
-
-    ::CIAO::Config_Handlers::SharedResource& Domain::
-    sharedResource ()
-    {
-      return *sharedResource_;
-    }
-
-    void Domain::
-    sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
-    {
-      if (sharedResource_.get ())
-      {
-        *sharedResource_ = e;
-      }
-
-      else
-      {
-        sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (new ::CIAO::Config_Handlers::SharedResource (e));
-        sharedResource_->container (this);
-      }
-    }
-
-    // Domain
-    // 
-    Domain::node_iterator Domain::
-    begin_node ()
-    {
-      return node_.begin ();
-    }
-
-    Domain::node_iterator Domain::
-    end_node ()
-    {
-      return node_.end ();
-    }
-
-    Domain::node_const_iterator Domain::
-    begin_node () const
-    {
-      return node_.begin ();
-    }
-
-    Domain::node_const_iterator Domain::
-    end_node () const
-    {
-      return node_.end ();
-    }
-
-    void Domain::
-    add_node (::CIAO::Config_Handlers::Node const& e)
-    {
-      if (node_.capacity () < node_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::Node > v;
-        v.reserve (node_.size () + 1);
-
-        while (node_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::Node& t = node_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          node_.pop_back ();
-        }
-
-        node_.swap (v);
-      }
-
-      node_.push_back (e);
-      node_.back ().container (this);
-    }
-
-    // Domain
-    // 
-    bool Domain::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& Domain::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& Domain::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
-
-    void Domain::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // Domain
-    //
-
-    Domain::
-    Domain (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    label_ (new ::XMLSchema::string< char > ()),
-    UUID_ (new ::XMLSchema::string< char > ()),
-    regulator__ ()
-    {
-      label_->container (this);
-      UUID_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          UUID (t);
-        }
-
-        else if (n == "sharedResource")
-        {
-          ::CIAO::Config_Handlers::SharedResource t (e);
-          sharedResource (t);
-        }
-
-        else if (n == "node")
-        {
-          ::CIAO::Config_Handlers::Node t (e);
-          add_node (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.hpp
deleted file mode 100644
index 16053fce1f3..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-#ifndef CDD_HPP
-#define CDD_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class Domain;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class Domain : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // sharedResource
-      //
-      public:
-      bool sharedResource_p () const;
-      ::CIAO::Config_Handlers::SharedResource const& sharedResource () const;
-      ::CIAO::Config_Handlers::SharedResource& sharedResource ();
-      void sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-      // node
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::Node > node_;
-
-      // infoProperty
-      //
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      public:
-      Domain ();
-      Domain (::XSCRT::XML::Element< char > const&);
-      Domain (Domain const& s);
-
-      Domain&
-      operator= (Domain const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // CDD_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.cpp
deleted file mode 100644
index a4e63057eff..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.cpp
+++ /dev/null
@@ -1,588 +0,0 @@
-// $Id$
-#include "cdp.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // DeploymentPlan
-    // 
-
-    DeploymentPlan::
-    DeploymentPlan ()
-    :
-    realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription ()),
-    implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription ()),
-    regulator__ ()
-    {
-      realizes_->container (this);
-      implementation_->container (this);
-    }
-
-    DeploymentPlan::
-    DeploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
-    realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_)),
-    implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription (*s.implementation_)),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      realizes_->container (this);
-      implementation_->container (this);
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
-
-      connection_.reserve (s.connection_.size ());
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
-
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
-
-      artifact_.reserve (s.artifact_.size ());
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
-
-      infoProperty_.reserve (s.infoProperty_.size ());
-      {
-        for (infoProperty_const_iterator i (s.infoProperty_.begin ());
-        i != s.infoProperty_.end ();
-        ++i) add_infoProperty (*i);
-      }
-    }
-
-    ::CIAO::Config_Handlers::DeploymentPlan& DeploymentPlan::
-    operator= (::CIAO::Config_Handlers::DeploymentPlan const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      realizes (s.realizes ());
-
-      implementation (s.implementation ());
-
-      instance_.clear ();
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
-
-      connection_.clear ();
-      connection_.reserve (s.connection_.size ());
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
-
-      dependsOn_.clear ();
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
-
-      artifact_.clear ();
-      artifact_.reserve (s.artifact_.size ());
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
-
-      infoProperty_.clear ();
-      infoProperty_.reserve (s.infoProperty_.size ());
-      {
-        for (infoProperty_const_iterator i (s.infoProperty_.begin ());
-        i != s.infoProperty_.end ();
-        ++i) add_infoProperty (*i);
-      }
-
-      return *this;
-    }
-
-
-    // DeploymentPlan
-    // 
-    bool DeploymentPlan::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DeploymentPlan::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& DeploymentPlan::
-    label ()
-    {
-      return *label_;
-    }
-
-    void DeploymentPlan::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // DeploymentPlan
-    // 
-    bool DeploymentPlan::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& DeploymentPlan::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& DeploymentPlan::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void DeploymentPlan::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // DeploymentPlan
-    // 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& DeploymentPlan::
-    realizes () const
-    {
-      return *realizes_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription& DeploymentPlan::
-    realizes ()
-    {
-      return *realizes_;
-    }
-
-    void DeploymentPlan::
-    realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-    {
-      *realizes_ = e;
-    }
-
-    // DeploymentPlan
-    // 
-    ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& DeploymentPlan::
-    implementation () const
-    {
-      return *implementation_;
-    }
-
-    ::CIAO::Config_Handlers::MonolithicDeploymentDescription& DeploymentPlan::
-    implementation ()
-    {
-      return *implementation_;
-    }
-
-    void DeploymentPlan::
-    implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& e)
-    {
-      *implementation_ = e;
-    }
-
-    // DeploymentPlan
-    // 
-    DeploymentPlan::instance_iterator DeploymentPlan::
-    begin_instance ()
-    {
-      return instance_.begin ();
-    }
-
-    DeploymentPlan::instance_iterator DeploymentPlan::
-    end_instance ()
-    {
-      return instance_.end ();
-    }
-
-    DeploymentPlan::instance_const_iterator DeploymentPlan::
-    begin_instance () const
-    {
-      return instance_.begin ();
-    }
-
-    DeploymentPlan::instance_const_iterator DeploymentPlan::
-    end_instance () const
-    {
-      return instance_.end ();
-    }
-
-    void DeploymentPlan::
-    add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& e)
-    {
-      if (instance_.capacity () < instance_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription > v;
-        v.reserve (instance_.size () + 1);
-
-        while (instance_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::InstanceDeploymentDescription& t = instance_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          instance_.pop_back ();
-        }
-
-        instance_.swap (v);
-      }
-
-      instance_.push_back (e);
-      instance_.back ().container (this);
-    }
-
-    // DeploymentPlan
-    // 
-    DeploymentPlan::connection_iterator DeploymentPlan::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
-
-    DeploymentPlan::connection_iterator DeploymentPlan::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
-
-    DeploymentPlan::connection_const_iterator DeploymentPlan::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
-
-    DeploymentPlan::connection_const_iterator DeploymentPlan::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
-
-    void DeploymentPlan::
-    add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& e)
-    {
-      if (connection_.capacity () < connection_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription > v;
-        v.reserve (connection_.size () + 1);
-
-        while (connection_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::PlanConnectionDescription& t = connection_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          connection_.pop_back ();
-        }
-
-        connection_.swap (v);
-      }
-
-      connection_.push_back (e);
-      connection_.back ().container (this);
-    }
-
-    // DeploymentPlan
-    // 
-    DeploymentPlan::dependsOn_iterator DeploymentPlan::
-    begin_dependsOn ()
-    {
-      return dependsOn_.begin ();
-    }
-
-    DeploymentPlan::dependsOn_iterator DeploymentPlan::
-    end_dependsOn ()
-    {
-      return dependsOn_.end ();
-    }
-
-    DeploymentPlan::dependsOn_const_iterator DeploymentPlan::
-    begin_dependsOn () const
-    {
-      return dependsOn_.begin ();
-    }
-
-    DeploymentPlan::dependsOn_const_iterator DeploymentPlan::
-    end_dependsOn () const
-    {
-      return dependsOn_.end ();
-    }
-
-    void DeploymentPlan::
-    add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-    {
-      if (dependsOn_.capacity () < dependsOn_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency > v;
-        v.reserve (dependsOn_.size () + 1);
-
-        while (dependsOn_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ImplementationDependency& t = dependsOn_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          dependsOn_.pop_back ();
-        }
-
-        dependsOn_.swap (v);
-      }
-
-      dependsOn_.push_back (e);
-      dependsOn_.back ().container (this);
-    }
-
-    // DeploymentPlan
-    // 
-    DeploymentPlan::artifact_iterator DeploymentPlan::
-    begin_artifact ()
-    {
-      return artifact_.begin ();
-    }
-
-    DeploymentPlan::artifact_iterator DeploymentPlan::
-    end_artifact ()
-    {
-      return artifact_.end ();
-    }
-
-    DeploymentPlan::artifact_const_iterator DeploymentPlan::
-    begin_artifact () const
-    {
-      return artifact_.begin ();
-    }
-
-    DeploymentPlan::artifact_const_iterator DeploymentPlan::
-    end_artifact () const
-    {
-      return artifact_.end ();
-    }
-
-    void DeploymentPlan::
-    add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& e)
-    {
-      if (artifact_.capacity () < artifact_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > v;
-        v.reserve (artifact_.size () + 1);
-
-        while (artifact_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::ArtifactDeploymentDescription& t = artifact_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          artifact_.pop_back ();
-        }
-
-        artifact_.swap (v);
-      }
-
-      artifact_.push_back (e);
-      artifact_.back ().container (this);
-    }
-
-    // DeploymentPlan
-    // 
-    DeploymentPlan::infoProperty_iterator DeploymentPlan::
-    begin_infoProperty ()
-    {
-      return infoProperty_.begin ();
-    }
-
-    DeploymentPlan::infoProperty_iterator DeploymentPlan::
-    end_infoProperty ()
-    {
-      return infoProperty_.end ();
-    }
-
-    DeploymentPlan::infoProperty_const_iterator DeploymentPlan::
-    begin_infoProperty () const
-    {
-      return infoProperty_.begin ();
-    }
-
-    DeploymentPlan::infoProperty_const_iterator DeploymentPlan::
-    end_infoProperty () const
-    {
-      return infoProperty_.end ();
-    }
-
-    void DeploymentPlan::
-    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.capacity () < infoProperty_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::Property > v;
-        v.reserve (infoProperty_.size () + 1);
-
-        while (infoProperty_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::Property& t = infoProperty_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          infoProperty_.pop_back ();
-        }
-
-        infoProperty_.swap (v);
-      }
-
-      infoProperty_.push_back (e);
-      infoProperty_.back ().container (this);
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // DeploymentPlan
-    //
-
-    DeploymentPlan::
-    DeploymentPlan (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription ()),
-    implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription ()),
-    regulator__ ()
-    {
-      realizes_->container (this);
-      implementation_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > 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);
-          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 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.hpp
deleted file mode 100644
index 012daf5621a..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.hpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-#ifndef CDP_HPP
-#define CDP_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "ccd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class DeploymentPlan : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // realizes
-      //
-      public:
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription& realizes ();
-      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-      // implementation
-      //
-      public:
-      ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& implementation () const;
-      ::CIAO::Config_Handlers::MonolithicDeploymentDescription& implementation ();
-      void implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
-
-      // instance
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::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::InstanceDeploymentDescription const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
-
-      // connection
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::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::PlanConnectionDescription const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
-
-      // dependsOn
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // artifact
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::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 (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
-
-      // infoProperty
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      public:
-      DeploymentPlan ();
-      DeploymentPlan (::XSCRT::XML::Element< char > const&);
-      DeploymentPlan (DeploymentPlan const& s);
-
-      DeploymentPlan&
-      operator= (DeploymentPlan const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // CDP_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.cpp
deleted file mode 100644
index 2b5ea3712db..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.cpp
+++ /dev/null
@@ -1,1554 +0,0 @@
-// $Id$
-#include "cid.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // SubcomponentInstantiationDescription
-    // 
-
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      package_->container (this);
-    }
-
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< char > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      package_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (reference_.get ()) reference_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentInstantiationDescription::
-    operator= (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    {
-      name (s.name ());
-
-      package (s.package ());
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
-
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (0);
-
-      return *this;
-    }
-
-
-    // SubcomponentInstantiationDescription
-    // 
-    ::XMLSchema::string< char > const& SubcomponentInstantiationDescription::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& SubcomponentInstantiationDescription::
-    name ()
-    {
-      return *name_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // SubcomponentInstantiationDescription
-    // 
-    ::CIAO::Config_Handlers::ComponentPackageDescription const& SubcomponentInstantiationDescription::
-    package () const
-    {
-      return *package_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageDescription& SubcomponentInstantiationDescription::
-    package ()
-    {
-      return *package_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    package (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
-    {
-      *package_ = e;
-    }
-
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& SubcomponentInstantiationDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& SubcomponentInstantiationDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    selectRequirement_p () const
-    {
-      return selectRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& SubcomponentInstantiationDescription::
-    selectRequirement () const
-    {
-      return *selectRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& SubcomponentInstantiationDescription::
-    selectRequirement ()
-    {
-      return *selectRequirement_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
-
-      else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
-    }
-
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    reference_p () const
-    {
-      return reference_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
-    reference () const
-    {
-      return *reference_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageReference& SubcomponentInstantiationDescription::
-    reference ()
-    {
-      return *reference_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
-    {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
-
-      else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
-    }
-
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
-
-    ::XMLSchema::ID< char > const& SubcomponentInstantiationDescription::
-    id () const
-    {
-      return *id_;
-    }
-
-    ::XMLSchema::ID< char >& SubcomponentInstantiationDescription::
-    id ()
-    {
-      return *id_;
-    }
-
-    void SubcomponentInstantiationDescription::
-    id (::XMLSchema::ID< char > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
-
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< char > > (new ::XMLSchema::ID< char > (e));
-        id_->container (this);
-      }
-    }
-
-
-    // SubcomponentPropertyReference
-    // 
-
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference ()
-    :
-    propertyName_ (new ::XMLSchema::string< char > ()),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription ()),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
-
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    :
-    propertyName_ (new ::XMLSchema::string< char > (*s.propertyName_)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*s.instance_)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
-    operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    {
-      propertyName (s.propertyName ());
-
-      instance (s.instance ());
-
-      return *this;
-    }
-
-
-    // SubcomponentPropertyReference
-    // 
-    ::XMLSchema::string< char > const& SubcomponentPropertyReference::
-    propertyName () const
-    {
-      return *propertyName_;
-    }
-
-    ::XMLSchema::string< char >& SubcomponentPropertyReference::
-    propertyName ()
-    {
-      return *propertyName_;
-    }
-
-    void SubcomponentPropertyReference::
-    propertyName (::XMLSchema::string< char > const& e)
-    {
-      *propertyName_ = e;
-    }
-
-    // SubcomponentPropertyReference
-    // 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& SubcomponentPropertyReference::
-    instance () const
-    {
-      return *instance_;
-    }
-
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentPropertyReference::
-    instance ()
-    {
-      return *instance_;
-    }
-
-    void SubcomponentPropertyReference::
-    instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      *instance_ = e;
-    }
-
-
-    // AssemblyPropertyMapping
-    // 
-
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    externalName_ (new ::XMLSchema::string< char > ()),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
-
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*s.name_)),
-    externalName_ (new ::XMLSchema::string< char > (*s.externalName_)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
-    operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    {
-      name (s.name ());
-
-      externalName (s.externalName ());
-
-      delegatesTo (s.delegatesTo ());
-
-      return *this;
-    }
-
-
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< char > const& AssemblyPropertyMapping::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& AssemblyPropertyMapping::
-    name ()
-    {
-      return *name_;
-    }
-
-    void AssemblyPropertyMapping::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< char > const& AssemblyPropertyMapping::
-    externalName () const
-    {
-      return *externalName_;
-    }
-
-    ::XMLSchema::string< char >& AssemblyPropertyMapping::
-    externalName ()
-    {
-      return *externalName_;
-    }
-
-    void AssemblyPropertyMapping::
-    externalName (::XMLSchema::string< char > const& e)
-    {
-      *externalName_ = e;
-    }
-
-    // AssemblyPropertyMapping
-    // 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& AssemblyPropertyMapping::
-    delegatesTo () const
-    {
-      return *delegatesTo_;
-    }
-
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference& AssemblyPropertyMapping::
-    delegatesTo ()
-    {
-      return *delegatesTo_;
-    }
-
-    void AssemblyPropertyMapping::
-    delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
-    {
-      *delegatesTo_ = e;
-    }
-
-
-    // ComponentAssemblyDescription
-    // 
-
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    :
-    externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
-    regulator__ ()
-    {
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
-
-      connection_.reserve (s.connection_.size ());
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
-
-      if (externalProperty_.get ()) externalProperty_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    {
-      instance_.clear ();
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
-
-      connection_.clear ();
-      connection_.reserve (s.connection_.size ());
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
-
-      if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
-      else externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (0);
-
-      return *this;
-    }
-
-
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    begin_instance ()
-    {
-      return instance_.begin ();
-    }
-
-    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::
-    end_instance () const
-    {
-      return instance_.end ();
-    }
-
-    void ComponentAssemblyDescription::
-    add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      if (instance_.capacity () < instance_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > v;
-        v.reserve (instance_.size () + 1);
-
-        while (instance_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& t = instance_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          instance_.pop_back ();
-        }
-
-        instance_.swap (v);
-      }
-
-      instance_.push_back (e);
-      instance_.back ().container (this);
-    }
-
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
-
-    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::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
-
-    void ComponentAssemblyDescription::
-    add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
-    {
-      if (connection_.capacity () < connection_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > v;
-        v.reserve (connection_.size () + 1);
-
-        while (connection_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::AssemblyConnectionDescription& t = connection_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          connection_.pop_back ();
-        }
-
-        connection_.swap (v);
-      }
-
-      connection_.push_back (e);
-      connection_.back ().container (this);
-    }
-
-    // ComponentAssemblyDescription
-    // 
-    bool ComponentAssemblyDescription::
-    externalProperty_p () const
-    {
-      return externalProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping const& ComponentAssemblyDescription::
-    externalProperty () const
-    {
-      return *externalProperty_;
-    }
-
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping& ComponentAssemblyDescription::
-    externalProperty ()
-    {
-      return *externalProperty_;
-    }
-
-    void ComponentAssemblyDescription::
-    externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
-    {
-      if (externalProperty_.get ())
-      {
-        *externalProperty_ = e;
-      }
-
-      else
-      {
-        externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (new ::CIAO::Config_Handlers::AssemblyPropertyMapping (e));
-        externalProperty_->container (this);
-      }
-    }
-
-
-    // MonolithicImplementationDescription
-    // 
-
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    :
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::ImplementationRequirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      if (execParameter_.get ()) execParameter_->container (this);
-      primaryArtifact_.reserve (s.primaryArtifact_.size ());
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
-
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    {
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      primaryArtifact_.clear ();
-      primaryArtifact_.reserve (s.primaryArtifact_.size ());
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (0);
-
-      return *this;
-    }
-
-
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& MonolithicImplementationDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
-
-    ::CIAO::Config_Handlers::Property& MonolithicImplementationDescription::
-    execParameter ()
-    {
-      return *execParameter_;
-    }
-
-    void MonolithicImplementationDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
-
-    // MonolithicImplementationDescription
-    // 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact ()
-    {
-      return primaryArtifact_.begin ();
-    }
-
-    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::
-    end_primaryArtifact () const
-    {
-      return primaryArtifact_.end ();
-    }
-
-    void MonolithicImplementationDescription::
-    add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      if (primaryArtifact_.capacity () < primaryArtifact_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
-        v.reserve (primaryArtifact_.size () + 1);
-
-        while (primaryArtifact_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::NamedImplementationArtifact& t = primaryArtifact_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          primaryArtifact_.pop_back ();
-        }
-
-        primaryArtifact_.swap (v);
-      }
-
-      primaryArtifact_.push_back (e);
-      primaryArtifact_.back ().container (this);
-    }
-
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationRequirement const& MonolithicImplementationDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationRequirement& MonolithicImplementationDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void MonolithicImplementationDescription::
-    deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (new ::CIAO::Config_Handlers::ImplementationRequirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-
-    // ComponentImplementationDescription
-    // 
-
-    ComponentImplementationDescription::
-    ComponentImplementationDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*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),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    capability_ (s.capability_.get () ? new ::CIAO::Config_Handlers::Capability (*s.capability_) : 0),
-    dependsOn_ (s.dependsOn_.get () ? new ::CIAO::Config_Handlers::ImplementationDependency (*s.dependsOn_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 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);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (capability_.get ()) capability_->container (this);
-      if (dependsOn_.get ()) dependsOn_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->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< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (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.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
-      else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.capability_.get ()) capability (*(s.capability_));
-      else capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (0);
-
-      if (s.dependsOn_.get ()) dependsOn (*(s.dependsOn_));
-      else dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (0);
-
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      return *this;
-    }
-
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentImplementationDescription::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& ComponentImplementationDescription::
-    label ()
-    {
-      return *label_;
-    }
-
-    void ComponentImplementationDescription::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentImplementationDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& ComponentImplementationDescription::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void ComponentImplementationDescription::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    implements_p () const
-    {
-      return implements_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
-    implements () const
-    {
-      return *implements_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentImplementationDescription::
-    implements ()
-    {
-      return *implements_;
-    }
-
-    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);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    assemblyImpl_p () const
-    {
-      return assemblyImpl_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
-    assemblyImpl () const
-    {
-      return *assemblyImpl_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentImplementationDescription::
-    assemblyImpl ()
-    {
-      return *assemblyImpl_;
-    }
-
-    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);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    monolithicImpl_p () const
-    {
-      return monolithicImpl_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
-    monolithicImpl () const
-    {
-      return *monolithicImpl_;
-    }
-
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& ComponentImplementationDescription::
-    monolithicImpl ()
-    {
-      return *monolithicImpl_;
-    }
-
-    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);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void ComponentImplementationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    capability_p () const
-    {
-      return capability_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Capability const& ComponentImplementationDescription::
-    capability () const
-    {
-      return *capability_;
-    }
-
-    ::CIAO::Config_Handlers::Capability& ComponentImplementationDescription::
-    capability ()
-    {
-      return *capability_;
-    }
-
-    void ComponentImplementationDescription::
-    capability (::CIAO::Config_Handlers::Capability const& e)
-    {
-      if (capability_.get ())
-      {
-        *capability_ = e;
-      }
-
-      else
-      {
-        capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (new ::CIAO::Config_Handlers::Capability (e));
-        capability_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    dependsOn_p () const
-    {
-      return dependsOn_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationDependency const& ComponentImplementationDescription::
-    dependsOn () const
-    {
-      return *dependsOn_;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationDependency& ComponentImplementationDescription::
-    dependsOn ()
-    {
-      return *dependsOn_;
-    }
-
-    void ComponentImplementationDescription::
-    dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-    {
-      if (dependsOn_.get ())
-      {
-        *dependsOn_ = e;
-      }
-
-      else
-      {
-        dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (new ::CIAO::Config_Handlers::ImplementationDependency (e));
-        dependsOn_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
-
-    void ComponentImplementationDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentImplementationDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< char >& ComponentImplementationDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
-
-    void ComponentImplementationDescription::
-    contentLocation (::XMLSchema::string< char > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        contentLocation_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // SubcomponentInstantiationDescription
-    //
-
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      package_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "package")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-          package (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
-
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< char > a (p.next_attribute ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< char > t (a);
-          id (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // SubcomponentPropertyReference
-    //
-
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    propertyName_ (new ::XMLSchema::string< char > ()),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription ()),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "propertyName")
-        {
-          ::XMLSchema::string< char > t (e);
-          propertyName (t);
-        }
-
-        else if (n == "instance")
-        {
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
-          instance (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // AssemblyPropertyMapping
-    //
-
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    externalName_ (new ::XMLSchema::string< char > ()),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "externalName")
-        {
-          ::XMLSchema::string< char > t (e);
-          externalName (t);
-        }
-
-        else if (n == "delegatesTo")
-        {
-          ::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
-          delegatesTo (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentAssemblyDescription
-    //
-
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        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 == "externalProperty")
-        {
-          ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
-          externalProperty (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // MonolithicImplementationDescription
-    //
-
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "primaryArtifact")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_primaryArtifact (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::ImplementationRequirement t (e);
-          deployRequirement (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentImplementationDescription
-    //
-
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          UUID (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 == "monolithicImpl")
-        {
-          ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
-          monolithicImpl (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "capability")
-        {
-          ::CIAO::Config_Handlers::Capability t (e);
-          capability (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::ImplementationDependency t (e);
-          dependsOn (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< char > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.hpp
deleted file mode 100644
index 8e84504bafd..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.hpp
+++ /dev/null
@@ -1,445 +0,0 @@
-// $Id$
-#ifndef CID_HPP
-#define CID_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class SubcomponentInstantiationDescription;
-    class SubcomponentPropertyReference;
-    class AssemblyPropertyMapping;
-    class ComponentAssemblyDescription;
-    class MonolithicImplementationDescription;
-    class ComponentImplementationDescription;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-#include "cpd.hpp"
-
-#include "iad.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class SubcomponentInstantiationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // package
-      //
-      public:
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
-      ::CIAO::Config_Handlers::ComponentPackageDescription& package ();
-      void package (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // selectRequirement
-      //
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& selectRequirement ();
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // reference
-      //
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference& reference ();
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // id
-      //
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< char > const& id () const;
-      ::XMLSchema::ID< char >& id ();
-      void id (::XMLSchema::ID< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< char > > id_;
-
-      public:
-      SubcomponentInstantiationDescription ();
-      SubcomponentInstantiationDescription (::XSCRT::XML::Element< char > const&);
-      SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
-
-      SubcomponentInstantiationDescription&
-      operator= (SubcomponentInstantiationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class SubcomponentPropertyReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // propertyName
-      //
-      public:
-      ::XMLSchema::string< char > const& propertyName () const;
-      ::XMLSchema::string< char >& propertyName ();
-      void propertyName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > propertyName_;
-
-      // instance
-      //
-      public:
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& instance ();
-      void instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      public:
-      SubcomponentPropertyReference ();
-      SubcomponentPropertyReference (::XSCRT::XML::Element< char > const&);
-      SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
-
-      SubcomponentPropertyReference&
-      operator= (SubcomponentPropertyReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class AssemblyPropertyMapping : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // externalName
-      //
-      public:
-      ::XMLSchema::string< char > const& externalName () const;
-      ::XMLSchema::string< char >& externalName ();
-      void externalName (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > externalName_;
-
-      // delegatesTo
-      //
-      public:
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference& delegatesTo ();
-      void delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
-
-      public:
-      AssemblyPropertyMapping ();
-      AssemblyPropertyMapping (::XSCRT::XML::Element< char > const&);
-      AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
-
-      AssemblyPropertyMapping&
-      operator= (AssemblyPropertyMapping const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentAssemblyDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // instance
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      // connection
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
-
-      // externalProperty
-      //
-      public:
-      bool externalProperty_p () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping& externalProperty ();
-      void externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
-
-      public:
-      ComponentAssemblyDescription ();
-      ComponentAssemblyDescription (::XSCRT::XML::Element< char > const&);
-      ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
-
-      ComponentAssemblyDescription&
-      operator= (ComponentAssemblyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class MonolithicImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // execParameter
-      //
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // primaryArtifact
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
-
-      public:
-      MonolithicImplementationDescription ();
-      MonolithicImplementationDescription (::XSCRT::XML::Element< char > const&);
-      MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
-
-      MonolithicImplementationDescription&
-      operator= (MonolithicImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // implements
-      //
-      public:
-      bool implements_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription& implements ();
-      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;
-      ::CIAO::Config_Handlers::ComponentAssemblyDescription& assemblyImpl ();
-      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;
-      ::CIAO::Config_Handlers::MonolithicImplementationDescription& monolithicImpl ();
-      void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // capability
-      //
-      public:
-      bool capability_p () const;
-      ::CIAO::Config_Handlers::Capability const& capability () const;
-      ::CIAO::Config_Handlers::Capability& capability ();
-      void capability (::CIAO::Config_Handlers::Capability const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
-
-      // dependsOn
-      //
-      public:
-      bool dependsOn_p () const;
-      ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
-      ::CIAO::Config_Handlers::ImplementationDependency& dependsOn ();
-      void dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // infoProperty
-      //
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      //
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< char > const& contentLocation () const;
-      ::XMLSchema::string< char >& contentLocation ();
-      void contentLocation (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > contentLocation_;
-
-      public:
-      ComponentImplementationDescription ();
-      ComponentImplementationDescription (::XSCRT::XML::Element< char > const&);
-      ComponentImplementationDescription (ComponentImplementationDescription const& s);
-
-      ComponentImplementationDescription&
-      operator= (ComponentImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // CID_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.cpp
deleted file mode 100644
index 93ffc86d1d3..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// $Id$
-#include "cpd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // PackagedComponentImplementation
-    // 
-
-    PackagedComponentImplementation::
-    PackagedComponentImplementation ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedImplementation_->container (this);
-    }
-
-    PackagedComponentImplementation::
-    PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*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< char > const& PackagedComponentImplementation::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& PackagedComponentImplementation::
-    name ()
-    {
-      return *name_;
-    }
-
-    void PackagedComponentImplementation::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // PackagedComponentImplementation
-    // 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
-    referencedImplementation () const
-    {
-      return *referencedImplementation_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentImplementationDescription& PackagedComponentImplementation::
-    referencedImplementation ()
-    {
-      return *referencedImplementation_;
-    }
-
-    void PackagedComponentImplementation::
-    referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
-    {
-      *referencedImplementation_ = e;
-    }
-
-
-    // ComponentPackageDescription
-    // 
-
-    ComponentPackageDescription::
-    ComponentPackageDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    ComponentPackageDescription::
-    ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
-    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    implementation_ (s.implementation_.get () ? new ::CIAO::Config_Handlers::PackagedComponentImplementation (*s.implementation_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (realizes_.get ()) realizes_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (implementation_.get ()) implementation_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-    }
-
-    ::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< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.realizes_.get ()) realizes (*(s.realizes_));
-      else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.implementation_.get ()) implementation (*(s.implementation_));
-      else implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (0);
-
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      return *this;
-    }
-
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentPackageDescription::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageDescription::
-    label ()
-    {
-      return *label_;
-    }
-
-    void ComponentPackageDescription::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentPackageDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageDescription::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void ComponentPackageDescription::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    realizes_p () const
-    {
-      return realizes_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
-    realizes () const
-    {
-      return *realizes_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentPackageDescription::
-    realizes ()
-    {
-      return *realizes_;
-    }
-
-    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
-    // 
-    bool ComponentPackageDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentPackageDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void ComponentPackageDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    implementation_p () const
-    {
-      return implementation_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::PackagedComponentImplementation const& ComponentPackageDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
-
-    ::CIAO::Config_Handlers::PackagedComponentImplementation& ComponentPackageDescription::
-    implementation ()
-    {
-      return *implementation_;
-    }
-
-    void ComponentPackageDescription::
-    implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
-    {
-      if (implementation_.get ())
-      {
-        *implementation_ = e;
-      }
-
-      else
-      {
-        implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (new ::CIAO::Config_Handlers::PackagedComponentImplementation (e));
-        implementation_->container (this);
-      }
-    }
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ComponentPackageDescription::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
-
-    void ComponentPackageDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
-
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ComponentPackageDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< char >& ComponentPackageDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
-
-    void ComponentPackageDescription::
-    contentLocation (::XMLSchema::string< char > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        contentLocation_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // PackagedComponentImplementation
-    //
-
-    PackagedComponentImplementation::
-    PackagedComponentImplementation (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedImplementation_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "referencedImplementation")
-        {
-          ::CIAO::Config_Handlers::ComponentImplementationDescription t (e);
-          referencedImplementation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ComponentPackageDescription
-    //
-
-    ComponentPackageDescription::
-    ComponentPackageDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > 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);
-          configProperty (t);
-        }
-
-        else if (n == "implementation")
-        {
-          ::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
-          implementation (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< char > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.hpp
deleted file mode 100644
index 290af440d33..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.hpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-#ifndef CPD_HPP
-#define CPD_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class PackagedComponentImplementation;
-    class ComponentPackageDescription;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "ccd.hpp"
-
-#include "cid.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class PackagedComponentImplementation : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // referencedImplementation
-      //
-      public:
-      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
-      ::CIAO::Config_Handlers::ComponentImplementationDescription& referencedImplementation ();
-      void referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_;
-
-      public:
-      PackagedComponentImplementation ();
-      PackagedComponentImplementation (::XSCRT::XML::Element< char > const&);
-      PackagedComponentImplementation (PackagedComponentImplementation const& s);
-
-      PackagedComponentImplementation&
-      operator= (PackagedComponentImplementation const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ComponentPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // realizes
-      //
-      public:
-      bool realizes_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription& realizes ();
-      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // implementation
-      //
-      public:
-      bool implementation_p () const;
-      ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
-      ::CIAO::Config_Handlers::PackagedComponentImplementation& implementation ();
-      void implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
-
-      // infoProperty
-      //
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      //
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< char > const& contentLocation () const;
-      ::XMLSchema::string< char >& contentLocation ();
-      void contentLocation (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > contentLocation_;
-
-      public:
-      ComponentPackageDescription ();
-      ComponentPackageDescription (::XSCRT::XML::Element< char > const&);
-      ComponentPackageDescription (ComponentPackageDescription const& s);
-
-      ComponentPackageDescription&
-      operator= (ComponentPackageDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // CPD_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.cpp
deleted file mode 100644
index 4615031d2ab..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.cpp
+++ /dev/null
@@ -1,605 +0,0 @@
-// $Id$
-#include "iad.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // NamedImplementationArtifact
-    // 
-
-    NamedImplementationArtifact::
-    NamedImplementationArtifact ()
-    :
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedArtifact_->container (this);
-    }
-
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-    :
-    name_ (new ::XMLSchema::string< char > (*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< char > const& NamedImplementationArtifact::
-    name () const
-    {
-      return *name_;
-    }
-
-    ::XMLSchema::string< char >& NamedImplementationArtifact::
-    name ()
-    {
-      return *name_;
-    }
-
-    void NamedImplementationArtifact::
-    name (::XMLSchema::string< char > const& e)
-    {
-      *name_ = e;
-    }
-
-    // NamedImplementationArtifact
-    // 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
-    referencedArtifact () const
-    {
-      return *referencedArtifact_;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription& NamedImplementationArtifact::
-    referencedArtifact ()
-    {
-      return *referencedArtifact_;
-    }
-
-    void NamedImplementationArtifact::
-    referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
-    {
-      *referencedArtifact_ = e;
-    }
-
-
-    // ImplementationArtifactDescription
-    // 
-
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
-
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
-
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-    }
-
-    ::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< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      location_.clear ();
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
-
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      dependsOn_.clear ();
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
-
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      return *this;
-    }
-
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ImplementationArtifactDescription::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationArtifactDescription::
-    label ()
-    {
-      return *label_;
-    }
-
-    void ImplementationArtifactDescription::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ImplementationArtifactDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationArtifactDescription::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void ImplementationArtifactDescription::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
-
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
-
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
-
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
-
-    void ImplementationArtifactDescription::
-    add_location (::XMLSchema::string< char > const& e)
-    {
-      if (location_.capacity () < location_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::string< char > > v;
-        v.reserve (location_.size () + 1);
-
-        while (location_.size ())
-        {
-          //@@ VC6
-          ::XMLSchema::string< char >& t = location_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          location_.pop_back ();
-        }
-
-        location_.swap (v);
-      }
-
-      location_.push_back (e);
-      location_.back ().container (this);
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
-    execParameter ()
-    {
-      return *execParameter_;
-    }
-
-    void ImplementationArtifactDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& ImplementationArtifactDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& ImplementationArtifactDescription::
-    deployRequirement ()
-    {
-      return *deployRequirement_;
-    }
-
-    void ImplementationArtifactDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    begin_dependsOn ()
-    {
-      return dependsOn_.begin ();
-    }
-
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    end_dependsOn ()
-    {
-      return dependsOn_.end ();
-    }
-
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    begin_dependsOn () const
-    {
-      return dependsOn_.begin ();
-    }
-
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    end_dependsOn () const
-    {
-      return dependsOn_.end ();
-    }
-
-    void ImplementationArtifactDescription::
-    add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      if (dependsOn_.capacity () < dependsOn_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
-        v.reserve (dependsOn_.size () + 1);
-
-        while (dependsOn_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::NamedImplementationArtifact& t = dependsOn_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          dependsOn_.pop_back ();
-        }
-
-        dependsOn_.swap (v);
-      }
-
-      dependsOn_.push_back (e);
-      dependsOn_.back ().container (this);
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
-
-    void ImplementationArtifactDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
-
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& ImplementationArtifactDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< char >& ImplementationArtifactDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
-
-    void ImplementationArtifactDescription::
-    contentLocation (::XMLSchema::string< char > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        contentLocation_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // NamedImplementationArtifact
-    //
-
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    name_ (new ::XMLSchema::string< char > ()),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription ()),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedArtifact_->container (this);
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          ::XMLSchema::string< char > t (e);
-          name (t);
-        }
-
-        else if (n == "referencedArtifact")
-        {
-          ::CIAO::Config_Handlers::ImplementationArtifactDescription t (e);
-          referencedArtifact (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
-    // ImplementationArtifactDescription
-    //
-
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          UUID (t);
-        }
-
-        else if (n == "location")
-        {
-          ::XMLSchema::string< char > t (e);
-          add_location (t);
-        }
-
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_dependsOn (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< char > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.hpp
deleted file mode 100644
index 882a18332a8..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.hpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// $Id$
-#ifndef IAD_HPP
-#define IAD_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class NamedImplementationArtifact;
-    class ImplementationArtifactDescription;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class NamedImplementationArtifact : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      //
-      public:
-      ::XMLSchema::string< char > const& name () const;
-      ::XMLSchema::string< char >& name ();
-      void name (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > name_;
-
-      // referencedArtifact
-      //
-      public:
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription& referencedArtifact ();
-      void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
-
-      public:
-      NamedImplementationArtifact ();
-      NamedImplementationArtifact (::XSCRT::XML::Element< char > const&);
-      NamedImplementationArtifact (NamedImplementationArtifact const& s);
-
-      NamedImplementationArtifact&
-      operator= (NamedImplementationArtifact const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class ImplementationArtifactDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // location
-      //
-      public:
-      typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
-      typedef ::std::vector< ::XMLSchema::string< char > >::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< char > const& );
-
-      protected:
-      ::std::vector< ::XMLSchema::string< char > > location_;
-
-      // execParameter
-      //
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      //
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // dependsOn
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
-      typedef ::std::vector< ::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& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
-
-      // infoProperty
-      //
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      //
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< char > const& contentLocation () const;
-      ::XMLSchema::string< char >& contentLocation ();
-      void contentLocation (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > contentLocation_;
-
-      public:
-      ImplementationArtifactDescription ();
-      ImplementationArtifactDescription (::XSCRT::XML::Element< char > const&);
-      ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
-
-      ImplementationArtifactDescription&
-      operator= (ImplementationArtifactDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // IAD_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.cpp
deleted file mode 100644
index bcae0ddb3a8..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-// $Id$
-#include "pcd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // PackageConfiguration
-    // 
-
-    PackageConfiguration::
-    PackageConfiguration ()
-    :
-    regulator__ ()
-    {
-    }
-
-    PackageConfiguration::
-    PackageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s)
-    :
-    label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
-    basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (basePackage_.get ()) basePackage_->container (this);
-      if (reference_.get ()) reference_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-    }
-
-    ::CIAO::Config_Handlers::PackageConfiguration& PackageConfiguration::
-    operator= (::CIAO::Config_Handlers::PackageConfiguration const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      if (s.basePackage_.get ()) basePackage (*(s.basePackage_));
-      else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0);
-
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
-
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
-
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
-
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0);
-
-      return *this;
-    }
-
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& PackageConfiguration::
-    label () const
-    {
-      return *label_;
-    }
-
-    ::XMLSchema::string< char >& PackageConfiguration::
-    label ()
-    {
-      return *label_;
-    }
-
-    void PackageConfiguration::
-    label (::XMLSchema::string< char > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        label_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& PackageConfiguration::
-    UUID () const
-    {
-      return *UUID_;
-    }
-
-    ::XMLSchema::string< char >& PackageConfiguration::
-    UUID ()
-    {
-      return *UUID_;
-    }
-
-    void PackageConfiguration::
-    UUID (::XMLSchema::string< char > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        UUID_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    basePackage_p () const
-    {
-      return basePackage_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageDescription const& PackageConfiguration::
-    basePackage () const
-    {
-      return *basePackage_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageDescription& PackageConfiguration::
-    basePackage ()
-    {
-      return *basePackage_;
-    }
-
-    void PackageConfiguration::
-    basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
-    {
-      if (basePackage_.get ())
-      {
-        *basePackage_ = e;
-      }
-
-      else
-      {
-        basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-        basePackage_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    reference_p () const
-    {
-      return reference_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageReference const& PackageConfiguration::
-    reference () const
-    {
-      return *reference_;
-    }
-
-    ::CIAO::Config_Handlers::ComponentPackageReference& PackageConfiguration::
-    reference ()
-    {
-      return *reference_;
-    }
-
-    void PackageConfiguration::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
-    {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
-
-      else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    selectRequirement_p () const
-    {
-      return selectRequirement_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Requirement const& PackageConfiguration::
-    selectRequirement () const
-    {
-      return *selectRequirement_;
-    }
-
-    ::CIAO::Config_Handlers::Requirement& PackageConfiguration::
-    selectRequirement ()
-    {
-      return *selectRequirement_;
-    }
-
-    void PackageConfiguration::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
-
-      else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::Property const& PackageConfiguration::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
-
-    ::CIAO::Config_Handlers::Property& PackageConfiguration::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
-
-    void PackageConfiguration::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
-
-    // PackageConfiguration
-    // 
-    bool PackageConfiguration::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< char > const& PackageConfiguration::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< char >& PackageConfiguration::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
-
-    void PackageConfiguration::
-    contentLocation (::XMLSchema::string< char > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e));
-        contentLocation_->container (this);
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // PackageConfiguration
-    //
-
-    PackageConfiguration::
-    PackageConfiguration (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< char > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< char > t (e);
-          UUID (t);
-        }
-
-        else if (n == "basePackage")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-          basePackage (t);
-        }
-
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
-
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< char > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.hpp
deleted file mode 100644
index 94ad98b2f56..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.hpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// $Id$
-#ifndef PCD_HPP
-#define PCD_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class PackageConfiguration;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "Basic_Deployment_Data.hpp"
-
-#include "cpd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class PackageConfiguration : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< char > const& label () const;
-      ::XMLSchema::string< char >& label ();
-      void label (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > label_;
-
-      // UUID
-      //
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< char > const& UUID () const;
-      ::XMLSchema::string< char >& UUID ();
-      void UUID (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
-
-      // basePackage
-      //
-      public:
-      bool basePackage_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
-      ::CIAO::Config_Handlers::ComponentPackageDescription& basePackage ();
-      void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
-
-      // reference
-      //
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference& reference ();
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // selectRequirement
-      //
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& selectRequirement ();
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // configProperty
-      //
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // contentLocation
-      //
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< char > const& contentLocation () const;
-      ::XMLSchema::string< char >& contentLocation ();
-      void contentLocation (::XMLSchema::string< char > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< char > > contentLocation_;
-
-      public:
-      PackageConfiguration ();
-      PackageConfiguration (::XSCRT::XML::Element< char > const&);
-      PackageConfiguration (PackageConfiguration const& s);
-
-      PackageConfiguration&
-      operator= (PackageConfiguration const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // PCD_HPP
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.cpp
deleted file mode 100644
index 5cc0c37b532..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-#include "toplevel.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // TopLevelPackageDescription
-    // 
-
-    TopLevelPackageDescription::
-    TopLevelPackageDescription ()
-    :
-    regulator__ ()
-    {
-    }
-
-    TopLevelPackageDescription::
-    TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
-    :
-    regulator__ ()
-    {
-      package_.reserve (s.package_.size ());
-      {
-        for (package_const_iterator i (s.package_.begin ());
-        i != s.package_.end ();
-        ++i) add_package (*i);
-      }
-    }
-
-    ::CIAO::Config_Handlers::TopLevelPackageDescription& TopLevelPackageDescription::
-    operator= (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
-    {
-      package_.clear ();
-      package_.reserve (s.package_.size ());
-      {
-        for (package_const_iterator i (s.package_.begin ());
-        i != s.package_.end ();
-        ++i) add_package (*i);
-      }
-
-      return *this;
-    }
-
-
-    // TopLevelPackageDescription
-    // 
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    begin_package ()
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    end_package ()
-    {
-      return package_.end ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    begin_package () const
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    end_package () const
-    {
-      return package_.end ();
-    }
-
-    void TopLevelPackageDescription::
-    add_package (::CIAO::Config_Handlers::PackageConfiguration const& e)
-    {
-      if (package_.capacity () < package_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration > v;
-        v.reserve (package_.size () + 1);
-
-        while (package_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::PackageConfiguration& t = package_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          package_.pop_back ();
-        }
-
-        package_.swap (v);
-      }
-
-      package_.push_back (e);
-      package_.back ().container (this);
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // TopLevelPackageDescription
-    //
-
-    TopLevelPackageDescription::
-    TopLevelPackageDescription (::XSCRT::XML::Element< char > const& e)
-    :
-    Base__ (e),
-    regulator__ ()
-    {
-
-      ::XSCRT::Parser< char > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< char > e (p.next_element ());
-        ::std::basic_string< char > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "package")
-        {
-          ::CIAO::Config_Handlers::PackageConfiguration t (e);
-          add_package (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.hpp
deleted file mode 100644
index 2897d588609..00000000000
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-#ifndef TOPLEVEL_HPP
-#define TOPLEVEL_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class TopLevelPackageDescription;
-  }
-}
-
-#include <memory>
-#include <vector>
-#include "XSCRT/XMLSchema.hpp"
-#include "XSCRT/Parser.hpp"
-
-#include "pcd.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class TopLevelPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // package
-      //
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::iterator package_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator package_const_iterator;
-      package_iterator begin_package ();
-      package_iterator end_package ();
-      package_const_iterator begin_package () const;
-      package_const_iterator end_package () const;
-      void add_package (::CIAO::Config_Handlers::PackageConfiguration const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration > package_;
-
-      public:
-      TopLevelPackageDescription ();
-      TopLevelPackageDescription (::XSCRT::XML::Element< char > const&);
-      TopLevelPackageDescription (TopLevelPackageDescription const& s);
-
-      TopLevelPackageDescription&
-      operator= (TopLevelPackageDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
-#endif // TOPLEVEL_HPP
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.cpp
deleted file mode 100644
index 10a85560237..00000000000
--- a/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "DAM_Map.h"
-#include "ciao/CIAO_Config.h"
-#include "ciao/CIAO_common.h"
-
-ACE_RCSID (ExecutionManager,
-           DAM_Map,
-           "$Id$")
-
-namespace CIAO
-{
-  namespace Execution_Manager
-  {
-    DAM_Map::DAM_Map (void)
-      : map_ (CIAO_DEFAULT_MAP_SIZE)
-    {
-    }
-
-    bool
-    DAM_Map::is_plan_available (const ACE_CString &str)
-    {
-      CIAO_TRACE("Execution_Manager::DAM_Map::is_plan_available");
-      if (this->map_.find (str) == 0)
-        return true;
-
-      return false;
-    }
-
-    ::Deployment::DomainApplicationManager_ptr
-    DAM_Map::fetch_dam_reference (const ACE_CString &str)
-    {
-      CIAO_TRACE("Execution_Manager::DAM_Map::fetch_dam_reference");
-      if (!this->is_plan_available (str))
-        return ::Deployment::DomainApplicationManager::_nil ();
-
-      ::Deployment::DomainApplicationManager_var tmp;
-
-      /// There should be duplicate when assigning a _var to an _var.
-      int retval =  this->map_.find (str,
-                                     tmp);
-
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) CIAO_ExecutionManager: fetch_dam_reference, "
-                      "result from find is [%d] \n",
-                      retval));
-        }
-
-      return tmp._retn ();
-    }
-
-
-    bool
-    DAM_Map::bind_dam_reference (
-      const ACE_CString &str,
-      ::Deployment::DomainApplicationManager_ptr dam)
-    {
-      CIAO_TRACE("Execution_Manager::DAM_Map::bind_dam_reference");
-      int retval =
-        this->map_.bind (str,
-                         dam);
-
-      if (retval != 0)
-        return false;
-
-      return true;
-    }
-
-
-    Deployment::DomainApplicationManagers *
-    DAM_Map::get_dams (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
-      CORBA::ULong sz =
-        this->map_.current_size ();
-
-      // Initialize the list of DomainApplication Managers
-      Deployment::DomainApplicationManagers_var list;
-      ACE_NEW_THROW_EX (list,
-                        Deployment::DomainApplicationManagers (sz),
-                        CORBA::NO_MEMORY());
-      ACE_CHECK_RETURN (0);
-
-      // Add the manager to the list
-      list->length (sz);
-
-      Iterator end =
-        this->map_.end ();
-
-      CORBA::ULong i = 0;
-
-      for (Iterator b =
-             this->map_.begin (); b != end; ++b)
-        {
-          list [i] =
-            Deployment::DomainApplicationManager::_duplicate ((*b).int_id_.in ());
-
-          ++i;
-        }
-
-      return list._retn ();
-    }
-
-    bool
-    DAM_Map::unbind_dam (const ACE_CString &str)
-    {
-      CIAO_TRACE("Execution_Manager::DAM_Map::unbind_dam");
-      int retval =
-        this->map_.unbind (str);
-
-      if (retval != 0)
-        return false;
-
-      return true;
-    }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.h b/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.h
deleted file mode 100644
index 21d8dee5de9..00000000000
--- a/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*=======================================================================
- *
- * @file DAM_Map.h
- *
- * $Id$
- *
- * @brief Map of DomainApplicationManager to UUID's
- *
- * @author Bala Natarajan <bala @ dre.vanderbilt.edu>
- *
- *======================================================================*/
-#ifndef CIAO_DAM_MAP_H
-#define CIAO_DAM_MAP_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "ciao/DeploymentC.h"
-#include "ace/SString.h"
-
-
-namespace CIAO
-{
-  namespace Execution_Manager
-  {
-    /**
-     * @class DAM_Map
-     *
-     * @brief Map of DomainApplicationManager to ACE_CStrings
-     *
-     */
-    class DAM_Map
-    {
-    public:
-      DAM_Map (void);
-
-      bool is_plan_available (const ACE_CString &str);
-
-      ::Deployment::DomainApplicationManager_ptr
-      fetch_dam_reference (const ACE_CString &str);
-
-      bool bind_dam_reference (
-        const ACE_CString &str,
-        ::Deployment::DomainApplicationManager_ptr tmp);
-
-      Deployment::DomainApplicationManagers *
-      get_dams (ACE_ENV_SINGLE_ARG_DECL);
-
-      bool unbind_dam (const ACE_CString &str);
-
-    private:
-      typedef
-      ACE_Hash_Map_Manager_Ex < ACE_CString,
-                                ::Deployment::DomainApplicationManager_var,
-                                ACE_Hash<ACE_CString>,
-                                ACE_Equal_To<ACE_CString>,
-                                ACE_Null_Mutex> MAP;
-      typedef MAP::iterator Iterator;
-
-      MAP map_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /*CIAO_DAM_MAP_H*/
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index af67fd06b45..faa2d6a8eb5 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -1,11 +1,12 @@
 // $Id$
+
 #include "Plan_Launcher_Impl.h"
 
 #include "ace/OS.h"
 #include "ace/Get_Opt.h"
 #include <iostream>
 
-#include "ExecutionManager/ExecutionManagerC.h"
+#include "DAnCE/Interfaces/ExecutionManagerDaemonC.h"
 
 namespace CIAO
 {
@@ -13,16 +14,22 @@ namespace CIAO
   {
     // deployment plan URL
     const char* package_url = 0;
+    const char* new_package_url = 0;
+    const char* plan_uuid = 0;
     bool use_naming = false;
     const char* ior_file = "file://em.ior";
     const char* dap_ior_filename = 0;
     const char* dap_ior = 0;
-    enum mode_type { 
+
+    enum mode_type {
       pl_mode_start,
-      pl_mode_stop,
-      pl_mode_interactive
+      pl_mode_interactive,
+      pl_mode_stop_by_dam,
+      pl_mode_stop_by_uuid,
+      pl_mode_redeployment
     };
 
+    // default mode
     mode_type mode = pl_mode_interactive;
 
     static void
@@ -35,8 +42,10 @@ namespace CIAO
                   ACE_TEXT (" : Default file://em.ior\n")
                   ACE_TEXT ("-n : Use naming service to fetch")
                   ACE_TEXT (" Execution Manager IOR Alternative to -k\n")
+                  ACE_TEXT ("-t <PLAN_UUID>\n")
                   ACE_TEXT ("-o <DOMAIN_APPLICATION_MANAGER_IOR_OUTPUT_FILE>\n")
                   ACE_TEXT ("-i <DOMAIN_APPLICATION_MANAGER_IOR_FOR_INPUT>\n")
+                  ACE_TEXT ("-r <NEW_PLAN_DESCRIPTOR_FOR_REDEPLOYMENT>\n")
                   ACE_TEXT ("-h : Show this usage information\n"),
                   program));
     }
@@ -47,7 +56,7 @@ namespace CIAO
     {
       ACE_Get_Arg_Opt<char> get_opt (argc,
                            argv,
-                           ACE_TEXT ("p:nk:o:i:h"));
+                           ACE_TEXT ("p:nk:t:o:i:r:h"));
       int c;
 
       while ((c = get_opt ()) != EOF)
@@ -69,7 +78,15 @@ namespace CIAO
               break;
             case 'i':
               dap_ior = get_opt.opt_arg ();
-              mode = pl_mode_stop;
+              mode = pl_mode_stop_by_dam;
+              break;
+            case 't':
+              plan_uuid = get_opt.opt_arg ();
+              mode = pl_mode_stop_by_uuid;
+              break;
+            case 'r':
+              new_package_url = get_opt.opt_arg ();
+              mode = pl_mode_redeployment;
               break;
             case 'h':
             default:
@@ -78,12 +95,15 @@ namespace CIAO
             }
         }
 
-      if ((mode != pl_mode_stop) && (package_url == 0))
+      if ((mode != pl_mode_stop_by_dam) &&
+          (mode != pl_mode_stop_by_uuid) &&
+          (package_url == 0) &&
+          (new_package_url ==0))
         {
           usage (argv[0]);
           return false;
         }
-      
+
       return true;
     }
 
@@ -134,32 +154,32 @@ namespace CIAO
 
           if (parse_args (argc, argv) == false)
             return -1;
-          
-          
+
+
           Plan_Launcher_i launcher;
-          
+
           if (!launcher.init (use_naming ? 0 : ior_file,
                               orb.in ()))
             {
               ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error initializing the EM.\n"));
               return -1;
             }
-          
+
           ::Deployment::DomainApplicationManager_var dapp_mgr;
-          
-          if (mode != pl_mode_stop)
+
+          if (mode == pl_mode_start || mode == pl_mode_interactive)  // initial deployment
             {
               const char* uuid = launcher.launch_plan (package_url);
-              
+
               if (uuid == 0)
                 {
                   ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error launching plan\n"));
                   return -1;
                 }
-              
+
               ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid));
               dapp_mgr = launcher.get_dam (uuid);
-              
+
               // Write out DAM ior if requested
               if (mode == pl_mode_start)
                 write_dap_ior (orb.in (), dapp_mgr.in ());
@@ -169,34 +189,57 @@ namespace CIAO
                               "Press <Enter> to tear down application\n"));
                   char dummy [256];
                   std::cin.getline (dummy, 256);
+
+                  // Tear down the assembly
+                  ACE_DEBUG ((LM_DEBUG,
+                              "Plan_Launcher: destroy the application....."));
+                  if (! launcher.teardown_plan (uuid))
+                      ACE_DEBUG ((LM_DEBUG,
+                                  "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: "
+                                  "unkonw plan uuid.\n"));
                 }
             }
-          else
+          else if (mode == pl_mode_redeployment && new_package_url != 0) // do redeployment
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Plan_Launcher: reconfigure application assembly....."));
+              const char* uuid = launcher.re_launch_plan (new_package_url);
+
+              if (uuid == 0)
+                {
+                  ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error re-launching plan\n"));
+                  return -1;
+                }
+            }
+          else if (mode == pl_mode_stop_by_dam) // tear down by DAM
             {
               dapp_mgr = read_dap_ior (orb.in ()
                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
+
+              if (CORBA::is_nil (dapp_mgr.in ()))
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: "
+                              "nil DomainApplicationManager reference\n"));
+                  return -1;
+                }
+
+              // Tear down the assembly
+              ACE_DEBUG ((LM_DEBUG,
+                          "Plan_Launcher: destroy the application....."));
+              launcher.teardown_plan (dapp_mgr.in ());
             }
-          
-          if (CORBA::is_nil (dapp_mgr.in ()))
+          else if (mode == pl_mode_stop_by_uuid) // tear down by plan_uuid
             {
+              // Tear down the assembly
               ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: "
-                          "nil DomainApplicationManager reference\n"));
-              return -1;
+                          "Plan_Launcher: destroy the application....."));
+              if (! launcher.teardown_plan (plan_uuid))
+                  ACE_DEBUG ((LM_DEBUG,
+                              "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: "
+                              "unkonw plan uuid.\n"));
             }
-          
-          if (CIAO::debug_level () > 9)
-            ACE_DEBUG ((LM_DEBUG,
-                        "CIAO_PlanLauncher: Obtained DAM ref \n"));
-
-          if (mode != pl_mode_start)
-          {
-            // Tear down the assembly
-            ACE_DEBUG ((LM_DEBUG,
-                        "Plan_Launcher: destroy the application....."));
-            launcher.teardown_plan (dapp_mgr.in ());
-          }
 
           orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -233,7 +276,7 @@ int
 ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
-  ACE_DEBUG ((LM_DEBUG, "NEW PLAN LAUNCHER\n"));
-  
+  //ACE_DEBUG ((LM_DEBUG, "NEW PLAN LAUNCHER\n"));
+
   return run_main_implementation (argc, argv);
 }
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index 20921a279e8..391912025b4 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -1,24 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
-project(Plan_Launcher_Impl) : ciao_component_dnc, ciao_config_handlers {
+project(Plan_Launcher_Impl) : ciao_servant_dnc, ciao_config_handlers {
   sharedname = Plan_Launcher_Impl
-  after +=  ExecutionManager_stub NodeDaemon_stub
+  after    += ExecutionManager_stub
   libs     += ExecutionManager_stub
 
   dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL
 
   Source_Files {
     Plan_Launcher_Impl.cpp
-    DAM_Map.cpp
+    ../ExecutionManager/DAM_Map.cpp
   }
 
   Header_Files {
+    ../ExecutionManager/DAM_Map.h
     Plan_Launcher_Impl_Export.h
   }
 }
 
-project(Plan_Launcher) : ciao_component_dnc, taoexe, ciao_config_handlers  {
+project(Plan_Launcher) : ciao_server_dnc, ciao_config_handlers  {
   exename = plan_launcher
 
   after += Plan_Launcher_Impl
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 8e66ff17a7e..7f5aa59ceda 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -10,7 +10,7 @@ namespace CIAO
 {
   namespace Plan_Launcher
   {
-    
+
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb
                             ACE_ENV_ARG_DECL)
@@ -19,19 +19,17 @@ namespace CIAO
         orb->resolve_initial_references ("NameService"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ()
                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
-      CosNaming::Name name (2);
-      name.length (2);
+
+      CosNaming::Name name (1);
+      name.length (1);
       name[0].id =
-        CORBA::string_dup ("CIAO");
-      name[1].id =
         CORBA::string_dup ("ExecutionManager");
-      
+
       return pns->resolve (name
                            ACE_ENV_ARG_PARAMETER);
     }
@@ -40,13 +38,13 @@ namespace CIAO
       : em_ ()
     {
     }
-    
+
     bool
     Plan_Launcher_i::init (const char *em_ior,
-                         CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+                           CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     {
       CORBA::Object_var obj;
-            
+
       if (em_ior == 0)
         {
           obj = fetch_reference_naming (orb ACE_ENV_ARG_PARAMETER);
@@ -58,55 +56,63 @@ namespace CIAO
                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      
+
       this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
                                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       if (CORBA::is_nil (this->em_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) CIAO_PlanLauncher: nil Execution"
-                          " Manager reference, narrow failed\n"));
+                      "(%P|%t) CIAO_PlanLauncher: nil Execution"
+                      " Manager reference, narrow failed\n"));
           return false;
         }
-      
+
       if (CIAO::debug_level () > 9)
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) CIAO_PlanLauncher: Obtained Execution"
                     " Manager ref \n"));
-      
+
       return true;
     }
-    
-    
-    const char * 
+
+
+    const char *
     Plan_Launcher_i::launch_plan (const char *plan_uri ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
+      ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n"));
+
       CIAO::Config_Handlers::XML_File_Intf intf (plan_uri);
-      
+
       ::Deployment::DeploymentPlan_var plan =
           intf.get_plan ();
-      
+      ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n"));
       return this->launch_plan (plan.in ());
     }
-    
-    const char * 
+
+    const char *
     Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
-          
+
       if (CORBA::is_nil (this->em_.in ()))
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("CIAO::Plan_Launcher_i: ")
-                      ACE_TEXT ("launch_plan called witn an uninitialized EM.\n")));            
+                      ACE_TEXT ("launch_plan called witn an uninitialized EM.\n")));
           return 0;
         }
-      
+
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+                  ACE_TEXT ("about to call this->em_->preparePlan\n")));
       ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1));
-      
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+                  ACE_TEXT ("after to call this->em_->preparePlan\n")));
+
       if (CORBA::is_nil (dam.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -114,20 +120,20 @@ namespace CIAO
                       "nil DomainApplicationManager reference\n"));
           return 0;
         }
-      
+
       if (CIAO::debug_level () > 9)
         ACE_DEBUG ((LM_DEBUG,
                     "CIAO_PlanLauncher: Obtained DAM ref \n"));
-      
+
       ::Deployment::Properties_var properties;
       ACE_NEW_RETURN (properties,
                       Deployment::Properties,
                       0);
-      
+
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
-                    "CIAO_PlanLauncher: start Launch application..."));
-      
+                    "CIAO_PlanLauncher: start Launch application...\n"));
+
       // Dont not start the Application immediately since it vialtes
       // the semantics of component activation sequence
       int start = 0;
@@ -135,37 +141,35 @@ namespace CIAO
         {
 
           dam->startLaunch (properties.in (), 0);
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           // Call finish Launch to complete the connections
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
-                        "CIAO_PlanLauncher: finish Launch application..."));
-          dam->finishLaunch (start);
-      
+                        "CIAO_PlanLauncher: finish Launch application...\n"));
+          dam->finishLaunch (start, false); // is_ReDAC by default is <false>
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           // Call start to activate components
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
-                        "CIAO_PlanLauncher: start activating components..."));
+                        "CIAO_PlanLauncher: start activating components...\n"));
           dam->start ();
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("CIAO_PlanLauncher: ")
                         ACE_TEXT ("Application Deployed successfully\n")));
-      
+
           map_.bind_dam_reference (plan.UUID.in (),
                                    Deployment::DomainApplicationManager::_duplicate (dam.in ()));
-
-
         }
       ACE_CATCH (Deployment::ResourceNotAvailable, ex)
         {
@@ -179,7 +183,7 @@ namespace CIAO
                       ex.resourceType.in (),
                       ex.propertyName.in (),
                       ex.elementName.in (),
-                      ex.resourceName.in ()));             
+                      ex.resourceName.in ()));
           ACE_THROW (Deployment_Failure ());
         }
       ACE_CATCH (Deployment::StartError, ex)
@@ -206,15 +210,28 @@ namespace CIAO
                       ex.reason.in ()));
           ACE_THROW (Deployment_Failure  ());
         }
+      ACE_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "CORBA EXCEPTION: %s\n",
+                      ACE_ANY_EXCEPTION._info().fast_rep()));
+          ACE_THROW (Deployment_Failure  ());
+        }
+      ACE_CATCHALL
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "EXCEPTION: non-CORBA exception\n"));
+          ACE_THROW (Deployment_Failure  ());
+        }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
-      
+
       std::string * retv = new std::string (plan.UUID.in ());
-      
-      return (*retv).c_str ();      
+
+      return (*retv).c_str ();
     }
-    
-    ::Deployment::DomainApplicationManager_ptr 
+
+    ::Deployment::DomainApplicationManager_ptr
     Plan_Launcher_i::get_dam (const char *uuid ACE_ENV_ARG_DECL)
     {
       if (!this->map_.is_plan_available (uuid))
@@ -226,53 +243,118 @@ namespace CIAO
         }
       return this->map_.fetch_dam_reference (uuid);
     }
-    
+
     bool
     Plan_Launcher_i::teardown_plan (const char *uuid)
     {
-      if (!this->map_.is_plan_available (uuid))
-        return false;
-      
-      ::Deployment::DomainApplicationManager_var dapp_mgr 
-          (this->map_.fetch_dam_reference (uuid));
-      
-      
-      this->map_.unbind_dam (uuid);
-      
+      // Since people could always run another instance of the Plan_Launcher
+      // executable to tear down a plan, so we could NOT rely on the local
+      // DAM_Map to fetch DAM obj reference. Instead, we make a remote call
+      // on ExecutionManager to fetch it.
+      ACE_TRY
+        {
+          ::Deployment::DomainApplicationManager_var dapp_mgr =
+              this->em_->getManager (uuid);
+
+          dapp_mgr->destroyApplication ();
+          if (CIAO::debug_level ())
+            ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+          // Note that we should ask the DAM to tell EM whether the DAM should
+          // be destroyed
+          this->destroy_dam_by_plan (uuid);
+        }
+      ACE_CATCHANY
+        {
+          ACE_DEBUG ((LM_ERROR, "Unable to find DomainApplicationManager "
+                      "for plan with uuid: %s\n", uuid));
+          return false;
+        }
+      ACE_ENDTRY;
+
       return true;
     }
-    
-    bool 
+
+    bool
     Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam
-                                  ACE_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     {
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
-                    "CIAO_PlanLauncher: destroy the application....."));
+                    "CIAO_PlanLauncher: destroy the application.....\n"));
+
       dam->destroyApplication ();
-      
+
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
 
-      this->destroy_dam (dam);      
-      
+      this->destroy_dam (dam);
+
       return true;
     }
-    
-    void 
+
+    void
     Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam
-                                ACE_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     {
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
-                    "CIAO_PlanLauncher: destroy the manager....."));
+                    "CIAO_PlanLauncher: destroy the manager.....\n"));
 
       this->em_->destroyManager (dam);
 
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
     }
-    
+
+    void
+    Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid
+                                          ACE_ENV_ARG_DECL)
+    {
+      if (CIAO::debug_level ())
+        ACE_DEBUG ((LM_DEBUG,
+                    "CIAO_PlanLauncher: destroy the manager.....\n"));
+
+      this->em_->destroyManagerByPlan (plan_uuid);
+
+      if (CIAO::debug_level ())
+        ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+    }
+
+    const char *
+    Plan_Launcher_i::re_launch_plan (const char *plan_uri ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
+    {
+      CIAO::Config_Handlers::XML_File_Intf intf (plan_uri);
+
+      ::Deployment::DeploymentPlan_var plan =
+          intf.get_plan ();
+
+      return this->re_launch_plan (plan.in ());
+    }
+
+    const char *
+    Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
+    {
+
+      if (CORBA::is_nil (this->em_.in ()))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("CIAO::Plan_Launcher_i: ")
+                      ACE_TEXT ("re_launch_plan called witn an uninitialized EM.\n")));
+          return 0;
+        }
+
+      this->em_->perform_redeployment (plan);
+
+      if (CIAO::debug_level ())
+        ACE_DEBUG ((LM_DEBUG,
+                    "CIAO_PlanLauncher: new plan redeployed ...\n"));
+
+      std::string * retv = new std::string (plan.UUID.in ());
+
+      return (*retv).c_str ();
+    }
   }
-  
 }
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 41e2cebacb8..e91711332d4 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -1,8 +1,8 @@
-/** 
+/**
  * $Id$
  * @file Plan_Launcher_Impl.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Contains the Plan_Launcher_i class, which can be used by
  * applications to launch component assemblies.
  */
@@ -12,14 +12,14 @@
 #include "Plan_Launcher_Impl_Export.h"
 #include "ciao/DeploymentS.h"
 #include "ciao/CIAO_common.h"
-#include "ExecutionManager/DAM_Map.h"
-#include "ExecutionManager/ExecutionManagerC.h"
+#include "DAnCE/ExecutionManager/DAM_Map.h"
+#include "DAnCE/Interfaces/ExecutionManagerDaemonC.h"
 
 namespace CIAO
 {
   namespace Plan_Launcher
   {
-    
+
     /**
      * @class Plan_Launcher_i
      * @brief This class launches and manages deployment plans.
@@ -28,13 +28,13 @@ namespace CIAO
     {
     public:
       class Deployment_Failure {};
-      
+
       Plan_Launcher_i ();
-      
-      
-      bool init (const char *em_ior, 
+
+
+      bool init (const char *em_ior,
                  CORBA::ORB_ptr orb
-                 ACE_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       /**
        * @fn launch_plan
@@ -43,9 +43,13 @@ namespace CIAO
        * @returns a string containing the UUID of the plan. Null indicates failure.
        */
       const char * launch_plan (const char *plan_uri
-                                ACE_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
-      
+
+      const char * re_launch_plan (const char *plan_uri
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((Deployment_Failure));
+
       /**
        * @fn launch_plan
        * @brief Launch a plan, given an IDL deployment plan
@@ -53,30 +57,36 @@ namespace CIAO
        * @returns a string containing the UUID of the plan. Null indicates failure.
        */
       const char * launch_plan (const ::Deployment::DeploymentPlan &plan
-                                ACE_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((Deployment_Failure));
+
+      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
-      
+
       /// Returns the DAM associated with a given plan URI
       ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid
-                                                          ACE_ENV_ARG_DECL);
-      
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
       /// Tears down a plan given the UUID
       bool teardown_plan (const char *uuid ACE_ENV_ARG_DECL);
-      
+
       bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam
-                          ACE_ENV_ARG_DECL);
-      
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
       void destroy_dam (::Deployment::DomainApplicationManager_ptr dam
-                        ACE_ENV_ARG_DECL);
-      
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+      void destroy_dam_by_plan (const char * plan_uuid
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
     private:
       ::CIAO::ExecutionManagerDaemon_var em_;
-      
+
       /// Local map for DAMs, to save expensive UUID lookups.
       Execution_Manager::DAM_Map map_;
-      
     };
-    
+
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
index 4f92f0edbe9..854a98b7e1a 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
@@ -1,12 +1,11 @@
 // $Id$
 
 #include "ciao/NodeApplication_CallBackC.h"
-#include "NodeApplication_Task.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-#include "RTServer_Impl.h"
-#include "ace/Null_Mutex.h"
 #include "ciao/CIAO_common.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
+#include "ace/Null_Mutex.h"
+#include "NodeApplication_Task.h"
+#include "RTServer_Impl.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplication_Task.inl"
@@ -19,7 +18,7 @@ CIAO::NodeApplication_Task::svc ()
     {
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
@@ -29,7 +28,7 @@ CIAO::NodeApplication_Task::svc ()
 
       object =
         this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
@@ -84,18 +83,18 @@ CIAO::NodeApplication_Task::svc ()
        */
       bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (retval)
-      {
-	ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+        {
+          ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
                                initializing the session container!"));
 	return 1;
       }
-      
+
       CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (this->options_.ior_output_filename_.length () != 0)
         CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (),
                                   str.in ());
@@ -118,7 +117,7 @@ CIAO::NodeApplication_Task::svc ()
 
           CIAO::NodeApplication_Callback_var nam_callback
             = CIAO::NodeApplication_Callback::_narrow (object.in ()
-						       ACE_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Deployment::Properties_out properties_out (prop.out ());
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
index 5b14a2b5ab5..521dd9a4806 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
@@ -36,7 +36,7 @@ namespace CIAO
    * @brief An ACE_Task subclass that manages the RT-ORB therad
    */
   class NodeApplication_Task
-    : public virtual ACE_Task_Base
+    : public ACE_Task_Base
   {
   public:
     // We can add a rt-task configuration facility here.
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
index c3ae7a829b5..b2923cde8aa 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
@@ -7,5 +7,5 @@ CIAO::NodeApplication_Task::NodeApplication_Task (ACE_Thread_Manager &tm,
   : ACE_Task_Base (&tm),
     orb_ (CORBA::ORB::_duplicate (o)),
     options_ (opts)
-{ 
+{
 }
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/README b/TAO/CIAO/DAnCE/RTNodeApplication/README
index 9ec28e29391..9a0c7e03aaa 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/README
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/README
@@ -1,6 +1,7 @@
 $Id$
 
-This directory contains the RTNodeApplication implementation
+This directory contains the depricated RTNodeApplication
+implementation.  It will be removed shortly.
 
 * Currently, the RTNodeApplication does not support configuring of any
   RT policies.
@@ -21,18 +22,18 @@ This directory contains the RTNodeApplication implementation
   RTNodeApplication.cpp: Main program
 
   NodeApplication_Task.*: ACE_Task class for spawning the thread for
-                          RT-NodeApplication using the right scheduling 
+                          RT-NodeApplication using the right scheduling
                           strategy.
 
-  RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation.  
+  RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation.
 
   senv.sh: A simple shell script for setting up the run-time
-           environment when starting NodeDaemon with sudo.  
+           environment when starting NodeDaemon with sudo.
            This is necessary because the RTNodeApplication needs to
            spawn threads with real-time scheduling class.  This
            operation requires the process to be run by privileged user.
-           You may need to tweak this shell script to suit your need. 
-           Here's an example of how to use the script: 
+           You may need to tweak this shell script to suit your need.
+           Here's an example of how to use the script:
 
             $ sudo senv.sh $CIAO_ROOT/DAnCE/NodeManager/NodeManager \
                 -ORBEndpoint iiop://localhost:10000 \
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc
deleted file mode 100644
index db58a042214..00000000000
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-project(RTNodeApplication): ciao_component_dnc,rt_server {
-
-  exename = RTNodeApplication
-
-  Source_Files {
-    NodeApplication_Task.cpp
-    RTNodeApplication.cpp
-    RTServer_Impl.cpp
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/senv.sh b/TAO/CIAO/DAnCE/RTNodeApplication/senv.sh
deleted file mode 100755
index bc01029e288..00000000000
--- a/TAO/CIAO/DAnCE/RTNodeApplication/senv.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ACE_ROOT/lib
-export LD_LIBRARY_PATH
-$*
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
deleted file mode 100644
index 1fc19b0d1be..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "Deployment.idl"
-
-module CIAO
-{
-  interface RepositoryManagerDaemon : Deployment::RepositoryManager
-  {
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index 4e059b669b2..159066e31ec 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,24 +1,51 @@
 // -*- MPC -*-
 // $Id$
 
-project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe, xerces, exceptions {
-  exename = executor
-  after += Config_Handlers ExecutionManager_stub NodeManager_stub
-  includes += /usr/include $(CIAO_ROOT)/tools
-  libpaths += /usr/lib
-  libs     += Config_Handlers NodeManager_stub
-  libs     += ExecutionManager_stub CIAO_DnC_Server
-  after    += Config_Handlers
+//RepositoryManager project: implementation of a repository manager
+//compleint with the D&C spec
+
+project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zzip, zlib {
+
+  includes += $(CIAO_ROOT)/tools/Config_Handlers  //to circumvent an improper include resolution
+                                                  //in the Package_Handlers/PC_Intf.h
+  exename = RepositoryManagerDeamon
+  requires += zzip zlib
+  libs += Package_Config_Handlers
 
   IDL_Files {
-    RepositoryManager.idl
+    RepositoryManagerDaemon.idl
   }
 
   Source_Files {
-    RepositoryManagerC.cpp
-    RepositoryManagerS.cpp
-    Update_Plan.cpp
-    Repository_Manager.cpp
+    RepositoryManagerDaemonC.cpp
+    RepositoryManagerDaemonS.cpp
+    ZIP_Wrapper.cpp
+    RepositoryManager.cpp
     RepositoryManager_Impl.cpp
+    RM_Helper.cpp
+    URL_Parser.cpp
+    HTTP_Handler.cpp
+    HTTP_Client.cpp
+    PC_Updater_T.cpp
+    PC_Updater.cpp
+  }
+}
+
+
+// RMadmin project: a sample client for the RM.
+
+project (RMAdmin) : ciao_servant_dnc, ciao_config_handlers {
+  exename = RMadmin
+  after  += RepositoryManager
+
+  IDL_Files {
+   RepositoryManagerDaemon.idl
+  }
+
+  Source_Files {
+    RMadmin.cpp
+    RepositoryManagerDaemonC.cpp
+    Options.cpp
+    RM_Helper.cpp
   }
 }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index da85e59cf55..d7e953a777a 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -1,205 +1,1140 @@
-/* -*- C++  -*- */
-// $Id$
+//====================================================================
+/**
+ * @file RepositoryManager_Impl.cpp
+ *
+ * $Id$
+ *
+ * Description: Actial implementation of the RepoMan
+ *
+ * @author Stoyan Paunov
+ */
+//====================================================================
 
 #include "RepositoryManager_Impl.h"
-#include "Repository_Manager_conf.h"
-#include "Old_Config_Handlers/TPD_Handler.h"
-#include "Old_Config_Handlers/DnC_Dump.h"
 
-CIAO::RepositoryManager_Impl::RepositoryManager_Impl
-   (CORBA::ORB_ptr orb,
-    PortableServer::POA_ptr poa)
-  : orb_ (CORBA::ORB::_duplicate  (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    pc_table_ (MAX_PACKAGES)
+#include "ace/OS_NS_fcntl.h"       //for open
+#include "ace/OS_NS_unistd.h"      //for close
+#include "ace/OS_NS_sys_stat.h"    //for filesize and fstat and mkdir
+#include "ace/OS_NS_string.h"      //for ACE_CString
+#include "ace/OS_Memory.h"         //for ACE_NEW* macros
+
+
+//to remove a file or dir from the local filesystem need remove () from stdio.h
+// ---> need to include ace/OS_NS_stdio.h which would include the correct file for any OS!
+#include "ace/OS_NS_stdio.h"
+
+#include "ZIP_Wrapper.h"                //Wrapper around zzip
+#include "ace/Containers_T.h"           //for ACE_Double_Linked_List
+#include "ace/Malloc_Allocator.h"       //for ACE_New_Allocator
+
+//for the PackageConfiguration parsing
+//#include "Config_Handlers/Package_Handlers/PC_Intf.h"
+#include "ciao/Deployment_DataC.h"
+#include "ciao/Packaging_DataC.h"
+#include "Config_Handlers/Utils/XML_Helper.h"
+#include "Config_Handlers/Package_Handlers/PCD_Handler.h"
+//#include "xercesc/dom/DOM.hpp"
+
+#include "RM_Helper.h"            //to be able to externalize/internalize a PackageConfiguration
+#include "ace/Message_Block.h"    //for ACE_Message_Block
+
+#include "ace/Thread.h"           //for obtaining the ID of the current thread
+#include "ace/OS_NS_stdlib.h"     //for itoa ()
+
+#include "URL_Parser.h"           //for parsing the URL
+#include "HTTP_Client.h"          //the HTTP client class to downloading packages
+
+#include "PC_Updater.h"           //A visitor class to walk through the elements of the PC
+
+#include <iostream>
+using namespace std;
+
+//-----------------------------------------------------------------
+//Constructor
+//
+//-----------------------------------------------------------------
+
+CIAO_RepositoryManagerDaemon_i::CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb, const char* server)
+  : the_orb_ (CORBA::ORB::_duplicate (the_orb)),
+    install_root_ (""),
+    HTTP_server_ (server)
 {
+  //create directory in which the packages will be stored
+
+  ACE_OS::mkdir(INSTALL_PATH);
+  //if dir already exists a -1 is returned
+  //we ignore this, just need to make sure the directory exists
+
+  ACE_OS::getcwd (this->cwd_, TEMP_LEN);
+
+  this->install_root_ = this->cwd_;
+  this->install_root_ += "/";
+  this->install_root_ += INSTALL_PATH;
 }
 
-CIAO::RepositoryManager_Impl::RepositoryManager_Impl ()
-  : pc_table_ (MAX_PACKAGES)
+//-----------------------------------------------------------------
+//Destructor
+//
+//-----------------------------------------------------------------
+
+CIAO_RepositoryManagerDaemon_i::~CIAO_RepositoryManagerDaemon_i (void)
 {
+  this->names_.unbind_all ();
+  this->uuids_.unbind_all ();
 }
 
-CIAO::RepositoryManager_Impl::~RepositoryManager_Impl ()
+//-----------------------------------------------------------------
+//shutdown
+//
+//-----------------------------------------------------------------
+
+void CIAO_RepositoryManagerDaemon_i::shutdown ()
+
+                ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                                ))
 {
+
+  this->names_.unbind_all ();
+  this->uuids_.unbind_all ();
+
+  this->the_orb_->shutdown (0);
 }
 
-void
-CIAO::RepositoryManager_Impl::
-installPackage (const char* installation_name,
-                const char* location
-                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NameExists,
-                   Deployment::PackageError))
+
+//-----------------------------------------------------------------
+//installPackage
+//
+//-----------------------------------------------------------------
+
+void CIAO_RepositoryManagerDaemon_i::installPackage (
+                                                     const char * installationName,
+                                                     const char * location
+                                                     )
+                     ACE_THROW_SPEC ((
+                                      CORBA::SystemException,
+                                      ::Deployment::NameExists,
+                                      ::Deployment::PackageError
+                                     ))
 {
-  try
-    {
-      xercesc::XMLPlatformUtils::Initialize();
-    }
-  catch (const XMLException& xml_e)
-    {
-      char* message = XMLString::transcode (xml_e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
-      return;
-    }
-  try
+
+  PCEntry *entry = 0;
+
+  if (this->names_.find (ACE_CString (installationName), entry) == 0)
+    ACE_THROW (Deployment::NameExists ());
+
+  //Now lets form the path for the local file
+  //NOTE: I need the absolute path because I will change to a subdirectory
+  //when I am parsing the descriptors
+
+  ACE_CString path (this->install_root_);
+  path += "/";
+  path += installationName;
+
+  ACE_CString package_path (path);
+  package_path += ".cpk";        //package extension
+
+  ACE_CString pc_path (path);
+  pc_path += PC_EXTENSION;      //external PackageConfiguration extension
+
+
+  ACE_CString descriptor_dir (path);
+  descriptor_dir += "/descriptors/"; //location of the descriptor directory
+
+
+  //check if URL or local file
+  //download or load into memory
+
+  size_t length = 0;
+
+  if (ACE_OS::strstr (location, "http://"))
     {
-      CIAO::Config_Handler::Config_Error_Handler tpd_err_handler;
-      CIAO::Config_Handler::Config_Error_Handler pc_err_handler;
-      auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils::
-                                       create_parser ());
-      tpd_parser->setErrorHandler(&tpd_err_handler);
-      DOMDocument* tpd_doc = tpd_parser->parseURI (location);
 
-      if (tpd_err_handler.getErrors())
+      //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
+      ACE_Message_Block* mb;
+      ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ());
+      ACE_CHECK_RETURN (0);
+
+      //get the remote file
+      if (!HTTP_Get (location, *mb))
         {
-          throw Deployment::PackageError ();
+          mb->release ();
+          ACE_THROW (CORBA::INTERNAL ());
         }
 
-      CIAO::Config_Handler::TPD_Handler top_pc_handler
-        (tpd_doc,
-         DOMNodeFilter::SHOW_ELEMENT |
-         DOMNodeFilter::SHOW_TEXT);
-      ACE_TString package_location = top_pc_handler.
-          process_TopLevelPackageDescription ();
-
-      auto_ptr<DOMBuilder> pc_parser (CIAO::Config_Handler::Utils::
-                                      create_parser ());
-      pc_parser->setErrorHandler(&pc_err_handler);
-      DOMDocument* pc_doc = pc_parser->parseURI (package_location.c_str());
-
-      if (pc_err_handler.getErrors())
+      // Write file to designated location on disk
+      if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
         {
-          throw Deployment::PackageError ();
+          mb->release ();
+          ACE_THROW (CORBA::INTERNAL ());
         }
 
-      CIAO::Config_Handler::PC_Handler pc_handler (pc_doc,
-                                                   DOMNodeFilter::SHOW_ELEMENT |
-                                                   DOMNodeFilter::SHOW_TEXT);
-      Deployment::PackageConfiguration pc;
-      pc_handler.process_PackageConfiguration (pc);
-      //Deployment::DnC_Dump::dump (pc);
-      this->pc_table_.bind (installation_name, (pc));
-      //Deployment::DnC_Dump::dump (*(&pc));
+      mb->release ();
     }
-  catch (CORBA::Exception& ex)
+  else
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return;
-    }
-  catch (const DOMException& e)
+      CORBA::Octet* file = 0;
+
+      //read the package from disk and store in the RM directory
+      //see if you can substiture this with a memory mapped file
+      //for better perofrmance (mimic zero copy here)
+      file = RM_Helper::read_from_disk (location, length);
+
+      if (!file)
+        ACE_THROW (CORBA::INTERNAL ());
+
+      //Store the package in the local RM dir for future retrieval
+      if (!RM_Helper::write_to_disk (package_path.c_str (), file, length))
     {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
+      delete file;
+          ACE_THROW (CORBA::INTERNAL ());
+    }
 
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
-                  \n",location));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      return;
+      //NOTE: MEMORY LEAK UNLESS delete file; change to Auto_Ptr
+      delete file;
     }
-  catch (...)
+
+
+  ZIP_Wrapper::uncompress (const_cast<char*> (package_path.c_str ()),
+                           const_cast<char*> (this->install_root_.c_str ()),
+                           false //not verbose
+                           );
+
+  //Start the parsing
+
+  ACE_CString pc_name;
+
+  this->find_PC_name (const_cast<char*> (package_path.c_str ()), pc_name);
+
+  //if the PackageConfiguration name cannot be found, then there is nothing to install
+  if (pc_name == "")
+    ACE_THROW (Deployment::PackageError ());
+
+
+  //TODO: move exception throwing out of this func. User boolean error handling!!!
+  //TODO: check for errors!
+  Deployment::PackageConfiguration_var pc;
+  pc = this->retrieve_PC_from_descriptors (const_cast<char*> (pc_name.c_str ()),
+                                           descriptor_dir.c_str ());
+
+
+  //forming the server path info
+  ACE_CString server_path (this->HTTP_server_);
+  server_path += installationName;
+  server_path += "/implementations/";
+
+  //NOTE: ComponentPackageReferences are currently NOT supported
+  if (!(pc->basePackage.length () > 0))
+    ACE_THROW (CORBA::NO_IMPLEMENT ());
+
+  PC_Updater updater (server_path, package_path);
+
+  if (!updater.update (pc))
     {
-      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      return;
+      ACE_DEBUG ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
+      remove_extracted_package (package_path.c_str (), path.c_str ());
+      remove (package_path.c_str ());
+      ACE_THROW (Deployment::PackageError ());
     }
+
+
+  //now lets externalize the PackageConfiguration, so that we can access it later on
+  //without having to do the whole parsing again.
+  //NOTE: Order here is important. Do not populate maps before the externalization!
+  RM_Helper::externalize (pc, pc_path.c_str ());
+
+  //insert the package into the database
+  if (this->names_.bind (ACE_CString (installationName), path) == -1)
+  {
+     ACE_DEBUG ((LM_ERROR,
+                 "[RM] could not bind %s.\n",
+                 installationName));
+
+     //clean the extracted files
+     remove_extracted_package (package_path.c_str (), path.c_str ());
+     //remove the package
+     remove (package_path.c_str ());
+     //remove the PackageConfiguration externalization
+     remove (pc_path.c_str ());
+
+   //throw exception
+   ACE_THROW (CORBA::INTERNAL ());
+  }
+
+  //ALSO NEED THE UUID here
+  if (this->uuids_.bind (ACE_CString (pc->UUID), path) == -1)
+  {
+     ACE_DEBUG ((LM_ERROR,
+                 "[RM] could not bind %s.\n",
+                 pc->UUID));
+
+     //unbind the name
+     this->names_.unbind (installationName);
+
+     //clean the extracted files
+     remove_extracted_package (package_path.c_str (), path.c_str ());
+     //remove the package
+     remove (package_path.c_str ());
+     //remove the PackageConfiguration externalization
+     remove (pc_path.c_str ());
+
+     //throw exception
+     ACE_THROW (CORBA::INTERNAL ());
+  }
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+  //now add the type interface
+  //TODO: CHECK if successful
+  if(!this->add_type (pc, installationName))
+    ACE_DEBUG ((LM_ERROR, "Failed to add the type\n"));
+#endif
+
+  this->dump ();
+
+  ACE_DEBUG ((LM_INFO,
+              "Installed PackageConfiguration \n\tname: %s \n\tuuid: %s\n",
+              installationName, pc->UUID));
 }
 
-void
-CIAO::RepositoryManager_Impl::
-createPackage (const char*,
-               const Deployment::PackageConfiguration&,
-               const char*,
-               CORBA::Boolean
-               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NameExists,
-                   Deployment::PackageError))
+
+//-----------------------------------------------------------------
+//createPackage
+//
+//-----------------------------------------------------------------
+
+void CIAO_RepositoryManagerDaemon_i::createPackage (
+                                                    const char * installationName,
+                                                    const ::Deployment::PackageConfiguration & package,
+                                                    const char * baseLocation,
+                                                    ::CORBA::Boolean replace
+                                                    )
+                   ACE_THROW_SPEC ((
+                                    CORBA::SystemException,
+                                    ::Deployment::NameExists,
+                                    ::Deployment::PackageError
+                                   ))
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-Deployment::PackageConfiguration*
-CIAO::RepositoryManager_Impl::findPackageByName (const char* name
-                                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
-{
-  Deployment::PackageConfiguration pc;
-  if (pc_table_.find (name, pc) == 0)
-    {
-      //Deployment::PackageConfiguration* dup_pc = pc;
-      //Deployment::DnC_Dump::dump (*pc);
-      //return dup_pc;
-      Deployment::PackageConfiguration_var pc_var = 0;
-      ACE_NEW_THROW_EX (pc_var,
-                        Deployment::PackageConfiguration (pc),
-                        CORBA::NO_MEMORY ());
-      //Deployment::DnC_Dump::dump (*pc_var);
-      return pc_var._retn ();
+
+//-----------------------------------------------------------------
+//findPackageByName
+//
+//-----------------------------------------------------------------
+
+::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
+
+  PCEntry *entry = 0;
+
+  if (this->names_.find (ACE_CString (name), entry) != 0)
+    ACE_THROW (Deployment::NoSuchName ());
+  //PackageConfiguration was not found
+
+  ACE_CString pc_path (entry->int_id_.c_str ());
+  pc_path += PC_EXTENSION;
+
+  Deployment::PackageConfiguration_var pc;
+  ACE_NEW_THROW_EX (pc,
+                    Deployment::PackageConfiguration (),
+                    CORBA::INTERNAL ());
+
+  ACE_CHECK_RETURN (0);
+
+  if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  ACE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
+
+  return pc._retn ();
+}
+
+
+//-----------------------------------------------------------------
+//findPackageByUUID
+//
+//-----------------------------------------------------------------
+
+::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
+
+  PCEntry *entry = 0;
+
+  if (this->uuids_.find (ACE_CString (UUID), entry) != 0)
+    ACE_THROW (Deployment::NoSuchName ());
+  //PackageConfiguration was not found
+
+  ACE_CString pc_path (entry->int_id_.c_str ());
+  pc_path += PC_EXTENSION;
+
+  Deployment::PackageConfiguration_var pc;
+  ACE_NEW_THROW_EX (pc,
+                    Deployment::PackageConfiguration (),
+                    CORBA::INTERNAL ());
+
+  ACE_CHECK_RETURN (0);
+
+  if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  ACE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
+
+  return pc._retn ();
+}
+
+//-----------------------------------------------------------------
+//findPackageByType
+//
+//-----------------------------------------------------------------
+
+::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::findNamesByType (
+                                                                      const char * type
+                                                                      )
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException
+                   ))
+{
+
+#if !defined ASSEMBLY_INTERFACE_SUPPORT
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+#endif
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+
+  CIEntry *entry = 0;
+
+    //find the type in the interface map
+  if (!this->types_.find (ACE_CString (type), entry))
+  {
+    //return an empty sequence
+    CORBA::StringSeq_var seq;
+    ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::INTERNAL ());
+    ACE_CHECK_RETURN (0);
+  return seq._retn ();
+  }
+  else
+  {
+    //The CORBA::StringSeq is implemented as an array and growing
+    //one at a time on demand is very inefficient due to the
+    //deallocations and reallocations. This is why we figure out the
+    //number of elements in advance and then create a CORBA::StringSeq
+    //of the right length
+
+    CIBucket_Iterator counter (this->types_, type);
+
+    CIBucket_Iterator end (this->types_,
+                 type,
+                 1 /*tail = true*/);
+
+    //count the number of components implementing this type
+    CORBA::ULong num_entries = 0;
+    for (;
+       counter != end;
+       ++counter)
+       ++num_entries;
+
+    //allocate a sequence of the right length
+    CORBA::StringSeq_var seq;
+    ACE_NEW_THROW_EX (seq,
+                      CORBA::StringSeq (num_entries),
+                      CORBA::INTERNAL ());
+
+    ACE_CHECK_RETURN (0);
+
+    //store the elements in the string sequence
+    CIBucket_Iterator iter (this->types_, type);
+    CORBA::ULong index = 0;
+    for (;
+       iter != end && index < num_entries;
+       ++iter, ++index)
+    {
+      CIEntry& element = *iter;
+      seq[index] = CORBA::string_dup (element.int_id_.c_str ());
     }
+
+    return seq._retn ();
+  }
+
+#endif
+}
+
+
+//-----------------------------------------------------------------
+//getAllNames
+//
+//-----------------------------------------------------------------
+
+::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
+  //Apparently the only way to figure out the number of keys is to
+  //count them with an iterator.
+
+  CORBA::ULong num_entries = 0;
+
+  for (PCMap_Iterator i = this->names_.begin ();
+         i != this->names_.end ();
+         ++i)
+     ++num_entries;
+
+  CORBA::StringSeq_var seq;
+  ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::INTERNAL ());
+
+  ACE_CHECK_RETURN (0);
+
+  seq->length (num_entries);
+
+  CORBA::ULong index = 0;
+  for (PCMap_Iterator iter = this->names_.begin ();
+    iter != this->names_.end () && index < num_entries;
+    ++iter, ++index)
+  {
+    CIEntry& element = *iter;
+    seq[index] = CORBA::string_dup (element.ext_id_.c_str ());
+  }
+
+  ACE_DEBUG ((LM_INFO, "Current # packages [ %d ]\n", seq->length ()));
+
+  return seq._retn ();    //release the underlying CORBA::StringSeq
+}
+
+
+//-----------------------------------------------------------------
+//getAllTypes
+//
+//-----------------------------------------------------------------
+
+::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::getAllTypes (
+
+  )
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException
+                   ))
+{
+
+#if !defined ASSEMBLY_INTERFACE_SUPPORT
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+#endif
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+
+  //Map.current_size () gives you the current number with the duplicates
+  //Map.total_size () gives you the allocated space + the empty slots
+  //Apparently the only way to figure out the number of keys is to
+  //count them with an iterator.
+
+  CORBA::ULong num_entries = 0;
+
+  for (PCMap_Iterator i = this->names_.begin ();
+         i != this->names_.end ();
+         ++i)
+     ++num_entries;
+
+  ACE_DEBUG ((LM_DEBUG, "# names: %d\n", num_entries));
+
+
+  CORBA::StringSeq_var seq;
+  ACE_NEW_THROW_EX (seq,
+                    CORBA::StringSeq (num_entries),
+                    CORBA::INTERNAL ());
+
+  ACE_CHECK_RETURN (0);
+
+  seq->length (num_entries);
+
+  CORBA::ULong index = 0;
+  for (CIMap_Iterator iter = this->types_.begin ();
+    iter != this->types_.end () && index < num_entries;
+    ++iter, ++index)
+
+  {
+    CIEntry& element = *iter;
+    seq[index] = CORBA::string_dup (element.int_id_.c_str ());
+  }
+
+  return seq._retn ();    //release the underlying CORBA::StringSeq
+
+#endif
+}
+
+
+//-----------------------------------------------------------------
+//DeletePackage
+//
+//-----------------------------------------------------------------
+
+void CIAO_RepositoryManagerDaemon_i::deletePackage (
+                                                    const char * installationName
+                                                    )
+                     ACE_THROW_SPEC ((
+                                      CORBA::SystemException,
+                                      ::Deployment::NoSuchName
+                                     ))
+{
+  bool internal_err = false;
+
+  PCEntry *entry = 0;
+
+  if (this->names_.find (ACE_CString (installationName), entry) != 0)
+    ACE_THROW (Deployment::NoSuchName ());
+
+  //cache the package path
+  ACE_CString path (entry->int_id_.c_str ());
+
+  //remove the name association
+  if (this->names_.unbind (installationName) == -1)
+  {
+    ACE_DEBUG ((LM_ERROR,
+                "Unable to unbind %s.\n",
+                installationName));
+    internal_err = true;
+  }
+
+  //the package location
+  ACE_CString package_path (path);
+  package_path += ".cpk";        //package extension
+
+  //the PackageConfiguration externalization location
+  ACE_CString pc_path (path);
+  pc_path += PC_EXTENSION;        //external PackageConfiguration extension
+
+  Deployment::PackageConfiguration_var pc;
+  ACE_NEW_THROW_EX (pc,
+                    Deployment::PackageConfiguration (),
+                    CORBA::INTERNAL ());
+
+  ACE_CHECK_RETURN (0);
+
+  if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
+  {
+    ACE_DEBUG ((LM_ERROR, "Could not reincarnate PC\n"));
+      internal_err = true;
+  }
+
+  //if (this->uuids_.find (ACE_CString (pc->UUID), entry) != 0)
+  //{
+  //  ACE_DEBUG ((LM_ERROR, "Could not remove UUID\n"));
+  //  internal_err = true;
+  //}
+  //else
+  //  //remove the UUID association
+  //  this->uuids_.unbind (entry->int_id_.c_str ());
+
+  if (this->uuids_.unbind (ACE_CString (pc->UUID)) == -1)
+  {
+    ACE_DEBUG ((LM_ERROR, "Could not remove UUID\n"));
+    internal_err = true;
+  }
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+  //remove the type from the interface map
+  if (!this->remove_type (pc, installationName))
+  {
+    ACE_DEBUG ((LM_ERROR, "Could not remove type\n"));
+    internal_err = true;
+  }
+#endif
+
+  //actually delete the package here!
+
+  //clean the extracted files
+  remove_extracted_package (package_path.c_str (), path.c_str ());
+  //remove the package
+  remove (package_path.c_str ());
+  //remove the PackageConfiguration externalization
+  remove (pc_path.c_str ());
+
+  this->dump ();
+
+  if (internal_err)
+    ACE_THROW (CORBA::INTERNAL ());
   else
+    ACE_DEBUG ((LM_INFO, "Successfully deleting \'%s\'\n", installationName));
+
+}
+
+
+
+
+
+//==========================================HELPER METHODS==================================================
+
+Deployment::PackageConfiguration*
+CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_package (char* package)
+{
+  char temp[128];
+  //  ACE_thread_t thread_id = ACE_Thread::self ();
+  char* PID = ACE_OS::itoa (ACE_OS::getpid (), temp, 10);
+
+  ACE_OS::mkdir(PID);
+  //if dir already exists a -1 is returned
+  //we ignore this, just need to make sure the directory exists
+
+  //change the working dir
+  ACE_OS::chdir (PID);
+
+  ACE_CString pcd_name;
+  //extract the necessary descriptors
+  if (extract_descriptor_files (package,
+                                pcd_name) < 0)
+    {
+      ACE_OS::chdir (this->cwd_);
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) RepositoryManager: error extracting necessary files\n"));
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  Deployment::PackageConfiguration_var pc;
+  //parse the PCD to make sure that there are no package errors
+  ACE_TRY
+    {
+      //CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
+      //pc = intf.get_PC ();
+    }
+  ACE_CATCHALL
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
+
+      //change back the the old working dir
+      ACE_OS::chdir (this->cwd_);
+      ACE_THROW (Deployment::PackageError ());
+    }
+  ACE_ENDTRY;
+  //able to parse the PC. So lets install the package in the repo
+
+  //we no longer need the descriptors, so lets erase them!
+  remove_descriptor_files (package);
+
+  //change back the the old working dir
+  ACE_OS::chdir (this->cwd_);
+
+  //now lets erase the directory!
+  ACE_OS::rmdir (PID);
+  //the ACE_OS::rmdir does not work. Possibly because we need to delete
+  //the contents first. I will look into it more closely when I am back.
+
+  return pc._retn ();
+}
+
+
+//function to retvieve a file via HTTP
+//stores the file in the passed preallocated ACE_Message_Block
+//returns 1 on success
+//      0 on error
+
+int CIAO_RepositoryManagerDaemon_i::HTTP_Get (const char* URL, ACE_Message_Block &mb)
+{
+    URL_Parser *parser = TheURL_Parser::instance ();
+    if (!parser->parseURL (const_cast<char*> (URL)))
+    return 0;
+
+    // Create a client
+    HTTP_Client client;
+
+    // Open the client
+    if (client.open (parser->filename_,
+                     parser->hostname_,
+                     parser->port_) == -1)
     {
-      ACE_THROW_RETURN (Deployment::NoSuchName (), 0);
+        client.close ();
+        return 0;
     }
+
+    // Read from it
+    if (client.read (&mb) <= 0)
+    {
+        client.close ();
+        return 0;
+    }
+
+  return 1;
 }
 
+
+
+//function to parse and return the PackageConfiguration from the already
+//extracted descriptor files
 Deployment::PackageConfiguration*
-CIAO::RepositoryManager_Impl::
-findPackageByUUID (const char*
-                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
+CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_name,
+                                                              const char* descriptor_dir)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  //change the working dir
+  ACE_OS::chdir (descriptor_dir);
+
+  Deployment::PackageConfiguration_var pc;
+  //parse the PCD to make sure that there are no package errors
+  ACE_TRY
+    {
+      //CIAO::Config_Handlers::STD_PC_Intf intf (pc_name);
+      //pc = intf.get_PC ();
+      if (xercesc::DOMDocument *doc = CIAO::Config_Handlers::XML_HELPER->create_dom (pc_name))
+      {
+        {
+          //Read in the XSC type structure from the DOMDocument
+
+          //Convert the XSC to an IDL datatype
+          CIAO::Config_Handlers::Packaging::PCD_Handler::package_config (pc_name, pc);
+          std::cout << "Instance document import succeeded.  Dumping contents to file\n";
+        }
+
+        //Cleanliness is next to Godliness
+        delete doc;
+      }
+    }
+  ACE_CATCHALL
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
+
+      //change back the the old working dir
+      ACE_OS::chdir (this->cwd_);
+      ACE_THROW (Deployment::PackageError ());
+    }
+  ACE_ENDTRY;
+  //able to parse the PC. So lets install the package in the repo
+
+  //change back the the old working dir
+  ACE_OS::chdir (this->cwd_);
+
+  return pc._retn ();
 }
 
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-findNamesByType (const char*
-                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+
+//find out what the name of the PackageConfiguration file is
+void CIAO_RepositoryManagerDaemon_i::find_PC_name (char* package, ACE_CString& pcd_name)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  pcd_name = "";  //empty the contents of the ACE_CString
+
+  //create a doubly link list
+  ACE_New_Allocator allocator;
+  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
+
+  //get the list of files in the package and figure out the names of all necessary files
+  if (!(ZIP_Wrapper::file_list_info (package, list)))
+    return;
+
+  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
+
+  while (!list.is_empty ())
+    {
+      ZIP_File_Info* inf = list.delete_head ();
+
+      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
+        if (ACE_OS::strstr (inf->name_.c_str (), ".pcd"))
+          pcd_name = inf->name_.c_str () + skip_len;
+
+      //deallocate the head of the filename list
+      delete inf;
+    }
 }
 
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-getAllNames (ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+
+//We are using Xercesc in the Config_Handlers and unfortunately its API only
+//takes a file in the local file system as an argument, thus need to
+//write out the contents of the deployent plan to a file
+//in the current directory. I use the thread id to guarrantee
+//lack of race conditions if multithreading is enabled
+
+int CIAO_RepositoryManagerDaemon_i::extract_descriptor_files (char* package, ACE_CString& pcd_name)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  //create a doubly link list
+  ACE_New_Allocator allocator;
+  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
+
+  //get the list of files in the package and figure out the names of all necessary files
+  if (!(ZIP_Wrapper::file_list_info (package, list)))
+    return 0;
+
+  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
+
+  while (!list.is_empty ())
+    {
+      ZIP_File_Info* inf = list.delete_head ();
+      ACE_Message_Block* file = 0;
+      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
+        {
+          if (ACE_OS::strstr (inf->name_.c_str (), ".pcd"))
+            pcd_name = inf->name_.c_str () + skip_len;
+
+          //extract the descriptor from the package
+          ACE_NEW_RETURN (file, ACE_Message_Block (0,0), 0);
+          if (!ZIP_Wrapper::get_file(const_cast<char*> (package),
+                                     const_cast<char*> (inf->name_.c_str ()),
+                                     *file))
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "[RM::extract_descriptor_files] Unable to retrieve file!\n"));
+              //release the message block chain
+              file->release ();
+              return 0;
+            }
+
+
+          //write the file to disk
+          if(!RM_Helper::write_to_disk (inf->name_.c_str () + skip_len, *file))
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "[RM::extract_descriptor_files] Unable to write out descriptor to disk!\n"));
+              //release the message block chain
+              file->release ();
+              return 0;
+            }
+
+          //release the message block chain
+          file->release ();
+        }
+
+      //deallocate the head of the filename list
+      delete inf;
+    }
+
+  return 1;
 }
 
-CORBA::StringSeq*
-CIAO::RepositoryManager_Impl::
-getAllTypes (ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+int CIAO_RepositoryManagerDaemon_i::remove_descriptor_files (char* package)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  int return_code = 1;
+
+  //create a doubly link list
+  ACE_New_Allocator allocator;
+  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
+
+  //get the list of files in the package and figure out the names of all necessary files
+  if (!(ZIP_Wrapper::file_list_info (package, list)))
+    return 0;
+
+  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
+
+  while (!list.is_empty ())
+    {
+      ZIP_File_Info* inf = list.delete_head ();
+      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
+        {
+          //delete disk
+          if(remove (inf->name_.c_str () + skip_len))
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "[RM::remove_descriptor_files] Unable to write out descriptor to disk!\n"));
+              return_code = 0;
+            }
+        }
+      //deallocate the head of the filename list
+      delete inf;
+    }
+
+  return return_code;
 }
 
-void
-CIAO::RepositoryManager_Impl::
-deletePackage (const char*
-               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::NoSuchName))
+//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)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  //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 return_code = 1;
+
+  //create a doubly link list
+  ACE_New_Allocator allocator;
+  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
+
+  //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)))
+    {
+      //change back the the old working dir
+      ACE_OS::chdir (this->cwd_);
+      return 0;
+    }
+
+  while (!list.is_empty ())
+    {
+      ZIP_File_Info* inf = list.delete_head ();
+
+      //delete file from disk
+      if(remove (inf->name_.c_str ()))
+        {
+          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");
+
+  //now go one directory up and delete the extraction directory
+  ACE_OS::chdir (this->install_root_.c_str ());
+  ACE_OS::rmdir (extraction_location);
+
+  //change back the the old working dir
+  ACE_OS::chdir (this->cwd_);
+
+  return return_code;
+}
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+
+//function to extract the type of the component from
+//the PackageConfiguration and update the interface map
+//returns 1 on success
+//        0 on error
+
+int CIAO_RepositoryManagerDaemon_i::add_type (Deployment::PackageConfiguration& pc,
+                        const char* name)
+{
+  const char* ifaceUUID = 0;
+  //
+  if (pc.basePackage.length () > 0)
+  {
+    ifaceUUID = pc.basePackage[0]
+            .implementation[0]
+            .referencedImplementation
+            .implements
+            .specificType.in ();
+            //.UUID.in ();
+
+            ACE_DEBUG ((LM_DEBUG,  "storing under: %s\n", ifaceUUID));
+
+       CIEntry *entry = 0;
+
+         //create an entry for this interface type
+       if (this->types_.bind (ACE_CString (ifaceUUID),
+                ACE_CString (name)/*pc.label.in ()*/ ) != 0)
+       return 0;
+
+  }
+  else //ComponentPackageReference
+  {
+    //not implemented yet
+    return 0;
+  }
+
+  return 1;
+}
+
+
+
+//function to remove the interface type of the component
+//being removed from the interface map
+//returns 1 on success
+//        0 on error
+
+int CIAO_RepositoryManagerDaemon_i::remove_type (Deployment::PackageConfiguration& pc,
+                         const char* name)
+{
+  const char* ifaceUUID = 0;
+  //
+  if (pc.basePackage.length () > 0)
+  {
+    ifaceUUID = pc.basePackage[0]
+            .implementation[0]
+            .referencedImplementation
+            .implements
+            .specificType.in ();
+            //.UUID.in ();
+
+            ACE_DEBUG ((LM_DEBUG, "removing by: %s\n", ifaceUUID));
+
+       CIEntry *entry = 0;
+
+         //find the type in the interface map
+       if (this->types_.find (ACE_CString (ifaceUUID), entry) == 0)
+     {
+       ACE_DEBUG ((LM_DEBUG,  "Type to be removed: ",
+             "KEY: %s", entry->ext_id_.c_str (),
+             " VAL: %s\n", entry->int_id_.c_str ()));
+     }
+     else
+       ACE_DEBUG ((LM_DEBUG, "Could not find type!\n"));
+
+    ACE_DEBUG ((LM_DEBUG,  "Attempting to remove: %s\n", ifaceUUID));
+    CIBucket_Iterator iter (this->types_, ACE_CString (ifaceUUID));
+
+    CIBucket_Iterator end (this->types_,
+              ACE_CString (ifaceUUID),
+              1 /*tail = true*/);
+    for (;
+      iter != end;
+      ++iter)
+    {
+      CIEntry& element = *iter;
+
+      if(!(strcmp (element.int_id_.c_str (), name /*pc.label.in ()*/)))
+      {
+        //clashes are not allowed so this must be the ONLY
+        //element that we are interested in
+
+        //lets remove this element
+        this->types_.unbind (&element);
+        return 1;
+      }
+    }
+
+  }
+  else //ComponentPackageReference
+  {
+    //not implemented yet
+    return 0;
+  }
+
+  return 1;
 }
 
-void
-CIAO::RepositoryManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+#endif //for has ASSEMBLY_INTERFACE_SUPPORT
+
+//function to dump the state of the RepositoryManager
+void CIAO_RepositoryManagerDaemon_i::dump (void)
 {
-  this->orb_->shutdown (1 ACE_ENV_SINGLE_ARG_PARAMETER);
+#if defined (ACE_HAS_DUMP)
+
+  ACE_DEBUG(LM_DEBUG, "NAMES:\n");
+    this->names_.dump ();
+  ACE_DEBUG(LM_DEBUG, "UUIDs:\n");
+  this->uuids_.dump ();
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+  ACE_DEBUG (LM_DEBUG, "Component Interface Types:\n");
+  this->types_.dump ();
+#endif
+
+#endif /* ACE_HAS_DUMP */
 }
+
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index cfb9e4f715b..4f5f2b4efd0 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -1,162 +1,292 @@
-/*=======================================================================
- *
+/* -*- C++ -*- */
+
+//======================================================================
+/**
  * @file RepositoryManager_Impl.h
  *
  * $Id$
  *
- * @brief This file contains implementation for
- * Deployment::RepositoryManager interface.
+ * Description:
+ *  This file is the main implementation file for the RepositoryManager
+ *  in CIAO. We have used a number of techniques in order to increase
+ *  scalability of the RepoMan while still maintaining complience with
+ *  the D&C spec
  *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *
- *======================================================================*/
-
-#ifndef REPOSITORYMANAGER_IMPL_H
-#define REPOSITORYMANAGER_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "RepositoryManagerS.h"
-#include "ace/Get_Opt.h"
-#include "RepositoryManager_Impl.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/parsers/AbstractDOMParser.hpp>
-#include "CIAO/DAnCE/Old_Config_Handlers/Config_Handler_export.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Utils.h"
-#include "CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMAttr;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeList;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::XercesDOMParser;
-using xercesc::AbstractDOMParser;
+ * @author Stoyan Paunov
+ */
+//======================================================================
+
+#ifndef REPOSITORYMANAGERI_H_
+#define REPOSITORYMANAGERI_H_
+
+
+//-----------------------------NOTE---------------------------------
+//I need to disable all the code which has to do with interface
+//type information because we currently do not support assembly
+//interfaces which causes undesired behavior with respect to the
+//hash tables because the specificType field in assembly interfaces
+//is empty, so two unrelated intefaces appear to be related.
+
+//uncomment this line to turn on the code that relates to interface types
+//#define ASSEMBLY_INTERFACE_SUPPORT 1
+
+#include "RepositoryManagerDaemonS.h"
+
+#include "ace/Hash_Map_Manager.h"      //for the ACE_Hash_Map_Manager
+#include "ace/Null_Mutex.h"          //for ACE_Null_Mutex
+#include "ace/RW_Mutex.h"          //for ACE_RW_Mutex
+#include "ace/OS_NS_string.h"        //for ACE_CString
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
+#pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/**
- *
- * @class ReposityManager_Impl
- *
- * @brief This class implements the RepositoryManager. RepositoryManager
- * assists the execution process after the planning stage.
- *
- */
-namespace CIAO
+namespace
 {
-  class RepositoryManager_Impl
-    : public virtual POA_CIAO::RepositoryManagerDaemon
-    {
-
-    public:
-
-      RepositoryManager_Impl ();
-
-      /// Constructor.
-      RepositoryManager_Impl (CORBA::ORB_ptr orb,
-                              PortableServer::POA_ptr poa
-                              ACE_ENV_ARG_DECL);
-
-      virtual void installPackage (const char* installation_name,
-                                   const char* location
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::NameExists,
-                         Deployment::PackageError));
-
-      virtual void createPackage (const char* installation_name,
-                                  const Deployment::PackageConfiguration& pc,
-                                  const char* base_location,
-                                  CORBA::Boolean replace
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::NameExists,
-                         Deployment::PackageError));
-
-      virtual Deployment::PackageConfiguration*
-        findPackageByName (const char* name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual Deployment::PackageConfiguration*
-        findPackageByUUID (const char* name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual CORBA::StringSeq*
-        findNamesByType (const char* type
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::StringSeq*
-        getAllNames (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::StringSeq*
-        getAllTypes (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual void
-        deletePackage (const char* name
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           Deployment::NoSuchName));
-
-      virtual void
-        shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-    protected:
-
-      ~RepositoryManager_Impl ();
-      // destructor
-
-      typedef ACE_Hash_Map_Manager_Ex<const char *,
-        Deployment::PackageConfiguration,
-        ACE_Hash<const char *>, ACE_Equal_To<const char *>,
-        TAO_SYNCH_MUTEX> pc_table;
-
-      typedef pc_table::iterator pc_iterator;
-      // Cached ORB pointer
-      CORBA::ORB_var orb_;
-
-      // Cached POA pointer
-      PortableServer::POA_var poa_;
-
-      pc_table pc_table_;
-    };
+  /// Directory where the packages will be stored locally
+  const static char* INSTALL_PATH = "RepositoryDir";
+
+  const static size_t TEMP_LEN = 512;
+
+  const static char* PC_EXTENSION = ".epc";
 }
 
-#include /**/ "ace/post.h"
-#endif /* REPOSITORYMANAGER_IMPL_H */
+class  CIAO_RepositoryManagerDaemon_i :
+  public virtual POA_CIAO::RepositoryManagerDaemon
+{
+public:
+  /// Constructor
+  CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb,
+                  const char* server = "http://localhost:5432/");
+
+  /// Destructor
+  virtual ~CIAO_RepositoryManagerDaemon_i (void);
+
+  virtual
+  void shutdown (
+
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual
+  void installPackage (
+      const char * installationName,
+      const char * location
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ::Deployment::NameExists,
+      ::Deployment::PackageError
+    ));
+
+  virtual
+  void createPackage (
+      const char * installationName,
+      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:
+
+    /// Function to parse and return the PackageConfiguration from a specified
+    /// package
+    Deployment::PackageConfiguration* retrieve_PC_from_package (char* package);
+
+    /// Find out what the name of the PackageConfiguration file is
+    void find_PC_name (char* package, ACE_CString& pcd_name);
+
+    /// Function to parse and return the PackageConfiguration from the already
+    /// extracted descriptor files
+    Deployment::PackageConfiguration* retrieve_PC_from_descriptors (const char* pc_name,
+                                    const char* descriptor_dir);
+
+
+    /// Function to retrieve a file via HTTP
+    /// stores the file in the passed preallocated ACE_Message_Block
+    /// @retval 1 success
+    /// @retval 0 error
+
+    int HTTP_Get (const char* URL, ACE_Message_Block &mb);
+
+    /// Function to extract all necessary files for parsing the
+    /// PackageConfiguration descriptor and populating the idl struct.
+    /// @retval 1 success
+    /// @retval 0 error
+    ///
+    /// @note ACE_CString& pcd_name is an out parameter
+
+    int extract_descriptor_files (char* package,
+                                  ACE_CString& pcd_name);
+
+
+    ///function to remove the files extracted for parsing the PackageConfiguration
+    ///descriptor and populating the idl struct. It reads the names of the files
+    ///from the package. They correspond to the names on disk.
+    ///return 1 on success
+    ///       0 on error
+
+    int remove_descriptor_files (char* package);
+
+
+    ///function to remove the files extracted from the package upon istallation
+    ///It reads the names of the files from the package. They correspond to the
+    ///names on disk. It deletes each file, then it deletes the directories that
+    ///contain them.
+    ///NOTE: extraction location is path/*archive_name*/
+    ///returns 1 on success
+    ///        0 on error
+
+    int remove_extracted_package (const char* package_path, const char* extraction_location);
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+    ///function to extract the type of the component from
+    ///the PackageConfiguration and update the interface map
+    ///returns 1 on success
+    ///        0 on error
+
+    int add_type (::Deployment::PackageConfiguration& pc,
+          const char* name);
+
+      ///function to remove the interface type of the component
+    ///being removed from the interface map
+    ///returns 1 on success
+    ///        0 on error
+
+    int remove_type (::Deployment::PackageConfiguration& pc,
+             const char* name);
+
+#endif
+
+    ///function to dump the state of the RepositoryManager
+    void dump (void);
+
+  private:
+  /// Cached information about the installed PackageConfigurations
+  /// A separate map for the installation names and their UUID's
+    /// Key:  PackageConfiguration name or its UUID (CString type)
+    /// Value:  The location of the local copy of the package
+
+  ///Based on the synchronization needed we can parametrize this with either
+  ///ACE_Null_Mutex or ACE_RW_Mutex
+
+    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                    ACE_CString,
+                                    ACE_Hash<ACE_CString>,
+                                    ACE_Equal_To<ACE_CString>,
+                                    ACE_RW_Mutex> PCMap;
+
+
+  typedef PCMap::iterator PCMap_Iterator;
+  typedef ACE_Hash_Map_Entry <ACE_CString,ACE_CString> PCEntry;
+
+
+  /// Cached information about the installed Component Interfaces
+  /// A map which associates Component Interface UUIDs with the
+  /// names of packages which implement this component type
+  /// Key:  Component Interface UUID
+  /// Value:  linked list of the names of installed packages which
+  ///      implement this component type
+
+  ///Based on the synchronization needed we can parametrize this with either
+  ///ACE_Null_Mutex or ACE_RW_Mutex
+
+    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                    ACE_CString,
+                                    ACE_Hash<ACE_CString>,
+                                    ACE_Equal_To<ACE_CString>,
+                                    ACE_RW_Mutex> CIMap;
+
+
+  typedef CIMap::iterator CIMap_Iterator;
+  typedef ACE_Hash_Map_Entry <ACE_CString,ACE_CString> CIEntry;
+  typedef ACE_Hash_Map_Bucket_Iterator<ACE_CString,
+                     ACE_CString,
+                     ACE_Hash<ACE_CString>,
+                     ACE_Equal_To<ACE_CString>,
+                     ACE_RW_Mutex> CIBucket_Iterator;
+
+  //a hash map that associates the names of
+  //PackageConfigurations with their location
+  PCMap names_;
+
+  /// a hash map that associates the UUIDs of
+  /// PackageConfigurations with their location
+  PCMap uuids_;
+
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+  //a hash map which associates Component Interface
+  //UUIDs with their implementations
+  CIMap types_;
+#endif
+
+  //the ORB
+  CORBA::ORB_var the_orb_;
+
+  char cwd_ [TEMP_LEN];      //will hold the current working directory
+  ACE_CString  install_root_;    //full path for the install directory
+  ACE_CString HTTP_server_;    //location of the server
+
+};
+
+#endif /* REPOSITORYMANAGER_H_  */
+
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
deleted file mode 100644
index c746f4d6a9c..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Repository_Manager_conf.h
- *
- * $Id$
- *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef REPOSITORY_MANAGER_CONF_H
-#define REPOSITORY_MANAGER_CONF_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#ifndef MAX_PACKAGES_DEF
-/// The number of packages that need to be configured
-const long MAX_PACKAGES = 15;
-#endif  /* MAX_PACKAGES_DEF */
-
-#include /**/ "ace/post.h"
-
-#endif  /* REPOSITORY_MANAGER_CONF_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
deleted file mode 100644
index 9f7b77a7799..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-// $Id$
-
-#include "RepositoryManager_Impl.h"
-#include "Update_Plan.h"
-#include "DeploymentC.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-
-ACE_RCSID (DAnCE,
-           RepositoryManager,
-           "$Id$")
-
-using namespace Deployment;
-
-namespace CIAO
-{
-  void
-  traverse_package (PackageConfiguration* &pc,
-                    DeploymentPlan &plan,
-                    REF_MAP &ref_map,
-                    REF_MAP &primary_ref_map)
-  {
-    // traverse the package configuration structure to get to the
-    // BasePackage which consists of assemblies.
-    //
-    REF_MAP plan_ref_map;
-    CORBA::ULong bp_len =
-      pc->basePackage.length ();
-
-    for (CORBA::ULong x = 0; x != bp_len; ++x)
-      {
-        CORBA::ULong impl_len =
-          pc->basePackage[x].implementation.length ();
-
-        for (CORBA::ULong y = 0;
-             y != impl_len;
-             ++y)
-          {
-            // traverse the .cpd file and get to the referenced .cid file
-            //
-            ComponentImplementationDescription cid =
-              pc->basePackage[x].implementation[y].referencedImplementation;
-            CORBA::ULong assembly_len = cid.assemblyImpl.length ();
-
-            for (CORBA::ULong z = 0;
-                 z != assembly_len;
-                 ++z)
-              {
-                // traverse the .cid file and get to each
-                // of the "assemblyImpl" tags.
-                //
-                ComponentAssemblyDescription assembly =
-                  cid.assemblyImpl[z];
-                //
-                // traverse the individual assembly.
-                //
-                traverse_assembly (assembly, plan, ref_map, primary_ref_map,
-                                   plan_ref_map);
-              }
-          }
-      }
-  }
-
-  void
-  traverse_assembly (ComponentAssemblyDescription &assembly,
-                     DeploymentPlan &plan,
-                     REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                     REF_MAP &plan_ref_map)
-  {
-    // traverse the assembly (ComponentAssemblyDescription) and
-    // processes the instances and the connection within the assembly.
-    //
-    CORBA::ULong ins_len = assembly.instance.length ();
-    for (CORBA::ULong k = 0; k < ins_len; ++k)
-      {
-        SubcomponentInstantiationDescription ins =
-          assembly.instance[k];
-        const char* in_name = ins.name;
-
-      CORBA::ULong plan_ins_len =
-        plan.instance.length ();
-
-      for (CORBA::ULong l = 0; l < plan_ins_len; ++l)
-        {
-          const char* plan_name = plan.instance[l].name;
-          if (ACE_OS::strcmp (plan_name, in_name) == 0)
-            {
-              traverse_assembly_instance (ins, plan, l,
-                                          ref_map, primary_ref_map,
-                                          plan_ref_map);
-            }
-        }
-      }
-
-    CORBA::ULong assembly_conn_len =
-      assembly.connection.length ();
-
-    for (CORBA::ULong m = 0; m < assembly_conn_len; ++m)
-      {
-        AssemblyConnectionDescription
-          assembly_connection = assembly.connection[m];
-        traverse_assembly_connection (assembly,
-                                      assembly_connection,
-                                      plan);
-      }
-  }
-
-  void
-  traverse_assembly_connection (ComponentAssemblyDescription
-                                &assembly,
-                                AssemblyConnectionDescription
-                                &assembly_connection,
-                                DeploymentPlan &plan)
-  {
-    // traverse the assembly connection and get information about the
-    // portName and the instances at each end of the connection.
-    // Also traverse the InterfaceDescriptions for each of those instances
-    // and populate the portKind information.
-    //
-    CORBA::ULong con_length (plan.connection.length ());
-    plan.connection.length (con_length + 1);
-    CORBA::ULong iepe_len = assembly_connection.internalEndpoint.length ();
-    for (CORBA::ULong n = 0; n < iepe_len; ++n)
-      {
-        CORBA::ULong iep_len (plan.connection[con_length].
-                              internalEndpoint.length ());
-      plan.connection[con_length].internalEndpoint
-        .length (iep_len + 1);
-      plan.connection[con_length].internalEndpoint
-        [iep_len].portName = assembly_connection.
-        internalEndpoint[n].portName;
-      CORBA::ULong ins_ref = assembly_connection.internalEndpoint[n].
-        instanceRef;
-      const char* ins_name = assembly.instance[ins_ref].name;
-      CORBA::ULong plan_ins_len = plan.instance.length ();
-      for (CORBA::ULong w = 0; w < plan_ins_len; ++w)
-        {
-          const char* pl_name = plan.instance[w].name;
-          if (ACE_OS::strcmp (pl_name, ins_name) == 0)
-            {
-              plan.connection[con_length].internalEndpoint
-                [iep_len].instanceRef = w;
-              break;
-            }
-        }
-      traverse_interface (assembly.instance[ins_ref],
-                          plan.connection[con_length].
-                          internalEndpoint[iep_len]);
-      }
-  }
-
-  void
-  traverse_interface (SubcomponentInstantiationDescription
-                      &instance,
-                      PlanSubcomponentPortEndpoint
-                      &pspe)
-  {
-    // traverse the InterfaceDescription of the instance and get information
-    // about the portkind of the port.
-    //
-    CORBA::ULong pack_len = instance.package.length ();
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-
-        ComponentInterfaceDescription
-          cid = package.realizes;
-
-        CORBA::ULong port_len = cid.port.length ();
-
-        for (CORBA::ULong n = 0; n < port_len; ++n)
-          {
-            const char* main_port_name = cid.port[n].name;
-            const char* port_name = pspe.portName;
-            if (ACE_OS::strcmp (main_port_name, port_name) == 0)
-              {
-                pspe.kind = cid.port[n].kind;
-              }
-          }
-      }
-  }
-
-  void
-  traverse_assembly_instance (
-                              SubcomponentInstantiationDescription
-                              &instance,
-                              DeploymentPlan &plan, int l,
-                              REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                              REF_MAP &plan_ref_map)
-  {
-    // Each instance has a package.
-    //   Each package has an implementation and their correspoding artifacts.
-    // Traverse this information and populate the artifact and the
-    // implementation information within the DeploymentPlan.
-    //
-    ART_REF_MAP art_ref_map;
-
-    update_config_property (instance, plan.instance[l]);
-
-    CORBA::ULong pack_len = instance.package.length ();
-    for (CORBA::ULong m = 0; m < pack_len; ++m)
-      {
-        ComponentPackageDescription
-          package = instance.package[m];
-        CORBA::ULong pack_impl_len = package.implementation.length ();
-
-        for (CORBA::ULong n = 0; n < pack_impl_len; ++n)
-          {
-            PackagedComponentImplementation
-              impl = package.implementation[n];
-            CORBA::ULong impl_length (plan.implementation.length ());
-            plan.implementation.length (impl_length + 1);
-            plan.implementation[impl_length].name = plan.instance[l].name;
-            plan.instance[l].implementationRef = impl_length;
-            CORBA::ULong mono_impl_len =
-              impl.referencedImplementation.monolithicImpl.length ();
-
-            for (CORBA::ULong p = 0; p < mono_impl_len; ++p)
-              {
-                MonolithicImplementationDescription
-                  mid = impl.referencedImplementation.monolithicImpl[p];
-
-                update_artifacts (mid, plan, plan.instance[l],
-                                  ref_map, primary_ref_map, art_ref_map,
-                                  plan_ref_map,
-                                  plan.implementation[impl_length]);
-              }
-            update_impl_config_property (impl, plan.implementation[impl_length],
-                                         plan.instance[l]);
-          }
-      }
-  }
-
-  void
-  update_artifacts (MonolithicImplementationDescription &mid,
-                    DeploymentPlan &plan,
-                    InstanceDeploymentDescription &instance,
-                    REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                    ART_REF_MAP &art_ref_map,
-                    REF_MAP &plan_ref_map,
-                    MonolithicDeploymentDescription &mdd)
-  {
-    ref_map.unbind_all ();
-    primary_ref_map.unbind_all ();
-    art_ref_map.unbind_all ();
-    CORBA::ULong prim_art_len = mid.primaryArtifact.length ();
-    for (CORBA::ULong q = 0; q < prim_art_len; ++q)
-      {
-        ImplementationArtifactDescription
-          pack_iad = mid.primaryArtifact[q].referencedArtifact;
-        ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name;
-        int arti_len;
-        int plan_arti_len;
-        CORBA::ULong art_length (plan.artifact.length ());
-
-        if (ref_map.find (artifact_name, arti_len) != 0)
-          {
-            if (plan_ref_map.find (artifact_name, plan_arti_len) != 0)
-              {
-                plan.artifact.length (art_length + 1);
-                plan.artifact[art_length].name = mid.primaryArtifact[q].name;
-                plan.artifact[art_length].node = instance.node;
-                ref_map.bind (artifact_name, art_length);
-                plan_ref_map.bind (artifact_name, art_length);
-                primary_ref_map.bind (artifact_name, art_length);
-                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-                mdd.artifactRef.length (art_ref_len + 1);
-                mdd.artifactRef[art_ref_len] = art_length;
-                update_artifact_location (pack_iad,
-                                          plan.artifact[art_length]);
-                update_artifact_property (pack_iad,
-                                          plan.artifact[art_length]);
-              }
-            else
-              {
-                art_length = plan_arti_len;
-                ref_map.bind (artifact_name, art_length);
-                primary_ref_map.bind (artifact_name, art_length);
-                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-                mdd.artifactRef.length (art_ref_len + 1);
-                mdd.artifactRef[art_ref_len] = art_length;
-                update_artifact_location (pack_iad,
-                                          plan.artifact[art_length]);
-                update_artifact_property (pack_iad,
-                                          plan.artifact[art_length]);
-              }
-          }
-        update_common_artifact_and_art_ref (pack_iad,
-                                            primary_ref_map, ref_map,
-                                            art_ref_map, plan_ref_map, mdd,
-                                            plan, instance);
-      }
-  }
-
-  void
-  update_common_artifact_and_art_ref (
-                                      ImplementationArtifactDescription
-                                      &pack_iad,
-                                      REF_MAP &primary_ref_map,
-                                      REF_MAP &ref_map,
-                                      ART_REF_MAP &art_ref_map,
-                                      REF_MAP &plan_ref_map,
-                                      MonolithicDeploymentDescription &mid,
-                                      DeploymentPlan &plan,
-                                      InstanceDeploymentDescription
-                                      &instance)
-  {
-    int plan_arti_len;
-    int arti_len;
-    CORBA::ULong new_art_length;
-    CORBA::ULong deps_len = pack_iad.dependsOn.length ();
-    for (CORBA::ULong g = 0; g < deps_len; ++g)
-      {
-        ACE_TString dep_name =
-          (const char*)pack_iad.dependsOn[g].name;
-
-        if (ref_map.find (dep_name, arti_len) == 0)
-          {
-            if (primary_ref_map.find (dep_name, arti_len) != 0)
-              {
-                if (art_ref_map.find (arti_len, arti_len) != 0)
-                  {
-                    update_impl_art_ref (mid, arti_len);
-                    art_ref_map.bind (arti_len, arti_len);
-                  }
-              }
-          }
-        else
-          {
-            ImplementationArtifactDescription
-              depends_iad = pack_iad.dependsOn[g].
-              referencedArtifact;
-            if (plan_ref_map.find (dep_name, plan_arti_len) != 0)
-              {
-                new_art_length = plan.artifact.length ();
-                plan.artifact.length (new_art_length + 1);
-                plan.artifact[new_art_length].name =
-                  pack_iad.dependsOn[g].name;
-                plan.artifact[new_art_length].node = instance.node;
-                update_artifact_location (depends_iad,
-                                          plan.artifact
-                                          [new_art_length]);
-                ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                plan_ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                update_impl_art_ref (mid, new_art_length);
-                art_ref_map.bind (new_art_length, new_art_length);
-              }
-            else
-              {
-                new_art_length = plan_arti_len;
-                ref_map.bind (
-                              (const char*)plan.artifact[new_art_length].name,
-                              new_art_length);
-                update_impl_art_ref (mid, new_art_length);
-                art_ref_map.bind (new_art_length, new_art_length);
-              }
-          }
-      }
-  }
-
-  void
-  update_config_property (SubcomponentInstantiationDescription &sub_instance,
-                          InstanceDeploymentDescription &instance)
-  {
-    CORBA::ULong pro_len =
-    sub_instance.configProperty.length ();
-
-    for (CORBA::ULong x = 0; x < pro_len; ++x)
-      {
-        CORBA::ULong ins_pro_len (instance.configProperty. length ());
-        instance.configProperty.length (ins_pro_len + 1);
-        instance.configProperty[ins_pro_len]
-          = sub_instance.configProperty[x];
-      }
-  }
-
-  void
-  update_impl_config_property (PackagedComponentImplementation
-                               &impl,
-                               MonolithicDeploymentDescription
-                               &mid,
-
-                                  InstanceDeploymentDescription
-                               &instance)
-  {
-    int update_flag;
-    CORBA::ULong pro_len =
-    impl.referencedImplementation.configProperty.length ();
-
-    for (CORBA::ULong x = 0; x < pro_len; ++x)
-      {
-        update_flag = 1;
-        CORBA::ULong impl_pro_len (mid.execParameter.length ());
-        mid.execParameter.length (impl_pro_len + 1);
-        mid.execParameter[impl_pro_len]
-          = impl.referencedImplementation.configProperty[x];
-        const char* property_name = 
-          impl.referencedImplementation.configProperty[x].name;
-        CORBA::ULong ins_pro_len (instance.configProperty. length ());
-        for (CORBA::ULong y = 0; y < ins_pro_len; ++y)
-          {
-            const char* ins_pro_name = instance.configProperty[y].name;
-            if (ACE_OS::strcmp (ins_pro_name, property_name) == 0)
-              {
-                update_flag = 0;
-                break;
-              }
-          }
-        if (update_flag == 1)
-          {
-            instance.configProperty.length (ins_pro_len + 1);
-            instance.configProperty[ins_pro_len]
-              = impl.referencedImplementation.configProperty[x];
-          }
-      }
-  }
-
-  void
-  update_impl_art_ref (MonolithicDeploymentDescription &mid,
-                       int arti_len)
-  {
-    CORBA::ULong new_art_ref_len (mid.artifactRef.length ());
-    mid.artifactRef.length (new_art_ref_len + 1);
-    mid.artifactRef[new_art_ref_len] = arti_len;
-  }
-
-  void
-  update_artifact_location (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong loc_len = pack_iad.location.length ();
-    for (CORBA::ULong e = 0; e < loc_len; ++e)
-      {
-        CORBA::ULong art_loc_len (plan_artifact.location.length ());
-        plan_artifact.location.length (art_loc_len + 1);
-        plan_artifact.location[art_loc_len] = pack_iad.location[e];
-      }
-  }
-
-  void
-  update_artifact_property (ImplementationArtifactDescription
-                            &pack_iad,
-                            ArtifactDeploymentDescription
-                            &plan_artifact)
-  {
-    CORBA::ULong para_len = pack_iad.execParameter.length ();
-    for (CORBA::ULong f = 0; f < para_len; ++f)
-      {
-        CORBA::ULong art_pro_len (plan_artifact.execParameter.length ());
-        plan_artifact.execParameter.length (art_pro_len + 1);
-        plan_artifact.execParameter[art_pro_len] = pack_iad.execParameter[f];
-      }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
deleted file mode 100644
index 9c3125092fd..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*=======================================================================
- *
- * @file Update_Plan.h
- *
- * $Id$
- *
- * @brief This file contains declarations for helper functions
- * used in updating the deployment plan data structure from
- * PackageConfiguration data structure.
- *
- * @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *
- *======================================================================*/
-
-#ifndef CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#define CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace Deployment
-{
-  struct SubcomponentInstantiationDescription;
-  struct DeploymentPlan;
-  struct ComponentAssemblyDescription;
-  struct SubcomponentInstantiationDescription;
-  struct AssemblyConnectionDescription;
-}
-
-namespace CIAO
-{
-  class Null_Dom_Document { };
-  // exception thrown when we have a null dom document.
-
-  typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-  typedef ACE_Hash_Map_Manager<int, int, ACE_Null_Mutex> ART_REF_MAP;
-
-  void
-  traverse_assembly_instance (Deployment::
-                              SubcomponentInstantiationDescription &instance,
-                              Deployment::DeploymentPlan &plan,
-                              int l,
-                              REF_MAP &ref_map,
-                              REF_MAP &primary_ref_map,
-                              REF_MAP &plan_ref_map);
-
-  void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
-                          Deployment::DeploymentPlan &plan,
-                          REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                          REF_MAP &plan_ref_map);
-
-  void traverse_interface (Deployment::SubcomponentInstantiationDescription
-                           &instance,
-                           Deployment::PlanSubcomponentPortEndpoint
-                           &pspe);
-
-  void traverse_assembly_connection (Deployment::ComponentAssemblyDescription
-                                     &assembly,
-                                     Deployment::AssemblyConnectionDescription
-                                     &assembly_connection,
-                                     Deployment::DeploymentPlan &plan);
-
-  void traverse_package (Deployment::PackageConfiguration* &pc,
-                         Deployment::DeploymentPlan &plan,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map);
-
-  void update_artifacts (Deployment::MonolithicImplementationDescription &mid,
-                         Deployment::DeploymentPlan &plan,
-                         Deployment::InstanceDeploymentDescription &instance,
-                         REF_MAP &ref_map, REF_MAP &primary_ref_map,
-                         ART_REF_MAP &art_ref_map,
-                         REF_MAP &plan_ref_map,
-                         Deployment::MonolithicDeploymentDescription &mdd);
-
-  void update_artifact_location (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_artifact_property (Deployment::ImplementationArtifactDescription
-                                 &pack_iad,
-                                 Deployment::ArtifactDeploymentDescription
-                                 &plan_artifact);
-
-  void update_impl_art_ref (Deployment::MonolithicDeploymentDescription
-                            &mid, int art_len);
-
-  void update_impl_config_property (Deployment::
-                                    PackagedComponentImplementation &impl,
-                                    Deployment::
-                                    MonolithicDeploymentDescription &mid,
-                                    Deployment::
-                                    InstanceDeploymentDescription
-                                    &instance);
-
-  void update_config_property (Deployment::
-                               SubcomponentInstantiationDescription
-                               &sub_instance,
-                               Deployment::
-                               InstanceDeploymentDescription
-                               &instance);
-
-  void update_common_artifact_and_art_ref (Deployment::
-                                           ImplementationArtifactDescription &pack_iad,
-                                           REF_MAP &primary_ref_map,
-                                           REF_MAP &ref_map,
-                                           ART_REF_MAP &art_ref_map,
-                                           REF_MAP &plan_ref_map,
-                                           Deployment::MonolithicDeploymentDescription
-                                           &mid,
-                                           Deployment::DeploymentPlan &plan,
-                                           Deployment::
-                                           InstanceDeploymentDescription
-                                           &instance);
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_REPOSITORY_MANAGER_UPDATE_PLAN_H*/
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index 6ff77c3e1fa..0a8a72fdb43 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions {
   exename   = StaticDAnCEParser
   includes += ..
   libs     += NodeApplicationManager
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index ea704259a0e..84e50a5fabf 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -201,9 +201,10 @@ namespace CIAO
        * @param available The available Properties
        */
 
-      void match_properties (
-                        ::Deployment::Properties deployed,
-                        ::Deployment::SatisfierProperties& available);
+        void CIAO::DomainDataManager::
+        match_properties (
+                          ::Deployment::Properties deployed,
+                          ::Deployment::SatisfierProperties& available);
 
 
         /// The different actiona that can take place
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 07200eb0eca..b5a7aaa5458 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -22,7 +22,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
 project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
   after += CIAO_TargetManager_stub
   sharedname  = TargetManager_svnt
-  libs    += TargetManager_stub NodeManager_stub
+  libs    += TargetManager_stub
 
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h
   dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
@@ -47,7 +47,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
 project(CIAO_TargetManager_exec) : ciao_servant_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc {
   after   += CIAO_TargetManager_svnt
   sharedname = TargetManager_exec
-  libs      += TargetManager_stub TargetManager_svnt NodeManager_stub
+  libs      += TargetManager_stub TargetManager_svnt
 
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h
   dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/DAnCE/XMI.xsd b/TAO/CIAO/DAnCE/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/TAO/CIAO/DAnCE/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/TAO/CIAO/DAnCE/XMI.xsd.orig b/TAO/CIAO/DAnCE/XMI.xsd.orig
deleted file mode 100644
index f4adac91934..00000000000
--- a/TAO/CIAO/DAnCE/XMI.xsd.orig
+++ /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/TAO/CIAO/DAnCE/new_RepositoryManager/packages/inconsistent.cpk b/TAO/CIAO/DAnCE/new_RepositoryManager/packages/inconsistent.cpk
deleted file mode 100644
index c944a2d25dd..00000000000
--- a/TAO/CIAO/DAnCE/new_RepositoryManager/packages/inconsistent.cpk
+++ /dev/null
diff --git a/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk b/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk
deleted file mode 100644
index ed3721f3165..00000000000
--- a/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk
+++ /dev/null
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp
deleted file mode 100644
index 00b228d0ee3..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-
-// HTTP_Client.cpp, Stoyan
-
-#include "HTTP_Client.h"
-#include "HTTP_Handler.h"
-#include "ace/OS_NS_string.h"
-
-HTTP_Client::HTTP_Client (void)
-{
-}
-
-HTTP_Client::~HTTP_Client (void)
-{
-  this->close ();
-}
-
-// initialize address and filename. No network i/o in open
-
-int
-HTTP_Client::open (const ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short port)
-{
-  filename_ = ACE_OS::strdup (filename);
-  inet_addr_.set (port, hostname);
-  return 0;
-}
-
-// read from connection length bytes from offset, into Message block
-
-int
-HTTP_Client::read (ACE_Message_Block *mb)
-{
-
-  // Create a HTTP_Client Reader
-  HTTP_Reader HTTP_reader (mb, filename_);
-  HTTP_Handler *brp = &HTTP_reader;
-
-  // Connect to the server
-  if (connector_.connect (brp, inet_addr_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1);
-
-  return HTTP_reader.byte_count ();
-
-}
-
-
-// close down the HTTP_Client
-
-int
-HTTP_Client::close (void)
-{
-
-  if (filename_)
-    {
-      ACE_OS::free ((void *) filename_);
-      filename_ = 0;
-    }
-  return 0;
-
-}
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.h
deleted file mode 100644
index eed67d3b93d..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-// HTTP_Client.h
-
-//============================================================================
-// = FILENAME
-//    HTTP_Client.h
-//
-// = DESCRIPTION
-//     This is the HTTP_Client class, which is the API for doing file
-//     uploads/downloads.
-//
-// = AUTHOR
-//    Stoyan Paunov
-//
-//============================================================================
-
-#ifndef HTTP_Client_H
-#define HTTP_Client_H
-
-
-#include "ace/INET_Addr.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
-#include "ace/Message_Block.h"
-#include "HTTP_Handler.h"
-
-class HTTP_Client
-  // = TITLE
-  //     HTTP_Client is intended to provide application API to
-  //     classes that wish to do network i/o at a very
-  //     high level of abstraction.
-  //
-  // = This class provides the ability to retrieve data from
-  //   the network, of specified length and offset, and potentially
-  //   use any protocol "under the hood" to do so. It currently
-  //   uses HTTP. See HTTP_Handler also.
-{
-public:
-  HTTP_Client (void);
-  ~HTTP_Client (void);
-
-  int open (const ACE_TCHAR *filename,
-            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
-            u_short port = 80);
-  // initializes the class with the given filename, hostname and port.
-  // it should be called with the filename, before any read/write calls
-
-
-  int read (ACE_Message_Block *mb);
-  // starts a connection, and reads a file from the server into Message_Block mb
-
-  int close ();
-  // Frees memory allocated for filename.
-
-private:
-  ACE_INET_Addr inet_addr_;
-  // store the internet address of the server
-
-  ACE_TCHAR *filename_;
-  // The filename
-
-  ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
-  // The connector endpoint to initiate the client connection
-
-};
-
-#endif /* HTTP_Client_H */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.cpp
deleted file mode 100644
index a5312605779..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-// HTTP_Handler.cpp, Stoyan
-
-#include "HTTP_Handler.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-
-// Empty constructor for compliance with new Connector behavior.
-HTTP_Handler::HTTP_Handler (void)
-{
-}
-
-// Always use this constructor
-HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb,
-                                    ACE_TCHAR *filename) :
-  mb_ (mb),
-  filename_ (ACE_OS::strdup (filename)),
-  bytecount_ (0)
-{
-}
-
-HTTP_Handler::~HTTP_Handler (void)
-{
-  if (filename_)
-    {
-      ACE_OS::free ((void *) filename_);
-      filename_ = 0;
-    }
-}
-
-// Called by Connector after connection is established
-int
-HTTP_Handler::open (void *)
-{
-  if (this->send_request () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed"), -1);
-
-  if (this->receive_reply () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed"), -1);
-  return 0;
-
-}
-
-// No-op
-int
-HTTP_Handler::close (u_long flags)
-{
-  ACE_UNUSED_ARG (flags);
-  return 0;
-}
-
-
-// Always overridden by the derived classes
-int
-HTTP_Handler::send_request (void)
-{
-  return -1;
-}
-
-// Always overridden by the derived classes
-int
-HTTP_Handler::receive_reply (void)
-{
-  return -1;
-}
-
-// used to retrieve the number of bytes read/written by the
-// last operation on the Blob
-int
-HTTP_Handler::byte_count (void)
-{
-  return bytecount_;
-}
-
-// Reader **************************************************
-
-HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb,
-                                  ACE_TCHAR *filename,
-                                  const char *request_prefix,
-                                  const char *request_suffix) :
-  HTTP_Handler (mb, filename),
-  request_prefix_ (request_prefix),
-  request_suffix_ (request_suffix)
-{
-}
-
-// Send the HTTP request
-int
-HTTP_Reader::send_request (void)
-{
-  char mesg [MAX_HEADER_SIZE];
-
-  // Check to see if the request is too big
-  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
-                         + ACE_OS::strlen (filename_) 
-                         + ACE_OS::strlen (request_suffix_) + 4))
-    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
-
-  // Create a message to send to the server requesting retrieval of the file
-  int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
-
-  // Send the message to server
-  if (peer ().send_n (mesg, len) != len)
-    ACE_ERROR_RETURN((LM_ERROR,"Error sending request"), -1);
-
-
-  return 0;
-}
-
-// Recieve the HTTP Reply
-int
-HTTP_Reader::receive_reply (void)
-{
-  size_t num_recvd = 0;
-  char buf [MTU+1];
-  char *buf_ptr;
-  int bytes_read = 0;
-
-  // Receive the first MTU bytes and strip the header off.
-  // Note that we assume that the header will fit into MTU bytes.
-
-  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
-    {
-
-	  //Make sure that response type is 200 OK
-	  if (ACE_OS::strstr (buf,"200 OK") == 0)
-			ACE_ERROR_RETURN ((LM_ERROR,
-                          "HTTP_Reader::receiveReply(): Response is not 200 OK" ), -1);
-
-      // Search for the header termination string "\r\n\r\n", or "\n\n". If
-      // found, move past it to get to the data portion.
-      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
-        buf_ptr += 4;
-      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
-        buf_ptr += 2;
-      else
-        buf_ptr = buf;
-
-      // Determine number of data bytes read. This is equal to the
-      // total bytes read minus number of header bytes.
-      bytes_read = num_recvd - (buf_ptr - buf);
-
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header"), -1);
-
-  // ***************************************************************
-  // At this point, we have stripped off the header and are ready to
-  // process data. buf_ptr points to the data
-
-  //set the size of the ACE_Message_Block to the current bytes read
-  //NOTE: this function reallocates if necessary
-  //this->mb_->size (bytes_read);
-
-  ACE_Message_Block* curr = this->mb_;
-  curr->cont (new ACE_Message_Block (bytes_read));
-  curr = curr->cont ();
-
-
-  // Copy over all the data bytes into our message buffer.
-  if (curr->copy (buf_ptr, bytes_read) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                          "HTTP_Reader::receiveReply():Error copying data into Message_Block" ), -1);
-
-
-  //read the rest of the data into a number of ACE_Message_Blocks and
-  //chain them together in a link list fashion
-
-  num_recvd = 0;
-
-  do
-  {
-	  if (curr->space () == 0)
-	  {
-		  curr->cont (new ACE_Message_Block (MTU));
-		  curr = curr->cont ();
-	  }
-
-	if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
-	  {
-		  //move the write pointer
-		  curr->wr_ptr (num_recvd); 
-
-		  //increment bytes_read
-		  bytes_read += num_recvd;
-
-	  }
-	else
-		ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header"), -1);
-  
-  }while (num_recvd != 0);
-
-
-  // Set the byte count to number of bytes received
-  this->bytecount_ = bytes_read;
-
-  return 0;
-
-}
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.h
deleted file mode 100644
index 3a2118bec8d..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-// HTTP_Handler.h, Stoyan
-
-//============================================================================
-// = FILENAME
-//    HTTP_Handler.h
-//
-// = DESCRIPTION
-//     HTTP_Handler is a base class for HTTP_Reader and
-//     HTTP_Writer which are created in response to calls to
-//     read/write, as appropriate
-//
-// = AUTHOR
-//    Stoyan Paunov
-//
-//============================================================================
-
-#ifndef HTTP_HANDLER_H
-#define HTTP_HANDLER_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Message_Block.h"
-
-class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-	//class to retrieve data via HTTP
-{
-public:
-  HTTP_Handler (void);
-  // Null constructor, insures that it works properly with Connector
-
-  HTTP_Handler (ACE_Message_Block *mb,
-                    ACE_TCHAR *filename);
-  // Always use this constructor to make HTTP_Handlers
-
-  int byte_count (void);
-  // returns the number of bytes read/written in the last operation.
-
-  virtual int open (void * = 0);
-  // Activate this instance of the <HTTP_Handler>
-
-  virtual int close (u_long flags = 0);
-  // Close down the Blob
-
-  ~HTTP_Handler (void);
-
-protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
-
-  ACE_Message_Block *mb_;
-  ACE_TCHAR *filename_;
-  int bytecount_;
-  enum
-  {
-    MAX_HEADER_SIZE = 2048,
-    // The handler assumes that the first 2048 bytes of a server response
-    // contains the header
-
-	MTU = BUFSIZ
-	//set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
-  };
-};
-
-class HTTP_Reader : public HTTP_Handler
-{
-public:
-  HTTP_Reader (ACE_Message_Block *mb,
-                   ACE_TCHAR *filename,
-                   const char *request_prefix = "GET",
-                   const char *request_suffix = "HTTP/1.0\r\n\r\n");
-
-private:
-  int send_request (void);
-  int receive_reply (void);
-  const char *request_prefix_;
-  const char *request_suffix_;
-};
-
-#endif /* HTTP_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h
deleted file mode 100644
index 32fad271f7d..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-// Options.h, Stoyan
-
-//============================================================================
-//
-// = LIBRARY
-//    JAWS
-//
-// = FILENAME
-//    Options.h
-//
-// = DESCRIPTION
-//     Options is an Singleton for blobby
-//
-// = AUTHOR
-//    Stoyan Paunov
-//
-//============================================================================
-
-#ifndef RM_OPTIONS_H
-#define RM_OPTIONS_H
-
-#include "ace/Get_Opt.h"
-#include "ace/SString.h"		//for ACE_CString 			
-
-class Options
-{
-public:
-  /// Returns the singleton instance
-  static Options *instance (void);
-
-  /// parses commandline arguments
-  void parse_args (int argc, ACE_TCHAR *argv[]);
-
-  ACE_CString name_;
-  // Name of package
-
-  ACE_CString uuid_;
-  // Name of package
-
-  ACE_CString path_;
-  // specifies the local path for install
-
-  /// delete the package_ name
-  bool delete_;
-
-  /// installs the package_ name
-  bool install_;
-
-  bool find_;
-  // installs the package_ name
-
-
-  /// shutdown the RepositoryManagerDemon
-  bool shutdown_;
-
-
-protected:
-  /// protected constructor, singleton
-  Options (void);
-
-  /// the singleton
-  static Options *instance_;
-
-
-  void usage (void);
-};
-
-#endif /* RM_OPTIONS_H */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.cpp
deleted file mode 100644
index 8e8c7daa665..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-#include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
-#include "PC_Updater.h"
-#include "PC_Updater_T.h"
-#include "ace/Containers_T.h"				//for ACE_Double_Linked_List
-
-
-#include <iostream>
-using namespace std;
-
-namespace
-{
-	const size_t TEMP_LEN = 1024;
-}
-
-using namespace PC_Updater_T;
-
-
-	//PATH of glory/gory to update the locations of the IADs
-	//
-	//PackageConfiguration something;
-	//ComponentPackageDescriptions basePackage;
-	//PackagedComponentImplementations implementation;
-	//ComponentImplementationDescription referencedImplementation;
-	//
-	//MONOLITHIC Component:
-	//MonolithicImplementationDescriptions monolithicImpl;
-	//NamedImplementationArtifacts primaryArtifact;
-	//ImplementationArtifactDescription referencedArtifact;
-	//::CORBA::StringSeq location;
-	//
-	//ASSEMBLY-BASED Component
-	//ComponentAssemblyDescriptions assemblyImpl;
-	//SubcomponentInstantiationDescriptions instance;
-	//ComponentPackageDescriptions package;
-	//...
-
-
-  /*
-   *  PC_Updater Constructors
-   */
-
-PC_Updater::PC_Updater (const char* server_path, const char* package)
-: server_path_ (server_path),
-  file_list_ (&allocator_),
-  package_ (package),
-  success_ (true)
-{
-}
-
-
-PC_Updater::PC_Updater (ACE_CString& server_path, ACE_CString& package)
-: server_path_ (server_path),
-  file_list_ (&allocator_),
-  package_ (package),
-  success_ (true)
-{
-}
-
-  /*
-   *  PC_Updater - Destructor
-   */
-
-PC_Updater::~PC_Updater ()
-{
-	this->clear_list ();
-}
-
-
-void PC_Updater::clear_list ()
-{
-	while (!this->file_list_.is_empty ())
-	{
-		ZIP_File_Info* inf = this->file_list_.delete_head ();
-
-		//deallocate the head of the filename list
-		delete inf;
-	}
-}
-
-
-  /*
-   *  PC_Updater - Object update methods
-   */
-
-
-  // PackageConfiguration
-
-  bool PC_Updater::update (const ::Deployment::PackageConfiguration &pc)
-  {
-	  //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*> (this->package_.c_str ()), this->file_list_))
-		  return false;
-
-	  update_sequence (pc.basePackage, this);
-
-	  return this->success_;
-  }
-
-
-  // ComponentInterfaceDescription
-
-  void PC_Updater::update (const ::Deployment::ComponentInterfaceDescription &cid)
-  {
-  }
-
-  // Requirement
-
-  void PC_Updater::update (const ::Deployment::Requirement &req)
-  {
-  }
-
-
-  // ComponentExternalPortEndpoint
-
-  void PC_Updater::update (const ::Deployment::ComponentExternalPortEndpoint &cepe)
-  {
-  }
-
-
-
-  // ImplementationDependency
-
-  void PC_Updater::update(const Deployment::ImplementationDependency &id)
-  {
-  }
-
-  // ComponentPackageReference
-
-  void PC_Updater::update (const ::Deployment::ComponentPackageReference &cpr)
-  {
-  }
-
-  // SubcomponentInstantiationDescription
-
-  void PC_Updater::update (const ::Deployment::SubcomponentInstantiationDescription &sid)
-  {
-    update_sequence (sid.package, this);
-  }
-
-  // SubcomponentPortEndpoint
-
-  void PC_Updater::update (const ::Deployment::SubcomponentPortEndpoint& spe)
-  {
-  }
-
-  // AssemblyConnectionDescription
-
-  void PC_Updater::update (const ::Deployment::AssemblyConnectionDescription &acd)
-  {
-  }
-
- 
-  // AssemblyPropertyMapping
-
-  void
-  PC_Updater::update (const ::Deployment::AssemblyPropertyMapping &apm)
-  {
-  }
-
-  // ComponentAssemblyDescription
-
-  void PC_Updater::update (const ::Deployment::ComponentAssemblyDescription& cad)
-  {
-    update_sequence (cad.instance, this);
-  }
-
-  // ImplementationArtifactDescription
-
-  void PC_Updater::update (const ::Deployment::ImplementationArtifactDescription &iad)
-  {
-	  bool found = false;
-
-	  cout << "label: " << iad.label << endl;
-	  cout << "location: " << CORBA::string_dup (iad.location[0].in ()) << endl;
-
-	  ACE_Double_Linked_List_Iterator<ZIP_File_Info> iter (this->file_list_);
-	  char str [TEMP_LEN];
-
-	  while (!iter.done ())
-	  {
-		  ACE_OS::strncpy ( str, iter.next ()->name_.c_str (), TEMP_LEN);
-		  //weird. Need to call next to get current ?!?!
-
-		  const char* name;
-		  const char* ext;
-
-		  name = ACE_OS::strstr (str, iad.location[0].in ());
-
-		  if (name)
-		  {
-			  ext = ACE_OS::strstr (name, ".");
-
-			  ACE_CString loc (this->server_path_);
-			  loc += iad.location[0].in ();
-			  loc += ext;
-
-			  iad.location[0] = CORBA::string_dup (loc.c_str ());
-
-			  cout << "new location: " << iad.location[0].in () << endl << endl;
-
-			  found = true;
-			  break;
-		  }
-		  iter++;
-	  }
-
-	  if (!found)
-		  this->success_ = false;
-  }
-
-  // NamedImplementationArtifact
-
-  void PC_Updater::update (const ::Deployment::NamedImplementationArtifact &nia)
-  {
-    update (nia.referencedArtifact);
-  }
-
-  // ImplementationRequirement
-
-  void PC_Updater::update (const ::Deployment::ImplementationRequirement &ir)
-  {
-  }
-
-  // MonolithicImplementationDescription
-
-  void PC_Updater::update (const ::Deployment::MonolithicImplementationDescription &mid)
-  {
-    update_sequence (mid.primaryArtifact, this);
-  }
-
-  // Capability
-
-  void PC_Updater::update (const ::Deployment::Capability &capability)
-  {
-  }
-
-
-
-  // ComponentImplementationDescription
-
-  void PC_Updater::update (
-        const ::Deployment::ComponentImplementationDescription &cid)
-  {
-    update_sequence (cid.assemblyImpl, this);
-    update_sequence (cid.monolithicImpl, this);
-  }
-
-  // PackagedComponentImplementation
-
-  void PC_Updater::update (const ::Deployment::PackagedComponentImplementation &pci)
-  {
-    PC_Updater::update (pci.referencedImplementation);
-  }
-
-  // ComponentPackageDescription
-
-  void PC_Updater::update (const ::Deployment::ComponentPackageDescription &comppkgdesc)
-  {
-    update_sequence (comppkgdesc.implementation, this);
-  }
-
-
-  // Property
-  void PC_Updater::update (const Deployment::Property& property)
-  {
-  }
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.h
deleted file mode 100644
index 8833f6ec6f3..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//==================================================================
-/**
- *  file  PC_Updater.h
- *
- * $Id$
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PC_UPDATER_H
-#define PC_UPDATER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "ace/SString.h"					//for the ACE_CString
-
-#include "ZIP_Wrapper.h"					//Wrapper around zzip
-#include "ace/Containers_T.h"				//for ACE_Double_Linked_List
-#include "ace/Malloc_Allocator.h"			//for ACE_New_Allocator needed by the doubly link list
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-  /**
-   * class PC_Updater
-   *
-   * This class defines a set of overloaded methods used to update
-   * the contents of a PackageConfiguration. More specifically the class
-   * goes through the PackageConfiguration and updates the locations of the
-   * artifacts, wrt to their location on the HTTP server.
-   */
-
-class  PC_Updater
-{
-public:
-
-	///constructors 
-
-	PC_Updater (const char* server_path, const char* package);
-	PC_Updater (ACE_CString& server_path, ACE_CString& package);
-
-	~PC_Updater ();
-
-    /// A whole slew of overloaded routines for different IDL
-    /// data types part of the PackageConfiguration.
-
-	bool update (const ::Deployment::PackageConfiguration &pc);
-
-    void update (const ::Deployment::Property &property);
-
-    void update (const ::Deployment::AssemblyConnectionDescription &acd);
-
-    void update (const ::Deployment::AssemblyPropertyMapping &apm);
-
-    void update (const ::Deployment::ComponentPackageDescription &comppkgdesc);
-
-    void update (const ::Deployment::MonolithicImplementationDescription &mid);
-
-    void update (const ::Deployment::PackagedComponentImplementation &pci);
-
-    void update (const ::Deployment::SubcomponentPortEndpoint &spe);
-
-    void update (const ::Deployment::Requirement &requirement);
-
-    void update (const ::Deployment::ComponentExternalPortEndpoint &cepe);
-
-    void update (const ::Deployment::ComponentPackageReference &cpr);
-
-    void update (const ::Deployment::ComponentImplementationDescription &cid);
-
-    void update (const ::Deployment::SubcomponentInstantiationDescription &sid);
-
-    void update (const ::Deployment::NamedImplementationArtifact &named_implementation);
-
-    void update (const ::Deployment::ComponentInterfaceDescription &cid);
-
-    void update (const ::Deployment::Capability &capability);
-
-    void update (const ::Deployment::ImplementationArtifactDescription &iad);
-
-    void update (const ::Deployment::ImplementationRequirement &ir);
-
-    void update(const Deployment::ImplementationDependency &id);
-
-    void update (const ::Deployment::ComponentAssemblyDescription& cad);
-
-protected:
-
-	void clear_list ();
-
-private:
-
-	ACE_CString server_path_;
-
-	//create a doubly link list
-	ACE_New_Allocator allocator_;
-	ACE_Double_Linked_List<ZIP_File_Info> file_list_;
-
-	ACE_CString package_;
-	bool success_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* PC_UPDATER_H */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.cpp
deleted file mode 100644
index 4bd4de11c67..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-#ifndef PC_UPDATER_T_C
-#define PC_UPDATER_T_C
-#include "PC_Updater.h"
-#include "PC_Updater_T.h"
-
-  namespace PC_Updater_T
-  {
-    // Dumps a sequence
-    template <typename SEQUENCE>
-    void update_sequence (const SEQUENCE &seq, PC_Updater* updater)
-    {
-      CORBA::ULong size = seq.length ();
-
-      if (size != 0)
-		  for (CORBA::ULong i = 0; i < size; ++i)
-              updater->update (seq[i]);
-	}
-
-  }
-
-#endif /* PC_Updater_C */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.h
deleted file mode 100644
index d2c7e9cb836..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//==================================================================
-/**
- *  file  PC_Updater_T.h
- *
- * $Id$
- *
- *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_PC_UPDATER_T_H
-#define CIAO_CONFIG_HANDLERS_PC_UPDATER_T_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-lite.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-  namespace PC_Updater_T
-  {
-    template <typename SEQUENCE>
-    static void update_sequence (const SEQUENCE &seq);
-  }
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PC_Updater_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PC_Updater_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-#endif /*CIAO_CONFIG_HANDLERS_PC_Updater_T_H*/
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/README.txt b/TAO/CIAO/DAnCE/spec_RepositoryManager/README.txt
deleted file mode 100644
index 29495032206..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/README.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the README file for the Repository Manager (RM).
-
-In order to be able to compile the RM you need to have ZZIP lib because the RM 
-uses it to read the contents of CCM packages. ZZIP itself is a C++ wrapper
-around ZLIB, thus you will also need ZLIB. In order to compile the RM successfully
-you will need to do the following:
- 
-1. Download ZLIB and ZZIP-LIB
-2. Compile the multi-threaded versions of these libraries
-3. create a separate directory for each library and create an include and a lib 
-subdirectory within them. Then copy the libraries files in the library subdirectory.
-Copy zlib.h in the zlib_path/include and copy zziplib.h, zzip-conf.h and zzip-msvc.h 
-(for Windows platforms; Linux might have its own file!!!). This step might be easier if
-you find a binary package of the libraries and just install it.
-4. Set $ZLIB_ROOT and $ZZIP_ROOT to point to the directories where you placed the 
-libraries and the include files.
-5. Turn on zzip and zlib in default.features for MPC.
-6. MPC will handle the rest.
-
-
-Things to watch out for: 
-On Windows make sure that you are linking the right ZIP libraries 
-together with the rest of the libraries, i.e. if you are building the debug version of ACE, 
-TAO and CIAO, then use the debug version of the ZIP libraries. Otherwise the RM will compile
-but it will not work properly. 
-
-to compile the idl with the tao_idl compiler:
-
-tao_idl -GI new_RepositoryManager.idl -I%TAO_ROOT% -I%TAO_ROOT%\tao -I%TAO_ROOT%\orbsvcs -I%CIAO_ROOT%\DAnCE\ciao
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.cpp
deleted file mode 100644
index db446d6c31e..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-// $Id$
-
-#include "RM_Helper.h"
-#include "ciao/Packaging_DataC.h"		//for the PackageConfiguration declaration
-#include "tao/CDR.h"					//for TAO CDR classes
-#include "ace/Message_Block.h"			//for ACE_Message_Block
-#include "ace/Auto_Ptr.h"				//for Auto_Ptr
-#include "ace/OS_NS_fcntl.h"			//for open
-#include "ace/OS_NS_unistd.h"			//for close
-#include "ace/OS_NS_sys_stat.h"			//for filesize and mkdir
-
-
-void RM_Helper::pc_to_cdr (const Deployment::PackageConfiguration& pc, TAO_OutputCDR& cdr)
-{
-	cdr << pc;
-}
-
-
-void RM_Helper::cdr_to_pc (Deployment::PackageConfiguration& pc, TAO_InputCDR& cdr)
-{
-	cdr >> pc;
-}
-
-
-bool RM_Helper::externalize (const Deployment::PackageConfiguration& pc, const char* path)
-{
-	size_t bufsiz = 0;
-	TAO_OutputCDR out (bufsiz);
-	
-	RM_Helper::pc_to_cdr (pc, out);
-	
-	const ACE_Message_Block* mb = out.begin ();
-
-	return write_pc_to_disk (path, *(const_cast<ACE_Message_Block*> (mb)));
-}
-
-bool RM_Helper::reincarnate (Deployment::PackageConfiguration& pc, const char* path)
-{
-	size_t length = 0;
-	ACE_Auto_Ptr<ACE_Message_Block> mb (read_pc_from_disk (path, length));
-
-	if (!mb.get ())
-		return false;
-
-	TAO_InputCDR in (mb.get ());
-
-	RM_Helper::cdr_to_pc (pc, in);
-
-	return true;
-}
-
-
-//---------------------------------------------------------------------
-//These are a bit obsolete but until I am sure I will keep them
-
-//This function attempts to write a sequence of bytes to
-//a specified location. A 0 is returned in the case of an error
-//and a 1 upon success
-
-bool RM_Helper::write_to_disk (
-							   const char* full_path, 
-							   const CORBA::Octet* buffer, 
-							   size_t length
-							  )
-{
-	
-	// Open a file handle to the local filesystem
-    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::write_to_disk] file creation error")),
-                           0);
-
-	//write the data to the file
-	if (ACE_OS::write (handle, buffer, length) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-						   ACE_TEXT ("[RM::write_to_disk] file write error")),
-                           0);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	return 1;
-}
-
-
-//This function attempts to write a sequence of bytes from an
-//ACE_Message_Block to a specified location. A 0 is returned 
-//in the case of an error and a 1 upon success
-
-bool RM_Helper::write_to_disk (
-							   const char* full_path, 
-							   ACE_Message_Block& mb,
-							   bool replace
-							  )
-{
-
-	ACE_stat stat;
-
-	if (ACE_OS::stat(full_path, &stat) != -1 && !replace)
-		return 0;
-	
-	// Open a file handle to the local filesystem
-    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::write_to_disk] file creation error")),
-                           0);
-
-	//write the data to the file
-	for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
-		if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
-		    ACE_ERROR_RETURN ((LM_ERROR,
-		                       ACE_TEXT ("%p\n"),
-		                       ACE_TEXT ("write error")),
-		                      0);
-		
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	return 1;
-}
-
-
-//This function attempts to write a sequence of bytes from an
-//ACE_Message_Block to a specified location. A 0 is returned 
-//in the case of an error and a 1 upon success
-//
-//NOTE: This function write the contents in a way that preserves the
-//structure of the ACE_Message_Block. It is relevant for 
-//PackageConfigurations ONLY
-
-
-bool RM_Helper::write_pc_to_disk (
-							 	  const char* full_path, 
-								  ACE_Message_Block& mb,
-								  bool replace
-								 )
-{
-
-	ACE_stat stat;
-
-	if (ACE_OS::stat(full_path, &stat) != -1 && !replace)
-		return 0;
-	
-	// Open a file handle to the local filesystem
-    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::write_to_disk] file creation error")),
-                           0);
-
-	//write the data to the file
-	for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
-		if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
-		    ACE_ERROR_RETURN ((LM_ERROR,
-		                       ACE_TEXT ("%p\n"),
-		                       ACE_TEXT ("write error")),
-		                      0);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	return 1;
-}
-
-
-//This function attempts to read a sequence of bytes from a specified 
-//location and returns an octet sequence. A 0 is returned 
-//in the case of an error and a 1 upon success
-
-CORBA::Octet* RM_Helper::read_from_disk (
-										 const char* full_path,
-									 	 size_t &length
-										)
-{
-	//open the file
-	ACE_HANDLE handle = ACE_OS::open (full_path, O_RDONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::read_from_disk] file open error")),
-                           0);
-
-	ACE_stat file_info;
-
-	ACE_OS::fstat (handle, &file_info);
-
-	CORBA::Octet* buffer = new CORBA::Octet[file_info.st_size];
-
-	if (buffer == 0)
-		return 0;
-
-	//read the contents of the file into the buffer
-	if (ACE_OS::read_n (handle, buffer, file_info.st_size) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-						   ACE_TEXT ("[RM::read_from_disk] file read error")),
-                           0);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	length = file_info.st_size;
-	return buffer;
-}
-
-
-
-	///function to read the contents of a file from disk into an ACE_Message_Block
-	///returns a pointer to an ACE_Message_Block and updates the lenght on success 
-	///		 0 on failure
-
-
-ACE_Message_Block* RM_Helper::read_pc_from_disk (
-											     const char* full_path, 
-											     size_t &length
-											    )
-{
-	length = 0;
-
-	//open the file
-	ACE_HANDLE handle = ACE_OS::open (full_path, O_RDONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::read_mb_from_disk] file open error")),
-                           0);
-
-	ACE_stat file_info;
-
-	ACE_OS::fstat (handle, &file_info);
-
-	ACE_Message_Block* mb = new ACE_Message_Block (file_info.st_size + 1);
-
-	if (mb == 0)
-		return 0;
-
-	//read the contents of the file into the buffer
-	if (ACE_OS::read_n (handle, mb->wr_ptr (), file_info.st_size) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-						   ACE_TEXT ("[RM::read_mb_from_disk] file read error")),
-                           0);
-
-	mb->length (file_info.st_size);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	length = file_info.st_size;
-	return mb;
-}
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.h
deleted file mode 100644
index e78be2e4f44..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-
-#ifndef RM_HELPER_H_
-#define RM_HELPER_H_
-
-
-#include "ciao/Packaging_DataC.h"		//for the PackageConfiguration declaration
-#include "tao/CDR.h"					//for TAO CDR classes
-
-//int operator<< (ACE_OutputCDR& cdr, const Deployment::PackageConfiguration& pc); 
-//int operator>> (ACE_InputCDR& cdr, Deployment::PackageConfiguration& pc);
-//Similar operators are generated by the IDL compiler
-//
-//Do search for "Deployment::PackageConfiguration &" in Packaging_DataC.cpp
-//
-//::CORBA::Boolean operator<< (
-//    TAO_OutputCDR &strm,
-//    const Deployment::PackageConfiguration &_tao_aggregate
-//
-//::CORBA::Boolean operator>> (
-//    TAO_InputCDR &strm,
-//    Deployment::PackageConfiguration &_tao_aggregate
-//  )
-
-
-class RM_Helper
-{
-public:
-
-	static void pc_to_cdr (const Deployment::PackageConfiguration& pc, TAO_OutputCDR& cdr);
-
-	static void cdr_to_pc (Deployment::PackageConfiguration& pc, TAO_InputCDR& cdr);
-
-	static bool externalize (const Deployment::PackageConfiguration& pc, const char* path);
-
-	static bool reincarnate (Deployment::PackageConfiguration& pc, const char* path);
-
-	///function that writes out a file to a specified location on the hard disk
-	///returns 1 on success
-	///		   0 on error
-
-	static bool write_to_disk (const char* full_path, 
-			 	 			   const CORBA::Octet* buffer, 
-							   size_t length
-							   );
-
-
-	///function that writes out a file to a specified location on the hand disk
-	///returns 1 on success
-	///		   0 on already exists and replace == false
-	///		   0 on error
-
-	static bool write_to_disk (const char* full_path, 
-							   ACE_Message_Block& mb,
-							   bool replace = true
-							   );
-
-	///function that writes out a file to a specified location on the hand disk
-	///returns 1 on success
-	///		   0 on already exists and replace == false
-	///		   0 on error
-	///
-	///NOTE: This function is relevant for PackageConfigurations ONLY
-
-	static bool write_pc_to_disk (const char* full_path, 
-								  ACE_Message_Block& mb,
-								  bool replace = true
-								 );
-
-	///function to read the contents of a file from disk into a CORBA::OctetSeq
-	///returns a pointer to a CORBA::Octet buffer and updates the lenght on success 
-	///		 0 on failure
-
-	static CORBA::Octet* read_from_disk (const char* full_path, size_t &length);
-
-	///function to read the contents of a file from disk into an ACE_Message_Block
-	///returns a pointer to an ACE_Message_Block and updates the lenght on success 
-	///		 0 on failure
-
-
-	static ACE_Message_Block* read_pc_from_disk (const char* full_path, size_t &length);
-
-};
-
-#endif
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RMadmin.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/RMadmin.cpp
deleted file mode 100644
index 3b96e606e83..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RMadmin.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-// $Id$
-
-/***
- * file RMClient.cpp
- *
- * author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- **/
-
-#include "RepositoryManagerC.h"
-#include "Options.h"
-
-//#include "Config_Handlers/pcd.hpp"	//for the PackageConfiguration data struct
-#include "ace/OS_NS_fcntl.h"			//for open
-#include "ace/OS_NS_unistd.h"		    //for close
-#include "ace/OS_NS_sys_stat.h"		    //for filesize and fstat and mkdir
-
-#include "Config_Handlers/DnC_Dump.h"
-
-#include <iostream>
-using namespace std;
-
-#include "RM_Helper.h"					//to be able to externalize/internalize a PackageConfiguration
-#include "tao/CDR.h"					//for TAO CDR classes
-#include "ace/Message_Block.h"			//for ACE_Message_Block
-
-
-
-//IOR file of the RM
-const char * ior = "file://RepositoryManagerDeamon.ior";
-
-
-///=============================COUPLE OF HELPER METHORS==================================
-CORBA::Octet* read_from_disk (
-	const char* full_path,
-	size_t &length
-	);
-
-int write_to_disk (
-	const char* full_path, 
-	const CORBA::Octet* buffer, 
-	size_t length
-	);
-///========================================================================================
-
-
-///main function that provides a sample interface for RM clients
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 
-											""ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-
-      CORBA::Object_var obj =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-	  CIAO::RepositoryManagerDaemon_var rm =
-		  CIAO::RepositoryManagerDaemon::_narrow (obj.in ()
-			                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (rm.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             "Unable to acquire RepositoryManagerDaemon's objref\n"),
-                            -1);
-        }
-
-
-		Options* options = Options::instance ();
-		options->parse_args (argc, argv);
-		
-		if (options->shutdown_)
-		{
-			rm->shutdown ();
-		}
-		else if (options->install_)
-		{
-			try
-			{
-				rm->installPackage (options->name_.c_str (), options->path_.c_str ());
-			}
-			catch (CORBA::Exception & ex)
-			{
-				cout << "\nException caught!" << ex << "\n";
-				return 0;
-			}
-
-			cout << "\nReassuring that the package in the repository ..." << endl;
-			try
-			{
-				Deployment::PackageConfiguration_var pc = rm->findPackageByName (options->name_.c_str ());
-				cout << "The package was found!" << endl;
-				cout << "Label: " << pc->label << endl;
-				cout << "UUID: " << pc->UUID << endl;
-			}
-			catch (CORBA::Exception &)
-			{
-				cout << "\nError! Package not found!" << endl;
-			}
-		}
-		else if (options->delete_)
-		{
-			try
-			{
-				rm->deletePackage (options->name_.c_str ());
-				cout << options->name_.c_str () << " deleted" << endl;
-			}
-			catch (CORBA::Exception &)
-			{
-				cout << "\nNo such package!" << endl;
-			}
-
-		}
-		else if (options->find_)
-		{
-			if (options->name_ != "")
-			{
-				Deployment::PackageConfiguration_var pc = rm->findPackageByName (options->name_.c_str ());
-				cout << "The package was found!" << endl;
-				Deployment::DnC_Dump::dump (pc);
-			}
-			else
-			{
-				Deployment::PackageConfiguration_var pc = rm->findPackageByUUID (options->uuid_.c_str ());
-				cout << "The package was found!" << endl;
-				Deployment::DnC_Dump::dump (pc);
-			}
-		}
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			                     "Unknown exception \n");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-
-CORBA::Octet* read_from_disk (
-	const char* full_path,
-	size_t &length
-	)
-{
-	//open the file
-
-	ACE_HANDLE handle = ACE_OS::open (full_path, O_RDONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::read_from_disk] file open error")),
-                           0);
-
-	ACE_stat file_info;
-
-	ACE_OS::fstat (handle, &file_info);
-
-	CORBA::Octet* buffer = new CORBA::Octet[file_info.st_size];
-
-	if (buffer == 0)
-		return 0;
-
-	//read the contents of the file into the buffer
-	if (ACE_OS::read_n (handle, buffer, file_info.st_size) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-						   ACE_TEXT ("[RM::write_to_disk] file write error")),
-                           0);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	length = file_info.st_size;
-	return buffer;
-}
-
-
-int write_to_disk (
-	const char* full_path, 
-	const CORBA::Octet* buffer, 
-	size_t length
-	)
-{
-	
-	// Open a file handle to the local filesystem
-    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
-    if (handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-                           ACE_TEXT ("[RM::write_to_disk] file creation error")),
-                           -1);
-
-	//write the data to the file
-	if (ACE_OS::write (handle, buffer, length) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("%p\n"),
-						   ACE_TEXT ("[RM::write_to_disk] file write error")),
-                           -1);
-
-	// Close the file handle
-    ACE_OS::close (handle);
-
-	return 1;
-}
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.cpp
deleted file mode 100644
index ebe07839060..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-/***
- * file RepositoryManager.cpp
- *
- * author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- **/
-
-
-#include "RepositoryManager_Impl.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Task.h"
-using namespace std;
-
-namespace
-{
-///name of the file holding the IOR of the RM
-const char * rm_ior = "RepositoryManagerDeamon.ior";
-
-///default number of worker threads to run in the multi-threaded RM
-const unsigned int nthreads = 3;
-}
-
-
-///Class that implements the service routine of the worker threads
-///of the repository manager
-
-class Worker : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
-public:
-  Worker (CORBA::ORB_ptr orb);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  CORBA::ORB_var orb_;
-  // The orb
-};
-
-
-///Main function
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-	try
-	{
-		//init the ORB
-		CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-
-		//Get the root POA object
-		CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-		
-		//downcast to POA type
-		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
-
-		//activate the POA manager
-		PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
-		mgr->activate ();
-
-		//create a servant
-		CIAO_RepositoryManagerDaemon_i* repo = new CIAO_RepositoryManagerDaemon_i (orb.in ());
-
-		//trasfer ownership to the POA
-		PortableServer::ServantBase_var distributor_owner_transfer(repo);
-
-		//register and implicitly activate servant
-		CIAO::RepositoryManagerDaemon_var RepositoryManagerDeamon = repo->_this ();
-		
-		//convert the IOR to string
-		CORBA::String_var ior = orb->object_to_string (RepositoryManagerDeamon.in ());
-
-		//output the IOR to a file
-		FILE* ior_out = ACE_OS::fopen (rm_ior, "w");
-		
-		if (ior_out == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           rm_ior),
-                              1);
-		
-		ACE_OS::fprintf (ior_out, "%s", ior.in ());
-		ACE_OS::fclose (ior_out);
-
-		Worker worker (orb.in ());
-		if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-			                   nthreads) != 0)
-			ACE_ERROR_RETURN ((LM_ERROR,
-			                   "Cannot activate client threads\n"),
-							   1);
-
-	    worker.thr_mgr ()->wait ();
-
-	    ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-		//done
-		return 0; 
-
-		//Start accepting requests
-		orb->run ();
-
-		//allow objects registered with the POA ot get cleaned-up
-		root_poa->destroy (1, 1);
-
-		//shutdown the orb
-		orb->shutdown (1);
-
-		return 0;
-	}
-	catch (CORBA::Exception &ex) {
-		cerr << "CORBA Exception: " << ex << endl;
-
-		return 1;
-	}
-
-
-  return 0;
-}
-
-
-
-// ****************************************************************
-
-///Constuctor for the worker class
-Worker::Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-///implementation of the service routine inherited from ACE::Task_Base
-
-int Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.idl b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.idl
deleted file mode 100644
index 5293ed4fcbe..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Deployment.idl"
-
-module CIAO
-{
-  interface RepositoryManagerDaemon : Deployment::RepositoryManager
-  {
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
deleted file mode 100644
index d6b66dfe33c..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
+++ /dev/null
@@ -1,705 +0,0 @@
-// $Id$
-
-///====================================================================
-// filename: RepositoryManager_Impl.cpp
-// Author: Stoyan Paunov	spaunov@isis.vanderbilt.edu
-//
-
-#include "RepositoryManager_Impl.h"
-
-#include "ace/OS_NS_fcntl.h"			//for open
-#include "ace/OS_NS_unistd.h"			//for close
-#include "ace/OS_NS_sys_stat.h"			//for filesize and fstat and mkdir
-#include "ace/OS_NS_string.h"			//for ACE_CString
-
-
-//to remove a file or dir from the local filesystem need remove () from stdio.h
-// ---> need to include ace/OS_NS_stdio.h which would include the correct file for any OS!
-#include "ace/OS_NS_stdio.h"
-
-#include "ZIP_Wrapper.h"					//Wrapper around zzip
-#include "ace/Containers_T.h"				//for ACE_Double_Linked_List
-#include "ace/Malloc_Allocator.h"			//for ACE_New_Allocator needed by the doubly link list
-
-//for the PackageConfiguration parsing
-#include "Config_Handlers/STD_PC_Intf.h"
-//#include "Config_Handlers/Deployment.hpp"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Packaging_DataC.h"
-#include "Config_Handlers/Utils/XML_Helper.h"
-#include "xercesc/dom/DOM.hpp"
-
-#include "RM_Helper.h"					//to be able to externalize/internalize a PackageConfiguration
-#include "ace/Message_Block.h"			//for ACE_Message_Block
-
-#include "ace/Thread.h"					//for obtaining the ID of the current thread
-#include "ace/OS_NS_stdlib.h"			//for itoa ()
-
-#include "URL_Parser.h"					//for parsing the URL
-#include "HTTP_Client.h"				//the HTTP client class to downloading packages
-
-#include "PC_Updater.h"					//A visitor class to walk through the elements of the PC
-
-#include <iostream>
-using namespace std;
-
-
-// Implementation skeleton constructor
-CIAO_RepositoryManagerDaemon_i::CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb, const char* server)
-  : the_orb_ (CORBA::ORB::_duplicate (the_orb)),
-    install_root_ (""),
-    HTTP_server_ (server)
-{
-  //create directory in which the packages will be stored
-
-  ACE_OS::mkdir(INSTALL_PATH);	
-  //if dir already exists a -1 is returned
-  //we ignore this, just need to make sure the directory exists
-
-  ACE_OS::getcwd (this->cwd_, TEMP_LEN);
-
-  this->install_root_ = this->cwd_;
-  this->install_root_ += "/";
-  this->install_root_ += INSTALL_PATH;
-}
-
-// Implementation skeleton destructor
-CIAO_RepositoryManagerDaemon_i::~CIAO_RepositoryManagerDaemon_i (void)
-{
-  this->names_.unbind_all ();
-  this->uuids_.unbind_all ();
-}
-
-void CIAO_RepositoryManagerDaemon_i::shutdown (
-    
-  )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-{
-  // Add your implementation here
-  this->names_.unbind_all ();
-  this->uuids_.unbind_all ();
-
-  this->the_orb_->shutdown (0);
-}
-
-
-void CIAO_RepositoryManagerDaemon_i::installPackage (
-                                                     const char * installationName,
-                                                     const char * location
-                                                     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   ::Deployment::NameExists,
-                   ::Deployment::PackageError
-                   ))
-{
-  // Add your implementation here
-	
-  ACE_Hash_Map_Entry <ACE_CString, ACE_CString> *entry;
-
-  if (this->names_.find (ACE_CString (installationName), entry) == 0)
-    ACE_THROW (Deployment::NameExists ());
-
-  //Now lets form the path for the local file
-  //NOTE: I need the absolute path because I will change to a subdirectory 
-  //when I am parsing the descriptors
-
-  ACE_CString path (this->install_root_);
-  path += "/";
-  path += installationName;
-
-  ACE_CString package_path (path);
-  package_path += ".cpk";				//package extension
-
-  ACE_CString pc_path (path);
-  pc_path += PC_EXTENSION;			//external PackageConfiguration extension
-
-
-  ACE_CString descriptor_dir (path);
-  descriptor_dir += "/descriptors/"; //location of the descriptor directory
-
-
-  //check if URL or local file
-  //download or load into memory
-
-  size_t length = 0;	 
-
-  if (ACE_OS::strstr (location, "http://"))
-    {
-      URL_Parser *parser = URL_Parser::instance ();
-      if (!parser->parseURL (const_cast <char*> (location)))
-        ACE_THROW (CORBA::INTERNAL ());
-
-      // Create a client
-      HTTP_Client client;
-
-      //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
-      ACE_Message_Block* mb = new ACE_Message_Block (0,0);
-
-      // Open the client
-      if (client.open (parser->filename_,
-                       parser->hostname_,
-                       parser->port_) == -1)
-        {
-          mb->release ();
-          client.close ();
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      // Read from it
-      if (client.read (mb) <= 0)
-        {
-          mb->release ();
-          client.close ();
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      // Write file to designated location on disk
-      if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
-        {
-          mb->release ();
-          client.close ();
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      mb->release ();
-      client.close ();
-    }
-  else
-    {
-      CORBA::Octet* file = 0;
-
-      //read the package from disk and store in the RM directory
-      //see if you can substiture this with a memory mapped file
-      //for better perofrmance (mimic zero copy here)
-      file = RM_Helper::read_from_disk (location, length);
-
-      if (!file)
-        ACE_THROW (CORBA::INTERNAL ());
-
-      //Store the package in the local RM dir for future retrieval
-      if (!RM_Helper::write_to_disk (package_path.c_str (), file, length))
-        ACE_THROW (CORBA::INTERNAL ());
-
-      //NOTE: MEMORY LEAK UNLESS delete file; change to Auto_Ptr
-      delete file;
-    }
-
-
-  ZIP_Wrapper::uncompress (const_cast<char*> (package_path.c_str ()), 
-                           const_cast<char*> (this->install_root_.c_str ()),
-                           false //not verbose
-                           );
-
-  //Start the parsing
-
-  ACE_CString pc_name;
-
-  this->find_PC_name (const_cast<char*> (package_path.c_str ()), pc_name);
-
-  //if the PackageConfiguration name cannot be found, then there is nothing to install
-  if (pc_name == "")
-    ACE_THROW (Deployment::PackageError ());
-
-
-  //TODO: move exception throwing out of this func. User boolean error handling!!!
-  //TODO: check for errors!
-  Deployment::PackageConfiguration_var pc;
-  pc = this->retrieve_PC_from_descriptors (const_cast<char*> (pc_name.c_str ()), 
-                                           descriptor_dir.c_str ());
-
-
-  //forming the server path info
-  ACE_CString server_path (this->HTTP_server_);
-  server_path += installationName;
-  server_path += "/implementations/";
-
-  PC_Updater updater (server_path, package_path);
-	
-  if (!updater.update (pc))
-    {
-      cout << "[RM] problem updating the PackageConfiguration!\n";
-      remove_extracted_package (package_path.c_str (), path.c_str ());
-      remove (package_path.c_str ());
-      ACE_THROW (Deployment::PackageError ());
-    }
-
-
-  //now lets externalize the PackageConfiguration, so that we can access it later on
-  //without having to do the whole parsing again.
-  //NOTE: Order here is important. Do not populate maps before the externalization!
-  RM_Helper::externalize (pc, pc_path.c_str ());
-
-  //insert the package into the database
-  this->names_.bind (ACE_CString (installationName), path);
-
-  //ALSO NEED THE UUID here
-  this->uuids_.bind (ACE_CString (pc->UUID), path);
-
-  ACE_TRACE (("Installed PackageConfiguration with: \nlabel %s \nuuid %s\n", pc->label, pc->UUID));
-}
-
-void CIAO_RepositoryManagerDaemon_i::createPackage (
-                                                    const char * installationName,
-                                                    const ::Deployment::PackageConfiguration & package,
-                                                    const char * baseLocation,
-                                                    ::CORBA::Boolean replace
-                                                    )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   ::Deployment::NameExists,
-                   ::Deployment::PackageError
-                   ))
-{
-  // Add your implementation here
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-::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
-
-  ACE_Hash_Map_Entry <ACE_CString, ACE_CString> *entry = 0;
-
-  if (this->names_.find (ACE_CString (name), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());							
-  //PackageConfiguration was not found
-
-  ACE_CString pc_path (entry->int_id_.c_str ());
-  pc_path += PC_EXTENSION;
-
-  Deployment::PackageConfiguration_var pc = new Deployment::PackageConfiguration (); 
-	
-  if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  //maybe I will still retrieve it in the case of failure: TODO
-  //Deployment::PackageConfiguration_var pc = retrieve_PC(const_cast<char*> ());
-
-  return pc._retn ();
-}
-
-::Deployment::PackageConfiguration * CIAO_RepositoryManagerDaemon_i::findPackageByUUID (
-                                                                                        const char * UUID
-                                                                                        )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   ::Deployment::NoSuchName
-                   ))
-{
-  // Add your implementation here
- 
-  //NOTE: The following code actually works but I have not gotten 
-  //the DELETE to remove the UUIDs and I am not allowing this code 
-  //to be used for right now because the RM stays in an inconsistent 
-  //state. A package can be deleted but it is still retrievable by is UUID.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-
-
-  // Find out if the PackageConfiguration was installed in the repository,
-  // return it if found or throw and exception otherwise
-
-  ACE_Hash_Map_Entry <ACE_CString, ACE_CString> *entry = 0;
-
-  if (this->uuids_.find (ACE_CString (UUID), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());							
-  //PackageConfiguration was not found
-
-  ACE_CString pc_path (entry->int_id_.c_str ());
-  pc_path += PC_EXTENSION;
-
-  Deployment::PackageConfiguration_var pc = new Deployment::PackageConfiguration (); 
-	
-  if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  //maybe I will still retrieve it in the case of failure: TODO
-  //Deployment::PackageConfiguration_var pc = retrieve_PC(const_cast<char*> ());
-
-  return pc._retn ();
-}
-
-::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::findNamesByType (
-                                                                      const char * type
-                                                                      )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-{
-  // Add your implementation here
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::getAllNames (
-    
-  )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-{
-  // Add your implementation here
-
-  CORBA::ULong num_entries = this->names_.current_size (); 
-  CORBA::StringSeq_var seq = new CORBA::StringSeq (num_entries);
-
-  CORBA::ULong index = 0;
-  for (PCMap_Iterator iter = this->names_.begin ();
-       iter != this->names_.end () && index < num_entries;
-       iter++)
-
-    seq[index] = const_cast<char*> (((*iter).int_id_).c_str ());	//this looks hideous, but as long as it works!
-
-
-  return seq._retn ();		//release the underlying CORBA::StringSeq
-}
-
-::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::getAllTypes (
-    
-  )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-{
-  // Add your implementation here
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-void CIAO_RepositoryManagerDaemon_i::deletePackage (
-                                                    const char * installationName
-                                                    )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   ::Deployment::NoSuchName
-                   ))
-{
-  // Add your implementation here
-
-  ACE_Hash_Map_Entry <ACE_CString, ACE_CString> *entry;
-
-  if (this->names_.find (ACE_CString (installationName), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());
-  else
-    this->names_.unbind (installationName);
-
-  //do the same for the UUID!!!!
-  //TODO: NEED TO DO THIS LATER
-
-
-  //actually delete the package here!
-  //TODO: Check if files are ref-counted by the OS, so if I delete it here while
-  //some other process is still using it from a previous request, would that cause an error,
-  //or would it decrement the recount and delete the file when the other process is done.
-  //
-  //on that note is a file handle is not closed the file does not get deleted! , so see how
-  //temp files work!
-		
-  ACE_CString path (this->install_root_.c_str ());
-  path += "/";
-  path += installationName;
-
-  ACE_CString package_path (path);
-  package_path += ".cpk";				//package extension
-
-  ACE_CString pc_path (path);
-  pc_path += PC_EXTENSION;			//external PackageConfiguration extension
-
-  remove_extracted_package (package_path.c_str (), path.c_str ());
-
-  remove (package_path.c_str ());
-  remove (pc_path.c_str ());
-}
-
-//==========================================HELPER METHODS==================================================
-
-Deployment::PackageConfiguration* 
-CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_package (char* package)
-{
-  char temp[128];
-  //  ACE_thread_t thread_id = ACE_Thread::self ();
-  char* PID = ACE_OS::itoa (ACE_OS::getpid (), temp, 10);
-  
-  ACE_OS::mkdir(PID);	
-  //if dir already exists a -1 is returned
-  //we ignore this, just need to make sure the directory exists
-
-  //change the working dir
-  ACE_OS::chdir (PID);
-
-  ACE_CString pcd_name;
-  //extract the necessary descriptors
-  if (extract_descriptor_files (package,
-                                pcd_name) < 0)
-    {
-      ACE_OS::chdir (this->cwd_);
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) RepositoryManager: error extracting necessary files\n"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  Deployment::PackageConfiguration_var pc;
-  //parse the PCD to make sure that there are no package errors
-  ACE_TRY
-    {
-      CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
-    
-      pc = intf.get_PC ();
-    }
-  ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
-
-      //change back the the old working dir
-      ACE_OS::chdir (this->cwd_);
-      ACE_THROW (Deployment::PackageError ());
-    }
-  ACE_ENDTRY;
-  //able to parse the PC. So lets install the package in the repo
-
-  //we no longer need the descriptors, so lets erase them!
-  remove_descriptor_files (package);
-
-  //change back the the old working dir
-  ACE_OS::chdir (this->cwd_);
-
-  //now lets erase the directory!
-  ACE_OS::rmdir (PID);
-  //the ACE_OS::rmdir does not work. Possibly because we need to delete
-  //the contents first. I will look into it more closely when I am back.
-
-  return pc._retn ();
-}
-
-
-//function to parse and return the PackageConfiguration from the already
-//extracted descriptor files
-Deployment::PackageConfiguration* 
-CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_name, 
-                                                              const char* descriptor_dir)
-{
-  //change the working dir
-  ACE_OS::chdir (descriptor_dir);
-
-  Deployment::PackageConfiguration_var pc;
-  //parse the PCD to make sure that there are no package errors
-  ACE_TRY
-    {
-      CIAO::Config_Handlers::STD_PC_Intf intf (pc_name);
-    
-      pc = intf.get_PC ();
-    }
-  ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
-		
-      //change back the the old working dir
-      ACE_OS::chdir (this->cwd_);
-      ACE_THROW (Deployment::PackageError ());
-    }
-  ACE_ENDTRY;
-  //able to parse the PC. So lets install the package in the repo
-
-  //change back the the old working dir
-  ACE_OS::chdir (this->cwd_);
-
-  return pc._retn ();
-}
-
-
-//find out what the name of the PackageConfiguration file is
-void CIAO_RepositoryManagerDaemon_i::find_PC_name (char* package, ACE_CString& pcd_name)
-{
-  pcd_name = "";	//empty the contents of the ACE_CString
-
-  //create a doubly link list
-  ACE_New_Allocator allocator;
-  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
-
-  //get the list of files in the package and figure out the names of all necessary files
-  if (!(ZIP_Wrapper::file_list_info (package, list)))
-    return;
-
-  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
-
-  while (!list.is_empty ())
-    {
-      ZIP_File_Info* inf = list.delete_head ();
-
-      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
-        if (ACE_OS::strstr (inf->name_.c_str (), ".pcd"))
-          pcd_name = inf->name_.c_str () + skip_len;
-
-      //deallocate the head of the filename list
-      delete inf;
-    }
-}
-
-
-//We are using Xercesc in the Config_Handlers and unfortunately its API only
-//takes a file in the local file system as an argument, thus need to
-//write out the contents of the deployent plan to a file
-//in the current directory. I use the thread id to guarrantee 
-//lack of race conditions if multithreading is enabled
-
-int CIAO_RepositoryManagerDaemon_i::extract_descriptor_files (char* package, ACE_CString& pcd_name) 
-{
-  //create a doubly link list
-  ACE_New_Allocator allocator;
-  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
-
-  //get the list of files in the package and figure out the names of all necessary files
-  if (!(ZIP_Wrapper::file_list_info (package, list)))
-    return 0;
-
-  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
-
-  while (!list.is_empty ())
-    {
-      ZIP_File_Info* inf = list.delete_head ();
-      ACE_Message_Block* file = 0;
-      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
-        {
-          if (ACE_OS::strstr (inf->name_.c_str (), ".pcd"))
-            pcd_name = inf->name_.c_str () + skip_len;
-
-          //extract the descriptor from the package
-          file = new ACE_Message_Block (0,0);
-          if (!ZIP_Wrapper::get_file(const_cast<char*> (package), 
-                                     const_cast<char*> (inf->name_.c_str ()), 
-                                     *file))
-            {
-              ACE_ERROR ((LM_ERROR, 
-                          "[RM::extract_descriptor_files] Unable to retrieve file!\n"));
-              //release the message block chain
-              file->release ();
-              return 0;
-            }
-
-
-          //write the file to disk
-          if(!RM_Helper::write_to_disk (inf->name_.c_str () + skip_len, *file))
-            {
-              ACE_ERROR ((LM_ERROR, 
-                          "[RM::extract_descriptor_files] Unable to write out descriptor to disk!\n"));
-              //release the message block chain
-              file->release ();
-              return 0;
-            }
-
-          //release the message block chain
-          file->release ();
-        }
-
-      //deallocate the head of the filename list
-      delete inf;
-    }
-
-  return 1;
-}
-
-int CIAO_RepositoryManagerDaemon_i::remove_descriptor_files (char* package)
-{
-  int return_code = 1;
-
-  //create a doubly link list
-  ACE_New_Allocator allocator;
-  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
-
-  //get the list of files in the package and figure out the names of all necessary files
-  if (!(ZIP_Wrapper::file_list_info (package, list)))
-    return 0;
-
-  size_t skip_len = ACE_OS::strlen ("descriptors") + 1;
-
-  while (!list.is_empty ())
-    {
-      ZIP_File_Info* inf = list.delete_head ();
-      if (ACE_OS::strstr (inf->name_.c_str (), "descriptors"))
-        {
-          //delete disk
-          if(remove (inf->name_.c_str () + skip_len))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "[RM::remove_descriptor_files] Unable to write out descriptor to disk!\n"));
-              return_code = 0;
-            }
-        }
-      //deallocate the head of the filename list
-      delete inf;
-    }
-
-  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 return_code = 1;
-
-  //create a doubly link list
-  ACE_New_Allocator allocator;
-  ACE_Double_Linked_List<ZIP_File_Info> list (&allocator);
-
-  //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)))
-    {
-      //change back the the old working dir
-      ACE_OS::chdir (this->cwd_);
-      return 0;
-    }
-
-  while (!list.is_empty ())
-    {
-      ZIP_File_Info* inf = list.delete_head ();
-	
-      //delete file from disk
-      if(remove (inf->name_.c_str ()))
-        {
-          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");
-
-  //now go one directory up and delete the extraction directory
-  ACE_OS::chdir (this->install_root_.c_str ());
-  ACE_OS::rmdir (extraction_location);
-
-  //change back the the old working dir
-  ACE_OS::chdir (this->cwd_);
-
-  return return_code;
-}
-
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h
deleted file mode 100644
index 85a0002c457..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// $Id$
-
-#ifndef REPOSITORYMANAGERI_H_
-#define REPOSITORYMANAGERI_H_
-
-///====================================================================
-// filename: RepositoryManager_Impl.h
-// Author: Stoyan Paunov	spaunov@isis.vanderbilt.edu
-//
-// Purpose: This class is the implementation class for the spec
-//          complient RepositoryManager
-//
-
-
-#include "RepositoryManagerS.h"
-#include "DeploymentS.h"					//added for the deployment stuff
-
-#include "ace/Hash_Map_Manager.h"			//for the ACE_Hash_Map_Manager
-#include "ace/Null_Mutex.h"					//for ACE_Null_Mutex
-#include "ace/RW_Mutex.h"					//for ACE_RW_Mutex
-#include "ace/OS_NS_string.h"				//for ACE_CString
-#include "ace/SString.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace
-{
-///DIRECTORY WHERE THE PACKAGES WILL BE STORED LOCALLY
-const static char* INSTALL_PATH = "RepositoryDir";
-
-const static size_t TEMP_LEN = 512;
-
-const static char* PC_EXTENSION = ".epc";
-}
-
-class  CIAO_RepositoryManagerDaemon_i : public virtual POA_CIAO::RepositoryManagerDaemon
-{
-public:
-  //Constructor
-	CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb,
-									const char* server = "http://localhost:5432/");
-
-  //Destructor
-  virtual ~CIAO_RepositoryManagerDaemon_i (void);
-
-  virtual
-  void shutdown (
-
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual
-  void installPackage (
-      const char * installationName,
-      const char * location
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ::Deployment::NameExists,
-      ::Deployment::PackageError
-    ));
-
-  virtual
-  void createPackage (
-      const char * installationName,
-      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:
-
-	  ///function to parse and return the PackageConfiguration from a specified package
-	  Deployment::PackageConfiguration* retrieve_PC_from_package (char* package);
-
-	  ///find out what the name of the PackageConfiguration file is
-	  void find_PC_name (char* package, ACE_CString& pcd_name);
-
-	  ///function to parse and return the PackageConfiguration from the already
-	  ///extracted descriptor files
-	  Deployment::PackageConfiguration* retrieve_PC_from_descriptors (const char* pc_name,
-																	  const char* descriptor_dir);
-
-	  ///function to extract all necessary files for parsing the PackageConfiguration
-	  ///descriptor and populating the idl struct.
-	  ///return 1 on success
-	  ///       0 on error
-	  ///
-	  ///NOTE: ACE_CString& pcd_name is an out parameter
-
-	  int extract_descriptor_files (char* package,
-								   ACE_CString& pcd_name);
-
-
-	  ///function to remove the files extracted for parsing the PackageConfiguration
-	  ///descriptor and populating the idl struct. It reads the names of the files
-	  ///from the package. They correspond to the names on disk.
-	  ///return 1 on success
-	  ///       0 on error
-
-	  int remove_descriptor_files (char* package);
-
-
-	  ///function to remove the files extracted from the package upon istallation
-	  ///It reads the names of the files from the package. They correspond to the
-	  ///names on disk. It deletes each file, then it deletes the directories that
-	  ///contain them.
-	  ///NOTE: extraction location is path/*archive_name*/
-	  ///return 1 on success
-	  ///       0 on error
-
-	  int remove_extracted_package (const char* package_path, const char* extraction_location);
-
-  private:
-	/// Cached information about the installed PackageConfigurations
-	/// A separate map for the installation names and their UUID's
-    /// Key:	PackageConfiguration name or its UUID (CString type)
-    /// Value:	The location of the local copy of the package
-
-	///Based on the synchronization needed we can parametrize this with either
-	///ACE_Null_Mutex or ACE_RW_Mutex
-
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    ACE_CString,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_RW_Mutex> PCMap;
-
-
-	typedef PCMap::iterator PCMap_Iterator;
-
-	//a hash map that associates the names of PackageConfigurations with their location
-    PCMap names_;
-
-	//a hash map that associates the UUIDs of PackageConfigurations with their location
-	PCMap uuids_;
-
-	CORBA::ORB_var the_orb_;
-
-	char cwd_ [TEMP_LEN];			//will hold the current working directory
-	ACE_CString	install_root_;		//full path for the install directory
-	ACE_CString HTTP_server_;		//location of the server
-
-};
-
-
-#endif /* REPOSITORYMANAGER_H_  */
-
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h
deleted file mode 100644
index 5f973fb4062..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-// URL_Parser.h, Stoyan
-
-//============================================================================
-//
-// = FILENAME
-//    URL_Parser.h
-//
-// = DESCRIPTION
-//     parses a URL
-//
-// = AUTHOR
-//    Stoyan Paunov
-//
-//============================================================================
-
-#ifndef URL_PARSER_H
-#define URL_PARSER_H
-
-#include "ace/Get_Opt.h"
-
-//#if !defined (ACE_LACKS_PRAGMA_ONCE)
-//# pragma once
-//#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/ARGV.h"
-
-class URL_Parser
-{
-public:
-  static URL_Parser *instance (void);
-  // Returns the singleton instance
-
-  bool parse_args (int argc, ACE_TCHAR *argv[]);
-  // parses commandline arguments
-
-  bool parseURL (char* url);
-
-  void exitOnError (void);
-
-  ACE_TCHAR *hostname_;
-  // Hostname to connect to
-
-  u_short port_;
-  // Port number to use
-
-  ACE_TCHAR *filename_;
-  // Filename to upload/download
-
-  int debug_;
-  // turns on verbosity
-
-  //destructor
-  ~URL_Parser (void);
-protected:
-  URL_Parser (void);
-  // protected constructor, singleton
-
-  static URL_Parser *instance_;
-  // the singleton
-};
-
-#endif /* URL_PARSER_H */
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
deleted file mode 100644
index 2b084521ffe..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-// $Id$
-
-///====================================================================
-// filename: ZIP_Wrapper.cpp
-// Author: Stoyan Paunov	spaunov@isis.vanderbilt.edu
-//
-// Purpose: to provide a wrapper around ZZIPlib for easy handling of
-//			ZIP archives. This wrapper can me used as an auxiliary 
-//			class that allows a program to become ZIP-aware
-
-
-
-#include "ace/Containers_T.h"		//for ACE_Double_Linked_List
-#include "ace/Message_Block.h"		//for ACE_Message_Block
-
-#include "ace/OS_NS_fcntl.h"	  //for open
-#include "ace/OS_NS_unistd.h"	  //for close
-#include "ace/OS_NS_string.h"	  //for strncpy
-#include "ace/SString.h"		  //for ACE_CString
-#include "ace/OS_NS_sys_stat.h"	  //for stat
-#include "ace/OS_NS_sys_stat.h"   //for filesize and mkdir
-
-#include <string>
-#include <memory>				  //for auto_ptr
-
-/////////////////////////////////////////////////////////////////////////////
-//NOTE: some #defines problems with zzip & ACE - put these 2 lines on top!!!!
-/////////////////////////////////////////////////////////////////////////////
-#include "zziplib.h"				//for ZZIP
-#include "ZIP_Wrapper.h"
-
-
-//ZIP_File_Info constructor
-ZIP_File_Info::ZIP_File_Info (char* name, size_t size) 
-	: name_ (name), 
-	  size_ (size),
-	  next_ (0),
-	  prev_ (0)
-{
-}
-
-//ZIP_File_Info default constructor
-ZIP_File_Info::ZIP_File_Info () 
-	: name_ (""), 
-	  size_ (0),
-	  next_ (0),
-	  prev_ (0)
-{
-}
-
-
-//get a list of the files in the archive
-size_t ZIP_Wrapper::file_list_info (char* zip_name, ACE_Double_Linked_List<ZIP_File_Info> &list)
-{
-	size_t num = 0;					//number of files in archive
-	ZZIP_DIR * dir;					//pointer to a zip archive
-    ZZIP_DIRENT * dir_entry;		//pointer to a file within the archive
-
-	//open the zip archive
-    dir = zzip_opendir(zip_name);
-    
-	if (!dir)
-	  return 0;
-
-	//read each dir entry and show one line of info per file
-    while ((dir_entry = zzip_readdir (dir)))
-	{
-		//retrieve the name of the file
-		char* name = dir_entry->d_name;
-
-		//remove the subpath part if any		NOTE: Lunux style assumed, need to check
-		//while(char* next = strstr(name, "/"))
-		//	name = next + 1;
-
-		list.insert_tail (new ZIP_File_Info (name, dir_entry->st_size));
-		num++;
-	}
-
-	zzip_closedir(dir);
-	return num;
-}
-
-//get file and store it into an ACE_Message_Block
-bool ZIP_Wrapper::get_file (char* accessor, ACE_Message_Block &file)
-{
-	bool return_code = true;
-
-	ZZIP_FILE* zip_file = zzip_open (accessor, O_RDONLY| O_BINARY);
-
-    if (! zip_file)
-		return false;
-	
-	int num_read;
-	file.size(BUFSIZ);
-	ACE_Message_Block* head = &file;
-
-	// read chunks of 16 bytes into buf and print them to stdout
-    while (0 < (num_read = zzip_read(zip_file, head->wr_ptr(), head->size())))
-    {
-		head->wr_ptr (num_read);
-		head->cont (new ACE_Message_Block (BUFSIZ));
-		head = head->cont ();
-	}
-
-	if (num_read < 0) 
-		return_code = false;
-
-	zzip_file_close (zip_file);
-	
-	return return_code;
-}
-
-
-bool ZIP_Wrapper::get_file (char* archive_path, char* filename, ACE_Message_Block &file)
-{
-	bool return_code = true;
-	ZZIP_DIR * dir;					//pointer to a zip archive
-
-	//open the zip archive
-    dir = zzip_opendir(archive_path);
-
-	if (!dir)
-	  return false;
-
-	//get the handle to the file
-	ZZIP_FILE* zip_file = zzip_file_open (dir, filename, O_RDONLY | O_BINARY);
-
-    if (!zip_file)
-		return false;
-	
-	int num_read = 0;
-	ACE_Message_Block* head = &file;
-
-	//read the file into the ACE_Message_Block
-    do
-    {
-		if (head->space () == 0)
-	  {
-		  head->cont (new ACE_Message_Block (BUFSIZ));
-		  head = head->cont ();
-	  }
-		
-		num_read = zzip_read(zip_file, head->wr_ptr(), head->space());
-		
-		if (num_read > 0)
-			head->wr_ptr (num_read);
-
-	}while (num_read > 0);
-
-	if (num_read < 0) 
-		return_code = false;
-
-	zzip_file_close (zip_file);
-	zzip_closedir(dir);
-	
-	return return_code;
-}
-
-
-//uncompress
-//the uncompress format will be
-//mkdir(name of zip archive).
-//the path is assumed to be an existing directory
-//directory structure of archive is recreated
-bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
-{
-	ZZIP_DIR * dir;					//pointer to a zip archive
-    ZZIP_DIRENT * dir_entry;		//pointer to a file within the archive
-    ZZIP_FILE* file;				//pointer to a zip file within an archive
-
-	//open the zip archive
-    dir = zzip_opendir(zip_archive);
-    
-	if (!dir)
-	  return false;
-
-	//??????
-	//check if a directory with the name if the archive exists
-	//If not, create it. Else, existing files will be truncated upon open.
-	//??????
-
-	//get the name of the archive
-	ACE_CString arch_dir (path);
-	arch_dir += "/";
-
-	//get only the name of the archive; remove path info
-	char* n = ACE_OS::strstr (zip_archive, "/");
-	char* zip_name = 0;
-	while (n != NULL)
-	{
-		zip_name = ++n;
-		n = ACE_OS::strstr (n, "/");
-	}
-
-	arch_dir += zip_name;
-	//NOTE: Assumes .zip or cpk extension
-	arch_dir = arch_dir.substring (0, arch_dir.length () - 4);
-
-	//create directory
-	ACE_OS::mkdir(arch_dir.c_str());				//if dir exists -1 is returned and ignored
-
-	//read each dir entry and show one line of info per file
-    while ((dir_entry = zzip_readdir (dir)))
-	{
-		//retrieve the name of the file
-		char* name = dir_entry->d_name;
-
-		//remove the subpath part if any		NOTE: Lunux style assumed, need to check
-
-		//let's try to create the directory structure for the package
-		char dir_name [2048];
-		char* next = ACE_OS::strstr (name, "/");
-		while (next != NULL)
-		{
-			ACE_CString location (arch_dir);
-			ACE_OS::strncpy (dir_name, name, next - name + 1);
-			dir_name[next - name + 1] = '\0';
-
-			location += "/";
-			location += dir_name;
-
-			ACE_stat stat;
-			if (ACE_OS::stat (location.c_str (), &stat) == -1)
-				ACE_OS::mkdir (location.c_str ());
-
-			next++;
-			next = ACE_OS::strstr (next, "/");
-		}
-
-		//open a zip handle
-		file = zzip_file_open(dir, dir_entry->d_name, O_RDONLY | O_BINARY);
-		if (!file)
-			return false;
-
-		//allocate buffer
-
-		//std::auto_ptr releases the memory upon reset.
-		//ACE_Auto_Ptr does not support this functionality
-		std::auto_ptr<char> buffer;
-		buffer.reset ( new char [dir_entry->st_size + 1]);
-		
-		//read in the data
-		zzip_read(file, &(*buffer), dir_entry->st_size);
-
-		//close the zip handle
-		zzip_file_close (file);
-
-		//create file name + path to open
-		std::string file_path (arch_dir.c_str ());		//NOTE: need the c-style char to stop at '\0'
-		file_path += "/";
-		file_path += name;
-
-		//print out the file to be uncompressed
-		if (verbose)
-		{
-			ACE_OS::write(ACE_STDOUT, file_path.c_str (), file_path.length () );
-			ACE_OS::write(ACE_STDOUT, "\n", 1);
-		}
-
-	   // Open a file handle to the local filesystem
-       ACE_HANDLE handle = ACE_OS::open (file_path.c_str (), O_CREAT | O_TRUNC | O_WRONLY);
-       if (handle == ACE_INVALID_HANDLE)
-	   {
-		   zzip_closedir(dir);
-		   ACE_ERROR_RETURN ((LM_ERROR,
-							  ACE_TEXT ("%p\n"),
-                              ACE_TEXT ("[uncompress] file creation error")),
-                              0);
-	   }
-
-	   //write the uncompressed data to the file
-	   if (ACE_OS::write (handle, &(*buffer), dir_entry->st_size) == -1)
-	   {
-		   zzip_closedir(dir);
-		   ACE_ERROR_RETURN ((LM_ERROR,
-                              ACE_TEXT ("%p\n"),
-                              ACE_TEXT ("[uncompress] file write error")),
-                              0);
-	   }
-
-	   // Close the file handle
-       ACE_OS::close (handle);
-	}
-
-	zzip_closedir(dir);
-	return true;
-}
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.h
deleted file mode 100644
index cb0e7e8752d..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-///====================================================================
-// filename: ZIP_Wrapper.h
-// Author: Stoyan Paunov	spaunov@isis.vanderbilt.edu
-//
-// Purpose: to provide a wrapper around ZZIPlib for easy handling of
-//			ZIP archives. This wrapper can me used as an auxiliary 
-//			class that allows a program to become ZIP-aware
-
-
-#ifndef _ZIP_WRAPPER_H_
-#define _ZIP_WRAPPER_H_
-
-#include "ace/Containers_T.h"		//for ACE_Double_Linked_List
-#include "ace/Message_Block.h"		//for ACE_Message_Block
-#include "ace/SString.h"			//for ACE_CString
-
-#include "ace/OS_NS_fcntl.h"	  //for open
-#include "ace/OS_NS_sys_stat.h"   //for filesize and mkdir
-
-#include <string>
-
-///===================================================================
-//Class definition for ZIP_File_Info
-//
-// Description: This class is used as a carrier of information
-//				about entities residing inside a ZIP archive
-
-class ZIP_File_Info
-{
-public:
-	ACE_CString name_;
-	size_t size_;
-	ZIP_File_Info* next_;
-	ZIP_File_Info* prev_;
-
-	ZIP_File_Info (char* name, size_t size);
-	ZIP_File_Info ();
-};
-
-
-///===================================================================
-//Class definition for ZIP_Wrapper
-//
-//@Description: This class is the actual workhorse that provides all of 
-//				the necessary functionality
-
-class ZIP_Wrapper
-{
-
-public:
-
-	//get a list of the files in the archive
-	static size_t file_list_info (char* zip_name, ACE_Double_Linked_List<ZIP_File_Info> &list);
-
-	//get file and store it into an ACE_Message_Block
-	//need to provide the correct accessor string. It formed by the ZIP_Options
-	//singleton on argument parsing and stored in ZIP_Options::instance()->read_file_
-	//ACE_Message_Block is null-terminated, but this is not reflected in the size!
-	static bool get_file (char* accessor, ACE_Message_Block &file);
-
-	//additional get_file function to avert subdirectory traversal problems with 
-	//zziplib accessors
-	static bool get_file (char* archive_path, char* filename, ACE_Message_Block &file);
-
-	//uncompress
-	//the uncompress format will be
-	//mkdir(name of zip archive)
-	//store all files in that directory.
-	//the path is assumed to be an existing directory
-	static bool uncompress (char* zip_archive, char* path = "", bool verbose = true);
-};
-
-#endif
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc b/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
deleted file mode 100644
index 76aae145588..00000000000
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-//RepositoryManager project: implementation of a repository manager
-//compleint with the D&C spec
-
-project (spec_RepositoryManager) : ciao_component_dnc, taoexe, ciao_config_handlers, zzip, zlib {
-
-  exename = RepositoryManagerDeamon
-  requires += zzip zlib
-
-  IDL_Files {
-    RepositoryManager.idl
-  }
-
-  Source_Files {
-    RepositoryManagerC.cpp
-    RepositoryManagerS.cpp
-    ZIP_Wrapper.cpp
-    RepositoryManager.cpp
-    RepositoryManager_Impl.cpp
-    RM_Helper.cpp
-    URL_Parser.cpp
-    HTTP_Handler.cpp
-    HTTP_Client.cpp
-    PC_Updater_T.cpp
-    PC_Updater.cpp
-  }
-}
-
-
-// RMadmin project: a sample client for the RM.
-
-project (spec_RMAdmin) : ciao_component_dnc, ciao_config_handlers {
-  exename = RMadmin
-  after    += spec_RepositoryManager
-
-  IDL_Files {
-   RepositoryManager.idl
-  }
-
-  Source_Files {
-    RMadmin.cpp
-    RepositoryManagerC.cpp
-    Options.cpp
-    RM_Helper.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
deleted file mode 100644
index 30b938ae411..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/CompImplDesc_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test 
-    <CIAO::Config_Handler::CompImplDesc_Handler, 
-    Deployment::ComponentImplementationDescription>
-    (argc, 
-     argv, 
-     &CIAO::Config_Handler::CompImplDesc_Handler::process_ComponentImplementationDescription);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
deleted file mode 100644
index a772c463452..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/CompIntrDesc_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::CompIntrDesc_Handler, Deployment::ComponentInterfaceDescription>
-    (argc, argv, &CIAO::Config_Handler::CompIntrDesc_Handler::process_ComponentInterfaceDescription);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
deleted file mode 100644
index 74d19064680..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/CompPkgDesc_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::CompPkgDesc_Handler, Deployment::ComponentPackageDescription>
-    (argc, argv, &CIAO::Config_Handler::CompPkgDesc_Handler::process_ComponentPackageDescription);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
deleted file mode 100644
index 31dbc7a9079..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/Domain_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::Domain_Handler, Deployment::Domain>
-    (argc, argv, &CIAO::Config_Handler::Domain_Handler::process_domain);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.ccd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.ccd
deleted file mode 100644
index f8a0c2be6bf..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.ccd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Component</label>
-  <UUID>058178f1-430a-460c-927a-d3c98b4ec860</UUID>
-  <specificType>IDL:BasicSP/BMClosedED:1.0</specificType>
-  <supportedType>IDL:BasicSP/BMClosedED:1.0</supportedType>
-  <port>
-    <name>in_avail</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>false</provider>
-    <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-    <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-    <kind>EventConsumer</kind>
-  </port>
-
-  <port>
-    <name>out_avail</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-    <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-    <kind>EventPublisher</kind>
-  </port>
-
-  <port>
-    <name>dataout</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-    <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-    <kind>Facet</kind>
-  </port>
-
-  <port>
-    <name>datain</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-    <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-    <kind>SimplexReceptacle</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cid b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cid
deleted file mode 100644
index 69d19585bee..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Implementation</label>
-  <UUID>66a409c2-fa3a-48ea-be50-482dec4ae7a2</UUID>
-  <implements href="Airframe.ccd"/>
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>BMClosedED_Stub</name>
-      <referencedArtifact href="Airframe_Stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMClosedED_Svnt</name>
-      <referencedArtifact href="Airframe_Svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMClosedED_Exec</name>
-      <referencedArtifact href="Airframe_Exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>BMClosedED.ior</string>
-      </value>
-    </value>
-  </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cpd
deleted file mode 100644
index 2b8f461581b..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cpd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Package </label>
-  <UUID>3c4c5adf-ae85-4b18-a404-a7c4887d6f7d</UUID>
-  <realizes href="Airframe.ccd"/>
-  <implementation>
-    <name>BMClosedED</name>
-    <referencedImplementation href="Airframe.cid"/>
-  </implementation>
-</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad
deleted file mode 100644
index 7b70be3fd5f..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Executor Artifact</label>
-  <UUID>0f76b3d3-3d50-4d65-88b1-e26b60b624dd</UUID>
-  <location>BMClosedED_exec</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMClosedED_Stub</name>
-    <referencedArtifact href="Airframe_Stub.iad"/>
-  </dependsOn>
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>createBMClosedEDHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad
deleted file mode 100644
index b3e7013091d..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Stub Artifact</label>
-  <UUID>93bbdf7d-d3f7-4227-bb75-b0562ac15b92</UUID>
-  <location>BMClosedED_stub</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad
deleted file mode 100644
index cb27b660286..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Airframe Servant Artifact</label>
-  <UUID>88f66272-bdb6-488b-9d95-cfa63317c616</UUID>
-  <location>BMClosedED_svnt</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMClosedED_Stub</name>
-    <referencedArtifact href="Airframe_Stub.iad"/>
-  </dependsOn>
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>createBMClosedEDHome_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Deployment.xsd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Deployment.xsd
deleted file mode 100644
index c8a6399730b..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/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/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Domain.cdd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Domain.cdd
deleted file mode 100644
index 6f5277d799e..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Domain.cdd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Deployment:Domain
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-<label>HUDisplay Domain</label>
-<UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID>
-<node>
-  <name>EC</name>
-  <label>Timer's Node</label>
-</node>
-<node>
-  <name>BMDisplay</name>
-  <label>NavDisplay's Node</label>
-</node>
-<node>
-  <name>BMDevice</name>
-  <label>GPS's Node</label>
-</node>
-<node>
-  <name>BMClosedED</name>
-  <label>Airframe's Node</label>
-</node>
-</Deployment:Domain>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.ccd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.ccd
deleted file mode 100644
index 3d7d99491c8..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.ccd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>GPS Component</label>
-  <UUID>058178f1-430a-460c-927a-d3c98b4ec860</UUID>
-  <specificType>IDL:BasicSP/BMDevice:1.0</specificType>
-  <supportedType>IDL:BasicSP/BMDevice:1.0</supportedType>
-  <port>
-    <name>timeout</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>false</provider>
-    <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
-    <specificType>IDL:BasicSP/TimeOut:1.0</specificType>
-    <kind>EventConsumer</kind>
-  </port>
-
-  <port>
-    <name>data_available</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-    <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-    <kind>EventPublisher</kind>
-  </port>
-
-  <port>
-    <name>data_read</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-    <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-    <kind>Facet</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cid b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cid
deleted file mode 100644
index ba56a63c8f5..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>GPS Implementation</label>
-  <UUID>154cf3cd-1770-4e92-b19b-8c2c921fea38</UUID>
-  <implements href="GPS.ccd"/>
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>BMDevice_Stub</name>
-      <referencedArtifact href="GPS_Stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMDevice_Svnt</name>
-      <referencedArtifact href="GPS_Svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMDevice_Exec</name>
-      <referencedArtifact href="GPS_Exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>BMDevice.ior</string>
-      </value>
-    </value>
-  </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cpd
deleted file mode 100644
index 3f1424967f4..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cpd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>GPS System</label>
-
-  <UUID>b55c949b-a9e8-41dd-bbb5-67d8f610dffe</UUID>
-
-  <realizes href="GPS.ccd"/>
-
-  <implementation>
-    <name>GPSImpl</name>
-    <referencedImplementation href="GPS.cid"/>
-  </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Exec.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Exec.iad
deleted file mode 100644
index c6724d39c8a..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Exec.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>GPS Executor Artifact</label>
-  <UUID>9617ed9a-d127-4797-836a-0a3b3d7d8b12</UUID>
-  <location>BMDevice_exec</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMDevice_Stub</name>
-    <referencedArtifact href="GPS_Stub.iad"/>
-  </dependsOn>
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>createBMDeviceHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Stub.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Stub.iad
deleted file mode 100644
index 6968ec7ad74..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Stub.iad
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>GPS Stub Artifact</label>
-  <UUID>c7264c15-d373-4d01-84ee-d37536599240</UUID>
-  <location>BMDevice_stub</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad
deleted file mode 100644
index a087459cc84..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>GPS Servant Artifact</label>
-  <UUID>657440e8-9143-494b-928c-2a3df84e509f</UUID>
-  <location>BMDevice_svnt</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMDevice_Stub</name>
-    <referencedArtifact href="GPS_Stub.iad"/>
-  </dependsOn>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMDeviceHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cdp b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cdp
deleted file mode 100644
index 613eec58754..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cdp
+++ /dev/null
@@ -1,24 +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">
-  <label>HUDisplay Deployment Plan</label>
-  <instance xmi:id="BMClosedED_Instance">
-    <name>BMClosedED_Instance</name>
-    <node>BMClosedED</node>
-  </instance>
-  <instance xmi:id="BMDevice_Instance">
-    <name>BMDevice_Instance</name>
-    <node>BMClosedED</node>
-  </instance>
-  <instance xmi:id="BMDisplay_Instance">
-    <name>BMDisplay_Instance</name>
-    <node>BMClosedED</node>
-  </instance>
-  <instance xmi:id="EC_Instance">
-    <name>EC_Instance</name>
-    <node>EC</node>
-  </instance>
-</Deployment:DeploymentPlan>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cid b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cid
deleted file mode 100644
index 3746e7cae24..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cid
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>HUDisplay Assembly</label>
-  <UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID>
-  <assemblyImpl>
-    <instance xmi:id="a_GPS">
-      <name>BMDevice_Instance</name>
-      <package href="GPS.cpd"/>
-    </instance>
-    <instance xmi:id="a_Airframe">
-      <name>BMClosedED_Instance</name>
-      <package href="Airframe.cpd"/>
-    </instance>
-    <instance xmi:id="a_NavDisplay">
-      <name>BMDisplay_Instance</name>
-      <package href="NavDisplay.cpd"/>
-    </instance>
-    <instance xmi:id="a_Timer">
-      <name>EC_Instance</name>
-      <package href="Timer.cpd"/>
-    </instance>
-    <connection>
-      <name>Timer_NavDisplay</name>
-      <internalEndpoint>
-        <portName>timeout</portName>
-        <instance xmi:idref="a_Timer"/>
-      </internalEndpoint>
-      <internalEndpoint>
-        <portName>timeout</portName>
-        <instance xmi:idref="a_GPS"/>
-      </internalEndpoint>
-    </connection>
-    <connection>
-      <name>GPS_Airframe</name>
-      <internalEndpoint>
-        <portName>data_available</portName>
-        <instance xmi:idref="a_GPS"/>
-      </internalEndpoint>
-      <internalEndpoint>
-        <portName>in_avail</portName>
-        <instance xmi:idref="a_Airframe"/>
-      </internalEndpoint>
-    </connection>
-    <connection>
-      <name>Airframe_GPS</name>
-      <internalEndpoint>
-        <portName>datain</portName>
-        <instance xmi:idref="a_Airframe"/>
-      </internalEndpoint>
-      <internalEndpoint>
-        <portName>data_read</portName>
-        <instance xmi:idref="a_GPS"/>
-      </internalEndpoint>
-    </connection>
-    <connection>
-      <name>Airframe_NavDisplay</name>
-      <internalEndpoint>
-        <portName>data_ready</portName>
-        <instance xmi:idref="a_NavDisplay"/>
-      </internalEndpoint>
-      <internalEndpoint>
-        <portName>out_avail</portName>
-        <instance xmi:idref="a_Airframe"/>
-      </internalEndpoint>
-    </connection>
-    <connection>
-      <name>NavDisplay_Airframe</name>
-      <internalEndpoint>
-        <portName>comp_data</portName>
-        <instance xmi:idref="a_NavDisplay"/>
-      </internalEndpoint>
-      <internalEndpoint>
-        <portName>dataout</portName>
-        <instance xmi:idref="a_Airframe"/>
-      </internalEndpoint>
-    </connection>
-  </assemblyImpl>
-</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cpd
deleted file mode 100644
index 9be7a1e0ef2..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cpd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>HUDisplay Package</label>
-  <UUID>823e4287-f53c-4caa-8619-f3dfda4c4998</UUID>
-  <implementation>
-    <name>HUDisplay</name>
-    <referencedImplementation href="HUDisplay.cid"/>
-  </implementation>
-</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.pcd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.pcd
deleted file mode 100644
index cbcec4e9113..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.pcd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:PackageConfiguration
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>HUDisplay Configuration for Unix machines</label>
-  <UUID>559d65e8-0407-48c0-a158-dafe21360fef</UUID>
-  <basePackage href="HUDisplay.cpd"/>
-</Deployment:PackageConfiguration>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Libraries.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Libraries.iad
deleted file mode 100644
index 720a7ce8219..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Libraries.iad
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Common Libraries</label>
-  <UUID>6bae4fcd-c71c-44b4-a0d4-0e4199ce1a49</UUID>
-  <location>$ACE_ROOT/lib/libACE</location>
-  <location>$ACE_ROOT/lib/libTAO</location>
-  <location>$ACE_ROOT/lib/libCIAO_Client</location>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.ccd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.ccd
deleted file mode 100644
index 175d4067000..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.ccd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>NavDisplay Component </label>
-  <UUID>589462ed-e88f-4f96-a7a7-359cdc333d63</UUID>
-  <specificType>IDL:BasicSP/BMDisplay:1.0</specificType>
-  <supportedType>IDL:BasicSP/BMDisplay:1.0</supportedType>
-  <idlFile>BMDisplay.idl</idlFile>
-  <port>
-    <name>data_ready</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>false</provider>
-    <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-    <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-    <kind>EventConsumer</kind>
-  </port>
-
-  <port>
-    <name>comp_data</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>false</provider>
-    <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-    <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-    <kind>SimplexReceptacle</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cid b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cid
deleted file mode 100644
index 30b66fea0b2..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>NavDisplay Implementation</label>
-  <UUID>0a52c9de-7852-42e4-aac7-bf478169a21a</UUID>
-  <implements href="NavDisplay.ccd"/>
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>BMDisplay_Stub</name>
-      <referencedArtifact href="NavDisplay_Stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMDisplay_Svnt</name>
-      <referencedArtifact href="NavDisplay_Svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>BMDisplay_Exec</name>
-      <referencedArtifact href="NavDisplay_Exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>BMDisplay.ior</string>
-      </value>
-    </value>
-  </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cpd
deleted file mode 100644
index 04862555769..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cpd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Navigation Display Package</label>
-  <UUID>a5923ef4-9c62-4458-9fa4-869b53d834ca</UUID>
-  <realizes href="NavDisplay.ccd"/>
-  <implementation>
-    <name>BMDisplay</name>
-    <referencedImplementation href="NavDisplay.cid"/>
-  </implementation>
-</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad
deleted file mode 100644
index fbd092506a8..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>NavDisplay Servant Artifact</label>
-  <UUID>412f8156-7913-4651-9110-f7a3f98c7a83</UUID>
-  <location>BMDisplay_exec</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMDisplay_Stub</name>
-    <referencedArtifact href="NavDisplay_Stub.iad"/>
-  </dependsOn>
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>createBMDisplayHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad
deleted file mode 100644
index e79eeea1f4e..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>NavDisplay Stub Artifact</label>
-  <UUID>4d02c22b-768e-4d1a-bf07-76da2f5d1fbf</UUID>
-  <location>BMDisplay_Stub</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad
deleted file mode 100644
index 05acef61d72..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>NavDisplay Servant Artifact</label>
-  <UUID>ad052b10-0806-43c7-9ccc-2dfeda0e0e03</UUID>
-  <location>BMDisplay_svnt</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>BMDisplay_Stub</name>
-    <referencedArtifact href="NavDisplay_Stub.iad"/>
-  </dependsOn>
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>createBMDisplayHome_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.ccd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.ccd
deleted file mode 100644
index ba44bcf1a00..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.ccd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Timer Component</label>
-  <UUID>803f8fc7-55de-4a20-81eb-ae951d85b7f4</UUID>
-  <specificType>IDL:BasicSP/EC:1.0</specificType>
-  <supportedType>IDL:BasicSP/EC:1.0</supportedType>
-  <property>
-    <name>hertz</name>
-    <type>
-      <kind>tk_long</kind>
-    </type>
-  </property>
-  <port>
-    <name>supports</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/trigger:1.0</supportedType>
-    <kind>Facet</kind>
-  </port>
-  <port>
-    <name>timeout</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
-    <specificType>IDL:BasicSP/TimeOut:1.0</specificType>
-    <kind>EventPublisher</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cid b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cid
deleted file mode 100644
index ac50742d0e3..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cid
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Timer Implementation</label>
-  <UUID>789e1be2-703f-4bd3-af50-b400eef91fd0</UUID>
-  <implements href="Timer.ccd"/>
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>EC_Stub</name>
-      <referencedArtifact href="Timer_Stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>EC_Svnt</name>
-      <referencedArtifact href="Timer_Svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>EC_Exec</name>
-      <referencedArtifact href="Timer_Exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-  <configProperty>
-    <name>hertz</name>
-    <value>
-      <type>
-        <kind>tk_long</kind>
-      </type>
-      <value>
-        <long>40</long>
-      </value>
-    </value>
-  </configProperty>
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>EC.ior</string>
-      </value>
-    </value>
-  </configProperty>
-</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cpd
deleted file mode 100644
index 167b1238934..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cpd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Timer Package</label>
-  <UUID>07ebf947-2174-4a3b-bd37-bcb92986eaf4</UUID>
-  <realizes href="Timer.ccd"/>
-  <implementation>
-    <name>EC</name>
-    <referencedImplementation href="Timer.cid"/>
-  </implementation>
-</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Exec.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Exec.iad
deleted file mode 100644
index 222fc22bc9e..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Exec.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Timer Executor Artifact</label>
-  <UUID>5e4f2366-3810-4d4c-a269-5788a525cbe1</UUID>
-  <location>EC_exec</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>EC_Stub</name>
-    <referencedArtifact href="Timer_Stub.iad"/>
-  </dependsOn>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createECHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Stub.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Stub.iad
deleted file mode 100644
index c9d15dcc82e..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Stub.iad
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Timer Stub Artifact</label>
-  <UUID>93bbdf7d-d3f7-4227-bb75-b0562ac15b92</UUID>
-  <location>EC_stub</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad
deleted file mode 100644
index f870112f143..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Timer Servant Artifact</label>
-  <UUID>04e4d246-e6eb-4b0e-8e32-60b996497cea</UUID>
-  <location>EC_svnt</location>
-  <dependsOn>
-    <name>ACE</name>
-    <referencedArtifact href="Libraries.iad"/>
-  </dependsOn>
-  <dependsOn>
-    <name>EC_Stub</name>
-    <referencedArtifact href="Timer_Stub.iad"/>
-  </dependsOn>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createECHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/XMI.xsd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/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/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/package.tpd b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/package.tpd
deleted file mode 100644
index 9096beb2c48..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/package.tpd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:TopLevelPackageDescription
-xmlns:Deployment="http://www.omg.org/Deployment"
-xmlns:xmi="http://www.omg.org/XMI"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <package href="HUDisplay.pcd"/>
-</Deployment:TopLevelPackageDescription>
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
deleted file mode 100644
index 0e0a95e3cca..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-#ifndef HANDLER_TEST_H
-#define HANDLER_TEST_H
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/Exception.h"
-#include "Old_Config_Handlers/XercesString.h"
-#include "Old_Config_Handlers/Config_Handler_export.h"
-#include "Old_Config_Handlers/DnC_Dump.h"
-#include "Old_Config_Handlers/Config_Error_Handler.h"
-
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMAttr;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeList;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-namespace Config_Handler_Test
-{
-}
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Handler_Test.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Handler_Test.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif // HANDLER_TEST_H
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Tests.mpc b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Tests.mpc
deleted file mode 100644
index f8bda5acc48..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Tests.mpc
+++ /dev/null
@@ -1,57 +0,0 @@
-//$Id$
-
-project (Domain_Handler_Test) : handler_test {
-  exename   = domain
-
-  Source_Files {
-    Domain_Handler_Test.cpp
-  }
-}
-
-project (CompImpl_Handler_Test) : handler_test {
-  exename   = compimpldesc
-
-  Source_Files {
-    CompImplDesc_Handler_Test.cpp
-  }
-}
-
-project (CompIntr_Handler_Test) : handler_test {
-  exename   = compintrdesc
-
-  Source_Files {
-    CompIntrDesc_Handler_Test.cpp
-  }
-}
-
-project (CompPkg_Handler_Test) : handler_test {
-  exename   = comppkgdesc
-
-  Source_Files {
-    CompPkgDesc_Handler_Test.cpp
-  }
-}
-
-project (IAD_Handler_Test) : handler_test {
-  exename   = iad
-
-  Source_Files {
-    IAD_Handler_Test.cpp
-  }
-}
-
-project (PC_Handler_Test) : handler_test {
-  exename   = pc
-
-  Source_Files {
-    PC_Handler_Test.cpp
-  }
-}
-
-project (Plan_Handler_Test) : handler_test {
-  exename   = plan
-
-  Source_Files {
-    Plan_Handler_Test.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
deleted file mode 100644
index f7a3017ddc2..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/IAD_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::IAD_Handler, Deployment::ImplementationArtifactDescription>
-    (argc, argv, &CIAO::Config_Handler::IAD_Handler::process_ImplementationArtifactDescription);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
deleted file mode 100644
index cc973145cb8..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/PC_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::PC_Handler, Deployment::PackageConfiguration>
-    (argc, argv, &CIAO::Config_Handler::PC_Handler::process_PackageConfiguration);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
deleted file mode 100644
index faeb52a1341..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Handler_Test.h"
-
-#include "Old_Config_Handlers/Plan_Handler.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return Config_Handler_Test::run_test <CIAO::Config_Handler::Plan_Handler, Deployment::DeploymentPlan>
-           (argc, argv, &CIAO::Config_Handler::Plan_Handler::process_plan);
-}
-
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
deleted file mode 100644
index f342352961e..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
+++ /dev/null
@@ -1,14 +0,0 @@
-//$Id$
-
-project : taoexe, ciao_server_dnc, ciao_deployment_stub, xerces  {
-  dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  requires += exceptions
-  includes += $(ACE_ROOT)/TAO/CIAO/DAnCE
-  libs     += Config_Handlers // Deployment_stub Deployment_svnt
-//   libs     += CIAO_DnC_Server CIAO_DnC_Container
-  after    += Config_Handlers
-
-  Template_Files {
-    Handler_Test.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
index 734635d9c09..81004d6b00d 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -143,21 +143,21 @@ project (NodeAppTest_client_ex) : ciao_deployment_stub {
  }
 }
 
-//project (NodeAppTest_client_dynamic) : ciao_deployment_stub {
-// after += NodeAppTest_RoundTrip_stub
-// libs += NodeAppTest_RoundTrip_stub
-// exename += client_dynamic
-//
-// IDL_Files {
-// }
-//
-// Source_Files {
-//   NodeApp_test_client_dynamic.cpp
-// }
-
-// Header_Files {
-// }
-
-// Inline_Files {
-// }
-//}
+project (NodeAppTest_client_dynamic) : ciao_deployment_stub {
+ after += NodeAppTest_RoundTrip_stub
+ libs += NodeAppTest_RoundTrip_stub
+ exename += client_dynamic
+
+ IDL_Files {
+ }
+
+ Source_Files {
+   NodeApp_test_client_dynamic.cpp
+ }
+
+ Header_Files {
+ }
+
+ Inline_Files {
+ }
+}
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
index f620ec569d0..3063a673d5a 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #ifndef NODEAPPTEST_ROUNDTRIP_CIDL
 #define NODEAPPTEST_ROUNDTRIP_CIDL
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index a7f196835db..c371f277a43 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -14,7 +14,7 @@
 
 const char *ior = "file://test.ior";
 int comp_number = 4;
-int count = 0;
+int counter = 0;
 
 int parse_args (int argc, char *argv[])
 {
@@ -95,8 +95,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           Deployment::ComponentImplementationInfo info;
 
           std::stringstream tmp;
-          tmp << "NodeAppTest_RoundTrip:" << count;
-          count = count + 1;
+          tmp << "NodeAppTest_RoundTrip:" << counter;
+          counter = counter + 1;
 
           // Add the names and entry points of each of the DLLs
           info.component_instance_name =
@@ -107,7 +107,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           info.servant_dll =
             CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
           info.servant_entrypt =
-            CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
+            CORBA::string_dup (
+                "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
+              );
 
           //Now add the info into the infos
           container_info_1.impl_infos[i] = info;
@@ -141,8 +143,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           Deployment::ComponentImplementationInfo info;
 
           std::stringstream tmp;
-          tmp << "NodeAppTest_RoundTrip:" << count;
-          count = count + 1;
+          tmp << "NodeAppTest_RoundTrip:" << counter;
+          counter = counter + 1;
 
           // Add the names and entry points of each of the DLLs
           info.component_instance_name =
@@ -153,7 +155,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           info.servant_dll =
             CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
           info.servant_entrypt =
-            CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
+            CORBA::string_dup (
+                "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
+              );
 
           //Now add the info into the infos
           container_info_2.impl_infos[i] = info;
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index d1834637fcc..90cafe7eee5 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -80,7 +80,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       info.servant_dll =
         CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
       info.servant_entrypt =
-        CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
+        CORBA::string_dup (
+                           "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
+                           );
 
       // Create a ContainerImplementationInfo sequence
       Deployment::ContainerImplementationInfo container_info;
@@ -108,11 +110,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip_var.in ()))
-       {
-         ACE_ERROR_RETURN ((LM_DEBUG,
-                            "Nil RoundTrip reference\n"),
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil RoundTrip reference\n"),
                             1);
-       }
+        }
 
       // initialize the component
       roundtrip_var->ciao_postactivate ();
@@ -120,45 +122,45 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       //get the provided facets info.
       Components::FacetDescriptions_var facets_info =
-      	roundtrip_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ;
+        roundtrip_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
 
       if ( facets_info->length () != 2 )
-      {
-	      ACE_DEBUG((LM_DEBUG, "Didn't get 2 facet back! but only %d\n",
-		               facets_info->length ()));
-	      return 1;
-      }
+        {
+          ACE_DEBUG((LM_DEBUG, "Didn't get 2 facet back! but only %d\n",
+                     facets_info->length ()));
+          return 1;
+        }
 
       // Invoke Operation on the Interface
       ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
 
       for (i = 0; i < 2; ++i )
         {
-	        NodeAppTest::LatencyTest_var latency_var
-	          = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ()));
-	        ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ())));
-
-	        ACE_TRY_CHECK;
-
-	        if ( CORBA::is_nil (latency_var.in ()) )
-	        {
-	          ACE_DEBUG((LM_DEBUG, "get nil latency ref for facet%d\n", i));
-	          return 1;
-	        }
-
-	        CORBA::Long input = 1L;
-	        CORBA::Long output =
-	          latency_var->cube_long (input ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                
-	        if (input == output)
-	          ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
-	        else
-	          {
-	            ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
-	            exit (1);
-	          }
+          NodeAppTest::LatencyTest_var latency_var
+            = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ()));
+          ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ())));
+
+          ACE_TRY_CHECK;
+
+          if ( CORBA::is_nil (latency_var.in ()) )
+            {
+              ACE_DEBUG((LM_DEBUG, "get nil latency ref for facet%d\n", i));
+              return 1;
+            }
+
+          CORBA::Long input = 1L;
+          CORBA::Long output =
+            latency_var->cube_long (input ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (input == output)
+            ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
+              exit (1);
+            }
         }
 
       ACE_DEBUG ((LM_DEBUG, "Try removing test component and its home\n"));
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index c3beeed8a2b..be98bf4ce1c 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -80,7 +80,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       info.servant_dll =
         CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
       info.servant_entrypt =
-      CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
+      CORBA::string_dup (
+          "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
+        );
 
       // Create a ContainerImplementationInfo sequence
       Deployment::ContainerImplementationInfo container_info;
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index c235a794806..042840f4679 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -38,54 +38,54 @@ namespace CIDL_RoundTrip_Impl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-      virtual CORBA::Long cube_long (CORBA::Long data
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     /*
-    virtual ::NodeAppTest::CCM_LatencyTest*
-                        get_latency (ACE_ENV_SINGLE_ARG_DECL)
-                ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual ::NodeAppTest::CCM_LatencyTest*
+      get_latency (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     */
 
-      NodeAppTest::CCM_LatencyTest_ptr
-      get_facet_1(ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    NodeAppTest::CCM_LatencyTest_ptr
+    get_facet_1(ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-      NodeAppTest::CCM_LatencyTest_ptr
-      get_facet_2(ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    NodeAppTest::CCM_LatencyTest_ptr
+    get_facet_2(ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-      virtual void set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
     /// Helper function to be called back by timeout_Handler
-      void pulse (void);
+    void pulse (void);
 
     // CIAO defined methods
-      virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
   protected:
 
@@ -109,9 +109,9 @@ namespace CIDL_RoundTrip_Impl
     {
     }
 
-    virtual CORBA::Long cube_long (CORBA::Long data 
-		    	                         ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data
+                                   ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
   /**
diff --git a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
index 361c6950fe8..d5521d0554f 100755
--- a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+++ b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
@@ -49,10 +49,10 @@ $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
-                             
+
 $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:50000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index 3c3fc72a79e..275c66d8c1b 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -1,12 +1,18 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
+. Enhance Execution Manager and Domain Application Manager to make calls
+  on the Target Manager to get resource information.
+
+. Enhance Node Manager to integrate resource monitoring capacity within
+  individual Nodes.
+
 . Add assembly-wide component activation/deactivation feature.
 
     - This should allow system deployers to specify the dependencies
       among component instances within the assembly.
 
-    - Add support in DAnCE so DAnCE could enforce the order in which 
+    - Add support in DAnCE so DAnCE could enforce the order in which
       components are to be activated within the assembly.
 
 . Add AMI support in DAnCE toolchain to when the DomainApplicationManager
@@ -19,13 +25,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . Enhance DAnCE to support OpenCCM components.
 
-. Static Configuration for DAnCE.
-
 . Target Manager implementation.
 
-. Support threading models in NodeApplication, such as thread pools
-  and the like.
-
 . Implement Resource Allocation and Control Engine (RACE), which is a
   component middleware framework built atop of CIAO/DAnCE that integrates
   multiple resource allocation/control algorithms for (re)deploying and
@@ -36,42 +37,254 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
   decisions, without handcrafting the mechanisms needed to (1) configure
   the algorithms and (2) deploy the decisions made by the algorithms.
 
+. Implement support for more complex type initialization with XML.
+
+. (Remedy) support for using CIAO with VxWorks as target
+
+. Decouple dependencies to NodeApplication from other DAnCE tools.
+  These dependencies were added to support static configurator.  We
+  need to have these tools in both conventional version and static
+  configuration version.
+
+. Support tool-specific debug levels and added CIAO_DEBUG macros to
+  simplify adding debug printouts based on various tool-specific debug
+  levels.
+
+. Add support for querying for interface types to the
+  RepositoryManager.
+ 
+. Implement a planner to query the TargetManager and RepositoryManager
+  and generate deployment plans on the fly.
 
 PLANNED MAJOR CHANGES FOR THE NEXT RELEASE
 ==========================================
 
-. Enhance DAnCE to support dynamically adding/removing components
-  to/from the existing running assembly without shutting down the
-  running appliation.  This will allow the application developers to
-  evolve their applications on the fly without incuring service down
-  time. 
-
-. Adding support to manage multiple interconnected assemblies, which will 
+. Adding support to manage multiple interconnected assemblies, which will
   involve the work through ExternalReferenceEndPoint idea.
 
-. Seamless integration of swapping into the main line programming model, 
+. Seamless integration of swapping into the main line programming model,
   so that DAnCE can actually kickstart swapping.
 
-. Integrate RepositoryManager into the DAnCE toolchain.
-
 . Integrate various Pub/Sub services into CIAO and DAnCE.
- 
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1
+====================================================
+
+. Fixed bug in detecting name clashes between names of ports of the same
+  category (facet, event sink, etc.) in the same component.
+  
+. Added support for attribute exceptions in code generated for executor
+  implementation classes.
+  
+. Implemented spec-defined component methods get_all_receptacles(),
+  get_all_publishers(), and disconnect_consumer().
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0
+====================================================
+
+. Changed MPC configuration of Config_Handlers to turn off hidden
+  visibility if applicable when compiling Config_Handlers or projects
+  that use Config_Handlers on linux.This change was to work around symbol
+  visibility inconsistencies in GNU standard C++ library when using g++
+  4.x's symbol visibility features. 
+
+. Enhanced ReDaC service to enforce the correct
+  assembly redeployment and reconfiguration order.
+
+. Some bug fixes in ReDaC about removing components. 
+
+. Fixed NodeApplication to unbind a component with naming service 
+  when removing it from the container. 
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.9 and CIAO-0.4.10
+======================================================
+
+. Enhanced DAnCE ReDaC service to enforce the correct
+  assembly redeployment and reconfiguration order.
+
+  The order that ReDaC currently enforces:
+
+  (1) Install new components,
+  (2) Set up new connections,
+  (3) Activate new components,
+  (4) Passivate old components,
+  (5) Remove old connections
+  (6) Remove old components.
+
+. Enhanced DAnCE to create hierarchical naming context
+  path through XML descriptors.
+
+. Enhanced DAnCE to maintain a component state map in
+  the component server to manage component life cycle.
+
+. Some bug fixes in DAnCE. 
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
+======================================================
+. RTTI enabled versions of the Xerces library are no longer needed on
+  Windows platforms.  
+
+. The CIDLC compiler now supports basic preprocessor directives:
+  #ifdef, #ifndef, #else, and #endif as well as the -D command-
+  line option.
+
+. The CIDLC compiler now supports incomplete struct and union
+  semantics which will appear in CORBA 3.1.
+  
+. DAnCE now supports dynamically adding/removing components
+  to/from the existing running assembly without shutting down the
+  running appliation.  This will allow the application developers to
+  evolve their applications on the fly without incuring service down
+  time. The service is called ReDaC (Redeployment and Reconfiguration)
+
+  Basically ReDAC provides a whole range of redeployment and
+  reconfiguration granularity level, including:
+
+  1) Install/remove component instances of the existing component types.
+  2) Install/remove component instances of a different type, i.e., a
+     totally new type of component.
+  3) Install/remove component instances from an existing container.
+  4) Install new component instances into a dynamically created brand
+     new container.
+     Move around existing components from one existing container to
+     another existing/new container.
+  5) Install new component instances into another component server in
+     the same physical node.
+  6) Install new component instances into another component server
+     into a remote host.
+  
+  To see how to use this feature, please see the ReDaC-Usage.html 
+  under the $CIAO_ROOT/examples/Hello/ directory.
+
+. Removed the Old Config Handlers, which have been deprecated for some
+  time.  Please see tools/Config_Handlers for the current version.
+
+. Added a step-by-step CoSMIC tutorial for modeling CIAO components
+  using PICML($CIAO_ROOT/docs/tutorials/CoSMIC). Using a simple Stock
+  Quoter system as example, this tutorial demonstrates all the steps
+  that needed to model Component-Based applications.
+
+. DAnCE now supports making connections among components across
+  different assemblies, and allow components to be "shared"
+  across assemblies seamlessly.
+
+  Internally, DAnCE provides a reference counting mechanism when
+  deploying/destroying components, and a reference count table
+  is maintained on each NodeManager.
+
+  From a deployer's point of view, if he/she chooses to deploy
+  a new assembly of component and simultaneously wants to reuse
+  previous deployed components in an existing running assembly,
+  then in the new deployment plan descriptor, he could refer
+  to an old component instance in the <InstanceDeploymentDescriptions>
+  XML tag. The "key" to identify the old component instance is
+  through the <Component_UUID, Node> pair, if such a key is found
+  present in a previous deployed assembly, then DAnCE won't
+  install this component instance (specified by the <Component_UUID>)
+  again, but instead it will increase the reference count of this
+  component instance.
+
+  DAnCE also supports making connections from existing running
+  components to newly deployed components in another assembly, and
+  vice versa.
+
+. The RepositoryManager has been enhanced to support standards based
+  interfaces. A number of techniques have been used to ensure high
+  performance and scalability. 
+
+. The RepositoryManager can now retrieve packages from remote locations via
+  HTTP. 
+
+. The Target Manager is released with this CIAO release. It is an
+  infrastructure component which keeps track of resource usage in the
+  target domain. The initial domain configuration remains with the
+  Target Manager. A monitor framework has been built into Node Manager which
+  monitors the resources used within each host. This monitor reports its
+  data intermittently to the Target Manager which aggregates the data
+  received across all such hosts acroos the Target domain. The monitor
+  is implemented using a strategy pattern, thus enabling the plug-in of
+  new monitors which can monitor different resources in the domain. The
+  Target manager is a component thus it needs to be started using a
+  deployment plan. It is right now a optional component in the DAnCE
+  tool chain. 
+
+. We added a skeleton implementation of the Resource Allocation and
+  Control Engine (RACE) which is a middleware framework built atop
+  CIAO/DAnCE that integrates multiple resource management algorithms for
+  (re)deploying and (re)configuring application components. We are in
+  the process of developing resource management algorithms (both
+  resource allocation and control algorithms) that will be a part of
+  future releases.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.7 and CIAO-0.4.8
 ======================================================
+. The deprecated RepositoryManager implementation, under
+  DAnCE/RepositoryManager, has been removed from this release. Please
+  use the Plan_Launcher and flattened deployment plans to deploy
+  component assemblies.
+
+. The CIDL compiler frontend now supports constants, const expressions,
+  bounded strings, bounded sequences, and arrays.
 
-. Integrated Real-time QoS support to CIAO based on OMG's new
-  Deployment and Configuration (D&C) specification. Such effort
-  allows application developers to use real-time CORBA 1.0 features
-  within their CCM appliation through meta-programming (via XML
-  metadata through DAnCE toolchain). Particularly, we added support 
-  for server-side RT policies, including extension for schema, 
-  container, and NodeApplication.
+. The CIDL compiler frontend now supports automatic indentation of
+  function arguments (both "new line" and "same line" styles are
+  supported).
+
+. Added backend CIDL compiler support for constants, arrays, bounded
+  strings, bounded sequences, and attribute exceptions, corresponding
+  to frontend support added by Boris Kolpackov <boris@kolpackov.net>.
+
+. Updated documentation to include instructions for building
+  the CIDL compiler using MakeProjectCreator (MPC).
+
+. Fixed a bug in the CIDL compiler's determination if an IDL
+  type is of fixed or variable size type, when it is declared
+  in the scope of an interface, valuetype or home.
+
+. Changes to generate servant code to support component
+  swapping.
+
+. Added capability to pass a base class event consumer to a
+  subscribe() operation generated for a derived event type.
+
+. Added support for .cdl file extension, which was belatedly
+  standardized by the OMG.
+
+. Added documentation on using Rational Purify with CIAO and
+  DAnCE.
+
+. Added tests and documentation for the IDL3-to-IDL2 converter tool.
+
+. RepositoryManager:
+  - enhanced the implementation to use various optimization techniques
+  - added HTTP support
+  - added PackageConfiguration visitor to update the locations of the
+    implementation artifacts with relevant HTTP URLs
+  - refactored some of the code and added a number of helpers functions
+
+. The XSC based config handlers have been heavily optimized, resulting
+  in greatly reduced parsing overhead for large deployments.
+
+. The DAnCE toolchain now supports initializing attributes which have
+  enumerated types. Support for other complex types is planned for the
+  future. Please see examples/Hello/descriptors/
+  flattened_deploymentplan_without_ns.cdp for an example of how to
+  populate enumerated attributes.
+
+. Integrated Real-time QoS support into the DAnCE-based runtime and
+  deployment tools based on the new OMG Deployment and Configuration
+  (D&C) specification.  Such effort allows application developers to
+  use real-time CORBA 1.0 features within their CCM appliation through
+  meta-programming (via XML metadata through DAnCE toolchain).  The old
+  run-time and deployment tools based on original Packaging and Deployment
+  section of the CCM specification have been completely removed.  This
+  work includes extensions to D&C schema, schema parsers, container and
+  NodeApplication.
 
 . Added functionality in XML parsing code to resolve schema in
   $CIAO_ROOT/docs/schema instead of the local directory only. All
   DeploymentPlans should use Deployment.xsd instead of
-  Modified_Deployment.xsd.
+  Modified_Deployment.xsd, which has been removed.
 
 . Fixed bug in CIDL code generation for some types of component and
   home attributes.
@@ -91,26 +304,25 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.7 and CIAO-0.4.8
 . Error reporting during component deployment has been greatly
   improved.  While debugging using CIAO_DEBUG_LEVEL is still
   available, detailed error messages are now generated and propagated
-  to the Plan_Launcher using exceptions. 
+  to the Plan_Launcher using exceptions.
 
 . generate_component_mpc.pl has been updated to generate MPC files
   useful by the modern CIAO infrastructure.  This script now also
-  automatically generates export files. 
+  automatically generates export files.
 
 . DAnCE has been enhanced to support deploying multiple assemblies
   with the same set of ExecutionManager and NodeMangers.
 
-
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.6 and CIAO-0.4.7
 ======================================================
-. Added a component packaging tool to DAnCE. This tool will allow 
-  component packagers to create from deployment plan archived 
-  packages that wrap up all relevant component properties, 
+. Added a component packaging tool to DAnCE. This tool will allow
+  component packagers to create from deployment plan archived
+  packages that wrap up all relevant component properties,
   descriptors and implementation artifacts.The component packages
-  generated from this tool will be distributed to Repository 
+  generated from this tool will be distributed to Repository
   Manager.
 
-. Enhanced DAnCE to allow more than one NodeApplicationManagers within 
+. Enhanced DAnCE to allow more than one NodeApplicationManagers within
   a NodeManager.
 
 . Enhanced DAnCE to support configurable output of debugging information.
@@ -123,7 +335,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.6 and CIAO-0.4.7
 
 . Added binding component to the Naming Service. A system deployer
   could configure this through XML-based flattened deployment plan
-  descriptor. 
+  descriptor.
   See $CIAO_ROOT/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
   for details. Currently DAnCE only provides resolving naming service
   reference through multicast, so be sure to initialize the naming service
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index 9255f42336e..dc2da7faff8 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.4.7
-    TAO VERSION : 1.4.7
-    ACE VERSION : 5.4.7
+    CIAO VERSION: 0.5.1
+    TAO VERSION : 1.5.1
+    ACE VERSION : 5.5.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -92,3 +92,4 @@ transcript if at all possible.  ]
 
     SAMPLE FIX/WORKAROUND:
 [If available ]
+
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
index 81f2211af90..24bc92644f5 100644
--- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
@@ -5,6 +5,9 @@
 #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
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
index 8e69a6d96a7..76bcf38962f 100644
--- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
@@ -3,6 +3,7 @@
 // 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 += -Sc \
@@ -76,6 +77,7 @@ project(SimpleBinPacker_svnt) : ciao_servant_dnc {
 
 
 project(SimpleBinPacker_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += SimpleBinPacker_svnt
   sharedname = SimpleBinPacker_exec
   libs      += SimpleBinPacker_stub \
diff --git a/TAO/CIAO/VERSION b/TAO/CIAO/VERSION
index 76b372e6ac1..df6114b70a4 100644
--- a/TAO/CIAO/VERSION
+++ b/TAO/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.4.7, released Fri Aug 05 08:00:08 2005.
+This is CIAO version 0.5.1, released Tue Apr 18 20:55:05 2006.
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the
@@ -9,3 +9,4 @@ see responses, please do one of the following:
        contents "subscribe ciao-users" to majordomo@cs.wustl.edu.
 
     2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+
diff --git a/TAO/CIAO/ciao/CCM_Base.idl b/TAO/CIAO/ciao/CCM_Base.idl
index 7e89723be4b..63c05a79578 100644
--- a/TAO/CIAO/ciao/CCM_Base.idl
+++ b/TAO/CIAO/ciao/CCM_Base.idl
@@ -14,7 +14,7 @@
 
 //#define CIAO_HAS_IMPORT_KEYWORD
 
-#if defined (CIAO_HAS_IMPORT_KEYWORD)
+#ifdef CIAO_HAS_IMPORT_KEYWORD
 // import ::CORBA;
 #else
 #include <orb.idl>
@@ -25,9 +25,6 @@
 
 module Components
 {
-  /**
-   * @@ Commented out temporarily for lack of typePrefix support.
-   */
   typeprefix Components "omg.org";
 
   typedef string FeatureName;
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index f338fba8256..339c4d2f387 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -1,4 +1,3 @@
-// -*- MPC -*-
 // $Id$
 
 project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
@@ -10,7 +9,7 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
 
   // This is necessary for MPC to pull in rules.ciao.GNU
   includes += $(CIAO_ROOT)/DAnCE
-    
+
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
@@ -34,10 +33,8 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi {
-  after += CIAO_DnC_Client
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc {
   sharedname  = CIAO_DnC_Container
-  libs       += CIAO_DnC_Client
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
@@ -52,7 +49,6 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
     CCM_Container_Ex.idl
     SwapExec.idl
     UpgradeableContext.idl
-    // ServerResources.idl
   }
 
   Source_Files {
@@ -72,14 +68,11 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
 
 // Valuetype library must be linked for this project.
 // Please don't remove.
-project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
+project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_stub
-  after        += CIAO_DnC_Client
-
-  libs += CIAO_DnC_Client
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)/DAnCE
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
@@ -94,8 +87,15 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
     Deployment_Base.idl
     Deployment_Data.idl
     Packaging_Data.idl
+    Target_Data.idl
     Deployment.idl
+    NodeManager.idl
+    NodeApplicationManager.idl
+    DomainApplicationManager.idl
+    ExecutionManager.idl
+    RepositoryManager.idl
     ServerResources.idl
+    Deployment_Events.idl
   }
 
   Source_Files {
@@ -103,26 +103,31 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
     Deployment_BaseC.cpp
     Deployment_DataC.cpp
     Packaging_DataC.cpp
+    Target_DataC.cpp
     DeploymentC.cpp
+    NodeManagerC.cpp
+    NodeApplicationManagerC.cpp
+    DomainApplicationManagerC.cpp
+    ExecutionManagerC.cpp
+    RepositoryManagerC.cpp
     NodeApplication_CallBackC.cpp
     ServerResourcesC.cpp
+    Deployment_EventsC.cpp
   }
 }
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client {
-  after        += Deployment_stub
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
-  libs         += CIAO_Deployment_stub CIAO_DnC_Client
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)/DAnCE
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   IDL_Files {
   }
@@ -132,20 +137,25 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
     Deployment_BaseS.cpp
     Deployment_DataS.cpp
     Packaging_DataS.cpp
+    Target_DataS.cpp
     DeploymentS.cpp
+    RepositoryManagerS.cpp
+    NodeManagerS.cpp
+    NodeApplicationManagerS.cpp
+    DomainApplicationManagerS.cpp
+    ExecutionManagerS.cpp
     NodeApp_CB_Impl.cpp
     NodeApplication_CallBackS.cpp
     ServerResourcesS.cpp
+    Deployment_EventsS.cpp
   }
 
 }
 
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security {
-  after        += CIAO_DnC_Container Deployment_svnt
-  includes     += $(CIAO_ROOT)/DAnCE
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt {
+  includes     += $(CIAO_ROOT)/ciao
   includes     += $(CIAO_ROOT)
   sharedname   =  CIAO_DnC_Server
-  libs         += CIAO_DnC_Client CIAO_DnC_Container CIAO_Deployment_svnt CIAO_Deployment_stub
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
@@ -155,9 +165,7 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c
 
   Source_Files {
     Container_Base.cpp
-    Container_Impl.cpp
     Swapping_Container.cpp
-    NodeApplication_Impl.cpp
     Context_Impl_Base.cpp
     Home_Servant_Impl_Base.cpp
     Servant_Impl_Base.cpp
@@ -182,6 +190,7 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c
     Swapping_Servant_Home_Impl_T.cpp
     Dynamic_Component_Servant_T.cpp
     Servant_Impl_T.cpp
+    Servant_Impl_Utils_T.cpp
     Servant_Activator_T.cpp
   }
 }
diff --git a/TAO/CIAO/ciao/CCM_Event.idl b/TAO/CIAO/ciao/CCM_Event.idl
index 575220a0283..59fa878f97f 100644
--- a/TAO/CIAO/ciao/CCM_Event.idl
+++ b/TAO/CIAO/ciao/CCM_Event.idl
@@ -27,7 +27,7 @@ module Components
   interface EventConsumerBase
   {
     void push_event (in EventBase evt) raises (BadEventType);
-    
+
     // CIAO-specific operation to help support the capability
     // to subscribe to eventtypes more derived than the type
     // consumed.
diff --git a/TAO/CIAO/ciao/CIAO_common.h b/TAO/CIAO/ciao/CIAO_common.h
index d55546b2aa3..cd6caa908ba 100644
--- a/TAO/CIAO/ciao/CIAO_common.h
+++ b/TAO/CIAO/ciao/CIAO_common.h
@@ -15,7 +15,7 @@
 #include "ace/config-all.h"
 
 #if !defined ACE_LACKS_PRAGMA_ONCE
-#pragma once
+# pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
 #include "CIAO_Client_Export.h"
@@ -30,7 +30,7 @@
         factory->_remove_ref ();      }
 
 // By default tracing is turned off.
-#if !defined (CIAO_NTRACE) 
+#if !defined (CIAO_NTRACE)
 #  if !defined (ACE_NTRACE)
 #    define CIAO_NTRACE 1
 #  else
@@ -43,7 +43,7 @@
 #    define CIAO_TRACE(X)
 #  else
 #    if (ACE_NTRACE == 0)
-#      #error CIAO_TRACE cannot be disabled if ACE_TRACE is enabled 
+#      error CIAO_TRACE cannot be disabled if ACE_TRACE is enabled
 #    else
 #      define CIAO_TRACE(X)
 #    endif
@@ -56,7 +56,6 @@
 #  include "ace/Trace.h"
 #endif /* CIAO_NTRACE */
 
-
 namespace CIAO
 {
   /**
diff --git a/TAO/CIAO/ciao/Client_init.h b/TAO/CIAO/ciao/Client_init.h
index 065c1f2a280..9c86e386778 100644
--- a/TAO/CIAO/ciao/Client_init.h
+++ b/TAO/CIAO/ciao/Client_init.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 /**
@@ -18,11 +20,15 @@
 #pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class ORB;
   typedef ORB *ORB_ptr;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
@@ -36,5 +42,6 @@ namespace CIAO
   CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o);
 }
 
+
 #include /**/ "ace/post.h"
 #endif /* CIAO_CLIENT_INIT_H */
diff --git a/TAO/CIAO/ciao/ComponentsC.h b/TAO/CIAO/ciao/ComponentsC.h
index a1c75c61736..9ed1608c2c0 100644
--- a/TAO/CIAO/ciao/ComponentsC.h
+++ b/TAO/CIAO/ciao/ComponentsC.h
@@ -40,6 +40,7 @@
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/Versioned_Namespace.h"
 
 #include "CCM_ContainerC.h"
 
@@ -68,9 +69,12 @@
 // be/be_visitor_traits.cpp:50
 
 // Traits specializations.
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 8d8d3e0c0ad..f4a9261b36a 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -6,7 +6,6 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
 #include "Servant_Activator.h"
-#include "ace/SString.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Container_Base.inl"
@@ -14,16 +13,11 @@
 
 namespace CIAO
 {
-
-////////////////////////////////////////////////////////////////
-
-  Container::Container (void)
-  {
-    ACE_ASSERT (0);
-  }
+  ////////////////////////////////////////////////////////////////
 
   Container::Container (CORBA::ORB_ptr o)
-    : orb_ (CORBA::ORB::_duplicate (o))
+    : orb_ (CORBA::ORB::_duplicate (o)),
+      container_impl_ (0)
   {
   }
 
@@ -57,18 +51,13 @@ namespace CIAO
 
   ///////////////////////////////////////////////////////////////
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
   Session_Container::serial_number_ (0);
 
-  Session_Container::Session_Container (void)
-  {
-    ACE_ASSERT (0);
-  }
-
   Session_Container::Session_Container (CORBA::ORB_ptr o,
                                         Container_Impl *container_impl,
                                         bool static_config_flag,
-                                    const Static_Config_EntryPoints_Maps* maps)
+                                        const Static_Config_EntryPoints_Maps* maps)
   : Container (o, container_impl),
     number_ (0),
     static_config_flag_ (static_config_flag),
@@ -88,6 +77,8 @@ namespace CIAO
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::init");
+
     char buffer[MAXPATHLEN];
 
     if (name == 0)
@@ -107,7 +98,7 @@ namespace CIAO
     if (CORBA::is_nil (poa_object.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
-                          " (%P|%t) Unable to initialize the POA.\n"),
+                           " (%P|%t) Unable to initialize the POA.\n"),
                           -1);
       }
 
@@ -125,6 +116,7 @@ namespace CIAO
     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 ()
                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
@@ -145,6 +137,8 @@ namespace CIAO
                                            PortableServer::POA_ptr root
                                            ACE_ENV_ARG_DECL)
   {
+    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
@@ -171,26 +165,36 @@ namespace CIAO
 
   void
   Session_Container::create_facet_consumer_POA (
-      const char *name,
-      PortableServer::POA_ptr root
-      ACE_ENV_ARG_DECL)
+                                                const char *name,
+                                                const CORBA::PolicyList *p,
+                                                PortableServer::POA_ptr root
+                                                ACE_ENV_ARG_DECL)
   {
+    CIAO_TRACE ("Session_Container::create_facet_consumer_POA");
+
     PortableServer::POAManager_var poa_manager =
       root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    TAO::Utils::PolicyList_Destroyer policies (3);
-    policies.length (3);
+    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
                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
+    // Servant Manager Policy
     policies[1] =
-      root->create_request_processing_policy 
-          (PortableServer::USE_SERVANT_MANAGER
-           ACE_ENV_ARG_PARAMETER);
+      root->create_request_processing_policy
+      (PortableServer::USE_SERVANT_MANAGER
+       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     // Servant Retention Policy
@@ -199,6 +203,11 @@ namespace CIAO
                                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
+    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 (),
@@ -211,9 +220,9 @@ namespace CIAO
                       CORBA::NO_MEMORY ());
 
     this->facet_cons_poa_->set_servant_manager (
-        this->sa_
-        ACE_ENV_ARG_PARAMETER
-      );
+                                                this->sa_
+                                                ACE_ENV_ARG_PARAMETER
+                                                );
     ACE_CHECK;
   }
 
@@ -223,6 +232,8 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::install_servant");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -253,6 +264,7 @@ namespace CIAO
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::install_component");
     PortableServer::ObjectId_var id =
       this->component_poa_->activate_object (p
                                              ACE_ENV_ARG_PARAMETER);
@@ -286,17 +298,19 @@ namespace CIAO
                      Deployment::ImplEntryPointNotFound,
                      Deployment::InstallationFailure))
   {
+    CIAO_TRACE ("Session_Container::ciao_install_home");
+
     HomeFactory hcreator = 0;
     ServantFactory screator = 0;
 
-    if (this->static_config_flag_ == 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;
-            
+            ACE_CString exception;
+
             if (exe_dll_name == 0)
               {
                 exception = "Null component executor DLL name";
@@ -306,17 +320,17 @@ namespace CIAO
               {
                 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 
+            ACE_THROW_RETURN
               (Deployment::UnknownImplId (
                  "Session_Container::ciao_install_home",
-	          exception.c_str ()),
+            exception.c_str ()),
                   Components::CCMHome::_nil ());
           }
 
@@ -326,17 +340,17 @@ namespace CIAO
           {
             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 ());
+
+            ACE_THROW_RETURN
+              (Deployment::UnknownImplId
+               ("Session_Container::ciao_install_home",
+                error.c_str ()), Components::CCMHome::_nil ());
           }
 
         if (servant_dll.open (sv_dll_name,
@@ -351,17 +365,17 @@ namespace CIAO
                         "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 ());
+
+            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,
@@ -380,13 +394,13 @@ namespace CIAO
                             "ERROR in opening the servant entry point "
                             "for servant DLL [%s] \n",
                             sv_dll_name));
-                error += sv_dll_name;  
+                error += sv_dll_name;
               }
-              
-            ACE_THROW_RETURN 
-              (Deployment::ImplEntryPointNotFound 
-                 ("Session_Container::ciao_install_home",
-                  error.c_str ()), Components::CCMHome::_nil ());
+
+            ACE_THROW_RETURN
+              (Deployment::ImplEntryPointNotFound
+               ("Session_Container::ciao_install_home",
+                error.c_str ()), Components::CCMHome::_nil ());
           }
 
         // @@ (OO) Please use a static_cast<> here instead of a C-style
@@ -394,7 +408,7 @@ namespace CIAO
         //         way of casting in ACE/TAO/CIAO.
         hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
         screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
-    }
+      }
     else
       {
         if (static_entrypts_maps_ == 0
@@ -407,21 +421,21 @@ namespace CIAO
 
         ACE_CString exe_entrypt_str (exe_entrypt);
         static_entrypts_maps_->home_creator_funcptr_map_->find (
-            exe_entrypt_str,
-            hcreator
-          );
+                                                                exe_entrypt_str,
+                                                                hcreator
+                                                                );
 
         ACE_CString sv_entrypt_str (sv_entrypt);
         static_entrypts_maps_->home_servant_creator_funcptr_map_->find (
-            sv_entrypt_str,
-            screator
-          );
+                                                                        sv_entrypt_str,
+                                                                        screator
+                                                                        );
       }
 
     if (hcreator == 0 || screator == 0)
       {
         ACE_CString error ("Entry point ");
-        
+
         if (hcreator == 0)
           {
             error += exe_entrypt;
@@ -434,22 +448,22 @@ namespace CIAO
             error += " invalid in dll ";
             error += sv_dll_name;
           }
-        
-        ACE_THROW_RETURN 
-           (Deployment::ImplEntryPointNotFound 
-              ("SessionContainer::ciao_install_home",
-               error.c_str ()), Components::CCMHome::_nil ());
+
+        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 ());
+        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 (),
@@ -460,11 +474,11 @@ namespace CIAO
 
     if (home_servant == 0)
       {
-        ACE_THROW_RETURN 
-          (Deployment::InstallationFailure 
-             ("SessionContainer::ciao_install_home",
-              "Servant entrypoing failed to create a home."),
-              Components::CCMHome::_nil ());
+        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);
@@ -488,6 +502,8 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::ciao_uninstall_home");
+
     this->uninstall (homeref,
                      Container::Component
                      ACE_ENV_ARG_PARAMETER);
@@ -500,6 +516,8 @@ namespace CIAO
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -527,6 +545,7 @@ namespace CIAO
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall");
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -540,7 +559,7 @@ namespace CIAO
 
     PortableServer::ObjectId_var oid
       = tmp->servant_to_id (svt
-                                 ACE_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     tmp->deactivate_object (oid.in ()
@@ -554,6 +573,8 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall_component");
+
     PortableServer::ObjectId_var id =
       this->component_poa_->reference_to_id (objref
                                              ACE_ENV_ARG_PARAMETER);
@@ -568,27 +589,29 @@ namespace CIAO
 
   void
   Session_Container::add_servant_map (
-      PortableServer::ObjectId &,
-      Dynamic_Component_Servant_Base*
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
+                                      PortableServer::ObjectId &,
+                                      Dynamic_Component_Servant_Base*
+                                      ACE_ENV_ARG_DECL_NOT_USED
+                                      )
   {
+    CIAO_TRACE ("Session_Container::add_servant_map");
   }
 
   void
-  Session_Container::deactivate_facet (const PortableServer::ObjectId &oid
+  Session_Container::deactivate_facet (const PortableServer::ObjectId &
                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_UNUSED_ARG (oid);
+    CIAO_TRACE ("Session_Container::deactivate_facet");
   }
 
   void
   Session_Container::delete_servant_map (
-      PortableServer::ObjectId &
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
+                                         PortableServer::ObjectId &
+                                         ACE_ENV_ARG_DECL_NOT_USED
+                                         )
   {
+    CIAO_TRACE ("Session_Container::delete_servant_map");
   }
 
   CORBA::Object_ptr
@@ -596,6 +619,7 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::get_home_objref");
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
   }
 
@@ -605,6 +629,8 @@ namespace CIAO
                                          Container::OA_Type t
                                          ACE_ENV_ARG_DECL)
   {
+    CIAO_TRACE ("Session_Container::generate_reference");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -620,14 +646,14 @@ namespace CIAO
       PortableServer::string_to_ObjectId (obj_id);
 
     CORBA::String_var str =
-      PortableServer::ObjectId_to_string (oid);
+      PortableServer::ObjectId_to_string (oid.in ());
 
     if (t == Container::Facet_Consumer)
-    {
-      if (CIAO::debug_level () > 1)
-        ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
-                    str.in ()));
-    }
+      {
+        //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 (),
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index f6ae970238a..cbde8a4d6c0 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -9,6 +9,7 @@
  *  Header file for CIAO's container implementations
  *
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ *  @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -29,7 +30,6 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -57,8 +57,6 @@ namespace CIAO
         Facet_Consumer
       };
 
-    explicit Container (void);
-
     Container (CORBA::ORB_ptr o);
     Container (CORBA::ORB_ptr o, Container_Impl *container_impl);
 
@@ -120,6 +118,7 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   protected:
+    /// Reference to the ORB
     CORBA::ORB_var orb_;
 
     /// POA within which all the components in this container will be
@@ -133,8 +132,12 @@ namespace CIAO
      * are distinct from the component.
      */
     PortableServer::POA_var facet_cons_poa_;
+
     PortableServer::POA_var home_servant_poa_;
     Container_Impl *container_impl_;
+  private:
+    /// Not allowed to be used
+    Container (void);
   };
 
   class Session_Container;
@@ -173,12 +176,6 @@ namespace CIAO
   class CIAO_SERVER_Export Session_Container : public Container
   {
   public:
-
-    explicit Session_Container (void);
-
-    // @@ (OO) Does the static_config_flag really need to be an int?
-    //         It appears to be a boolean value.  Please use bool
-    //         instead.
     Session_Container (CORBA::ORB_ptr o,
                        Container_Impl *container_impl,
                        bool static_config_flag = false,
@@ -217,41 +214,41 @@ namespace CIAO
                        Deployment::ImplEntryPointNotFound,
                        Deployment::InstallationFailure));
 
-    // Uninstall a servant for component or home.
+    /// Uninstall a servant for component or home.
     virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Uninstall a servant for component.
+    /// Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
                                       PortableServer::ObjectId_out oid
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Install a servant for component or home.
+    /// Install a servant for component or home.
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
                                        Container::OA_Type t
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Install a component servant.
+    /// Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
                                          PortableServer::ObjectId_out oid
                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Get an object reference to a component or home from the servant.
+    /// Get an object reference to a component or home from the servant.
     virtual CORBA::Object_ptr get_objref (PortableServer::Servant p
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Uninstall a servant for component or home.
+    /// Uninstall a servant for component or home.
     void uninstall (CORBA::Object_ptr objref,
                     Container::OA_Type t
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Uninstall a servant for component or home.
+    /// Uninstall a servant for component or home.
     void uninstall (PortableServer::Servant svt,
                     Container::OA_Type t
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -285,8 +282,8 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // Analog of the POA method that creates an object reference from
-    // an object id string.
+    /// 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
@@ -298,7 +295,7 @@ namespace CIAO
 
   private:
 
-    /// Create POA  for the component.
+    /// Create POA for the component.
     /**
      * This is the POA that is returned to the component applications
      * if they need one.
@@ -310,19 +307,21 @@ namespace CIAO
 
     /// Create POA for the facets and consumers alone.
     void create_facet_consumer_POA (const char *name,
+                                    const CORBA::PolicyList *p,
                                     PortableServer::POA_ptr root
                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
+    /// Not allowed to be
+    Session_Container (void);
+
   protected:
-    long number_;
+    unsigned long number_;
 
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_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_;
 
-    // @@ (OO) Does this really need to be an int?  It appears to be a
-    //         boolean value.  Please use bool instead.
-    //
-    //         It looks like it can also be declared const, as well.
-    bool static_config_flag_;
+    const bool static_config_flag_;
     const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
 
     /// The servant activator factory used to activate facets and
diff --git a/TAO/CIAO/ciao/Container_Impl.cpp b/TAO/CIAO/ciao/Container_Impl.cpp
deleted file mode 100644
index ac5fc047693..00000000000
--- a/TAO/CIAO/ciao/Container_Impl.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-// $Id$
-#include "Container_Impl.h"
-#include "CCM_ComponentC.h" // for calling StandardConfigurator interface
-
-#include "orbsvcs/CosNamingC.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Container_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-CIAO::Container_Impl::~Container_Impl ()
-{
-  // @@ remove all components and home?
-  delete this->container_;
-}
-
-PortableServer::POA_ptr
-CIAO::Container_Impl::_default_POA (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-  ///////////////////////////////////////////////////////////////
-
-CORBA::Long
-CIAO::Container_Impl::init (const ::Deployment::Properties &properties
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @@ Gan/Jai, see how this init can create many instances of the
-  // same container? Neither thread safe or single entity safe.
-  this->properties_ = properties;
-
-  // @@ Initialize container and create the internal container
-  // implementation that actually interacts with installed
-  // homes/components.
-
-  // @@ We will need a container factory here later on when we support
-  // more kinds of container implementations.
-
-  // @@Jai, what is the condition to create an upgradeable container?
-  // Where is it getting created and how? Need to address that.
-
-  ACE_NEW_THROW_EX (this->container_,
-                    CIAO::Session_Container (this->orb_.in (), this),
-                    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
-  return this->container_->init (0,
-                                 0
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-
-Deployment::ComponentInfos *
-CIAO::Container_Impl::install (
-    const ::Deployment::ContainerImplementationInfo & container_impl_info
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  ::Deployment::UnknownImplId,
-                  ::Deployment::ImplEntryPointNotFound,
-                  ::Deployment::InstallationFailure,
-                  ::Components::InvalidConfiguration))
-{
-  Deployment::ComponentInfos_var retv;
-  ACE_TRY
-   {
-     ACE_NEW_THROW_EX (retv,
-                       Deployment::ComponentInfos,
-                       CORBA::NO_MEMORY ());
-     ACE_TRY_CHECK;
-
-     // Get the ComponentImplementationInfos from the 
-     // ContainerImplementationInfo
-     // to avoid too long syntax representation
-     const ::Deployment::ComponentImplementationInfos impl_infos =
-       container_impl_info.impl_infos;
-
-     const CORBA::ULong len = impl_infos.length ();
-     retv->length (len);
-
-     for (CORBA::ULong i = 0; i < len; ++i)
-       {
-         // Install home
-         Components::CCMHome_var home =
-           this->install_home (impl_infos[i]
-                               ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
-
-         Components::KeylessCCMHome_var kh =
-           Components::KeylessCCMHome::_narrow (home.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
-
-         if (CORBA::is_nil (kh.in ()))
-           ACE_TRY_THROW (Deployment::InstallationFailure ());
-
-         // Create component from home
-         Components::CCMObject_var comp =
-           kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-         ACE_TRY_CHECK;
-
-         if (CORBA::is_nil (comp.in ()))
-           ACE_TRY_THROW (Deployment::InstallationFailure ());
-
-         if (this->component_map_.bind 
-                (impl_infos[i].component_instance_name.in (),
-                 Components::CCMObject::_duplicate (comp.in ())))
-           {
-             ACE_DEBUG ((LM_DEBUG,
-                         "CIAO (%P|%t) Container_Impl.cpp -"
-                         "CIAO::Container_Impl::install -"
-                         "error in binding component "
-                         "instance name [%s] into the component map \n",
-                         impl_infos[i].component_instance_name.in ()));
-             ACE_TRY_THROW (Deployment::InstallationFailure ());
-           }
-
-         // Set the return value.
-         (*retv)[i].component_instance_name
-           = impl_infos[i].component_instance_name.in ();
-
-         (*retv)[i].component_ref = 
-             Components::CCMObject::_duplicate (comp.in ());
-
-         // Deal with Component instance related Properties.
-         // Now I am only concerning about the COMPOENTIOR and attribute
-         // configuration initialization.
-
-         // I need to map Properties to Components::ConfigValues
-         ::Components::ConfigValues comp_attributes;
-         comp_attributes.length (0);
-
-         const CORBA::ULong clen = impl_infos[i].component_config.length ();
-         for (CORBA::ULong prop_len = 0; prop_len < clen; ++prop_len)
-           {
-             // Set up the ComponentIOR attribute
-             if (ACE_OS::strcmp 
-                  (impl_infos[i].component_config[prop_len].name.in (),
-                   "ComponentIOR") == 0)
-               {
-                 const char * path;
-                 impl_infos[i].component_config[prop_len].value >>= path;
-
-                 CORBA::String_var ior =
-                   this->orb_->object_to_string (comp.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-                 ACE_TRY_CHECK;
-
-                 if (CIAO::Utility::write_IOR (path, ior.in ()) != 0)
-                   {
-                     if (CIAO::debug_level () > 1)
-                       ACE_DEBUG ((LM_DEBUG, "Failed to write the IOR.\n"));
-
-                     ACE_TRY_THROW (CORBA::INTERNAL ());
-                   }
-               }
-
-             // Set up the naming service attribute
-             if (ACE_OS::strcmp 
-                  (impl_infos[i].component_config[prop_len].name.in (),
-                   "RegisterNaming") == 0)
-               {
-                 const char * naming_context;
-                 impl_infos[i].
-                    component_config[prop_len].value >>= naming_context;
-
-                 // Register the component with the naming service
-                 ACE_DEBUG ((LM_DEBUG, 
-                             "Register component with naming service.\n"));
-                 bool result = register_with_ns (naming_context,
-                                                 this->orb_.in (),
-                                                 comp.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-                 ACE_TRY_CHECK;
-
-                 if (!result)
-                   {
-                     ACE_DEBUG ((LM_DEBUG, 
-                                 "Failed to register with naming service.\n"));
-                   }
-
-               }
-
-             // Initialize attributes through StandardConfigurator interface
-             // @@Todo: Currently I have to manually map 
-             // the Deployment::Properties to 
-             // Components::ConfigValues, we should use a 
-             // common data structure in
-             // the future. - Gan
-             CORBA::ULong cur_len = comp_attributes.length ();
-             comp_attributes.length (cur_len + 1);
-
-             Components::ConfigValue *item = new OBV_Components::ConfigValue ();
-             item->name (impl_infos[i].component_config[prop_len].name.in ());
-             CORBA::Any tmp = impl_infos[i].component_config[prop_len].value;
-             item->value (tmp);
-
-             comp_attributes[cur_len] = item;
-           }
-           
-         if (comp_attributes.length () != 0)
-         {
-           //std_configurator.set_configuration
-           ::Components::StandardConfigurator_var std_configurator = 
-             comp->get_standard_configurator ();
-
-           std_configurator->set_configuration (comp_attributes);
-         }
-       }
-   }
-  ACE_CATCHANY
-   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Container_Impl::install\t\n");
-     ACE_RE_THROW;
-   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return retv._retn ();
-}
-
-::Deployment::Properties *
-CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ::Deployment::Properties *retval;
-
-  ACE_NEW_THROW_EX (retval,
-                    ::Deployment::Properties,
-                    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
-  *retval = this->properties_;
-
-  return retval;
-}
-
-::Deployment::NodeApplication_ptr
-CIAO::Container_Impl::get_node_application (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return ::Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
-}
-
-::Components::CCMHome_ptr
-CIAO::Container_Impl::install_home (
-    const ::Deployment::ComponentImplementationInfo & impl_info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::UnknownImplId,
-                   Deployment::ImplEntryPointNotFound,
-                   Deployment::InstallationFailure,
-                   Components::InvalidConfiguration))
-{
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) Container_Impl.cpp -"
-                  "CIAO::Container_Impl::install_home -"
-                  "installing home for component "
-                  "instance [%s] \n",
-                  impl_info.component_instance_name.in ()));
-    }
-
-  Components::CCMHome_var newhome =
-    this->container_->ciao_install_home (impl_info.executor_dll.in (),
-                                         impl_info.executor_entrypt.in (),
-                                         impl_info.servant_dll.in (),
-                                         impl_info.servant_entrypt.in (),
-                                         impl_info.component_instance_name.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Components::CCMHome::_nil ());
-
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) Container_Impl.cpp -"
-                  "CIAO::Container_Impl::install_home -"
-                  "success in installing home for component "
-                  "instance [%s] \n",
-                  impl_info.component_instance_name.in ()));
-    }
-
-  // We don't have to do _narrow since the generated code makes sure of
-  // the object type for us
-  // Bind the home in the map.
-  if (this->home_map_.bind (impl_info.component_instance_name.in (),
-                            Components::CCMHome::_duplicate (newhome.in ())))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) Container_Impl.cpp -"
-                  "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 ());
-    }
-
-  //Note: If the return value will be discarded, it must be kept in a var or
-  //      release () will have to be called explicitly.
-  return newhome._retn ();
-}
-
-
-void
-CIAO::Container_Impl::remove_home (const char * comp_ins_name
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
-{
-  Components::CCMHome_ptr home;
-  ACE_CString str (comp_ins_name);
-
-  if (this->home_map_.find (str, home) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  // @@TODO We should remove all components created by this home as well.
-  // This is not implemented yet.
-
-  this->container_->ciao_uninstall_home (home
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If the previous calls failed, what should we do here??
-  CORBA::release (home);
-
-  // @@ Still need to remove the home if the previous operation fails?
-  if (this->home_map_.unbind (str) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
-}
-
-::Components::CCMHomes *
-CIAO::Container_Impl::get_homes (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  Components::CCMHomes * tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    Components::CCMHomes (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  Components::CCMHomes_var retval (tmp);
-
-  const CORBA::ULong len = this->home_map_.current_size ();
-  retval->length (len);
-
-
-  CORBA::ULong i = 0;
-  const Home_Iterator end = this->home_map_.end ();
-  for (Home_Iterator iter (this->home_map_.begin ());
-       iter != end;
-       ++iter, ++i)
-  {
-    retval[i] = Components::CCMHome::_duplicate ( (*iter).int_id_);
-  }
-
-  return retval._retn ();
-}
-
-// Remove all homes and components
-void
-CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
-{
-  // Remove all components first.
-  this->remove_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Even if above operation failed we should still remove homes.
-  const Home_Iterator end = this->home_map_.end ();
-  for (Home_Iterator iter (this->home_map_.begin ());
-       iter != end;
-       ++iter)
-    {
-      this->container_->ciao_uninstall_home ( (*iter).int_id_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::release ( (*iter).int_id_);
-    }
-
-  this->home_map_.unbind_all ();
-
-  //if (CIAO::debug_level () > 1)
-  if (true)
-    ACE_DEBUG ((LM_DEBUG, 
-                "Removed all homes and components from this container!\n"));
-}
-
-////////////////////////////////////////////////////////////////////////
-//                      Internal helper functions.
-////////////////////////////////////////////////////////////////////////
-
-void
-CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
-{
-  // Remove all the components in the NodeApplication/Container
-  // Release all component servant object.
-  const Component_Iterator end = this->component_map_.end ();
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    // Find the component home first, then call the remove_component
-    // on the home.
-    Components::CCMHome_ptr home;
-    if (this->home_map_.find ( (*iter).ext_id_, home) != 0)
-      ACE_THROW (CORBA::BAD_PARAM ());
-
-    // This will call ccm_passivate on the component executor.
-    home->remove_component (((*iter).int_id_).in ());
-    ACE_CHECK;
-
-    CORBA::release (((*iter).int_id_).in ());
-  }
-
-  this->component_map_.unbind_all ();
-  // To this point the servant should have been destroyed. However,
-  // if someone is still making calls on the servant, terrible thing
-  // will happen.
-}
-
-
-// Below method is not used actually.
-void
-CIAO::Container_Impl::remove_component (const char * comp_ins_name
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Components::RemoveFailure))
-{
-  Components::CCMObject_var comp;
-  Components::CCMHome_ptr home;
-
-  ACE_CString str (comp_ins_name);
-
-  /* Before we do remove component we have to inform the homeservant so
-   * Component::ccm_passivate ()
-   * constainer::uninstall_component () ->deactivate_object () will be called.
-   *
-   * ccm_remove will be called when the poa destroys the servant.
-   */
-
-  if (this->component_map_.find (str, comp) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  if (this->home_map_.find (str, home) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  // This will call ccm_passivate on the component executor.
-  home->remove_component (comp.in ());
-  ACE_CHECK;
-
-  // If the previous calls failed, what should we do here??
-  CORBA::release (comp.in ());
-
-  // @@ Still need to remove the home if the previous operation fails?
-  if (this->component_map_.unbind (str) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
-}
-
-bool
-CIAO::Container_Impl::register_with_ns (const char * obj_name,
-                                        CORBA::ORB_ptr orb,
-                                        Components::CCMObject_ptr obj
-                                        ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-	  // Obtain the naming service
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" 
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get the Naming Service.\n"),
-                          false);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () 
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-  
-      // Create a Naming Sequence
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (obj_name);
-      name[0].kind = CORBA::string_dup ("");
-
-      // Register with the Name Server
-      naming_context->bind (name, obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      return true;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "CIAO (%P|%t) Container_Impl.cpp -"
-                           "CIAO::Container_Impl::register_with_ns -"
-                           "NodeApplication: failed to register "
-                           "with naming service.");
-      return false;
-    }
-  ACE_ENDTRY;
-  return true;
-}
-
-bool
-CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-	  // Obtain the naming service
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" 
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get the Naming Service.\n"),
-                          false);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () 
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-  
-      // Create a Naming Sequence
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (obj_name);
-      name[0].kind = CORBA::string_dup ("");
-
-      // Register with the Name Server
-      ACE_DEBUG ((LM_DEBUG, 
-                  "Unregister component with the name server : %s!\n", 
-                  obj_name));
-      naming_context->unbind (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      return true;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "CIAO (%P|%t) Container_Impl.cpp -"
-                           "CIAO::Container_Impl::unregister_with_ns -"
-                           "NodeApplication: failed to unregister "
-                           "with naming service.");
-      return false;
-    }
-  ACE_ENDTRY;
-  return true;
-}
-
diff --git a/TAO/CIAO/ciao/Container_Impl.h b/TAO/CIAO/ciao/Container_Impl.h
deleted file mode 100644
index 428b47c67f2..00000000000
--- a/TAO/CIAO/ciao/Container_Impl.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Container_Impl.h
- *
- *  $Id$
- *
- *  This file contains implementation for the servant of
- *  Components::Deployment::Container interface.
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef CIAO_CONTAINER_IMPL_H
-#define CIAO_CONTAINER_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Deployment_CoreS.h"
-#include "Container_Base.h"
-#include "Swapping_Container.h"
-#include "ace/SString.h"
-#include "Server_init.h"  // write_IOR function
-#include "CIAO_common.h" // CIAO::debug_level
-
-namespace CIAO
-{
-  /**
-   * @class Container_Impl
-   *
-   * @brief Servant implementation for the interface Deployment::Container
-   *
-   * This class implements the Deployment::Container
-   * interface which is not defined by the CCM DnC specification.
-   * As the interface implies, this is actually part of the deployment
-   * interface and is used to manage the lifecycle of the installed
-   * components and homes.
-   */
-  class CIAO_SERVER_Export Container_Impl
-    : public virtual POA_Deployment::Container
-  {
-  public:
-    /// Constructor
-    Container_Impl (CORBA::ORB_ptr o,
-                    PortableServer::POA_ptr p,
-                    ::Deployment::NodeApplication_ptr server);
-
-    /// Destructor
-    virtual ~Container_Impl (void);
-
-    /*-------------------------------------------------------------*/
-    /*--------------------  IDL operations (idl) ------------------*/
-
-    /// Initialize the container.
-    virtual CORBA::Long init (const ::Deployment::Properties &properties
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Install all homes and components
-    Deployment::ComponentInfos *
-      install (const ::Deployment::ContainerImplementationInfo & container_impl_info
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::UnknownImplId,
-                         Deployment::ImplEntryPointNotFound,
-                         Deployment::InstallationFailure,
-                         Components::InvalidConfiguration));
-
-    /// Remove all homes and components
-    virtual void
-      remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::RemoveFailure));
-
-    /// Deployment::Container interface defined attributes/operations.
-    virtual ::Deployment::Properties *
-      properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Deployment::NodeApplication_ptr
-      get_node_application (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /*-------------------------------------------------------------*/
-    /*-------------------  C++ help methods (c++) -----------------*/
-
-    /// Get the containing POA.  This operation does *not*
-    /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Deployment::UnknownImplId,
-                         Deployment::ImplEntryPointNotFound,
-                         Deployment::InstallationFailure,
-                         Components::InvalidConfiguration));
-
-    /**
-     * @@Note: I don't know how to remove a home right now.
-     *         I assume that user will only call remove instead.
-     *         This is true at least for DnC run time.
-     *
-     * Right now, in this implementation I assumpe that there will be
-     * same number of homes as the components even if the components
-     * are of the same type. I don't think that we have the modeling
-     * side support of this either. So bear me if you think I avoid
-     * the real thinking for easiness.
-     */
-    // Remove the home of this particular component
-    virtual void
-      remove_home (const char * comp_ins_name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::RemoveFailure));
-
-    // Get all homes
-    virtual ::Components::CCMHomes *
-      get_homes (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    bool
-    register_with_ns (const char * obj_name,
-                      CORBA::ORB_ptr orb,
-                      Components::CCMObject_ptr obj
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    bool
-    unregister_with_ns (const char * obj_name,
-                        CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-    // ------------------- 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_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
-
-    virtual void remove_component (const char * comp_ins_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
-
-    /// Set the cached object reference.
-    void set_objref (Deployment::Container_ptr o
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Get the cached object reference.  This operation will invoke
-    /// _this if there's no cached reference available.  Notice that
-    /// this method does *NOT* increase the reference count of the
-    /// cached reference.
-    /// @@ Gan, caller should own memory. In this case you shoudl
-    /// return a duplicate OR add a const to the operation
-    /// signature. This is simply bad programming.
-    Deployment::Container_ptr get_objref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-protected:
-    /// Keep a pointer to the managing ORB serving this servant.
-    CORBA::ORB_var orb_;
-
-    /// Keep a pointer to the managing POA.
-    PortableServer::POA_var poa_;
-
-    /// Internal container implementation.
-    // @@ Gan/Jai, heard of auto_ptr <>?
-    CIAO::Container *container_;
-
-    /// Cached ConfigValues.
-    Deployment::Properties properties_;
-
-    /// Cached Container reference (of ourselves.)
-    Deployment::Container_var objref_;
-
-    /// Cached NodeApplication.
-    Deployment::NodeApplication_var nodeapp_;
-
-    /// To store all created CCMHome object
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Components::CCMHome_ptr,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> CCMHome_Map;
-    typedef CCMHome_Map::iterator Home_Iterator;
-    CCMHome_Map home_map_;
-
-    /// To store all created Component object.
-    // @@Gan, see how this caching is duplicated..
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Components::CCMObject_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> CCMComponent_Map;
-    typedef CCMComponent_Map::iterator Component_Iterator;
-    CCMComponent_Map component_map_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "Container_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONTAINER_IMPL_H */
diff --git a/TAO/CIAO/ciao/Container_Impl.inl b/TAO/CIAO/ciao/Container_Impl.inl
deleted file mode 100644
index 40406e5582e..00000000000
--- a/TAO/CIAO/ciao/Container_Impl.inl
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-CIAO::Container_Impl::Container_Impl (CORBA::ORB_ptr o,
-                                      PortableServer::POA_ptr p,
-                                      ::Deployment::NodeApplication_ptr server)
-  : orb_ (CORBA::ORB::_duplicate (o)),
-    poa_ (PortableServer::POA::_duplicate (p)),
-    nodeapp_ (::Deployment::NodeApplication::_duplicate (server))
-{
-}
-
-ACE_INLINE void
-CIAO::Container_Impl::set_objref (Deployment::Container_ptr o
-                                  ACE_ENV_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->objref_.in ()))
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  this->objref_ = Deployment::Container::_duplicate (o);
-}
-
-ACE_INLINE ::Deployment::Container_ptr
-CIAO::Container_Impl::get_objref (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (CORBA::is_nil (this->objref_.in ()))
-    {
-      this->objref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  return this->objref_.in ();
-}
diff --git a/TAO/CIAO/ciao/Context_Impl_Base.cpp b/TAO/CIAO/ciao/Context_Impl_Base.cpp
index e68639a889e..6b31dedf392 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Context_Impl_Base.cpp
@@ -6,7 +6,6 @@ namespace CIAO
 {
   Context_Impl_Base::Context_Impl_Base (void)
   {
-    // Should not be called
     ACE_ASSERT (0);
   }
 
@@ -90,4 +89,16 @@ namespace CIAO
   {
     return this->container_;
   }
+
+  const char *
+  Context_Impl_Base::_ciao_instance_id (void) const
+  {
+    return this->ciao_instance_id_.in ();
+  }
+
+  void
+  Context_Impl_Base::_ciao_instance_id (const char *instance_id)
+  {
+    this->ciao_instance_id_ = instance_id;
+  }
 }
diff --git a/TAO/CIAO/ciao/Context_Impl_Base.h b/TAO/CIAO/ciao/Context_Impl_Base.h
index 737956742a6..62df2bba097 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.h
+++ b/TAO/CIAO/ciao/Context_Impl_Base.h
@@ -56,7 +56,9 @@ namespace CIAO
     : public virtual Components::CCMContext
   {
   public:
-    explicit Context_Impl_Base (void);
+    /// @todo This constructor should be declarated private but it seems
+    /// 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);
@@ -97,9 +99,16 @@ namespace CIAO
 
     CIAO::Session_Container *_ciao_the_Container (void) const;
 
+    const char *_ciao_instance_id (void) const;
+    void _ciao_instance_id (const char *instance_id);
+    // Accessors for the private member.
+
   protected:
     Components::CCMHome_var home_;
     Session_Container *container_;
+
+  private:
+    CORBA::String_var ciao_instance_id_;
   };
 }
 
diff --git a/TAO/CIAO/ciao/Context_Impl_T.cpp b/TAO/CIAO/ciao/Context_Impl_T.cpp
index 9dca7821824..0ef58a1b735 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Context_Impl_T.cpp
@@ -7,9 +7,9 @@
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  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,
@@ -20,9 +20,9 @@ namespace CIAO
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::~Context_Impl (void)
   {
@@ -30,9 +30,9 @@ namespace CIAO
 
   // Operations from ::Components::SessionContext.
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   CORBA::Object_ptr
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object (
@@ -45,22 +45,22 @@ namespace CIAO
     {
       CORBA::Object_var obj;
 
-      ACE_TRY 
+      ACE_TRY
         {
           obj =
             this->container_->get_objref (this->servant_
                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK; 
+          ACE_TRY_CHECK;
         }
-      ACE_CATCHANY 
-        { 
+      ACE_CATCHANY
+        {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught Exception \n"); 
+                               "Caught Exception \n");
           return CORBA::Object::_nil ();
         }
       ACE_ENDTRY;
-      
-      
+
+
       this->component_ = COMP::_narrow (obj.in ()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/CIAO/ciao/Context_Impl_T.h b/TAO/CIAO/ciao/Context_Impl_T.h
index 2cc2895e23f..cc09becfd35 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Context_Impl_T.h
@@ -26,6 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class SystemException;
@@ -35,14 +36,15 @@ namespace SecurityLevel2
 {
   class Credentials;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace Components
 {
   typedef SecurityLevel2::Credentials Principal;
   typedef Principal *Principal_ptr;
-  
+
   class IllegalState;
-  
+
   namespace Transaction
   {
     class UserTransaction;
@@ -62,9 +64,9 @@ namespace CIAO
    * This class implements operations and contains parameterized
    * members common to all generated servants.
    */
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   class Context_Impl : public virtual BASE_CTX,
                        public virtual Context_Impl_Base,
@@ -83,7 +85,7 @@ namespace CIAO
     get_CCM_object (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
-                       
+
   protected:
     SVNT *servant_;
     COMP_VAR component_;
diff --git a/TAO/CIAO/ciao/Deployment.idl b/TAO/CIAO/ciao/Deployment.idl
index f37d71aa520..b5515f5fe59 100644
--- a/TAO/CIAO/ciao/Deployment.idl
+++ b/TAO/CIAO/ciao/Deployment.idl
@@ -1,35 +1,20 @@
 // $Id$
+
+#ifndef DEPLOYMENT_IDL
+#define DEPLOYMENT_IDL
+
+#include "Deployment_Data.idl"
 #include "Packaging_Data.idl"
+#include "Target_Data.idl"
 #include "ServerResources.idl"
 
 module Deployment {
 
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-
   exception InvalidProperty {
     string name;
     string reason;
   };
 
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
   exception NoSuchName {
   };
 
@@ -39,137 +24,38 @@ module Deployment {
   exception InvalidReference {
   };
 
-  interface ApplicationManager {
-    Application startLaunch (in Properties configProperty, out Connections providedReference, in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-    void destroyApplication (in Application app)
-      raises (StopError);
+  // Below exception types are CIAO specific
+  exception PlanNotExist {
   };
 
-  typedef sequence < Application > Applications;
-
-  interface DomainApplicationManager
+  // CIAO specific struct type used for shared component management
+  // mapping the name of component to its plan_uuid
+  struct ComponentPlan
   {
-    DeploymentPlan getPlan ();
-    void startLaunch (in Properties configProperty, in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-    void finishLaunch (in boolean start)
-      raises (StartError, InvalidConnection);
-    void start ()
-      raises (StartError);
-    void destroyApplication ()
-      raises (StopError);
-    void destroyManager ()
-      raises (StopError);
-  };
-
-  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
-
-  interface ExecutionManager {
-    DomainApplicationManager preparePlan (in DeploymentPlan plan, in boolean commitResources)
-      raises (ResourceNotAvailable, PlanError, StartError);
-    DomainApplicationManagers getManagers ();
-    void destroyManager (in DomainApplicationManager manager)
-      raises (StopError);
-  };
-
-  interface TargetManager {
-    Domain getAllResources ();
-    Domain getAvailableResources ();
-    void commitResources (in DeploymentPlan plan)
-      raises (ResourceNotAvailable, PlanError);
-    void releaseResources (in DeploymentPlan argname);
-    void updateDomain (in ::CORBA::StringSeq elements, in Domain domainSubset, in DomainUpdateKind updateKind);
-  };
-
-  interface Logger {
+    string name;
+    string plan_uuid;
   };
+  /**
+   * @struct Sched_Params
+   * @brief Carries Scheduling Params
+   * @description  CIAO specific structure to carry the scheduling params
+   *  to set the process, required by RACE
+   */
 
-  interface NodeApplicationManager :
-      ApplicationManager
+  struct Sched_Params
   {
+    long policy_;
+    long priority_;
+    long scope_;
+    long msec_;
   };
 
-  interface NodeManager {
-    void joinDomain (in Domain ciao_domain, in TargetManager manager, in Logger log);
-    void leaveDomain ();
-    NodeApplicationManager preparePlan (in DeploymentPlan plan)
-      raises (StartError, PlanError);
-    void destroyManager (in NodeApplicationManager appManager)
-      raises (StopError, InvalidReference);
-  };
-
-  interface RepositoryManager {
-    void installPackage (in string installationName, in string location)
-      raises (NameExists, PackageError);
-    void createPackage (in string installationName, in PackageConfiguration package, in string baseLocation, in boolean replace)
-      raises (NameExists, PackageError);
-    PackageConfiguration findPackageByName (in string name)
-      raises (NoSuchName);
-    PackageConfiguration findPackageByUUID (in string UUID)
-      raises (NoSuchName);
-    ::CORBA::StringSeq findNamesByType (in string type);
-    ::CORBA::StringSeq getAllNames ();
-    ::CORBA::StringSeq getAllTypes ();
-    void deletePackage (in string installationName)
-      raises (NoSuchName);
-  };
-
-
-//***************************************new_RepositoryManager ONWARDS*****************************************
-
-
-	typedef sequence<octet> Artifact;
-	typedef sequence<octet> Package;
-
-	exception NoPlan {
-	};
+  typedef sequence < ComponentPlan > ComponentPlans;
 
-	enum Platform {
-		Win32,
-		Unix,
-		Linux,
-		Solaris,
-		Vxworks,
-		UNDEF
-	};
-
-	struct Implementation
-	{
-		Platform the_platform;
-		string name;
-		Artifact the_implementation;
-	};
-
-	typedef sequence<Implementation> Implementations;
-
-	interface new_RepositoryManager 
-	{
-		void installPackage (in string installationName, in Package the_package, in boolean replace)
-	      raises (NameExists, PackageError);
-
-		DeploymentPlan	retrievePlan (in string packageName)
-			raises (NoPlan);
-
-	    Package findPackageByName (in string name)
-	      raises (NoSuchName);
-	
-		Implementation findImplementationByName (in string implementation_name, in string package_name)
-	      raises (NoSuchName);
-
-	    Package findPackageByUUID (in string UUID)
-	      raises (NoSuchName);
-	
-	    Implementation findImplementationByUUID (in string UUID)
-	      raises (NoSuchName);
-	
-
-	    //::CORBA::StringSeq findNamesByType (in string type);
-	    //::CORBA::StringSeq getAllTypes ();
+  typedef sequence < Application > Applications;
 
-		::CORBA::StringSeq getAllPackageNames ();
-	    
-		void deletePackage (in string installationName)
-	      raises (NoSuchName);
-	};
+  interface Logger {
+  };
 };
+
+#endif /* DEPLOYMENT_IDL */
diff --git a/TAO/CIAO/ciao/Deployment_Base.idl b/TAO/CIAO/ciao/Deployment_Base.idl
index 7a9e9219ef9..caadccf2fee 100644
--- a/TAO/CIAO/ciao/Deployment_Base.idl
+++ b/TAO/CIAO/ciao/Deployment_Base.idl
@@ -1,6 +1,9 @@
 //$Id$
+
+#ifndef DEPLOYMENT_BASE_IDL
+#define DEPLOYMENT_BASE_IDL
+
 #include <orb.idl>
-#include "tao/ULongSeq.pidl"
 #include "Deployment_Core.idl"
 
 module Deployment {
@@ -17,6 +20,7 @@ module Deployment {
   struct SatisfierProperty {
     string name;
     SatisfierPropertyKind kind;
+    boolean dynamic;
     any value;
   };
 
@@ -79,3 +83,5 @@ module Deployment {
   };
 
 };
+
+#endif /* DEPLOYMENT_BASE_IDL */
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index 023c413b1fc..bfb58b6e2c8 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -4,6 +4,7 @@
 #define DEPLOYMENT_CORE_IDL
 
 #include "CCM_Component.idl"
+#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 
 // *************** Packaging and Deployment ***************
 module Deployment
@@ -11,21 +12,19 @@ module Deployment
   // Typeprefix Components "omg.org";
   // OMG threw these things away, didn't it.
 
-  exception UnknownImplId 
+  exception UnknownImplId
   {
     string name;
     string reason;
   };
 
   exception InvalidLocation {};
-  exception InstallationFailure 
+  exception InstallationFailure
   {
-    /*Do we still need a reason? --Tao
-     *Yes -- will */
     string name;
     string reason;
   };
-  exception ImplEntryPointNotFound 
+  exception ImplEntryPointNotFound
   {
     string name;
     string reason;
@@ -49,14 +48,14 @@ module Deployment
     string name;
     string reason;
   };
-  
+
   //==============property==================
   struct Property
   {
     string name;
     any value;
   };
-  
+
   typedef sequence < Property > Properties;
 
   //============connection==================
@@ -71,9 +70,19 @@ module Deployment
     MultiplexReceptacle,
     EventEmitter,
     EventPublisher,
-    EventConsumer
+    EventConsumer,
+    ecEventEmitter,
+    ecEventPublisher,
+    ecEventConsumer,
+    rtecEventEmitter,
+    rtecEventPublisher,
+    rtecEventConsumer,
+    nsEventEmitter,
+    nsEventPublisher,
+    nsEventConsumer
   };
 
+  // CIAO's specific <Connection> type defition.
   // To avoid the connection info in the plan being passed to the
   // local node and to make the implementation not very cumbersome
   // I changed the connection struct to include some extra informations.
@@ -83,11 +92,22 @@ module Deployment
     string portName;
     CCMComponentPortKind kind;
 
+    string endpointInstanceName; // CIAO specific extension
+    string endpointPortName;     // CIAO specific extension
+
     // the endpoints member is change to endpoint.
     // Since we will not have more than 1 objref in there.
     Object endpoint;
+
+    // A wrapper facade interface to provision different event
+    // communication mechanisms, including RTEC, etc.
+    CIAO::CIAO_Event_Service event_service;
+
+    // The properties of this connection, particularly useful
+    // to speicfy QoS properties of pub/sub service connections.
+    Properties config;
   };
-  
+
   typedef sequence < Connection > Connections;
 
   //=======================================
@@ -123,7 +143,9 @@ module Deployment
   //==================================
   interface Application
   {
-    void finishLaunch (in Connections providedReference, in boolean start)
+    void finishLaunch (in Connections providedReference,
+                       in boolean start,
+                       in boolean is_ReDAC)
       raises (StartError, InvalidConnection);
     void start ()
       raises (StartError);
@@ -151,6 +173,8 @@ module Deployment
   interface NodeApplication; // Forward decl.
   typedef sequence<NodeApplication> NodeApplications;
 
+  /// CIAO specific interface, which could deal with installing multiple
+  /// containers into a single NodeApplication.
   interface Container
   {
     readonly attribute ::Deployment::Properties properties;
@@ -158,10 +182,14 @@ module Deployment
     /// Get the NodeApplication which created us
     NodeApplication get_node_application ();
 
-    /// Initialize the container with properties.
-    long init (in ::Deployment::Properties properties);
+    /// Initialize the container with policies
+    // long init (in ::CORBA::PolicyList policies);
 
-    //@@ The properties will contain
+    // NW: The following should be component specific info because the
+    // container has already been created and initialized at this
+    // time.  So there's not much container configuration to be done
+    // at this stage.
+    //@@ The container_impl_info will contain
     //1 component instance name as the key.
     //2 dll/so name of the exec
     //3 entry point of the exec
@@ -169,7 +197,7 @@ module Deployment
     //5 entry point of the svnt
     //6 Poosible other configuration for container/home/component
 
-    /// Install all homes and components    
+    /// Install all homes and components
     Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
         raises (UnknownImplId,
                 ImplEntryPointNotFound,
@@ -179,14 +207,35 @@ module Deployment
     /// Remove all homes and components
     void remove ()
       raises (::Components::RemoveFailure);
+
+    /// Remove a component instance
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
   };
 
   typedef sequence<Container> Containers;
+  typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services;
+
+  /// CIAO specific extension
+  /// This struct captures the installation information of a particular
+  /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl>
+  struct ESInstallationInfo
+  {
+    string id;
+    CIAO::EventServiceType type;
+    string svcconf;
+    //Properties es_config;
+  };
+
+  /// CIAO specific extension
+  typedef sequence<ESInstallationInfo> ESInstallationInfos;
 
   interface NodeApplication : Application
   {
     readonly attribute ::Deployment::Properties properties;
 
+    /// CIAO specific operation to handle dynamic system redeployment
+    /// and reconfiguration
     /// @@ Initialize the nodeapplication, so it will know what
     ///    components it will create and home many of them are
     ///    there. However the real create action will take place when
@@ -202,33 +251,61 @@ module Deployment
               ::Components::InvalidConfiguration,
               ::Components::RemoveFailure);
 
-    ///@@ We know that Dployment::NodeApplicationManager will be returned,
+    /// CIAO specific extension
+    /// This operation will create one or more CIAO_Event_Service objects
+    /// within the NodeApplication, which will be used to mediate the
+    /// communication of CCM events
+    CIAO_Event_Services install_es (in ESInstallationInfos es_infos)
+      raises (InstallationFailure);
+
+    /// CIAO specific extensions
+    ///@@ We know that Deployment::NodeApplicationManager will be returned,
     ///   however to avoid the size of the shared object of CIAO_Server.
     ///   we return an Object.
     Object get_node_application_manager ();
 
+    /// CIAO specific extension
     Container create_container (in ::Deployment::Properties properties)
       raises (::Components::CreateFailure,
               ::Components::InvalidConfiguration);
 
+    /// CIAO specific extension
     void remove_container (in Container cref)
       raises (::Components::RemoveFailure);
 
+    /// CIAO specific extension
     Containers get_containers ();
 
+    /// CIAO specific extension
+    /// Remove a component instance from the NodeApplication
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
+    /// Activate a component instance from the NodeApplication
+    void activate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
+    /// Passivate a component instance from the NodeApplication
+    void passivate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
     /// Remove all containers, components and component homes.
     /// Shuts down the ORB of the NodeApplication to terminate the process.
     oneway void remove ();
 
-    /// CIAO specific extensions. This will enforce the component to
+    /// CIAO specific extension. This will enforce the component to
     /// be activated (preactivate, activate, postactivated) before the assembly
     /// is established
     void ciao_preactivate ()
       raises (StartError);
 
+    /// CIAO specific extension
     void ciao_postactivate ()
       raises (StartError);
 
+    /// CIAO specific extension
     void ciao_passivate ()
       raises (StopError);
   };
diff --git a/TAO/CIAO/ciao/Deployment_Data.idl b/TAO/CIAO/ciao/Deployment_Data.idl
index 5cb8a2d98d0..7b475947add 100644
--- a/TAO/CIAO/ciao/Deployment_Data.idl
+++ b/TAO/CIAO/ciao/Deployment_Data.idl
@@ -1,5 +1,7 @@
 // $Id$
 
+#ifndef DEPLOYMENT_DATA_IDL
+#define DEPLOYMENT_DATA_IDL
 #include "Deployment_Base.idl"
 
 module Deployment {
@@ -66,7 +68,7 @@ module Deployment {
     ResourceUsageKind resourceUsage;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
@@ -108,7 +110,7 @@ module Deployment {
     string targetName;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
@@ -150,7 +152,7 @@ module Deployment {
   struct ResourceDeploymentDescription {
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
@@ -174,7 +176,7 @@ module Deployment {
     MonolithicDeploymentDescriptions implementation;
     InstanceDeploymentDescriptions instance;
     PlanConnectionDescriptions connection;
-    PlanPropertyMappings externalProperty;
+            PlanPropertyMappings externalProperty;
     ImplementationDependencies dependsOn;
     ArtifactDeploymentDescriptions artifact;
     Properties infoProperty;
@@ -195,38 +197,6 @@ module Deployment {
 
   typedef sequence < ComponentPackageReference > ComponentPackageReferences;
 
-  struct SubcomponentPortEndpoint {
-    string portName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
-
-  struct AssemblyConnectionDescription {
-    string name;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    SubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-  };
-
-  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
-  struct SubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
-
-  struct AssemblyPropertyMapping {
-    string name;
-    string externalName;
-    SubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
-
   typedef sequence < ResourceUsageKind > ResourceUsageKinds;
 
   struct ImplementationRequirement {
@@ -254,3 +224,5 @@ module Deployment {
     SatisfierProperties property;
   };
 };
+
+#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/TAO/CIAO/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/ciao/Dynamic_Component_Activator.h
index 1e9a023f38c..d42fa216698 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/TAO/CIAO/ciao/Dynamic_Component_Activator.h
@@ -15,23 +15,24 @@
 #define CIAO_DYNAMIC_SWAPPING_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Array_Base.h"
 #include "ciao/CIAO_Server_Export.h"
-#include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
-
-#include "tao/PortableServer/Key_Adapters.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "Dynamic_Component_Servant_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ciao/CCM_ContainerC.h"
+#include "ciao/Deployment_CoreC.h"
+#include "ciao/Dynamic_Component_Servant_Base.h"
+
+#include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/LocalObject.h"
 #include "tao/PortableServer/ServantActivatorC.h"
 
+#include "ace/Hash_Map_Manager_T.h"
+#include "ace/Array_Base.h"
+
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
diff --git a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
index e7a0daceadd..16a9f40ea3a 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
+++ b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
@@ -10,6 +10,7 @@ ACE_RCSID (ciao,
 namespace CIAO
 {
   Dynamic_Component_Servant_Base::Dynamic_Component_Servant_Base (void)
+    : container_ (0)
   {
     ACE_ASSERT (0);
   }
diff --git a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h
index db1a89fd6f6..15aab6cace3 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h
@@ -31,9 +31,10 @@ namespace CIAO
   class CIAO_SERVER_Export Dynamic_Component_Servant_Base
   {
   public:
-    explicit Dynamic_Component_Servant_Base (void);
+    /// @todo Not to be used, no idea why this should be public, have to check this
+    Dynamic_Component_Servant_Base (void);
 
-    Dynamic_Component_Servant_Base (Session_Container *c);
+    explicit Dynamic_Component_Servant_Base (Session_Container *c);
 
     virtual ~Dynamic_Component_Servant_Base (void);
 
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
index 5520c193be7..81c62eb6110 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -4,11 +4,6 @@
 
 namespace CIAO
 {
-  Home_Servant_Impl_Base::Home_Servant_Impl_Base (void)
-  {
-    ACE_ASSERT (0);
-  }
-
   Home_Servant_Impl_Base::Home_Servant_Impl_Base (Session_Container * c)
     : container_ (c)
   {
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_Base.h b/TAO/CIAO/ciao/Home_Servant_Impl_Base.h
index 8fb03deb168..a8752b95218 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -43,8 +43,6 @@ namespace CIAO
     : public virtual POA_Components::CCMHome
   {
   public:
-    explicit Home_Servant_Impl_Base (void);
-
     Home_Servant_Impl_Base (Session_Container * c);
 
     virtual ~Home_Servant_Impl_Base (void);
@@ -64,6 +62,9 @@ namespace CIAO
 
   protected:
     Session_Container *container_;
+  private:
+    /// Not to be used
+    Home_Servant_Impl_Base (void);
   };
 }
 
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
index adebb4ffee1..404b1c94a7d 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -4,6 +4,7 @@
 #define CIAO_HOME_SERVANT_IMPL_T_C
 
 #include "Home_Servant_Impl_T.h"
+#include "CIAO_common.h"
 
 
 namespace CIAO
@@ -51,6 +52,8 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::~Home_Servant_Impl (void)
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::destructor");
+
     const OBJ_ITERATOR end =
       this->objref_map_.end ();
 
@@ -87,6 +90,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
+
     PortableServer::ObjectId_var oid =
       this->container_->the_POA ()->reference_to_id (comp
                                                      ACE_ENV_ARG_PARAMETER);
@@ -112,7 +117,8 @@ namespace CIAO
     _ciao_comp->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+    if (CIAO::debug_level () > 3)
+      ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
   }
 
   template <typename BASE_SKEL,
@@ -134,6 +140,8 @@ namespace CIAO
                     COMP_SVNT>::update_component_map (
       PortableServer::ObjectId &oid)
   {
+    CIAO_TRACE ("update_component_map");
+
     Components::CCMObject_var ccm_obj_ptr;
     if (objref_map_.unbind (oid, ccm_obj_ptr) != 0)
       {
@@ -167,6 +175,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::create_component");
+
     return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 
@@ -194,6 +204,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::create");
+
     if (this->executor_.in () == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),
@@ -237,6 +249,8 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
+
     CORBA::Object_var hobj =
       this->container_->get_objref (this
                                     ACE_ENV_ARG_PARAMETER);
@@ -302,6 +316,8 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
+
     PortableServer::ObjectId_var oid;
     this->container_->uninstall_component (comp,
                                            oid.out ()
diff --git a/TAO/CIAO/ciao/NodeApp_CB_Impl.h b/TAO/CIAO/ciao/NodeApp_CB_Impl.h
index e14899f38ff..824f3605d8f 100644
--- a/TAO/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/TAO/CIAO/ciao/NodeApp_CB_Impl.h
@@ -24,9 +24,6 @@
 
 namespace CIAO
 {
-  // Forward declaration.
-  // class NodeApplicationManager;
-
   /**
    * @class NodeApplication_Callback_Impl
    *
@@ -47,14 +44,6 @@ namespace CIAO
                                    const Deployment::Properties &properties)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // @@ (OO) Since this class is reference counted, please make this
-    //         destructor protected to enforce proper memory managment
-    //         through the reference counting mechanism (i.e. to
-    //         disallow calling operator delete() on an instance of
-    //         this class.
-    /// Destructor.
-    ~NodeApplication_Callback_Impl ();
-
     /// Get the containing POA.  This operation does *not* increase
     /// the reference count of the POA.
     virtual PortableServer::POA_ptr _default_POA (void);
@@ -68,9 +57,12 @@ namespace CIAO
                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  protected:
     Deployment::NodeApplication_ptr get_nodeapp_ref (void);
 
+  protected:
+    /// Destructor.
+    ~NodeApplication_Callback_Impl ();
+
     CORBA::ORB_var orb_;
 
     PortableServer::POA_var poa_;
diff --git a/TAO/CIAO/ciao/NodeApplication_CallBack.idl b/TAO/CIAO/ciao/NodeApplication_CallBack.idl
index 9c4f1d14775..d0f8daeb42e 100644
--- a/TAO/CIAO/ciao/NodeApplication_CallBack.idl
+++ b/TAO/CIAO/ciao/NodeApplication_CallBack.idl
@@ -4,12 +4,13 @@
  * This IDL file is used to combine the NodeApplication
  * interface with the NodeApplicationManager interface.
  *
- * NodeApplicationManager will be spwan NodeApplication.
+ * NodeApplicationManager will be spawn NodeApplication.
  * The call back object will be used to get the objectref of
  * NodeApplication.
  */
 
 #include "Deployment.idl"
+#include "NodeApplicationManager.idl"
 
 module CIAO
 {
diff --git a/TAO/CIAO/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/ciao/NodeApplication_Impl.cpp
deleted file mode 100644
index cfc18baaf91..00000000000
--- a/TAO/CIAO/ciao/NodeApplication_Impl.cpp
+++ /dev/null
@@ -1,516 +0,0 @@
-//$Id$
-
-#include "NodeApplication_Impl.h"
-#include "ace/SString.h"
-#include "Container_Impl.h"
-
-#if !defined (__ACE_INLINE__)
-# include "NodeApplication_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-CIAO::NodeApplication_Impl::~NodeApplication_Impl (void)
-{
-}
-
-CORBA::Long
-CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //@@TODO initialize this NodeApplication properties
-  return 0;
-}
-
-CORBA::Long
-CIAO::NodeApplication_Impl::create_all_containers (
-    const ::Deployment::ContainerImplementationInfos & container_infos
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create all the containers here based on the input node_impl_info.
-  const CORBA::ULong len = container_infos.length ();
-  
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      // The factory method <create_container> will intialize the container
-      // servant with properties, so we don't need to call <init> on the
-      // container object reference.
-      // Also, the factory method will add the container object reference
-      // to the set for us.
-      ::Deployment::Container_var cref =
-        this->create_container (container_infos[i].container_config);
-    }
-  
-  return 0;
-}
-
-void
-CIAO::NodeApplication_Impl::finishLaunch (
-    const Deployment::Connections & providedReference,
-    CORBA::Boolean start
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::InvalidConnection))
-{
-  ACE_UNUSED_ARG (start);
-
-  ACE_TRY
-    {
-      const CORBA::ULong length = providedReference.length ();
-
-      // For every connection struct we finish the connection.
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          ACE_CString name = providedReference[i].instanceName.in ();
-          Components::CCMObject_ptr comp;
-
-          if (this->component_map_.find (name, comp) != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                          "CIAO::NodeApplication_Impl::finishLaunch, "
-                          "invalid port name [%s] in instance [%s] \n",
-                          providedReference[i].portName.in (),
-                          name.c_str ()));
-              ACE_TRY_THROW (Deployment::InvalidConnection ());
-            }
-
-          Components::EventConsumerBase_var consumer;
-
-          // Since we know CCMObject inherits from 
-          // navigation/event/receptacle, no need
-          // to narrow here.
-
-          switch (providedReference[i].kind)
-            {
-            case Deployment::SimplexReceptacle:
-            case Deployment::MultiplexReceptacle:
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "connecting port name [%s] in instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-
-              comp->connect (providedReference[i].portName.in (),
-                             providedReference[i].endpoint.in ()
-                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "success connecting port name [%s] in "
-                              "instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-              break;
-
-	        // @@ (GD) A place holder where the Event Channel connections
-	        //         should be set up.
-
-            case Deployment::EventEmitter:
-
-              consumer = Components::EventConsumerBase::
-                _narrow (providedReference[i].endpoint.in ()
-                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if (CORBA::is_nil (consumer.in ()))
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "for port name [%s] in instance [%s] ,"
-                              "there is an invalid endPoint. \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                  ACE_TRY_THROW (Deployment::InvalidConnection ());
-                }
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "connecting port name [%s] in instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-
-              comp->connect_consumer (providedReference[i].portName.in (),
-                                      consumer.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "success connecting port name [%s] in "
-                              "instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-              break;
-
-            case Deployment::EventPublisher:
-
-              consumer = Components::EventConsumerBase::
-                _narrow (providedReference[i].endpoint.in ()
-                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if (CORBA::is_nil (consumer.in ()))
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "for port name [%s] in instance [%s] ,"
-                              "there is an invalid endPoint. \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                  ACE_TRY_THROW (Deployment::InvalidConnection ());
-                }
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "connecting port name [%s] in instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-
-              comp->subscribe (providedReference[i].portName.in (),
-                               consumer.in ()
-                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if (CIAO::debug_level () > 9)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                              "CIAO::NodeApplication_Impl::finishLaunch, "
-                              "success connecting port name [%s] in "
-                              "instance [%s] \n",
-                              providedReference[i].portName.in (),
-                              name.c_str ()));
-                }
-              break;
-
-            default:
-              ACE_TRY_THROW (Deployment::InvalidConnection ());
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplication_Impl::finishLaunch\t\n");
-      ACE_RE_THROW;
-    }
-
-  ACE_ENDTRY;
-}
-
-void
-CIAO::NodeApplication_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
-{
-  Component_Iterator end = this->component_map_.end ();
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    ((*iter).int_id_)->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::start (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
-{
-  Component_Iterator end = this->component_map_.end ();
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    ((*iter).int_id_)->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
-{
-  Component_Iterator end = this->component_map_.end ();
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    ((*iter).int_id_)->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
-{
-  Component_Iterator end = this->component_map_.end ();
-  for (Component_Iterator iter (this->component_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    ((*iter).int_id_)->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-}
-
-Deployment::ComponentInfos *
-CIAO::NodeApplication_Impl::install (
-    const ::Deployment::NodeImplementationInfo & node_impl_info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::UnknownImplId,
-                   Deployment::ImplEntryPointNotFound,
-                   Deployment::InstallationFailure,
-                   Components::InvalidConfiguration))
-{
-  Deployment::ComponentInfos_var retv;
-  ACE_TRY
-    {
-      const ::Deployment::ContainerImplementationInfos container_infos =
-        node_impl_info.impl_infos;
-
-      ACE_NEW_THROW_EX (retv,
-                        Deployment::ComponentInfos,
-                        CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
-
-      retv->length (0UL);
-
-      // Call create_all_containers to create all the necessary containers..
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) NodeApplication_Impl.cpp -"
-                      "CIAO::NodeApplication_Impl::install -"
-                      "creating all the containers. \n"));
-        }
-      (void) this->create_all_containers (container_infos);
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) NodeApplication_Impl.cpp -"
-                      "CIAO::NodeApplication_Impl::install -"
-                      "created all the containers. \n"));
-        }
-
-      // For each container, invoke <install> operation, this will return
-      // the ComponentInfo for components installed in each container.
-      // Merge all the returned ComponentInfo, which will be used
-      // as the return value of this method.
-      const CORBA::ULong num_containers = container_infos.length ();
-      for (CORBA::ULong i = 0; i < num_containers; ++i)
-        {
-          Deployment::ComponentInfos_var comp_infos =
-            this->container_set_.at(i)->install (container_infos[i]
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Append the return sequence to the *big* return sequence
-          CORBA::ULong curr_len = retv->length ();
-          retv->length (curr_len + comp_infos->length ());
-
-          for (CORBA::ULong j = curr_len; j < retv->length (); j++)
-            retv[j] = comp_infos[j-curr_len];
-        }
-
-      // @@ Maybe we can optimize this. We can come up with a decision later.
-      // Cache a copy of the component object references for all the components
-      // installed on this NodeApplication. I know we can delegates these to the
-      // undelying containers, but in that case, we should loop 
-      // all the containers
-      // to find the component object reference. - Gan
-      const CORBA::ULong comp_len = retv->length ();
-      for (CORBA::ULong len = 0;
-          len < comp_len;
-          ++len)
-      {
-        //Since we know the type ahead of time...narrow is omitted here.
-        if (this->component_map_.bind (retv[len].component_instance_name.in(),
-              Components::CCMObject::_duplicate (retv[len].
-                component_ref.in ())))
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "CIAO (%P|%t) NodeApplication_Impl.cpp -"
-                        "CIAO::NodeApplication_Impl::install -"
-                        "error binding component instance [%s] "
-                        "into the map. \n",
-                        retv[len].component_instance_name.in ()));
-            ACE_TRY_THROW (
-               Deployment::InstallationFailure ("NodeApplication_Imp::install",
-                                       "Duplicate component instance name"));
-          }
-      }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CIAO_NodeApplication::install error\t\n");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return retv._retn ();
-}
-
-void
-CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // For each container, invoke <remove> operation to remove home and components.
-  const CORBA::ULong set_size = this->container_set_.size ();
-  for (CORBA::ULong i = 0; i < set_size; ++i)
-    {
-      this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // Remove all containers
-  // Maybe we should also deactivate container object reference.
-  this->container_set_.remove_all ();
-
-  if (CIAO::debug_level () > 1)
-    ACE_DEBUG ((LM_DEBUG, "Removed all containers from this NodeApplication!\n"));
-
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-
-// Create a container interface, which will be hosted in this NodeApplication.
-::Deployment::Container_ptr
-CIAO::NodeApplication_Impl::create_container (const ::Deployment::Properties &properties
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  ::Components::CreateFailure,
-                  ::Components::InvalidConfiguration))
-{
-  if (CIAO::debug_level () > 1)
-    ACE_DEBUG ((LM_DEBUG, "ENTERING: NodeApplication_Impl::create_container()\n"));
-
-  CIAO::Container_Impl *container_servant = 0;
-
-  ACE_NEW_THROW_EX (container_servant,
-                    CIAO::Container_Impl (this->orb_.in (),
-                                          this->poa_.in (),
-                                          this->get_objref ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ServantBase_var safe_servant (container_servant);
-
-  // @TODO: Need to decide a "component_installation" equivalent data
-  // structure  to pass to the container, which will be used to
-  // suggest how to install the components.  Each such data stucture
-  // should be correspond to one <process_collocation> tag  in the XML
-  // file to describe the deployment plan.
-  container_servant->init (properties
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ObjectId_var oid
-    = this->poa_->activate_object (container_servant
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Object_var obj
-    = this->poa_->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  ::Deployment::Container_var ci
-    = ::Deployment::Container::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Cached the objref in its servant.
-  container_servant->set_objref (ci.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-    this->container_set_.add (ci.in ());
-  }
-
-  if (CIAO::debug_level () > 1)
-    ACE_DEBUG ((LM_DEBUG,
-                "LEAVING: NodeApplication_Impl::create_container()\n"));
-  return ci._retn ();
-}
-
-// Remove a container interface.
-void
-CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
-                                              ACE_ENV_ARG_DECL)
-  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_);
-
-  if (this->container_set_.object_in_set (cref) == 0)
-    {
-      ACE_THROW (Components::RemoveFailure());
-    }
-
-  cref->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // @@ Deactivate object.
-  PortableServer::ObjectId_var oid
-    = this->poa_->reference_to_id (cref
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Should we remove the server still, even if the previous call failed.
-
-  if (this->container_set_.remove (cref) == -1)
-    {
-      ACE_THROW (::Components::RemoveFailure ());
-    }
-    
-  ACE_DEBUG ((LM_DEBUG, "LEAVING: NodeApplication_Impl::remove_container()\n"));
-}
-
-// Get containers
-::Deployment::Containers *
-CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return 0;
-}
diff --git a/TAO/CIAO/ciao/NodeApplication_Impl.h b/TAO/CIAO/ciao/NodeApplication_Impl.h
deleted file mode 100644
index b16e8931ccb..00000000000
--- a/TAO/CIAO/ciao/NodeApplication_Impl.h
+++ /dev/null
@@ -1,238 +0,0 @@
-//$Id$
-/**========================================================
- *
- * @file   NodeApplication_Impl.h
- *
- * @Brief  This file contains the implementation of
- *         the NodeApplication interface.
- *
- * @author Tao Lu <lu@dre.vanderbilt.edu>
- * @author Gan Deng <dengg@dre.vanderbilt.edu>
- *========================================================*/
-
-#ifndef NODEAPPLICATION_IMPL_H
-#define NODEAPPLICATION_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Container_Base.h"
-#include "Deployment_CoreS.h"
-#include "Server_init.h"
-#include "CIAO_common.h"
-#include "Object_Set_T.h"
-#include "tao/ORB.h"
-#include "ace/Synch.h"
-#include "ace/Synch_Traits.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-using CIAO::Utility::write_IOR;
-
-/**
- *
- * @class NodeApplication_Impl
- *
- * @brief This class implements the NodeApplication interface.
- * This interface is semantically very simillar to container
- * in the old DnC spec. However this class will also be used
- * as a Server for hosting home/component. This way we reduce the
- * complexity of the framework by omitting the componentserver layer.
- *
- * @@TODO add configuration capabilities. Threading is one of them.
- *
- * @@Assumptions:
- * 1. Now the implementation is not thread safe.
- * // @@Gan, the above assumption is _really_ bad. Could you please
- * use the lock in the imeplementation to do some simple
- * prootections.
- **/
-
-namespace CIAO
-{
-  // @@ Gan, as we discussed before can you please wrap this
-  // implementation in a namespace Node_Application or whatever to
-  // signify that it belongs to another software piece of CIAO?
-  class CIAO_SERVER_Export NodeApplication_Impl
-    : public virtual POA_Deployment::NodeApplication
-  {
-  public:
-    /// Default constructor.
-    NodeApplication_Impl (CORBA::ORB_ptr o,
-                          PortableServer::POA_ptr p);
-
-    /// Default destructor.
-    virtual ~NodeApplication_Impl (void);
-
-    /**
-     * @method finishLaunch
-     *
-     * @brief This operation dose 2 things.
-     *        1. Get the external connction (facet and Event source)
-     *           and connect them to the local receptacle/event sink.
-     *        2. If the start augment is true, start the Components.
-     * @Note:
-     * The connection containes the object ref of the provided object
-     * reference (facet/event consumer) of components from other NodeApplications.
-     * However the name field stores the name of the port on the local component.
-     */
-    virtual void
-    finishLaunch (const Deployment::Connections & providedReference,
-                  CORBA::Boolean start
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError,
-                       Deployment::InvalidConnection));
-
-    /**
-     * @method start
-     */
-    virtual void
-    start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
-
-    /*-------------  CIAO specific IDL operations (idl)----------
-     *
-     *-----------------------------------------------------------*/
-
-    /**
-     * @method ciao_preactivate
-     */
-    virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
-
-    /**
-     * @method ciao_postactivate
-     */
-    virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError));
-
-    /**
-     * @method ciao_passivate
-     */
-    virtual void
-    ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError));
-
-    /// Initialize the NodeApplication
-    virtual CORBA::Long init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Start install homes and components.
-    virtual ::Deployment::ComponentInfos *
-      install (const ::Deployment::NodeImplementationInfo & node_impl_info
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Deployment::UnknownImplId,
-                       ::Deployment::ImplEntryPointNotFound,
-                       ::Deployment::InstallationFailure,
-                       ::Components::InvalidConfiguration));
-
-    /// Get the object reference of the NodeApplicationManager.
-    /// This might come in handy later.
-    virtual ::CORBA::Object_ptr
-    get_node_application_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Access the readonly attribute.
-    virtual ::Deployment::Properties *
-    properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Remove everything inside including all components and homes.
-    virtual void remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Create a container interface, which will be hosted in this NodeApplication.
-    virtual ::Deployment::Container_ptr
-      create_container (const ::Deployment::Properties &properties
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::CreateFailure,
-                       ::Components::InvalidConfiguration));
-
-    /// Remove a container interface.
-    virtual void remove_container (::Deployment::Container_ptr cref
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::RemoveFailure));
-
-    /// Get all container object refs
-    virtual ::Deployment::Containers * get_containers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /*-------------  CIAO specific helper functions (C++)---------
-     *
-     *-----------------------------------------------------------*/
-
-    /// Get the containing POA.  This operation does *not*
-    /// increase the reference count of the POA.
-    virtual PortableServer::POA_ptr _default_POA (void);
-
-    /// Return the cached object reference of this NodeApplication object.
-    /// This operation does *NOT* increase the reference count.
-    ::Deployment::NodeApplication_ptr
-    get_objref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  protected:
-    /// Create and initialize all the containers
-    virtual CORBA::Long create_all_containers (
-        const ::Deployment::ContainerImplementationInfos & container_infos
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// To store all created Component object.
-    // @@Gan/Jai, as we discussed before this is simply a BAD
-    //idea. These need to moved into the container.
-    // @@ Jai/Gan, how about using CCMObject_var instead of
-    //CCMObject_ptr's?
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Components::CCMObject_ptr,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> CCMComponent_Map;
-    typedef CCMComponent_Map::iterator Component_Iterator;
-    CCMComponent_Map component_map_;
-
-    /// Synchronize access to the object set.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Keep a list of managed Container objects.
-    Object_Set<Deployment::Container, Deployment::Container_var> container_set_;
-    /// Keep a pointer to the managing ORB serving this servant.
-    CORBA::ORB_var orb_;
-
-    /// Keep a pointer to the managing POA.
-    // @@Gan/Jai, which POA is this? Same as the component POA or a
-    // different one. My sense is that its different. Could you please
-    //document it?
-    PortableServer::POA_var poa_;
-
-    /// Cached properties
-    Deployment::Properties properties_;
-
-    /// And a reference to the NodeApplicationManager that created us.
-    ::CORBA::Object_var node_app_manager_;
-
-    /// Cache the object reference (of ourselves).
-    ::Deployment::NodeApplication_var objref_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "NodeApplication_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* NODEAPPLICATION_IMPL_H */
diff --git a/TAO/CIAO/ciao/NodeApplication_Impl.inl b/TAO/CIAO/ciao/NodeApplication_Impl.inl
deleted file mode 100644
index d0a30e2b401..00000000000
--- a/TAO/CIAO/ciao/NodeApplication_Impl.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-CIAO::NodeApplication_Impl::
-NodeApplication_Impl (CORBA::ORB_ptr o,
-                      PortableServer::POA_ptr p)
-
-  : orb_ (CORBA::ORB::_duplicate (o)),
-    poa_ (PortableServer::POA::_duplicate (p))
-{
-}
-
-// Access the readonly attribute
-ACE_INLINE
-Deployment::Properties *
-CIAO::NodeApplication_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  Deployment::Properties * tmp;
-
-  ACE_NEW_THROW_EX (tmp,
-                    Deployment::Properties (this->properties_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return tmp;
-}
-
-ACE_INLINE
-PortableServer::POA_ptr
-CIAO::NodeApplication_Impl::_default_POA (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-
-ACE_INLINE
-CORBA::Object_ptr
-CIAO::NodeApplication_Impl::get_node_application_manager (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return ::CORBA::Object::_duplicate (this->node_app_manager_.in ());
-}
-
-/*
-ACE_INLINE void
-CIAO::NodeApplication_Impl::
-set_objref (Components::Deployment::ServerActivator_ptr act,
-            const Components::ConfigValues &config,
-            Components::Deployment::ComponentServer_ptr cs
-            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (!CORBA::is_nil (this->node_app_manager_.in ()) || 
-      !CORBA::is_nil (this->objref_.in ()))
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  this->config_ = new Components::ConfigValues (config);
-  this->activator_ = Components::Deployment::ServerActivator::_duplicate (act);
-  this->objref_ = Components::Deployment::ComponentServer::_duplicate (cs);
-}
-*/
-
-ACE_INLINE ::Deployment::NodeApplication_ptr
-CIAO::NodeApplication_Impl::
-get_objref (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (CORBA::is_nil (this->objref_.in ()))
-    {
-      this->objref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return this->objref_.in ();
-}
diff --git a/TAO/CIAO/ciao/Object_Set_T.h b/TAO/CIAO/ciao/Object_Set_T.h
index d21ff724faf..b11632a5e1b 100644
--- a/TAO/CIAO/ciao/Object_Set_T.h
+++ b/TAO/CIAO/ciao/Object_Set_T.h
@@ -60,7 +60,7 @@ namespace CIAO
 
     /// Removing all objects from the set. Return -1 if error occurred.
     CORBA::Long remove_all (void);
-    
+
     /// Access the underlying T_var array directly.  This is added to
     /// get around a bug in TAO's sequence of object C++ mapping.
     T_var &at (CORBA::ULong index);
diff --git a/TAO/CIAO/ciao/Packaging_Data.idl b/TAO/CIAO/ciao/Packaging_Data.idl
index 0b1881d3288..533116196eb 100644
--- a/TAO/CIAO/ciao/Packaging_Data.idl
+++ b/TAO/CIAO/ciao/Packaging_Data.idl
@@ -1,13 +1,45 @@
 // $Id$
 
+#ifndef PACKAGING_DATA_IDL
+#define PACKAGING_DATA_IDL
+
 #include "Deployment_Data.idl"
 
 module Deployment
 {
+  struct ComponentPackageImport {
+    ::CORBA::StringSeq location;
+  };
+
+  typedef sequence < ComponentPackageImport > ComponentPackageImports;
+
+  struct SubcomponentPropertyReference {
+    string propertyName;
+    unsigned long instanceRef;
+  };
+
+  struct SubcomponentPortEndpoint {
+    string portName;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
+
+  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
+
+  struct AssemblyPropertyMapping {
+    string name;
+    string externalName;
+    SubcomponentPropertyReferences delegatesTo;
+  };
+
+  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
 
+#ifndef AVOID_IFR_CRASH
   struct NamedImplementationArtifact;
 
   typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
+#endif /* AVOID_IFR_CRASH */
 
   struct ImplementationArtifactDescription {
     string label;
@@ -15,7 +47,9 @@ module Deployment
     ::CORBA::StringSeq location;
     Properties execParameter;
     Requirements deployRequirement;
+#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts dependsOn;
+#endif /* AVOID_IFR_CRASH */
     Properties infoProperty;
   };
 
@@ -25,13 +59,17 @@ module Deployment
   };
 
   struct MonolithicImplementationDescription {
-    Properties execParameter;
+    Properties nodeExecParameter;
+    Properties componentExecParameter;
+#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts primaryArtifact;
+#endif /* AVOID_IFR_CRASH */
     ImplementationRequirements deployRequirement;
   };
 
   typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
-  
+
+#ifndef AVOID_IFR_CRASH
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
@@ -39,17 +77,31 @@ module Deployment
   struct ComponentPackageDescription;
 
   typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
+#endif /* AVOID_IFR_CRASH */
 
   struct SubcomponentInstantiationDescription {
     string name;
-    ComponentPackageDescriptions package;
-    Properties configProperty;
+#ifndef AVOID_IFR_CRASH
+    ComponentPackageDescriptions basePackage;
+    PackageConfigurations specializedConfig;
+#endif /* AVOID_IFR_CRASH */
     Requirements selectRequirement;
-    ComponentPackageReferences reference;
+    Properties configProperty;
+    ComponentPackageReferences referencedPackage;
+    ComponentPackageImports importedPackage;
   };
 
   typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
 
+  struct AssemblyConnectionDescription {
+    string name;
+    Requirements deployRequirement;
+    ComponentExternalPortEndpoints externalEndpoint;
+    SubcomponentPortEndpoints internalEndpoint;
+    ExternalReferenceEndpoints externalReference;
+  };
+
+  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
 
   struct ComponentAssemblyDescription {
     SubcomponentInstantiationDescriptions instance;
@@ -93,12 +145,16 @@ module Deployment
   struct PackageConfiguration {
     string label;
     string UUID;
+#ifndef AVOID_IFR_CRASH
     PackageConfigurations specializedConfig;
     ComponentPackageDescriptions basePackage;
+#endif /* AVOID_IFR_CRASH */
     ComponentPackageReferences reference;
     Requirements selectRequirement;
     Properties configProperty;
   };
 
-  
+
 };
+
+#endif /* PACKAGING_DATA_IDL */
diff --git a/TAO/CIAO/ciao/Port_Activator.h b/TAO/CIAO/ciao/Port_Activator.h
index d87d0c2630f..5ab3adb2604 100644
--- a/TAO/CIAO/ciao/Port_Activator.h
+++ b/TAO/CIAO/ciao/Port_Activator.h
@@ -54,7 +54,7 @@ namespace CIAO
     /// Return the name of port that this activator encapulates.
     const char*  name (void) const;
 
-    /// set the name
+    /// Set the name
     void set_name (const char* name);
 
     /// Activate the servant reponsible for this port.
@@ -79,7 +79,7 @@ namespace CIAO
     /// Name of the port
     CORBA::String_var name_;
 
-    /// What type of port is it, a conumer or facet.
+    /// What type of port is it, a consumer or facet.
     Type t_;
   };
 }
diff --git a/TAO/CIAO/ciao/Port_Activator_T.cpp b/TAO/CIAO/ciao/Port_Activator_T.cpp
index 8b84e931f56..6881ffc73e5 100644
--- a/TAO/CIAO/ciao/Port_Activator_T.cpp
+++ b/TAO/CIAO/ciao/Port_Activator_T.cpp
@@ -64,7 +64,7 @@ namespace CIAO
             this->t_ == Port_Activator::Facet)
           {
             CORBA::Object_var tmp =
-              this->comp_serv_->get_facet_executor (this->name_);
+              this->comp_serv_->get_facet_executor (this->name_.in ());
 
             this->executor_ = EXEC::_narrow (tmp.in ());
           }
diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp
index 3c57a6a8e8a..cf194524ec7 100644
--- a/TAO/CIAO/ciao/Servant_Activator.cpp
+++ b/TAO/CIAO/ciao/Servant_Activator.cpp
@@ -25,9 +25,9 @@ namespace CIAO
                  guard,
                  this->mutex_);
 
-      const unsigned int sz =  this->slot_index_;
+      const size_t sz =  this->slot_index_;
 
-      for (unsigned int t = 0; t != sz; ++t)
+      for (size_t t = 0; t != sz; ++t)
         {
           Port_Activator *&tmp = this->pa_[t];
 
@@ -49,8 +49,8 @@ namespace CIAO
                         guard,
                         this->mutex_,
                         0);
-      const unsigned int sz = this->slot_index_;
-      for (unsigned int t = 0; t != sz; ++t)
+      const size_t sz = this->slot_index_;
+      for (size_t t = 0; t != sz; ++t)
         {
           Port_Activator *&tmp = this->pa_[t];
           if (ACE_OS::strcmp (tmp->name (), str.in ()) == 0)
@@ -86,11 +86,11 @@ namespace CIAO
                         this->mutex_,
                         0);
 
-      const unsigned int sz = this->slot_index_;
+      const size_t sz = this->slot_index_;
 
       Port_Activator *tmp = 0;
 
-      for (unsigned int t = 0; t != sz; ++t)
+      for (size_t t = 0; t != sz; ++t)
         {
           if (this->pa_.get (tmp, t) == -1)
             ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -110,8 +110,10 @@ namespace CIAO
               // We should try avoiding making outbound calls with the
               // lock held. Oh well, let us get some sense of sanity in
               // CIAO to do think about these.
-              ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n",
-                          str.in ()));
+              if (CIAO::debug_level () > 5)
+                ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n",
+                            str.in ()));
+
               return this->pa_[t]->activate (oid
                                              ACE_ENV_ARG_PARAMETER);
             }
@@ -133,11 +135,11 @@ namespace CIAO
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
 
-    const unsigned int sz = this->slot_index_;
+    const size_t sz = this->slot_index_;
 
     Port_Activator *tmp = 0;
 
-    for (unsigned int t = 0; t != sz; ++t)
+    for (size_t t = 0; t != sz; ++t)
       {
         if (this->pa_.get (tmp, t) == -1)
           {
@@ -181,8 +183,10 @@ namespace CIAO
 
         if (CIAO::debug_level () > 9)
           ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - Servant_Activator::register_port_activator,"
+                      "CIAO (%P|%t) - Servant_Activator::register_port_activator"
+                      " with port name [%s],"
                       " the slot_index_ is [%d] \n",
+                      pa->name (),
                       this->slot_index_));
 
         return true;
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
index 4918c0cda49..dc50e0bd0f8 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -6,11 +6,6 @@
 
 namespace CIAO
 {
-  Servant_Impl_Base::Servant_Impl_Base (void)
-  {
-    ACE_ASSERT (0);
-  }
-
   Servant_Impl_Base::Servant_Impl_Base (Components::CCMHome_ptr home,
                                         Home_Servant_Impl_Base *home_servant,
                                         Session_Container * c)
@@ -84,7 +79,7 @@ namespace CIAO
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
 
-        sa->update_port_activator (facet_id ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (facet_id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
@@ -110,7 +105,7 @@ namespace CIAO
 
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
-        sa->update_port_activator (cons_id ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (cons_id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
@@ -132,11 +127,11 @@ namespace CIAO
 
       PortableServer::ObjectId_var oid;
 
-      this->container_->uninstall_component ( ccmobjref.in (),
-                                              oid.out ()
-                                              ACE_ENV_ARG_PARAMETER);
+      this->container_->uninstall_component (ccmobjref.in (),
+                                             oid.out ()
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       this->home_servant_->update_component_map (oid);
     }
     ACE_CATCHANY
@@ -178,11 +173,9 @@ namespace CIAO
       this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
-    /*
     ::Components::ConsumerDescriptions_var consumer_desc =
       this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    */
 
     ::Components::EmitterDescriptions_var emitter_desc =
       this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -194,7 +187,7 @@ namespace CIAO
 
     retv->facets (facets_desc.in ());
     retv->receptacles (receptacle_desc.in ());
-    // retv->consumers (consumer_desc.in ());
+    retv->consumers (consumer_desc.in ());
     retv->emitters (emitter_desc.in ());
     retv->publishers (publisher_desc.in ());
 
@@ -209,7 +202,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    if (name == 0)
+    if (0 == name)
       {
         ACE_THROW_RETURN (Components::InvalidName (),
                           CORBA::Object::_nil ());
@@ -245,9 +238,9 @@ namespace CIAO
 
     for (CORBA::ULong i = 0; i < len; ++i)
       {
-        tmp = this->lookup_facet_description (names[i].in ());
+        tmp = this->lookup_facet_description (names[i]);
 
-        if (tmp == 0)
+        if (0 == tmp)
           {
             ACE_THROW_RETURN (Components::InvalidName (),
                               0);
@@ -272,15 +265,15 @@ namespace CIAO
 
     ::Components::FacetDescriptions_var retval = tmp;
 
-    retval->length (this->facet_table_.current_size ());
+    retval->length (this->facet_table_.size ());
     CORBA::ULong i = 0;
 
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
+    for (FacetTable::const_iterator iter = this->facet_table_.begin ();
          iter != this->facet_table_.end ();
          ++iter, ++i)
       {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
+        FacetTable::const_reference entry = *iter;
+        retval[i] = entry.second;
       }
 
     return retval._retn ();
@@ -293,25 +286,25 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-
     ::Components::ConsumerDescriptions *tmp = 0;
     ACE_NEW_THROW_EX (tmp,
                       ::Components::ConsumerDescriptions (
-                      this->consumer_table_.current_size ()),
+                      this->consumer_table_.size ()),
                       CORBA::NO_MEMORY ());
+    ACE_CHECK_RETURN (0);
 
     ::Components::ConsumerDescriptions_var retval = tmp;
 
-    retval->length (this->consumer_table_.current_size ());
+    retval->length (this->consumer_table_.size ());
     CORBA::ULong i = 0;
 
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
+    for (ConsumerTable::const_iterator iter = this->consumer_table_.begin ();
          iter != this->consumer_table_.end ();
          ++iter, ++i)
       {
         // ACE_DEBUG ((LM_DEBUG, "EXECUTING \n"));
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
+        ConsumerTable::const_reference entry = *iter;
+        retval[i] = entry.second;
       }
 
     return retval._retn ();
@@ -326,7 +319,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    if (sink_name == 0)
+    if (0 == sink_name)
       {
         ACE_THROW_RETURN (Components::InvalidName (),
                           Components::EventConsumerBase::_nil ());
@@ -344,18 +337,6 @@ namespace CIAO
     return retval;
   }
 
-  ::Components::EventConsumerBase_ptr
-  Servant_Impl_Base::disconnect_consumer (
-      const char * /* source_name */
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName,
-                     Components::NoConnection))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_named_consumers (
       const ::Components::NameList & names
@@ -375,9 +356,9 @@ namespace CIAO
 
     for (CORBA::ULong i = 0; i < len; ++i)
       {
-        tmp = this->lookup_consumer_description (names[i].in ());
+        tmp = this->lookup_consumer_description (names[i]);
 
-        if (tmp == 0)
+        if (0 == tmp)
           {
             ACE_THROW_RETURN (Components::InvalidName (),
                               0);
@@ -390,15 +371,6 @@ namespace CIAO
   }
 
   ::Components::EmitterDescriptions *
-  Servant_Impl_Base::get_all_emitters (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::EmitterDescriptions *
   Servant_Impl_Base::get_named_emitters (
       const ::Components::NameList & /* names */
       ACE_ENV_ARG_DECL
@@ -410,12 +382,38 @@ namespace CIAO
   }
 
   ::Components::ReceptacleDescriptions *
+
   Servant_Impl_Base::get_all_receptacles (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::get_all_receptacles\n"));
+
+    ::Components::ReceptacleDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ReceptacleDescriptions,
+                    0);
+
+    ::Components::ReceptacleDescriptions_var retval = tmp;
+
+    retval->length (this->receptacle_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    ACE_DEBUG ((LM_DEBUG, "Building sequence of length %d\n", retval->length()));
+
+    for (ReceptacleTable::iterator iter = this->receptacle_table_.begin ();
+         iter != this->receptacle_table_.end ();
+         ++iter, ++i)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Starting loop iteration...\n", retval->length()));
+
+        ReceptacleTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    ACE_DEBUG ((LM_DEBUG, "Escaped loop.\n"));
+    return retval._retn ();
   }
 
   ::Components::ReceptacleDescriptions *
@@ -430,15 +428,6 @@ namespace CIAO
   }
 
   ::Components::PublisherDescriptions *
-  Servant_Impl_Base::get_all_publishers (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
-  }
-
-  ::Components::PublisherDescriptions *
   Servant_Impl_Base::get_named_publishers (
       const ::Components::NameList & /* names */
       ACE_ENV_ARG_DECL
@@ -453,82 +442,211 @@ namespace CIAO
 
   void
   Servant_Impl_Base::add_facet (const char *port_name,
-                                CORBA::Object_ptr port_ref)
+                                ::CORBA::Object_ptr port_ref
+                                ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
+    if (0 == port_name || ::CORBA::is_nil (port_ref))
+      {
+        ACE_THROW ( ::CORBA::BAD_PARAM ());
+        return;
+      }
+
     ::Components::FacetDescription *fd = 0;
     ACE_NEW (fd,
-             OBV_Components::FacetDescription);
+             ::OBV_Components::FacetDescription);
     ::Components::FacetDescription_var safe = fd;
 
     fd->name (port_name);
     fd->type_id (port_ref->_interface_repository_id ());
     fd->facet_ref (port_ref);
 
-    if (this->facet_table_.bind (port_name, fd) == 0)
-      {
-        safe._retn ();
-      }
+    FacetTable::value_type entry;
+    entry.first = port_name;
+    entry.second = safe._retn ();
+
+    ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
+
+    (void) this->facet_table_.insert (entry);
   }
 
   CORBA::Object_ptr
   Servant_Impl_Base::lookup_facet (const char *port_name)
   {
-    ::Components::FacetDescription_var fd;
+    if (0 == port_name)
+      {
+        return CORBA::Object::_nil ();
+      }
+
+    ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                           mon,
+                           this->lock_,
+                           CORBA::Object::_nil ());
+
+    FacetTable::const_iterator iter =
+      this->facet_table_.find (port_name);
 
-    if (this->facet_table_.find (port_name, fd) != 0)
+    if (iter == this->facet_table_.end ())
       {
         return CORBA::Object::_nil ();
       }
 
-    return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
+    return CORBA::Object::_duplicate (iter->second->facet_ref ());
   }
 
   ::Components::FacetDescription *
   Servant_Impl_Base::lookup_facet_description (const char *port_name)
   {
-    ::Components::FacetDescription_var fd;
-
-    if (this->facet_table_.find (port_name, fd) != 0)
+    if (0 == port_name)
       {
+        /// Calling function will throw InvalidName after getting this.
         return 0;
       }
 
+    ::Components::FacetDescription_var fd;
+    FacetTable::const_iterator iter;
+
+    {
+      ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                             mon,
+                             this->lock_,
+                             0);
+
+      iter = this->facet_table_.find (port_name);
+
+      if (iter != this->facet_table_.end ())
+        {
+          fd = iter->second;
+        }
+    }
+
     return fd._retn ();
   }
 
   void
+  Servant_Impl_Base::add_receptacle (const char *receptacle_name,
+                                     CORBA::Object_ptr recept_ref,
+                                     ::Components::Cookie * cookie)
+  {
+    ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::add_receptacle (%s)\n", receptacle_name));
+
+    ::Components::ReceptacleDescription_var safe;
+    ::Components::ReceptacleDescription *rd = 0;
+
+    if (this->receptacle_table_.find (receptacle_name,
+                                      safe) == -1)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Found no receptacle named (%s)\n", receptacle_name));
+
+      ACE_NEW (rd,
+               OBV_Components::ReceptacleDescription);
+      safe = rd;
+
+      rd->name (receptacle_name);
+      rd->type_id (recept_ref->_interface_repository_id ());
+      // The receptacle is a multiplex receptacle if and only if a
+      // cookie was given.
+      rd->is_multiple (cookie != 0);
+
+      ::Components::ConnectionDescription *cd = 0;
+      ACE_NEW (cd,
+               OBV_Components::ConnectionDescription);
+      ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
+      ::Components::ConnectionDescriptions cds (1);
+
+      cds.length (1);
+      cds[0] = cd_safe;
+      rd->connections (cds);
+    }
+    else
+    {
+      ACE_DEBUG ((LM_DEBUG, "Found a receptacle named (%s)\n", receptacle_name));
+      rd = safe.inout ();
+
+      ::Components::ConnectionDescription *cd = 0;
+      ACE_NEW (cd,
+               OBV_Components::ConnectionDescription);
+      ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
+      ::Components::ConnectionDescriptions & cds = rd->connections ();
+      CORBA::ULong old_length = cds.length ();
+      ACE_DEBUG ((LM_DEBUG, "Old length was %d\n", old_length));
+      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));
+    }
+
+    if (this->receptacle_table_.bind (receptacle_name, safe) == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Successfully added new receptacle named (%s)\n", receptacle_name));
+      }
+  }
+
+  void
   Servant_Impl_Base::add_consumer (
       const char *port_name,
       ::Components::EventConsumerBase_ptr port_ref
+      ACE_ENV_ARG_DECL
     )
+    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
+    if (0 == port_name || ::CORBA::is_nil (port_ref))
+      {
+        ACE_THROW ( ::CORBA::BAD_PARAM ());
+        return;
+      }
+
     ::Components::ConsumerDescription *cd = 0;
     ACE_NEW (cd,
-             OBV_Components::ConsumerDescription);
+             ::OBV_Components::ConsumerDescription);
     ::Components::ConsumerDescription_var safe = cd;
 
     cd->name (port_name);
     cd->type_id (port_ref->_interface_repository_id ());
     cd->consumer (port_ref);
 
-    if (this->consumer_table_.bind (port_name, cd) == 0)
-      {
-        safe._retn ();
-      }
+    ConsumerTable::value_type entry;
+    entry.first = port_name;
+    entry.second = safe._retn ();
+
+    ACE_WRITE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
+
+    (void) this->consumer_table_.insert (entry);
   }
 
   ::Components::EventConsumerBase_ptr
   Servant_Impl_Base::lookup_consumer (const char *port_name)
   {
-    ::Components::ConsumerDescription_var cd;
+    if (0 == port_name)
+      {
+        return ::Components::EventConsumerBase::_nil ();
+      }
+
+    ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                           mon,
+                           this->lock_,
+                           ::Components::EventConsumerBase::_nil ());
 
-    if (this->consumer_table_.find (port_name, cd) != 0)
+    ConsumerTable::const_iterator iter =
+      this->consumer_table_.find (port_name);
+
+    if (iter == this->consumer_table_.end ())
       {
         return ::Components::EventConsumerBase::_nil ();
       }
 
     return
-      ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
+      ::Components::EventConsumerBase::_duplicate (
+          iter->second->consumer ()
+        );
   }
 
   ::Components::ConsumerDescription *
@@ -536,17 +654,33 @@ namespace CIAO
       const char *port_name
     )
   {
-    ::Components::ConsumerDescription_var cd;
-
-    if (this->consumer_table_.find (port_name, cd) != 0)
+    if (0 == port_name)
       {
+        /// Calling function will throw InvalidName after getting this.
         return 0;
       }
 
+    ::Components::ConsumerDescription_var cd;
+    ConsumerTable::const_iterator iter;
+
+    {
+      ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                             mon,
+                             this->lock_,
+                             0);
+
+      iter = this->consumer_table_.find (port_name);
+
+      if (iter != this->consumer_table_.end ())
+        {
+          cd = iter->second;
+        }
+    }
+
     return cd._retn ();
   }
-  
-  ::Components::StandardConfigurator_ptr 
+
+  ::Components::StandardConfigurator_ptr
   Servant_Impl_Base::get_standard_configurator (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -573,3 +707,4 @@ namespace CIAO
       PortableServer::POA::_duplicate (container_->the_POA ());
   }
 }
+
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.h b/TAO/CIAO/ciao/Servant_Impl_Base.h
index 4a32b5e8e57..a68270392b2 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.h
@@ -18,13 +18,16 @@
 #define CIAO_SERVANT_IMPL_BASE_H
 
 #include /**/ "ace/pre.h"
-
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/Array_Map.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Active_Map_Manager_T.h"
+#include "ace/Thread_Mutex.h"
+
 #include "CCM_EventC.h"
 #include "CIAO_Server_Export.h"
 #include "CCM_ComponentS.h"
@@ -48,9 +51,7 @@ namespace CIAO
     : public virtual POA_Components::CCMObject
   {
   public:
-    explicit Servant_Impl_Base (void);
-
-    Servant_Impl_Base (Components::CCMHome_ptr home, 
+    Servant_Impl_Base (Components::CCMHome_ptr home,
                        Home_Servant_Impl_Base *home_servant,
                        Session_Container * c);
 
@@ -107,11 +108,11 @@ namespace CIAO
     get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    
+
     virtual ::Components::ConsumerDescriptions *
     get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
 
     virtual ::Components::EventConsumerBase_ptr
     get_consumer (const char *sink_name
@@ -119,13 +120,6 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
-    virtual ::Components::EventConsumerBase_ptr
-    disconnect_consumer (const char *source_name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName,
-                       Components::NoConnection));
-
     virtual ::Components::ConsumerDescriptions *
     get_named_consumers (const ::Components::NameList & names
                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -133,27 +127,19 @@ namespace CIAO
                        Components::InvalidName));
 
     virtual ::Components::EmitterDescriptions *
-    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & /* names */
+    get_named_emitters (const ::Components::NameList & names
                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & /* names */
+    get_named_receptacles (const ::Components::NameList & names
                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
-
-    virtual ::Components::PublisherDescriptions *
-    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    
+    virtual ::Components::ReceptacleDescriptions *
+    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::PublisherDescriptions *
@@ -167,7 +153,7 @@ namespace CIAO
                                  ACE_ENV_ARG_DECL) = 0;
 
     // Creates and returns the StandardConfigurator for the component.
-    virtual ::Components::StandardConfigurator_ptr 
+    virtual ::Components::StandardConfigurator_ptr
     get_standard_configurator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -180,7 +166,9 @@ namespace CIAO
 
   protected:
     void add_facet (const char *port_name,
-                    CORBA::Object_ptr port_ref);
+                    ::CORBA::Object_ptr port_ref
+                    ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
@@ -188,8 +176,14 @@ namespace CIAO
         const char *port_name
       );
 
+    void add_receptacle (const char *receptacle_name,
+                         CORBA::Object_ptr recept_ref,
+                         ::Components::Cookie * cookie);
+
     void add_consumer (const char *port_name,
-                       ::Components::EventConsumerBase_ptr port_ref);
+                       ::Components::EventConsumerBase_ptr port_ref
+                       ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
@@ -198,30 +192,86 @@ namespace CIAO
     ::Components::ConsumerDescription *lookup_consumer_description (
         const char *port_name
       );
-      
+
+    /// Called from generated servant class to help with
+    /// get_all_*() methods.
+
+    template<typename T_var>
+    static void describe_simplex_receptacle (
+        const char *port_name,
+        const char *port_type_repo_id,
+        T_var &connection,
+        ::Components::ReceptacleDescriptions_var &descriptions,
+        CORBA::ULong slot
+      );
+
+    template<typename T_var>
+    static void describe_multiplex_receptacle (
+        const char *port_name,
+        const char *port_type_repo_id,
+        ACE_Active_Map_Manager<T_var> &objrefs,
+        ::Components::ReceptacleDescriptions_var &descriptions,
+        CORBA::ULong slot
+      );
+
+    template<typename T_var>
+    static void describe_pub_event_source (
+        const char *port_name,
+        const char *port_type_repo_id,
+        ACE_Active_Map_Manager<T_var> &consumers,
+        ::Components::PublisherDescriptions_var &descriptions,
+        CORBA::ULong slot
+      );
+
+    template<typename T_var>
+    static void describe_emit_event_source (
+        const char *port_name,
+        const char *port_type_repo_id,
+        T_var &consumer_ref,
+        ::Components::EmitterDescriptions_var &descriptions,
+        CORBA::ULong slot
+      );
+
   protected:
-    typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                    ::Components::FacetDescription_var,
-                                    ACE_Hash<const char *>,
-                                    ACE_Equal_To<const char *>,
-                                    ACE_Null_Mutex>
+    typedef ACE_Array_Map<ACE_CString,
+                          ::Components::FacetDescription_var>
        FacetTable;
 
+    typedef ACE_Array_Map<ACE_CString,
+                          ::Components::ConsumerDescription_var>
+       ConsumerTable;
+
     typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                    ::Components::ConsumerDescription_var,
+                                    ::Components::ReceptacleDescription_var,
                                     ACE_Hash<const char *>,
                                     ACE_Equal_To<const char *>,
                                     ACE_Null_Mutex>
-       ConsumerTable;
+       ReceptacleTable;
 
     FacetTable facet_table_;
     ConsumerTable consumer_table_;
+    ReceptacleTable receptacle_table_;
     Components::CCMHome_var home_;
     Home_Servant_Impl_Base *home_servant_;
     Session_Container * container_;
+  private:
+    /// Not allowed to be used
+    Servant_Impl_Base (void);
+
+  private:
+    /// For internal locking of table reads and writes.
+    TAO_SYNCH_MUTEX lock_;
   };
 }
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Servant_Impl_Utils_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Servant_Impl_Utils_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include /**/ "ace/post.h"
 
 #endif /* CIAO_SERVANT_IMPL_T_H */
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp
index e0fa17715b1..01ee28df790 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp
@@ -18,9 +18,9 @@ namespace CIAO
       Session_Container * c
     )
     : Servant_Impl_Base (home, home_servant, c),
-      activated_ (0),
-      pre_activated_ (0),
-      post_activated_ (0),
+      activated_ (false),
+      pre_activated_ (false),
+      post_activated_ (false),
       executor_ (EXEC::_duplicate (exe))
   {
   }
@@ -301,6 +301,10 @@ namespace CIAO
     if (! ::CORBA::is_nil (temp.in ()))
       temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
+
+    this->pre_activated_ = 0;
+    this->activated_ = 0;
+    this->post_activated_ = 0;
   }
 }
 
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h
index b4da0013448..c4151d37f10 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Servant_Impl_T.h
@@ -105,8 +105,10 @@ namespace CIAO
     CORBA::Boolean pre_activated_;
     CORBA::Boolean post_activated_;
 
+    /// Initialized in this constructor.
     EXEC_VAR executor_;
 
+    /// Initialized in the derived, generated servant constructor.
     CONTEXT * context_;
   };
 }
diff --git a/TAO/CIAO/ciao/ServerResources.idl b/TAO/CIAO/ciao/ServerResources.idl
index 726bb1f8a12..2269357ce38 100644
--- a/TAO/CIAO/ciao/ServerResources.idl
+++ b/TAO/CIAO/ciao/ServerResources.idl
@@ -1,20 +1,12 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    ServerResrouces.idl
-//
-// = DESCRIPTION
-//    A collection of IDL data types for
-//
-// = AUTHORS
-//    Nanbor Wang
-//
-// ============================================================================
+/**
+ * @file ServerResources.idl
+ *
+ * @brief A collection of IDL data types for
+ *
+ * @author Nanbor Wang
+ */
 
 #if !defined (CIAO_SERVERRESOURCES_IDL)
 #define CIAO_SERVERRESOURCES_IDL
@@ -76,6 +68,8 @@ module CIAO
       unsigned long max_request_buffer_size;
     };
 
+    typedef sequence<ORS_Threadpool> ORS_ThreadpoolSeq;
+
     /**
      * @brief Defines the configuration of a threadpool lane.  We need
      * to redefine it here to avoid dependency to RTCORBA library.
@@ -108,6 +102,8 @@ module CIAO
       unsigned long max_request_buffer_size;
     };
 
+    typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq;
+
     /**
      * @brief Define a priority band for BandedConnection policies.
      */
@@ -133,21 +129,23 @@ module CIAO
       ORS_PriorityBands bands;
     };
 
+    typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq;
+
     /**
      * @brief Collection of resources managed by the NodeApplication
      * ORB.
      */
     struct ORBResource
     {
-      sequence<ORS_Threadpool> threadpool_list;
+      ORS_ThreadpoolSeq threadpool_list;
 
-      sequence<ORS_ThreadpoolWithLanes> threadpool_with_lanes_list;
+      ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list;
 
-      sequence<ORS_ConnectionBands> connection_bands_list;
+      ORS_ConnectionBandsSeq connection_bands_list;
     };
 
     typedef sequence<ORBResource, 1> ORBResources;
-    
+
     // =================================================================
 
     /**
@@ -218,13 +216,13 @@ module CIAO
      * @brief A list of all policy sets.
      */
     typedef sequence<PolicySet> PolicySets;
-    
+
     struct ORBConfigs
     {
       ORBResources orb_resources;
       PolicySets policy_set;
     };
-    
+
     struct ServerResource
     {
       string Id;
@@ -232,7 +230,7 @@ module CIAO
       CommandlineArgs args;
       SvcconfURI svcconf;
       ORBConfigs orb_config;
-    };      
+    };
   };
 };
 
diff --git a/TAO/CIAO/ciao/Server_init.cpp b/TAO/CIAO/ciao/Server_init.cpp
index 43eaabcd598..27c4d035cdc 100644
--- a/TAO/CIAO/ciao/Server_init.cpp
+++ b/TAO/CIAO/ciao/Server_init.cpp
@@ -6,52 +6,235 @@
 #include "Cookies.h"
 
 #include "ace/OS_NS_stdio.h"
-
-int
-CIAO::Server_init (CORBA::ORB_ptr o)
-{
-  CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
-                               Components::Cookie);
-  CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
-                               CIAO::Cookie);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
-                               Components::PortDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
-                               Components::FacetDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init,
-                               Components::ConnectionDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init,
-                               Components::ReceptacleDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
-                               Components::ConsumerDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init,
-                               Components::EmitterDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init,
-                               Components::SubscriberDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init,
-                               Components::PublisherDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init,
-                               Components::ConfigValue);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init,
-                               Components::ComponentPortDescription);
-  return 0;
-}
-
-int
-CIAO::Utility::write_IOR (const char *pathname,
-                          const char *ior)
+namespace CIAO
 {
-  FILE* ior_output_file_ =
-    ACE_OS::fopen (pathname, "w");
+  int
+  Server_init (CORBA::ORB_ptr o)
+  {
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+                                Components::Cookie);
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+                                CIAO::Cookie);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
+                                Components::PortDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
+                                Components::FacetDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init,
+                                Components::ConnectionDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init,
+                                Components::ReceptacleDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
+                                Components::ConsumerDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init,
+                                Components::EmitterDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init,
+                                Components::SubscriberDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init,
+                                Components::PublisherDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init,
+                                Components::ConfigValue);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init,
+                                Components::ComponentPortDescription);
+    return 0;
+  }
+
+  namespace Utility
+  {
+    int write_IOR (const char *pathname,
+                   const char *ior)
+    {
+      FILE* ior_output_file_ =
+        ACE_OS::fopen (pathname, "w");
+
+      if (ior_output_file_)
+        {
+          ACE_OS::fprintf (ior_output_file_,
+                          "%s",
+                          ior);
+          ACE_OS::fclose (ior_output_file_);
+          return 0;
+        }
+
+      return -1;
+    }
+
+    // --------------------------------------------------------------
+    //             Implementation of NameUtility class
+    // --------------------------------------------------------------
+
+    void NameUtility::CreateContextPath (const CosNaming::NamingContextExt_ptr nc,
+                                         const CosNaming::Name& name)
+    {
+      bool isNotFound = false;
+      CORBA::ULong lengthMissing = 0;
+      CORBA::ULong OriginalLength = name.length();
+      CosNaming::Name tmpName;
 
-  if (ior_output_file_)
+      CosNaming::NamingContext_var tmpCtxVar;
+
+      ACE_TRY
+        {
+          tmpCtxVar = nc->bind_new_context(name);
+          ACE_DEBUG ((LM_DEBUG, "Bound Context.\n\n"));
+        }
+      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Context Already Bound.\n\n"));
+        }
+      ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Context not found.\n\n"));
+          isNotFound = true;
+          lengthMissing = nf.rest_of_name.length();
+        }
+      ACE_ENDTRY;
+
+      if (lengthMissing == name.length())
+        {
+          ACE_DEBUG ((LM_ERROR, "Null name length.\n\n"));
+        }
+
+      if (isNotFound)
+        {
+          for (CORBA::ULong l = OriginalLength-lengthMissing;
+                l < OriginalLength;
+                l++)
+              {
+                tmpName.length(l+1);
+                for (CORBA::ULong i=0; i <= l; i++)
+                  {
+                    tmpName[i] = name[i];
+
+                    CORBA::String_var newSCName = nc->to_string(tmpName);
+                    ACE_DEBUG ((LM_DEBUG, "What's left of the name:%s\n",
+                                newSCName.in ()));
+                  }
+
+                tmpCtxVar = nc->bind_new_context(tmpName);
+                ACE_DEBUG ((LM_DEBUG, "Bound New Context.\n"));
+              }
+          }
+    }
+
+    //---------------------------------------------------------------------------------------------
+    void NameUtility::BindObjectPath (const CosNaming::NamingContextExt_ptr nc,
+                                      const CosNaming::Name& name,
+                                      const CORBA::Object_var obj)
     {
-      ACE_OS::fprintf (ior_output_file_,
-                       "%s",
-                       ior);
-      ACE_OS::fclose (ior_output_file_);
-      return 0;
+      CosNaming::Name tmpName;
+      CORBA::String_var  newSCName = nc->to_string(name);
+      ACE_DEBUG ((LM_DEBUG, "The name is: %s\n", newSCName.in ()));
+
+      ACE_TRY
+        {
+          nc->rebind(name, obj);
+        }
+
+      ACE_CATCH (CosNaming::NamingContext::NotFound, ex )
+        {
+          ACE_DEBUG ((LM_DEBUG, "Name not found, doing new bind.\n"));
+          nc->bind(name, obj);
+        }
+      ACE_ENDTRY;
+    }
+
+    //---------------------------------------------------------------------------------------------
+    CosNaming::BindingList *
+    NameUtility::listBindings (const CosNaming::NamingContext_ptr nc,
+                               const CosNaming::Name& name,
+                               CORBA::ULong max_list_size)
+    {
+      CosNaming::BindingList_var   basicListV;
+      CosNaming::BindingIterator_var bIterV;
+
+      CORBA::Object_var objV;
+      CosNaming::NamingContext_var tmpContextV;
+
+      if (name.length()==0)
+        {
+          tmpContextV = CosNaming::NamingContext::_duplicate(nc);
+        }
+      else
+        {
+          objV = nc->resolve(name);
+          tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
+        }
+      if (CORBA::is_nil(tmpContextV.in ()))
+        {
+          ACE_DEBUG ((LM_ERROR, "listBindings: Nil context.\n"));
+          return 0;
+        }
+
+      tmpContextV->list(max_list_size, basicListV.out(), bIterV.out());
+
+      CORBA::Long   max_remaining = max_list_size - basicListV->length();
+      CORBA::Boolean moreBindings = !CORBA::is_nil(bIterV.in ());
+
+      if (moreBindings)
+        {
+          while (moreBindings && (max_remaining > 0) )
+            {
+              CosNaming::BindingList_var tmpListV;
+
+              moreBindings = bIterV->next_n(max_remaining, tmpListV.out());
+
+              //Append 'tmpListV' to 'basicListV'
+              CORBA::ULong basicListLen = basicListV->length();
+              basicListV->length(basicListLen+tmpListV->length());
+              for (CORBA::ULong i=0; i < tmpListV->length(); i++)
+                {
+                  (*basicListV)[i+basicListLen] = (*tmpListV)[i];
+                }
+
+              //Re-calculate 'max_remaining'
+              max_remaining = max_list_size - basicListV->length();
+            }
+          bIterV->destroy();
+        }
+
+      return basicListV._retn();
+    }
+
+    //---------------------------------------------------------------------------------------------
+    void
+    NameUtility::recursiveUnbind (const CosNaming::NamingContext_ptr nc,
+                                  const CosNaming::Name& name)
+    {
+      CORBA::Object_var objV;
+      CosNaming::NamingContext_var tmpContextV;
+
+      objV = nc->resolve(name);
+      tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
+      if (CORBA::is_nil(tmpContextV.in ()))
+        {
+          ACE_DEBUG ((LM_ERROR, "recursiveUnbind: Nil context reference.\n"));
+          return;
+        }
+
+      CosNaming::BindingList_var blV;
+      CosNaming::Name tmpName;
+      tmpName.length(0);
+
+      blV = NameUtility::listBindings(tmpContextV.in(),
+                                      tmpName,
+                                      10000);  // 'max_list_size'
+
+      for (CORBA::ULong i=0; i<blV->length(); i++)
+        {
+          tmpName = (*blV)[i].binding_name;
+
+          if ((*blV)[i].binding_type==CosNaming::nobject)
+            {
+              tmpContextV->unbind(tmpName);
+            }
+          else if ( (*blV)[i].binding_type==CosNaming::ncontext)
+            {
+              NameUtility::recursiveUnbind(tmpContextV.in(), tmpName);
+            }
+        }
+      nc->unbind(name);
+      tmpContextV->destroy();
     }
 
-  return -1;
-}
+  } /* namespace Utility */
+} /* namespace CIAO */
diff --git a/TAO/CIAO/ciao/Server_init.h b/TAO/CIAO/ciao/Server_init.h
index d2cbfcc04f5..c5fe53ed77d 100644
--- a/TAO/CIAO/ciao/Server_init.h
+++ b/TAO/CIAO/ciao/Server_init.h
@@ -7,6 +7,7 @@
  * I'm also puting some utilities functions here.
  *
  * @author Nanbor Wang <nanbor@cs.wustl.edu>
+ * @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 
 #ifndef CIAO_SERVER_INIT_H
@@ -14,16 +15,20 @@
 #include /**/ "ace/pre.h"
 
 #include "CIAO_Server_Export.h"
+#include "tao/Versioned_Namespace.h"
+#include <orbsvcs/CosNamingC.h>
 
 #if !defined ACE_LACKS_PRAGMA_ONCE
 #pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class ORB;
   typedef ORB *ORB_ptr;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
@@ -43,6 +48,42 @@ namespace CIAO
     /// overwritten.
     CIAO_SERVER_Export int write_IOR (const char *pathname,
                                       const char *IOR);
+
+    class CIAO_SERVER_Export NameUtility
+    {
+      /**
+      * A utility class to bind naming context. This class is contributed by
+      * Dipa Suri <dipa.suri@lmco.com>.
+      *
+      * The concept/code are derived from
+      * http://www.informit.com/articles/article.asp?p=23266&seqNum=6
+      */
+
+    public:
+      /// For each 'NameComponent' in 'name', create a corresponding 'NamingContext'.
+      static  void CreateContextPath (const CosNaming::NamingContextExt_ptr,
+                                      const CosNaming::Name &);
+
+      /// For the first [0, length-2] NameComponents of 'name', create a
+      /// corresponding 'NamingContext'.
+      /// For the length-1 NameComponent of 'name', bind it to the object
+      /// reference 'obj'.
+      static  void BindObjectPath (const CosNaming::NamingContextExt_ptr,
+                                   const CosNaming::Name&,
+                                   const CORBA::Object_var);
+
+      /// Get a list of all bindings under the given context, up to
+      /// max_list_size.
+      static CosNaming::BindingList * listBindings (const CosNaming::NamingContext_ptr,
+                                                    const CosNaming::Name&,
+                                                    CORBA::ULong);
+
+      /// Recursively unbind all objects and contexts below the given name
+      /// context, given the initial context nc.
+      /// Assumes a tree shape to service (not cyclic)
+      static void recursiveUnbind (const CosNaming::NamingContext_ptr,
+                                   const CosNaming::Name&);
+    };
   }
 }
 
diff --git a/TAO/CIAO/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/ciao/StandardConfigurator_Impl.h
index d7184c74647..a743c4d231f 100644
--- a/TAO/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/TAO/CIAO/ciao/StandardConfigurator_Impl.h
@@ -51,7 +51,6 @@ namespace CIAO
     /// Destructor
     virtual ~StandardConfigurator_Impl (void);
 
-
     /// This method will call set_attributes on the component that is
     /// being configured, i.e, the template method from
     /// StandardConfigurator interface.
diff --git a/TAO/CIAO/ciao/Swapping_Container.cpp b/TAO/CIAO/ciao/Swapping_Container.cpp
index 643454b16db..d7539ed21f2 100644
--- a/TAO/CIAO/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/ciao/Swapping_Container.cpp
@@ -13,7 +13,7 @@
 namespace CIAO
 {
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
   Swapping_Container::serial_number_ (0);
 
   Swapping_Container::Swapping_Container (CORBA::ORB_ptr o,
diff --git a/TAO/CIAO/ciao/Swapping_Container.h b/TAO/CIAO/ciao/Swapping_Container.h
index 9f107cd1b46..99be4aa474f 100644
--- a/TAO/CIAO/ciao/Swapping_Container.h
+++ b/TAO/CIAO/ciao/Swapping_Container.h
@@ -96,10 +96,11 @@ namespace CIAO
     void create_connections_POA (PortableServer::POA_ptr root
                                  ACE_ENV_ARG_DECL);
   protected:
-    long number_;
+    unsigned long number_;
 
-    // @@ Jai, why should this be static?
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_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_;
 
     Dynamic_Component_Activator *dsa_;
 
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
index 9f799ae08aa..d222e722818 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -4,12 +4,7 @@
 
 namespace CIAO
 {
-  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base (void)
-  {
-    ACE_ASSERT (0);
-  }
-
-  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base 
+  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base
     (Swapping_Container * c)
     : container_ (c)
   {
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
index ed02e055c9d..66258261e7d 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CIAO_Server_Export.h"
+#include "ciao/CIAO_Server_Export.h"
 
 namespace CIAO
 {
@@ -41,8 +41,6 @@ namespace CIAO
     : public virtual POA_Components::CCMHome
   {
   public:
-    explicit Swapping_Home_Servant_Impl_Base (void);
-
     Swapping_Home_Servant_Impl_Base (Swapping_Container * c);
 
     virtual ~Swapping_Home_Servant_Impl_Base (void);
@@ -58,6 +56,9 @@ namespace CIAO
 
   protected:
     Swapping_Container *container_;
+  private:
+    /// Not to be used
+    Swapping_Home_Servant_Impl_Base (void);
   };
 }
 
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index 22ddf32cb00..cf03a6f3c35 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -3,8 +3,8 @@
 #ifndef CIAO_SWAPPING_SERVANT_IMPL_T_C
 #define CIAO_SWAPPING_SERVANT_IMPL_T_C
 
-#include "Swapping_Servant_Home_Impl_T.h"
-#include "Dynamic_Component_Servant_T.h"
+#include "ciao/Swapping_Servant_Home_Impl_T.h"
+#include "ciao/Dynamic_Component_Servant_T.h"
 
 namespace CIAO
 {
@@ -105,7 +105,7 @@ namespace CIAO
       PortableServer::string_to_ObjectId (this->obj_id_);
 
     Dynamic_Component_Servant_Base *servant = 0;
-    if (this->dynamic_servant_map_.find (oid, servant) == 0)
+    if (this->dynamic_servant_map_.find (oid.in (), servant) == 0)
     {
       servant->destroy (oid);
     }
@@ -229,8 +229,8 @@ namespace CIAO
 
     this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
-    
-    this->dynamic_servant_map_.bind (oid, svt);
+
+    this->dynamic_servant_map_.bind (oid.in (), svt);
 
     COMP_VAR ho = COMP::_narrow (objref.in ()
                                  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index 76bc3a09f0f..2b5b64df889 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Home_Servant_Impl_Base.h"
+#include "ciao/Home_Servant_Impl_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,7 @@
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "ace/Hash_Map_Manager_T.h"
-#include "Dynamic_Component_Servant_Base.h"
+#include "ciao/Dynamic_Component_Servant_Base.h"
 
 namespace CIAO
 {
@@ -54,9 +54,10 @@ namespace CIAO
   {
   public:
     Swapping_Home_Servant_Impl (EXEC * exe,
-                       Session_Container * c,
-                       const char* ins_name,
-                       const char* obj_id, const char* repo_id);
+                                Session_Container * c,
+                                const char* ins_name,
+                                const char* obj_id,
+                                const char* repo_id);
 
     virtual ~Swapping_Home_Servant_Impl (void);
 
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index 9a1564b7a5a..da7843974c4 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -7,9 +7,9 @@
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
       Upgradeable_Context_Impl (
@@ -21,18 +21,18 @@ namespace CIAO
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
        ~Upgradeable_Context_Impl (void)
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet (
@@ -50,9 +50,9 @@ namespace CIAO
     ACE_CHECK;
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
@@ -65,17 +65,17 @@ namespace CIAO
       this->container_->the_facet_cons_POA ()->reference_to_id
          (reference ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
-    this->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
+
+    this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
-    this->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
+
+    this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 28670a296da..18e5272b205 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -15,23 +15,25 @@
 
 #include /**/ "ace/pre.h"
 
-#include "UpgradeableContextC.h"
-#include "Context_Impl_T.h"
+#include "ciao/UpgradeableContextC.h"
+#include "ciao/Context_Impl_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class SystemException;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  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>
@@ -64,11 +66,14 @@ namespace CIAO
       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;
+  private:
+    /// Not to be used
+    Upgradeable_Context_Impl (void);
   };
 }
 
diff --git a/TAO/CIAO/ciao/Version.h b/TAO/CIAO/ciao/Version.h
index 6f4d721b1c0..d3be24c7e32 100644
--- a/TAO/CIAO/ciao/Version.h
+++ b/TAO/CIAO/ciao/Version.h
@@ -1,7 +1,9 @@
+// -*- C++ -*-
 // $Id$
-// This is an automatically generated file.
+
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.
 
 #define CIAO_MAJOR_VERSION 0
-#define CIAO_MINOR_VERSION 4
-#define CIAO_BETA_VERSION 7
-#define CIAO_VERSION "0.4.7"
+#define CIAO_MINOR_VERSION 5
+#define CIAO_BETA_VERSION 1
+#define CIAO_VERSION "0.5.1"
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
new file mode 100644
index 00000000000..bcfcca9ef93
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
@@ -0,0 +1,69 @@
+// $Id$
+
+/**
+ * @file CIAO_Events.idl
+ *
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <dengg@dre.vanderbilt.edu>
+ *
+ * @brief Interfaces for configuring CIAO's event mechanism.
+ */
+
+#include "ciao/CCM_Event.idl"
+
+module CIAO
+{
+  /// A component's UUID + port name.
+  typedef string CONNECTION_ID;
+
+  enum EventServiceType
+  {
+    DIRECT,
+    EC,
+    RTEC,
+    NOTIFY,
+    RTNOTIFY
+  };
+
+  interface Supplier_Config
+  {
+    attribute CONNECTION_ID supplier_id;
+
+    readonly attribute EventServiceType service_type;
+
+    void destroy ();
+  };
+
+  interface Consumer_Config : Supplier_Config
+  {
+    attribute CONNECTION_ID consumer_id;
+    attribute Components::EventConsumerBase consumer;
+
+    void start_conjunction_group (in long size);
+
+    void start_disjunction_group (in long size);
+
+    void insert_source (in CONNECTION_ID source_id);
+
+    void insert_type (in long event_type);
+  };
+
+  interface CIAO_Event_Service : Components::EventConsumerBase
+  {
+    Supplier_Config create_supplier_config ();
+
+    Consumer_Config create_consumer_config ();
+
+    void connect_event_supplier (in Supplier_Config supplier_conf);
+
+    void connect_event_consumer (in Consumer_Config consumer_conf);
+
+    void disconnect_event_supplier (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    void disconnect_event_consumer (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    //void push_event (in Components::EventBase ev);
+  };
+};
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index a5a1417673e..c4ba7145521 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
+project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc, ciao_events_base_dnc {
 
   sharedname  = CIAO_DnC_Events
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
@@ -14,7 +14,4 @@ project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
   Header_Files {
     CIAO_EventService_Factory_impl.h
   }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/CIAO/docs/index.html b/TAO/CIAO/docs/index.html
index 937753498a9..fcfc8cd2060 100644
--- a/TAO/CIAO/docs/index.html
+++ b/TAO/CIAO/docs/index.html
@@ -82,8 +82,9 @@ Visio file</a> (The same file in Visio V.5 format is <a
 <br>
 <hr>
 <h2>CIAO's D&C Framework (DAnCE) part-by-part</h2>
-Here is a list of the major actors of CIAO runtime that a user should
-be aware of.
+DAnCE's implementation is based on the OMG's Deployment and Configuration
+Specification version [ptc/2003-07-08]. Here is a list of the major
+actors of CIAO runtime that a user should be aware of.
 <ul>
   <li><a
  href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000011.html"><strong>NodeManager:</strong></a>
diff --git a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
index c7e708b1af5..73c2c1ce342 100644
--- a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
@@ -146,8 +146,8 @@
   <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:element name="resourceType" type="xsd:string" maxOccurs="unbounded" />
+      <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
@@ -231,7 +231,6 @@
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
-
   <xsd:simpleType name="CCMComponentPortKind">
     <xsd:restriction base="xsd:NCName">
       <xsd:enumeration value="Facet"/>
@@ -240,6 +239,8 @@
       <xsd:enumeration value="EventEmitter"/>
       <xsd:enumeration value="EventPublisher"/>
       <xsd:enumeration value="EventConsumer"/>
+      <xsd:enumeration value="rtecEventPublisher"/>
+      <xsd:enumeration value="rtecEventConsumer"/>      
     </xsd:restriction>
   </xsd:simpleType>
 
diff --git a/TAO/CIAO/docs/schema/cdd.xsd b/TAO/CIAO/docs/schema/cdd.xsd
index 301ab1f4d9e..711ec8d4e0a 100644
--- a/TAO/CIAO/docs/schema/cdd.xsd
+++ b/TAO/CIAO/docs/schema/cdd.xsd
@@ -43,7 +43,7 @@
       <xsd:element name="label" type="xsd:string" minOccurs="0" />
       <xsd:element name="connection" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
     </xsd:sequence>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index 4fa69acd3fe..d3641992b34 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -13,6 +13,11 @@
     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />     
     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
+    
+    <!-- CIAO Specific Extension    
+    <xsd:element name="es" type="Deployment:EventServiceDeploymentDescription" 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"/>
diff --git a/TAO/CIAO/docs/schema/xsc-banner.h b/TAO/CIAO/docs/schema/xsc-banner.h
index 0bccbd262ca..9f433e2a68a 100644
--- a/TAO/CIAO/docs/schema/xsc-banner.h
+++ b/TAO/CIAO/docs/schema/xsc-banner.h
@@ -3,20 +3,16 @@
  *
  * 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>
  */
 
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
 # include <string.h>
 #endif
 
-#include "Config_Handlers_Export.h"
+#include "XSC_XML_Handlers_Export.h"
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 014838a3b5a..a07e199285d 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Distributor"
 
-project(Stock_Base_Distributor_stub): ciao_client_dnc {
+project(Stock_Base_Distributor_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Distributor_stub
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export -Wb,stub_export_include=Distributor_stub_export.h -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export -Wb,skel_export_include=Distributor_svnt_export.h
@@ -22,7 +23,7 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
   after += Stock_Base_svnt Stock_Base_Distributor_stub
   sharedname  = Distributor_svnt
   libs    += Distributor_stub Stock_Base_stub Stock_Base_svnt
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h
   dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL
 
@@ -46,16 +47,16 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc {
   after   += Stock_Base_Distributor_svnt
   sharedname = Distributor_exec
   libs      += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h
   dynamicflags   = DISTRIBUTOR_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     Distributor_exec.cpp
   }
 }
@@ -73,4 +74,3 @@ project (Stock_Distributor) : ciao_client_dnc, valuetype{
     Distributor.cpp
   }
 }
-
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
index a107b070529..b038cdca509 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
@@ -5,6 +5,7 @@
 module Stock
 {
   exception Invalid_Stock {};
+  typedef sequence<octet> ImageBlob;
 
   /**
    * @struct StockInfo
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index b294d5db74e..f652394bee3 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Stock_Base"
 
-project(Stock_Base_stub): ciao_client_dnc {
+project(Stock_Base_stub): ciao_component_dnc {
 
   sharedname = Stock_Base_stub
   idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export -Wb,stub_export_include=Stock_Base_stub_export.h -Wb,skel_export_macro=STOCK_BASE_SVNT_Export -Wb,skel_export_include=Stock_Base_svnt_export.h
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
index 176cb624872..2944181e015 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
@@ -22,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createStockBrokerHome_Servant</string>
+          <string>create_Stock_StockBrokerHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
index bb253b468d7..7643089044f 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
@@ -22,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createStockDistributorHome_Servant</string>
+          <string>create_Stock_StockDistributorHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
index fb989627a2b..86f7c27b786 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
@@ -147,7 +147,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createStockDistributorHome_Servant</string>
+          <string>create_Stock_StockDistributorHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -190,7 +190,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createStockBrokerHome_Servant</string>
+          <string>create_Stock_StockBrokerHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 652dab2f7a3..26aa8a8b939 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -2,13 +2,14 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i BMClosedED"
 // This file has been manually modified to add a second component implementation.
 
-project(BMClosedED_DnC_stub): ciao_client_dnc {
+project(BMClosedED_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
 
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
   idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
 
   libs += BasicSP_stub
@@ -29,12 +30,12 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
 
   sharedname = BMClosedED_svnt
 
-  libs    += BMClosedED_stub BasicSP_stub 
+  libs    += BMClosedED_stub BasicSP_stub
   libs    += BasicSP_svnt
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export
   idlflags  += -Wb,export_include=BMClosedED_svnt_export.h
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
@@ -60,11 +61,11 @@ project(BMClosedED_DnC_exec) : ciao_component_dnc {
 
   sharedname = BMClosedED_exec
 
-  libs       += BMClosedED_stub BMClosedED_svnt 
+  libs       += BMClosedED_stub BMClosedED_svnt
   libs       += BasicSP_stub BasicSP_svnt
 
   libpaths   += ..
-  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export 
+  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export
   idlflags   += -Wb,export_include=BMClosedED_exec_export.h
 
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index ddf343d9277..12b3d28ea98 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -67,7 +67,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
                   str.in ()));
     }
 
-  if (ACE_OS::strcmp (str, "BM DEVICE DATA") == 0)
+  if (ACE_OS::strcmp (str.in (), "BM DEVICE DATA") == 0)
     {
       this->str_ = CORBA::string_dup ("BM CLOSED ED DATA");
     }
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index a58ba4a18fe..18c801c9c9a 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
-project(BMDevice_DnC_stub): ciao_client_dnc {
+project(BMDevice_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMDevice_stub
 
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 5a28ed1b783..6a516f426d3 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -1,17 +1,18 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
-project(BMDisplay_DnC_stub): ciao_client_dnc {
+project(BMDisplay_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = BMDisplay_stub
 
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
- 
+
   libs += BasicSP_stub
 
   IDL_Files {
@@ -32,7 +33,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,export_include=BMDisplay_svnt_export.h
 
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
@@ -58,12 +59,12 @@ project(BMDisplay_DnC_exec) : ciao_component_dnc {
 
   sharedname = BMDisplay_exec
 
-  libs      += BMDisplay_stub BMDisplay_svnt 
+  libs      += BMDisplay_stub BMDisplay_svnt
   libs      += BasicSP_stub BasicSP_svnt
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export
   idlflags  += -Wb,export_include=BMDisplay_exec_export.h
 
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
index 20f682a413b..fd1151988cf 100644
--- a/TAO/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_DnC_stub): ciao_client_dnc {
+project(BasicSP_DnC_stub): ciao_events_base_dnc {
 
   sharedname = BasicSP_stub
   idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index 2b0362f66ba..314f7c62be4 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -1,14 +1,15 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC"
 
-project(EC_DnC_stub): ciao_client_dnc {
+project(EC_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = EC_stub
 
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
-  idlflags += -Wb,stub_export_include=EC_stub_export.h 
-  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export
+  idlflags += -Wb,stub_export_include=EC_stub_export.h
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export
   idlflags += -Wb,skel_export_include=EC_svnt_export.h
 
   dynamicflags   = EC_STUB_BUILD_DLL
@@ -30,7 +31,7 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=EC_SVNT_Export 
+  idlflags  += -Wb,export_macro=EC_SVNT_Export
   idlflags  += -Wb,export_include=EC_svnt_export.h
 
   dynamicflags = EC_SVNT_BUILD_DLL
@@ -57,11 +58,11 @@ project(EC_DnC_exec) : ciao_component_dnc {
   after    += EC_DnC_svnt
   sharedname = EC_exec
 
-  libs     += EC_stub BasicSP_stub EC_svnt
+  libs     += EC_stub BasicSP_stub BasicSP_svnt EC_svnt
 
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags +=  -Wb,export_macro=EC_EXEC_Export
   idlflags += -Wb,export_include=EC_exec_export.h
 
   dynamicflags   = EC_EXEC_BUILD_DLL
@@ -93,7 +94,8 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype {
 }
 
 
-project (EC_DnC_controller) : ciao_client_dnc, valuetype {
+project (EC_DnC_controller) : ciao_events_dnc, valuetype {
+  avoids += ace_for_tao
   exename = controller
   after += EC_DnC_stub
   libs += EC_stub BasicSP_stub
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC_exec.h b/TAO/CIAO/examples/BasicSP/EC/EC_exec.h
index 057f8f70f14..db95a5deaa4 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC_exec.h
+++ b/TAO/CIAO/examples/BasicSP/EC/EC_exec.h
@@ -62,7 +62,7 @@ namespace MyImpl
     int done_;
 
     /// The timer id we are waiting.
-    int tid_;
+    long tid_;
 
     EC_exec_i *pulse_callback_;
 
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad b/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad
index cb27b660286..dd086ff5f23 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad
+++ b/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad
@@ -22,7 +22,7 @@
         <kind>tk_string</kind>
       </type>
       <value>
-        <string>createBMClosedEDHome_Servant</string>
+        <string>create_BasicSP_BMClosedEDHome_Servant</string>
       </value>
     </value>
   </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/GPS_Svnt.iad b/TAO/CIAO/examples/BasicSP/descriptors/GPS_Svnt.iad
index a087459cc84..3f4f592cf3f 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/GPS_Svnt.iad
+++ b/TAO/CIAO/examples/BasicSP/descriptors/GPS_Svnt.iad
@@ -22,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createBMDeviceHome_Servant</string>
+          <string>create_BasicSP_BMDeviceHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/NavDisplay_Svnt.iad b/TAO/CIAO/examples/BasicSP/descriptors/NavDisplay_Svnt.iad
index 05acef61d72..c6b0e7a34ea 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/NavDisplay_Svnt.iad
+++ b/TAO/CIAO/examples/BasicSP/descriptors/NavDisplay_Svnt.iad
@@ -22,7 +22,7 @@
         <kind>tk_string</kind>
       </type>
       <value>
-        <string>createBMDisplayHome_Servant</string>
+        <string>create_BasicSP_BMDisplayHome_Servant</string>
       </value>
     </value>
   </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/Timer_Svnt.iad b/TAO/CIAO/examples/BasicSP/descriptors/Timer_Svnt.iad
index f870112f143..0082291e27f 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/Timer_Svnt.iad
+++ b/TAO/CIAO/examples/BasicSP/descriptors/Timer_Svnt.iad
@@ -22,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createECHome_Servant</string>
+          <string>create_BasicSP_ECHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
index 03f5d22d057..d3aa1197327 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
@@ -263,7 +263,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createBMClosedEDHome_Servant</string>
+          <string>create_BasicSP_BMClosedEDHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -318,7 +318,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createBMDeviceHome_Servant</string>
+          <string>create_BasicSP_BMDeviceHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -356,7 +356,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createBMDisplayHome_Servant</string>
+          <string>create_BasicSP_BMDisplayHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -393,7 +393,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createECHome_Servant</string>
+          <string>create_BasicSP_ECHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index 9722a2747b9..5d60b1dc6d0 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -1,14 +1,15 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay GPS"
 
-project(GPS_DnC_stub): ciao_client_dnc {
+project(GPS_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = GPS_DnC_stub
   idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
   libpaths+=..
   libs += HUDisplay_DnC_stub
   dynamicflags   = GPS_STUB_BUILD_DLL
-  
+
   IDL_Files {
     GPS.idl
   }
@@ -55,12 +56,9 @@ project(GPS_DnC_exec) : ciao_component_dnc {
   }
 
   Source_Files {
-    
+
     GPSEIC.cpp
 
     GPS_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc
index 29016a5c4d6..41e3dbc1ab1 100644
--- a/TAO/CIAO/examples/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/Display/HUDisplay.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(HUDisplay_DnC_stub): ciao_client_dnc {
-  
+project(HUDisplay_DnC_stub): ciao_events_base_dnc {
+
   sharedname = HUDisplay_DnC_stub
   idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
   dynamicflags   = HUDISPLAY_STUB_BUILD_DLL
@@ -19,20 +19,20 @@ project(HUDisplay_DnC_stub): ciao_client_dnc {
 project(HUDisplay_DnC_svnt) : ciao_servant_dnc {
   after +=  HUDisplay_DnC_stub
   sharedname  = HUDisplay_DnC_svnt
-  libs    += HUDisplay_DnC_stub 
-  
+  libs    += HUDisplay_DnC_stub
+
   //idlflags  +=  -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h
-  
+
   idlflags  += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
-  
+
   dynamicflags = HUDISPLAY_SVNT_BUILD_DLL
 
-  
+
 
   Source_Files {
-    
+
     HUDisplayS.cpp
-    
+
   }
 }
 
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 5aeaaa0ef8a..e4edcc630c5 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay NavDisplay"
 
-project(NavDisplay_DnC_stub): ciao_client_dnc {
+project(NavDisplay_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = NavDisplay_DnC_stub
   idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h
@@ -20,7 +21,7 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
   after += HUDisplay_DnC_svnt NavDisplay_DnC_stub
   sharedname  = NavDisplay_DnC_svnt
   libs    += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
-  
+
   idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
@@ -57,6 +58,3 @@ project(NavDisplay_DnC_exec) : ciao_component_dnc {
     NavDisplay_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 7a5a4e78902..5c12e09bb09 100644
--- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_DnC_exec) : ciao_component_dnc, qt {
+project(NavDisplayGUI_DnC_exec) : ciao_events_base_dnc, qt {
   after   += NavDisplay_DnC_exec
   requires += qt
   sharedname = NavDisplayGUI_DnC_exec
diff --git a/TAO/CIAO/examples/Display/README.html b/TAO/CIAO/examples/Display/README.html
index 3475a97dc33..3f6958893db 100644
--- a/TAO/CIAO/examples/Display/README.html
+++ b/TAO/CIAO/examples/Display/README.html
@@ -11,11 +11,11 @@
 
 <h2>Example Description</h2>
 
-<font face="Times New Roman" size="4">This example is an imaginary car (software) instrument assembly which updates the display of current coordination of the airplane periodically.  It consists of 3 components as shown above:
-</font>
-<p align="center"><img src="Display1.gif" border="0" height="268" width="652"></p>
-<p>Each of these components are placed in its own directory and works as 
-follows:</p><ul>
+<font face="Times New Roman" size="4">This example is an imaginary car
+(software) instrument assembly which updates the display of
+current coordination of the airplane periodically.  It consists of
+the following three components:
+<ul>
   <li>The <font face="Courier New">RateGen</font> component sends periodic
   <font face="Courier New">Pulse</font> events to consumers according to the
   rate specified in its attribute <font face="Courier New">Rate</font>, it
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index d063453a020..71bdfe9297f 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay RateGen"
 
-project(RateGen_DnC_stub): ciao_client_dnc {
+project(RateGen_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = RateGen_DnC_stub
   idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
@@ -73,6 +74,3 @@ project(RateGen_DnC_exec) : ciao_component_dnc {
       controller.cpp
         }
 }
-					
-
-
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h
index 8122b1cceda..b6b8031c3bf 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h
@@ -61,7 +61,7 @@ namespace MyImpl
     int done_;
 
     /// The timer id we are waiting.
-    int tid_;
+    long tid_;
 
     RateGen_exec_i *pulse_callback_;
 
diff --git a/TAO/CIAO/examples/Display/descriptors/EM.ior b/TAO/CIAO/examples/Display/descriptors/EM.ior
deleted file mode 100644
index e177e5d5062..00000000000
--- a/TAO/CIAO/examples/Display/descriptors/EM.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:010000002400000049444c3a4349414f2f457865637574696f6e4d616e616765724461656d6f6e3a312e3000010000000000000078000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000c89f00001b00000014010f00525354ca168142626304000000000001000000010000000002000000000000000800000001000000004f415401000000140000000176e9b601000100000000000901010000000000
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Display/descriptors/GPS.ior b/TAO/CIAO/examples/Display/descriptors/GPS.ior
deleted file mode 100644
index d5469764621..00000000000
--- a/TAO/CIAO/examples/Display/descriptors/GPS.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:010000001600000049444c3a4855446973706c61792f4750533a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
deleted file mode 100644
index 9dc8184f9a9..00000000000
--- a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e456475000038b100002300000014010f004e535400fa7842a820000001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
deleted file mode 100644
index 0eefd174095..00000000000
--- a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Display/descriptors/RateGen.ior b/TAO/CIAO/examples/Display/descriptors/RateGen.ior
deleted file mode 100644
index 60326a12b43..00000000000
--- a/TAO/CIAO/examples/Display/descriptors/RateGen.ior
+++ /dev/null
@@ -1 +0,0 @@
-IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
index 2cd4a44cf3f..18b300932ee 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
@@ -14,6 +14,7 @@ module Hello
 
   eventtype TimeOut
   {
+    public string data;
   };
 };
 
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index b5c00fea2c8..e637d031bd9 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_stub): ciao_client_dnc {
-  
+project(Hello_Base_DnC_stub): ciao_events_base_dnc {
+
   sharedname = Hello_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Hello_BaseC.cpp
   }
-  
+
   Header_Files {
     Hello_BaseC.h
   }
-  
+
   Inline_Files {
     Hello_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
 project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_stub
   sharedname  = Hello_Base_DnC_svnt
-  libs    += Hello_Base_DnC_stub 
-  
+  libs    += Hello_Base_DnC_stub
+
   idlflags  += -Sc \
                -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
                -Wb,stub_export_include=Hello_Base_stub_export.h \
                -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \
                -Wb,skel_export_include=Hello_Base_svnt_export.h
-  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL 
+  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Hello_Base.idl
@@ -47,11 +47,11 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Hello_BaseS.cpp
   }
-  
+
   Header_Files {
     Hello_BaseS.h
   }
-  
+
   Inline_Files {
     Hello_BaseS.inl
   }
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index 5aa0c89e176..3694a180d18 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
+project(Hello_Base_Receiver_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Receiver_DnC_stub
   idlflags += -Sc \
@@ -19,11 +20,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-  
+
   Header_Files {
     ReceiverC.h
   }
-  
+
   Inline_Files {
     ReceiverC.inl
   }
@@ -36,7 +37,7 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
   libs    += Receiver_DnC_stub \
              Hello_Base_DnC_stub \
              Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
@@ -76,7 +77,7 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
                Receiver_DnC_svnt \
                Hello_Base_DnC_stub \
                Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
@@ -88,10 +89,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 45b4dd2db78..9a903b00ee1 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
+project(Hello_Base_Sender_DnC_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Sender_DnC_stub
   idlflags += -Sc \
@@ -19,11 +20,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-  
+
   Header_Files {
     SenderC.h
   }
-  
+
   Inline_Files {
     SenderC.inl
   }
@@ -55,13 +56,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-  
+
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-  
+
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -87,7 +88,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-  
+
   Header_Files {
     Sender_exec.h
   }
@@ -104,10 +105,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
   Source_Files {
     starter.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 76245c1a4de..7e7e889ca8d 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -28,7 +28,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return CORBA::string_dup (message_);
+    return CORBA::string_dup (message_.in ());
   }
 
   void
@@ -69,7 +69,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "Sender_exec.i::get_push_message called\n "));
     return ( new Message_Impl (*this) );
   }
@@ -82,30 +82,30 @@ namespace CIDL_Sender_Impl
     ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
     this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     ACE_DEBUG ((LM_DEBUG, "My current color is:"));
-    
+
     switch (this->color_)
       {
       case ::Hello::empty:
         ACE_DEBUG ((LM_DEBUG, "ERROR: Enum attribute initialization failed.\n"));
         break;
-        
+
       case ::Hello::white:
         ACE_DEBUG ((LM_DEBUG, "white\n"));
         break;
-        
+
       case ::Hello::red:
         ACE_DEBUG ((LM_DEBUG, "red\n"));
         break;
-        
+
       case ::Hello::yellow:
         ACE_DEBUG ((LM_DEBUG, "yellow\n"));
         break;
-        
+
       default:
         ACE_DEBUG ((LM_DEBUG, "Unknown color!\n"));
-        
+
       }
   }
 
@@ -184,7 +184,7 @@ namespace CIDL_Sender_Impl
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating SenderHome \n")); 
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating SenderHome \n"));
     return new Sender_exec_i;
   }
 
diff --git a/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat b/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
index 7221318ce42..fe88523971e 100644
--- a/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
+++ b/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
@@ -1,2 +1,2 @@
-SenderNode      corbaloc:iiop:localhost:30000/NodeManager
-ReceiverNode    corbaloc:iiop:localhost:40000/NodeManager
+SenderNode      corbaloc:iiop:localhost:60001/NodeManager
+ReceiverNode    corbaloc:iiop:localhost:60002/NodeManager
diff --git a/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad b/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad
index 2bb0e867ddf..54f024360c7 100644
--- a/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad
+++ b/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad
@@ -22,7 +22,7 @@
         <kind>tk_string</kind>
       </type>
       <value>
-        <string>createReceiverHome_Servant</string>
+        <string>create_Hello_ReceiverHome_Servant</string>
       </value>
     </value>
   </execParameter>
diff --git a/TAO/CIAO/examples/Hello/descriptors/Sender_Svnt.iad b/TAO/CIAO/examples/Hello/descriptors/Sender_Svnt.iad
index 8fec927ebad..8a9d128e50d 100644
--- a/TAO/CIAO/examples/Hello/descriptors/Sender_Svnt.iad
+++ b/TAO/CIAO/examples/Hello/descriptors/Sender_Svnt.iad
@@ -22,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createSenderHome_Servant</string>
+          <string>create_Hello_SenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat b/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat
deleted file mode 100644
index d3e2c75a243..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-SenderNode      corbaloc:iiop:localhost:60001/NodeManager
-ReceiverNode    corbaloc:iiop:localhost:60002/NodeManager
-
diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
index 6d54602b33c..7192a2bc061 100644
--- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
@@ -96,6 +96,26 @@
         </value>
       </value> 
     </configProperty>
+    <!-- This attribute initializes an enumerated value -->
+    <configProperty>
+      <name>color</name>
+      <value>
+        <type>
+          <kind>tk_enum</kind>
+          <enum>
+            <name>COLOR_SELECTION</name>
+            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+            <member>empty</member>
+            <member>white</member>
+            <member>red</member>
+            <member>yellow</member>
+          </enum>
+        </type>
+        <value>
+          <enum>yellow</enum>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance id="Hello-Receiver-idd">
@@ -176,7 +196,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createSenderHome_Servant</string>
+          <string>create_Hello_SenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -212,7 +232,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createReceiverHome_Servant</string>
+          <string>create_Hello_ReceiverHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
index 93ea095a6e5..8b42fa056ef 100644
--- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
@@ -120,7 +120,7 @@
 
 
   <connection>
-    <name>hell_event_connection</name>
+    <name>hello_event_connection</name>
     <internalEndpoint>
       <portName>click_out</portName>
       <kind>EventPublisher</kind>
@@ -178,7 +178,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createSenderHome_Servant</string>
+          <string>create_Hello_SenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -214,7 +214,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createReceiverHome_Servant</string>
+          <string>create_Hello_ReceiverHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Hello/descriptors/rt-config-example.cdp b/TAO/CIAO/examples/Hello/descriptors/rt-config-example.cdp
deleted file mode 100644
index 962a24062a8..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors/rt-config-example.cdp
+++ /dev/null
@@ -1,215 +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 Modified_Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-
-  <UUID>Hello_Plan_UUID_0001</UUID>
-
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType/>
-    <supportedType>IDL:Hello/Sender:1.0</supportedType>
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source/>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source/>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation>Hello-Sender-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value>
-    </configProperty>
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>CIAO:PolicySet</requirementName>
-      <resourceName>test_policy_set_id</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>test_server_resource_id</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>hell_event_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>EventPublisher</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <kind>EventConsumer</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>hello_facet_connection</name>
-    <internalEndpoint>
-      <portName>push_message</portName>
-      <kind>Facet</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <infoProperty>
-    <name>CIAOServerResources</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>rt-config-example.csr</string>
-      </value>
-    </value>
-  </infoProperty>
-
-</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors/rt-config-example.csr b/TAO/CIAO/examples/Hello/descriptors/rt-config-example.csr
deleted file mode 100644
index a3881225930..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors/rt-config-example.csr
+++ /dev/null
@@ -1,70 +0,0 @@
-
-<CIAO:ServerResources
- xmlns:CIAO="http://www.dre.vanderbilt.edu/ServerResources"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd">
-  
-  <cmdline>
-    <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg>
-  </cmdline>
-  
-  <svcconf>
-    <uri>
-      svcconf.uri
-    </uri>
-  </svcconf>
-  
-  <orbConfigs>
-    <resources>
-      <threadpool id="threadpool-1">
-        <stacksize>100</stacksize>
-        <static_threads>50</static_threads>
-        <dynamic_threads>25</dynamic_threads>
-        <default_priority>5</default_priority>
-        <allow_request_buffering>true</allow_request_buffering>
-        <max_buffered_requests>10</max_buffered_requests>
-        <max_request_buffered_size>20</max_request_buffered_size>
-      </threadpool>
-      
-      <threadpoolWithLanes id="threadpool-2">
-        <threadpoolLane>
-          <static_threads>50</static_threads>
-          <dynamic_threads>25</dynamic_threads>
-          <priority>36</priority>
-        </threadpoolLane>
-        <stacksize>100</stacksize>
-        <allow_borrowing>true</allow_borrowing>
-        <allow_request_buffering>true</allow_request_buffering>
-        <max_buffered_requests>10</max_buffered_requests>
-        <max_request_buffered_size>20</max_request_buffered_size>
-      </threadpoolWithLanes>
-      
-      <connectionBands id="cb-1">
-        <band>
-          <low>0</low>
-          <high>10</high>
-        </band>
-        <band>
-          <low>11</low>
-          <high>20</high>
-        </band>
-      </connectionBands>
-    </resources>
-    
-    <policySet id="test_policy_set_id">
-      <priorityModel server_priority="10">
-        <priority_model>SERVER_DECLARED</priority_model>
-      </priorityModel>
-      <priorityModel>
-        <priority_model>CLIENT_PROPAGATED</priority_model>
-      </priorityModel>
-      
-      <threadpool>threadpool-1</threadpool>
-      <threadpool>threadpool-2</threadpool>
-      
-      <priorityBandedConnection>cb-1</priorityBandedConnection>
-      
-    </policySet>
-  </orbConfigs>
-</CIAO:ServerResources>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
index 0192d11c2b7..82d96898de5 100644
--- a/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
@@ -29,10 +29,10 @@ unlink $iorfile2;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
 $SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
-                             "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
-                             "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV1->Spawn ();
 $SV2->Spawn ();
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test.pl b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
index 90b5f69f4a4..cfb0e0e9e49 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
@@ -18,7 +18,7 @@ $daemons = 2;
 @ports = ( 60001, 60002 );
 @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
 $status = 0;
-$dat_file = "TestNodeManagerMap.dat";
+$dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
@@ -74,7 +74,7 @@ sub run_node_daemons {
       $node_app = "$DAnCE/NodeApplication/NodeApplication";
 
       $d_cmd = "$DAnCE/NodeManager/NodeManager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
       $result = $Daemons[$i]->Spawn ();
@@ -98,7 +98,7 @@ delete_ior_files ();
 
 # Invoke naming service
 
-$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -o $nsior");
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
 
 $NS->Spawn ();
 
@@ -111,6 +111,9 @@ if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
     exit 1;
 }
 
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
 # Invoke node daemons.
 print "Invoking node daemons\n";
 $status = run_node_daemons ();
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 1649cb0595f..c0659c4299f 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -16,7 +16,7 @@ $daemons = 2;
 @ports = ( 60001, 60002 );
 @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
 $status = 0;
-$dat_file = "TestNodeManagerMap.dat";
+$dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
@@ -61,7 +61,7 @@ sub run_node_daemons {
       $node_app = "$DAnCE/NodeApplication/NodeApplication";
 
       $d_cmd = "$DAnCE/NodeManager/NodeManager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
       $result = $Daemons[$i]->Spawn ();
diff --git a/TAO/CIAO/examples/Hello/step-by-step.html b/TAO/CIAO/examples/Hello/step-by-step.html
index c0fc607c4cd..cb73707d0b7 100644
--- a/TAO/CIAO/examples/Hello/step-by-step.html
+++ b/TAO/CIAO/examples/Hello/step-by-step.html
@@ -147,8 +147,8 @@ Note: Creating the deployment plan descriptor is a tedious and
 </UL>
 
 <hr>
-<h3>Run</h3>
-Finally you are ready to test the application you have made.
+<h3>Deploy with <A href="../../docs/releasenotes/dance.html">DAnCE</A></h3>
+Finally you are ready to deploy the component-based application you have developed.
 <br><br>
 
 <UL>
@@ -190,6 +190,12 @@ Finally you are ready to test the application you have made.
 </UL>
 
 <hr>
+<h3>More Features</h3>
+Recently DAnCE is enabled with a feature called <em>Redeployment and Reconfiguration</em> (ReDaC). For more information
+about how to use this feature, please refer to the ReDaC-Usage-Example.html under $CIAO_ROOT/examples/Hello/.
+<br><br>
+
+<hr>
 <b>Email: </b><a href="mailto:"</a<ADDRESS>ciao-users@cse.wustl.edu</ADDRESS>
 </body>
 </html>
diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
index 22c0598f8a7..ba9357c2fd8 100644
--- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
-  
+project(Hello_Base_DnC_Upgradeable_stub): ciao_events_base_dnc {
+
   sharedname = Hello_Base_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
   dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
 project(Hello_Base_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_Upgradeable_stub
   sharedname  = Hello_Base_DnC_Upgradeable_svnt
-  libs    += Hello_Base_DnC_Upgradeable_stub 
-  
+  libs    += Hello_Base_DnC_Upgradeable_stub
+
   idlflags  += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
   dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 6dfd8271a73..d8676fff50c 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(Hello_Base_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
+project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Receiver_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
@@ -17,11 +18,11 @@ project(Hello_Base_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
   }
 }
 
-project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
-  after += Hello_Base_DnC_Upgradeable_svnt Hello_Base_Receiver_DnC_Upgradeable_stub
+project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
+  after += Hello_Base_DnC_Upgradeable_svnt HelloB_Receiver_DnC_Upgradeable_stub
   sharedname  = Receiver_DnC_Upgradeable_svnt
   libs    += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
   cidlflags -= --
@@ -43,11 +44,11 @@ project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
 }
 
 
-project(Hello_Base_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
-  after   += Hello_Base_Receiver_DnC_Upgradeable_svnt
+project(HelloB_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
+  after   += HelloB_Receiver_DnC_Upgradeable_svnt
   sharedname = Receiver_DnC_Upgradeable_exec
   libs      += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index 1d0e5662b0b..4539e7d5b56 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -1,7 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(Hello_Base_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
+project(HelloB_Sender_DnC_Upgradeable_stub): ciao_events_base_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Sender_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
@@ -18,9 +19,9 @@ project(Hello_Base_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
   }
 }
 
-project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
+project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after += Hello_Base_DnC_Upgradeable_svnt \
-           Hello_Base_Sender_DnC_Upgradeable_stub
+           HelloB_Sender_DnC_Upgradeable_stub
   sharedname  = Sender_DnC_Upgradeable_svnt
   libs    += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub \
              Hello_Base_DnC_Upgradeable_svnt
@@ -35,7 +36,7 @@ project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   }
 
   IDL_Files {
-    SenderE.idl
+    SenderE.idl << SenderE.idl
   }
 
   Source_Files {
@@ -45,8 +46,8 @@ project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   }
 }
 
-project(Hello_Base_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
-  after   += Hello_Base_Sender_DnC_Upgradeable_svnt
+project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
+  after   += HelloB_Sender_DnC_Upgradeable_svnt
   sharedname = Sender_DnC_Upgradeable_exec
   libs      += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
 
@@ -61,9 +62,9 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
   }
 }
 
-project(Hello_Base_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
-  after   += Hello_Base_Sender_DnC_Upgradeable_svnt \
-             Hello_Base_Sender_DnC_Upgradeable_exec
+project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
+  after   += HelloB_Sender_DnC_Upgradeable_svnt \
+             HelloB_Sender_DnC_Upgradeable_exec
   sharedname = Sender_DnC_Upgradeable_exec_1
   libs      += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt \
                Sender_DnC_Upgradeable_exec Hello_Base_DnC_Upgradeable_stub \
@@ -81,9 +82,9 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
   }
 }
 
-project(Hello_Base_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
-  after   += Hello_Base_Sender_DnC_Upgradeable_svnt \
-             Hello_Base_Sender_DnC_Upgradeable_exec
+project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
+  after   += HelloB_Sender_DnC_Upgradeable_svnt \
+             HelloB_Sender_DnC_Upgradeable_exec
   sharedname = Sender_DnC_Upgradeable_exec_2
   libs      += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt \
                Sender_DnC_Upgradeable_exec Hello_Base_DnC_Upgradeable_stub \
@@ -103,7 +104,7 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
 
 project (Hello_DnC_Upgradeable_Starter) : ciao_client_dnc, valuetype{
   exename = Upgradeable_starter
-  after += Hello_Base_Sender_DnC_Upgradeable_stub
+  after += HelloB_Sender_DnC_Upgradeable_stub
   libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Swapping/Sender/Sender_exec.cpp
index 7825b0c2238..8bd256ea90c 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender_exec.cpp
@@ -33,7 +33,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return CORBA::string_dup(message_);
+    return CORBA::string_dup(message_. in());
   }
 
   Hello::CCM_ReadMessage_ptr
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp b/TAO/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
index 33900d43382..e2e976424a7 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
@@ -30,7 +30,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_1_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return CORBA::string_dup(message_);
+    return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
@@ -113,7 +113,7 @@ namespace CIDL_Sender_Impl
       this->context_->get_registered_consumers ("click_out"
         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     this->base_exec_->consumers (retval._retn ());
 
     CORBA::Object_var o =
@@ -131,7 +131,7 @@ namespace CIDL_Sender_Impl
 
     const CORBA::ULong facet_len = facets->length ();
       CORBA::ULong i = 0;
-      
+
       for (i = 0; i < facet_len; ++i)
       {
         this->context_->remove_facet (facets[i]->facet_ref ()
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp b/TAO/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
index a57cb4b9049..a4c8fe46308 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
@@ -29,7 +29,7 @@ namespace CIDL_Sender_Impl
   Sender_exec_2_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return CORBA::string_dup(message_);
+    return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index cd4ecb031fc..32f12acaa2e 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -15,20 +15,22 @@ project(Benchmark_stub): ciao_client_dnc {
   }
 }
 
-project(Benchmark_svnt) : ciao_server_dnc {
+project(Benchmark_svnt) : ciao_component_dnc {
   after +=  Benchmark_stub
   sharedname = Benchmark_svnt
   libs    += Benchmark_stub
 
   idlflags  +=  -Wb,export_macro=BENCHMARK_SVNT_Export -Wb,export_include=Benchmark_svnt_export.h
   dynamicflags = BENCHMARK_SVNT_BUILD_DLL
+  IDL_Files {
+  }
 
   Source_Files {
     BenchmarkS.cpp
   }
 }
 
-project (*server) : taoserver, strategies,ciao_server_dnc {
+project (*server) : taoserver, strategies,ciao_component_dnc {
   after += Benchmark_svnt
   libs += Benchmark_svnt Benchmark_stub 
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h b/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h
index ad066166e6b..b4b73b1ae84 100644
--- a/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h
+++ b/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h
@@ -8,11 +8,6 @@
 
 #include "BenchmarkS.h"
 
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
 /// Implement the Test::LatencyTest interface
 class LatencyTest
 : public virtual POA_Benchmark::LatencyTest
@@ -31,13 +26,9 @@ class LatencyTest
 
  private:
   /// Use an ORB reference to conver strings to objects and shutdown
-    /// the application.
-    CORBA::ORB_var orb_;
+  /// the application.
+  CORBA::ORB_var orb_;
 };
 
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 #endif /* LATENCYTEST_H */
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 9a237b88bc0..793f486cbbf 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -56,7 +56,7 @@ project(RoundTrip_exec) : ciao_component_dnc {
   after += RoundTrip_svnt
   sharedname = RoundTrip_exec
 
-  libs     += RoundTrip_stub Benchmark_stub RoundTrip_svnt
+  libs     += RoundTrip_stub Benchmark_stub Benchmark_svnt RoundTrip_svnt
   libpaths += ..
 
   idlflags +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 41c67edcb2d..6ccc38cc06b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p Benchmark -i -c RoundTripClient"
 
 project(RoundTripClient_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Benchmark_stub
   sharedname = RoundTripClient_stub
 
@@ -24,6 +25,7 @@ project(RoundTripClient_stub): ciao_client_dnc {
 }
 
 project(RoundTripClient_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Benchmark_svnt RoundTripClient_stub
   sharedname  = RoundTripClient_svnt
   libs    += RoundTripClient_stub Benchmark_stub Benchmark_svnt
@@ -51,11 +53,12 @@ project(RoundTripClient_svnt) : ciao_servant_dnc {
 
 
 project(RoundTripClient_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after += RoundTripClient_svnt
 
   sharedname = RoundTripClient_exec
 
-  libs      += RoundTripClient_stub Benchmark_stub RoundTripClient_svnt
+  libs      += RoundTripClient_stub Benchmark_stub Benchmark_svnt RoundTripClient_svnt
 
   libpaths += ..
 
@@ -76,6 +79,7 @@ project(RoundTripClient_exec) : ciao_component_dnc {
 
 
 project (*client) : ciao_client_dnc {
+  avoids += ace_for_tao
   exename = client
   after += RoundTripClient_stub
   libs += RoundTripClient_stub Benchmark_stub
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
index 6d20d6872f8..35a3dbed71b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project (RoundTripServer) : strategies, ciao_server_dnc {
+project (RoundTripServer) : strategies, ciao_component_dnc {
   after += Benchmark_svnt
   libs    += Benchmark_stub Benchmark_svnt
   libpaths += ..
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index 2a6f2e404b6..ce70851188d 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project (perf*) : ciao_client_dnc, rtcorba, exceptions {
+  avoids += ace_for_tao
   after += Protocols_Sender_stub Protocols_Receiver_stub
   includes += ../Sender
   includes += ../Receiver
diff --git a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 5f83db6a1e0..1cbf85b801a 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
 project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
+  avoids += ace_for_tao
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
@@ -18,6 +19,7 @@ project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
 }
 
 project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
+  avoids += ace_for_tao
   after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
   libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
@@ -41,6 +43,7 @@ project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
 
 
 project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions {
+  avoids += ace_for_tao
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
   libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index ae6ba814b79..9382dd63289 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
 project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
+  avoids += ace_for_tao
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
@@ -18,6 +19,7 @@ project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
 }
 
 project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
+  avoids += ace_for_tao
   after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
   libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
@@ -41,6 +43,7 @@ project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
 
 
 project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions {
+  avoids += ace_for_tao
   after   += Protocols_Sender_svnt
   sharedname = Protocols_Sender_exec
   libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
diff --git a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 43caa154675..4c01677de0e 100644
--- a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_stub): ciao_client_dnc {
-  
+project(Protocols_stub): ciao_component_dnc {
+
   sharedname = Protocols_stub
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h
   dynamicflags   = PROTOCOLS_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Protocols_stub): ciao_client_dnc {
 project(Protocols_svnt) : ciao_servant_dnc {
   after +=  Protocols_stub
   sharedname  = Protocols_svnt
-  libs    += Protocols_stub 
-  
+  libs    += Protocols_stub
+
   idlflags  +=  -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h
   dynamicflags = PROTOCOLS_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/rules.ciao.GNU b/TAO/CIAO/rules.ciao.GNU
index 8c13c54fa2c..890aaa15778 100644
--- a/TAO/CIAO/rules.ciao.GNU
+++ b/TAO/CIAO/rules.ciao.GNU
@@ -16,14 +16,27 @@ ifndef CIAO_ROOT
   CIAO_ROOT = $(TAO_ROOT)/CIAO
 endif
 
+ifeq (,$(findstring -L$(CIAO_ROOT)/ciao,$(LDFLAGS)))
+  LDFLAGS += -L$(CIAO_ROOT)/ciao
+endif
+ifeq (,$(findstring -I$(CIAO_ROOT),$(INCLDIRS)))
+  INCLDIRS += -I$(CIAO_ROOT)
+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
 # with different minor or major or beta versions to fail.
 #
+ifeq (cmd,$(findstring cmd,$(SHELL)))
+CIAO_MAJOR_VERSION := $(shell awk "/CIAO_MAJOR_VERSION/ { print $$3}" ${CIAO_ROOT}/ciao/Version.h)
+CIAO_MINOR_VERSION := $(shell awk "/CIAO_MINOR_VERSION/ { print $$3}" ${CIAO_ROOT}/ciao/Version.h)
+CIAO_BETA_VERSION := $(shell awk "/CIAO_BETA_VERSION/ { print $$3}" ${CIAO_ROOT}/ciao/Version.h)
+else
 CIAO_MAJOR_VERSION := $(shell awk '/CIAO_MAJOR_VERSION/ { print $$3}' ${CIAO_ROOT}/ciao/Version.h)
 CIAO_MINOR_VERSION := $(shell awk '/CIAO_MINOR_VERSION/ { print $$3}' ${CIAO_ROOT}/ciao/Version.h)
 CIAO_BETA_VERSION := $(shell awk '/CIAO_BETA_VERSION/ { print $$3}' ${CIAO_ROOT}/ciao/Version.h)
+endif
 
 # Version number of the libraries
 #
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 41501f86b1e..d7202e70781 100644
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,7 +1,6 @@
 //$Id$
 
 project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
-  avoids += ace_for_tao
   after  += ENW_stub
   libpaths += ../interfaces
   libs     += ENW_stub
@@ -19,7 +18,6 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
 }
 
 project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
-  avoids += ace_for_tao
   after +=  TSEC_CheckPoint_stub
   after +=  ENW_svnt ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
@@ -47,7 +45,6 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 
 
 project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
-  avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
   after   += ENW_svnt ENW_stub
 
@@ -73,7 +70,6 @@ project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
 
 
 project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event {
-  avoids += ace_for_tao
   exename = controller
   after += TSEC_CheckPoint_stub
   libs += TSEC_CheckPoint_stub ENW_stub
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 0a3ffc979e3..faf1f9917b2 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CIDL_Basic_stub): ciao_client_dnc {
+project(CIDL_Basic_stub): ciao_component_dnc {
 
   sharedname = CIDL_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 1372ae82668..5613617d1af 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Attributes"
 
-project(Attributes_stub): ciao_client_dnc {
-  
+project(Attributes_stub): ciao_component_dnc {
+
   sharedname = Attributes_stub
   idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h
   dynamicflags   = ATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
index a1a90abe9a3..11d5d9e28d9 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSink"
 
-project(EventSink_stub): ciao_client_dnc {
-  
+project(EventSink_stub): ciao_component_dnc {
+
   sharedname = EventSink_stub
   idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h
   dynamicflags   = EVENTSINK_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
index e98d21e8a5a..1ef539cc479 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSource"
 
-project(EventSource_stub): ciao_client_dnc {
-  
+project(EventSource_stub): ciao_component_dnc {
+
   sharedname = EventSource_stub
   idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h
   dynamicflags   = EVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
index 1f1ba286b7d..70c54bba7b4 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Facets"
 
-project(Facets_stub): ciao_client_dnc {
-  
+project(Facets_stub): ciao_component_dnc {
+
   sharedname = Facets_stub
   idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h
   dynamicflags   = FACETS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
index 6ecfc50f438..53db53dee90 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Receptacles"
 
-project(Receptacles_stub): ciao_client_dnc {
-  
+project(Receptacles_stub): ciao_component_dnc {
+
   sharedname = Receptacles_stub
   idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h
   dynamicflags   = RECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
index da4084ee9f3..5737e7220e0 100644
--- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleComponent"
 
-project(SimpleComponent_stub): ciao_client_dnc {
-  
+project(SimpleComponent_stub): ciao_component_dnc {
+
   sharedname = SimpleComponent_stub
   idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export -Wb,stub_export_include=SimpleComponent_stub_export.h -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export -Wb,skel_export_include=SimpleComponent_svnt_export.h
   dynamicflags   = SIMPLECOMPONENT_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
index bffbdebb9df..b9ab054bae6 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Abstract"
 
-project(Abstract_stub): ciao_client_dnc {
-  
+project(Abstract_stub): ciao_component_dnc {
+
   sharedname = Abstract_stub
   idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h
   dynamicflags   = ABSTRACT_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index 81faf3a8e4f..a8f153cfb1d 100644
--- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Regular"
 
-project(Regular_stub): ciao_client_dnc {
-  
+project(Regular_stub): ciao_component_dnc {
+
   sharedname = Regular_stub
   idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
   dynamicflags   = REGULAR_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
index 413748705d0..931fa200079 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HomeAttributes"
 
-project(HomeAttributes_stub): ciao_client_dnc {
-  
+project(HomeAttributes_stub): ciao_component_dnc {
+
   sharedname = HomeAttributes_stub
   idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h
   dynamicflags   = HOMEATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index f364c13c293..8130df04024 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
-project(IDL3_Basic_stub): ciao_client_dnc {
-  
+project(IDL3_Basic_stub): ciao_component_dnc {
+
   sharedname = Homes_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
index 7ff6c2a75bc..aa13235daf0 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Factory"
 
-project(Factory_stub): ciao_client_dnc {
-  
+project(Factory_stub): ciao_component_dnc {
+
   sharedname = Factory_stub
   idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h
   dynamicflags   = FACTORY_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
index 0409af4d8ad..965043e4558 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Finder"
 
-project(Finder_stub): ciao_client_dnc {
-  
+project(Finder_stub): ciao_component_dnc {
+
   sharedname = Finder_stub
   idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h
   dynamicflags   = FINDER_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
index b8c27d5b42d..ef6226a3426 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Inheritance"
 
-project(Inheritance_stub): ciao_client_dnc {
-  
+project(Inheritance_stub): ciao_component_dnc {
+
   sharedname = Inheritance_stub
   idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h
   dynamicflags   = INHERITANCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
index 5759c52f43c..e83dabd8b0e 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICBasic"
 
-project(ICBasic_stub): ciao_client_dnc {
-  
+project(ICBasic_stub): ciao_component_dnc {
+
   sharedname = ICBasic_stub
   idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h
   dynamicflags   = ICBASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
index f3707d8bea2..5f7126ff4f4 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICEventSink"
 
-project(ICEventSink_stub): ciao_client_dnc {
-  
+project(ICEventSink_stub): ciao_component_dnc {
+
   sharedname = ICEventSink_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h
   dynamicflags   = ICEVENTSINK_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
index c86b9521ce4..103ba9123d6 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICEventSource"
 
-project(ICEventSource_stub): ciao_client_dnc {
-  
+project(ICEventSource_stub): ciao_component_dnc {
+
   sharedname = ICEventSource_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h
   dynamicflags   = ICEVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
index d47827f2a2d..4307a8bfb9c 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICReceptacles"
 
-project(ICReceptacles_stub): ciao_client_dnc {
-  
+project(ICReceptacles_stub): ciao_component_dnc {
+
   sharedname = ICReceptacles_stub
   idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h
   dynamicflags   = ICRECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
index 7c3478d0b2e..07c4820fce6 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Events"
 
-project(Events_stub): ciao_client_dnc {
-  
+project(Events_stub): ciao_component_dnc {
+
   sharedname = Events_stub
   idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h
   dynamicflags   = EVENTS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
index c81e215abfa..cd97e268c98 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Homes"
 
-project(Homes_stub): ciao_client_dnc {
-  
+project(Homes_stub): ciao_component_dnc {
+
   sharedname = Homes_stub
   idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h
   dynamicflags   = HOMES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index 9814f248c5a..f0c020b3169 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project(LookupTest_stub): ciao_client_dnc {
-  
+project(LookupTest_stub): ciao_component_dnc {
+
   sharedname = LookupTest_stub
   idlflags += -Sc
 
diff --git a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
index f4393115c4f..190b358d5c8 100644
--- a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
+++ b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Minimum_Base"
 
-project(Minimum_Base_DnC_stub): ciao_client_dnc {
-  
+project(Minimum_Base_DnC_stub): ciao_component_dnc {
+
   sharedname = Minimum_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Minimum_BaseC.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseC.h
   }
-  
+
   Inline_Files {
     Minimum_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
 project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Minimum_Base_DnC_stub
   sharedname  = Minimum_Base_DnC_svnt
-  libs    += Minimum_Base_DnC_stub 
-  
+  libs    += Minimum_Base_DnC_stub
+
   idlflags  += -Sc \
                -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
                -Wb,stub_export_include=Minimum_Base_stub_export.h \
                -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \
                -Wb,skel_export_include=Minimum_Base_svnt_export.h
-  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL 
+  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Minimum_Base.idl
@@ -47,11 +47,11 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Minimum_BaseS.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseS.h
   }
-  
+
   Inline_Files {
     Minimum_BaseS.inl
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 09d53d2afd5..204bd665a70 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -9,160 +9,157 @@ ACE_RCSID (DAnCE,
            ADD_Handler,
            "$Id$")
 
- 
 namespace CIAO
 {
   namespace Config_Handlers
   {
     IDREF_Base<CORBA::ULong> ADD_Handler::IDREF;
-    
-    void
-    ADD_Handler::artifact_deployment_descrs (
-        const DeploymentPlan &src,
-        ::Deployment::ArtifactDeploymentDescriptions &dest)
-    {
-      DeploymentPlan::artifact_const_iterator aci_e =
-        src.end_artifact ();
-      dest.length (src.count_artifact ());
-      CORBA::ULong pos = 0;
-      for (DeploymentPlan::artifact_const_iterator aci_b =
-             src.begin_artifact ();
-           aci_e != aci_b;
-           ++aci_b)
-        {
-          ADD_Handler::artifact_deployment_descr ((*aci_b),
-                                                  dest[pos],
-                                                  pos);
-	  pos++;
-        }
-    }
 
-    void
-    ADD_Handler::artifact_deployment_descr (
-        const ArtifactDeploymentDescription &src,
-        Deployment::ArtifactDeploymentDescription &dest,
-        CORBA::ULong pos)
-    {
-      dest.name = src.name ().c_str ();
-
-      dest.node = src.node ().c_str ();
-
-      ArtifactDeploymentDescription::location_const_iterator end =
-        src.end_location ();
-      
-      dest.location.length (src.count_location ());
-      CORBA::ULong len = 0;
-      for (ArtifactDeploymentDescription::location_const_iterator
-           start = src.begin_location ();
-           start != end;
-           ++start)
-        {
-          dest.location[len++] = start->c_str ();
-        }
-
-      ArtifactDeploymentDescription::source_const_iterator sce =
-        src.end_source ();
-      len = 0;
-      dest.source.length (src.count_source ());
-      for (ArtifactDeploymentDescription::source_const_iterator
-           scb = src.begin_source ();
-           scb != sce;
-           ++scb)
-        {
-          dest.source[len++] = scb->c_str ();
-        }
-
-      // @@TODO: See this loop is repeated
-      ArtifactDeploymentDescription::execParameter_const_iterator adce =
-        src.end_execParameter ();
-      len = 0;
-      dest.execParameter.length (src.count_execParameter ());
-      for (ArtifactDeploymentDescription::execParameter_const_iterator adcb =
-             src.begin_execParameter ();
-           adcb != adce;
-           ++adcb)
-        {
-          Property_Handler::get_property ((*adcb),
-                                          dest.execParameter[len++]);
-        }
-
-      if (src.id_p ())
-        {
-          ACE_CString cstr (src.id ().c_str ());
-          
-          ADD_Handler::IDREF.bind_ref (cstr,pos);
-	}
-      else
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) Warning: ADD %s has no idref.\n",
-                      src.name ().c_str ()));
-        }
+      void
+      ADD_Handler::artifact_deployment_descrs (
+                                               const DeploymentPlan &src,
+                                               ::Deployment::ArtifactDeploymentDescriptions &dest)
+      {
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs");
+        DeploymentPlan::artifact_const_iterator aci_e =
+          src.end_artifact ();
+        dest.length (src.count_artifact ());
+        CORBA::ULong pos = 0;
+        for (DeploymentPlan::artifact_const_iterator aci_b =
+               src.begin_artifact ();
+             aci_e != aci_b;
+             ++aci_b)
+          {
+            ADD_Handler::artifact_deployment_descr ((*aci_b),
+                                                    dest[pos],
+                                                    pos);
+            pos++;
+          }
+      }
+
+      void
+      ADD_Handler::artifact_deployment_descr (
+                                              const ArtifactDeploymentDescription &src,
+                                              Deployment::ArtifactDeploymentDescription &dest,
+                                              CORBA::ULong pos)
+      {
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descr");
+        dest.name = src.name ().c_str ();
+
+
+        dest.node = src.node ().c_str ();
+
+        ArtifactDeploymentDescription::location_const_iterator end =
+          src.end_location ();
+
+        dest.location.length (src.count_location ());
+        CORBA::ULong len = 0;
+        for (ArtifactDeploymentDescription::location_const_iterator
+               start = src.begin_location ();
+             start != end;
+             ++start)
+          {
+            dest.location[len++] = start->c_str ();
+          }
+
+        ArtifactDeploymentDescription::source_const_iterator sce =
+          src.end_source ();
+        len = 0;
+        dest.source.length (src.count_source ());
+        for (ArtifactDeploymentDescription::source_const_iterator
+               scb = src.begin_source ();
+             scb != sce;
+             ++scb)
+          {
+            dest.source[len++] = scb->c_str ();
+          }
+
+        // @@TODO: See this loop is repeated
+        ArtifactDeploymentDescription::execParameter_const_iterator adce =
+          src.end_execParameter ();
+        len = 0;
+        dest.execParameter.length (src.count_execParameter ());
+        for (ArtifactDeploymentDescription::execParameter_const_iterator adcb =
+               src.begin_execParameter ();
+             adcb != adce;
+             ++adcb)
+          {
+            Property_Handler::get_property ((*adcb),
+                                            dest.execParameter[len++]);
+          }
+
+        if (src.id_p ())
+          {
+            ACE_CString cstr (src.id ().c_str ());
+
+            ADD_Handler::IDREF.bind_ref (cstr,pos);
+          }
+        else
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "(%P|%t) Warning: ADD %s has no idref.\n",
+                        src.name ().c_str ()));
+          }
 
 #if 0
-      // @@ MAJO: Don't know how to handle this.
-      if (src.deployRequirement_p ())
-        {
-          Req_Handler handler;
-          add.deployRequirement.length (
-            add.deployRequirement.length () + 1);
-          handler.get_Requirement (
-            add.deployRequirement[add.deployRequirement.length () - 1],
-            src.deployRequirement ());
-        }
-
-      if (src.deployedResource_p ())
-        {
-          RDD_Handler handler;
-          add.deployedResource.length (
-            add.deployedResource.length () + 1);
-          handler.get_ResourceDeploymentDescription (
-            add.deployedResource[add.deployedResource.length () - 1],
-            src.deployedResource ());
-        }
+        // @@ MAJO: Don't know how to handle this.
+        if (src.deployRequirement_p ())
+          {
+            Req_Handler handler;
+            add.deployRequirement.length (
+                                          add.deployRequirement.length () + 1);
+            handler.get_Requirement (
+                                     add.deployRequirement[add.deployRequirement.length () - 1],
+                                     src.deployRequirement ());
+          }
+
+        if (src.deployedResource_p ())
+          {
+            RDD_Handler handler;
+            add.deployedResource.length (
+                                         add.deployedResource.length () + 1);
+            handler.get_ResourceDeploymentDescription (
+                                                       add.deployedResource[add.deployedResource.length () - 1],
+                                                       src.deployedResource ());
+          }
 #endif /* 0  */
-    }
-    
+      }
+
       ArtifactDeploymentDescription
       ADD_Handler::artifact_deployment_descr (
-	  const Deployment::ArtifactDeploymentDescription &src)
+                                              const Deployment::ArtifactDeploymentDescription &src)
       {
-	  //Get the name and node and store them in the add
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > node ((src.node));
-	  
-	  ArtifactDeploymentDescription add (name,node);
-
-	  //Get the location(s) and store it/them in the add
-	  size_t total = src.location.length ();
-	  for (size_t i = 0; i < total; ++i)
-	  {
-	      XMLSchema::string< char > curr ((src.location[i]));
-	      add.add_location (curr);
-	  }
-
-	  //As above, for the source(s)
-	  total = src.source.length ();
-	  for (size_t j = 0; j < total; ++j)
-	  {
-	      XMLSchema::string< char > curr ((src.source[j]));
-	      add.add_source (curr);
-	  }  
-
-	  //As above for the execParameter(s)
-	  total = src.execParameter.length ();
-	  for (size_t k = 0; k < total; ++k)
-	  {
-	      add.add_execParameter (
-		  Property_Handler::get_property (
-		      src.execParameter[k]));
-	  }
-        
-	  return add;       
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse");
+        //Get the name and node and store them in the add
+        XMLSchema::string< char > name ((src.name));
+        XMLSchema::string< char > node ((src.node));
+
+        ArtifactDeploymentDescription add (name,node);
+
+        //Get the location(s) and store it/them in the add
+        size_t total = src.location.length ();
+        for (size_t i = 0; i < total; ++i)
+          {
+            XMLSchema::string< char > curr ((src.location[i]));
+            add.add_location (curr);
+          }
+
+        //As above, for the source(s)
+        total = src.source.length ();
+        for (size_t j = 0; j < total; ++j)
+          {
+            XMLSchema::string< char > curr ((src.source[j]));
+            add.add_source (curr);
+          }
+
+        //As above for the execParameter(s)
+        total = src.execParameter.length ();
+        for (size_t k = 0; k < total; ++k)
+          {
+            add.add_execParameter (Property_Handler::get_property (src.execParameter[k]));
+          }
+
+        return add;
+      }
     }
-
-    
-
   }
-
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
index 6ac3d36f194..0db82b30fb2 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ADD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ADD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ADD_Handler_H
@@ -23,50 +23,50 @@
 
 namespace Deployment
 {
-  struct ArtifactDeploymentDescription;
-  class ArtifactDeploymentDescriptions;
+struct ArtifactDeploymentDescription;
+class ArtifactDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class ArtifactDeploymentDescription;
+namespace Config_Handlers
+{
+class DeploymentPlan;
+class ArtifactDeploymentDescription;
+
+/*
+* @class ADD_Handler
+*
+* @brief Handler class for <ArtifactDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* ArtifactDeploymentDescription objects, parsed from the
+*       // @@ Jules, why Any type?
+* descriptor files, to the  corresponding CORBA IDL Any type.
+*/
+class Config_Handlers_Export ADD_Handler
+{
+public:
+static void artifact_deployment_descrs (
+const DeploymentPlan &src,
+::Deployment::ArtifactDeploymentDescriptions &dest);
 
-    /*
-    * @class ADD_Handler
-    *
-    * @brief Handler class for <ArtifactDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from XSC
-    * ArtifactDeploymentDescription objects, parsed from the
-    *       // @@ Jules, why Any type?
-    * descriptor files, to the  corresponding CORBA IDL Any type.
-    */
-    class Config_Handlers_Export ADD_Handler
-    {
-    public:
-      static void artifact_deployment_descrs (
-          const DeploymentPlan &src,
-          ::Deployment::ArtifactDeploymentDescriptions &dest);
+static ArtifactDeploymentDescription
+artifact_deployment_descr (
+const Deployment::ArtifactDeploymentDescription &src);
 
-      static ArtifactDeploymentDescription
-	  artifact_deployment_descr (
-	      const Deployment::ArtifactDeploymentDescription &src);
+///  The IDREF Table associated with this class
+static IDREF_Base<CORBA::ULong> IDREF;
 
-      ///  The IDREF Table associated with this class
-      static IDREF_Base<CORBA::ULong> IDREF;
-      
-    private:
-      static void artifact_deployment_descr (
-          const ArtifactDeploymentDescription& desc,
-          ::Deployment::ArtifactDeploymentDescription &dest,
-          CORBA::ULong l = 0);
-    };
-  }
+private:
+static void artifact_deployment_descr (
+const ArtifactDeploymentDescription& desc,
+::Deployment::ArtifactDeploymentDescription &dest,
+CORBA::ULong l = 0);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
index e14838e9a9a..535d5a88d8a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-
+#include "ciao/CIAO_common.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 namespace CIAO
@@ -27,24 +27,20 @@ namespace CIAO
                                    CORBA::Any& toconfig)
 
     {
+      CIAO_TRACE("Any_Handler::extract_into_any");
       DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
-                                                 desc.value ());
-      
+                                                                        desc.value ());
+
       toconfig = *dyn->to_any ();
-      
+
       dyn->destroy ();
     }
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
     {
-      //MAJO
-      //@Bala ... still haven't figured this one out yet
-      //I was saving it for last...going from corba::any
-      //to xsc DataValue
-      DataType type = DataType_Handler::data_type (src.type ());
-      DataValue value;
-      Any any (type,value);
-      return any;
+      CIAO_TRACE("Any_Handler::extract_into_any - reverse");
+
+      return DYNANY_HANDLER->extract_from_dynany (src);
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
index 8317c41422f..e7086f6ec2c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  Any_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Any_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ANY_HANDLER_H
@@ -18,39 +18,43 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
-  class Any;
+class Any;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Any;
-
-   /*
-    * @class Any_Handler
-    *
-    * @brief Handler class for <ComponentInterfaceDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC Any objects, parsed from the descriptor files, to the
-    * corresponding CORBA IDL Any type.
-    *
-    */
-    class Config_Handlers_Export Any_Handler
-    {
-      public:
-      Any_Handler (void);
-      virtual ~Any_Handler (void);
-
-      static void extract_into_any (const Any& desc,
-                                    ::CORBA::Any& toconfig);
-
-      static Any get_any (const CORBA::Any &src);
-    };
-  }
+namespace Config_Handlers
+{
+class Any;
+
+/*
+* @class Any_Handler
+*
+* @brief Handler class for <ComponentInterfaceDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC Any objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL Any type.
+*
+*/
+class Config_Handlers_Export Any_Handler
+{
+public:
+Any_Handler (void);
+virtual ~Any_Handler (void);
+
+static void extract_into_any (const Any& desc,
+::CORBA::Any& toconfig);
+
+static Any get_any (const CORBA::Any &src);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp b/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
index b9fa6a6e221..dee3dc87fcf 100644
--- a/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
+++ b/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
@@ -1,489 +1,489 @@
 <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>  
+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/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 57d9d4c5c9e..25191d1daaf 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "Basic_Deployment_Data.hpp"
 
 namespace CIAO
@@ -16,7 +16,7 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TCKind
-    // 
+    //
 
     TCKind::Value TCKind::
     integral () const
@@ -38,30 +38,30 @@ 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),
+      regulator__ ()
     {
       kind_->container (this);
       if (enum__.get ()) enum__->container (this);
@@ -80,7 +80,7 @@ namespace CIAO
 
 
     // DataType
-    // 
+    //
     ::CIAO::Config_Handlers::TCKind const& DataType::
     kind () const
     {
@@ -94,7 +94,7 @@ namespace CIAO
     }
 
     // DataType
-    // 
+    //
     bool DataType::
     enum_p () const
     {
@@ -111,111 +111,85 @@ 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);
+        }
     }
 
 
     // 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);
+        for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i);
       }
 
       {
-        for (long_const_iterator i (s.long_.begin ());
-        i != s.long_.end ();
-        ++i) add_long (*i);
+        for (long_const_iterator i (s.long_.begin ());i != s.long_.end ();++i) add_long (*i);
       }
 
       {
-        for (ushort_const_iterator i (s.ushort_.begin ());
-        i != s.ushort_.end ();
-        ++i) add_ushort (*i);
+        for (ushort_const_iterator i (s.ushort_.begin ());i != s.ushort_.end ();++i) add_ushort (*i);
       }
 
       {
-        for (ulong_const_iterator i (s.ulong_.begin ());
-        i != s.ulong_.end ();
-        ++i) add_ulong (*i);
+        for (ulong_const_iterator i (s.ulong_.begin ());i != s.ulong_.end ();++i) add_ulong (*i);
       }
 
       {
-        for (float_const_iterator i (s.float_.begin ());
-        i != s.float_.end ();
-        ++i) add_float (*i);
+        for (float_const_iterator i (s.float_.begin ());i != s.float_.end ();++i) add_float (*i);
       }
 
       {
-        for (double_const_iterator i (s.double_.begin ());
-        i != s.double_.end ();
-        ++i) add_double (*i);
+        for (double_const_iterator i (s.double_.begin ());i != s.double_.end ();++i) add_double (*i);
       }
 
       {
-        for (boolean_const_iterator i (s.boolean_.begin ());
-        i != s.boolean_.end ();
-        ++i) add_boolean (*i);
+        for (boolean_const_iterator i (s.boolean_.begin ());i != s.boolean_.end ();++i) add_boolean (*i);
       }
 
       {
-        for (octet_const_iterator i (s.octet_.begin ());
-        i != s.octet_.end ();
-        ++i) add_octet (*i);
+        for (octet_const_iterator i (s.octet_.begin ());i != s.octet_.end ();++i) add_octet (*i);
       }
 
       {
-        for (enum_const_iterator i (s.enum_.begin ());
-        i != s.enum_.end ();
-        ++i) add_enum (*i);
+        for (enum_const_iterator i (s.enum_.begin ());i != s.enum_.end ();++i) add_enum (*i);
       }
 
       {
-        for (string_const_iterator i (s.string_.begin ());
-        i != s.string_.end ();
-        ++i) add_string (*i);
+        for (string_const_iterator i (s.string_.begin ());i != s.string_.end ();++i) add_string (*i);
       }
 
       {
-        for (longlong_const_iterator i (s.longlong_.begin ());
-        i != s.longlong_.end ();
-        ++i) add_longlong (*i);
+        for (longlong_const_iterator i (s.longlong_.begin ());i != s.longlong_.end ();++i) add_longlong (*i);
       }
 
       {
-        for (ulonglong_const_iterator i (s.ulonglong_.begin ());
-        i != s.ulonglong_.end ();
-        ++i) add_ulonglong (*i);
+        for (ulonglong_const_iterator i (s.ulonglong_.begin ());i != s.ulonglong_.end ();++i) add_ulonglong (*i);
       }
 
       {
-        for (longdouble_const_iterator i (s.longdouble_.begin ());
-        i != s.longdouble_.end ();
-        ++i) add_longdouble (*i);
+        for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i);
       }
     }
 
@@ -224,93 +198,67 @@ namespace CIAO
     {
       short_.clear ();
       {
-        for (short_const_iterator i (s.short_.begin ());
-        i != s.short_.end ();
-        ++i) add_short (*i);
+        for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i);
       }
 
       long_.clear ();
       {
-        for (long_const_iterator i (s.long_.begin ());
-        i != s.long_.end ();
-        ++i) add_long (*i);
+        for (long_const_iterator i (s.long_.begin ());i != s.long_.end ();++i) add_long (*i);
       }
 
       ushort_.clear ();
       {
-        for (ushort_const_iterator i (s.ushort_.begin ());
-        i != s.ushort_.end ();
-        ++i) add_ushort (*i);
+        for (ushort_const_iterator i (s.ushort_.begin ());i != s.ushort_.end ();++i) add_ushort (*i);
       }
 
       ulong_.clear ();
       {
-        for (ulong_const_iterator i (s.ulong_.begin ());
-        i != s.ulong_.end ();
-        ++i) add_ulong (*i);
+        for (ulong_const_iterator i (s.ulong_.begin ());i != s.ulong_.end ();++i) add_ulong (*i);
       }
 
       float_.clear ();
       {
-        for (float_const_iterator i (s.float_.begin ());
-        i != s.float_.end ();
-        ++i) add_float (*i);
+        for (float_const_iterator i (s.float_.begin ());i != s.float_.end ();++i) add_float (*i);
       }
 
       double_.clear ();
       {
-        for (double_const_iterator i (s.double_.begin ());
-        i != s.double_.end ();
-        ++i) add_double (*i);
+        for (double_const_iterator i (s.double_.begin ());i != s.double_.end ();++i) add_double (*i);
       }
 
       boolean_.clear ();
       {
-        for (boolean_const_iterator i (s.boolean_.begin ());
-        i != s.boolean_.end ();
-        ++i) add_boolean (*i);
+        for (boolean_const_iterator i (s.boolean_.begin ());i != s.boolean_.end ();++i) add_boolean (*i);
       }
 
       octet_.clear ();
       {
-        for (octet_const_iterator i (s.octet_.begin ());
-        i != s.octet_.end ();
-        ++i) add_octet (*i);
+        for (octet_const_iterator i (s.octet_.begin ());i != s.octet_.end ();++i) add_octet (*i);
       }
 
       enum_.clear ();
       {
-        for (enum_const_iterator i (s.enum_.begin ());
-        i != s.enum_.end ();
-        ++i) add_enum (*i);
+        for (enum_const_iterator i (s.enum_.begin ());i != s.enum_.end ();++i) add_enum (*i);
       }
 
       string_.clear ();
       {
-        for (string_const_iterator i (s.string_.begin ());
-        i != s.string_.end ();
-        ++i) add_string (*i);
+        for (string_const_iterator i (s.string_.begin ());i != s.string_.end ();++i) add_string (*i);
       }
 
       longlong_.clear ();
       {
-        for (longlong_const_iterator i (s.longlong_.begin ());
-        i != s.longlong_.end ();
-        ++i) add_longlong (*i);
+        for (longlong_const_iterator i (s.longlong_.begin ());i != s.longlong_.end ();++i) add_longlong (*i);
       }
 
       ulonglong_.clear ();
       {
-        for (ulonglong_const_iterator i (s.ulonglong_.begin ());
-        i != s.ulonglong_.end ();
-        ++i) add_ulonglong (*i);
+        for (ulonglong_const_iterator i (s.ulonglong_.begin ());i != s.ulonglong_.end ();++i) add_ulonglong (*i);
       }
 
       longdouble_.clear ();
       {
-        for (longdouble_const_iterator i (s.longdouble_.begin ());
-        i != s.longdouble_.end ();
-        ++i) add_longdouble (*i);
+        for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i);
       }
 
       return *this;
@@ -318,7 +266,7 @@ namespace CIAO
 
 
     // DataValue
-    // 
+    //
     DataValue::short_iterator DataValue::
     begin_short ()
     {
@@ -356,7 +304,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::long_iterator DataValue::
     begin_long ()
     {
@@ -394,7 +342,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ushort_iterator DataValue::
     begin_ushort ()
     {
@@ -432,7 +380,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ulong_iterator DataValue::
     begin_ulong ()
     {
@@ -470,7 +418,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::float_iterator DataValue::
     begin_float ()
     {
@@ -508,7 +456,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::double_iterator DataValue::
     begin_double ()
     {
@@ -546,7 +494,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::boolean_iterator DataValue::
     begin_boolean ()
     {
@@ -584,7 +532,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::octet_iterator DataValue::
     begin_octet ()
     {
@@ -622,7 +570,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::enum_iterator DataValue::
     begin_enum ()
     {
@@ -660,7 +608,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::string_iterator DataValue::
     begin_string ()
     {
@@ -698,7 +646,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::longlong_iterator DataValue::
     begin_longlong ()
     {
@@ -736,7 +684,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ulonglong_iterator DataValue::
     begin_ulonglong ()
     {
@@ -774,7 +722,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::longdouble_iterator DataValue::
     begin_longdouble ()
     {
@@ -813,12192 +761,13326 @@ namespace CIAO
 
 
     // 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);
-    }
+              ::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);
+}
 
-    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
-    // 
+// Any
+//
 
-    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);
-    }
+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);
+}
 
-    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);
-    }
+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);
+}
 
-    ::CIAO::Config_Handlers::Any& Any::
-    operator= (::CIAO::Config_Handlers::Any const& s)
-    {
-      type (s.type ());
+::CIAO::Config_Handlers::Any& Any::
+operator= (::CIAO::Config_Handlers::Any const& s)
+{
+type (s.type ());
 
-      value (s.value ());
+value (s.value ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataType const& Any::
-    type () const
-    {
-      return *type_;
-    }
+// Any
+//
+::CIAO::Config_Handlers::DataType const& Any::
+type () const
+{
+return *type_;
+}
 
-    void Any::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
+void Any::
+type (::CIAO::Config_Handlers::DataType const& e)
+{
+*type_ = e;
+}
 
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataValue const& Any::
-    value () const
-    {
-      return *value_;
-    }
+// Any
+//
+::CIAO::Config_Handlers::DataValue const& Any::
+value () const
+{
+return *value_;
+}
 
-    void Any::
-    value (::CIAO::Config_Handlers::DataValue const& e)
-    {
-      *value_ = e;
-    }
+void Any::
+value (::CIAO::Config_Handlers::DataValue const& e)
+{
+*value_ = e;
+}
 
 
-    // Property
-    // 
+// Property
+//
 
-    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);
-    }
+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);
+}
 
-    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);
-    }
+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);
+}
 
-    ::CIAO::Config_Handlers::Property& Property::
-    operator= (::CIAO::Config_Handlers::Property const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::Property& Property::
+operator= (::CIAO::Config_Handlers::Property const& s)
+{
+name (s.name ());
 
-      value (s.value ());
+value (s.value ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // Property
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Property::
-    name () const
-    {
-      return *name_;
-    }
+// Property
+//
+::XMLSchema::string< ACE_TCHAR > const& Property::
+name () const
+{
+return *name_;
+}
 
-    void Property::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Property::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // Property
-    // 
-    ::CIAO::Config_Handlers::Any const& Property::
-    value () const
-    {
-      return *value_;
-    }
+// Property
+//
+::CIAO::Config_Handlers::Any const& Property::
+value () const
+{
+return *value_;
+}
 
-    void Property::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
+void Property::
+value (::CIAO::Config_Handlers::Any const& e)
+{
+*value_ = e;
+}
 
 
-    // SatisfierPropertyKind
-    // 
+// SatisfierPropertyKind
+//
 
-    SatisfierPropertyKind::Value SatisfierPropertyKind::
-    integral () const
-    {
-      return v_;
-    }
+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_;
-    }
+bool
+operator== (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+bool
+operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (SatisfierPropertyKind::Value v)
-    : v_ (v)
-    {
-    }
+SatisfierPropertyKind::
+SatisfierPropertyKind (SatisfierPropertyKind::Value v)
+: v_ (v)
+{
+}
 
-    // SatisfierProperty
-    // 
-
-    SatisfierProperty::
-    SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-    ::CIAO::Config_Handlers::Any const& value__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
-    value_ (new ::CIAO::Config_Handlers::Any (value__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
+// 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);
+}
 
-    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_)),
-    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
+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 ());
+::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
+operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
+{
+name (s.name ());
 
-      kind (s.kind ());
+kind (s.kind ());
 
-      value (s.value ());
+dynamic (s.dynamic ());
 
-      return *this;
-    }
+value (s.value ());
 
+return *this;
+}
 
-    // SatisfierProperty
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
-    name () const
-    {
-      return *name_;
-    }
 
-    void SatisfierProperty::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// SatisfierProperty
+//
+::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
+name () const
+{
+return *name_;
+}
 
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
-    kind () const
-    {
-      return *kind_;
-    }
+void SatisfierProperty::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void SatisfierProperty::
-    kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
-    {
-      *kind_ = e;
-    }
+// SatisfierProperty
+//
+::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
+kind () const
+{
+return *kind_;
+}
 
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::Any const& SatisfierProperty::
-    value () const
-    {
-      return *value_;
-    }
+void SatisfierProperty::
+kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
+{
+*kind_ = e;
+}
 
-    void SatisfierProperty::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
+// SatisfierProperty
+//
+::XMLSchema::boolean const& SatisfierProperty::
+dynamic () const
+{
+return *dynamic_;
+}
 
+void SatisfierProperty::
+dynamic (::XMLSchema::boolean const& e)
+{
+*dynamic_ = e;
+}
 
-    // Resource
-    // 
+// SatisfierProperty
+//
+::CIAO::Config_Handlers::Any const& SatisfierProperty::
+value () const
+{
+return *value_;
+}
 
-    Resource::
-    Resource (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-    ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
+void SatisfierProperty::
+value (::CIAO::Config_Handlers::Any const& e)
+{
+*value_ = e;
+}
 
-    Resource::
-    Resource (::CIAO::Config_Handlers::Resource const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
 
-    ::CIAO::Config_Handlers::Resource& Resource::
-    operator= (::CIAO::Config_Handlers::Resource const& s)
-    {
-      name (s.name ());
+// Resource
+//
 
-      resourceType (s.resourceType ());
+Resource::
+Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-      property (s.property ());
+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);
+}
 
-      return *this;
-    }
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
+::CIAO::Config_Handlers::Resource& Resource::
+operator= (::CIAO::Config_Handlers::Resource const& s)
+{
+name (s.name ());
 
-    // Resource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Resource::
-    name () const
-    {
-      return *name_;
-    }
+resourceType_.clear ();
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-    void Resource::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    // Resource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Resource::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+return *this;
+}
 
-    void Resource::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
 
-    // Resource
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& Resource::
-    property () const
-    {
-      return *property_;
-    }
+// Resource
+//
+::XMLSchema::string< ACE_TCHAR > const& Resource::
+name () const
+{
+return *name_;
+}
 
-    void Resource::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
+void Resource::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
+// Resource
+//
+Resource::resourceType_iterator Resource::
+begin_resourceType ()
+{
+return resourceType_.begin ();
+}
 
-    // Requirement
-    // 
+Resource::resourceType_iterator Resource::
+end_resourceType ()
+{
+return resourceType_.end ();
+}
 
-    Requirement::
-    Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-    ::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::Property const& property__)
-    : 
-    ::XSCRT::Type (), 
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    property_ (new ::CIAO::Config_Handlers::Property (property__)),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+Resource::resourceType_const_iterator Resource::
+begin_resourceType () const
+{
+return resourceType_.begin ();
+}
 
-    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_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+Resource::resourceType_const_iterator Resource::
+end_resourceType () const
+{
+return resourceType_.end ();
+}
 
-    ::CIAO::Config_Handlers::Requirement& Requirement::
-    operator= (::CIAO::Config_Handlers::Requirement const& s)
-    {
-      resourceType (s.resourceType ());
+void Resource::
+add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+resourceType_.push_back (e);
+}
 
-      name (s.name ());
+size_t Resource::
+count_resourceType(void) const
+{
+return resourceType_.size ();
+}
 
-      property (s.property ());
+// Resource
+//
+Resource::property_iterator Resource::
+begin_property ()
+{
+return property_.begin ();
+}
 
-      return *this;
-    }
+Resource::property_iterator Resource::
+end_property ()
+{
+return property_.end ();
+}
 
+Resource::property_const_iterator Resource::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    // Requirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+Resource::property_const_iterator Resource::
+end_property () const
+{
+return property_.end ();
+}
 
-    void Requirement::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+void Resource::
+add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+{
+property_.push_back (e);
+}
 
-    // Requirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
-    name () const
-    {
-      return *name_;
-    }
+size_t Resource::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    void Requirement::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
 
-    // Requirement
-    // 
-    ::CIAO::Config_Handlers::Property const& Requirement::
-    property () const
-    {
-      return *property_;
-    }
+// Requirement
+//
 
-    void Requirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
+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);
+}
 
+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);
+}
+}
 
-    // ResourceDeploymentDescription
-    // 
+::CIAO::Config_Handlers::Requirement& Requirement::
+operator= (::CIAO::Config_Handlers::Requirement const& s)
+{
+resourceType (s.resourceType ());
 
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-    ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+name (s.name ());
 
-    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_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    ::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-    {
-      requirementName (s.requirementName ());
+return *this;
+}
 
-      resourceName (s.resourceName ());
 
-      resourceValue (s.resourceValue ());
+// Requirement
+//
+::XMLSchema::string< ACE_TCHAR > const& Requirement::
+resourceType () const
+{
+return *resourceType_;
+}
 
-      return *this;
-    }
+void Requirement::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
 
+// Requirement
+//
+::XMLSchema::string< ACE_TCHAR > const& Requirement::
+name () const
+{
+return *name_;
+}
 
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
+void Requirement::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void ResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+// Requirement
+//
+Requirement::property_iterator Requirement::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
+Requirement::property_iterator Requirement::
+end_property ()
+{
+return property_.end ();
+}
 
-    void ResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+Requirement::property_const_iterator Requirement::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    // ResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
+Requirement::property_const_iterator Requirement::
+end_property () const
+{
+return property_.end ();
+}
 
-    void ResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+void Requirement::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
+size_t Requirement::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
 
-    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);
-    }
+// ResourceDeploymentDescription
+//
 
-    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);
-      }
+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);
+}
 
-      node_->container (this);
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
+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);
+}
+}
 
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());
-        i != s.execParameter_.end ();
-        ++i) add_execParameter (*i);
-      }
+::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
+{
+requirementName (s.requirementName ());
 
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
-        i != s.deployRequirement_.end ();
-        ++i) add_deployRequirement (*i);
-      }
+resourceName (s.resourceName ());
 
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
-        i != s.deployedResource_.end ();
-        ++i) add_deployedResource (*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::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-    {
-      name (s.name ());
 
-      source_.clear ();
-      {
-        for (source_const_iterator i (s.source_.begin ());
-        i != s.source_.end ();
-        ++i) add_source (*i);
-      }
+// ResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-      node (s.node ());
+void ResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-      location_.clear ();
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
+// ResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-      execParameter_.clear ();
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());
-        i != s.execParameter_.end ();
-        ++i) add_execParameter (*i);
-      }
+void ResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
-        i != s.deployRequirement_.end ();
-        ++i) add_deployRequirement (*i);
-      }
+// ResourceDeploymentDescription
+//
+ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-      deployedResource_.clear ();
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
-        i != s.deployedResource_.end ();
-        ++i) add_deployedResource (*i);
-      }
+ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-      return *this;
-    }
+ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
+void ResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+size_t ResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    void ArtifactDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-    begin_source ()
-    {
-      return source_.begin ();
-    }
+// ArtifactDeploymentDescription
+//
 
-    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-    end_source ()
-    {
-      return source_.end ();
-    }
+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);
+}
 
-    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-    begin_source () const
-    {
-      return source_.begin ();
-    }
+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);
+}
 
-    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-    end_source () const
-    {
-      return source_.end ();
-    }
+node_->container (this);
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-    void ArtifactDeploymentDescription::
-    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      source_.push_back (e);
-    }
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_source(void) const
-    {
-      return source_.size ();
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    void ArtifactDeploymentDescription::
-    node (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *node_ = e;
-    }
+if (id_.get ()) id_->container (this);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
+::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
+{
+name (s.name ());
 
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
+source_.clear ();
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
+node (s.node ());
 
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
+location_.clear ();
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-    void ArtifactDeploymentDescription::
-    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      location_.push_back (e);
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_location(void) const
-    {
-      return location_.size ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-    begin_execParameter ()
-    {
-      return execParameter_.begin ();
-    }
+deployedResource_.clear ();
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-    end_execParameter ()
-    {
-      return execParameter_.end ();
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-    begin_execParameter () const
-    {
-      return execParameter_.begin ();
-    }
+return *this;
+}
 
-    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-    end_execParameter () const
-    {
-      return execParameter_.end ();
-    }
 
-    void ArtifactDeploymentDescription::
-    add_execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      execParameter_.push_back (e);
-    }
+// ArtifactDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_execParameter(void) const
-    {
-      return execParameter_.size ();
-    }
+void ArtifactDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-    begin_deployRequirement ()
-    {
-      return deployRequirement_.begin ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+begin_source ()
+{
+return source_.begin ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+end_source ()
+{
+return source_.end ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+begin_source () const
+{
+return source_.begin ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+end_source () const
+{
+return source_.end ();
+}
 
-    void ArtifactDeploymentDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
+void ArtifactDeploymentDescription::
+add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+source_.push_back (e);
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+size_t ArtifactDeploymentDescription::
+count_source(void) const
+{
+return source_.size ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-    begin_deployedResource ()
-    {
-      return deployedResource_.begin ();
-    }
+// ArtifactDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+node () const
+{
+return *node_;
+}
 
-    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-    end_deployedResource ()
-    {
-      return deployedResource_.end ();
-    }
+void ArtifactDeploymentDescription::
+node (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*node_ = e;
+}
 
-    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-    begin_deployedResource () const
-    {
-      return deployedResource_.begin ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+begin_location ()
+{
+return location_.begin ();
+}
 
-    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-    end_deployedResource () const
-    {
-      return deployedResource_.end ();
-    }
+ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+end_location ()
+{
+return location_.end ();
+}
 
-    void ArtifactDeploymentDescription::
-    add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
-    {
-      deployedResource_.push_back (e);
-    }
+ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+begin_location () const
+{
+return location_.begin ();
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_deployedResource(void) const
-    {
-      return deployedResource_.size ();
-    }
+ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+end_location () const
+{
+return location_.end ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+void ArtifactDeploymentDescription::
+add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+location_.push_back (e);
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
+size_t ArtifactDeploymentDescription::
+count_location(void) const
+{
+return location_.size ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    void ArtifactDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
+ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
+void ArtifactDeploymentDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+size_t ArtifactDeploymentDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
-    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);
-      }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
+ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());
-        i != s.execParameter_.end ();
-        ++i) add_execParameter (*i);
-      }
+ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
-        i != s.deployRequirement_.end ();
-        ++i) add_deployRequirement (*i);
-      }
+ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-      if (id_.get ()) id_->container (this);
-    }
+void ArtifactDeploymentDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-    ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-    {
-      name (s.name ());
+size_t ArtifactDeploymentDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-      source_.clear ();
-      {
-        for (source_const_iterator i (s.source_.begin ());
-        i != s.source_.end ();
-        ++i) add_source (*i);
-      }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+begin_deployedResource ()
+{
+return deployedResource_.begin ();
+}
 
-      artifact_.clear ();
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
-      }
+ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+end_deployedResource ()
+{
+return deployedResource_.end ();
+}
 
-      execParameter_.clear ();
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());
-        i != s.execParameter_.end ();
-        ++i) add_execParameter (*i);
-      }
+ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+begin_deployedResource () const
+{
+return deployedResource_.begin ();
+}
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
-        i != s.deployRequirement_.end ();
-        ++i) add_deployRequirement (*i);
-      }
+ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+end_deployedResource () const
+{
+return deployedResource_.end ();
+}
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+void ArtifactDeploymentDescription::
+add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
+{
+deployedResource_.push_back (e);
+}
 
-      return *this;
-    }
+size_t ArtifactDeploymentDescription::
+count_deployedResource(void) const
+{
+return deployedResource_.size ();
+}
 
+// ArtifactDeploymentDescription
+//
+bool ArtifactDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-    void MonolithicDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-    begin_source ()
-    {
-      return source_.begin ();
-    }
+void ArtifactDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-    end_source ()
-    {
-      return source_.end ();
-    }
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-    begin_source () const
-    {
-      return source_.begin ();
-    }
 
-    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-    end_source () const
-    {
-      return source_.end ();
-    }
+// MonolithicDeploymentDescription
+//
 
-    void MonolithicDeploymentDescription::
-    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      source_.push_back (e);
-    }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_source(void) const
-    {
-      return source_.size ();
-    }
+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);
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    begin_artifact ()
-    {
-      return artifact_.begin ();
-    }
+{
+for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+}
 
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    end_artifact ()
-    {
-      return artifact_.end ();
-    }
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    begin_artifact () const
-    {
-      return artifact_.begin ();
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    end_artifact () const
-    {
-      return artifact_.end ();
-    }
+if (id_.get ()) id_->container (this);
+}
 
-    void MonolithicDeploymentDescription::
-    add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      artifact_.push_back (e);
-    }
+::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
+operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
+{
+name (s.name ());
 
-    size_t MonolithicDeploymentDescription::
-    count_artifact(void) const
-    {
-      return artifact_.size ();
-    }
+source_.clear ();
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-    begin_execParameter ()
-    {
-      return execParameter_.begin ();
-    }
+artifact_.clear ();
+{
+for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+}
 
-    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-    end_execParameter ()
-    {
-      return execParameter_.end ();
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-    begin_execParameter () const
-    {
-      return execParameter_.begin ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-    end_execParameter () const
-    {
-      return execParameter_.end ();
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    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 ();
-    }
+// MonolithicDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+void MonolithicDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+begin_source ()
+{
+return source_.begin ();
+}
 
-    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+end_source ()
+{
+return source_.end ();
+}
 
-    void MonolithicDeploymentDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
+MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+begin_source () const
+{
+return source_.begin ();
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+end_source () const
+{
+return source_.end ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    bool MonolithicDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+void MonolithicDeploymentDescription::
+add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+source_.push_back (e);
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
+size_t MonolithicDeploymentDescription::
+count_source(void) const
+{
+return source_.size ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+begin_artifact ()
+{
+return artifact_.begin ();
+}
 
-    void MonolithicDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+end_artifact ()
+{
+return artifact_.end ();
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+begin_artifact () const
+{
+return artifact_.begin ();
+}
 
+MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+end_artifact () const
+{
+return artifact_.end ();
+}
 
-    // ResourceUsageKind
-    // 
+void MonolithicDeploymentDescription::
+add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+artifact_.push_back (e);
+}
 
-    ResourceUsageKind::Value ResourceUsageKind::
-    integral () const
-    {
-      return v_;
-    }
+size_t MonolithicDeploymentDescription::
+count_artifact(void) const
+{
+return artifact_.size ();
+}
 
-    bool
-    operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-    ResourceUsageKind::
-    ResourceUsageKind (ResourceUsageKind::Value v)
-    : v_ (v)
-    {
-    }
+MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-    ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-    ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    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_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+void MonolithicDeploymentDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-    {
-      resourceUsage (s.resourceUsage ());
+size_t MonolithicDeploymentDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
-      requirementName (s.requirementName ());
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      resourceName (s.resourceName ());
+MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      resourceValue (s.resourceValue ());
+MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-      return *this;
-    }
+MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
+void MonolithicDeploymentDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
+size_t MonolithicDeploymentDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-    void InstanceResourceDeploymentDescription::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
+// MonolithicDeploymentDescription
+//
+bool MonolithicDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
+::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-    void InstanceResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
+void MonolithicDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-    void InstanceResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& InstanceResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
 
-    void InstanceResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+// ResourceUsageKind
+//
 
+ResourceUsageKind::Value ResourceUsageKind::
+integral () const
+{
+return v_;
+}
 
-    // 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);
-    }
+bool
+operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    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);
-      }
+bool
+operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-      if (deployedResource_.get ()) deployedResource_->container (this);
-      if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
+ResourceUsageKind::
+ResourceUsageKind (ResourceUsageKind::Value v)
+: v_ (v)
+{
+}
 
-    ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-    {
-      name (s.name ());
+// 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);
+}
 
-      node (s.node ());
+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);
+}
+}
 
-      source (s.source ());
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
+{
+resourceUsage (s.resourceUsage ());
 
-      implementation (s.implementation ());
+requirementName (s.requirementName ());
 
-      configProperty_.clear ();
-      {
-        for (configProperty_const_iterator i (s.configProperty_.begin ());
-        i != s.configProperty_.end ();
-        ++i) add_configProperty (*i);
-      }
+resourceName (s.resourceName ());
 
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-      if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
-      else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+return *this;
+}
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-      return *this;
-    }
+// InstanceResourceDeploymentDescription
+//
+::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
+resourceUsage () const
+{
+return *resourceUsage_;
+}
 
+void InstanceResourceDeploymentDescription::
+resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+{
+*resourceUsage_ = e;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+// InstanceResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-    void InstanceDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void InstanceResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
+// InstanceResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-    void InstanceDeploymentDescription::
-    node (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *node_ = e;
-    }
+void InstanceResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    source () const
-    {
-      return *source_;
-    }
+// InstanceResourceDeploymentDescription
+//
+InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    void InstanceDeploymentDescription::
-    source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *source_ = e;
-    }
+InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
+InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    void InstanceDeploymentDescription::
-    implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *implementation_ = e;
-    }
+InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
-    // InstanceDeploymentDescription
-    // 
-    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-    begin_configProperty ()
-    {
-      return configProperty_.begin ();
-    }
+void InstanceResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-    end_configProperty ()
-    {
-      return configProperty_.end ();
-    }
+size_t InstanceResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-    begin_configProperty () const
-    {
-      return configProperty_.begin ();
-    }
 
-    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-    end_configProperty () const
-    {
-      return configProperty_.end ();
-    }
+// 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);
+}
 
-    void InstanceDeploymentDescription::
-    add_configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      configProperty_.push_back (e);
-    }
+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);
+}
 
-    size_t InstanceDeploymentDescription::
-    count_configProperty(void) const
-    {
-      return configProperty_.size ();
-    }
+if (deployedResource_.get ()) deployedResource_->container (this);
+if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
+if (id_.get ()) id_->container (this);
+}
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedResource_p () const
-    {
-      return deployedResource_.get () != 0;
-    }
+::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
+{
+name (s.name ());
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedResource () const
-    {
-      return *deployedResource_;
-    }
+node (s.node ());
 
-    void InstanceDeploymentDescription::
-    deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
+source (s.source ());
 
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
-    }
+implementation (s.implementation ());
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedSharedResource_p () const
-    {
-      return deployedSharedResource_.get () != 0;
-    }
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedSharedResource () const
-    {
-      return *deployedSharedResource_;
-    }
+if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
+else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-    void InstanceDeploymentDescription::
-    deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedSharedResource_.get ())
-      {
-        *deployedSharedResource_ = e;
-      }
+if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
+else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-      else
-      {
-        deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedSharedResource_->container (this);
-      }
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+return *this;
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
 
-    ::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    void InstanceDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+void InstanceDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+node () const
+{
+return *node_;
+}
 
+void InstanceDeploymentDescription::
+node (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*node_ = e;
+}
 
-    // CCMComponentPortKind
-    // 
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+source () const
+{
+return *source_;
+}
 
-    CCMComponentPortKind::Value CCMComponentPortKind::
-    integral () const
-    {
-      return v_;
-    }
+void InstanceDeploymentDescription::
+source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*source_ = e;
+}
 
-    bool
-    operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
+implementation () const
+{
+return *implementation_;
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+void InstanceDeploymentDescription::
+implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*implementation_ = e;
+}
 
-    CCMComponentPortKind::
-    CCMComponentPortKind (CCMComponentPortKind::Value v)
-    : v_ (v)
-    {
-    }
+// InstanceDeploymentDescription
+//
+InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-    // ComponentPortDescription
-    // 
-
-    ComponentPortDescription::
-    ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::XMLSchema::string< ACE_TCHAR > const& specificType__,
-    ::XMLSchema::string< ACE_TCHAR > const& supportedType__,
-    ::XMLSchema::string< ACE_TCHAR > const& provider__,
-    ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider__,
-    ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser__,
-    ::XMLSchema::string< ACE_TCHAR > const& optional__,
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    specificType_ (new ::XMLSchema::string< ACE_TCHAR > (specificType__)),
-    supportedType_ (new ::XMLSchema::string< ACE_TCHAR > (supportedType__)),
-    provider_ (new ::XMLSchema::string< ACE_TCHAR > (provider__)),
-    exclusiveProvider_ (new ::XMLSchema::string< ACE_TCHAR > (exclusiveProvider__)),
-    exclusiveUser_ (new ::XMLSchema::string< ACE_TCHAR > (exclusiveUser__)),
-    optional_ (new ::XMLSchema::string< ACE_TCHAR > (optional__)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
+InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+end_configProperty ()
+{
+return configProperty_.end ();
+}
 
-    ComponentPortDescription::
-    ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    specificType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_)),
-    supportedType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.supportedType_)),
-    provider_ (new ::XMLSchema::string< ACE_TCHAR > (*s.provider_)),
-    exclusiveProvider_ (new ::XMLSchema::string< ACE_TCHAR > (*s.exclusiveProvider_)),
-    exclusiveUser_ (new ::XMLSchema::string< ACE_TCHAR > (*s.exclusiveUser_)),
-    optional_ (new ::XMLSchema::string< ACE_TCHAR > (*s.optional_)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
+InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+begin_configProperty () const
+{
+return configProperty_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    {
-      name (s.name ());
+InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
 
-      specificType (s.specificType ());
+void InstanceDeploymentDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
 
-      supportedType (s.supportedType ());
+size_t InstanceDeploymentDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
 
-      provider (s.provider ());
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+deployedResource_p () const
+{
+return deployedResource_.get () != 0;
+}
 
-      exclusiveProvider (s.exclusiveProvider ());
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
+deployedResource () const
+{
+return *deployedResource_;
+}
 
-      exclusiveUser (s.exclusiveUser ());
+void InstanceDeploymentDescription::
+deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+{
+if (deployedResource_.get ())
+{
+*deployedResource_ = e;
+}
 
-      optional (s.optional ());
+else
+{
+deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
+deployedResource_->container (this);
+}
+}
 
-      kind (s.kind ());
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+deployedSharedResource_p () const
+{
+return deployedSharedResource_.get () != 0;
+}
 
-      return *this;
-    }
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
+deployedSharedResource () const
+{
+return *deployedSharedResource_;
+}
 
+void InstanceDeploymentDescription::
+deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+{
+if (deployedSharedResource_.get ())
+{
+*deployedSharedResource_ = e;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    name () const
-    {
-      return *name_;
-    }
+else
+{
+deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
+deployedSharedResource_->container (this);
+}
+}
 
-    void ComponentPortDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    specificType () const
-    {
-      return *specificType_;
-    }
+::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-    void ComponentPortDescription::
-    specificType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *specificType_ = e;
-    }
+::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    supportedType () const
-    {
-      return *supportedType_;
-    }
+void InstanceDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-    void ComponentPortDescription::
-    supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *supportedType_ = e;
-    }
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    provider () const
-    {
-      return *provider_;
-    }
 
-    void ComponentPortDescription::
-    provider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *provider_ = e;
-    }
+// CCMComponentPortKind
+//
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    exclusiveProvider () const
-    {
-      return *exclusiveProvider_;
-    }
+CCMComponentPortKind::Value CCMComponentPortKind::
+integral () const
+{
+return v_;
+}
 
-    void ComponentPortDescription::
-    exclusiveProvider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *exclusiveProvider_ = e;
-    }
+bool
+operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    exclusiveUser () const
-    {
-      return *exclusiveUser_;
-    }
+bool
+operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-    void ComponentPortDescription::
-    exclusiveUser (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *exclusiveUser_ = e;
-    }
+CCMComponentPortKind::
+CCMComponentPortKind (CCMComponentPortKind::Value v)
+: v_ (v)
+{
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    optional () const
-    {
-      return *optional_;
-    }
+// 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 ComponentPortDescription::
-    optional (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *optional_ = 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);
+}
 
-    // ComponentPortDescription
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
-    kind () const
-    {
-      return *kind_;
-    }
+provider_->container (this);
+exclusiveProvider_->container (this);
+exclusiveUser_->container (this);
+optional_->container (this);
+kind_->container (this);
+}
 
-    void ComponentPortDescription::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
+::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
+operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
+{
+name (s.name ());
 
+if (s.specificType_.get ()) specificType (*(s.specificType_));
+else specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentPropertyDescription
-    // 
+supportedType_.clear ();
+{
+for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+}
 
-    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);
-    }
+provider (s.provider ());
 
-    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);
-    }
+exclusiveProvider (s.exclusiveProvider ());
 
-    ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-    {
-      name (s.name ());
+exclusiveUser (s.exclusiveUser ());
 
-      type (s.type ());
+optional (s.optional ());
 
-      return *this;
-    }
+kind (s.kind ());
 
+return *this;
+}
 
-    // ComponentPropertyDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
-    name () const
-    {
-      return *name_;
-    }
 
-    void ComponentPropertyDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// ComponentPortDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+name () const
+{
+return *name_;
+}
 
-    // ComponentPropertyDescription
-    // 
-    ::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
-    type () const
-    {
-      return *type_;
-    }
+void ComponentPortDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void ComponentPropertyDescription::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
+// ComponentPortDescription
+//
+bool ComponentPortDescription::
+specificType_p () const
+{
+return specificType_.get () != 0;
+}
 
+::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+specificType () const
+{
+return *specificType_;
+}
 
-    // ComponentExternalPortEndpoint
-    // 
+void ComponentPortDescription::
+specificType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (specificType_.get ())
+{
+*specificType_ = e;
+}
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
-    : 
-    ::XSCRT::Type (), 
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
+else
+{
+specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+specificType_->container (this);
+}
+}
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    :
-    ::XSCRT::Type (),
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
+// ComponentPortDescription
+//
+ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+begin_supportedType ()
+{
+return supportedType_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
-    operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    {
-      portName (s.portName ());
+ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+end_supportedType ()
+{
+return supportedType_.end ();
+}
 
-      return *this;
-    }
+ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+begin_supportedType () const
+{
+return supportedType_.begin ();
+}
 
+ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+end_supportedType () const
+{
+return supportedType_.end ();
+}
 
-    // ComponentExternalPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
+void ComponentPortDescription::
+add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+supportedType_.push_back (e);
+}
 
-    void ComponentExternalPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
+size_t ComponentPortDescription::
+count_supportedType(void) const
+{
+return supportedType_.size ();
+}
 
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+provider () const
+{
+return *provider_;
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
+void ComponentPortDescription::
+provider (::XMLSchema::boolean const& e)
+{
+*provider_ = e;
+}
 
-    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);
-    }
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+exclusiveProvider () const
+{
+return *exclusiveProvider_;
+}
 
-    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);
-    }
+void ComponentPortDescription::
+exclusiveProvider (::XMLSchema::boolean const& e)
+{
+*exclusiveProvider_ = e;
+}
 
-    ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
-    operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-    {
-      portName (s.portName ());
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+exclusiveUser () const
+{
+return *exclusiveUser_;
+}
 
-      if (s.provider_.get ()) provider (*(s.provider_));
-      else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+void ComponentPortDescription::
+exclusiveUser (::XMLSchema::boolean const& e)
+{
+*exclusiveUser_ = e;
+}
 
-      kind (s.kind ());
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+optional () const
+{
+return *optional_;
+}
 
-      instance (s.instance ());
+void ComponentPortDescription::
+optional (::XMLSchema::boolean const& e)
+{
+*optional_ = e;
+}
 
-      return *this;
-    }
+// ComponentPortDescription
+//
+::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
+kind () const
+{
+return *kind_;
+}
 
+void ComponentPortDescription::
+kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+{
+*kind_ = e;
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
 
-    void PlanSubcomponentPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
+// ComponentPropertyDescription
+//
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    bool PlanSubcomponentPortEndpoint::
-    provider_p () const
-    {
-      return provider_.get () != 0;
-    }
+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);
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    provider () const
-    {
-      return *provider_;
-    }
+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 PlanSubcomponentPortEndpoint::
-    provider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (provider_.get ())
-      {
-        *provider_ = e;
-      }
+::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
+operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
+{
+name (s.name ());
 
-      else
-      {
-        provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        provider_->container (this);
-      }
-    }
+type (s.type ());
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
-    kind () const
-    {
-      return *kind_;
-    }
+return *this;
+}
 
-    void PlanSubcomponentPortEndpoint::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
+// ComponentPropertyDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
+name () const
+{
+return *name_;
+}
 
-    void PlanSubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *instance_ = e;
-    }
+void ComponentPropertyDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
+// ComponentPropertyDescription
+//
+::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
+type () const
+{
+return *type_;
+}
 
-    // ExternalReferenceEndpoint
-    // 
+void ComponentPropertyDescription::
+type (::CIAO::Config_Handlers::DataType const& e)
+{
+*type_ = e;
+}
 
-    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);
-    }
+// ComponentExternalPortEndpoint
+//
 
-    ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
-    operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-    {
-      location (s.location ());
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+regulator__ ()
+{
+portName_->container (this);
+}
 
-      return *this;
-    }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+regulator__ ()
+{
+portName_->container (this);
+}
 
+::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
+operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+{
+portName (s.portName ());
 
-    // ExternalReferenceEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
-    location () const
-    {
-      return *location_;
-    }
+return *this;
+}
 
-    void ExternalReferenceEndpoint::
-    location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *location_ = e;
-    }
 
+// ComponentExternalPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-    ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-    ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+void ComponentExternalPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-    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_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
 
-    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-    {
-      targetName (s.targetName ());
+// PlanSubcomponentPortEndpoint
+//
 
-      requirementName (s.requirementName ());
+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);
+}
 
-      resourceName (s.resourceName ());
+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);
+}
 
-      resourceValue (s.resourceValue ());
+::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
+operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
+{
+portName (s.portName ());
 
-      return *this;
-    }
+if (s.provider_.get ()) provider (*(s.provider_));
+else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
+kind (s.kind ());
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    targetName () const
-    {
-      return *targetName_;
-    }
+instance (s.instance ());
 
-    void ConnectionResourceDeploymentDescription::
-    targetName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *targetName_ = e;
-    }
+return *this;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
 
-    void ConnectionResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+// PlanSubcomponentPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
+void PlanSubcomponentPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-    void ConnectionResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+// PlanSubcomponentPortEndpoint
+//
+bool PlanSubcomponentPortEndpoint::
+provider_p () const
+{
+return provider_.get () != 0;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ConnectionResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
+::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+provider () const
+{
+return *provider_;
+}
 
-    void ConnectionResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+void PlanSubcomponentPortEndpoint::
+provider (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (provider_.get ())
+{
+*provider_ = e;
+}
 
+else
+{
+provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+provider_->container (this);
+}
+}
 
-    // PlanConnectionDescription
-    // 
+// PlanSubcomponentPortEndpoint
+//
+::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
+kind () const
+{
+return *kind_;
+}
 
-    PlanConnectionDescription::
-    PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+void PlanSubcomponentPortEndpoint::
+kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+{
+*kind_ = e;
+}
 
-    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);
-      }
+// PlanSubcomponentPortEndpoint
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+instance () const
+{
+return *instance_;
+}
 
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
+void PlanSubcomponentPortEndpoint::
+instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*instance_ = e;
+}
 
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
 
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
+// ExternalReferenceEndpoint
+//
 
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
-        i != s.deployedResource_.end ();
-        ++i) add_deployedResource (*i);
-      }
-    }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
+:
+::XSCRT::Type (),
+location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
+regulator__ ()
+{
+location_->container (this);
+}
 
-    ::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
-    operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-    {
-      name (s.name ());
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+:
+::XSCRT::Type (),
+location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
+regulator__ ()
+{
+location_->container (this);
+}
 
-      if (s.source_.get ()) source (*(s.source_));
-      else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
+operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+{
+location (s.location ());
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
-        i != s.deployRequirement_.end ();
-        ++i) add_deployRequirement (*i);
-      }
+return *this;
+}
 
-      externalEndpoint_.clear ();
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
 
-      internalEndpoint_.clear ();
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
+// ExternalReferenceEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
+location () const
+{
+return *location_;
+}
 
-      externalReference_.clear ();
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
+void ExternalReferenceEndpoint::
+location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*location_ = e;
+}
 
-      deployedResource_.clear ();
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
-        i != s.deployedResource_.end ();
-        ++i) add_deployedResource (*i);
-      }
 
-      return *this;
-    }
+// ConnectionResourceDeploymentDescription
+//
 
+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);
+}
 
-    // PlanConnectionDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
+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);
+}
+}
 
-    void PlanConnectionDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
+{
+targetName (s.targetName ());
 
-    // PlanConnectionDescription
-    // 
-    bool PlanConnectionDescription::
-    source_p () const
-    {
-      return source_.get () != 0;
-    }
+requirementName (s.requirementName ());
 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-    source () const
-    {
-      return *source_;
-    }
+resourceName (s.resourceName ());
 
-    void PlanConnectionDescription::
-    source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (source_.get ())
-      {
-        *source_ = e;
-      }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-      else
-      {
-        source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        source_->container (this);
-      }
-    }
+return *this;
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-    begin_deployRequirement ()
-    {
-      return deployRequirement_.begin ();
-    }
 
-    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+targetName () const
+{
+return *targetName_;
+}
 
-    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+void ConnectionResourceDeploymentDescription::
+targetName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*targetName_ = e;
+}
 
-    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-    void PlanConnectionDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
+void ConnectionResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-    size_t PlanConnectionDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    begin_externalEndpoint ()
-    {
-      return externalEndpoint_.begin ();
-    }
+void ConnectionResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    end_externalEndpoint ()
-    {
-      return externalEndpoint_.end ();
-    }
+// ConnectionResourceDeploymentDescription
+//
+ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    begin_externalEndpoint () const
-    {
-      return externalEndpoint_.begin ();
-    }
+ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    end_externalEndpoint () const
-    {
-      return externalEndpoint_.end ();
-    }
+ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    void PlanConnectionDescription::
-    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-    {
-      externalEndpoint_.push_back (e);
-    }
+ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
-    size_t PlanConnectionDescription::
-    count_externalEndpoint(void) const
-    {
-      return externalEndpoint_.size ();
-    }
+void ConnectionResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    begin_internalEndpoint ()
-    {
-      return internalEndpoint_.begin ();
-    }
+size_t ConnectionResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    end_internalEndpoint ()
-    {
-      return internalEndpoint_.end ();
-    }
 
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    begin_internalEndpoint () const
-    {
-      return internalEndpoint_.begin ();
-    }
+// PlanConnectionDescription
+//
 
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    end_internalEndpoint () const
-    {
-      return internalEndpoint_.end ();
-    }
+PlanConnectionDescription::
+PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    void PlanConnectionDescription::
-    add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
-    {
-      internalEndpoint_.push_back (e);
-    }
+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);
+}
 
-    size_t PlanConnectionDescription::
-    count_internalEndpoint(void) const
-    {
-      return internalEndpoint_.size ();
-    }
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    begin_externalReference ()
-    {
-      return externalReference_.begin ();
-    }
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    end_externalReference ()
-    {
-      return externalReference_.end ();
-    }
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    begin_externalReference () const
-    {
-      return externalReference_.begin ();
-    }
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
+}
 
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    end_externalReference () const
-    {
-      return externalReference_.end ();
-    }
+::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
+operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
+{
+name (s.name ());
 
-    void PlanConnectionDescription::
-    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-    {
-      externalReference_.push_back (e);
-    }
+if (s.source_.get ()) source (*(s.source_));
+else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    size_t PlanConnectionDescription::
-    count_externalReference(void) const
-    {
-      return externalReference_.size ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-    begin_deployedResource ()
-    {
-      return deployedResource_.begin ();
-    }
+externalEndpoint_.clear ();
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-    end_deployedResource ()
-    {
-      return deployedResource_.end ();
-    }
+internalEndpoint_.clear ();
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-    begin_deployedResource () const
-    {
-      return deployedResource_.begin ();
-    }
+externalReference_.clear ();
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-    end_deployedResource () const
-    {
-      return deployedResource_.end ();
-    }
+deployedResource_.clear ();
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    void PlanConnectionDescription::
-    add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
-    {
-      deployedResource_.push_back (e);
-    }
+return *this;
+}
 
-    size_t PlanConnectionDescription::
-    count_deployedResource(void) const
-    {
-      return deployedResource_.size ();
-    }
 
+// PlanConnectionDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+name () const
+{
+return *name_;
+}
 
-    // ImplementationDependency
-    // 
+void PlanConnectionDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    ImplementationDependency::
-    ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-    : 
-    ::XSCRT::Type (), 
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
+// PlanConnectionDescription
+//
+bool PlanConnectionDescription::
+source_p () const
+{
+return source_.get () != 0;
+}
 
-    ImplementationDependency::
-    ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    :
-    ::XSCRT::Type (),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
+::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+source () const
+{
+return *source_;
+}
 
-    ::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
-    operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    {
-      requiredType (s.requiredType ());
+void PlanConnectionDescription::
+source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (source_.get ())
+{
+*source_ = e;
+}
 
-      return *this;
-    }
+else
+{
+source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+source_->container (this);
+}
+}
 
+// PlanConnectionDescription
+//
+PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-    // ImplementationDependency
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
+PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-    void ImplementationDependency::
-    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredType_ = e;
-    }
+PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
+PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-    // Capability
-    // 
+void PlanConnectionDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-    Capability::
-    Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-    ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
+size_t PlanConnectionDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-    Capability::
-    Capability (::CIAO::Config_Handlers::Capability const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
+// PlanConnectionDescription
+//
+PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+begin_externalEndpoint ()
+{
+return externalEndpoint_.begin ();
+}
 
-    ::CIAO::Config_Handlers::Capability& Capability::
-    operator= (::CIAO::Config_Handlers::Capability const& s)
-    {
-      name (s.name ());
+PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+end_externalEndpoint ()
+{
+return externalEndpoint_.end ();
+}
 
-      resourceType (s.resourceType ());
+PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+begin_externalEndpoint () const
+{
+return externalEndpoint_.begin ();
+}
 
-      property (s.property ());
+PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+end_externalEndpoint () const
+{
+return externalEndpoint_.end ();
+}
 
-      return *this;
-    }
+void PlanConnectionDescription::
+add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+{
+externalEndpoint_.push_back (e);
+}
 
+size_t PlanConnectionDescription::
+count_externalEndpoint(void) const
+{
+return externalEndpoint_.size ();
+}
 
-    // Capability
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Capability::
-    name () const
-    {
-      return *name_;
-    }
+// PlanConnectionDescription
+//
+PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+begin_internalEndpoint ()
+{
+return internalEndpoint_.begin ();
+}
 
-    void Capability::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+end_internalEndpoint ()
+{
+return internalEndpoint_.end ();
+}
 
-    // Capability
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Capability::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+begin_internalEndpoint () const
+{
+return internalEndpoint_.begin ();
+}
 
-    void Capability::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+end_internalEndpoint () const
+{
+return internalEndpoint_.end ();
+}
 
-    // Capability
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& Capability::
-    property () const
-    {
-      return *property_;
-    }
+void PlanConnectionDescription::
+add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
+{
+internalEndpoint_.push_back (e);
+}
 
-    void Capability::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
+size_t PlanConnectionDescription::
+count_internalEndpoint(void) const
+{
+return internalEndpoint_.size ();
+}
 
+// PlanConnectionDescription
+//
+PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+begin_externalReference ()
+{
+return externalReference_.begin ();
+}
 
-    // ImplementationRequirement
-    // 
-
-    ImplementationRequirement::
-    ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourcePort__,
-    ::XMLSchema::string< ACE_TCHAR > const& componentPort__,
-    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-    ::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::Property const& property__)
-    : 
-    ::XSCRT::Type (), 
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
-    resourcePort_ (new ::XMLSchema::string< ACE_TCHAR > (resourcePort__)),
-    componentPort_ (new ::XMLSchema::string< ACE_TCHAR > (componentPort__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    property_ (new ::CIAO::Config_Handlers::Property (property__)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+end_externalReference ()
+{
+return externalReference_.end ();
+}
 
-    ImplementationRequirement::
-    ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    :
-    ::XSCRT::Type (),
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-    resourcePort_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourcePort_)),
-    componentPort_ (new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+begin_externalReference () const
+{
+return externalReference_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
-    operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    {
-      resourceUsage (s.resourceUsage ());
+PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+end_externalReference () const
+{
+return externalReference_.end ();
+}
 
-      resourcePort (s.resourcePort ());
+void PlanConnectionDescription::
+add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+{
+externalReference_.push_back (e);
+}
 
-      componentPort (s.componentPort ());
+size_t PlanConnectionDescription::
+count_externalReference(void) const
+{
+return externalReference_.size ();
+}
 
-      resourceType (s.resourceType ());
+// PlanConnectionDescription
+//
+PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+begin_deployedResource ()
+{
+return deployedResource_.begin ();
+}
 
-      name (s.name ());
+PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+end_deployedResource ()
+{
+return deployedResource_.end ();
+}
 
-      property (s.property ());
+PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+begin_deployedResource () const
+{
+return deployedResource_.begin ();
+}
 
-      return *this;
-    }
+PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+end_deployedResource () const
+{
+return deployedResource_.end ();
+}
 
+void PlanConnectionDescription::
+add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
+{
+deployedResource_.push_back (e);
+}
 
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
+size_t PlanConnectionDescription::
+count_deployedResource(void) const
+{
+return deployedResource_.size ();
+}
 
-    void ImplementationRequirement::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    resourcePort () const
-    {
-      return *resourcePort_;
-    }
+// ImplementationDependency
+//
 
-    void ImplementationRequirement::
-    resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourcePort_ = e;
-    }
+ImplementationDependency::
+ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    componentPort () const
-    {
-      return *componentPort_;
-    }
+ImplementationDependency::
+ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-    void ImplementationRequirement::
-    componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *componentPort_ = e;
-    }
+::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
+operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
+{
+requiredType (s.requiredType ());
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+return *this;
+}
 
-    void ImplementationRequirement::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    name () const
-    {
-      return *name_;
-    }
+// ImplementationDependency
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
+requiredType () const
+{
+return *requiredType_;
+}
 
-    void ImplementationRequirement::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void ImplementationDependency::
+requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requiredType_ = e;
+}
 
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::Property const& ImplementationRequirement::
-    property () const
-    {
-      return *property_;
-    }
 
-    void ImplementationRequirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
+// Capability
+//
 
+Capability::
+Capability (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // ComponentPackageReference
-    // 
+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);
+}
 
-    ComponentPackageReference::
-    ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredUUID__,
-    ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-    ::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-    : 
-    ::XSCRT::Type (), 
-    requiredUUID_ (new ::XMLSchema::string< ACE_TCHAR > (requiredUUID__)),
-    requiredName_ (new ::XMLSchema::string< ACE_TCHAR > (requiredName__)),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-    ComponentPackageReference::
-    ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    :
-    ::XSCRT::Type (),
-    requiredUUID_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_)),
-    requiredName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_)),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
+::CIAO::Config_Handlers::Capability& Capability::
+operator= (::CIAO::Config_Handlers::Capability const& s)
+{
+name (s.name ());
 
-    ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
-    operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    {
-      requiredUUID (s.requiredUUID ());
+resourceType_.clear ();
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-      requiredName (s.requiredName ());
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-      requiredType (s.requiredType ());
+return *this;
+}
 
-      return *this;
-    }
 
+// Capability
+//
+::XMLSchema::string< ACE_TCHAR > const& Capability::
+name () const
+{
+return *name_;
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredUUID () const
-    {
-      return *requiredUUID_;
-    }
+void Capability::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void ComponentPackageReference::
-    requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredUUID_ = e;
-    }
+// Capability
+//
+Capability::resourceType_iterator Capability::
+begin_resourceType ()
+{
+return resourceType_.begin ();
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredName () const
-    {
-      return *requiredName_;
-    }
+Capability::resourceType_iterator Capability::
+end_resourceType ()
+{
+return resourceType_.end ();
+}
 
-    void ComponentPackageReference::
-    requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredName_ = e;
-    }
+Capability::resourceType_const_iterator Capability::
+begin_resourceType () const
+{
+return resourceType_.begin ();
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
+Capability::resourceType_const_iterator Capability::
+end_resourceType () const
+{
+return resourceType_.end ();
+}
 
-    void ComponentPackageReference::
-    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredType_ = e;
-    }
+void Capability::
+add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+resourceType_.push_back (e);
+}
 
+size_t Capability::
+count_resourceType(void) const
+{
+return resourceType_.size ();
+}
 
-    // SubcomponentPortEndpoint
-    // 
+// Capability
+//
+Capability::property_iterator Capability::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    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);
-    }
+Capability::property_iterator Capability::
+end_property ()
+{
+return property_.end ();
+}
 
-    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);
-    }
+Capability::property_const_iterator Capability::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    ::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
-    operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-    {
-      portName (s.portName ());
+Capability::property_const_iterator Capability::
+end_property () const
+{
+return property_.end ();
+}
 
-      instance (s.instance ());
+void Capability::
+add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+{
+property_.push_back (e);
+}
 
-      return *this;
-    }
+size_t Capability::
+count_property(void) const
+{
+return property_.size ();
+}
 
 
-    // SubcomponentPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
+// ImplementationRequirement
+//
 
-    void SubcomponentPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
+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);
+}
 
-    // SubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
+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);
+}
+}
 
-    void SubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *instance_ = e;
-    }
+::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);
 
+if (s.resourcePort_.get ()) resourcePort (*(s.resourcePort_));
+else resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // AssemblyConnectionDescription
-    // 
+if (s.componentPort_.get ()) componentPort (*(s.componentPort_));
+else componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+resourceType (s.resourceType ());
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
+name (s.name ());
 
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
-    }
+return *this;
+}
 
-    ::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
-    operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-    {
-      name (s.name ());
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+resourceUsage_p () const
+{
+return resourceUsage_.get () != 0;
+}
 
-      externalEndpoint_.clear ();
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
-        i != s.externalEndpoint_.end ();
-        ++i) add_externalEndpoint (*i);
-      }
+::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
+resourceUsage () const
+{
+return *resourceUsage_;
+}
 
-      internalEndpoint_.clear ();
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
-        i != s.internalEndpoint_.end ();
-        ++i) add_internalEndpoint (*i);
-      }
+void ImplementationRequirement::
+resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+{
+if (resourceUsage_.get ())
+{
+*resourceUsage_ = e;
+}
 
-      externalReference_.clear ();
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());
-        i != s.externalReference_.end ();
-        ++i) add_externalReference (*i);
-      }
+else
+{
+resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+resourceUsage_->container (this);
+}
+}
 
-      return *this;
-    }
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+resourcePort_p () const
+{
+return resourcePort_.get () != 0;
+}
 
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+resourcePort () const
+{
+return *resourcePort_;
+}
 
-    // AssemblyConnectionDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
+void ImplementationRequirement::
+resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (resourcePort_.get ())
+{
+*resourcePort_ = e;
+}
 
-    void AssemblyConnectionDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+else
+{
+resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourcePort_->container (this);
+}
+}
 
-    // AssemblyConnectionDescription
-    // 
-    bool AssemblyConnectionDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+componentPort_p () const
+{
+return componentPort_.get () != 0;
+}
 
-    ::CIAO::Config_Handlers::Requirement const& AssemblyConnectionDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+componentPort () const
+{
+return *componentPort_;
+}
 
-    void AssemblyConnectionDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
+void ImplementationRequirement::
+componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (componentPort_.get ())
+{
+*componentPort_ = e;
+}
 
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+else
+{
+componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+componentPort_->container (this);
+}
+}
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-    begin_externalEndpoint ()
-    {
-      return externalEndpoint_.begin ();
-    }
+// ImplementationRequirement
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+resourceType () const
+{
+return *resourceType_;
+}
 
-    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-    end_externalEndpoint ()
-    {
-      return externalEndpoint_.end ();
-    }
+void ImplementationRequirement::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
 
-    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-    begin_externalEndpoint () const
-    {
-      return externalEndpoint_.begin ();
-    }
+// ImplementationRequirement
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+name () const
+{
+return *name_;
+}
 
-    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-    end_externalEndpoint () const
-    {
-      return externalEndpoint_.end ();
-    }
+void ImplementationRequirement::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void AssemblyConnectionDescription::
-    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-    {
-      externalEndpoint_.push_back (e);
-    }
+// ImplementationRequirement
+//
+ImplementationRequirement::property_iterator ImplementationRequirement::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    size_t AssemblyConnectionDescription::
-    count_externalEndpoint(void) const
-    {
-      return externalEndpoint_.size ();
-    }
+ImplementationRequirement::property_iterator ImplementationRequirement::
+end_property ()
+{
+return property_.end ();
+}
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-    begin_internalEndpoint ()
-    {
-      return internalEndpoint_.begin ();
-    }
+ImplementationRequirement::property_const_iterator ImplementationRequirement::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-    end_internalEndpoint ()
-    {
-      return internalEndpoint_.end ();
-    }
+ImplementationRequirement::property_const_iterator ImplementationRequirement::
+end_property () const
+{
+return property_.end ();
+}
 
-    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-    begin_internalEndpoint () const
-    {
-      return internalEndpoint_.begin ();
-    }
+void ImplementationRequirement::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-    end_internalEndpoint () const
-    {
-      return internalEndpoint_.end ();
-    }
+size_t ImplementationRequirement::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    void AssemblyConnectionDescription::
-    add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
-    {
-      internalEndpoint_.push_back (e);
-    }
 
-    size_t AssemblyConnectionDescription::
-    count_internalEndpoint(void) const
-    {
-      return internalEndpoint_.size ();
-    }
+// ComponentPackageReference
+//
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-    begin_externalReference ()
-    {
-      return externalReference_.begin ();
-    }
+ComponentPackageReference::
+ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-    end_externalReference ()
-    {
-      return externalReference_.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);
+}
 
-    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-    begin_externalReference () const
-    {
-      return externalReference_.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);
 
-    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-    end_externalReference () const
-    {
-      return externalReference_.end ();
-    }
+if (s.requiredName_.get ()) requiredName (*(s.requiredName_));
+else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    void AssemblyConnectionDescription::
-    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-    {
-      externalReference_.push_back (e);
-    }
+requiredType (s.requiredType ());
 
-    size_t AssemblyConnectionDescription::
-    count_externalReference(void) const
-    {
-      return externalReference_.size ();
-    }
-  }
+return *this;
 }
 
-namespace CIAO
+
+// ComponentPackageReference
+//
+bool ComponentPackageReference::
+requiredUUID_p () const
 {
-  namespace Config_Handlers
-  {
-    // TCKind
-    //
+return requiredUUID_.get () != 0;
+}
 
-    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 
-      {
-      }
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredUUID () const
+{
+return *requiredUUID_;
+}
 
-    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 
-      {
-      }
-    }
+void ComponentPackageReference::
+requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (requiredUUID_.get ())
+{
+*requiredUUID_ = e;
+}
 
-    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);
+else
+{
+requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredUUID_->container (this);
+}
+}
 
-    // DataType
-    //
+// ComponentPackageReference
+//
+bool ComponentPackageReference::
+requiredName_p () const
+{
+return requiredName_.get () != 0;
+}
 
-    DataType::
-    DataType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredName () const
+{
+return *requiredName_;
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+void ComponentPackageReference::
+requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (requiredName_.get ())
+{
+*requiredName_ = 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 ()));
+else
+{
+requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredName_->container (this);
+}
+}
 
-        if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
-          kind_->container (this);
-        }
+// ComponentPackageReference
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredType () const
+{
+return *requiredType_;
+}
 
-        else if (n == "enum")
-        {
-          ::CIAO::Config_Handlers::EnumType t (e);
-          enum_ (t);
-        }
+void ComponentPackageReference::
+requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requiredType_ = e;
+}
 
-        else 
-        {
-        }
-      }
-    }
 
-    // DataValue
-    //
+// SubcomponentPortEndpoint
+//
 
-    DataValue::
-    DataValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+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);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+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);
+}
 
-      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 ()));
+::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
+operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
+{
+portName (s.portName ());
 
-        if (n == "short")
-        {
-          ::XMLSchema::short_ t (e);
-          add_short (t);
-        }
+instance (s.instance ());
 
-        else if (n == "long")
-        {
-          ::XMLSchema::int_ t (e);
-          add_long (t);
-        }
+return *this;
+}
 
-        else if (n == "ushort")
-        {
-          ::XMLSchema::unsignedShort t (e);
-          add_ushort (t);
-        }
 
-        else if (n == "ulong")
-        {
-          ::XMLSchema::unsignedInt t (e);
-          add_ulong (t);
-        }
+// SubcomponentPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-        else if (n == "float")
-        {
-          ::XMLSchema::float_ t (e);
-          add_float (t);
-        }
+void SubcomponentPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-        else if (n == "double")
-        {
-          ::XMLSchema::double_ t (e);
-          add_double (t);
-        }
+// SubcomponentPortEndpoint
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
+instance () const
+{
+return *instance_;
+}
 
-        else if (n == "boolean")
-        {
-          ::XMLSchema::boolean t (e);
-          add_boolean (t);
-        }
+void SubcomponentPortEndpoint::
+instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*instance_ = e;
+}
 
-        else if (n == "octet")
-        {
-          ::XMLSchema::unsignedByte t (e);
-          add_octet (t);
-        }
 
-        else if (n == "enum")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_enum (t);
-        }
+// AssemblyConnectionDescription
+//
 
-        else if (n == "string")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_string (t);
-        }
+AssemblyConnectionDescription::
+AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-        else if (n == "longlong")
-        {
-          ::XMLSchema::long_ t (e);
-          add_longlong (t);
-        }
+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);
+}
 
-        else if (n == "ulonglong")
-        {
-          ::XMLSchema::unsignedLong t (e);
-          add_ulonglong (t);
-        }
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-        else if (n == "longdouble")
-        {
-          ::XMLSchema::double_ t (e);
-          add_longdouble (t);
-        }
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-        else 
-        {
-        }
-      }
-    }
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
+}
 
-    // EnumType
-    //
+::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
+operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
+{
+name (s.name ());
 
-    EnumType::
-    EnumType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+internalEndpoint_.clear ();
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-      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 ()));
+externalEndpoint_.clear ();
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+externalReference_.clear ();
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-        else if (n == "typeId")
-        {
-          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          typeId_->container (this);
-        }
+return *this;
+}
 
-        else if (n == "member")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_member (t);
-        }
 
-        else 
-        {
-        }
-      }
-    }
+// AssemblyConnectionDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
+name () const
+{
+return *name_;
+}
 
-    // Any
-    //
+void AssemblyConnectionDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    Any::
-    Any (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      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 ()));
+AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-        if (n == "type")
-        {
-          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-          type_->container (this);
-        }
+AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
-          value_->container (this);
-        }
+void AssemblyConnectionDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-        else 
-        {
-        }
-      }
-    }
+size_t AssemblyConnectionDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-    // Property
-    //
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+begin_internalEndpoint ()
+{
+return internalEndpoint_.begin ();
+}
 
-    Property::
-    Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+end_internalEndpoint ()
+{
+return internalEndpoint_.end ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+begin_internalEndpoint () const
+{
+return internalEndpoint_.begin ();
+}
 
-      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 ()));
+AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+end_internalEndpoint () const
+{
+return internalEndpoint_.end ();
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+void AssemblyConnectionDescription::
+add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
+{
+internalEndpoint_.push_back (e);
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          value_->container (this);
-        }
+size_t AssemblyConnectionDescription::
+count_internalEndpoint(void) const
+{
+return internalEndpoint_.size ();
+}
 
-        else 
-        {
-        }
-      }
-    }
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+begin_externalEndpoint ()
+{
+return externalEndpoint_.begin ();
+}
 
-    // SatisfierPropertyKind
-    //
+AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+end_externalEndpoint ()
+{
+return externalEndpoint_.end ();
+}
 
-    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 
-      {
-      }
-    }
+AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+begin_externalEndpoint () const
+{
+return externalEndpoint_.begin ();
+}
 
-    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 
-      {
-      }
-    }
+AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+end_externalEndpoint () const
+{
+return externalEndpoint_.end ();
+}
 
-    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);
+void AssemblyConnectionDescription::
+add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+{
+externalEndpoint_.push_back (e);
+}
 
-    // SatisfierProperty
-    //
+size_t AssemblyConnectionDescription::
+count_externalEndpoint(void) const
+{
+return externalEndpoint_.size ();
+}
 
-    SatisfierProperty::
-    SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+begin_externalReference ()
+{
+return externalReference_.begin ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+end_externalReference ()
+{
+return externalReference_.end ();
+}
 
-      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 ()));
+AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+begin_externalReference () const
+{
+return externalReference_.begin ();
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+end_externalReference () const
+{
+return externalReference_.end ();
+}
 
-        else if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
-          kind_->container (this);
-        }
+void AssemblyConnectionDescription::
+add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+{
+externalReference_.push_back (e);
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          value_->container (this);
-        }
+size_t AssemblyConnectionDescription::
+count_externalReference(void) const
+{
+return externalReference_.size ();
+}
+}
+}
 
-        else 
-        {
-        }
-      }
-    }
+namespace CIAO
+{
+namespace Config_Handlers
+{
+// TCKind
+//
 
-    // Resource
-    //
+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
+{
+}
+}
 
-    Resource::
-    Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+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
+{
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+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__ ()
+{
 
-      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 == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
+kind_->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 == "enum")
+{
+::CIAO::Config_Handlers::EnumType t (e);
+enum_ (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // Requirement
-    //
+// DataValue
+//
 
-    Requirement::
-    Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+DataValue::
+DataValue (::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 == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+if (n == "short")
+{
+::XMLSchema::short_ t (e);
+add_short (t);
+}
 
-        else if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "long")
+{
+::XMLSchema::int_ t (e);
+add_long (t);
+}
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-          property_->container (this);
-        }
+else if (n == "ushort")
+{
+::XMLSchema::unsignedShort t (e);
+add_ushort (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "ulong")
+{
+::XMLSchema::unsignedInt t (e);
+add_ulong (t);
+}
 
-    // ResourceDeploymentDescription
-    //
+else if (n == "float")
+{
+::XMLSchema::float_ t (e);
+add_float (t);
+}
 
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::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 == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->container (this);
-        }
+else if (n == "enum")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_enum (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 == "string")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_string (t);
+}
 
-        else if (n == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+else if (n == "longlong")
+{
+::XMLSchema::long_ t (e);
+add_longlong (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "ulonglong")
+{
+::XMLSchema::unsignedLong t (e);
+add_ulonglong (t);
+}
 
-    // ArtifactDeploymentDescription
-    //
+else if (n == "longdouble")
+{
+::XMLSchema::double_ t (e);
+add_longdouble (t);
+}
 
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// EnumType
+//
 
-      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 ()));
+EnumType::
+EnumType (::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 == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_source (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 == "node")
-        {
-          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          node_->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 == "location")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_location (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 == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_execParameter (t);
-        }
+else if (n == "member")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_member (t);
+}
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          add_deployRequirement (t);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
-          add_deployedResource (t);
-        }
+// Any
+//
 
-        else 
-        {
-        }
-      }
+Any::
+Any (::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 ()));
 
-    // MonolithicDeploymentDescription
-    //
+if (n == "type")
+{
+type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+type_->container (this);
+}
 
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (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 ()));
+// Property
+//
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+Property::
+Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_source (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "artifact")
-        {
-          ::XMLSchema::IDREF< ACE_TCHAR > t (e);
-          add_artifact (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 == "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 == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+value_->container (this);
+}
 
-        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);
-        }
+// SatisfierPropertyKind
+//
 
-        else 
-        {
-        }
-      }
-    }
+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
+{
+}
+}
 
-    // ResourceUsageKind
-    //
+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
+{
+}
+}
 
-    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 
-      {
-      }
-    }
+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);
 
-    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 
-      {
-      }
-    }
+// SatisfierProperty
+//
 
-    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);
+SatisfierProperty::
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // InstanceResourceDeploymentDescription
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::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 == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (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 == "dynamic")
+{
+dynamic_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+dynamic_->container (this);
+}
 
-        else if (n == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->container (this);
-        }
+else if (n == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+value_->container (this);
+}
 
-        else if (n == "resourceName")
-        {
-          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceName_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+// Resource
+//
 
-        else 
-        {
-        }
-      }
-    }
+Resource::
+Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // InstanceDeploymentDescription
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::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 == "resourceType")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_resourceType (t);
+}
 
-        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::SatisfierProperty t (e);
+add_property (t);
+}
 
-        else if (n == "node")
-        {
-          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          node_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "source")
-        {
-          source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          source_->container (this);
-        }
+// Requirement
+//
 
-        else if (n == "implementation")
-        {
-          implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-          implementation_->container (this);
-        }
+Requirement::
+Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_configProperty (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedResource (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 == "deployedSharedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedSharedResource (t);
-        }
+if (n == "resourceType")
+{
+resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceType_->container (this);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->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 == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // CCMComponentPortKind
-    //
+// ResourceDeploymentDescription
+//
 
-    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 
-      {
-      }
-    }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    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 
-      {
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    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);
+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 ()));
 
-    // ComponentPortDescription
-    //
+if (n == "requirementName")
+{
+requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requirementName_->container (this);
+}
 
-    ComponentPortDescription::
-    ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "resourceName")
+{
+resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceName_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (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 == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+// ArtifactDeploymentDescription
+//
 
-        else if (n == "specificType")
-        {
-          specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          specificType_->container (this);
-        }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "supportedType")
-        {
-          supportedType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          supportedType_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "provider")
-        {
-          provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          provider_->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 == "exclusiveProvider")
-        {
-          exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          exclusiveProvider_->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 == "exclusiveUser")
-        {
-          exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          exclusiveUser_->container (this);
-        }
+else if (n == "source")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_source (t);
+}
 
-        else if (n == "optional")
-        {
-          optional_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          optional_->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 == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
-          kind_->container (this);
-        }
+else if (n == "location")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_location (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "execParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_execParameter (t);
+}
 
-    // ComponentPropertyDescription
-    //
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
 
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "deployedResource")
+{
+::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
+add_deployedResource (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 == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "type")
-        {
-          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-          type_->container (this);
-        }
+// MonolithicDeploymentDescription
+//
 
-        else 
-        {
-        }
-      }
-    }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // ComponentExternalPortEndpoint
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::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 == "portName")
-        {
-          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          portName_->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);
+}
 
-    // PlanSubcomponentPortEndpoint
-    //
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
 
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::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 if (n == "provider")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          provider (t);
-        }
+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::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (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 == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-          instance_->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 
-        {
-        }
-      }
-    }
+// InstanceResourceDeploymentDescription
+//
 
-    // ExternalReferenceEndpoint
-    //
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::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 == "resourceUsage")
+{
+resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+resourceUsage_->container (this);
+}
 
-        if (n == "location")
-        {
-          location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          location_->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);
+}
 
-    // ConnectionResourceDeploymentDescription
-    //
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::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 == "targetName")
-        {
-          targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          targetName_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->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 == "resourceName")
-        {
-          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceName_->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 == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+else if (n == "node")
+{
+node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+node_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "source")
+{
+source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+source_->container (this);
+}
 
-    // PlanConnectionDescription
-    //
+else if (n == "implementation")
+{
+implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+implementation_->container (this);
+}
 
-    PlanConnectionDescription::
-    PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "deployedResource")
+{
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+deployedResource (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 == "deployedSharedResource")
+{
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+deployedSharedResource (t);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else
+{
+}
+}
 
-        else if (n == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          source (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 == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          add_deployRequirement (t);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "externalEndpoint")
-        {
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-          add_externalEndpoint (t);
-        }
+// CCMComponentPortKind
+//
 
-        else if (n == "internalEndpoint")
-        {
-          ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
-          add_internalEndpoint (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 if (n == "externalReference")
-        {
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-          add_externalReference (t);
-        }
+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
+{
+}
+}
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
-          add_deployedResource (t);
-        }
+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 
-        {
-        }
-      }
-    }
+// ComponentPortDescription
+//
 
-    // ImplementationDependency
-    //
+ComponentPortDescription::
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    ImplementationDependency::
-    ImplementationDependency (::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 == "requiredType")
-        {
-          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredType_->container (this);
-        }
+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);
+}
 
-    // Capability
-    //
+else if (n == "provider")
+{
+provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+provider_->container (this);
+}
 
-    Capability::
-    Capability (::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 == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
+kind_->container (this);
+}
 
-        else if (n == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
-          property_->container (this);
-        }
+// ComponentPropertyDescription
+//
 
-        else 
-        {
-        }
-      }
-    }
+ComponentPropertyDescription::
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // ImplementationRequirement
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    ImplementationRequirement::
-    ImplementationRequirement (::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 == "resourceUsage")
-        {
-          resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
-          resourceUsage_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "resourcePort")
-        {
-          resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourcePort_->container (this);
-        }
+// ComponentExternalPortEndpoint
+//
 
-        else if (n == "componentPort")
-        {
-          componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          componentPort_->container (this);
-        }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::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")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-          property_->container (this);
-        }
+if (n == "portName")
+{
+portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+portName_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // ComponentPackageReference
-    //
+// PlanSubcomponentPortEndpoint
+//
 
-    ComponentPackageReference::
-    ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::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 == "requiredUUID")
-        {
-          requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredUUID_->container (this);
-        }
+if (n == "portName")
+{
+portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+portName_->container (this);
+}
 
-        else if (n == "requiredName")
-        {
-          requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredName_->container (this);
-        }
+else if (n == "provider")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+provider (t);
+}
 
-        else 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 if (n == "instance")
+{
+instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+instance_->container (this);
+}
 
-    // SubcomponentPortEndpoint
-    //
+else
+{
+}
+}
+}
 
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// ExternalReferenceEndpoint
+//
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::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 == "location")
+{
+location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+location_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // AssemblyConnectionDescription
-    //
+// ConnectionResourceDeploymentDescription
+//
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::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 == "targetName")
+{
+targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+targetName_->container (this);
+}
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (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 == "externalEndpoint")
-        {
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-          add_externalEndpoint (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 == "internalEndpoint")
-        {
-          ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
-          add_internalEndpoint (t);
-        }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-        else if (n == "externalReference")
-        {
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-          add_externalReference (t);
-        }
+else
+{
+}
+}
+}
 
-        else 
-        {
-        }
-      }
-    }
-  }
+// PlanConnectionDescription
+//
+
+PlanConnectionDescription::
+PlanConnectionDescription (::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 == "source")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+source (t);
+}
+
+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 AnyTypeInfoInitializer
+{
+AnyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Any));
+::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_;
+AnyTypeInfoInitializer AnyTypeInfoInitializer_;
 
-      struct PropertyTypeInfoInitializer
-      {
-        PropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Property));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct PropertyTypeInfoInitializer
+{
+PropertyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Property));
+::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_;
+PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
 
-      struct SatisfierPropertyKindTypeInfoInitializer
-      {
-        SatisfierPropertyKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SatisfierPropertyKindTypeInfoInitializer
+{
+SatisfierPropertyKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
+::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));
+}
+};
 
-      SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
+SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
 
-      struct SatisfierPropertyTypeInfoInitializer
-      {
-        SatisfierPropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierProperty));
-          ::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));
+}
+};
 
-      SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
+SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
 
-      struct ResourceTypeInfoInitializer
-      {
-        ResourceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Resource));
-          ::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));
+}
+};
 
-      ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
+ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
 
-      struct RequirementTypeInfoInitializer
-      {
-        RequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Requirement));
-          ::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));
+}
+};
 
-      RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
+RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
 
-      struct ResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
-          ::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));
+}
+};
 
-      ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
+ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct ArtifactDeploymentDescriptionTypeInfoInitializer
-      {
-        ArtifactDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
-          ::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));
+}
+};
 
-      ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
+ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
 
-      struct MonolithicDeploymentDescriptionTypeInfoInitializer
-      {
-        MonolithicDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
-          ::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));
-          ::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));
+}
+};
 
-      MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
+MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
 
-      struct ResourceUsageKindTypeInfoInitializer
-      {
-        ResourceUsageKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceUsageKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ResourceUsageKindTypeInfoInitializer
+{
+ResourceUsageKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ResourceUsageKind));
+::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));
+}
+};
 
-      ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
+ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
 
-      struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
-          ::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));
+}
+};
 
-      InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
+InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct InstanceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
-          ::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));
+}
+};
 
-      InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
+InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct CCMComponentPortKindTypeInfoInitializer
-      {
-        CCMComponentPortKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (CCMComponentPortKind));
-          ::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));
+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));
+}
+};
 
-      CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
+CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
 
-      struct ComponentPortDescriptionTypeInfoInitializer
-      {
-        ComponentPortDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPortDescription));
-          ::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));
+}
+};
 
-      ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
+ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
 
-      struct ComponentPropertyDescriptionTypeInfoInitializer
-      {
-        ComponentPropertyDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
-          ::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));
+}
+};
 
-      ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
+ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
 
-      struct ComponentExternalPortEndpointTypeInfoInitializer
-      {
-        ComponentExternalPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
-          ::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));
+}
+};
 
-      ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
+ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
 
-      struct PlanSubcomponentPortEndpointTypeInfoInitializer
-      {
-        PlanSubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
-          ::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));
+}
+};
 
-      PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
+PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
 
-      struct ExternalReferenceEndpointTypeInfoInitializer
-      {
-        ExternalReferenceEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
-          ::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));
+}
+};
 
-      ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
+ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
 
-      struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
-          ::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));
+}
+};
 
-      ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
+ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct PlanConnectionDescriptionTypeInfoInitializer
-      {
-        PlanConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanConnectionDescription));
-          ::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));
+}
+};
 
-      PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
+PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
 
-      struct ImplementationDependencyTypeInfoInitializer
-      {
-        ImplementationDependencyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationDependency));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
+ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
 
-      struct CapabilityTypeInfoInitializer
-      {
-        CapabilityTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Capability));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
+CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
 
-      struct ImplementationRequirementTypeInfoInitializer
-      {
-        ImplementationRequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationRequirement));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
+ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
 
-      struct ComponentPackageReferenceTypeInfoInitializer
-      {
-        ComponentPackageReferenceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPackageReference));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
 
-      struct SubcomponentPortEndpointTypeInfoInitializer
-      {
-        SubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
+SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
 
-      struct AssemblyConnectionDescriptionTypeInfoInitializer
-      {
-        AssemblyConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+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));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
-    }
-  }
+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);
+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);
+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::
+post (Type&)
+{
+}
 
-      void DataType::
-      post (Type const&)
-      {
-      }
+void DataType::
+post (Type const&)
+{
+}
 
-      // DataValue
-      //
-      //
+// DataValue
+//
+//
 
-      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 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 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 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 DataValue::
-      pre (Type&)
-      {
-      }
+void DataValue::
+pre (Type&)
+{
+}
 
-      void DataValue::
-      pre (Type const&)
-      {
-      }
+void DataValue::
+pre (Type const&)
+{
+}
 
-      void DataValue::
-      short_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
+void DataValue::
+short_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
 
-        if (b != e)
-        {
-          short_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) short_next (o);
-          }
-
-          short_post (o);
-        }
+if (b != e)
+{
+short_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) short_next (o);
+}
 
-        else short_none (o);
-      }
+short_post (o);
+}
 
-      void DataValue::
-      short_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
+else short_none (o);
+}
 
-        if (b != e)
-        {
-          short_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) short_next (o);
-          }
-
-          short_post (o);
-        }
+void DataValue::
+short_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
 
-        else short_none (o);
-      }
+if (b != e)
+{
+short_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) short_next (o);
+}
 
-      void DataValue::
-      short_pre (Type&)
-      {
-      }
+short_post (o);
+}
 
-      void DataValue::
-      short_pre (Type const&)
-      {
-      }
+else short_none (o);
+}
 
-      void DataValue::
-      short_next (Type&)
-      {
-      }
+void DataValue::
+short_pre (Type&)
+{
+}
 
-      void DataValue::
-      short_next (Type const&)
-      {
-      }
+void DataValue::
+short_pre (Type const&)
+{
+}
 
-      void DataValue::
-      short_post (Type&)
-      {
-      }
+void DataValue::
+short_next (Type&)
+{
+}
 
-      void DataValue::
-      short_post (Type const&)
-      {
-      }
+void DataValue::
+short_next (Type const&)
+{
+}
 
-      void DataValue::
-      short_none (Type&)
-      {
-      }
+void DataValue::
+short_post (Type&)
+{
+}
 
-      void DataValue::
-      short_none (Type const&)
-      {
-      }
+void DataValue::
+short_post (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_none (Type&)
+{
+}
 
-        if (b != e)
-        {
-          long_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) long_next (o);
-          }
-
-          long_post (o);
-        }
+void DataValue::
+short_none (Type const&)
+{
+}
 
-        else long_none (o);
-      }
+void DataValue::
+long_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long());
 
-      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)
+{
+long_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) long_next (o);
+}
 
-        if (b != e)
-        {
-          long_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) long_next (o);
-          }
-
-          long_post (o);
-        }
+long_post (o);
+}
 
-        else long_none (o);
-      }
+else long_none (o);
+}
 
-      void DataValue::
-      long_pre (Type&)
-      {
-      }
+void DataValue::
+long_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long());
 
-      void DataValue::
-      long_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+long_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) long_next (o);
+}
 
-      void DataValue::
-      long_next (Type&)
-      {
-      }
+long_post (o);
+}
 
-      void DataValue::
-      long_next (Type const&)
-      {
-      }
+else long_none (o);
+}
 
-      void DataValue::
-      long_post (Type&)
-      {
-      }
+void DataValue::
+long_pre (Type&)
+{
+}
 
-      void DataValue::
-      long_post (Type const&)
-      {
-      }
+void DataValue::
+long_pre (Type const&)
+{
+}
 
-      void DataValue::
-      long_none (Type&)
-      {
-      }
+void DataValue::
+long_next (Type&)
+{
+}
 
-      void DataValue::
-      long_none (Type const&)
-      {
-      }
+void DataValue::
+long_next (Type const&)
+{
+}
 
-      void DataValue::
-      ushort (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
+void DataValue::
+long_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          ushort_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) ushort_next (o);
-          }
-
-          ushort_post (o);
-        }
+void DataValue::
+long_post (Type const&)
+{
+}
 
-        else ushort_none (o);
-      }
+void DataValue::
+long_none (Type&)
+{
+}
 
-      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_none (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 (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
 
-        else ushort_none (o);
-      }
+if (b != e)
+{
+ushort_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ushort_next (o);
+}
 
-      void DataValue::
-      ushort_pre (Type&)
-      {
-      }
+ushort_post (o);
+}
 
-      void DataValue::
-      ushort_pre (Type const&)
-      {
-      }
+else ushort_none (o);
+}
 
-      void DataValue::
-      ushort_next (Type&)
-      {
-      }
+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::
-      ushort_next (Type const&)
-      {
-      }
+if (b != e)
+{
+ushort_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ushort_next (o);
+}
 
-      void DataValue::
-      ushort_post (Type&)
-      {
-      }
+ushort_post (o);
+}
 
-      void DataValue::
-      ushort_post (Type const&)
-      {
-      }
+else ushort_none (o);
+}
 
-      void DataValue::
-      ushort_none (Type&)
-      {
-      }
+void DataValue::
+ushort_pre (Type&)
+{
+}
 
-      void DataValue::
-      ushort_none (Type const&)
-      {
-      }
+void DataValue::
+ushort_pre (Type const&)
+{
+}
 
-      void DataValue::
-      ulong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulong_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);
-          }
-
-          ulong_post (o);
-        }
+void DataValue::
+ushort_next (Type const&)
+{
+}
 
-        else ulong_none (o);
-      }
+void DataValue::
+ushort_post (Type&)
+{
+}
 
-      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_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          ulong_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) ulong_next (o);
-          }
-
-          ulong_post (o);
-        }
+void DataValue::
+ushort_none (Type&)
+{
+}
 
-        else ulong_none (o);
-      }
+void DataValue::
+ushort_none (Type const&)
+{
+}
 
-      void DataValue::
-      ulong_pre (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_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+ulong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulong_next (o);
+}
 
-      void DataValue::
-      ulong_next (Type&)
-      {
-      }
+ulong_post (o);
+}
 
-      void DataValue::
-      ulong_next (Type const&)
-      {
-      }
+else ulong_none (o);
+}
 
-      void DataValue::
-      ulong_post (Type&)
-      {
-      }
+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_post (Type const&)
-      {
-      }
+if (b != e)
+{
+ulong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulong_next (o);
+}
 
-      void DataValue::
-      ulong_none (Type&)
-      {
-      }
+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);
-          }
-
-          float_post (o);
-        }
+void DataValue::
+ulong_pre (Type const&)
+{
+}
 
-        else float_none (o);
-      }
+void DataValue::
+ulong_next (Type&)
+{
+}
 
-      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_next (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          float_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) float_next (o);
-          }
-
-          float_post (o);
-        }
+void DataValue::
+ulong_post (Type&)
+{
+}
 
-        else float_none (o);
-      }
+void DataValue::
+ulong_post (Type const&)
+{
+}
 
-      void DataValue::
-      float_pre (Type&)
-      {
-      }
+void DataValue::
+ulong_none (Type&)
+{
+}
 
-      void DataValue::
-      float_pre (Type const&)
-      {
-      }
+void DataValue::
+ulong_none (Type const&)
+{
+}
 
-      void DataValue::
-      float_next (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_next (Type const&)
-      {
-      }
+if (b != e)
+{
+float_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) float_next (o);
+}
 
-      void DataValue::
-      float_post (Type&)
-      {
-      }
+float_post (o);
+}
 
-      void DataValue::
-      float_post (Type const&)
-      {
-      }
+else float_none (o);
+}
 
-      void DataValue::
-      float_none (Type&)
-      {
-      }
+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_none (Type const&)
-      {
-      }
+if (b != e)
+{
+float_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) float_next (o);
+}
 
-      void DataValue::
-      double_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
+float_post (o);
+}
 
-        if (b != e)
-        {
-          double_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) double_next (o);
-          }
-
-          double_post (o);
-        }
+else float_none (o);
+}
 
-        else double_none (o);
-      }
+void DataValue::
+float_pre (Type&)
+{
+}
 
-      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_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          double_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) double_next (o);
-          }
-
-          double_post (o);
-        }
+void DataValue::
+float_next (Type&)
+{
+}
 
-        else double_none (o);
-      }
+void DataValue::
+float_next (Type const&)
+{
+}
 
-      void DataValue::
-      double_pre (Type&)
-      {
-      }
+void DataValue::
+float_post (Type&)
+{
+}
 
-      void DataValue::
-      double_pre (Type const&)
-      {
-      }
+void DataValue::
+float_post (Type const&)
+{
+}
 
-      void DataValue::
-      double_next (Type&)
-      {
-      }
+void DataValue::
+float_none (Type&)
+{
+}
 
-      void DataValue::
-      double_next (Type const&)
-      {
-      }
+void DataValue::
+float_none (Type const&)
+{
+}
 
-      void DataValue::
-      double_post (Type&)
-      {
-      }
+void DataValue::
+double_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
 
-      void DataValue::
-      double_post (Type const&)
-      {
-      }
+if (b != e)
+{
+double_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) double_next (o);
+}
 
-      void DataValue::
-      double_none (Type&)
-      {
-      }
+double_post (o);
+}
 
-      void DataValue::
-      double_none (Type const&)
-      {
-      }
+else double_none (o);
+}
 
-      void DataValue::
-      boolean (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
+void DataValue::
+double_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double());
 
-        if (b != e)
-        {
-          boolean_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) boolean_next (o);
-          }
-
-          boolean_post (o);
-        }
+if (b != e)
+{
+double_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) double_next (o);
+}
 
-        else boolean_none (o);
-      }
+double_post (o);
+}
 
-      void DataValue::
-      boolean (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean());
+else double_none (o);
+}
 
-        if (b != e)
-        {
-          boolean_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) boolean_next (o);
-          }
-
-          boolean_post (o);
-        }
+void DataValue::
+double_pre (Type&)
+{
+}
 
-        else boolean_none (o);
-      }
+void DataValue::
+double_pre (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_pre (Type&)
-      {
-      }
+void DataValue::
+double_next (Type&)
+{
+}
 
-      void DataValue::
-      boolean_pre (Type const&)
-      {
-      }
+void DataValue::
+double_next (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_next (Type&)
-      {
-      }
+void DataValue::
+double_post (Type&)
+{
+}
 
-      void DataValue::
-      boolean_next (Type const&)
-      {
-      }
+void DataValue::
+double_post (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_post (Type&)
-      {
-      }
+void DataValue::
+double_none (Type&)
+{
+}
 
-      void DataValue::
-      boolean_post (Type const&)
-      {
-      }
+void DataValue::
+double_none (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_none (Type&)
-      {
-      }
+void DataValue::
+boolean (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
 
-      void DataValue::
-      boolean_none (Type const&)
-      {
-      }
+if (b != e)
+{
+boolean_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) boolean_next (o);
+}
 
-      void DataValue::
-      octet (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
+boolean_post (o);
+}
 
-        if (b != e)
-        {
-          octet_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) octet_next (o);
-          }
-
-          octet_post (o);
-        }
+else boolean_none (o);
+}
 
-        else octet_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::
-      octet (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet());
+if (b != e)
+{
+boolean_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) boolean_next (o);
+}
 
-        if (b != e)
-        {
-          octet_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) octet_next (o);
-          }
-
-          octet_post (o);
-        }
+boolean_post (o);
+}
 
-        else octet_none (o);
-      }
+else boolean_none (o);
+}
 
-      void DataValue::
-      octet_pre (Type&)
-      {
-      }
+void DataValue::
+boolean_pre (Type&)
+{
+}
 
-      void DataValue::
-      octet_pre (Type const&)
-      {
-      }
+void DataValue::
+boolean_pre (Type const&)
+{
+}
 
-      void DataValue::
-      octet_next (Type&)
-      {
-      }
+void DataValue::
+boolean_next (Type&)
+{
+}
 
-      void DataValue::
-      octet_next (Type const&)
-      {
-      }
+void DataValue::
+boolean_next (Type const&)
+{
+}
 
-      void DataValue::
-      octet_post (Type&)
-      {
-      }
+void DataValue::
+boolean_post (Type&)
+{
+}
 
-      void DataValue::
-      octet_post (Type const&)
-      {
-      }
+void DataValue::
+boolean_post (Type const&)
+{
+}
 
-      void DataValue::
-      octet_none (Type&)
-      {
-      }
+void DataValue::
+boolean_none (Type&)
+{
+}
 
-      void DataValue::
-      octet_none (Type const&)
-      {
-      }
+void DataValue::
+boolean_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::
+octet (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
 
-        if (b != e)
-        {
-          enum_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) enum_next (o);
-          }
-
-          enum_post (o);
-        }
+if (b != e)
+{
+octet_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) octet_next (o);
+}
 
-        else enum_none (o);
-      }
+octet_post (o);
+}
 
-      void DataValue::
-      enum_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum());
+else octet_none (o);
+}
 
-        if (b != e)
-        {
-          enum_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) enum_next (o);
-          }
-
-          enum_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 enum_none (o);
-      }
+if (b != e)
+{
+octet_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) octet_next (o);
+}
 
-      void DataValue::
-      enum_pre (Type&)
-      {
-      }
+octet_post (o);
+}
 
-      void DataValue::
-      enum_pre (Type const&)
-      {
-      }
+else octet_none (o);
+}
 
-      void DataValue::
-      enum_next (Type&)
-      {
-      }
+void DataValue::
+octet_pre (Type&)
+{
+}
 
-      void DataValue::
-      enum_next (Type const&)
-      {
-      }
+void DataValue::
+octet_pre (Type const&)
+{
+}
 
-      void DataValue::
-      enum_post (Type&)
-      {
-      }
+void DataValue::
+octet_next (Type&)
+{
+}
 
-      void DataValue::
-      enum_post (Type const&)
-      {
-      }
+void DataValue::
+octet_next (Type const&)
+{
+}
 
-      void DataValue::
-      enum_none (Type&)
-      {
-      }
+void DataValue::
+octet_post (Type&)
+{
+}
 
-      void DataValue::
-      enum_none (Type const&)
-      {
-      }
+void DataValue::
+octet_post (Type const&)
+{
+}
 
-      void DataValue::
-      string (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
+void DataValue::
+octet_none (Type&)
+{
+}
 
-        if (b != e)
-        {
-          string_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) string_next (o);
-          }
-
-          string_post (o);
-        }
+void DataValue::
+octet_none (Type const&)
+{
+}
 
-        else string_none (o);
-      }
+void DataValue::
+enum_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum());
 
-      void DataValue::
-      string (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string());
+if (b != e)
+{
+enum_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) enum_next (o);
+}
 
-        if (b != e)
-        {
-          string_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) string_next (o);
-          }
-
-          string_post (o);
-        }
+enum_post (o);
+}
 
-        else string_none (o);
-      }
+else enum_none (o);
+}
 
-      void DataValue::
-      string_pre (Type&)
-      {
-      }
+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::
-      string_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+enum_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) enum_next (o);
+}
 
-      void DataValue::
-      string_next (Type&)
-      {
-      }
+enum_post (o);
+}
 
-      void DataValue::
-      string_next (Type const&)
-      {
-      }
+else enum_none (o);
+}
 
-      void DataValue::
-      string_post (Type&)
-      {
-      }
+void DataValue::
+enum_pre (Type&)
+{
+}
 
-      void DataValue::
-      string_post (Type const&)
-      {
-      }
+void DataValue::
+enum_pre (Type const&)
+{
+}
 
-      void DataValue::
-      string_none (Type&)
-      {
-      }
+void DataValue::
+enum_next (Type&)
+{
+}
 
-      void DataValue::
-      string_none (Type const&)
-      {
-      }
+void DataValue::
+enum_next (Type const&)
+{
+}
 
-      void DataValue::
-      longlong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
+void DataValue::
+enum_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          longlong_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) longlong_next (o);
-          }
-
-          longlong_post (o);
-        }
+void DataValue::
+enum_post (Type const&)
+{
+}
 
-        else longlong_none (o);
-      }
+void DataValue::
+enum_none (Type&)
+{
+}
 
-      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::
+enum_none (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 (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
 
-        else longlong_none (o);
-      }
+if (b != e)
+{
+string_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) string_next (o);
+}
 
-      void DataValue::
-      longlong_pre (Type&)
-      {
-      }
+string_post (o);
+}
 
-      void DataValue::
-      longlong_pre (Type const&)
-      {
-      }
+else string_none (o);
+}
 
-      void DataValue::
-      longlong_next (Type&)
-      {
-      }
+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::
-      longlong_next (Type const&)
-      {
-      }
+if (b != e)
+{
+string_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) string_next (o);
+}
 
-      void DataValue::
-      longlong_post (Type&)
-      {
-      }
+string_post (o);
+}
 
-      void DataValue::
-      longlong_post (Type const&)
-      {
-      }
+else string_none (o);
+}
 
-      void DataValue::
-      longlong_none (Type&)
-      {
-      }
+void DataValue::
+string_pre (Type&)
+{
+}
 
-      void DataValue::
-      longlong_none (Type const&)
-      {
-      }
+void DataValue::
+string_pre (Type const&)
+{
+}
 
-      void DataValue::
-      ulonglong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
+void DataValue::
+string_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          ulonglong_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) ulonglong_next (o);
-          }
-
-          ulonglong_post (o);
-        }
+void DataValue::
+string_next (Type const&)
+{
+}
 
-        else ulonglong_none (o);
-      }
+void DataValue::
+string_post (Type&)
+{
+}
 
-      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::
+string_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          ulonglong_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) ulonglong_next (o);
-          }
-
-          ulonglong_post (o);
-        }
+void DataValue::
+string_none (Type&)
+{
+}
 
-        else ulonglong_none (o);
-      }
+void DataValue::
+string_none (Type const&)
+{
+}
 
-      void DataValue::
-      ulonglong_pre (Type&)
-      {
-      }
+void DataValue::
+longlong (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
 
-      void DataValue::
-      ulonglong_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+longlong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longlong_next (o);
+}
 
-      void DataValue::
-      ulonglong_next (Type&)
-      {
-      }
+longlong_post (o);
+}
 
-      void DataValue::
-      ulonglong_next (Type const&)
-      {
-      }
+else longlong_none (o);
+}
 
-      void DataValue::
-      ulonglong_post (Type&)
-      {
-      }
+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::
-      ulonglong_post (Type const&)
-      {
-      }
+if (b != e)
+{
+longlong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longlong_next (o);
+}
 
-      void DataValue::
-      ulonglong_none (Type&)
-      {
-      }
+longlong_post (o);
+}
 
-      void DataValue::
-      ulonglong_none (Type const&)
-      {
-      }
+else longlong_none (o);
+}
 
-      void DataValue::
-      longdouble (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
+void DataValue::
+longlong_pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          longdouble_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) longdouble_next (o);
-          }
-
-          longdouble_post (o);
-        }
+void DataValue::
+longlong_pre (Type const&)
+{
+}
 
-        else longdouble_none (o);
-      }
+void DataValue::
+longlong_next (Type&)
+{
+}
 
-      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::
+longlong_next (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          longdouble_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) longdouble_next (o);
-          }
-
-          longdouble_post (o);
-        }
+void DataValue::
+longlong_post (Type&)
+{
+}
 
-        else longdouble_none (o);
-      }
+void DataValue::
+longlong_post (Type const&)
+{
+}
 
-      void DataValue::
-      longdouble_pre (Type&)
-      {
-      }
+void DataValue::
+longlong_none (Type&)
+{
+}
 
-      void DataValue::
-      longdouble_pre (Type const&)
-      {
-      }
+void DataValue::
+longlong_none (Type const&)
+{
+}
 
-      void DataValue::
-      longdouble_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::
-      longdouble_next (Type const&)
-      {
-      }
+if (b != e)
+{
+ulonglong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulonglong_next (o);
+}
 
-      void DataValue::
-      longdouble_post (Type&)
-      {
-      }
+ulonglong_post (o);
+}
 
-      void DataValue::
-      longdouble_post (Type const&)
-      {
-      }
+else ulonglong_none (o);
+}
 
-      void DataValue::
-      longdouble_none (Type&)
-      {
-      }
+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::
-      longdouble_none (Type const&)
-      {
-      }
+if (b != e)
+{
+ulonglong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulonglong_next (o);
+}
 
-      void DataValue::
-      post (Type&)
-      {
-      }
+ulonglong_post (o);
+}
 
-      void DataValue::
-      post (Type const&)
-      {
-      }
+else ulonglong_none (o);
+}
 
-      // EnumType
-      //
-      //
+void DataValue::
+ulonglong_pre (Type&)
+{
+}
 
-      void EnumType::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        typeId (o);
-        member (o);
-        post (o);
-      }
+void DataValue::
+ulonglong_pre (Type const&)
+{
+}
 
-      void EnumType::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        typeId (o);
-        member (o);
-        post (o);
-      }
+void DataValue::
+ulonglong_next (Type&)
+{
+}
 
-      void EnumType::
-      pre (Type&)
-      {
-      }
+void DataValue::
+ulonglong_next (Type const&)
+{
+}
 
-      void EnumType::
-      pre (Type const&)
-      {
-      }
+void DataValue::
+ulonglong_post (Type&)
+{
+}
 
-      void EnumType::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void DataValue::
+ulonglong_post (Type const&)
+{
+}
 
-      void EnumType::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void DataValue::
+ulonglong_none (Type&)
+{
+}
 
-      void EnumType::
-      typeId (Type& o)
-      {
-        dispatch (o.typeId ());
-      }
+void DataValue::
+ulonglong_none (Type const&)
+{
+}
 
-      void EnumType::
-      typeId (Type const& o)
-      {
-        dispatch (o.typeId ());
-      }
+void DataValue::
+longdouble (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-      void EnumType::
-      member (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
+if (b != e)
+{
+longdouble_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longdouble_next (o);
+}
 
-        if (b != e)
-        {
-          member_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) member_next (o);
-          }
-
-          member_post (o);
-        }
-      }
+longdouble_post (o);
+}
 
-      void EnumType::
-      member (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        EnumType::Type::member_const_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 (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-      void EnumType::
-      member_pre (Type&)
-      {
-      }
+if (b != e)
+{
+longdouble_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longdouble_next (o);
+}
 
-      void EnumType::
-      member_pre (Type const&)
-      {
-      }
+longdouble_post (o);
+}
 
-      void EnumType::
-      member_next (Type&)
-      {
-      }
+else longdouble_none (o);
+}
 
-      void EnumType::
-      member_next (Type const&)
-      {
-      }
+void DataValue::
+longdouble_pre (Type&)
+{
+}
 
-      void EnumType::
-      member_post (Type&)
-      {
-      }
+void DataValue::
+longdouble_pre (Type const&)
+{
+}
 
-      void EnumType::
-      member_post (Type const&)
-      {
-      }
+void DataValue::
+longdouble_next (Type&)
+{
+}
 
-      void EnumType::
-      post (Type&)
-      {
-      }
+void DataValue::
+longdouble_next (Type const&)
+{
+}
 
-      void EnumType::
-      post (Type const&)
-      {
-      }
+void DataValue::
+longdouble_post (Type&)
+{
+}
+
+void DataValue::
+longdouble_post (Type const&)
+{
+}
 
-      // Any
-      //
-      //
+void DataValue::
+longdouble_none (Type&)
+{
+}
 
-      void Any::
-      traverse (Type& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
+void DataValue::
+longdouble_none (Type const&)
+{
+}
 
-      void Any::
-      traverse (Type const& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
+void DataValue::
+post (Type&)
+{
+}
 
-      void Any::
-      pre (Type&)
-      {
-      }
+void DataValue::
+post (Type const&)
+{
+}
 
-      void Any::
-      pre (Type const&)
-      {
-      }
+// EnumType
+//
+//
 
-      void Any::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
+void EnumType::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+typeId (o);
+member (o);
+post (o);
+}
 
-      void Any::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
+void EnumType::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+typeId (o);
+member (o);
+post (o);
+}
 
-      void Any::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+void EnumType::
+pre (Type&)
+{
+}
 
-      void Any::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+void EnumType::
+pre (Type const&)
+{
+}
 
-      void Any::
-      post (Type&)
-      {
-      }
+void EnumType::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Any::
-      post (Type const&)
-      {
-      }
+void EnumType::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      // Property
-      //
-      //
+void EnumType::
+typeId (Type& o)
+{
+dispatch (o.typeId ());
+}
 
-      void Property::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+typeId (Type const& o)
+{
+dispatch (o.typeId ());
+}
 
-      void Property::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+member (Type& o)
+{
+// VC6 anathema strikes again
+//
+EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-      void Property::
-      pre (Type&)
-      {
-      }
+if (b != e)
+{
+member_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) member_next (o);
+}
 
-      void Property::
-      pre (Type const&)
-      {
-      }
+member_post (o);
+}
+}
 
-      void Property::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void EnumType::
+member (Type const& o)
+{
+// VC6 anathema strikes again
+//
+EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-      void Property::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+member_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) member_next (o);
+}
 
-      void Property::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+member_post (o);
+}
+}
 
-      void Property::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+void EnumType::
+member_pre (Type&)
+{
+}
 
-      void Property::
-      post (Type&)
-      {
-      }
+void EnumType::
+member_pre (Type const&)
+{
+}
 
-      void Property::
-      post (Type const&)
-      {
-      }
+void EnumType::
+member_next (Type&)
+{
+}
 
-      // SatisfierProperty
-      //
-      //
+void EnumType::
+member_next (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+member_post (Type&)
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+member_post (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      pre (Type&)
-      {
-      }
+void EnumType::
+post (Type&)
+{
+}
 
-      void SatisfierProperty::
-      pre (Type const&)
-      {
-      }
+void EnumType::
+post (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+// Any
+//
+//
 
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Any::
+traverse (Type& o)
+{
+pre (o);
+type (o);
+value (o);
+post (o);
+}
 
-      void SatisfierProperty::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void Any::
+traverse (Type const& o)
+{
+pre (o);
+type (o);
+value (o);
+post (o);
+}
 
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void Any::
+pre (Type&)
+{
+}
 
-      void SatisfierProperty::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+void Any::
+pre (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+void Any::
+type (Type& o)
+{
+dispatch (o.type ());
+}
 
-      void SatisfierProperty::
-      post (Type&)
-      {
-      }
+void Any::
+type (Type const& o)
+{
+dispatch (o.type ());
+}
 
-      void SatisfierProperty::
-      post (Type const&)
-      {
-      }
+void Any::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      // Resource
-      //
-      //
+void Any::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void Any::
+post (Type&)
+{
+}
 
-      void Resource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void Any::
+post (Type const&)
+{
+}
 
-      void Resource::
-      pre (Type&)
-      {
-      }
+// Property
+//
+//
 
-      void Resource::
-      pre (Type const&)
-      {
-      }
+void Property::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+value (o);
+post (o);
+}
 
-      void Resource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Property::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+value (o);
+post (o);
+}
 
-      void Resource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Property::
+pre (Type&)
+{
+}
 
-      void Resource::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void Property::
+pre (Type const&)
+{
+}
 
-      void Resource::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void Property::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Resource::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void Property::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Resource::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void Property::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      post (Type&)
-      {
-      }
+void Property::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      post (Type const&)
-      {
-      }
+void Property::
+post (Type&)
+{
+}
 
-      // Requirement
-      //
-      //
+void Property::
+post (Type const&)
+{
+}
 
-      void Requirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+// SatisfierProperty
+//
+//
 
-      void Requirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void SatisfierProperty::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+kind (o);
+dynamic (o);
+value (o);
+post (o);
+}
 
-      void Requirement::
-      pre (Type&)
-      {
-      }
+void SatisfierProperty::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+kind (o);
+dynamic (o);
+value (o);
+post (o);
+}
 
-      void Requirement::
-      pre (Type const&)
-      {
-      }
+void SatisfierProperty::
+pre (Type&)
+{
+}
 
-      void Requirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void SatisfierProperty::
+pre (Type const&)
+{
+}
 
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void SatisfierProperty::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Requirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void SatisfierProperty::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Requirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void SatisfierProperty::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void Requirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void SatisfierProperty::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void Requirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void SatisfierProperty::
+dynamic (Type& o)
+{
+dispatch (o.dynamic ());
+}
 
-      void Requirement::
-      post (Type&)
-      {
-      }
+void SatisfierProperty::
+dynamic (Type const& o)
+{
+dispatch (o.dynamic ());
+}
 
-      void Requirement::
-      post (Type const&)
-      {
-      }
+void SatisfierProperty::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      // ResourceDeploymentDescription
-      //
-      //
+void SatisfierProperty::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void SatisfierProperty::
+post (Type&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void SatisfierProperty::
+post (Type const&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+// Resource
+//
+//
 
-      void ResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void Resource::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
 
-      void ResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void Resource::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
 
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void Resource::
+pre (Type&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void Resource::
+pre (Type const&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void Resource::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void Resource::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void Resource::
+resourceType (Type& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-      void ResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
 
-      void ResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+resourceType_post (o);
+}
+}
 
-      // ArtifactDeploymentDescription
-      //
-      //
+void Resource::
+resourceType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-      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)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_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);
-      }
+resourceType_post (o);
+}
+}
 
-      void ArtifactDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void Resource::
+resourceType_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void Resource::
+resourceType_pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Resource::
+resourceType_next (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Resource::
+resourceType_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 Resource::
+resourceType_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+void Resource::
+resourceType_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 Resource::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_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 ArtifactDeploymentDescription::
-      source_next (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+void Resource::
+property_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+void Resource::
+property_pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
+void Resource::
+property_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
+void Resource::
+property_next (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 Resource::
+property_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
+void Resource::
+property_post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type&)
-      {
-      }
+void Resource::
+property_none (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-      }
+void Resource::
+property_none (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_next (Type&)
-      {
-      }
+void Resource::
+post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_next (Type const&)
-      {
-      }
+void Resource::
+post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_post (Type&)
-      {
-      }
+// Requirement
+//
+//
 
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-      }
+void Requirement::
+traverse (Type& o)
+{
+pre (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void Requirement::
+traverse (Type const& o)
+{
+pre (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void Requirement::
+pre (Type&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void Requirement::
+pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void Requirement::
+resourceType (Type& o)
+{
+dispatch (o.resourceType ());
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void Requirement::
+resourceType (Type const& o)
+{
+dispatch (o.resourceType ());
+}
 
-        else execParameter_none (o);
-      }
+void Requirement::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
+void Requirement::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
+void Requirement::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Requirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (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::
-      execParameter_none (Type&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_none (Type const&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+else property_none (o);
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void Requirement::
+property_pre (Type&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void Requirement::
+property_pre (Type const&)
+{
+}
 
-      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::
+property_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void Requirement::
+property_next (Type const&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void Requirement::
+property_post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+void Requirement::
+property_post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+void Requirement::
+property_none (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+void Requirement::
+property_none (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void Requirement::
+post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+void Requirement::
+post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+// ResourceDeploymentDescription
+//
+//
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-        else deployedResource_none (o);
-      }
+void ResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-        else deployedResource_none (o);
-      }
+void ResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_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 ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+void ResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+void ResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      id_none (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      post (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-      // MonolithicDeploymentDescription
-      //
-      //
+void ResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-      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_none (Type const&)
+{
+}
 
-      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::
+post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+// ArtifactDeploymentDescription
+//
+//
 
-      void MonolithicDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+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 MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+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 MonolithicDeploymentDescription::
-      source (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
+void ArtifactDeploymentDescription::
+pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+void ArtifactDeploymentDescription::
+pre (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 ArtifactDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+void ArtifactDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      source_next (Type&)
-      {
-      }
+source_post (o);
+}
+}
 
-      void MonolithicDeploymentDescription::
-      source_next (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::
-      source_post (Type&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
+source_post (o);
+}
+}
 
-      void MonolithicDeploymentDescription::
-      artifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
+void ArtifactDeploymentDescription::
+source_pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          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);
-          }
-
-          artifact_post (o);
-        }
-      }
+void ArtifactDeploymentDescription::
+source_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source_post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+node (Type& o)
+{
+dispatch (o.node ());
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+node (Type const& o)
+{
+dispatch (o.node ());
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_post (Type&)
-      {
-      }
+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 const&)
-      {
-      }
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+location_post (o);
+}
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_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());
 
-        else execParameter_none (o);
-      }
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_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());
+location_post (o);
+}
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void ArtifactDeploymentDescription::
+location_pre (Type&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void ArtifactDeploymentDescription::
+location_pre (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_next (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_none (Type&)
-      {
-      }
+execParameter_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_none (Type const&)
-      {
-      }
+else execParameter_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void ArtifactDeploymentDescription::
+execParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-        else deployRequirement_none (o);
-      }
+execParameter_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+else execParameter_none (o);
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void ArtifactDeploymentDescription::
+execParameter_pre (Type&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void ArtifactDeploymentDescription::
+execParameter_pre (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_next (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_none (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_none (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+deployRequirement_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+else deployRequirement_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id_none (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::
-      id_none (Type const&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      post (Type&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      post (Type const&)
-      {
-      }
+else deployRequirement_none (o);
+}
 
-      // InstanceResourceDeploymentDescription
-      //
-      //
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void ArtifactDeploymentDescription::
+deployedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+deployedResource_post (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+else deployedResource_none (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+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::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+deployedResource_post (o);
+}
 
-      // InstanceDeploymentDescription
-      //
-      //
+else deployedResource_none (o);
+}
 
-      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 ArtifactDeploymentDescription::
+deployedResource_pre (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 ArtifactDeploymentDescription::
+deployedResource_pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_next (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_next (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+void ArtifactDeploymentDescription::
+deployedResource_none (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+void ArtifactDeploymentDescription::
+deployedResource_none (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
+void ArtifactDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
+void ArtifactDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
+void ArtifactDeploymentDescription::
+id_none (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
+void ArtifactDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+void ArtifactDeploymentDescription::
+post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
+void ArtifactDeploymentDescription::
+post (Type const&)
+{
+}
 
-        else configProperty_none (o);
-      }
+// MonolithicDeploymentDescription
+//
+//
 
-      void InstanceDeploymentDescription::
-      configProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+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);
+}
 
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
+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);
+}
 
-        else configProperty_none (o);
-      }
+void MonolithicDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-      }
+source_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_none (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
 
-      void InstanceDeploymentDescription::
-      configProperty_none (Type const&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        dispatch (o.deployedResource ());
-      }
+source_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        dispatch (o.deployedResource ());
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source_next (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
+void MonolithicDeploymentDescription::
+source_next (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
+void MonolithicDeploymentDescription::
+source_post (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source_post (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
-      void InstanceDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+if (b != e)
+{
+artifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) artifact_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+artifact_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      id_none (Type&)
-      {
-      }
+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::
-      id_none (Type const&)
-      {
-      }
+if (b != e)
+{
+artifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) artifact_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      post (Type&)
-      {
-      }
+artifact_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_pre (Type&)
+{
+}
 
-      // ComponentPortDescription
-      //
-      //
+void MonolithicDeploymentDescription::
+artifact_pre (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+artifact_next (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+artifact_next (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      pre (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      pre (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void MonolithicDeploymentDescription::
+execParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void ComponentPortDescription::
-      specificType (Type& o)
-      {
-        dispatch (o.specificType ());
-      }
+execParameter_post (o);
+}
 
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        dispatch (o.specificType ());
-      }
+else execParameter_none (o);
+}
 
-      void ComponentPortDescription::
-      supportedType (Type& o)
-      {
-        dispatch (o.supportedType ());
-      }
+void MonolithicDeploymentDescription::
+execParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        dispatch (o.supportedType ());
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void ComponentPortDescription::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
+execParameter_post (o);
+}
 
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
+else execParameter_none (o);
+}
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveUser (Type& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_next (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_next (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      optional (Type& o)
-      {
-        dispatch (o.optional ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_post (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        dispatch (o.optional ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_post (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_none (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_none (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void ComponentPortDescription::
-      post (Type const&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      // ComponentPropertyDescription
-      //
-      //
+deployRequirement_post (o);
+}
 
-      void ComponentPropertyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
+else deployRequirement_none (o);
+}
 
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void ComponentPropertyDescription::
-      pre (Type&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void ComponentPropertyDescription::
-      pre (Type const&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void ComponentPropertyDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+else deployRequirement_none (o);
+}
 
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-      void ComponentPropertyDescription::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type&)
+{
+}
 
-      void ComponentPropertyDescription::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-      void ComponentPropertyDescription::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      // ComponentExternalPortEndpoint
-      //
-      //
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      pre (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentExternalPortEndpoint::
-      pre (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentExternalPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+void MonolithicDeploymentDescription::
+id_none (Type&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+void MonolithicDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+post (Type&)
+{
+}
 
-      void ComponentExternalPortEndpoint::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+post (Type const&)
+{
+}
 
-      // PlanSubcomponentPortEndpoint
-      //
-      //
+// InstanceResourceDeploymentDescription
+//
+//
 
-      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 InstanceResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+resourceUsage (o);
+requirementName (o);
+resourceName (o);
+property (o);
+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);
-      }
+void InstanceResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+resourceUsage (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type& o)
+{
+dispatch (o.resourceUsage ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type const& o)
+{
+dispatch (o.resourceUsage ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void InstanceResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+InstanceResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+property_post (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+else property_none (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+InstanceResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void PlanSubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      // ExternalReferenceEndpoint
-      //
-      //
+property_post (o);
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
+else property_none (o);
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      pre (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      pre (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type& o)
-      {
-        dispatch (o.location ());
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        dispatch (o.location ());
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      post (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      post (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-      // ConnectionResourceDeploymentDescription
-      //
-      //
+void InstanceResourceDeploymentDescription::
+property_none (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+post (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+// InstanceDeploymentDescription
+//
+//
 
-      void ConnectionResourceDeploymentDescription::
-      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 ConnectionResourceDeploymentDescription::
-      targetName (Type& o)
-      {
-        dispatch (o.targetName ());
-      }
+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 ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        dispatch (o.targetName ());
-      }
+void InstanceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void InstanceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void InstanceDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void InstanceDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void InstanceDeploymentDescription::
+node (Type& o)
+{
+dispatch (o.node ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void InstanceDeploymentDescription::
+node (Type const& o)
+{
+dispatch (o.node ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void InstanceDeploymentDescription::
+source (Type& o)
+{
+dispatch (o.source ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+source (Type const& o)
+{
+dispatch (o.source ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+implementation (Type& o)
+{
+dispatch (o.implementation ());
+}
 
-      // PlanConnectionDescription
-      //
-      //
+void InstanceDeploymentDescription::
+implementation (Type const& o)
+{
+dispatch (o.implementation ());
+}
 
-      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 InstanceDeploymentDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      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);
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void PlanConnectionDescription::
-      pre (Type&)
-      {
-      }
+configProperty_post (o);
+}
 
-      void PlanConnectionDescription::
-      pre (Type const&)
-      {
-      }
+else configProperty_none (o);
+}
 
-      void PlanConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void InstanceDeploymentDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void PlanConnectionDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
+configProperty_post (o);
+}
 
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
+else configProperty_none (o);
+}
 
-      void PlanConnectionDescription::
-      source_none (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      source_none (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void InstanceDeploymentDescription::
+configProperty_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void InstanceDeploymentDescription::
+configProperty_next (Type const&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void InstanceDeploymentDescription::
+configProperty_post (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 InstanceDeploymentDescription::
+configProperty_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void InstanceDeploymentDescription::
+configProperty_none (Type&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void InstanceDeploymentDescription::
+configProperty_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource (Type& o)
+{
+dispatch (o.deployedResource ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource (Type const& o)
+{
+dispatch (o.deployedResource ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type& o)
+{
+dispatch (o.deployedSharedResource ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type const& o)
+{
+dispatch (o.deployedSharedResource ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+void InstanceDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+void InstanceDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-        else externalEndpoint_none (o);
-      }
+void InstanceDeploymentDescription::
+id_none (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 InstanceDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+void InstanceDeploymentDescription::
+post (Type&)
+{
+}
 
-        else externalEndpoint_none (o);
-      }
+void InstanceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
+// ComponentPortDescription
+//
+//
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
+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 PlanConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
+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 PlanConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
+void ComponentPortDescription::
+pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
+void ComponentPortDescription::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
+void ComponentPortDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
+void ComponentPortDescription::
+specificType (Type& o)
+{
+dispatch (o.specificType ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+void ComponentPortDescription::
+specificType (Type const& o)
+{
+dispatch (o.specificType ());
+}
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+void ComponentPortDescription::
+specificType_none (Type&)
+{
+}
 
-        else internalEndpoint_none (o);
-      }
+void ComponentPortDescription::
+specificType_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+void ComponentPortDescription::
+supportedType (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPortDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+if (b != e)
+{
+supportedType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) supportedType_next (o);
+}
 
-        else internalEndpoint_none (o);
-      }
+supportedType_post (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
+else supportedType_none (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPortDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
+if (b != e)
+{
+supportedType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) supportedType_next (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
+supportedType_post (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
+else supportedType_none (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_next (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+void ComponentPortDescription::
+supportedType_next (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+void ComponentPortDescription::
+supportedType_post (Type&)
+{
+}
 
-        else externalReference_none (o);
-      }
+void ComponentPortDescription::
+supportedType_post (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 ComponentPortDescription::
+supportedType_none (Type&)
+{
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+void ComponentPortDescription::
+supportedType_none (Type const&)
+{
+}
 
-        else externalReference_none (o);
-      }
+void ComponentPortDescription::
+provider (Type& o)
+{
+dispatch (o.provider ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
+void ComponentPortDescription::
+provider (Type const& o)
+{
+dispatch (o.provider ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
+void ComponentPortDescription::
+exclusiveProvider (Type& o)
+{
+dispatch (o.exclusiveProvider ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
+void ComponentPortDescription::
+exclusiveProvider (Type const& o)
+{
+dispatch (o.exclusiveProvider ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
+void ComponentPortDescription::
+exclusiveUser (Type& o)
+{
+dispatch (o.exclusiveUser ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
+void ComponentPortDescription::
+exclusiveUser (Type const& o)
+{
+dispatch (o.exclusiveUser ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+optional (Type& o)
+{
+dispatch (o.optional ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
+void ComponentPortDescription::
+optional (Type const& o)
+{
+dispatch (o.optional ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
+void ComponentPortDescription::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ComponentPortDescription::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ComponentPortDescription::
+post (Type&)
+{
+}
 
-        else deployedResource_none (o);
-      }
+void ComponentPortDescription::
+post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+// ComponentPropertyDescription
+//
+//
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ComponentPropertyDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+type (o);
+post (o);
+}
 
-        else deployedResource_none (o);
-      }
+void ComponentPropertyDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+type (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+type (Type& o)
+{
+dispatch (o.type ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+type (Type const& o)
+{
+dispatch (o.type ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_none (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      post (Type&)
-      {
-      }
+// ComponentExternalPortEndpoint
+//
+//
 
-      void PlanConnectionDescription::
-      post (Type const&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+traverse (Type& o)
+{
+pre (o);
+portName (o);
+post (o);
+}
 
-      // ImplementationDependency
-      //
-      //
+void ComponentExternalPortEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+portName (o);
+post (o);
+}
 
-      void ImplementationDependency::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
+void ComponentExternalPortEndpoint::
+pre (Type&)
+{
+}
 
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
+void ComponentExternalPortEndpoint::
+pre (Type const&)
+{
+}
 
-      void ImplementationDependency::
-      pre (Type&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
 
-      void ImplementationDependency::
-      pre (Type const&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
 
-      void ImplementationDependency::
-      requiredType (Type& o)
-      {
-        dispatch (o.requiredType ());
-      }
+void ComponentExternalPortEndpoint::
+post (Type&)
+{
+}
 
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        dispatch (o.requiredType ());
-      }
+void ComponentExternalPortEndpoint::
+post (Type const&)
+{
+}
 
-      void ImplementationDependency::
-      post (Type&)
-      {
-      }
+// PlanSubcomponentPortEndpoint
+//
+//
 
-      void ImplementationDependency::
-      post (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);
+}
 
-      // Capability
-      //
-      //
+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);
+}
 
-      void Capability::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void PlanSubcomponentPortEndpoint::
+pre (Type&)
+{
+}
 
-      void Capability::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void PlanSubcomponentPortEndpoint::
+pre (Type const&)
+{
+}
 
-      void Capability::
-      pre (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
 
-      void Capability::
-      pre (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
 
-      void Capability::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type& o)
+{
+dispatch (o.provider ());
+}
 
-      void Capability::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type const& o)
+{
+dispatch (o.provider ());
+}
 
-      void Capability::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void PlanSubcomponentPortEndpoint::
+provider_none (Type&)
+{
+}
 
-      void Capability::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void PlanSubcomponentPortEndpoint::
+provider_none (Type const&)
+{
+}
 
-      void Capability::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void PlanSubcomponentPortEndpoint::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void Capability::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void PlanSubcomponentPortEndpoint::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void Capability::
-      post (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
 
-      void Capability::
-      post (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
 
-      // ImplementationRequirement
-      //
-      //
+void PlanSubcomponentPortEndpoint::
+post (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void PlanSubcomponentPortEndpoint::
+post (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+// ExternalReferenceEndpoint
+//
+//
 
-      void ImplementationRequirement::
-      pre (Type&)
-      {
-      }
+void ExternalReferenceEndpoint::
+traverse (Type& o)
+{
+pre (o);
+location (o);
+post (o);
+}
 
-      void ImplementationRequirement::
-      pre (Type const&)
-      {
-      }
+void ExternalReferenceEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+location (o);
+post (o);
+}
 
-      void ImplementationRequirement::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ExternalReferenceEndpoint::
+pre (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ExternalReferenceEndpoint::
+pre (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      resourcePort (Type& o)
-      {
-        dispatch (o.resourcePort ());
-      }
+void ExternalReferenceEndpoint::
+location (Type& o)
+{
+dispatch (o.location ());
+}
 
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        dispatch (o.resourcePort ());
-      }
+void ExternalReferenceEndpoint::
+location (Type const& o)
+{
+dispatch (o.location ());
+}
 
-      void ImplementationRequirement::
-      componentPort (Type& o)
-      {
-        dispatch (o.componentPort ());
-      }
+void ExternalReferenceEndpoint::
+post (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        dispatch (o.componentPort ());
-      }
+void ExternalReferenceEndpoint::
+post (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+// ConnectionResourceDeploymentDescription
+//
+//
 
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+targetName (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ImplementationRequirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+targetName (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void ConnectionResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type& o)
+{
+dispatch (o.targetName ());
+}
 
-      void ImplementationRequirement::
-      post (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type const& o)
+{
+dispatch (o.targetName ());
+}
 
-      void ImplementationRequirement::
-      post (Type const&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      // ComponentPackageReference
-      //
-      //
+void ConnectionResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ComponentPackageReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (o);
-        requiredType (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (o);
-        requiredType (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ComponentPackageReference::
-      pre (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ConnectionResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ComponentPackageReference::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type& o)
-      {
-        dispatch (o.requiredUUID ());
-      }
+property_post (o);
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type const& o)
-      {
-        dispatch (o.requiredUUID ());
-      }
+else property_none (o);
+}
 
-      void ComponentPackageReference::
-      requiredName (Type& o)
-      {
-        dispatch (o.requiredName ());
-      }
+void ConnectionResourceDeploymentDescription::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ConnectionResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        dispatch (o.requiredName ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ComponentPackageReference::
-      requiredType (Type& o)
-      {
-        dispatch (o.requiredType ());
-      }
+property_post (o);
+}
 
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        dispatch (o.requiredType ());
-      }
+else property_none (o);
+}
 
-      void ComponentPackageReference::
-      post (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void ComponentPackageReference::
-      post (Type const&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      // SubcomponentPortEndpoint
-      //
-      //
+void ConnectionResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_none (Type const&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+void ConnectionResourceDeploymentDescription::
+post (Type&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+void ConnectionResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+// PlanConnectionDescription
+//
+//
 
-      void SubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
+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 SubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
+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);
+}
 
-      // AssemblyConnectionDescription
-      //
-      //
+void PlanConnectionDescription::
+pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
+void PlanConnectionDescription::
+pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
+void PlanConnectionDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void AssemblyConnectionDescription::
-      pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void AssemblyConnectionDescription::
-      pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+source (Type& o)
+{
+dispatch (o.source ());
+}
 
-      void AssemblyConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void PlanConnectionDescription::
+source (Type const& o)
+{
+dispatch (o.source ());
+}
 
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void PlanConnectionDescription::
+source_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+void PlanConnectionDescription::
+source_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+void PlanConnectionDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+else deployRequirement_none (o);
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_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());
 
-        else externalEndpoint_none (o);
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+deployRequirement_post (o);
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+else deployRequirement_none (o);
+}
 
-        else externalEndpoint_none (o);
-      }
+void PlanConnectionDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_next (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-      void AssemblyConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+externalEndpoint_post (o);
+}
 
-        else internalEndpoint_none (o);
-      }
+else externalEndpoint_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());
+void PlanConnectionDescription::
+externalEndpoint (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
 
-        else internalEndpoint_none (o);
-      }
+externalEndpoint_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
+else externalEndpoint_none (o);
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_next (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+void PlanConnectionDescription::
+externalEndpoint_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+void PlanConnectionDescription::
+internalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
 
-        else externalReference_none (o);
-      }
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+internalEndpoint_post (o);
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+else internalEndpoint_none (o);
+}
 
-        else externalReference_none (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 AssemblyConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
+internalEndpoint_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
+else internalEndpoint_none (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+void PlanConnectionDescription::
+internalEndpoint_none (Type&)
+{
+}
+
+void PlanConnectionDescription::
+internalEndpoint_none (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::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 PlanConnectionDescription::
+externalReference (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::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 PlanConnectionDescription::
+externalReference_pre (Type&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_pre (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_next (Type&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_next (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_post (Type&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_post (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_none (Type&)
+{
+}
+
+void PlanConnectionDescription::
+externalReference_none (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
+
+deployedResource_post (o);
+}
+
+else deployedResource_none (o);
+}
+
+void PlanConnectionDescription::
+deployedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
+
+deployedResource_post (o);
+}
+
+else deployedResource_none (o);
+}
+
+void PlanConnectionDescription::
+deployedResource_pre (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_pre (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_next (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_next (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_post (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_post (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_none (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_none (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+post (Type&)
+{
+}
+
+void PlanConnectionDescription::
+post (Type const&)
+{
+}
+
+// ImplementationDependency
+//
+//
+
+void ImplementationDependency::
+traverse (Type& o)
+{
+pre (o);
+requiredType (o);
+post (o);
+}
+
+void ImplementationDependency::
+traverse (Type const& o)
+{
+pre (o);
+requiredType (o);
+post (o);
+}
+
+void ImplementationDependency::
+pre (Type&)
+{
+}
+
+void ImplementationDependency::
+pre (Type const&)
+{
+}
+
+void ImplementationDependency::
+requiredType (Type& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ImplementationDependency::
+requiredType (Type const& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ImplementationDependency::
+post (Type&)
+{
+}
+
+void ImplementationDependency::
+post (Type const&)
+{
+}
+
+// Capability
+//
+//
+
+void Capability::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
+
+void Capability::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
+
+void Capability::
+pre (Type&)
+{
+}
+
+void Capability::
+pre (Type const&)
+{
+}
+
+void Capability::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void Capability::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void Capability::
+resourceType (Type& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
+
+resourceType_post (o);
+}
+}
+
+void Capability::
+resourceType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
+
+resourceType_post (o);
+}
+}
+
+void Capability::
+resourceType_pre (Type&)
+{
+}
+
+void Capability::
+resourceType_pre (Type const&)
+{
+}
+
+void Capability::
+resourceType_next (Type&)
+{
+}
+
+void Capability::
+resourceType_next (Type const&)
+{
+}
+
+void Capability::
+resourceType_post (Type&)
+{
+}
+
+void Capability::
+resourceType_post (Type const&)
+{
+}
+
+void Capability::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::property_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_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());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void Capability::
+property_pre (Type&)
+{
+}
+
+void Capability::
+property_pre (Type const&)
+{
+}
+
+void Capability::
+property_next (Type&)
+{
+}
+
+void Capability::
+property_next (Type const&)
+{
+}
+
+void Capability::
+property_post (Type&)
+{
+}
+
+void Capability::
+property_post (Type const&)
+{
+}
+
+void Capability::
+property_none (Type&)
+{
+}
+
+void Capability::
+property_none (Type const&)
+{
+}
+
+void Capability::
+post (Type&)
+{
+}
+
+void Capability::
+post (Type const&)
+{
+}
+
+// ImplementationRequirement
+//
+//
+
+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 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 ImplementationRequirement::
+pre (Type&)
+{
+}
+
+void ImplementationRequirement::
+pre (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourceUsage (Type& o)
+{
+dispatch (o.resourceUsage ());
+}
+
+void ImplementationRequirement::
+resourceUsage (Type const& o)
+{
+dispatch (o.resourceUsage ());
+}
+
+void ImplementationRequirement::
+resourceUsage_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+resourceUsage_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourcePort (Type& o)
+{
+dispatch (o.resourcePort ());
+}
+
+void ImplementationRequirement::
+resourcePort (Type const& o)
+{
+dispatch (o.resourcePort ());
+}
+
+void ImplementationRequirement::
+resourcePort_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+resourcePort_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+componentPort (Type& o)
+{
+dispatch (o.componentPort ());
+}
+
+void ImplementationRequirement::
+componentPort (Type const& o)
+{
+dispatch (o.componentPort ());
+}
+
+void ImplementationRequirement::
+componentPort_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+componentPort_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourceType (Type& o)
+{
+dispatch (o.resourceType ());
+}
+
+void ImplementationRequirement::
+resourceType (Type const& o)
+{
+dispatch (o.resourceType ());
+}
+
+void ImplementationRequirement::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void ImplementationRequirement::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void ImplementationRequirement::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationRequirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+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)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void ImplementationRequirement::
+property_pre (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_pre (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_next (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_next (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_post (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_post (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+post (Type&)
+{
+}
+
+void ImplementationRequirement::
+post (Type const&)
+{
+}
+
+// ComponentPackageReference
+//
+//
+
+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 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 ComponentPackageReference::
+pre (Type&)
+{
+}
+
+void ComponentPackageReference::
+pre (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredUUID (Type& o)
+{
+dispatch (o.requiredUUID ());
+}
+
+void ComponentPackageReference::
+requiredUUID (Type const& o)
+{
+dispatch (o.requiredUUID ());
+}
+
+void ComponentPackageReference::
+requiredUUID_none (Type&)
+{
+}
+
+void ComponentPackageReference::
+requiredUUID_none (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredName (Type& o)
+{
+dispatch (o.requiredName ());
+}
+
+void ComponentPackageReference::
+requiredName (Type const& o)
+{
+dispatch (o.requiredName ());
+}
+
+void ComponentPackageReference::
+requiredName_none (Type&)
+{
+}
+
+void ComponentPackageReference::
+requiredName_none (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredType (Type& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ComponentPackageReference::
+requiredType (Type const& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ComponentPackageReference::
+post (Type&)
+{
+}
+
+void ComponentPackageReference::
+post (Type const&)
+{
+}
+
+// SubcomponentPortEndpoint
+//
+//
+
+void SubcomponentPortEndpoint::
+traverse (Type& o)
+{
+pre (o);
+portName (o);
+instance (o);
+post (o);
+}
+
+void SubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+portName (o);
+instance (o);
+post (o);
+}
+
+void SubcomponentPortEndpoint::
+pre (Type&)
+{
+}
+
+void SubcomponentPortEndpoint::
+pre (Type const&)
+{
+}
+
+void SubcomponentPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
+
+void SubcomponentPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
+
+void SubcomponentPortEndpoint::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
+
+void SubcomponentPortEndpoint::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
+
+void SubcomponentPortEndpoint::
+post (Type&)
+{
+}
+
+void SubcomponentPortEndpoint::
+post (Type const&)
+{
+}
+
+// AssemblyConnectionDescription
+//
+//
+
+void AssemblyConnectionDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+deployRequirement (o);
+internalEndpoint (o);
+externalEndpoint (o);
+externalReference (o);
+post (o);
+}
+
+void AssemblyConnectionDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+deployRequirement (o);
+internalEndpoint (o);
+externalEndpoint (o);
+externalReference (o);
+post (o);
+}
+
+void AssemblyConnectionDescription::
+pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void AssemblyConnectionDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void AssemblyConnectionDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::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 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
-      //
-      //
+// DataValue
+//
+//
 
-      DataValue::
-      DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+DataValue::
+DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      DataValue::
-      DataValue ()
-      {
-      }
+DataValue::
+DataValue ()
+{
+}
 
-      void DataValue::
-      traverse (Type const& o)
-      {
-        Traversal::DataValue::traverse (o);
-      }
+void DataValue::
+traverse (Type const& o)
+{
+Traversal::DataValue::traverse (o);
+}
 
-      void DataValue::
-      short_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
-      }
+void DataValue::
+short_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
+}
 
-      void DataValue::
-      short_next (Type const& o)
-      {
-        short_post (o);
-        short_pre (o);
-      }
+void DataValue::
+short_next (Type const& o)
+{
+short_post (o);
+short_pre (o);
+}
 
-      void DataValue::
-      short_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+short_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      long_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
-      }
+void DataValue::
+long_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
+}
 
-      void DataValue::
-      long_next (Type const& o)
-      {
-        long_post (o);
-        long_pre (o);
-      }
+void DataValue::
+long_next (Type const& o)
+{
+long_post (o);
+long_pre (o);
+}
 
-      void DataValue::
-      long_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+long_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ushort_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
-      }
+void DataValue::
+ushort_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
+}
 
-      void DataValue::
-      ushort_next (Type const& o)
-      {
-        ushort_post (o);
-        ushort_pre (o);
-      }
+void DataValue::
+ushort_next (Type const& o)
+{
+ushort_post (o);
+ushort_pre (o);
+}
 
-      void DataValue::
-      ushort_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ushort_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ulong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
-      }
+void DataValue::
+ulong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
+}
 
-      void DataValue::
-      ulong_next (Type const& o)
-      {
-        ulong_post (o);
-        ulong_pre (o);
-      }
+void DataValue::
+ulong_next (Type const& o)
+{
+ulong_post (o);
+ulong_pre (o);
+}
 
-      void DataValue::
-      ulong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ulong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      float_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
-      }
+void DataValue::
+float_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
+}
 
-      void DataValue::
-      float_next (Type const& o)
-      {
-        float_post (o);
-        float_pre (o);
-      }
+void DataValue::
+float_next (Type const& o)
+{
+float_post (o);
+float_pre (o);
+}
 
-      void DataValue::
-      float_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+float_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      double_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
-      }
+void DataValue::
+double_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
+}
 
-      void DataValue::
-      double_next (Type const& o)
-      {
-        double_post (o);
-        double_pre (o);
-      }
+void DataValue::
+double_next (Type const& o)
+{
+double_post (o);
+double_pre (o);
+}
 
-      void DataValue::
-      double_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+double_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      boolean_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
-      }
+void DataValue::
+boolean_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
+}
 
-      void DataValue::
-      boolean_next (Type const& o)
-      {
-        boolean_post (o);
-        boolean_pre (o);
-      }
+void DataValue::
+boolean_next (Type const& o)
+{
+boolean_post (o);
+boolean_pre (o);
+}
 
-      void DataValue::
-      boolean_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+boolean_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      octet_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
-      }
+void DataValue::
+octet_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
+}
 
-      void DataValue::
-      octet_next (Type const& o)
-      {
-        octet_post (o);
-        octet_pre (o);
-      }
+void DataValue::
+octet_next (Type const& o)
+{
+octet_post (o);
+octet_pre (o);
+}
 
-      void DataValue::
-      octet_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+octet_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      enum_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
-      }
+void DataValue::
+enum_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
+}
 
-      void DataValue::
-      enum_next (Type const& o)
-      {
-        enum_post (o);
-        enum_pre (o);
-      }
+void DataValue::
+enum_next (Type const& o)
+{
+enum_post (o);
+enum_pre (o);
+}
 
-      void DataValue::
-      enum_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+enum_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      string_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
-      }
+void DataValue::
+string_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
+}
 
-      void DataValue::
-      string_next (Type const& o)
-      {
-        string_post (o);
-        string_pre (o);
-      }
+void DataValue::
+string_next (Type const& o)
+{
+string_post (o);
+string_pre (o);
+}
 
-      void DataValue::
-      string_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+string_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      longlong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
-      }
+void DataValue::
+longlong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
+}
 
-      void DataValue::
-      longlong_next (Type const& o)
-      {
-        longlong_post (o);
-        longlong_pre (o);
-      }
+void DataValue::
+longlong_next (Type const& o)
+{
+longlong_post (o);
+longlong_pre (o);
+}
 
-      void DataValue::
-      longlong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+longlong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ulonglong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
-      }
+void DataValue::
+ulonglong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
+}
 
-      void DataValue::
-      ulonglong_next (Type const& o)
-      {
-        ulonglong_post (o);
-        ulonglong_pre (o);
-      }
+void DataValue::
+ulonglong_next (Type const& o)
+{
+ulonglong_post (o);
+ulonglong_pre (o);
+}
 
-      void DataValue::
-      ulonglong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ulonglong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      longdouble_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
-      }
+void DataValue::
+longdouble_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
+}
 
-      void DataValue::
-      longdouble_next (Type const& o)
-      {
-        longdouble_post (o);
-        longdouble_pre (o);
-      }
+void DataValue::
+longdouble_next (Type const& o)
+{
+longdouble_post (o);
+longdouble_pre (o);
+}
 
-      void DataValue::
-      longdouble_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+longdouble_post (Type const&)
+{
+pop_ ();
+}
 
-      // EnumType
-      //
-      //
+// EnumType
+//
+//
 
-      EnumType::
-      EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+EnumType::
+EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      EnumType::
-      EnumType ()
-      {
-      }
+EnumType::
+EnumType ()
+{
+}
 
-      void EnumType::
-      traverse (Type const& o)
-      {
-        Traversal::EnumType::traverse (o);
-      }
+void EnumType::
+traverse (Type const& o)
+{
+Traversal::EnumType::traverse (o);
+}
 
-      void EnumType::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::EnumType::name (o);
-        pop_ ();
-      }
+void EnumType::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::EnumType::name (o);
+pop_ ();
+}
 
-      void EnumType::
-      typeId (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
-        Traversal::EnumType::typeId (o);
-        pop_ ();
-      }
+void EnumType::
+typeId (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+Traversal::EnumType::typeId (o);
+pop_ ();
+}
 
-      void EnumType::
-      member_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
-      }
+void EnumType::
+member_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+}
 
-      void EnumType::
-      member_next (Type const& o)
-      {
-        member_post (o);
-        member_pre (o);
-      }
+void EnumType::
+member_next (Type const& o)
+{
+member_post (o);
+member_pre (o);
+}
 
-      void EnumType::
-      member_post (Type const&)
-      {
-        pop_ ();
-      }
+void EnumType::
+member_post (Type const&)
+{
+pop_ ();
+}
 
-      // Any
-      //
-      //
+// Any
+//
+//
 
-      Any::
-      Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+Any::
+Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      Any::
-      Any ()
-      {
-      }
+Any::
+Any ()
+{
+}
 
-      void Any::
-      traverse (Type const& o)
-      {
-        Traversal::Any::traverse (o);
-      }
+void Any::
+traverse (Type const& o)
+{
+Traversal::Any::traverse (o);
+}
 
-      void Any::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-        Traversal::Any::type (o);
-        pop_ ();
-      }
+void Any::
+type (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+Traversal::Any::type (o);
+pop_ ();
+}
 
-      void Any::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::Any::value (o);
-        pop_ ();
-      }
+void Any::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::Any::value (o);
+pop_ ();
+}
 
-      // Property
-      //
-      //
+// Property
+//
+//
 
-      Property::
-      Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+Property::
+Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      Property::
-      Property ()
-      {
-      }
+Property::
+Property ()
+{
+}
 
-      void Property::
-      traverse (Type const& o)
-      {
-        Traversal::Property::traverse (o);
-      }
+void Property::
+traverse (Type const& o)
+{
+Traversal::Property::traverse (o);
+}
 
-      void Property::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Property::name (o);
-        pop_ ();
-      }
+void Property::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Property::name (o);
+pop_ ();
+}
 
-      void Property::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::Property::value (o);
-        pop_ ();
-      }
+void Property::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::Property::value (o);
+pop_ ();
+}
 
-      // SatisfierPropertyKind
-      //
-      //
+// SatisfierPropertyKind
+//
+//
 
-      SatisfierPropertyKind::
-      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SatisfierPropertyKind::
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      SatisfierPropertyKind::
-      SatisfierPropertyKind ()
-      {
-      }
+SatisfierPropertyKind::
+SatisfierPropertyKind ()
+{
+}
 
-      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 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
+{
+}
 
-        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);
+}
+}
 
-      // SatisfierProperty
-      //
-      //
+// SatisfierProperty
+//
+//
 
-      SatisfierProperty::
-      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SatisfierProperty::
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      SatisfierProperty::
-      SatisfierProperty ()
-      {
-      }
+SatisfierProperty::
+SatisfierProperty ()
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        Traversal::SatisfierProperty::traverse (o);
-      }
+void SatisfierProperty::
+traverse (Type const& o)
+{
+Traversal::SatisfierProperty::traverse (o);
+}
 
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::SatisfierProperty::name (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::SatisfierProperty::name (o);
+pop_ ();
+}
 
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::SatisfierProperty::kind (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::SatisfierProperty::kind (o);
+pop_ ();
+}
 
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::SatisfierProperty::value (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+dynamic (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic", top_ ()));
+Traversal::SatisfierProperty::dynamic (o);
+pop_ ();
+}
 
-      // Resource
-      //
-      //
+void SatisfierProperty::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::SatisfierProperty::value (o);
+pop_ ();
+}
 
-      Resource::
-      Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// Resource
+//
+//
 
-      Resource::
-      Resource ()
-      {
-      }
+Resource::
+Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Resource::
-      traverse (Type const& o)
-      {
-        Traversal::Resource::traverse (o);
-      }
+Resource::
+Resource ()
+{
+}
 
-      void Resource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Resource::name (o);
-        pop_ ();
-      }
+void Resource::
+traverse (Type const& o)
+{
+Traversal::Resource::traverse (o);
+}
 
-      void Resource::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::Resource::resourceType (o);
-        pop_ ();
-      }
+void Resource::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Resource::name (o);
+pop_ ();
+}
 
-      void Resource::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::Resource::property (o);
-        pop_ ();
-      }
+void Resource::
+resourceType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+}
 
-      // Requirement
-      //
-      //
+void Resource::
+resourceType_next (Type const& o)
+{
+resourceType_post (o);
+resourceType_pre (o);
+}
 
-      Requirement::
-      Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Resource::
+resourceType_post (Type const&)
+{
+pop_ ();
+}
 
-      Requirement::
-      Requirement ()
-      {
-      }
+void Resource::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void Requirement::
-      traverse (Type const& o)
-      {
-        Traversal::Requirement::traverse (o);
-      }
+void Resource::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::Requirement::resourceType (o);
-        pop_ ();
-      }
+void Resource::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void Requirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Requirement::name (o);
-        pop_ ();
-      }
+// Requirement
+//
+//
 
-      void Requirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::Requirement::property (o);
-        pop_ ();
-      }
+Requirement::
+Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      // ResourceDeploymentDescription
-      //
-      //
+Requirement::
+Requirement ()
+{
+}
 
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Requirement::
+traverse (Type const& o)
+{
+Traversal::Requirement::traverse (o);
+}
 
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription ()
-      {
-      }
+void Requirement::
+resourceType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+Traversal::Requirement::resourceType (o);
+pop_ ();
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ResourceDeploymentDescription::traverse (o);
-      }
+void Requirement::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Requirement::name (o);
+pop_ ();
+}
 
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::ResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+void Requirement::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
+void Requirement::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+void Requirement::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      // ArtifactDeploymentDescription
-      //
-      //
+// ResourceDeploymentDescription
+//
+//
 
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription ()
-      {
-      }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription ()
+{
+}
 
-      void ArtifactDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ArtifactDeploymentDescription::traverse (o);
-      }
+void ResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ResourceDeploymentDescription::traverse (o);
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ArtifactDeploymentDescription::name (o);
-        pop_ ();
-      }
+void ResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::ResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-      }
+void ResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::ResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
+void ResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
+void ResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::ArtifactDeploymentDescription::node (o);
-        pop_ ();
-      }
+void ResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-      }
+// ArtifactDeploymentDescription
+//
+//
 
-      void ArtifactDeploymentDescription::
-      location_next (Type const& o)
-      {
-        location_post (o);
-        location_pre (o);
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-        pop_ ();
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription ()
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ArtifactDeploymentDescription::traverse (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
+void ArtifactDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ArtifactDeploymentDescription::name (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+source_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+source_next (Type const& o)
+{
+source_post (o);
+source_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+void ArtifactDeploymentDescription::
+source_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+node (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+Traversal::ArtifactDeploymentDescription::node (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+location_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
+void ArtifactDeploymentDescription::
+location_next (Type const& o)
+{
+location_post (o);
+location_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+location_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::ArtifactDeploymentDescription::id (o);
-        attr_ (0);
-      }
+void ArtifactDeploymentDescription::
+execParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+}
 
-      // MonolithicDeploymentDescription
-      //
-      //
+void ArtifactDeploymentDescription::
+execParameter_next (Type const& o)
+{
+execParameter_post (o);
+execParameter_pre (o);
+}
 
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription ()
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicDeploymentDescription::traverse (o);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::MonolithicDeploymentDescription::name (o);
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+deployedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
+void ArtifactDeploymentDescription::
+deployedResource_next (Type const& o)
+{
+deployedResource_post (o);
+deployedResource_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::ArtifactDeploymentDescription::id (o);
+attr_ (0);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const& o)
-      {
-        artifact_post (o);
-        artifact_pre (o);
-      }
+// MonolithicDeploymentDescription
+//
+//
 
-      void MonolithicDeploymentDescription::
-      artifact_post (Type const&)
-      {
-        pop_ ();
-      }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-      }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription ()
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
+void MonolithicDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::MonolithicDeploymentDescription::traverse (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
+void MonolithicDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::MonolithicDeploymentDescription::name (o);
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+void MonolithicDeploymentDescription::
+source_next (Type const& o)
+{
+source_post (o);
+source_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void MonolithicDeploymentDescription::
+source_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::MonolithicDeploymentDescription::id (o);
-        attr_ (0);
-      }
+void MonolithicDeploymentDescription::
+artifact_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
+}
 
-      // ResourceUsageKind
-      //
-      //
+void MonolithicDeploymentDescription::
+artifact_next (Type const& o)
+{
+artifact_post (o);
+artifact_pre (o);
+}
 
-      ResourceUsageKind::
-      ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type const&)
+{
+pop_ ();
+}
 
-      ResourceUsageKind::
-      ResourceUsageKind ()
-      {
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+}
 
-      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 
-        {
-        }
+void MonolithicDeploymentDescription::
+execParameter_next (Type const& o)
+{
+execParameter_post (o);
+execParameter_pre (o);
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+void MonolithicDeploymentDescription::
+execParameter_post (Type const&)
+{
+pop_ ();
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      // InstanceResourceDeploymentDescription
-      //
-      //
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription ()
-      {
-      }
+void MonolithicDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::MonolithicDeploymentDescription::id (o);
+attr_ (0);
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceResourceDeploymentDescription::traverse (o);
-      }
+// ResourceUsageKind
+//
+//
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
-        pop_ ();
-      }
+ResourceUsageKind::
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+ResourceUsageKind::
+ResourceUsageKind ()
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceName (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
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-      // InstanceDeploymentDescription
-      //
-      //
+else
+{
+top_().value (s);
+}
+}
 
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// InstanceResourceDeploymentDescription
+//
+//
 
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription ()
-      {
-      }
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void InstanceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceDeploymentDescription::traverse (o);
-      }
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription ()
+{
+}
 
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::InstanceDeploymentDescription::name (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::InstanceResourceDeploymentDescription::traverse (o);
+}
 
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::InstanceDeploymentDescription::node (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        Traversal::InstanceDeploymentDescription::source (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-        Traversal::InstanceDeploymentDescription::implementation (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-      }
+void InstanceResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const& o)
-      {
-        configProperty_post (o);
-        configProperty_pre (o);
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedResource (o);
-        pop_ ();
-      }
+// InstanceDeploymentDescription
+//
+//
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
-        pop_ ();
-      }
+InstanceDeploymentDescription::
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::InstanceDeploymentDescription::id (o);
-        attr_ (0);
-      }
+InstanceDeploymentDescription::
+InstanceDeploymentDescription ()
+{
+}
 
-      // CCMComponentPortKind
-      //
-      //
+void InstanceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::InstanceDeploymentDescription::traverse (o);
+}
 
-      CCMComponentPortKind::
-      CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void InstanceDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::InstanceDeploymentDescription::name (o);
+pop_ ();
+}
 
-      CCMComponentPortKind::
-      CCMComponentPortKind ()
-      {
-      }
+void InstanceDeploymentDescription::
+node (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+Traversal::InstanceDeploymentDescription::node (o);
+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 InstanceDeploymentDescription::
+source (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+Traversal::InstanceDeploymentDescription::source (o);
+pop_ ();
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+void InstanceDeploymentDescription::
+implementation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
+Traversal::InstanceDeploymentDescription::implementation (o);
+pop_ ();
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
 
-      // ComponentPortDescription
-      //
-      //
+void InstanceDeploymentDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
 
-      ComponentPortDescription::
-      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void InstanceDeploymentDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      ComponentPortDescription::
-      ComponentPortDescription ()
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+Traversal::InstanceDeploymentDescription::deployedResource (o);
+pop_ ();
+}
 
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPortDescription::traverse (o);
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
+Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
+pop_ ();
+}
 
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ComponentPortDescription::name (o);
-        pop_ ();
-      }
+void InstanceDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::InstanceDeploymentDescription::id (o);
+attr_ (0);
+}
 
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
-        Traversal::ComponentPortDescription::specificType (o);
-        pop_ ();
-      }
+// CCMComponentPortKind
+//
+//
 
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
-        Traversal::ComponentPortDescription::supportedType (o);
-        pop_ ();
-      }
+CCMComponentPortKind::
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-        Traversal::ComponentPortDescription::provider (o);
-        pop_ ();
-      }
+CCMComponentPortKind::
+CCMComponentPortKind ()
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveProvider (o);
-        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 ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveUser (o);
-        pop_ ();
-      }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
-        Traversal::ComponentPortDescription::optional (o);
-        pop_ ();
-      }
+else
+{
+top_().value (s);
+}
+}
 
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::ComponentPortDescription::kind (o);
-        pop_ ();
-      }
+// ComponentPortDescription
+//
+//
 
-      // ComponentPropertyDescription
-      //
-      //
+ComponentPortDescription::
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ComponentPropertyDescription::
-      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ComponentPortDescription::
+ComponentPortDescription ()
+{
+}
 
-      ComponentPropertyDescription::
-      ComponentPropertyDescription ()
-      {
-      }
+void ComponentPortDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentPortDescription::traverse (o);
+}
 
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPropertyDescription::traverse (o);
-      }
+void ComponentPortDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ComponentPortDescription::name (o);
+pop_ ();
+}
 
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ComponentPropertyDescription::name (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+specificType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
+Traversal::ComponentPortDescription::specificType (o);
+pop_ ();
+}
 
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-        Traversal::ComponentPropertyDescription::type (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+supportedType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
+}
 
-      // ComponentExternalPortEndpoint
-      //
-      //
+void ComponentPortDescription::
+supportedType_next (Type const& o)
+{
+supportedType_post (o);
+supportedType_pre (o);
+}
 
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentPortDescription::
+supportedType_post (Type const&)
+{
+pop_ ();
+}
 
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint ()
-      {
-      }
+void ComponentPortDescription::
+provider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+Traversal::ComponentPortDescription::provider (o);
+pop_ ();
+}
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentExternalPortEndpoint::traverse (o);
-      }
+void ComponentPortDescription::
+exclusiveProvider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
+Traversal::ComponentPortDescription::exclusiveProvider (o);
+pop_ ();
+}
 
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::ComponentExternalPortEndpoint::portName (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+exclusiveUser (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
+Traversal::ComponentPortDescription::exclusiveUser (o);
+pop_ ();
+}
 
-      // PlanSubcomponentPortEndpoint
-      //
-      //
+void ComponentPortDescription::
+optional (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
+Traversal::ComponentPortDescription::optional (o);
+pop_ ();
+}
 
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentPortDescription::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::ComponentPortDescription::kind (o);
+pop_ ();
+}
 
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint ()
-      {
-      }
+// ComponentPropertyDescription
+//
+//
 
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::PlanSubcomponentPortEndpoint::traverse (o);
-      }
+ComponentPropertyDescription::
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
+ComponentPropertyDescription::
+ComponentPropertyDescription ()
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::provider (o);
-        pop_ ();
-      }
+void ComponentPropertyDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentPropertyDescription::traverse (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::kind (o);
-        pop_ ();
-      }
+void ComponentPropertyDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ComponentPropertyDescription::name (o);
+pop_ ();
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
+void ComponentPropertyDescription::
+type (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+Traversal::ComponentPropertyDescription::type (o);
+pop_ ();
+}
 
-      // ExternalReferenceEndpoint
-      //
-      //
+// ComponentExternalPortEndpoint
+//
+//
 
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint ()
-      {
-      }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint ()
+{
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ExternalReferenceEndpoint::traverse (o);
-      }
+void ComponentExternalPortEndpoint::
+traverse (Type const& o)
+{
+Traversal::ComponentExternalPortEndpoint::traverse (o);
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-        Traversal::ExternalReferenceEndpoint::location (o);
-        pop_ ();
-      }
+void ComponentExternalPortEndpoint::
+portName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+Traversal::ComponentExternalPortEndpoint::portName (o);
+pop_ ();
+}
 
-      // ConnectionResourceDeploymentDescription
-      //
-      //
+// PlanSubcomponentPortEndpoint
+//
+//
 
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription ()
-      {
-      }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint ()
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ConnectionResourceDeploymentDescription::traverse (o);
-      }
+void PlanSubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+Traversal::PlanSubcomponentPortEndpoint::traverse (o);
+}
 
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::targetName (o);
-        pop_ ();
-      }
+void PlanSubcomponentPortEndpoint::
+portName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::portName (o);
+pop_ ();
+}
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::provider (o);
+pop_ ();
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
+void PlanSubcomponentPortEndpoint::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::kind (o);
+pop_ ();
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::instance (o);
+pop_ ();
+}
 
-      // PlanConnectionDescription
-      //
-      //
+// ExternalReferenceEndpoint
+//
+//
 
-      PlanConnectionDescription::
-      PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      PlanConnectionDescription::
-      PlanConnectionDescription ()
-      {
-      }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint ()
+{
+}
 
-      void PlanConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::PlanConnectionDescription::traverse (o);
-      }
+void ExternalReferenceEndpoint::
+traverse (Type const& o)
+{
+Traversal::ExternalReferenceEndpoint::traverse (o);
+}
 
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::PlanConnectionDescription::name (o);
-        pop_ ();
-      }
+void ExternalReferenceEndpoint::
+location (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+Traversal::ExternalReferenceEndpoint::location (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        Traversal::PlanConnectionDescription::source (o);
-        pop_ ();
-      }
+// ConnectionResourceDeploymentDescription
+//
+//
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription ()
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ConnectionResourceDeploymentDescription::traverse (o);
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::targetName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
+void ConnectionResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
+void ConnectionResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-      }
+// PlanConnectionDescription
+//
+//
 
-      void PlanConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
+PlanConnectionDescription::
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        pop_ ();
-      }
+PlanConnectionDescription::
+PlanConnectionDescription ()
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-      }
+void PlanConnectionDescription::
+traverse (Type const& o)
+{
+Traversal::PlanConnectionDescription::traverse (o);
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
+void PlanConnectionDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::PlanConnectionDescription::name (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void PlanConnectionDescription::
+source (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+Traversal::PlanConnectionDescription::source (o);
+pop_ ();
+}
 
-      // ImplementationDependency
-      //
-      //
+void PlanConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      ImplementationDependency::
-      ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      ImplementationDependency::
-      ImplementationDependency ()
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationDependency::traverse (o);
-      }
+void PlanConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
+}
 
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-        Traversal::ImplementationDependency::requiredType (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+externalEndpoint_next (Type const& o)
+{
+externalEndpoint_post (o);
+externalEndpoint_pre (o);
+}
 
-      // Capability
-      //
-      //
+void PlanConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+pop_ ();
+}
 
-      Capability::
-      Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
+}
 
-      Capability::
-      Capability ()
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type const& o)
+{
+internalEndpoint_post (o);
+internalEndpoint_pre (o);
+}
 
-      void Capability::
-      traverse (Type const& o)
-      {
-        Traversal::Capability::traverse (o);
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+pop_ ();
+}
 
-      void Capability::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Capability::name (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+externalReference_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
+}
 
-      void Capability::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::Capability::resourceType (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+externalReference_next (Type const& o)
+{
+externalReference_post (o);
+externalReference_pre (o);
+}
 
-      void Capability::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::Capability::property (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+externalReference_post (Type const&)
+{
+pop_ ();
+}
 
-      // ImplementationRequirement
-      //
-      //
+void PlanConnectionDescription::
+deployedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+}
 
-      ImplementationRequirement::
-      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanConnectionDescription::
+deployedResource_next (Type const& o)
+{
+deployedResource_post (o);
+deployedResource_pre (o);
+}
 
-      ImplementationRequirement::
-      ImplementationRequirement ()
-      {
-      }
+void PlanConnectionDescription::
+deployedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationRequirement::traverse (o);
-      }
+// ImplementationDependency
+//
+//
 
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-        Traversal::ImplementationRequirement::resourceUsage (o);
-        pop_ ();
-      }
+ImplementationDependency::
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
-        Traversal::ImplementationRequirement::resourcePort (o);
-        pop_ ();
-      }
+ImplementationDependency::
+ImplementationDependency ()
+{
+}
 
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
-        Traversal::ImplementationRequirement::componentPort (o);
-        pop_ ();
-      }
+void ImplementationDependency::
+traverse (Type const& o)
+{
+Traversal::ImplementationDependency::traverse (o);
+}
 
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::ImplementationRequirement::resourceType (o);
-        pop_ ();
-      }
+void ImplementationDependency::
+requiredType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+Traversal::ImplementationDependency::requiredType (o);
+pop_ ();
+}
 
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ImplementationRequirement::name (o);
-        pop_ ();
-      }
+// Capability
+//
+//
 
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::ImplementationRequirement::property (o);
-        pop_ ();
-      }
+Capability::
+Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      // ComponentPackageReference
-      //
-      //
+Capability::
+Capability ()
+{
+}
 
-      ComponentPackageReference::
-      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Capability::
+traverse (Type const& o)
+{
+Traversal::Capability::traverse (o);
+}
 
-      ComponentPackageReference::
-      ComponentPackageReference ()
-      {
-      }
+void Capability::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Capability::name (o);
+pop_ ();
+}
 
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPackageReference::traverse (o);
-      }
+void Capability::
+resourceType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
-        Traversal::ComponentPackageReference::requiredUUID (o);
-        pop_ ();
-      }
+void Capability::
+resourceType_next (Type const& o)
+{
+resourceType_post (o);
+resourceType_pre (o);
+}
 
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
-        Traversal::ComponentPackageReference::requiredName (o);
-        pop_ ();
-      }
+void Capability::
+resourceType_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-        Traversal::ComponentPackageReference::requiredType (o);
-        pop_ ();
-      }
+void Capability::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      // SubcomponentPortEndpoint
-      //
-      //
+void Capability::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Capability::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint ()
-      {
-      }
+// ImplementationRequirement
+//
+//
 
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPortEndpoint::traverse (o);
-      }
+ImplementationRequirement::
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::SubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
+ImplementationRequirement::
+ImplementationRequirement ()
+{
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::SubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
+void ImplementationRequirement::
+traverse (Type const& o)
+{
+Traversal::ImplementationRequirement::traverse (o);
+}
 
-      // AssemblyConnectionDescription
-      //
-      //
+void ImplementationRequirement::
+resourceUsage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+Traversal::ImplementationRequirement::resourceUsage (o);
+pop_ ();
+}
 
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ImplementationRequirement::
+resourcePort (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
+Traversal::ImplementationRequirement::resourcePort (o);
+pop_ ();
+}
 
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription ()
-      {
-      }
+void ImplementationRequirement::
+componentPort (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
+Traversal::ImplementationRequirement::componentPort (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyConnectionDescription::traverse (o);
-      }
+void ImplementationRequirement::
+resourceType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+Traversal::ImplementationRequirement::resourceType (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::AssemblyConnectionDescription::name (o);
-        pop_ ();
-      }
+void ImplementationRequirement::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ImplementationRequirement::name (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::AssemblyConnectionDescription::deployRequirement (o);
-        pop_ ();
-      }
+void ImplementationRequirement::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-      }
+void ImplementationRequirement::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
+void ImplementationRequirement::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+// ComponentPackageReference
+//
+//
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-      }
+ComponentPackageReference::
+ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
+ComponentPackageReference::
+ComponentPackageReference ()
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+void ComponentPackageReference::
+traverse (Type const& o)
+{
+Traversal::ComponentPackageReference::traverse (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-      }
+void ComponentPackageReference::
+requiredUUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
+Traversal::ComponentPackageReference::requiredUUID (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
+void ComponentPackageReference::
+requiredName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
+Traversal::ComponentPackageReference::requiredName (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        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/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index 530a46d5bbf..3b3f395a0bb 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,39 +24,39 @@
 //
 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 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>
@@ -68,6999 +65,7032 @@ namespace CIAO
 
 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
-      };
-
-
-      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
-    {
-      //@@ VC6 anathema
-      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__;
-
-      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
-    {
-      //@@ VC6 anathema
-      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_;
-
-      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
-    {
-      //@@ 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_;
-
-      // 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 Any : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // type
-      // 
-      public:
-      ::CIAO::Config_Handlers::DataType const& type () const;
-      void type (::CIAO::Config_Handlers::DataType const& );
+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
+{
+//@@ VC6 anathema
+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__;
+
+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
+{
+//@@ VC6 anathema
+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_;
+
+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
+{
+//@@ 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_;
+
+// 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 Any : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// 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_;
+
+// value
+//
+public:
+::CIAO::Config_Handlers::DataValue const& value () const;
+void value (::CIAO::Config_Handlers::DataValue const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
+
+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);
+
+Any&
+operator= (Any const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Property : 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_;
+
+// value
+//
+public:
+::CIAO::Config_Handlers::Any const& value () const;
+void value (::CIAO::Config_Handlers::Any const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+
+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);
+
+Property&
+operator= (Property const& s);
+
+private:
+char regulator__;
+};
+
+
+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);
+
+friend bool XSC_XML_Handlers_Export
+operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+
+private:
+SatisfierPropertyKind (Value v);
+
+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);
+
+
+class XSC_XML_Handlers_Export SatisfierProperty : 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_;
+
+// kind
+//
+public:
+::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
+void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
+
+// dynamic
+//
+public:
+::XMLSchema::boolean const& dynamic () const;
+void dynamic (::XMLSchema::boolean const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > dynamic_;
+
+// value
+//
+public:
+::CIAO::Config_Handlers::Any const& value () const;
+void value (::CIAO::Config_Handlers::Any const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+
+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
+{
+//@@ 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:
+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
+{
+//@@ VC6 anathema
+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
+{
+//@@ VC6 anathema
+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
+{
+//@@ 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_;
+
+// 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
+{
+//@@ 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_;
+
+// 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
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+// resourceUsage
+//
+public:
+::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
+void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::DataValue const& value () const;
-      void value (::CIAO::Config_Handlers::DataValue const& );
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
+// requirementName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      Any (::CIAO::Config_Handlers::DataType const& type__,
-      ::CIAO::Config_Handlers::DataValue const& value__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
-      Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Any (Any const& s);
+// 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;
 
-      Any&
-      operator= (Any const& s);
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
 
-      private:
-      char regulator__;
-    };
+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);
 
-    class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+InstanceResourceDeploymentDescription&
+operator= (InstanceResourceDeploymentDescription const& s);
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export InstanceDeploymentDescription : 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_;
+
+// node
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& node () const;
+void node (::XMLSchema::string< ACE_TCHAR > const& );
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      void value (::CIAO::Config_Handlers::Any const& );
+// source
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& source () const;
+void source (::XMLSchema::string< ACE_TCHAR > const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
 
-      public:
-      Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::Any const& value__);
+// implementation
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
+void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
 
-      Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Property (Property const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
 
-      Property&
-      operator= (Property const& s);
+// 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& );
 
-      private:
-      char regulator__;
-    };
+protected:
+::std::auto_ptr< ::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& );
 
-    class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
-    {
-      public:
-      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
 
-      static SatisfierPropertyKind const Quantity;
-      static SatisfierPropertyKind const Capacity;
-      static SatisfierPropertyKind const Minimum;
-      static SatisfierPropertyKind const Maximum;
-      static SatisfierPropertyKind const Attribute;
-      static SatisfierPropertyKind const Selection;
+// 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& );
 
-      enum Value
-      {
-        Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l
-      };
+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__);
 
-      Value
-      integral () const;
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
 
-      friend bool XSC_XML_Handlers_Export 
-      operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+InstanceDeploymentDescription&
+operator= (InstanceDeploymentDescription const& s);
 
-      friend bool XSC_XML_Handlers_Export 
-      operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+private:
+char regulator__;
+};
 
-      private:
-      SatisfierPropertyKind (Value v);
 
-      Value v_;
-    };
+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
+};
 
-    bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-    bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+Value
+integral () const;
 
+friend bool XSC_XML_Handlers_Export
+operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
-    class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+friend bool XSC_XML_Handlers_Export
+operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+CCMComponentPortKind (Value v);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+Value v_;
+};
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
+bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
+bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      void value (::CIAO::Config_Handlers::Any const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      public:
-      SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-      ::CIAO::Config_Handlers::Any const& value__);
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SatisfierProperty (SatisfierProperty const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      SatisfierProperty&
-      operator= (SatisfierProperty const& s);
+// specificType
+//
+public:
+bool specificType_p () const;
+::XMLSchema::string< ACE_TCHAR > const& specificType () const;
+void specificType (::XMLSchema::string< ACE_TCHAR > const& );
 
-      private:
-      char regulator__;
-    };
+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_;
+
+// provider
+//
+public:
+::XMLSchema::boolean const& provider () const;
+void provider (::XMLSchema::boolean const& );
 
-    class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > provider_;
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
+// exclusiveProvider
+//
+public:
+::XMLSchema::boolean const& exclusiveProvider () const;
+void exclusiveProvider (::XMLSchema::boolean const& );
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > exclusiveProvider_;
 
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+// exclusiveUser
+//
+public:
+::XMLSchema::boolean const& exclusiveUser () const;
+void exclusiveUser (::XMLSchema::boolean const& );
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > exclusiveUser_;
 
-      // property
-      // 
-      public:
-      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
+// optional
+//
+public:
+::XMLSchema::boolean const& optional () const;
+void optional (::XMLSchema::boolean const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > optional_;
 
-      public:
-      Resource (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
+// kind
+//
+public:
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
 
-      Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Resource (Resource const& s);
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-      Resource&
-      operator= (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__);
 
-      private:
-      char regulator__;
-    };
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPortDescription (ComponentPortDescription const& s);
 
+ComponentPortDescription&
+operator= (ComponentPortDescription const& s);
 
-    class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
 
-      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:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-      ::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::Property const& property__);
-
-      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
-    {
-      //@@ VC6 anathema
-      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_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-      ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      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
-    {
-      //@@ 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_;
-
-      // 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
-    {
-      //@@ 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_;
-
-      // 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
-    {
-      //@@ VC6 anathema
-      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_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-      ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-      ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      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
-    {
-      //@@ 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_;
-
-      // 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:
-      bool deployedResource_p () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
-      void deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::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
-    {
-      //@@ 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_;
-
-      // specificType
-      // 
-      public:
-      ::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:
-      ::XMLSchema::string< ACE_TCHAR > const& supportedType () const;
-      void supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // provider
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& provider () const;
-      void provider (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+// type
+//
+public:
+::CIAO::Config_Handlers::DataType const& type () const;
+void type (::CIAO::Config_Handlers::DataType const& );
 
-      // exclusiveProvider
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider () const;
-      void exclusiveProvider (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveProvider_;
+public:
+ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::DataType const& type__);
 
-      // exclusiveUser
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser () const;
-      void exclusiveUser (::XMLSchema::string< ACE_TCHAR > const& );
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPropertyDescription (ComponentPropertyDescription const& s);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveUser_;
+ComponentPropertyDescription&
+operator= (ComponentPropertyDescription const& s);
 
-      // optional
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& optional () const;
-      void optional (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > optional_;
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+// portName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& portName () const;
+void portName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::XMLSchema::string< ACE_TCHAR > const& specificType__,
-      ::XMLSchema::string< ACE_TCHAR > const& supportedType__,
-      ::XMLSchema::string< ACE_TCHAR > const& provider__,
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider__,
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser__,
-      ::XMLSchema::string< ACE_TCHAR > const& optional__,
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
-      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPortDescription (ComponentPortDescription const& s);
+public:
+ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
 
-      ComponentPortDescription&
-      operator= (ComponentPortDescription const& s);
-
-      private:
-      char regulator__;
-    };
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
 
+ComponentExternalPortEndpoint&
+operator= (ComponentExternalPortEndpoint const& s);
 
-    class XSC_XML_Handlers_Export ComponentPropertyDescription : 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_;
-
-      // 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__);
-
-      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPropertyDescription (ComponentPropertyDescription const& s);
-
-      ComponentPropertyDescription&
-      operator= (ComponentPropertyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
+private:
+char regulator__;
+};
 
-    class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      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 PlanSubcomponentPortEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+// portName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& portName () const;
+void portName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
+// provider
+//
+public:
+bool provider_p () const;
+::XMLSchema::string< ACE_TCHAR > const& provider () const;
+void provider (::XMLSchema::string< ACE_TCHAR > const& );
 
-      ComponentExternalPortEndpoint&
-      operator= (ComponentExternalPortEndpoint const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
 
-      private:
-      char regulator__;
-    };
+// kind
+//
+public:
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
 
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-    class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+// instance
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
 
-      // portName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
-      void portName (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+public:
+PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
 
-      // provider
-      // 
-      public:
-      bool provider_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& provider () const;
-      void provider (::XMLSchema::string< ACE_TCHAR > const& );
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+PlanSubcomponentPortEndpoint&
+operator= (PlanSubcomponentPortEndpoint const& s);
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-      // instance
-      // 
-      public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+// location
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& location () const;
+void location (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
 
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
+public:
+ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
 
-      PlanSubcomponentPortEndpoint&
-      operator= (PlanSubcomponentPortEndpoint const& s);
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
 
-      private:
-      char regulator__;
-    };
+ExternalReferenceEndpoint&
+operator= (ExternalReferenceEndpoint const& s);
 
+private:
+char regulator__;
+};
 
-    class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
 
-      // location
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& location () const;
-      void location (::XMLSchema::string< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
+// targetName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& targetName () const;
+void targetName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      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
-    {
-      //@@ VC6 anathema
-      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_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-      ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-      ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      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
-    {
-      //@@ 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_;
-
-      // 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
-    {
-      //@@ VC6 anathema
-      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
-    {
-      //@@ 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_;
-
-      // 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:
-      Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
-
-      Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Capability (Capability const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
 
-      Capability&
-      operator= (Capability const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+// requirementName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // resourceUsage
-      // 
-      public:
-      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
-
-      // resourcePort
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourcePort () const;
-      void resourcePort (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_;
+// resourceName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // componentPort
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& componentPort () const;
-      void componentPort (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_;
+// 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;
 
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+public:
+ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
+::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__);
 
-      // 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:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourcePort__,
-      ::XMLSchema::string< ACE_TCHAR > const& componentPort__,
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-      ::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::Property const& property__);
-
-      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ImplementationRequirement (ImplementationRequirement const& s);
-
-      ImplementationRequirement&
-      operator= (ImplementationRequirement const& s);
-
-      private:
-      char regulator__;
-    };
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
 
+ConnectionResourceDeploymentDescription&
+operator= (ConnectionResourceDeploymentDescription const& s);
 
-    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requiredUUID
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
-      void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
-
-      // requiredName
-      // 
-      public:
-      ::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& requiredUUID__,
-      ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-      ::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
-    {
-      //@@ VC6 anathema
-      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
-    {
-      //@@ 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_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::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::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_;
-
-      // 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__;
-    };
-  }
+
+class XSC_XML_Handlers_Export PlanConnectionDescription : 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_;
+
+// 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
+{
+//@@ VC6 anathema
+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
+{
+//@@ 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:
+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
+{
+//@@ VC6 anathema
+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 ComponentPackageReference : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+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
+{
+//@@ VC6 anathema
+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
+{
+//@@ 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_;
+
+// 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
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
-      TCKind;
+namespace Config_Handlers
+{
+namespace Traversal
+{
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
+TCKind;
 
-      struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
+{
+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
-        kind (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        enum_ (Type&);
+virtual void
+enum_ (Type&);
 
-        virtual void
-        enum_ (Type const&);
+virtual void
+enum_ (Type const&);
 
-        virtual void
-        enum_none (Type&);
+virtual void
+enum_none (Type&);
 
-        virtual void
-        enum_none (Type const&);
+virtual void
+enum_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 DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
+{
+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
-        short_ (Type&);
+virtual void
+short_ (Type&);
 
-        virtual void
-        short_ (Type const&);
+virtual void
+short_ (Type const&);
 
-        virtual void
-        short_pre (Type&);
+virtual void
+short_pre (Type&);
 
-        virtual void
-        short_pre (Type const&);
+virtual void
+short_pre (Type const&);
 
-        virtual void
-        short_next (Type&);
+virtual void
+short_next (Type&);
 
-        virtual void
-        short_next (Type const&);
+virtual void
+short_next (Type const&);
 
-        virtual void
-        short_post (Type&);
+virtual void
+short_post (Type&);
 
-        virtual void
-        short_post (Type const&);
+virtual void
+short_post (Type const&);
 
-        virtual void
-        short_none (Type&);
+virtual void
+short_none (Type&);
 
-        virtual void
-        short_none (Type const&);
+virtual void
+short_none (Type const&);
 
-        virtual void
-        long_ (Type&);
+virtual void
+long_ (Type&);
 
-        virtual void
-        long_ (Type const&);
+virtual void
+long_ (Type const&);
 
-        virtual void
-        long_pre (Type&);
+virtual void
+long_pre (Type&);
 
-        virtual void
-        long_pre (Type const&);
+virtual void
+long_pre (Type const&);
 
-        virtual void
-        long_next (Type&);
+virtual void
+long_next (Type&);
 
-        virtual void
-        long_next (Type const&);
+virtual void
+long_next (Type const&);
 
-        virtual void
-        long_post (Type&);
+virtual void
+long_post (Type&);
 
-        virtual void
-        long_post (Type const&);
+virtual void
+long_post (Type const&);
 
-        virtual void
-        long_none (Type&);
+virtual void
+long_none (Type&);
 
-        virtual void
-        long_none (Type const&);
+virtual void
+long_none (Type const&);
 
-        virtual void
-        ushort (Type&);
+virtual void
+ushort (Type&);
 
-        virtual void
-        ushort (Type const&);
+virtual void
+ushort (Type const&);
 
-        virtual void
-        ushort_pre (Type&);
+virtual void
+ushort_pre (Type&);
 
-        virtual void
-        ushort_pre (Type const&);
+virtual void
+ushort_pre (Type const&);
 
-        virtual void
-        ushort_next (Type&);
+virtual void
+ushort_next (Type&);
 
-        virtual void
-        ushort_next (Type const&);
+virtual void
+ushort_next (Type const&);
 
-        virtual void
-        ushort_post (Type&);
+virtual void
+ushort_post (Type&);
 
-        virtual void
-        ushort_post (Type const&);
+virtual void
+ushort_post (Type const&);
 
-        virtual void
-        ushort_none (Type&);
+virtual void
+ushort_none (Type&);
 
-        virtual void
-        ushort_none (Type const&);
+virtual void
+ushort_none (Type const&);
 
-        virtual void
-        ulong (Type&);
+virtual void
+ulong (Type&);
 
-        virtual void
-        ulong (Type const&);
+virtual void
+ulong (Type const&);
 
-        virtual void
-        ulong_pre (Type&);
+virtual void
+ulong_pre (Type&);
 
-        virtual void
-        ulong_pre (Type const&);
+virtual void
+ulong_pre (Type const&);
 
-        virtual void
-        ulong_next (Type&);
+virtual void
+ulong_next (Type&);
 
-        virtual void
-        ulong_next (Type const&);
+virtual void
+ulong_next (Type const&);
 
-        virtual void
-        ulong_post (Type&);
+virtual void
+ulong_post (Type&);
 
-        virtual void
-        ulong_post (Type const&);
+virtual void
+ulong_post (Type const&);
 
-        virtual void
-        ulong_none (Type&);
+virtual void
+ulong_none (Type&);
 
-        virtual void
-        ulong_none (Type const&);
+virtual void
+ulong_none (Type const&);
 
-        virtual void
-        float_ (Type&);
+virtual void
+float_ (Type&);
 
-        virtual void
-        float_ (Type const&);
+virtual void
+float_ (Type const&);
 
-        virtual void
-        float_pre (Type&);
+virtual void
+float_pre (Type&);
 
-        virtual void
-        float_pre (Type const&);
+virtual void
+float_pre (Type const&);
 
-        virtual void
-        float_next (Type&);
+virtual void
+float_next (Type&);
 
-        virtual void
-        float_next (Type const&);
+virtual void
+float_next (Type const&);
 
-        virtual void
-        float_post (Type&);
+virtual void
+float_post (Type&);
 
-        virtual void
-        float_post (Type const&);
+virtual void
+float_post (Type const&);
 
-        virtual void
-        float_none (Type&);
+virtual void
+float_none (Type&);
 
-        virtual void
-        float_none (Type const&);
+virtual void
+float_none (Type const&);
 
-        virtual void
-        double_ (Type&);
+virtual void
+double_ (Type&);
 
-        virtual void
-        double_ (Type const&);
+virtual void
+double_ (Type const&);
 
-        virtual void
-        double_pre (Type&);
+virtual void
+double_pre (Type&);
 
-        virtual void
-        double_pre (Type const&);
+virtual void
+double_pre (Type const&);
 
-        virtual void
-        double_next (Type&);
+virtual void
+double_next (Type&);
 
-        virtual void
-        double_next (Type const&);
+virtual void
+double_next (Type const&);
 
-        virtual void
-        double_post (Type&);
+virtual void
+double_post (Type&);
 
-        virtual void
-        double_post (Type const&);
+virtual void
+double_post (Type const&);
 
-        virtual void
-        double_none (Type&);
+virtual void
+double_none (Type&);
 
-        virtual void
-        double_none (Type const&);
+virtual void
+double_none (Type const&);
 
-        virtual void
-        boolean (Type&);
+virtual void
+boolean (Type&);
 
-        virtual void
-        boolean (Type const&);
+virtual void
+boolean (Type const&);
 
-        virtual void
-        boolean_pre (Type&);
+virtual void
+boolean_pre (Type&);
 
-        virtual void
-        boolean_pre (Type const&);
+virtual void
+boolean_pre (Type const&);
 
-        virtual void
-        boolean_next (Type&);
+virtual void
+boolean_next (Type&);
 
-        virtual void
-        boolean_next (Type const&);
+virtual void
+boolean_next (Type const&);
 
-        virtual void
-        boolean_post (Type&);
+virtual void
+boolean_post (Type&);
 
-        virtual void
-        boolean_post (Type const&);
+virtual void
+boolean_post (Type const&);
 
-        virtual void
-        boolean_none (Type&);
+virtual void
+boolean_none (Type&);
 
-        virtual void
-        boolean_none (Type const&);
+virtual void
+boolean_none (Type const&);
 
-        virtual void
-        octet (Type&);
+virtual void
+octet (Type&);
 
-        virtual void
-        octet (Type const&);
+virtual void
+octet (Type const&);
 
-        virtual void
-        octet_pre (Type&);
+virtual void
+octet_pre (Type&);
 
-        virtual void
-        octet_pre (Type const&);
+virtual void
+octet_pre (Type const&);
 
-        virtual void
-        octet_next (Type&);
+virtual void
+octet_next (Type&);
 
-        virtual void
-        octet_next (Type const&);
+virtual void
+octet_next (Type const&);
 
-        virtual void
-        octet_post (Type&);
+virtual void
+octet_post (Type&);
 
-        virtual void
-        octet_post (Type const&);
+virtual void
+octet_post (Type const&);
 
-        virtual void
-        octet_none (Type&);
+virtual void
+octet_none (Type&);
 
-        virtual void
-        octet_none (Type const&);
+virtual void
+octet_none (Type const&);
 
-        virtual void
-        enum_ (Type&);
+virtual void
+enum_ (Type&);
 
-        virtual void
-        enum_ (Type const&);
+virtual void
+enum_ (Type const&);
 
-        virtual void
-        enum_pre (Type&);
+virtual void
+enum_pre (Type&);
 
-        virtual void
-        enum_pre (Type const&);
+virtual void
+enum_pre (Type const&);
 
-        virtual void
-        enum_next (Type&);
+virtual void
+enum_next (Type&);
 
-        virtual void
-        enum_next (Type const&);
+virtual void
+enum_next (Type const&);
 
-        virtual void
-        enum_post (Type&);
+virtual void
+enum_post (Type&);
 
-        virtual void
-        enum_post (Type const&);
+virtual void
+enum_post (Type const&);
 
-        virtual void
-        enum_none (Type&);
+virtual void
+enum_none (Type&);
 
-        virtual void
-        enum_none (Type const&);
+virtual void
+enum_none (Type const&);
 
-        virtual void
-        string (Type&);
+virtual void
+string (Type&);
 
-        virtual void
-        string (Type const&);
+virtual void
+string (Type const&);
 
-        virtual void
-        string_pre (Type&);
+virtual void
+string_pre (Type&);
 
-        virtual void
-        string_pre (Type const&);
+virtual void
+string_pre (Type const&);
 
-        virtual void
-        string_next (Type&);
+virtual void
+string_next (Type&);
 
-        virtual void
-        string_next (Type const&);
+virtual void
+string_next (Type const&);
 
-        virtual void
-        string_post (Type&);
+virtual void
+string_post (Type&);
 
-        virtual void
-        string_post (Type const&);
+virtual void
+string_post (Type const&);
 
-        virtual void
-        string_none (Type&);
+virtual void
+string_none (Type&);
 
-        virtual void
-        string_none (Type const&);
+virtual void
+string_none (Type const&);
 
-        virtual void
-        longlong (Type&);
+virtual void
+longlong (Type&);
 
-        virtual void
-        longlong (Type const&);
+virtual void
+longlong (Type const&);
 
-        virtual void
-        longlong_pre (Type&);
+virtual void
+longlong_pre (Type&);
 
-        virtual void
-        longlong_pre (Type const&);
+virtual void
+longlong_pre (Type const&);
 
-        virtual void
-        longlong_next (Type&);
+virtual void
+longlong_next (Type&);
 
-        virtual void
-        longlong_next (Type const&);
+virtual void
+longlong_next (Type const&);
 
-        virtual void
-        longlong_post (Type&);
+virtual void
+longlong_post (Type&);
 
-        virtual void
-        longlong_post (Type const&);
+virtual void
+longlong_post (Type const&);
 
-        virtual void
-        longlong_none (Type&);
+virtual void
+longlong_none (Type&);
 
-        virtual void
-        longlong_none (Type const&);
+virtual void
+longlong_none (Type const&);
 
-        virtual void
-        ulonglong (Type&);
+virtual void
+ulonglong (Type&);
 
-        virtual void
-        ulonglong (Type const&);
+virtual void
+ulonglong (Type const&);
 
-        virtual void
-        ulonglong_pre (Type&);
+virtual void
+ulonglong_pre (Type&);
 
-        virtual void
-        ulonglong_pre (Type const&);
+virtual void
+ulonglong_pre (Type const&);
 
-        virtual void
-        ulonglong_next (Type&);
+virtual void
+ulonglong_next (Type&);
 
-        virtual void
-        ulonglong_next (Type const&);
+virtual void
+ulonglong_next (Type const&);
 
-        virtual void
-        ulonglong_post (Type&);
+virtual void
+ulonglong_post (Type&);
 
-        virtual void
-        ulonglong_post (Type const&);
+virtual void
+ulonglong_post (Type const&);
 
-        virtual void
-        ulonglong_none (Type&);
+virtual void
+ulonglong_none (Type&);
 
-        virtual void
-        ulonglong_none (Type const&);
+virtual void
+ulonglong_none (Type const&);
 
-        virtual void
-        longdouble (Type&);
+virtual void
+longdouble (Type&);
 
-        virtual void
-        longdouble (Type const&);
+virtual void
+longdouble (Type const&);
 
-        virtual void
-        longdouble_pre (Type&);
+virtual void
+longdouble_pre (Type&);
 
-        virtual void
-        longdouble_pre (Type const&);
+virtual void
+longdouble_pre (Type const&);
 
-        virtual void
-        longdouble_next (Type&);
+virtual void
+longdouble_next (Type&);
 
-        virtual void
-        longdouble_next (Type const&);
+virtual void
+longdouble_next (Type const&);
 
-        virtual void
-        longdouble_post (Type&);
+virtual void
+longdouble_post (Type&);
 
-        virtual void
-        longdouble_post (Type const&);
+virtual void
+longdouble_post (Type const&);
 
-        virtual void
-        longdouble_none (Type&);
+virtual void
+longdouble_none (Type&);
 
-        virtual void
-        longdouble_none (Type const&);
+virtual void
+longdouble_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 EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
+{
+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
-        typeId (Type&);
+virtual void
+typeId (Type&);
 
-        virtual void
-        typeId (Type const&);
+virtual void
+typeId (Type const&);
 
-        virtual void
-        member (Type&);
+virtual void
+member (Type&);
 
-        virtual void
-        member (Type const&);
+virtual void
+member (Type const&);
 
-        virtual void
-        member_pre (Type&);
+virtual void
+member_pre (Type&);
 
-        virtual void
-        member_pre (Type const&);
+virtual void
+member_pre (Type const&);
 
-        virtual void
-        member_next (Type&);
+virtual void
+member_next (Type&);
 
-        virtual void
-        member_next (Type const&);
+virtual void
+member_next (Type const&);
 
-        virtual void
-        member_post (Type&);
+virtual void
+member_post (Type&);
 
-        virtual void
-        member_post (Type const&);
+virtual void
+member_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 Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
+{
+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
-        type (Type&);
+virtual void
+type (Type&);
 
-        virtual void
-        type (Type const&);
+virtual void
+type (Type const&);
 
-        virtual void
-        value (Type&);
+virtual void
+value (Type&);
 
-        virtual void
-        value (Type const&);
+virtual void
+value (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 Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
+{
+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
-        value (Type&);
+virtual void
+value (Type&);
 
-        virtual void
-        value (Type const&);
+virtual void
+value (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+post (Type const&);
+};
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
-      SatisfierPropertyKind;
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
+SatisfierPropertyKind;
 
-      struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
+{
+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
-        kind (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        value (Type&);
+virtual void
+dynamic (Type&);
 
-        virtual void
-        value (Type const&);
+virtual void
+dynamic (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+value (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+value (Type const&);
 
-      struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
-      {
-        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 Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
+{
+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
-        resourceType (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+resourceType_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+resourceType_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+resourceType_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+resourceType_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property_post (Type const&);
 
-      struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        requirementName (Type&);
+struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        resourceName (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        resourceValue (Type const&);
+virtual void
+resourceType (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 ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
-      {
-        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
-        name (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        source_pre (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        source_pre (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        source_next (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        source_next (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        source_post (Type&);
+struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        source_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        node (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        node (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        location (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        location (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void
-        location_pre (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        location_pre (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        location_next (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        location_next (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        location_post (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        location_post (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        execParameter_pre (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        execParameter_pre (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        execParameter_next (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        execParameter_next (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        execParameter_post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        execParameter_none (Type&);
+struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        deployRequirement_pre (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        deployRequirement_next (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        deployRequirement_post (Type&);
+virtual void
+source_pre (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+source_pre (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+source_next (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+source_next (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+source_post (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+source_post (Type const&);
 
-        virtual void
-        deployedResource_pre (Type&);
+virtual void
+node (Type&);
 
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void
-        deployedResource_next (Type&);
+virtual void
+location (Type&);
 
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+location (Type const&);
 
-        virtual void
-        deployedResource_post (Type&);
+virtual void
+location_pre (Type&);
 
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+location_pre (Type const&);
 
-        virtual void
-        deployedResource_none (Type&);
+virtual void
+location_next (Type&);
 
-        virtual void
-        deployedResource_none (Type const&);
+virtual void
+location_next (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+location_post (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+location_post (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+execParameter_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+execParameter_none (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        source_pre (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        source_pre (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        source_next (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        source_next (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        source_post (Type&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        source_post (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        artifact (Type&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        artifact (Type const&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        artifact_pre (Type&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        artifact_pre (Type const&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        artifact_next (Type&);
+virtual void
+deployedResource_pre (Type&);
 
-        virtual void
-        artifact_next (Type const&);
+virtual void
+deployedResource_pre (Type const&);
 
-        virtual void
-        artifact_post (Type&);
+virtual void
+deployedResource_next (Type&);
 
-        virtual void
-        artifact_post (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+deployedResource_post (Type&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void
-        execParameter_pre (Type&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        execParameter_pre (Type const&);
+virtual void
+deployedResource_none (Type const&);
 
-        virtual void
-        execParameter_next (Type&);
+virtual void
+id (Type&);
 
-        virtual void
-        execParameter_next (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void
-        execParameter_post (Type&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        deployRequirement (Type&);
+struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        deployRequirement_pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        deployRequirement_next (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        deployRequirement_post (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+source_pre (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+source_pre (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+source_next (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+source_next (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+source_post (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+source_post (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+artifact (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+artifact (Type const&);
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
-      ResourceUsageKind;
+virtual void
+artifact_pre (Type&);
 
-      struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+artifact_pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+artifact_next (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+artifact_next (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+artifact_post (Type&);
 
-        virtual void
-        resourceUsage (Type&);
+virtual void
+artifact_post (Type const&);
 
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        requirementName (Type&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        resourceName (Type&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        resourceValue (Type const&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+execParameter_none (Type&);
 
-      struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        node (Type&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        node (Type const&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        source (Type&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        source (Type const&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        implementation (Type&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        implementation (Type const&);
+virtual void
+id (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+id (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        configProperty_pre (Type&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        configProperty_pre (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        configProperty_next (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        configProperty_next (Type const&);
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
+ResourceUsageKind;
 
-        virtual void
-        configProperty_post (Type&);
+struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        configProperty_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+resourceUsage (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+resourceUsage (Type const&);
 
-        virtual void
-        deployedResource_none (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        deployedResource_none (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void
-        deployedSharedResource (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        deployedSharedResource (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        deployedSharedResource_none (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        deployedSharedResource_none (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property_post (Type const&);
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
-      CCMComponentPortKind;
+virtual void
+property_none (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property_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&);
+struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        specificType (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        specificType (Type const&);
+virtual void
+name (Type&);
 
-        virtual void
-        supportedType (Type&);
+virtual void
+name (Type const&);
 
-        virtual void
-        supportedType (Type const&);
+virtual void
+node (Type&);
 
-        virtual void
-        provider (Type&);
+virtual void
+node (Type const&);
 
-        virtual void
-        provider (Type const&);
+virtual void
+source (Type&);
 
-        virtual void
-        exclusiveProvider (Type&);
+virtual void
+source (Type const&);
 
-        virtual void
-        exclusiveProvider (Type const&);
+virtual void
+implementation (Type&);
 
-        virtual void
-        exclusiveUser (Type&);
+virtual void
+implementation (Type const&);
 
-        virtual void
-        exclusiveUser (Type const&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        optional (Type&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        optional (Type const&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        kind (Type&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+configProperty_post (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        type (Type&);
+virtual void
+deployedResource_none (Type const&);
 
-        virtual void
-        type (Type const&);
+virtual void
+deployedSharedResource (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployedSharedResource (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+deployedSharedResource_none (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+deployedSharedResource_none (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+id (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+id (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        portName (Type&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        post (Type const&);
-      };
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
+CCMComponentPortKind;
 
-      struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
+{
+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
-        portName (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        provider (Type&);
+virtual void
+specificType (Type&);
 
-        virtual void
-        provider (Type const&);
+virtual void
+specificType (Type const&);
 
-        virtual void
-        provider_none (Type&);
+virtual void
+specificType_none (Type&);
 
-        virtual void
-        provider_none (Type const&);
+virtual void
+specificType_none (Type const&);
 
-        virtual void
-        kind (Type&);
+virtual void
+supportedType (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+supportedType (Type const&);
 
-        virtual void
-        instance (Type&);
+virtual void
+supportedType_pre (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+supportedType_pre (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+supportedType_next (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+supportedType_next (Type const&);
 
-      struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+supportedType_post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+supportedType_post (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+supportedType_none (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+supportedType_none (Type const&);
 
-        virtual void
-        location (Type&);
+virtual void
+provider (Type&);
 
-        virtual void
-        location (Type const&);
+virtual void
+provider (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+exclusiveProvider (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+exclusiveProvider (Type const&);
 
-      struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+exclusiveUser (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+exclusiveUser (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+optional (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+optional (Type const&);
 
-        virtual void
-        targetName (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        targetName (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        requirementName (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        resourceName (Type&);
+struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        resourceValue (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 PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+type (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+type (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        name (Type&);
+struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        source_none (Type&);
+virtual void
+portName (Type&);
 
-        virtual void
-        source_none (Type const&);
+virtual void
+portName (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 PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
+{
+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
+portName (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+portName (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+provider (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+provider (Type const&);
 
-        virtual void
-        externalEndpoint (Type&);
+virtual void
+provider_none (Type&);
 
-        virtual void
-        externalEndpoint (Type const&);
+virtual void
+provider_none (Type const&);
 
-        virtual void
-        externalEndpoint_pre (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        externalEndpoint_next (Type&);
+virtual void
+instance (Type&);
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        externalEndpoint_post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        externalEndpoint_none (Type&);
+struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        externalEndpoint_none (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        internalEndpoint (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        internalEndpoint (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        internalEndpoint_pre (Type&);
+virtual void
+location (Type&);
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+location (Type const&);
 
-        virtual void
-        internalEndpoint_next (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        internalEndpoint_post (Type&);
+struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        internalEndpoint_none (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        internalEndpoint_none (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        externalReference (Type&);
+virtual void
+targetName (Type&);
 
-        virtual void
-        externalReference (Type const&);
+virtual void
+targetName (Type const&);
 
-        virtual void
-        externalReference_pre (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void
-        externalReference_next (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        externalReference_post (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        externalReference_none (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        externalReference_none (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        deployedResource_pre (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        deployedResource_next (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        deployedResource_post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        deployedResource_none (Type&);
+struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        deployedResource_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&);
 
-      struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        requiredType (Type&);
+virtual void
+source_none (Type&);
 
-        virtual void
-        requiredType (Type const&);
+virtual void
+source_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+deployRequirement (Type const&);
 
-      struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+externalEndpoint (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+externalEndpoint (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+externalEndpoint_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+externalEndpoint_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+externalEndpoint_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+externalEndpoint_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        virtual void
-        resourceUsage (Type&);
+virtual void
+externalEndpoint_none (Type&);
 
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+externalEndpoint_none (Type const&);
 
-        virtual void
-        resourcePort (Type&);
+virtual void
+internalEndpoint (Type&);
 
-        virtual void
-        resourcePort (Type const&);
+virtual void
+internalEndpoint (Type const&);
 
-        virtual void
-        componentPort (Type&);
+virtual void
+internalEndpoint_pre (Type&);
 
-        virtual void
-        componentPort (Type const&);
+virtual void
+internalEndpoint_pre (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+internalEndpoint_next (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+internalEndpoint_post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+internalEndpoint_none (Type&);
 
-        virtual void
-        property (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 ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
-      {
-        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
-        requiredUUID (Type&);
+virtual void
+externalReference_post (Type&);
 
-        virtual void
-        requiredUUID (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        virtual void
-        requiredName (Type&);
+virtual void
+externalReference_none (Type&);
 
-        virtual void
-        requiredName (Type const&);
+virtual void
+externalReference_none (Type const&);
 
-        virtual void
-        requiredType (Type&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        requiredType (Type const&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployedResource_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+deployedResource_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+deployedResource_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+deployedResource_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void
-        portName (Type&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+deployedResource_none (Type const&);
 
-        virtual void
-        instance (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        post (Type&);
+struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+requiredType (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+requiredType (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        deployRequirement (Type&);
+struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        externalEndpoint (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        externalEndpoint (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        externalEndpoint_pre (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        externalEndpoint_next (Type&);
+virtual void
+resourceType_pre (Type&);
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        virtual void
-        externalEndpoint_post (Type&);
+virtual void
+resourceType_next (Type&);
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void
-        externalEndpoint_none (Type&);
+virtual void
+resourceType_post (Type&);
 
-        virtual void
-        externalEndpoint_none (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        virtual void
-        internalEndpoint (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        internalEndpoint (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        internalEndpoint_pre (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        internalEndpoint_next (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        internalEndpoint_post (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        internalEndpoint_none (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        internalEndpoint_none (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        externalReference (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        externalReference (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        externalReference_pre (Type&);
+struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        externalReference_next (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        externalReference_post (Type&);
+virtual void
+resourceUsage (Type&);
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+resourceUsage (Type const&);
 
-        virtual void
-        externalReference_none (Type&);
+virtual void
+resourceUsage_none (Type&);
 
-        virtual void
-        externalReference_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&);
+
+virtual void
+resourcePort_none (Type&);
+
+virtual void
+resourcePort_none (Type const&);
+
+virtual void
+componentPort (Type&);
+
+virtual void
+componentPort (Type const&);
+
+virtual void
+componentPort_none (Type&);
+
+virtual void
+componentPort_none (Type const&);
+
+virtual void
+resourceType (Type&);
+
+virtual void
+resourceType (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+property (Type&);
+
+virtual void
+property (Type const&);
+
+virtual void
+property_pre (Type&);
+
+virtual void
+property_pre (Type const&);
+
+virtual void
+property_next (Type&);
+
+virtual void
+property_next (Type const&);
+
+virtual void
+property_post (Type&);
+
+virtual void
+property_post (Type const&);
+
+virtual void
+property_none (Type&);
+
+virtual void
+property_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+requiredUUID (Type&);
+
+virtual void
+requiredUUID (Type const&);
+
+virtual void
+requiredUUID_none (Type&);
+
+virtual void
+requiredUUID_none (Type const&);
+
+virtual void
+requiredName (Type&);
+
+virtual void
+requiredName (Type const&);
+
+virtual void
+requiredName_none (Type&);
+
+virtual void
+requiredName_none (Type const&);
+
+virtual void
+requiredType (Type&);
+
+virtual void
+requiredType (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+portName (Type&);
+
+virtual void
+portName (Type const&);
+
+virtual void
+instance (Type&);
+
+virtual void
+instance (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
+{
+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
+deployRequirement (Type&);
+
+virtual void
+deployRequirement (Type const&);
+
+virtual void
+deployRequirement_pre (Type&);
+
+virtual void
+deployRequirement_pre (Type const&);
+
+virtual void
+deployRequirement_next (Type&);
+
+virtual void
+deployRequirement_next (Type const&);
+
+virtual void
+deployRequirement_post (Type&);
+
+virtual void
+deployRequirement_post (Type const&);
+
+virtual void
+deployRequirement_none (Type&);
+
+virtual void
+deployRequirement_none (Type const&);
+
+virtual void
+internalEndpoint (Type&);
+
+virtual void
+internalEndpoint (Type const&);
+
+virtual void
+internalEndpoint_pre (Type&);
+
+virtual void
+internalEndpoint_pre (Type const&);
+
+virtual void
+internalEndpoint_next (Type&);
+
+virtual void
+internalEndpoint_next (Type const&);
+
+virtual void
+internalEndpoint_post (Type&);
+
+virtual void
+internalEndpoint_post (Type const&);
+
+virtual void
+internalEndpoint_none (Type&);
+
+virtual void
+internalEndpoint_none (Type const&);
+
+virtual void
+externalEndpoint (Type&);
+
+virtual void
+externalEndpoint (Type const&);
+
+virtual void
+externalEndpoint_pre (Type&);
+
+virtual void
+externalEndpoint_pre (Type const&);
+
+virtual void
+externalEndpoint_next (Type&);
+
+virtual void
+externalEndpoint_next (Type const&);
+
+virtual void
+externalEndpoint_post (Type&);
+
+virtual void
+externalEndpoint_post (Type const&);
+
+virtual void
+externalEndpoint_none (Type&);
+
+virtual void
+externalEndpoint_none (Type const&);
+
+virtual void
+externalReference (Type&);
+
+virtual void
+externalReference (Type const&);
+
+virtual void
+externalReference_pre (Type&);
+
+virtual void
+externalReference_pre (Type const&);
+
+virtual void
+externalReference_next (Type&);
+
+virtual void
+externalReference_next (Type const&);
+
+virtual void
+externalReference_post (Type&);
+
+virtual void
+externalReference_post (Type const&);
+
+virtual void
+externalReference_none (Type&);
+
+virtual void
+externalReference_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TCKind : Traversal::TCKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct TCKind : Traversal::TCKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void TCKind::
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        protected:
-        TCKind ();
-      };
+protected:
+TCKind ();
+};
 
-      struct DataType : Traversal::DataType, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DataType Type;
-        DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct DataType : Traversal::DataType,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DataType Type;
+DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        kind (Type &o)
-        {
+virtual void
+kind (Type &o)
+{
 
-          this->kind (const_cast <Type const &> (o));
-        }
+this->kind (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        kind (Type const&);
+virtual void
+kind (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        enum_ (Type &o)
-        {
+virtual void
+enum_ (Type &o)
+{
 
-          this->enum_ (const_cast <Type const &> (o));
-        }
+this->enum_ (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        enum_ (Type const&);
+virtual void
+enum_ (Type const&);
 
-        protected:
-        DataType ();
-      };
+protected:
+DataType ();
+};
 
-      struct DataValue : Traversal::DataValue, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DataValue Type;
-        DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct DataValue : Traversal::DataValue,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DataValue Type;
+DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        short_pre (Type &o)
-        {
+virtual void
+short_pre (Type &o)
+{
 
-          this->short_pre (const_cast <Type const &> (o));
-        }
+this->short_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        short_pre (Type const&);
+virtual void
+short_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        short_next (Type &o)
-        {
+virtual void
+short_next (Type &o)
+{
 
-          this->short_next (const_cast <Type const &> (o));
-        }
+this->short_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        short_next (Type const&);
+virtual void
+short_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        short_post (Type &o)
-        {
+virtual void
+short_post (Type &o)
+{
 
-          this->short_post (const_cast <Type const &> (o));
-        }
+this->short_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        short_post (Type const&);
+virtual void
+short_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        long_pre (Type &o)
-        {
+virtual void
+long_pre (Type &o)
+{
 
-          this->long_pre (const_cast <Type const &> (o));
-        }
+this->long_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        long_pre (Type const&);
+virtual void
+long_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        long_next (Type &o)
-        {
+virtual void
+long_next (Type &o)
+{
 
-          this->long_next (const_cast <Type const &> (o));
-        }
+this->long_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        long_next (Type const&);
+virtual void
+long_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        long_post (Type &o)
-        {
+virtual void
+long_post (Type &o)
+{
 
-          this->long_post (const_cast <Type const &> (o));
-        }
+this->long_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        long_post (Type const&);
+virtual void
+long_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ushort_pre (Type &o)
-        {
+virtual void
+ushort_pre (Type &o)
+{
 
-          this->ushort_pre (const_cast <Type const &> (o));
-        }
+this->ushort_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ushort_pre (Type const&);
+virtual void
+ushort_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ushort_next (Type &o)
-        {
+virtual void
+ushort_next (Type &o)
+{
 
-          this->ushort_next (const_cast <Type const &> (o));
-        }
+this->ushort_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ushort_next (Type const&);
+virtual void
+ushort_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ushort_post (Type &o)
-        {
+virtual void
+ushort_post (Type &o)
+{
 
-          this->ushort_post (const_cast <Type const &> (o));
-        }
+this->ushort_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ushort_post (Type const&);
+virtual void
+ushort_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulong_pre (Type &o)
-        {
+virtual void
+ulong_pre (Type &o)
+{
 
-          this->ulong_pre (const_cast <Type const &> (o));
-        }
+this->ulong_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulong_pre (Type const&);
+virtual void
+ulong_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulong_next (Type &o)
-        {
+virtual void
+ulong_next (Type &o)
+{
 
-          this->ulong_next (const_cast <Type const &> (o));
-        }
+this->ulong_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulong_next (Type const&);
+virtual void
+ulong_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulong_post (Type &o)
-        {
+virtual void
+ulong_post (Type &o)
+{
 
-          this->ulong_post (const_cast <Type const &> (o));
-        }
+this->ulong_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulong_post (Type const&);
+virtual void
+ulong_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        float_pre (Type &o)
-        {
+virtual void
+float_pre (Type &o)
+{
 
-          this->float_pre (const_cast <Type const &> (o));
-        }
+this->float_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        float_pre (Type const&);
+virtual void
+float_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        float_next (Type &o)
-        {
+virtual void
+float_next (Type &o)
+{
 
-          this->float_next (const_cast <Type const &> (o));
-        }
+this->float_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        float_next (Type const&);
+virtual void
+float_next (Type const&);
+
+virtual void
+float_post (Type &o)
+{
+
+this->float_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        float_post (Type &o)
-        {
 
-          this->float_post (const_cast <Type const &> (o));
-        }
+virtual void
+float_post (Type const&);
 
+virtual void
+double_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        float_post (Type const&);
+this->double_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        double_pre (Type &o)
-        {
 
-          this->double_pre (const_cast <Type const &> (o));
-        }
+virtual void
+double_pre (Type const&);
 
+virtual void
+double_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        double_pre (Type const&);
+this->double_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        double_next (Type &o)
-        {
 
-          this->double_next (const_cast <Type const &> (o));
-        }
+virtual void
+double_next (Type const&);
 
+virtual void
+double_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        double_next (Type const&);
+this->double_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        double_post (Type &o)
-        {
 
-          this->double_post (const_cast <Type const &> (o));
-        }
+virtual void
+double_post (Type const&);
 
+virtual void
+boolean_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        double_post (Type const&);
+this->boolean_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        boolean_pre (Type &o)
-        {
 
-          this->boolean_pre (const_cast <Type const &> (o));
-        }
+virtual void
+boolean_pre (Type const&);
 
+virtual void
+boolean_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        boolean_pre (Type const&);
+this->boolean_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        boolean_next (Type &o)
-        {
 
-          this->boolean_next (const_cast <Type const &> (o));
-        }
+virtual void
+boolean_next (Type const&);
 
+virtual void
+boolean_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        boolean_next (Type const&);
+this->boolean_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        boolean_post (Type &o)
-        {
 
-          this->boolean_post (const_cast <Type const &> (o));
-        }
+virtual void
+boolean_post (Type const&);
 
+virtual void
+octet_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        boolean_post (Type const&);
+this->octet_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        octet_pre (Type &o)
-        {
 
-          this->octet_pre (const_cast <Type const &> (o));
-        }
+virtual void
+octet_pre (Type const&);
 
+virtual void
+octet_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        octet_pre (Type const&);
+this->octet_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        octet_next (Type &o)
-        {
 
-          this->octet_next (const_cast <Type const &> (o));
-        }
+virtual void
+octet_next (Type const&);
 
+virtual void
+octet_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        octet_next (Type const&);
+this->octet_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        octet_post (Type &o)
-        {
 
-          this->octet_post (const_cast <Type const &> (o));
-        }
+virtual void
+octet_post (Type const&);
 
+virtual void
+enum_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        octet_post (Type const&);
+this->enum_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        enum_pre (Type &o)
-        {
 
-          this->enum_pre (const_cast <Type const &> (o));
-        }
+virtual void
+enum_pre (Type const&);
 
+virtual void
+enum_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        enum_pre (Type const&);
+this->enum_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        enum_next (Type &o)
-        {
 
-          this->enum_next (const_cast <Type const &> (o));
-        }
+virtual void
+enum_next (Type const&);
 
+virtual void
+enum_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        enum_next (Type const&);
+this->enum_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        enum_post (Type &o)
-        {
 
-          this->enum_post (const_cast <Type const &> (o));
-        }
+virtual void
+enum_post (Type const&);
 
+virtual void
+string_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        enum_post (Type const&);
+this->string_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        string_pre (Type &o)
-        {
 
-          this->string_pre (const_cast <Type const &> (o));
-        }
+virtual void
+string_pre (Type const&);
 
+virtual void
+string_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        string_pre (Type const&);
+this->string_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        string_next (Type &o)
-        {
 
-          this->string_next (const_cast <Type const &> (o));
-        }
+virtual void
+string_next (Type const&);
 
+virtual void
+string_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        string_next (Type const&);
+this->string_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        string_post (Type &o)
-        {
 
-          this->string_post (const_cast <Type const &> (o));
-        }
+virtual void
+string_post (Type const&);
 
+virtual void
+longlong_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        string_post (Type const&);
+this->longlong_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longlong_pre (Type &o)
-        {
 
-          this->longlong_pre (const_cast <Type const &> (o));
-        }
+virtual void
+longlong_pre (Type const&);
 
+virtual void
+longlong_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longlong_pre (Type const&);
+this->longlong_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longlong_next (Type &o)
-        {
 
-          this->longlong_next (const_cast <Type const &> (o));
-        }
+virtual void
+longlong_next (Type const&);
 
+virtual void
+longlong_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longlong_next (Type const&);
+this->longlong_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longlong_post (Type &o)
-        {
 
-          this->longlong_post (const_cast <Type const &> (o));
-        }
+virtual void
+longlong_post (Type const&);
 
+virtual void
+ulonglong_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longlong_post (Type const&);
+this->ulonglong_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulonglong_pre (Type &o)
-        {
 
-          this->ulonglong_pre (const_cast <Type const &> (o));
-        }
+virtual void
+ulonglong_pre (Type const&);
 
+virtual void
+ulonglong_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulonglong_pre (Type const&);
+this->ulonglong_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulonglong_next (Type &o)
-        {
 
-          this->ulonglong_next (const_cast <Type const &> (o));
-        }
+virtual void
+ulonglong_next (Type const&);
 
+virtual void
+ulonglong_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulonglong_next (Type const&);
+this->ulonglong_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        ulonglong_post (Type &o)
-        {
 
-          this->ulonglong_post (const_cast <Type const &> (o));
-        }
+virtual void
+ulonglong_post (Type const&);
 
+virtual void
+longdouble_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        ulonglong_post (Type const&);
+this->longdouble_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longdouble_pre (Type &o)
-        {
 
-          this->longdouble_pre (const_cast <Type const &> (o));
-        }
+virtual void
+longdouble_pre (Type const&);
 
+virtual void
+longdouble_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longdouble_pre (Type const&);
+this->longdouble_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longdouble_next (Type &o)
-        {
 
-          this->longdouble_next (const_cast <Type const &> (o));
-        }
+virtual void
+longdouble_next (Type const&);
 
+virtual void
+longdouble_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longdouble_next (Type const&);
+this->longdouble_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        longdouble_post (Type &o)
-        {
 
-          this->longdouble_post (const_cast <Type const &> (o));
-        }
+virtual void
+longdouble_post (Type const&);
 
+protected:
+DataValue ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        longdouble_post (Type const&);
+struct EnumType : Traversal::EnumType,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::EnumType Type;
+EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        DataValue ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct EnumType : Traversal::EnumType, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::EnumType Type;
-        EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+typeId (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->typeId (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        typeId (Type &o)
-        {
 
-          this->typeId (const_cast <Type const &> (o));
-        }
+virtual void
+typeId (Type const&);
 
+virtual void
+member_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        typeId (Type const&);
+this->member_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        member_pre (Type &o)
-        {
 
-          this->member_pre (const_cast <Type const &> (o));
-        }
+virtual void
+member_pre (Type const&);
 
+virtual void
+member_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        member_pre (Type const&);
+this->member_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        member_next (Type &o)
-        {
 
-          this->member_next (const_cast <Type const &> (o));
-        }
+virtual void
+member_next (Type const&);
 
+virtual void
+member_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        member_next (Type const&);
+this->member_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        member_post (Type &o)
-        {
 
-          this->member_post (const_cast <Type const &> (o));
-        }
+virtual void
+member_post (Type const&);
 
+protected:
+EnumType ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        member_post (Type const&);
+struct Any : Traversal::Any,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Any Type;
+Any (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        EnumType ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct Any : Traversal::Any, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Any Type;
-        Any (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+type (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->type (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        type (Type &o)
-        {
 
-          this->type (const_cast <Type const &> (o));
-        }
+virtual void
+type (Type const&);
 
+virtual void
+value (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        type (Type const&);
+this->value (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+value (Type const&);
 
+protected:
+Any ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        value (Type const&);
+struct Property : Traversal::Property,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Property Type;
+Property (::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));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+value (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->value (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+value (Type const&);
 
+protected:
+Property ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        value (Type const&);
+struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        Property ();
-      };
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-      struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+traverse (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void SatisfierPropertyKind::
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+protected:
+SatisfierPropertyKind ();
+};
 
-        #endif /* __BORLANDC__ */
-        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 >&);
 
-        protected:
-        SatisfierPropertyKind ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct SatisfierProperty : Traversal::SatisfierProperty, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
-        SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+kind (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->kind (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        kind (Type &o)
-        {
 
-          this->kind (const_cast <Type const &> (o));
-        }
+virtual void
+kind (Type const&);
 
+virtual void
+dynamic (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        kind (Type const&);
+this->dynamic (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+dynamic (Type const&);
 
+virtual void
+value (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        value (Type const&);
+this->value (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
+value (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+SatisfierProperty ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+struct Resource : Traversal::Resource,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Resource Type;
+Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceType (Type &o)
-        {
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+resourceType_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceType (Type const&);
+this->resourceType_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property (Type &o)
-        {
 
-          this->property (const_cast <Type const &> (o));
-        }
+virtual void
+resourceType_pre (Type const&);
 
+virtual void
+resourceType_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property (Type const&);
+this->resourceType_next (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
+resourceType_next (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+resourceType_post (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->resourceType_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceType (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceType (Type const&);
+virtual void
+property_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+property_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->property (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property (Type const&);
+virtual void
+property_post (Type const&);
 
-        protected:
-        Requirement ();
-      };
+protected:
+Resource ();
+};
 
-      struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
-        ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct Requirement : Traversal::Requirement,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Requirement Type;
+Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requirementName (Type &o)
-        {
+virtual void
+resourceType (Type &o)
+{
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+this->resourceType (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requirementName (Type const&);
+virtual void
+resourceType (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceName (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceName (Type const&);
+virtual void
+name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceValue (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceValue (Type const&);
+virtual void
+property_pre (Type const&);
 
-        protected:
-        ResourceDeploymentDescription ();
-      };
+virtual void
+property_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->property_next (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->property_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+property_post (Type const&);
 
+protected:
+Requirement ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_pre (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->source_pre (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_next (Type &o)
-        {
+virtual void
+requirementName (Type &o)
+{
+
+this->requirementName (const_cast <Type const &> (o));
+}
+
+
+virtual void
+requirementName (Type const&);
+
+virtual void
+resourceName (Type &o)
+{
+
+this->resourceName (const_cast <Type const &> (o));
+}
+
+
+virtual void
+resourceName (Type const&);
+
+virtual void
+property_pre (Type &o)
+{
+
+this->property_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+property_pre (Type const&);
+
+virtual void
+property_next (Type &o)
+{
+
+this->property_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+property_next (Type const&);
+
+virtual void
+property_post (Type &o)
+{
+
+this->property_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+property_post (Type const&);
+
+protected:
+ResourceDeploymentDescription ();
+};
+
+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)
+{
+
+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
+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
+node (Type &o)
+{
+
+this->node (const_cast <Type const &> (o));
+}
+
+
+virtual void
+node (Type const&);
+
+virtual void
+location_pre (Type &o)
+{
+
+this->location_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_pre (Type const&);
+
+virtual void
+location_next (Type &o)
+{
+
+this->location_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_next (Type const&);
+
+virtual void
+location_post (Type &o)
+{
+
+this->location_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_post (Type const&);
+
+virtual void
+execParameter_pre (Type &o)
+{
+
+this->execParameter_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+execParameter_pre (Type const&);
+
+virtual void
+execParameter_next (Type &o)
+{
+
+this->execParameter_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+execParameter_next (Type const&);
+
+virtual void
+execParameter_post (Type &o)
+{
+
+this->execParameter_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+execParameter_post (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
+deployedResource_pre (Type &o)
+{
+
+this->deployedResource_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+deployedResource_pre (Type const&);
+
+virtual void
+deployedResource_next (Type &o)
+{
+
+this->deployedResource_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+deployedResource_next (Type const&);
+
+virtual void
+deployedResource_post (Type &o)
+{
 
-          this->source_next (const_cast <Type const &> (o));
-        }
+this->deployedResource_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_next (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_post (Type &o)
-        {
+virtual void
+id (Type &o)
+{
 
-          this->source_post (const_cast <Type const &> (o));
-        }
+this->id (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_post (Type const&);
+virtual void
+id (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node (Type &o)
-        {
+protected:
+ArtifactDeploymentDescription ();
+};
 
-          this->node (const_cast <Type const &> (o));
-        }
+struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_pre (Type &o)
-        {
 
-          this->location_pre (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_pre (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_next (Type &o)
-        {
 
-          this->location_next (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+source_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_next (Type const&);
+this->source_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_post (Type &o)
-        {
 
-          this->location_post (const_cast <Type const &> (o));
-        }
+virtual void
+source_pre (Type const&);
 
+virtual void
+source_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_post (Type const&);
+this->source_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_pre (Type &o)
-        {
 
-          this->execParameter_pre (const_cast <Type const &> (o));
-        }
+virtual void
+source_next (Type const&);
 
+virtual void
+source_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_pre (Type const&);
+this->source_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_next (Type &o)
-        {
 
-          this->execParameter_next (const_cast <Type const &> (o));
-        }
+virtual void
+source_post (Type const&);
 
+virtual void
+artifact_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_next (Type const&);
+this->artifact_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_post (Type &o)
-        {
 
-          this->execParameter_post (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_pre (Type const&);
 
+virtual void
+artifact_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_post (Type const&);
+this->artifact_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_next (Type const&);
 
+virtual void
+artifact_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_pre (Type const&);
+this->artifact_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_post (Type const&);
 
+virtual void
+execParameter_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_next (Type const&);
+this->execParameter_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_pre (Type const&);
 
+virtual void
+execParameter_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_post (Type const&);
+this->execParameter_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_pre (Type &o)
-        {
 
-          this->deployedResource_pre (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_next (Type const&);
 
+virtual void
+execParameter_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_pre (Type const&);
+this->execParameter_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_next (Type &o)
-        {
 
-          this->deployedResource_next (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_post (Type const&);
 
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_next (Type const&);
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_post (Type &o)
-        {
 
-          this->deployedResource_post (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type const&);
 
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_post (Type const&);
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        id (Type &o)
-        {
 
-          this->id (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_next (Type const&);
 
+virtual void
+deployRequirement_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        id (Type const&);
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        ArtifactDeploymentDescription ();
-      };
 
-      struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
-        MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+deployRequirement_post (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+id (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->id (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+id (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+protected:
+MonolithicDeploymentDescription ();
+};
 
-          this->name (const_cast <Type const &> (o));
-        }
+struct ResourceUsageKind : Traversal::ResourceUsageKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_pre (Type &o)
-        {
+protected:
+ResourceUsageKind ();
+};
 
-          this->source_pre (const_cast <Type const &> (o));
-        }
+struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_pre (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_next (Type &o)
-        {
 
-          this->source_next (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+resourceUsage (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_next (Type const&);
+this->resourceUsage (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source_post (Type &o)
-        {
 
-          this->source_post (const_cast <Type const &> (o));
-        }
+virtual void
+resourceUsage (Type const&);
 
+virtual void
+requirementName (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source_post (Type const&);
+this->requirementName (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        artifact_pre (Type &o)
-        {
 
-          this->artifact_pre (const_cast <Type const &> (o));
-        }
+virtual void
+requirementName (Type const&);
 
+virtual void
+resourceName (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_pre (Type const&);
+this->resourceName (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        artifact_next (Type &o)
-        {
 
-          this->artifact_next (const_cast <Type const &> (o));
-        }
+virtual void
+resourceName (Type const&);
 
+virtual void
+property_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_next (Type const&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        artifact_post (Type &o)
-        {
 
-          this->artifact_post (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type const&);
 
+virtual void
+property_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_post (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_pre (Type &o)
-        {
 
-          this->execParameter_pre (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_pre (Type const&);
+this->property_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_next (Type &o)
-        {
 
-          this->execParameter_next (const_cast <Type const &> (o));
-        }
+virtual void
+property_post (Type const&);
 
+protected:
+InstanceResourceDeploymentDescription ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_next (Type const&);
+struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter_post (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->execParameter_post (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
+virtual void
+node (Type &o)
+{
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+this->node (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+node (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
+virtual void
+source (Type &o)
+{
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+this->source (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+source (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        id (Type &o)
-        {
+virtual void
+implementation (Type &o)
+{
 
-          this->id (const_cast <Type const &> (o));
-        }
+this->implementation (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        id (Type const&);
+virtual void
+implementation (Type const&);
 
-        protected:
-        MonolithicDeploymentDescription ();
-      };
+virtual void
+configProperty_pre (Type &o)
+{
 
-      struct ResourceUsageKind : Traversal::ResourceUsageKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void ResourceUsageKind::
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        protected:
-        ResourceUsageKind ();
-      };
+virtual void
+configProperty_next (Type &o)
+{
 
-      struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
-        InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_next (Type const&);
 
+virtual void
+configProperty_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceUsage (Type &o)
-        {
 
-          this->resourceUsage (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_post (Type const&);
 
+virtual void
+deployedResource (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceUsage (Type const&);
+this->deployedResource (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requirementName (Type &o)
-        {
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+virtual void
+deployedResource (Type const&);
 
+virtual void
+deployedSharedResource (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requirementName (Type const&);
+this->deployedSharedResource (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceName (Type &o)
-        {
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+virtual void
+deployedSharedResource (Type const&);
 
+virtual void
+id (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceName (Type const&);
+this->id (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceValue (Type &o)
-        {
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+virtual void
+id (Type const&);
 
+protected:
+InstanceDeploymentDescription ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceValue (Type const&);
+struct CCMComponentPortKind : Traversal::CCMComponentPortKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        InstanceResourceDeploymentDescription ();
-      };
+virtual void
+traverse (Type &o)
+{
+this->traverse (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 const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+CCMComponentPortKind ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+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 &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node (Type &o)
-        {
 
-          this->node (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+specificType (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node (Type const&);
+this->specificType (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source (Type &o)
-        {
 
-          this->source (const_cast <Type const &> (o));
-        }
+virtual void
+specificType (Type const&);
 
+virtual void
+supportedType_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source (Type const&);
+this->supportedType_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        implementation (Type &o)
-        {
 
-          this->implementation (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_pre (Type const&);
 
+virtual void
+supportedType_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implementation (Type const&);
+this->supportedType_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_pre (Type &o)
-        {
 
-          this->configProperty_pre (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_next (Type const&);
 
+virtual void
+supportedType_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_pre (Type const&);
+this->supportedType_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_next (Type &o)
-        {
 
-          this->configProperty_next (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_post (Type const&);
 
+virtual void
+provider (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_next (Type const&);
+this->provider (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_post (Type &o)
-        {
 
-          this->configProperty_post (const_cast <Type const &> (o));
-        }
+virtual void
+provider (Type const&);
 
+virtual void
+exclusiveProvider (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_post (Type const&);
+this->exclusiveProvider (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource (Type &o)
-        {
 
-          this->deployedResource (const_cast <Type const &> (o));
-        }
+virtual void
+exclusiveProvider (Type const&);
 
+virtual void
+exclusiveUser (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource (Type const&);
+this->exclusiveUser (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedSharedResource (Type &o)
-        {
 
-          this->deployedSharedResource (const_cast <Type const &> (o));
-        }
+virtual void
+exclusiveUser (Type const&);
 
+virtual void
+optional (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedSharedResource (Type const&);
+this->optional (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        id (Type &o)
-        {
 
-          this->id (const_cast <Type const &> (o));
-        }
+virtual void
+optional (Type const&);
 
+virtual void
+kind (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        id (Type const&);
+this->kind (const_cast <Type const &> (o));
+}
 
-        protected:
-        InstanceDeploymentDescription ();
-      };
 
-      struct CCMComponentPortKind : Traversal::CCMComponentPortKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+kind (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void CCMComponentPortKind::
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+protected:
+ComponentPortDescription ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        CCMComponentPortKind ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct ComponentPortDescription : Traversal::ComponentPortDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
-        ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+type (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->type (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        specificType (Type &o)
-        {
 
-          this->specificType (const_cast <Type const &> (o));
-        }
+virtual void
+type (Type const&);
 
+protected:
+ComponentPropertyDescription ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        specificType (Type const&);
+struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        supportedType (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->supportedType (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        supportedType (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        provider (Type &o)
-        {
+virtual void
+portName (Type &o)
+{
 
-          this->provider (const_cast <Type const &> (o));
-        }
+this->portName (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        provider (Type const&);
+virtual void
+portName (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        exclusiveProvider (Type &o)
-        {
+protected:
+ComponentExternalPortEndpoint ();
+};
 
-          this->exclusiveProvider (const_cast <Type const &> (o));
-        }
+struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        exclusiveProvider (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        exclusiveUser (Type &o)
-        {
 
-          this->exclusiveUser (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+portName (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        exclusiveUser (Type const&);
+this->portName (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        optional (Type &o)
-        {
 
-          this->optional (const_cast <Type const &> (o));
-        }
+virtual void
+portName (Type const&);
 
+virtual void
+provider (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        optional (Type const&);
+this->provider (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        kind (Type &o)
-        {
 
-          this->kind (const_cast <Type const &> (o));
-        }
+virtual void
+provider (Type const&);
 
+virtual void
+kind (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        kind (Type const&);
+this->kind (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
+kind (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+instance (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->instance (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+instance (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+protected:
+PlanSubcomponentPortEndpoint ();
+};
 
-          this->name (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)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        type (Type &o)
-        {
 
-          this->type (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+location (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        type (Type const&);
+this->location (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
+location (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+ExternalReferenceEndpoint ();
+};
 
-          this->traverse (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)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        portName (Type &o)
-        {
 
-          this->portName (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+targetName (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        portName (Type const&);
+this->targetName (const_cast <Type const &> (o));
+}
 
-        protected:
-        ComponentExternalPortEndpoint ();
-      };
 
-      struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
-        PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+targetName (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+requirementName (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->requirementName (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+requirementName (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        portName (Type &o)
-        {
+virtual void
+resourceName (Type &o)
+{
 
-          this->portName (const_cast <Type const &> (o));
-        }
+this->resourceName (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        portName (Type const&);
+virtual void
+resourceName (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        provider (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->provider (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        provider (Type const&);
+virtual void
+property_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        kind (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->kind (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        kind (Type const&);
+virtual void
+property_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->instance (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance (Type const&);
+virtual void
+property_post (Type const&);
 
-        protected:
-        PlanSubcomponentPortEndpoint ();
-      };
+protected:
+ConnectionResourceDeploymentDescription ();
+};
 
-      struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
-        ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct PlanConnectionDescription : Traversal::PlanConnectionDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->location (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location (Type const&);
+virtual void
+name (Type const&);
 
-        protected:
-        ExternalReferenceEndpoint ();
-      };
+virtual void
+source (Type &o)
+{
 
-      struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
-        ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->source (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+source (Type const&);
 
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        targetName (Type &o)
-        {
 
-          this->targetName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type const&);
 
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        targetName (Type const&);
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requirementName (Type &o)
-        {
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_next (Type const&);
 
+virtual void
+deployRequirement_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requirementName (Type const&);
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceName (Type &o)
-        {
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_post (Type const&);
 
+virtual void
+externalEndpoint_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceName (Type const&);
+this->externalEndpoint_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceValue (Type &o)
-        {
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+virtual void
+externalEndpoint_pre (Type const&);
 
+virtual void
+externalEndpoint_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceValue (Type const&);
+this->externalEndpoint_next (const_cast <Type const &> (o));
+}
 
-        protected:
-        ConnectionResourceDeploymentDescription ();
-      };
 
-      struct PlanConnectionDescription : Traversal::PlanConnectionDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
-        PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+externalEndpoint_post (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+internalEndpoint_pre (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+internalEndpoint_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        source (Type &o)
-        {
+virtual void
+internalEndpoint_next (Type &o)
+{
 
-          this->source (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        source (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
+virtual void
+internalEndpoint_post (Type &o)
+{
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
+virtual void
+externalReference_pre (Type &o)
+{
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+this->externalReference_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+externalReference_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
+virtual void
+externalReference_next (Type &o)
+{
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+this->externalReference_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+externalReference_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_pre (Type &o)
-        {
+virtual void
+externalReference_post (Type &o)
+{
 
-          this->externalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->externalReference_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_next (Type &o)
-        {
+virtual void
+deployedResource_pre (Type &o)
+{
 
-          this->externalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->deployedResource_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+deployedResource_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_post (Type &o)
-        {
+virtual void
+deployedResource_next (Type &o)
+{
 
-          this->externalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->deployedResource_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_pre (Type &o)
-        {
+virtual void
+deployedResource_post (Type &o)
+{
 
-          this->internalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->deployedResource_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_next (Type &o)
-        {
+protected:
+PlanConnectionDescription ();
+};
 
-          this->internalEndpoint_next (const_cast <Type const &> (o));
-        }
+struct ImplementationDependency : Traversal::ImplementationDependency,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_next (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_post (Type &o)
-        {
 
-          this->internalEndpoint_post (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+requiredType (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_post (Type const&);
+this->requiredType (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_pre (Type &o)
-        {
 
-          this->externalReference_pre (const_cast <Type const &> (o));
-        }
+virtual void
+requiredType (Type const&);
 
+protected:
+ImplementationDependency ();
+};
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_pre (Type const&);
+struct Capability : Traversal::Capability,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Capability Type;
+Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_next (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->externalReference_next (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_post (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->externalReference_post (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_pre (Type &o)
-        {
+virtual void
+resourceType_pre (Type &o)
+{
 
-          this->deployedResource_pre (const_cast <Type const &> (o));
-        }
+this->resourceType_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_next (Type &o)
-        {
+virtual void
+resourceType_next (Type &o)
+{
 
-          this->deployedResource_next (const_cast <Type const &> (o));
-        }
+this->resourceType_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployedResource_post (Type &o)
-        {
+virtual void
+resourceType_post (Type &o)
+{
 
-          this->deployedResource_post (const_cast <Type const &> (o));
-        }
+this->resourceType_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        protected:
-        PlanConnectionDescription ();
-      };
+virtual void
+property_pre (Type &o)
+{
 
-      struct ImplementationDependency : Traversal::ImplementationDependency, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
-        ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type const&);
 
+virtual void
+property_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requiredType (Type &o)
-        {
 
-          this->requiredType (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requiredType (Type const&);
+this->property_post (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
+property_post (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+Capability ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+struct ImplementationRequirement : Traversal::ImplementationRequirement,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+resourceUsage (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->resourceUsage (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceType (Type &o)
-        {
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+virtual void
+resourceUsage (Type const&);
 
+virtual void
+resourcePort (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceType (Type const&);
+this->resourcePort (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property (Type &o)
-        {
 
-          this->property (const_cast <Type const &> (o));
-        }
+virtual void
+resourcePort (Type const&);
 
+virtual void
+componentPort (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property (Type const&);
+this->componentPort (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
+componentPort (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+resourceType (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->resourceType (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+resourceType (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceUsage (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->resourceUsage (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourcePort (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->resourcePort (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourcePort (Type const&);
+virtual void
+property_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        componentPort (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->componentPort (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        componentPort (Type const&);
+virtual void
+property_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceType (Type const&);
+virtual void
+property_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+protected:
+ImplementationRequirement ();
+};
 
-          this->name (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)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property (Type &o)
-        {
 
-          this->property (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+requiredUUID (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property (Type const&);
+this->requiredUUID (const_cast <Type const &> (o));
+}
 
-        protected:
-        ImplementationRequirement ();
-      };
 
-      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
-        ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+requiredUUID (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+requiredName (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->requiredName (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+requiredName (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requiredUUID (Type &o)
-        {
+virtual void
+requiredType (Type &o)
+{
 
-          this->requiredUUID (const_cast <Type const &> (o));
-        }
+this->requiredType (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requiredUUID (Type const&);
+virtual void
+requiredType (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requiredName (Type &o)
-        {
+protected:
+ComponentPackageReference ();
+};
 
-          this->requiredName (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)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requiredName (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        requiredType (Type &o)
-        {
 
-          this->requiredType (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+portName (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        requiredType (Type const&);
+this->portName (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
+portName (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+instance (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->instance (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+instance (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        portName (Type &o)
-        {
+protected:
+SubcomponentPortEndpoint ();
+};
 
-          this->portName (const_cast <Type const &> (o));
-        }
+struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
+AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        portName (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance (Type &o)
-        {
 
-          this->instance (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        protected:
-        SubcomponentPortEndpoint ();
-      };
 
-      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 const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+deployRequirement_next (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement (Type &o)
-        {
+virtual void
+deployRequirement_post (Type &o)
+{
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_pre (Type &o)
-        {
+virtual void
+internalEndpoint_pre (Type &o)
+{
 
-          this->externalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+internalEndpoint_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_next (Type &o)
-        {
+virtual void
+internalEndpoint_next (Type &o)
+{
 
-          this->externalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalEndpoint_post (Type &o)
-        {
+virtual void
+internalEndpoint_post (Type &o)
+{
 
-          this->externalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_pre (Type &o)
-        {
+virtual void
+externalEndpoint_pre (Type &o)
+{
 
-          this->internalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+externalEndpoint_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_next (Type &o)
-        {
+virtual void
+externalEndpoint_next (Type &o)
+{
 
-          this->internalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        internalEndpoint_post (Type &o)
-        {
+virtual void
+externalEndpoint_post (Type &o)
+{
 
-          this->internalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_pre (Type &o)
-        {
+virtual void
+externalReference_pre (Type &o)
+{
 
-          this->externalReference_pre (const_cast <Type const &> (o));
-        }
+this->externalReference_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+externalReference_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_next (Type &o)
-        {
+virtual void
+externalReference_next (Type &o)
+{
 
-          this->externalReference_next (const_cast <Type const &> (o));
-        }
+this->externalReference_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+externalReference_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalReference_post (Type &o)
-        {
+virtual void
+externalReference_post (Type &o)
+{
 
-          this->externalReference_post (const_cast <Type const &> (o));
-        }
+this->externalReference_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        protected:
-        AssemblyConnectionDescription ();
-      };
-    }
-  }
+protected:
+AssemblyConnectionDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // BASIC_DEPLOYMENT_DATA_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index 288787f1eda..70104131917 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -1,5 +1,8 @@
 // $Id$
 
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+
+#include "ciao/CIAO_common.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
@@ -13,173 +16,173 @@ namespace CIAO
   {
     void
     CCD_Handler::component_interface_descr (
-        const ComponentInterfaceDescription &desc,
-        Deployment::ComponentInterfaceDescription& toconfig)
+                                            const ComponentInterfaceDescription &desc,
+                                            Deployment::ComponentInterfaceDescription& toconfig)
     {
-	if (desc.UUID_p ())
-	    toconfig.UUID =
-		CORBA::string_dup (desc.UUID ().c_str ());
+      CIAO_TRACE("CCD_Handler::component_interface_descr");
+      if (desc.UUID_p ())
+        toconfig.UUID =
+          CORBA::string_dup (desc.UUID ().c_str ());
 
-	if (desc.label_p ())
+      if (desc.label_p ())
         {
-	    toconfig.label =
-		CORBA::string_dup (desc.label ().c_str ());
+          toconfig.label =
+            CORBA::string_dup (desc.label ().c_str ());
         }
-	
-	if (desc.specificType_p ())
+
+      if (desc.specificType_p ())
         {
-	    toconfig.specificType =
-		CORBA::string_dup (desc.specificType ().c_str ());
+          toconfig.specificType =
+            CORBA::string_dup (desc.specificType ().c_str ());
         }
 
-	ComponentInterfaceDescription::supportedType_const_iterator
-	    end = desc.end_supportedType ();
-	
-        CORBA::ULong pos = 0;
-        toconfig.supportedType.length (desc.count_supportedType ());
-	for (ComponentInterfaceDescription::supportedType_const_iterator s =
-		 desc.begin_supportedType ();
-	     s != end;
-	     ++s)
+      ComponentInterfaceDescription::supportedType_const_iterator
+        end = desc.end_supportedType ();
+
+      CORBA::ULong pos = 0;
+      toconfig.supportedType.length (desc.count_supportedType ());
+      for (ComponentInterfaceDescription::supportedType_const_iterator s =
+             desc.begin_supportedType ();
+           s != end;
+           ++s)
         {
           toconfig.supportedType[pos++] = s->c_str ();
         }
-	
-	ComponentInterfaceDescription::idlFile_const_iterator
-	    eidl = desc.end_idlFile ();
-	pos = 0;
-        toconfig.idlFile.length (desc.count_idlFile ());
-	for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
-		 desc.begin_idlFile ();
-	     sidl != eidl;
-	     ++sidl)
+
+      ComponentInterfaceDescription::idlFile_const_iterator
+        eidl = desc.end_idlFile ();
+      pos = 0;
+      toconfig.idlFile.length (desc.count_idlFile ());
+      for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
+             desc.begin_idlFile ();
+           sidl != eidl;
+           ++sidl)
         {
-	    toconfig.idlFile [pos++] = sidl->c_str ();
+          toconfig.idlFile [pos++] = sidl->c_str ();
+        }
+
+      ComponentInterfaceDescription::configProperty_const_iterator pend =
+        desc.end_configProperty ();
+      pos = 0;
+      toconfig.configProperty.length (desc.count_configProperty ());
+      for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
+             desc.begin_configProperty ();
+           pstart != pend;
+           ++pstart)
+        {
+          Property_Handler::get_property (*pstart,
+                                          toconfig.configProperty [pos++]);
+        }
+
+      pos = 0;
+      toconfig.port.length (desc.count_port ());
+      for (ComponentInterfaceDescription::port_const_iterator
+             port (desc.begin_port ());
+           port != desc.end_port ();
+           ++port)
+        {
+          CPD_Handler::component_port_description (
+                                                   *port,
+                                                   toconfig.port[pos++]);
+        }
+
+      pos = 0;
+      CORBA::ULong len = desc.count_property ();
+      toconfig.property.length ( len );
+      for(ComponentInterfaceDescription::property_const_iterator
+            prop (desc.begin_property());
+          prop != desc.end_property();
+          prop++)
+        {
+          ComponentPropertyDescription_Handler::component_property_description (*prop,
+                                                                                toconfig.property[pos++]);
+        }
+
+      pos = 0;
+      toconfig.infoProperty.length (desc.count_infoProperty ());
+      for ( ComponentInterfaceDescription::infoProperty_const_iterator
+              infoProp (desc.begin_infoProperty());
+            infoProp != desc.end_infoProperty();
+            infoProp++)
+        {
+          Property_Handler::get_property (
+                                          *infoProp,
+                                          toconfig.infoProperty[pos]);
         }
-	
-	ComponentInterfaceDescription::configProperty_const_iterator pend =
-	    desc.end_configProperty ();
-	pos = 0;
-        toconfig.configProperty.length (desc.count_configProperty ());
-	for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
-		 desc.begin_configProperty ();
-	     pstart != pend;
-	     ++pstart)
-	{
-	    Property_Handler::get_property (*pstart,
-					    toconfig.configProperty [pos++]);
-	}
-	
-        pos = 0;
-        toconfig.port.length (desc.count_port ());
-	for (ComponentInterfaceDescription::port_const_iterator
-		 port (desc.begin_port ());
-	     port != desc.end_port ();
-	     ++port)
-	{
-	    CPD_Handler::component_port_description (
-		*port,
-		toconfig.port[pos++]);
-	}
-	
-        pos = 0;
-        toconfig.property.length ( desc.count_property ());
-	for(ComponentInterfaceDescription::property_const_iterator
-		prop (desc.begin_property());
-	    prop != desc.end_property();
-	    prop++)
-	{
-	    ComponentPropertyDescription_Handler::component_property_description (
-		*prop,
-		toconfig.property[pos++]);
-	}
-	
-        pos = 0;
-        toconfig.infoProperty.length (desc.count_infoProperty ());
-	for ( ComponentInterfaceDescription::infoProperty_const_iterator
-		  infoProp (desc.begin_infoProperty());
-	      infoProp != desc.end_infoProperty();
-	      infoProp++)
-	{
-	    Property_Handler::get_property (
-		*infoProp,
-		toconfig.infoProperty[pos]);
-	}	
     }
 
-      ComponentInterfaceDescription
-      CCD_Handler::component_interface_descr (
-	  const ::Deployment::ComponentInterfaceDescription&  src)
-      {
-	  ComponentInterfaceDescription cid;
-	  
-	  //Load up the basic string members
-	  XMLSchema::string< char > uuid ((src.UUID));
-	  XMLSchema::string< char > label ((src.label));
-	  XMLSchema::string< char > specifict ((src.specificType));
-	  
-	  //Then put them in the CID
-	  cid.UUID (uuid);
-	  cid.label (label);
-	  cid.specificType (specifict);
-	  
-	  //Get the supported type(s) and load them into cid
-	  ::CORBA::ULong total = src.supportedType.length ();
-	  for (size_t i = 0; i < total; ++i)
-	  {
-	      XMLSchema::string< char > curr ((src.supportedType[i]));
-	      cid.add_supportedType (curr);
-	  }
-	  
-	  //Get the idlFile(s) and store them into the cid
-	  total = src.idlFile.length ();
-	  for (size_t j = 0; j < total; ++j)
-	  {
-	      XMLSchema::string< char > curr ((src.idlFile[j]));
-	      cid.add_idlFile (curr);
-	  }
-	  
-	  //Get the configProperty(ies) and store them into the cid 
-	  total = src.configProperty.length ();
-	  for (size_t k = 0; k < total; ++k)
-	  {
-	      cid.add_configProperty (
-		  Property_Handler::get_property (
-		      src.configProperty[k]));
-	  }
-	  
-	  //Same drill for the component port description(s)
-	  total = src.port.length ();
-	  for (size_t l = 0; l < total; ++l)
-	  {
-	      cid.add_port (
-		  CPD_Handler::component_port_description (
-		      src.port[l]));
-	  }
-
-	  //Load up the property field
-	  total = src.property.length();
-	  for(size_t m = 0;
-	      m < total;
-	      m++)
-	  {
-	      cid.add_property(
-		  ComponentPropertyDescription_Handler::component_property_description (
-		      src.property[m]));
-	  }
-
-	  //Load up the infoProperty(s)
-	  total = src.infoProperty.length();
-	  for(size_t n = 0;
-	      n < total;
-	      n++)
-	  {
-	      cid.add_infoProperty(
-		  Property_Handler::get_property (
-		      src.infoProperty[n]));
-	  }
-
-	  return cid;
-      }
+    ComponentInterfaceDescription
+    CCD_Handler::component_interface_descr (
+                                            const ::Deployment::ComponentInterfaceDescription&  src)
+    {
+      CIAO_TRACE("CCD_Handler::component_interface_descr - reverse");
+      ComponentInterfaceDescription cid;
+
+      //Load up the basic string members
+      XMLSchema::string< char > uuid ((src.UUID));
+      XMLSchema::string< char > label ((src.label));
+      XMLSchema::string< char > specifict ((src.specificType));
+
+      //Then put them in the CID
+      cid.UUID (uuid);
+      cid.label (label);
+      cid.specificType (specifict);
+
+      //Get the supported type(s) and load them into cid
+      ::CORBA::ULong total = src.supportedType.length ();
+      for (size_t i = 0; i < total; ++i)
+        {
+          XMLSchema::string< char > curr ((src.supportedType[i]));
+          cid.add_supportedType (curr);
+        }
+
+      //Get the idlFile(s) and store them into the cid
+      total = src.idlFile.length ();
+      for (size_t j = 0; j < total; ++j)
+        {
+          XMLSchema::string< char > curr ((src.idlFile[j]));
+          cid.add_idlFile (curr);
+        }
+
+      //Get the configProperty(ies) and store them into the cid
+      total = src.configProperty.length ();
+      for (size_t k = 0; k < total; ++k)
+        {
+          cid.add_configProperty (
+                                  Property_Handler::get_property (src.configProperty[k]));
+        }
+
+      //Same drill for the component port description(s)
+      total = src.port.length ();
+      for (size_t l = 0; l < total; ++l)
+        {
+          cid.add_port (
+                        CPD_Handler::component_port_description (src.port[l]));
+        }
+
+
+      //Load up the property field
+      total = src.property.length();
+      for(size_t m = 0;
+          m < total;
+          m++)
+        {
+          cid.add_property(
+                           ComponentPropertyDescription_Handler::component_property_description (
+                                                                                                 src.property[m]));
+        }
+
+      //Load up the infoProperty(s)
+      total = src.infoProperty.length();
+      for(size_t n = 0;
+          n < total;
+          n++)
+        {
+          cid.add_infoProperty(
+                               Property_Handler::get_property (src.infoProperty[n]));
+        }
+
+      return cid;
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
index 0be3146798c..b3e8292f038 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  CCD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CCD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CCD_HANDLER_H
@@ -20,37 +20,37 @@
 
 namespace Deployment
 {
-  struct ComponentInterfaceDescription;
+struct ComponentInterfaceDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription;
-
-   /*
-    * @class CCD_Handler
-    *
-    * @brief Handler class for <ComponentInterfaceDescription> types.
-    *
-    * This class is named CCD_Handler but actually fills
-    * <ComponentInterfaceDescription>. Why is this confusion? We
-    * want to maintain the correlation between the XSD file and the
-    * actual datatype. The file name corresponds to the XSD file but
-    * the data type being filled in is of type
-    * <ComponentInterfaceDescription>
-    */
-    class Config_Handlers_Export CCD_Handler
-    {
-      public:
-       static void component_interface_descr (const ComponentInterfaceDescription &src,
-                                              ::Deployment::ComponentInterfaceDescription& dest);
-       static ComponentInterfaceDescription
-	   component_interface_descr (const ::Deployment::ComponentInterfaceDescription&  src);
-
-    };
-  }
+namespace Config_Handlers
+{
+class ComponentInterfaceDescription;
+
+/*
+* @class CCD_Handler
+*
+* @brief Handler class for <ComponentInterfaceDescription> types.
+*
+* This class is named CCD_Handler but actually fills
+* <ComponentInterfaceDescription>. Why is this confusion? We
+* want to maintain the correlation between the XSD file and the
+* actual datatype. The file name corresponds to the XSD file but
+* the data type being filled in is of type
+* <ComponentInterfaceDescription>
+*/
+class Config_Handlers_Export CCD_Handler
+{
+public:
+static void component_interface_descr (const ComponentInterfaceDescription &src,
+::Deployment::ComponentInterfaceDescription& dest);
+static ComponentInterfaceDescription
+component_interface_descr (const ::Deployment::ComponentInterfaceDescription&  src);
+
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 71d280266bd..b061c426987 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -3,16 +3,17 @@
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     CEPE_Handler::external_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ComponentExternalPortEndpoints &dest)
+                                           const PlanConnectionDescription &src,
+                                           ::Deployment::ComponentExternalPortEndpoints &dest)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoints");
       PlanConnectionDescription::externalEndpoint_const_iterator eeci_e =
         src.end_externalEndpoint ();
 
@@ -30,20 +31,21 @@ namespace CIAO
 
     void
     CEPE_Handler::external_port_endpoint (
-        const ComponentExternalPortEndpoint &src,
-        ::Deployment::ComponentExternalPortEndpoint &dest)
+                                          const ComponentExternalPortEndpoint &src,
+                                          ::Deployment::ComponentExternalPortEndpoint &dest)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoint");
       dest.portName = src.portName ().c_str ();
     }
-    
+
     ComponentExternalPortEndpoint
     CEPE_Handler::external_port_endpoint (
-      const ::Deployment::ComponentExternalPortEndpoint &src)
+                                          const ::Deployment::ComponentExternalPortEndpoint &src)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoint - reverse");
       //MAJO Unfinished
       XMLSchema::string< char > portname ((src.portName));
-      ComponentExternalPortEndpoint cepe (portname);
-      return cepe;
+      return ComponentExternalPortEndpoint  (portname);
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
index 708e5e35c90..681fcb1ec43 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  CEPE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CEPE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H
@@ -13,6 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -20,45 +21,48 @@
 
 namespace Deployment
 {
-  class ComponentExternalPortEndpoints;
-  struct ComponentExternalPortEndpoint;
+class ComponentExternalPortEndpoints;
+struct ComponentExternalPortEndpoint;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ComponentExternalPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ComponentExternalPortEndpoint;
+
+/*
+* @class CEPE_Handler
+*
+* @brief Handler class for <ComponentExternalPortEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ComponentExternalPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export CEPE_Handler
+{
+public:
+static void external_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ComponentExternalPortEndpoints &dest);
+
+static ComponentExternalPortEndpoint
+external_port_endpoint (
+const ::Deployment::ComponentExternalPortEndpoint &src);
 
-    /*
-     * @class CEPE_Handler
-     *
-     * @brief Handler class for <ComponentExternalPortEndpoint> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC ComponentExternalPortEndpoint objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     *
-     */
+static void external_port_endpoint (const ComponentExternalPortEndpoint &src,
+::Deployment::ComponentExternalPortEndpoint &dest);
+};
 
-    class Config_Handlers_Export CEPE_Handler
-    {
-    public:
-      static void external_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ComponentExternalPortEndpoints &dest);
-      
-      static ComponentExternalPortEndpoint
-      external_port_endpoint (
-        const ::Deployment::ComponentExternalPortEndpoint &src);
-        
-    private:
-      static void external_port_endpoint (
-        const ComponentExternalPortEndpoint &src,
-        ::Deployment::ComponentExternalPortEndpoint &dest);
-    };
-  }
+typedef Sequence_Handler < ComponentExternalPortEndpoint,
+::Deployment::ComponentExternalPortEndpoints,
+::Deployment::ComponentExternalPortEndpoint,
+CEPE_Handler::external_port_endpoint > CEPE_Functor;
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index ccf604c5465..67fcc0901c6 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -1,150 +1,150 @@
 // $Id$
+
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     CPD_Handler::component_port_description (
-      const ComponentPortDescription& desc,
-      Deployment::ComponentPortDescription& toconfig)
+                                             const ComponentPortDescription& desc,
+                                             Deployment::ComponentPortDescription& toconfig)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description");
       toconfig.name =
         desc.name ().c_str ();
 
-      toconfig.specificType =
-        desc.specificType ().c_str ();
+      if (desc.specificType_p ())
+        toconfig.specificType =
+          desc.specificType ().c_str ();
+
+      toconfig.supportedType.length (desc.count_supportedType ());
+      std::for_each (desc.begin_supportedType (),
+                     desc.end_supportedType (),
+                     String_Seq_Functor (toconfig.supportedType));
+
 
-      if (!desc.supportedType ().empty ())
-        {
-          toconfig.supportedType.length (1);
-          toconfig.supportedType[0] =
-            desc.supportedType ().c_str ();
-        }
-      
       switch (desc.kind ().integral ())
         {
         case CCMComponentPortKind::Facet_l:
           toconfig.kind = Deployment::Facet;
           break;
-          
+
         case CCMComponentPortKind::SimplexReceptacle_l:
           toconfig.kind = Deployment::SimplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::MultiplexReceptacle_l:
           toconfig.kind = Deployment::MultiplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::EventEmitter_l:
           toconfig.kind = Deployment::EventEmitter;
           break;
-          
+
         case CCMComponentPortKind::EventPublisher_l:
           toconfig.kind = Deployment::EventPublisher;
           break;
-          
+
         case CCMComponentPortKind::EventConsumer_l:
-          toconfig.kind = Deployment::EventConsumer; 
+          toconfig.kind = Deployment::EventConsumer;
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port type in connection %s\n",
                       desc.name ().c_str ()));
           throw 1;
         }
-      
+
       /* @@BUG: We need to consider how to handle booleans. */
-      toconfig.provider = desc.provider () == "true";
-      toconfig.exclusiveProvider = desc.exclusiveProvider () == "true";
-      toconfig.exclusiveUser = desc.exclusiveUser () == "true";
-      toconfig.optional =  desc.optional () == "true";
+      toconfig.provider = desc.provider ();
+      toconfig.exclusiveProvider = desc.exclusiveProvider ();
+      toconfig.exclusiveUser = desc.exclusiveUser ();
+      toconfig.optional =  desc.optional ();
     }
-    
+
     ComponentPortDescription
     CPD_Handler::component_port_description (
-      const Deployment::ComponentPortDescription& src)
+                                             const Deployment::ComponentPortDescription& src)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description - reverse");
       ::XMLSchema::string< char > name ((src.name));
       ::XMLSchema::string< char > stype ((src.specificType));
-     
-      ::XMLSchema::string< char > tval ("true"); 
-      ::XMLSchema::string< char > fval ("false"); 
-      ::XMLSchema::string< char > provider ("");
-      ::XMLSchema::string< char > exclusiveProvider ("");
-      ::XMLSchema::string< char > exclusiveUser ("");
-      ::XMLSchema::string< char > optional ("");
-      
+
+      ::XMLSchema::string< char > tval ("true");
+      ::XMLSchema::string< char > fval ("false");
+      XMLSchema::boolean provider;
+      XMLSchema::boolean  exclusiveProvider;
+      XMLSchema::boolean exclusiveUser;
+      XMLSchema::boolean optional;
+
       if (src.provider)
-        provider = tval;
+        provider = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.exclusiveUser)
-        exclusiveUser = tval;
+        exclusiveUser = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.exclusiveProvider)
-        exclusiveProvider = tval;
+        exclusiveProvider = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.optional)
-        optional = tval;
+        optional = true;
       else
-        provider = fval;
-      
-      ComponentPortDescription cpd (
-        name,
-        stype,
-        tval,
-        provider,
-        exclusiveProvider,
-        exclusiveUser,
-        optional,
-        CCMComponentPortKind::Facet);
+        provider = false;
+
+      ComponentPortDescription cpd (name,
+                                    provider,
+                                    exclusiveProvider,
+                                    exclusiveUser,
+                                    optional,
+                                    CCMComponentPortKind::Facet);
 
       switch (src.kind)
         {
         case ::Deployment::Facet:
           cpd.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           cpd.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           cpd.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           cpd.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           cpd.kind (CCMComponentPortKind::EventPublisher);
           break;
-          
+
         case ::Deployment::EventConsumer:
           cpd.kind (CCMComponentPortKind::EventConsumer);
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port kind in connection %s\n",
                       name.c_str ()));
         }
-      
 
-      if (src.supportedType.length () > 0)
-        cpd.supportedType (
-          XMLSchema::string< char > ((src.supportedType[0])));      
+      for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
+        cpd.add_supportedType (XMLSchema::string< char > ((src.supportedType[i])));
 
       return cpd;
     }
-  
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
index 3bb017a3429..31737241b51 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  CPD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CPD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CPD_HANDLER_H
@@ -14,6 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,41 +22,48 @@
 
 namespace Deployment
 {
-  struct ComponentPortDescription;
+class ComponentPortDescription;
+class ComponentPortDescriptions;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentPortDescription;
-    /*
-     * @class CPD_Handler
-     *
-     * @brief Handler class for <CCMComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-
-    class Config_Handlers_Export CPD_Handler
-    {
-
-    public:
-      /// Maps the values from the XSC object
-      /// <ComponentInterfaceDescription> to the CORBA IDL type
-      /// <Deployment::ComponentInterfaceDescription>.
-     static void component_port_description (
-         const ComponentPortDescription &desc,
-         ::Deployment::ComponentPortDescription &toconfig);
-    
-     static ComponentPortDescription
-     component_port_description (
-         const Deployment::ComponentPortDescription& src);
-  };
- }
+namespace Config_Handlers
+{
+class ComponentPortDescription;
+/*
+* @class CPD_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export CPD_Handler
+{
+
+public:
+/// Maps the values from the XSC object
+/// <ComponentInterfaceDescription> to the CORBA IDL type
+/// <Deployment::ComponentInterfaceDescription>.
+static void component_port_description (
+const ComponentPortDescription &desc,
+::Deployment::ComponentPortDescription &toconfig);
+
+static ComponentPortDescription
+component_port_description (
+const Deployment::ComponentPortDescription& src);
+};
+
+typedef Sequence_Handler < ComponentPortDescription,
+::Deployment::ComponentPortDescriptions,
+::Deployment::ComponentPortDescription,
+CPD_Handler::component_port_description > CPD_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index da4f6584eb0..03da34467eb 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -4,6 +4,9 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "Property_Handler.h"
+
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -21,34 +24,41 @@ namespace CIAO
     ///This method takes a <Deployment::ConnectionResourceDeploymentDescription>
     ///and maps the values from the passed in XSC
     ///ConnectionResourceDeploymentDescription to its members.
-    void CRDD_Handler::get_ConnectionResourceDeploymentDescription (
-                Deployment::ConnectionResourceDeploymentDescription& toconfig,
-                ConnectionResourceDeploymentDescription& desc)
+    void CRDD_Handler::get_ConnectionResourceDeploymentDescription (Deployment::ConnectionResourceDeploymentDescription& toconfig,
+                                                                    const ConnectionResourceDeploymentDescription& desc)
     {
-      toconfig.targetName = CORBA::string_dup (desc.targetName ().c_str ());
-      toconfig.requirementName =
-        CORBA::string_dup (desc.requirementName ().c_str ());
-      toconfig.resourceName =
-        CORBA::string_dup (desc.resourceName ().c_str ());
-
-      Any_Handler::extract_into_any (desc.resourceValue (),
-                                     toconfig.resourceValue);
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDD");
+
+      toconfig.targetName = desc.targetName ().c_str ();
+      toconfig.requirementName = desc.requirementName ().c_str ();
+      toconfig.resourceName = desc.resourceName ().c_str ();
+
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
     }
-    
+
     ConnectionResourceDeploymentDescription
     CRDD_Handler::connection_resource_depl_desc (
-      const ::Deployment::ConnectionResourceDeploymentDescription& src)
+                                                 const ::Deployment::ConnectionResourceDeploymentDescription& src)
     {
-      XMLSchema::string< char > tname ((src.targetName));
-      XMLSchema::string< char > reqname ((src.requirementName));
-      XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
-      
-      ConnectionResourceDeploymentDescription crdd (
-                                              tname,
-                                              reqname,
-                                              resname,
-                                              resval);
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse");
+      XMLSchema::string< ACE_TCHAR > tname ((src.targetName));
+      XMLSchema::string< ACE_TCHAR > reqname ((src.requirementName));
+      XMLSchema::string <ACE_TCHAR> resname ((src.resourceName));
+
+      ConnectionResourceDeploymentDescription crdd (tname,
+                                                    reqname,
+                                                    resname);
+
+      for (CORBA::ULong i = 0;
+           i != src.property.length ();
+           ++i)
+        {
+          crdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
+
       return crdd;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
index 3196b4bb1f4..8f5c964aab4 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
@@ -20,7 +20,7 @@
 
 namespace Deployment
 {
-  struct ConnectionResourceDeploymentDescription; 
+  struct ConnectionResourceDeploymentDescription;
 }
 
 namespace CIAO
@@ -28,37 +28,36 @@ namespace CIAO
 
   namespace Config_Handlers
   {
-    
-   class ConnectionResourceDeploymentDescription;
-   
-   /*
-    * @class CRDD_Handler
-    *
-    * @brief Handler class for <ConnectionResourceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ConnectionResourceDeploymentDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
+
+    class ConnectionResourceDeploymentDescription;
+
+    /*
+     * @class CRDD_Handler
+     *
+     * @brief Handler class for <ConnectionResourceDeploymentDescription> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC ConnectionResourceDeploymentDescription objects, parsed from
+     * the descriptor files, to the corresponding CORBA IDL type.
+     *
+     */
+
     class Config_Handlers_Export CRDD_Handler{
-     
-      public:
-       
-        CRDD_Handler (void);
-        virtual ~CRDD_Handler (void);
-  
-        ///This method takes a <Deployment::ConnectionResourceDeploymentDescription>
-        ///and maps the values from the passed in XSC 
-        ///ConnectionResourceDeploymentDescription to its members.
-        void get_ConnectionResourceDeploymentDescription (
-                    Deployment::ConnectionResourceDeploymentDescription& toconfig,
-                    ConnectionResourceDeploymentDescription& desc);   
-                    
-        static ConnectionResourceDeploymentDescription
-        connection_resource_depl_desc (
-          const ::Deployment::ConnectionResourceDeploymentDescription& src);       
+
+    public:
+
+      CRDD_Handler (void);
+      virtual ~CRDD_Handler (void);
+
+      ///This method takes a <Deployment::ConnectionResourceDeploymentDescription>
+      ///and maps the values from the passed in XSC
+      ///ConnectionResourceDeploymentDescription to its members.
+      void get_ConnectionResourceDeploymentDescription (Deployment::ConnectionResourceDeploymentDescription& toconfig,
+                                                        const ConnectionResourceDeploymentDescription& desc);
+
+      static ConnectionResourceDeploymentDescription
+      connection_resource_depl_desc (
+                                     const ::Deployment::ConnectionResourceDeploymentDescription& src);
 
     };
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/Common.h b/TAO/CIAO/tools/Config_Handlers/Common.h
index 8109fa005e0..6057cbb74be 100644
--- a/TAO/CIAO/tools/Config_Handlers/Common.h
+++ b/TAO/CIAO/tools/Config_Handlers/Common.h
@@ -1,41 +1,41 @@
 // $Id$
 /**
- * @file Common.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * Some common definitions for all config_handlers.
- */
+* @file Common.h
+* @author Will Otte <wotte@dre.vanderbilt.edu>
+*
+* Some common definitions for all config_handlers.
+*/
 #ifndef CONFIG_HANDLERS_COMMON_H
 #define CONFIG_HANDLERS_COMMON_H
 #include <string>
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    /**
-     * @class Config_Error
-     * @brief Exception to communicate a config_handlers error
-     */
-    class Config_Error
-    {
-    public:
-      Config_Error (const std::string &name,
-		   const std::string &error) :
-	name_ (name),
-	error_ (error)
-      {};
-      
-      /// Some identifying information about the element that
-      /// caused the error
-      std::string name_;
-      
-      /// A human readable error message
-      std::string error_;
-      
-    };
-  }
+namespace Config_Handlers
+{
+/**
+* @class Config_Error
+* @brief Exception to communicate a config_handlers error
+*/
+class Config_Error
+{
+public:
+Config_Error (const std::string &name,
+const std::string &error) :
+name_ (name),
+error_ (error)
+{};
+
+/// Some identifying information about the element that
+/// caused the error
+std::string name_;
+
+/// A human readable error message
+std::string error_;
+
+};
+}
 }
 #endif /* CONFIG_HANDLERS_COMMON_H */
-      
-      
+
+
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 6c56f10a44e..e7f9fa0266d 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -3,32 +3,34 @@
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     ComponentPropertyDescription_Handler::component_property_description (
-        const ComponentPropertyDescription& desc,
-        ::Deployment::ComponentPropertyDescription& toconfig)
+                                                                          const ComponentPropertyDescription& desc,
+                                                                          ::Deployment::ComponentPropertyDescription& toconfig)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description");
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       // Delegate the DataType to the
       // DataType_Handler.
 
       // @@ There is a lurking bug here.
-//#if 0
+      //#if 0
       CORBA::TypeCode_ptr tcptr = toconfig.type.in ();
-      DataType_Handler::data_type (tcptr,desc.type ());
-//#endif /*if 0*/
+      DataType_Handler::data_type (desc.type (), tcptr);
+      //#endif /*if 0*/
     }
 
-    ComponentPropertyDescription 
+    ComponentPropertyDescription
     ComponentPropertyDescription_Handler::component_property_description (
-      const ::Deployment::ComponentPropertyDescription &src)
+                                                                          const ::Deployment::ComponentPropertyDescription &src)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse");
       XMLSchema::string< char > name ((src.name));
       DataType dt (DataType_Handler::data_type (src.type));
       ComponentPropertyDescription cpd (name,dt);
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
index dffb9741455..f87edc7fcea 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ComponentPropertyDescription_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ComponentPropertyDescription_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ComponentPropertyDescription_Handler_H
@@ -21,40 +21,40 @@
 
 namespace Deployment
 {
-  struct ComponentPropertyDescription;
+struct ComponentPropertyDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentPropertyDescription;
-
-    /*
-     * @class ComponentPropertyDescription_Handler
-     *
-     * @brief Handler class for <ComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export ComponentPropertyDescription_Handler
-    {
-    public:
-
-      /// This method maps the values from the XSC object
-      /// <ComponentPropertyDescription> to the CORBA IDL type
-      /// <Deployment::ComponentPropertyDescription>.
-     static void   component_property_description (
-         const ComponentPropertyDescription& desc,
-         ::Deployment::ComponentPropertyDescription& toconfig);
-     static ComponentPropertyDescription
-     component_property_description (
-         const ::Deployment::ComponentPropertyDescription &src);
-    };
-  }
+namespace Config_Handlers
+{
+class ComponentPropertyDescription;
+
+/*
+* @class ComponentPropertyDescription_Handler
+*
+* @brief Handler class for <ComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export ComponentPropertyDescription_Handler
+{
+public:
+
+/// This method maps the values from the XSC object
+/// <ComponentPropertyDescription> to the CORBA IDL type
+/// <Deployment::ComponentPropertyDescription>.
+static void   component_property_description (
+const ComponentPropertyDescription& desc,
+::Deployment::ComponentPropertyDescription& toconfig);
+static ComponentPropertyDescription
+component_property_description (
+const ::Deployment::ComponentPropertyDescription &src);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 5131bbfdf8a..e4f3bb21e66 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,6 +1,11 @@
 //$Id$
 
 project (XSC_XML_Handlers) : acelib, xerces {
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
+
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
@@ -25,21 +30,25 @@ project (XSC_XML_Handlers) : acelib, xerces {
   }
 }
 
-project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany {
-  after += RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
+project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory {
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
+
+  after += CIAO_Events_Handlers RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
   requires += exceptions
   includes += $(CIAO_ROOT)/tools/Config_Handlers
-  libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
+  libs += CIAO_XML_Utils CIAO_Events_Handlers RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
 
   Source_Files {
     DP_Handler.cpp
     CCD_Handler.cpp
     Property_Handler.cpp
     ComponentPropertyDescription_Handler.cpp
-    DP_PCD_Handler.cpp
     CPD_Handler.cpp
     DataType_Handler.cpp
     MDD_Handler.cpp
@@ -64,13 +73,10 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany {
     DnC_Dump.cpp
     DnC_Dump_T.cpp
     Dump_Obj.cpp
-    STD_CID_Handler.cpp
-    STD_CPD_Handler.cpp
-    STD_IAD_Handler.cpp
-    STD_PC_Intf.cpp
-    STD_PCD_Handler.cpp
     PCD_Handler.cpp
     IRDD_Handler.cpp
+    DD_Handler.cpp
+    SatisfierProperty_Handler.cpp
   }
 
   Header_Files {
@@ -79,15 +85,15 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany {
 }
 
 project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
-  requires += dummy_label
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-  exename = test
-  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-  macros   += XML_USE_PTHREAD/S
+//  requires += dummy_label
+includes += $(CIAO_ROOT)/tools/Config_Handlers
+exename = test
+dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+macros   += XML_USE_PTHREADS
 
-  Source_Files {
-    test.cpp
-  }
+Source_Files {
+test.cpp
+}
 }
 
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 00aacd892c9..fb66b16fa41 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -5,6 +5,7 @@
 #endif
 
 #include "DP_Handler.h"
+#include "ace/UUID.h"
 #include "ciao/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
@@ -16,275 +17,312 @@
 #include "cdp.hpp"
 #include "RT-CCM/SRD_Handler.h"
 #include "RT-CCM/CIAOServerResources.hpp"
+#include "CIAO_Events/CIAOEvents_Handler.h"
+#include "CIAO_Events/CIAOEvents.hpp"
+
+#include "PCD_Handler.h"
 
-#include "DP_PCD_Handler.h"
-  
 ACE_RCSID (Config_Handlers,
            DP_Handler,
            "$Id$")
 
-namespace CIAO
-{
-  namespace Config_Handlers
+  namespace CIAO
   {
-    DP_Handler::DP_Handler (DeploymentPlan &dp)
-      :   xsc_dp_ (0)
+    namespace Config_Handlers
+    {
+      DP_Handler::DP_Handler (DeploymentPlan &dp)
+        :   xsc_dp_ (0)
         , idl_dp_ (0)
         , retval_ (true)
-    {
-      if (!this->resolve_plan (dp))
-        throw;
-    }
-    
-    DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
-      : xsc_dp_ (new DeploymentPlan),
-        idl_dp_ (0),
-        retval_ (0)
-    {
-      if (!this->build_xsc (plan))
-        throw;
-    }
-    
-    DP_Handler::~DP_Handler (void)
-      throw ()
-    {
-    }
-    
-    DeploymentPlan const *
-    DP_Handler::xsc (void) const
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->xsc_dp_.get () != 0)
-        return this->xsc_dp_.get ();
-
-      throw NoPlan ();
-    }
-    
-    DeploymentPlan *
-    DP_Handler::xsc (void)
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->xsc_dp_.get () != 0)
-        return this->xsc_dp_.release ();
-      
-      throw NoPlan ();
-    }
-    
-    ::Deployment::DeploymentPlan const *
-    DP_Handler::plan (void) const
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->idl_dp_.get () != 0)
-        return this->idl_dp_.get ();
-
-      throw NoPlan ();
-    }
+      {
+        if (!this->resolve_plan (dp))
+          throw;
+      }
 
-    ::Deployment::DeploymentPlan *
-    DP_Handler::plan (void)
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->idl_dp_.get () != 0)
-        return this->idl_dp_.release ();
+      DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
+        : xsc_dp_ (new DeploymentPlan),
+          idl_dp_ (0),
+          retval_ (0)
+      {
+        if (!this->build_xsc (plan))
+          throw;
+      }
 
-      throw NoPlan ();
-    }
+      DP_Handler::~DP_Handler (void)
+        throw ()
+      {
+      }
 
-    bool
-    DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
-    {
-      ::Deployment::DeploymentPlan *tmp =
-          new Deployment::DeploymentPlan;
-
-      this->idl_dp_.reset (tmp);
-
-      // Read in the label, if present, since minoccurs = 0
-      if (xsc_dp.label_p ())
-	      {
-	        this->idl_dp_->label =
-	          CORBA::string_dup (xsc_dp.label ().c_str ());
-	      }
-
-      // Read in the UUID, if present
-      if (xsc_dp.UUID_p ())
-	      {
-	        this->idl_dp_->UUID =
-	          CORBA::string_dup (xsc_dp.UUID ().c_str ());
-	      }
-
-      // Similar thing for dependsOn
-      for (DeploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
-	   dstart != xsc_dp.end_dependsOn ();
-	   ++dstart)
+      DeploymentPlan const *
+      DP_Handler::xsc (void) const
+        throw (DP_Handler::NoPlan)
       {
-	CORBA::ULong len = this->idl_dp_->dependsOn.length ();
-	this->idl_dp_->dependsOn.length (len + 1);
-	ID_Handler::get_ImplementationDependency (
-				   this->idl_dp_->dependsOn [len],
-                *dstart);
+        if (this->retval_ && this->xsc_dp_.get () != 0)
+          return this->xsc_dp_.get ();
 
+        throw NoPlan ();
       }
 
-      // ... An the property stuff
-      for (DeploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
-	   pstart != xsc_dp.end_infoProperty ();
-	   ++pstart)
-	{
-	  CORBA::ULong len =
-	    this->idl_dp_->infoProperty.length ();
-
-	  this->idl_dp_->infoProperty.length (len + 1);
-          
-          if (pstart->name () != "CIAOServerResources")
-            Property_Handler::get_property (*pstart,
-                                            this->idl_dp_->infoProperty [len]);
-          else
-            {
-              /*
-               * Hook for RT-CCM
-               */
-
-
-	      ACE_DEBUG ((LM_DEBUG,
-                          "Importing ServerResources...\n"));
-              
-              // Parse the SR document
-              SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
-
-              // Populate the property
-              this->idl_dp_->infoProperty [len].name = pstart->name ().c_str ();
-              this->idl_dp_->infoProperty [len].value <<= *(srd_handler.srd_idl ());
-            }
-	}
-      // Read in the realizes, if present
-      if (xsc_dp.realizes_p ())
+      DeploymentPlan *
+      DP_Handler::xsc (void)
+        throw (DP_Handler::NoPlan)
       {
-          CCD_Handler::component_interface_descr (
-            xsc_dp.realizes (),
-            this->idl_dp_->realizes);
+        if (this->retval_ && this->xsc_dp_.get () != 0)
+          return this->xsc_dp_.release ();
+
+        throw NoPlan ();
       }
 
-      ADD_Handler::artifact_deployment_descrs (xsc_dp,
-                                               this->idl_dp_->artifact);
-      
-      MDD_Handler::mono_deployment_descriptions (xsc_dp,
-                                                 this->idl_dp_->implementation);
-
-      IDD_Handler::instance_deployment_descrs (xsc_dp,
-                                               this->idl_dp_->instance);
-      
-      DP_PCD_Handler::plan_connection_descrs (xsc_dp, this->idl_dp_->connection);
-      
-      return true;
-    }
-    
-    bool
-    DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
-    {
-      size_t len; //Used for checking the length of struct data members
-      
-      // Read in the label, if present, since minoccurs = 0
-      if (plan.label != 0)
+      ::Deployment::DeploymentPlan const *
+      DP_Handler::plan (void) const
+        throw (DP_Handler::NoPlan)
       {
-	  XMLSchema::string< char > i((plan.label));
-	  this->xsc_dp_->label(i);
+        if (this->retval_ && this->idl_dp_.get () != 0)
+          return this->idl_dp_.get ();
+
+        throw NoPlan ();
       }
 
-      // Read in the UUID, if present
-      if (plan.UUID != 0)
+      ::Deployment::DeploymentPlan *
+      DP_Handler::plan (void)
+        throw (DP_Handler::NoPlan)
+
       {
-	  XMLSchema::string< char > j((plan.UUID));
-	  this->xsc_dp_->UUID(j);
+        if (this->retval_ && this->idl_dp_.get () != 0)
+          return this->idl_dp_.release ();
+
+        throw NoPlan ();
       }
 
-      // Similar thing for dependsOn
-      len = plan.dependsOn.length();
-      for (size_t j = 0;
-	   j < len;
-	   ++j)
+      bool
+      DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
       {
-	  this->xsc_dp_->add_dependsOn(
-	      ID_Handler::impl_dependency(
-		  plan.dependsOn[j]));	
+        CIAO_TRACE ("DP_Handler::resolve_plan");
+
+        ::Deployment::DeploymentPlan *tmp =
+            new Deployment::DeploymentPlan;
+
+        this->idl_dp_.reset (tmp);
+
+        // Read in the label, if present, since minoccurs = 0
+        if (xsc_dp.label_p ())
+          {
+            this->idl_dp_->label =
+              CORBA::string_dup (xsc_dp.label ().c_str ());
+          }
+
+        // Read in the UUID, if present
+        if (xsc_dp.UUID_p ())
+          {
+            this->idl_dp_->UUID =
+              CORBA::string_dup (xsc_dp.UUID ().c_str ());
+          }
+
+        // Similar thing for dependsOn
+        for (DeploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
+             dstart != xsc_dp.end_dependsOn ();
+             ++dstart)
+          {
+            CORBA::ULong len = this->idl_dp_->dependsOn.length ();
+            this->idl_dp_->dependsOn.length (len + 1);
+            ID_Handler::get_ImplementationDependency (*dstart,
+                                                      this->idl_dp_->dependsOn [len]);
+
+          }
+
+        // ... An the property stuff
+        for (DeploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
+             pstart != xsc_dp.end_infoProperty ();
+             ++pstart)
+          {
+            CORBA::ULong len =
+              this->idl_dp_->infoProperty.length ();
+
+            this->idl_dp_->infoProperty.length (len + 1);
+
+            if (pstart->name () == "CIAOServerResources")
+              {
+                /*
+                 * Hook for RT-CCM
+                 */
+
+
+                ACE_DEBUG ((LM_DEBUG,
+                            "Importing ServerResources...\n"));
+
+                // Parse the SR document
+                SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
+
+                // Populate the property
+                this->idl_dp_->infoProperty [len].name = pstart->name ().c_str ();
+                this->idl_dp_->infoProperty [len].value <<= *(srd_handler.srd_idl ());
+              }
+            else if (pstart->name () == "CIAOEvents")
+              {
+                /*
+                * Hook for EVENTS
+                */
+
+                ACE_DEBUG ((LM_DEBUG,
+                            "Importing CIAOEvents...\n"));
+
+                // Parse the SR document
+                CIAOEvents_Handler event_handler (pstart->value ().value ().begin_string ()->c_str ());
+
+                // Populate the property
+                this->idl_dp_->infoProperty [len].name = pstart->name ().c_str ();
+                this->idl_dp_->infoProperty [len].value <<= *(event_handler.esd_idl ());
+              }
+            else
+              {
+                Property_Handler::get_property (*pstart,
+                                                this->idl_dp_->infoProperty [len]);
+              }
+          }
+
+        // Read in the realizes, if present
+        if (xsc_dp.realizes_p ())
+          {
+            CCD_Handler::component_interface_descr (
+                                                    xsc_dp.realizes (),
+                                                    this->idl_dp_->realizes);
+          }
+
+        ADD_Handler::artifact_deployment_descrs (xsc_dp,
+                                                 this->idl_dp_->artifact);
+
+        MDD_Handler::mono_deployment_descriptions (xsc_dp,
+                                                   this->idl_dp_->implementation);
+
+        IDD_Handler::instance_deployment_descrs (xsc_dp,
+                                                 this->idl_dp_->instance);
+
+        this->idl_dp_->connection.length (xsc_dp.count_connection ());
+        std::for_each (xsc_dp.begin_connection (),
+                       xsc_dp.end_connection (),
+                       PCD_Functor (this->idl_dp_->connection));
+        
+        //PCD_Handler::get_PlanConnectionDescription (xsc_dp, this->idl_dp_->connection);
+
+        return true;
       }
 
-      // ... And the property stuff
-      len = plan.infoProperty.length();
-      for (size_t q = 0;
-	   q < len;
-	   q++)
+      bool
+      DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
       {
-        if (ACE_OS::strcmp (plan.infoProperty[q].name.in (),
-                            "CIAOServerResources") == 0)
+        CIAO_TRACE ("DP_Handler::build_xsc");
+
+        // Initialize the UUID generator.
+        ACE_Utils::UUID_GENERATOR::instance ()->init ();
+
+        // Clear IDREF tables
+        IDD_Handler::IDREF.unbind_refs ();
+        MDD_Handler::IDREF.unbind_refs ();
+
+
+        size_t len; //Used for checking the length of struct data members
+
+        // Read in the label, if present, since minoccurs = 0
+        if (plan.label != 0)
+          {
+            XMLSchema::string< char > i((plan.label));
+            this->xsc_dp_->label(i);
+          }
+
+        // Read in the UUID, if present
+        if (plan.UUID != 0)
+          {
+            XMLSchema::string< char > j((plan.UUID));
+            this->xsc_dp_->UUID(j);
+          }
+
+        // Similar thing for dependsOn
+        len = plan.dependsOn.length();
+        for (size_t j = 0;
+             j < len;
+             ++j)
+          {
+            this->xsc_dp_->add_dependsOn(
+                                         ID_Handler::impl_dependency(
+                                                                     plan.dependsOn[j]));
+          }
+
+        // ... And the property stuff
+        len = plan.infoProperty.length();
+        for (size_t q = 0;
+             q < len;
+             q++)
+          {
+            if (ACE_OS::strcmp (plan.infoProperty[q].name.in (),
+                                "CIAOServerResources") == 0)
+              {
+                ACE_DEBUG ((LM_ERROR,
+                            "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported."));
+                continue;
+              }
+
+            this->xsc_dp_->add_infoProperty (
+                                             Property_Handler::get_property (
+                                                                             plan.infoProperty[q]));
+          }
+
+
+        // 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
+        // @@ so we can check for length
+        this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
+        if (!this->xsc_dp_->realizes_p())
           {
             ACE_DEBUG ((LM_ERROR,
-                        "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported."));
-            continue;
+                        "(%P|%t) DP_Handler: "
+                        "Error parsing Component Interface Descriptor."));
+            return false;
           }
-        
-        this->xsc_dp_->add_infoProperty (
-               Property_Handler::get_property (
-                    plan.infoProperty[q]));
-      }
 
+        //Take care of the artifact(s) if they exist
+        len = plan.artifact.length();
+        for(size_t k = 0;
+            k < len;
+            k++)
+          {
+            this->xsc_dp_->add_artifact (
+                                         ADD_Handler::artifact_deployment_descr (
+                                                                                 plan.artifact[k]));
+          }
 
-      // 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
-      // @@ so we can check for length
-      this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
-      if (!this->xsc_dp_->realizes_p())
-      {
-	  ACE_DEBUG ((LM_ERROR,
-		      "(%P|%t) DP_Handler: "
-		      "Error parsing Component Interface Descriptor."));
-	  return false;
-      }
+        //Take care of the implementation(s) if they exist
+        len = plan.implementation.length();
+        for(size_t l = 0;
+            l < len;
+            l++)
+          {
+            this->xsc_dp_->add_implementation (
+                                               MDD_Handler::mono_deployment_description (
+                                                                                         plan.implementation[l]));
+          }
 
-      //Take care of the artifact(s) if they exist
-      len = plan.artifact.length();
-      for(size_t k = 0;
-	  k < len;
-	  k++)
-      {
-	  this->xsc_dp_->add_artifact (
-	      ADD_Handler::artifact_deployment_descr (
-		  plan.artifact[k]));
-      }
-      
-      //Take care of the implementation(s) if they exist
-      len = plan.implementation.length();
-      for(size_t l = 0;
-	  l < len;
-	  l++)
-      {
-	  this->xsc_dp_->add_implementation (
-	      MDD_Handler::mono_deployment_description (
-		  plan.implementation[l]));
-      }
-    
-      //Ditto for the instance(s)
-      len = plan.instance.length();
-      for(size_t m = 0;
-	  m < len;
-	  m++)
-      {
-	  this->xsc_dp_->add_instance (
-	      IDD_Handler::instance_deployment_descr (
-		  plan.instance[m]));
-      }
+        //Ditto for the instance(s)
+        len = plan.instance.length();
+        for(size_t m = 0;
+            m < len;
+            m++)
+          {
+            this->xsc_dp_->add_instance (
+                                         IDD_Handler::instance_deployment_descr (
+                                                                                 plan.instance[m]));
+          }
 
-      //Finally, take care of the Connection Planning
-      len = plan.connection.length();
-      for(size_t n = 0; n < len; n++)
-      {
-	  this->xsc_dp_->add_connection (
-	      DP_PCD_Handler::plan_connection_descr (
-		  plan.connection[n]));
+        //Finally, take care of the Connection Planning
+        len = plan.connection.length();
+        for(size_t n = 0; n < len; n++)
+          {
+            this->xsc_dp_->add_connection (PCD_Handler::get_PlanConnectionDescription (
+                                                                                  plan.connection[n]));
+          }
+
+        retval_ = true;
+        return true;
       }
-      
-      retval_ = true;
-      return true;
     }
   }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.h b/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
index b98f697e84b..50620822263 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  DP_Handler.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
+*  @file  DP_Handler.h
+*
+*  $Id$
+*
+*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DP_HANDLER_H
@@ -13,7 +13,9 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
+using std::auto_ptr;
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,67 +24,67 @@
 
 namespace Deployment
 {
-  struct DeploymentPlan ;
+struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-
-   /*
-    * @class DP_Handler
-    *
-    * @brief Handler for Deployment::DeploymentPlan
-    */
-    class Config_Handlers_Export DP_Handler
-    {
-    public:
-      class NoPlan {};
-
-      /// Use this constructor if you want to use
-      /// the XSC->IDL mapping
-      DP_Handler (DeploymentPlan &dp);
-      
-      /// Use this constructor if you want to use
-      /// the IDL->XSC mapping
-      DP_Handler (const ::Deployment::DeploymentPlan &plan);
-      
-      ~DP_Handler (void)
-        throw ();
-      
-      /// Generates the IDL->XSC mapping.  returns
-      /// null if the method fails or if the class was
-      /// constructed with the wrong source.
-      DeploymentPlan const *xsc (void) const
-        throw (NoPlan);
-      
-      DeploymentPlan *xsc (void)
-        throw (NoPlan);
-      
-      /// Generates the XSC->IDL mapping.  returns null
-      /// if the method fails or the class was constructed
-      ::Deployment::DeploymentPlan const *plan (void) const
-        throw (NoPlan);
-
-      ::Deployment::DeploymentPlan *plan (void)
-        throw (NoPlan);
-
-    private:
-
-      bool resolve_plan (DeploymentPlan &dp);
-      
-      bool build_xsc (const ::Deployment::DeploymentPlan &plan);
-      
-    private:
-      auto_ptr< DeploymentPlan > xsc_dp_;
-      
-      auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
-
-      bool retval_;
-    };
-  }
+namespace Config_Handlers
+{
+class DeploymentPlan;
+
+/*
+* @class DP_Handler
+*
+* @brief Handler for Deployment::DeploymentPlan
+*/
+class Config_Handlers_Export DP_Handler
+{
+public:
+class NoPlan {};
+
+/// Use this constructor if you want to use
+/// the XSC->IDL mapping
+DP_Handler (DeploymentPlan &dp);
+
+/// Use this constructor if you want to use
+/// the IDL->XSC mapping
+DP_Handler (const ::Deployment::DeploymentPlan &plan);
+
+~DP_Handler (void)
+throw ();
+
+/// Generates the IDL->XSC mapping.  returns
+/// null if the method fails or if the class was
+/// constructed with the wrong source.
+DeploymentPlan const *xsc (void) const
+throw (NoPlan);
+
+DeploymentPlan *xsc (void)
+throw (NoPlan);
+
+/// Generates the XSC->IDL mapping.  returns null
+/// if the method fails or the class was constructed
+::Deployment::DeploymentPlan const *plan (void) const
+throw (NoPlan);
+
+::Deployment::DeploymentPlan *plan (void)
+throw (NoPlan);
+
+private:
+
+bool resolve_plan (DeploymentPlan &dp);
+
+bool build_xsc (const ::Deployment::DeploymentPlan &plan);
+
+private:
+auto_ptr< DeploymentPlan > xsc_dp_;
+
+auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+
+bool retval_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index e468ec00357..22512ec15a5 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -9,7 +9,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -19,6 +19,7 @@ namespace CIAO
         const DeploymentPlan &src,
         Deployment::PlanConnectionDescriptions& dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descrs");
       DeploymentPlan::connection_const_iterator cci_e =
         src.end_connection ();
       
@@ -38,8 +39,9 @@ namespace CIAO
     DP_PCD_Handler::plan_connection_descr (
 	const Deployment::PlanConnectionDescription &src)
     {
-	PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
-	return pcd;
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr");
+      PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
+      return pcd;
     }
 
     void
@@ -47,6 +49,7 @@ namespace CIAO
         const PlanConnectionDescription &src,
         Deployment::PlanConnectionDescription &dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr - reverse");
       dest.name =
         src.name ().c_str ();
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
index c71f8701d6f..02034f6d56a 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
@@ -2,10 +2,11 @@
 
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-
-namespace CIAO{
-
-  namespace Config_Handlers{
+#include "ciao/CIAO_common.h"
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
 
     DataType_Handler::DataType_Handler (void)
     {
@@ -17,164 +18,162 @@ namespace CIAO{
     ///This method takes a <CIAO::Config_Handlers::DataType>
     ///and returns the corresponding CORBA::TypeCode.
     void
-    DataType_Handler::data_type (
-                                CORBA::TypeCode_ptr& type,
-                                const DataType& desc)
+    DataType_Handler::data_type (const DataType& desc,
+                                 CORBA::TypeCode_ptr& type)
     {
+      CIAO_TRACE("DataType_Handler::data_type");
+      TCKind kind (desc.kind ());
+
+      switch (kind.integral ())
+        {
+        case  TCKind::tk_null_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+          break;
+
+        case  TCKind::tk_short_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
+          break;
+
+        case  TCKind::tk_long_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
+          break;
+
+        case  TCKind::tk_ushort_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
+          break;
+
+        case  TCKind::tk_ulong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
+          break;
+
+        case  TCKind::tk_float_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
+          break;
+
+        case  TCKind::tk_double_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
+          break;
+
+        case  TCKind::tk_boolean_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
+          break;
+
+        case  TCKind::tk_char_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
+          break;
 
-        TCKind kind (desc.kind ());
-        
-        switch (kind.integral ())
-          {
-          case  TCKind::tk_null_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-            break;
-
-          case  TCKind::tk_short_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-            break;
-
-          case  TCKind::tk_long_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-            break;
-
-          case  TCKind::tk_ushort_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-            break;
-
-          case  TCKind::tk_ulong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-            break;
-
-          case  TCKind::tk_float_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-            break;
-
-          case  TCKind::tk_double_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-            break;
-
-          case  TCKind::tk_boolean_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-            break;
-
-          case  TCKind::tk_char_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-            break;
-
-          case  TCKind::tk_octet_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-            break;
-
-          case  TCKind::tk_string_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-            break;
-
-          case  TCKind::tk_longlong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-            break;
-
-          case  TCKind::tk_ulonglong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-            break;
-
-          case  TCKind::tk_longdouble_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-            break;
-
-          case  TCKind::tk_wchar_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-            break;
-
-          case  TCKind::tk_wstring_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-            break;
-
-          case  TCKind::tk_any_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-            break;
-
-          case  TCKind::tk_TypeCode_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-            break;
-
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
-            throw 1;
-          }
-        
-        //   This case used to be supported...is it not in the schema?
-    //    case  TCKind::tk_Object)
-    //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
+        case  TCKind::tk_octet_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
+          break;
+
+        case  TCKind::tk_string_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+          break;
+
+        case  TCKind::tk_longlong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
+          break;
+
+        case  TCKind::tk_ulonglong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
+          break;
+
+        case  TCKind::tk_longdouble_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
+          break;
+
+        case  TCKind::tk_wchar_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
+          break;
+
+        case  TCKind::tk_wstring_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+          break;
+
+        case  TCKind::tk_any_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
+          break;
+
+        case  TCKind::tk_TypeCode_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
+          break;
+
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
+          throw 1;
+        }
+
+      //   This case used to be supported...is it not in the schema?
+      //    case  TCKind::tk_Object)
+      //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
 
     }
 
     DataType
     DataType_Handler::data_type (
-                      const CORBA::TypeCode_ptr&  src)
+                                 const CORBA::TypeCode_ptr&  src)
     {
-              
-        switch (src->kind ())
-          {
-          case ::CORBA::tk_null:
-            return DataType ( (TCKind::tk_null));
-            break;
-          case CORBA::tk_short:
-            return DataType ( (TCKind::tk_short));
-            break;
-          case CORBA::tk_long:
-            return DataType ( (TCKind::tk_long));
-            break;
-          case CORBA::tk_ushort:
-            return DataType ( (TCKind::tk_ushort));
-            break;
-          case CORBA::tk_ulong:
-            return DataType ( (TCKind::tk_ulong));
-            break;
-          case CORBA::tk_float:
-            return DataType ( (TCKind::tk_float));
-            break;
-          case CORBA::tk_double:
-            return DataType ( (TCKind::tk_double));
-            break;
-          case CORBA::tk_boolean:
-            return DataType ( (TCKind::tk_boolean));
-            break;
-          case CORBA::tk_char:
-            return DataType ( (TCKind::tk_char));
-            break;
-          case CORBA::tk_octet:
-            return DataType ( (TCKind::tk_octet));
-            break;
-          case CORBA::tk_string:
-            return DataType ( (TCKind::tk_string));
-            break;
-          case CORBA::tk_longlong:
-            return DataType ( (TCKind::tk_longlong));
-            break;
-          case CORBA::tk_ulonglong:
-            return DataType ( (TCKind::tk_ulonglong));
-            break;
-          case CORBA::tk_longdouble:
-            return DataType ( (TCKind::tk_longdouble));
-            break;
-          case CORBA::tk_wchar:
-            return DataType ( (TCKind::tk_wchar));
-            break;
-          case CORBA::tk_wstring:
-            return DataType ( (TCKind::tk_wstring));
-            break;
-          case CORBA::tk_any:
-            return DataType ( (TCKind::tk_any));
-            break;
-          case CORBA::tk_TypeCode:
-            return DataType ( (TCKind::tk_TypeCode));
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
-            throw 1;
-          }
-        
-        
+      CIAO_TRACE("DataType_Handler::data_type - reverse");
+      switch (src->kind ())
+        {
+        case ::CORBA::tk_null:
+          return DataType ( (TCKind::tk_null));
+          break;
+        case CORBA::tk_short:
+          return DataType ( (TCKind::tk_short));
+          break;
+        case CORBA::tk_long:
+          return DataType ( (TCKind::tk_long));
+          break;
+        case CORBA::tk_ushort:
+          return DataType ( (TCKind::tk_ushort));
+          break;
+        case CORBA::tk_ulong:
+          return DataType ( (TCKind::tk_ulong));
+          break;
+        case CORBA::tk_float:
+          return DataType ( (TCKind::tk_float));
+          break;
+        case CORBA::tk_double:
+          return DataType ( (TCKind::tk_double));
+          break;
+        case CORBA::tk_boolean:
+          return DataType ( (TCKind::tk_boolean));
+          break;
+        case CORBA::tk_char:
+          return DataType ( (TCKind::tk_char));
+          break;
+        case CORBA::tk_octet:
+          return DataType ( (TCKind::tk_octet));
+          break;
+        case CORBA::tk_string:
+          return DataType ( (TCKind::tk_string));
+          break;
+        case CORBA::tk_longlong:
+          return DataType ( (TCKind::tk_longlong));
+          break;
+        case CORBA::tk_ulonglong:
+          return DataType ( (TCKind::tk_ulonglong));
+          break;
+        case CORBA::tk_longdouble:
+          return DataType ( (TCKind::tk_longdouble));
+          break;
+        case CORBA::tk_wchar:
+          return DataType ( (TCKind::tk_wchar));
+          break;
+        case CORBA::tk_wstring:
+          return DataType ( (TCKind::tk_wstring));
+          break;
+        case CORBA::tk_any:
+          return DataType ( (TCKind::tk_any));
+          break;
+        case CORBA::tk_TypeCode:
+          return DataType ( (TCKind::tk_TypeCode));
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
+          throw 1;
+        }
+
     }
 
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
index eda2375fcee..97d512f2300 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
@@ -1,59 +1,61 @@
 //================================================
 /**
- *  @file  DataType_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  DataType_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef DATATYPE_HANDLER_H
 #define DATATYPE_HANDLER_H
 
 #include /**/ "ace/pre.h"
-                                                                                
+
 #include "ciao/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
-             
-                                                                                
+
+#include "Config_Handlers_Export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
 namespace CIAO{
-    
-  namespace Config_Handlers{
-
-  /*
-   * @class DataType_Handler
-   * 
-   * @brief Handler class for <ComponentPortDescription> types.
-   * 
-   * This class defines handler methods to map values from 
-   * XSC objects, parsed from the descriptor files, to the
-   * corresponding CORBA IDL type for the schema element.
-   * 
-   */
-
-   class DataType_Handler{
- 
-    public:
-       
-      DataType_Handler (void);
-      virtual ~DataType_Handler (void);
-              
-      ////This method takes a <CIAO::Config_Handlers::DataType>
-      ///and returns the corresponding CORBA::TypeCode.
-      static void
-      data_type (CORBA::TypeCode_ptr& type,
-                    const DataType& desc);
-
-      static DataType data_type (const CORBA::TypeCode_ptr& type);
-    };
-
- }
+
+namespace Config_Handlers{
+
+/*
+* @class DataType_Handler
+*
+* @brief Handler class for <ComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export DataType_Handler {
+
+public:
+
+DataType_Handler (void);
+virtual ~DataType_Handler (void);
+
+////This method takes a <CIAO::Config_Handlers::DataType>
+///and returns the corresponding CORBA::TypeCode.
+static void
+data_type (const DataType& desc,
+CORBA::TypeCode_ptr& type);
+
+
+static DataType data_type (const CORBA::TypeCode_ptr& type);
+};
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.cpp b/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
index 3e4e5bd8497..3d4ddb419c0 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "Deployment.hpp"
 
 namespace CIAO
@@ -34,15 +34,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 +50,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 +66,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 +82,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 +98,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 +114,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 +130,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 +146,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 +201,39 @@ 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 ::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::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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -247,51 +247,51 @@ 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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -305,34 +305,34 @@ 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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -346,35 +346,35 @@ 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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -388,59 +388,61 @@ 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::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      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::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -454,59 +456,61 @@ 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::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      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::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -520,60 +524,61 @@ 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 ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      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::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -587,61 +592,62 @@ 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 ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      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::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      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::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 >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
index d58335dfcb6..6c6cea3596f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,9 +24,9 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include <memory>
@@ -44,115 +41,113 @@ namespace CIAO
 
 #include "cdp.hpp"
 
-#include "pcd.hpp"
-
 #include "toplevel.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::Domain
-    domain (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription
-    implementationArtifactDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription
-    componentInterfaceDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentImplementationDescription
-    componentImplementationDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentPackageDescription
-    componentPackageDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::PackageConfiguration
-    packageConfiguration (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::TopLevelPackageDescription
-    topLevelPackageDescription (xercesc::DOMDocument const*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::Domain
+domain (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::DeploymentPlan
+deploymentPlan (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ImplementationArtifactDescription
+implementationArtifactDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentInterfaceDescription
+componentInterfaceDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentImplementationDescription
+componentImplementationDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentPackageDescription
+componentPackageDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::PackageConfiguration
+packageConfiguration (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::TopLevelPackageDescription
+topLevelPackageDescription (xercesc::DOMDocument const*);
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Writer
+{
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    void
-    domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+void
+domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
+}
 }
 
 #endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 52ecb06e220..050f0307344 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -23,13 +23,13 @@ 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].in ()));
+                        Dump_Obj::indent(), str_seq[i]));
           }
       }
   }
 
   // Dumps a string
-  void DnC_Dump::dump (const char* caption, const TAO_String_Manager& str)
+  void DnC_Dump::dump (const char* caption, const TAO::String_Manager& str)
   {
     ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(),
                 caption, str.in()));
@@ -101,15 +101,15 @@ namespace Deployment
 
 #if (_MSC_VER > 1200)
     dump_ref_seq<Deployment::Domain> (
-      "sharedResourceRef",
-      node.sharedResourceRef, "Domain",
-      &Domain::sharedResource);
+                                      "sharedResourceRef",
+                                      node.sharedResourceRef, "Domain",
+                                      &Domain::sharedResource);
 
     dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      node.connectionRef,
-      "Domain",
-      &Domain::interconnect);
+                                      "connectionRef",
+                                      node.connectionRef,
+                                      "Domain",
+                                      &Domain::interconnect);
 #endif /* _MSC_VER */
     dump_sequence ("resource",
                    node.resource);
@@ -125,16 +125,16 @@ namespace Deployment
 
 #if (_MSC_VER > 1200)
     dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      conn.connectionRef,
-      "Domain",
-      &Domain::bridge);
+                                      "connectionRef",
+                                      conn.connectionRef,
+                                      "Domain",
+                                      &Domain::bridge);
 
     dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      conn.connectRef,
-      "Domain",
-      &Domain::node);
+                                      "connectRef",
+                                      conn.connectRef,
+                                      "Domain",
+                                      &Domain::node);
 #endif /*_MSC_VER*/
 
     dump_sequence ("resource",
@@ -151,10 +151,10 @@ namespace Deployment
 #if (_MSC_VER > 1200)
 
     dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      bridge.connectRef,
-      "Domain",
-      &Domain::interconnect);
+                                      "connectRef",
+                                      bridge.connectRef,
+                                      "Domain",
+                                      &Domain::interconnect);
 #endif /*_MSC_VER*/
 
     dump_sequence ("resource", bridge.resource);
@@ -189,7 +189,7 @@ namespace Deployment
   // ComponentPortDescription
 
   void DnC_Dump::dump (const ::Deployment::ComponentPortDescription
-                         &compportdesc)
+                       &compportdesc)
   {
     Dump_Obj dump_obj("ComponentPortDescription");
 
@@ -209,6 +209,7 @@ namespace Deployment
     case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
     case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
     case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
+    default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind\n")); break;
     }
   }
 
@@ -333,7 +334,7 @@ namespace Deployment
     dump ("requirementName", irdd.requirementName);
     dump ("resourceName", irdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (irdd.resourceValue);
+    dump_sequence ("property",  irdd.property);
   }
 
   // InstanceDeploymentDescription
@@ -382,6 +383,7 @@ namespace Deployment
     case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
     case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
     case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
+    default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind\n")); break;
     }
 #if (_MSC_VER > 1200)
     dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef,
@@ -409,7 +411,7 @@ namespace Deployment
     dump ("requirementName", crdd.requirementName);
     dump ("resourceName", crdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (crdd.resourceValue);
+    dump_sequence ("properties", crdd.property);
   }
 
   // PlanConnectionDescription
@@ -472,7 +474,7 @@ namespace Deployment
     dump ("requirementName", rdd.requirementName);
     dump ("resourceName", rdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (rdd.resourceValue);
+    dump_sequence ("properties", rdd.property);
   }
 
   // ArtifactDeploymentDescription
@@ -528,10 +530,10 @@ namespace Deployment
     Dump_Obj dump_obj("SubcomponentInstantiationDescription");
 
     dump ("name", sid.name);
-    dump_sequence ("package", sid.package);
+    //    dump_sequence ("basePackage", sid.package);
     dump_sequence ("configProperty", sid.configProperty);
     dump_sequence ("selectRequirement", sid.selectRequirement);
-    dump_sequence ("reference", sid.reference);
+    //    dump_sequence ("reference", sid.reference);
   }
 
   // SubcomponentPortEndpoint
@@ -652,11 +654,11 @@ namespace Deployment
   // MonolithicImplementationDescription
 
   void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription
-                         &mid)
+                       &mid)
   {
     Dump_Obj dump_obj("MonolithicImplementationDescription");
 
-    dump_sequence ("execParameter", mid.execParameter);
+    //    dump_sequence ("execParameter", mid.execParameter);
     dump_sequence ("primaryArtifact", mid.primaryArtifact);
     dump_sequence ("deployRequirement", mid.deployRequirement);
   }
@@ -675,7 +677,7 @@ namespace Deployment
   // ComponentImplementationDescription
 
   void DnC_Dump::dump (
-        const ::Deployment::ComponentImplementationDescription &cid)
+                       const ::Deployment::ComponentImplementationDescription &cid)
   {
     Dump_Obj dump_obj("ComponentImplementationDescription");
 
@@ -706,7 +708,7 @@ namespace Deployment
   // ComponentPackageDescription
 
   void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription
-                         &comppkgdesc)
+                       &comppkgdesc)
   {
     Dump_Obj dump_obj("ComponentPackageDescription");
 
@@ -766,7 +768,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\
-                                  encoded different type"));
+encoded different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -788,7 +790,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -802,7 +804,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\
-                                   encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
@@ -816,7 +818,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
@@ -830,7 +832,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
@@ -843,7 +845,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
@@ -856,7 +858,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_boolean (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
 
@@ -873,7 +875,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_char (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
@@ -887,7 +889,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_octet (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -901,7 +903,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
@@ -914,7 +916,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
@@ -928,7 +930,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -942,7 +944,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_wchar (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
@@ -956,7 +958,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
index e4fbf255f21..d80d4a4af15 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  DnC_Dump.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  DnC_Dump.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef DNC_DUMP_H
@@ -22,130 +22,130 @@
 
 namespace Deployment
 {
-  /**
-   * @class DnC_Dump
-   *
-   * @brief This class defines a set of overloaded "dump" methods to print
-   * the contents of various IDL data types, which passed as input.
-   */
-  class Config_Handlers_Export DnC_Dump
-  {
-  public:
-    /// Dump functions for CORBA sequences
-    static void dump (const char* caption,
-                      const ::CORBA::StringSeq &str_seq);
+/**
+* @class DnC_Dump
+*
+* @brief This class defines a set of overloaded "dump" methods to print
+* the contents of various IDL data types, which passed as input.
+*/
+class Config_Handlers_Export DnC_Dump
+{
+public:
+/// Dump functions for CORBA sequences
+static void dump (const char* caption,
+const ::CORBA::StringSeq &str_seq);
 
-    static void dump (const char* caption, const TAO_String_Manager& str);
+static void dump (const char* caption, const TAO::String_Manager& str);
 
-    static void dump (const char* caption, const CORBA::Boolean& val);
+static void dump (const char* caption, const CORBA::Boolean& val);
 
-    /// A whole slew of overloaded dump routines for different IDL
-    /// data types.
+/// A whole slew of overloaded dump routines for different IDL
+/// data types.
 
-    static void dump(const Deployment::SatisfierProperty &sp);
+static void dump(const Deployment::SatisfierProperty &sp);
 
-    static void dump (const Deployment::SharedResource& sr);
+static void dump (const Deployment::SharedResource& sr);
 
-    static void dump (const Deployment::Node& node);
+static void dump (const Deployment::Node& node);
 
-    static void dump (const Deployment::Resource& resource);
+static void dump (const Deployment::Resource& resource);
 
-    static void dump (const Deployment::Interconnect& conn);
+static void dump (const Deployment::Interconnect& conn);
 
-    static void dump (const Deployment::Bridge& bridge);
+static void dump (const Deployment::Bridge& bridge);
 
-    static void dump (const ::Deployment::Property &property);
+static void dump (const ::Deployment::Property &property);
 
-    static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
+static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
 
-    static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
+static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
 
-    static void dump (const ::Deployment::ComponentPackageDescription
-                      &comppkgdesc);
+static void dump (const ::Deployment::ComponentPackageDescription
+&comppkgdesc);
 
-    static void dump (const ::Deployment::ComponentPortDescription
-                      &compportdesc);
+static void dump (const ::Deployment::ComponentPortDescription
+&compportdesc);
 
-    static void dump (const ::Deployment::ComponentPropertyDescription
-                      &comppropdesc);
+static void dump (const ::Deployment::ComponentPropertyDescription
+&comppropdesc);
 
-    static void dump (const ::Deployment::MonolithicImplementationDescription
-                      &mid);
+static void dump (const ::Deployment::MonolithicImplementationDescription
+&mid);
 
-    static void dump (const ::Deployment::PackageConfiguration &pc);
+static void dump (const ::Deployment::PackageConfiguration &pc);
 
-    static void dump (const ::Deployment::PackagedComponentImplementation
-                      &pci);
+static void dump (const ::Deployment::PackagedComponentImplementation
+&pci);
 
-    static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
+static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
 
-    static void dump (const ::Deployment::Requirement &requirement);
+static void dump (const ::Deployment::Requirement &requirement);
 
-    static void dump (const ::Deployment::ComponentExternalPortEndpoint
-                      &cepe);
+static void dump (const ::Deployment::ComponentExternalPortEndpoint
+&cepe);
 
-    static void dump (const ::Deployment::ComponentPackageReference &cpr);
+static void dump (const ::Deployment::ComponentPackageReference &cpr);
 
-    static void dump (const ::Deployment::ComponentImplementationDescription
-                             &cid);
+static void dump (const ::Deployment::ComponentImplementationDescription
+&cid);
 
-    static void dump (const ::Deployment::SubcomponentInstantiationDescription
-                             &sid);
+static void dump (const ::Deployment::SubcomponentInstantiationDescription
+&sid);
 
-    static void dump (const ::Deployment::NamedImplementationArtifact
-                      &named_implementation);
+static void dump (const ::Deployment::NamedImplementationArtifact
+&named_implementation);
 
-    static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
+static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
 
-    static void dump (const ::Deployment::SubcomponentPropertyReference
-                      &scpr);
+static void dump (const ::Deployment::SubcomponentPropertyReference
+&scpr);
 
-    static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
+static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
 
-    static void dump (const ::Deployment::Domain &domain);
+static void dump (const ::Deployment::Domain &domain);
 
-    static void dump (const ::Deployment::Capability &capability);
+static void dump (const ::Deployment::Capability &capability);
 
-    static void dump (const ::Deployment::ImplementationArtifactDescription
-                             &iad);
+static void dump (const ::Deployment::ImplementationArtifactDescription
+&iad);
 
-    static void dump (const ::Deployment::ImplementationRequirement &ir);
+static void dump (const ::Deployment::ImplementationRequirement &ir);
 
-    static void dump(const Deployment::ResourceUsageKind &ruk);
+static void dump(const Deployment::ResourceUsageKind &ruk);
 
-    static void dump(const Deployment::DeploymentPlan &plan);
+static void dump(const Deployment::DeploymentPlan &plan);
 
-    static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
+static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
 
-    static void dump(const Deployment::InstanceDeploymentDescription &idd);
+static void dump(const Deployment::InstanceDeploymentDescription &idd);
 
-    static void dump(const Deployment::PlanConnectionDescription &pcd);
+static void dump(const Deployment::PlanConnectionDescription &pcd);
 
-    static void dump(const Deployment::PlanPropertyMapping &ppm);
+static void dump(const Deployment::PlanPropertyMapping &ppm);
 
-    static void dump(const Deployment::ImplementationDependency &id);
+static void dump(const Deployment::ImplementationDependency &id);
 
-    static void dump(const Deployment::ArtifactDeploymentDescription &add);
+static void dump(const Deployment::ArtifactDeploymentDescription &add);
 
-    static void dump(const Deployment::InstanceResourceDeploymentDescription
-                     &irdd);
+static void dump(const Deployment::InstanceResourceDeploymentDescription
+&irdd);
 
-    static void dump(const PlanSubcomponentPortEndpoint &pspe);
+static void dump(const PlanSubcomponentPortEndpoint &pspe);
 
-    static void dump(const ConnectionResourceDeploymentDescription &crdd);
+static void dump(const ConnectionResourceDeploymentDescription &crdd);
 
-    static void dump(const PlanSubcomponentPropertyReference &pspr);
+static void dump(const PlanSubcomponentPropertyReference &pspr);
 
-    static void dump(const ResourceDeploymentDescription &rdd);
+static void dump(const ResourceDeploymentDescription &rdd);
 
-    static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
+static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
 
-    static void dump (const Deployment::RequirementSatisfier& rs);
+static void dump (const Deployment::RequirementSatisfier& rs);
 
-  private:
-    static void dump (const ::CORBA::Any &any);
-    // Helper function to print an Any
-  };
+private:
+static void dump (const ::CORBA::Any &any);
+// Helper function to print an Any
+};
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
index dff9365ceb7..6dd83b18989 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
@@ -8,83 +8,83 @@
 ACE_RCSID (Config_Handlers,
            DnC_Dump_T,
            "$Id$")
-namespace Deployment
-{
-  namespace DnC_Dump_T
+  namespace Deployment
   {
-    // Dumps a reference
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref (const char* caption, REFERENCE& ref,
-              const char* root, DATA_TYPE CLASS::*data)
+    namespace DnC_Dump_T
     {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                  Dump_Obj::indent(), caption));
+      // Dumps a reference
+      template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
+                typename CLASS>
+      void
+      dump_ref (const char* caption, REFERENCE& ref,
+                const char* root, DATA_TYPE CLASS::*data)
+      {
+        ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
+                    Dump_Obj::indent(), caption));
 
-      const CORBA::Any &val = Dump_Obj::desc (root);
+        const CORBA::Any &val = Dump_Obj::desc (root);
 
-      ROOT *t = 0;
+        ROOT *t = 0;
 
-      val >>= t;
+        val >>= t;
 
-      const ROOT &root_obj = *t;
+        const ROOT &root_obj = *t;
 
-      int value = ref;
-      ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
-                  Dump_Obj::indent(), caption,
-                  (root_obj.*data)[value].name.in()));
-    }
+        int value = ref;
+        ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
+                    Dump_Obj::indent(), caption,
+                    (root_obj.*data)[value].name.in()));
+      }
 
-    // Dumps a reference sequence
-    template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref_seq (const char* caption, SEQUENCE& seq, 
-                  const char* root, DATA_TYPE CLASS::*data)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s%s:\n",
-                  Dump_Obj::indent(), caption));
+      // Dumps a reference sequence
+      template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
+                typename CLASS>
+      void
+      dump_ref_seq (const char* caption, SEQUENCE& seq,
+                    const char* root, DATA_TYPE CLASS::*data)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s%s:\n",
+                    Dump_Obj::indent(), caption));
 
-      CORBA::Any val;
-      val <<= root;
+        CORBA::Any val;
+        val <<= root;
 
-      for (size_t i = 0; i < seq.length(); ++i)
-        {
-          const CORBA::Any &val = Dump_Obj::desc (root);
+        for (size_t i = 0; i < seq.length(); ++i)
+          {
+            const CORBA::Any &val = Dump_Obj::desc (root);
 
-          ROOT *t = 0;
+            ROOT *t = 0;
 
-          val >>= t;
+            val >>= t;
 
-          const ROOT &root_obj = *t;
-          int value = seq[i];
-          ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
-                      Dump_Obj::indent(), caption, i,
-                      (root_obj.*data)[value].name.in()));
-        }
-    }
+            const ROOT &root_obj = *t;
+            int value = seq[i];
+            ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
+                        Dump_Obj::indent(), caption, i,
+                        (root_obj.*data)[value].name.in()));
+          }
+      }
 
-    // Dumps a sequence
-    template <typename SEQUENCE>
-    void
-    dump_sequence (const char* caption, const SEQUENCE &seq)
-    {
-      CORBA::ULong size = seq.length ();
+      // Dumps a sequence
+      template <typename SEQUENCE>
+      void
+      dump_sequence (const char* caption, const SEQUENCE &seq)
+      {
+        CORBA::ULong size = seq.length ();
 
-      if (size != 0)
-        {
-          Dump_Obj dump_obj(caption);
+        if (size != 0)
+          {
+            Dump_Obj dump_obj(caption);
 
-          for (CORBA::ULong i = 0; i < size; ++i)
-            {
-              ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
-                          caption, i));
-              DnC_Dump::dump (seq[i]);
-            }
-        }
+            for (CORBA::ULong i = 0; i < size; ++i)
+              {
+                ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
+                            caption, i));
+                DnC_Dump::dump (seq[i]);
+              }
+          }
+      }
     }
   }
-}
 #endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
index 80ce883fb87..88a5c55f3cd 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  DnC_Dump_T.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  DnC_Dump_T.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DNC_DUMP_T_H
@@ -20,21 +20,21 @@
 
 namespace Deployment
 {
-  namespace DnC_Dump_T
-  {
-    template <typename SEQUENCE>
-    static void dump_sequence (const char* caption, const SEQUENCE &seq);
-
-    template <typename ROOT, typename SEQUENCE,
-              typename DATA_TYPE, typename CLASS>
-    static void dump_ref_seq (const char* caption, SEQUENCE& seq,
-                              const char* root, DATA_TYPE CLASS::*data);
-
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    static void dump_ref (const char* caption, REFERENCE& ref,
-                          const char* root, DATA_TYPE CLASS::*data);
-  }
+namespace DnC_Dump_T
+{
+template <typename SEQUENCE>
+void dump_sequence (const char* caption, const SEQUENCE &seq);
+
+template <typename ROOT, typename SEQUENCE,
+typename DATA_TYPE, typename CLASS>
+void dump_ref_seq (const char* caption, SEQUENCE& seq,
+const char* root, DATA_TYPE CLASS::*data);
+
+template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
+typename CLASS>
+void dump_ref (const char* caption, REFERENCE& ref,
+const char* root, DATA_TYPE CLASS::*data);
+}
 }
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
index 18dde6aa39f..3caf5440e9b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
@@ -5,60 +5,60 @@ ACE_RCSID (Config_Handlers,
            Dump_Obj,
            "$Id$")
 
-namespace Deployment
-{
-  // static member initialization
-  std::string Dump_Obj::indent_ = "-";
-  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-  Dump_Obj::Dump_Obj(const char* caption)
-    : desc_()
+  namespace Deployment
   {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-    indent_.append("  ");
-  }
+    // static member initialization
+    std::string Dump_Obj::indent_ = "-";
+    std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
 
+    Dump_Obj::Dump_Obj(const char* caption)
+      : desc_()
+    {
+      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
+      indent_.append("  ");
+    }
 
-  Dump_Obj::Dump_Obj(const char* caption,
-                     CORBA::Any &val)
-    : desc_(caption)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                indent_.c_str(),
-                caption));
 
-    indent_.append("   ");
+    Dump_Obj::Dump_Obj(const char* caption,
+                       CORBA::Any &val)
+      : desc_(caption)
+    {
+      ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
+                  indent_.c_str(),
+                  caption));
 
-    if (desc_map_.find (std::string (caption)) != desc_map_.end())
-      {
-        ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                      The item with name %s is already in \
-                      the node map.\n", caption));
-        throw Node_Exist();
-      }
-    else
-      {
-        desc_map_[std::string(caption)] = val;
-      }
-  }
+      indent_.append("   ");
 
-  Dump_Obj::~Dump_Obj()
-  {
-    indent_.erase(indent_.size() - 2, 2);
-    if (desc_.size() != 0)
-      {
-        if (desc_map_.find(desc_) != desc_map_.end())
-          {
-            desc_map_.erase(desc_map_.find(desc_));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                          The item with name %s is not in the node map.\n",
-                        desc_.c_str()));
-            throw Node_Not_Exist();
-          }
-      }
-  }
+      if (desc_map_.find (std::string (caption)) != desc_map_.end())
+        {
+          ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+The item with name %s is already in \
+the node map.\n", caption));
+          throw Node_Exist();
+        }
+      else
+        {
+          desc_map_[std::string(caption)] = val;
+        }
+    }
 
-}
+    Dump_Obj::~Dump_Obj()
+    {
+      indent_.erase(indent_.size() - 2, 2);
+      if (desc_.size() != 0)
+        {
+          if (desc_map_.find(desc_) != desc_map_.end())
+            {
+              desc_map_.erase(desc_map_.find(desc_));
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+The item with name %s is not in the node map.\n",
+                          desc_.c_str()));
+              throw Node_Not_Exist();
+            }
+        }
+    }
+
+  }
diff --git a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
index 954fea46aa7..d8e90351ad1 100644
--- a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
+++ b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  Dump_Obj.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  Dump_Obj.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef CIAO_DUMP_OBJ_H
@@ -24,52 +24,52 @@
 
 namespace Deployment
 {
-  /*
-   *  @brief class Dump_Obj handles the indentation and keeps a map of
-   * structures for reference look-up.
-   */
-  class Config_Handlers_Export Dump_Obj
-  {
-  public:
-    /// Exception thrown when there is a node with the same name in the
-    /// map
-    class Node_Exist { };
+/*
+*  @brief class Dump_Obj handles the indentation and keeps a map of
+* structures for reference look-up.
+*/
+class Config_Handlers_Export Dump_Obj
+{
+public:
+/// Exception thrown when there is a node with the same name in the
+/// map
+class Node_Exist { };
 
-    /// Exception thrown when there is no node with the name given in
-    /// the map
-    class Node_Not_Exist { };
+/// Exception thrown when there is no node with the name given in
+/// the map
+class Node_Not_Exist { };
 
-    /// Constructors prints out the caption and increases indent
-    Dump_Obj (const char *caption);
+/// Constructors prints out the caption and increases indent
+Dump_Obj (const char *caption);
 
-    /// Additionally insets <val> into the map
-    Dump_Obj (const char* caption,
-              CORBA::Any &val);
+/// Additionally insets <val> into the map
+Dump_Obj (const char* caption,
+CORBA::Any &val);
 
-    // Destructor
-    ~Dump_Obj (void);
-    // return the indent string
-    static const char* indent()
-    {
-      return indent_.c_str();
-    }
+// Destructor
+~Dump_Obj (void);
+// return the indent string
+static const char* indent()
+{
+return indent_.c_str();
+}
 
-    static CORBA::Any& desc(const char* caption)
-    {
-      return desc_map_[caption];
-    }
+static CORBA::Any& desc(const char* caption)
+{
+return desc_map_[caption];
+}
 
-  private:
-    // indent string
-    static std::string indent_;
+private:
+// indent string
+static std::string indent_;
 
-    // map for reference lookup
-    static std::map<std::string, CORBA::Any> desc_map_;
+// map for reference lookup
+static std::map<std::string, CORBA::Any> desc_map_;
 
-    // descriptor - used by destructor for deleting the
-    // correct descriptor from the map
-    std::string desc_;
-  };
+// descriptor - used by destructor for deleting the
+// correct descriptor from the map
+std::string desc_;
+};
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 601f9e8a746..60095581130 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,19 +1,19 @@
 // $Id$
 
-project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory {
-  after += XSC_XML_Handlers
-  libs += XSC_XML_Handlers
-  dynamicflags += DYNANY_HANDLER_BUILD_DLL
-  macros += XML_USE_PTHREADS
-  requires += exceptions
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
+project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory, ciao_client_dnc {
+after += XSC_XML_Handlers
+libs += XSC_XML_Handlers
+dynamicflags += DYNANY_HANDLER_BUILD_DLL
+macros += XML_USE_PTHREADS
+requires += exceptions
+includes += $(CIAO_ROOT)/tools/Config_Handlers
 
-  Source_Files {
-    DynAny_Handler/DynAny_Handler.cpp
-    DynAny_Handler/DynEnum_Handler.cpp
-  }
-  
-  Header_Files {
-    DynAny_Handler_Export.h
-  }
-}
\ No newline at end of file
+Source_Files {
+DynAny_Handler/DynAny_Handler.cpp
+DynAny_Handler/DynEnum_Handler.cpp
+}
+
+Header_Files {
+DynAny_Handler_Export.h
+}
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
index cfc8d657fca..77567e3739c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
@@ -21,86 +21,86 @@ namespace CIAO{
     {
 
         TCKind kind (desc.kind ());
-        
+
         switch (kind.integral ())
           {
           case  TCKind::tk_null_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-            
+
 
           case  TCKind::tk_short_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-            
+
 
           case  TCKind::tk_long_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-            
+
 
           case  TCKind::tk_ushort_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-            
+
 
           case  TCKind::tk_ulong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-            
+
 
           case  TCKind::tk_float_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-            
+
 
           case  TCKind::tk_double_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-            
+
 
           case  TCKind::tk_boolean_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-            
+
 
           case  TCKind::tk_char_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-            
+
 
           case  TCKind::tk_octet_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-            
+
 
           case  TCKind::tk_string_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-            
+
 
           case  TCKind::tk_longlong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-            
+
 
           case  TCKind::tk_ulonglong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-            
+
 
           case  TCKind::tk_longdouble_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-            
+
 
           case  TCKind::tk_wchar_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-            
+
 
           case  TCKind::tk_wstring_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-            
+
 
           case  TCKind::tk_any_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-            
+
 
           case  TCKind::tk_TypeCode_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-            
+
 
           default:
             ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
             throw 1;
           }
-        
+
         //   This case used to be supported...is it not in the schema?
     //    case  TCKind::tk_Object)
     //      return CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
@@ -112,7 +112,7 @@ namespace CIAO{
                       const CORBA::TypeCode_ptr&  src)
     {
         DataType type;
-        
+
         switch (src->kind ())
           {
           case ::CORBA::tk_null:
@@ -172,7 +172,7 @@ namespace CIAO{
             ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
             throw 1;
           }
-        
+
         return type;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
index eda2375fcee..c16b4b21fe3 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
@@ -12,38 +12,38 @@
 #define DATATYPE_HANDLER_H
 
 #include /**/ "ace/pre.h"
-                                                                                
+
 #include "ciao/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
-             
-                                                                                
+
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
 namespace CIAO{
-    
+
   namespace Config_Handlers{
 
   /*
    * @class DataType_Handler
-   * 
+   *
    * @brief Handler class for <ComponentPortDescription> types.
-   * 
-   * This class defines handler methods to map values from 
+   *
+   * This class defines handler methods to map values from
    * XSC objects, parsed from the descriptor files, to the
    * corresponding CORBA IDL type for the schema element.
-   * 
+   *
    */
 
    class DataType_Handler{
- 
+
     public:
-       
+
       DataType_Handler (void);
       virtual ~DataType_Handler (void);
-              
+
       ////This method takes a <CIAO::Config_Handlers::DataType>
       ///and returns the corresponding CORBA::TypeCode.
       static void
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 74d702e1bd9..64690ad61c1 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -10,8 +10,6 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    //    DynAny_Handler * DynAny_Handler::instance_ = 0;
-
     DynAny_Handler::DynAny_Handler (void) :
       orb_ (0),
       daf_ (0)
@@ -35,17 +33,6 @@ namespace CIAO
     {
     }
 
-    /*
-    DynAny_Handler *
-    DynAny_Handler::instance (void)
-    {
-      if (instance_ == 0)
-        instance_ = new DynAny_Handler (0, 0);
-
-      return instance_;
-    }
-    */
-
     CORBA::ORB_ptr
     DynAny_Handler::orb ()
     {
@@ -94,25 +81,11 @@ namespace CIAO
         case TCKind::tk_float_l:
           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_float);
           retval->insert_float (CORBA::Float (*value.begin_float ()));
-          /*
-#ifdef __BORLANDC__
-          CORBA::Float (static_cast < float & > (*value.begin_float_ ())));
-#else
-          CORBA::Float (static_cast < ::XMLSchema::float_ const& > (*value.begin_float_ ())));
-#endif
-          */
           break;
 
         case TCKind::tk_double_l:
           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_double);
           retval->insert_double (CORBA::Double (*value.begin_double ()));
-          /*
-#ifdef __BORLANDC__
-            CORBA::Double (static_cast < double &> (*value.begin_double_ ())));
-#else
-          CORBA::Double (static_cast < ::XMLSchema::double_ const& > (*value.begin_double_ ())));
-#endif
-          */
           break;
 
         case TCKind::tk_boolean_l:
@@ -146,8 +119,6 @@ namespace CIAO
           break;
 
          case TCKind::tk_longdouble_l:
-//           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_longdouble);
-//           retval->insert_longdouble (CORBA::LongDouble (*value.begin_longdouble ()));
            break;
 
         case TCKind::tk_wchar_l:
@@ -156,8 +127,6 @@ namespace CIAO
           break;
 
         case TCKind::tk_wstring_l:
-          //          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_wstring);
-          //retval->insert_wstring (CORBA::WString (*value.begin_string ().c_str ()));
           break;
 
         case TCKind::tk_enum_l:
@@ -190,10 +159,83 @@ namespace CIAO
       return retval._retn ();
     }
 
-          //    Any Any_Handler::get_any (const ::CORBA::Any& src)
-          //   {
-          //ACE_ERROR ((LM_ERROR, "Output of Anys not yet supported."));
-          // }
+    Any
+    DynAny_Handler::extract_from_dynany (const CORBA::Any &any)
+    {
+      DynamicAny::DynAny_var dyn = this->daf_->create_dyn_any (any);
+
+      DataValue val;
+
+      switch (dyn->type ()->kind ())
+        {
+        case CORBA::tk_short:
+          val.add_short (dyn->get_short ());
+          return Any (TCKind::tk_short, val);
+
+        case CORBA::tk_long:
+          val.add_long (dyn->get_long ());
+          return Any (TCKind::tk_long, val);
+
+        case CORBA::tk_ushort:
+          val.add_ushort (dyn->get_ushort ());
+          return Any (TCKind::tk_ushort, val);
+
+        case CORBA::tk_ulong:
+          val.add_ulong (dyn->get_ulong ());
+          return Any (TCKind::tk_ulong, val);
+
+        case CORBA::tk_float:
+          val.add_float (dyn->get_float ());
+          return Any (TCKind::tk_float, val);
+
+        case CORBA::tk_double:
+          val.add_double (dyn->get_double ());
+          return Any (TCKind::tk_double, val);
+
+        case CORBA::tk_boolean:
+          val.add_boolean (dyn->get_boolean ());
+          return Any (TCKind::tk_boolean, val);
+
+        case CORBA::tk_octet:
+          val.add_octet (dyn->get_octet ());
+          return Any (TCKind::tk_octet, val);
+
+        case CORBA::tk_string:
+          val.add_string (dyn->get_string ());
+          return Any (TCKind::tk_string, val);
+
+        case CORBA::tk_longlong:
+          val.add_longlong (dyn->get_longlong ());
+          return Any (TCKind::tk_longlong, val);
+
+        case CORBA::tk_ulonglong:
+          val.add_ulonglong (dyn->get_ulonglong ());
+          return Any (TCKind::tk_ulonglong, val);
+
+        case CORBA::tk_longdouble:
+          //          return Any (TCKind::tk_longdouble);
+          // @@MAJO: Need to add longdouble to schema.
+          //val.add_longdouble (dyn->get_longdouble ());
+
+        case CORBA::tk_wchar:
+          //          return Any (TCKind::tk_wchar);
+          // @@MAJO: Need to add wchar to schema
+          //          val.add_wchar (dyn->get_wchar ());
+        case CORBA::tk_char:
+          // return Any (TCKind::tk_char);
+          // @@MAJO: Need to add char into the schema.
+          //          val.add_char (dyn->get_char ());
+
+        case CORBA::tk_wstring:
+        case CORBA::tk_any:
+        case CORBA::tk_TypeCode:
+        case ::CORBA::tk_null:
+        default:
+          ACE_ERROR ((LM_ERROR, "DynAny_Handler: I have no idea how to perform a referse mapping.\n"));
+          throw 1;
+        }
+
+    }
   }
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
index af81ace52ff..a209b3eae2c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
@@ -29,7 +29,7 @@ namespace CIAO
     class Any;
     class DataType;
     class DataValue;
-    
+
     /**
     * @class Any_Handler
     *
@@ -46,26 +46,23 @@ namespace CIAO
       DynAny_Handler ();
 
       ~DynAny_Handler (void);
-      
-      //      static DynAny_Handler *instance ();
-      
+
       DynamicAny::DynAny_ptr  extract_into_dynany (const DataType& type,
                                                    const DataValue& value);
-      
-      //      Any get_any (const CORBA::Any &src);
-      
+
+      Any extract_from_dynany (const CORBA::Any &any);
+
       CORBA::ORB_ptr orb ();
-            
+
       DynamicAny::DynAnyFactory_ptr daf ();
-            
+
     private:
-      //      static DynAny_Handler *instance_;
-      
+
       CORBA::ORB_var orb_;
-      
+
       DynamicAny::DynAnyFactory_var daf_;
     };
-    
+
     typedef ACE_Singleton<DynAny_Handler, ACE_Null_Mutex> DynAny_Singleton;
     #define DYNANY_HANDLER DynAny_Singleton::instance()
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index 736a866cdc0..8773f7b9014 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -23,43 +23,43 @@ namespace CIAO
           ACE_ERROR ((LM_ERROR, "ERROR: Enum type descriptioin required"));
           throw 1;
         }
-      
+
       // Construct TypeCode for the enum
       CORBA::EnumMemberSeq members;
       members.length (type.enum_ ().count_member ());
       CORBA::ULong index (0);
-      
+
       for (EnumType::member_const_iterator i = type.enum_ ().begin_member ();
            i != type.enum_ ().end_member ();
            ++i)
         {
           members[index++] = i->c_str ();
         }
-      
+
       // Grab pointer to the DynAny_Handler to use the orb and any factory.
       //      DynAny_Handler *dah = DynAny_Handler::instance ();
-      
-      // @@ Leak this guy onto the heap to avoid a compile problem. 
-      CORBA::TypeCode_ptr tc = 
+
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
         DYNANY_HANDLER->orb ()->create_enum_tc (type.enum_ ().typeId ().c_str (),
                                      type.enum_ ().name ().c_str (),
                                      members);
-      
+
       ACE_ERROR ((LM_ERROR, "Type: %s \nName: %s\nvalue: %s\n",
                   type.enum_ ().typeId ().c_str (),
                   type.enum_ ().name ().c_str (),
                   value.begin_enum ()->c_str ()));
-      
+
       // Make the actual DynEnum
-      DynamicAny::DynAny_var temp =  
+      DynamicAny::DynAny_var temp =
         DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
       DynamicAny::DynEnum_var retval = DynamicAny::DynEnum::_narrow (temp.in ());
-      
+
       retval->set_as_string (value.begin_enum ()->c_str ());
 
       return retval._retn ();
     }
-    
+
     void
     DynEnum_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
     {
@@ -69,4 +69,4 @@ namespace CIAO
   }
 }
 
-    
+
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 9203b32ba58..f4cf96dfb3c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -1,6 +1,6 @@
 /**
  * $Id$
- * 
+ *
  * @file DynEnum_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
  */
@@ -25,7 +25,7 @@ namespace CIAO
     class Any;
     class DataType;
     class DataValue;
-    
+
     /**
      * @class DynEnum_Handler
      * @brief Translates enums specified in deployment plans into Dynamic Anys
@@ -36,14 +36,13 @@ namespace CIAO
     public:
       static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
                                                       const DataValue &value);
-      
+
       static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
     };
-    
+
   }
 }
 
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_CONFIG_HANDLERS_DYNENUM_HANDLER_H*/
-
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index 2f6de450d8c..200282aa792 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -3,16 +3,17 @@
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     ERE_Handler::external_ref_endpoints (
-        const PlanConnectionDescription &src,
-        Deployment::ExternalReferenceEndpoints &dest)
+                                         const PlanConnectionDescription &src,
+                                         Deployment::ExternalReferenceEndpoints &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoints");
       PlanConnectionDescription::externalReference_const_iterator erep_e =
         src.end_externalReference ();
 
@@ -30,17 +31,19 @@ namespace CIAO
 
     void
     ERE_Handler::external_ref_endpoint (
-        const ExternalReferenceEndpoint &src,
-        Deployment::ExternalReferenceEndpoint &dest)
+                                        const ExternalReferenceEndpoint &src,
+                                        Deployment::ExternalReferenceEndpoint &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint");
       dest.location =
         src.location ().c_str ();
     }
-   
-    ExternalReferenceEndpoint 
+
+    ExternalReferenceEndpoint
     ERE_Handler::external_ref_endpoint (
-        const Deployment::ExternalReferenceEndpoint& src)
+                                        const Deployment::ExternalReferenceEndpoint& src)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint - reverse");
       XMLSchema::string< char > loc ((src.location));
       ExternalReferenceEndpoint erp (loc);
       return erp;
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
index 93671582bae..934e2273bf5 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ERE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ERE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ERE_HANDLER_H
@@ -18,46 +18,53 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Utils/Functors.h"
+
 namespace Deployment
 {
-  class ExternalReferenceEndpoints;
-  struct ExternalReferenceEndpoint;
+class ExternalReferenceEndpoints;
+struct ExternalReferenceEndpoint;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ExternalReferenceEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ExternalReferenceEndpoint;
+
+/*
+* @class ERE_Handler
+*
+* @brief Handler class for <ExternalReferenceEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ExternalReferenceEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export ERE_Handler
+{
+public:
+static void external_ref_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ExternalReferenceEndpoints &dest);
+
+static ExternalReferenceEndpoint external_ref_endpoint (
+const Deployment::ExternalReferenceEndpoint& src);
 
-   /*
-    * @class ERE_Handler
-    *
-    * @brief Handler class for <ExternalReferenceEndpoint> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ExternalReferenceEndpoint objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
+static void external_ref_endpoint (const ExternalReferenceEndpoint &src,
+Deployment::ExternalReferenceEndpoint &dest);
+};
 
-    class Config_Handlers_Export ERE_Handler
-    {
-    public:
-      static void external_ref_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ExternalReferenceEndpoints &dest);
-      
-      static ExternalReferenceEndpoint external_ref_endpoint (
-        const Deployment::ExternalReferenceEndpoint& src);
-    private:
-      static void external_ref_endpoint (
-        const ExternalReferenceEndpoint &src,
-        Deployment::ExternalReferenceEndpoint &dest);
-    };
-  }
+typedef Sequence_Handler < ExternalReferenceEndpoint,
+::Deployment::ExternalReferenceEndpoints,
+::Deployment::ExternalReferenceEndpoint,
+ERE_Handler::external_ref_endpoint > ERE_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 5f1978d41b9..4adedee7715 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/UUID.h"
 #include "IDD_Handler.h"
 #include "IRDD_Handler.h"
 #include "MDD_Handler.h"
@@ -17,13 +18,14 @@ namespace CIAO
 
     void
     IDD_Handler::instance_deployment_descrs (
-        const DeploymentPlan &src,
-        Deployment::InstanceDeploymentDescriptions& dest)
+                                             const DeploymentPlan &src,
+                                             Deployment::InstanceDeploymentDescriptions& dest)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descrs");
       DeploymentPlan::instance_const_iterator idd_e =
         src.end_instance ();
-      
+
       CORBA::ULong pos = 0;
       dest.length (src.count_instance ());
       for (DeploymentPlan::instance_const_iterator idd_b =
@@ -31,124 +33,125 @@ namespace CIAO
            idd_b != idd_e;
            ++idd_b)
         {
-	  IDD_Handler::instance_deployment_descr ((*idd_b),
-						  dest[pos], pos);
-	  pos++;
+          IDD_Handler::instance_deployment_descr ((*idd_b),
+                                                  dest[pos], pos);
+          pos++;
         }
     }
 
     void
     IDD_Handler::instance_deployment_descr (
-        const InstanceDeploymentDescription& src,
-        Deployment::InstanceDeploymentDescription& dest,
-        CORBA::ULong pos)
+                                            const InstanceDeploymentDescription& src,
+                                            Deployment::InstanceDeploymentDescription& dest,
+                                            CORBA::ULong pos)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr");
       try
-	{
-	  dest.name = src.name ().c_str ();
-	  dest.node = src.node ().c_str ();
-
-	  if (src.id_p ())
-	    {
-	      ACE_CString cstr (src.id ().c_str ());
-	      IDD_Handler::IDREF.bind_ref (cstr, pos);
-	    }
-	  else
-	    {
-	      ACE_DEBUG((LM_ERROR,
-			 "(%P|%t) Warning:  IDD %s has no idref \n",
-			 src.name ().c_str ()));
-	    }
-
-	  // We know there should be only one element
+        {
+          dest.name = src.name ().c_str ();
+          dest.node = src.node ().c_str ();
+
+          if (src.id_p ())
+            {
+              ACE_CString cstr (src.id ().c_str ());
+              IDD_Handler::IDREF.bind_ref (cstr, pos);
+            }
+          else
+            {
+              ACE_DEBUG((LM_ERROR,
+                         "(%P|%t) Warning:  IDD %s has no idref \n",
+                         src.name ().c_str ()));
+            }
+
+          // We know there should be only one element
           dest.source.length (1);
-	  dest.source [0] =
-	    src.source ().c_str ();
-
-	  CORBA::ULong tmp = 0;
-	  MDD_Handler::IDREF.find_ref 
-	    (ACE_CString (src.implementation ().id ().c_str ()), tmp);
-      
-	  dest.implementationRef = tmp;
-
-	  InstanceDeploymentDescription::configProperty_const_iterator pend =
-	    src.end_configProperty ();
-          
-          CORBA::ULong pos = 0;
+          dest.source [0] =
+            src.source ().c_str ();
+
+          CORBA::ULong tmp = 0;
+          MDD_Handler::IDREF.find_ref
+            (ACE_CString (src.implementation ().id ().c_str ()), tmp);
+
+          dest.implementationRef = tmp;
+
           dest.configProperty.length (src.count_configProperty ());
-	  for (InstanceDeploymentDescription::configProperty_const_iterator pstart =
-		 src.begin_configProperty ();
-	       pstart != pend;
-	       ++pstart)
-	    {
-	      Property_Handler::get_property (*pstart,
-					      dest.configProperty[pos++]);
-	    }
-
-	  if (src.deployedResource_p ())
-	    {
-	      dest.deployedResource.length (1);
-	      IRDD_Handler::instance_resource_deployment_descr (src.deployedResource (),
-							  dest.deployedResource[0]);
-	    }
-
-	  if (src.deployedSharedResource_p ())
-	    {
-	      dest.deployedSharedResource.length (1);
-	      IRDD_Handler::instance_resource_deployment_descr (src.deployedSharedResource (),
-								dest.deployedSharedResource[0]);
-	    }
-
-	}
+          std::for_each (src.begin_configProperty (),
+                         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]);
+            }
+
+          if (src.deployedSharedResource_p ())
+            {
+              dest.deployedSharedResource.length (1);
+              IRDD_Handler::instance_resource_deployment_descr (src.deployedSharedResource (),
+                                                                dest.deployedSharedResource[0]);
+            }
+
+        }
       catch (Config_Error &ex)
-	{
-	  ex.name_ = src.name ()  + ":" + ex.name_;
-	  throw ex;
-	}
+        {
+          ex.name_ = src.name ()  + ":" + ex.name_;
+          throw ex;
+        }
       // Done!
     }
- 
+
     InstanceDeploymentDescription
     IDD_Handler::instance_deployment_descr (
-	const Deployment::InstanceDeploymentDescription& src)
+                                            const Deployment::InstanceDeploymentDescription& src)
       throw (Config_Error)
     {
-	
-	//Get all the string/IDREFs
-	XMLSchema::string < ACE_TCHAR > name ((src.name));
-	XMLSchema::string < ACE_TCHAR > node ((src.node));
-	XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
-	ACE_CString temp;
-	MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
-	XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
-
-	// Instantiate the IDD
-	InstanceDeploymentDescription idd (name, node, source, implementation);
-
-	//Get and store the configProperty(s)
-	size_t total = src.configProperty.length();
-	for(size_t j = 0; j < total; j++)
-	{
-	    idd.add_configProperty(
-		Property_Handler::get_property (
-		    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]));
-
-	//Check if there is a deployedSharedResource, if so store it
-	if(src.deployedSharedResource.length() != 0)
-	    idd. deployedSharedResource(
-		IRDD_Handler::instance_resource_deployment_descr(
-		    src.deployedSharedResource[0]));
-
-	return idd;
-    }	
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse");
+      //Get all the string/IDREFs
+      XMLSchema::string < ACE_TCHAR > name ((src.name));
+      XMLSchema::string < ACE_TCHAR > node ((src.node));
+      XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
+      ACE_CString temp;
+      MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
+      XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
+
+      // Instantiate the IDD
+      InstanceDeploymentDescription idd (name, node, source, implementation);
+
+      //Get and store the configProperty(s)
+      size_t total = src.configProperty.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          idd.add_configProperty(
+                                 Property_Handler::get_property (
+                                                                 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]));
+
+      //Check if there is a deployedSharedResource, if so store it
+      if(src.deployedSharedResource.length() != 0)
+        idd. deployedSharedResource(IRDD_Handler::instance_resource_deployment_descr(src.deployedSharedResource[0]));
+
+      // Generate a UUID to use for the IDREF.
+      ACE_Utils::UUID uuid;
+      ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (uuid);
+      ACE_CString idd_id ("_");
+      idd_id += *uuid.to_string ();
+
+      XMLSchema::ID< ACE_TCHAR > xml_id (idd_id.c_str ());
+
+      // Bind the ref and set it in the IDD
+      IDD_Handler::IDREF.bind_next_available (idd_id);
+
+      idd.id (xml_id);
+
+      return idd;
+    }
 
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
index f21ea114f49..735038e2468 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  IDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  IDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_IDD_HANDLER_H
@@ -23,53 +23,53 @@
 
 namespace Deployment
 {
-  struct InstanceDeploymentDescription;
-  class InstanceDeploymentDescriptions;
-  struct InstanceResourceDeploymentDescription;
+struct InstanceDeploymentDescription;
+class InstanceDeploymentDescriptions;
+struct InstanceResourceDeploymentDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class InstanceDeploymentDescription;
-    class InstanceResourceDeploymentDescription;
+namespace Config_Handlers
+{
+class DeploymentPlan;
+class InstanceDeploymentDescription;
+class InstanceResourceDeploymentDescription;
+
+/*
+* @class IDD_Handler
+*
+* @brief Handler class for <InstanceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC InstanceDeploymentDescriptionn objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-   /*
-    * @class IDD_Handler
-    *
-    * @brief Handler class for <InstanceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC InstanceDeploymentDescriptionn objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
+class Config_Handlers_Export IDD_Handler
+{
+public:
+static void instance_deployment_descrs (
+const DeploymentPlan &src,
+::Deployment::InstanceDeploymentDescriptions& dest)
+throw (Config_Error);
 
-    class Config_Handlers_Export IDD_Handler
-    {
-    public:
-      static void instance_deployment_descrs (
-          const DeploymentPlan &src,
-          ::Deployment::InstanceDeploymentDescriptions& dest)
-	throw (Config_Error);
+static InstanceDeploymentDescription instance_deployment_descr (
+const Deployment::InstanceDeploymentDescription &src)
+throw (Config_Error);
 
-      static InstanceDeploymentDescription instance_deployment_descr (
-	  const Deployment::InstanceDeploymentDescription &src)
-	throw (Config_Error);
-      
-      static IDREF_Base<CORBA::ULong> IDREF;
+static IDREF_Base<CORBA::ULong> IDREF;
 
-    private:
-      static void instance_deployment_descr (
-          const InstanceDeploymentDescription &src,
-          ::Deployment::InstanceDeploymentDescription &dest,
-          CORBA::ULong pos)
-	throw (Config_Error);
+private:
+static void instance_deployment_descr (
+const InstanceDeploymentDescription &src,
+::Deployment::InstanceDeploymentDescription &dest,
+CORBA::ULong pos)
+throw (Config_Error);
 
-    };
-  }
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
index 88808bb4a6f..371c6fb85f8 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
@@ -1,7 +1,9 @@
 // $Id$
+
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
+#include "ciao/CIAO_common.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
@@ -10,68 +12,103 @@ ACE_RCSID (DAnCE,
            IDREF_Base,
            "$Id$")
 
- 
 namespace CIAO
-{
-  namespace Config_Handlers
   {
-    template <typename T>
-    void
-    IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
-      throw (Config_Error)
+    namespace Config_Handlers
     {
-      int retval =
-        idref_map_.bind (id, value);
+      template <typename T>
+      void
+      IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::bind_ref");
 
-      pos_map_.bind (value,id);
+        int retval =
+          idref_map_.bind (id, value);
 
-      if (retval < 0)
-        throw Config_Error (id.c_str (),
-			    "Failed to bind an IDRef.  This likely indicates a name clash.");
-    }
+        pos_map_.bind (value,id);
 
-    template <typename T>
-    void
-    IDREF_Base<T>::find_ref (const ACE_CString& id, T& val)
-      throw (Config_Error)
-    {
-      int retval =
-        idref_map_.find (id, val);
+        if (retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Failed to bind an IDRef.  This likely indicates a name clash.");
+      }
 
-      if (retval < 0)
-        throw Config_Error (id.c_str (),
-			    "Unable to look up an IDRef.");
-    }
+      template <typename T>
+      void
+      IDREF_Base<T>::bind_next_available (ACE_CString &id)
+      {
+        // Note:  For this function to compile and work properly,
+        // T must have the postincrement operator defined.
+        CIAO_TRACE ("IDREF_Base<T>::bind_next_available");
+        //      ACE_DEBUG ((LM_DEBUG, "**** Binding %s to %i\n",
+        //            id.c_str (),
+        //            this->next_));
 
-    template <typename T>
-    void
-    IDREF_Base<T>::find_ref (const T& value, ACE_CString& id)
-      throw (Config_Error)
-    {
-      int retval =
-        pos_map_.find (value, id);
+        int retval = idref_map_.bind (id, this->next_);
 
-      if (retval < 0)
-        throw Config_Error ("No location information",
-			    "Failed a reverse IDRef lookup.");
-    }
+        int pos_retval = pos_map_.bind (this->next_, id);
 
-    template <typename T>
-    bool
-    IDREF_Base<T>::unbind_refs (void)
-    {
-      int retval =
-        idref_map_.unbind_all ();
- 
-      pos_map_.unbind_all ();
-   
-      if (retval < 0)
-        return false;
-
-      return true;
+        ++this->next_;
+
+        if (retval < 0 || pos_retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Failed to bind an IDRef.  This likely indicates a name clash");
+
+      }
+
+      template <typename T>
+      void
+      IDREF_Base<T>::find_ref (const ACE_CString& id, T& val)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::find_ref(C_String, T)");
+
+        int retval =
+          idref_map_.find (id, val);
+
+        if (retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Unable to look up an IDRef.");
+      }
+
+      template <typename T>
+      void
+      IDREF_Base<T>::find_ref (const T& value, ACE_CString& id)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::find_ref (T, CString)");
+
+        int retval =
+          pos_map_.find (value, id);
+
+        //      ACE_DEBUG ((LM_ERROR, "**** Looking up value %i\n",
+        //            value));
+
+        if (retval < 0)
+          throw Config_Error ("No location information for reverse IDREF lookup",
+                              id.c_str ());
+      }
+
+      template <typename T>
+      bool
+      IDREF_Base<T>::unbind_refs (void)
+      {
+        CIAO_TRACE("IDREF_Base<T>::unbind_refs");
+
+        int retval =
+          idref_map_.unbind_all ();
+
+        pos_map_.unbind_all ();
+
+        this->next_ = 0;
+
+        if (retval < 0)
+          return false;
+
+        return true;
+      }
     }
-}
 
-}
+  }
 
 #endif /* IDREF_BASE_CPP */
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
index 6f29866c9ac..85f0d3a4f22 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
@@ -1,11 +1,11 @@
-/** 
- * $Id$
- * @file IDREF_Base.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * Defines the IDREF_Base class, which is an abstract class that serves
- * as a base for any config handler that must map IDREFS.  
- */
+/**
+* $Id$
+* @file IDREF_Base.h
+* @author Will Otte <wotte@dre.vanderbilt.edu>
+*
+* Defines the IDREF_Base class, which is an abstract class that serves
+* as a base for any config handler that must map IDREFS.
+*/
 
 #ifndef CIAO_CONFIG_HANDLERS_IDREF_BASE_H
 #define CIAO_CONFIG_HANDLERS_IDREF_BASE_H
@@ -24,53 +24,66 @@
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    
-    /**
-     * @class IDREF_Handler
-     * @brief Base class for any handler that must process idrefs.
-     *
-     */
-    template <typename T>
-    class IDREF_Base
-    {
-    public:
-      /// Bind an IDREF to an index
-      void bind_ref (ACE_CString& id, T value)
-	throw (Config_Error);
-  
-      /// Get the index associated with an IDREF
-      void find_ref (const ACE_CString& id, T& value)
-	throw (Config_Error);
-      
-      /// get the IDREF associated with an index
-      void find_ref (const T &value, ACE_CString& id)
-	throw (Config_Error);
-  
-      /// Unbind all IDREFS
-      bool
-      unbind_refs (void);
-
-      typedef ACE_Hash_Map_Manager<ACE_CString,
-                                   T,
-                                   ACE_Null_Mutex> IDREF_MAP;
-
-          
-      typedef ACE_Hash_Map_Manager<T,
-                                   ACE_CString,
-                                   ACE_Null_Mutex> POS_MAP;
-    protected:
-      /// The map used to store and look up the indexes of elements
-      /// referenced by their IDREF.
-      IDREF_MAP idref_map_;
-      /// The map used to store and look up the IDREFS of elements
-      /// referenced by their index.
-      POS_MAP pos_map_;
-    };
-    
-  }
-  
+namespace Config_Handlers
+{
+
+/**
+* @class IDREF_Handler
+* @brief Base class for any handler that must process idrefs.
+*
+*/
+template <typename T>
+class IDREF_Base
+{
+public:
+IDREF_Base ()
+{
+}
+
+IDREF_Base (T start_point)
+: next_ (start_point)
+{
+}
+
+/// Bind an IDREF to an index
+void bind_ref (ACE_CString& id, T value)
+throw (Config_Error);
+
+void bind_next_available (ACE_CString &id);
+
+/// Get the index associated with an IDREF
+void find_ref (const ACE_CString& id, T& value)
+throw (Config_Error);
+
+/// get the IDREF associated with an index
+void find_ref (const T &value, ACE_CString& id)
+throw (Config_Error);
+
+/// Unbind all IDREFS
+bool
+unbind_refs (void);
+
+typedef ACE_Hash_Map_Manager<ACE_CString,
+T,
+ACE_Null_Mutex> IDREF_MAP;
+
+
+typedef ACE_Hash_Map_Manager<T,
+ACE_CString,
+ACE_Null_Mutex> POS_MAP;
+protected:
+/// The map used to store and look up the indexes of elements
+/// referenced by their IDREF.
+IDREF_MAP idref_map_;
+/// The map used to store and look up the IDREFS of elements
+/// referenced by their index.
+POS_MAP pos_map_;
+
+T next_;
+};
+
+}
+
 }
 
 #include "IDREF_Base.cpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 664e4f46b3d..5d3cad169a6 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -19,18 +18,21 @@ namespace CIAO
 
 
     void
-    ID_Handler::get_ImplementationDependency (
-                    Deployment::ImplementationDependency& toconfig,
-                    const ImplementationDependency& desc)
+    ID_Handler::get_ImplementationDependency (const ImplementationDependency& desc,
+                                              Deployment::ImplementationDependency& toconfig)
     {
+
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency");
+      
       toconfig.requiredType=
-           CORBA::string_dup (desc.requiredType ().c_str ());
+        CORBA::string_dup (desc.requiredType ().c_str ());
     }
 
     ImplementationDependency
     ID_Handler::impl_dependency (
-        const ::Deployment::ImplementationDependency& src)
+                                 const ::Deployment::ImplementationDependency& src)
     {
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency - reverse");
       XMLSchema::string< char > reqtype ((src.requiredType));
 
       ImplementationDependency id (reqtype);
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.h b/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
index c800b31e0b3..bea6ec2b1a6 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
@@ -1,12 +1,12 @@
 
 //==============================================================
 /**
- *  @file  ID_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ID_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ID_Handler_H
@@ -16,6 +16,8 @@
 #include "Config_Handlers_Export.h"
 #include "ace/config-lite.h"
 
+#include "Utils/Functors.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -24,44 +26,52 @@
 
 namespace Deployment
 {
-  struct ImplementationDependency;
+struct ImplementationDependency;
+class ImplementationDependencies;
+
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-
-   class ImplementationDependency;
-
-
-   /*
-    * @class ID_Handler
-    *
-    * @brief Handler class for <ImplementationDependency> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ImplementationDependency objects, parsed from the descriptor files, to the
-    * corresponding CORBA IDL Any type.
-    *
-    */
-    class Config_Handlers_Export ID_Handler
-    {
-    public:
-
-      ID_Handler (void);
-      virtual ~ID_Handler (void);
-
-      static void get_ImplementationDependency (
-          Deployment::ImplementationDependency& toconfig,
-          const ImplementationDependency& desc);
-
-      static ImplementationDependency impl_dependency (
-          const ::Deployment::ImplementationDependency& src);
-    };
-  }
+namespace Config_Handlers
+{
+
+class ImplementationDependency;
+
+
+/*
+* @class ID_Handler
+*
+* @brief Handler class for <ImplementationDependency> types.
+*
+* This class defines handler methods to map values from
+* XSC ImplementationDependency objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL Any type.
+*
+*/
+class Config_Handlers_Export ID_Handler
+{
+public:
+
+ID_Handler (void);
+virtual ~ID_Handler (void);
+
+static void get_ImplementationDependency (
+const ImplementationDependency& desc,
+Deployment::ImplementationDependency& toconfig);
+
+static ImplementationDependency impl_dependency (
+const ::Deployment::ImplementationDependency& src);
+};
+
+typedef Sequence_Handler < ImplementationDependency,
+::Deployment::ImplementationDependencies,
+::Deployment::ImplementationDependency,
+ID_Handler::get_ImplementationDependency > ID_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 36ab6231001..34318ee8d4c 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -1,12 +1,10 @@
-
 // $Id$
 
-
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "Any_Handler.h"
-
+#include "Property_Handler.h"
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -25,90 +23,98 @@ namespace CIAO
 
     void
     IRDD_Handler::instance_resource_deployment_descr (
-                    const InstanceResourceDeploymentDescription& desc,
-                    Deployment::InstanceResourceDeploymentDescription& toconfig)
+                                                      const InstanceResourceDeploymentDescription& desc,
+                                                      Deployment::InstanceResourceDeploymentDescription& toconfig)
       throw (Config_Error)
     {
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr");
       
       switch (desc.resourceUsage ().integral ())
-	{
-	case ResourceUsageKind::None_l:
-	  toconfig.resourceUsage = Deployment::None;
-	  break;
-	  
-	case ResourceUsageKind::InstanceUsesResource_l:
-	  toconfig.resourceUsage = Deployment::InstanceUsesResource;
-	  break;
-	  
-	case ResourceUsageKind::ResourceUsesInstance_l:
-	  toconfig.resourceUsage = Deployment::ResourceUsesInstance;
-	  break;
-	  
-	case ResourceUsageKind::PortUsesResource_l:
-	  toconfig.resourceUsage = Deployment::PortUsesResource;
-	  break;
-	  
-	case ResourceUsageKind::ResourceUsesPort_l:
-	  toconfig.resourceUsage = Deployment::ResourceUsesPort;
-	  break;
-	  
-	default:
-	  throw Config_Error (desc.requirementName (),
-			      "Unknown ResourceUsageKind.");
-	  break;
-	}
-      
+        {
+        case ResourceUsageKind::None_l:
+          toconfig.resourceUsage = Deployment::None;
+          break;
+
+        case ResourceUsageKind::InstanceUsesResource_l:
+          toconfig.resourceUsage = Deployment::InstanceUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesInstance_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesInstance;
+          break;
+
+        case ResourceUsageKind::PortUsesResource_l:
+          toconfig.resourceUsage = Deployment::PortUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesPort_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesPort;
+          break;
+
+        default:
+          throw Config_Error (desc.requirementName (),
+                              "Unknown ResourceUsageKind.");
+          break;
+        }
+
       toconfig.requirementName = desc.requirementName ().c_str ();
-      
+
       toconfig.resourceName= desc.resourceName ().c_str ();
-      
-      Any_Handler::extract_into_any (desc.resourceValue (),
-				     toconfig.resourceValue);
-      
+
+      toconfig.property.length (desc.count_property ());
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
     }
 
     InstanceResourceDeploymentDescription
     IRDD_Handler::instance_resource_deployment_descr (
-      const Deployment::InstanceResourceDeploymentDescription& src)
+                                                      const Deployment::InstanceResourceDeploymentDescription& src)
       throw (Config_Error)
     {
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse");
+
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
-      
+
       InstanceResourceDeploymentDescription irdd (ResourceUsageKind::None,
-						  reqname,
-						  resname,
-						  resval);
-      
+                                                  reqname,
+                                                  resname);
+
       switch (src.resourceUsage)
-	{
-	case Deployment::None:
-	  irdd.resourceUsage (ResourceUsageKind::None);
-	  break;
-	  
-	case Deployment::InstanceUsesResource:
-	  irdd.resourceUsage (ResourceUsageKind::InstanceUsesResource);
-	  break;
-	  
-	case Deployment::ResourceUsesInstance:
-	  irdd.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
-	  break;
-	  
-	case Deployment::PortUsesResource:
-	  irdd.resourceUsage (ResourceUsageKind::PortUsesResource);
-	  break;
-
-	case Deployment::ResourceUsesPort:
-         irdd.resourceUsage (ResourceUsageKind::ResourceUsesPort);
-	 break;
-	 
-	default:
-	  throw Config_Error (src.resourceName.in (),
-			      "Unknown ResourceUsageKind.");
-	  break;
-	}
-      
+        {
+        case Deployment::None:
+          irdd.resourceUsage (ResourceUsageKind::None);
+          break;
+
+        case Deployment::InstanceUsesResource:
+          irdd.resourceUsage (ResourceUsageKind::InstanceUsesResource);
+          break;
+
+        case Deployment::ResourceUsesInstance:
+          irdd.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
+          break;
+
+        case Deployment::PortUsesResource:
+          irdd.resourceUsage (ResourceUsageKind::PortUsesResource);
+          break;
+
+        case Deployment::ResourceUsesPort:
+          irdd.resourceUsage (ResourceUsageKind::ResourceUsesPort);
+          break;
+
+        default:
+          throw Config_Error (src.resourceName.in (),
+                              "Unknown ResourceUsageKind.");
+          break;
+        }
+
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        {
+          irdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
+
       return irdd;
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
index aba36bc9e87..c48c95b9eb5 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -1,12 +1,11 @@
-
-      //==============================================================
+//==============================================================
 /**
- *  @file  IRDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  IRDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_IRDD_Handler_H
@@ -25,48 +24,47 @@
 
 namespace Deployment
 {
-  struct InstanceResourceDeploymentDescription;
+struct InstanceResourceDeploymentDescription;
 }
 
 
 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 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);
+
+
+};
+}
 }
 
-#include /**/ "ace/post.h" 
+#include /**/ "ace/post.h"
 #endif /* CIAO_CONFIG_HANDLERS_IRDD_Handler_H */
-
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index e9200cb0a49..9006956d2de 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 #include "MDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
@@ -6,18 +7,21 @@
 #include "Property_Handler.h"
 #include "Req_Handler.h"
 #include "cdp.hpp"
+#include "ace/UUID.h"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
     IDREF_Base<CORBA::ULong> MDD_Handler::IDREF;
-    
+
     void
     MDD_Handler::mono_deployment_descriptions (
-        const DeploymentPlan& src,
-        Deployment::MonolithicDeploymentDescriptions& dest)
+                                               const DeploymentPlan& src,
+                                               Deployment::MonolithicDeploymentDescriptions& dest)
     {
+      CIAO_TRACE("MDD_Handler::mono_deployment_descriptions");
+
       DeploymentPlan::implementation_const_iterator imp_e =
         src.end_implementation ();
       CORBA::ULong pos = 0;
@@ -30,22 +34,22 @@ namespace CIAO
           MDD_Handler::mono_deployment_description (*imp_b,
                                                     dest[pos],
                                                     pos);
-	  pos++;
+          pos++;
         }
-    }  
-    
+    }
+
     void
     MDD_Handler::mono_deployment_description (
-        const MonolithicDeploymentDescription& desc,
-        Deployment::MonolithicDeploymentDescription& toconfig,
-        CORBA::ULong pos)
+                                              const MonolithicDeploymentDescription& desc,
+                                              Deployment::MonolithicDeploymentDescription& toconfig,
+                                              CORBA::ULong pos)
     {
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
       MonolithicDeploymentDescription::source_const_iterator me =
         desc.end_source ();
-      
+
       CORBA::ULong len = 0;
       toconfig.source.length (desc.count_source ());
       for (MonolithicDeploymentDescription::source_const_iterator se =
@@ -68,8 +72,8 @@ namespace CIAO
         {
           CORBA::ULong tmp = 0;
 
-	  ADD_Handler::IDREF.find_ref (ACE_CString (ab->id ().c_str ()),
-						   tmp);
+          ADD_Handler::IDREF.find_ref (ACE_CString (ab->id ().c_str ()),
+                                       tmp);
 
           toconfig.artifactRef[len++] = tmp;
         }
@@ -87,24 +91,16 @@ namespace CIAO
                                           toconfig.execParameter[len++]);
         }
 
-#if 0
-      // @@ MAJO: Don't know how to handle this
-      if (desc.deployRequirement_p ())
-        {
-                                  Req_Handler handler;
-          toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
-          handler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
-            desc.deployRequirement ());
-        }
-#endif /*if 0*/
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      std::for_each (desc.begin_deployRequirement (),
+                     desc.end_deployRequirement (),
+                     Requirement_Functor (toconfig.deployRequirement));
 
       // Handle the idref
       if (desc.id_p ())
         {
           ACE_CString cstr (desc.id ().c_str ());
-          
+
           MDD_Handler::IDREF.bind_ref (cstr, pos);
         }
       else
@@ -113,57 +109,69 @@ namespace CIAO
                      "(%P|%t) Warning:  MDD %s has no idref \n",
                      desc.name ().c_str ()));
         }
-    }  
-
-
-      MonolithicDeploymentDescription
-      MDD_Handler::mono_deployment_description(
-	  const Deployment::MonolithicDeploymentDescription &src)
-      {
-	  //Get the name and instantiate the mdd
-	  XMLSchema::string < char > name ((src.name));
-	  MonolithicDeploymentDescription mdd (name);
-
-	  //Get the source(s) from the IDL and store them
-	  size_t total = src.source.length();
-	  for(size_t i = 0; i < total; i++)
-	  {
-	      XMLSchema::string< char > curr ((src.source[i]));
-	      mdd.add_source(curr);
-	  }
-
-	  //Get the artifactRef(s) from the IDL and store them
-	  total = src.artifactRef.length();
-	  for(size_t j = 0; j < total; j++)
-	  {
-	      ACE_CString tmp;
-	      ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
-	      XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
-	      mdd.add_artifact (curr);
-	  }
-
-	  //Get the execParameter(s) from the IDL and store them
-	  total = src.execParameter.length();
-	  for(size_t k = 0; k < total; k++)
-	  {
-	      mdd.add_execParameter (
-		  Property_Handler::get_property (
-		      src.execParameter[k]));
-	  }
-
-	  //Get the deployRequirement(s) from the IDL and store them
-	  total = src.deployRequirement.length();
-	  for(size_t l = 0; l < total; l++)
-	  {
-	      mdd.add_deployRequirement(
-		  Req_Handler::get_requirement (
-		      src.deployRequirement[l]));
-	  }
-
-	  return mdd;
-      }
+    }
+
+
+    MonolithicDeploymentDescription
+    MDD_Handler::mono_deployment_description(
+                                             const Deployment::MonolithicDeploymentDescription &src)
+    {
+      CIAO_TRACE("mono_deployment_description - reverse");
+
+      //Get the name and instantiate the mdd
+      XMLSchema::string < char > name ((src.name));
+      MonolithicDeploymentDescription mdd (name);
+
+      //Get the source(s) from the IDL and store them
+      size_t total = src.source.length();
+      for(size_t i = 0; i < total; i++)
+        {
+          XMLSchema::string< char > curr ((src.source[i]));
+          mdd.add_source(curr);
+        }
 
+      //Get the artifactRef(s) from the IDL and store them
+      total = src.artifactRef.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          ACE_CString tmp;
+          ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
+          XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
+          mdd.add_artifact (curr);
+        }
+
+      //Get the execParameter(s) from the IDL and store them
+      total = src.execParameter.length();
+      for(size_t k = 0; k < total; k++)
+        {
+          mdd.add_execParameter (
+                                 Property_Handler::get_property (src.execParameter[k]));
+        }
+
+      //Get the deployRequirement(s) from the IDL and store them
+      total = src.deployRequirement.length();
+      for(size_t l = 0; l < total; l++)
+        {
+          mdd.add_deployRequirement(
+                                    Req_Handler::get_requirement (src.deployRequirement[l]));
+        }
+
+      // Generate a UUID to use for the IDREF.
+      ACE_Utils::UUID uuid;
+      ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (uuid);
+      ACE_CString mdd_id ("_");
+      mdd_id += *uuid.to_string ();
+
+      XMLSchema::ID< ACE_TCHAR > xml_id (mdd_id.c_str ());
+
+      // Bind the ref and set it in the IDD
+      MDD_Handler::IDREF.bind_next_available (mdd_id);
+
+      mdd.id (xml_id);
+
+      return mdd;
+    }
   }
 
 }
-      
+
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
index 343e737beb2..2d95ff71e2d 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  MDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  MDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_MDD_Handler_H
@@ -22,49 +22,49 @@
 
 namespace Deployment
 {
-  struct MonolithicDeploymentDescription;
-  class MonolithicDeploymentDescriptions;
+struct MonolithicDeploymentDescription;
+class MonolithicDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class MonolithicDeploymentDescription;
-    class DeploymentPlan;
-    
-    /*
-     * @class MDD_Handler
-     *
-     * @brief Handler class for <MonolithicDeploymentDescription> types.
-     *
-     * This class defines handler methods to map values from XSC
-     * MonolithicDeploymentDescription objects, parsed from the
-     * descriptor files, to the corresponding CORBA IDL types.
-     *
-     */
+namespace Config_Handlers
+{
+class MonolithicDeploymentDescription;
+class DeploymentPlan;
+
+/*
+* @class MDD_Handler
+*
+* @brief Handler class for <MonolithicDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* MonolithicDeploymentDescription objects, parsed from the
+* descriptor files, to the corresponding CORBA IDL types.
+*
+*/
+
+class Config_Handlers_Export MDD_Handler
+{
+public:
+static void mono_deployment_descriptions (
+const DeploymentPlan &src,
+Deployment::MonolithicDeploymentDescriptions &dest);
+
+static MonolithicDeploymentDescription mono_deployment_description(
+const Deployment::MonolithicDeploymentDescription &src);
 
-    class Config_Handlers_Export MDD_Handler
-    {
-    public:
-      static void mono_deployment_descriptions (
-          const DeploymentPlan &src,
-          Deployment::MonolithicDeploymentDescriptions &dest);
-      
-      static MonolithicDeploymentDescription mono_deployment_description(
-	  const Deployment::MonolithicDeploymentDescription &src);
+static IDREF_Base<CORBA::ULong> IDREF;
 
-      static IDREF_Base<CORBA::ULong> IDREF;
-      
-    private:
-      static void mono_deployment_description (
-          const MonolithicDeploymentDescription& desc,
-          Deployment::MonolithicDeploymentDescription& toconfig,
-          CORBA::ULong pos);
-    };
-  }
+private:
+static void mono_deployment_description (
+const MonolithicDeploymentDescription& desc,
+Deployment::MonolithicDeploymentDescription& toconfig,
+CORBA::ULong pos);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd b/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd
deleted file mode 100644
index 53ff11a9107..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd
+++ /dev/null
@@ -1,688 +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" />
-			<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>
\ No newline at end of file
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 917c056a6cb..bcb5e4d917c 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -8,6 +8,7 @@
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -25,10 +26,11 @@ namespace CIAO
     ///This method takes a <Deployment::PlanConnectionDescription>
     ///and maps the values from the passed in XSC
     ///PlanConnectionDescription to its members.
-    void PCD_Handler::get_PlanConnectionDescription (
-                Deployment::PlanConnectionDescription& toconfig,
-                PlanConnectionDescription& desc)
+    void PCD_Handler::get_PlanConnectionDescription (const PlanConnectionDescription& desc,
+                                                     Deployment::PlanConnectionDescription& toconfig)
     {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       //Source is mapped to a string in the schema and a sequence
@@ -43,118 +45,96 @@ namespace CIAO
           toconfig.source[0] = desc.source ().c_str ();
         }
 
-      for(PlanConnectionDescription::deployRequirement_iterator 
-	      req (desc.begin_deployRequirement());
-	  req != desc.end_deployRequirement();
-	  req++)
-        {
-#if 0
-          // @@ MAJO:
-          //Create the handler for the requirements.
-          Requirement_Handler reqhandler;
-
-          //Increase the sequence length and delgate
-          //the Requirement to the Req_Handler.
-          toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
-          reqhandler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
-            desc.deployRequirement ());
-#endif /*if 0*/
-        }
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      std::for_each (desc.begin_deployRequirement (),
+                     desc.end_deployRequirement (),
+                     Requirement_Functor (toconfig.deployRequirement));
+
 
       //Create the ComponentExternalPortEndpoint handler.
-      CEPE_Handler::external_port_endpoints (
-	  desc,
-	  toconfig.externalEndpoint);
-      
-      //Configure the PlanSubcomponentPortEndpoint's.
+      CEPE_Handler::external_port_endpoints (desc,
+                                             toconfig.externalEndpoint);
 
-      PSPE_Handler::sub_component_port_endpoints (
-	  desc,
-	  toconfig.internalEndpoint);
+      //Configure the PlanSubcomponentPortEndpoint's.
+      PSPE_Handler::sub_component_port_endpoints (desc,
+                                                  toconfig.internalEndpoint);
 
       //Configure the ExternalReferenceEndpoint's.
-      ERE_Handler::external_ref_endpoints (
-	  desc,
-	  toconfig.externalReference);
-      
+      ERE_Handler::external_ref_endpoints (desc,
+                                           toconfig.externalReference);
+
       //Configure the resource value.
       CRDD_Handler crddhandler;
       CORBA::ULong pos = 0;
       toconfig.deployedResource.length (desc.count_deployedResource ());
-      for(PlanConnectionDescription::deployedResource_iterator res =
-	      desc.begin_deployedResource();
-	  res != desc.end_deployedResource();
-	  res++)
-      {
-          crddhandler.get_ConnectionResourceDeploymentDescription (
-            toconfig.deployedResource[pos++],
-            *res);
-      }
+      for(PlanConnectionDescription::deployedResource_const_iterator res =
+            desc.begin_deployedResource();
+          res != desc.end_deployedResource();
+          res++)
+        {
+          crddhandler.get_ConnectionResourceDeploymentDescription (toconfig.deployedResource[pos++],
+                                                                   *res);
+        }
+
+    }
+
+    PlanConnectionDescription 
+    PCD_Handler::get_PlanConnectionDescription (const Deployment::PlanConnectionDescription &src)
+    {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+
+      XMLSchema::string< char > name ((src.name));
+
+      PlanConnectionDescription pcd(name);
+
+      //Get the source if it exists
+      if(src.source.length() != 0)
+        {
+          XMLSchema::string< char > source((src.source[0]));
+          pcd.source(source);
+        }
+
+      //Get any externalEndpoint(s) and store them
+      size_t total = src.externalEndpoint.length();
+      for(size_t i = 0; i < total; i++)
+        {
+          pcd.add_externalEndpoint(
+                                   CEPE_Handler::external_port_endpoint(src.externalEndpoint[i]));
+        }
+
+      //Get any externalReference(s) and store them
+      total = src.externalReference.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          pcd.add_externalReference(
+                                    ERE_Handler::external_ref_endpoint(src.externalReference[j]));
+        }
+
+      //Get any internalEndpoint(s) and store them
+      total = src.internalEndpoint.length();
+      for(size_t k = 0; k < total; k++)
+        {
+          pcd.add_internalEndpoint(
+                                   PSPE_Handler::sub_component_port_endpoint(src.internalEndpoint[k]));
+        }
+
+      //Get any deployedResource(s) and store them
+      total = src.deployedResource.length();
+      for(size_t l = 0; l < total; l++)
+        {
+          pcd.add_deployedResource(
+                                   CRDD_Handler::connection_resource_depl_desc(src.deployedResource[l]));
+        }
+
+      //Get any deployRequirement(s) and store them
+      total = src.deployRequirement.length();
+      for(size_t m = 0; m < total; m++)
+        {
+          pcd.add_deployRequirement(
+                                    Req_Handler::get_requirement(src.deployRequirement[m]));
+        }
 
+      return pcd;
     }
-      
-      PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (
-	  const Deployment::PlanConnectionDescription &src)
-      {
-	  XMLSchema::string< char > name ((src.name));
-
-	  PlanConnectionDescription pcd(name);
-
-	  //Get the source if it exists
-	  if(src.source.length() != 0)
-	  {
-	      XMLSchema::string< char > source((src.source[0]));
-	      pcd.source(source);
-	  }
-
-	  //Get any externalEndpoint(s) and store them
-	  size_t total = src.externalEndpoint.length();
-	  for(size_t i = 0; i < total; i++)
-	  {
-	      pcd.add_externalEndpoint(
-		  CEPE_Handler::external_port_endpoint(
-		      src.externalEndpoint[i]));
-	  }
-
-	  //Get any externalReference(s) and store them
-	  total = src.externalReference.length();
-	  for(size_t j = 0; j < total; j++)
-	  {
-	      pcd.add_externalReference(
-		  ERE_Handler::external_ref_endpoint(
-		      src.externalReference[j]));
-	  }
-
-	  //Get any internalEndpoint(s) and store them
-	  total = src.internalEndpoint.length();
-	  for(size_t k = 0; k < total; k++)
-	  {
-	      pcd.add_internalEndpoint(
-		  PSPE_Handler::sub_component_port_endpoint(
-		      src.internalEndpoint[k]));
-	  }
-	  
-	  //Get any deployedResource(s) and store them
-	  total = src.deployedResource.length();
-	  for(size_t l = 0; l < total; l++)
-	  {
-	      pcd.add_deployedResource(
-		  CRDD_Handler::connection_resource_depl_desc(
-		      src.deployedResource[l]));
-	  }
-
-	  //Get any deployRequirement(s) and store them
-	  total = src.deployRequirement.length();
-	  for(size_t m = 0; m < total; m++)
-	  {
-	      pcd.add_deployRequirement(
-		  Req_Handler::get_requirement(
-		      src.deployRequirement[m]));
-	  }
-
-	  return pcd;
-      }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
index f5ad6eee6e8..edac698d7b6 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
@@ -13,14 +13,15 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
-
+#include "Utils/Functors.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 namespace Deployment
 {
-  struct PlanConnectionDescription; 
+  struct PlanConnectionDescription;
+  class PlanConnectionDescriptions;
 }
 
 namespace CIAO
@@ -28,40 +29,45 @@ namespace CIAO
 
   namespace Config_Handlers
   {
-    
-   class PlanConnectionDescription;
-   
-   /*
-    * @class PCD_Handler
-    *
-    * @brief Handler class for <PlanConnectionDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC PlanConnectionDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
+
+    class PlanConnectionDescription;
+
+    /*
+     * @class PCD_Handler
+     *
+     * @brief Handler class for <PlanConnectionDescription> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC PlanConnectionDescription objects, parsed from
+     * the descriptor files, to the corresponding CORBA IDL type.
+     *
+     */
+
     class Config_Handlers_Export PCD_Handler{
-     
-      public:
-       
-        PCD_Handler (void);
-        virtual ~PCD_Handler (void);
-  
-        ///This method takes a <Deployment::PlanConnectionDescription>
-        ///and maps the values from the passed in XSC 
-        ///PlanConnectionDescription to its members.
-        void get_PlanConnectionDescription (
-                    Deployment::PlanConnectionDescription& toconfig,
-                    PlanConnectionDescription& desc);          
 
-	//This method takes a <Deployment::PlanConnectionDescription>
-	//converts it into a <Config_Handler::PlanConnectionDescription>
-	//and returns the value
-	static PlanConnectionDescription get_PlanConnectionDescription (
-	    const Deployment::PlanConnectionDescription &src);
+    public:
+
+      PCD_Handler (void);
+      virtual ~PCD_Handler (void);
+
+      ///This method takes a <Deployment::PlanConnectionDescription>
+      ///and maps the values from the passed in XSC
+      ///PlanConnectionDescription to its members.
+      static void get_PlanConnectionDescription (const PlanConnectionDescription& desc,
+                                          Deployment::PlanConnectionDescription& toconfig);
+
+      //This method takes a <Deployment::PlanConnectionDescription>
+      //converts it into a <Config_Handler::PlanConnectionDescription>
+      //and returns the value
+      static PlanConnectionDescription 
+        get_PlanConnectionDescription (const Deployment::PlanConnectionDescription &src);
     };
+    
+    typedef Sequence_Handler < PlanConnectionDescription,
+                               ::Deployment::PlanConnectionDescriptions,
+                               ::Deployment::PlanConnectionDescription,
+                               PCD_Handler::get_PlanConnectionDescription > PCD_Functor;
+    
   }
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 302c560d899..24d55cecf36 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -11,14 +11,16 @@ namespace CIAO
   {
     void
     PSPE_Handler::sub_component_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::PlanSubcomponentPortEndpoints &dest)
+                                                const PlanConnectionDescription &src,
+                                                ::Deployment::PlanSubcomponentPortEndpoints &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints");
+
       PlanConnectionDescription::internalEndpoint_const_iterator iei_e =
         src.end_internalEndpoint ();
       CORBA::ULong pos = 0;
       dest.length (src.count_internalEndpoint ());
-      
+
       for (PlanConnectionDescription::internalEndpoint_const_iterator iei_b =
              src.begin_internalEndpoint ();
            iei_b != iei_e;
@@ -31,9 +33,10 @@ namespace CIAO
 
     void
     PSPE_Handler::sub_component_port_endpoint (
-        const PlanSubcomponentPortEndpoint &src,
-        ::Deployment::PlanSubcomponentPortEndpoint &dest)
+                                               const PlanSubcomponentPortEndpoint &src,
+                                               ::Deployment::PlanSubcomponentPortEndpoint &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint");
       dest.portName =
         src.portName ().c_str ();
 
@@ -47,89 +50,94 @@ namespace CIAO
         }
 
       CORBA::ULong tmp = 0;
-      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()), 
-					    tmp);
-            
+
+      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()),
+                                   tmp);
+
       dest.instanceRef = tmp;
 
       switch (src.kind ().integral ())
         {
-          case CCMComponentPortKind::Facet_l:
-            dest.kind = Deployment::Facet;
-            break;
-            
-          case CCMComponentPortKind::SimplexReceptacle_l:
-            dest.kind = Deployment::SimplexReceptacle;
-            break;
-            
-          case CCMComponentPortKind::MultiplexReceptacle_l:
-            dest.kind = Deployment::MultiplexReceptacle;
-            break;
-            
-          case CCMComponentPortKind::EventEmitter_l:
-            dest.kind = Deployment::EventEmitter;
-            break;
-            
-          case CCMComponentPortKind::EventPublisher_l:
-            dest.kind = Deployment::EventPublisher;
-            break;
-            
-          case CCMComponentPortKind::EventConsumer_l:
-            dest.kind = Deployment::EventConsumer;
-            break;
-          
-          default:
-            ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
-            
-         }
+        case CCMComponentPortKind::Facet_l:
+          dest.kind = Deployment::Facet;
+          break;
+
+        case CCMComponentPortKind::SimplexReceptacle_l:
+          dest.kind = Deployment::SimplexReceptacle;
+          break;
+
+        case CCMComponentPortKind::MultiplexReceptacle_l:
+          dest.kind = Deployment::MultiplexReceptacle;
+          break;
+
+        case CCMComponentPortKind::EventEmitter_l:
+          dest.kind = Deployment::EventEmitter;
+          break;
+
+        case CCMComponentPortKind::EventPublisher_l:
+          dest.kind = Deployment::EventPublisher;
+          break;
+
+        case CCMComponentPortKind::EventConsumer_l:
+          dest.kind = Deployment::EventConsumer;
+          break;
+
+        default:
+          ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
+
+        }
     }
 
     PlanSubcomponentPortEndpoint
     PSPE_Handler::sub_component_port_endpoint (
-      const Deployment::PlanSubcomponentPortEndpoint &src)
+                                               const Deployment::PlanSubcomponentPortEndpoint &src)
     { // @@MAJO
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse");
       XMLSchema::string< char > pname ((src.portName));
       XMLSchema::string< char > tval  ("true");
       XMLSchema::string< char > prov  ("");
       ACE_CString id;
       IDD_Handler::IDREF.find_ref(src.instanceRef, id);
-      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str()); 
-      
+      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str());
+
       if (src.provider)
         prov = tval;
 
       PlanSubcomponentPortEndpoint pspe (pname,
-					 CCMComponentPortKind::Facet,
-					 idref);
+                                         CCMComponentPortKind::Facet,
+                                         idref);
       pspe.provider (prov);
-      
+
       switch (src.kind)
-        {    
+        {
         case ::Deployment::Facet:
           pspe.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           pspe.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           pspe.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           pspe.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           pspe.kind (CCMComponentPortKind::EventPublisher);
           break;
-        
+
         case ::Deployment::EventConsumer:
           pspe.kind (CCMComponentPortKind::EventConsumer);
           break;
+          
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid port kind in PSPE\n"));
         }
-      
+
 
       return pspe;
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
index ec27a6e4dcb..aeb92da9eb0 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  PSPE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  PSPE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PSPE_HANDLER_H
@@ -20,45 +20,45 @@
 
 namespace Deployment
 {
-  class PlanSubcomponentPortEndpoints;
-  struct PlanSubcomponentPortEndpoint;
+class PlanSubcomponentPortEndpoints;
+struct PlanSubcomponentPortEndpoint;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class PlanSubcomponentPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class PlanSubcomponentPortEndpoint;
 
-    /*
-     * @class PSPE_Handler
-     *
-     * @brief Handler class for <PlanSubcomponentPortEndpoint> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC PlanSubcomponentPortEndpoint objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     *
-     */
-    class Config_Handlers_Export PSPE_Handler
-    {
-    public:
-      static void sub_component_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::PlanSubcomponentPortEndpoints &dest);
+/*
+* @class PSPE_Handler
+*
+* @brief Handler class for <PlanSubcomponentPortEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC PlanSubcomponentPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+class Config_Handlers_Export PSPE_Handler
+{
+public:
+static void sub_component_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::PlanSubcomponentPortEndpoints &dest);
 
-      static PlanSubcomponentPortEndpoint
-      sub_component_port_endpoint (
-        const Deployment::PlanSubcomponentPortEndpoint &src);
+static PlanSubcomponentPortEndpoint
+sub_component_port_endpoint (
+const Deployment::PlanSubcomponentPortEndpoint &src);
 
-    private:
-      static void sub_component_port_endpoint (
-        const PlanSubcomponentPortEndpoint &src,
-        ::Deployment::PlanSubcomponentPortEndpoint &dest);
-    };
-  }
+private:
+static void sub_component_port_endpoint (
+const PlanSubcomponentPortEndpoint &src,
+::Deployment::PlanSubcomponentPortEndpoint &dest);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index df3c0884b60..d9756f3c07f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -21,7 +21,7 @@ namespace CIAO
       {
         struct SPE_Handler
         {
-          static void handle_spe (const SubcomponentPortEndpoint &desc,
+          static void get_spe (const SubcomponentPortEndpoint &desc,
                                ::Deployment::SubcomponentPortEndpoint &toconfig)
           {
             CIAO_TRACE("SPE_Handler::get_spe");
@@ -50,11 +50,11 @@ namespace CIAO
         typedef Sequence_Handler < SubcomponentPortEndpoint,
                                    ::Deployment::SubcomponentPortEndpoints,
                                    ::Deployment::SubcomponentPortEndpoint,
-                                   SPE_Handler::handle_spe > SPE_Functor;
+                                   SPE_Handler::get_spe > SPE_Functor;
 
         struct ACD_Handler
         {
-          static void handle_acd (const AssemblyConnectionDescription &desc,
+          static void get_acd (const AssemblyConnectionDescription &desc,
                                ::Deployment::AssemblyConnectionDescription &toconfig)
           {
             CIAO_TRACE("ACD_Handler::get_acd");
@@ -113,12 +113,12 @@ namespace CIAO
         typedef Sequence_Handler < AssemblyConnectionDescription,
                                    ::Deployment::AssemblyConnectionDescriptions,
                                    ::Deployment::AssemblyConnectionDescription,
-                                   ACD_Handler::handle_acd > ACD_Functor;
+                                   ACD_Handler::get_acd > ACD_Functor;
 
 
         struct SPR_Handler
         {
-          static void handle_spr (const SubcomponentPropertyReference &desc,
+          static void get_spr (const SubcomponentPropertyReference &desc,
                                ::Deployment::SubcomponentPropertyReference &toconfig)
           {
             CIAO_TRACE("SPR_Handler::get_spr");
@@ -149,11 +149,11 @@ namespace CIAO
         typedef Sequence_Handler < SubcomponentPropertyReference,
                                    ::Deployment::SubcomponentPropertyReferences,
                                    ::Deployment::SubcomponentPropertyReference,
-                                   SPR_Handler::handle_spr > SPR_Functor;
+                                   SPR_Handler::get_spr > SPR_Functor;
 
         struct APM_Handler
         {
-          static void handle_apm (const AssemblyPropertyMapping &desc,
+          static void get_apm (const AssemblyPropertyMapping &desc,
                                ::Deployment::AssemblyPropertyMapping &toconfig)
           {
             CIAO_TRACE("APM_Handler::get_apm");
@@ -185,7 +185,7 @@ namespace CIAO
         typedef Sequence_Handler < AssemblyPropertyMapping,
                                    ::Deployment::AssemblyPropertyMappings,
                                    ::Deployment::AssemblyPropertyMapping,
-                                   APM_Handler::handle_apm > APM_Functor;
+                                   APM_Handler::get_apm > APM_Functor;
       }
 
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index 8818ff34518..782027a38fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -31,7 +31,7 @@ namespace CIAO
       {
         struct Capability_Handler
         {
-          static void handle_capability (const Capability &desc,
+          static void get_capability (const Capability &desc,
                                       ::Deployment::Capability &toconfig)
           {
             CIAO_TRACE ("Capability_Handler::get_capability");
@@ -68,11 +68,11 @@ namespace CIAO
         typedef Sequence_Handler < Capability,
                                    ::Deployment::Capabilities,
                                    ::Deployment::Capability,
-                                   Capability_Handler::handle_capability > Capability_Functor;
+                                   Capability_Handler::get_capability > Capability_Functor;
 
         struct IR_Handler
         {
-          static void handle_ir (const ImplementationRequirement &desc,
+          static void get_ir (const ImplementationRequirement &desc,
                               ::Deployment::ImplementationRequirement &toconfig)
           {
             CIAO_TRACE ("IR_Handler::get_ir");
@@ -173,13 +173,13 @@ namespace CIAO
         typedef Sequence_Handler < ImplementationRequirement,
                                    ::Deployment::ImplementationRequirements,
                                    ::Deployment::ImplementationRequirement,
-                                   IR_Handler::handle_ir > IR_Functor;
+                                   IR_Handler::get_ir > IR_Functor;
 
 
 
         struct MID_Handler
         {
-          static void handle_mid (const MonolithicImplementationDescription &desc,
+          static void get_mid (const MonolithicImplementationDescription &desc,
                                ::Deployment::MonolithicImplementationDescription &toconfig)
           {
             CIAO_TRACE ("MID_Handler::get_mid");
@@ -236,7 +236,7 @@ namespace CIAO
         typedef Sequence_Handler < MonolithicImplementationDescription,
                                    ::Deployment::MonolithicImplementationDescriptions,
                                    ::Deployment::MonolithicImplementationDescription,
-                                   MID_Handler::handle_mid > MID_Functor;
+                                   MID_Handler::get_mid > MID_Functor;
 
       }
 
@@ -279,7 +279,7 @@ namespace CIAO
         else if (cid->monolithicImpl_p ())
           {
             toconfig.monolithicImpl.length (1);
-            MID_Handler::handle_mid (cid->monolithicImpl (),
+            MID_Handler::get_mid (cid->monolithicImpl (),
                                   toconfig.monolithicImpl[0]);
           }
         else
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 09f02684a21..dc3976ce698 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
       {
         struct PCI_Handler
         {
-          static void handle_pci (const PackagedComponentImplementation &desc,
+          static void get_pci (const PackagedComponentImplementation &desc,
                                ::Deployment::PackagedComponentImplementation &toconfig)
           {
             CIAO_TRACE ("PCI_Handler::get_pci");
@@ -41,11 +41,11 @@ namespace CIAO
         typedef Sequence_Handler < PackagedComponentImplementation,
                                    ::Deployment::PackagedComponentImplementations,
                                    ::Deployment::PackagedComponentImplementation,
-                                   PCI_Handler::handle_pci > PCI_Functor;
+                                   PCI_Handler::get_pci > PCI_Functor;
       }
 
       void
-      CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc,
+      CPD_Handler::component_package_descr (const ComponentPackageDescription &desc,
                                             ::Deployment::ComponentPackageDescription &toconfig)
       {
         CIAO_TRACE ("CPD_Handler::component_package_descr");
@@ -136,7 +136,7 @@ namespace CIAO
       {
         CIAO_TRACE ("CPD_Handler::resolve_cpd");
         if (!XML_HELPER->is_initialized ())
-          return 0;
+          return false;
 
         xercesc::DOMDocument* dom =
           XML_HELPER->create_dom (uri);
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 9535d24eef2..92b05187fa8 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -1,6 +1,6 @@
 //================================================
 /**
- *  @file  CPD_Handler.h
+ *  @file  STD_CPD_Handler.h
  *
  *  $Id$
  *
@@ -50,11 +50,11 @@ namespace CIAO
         /// Maps the values from the XSC object
         /// <ComponentPackageDescription> to the CORBA IDL type
         /// <Deployment::ComponentPackageDescription>.
-        static void handle_component_package_descr (const ComponentPackageDescription &desc,
+        static void component_package_descr (const ComponentPackageDescription &desc,
                                              ::Deployment::ComponentPackageDescription &toconfig);
 
         static ComponentPackageDescription
-	  component_package_descr (const Deployment::ComponentPackageDescription& src);
+        component_package_descr (const Deployment::ComponentPackageDescription& src);
       private:
         static ComponentPackageDescription * resolve_cpd (const char *uri);
 
@@ -63,7 +63,7 @@ namespace CIAO
       typedef Sequence_Handler < ComponentPackageDescription,
                                  ::Deployment::ComponentPackageDescriptions,
                                  ::Deployment::ComponentPackageDescription,
-                                 CPD_Handler::handle_component_package_descr > CPD_Functor;
+                                 CPD_Handler::component_package_descr > CPD_Functor;
 
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index 74223c6b2d8..ea487980046 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
       {
         struct Comp_Prop_Handler
         {
-          static void handle_cpd (const ComponentPropertyDescription &desc,
+          static void get_cpd (const ComponentPropertyDescription &desc,
                                ::Deployment::ComponentPropertyDescription &toconfig)
           {
             CIAO_TRACE ("Comp_Prop_Handler::get_cpd");
@@ -44,7 +44,7 @@ namespace CIAO
         typedef Sequence_Handler < ComponentPropertyDescription,
                                    ::Deployment::ComponentPropertyDescriptions,
                                    ::Deployment::ComponentPropertyDescription,
-                                   Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor;
+                                   Comp_Prop_Handler::get_cpd > Comp_Prop_Functor;
       }
 
       void
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index edc5fe7fa6c..6ad2767104b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -34,7 +34,7 @@ namespace CIAO
       class Packaging_Handlers_Export NIA_Handler
       {
       public:
-        static void handle_nia (const NamedImplementationArtifact &desc,
+        static void get_nia (const NamedImplementationArtifact &desc,
                              ::Deployment::NamedImplementationArtifact &toconfig)
         {
           toconfig.name = desc.name ().c_str ();
@@ -55,11 +55,10 @@ namespace CIAO
       typedef Sequence_Handler < NamedImplementationArtifact,
                                  ::Deployment::NamedImplementationArtifacts,
                                  ::Deployment::NamedImplementationArtifact,
-        NIA_Handler::handle_nia > NIA_Functor;
+        NIA_Handler::get_nia > NIA_Functor;
     }
   }
 }
 
-#include /**/ "ace/post.h"
 
 #endif /* CIAO_PACKAGING_NIA_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 675060fd082..922c1fac252 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,19 +1,19 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "ciao/CIAO_common.h"
-#include "ciao/Packaging_DataC.h"
-#include "Utils/XML_Helper.h"
-#include "Utils/XercesString.h"
-#include "Utils/Exceptions.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Package_Handlers/CPD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
-
-#include "Basic_Deployment_Data.hpp"
+#include "Utils/XercesString.h"
+#include "Utils/Exceptions.h"
 
 #include <memory>
+#include "ciao/CIAO_common.h"
+
+#include <xercesc/util/XMLString.hpp>
 
 namespace CIAO
 {
@@ -25,20 +25,13 @@ namespace CIAO
       PCD_Handler::package_config (const ACE_TCHAR *uri,
                                    ::Deployment::PackageConfiguration &toconfig)
       {
-        const xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
-
-	if (dom == 0)
-	  {
-	    std::string error ("Unable to open file: ");
-	    error += uri;
-	    throw Parse_Error (error);
-	  }
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
 
-	XStr root = dom->getDocumentElement ()->getTagName ();
+        XStr root = dom->getDocumentElement ()->getTagName ();
 
         if (root == XStr ("Deployment:topLevelPackageDescription"))
           {
-	TopLevelPackageDescription tpd = topLevelPackageDescription (dom);
+            TopLevelPackageDescription tpd (topLevelPackageDescription (dom));
             PCD_Handler::package_config (tpd.package (),
                                          toconfig);
           }
@@ -90,8 +83,8 @@ namespace CIAO
         if (pcd->basePackage_p ())
           {
             toconfig.basePackage.length (1);
-            CPD_Handler::handle_component_package_descr (pcd->basePackage (),
-							 toconfig.basePackage [0]);
+            CPD_Handler::component_package_descr (pcd->basePackage (),
+                                                  toconfig.basePackage [0]);
           }
 
         // @@ MAJO: Support other elements present here.
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index e265295d040..334245559fa 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -1,5 +1,11 @@
 // $Id$
 
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
 #include "STD_PC_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
index c15ae0389b9..d280fb5c655 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
@@ -1,6 +1,6 @@
 //==============================================================
 /**
- *  @file  PC_Intf.h
+ *  @file  STD_PC_Intf.h
  *
  *  $Id$
  *
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 34eadf9ea32..4cca9747789 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
       IDREF_Base<CORBA::ULong> SID_Handler::IDREF;
 
       void
-      SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+      SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
                                          ::Deployment::SubcomponentInstantiationDescription &toconfig)
       {
         CIAO_TRACE ("SID_Handler::sub_comp_inst_descr");
@@ -28,7 +28,7 @@ namespace CIAO
         if (desc.basePackage_p ())
           {
             toconfig.basePackage.length (1);
-            CPD_Handler::handle_component_package_descr (desc.basePackage (),
+            CPD_Handler::component_package_descr (desc.basePackage (),
                                                   toconfig.basePackage[0]);
           }
         else if (desc.specializedConfig_p ())
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
index 1bcb73e751e..c166fcd6294 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
@@ -43,7 +43,7 @@ namespace CIAO
         }
 
       public:
-        static void handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+        static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
                                          ::Deployment::SubcomponentInstantiationDescription &toconfig);
 
         static SubcomponentInstantiationDescription
@@ -61,7 +61,7 @@ namespace CIAO
       typedef Sequence_Handler < SubcomponentInstantiationDescription,
                                  ::Deployment::SubcomponentInstantiationDescriptions,
                                  ::Deployment::SubcomponentInstantiationDescription,
-	SID_Handler::handle_sub_comp_inst_descr > SID_Functor;
+                                 SID_Handler::sub_comp_inst_descr > SID_Functor;
 
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index c2525f5ceeb..273fe8c8e69 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -20,9 +20,11 @@ namespace CIAO
 
     void
     Property_Handler::get_property (
-      const Property& desc,
-      Deployment::Property& toconfig)
+                                    const Property& desc,
+                                    Deployment::Property& toconfig)
     {
+      CIAO_TRACE("Property_Handler::get_property");
+
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
@@ -33,8 +35,10 @@ namespace CIAO
 
     Property
     Property_Handler::get_property (
-      const Deployment::Property& src)
+                                    const Deployment::Property& src)
     {
+      CIAO_TRACE("Property_Handler::get_property - reverse");
+
       ::XMLSchema::string< char > name ((src.name));
       Any value (Any_Handler::get_any (src.value));
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
index ae6dee192da..07044faed8e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  Property_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Property_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H
@@ -14,6 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,42 +22,50 @@
 
 namespace Deployment
 {
-  struct Property;
+struct Property;
+class Properties;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Property;
-
-    /*
-     * @class Property_Handler
-     *
-     * @brief Handler class for <CCMComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-
-   class Config_Handlers_Export Property_Handler
-   {
-   public:
-     Property_Handler (void);
-     virtual ~Property_Handler (void);
-
-     /// This method maps the values from the XSC object
-     /// <CIAO::Config_Handlers::Property> to the CORBA IDL type
-     /// <Deployment::Property>.
-     static void get_property (const Property& desc,
-       ::Deployment::Property& toconfig);
-     static Property get_property (
-       const ::Deployment::Property& src);
-   };
-
- }
+namespace Config_Handlers
+{
+class Property;
+
+/*
+* @class Property_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export Property_Handler
+{
+public:
+Property_Handler (void);
+virtual ~Property_Handler (void);
+
+typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
+
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::Property> to the CORBA IDL type
+/// <Deployment::Property>.
+static void get_property (const Property& desc,
+::Deployment::Property& toconfig);
+static Property get_property (
+const ::Deployment::Property& src);
+};
+
+typedef Sequence_Handler < Property,
+::Deployment::Properties,
+::Deployment::Property,
+Property_Handler::get_property> Property_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 7a9fe8bca08..374c0e4993f 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -1,8 +1,11 @@
 // $Id$
+
 #include "RDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
+#include "ciao/CIAO_common.h"
+#include "Property_Handler.h"
 
 namespace CIAO
 {
@@ -10,29 +13,41 @@ namespace CIAO
   {
     void
     RDD_Handler::resource_deployment_descr (
-        const ResourceDeploymentDescription &src,
-        ::Deployment::ResourceDeploymentDescription &dest)
+                                            const ResourceDeploymentDescription &src,
+                                            ::Deployment::ResourceDeploymentDescription &dest)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr");
+
       dest.requirementName =
         src.requirementName ().c_str ();
 
       dest.resourceName=
         src.resourceName ().c_str ();
 
-      Any_Handler::extract_into_any (src.resourceValue (),
-                                     dest.resourceValue);
+      std::for_each (src.begin_property (),
+                     src.end_property (),
+                     Property_Functor (dest.property));
 
     }
 
     ResourceDeploymentDescription
     RDD_Handler::resource_deployment_descr (
-      const ::Deployment::ResourceDeploymentDescription &src)
+                                            const ::Deployment::ResourceDeploymentDescription &src)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr - reverse");
+
       XMLSchema::string< char > reqname ((src.requirementName));
-      XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
+      XMLSchema::string< char > resname ((src.resourceName.in ()));
+
+      ResourceDeploymentDescription rdd (reqname,resname);
+
+      for (CORBA::ULong i = 0;
+           i != src.property.length ();
+           ++i)
+        {
+          rdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
 
-      ResourceDeploymentDescription rdd (reqname,resname,resval);
       return rdd;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
index 001a57e0da7..e0d19c58ee2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
@@ -1,12 +1,12 @@
 
-      //==============================================================
+//==============================================================
 /**
- *  @file  RDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  RDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_RDD_Handler_H
@@ -23,40 +23,40 @@
 
 namespace Deployment
 {
-  struct ResourceDeploymentDescription;
+struct ResourceDeploymentDescription;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class ResourceDeploymentDescription;
-
-    /*
-    * @class RDD_Handler
-    *
-    * @brief Handler class for <ResourceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from XSC
-    * ResourceDeploymentDescription objects, parsed from the
-    * descriptor files, to the  corresponding CORBA IDL Any type.
-    *
-    */
-
-    class Config_Handlers_Export RDD_Handler
-    {
-      public:
-      static void resource_deployment_descr (
-          const ResourceDeploymentDescription& desc,
-          ::Deployment::ResourceDeploymentDescription& toconfig);
-      static ResourceDeploymentDescription
-      resource_deployment_descr (
-          const ::Deployment::ResourceDeploymentDescription &src);
-
-    };
-  }
+namespace Config_Handlers
+{
+class ResourceDeploymentDescription;
+
+/*
+* @class RDD_Handler
+*
+* @brief Handler class for <ResourceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* ResourceDeploymentDescription objects, parsed from the
+* descriptor files, to the  corresponding CORBA IDL Any type.
+*
+*/
+
+class Config_Handlers_Export RDD_Handler
+{
+public:
+static void resource_deployment_descr (
+const ResourceDeploymentDescription& desc,
+::Deployment::ResourceDeploymentDescription& toconfig);
+static ResourceDeploymentDescription
+resource_deployment_descr (
+const ::Deployment::ResourceDeploymentDescription &src);
+
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
index 595f0850e39..16d6697c509 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -10,23 +10,24 @@ namespace CIAO
   namespace Config_Handlers
   {
     //    IDREF_Base CB_Handler::IDREF;
-    
-    bool 
+
+    bool
     CB_Handler::connection_band (const ConnectionBandsDef &src,
                                  ::CIAO::DAnCE::ORS_ConnectionBands &dest)
     {
       // Set the number of bands
       CORBA::ULong num (dest.bands.length ());
       dest.bands.length (num + src.count_band ());
-      
+
       for (ConnectionBandsDef::band_const_iterator i = src.begin_band ();
            i != src.end_band ();
            ++i)
         {
           dest.bands[num].low = static_cast <ACE_INT32> ((i->low ()));
           dest.bands[num].high = static_cast < ACE_INT32 > (i->high ());
+          num++;
         }
-      
+
       if (src.id_p ())
         {
           /*
@@ -36,16 +37,16 @@ namespace CIAO
           */
           dest.Id = CORBA::string_dup (src.id ().c_str ());
         }
-      
+
       return true;
     }
-    
 
-    ConnectionBandsDef 
+
+    ConnectionBandsDef
     CB_Handler::connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src)
     {
       ConnectionBandsDef cb;
-      
+
       for (CORBA::ULong i = 0;
            i < src.bands.length ();
            ++i)
@@ -53,18 +54,18 @@ namespace CIAO
           cb.add_band (PriorityBandDef (src.bands[i].low,
                                         src.bands[i].high));
         }
-      
+
       /*
       ACE_CString cstr;
       if (CB_Handler::IDREF.find_ref (src, cstr))
         cb->id (cstr.c_str ());
       */
-      
+
       if (src.Id.in () != 0)
         cb.id (src.Id.in ());
-      
+
       return cb;
     }
-    
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
index 338a21e134c..e72bbe18ee8 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
@@ -1,7 +1,7 @@
 /**
  * @file CB_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * $Id$
  */
 
@@ -22,26 +22,26 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ConnectionBandsDef;
+
+    /*
+     * @class CB_Handler
+     * A brief Handler class for <ConnectionBands>
+     */
+
+    class RT_CCM_Handlers_Export CB_Handler
     {
-	class ConnectionBandsDef;
-
-	/*
-	 * @class CB_Handler
-	 * A brief Handler class for <ConnectionBands>
-	 */
-
-	class RT_CCM_Handlers_Export CB_Handler
-	{
-        public:
-          static bool connection_band (const ConnectionBandsDef &src,
-                                       ::CIAO::DAnCE::ORS_ConnectionBands &dest);
-          
-          static ConnectionBandsDef connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src);
-          
-          //          static IDREF_Base<::CIAO::DAnCE::ORS_ConnectionBands> IDREF;
-	};
-    }
+    public:
+      static bool connection_band (const ConnectionBandsDef &src,
+                                   ::CIAO::DAnCE::ORS_ConnectionBands &dest);
+
+      static ConnectionBandsDef connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src);
+
+      //          static IDREF_Base<::CIAO::DAnCE::ORS_ConnectionBands> IDREF;
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index d56f03149eb..af9d71cfbee 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "CIAOServerResources.hpp"
 
 namespace CIAO
@@ -16,12 +16,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 +63,7 @@ namespace CIAO
 
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     cmdline_p () const
     {
@@ -92,7 +92,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     svcconf_p () const
     {
@@ -121,7 +121,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     ::CIAO::Config_Handlers::ORBConfigs const& ServerResourcesDef::
     orbConfigs () const
     {
@@ -135,7 +135,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     id_p () const
     {
@@ -171,12 +171,12 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    // 
+    //
 
     ServerCmdlineOptions::
     ServerCmdlineOptions ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -187,11 +187,8 @@ namespace CIAO
     ::XSCRT::Type (),
     regulator__ ()
     {
-      arg_.reserve (s.arg_.size ());
       {
-        for (arg_const_iterator i (s.arg_.begin ());
-        i != s.arg_.end ();
-        ++i) add_arg (*i);
+        for (arg_const_iterator i (s.arg_.begin ());i != s.arg_.end ();++i) add_arg (*i);
       }
     }
 
@@ -199,11 +196,8 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::ServerCmdlineOptions const& s)
     {
       arg_.clear ();
-      arg_.reserve (s.arg_.size ());
       {
-        for (arg_const_iterator i (s.arg_.begin ());
-        i != s.arg_.end ();
-        ++i) add_arg (*i);
+        for (arg_const_iterator i (s.arg_.begin ());i != s.arg_.end ();++i) add_arg (*i);
       }
 
       return *this;
@@ -211,7 +205,7 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    // 
+    //
     ServerCmdlineOptions::arg_iterator ServerCmdlineOptions::
     begin_arg ()
     {
@@ -239,26 +233,7 @@ namespace CIAO
     void ServerCmdlineOptions::
     add_arg (::XMLSchema::string< ACE_TCHAR > const& e)
     {
-      if (arg_.capacity () < arg_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::string< ACE_TCHAR > > v;
-        v.reserve (arg_.size () + 1);
-
-        for (arg_iterator i = arg_.begin ();
-        i != arg_.end ();
-         ++i)
-        {
-          ::XMLSchema::string< ACE_TCHAR >& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        arg_.swap (v);
-      }
-
       arg_.push_back (e);
-      arg_.back ().container (this);
     }
 
     size_t ServerCmdlineOptions::
@@ -269,12 +244,12 @@ namespace CIAO
 
 
     // ACESvcConf
-    // 
+    //
 
     ACESvcConf::
     ACESvcConf ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -300,7 +275,7 @@ namespace CIAO
 
 
     // ACESvcConf
-    // 
+    //
     bool ACESvcConf::
     uri_p () const
     {
@@ -330,12 +305,12 @@ namespace CIAO
 
 
     // ORBConfigs
-    // 
+    //
 
     ORBConfigs::
     ORBConfigs ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -348,11 +323,8 @@ namespace CIAO
     regulator__ ()
     {
       if (resources_.get ()) resources_->container (this);
-      policySet_.reserve (s.policySet_.size ());
       {
-        for (policySet_const_iterator i (s.policySet_.begin ());
-        i != s.policySet_.end ();
-        ++i) add_policySet (*i);
+        for (policySet_const_iterator i (s.policySet_.begin ());i != s.policySet_.end ();++i) add_policySet (*i);
       }
     }
 
@@ -363,11 +335,8 @@ namespace CIAO
       else resources_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ORBResources > (0);
 
       policySet_.clear ();
-      policySet_.reserve (s.policySet_.size ());
       {
-        for (policySet_const_iterator i (s.policySet_.begin ());
-        i != s.policySet_.end ();
-        ++i) add_policySet (*i);
+        for (policySet_const_iterator i (s.policySet_.begin ());i != s.policySet_.end ();++i) add_policySet (*i);
       }
 
       return *this;
@@ -375,7 +344,7 @@ namespace CIAO
 
 
     // ORBConfigs
-    // 
+    //
     bool ORBConfigs::
     resources_p () const
     {
@@ -404,7 +373,7 @@ namespace CIAO
     }
 
     // ORBConfigs
-    // 
+    //
     ORBConfigs::policySet_iterator ORBConfigs::
     begin_policySet ()
     {
@@ -432,26 +401,7 @@ namespace CIAO
     void ORBConfigs::
     add_policySet (::CIAO::Config_Handlers::PolicySet const& e)
     {
-      if (policySet_.capacity () < policySet_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PolicySet > v;
-        v.reserve (policySet_.size () + 1);
-
-        for (policySet_iterator i = policySet_.begin ();
-        i != policySet_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::PolicySet& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        policySet_.swap (v);
-      }
-
       policySet_.push_back (e);
-      policySet_.back ().container (this);
     }
 
     size_t ORBConfigs::
@@ -462,12 +412,12 @@ namespace CIAO
 
 
     // ORBResources
-    // 
+    //
 
     ORBResources::
     ORBResources ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -478,25 +428,16 @@ namespace CIAO
     ::XSCRT::Type (),
     regulator__ ()
     {
-      threadpool_.reserve (s.threadpool_.size ());
       {
-        for (threadpool_const_iterator i (s.threadpool_.begin ());
-        i != s.threadpool_.end ();
-        ++i) add_threadpool (*i);
+        for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
       }
 
-      threadpoolWithLanes_.reserve (s.threadpoolWithLanes_.size ());
       {
-        for (threadpoolWithLanes_const_iterator i (s.threadpoolWithLanes_.begin ());
-        i != s.threadpoolWithLanes_.end ();
-        ++i) add_threadpoolWithLanes (*i);
+        for (threadpoolWithLanes_const_iterator i (s.threadpoolWithLanes_.begin ());i != s.threadpoolWithLanes_.end ();++i) add_threadpoolWithLanes (*i);
       }
 
-      connectionBands_.reserve (s.connectionBands_.size ());
       {
-        for (connectionBands_const_iterator i (s.connectionBands_.begin ());
-        i != s.connectionBands_.end ();
-        ++i) add_connectionBands (*i);
+        for (connectionBands_const_iterator i (s.connectionBands_.begin ());i != s.connectionBands_.end ();++i) add_connectionBands (*i);
       }
     }
 
@@ -504,27 +445,18 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::ORBResources const& s)
     {
       threadpool_.clear ();
-      threadpool_.reserve (s.threadpool_.size ());
       {
-        for (threadpool_const_iterator i (s.threadpool_.begin ());
-        i != s.threadpool_.end ();
-        ++i) add_threadpool (*i);
+        for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
       }
 
       threadpoolWithLanes_.clear ();
-      threadpoolWithLanes_.reserve (s.threadpoolWithLanes_.size ());
       {
-        for (threadpoolWithLanes_const_iterator i (s.threadpoolWithLanes_.begin ());
-        i != s.threadpoolWithLanes_.end ();
-        ++i) add_threadpoolWithLanes (*i);
+        for (threadpoolWithLanes_const_iterator i (s.threadpoolWithLanes_.begin ());i != s.threadpoolWithLanes_.end ();++i) add_threadpoolWithLanes (*i);
       }
 
       connectionBands_.clear ();
-      connectionBands_.reserve (s.connectionBands_.size ());
       {
-        for (connectionBands_const_iterator i (s.connectionBands_.begin ());
-        i != s.connectionBands_.end ();
-        ++i) add_connectionBands (*i);
+        for (connectionBands_const_iterator i (s.connectionBands_.begin ());i != s.connectionBands_.end ();++i) add_connectionBands (*i);
       }
 
       return *this;
@@ -532,7 +464,7 @@ namespace CIAO
 
 
     // ORBResources
-    // 
+    //
     ORBResources::threadpool_iterator ORBResources::
     begin_threadpool ()
     {
@@ -560,26 +492,7 @@ namespace CIAO
     void ORBResources::
     add_threadpool (::CIAO::Config_Handlers::ThreadpoolDef const& e)
     {
-      if (threadpool_.capacity () < threadpool_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef > v;
-        v.reserve (threadpool_.size () + 1);
-
-        for (threadpool_iterator i = threadpool_.begin ();
-        i != threadpool_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::ThreadpoolDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        threadpool_.swap (v);
-      }
-
       threadpool_.push_back (e);
-      threadpool_.back ().container (this);
     }
 
     size_t ORBResources::
@@ -589,7 +502,7 @@ namespace CIAO
     }
 
     // ORBResources
-    // 
+    //
     ORBResources::threadpoolWithLanes_iterator ORBResources::
     begin_threadpoolWithLanes ()
     {
@@ -617,26 +530,7 @@ namespace CIAO
     void ORBResources::
     add_threadpoolWithLanes (::CIAO::Config_Handlers::ThreadpoolWithLanesDef const& e)
     {
-      if (threadpoolWithLanes_.capacity () < threadpoolWithLanes_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > v;
-        v.reserve (threadpoolWithLanes_.size () + 1);
-
-        for (threadpoolWithLanes_iterator i = threadpoolWithLanes_.begin ();
-        i != threadpoolWithLanes_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::ThreadpoolWithLanesDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        threadpoolWithLanes_.swap (v);
-      }
-
       threadpoolWithLanes_.push_back (e);
-      threadpoolWithLanes_.back ().container (this);
     }
 
     size_t ORBResources::
@@ -646,7 +540,7 @@ namespace CIAO
     }
 
     // ORBResources
-    // 
+    //
     ORBResources::connectionBands_iterator ORBResources::
     begin_connectionBands ()
     {
@@ -674,26 +568,7 @@ namespace CIAO
     void ORBResources::
     add_connectionBands (::CIAO::Config_Handlers::ConnectionBandsDef const& e)
     {
-      if (connectionBands_.capacity () < connectionBands_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef > v;
-        v.reserve (connectionBands_.size () + 1);
-
-        for (connectionBands_iterator i = connectionBands_.begin ();
-        i != connectionBands_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::ConnectionBandsDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        connectionBands_.swap (v);
-      }
-
       connectionBands_.push_back (e);
-      connectionBands_.back ().container (this);
     }
 
     size_t ORBResources::
@@ -704,11 +579,11 @@ namespace CIAO
 
 
     // Priority
-    // 
+    //
 
     Priority::
     Priority (::XMLSchema::int_ const& b__)
-    : 
+    :
     Base__ (b__),
     regulator__ ()
     {
@@ -733,18 +608,18 @@ namespace CIAO
 
 
     // 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::boolean const& allow_request_buffering__,
-    ::XMLSchema::unsignedLong const& max_buffered_requests__,
-    ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    : 
-    ::XSCRT::Type (), 
+                   ::XMLSchema::unsignedLong const& static_threads__,
+                   ::XMLSchema::unsignedLong const& dynamic_threads__,
+                   ::CIAO::Config_Handlers::Priority const& default_priority__,
+                   ::XMLSchema::boolean const& allow_request_buffering__,
+                   ::XMLSchema::unsignedLong const& max_buffered_requests__,
+                   ::XMLSchema::unsignedLong const& max_request_buffered_size__)
+    :
+    ::XSCRT::Type (),
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (dynamic_threads__)),
@@ -812,7 +687,7 @@ namespace CIAO
 
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     stacksize () const
     {
@@ -826,7 +701,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     static_threads () const
     {
@@ -840,7 +715,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     dynamic_threads () const
     {
@@ -854,7 +729,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::CIAO::Config_Handlers::Priority const& ThreadpoolDef::
     default_priority () const
     {
@@ -868,7 +743,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolDef::
     allow_request_buffering () const
     {
@@ -882,7 +757,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_buffered_requests () const
     {
@@ -896,7 +771,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_request_buffered_size () const
     {
@@ -910,7 +785,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     bool ThreadpoolDef::
     id_p () const
     {
@@ -946,16 +821,16 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    // 
+    //
 
     ThreadpoolWithLanesDef::
     ThreadpoolWithLanesDef (::XMLSchema::unsignedLong const& stacksize__,
-    ::XMLSchema::boolean const& allow_borrowing__,
-    ::XMLSchema::boolean const& allow_request_buffering__,
-    ::XMLSchema::unsignedLong const& max_buffered_requests__,
-    ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    : 
-    ::XSCRT::Type (), 
+                            ::XMLSchema::boolean const& allow_borrowing__,
+                            ::XMLSchema::boolean const& allow_request_buffering__,
+                            ::XMLSchema::unsignedLong const& max_buffered_requests__,
+                            ::XMLSchema::unsignedLong const& max_request_buffered_size__)
+    :
+    ::XSCRT::Type (),
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     allow_borrowing_ (new ::XMLSchema::boolean (allow_borrowing__)),
     allow_request_buffering_ (new ::XMLSchema::boolean (allow_request_buffering__)),
@@ -982,11 +857,8 @@ namespace CIAO
     id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
     regulator__ ()
     {
-      threadpoolLane_.reserve (s.threadpoolLane_.size ());
       {
-        for (threadpoolLane_const_iterator i (s.threadpoolLane_.begin ());
-        i != s.threadpoolLane_.end ();
-        ++i) add_threadpoolLane (*i);
+        for (threadpoolLane_const_iterator i (s.threadpoolLane_.begin ());i != s.threadpoolLane_.end ();++i) add_threadpoolLane (*i);
       }
 
       stacksize_->container (this);
@@ -1001,11 +873,8 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::ThreadpoolWithLanesDef const& s)
     {
       threadpoolLane_.clear ();
-      threadpoolLane_.reserve (s.threadpoolLane_.size ());
       {
-        for (threadpoolLane_const_iterator i (s.threadpoolLane_.begin ());
-        i != s.threadpoolLane_.end ();
-        ++i) add_threadpoolLane (*i);
+        for (threadpoolLane_const_iterator i (s.threadpoolLane_.begin ());i != s.threadpoolLane_.end ();++i) add_threadpoolLane (*i);
       }
 
       stacksize (s.stacksize ());
@@ -1026,7 +895,7 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ThreadpoolWithLanesDef::threadpoolLane_iterator ThreadpoolWithLanesDef::
     begin_threadpoolLane ()
     {
@@ -1054,26 +923,7 @@ namespace CIAO
     void ThreadpoolWithLanesDef::
     add_threadpoolLane (::CIAO::Config_Handlers::ThreadpoolLaneDef const& e)
     {
-      if (threadpoolLane_.capacity () < threadpoolLane_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef > v;
-        v.reserve (threadpoolLane_.size () + 1);
-
-        for (threadpoolLane_iterator i = threadpoolLane_.begin ();
-        i != threadpoolLane_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::ThreadpoolLaneDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        threadpoolLane_.swap (v);
-      }
-
       threadpoolLane_.push_back (e);
-      threadpoolLane_.back ().container (this);
     }
 
     size_t ThreadpoolWithLanesDef::
@@ -1083,7 +933,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     stacksize () const
     {
@@ -1097,7 +947,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_borrowing () const
     {
@@ -1111,7 +961,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_request_buffering () const
     {
@@ -1125,7 +975,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_buffered_requests () const
     {
@@ -1139,7 +989,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_request_buffered_size () const
     {
@@ -1153,7 +1003,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     bool ThreadpoolWithLanesDef::
     id_p () const
     {
@@ -1189,14 +1039,14 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    // 
+    //
 
     ThreadpoolLaneDef::
     ThreadpoolLaneDef (::XMLSchema::unsignedLong const& static_threads__,
-    ::XMLSchema::unsignedLong const& dynamic_threads__,
-    ::CIAO::Config_Handlers::Priority const& priority__)
-    : 
-    ::XSCRT::Type (), 
+                       ::XMLSchema::unsignedLong const& dynamic_threads__,
+                       ::CIAO::Config_Handlers::Priority 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__)),
@@ -1235,7 +1085,7 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     static_threads () const
     {
@@ -1249,7 +1099,7 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     dynamic_threads () const
     {
@@ -1263,7 +1113,7 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::CIAO::Config_Handlers::Priority const& ThreadpoolLaneDef::
     priority () const
     {
@@ -1278,12 +1128,12 @@ namespace CIAO
 
 
     // ConnectionBandsDef
-    // 
+    //
 
     ConnectionBandsDef::
     ConnectionBandsDef ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -1295,11 +1145,8 @@ namespace CIAO
     id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
     regulator__ ()
     {
-      band_.reserve (s.band_.size ());
       {
-        for (band_const_iterator i (s.band_.begin ());
-        i != s.band_.end ();
-        ++i) add_band (*i);
+        for (band_const_iterator i (s.band_.begin ());i != s.band_.end ();++i) add_band (*i);
       }
 
       if (id_.get ()) id_->container (this);
@@ -1309,11 +1156,8 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::ConnectionBandsDef const& s)
     {
       band_.clear ();
-      band_.reserve (s.band_.size ());
       {
-        for (band_const_iterator i (s.band_.begin ());
-        i != s.band_.end ();
-        ++i) add_band (*i);
+        for (band_const_iterator i (s.band_.begin ());i != s.band_.end ();++i) add_band (*i);
       }
 
       if (s.id_.get ()) id (*(s.id_));
@@ -1324,7 +1168,7 @@ namespace CIAO
 
 
     // ConnectionBandsDef
-    // 
+    //
     ConnectionBandsDef::band_iterator ConnectionBandsDef::
     begin_band ()
     {
@@ -1352,26 +1196,7 @@ namespace CIAO
     void ConnectionBandsDef::
     add_band (::CIAO::Config_Handlers::PriorityBandDef const& e)
     {
-      if (band_.capacity () < band_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef > v;
-        v.reserve (band_.size () + 1);
-
-        for (band_iterator i = band_.begin ();
-        i != band_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::PriorityBandDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        band_.swap (v);
-      }
-
       band_.push_back (e);
-      band_.back ().container (this);
     }
 
     size_t ConnectionBandsDef::
@@ -1381,7 +1206,7 @@ namespace CIAO
     }
 
     // ConnectionBandsDef
-    // 
+    //
     bool ConnectionBandsDef::
     id_p () const
     {
@@ -1417,13 +1242,13 @@ namespace CIAO
 
 
     // PriorityBandDef
-    // 
+    //
 
     PriorityBandDef::
     PriorityBandDef (::XMLSchema::int_ const& low__,
-    ::XMLSchema::int_ const& high__)
-    : 
-    ::XSCRT::Type (), 
+                     ::XMLSchema::int_ const& high__)
+    :
+    ::XSCRT::Type (),
     low_ (new ::XMLSchema::int_ (low__)),
     high_ (new ::XMLSchema::int_ (high__)),
     regulator__ ()
@@ -1456,7 +1281,7 @@ namespace CIAO
 
 
     // PriorityBandDef
-    // 
+    //
     ::XMLSchema::int_ const& PriorityBandDef::
     low () const
     {
@@ -1470,7 +1295,7 @@ namespace CIAO
     }
 
     // PriorityBandDef
-    // 
+    //
     ::XMLSchema::int_ const& PriorityBandDef::
     high () const
     {
@@ -1485,12 +1310,12 @@ namespace CIAO
 
 
     // PolicySet
-    // 
+    //
 
     PolicySet::
     PolicySet ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -1502,25 +1327,16 @@ namespace CIAO
     id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
     regulator__ ()
     {
-      priorityModel_.reserve (s.priorityModel_.size ());
       {
-        for (priorityModel_const_iterator i (s.priorityModel_.begin ());
-        i != s.priorityModel_.end ();
-        ++i) add_priorityModel (*i);
+        for (priorityModel_const_iterator i (s.priorityModel_.begin ());i != s.priorityModel_.end ();++i) add_priorityModel (*i);
       }
 
-      threadpool_.reserve (s.threadpool_.size ());
       {
-        for (threadpool_const_iterator i (s.threadpool_.begin ());
-        i != s.threadpool_.end ();
-        ++i) add_threadpool (*i);
+        for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
       }
 
-      priorityBandedConnection_.reserve (s.priorityBandedConnection_.size ());
       {
-        for (priorityBandedConnection_const_iterator i (s.priorityBandedConnection_.begin ());
-        i != s.priorityBandedConnection_.end ();
-        ++i) add_priorityBandedConnection (*i);
+        for (priorityBandedConnection_const_iterator i (s.priorityBandedConnection_.begin ());i != s.priorityBandedConnection_.end ();++i) add_priorityBandedConnection (*i);
       }
 
       if (id_.get ()) id_->container (this);
@@ -1530,27 +1346,18 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::PolicySet const& s)
     {
       priorityModel_.clear ();
-      priorityModel_.reserve (s.priorityModel_.size ());
       {
-        for (priorityModel_const_iterator i (s.priorityModel_.begin ());
-        i != s.priorityModel_.end ();
-        ++i) add_priorityModel (*i);
+        for (priorityModel_const_iterator i (s.priorityModel_.begin ());i != s.priorityModel_.end ();++i) add_priorityModel (*i);
       }
 
       threadpool_.clear ();
-      threadpool_.reserve (s.threadpool_.size ());
       {
-        for (threadpool_const_iterator i (s.threadpool_.begin ());
-        i != s.threadpool_.end ();
-        ++i) add_threadpool (*i);
+        for (threadpool_const_iterator i (s.threadpool_.begin ());i != s.threadpool_.end ();++i) add_threadpool (*i);
       }
 
       priorityBandedConnection_.clear ();
-      priorityBandedConnection_.reserve (s.priorityBandedConnection_.size ());
       {
-        for (priorityBandedConnection_const_iterator i (s.priorityBandedConnection_.begin ());
-        i != s.priorityBandedConnection_.end ();
-        ++i) add_priorityBandedConnection (*i);
+        for (priorityBandedConnection_const_iterator i (s.priorityBandedConnection_.begin ());i != s.priorityBandedConnection_.end ();++i) add_priorityBandedConnection (*i);
       }
 
       if (s.id_.get ()) id (*(s.id_));
@@ -1561,7 +1368,7 @@ namespace CIAO
 
 
     // PolicySet
-    // 
+    //
     PolicySet::priorityModel_iterator PolicySet::
     begin_priorityModel ()
     {
@@ -1589,26 +1396,7 @@ namespace CIAO
     void PolicySet::
     add_priorityModel (::CIAO::Config_Handlers::PriorityModelPolicyDef const& e)
     {
-      if (priorityModel_.capacity () < priorityModel_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef > v;
-        v.reserve (priorityModel_.size () + 1);
-
-        for (priorityModel_iterator i = priorityModel_.begin ();
-        i != priorityModel_.end ();
-         ++i)
-        {
-          ::CIAO::Config_Handlers::PriorityModelPolicyDef& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        priorityModel_.swap (v);
-      }
-
       priorityModel_.push_back (e);
-      priorityModel_.back ().container (this);
     }
 
     size_t PolicySet::
@@ -1618,7 +1406,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     PolicySet::threadpool_iterator PolicySet::
     begin_threadpool ()
     {
@@ -1646,26 +1434,7 @@ namespace CIAO
     void PolicySet::
     add_threadpool (::XMLSchema::IDREF< ACE_TCHAR > const& e)
     {
-      if (threadpool_.capacity () < threadpool_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > v;
-        v.reserve (threadpool_.size () + 1);
-
-        for (threadpool_iterator i = threadpool_.begin ();
-        i != threadpool_.end ();
-         ++i)
-        {
-          ::XMLSchema::IDREF< ACE_TCHAR >& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        threadpool_.swap (v);
-      }
-
       threadpool_.push_back (e);
-      threadpool_.back ().container (this);
     }
 
     size_t PolicySet::
@@ -1675,7 +1444,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     PolicySet::priorityBandedConnection_iterator PolicySet::
     begin_priorityBandedConnection ()
     {
@@ -1703,26 +1472,7 @@ namespace CIAO
     void PolicySet::
     add_priorityBandedConnection (::XMLSchema::IDREF< ACE_TCHAR > const& e)
     {
-      if (priorityBandedConnection_.capacity () < priorityBandedConnection_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > v;
-        v.reserve (priorityBandedConnection_.size () + 1);
-
-        for (priorityBandedConnection_iterator i = priorityBandedConnection_.begin ();
-        i != priorityBandedConnection_.end ();
-         ++i)
-        {
-          ::XMLSchema::IDREF< ACE_TCHAR >& t = *i;
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-        }
-
-        priorityBandedConnection_.swap (v);
-      }
-
       priorityBandedConnection_.push_back (e);
-      priorityBandedConnection_.back ().container (this);
     }
 
     size_t PolicySet::
@@ -1732,7 +1482,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     bool PolicySet::
     id_p () const
     {
@@ -1768,7 +1518,7 @@ namespace CIAO
 
 
     // PriorityModel
-    // 
+    //
 
     PriorityModel::Value PriorityModel::
     integral () const
@@ -1795,12 +1545,12 @@ namespace CIAO
     }
 
     // PriorityModelPolicyDef
-    // 
+    //
 
     PriorityModelPolicyDef::
     PriorityModelPolicyDef (::CIAO::Config_Handlers::PriorityModel const& priority_model__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     priority_model_ (new ::CIAO::Config_Handlers::PriorityModel (priority_model__)),
     regulator__ ()
     {
@@ -1832,7 +1582,7 @@ namespace CIAO
 
 
     // PriorityModelPolicyDef
-    // 
+    //
     ::CIAO::Config_Handlers::PriorityModel const& PriorityModelPolicyDef::
     priority_model () const
     {
@@ -1846,7 +1596,7 @@ namespace CIAO
     }
 
     // PriorityModelPolicyDef
-    // 
+    //
     bool PriorityModelPolicyDef::
     server_priority_p () const
     {
@@ -1919,7 +1669,7 @@ namespace CIAO
           orbConfigs_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1934,7 +1684,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1961,7 +1711,7 @@ namespace CIAO
           add_arg (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1988,7 +1738,7 @@ namespace CIAO
           uri (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2021,7 +1771,7 @@ namespace CIAO
           add_policySet (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2060,7 +1810,7 @@ namespace CIAO
           add_connectionBands (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2140,7 +1890,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2155,7 +1905,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2212,7 +1962,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2227,7 +1977,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2266,7 +2016,7 @@ namespace CIAO
           priority_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2293,7 +2043,7 @@ namespace CIAO
           add_band (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2308,7 +2058,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2341,7 +2091,7 @@ namespace CIAO
           high_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2380,7 +2130,7 @@ namespace CIAO
           add_priorityBandedConnection (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2395,7 +2145,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2412,7 +2162,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else 
+      else
       {
       }
     }
@@ -2425,7 +2175,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else 
+      else
       {
       }
     }
@@ -2454,7 +2204,7 @@ namespace CIAO
           priority_model_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2469,7 +2219,7 @@ namespace CIAO
           server_priority (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2885,9 +2635,7 @@ namespace CIAO
         if (b != e)
         {
           arg_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) arg_next (o);
@@ -2907,9 +2655,7 @@ namespace CIAO
         if (b != e)
         {
           arg_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) arg_next (o);
@@ -3089,9 +2835,7 @@ namespace CIAO
         if (b != e)
         {
           policySet_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) policySet_next (o);
@@ -3111,9 +2855,7 @@ namespace CIAO
         if (b != e)
         {
           policySet_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) policySet_next (o);
@@ -3207,9 +2949,7 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -3231,9 +2971,7 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -3295,9 +3033,7 @@ namespace CIAO
         if (b != e)
         {
           threadpoolWithLanes_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpoolWithLanes_next (o);
@@ -3319,9 +3055,7 @@ namespace CIAO
         if (b != e)
         {
           threadpoolWithLanes_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpoolWithLanes_next (o);
@@ -3383,9 +3117,7 @@ namespace CIAO
         if (b != e)
         {
           connectionBands_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) connectionBands_next (o);
@@ -3407,9 +3139,7 @@ namespace CIAO
         if (b != e)
         {
           connectionBands_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) connectionBands_next (o);
@@ -3725,9 +3455,7 @@ namespace CIAO
         if (b != e)
         {
           threadpoolLane_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpoolLane_next (o);
@@ -3747,9 +3475,7 @@ namespace CIAO
         if (b != e)
         {
           threadpoolLane_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpoolLane_next (o);
@@ -4005,9 +3731,7 @@ namespace CIAO
         if (b != e)
         {
           band_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) band_next (o);
@@ -4027,9 +3751,7 @@ namespace CIAO
         if (b != e)
         {
           band_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) band_next (o);
@@ -4215,9 +3937,7 @@ namespace CIAO
         if (b != e)
         {
           priorityModel_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) priorityModel_next (o);
@@ -4239,9 +3959,7 @@ namespace CIAO
         if (b != e)
         {
           priorityModel_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) priorityModel_next (o);
@@ -4303,9 +4021,7 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -4327,9 +4043,7 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -4391,9 +4105,7 @@ namespace CIAO
         if (b != e)
         {
           priorityBandedConnection_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) priorityBandedConnection_next (o);
@@ -4415,9 +4127,7 @@ namespace CIAO
         if (b != e)
         {
           priorityBandedConnection_pre (o);
-          for (;
-           b != e;
-          )
+          for (; b != e;)
           {
             dispatch (*b);
             if (++b != e) priorityBandedConnection_next (o);
@@ -4855,10 +4565,6 @@ namespace CIAO
       void Priority::
       traverse (Type const& o)
       {
-        std::basic_ostringstream<ACE_TCHAR> os;
-        os << o;
-        top_().value (os.str ());
-        //::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >::traverse (o);
         Traversal::Priority::traverse (o);
       }
 
@@ -5277,7 +4983,7 @@ 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 
+        else
         {
         }
 
@@ -5365,7 +5071,7 @@ namespace CIAO
       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 ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index 1c5ac74417a..7493f703fb9 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -3,16 +3,13 @@
  *
  * 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>
  */
 
 
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -47,7 +44,7 @@ namespace CIAO
 }
 
 #include <memory>
-#include <vector>
+#include <list>
 #include "XMLSchema/Types.hpp"
 
 namespace CIAO
@@ -60,7 +57,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // cmdline
-      // 
+      //
       public:
       bool cmdline_p () const;
       ::CIAO::Config_Handlers::ServerCmdlineOptions const& cmdline () const;
@@ -70,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;
@@ -80,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& );
@@ -89,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;
@@ -119,10 +116,10 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // arg
-      // 
+      //
       public:
-      typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
-      typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::const_iterator arg_const_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator arg_const_iterator;
       arg_iterator begin_arg ();
       arg_iterator end_arg ();
       arg_const_iterator begin_arg () const;
@@ -131,7 +128,7 @@ namespace CIAO
       size_t count_arg (void) const;
 
       protected:
-      ::std::vector< ::XMLSchema::string< ACE_TCHAR > > arg_;
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > arg_;
 
       public:
       ServerCmdlineOptions ();
@@ -153,7 +150,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // uri
-      // 
+      //
       public:
       bool uri_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& uri () const;
@@ -182,7 +179,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resources
-      // 
+      //
       public:
       bool resources_p () const;
       ::CIAO::Config_Handlers::ORBResources const& resources () const;
@@ -192,10 +189,10 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ORBResources > resources_;
 
       // policySet
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::PolicySet >::const_iterator policySet_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::const_iterator policySet_const_iterator;
       policySet_iterator begin_policySet ();
       policySet_iterator end_policySet ();
       policySet_const_iterator begin_policySet () const;
@@ -204,7 +201,7 @@ namespace CIAO
       size_t count_policySet (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::PolicySet > policySet_;
+      ::std::list< ::CIAO::Config_Handlers::PolicySet > policySet_;
 
       public:
       ORBConfigs ();
@@ -226,10 +223,10 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // threadpool
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef >::const_iterator threadpool_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::const_iterator threadpool_const_iterator;
       threadpool_iterator begin_threadpool ();
       threadpool_iterator end_threadpool ();
       threadpool_const_iterator begin_threadpool () const;
@@ -238,13 +235,13 @@ namespace CIAO
       size_t count_threadpool (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
+      ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
 
       // threadpoolWithLanes
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::const_iterator threadpoolWithLanes_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::const_iterator threadpoolWithLanes_const_iterator;
       threadpoolWithLanes_iterator begin_threadpoolWithLanes ();
       threadpoolWithLanes_iterator end_threadpoolWithLanes ();
       threadpoolWithLanes_const_iterator begin_threadpoolWithLanes () const;
@@ -253,13 +250,13 @@ namespace CIAO
       size_t count_threadpoolWithLanes (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
+      ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
 
       // connectionBands
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef >::const_iterator connectionBands_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::const_iterator connectionBands_const_iterator;
       connectionBands_iterator begin_connectionBands ();
       connectionBands_iterator end_connectionBands ();
       connectionBands_const_iterator begin_connectionBands () const;
@@ -268,7 +265,7 @@ namespace CIAO
       size_t count_connectionBands (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef > connectionBands_;
+      ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef > connectionBands_;
 
       public:
       ORBResources ();
@@ -309,7 +306,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // stacksize
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -318,7 +315,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // static_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -327,7 +324,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& );
@@ -336,7 +333,7 @@ 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& );
@@ -345,7 +342,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > default_priority_;
 
       // allow_request_buffering
-      // 
+      //
       public:
       ::XMLSchema::boolean const& allow_request_buffering () const;
       void allow_request_buffering (::XMLSchema::boolean const& );
@@ -354,7 +351,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& );
@@ -363,7 +360,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& );
@@ -372,7 +369,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;
@@ -384,12 +381,12 @@ namespace CIAO
 
       public:
       ThreadpoolDef (::XMLSchema::unsignedLong const& stacksize__,
-      ::XMLSchema::unsignedLong const& static_threads__,
-      ::XMLSchema::unsignedLong const& dynamic_threads__,
-      ::CIAO::Config_Handlers::Priority const& default_priority__,
-      ::XMLSchema::boolean const& allow_request_buffering__,
-      ::XMLSchema::unsignedLong const& max_buffered_requests__,
-      ::XMLSchema::unsignedLong const& max_request_buffered_size__);
+                     ::XMLSchema::unsignedLong const& static_threads__,
+                     ::XMLSchema::unsignedLong const& dynamic_threads__,
+                     ::CIAO::Config_Handlers::Priority const& default_priority__,
+                     ::XMLSchema::boolean const& allow_request_buffering__,
+                     ::XMLSchema::unsignedLong const& max_buffered_requests__,
+                     ::XMLSchema::unsignedLong const& max_request_buffered_size__);
 
       ThreadpoolDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ThreadpoolDef (ThreadpoolDef const& s);
@@ -408,10 +405,10 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // threadpoolLane
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
       threadpoolLane_iterator begin_threadpoolLane ();
       threadpoolLane_iterator end_threadpoolLane ();
       threadpoolLane_const_iterator begin_threadpoolLane () const;
@@ -420,10 +417,10 @@ namespace CIAO
       size_t count_threadpoolLane (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
+      ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
 
       // stacksize
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -432,7 +429,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // allow_borrowing
-      // 
+      //
       public:
       ::XMLSchema::boolean const& allow_borrowing () const;
       void allow_borrowing (::XMLSchema::boolean const& );
@@ -441,7 +438,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& );
@@ -450,7 +447,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& );
@@ -459,7 +456,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& );
@@ -468,7 +465,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;
@@ -480,10 +477,10 @@ namespace CIAO
 
       public:
       ThreadpoolWithLanesDef (::XMLSchema::unsignedLong const& stacksize__,
-      ::XMLSchema::boolean const& allow_borrowing__,
-      ::XMLSchema::boolean const& allow_request_buffering__,
-      ::XMLSchema::unsignedLong const& max_buffered_requests__,
-      ::XMLSchema::unsignedLong const& max_request_buffered_size__);
+                              ::XMLSchema::boolean const& allow_borrowing__,
+                              ::XMLSchema::boolean const& allow_request_buffering__,
+                              ::XMLSchema::unsignedLong const& max_buffered_requests__,
+                              ::XMLSchema::unsignedLong const& max_request_buffered_size__);
 
       ThreadpoolWithLanesDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ThreadpoolWithLanesDef (ThreadpoolWithLanesDef const& s);
@@ -502,7 +499,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // static_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -511,7 +508,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& );
@@ -520,7 +517,7 @@ 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& );
@@ -530,8 +527,8 @@ namespace CIAO
 
       public:
       ThreadpoolLaneDef (::XMLSchema::unsignedLong const& static_threads__,
-      ::XMLSchema::unsignedLong const& dynamic_threads__,
-      ::CIAO::Config_Handlers::Priority const& priority__);
+                         ::XMLSchema::unsignedLong const& dynamic_threads__,
+                         ::CIAO::Config_Handlers::Priority const& priority__);
 
       ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ThreadpoolLaneDef (ThreadpoolLaneDef const& s);
@@ -550,10 +547,10 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // band
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
       band_iterator begin_band ();
       band_iterator end_band ();
       band_const_iterator begin_band () const;
@@ -562,10 +559,10 @@ namespace CIAO
       size_t count_band (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef > band_;
+      ::std::list< ::CIAO::Config_Handlers::PriorityBandDef > band_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -595,7 +592,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // low
-      // 
+      //
       public:
       ::XMLSchema::int_ const& low () const;
       void low (::XMLSchema::int_ const& );
@@ -604,7 +601,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::int_ > low_;
 
       // high
-      // 
+      //
       public:
       ::XMLSchema::int_ const& high () const;
       void high (::XMLSchema::int_ const& );
@@ -614,7 +611,7 @@ namespace CIAO
 
       public:
       PriorityBandDef (::XMLSchema::int_ const& low__,
-      ::XMLSchema::int_ const& high__);
+                       ::XMLSchema::int_ const& high__);
 
       PriorityBandDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       PriorityBandDef (PriorityBandDef const& s);
@@ -633,10 +630,10 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // priorityModel
-      // 
+      //
       public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::const_iterator priorityModel_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::const_iterator priorityModel_const_iterator;
       priorityModel_iterator begin_priorityModel ();
       priorityModel_iterator end_priorityModel ();
       priorityModel_const_iterator begin_priorityModel () const;
@@ -645,13 +642,13 @@ namespace CIAO
       size_t count_priorityModel (void) const;
 
       protected:
-      ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
+      ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
 
       // threadpool
-      // 
+      //
       public:
-      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
-      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator threadpool_const_iterator;
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator threadpool_const_iterator;
       threadpool_iterator begin_threadpool ();
       threadpool_iterator end_threadpool ();
       threadpool_const_iterator begin_threadpool () const;
@@ -660,13 +657,13 @@ namespace CIAO
       size_t count_threadpool (void) const;
 
       protected:
-      ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
+      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
 
       // priorityBandedConnection
-      // 
+      //
       public:
-      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
-      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
+      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
       priorityBandedConnection_iterator begin_priorityBandedConnection ();
       priorityBandedConnection_iterator end_priorityBandedConnection ();
       priorityBandedConnection_const_iterator begin_priorityBandedConnection () const;
@@ -675,10 +672,10 @@ namespace CIAO
       size_t count_priorityBandedConnection (void) const;
 
       protected:
-      ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
+      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -720,10 +717,10 @@ namespace CIAO
       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:
@@ -743,7 +740,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // priority_model
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::PriorityModel const& priority_model () const;
       void priority_model (::CIAO::Config_Handlers::PriorityModel const& );
@@ -752,7 +749,7 @@ 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;
@@ -1593,14 +1590,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1608,13 +1604,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         cmdline (Type &o)
         {
 
@@ -1622,13 +1615,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         cmdline (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         svcconf (Type &o)
         {
 
@@ -1636,13 +1626,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         svcconf (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         orbConfigs (Type &o)
         {
 
@@ -1650,13 +1637,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         orbConfigs (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -1664,7 +1648,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -1672,14 +1655,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1687,13 +1669,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         arg_pre (Type &o)
         {
 
@@ -1701,13 +1680,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         arg_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         arg_next (Type &o)
         {
 
@@ -1715,13 +1691,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         arg_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         arg_post (Type &o)
         {
 
@@ -1729,7 +1702,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         arg_post (Type const&);
 
@@ -1737,14 +1709,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1752,13 +1723,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         uri (Type &o)
         {
 
@@ -1766,7 +1734,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         uri (Type const&);
 
@@ -1774,14 +1741,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1789,13 +1755,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         resources (Type &o)
         {
 
@@ -1803,13 +1766,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         resources (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         policySet_pre (Type &o)
         {
 
@@ -1817,13 +1777,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         policySet_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         policySet_next (Type &o)
         {
 
@@ -1831,13 +1788,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         policySet_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         policySet_post (Type &o)
         {
 
@@ -1845,7 +1799,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         policySet_post (Type const&);
 
@@ -1853,14 +1806,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1868,13 +1820,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_pre (Type &o)
         {
 
@@ -1882,13 +1831,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_next (Type &o)
         {
 
@@ -1896,13 +1842,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_post (Type &o)
         {
 
@@ -1910,13 +1853,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolWithLanes_pre (Type &o)
         {
 
@@ -1924,13 +1864,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolWithLanes_next (Type &o)
         {
 
@@ -1938,13 +1875,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolWithLanes_post (Type &o)
         {
 
@@ -1952,13 +1886,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         connectionBands_pre (Type &o)
         {
 
@@ -1966,13 +1897,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         connectionBands_next (Type &o)
         {
 
@@ -1980,13 +1908,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         connectionBands_post (Type &o)
         {
 
@@ -1994,7 +1919,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_post (Type const&);
 
@@ -2002,22 +1926,20 @@ namespace CIAO
         ORBResources ();
       };
 
-      struct Priority : Traversal::Priority, 
-//      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      struct Priority : Traversal::Priority,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Priority Type;
         Priority (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
+
           this->traverse (const_cast <Type const &> (o));
         }
 
-        #endif /* __BORLANDC__ */
+
         virtual void
         traverse (Type const&);
 
@@ -2025,14 +1947,13 @@ namespace CIAO
         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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2040,13 +1961,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         stacksize (Type &o)
         {
 
@@ -2054,13 +1972,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         stacksize (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         static_threads (Type &o)
         {
 
@@ -2068,13 +1983,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         static_threads (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         dynamic_threads (Type &o)
         {
 
@@ -2082,13 +1994,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         dynamic_threads (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         default_priority (Type &o)
         {
 
@@ -2096,13 +2005,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         default_priority (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         allow_request_buffering (Type &o)
         {
 
@@ -2110,13 +2016,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         allow_request_buffering (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         max_buffered_requests (Type &o)
         {
 
@@ -2124,13 +2027,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         max_buffered_requests (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         max_request_buffered_size (Type &o)
         {
 
@@ -2138,13 +2038,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         max_request_buffered_size (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2152,7 +2049,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2160,14 +2056,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2175,13 +2070,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolLane_pre (Type &o)
         {
 
@@ -2189,13 +2081,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolLane_next (Type &o)
         {
 
@@ -2203,13 +2092,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpoolLane_post (Type &o)
         {
 
@@ -2217,13 +2103,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         stacksize (Type &o)
         {
 
@@ -2231,13 +2114,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         stacksize (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         allow_borrowing (Type &o)
         {
 
@@ -2245,13 +2125,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         allow_borrowing (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         allow_request_buffering (Type &o)
         {
 
@@ -2259,13 +2136,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         allow_request_buffering (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         max_buffered_requests (Type &o)
         {
 
@@ -2273,13 +2147,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         max_buffered_requests (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         max_request_buffered_size (Type &o)
         {
 
@@ -2287,13 +2158,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         max_request_buffered_size (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2301,7 +2169,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2309,14 +2176,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2324,13 +2190,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         static_threads (Type &o)
         {
 
@@ -2338,13 +2201,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         static_threads (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         dynamic_threads (Type &o)
         {
 
@@ -2352,13 +2212,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         dynamic_threads (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priority (Type &o)
         {
 
@@ -2366,7 +2223,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priority (Type const&);
 
@@ -2374,14 +2230,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2389,13 +2244,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         band_pre (Type &o)
         {
 
@@ -2403,13 +2255,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         band_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         band_next (Type &o)
         {
 
@@ -2417,13 +2266,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         band_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         band_post (Type &o)
         {
 
@@ -2431,13 +2277,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         band_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2445,7 +2288,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2453,14 +2295,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2468,13 +2309,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         low (Type &o)
         {
 
@@ -2482,13 +2320,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         low (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         high (Type &o)
         {
 
@@ -2496,7 +2331,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         high (Type const&);
 
@@ -2504,14 +2338,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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2519,13 +2352,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityModel_pre (Type &o)
         {
 
@@ -2533,13 +2363,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityModel_next (Type &o)
         {
 
@@ -2547,13 +2374,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityModel_post (Type &o)
         {
 
@@ -2561,13 +2385,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_pre (Type &o)
         {
 
@@ -2575,13 +2396,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_next (Type &o)
         {
 
@@ -2589,13 +2407,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         threadpool_post (Type &o)
         {
 
@@ -2603,13 +2418,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         threadpool_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityBandedConnection_pre (Type &o)
         {
 
@@ -2617,13 +2429,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityBandedConnection_next (Type &o)
         {
 
@@ -2631,13 +2440,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priorityBandedConnection_post (Type &o)
         {
 
@@ -2645,13 +2451,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2659,7 +2462,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2667,19 +2469,17 @@ namespace CIAO
         PolicySet ();
       };
 
-      struct PriorityModel : Traversal::PriorityModel, 
+      struct PriorityModel : Traversal::PriorityModel,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         PriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void PriorityModel::
+        virtual void
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -2687,14 +2487,13 @@ namespace CIAO
         PriorityModel ();
       };
 
-      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef, 
+      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PriorityModelPolicyDef Type;
         PriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2702,13 +2501,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         priority_model (Type &o)
         {
 
@@ -2716,13 +2512,10 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         priority_model (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
+        virtual void
         server_priority (Type &o)
         {
 
@@ -2730,7 +2523,6 @@ namespace CIAO
         }
 
 
-        #endif /* __BORLANDC__ */
         virtual void
         server_priority (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index c810c4e44ea..8edf1ef9980 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -6,40 +6,40 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    bool CLA_Handler::commandline_arguments (const ServerResourcesDef &src,
+                                             ::CIAO::DAnCE::CommandlineArgs &dest)
     {
-	bool CLA_Handler::commandline_arguments (const ServerResourcesDef &src,
-                                                 ::CIAO::DAnCE::CommandlineArgs &dest)
-	{
-	    ServerCmdlineOptions sco = src.cmdline();
-	   
-	    for(ServerCmdlineOptions::arg_iterator loc = sco.begin_arg();
-		loc != sco.end_arg();
-		loc++)
-	    {
-		CORBA::ULong len = dest.length();
-
-		dest.length(len+1);
-                
-                dest[len] = CORBA::string_dup (loc->c_str ());
-	    }
-
-	    return true;	
-	}
-
-        ServerCmdlineOptions
-	CLA_Handler::commandline_argument (const CIAO::DAnCE::CommandlineArgs &src)
-	{
-          ServerCmdlineOptions co;
-          
-          for  (CORBA::ULong i = 0;
-                i < src.length ();
-                ++i)
-            {
-              co.add_arg (src[i].in ());
-            }
-          
-          return co;
+      ServerCmdlineOptions sco = src.cmdline();
+
+      for(ServerCmdlineOptions::arg_iterator loc = sco.begin_arg();
+          loc != sco.end_arg();
+          loc++)
+        {
+          CORBA::ULong len = dest.length();
+
+          dest.length(len+1);
+
+          dest[len] = CORBA::string_dup (loc->c_str ());
+        }
+
+      return true;
+    }
+
+    ServerCmdlineOptions
+    CLA_Handler::commandline_argument (const CIAO::DAnCE::CommandlineArgs &src)
+    {
+      ServerCmdlineOptions co;
+
+      for  (CORBA::ULong i = 0;
+            i < src.length ();
+            ++i)
+        {
+          co.add_arg (src[i]);
         }
+
+      return co;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 13d115a5b2d..ae917f885e5 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
@@ -21,31 +21,31 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 namespace CIAO
-{   
-    namespace Config_Handlers
+{
+  namespace Config_Handlers
+  {
+
+    class ServerResourcesDef;
+    class ServerCmdlineOptions;
+
+    /*
+     * class CLA_Handler
+     * This is a brief Handler class for <CommandlineArg>
+     */
+
+    class RT_CCM_Handlers_Export CLA_Handler
     {
-	
-	class ServerResourcesDef;
-	class ServerCmdlineOptions;
-
-	/*
-	 * class CLA_Handler
-	 * This is a brief Handler class for <CommandlineArg>
-	 */
-	
-	class RT_CCM_Handlers_Export CLA_Handler
-	{
-	public:
-	    static bool
-		commandline_arguments (
-		    const ServerResourcesDef &src,
-		    ::CIAO::DAnCE::CommandlineArgs &dest);
-	    
-	    static ServerCmdlineOptions
-            commandline_argument (const ::CIAO::DAnCE::CommandlineArgs &src);
-
-	};
-    }
+    public:
+      static bool
+      commandline_arguments (
+                             const ServerResourcesDef &src,
+                             ::CIAO::DAnCE::CommandlineArgs &dest);
+
+      static ServerCmdlineOptions
+      commandline_argument (const ::CIAO::DAnCE::CommandlineArgs &src);
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
index 1adf552c09e..5a8fc9114f2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
@@ -8,45 +8,45 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+
+    bool OC_Handler::orb_config (
+                                 const ORBConfigs &src,
+                                 ::CIAO::DAnCE::ORBConfigs &dest)
     {
+      if (src.resources_p ())
+        OR_Handler::orb_resources (src.resources (), dest.orb_resources);
+
+      CORBA::ULong pos (dest.policy_set.length ());
+
+      dest.policy_set.length (pos + src.count_policySet ());
+
+      for (ORBConfigs::policySet_const_iterator i = src.begin_policySet ();
+           i != src.end_policySet ();
+           ++i)
+        {
+          PS_Handler::policy_set (*i, dest.policy_set[pos++]);
+        }
+
+      return true;
+    }
+
+
+    ORBConfigs OC_Handler::orb_config (
+                                       const ::CIAO::DAnCE::ORBConfigs &src)
+    {
+      ORBConfigs oc;
+
+      oc.resources(OR_Handler::orb_resources (src.orb_resources));
+
+      size_t len = src.policy_set.length();
+      for(size_t i = 0; i < len; i++)
+        {
+          oc.add_policySet (PS_Handler::policy_set (src.policy_set [i]));
+        }
 
-	bool OC_Handler::orb_config (
-	    const ORBConfigs &src,
-	    ::CIAO::DAnCE::ORBConfigs &dest)
-	{
-          if (src.resources_p ())
-            OR_Handler::orb_resources (src.resources (), dest.orb_resources);
-          
-          CORBA::ULong pos (dest.policy_set.length ());
-          
-          dest.policy_set.length (pos + src.count_policySet ());
-          
-          for (ORBConfigs::policySet_const_iterator i = src.begin_policySet ();
-               i != src.end_policySet ();
-               ++i)
-            {
-              PS_Handler::policy_set (*i, dest.policy_set[pos++]);
-            }
-          
-          return true;
-	}
-
-
-	ORBConfigs OC_Handler::orb_config (
-	    const ::CIAO::DAnCE::ORBConfigs &src)
-	{
-          ORBConfigs oc;
-          
-          oc.resources(OR_Handler::orb_resources (src.orb_resources));
-          
-          size_t len = src.policy_set.length();
-          for(size_t i = 0; i < len; i++)
-	    {
-              oc.add_policySet (PS_Handler::policy_set (src.policy_set [i]));
-	    }
-          
-          return oc;
-	}
+      return oc;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index ab702e321f9..8360825226e 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
@@ -23,28 +23,28 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ORBConfigs;
+
+    /*
+     * @class OC_Handler
+     *
+     * @brief Handler class for <ORBConfigs>
+     */
+
+    class RT_CCM_Handlers_Export OC_Handler
     {
-	class ORBConfigs;
-
-	/*
-	 * @class OC_Handler
-	 *
-	 * @brief Handler class for <ORBConfigs>
-	 */
-
-	class RT_CCM_Handlers_Export OC_Handler
-	{
-	public:
-          static bool orb_config (const ORBConfigs &src,
-                                  ::CIAO::DAnCE::ORBConfigs &dest);
-          
-	  static ORBConfigs orb_config (const ::CIAO::DAnCE::ORBConfigs &src);
-
-	};
-    }
+    public:
+      static bool orb_config (const ORBConfigs &src,
+                              ::CIAO::DAnCE::ORBConfigs &dest);
+
+      static ORBConfigs orb_config (const ::CIAO::DAnCE::ORBConfigs &src);
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
 #endif /* OC_HANDLER_H */
-		
+
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
index d7c750d07cd..5fd8a1b32ff 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
@@ -9,84 +9,84 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    bool OR_Handler::orb_resources (const ORBResources &src,
+                                    ::CIAO::DAnCE::ORBResources &dest)
     {
-	bool OR_Handler::orb_resources (const ORBResources &src,
-	    ::CIAO::DAnCE::ORBResources &dest)
-	{
-          // We know that there should be only one.
-          dest.length (1);
-          
-          // Set the length of the threadpools
-          CORBA::ULong pos (dest[0].threadpool_list.length ());
-          dest[0].threadpool_list.length (pos + src.count_threadpool ());
-          
-          for (ORBResources::threadpool_const_iterator i = src.begin_threadpool ();
-               i != src.end_threadpool ();
-               ++i)
-            {
-              TP_Handler::thread_pool (*i,
-                                       dest[0].threadpool_list[pos++]);
-	    }
-          
-          pos = dest[0].threadpool_with_lanes_list.length ();
-          dest[0].threadpool_with_lanes_list.length (pos + src.count_threadpoolWithLanes ());
+      // We know that there should be only one.
+      dest.length (1);
 
-          for (ORBResources::threadpoolWithLanes_const_iterator j = src.begin_threadpoolWithLanes();
-		 j != src.end_threadpoolWithLanes();
-		 j++)
-	    {
-		TPL_Handler::threadpool_with_lanes (*j,
-                                                    dest[0].threadpool_with_lanes_list [pos++]);
-	    }
+      // Set the length of the threadpools
+      CORBA::ULong pos (dest[0].threadpool_list.length ());
+      dest[0].threadpool_list.length (pos + src.count_threadpool ());
 
-          pos = dest[0].connection_bands_list.length ();
-          dest[0].connection_bands_list.length (pos + src.count_connectionBands ());
+      for (ORBResources::threadpool_const_iterator i = src.begin_threadpool ();
+           i != src.end_threadpool ();
+           ++i)
+        {
+          TP_Handler::thread_pool (*i,
+                                   dest[0].threadpool_list[pos++]);
+        }
 
-          for (ORBResources::connectionBands_const_iterator k = src.begin_connectionBands();
-               k != src.end_connectionBands();
-               k++)
-	    {
-		CB_Handler::connection_band (*k,
-                                             dest[0].connection_bands_list[pos++]);
-            }
-          return true;
-	}
+      pos = dest[0].threadpool_with_lanes_list.length ();
+      dest[0].threadpool_with_lanes_list.length (pos + src.count_threadpoolWithLanes ());
 
-	ORBResources OR_Handler::orb_resources (const ::CIAO::DAnCE::ORBResources &src)
-          throw (OR_Handler::No_Resource)
-	{
-          if (src.length () == 0 ||
-              src[0].threadpool_list.length () == 0 ||
-              src[0].threadpool_with_lanes_list.length () == 0 ||
-              src[0].connection_bands_list.length () == 0)
-            {
-              throw No_Resource ();
-            }
-          
-          size_t len; //For checking the length of sequences
-          
-          ORBResources ores;
-          
-          len = src[0].threadpool_list.length();
-          for(size_t i = 0; i < len; ++i)
-	    {
-              ores.add_threadpool (TP_Handler::thread_pool (src[0].threadpool_list[i]));
-	    }
-          
-          len = src[0].threadpool_with_lanes_list.length();
-          for(size_t j = 0; j < len; ++j)
-	    {
-              ores.add_threadpoolWithLanes(TPL_Handler::threadpool_with_lanes (src[0].threadpool_with_lanes_list[j]));
-	    }
-          
-          len = src[0].connection_bands_list.length();
-          for(size_t k = 0; k < len; k++)
-	    {
-              ores.add_connectionBands (CB_Handler::connection_band (src[0].connection_bands_list[k]));
-	    }
-          
-          return ores;
-	}
+      for (ORBResources::threadpoolWithLanes_const_iterator j = src.begin_threadpoolWithLanes();
+           j != src.end_threadpoolWithLanes();
+           j++)
+        {
+          TPL_Handler::threadpool_with_lanes (*j,
+                                              dest[0].threadpool_with_lanes_list [pos++]);
+        }
+
+      pos = dest[0].connection_bands_list.length ();
+      dest[0].connection_bands_list.length (pos + src.count_connectionBands ());
+
+      for (ORBResources::connectionBands_const_iterator k = src.begin_connectionBands();
+           k != src.end_connectionBands();
+           k++)
+        {
+          CB_Handler::connection_band (*k,
+                                       dest[0].connection_bands_list[pos++]);
+        }
+      return true;
+    }
+
+    ORBResources OR_Handler::orb_resources (const ::CIAO::DAnCE::ORBResources &src)
+      throw (OR_Handler::No_Resource)
+    {
+      if (src.length () == 0 ||
+          src[0].threadpool_list.length () == 0 ||
+          src[0].threadpool_with_lanes_list.length () == 0 ||
+          src[0].connection_bands_list.length () == 0)
+        {
+          throw No_Resource ();
+        }
+
+      size_t len; //For checking the length of sequences
+
+      ORBResources ores;
+
+      len = src[0].threadpool_list.length();
+      for(size_t i = 0; i < len; ++i)
+        {
+          ores.add_threadpool (TP_Handler::thread_pool (src[0].threadpool_list[i]));
+        }
+
+      len = src[0].threadpool_with_lanes_list.length();
+      for(size_t j = 0; j < len; ++j)
+        {
+          ores.add_threadpoolWithLanes(TPL_Handler::threadpool_with_lanes (src[0].threadpool_with_lanes_list[j]));
+        }
+
+      len = src[0].connection_bands_list.length();
+      for(size_t k = 0; k < len; k++)
+        {
+          ores.add_connectionBands (CB_Handler::connection_band (src[0].connection_bands_list[k]));
+        }
+
+      return ores;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index 928ed1bb286..707547adf61 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
@@ -23,30 +23,30 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ORBResources;
+
+    /* Class description
+     * @class OR_Handler
+     * @function A brief Handler class for the <ORBResource> member
+     */
+
+    class RT_CCM_Handlers_Export OR_Handler
     {
-	class ORBResources;
-
-	/* Class description
-	 * @class OR_Handler
-	 * @function A brief Handler class for the <ORBResource> member
-	 */
-
-	class RT_CCM_Handlers_Export OR_Handler
-	{
-	public:
-          
-          static bool orb_resources (const ORBResources &src,
-                                     ::CIAO::DAnCE::ORBResources &dest);
-          
-          class No_Resource {};
-          
-          static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src)
-            throw (No_Resource);
-          
-          
-	};
-    }
+    public:
+
+      static bool orb_resources (const ORBResources &src,
+                                 ::CIAO::DAnCE::ORBResources &dest);
+
+      class No_Resource {};
+
+      static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src)
+        throw (No_Resource);
+
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
index cf53e198499..088a426505c 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
@@ -8,7 +8,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    
+
     bool
     PM_Handler::priority_model_pd (const PriorityModelPolicyDef &src,
                                    ::CIAO::DAnCE::PriorityModelPolicyDef &dest)
@@ -18,56 +18,56 @@ namespace CIAO
         case PriorityModel::SERVER_DECLARED_l:
           dest.priority_model = ::CIAO::DAnCE::SERVER_DECLARED;
           break;
-          
+
         case PriorityModel::CLIENT_PROPAGATED_l:
           dest.priority_model = ::CIAO::DAnCE::CLIENT_PROPAGATED;
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR,
                       "Unknown priority model passed to priority_model_pd\n"));
           return false;
         }
-      
+
       if (src.server_priority_p ())
         dest.server_priority = static_cast < ACE_INT32 > (src.server_priority ());
       else
         dest.server_priority = 0;
-      
+
       return true;
     }
-    
-      
-    PriorityModelPolicyDef 
+
+
+    PriorityModelPolicyDef
     PM_Handler::priority_model_pd (const ::CIAO::DAnCE::PriorityModelPolicyDef &src)
     {
       auto_ptr <PriorityModelPolicyDef> pmd;
-      
+
       switch (src.priority_model)
         {
         case ::CIAO::DAnCE::CLIENT_PROPAGATED:
           pmd.reset (new PriorityModelPolicyDef (PriorityModel::CLIENT_PROPAGATED));
           break;
-          
+
         case ::CIAO::DAnCE::SERVER_DECLARED:
           pmd.reset (new PriorityModelPolicyDef (PriorityModel::SERVER_DECLARED));
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR,
                       "Invalid priority model given to priority_model_pd\n"));
           throw 1;
         }
-      
+
       pmd->server_priority (XMLSchema::int_ (src.server_priority));
-      
+
       return *pmd;
     }
-    
-    
+
+
   }
-  
-  
-  
+
+
+
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
index 2ebe0fb0c0e..aa0705fcac2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file PM_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
  *
@@ -23,22 +23,22 @@ namespace CIAO
     namespace Config_Handlers
     {
       class PriorityModelPolicyDef;
-      
+
       /**
        * @class PS_Handler
        * @brief Handler class for PriorityModelPolicyDefs
        */
-      
+
       class RT_CCM_Handlers_Export PM_Handler
       {
       public:
         static bool priority_model_pd (const PriorityModelPolicyDef &src,
                                        ::CIAO::DAnCE::PriorityModelPolicyDef &dest);
-        
+
         static PriorityModelPolicyDef priority_model_pd (const ::CIAO::DAnCE::PriorityModelPolicyDef &src);
       };
     }
-  
+
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
index 14ce2d8702b..a2fa834233e 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -14,58 +14,62 @@ namespace CIAO
     {
       if (src.id_p ())
         dest.Id = CORBA::string_dup (src.id ().c_str ());
-      
+
       // Make room for all of the policies
       CORBA::ULong len (dest.policies.length ());
-      dest.policies.length (len + 
+      dest.policies.length (len +
                             src.count_priorityModel () +
                             src.count_threadpool () +
                             src.count_priorityBandedConnection ());
-      
+
       for (PolicySet::priorityModel_const_iterator i = src.begin_priorityModel ();
            i != src.end_priorityModel ();
            ++i)
         {
-          PM_Handler::priority_model_pd (*i, dest.policies[len++].PriorityModelDef ());
+          ::CIAO::DAnCE::PriorityModelPolicyDef pmd;
+
+          PM_Handler::priority_model_pd (*i, pmd);
+
+          dest.policies[len++].PriorityModelDef (pmd);
         }
-      
+
       for (PolicySet::threadpool_const_iterator i = src.begin_threadpool ();
            i != src.end_threadpool ();
            ++i)
         {
           ::CIAO::DAnCE::ThreadpoolPolicyDef tpd;
-          
+
           tpd.Id = CORBA::string_dup (i->id ().c_str ());
-          
+
           dest.policies[len++].ThreadpoolDef (tpd);
         }
-      
-      
+
+
       for (PolicySet::priorityBandedConnection_const_iterator i = src.begin_priorityBandedConnection ();
            i != src.end_priorityBandedConnection ();
            ++i)
         {
           ::CIAO::DAnCE::PriorityBandedConnectionPolicyDef pbc;
-          
+
           pbc.Id = CORBA::string_dup (i->id ().c_str ());
-          
+
           dest.policies[len++].PriorityBandedConnectionDef (pbc);
         }
-      
-          
-          
+
+
+
       return true;
     }
 
 
-    PolicySet 
+    PolicySet
     PS_Handler::policy_set (const ::CIAO::DAnCE::PolicySet &src)
     {
       PolicySet ps;
-      
+
       if (src.Id.in ())
         ps.id (src.Id.in ());
-      
+
       for (CORBA::ULong i = 0;
            i < src.policies.length ();
            ++i)
@@ -73,38 +77,38 @@ namespace CIAO
           ACE_DEBUG ((LM_ERROR,
                       "Attempting switch for i = %d\n",
                       i));
-          
+
           switch (src.policies[i]._d ())
             {
             case ::CIAO::DAnCE::PRIORITY_MODEL_POLICY_TYPE:
               ps.add_priorityModel (
                 PM_Handler::priority_model_pd (src.policies[i].PriorityModelDef ()));
               break;
-              
+
             case ::CIAO::DAnCE::THREADPOOL_POLICY_TYPE:
               ps.add_threadpool  (src.policies[i].ThreadpoolDef ().Id.in ());
               break;
-              
+
             case ::CIAO::DAnCE::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
               ps.add_priorityBandedConnection (src.policies[i].PriorityBandedConnectionDef ().Id.in ());
               break;
-              
+
             case 0:
               ACE_ERROR ((LM_ERROR,
                           "Skipping invalid policy.\n"));
               break;
-              
+
             default:
               ACE_ERROR ((LM_ERROR,
                           "Bad policy stored in policy_set: %i\n",
                           src.policies[i]._d ()));
               throw 1;
             }
-        } 
-      
+        }
+
       return ps;
     }
-    
+
   }
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 5d924587fa9..5f8673d94ef 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
@@ -1,7 +1,7 @@
-/** 
+/**
  * @file PS_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  *  $Id$
  */
 
@@ -23,21 +23,21 @@ namespace CIAO
     namespace Config_Handlers
     {
       class PolicySet;
-      
+
       /**
        * @class PS_Handler
        * @brief Handler class for PolicySets
        */
-      
+
       class RT_CCM_Handlers_Export PS_Handler
       {
       public:
         static bool policy_set (const PolicySet &src,
                                 ::CIAO::DAnCE::PolicySet &dest);
-        
+
         static PolicySet policy_set (const ::CIAO::DAnCE::PolicySet &src);
       };
-      
+
     }
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
index 5b4500becf9..fc7e4b88a56 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
@@ -16,20 +16,20 @@ namespace CIAO
       retval_ (false)
     {
       XML_Helper helper;
-      
-      XERCES_CPP_NAMESPACE::DOMDocument *dom = 
-	helper.create_dom (file);
-      
+
+      XERCES_CPP_NAMESPACE::DOMDocument *dom =
+        helper.create_dom (file);
+
       if (!dom)
-	throw SRD_Handler::NoSRD ();
-      
-      this->srd_.reset (new ServerResourcesDef 
-	(ServerResources (dom)));
-      
+        throw SRD_Handler::NoSRD ();
+
+      this->srd_.reset (new ServerResourcesDef
+                        (ServerResources (dom)));
+
       if (!this->build_srd ())
-	throw NoSRD ();
+        throw NoSRD ();
     }
-    
+
     SRD_Handler::SRD_Handler (ServerResourcesDef *srd):
       idl_srd_(0),
       srd_(srd),
@@ -47,16 +47,16 @@ namespace CIAO
       if(!this->build_xsc())
         throw NoSRD ();
     }
-    
+
     SRD_Handler::~SRD_Handler (void)
     {
     }
-    
+
     bool
     SRD_Handler::build_srd ()
     {
       this->idl_srd_.reset ( new ::CIAO::DAnCE::ServerResource );
-          
+
       if(this->srd_->cmdline_p())
         {
           this->retval_ = CLA_Handler::commandline_arguments(*this->srd_,
@@ -70,12 +70,12 @@ namespace CIAO
 
       this->retval_ = OC_Handler::orb_config (this->srd_->orbConfigs (),
                                               this->idl_srd_->orb_config);
-      
+
       if (this->srd_->id_p ())
         {
           this->idl_srd_->Id = srd_->id ().c_str ();
         }
-      
+
       return this->retval_;
     }
 
@@ -83,11 +83,11 @@ namespace CIAO
     SRD_Handler::build_xsc ()
     {
       size_t len; //For checking the length of src data members
-	    
+
       // Load the ORBConfigs and create the XSC structure for SRD
       this->srd_.reset (new ServerResourcesDef (OC_Handler::orb_config (this->idl_srd_->orb_config)));
-      
-      
+
+
       //Note: Why did we make the CmdlineOptions a separate class instead of a
       //      vector of strings???
 
@@ -107,10 +107,10 @@ namespace CIAO
       ACESvcConf asc;
       asc.uri(curr);
       this->srd_->svcconf (asc);
-      
+
       XMLSchema::string < ACE_TCHAR > id (this->idl_srd_->Id.in ());
       this->srd_->id  (id);
-      
+
       return true;
     }
 
@@ -160,4 +160,4 @@ namespace CIAO
   }
 }
 
-    
+
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index cfa7871b705..c97d951ec90 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -4,7 +4,7 @@
  *
  *   @author Lucas Seibert <lseibert@dre.vanderbilt.edu>
  *   @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * $Id$
  */
 //======================================
@@ -24,54 +24,54 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ServerResourcesDef;
+
+    /*
+     * @class SRD_Handler
+     *
+     * @brief Handler class for <ServerResourcesDef
+     */
+
+    class RT_CCM_Handlers_Export SRD_Handler
     {
-      class ServerResourcesDef;
-      
-	/*
-	 * @class SRD_Handler
-	 *
-	 * @brief Handler class for <ServerResourcesDef
-	 */
-
-	class RT_CCM_Handlers_Export SRD_Handler
-	{
-	public:
-          class NoSRD {};
-	    
-          SRD_Handler (const ACE_TCHAR *file);
-          
-          SRD_Handler(ServerResourcesDef *srd);
-          
-          SRD_Handler(::CIAO::DAnCE::ServerResource *srd);
-          
-          ~SRD_Handler (void);
-          
-          ::CIAO::DAnCE::ServerResource const *srd_idl (void) const
-            throw (NoSRD);
-          
-          ::CIAO::DAnCE::ServerResource *srd_idl (void)
-            throw (NoSRD);
-          
-          ServerResourcesDef const *srd_xsc (void) const
-            throw (NoSRD);
-          
-          ServerResourcesDef *srd_xsc (void)
-            throw (NoSRD);
-
-	private:
-          bool build_srd ();
-          
-
-          bool build_xsc ();
-          	    
-          auto_ptr < ::CIAO::DAnCE::ServerResource > idl_srd_;
-          
-          auto_ptr <ServerResourcesDef> srd_;
-          
-          bool retval_;
-	};
-    }
+    public:
+      class NoSRD {};
+
+      SRD_Handler (const ACE_TCHAR *file);
+
+      SRD_Handler(ServerResourcesDef *srd);
+
+      SRD_Handler(::CIAO::DAnCE::ServerResource *srd);
+
+      ~SRD_Handler (void);
+
+      ::CIAO::DAnCE::ServerResource const *srd_idl (void) const
+        throw (NoSRD);
+
+      ::CIAO::DAnCE::ServerResource *srd_idl (void)
+        throw (NoSRD);
+
+      ServerResourcesDef const *srd_xsc (void) const
+        throw (NoSRD);
+
+      ServerResourcesDef *srd_xsc (void)
+        throw (NoSRD);
+
+    private:
+      bool build_srd ();
+
+
+      bool build_xsc ();
+
+      auto_ptr < ::CIAO::DAnCE::ServerResource > idl_srd_;
+
+      auto_ptr <ServerResourcesDef> srd_;
+
+      bool retval_;
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
index eaf336d4b52..4d65478d19c 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
@@ -7,77 +7,75 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    bool 
+    bool
     TPL_Handler::threadpool_with_lanes (
-	      const ThreadpoolWithLanesDef &src,
-	      ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &dest
-	    )
-	  {
-	    if (src.id_p ())
-	      {
+           const ThreadpoolWithLanesDef &src,
+           ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &dest)
+    {
+      if (src.id_p ())
+        {
           dest.Id = CORBA::string_dup (src.id().c_str ());
         }
 
-	    for (ThreadpoolWithLanesDef::threadpoolLane_const_iterator loc =
-	           src.begin_threadpoolLane ();
-		       loc != src.end_threadpoolLane ();
-		       loc++)
-	      {
-		      size_t len = dest.threadpool_lanes.length ();
+      for (ThreadpoolWithLanesDef::threadpoolLane_const_iterator loc =
+             src.begin_threadpoolLane ();
+           loc != src.end_threadpoolLane ();
+           loc++)
+        {
+          size_t len = dest.threadpool_lanes.length ();
+
+          dest.threadpool_lanes.length (len + 1);
 
-		      dest.threadpool_lanes.length (len + 1);
-                      
           dest.threadpool_lanes[len].lane_priority =
-            static_cast <const ACE_INT16> (loc->priority ());
-
-		      dest.threadpool_lanes[len].static_threads =
-		        static_cast <ACE_UINT32> (loc->static_threads ());
-
-		      dest.threadpool_lanes[len].dynamic_threads =
-		        static_cast <ACE_UINT32> (loc->dynamic_threads ());
-	      }
-
-        dest.allow_borrowing = src.allow_borrowing ();
-
-        dest.allow_request_buffering = src.allow_request_buffering ();
-
-        dest.max_buffered_requests =
-          static_cast <ACE_UINT32> (src.max_buffered_requests ());
-
-        dest.max_request_buffer_size =
-          static_cast <ACE_UINT32> (src.max_request_buffered_size ());
-        
-        return true;
-	    }
-
-	    ThreadpoolWithLanesDef TPL_Handler::threadpool_with_lanes (
-	        const ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &src
-	      )
-	    {
-        ThreadpoolWithLanesDef tpl (
-            XMLSchema::unsignedLong (src.stacksize),
-            XMLSchema::boolean ((src.allow_borrowing)),
-            XMLSchema::boolean ((src.allow_request_buffering)),
-            XMLSchema::unsignedLong ((src.max_buffered_requests)),
-            XMLSchema::unsignedLong ((src.max_request_buffer_size))
-          );
-        
-        //XMLSchema::ID <ACE_TCHAR> id = ((src.Id));
-        tpl.id (src.Id.in ());
-        
-        size_t len = src.threadpool_lanes.length ();
-        for (size_t i = 0; i < len; i++)
-	        {
-            ThreadpoolLaneDef new_tplane (
-                XMLSchema::unsignedLong (src.threadpool_lanes[i].static_threads),
-                XMLSchema::unsignedLong (src.threadpool_lanes[i].dynamic_threads),
-                XMLSchema::int_ (src.threadpool_lanes[i].lane_priority)
-              );
-                          
-            tpl.add_threadpoolLane (new_tplane);
-	        } 
-              
-        return tpl;
-	    }
-   }
+            static_cast <ACE_INT16> (loc->priority ());
+
+          dest.threadpool_lanes[len].static_threads =
+            static_cast <ACE_UINT32> (loc->static_threads ());
+
+          dest.threadpool_lanes[len].dynamic_threads =
+            static_cast <ACE_UINT32> (loc->dynamic_threads ());
+        }
+
+      dest.stacksize = static_cast <ACE_INT16> (src.stacksize ());
+
+      dest.allow_borrowing = src.allow_borrowing ();
+
+      dest.allow_request_buffering = src.allow_request_buffering ();
+
+      dest.max_buffered_requests =
+        static_cast <ACE_UINT32> (src.max_buffered_requests ());
+
+      dest.max_request_buffer_size =
+        static_cast <ACE_UINT32> (src.max_request_buffered_size ());
+
+      return true;
+    }
+
+    ThreadpoolWithLanesDef TPL_Handler::threadpool_with_lanes (
+           const ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &src)
+    {
+      ThreadpoolWithLanesDef tpl (XMLSchema::unsignedLong (src.stacksize),
+                                  XMLSchema::boolean ((src.allow_borrowing)),
+                                  XMLSchema::boolean ((src.allow_request_buffering)),
+                                  XMLSchema::unsignedLong ((src.max_buffered_requests)),
+                                  XMLSchema::unsignedLong ((src.max_request_buffer_size))
+                                  );
+
+      //XMLSchema::ID <ACE_TCHAR> id = ((src.Id));
+      tpl.id (src.Id.in ());
+
+      size_t len = src.threadpool_lanes.length ();
+      for (size_t i = 0; i < len; i++)
+        {
+          ThreadpoolLaneDef new_tplane (
+               XMLSchema::unsignedLong (src.threadpool_lanes[i].static_threads),
+               XMLSchema::unsignedLong (src.threadpool_lanes[i].dynamic_threads),
+               XMLSchema::int_ (src.threadpool_lanes[i].lane_priority));
+
+          tpl.add_threadpoolLane (new_tplane);
+        }
+
+      return tpl;
+    }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
index ec28027cb5c..7a9bc607b32 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -7,58 +7,58 @@
 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 ());
-  
+
       dest.stacksize =
         static_cast <ACE_UINT32> (src.stacksize ());
-  
+
       dest.static_threads =
         static_cast <ACE_UINT32> (src.static_threads( ));
-  
+
       dest.dynamic_threads =
         static_cast <ACE_UINT32> (src.dynamic_threads());
-      
+
       dest.default_priority =
         static_cast <ACE_INT16> (src.default_priority ());
-                  
+
       dest.allow_request_buffering = src.allow_request_buffering ();
-  
+
       dest.max_buffered_requests =
         static_cast <ACE_UINT32> (src.max_buffered_requests ());
-  
+
       dest.max_request_buffer_size =
         static_cast <ACE_UINT32> (src.max_request_buffered_size ());
-      
+
       return true;
-	  }
+    }
 
-	  ThreadpoolDef 
-        TP_Handler::thread_pool (
-	      const ::CIAO::DAnCE::ORS_Threadpool &src
-	    )
-	  {
+    ThreadpoolDef
+    TP_Handler::thread_pool (
+                             const ::CIAO::DAnCE::ORS_Threadpool &src
+                             )
+    {
       ThreadpoolDef tp (
-          XMLSchema::unsignedLong (src.stacksize),
-          XMLSchema::unsignedLong (src.static_threads),
-          XMLSchema::unsignedLong (src.dynamic_threads),
-          Priority (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.stacksize),
+                        XMLSchema::unsignedLong (src.static_threads),
+                        XMLSchema::unsignedLong (src.dynamic_threads),
+                        Priority (src.default_priority),
+                        XMLSchema::boolean (src.allow_request_buffering),
+                        XMLSchema::unsignedLong (src.max_buffered_requests),
+                        XMLSchema::unsignedLong (src.max_request_buffer_size)
+                        );
+
       if (src.Id.in () == 0)
         {
           tp.id (src.Id.in ());
-        }       
+        }
 
       return tp;
-	  }
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index 638ab07f675..b0403ab0342 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
@@ -22,24 +22,24 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ThreadpoolDef;
+
+    /*
+     * @class TP_Handler
+     * A brief Handler class for <ThreadpoolDef>
+     */
+
+    class RT_CCM_Handlers_Export TP_Handler
     {
-	class ThreadpoolDef;
-
-	/*
-	 * @class TP_Handler
-	 * A brief Handler class for <ThreadpoolDef>
-	 */
-
-	class RT_CCM_Handlers_Export TP_Handler
-	{
-        public:
-          static bool thread_pool (const ThreadpoolDef &src,
-                                   ::CIAO::DAnCE::ORS_Threadpool &dest);
-          
-          static ThreadpoolDef thread_pool (const ::CIAO::DAnCE::ORS_Threadpool &src);
-	};
-    }
+    public:
+      static bool thread_pool (const ThreadpoolDef &src,
+                               ::CIAO::DAnCE::ORS_Threadpool &dest);
+
+      static ThreadpoolDef thread_pool (const ::CIAO::DAnCE::ORS_Threadpool &src);
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
index e8a05932f4b..3a44faf9754 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
@@ -4,17 +4,17 @@
  xmlns:xmi="http://www.omg.org/XMI"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd">
-  
+
   <cmdline>
     <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg>
   </cmdline>
-  
+
   <svcconf>
     <uri>
       svcconf.uri
     </uri>
   </svcconf>
-  
+
   <orbConfigs>
     <resources>
       <threadpool id="threadpool-1">
@@ -26,7 +26,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpool>
-      
+
       <threadpoolWithLanes id="threadpool-2">
         <threadpoolLane>
           <static_threads>50</static_threads>
@@ -39,7 +39,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpoolWithLanes>
-      
+
       <connectionBands id="cb-1">
         <band>
           <low>0</low>
@@ -51,7 +51,7 @@
         </band>
       </connectionBands>
     </resources>
-    
+
     <policySet>
       <priorityModel server_priority="10">
         <priority_model>SERVER_DECLARED</priority_model>
@@ -59,12 +59,12 @@
       <priorityModel>
         <priority_model>CLIENT_PROPAGATED</priority_model>
       </priorityModel>
-      
+
       <threadpool>threadpool-1</threadpool>
       <threadpool>threadpool-2</threadpool>
-      
+
       <priorityBandedConnection>cb-1</priorityBandedConnection>
-      
+
     </policySet>
   </orbConfigs>
 </CIAO:ServerResources>
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 9f18172ba5b..cf31d9bb0b5 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -33,17 +33,17 @@ parse_args (int argc, char *argv[])
                            "-i <input file> "
                            "\n",
                            argv [0]),
-                          -1); 
+                          -1);
       }
   // Indicates sucessful parsing of the command-line
-  return 0;  
+  return 0;
 }
 
 using namespace CIAO::Config_Handlers;
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-    
+
   if (parse_args (argc, argv) != 0)
     return 1;
 
@@ -52,38 +52,38 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
-  
+
   if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
   {
     //Read in the XSC type structure from the DOMDocument
     ServerResourcesDef srd = ServerResources (doc);
-    
+
     // Convert XSC to idl datatype
     SRD_Handler srd_handler (&srd);
-    
+
     std::cout << "Instance document import succeeded.  Dumping contents to file\n";
-    
+
     CIAO::DAnCE::ServerResource *sr (srd_handler.srd_idl ());
-    
+
     SRD_Handler reverse_handler (sr);
-    
+
     xercesc::DOMDocument *the_xsc (the_helper.create_dom ("CIAO:ServerResources",
                                                           "http://www.dre.vanderbilt.edu/ServerResources"));
-    
-    std::cout << "NS:" 
+
+    std::cout << "NS:"
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getNamespaceURI ())) << std::endl
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getPrefix ())) << std::endl
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getLocalName ())) << std::endl
               << std::endl;
-    
+
     ServerResources (*reverse_handler.srd_xsc (), the_xsc);
-    
+
     // write out the result
     the_helper.write_DOM (the_xsc, "output.srd");
   }
-  
+
   std::cout << "Test completed!";
-  
+
   return 0;
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
index 4a52efb9967..37fd441ac92 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Req_Handler.h"
 #include "Property_Handler.h"
 #include "ciao/DeploymentC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -18,43 +18,40 @@ namespace CIAO
     }
 
     void
-    Req_Handler::get_Requirement (
-                         Deployment::Requirement& toconfig,
-                         Requirement& desc)
+    Req_Handler::get_requirement (const Requirement& desc,
+                                  Deployment::Requirement& toconfig)
     {
+      CIAO_TRACE("Req_Handler::get_Requirement");
+
       //Map the basic string types to their Deployment::Req
       //counterparts.
-      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
-      toconfig.resourceType =
-        CORBA::string_dup (desc.resourceType ().c_str ());
-
-      //Map the XSC Req's property into the next
-      //position in the IDL Req's sequence.
-      /// @@ MAJO:
-      Property_Handler prophandler;
-      toconfig.property.length (toconfig.property.length () + 1);
-      Property_Handler::get_property (
-        desc.property (),
-        toconfig.property[toconfig.property.length () - 1]);
+      toconfig.name = desc.name ().c_str ();
+      toconfig.resourceType = desc.resourceType ().c_str ();
+
+      toconfig.property.length (desc.count_property ());
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
+    }
+
+    Requirement
+    Req_Handler::get_requirement (const Deployment::Requirement& src)
+    {
+      CIAO_TRACE("Req_Handler::get_requirement - reverse");
+
+      //Get the values for name and res
+      XMLSchema::string< char > name ((src.name));
+      XMLSchema::string< char > res ((src.resourceType));
+
+      //Instantiate the Requirement
+      Requirement req (name,res);
+
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        {
+          req.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
+      return req;
     }
-    
-      Requirement
-      Req_Handler::get_requirement (
-	  const Deployment::Requirement& src)
-      {
-	  //Get the values for name and res
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > res ((src.resourceType));
-
-	  //Get the Property
-	  Property prop (
-	      Property_Handler::get_property (
-		  src.property[0]));
-
-	  //Instantiate the Requirement
-	  Requirement req (name,res,prop);
-	  
-	  return req;
-      }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
index 6f58f8677e4..315eee76579 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  Req_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Req_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_REQ_HANDLER_H
@@ -14,6 +14,7 @@
 
 #include "Basic_Deployment_Data.hpp"
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,42 +22,49 @@
 
 namespace Deployment
 {
-  struct Requirement; 
+struct Requirement;
+class Requirements;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-   /*
-    * @class REQ_Handler
-    *
-    * @brief Handler class for <Requirement> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC Requirement objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
-    class Config_Handlers_Export Req_Handler{
-     
-      public:
-       
-        Req_Handler (void);
-        virtual ~Req_Handler (void);
-  
-        ///This method takes a <Deployment::Requirement>
-        ///and maps the values from the passed in XSC 
-        ///Requirement to its members.
-        static void get_Requirement (
-                    Deployment::Requirement& toconfig,
-                    Requirement& desc);          
-        static Requirement
-          get_requirement (const Deployment::Requirement& src);
-    };
-  }
+namespace Config_Handlers
+{
+/*
+* @class REQ_Handler
+*
+* @brief Handler class for <Requirement> types.
+*
+* This class defines handler methods to map values from
+* XSC Requirement objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export Req_Handler
+{
+public:
+
+Req_Handler (void);
+virtual ~Req_Handler (void);
+
+///This method takes a <Deployment::Requirement>
+///and maps the values from the passed in XSC
+///Requirement to its members.
+static void get_requirement (const Requirement& desc,
+Deployment::Requirement& toconfig);
+static Requirement
+get_requirement (const Deployment::Requirement& src);
+};
+
+typedef Sequence_Handler < Requirement,
+::Deployment::Requirements,
+::Deployment::Requirement,
+Req_Handler::get_requirement > Requirement_Functor;
+
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
index 66db939ec49..654fb0155ca 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
@@ -58,20 +58,20 @@ namespace CIAO
             const ComponentPackageDescription &desc,
             ::Deployment::ComponentPackageDescription &toconfig);
 
-//@@Note: This part has yet to be added in the future
-//     ComponentPortDescription
-//     component_package_descr (
-//         const Deployment::ComponentPortDescription& src);
+      //@@Note: This part has yet to be added in the future
+      //     ComponentPortDescription
+      //     component_package_descr (
+      //         const Deployment::ComponentPortDescription& src);
     private:
       // disable the default constructor
       STD_CPD_Handler ()
         :xml_helper_ (0)
       {
       }
-
+      
       XML_Helper *xml_helper_;
     };
- }
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
index f3eb1609c1b..e265295d040 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -1,17 +1,11 @@
 // $Id$
 
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-#pragma warning (disable: 4018)
-#pragma warning (disable: 4284)
-#pragma warning (disable: 4146)
-#endif
-
 #include "STD_PC_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -26,6 +20,8 @@ namespace CIAO
     bool
     STD_PC_Intf::prepare_PC (const char *file)
     {
+      CIAO_TRACE("STD_PC_Intf::prepare_PC");
+
       ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
 
       if (!helper->is_initialized ())
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 31f4d937a49..0a50d889b0b 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
     }
 
     void
-    SatisfierProperty_Handler::handle_sat_property (
+    SatisfierProperty_Handler::get_sat_property (
                                                  const SatisfierProperty& desc,
                                                  Deployment::SatisfierProperty& toconfig)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
index 4ee0b804b24..2c2f671cb02 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  SatisfierProperty_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  SatisfierProperty_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H
@@ -22,49 +22,49 @@
 
 namespace Deployment
 {
-  struct SatisfierProperty;
-  class SatisfierProperties;
+struct SatisfierProperty;
+class SatisfierProperties;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-    {
-      class SatisfierProperty;
+namespace Config_Handlers
+{
+class SatisfierProperty;
 
-      /*
-       * @class SatisfierProperty_Handler
-       *
-       * @brief Handler class for <CCMComponentPortDescription> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC objects, parsed from the descriptor files, to the
-       * corresponding CORBA IDL type for the schema element.
-       *
-       */
+/*
+* @class SatisfierProperty_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
 
-      class Config_Handlers_Export SatisfierProperty_Handler
-	{
-	public:
-	  SatisfierProperty_Handler (void);
-	  virtual ~SatisfierProperty_Handler (void);
+class Config_Handlers_Export SatisfierProperty_Handler
+{
+public:
+SatisfierProperty_Handler (void);
+virtual ~SatisfierProperty_Handler (void);
 
-	  typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter;
+typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter;
 
-	  /// This method maps the values from the XSC object
-	  /// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
-	  /// <Deployment::SatisfierProperty>.
-	  static void handle_sat_property (const SatisfierProperty& desc,
-					   ::Deployment::SatisfierProperty& toconfig);
-	  static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
-	};
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
+/// <Deployment::SatisfierProperty>.
+static void get_sat_property (const SatisfierProperty& desc,
+::Deployment::SatisfierProperty& toconfig);
+static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
+};
 
-      typedef Sequence_Handler < SatisfierProperty,
-	::Deployment::SatisfierProperties,
-	::Deployment::SatisfierProperty,
-	SatisfierProperty_Handler::handle_sat_property> SatisfierProperty_Functor;
+typedef Sequence_Handler < SatisfierProperty,
+::Deployment::SatisfierProperties,
+::Deployment::SatisfierProperty,
+SatisfierProperty_Handler::get_sat_property> SatisfierProperty_Functor;
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
index 359af0af27a..6fc4f4697a1 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
@@ -1,12 +1,11 @@
 // $Id$
 
-project (CIAO_XML_Utils) : acelib, xerces {
+project (CIAO_XML_Utils) : acelib, xerces, exceptions {
   includes += $(CIAO_ROOT)/tools/Config_Handlers
   sharedname   += CIAO_XML_Utils
   dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
   macros       += XML_USE_PTHREADS
-  requires     += exceptions
-  
+
   Source_Files {
     XML_Schema_Resolver.cpp
     XML_Error_Handler.cpp
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
index d87e75dfb93..beae7bce56c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
@@ -42,12 +42,18 @@ namespace CIAO
 
       ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg);
 
+      char *file =
+        XMLString::transcode (domError.getLocation ()->getURI ());
+
+      ACE_Auto_Basic_Array_Ptr<char> cleanup_file (file);
+
       ACE_DEBUG ((LM_DEBUG,
-                  "%s at line %d and column %d\n", 
+                  "%s at line %d and column %d in file %s\n",
                   msg,
                   domError.getLocation ()->getLineNumber (),
-                  domError.getLocation ()->getColumnNumber ()));
-      
+                  domError.getLocation ()->getColumnNumber (),
+                  file));
+
       return true;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
index de7c85bd979..c711b54a250 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
@@ -72,25 +72,25 @@ namespace CIAO
 
       // Instantiate the DOM parser.
       static const XMLCh gLS[] = { xercesc::chLatin_L,
-				   xercesc::chLatin_S,
-				   xercesc::chNull };
-      
+                                   xercesc::chLatin_S,
+                                   xercesc::chNull };
+
       // Get an implementation of the Load-Store (LS) interface
       // and cache it for later use
       impl_ =
-	  DOMImplementationRegistry::getDOMImplementation(gLS);
-      
+        DOMImplementationRegistry::getDOMImplementation(gLS);
+
       this->initialized_ = true;
       return;
     }
-    
+
     XERCES_CPP_NAMESPACE::DOMDocument *
     XML_Helper::create_dom (const ACE_TCHAR *root,
                             const ACE_TCHAR *ns)
     {
       if (root == 0 || ns == 0)
         return 0;
-      
+
       return this->impl_->createDocument (XStr (ns),
                                           XStr (root),
                                           0);
@@ -101,10 +101,10 @@ namespace CIAO
     {
 
       if (url == 0)
-	  return impl_->createDocument(
-	      XStr ("http://www.omg.org/DeploymentPlan"),
-	      XStr ("deploymentPlan"),
-	      0);
+        return impl_->createDocument(
+                                     XStr ("http://www.omg.org/DeploymentPlan"),
+                                     XStr ("deploymentPlan"),
+                                     0);
 
       try
         {
@@ -112,7 +112,7 @@ namespace CIAO
           // Create a DOMBuilder
           DOMBuilder* parser =
             impl_->createDOMBuilder (DOMImplementationLS::MODE_SYNCHRONOUS,
-                                    0);
+                                     0);
 
           // Discard comment nodes in the document
           parser->setFeature (XMLUni::fgDOMComments, false);
@@ -151,15 +151,15 @@ namespace CIAO
           XML_Error_Handler handler;
 
           parser->setErrorHandler (&handler);
-          
+
           CIAO_Schema_Resolver resolver;
-          
+
           parser->setEntityResolver (&resolver);
-          
+
           DOMDocument* doc = parser->parseURI (url);
 
           if (handler.getErrors ())
-            throw;
+            throw 0;
 
           return doc;
         }
@@ -183,13 +183,13 @@ namespace CIAO
         {
           char* message = XMLString::transcode (e.getMessage());
           ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          throw;
+          throw 0;
         }
       catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Caught an unknown exception \n"));
-          throw;
+          throw 0;
         }
 
       return 0;
@@ -214,22 +214,22 @@ namespace CIAO
       return;
     }
 
-      bool XML_Helper::write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-				 ACE_TCHAR *file)
-      {
-	  bool retn;
-	  XERCES_CPP_NAMESPACE::DOMWriter *writer = impl_->createDOMWriter();
-          
-          if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint,
-                                      true))
-            writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true);
-          
-	  xercesc::XMLFormatTarget* ft (new xercesc::LocalFileFormatTarget(file));
-	  retn = writer->writeNode(ft, *doc);
-	  delete writer;
-	  delete ft;
-	  return retn;
-      }
-	  
+    bool XML_Helper::write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
+                                const ACE_TCHAR *file)
+    {
+      bool retn;
+      XERCES_CPP_NAMESPACE::DOMWriter *writer = impl_->createDOMWriter();
+
+      if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint,
+                                 true))
+        writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true);
+
+      xercesc::XMLFormatTarget* ft (new xercesc::LocalFileFormatTarget(file));
+      retn = writer->writeNode(ft, *doc);
+      delete writer;
+      delete ft;
+      return retn;
+    }
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
index 50c05f3472d..e3d6722902c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
@@ -17,6 +17,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Singleton.h"
+#include "ace/Null_Mutex.h"
 
 #include "xercesc/util/XercesDefs.hpp"
 
@@ -47,15 +49,15 @@ namespace CIAO
       /// Create a DOM tree
       XERCES_CPP_NAMESPACE::DOMDocument *
       create_dom (const ACE_TCHAR *uri);
-      
+
       XERCES_CPP_NAMESPACE::DOMDocument *
       create_dom (const ACE_TCHAR *root,
                   const ACE_TCHAR *ns);
-      
+
       //Writes out a DOMDocument to an XML file
       bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-		      ACE_TCHAR *file);
-      
+                      const ACE_TCHAR *file);
+
       bool is_initialized (void) const;
 
     protected:
@@ -69,8 +71,16 @@ namespace CIAO
       bool initialized_;
       XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
     };
+
+    CIAO_XML_UTILS_SINGLETON_DECLARE (ACE_Singleton,
+                                      XML_Helper,
+                                      ACE_Null_Mutex)
+
+    typedef ACE_Singleton < XML_Helper, ACE_Null_Mutex > XML_Helper_Singleton;
+#define XML_HELPER XML_Helper_Singleton::instance ()
   }
 }
 
+
 #include /**/ "ace/post.h"
 #endif/*CIAO_CONFIG_HANDLERS_XML_HELPER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
index 1d4d5a74a0e..db3e704caa5 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
@@ -112,7 +112,7 @@ namespace Config_Handlers
     return _wstr[i];
   }
 
-  const XMLCh XStr::operator [] (const int i) const
+  XMLCh XStr::operator [] (const int i) const
   {
     return _wstr[i];
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
index 9e8f963f8d1..a6f1dabe1db 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
@@ -17,13 +17,13 @@
 
 // Utility class that provides a std::string like facade to XMLString.
 // Doesn't implement all of the methods of std::string.
-
+#include "CIAO_XML_Utils_Export.h"
 namespace CIAO
 {
 namespace Config_Handlers
 {
 
-  class XStr
+  class CIAO_XML_Utils_Export XStr
   {
   public:
     XStr() : _wstr(0L) { };
@@ -52,7 +52,7 @@ namespace Config_Handlers
 
     XMLCh operator [] (const int i);
 
-    const XMLCh operator [] (const int i) const;
+    XMLCh operator [] (const int i) const;
 
     operator const XMLCh* () const { return _wstr; };
 
@@ -62,12 +62,12 @@ namespace Config_Handlers
 
   };
 
-  bool operator== (const XStr& lhs, const XStr& rhs);
-  bool operator!= (const XStr& lhs, const XStr& rhs);
+  CIAO_XML_Utils_Export bool operator== (const XStr& lhs, const XStr& rhs);
+  CIAO_XML_Utils_Export bool operator!= (const XStr& lhs, const XStr& rhs);
 
-  std::ostream&
+  CIAO_XML_Utils_Export std::ostream&
   operator<< (std::ostream& o, XStr const& str);
-  
+
 }
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
index 436787813dd..a5c614182a3 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
@@ -5,6 +5,6 @@
 namespace XMLSchema
 {
   namespace Traversal
-  { 
-  }  
+  {
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
index 67d4c4ad21a..d79c13630fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
@@ -6,6 +6,6 @@ namespace XMLSchema
 {
   namespace Traversal
   {
-    
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
index 947e37d2ae3..5b9422f38c8 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
@@ -3,5 +3,5 @@
 // cvs-id    : $Id$
 
 namespace XMLSchema
-{ 
+{
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index 0ef2db213f3..93c2a003606 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -421,7 +421,7 @@ namespace XMLSchema
         //std::wcerr << "registering " << container ()
         //           << " as '" << *this
         //           << "' on " << container () << std::endl;
-        NCName<C>::container ()->register_id (id_provider_, 
+        NCName<C>::container ()->register_id (id_provider_,
                                               NCName<C>::container ());
       }
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
index 410eeda8167..6b749260f55 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
@@ -4,5 +4,5 @@
 
 namespace XMLSchema
 {
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
index edd10f817f0..4a8bddcf597 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
@@ -4,6 +4,6 @@
 
 namespace XMLSchema
 {
-  
+
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
index c8dca806caf..d647b630a33 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
@@ -12,6 +12,8 @@
 #include <XMLSchema/Types.hpp>
 #include <XMLSchema/Traversal.hpp>
 
+#include <iostream>
+
 namespace XMLSchema
 {
   namespace Writer
@@ -48,6 +50,63 @@ namespace XMLSchema
       }
 
     protected:
+      virtual void
+      traverse (T &t)
+      {
+        Traversal::Traverser<T>::traverse (t);
+      }
+
+      FundamentalType ()
+      {
+      }
+    };
+
+    template<typename C>
+    struct FundamentalType <XSCRT::FundamentalType<bool>, C> :
+      Traversal::Traverser<XSCRT::FundamentalType<bool> >,
+      virtual XSCRT::Writer<C>
+    {
+      FundamentalType (XSCRT::XML::Element<C> &e)
+        : XSCRT::Writer<C> (e)
+      {
+      }
+
+      using XSCRT::Writer<C>::top_;
+      using XSCRT::Writer<C>::attr_;
+
+      virtual void
+      traverse (XSCRT::FundamentalType<bool> const &o)
+      {
+        using namespace XSCRT::XML;
+
+        std::basic_ostringstream<C> os;
+
+        if (o)
+          {
+            os << "true";
+          }
+        else
+          {
+            os << "false";
+          }
+
+        if (Attribute<C>* a = attr_ ())
+        {
+          a->value (os.str ());
+        }
+        else
+        {
+          top_().value (os.str ());
+        }
+      }
+
+    protected:
+      virtual void
+      traverse (XSCRT::FundamentalType<bool> &t)
+      {
+        Traversal::Traverser<XSCRT::FundamentalType<bool> >::traverse (t);
+      }
+
       FundamentalType ()
       {
       }
@@ -83,6 +142,13 @@ namespace XMLSchema
       }
 
     protected:
+
+      virtual void
+      traverse (typename Traversal::Traverser<XMLSchema::IDREF<C> >::Type &o)
+      {
+        Traversal::Traverser<XMLSchema::IDREF<C> >::traverse (o);
+      }
+
       IDREF ()
       {
       }
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 8c4caa05475..041b369884a 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -11,7 +11,7 @@
 #include "Deployment.hpp"
 #include "DP_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -27,6 +27,8 @@ namespace CIAO
     bool
     XML_File_Intf::read_process_file (const char *file)
     {
+      CIAO_TRACE("XML_File_Intf::read_process_file");
+
       XML_Helper helper;
 
       if (!helper.is_initialized ())
@@ -51,16 +53,18 @@ namespace CIAO
 
       return false;
     }
- 
+
     ::Deployment::DeploymentPlan const *
     XML_File_Intf::get_plan (void) const
     {
+      CIAO_TRACE("get_plan");
       return this->idl_dp_.get ();
     }
 
     ::Deployment::DeploymentPlan *
     XML_File_Intf::get_plan (void)
     {
+      CIAO_TRACE("XML_File_Intf::get_plan");
       return this->idl_dp_.release ();
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
index 4a7216e78ef..9f5869b20fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  XML_File_Intf.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
+*  @file  XML_File_Intf.h
+*
+*  $Id$
+*
+*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_XML_FILE_INTF_H
@@ -23,29 +23,29 @@
 
 namespace Deployment
 {
-  struct DeploymentPlan ;
+struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Config_Handlers_Export XML_File_Intf
-    {
-    public:
-      XML_File_Intf (const char *file);
+namespace Config_Handlers
+{
+class Config_Handlers_Export XML_File_Intf
+{
+public:
+XML_File_Intf (const char *file);
 
-      ::Deployment::DeploymentPlan const *get_plan (void) const;
-      ::Deployment::DeploymentPlan *get_plan (void);
+::Deployment::DeploymentPlan const *get_plan (void) const;
+::Deployment::DeploymentPlan *get_plan (void);
 
-    protected:
+protected:
 
-      bool read_process_file (const char *file);
+bool read_process_file (const char *file);
 
-    private:
-      ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
-    };
-  }
+private:
+ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
+};
+}
 }
 #include /**/ "ace/post.h"
 #endif /*CIAO_CONFIG_XML_FILE_INTF_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 06d6801d83d..0d84a6bc28a 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -333,12 +333,12 @@ namespace XSCRT
     }
 
   public:
-    
+
     operator X const& () const
     {
       return x_;
     }
-    /* 
+    /*
     operator X& ()
     {
       return x_;
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
index 51f1930eea9..e2ab4b64956 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
@@ -36,7 +36,7 @@ namespace XSCRT
     friend std::ostream&
     operator << (std::ostream& os, TypeId const& t);
     */
-    
+
   public:
     char const*
     name () const
@@ -162,7 +162,7 @@ namespace XSCRT
   {
     ExtendedTypeInfoMap::const_iterator i (
       extended_type_info_map ().find (tid));
-    
+
     if (i == extended_type_info_map ().end ()) throw NotAvailable ();
 
     return i->second;
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
index 6745c9ad28c..6c4fba2cf88 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
@@ -6,7 +6,7 @@
 /*
  *  @@HACK: Visual Studio.
  *  I think the return value for operator== for type_info
- *  in VC7 (perhaps others) is int when is should be bool. 
+ *  in VC7 (perhaps others) is int when is should be bool.
  *  This causes a warning about converting the return value from
  *  int to bool.
  */
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
index 66fd4b6db5c..5fa1e827f8d 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
@@ -30,8 +30,7 @@ namespace XSCRT
     XML::Element<C>
     next_element ()
     {
-      return XML::Element<C> (
-        dynamic_cast<xercesc::DOMElement*> (e_->item (ei_++)));
+      return XML::Element<C> (XML::dom_cast <xercesc::DOMElement*> (e_->item (ei_++)));
     }
 
     bool
@@ -44,7 +43,7 @@ namespace XSCRT
     next_attribute ()
     {
       return XML::Attribute<C> (
-        dynamic_cast<xercesc::DOMAttr*> (a_->item (ai_++)));
+        XML::dom_cast <xercesc::DOMAttr*> (a_->item (ai_++)));
     }
 
   private:
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index 4b440803a0f..b12fda738d2 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -145,6 +145,35 @@ namespace XSCRT
     std::basic_string<C>
     ns_prefix (std::basic_string<C> const& ns, Element<C> const& e);
 
+    // Casting helpers, made necessary by the Xerces project's braindead
+    // avoidance of RTTI.
+    template <typename DERIVED> struct dom_traits;
+
+    // Specializations for different node types
+    template <>
+    struct dom_traits<xercesc::DOMElement *>
+    {
+      enum { node_type = xercesc::DOMNode::ELEMENT_NODE };
+    };
+
+    template <>
+    struct dom_traits<xercesc::DOMAttr *>
+    {
+      enum { node_type = xercesc::DOMNode::ATTRIBUTE_NODE };
+    };
+
+    template <typename DERIVED_PTR>
+    DERIVED_PTR dom_cast (xercesc::DOMNode *node)
+    {
+      DERIVED_PTR elem = 0;
+      if ((node != 0) &&
+          (node->getNodeType () == dom_traits<DERIVED_PTR>::node_type))
+        {
+          elem = reinterpret_cast <DERIVED_PTR> (node);
+        }
+      return elem;
+    }
+
     template <typename C>
     class Element
     {
@@ -221,7 +250,7 @@ namespace XSCRT
       Element<C>
       parent () const
       {
-        return dynamic_cast<xercesc::DOMElement const*>(ce_->getParentNode ());
+        return dom_cast <xercesc::DOMElement const*>(ce_->getParentNode ());
       }
 
     public:
diff --git a/TAO/CIAO/tools/Config_Handlers/ccd.cpp b/TAO/CIAO/tools/Config_Handlers/ccd.cpp
index f9081629cc8..66743f01e2e 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "ccd.hpp"
 
 namespace CIAO
@@ -16,66 +16,56 @@ 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),
-    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);
       if (specificType_.get ()) specificType_->container (this);
       {
-        for (supportedType_const_iterator i (s.supportedType_.begin ());
-        i != s.supportedType_.end ();
-        ++i) add_supportedType (*i);
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
       }
 
       {
-        for (idlFile_const_iterator i (s.idlFile_.begin ());
-        i != s.idlFile_.end ();
-        ++i) add_idlFile (*i);
+        for (idlFile_const_iterator i (s.idlFile_.begin ());i != s.idlFile_.end ();++i) add_idlFile (*i);
       }
 
       {
-        for (configProperty_const_iterator i (s.configProperty_.begin ());
-        i != s.configProperty_.end ();
-        ++i) add_configProperty (*i);
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
       }
 
       {
-        for (port_const_iterator i (s.port_.begin ());
-        i != s.port_.end ();
-        ++i) add_port (*i);
+        for (port_const_iterator i (s.port_.begin ());i != s.port_.end ();++i) add_port (*i);
       }
 
       {
-        for (property_const_iterator i (s.property_.begin ());
-        i != s.property_.end ();
-        ++i) add_property (*i);
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*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);
     }
 
     ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentInterfaceDescription::
@@ -92,55 +82,46 @@ namespace CIAO
 
       supportedType_.clear ();
       {
-        for (supportedType_const_iterator i (s.supportedType_.begin ());
-        i != s.supportedType_.end ();
-        ++i) add_supportedType (*i);
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
       }
 
       idlFile_.clear ();
       {
-        for (idlFile_const_iterator i (s.idlFile_.begin ());
-        i != s.idlFile_.end ();
-        ++i) add_idlFile (*i);
+        for (idlFile_const_iterator i (s.idlFile_.begin ());i != s.idlFile_.end ();++i) add_idlFile (*i);
       }
 
       configProperty_.clear ();
       {
-        for (configProperty_const_iterator i (s.configProperty_.begin ());
-        i != s.configProperty_.end ();
-        ++i) add_configProperty (*i);
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
       }
 
       port_.clear ();
       {
-        for (port_const_iterator i (s.port_.begin ());
-        i != s.port_.end ();
-        ++i) add_port (*i);
+        for (port_const_iterator i (s.port_.begin ());i != s.port_.end ();++i) add_port (*i);
       }
 
       property_.clear ();
       {
-        for (property_const_iterator i (s.property_.begin ());
-        i != s.property_.end ();
-        ++i) add_property (*i);
+        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
       }
 
       infoProperty_.clear ();
       {
-        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 (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;
     }
 
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     label_p () const
     {
@@ -157,19 +138,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
     {
@@ -186,19 +167,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
     {
@@ -215,19 +196,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 ()
     {
@@ -265,7 +246,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::idlFile_iterator ComponentInterfaceDescription::
     begin_idlFile ()
     {
@@ -303,7 +284,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::configProperty_iterator ComponentInterfaceDescription::
     begin_configProperty ()
     {
@@ -341,7 +322,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::port_iterator ComponentInterfaceDescription::
     begin_port ()
     {
@@ -379,7 +360,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::property_iterator ComponentInterfaceDescription::
     begin_property ()
     {
@@ -417,7 +398,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::infoProperty_iterator ComponentInterfaceDescription::
     begin_infoProperty ()
     {
@@ -455,7 +436,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     contentLocation_p () const
     {
@@ -472,15 +453,50 @@ 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
+    {
+      return href_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentInterfaceDescription::
+    href () const
+    {
+      return *href_;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR >& ComponentInterfaceDescription::
+    href ()
+    {
+      return *href_;
+    }
+
+    void ComponentInterfaceDescription::
+    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);
+        }
     }
   }
 }
@@ -494,80 +510,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);
+          ::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
+            {
+            }
         }
 
-        else if (n == "specificType")
+      while (p.more_attributes ())
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          specificType (t);
+          ::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 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 
-        {
-        }
-      }
     }
   }
 }
@@ -634,6 +665,8 @@ namespace CIAO
         infoProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -655,6 +688,8 @@ namespace CIAO
         infoProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -742,19 +777,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
         if (b != e)
-        {
-          supportedType_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) supportedType_next (o);
+            supportedType_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) supportedType_next (o);
+              }
+
+            supportedType_post (o);
           }
 
-          supportedType_post (o);
-        }
-
         else supportedType_none (o);
       }
 
@@ -766,19 +799,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) supportedType_next (o);
+            supportedType_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) supportedType_next (o);
+              }
+
+            supportedType_post (o);
           }
 
-          supportedType_post (o);
-        }
-
         else supportedType_none (o);
       }
 
@@ -830,19 +861,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile());
 
         if (b != e)
-        {
-          idlFile_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
+            idlFile_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) idlFile_next (o);
+              }
+
+            idlFile_post (o);
           }
 
-          idlFile_post (o);
-        }
-
         else idlFile_none (o);
       }
 
@@ -854,19 +883,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
+            idlFile_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) idlFile_next (o);
+              }
+
+            idlFile_post (o);
           }
 
-          idlFile_post (o);
-        }
-
         else idlFile_none (o);
       }
 
@@ -918,19 +945,17 @@ namespace CIAO
         ComponentInterfaceDescription::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_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
           }
 
-          configProperty_post (o);
-        }
-
         else configProperty_none (o);
       }
 
@@ -942,19 +967,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
+            configProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
           }
 
-          configProperty_post (o);
-        }
-
         else configProperty_none (o);
       }
 
@@ -1006,19 +1029,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::port_iterator b (o.begin_port()), e (o.end_port());
 
         if (b != e)
-        {
-          port_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) port_next (o);
+            port_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) port_next (o);
+              }
+
+            port_post (o);
           }
 
-          port_post (o);
-        }
-
         else port_none (o);
       }
 
@@ -1030,19 +1051,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) port_next (o);
+            port_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) port_next (o);
+              }
+
+            port_post (o);
           }
 
-          port_post (o);
-        }
-
         else port_none (o);
       }
 
@@ -1094,19 +1113,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
         if (b != e)
-        {
-          property_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) property_next (o);
+            property_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) property_next (o);
+              }
+
+            property_post (o);
           }
 
-          property_post (o);
-        }
-
         else property_none (o);
       }
 
@@ -1118,19 +1135,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) property_next (o);
+            property_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) property_next (o);
+              }
+
+            property_post (o);
           }
 
-          property_post (o);
-        }
-
         else property_none (o);
       }
 
@@ -1182,19 +1197,17 @@ namespace CIAO
         ComponentInterfaceDescription::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_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1206,19 +1219,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1285,6 +1296,28 @@ namespace CIAO
       }
 
       void ComponentInterfaceDescription::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ComponentInterfaceDescription::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void ComponentInterfaceDescription::
+      href_none (Type&)
+      {
+      }
+
+      void ComponentInterfaceDescription::
+      href_none (Type const&)
+      {
+      }
+
+      void ComponentInterfaceDescription::
       post (Type&)
       {
       }
@@ -1309,7 +1342,7 @@ namespace CIAO
 
       ComponentInterfaceDescription::
       ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -1469,6 +1502,15 @@ namespace CIAO
         Traversal::ComponentInterfaceDescription::contentLocation (o);
         pop_ ();
       }
+
+      void ComponentInterfaceDescription::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::ComponentInterfaceDescription::href (o);
+        attr_ (0);
+      }
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/ccd.hpp b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
index 36e0c82c71d..0a95203fecf 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,10 +24,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription;
-  }
+namespace Config_Handlers
+{
+class ComponentInterfaceDescription;
+}
 }
 
 #include <memory>
@@ -41,772 +38,738 @@ namespace CIAO
 
 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_;
-
-      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
+{
+//@@ 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 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
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+specificType (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+specificType (Type const&);
 
-        virtual void
-        specificType (Type&);
+virtual void
+specificType_none (Type&);
 
-        virtual void
-        specificType (Type const&);
+virtual void
+specificType_none (Type const&);
 
-        virtual void
-        specificType_none (Type&);
+virtual void
+supportedType (Type&);
 
-        virtual void
-        specificType_none (Type const&);
+virtual void
+supportedType (Type const&);
 
-        virtual void
-        supportedType (Type&);
+virtual void
+supportedType_pre (Type&);
 
-        virtual void
-        supportedType (Type const&);
+virtual void
+supportedType_pre (Type const&);
 
-        virtual void
-        supportedType_pre (Type&);
+virtual void
+supportedType_next (Type&);
 
-        virtual void
-        supportedType_pre (Type const&);
+virtual void
+supportedType_next (Type const&);
 
-        virtual void
-        supportedType_next (Type&);
+virtual void
+supportedType_post (Type&);
 
-        virtual void
-        supportedType_next (Type const&);
+virtual void
+supportedType_post (Type const&);
 
-        virtual void
-        supportedType_post (Type&);
+virtual void
+supportedType_none (Type&);
 
-        virtual void
-        supportedType_post (Type const&);
+virtual void
+supportedType_none (Type const&);
 
-        virtual void
-        supportedType_none (Type&);
+virtual void
+idlFile (Type&);
 
-        virtual void
-        supportedType_none (Type const&);
+virtual void
+idlFile (Type const&);
 
-        virtual void
-        idlFile (Type&);
+virtual void
+idlFile_pre (Type&);
 
-        virtual void
-        idlFile (Type const&);
+virtual void
+idlFile_pre (Type const&);
 
-        virtual void
-        idlFile_pre (Type&);
+virtual void
+idlFile_next (Type&);
 
-        virtual void
-        idlFile_pre (Type const&);
+virtual void
+idlFile_next (Type const&);
 
-        virtual void
-        idlFile_next (Type&);
+virtual void
+idlFile_post (Type&);
 
-        virtual void
-        idlFile_next (Type const&);
+virtual void
+idlFile_post (Type const&);
 
-        virtual void
-        idlFile_post (Type&);
+virtual void
+idlFile_none (Type&);
 
-        virtual void
-        idlFile_post (Type const&);
+virtual void
+idlFile_none (Type const&);
 
-        virtual void
-        idlFile_none (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        idlFile_none (Type const&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        configProperty_pre (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        configProperty_pre (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        configProperty_next (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        configProperty_next (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        configProperty_post (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        configProperty_post (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+port (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+port (Type const&);
 
-        virtual void
-        port (Type&);
+virtual void
+port_pre (Type&);
 
-        virtual void
-        port (Type const&);
+virtual void
+port_pre (Type const&);
 
-        virtual void
-        port_pre (Type&);
+virtual void
+port_next (Type&);
 
-        virtual void
-        port_pre (Type const&);
+virtual void
+port_next (Type const&);
 
-        virtual void
-        port_next (Type&);
+virtual void
+port_post (Type&);
 
-        virtual void
-        port_next (Type const&);
+virtual void
+port_post (Type const&);
 
-        virtual void
-        port_post (Type&);
+virtual void
+port_none (Type&);
 
-        virtual void
-        port_post (Type const&);
+virtual void
+port_none (Type const&);
 
-        virtual void
-        port_none (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        port_none (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        property_pre (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        property_pre (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        property_next (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        property_next (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        property_post (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        property_post (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        property_none (Type&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        property_none (Type const&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        infoProperty_pre (Type&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        infoProperty_next (Type&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        infoProperty_post (Type&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation_none (Type const&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+href (Type&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+href (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+href_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+label (Type &o)
+{
 
+this->label (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+UUID (Type &o)
+{
 
+this->UUID (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+UUID (Type const&);
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+virtual void
+specificType (Type &o)
+{
 
+this->specificType (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        specificType (Type &o)
-        {
+virtual void
+specificType (Type const&);
 
-          this->specificType (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_pre (Type &o)
+{
 
+this->supportedType_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        specificType (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        supportedType_pre (Type &o)
-        {
+virtual void
+supportedType_pre (Type const&);
 
-          this->supportedType_pre (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_next (Type &o)
+{
 
+this->supportedType_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        supportedType_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        supportedType_next (Type &o)
-        {
+virtual void
+supportedType_next (Type const&);
 
-          this->supportedType_next (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_post (Type &o)
+{
 
+this->supportedType_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        supportedType_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        supportedType_post (Type &o)
-        {
+virtual void
+supportedType_post (Type const&);
 
-          this->supportedType_post (const_cast <Type const &> (o));
-        }
+virtual void
+idlFile_pre (Type &o)
+{
 
+this->idlFile_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        supportedType_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        idlFile_pre (Type &o)
-        {
+virtual void
+idlFile_pre (Type const&);
 
-          this->idlFile_pre (const_cast <Type const &> (o));
-        }
+virtual void
+idlFile_next (Type &o)
+{
 
+this->idlFile_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        idlFile_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        idlFile_next (Type &o)
-        {
+virtual void
+idlFile_next (Type const&);
 
-          this->idlFile_next (const_cast <Type const &> (o));
-        }
+virtual void
+idlFile_post (Type &o)
+{
 
+this->idlFile_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        idlFile_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        idlFile_post (Type &o)
-        {
+virtual void
+idlFile_post (Type const&);
 
-          this->idlFile_post (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_pre (Type &o)
+{
 
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        idlFile_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_pre (Type &o)
-        {
+virtual void
+configProperty_pre (Type const&);
 
-          this->configProperty_pre (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_next (Type &o)
+{
 
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_next (Type &o)
-        {
+virtual void
+configProperty_next (Type const&);
 
-          this->configProperty_next (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_post (Type &o)
+{
 
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty_post (Type &o)
-        {
+virtual void
+configProperty_post (Type const&);
 
-          this->configProperty_post (const_cast <Type const &> (o));
-        }
+virtual void
+port_pre (Type &o)
+{
 
+this->port_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        port_pre (Type &o)
-        {
+virtual void
+port_pre (Type const&);
 
-          this->port_pre (const_cast <Type const &> (o));
-        }
+virtual void
+port_next (Type &o)
+{
 
+this->port_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        port_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        port_next (Type &o)
-        {
+virtual void
+port_next (Type const&);
 
-          this->port_next (const_cast <Type const &> (o));
-        }
+virtual void
+port_post (Type &o)
+{
 
+this->port_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        port_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        port_post (Type &o)
-        {
+virtual void
+port_post (Type const&);
 
-          this->port_post (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type &o)
+{
 
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        port_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property_pre (Type &o)
-        {
+virtual void
+property_pre (Type const&);
 
-          this->property_pre (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type &o)
+{
 
+this->property_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property_next (Type &o)
-        {
+virtual void
+property_next (Type const&);
 
-          this->property_next (const_cast <Type const &> (o));
-        }
+virtual void
+property_post (Type &o)
+{
 
+this->property_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property_post (Type &o)
-        {
+virtual void
+property_post (Type const&);
 
-          this->property_post (const_cast <Type const &> (o));
-        }
+virtual void
+infoProperty_pre (Type &o)
+{
 
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        property_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty_pre (Type &o)
-        {
+virtual void
+infoProperty_pre (Type const&);
 
-          this->infoProperty_pre (const_cast <Type const &> (o));
-        }
+virtual void
+infoProperty_next (Type &o)
+{
+
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty_next (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty_next (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty_post (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->infoProperty_post (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        contentLocation (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/TAO/CIAO/tools/Config_Handlers/cdd.cpp b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
index 048afb74ca0..081ff061ea8 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
@@ -1,14 +1,15 @@
+
 /* $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>
  */
- 
+
 #include "cdd.hpp"
 
 namespace CIAO
@@ -16,45 +17,45 @@ namespace CIAO
   namespace Config_Handlers
   {
     // Domain
-    // 
+    //
 
     Domain::
-    Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-    ::CIAO::Config_Handlers::Bridge const& bridge__)
-    : 
-    ::XSCRT::Type (), 
-    interconnect_ (new ::CIAO::Config_Handlers::Interconnect (interconnect__)),
-    bridge_ (new ::CIAO::Config_Handlers::Bridge (bridge__)),
-    regulator__ ()
+    Domain ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
-      interconnect_->container (this);
-      bridge_->container (this);
     }
 
     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),
-    interconnect_ (new ::CIAO::Config_Handlers::Interconnect (*s.interconnect_)),
-    bridge_ (new ::CIAO::Config_Handlers::Bridge (*s.bridge_)),
-    sharedResource_ (s.sharedResource_.get () ? new ::CIAO::Config_Handlers::SharedResource (*s.sharedResource_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 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);
       {
-        for (node_const_iterator i (s.node_.begin ());
-        i != s.node_.end ();
-        ++i) add_node (*i);
+        for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i);
+      }
+
+      {
+        for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i);
+      }
+
+      {
+        for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i);
+      }
+
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
       }
 
-      interconnect_->container (this);
-      bridge_->container (this);
-      if (sharedResource_.get ()) sharedResource_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
     }
 
     ::CIAO::Config_Handlers::Domain& Domain::
@@ -68,27 +69,35 @@ namespace CIAO
 
       node_.clear ();
       {
-        for (node_const_iterator i (s.node_.begin ());
-        i != s.node_.end ();
-        ++i) add_node (*i);
+        for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i);
       }
 
-      interconnect (s.interconnect ());
+      interconnect_.clear ();
+      {
+        for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i);
+      }
 
-      bridge (s.bridge ());
+      bridge_.clear ();
+      {
+        for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i);
+      }
 
-      if (s.sharedResource_.get ()) sharedResource (*(s.sharedResource_));
-      else sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (0);
+      sharedResource_.clear ();
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+      }
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      infoProperty_.clear ();
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
       return *this;
     }
 
 
     // Domain
-    // 
+    //
     bool Domain::
     UUID_p () const
     {
@@ -105,19 +114,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
     {
@@ -134,19 +143,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 ()
     {
@@ -184,2778 +193,3200 @@ namespace CIAO
     }
 
     // Domain
-    // 
-    ::CIAO::Config_Handlers::Interconnect const& Domain::
-    interconnect () const
+    //
+    Domain::interconnect_iterator Domain::
+    begin_interconnect ()
     {
-      return *interconnect_;
+      return interconnect_.begin ();
     }
 
-    void Domain::
-    interconnect (::CIAO::Config_Handlers::Interconnect const& e)
+    Domain::interconnect_iterator Domain::
+    end_interconnect ()
     {
-      *interconnect_ = e;
+      return interconnect_.end ();
     }
 
-    // Domain
-    // 
-    ::CIAO::Config_Handlers::Bridge const& Domain::
-    bridge () const
+    Domain::interconnect_const_iterator Domain::
+    begin_interconnect () const
     {
-      return *bridge_;
+      return interconnect_.begin ();
     }
 
-    void Domain::
-    bridge (::CIAO::Config_Handlers::Bridge const& e)
+    Domain::interconnect_const_iterator Domain::
+    end_interconnect () const
     {
-      *bridge_ = e;
+      return interconnect_.end ();
     }
 
-    // Domain
-    // 
-    bool Domain::
-    sharedResource_p () const
+    void Domain::
+    add_interconnect (::CIAO::Config_Handlers::Interconnect const& e)
     {
-      return sharedResource_.get () != 0;
+      interconnect_.push_back (e);
     }
 
-    ::CIAO::Config_Handlers::SharedResource const& Domain::
-    sharedResource () const
+    size_t Domain::
+    count_interconnect(void) const
     {
-      return *sharedResource_;
+      return interconnect_.size ();
     }
 
-    void Domain::
-    sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
+    // Domain
+    //
+    Domain::bridge_iterator Domain::
+    begin_bridge ()
     {
-      if (sharedResource_.get ())
-      {
-        *sharedResource_ = e;
-      }
-
-      else
-      {
-        sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (new ::CIAO::Config_Handlers::SharedResource (e));
-        sharedResource_->container (this);
-      }
+      return bridge_.begin ();
     }
 
-    // Domain
-    // 
-    bool Domain::
-    infoProperty_p () const
+    Domain::bridge_iterator Domain::
+    end_bridge ()
     {
-      return infoProperty_.get () != 0;
+      return bridge_.end ();
     }
 
-    ::CIAO::Config_Handlers::Property const& Domain::
-    infoProperty () const
+    Domain::bridge_const_iterator Domain::
+    begin_bridge () const
     {
-      return *infoProperty_;
+      return bridge_.begin ();
     }
 
-    void Domain::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
+    Domain::bridge_const_iterator Domain::
+    end_bridge () const
     {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
+      return bridge_.end ();
     }
 
-
-    // Bridge
-    // 
-
-    Bridge::
-    Bridge (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
+    void Domain::
+    add_bridge (::CIAO::Config_Handlers::Bridge const& e)
     {
-      name_->container (this);
+      bridge_.push_back (e);
     }
 
-    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__ ()
+    size_t Domain::
+    count_bridge(void) const
     {
-      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);
-      }
+      return bridge_.size ();
     }
 
-    ::CIAO::Config_Handlers::Bridge& Bridge::
-    operator= (::CIAO::Config_Handlers::Bridge const& s)
+    // Domain
+    //
+    Domain::sharedResource_iterator Domain::
+    begin_sharedResource ()
     {
-      name (s.name ());
-
-      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);
-      }
-
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());
-        i != s.resource_.end ();
-        ++i) add_resource (*i);
-      }
-
-      return *this;
+      return sharedResource_.begin ();
     }
 
-
-    // Bridge
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
-    name () const
+    Domain::sharedResource_iterator Domain::
+    end_sharedResource ()
     {
-      return *name_;
+      return sharedResource_.end ();
     }
 
-    void Bridge::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    Domain::sharedResource_const_iterator Domain::
+    begin_sharedResource () const
     {
-      *name_ = e;
+      return sharedResource_.begin ();
     }
 
-    // Bridge
-    // 
-    bool Bridge::
-    label_p () const
+    Domain::sharedResource_const_iterator Domain::
+    end_sharedResource () const
     {
-      return label_.get () != 0;
+      return sharedResource_.end ();
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
-    label () const
+    void Domain::
+    add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
     {
-      return *label_;
+      sharedResource_.push_back (e);
     }
 
-    void Bridge::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    size_t Domain::
+    count_sharedResource(void) const
     {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+      return sharedResource_.size ();
     }
 
-    // Bridge
-    // 
-    Bridge::connect_iterator Bridge::
-    begin_connect ()
+    // Domain
+    //
+    Domain::infoProperty_iterator Domain::
+    begin_infoProperty ()
     {
-      return connect_.begin ();
+      return infoProperty_.begin ();
     }
 
-    Bridge::connect_iterator Bridge::
-    end_connect ()
+    Domain::infoProperty_iterator Domain::
+    end_infoProperty ()
     {
-      return connect_.end ();
+      return infoProperty_.end ();
     }
 
-    Bridge::connect_const_iterator Bridge::
-    begin_connect () const
+    Domain::infoProperty_const_iterator Domain::
+    begin_infoProperty () const
     {
-      return connect_.begin ();
+      return infoProperty_.begin ();
     }
 
-    Bridge::connect_const_iterator Bridge::
-    end_connect () const
+    Domain::infoProperty_const_iterator Domain::
+    end_infoProperty () const
     {
-      return connect_.end ();
+      return infoProperty_.end ();
     }
 
-    void Bridge::
-    add_connect (::CIAO::Config_Handlers::Interconnect const& e)
+    void Domain::
+    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
     {
-      connect_.push_back (e);
+      infoProperty_.push_back (e);
     }
 
-    size_t Bridge::
-    count_connect(void) const
+    size_t Domain::
+    count_infoProperty(void) const
     {
-      return connect_.size ();
+      return infoProperty_.size ();
     }
 
+
     // Bridge
-    // 
-    Bridge::resource_iterator Bridge::
-    begin_resource ()
-    {
-      return resource_.begin ();
-    }
+    //
 
-    Bridge::resource_iterator Bridge::
-    end_resource ()
-    {
-      return resource_.end ();
-    }
+    Bridge::
+    Bridge (::XMLSchema::string< ACE_TCHAR > const& name__)
+      :
+      ::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    Bridge::resource_const_iterator Bridge::
-    begin_resource () const
-    {
-      return resource_.begin ();
-    }
+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::resource_const_iterator Bridge::
-    end_resource () const
-    {
-      return resource_.end ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    void Bridge::
-    add_resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      resource_.push_back (e);
-    }
+::CIAO::Config_Handlers::Bridge& Bridge::
+operator= (::CIAO::Config_Handlers::Bridge const& s)
+{
+name (s.name ());
 
-    size_t Bridge::
-    count_resource(void) const
-    {
-      return resource_.size ();
-    }
+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);
+}
 
-    // Interconnect
-    // 
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
-    Interconnect::
-    Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+return *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);
-      }
 
-      {
-        for (connect_const_iterator i (s.connect_.begin ());
-        i != s.connect_.end ();
-        ++i) add_connect (*i);
-      }
+// Bridge
+//
+::XMLSchema::string< ACE_TCHAR > const& Bridge::
+name () const
+{
+return *name_;
+}
 
-      {
-        for (resource_const_iterator i (s.resource_.begin ());
-        i != s.resource_.end ();
-        ++i) add_resource (*i);
-      }
-    }
+void Bridge::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    ::CIAO::Config_Handlers::Interconnect& Interconnect::
-    operator= (::CIAO::Config_Handlers::Interconnect const& s)
-    {
-      name (s.name ());
+// Bridge
+//
+bool Bridge::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+::XMLSchema::string< ACE_TCHAR > const& Bridge::
+label () const
+{
+return *label_;
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
+void Bridge::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-      connect_.clear ();
-      {
-        for (connect_const_iterator i (s.connect_.begin ());
-        i != s.connect_.end ();
-        ++i) add_connect (*i);
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());
-        i != s.resource_.end ();
-        ++i) add_resource (*i);
-      }
+// Bridge
+//
+Bridge::connect_iterator Bridge::
+begin_connect ()
+{
+return connect_.begin ();
+}
 
-      return *this;
-    }
+Bridge::connect_iterator Bridge::
+end_connect ()
+{
+return connect_.end ();
+}
 
+Bridge::connect_const_iterator Bridge::
+begin_connect () const
+{
+return connect_.begin ();
+}
 
-    // Interconnect
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-    name () const
-    {
-      return *name_;
-    }
+Bridge::connect_const_iterator Bridge::
+end_connect () const
+{
+return connect_.end ();
+}
 
-    void Interconnect::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Bridge::
+add_connect (::CIAO::Config_Handlers::Interconnect const& e)
+{
+connect_.push_back (e);
+}
 
-    // Interconnect
-    // 
-    bool Interconnect::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+size_t Bridge::
+count_connect(void) const
+{
+return connect_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-    label () const
-    {
-      return *label_;
-    }
+// Bridge
+//
+Bridge::resource_iterator Bridge::
+begin_resource ()
+{
+return resource_.begin ();
+}
 
-    void Interconnect::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+Bridge::resource_iterator Bridge::
+end_resource ()
+{
+return resource_.end ();
+}
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+Bridge::resource_const_iterator Bridge::
+begin_resource () const
+{
+return resource_.begin ();
+}
 
-    // Interconnect
-    // 
-    Interconnect::connection_iterator Interconnect::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+Bridge::resource_const_iterator Bridge::
+end_resource () const
+{
+return resource_.end ();
+}
 
-    Interconnect::connection_iterator Interconnect::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+void Bridge::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
 
-    Interconnect::connection_const_iterator Interconnect::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+size_t Bridge::
+count_resource(void) const
+{
+return resource_.size ();
+}
 
-    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);
-    }
+// Interconnect
+//
 
-    size_t Interconnect::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+Interconnect::
+Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // Interconnect
-    // 
-    Interconnect::connect_iterator Interconnect::
-    begin_connect ()
-    {
-      return connect_.begin ();
-    }
+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::connect_iterator Interconnect::
-    end_connect ()
-    {
-      return connect_.end ();
-    }
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    Interconnect::connect_const_iterator Interconnect::
-    begin_connect () const
-    {
-      return connect_.begin ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    Interconnect::connect_const_iterator Interconnect::
-    end_connect () const
-    {
-      return connect_.end ();
-    }
+::CIAO::Config_Handlers::Interconnect& Interconnect::
+operator= (::CIAO::Config_Handlers::Interconnect const& s)
+{
+name (s.name ());
 
-    void Interconnect::
-    add_connect (::CIAO::Config_Handlers::Node const& e)
-    {
-      connect_.push_back (e);
-    }
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    size_t Interconnect::
-    count_connect(void) const
-    {
-      return connect_.size ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    // Interconnect
-    // 
-    Interconnect::resource_iterator Interconnect::
-    begin_resource ()
-    {
-      return resource_.begin ();
-    }
+connect_.clear ();
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    Interconnect::resource_iterator Interconnect::
-    end_resource ()
-    {
-      return resource_.end ();
-    }
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
-    Interconnect::resource_const_iterator Interconnect::
-    begin_resource () const
-    {
-      return resource_.begin ();
-    }
+return *this;
+}
 
-    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);
-    }
+// Interconnect
+//
+::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+name () const
+{
+return *name_;
+}
 
-    size_t Interconnect::
-    count_resource(void) const
-    {
-      return resource_.size ();
-    }
+void Interconnect::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
+// Interconnect
+//
+bool Interconnect::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // Node
-    // 
+::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+label () const
+{
+return *label_;
+}
 
-    Node::
-    Node (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::Resource const& resource__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    resource_ (new ::CIAO::Config_Handlers::Resource (resource__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resource_->container (this);
-    }
+void Interconnect::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    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),
-    resource_ (new ::CIAO::Config_Handlers::Resource (*s.resource_)),
-    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);
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());
-        i != s.sharedResource_.end ();
-        ++i) add_sharedResource (*i);
-      }
+// Interconnect
+//
+Interconnect::connection_iterator Interconnect::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-      resource_->container (this);
-    }
+Interconnect::connection_iterator Interconnect::
+end_connection ()
+{
+return connection_.end ();
+}
 
-    ::CIAO::Config_Handlers::Node& Node::
-    operator= (::CIAO::Config_Handlers::Node const& s)
-    {
-      name (s.name ());
+Interconnect::connection_const_iterator Interconnect::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+Interconnect::connection_const_iterator Interconnect::
+end_connection () const
+{
+return connection_.end ();
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
+void Interconnect::
+add_connection (::CIAO::Config_Handlers::Bridge const& e)
+{
+connection_.push_back (e);
+}
 
-      sharedResource_.clear ();
-      {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());
-        i != s.sharedResource_.end ();
-        ++i) add_sharedResource (*i);
-      }
+size_t Interconnect::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
-      resource (s.resource ());
+// Interconnect
+//
+Interconnect::connect_iterator Interconnect::
+begin_connect ()
+{
+return connect_.begin ();
+}
 
-      return *this;
-    }
+Interconnect::connect_iterator Interconnect::
+end_connect ()
+{
+return connect_.end ();
+}
 
+Interconnect::connect_const_iterator Interconnect::
+begin_connect () const
+{
+return connect_.begin ();
+}
 
-    // Node
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Node::
-    name () const
-    {
-      return *name_;
-    }
+Interconnect::connect_const_iterator Interconnect::
+end_connect () const
+{
+return connect_.end ();
+}
 
-    void Node::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Interconnect::
+add_connect (::CIAO::Config_Handlers::Node const& e)
+{
+connect_.push_back (e);
+}
 
-    // Node
-    // 
-    bool Node::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+size_t Interconnect::
+count_connect(void) const
+{
+return connect_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& Node::
-    label () const
-    {
-      return *label_;
-    }
+// Interconnect
+//
+Interconnect::resource_iterator Interconnect::
+begin_resource ()
+{
+return resource_.begin ();
+}
 
-    void Node::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+Interconnect::resource_iterator Interconnect::
+end_resource ()
+{
+return resource_.end ();
+}
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+Interconnect::resource_const_iterator Interconnect::
+begin_resource () const
+{
+return resource_.begin ();
+}
 
-    // Node
-    // 
-    Node::connection_iterator Node::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+Interconnect::resource_const_iterator Interconnect::
+end_resource () const
+{
+return resource_.end ();
+}
 
-    Node::connection_iterator Node::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+void Interconnect::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
 
-    Node::connection_const_iterator Node::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+size_t Interconnect::
+count_resource(void) const
+{
+return resource_.size ();
+}
 
-    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);
-    }
+// Node
+//
 
-    size_t Node::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+Node::
+Node (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // Node
-    // 
-    Node::sharedResource_iterator Node::
-    begin_sharedResource ()
-    {
-      return sharedResource_.begin ();
-    }
+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::sharedResource_iterator Node::
-    end_sharedResource ()
-    {
-      return sharedResource_.end ();
-    }
+{
+for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+}
 
-    Node::sharedResource_const_iterator Node::
-    begin_sharedResource () const
-    {
-      return sharedResource_.begin ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    Node::sharedResource_const_iterator Node::
-    end_sharedResource () const
-    {
-      return sharedResource_.end ();
-    }
+::CIAO::Config_Handlers::Node& Node::
+operator= (::CIAO::Config_Handlers::Node const& s)
+{
+name (s.name ());
 
-    void Node::
-    add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
-    {
-      sharedResource_.push_back (e);
-    }
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    size_t Node::
-    count_sharedResource(void) const
-    {
-      return sharedResource_.size ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    // Node
-    // 
-    ::CIAO::Config_Handlers::Resource const& Node::
-    resource () const
-    {
-      return *resource_;
-    }
+sharedResource_.clear ();
+{
+for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+}
 
-    void Node::
-    resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      *resource_ = e;
-    }
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
+return *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);
-    }
+// Node
+//
+::XMLSchema::string< ACE_TCHAR > const& Node::
+name () const
+{
+return *name_;
+}
 
-    ::CIAO::Config_Handlers::SharedResource& SharedResource::
-    operator= (::CIAO::Config_Handlers::SharedResource const& s)
-    {
-      name (s.name ());
+void Node::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-      resourceType (s.resourceType ());
+// Node
+//
+bool Node::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-      node (s.node ());
+::XMLSchema::string< ACE_TCHAR > const& Node::
+label () const
+{
+return *label_;
+}
 
-      property (s.property ());
+void Node::
+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);
+}
+}
 
+// Node
+//
+Node::connection_iterator Node::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-    // SharedResource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-    name () const
-    {
-      return *name_;
-    }
+Node::connection_iterator Node::
+end_connection ()
+{
+return connection_.end ();
+}
 
-    void SharedResource::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+Node::connection_const_iterator Node::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-    // SharedResource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+Node::connection_const_iterator Node::
+end_connection () const
+{
+return connection_.end ();
+}
 
-    void SharedResource::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+void Node::
+add_connection (::CIAO::Config_Handlers::Interconnect const& e)
+{
+connection_.push_back (e);
+}
 
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::Node const& SharedResource::
-    node () const
-    {
-      return *node_;
-    }
+size_t Node::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
-    void SharedResource::
-    node (::CIAO::Config_Handlers::Node const& e)
-    {
-      *node_ = e;
-    }
+// Node
+//
+Node::sharedResource_iterator Node::
+begin_sharedResource ()
+{
+return sharedResource_.begin ();
+}
 
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
-    property () const
-    {
-      return *property_;
-    }
+Node::sharedResource_iterator Node::
+end_sharedResource ()
+{
+return sharedResource_.end ();
+}
 
-    void SharedResource::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
-  }
+Node::sharedResource_const_iterator Node::
+begin_sharedResource () const
+{
+return sharedResource_.begin ();
+}
+
+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);
+}
+
+size_t Node::
+count_sharedResource(void) const
+{
+return sharedResource_.size ();
+}
+
+// Node
+//
+Node::resource_iterator Node::
+begin_resource ()
+{
+return resource_.begin ();
+}
+
+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::
+end_resource () const
+{
+return resource_.end ();
+}
+
+void Node::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
+
+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 (::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 ());
+
+resourceType (s.resourceType ());
+
+node (s.node ());
+
+property (s.property ());
+
+return *this;
+}
+
+
+// SharedResource
+//
+::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+name () const
+{
+return *name_;
+}
+
+void SharedResource::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
+
+// SharedResource
+//
+::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+resourceType () const
+{
+return *resourceType_;
+}
+
+void SharedResource::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
+
+// SharedResource
+//
+::CIAO::Config_Handlers::Node const& SharedResource::
+node () const
+{
+return *node_;
+}
+
+void SharedResource::
+node (::CIAO::Config_Handlers::Node const& e)
+{
+*node_ = e;
+}
+
+// SharedResource
+//
+::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
+property () const
+{
+return *property_;
+}
+
+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")
-        {
-          interconnect_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Interconnect > (new ::CIAO::Config_Handlers::Interconnect (e));
-          interconnect_->container (this);
-        }
+else if (n == "interconnect")
+{
+::CIAO::Config_Handlers::Interconnect t (e);
+add_interconnect (t);
+}
 
-        else if (n == "bridge")
-        {
-          bridge_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Bridge > (new ::CIAO::Config_Handlers::Bridge (e));
-          bridge_->container (this);
-        }
+else if (n == "bridge")
+{
+::CIAO::Config_Handlers::Bridge t (e);
+add_bridge (t);
+}
 
-        else if (n == "sharedResource")
-        {
-          ::CIAO::Config_Handlers::SharedResource t (e);
-          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);
-          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")
-        {
-          resource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Resource > (new ::CIAO::Config_Handlers::Resource (e));
-          resource_->container (this);
-        }
+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
-      //
-      //
+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);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        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);
+}
 
-      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);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (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&)
+{
+}
 
-      void Domain::
-      pre (Type const&)
-      {
-      }
+void Domain::
+pre (Type const&)
+{
+}
 
-      void Domain::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
+void Domain::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
 
-      void Domain::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
+void Domain::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
 
-      void Domain::
-      UUID_none (Type&)
-      {
-      }
+void Domain::
+UUID_none (Type&)
+{
+}
 
-      void Domain::
-      UUID_none (Type const&)
-      {
-      }
+void Domain::
+UUID_none (Type const&)
+{
+}
 
-      void Domain::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-      void Domain::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-      void Domain::
-      label_none (Type&)
-      {
-      }
+void Domain::
+label_none (Type&)
+{
+}
 
-      void Domain::
-      label_none (Type const&)
-      {
-      }
+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());
+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);
-        }
-      }
+if (b != e)
+{
+node_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) node_next (o);
+}
 
-      void Domain::
-      node (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
+node_post (o);
+}
+}
 
-        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());
 
-      void Domain::
-      node_pre (Type&)
-      {
-      }
+if (b != e)
+{
+node_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) node_next (o);
+}
 
-      void Domain::
-      node_pre (Type const&)
-      {
-      }
+node_post (o);
+}
+}
 
-      void Domain::
-      node_next (Type&)
-      {
-      }
+void Domain::
+node_pre (Type&)
+{
+}
 
-      void Domain::
-      node_next (Type const&)
-      {
-      }
+void Domain::
+node_pre (Type const&)
+{
+}
 
-      void Domain::
-      node_post (Type&)
-      {
-      }
+void Domain::
+node_next (Type&)
+{
+}
 
-      void Domain::
-      node_post (Type const&)
-      {
-      }
+void Domain::
+node_next (Type const&)
+{
+}
 
-      void Domain::
-      interconnect (Type& o)
-      {
-        dispatch (o.interconnect ());
-      }
+void Domain::
+node_post (Type&)
+{
+}
 
-      void Domain::
-      interconnect (Type const& o)
-      {
-        dispatch (o.interconnect ());
-      }
+void Domain::
+node_post (Type const&)
+{
+}
 
-      void Domain::
-      bridge (Type& o)
-      {
-        dispatch (o.bridge ());
-      }
+void Domain::
+interconnect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect());
 
-      void Domain::
-      bridge (Type const& o)
-      {
-        dispatch (o.bridge ());
-      }
+if (b != e)
+{
+interconnect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) interconnect_next (o);
+}
 
-      void Domain::
-      sharedResource (Type& o)
-      {
-        dispatch (o.sharedResource ());
-      }
+interconnect_post (o);
+}
 
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        dispatch (o.sharedResource ());
-      }
+else interconnect_none (o);
+}
 
-      void Domain::
-      sharedResource_none (Type&)
-      {
-      }
+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::
-      sharedResource_none (Type const&)
-      {
-      }
+if (b != e)
+{
+interconnect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) interconnect_next (o);
+}
 
-      void Domain::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+interconnect_post (o);
+}
 
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+else interconnect_none (o);
+}
 
-      void Domain::
-      infoProperty_none (Type&)
-      {
-      }
+void Domain::
+interconnect_pre (Type&)
+{
+}
 
-      void Domain::
-      infoProperty_none (Type const&)
-      {
-      }
+void Domain::
+interconnect_pre (Type const&)
+{
+}
 
-      void Domain::
-      post (Type&)
-      {
-      }
+void Domain::
+interconnect_next (Type&)
+{
+}
 
-      void Domain::
-      post (Type const&)
-      {
-      }
+void Domain::
+interconnect_next (Type const&)
+{
+}
 
-      // Bridge
-      //
-      //
+void Domain::
+interconnect_post (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 Domain::
+interconnect_post (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 Domain::
+interconnect_none (Type&)
+{
+}
 
-      void Bridge::
-      pre (Type&)
-      {
-      }
+void Domain::
+interconnect_none (Type const&)
+{
+}
 
-      void Bridge::
-      pre (Type const&)
-      {
-      }
+void Domain::
+bridge (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::bridge_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-      void Bridge::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+bridge_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) bridge_next (o);
+}
 
-      void Bridge::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+bridge_post (o);
+}
 
-      void Bridge::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+else bridge_none (o);
+}
 
-      void Bridge::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+bridge (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-      void Bridge::
-      label_none (Type&)
-      {
-      }
+if (b != e)
+{
+bridge_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) bridge_next (o);
+}
 
-      void Bridge::
-      label_none (Type const&)
-      {
-      }
+bridge_post (o);
+}
 
-      void Bridge::
-      connect (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+else bridge_none (o);
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Domain::
+bridge_pre (Type&)
+{
+}
 
-      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::
+bridge_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Domain::
+bridge_next (Type&)
+{
+}
 
-      void Bridge::
-      connect_pre (Type&)
-      {
-      }
+void Domain::
+bridge_next (Type const&)
+{
+}
 
-      void Bridge::
-      connect_pre (Type const&)
-      {
-      }
+void Domain::
+bridge_post (Type&)
+{
+}
 
-      void Bridge::
-      connect_next (Type&)
-      {
-      }
+void Domain::
+bridge_post (Type const&)
+{
+}
 
-      void Bridge::
-      connect_next (Type const&)
-      {
-      }
+void Domain::
+bridge_none (Type&)
+{
+}
 
-      void Bridge::
-      connect_post (Type&)
-      {
-      }
+void Domain::
+bridge_none (Type const&)
+{
+}
 
-      void Bridge::
-      connect_post (Type const&)
-      {
-      }
+void Domain::
+sharedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-      void Bridge::
-      resource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+sharedResource_post (o);
+}
 
-        else resource_none (o);
-      }
+else sharedResource_none (o);
+}
 
-      void Bridge::
-      resource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+void Domain::
+sharedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
 
-        else resource_none (o);
-      }
+sharedResource_post (o);
+}
 
-      void Bridge::
-      resource_pre (Type&)
-      {
-      }
+else sharedResource_none (o);
+}
 
-      void Bridge::
-      resource_pre (Type const&)
-      {
-      }
+void Domain::
+sharedResource_pre (Type&)
+{
+}
 
-      void Bridge::
-      resource_next (Type&)
-      {
-      }
+void Domain::
+sharedResource_pre (Type const&)
+{
+}
 
-      void Bridge::
-      resource_next (Type const&)
-      {
-      }
+void Domain::
+sharedResource_next (Type&)
+{
+}
 
-      void Bridge::
-      resource_post (Type&)
-      {
-      }
+void Domain::
+sharedResource_next (Type const&)
+{
+}
 
-      void Bridge::
-      resource_post (Type const&)
-      {
-      }
+void Domain::
+sharedResource_post (Type&)
+{
+}
 
-      void Bridge::
-      resource_none (Type&)
-      {
-      }
+void Domain::
+sharedResource_post (Type const&)
+{
+}
 
-      void Bridge::
-      resource_none (Type const&)
-      {
-      }
+void Domain::
+sharedResource_none (Type&)
+{
+}
 
-      void Bridge::
-      post (Type&)
-      {
-      }
+void Domain::
+sharedResource_none (Type const&)
+{
+}
 
-      void Bridge::
-      post (Type const&)
-      {
-      }
+void Domain::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-      // Interconnect
-      //
-      //
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (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);
-      }
+infoProperty_post (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);
-      }
+else infoProperty_none (o);
+}
 
-      void Interconnect::
-      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 Interconnect::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
 
-      void Interconnect::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+infoProperty_post (o);
+}
 
-      void Interconnect::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+else infoProperty_none (o);
+}
 
-      void Interconnect::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+infoProperty_pre (Type&)
+{
+}
 
-      void Interconnect::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+infoProperty_pre (Type const&)
+{
+}
 
-      void Interconnect::
-      label_none (Type&)
-      {
-      }
+void Domain::
+infoProperty_next (Type&)
+{
+}
 
-      void Interconnect::
-      label_none (Type const&)
-      {
-      }
+void Domain::
+infoProperty_next (Type const&)
+{
+}
 
-      void Interconnect::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void Domain::
+infoProperty_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Domain::
+infoProperty_post (Type const&)
+{
+}
 
-        else connection_none (o);
-      }
+void Domain::
+infoProperty_none (Type&)
+{
+}
 
-      void Interconnect::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void Domain::
+infoProperty_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Domain::
+post (Type&)
+{
+}
 
-        else connection_none (o);
-      }
+void Domain::
+post (Type const&)
+{
+}
 
-      void Interconnect::
-      connection_pre (Type&)
-      {
-      }
+// Bridge
+//
+//
 
-      void Interconnect::
-      connection_pre (Type const&)
-      {
-      }
+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 Interconnect::
-      connection_next (Type&)
-      {
-      }
+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 Interconnect::
-      connection_next (Type const&)
-      {
-      }
+void Bridge::
+pre (Type&)
+{
+}
 
-      void Interconnect::
-      connection_post (Type&)
-      {
-      }
+void Bridge::
+pre (Type const&)
+{
+}
 
-      void Interconnect::
-      connection_post (Type const&)
-      {
-      }
+void Bridge::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Interconnect::
-      connection_none (Type&)
-      {
-      }
+void Bridge::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Interconnect::
-      connection_none (Type const&)
-      {
-      }
+void Bridge::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-      void Interconnect::
-      connect (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+void Bridge::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Bridge::
+label_none (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 Bridge::
+label_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Bridge::
+connect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Interconnect::
-      connect_pre (Type&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Interconnect::
-      connect_pre (Type const&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Interconnect::
-      connect_next (Type&)
-      {
-      }
+void Bridge::
+connect (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Interconnect::
-      connect_next (Type const&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Interconnect::
-      connect_post (Type&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Interconnect::
-      connect_post (Type const&)
-      {
-      }
+void Bridge::
+connect_pre (Type&)
+{
+}
 
-      void Interconnect::
-      resource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+void Bridge::
+connect_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Bridge::
+connect_next (Type&)
+{
+}
 
-        else resource_none (o);
-      }
+void Bridge::
+connect_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 Bridge::
+connect_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Bridge::
+connect_post (Type const&)
+{
+}
 
-        else resource_none (o);
-      }
+void Bridge::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void Interconnect::
-      resource_pre (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Interconnect::
-      resource_pre (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Interconnect::
-      resource_next (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Interconnect::
-      resource_next (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 Interconnect::
-      resource_post (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Interconnect::
-      resource_post (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Interconnect::
-      resource_none (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Interconnect::
-      resource_none (Type const&)
-      {
-      }
+void Bridge::
+resource_pre (Type&)
+{
+}
 
-      void Interconnect::
-      post (Type&)
-      {
-      }
+void Bridge::
+resource_pre (Type const&)
+{
+}
 
-      void Interconnect::
-      post (Type const&)
-      {
-      }
+void Bridge::
+resource_next (Type&)
+{
+}
 
-      // Node
-      //
-      //
+void Bridge::
+resource_next (Type const&)
+{
+}
 
-      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 Bridge::
+resource_post (Type&)
+{
+}
 
-      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 Bridge::
+resource_post (Type const&)
+{
+}
 
-      void Node::
-      pre (Type&)
-      {
-      }
+void Bridge::
+resource_none (Type&)
+{
+}
 
-      void Node::
-      pre (Type const&)
-      {
-      }
+void Bridge::
+resource_none (Type const&)
+{
+}
 
-      void Node::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Bridge::
+post (Type&)
+{
+}
 
-      void Node::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Bridge::
+post (Type const&)
+{
+}
 
-      void Node::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+// Interconnect
+//
+//
 
-      void Node::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+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);
+}
 
-      void Node::
-      label_none (Type&)
-      {
-      }
+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 Node::
-      label_none (Type const&)
-      {
-      }
+void Interconnect::
+pre (Type&)
+{
+}
 
-      void Node::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void Interconnect::
+pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          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 Node::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void Interconnect::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Interconnect::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-        else connection_none (o);
-      }
+void Interconnect::
+label_none (Type&)
+{
+}
 
-      void Node::
-      connection_pre (Type&)
-      {
-      }
+void Interconnect::
+label_none (Type const&)
+{
+}
 
-      void Node::
-      connection_pre (Type const&)
-      {
-      }
+void Interconnect::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connection_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);
+}
 
-      void Node::
-      connection_next (Type const&)
-      {
-      }
+connection_post (o);
+}
 
-      void Node::
-      connection_post (Type&)
-      {
-      }
+else connection_none (o);
+}
 
-      void Node::
-      connection_post (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 Node::
-      connection_none (Type&)
-      {
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void Node::
-      connection_none (Type const&)
-      {
-      }
+connection_post (o);
+}
 
-      void Node::
-      sharedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+else connection_none (o);
+}
 
-        if (b != e)
-        {
-          sharedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) sharedResource_next (o);
-          }
-
-          sharedResource_post (o);
-        }
+void Interconnect::
+connection_pre (Type&)
+{
+}
 
-        else sharedResource_none (o);
-      }
+void Interconnect::
+connection_pre (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 Interconnect::
+connection_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          sharedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) sharedResource_next (o);
-          }
-
-          sharedResource_post (o);
-        }
+void Interconnect::
+connection_next (Type const&)
+{
+}
 
-        else sharedResource_none (o);
-      }
+void Interconnect::
+connection_post (Type&)
+{
+}
 
-      void Node::
-      sharedResource_pre (Type&)
-      {
-      }
+void Interconnect::
+connection_post (Type const&)
+{
+}
 
-      void Node::
-      sharedResource_pre (Type const&)
-      {
-      }
+void Interconnect::
+connection_none (Type&)
+{
+}
 
-      void Node::
-      sharedResource_next (Type&)
-      {
-      }
+void Interconnect::
+connection_none (Type const&)
+{
+}
 
-      void Node::
-      sharedResource_next (Type const&)
-      {
-      }
+void Interconnect::
+connect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Node::
-      sharedResource_post (Type&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Node::
-      sharedResource_post (Type const&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Node::
-      sharedResource_none (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 Node::
-      sharedResource_none (Type const&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Node::
-      resource (Type& o)
-      {
-        dispatch (o.resource ());
-      }
+connect_post (o);
+}
+}
 
-      void Node::
-      resource (Type const& o)
-      {
-        dispatch (o.resource ());
-      }
+void Interconnect::
+connect_pre (Type&)
+{
+}
 
-      void Node::
-      post (Type&)
-      {
-      }
+void Interconnect::
+connect_pre (Type const&)
+{
+}
 
-      void Node::
-      post (Type const&)
-      {
-      }
+void Interconnect::
+connect_next (Type&)
+{
+}
 
-      // SharedResource
-      //
-      //
+void Interconnect::
+connect_next (Type const&)
+{
+}
 
-      void SharedResource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
+void Interconnect::
+connect_post (Type&)
+{
+}
 
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
+void Interconnect::
+connect_post (Type const&)
+{
+}
 
-      void SharedResource::
-      pre (Type&)
-      {
-      }
+void Interconnect::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void SharedResource::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void SharedResource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+resource_post (o);
+}
 
-      void SharedResource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+else resource_none (o);
+}
 
-      void SharedResource::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void Interconnect::
+resource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void SharedResource::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+resource_post (o);
+}
 
-      void SharedResource::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+else resource_none (o);
+}
 
-      void SharedResource::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void Interconnect::
+resource_pre (Type&)
+{
+}
 
-      void SharedResource::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void Interconnect::
+resource_pre (Type const&)
+{
+}
 
-      void SharedResource::
-      post (Type&)
-      {
-      }
+void Interconnect::
+resource_next (Type&)
+{
+}
 
-      void SharedResource::
-      post (Type const&)
-      {
-      }
-    }
-  }
+void Interconnect::
+resource_next (Type const&)
+{
+}
+
+void Interconnect::
+resource_post (Type&)
+{
+}
+
+void Interconnect::
+resource_post (Type const&)
+{
+}
+
+void Interconnect::
+resource_none (Type&)
+{
+}
+
+void Interconnect::
+resource_none (Type const&)
+{
+}
+
+void Interconnect::
+post (Type&)
+{
+}
+
+void Interconnect::
+post (Type const&)
+{
+}
+
+// Node
+//
+//
+
+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::
+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::
+pre (Type&)
+{
+}
+
+void Node::
+pre (Type const&)
+{
+}
+
+void Node::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void Node::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void Node::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void Node::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void Node::
+label_none (Type&)
+{
+}
+
+void Node::
+label_none (Type const&)
+{
+}
+
+void Node::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
+
+connection_post (o);
+}
+
+else connection_none (o);
+}
+
+void Node::
+connection (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
+
+connection_post (o);
+}
+
+else connection_none (o);
+}
+
+void Node::
+connection_pre (Type&)
+{
+}
+
+void Node::
+connection_pre (Type const&)
+{
+}
+
+void Node::
+connection_next (Type&)
+{
+}
+
+void Node::
+connection_next (Type const&)
+{
+}
+
+void Node::
+connection_post (Type&)
+{
+}
+
+void Node::
+connection_post (Type const&)
+{
+}
+
+void Node::
+connection_none (Type&)
+{
+}
+
+void Node::
+connection_none (Type const&)
+{
+}
+
+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);
+}
+
+sharedResource_post (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());
+
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
+
+sharedResource_post (o);
+}
+
+else sharedResource_none (o);
+}
+
+void Node::
+sharedResource_pre (Type&)
+{
+}
+
+void Node::
+sharedResource_pre (Type const&)
+{
+}
+
+void Node::
+sharedResource_next (Type&)
+{
+}
+
+void Node::
+sharedResource_next (Type const&)
+{
+}
+
+void Node::
+sharedResource_post (Type&)
+{
+}
+
+void Node::
+sharedResource_post (Type const&)
+{
+}
+
+void Node::
+sharedResource_none (Type&)
+{
+}
+
+void Node::
+sharedResource_none (Type const&)
+{
+}
+
+void Node::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
+
+resource_post (o);
+}
+
+else resource_none (o);
+}
+
+void Node::
+resource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
+
+resource_post (o);
+}
+
+else resource_none (o);
+}
+
+void Node::
+resource_pre (Type&)
+{
+}
+
+void Node::
+resource_pre (Type const&)
+{
+}
+
+void Node::
+resource_next (Type&)
+{
+}
+
+void Node::
+resource_next (Type const&)
+{
+}
+
+void Node::
+resource_post (Type&)
+{
+}
+
+void Node::
+resource_post (Type const&)
+{
+}
+
+void Node::
+resource_none (Type&)
+{
+}
+
+void Node::
+resource_none (Type const&)
+{
+}
+
+void Node::
+post (Type&)
+{
+}
+
+void Node::
+post (Type const&)
+{
+}
+
+// SharedResource
+//
+//
+
+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::
+pre (Type&)
+{
+}
+
+void SharedResource::
+pre (Type const&)
+{
+}
+
+void SharedResource::
+name (Type& 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 const& o)
+{
+dispatch (o.resourceType ());
+}
+
+void SharedResource::
+node (Type& 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 const& o)
+{
+dispatch (o.property ());
+}
+
+void SharedResource::
+post (Type&)
+{
+}
+
+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 (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
-        Traversal::Domain::interconnect (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
+}
 
-      void Domain::
-      bridge (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
-        Traversal::Domain::bridge (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_next (Type const& o)
+{
+interconnect_post (o);
+interconnect_pre (o);
+}
 
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-        Traversal::Domain::sharedResource (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::Domain::infoProperty (o);
-        pop_ ();
-      }
+void Domain::
+bridge_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
+}
 
-      // Bridge
-      //
-      //
+void Domain::
+bridge_next (Type const& o)
+{
+bridge_post (o);
+bridge_pre (o);
+}
 
-      Bridge::
-      Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Domain::
+bridge_post (Type const&)
+{
+pop_ ();
+}
 
-      Bridge::
-      Bridge ()
-      {
-      }
+void Domain::
+sharedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+}
 
-      void Bridge::
-      traverse (Type const& o)
-      {
-        Traversal::Bridge::traverse (o);
-      }
+void Domain::
+sharedResource_next (Type const& o)
+{
+sharedResource_post (o);
+sharedResource_pre (o);
+}
 
-      void Bridge::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Bridge::name (o);
-        pop_ ();
-      }
+void Domain::
+sharedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Bridge::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Bridge::label (o);
-        pop_ ();
-      }
+void Domain::
+infoProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+}
 
-      void Bridge::
-      connect_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-      }
+void Domain::
+infoProperty_next (Type const& o)
+{
+infoProperty_post (o);
+infoProperty_pre (o);
+}
 
-      void Bridge::
-      connect_next (Type const& o)
-      {
-        connect_post (o);
-        connect_pre (o);
-      }
+void Domain::
+infoProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      void Bridge::
-      connect_post (Type const&)
-      {
-        pop_ ();
-      }
+// Bridge
+//
+//
 
-      void Bridge::
-      resource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-      }
+Bridge::
+Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Bridge::
-      resource_next (Type const& o)
-      {
-        resource_post (o);
-        resource_pre (o);
-      }
+Bridge::
+Bridge ()
+{
+}
 
-      void Bridge::
-      resource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Bridge::
+traverse (Type const& o)
+{
+Traversal::Bridge::traverse (o);
+}
 
-      // Interconnect
-      //
-      //
+void Bridge::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Bridge::name (o);
+pop_ ();
+}
 
-      Interconnect::
-      Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Bridge::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Bridge::label (o);
+pop_ ();
+}
 
-      Interconnect::
-      Interconnect ()
-      {
-      }
+void Bridge::
+connect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+}
 
-      void Interconnect::
-      traverse (Type const& o)
-      {
-        Traversal::Interconnect::traverse (o);
-      }
+void Bridge::
+connect_next (Type const& o)
+{
+connect_post (o);
+connect_pre (o);
+}
 
-      void Interconnect::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Interconnect::name (o);
-        pop_ ();
-      }
+void Bridge::
+connect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Interconnect::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Interconnect::label (o);
-        pop_ ();
-      }
+void Bridge::
+resource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+}
 
-      void Interconnect::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void Bridge::
+resource_next (Type const& o)
+{
+resource_post (o);
+resource_pre (o);
+}
 
-      void Interconnect::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+void Bridge::
+resource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Interconnect::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+// Interconnect
+//
+//
 
-      void Interconnect::
-      connect_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-      }
+Interconnect::
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Interconnect::
-      connect_next (Type const& o)
-      {
-        connect_post (o);
-        connect_pre (o);
-      }
+Interconnect::
+Interconnect ()
+{
+}
 
-      void Interconnect::
-      connect_post (Type const&)
-      {
-        pop_ ();
-      }
+void Interconnect::
+traverse (Type const& o)
+{
+Traversal::Interconnect::traverse (o);
+}
 
-      void Interconnect::
-      resource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-      }
+void Interconnect::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Interconnect::name (o);
+pop_ ();
+}
 
-      void Interconnect::
-      resource_next (Type const& o)
-      {
-        resource_post (o);
-        resource_pre (o);
-      }
+void Interconnect::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Interconnect::label (o);
+pop_ ();
+}
 
-      void Interconnect::
-      resource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Interconnect::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      // Node
-      //
-      //
+void Interconnect::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      Node::
-      Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Interconnect::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      Node::
-      Node ()
-      {
-      }
+void Interconnect::
+connect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+}
 
-      void Node::
-      traverse (Type const& o)
-      {
-        Traversal::Node::traverse (o);
-      }
+void Interconnect::
+connect_next (Type const& o)
+{
+connect_post (o);
+connect_pre (o);
+}
 
-      void Node::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Node::name (o);
-        pop_ ();
-      }
+void Interconnect::
+connect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Node::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Node::label (o);
-        pop_ ();
-      }
+void Interconnect::
+resource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+}
 
-      void Node::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void Interconnect::
+resource_next (Type const& o)
+{
+resource_post (o);
+resource_pre (o);
+}
 
-      void Node::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+void Interconnect::
+resource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Node::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+// Node
+//
+//
 
-      void Node::
-      sharedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-      }
+Node::
+Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Node::
-      sharedResource_next (Type const& o)
-      {
-        sharedResource_post (o);
-        sharedResource_pre (o);
-      }
+Node::
+Node ()
+{
+}
 
-      void Node::
-      sharedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Node::
+traverse (Type const& o)
+{
+Traversal::Node::traverse (o);
+}
 
-      void Node::
-      resource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-        Traversal::Node::resource (o);
-        pop_ ();
-      }
+void Node::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Node::name (o);
+pop_ ();
+}
 
-      // SharedResource
-      //
-      //
+void Node::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Node::label (o);
+pop_ ();
+}
 
-      SharedResource::
-      SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Node::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      SharedResource::
-      SharedResource ()
-      {
-      }
+void Node::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        Traversal::SharedResource::traverse (o);
-      }
+void Node::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      void SharedResource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::SharedResource::name (o);
-        pop_ ();
-      }
+void Node::
+sharedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+}
 
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::SharedResource::resourceType (o);
-        pop_ ();
-      }
+void Node::
+sharedResource_next (Type const& o)
+{
+sharedResource_post (o);
+sharedResource_pre (o);
+}
 
-      void SharedResource::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::SharedResource::node (o);
-        pop_ ();
-      }
+void Node::
+sharedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void SharedResource::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::SharedResource::property (o);
-        pop_ ();
-      }
-    }
-  }
+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_post (Type const&)
+{
+pop_ ();
+}
+
+// SharedResource
+//
+//
+
+SharedResource::
+SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+SharedResource::
+SharedResource ()
+{
+}
+
+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::
+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::
+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/TAO/CIAO/tools/Config_Handlers/cdd.hpp b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
index f24fac62bd7..f2e599d1b9d 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,14 +24,14 @@
 //
 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>
@@ -45,1583 +42,1694 @@ namespace CIAO
 
 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:
-      ::CIAO::Config_Handlers::Interconnect const& interconnect () const;
-      void interconnect (::CIAO::Config_Handlers::Interconnect const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Interconnect > interconnect_;
-
-      // bridge
-      // 
-      public:
-      ::CIAO::Config_Handlers::Bridge const& bridge () const;
-      void bridge (::CIAO::Config_Handlers::Bridge const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Bridge > bridge_;
-
-      // sharedResource
-      // 
-      public:
-      bool sharedResource_p () const;
-      ::CIAO::Config_Handlers::SharedResource const& sharedResource () const;
-      void sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      public:
-      Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-      ::CIAO::Config_Handlers::Bridge const& bridge__);
-
-      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:
-      ::CIAO::Config_Handlers::Resource const& resource () const;
-      void resource (::CIAO::Config_Handlers::Resource const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Resource > resource_;
-
-      public:
-      Node (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::Resource const& resource__);
-
-      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
+{
+//@@ 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 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
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+UUID (Type&);
+
+virtual void
+UUID (Type const&);
+
+virtual void
+UUID_none (Type&);
+
+virtual void
+UUID_none (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
+
+virtual void
+label_none (Type&);
+
+virtual void
+label_none (Type const&);
+
+virtual void
+node (Type&);
+
+virtual void
+node (Type const&);
+
+virtual void
+node_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+node_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+node_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+node_next (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+node_post (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+node_post (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+interconnect (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+interconnect (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+interconnect_pre (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+interconnect_pre (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+interconnect_next (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+interconnect_next (Type const&);
 
-        virtual void
-        node (Type&);
+virtual void
+interconnect_post (Type&);
 
-        virtual void
-        node (Type const&);
+virtual void
+interconnect_post (Type const&);
 
-        virtual void
-        node_pre (Type&);
+virtual void
+interconnect_none (Type&);
 
-        virtual void
-        node_pre (Type const&);
+virtual void
+interconnect_none (Type const&);
 
-        virtual void
-        node_next (Type&);
+virtual void
+bridge (Type&);
 
-        virtual void
-        node_next (Type const&);
+virtual void
+bridge (Type const&);
 
-        virtual void
-        node_post (Type&);
+virtual void
+bridge_pre (Type&);
 
-        virtual void
-        node_post (Type const&);
+virtual void
+bridge_pre (Type const&);
 
-        virtual void
-        interconnect (Type&);
+virtual void
+bridge_next (Type&);
 
-        virtual void
-        interconnect (Type const&);
+virtual void
+bridge_next (Type const&);
 
-        virtual void
-        bridge (Type&);
+virtual void
+bridge_post (Type&);
 
-        virtual void
-        bridge (Type const&);
+virtual void
+bridge_post (Type const&);
 
-        virtual void
-        sharedResource (Type&);
+virtual void
+bridge_none (Type&);
 
-        virtual void
-        sharedResource (Type const&);
+virtual void
+bridge_none (Type const&);
 
-        virtual void
-        sharedResource_none (Type&);
+virtual void
+sharedResource (Type&);
 
-        virtual void
-        sharedResource_none (Type const&);
+virtual void
+sharedResource (Type const&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+sharedResource_pre (Type&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+sharedResource_next (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+sharedResource_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+sharedResource_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+sharedResource_post (Type const&);
 
-      struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+sharedResource_none (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+sharedResource_none (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        connect (Type&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        connect (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        connect_pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        connect_next (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
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
+
+virtual void
+label_none (Type&);
+
+virtual void
+label_none (Type const&);
+
+virtual void
+connect (Type&);
+
+virtual void
+connect (Type const&);
+
+virtual void
+connect_pre (Type&);
+
+virtual void
+connect_pre (Type const&);
+
+virtual void
+connect_next (Type&);
+
+virtual void
+connect_next (Type const&);
+
+virtual void
+connect_post (Type&);
+
+virtual void
+connect_post (Type const&);
+
+virtual void
+resource (Type&);
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        connect_post (Type&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        resource (Type&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        resource (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        resource_pre (Type&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        resource_next (Type&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_none (Type const&);
 
-        virtual void
-        resource_post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        resource_none (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
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
 
-        virtual void
-        resource_none (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+label (Type const&);
 
-      struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+connection (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        connection (Type&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+connection_none (Type const&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+connect (Type&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connect (Type const&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+connect_pre (Type&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connect_pre (Type const&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+connect_next (Type&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connect_next (Type const&);
 
-        virtual void
-        connection_none (Type&);
+virtual void
+connect_post (Type&);
 
-        virtual void
-        connection_none (Type const&);
+virtual void
+connect_post (Type const&);
 
-        virtual void
-        connect (Type&);
+virtual void
+resource (Type&);
 
-        virtual void
-        connect (Type const&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        connect_pre (Type&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        connect_next (Type&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        connect_post (Type&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        resource (Type&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        resource (Type const&);
+virtual void
+resource_none (Type const&);
 
-        virtual void
-        resource_pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        resource_next (Type&);
+struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        resource_post (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        resource_none (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        resource_none (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+label (Type const&);
 
-      struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+connection (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        connection (Type&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+connection_none (Type const&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+sharedResource (Type&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+sharedResource (Type const&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+sharedResource_pre (Type&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+sharedResource_next (Type&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+sharedResource_next (Type const&);
 
-        virtual void
-        connection_none (Type&);
+virtual void
+sharedResource_post (Type&);
 
-        virtual void
-        connection_none (Type const&);
+virtual void
+sharedResource_post (Type const&);
 
-        virtual void
-        sharedResource (Type&);
+virtual void
+sharedResource_none (Type&);
 
-        virtual void
-        sharedResource (Type const&);
+virtual void
+sharedResource_none (Type const&);
 
-        virtual void
-        sharedResource_pre (Type&);
+virtual void
+resource (Type&);
 
-        virtual void
-        sharedResource_pre (Type const&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        sharedResource_next (Type&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        sharedResource_next (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        sharedResource_post (Type&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        sharedResource_post (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        sharedResource_none (Type&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        sharedResource_none (Type const&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        resource (Type&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        resource (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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+UUID (Type &o)
+{
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+this->UUID (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+UUID (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+label (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+this->label (const_cast <Type const &> (o));
+}
 
-          this->UUID (const_cast <Type const &> (o));
-        }
 
+virtual void
+label (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
+virtual void
+node_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+this->node_pre (const_cast <Type const &> (o));
+}
 
-          this->label (const_cast <Type const &> (o));
-        }
 
+virtual void
+node_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
+virtual void
+node_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node_pre (Type &o)
-        {
+this->node_next (const_cast <Type const &> (o));
+}
 
-          this->node_pre (const_cast <Type const &> (o));
-        }
 
+virtual void
+node_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node_pre (Type const&);
+virtual void
+node_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node_next (Type &o)
-        {
+this->node_post (const_cast <Type const &> (o));
+}
 
-          this->node_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+node_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node_next (Type const&);
+virtual void
+interconnect_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node_post (Type &o)
-        {
+this->interconnect_pre (const_cast <Type const &> (o));
+}
 
-          this->node_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+interconnect_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node_post (Type const&);
+virtual void
+interconnect_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        interconnect (Type &o)
-        {
+this->interconnect_next (const_cast <Type const &> (o));
+}
 
-          this->interconnect (const_cast <Type const &> (o));
-        }
 
+virtual void
+interconnect_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        interconnect (Type const&);
+virtual void
+interconnect_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        bridge (Type &o)
-        {
+this->interconnect_post (const_cast <Type const &> (o));
+}
 
-          this->bridge (const_cast <Type const &> (o));
-        }
 
+virtual void
+interconnect_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        bridge (Type const&);
+virtual void
+bridge_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        sharedResource (Type &o)
-        {
+this->bridge_pre (const_cast <Type const &> (o));
+}
 
-          this->sharedResource (const_cast <Type const &> (o));
-        }
 
+virtual void
+bridge_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        sharedResource (Type const&);
+virtual void
+bridge_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty (Type &o)
-        {
+this->bridge_next (const_cast <Type const &> (o));
+}
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+bridge_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty (Type const&);
+virtual void
+bridge_post (Type &o)
+{
 
-        protected:
-        Domain ();
-      };
+this->bridge_post (const_cast <Type const &> (o));
+}
 
-      struct Bridge : Traversal::Bridge, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Bridge Type;
-        Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+bridge_post (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_pre (Type &o)
+{
 
+this->sharedResource_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+sharedResource_pre (Type const&);
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_next (Type &o)
+{
 
+this->sharedResource_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+sharedResource_next (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_post (Type &o)
+{
 
+this->sharedResource_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_pre (Type &o)
-        {
+virtual void
+sharedResource_post (Type const&);
 
-          this->connect_pre (const_cast <Type const &> (o));
-        }
+virtual void
+infoProperty_pre (Type &o)
+{
 
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_next (Type &o)
-        {
+virtual void
+infoProperty_pre (Type const&);
 
-          this->connect_next (const_cast <Type const &> (o));
-        }
+virtual void
+infoProperty_next (Type &o)
+{
 
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_post (Type &o)
-        {
+virtual void
+infoProperty_next (Type const&);
 
-          this->connect_post (const_cast <Type const &> (o));
-        }
+virtual void
+infoProperty_post (Type &o)
+{
 
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_pre (Type &o)
-        {
+virtual void
+infoProperty_post (Type const&);
 
-          this->resource_pre (const_cast <Type const &> (o));
-        }
+protected:
+Domain ();
+};
 
+struct Bridge : Traversal::Bridge,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Bridge Type;
+Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_pre (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_next (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->resource_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_next (Type const&);
+virtual void
+name (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_post (Type &o)
-        {
+this->name (const_cast <Type const &> (o));
+}
 
-          this->resource_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+name (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_post (Type const&);
+virtual void
+label (Type &o)
+{
 
-        protected:
-        Bridge ();
-      };
+this->label (const_cast <Type const &> (o));
+}
 
-      struct Interconnect : Traversal::Interconnect, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Interconnect Type;
-        Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+label (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+connect_pre (Type &o)
+{
 
+this->connect_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+connect_pre (Type const&);
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+connect_next (Type &o)
+{
 
+this->connect_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+connect_next (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+connect_post (Type &o)
+{
 
+this->connect_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_pre (Type &o)
-        {
+virtual void
+connect_post (Type const&);
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
+virtual void
+resource_pre (Type &o)
+{
 
+this->resource_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_next (Type &o)
-        {
+virtual void
+resource_pre (Type const&);
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
+virtual void
+resource_next (Type &o)
+{
 
+this->resource_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_post (Type &o)
-        {
+virtual void
+resource_next (Type const&);
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
+virtual void
+resource_post (Type &o)
+{
 
+this->resource_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_pre (Type &o)
-        {
+virtual void
+resource_post (Type const&);
 
-          this->connect_pre (const_cast <Type const &> (o));
-        }
+protected:
+Bridge ();
+};
 
+struct Interconnect : Traversal::Interconnect,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Interconnect Type;
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_pre (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_next (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->connect_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_next (Type const&);
+virtual void
+name (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connect_post (Type &o)
-        {
+this->name (const_cast <Type const &> (o));
+}
 
-          this->connect_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+name (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connect_post (Type const&);
+virtual void
+label (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_pre (Type &o)
-        {
+this->label (const_cast <Type const &> (o));
+}
 
-          this->resource_pre (const_cast <Type const &> (o));
-        }
 
+virtual void
+label (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_pre (Type const&);
+virtual void
+connection_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_next (Type &o)
-        {
+this->connection_pre (const_cast <Type const &> (o));
+}
 
-          this->resource_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+connection_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_next (Type const&);
+virtual void
+connection_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource_post (Type &o)
-        {
+this->connection_next (const_cast <Type const &> (o));
+}
 
-          this->resource_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+connection_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource_post (Type const&);
+virtual void
+connection_post (Type &o)
+{
 
-        protected:
-        Interconnect ();
-      };
+this->connection_post (const_cast <Type const &> (o));
+}
 
-      struct Node : Traversal::Node, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Node Type;
-        Node (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+connection_post (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+connect_pre (Type &o)
+{
 
+this->connect_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+connect_pre (Type const&);
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+connect_next (Type &o)
+{
 
+this->connect_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+connect_next (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+connect_post (Type &o)
+{
 
+this->connect_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_pre (Type &o)
-        {
+virtual void
+connect_post (Type const&);
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
+virtual void
+resource_pre (Type &o)
+{
 
+this->resource_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_next (Type &o)
-        {
+virtual void
+resource_pre (Type const&);
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
+virtual void
+resource_next (Type &o)
+{
 
+this->resource_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_post (Type &o)
-        {
+virtual void
+resource_next (Type const&);
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
+virtual void
+resource_post (Type &o)
+{
 
+this->resource_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+resource_post (Type const&);
+
+protected:
+Interconnect ();
+};
+
+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)
+{
+
+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
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
+
+
+virtual void
+label (Type const&);
+
+virtual void
+connection_pre (Type &o)
+{
+
+this->connection_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+connection_pre (Type const&);
+
+virtual void
+connection_next (Type &o)
+{
+
+this->connection_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+connection_next (Type const&);
+
+virtual void
+connection_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_post (Type const&);
+this->connection_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+connection_post (Type const&);
+
+virtual void
+sharedResource_pre (Type &o)
+{
+
+this->sharedResource_pre (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        sharedResource_pre (Type &o)
-        {
 
-          this->sharedResource_pre (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_pre (Type const&);
 
+virtual void
+sharedResource_next (Type &o)
+{
+
+this->sharedResource_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        sharedResource_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        sharedResource_next (Type &o)
-        {
+virtual void
+sharedResource_next (Type const&);
 
-          this->sharedResource_next (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_post (Type &o)
+{
+
+this->sharedResource_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+sharedResource_post (Type const&);
+
+virtual void
+resource_pre (Type &o)
+{
+
+this->resource_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        sharedResource_next (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        sharedResource_post (Type &o)
-        {
+virtual void
+resource_next (Type &o)
+{
 
-          this->sharedResource_post (const_cast <Type const &> (o));
-        }
+this->resource_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        sharedResource_post (Type const&);
+virtual void
+resource_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resource (Type &o)
-        {
+virtual void
+resource_post (Type &o)
+{
 
-          this->resource (const_cast <Type const &> (o));
-        }
+this->resource_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resource (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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        resourceType (Type &o)
-        {
+virtual void
+resourceType (Type &o)
+{
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+this->resourceType (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        resourceType (Type const&);
+virtual void
+resourceType (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        node (Type &o)
-        {
+virtual void
+node (Type &o)
+{
 
-          this->node (const_cast <Type const &> (o));
-        }
+this->node (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        node (Type const&);
+virtual void
+node (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        property (Type &o)
-        {
+virtual void
+property (Type &o)
+{
 
-          this->property (const_cast <Type const &> (o));
-        }
+this->property (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        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/TAO/CIAO/tools/Config_Handlers/cdp.cpp b/TAO/CIAO/tools/Config_Handlers/cdp.cpp
index 60a4e272d67..0ba7c13577d 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "cdp.hpp"
 
 namespace CIAO
@@ -16,62 +16,50 @@ 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);
       if (realizes_.get ()) realizes_->container (this);
       {
-        for (implementation_const_iterator i (s.implementation_.begin ());
-        i != s.implementation_.end ();
-        ++i) add_implementation (*i);
+        for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
       }
 
       {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
+        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 (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 (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
+        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*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);
       }
     }
 
@@ -89,44 +77,32 @@ namespace CIAO
 
       implementation_.clear ();
       {
-        for (implementation_const_iterator i (s.implementation_.begin ());
-        i != s.implementation_.end ();
-        ++i) add_implementation (*i);
+        for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
       }
 
       instance_.clear ();
       {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
+        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);
+        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
       }
 
       dependsOn_.clear ();
       {
-        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);
       }
 
       artifact_.clear ();
       {
-        for (artifact_const_iterator i (s.artifact_.begin ());
-        i != s.artifact_.end ();
-        ++i) add_artifact (*i);
+        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
       }
 
       infoProperty_.clear ();
       {
-        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);
       }
 
       return *this;
@@ -134,7 +110,7 @@ namespace CIAO
 
 
     // DeploymentPlan
-    // 
+    //
     bool DeploymentPlan::
     label_p () const
     {
@@ -151,19 +127,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
     {
@@ -180,19 +156,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
     {
@@ -209,19 +185,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 ()
     {
@@ -259,7 +235,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::instance_iterator DeploymentPlan::
     begin_instance ()
     {
@@ -297,7 +273,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::connection_iterator DeploymentPlan::
     begin_connection ()
     {
@@ -335,7 +311,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::dependsOn_iterator DeploymentPlan::
     begin_dependsOn ()
     {
@@ -373,7 +349,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::artifact_iterator DeploymentPlan::
     begin_artifact ()
     {
@@ -411,7 +387,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::infoProperty_iterator DeploymentPlan::
     begin_infoProperty ()
     {
@@ -459,74 +435,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")
-        {
-          ::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 
         {
+          ::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
+            {
+            }
         }
-      }
     }
   }
 }
@@ -697,18 +673,16 @@ namespace CIAO
         DeploymentPlan::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_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) implementation_next (o);
+              }
+
+            implementation_post (o);
           }
-
-          implementation_post (o);
-        }
       }
 
       void DeploymentPlan::
@@ -719,18 +693,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) implementation_next (o);
+            implementation_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) implementation_next (o);
+              }
+
+            implementation_post (o);
           }
-
-          implementation_post (o);
-        }
       }
 
       void DeploymentPlan::
@@ -771,19 +743,17 @@ namespace CIAO
         DeploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
+            instance_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) instance_next (o);
+              }
+
+            instance_post (o);
           }
 
-          instance_post (o);
-        }
-
         else instance_none (o);
       }
 
@@ -795,19 +765,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
+            instance_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) instance_next (o);
+              }
+
+            instance_post (o);
           }
 
-          instance_post (o);
-        }
-
         else instance_none (o);
       }
 
@@ -859,19 +827,17 @@ namespace CIAO
         DeploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
+            connection_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) connection_next (o);
+              }
+
+            connection_post (o);
           }
 
-          connection_post (o);
-        }
-
         else connection_none (o);
       }
 
@@ -883,19 +849,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
+            connection_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) connection_next (o);
+              }
+
+            connection_post (o);
           }
 
-          connection_post (o);
-        }
-
         else connection_none (o);
       }
 
@@ -947,19 +911,17 @@ namespace CIAO
         DeploymentPlan::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_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) dependsOn_next (o);
+              }
+
+            dependsOn_post (o);
           }
 
-          dependsOn_post (o);
-        }
-
         else dependsOn_none (o);
       }
 
@@ -971,19 +933,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
+            dependsOn_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) dependsOn_next (o);
+              }
+
+            dependsOn_post (o);
           }
 
-          dependsOn_post (o);
-        }
-
         else dependsOn_none (o);
       }
 
@@ -1035,19 +995,17 @@ namespace CIAO
         DeploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
           {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
+            artifact_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) artifact_next (o);
+              }
+
+            artifact_post (o);
           }
 
-          artifact_post (o);
-        }
-
         else artifact_none (o);
       }
 
@@ -1059,19 +1017,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
+            artifact_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) artifact_next (o);
+              }
+
+            artifact_post (o);
           }
 
-          artifact_post (o);
-        }
-
         else artifact_none (o);
       }
 
@@ -1123,19 +1079,17 @@ namespace CIAO
         DeploymentPlan::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_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1147,19 +1101,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;
-          )
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1228,7 +1180,7 @@ namespace CIAO
 
       DeploymentPlan::
       DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index 50ea96a11f6..8c8cb56e04f 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -20,6 +17,7 @@
 #endif
 
 #include "XSC_XML_Handlers_Export.h"
+
 #ifndef CDP_HPP
 #define CDP_HPP
 
@@ -27,10 +25,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-  }
+namespace Config_Handlers
+{
+class DeploymentPlan;
+}
 }
 
 #include <memory>
@@ -41,730 +39,665 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export DeploymentPlan : 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_;
-
-      // implementation
-      // 
-      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 ();
-      implementation_iterator end_implementation ();
-      implementation_const_iterator begin_implementation () const;
-      implementation_const_iterator end_implementation () const;
-      void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
-      size_t count_implementation (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
-
-      // instance
-      // 
-      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 ();
-      instance_iterator end_instance ();
-      instance_const_iterator begin_instance () const;
-      instance_const_iterator end_instance () const;
-      void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
-      size_t count_instance (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
-
-      // connection
-      // 
-      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 ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
-      size_t count_connection (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
-
-      // 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_;
-
-      // artifact
-      // 
-      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 ();
-      artifact_iterator end_artifact ();
-      artifact_const_iterator begin_artifact () const;
-      artifact_const_iterator end_artifact () const;
-      void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
-      size_t count_artifact (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
-
-      // 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:
-      DeploymentPlan ();
-
-      DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DeploymentPlan (DeploymentPlan const& s);
-
-      DeploymentPlan&
-      operator= (DeploymentPlan const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export DeploymentPlan : 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_;
+
+// implementation
+//
+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 ();
+implementation_iterator end_implementation ();
+implementation_const_iterator begin_implementation () const;
+implementation_const_iterator end_implementation () const;
+void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
+size_t count_implementation (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
+
+// instance
+//
+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 ();
+instance_iterator end_instance ();
+instance_const_iterator begin_instance () const;
+instance_const_iterator end_instance () const;
+void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
+size_t count_instance (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
+
+// connection
+//
+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 ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
+
+// 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_;
+
+// artifact
+//
+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 ();
+artifact_iterator end_artifact ();
+artifact_const_iterator begin_artifact () const;
+artifact_const_iterator end_artifact () const;
+void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
+size_t count_artifact (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
+
+// 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:
+DeploymentPlan ();
+
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
+DeploymentPlan (DeploymentPlan const& s);
+
+DeploymentPlan&
+operator= (DeploymentPlan 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 DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
+{
+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&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct DeploymentPlan : Traversal::DeploymentPlan, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-        DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct DeploymentPlan : Traversal::DeploymentPlan,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+UUID (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->UUID (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        realizes (Type &o)
-        {
+virtual void
+realizes (Type &o)
+{
 
-          this->realizes (const_cast <Type const &> (o));
-        }
+this->realizes (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        realizes (Type const&);
+virtual void
+realizes (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implementation_pre (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implementation_next (Type const&);
+virtual void
+implementation_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implementation_post (Type const&);
+virtual void
+implementation_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_pre (Type const&);
+virtual void
+instance_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_next (Type const&);
+virtual void
+instance_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_post (Type const&);
+virtual void
+instance_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_pre (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_next (Type const&);
+virtual void
+artifact_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        artifact_post (Type const&);
+virtual void
+artifact_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        protected:
-        DeploymentPlan ();
-      };
-    }
-  }
+protected:
+DeploymentPlan ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CDP_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.cpp b/TAO/CIAO/tools/Config_Handlers/cid.cpp
index 39111605f5d..5cfd51e40d5 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "cid.hpp"
 
 namespace CIAO
@@ -16,38 +16,43 @@ namespace CIAO
   namespace Config_Handlers
   {
     // SubcomponentInstantiationDescription
-    // 
+    //
 
     SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)),
-    regulator__ ()
+    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        regulator__ ()
     {
       name_->container (this);
-      package_->container (this);
     }
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 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);
-      package_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (reference_.get ()) reference_->container (this);
+      if (basePackage_.get ()) basePackage_->container (this);
+      if (specializedConfig_.get ()) specializedConfig_->container (this);
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
+      if (referencedPackage_.get ()) referencedPackage_->container (this);
+      if (importedPackage_.get ()) importedPackage_->container (this);
       if (id_.get ()) id_->container (this);
     }
 
@@ -56,16 +61,27 @@ namespace CIAO
     {
       name (s.name ());
 
-      package (s.package ());
+      if (s.basePackage_.get ()) basePackage (*(s.basePackage_));
+      else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0);
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_));
+      else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0);
 
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+      selectRequirement_.clear ();
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
+      if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_));
+      else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
 
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+      if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_));
+      else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0);
 
       if (s.id_.get ()) id (*(s.id_));
       else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
@@ -75,7 +91,7 @@ namespace CIAO
 
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     ::XMLSchema::string< ACE_TCHAR > const& SubcomponentInstantiationDescription::
     name () const
     {
@@ -89,108 +105,199 @@ namespace CIAO
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
+    bool SubcomponentInstantiationDescription::
+    basePackage_p () const
+    {
+      return basePackage_.get () != 0;
+    }
+
     ::CIAO::Config_Handlers::ComponentPackageDescription const& SubcomponentInstantiationDescription::
-    package () const
+    basePackage () const
     {
-      return *package_;
+      return *basePackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    package (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
+    basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
     {
-      *package_ = e;
+      if (basePackage_.get ())
+        {
+          *basePackage_ = e;
+        }
+
+      else
+        {
+          basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+          basePackage_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     bool SubcomponentInstantiationDescription::
-    configProperty_p () const
+    specializedConfig_p () const
     {
-      return configProperty_.get () != 0;
+      return specializedConfig_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Property const& SubcomponentInstantiationDescription::
-    configProperty () const
+    ::CIAO::Config_Handlers::PackageConfiguration const& SubcomponentInstantiationDescription::
+    specializedConfig () const
     {
-      return *configProperty_;
+      return *specializedConfig_;
     }
 
     void SubcomponentInstantiationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
+    specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
+      if (specializedConfig_.get ())
+        {
+          *specializedConfig_ = e;
+        }
 
       else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->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 ()
+    {
+      return selectRequirement_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_iterator SubcomponentInstantiationDescription::
+    end_selectRequirement ()
+    {
+      return selectRequirement_.end ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_const_iterator SubcomponentInstantiationDescription::
+    begin_selectRequirement () const
+    {
+      return selectRequirement_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_const_iterator SubcomponentInstantiationDescription::
+    end_selectRequirement () const
+    {
+      return selectRequirement_.end ();
+    }
+
+    void SubcomponentInstantiationDescription::
+    add_selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      selectRequirement_.push_back (e);
+    }
+
+    size_t SubcomponentInstantiationDescription::
+    count_selectRequirement(void) const
+    {
+      return selectRequirement_.size ();
+    }
+
+    // SubcomponentInstantiationDescription
+    //
+    SubcomponentInstantiationDescription::configProperty_iterator SubcomponentInstantiationDescription::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_iterator SubcomponentInstantiationDescription::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_const_iterator SubcomponentInstantiationDescription::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_const_iterator SubcomponentInstantiationDescription::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
+
+    void SubcomponentInstantiationDescription::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
+
+    size_t SubcomponentInstantiationDescription::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
+
+    // SubcomponentInstantiationDescription
+    //
     bool SubcomponentInstantiationDescription::
-    selectRequirement_p () const
+    referencedPackage_p () const
     {
-      return selectRequirement_.get () != 0;
+      return referencedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Requirement const& SubcomponentInstantiationDescription::
-    selectRequirement () const
+    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
+    referencedPackage () const
     {
-      return *selectRequirement_;
+      return *referencedPackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
+      if (referencedPackage_.get ())
+        {
+          *referencedPackage_ = e;
+        }
 
       else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
+        {
+          referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+          referencedPackage_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     bool SubcomponentInstantiationDescription::
-    reference_p () const
+    importedPackage_p () const
     {
-      return reference_.get () != 0;
+      return importedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
-    reference () const
+    ::CIAO::Config_Handlers::ComponentPackageImport const& SubcomponentInstantiationDescription::
+    importedPackage () const
     {
-      return *reference_;
+      return *importedPackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
+    importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
+      if (importedPackage_.get ())
+        {
+          *importedPackage_ = e;
+        }
 
       else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->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
     {
@@ -213,2743 +320,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__,
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
-    : 
-    ::XSCRT::Type (), 
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
+                                   ::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);
+}
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    :
-    ::XSCRT::Type (),
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*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
-    // 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& SubcomponentPropertyReference::
-    instance () const
-    {
-      return *instance_;
-    }
+// SubcomponentPropertyReference
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPropertyReference::
+instance () const
+{
+return *instance_;
+}
 
-    void SubcomponentPropertyReference::
-    instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription 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__,
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->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_)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->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);
+}
+}
 
-    ::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 (s.delegatesTo ());
+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
-    // 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& AssemblyPropertyMapping::
-    delegatesTo () const
-    {
-      return *delegatesTo_;
-    }
+// AssemblyPropertyMapping
+//
+AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+begin_delegatesTo ()
+{
+return delegatesTo_.begin ();
+}
 
-    void AssemblyPropertyMapping::
-    delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
-    {
-      *delegatesTo_ = e;
-    }
+AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+end_delegatesTo ()
+{
+return delegatesTo_.end ();
+}
 
+AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+begin_delegatesTo () const
+{
+return delegatesTo_.begin ();
+}
 
-    // ComponentAssemblyDescription
-    // 
+AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+end_delegatesTo () const
+{
+return delegatesTo_.end ();
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+void AssemblyPropertyMapping::
+add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
+{
+delegatesTo_.push_back (e);
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    :
-    ::XSCRT::Type (),
-    externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
-    regulator__ ()
-    {
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
+size_t AssemblyPropertyMapping::
+count_delegatesTo(void) const
+{
+return delegatesTo_.size ();
+}
 
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
-      }
 
-      if (externalProperty_.get ()) externalProperty_->container (this);
-    }
+// ComponentAssemblyDescription
+//
 
-    ::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);
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*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);
+}
 
-      if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
-      else externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (0);
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-      return *this;
-    }
+{
+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);
+}
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    begin_instance ()
-    {
-      return instance_.begin ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    end_instance ()
-    {
-      return instance_.end ();
-    }
+externalProperty_.clear ();
+{
+for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
+}
 
-    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-    begin_instance () const
-    {
-      return instance_.begin ();
-    }
+return *this;
+}
 
-    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);
-    }
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+begin_instance ()
+{
+return instance_.begin ();
+}
 
-    size_t ComponentAssemblyDescription::
-    count_instance(void) const
-    {
-      return instance_.size ();
-    }
+ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+end_instance ()
+{
+return instance_.end ();
+}
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+begin_instance () const
+{
+return instance_.begin ();
+}
 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+end_instance () const
+{
+return instance_.end ();
+}
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+void ComponentAssemblyDescription::
+add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
+{
+instance_.push_back (e);
+}
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
+size_t ComponentAssemblyDescription::
+count_instance(void) const
+{
+return instance_.size ();
+}
 
-    void ComponentAssemblyDescription::
-    add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
-    {
-      connection_.push_back (e);
-    }
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-    size_t ComponentAssemblyDescription::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+end_connection ()
+{
+return connection_.end ();
+}
 
-    // ComponentAssemblyDescription
-    // 
-    bool ComponentAssemblyDescription::
-    externalProperty_p () const
-    {
-      return externalProperty_.get () != 0;
-    }
+ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping const& ComponentAssemblyDescription::
-    externalProperty () const
-    {
-      return *externalProperty_;
-    }
+ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+end_connection () const
+{
+return connection_.end ();
+}
 
-    void ComponentAssemblyDescription::
-    externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
-    {
-      if (externalProperty_.get ())
-      {
-        *externalProperty_ = e;
-      }
+void ComponentAssemblyDescription::
+add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
+{
+connection_.push_back (e);
+}
 
-      else
-      {
-        externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (new ::CIAO::Config_Handlers::AssemblyPropertyMapping (e));
-        externalProperty_->container (this);
-      }
-    }
+size_t ComponentAssemblyDescription::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+begin_externalProperty ()
+{
+return externalProperty_.begin ();
+}
 
-    // MonolithicImplementationDescription
-    // 
+ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+end_externalProperty ()
+{
+return externalProperty_.end ();
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+begin_externalProperty () const
+{
+return externalProperty_.begin ();
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    :
-    ::XSCRT::Type (),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::ImplementationRequirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      if (execParameter_.get ()) execParameter_->container (this);
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
+ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+end_externalProperty () const
+{
+return externalProperty_.end ();
+}
 
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-    }
+void ComponentAssemblyDescription::
+add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
+{
+externalProperty_.push_back (e);
+}
 
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    {
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+size_t ComponentAssemblyDescription::
+count_externalProperty(void) const
+{
+return externalProperty_.size ();
+}
 
-      primaryArtifact_.clear ();
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (0);
+// MonolithicImplementationDescription
+//
 
-      return *this;
-    }
+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
-    // 
-    bool MonolithicImplementationDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+{
+for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+}
 
-    ::CIAO::Config_Handlers::Property const& MonolithicImplementationDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    void MonolithicImplementationDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
+{
+for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+}
+}
 
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+::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);
+}
 
-    // MonolithicImplementationDescription
-    // 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact ()
-    {
-      return primaryArtifact_.begin ();
-    }
+componentExecParameter_.clear ();
+{
+for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    end_primaryArtifact ()
-    {
-      return primaryArtifact_.end ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact () const
-    {
-      return primaryArtifact_.begin ();
-    }
+primaryArtifact_.clear ();
+{
+for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    end_primaryArtifact () const
-    {
-      return primaryArtifact_.end ();
-    }
+return *this;
+}
 
-    void MonolithicImplementationDescription::
-    add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      primaryArtifact_.push_back (e);
-    }
 
-    size_t MonolithicImplementationDescription::
-    count_primaryArtifact(void) const
-    {
-      return primaryArtifact_.size ();
-    }
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+begin_nodeExecParameter ()
+{
+return nodeExecParameter_.begin ();
+}
 
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+end_nodeExecParameter ()
+{
+return nodeExecParameter_.end ();
+}
 
-    ::CIAO::Config_Handlers::ImplementationRequirement const& MonolithicImplementationDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+begin_nodeExecParameter () const
+{
+return nodeExecParameter_.begin ();
+}
 
-    void MonolithicImplementationDescription::
-    deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
+MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+end_nodeExecParameter () const
+{
+return nodeExecParameter_.end ();
+}
 
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (new ::CIAO::Config_Handlers::ImplementationRequirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+void MonolithicImplementationDescription::
+add_nodeExecParameter (::CIAO::Config_Handlers::Property const& e)
+{
+nodeExecParameter_.push_back (e);
+}
 
+size_t MonolithicImplementationDescription::
+count_nodeExecParameter(void) const
+{
+return nodeExecParameter_.size ();
+}
 
-    // ComponentImplementationDescription
-    // 
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+begin_componentExecParameter ()
+{
+return componentExecParameter_.begin ();
+}
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+end_componentExecParameter ()
+{
+return componentExecParameter_.end ();
+}
 
-    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),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    capability_ (s.capability_.get () ? new ::CIAO::Config_Handlers::Capability (*s.capability_) : 0),
-    dependsOn_ (s.dependsOn_.get () ? new ::CIAO::Config_Handlers::ImplementationDependency (*s.dependsOn_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 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);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (capability_.get ()) capability_->container (this);
-      if (dependsOn_.get ()) dependsOn_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
-    }
+MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+begin_componentExecParameter () const
+{
+return componentExecParameter_.begin ();
+}
 
-    ::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);
+MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+end_componentExecParameter () const
+{
+return componentExecParameter_.end ();
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+void MonolithicImplementationDescription::
+add_componentExecParameter (::CIAO::Config_Handlers::Property const& e)
+{
+componentExecParameter_.push_back (e);
+}
 
-      if (s.implements_.get ()) implements (*(s.implements_));
-      else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+size_t MonolithicImplementationDescription::
+count_componentExecParameter(void) const
+{
+return componentExecParameter_.size ();
+}
 
-      if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
-      else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
-      else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
+MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-      if (s.capability_.get ()) capability (*(s.capability_));
-      else capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (0);
+MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-      if (s.dependsOn_.get ()) dependsOn (*(s.dependsOn_));
-      else dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (0);
+void MonolithicImplementationDescription::
+add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+size_t MonolithicImplementationDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+begin_primaryArtifact ()
+{
+return primaryArtifact_.begin ();
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+end_primaryArtifact ()
+{
+return primaryArtifact_.end ();
+}
 
-      return *this;
-    }
+MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+begin_primaryArtifact () const
+{
+return primaryArtifact_.begin ();
+}
 
+MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+end_primaryArtifact () const
+{
+return primaryArtifact_.end ();
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+void MonolithicImplementationDescription::
+add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+{
+primaryArtifact_.push_back (e);
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    label () const
-    {
-      return *label_;
-    }
+size_t MonolithicImplementationDescription::
+count_primaryArtifact(void) const
+{
+return primaryArtifact_.size ();
+}
 
-    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);
-      }
-    }
+// ComponentImplementationDescription
+//
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+ComponentImplementationDescription::
+ComponentImplementationDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
+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);
+}
 
-    void ComponentImplementationDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+{
+for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+}
 
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
-    }
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    implements_p () const
-    {
-      return implements_.get () != 0;
-    }
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
-    implements () const
-    {
-      return *implements_;
-    }
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-    void ComponentImplementationDescription::
-    implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-    {
-      if (implements_.get ())
-      {
-        *implements_ = e;
-      }
+::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);
 
-      else
-      {
-        implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-        implements_->container (this);
-      }
-    }
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    assemblyImpl_p () const
-    {
-      return assemblyImpl_.get () != 0;
-    }
+if (s.implements_.get ()) implements (*(s.implements_));
+else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
-    assemblyImpl () const
-    {
-      return *assemblyImpl_;
-    }
+if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
+else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
 
-    void ComponentImplementationDescription::
-    assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
-    {
-      if (assemblyImpl_.get ())
-      {
-        *assemblyImpl_ = e;
-      }
+if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
+else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
 
-      else
-      {
-        assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
-        assemblyImpl_->container (this);
-      }
-    }
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    monolithicImpl_p () const
-    {
-      return monolithicImpl_.get () != 0;
-    }
+capability_.clear ();
+{
+for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+}
 
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
-    monolithicImpl () const
-    {
-      return *monolithicImpl_;
-    }
+dependsOn_.clear ();
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-    void ComponentImplementationDescription::
-    monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
-    {
-      if (monolithicImpl_.get ())
-      {
-        *monolithicImpl_ = e;
-      }
+infoProperty_.clear ();
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      else
-      {
-        monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
-        monolithicImpl_->container (this);
-      }
-    }
+if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
+return *this;
+}
 
-    void ComponentImplementationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
 
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    capability_p () const
-    {
-      return capability_.get () != 0;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+label () const
+{
+return *label_;
+}
 
-    ::CIAO::Config_Handlers::Capability const& ComponentImplementationDescription::
-    capability () const
-    {
-      return *capability_;
-    }
+void ComponentImplementationDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    void ComponentImplementationDescription::
-    capability (::CIAO::Config_Handlers::Capability const& e)
-    {
-      if (capability_.get ())
-      {
-        *capability_ = e;
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      else
-      {
-        capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (new ::CIAO::Config_Handlers::Capability (e));
-        capability_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    dependsOn_p () const
-    {
-      return dependsOn_.get () != 0;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    ::CIAO::Config_Handlers::ImplementationDependency const& ComponentImplementationDescription::
-    dependsOn () const
-    {
-      return *dependsOn_;
-    }
+void ComponentImplementationDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    void ComponentImplementationDescription::
-    dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-    {
-      if (dependsOn_.get ())
-      {
-        *dependsOn_ = e;
-      }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-      else
-      {
-        dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (new ::CIAO::Config_Handlers::ImplementationDependency (e));
-        dependsOn_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+implements_p () const
+{
+return implements_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
+implements () const
+{
+return *implements_;
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+void ComponentImplementationDescription::
+implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+{
+if (implements_.get ())
+{
+*implements_ = e;
+}
 
-    void ComponentImplementationDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
+else
+{
+implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+implements_->container (this);
+}
+}
 
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+assemblyImpl_p () const
+{
+return assemblyImpl_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
+assemblyImpl () const
+{
+return *assemblyImpl_;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+void ComponentImplementationDescription::
+assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
+{
+if (assemblyImpl_.get ())
+{
+*assemblyImpl_ = e;
+}
 
-    void ComponentImplementationDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
+else
+{
+assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
+assemblyImpl_->container (this);
+}
+}
 
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+monolithicImpl_p () const
+{
+return monolithicImpl_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
+monolithicImpl () const
+{
+return *monolithicImpl_;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    href () const
-    {
-      return *href_;
-    }
+void ComponentImplementationDescription::
+monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
+{
+if (monolithicImpl_.get ())
+{
+*monolithicImpl_ = e;
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-    href ()
-    {
-      return *href_;
-    }
+else
+{
+monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
+monolithicImpl_->container (this);
+}
+}
 
-    void ComponentImplementationDescription::
-    href (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (href_.get ())
-      {
-        *href_ = e;
-      }
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-      else
-      {
-        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        href_->container (this);
-      }
-    }
-  }
+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::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
+
+void ComponentImplementationDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
+begin_capability ()
+{
+return capability_.begin ();
+}
+
+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::
+end_capability () const
+{
+return capability_.end ();
+}
+
+void ComponentImplementationDescription::
+add_capability (::CIAO::Config_Handlers::Capability const& e)
+{
+capability_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_capability(void) const
+{
+return capability_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
+begin_dependsOn ()
+{
+return dependsOn_.begin ();
+}
+
+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::
+end_dependsOn () const
+{
+return dependsOn_.end ();
+}
+
+void ComponentImplementationDescription::
+add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
+{
+dependsOn_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_dependsOn(void) const
+{
+return dependsOn_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
+
+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::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ComponentImplementationDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+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);
+}
+}
+
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+href ()
+{
+return *href_;
+}
+
+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);
+}
+}
+}
 }
 
 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 == "package")
-        {
-          package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-          package_->container (this);
-        }
+else if (n == "basePackage")
+{
+::CIAO::Config_Handlers::ComponentPackageDescription t (e);
+basePackage (t);
+}
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+else if (n == "specializedConfig")
+{
+::CIAO::Config_Handlers::PackageConfiguration t (e);
+specializedConfig (t);
+}
 
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
+else if (n == "selectRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_selectRequirement (t);
+}
 
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "referencedPackage")
+{
+::CIAO::Config_Handlers::ComponentPackageReference t (e);
+referencedPackage (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 == "importedPackage")
+{
+::CIAO::Config_Handlers::ComponentPackageImport t (e);
+importedPackage (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
 
-    // SubcomponentPropertyReference
-    //
+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);
+}
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// SubcomponentPropertyReference
+//
 
-      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 ()));
+SubcomponentPropertyReference::
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "propertyName")
-        {
-          propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          propertyName_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (e));
-          instance_->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 == "propertyName")
+{
+propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+propertyName_->container (this);
+}
 
-    // AssemblyPropertyMapping
-    //
+else if (n == "instance")
+{
+instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+instance_->container (this);
+}
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// AssemblyPropertyMapping
+//
 
-      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 ()));
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::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 == "externalName")
-        {
-          externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          externalName_->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 == "delegatesTo")
-        {
-          delegatesTo_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (e));
-          delegatesTo_->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 == "externalName")
+{
+externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+externalName_->container (this);
+}
 
-    // ComponentAssemblyDescription
-    //
+else if (n == "delegatesTo")
+{
+::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
+add_delegatesTo (t);
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// ComponentAssemblyDescription
+//
 
-      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 ()));
+ComponentAssemblyDescription::
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "instance")
-        {
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
-          add_instance (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
-          add_connection (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 == "externalProperty")
-        {
-          ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
-          externalProperty (t);
-        }
+if (n == "instance")
+{
+::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
+add_instance (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "connection")
+{
+::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
+add_connection (t);
+}
 
-    // MonolithicImplementationDescription
-    //
+else if (n == "externalProperty")
+{
+::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
+add_externalProperty (t);
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// MonolithicImplementationDescription
+//
 
-      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 ()));
+MonolithicImplementationDescription::
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "primaryArtifact")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_primaryArtifact (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 == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::ImplementationRequirement t (e);
-          deployRequirement (t);
-        }
+if (n == "nodeExecParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_nodeExecParameter (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "componentExecParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_componentExecParameter (t);
+}
 
-    // ComponentImplementationDescription
-    //
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::ImplementationRequirement t (e);
+add_deployRequirement (t);
+}
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "primaryArtifact")
+{
+::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+add_primaryArtifact (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 ()));
+// ComponentImplementationDescription
+//
 
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+ComponentImplementationDescription::
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "implements")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-          implements (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 == "assemblyImpl")
-        {
-          ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
-          assemblyImpl (t);
-        }
+if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "monolithicImpl")
-        {
-          ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
-          monolithicImpl (t);
-        }
+else if (n == "UUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+UUID (t);
+}
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+else if (n == "implements")
+{
+::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+implements (t);
+}
 
-        else if (n == "capability")
-        {
-          ::CIAO::Config_Handlers::Capability t (e);
-          capability (t);
-        }
+else if (n == "assemblyImpl")
+{
+::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
+assemblyImpl (t);
+}
 
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::ImplementationDependency t (e);
-          dependsOn (t);
-        }
+else if (n == "monolithicImpl")
+{
+::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
+monolithicImpl (t);
+}
 
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (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 if (n == "capability")
+{
+::CIAO::Config_Handlers::Capability t (e);
+add_capability (t);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "dependsOn")
+{
+::CIAO::Config_Handlers::ImplementationDependency t (e);
+add_dependsOn (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 if (n == "infoProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_infoProperty (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
-  }
+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 ());
+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
-      //
-      //
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// SubcomponentInstantiationDescription
+//
+//
 
-      void SubcomponentInstantiationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+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);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_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&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+pre (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void SubcomponentInstantiationDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void SubcomponentInstantiationDescription::
-      package (Type& o)
-      {
-        dispatch (o.package ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type& o)
+{
+dispatch (o.basePackage ());
+}
 
-      void SubcomponentInstantiationDescription::
-      package (Type const& o)
-      {
-        dispatch (o.package ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type const& o)
+{
+dispatch (o.basePackage ());
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage_none (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage_none (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type& o)
+{
+dispatch (o.specializedConfig ());
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type const& o)
+{
+dispatch (o.specializedConfig ());
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig_none (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig_none (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+selectRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) selectRequirement_next (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type& o)
-      {
-        dispatch (o.reference ());
-      }
+selectRequirement_post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        dispatch (o.reference ());
-      }
+else selectRequirement_none (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference_none (Type&)
-      {
-      }
+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::
-      reference_none (Type const&)
-      {
-      }
+if (b != e)
+{
+selectRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) selectRequirement_next (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+selectRequirement_post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+else selectRequirement_none (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      id_none (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      post (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      post (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type const&)
+{
+}
 
-      // SubcomponentPropertyReference
-      //
-      //
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type const&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_none (Type&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_none (Type const&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void SubcomponentPropertyReference::
-      propertyName (Type& o)
-      {
-        dispatch (o.propertyName ());
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        dispatch (o.propertyName ());
-      }
+configProperty_post (o);
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+else configProperty_none (o);
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void SubcomponentPropertyReference::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void SubcomponentPropertyReference::
-      post (Type const&)
-      {
-      }
+configProperty_post (o);
+}
 
-      // AssemblyPropertyMapping
-      //
-      //
+else configProperty_none (o);
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type& o)
-      {
-        dispatch (o.externalName ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_none (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        dispatch (o.externalName ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_none (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type& o)
+{
+dispatch (o.referencedPackage ());
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type const& o)
+{
+dispatch (o.referencedPackage ());
+}
 
-      void AssemblyPropertyMapping::
-      post (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage_none (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      post (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage_none (Type const&)
+{
+}
 
-      // ComponentAssemblyDescription
-      //
-      //
+void SubcomponentInstantiationDescription::
+importedPackage (Type& o)
+{
+dispatch (o.importedPackage ());
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+importedPackage (Type const& o)
+{
+dispatch (o.importedPackage ());
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+importedPackage_none (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+importedPackage_none (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentAssemblyDescription::
-      instance (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
+void SubcomponentInstantiationDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
+void SubcomponentInstantiationDescription::
+id_none (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 SubcomponentInstantiationDescription::
+id_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
+void SubcomponentInstantiationDescription::
+post (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+post (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-      }
+// SubcomponentPropertyReference
+//
+//
 
-      void ComponentAssemblyDescription::
-      instance_next (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+traverse (Type& o)
+{
+pre (o);
+propertyName (o);
+instance (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      instance_next (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+traverse (Type const& o)
+{
+pre (o);
+propertyName (o);
+instance (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+pre (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+pre (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void SubcomponentPropertyReference::
+propertyName (Type& o)
+{
+dispatch (o.propertyName ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
+void SubcomponentPropertyReference::
+propertyName (Type const& o)
+{
+dispatch (o.propertyName ());
+}
 
-      void ComponentAssemblyDescription::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void SubcomponentPropertyReference::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
+void SubcomponentPropertyReference::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+post (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+post (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection_next (Type&)
-      {
-      }
+// AssemblyPropertyMapping
+//
+//
 
-      void ComponentAssemblyDescription::
-      connection_next (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+externalName (o);
+delegatesTo (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_post (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+externalName (o);
+delegatesTo (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+pre (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type& o)
-      {
-        dispatch (o.externalProperty ());
-      }
+void AssemblyPropertyMapping::
+pre (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        dispatch (o.externalProperty ());
-      }
+void AssemblyPropertyMapping::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+externalName (Type& o)
+{
+dispatch (o.externalName ());
+}
 
-      void ComponentAssemblyDescription::
-      post (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+externalName (Type const& o)
+{
+dispatch (o.externalName ());
+}
 
-      void ComponentAssemblyDescription::
-      post (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyPropertyMapping::Type::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-      // MonolithicImplementationDescription
-      //
-      //
+if (b != e)
+{
+delegatesTo_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) delegatesTo_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
+delegatesTo_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
+void AssemblyPropertyMapping::
+delegatesTo (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyPropertyMapping::Type::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-      void MonolithicImplementationDescription::
-      pre (Type&)
-      {
-      }
+if (b != e)
+{
+delegatesTo_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) delegatesTo_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      pre (Type const&)
-      {
-      }
+delegatesTo_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type& o)
-      {
-        dispatch (o.execParameter ());
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter_none (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter_none (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+void AssemblyPropertyMapping::
+delegatesTo_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
+void AssemblyPropertyMapping::
+delegatesTo_post (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+void AssemblyPropertyMapping::
+post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
+void AssemblyPropertyMapping::
+post (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type&)
-      {
-      }
+// ComponentAssemblyDescription
+//
+//
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+traverse (Type& o)
+{
+pre (o);
+instance (o);
+connection (o);
+externalProperty (o);
+post (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+traverse (Type const& o)
+{
+pre (o);
+instance (o);
+connection (o);
+externalProperty (o);
+post (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+pre (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+pre (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+if (b != e)
+{
+instance_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) instance_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+instance_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement_none (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 MonolithicImplementationDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+instance_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) instance_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      post (Type&)
-      {
-      }
+instance_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      post (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_pre (Type&)
+{
+}
 
-      // ComponentImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+instance_pre (Type const&)
+{
+}
 
-      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);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
+void ComponentAssemblyDescription::
+instance_next (Type&)
+{
+}
 
-      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);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
+void ComponentAssemblyDescription::
+instance_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      pre (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      pre (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void ComponentAssemblyDescription::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void ComponentImplementationDescription::
-      label_none (Type&)
-      {
-      }
+connection_post (o);
+}
 
-      void ComponentImplementationDescription::
-      label_none (Type const&)
-      {
-      }
+else connection_none (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
+void ComponentAssemblyDescription::
+connection (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID_none (Type&)
-      {
-      }
+connection_post (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID_none (Type const&)
-      {
-      }
+else connection_none (o);
+}
 
-      void ComponentImplementationDescription::
-      implements (Type& o)
-      {
-        dispatch (o.implements ());
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        dispatch (o.implements ());
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_next (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
+void ComponentAssemblyDescription::
+connection_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
+void ComponentAssemblyDescription::
+connection_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_none (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_none (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
+void ComponentAssemblyDescription::
+externalProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
+if (b != e)
+{
+externalProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalProperty_next (o);
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type&)
-      {
-      }
+externalProperty_post (o);
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type const&)
-      {
-      }
+else externalProperty_none (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void ComponentAssemblyDescription::
+externalProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
+if (b != e)
+{
+externalProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalProperty_next (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty_none (Type&)
-      {
-      }
+externalProperty_post (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty_none (Type const&)
-      {
-      }
+else externalProperty_none (o);
+}
 
-      void ComponentImplementationDescription::
-      capability (Type& o)
-      {
-        dispatch (o.capability ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        dispatch (o.capability ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type& o)
-      {
-        dispatch (o.dependsOn ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        dispatch (o.dependsOn ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_none (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_none (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+void ComponentAssemblyDescription::
+post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+void ComponentAssemblyDescription::
+post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty_none (Type&)
-      {
-      }
+// MonolithicImplementationDescription
+//
+//
 
-      void ComponentImplementationDescription::
-      infoProperty_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+traverse (Type& o)
+{
+pre (o);
+nodeExecParameter (o);
+componentExecParameter (o);
+deployRequirement (o);
+primaryArtifact (o);
+post (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
+void MonolithicImplementationDescription::
+traverse (Type const& o)
+{
+pre (o);
+nodeExecParameter (o);
+componentExecParameter (o);
+deployRequirement (o);
+primaryArtifact (o);
+post (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
+void MonolithicImplementationDescription::
+pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      contentLocation_none (Type&)
-      {
-      }
+void MonolithicImplementationDescription::
+pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      contentLocation_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-      void ComponentImplementationDescription::
-      href (Type& o)
-      {
-        dispatch (o.href ());
-      }
+if (b != e)
+{
+nodeExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) nodeExecParameter_next (o);
+}
 
-      void ComponentImplementationDescription::
-      href (Type const& o)
-      {
-        dispatch (o.href ());
-      }
+nodeExecParameter_post (o);
+}
 
-      void ComponentImplementationDescription::
-      href_none (Type&)
-      {
-      }
+else nodeExecParameter_none (o);
+}
 
-      void ComponentImplementationDescription::
-      href_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-      void ComponentImplementationDescription::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+nodeExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) nodeExecParameter_next (o);
+}
 
-      void ComponentImplementationDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+nodeExecParameter_post (o);
+}
+
+else nodeExecParameter_none (o);
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
+
+if (b != e)
+{
+componentExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) componentExecParameter_next (o);
+}
+
+componentExecParameter_post (o);
+}
+
+else componentExecParameter_none (o);
+}
+
+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)
+{
+componentExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) componentExecParameter_next (o);
+}
+
+componentExecParameter_post (o);
+}
+
+else componentExecParameter_none (o);
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::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 MonolithicImplementationDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::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 MonolithicImplementationDescription::
+deployRequirement_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+
+if (b != e)
+{
+primaryArtifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) primaryArtifact_next (o);
+}
+
+primaryArtifact_post (o);
+}
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+
+if (b != e)
+{
+primaryArtifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) primaryArtifact_next (o);
+}
+
+primaryArtifact_post (o);
+}
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+post (Type const&)
+{
+}
+
+// ComponentImplementationDescription
+//
+//
+
+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::
+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::
+pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentImplementationDescription::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentImplementationDescription::
+label_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+label_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentImplementationDescription::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentImplementationDescription::
+UUID_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+UUID_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+implements (Type& o)
+{
+dispatch (o.implements ());
+}
+
+void ComponentImplementationDescription::
+implements (Type const& o)
+{
+dispatch (o.implements ());
+}
+
+void ComponentImplementationDescription::
+implements_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+implements_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+assemblyImpl (Type& o)
+{
+dispatch (o.assemblyImpl ());
+}
+
+void ComponentImplementationDescription::
+assemblyImpl (Type const& o)
+{
+dispatch (o.assemblyImpl ());
+}
+
+void ComponentImplementationDescription::
+assemblyImpl_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+assemblyImpl_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+monolithicImpl (Type& o)
+{
+dispatch (o.monolithicImpl ());
+}
+
+void ComponentImplementationDescription::
+monolithicImpl (Type const& o)
+{
+dispatch (o.monolithicImpl ());
+}
+
+void ComponentImplementationDescription::
+monolithicImpl_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+monolithicImpl_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::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 ComponentImplementationDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::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 ComponentImplementationDescription::
+configProperty_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::capability_iterator b (o.begin_capability()), e (o.end_capability());
+
+if (b != e)
+{
+capability_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) capability_next (o);
+}
+
+capability_post (o);
+}
+
+else capability_none (o);
+}
+
+void ComponentImplementationDescription::
+capability (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::capability_const_iterator b (o.begin_capability()), e (o.end_capability());
+
+if (b != e)
+{
+capability_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) capability_next (o);
+}
+
+capability_post (o);
+}
+
+else capability_none (o);
+}
+
+void ComponentImplementationDescription::
+capability_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_none (Type const&)
+{
+}
+
+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);
+}
+
+dependsOn_post (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());
+
+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 ComponentImplementationDescription::
+dependsOn_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::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 ComponentImplementationDescription::
+infoProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::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 ComponentImplementationDescription::
+infoProperty_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+contentLocation (Type& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentImplementationDescription::
+contentLocation (Type const& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentImplementationDescription::
+contentLocation_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+contentLocation_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+href (Type& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentImplementationDescription::
+href (Type const& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentImplementationDescription::
+href_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+href_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+post (Type&)
+{
+}
+
+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::
-      package (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("package", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::package (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::basePackage (o);
+pop_ ();
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::configProperty (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
+Traversal::SubcomponentInstantiationDescription::specializedConfig (o);
+pop_ ();
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::selectRequirement (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reference", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::reference (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type const& o)
+{
+selectRequirement_post (o);
+selectRequirement_pre (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::SubcomponentInstantiationDescription::id (o);
-        attr_ (0);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      // SubcomponentPropertyReference
-      //
-      //
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
 
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
 
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference ()
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPropertyReference::traverse (o);
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::referencedPackage (o);
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
-        Traversal::SubcomponentPropertyReference::propertyName (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+importedPackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::importedPackage (o);
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::SubcomponentPropertyReference::instance (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::SubcomponentInstantiationDescription::id (o);
+attr_ (0);
+}
 
-      // AssemblyPropertyMapping
-      //
-      //
+// SubcomponentPropertyReference
+//
+//
 
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SubcomponentPropertyReference::
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping ()
-      {
-      }
+SubcomponentPropertyReference::
+SubcomponentPropertyReference ()
+{
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyPropertyMapping::traverse (o);
-      }
+void SubcomponentPropertyReference::
+traverse (Type const& o)
+{
+Traversal::SubcomponentPropertyReference::traverse (o);
+}
 
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::AssemblyPropertyMapping::name (o);
-        pop_ ();
-      }
+void SubcomponentPropertyReference::
+propertyName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
+Traversal::SubcomponentPropertyReference::propertyName (o);
+pop_ ();
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
-        Traversal::AssemblyPropertyMapping::externalName (o);
-        pop_ ();
-      }
+void SubcomponentPropertyReference::
+instance (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+Traversal::SubcomponentPropertyReference::instance (o);
+pop_ ();
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
-        Traversal::AssemblyPropertyMapping::delegatesTo (o);
-        pop_ ();
-      }
+// AssemblyPropertyMapping
+//
+//
 
-      // ComponentAssemblyDescription
-      //
-      //
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+AssemblyPropertyMapping::
+AssemblyPropertyMapping ()
+{
+}
 
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription ()
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type const& o)
+{
+Traversal::AssemblyPropertyMapping::traverse (o);
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentAssemblyDescription::traverse (o);
-      }
+void AssemblyPropertyMapping::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::AssemblyPropertyMapping::name (o);
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-      }
+void AssemblyPropertyMapping::
+externalName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
+Traversal::AssemblyPropertyMapping::externalName (o);
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      instance_next (Type const& o)
-      {
-        instance_post (o);
-        instance_pre (o);
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-        pop_ ();
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type const& o)
+{
+delegatesTo_post (o);
+delegatesTo_pre (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void AssemblyPropertyMapping::
+delegatesTo_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+// ComponentAssemblyDescription
+//
+//
 
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
-        Traversal::ComponentAssemblyDescription::externalProperty (o);
-        pop_ ();
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription ()
+{
+}
 
-      // MonolithicImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentAssemblyDescription::traverse (o);
+}
 
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+}
 
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription ()
-      {
-      }
+void ComponentAssemblyDescription::
+instance_next (Type const& o)
+{
+instance_post (o);
+instance_pre (o);
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicImplementationDescription::traverse (o);
-      }
+void ComponentAssemblyDescription::
+instance_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-        Traversal::MonolithicImplementationDescription::execParameter (o);
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
-      }
+void ComponentAssemblyDescription::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const& o)
-      {
-        primaryArtifact_post (o);
-        primaryArtifact_pre (o);
-      }
+void ComponentAssemblyDescription::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::MonolithicImplementationDescription::deployRequirement (o);
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type const& o)
+{
+externalProperty_post (o);
+externalProperty_pre (o);
+}
 
-      // ComponentImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+externalProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      ComponentImplementationDescription::
-      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// MonolithicImplementationDescription
+//
+//
 
-      ComponentImplementationDescription::
-      ComponentImplementationDescription ()
-      {
-      }
+MonolithicImplementationDescription::
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentImplementationDescription::traverse (o);
-      }
+MonolithicImplementationDescription::
+MonolithicImplementationDescription ()
+{
+}
 
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::ComponentImplementationDescription::label (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+traverse (Type const& o)
+{
+Traversal::MonolithicImplementationDescription::traverse (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-        Traversal::ComponentImplementationDescription::UUID (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nodeExecParameter", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
-        Traversal::ComponentImplementationDescription::implements (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type const& o)
+{
+nodeExecParameter_post (o);
+nodeExecParameter_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::assemblyImpl (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::monolithicImpl (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentExecParameter", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::configProperty (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type const& o)
+{
+componentExecParameter_post (o);
+componentExecParameter_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
-        Traversal::ComponentImplementationDescription::capability (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
-        Traversal::ComponentImplementationDescription::dependsOn (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::infoProperty (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-        Traversal::ComponentImplementationDescription::contentLocation (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      href (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-        attr_ (&a);
-        Traversal::ComponentImplementationDescription::href (o);
-        attr_ (0);
-      }
-    }
-  }
+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_post (Type const&)
+{
+pop_ ();
+}
+
+// ComponentImplementationDescription
+//
+//
+
+ComponentImplementationDescription::
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+ComponentImplementationDescription::
+ComponentImplementationDescription ()
+{
+}
+
+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::
+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::
+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::
+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_post (Type const&)
+{
+pop_ ();
+}
+
+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_post (Type const&)
+{
+pop_ ();
+}
+
+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_post (Type const&)
+{
+pop_ ();
+}
+
+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_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::
+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/TAO/CIAO/tools/Config_Handlers/cid.hpp b/TAO/CIAO/tools/Config_Handlers/cid.hpp
index 9a07d2b6788..069c7407eae 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,15 +24,15 @@
 //
 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>
@@ -48,1523 +45,2017 @@ namespace CIAO
 
 #include "iad.hpp"
 
+#include "pcd.hpp"
+
 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_;
-
-      // package
-      // 
-      public:
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
-      void package (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // selectRequirement
-      // 
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // reference
-      // 
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // 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__,
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
-
-      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:
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
-      void instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      public:
-      SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription 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:
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
-      void delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
-
-      public:
-      AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
-
-      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:
-      bool externalProperty_p () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
-      void externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
-
-      protected:
-      ::std::auto_ptr< ::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__;
-
-      // execParameter
-      // 
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // 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_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
-
-      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:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // capability
-      // 
-      public:
-      bool capability_p () const;
-      ::CIAO::Config_Handlers::Capability const& capability () const;
-      void capability (::CIAO::Config_Handlers::Capability const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
-
-      // dependsOn
-      // 
-      public:
-      bool dependsOn_p () const;
-      ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
-      void dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::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
+{
+//@@ 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 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
-        package (Type&);
+virtual void
+basePackage (Type const&);
 
-        virtual void
-        package (Type const&);
+virtual void
+basePackage_none (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+basePackage_none (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+specializedConfig (Type&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+specializedConfig (Type const&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+specializedConfig_none (Type&);
 
-        virtual void
-        selectRequirement (Type&);
+virtual void
+specializedConfig_none (Type const&);
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+selectRequirement (Type&);
 
-        virtual void
-        selectRequirement_none (Type&);
+virtual void
+selectRequirement (Type const&);
 
-        virtual void
-        selectRequirement_none (Type const&);
+virtual void
+selectRequirement_pre (Type&);
 
-        virtual void
-        reference (Type&);
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void
-        reference (Type const&);
+virtual void
+selectRequirement_next (Type&);
 
-        virtual void
-        reference_none (Type&);
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void
-        reference_none (Type const&);
+virtual void
+selectRequirement_post (Type&);
 
-        virtual void
-        id (Type&);
+virtual void
+selectRequirement_post (Type const&);
 
-        virtual void
-        id (Type const&);
+virtual void
+selectRequirement_none (Type&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+selectRequirement_none (Type const&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+configProperty_pre (Type&);
 
-      struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        propertyName (Type&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        propertyName (Type const&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        instance (Type&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+referencedPackage (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+referencedPackage (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+referencedPackage_none (Type&);
 
-      struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+referencedPackage_none (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+importedPackage (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+importedPackage (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+importedPackage_none (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+importedPackage_none (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+id (Type&);
 
-        virtual void
-        externalName (Type&);
+virtual void
+id (Type const&);
 
-        virtual void
-        externalName (Type const&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        delegatesTo (Type&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        delegatesTo (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 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
+propertyName (Type&);
 
-        virtual void
-        instance (Type&);
+virtual void
+propertyName (Type const&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+instance (Type&);
 
-        virtual void
-        instance_pre (Type&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        instance_pre (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        instance_next (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        instance_next (Type const&);
+struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        instance_post (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        instance_post (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        connection (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+name (Type&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+name (Type const&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+externalName (Type&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+externalName (Type const&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+delegatesTo (Type&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+delegatesTo (Type const&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+delegatesTo_pre (Type&);
 
-        virtual void
-        externalProperty (Type&);
+virtual void
+delegatesTo_pre (Type const&);
 
-        virtual void
-        externalProperty (Type const&);
+virtual void
+delegatesTo_next (Type&);
 
-        virtual void
-        externalProperty_none (Type&);
+virtual void
+delegatesTo_next (Type const&);
 
-        virtual void
-        externalProperty_none (Type const&);
+virtual void
+delegatesTo_post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+delegatesTo_post (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+post (Type&);
+
+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 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
+instance (Type&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+instance_pre (Type&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+instance_pre (Type const&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+instance_next (Type&);
 
-        virtual void
-        primaryArtifact (Type&);
+virtual void
+instance_next (Type const&);
 
-        virtual void
-        primaryArtifact (Type const&);
+virtual void
+instance_post (Type&);
 
-        virtual void
-        primaryArtifact_pre (Type&);
+virtual void
+instance_post (Type const&);
 
-        virtual void
-        primaryArtifact_pre (Type const&);
+virtual void
+connection (Type&);
 
-        virtual void
-        primaryArtifact_next (Type&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        primaryArtifact_next (Type const&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        primaryArtifact_post (Type&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        primaryArtifact_post (Type const&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+connection_none (Type const&);
+
+virtual void
+externalProperty (Type&);
+
+virtual void
+externalProperty (Type const&);
+
+virtual void
+externalProperty_pre (Type&);
+
+virtual void
+externalProperty_pre (Type const&);
+
+virtual void
+externalProperty_next (Type&);
+
+virtual void
+externalProperty_next (Type const&);
+
+virtual void
+externalProperty_post (Type&);
+
+virtual void
+externalProperty_post (Type const&);
+
+virtual void
+externalProperty_none (Type&);
+
+virtual void
+externalProperty_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+nodeExecParameter (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+nodeExecParameter (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+nodeExecParameter_pre (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+nodeExecParameter_pre (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+nodeExecParameter_next (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+nodeExecParameter_next (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+nodeExecParameter_post (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+nodeExecParameter_post (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+nodeExecParameter_none (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+nodeExecParameter_none (Type const&);
 
-        virtual void
-        implements (Type&);
+virtual void
+componentExecParameter (Type&);
 
-        virtual void
-        implements (Type const&);
+virtual void
+componentExecParameter (Type const&);
 
-        virtual void
-        implements_none (Type&);
+virtual void
+componentExecParameter_pre (Type&);
 
-        virtual void
-        implements_none (Type const&);
+virtual void
+componentExecParameter_pre (Type const&);
+
+virtual void
+componentExecParameter_next (Type&);
+
+virtual void
+componentExecParameter_next (Type const&);
+
+virtual void
+componentExecParameter_post (Type&);
+
+virtual void
+componentExecParameter_post (Type const&);
+
+virtual void
+componentExecParameter_none (Type&);
+
+virtual void
+componentExecParameter_none (Type const&);
+
+virtual void
+deployRequirement (Type&);
+
+virtual void
+deployRequirement (Type const&);
+
+virtual void
+deployRequirement_pre (Type&);
+
+virtual void
+deployRequirement_pre (Type const&);
+
+virtual void
+deployRequirement_next (Type&);
+
+virtual void
+deployRequirement_next (Type const&);
+
+virtual void
+deployRequirement_post (Type&);
+
+virtual void
+deployRequirement_post (Type const&);
+
+virtual void
+deployRequirement_none (Type&);
+
+virtual void
+deployRequirement_none (Type const&);
+
+virtual void
+primaryArtifact (Type&);
+
+virtual void
+primaryArtifact (Type const&);
+
+virtual void
+primaryArtifact_pre (Type&);
+
+virtual void
+primaryArtifact_pre (Type const&);
+
+virtual void
+primaryArtifact_next (Type&);
+
+virtual void
+primaryArtifact_next (Type const&);
+
+virtual void
+primaryArtifact_post (Type&);
+
+virtual void
+primaryArtifact_post (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        assemblyImpl (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        assemblyImpl (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        assemblyImpl_none (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        assemblyImpl_none (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        monolithicImpl (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        monolithicImpl (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        monolithicImpl_none (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        monolithicImpl_none (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+implements (Type&);
 
-        virtual void
-        capability (Type&);
+virtual void
+implements (Type const&);
 
-        virtual void
-        capability (Type const&);
+virtual void
+implements_none (Type&);
 
-        virtual void
-        capability_none (Type&);
+virtual void
+implements_none (Type const&);
 
-        virtual void
-        capability_none (Type const&);
+virtual void
+assemblyImpl (Type&);
 
-        virtual void
-        dependsOn (Type&);
+virtual void
+assemblyImpl (Type const&);
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+assemblyImpl_none (Type&);
 
-        virtual void
-        dependsOn_none (Type&);
+virtual void
+assemblyImpl_none (Type const&);
 
-        virtual void
-        dependsOn_none (Type const&);
+virtual void
+monolithicImpl (Type&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+monolithicImpl (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+monolithicImpl_none (Type&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+monolithicImpl_none (Type const&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        href (Type&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        href (Type const&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+capability (Type&);
+
+virtual void
+capability (Type const&);
+
+virtual void
+capability_pre (Type&);
+
+virtual void
+capability_pre (Type const&);
+
+virtual void
+capability_next (Type&);
+
+virtual void
+capability_next (Type const&);
+
+virtual void
+capability_post (Type&);
+
+virtual void
+capability_post (Type const&);
+
+virtual void
+capability_none (Type&);
+
+virtual void
+capability_none (Type const&);
+
+virtual void
+dependsOn (Type&);
+
+virtual void
+dependsOn (Type const&);
+
+virtual void
+dependsOn_pre (Type&);
+
+virtual void
+dependsOn_pre (Type const&);
+
+virtual void
+dependsOn_next (Type&);
+
+virtual void
+dependsOn_next (Type const&);
+
+virtual void
+dependsOn_post (Type&);
+
+virtual void
+dependsOn_post (Type const&);
+
+virtual void
+dependsOn_none (Type&);
+
+virtual void
+dependsOn_none (Type const&);
+
+virtual void
+infoProperty (Type&);
+
+virtual void
+infoProperty (Type const&);
+
+virtual void
+infoProperty_pre (Type&);
+
+virtual void
+infoProperty_pre (Type const&);
+
+virtual void
+infoProperty_next (Type&);
+
+virtual void
+infoProperty_next (Type const&);
+
+virtual void
+infoProperty_post (Type&);
+
+virtual void
+infoProperty_post (Type const&);
+
+virtual void
+infoProperty_none (Type&);
+
+virtual void
+infoProperty_none (Type const&);
+
+virtual void
+contentLocation (Type&);
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+contentLocation_none (Type&);
+
+virtual void
+contentLocation_none (Type const&);
+
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+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)
+{
+
+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
+basePackage (Type &o)
+{
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+this->basePackage (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+basePackage (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+specializedConfig (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+this->specializedConfig (const_cast <Type const &> (o));
+}
 
-          this->name (const_cast <Type const &> (o));
-        }
 
+virtual void
+specializedConfig (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+virtual void
+selectRequirement_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        package (Type &o)
-        {
+this->selectRequirement_pre (const_cast <Type const &> (o));
+}
 
-          this->package (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        package (Type const&);
+virtual void
+selectRequirement_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty (Type &o)
-        {
+this->selectRequirement_next (const_cast <Type const &> (o));
+}
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty (Type const&);
+virtual void
+selectRequirement_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        selectRequirement (Type &o)
-        {
+this->selectRequirement_post (const_cast <Type const &> (o));
+}
 
-          this->selectRequirement (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+configProperty_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        reference (Type &o)
-        {
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-          this->reference (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        reference (Type const&);
+virtual void
+configProperty_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        id (Type &o)
-        {
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-          this->id (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        id (Type const&);
+virtual void
+configProperty_post (Type &o)
+{
 
-        protected:
-        SubcomponentInstantiationDescription ();
-      };
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-      struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
-        SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+configProperty_post (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+referencedPackage (Type &o)
+{
 
+this->referencedPackage (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        propertyName (Type &o)
-        {
+virtual void
+referencedPackage (Type const&);
 
-          this->propertyName (const_cast <Type const &> (o));
-        }
+virtual void
+importedPackage (Type &o)
+{
 
+this->importedPackage (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        propertyName (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance (Type &o)
-        {
+virtual void
+importedPackage (Type const&);
 
-          this->instance (const_cast <Type const &> (o));
-        }
+virtual void
+id (Type &o)
+{
 
+this->id (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance (Type const&);
 
-        protected:
-        SubcomponentPropertyReference ();
-      };
+virtual void
+id (Type const&);
 
-      struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
-        AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
+protected:
+SubcomponentInstantiationDescription ();
+};
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type &o)
+{
 
+this->traverse (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+traverse (Type const&);
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+propertyName (Type &o)
+{
 
+this->propertyName (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalName (Type &o)
-        {
+virtual void
+propertyName (Type const&);
 
-          this->externalName (const_cast <Type const &> (o));
-        }
+virtual void
+instance (Type &o)
+{
 
+this->instance (const_cast <Type const &> (o));
+}
+
+
+virtual void
+instance (Type const&);
+
+protected:
+SubcomponentPropertyReference ();
+};
+
+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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+name (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalName (Type const&);
+this->name (const_cast <Type const &> (o));
+}
+
+
+virtual void
+name (Type const&);
+
+virtual void
+externalName (Type &o)
+{
+
+this->externalName (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        delegatesTo (Type &o)
-        {
 
-          this->delegatesTo (const_cast <Type const &> (o));
-        }
+virtual void
+externalName (Type const&);
+
+virtual void
+delegatesTo_pre (Type &o)
+{
+
+this->delegatesTo_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        delegatesTo (Type const&);
+virtual void
+delegatesTo_pre (Type const&);
 
-        protected:
-        AssemblyPropertyMapping ();
-      };
+virtual void
+delegatesTo_next (Type &o)
+{
+
+this->delegatesTo_next (const_cast <Type const &> (o));
+}
 
-      struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
-        ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+delegatesTo_next (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+delegatesTo_post (Type &o)
+{
 
+this->delegatesTo_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance_pre (Type &o)
-        {
+virtual void
+delegatesTo_post (Type const&);
 
-          this->instance_pre (const_cast <Type const &> (o));
-        }
+protected:
+AssemblyPropertyMapping ();
+};
 
+struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_pre (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance_next (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->instance_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_next (Type const&);
+virtual void
+instance_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        instance_post (Type &o)
-        {
+this->instance_pre (const_cast <Type const &> (o));
+}
 
-          this->instance_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+instance_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        instance_post (Type const&);
+virtual void
+instance_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_pre (Type &o)
-        {
+this->instance_next (const_cast <Type const &> (o));
+}
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
 
+virtual void
+instance_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_pre (Type const&);
+virtual void
+instance_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_next (Type &o)
-        {
+this->instance_post (const_cast <Type const &> (o));
+}
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+instance_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        connection_post (Type &o)
-        {
+this->connection_pre (const_cast <Type const &> (o));
+}
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+connection_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        externalProperty (Type &o)
-        {
+this->connection_next (const_cast <Type const &> (o));
+}
 
-          this->externalProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+connection_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        externalProperty (Type const&);
+virtual void
+connection_post (Type &o)
+{
 
-        protected:
-        ComponentAssemblyDescription ();
-      };
+this->connection_post (const_cast <Type const &> (o));
+}
 
-      struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
-        MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+connection_post (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+externalProperty_pre (Type &o)
+{
 
+this->externalProperty_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter (Type &o)
-        {
+virtual void
+externalProperty_pre (Type const&);
 
-          this->execParameter (const_cast <Type const &> (o));
-        }
+virtual void
+externalProperty_next (Type &o)
+{
 
+this->externalProperty_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        primaryArtifact_pre (Type &o)
-        {
+virtual void
+externalProperty_next (Type const&);
 
-          this->primaryArtifact_pre (const_cast <Type const &> (o));
-        }
+virtual void
+externalProperty_post (Type &o)
+{
 
+this->externalProperty_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        primaryArtifact_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        primaryArtifact_next (Type &o)
-        {
+virtual void
+externalProperty_post (Type const&);
 
-          this->primaryArtifact_next (const_cast <Type const &> (o));
-        }
+protected:
+ComponentAssemblyDescription ();
+};
 
+struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        primaryArtifact_next (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        primaryArtifact_post (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->primaryArtifact_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        primaryArtifact_post (Type const&);
+virtual void
+nodeExecParameter_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement (Type &o)
-        {
+this->nodeExecParameter_pre (const_cast <Type const &> (o));
+}
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
 
+virtual void
+nodeExecParameter_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+nodeExecParameter_next (Type &o)
+{
 
-        protected:
-        MonolithicImplementationDescription ();
-      };
+this->nodeExecParameter_next (const_cast <Type const &> (o));
+}
 
-      struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
-        ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+nodeExecParameter_next (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+nodeExecParameter_post (Type &o)
+{
 
+this->nodeExecParameter_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+nodeExecParameter_post (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+componentExecParameter_pre (Type &o)
+{
 
+this->componentExecParameter_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+componentExecParameter_pre (Type const&);
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+virtual void
+componentExecParameter_next (Type &o)
+{
 
+this->componentExecParameter_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        implements (Type &o)
-        {
+virtual void
+componentExecParameter_next (Type const&);
 
-          this->implements (const_cast <Type const &> (o));
-        }
+virtual void
+componentExecParameter_post (Type &o)
+{
 
+this->componentExecParameter_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implements (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        assemblyImpl (Type &o)
-        {
+virtual void
+componentExecParameter_post (Type const&);
 
-          this->assemblyImpl (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type &o)
+{
 
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        assemblyImpl (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        monolithicImpl (Type &o)
-        {
+virtual void
+deployRequirement_pre (Type const&);
 
-          this->monolithicImpl (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_next (Type &o)
+{
 
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        monolithicImpl (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty (Type &o)
-        {
+virtual void
+deployRequirement_next (Type const&);
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_post (Type &o)
+{
 
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        capability (Type &o)
-        {
+virtual void
+deployRequirement_post (Type const&);
 
-          this->capability (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_pre (Type &o)
+{
 
+this->primaryArtifact_pre (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        capability (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        dependsOn (Type &o)
-        {
+virtual void
+primaryArtifact_pre (Type const&);
 
-          this->dependsOn (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_next (Type &o)
+{
 
+this->primaryArtifact_next (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+primaryArtifact_next (Type const&);
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_post (Type &o)
+{
 
+this->primaryArtifact_post (const_cast <Type const &> (o));
+}
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+primaryArtifact_post (Type const&);
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+protected:
+MonolithicImplementationDescription ();
+};
 
+struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        contentLocation (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        href (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->href (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        href (Type const&);
+virtual void
+label (Type &o)
+{
 
-        protected:
-        ComponentImplementationDescription ();
-      };
-    }
-  }
+this->label (const_cast <Type const &> (o));
+}
+
+
+virtual void
+label (Type const&);
+
+virtual void
+UUID (Type &o)
+{
+
+this->UUID (const_cast <Type const &> (o));
+}
+
+
+virtual void
+UUID (Type const&);
+
+virtual void
+implements (Type &o)
+{
+
+this->implements (const_cast <Type const &> (o));
+}
+
+
+virtual void
+implements (Type const&);
+
+virtual void
+assemblyImpl (Type &o)
+{
+
+this->assemblyImpl (const_cast <Type const &> (o));
+}
+
+
+virtual void
+assemblyImpl (Type const&);
+
+virtual void
+monolithicImpl (Type &o)
+{
+
+this->monolithicImpl (const_cast <Type const &> (o));
+}
+
+
+virtual void
+monolithicImpl (Type const&);
+
+virtual void
+configProperty_pre (Type &o)
+{
+
+this->configProperty_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_pre (Type const&);
+
+virtual void
+configProperty_next (Type &o)
+{
+
+this->configProperty_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_next (Type const&);
+
+virtual void
+configProperty_post (Type &o)
+{
+
+this->configProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+capability_pre (Type &o)
+{
+
+this->capability_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_pre (Type const&);
+
+virtual void
+capability_next (Type &o)
+{
+
+this->capability_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_next (Type const&);
+
+virtual void
+capability_post (Type &o)
+{
+
+this->capability_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_post (Type const&);
+
+virtual void
+dependsOn_pre (Type &o)
+{
+
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+dependsOn_pre (Type const&);
+
+virtual void
+dependsOn_next (Type &o)
+{
+
+this->dependsOn_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+dependsOn_next (Type const&);
+
+virtual void
+dependsOn_post (Type &o)
+{
+
+this->dependsOn_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+dependsOn_post (Type const&);
+
+virtual void
+infoProperty_pre (Type &o)
+{
+
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_pre (Type const&);
+
+virtual void
+infoProperty_next (Type &o)
+{
+
+this->infoProperty_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_next (Type const&);
+
+virtual void
+infoProperty_post (Type &o)
+{
+
+this->infoProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_post (Type const&);
+
+virtual void
+contentLocation (Type &o)
+{
+
+this->contentLocation (const_cast <Type const &> (o));
+}
+
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+href (Type &o)
+{
+
+this->href (const_cast <Type const &> (o));
+}
+
+
+virtual void
+href (Type const&);
+
+protected:
+ComponentImplementationDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CID_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.cpp b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
index 787afc2e32b..234843d14d4 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
@@ -3,29 +3,29 @@
  *
  * 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>
  */
- 
-#include "cpd.hpp"
 
+#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__ ()
+                                     ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
+        regulator__ ()
     {
       name_->container (this);
       referencedImplementation_->container (this);
@@ -33,984 +33,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);
-    }
+      :
+      ::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 ());
+::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation::
+operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
+{
+name (s.name ());
 
-      referencedImplementation (s.referencedImplementation ());
+referencedImplementation (s.referencedImplementation ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // PackagedComponentImplementation
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
-    name () const
-    {
-      return *name_;
-    }
+// PackagedComponentImplementation
+//
+::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
+name () const
+{
+return *name_;
+}
 
-    void PackagedComponentImplementation::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void PackagedComponentImplementation::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // PackagedComponentImplementation
-    // 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
-    referencedImplementation () const
-    {
-      return *referencedImplementation_;
-    }
+// PackagedComponentImplementation
+//
+::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
+referencedImplementation () const
+{
+return *referencedImplementation_;
+}
 
-    void PackagedComponentImplementation::
-    referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
-    {
-      *referencedImplementation_ = e;
-    }
+void PackagedComponentImplementation::
+referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
+{
+*referencedImplementation_ = e;
+}
 
 
-    // ComponentPackageDescription
-    // 
+// ComponentPackageDescription
+//
 
-    ComponentPackageDescription::
-    ComponentPackageDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ComponentPackageDescription::
+ComponentPackageDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    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),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    implementation_ (s.implementation_.get () ? new ::CIAO::Config_Handlers::PackagedComponentImplementation (*s.implementation_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 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);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (implementation_.get ()) implementation_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (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);
+}
 
-    ::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);
+{
+for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      if (s.realizes_.get ()) realizes (*(s.realizes_));
-      else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+::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.implementation_.get ()) implementation (*(s.implementation_));
-      else implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (0);
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (s.realizes_.get ()) realizes (*(s.realizes_));
+else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+implementation_.clear ();
+{
+for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+}
 
-      return *this;
-    }
+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);
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    label () const
-    {
-      return *label_;
-    }
+return *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::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+label () const
+{
+return *label_;
+}
 
-    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);
-      }
-    }
+void ComponentPackageDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    realizes_p () const
-    {
-      return realizes_.get () != 0;
-    }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
-    realizes () const
-    {
-      return *realizes_;
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    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);
-      }
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+void ComponentPackageDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-    void ComponentPackageDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+realizes_p () const
+{
+return realizes_.get () != 0;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    implementation_p () const
-    {
-      return implementation_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
+realizes () const
+{
+return *realizes_;
+}
 
-    ::CIAO::Config_Handlers::PackagedComponentImplementation const& ComponentPackageDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
+void ComponentPackageDescription::
+realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+{
+if (realizes_.get ())
+{
+*realizes_ = e;
+}
 
-    void ComponentPackageDescription::
-    implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
-    {
-      if (implementation_.get ())
-      {
-        *implementation_ = e;
-      }
-
-      else
-      {
-        implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (new ::CIAO::Config_Handlers::PackagedComponentImplementation (e));
-        implementation_->container (this);
-      }
-    }
+else
+{
+realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+realizes_->container (this);
+}
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+end_configProperty ()
+{
+return configProperty_.end ();
+}
 
-    void ComponentPackageDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+begin_configProperty () const
+{
+return configProperty_.begin ();
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+void ComponentPackageDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
 
-    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);
-      }
-    }
+size_t ComponentPackageDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+begin_implementation ()
+{
+return implementation_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    href () const
-    {
-      return *href_;
-    }
+ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+end_implementation ()
+{
+return implementation_.end ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
-    href ()
-    {
-      return *href_;
-    }
+ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+begin_implementation () const
+{
+return implementation_.begin ();
+}
 
-    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);
-      }
-    }
-  }
+ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+end_implementation () const
+{
+return implementation_.end ();
+}
+
+void ComponentPackageDescription::
+add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
+{
+implementation_.push_back (e);
+}
+
+size_t ComponentPackageDescription::
+count_implementation(void) const
+{
+return implementation_.size ();
+}
+
+// ComponentPackageDescription
+//
+ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
+
+ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+end_infoProperty ()
+{
+return infoProperty_.end ();
+}
+
+ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+begin_infoProperty () const
+{
+return infoProperty_.begin ();
+}
+
+ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ComponentPackageDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ComponentPackageDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+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);
+}
+}
+
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
+href ()
+{
+return *href_;
+}
+
+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
-    //
+namespace Config_Handlers
+{
+// PackagedComponentImplementation
+//
 
-    PackagedComponentImplementation::
-    PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+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 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ComponentPackageDescription
-    //
+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 ()));
 
-    ComponentPackageDescription::
-    ComponentPackageDescription (::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);
-
-      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);
-          configProperty (t);
-        }
-
-        else if (n == "implementation")
-        {
-          ::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
-          implementation (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          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 
-        {
-        }
-      }
-    }
-  }
+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);
+}
+
+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);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (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);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (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)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      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 (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::ComponentPackageDescription::configProperty (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-        Traversal::ComponentPackageDescription::implementation (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ComponentPackageDescription::infoProperty (o);
-        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/TAO/CIAO/tools/Config_Handlers/cpd.hpp b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
index a6c297da012..d5f6d9dccd7 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,11 +24,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PackagedComponentImplementation;
-    class ComponentPackageDescription;
-  }
+namespace Config_Handlers
+{
+class PackagedComponentImplementation;
+class ComponentPackageDescription;
+}
 }
 
 #include <memory>
@@ -44,517 +41,618 @@ namespace CIAO
 
 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:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // implementation
-      // 
-      public:
-      bool implementation_p () const;
-      ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
-      void implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::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
+{
+//@@ 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 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
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+referencedImplementation (Type&);
+
+virtual void
+referencedImplementation (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        referencedImplementation (Type&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        referencedImplementation (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+UUID_none (Type const&);
 
-      struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+realizes (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+realizes (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+realizes_none (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+realizes_none (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        realizes (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        realizes (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        realizes_none (Type&);
+virtual void
+implementation (Type&);
 
-        virtual void
-        realizes_none (Type const&);
+virtual void
+implementation (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+implementation_pre (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+implementation_next (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+implementation_next (Type const&);
 
-        virtual void
-        implementation (Type&);
+virtual void
+implementation_post (Type&);
 
-        virtual void
-        implementation (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_none (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        href (Type&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        href (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+contentLocation_none (Type const&);
+
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+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)
+{
+
+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
+referencedImplementation (Type &o)
+{
+
+this->referencedImplementation (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedImplementation (Type const&);
+
+protected:
+PackagedComponentImplementation ();
+};
+
+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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+label (Type const&);
 
+virtual void
+UUID (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+this->UUID (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+UUID (Type const&);
 
+virtual void
+realizes (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->realizes (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        referencedImplementation (Type &o)
-        {
 
-          this->referencedImplementation (const_cast <Type const &> (o));
-        }
+virtual void
+realizes (Type const&);
 
+virtual void
+configProperty_pre (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        referencedImplementation (Type const&);
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-        protected:
-        PackagedComponentImplementation ();
-      };
 
-      struct ComponentPackageDescription : Traversal::ComponentPackageDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
-        ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+configProperty_pre (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+configProperty_next (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+configProperty_post (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->configProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+implementation_pre (Type &o)
+{
+
+this->implementation_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+implementation_next (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->implementation_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
+virtual void
+implementation_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        realizes (Type &o)
-        {
+virtual void
+implementation_post (Type &o)
+{
 
-          this->realizes (const_cast <Type const &> (o));
-        }
+this->implementation_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        realizes (Type const&);
+virtual void
+implementation_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        implementation (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->implementation (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        implementation (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        href (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->href (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        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/TAO/CIAO/tools/Config_Handlers/iad.cpp b/TAO/CIAO/tools/Config_Handlers/iad.cpp
index 6c058af91a5..e799fd544fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "iad.hpp"
 
 namespace CIAO
@@ -16,16 +16,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__ ()
+                                 ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
+        regulator__ ()
     {
       name_->container (this);
       referencedArtifact_->container (this);
@@ -33,1242 +33,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);
-    }
+      :
+      ::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 ());
+::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
+operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
+{
+name (s.name ());
 
-      referencedArtifact (s.referencedArtifact ());
+referencedArtifact (s.referencedArtifact ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // NamedImplementationArtifact
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
-    name () const
-    {
-      return *name_;
-    }
+// NamedImplementationArtifact
+//
+::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
+name () const
+{
+return *name_;
+}
 
-    void NamedImplementationArtifact::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void NamedImplementationArtifact::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // NamedImplementationArtifact
-    // 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
-    referencedArtifact () const
-    {
-      return *referencedArtifact_;
-    }
+// NamedImplementationArtifact
+//
+::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
+referencedArtifact () const
+{
+return *referencedArtifact_;
+}
 
-    void NamedImplementationArtifact::
-    referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
-    {
-      *referencedArtifact_ = e;
-    }
+void NamedImplementationArtifact::
+referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
+{
+*referencedArtifact_ = e;
+}
 
 
-    // ImplementationArtifactDescription
-    // 
+// ImplementationArtifactDescription
+//
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ImplementationArtifactDescription::
+ImplementationArtifactDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    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),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 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);
-      }
-
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
-    }
+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);
+}
 
-    ::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);
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-      location_.clear ();
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      dependsOn_.clear ();
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+::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.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::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);
+location_.clear ();
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::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);
+}
 
-      return *this;
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
+infoProperty_.clear ();
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    label () const
-    {
-      return *label_;
-    }
+if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    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);
-      }
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+return *this;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
 
-    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
+//
+bool ImplementationArtifactDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+label () const
+{
+return *label_;
+}
 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
+void ImplementationArtifactDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    void ImplementationArtifactDescription::
-    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      location_.push_back (e);
-    }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    size_t ImplementationArtifactDescription::
-    count_location(void) const
-    {
-      return location_.size ();
-    }
+void ImplementationArtifactDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    begin_dependsOn ()
-    {
-      return dependsOn_.begin ();
-    }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    end_dependsOn ()
-    {
-      return dependsOn_.end ();
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+begin_location ()
+{
+return location_.begin ();
+}
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    begin_dependsOn () const
-    {
-      return dependsOn_.begin ();
-    }
+ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+end_location ()
+{
+return location_.end ();
+}
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    end_dependsOn () const
-    {
-      return dependsOn_.end ();
-    }
+ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+begin_location () const
+{
+return location_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      dependsOn_.push_back (e);
-    }
+ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+end_location () const
+{
+return location_.end ();
+}
 
-    size_t ImplementationArtifactDescription::
-    count_dependsOn(void) const
-    {
-      return dependsOn_.size ();
-    }
+void ImplementationArtifactDescription::
+add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+location_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_location(void) const
+{
+return location_.size ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+begin_dependsOn ()
+{
+return dependsOn_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+end_dependsOn ()
+{
+return dependsOn_.end ();
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+begin_dependsOn () const
+{
+return dependsOn_.begin ();
+}
 
-    ::CIAO::Config_Handlers::Requirement const& ImplementationArtifactDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+end_dependsOn () const
+{
+return dependsOn_.end ();
+}
 
-    void ImplementationArtifactDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+void ImplementationArtifactDescription::
+add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+{
+dependsOn_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_dependsOn(void) const
+{
+return dependsOn_.size ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    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);
-      }
-    }
+void ImplementationArtifactDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    href () const
-    {
-      return *href_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-    href ()
-    {
-      return *href_;
-    }
+ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+end_infoProperty ()
+{
+return infoProperty_.end ();
+}
 
-    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);
-      }
-    }
-  }
+ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+begin_infoProperty () const
+{
+return infoProperty_.begin ();
+}
+
+ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ImplementationArtifactDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ImplementationArtifactDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
+
+ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
+
+ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
+
+ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
+
+void ImplementationArtifactDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
+
+size_t ImplementationArtifactDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
+
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+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);
+}
+}
+
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+href ()
+{
+return *href_;
+}
+
+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
-    //
+namespace Config_Handlers
+{
+// NamedImplementationArtifact
+//
 
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+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 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ImplementationArtifactDescription
-    //
+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 ()));
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::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);
-
-      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);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          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 
-        {
-        }
-      }
-    }
-  }
+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);
+}
+
+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);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (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);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (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)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_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 (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-        Traversal::ImplementationArtifactDescription::execParameter (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::ImplementationArtifactDescription::deployRequirement (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ImplementationArtifactDescription::infoProperty (o);
-        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/TAO/CIAO/tools/Config_Handlers/iad.hpp b/TAO/CIAO/tools/Config_Handlers/iad.hpp
index 4ec2e67443c..f5a5c82399a 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,11 +24,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class NamedImplementationArtifact;
-    class ImplementationArtifactDescription;
-  }
+namespace Config_Handlers
+{
+class NamedImplementationArtifact;
+class ImplementationArtifactDescription;
+}
 }
 
 #include <memory>
@@ -42,655 +39,741 @@ namespace CIAO
 
 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:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::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:
-      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
+{
+//@@ 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 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
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+referencedArtifact (Type&);
+
+virtual void
+referencedArtifact (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
+
+virtual void
+label_none (Type&);
+
+virtual void
+label_none (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+location (Type&);
 
-        virtual void
-        referencedArtifact (Type&);
+virtual void
+location (Type const&);
 
-        virtual void
-        referencedArtifact (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 ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
-      {
-        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
+location_none (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+location_none (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+dependsOn (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+dependsOn (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+dependsOn_pre (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+dependsOn_pre (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+dependsOn_next (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+dependsOn_next (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+dependsOn_post (Type&);
 
-        virtual void
-        location (Type&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void
-        location (Type const&);
+virtual void
+dependsOn_none (Type&);
 
-        virtual void
-        location_pre (Type&);
+virtual void
+dependsOn_none (Type const&);
 
-        virtual void
-        location_pre (Type const&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        location_next (Type&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        location_next (Type const&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        location_post (Type&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void
-        location_post (Type const&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        location_none (Type&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        location_none (Type const&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        dependsOn (Type&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+execParameter_none (Type&);
 
-        virtual void
-        dependsOn_pre (Type&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        dependsOn_next (Type&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        dependsOn_post (Type&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        dependsOn_none (Type&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        dependsOn_none (Type const&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        execParameter_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_none (Type&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        href (Type&);
+virtual void
+contentLocation_none (Type const&);
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+href (Type const&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+href_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+href_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type&);
+
+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 >&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        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
+referencedArtifact (Type &o)
+{
+
+this->referencedArtifact (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedArtifact (Type const&);
+
+protected:
+NamedImplementationArtifact ();
+};
+
+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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
+
+
+virtual void
+label (Type const&);
+
+virtual void
+UUID (Type &o)
+{
+
+this->UUID (const_cast <Type const &> (o));
+}
+
+
+virtual void
+UUID (Type const&);
+
+virtual void
+location_pre (Type &o)
+{
+
+this->location_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_pre (Type const&);
 
+virtual void
+location_next (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        name (Type const&);
+this->location_next (const_cast <Type const &> (o));
+}
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        referencedArtifact (Type &o)
-        {
 
-          this->referencedArtifact (const_cast <Type const &> (o));
-        }
+virtual void
+location_next (Type const&);
 
+virtual void
+location_post (Type &o)
+{
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        referencedArtifact (Type const&);
+this->location_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        NamedImplementationArtifact ();
-      };
 
-      struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
-        ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+location_post (Type const&);
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+dependsOn_pre (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+dependsOn_next (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->dependsOn_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+dependsOn_post (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->dependsOn_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_pre (Type &o)
-        {
+virtual void
+execParameter_pre (Type &o)
+{
 
-          this->location_pre (const_cast <Type const &> (o));
-        }
+this->execParameter_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_pre (Type const&);
+virtual void
+execParameter_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_next (Type &o)
-        {
+virtual void
+execParameter_next (Type &o)
+{
 
-          this->location_next (const_cast <Type const &> (o));
-        }
+this->execParameter_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_next (Type const&);
+virtual void
+execParameter_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        location_post (Type &o)
-        {
+virtual void
+execParameter_post (Type &o)
+{
 
-          this->location_post (const_cast <Type const &> (o));
-        }
+this->execParameter_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        location_post (Type const&);
+virtual void
+execParameter_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        dependsOn_pre (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->dependsOn_pre (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        dependsOn_next (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->dependsOn_next (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        dependsOn_post (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->dependsOn_post (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        execParameter (Type &o)
-        {
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-          this->execParameter (const_cast <Type const &> (o));
-        }
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        execParameter (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        deployRequirement (Type &o)
-        {
+virtual void
+deployRequirement_next (Type &o)
+{
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+deployRequirement_post (Type &o)
+{
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        infoProperty (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        href (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->href (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        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/TAO/CIAO/tools/Config_Handlers/pcd.cpp b/TAO/CIAO/tools/Config_Handlers/pcd.cpp
index 7403102c879..1021d178ad6 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.cpp
@@ -3,49 +3,132 @@
  *
  * 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>
  */
- 
+
 #include "pcd.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
+    // ComponentPackageImport
+    //
+
+    ComponentPackageImport::
+    ComponentPackageImport ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
+    {
+    }
+
+    ComponentPackageImport::
+    ComponentPackageImport (::CIAO::Config_Handlers::ComponentPackageImport const& s)
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
+    {
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
+    }
+
+    ::CIAO::Config_Handlers::ComponentPackageImport& ComponentPackageImport::
+    operator= (::CIAO::Config_Handlers::ComponentPackageImport const& s)
+    {
+      location_.clear ();
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
+
+      return *this;
+    }
+
+
+    // ComponentPackageImport
+    //
+    ComponentPackageImport::location_iterator ComponentPackageImport::
+    begin_location ()
+    {
+      return location_.begin ();
+    }
+
+    ComponentPackageImport::location_iterator ComponentPackageImport::
+    end_location ()
+    {
+      return location_.end ();
+    }
+
+    ComponentPackageImport::location_const_iterator ComponentPackageImport::
+    begin_location () const
+    {
+      return location_.begin ();
+    }
+
+    ComponentPackageImport::location_const_iterator ComponentPackageImport::
+    end_location () const
+    {
+      return location_.end ();
+    }
+
+    void ComponentPackageImport::
+    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      location_.push_back (e);
+    }
+
+    size_t ComponentPackageImport::
+    count_location(void) const
+    {
+      return location_.size ();
+    }
+
+
     // 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),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 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),
+            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 (basePackage_.get ()) basePackage_->container (this);
-      if (reference_.get ()) reference_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
+      if (specializedConfig_.get ()) specializedConfig_->container (this);
+      if (importedPackage_.get ()) importedPackage_->container (this);
+      if (referencedPackage_.get ()) referencedPackage_->container (this);
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
       if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
     }
 
     ::CIAO::Config_Handlers::PackageConfiguration& PackageConfiguration::
@@ -60,24 +143,37 @@ namespace CIAO
       if (s.basePackage_.get ()) basePackage (*(s.basePackage_));
       else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0);
 
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+      if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_));
+      else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0);
 
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+      if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_));
+      else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0);
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_));
+      else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+
+      selectRequirement_.clear ();
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
       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
     {
@@ -94,19 +190,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
     {
@@ -123,19 +219,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
     {
@@ -152,106 +248,182 @@ 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::
-    reference_p () const
+    specializedConfig_p () const
     {
-      return reference_.get () != 0;
+      return specializedConfig_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference const& PackageConfiguration::
-    reference () const
+    ::CIAO::Config_Handlers::PackageConfiguration const& PackageConfiguration::
+    specializedConfig () const
     {
-      return *reference_;
+      return *specializedConfig_;
     }
 
     void PackageConfiguration::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
+    specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
+      if (specializedConfig_.get ())
+        {
+          *specializedConfig_ = e;
+        }
 
       else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
+        {
+          specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+          specializedConfig_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
-    selectRequirement_p () const
+    importedPackage_p () const
     {
-      return selectRequirement_.get () != 0;
+      return importedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Requirement const& PackageConfiguration::
-    selectRequirement () const
+    ::CIAO::Config_Handlers::ComponentPackageImport const& PackageConfiguration::
+    importedPackage () const
     {
-      return *selectRequirement_;
+      return *importedPackage_;
     }
 
     void PackageConfiguration::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
+      if (importedPackage_.get ())
+        {
+          *importedPackage_ = e;
+        }
 
       else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
+        {
+          importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
+          importedPackage_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
-    configProperty_p () const
+    referencedPackage_p () const
     {
-      return configProperty_.get () != 0;
+      return referencedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Property const& PackageConfiguration::
-    configProperty () const
+    ::CIAO::Config_Handlers::ComponentPackageReference const& PackageConfiguration::
+    referencedPackage () const
     {
-      return *configProperty_;
+      return *referencedPackage_;
     }
 
     void PackageConfiguration::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
+    referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
+      if (referencedPackage_.get ())
+        {
+          *referencedPackage_ = e;
+        }
 
       else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->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 ()
+    {
+      return selectRequirement_.begin ();
+    }
+
+    PackageConfiguration::selectRequirement_iterator PackageConfiguration::
+    end_selectRequirement ()
+    {
+      return selectRequirement_.end ();
+    }
+
+    PackageConfiguration::selectRequirement_const_iterator PackageConfiguration::
+    begin_selectRequirement () const
+    {
+      return selectRequirement_.begin ();
+    }
+
+    PackageConfiguration::selectRequirement_const_iterator PackageConfiguration::
+    end_selectRequirement () const
+    {
+      return selectRequirement_.end ();
+    }
+
+    void PackageConfiguration::
+    add_selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      selectRequirement_.push_back (e);
+    }
+
+    size_t PackageConfiguration::
+    count_selectRequirement(void) const
+    {
+      return selectRequirement_.size ();
+    }
+
+    // PackageConfiguration
+    //
+    PackageConfiguration::configProperty_iterator PackageConfiguration::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
+
+    PackageConfiguration::configProperty_iterator PackageConfiguration::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
+
+    PackageConfiguration::configProperty_const_iterator PackageConfiguration::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
+
+    PackageConfiguration::configProperty_const_iterator PackageConfiguration::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
+
+    void PackageConfiguration::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
+
+    size_t PackageConfiguration::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
+
+    // PackageConfiguration
+    //
     bool PackageConfiguration::
     contentLocation_p () const
     {
@@ -268,15 +440,50 @@ 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);
+        }
+    }
+
+    // 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;
+        }
+
+      else
+        {
+          href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          href_->container (this);
+        }
     }
   }
 }
@@ -285,67 +492,121 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    // PackageConfiguration
+    // ComponentPackageImport
     //
 
-    PackageConfiguration::
-    PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    ComponentPackageImport::
+    ComponentPackageImport (::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 == "basePackage")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-          basePackage (t);
+          ::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
+            {
+            }
         }
+    }
 
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
+    // PackageConfiguration
+    //
 
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
+    PackageConfiguration::
+    PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+      :Base__ (e), regulator__ ()
+    {
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "contentLocation")
+      while (p.more_elements ())
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
+          ::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
+            {
+            }
         }
 
-        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
+            {
+            }
         }
-      }
     }
   }
 }
@@ -367,6 +628,20 @@ namespace CIAO
     {
       ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
+      struct ComponentPackageImportTypeInfoInitializer
+      {
+        ComponentPackageImportTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPackageImport));
+          ::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));
+        }
+      };
+
+      ComponentPackageImportTypeInfoInitializer ComponentPackageImportTypeInfoInitializer_;
+
       struct PackageConfigurationTypeInfoInitializer
       {
         PackageConfigurationTypeInfoInitializer ()
@@ -390,6 +665,116 @@ namespace CIAO
   {
     namespace Traversal
     {
+      // ComponentPackageImport
+      //
+      //
+
+      void ComponentPackageImport::
+      traverse (Type& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
+
+      void ComponentPackageImport::
+      traverse (Type const& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
+
+      void ComponentPackageImport::
+      pre (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      pre (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageImport::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);
+          }
+      }
+
+      void ComponentPackageImport::
+      location (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageImport::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);
+          }
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_next (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_next (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_post (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_post (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      post (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      post (Type const&)
+      {
+      }
+
       // PackageConfiguration
       //
       //
@@ -404,14 +789,18 @@ namespace CIAO
         else UUID_none (o);
         if (o.basePackage_p ()) basePackage (o);
         else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        selectRequirement (o);
+        configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -425,14 +814,18 @@ namespace CIAO
         else UUID_none (o);
         if (o.basePackage_p ()) basePackage (o);
         else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        selectRequirement (o);
+        configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -513,37 +906,143 @@ namespace CIAO
       }
 
       void PackageConfiguration::
-      reference (Type& o)
+      specializedConfig (Type& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
+
+      void PackageConfiguration::
+      specializedConfig (Type const& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
+
+      void PackageConfiguration::
+      specializedConfig_none (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      specializedConfig_none (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      importedPackage (Type& o)
       {
-        dispatch (o.reference ());
+        dispatch (o.importedPackage ());
       }
 
       void PackageConfiguration::
-      reference (Type const& o)
+      importedPackage (Type const& o)
       {
-        dispatch (o.reference ());
+        dispatch (o.importedPackage ());
       }
 
       void PackageConfiguration::
-      reference_none (Type&)
+      importedPackage_none (Type&)
       {
       }
 
       void PackageConfiguration::
-      reference_none (Type const&)
+      importedPackage_none (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type const& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
+
+      void PackageConfiguration::
+      referencedPackage_none (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      referencedPackage_none (Type const&)
       {
       }
 
       void PackageConfiguration::
       selectRequirement (Type& o)
       {
-        dispatch (o.selectRequirement ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::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 PackageConfiguration::
       selectRequirement (Type const& o)
       {
-        dispatch (o.selectRequirement ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::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 PackageConfiguration::
+      selectRequirement_pre (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_pre (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type const&)
+      {
       }
 
       void PackageConfiguration::
@@ -559,13 +1058,75 @@ namespace CIAO
       void PackageConfiguration::
       configProperty (Type& o)
       {
-        dispatch (o.configProperty ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::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 PackageConfiguration::
       configProperty (Type const& o)
       {
-        dispatch (o.configProperty ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::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 PackageConfiguration::
+      configProperty_pre (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_pre (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type const&)
+      {
       }
 
       void PackageConfiguration::
@@ -601,6 +1162,28 @@ 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&)
       {
       }
@@ -619,13 +1202,53 @@ namespace CIAO
   {
     namespace Writer
     {
+      // ComponentPackageImport
+      //
+      //
+
+      ComponentPackageImport::
+      ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >& e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ComponentPackageImport::
+      ComponentPackageImport ()
+      {
+      }
+
+      void ComponentPackageImport::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPackageImport::traverse (o);
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+      }
+
+      void ComponentPackageImport::
+      location_next (Type const& o)
+      {
+        location_post (o);
+        location_pre (o);
+      }
+
+      void ComponentPackageImport::
+      location_post (Type const&)
+      {
+        pop_ ();
+      }
+
       // PackageConfiguration
       //
       //
 
       PackageConfiguration::
       PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -665,26 +1288,64 @@ namespace CIAO
       }
 
       void PackageConfiguration::
-      reference (Type const& o)
+      specializedConfig (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reference", top_ ()));
-        Traversal::PackageConfiguration::reference (o);
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
+        Traversal::PackageConfiguration::specializedConfig (o);
         pop_ ();
       }
 
       void PackageConfiguration::
-      selectRequirement (Type const& o)
+      importedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
+        Traversal::PackageConfiguration::importedPackage (o);
+        pop_ ();
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
+        Traversal::PackageConfiguration::referencedPackage (o);
+        pop_ ();
+      }
+
+      void PackageConfiguration::
+      selectRequirement_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
-        Traversal::PackageConfiguration::selectRequirement (o);
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type const& o)
+      {
+        selectRequirement_post (o);
+        selectRequirement_pre (o);
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type const&)
+      {
         pop_ ();
       }
 
       void PackageConfiguration::
-      configProperty (Type const& o)
+      configProperty_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::PackageConfiguration::configProperty (o);
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type const&)
+      {
         pop_ ();
       }
 
@@ -695,6 +1356,15 @@ 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/TAO/CIAO/tools/Config_Handlers/pcd.hpp b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
index 546aab53451..d58c46fc5d9 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,10 +24,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PackageConfiguration;
-  }
+namespace Config_Handlers
+{
+class ComponentPackageImport;
+class PackageConfiguration;
+}
 }
 
 #include <memory>
@@ -43,358 +41,658 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    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_;
-
-      // reference
-      // 
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // selectRequirement
-      // 
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::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 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 CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
-      {
-        virtual void
-        traverse (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
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+location (Type&);
+
+virtual void
+location (Type const&);
+
+virtual void
+location_pre (Type&);
+
+virtual void
+location_pre (Type const&);
+
+virtual void
+location_next (Type&);
+
+virtual void
+location_next (Type const&);
+
+virtual void
+location_post (Type&);
+
+virtual void
+location_post (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+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
+pre (Type&);
+
+virtual void
+pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+basePackage (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+basePackage (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+basePackage_none (Type&);
 
-        virtual void
-        basePackage (Type&);
+virtual void
+basePackage_none (Type const&);
 
-        virtual void
-        basePackage (Type const&);
+virtual void
+specializedConfig (Type&);
 
-        virtual void
-        basePackage_none (Type&);
+virtual void
+specializedConfig (Type const&);
 
-        virtual void
-        basePackage_none (Type const&);
+virtual void
+specializedConfig_none (Type&);
 
-        virtual void
-        reference (Type&);
+virtual void
+specializedConfig_none (Type const&);
 
-        virtual void
-        reference (Type const&);
+virtual void
+importedPackage (Type&);
 
-        virtual void
-        reference_none (Type&);
+virtual void
+importedPackage (Type const&);
 
-        virtual void
-        reference_none (Type const&);
+virtual void
+importedPackage_none (Type&);
 
-        virtual void
-        selectRequirement (Type&);
+virtual void
+importedPackage_none (Type const&);
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+referencedPackage (Type&);
 
-        virtual void
-        selectRequirement_none (Type&);
+virtual void
+referencedPackage (Type const&);
 
-        virtual void
-        selectRequirement_none (Type const&);
+virtual void
+referencedPackage_none (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+referencedPackage_none (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+selectRequirement (Type&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+selectRequirement (Type const&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+selectRequirement_pre (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+selectRequirement_next (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+selectRequirement_post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+selectRequirement_post (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+selectRequirement_none (Type&);
+
+virtual void
+selectRequirement_none (Type const&);
+
+virtual void
+configProperty (Type&);
+
+virtual void
+configProperty (Type const&);
+
+virtual void
+configProperty_pre (Type&);
+
+virtual void
+configProperty_pre (Type const&);
+
+virtual void
+configProperty_next (Type&);
+
+virtual void
+configProperty_next (Type const&);
+
+virtual void
+configProperty_post (Type&);
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+configProperty_none (Type&);
+
+virtual void
+configProperty_none (Type const&);
+
+virtual void
+contentLocation (Type&);
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+contentLocation_none (Type&);
+
+virtual void
+contentLocation_none (Type const&);
+
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct PackageConfiguration : Traversal::PackageConfiguration, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
-        PackageConfiguration (::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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+location_pre (Type &o)
+{
+
+this->location_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_pre (Type const&);
+
+virtual void
+location_next (Type &o)
+{
+
+this->location_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_next (Type const&);
+
+virtual void
+location_post (Type &o)
+{
+
+this->location_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_post (Type const&);
+
+protected:
+ComponentPackageImport ();
+};
+
+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)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
+
+
+virtual void
+label (Type const&);
+
+virtual void
+UUID (Type &o)
+{
+
+this->UUID (const_cast <Type const &> (o));
+}
 
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+UUID (Type const&);
 
+virtual void
+basePackage (Type &o)
+{
+
+this->basePackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+basePackage (Type const&);
+
+virtual void
+specializedConfig (Type &o)
+{
+
+this->specializedConfig (const_cast <Type const &> (o));
+}
+
+
+virtual void
+specializedConfig (Type const&);
+
+virtual void
+importedPackage (Type &o)
+{
+
+this->importedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+importedPackage (Type const&);
+
+virtual void
+referencedPackage (Type &o)
+{
+
+this->referencedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedPackage (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
+virtual void
+selectRequirement_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        label (Type &o)
-        {
+this->selectRequirement_pre (const_cast <Type const &> (o));
+}
 
-          this->label (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        label (Type const&);
+virtual void
+selectRequirement_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        UUID (Type &o)
-        {
+this->selectRequirement_next (const_cast <Type const &> (o));
+}
 
-          this->UUID (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        UUID (Type const&);
+virtual void
+selectRequirement_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        basePackage (Type &o)
-        {
+this->selectRequirement_post (const_cast <Type const &> (o));
+}
 
-          this->basePackage (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        basePackage (Type const&);
+virtual void
+configProperty_pre (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        reference (Type &o)
-        {
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-          this->reference (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_pre (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        reference (Type const&);
+virtual void
+configProperty_next (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        selectRequirement (Type &o)
-        {
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-          this->selectRequirement (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_next (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+configProperty_post (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        configProperty (Type &o)
-        {
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_post (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        configProperty (Type const&);
+virtual void
+contentLocation (Type &o)
+{
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        contentLocation (Type &o)
-        {
+this->contentLocation (const_cast <Type const &> (o));
+}
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
 
+virtual void
+contentLocation (Type const&);
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        contentLocation (Type const&);
+virtual void
+href (Type &o)
+{
 
-        protected:
-        PackageConfiguration ();
-      };
-    }
-  }
+this->href (const_cast <Type const &> (o));
+}
+
+
+virtual void
+href (Type const&);
+
+protected:
+PackageConfiguration ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // PCD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cdp b/TAO/CIAO/tools/Config_Handlers/test.cdp
index 72839f9c8b8..2430859601b 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cdp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cdp
@@ -1,211 +1,1827 @@
 <?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">
 
-  <label>Hello-DeploymentPlan</label>
-
-  <UUID>Hello_Plan_UUID_0001</UUID>
-
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType/>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false&gt;</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source/>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source/>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation>Hello-Sender-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value>
-    </configProperty>
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>testRequirementName</requirementName>
-      <resourceName>testResourceName</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValue</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>hell_event_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>EventPublisher</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <kind>EventConsumer</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>hello_facet_connection</name>
-    <internalEndpoint>
-      <portName>push_message</portName>
-      <kind>Facet</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-<!--
-  <infoProperty>
-    <name>CIAOServerResources</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>input.csr</string>
-      </value>
-    </value>
-  </infoProperty>
--->
+<UUID>8E8594AF-3310-446F-95E2-4440D622D5CE</UUID>
+
+<implementation id="_2D19FD96-440B-48D4-8D68-4E9B466B2BCC">
+<name>RT1H_Combined.ComponentImplementations.Config_Op_Impl.Config_Op</name>
+<source/>
+<artifact>_304555B7-9E3A-4DC5-9535-FA774FAA5070</artifact>
+<artifact>_358C7270-F290-465E-B0E4-5FD390980B44</artifact>
+<artifact>_C4A896EE-C035-45F1-8F14-2320383B1991</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_DA5C3C13-030E-4971-A0BF-8631563EFDF3">
+<name>RT1H_Combined.ComponentImplementations.Planner_One_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_6C7AA3D5-7A09-4DEF-8D49-60A4E1DE173D</artifact>
+<artifact>_1DAD54BC-F7B5-41E3-9FFC-3E0AE255D989</artifact>
+<artifact>_66E9CA12-F886-4760-A9B3-DB1E3F27B920</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_A7DAA16F-D455-4C63-92CE-05B98DD34B15">
+<name>RT1H_Combined.ComponentImplementations.Planner_Three_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_2748D2D1-AAE5-4934-A43F-1639241C4351</artifact>
+<artifact>_556249CC-E874-4BC6-9411-1B33EB2B895B</artifact>
+<artifact>_458C6E27-87CA-4F77-8036-C9F612511B6F</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_A8181747-270E-43FF-B723-50825AA8EA74">
+<name>RT1H_Combined.ComponentImplementations.Env_Dectector_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_1A46D81D-989F-406B-9E87-A57D63ADDF43</artifact>
+<artifact>_208D7378-B123-4F15-B376-CAA58B5CB1E0</artifact>
+<artifact>_5D7CAC69-4E3B-45F9-BACD-B12D3A86AC7A</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_05FAFE3F-76B3-4C6E-A86B-0225B9E76909">
+<name>RT1H_Combined.ComponentImplementations.Effector_Main_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_D40E03AB-CE43-49D6-A7FF-C1231FE98898</artifact>
+<artifact>_840618C0-5513-4389-97A4-C53EB87B29A0</artifact>
+<artifact>_E1AF706E-0B37-480B-8B26-E844FE2E9C3E</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_8D45FC0E-C3DD-4671-926D-A08430B37D37">
+<name>RT1H_Combined.ComponentImplementations.Effector_Secondary_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>__31B2C21F-86C7-4306-AA10-33687687B5D0</artifact>
+<artifact>__C7A0B01C-6C13-4EAA-8527-155035BF1A00</artifact>
+<artifact>__2F43BA6B-2749-4744-B9C4-18F4AEAC16C9</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_2DF6D3BE-F1A2-43E1-BEA0-54576784FF96">
+<name>RT1H_Combined.CUTS_ComponentImplementations.BDC_Implementation.BDC_Monolithic_Impl</name>
+<source/>
+<artifact>__55C2DCD4-30B1-46A3-86B2-229896D74D0D</artifact>
+<artifact>__BF5CDECF-AF12-4876-9B6C-211B7BF0B22F</artifact>
+<artifact>_0E615519-6CC8-4EA5-B67A-65FF73586F04</artifact>
+</implementation>
+
+<implementation id="_BA0C4535-191E-4BE0-9BF4-A054EB2C4139">
+<name>RT1H_Combined.CUTS_ComponentImplementations.BDC_Ex_Implementation.BDC_Ex_Impl</name>
+<source/>
+<artifact>_2DBFA82B-1D1F-48C6-9BDC-014E789E6A77</artifact>
+<artifact>_5CE1793F-38DD-427D-A21E-E6D870E769E4</artifact>
+<artifact>_0B8A6C29-8962-4DA6-99F4-25FEECD77E97</artifact>
+</implementation>
+
+<implementation id="_D98AF36F-11FA-43A4-8FAD-C14A461437FF">
+<name>RT1H_Combined.RACE_ComponentImplementations.ControllerImplementation.ControllerMonolithicImpl</name>
+<source/>
+<artifact>__032AE7B6-3ABD-478A-B0D7-56BC4AAEF0B7</artifact>
+<artifact>__00B105AB-50F5-49B7-A822-9B267F2D8896</artifact>
+<artifact>__BF4AE6A2-BE32-4B8E-9919-C812EC18BF00</artifact>
+</implementation>
+
+<implementation id="_CA363CD1-4E23-4A4B-B25B-C38B939E2B25">
+<name>RT1H_Combined.RACE_ComponentImplementations.TargetManagerImplImplementation.TargetManagerImplMonolithicImpl</name>
+<source/>
+<artifact>__C22D0B06-6CDA-4652-B1CE-586E0C23251F</artifact>
+<artifact>__9CB3A43B-397F-4FA9-97AA-EBFC3A22BFEC</artifact>
+<artifact>__0F176DA2-9953-482A-9268-7DA5E69A88FE</artifact>
+</implementation>
+
+<implementation id="_7A233158-69BB-4382-BDE0-72432BF3D48E">
+<name>RT1H_Combined.RA_ComponentImplementations.AnalyzerImplementation.AnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__315FC65C-0582-4E0E-BB8B-C23A1238C67F</artifact>
+<artifact>__7AD332BC-90DC-4E7D-B026-8D5053F2552E</artifact>
+<artifact>__84974D39-AE18-4C0A-B81A-B1EC349E93BB</artifact>
+</implementation>
+
+<implementation id="_14E77757-BC3A-49F4-8D45-FB447FA7F626">
+<name>RT1H_Combined.RA_ComponentImplementations.SimpleAllocationAnalyzerImplementation.SimpleAllocationAnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__6BDE830C-FFA8-4F2D-9733-34F02F35020F</artifact>
+<artifact>__138A0FE1-D8AA-4C1E-BB5E-4EC9714F4CA8</artifact>
+<artifact>__621F3412-C507-4945-836B-CF9B81BDCC99</artifact>
+</implementation>
+
+<implementation id="_E4DC8736-E532-44DC-9C9B-789EBA3D6B27">
+<name>RT1H_Combined.RA_ComponentImplementations.Input_AdapterImplementation.Input_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__DC22BCBB-DB20-4072-AA64-161AFD7A9C10</artifact>
+<artifact>__3E362049-0CF5-4F01-905F-67CAD769FFD5</artifact>
+<artifact>__3B466B60-F8C2-4E48-A6E4-3D3D7EED9F03</artifact>
+</implementation>
+
+<implementation id="_73898E70-9FB1-4881-9313-A2DE181EE48E">
+<name>RT1H_Combined.RA_ComponentImplementations.Interactive_Input_AdapterImplementation.Interactive_Input_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__AD4B52E0-103C-49E2-BE47-29CAE978676F</artifact>
+<artifact>__E4AF24BF-5A39-46B1-8217-6343D7D53298</artifact>
+<artifact>__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C</artifact>
+</implementation>
+
+<implementation id="_796D9731-1CD9-4855-83F2-025AECB90C93">
+<name>RT1H_Combined.RA_ComponentImplementations.Output_AdapterImplementation.Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__864DB99C-C60B-4FDD-A47D-AFD5C1599892</artifact>
+<artifact>__D6EB8E01-F794-4C43-AB14-A3AFB9767D01</artifact>
+<artifact>__4C78C4F9-FEF4-45AA-84A4-FFB10255A1EC</artifact>
+</implementation>
+
+<implementation id="_A22015F9-9BC9-4767-A861-FAFF737E074B">
+<name>RT1H_Combined.RA_ComponentImplementations.Output_ManagerImplementation.Output_ManagerMonolithicImpl</name>
+<source/>
+<artifact>__AB498B7F-A0E8-4F59-BF24-BBB9D125EED3</artifact>
+<artifact>__1BB4CD4A-38A8-4BBA-9303-4A10F5B8BC57</artifact>
+<artifact>__280E6118-F4C7-4DE4-A0A4-A50637282EAE</artifact>
+</implementation>
+
+<implementation id="_219DB379-DB2E-44D2-8308-D91FC5A42A9D">
+<name>RT1H_Combined.RA_ComponentImplementations.DAnCE_Output_AdapterImplementation.DAnCE_Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__A47095F9-2E08-485E-96B4-CC0829051DF3</artifact>
+<artifact>__E54AE941-14CA-48FC-BAAA-1B93269EF79B</artifact>
+<artifact>__ACA6BD67-D92A-4DBF-827A-7C0B15EA3F6D</artifact>
+</implementation>
+
+<implementation id="_5A98D073-1392-4C85-AB88-1AD6E61BF34D">
+<name>RT1H_Combined.RA_ComponentImplementations.XML_Output_AdapterImplementation.XML_Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__CF7C6C9B-C6E3-4356-B9F1-598FA0B4A5B7</artifact>
+<artifact>__437B6234-9DD3-40E4-9AE0-0923EBAF4548</artifact>
+<artifact>__E2F1EA75-127C-4579-B692-ADD1026C6F23</artifact>
+</implementation>
+
+<implementation id="_571F6ECC-579F-4F69-88AB-EA1603B422E8">
+<name>RT1H_Combined.RA_ComponentImplementations.PlannerImplementation.PlannerMonolithicImpl</name>
+<source/>
+<artifact>__B28C1F32-0231-4F7F-8FE2-164321942B87</artifact>
+<artifact>__2021EE2F-3480-4BF9-9A3A-D146A99D251D</artifact>
+<artifact>__D952F988-841F-43BA-9650-86846B08DF5F</artifact>
+</implementation>
+
+<implementation id="_38C5B64C-72FD-48FF-B095-260669E2A488">
+<name>RT1H_Combined.RA_ComponentImplementations.SimpleBinPackerImplementation.SimpleBinPackerMonolithicImpl</name>
+<source/>
+<artifact>__2B5FE9E6-AF4C-4BC1-92A2-58101B2ECCA8</artifact>
+<artifact>__4D375D8F-5470-4236-8614-EF07D08020E3</artifact>
+<artifact>__D6176B6C-58E4-43D4-BFC9-3DCF98249044</artifact>
+</implementation>
+
+<implementation id="_FD120510-765E-4B02-803D-7DADF3F5E4E6">
+<name>RT1H_Combined.RA_ComponentImplementations.Planner_ManagerImplementation.Planner_ManagerMonolithicImpl</name>
+<source/>
+<artifact>__5B614077-C99E-428C-B8BE-252ADD7905B7</artifact>
+<artifact>__0BEB188E-3967-4D91-A6A1-CDF08EF81718</artifact>
+<artifact>__A65A1FA0-8F4D-4807-9AE9-90D344154D2C</artifact>
+</implementation>
+
+<implementation id="_5D6641D2-640C-4F80-B055-10DC69C7A636">
+<name>RT1H_Combined.RA_ComponentImplementations.Plan_AnalyzerImplementation.Plan_AnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__1CC443DF-7EE3-4130-8ACE-EE4181AC96CD</artifact>
+<artifact>__57123764-8624-4D79-9C5B-7ADF929536E6</artifact>
+<artifact>__CDC7061A-483C-447B-8151-E68250566E86</artifact>
+</implementation>
+
+<instance id="_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector1</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_AC6DB008-DCCB-45D7-B52D-628B74B49AC9">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector2</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_7529501D-B22A-42F9-A75B-0E71DC97D3AA">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetecto3</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_FEBD6AD3-6310-4E25-A0E5-957DED0B6509">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector4</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector3</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_EC0045E5-7501-4E2B-B755-D8CE22BF4816">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector2</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_57B08287-3528-4862-9110-ACACD713360B">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector4</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_AB189D2B-6D86-4020-88BD-74DBECC7F7B8">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Planner_Three</name>
+<node>blade39</node>
+<source/>
+<implementation>_A7DAA16F-D455-4C63-92CE-05B98DD34B15</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Planner_Three.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_002D7B3A-A628-43E3-AD53-B1AB8636001E">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Planner_One</name>
+<node>blade42</node>
+<source/>
+<implementation>_DA5C3C13-030E-4971-A0BF-8631563EFDF3</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Planner_One.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_015ACD88-117F-42C9-8D04-3FFAB9F6C98E">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector_Main</name>
+<node>blade41</node>
+<source/>
+<implementation>_05FAFE3F-76B3-4C6E-A86B-0225B9E76909</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Main.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_34C61830-1F54-494F-95DE-4003BCD428C5">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Config_Op</name>
+<node>blade40</node>
+<source/>
+<implementation>_2D19FD96-440B-48D4-8D68-4E9B466B2BCC</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Config_Op.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_7AE0BE73-48F8-4717-A5FF-524D454C58DD">
+<name>RT1H_Combined.ComponentImplementations.RACE.RACE.Benchmark_Data_Collector_Ex</name>
+<node>blade10</node>
+<source/>
+<implementation>_BA0C4535-191E-4BE0-9BF4-A054EB2C4139</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>BDC_Ex.ior</string>
+</value>
+</value>
+</configProperty>
+<configProperty>
+<name>server_name</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>blade10.isislab.vanderbilt.edu</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>assessment_assessment</name>
+<internalEndpoint>
+<portName>assessment</portName>
+<kind>EventPublisher</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>assessment</portName>
+<kind>EventConsumer</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>situation_situation</name>
+<internalEndpoint>
+<portName>situation</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>situation</portName>
+<kind>EventConsumer</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<artifact id="_358C7270-F290-465E-B0E4-5FD390980B44">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_stub</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_304555B7-9E3A-4DC5-9535-FA774FAA5070">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_svnt</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Config_Op_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_C4A896EE-C035-45F1-8F14-2320383B1991">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_exec</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Config_Op_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_208D7378-B123-4F15-B376-CAA58B5CB1E0">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Detector_exec</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Env_Detector_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_5D7CAC69-4E3B-45F9-BACD-B12D3A86AC7A">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Dectector_stub</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_1A46D81D-989F-406B-9E87-A57D63ADDF43">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Detector_svnt</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Env_Detector_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_1DAD54BC-F7B5-41E3-9FFC-3E0AE255D989">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_stub</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_6C7AA3D5-7A09-4DEF-8D49-60A4E1DE173D">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_svnt</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_One_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_66E9CA12-F886-4760-A9B3-DB1E3F27B920">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_exec</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_One_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__C7A0B01C-6C13-4EAA-8527-155035BF1A00">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_svnt</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Secondary_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__31B2C21F-86C7-4306-AA10-33687687B5D0">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_stub</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="__2F43BA6B-2749-4744-B9C4-18F4AEAC16C9">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_exec</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Secondary_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_840618C0-5513-4389-97A4-C53EB87B29A0">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_svnt</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Main_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_E1AF706E-0B37-480B-8B26-E844FE2E9C3E">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_exec</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Main_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_D40E03AB-CE43-49D6-A7FF-C1231FE98898">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_stub</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_556249CC-E874-4BC6-9411-1B33EB2B895B">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_svnt</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_Three_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_458C6E27-87CA-4F77-8036-C9F612511B6F">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_exec</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_Three_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_2748D2D1-AAE5-4934-A43F-1639241C4351">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_stub</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="__55C2DCD4-30B1-46A3-86B2-229896D74D0D">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_stub</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_stub</location>
+</artifact>
+
+<artifact id="__BF5CDECF-AF12-4876-9B6C-211B7BF0B22F">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_svnt</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_0E615519-6CC8-4EA5-B67A-65FF73586F04">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_exec</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_0B8A6C29-8962-4DA6-99F4-25FEECD77E97">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_exec</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Ex_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_5CE1793F-38DD-427D-A21E-E6D870E769E4">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_stub</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_stub</location>
+</artifact>
+
+<artifact id="_2DBFA82B-1D1F-48C6-9BDC-014E789E6A77">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_svnt</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Ex_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__032AE7B6-3ABD-478A-B0D7-56BC4AAEF0B7">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_stub</name>
+<source/>
+<node/>
+<location>Controller_stub</location>
+</artifact>
+
+<artifact id="__00B105AB-50F5-49B7-A822-9B267F2D8896">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_svnt</name>
+<source/>
+<node/>
+<location>Controller_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Controller_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__BF4AE6A2-BE32-4B8E-9919-C812EC18BF00">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_exec</name>
+<source/>
+<node/>
+<location>Controller_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Controller_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__C22D0B06-6CDA-4652-B1CE-586E0C23251F">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_stub</name>
+<source/>
+<node/>
+<location>TargetManager_stub</location>
+</artifact>
+
+<artifact id="__9CB3A43B-397F-4FA9-97AA-EBFC3A22BFEC">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_svnt</name>
+<source/>
+<node/>
+<location>TargetManager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_TargetManagerHome_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__0F176DA2-9953-482A-9268-7DA5E69A88FE">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_exec</name>
+<source/>
+<node/>
+<location>TargetManager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_TargetManagerHome_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__315FC65C-0582-4E0E-BB8B-C23A1238C67F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_stub</name>
+<source/>
+<node/>
+<location>Analyzer_stub</location>
+</artifact>
+
+<artifact id="__7AD332BC-90DC-4E7D-B026-8D5053F2552E">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_svnt</name>
+<source/>
+<node/>
+<location>Analyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Analyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__84974D39-AE18-4C0A-B81A-B1EC349E93BB">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_exec</name>
+<source/>
+<node/>
+<location>Analyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Analyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__6BDE830C-FFA8-4F2D-9733-34F02F35020F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_stub</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_stub</location>
+</artifact>
+
+<artifact id="__138A0FE1-D8AA-4C1E-BB5E-4EC9714F4CA8">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_svnt</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleAllocationAnalyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__621F3412-C507-4945-836B-CF9B81BDCC99">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_exec</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleAllocationAnalyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__DC22BCBB-DB20-4072-AA64-161AFD7A9C10">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_stub</name>
+<source/>
+<node/>
+<location>Input_Adapter_stub</location>
+</artifact>
+
+<artifact id="__3E362049-0CF5-4F01-905F-67CAD769FFD5">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Input_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Input_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__3B466B60-F8C2-4E48-A6E4-3D3D7EED9F03">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_exec</name>
+<source/>
+<node/>
+<location>Input_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Input_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__AD4B52E0-103C-49E2-BE47-29CAE978676F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_stub</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_stub</location>
+</artifact>
+
+<artifact id="__E4AF24BF-5A39-46B1-8217-6343D7D53298">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Interactive_Input_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_exec</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Interactive_Input_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__864DB99C-C60B-4FDD-A47D-AFD5C1599892">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__D6EB8E01-F794-4C43-AB14-A3AFB9767D01">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__4C78C4F9-FEF4-45AA-84A4-FFB10255A1EC">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__AB498B7F-A0E8-4F59-BF24-BBB9D125EED3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_stub</name>
+<source/>
+<node/>
+<location>Output_Manager_stub</location>
+</artifact>
+
+<artifact id="__1BB4CD4A-38A8-4BBA-9303-4A10F5B8BC57">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_svnt</name>
+<source/>
+<node/>
+<location>Output_Manager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Manager_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__280E6118-F4C7-4DE4-A0A4-A50637282EAE">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_exec</name>
+<source/>
+<node/>
+<location>Output_Manager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Manager_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__A47095F9-2E08-485E-96B4-CC0829051DF3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__E54AE941-14CA-48FC-BAAA-1B93269EF79B">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_DAnCE_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__ACA6BD67-D92A-4DBF-827A-7C0B15EA3F6D">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_DAnCE_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__CF7C6C9B-C6E3-4356-B9F1-598FA0B4A5B7">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__437B6234-9DD3-40E4-9AE0-0923EBAF4548">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_XML_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__E2F1EA75-127C-4579-B692-ADD1026C6F23">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_XML_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__B28C1F32-0231-4F7F-8FE2-164321942B87">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_stub</name>
+<source/>
+<node/>
+<location>Planner_stub</location>
+</artifact>
+
+<artifact id="__2021EE2F-3480-4BF9-9A3A-D146A99D251D">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_svnt</name>
+<source/>
+<node/>
+<location>Planner_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__D952F988-841F-43BA-9650-86846B08DF5F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_exec</name>
+<source/>
+<node/>
+<location>Planner_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__2B5FE9E6-AF4C-4BC1-92A2-58101B2ECCA8">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_stub</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_stub</location>
+</artifact>
+
+<artifact id="__4D375D8F-5470-4236-8614-EF07D08020E3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_svnt</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleBinPacker_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__D6176B6C-58E4-43D4-BFC9-3DCF98249044">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_exec</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleBinPacker_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__5B614077-C99E-428C-B8BE-252ADD7905B7">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_stub</name>
+<source/>
+<node/>
+<location>Planner_Manager_stub</location>
+</artifact>
+
+<artifact id="__0BEB188E-3967-4D91-A6A1-CDF08EF81718">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_svnt</name>
+<source/>
+<node/>
+<location>Planner_Manager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Manager_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__A65A1FA0-8F4D-4807-9AE9-90D344154D2C">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_exec</name>
+<source/>
+<node/>
+<location>Planner_Manager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Manager_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__1CC443DF-7EE3-4130-8ACE-EE4181AC96CD">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_stub</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_stub</location>
+</artifact>
+
+<artifact id="__57123764-8624-4D79-9C5B-7ADF929536E6">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_svnt</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Plan_Analyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__CDC7061A-483C-447B-8151-E68250566E86">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_exec</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Plan_Analyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
 </Deployment:deploymentPlan>
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index 2f77796921c..ba951491409 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cpp
@@ -33,10 +33,10 @@ parse_args (int argc, char *argv[])
                            "-i <input file> "
                            "\n",
                            argv [0]),
-                          -1); 
+                          -1);
       }
   // Indicates sucessful parsing of the command-line
-  return 0;  
+  return 0;
 }
 
 // Check to see if SRD was imported.
@@ -47,42 +47,43 @@ using namespace CIAO::Config_Handlers;
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  
+
   if (parse_args (argc, argv) != 0)
     return 1;
 
   // Initialize an ORB so Any will work
   CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
-
+  ACE_UNUSED_ARG (orb);
+  
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
-  
+
   if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
-  {
+    {
       //Read in the XSC type structure from the DOMDocument
       DeploymentPlan dp = deploymentPlan (doc);
 
       //Convert the XSC to an IDL datatype
 
       DP_Handler dp_handler (dp);
-      
+
       std::cout << "Instance document import succeeded.  Dumping contents to file\n";
 
       //Retrieve the newly created IDL structure
       Deployment::DeploymentPlan *idl = dp_handler.plan();
-      
+
       // Check for server resources, if present....
       check_srd (*idl);
-      
+
       //Convert it back to an XSC structure with a new DP_Handler
       DP_Handler reverse_handler(*idl);
-      
+
       //Create a new DOMDocument for writing the XSC into XML
       xercesc::DOMDocument* the_xsc (the_helper.create_dom(0));
 
       //Serialize the XSC into a DOMDocument
       deploymentPlan(*reverse_handler.xsc(), the_xsc);
-      
+
 
       //Write it to test.xml
       the_helper.write_DOM(the_xsc, "test.xml");
@@ -90,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //Cleanliness is next to Godliness
       delete doc;
     }
-  
+
   std::cout << "Test completed!\n";
 
   return 0;
@@ -107,7 +108,7 @@ void check_srd (const Deployment::DeploymentPlan &dp)
                           "CIAOServerResources") == 0)
         {
           CIAO::DAnCE::ServerResource *test;
-          
+
           if (dp.infoProperty[i].value >>= test)
             std::cerr << "ServerResources found and successfully extracted." << std::endl;
           else
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp b/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
index a12f1510cbe..25c9a04929d 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
@@ -3,12 +3,12 @@
  *
  * 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>
  */
- 
+
 #include "toplevel.hpp"
 
 namespace CIAO
@@ -16,79 +16,49 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TopLevelPackageDescription
-    // 
+    //
 
     TopLevelPackageDescription::
-    TopLevelPackageDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+    TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__)
+      :
+      ::XSCRT::Type (),
+      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (package__)),
+      regulator__ ()
     {
+      package_->container (this);
     }
 
     TopLevelPackageDescription::
     TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
-    :
-    ::XSCRT::Type (),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (*s.package_)),
+      regulator__ ()
     {
-      {
-        for (package_const_iterator i (s.package_.begin ());
-        i != s.package_.end ();
-        ++i) add_package (*i);
-      }
+      package_->container (this);
     }
 
     ::CIAO::Config_Handlers::TopLevelPackageDescription& TopLevelPackageDescription::
     operator= (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
     {
-      package_.clear ();
-      {
-        for (package_const_iterator i (s.package_.begin ());
-        i != s.package_.end ();
-        ++i) add_package (*i);
-      }
+      package (s.package ());
 
       return *this;
     }
 
 
     // TopLevelPackageDescription
-    // 
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    begin_package ()
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    end_package ()
-    {
-      return package_.end ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    begin_package () const
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    end_package () const
+    //
+    ::CIAO::Config_Handlers::PackageConfiguration const& TopLevelPackageDescription::
+    package () const
     {
-      return package_.end ();
+      return *package_;
     }
 
     void TopLevelPackageDescription::
-    add_package (::CIAO::Config_Handlers::PackageConfiguration const& e)
+    package (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      package_.push_back (e);
-    }
-
-    size_t TopLevelPackageDescription::
-    count_package(void) const
-    {
-      return package_.size ();
+      *package_ = e;
     }
   }
 }
@@ -102,26 +72,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 == "package")
-        {
-          ::CIAO::Config_Handlers::PackageConfiguration t (e);
-          add_package (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
+            {
+            }
         }
-      }
     }
   }
 }
@@ -199,75 +169,13 @@ namespace CIAO
       void TopLevelPackageDescription::
       package (Type& o)
       {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
+        dispatch (o.package ());
       }
 
       void TopLevelPackageDescription::
       package (Type const& o)
       {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_const_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
+        dispatch (o.package ());
       }
 
       void TopLevelPackageDescription::
@@ -295,7 +203,7 @@ namespace CIAO
 
       TopLevelPackageDescription::
       TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -311,21 +219,10 @@ namespace CIAO
       }
 
       void TopLevelPackageDescription::
-      package_pre (Type const&)
+      package (Type const& o)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("package", top_ ()));
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const& o)
-      {
-        package_post (o);
-        package_pre (o);
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
+        Traversal::TopLevelPackageDescription::package (o);
         pop_ ();
       }
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
index 9f0071f18d0..d828adf7ece 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -1,18 +1,15 @@
 /* $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>
- */
-
-
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
- 
+* 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.
 #ifdef __BORLANDC__
@@ -27,10 +24,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class TopLevelPackageDescription;
-  }
+namespace Config_Handlers
+{
+class TopLevelPackageDescription;
+}
 }
 
 #include <memory>
@@ -41,187 +38,130 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      // package
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::iterator package_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator package_const_iterator;
-      package_iterator begin_package ();
-      package_iterator end_package ();
-      package_const_iterator begin_package () const;
-      package_const_iterator end_package () const;
-      void add_package (::CIAO::Config_Handlers::PackageConfiguration const& );
-      size_t count_package (void) const;
+// package
+//
+public:
+::CIAO::Config_Handlers::PackageConfiguration const& package () const;
+void package (::CIAO::Config_Handlers::PackageConfiguration const& );
 
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::PackageConfiguration > package_;
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_;
 
-      public:
-      TopLevelPackageDescription ();
+public:
+TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__);
 
-      TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      TopLevelPackageDescription (TopLevelPackageDescription const& s);
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+TopLevelPackageDescription (TopLevelPackageDescription const& s);
 
-      TopLevelPackageDescription&
-      operator= (TopLevelPackageDescription const& s);
+TopLevelPackageDescription&
+operator= (TopLevelPackageDescription const& s);
 
-      private:
-      char regulator__;
-    };
-  }
+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 TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        package (Type&);
-
-        virtual void
-        package (Type const&);
-
-        virtual void
-        package_pre (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        package_pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        package_next (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        package_next (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        package_post (Type&);
+virtual void
+package (Type&);
 
-        virtual void
-        package_post (Type const&);
+virtual void
+package (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 TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
-        TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-        #ifdef __BORLANDC__
-        virtual void 
-        traverse (Type &o)
-        {
-
-          this->traverse (const_cast <Type const &> (o));
-        }
-
-
-        #endif /* __BORLANDC__ */
-        virtual void
-        traverse (Type const&);
-
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        package_pre (Type &o)
-        {
-
-          this->package_pre (const_cast <Type const &> (o));
-        }
-
-
-        #endif /* __BORLANDC__ */
-        virtual void
-        package_pre (Type const&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        package_next (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->package_next (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        package_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        // Hack to make borland stop complaining.  
-        #ifdef __BORLANDC__
-        virtual void 
-        package_post (Type &o)
-        {
+virtual void
+package (Type &o)
+{
 
-          this->package_post (const_cast <Type const &> (o));
-        }
+this->package (const_cast <Type const &> (o));
+}
 
 
-        #endif /* __BORLANDC__ */
-        virtual void
-        package_post (Type const&);
+virtual void
+package (Type const&);
 
-        protected:
-        TopLevelPackageDescription ();
-      };
-    }
-  }
+protected:
+TopLevelPackageDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // TOPLEVEL_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/vc6-4786.h b/TAO/CIAO/tools/Config_Handlers/vc6-4786.h
deleted file mode 100644
index ab8457de1cd..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/vc6-4786.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file vc6-4786.h
- * @author Will Otte <wotte@dre.vanderbilt.edu
- * $Id$
- * Silences that nefarious 4786 warning in a bit cleaner way
- * than sprinkling the same preprocessor directives all over the code.
- */
-
-#ifndef VC6_4786_H_
-# define VC6_4786_H_
-# if defined (_MSC_VER) && (_MSC_VER < 1300)
-#  pragma warning (disable: 4786)
-# endif
-#endif /* VC6_4786_H_ */
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
index 3592635634e..f70b062b77a 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -27,8 +27,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "idl_bool.h"
-
 class AST_Generator;
 
 // Defines a class containing all back end global data.
@@ -55,25 +53,25 @@ public:
 
   const char* output_dir (void) const;
   void output_dir (const char* s);
-  
+
   void parse_args (long &i, char **av);
   // Parse args that affect the backend.
-  
+
   void prep_be_arg (char *s);
   // Special BE arg call factored out of DRV_args.
-  
+
   void arg_post_proc (void);
   // Checks made after parsing args.
-  
+
   void usage (void) const;
   // Usage message for backend options.
-  
+
   AST_Generator *generator_init (void);
   // Create an AST node generator.
-  
+
   void destroy (void);
   // Cleanup.
-  
+
 private:
   char *filename_;
   // Name of the IDL file we are processing.
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_init.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/be_init.cpp
index f74e4d2a5b6..0fbfcf6fdf2 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_init.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_init.cpp
@@ -16,7 +16,7 @@ BE_version (void)
 TAO_IDL3_TO_IDL2_BE_Export int
 BE_init (int & /* argc */, char * /* argv */ [])
 {
-  idl_global->pass_orb_idl (I_TRUE);
+  idl_global->pass_orb_idl (true);
   return 0;
 }
 
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
index fe0810a4202..71c67116ab1 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
@@ -9,8 +9,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (be, 
-           be_sunsoft, 
+ACE_RCSID (be,
+           be_sunsoft,
            "$Id$")
 
 TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
@@ -34,8 +34,8 @@ TAO_SunSoft_OutStream::print (Identifier *id)
 TAO_OutStream &
 TAO_SunSoft_OutStream::print (UTL_IdList *idl)
 {
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
   Identifier *id = 0;
 
   for (UTL_IdListActiveIterator i (idl); !i.is_done (); i.next ())
@@ -46,7 +46,7 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       // Print the identifier.
@@ -58,11 +58,11 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl)
           if (ACE_OS::strcmp (id->get_string (), "") != 0)
             {
               // Does not start with a "".
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
@@ -126,8 +126,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX)
             this->TAO_OutStream::print ("%hd", ev->u.cval);
           else if (isprint (ev->u.cval))
-	          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-	        else if (iscntrl (ev->u.cval))
+            this->TAO_OutStream::print ("'%c'", ev->u.cval);
+          else if (iscntrl (ev->u.cval))
             switch (ev->u.cval)
               {
                 case '\n':
@@ -157,8 +157,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
               default:
                 this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
               }
- 	        else
-	          this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
+           else
+            this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
           this->TAO_OutStream::print ("L'%lc'", ev->u.wcval);
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 99a9f7bc7db..11792c4e319 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -49,13 +49,13 @@ idl3_to_idl2_visitor::~idl3_to_idl2_visitor (void)
   this->os = 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_decl (AST_Decl *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
 {
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
@@ -63,12 +63,12 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
        si.next ())
     {
       AST_Decl *d = si.item ();
-      
+
       if (d->node_type () == AST_Decl::NT_pre_defined)
         {
           continue;
         }
-        
+
       // Want to skip the uses_xxxConnection structs added by uses
       // multiple ports.
       // @@@ (JP) This will go away when the visitor is finished, since
@@ -78,7 +78,7 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
         {
           continue;
         }
-      
+
       if (d->ast_accept (this) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,38 +87,38 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
                             -1);
         }
     }
-       
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_type (AST_Type *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_predefined_type (AST_PredefinedType *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_module (AST_Module *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "module " << node->local_name () << be_nl
       << "{" << be_idt;
-      
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-            
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -126,37 +126,37 @@ idl3_to_idl2_visitor::visit_module (AST_Module *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_interface (AST_Interface *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_local ())
     {
       *os << "local ";
     }
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
-    } 
-    
+    }
+
   *os << "interface " << node->local_name ();
-  
+
   AST_Interface **parents = node->inherits ();
-  
+
   for (long i = 0; i < node->n_inherits (); ++i)
     {
       if (i == 0)
@@ -167,16 +167,16 @@ idl3_to_idl2_visitor::visit_interface (AST_Interface *node)
         {
           *os << ", ";
         }
-        
+
       *os << parents[i]->name ();
     }
-  
+
   *os << be_nl
       << "{" << be_idt;
-      
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-      
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -184,53 +184,53 @@ idl3_to_idl2_visitor::visit_interface (AST_Interface *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_local ())
     {
       *os << "local ";
     }
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
-    } 
-    
+    }
+
   *os << "interface " << node->local_name () << ";";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuebox (AST_ValueBox *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "valuetype " << node->local_name ();
-      
+
   AST_Type *bt = node->boxed_type ();
-      
+
   // Keep output statements separate because of side effects.
-  
+
   if (bt->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (bt, node);
@@ -239,41 +239,41 @@ idl3_to_idl2_visitor::visit_valuebox (AST_ValueBox *node)
     {
       *os << this->type_name (bt);
     }
-   
+
   *os << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
     }
-    
+
   if (node->custom ())
     {
       *os << "custom ";
     }
-    
+
   *os << "valuetype " << node->local_name ();
-  
-  AST_Decl::NodeType nt = node->node_type ();    
+
+  AST_Decl::NodeType nt = node->node_type ();
   AST_Interface **parents = node->inherits ();
   long ninherits = node->n_inherits ();
-  
-  long i = 0; 
+
+  long i = 0;
   for (i = 0; i < ninherits; ++i)
     {
       if (i == 0)
@@ -284,18 +284,18 @@ idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
         {
           *os << ", ";
         }
-        
+
       *os << parents[i]->name ();
     }
-    
+
   if (nt == AST_Decl::NT_eventtype)
     {
       *os << (ninherits == 0 ? " : " : ", ")
           << "Components::EventBase";
     }
-    
+
   AST_Interface **supports = node->supports ();
-  
+
   for (i = 0; i < node->n_supports (); ++i)
     {
       if (i == 0)
@@ -306,16 +306,16 @@ idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
         {
           *os << ", ";
         }
-        
+
       *os << supports[i]->name ();
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-            
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-      
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -323,30 +323,30 @@ idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
     }
-    
+
   (void) node->node_type ();
-    
+
   *os << "valuetype " << node->local_name () << ";";
 
   return 0;
@@ -359,26 +359,26 @@ idl3_to_idl2_visitor::visit_component (AST_Component *node)
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "interface " << node->local_name ();
-    
+
   AST_Component *base = node->base_component ();
   long nsupports = node->n_supports ();
-  
-  *os << " : " 
+
+  *os << " : "
       << (base != 0 ? base->full_name () : "Components::CCMObject");
-  
+
   for (long i = 0; i < nsupports; ++i)
     {
       *os << ", " << node->supports ()[i]->name ();
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-  
+
   this->check_id_and_version (node);
-  
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -386,42 +386,42 @@ idl3_to_idl2_visitor::visit_component (AST_Component *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
+
   this->gen_provides (node);
   this->gen_uses (node);
   this->gen_publishes (node);
   this->gen_emits (node);
   this->gen_consumes (node);
-    
+
   *os << be_uidt_nl
       << "};";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_component_fwd (AST_ComponentFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "component " << node->local_name () << ";";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   if (this->visit_valuetype (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -429,20 +429,20 @@ idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
                           "codegen for valuetype failed\n"),
                         -1);
     }
-  
+
   *os << be_nl << be_nl
       << "interface " << node->local_name () << "Consumer : ";
-      
+
   AST_Interface *parent = 0;
   AST_Decl::NodeType nt = AST_Decl::NT_native;
-      
+
   if (node->n_inherits () > 0)
     {
       parent = node->inherits ()[0];
       AST_Type *ut = parent->unaliased_type ();
       nt = ut->node_type ();
     }
-      
+
   if (node->n_inherits () == 0 || nt == AST_Decl::NT_valuetype)
     {
       *os << "Components::EventConsumerBase";
@@ -451,25 +451,25 @@ idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
     {
       *os << node->inherits ()[0]->name () << "Consumer";
     }
-      
+
   *os << be_nl
       << "{" << be_idt_nl
       << "void push_" << node->local_name () << " (in "
       << node->local_name () << " the_"
       << node->local_name () << ");" << be_uidt_nl
       << "};";
-     
-  return 0; 
+
+  return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   if (this->visit_valuetype_fwd (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -477,10 +477,10 @@ idl3_to_idl2_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
                           "codegen for valuetype_fwd failed\n"),
                         -1);
     }
-    
+
   *os << be_nl
       << "interface " << node->local_name () << "Consumer;";
-      
+
   return 0;
 }
 
@@ -491,15 +491,15 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
     {
       return 0;
     }
-    
+
   ACE_CString explicit_name = node->local_name ()->get_string ();
   explicit_name += "Explicit";
-  
+
   *os << be_nl << be_nl
       << "interface " << explicit_name.c_str () << " : ";
-      
+
   AST_Home *base = node->base_home ();
-  
+
   if (base == 0)
     {
       *os << "Components::CCMHome";
@@ -508,89 +508,89 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
     {
       *os << base->name () << "Explicit";
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-    
+
   this->check_id_and_version (node);
-  
+
   // Create a temporary interface node corresponding to the one we
   // just generated above for the home explicit interface.
-  UTL_ScopedName *sn = 
+  UTL_ScopedName *sn =
     this->create_scoped_name (0,
                               explicit_name.c_str (),
                               0,
                               ScopeAsDecl (node->defined_in ()));
-                      
+
   AST_Interface xplicit (sn,
                          0,
                          0,
                          0,
                          0,
-                         I_FALSE,
-                         I_FALSE);
+                         false,
+                         false);
   xplicit.set_defined_in (node->defined_in ());
 
   // Reset the home's decls to be defined in the explicit home interface.
   this->tranfer_scope_elements (node, xplicit);
-  
+
   this->gen_factories (node, xplicit);
   this->gen_finders (node, xplicit);
-    
+
   *os << be_uidt_nl
       << "};" << be_nl << be_nl;
-      
+
   xplicit.destroy ();
   sn->destroy ();
   delete sn;
   sn = 0;
-      
+
   AST_ValueType *key = node->primary_key ();
-     
-  // Generate the implicit home interface and its operations.   
+
+  // Generate the implicit home interface and its operations.
   *os << "interface " << node->local_name () << "Implicit"
       << (key == 0 ? " : Components::KeylessCCMHome" : "")
       << be_nl
       << "{" << be_idt_nl
       << node->managed_component ()->name () << " create (";
-      
+
   if (key != 0)
     {
       *os << "in " << key->name () << " key";
     }
-    
+
   *os << ")" << be_idt_nl
       << "raises (Components::CreateFailure";
-      
+
   if (key != 0)
     {
       *os << ", Components::InvalidKey, Components::DuplicateKeyValue";
     }
-    
+
   *os << ");" << be_uidt;
-  
+
   if (key != 0)
     {
       *os << be_nl << be_nl
-          << node->managed_component ()->name () 
-          << " find_by_primary_key (in " << key->name () 
+          << node->managed_component ()->name ()
+          << " find_by_primary_key (in " << key->name ()
           << " key)" << be_idt_nl
           << "raises (Components::InvalidKey, Components::UnknownKeyValue, "
           << "Components::FinderFailure);" << be_uidt;
-          
+
       *os << be_nl << be_nl
           << "void remove (in " << key->name () << " key)" << be_idt_nl
           << "raises (Components::InvalidKey, Components::UnknownKeyValue, "
           << "Components::RemoveFailure);" << be_uidt;
-          
+
       *os << be_nl << be_nl
           << key->name () << " get_primary_key (in "
           << node->managed_component ()->name () << " comp);";
     }
-      
+
   *os << be_uidt_nl
       << "};";
-      
+
   // Create equivalent interface.
   *os << be_nl << be_nl
       << "interface " << node->local_name () << " : "
@@ -598,29 +598,29 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
       << node->local_name () << "Implicit" << be_nl
       << "{" << be_nl
       << "};";
-      
+
   return 0;
 }
 
 
-int 
+int
 idl3_to_idl2_visitor::visit_factory  (AST_Factory *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl;
-    
+
   *os << "factory " << node->local_name () << " (";
-  
+
   this->gen_params (node, node->argument_count ());
-  
+
   *os << ")";
-  
+
   this->gen_exception_list (node->exceptions ());
-  
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -628,16 +628,16 @@ idl3_to_idl2_visitor::visit_factory  (AST_Factory *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_structure (AST_Structure *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "struct " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -650,38 +650,38 @@ idl3_to_idl2_visitor::visit_structure (AST_Structure *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_structure_fwd (AST_StructureFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "struct " << node->local_name () << ";";
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_exception (AST_Exception *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "exception " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -694,29 +694,29 @@ idl3_to_idl2_visitor::visit_exception (AST_Exception *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_expression (AST_Expression *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_enum (AST_Enum *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "enum " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -724,28 +724,28 @@ idl3_to_idl2_visitor::visit_enum (AST_Enum *node)
        !i.is_done ();)
     {
       *os << be_nl;
-      
+
       AST_EnumVal *ev = AST_EnumVal::narrow_from_decl (i.item ());
       *os << ev->local_name ();
-      
+
       // Advance here so the check below will work.
       i.next ();
-      
+
       if (!i.is_done ())
         {
           *os << ",";
         }
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
 {
   *os << be_nl << be_nl;
@@ -754,16 +754,16 @@ idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
     {
       *os << "oneway ";
     }
-    
+
   *os << this->type_name (node->return_type ());
   *os << " " << node->local_name () << " (";
-  
+
   this->gen_params (node, node->argument_count ());
-    
+
   *os << ")";
-  
+
   this->gen_exception_list (node->exceptions ());
-  
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -771,18 +771,18 @@ idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_field (AST_Field *node)
 {
   AST_Field::Visibility v = node->visibility ();
 
   *os << be_nl
-      << (v == AST_Field::vis_PUBLIC 
-          ? "public " 
+      << (v == AST_Field::vis_PUBLIC
+          ? "public "
           : (v == AST_Field::vis_PRIVATE ? "private " : ""));
-  
+
   AST_Type *ft = node->field_type ();
-  
+
   if (ft->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (ft, node);
@@ -793,13 +793,13 @@ idl3_to_idl2_visitor::visit_field (AST_Field *node)
       *os << this->type_name (ft);
       *os << " " << node->local_name ();
     }
-  
+
   *os << ";";
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_argument (AST_Argument *node)
 {
   *os << be_nl;
@@ -814,22 +814,22 @@ idl3_to_idl2_visitor::visit_argument (AST_Argument *node)
         break;
       case AST_Argument::dir_OUT:
         *os << "out ";
-        break;        
+        break;
       default:
         return -1;
     }
-    
-  *os << this->type_name (node->field_type ()) 
+
+  *os << this->type_name (node->field_type ())
       << " " << node->local_name ();
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
 {
-  idl_bool rd_only = node->readonly ();
-  
+  bool rd_only = node->readonly ();
+
   // Keep output statements separate because of side effects.
   // No need to check for anonymous array - anonymous types not
   // accepted by parser for attributes.
@@ -837,13 +837,13 @@ idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
       << (rd_only ? "readonly " : "") << "attribute ";
   *os << this->type_name (node->field_type ());
   *os << " " << node->local_name ();
-  
+
   this->gen_exception_list (node->get_get_exceptions (),
                             rd_only ? "" : "get");
-                                   
+
   this->gen_exception_list (node->get_set_exceptions (),
                             "set");
-      
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -851,18 +851,18 @@ idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union (AST_Union *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   this->disc_type_ = node->disc_type ()->unaliased_type ();
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "union " << node->local_name () << " switch ("
       << node->disc_type ()->name () << ")" << be_nl
       << "{" << be_idt;
@@ -876,28 +876,28 @@ idl3_to_idl2_visitor::visit_union (AST_Union *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_fwd (AST_UnionFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "union " << node->local_name () << ";";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
 {
   for (unsigned long i = 0; i < node->label_list_length (); ++i)
@@ -910,9 +910,9 @@ idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
                             -1);
         }
     }
-    
+
   AST_Type *ft = node->field_type ();
-  
+
   if (ft->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (ft, node);
@@ -922,43 +922,43 @@ idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
       *os << this->type_name (ft);
       *os << " " << node->local_name ();
     }
-  
+
   *os << ";";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_label (AST_UnionLabel *node)
 {
   *os << be_nl;
-  
+
   if (node->label_kind () == AST_UnionLabel::UL_default)
     {
       *os << "default: ";
-    } 
+    }
   else
     {
       *os << "case ";
       this->gen_label_value (node);
       *os << ": ";
     }
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_constant (AST_Constant *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-  
+
   *os << "const ";
-  
+
   switch (node->et ())
     {
       case AST_Expression::EV_short:
@@ -980,7 +980,7 @@ idl3_to_idl2_visitor::visit_constant (AST_Constant *node)
         *os << "unsigned long long";
         break;
       case AST_Expression::EV_char:
-	      *os << "char";
+        *os << "char";
         break;
       case AST_Expression::EV_wchar:
         *os << "wchar";
@@ -1012,26 +1012,26 @@ idl3_to_idl2_visitor::visit_constant (AST_Constant *node)
       default:
         break;
     }
-  
-  *os <<  " " 
+
+  *os <<  " "
       << node->local_name () << " = " << node->constant_value () << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_enum_val (AST_EnumVal *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_array (AST_Array *node)
 {
   *os << node->base_type ()->name ();
-  
+
   for (unsigned long i = 0; i < node->n_dims (); ++i)
     {
       *os << "[" << node->dims ()[i] << "]";
@@ -1040,53 +1040,53 @@ idl3_to_idl2_visitor::visit_array (AST_Array *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_sequence (AST_Sequence *node)
 {
   // Keep output statements separate because of side effects.
   *os << "sequence<";
   *os << this->type_name (node->base_type ());
-  
+
   if (!node->unbounded ())
     {
       *os << ", " << node->max_size ()->ev ()->u.ulval;
     }
-    
+
   *os << "> ";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_string (AST_String *node)
 {
   *os << (node->width () > 1 ? "w" : "") << "string";
-  
+
   unsigned long bound = node->max_size ()->ev ()->u.ulval;
-  
+
   if (bound > 0)
     {
       *os << "<" << bound << ">";
     }
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_typedef (AST_Typedef *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "typedef ";
-      
+
   AST_Type *bt = node->base_type ();
-      
+
   // Keep output statements separate because of side effects.
-  
+
   if (bt->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (bt, node);
@@ -1096,59 +1096,59 @@ idl3_to_idl2_visitor::visit_typedef (AST_Typedef *node)
       *os << this->type_name (bt);
       *os << " " << node->local_name ();
    }
-   
+
   *os << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_root (AST_Root *node)
 {
   ACE_NEW_RETURN (this->os,
                   TAO_SunSoft_OutStream,
                   -1);
-           
+
   ACE_CString fn (idl_global->stripped_filename ()->get_string ());
   fn = fn.substr (0, fn.rfind ('.'));
   fn += "_IDL2.idl";
-  
+
   const char *path = be_global->output_dir ();
   ACE_CString target_name;
-  
+
   if (path != 0)
     {
       target_name = path;
       target_name += "/";
     }
-    
+
   target_name += fn;
-  
+
   if (this->os->open (target_name.c_str ()) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed to open file %s for writing.\n",
                   target_name.c_str ()));
-                  
+
       return -1;
     }
-  
+
   os->gen_ifndef_string (fn.c_str (), "_TAO_IDL_", "_IDL_");
-  
+
   ACE_CString raw_filename;
   ACE_CString filename;
-  
+
   for (size_t i = 0; i < idl_global->n_included_idl_files (); ++i)
     {
       if (i == 0)
         {
           *os << be_nl;
         }
-        
+
       raw_filename = idl_global->included_idl_files ()[i];
-      
+
       if (raw_filename.find (".pidl") != ACE_CString::npos
           || raw_filename == "orb.idl"
           || raw_filename == "Components.idl")
@@ -1157,22 +1157,22 @@ idl3_to_idl2_visitor::visit_root (AST_Root *node)
         }
       else
         {
-          filename = 
+          filename =
             raw_filename.substr (0, raw_filename.rfind ('.')) + "_IDL2.idl";
         }
-        
+
       *os << be_nl
           << "#include \"" << filename.c_str () << "\"";
     }
-    
+
   const char *pfix = node->prefix ();
-  
+
   if (ACE_OS::strcmp (pfix, "") != 0)
     {
       *os << be_nl << be_nl
           << "#pragma prefix \"" << pfix << "\"";
     }
-  
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -1180,25 +1180,25 @@ idl3_to_idl2_visitor::visit_root (AST_Root *node)
                           "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_nl << be_nl
       << "#endif /* ifndef */" << be_nl << be_nl;
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_native (AST_Native *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-  
+
   *os << "native " << node->local_name () << ";";
-    
+
   return 0;
 }
 
@@ -1212,11 +1212,11 @@ idl3_to_idl2_visitor::check_prefix (AST_Decl *d)
 
   const char *the_prefix = d->prefix ();
   AST_Decl *p = ScopeAsDecl (d->defined_in ());
-  
+
   if (ACE_OS::strcmp (the_prefix, p->prefix ()) != 0)
     {
       *os << be_nl
-          << "typeprefix " << d->local_name () 
+          << "typeprefix " << d->local_name ()
           << " \"" << the_prefix << "\";";
     }
 }
@@ -1227,19 +1227,19 @@ idl3_to_idl2_visitor::check_id_and_version (AST_Decl *d)
   if (d->typeid_set ())
     {
       *os << be_nl
-          << "typeid " << d->local_name () 
+          << "typeid " << d->local_name ()
           << " \"" << d->repoID () << "\";";
-          
+
       return;
     }
-    
+
   const char *the_version = d->version ();
   AST_Decl *p = ScopeAsDecl (d->defined_in ());
-  
+
   if (ACE_OS::strcmp (the_version, p->version ()) != 0)
     {
       *os << "\n"
-          << "#pragma version " << d->local_name () 
+          << "#pragma version " << d->local_name ()
           << " " << the_version;
     }
 }
@@ -1260,7 +1260,7 @@ idl3_to_idl2_visitor::type_name (AST_Type *t)
         return "";
       case AST_Decl::NT_pre_defined:
         pdt = AST_PredefinedType::narrow_from_decl (t);
-        
+
         switch (pdt->pt ())
           {
             case AST_PredefinedType::PT_pseudo:
@@ -1311,10 +1311,10 @@ idl3_to_idl2_visitor::gen_anonymous_array (AST_Type *a,
 {
   AST_Array *array = AST_Array::narrow_from_decl (a);
   AST_Type *bt = array->base_type ();
-  
+
   *os << this->type_name (bt);
   *os << " " << wrapper->local_name ();
-  
+
   for (unsigned long i = 0; i < array->n_dims (); ++i)
     {
       *os << "[" << array->dims ()[i]->ev ()->u.ulval << "]";
@@ -1326,11 +1326,11 @@ idl3_to_idl2_visitor::gen_label_value (AST_UnionLabel *node)
 {
   AST_Expression *val = node->label_val ();
   AST_Expression::AST_ExprValue *ev = val->ev ();
-  
+
   if (this->disc_type_->node_type () == AST_Decl::NT_enum)
     {
       UTL_Scope *s = this->disc_type_->defined_in ();
-      
+
       if (s == 0)
         {
           *os << val->n ();
@@ -1340,7 +1340,7 @@ idl3_to_idl2_visitor::gen_label_value (AST_UnionLabel *node)
           *os << ScopeAsDecl (s)->name () << "::"
               << val->n ()->last_component ();
         }
-        
+
       return;
     }
 
@@ -1371,7 +1371,7 @@ idl3_to_idl2_visitor::gen_label_value (AST_UnionLabel *node)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
         break;
       case AST_Expression::EV_char:
-	      *os << ev->u.cval;
+        *os << ev->u.cval;
         break;
       case AST_Expression::EV_wchar:
         *os << ev->u.wcval;
@@ -1399,7 +1399,7 @@ idl3_to_idl2_visitor::gen_provides (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << pd->impl->name () << " provide_" << pd->id << " ();";
     }
@@ -1417,9 +1417,9 @@ idl3_to_idl2_visitor::gen_uses (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl;
-      
+
       if (pd->is_multiple)
         {
           *os << "struct " << pd->id << "Connection" << be_nl
@@ -1436,14 +1436,14 @@ idl3_to_idl2_visitor::gen_uses (AST_Component *node)
               << "Components::InvalidConnection);" << be_uidt_nl << be_nl
               << pd->impl->name () << " disconnect_" << pd->id
               << " (in Components::Cookie ck)" << be_idt_nl
-              << "raises (Components::InvalidConnection);" 
+              << "raises (Components::InvalidConnection);"
               << be_uidt_nl << be_nl
-              << pd->id << "Connections get_connections_" << pd->id 
+              << pd->id << "Connections get_connections_" << pd->id
               << " ();";
         }
       else
         {
-          *os << "void connect_" << pd->id << " (in " 
+          *os << "void connect_" << pd->id << " (in "
               << pd->impl->name () << " conxn)" << be_idt_nl
               << "raises (Components::AlreadyConnected, "
               << "Components::InvalidConnection);" << be_uidt_nl << be_nl
@@ -1468,10 +1468,10 @@ idl3_to_idl2_visitor::gen_publishes (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << "Components::Cookie subscribe_" << pd->id
-          << " (in " << pd->impl->name () <<"Consumer consumer)" 
+          << " (in " << pd->impl->name () <<"Consumer consumer)"
           << be_idt_nl
           << "raises (Components::ExceededConnectionLimit);"
           << be_uidt_nl << be_nl
@@ -1493,12 +1493,12 @@ idl3_to_idl2_visitor::gen_emits (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << "void connect_" << pd->id
-          << " (in " << pd->impl->name () 
+          << " (in " << pd->impl->name ()
           << "Consumer consumer)" << be_idt_nl
-          << "raises (Components::AlreadyConnected);" 
+          << "raises (Components::AlreadyConnected);"
           << be_uidt_nl << be_nl
           << pd->impl->name () << "Consumer disconnect_" << pd->id
           << " ()" << be_idt_nl
@@ -1518,7 +1518,7 @@ idl3_to_idl2_visitor::gen_consumes (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << pd->impl->name () << "Consumer get_consumer_" << pd->id
           << " ();";
@@ -1571,10 +1571,10 @@ idl3_to_idl2_visitor::tranfer_scope_elements (AST_Home *src,
       d->set_name (new_name);
       dst.add_to_scope (d);
     }
-  
+
   // Visit the transferred scope elements normally to generate the IDL.
   // This way referenced items will have the interface's name in the
-  // scoped name instead of the home's name.  
+  // scoped name instead of the home's name.
   for (UTL_ScopeActiveIterator dst_iter (&dst, UTL_Scope::IK_decls);
        ! dst_iter.is_done ();
        dst_iter.next ())
@@ -1599,27 +1599,27 @@ idl3_to_idl2_visitor::gen_factories (AST_Home *node,
        i.advance ())
     {
       i.next (item);
-      
+
       *os << be_nl << be_nl
           << node->managed_component ()->name () << " "
           << (*item)->local_name () << " (";
-          
+
       this->gen_params (*item, (*item)->argument_count ());
-      
+
       *os << ")";
-      
+
       UTL_ExceptList *exceps = (*item)->exceptions ();
-      
+
       if (exceps != 0 && exceps->length () > 0)
         {
-          this->gen_exception_list (exceps, "", I_FALSE);
+          this->gen_exception_list (exceps, "", false);
         }
       else
         {
           *os << be_idt_nl
               << "raises (";
         }
-      
+
       *os << "Components::CreateFailure);" << be_uidt;
     }
 }
@@ -1635,27 +1635,27 @@ idl3_to_idl2_visitor::gen_finders (AST_Home *node,
        i.advance ())
     {
       i.next (item);
-      
+
       *os << be_nl << be_nl
           << node->managed_component ()->name () << " "
           << (*item)->local_name () << " (";
-          
+
       this->gen_params (*item, (*item)->argument_count ());
-      
+
       *os << ")";
-      
+
       UTL_ExceptList *exceps = (*item)->exceptions ();
-      
+
       if (exceps != 0 && exceps->length () > 0)
         {
-          this->gen_exception_list (exceps, "", I_FALSE);
+          this->gen_exception_list (exceps, "", false);
         }
       else
         {
           *os << be_idt_nl
               << "raises (";
         }
-      
+
       *os << "Components::FinderFailure);" << be_uidt;
     }
 }
@@ -1666,7 +1666,7 @@ idl3_to_idl2_visitor::gen_params (UTL_Scope *s, int arg_count)
   if (arg_count > 0)
     {
       *os << be_idt << be_idt;
-      
+
       for (UTL_ScopeActiveIterator si (s, UTL_Scope::IK_decls);
            !si.is_done ();)
         {
@@ -1676,45 +1676,45 @@ idl3_to_idl2_visitor::gen_params (UTL_Scope *s, int arg_count)
                           "idl3_to_idl2_visitor::gen_params - "
                           "codegen for parameters failed\n"));
             }
-            
+
           si.next ();
-          
+
           if (!si.is_done ())
             {
               *os << ",";
             }
         }
-        
+
       *os << be_uidt_nl << be_uidt;
-    }   
+    }
 }
 
 void
 idl3_to_idl2_visitor::gen_exception_list (UTL_ExceptList *exceptions,
                                           const char *prefix,
-                                          idl_bool closed)
+                                          bool closed)
 {
   if (exceptions != 0 && exceptions->length () > 0)
     {
       *os << be_idt_nl
           << prefix << "raises (";
-          
+
       for (UTL_ExceptlistActiveIterator ei (exceptions);
            !ei.is_done ();)
         {
           *os << ei.item ()->name ();
-          
+
           ei.next ();
-        
+
           if (!ei.is_done () || !closed)
             {
               *os << ", ";
             }
         }
-        
+
       if (closed)
-        {  
+        {
           *os << ")" << be_uidt;
         }
-    }  
+    }
 }
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index e310e2d1cfc..e5f976edf3e 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -82,7 +82,7 @@ public:
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node);
   virtual int visit_native (AST_Native *node);
-  
+
 private:
   void check_prefix (AST_Decl *d);
   void check_id_and_version (AST_Decl *d);
@@ -104,8 +104,8 @@ private:
   void gen_params (UTL_Scope *s, int arg_count);
   void gen_exception_list (UTL_ExceptList *exceptions,
                            const char *prefix = "",
-                           idl_bool closed = I_TRUE);
-  
+                           bool closed = true);
+
 private:
   TAO_OutStream *os;
   AST_Type *disc_type_;
diff --git a/TAO/COPYING b/TAO/COPYING
index 41eecbf0fc3..35b26e8f8b7 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -8,11 +8,11 @@
    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-2005, all rights reserved. Since DOC software is
-   open-source, free 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,
+   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.
    
@@ -67,9 +67,16 @@
    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.
+   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
+   2005," which established new daylight savings times (DST) rules for
+   the United States that expand DST as of March 2007. Since DOC software
+   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
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 30b01997a1c..7839a311a36 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,12 +1,12540 @@
-Tue Jan 10 16:03:17 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+Fri Mar 31 15:17:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * orbsvcs/performance-tests/perf.mwc:
-				  
-					avoided wchar for this whole test.
+        * tests/IDL_Test/included.idl:
+        * tests/IDL_Test/including.idl:
 
-Tue Jan 10 09:57:39 2006  Wallace Zhang  <zhangw@ociweb.com>
+          Added valuetype IDL example that is declared in one file, which
+          is included in another where the valuetype is used in a sequence.
+          This example tests whether the inclusion of Value_VarOut_T.h
+          occurs soon enough in the translation unit to be seen when the
+          sequence template class is instantiated, and to make sure the
+          change in
 
-        * orbsvcs/performance-tests/perf.mwc:
+          Thu Mar 30 20:21:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          survives when the TAO sequence overhaul is integrated.
+
+Fri Mar 31 11:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl:
+          Check the return value of the spawn of the server and don't try
+          to also run the client on the vxworks target, the server is the
+          side of the test that runs there
+
+Fri Mar 31 11:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/Adapter_Activator/run_test.pl:
+        * examples/POA/Default_Servant/run_test.pl:
+        * examples/POA/Explicit_Activation/run_test.pl:
+        * examples/POA/Loader/run_test.pl:
+        * examples/POA/On_Demand_Activation/run_test.pl:
+        * examples/POA/On_Demand_Loading/run_test.pl:
+        * examples/POA/Reference_Counted_Servant/run_test.pl:
+          Check the return value of the spawn of the server, if this is
+          not equal zero just exit directly. Speeds up the tests when
+          there are no executables build
+
+Fri Mar 31 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Wait_On_Read.cpp:
+          Use false instead of 0 for a bool
+
+Thu Mar 30 20:21:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Valuetype/Sequence_T.h:
+
+          Added include of Value_VarOut_T.h, needed when compiling
+          generated code from an IDL file with a sequence whose
+          valuetype element was declared in an included IDL file, on
+          platforms where template source files are not included in
+          the corresponding header file. Thanks to Dmitriy Kuznetsov
+          <dk3@garant.ru> for sending the example IDL files that
+          uncovered the problem.
+
+Thu Mar 30 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.i:
+          Moved is_permanent_forward_condition out of TAO_HAS_INTERCEPTORS
+          check
+
+Thu Mar 30 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exclusive_TMS.cpp:
+          Fixed incorrect formatted debug statement
+
+Thu Mar 30 11:26:45 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/tao_idl.mpc:
+
+          If variable ACE_CC_PREPROCESSOR is defined add that as a macro
+          definition on the compile line instead of assuming that the value of
+          CXX should be used. This fixes bug #2478.
+
+          See also: Thu Mar 30 11:27:00 UTC 2006  Simon McQueen  <sm@prismtech.com>
+          in ../ChangeLog.
+
+Thu Mar 30 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional_DelayedUpcall/*:
+          New test testing bidir where the client makes an invocation to
+          the server, this directly returns, and a second later the
+          server is going to callback on the client.
+
+Thu Mar 30 11:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional_NestedUpcall/run_test.pl:
+          Updated for VxWorks
+
+Thu Mar 30 10:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Transport.cpp:
+          Fixed incorrect debug statements
+
+Thu Mar 30 10:38:31 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Permanent_Forward/StubTest.cpp:
+
+          VxWorks warning - make String_var conversion explicit.
+
+Thu Mar 30 10:24:14 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Permanent_Forward/StubTest.cpp:
+
+          LynxOS compile error. Use ACE_OS::strcmp.
+
+Thu Mar 30 09:58:11 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Permanent_Forward/StubTest.cpp:
+
+          Suppress unused function warnings and make the test more effective
+          when ACE_NDEBUG defined.
+
+Thu Mar 30 06:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitInfo.cpp (codec_factory):
+          Fixed resource leak. Thanks to Steven Xie
+          <steven dot xie at mpathix dot com> for reporting this.
+
+Thu Mar 30 03:30:00 UTC 2006  Frank Rehberger  <frehberger@prismtech.com>
+
+        * tao/Stub.i: add missing call to
+          orb_core->reinitialize_object (this), to optimize for colocal
+          case.
+
+        * tests/Permanent_Forward/StubTest.cpp: Removed code at end of
+          test, which caused error messages even if the test run thru all
+          test-cases successfully.
+
+Wed Mar 29 19:30:00 UTC 2006  Frank Rehberger  <frehberger@prismtech.com>
+
+        * tao/Transport.h:
+          Correct the documentation explaining message parsing. This is
+          related to #2313
+
+Wed Mar 29 17:15:00 UTC 2006  Frank Rehberger  <frehberger@prismtech.com>
+
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+          TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp:
+          TAO/tao/Invocation_Adapter.cpp:
+
+          Guard reply_status() operation with if-else-endif macro for
+          MINIMUM builds.
+
+Wed Mar 29 15:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
+          Explicit shouldn't be used for a copy constructor
+
+Wed Mar 29 15:24:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.yy (yyparse):
+        * TAO_IDL/fe/y.tab.cpp (yyparse):
+
+          Added return with error code immediately after outputting
+          a lookup error for an enum type, since further parsing
+          leads to a crash. Thanks to Jules Colding <colding@omesc.com>
+          for reporting the problem and submitting examples IDL files.
+
+Wed Mar 29 03:42:55 UTC 2006  Balachandran Natarajan  <bala_natarajan at symantec dot com>
+
+        * docs/Options.html:
+
+          Added documentation for -ORBConnectionHandlerCleanup.
+
+Tue Mar 28 23:59:00 UTC 2006  Frank Rehberger <frehberger@prismtech.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.{h,cpp}:
+        * tao/Service_Callbacks.{h,cpp}:
+          Add operation is_permanent_forward_condition()
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl:
+          Add reset() operation to interceptor to be able to do colocal
+          and repeat as remote test. Also store forward objects as
+          deep-copies.
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp:
+          Compare stringified object reference before and after the
+          LOCATION_FORWARD_PERM occured, they must differ.
+
+        * tao/GIOP_Message_Generator_Parser.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/Invocation_Adapter.cpp:
+          Add handling of TAO_GIOP_LOCATION_FORWARD_PERM.
+
+        * tao/ORB_Core.{i,h,cpp}:
+          Add operation is_permanent_forward_condition() which will
+          upcalls the operation in Service_Callbacks interface.
+
+        * tao/Object.cpp:
+          Refactor the Object marshaling code into TAO_Stub::marshal()
+          operation to encapsulate the TAO_GIOP_LOCATION_FORWARD_PERM
+          case.
+
+        * tao/Stub.{i,h,cpp}:
+          Add operation TAO_Stub::marshal(), and permanent-forward-feature
+          to operation add_forward_profiles().
+
+        * tao/Synch_Invocation.cpp:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/TAO_Server_Request.cpp:
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+          Add handling for TAO_GIOP_LOCATION_FORWARD_PERM.
+
+        * bin/tao_orb_tests.lst
+          Add TAO/tests/Permanent_Forward/run_test.pl
+
+        * tests/Permanent_Forward/Permanent_Forward.mpc:
+        * tests/Permanent_Forward/run_test.pl:
+        * tests/Permanent_Forward/StubTest.cpp:
+        * tests/Permanent_Forward/README:
+          New test, testing TAO_Stub features for permanent-forwarding support
+
+          These changes add LOCATION_FORWARD_PERM feature, #1777
+
+Tue Mar 28 14:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/AMH_Exceptions/run_test.pl:
+        * tests/AMH_Oneway/run_test.pl:
+          Adjusted the timeouts to platform constants.
+          Existing time too short for lynxos.
+
+Tue Mar 28 13:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.cpp:
+          Use bool as type, improved constness
+
+Mon Mar 27 18:55:51 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl:
+        * tao/Connection_Handler.cpp:
+        * tao/Resume_Handle.h:
+        * tao/Resume_Handle.cpp:
+
+          Merged in fixes from OCI 1.4a.
+          Tue Feb 21 16:29:32 UTC 2006  Don Busch  <busch_d@ociweb.com>
+
+           * tao/Connection_Handler.cpp
+           * tao/Resume_Handle.h
+           * tao/Resume_Handle.cpp
+           * orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+
+           RT8248(Bug 1647) is a race condition involving two threads
+           active in the same connection handler at the same time.
+           The race is fixed by
+           ensuring that a connection handler that has allowed its handle
+           to be resumed in the Reactor does not return "1" from
+           handle_input. "1" is the Reactor's "call me back immediately"
+           value. Essentially, you can't give up ownership of yourself twice
+           --  you give up owner-ship when you resume the handle, so you
+           can't ask to be called back immediately.  (The SSLIOP handler
+           is the only one that ever returns 1, so that's the only handler
+           in which this manifests itself)
+
+           The additional test (run_test_harsh.pl) is a longer (~5 minute)
+           version of the MT_SSLIOP test that fails without this change,
+           but succeeds with it.
+
+           Also moved the code for Ciju's "connection close" fix of
+           "Fri Dec 16 14:40:54 2005" (this entry is moved from OCI 1.4a)
+           from the Connection_Handler.cpp to the Resume_Handle.cpp.
+             Fri Dec 16 14:40:54 2005  Ciju John  <john_c@ociweb.com>
+
+             * tao/Connection_Handler.cpp:
+
+               When the client closes its connections, it sends an EOF
+               to the server. The sever reactor gets an event for that
+               handler. It first suspends the handler and then dispatches
+               a thread to handle_input().Some where down the lane, a read()
+               is done on the handle and automatically the handle is resumed.
+               At this point another thread CAN enter the reactor and
+               since the handle being closed has been resumed, the reactor
+               will add it to its fd_set. As expected the reactor gets an
+               event on that handle and dispatches someone else to handle
+               that event.
+               What this patch does is prevent the closing handler from being
+               resumed. Thus it never does get added to the reactor
+               fd_set and the possibility of getting a nil handler is removed.
+
+Mon Mar 27 10:29:08 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/ORB_Core.cpp (destroy_interceptors):
+
+          Fixed race condition that allowed multiple threads to destroy
+          interceptors concurrently.  Thanks to Iliyan for finding this
+          race condition.
+
+Wed Mar 22 16:18:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_1482_Regression/run_test.pl:
+        * tests/Bug_2174_Regression/run_test.pl:
+        * tests/RTCORBA/Banded_Connections/run_test.pl:
+        * tests/RTCORBA/Client_Protocol/run_test.pl:
+        * tests/RTCORBA/Explicit_Binding/run_test.pl:
+        * tests/RTCORBA/Policy_Combinations/run_test.pl:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl:
+        * tests/RTCORBA/Server_Protocol/run_test.pl:
+        * tests/RTCORBA/Thread_Pool/run_test.pl:
+        * tests/RTScheduling/DT_Spawn/run_test.pl:
+        * tests/RTScheduling/Current/run_test.pl:
+        * tests/RTScheduling/Scheduling_Interceptor/run_test.pl:
+        * tests/OBV/Collocated/Forward/run_test.pl:
+        * tests/Muxed_GIOP_Versions/run_test.pl:
+          Altered IOR file wait timing to platform constant.
+          Existing time too short for lynxos.
+
+Mon Mar 27 08:13:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * docs/Options.html :
+        * docs/ORBEndpoint.html :
+          Fixed incorrect ORBInitRef examples.
+
+Fri Mar 24 01:58:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+        * orbsvcs/tests/Notify/lib/Driver.cpp:
+
+          Removed logging of ORB worker thread start up, as that fails on
+          systems without thread priorities.  See bugzilla issue 2477 for
+          details.
+
+Wed Mar 22 16:18:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_1495_Regression/run_test.pl:
+          Altered IOR file wait timing to platform constant.
+
+Wed Mar 22 16:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+          Also disable a warning for BDS2006 with Update Pack 2
+
+Wed Mar 22 15:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2417_Regression/run_test.pl:
+          Updated to run with VxWorks
+
+Wed Mar 22 14:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+          Fixed no return statement in function warning
+
+Wed Mar 22 14:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Base.cpp:
+          Fixed "control reaches end of non-void function" warning
+
+Tue Mar 21 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Table.h:
+          Removed update_orbs method declaration, there was no implementation,
+          if someone would use this method he would get an unresolved external,
+          so zapped it
+
+Tue Mar 21 13:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.h:
+        * tao/LocalObject.h:
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Acceptor.h:
+          Documentation and layout fixes
+
+Mon Mar 20 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+          Use prefix decrement instead of postfix
+
+Mon Mar 20 13:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Base.cpp:
+          Made more local variables const, initialize pointer to 0
+
+        * tao/GIOP_Message_Base.h:
+          Documentation fix
+
+Mon Mar 20 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp:
+          Made some more local variables const
+
+Mon Mar 20 13:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.h:
+          Documentation improvements
+
+Fri Mar 17 15:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/pluggable_protocols/index.html:
+          Fixed some hyperlinks to TAO source files
+
+Fri Mar 17 14:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/poa_migration.html:
+          Fixed links to the POA implementation
+
+Fri Mar 17 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Smart_Proxies.html:
+          Fixed typo
+
+Thu Mar 16 22:20:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_interface.cpp (be_add_operation):
+        * TAO_IDL/include/ast_interface.h (be_add_operation):
+
+          Changed the return type from void to AST_Operation*,
+          the same type that is returned from the implementation's
+          delegation to the private method fe_add_operation. This
+          change allows an error in fe_add_operation (which will
+          return 0 and probably be the result of a name clash) to
+          get propagated up and be reflected in tao_idl's return
+          value.
+
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+
+          Changed usage of be_add_operation() to check the new
+          return type and return -1 if it is null. The IDL
+          compiler formerly would output a 'redefinition'
+          (name clash) diagnostic if a user operation name
+          clashed with an implied operation name of AMI or AMH,
+          and likewise if 2 ports of the same category in a
+          component had the same name. Now the IDL compiler
+          will also indicate failure when it exits.
+
+Thu Mar 16 20:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Object.cpp:
+          Use true/false instead of 1/0
+
+Thu Mar 16 12:20:41 MST 2006  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+
+          Typedef'd Thread_Counter as unsigned long and used it for
+          the num_threads.
+
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.inl:
+
+          Updated data member num_threads_ and set_num_threads() method
+          to use the Thread_Counter type for the number of threads.
+
+Thu Mar 16 15:48:50 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+        * TAO_IDL/util/utl_global.cpp
+        * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+        * orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+        * orbsvcs/ImplRepo_Service/INS_Locator.cpp
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+        * orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+        * orbsvcs/Notify_Service/Notify_Service.cpp
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+        * orbsvcs/orbsvcs/AV/RTP.cpp
+        * orbsvcs/orbsvcs/AV/sfp.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+        * tao/GIOP_Message_Base.cpp
+        * tao/GIOP_Message_Generator_Parser_10.cpp
+        * tao/GIOP_Message_Generator_Parser_12.cpp
+        * tao/GIOP_Message_Lite.cpp
+        * tao/IIOP_Acceptor.cpp
+        * tao/IIOP_Connection_Handler.cpp
+        * tao/ORB_Core.cpp
+        * tao/TAO_Internal.cpp
+        * tao/AnyTypeCode/Union_TypeCode.cpp
+        * tao/AnyTypeCode/append.cpp
+        * tao/AnyTypeCode/skip.cpp
+        * tao/PortableServer/POAManager.cpp
+        * tao/RTCORBA/Continuous_Priority_Mapping.cpp
+        * tao/RTCORBA/Linear_Priority_Mapping.cpp
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp
+        * tao/RTCORBA/RT_ORB_Loader.cpp
+        * tao/Strategies/DIOP_Acceptor.cpp
+        * tao/Strategies/SHMIOP_Factory.cpp
+        * tao/Strategies/advanced_resource.cpp
+        * utils/catior/catior.cpp
+          Updated these files to solve the warnings when setting up "VC level
+          4 warnings" on Windows. These warnings include "unreachable code",
+          "assignment within conditional expression", "conversion from some
+          type to another type, possible loss of data", "local variable may be
+          used without having been initialized" and so on.
+          Thanks to Lukas Gruetzmacher <gruetzmacher at ais-dresden dot de>
+          for motivating the fix to these "VC level 4 warnings".
+
+Thu Mar 16 14:10:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * docs/Compiler.html:
+
+          Updated '-Ge <flag>' entry in the options table to reflect
+          the current status in the ongoing migration toward dropping
+          support for emulated exceptions.
+
+Thu Mar 16 12:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl:
+          Fixed fuzz error
+
+Thu Mar 16 11:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Persistent_ID/server.cpp:
+          After creating the child poa destroy the policies
+
+Wed Mar 15 21:26:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Notify/Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Event.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
+
+          Add "orbsvcs/..." prefix to #includes of *.h, *.i, *.inl, and
+          template *.cpp files found in ${TAO_ROOT}/orbsvcs/orbsvcs.
+
+          These instances were missed among the the changes made on:
+          Tue Mar 14 06:02:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+          because they used relative paths.
+
+Wed Mar 15 13:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Resume_Handle.h:
+          Documentation fix
+
+Wed Mar 15 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h:
+          Doxygen fix
+
+Wed Mar 15 10:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2186_Regression/server.conf:
+          Use 1 instead of true for -ORBConnectionHandlerCleanup, true is
+          deprecated
+
+Wed Mar 15 07:48:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Event_Utilities.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h:
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Worker.h:
+        * orbsvcs/orbsvcs/Event/ECG_Adapters.h:
+        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
+        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h:
+        * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h:
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h:
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
+        * orbsvcs/orbsvcs/Event/EC_SupplierControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h:
+        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+
+          Add "orbsvcs/..." prefix to #includes of *.h, *.i, *.inl, and
+          template *.cpp files found in ${TAO_ROOT}/orbsvcs/orbsvcs.
+
+          These instances were missed among the the changes made on:
+          Tue Mar 14 06:02:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+Tue Mar 14 08:12:55 UTC 2006  Ciju John  <john_c@ociweb.com>
+
+        * tao/Connection_Handler.cpp:
+
+          When the client closes its connections, it sends an EOF to the
+          server. The sever reactor gets an event for that handler. It
+          first suspends the handler and then dispatches a thread to
+          handle_input(). Some where down the lane, a read() is done on the
+          handle and automatically the handle is resumed. At this point
+          another thread CAN enter the reactor and since the handle being
+          closed has been resumed, the reactor will add it to its
+          fd_set. As expected the reactor gets an event on that handle and
+          dispatches someone else to handle that event. What this patch
+          does is prevent the closing handler from being resumed. Thus it
+          never does get added to the reactor fd_set and the possibility
+          of getting a nil handler is removed.
+
+Tue Mar 14 15:25:48 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Domain.pidl:
+        * tao/GIOP.pidl:
+        * tao/IOP.pidl:
+        * tao/IOP_IOR.pidl:
+        * tao/Messaging_PolicyValue.pidl:
+        * tao/PI_Forward.pidl:
+        * tao/Policy.pidl:
+        * tao/PortableInterceptor.pidl:
+        * tao/Services.pidl:
+        * tao/TAO.pidl:
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl:
+        * tao/BiDir_GIOP/BiDirPolicy.pidl:
+        * tao/CodecFactory/IOP_Codec.pidl:
+        * tao/CodecFactory/IOP_Codec_include.pidl:
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/IFR_Client/IFR_Base.pidl:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+        * tao/PI/ClientRequestInfo.pidl:
+        * tao/PI/ORBInitInfo.pidl:
+        * tao/PI/PICurrent.pidl:
+        * tao/PI/PolicyFactory.pidl:
+        * tao/PI/RequestInfo.pidl:
+        * tao/PI_Server/PI_Server_include.pidl:
+        * tao/PI_Server/ServerRequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInterceptor.pidl:
+        * tao/PortableServer/AdapterActivator.pidl:
+        * tao/PortableServer/IdAssignmentPolicy.pidl:
+        * tao/PortableServer/IdUniquenessPolicy.pidl:
+        * tao/PortableServer/ImplicitActivationPolicy.pidl:
+        * tao/PortableServer/LifespanPolicy.pidl:
+        * tao/PortableServer/PS_Current.pidl:
+        * tao/PortableServer/PS_Forward.pidl:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServer_include.pidl:
+        * tao/PortableServer/RequestProcessingPolicy.pidl:
+        * tao/PortableServer/ServantActivator.pidl:
+        * tao/PortableServer/ServantLocator.pidl:
+        * tao/PortableServer/ServantRetentionPolicy.pidl:
+        * tao/PortableServer/ThreadPolicy.pidl:
+        * tao/RTCORBA/RTCORBA.pidl:
+        * tao/RTPortableServer/RTPortableServer_include.pidl:
+
+          Change #include <tao/...> to #include "tao/..." to avoid fuzz
+          warnings.  At the very least, this makes everyting consistant
+          while we are investigate and decide what #include conventions
+          for <...> vs. "..." to adopt.
+
+Tue Mar 14 06:02:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/...*.cpp:
+        * orbsvcs/orbsvcs/...*.h:
+        * orbsvcs/orbsvcs/...*.i:
+        * orbsvcs/orbsvcs/...*.inl:
+
+          Add "orbsvcs/..." prefix to #includes of *.h, *.i, *.inl, and
+          template *.cpp files found in ${TAO_ROOT}/orbsvcs/orbsvcs.
+
+Mon Mar 13 19:51:12 UTC 2006  Johnny Willemsen  <jwilemsen@remedy.nl>
+
+        * tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/Test.idl:
+          Extended this test with a non recursive union with an enum
+          as discriminator, this also fails.
+
+Mon Mar 13 15:06:08 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/CollocationLockup/run_test.pl:
+
+          Attempted to add support for running the important portion of the
+          test on VxWorks.
+
+Mon Mar 13 10:09:21 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2186_Regression/server.conf:
+
+          Add '-ORBConnectionHandlerCleanup true' to get this test to pass.
+
+Sun Mar 12 10:21:12 UTC 2006  Johnny Willemsen  <jwilemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+          Fixed invalid deletes when using the typed event channel and fixed
+          some unicode issues. Thanks to Feng Li <fengli at gmail dot com>
+          for providing the patches.
+
+Sat Mar 11 12:16:01 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/CollocationLockup/SimpleNamingService.cpp:
+
+          Fixed a warning with gcc.
+
+Fri Mar 10 20:00:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+
+          Removed extra "orbsvcs/" prefix when including orbsvcs
+          headers.
+
+Fri Mar 10 15:57:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        Committing the following on behalf of Adam Mitz
+        <mitza at ociweb dot com>.
+
+        * tests/CollocationLockup/AB.idl:
+        * tests/CollocationLockup/CollocationLockup.cpp:
+        * tests/CollocationLockup/CollocationLockup.mpc:
+        * tests/CollocationLockup/SimpleNamingService.cpp:
+        * tests/CollocationLockup/SimpleNamingService.idl:
+        * tests/CollocationLockup/run_test.pl:
+
+          Added a regression test for Bugzilla #2130, which is a deadlock
+          involving servant activation and collocated calls.
+
+Fri Mar 10 15:36:08 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+          Fixed warning. Thanks to Johnny for the tip off.
+
+Fri Mar 10 14:00:00 UTC 2006  Simon Massey <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+          Remove redundant ACE_PRINT_EXCEPTION when rethrowing
+          CANNOT_PROCEED exceptions, to clean up the scoreboard and
+          stop confusing end users who think an unhandled exception has
+          occured when it hasn't.
+
+Fri Mar 10 11:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/Test.idl:
+        * tests/Any/Recursive/client.cpp:
+          Also added a test for a recursive union with no default
+
+Fri Mar 10 10:44:29 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * orbsvcs/tests/Bug_2377_Regression/Hello.cpp:
+
+          std::string ==> ACE_CString.
+
+Fri Mar 10 10:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport_Descriptor_Interface.inl:
+        * tao/AnyTypeCode/skip.cpp:
+          Use true/false
+
+Fri Mar 10 09:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Stub.cpp:
+          Fixed warning in vc6 build
+
+Fri Mar 10 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/Test.idl:
+          Extended this test with a new test case as described in bug
+          2446. This test now fails again because this added test case
+          uncovers a new bug. Thanks to Tommy Persson
+          <tpe at ida dot liu dot se> for delivering this test case
+
+Fri Mar 10 07:09:22 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/...*.cpp:
+        * tao/...*.h:
+        * tao/...*.i:
+        * tao/...*.inl:
+
+          Add "tao/..." prefix to #includes of *.h, *.i, *.inl, and
+          template *.cpp files found in ${TAO_ROOT}/tao.
+
+Thu Mar  9 16:04:22 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+
+          Don't bail out on code generation when the node is imported.
+
+          This fixes bug #2429.
+
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+          Prevent seg faults when the activator has been fed a duff ImR IOR.
+
+          This fixes bug #2445.
+
+Thu Mar  9 15:37:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/AnyTypeCode/Dynamic.pidl:
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl:
+        * tao/BiDir_GIOP/BiDirPolicy.pidl:
+        * tao/CodecFactory/IOP_Codec.pidl:
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/IFR_Client/IFR_Base.pidl:
+        * tao/IFR_Client/IFR_Basic.pidl:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+        * tao/PI/ClientRequestInfo.pidl:
+        * tao/PI/ORBInitInfo.pidl:
+        * tao/PI/PICurrent.pidl:
+        * tao/PI/PolicyFactory.pidl:
+        * tao/PI/RequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInterceptor.pidl:
+        * tao/PortableServer/IdAssignmentPolicy.pidl:
+        * tao/PortableServer/IdUniquenessPolicy.pidl:
+        * tao/PortableServer/ImplicitActivationPolicy.pidl:
+        * tao/PortableServer/LifespanPolicy.pidl:
+        * tao/PortableServer/PS_Current.pidl:
+        * tao/PortableServer/PS_Forward.pidl:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/RequestProcessingPolicy.pidl:
+        * tao/PortableServer/ServantLocator.pidl:
+        * tao/PortableServer/ServantRetentionPolicy.pidl:
+        * tao/PortableServer/ThreadPolicy.pidl:
+        * tao/RTCORBA/RTCORBA.pidl:
+        * tao/RTScheduling/RTScheduler_include.pidl:
+
+          Add "tao/" prefix to #includes of *.pidl files found in
+          ${TAO_ROOT}/tao.
+
+Thu Mar  9 09:18:58 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
+
+        * COPYING: Updated the date to include 2006.
+          Thanks to Alan Kierstead <ackierstead at fedex dot com> for
+          motivating the fix to this oversight.
+
+Thu Mar  9 15:03:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/CSIIOP.idl:
+        * tao/Domain.pidl:
+        * tao/GIOP.pidl:
+        * tao/IOP.pidl:
+        * tao/IOP_IOR.pidl:
+        * tao/Messaging_PolicyValue.pidl:
+        * tao/PI_Forward.pidl:
+        * tao/Policy.pidl:
+        * tao/PortableInterceptor.pidl:
+        * tao/Services.pidl:
+        * tao/TAO.pidl:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl:
+
+          Add "tao/" prefix to #includes of *.pidl files found in
+          ${TAO_ROOT}/tao.  Thanks to Thomas Lockhart <Thomas dot
+          Lockhart at jpl dot nasa dot gov> for providing this change.
+
+Thu Mar  9 14:51:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosNaming.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+
+          Support for the TAO_ORBSVCS GNU Make macro was broken for some
+          time.  I added the missing 'tagchecks' settings to these projects.
+
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+
+          Corrected the usage of 'tagchecks' so that the values were added
+          instead of being set absolutely.
+
+Thu Mar  9 12:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Stub.{cpp,i}:
+          Use true/false instead of 1/0
+
+Thu Mar  9 10:57:13 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * orbsvcs/tests/Bug_2377_Regression/Hello.cpp:
+
+          Removed extra semi-colons.
+
+Wed Mar  8 17:01:00 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * orbsvcs/tests/Bug_2377_Regression/Hello.cpp:
+
+          Following a suggestion from Simon McQueen, <sm@prismtech.com>,
+          used a more portable method of invoking sub-second resolution
+          timing intervals.
+
+Wed Mar  8 14:58:07 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Use a dynamically allocated buffer to read IDL file lines and resize
+          it if required.
+
+          This fixes bug #2424.
+
+        * tests/Bug_2424_Regression/Bug_2424_Regression.mpc:
+        * tests/Bug_2424_Regression/OneLineCosNaming.idl:
+        * tests/Bug_2424_Regression/README:
+        * tests/Bug_2424_Regression/client.cpp:
+
+          Regression test for the above fix.
+
+        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
+        * tests/Bug_2429_Regression/Child.idl:
+        * tests/Bug_2429_Regression/ChildServant.h:
+        * tests/Bug_2429_Regression/ChildServant.cpp:
+        * tests/Bug_2429_Regression/Parent.idl:
+        * tests/Bug_2429_Regression/README:
+        * tests/Bug_2429_Regression/client.cpp:
+        * tests/Bug_2429_Regression/run_test.pl:
+        * tests/Bug_2429_Regression/server.cpp:
+
+          Regression test for bug #2429. This bug is currently not fixed so
+          this test will fail.
+
+Wed Mar  8 13:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+          Include IFR_BasicC.h instead of IFR_ExtendedC.h, all types
+          used in this file are from IFR_BasicC.h
+
+Wed Mar  8 12:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+          The workaround in this file for Borland C++ is also needed for
+          BCB2006 Update Pack 2
+
+Wed Mar  8 12:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Object.cpp:
+          Use true/false instead of 1/0
+
+Wed Mar  8 12:19:37 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * tests/Bug_2377_Regression/*:
+          removed from TAO level to the more appropriate orbsvcs
+
+        * orbsvcs/tests/Bug_2377_Regression/*:
+          Regression for bug 2377 moved here.
+
+Wed Mar  8 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/LocalObject.cpp:
+          Use true/false instead of 1/0
+
+Wed Mar  8 07:14:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Tue Mar  7 16:21:32 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Naming_Server.cpp:
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
+          The Naming Server executable now includes the header for the
+          ImR client library.  This is required for tests in static
+          builds that use the Naming Server with the ImR.
+
+Tue Mar 07 11:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2417_Regression/publisher_impl.cpp:
+          Fixed implicit conversion warnings
+
+Tue Mar  7 10:16:50 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * tests/Bug_2377_Regression/*:
+          New regression for bug 2377.
+
+Tue Mar 07 09:36:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
+          Added threads as base project
+
+Tue Mar  7 07:51:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/LifeCycle_Service/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
+
+          Changed to not inherit from 'core' so LifeCycle_Service
+          executable is not installed.  It's not a stand-alone service
+          like the others in ${TAO_ROOT}/orbsvcs, it is an example for use
+          with ${TAO_ROOT}/examples/Quoter.  After x.5.1 we'll try to find
+          a better place for this.  See bugzilla issue 2410.
+
+Tue Mar  7 07:40:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/AMI/FL_Callback/Makefile.am:
+        * tao/Makefile.am:
+
+          Regenerated for autoconf FL & QT Reactor / FL & QT Resource
+          Factory support.
+
+Mon Mar 06 20:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.h:
+          Doxygen improvement
+
+Mon Mar 06 19:19:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Queue.cpp:
+          Doxygen improvements
+
+Mon Mar 06 16:00:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+          Use prefix increment instead of postfix
+
+Mon Mar 06 15:57:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Adapter.cpp:
+          Removed a not needed local variable.
+
+        * tao/IIOP_Transport.cpp:
+          Initialise pointer with 0
+
+Mon Mar 06 15:56:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Factory/OBV_Factory.mpc:
+        * tests/OBV/Forward/OBV_Forward.mpc:
+        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+        * tests/OBV/ValueBox/valuebox.mpc:
+          Use more specific base projects
+
+        * tests/OBV/Supports/Supports_Test.mpc:
+          Removed exename, not needed
+
+Mon Mar 06 15:32:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Any/Recursive/client.cpp:
+        * tests/Any/Recursive/Test.idl:
+          Extended this test by making the IDL even a little bit more complex
+
+        * TAO_IDL/fe/fe_interface_header.cpp:
+          Explicitly initialize pd_n_supports to 0, fixes a crash of TAO_IDL
+          when build with Borland C++ when feeding it a certain incorrect
+          IDL file. This fixes bugzilla bug 2428
+
+        * 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/Enum_TypeCode.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/TypeCode_Case_T.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+          Initialise some pointers with 0, made some local variables const,
+          use true/false instead of 1/0. Fixed bugzilla bug 2323 by:
+          - When marshaling recursive unions for each case use a seperate
+            stream so that the offsets do get calculated
+          - For each recursive type be able to handle multiple members of
+            the recursive type, we could only handle one occurence.
+          For recursive types we should have more test cases, probably there
+          are a few small bugs left in this code but these aren't catched
+          by the current regression test suite.
+
+Mon Mar 06 15:13:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2417_Regression/*:
+          New regression for bug 2417. Thanks to Jan Ohlenburg
+          <jan dot ohlenburg at fit dot fraunhofer dot de> for
+          delivering this test. This bug has not been fixed yet.
+
+Sun Mar 05 11:13:13 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * TAO version 1.5 released.
+
+Fri Mar  3 17:09:34 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS:
+
+          Updated this file.
+
+Thu Mar  2 14:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader.h:
+        * tao/Incoming_Message_Stack.h:
+          For Borland C++ we have workarounds in these files, seems these
+          are also needed for BDS2006 with Update Pack 2
+
+Thu Mar  2 01:56:58 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS:
+
+          Updated this file with more inputs.
+
+Wed Mar  1 22:39:37 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS:
+
+          Updated this file with info from Jeff Parsons
+
+Wed Mar  1 15:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp (shutdown):
+          After releasing pi_current_ set it to nil because this release could
+          result in the destruction of picurrent and then we read invalid
+          memory. Found from the AdvSlot test running with valgrind.
+
+Wed Mar  1 07:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
+          Added after to fix parallel build problems with vc8
+
+Tue Feb 28 12:25:24 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * NEWS:
+
+          Updated.
+
+Tue Feb 28 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Stack.inl (destructor):
+          Initialise pointer with 0
+
+Tue Feb 28 10:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Queue.cpp (destructor):
+          Use the correct datatype for the cleanup loop.
+
+Tue Feb 28 10:09:45 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/be/be_argument.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Redo the fix for bug #2419 from:
+          Mon Feb 27 16:23:50 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+          Introduce a new flag to idl_global to indicate when we need to
+          force generation of the skeleton includes. Setting
+          non_local_iface_seen_ to be true was causing undesirable side effects
+          on non-inlined builds. Generate skeleton includes when the new
+          need_skeleton_includes_ or non_local_iface_seen_ is true.
+
+Tue Feb 28 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Stack.h:
+          Also BCB2006 Update Pack 1 needs an explicit export
+
+Mon Feb 27 18:19:03 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2084_Regression/Server_Task.cpp:
+
+          Suppress occasional spurious exception output on fast machines.
+
+Mon Feb 27 18:42:38 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+
+          Reverted my change on
+          Thu Feb 23 15:10:18 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+          Because it made the two tests IOGRManipulation and 2247 failed.
+          I will supply a better fix in x.5.1 after more thorough testing.
+
+Mon Feb 27 17:08:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com>
+
+        * tao/Transport.cpp:
+          Incomplete messages, smaller Header-Length, shall be put
+          into intermediate buffer
+
+Mon Feb 27 16:23:50 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/be/be_argument.cpp:
+
+          Don't not generate skeleton includes for arguments from inherited
+          imported abtstract types.
+
+          This fixes bug #2419 howewer the ticket needs to stay open pending
+          a fix that can be described without ugly double negatives. ;-)
+
+        * tests/Bug_2419_Regression/Bug_2419_Regression.mpc:
+        * tests/Bug_2419_Regression/README:
+        * tests/Bug_2419_Regression/abstract_parent.idl:
+        * tests/Bug_2419_Regression/client.cpp:
+        * tests/Bug_2419_Regression/local_child.idl:
+
+          Small regression test for the above.
+
+Mon Feb 27 15:27:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log_i.cpp (TAO_Log_i::set_capacity_alarm_thresholds):
+
+          Call get_capacity_alarm_thresholds() on the record store instead
+          of on "this" to avoid recursive lock invocation.
+
+Mon Feb 27 10:56:12 UTC 2006 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
+        * tests/Portable_Interceptors/Register_Initial_References/run_test.pl:
+          Increased timeouts to get these test running fine with VxWorks,
+          the time there includes also loading the image which takes a
+          few seconds
+
+Sun Feb 26 12:26:12 UTC 2006 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/AMI.mpc:
+          Added after to fix problems in vc8 ide build
+
+Sun Feb 26 11:57:12 UTC 2006 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Stack.h:
+          Only export this class with BCB6, all other compilers don't have
+          problems with this.
+
+        * tests/Bug_2174_Regression/run_test.pl:
+        * tests/Bug_2183_Regression/run_test.pl:
+        * tests/Bug_2289_Regression/run_test.pl:
+        * tests/Smart_Proxies/dtor/run_test.pl:
+          Updated to work under VxWorks
+
+Sat Feb 25 14:56:12 UTC 2006 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Incoming_Message_Stack.h:
+          Export this class, fixes unresolved external errors with BCB6
+
+Sat Feb 25 12:38:12 UTC 2006 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CodeSets/simple/CodeSets_simple.mpc:
+          Added after to fix parallel build problems with vc8
+
+Sat Feb 25 03:00:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com>
+
+        * tao/Incoming_Message_Stack.{h,cpp,inl}: remove unused operation
+          from interface and turn return type of push-operation to "void"
+        * tao/Transport.cpp:
+          tao/GIOP_Message_Base.cpp:
+          Adapt to interface of Incoming_Message_Stack and limit
+          number of ACE_ERROR message to usefull amount to reduce
+          footprint size.
+
+Fri Feb 24 19:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/run_test.pl:
+          Check what spawn returned, when there is no exe this speedsup
+          this test a lot
+
+Fri Feb 24 14:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2289_Regression/run_test.pl:
+          Fixed error message to say correct test number
+
+Fri Feb 24 13:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2234_Regression/run_test.pl:
+        * tests/AMH_Oneway/run_test.pl:
+        * tests/Smart_Proxies/dtor/run_test.pl:
+        * tests/Bug_2183_Regression/run_test.pl:
+          Updated these scripts to work with VxWorks and when we can't
+          spawn the server directly exists, safes us some seconds in
+          the test run when nothing has been build
+
+Fri Feb 24 11:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2349_Regression/Bug_2349_Regression.mpc:
+          Added after to fix build problems with the vc8 ide
+
+Fri Feb 24 10:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+          Added static casts to fix compile errors with SunCC 64bit
+
+Fri Feb 24 09:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/interface.idl:
+          Added try interface as testcase
+
+Fri Feb 24 09:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Basic_Arguments.h:
+          Use for the basic types the AnyTypeCode adapter, belonging to
+          Tue Feb 21 19:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+Fri Feb 24 07:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTScheduling/RTScheduler_includeS.h:
+          Added this file, needed by the RTScheduling example
+
+Thu Feb 23 21:45:54 UTC 2006  Adam Mitz  <mitza@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+          The test "nt_service_ir" copies files, installs services, and starts
+          those services (Windows "NT" Services).  With this change the test
+          will clean up all of these actions even when the test fails.
+
+Thu Feb 23 20:01:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated for autoconf TK Reactor / TK Resource Factory
+          support.
+
+Thu Feb 23 18:41:18 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tao/Utils/Servant_Var.inl (operator=):
+        * tao/Valuetype/Value_VarOut_T.cpp (operator=):
+
+          Fixed problem where non-copying assignment prematurely decreased
+          reference count on contained object by adding a check for
+          self-assignment.  The canonical copy-and-swap idiom was used to
+          provide a strong exception safety guarantee.  It doesn't require
+          a self-assignment check for copying assignment but it may be
+          needed for non-copying assignment.  Addresses memory access
+          violations.
+
+Thu Feb 23 17:14:25 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+
+          Fixed unused argument warning.
+
+Thu Feb 23 16:45:36 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
+        * tests/Bug_2186_Regression/Hello.h:
+        * tests/Bug_2186_Regression/Hello.cpp:
+        * tests/Bug_2186_Regression/README:
+        * tests/Bug_2186_Regression/Test.idl:
+        * tests/Bug_2186_Regression/client.cpp:
+        * tests/Bug_2186_Regression/run_test.pl:
+        * tests/Bug_2186_Regression/server.conf:
+        * tests/Bug_2186_Regression/server.cpp:
+
+          Added a regression test for this bug. This will fail until it is
+          fixed.
+
+Thu Feb 23 15:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/PI/PICurrent_Impl.cpp:
+
+        Updated/TAOized debug text at line 57.
+
+Thu Feb 23 15:10:18 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+
+          Added A helper function that tests the equivalency of two
+          profiles that come from an ior and an iogr.
+
+Thu Feb 23 10:55:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/README:
+
+        Updated README to show example test run.
+
+Wed Feb 22 23:42:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerate for new files.
+
+Wed Feb 22 20:54:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/LogNotification.cpp:
+
+          _duplicate() log reference before assigning it to event's logref
+          field to get life cycle/reference count management right.  Fixes
+          bugzilla issue #2416.
+
+Wed Feb 22 20:37:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com>
+
+        * tao/PluggableMessaging.h: Remove abstract operation:
+        read_message, missing_data, get_message_data. Add abstract
+        operation parse_next_message (), consolidate_fragmented_message,
+        discard_fragmented_message.
+
+        * tao/GIOPMessageBase.{h,cpp}: Remove implementation for
+        read_message. Add parse_incoming_messages. Add implementation for
+        new abstract methods consolidate_fragmented_message,
+        parse_next_message, discard_fragmented_message. Declare as private
+        parse_incoming_messages, parse_request_id.  Add new member
+        attribute fragment_stack_ of type Incoming_Message_Stack. Handle
+        TAO_GIOP_MESSAGE_ERROR not as error. For incomplete messages of
+        unknown size, allocating message_blocks of size
+        ACE_CDR::DEFAULT_BUFSIZE. Handle memory allocation failures in
+        code. Wrap output-strings with ACE_TEXT macro.
+
+        * tao/GIOP_Message_Lite.{h,cpp}: Remove implementation of
+        read_message and get_message_data. Handle
+        GIOP_MESSAGE_CANCELREQUEST. IMplement new virtual method
+        parse_next_message, Handle out-of-memory cases. Dummy
+        implementations for consolidate_fragmented_message and
+        discard_fragmented_message.
+
+        * tao/Incoming_Message_Stack.{h,cpp}: New class providing stack
+        operations for TAO_Queued_Data, operations do not require dynamic
+        memory allocation.
+
+        * tao/Incoming_Message_Queue.{h,cpp,inl}: remove obsolet
+        operations for interface TAO_Incoming_Message_Queue: copy_tail,
+        is_tail_complete, is_head_complete, is_tail_fragmented,
+        missing_data_tail, find_fragment_chain. Change return type to
+        "int" for operation consolidate, return value -1 indicating out of
+        memory cases.
+
+        * tao/Transport.{h,cpp}: Major changes: New implementation of
+        operation handle_input() fixing following, errors with GIOP
+        fragment handling that showed up testing with Java_Big_Request
+        test (w/ jre1.4), handling of messages bigger than 2Go, concurrent
+        processing of short messages using single-read-optimization, keep
+        connection in case of GIOP CancelRequests, compensate memory
+        buffer alignment. Remote methods from interface
+        parse_consolidate_messages, parse_incoming_messages, missing_data,
+        consolidate_message, consolidate_fragments,
+        consolidate_message_queue, consolidate_extra_messages,
+        make_queued_data. Add methods handle_input_missing_data,
+        handle_input_parse_data. Add instance member
+        "incoming_message_stack_" of type Incomig_Message_Stack. Minor
+        changes: Wrap output strings with ACE_TEXT macro, remove
+        ACE_ASSERT statements.
+
+        * tao/Strategies/DIOP_Transport.cpp: Compensate memory buffer
+        alignment.
+
+        * tao/Strategies/SHMIOP_Transport.{h,cpp}: Compensate memory
+        buffer alignment.  Adapt to new interface of
+        PluggableMessaging. Add specialized implemenation of
+        PLuggable_Messaging::handle_input()
+
+        * tao/tao.mpc: Add dependency to tao/IncomingMessageStack.{h,cpp}
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Tranport.cpp: Adapt to new
+        interface of PluggableMessaging.
+
+        These changes require to recompile and modify custom Messaging
+        implementations.  This patch fixes #2303, 2305, 2306, 2307, 2308,
+        2309, 2313, 2361, 2365
+
+Wed Feb 22 16:55:24 GMT 2006  Rich Seibel <seibel_r@ociweb.com>
+
+        * examples/RTScheduling/MIF_Scheduler/svc.conf.client:
+        * examples/RTScheduling/MIF_Scheduler/svc.conf.server:
+          Changed priority policy from direct to continuous.
+          The direct does not work on AIX 5.3, but continuous
+          seems to work everywhere.
+
+Wed Feb 22 16:45:29 GMT 2006  Rich Seibel <seibel_r@ociweb.com>
+
+        * tao/Array_VarOut_T.inl:
+          Removed a nasty cast that shouldn't be necessary.
+          Only broken builds, like MSVC6 should require the
+          reinterpret_cast<>, otherwise builds should need
+          no cast.  Thus, only the broken compilers should
+          be singled out.  Thanks to the XL 7 compiler on
+          AIX for pointing this out.
+
+Wed Feb 22 15:56:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          Reverting a change, added with the commits from
+          Fri Feb 10 20:40:31 UTC 2006 and Thu Feb  9 19:59:41 UTC
+          2006. The original intent was to ensure that unsecured clients
+          can not make invocations on servants, explicitly marked as
+          secure. The problem is in that a client-side-only policy
+          (Security::SecQoP*) was used, which is not permitted by the
+          CORBA specification. An alternative solution, based upon
+          SecurityLevel2 SecureInvocationPolicy or SecurityLevel3
+          ObjectCredentialsPolicy should be sought. Thanks
+          to Ossama Othman <Ossama_Othman at symantec dot com> for
+          pointing that out and discussing the alternatives.
+
+        * NEWS:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * orbsvcs/tests/Security/Policies/Foo.idl:
+        * orbsvcs/tests/Security/Policies/Foo_i.h:
+        * orbsvcs/tests/Security/Policies/Foo_i.cpp:
+        * orbsvcs/tests/Security/Policies/Policies.mpc:
+        * orbsvcs/tests/Security/Policies/README:
+        * orbsvcs/tests/Security/Policies/cacert.pem:
+        * orbsvcs/tests/Security/Policies/client.conf:
+        * orbsvcs/tests/Security/Policies/client.conf.xml:
+        * orbsvcs/tests/Security/Policies/client.cpp:
+        * orbsvcs/tests/Security/Policies/client_cert.pem:
+        * orbsvcs/tests/Security/Policies/client_key.pem:
+        * orbsvcs/tests/Security/Policies/client_nopasswd.conf:
+        * orbsvcs/tests/Security/Policies/client_nopasswd.conf.xml:
+        * orbsvcs/tests/Security/Policies/run_test.pl:
+        * orbsvcs/tests/Security/Policies/server.conf:
+        * orbsvcs/tests/Security/Policies/server.conf.xml:
+        * orbsvcs/tests/Security/Policies/server.cpp:
+        * orbsvcs/tests/Security/Policies/server_cert.pem:
+        * orbsvcs/tests/Security/Policies/server_key.pem:
+        * orbsvcs/tests/Security/Policies/server_key_nopasswd.pem:
+
+          Removed these files.
+
+Wed Feb 22 12:15:30 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2134_Regression/Hello.cpp:
+
+          Fix error on FC4_ACE_FOR_TAO build. Spurious ';'s in the code.
+
+Wed Feb 22 11:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/PI/PICurrent_Copy_Callback.cpp:
+        * tao/PI/PICurrent_Impl.cpp:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PICurrent_Impl.inl:
+        * tao/PI_Server/PICurrent_Guard.cpp:
+
+          Bugzilla bugfix #2304, also fixes #2066
+
+Wed Feb 22 09:55:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+
+          Updated regression test for set_slot in send_reply
+          bugzilla bug #2304.
+
+Wed Feb 22 04:45:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com>
+
+        * tao/ORB_Core.cpp:
+          Fixing TAO_ORB_Core_Auto_Ptr assignment
+
+        * tao/ORB_Table.{h,inl}:
+          Fixing namespace-ing for TAO_ORB_Core.
+
+        * tao/Stub.i:
+          Fixing TAO_ORB_Core declaration
+
+          Together all these changes are related to previous commit for
+          bugzilla bugs #1741 / #2134; #2289; #1493; #2130.
+
+Tue Feb 21 19:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.{h,cpp}:
+        * tao/AnyTypeCode_Adapter.h:
+          Added insert_into_any methods for all basic types. Thanks to
+          Nemoy Michael <michaeln at sintecmedia dot com> for providing
+          the patches. This also fixes bugzilla bugs 2371, 2367, and 2422
+
+Tue Feb 21 17:48:24 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tao/Adapter.h:
+
+          Remove the CORBA::Object_ptr argument from
+          ::initialize_collocated_object on TAO_Adapter. We need to call this
+          method in circumstances when a CORBA::Object is not available.
+
+        * tao/Adapter_Registry.h:
+        * tao/Adapter_Registry.cpp:
+
+          Reflect the above change. Also ::initialize_collocated_object must
+          now only return 0 for success if the stub it is working on has been
+          fully initialized. The registry reflects this by continuing to try
+          adapters until one returns 0.
+
+          Similarly ::create_collocated_object now will potentially call the
+          above method on all remaining adapters if, after an adapter has
+          created an Object, the Object has not been fully initialized.
+
+        * tao/IORTable/Table_Adapter.h:
+        * tao/IORTable/Table_Adapter.cpp:
+
+          Create a common method ::find_object which attempts to locate an
+          object in in the table. Implement ::dispatch in terms of this method.
+
+          Implement ::initialize_collocated_object to search the table using
+          the above mentioned ::find_object method and, if one is found, to
+          forward the stub it is initializing to this object ref. Reflect the
+          change in API for ::initialize_collocated_object.
+
+          Add an implementation of ::create_collocated_object in terms of
+          ::initialize_collocated_object.
+
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Table.h:
+
+          Include the locking changes proposed by Robert Hancock (Robert dot
+          Hancock at sedsystems dot ca) on bug #2130 with a couple of small
+          mods. Thanks to Robert Hancock for providing these.
+
+          Add a new method ::reinitialize_object to be called on stubs whenever
+          an object has been forwarded or has fallen back from a forwarded
+          location. This method determines if the stub has become (or ceased to
+          be) collocated and performs the necessary actions to set the
+          collocation relevent attributes on the stub.
+
+        * tao/Object.h:
+        * tao/Object.i:
+        * tao/Object.cpp:
+
+          Remove the members TAO::Object_Proxy_Broker *proxy_broker_,
+          TAO_Abstract_ServantBase *servant_ and
+          CORBA::Boolean is_collocated_ from this class. These are now held on
+          the stub. Change all access to these values to delegate to the stub.
+
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+
+          Remove the CORBA::Object_ptr argument from the function
+          _TAO_collocation_Object_Proxy_Broker_Factory. It was unused and we
+          need to use this when we don't have an Object.
+
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+
+          Reflect the change in API for ::initialize_collocated_object. Make
+          that method and ::create_collocated_object use the new accessors
+          for collocation attributes on the stub rather than the CORBA::Object.
+  Make ::initialize_object only return 0 for success if it has fully
+  completed the intialisation of an object. i.e. it managed to locate
+          a collocated servant for the stub.
+
+        * tao/Stub.h:
+        * tao/Stub.i:
+        * tao/Stub.cpp:
+
+          Add the collocated servant, collocated indicator, and object proxy
+          broker members from CORBA::Object to this class with appropriate
+          accessors.
+
+          Insert calls to ::reinitialize_object on the stubs ORB core at points
+          where the stub may have moved to / from being collocated.
+
+          Together all these changes fix bugzilla bugs #1741 / #2134; #2289;
+          #1495; #2130.
+
+        * tests/Bug_2134_Regression/Bug_2134_Regression.mpc:
+        * tests/Bug_2134_Regression/Hello.idl:
+        * tests/Bug_2134_Regression/Hello.cpp:
+        * tests/Bug_2134_Regression/README:
+        * tests/Bug_2134_Regression/run_test.pl:
+
+          A regression test for bugzilla #1741 / #2134. #2289 is already in the
+          repo, as is #1495.
+
+Tue Feb 21 17:45:06 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+
+          Cosmetic change to source code.
+
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp (members_i):
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp (members_i):
+
+          Fixed a bug with nested structs/nested unions that results
+          in the servant's ACE_Configuration_Section_Key (its
+          placeholder in the repository) being changed to the key
+          of the nested type, when processing returns to the top level
+          Thanks to Richard Spence <richard.spence.extern@icn.siemens.de>
+          for reporting the bogus exception thrown in TypeCodeFactory
+          that uncovered the problem. This fix closes [BUGID:2407].
+
+Mon Feb 20 15:06:27 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * TAO version 1.4.10 released.
+
+Mon Feb 20 07:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Release:
+          Updated for rename of TAOACE.mwc to TAO_ACE.mwc
+
+Sun Feb 19 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+          Fixed conversion warning and fixed compile error with gcc4
+
+Fri Feb 17 19:30:59 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS:
+
+          Updated this file with more inputs.
+
+Fri Feb 17 15:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Small improvements
+
+Fri Feb 17 13:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+          Removed escape character that slipped in by accident
+
+Fri Feb 17 09:40:00 UTC  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+          Work around GCC4.0 template resolusion compilation bug?
+
+Fri Feb 17 09:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+          Fixed compile error with Borland
+
+Fri Feb 17 08:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+          Fixed conversion warning
+
+Thu Feb 16 19:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+          Fixed GOA factory name. Thanks to Alex Sheh
+          <ASHEH at euphonix dot com> for reporting this.
+
+Thu Feb 16 18:11:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/default_client.cpp:
+
+          Report an error if unknown/unsupported argument is used with
+          -ORBIIOPProfileLock.
+
+          Changed -ORBConnectionHandlerCleanup to support 0 and 1 as
+          arguments.  Previously it only supported false, which made it
+          impossible to set the option after the default was changed to
+          false last September.  Support false (and now true) arguments
+          for backwards compatibility.
+
+Thu Feb 16 16:00:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Revert change that got mixed in with:
+          Thu Feb 16 03:33:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+Thu Feb 16 12:35:00 UTC  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/InvokeMe.idl:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/README:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+          Added regression test for Bugzilla 2403
+
+Thu Feb 16 09:21:51 UTC Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAOACE.mwc:
+        * TAO_ACE.mwc:
+          Renamed TAOACE to TAO_ACE, makes it easier for the builds to
+          exclude
+
+Thu Feb 16 03:33:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * docs/tutorials/Quoter/AMI/Makefile.am:
+        * docs/tutorials/Quoter/Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Advanced/ch_3/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+        * examples/Callback_Quoter/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/Event_Comm/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/Logging/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Quoter/Makefile.am:
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * orbsvcs/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/LifeCycle_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+        * orbsvcs/Trading_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/Log/RTEvent/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
+        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Memory/IORsize/Makefile.am:
+        * performance-tests/Memory/Single_Threaded/Makefile.am:
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+
+          Regenerated with new MPC automake template.  Addresses
+          problems where *.idl files in IDL custom_only projects
+          weren't listed.  This addresses a large part of the issue
+          raised by Vladimir Panov where orbsvcs *.idl files were
+          not installed.
+
+Wed Feb 15 20:11:51 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+
+          Renamed many of the projects within this MPC file to avoid fuzz
+          warnings.
+
+Wed Feb 15 16:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Objref_TypeCode.cpp:
+        * tao/Special_Basic_Argument_T.cpp:
+          Added includes to fix the solaris autoconf build. Thanks to
+          Vladimir Panov <gbr at voidland dot org> for reporting this
+          and providing patches.
+
+Wed Feb 15 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PICurrent_Impl.h:
+          Extended documentation
+
+        * tests/Portable_Interceptors/AdvSlotExt/*:
+          Another new PI test. We test the PI functionality in
+          receive_request. When we set a value in TSC, then this should
+          be independent of any change in RSC, so we set a value in
+          TSC, then another value in RSC and then read TSC again and
+          check if we did get the correct value back.
+
+        * tao/PI/PICurrent_Impl.cpp (set_slot):
+          When this PICurrent has a lc_slot_table set, then copy this
+          table we refer to to our own table befor we start modifiying
+          our table.
+
+        * tao/PI/PICurrent_Copy_Callback.cpp:
+          Only copy the slot table from source to destination when the
+          destination still refers to the table of the source.
+
+          These changes together fix bugzilla bug 2401 and 2398.
+
+Wed Feb 15 09:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PICurrent_Copy_Callback.{h,cpp}:
+          Changed the return type of the execute method to void, there
+          was no real meaning for the return value
+
+        * tao/PI/PICurrent_Impl.cpp:
+          Updated for the change of the return value type
+
+Wed Feb 15 08:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/TC_Alignment/test_i.cpp:
+          Fixed compile errors with Borland
+
+        * tao/PI_Server/PICurrent_Guard.h:
+          No need to export this class from this shared library
+
+Tue Feb 14 13:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PICurrent/server.cpp:
+          Explicitly destroy the ORB at the end to make sure all interceptors
+          do get destroyed
+
+Tue Feb 14 12:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp:
+          Improved check in receive_request to not give bad output
+
+Tue Feb 14 11:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Abstract_Interface/test_i.cpp:
+        * tests/OBV/Any/AnyS_impl.cpp:
+        * tests/OBV/Any/client.cpp:
+        * tests/OBV/Collocated/Forward/Client_Task.cpp:
+        * tests/OBV/Forward/client.cpp:
+          Fixed compile errors with Borland
+
+Tue Feb 14 08:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp:
+          Added a test case for bugzilla bug 2401, in the receive_request we
+          modifity the RSC, this should not effect the TSC, this bug has not
+          been fixed yet, working on it
+
+Tue Feb 14 08:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/ValueBox/client.cpp:
+          Fixed compile errors with Borland C++
+
+Mon Feb 13 20:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Latency/DII/client.cpp:
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+          Use a cast to convert a ACE_hrtime_t to a CORBA::ULongLong. This
+          fixes compile errors on Solaris 64bit
+
+Mon Feb 13 16:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/releasenotes/orbcore.html:
+          Updated link for bugzilla
+
+Mon Feb 13 15:51:38 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Remove trailing whitespace for const wstring's as is done for
+          const string's.
+
+        * tao/Seq_Var_T.h:
+        * tao/Seq_Var_T.inl:
+
+          Added const [] operators to the TAO_FixedSeq_Var_T and
+          TAO_VarSeq_Var_T classes.
+
+Mon Feb 13 15:23:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
+
+          Regenerate.  Test now requires Strategies library.
+
+Mon Feb 13 15:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h:
+          Changed is_primary from bool to CORBA::Boolean to fix compile
+          errors with MacOS. Also removed is_primary method, was just
+          declared and I couldn't find any implementation
+
+Mon Feb 13 14:21:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_union.cpp (compute_default_value):
+
+          When a clash is found between a declared case label value and
+          the initialized default discriminator value for a boolean
+          discriminator, changed the method of modifying the intialized
+          discriminator defaul value from '++' to '^=', in order to
+          be consistent with the changes in
+
+          Thu Feb  9 16:31:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          since this type of discriminator value is now stored internally as
+          a native boolean instead of a signed long.
+
+        * TAO_IDL/be/be_generator.cpp:
+        * TAO_IDL/be_include/be_generator.h:
+
+          Changed signature of one of the create_expr() overloads
+          to match the signature change to constructors of be_expression
+          and AST_Expression in
+
+          Thu Feb  9 16:31:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Mon Feb 13 13:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlot/server.cpp:
+          Improved this test, explicitly put a Long with value 5 in the PI
+          slot and retrieve it later, this we can check whether we get
+          the correct value back.
+
+Mon Feb 13 13:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PICurrent_Copy_Callback.h:
+          Disallow copy and assignment
+
+Mon Feb 13 12:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PICurrent_Impl.cpp:
+          Added some more documentation
+
+Mon Feb 13 12:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PICurrent_Impl.h:
+          Doxygen improvements
+
+Mon Feb 13 12:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlot/client.cpp:
+          Call shutdown on the server when ready
+
+Mon Feb 13 11:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Fixed typo in comment
+
+        * tao/PortableServer/Servant_Upcall.h:
+          Document that we have an instance per upcall
+
+Mon Feb 13 11:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Initialise some pointers with 0
+
+Mon Feb 13 11:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Thread_Pool.{h,cpp}:
+          Create the dynamic threads as detached, they can exit themselves
+          when load drops again, so we then can't join on them. Used the
+          same flags as for the TPC thread the ORB can create
+
+Mon Feb 13 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Security/Policies/Foo_i.cpp:
+          Use CORBA::is_nil to check if an object reference is nil or not
+
+Mon Feb 13 09:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Do the allocation of the ExceptionHolder in two steps, for allocate
+          is using a pointer and then assign this pointer to a _var. Fixes
+          compile problems in the Borland builds
+
+Sun Feb 12 13:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/catior/catior.cpp:
+        * orbsvcs/tests/Security/Policies/client.cpp:
+          Fixed conversion warning
+
+        * orbsvcs/tests/Security/Policies/Policies.mpc:
+          No need to set exename
+
+Sun Feb 12 08:32:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Regenerated.
+
+        * utils/catior/catior.cpp:
+
+          Use #include "orbsvcs/CosNamingC.h" instead of #include
+          "CosNamingC.h", as per normal TAO include path conventions.
+
+        * utils/catior/catior.mpc:
+
+          Remove includes += definition.  The include path already has
+          orbsvcs via inheritance from namingexe.
+
+Sun Feb 12 05:29:06 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+
+          Cosmetic change to source code.
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp (gen_throw_spec):
+
+          Fixed code generation error introduced with a change to this
+          file in
+
+          Thu Feb  9 14:06:09 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+Sat Feb 11 15:36:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/OBV/ValueBox/Test_impl.cpp:
+
+          Divide sizeof(VBlongarray) by sizeof(CORBA::Long) instead of
+          sizeof(long).  Fixes OBV/ValueBox test on systems with 64 bit
+          longs.
+
+Sat Feb 11 04:08:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+Sat Feb 11 000:26:18 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_err.cpp:
+
+          Changed base class AST_Decl to use ACE_CString for its
+          pd_file_name member, instead of using UTL_String*. Also
+          changed static method idl_error_header() to take an
+          ACE_CString for the filename argument. Easier to get
+          this member type to stick around until we check for
+          illegal primary keys, which must be done after all
+          other parsing.
+
+Fri Feb 10 20:40:31 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * orbsvcs/tests/Security/Policies/Foo_i.cpp:
+        * orbsvcs/tests/Security/Policies/client.cpp:
+
+          Minor updates to printed output to prevent the regression suite
+          from incorrectly interpreting debug output as test failure.
+
+Fri Feb 10 19:22:34 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Added iortable as a base project for the CosTrading_Serv library.
+
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+
+          Add the TradingService IOR to the IORTable so that it may be used
+          as a corbaloc within a -ORBInitRef.
+
+        * orbsvcs/tests/Trading/run_test.pl:
+
+          Modified this test to use a corbaloc to locate the TradingService.
+
+Fri Feb 10 15:49:17 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+
+          Reverted back a change I did because its non-compliance
+          with the FT Spec.
+          Thu Feb  9 20:06:18 UTC 2006  Wallace Zhang
+
+Fri Feb 10 15:28:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+
+          Applied the fix suggested by Johnny Willemsen
+          <jwillemsen@remedy.nl> in [BUGID:2145], since it was
+          never supplied by the bug reporter, and closed the entry.
+
+Fri Feb 10 15:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/configurations.html:
+          Fixed link
+
+Fri Feb 10 15:00:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/ServerRequestInterceptor_Adapter.h
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Correct compile problems for TAO_HAS_EXTENDED_FT_INTERCEPTORS
+          builds. This build configuration has been left behind with
+          recent changes.
+
+Fri Feb 10 14:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/EC_Mcast/run_test.pl:
+        * orbsvcs/tests/EC_MT_Mcast/run_test.pl:
+          When we can't spawn the processes, just exit directly instead
+          of waiting on a timeout. Speedsup the daily builds when we
+          can't build the executables
+
+Fri Feb 10 11:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+          Use prefix increment
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h:
+          Removed this file
+
+        * orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc:
+        * orbsvcs/tests/EC_MT_Mcast/MCast.cpp:
+        * orbsvcs/tests/EC_MT_Mcast/svc.conf:
+          Link in the strategies lib, this way this test can be used
+          also in a static environment
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+          Initialise pointer with 0
+
+Fri Feb 10 11:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2319_Regression/*:
+          Added regression for this bug. Thanks to  Toha Bakanovsky
+          <im-scooter at yandex dot ru> for creating this. This bug
+          is not fixed
+
+        * tao/Blocked_Connect_Strategy.h:
+          Doxygen improvements
+
+        * tao/FlResource_Loader.cpp:
+          Removed not needed include
+
+        * tao/FlResource_Factory.h:
+          Reordered includes
+
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+          We did copy PICurrent too often from TSC to RSC and back
+
+        * tao/PortableServer/Servant_Upcall.h:
+          Made single argument constructor explicit
+
+        * tao/RTPortableServer/RT_POA.cpp:
+          Initialize pointer with 0
+
+Fri Feb 10 08:28:55 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
+
+        * utils/catior/catior.cpp:
+        * utils/catior/catior.mpc:
+
+          Better error reporting.
+
+          Implement name server IOR lookup.
+
+Wed Feb  8 12:00:57 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * utils/catior/catior.cpp (cat_codeset_info):
+
+          Take into account CDR encapsulation byte order when demarshaling
+          information from the encapsulation.  Fixes incorrect
+          demarshaling in cases where CDR encapsulation byte order does
+          not match CDR stream byte order.  [Bug 2400]
+
+Thu Feb  9 21:07:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be_include/be_helper.h:
+
+          Changed the signature of the TAO_OutStream operator that
+          takes a TAO_ACE_CHECK struct to get a const reference of
+          the struct, instead of a non-const reference. In code
+          generation, this struct is passed to the operator as a
+          temporary, and gcc is evidently catching that a temporary
+          shouldn't be passed as a non-const reference (Visual Studio
+          did not catch it), but reporting the error as a failure to
+          resolve the operator overload.
+
+Thu Feb  9 20:17:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Fix typo in regeneration.
+
+Thu Feb  9 20:06:18 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+
+          Corrected the use of the length of the passing parameter to a
+          function.
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+
+          Changed the return value of function is_profile_equivalent when
+          comparing an IOR and an IOGR. Basically, when you compare an
+          IOR and an IOGR, we need to return "DONT_KNOW",not
+          "NOT_EQUIVALENT".
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+
+          A fix for using the object reference.
+
+        * tao/IORManipulation/IORManipulation.cpp:
+
+          Corrected the order of adding, removing profiles, and creating
+          Object References.
+
+Thu Feb  9 19:59:41 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This change was adds enforcement for any Security::SecQoP*
+          policies applicable on a POA, that may be different from the ORB
+          default. It resolves an bug, which allowed security unaware
+          clients to make invocations on "secure" objects when the ORB is
+          configured with support for Security::SecQoPNoProtection.
+          ("Secure" in this context means that the object is activated in
+          a POA, for wich security policy was set to at least
+          Security::SecQoPIntegrity.)
+
+       * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+
+          Added code to the interception point to ensure that any
+          Security::SecQoP* policies are enforced.
+
+        * orbsvcs/tests/Security/Policies/Foo.idl:
+        * orbsvcs/tests/Security/Policies/Foo_i.h:
+        * orbsvcs/tests/Security/Policies/Foo_i.cpp:
+        * orbsvcs/tests/Security/Policies/Policies.mpc:
+        * orbsvcs/tests/Security/Policies/README:
+        * orbsvcs/tests/Security/Policies/cacert.pem:
+        * orbsvcs/tests/Security/Policies/client.conf:
+        * orbsvcs/tests/Security/Policies/client.conf.xml:
+        * orbsvcs/tests/Security/Policies/client.cpp:
+        * orbsvcs/tests/Security/Policies/client_cert.pem:
+        * orbsvcs/tests/Security/Policies/client_key.pem:
+        * orbsvcs/tests/Security/Policies/client_nopasswd.conf:
+        * orbsvcs/tests/Security/Policies/client_nopasswd.conf.xml:
+        * orbsvcs/tests/Security/Policies/run_test.pl:
+        * orbsvcs/tests/Security/Policies/server.conf:
+        * orbsvcs/tests/Security/Policies/server.conf.xml:
+        * orbsvcs/tests/Security/Policies/server.cpp:
+        * orbsvcs/tests/Security/Policies/server_cert.pem:
+        * orbsvcs/tests/Security/Policies/server_key.pem:
+        * orbsvcs/tests/Security/Policies/server_key_nopasswd.pem:
+
+          Added a test to excercise the various combinations of clients
+          making invocations on servers that either support or requre
+          protection.
+
+Thu Feb  9 19:27:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/HTOIP.mpc:
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+
+          Add Pidl_Files section so that *_endpoints.pidl files are
+          installed in autoconf builds.
+
+Thu Feb  9 18:25:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          If TAO_ROOT or ACE_ROOT environment variables are set they
+          override the path set by 'TAO_IDL_INCLUDE_DIR'.  Both $TAO_ROOT
+          and $TAO_ROOT/tao (or $ACE_ROOT/TAO and $ACE_ROOT/TAO/tao) have
+          to be added to the list of preprocessor include paths.  Instead
+          of unconditionally disabling appending the second include path
+          when TAO_IDL_INCLUDE_PATH is defined, we just set it to '.' in
+          the case neither TAO_ROOT or ACE_ROOT environment variables are
+          set.
+
+          Similarly, disable appending /orbsvcs, /CIAO, and /CIAO/ciao to
+          TAO_IDL_INCLUDE_PATH, again setting the include paths to '.'.
+
+Thu Feb  9 16:45:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/be_global.cpp:
+        * orbsvcs/IFR_Servicebe_global.h:
+        * orbsvcs/IFR_Serviceifr_adding_visitor.cpp:
+        * orbsvcs/IFR_Serviceifr_adding_visitor_exception.cpp:
+        * orbsvcs/IFR_Serviceifr_adding_visitor_structure.cpp:
+        * orbsvcs/IFR_Serviceifr_adding_visitor_union.cpp:
+
+          - removed all usage of idl_bool typedef in the IFR loader,
+            consistentlty with changes in
+
+            Thu Feb  9 16:31:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          - added support for boxed valuetypes to the IFR loader
+
+Thu Feb  9 16:31:17 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/idl_bool.h:
+
+          Removed this file, no longer used because of changes
+          below.
+
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/ast/ast_array.cpp:
+        * TAO_IDL/ast/ast_attribute.cpp:
+        * TAO_IDL/ast/ast_component.cpp:
+        * TAO_IDL/ast/ast_component_fwd.cpp:
+        * TAO_IDL/ast/ast_constant.cpp:
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/ast/ast_enum.cpp:
+        * TAO_IDL/ast/ast_eventtype.cpp:
+        * TAO_IDL/ast/ast_eventtype_fwd.cpp:
+        * TAO_IDL/ast/ast_exception.cpp:
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/ast/ast_factory.cpp:
+        * TAO_IDL/ast/ast_generator.cpp:
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_interface_fwd.cpp:
+        * TAO_IDL/ast/ast_module.cpp:
+        * TAO_IDL/ast/ast_native.cpp:
+        * TAO_IDL/ast/ast_operation.cpp:
+        * TAO_IDL/ast/ast_predefined_type.cpp:
+        * TAO_IDL/ast/ast_recursive.cpp:
+        * TAO_IDL/ast/ast_redef.cpp:
+        * TAO_IDL/ast/ast_sequence.cpp:
+        * TAO_IDL/ast/ast_string.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/ast/ast_structure_fwd.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/ast/ast_typedef.cpp:
+        * TAO_IDL/ast/ast_union.cpp:
+        * TAO_IDL/ast/ast_valuebox.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/ast/ast_valuetype_fwd.cpp:
+        * TAO_IDL/be/be_argument.cpp:
+        * TAO_IDL/be/be_array.cpp:
+        * TAO_IDL/be/be_attribute.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_component.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_enum.cpp:
+        * TAO_IDL/be/be_eventtype.cpp:
+        * TAO_IDL/be/be_exception.cpp:
+        * TAO_IDL/be/be_expression.cpp:
+        * TAO_IDL/be/be_generator.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_home.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_interface_fwd.cpp:
+        * TAO_IDL/be/be_native.cpp:
+        * TAO_IDL/be/be_operation.cpp:
+        * TAO_IDL/be/be_predefined_type.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_string.cpp:
+        * TAO_IDL/be/be_structure.cpp:
+        * TAO_IDL/be/be_sunsoft.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_typedef.cpp:
+        * TAO_IDL/be/be_union.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_scope.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ci.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ci.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_home/home_ch.cpp:
+        * TAO_IDL/be/be_visitor_home/home_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+        * TAO_IDL/be/be_visitor_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/remote_proxy_broker_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/argument.cpp:
+        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_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_structure/structure_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ci.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ci.cpp:
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+        * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_array.h:
+        * TAO_IDL/be_include/be_attribute.h:
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be_include/be_enum.h:
+        * TAO_IDL/be_include/be_eventtype.h:
+        * TAO_IDL/be_include/be_exception.h:
+        * TAO_IDL/be_include/be_expression.h:
+        * TAO_IDL/be_include/be_generator.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_helper.h:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_interface_fwd.h:
+        * TAO_IDL/be_include/be_operation.h:
+        * TAO_IDL/be_include/be_sequence.h:
+        * TAO_IDL/be_include/be_structure.h:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_typedef.h:
+        * TAO_IDL/be_include/be_union.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * TAO_IDL/be_include/be_visitor_arg_traits.h:
+        * TAO_IDL/be_include/be_visitor_context.h:
+        * TAO_IDL/be_include/be_visitor_scope.h:
+        * TAO_IDL/be_include/be_visitor_operation/operation.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/arglist.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_ci.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/fe/fe_interface_header.cpp:
+        * TAO_IDL/fe/idl.yy
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/y.tab.cpp:.diff
+        * TAO_IDL/fe/y.tab.h:
+        * TAO_IDL/include/ast_array.h:
+        * TAO_IDL/include/ast_attribute.h:
+        * TAO_IDL/include/ast_component.h:
+        * TAO_IDL/include/ast_constant.h:
+        * TAO_IDL/include/ast_decl.h:
+        * TAO_IDL/include/ast_enum.h:
+        * TAO_IDL/include/ast_eventtype.h:
+        * TAO_IDL/include/ast_exception.h:
+        * TAO_IDL/include/ast_expression.h:
+        * TAO_IDL/include/ast_extern.h:
+        * TAO_IDL/include/ast_generator.h:
+        * TAO_IDL/include/ast_home.h:
+        * TAO_IDL/include/ast_interface.h:
+        * TAO_IDL/include/ast_interface_fwd.h:
+        * TAO_IDL/include/ast_module.h:
+        * TAO_IDL/include/ast_operation.h:
+        * TAO_IDL/include/ast_sequence.h:
+        * TAO_IDL/include/ast_structure.h:
+        * TAO_IDL/include/ast_structure_fwd.h:
+        * TAO_IDL/include/ast_type.h:
+        * TAO_IDL/include/ast_typedef.h:
+        * TAO_IDL/include/ast_union.h:
+        * TAO_IDL/include/ast_valuetype.h:
+        * TAO_IDL/include/fe_interface_header.h:
+        * TAO_IDL/include/global_extern.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/include/utl_identifier.h:
+        * TAO_IDL/include/utl_list.h:
+        * TAO_IDL/include/utl_namelist.h:
+        * TAO_IDL/include/utl_scope.h:
+        * TAO_IDL/include/utl_string.h:
+        * TAO_IDL/include/utl_tmpl/utl_exceptlist.h:
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/util/utl_identifier.cpp:
+        * TAO_IDL/util/utl_idlist.cpp:
+        * TAO_IDL/util/utl_list.cpp:
+        * TAO_IDL/util/utl_namelist.cpp:
+        * TAO_IDL/util/utl_scope.cpp:
+        * TAO_IDL/util/utl_stack.cpp:
+        * TAO_IDL/util/utl_string.cpp:
+        * TAO_IDL/util/utl_strlist.cpp:
+        * TAO_IDL/util/utl_tmpl/utl_idlist.cpp:
+        * TAO_IDL/util/utl_tmpl/utl_list.cpp:
+        * TAO_IDL/util/utl_tmpl/utl_strlist.cpp:
+
+          - Replaced all usage of the IDL compiler's internal type
+            idl_bool (typedef of long) with native bool. Also
+            replaced similarly typedef'd values I_TRUE and I_FALSE.
+
+          - Extended the effects of the -Ge 2 command line option
+            (which previously replaced 'ACE_THROW' with 'throw'
+            and removed all generation of environment variables
+            and forms of 'ACE_CHECK' in user defined operations)
+            to remove generation of environment variables and
+            forms of 'ACE_CHECK' in all operations, including
+            overrides of inherited operations, to replace
+            all forms of 'ACE_TRY' and 'ACE_CATCH', and  to
+            remove generation of 'ACE_ENDTRY'.
+
+          - regenerated lex.yy.cpp and y.tab.cpp, along with
+            the associated diff files.
+
+          - removed the passing of 'TAO_IDL_INCLUDE_DIR/tao' path to
+            the preprocessor, when 'TAO_IDL_INCLUDE_DIR' is used
+            instead of the TAO_ROOT environment variable.
+
+          - made many cosmetic changes to generated code formatting.
+
+Thu Feb  9 14:06:09 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/be/be_global.cpp:
+
+          Whitespace.
+
+        * TAO_IDL/be/be_visitor_operation/tie_si.cpp:
+
+          Prevent arguments called T from clashing with the temmplate class
+          identifier. This fixes bug #2390.
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp:
+
+          Prevent generation of spurious SystemException throw specs on
+          valuetype factroy methods. This fixes bug #2375.
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Change all '#include "foo.idl"' entries in IDL files to
+          '#include <foo.idl>' before feeding them to the pre-processor.
+          Prevents accidental processing of IDL files from the users tmp
+          directory. This fixes bug #2399.
+
+        * tests/Bug_2375_Regression/Bug_2375_Regression.mpc:
+        * tests/Bug_2375_Regression/README:
+        * tests/Bug_2375_Regression/test.cpp:
+        * tests/Bug_2375_Regression/test.idl:
+        * tests/Bug_2399_Regression/README:
+        * tests/Bug_2399_Regression/included.idl:
+        * tests/Bug_2399_Regression/mytmp/included.idl:
+        * tests/Bug_2399_Regression/Bug_2399_Regression.mpc:
+        * tests/Bug_2399_Regression/test.idl:
+        * tests/Bug_2399_Regression/test.cpp:
+
+          Regression tests for two of the above bugs.
+
+Wed Feb 08 15:49:54 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * TAO version 1.4.9 released.
+
+Wed Feb  8 04:46:33 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+
+          Added versioned namespace macros to generation of
+          any insertion/extraction operators.  Thanks to Ossama
+          Othman for pointing out this problem.
+
+Tue Feb  7 22:40:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
+        * tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+        * tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
+        * tests/Sequence_Unit_Tests/generic_sequence.hpp
+        * tests/Sequence_Unit_Tests/mock_reference.cpp
+        * tests/Sequence_Unit_Tests/mock_reference.hpp
+        * tests/Sequence_Unit_Tests/mock_stream.cpp
+        * tests/Sequence_Unit_Tests/mock_stream.hpp
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+        * tests/Sequence_Unit_Tests/object_reference_traits.hpp
+        * tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
+        * tests/Sequence_Unit_Tests/range_checking.hpp
+        * tests/Sequence_Unit_Tests/string_sequence_element.hpp
+        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+        * tests/Sequence_Unit_Tests/string_traits.hpp
+        * tests/Sequence_Unit_Tests/string_traits_base.hpp
+        * tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
+        * tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
+        * tests/Sequence_Unit_Tests/testing_range_checking.hpp
+        * tests/Sequence_Unit_Tests/testing_string_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+        * tests/Sequence_Unit_Tests/value_traits.hpp
+
+          Fixes for versioned namespace compile problems.  Thanks to
+          Ossama Othman (ossama_othman at symantec dot com) for providing
+          assistance..
+
+Tue Feb  7 21:07:35 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+
+          Surrounded valuetype CDR operators with versioned namespace
+          macros.
+
+        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+        * tests/NestedUpcall/MT_Client_Test/local_server.h
+
+          Surrounded forward declarations of ACE/TAO types with versioned
+          namespace macros.
+
+Mon Feb  6 16:46:57 Pacific Standard Time 2006    Ossama Othman  <ossama_othman at symantec dot com>
+
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp:
+
+          Added ability to set "versioned" namespace opening and closing
+          text.  Addresses problem where applications that do not enable
+          versioned namespace support in their own code need not get
+          "versioned" stubs/skeletons.  This was previously done for all
+          other IDL types.  Forward interface declarations were
+          overlooked.
+
+        * tests/MT_BiDir/Sender_i.h:
+        * tests/MT_BiDir/Server_Task.h:
+        * tests/NestedUpcall/MT_Client_Test/local_server.h:
+        * tests/OBV/Collocated/Forward/Server_Task.h:
+        * tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h:
+        * tests/Two_Objects/First_i.cpp:
+        * tests/Two_Objects/First_i.h:
+        * tests/Two_Objects/Object_Factory_i.h:
+        * tests/Two_Objects/Second_i.h:
+
+          Placed forward declarations for ACE/TAO types in the appropriate
+          versioned namespace.
+
+Fri Feb  3 15:16:41 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * tests/Bug_1495_Regression/Server_Task.h:
+        * tests/Bug_2084_Regression/Server_Task.h:
+        * tests/Collocation_Exception_Test/Server_Task.h:
+        * tests/Collocation_Oneway_Tests/Server_Task.h:
+        * tests/Collocation_Tests/Server_Task.h:
+
+          Place ACE_Manual_Event forward declaration within versioned
+          namespace.
+
+        * tests/Hang_Shutdown/Test.idl:
+        * tests/Hang_Shutdown/client.cpp:
+        * tests/Hang_Shutdown/server.cpp:
+        * tests/Hang_Shutdown/test_i.h:
+
+          Removed outer "TAO" namespace.  It served no useful purpose, and
+          conflicted with the versioned TAO namespace used in the core TAO
+          libraries.
+
+Thu Feb  3 14:54:51 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * be/be_visitor_valuebox/valuebox_ci.cpp:
+        * be/be_visitor_valuebox/valuebox_cs.cpp:
+        * be_include/be_visitor_valuebox/valuebox_ci.h:
+        * be_include/be_visitor_valuebox/valuebox_cs.h:
+
+          Moved generated inlined virtual functions out of line.  The
+          TAO_IDL valuebox code previously generated inlined virtual
+          functions, including a virtual destructor, which can cause RTTI
+          problems when attempting to downcast a valuebox object found in
+          a shared library that was compiled with g++ 4.0's
+          "-fvisibility-inlines-hidden" command line option.  The virtual
+          functions marked as "inline" (as opposed to actually inlined)
+          end up being left out of the export table, which breaks RTTI for
+          valueboxes in the shared library.  [Bug 2392]
+
+Fri Feb  3 10:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/TAO-metrics.html:
+          Fixed hyperlink
+
+Thu Feb  2 13:08:31 Pacific Standard Time 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+
+          Added ability to set "versioned" namespace opening and closing
+          text.  Addresses problem where applications that do not enable
+          versioned namespace support in their own code need not get
+          "versioned" stubs/skeletons.  This was previously done for all
+          other IDL types.  Valuetypes were overlooked.
+
+Thu Feb  2 12:20:16 Pacific Standard Time 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+          (ImR_Activator_IDL, ImR_Locator_IDL):
+
+          Added missing "tao_versioning_idl_defaults" base project.  Fixes
+          syntax errors in versioned namespace builds.
+
+Thu Feb  2 17:48:16 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Makefile.am:
+
+          Must build tests before examples, as the Notify Service examples
+          use a Notify Service test library.
+
+Wed Feb  1 21:02:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_predefined_type.cpp:
+
+          Fixed a bug in the computation of repository ids for
+          predefined types.
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp (fill_valuemember_sequence):
+
+          Fixed a bug in retrieving the repository path to the type of
+          a valuetype member.
+
+        * orbsvcs/IFR_Service/adding_visitor.cpp(create_value_member):
+
+          Fixed a bug in looking up a valuetype member's type in the
+          repository.
+
+Wed Feb  1 20:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/pluggable_messaging.html:
+          Added some info how to load IIOP Lite when the strategies lib
+          is used. Thanks to Kobi Cohen Arazi <kobi dot cohenarazi at gmail
+          dot com> for reporting this.
+
+Wed Feb  1 14:46:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * NEWS:
+
+          Describe changes to Telecom Log Service Strategy interface.
+
+Wed Feb  1 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2345_Regression/Bug_2345_Regression.mpc:
+        * tests/Bug_2345_Regression/server.cpp:
+          Link in the ImR_Client library explicitly, this is needed for
+          this test
+
+Wed Feb  1 13:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/pluggable_messaging.html:
+          Small improvements to improve readability
+
+Wed Feb  1 13:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Options.html:
+          Small fix
+
+Tue Jan 31 19:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/rtcorba/issues.html:
+          Fixed bugzilla link
+
+Mon Jan 30 22:04:39 UTC 2006  Ming Xiong <ming.xiong@vanderbilt.edu>
+
+        * TAO/tao/PortableServer/Root_POA.h
+
+         Improved documentation for find_servant_priority ()
+
+Mon Jan 30 17:22:50 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS:
+
+          Moved the NEWS entry below to the right place.
+          Updated info for support for RTCORBA Keepalive.
+
+Mon Jan 30 17:09:25 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * NEWS:
+
+          Record -ORBKeepalive option.
+
+Sun Jan 29 22:23:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_args.cpp (DRV_usage):
+        * TAO_IDL/be/be_global.cpp (usage):
+
+          Moved all all usage messages about -Wb options to the IDL
+          compiler back end, which they are specific to. Thanks to
+          Andy Gokhale <a.gokhale@vanderbilt.edu> for pointing
+          out that these usage message were appearing with the
+          idl_to_picml executable, where they are not relevant.
+
+Sun Jan 29 15:01:13 UTC 2006  Martin Corino <mcorino@remedy.nl>
+
+        * tao/IIOP_Profile.cpp:
+
+          Fixed some compile problems with the enhancements in
+          TAO_IIOP_Profile::to_string() for IPv6 enabled builds.
+
+Sat Jan 28 23:15:13 UTC 2006  Martin Corino <mcorino@remedy.nl>
+
+        * tao/IIOP_Profile.cpp:
+
+          Added enhancement to TAO_IIOP_Profile::to_string() to return
+          *all* endpoints in profile embedded in a corbaloc URL like:
+          corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key
+          Thanks to Victor Chernenko (GE Healthcare) for suggesting this
+          and providing a first patch.
+
+Sat Jan 28 22:22:13 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+
+          Fixed unused argument warning.
+
+Fri Jan 27 22:03:14 UTC 2006  Ming Xiong <ming.xiong@vanderbilt.edu>
+
+        * tao/PortableServer/ServantRetentionStrategy.h
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp
+        * tao/PortableServer/ServantRetentionStrategyRetain.h
+
+        Add a find_servant_priority () method to
+        PortableServer::ServantRetentionStrategy
+        PortableServer::ServantRetentionStrategyNonRetain
+        PortableServer::ServantRetentionStrategyRetain
+
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/Root_POA.h
+
+        Add a find_servant_priority () method to TAO_Root_POA
+
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp
+
+        Change the way TAO_RT_Collocation_Resolver::is_collocated
+        retrieves servant priority. In particular, it will use
+        poa->find_servant_priority () instread of locate_servant_i ()
+
+        This change is aimed at fixing TAO Bug 2325, which has a misuse
+        of Servant_Upcall, causing the aom entry reference counts to
+        be incorrectly incremented.Thanks to Abhi (abhi dot qualcomm
+        dot com) and Johnny for reporting this bug and helping out
+        with the solution.
+
+
+Fri Jan 27 14:53:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+
+          Add some .in()'s to help out old senile compilers who can't
+          figure things out on their own.
+
+Fri Jan 27 03:51:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          If examples and/or tests have been disabled, don't bother
+          generating subdirectory hierarchies or Makefiles for them.
+
+Fri Jan 27 02:41:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+        * orbsvcs/Makefile.am:
+
+          Use BUILD_EXAMPLES AND BUILD_TESTS automake conditionals to
+          control whether TAO's (and TAO's ORBservice's) examples and
+          tests are built.
+
+        * configure.ac:
+
+          Invoke TAO_ENABLE_EXAMPLES and TAO_ENABLE_TESTS.
+
+        * m4/tao.m4:
+
+          Added TAO_ENABLE_EXAMPLES and TAO_ENABLE_TESTS autoconf macros.
+          These enable/disable BUILD_EXAMPLES and BUILD_TESTS automake
+          conditionals.
+
+Thu Jan 26 20:36:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/be_produce.cpp(BE_cleanup):
+
+          Removed code to destory the temporary holding scope entry in
+          the repository after each IDL file is processed. Instead the
+          lifetime of that entry is now tied to the repository itself.
+
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp (visit_typedef):
+
+          Removed code that replaces a typedef with the same repo id
+          with a new entry, which would invalidate any references to
+          the typedef entry that other entries may hold. The IFR will
+          now throw the BAD_PARAM minor code that corresponds to an
+          attempt to create an entry for a repo id that already exists
+          in the repository. Thanks to Richard Spence
+          <richard dot spence dot extern at icn dot siemens dot de>
+          for reporting the problem when the typdef is used as an
+          operation parameter. This closes [BUGID:2381].
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp (name_exists):
+
+          Changed the loop to be a FOR loop using the explicit section
+          names, rather than a while loop calling enumerate_sections()
+          to get each section name.
+
+Thu Jan 26 15:37:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Added lock() method to LogRecordStore that returns a reference
+          to a ACE_SYNCH_RW_MUTEX.  Changed Log_i and Hash_Iterator_i to
+          use the lock (via the ACE_READ_GUARD... and ACE_WRITE_GUARD...
+          macros), while removing its use within the Hash_LogRecordStore
+          methods themselves.
+
+          This change avoids any race conditions in read-modify-write
+          operations (e.g. the set_* methods) that exist when locking is
+          done entirely within the LogRecordStore.
+
+          It also avoids acquiring and releasing the lock multiple times
+          in the course of a single operation, which resulted in a modest
+          performance improvement (~15%) for methods like write_records()
+          and write_recordlist().
+
+          In the future, we may want to abstract locking so instead of a
+          rwlock it may represent a database session or transaction.
+
+Mon Jan 23 15:50:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Obtain the capacity alarm thresholds, log QoS, and week mask
+          from the record store.
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+
+          Added methods to get and set the log QoS and week mask.
+
+Tue Jan 24 20:37:55 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Connection_Handler.cpp:
+
+          Extended Simon McQueen's Fri Jan 20 17:11:49 UTC 2006 addition
+          of support for SO_KEEPALIVE to include taking the value from
+          RTCORBA::TCPPrototocolProperties::keep_alive, when RTCORBA is
+          used, and the application is using a Server or Client
+          ProtocolPolicy.
+
+        * docs/rtcorba/issues.html:
+
+          Removed lack of support for the keep alive protocol property
+          from the list of issues.
+
+Tue Jan 24 19:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Borland/ChatClientWnd.cpp:
+          Fixed parameter unused warnings
+
+Tue Jan 24 15:24:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Calling create_reference_with_id() (via create_log_reference) in
+          the constructor and/or ::init() appears to result in an infinate
+          loop within the ORB.  Until that's resolved, defer obtaining the
+          logs object reference until it's needed.
+
+Tue Jan 24 14:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
+          Fixed export macro in ACE_FACTORY_DECLARE
+
+Tue Jan 24 10:20:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * NEWS:
+          Added -ORBUseLocalMemoryPool option info.
+
+Mon Jan 23 12:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlot/client.cpp:
+        * tests/Portable_Interceptors/AdvSlot/server.cpp:
+          Fixed compile warnings
+
+Sun Jan 22 18:32:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+
+          Use _Serv versions of the export macros.  It seems I missed
+          some that should have been part of this:
+
+          Tue Jan 17 22:26:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+Sun Jan 22 18:24:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp:
+
+          Update ACE_FACTORY_DEFINE() that wasn't updated when splitting
+          the Concurrency Service libraries.
+
+Sun Jan 22 16:54:55 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
+
+        * tests/Portable_Interceptors/AdvSlot/server.cpp:
+
+          Fixed a problem with VC6.
+
+Sun Jan 22 02:42:21 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Added operator== and operator!= for IDL generated types
+          DsLogAdmin::QoSList and DsLogAdmin::TimeInterval. Use them to
+          compare old and new log attribute values to decide whether to
+          send an AttributeValueChange event.
+
+Sun Jan 22 02:34:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Added a new member variable to store the log channel's object
+          reference.  Until now, the code was calling _this() each time
+          the reference was needed.  Not only was this inefficient (the
+          reference is a field of each of the the structures used for log
+          notification events, so it's needed relatively frequently), but
+          also it resulted in the servant being activated in the RootPOA,
+          so a transient rather than persistent IOR was returned.
+
+        * orbsvcs/orbsvcs/Log/LogNotification.cpp:
+
+          The event's logref field wasn't being set in state_change() and
+          threshold alarm(), even though the log channel object reference
+          was being passed to the methods.
+
+Sat Jan 21 01:56:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log_i.cpp:
+
+          Call reset_capacity_alarm_threshold () in set_log_full_action()
+          if the value is changed.
+
+          If the log full action is DsLogAdmin::halt, capacity threshold
+          alarms are triggered when the size of a log exceeds one if its
+          capacity alarm thresholds; if the log full action is ::wrap,
+          capacity threshold alarms are triggered "as if coupled to a
+          guage that counts from zero to the highest capacity threshold
+          value".  The specification doesn't describe required behavior
+          when changing from one to the other.  Since the recordkeeping
+          needed for each option is so different, resetting may be the
+          only realistic option --- at least that way we won't be using
+          one set of data for the other.
+
+        * orbsvcs/orbsvcs/Log_i.cpp:
+
+          The current revision of the log service spec is inconsistent
+          whether an AttributeValueChange event should generated only if
+          the attribute's value actually changed or whether it should be
+          sent unconditionally.  TAO's log service implements the former,
+          which I believe to be the most useful behavior.  Nevertheless,
+          I've filed a defect report with the OMG for clarification.  I've
+          also added a block comment to this effect before each instance
+          to alert future maintainers.
+
+Sat Jan 21 01:02:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log_i.h:
+
+          Changed set_week_mask() to avoid recomputing week_intervals_,
+          updating the record store, and sending an AttributeValueChange
+          event if the new mask has the same value as the old.
+
+          Added operator== and operator!= for many IDL generated types and
+          sequences.  Use them to compare old and new log attribute values
+          to decide whether to send an AttributeValueChange event.
+
+        * orbsvcs/orbsvcs/Log_i.cpp:
+
+          Although set_week_mask() updated week_intervals_ (an optimized
+          representation) from the new mask, it didn't actually save it;
+          this resulted in get_week_mask() returning the original value.
+
+Fri Jan 20 17:11:49 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/params.h:
+        * tao/params.i:
+        * tao/params.cpp:
+
+          Add configuration option -ORBKeepalive to allow users to specify
+          that the SO_KEEPALIVE option be set on TCP sockets.
+
+          This fixes bug #2374.
+
+        * docs/Options.html:
+
+          Add documentation for the above.
+
+Fri Jan 20 16:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * docs/Options.html
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
+        * tao/Resource_Factory.cpp
+        * tao/Resource_Factory.h
+        * tao/default_resource.cpp
+        * tao/default_resource.h
+          Fix for Bug 2373.
+          Add run-time option -ORBUseLocalMemoryPool (0|1) which defaults
+          to the compile time option TAO_USES_LOCAL_MEMORY_POOL.
+
+Fri Jan 20 15:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/CDR.cpp:
+        * tao/CDR.h:
+        * tao/Synch_Reply_Dispatcher.cpp:
+          Fix for Bug 2372.
+          Possiably unnecessary reply_cdr_.clone_from() inside
+          TAO_Synch_Reply_Dispatcher::dispatch_reply() averted.
+
+Fri Jan 20 11:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/AdvSlot/*:
+          Added new regression from Boris Kolpackov
+          <boris at dre dot vanderbilt dot edu> for a bug with PI. Not fixed
+          yet, but having a regression will make finding the problem a lot
+          easier
+
+Fri Jan 20 11:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+          Fixed bug related to the slot functionality of PICurrent, when the
+          slot count is not equal to zero and there is no PICurrent yet,
+          then force the creation of PICurrent by the ORB to make sure we
+          don't loose the slot_count. Thanks to Boris Kolpackov
+          <boris at dre dot vanderbilt dot edu> for providing the patch
+
+Thu Jan 19 02:45:48 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log_i.cpp:
+
+          Call reset_capacity_alarm_threshold () in set_max_size () and
+          set_capacity_alarm_thresholds () if the value is changed.  If
+          either the max size or the threshold list is changed, the old
+          capacity index no longer makes sense.
+
+          Reseting the index means that a ThresholdAlarm event will be
+          sent after the next threshold is crossed.  It is unclear whether
+          this is the correct behavior.  An argument could be made that an
+          event should be sent for each threshold that has already been
+          crossed given the new max size or capacity alarm threshold list.
+
+          Unfortunately the current version of the specification does not
+          describe what is the correct behavior.
+
+Wed Jan 18 23:35:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerate.
+
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+
+          Fix typos in symbol export header file names.
+
+Wed Jan 18 19:43:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/RTEventLogConsumer.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogNotification.h:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+
+          Now that we use the *_Serv_Export versions of the symbol export
+          macros, we need to #include "*_serv_export.h"
+
+Wed Jan 18 19:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Slot/*:
+          Added new regression from Boris Kolpackov
+          <boris at dre dot vanderbilt dot edu> for a bug with PI. Not fixed
+          yet, but having a regression will make finding the problem a lot
+          easier
+
+Wed Jan 18 18:41:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Concurrency/CC_Lock.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+
+          Now that we use the *_Serv_Export versions of the symbol export
+          macros, we need to #include "*_serv_export.h"
+
+Wed Jan 18 13:44:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/RTScheduling/Current.h:
+        * tao/RTScheduling/Current.cpp:
+        * tests/RTScheduling/Current/Thread_Task.cpp:
+        * tests/RTScheduling/DT_Spawn/Thread_Action.h:
+        * tests/RTScheduling/DT_Spawn/test.cpp:
+        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+
+          Reverted a portion of my memory leak changes.  I was mistaken as
+          to the reference counting.
+
+        * tests/RTScheduling/VoidData/test.h:
+
+          Dereference the "something" pointer as was most likely the
+          original intention.
+
+Wed Jan 18 01:42:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * NEWS:
+
+          Update for splitting ORB service libraries.
+
+Tue Jan 17 23:03:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+Tue Jan 17 22:26:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Concurrency/CC_Lock.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogConsumer.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogNotification.h:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+
+          Use _Serv_ version of the symbol export macros.
+
+Tue Jan 17 20:36:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
+          Update project to inherit from rteventlogadmin_serv.mpb ---
+          rteventlogadmin.mpb now only brings in the client stubs.
+
+        * orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in:
+        * orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in:
+
+          New files, pkg-template files for RTEventLogAdmin client stub,
+          servant skeleton, and service implementation libraries.
+
+        * orbsvcs/orbsvcs/Log/rteventlog_serv_export.h:
+        * orbsvcs/orbsvcs/Log/rteventlog_skel_export.h:
+
+          New export headers for RTEventLogAdmin servant skeleton and
+          service implementation libraries.
+
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+
+          Split the RTEventLogAdmin Service (A varient of the OMG Telecom
+          Logging Service that uses TAO's Real-Time Event channels) into
+          three libraries: RTEventLogAdmin, RTEventLogAdmin_Skel, and
+          RTEventLogAdmin_Serv for client stubs, servant skeletons, and
+          service implementation respectively.
+
+Tue Jan 17 13:31:40 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
+
+          Changed #include to use "" instead of <>.
+
+Tue Jan 17 02:32:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/TAO_RTEvent.pc.in:
+        * orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in:
+
+          New files, pkg-template files for RTEvent client stub,
+          servant skeleton, and service implementation libraries.
+
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+
+          Added Pkgconfig_Files section for pkg-config templates.
+
+Tue Jan 17 02:21:56 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in:
+
+          Somehow this pkg-config template was describing the
+          CosNaming_Serv library.
+
+Tue Jan 17 01:50:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+
+          Change type of property_lookup_ map from Any_var to Any, similar
+          to what was done for the Notify_Constraint_Visitor some time
+          ago.  This allows us to avoid dynamically allocating Anys in
+          the constructor for increased performance and reliability.
+
+          I've measured a ~10% performance boost from this change.
+
+Mon Jan 16 17:57:53 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/AV.mpc
+
+          Fixed a linking error on OS X.
+
+Mon Jan 16 16:49:27 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
+        * tao/Exception.h:
+        * tao/RTScheduling/Current.cpp:
+        * tao/SystemException.h:
+        * tao/SystemException.cpp:
+        * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
+        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+          Get rid of ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO.
+          If macro THREAD_CANCELLED is defined we now simply undef it.
+
+Mon Jan 16 14:17:47 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+
+          Delete the stored memory in _tao_decode() before calling
+          demarshal_value() to avoid leaking memory.
+
+        * tao/RTScheduling/Current.h:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/Distributable_Thread.h:
+        * tao/RTScheduling/RTScheduler_Initializer.cpp:
+        * tao/RTScheduling/Request_Interceptor.h:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+
+          Corrected various misuses of memory management.
+
+        * tests/CodeSets/simple/client.cpp:
+        * tests/CodeSets/simple/server.cpp:
+
+          Added memory cleanup code so these tests do not contribute to
+          the memory leak list.
+
+        * tests/OBV/TC_Alignment/test_i.cpp:
+
+          Call shutdown() on the ORB from within test_i::shutdown() instead
+          of destroy().  Calling destroy() within this context is not
+          allowed by CORBA 2.3.
+
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp:
+
+          Call shtdown() on the ORB with a wait_for_completion of zero
+          instead of 1.  The later is not allowed by CORBA 2.3.
+
+        * tests/Portable_Interceptors/IORInterceptor/server.cpp:
+
+          This test registers a portable interceptor with the ORB.  If
+          destroy() is not called on the ORB the interceptor initializer
+          will be leaked.
+
+        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
+
+          The TAO_Asynch_Queued_Message needs to know if it is allocated on
+          the heap in order to clean itself properly.
+
+        * tests/RTScheduling/Current/Thread_Task.h:
+        * tests/RTScheduling/Current/Thread_Task.cpp:
+        * tests/RTScheduling/Current/test.cpp:
+        * tests/RTScheduling/DT_Spawn/Thread_Action.h:
+        * tests/RTScheduling/DT_Spawn/test.cpp:
+        * tests/RTScheduling/Scheduler.cpp:
+        * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
+        * tests/RTScheduling/Scheduling_Interceptor/test_server.cpp:
+        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+        * tests/RTScheduling/Thread_Cancel/test.cpp:
+        * tests/RTScheduling/VoidData/test_client.cpp:
+
+          Corrected various misuses of memory management.
+
+Mon Jan 16 05:51:14 2006  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * orbsvcs/examples/ImR/Combined_Service/test.cpp (assertTrue):
+          Make sure to #include <string> so that "std::" makes sense.
+          Thanks to Ian Zagorskih <ianzag at megasignal dot com> for this
+          fix.  This fixes bugid 2362.
+
+Sun Jan 15 19:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1869_Regression/client.cpp:
+          Fixed conversion warning
+
+Sun Jan 15 18:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1869_Regression/client.cpp:
+          Fixed unused argument warning
+
+Sun Jan 15 05:44:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Concurrency_Service/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
+        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
+        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
+        * orbsvcs/tests/Concurrency/Makefile.am:
+        * orbsvcs/tests/Property/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/tests/Property/Property.mpc:
+
+          Update project to inherit from property_serv.mpb, as this
+          test uses a collocated concurrency service --- property.mpb
+          now only brings in the client stubs.
+
+        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
+
+          Update project to inherit from concurrency_serv.mpb, as this
+          test uses a collocated concurrency service --- concurrency.mpb
+          now only brings in the client stubs.
+
+        * orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in:
+
+          Split TAO_CosConcurrency.pc.in pkg-config template into one for
+          each library.
+
+        * orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h:
+        * orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h:
+
+          New export headers for CosConcurrency servant skeleton and
+          service implementation libraries.
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+
+          Split CosConcurrency Service into three libraries:
+          CosConcurrency, CosConcurrency_Skel, and CosConcurrency_Serv for
+          client stubs, servant skeletons, and service implementation
+          respectively.
+
+        * orbsvcs/orbsvcs/TAO_CosProperty.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in:
+
+          Split TAO_CosProperty.pc.in pkg-config template into one for
+          each library.
+
+        * orbsvcs/orbsvcs/Property/property_serv_export.h:
+        * orbsvcs/orbsvcs/Property/property_skel_export.h:
+
+          New export headers for CosProperty servant skeleton and service
+          implementation libraries.
+
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+
+          Split CosProperty Service into three libraries:
+          CosProperty, CosProperty_Skel, and CosProperty_Serv for client
+          stubs, servant skeletons, and service implementation
+          respectively.
+
+Sun Jan 15 05:35:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+        * orbsvcs/tests/InterfaceRepo/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am:
+
+          Added autoconf build support for this new test.
+
+Sat Jan 14 23:44:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+
+          Changed TAO_Log_i::set_capacity_alarm_thresholds() to compare
+          the new threshold list against the old.  If they're the same,
+          we don't send a change notification.
+
+          Added operator== and operator!= for DsLogAdmin::
+          CapacityAlarmThresholdList.
+
+Sat Jan 14 16:29:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/TAO_CosEvent.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNaming.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosTrading.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in:
+        * orbsvcs/orbsvcs/TAO_ETCL.pc.in:
+
+          Changed to Require TAO_AnyTypeCode.
+
+Sat Jan 14 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/ExceptionHolder_i.h:
+          Fixed casing of include
+
+Fri Jan 13 13:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1869_Regression/*:
+          Added this regression to cvs, no fix yet and regression could
+          be improved more to give more output to the user
+
+Fri Jan 13 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/ExceptionHolder_i.{h,cpp}:
+        * tao/Messaging/Messaging_ORBInitializer.{h,cpp}:
+          Added a OBV Factory for the ExceptionHolder. At the moment we use
+          AMI with collocation disabled the ExceptionHolder is marshaled
+          and then tried to be demarshaled and then we need an OBV factory.
+          For system exceptions things work fine now, for user exceptions
+          always an UNKNOWN exception occurs in the _excep method, the
+          meta data which user exceptions we could throw is not available
+          in the current callstack so we just can't recreate the correct
+          user exception, have to see how we could fix that but
+          this is at least a good step in the direction. This only works
+          for the new AMI mapping. This is part of the fix for bugzilla
+          bug 2350. Thanks to Alan Stokes <alan at alanstokes dot org dot uk>
+          for reporting this.
+
+Fri Jan 13 12:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/simple_client.cpp:
+          Print out the exception when we get a not expected exception
+
+Fri Jan 13 11:43:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/ValueBase.cpp:
+          When no OBV Factory is found, throw a MARSHAL exception with
+          minor code 1 and completed MAYBE. This fixes bugzilla bug
+          2354
+
+Fri Jan 13 04:57:20 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+
+          Changed to #include "Thread_Lane_Resources.h".  This was missed
+          in this change:
+
+          Thu Jan 12 00:31:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+          because I didn't have SSL enabled at the time.
+
+Thu Jan 12 19:27:12 UTC 2006  Tim Bradley  <bradley_t@ociweb.com>
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+        * tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+
+          The files listed above were modified to fix a problem that was
+          observed in two similar tests.  The original problem was observed
+          to occur when the test application was shutting down, and is not
+          100% repeatable.  It is theorized that a race condition in the
+          existing test code, causing the tests to sometimes succeed.
+
+          When the test applications did fail, some platforms caused the
+          message "pure virtual method called" to be printed to standard
+          error.  A core file, created using Linux (FC3), showed a somewhat
+          corrupt stack trace pointing to the implementation of the
+          shutdown() operation in the Visual_i (servant) class (test_i.cpp).
+
+          Both tests are very similar, and the following description applies
+          to both.  Note that there are details not being described (such
+          as the Portable Interceptor usage), but are not important to the
+          problem that was fixed (hopefully).
+
+          The test is a "collocation" (thru_poa) test, consisting of one
+          application/executable.  A single IDL interface (Visual)
+          is declared, and a servant class (Visual_i) is defined that
+          implements the interface.
+
+          The test application creates two active objects (ClientTask and
+          ServerTask), and two ORBs.  Each active object is given its own
+          ORB to use, and then each is activated in a separate thread.
+          The "mainline" thread waits until both of the task threads complete,
+          performs the expected vs. actual results comparison, and then exits.
+
+          The ServerTask::svc() does the following:
+
+            - Obtain the RootPOA
+            - Create/activate the Visual_i servant object
+            - Save the IOR to a file
+            - Run the (server) ORB event loop.
+            - Destroy the RootPOA
+            - Destroy the (server) ORB.
+
+          The ClientTask::svc() does the following:
+
+            - Read/convert/narrow the server-side's IOR file into a
+              "Visual" object reference (using the ClientTask's ORB).
+            - Invoke each of the operations on the (Visual) object reference.
+            - Invoke the "shutdown" operation on the (Visual) object reference.
+
+          The problem lies with the servant's (Visual_i) implementation of
+          the "shutdown" operation.  The IDL interface, Visual, declares the
+          "shutdown" operation to be a "oneway" operation.  The
+          Visual_i::shutdown() method is implemented to invoke
+          "shutdown(false)" on the (server) ORB.  This is a rather common
+          approach taken by many other TAO tests, but the approach doesn't
+          work here because the servant object is collocated (thru_poa).
+
+          The "oneway" operations do not work the same way under collocated
+          versus remote request contexts.  A collocated oneway request gets
+          treated as if it were a synchronous request, for it is the client's
+          "requesting thread" that carries out the entire dispatching and
+          invocation of the appropriate method on the collocated servant
+          object.  Control is not returned to the client's requesting thread
+          until the request is completely finished.
+
+          So, the steps that lead up to the problem in the tests is that
+          the ClientTask's thread is the thread that ends up invoking
+          shutdown() on the (server) ORB.  At some point soon afterwards,
+          and before the ClientTask's thread has been given back control,
+          the (server) ORB event loop being run in the ServerTask completes.
+          This causes the ServerTask thread to continue on in its logic,
+          which is to destroy the (server) RootPOA, destroy the (server) ORB,
+          and then go away (the ServerTask thread, that is).  Meanwhile,
+          the ClientTask's thread left executing a method in an object that
+          has been destroyed.  When the stack is unwound, bad things happen,
+          and a segmentation fault, with a somewhat corrupt stack trace
+          is produced.
+
+          The fix to the tests was to stop destroying the (server) ORB
+          in the ServerTask thread.  Instead, the application mainline code
+          was modified (Collocated_Test.cpp) to destroy the (server) ORB
+          after both the ServerTask and the ClientTask threads have
+          completed.
+
+
+Thu Jan 12 11:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+          Replaced some return 0, with return false
+
+Thu Jan 12 11:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Small updates
+
+Thu Jan 12 10:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/PluggableUDP/tests/SimplePerformance/server.cpp:
+        * examples/PluggableUDP/tests/SimplePerformance/client.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/client.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/server.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
+          In rtp model don't do main redefinition
+
+Thu Jan 12 09:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Latency/DII/client.cpp:
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+          Added include of AnyTypeCode/Any.h to get all operator <<
+
+Thu Jan 12 00:49:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/TAO_CosNotification.pc.in:
+
+          Add TAO_CosEvent to Requires.
+
+        * orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in:
+
+          Add TAO_CosEvent_Skel to Requires.
+
+Thu Jan 12 00:31:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_home.cpp:
+        * TAO_IDL/be/be_visitor_interface.cpp:
+        * TAO_IDL/be/be_visitor_valuebox.cpp:
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.inl:
+        * examples/RTCORBA/Activity/Task_Stats.inl:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp:
+        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
+        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
+        * orbsvcs/orbsvcs/AV/TCP.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Options.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp:
+        * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
+        * orbsvcs/tests/Notify/lib/Activation_Manager.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.inl:
+        * tao/Any_Insert_Policy_T.h:
+        * tao/ORB_Table.inl:
+        * tao/WrongTransactionC.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl:
+        * tao/Codeset/UTF16_BOM_Factory.cpp:
+        * tao/Codeset/UTF8_Latin1_Factory.cpp:
+
+          On systems where ACE_TEMPLATES_REQUIRE_SOURCE is not defined,
+          template implementation files (*_T.cpp) are not #included by the
+          corresponding template header file (*_T.h).  So headers that had
+          been implicitly #included via the template implementation file,
+          may now need to be #included explicitly.
+
+          This change explicitly #includes those headers (most commonly
+          ace/Log_Msg.h and ace/Auto_Ptr.h).  Now TAO can be built with
+          autoconf on Solaris using the Sun Studio C++ compiler.
+
+          Thanks to Vladimir Panov for reporting this problem and
+          providing the initial patch.
+
+Tue Jan 10 19:38:49 UTC 2006  Scott Harris  <harris_s@ociweb.com>
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
+
+          Fix VC++ v6.0 compile error and conform to ACE coding standards.
+
+Tue Jan 10 19:26:58 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp:
+        * tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp:
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp:
+
+          On behalf of Tim Bradley (bradley_t@ociweb.com), applying these
+          changes to resolve the failure of the two tests.
+
+Tue Jan 10 10:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2349_Regression/server.cpp:
+          Added missign return
+
+Mon Jan  9 23:33:10 UTC 2006  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
+
+        * orbsvcs/tests/Notify/lib/common.h:
+
+          Correcting a build problem due to the wrong placement of an
+          export modifier in the function's declaration.
+
+Mon Jan  9 13:51:05 MST 2006  Scott Harris  <harris_s@ociweb.com>
+
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+
+          Fixed an Interface Repository inheritance bug.
+          Thanks to Bryan Cassell <BryanCassell@iti-team.com> for identifying
+          the problem.
+          Thanks to Jeff Parsons <j.parsons@vanderbilt.edu> for reviewing
+          the changes.
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl:
+
+          An automated test of the bug.
+
+Mon Jan  9 16:20:05 UTC 2006  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
+
+        * orbsvcs/tests/Notify/lib/common.cpp:
+
+          Correcting a build problem due to an unnecessary export in the
+          function's definition.
+
+Mon Jan  9 13:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2349_Regression/*:
+          Added regression for this test. Not fixed yet, just to make
+          clear that we have this bug, thanks to Chad Elliot
+          <elliott_c at ociweb dot com> for creating this regression
+          test.
+
+Mon Jan  9 13:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Security/SSLIOP-INSTALL.html:
+          Updated this file, update references to local files instead
+          of webbased and refer to ACE-INSTALL.html for how to build
+          ACE_SSL
+
+Mon Jan  9 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/ValueFactory_Map.h:
+          No need to export this class from the Valuetype library
+
+Mon Jan  9 08:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Factory/client.cpp:
+          Extended this test to check if we get a marshal exception with
+          minor code 1 when using OBV without a valuefactory registered.
+          This is added for bugzilla bug 2354
+
+Mon Jan  9 08:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
+          Made this test compiling with VxWorks and pthread support
+
+Fri Jan  6 19:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/run_test.pl:
+          Extended this test to also run the client with -ORBCollocation
+          no. This will fail at this moment, this bug seems to be there
+          already for a long time, not it is visible for everyone
+
+        * tao/Valuetype/ValueBase.cpp:
+          Use true/false instead of 0/1
+
+Fri Jan  6 18:25:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+
+          Regenerated.
+
+Fri Jan  6 16:14:56 UTC 2006  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
+
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/lib/common.h:
+        * orbsvcs/tests/Notify/lib/common.cpp:
+
+          Newly created to give permanent home to previously scattered and
+          duplicated functionality. Updated to use the
+          ACE_[U]INT[16|32|64]_FORMAT_SPECIFIER macros. Thanks to Johnny
+          Willemsen <jwillemsen@remedy.nl> for suggesting it.
+
+        * orbsvcs/tests/Notify/Blocking/common.h:
+        * orbsvcs/tests/Notify/Blocking/common.cpp:
+        * orbsvcs/tests/Notify/Discarding/common.h:
+        * orbsvcs/tests/Notify/Discarding/common.cpp:
+        * orbsvcs/tests/Notify/Ordering/common.h:
+        * orbsvcs/tests/Notify/Ordering/common.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
+        * orbsvcs/tests/Notify/performance-tests/Filter/common.h:
+        * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
+
+          Removed these files to eliminate duplication. Moved the code to
+          the lib/common.{cpp|h}
+
+        * orbsvcs/tests/Notify/Blocking/Blocking.mpc:
+        * orbsvcs/tests/Notify/Discarding/Discarding.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/performance-tests/Filter/Filter.mpc:
+
+          Updated to remove references to common.{cpp|h}
+
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+
+          Updated to remove references to common.{cpp|h}
+
+Fri Jan  6 12:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/ValueBase.cpp:
+          When no OBV Factory is found, tell in the error message for what we
+          are lacking an OBV Factory.
+
+Thu Jan  5 19:56:43 2006  Michi Henning <michi@triodia.com>
+
+        * End of bloatware predicted.
+
+Fri Jan  6 03:16:41 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * interop-tests/wchar/Makefile.am:
+
+          Regenerated.
+
+        * interop-tests/wchar/interop_wchar.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Fri Jan  6 02:34:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+
+          Moved static const definitions out of class declaration as VC6
+          doesn't support this.  Thanks to Wallace Zhang for the initial
+          patch for Notify Service, which I've adapted for the Logging
+          Service.
+
+Fri Jan  6 01:57:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/ior_corbaloc/Makefile.am:
+
+          Regenerated.
+
+        * examples/ior_corbaloc/ior_corbaloc.mpc:
+
+          Changed client and corbaname client projects not to inherit
+          from portableserver.  These are pure clients.
+
+          Changed corbaname client project to not add status_i.cpp to
+          Source Files section.  It's not part of the client.
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+        * examples/ior_corbaloc/corbaname_client.cpp
+
+          Changed to #include "corbanameC.h" instead of
+          "ior_corbaloc_client_i.h", which is actually part of the
+          client project.
+
+Thu Jan  5 15:50:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+
+          Regenerated.
+
+        * examples/Simple/bank/bank.mpc:
+        * examples/Simple/chat/chat.mpc:
+        * examples/Simple/echo/echo.mpc:
+        * examples/Simple/grid/grid.mpc:
+        * examples/Simple/time/time.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Thu Jan  5 15:44:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Release:
+
+          Add TAO/m4 subdirectory to CONTROLLED_FILES.
+
+Thu Jan  5 10:29:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/simple_client.cpp:
+          Small layout fixes
+
+        * tests/AMI/client.cpp:
+          Use prefix decrement
+
+Thu Jan  5 09:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/IFR_Service/be_init.cpp:
+          Fixed 64bit conversion warnings
+
+Wed Jan  4 21:27:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Changed "add-log-time-format" to a really ugly lambda expression
+          that formats changelog timestamps in UTC and works with both GNU
+          Emacs and XEmacs.
+
+Wed Jan  4 11:08:58 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/ast/ast_expression.cpp:
+
+          Fix cut-n-pasto where unsigned long longs / long longs were
+          compared with a floating point zero literal. This should be
+          benign, but triggers a VC6 bug.
+
+Wed Jan  4 09:54:01 2006  David Giovannini  <giovannd@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Activator_Loader.cpp:
+        * orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp:
+        * orbsvcs/ImplRepo_Service/Activator_Options.h:
+        * orbsvcs/ImplRepo_Service/Activator_Options.cpp:
+        * orbsvcs/ImplRepo_Service/Adapter_Activator.cpp:
+        * orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h:
+        * orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp:
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * orbsvcs/ImplRepo_Service/INS_Locator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.idl:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/Iterator.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Loader.h:
+        * orbsvcs/ImplRepo_Service/Locator_Loader.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Options.h:
+        * orbsvcs/ImplRepo_Service/Locator_Options.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.h:
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
+        * orbsvcs/ImplRepo_Service/Server_Info.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+
+          Corrected white-space to match ACE/TAO guidelines.
+          Adding a const to an int in Imr_Locator_i.cpp.
+          Changing a command line behavior for defualt activator
+          in tao_imr_i.cpp.
+
+Tue Jan  3 21:34:30 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Add "indent-tabs-mode: nil" to Local Variables at end of file.
+          Untabify.
+          Delete-trailing-whitespace.
+
+Tue Jan  3 11:27:56 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Quoter/Makefile.am:
+
+          Regenerated.
+
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+        * examples/POA/DSI/POA_DSI.mpc:
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc:
+        * examples/POA/Forwarding/POA_Forwarding.mpc:
+        * examples/PluggableUDP/tests/Basic/Basic.mpc:
+        * examples/PluggableUDP/tests/Performance/Performance.mpc:
+        * examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc:
+        * examples/Quoter/Quoter.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Tue Jan  3 10:39:12 UTC UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2345_Regression/server.cpp:
+          Fixed unused variable warning
+
+Mon Jan  2 18:45:12 UTC UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2345_Regression/server.cpp:
+          Fixed implicit conversion warning
+
+Mon Jan  2 15:21:27 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+
+          Fixed a bug in the describe_interface() API operation that occurs
+          when an interface has one or more parents. Thanks to Scott Harris
+          <harris_s@ociweb.com> for reporting the problem.
+
+Mon Jan  2 14:12:15 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/include/drv_extern.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          - Frontend changes necessary to support a backend option
+            for the CoSMIC IDL importer that passes a directory
+            name instead of a list of IDL files. This option is
+            not available for any other backends and should not
+            affect their behavior.
+
+          - Added a patch submitted by Ken Sedgwick <ken+5a4@bonsai,com>
+            that fixes a bug in the functioning of TAO_IDL_INCLUDE_DIR.
+
+Sun Jan  1 10:50:39 2006  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp (is_alive):
+          Fixed a couple of bugs reported by Yariv Tal
+          <yariv_tal2003@hotmail.com>.  This fixes bugid 2347.
+
+Fri Dec 30 15:36:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Event_Comm/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Logging/Makefile.am:
+
+          Regenerated.
+
+        * examples/Event_Comm/Event_Comm.mpc:
+        * examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc:
+        * examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc:
+        * examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc:
+        * examples/Logging/Logging.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Fri Dec 30 16:15:24 2005  Wallace Zhang  <zhangw@ociweb.com>
+
+        * NEWS: Updated information for the wchar refactoring work.
+
+Wed Dec 30 14:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp:
+        * tests/MT_Timeout/server.cpp:
+        * tests/Crash_On_Write/server.cpp:
+          Fixed compile error
+
+Wed Dec 30 12:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2345_Regression/*:
+          Added regression for bug 2345, this is not fixed yet, just
+          adding the regression first. Thanks to Yariv Tal
+          <yariv_tal2003 at hotmail dot com> for reporting this
+          problem and delivering this simple regression
+
+Thu Dec 29 11:43:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Content_Server/AMI_Iterator/Makefile.am
+        * examples/Content_Server/AMI_Observer/Makefile.am
+        * examples/Content_Server/SMI_Iterator/Makefile.am
+
+          Regenerated.
+
+        * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc:
+        * examples/Content_Server/AMI_Observer/AMI_Observer.mpc:
+        * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Thu Dec 29 11:26:45 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Thu Dec 29 09:43:07 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/PI/PI_PolicyFactory.cpp:
+        * tao/PI/ProcessingModePolicy.h:
+        * tao/PI/ProcessingModePolicy.pidl:
+
+          Took care of some TBD comments.  The TBD in the .pidl has been
+          changed into a Doxygen @todo.
+
+Thu Dec 29 07:29:38 2005  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+
+          Added Comment regarding new Endpoint Selector.
+
+Thu Dec 29 06:47:37 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/Strategies/OC_Endpoint_Selector_Factory.cpp:
+
+          Wrapped plain text string in ACE_TEXT () to avoid problems on
+          wide-character builds.
+
+Wed Dec 28 18:20:23 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Callback_Quoter/Makefile.am:
+
+          Regenerated.
+
+        * examples/Callback_Quoter/Callback_Quoter.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Wed Dec 28 17:07:23 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+
+          Regenerated.
+
+        * examples/AMH/Sink_Server/Sink_Server.mpc:
+        * examples/Buffered_AMI/Buffered_AMI.mpc:
+        * examples/Buffered_Oneways/Buffered_Oneways.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Wed Dec 28 13:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
+          Removed setting of idlflags, native exceptions are the default
+          now and the overruling of the idlflags gives problem when
+          trying to extend TAO_IDLFLAGS from the platform_macros.GNU
+          file
+
+Wed Dec 28 11:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
+          Made this test compiling again with VxWorks 6.1, the WIND_TCB
+          struct has been changed and shouldn't be used directly anymore
+
+Wed Dec 28 10:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/RTScheduling/Synch_i.cpp:
+          Cast number of seconds explicitly to time_t
+
+Wed Dec 28 10:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+          Applied a workaround for Borland to not give argument not used
+          warnings. This problem has been reported to Borland to get it
+          fixed in the next version.
+
+Wed Dec 28 09:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+          Fixed 64bit conversion warning
+
+Wed Dec 28 09:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h:
+          No need to derive explicitly from ServantBase
+
+Wed Dec 28 09:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/catior/catior.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Added missing include
+
+Wed Dec 28 08:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+          Removed incorrect ; at end of method
+
+Tue Dec 27 22:50:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Fix typo in last change.
+
+Tue Dec 27 18:17:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Tweak so trading_serv_export.h is installed.
+
+Tue Dec 27 17:21:54 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+
+          Tweak so notify_serv_export and notify_persist_export.h are
+          installed.
+
+        * orbsvcs/orbsvcs/CosTime.mpc:
+
+          Tweak so time_export.h is installed.
+
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/ec_typed_events_serv.mpb:
+
+          Tweak so that CEC_Defaults.h and event_serv_export.h are
+          installed.
+
+Tue Dec 27 16:17:30 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+
+          Tweak so concurrency_export.h is installed.  Thanks to Vladimir
+          Panov for pointing out this class of problems.
+
+        * tao/Makefile.am:
+
+          Regenerated due to new Optimized Connection Endpoint Selector
+          feature.  C.f.:
+
+          Tue Dec 27 08:22:42 2005  Phil Mesnier  <mesnier_p@ociweb.com>
+
+Tue Dec 27 15:33:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Remove DISTCLEANFILES definitions.  We no longer ship
+          tao-config and tao-config.1.
+
+        * Makefile.am:
+
+          Build examples and interop-tests subdirectories.
+
+        * Makefile.am:
+
+          I accidently clobbered this file by checking in the MPC
+          generated version.   Restore to revision 1.13, the last
+          known good version.
+
+Tue Dec 27 15:11:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Release
+
+          Add aclocal.m4 to RELEASE_FILES.  Thanks to Vladimir Panov
+          < gbr at voidland dot org >.
+
+Fri Dec 23 20:17:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+
+          Changed lock strategy of implicit_ids_, filterable_data_, and
+          variable_header_ maps from TAO_SYNCH_MUTEX to ACE_Null_Mutex,
+          since accesses to the maps are already protected at a higher
+          level.
+
+          Explicitly set the size of the implicit_ids_, filterable_data_,
+          and variable_header_ maps to 27, 31, and 31 hash buckets
+          respectively.
+
+          A fixed set of 9 keys are stored in implicit_ids_.  With the
+          default hash_pjw() hash function, 27 buckets is the smallest
+          table where each key is hashed to a unique bucket.  Further
+          optimizations, perhaps using a minimal perfect hash, may be
+          possible.
+
+          A 31 bucket hash table size was selected for filterable_data_
+          and variable_header_ because a typical structured event has very
+          few if any attributes, the cost of allocating default (1024 hash
+          buckets) size maps outweigh any benefits of fewer hash
+          collisions.
+
+Tue Dec 27 12:24:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Fixed botched ACLOCAL_AMFLAGS definition.
+
+Tue Dec 27 11:34:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Build examples subdirectory.
+
+        * examples/Makefile.am:
+
+          Disable building CSD_Strategy and RTScheduling subdirectories.
+          These *.mpc files need major changes to support separate build
+          directories.  This is too risky to complete within this beta
+          cycle.
+
+        * performance-tests/Makefile.am:
+
+          Disable building CSD_Strategy subdirectory.
+          These *.mpc files need major changes to support separate build
+          directories.  This is too risky to complete within this beta
+          cycle.
+
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/POA/Adapter_Activator/Makefile.am:
+        * examples/POA/Explicit_Activation/Makefile.am:
+        * examples/POA/On_Demand_Activation/Makefile.am:
+        * examples/POA/Reference_Counted_Servant/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+
+          Regenerated.
+
+        * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+        * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+        * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+        * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+
+          Change automake specific includes definitions to to have both
+          build dir and source dir relative paths.
+
+        * examples/Load_Balancing/Load_Balancing.mpc:
+        * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
+        * examples/POA/TIE/POA_TIE.mpc:
+        * examples/Persistent_Grid/Persistent_Grid.mpc:
+        * examples/Simulator/Event_Supplier/Event_Supplier.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
+Tue Dec 27 08:22:42 2005  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/Strategies/OC_Endpoint_Selector_Loader.cpp:
+        * tao/Strategies/OC_Endpoint_Selector_Loader.h:
+        * tao/Strategies/OC_Endpoint_Selector_Factory.cpp:
+        * tao/Strategies/OC_Endpoint_Selector_Factory.h:
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.h:
+
+          A new feature requested by Homag.  This feature is an
+          alternative endpoint selector that improves the performance of
+          connection establishment when an IOR contains unreachable
+          endpoints. The two elements of this optimization are a
+          connection cache lookup before attempting any connections and a
+          second means for setting the connection timeout without loading
+          the AMI library to use the TAO-specific connection timeout
+          policy.
+
+        * tests/AlternateIIOP/svc.conf:
+
+          The alternate IIOP test now uses the Optimized Connection
+          Endpoint Selector to speed up the selection of the correct endpoint.
+
+Tue Dec 27 09:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/FlResource_Loader.h:
+        * tao/TkResource_Loader.h:
+          Added missing versioning include. Thanks to
+          Ken Sedgwick <ken at bonsai dot com>
+
+Tue Dec 27 09:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORInterceptor/IORInterceptor_Details.h:
+          Fixed pragma once warning
+
+Fri Dec 23 16:16:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add orbsvcs/tests/Bug_2316_Regression/Makefile to
+          AC_CONFIG_FILES.
+
+        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
+
+          New file.
+
+Fri Dec 23 13:06:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+
+          Don't assign values to dynamically allocated Any's if the
+          allocation failed.
+
+          Remove rec_ member variable.  The constructor extracts all
+          relevant fields and adds them to property_lookup_ map.
+
+          Const-qualify constructor argument.
+
+Fri Dec 23 10:47:55 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+
+          Removed unused variable.
+
+Fri Dec 23 09:09:14 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI/PI_PolicyFactory.h:
+        * tao/PI/PI_PolicyFactory.cpp:
+        * tao/PI/ProcessingModePolicy.h:
+        * tao/PI/ProcessingModePolicy.cpp:
+
+          Added the TAO versioning namespace macros.
+
+Fri Dec 23 08:50:37 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h:
+
+          Fixed fuzz errors related to RefCountedServantBase and _MSC_VER >=
+          1200.
+
+Fri Dec 23 13:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/util/utl_err.cpp:
+          Added include of Log_Msg.h to get ACE_ERROR. Can't reproduce
+          it on my machine but it can be that because of other defines
+          this file is not included implicitly. This fixes bugzilla bug
+          2342. Thanks to Dave Craig <dwcraig at qualcomm dot com> for
+          reporting this.
+
+Fri Dec 23 10:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Manager.cpp:
+          Fixed 64bit conversion warnings
+
+Fri Dec 23 10:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
+          Changed the way we change the TAO_IDL flags so that adding
+          more flags from the platform_macros.GNU file works for these
+          projects
+
+Fri Dec 23 10:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PI_PolicyFactory.h:
+          Fixed export macros
+
+Fri Dec 23 10:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ClientRequestDetails.{h,inl}:
+        * tao/PI_Server/ServerRequestDetails.{h,inl}:
+        * tao/IORInterceptor/IORInterceptor_Details.{h,inl,cpp}:
+          Fixed pragma once warning, removed empty destructor, not needed
+
+        * tao/IORInterceptor/IORInterceptor_Details.inl:
+          Removed this file, it is now empty
+
+        * tao/Makefile.am:
+          Updated
+
+Fri Dec 23 08:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/ProcessingModePolicy.h:
+          Fixed export macros
+
+Thu Dec 22 16:07:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * examples/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/Generic_Servant/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * orbsvcs/Event_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+        * orbsvcs/FT_ReplicationManager/Makefile.am:
+        * orbsvcs/Fault_Detector/Makefile.am:
+        * orbsvcs/Fault_Notifier/Makefile.am:
+        * orbsvcs/IFR_Service/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/Log/RTEvent/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
+        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
+        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
+        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
+        * orbsvcs/examples/RtEC/MCast/Makefile.am:
+        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
+        * orbsvcs/examples/RtEC/Simple/Makefile.am:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+        * orbsvcs/tests/Makefile.am:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
+        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
+        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
+        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
+        * orbsvcs/tests/EC_Mcast/Makefile.am:
+        * orbsvcs/tests/EC_Multiple/Makefile.am:
+        * orbsvcs/tests/EC_Throughput/Makefile.am:
+        * orbsvcs/tests/Event/Basic/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
+        * orbsvcs/tests/Event/Performance/Makefile.am:
+        * orbsvcs/tests/Event/lib/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am:
+        * orbsvcs/tests/FtRtEvent/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * performance-tests/Makefile.am:
+        * performance-tests/Anyop/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Collocation/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/POA/Create_Reference/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+
+          Regenerated.
+
+Thu Dec 22 15:24:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/tao_idl.mpc:
+        * docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc:
+        * docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
+        * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
+        * docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc:
+        * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+        * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+        * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+        * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc:
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.mpc:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
+        * orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc:
+        * orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc:
+        * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
+        * orbsvcs/tests/Event/Basic/rteventtestexe.mpb:
+        * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc:
+        * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc:
+        * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc:
+        * orbsvcs/tests/Event/Performance/eventperftestexe.mpb:
+        * performance-tests/Protocols/Protocols.mpc:
+
+          Add automake specific blocks that either add or replace include
+          paths definitions with $(srcdir) relative paths.
+
+Thu Dec 22 13:04:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added BUILD_ACE_FOR_TAO automake conditional.  Explicitly
+          set to false (at least for now).
+
+Thu Dec 22 14:43:24 2005  Paul Calabrese  <calabrese_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
+
+          Fix some uninitialized data members.
+
+Thu Dec 22 12:38:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+Thu Dec 22 14:13:14 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl:
+
+          Made an attempt at supporting these new tests on VxWorks.
+
+Wed Dec 21 19:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/Notify/Federation/federation.mwc:
+          Removed this file, it causes project files with
+          just different casing, which causes problems when extracting
+          the zip release files under windows
+
+Thu Dec 22 10:12:33 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/PI/ProcessingModePolicyC.h:
+        * tao/PI/ProcessingModePolicyC.cpp:
+        * tao/PI/ProcessingModePolicyS.h:
+
+          These did not show up as unknown files for the previous commit.
+
+Thu Dec 22 08:54:09 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        Committing these changes on behalf of Tim Bradley
+        <bradley_t@ociweb.com>.
+
+          The following changes were made in order to support a new
+          feature that is described in the CORBA 3.1 draft specification.
+          The new feature consists of adding the capability to register
+          Portable Interceptors with an associated set of Policy objects.
+          In addition, a new Policy was introduced: the
+          PortableInterceptor::ProcessingModePolicy.  This policy can be
+          applied to either client request interceptors or server request
+          interceptors.  There are three possible ProcessingMode values:
+
+          - LOCAL_AND_REMOTE (the default)
+          - LOCAL_ONLY
+          - REMOTE_ONLY
+
+          The policy is used during the dispatching of a CORBA request.
+          It comes into play for remote requests as well as collocated
+          (thru-poa) requests.  When the policy value is something other
+          than the default value, the interception points on the
+          corresponding interceptor may or may not be invoked.  For the
+          LOCAL_ONLY policy value, the interception points are only invoked
+          on the interceptor if the request is a collocated (thru-poa)
+          request.  If it is a remote request, the LOCAL_ONLY policy value
+          causes the interceptor to not apply to the current request.
+          The REMOTE_ONLY has the opposite effect - only remote requests
+          cause the interception points to be invoked in the interceptor.
+
+        * tao/IORInterceptor/IORInterceptor_Details.cpp:
+        * tao/IORInterceptor/IORInterceptor_Details.h:
+        * tao/IORInterceptor/IORInterceptor_Details.inl:
+        * tao/PI/ClientRequestDetails.cpp:
+        * tao/PI/ClientRequestDetails.h:
+        * tao/PI/ClientRequestDetails.inl:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/PI_PolicyFactory.cpp:
+        * tao/PI/PI_PolicyFactory.h:
+        * tao/PI/ProcessingModePolicy.cpp:
+        * tao/PI/ProcessingModePolicy.h:
+        * tao/PI/ProcessingModePolicy.pidl:
+        * tao/PI/ProcessingModePolicyC.cpp:
+        * tao/PI/ProcessingModePolicyC.h:
+        * tao/PI/ProcessingModePolicyS.h:
+        * tao/PI_Server/ServerRequestDetails.cpp:
+        * tao/PI_Server/ServerRequestDetails.h:
+        * tao/PI_Server/ServerRequestDetails.inl:
+
+          The files listed above have been added as part of the
+          the new PI Policy support (including the new
+          PI ProcessingModePolicy).
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h:
+
+          The files listed above make up a new "collocated" test for the
+          new PortableInterceptor::ProcessingModePolicy "feature".
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h:
+
+          The files listed above make up a new "remote" test for the
+          new PortableInterceptor::ProcessingModePolicy "feature".
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+
+          The Upcall_Wrapper class was modified to fix a bug that
+          was observed while testing the new ProcessingModePolicy.
+          The server request portable interceptors were being supplied
+          with a ServerRequestInfo object that referenced uninitialized
+          operation arguments in the collocated (thru_poa) case.
+
+        * tao/PI/ClientRequestInfo.cpp:
+
+          During testing of the new ProcessingModePolicy, another bug
+          was observed.  Client request interceptors were not getting
+          the proper "result argument" (both collocated and remote cases).
+          The changes made to the tao/PI/ClientRequestInfo.cpp file fixes
+          this bug.
+
+        * tao/ClientRequestInterceptor_Adapter.h:
+        * tao/Collocated_Invocation.cpp:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/Invocation_Base.cpp:
+        * tao/Invocation_Base.h:
+        * tao/Invocation_Base.inl:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
+        * tao/Remote_Invocation.cpp:
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/Interceptor_List_T.h:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitInfo.h:
+        * tao/PI/ORBInitInfo.pidl:
+        * tao/PI/ORBInitInfoC.cpp:
+        * tao/PI/ORBInitInfoC.h:
+        * tao/PI/ORBInitInfoS.h:
+        * tao/PI/PI.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+
+          The files listed above were modified as part of the
+          changes made to support policies at PI registration-time
+          and the new PI ProcessingModePolicy.
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp:
+
+          Added a sleep before the shutdown to allow the client thread to
+          complete the collocated call before shutting down the ORB to avoid
+          BAD_INV_ORDER exceptions on fast multi-processor machines.
+
+Thu Dec 22 14:04:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Dynamic_Thread_Pool/client.cpp:
+          Fixed variable not used warning
+
+Thu Dec 22 12:25:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Dynamic_Thread_Pool/*.mpc:
+          Shortened filename to fix fuzz error
+
+Wed Dec 21 13:06:53 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Use TAO_ENABLE_MINIMUM_CORBA macro instead of explicitly setting
+          BUILD_MINIMUM_CORBA automake conditional to false.
+
+        * m4/tao.m4:
+
+          New file, autoconf macros for TAO-specific feature tests.
+
+          Added TAO_ENABLE_MINIMUM_CORBA autoconf macro.  Configuring with
+          --enable-minimum-corba will set the BUILD_MINIMUM_CORBA automake
+          conditional.
+
+        * configure.ac:
+        * Makefile.am:
+
+          Look for automake macro files (*.m4) in ../m4 and ./m4.
+
+Wed Dec 21 12:08:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+
+          Changed TAO_Log_Constraint_Visitor constructor to use
+          ACE_CString constructors that don't copy or take ownership of
+          the string, this allows us to wrap string literals for use as
+          map bindings with as little overhead as possible.
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+
+          Changed lock strategy of property_lookup_map_ from
+          TAO_SYNCH_MUTEX to ACE_Null_Mutex, since all accesses to the map
+          are already protected at a higher level.
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+
+          Explicitly set the size of the property_lookup_map_ to 31 hash
+          buckets.  A typical log record has very few if any attributes,
+          the cost of allocating the default (1024 hash bucket) size map
+          outweighs any benefits of fewer hash collisions.
+
+Wed Dec 21 19:28:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Upcall.cpp:
+          No need to store the TAO_Adapter in an intermediate variable
+
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+          Fixed 64bit conversion warning
+
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+          Initialise pointer with 0 and removed some debugging statements that
+          appear always and don't add a value to the log
+
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp:
+          Removed some old comments
+
+        * tao/orbconf.h:
+          Did some cleanup, removed TAO_USE_SEQUENCE_TEMPLATES,
+          TAO_MAXIMUM_NATIVE_TYPE_SIZE, TAO_MAX_TRANSPORT_REREAD_ATTEMPTS.
+          I couldn't find these throughtout all the code.
+
+Wed Dec 21 11:03:25 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/include/ast_expression.h:
+
+          If !ACE_LACKS_LONGLONG_T, perform operations on CORBA::LongLong
+          and CORBA::ULongLong types using 64 bit arithmetic.  Previously
+          this was done with doubles (53 bit mantissa) for '+', '-', '*';
+          or disallowed for the other operators.
+
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/include/ast_expression.h:
+
+          Add EvalKind parameter to ::eval_bin_op and ::eval_mod_op so
+          that operations can be done in terms of the given type.
+
+        * TAO_IDL/ast/ast_expression.cpp:
+
+          Remove handling of '%' operator in AST_Expression::eval_bin_op()
+          as it is handled by AST_Expression::eval_mod_op().
+
+Wed Dec 21 18:50:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/constraint.l:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+          Use true and false for booleans
+
+Wed Dec 21 18:40:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tests/Bug_2328_Regression/*:
+          Added new regression for bug 2328. When having a client without
+          codeset support and a server with, sending multiple strings in one
+          invocation caused a crash with x.4.7. A retest just before the
+          release of x.4.8 proved things where fixed already, just putting
+          the regression into the repo to make sure we don't get this bug
+          back.
+
+Wed Dec 21 16:23:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tao/Leader_Follower.cpp:
+          Use prefix increment/decrement instead of postfix
+
+        * tao/Object.cpp:
+          Made lazy_strategy a real bool instead of an int
+
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.{h,inl}:
+          Made num_threads a long to fix 64bit conversion warnings
+
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Initialise pointer with 0
+
+        * tests/IDL_Test/array.idl:
+          Added some bound array types
+
+        * tests/IDL_Test/interface.idl:
+          Added an empty local interface
+
+        * tests/IDL_Test/sequence.idl:
+          Added a sequence of local interfaces
+
+        * tests/RTCORBA/Dynamic_Thread_Pool/*:
+          Added new test to show dynamic thread pools with the idle timeout
+          functionality
+
+Tue Dec 20 08:04:30 2005  Simon McQueen  <sm@prismtech.com>
+
+        * TAO version 1.4.8 released.
+
+Fri Dec 16 18:06:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/driver/drv_args.cpp:
+
+          Added missing code that sets versioned namespace opening and
+          closing text.
+
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+
+          Fixed typo that caused generated versioned namespace to be
+          reopened before it was closed.
+
+        * orbsvcs/orbsvcs/AV.mpc:
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
+        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+        * orbsvcs/orbsvcs/CosNaming.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * orbsvcs/orbsvcs/CosTime.mpc:
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/FaultTolerance.mpc:
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+        * orbsvcs/orbsvcs/HTIOP.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTSched.mpc:
+        * orbsvcs/orbsvcs/RT_Notification.mpc:
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+        * orbsvcs/orbsvcs/Security.mpc:
+        * orbsvcs/orbsvcs/Svc_Utils.mpc:
+
+          Core orbsvcs stubs/skeletons must have ability to support
+          versioned namespaces.  IDL-capable MPC projects now inherit from
+          the "tao_versioning_idl_defaults" MPC base project.
+
+        * tao/CONV_FRAME.pidl:
+        * tao/CharSeq.pidl:
+        * tao/Current.pidl:
+        * tao/Domain.pidl:
+        * tao/DoubleSeq.pidl:
+        * tao/FloatSeq.pidl:
+        * tao/GIOP.pidl:
+        * tao/IIOP.pidl:
+        * tao/AnyTypeCode/AnySeq.pidl:
+        * tao/AnyTypeCode/Bounds.pidl:
+        * tao/AnyTypeCode/Dynamic.pidl:
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl:
+        * tao/AnyTypeCode/ValueModifier.pidl:
+        * tao/AnyTypeCode/Visibility.pidl:
+        * tao/BiDir_GIOP/BiDirPolicy.pidl:
+        * tao/CSD_Framework/CSD_Framework.pidl:
+        * tao/CodecFactory/IOP_Codec.pidl:
+        * tao/CodecFactory/IOP_Codec_include.pidl:
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/IFR_Client/IFR_Base.pidl:
+        * tao/IFR_Client/IFR_Basic.pidl:
+        * tao/IFR_Client/IFR_Components.pidl:
+        * tao/IFR_Client/IFR_Extended.pidl:
+
+          Added versioned namespace related TAO_IDL command line options
+          to the stub/skeleton generation documentation.
+
+        * tests/Param_Test/results.h:
+
+          Wrap forward declaration of class in CORBA namespace within a
+          TAO versioned namespace since the core TAO library does so.
+
+Thu Dec 15 16:19:48 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/driver/drv_args.cpp:
+
+          Added ability to set "versioned" namespace opening and closing
+          text.  Addresses problem where applications that do not enable
+          versioned namespace support in their own code need not get
+          "versioned" stubs/skeletons.
+
+Tue Dec 13 12:13:26 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * COPYING: Updated this file to mention compliance issues wrt the
+          new "The Energy Policy Act of 2005".  Thanks to Malcolm Spence
+          for providing this.
+
+Wed Dec 14 09:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Borland/README:
+          Updated contact information
+
+Tue Dec 13 13:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/string_traits_base.hpp:
+          Removed static from the declaration of empty to fix VxWorks warnings
+
+Tue Dec 13 12:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/Discarding/notify.conf:
+          Use DispatchingThreads instead of ListeningThreads, the last one
+          is deprecated
+
+Tue Dec 13 12:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
+          Set exename to Subscribe to match the run_test perl script
+
+Tue Dec 13 12:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp (shutdown):
+          Only unbind from the naming service when we have a valid object
+          reference to it.
+
+Tue Dec 13 10:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Codeset_Manager_Factory_Base.h:
+          Fixed typo in comment
+
+Tue Dec 13 09:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Shutdown_Utilities.{h,cpp}:
+          The vc8 runtime seems to check wether a signal number is a valid
+          one, if not it asserts. The Shutdown_Utilities where just
+          calling remove_handler for all signal numbers, changed this to just
+          call it for the signals we registered. This way we can end the
+          orbsvcs executable with ctrl-c again.
+
+Mon Dec 12 15:20:10 2005    <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/Notify_Service/Notify_Service.mpc:
+
+          Disable NT_Notify_Service project in ace_for_tao configuration.
+          It depends on ace/NT_Service.*, which is currently not part of
+        the ace_for_tao subset.
+
+        * examples/Load_Balancing/Load_Balancing.mpc:
+
+          Disable in ace_for_tao configuration.  It requires ACE_DLList,
+          which is not part of the ace_for_tao subset.
+
+Mon Dec 12 09:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Minor formatting improvement in debug logging
+
+Sun Dec 11 17:39:54 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
+
+          Added sleep before client call done(). This is workaround with
+          the problem that some oneway requests lost when the server has
+          multiple orb threads.
+
+Fri Dec  9 16:36:27 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+
+          Made actual_vs_expected() dump more details with the failure.
+
+Fri Dec  9 21:48:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Array_VarOut_T.h:
+        * tao/Array_VarOut_T.inl:
+
+          In the TAO_Array_Forany_T<> template class:
+
+          - Changed initialization values for the CORBA::Boolean
+            nocopy_ member from '0' to 'false'.
+
+          - Removed the 'const' qualifier from the nocopy_ member.
+            This member gets assigned to in the class assignment
+            operator, and because of this, tools like insure++
+            complain. It's a mystery why C++ compilers don't
+            complain as well. This fix closes [BUGID:2326]. Thanks
+            to Brian Buesker <bbuesker@qualcomm.com> for reporting
+            the problem.
+
+Thu Dec  8 16:37:06 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/RTCORBA/Activity/Activity.mpc:
+
+          Do not override "macros" variable.  Add to it instead.  Fixes
+          problem where versioned namespace preprocessor symbols were not
+          added to generated Makefiles/projects.
+
+        * examples/RTCORBA/Activity/Activity.h:
+        * examples/RTCORBA/Activity/Builder.h:
+        * examples/RTCORBA/Activity/Job_i.h:
+        * examples/RTCORBA/Activity/POA_Holder.h:
+        * examples/RTCORBA/Activity/Periodic_Task.h:
+        * examples/RTScheduling/Job_i.h:
+        * examples/RTScheduling/POA_Holder.h:
+        * examples/Simple/bank/AccountManager_i.h:
+
+          Fixed versioned namespace support.
+
+Thu Dec  8 14:19:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h:
+
+          Fixed versioned namespace support.  The versioning macros calls
+          were missing.
+
+Thu Dec  8 20:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * interop-tests/wchar/interop_wchar.mpc:
+        * examples/PluggableUDP/tests/Basic/Basic.mpc:
+        * examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc:
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc:
+        * examples/POA/DSI/POA_DSI.mpc:
+        * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc:
+        * examples/Content_Server/AMI_Observer/AMI_Observer.mpc:
+        * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
+        * examples/Buffered_Oneways/Buffered_Oneways.mpc:
+        * examples/Buffered_AMI/Buffered_AMI.mpc:
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files.
+
+Thu Dec  8 13:10:42 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl:
+
+          Commented the client command line output previously added for
+          debugging.
+
+Thu Dec  8 07:17:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/Asynch_Queued_Message.h:
+        * tao/default_server.h:
+        * tao/PortableServer/Operation_Table_Binary_Search.h:
+
+          Fixed versioned namespace support.  The versioning macros calls
+          were missing.
+
+Thu Dec  8 06:54:31 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h:
+
+          Fixed versioned namespace build errors, predominantly caused by
+          forwared declarations not being placed within the appropriate
+          {ACE,TAO}_{BEGIN,END}_VERSIONED_NAMESPACE_DECL block.
+
+Thu Dec  8 06:45:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tests/OctetSeq/OctetSeq.mpc:
+        * performance-tests/Anyop/Anyop.mpc:
+        * performance-tests/POA/Create_Reference/Create_Reference.mpc:
+        * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+        * performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
+        * performance-tests/Protocols/Protocols.mpc:
+        * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
+
+          Disable these projects when "ace_for_tao" is enabled.
+
+Wed Dec  7 19:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+          Workaround for Borland is also needed for BSD2006
+
+Wed Dec  7 18:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool6.mpc:
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files.
+
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+          Simplified
+
+Wed Dec  7 05:43:53 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tests/Connection_Timeout/Connection_Timeout.mpc:
+        * tests/Hang_Shutdown/Hang.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+
+          Disable these projects when "ace_for_tao" is enabled.
+
+Wed Dec  7 10:59:55 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+
+          Added more logging in test results checking to help debug the
+          TP_Test_3 failure on RHEL3_Minimum build.
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+
+          Removed the ACE_Atomic_Op for num_callbacks_ data member since the
+          CSD synchronizes the request dispatching.
+
+Wed Dec  7 17:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc:
+        * examples/POA/Forwarding/POA_Forwarding.mpc:
+        * examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc:
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files.
+
+Wed Dec  7 12:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader.h:
+          Work around for TAO_Lockable is also needed for BCB2006 Update 1
+
+Tue Dec  6 21:16:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h:
+        * orbsvcs/tests/Notify/lib/Activation_Manager.h:
+        * orbsvcs/tests/Notify/lib/Command.h:
+        * orbsvcs/tests/Notify/lib/EventChannel_Command.h:
+        * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+        * orbsvcs/tests/Notify/lib/Options_Parser.h:
+        * orbsvcs/tests/Notify/lib/Peer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
+
+          Fixed versioned namespace build errors, predominantly caused by
+          forwared declarations not being placed within the appropriate
+          {ACE,TAO}_{BEGIN,END}_VERSIONED_NAMESPACE_DECL block.
+
+Tue Dec  6 14:55:41 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+
+          Added debug message to help debugging the problem of
+          "<server_main> failed: No such file or directory".
+
+Tue Dec  6 15:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc:
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files.
+
+Tue Dec  6 15:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Security/BiDirectional/client.cpp:
+        * orbsvcs/tests/Security/BiDirectional/test_i.cpp:
+          Fixed 64bit conversion warnings
+
+Tue Dec  6 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc:
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+        * examples/Load_Balancing/Load_Balancing.mpc:
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files.
+
+Tue Dec  6 08:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader.h:
+          Also with BDS2006 we need to export the TAO_Lockable class as
+          workaround. Reported this to Borland, hopefully they will fix
+          this soon
+
+Mon Dec  5 19:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
+          Added include of PI/PI.h to fix test failures in static builds
+
+Mon Dec  5 14:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/releasenotes/index.html:
+          Small improvements
+
+Sun Dec  4 11:34:11 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+
+        Moved definition of TOPOLOGY_ID_NAME earier in the file to avoid
+        undefined argument error.
+
+Sun Dec  4 11:14:45 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp
+
+        Fixed an unused arg warning.
+
+Sat Dec  3 20:54:28 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp: Moved the namespace decl
+          for TOPOLOGY_ID_NAME inside the VERSIONED_NAMESPACE_DECL block
+          to fix broken versioned namespace builds.  Thanks to Ossama for
+          pointing this out.
+
+Sat Dec  3 19:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/QtTests/QtTests.mpc:
+          Added anytypecode to the client project
+
+Sat Dec  3 09:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/constants.idl:
+          Removed the wstring constants for the time being, cause issues
+          with some builds that lack wchar_t support
+
+Fri Dec  2 16:18:15 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp (DTOR):
+          Add try/catch block around call to ec->destroy() because it
+          seems that often in this test the EC is gone by the time
+          destroy() gets called.  This raises a COMM_FAILURE which now
+          gets caught and noticed printed.  We also now catch and print
+          any exception raised in the DTOR since there's little chance of
+          doing anything about it, and at least this way we get
+          information.
+
+Fri Dec  2 10:26:33 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h: Added 'extern'
+          declaration in here as this seems to placate the VC8 compiler's
+          errors.
+
+Fri Dec  2 11:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+          Added missing include of ace/pre.h
+
+Fri Dec  2 11:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1627_Regression/test.mpc:
+        * tests/Bug_1551_Regression/test.mpc:
+        * tests/Bug_1482_Regression/test.mpc:
+        * tests/Bug_1627_Regression/Bug_1627_Regression.mpc:
+        * tests/Bug_1551_Regression/Bug_1551_Regression.mpc:
+        * tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
+          Renamed test.mpc to a more specific name to fix duplicate errors
+          in the MPC generation
+
+Fri Dec  2 11:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/constants.idl:
+          Added several wstring constants for test
+
+Fri Dec  2 01:35:31 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.cpp:
+
+          Reintroduced `params_dup.c' and removed `params_dup.cpp' file.
+          Some C++ compiler/platform combinations cannot handle the broken
+          OpenSSL function pointer conversions.  Stick with a C compiler.
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+
+          Include the new "ace/config-macros.h" header instead of
+          "ace/config-lite.h".  The former can be parsed by C compilers.
+
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/TAO_Singleton_Manager.h:
+
+          Moved static "instance_" pointer to an anonymous namespace
+          within the implementation file.  Allows the friend declaration
+          to be removed, in turn fixing builds that cannot handle the
+          global scope qualifier prepended to that friend declaration.
+
+          Removed unused "preallocated_object" static array.
+
+        * tao/Versioned_Namespace.h:
+
+          Update preprocessor check to use new config-macros.h specific
+          include guard preprocessor symbol.
+
+Thu Dec  1 08:07:23 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * TAO-INSTALL.html: Updated this file for VxWorks.
+          Thanks to Nathan Anderson <nathan dot l dot anderson at lmco dot
+          com> for these suggestions.
+
+Thu Dec  1 20:17:29 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+
+          Removed TOPOLOGY_ID from here.  It should have been nmoved when
+          the persistence stuff was broken into a separate library.
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp:
+
+          Moved TOPOLOGY_ID into here since that's all that uses it.
+
+Thu Dec  1 12:08:17 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Object.h: Revert previous change as it
+          apparently confused Borland BC6.
+
+        * orbsvcs/orbsvcs/Notify/Topology_Object.*:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.*:
+
+          Changed manifest constants for TOPOLOGY_ID_NAME, REGISTRY_TYPE,
+          RECONNECT_ID, RECONNECT_IOR, and REGISTRY_CALLBACK_TYPE from
+          statics within the namespace to being declared in the namespace
+          in the header, but defined in the .cpp file.  This de-warns on
+          OS X Tiger G++ 3.3 builds, but may also have a minor reduction
+          in footprint everywhere since now there will be only one
+          instance of these rather than an instance everywhere the
+          relevant header gets #included.
+
+Thu Dec  1 18:10:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/AMH_Exceptions/AMH_Exceptions.mpc:
+        * tests/AMH_Oneway/AMH_Oneway.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.mpc:
+        * tests/Abstract_Interface/Abstract_Interface.mpc:
+        * tests/Any/Recursive/RecursiveHello.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+        * tests/Big_AMI/Big_AMI.mpc:
+        * tests/Big_Oneways/Big_Oneways.mpc:
+        * tests/Big_Reply/Big_Reply.mpc:
+        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
+        * tests/Big_Twoways/Big_Twoways.mpc:
+        * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
+        * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
+        * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
+        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
+        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
+        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
+        * tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
+        * tests/Bug_1482_Regression/test.mpc:
+        * tests/Bug_1495_Regression/Bug_1495.mpc:
+        * tests/Bug_1551_Regression/test.mpc:
+        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
+        * tests/Bug_1627_Regression/test.mpc:
+        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
+        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
+        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc:
+        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
+        * tests/CallbackTest/CallbackTest.mpc:
+        * tests/Client_Leaks/Client_Leaks.mpc:
+        * tests/Collocation/Collocation.mpc:
+        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
+        * tests/Connection_Purging/Connection_Purging.mpc:
+        * tests/Crash_On_Write/Crash_On_Write.mpc:
+        * tests/Crashed_Callback/Crashed_Callback.mpc:
+        * tests/DLL_ORB/DLL_ORB.mpc:
+        * tests/DSI_Gateway/DSI_Gateway.mpc:
+        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+        * tests/Exposed_Policies/Exposed_Policies.mpc:
+        * tests/FL_Cube/FL_Cube.mpc:
+        * tests/Faults/Faults.mpc:
+        * tests/File_IO/File_IO.mpc:
+        * tests/Forwarding/Forwarding.mpc:
+        * tests/Hang_Shutdown/Hang.mpc:
+        * tests/Hello/Hello.mpc:
+        * tests/ICMG_Any_Bug/Hello.mpc:
+        * tests/IPV6/IPV6_Hello.mpc:
+        * tests/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/Leader_Followers/Leader_Followers.mpc:
+        * tests/LongUpcalls/LongUpcalls.mpc:
+        * tests/MProfile/MProfile.mpc:
+        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+        * tests/MT_BiDir/MT_BiDir.mpc:
+        * tests/MT_Client/MT_Client.mpc:
+        * tests/MT_Server/MT_Server.mpc:
+        * tests/Multiple/Multiple.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+        * tests/Muxing/Muxing.mpc:
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+        * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Factory/OBV_Factory.mpc:
+        * tests/OBV/Forward/OBV_Forward.mpc:
+        * tests/OBV/Supports/Supports_Test.mpc:
+        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+        * tests/OBV/ValueBox/valuebox.mpc:
+        * tests/Object_Loader/Object_Loader.mpc:
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
+        * tests/OctetSeq/OctetSeq.mpc:
+        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
+        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
+        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
+        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
+        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
+        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.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/QtTests/QtTests.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/Diffserv/RTCORBA_Diffserv.mpc:
+        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.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/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/Reliable_Oneways/Reliable_Oneways.mpc:
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+        * tests/Server_Leaks/Server_Leaks.mpc:
+        * tests/Single_Read/Single_Read.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/Timeout/Timeout.mpc:
+        * tests/Two_Objects/Two_Objects.mpc:
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
+        * tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+
+          Added 'after += ...' lines to files where projects share one or
+          more IDL files. This change will order the builds and eliminate
+          concurrency problems in VC8 builds. This is a temporary solution
+          until there is time to apply J.T. Conklin's <jtc@acorntoolworks.com>
+          approach of creating a separate project in each file that just
+          executes the IDL compiler on the shared files, and ordering all
+          other projects that build the resulting generated files to
+          come after this step.
+
+Thu Dec  1 16:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Thread_Pool.cpp:
+          Fixed bug in thread pool id calculation
+
+Thu Dec  1 16:02:36 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/MT_Timeout/MT_Timeout.mpc:
+
+          Added 'after' line in one project to order the builds (which
+          share an IDL file) for VC8.
+
+Thu Dec  1 14:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Updated VxWorks part
+
+Wed Nov 30 10:23:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Options.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h:
+        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Send_Task.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Driver.h:
+        * orbsvcs/tests/Event/Basic/BCast.h:
+        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h:
+        * orbsvcs/tests/Event/Performance/Latency.h:
+        * orbsvcs/tests/Event/lib/Driver.h:
+        * orbsvcs/tests/FT_App/FT_Creator.h:
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h:
+        * orbsvcs/tests/FtRtEvent/PushSupplier.h:
+
+          Fixed forward declarations so that they take into account
+          versioned namespace support.
+
+Wed Nov 30 00:33:21 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc:
+        * examples/Content_Server/AMI_Observer/AMI_Observer.mpc:
+        * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
+        * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
+        * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
+        * examples/POA/TIE/POA_TIE.mpc:
+        * examples/Persistent_Grid/Persistent_Grid.mpc:
+        * orbsvcs/examples/LoadBalancing/LoadBalancing.mpc:
+        * orbsvcs/orbsvcs/AV.mpc:
+        * orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc:
+        * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc:
+        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc:
+
+          Disable these projects when "ace_for_tao" is enabled.
+
+        * tao/GIOP_Message_Generator_Parser_Impl.inl:
+
+          Removed "static" keywork from constant variable declaration.
+          Corrected semantics are not supported in shared libraries on
+          VxWorks.  Thanks to Frank Rehberger for suggesting the change,
+          and to Johnny for pointing out the VxWorks issue.  [Bug 2304]
+
+Wed Nov 30 14:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/Thread_Pool.{h,cpp}:
+          Fixed warnings in GCC build
+
+Wed Nov 30 12:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl:
+          New regression test script. Test the TAO SSLIOP under heavy load
+          and it will fail. This test takes a long time to succeed so
+          didn't put it in the standard test suite. We have no idea why
+          it fails, but something is buggy in the SSLIOP support
+
+Wed Nov 30 11:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RT_ORB.{h,cpp}:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.{h,cpp}:
+        * tao/RTCORBA/Thread_Pool.{h,cpp,inl}:
+        * docs/rtcorba/features.html:
+          When using RTCorba threadpools dynamic threads can be used, these
+          will be created on demand but will life forever after that. A new
+          option has been added to the RT_ORB_Loader:
+          RTORBDynamicThreadIdleTimeout. With this option a number of micro
+          seconds can be specified. If a dynamic thread has not performed
+          anywork in that time it will end itself. This way dynamic threads
+          can go away if the load reduces again on the server, at the moment
+          they are needed they are recreated. Because of this some internal
+          administration has been updated, argument parsing has been updated
+          and the timeout is passed through several interfacs.
+
+        * docs/releasenotes/index.html:
+          Fixed RTCorba link
+
+Wed Nov 30 08:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
+          Added brief class description
+
+Tue Nov 29 06:44:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+        * orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_Property_Validator.h:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+        * orbsvcs/Fault_Detector/Fault_Detector_i.cpp:
+        * orbsvcs/Fault_Detector/Fault_Detector_i.h:
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+        * orbsvcs/Notify_Service/Notify_Service.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
+
+          More versioned namespace build fixes.
+
+Tue Nov 29 13:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/LRU_Connection_Purging_Strategy.cpp:
+          Use prefix increment instead of postfix
+
+Tue Nov 29 11:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.h:
+          Added argument names to perform_work methods, improves doxygen
+          docu
+
+Tue Nov 29 09:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/PluggableUDP/tests/Performance/Performance.mpc:
+          Added 'after' lines to order the builds for VC8.
+
+Mon Nov 28 22:22:11 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
+
+          Added 'after' lines to order the builds for VC8.
+
+Mon Nov 28 12:09:12 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp:
+
+          Made main thread call ACE_Object_Manager::instance()->wait()
+          after orb shutdown. This would avoid the problem that the main
+          thread possiably exit before all CSD threads exit and crash
+          upon exit.
+
+Mon Nov 28 07:30:58 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+
+          Added missing "/**/ between "include" and "{pre,post}.h".
+
+        * tao/Utils/Server_Main.h:
+
+          Fixed "obsolete #pragma once" warning.
+
+Sun Nov 27 04:00:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/orbsvcs/Scheduler_Factory.h:
+        * orbsvcs/orbsvcs/Scheduler_Factory.i:
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.h:
+        * orbsvcs/orbsvcs/AV/Policy.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Adapters.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
+        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.h:
+        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h:
+        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.h:
+        * orbsvcs/orbsvcs/Notify/Factory.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h:
+        * orbsvcs/orbsvcs/Notify/Property.h:
+        * orbsvcs/orbsvcs/Notify/Timer.h:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * tao/Basic_Types.h:
+        * tao/TAO_Singleton_Manager.inl:
+        * tao/AnyTypeCode/String_TypeCode_Traits.h:
+        * tao/AnyTypeCode/TAOA.h:
+        * tao/AnyTypeCode/TypeCodeA.cpp:
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * tao/AnyTypeCode/TypeCode_Constants.cpp:
+        * tao/IFR_Client/IFR_BasicC.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/ImR_Client/ImR_Client.h:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
+        * tao/PI/InvalidSlotA.cpp:
+        * tao/PI/ORBInitInfoC.cpp:
+        * tao/PI/ORBInitInfoC.h:
+        * tao/PI/PICurrentC.cpp:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.h:
+        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
+        * tao/PortableServer/IdAssignmentStrategySystem.h:
+        * tao/PortableServer/IdAssignmentStrategyUser.cpp:
+        * tao/PortableServer/IdAssignmentStrategyUser.h:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.h:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h:
+        * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyExplicit.h:
+        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.h:
+        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyFactoryImpl.h:
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h:
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.h:
+        * tao/PortableServer/Non_Servant_Upcall.h:
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/PortableServerA.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.h:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h:
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h:
+        * tao/PortableServer/ServantRetentionStrategyFactory.h:
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h:
+        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h:
+        * tao/PortableServer/StrategyFactory.h:
+        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategyFactoryImpl.h:
+        * tao/PortableServer/ThreadStrategyORBControl.cpp:
+        * tao/PortableServer/ThreadStrategyORBControl.h:
+        * tao/PortableServer/ThreadStrategySingle.cpp:
+        * tao/PortableServer/ThreadStrategySingle.h:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+        * tao/PortableServer/Var_Size_SArgument_T.cpp:
+        * tao/PortableServer/Var_Size_SArgument_T.h:
+        * tao/PortableServer/Var_Size_SArgument_T.inl:
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * tao/RTCORBA/RTCORBAA.cpp:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTPortableServer/RTPortableServerA.cpp:
+        * tao/RTScheduling/RTSchedulerA.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp:
+        * tao/Utils/PolicyList_Destroyer.h:
+        * tao/Utils/Server_Main.cpp:
+        * tao/Utils/Server_Main.h:
+
+          Corrected build errors in versioned namespace builds.
+
+Sat Nov 26 14:57:56 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/util/utl_global.cpp:
+        * TAO_IDL/include/idl_global.h:
+
+          Modified files overlooked in the checkin of
+
+          Fri Nov 25 19:26:03 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Fri Nov 25 18:54:19 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * NEWS:
+
+          Updated with latest versioned namespace information.
+
+        * TAO_IDL/tao_idl.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/IFRService.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
+        * orbsvcs/orbsvcs/Svc_Utils.mpc:
+        * tao/Strategies.mpc:
+
+          Updated to take into account latest "ace_for_tao" subset
+          changes.
+
+        * tao/TAO_Singleton_Manager.h:
+        * tao/AnyTypeCode/CharSeqA.cpp:
+        * tao/AnyTypeCode/CharSeqA.h:
+        * tao/AnyTypeCode/CurrentA.cpp:
+        * tao/AnyTypeCode/CurrentA.h:
+        * tao/AnyTypeCode/DomainA.cpp:
+        * tao/AnyTypeCode/DomainA.h:
+        * tao/AnyTypeCode/DoubleSeqA.cpp:
+        * tao/AnyTypeCode/DoubleSeqA.h:
+        * tao/AnyTypeCode/DynamicA.cpp:
+        * tao/AnyTypeCode/DynamicA.h:
+        * tao/AnyTypeCode/Dynamic_ParameterA.cpp:
+        * tao/AnyTypeCode/Dynamic_ParameterA.h:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/ExceptionA.h:
+        * tao/AnyTypeCode/FloatSeqA.cpp:
+        * tao/AnyTypeCode/FloatSeqA.h:
+        * tao/AnyTypeCode/GIOPA.cpp:
+        * tao/AnyTypeCode/GIOPA.h:
+        * tao/AnyTypeCode/IIOPA.cpp:
+        * tao/AnyTypeCode/IIOPA.h:
+        * tao/AnyTypeCode/IIOP_EndpointsA.cpp:
+        * tao/AnyTypeCode/IIOP_EndpointsA.h:
+        * tao/AnyTypeCode/IOP_IORA.cpp:
+        * tao/AnyTypeCode/IOP_IORA.h:
+        * tao/AnyTypeCode/LongDoubleSeqA.cpp:
+        * tao/AnyTypeCode/LongDoubleSeqA.h:
+        * tao/AnyTypeCode/LongLongSeqA.cpp:
+        * tao/AnyTypeCode/LongLongSeqA.h:
+        * tao/AnyTypeCode/LongSeqA.cpp:
+        * tao/AnyTypeCode/LongSeqA.h:
+        * tao/AnyTypeCode/Messaging_PolicyValueA.cpp:
+        * tao/AnyTypeCode/Messaging_PolicyValueA.h:
+        * tao/AnyTypeCode/ObjectIdListA.cpp:
+        * tao/AnyTypeCode/ObjectIdListA.h:
+        * tao/AnyTypeCode/PI_ForwardA.cpp:
+        * tao/AnyTypeCode/PI_ForwardA.h:
+        * tao/AnyTypeCode/ParameterModeA.cpp:
+        * tao/AnyTypeCode/ParameterModeA.h:
+        * tao/AnyTypeCode/PolicyA.cpp:
+        * tao/AnyTypeCode/PolicyA.h:
+        * tao/AnyTypeCode/Policy_ForwardA.cpp:
+        * tao/AnyTypeCode/Policy_ForwardA.h:
+        * tao/AnyTypeCode/PortableInterceptorA.h:
+        * tao/AnyTypeCode/ServicesA.cpp:
+        * tao/AnyTypeCode/ServicesA.h:
+        * tao/AnyTypeCode/ShortSeqA.cpp:
+        * tao/AnyTypeCode/ShortSeqA.h:
+        * tao/AnyTypeCode/StringSeqA.cpp:
+        * tao/AnyTypeCode/StringSeqA.h:
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
+        * tao/AnyTypeCode/SystemExceptionA.h:
+        * tao/AnyTypeCode/TAOA.cpp:
+        * tao/AnyTypeCode/TimeBaseA.cpp:
+        * tao/AnyTypeCode/TimeBaseA.h:
+        * tao/AnyTypeCode/ULongLongSeqA.cpp:
+        * tao/AnyTypeCode/ULongLongSeqA.h:
+        * tao/AnyTypeCode/ULongSeqA.cpp:
+        * tao/AnyTypeCode/ULongSeqA.h:
+        * tao/AnyTypeCode/UShortSeqA.cpp:
+        * tao/AnyTypeCode/UShortSeqA.h:
+        * tao/AnyTypeCode/ValueModifierA.cpp:
+        * tao/AnyTypeCode/ValueModifierA.h:
+        * tao/AnyTypeCode/VisibilityA.cpp:
+        * tao/AnyTypeCode/VisibilityA.h:
+        * tao/AnyTypeCode/WCharSeqA.cpp:
+        * tao/AnyTypeCode/WCharSeqA.h:
+        * tao/AnyTypeCode/WStringSeqA.cpp:
+        * tao/AnyTypeCode/WStringSeqA.h:
+        * tao/AnyTypeCode/WrongTransactionA.cpp:
+        * tao/AnyTypeCode/WrongTransactionA.h:
+        * tao/AnyTypeCode/orb_typesA.cpp:
+        * tao/AnyTypeCode/orb_typesA.h:
+        * tao/CSD_Framework/CSD_FrameworkA.cpp:
+        * tao/CSD_Framework/CSD_FrameworkA.h:
+        * tao/CSD_Framework/CSD_FrameworkC.cpp:
+        * tao/CSD_Framework/CSD_FrameworkC.h:
+        * tao/Domain/DomainS.cpp:
+        * tao/Domain/DomainS.h:
+        * tao/Domain/DomainS.inl:
+        * tao/Domain/DomainS_T.h:
+        * tao/Domain/DomainS_T.inl:
+        * tao/DynamicAny/DynamicAnyC.cpp:
+        * tao/DynamicAny/DynamicAnyC.h:
+        * tao/IFR_Client/IFR_BaseC.cpp:
+        * tao/IFR_Client/IFR_BaseC.h:
+        * tao/IFR_Client/IFR_BaseC.inl:
+        * tao/IFR_Client/IFR_BaseS.h:
+        * tao/IFR_Client/IFR_BasicC.h:
+        * tao/IFR_Client/IFR_BasicC.inl:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.h:
+        * tao/IFR_Client/IFR_ComponentsC.inl:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.h:
+        * tao/IFR_Client/IFR_ExtendedC.inl:
+        * tao/IORInterceptor/IORInfoC.cpp:
+        * tao/IORInterceptor/IORInfoC.h:
+        * tao/IORInterceptor/IORInterceptorC.cpp:
+        * tao/IORInterceptor/IORInterceptorC.h:
+        * tao/IORManipulation/IORA.cpp:
+        * tao/IORManipulation/IORC.cpp:
+        * tao/IORManipulation/IORC.h:
+        * tao/IORTable/IORTableC.cpp:
+        * tao/IORTable/IORTableC.h:
+        * tao/ImR_Client/ImplRepoC.cpp:
+        * tao/ImR_Client/ImplRepoC.h:
+        * tao/ImR_Client/ImplRepoC.inl:
+        * tao/ImR_Client/ImplRepoS.cpp:
+        * tao/ImR_Client/ImplRepoS.h:
+        * tao/ImR_Client/ServerObjectC.cpp:
+        * tao/ImR_Client/ServerObjectC.h:
+        * tao/ImR_Client/ServerObjectC.inl:
+        * tao/ImR_Client/ServerObjectS.cpp:
+        * tao/ImR_Client/ServerObjectS.h:
+        * tao/Messaging/ExceptionHolderA.cpp:
+        * tao/Messaging/ExceptionHolderA.h:
+        * tao/Messaging/ExceptionHolderC.cpp:
+        * tao/Messaging/ExceptionHolderC.h:
+        * tao/Messaging/ExceptionHolderC.inl:
+        * tao/Messaging/MessagingA.cpp:
+        * tao/Messaging/MessagingA.h:
+        * tao/Messaging/MessagingC.cpp:
+        * tao/Messaging/MessagingC.h:
+        * tao/Messaging/MessagingC.inl:
+        * tao/Messaging/MessagingS.cpp:
+        * tao/Messaging/MessagingS.h:
+        * tao/Messaging/MessagingS_T.h:
+        * tao/Messaging/MessagingS_T.inl:
+        * tao/Messaging/Messaging_No_ImplA.cpp:
+        * tao/Messaging/Messaging_No_ImplA.h:
+        * tao/Messaging/Messaging_No_ImplC.cpp:
+        * tao/Messaging/Messaging_No_ImplC.h:
+        * tao/Messaging/Messaging_RT_PolicyA.cpp:
+        * tao/Messaging/Messaging_RT_PolicyA.h:
+        * tao/Messaging/Messaging_RT_PolicyC.cpp:
+        * tao/Messaging/Messaging_RT_PolicyC.h:
+        * tao/Messaging/Messaging_SyncScope_PolicyA.cpp:
+        * tao/Messaging/Messaging_SyncScope_PolicyA.h:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.h:
+        * tao/Messaging/OldExceptionHolderA.cpp:
+        * tao/Messaging/OldExceptionHolderA.h:
+        * tao/Messaging/OldExceptionHolderC.cpp:
+        * tao/Messaging/OldExceptionHolderC.h:
+        * tao/Messaging/OldExceptionHolderC.inl:
+        * tao/Messaging/PollableC.cpp:
+        * tao/Messaging/PollableC.h:
+        * tao/Messaging/TAO_ExtA.cpp:
+        * tao/Messaging/TAO_ExtA.h:
+        * tao/Messaging/TAO_ExtC.cpp:
+        * tao/Messaging/TAO_ExtC.h:
+        * tao/ObjRefTemplate/Default_ORTA.cpp:
+        * tao/ObjRefTemplate/Default_ORTC.cpp:
+        * tao/ObjRefTemplate/Default_ORTC.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h:
+        * tao/PI/ClientRequestInfoA.cpp:
+        * tao/PI/ClientRequestInfoA.h:
+        * tao/PI/ClientRequestInfoC.cpp:
+        * tao/PI/ClientRequestInterceptorA.cpp:
+        * tao/PI/ClientRequestInterceptorA.h:
+        * tao/PI/ClientRequestInterceptorC.cpp:
+        * tao/PI/InterceptorA.cpp:
+        * tao/PI/InterceptorA.h:
+        * tao/PI/InterceptorC.cpp:
+        * tao/PI/InterceptorC.h:
+        * tao/PI/InvalidSlotA.h:
+        * tao/PI/InvalidSlotC.cpp:
+        * tao/PI/InvalidSlotC.h:
+        * tao/PI/ORBInitializerA.cpp:
+        * tao/PI/ORBInitializerA.h:
+        * tao/PI/ORBInitializerC.cpp:
+        * tao/PI/ORBInitializerC.h:
+        * tao/PI/PICurrentA.cpp:
+        * tao/PI/PICurrentA.h:
+        * tao/PI/PICurrentC.h:
+        * tao/PI/PIForwardRequestA.cpp:
+        * tao/PI/PIForwardRequestA.h:
+        * tao/PI/PIForwardRequestC.cpp:
+        * tao/PI/PIForwardRequestC.h:
+        * tao/PI/PolicyFactoryA.cpp:
+        * tao/PI/PolicyFactoryA.h:
+        * tao/PI/PolicyFactoryC.cpp:
+        * tao/PI/PolicyFactoryC.h:
+        * tao/PI/RequestInfoA.cpp:
+        * tao/PI/RequestInfoA.h:
+        * tao/PI/RequestInfoC.cpp:
+        * tao/PI/RequestInfoC.h:
+        * tao/PI_Server/ServerRequestInfoA.cpp:
+        * tao/PI_Server/ServerRequestInfoA.h:
+        * tao/PI_Server/ServerRequestInfoC.cpp:
+        * tao/PI_Server/ServerRequestInfoC.h:
+        * tao/PI_Server/ServerRequestInterceptorA.cpp:
+        * tao/PI_Server/ServerRequestInterceptorA.h:
+        * tao/PI_Server/ServerRequestInterceptorC.cpp:
+        * tao/PI_Server/ServerRequestInterceptorC.h:
+        * tao/PortableServer/AdapterActivatorA.cpp:
+        * tao/PortableServer/AdapterActivatorA.h:
+        * tao/PortableServer/AdapterActivatorC.cpp:
+        * tao/PortableServer/AdapterActivatorC.h:
+        * tao/PortableServer/ForwardRequestA.cpp:
+        * tao/PortableServer/ForwardRequestA.h:
+        * tao/PortableServer/ForwardRequestC.cpp:
+        * tao/PortableServer/ForwardRequestC.h:
+        * tao/PortableServer/IdAssignmentPolicyA.cpp:
+        * tao/PortableServer/IdAssignmentPolicyA.h:
+        * tao/PortableServer/IdAssignmentPolicyC.cpp:
+        * tao/PortableServer/IdAssignmentPolicyC.h:
+        * tao/PortableServer/IdUniquenessPolicyA.cpp:
+        * tao/PortableServer/IdUniquenessPolicyA.h:
+        * tao/PortableServer/IdUniquenessPolicyC.cpp:
+        * tao/PortableServer/IdUniquenessPolicyC.h:
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyA.h:
+        * tao/PortableServer/ImplicitActivationPolicyC.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyC.h:
+        * tao/PortableServer/LifespanPolicyA.cpp:
+        * tao/PortableServer/LifespanPolicyA.h:
+        * tao/PortableServer/LifespanPolicyC.cpp:
+        * tao/PortableServer/LifespanPolicyC.h:
+        * tao/PortableServer/POAManagerC.cpp:
+        * tao/PortableServer/POAManagerC.h:
+        * tao/PortableServer/PS_CurrentC.cpp:
+        * tao/PortableServer/PS_CurrentC.h:
+        * tao/PortableServer/PS_ForwardA.cpp:
+        * tao/PortableServer/PS_ForwardA.h:
+        * tao/PortableServer/PS_ForwardC.cpp:
+        * tao/PortableServer/PS_ForwardC.h:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/PolicyS.h:
+        * tao/PortableServer/PolicyS_T.h:
+        * tao/PortableServer/PolicyS_T.inl:
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/PortableServerS.h:
+        * tao/PortableServer/PortableServer_includeC.h:
+        * tao/PortableServer/RequestProcessingPolicyA.cpp:
+        * tao/PortableServer/RequestProcessingPolicyA.h:
+        * tao/PortableServer/RequestProcessingPolicyC.cpp:
+        * tao/PortableServer/RequestProcessingPolicyC.h:
+        * tao/PortableServer/ServantActivatorA.cpp:
+        * tao/PortableServer/ServantActivatorA.h:
+        * tao/PortableServer/ServantActivatorC.cpp:
+        * tao/PortableServer/ServantActivatorC.h:
+        * tao/PortableServer/ServantLocatorA.cpp:
+        * tao/PortableServer/ServantLocatorA.h:
+        * tao/PortableServer/ServantLocatorC.cpp:
+        * tao/PortableServer/ServantLocatorC.h:
+        * tao/PortableServer/ServantManagerA.cpp:
+        * tao/PortableServer/ServantManagerA.h:
+        * tao/PortableServer/ServantManagerC.cpp:
+        * tao/PortableServer/ServantManagerC.h:
+        * tao/PortableServer/ServantRetentionPolicyA.cpp:
+        * tao/PortableServer/ServantRetentionPolicyA.h:
+        * tao/PortableServer/ServantRetentionPolicyC.cpp:
+        * tao/PortableServer/ServantRetentionPolicyC.h:
+        * tao/PortableServer/ThreadPolicyA.cpp:
+        * tao/PortableServer/ThreadPolicyA.h:
+        * tao/PortableServer/ThreadPolicyC.cpp:
+        * tao/PortableServer/ThreadPolicyC.h:
+        * tao/RTCORBA/RTCORBAC.cpp:
+        * tao/RTCORBA/RTCORBAC.h:
+        * tao/RTCORBA/RTCORBA_includeC.h:
+        * tao/RTPortableServer/RTPortableServerC.cpp:
+        * tao/RTPortableServer/RTPortableServerC.h:
+        * tao/RTPortableServer/RTPortableServerS.h:
+        * tao/RTPortableServer/RTPortableServer_includeC.h:
+        * tao/RTScheduling/RTSchedulerC.cpp:
+        * tao/RTScheduling/RTSchedulerC.h:
+        * tao/RTScheduling/RTScheduler_includeA.h:
+        * tao/RTScheduling/RTScheduler_includeC.h:
+        * tao/Strategies/sciop_endpointsC.cpp:
+        * tao/Strategies/sciop_endpointsC.h:
+        * tao/Strategies/uiop_endpointsC.cpp:
+        * tao/Strategies/uiop_endpointsC.h:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.h:
+        * tao/Valuetype/StringValueC.cpp:
+        * tao/Valuetype/StringValueC.h:
+        * tao/Valuetype/StringValueC.inl:
+
+          Added missing versioned namespace support.
+
+Fri Nov 25 19:26:03 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_field.cpp:
+        * TAO_IDL/fe/fe_declarator.cpp:
+
+          Added code generation for explicit inclusionn of
+          tao/Managed_Types.h if TAO_(W)String_Manager is seen
+          anywhere in the generated code. This inclusion is
+          redundant now, but will make it easier to merge the
+          new sequence implementation branch, where managed_Types.h
+          will be changed to the name of a new file, into which
+          templatized versions of TAO_(W)String_Manager have
+          been factored.
+
+Fri Nov 25 07:43:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/TAO_Singleton_Manager.h (~TAO_Singleton_Manager):
+
+          Made destructor protected to address warnings about a class with
+          a private destructor and no friends.
+
+Fri Nov 25 15:06:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_interface_header.cpp:
+
+          Applied a patch submitted by Max Khon <mkhon@swsoft.com>
+          to fix a bug in computing the inheritance list of an IDL
+          interface. This fix closes [BUGID:2318].
+
+Fri Nov 25 13:01:23 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+
+          Added time parameter to WaitKill to fix spurious test error.
+
+Fri Nov 25 11:18:12 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orsbvcs/tests/Bug_2074_Regression/run_test.pl:
+
+          Correct the use lib path to give this a sporting chance.
+          Can't have ever been run from this location.
+
+Thu Nov 24 19:50:35 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h:
+
+          Override the base class ::decode method with one that
+          doesn't try and extract an object key from the CDR encoding.
+          MIOP profiles don't have an object key marshalled between
+          the address info and the tagged components.
+
+          This fixes bug #2316.
+
+        * orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc:
+        * orbsvcs/tests/Bug_2316_Regression/README:
+        * orbsvcs/tests/Bug_2316_Regression/Test.idl:
+        * orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp:
+        * orbsvcs/tests/Bug_2316_Regression/Test_impl.h:
+        * orbsvcs/tests/Bug_2316_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2316_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2316_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2316_Regression/svc.conf:
+
+          Regression test for the above.
+
+Thu Nov 24 19:07:56 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
+
+          Fix calculation of protocol name length. This fixes the
+          failure in orbsvcs/tests/Miop/McastHello.
+
+Thu Nov 24 15:56:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
+
+          Added 'after' line in one project to avoid concurrently
+          clashes in VC8 builds, since the two projects share an
+          IDL file.
+
+Thu Nov 24 03:01:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i:
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Security/Security_Current.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * tao/Acceptor_Registry.h:
+        * tao/Asynch_Reply_Dispatcher_Base.h:
+        * tao/BooleanSeqC.cpp:
+        * tao/BooleanSeqC.h:
+        * tao/CDR.h:
+        * tao/CONV_FRAMEC.cpp:
+        * tao/CONV_FRAMEC.h:
+        * tao/CORBA_methods.h:
+        * tao/CharSeqC.cpp:
+        * tao/CharSeqC.h:
+        * tao/Client_Strategy_Factory.h:
+        * tao/Codeset_Manager.h:
+        * tao/Codeset_Translator_Base.h:
+        * tao/Collocation_Strategy.h:
+        * tao/Condition.h:
+        * tao/Connect_Strategy.h:
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.inl:
+        * tao/Connector_Impl.h:
+        * tao/CurrentC.cpp:
+        * tao/CurrentC.h:
+        * tao/DomainC.cpp:
+        * tao/DomainC.h:
+        * tao/DomainC.inl:
+        * tao/DoubleSeqC.cpp:
+        * tao/DoubleSeqC.h:
+        * tao/Exception.h:
+        * tao/Fault_Tolerance_Service.h:
+        * tao/FlResource_Factory.h:
+        * tao/FloatSeqC.cpp:
+        * tao/FloatSeqC.h:
+        * tao/Flushing_Strategy.h:
+        * tao/GIOPC.cpp:
+        * tao/GIOPC.h:
+        * tao/GIOPC.inl:
+        * tao/GIOP_Utils.h:
+        * tao/GUIResource_Factory.h:
+        * tao/IIOPC.cpp:
+        * tao/IIOPC.h:
+        * tao/IIOP_EndpointsC.cpp:
+        * tao/IIOP_EndpointsC.h:
+        * tao/IIOP_Lite_Factory.cpp:
+        * tao/IOPC.cpp:
+        * tao/IOPC.h:
+        * tao/IOP_IORC.cpp:
+        * tao/IOP_IORC.h:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/Incoming_Message_Queue.h:
+        * tao/Invocation_Adapter.h:
+        * tao/Invocation_Endpoint_Selectors.h:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Strategy.h:
+        * tao/Leader_Follower.h:
+        * tao/LocateRequest_Invocation_Adapter.h:
+        * tao/LongDoubleSeqC.cpp:
+        * tao/LongDoubleSeqC.h:
+        * tao/LongLongSeqC.cpp:
+        * tao/LongLongSeqC.h:
+        * tao/LongSeqC.cpp:
+        * tao/LongSeqC.h:
+        * tao/Messaging_PolicyValueC.cpp:
+        * tao/Messaging_PolicyValueC.h:
+        * tao/Messaging_SyncScopeC.cpp:
+        * tao/Messaging_SyncScopeC.h:
+        * tao/ORBInitializer_Registry.h:
+        * tao/ORB_Core.h:
+        * tao/Object.h:
+        * tao/ObjectIdListC.cpp:
+        * tao/ObjectIdListC.h:
+        * tao/Object_KeyC.cpp:
+        * tao/Object_KeyC.h:
+        * tao/OctetSeqC.cpp:
+        * tao/OctetSeqC.h:
+        * tao/PI_ForwardC.cpp:
+        * tao/PI_ForwardC.h:
+        * tao/ParameterModeC.cpp:
+        * tao/ParameterModeC.h:
+        * tao/Pluggable_Messaging.h:
+        * tao/PolicyC.cpp:
+        * tao/PolicyC.h:
+        * tao/PolicyC.inl:
+        * tao/Policy_Current.h:
+        * tao/Policy_ForwardC.cpp:
+        * tao/Policy_ForwardC.h:
+        * tao/PortableInterceptorC.cpp:
+        * tao/PortableInterceptorC.h:
+        * tao/Profile.h:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/Queued_Message.h:
+        * tao/Reactive_Connect_Strategy.h:
+        * tao/Resource_Factory.h:
+        * tao/Sequence.h:
+        * tao/ServicesC.cpp:
+        * tao/ServicesC.h:
+        * tao/ShortSeqC.cpp:
+        * tao/ShortSeqC.h:
+        * tao/StringSeqC.cpp:
+        * tao/StringSeqC.h:
+        * tao/Synch_Invocation.h:
+        * tao/TAOC.cpp:
+        * tao/TAOC.h:
+        * tao/TAO_Internal.h:
+        * tao/TAO_Server_Request.h:
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/TAO_Singleton_Manager.h:
+        * tao/Thread_Lane_Resources.h:
+        * tao/TimeBaseC.cpp:
+        * tao/TimeBaseC.h:
+        * tao/Transport_Acceptor.h:
+        * tao/Transport_Cache_Manager.h:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Mux_Strategy.h:
+        * tao/Transport_Queueing_Strategies.h:
+        * tao/TypeCodeFactory_Adapter.h:
+        * tao/Typecode_typesC.cpp:
+        * tao/Typecode_typesC.h:
+        * tao/ULongLongSeqC.cpp:
+        * tao/ULongLongSeqC.h:
+        * tao/ULongSeqC.cpp:
+        * tao/ULongSeqC.h:
+        * tao/UShortSeqC.cpp:
+        * tao/UShortSeqC.h:
+        * tao/VarOut_T.cpp:
+        * tao/Var_Size_Argument_T.inl:
+        * tao/Versioned_Namespace.h:
+        * tao/WCharSeqC.cpp:
+        * tao/WCharSeqC.h:
+        * tao/WStringSeqC.cpp:
+        * tao/WStringSeqC.h:
+        * tao/Wait_Strategy.h:
+        * tao/WrongTransactionC.cpp:
+        * tao/WrongTransactionC.h:
+        * tao/default_resource.h:
+        * tao/orb_typesC.cpp:
+        * tao/orb_typesC.h:
+        * tao/target_specification.h:
+        * tao/target_specification.i:
+        * tao/AnyTypeCode/AnySeqA.cpp:
+        * tao/AnyTypeCode/AnySeqA.h:
+        * tao/AnyTypeCode/AnySeqC.cpp:
+        * tao/AnyTypeCode/AnySeqC.h:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
+        * tao/AnyTypeCode/Any_Impl.h:
+        * tao/AnyTypeCode/Any_Impl_T.h:
+        * tao/AnyTypeCode/Any_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
+        * tao/AnyTypeCode/BooleanSeqA.cpp:
+        * tao/AnyTypeCode/BooleanSeqA.h:
+        * tao/AnyTypeCode/BoundsA.cpp:
+        * tao/AnyTypeCode/BoundsA.h:
+        * tao/AnyTypeCode/BoundsC.cpp:
+        * tao/AnyTypeCode/BoundsC.h:
+        * tao/AnyTypeCode/CONV_FRAMEA.cpp:
+        * tao/AnyTypeCode/CONV_FRAMEA.h:
+        * tao/AnyTypeCode/DynamicC.cpp:
+        * tao/AnyTypeCode/DynamicC.h:
+        * tao/AnyTypeCode/Dynamic_ParameterC.cpp:
+        * tao/AnyTypeCode/Dynamic_ParameterC.h:
+        * tao/AnyTypeCode/OctetSeqA.cpp:
+        * tao/AnyTypeCode/OctetSeqA.h:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.h:
+        * tao/AnyTypeCode/ValueModifierC.cpp:
+        * tao/AnyTypeCode/ValueModifierC.h:
+        * tao/AnyTypeCode/VisibilityC.cpp:
+        * tao/AnyTypeCode/VisibilityC.h:
+        * tao/BiDir_GIOP/BiDirPolicyC.cpp:
+        * tao/BiDir_GIOP/BiDirPolicyC.h:
+        * tao/CodecFactory/IOP_CodecC.cpp:
+        * tao/CodecFactory/IOP_CodecC.h:
+        * tao/CodecFactory/IOP_Codec_includeC.h:
+        * tao/Codeset/Codeset_Translator_Factory.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/Messaging/Asynch_Invocation.h:
+        * tao/Messaging/Asynch_Invocation_Adapter.h:
+        * tao/Messaging/Asynch_Reply_Dispatcher.h:
+        * tao/Messaging/Connection_Timeout_Policy_i.h:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfoC.h:
+        * tao/PI/ClientRequestInterceptorC.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/Key_Adapters.h:
+        * tao/PortableServer/Servant_Dispatcher.cpp:
+        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/Utils/Synch_Refcountable.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+
+          Corrected build errors in versioned namespace builds.
+
+Wed Nov 23 22:24:38 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
+
+          Explicitly declared a private copy constructor and assignment
+          operator for TAO_Notify_Event_Manager.  By not declaring them,
+          the compiler has to generate them.  In generating them, it needs
+          to be able to know the complete type for the template arguments
+          to its ACE_Auto_Ptr<> private instances.  Various circular
+          dependencies make that difficult to impossible without
+          restructuring, so we take this approach instead.
+
+          This change should eliminate warnings from Windows-based
+          compilers (e.g., VC8) about calling delete through a pointer to
+          an incomplete type while instantiating ACE_Auto_Ptr<> methods.
+
+        * orbsvcs/orbsvcs/Notify/Object.h:
+        * orbsvcs/orbsvcs/Notify/Object.cpp:
+
+          Only needed a forward decl in Object.h; we only needed the
+          complete type in Object.cpp.  Maybe this will help footprint.
+
+Wed Nov 23 09:20:03 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          Fix a few things I should have caught in the Great Merge, but
+          missed.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_request): Change
+          from using deprecated TAO_DEFAULT_MINOR_CODE to TAO::VMCID.
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: Use
+          real C++ static_cast<> rather than deprecated ACE_static_cast().
+
+Wed Nov 23 14:53:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
+
+          Added an 'after' line to one project to avoid concurrency
+          collisions in VC8 builds, since the 2 projects in this file
+          share IDL.
+
+Wed Nov 23 14:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/ValueBox/client.cpp:
+          This test was doing a few release calls to much causing it to
+          crash.
+
+Wed Nov 23 14:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+          Make sure all generated pointers are initialised to 0
+
+Wed Nov 23 10:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional/run_test_ipv6.pl:
+        * tests/CallbackTest/run_test_ipv6.pl:
+        * tests/IPV6/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+          Updated these scripts because of the following change, use
+          1|0 instead of YES|NO
+          Tue Nov 22 07:49:59 2005  Douglas C. Schmidt
+
+Tue Nov 22 22:58:55 2005  Chris Cleeland  <cleeland@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+
+          Fixed warnings about preferring one conversion over another
+          from a _var that appeared on a couple of platforms.
+
+Tue Nov 22 07:49:59 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * tao/ORB_Core.cpp (init): Updated the code to use 1 or 0 for
+          options, rather than YES or NO.  Thanks to Abhi Sachdev for
+          motivating this cleanup.
+
+        * docs/Options.html: Updated the documentation to remove the use of
+          YES and NO as options and replace them with 1 or 0 to be
+          consistent with the other options.
+
+Tue Nov 22 04:14:05 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * TAO_IDL/be_include/be_visitor_traits.h:
+
+          Added missing operation declaration.
+
+Tue Nov 22 01:42:48 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+
+          Rather than disable this project in the ACE_FOR_TAO
+          configuration, inherit from acesocketslib_for_tao to allow it to
+          be used.
+
+Tue Nov 22 09:33:30 (IST) 2005  Bala Natarajan <bala_natarajan@symantec.com>
+
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+
+          Do not build in ACE_FOR_TAO configuration.
+
+Mon Nov 21 19:28:51 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/EventChannel.h: Removed mistakenly left
+          in attempt to #include EventChannel.inl.
+
+Mon Nov 21 22:22:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+
+          Removed commented out code.
+
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_traits.h:
+
+          Added code generation of Value_Traits<> template
+          specialization for boxed valuetypes. Thanks to
+          Johnny Willemse <jwillemsen@remedy.nl> for reporting
+          the missing code. This fix closes [BUGID:2311].
+
+Mon Nov 21 20:14:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
+
+          Added an 'after' line for one of the two projects, since they
+          share an IDL file and VC8 concurrency features need an
+          ordering.
+
+Mon Nov 21 13:21:03 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          This entry is the result of an accumulation of many changes in
+          the OCITAO repository for the Notification Service and the
+          subsequent merge of those changes back to DOC.  There have been
+          general changes to improve code formatting in accordance with
+          ACE guidelines, improve lax checking of emulated exceptions, and
+          the like, so these sorts of changes are not noted on a per-file
+          basis.
+
+          These changes include changes from the following OCITAO 1.4a
+          OCIChangeLog entries:
+
+          Thu Oct 27 13:01:00 2005  Wallace Zhang  <zhangw@ociweb.com>
+          Wed Sep 28 14:25:52 2005  David Giovannini  <giovannd@ociweb.com>
+          Mon Sep 26 15:58:41 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+          Tue Sep 13 17:14:25 2005  Justin Michel  <michel_j@ociweb.com>
+          Sun Sep 11 14:21:45 2005  Justin Michel  <michel_j@ociweb.com>
+          Thu Aug 18 13:50:50 2005  David Giovannini  <giovannd@ociweb.com>
+          Tue Aug 16 14:16:47 2005  Justin Michel  <michel_j@ociweb.com>
+          Wed Jul 27 12:38:01 2005  Justin Michel  <michel_j@ociweb.com>
+          Wed Jul 13 14:28:39 2005  Justin Michel  <michel_j@ociweb.com>
+          Mon Jul 11 16:47:08 2005  Justin Michel  <michel_j@ociweb.com>
+          Mon May 23 09:18:46 2005  David Giovannini  <giovanninid@ociweb.com>
+          Fri Apr 22 15:24:43 2005  David Giovannini <giovanninid@ociweb.com>
+
+        * orbsvcs/Notify_Service/Notify_Server.cpp:
+
+          Added #include of valuetype header file to that the service can
+          use valuetypes portably.
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Made some error messages more informative and removed dead code.
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+
+          Improve compliance with ACE formatting guidelines.
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Object.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+        * orbsvcs/tests/Notify/Basic/Filter.cpp:
+        * orbsvcs/tests/Notify/Basic/MultiTypes.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
+        * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
+        * orbsvcs/tests/Notify/lib/Application_Command.cpp:
+        * orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp:
+        * orbsvcs/tests/Notify/lib/EventChannel_Command.cpp:
+        * orbsvcs/tests/Notify/lib/Filter_Command.cpp:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp:
+        * orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
+
+          Emulated exception cleanup.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.h:
+        * orbsvcs/orbsvcs/Notify/Peer.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.h:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
+        * orbsvcs/tests/Notify/PluggableTopology/main.cpp:
+
+          Improved/removed crufty comments.
+
+        * orbsvcs/orbsvcs/Notify/AllocTracker.h (ACE_WIN32_HEAP_MONITOR):
+
+          Explicitly scoped reference to CrtHeapDumper to address a
+          compiler error.
+
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+
+          Changed methods using TAO_Notify_Method_Request_Queueable to use
+          a pointer rather than a reference.  This improves expectations
+          in areas of code that take the address of the reference and
+          store it or treat it as a pointer.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_request):
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+
+          Handle COMM_FAILURE and TIMEOUT exceptions when pushing to a
+          consumer. These exceptions used to result in simply discarding
+          the event, but now they are considered a failure, and consumer
+          resources will be released.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_batch):
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+
+          Fixed the detection of dead consumers for batches of events, so
+          that killing (or crashing) a consumer will correctly discard
+          remaining queued events for that consumer, and prevent new
+          events from being queued.
+
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+
+          Simplify the types of threads from "dispatching, listener,
+          source, and lookup" to simply be "consumer" and "supplier"
+          threads.  This is the way they were used, anyway.
+
+          Changed the info message printed at startup to correctly
+          indicate that -DispatchingThreads threads are used
+          *per-consumer_admin*.  Previously it indicated that the thread
+          pool was per-channel.
+
+        * orbsvcs/orbsvcs/Notify/EventChannel.h:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp (destroy):
+
+          Fixed a memory leak where event channel destroy was not cleaning
+          up the admins.  This avoids circular reference counting problems
+          similar to those described in the next entry.
+
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp (destroy):
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp (destroy):
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp (destroy):
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp (destroy):
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp (destroy):
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp (destroy):
+
+          Fixed exceptions=0 builds logical error in destroy methods and
+          made certain all owned circular refcounted members are released
+          in class::destroy methods.
+
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp (init):
+
+          Prefer ACE_Auto_Ptr<> to auto_ptr<>.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h (event_var_):
+
+          Eliminated 'const'.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h (CTOR):
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp (CTOR):
+
+          Changed potentially confusing name of argument; it had "_var"
+          appended when it was really a pointer of sorts.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+
+          Eliminated 'const' on event_var_ data member and changed
+          potentially confusing name of local variable in copy() b/c it
+          had "_var" appended when it was really a pointer of sorts.
+
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+
+          Changed the filterable_data_ and variable_header_
+          maps. Previously they contained a CORBA::Any* which was not
+          properly reference counted; the reference count was always one
+          regardless of the number of threads using the Any.  Now it is
+          changed to contain the light-weighted CORBA::Any Object. Now the
+          "bind" method for the map will pass in the value from
+          StructuredEvent by value. Since the payload object of the
+          CORBA::Any is reference counted, we are safe.
+
+          This change fixed a Notification Service crash.
+
+        * orbsvcs/orbsvcs/Notify/Object.h (lock_):
+
+          Added new mutex to serialize access to state variables.  In the
+          past, the notification service reused mutexes for different
+          purposes, allowing a mutex in one scope to be used in a
+          different scope.  When we started using reference counting on
+          objects properly, these scopes occasionally crossed, creating
+          deadlocks, race conditions, and all other sorts of mayhem
+          associated with misuse of mutexes.
+
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/Peer.h:
+        * orbsvcs/orbsvcs/Notify/Proxy.cpp:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
+        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
+
+          Changed how the persistence specific methods handle nil object
+          references - since TAO throws an exception with url ref styles
+          on nil references.
+
+        * orbsvcs/orbsvcs/Notify/README:
+
+          Changed "ListenerThreads" to "SourceThreads".
+
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.h (timer_):
+
+          Changed to private scope.  There was no need for it to be
+          anything but private.
+
+        * orbsvcs/orbsvcs/Notify/Refcountable.h (TAO_Notify_Tracker):
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp (TAO_Notify_Tracker):
+
+          Added class to track reference counted objects in the
+          notification service.  This is disabled by default, and enabled
+          by setting the preprocessor macro
+          TAO_NOTIFY_REFCOUNT_DIAGNOSTICS to 1.  Note that currently this
+          class requires the availability of the STL map and string
+          features.
+
+          Use CORBA::Long for reference count rather than compilation
+          environment's 'long'.
+
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+
+          Updates to use isSet() predicate on TAO_Notify_Event::Ptr.
+
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
+
+          Remove the fix for zombie threads, and instead use THR_DETACHED
+          to avoid the problem entirely.
+
+        * orbsvcs/orbsvcs/Notify/Topology_Factory.h (DTOR):
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+
+          Add explicit virtual destructor to get around the problem in g++
+          4.0 where inlines get hidden.  Without the virtual DTOR, this
+          class does not get exported and code that dynamically loads
+          classes derived from this class cannot access this type and
+          access the derived instances through pointers of this type.
+          This happens most notably when loading topology persistence
+          mechanisms via the Service Configurator.
+
+          The actual code for the do-nothing destructor is in
+          EventChannelFactory.cpp.  I did this because the only chunk of
+          code that uses Topology_Factory is already in that file, and it
+          didn't seem terribly reasonable to create a completely new file
+          to hold a do-nothing implementation of a destructor.
+
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp:
+
+          Added explicit virtual destructor for the same reasons as
+          described immediately above.
+
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
+
+          Changed ANY_CODE from being static to being
+          scope-local.
+
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+
+          Removed asserts associated with parameters. If a param is not
+          optional we throw a BAD_PARAM exception.
+
+        * orbsvcs/tests/Notify/Basic/Basic.mpc:
+        * orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc:
+
+          Provide explicit exenames for each project.  While not strictly
+          required, this is "best practice" because it eliminates the need
+          for MPC to open each source file and search for the pattern
+          "*main*" to intuit an exename.
+
+        * orbsvcs/tests/Notify/Basic/Sequence.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
+
+          Fix incorrect use of pacing interval and other test issues.
+
+        * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp:
+
+          Fixed ACE_DEBUG printf-style message that had one too many
+          arguments.
+
+        * orbsvcs/tests/Notify/Reconnecting/event.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf:
+        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
+
+          Changed name of factory function used to dynamically load
+          persistence mechanism to be consistent with the new use of
+          ACE_FACTORY_NAMESPACE_DEFINE.
+
+        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
+
+          Use -ORBObjRefStyle url so that IORs will be comparable.
+
+Mon Nov 21 07:23:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+
+          Re-export TAO_SSLIOP_Transport class.  It is currently used
+          outside of the TAO_SSLIOP shared library by some of our
+          regression tests.
+
+Fri Nov 18 19:27:29 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+
+          Reverted change of
+
+          Wed Nov 16 21:53:08 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          since it caused problems with Borland and Intel compilers.
+          We'll try it again after the next beta, or when there is
+          more time to track down the problems.
+
+Fri Nov 18 15:08:19 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Typedef_String_Array/typedef_string_array.mpc:
+
+          Added 'after' line to one of two projects that share an IDL
+          file, to avoid concurrency problems with the VC8 build.
+
+Thu Nov 17 16:38:27 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
+
+          Added 'after' line to one project to avoid concurrency clashes
+          in IDL compiler execution when compiling with VC8.
+
+Thu Nov 17 07:57:13 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * docs/releasenotes/index.html:
+
+          Added CSD feature to ORB related section.
+
+Thu Nov 17 06:55:53 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
+
+          Re-export the classes in these files.  Addresses unresolved
+          symbol errors in g++ 4.x builds.
+
+Thu Nov 17 06:49:02 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+
+          Declare wrapper functions with their versioned namespace macro
+          counterparts.
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+
+          Include "params_dup.h" to pull in wrapper function names with
+          versioned namespace support.
+
+Thu Nov 17 13:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Borland/ChatClient.mpc:
+          New MPC file, add vcl=1 to your default.features and pass VCL=1
+          to the make flags to build this
+
+        * examples/Borland/README:
+          Updated
+
+Thu Nov 17 12:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Borland/ChatClient.bpr:
+        * examples/Borland/ChatClient.res:
+          Updated to BCB6 format
+
+Wed Nov 16 21:53:08 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/lex.yy.cpp.diff:
+
+          Since the change of
+
+          Wed Nov 16 11:23:15 2005  Jeff Parsons  <j.parsons@vanderbilt.edu>
+
+          checked in a version of lex.yy.cpp that had been generated
+          elsewhere, regenerated this file with the version of flex
+          that's on tango.dre.vanderbilt.edu, and updated the
+          corresponding diff file.
+
+Wed Nov 16 14:12:08 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+
+          Rolled back the changes
+          "Sun Nov 13 12:15:58 USMST 2005  Yan Dai  <dai_y@ociweb.com>"
+          made for debugging test failures on VxWorks build.
+
+        * NEWS:
+
+          Added description for CSD feature.
+
+Wed Nov 16 11:23:15 2005  Jeff Parsons  <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/idl.yy.cpp:
+
+          Applied patches submitted by Thomas Lockhart
+          <Thomas.Lockhart@jpl.nasa.gov> to enable the IDL compiler's
+          lexer to handle extra numeric fields produced by the gcc
+          4.0.1 preprocessor. Closes [BUGID:2294].
+
+Wed Nov 16 09:14:21 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp:
+
+          Include "tao/ORB_Constants.h" to pull TAO::VMCID constant.
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h:
+
+          Corrected typos in versioned namespace macros.
+
+Wed Nov 16 09:05:08 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h (Current):
+
+          Removed "const" qualifier for tss_slot_ member.  It must
+          currently remain mutable.
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h:
+
+          Include "tao/Versioned_Namespace.h" to pull in versioned
+          namespace macro definitions.
+
+Wed Nov 16 14:52:32 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/NestedUpcall/Simple/Simple.mpc:
+
+          Added 'after' line to one of the two projects in the MPC file,
+          so VC8 doesn't execute the IDL compiler concurrently.
+
+Tue Nov 15 23:48:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp:
+
+          Removed empty files.
+
+        * orbsvcs/orbsvcs/ETCL/ETCL.ll:
+        * orbsvcs/orbsvcs/ETCL/ETCL.yy:
+        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp:
+
+          Added missing versioned namespace macros.
+
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.h:
+        * orbsvcs/orbsvcs/Sched/DynSched.i:
+        * 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_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.h:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.i:
+        * 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/Security/CSI_Utils.cpp:
+        * orbsvcs/orbsvcs/Security/CSI_Utils.h:
+        * orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp:
+        * orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h:
+        * orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp:
+        * orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h:
+        * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
+        * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h:
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp:
+        * orbsvcs/orbsvcs/Security/SL3_SecurityManager.h:
+        * orbsvcs/orbsvcs/Security/Security_Current.cpp:
+        * orbsvcs/orbsvcs/Security/Security_Current.h:
+        * orbsvcs/orbsvcs/Security/Security_Current.inl:
+        * orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp:
+        * orbsvcs/orbsvcs/Security/Security_Current_Impl.h:
+        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h:
+        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h:
+        * orbsvcs/orbsvcs/Time/TAO_TIO.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_TIO.h:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h:
+        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_UTO.h:
+        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp:
+        * orbsvcs/orbsvcs/Time/Timer_Helper.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter.h:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h:
+        * orbsvcs/orbsvcs/Trader/Locking.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.h:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
+        * orbsvcs/orbsvcs/Trader/Trader.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * orbsvcs/orbsvcs/Trader/Trader_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_T.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+        * orbsvcs/orbsvcs/Trader/constraint.l:
+        * orbsvcs/orbsvcs/Trader/constraint.y:
+
+          Added versioned namespace support.
+
+Tue Nov 15 07:44:59 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+
+          Regenerate with a separate project for compiling *.idl files.
+          The corresponding *.mpc changes will be committed at a later
+          date since the repo is frozen.
+
+Tue Nov 15 06:56:51 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Makefile.am:
+        * examples/POA/Explicit_Activation/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
+        * orbsvcs/examples/Log/RTEvent/Makefile.am:
+        * orbsvcs/examples/Notify/Lanes/Makefile.am:
+        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/tests/Makefile.am:
+        * orbsvcs/tests/Notify/Basic/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Destroy/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/Driver/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/RT_lib/Makefile.am:
+        * orbsvcs/tests/Notify/Reconnecting/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * performance-tests/Makefile.am:
+        * tao/Makefile.am:
+
+          Regenerated.
+
+        * configure.ac:
+
+          Add new files to AC_CONFIG_FILES.
+
+        * examples/CSD_Strategy/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * orbsvcs/tests/Bug_2074_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * performance-tests/CSD_Strategy/Makefile.am:
+        * performance-tests/CSD_Strategy/TestApps/Makefile.am:
+        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
+        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
+
+          New files.
+
+Tue Nov 15 07:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/*:
+          Handle sequences of forward declared object references and
+          added some more unit tests
+
+Mon Nov 14 23:37:09 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+
+          Fixed memory leaks.
+
+Mon Nov 14 13:54:08 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Makefile.am (libTAO_PortableGroup_la_SOURCES):
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp:
+
+          Removed empty map/set source files.
+
+        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/EventLogConsumer.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogConsumer.h:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/EventLogNotification.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogNotification.h:
+        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLog_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.h:
+        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h:
+        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Iterator_i.h:
+        * orbsvcs/orbsvcs/Log/LogActivator.cpp:
+        * orbsvcs/orbsvcs/Log/LogActivator.h:
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
+        * orbsvcs/orbsvcs/Log/LogNotification.cpp:
+        * orbsvcs/orbsvcs/Log/LogNotification.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
+        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
+        * orbsvcs/orbsvcs/Log/LogStore.h:
+        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.h:
+        * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.h:
+        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp:
+        * orbsvcs/orbsvcs/Log/PersistStore.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogConsumer.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
+        * orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogNotification.h:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.i:
+        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp:
+        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h:
+        * orbsvcs/orbsvcs/Naming/Entries.cpp:
+        * orbsvcs/orbsvcs/Naming/Entries.h:
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h:
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Client.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Client.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Service_Container.h:
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Entries.h:
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
+        * orbsvcs/orbsvcs/Naming/Storable.h:
+        * orbsvcs/orbsvcs/Naming/Storable.inl:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/Admin.h:
+        * orbsvcs/orbsvcs/Notify/Admin.inl:
+        * orbsvcs/orbsvcs/Notify/AdminProperties.cpp:
+        * orbsvcs/orbsvcs/Notify/AdminProperties.h:
+        * orbsvcs/orbsvcs/Notify/AdminProperties.inl:
+        * orbsvcs/orbsvcs/Notify/Bit_Vector.cpp:
+        * orbsvcs/orbsvcs/Notify/Bit_Vector.h:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
+        * orbsvcs/orbsvcs/Notify/Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/Builder.h:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.h:
+        * orbsvcs/orbsvcs/Notify/Consumer.inl:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/Notify/Consumer_Map.h:
+        * orbsvcs/orbsvcs/Notify/Container_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Container_T.h:
+        * orbsvcs/orbsvcs/Notify/Container_T.inl:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp:
+        * orbsvcs/orbsvcs/Notify/Delivery_Request.h:
+        * orbsvcs/orbsvcs/Notify/Delivery_Request.inl:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
+        * orbsvcs/orbsvcs/Notify/Event.cpp:
+        * orbsvcs/orbsvcs/Notify/Event.h:
+        * orbsvcs/orbsvcs/Notify/Event.inl:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.h:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.h:
+        * orbsvcs/orbsvcs/Notify/EventType.cpp:
+        * orbsvcs/orbsvcs/Notify/EventType.h:
+        * orbsvcs/orbsvcs/Notify/EventType.inl:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
+        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
+        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h:
+        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl:
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.h:
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.inl:
+        * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h:
+        * orbsvcs/orbsvcs/Notify/Factory.h:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.inl:
+        * orbsvcs/orbsvcs/Notify/FilterFactory.h:
+        * orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Find_Worker_T.h:
+        * orbsvcs/orbsvcs/Notify/Find_Worker_T.inl:
+        * orbsvcs/orbsvcs/Notify/ID_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/ID_Factory.h:
+        * orbsvcs/orbsvcs/Notify/ID_Factory.inl:
+        * orbsvcs/orbsvcs/Notify/Method_Request.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
+        * orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
+        * orbsvcs/orbsvcs/Notify/Object.cpp:
+        * orbsvcs/orbsvcs/Notify/Object.h:
+        * orbsvcs/orbsvcs/Notify/Object.inl:
+        * orbsvcs/orbsvcs/Notify/POA_Helper.cpp:
+        * orbsvcs/orbsvcs/Notify/POA_Helper.h:
+        * orbsvcs/orbsvcs/Notify/POA_Helper.inl:
+        * orbsvcs/orbsvcs/Notify/Peer.cpp:
+        * orbsvcs/orbsvcs/Notify/Peer.h:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h:
+        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+        * orbsvcs/orbsvcs/Notify/Properties.h:
+        * orbsvcs/orbsvcs/Notify/Properties.inl:
+        * orbsvcs/orbsvcs/Notify/Property.h:
+        * orbsvcs/orbsvcs/Notify/PropertySeq.cpp:
+        * orbsvcs/orbsvcs/Notify/PropertySeq.h:
+        * orbsvcs/orbsvcs/Notify/PropertySeq.inl:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.h:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.inl:
+        * orbsvcs/orbsvcs/Notify/Property_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_T.h:
+        * orbsvcs/orbsvcs/Notify/Property_T.inl:
+        * orbsvcs/orbsvcs/Notify/Proxy.cpp:
+        * orbsvcs/orbsvcs/Notify/Proxy.h:
+        * orbsvcs/orbsvcs/Notify/Proxy.inl:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.inl:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.inl:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h:
+        * orbsvcs/orbsvcs/Notify/Proxy_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Proxy_T.h:
+        * orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
+        * orbsvcs/orbsvcs/Notify/QoSProperties.h:
+        * orbsvcs/orbsvcs/Notify/QoSProperties.inl:
+        * orbsvcs/orbsvcs/Notify/RT_Builder.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Builder.h:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.h:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.h:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.h:
+        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp:
+        * orbsvcs/orbsvcs/Notify/RT_Properties.h:
+        * orbsvcs/orbsvcs/Notify/RT_Properties.inl:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.h:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.inl:
+        * orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.h:
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
+        * orbsvcs/orbsvcs/Notify/Refcountable.h:
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h:
+        * orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h:
+        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h:
+        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl:
+        * orbsvcs/orbsvcs/Notify/Service.cpp:
+        * orbsvcs/orbsvcs/Notify/Service.h:
+        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp:
+        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h:
+        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp:
+        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
+        * orbsvcs/orbsvcs/Notify/Supplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Supplier.h:
+        * orbsvcs/orbsvcs/Notify/Supplier.inl:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
+        * orbsvcs/orbsvcs/Notify/Supplier_Map.h:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
+        * orbsvcs/orbsvcs/Notify/Timer.h:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.cpp:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Loader.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Loader.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.inl:
+        * orbsvcs/orbsvcs/Notify/Topology_Saver.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Saver.h:
+        * orbsvcs/orbsvcs/Notify/Worker_Task.cpp:
+        * orbsvcs/orbsvcs/Notify/Worker_Task.h:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.h:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+        * orbsvcs/orbsvcs/PortableGroup/MIOP.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/MIOP.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Operators.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Utils.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_conf.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h:
+        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h:
+
+          Added versioned namespace support.
+
+Mon Nov 14 15:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+          The first argument of Objref_Traits::marshal should be
+          a const argument
+
+Mon Nov 14 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp:
+          Fixed compile error with HPUX
+
+Mon Nov 14 07:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/mock_stream.{hpp,cpp}:
+        * tests/Sequence_Unit_Tests/fwd_mock_reference.{hpp,cpp}:
+          New mock_stream and fwd_mock_reference, needed for some more unit
+          tests
+
+Sun Nov 13 12:15:58 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+
+          Changed the done() method to be oneway to see if this fixes TRANSIENT
+          exception caught on VXWORKS builds.
+
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+
+          Extended timeout for server process startup to see if this fixes
+          server.ior not found problem on VXWORKS builds.
+
+Sat Nov 12 09:55:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Change "FaultTolerance/FT_IOGR_Property.i" to
+          "FaultTolerance/FT_IOGR_Property.inl".
+
+          Remove "ETCL/ETCL_Constraint.i".
+
+Sat Nov 12 01:34:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp:
+
+          Removed empty LoadBalancing/*Map.cpp source files.
+
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h:
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp:
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h:
+        * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Contained_i.h:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.h:
+        * orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EmitsDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EventDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/FactoryDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/FinderDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/FixedDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/IDLType_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IDLType_i.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Options.cpp:
+        * orbsvcs/orbsvcs/IFRService/Options.h:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Component.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_conf.h:
+
+          Added versioned namespace support.
+
+Fri Nov 11 08:55:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+
+          Include "tao/Versioned_Namespace.h" for
+          TAO_BEGIN_VERSIONED_NAMESPACE_DECL macro definition.
+
+Fri Nov 11 08:50:02 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
+
+          Include "ace/OS_NS_unistd.h" for ACE_OS::getgid() prototype.
+
+Thu Nov 10 10:18:20 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+
+          Merged a bug fix from OCI 1.4a.
+          "Thu Nov 10 02:34:04 2005  Ciju John  <john_c@ociweb.com>"
+
+Thu Nov 10 10:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp:
+          Fixed incorrect macro
+
+Wed Nov  9 22:34:24 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Channel_Clients_T.cpp:
+        * orbsvcs/orbsvcs/Channel_Clients_T.h:
+        * orbsvcs/orbsvcs/Channel_Clients_T.i:
+        * orbsvcs/orbsvcs/Event_Service_Constants.h:
+        * orbsvcs/orbsvcs/Event_Utilities.cpp:
+        * orbsvcs/orbsvcs/Event_Utilities.h:
+        * orbsvcs/orbsvcs/Event_Utilities.i:
+        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
+        * orbsvcs/orbsvcs/IOR_Multicast.h:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
+        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
+        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
+        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
+        * orbsvcs/orbsvcs/Time_Utilities.cpp:
+        * orbsvcs/orbsvcs/Time_Utilities.h:
+        * orbsvcs/orbsvcs/Time_Utilities.i:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.i:
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.h:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h:
+        * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp:
+        * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i:
+        * orbsvcs/orbsvcs/AV/Flows_T.cpp:
+        * orbsvcs/orbsvcs/AV/Flows_T.h:
+        * orbsvcs/orbsvcs/AV/MCast.cpp:
+        * orbsvcs/orbsvcs/AV/MCast.h:
+        * orbsvcs/orbsvcs/AV/MCast.i:
+        * orbsvcs/orbsvcs/AV/Policy.cpp:
+        * orbsvcs/orbsvcs/AV/Policy.h:
+        * orbsvcs/orbsvcs/AV/Policy.i:
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp:
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.h:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.h:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.i:
+        * orbsvcs/orbsvcs/AV/RTCP.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP.h:
+        * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP_Channel.h:
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.h:
+        * orbsvcs/orbsvcs/AV/RTP.cpp:
+        * orbsvcs/orbsvcs/AV/RTP.h:
+        * orbsvcs/orbsvcs/AV/Resource_Factory.h:
+        * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp:
+        * orbsvcs/orbsvcs/AV/SCTP_SEQ.h:
+        * orbsvcs/orbsvcs/AV/TCP.cpp:
+        * orbsvcs/orbsvcs/AV/TCP.h:
+        * orbsvcs/orbsvcs/AV/Transport.cpp:
+        * orbsvcs/orbsvcs/AV/Transport.h:
+        * orbsvcs/orbsvcs/AV/Transport.i:
+        * orbsvcs/orbsvcs/AV/UDP.cpp:
+        * orbsvcs/orbsvcs/AV/UDP.h:
+        * orbsvcs/orbsvcs/AV/UDP.i:
+        * orbsvcs/orbsvcs/AV/default_resource.cpp:
+        * orbsvcs/orbsvcs/AV/default_resource.h:
+        * orbsvcs/orbsvcs/AV/media_timer.cpp:
+        * orbsvcs/orbsvcs/AV/media_timer.h:
+        * orbsvcs/orbsvcs/AV/ntp-time.h:
+        * orbsvcs/orbsvcs/AV/sfp.cpp:
+        * orbsvcs/orbsvcs/AV/sfp.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp:
+        * orbsvcs/orbsvcs/Concurrency/CC_Lock.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp:
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp:
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Defaults.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i:
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h:
+        * orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Worker.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Worker.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL.ll:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Adapters.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Adapters.h:
+        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i:
+        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h:
+        * orbsvcs/orbsvcs/Event/ECG_Defaults.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i:
+        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h:
+        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.i:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h:
+        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.i:
+        * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i:
+        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Filter.i:
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.i:
+        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h:
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i:
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i:
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i:
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i:
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i:
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i:
+        * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h:
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
+        * orbsvcs/orbsvcs/Event/EC_QOS_Info.i:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i:
+        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h:
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
+        * orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_SupplierControl.h:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i:
+        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp:
+        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+
+          Added versioned namespace support.
+
+Wed Nov  9 22:54:43 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+
+        Merged changes from OCI TAO 1.4a that optionally supports the
+        serialization of requests. (See OCIChangeLog entry
+        "Mon Nov  7 09:31:11 MST 2005  Tim Bradley  <bradley_t@ociweb.com>"
+        for details.)
+
+Wed Nov  9 15:59:01 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/Bug_2234_Regression/client.cpp
+
+        Fixed a warning on the OS X build.
+
+Wed Nov  9 13:39:13 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool4/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+
+          Added exception raise to test_callback() in idl. This would fix the
+          warnings on borland builds.
+
+Wed Nov  9 10:20:05 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
+
+          Removed duplicated dependency on pi and codecfactory and removed
+          dependency on interceptors since it's not needed and it makes the
+          test library not built on minumum corba build.
+
+Wed Nov  9 14:57:54 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2289_Regression/Bug_2289_Regression.mpc:
+        * tests/Bug_2289_Regression/MyInterfaceImpl.cpp:
+        * tests/Bug_2289_Regression/MyInterfaceImpl.h:
+        * tests/Bug_2289_Regression/README:
+        * tests/Bug_2289_Regression/Test.idl:
+        * tests/Bug_2289_Regression/client.cpp:
+
+          Updated this test so it doesn't need handcrafted code.
+
+        * tests/Bug_2289_Regression/MyStruct.idl:
+        * tests/Bug_2289_Regression/MyStructC.cpp:
+        * tests/Bug_2289_Regression/MyStructC.h:
+        * tests/Bug_2289_Regression/MyStructC.inl:
+        * tests/Bug_2289_Regression/MyStructS.cpp:
+        * tests/Bug_2289_Regression/MyStructS.h:
+        * tests/Bug_2289_Regression/MyStructS.inl:
+        * tests/Bug_2289_Regression/MyStructS_T.cpp:
+        * tests/Bug_2289_Regression/MyStructS_T.h:
+        * tests/Bug_2289_Regression/MyStructS_T.inl:
+
+          Removed these files. They are no longer needed.
+
+Wed Nov  9 14:25:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/constants.idl:
+
+          Reverted the change of
+
+          Tue Nov  8 20:11:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          since that constant value is being used to address an Intel compiler
+          bug, and the value itself is a legal one. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointing this out.
+
+Tue Nov  8 20:11:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/constants.idl:
+
+          Changed the literal rhs for one of the constants
+          to a value that won't challenge compilers that are not
+          compliant with the ANSI/IEEE minimum positive value for
+          double. This change should eliminate a warning on
+          SuSE 9.3 ICC90.
+
+Tue Nov  8 11:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc:
+          Added minimum_corba as base project
+
+Tue Nov  8 10:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Request_Muxing/server.cpp:
+          Slightly changed this server, when we directly have all expected
+          messages then there is no need to wait for anymore. If we don't
+          have all messages, we print how many we have and then we run
+          the orb for another 5 seconds to see if we get extra messages
+
+Tue Nov  8 10:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp:
+          Reimplemented the copy constructor and implemented the assignment
+          operator in terms of using the copy constructor
+
+Tue Nov  8 10:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Makefile.am:
+          Removed POA_Current.inl
+
+Tue Nov  8 08:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
+          Changed test_get_buffer_true_with_release_false to use
+          a BOOST_CHECK to chekd that we correctly return a null pointer
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
+          Trying to test the normal sequence behaviour and the special
+          TAO optimization when TAO_NO_COPY_OCTET_SEQUENCES in one file
+          will make things hard to maintain, this file now just tests
+          the default behaviour, the special behaviour is now done in the
+          new unit test listed below.
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
+          New unit test file
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp:
+          Fixed get_buffer()
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+        * tests/Sequence_Unit_Tests/run_test.pl:
+          Added the new unit test
+
+Tue Nov  8 08:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp:
+          Specialization for unbounded octet sequences, enabled when
+          TAO_NO_COPY_OCTET_SEQUENCES is defined to 1. This is not
+          ready yet, but this way it is easier to share the code
+          and build it on multiple systems
+
+        * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
+          Include unbounded_octet_sequences.hpp
+
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
+          Added a first extra test for when TAO_NO_COPY_OCTET_SEQUENCES
+          is defined
+
+Tue Nov  8 08:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp:
+        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp:
+        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
+          Made these unit tests working with boost 1.33
+
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp:
+          Enabled the explicit for the single argument constructor
+
+        * tests/Sequence_Unit_Tests/run_test.pl:
+          Reduced test time to 10 seconds, long enough
+
+Tue Nov  8 08:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp:
+          Fixed compile error on Solaris
+
+Mon Nov  7 16:25:38 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+        * orbsvcs/tests/Notify/lib/Notify_lib.mpc
+        * orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+        * orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+        * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+        * orbsvcs/tests/Trading/Trading.mpc
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
+
+        Fixes for linking problems on OS X.
+
+Mon Nov  7 12:07:44 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/PortableServer/POA_Current.h (POA_Current):
+
+          Re-exported this class.  Unfortunately, some other TAO libraries
+          make direct calls on this class.  Addresses unresolved symbol
+          errors.
+
+        * tao/PortableServer/POA_Current.inl:
+
+          Removed this unused file.
+
+Mon Nov  7 19:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
+          Extended test_get_buffer_true_with_release_true test
+
+Mon Nov  7 08:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/tests/Notify/lib/EventChannel_Command.cpp:
+          Fixed warning in MinGW build
+
+Mon Nov  7 08:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Thread_Pool.{h,inl}:
+          Don't export TAO_Thread_Pool_Threads and removed
+          threads accessor it exposes internal data
+          and current_threads modifier which just is invalid todo
+
+Mon Nov  7 00:54:58 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+
+          Fixed warnings that complains mis-use of throw expression.
+
+Sun Nov  6 14:34:51 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+        * TAO_IDLbe/be_visitor_valuetype/field_cs.cpp:
+
+          Made the generated signature of member mutators
+          consistent with IN parameter semantics.
+
+Sat Nov  5 01:43:59 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/PI/ClientRequestInfo.h (TAO_ClientRequestInfo):
+
+          Re-exported this class.  TAO's FT client side requires access to
+          it.
+
+Fri Nov  4 11:57:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/Versioned_Namespace.h:
+
+          Added TAO_ORBCONF_H include/define sanity check.
+
+        * tao/Utils/Synch_Refcountable.h:
+
+          Include "tao/Versioned_Namespace.h" to pull in versioned
+          namespace macros.
+
+Fri Nov  4 10:31:15 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/SmartProxies/Smart_Proxies.h:
+        * tao/SmartProxies/Smart_Proxies.inl:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Acceptor.h:
+        * tao/Strategies/DIOP_Acceptor.i:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.h:
+        * tao/Strategies/DIOP_Connector.cpp:
+        * tao/Strategies/DIOP_Connector.h:
+        * tao/Strategies/DIOP_Endpoint.cpp:
+        * tao/Strategies/DIOP_Endpoint.h:
+        * tao/Strategies/DIOP_Endpoint.i:
+        * tao/Strategies/DIOP_Factory.cpp:
+        * tao/Strategies/DIOP_Factory.h:
+        * tao/Strategies/DIOP_Profile.cpp:
+        * tao/Strategies/DIOP_Profile.h:
+        * tao/Strategies/DIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Transport.h:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/FIFO_Connection_Purging_Strategy.h:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/LFU_Connection_Purging_Strategy.h:
+        * tao/Strategies/LF_Strategy_Null.cpp:
+        * tao/Strategies/LF_Strategy_Null.h:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.cpp:
+        * tao/Strategies/NULL_Connection_Purging_Strategy.h:
+        * tao/Strategies/SCIOP_Acceptor.cpp:
+        * tao/Strategies/SCIOP_Acceptor.h:
+        * tao/Strategies/SCIOP_Acceptor.i:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.h:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * tao/Strategies/SCIOP_Connector.h:
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+        * tao/Strategies/SCIOP_Endpoint.h:
+        * tao/Strategies/SCIOP_Endpoint.i:
+        * tao/Strategies/SCIOP_Factory.cpp:
+        * tao/Strategies/SCIOP_Factory.h:
+        * tao/Strategies/SCIOP_Lite_Factory.cpp:
+        * tao/Strategies/SCIOP_Lite_Factory.h:
+        * tao/Strategies/SCIOP_Profile.cpp:
+        * tao/Strategies/SCIOP_Profile.h:
+        * tao/Strategies/SCIOP_Transport.cpp:
+        * tao/Strategies/SCIOP_Transport.h:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.h:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.h:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+        * tao/Strategies/SHMIOP_Connector.h:
+        * tao/Strategies/SHMIOP_Endpoint.cpp:
+        * tao/Strategies/SHMIOP_Endpoint.h:
+        * tao/Strategies/SHMIOP_Endpoint.i:
+        * tao/Strategies/SHMIOP_Factory.cpp:
+        * tao/Strategies/SHMIOP_Factory.h:
+        * tao/Strategies/SHMIOP_Profile.cpp:
+        * tao/Strategies/SHMIOP_Profile.h:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Transport.h:
+        * tao/Strategies/UIOP_Acceptor.cpp:
+        * tao/Strategies/UIOP_Acceptor.h:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.h:
+        * tao/Strategies/UIOP_Connector.cpp:
+        * tao/Strategies/UIOP_Connector.h:
+        * tao/Strategies/UIOP_Endpoint.cpp:
+        * tao/Strategies/UIOP_Endpoint.h:
+        * tao/Strategies/UIOP_Endpoint.i:
+        * tao/Strategies/UIOP_Factory.cpp:
+        * tao/Strategies/UIOP_Factory.h:
+        * tao/Strategies/UIOP_Lite_Factory.cpp:
+        * tao/Strategies/UIOP_Lite_Factory.h:
+        * tao/Strategies/UIOP_Profile.cpp:
+        * tao/Strategies/UIOP_Profile.h:
+        * tao/Strategies/UIOP_Transport.cpp:
+        * tao/Strategies/UIOP_Transport.h:
+        * tao/Strategies/advanced_resource.cpp:
+        * tao/Strategies/advanced_resource.h:
+        * tao/TypeCodeFactory/Recursive_TypeCode.cpp:
+        * tao/TypeCodeFactory/Recursive_TypeCode.h:
+        * tao/TypeCodeFactory/Recursive_TypeCode.inl:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h:
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.h:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.h:
+        * tao/Utils/Encodable.cpp:
+        * tao/Utils/Encodable.h:
+        * tao/Utils/Implicit_Deactivator.cpp:
+        * tao/Utils/Implicit_Deactivator.h:
+        * tao/Utils/ORB_Destroyer.cpp:
+        * tao/Utils/ORB_Destroyer.h:
+        * tao/Utils/ORB_Manager.cpp:
+        * tao/Utils/ORB_Manager.h:
+        * tao/Utils/PolicyList_Destroyer.cpp:
+        * tao/Utils/PolicyList_Destroyer.inl:
+        * tao/Utils/RIR_Narrow.cpp:
+        * tao/Utils/RIR_Narrow.h:
+        * tao/Utils/Servant_Var.h:
+        * tao/Utils/Servant_Var.inl:
+        * tao/Utils/Synch_Refcountable.cpp:
+        * tao/Utils/Synch_Refcountable.h:
+        * tao/Utils/Synch_Refcountable.inl:
+        * tao/Valuetype/AbstractBase.cpp:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.inl:
+        * tao/Valuetype/AbstractBase_Invocation_Adapter.cpp:
+        * tao/Valuetype/AbstractBase_Invocation_Adapter.h:
+        * tao/Valuetype/AbstractBase_T.cpp:
+        * tao/Valuetype/AbstractBase_T.h:
+        * tao/Valuetype/Sequence_T.cpp:
+        * tao/Valuetype/Sequence_T.h:
+        * tao/Valuetype/Sequence_T.inl:
+        * tao/Valuetype/ValueBase.cpp:
+        * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/ValueBase.inl:
+        * tao/Valuetype/ValueFactory.cpp:
+        * tao/Valuetype/ValueFactory.h:
+        * tao/Valuetype/ValueFactory_Map.cpp:
+        * tao/Valuetype/ValueFactory_Map.h:
+        * tao/Valuetype/Value_CORBA_methods.h:
+        * tao/Valuetype/Value_VarOut_T.cpp:
+        * tao/Valuetype/Value_VarOut_T.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+
+          Added remaining core TAO library versioned namespace support.
+
+Fri Nov  4 10:13:43 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/RTScheduling/Request_Interceptor.h (Client_Interceptor):
+
+          Re-exported this class.  The export declaration was
+          inadvertently removed.
+
+Fri Nov  4 08:59:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/ORB_Core.i (add_tss_cleanup_func):
+        * tao/ORB_Core.cpp (add_tss_cleanup_func):
+
+          Moved this method out of line.  Allows the
+          TAO_Cleanup_Func_Registry class to remain unexported from the
+          TAO DLL.
+
+        * tao/AnyTypeCode/TypeCode_Constants.h (_tc_UnknownUserException):
+
+          Removed this forward declaration.  It's DLL linkage ends up
+          differing from the same declaration in the DynamicInterface
+          library.  Addresses "inconsistent dll linkage" warnings from
+          VC++.
+
+        * tao/PortableServer/POA_Current_Impl.h (POA_Current_Impl):
+
+          Re-exported this class.  Unfortunately, some other TAO libraries
+          make direct calls on this class.  Addresses unresolved symbol
+          errors.
+
+Fri Nov  4 16:56:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+
+          Added a 'const' qualifier to the generated member mutator
+          argument for array member types, since this arguement has
+          the same semantics as an 'in' operation argument.
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h:
+
+          Change generation of the initializing constructor definition to
+          simply call the corresponding member mutators in the constructor
+          body. This change allows reuse of the copy semantics already
+          generated in the various member mutator methods, and as a side
+          effect, avoids a VC6 compiler bug that complained when we had
+          a call to the base class initializing constructor in the
+          derived constructor's initialization list.
+
+Thu Nov  3 22:17:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * performance-tests/Cubit/TAO/DII_Cubit/client.cpp:
+        * performance-tests/Latency/DII/client.cpp:
+        * performance-tests/Latency/DSI/Roundtrip.cpp:
+        * performance-tests/Latency/Deferred/client.cpp:
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+        * performance-tests/Sequence_Latency/DSI/Roundtrip.cpp:
+        * performance-tests/Sequence_Latency/Deferred/client.cpp:
+        * tests/CDR/tc.cpp:
+        * tests/DynAny_Test/data.h:
+        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp:
+
+          Include "TypeCode_Constants.h" instead of
+          "TC_Constants_Forward.h".  The latter is deprecated.
+
+Thu Nov  3 22:06:44 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/AnyTypeCode/TC_Constants_Forward.h:
+
+          Reintroduced this header as a backward compatibility header that
+          includes "tao/AnyTypeCode/TypeCode_Constants.h".
+
+Thu Nov  3 19:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2084_Regression/Hello.cpp:
+          Fixed variable not used warning
+
+Thu Nov  3 12:17:09 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_Framework.mpc:
+
+          Removed interceptor as the base project since it's not needed.
+
+Thu Nov  3 09:26:21 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h:
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.h:
+        * orbsvcs/orbsvcs/Sched/Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h:
+        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h:
+        * orbsvcs/orbsvcs/Security/Security_Current.h:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+
+          Removed unnecessary uses of ACE_UNIMPLEMENTED_FUNC macro.  It is
+          only meant to be used for private unimplemented member functions
+          in class templates.
+
+        * tao/Collocated_Invocation.h:
+        * tao/Connector_Registry.h:
+        * tao/Object_Ref_Table.h:
+        * tao/PolicyFactory_Registry_Factory.cpp:
+        * tao/PolicyFactory_Registry_Factory.h:
+        * tao/Profile.h:
+        * tao/Resource_Factory.h:
+        * tao/Stub.h:
+        * tao/TSS_Resources.h:
+        * tao/Transport.h:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode.h:
+        * tao/AnyTypeCode/Alias_TypeCode.inl:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.inl:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/Any.inl:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+        * tao/AnyTypeCode/Any_Arg_Traits.h:
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Array_Impl_T.h:
+        * tao/AnyTypeCode/Any_Array_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.h:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.h:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.h:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.inl:
+        * tao/AnyTypeCode/Any_Impl.cpp:
+        * tao/AnyTypeCode/Any_Impl.h:
+        * tao/AnyTypeCode/Any_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.h:
+        * tao/AnyTypeCode/Any_Special_Impl_T.inl:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+        * tao/AnyTypeCode/Any_SystemException.h:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.h:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.inl:
+        * tao/AnyTypeCode/Enum_TypeCode.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode.h:
+        * tao/AnyTypeCode/Enum_TypeCode.inl:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.h:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.inl:
+        * tao/AnyTypeCode/Fixed_TypeCode.cpp:
+        * tao/AnyTypeCode/Fixed_TypeCode.h:
+        * tao/AnyTypeCode/Fixed_TypeCode.inl:
+        * tao/AnyTypeCode/Marshal.cpp:
+        * tao/AnyTypeCode/Marshal.h:
+        * tao/AnyTypeCode/Marshal.inl:
+        * tao/AnyTypeCode/NVList.cpp:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/AnyTypeCode/NVList.inl:
+        * tao/AnyTypeCode/NVList_Adapter_Impl.cpp:
+        * tao/AnyTypeCode/NVList_Adapter_Impl.h:
+        * tao/AnyTypeCode/Null_RefCount_Policy.h:
+        * tao/AnyTypeCode/Objref_TypeCode.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode.h:
+        * tao/AnyTypeCode/Objref_TypeCode.inl:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.h:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.inl:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.inl:
+        * tao/AnyTypeCode/RefCount_Policy_Traits.h:
+        * tao/AnyTypeCode/Sequence_TypeCode.cpp:
+        * tao/AnyTypeCode/Sequence_TypeCode.h:
+        * tao/AnyTypeCode/Sequence_TypeCode.inl:
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.h:
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.inl:
+        * tao/AnyTypeCode/String_TypeCode.cpp:
+        * tao/AnyTypeCode/String_TypeCode.h:
+        * tao/AnyTypeCode/String_TypeCode.inl:
+        * tao/AnyTypeCode/String_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/String_TypeCode_Static.h:
+        * tao/AnyTypeCode/String_TypeCode_Static.inl:
+        * tao/AnyTypeCode/Struct_TypeCode.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode.h:
+        * tao/AnyTypeCode/Struct_TypeCode.inl:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.h:
+        * tao/AnyTypeCode/Struct_TypeCode_Static.inl:
+        * tao/AnyTypeCode/True_RefCount_Policy.cpp:
+        * tao/AnyTypeCode/True_RefCount_Policy.h:
+        * tao/AnyTypeCode/True_RefCount_Policy.inl:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/AnyTypeCode/TypeCode.inl:
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.h:
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.inl:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.h:
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.inl:
+        * tao/AnyTypeCode/TypeCode_Case_T.cpp:
+        * tao/AnyTypeCode/TypeCode_Case_T.h:
+        * tao/AnyTypeCode/TypeCode_Case_T.inl:
+        * tao/AnyTypeCode/TypeCode_Constants.h:
+        * tao/AnyTypeCode/TypeCode_Struct_Field.h:
+        * tao/AnyTypeCode/TypeCode_Traits.h:
+        * tao/AnyTypeCode/TypeCode_Value_Field.h:
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+        * tao/AnyTypeCode/Union_TypeCode.h:
+        * tao/AnyTypeCode/Union_TypeCode.inl:
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Union_TypeCode_Static.h:
+        * tao/AnyTypeCode/Union_TypeCode_Static.inl:
+        * tao/AnyTypeCode/Value_TypeCode.cpp:
+        * tao/AnyTypeCode/Value_TypeCode.h:
+        * tao/AnyTypeCode/Value_TypeCode.inl:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.h:
+        * tao/AnyTypeCode/Value_TypeCode_Static.inl:
+        * tao/AnyTypeCode/append.cpp:
+        * tao/AnyTypeCode/skip.cpp:
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/BiDir_GIOP/BiDirGIOP.h:
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.h:
+        * tao/BiDir_GIOP/BiDir_ORBInitializer.cpp:
+        * tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * tao/BiDir_GIOP/BiDir_Policy_i.cpp:
+        * tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
+        * tao/CSD_Framework/CSD_Framework_Loader.h:
+        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
+        * tao/CSD_Framework/CSD_ORBInitializer.h:
+        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter.h:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.h:
+        * tao/CSD_Framework/CSD_POA.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_POA.inl:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+        * tao/CSD_Framework/CSD_Strategy_Base.inl:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.h:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.inl:
+        * tao/CSD_Framework/CSD_Strategy_Repository.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Repository.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * tao/CSD_ThreadPool/CSD_TP_Task.inl:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.cpp:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.h:
+        * 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:
+        * tao/Codeset/Codeset.cpp:
+        * tao/Codeset/Codeset.h:
+        * tao/Codeset/Codeset_Descriptor.cpp:
+        * tao/Codeset/Codeset_Descriptor.h:
+        * tao/Codeset/Codeset_Manager_Factory.cpp:
+        * tao/Codeset/Codeset_Manager_Factory.h:
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/Codeset/Codeset_Manager_i.h:
+        * tao/Codeset/Codeset_Translator_Factory.cpp:
+        * tao/Codeset/Codeset_Translator_Factory.h:
+        * tao/Codeset/Codeset_Translator_Factory_T.cpp:
+        * tao/Codeset/Codeset_Translator_Factory_T.h:
+        * tao/Codeset/UTF16_BOM_Factory.cpp:
+        * tao/Codeset/UTF16_BOM_Factory.h:
+        * tao/Codeset/UTF16_BOM_Translator.cpp:
+        * tao/Codeset/UTF16_BOM_Translator.h:
+        * tao/Codeset/UTF8_Latin1_Factory.cpp:
+        * tao/Codeset/UTF8_Latin1_Factory.h:
+        * tao/Codeset/UTF8_Latin1_Translator.cpp:
+        * tao/Codeset/UTF8_Latin1_Translator.h:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynAnyFactory.h:
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynAny_i.h:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynArray_i.h:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynCommon.h:
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/DynamicAny/DynEnum_i.h:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicAny/DynSequence_i.h:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynStruct_i.h:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynUnion_i.h:
+        * tao/DynamicAny/DynamicAny.cpp:
+        * tao/DynamicAny/DynamicAny.h:
+        * tao/DynamicInterface/Context.cpp:
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/Context.inl:
+        * tao/DynamicInterface/DII_Arguments.cpp:
+        * tao/DynamicInterface/DII_Arguments.h:
+        * tao/DynamicInterface/DII_Arguments.inl:
+        * tao/DynamicInterface/DII_CORBA_methods.h:
+        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/DynamicInterface/DII_Invocation.h:
+        * tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.h:
+        * 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.cpp:
+        * tao/DynamicInterface/ExceptionList.h:
+        * tao/DynamicInterface/ExceptionList.inl:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Request.inl:
+        * tao/DynamicInterface/Server_Request.cpp:
+        * tao/DynamicInterface/Server_Request.h:
+        * tao/DynamicInterface/Server_Request.inl:
+        * tao/DynamicInterface/Unknown_User_Exception.cpp:
+        * tao/DynamicInterface/Unknown_User_Exception.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
+        * tao/IORInterceptor/IORInfo.cpp:
+        * tao/IORInterceptor/IORInfo.h:
+        * tao/IORInterceptor/IORInfo.inl:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/IORManipulation/IORManip_Loader.cpp:
+        * tao/IORManipulation/IORManip_Loader.h:
+        * tao/IORManipulation/IORManipulation.cpp:
+        * tao/IORManipulation/IORManipulation.h:
+        * tao/IORTable/IORTable.cpp:
+        * tao/IORTable/IORTable.h:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/IORTable/IOR_Table_Impl.h:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/IORTable/Table_Adapter.h:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/ImR_Client/ImR_Client.h:
+        * tao/ImR_Client/ServerObject_i.cpp:
+        * tao/ImR_Client/ServerObject_i.h:
+        * tao/Messaging/AMH_Response_Handler.cpp:
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Messaging/Asynch_Invocation.h:
+        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Invocation_Adapter.h:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.h:
+        * tao/Messaging/Asynch_Timeout_Handler.cpp:
+        * tao/Messaging/Asynch_Timeout_Handler.h:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.h:
+        * tao/Messaging/ExceptionHolder_i.cpp:
+        * tao/Messaging/ExceptionHolder_i.h:
+        * tao/Messaging/Messaging.cpp:
+        * tao/Messaging/Messaging.h:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/Messaging/Messaging_Loader.h:
+        * tao/Messaging/Messaging_ORBInitializer.cpp:
+        * tao/Messaging/Messaging_ORBInitializer.h:
+        * tao/Messaging/Messaging_PolicyFactory.cpp:
+        * tao/Messaging/Messaging_PolicyFactory.h:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+        * tao/Messaging/Messaging_Policy_i.h:
+        * tao/Messaging/Messaging_Policy_i.i:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.h:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.inl:
+        * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp:
+        * tao/PI/ClientRequestInterceptor_Factory_Impl.h:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/Interceptor_List_T.h:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitInfo.h:
+        * tao/PI/ORBInitInfo.inl:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/PI.cpp:
+        * tao/PI/PI.h:
+        * tao/PI/PICurrent.cpp:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent.inl:
+        * tao/PI/PICurrent_Copy_Callback.cpp:
+        * tao/PI/PICurrent_Copy_Callback.h:
+        * tao/PI/PICurrent_Impl.cpp:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PICurrent_Impl.inl:
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PICurrent_Loader.h:
+        * tao/PI/PolicyFactory_Loader.cpp:
+        * tao/PI/PolicyFactory_Loader.h:
+        * tao/PI/PolicyFactory_Registry.cpp:
+        * tao/PI/PolicyFactory_Registry.h:
+        * tao/PI/RequestInfo_Util.cpp:
+        * tao/PI/RequestInfo_Util.h:
+        * tao/PI_Server/PICurrent_Guard.cpp:
+        * tao/PI_Server/PICurrent_Guard.h:
+        * tao/PI_Server/PI_Server.cpp:
+        * tao/PI_Server/PI_Server.h:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/PI_Server_Loader.h:
+        * tao/PI_Server/Policy_Creator_T.h:
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/PortableServer_ORBInitializer.h:
+        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
+        * tao/PI_Server/PortableServer_PolicyFactory.h:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PI_Server/ServerRequestInfo.h:
+        * tao/PI_Server/ServerRequestInfo.inl:
+        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp:
+        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h:
+        * tao/PortableServer/Active_Object_Map.cpp:
+        * tao/PortableServer/Active_Object_Map.h:
+        * tao/PortableServer/Active_Object_Map.i:
+        * tao/PortableServer/Active_Object_Map_Entry.cpp:
+        * tao/PortableServer/Active_Object_Map_Entry.h:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/Active_Policy_Strategies.h:
+        * tao/PortableServer/Active_Policy_Strategies.inl:
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Adapter_Activator.h:
+        * tao/PortableServer/Any_SArg_Traits.h:
+        * tao/PortableServer/BD_String_SArgument_T.cpp:
+        * tao/PortableServer/BD_String_SArgument_T.h:
+        * tao/PortableServer/BD_String_SArgument_T.inl:
+        * tao/PortableServer/Basic_SArgument_T.cpp:
+        * tao/PortableServer/Basic_SArgument_T.h:
+        * tao/PortableServer/Basic_SArgument_T.inl:
+        * tao/PortableServer/Basic_SArguments.h:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.h:
+        * tao/PortableServer/Creation_Time.h:
+        * tao/PortableServer/Creation_Time.inl:
+        * tao/PortableServer/Default_Acceptor_Filter.cpp:
+        * tao/PortableServer/Default_Acceptor_Filter.h:
+        * tao/PortableServer/Default_Policy_Validator.cpp:
+        * tao/PortableServer/Default_Policy_Validator.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.h:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Array_SArgument_T.h:
+        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Size_SArgument_T.h:
+        * tao/PortableServer/Fixed_Size_SArgument_T.inl:
+        * tao/PortableServer/IdAssignmentPolicy.cpp:
+        * tao/PortableServer/IdAssignmentPolicy.h:
+        * tao/PortableServer/IdAssignmentStrategy.cpp:
+        * tao/PortableServer/IdAssignmentStrategy.h:
+        * tao/PortableServer/IdAssignmentStrategyFactory.h:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.h:
+        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
+        * tao/PortableServer/IdAssignmentStrategySystem.h:
+        * tao/PortableServer/IdAssignmentStrategyUser.cpp:
+        * tao/PortableServer/IdAssignmentStrategyUser.h:
+        * tao/PortableServer/IdUniquenessPolicy.cpp:
+        * tao/PortableServer/IdUniquenessPolicy.h:
+        * tao/PortableServer/IdUniquenessStrategy.h:
+        * tao/PortableServer/IdUniquenessStrategyFactory.h:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.h:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h:
+        * tao/PortableServer/ImR_Client_Adapter.cpp:
+        * tao/PortableServer/ImR_Client_Adapter.h:
+        * tao/PortableServer/ImplicitActivationPolicy.cpp:
+        * tao/PortableServer/ImplicitActivationPolicy.h:
+        * tao/PortableServer/ImplicitActivationStrategy.cpp:
+        * tao/PortableServer/ImplicitActivationStrategy.h:
+        * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyExplicit.h:
+        * tao/PortableServer/ImplicitActivationStrategyFactory.h:
+        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.h:
+        * tao/PortableServer/Key_Adapters.cpp:
+        * tao/PortableServer/Key_Adapters.h:
+        * tao/PortableServer/LifespanPolicy.cpp:
+        * tao/PortableServer/LifespanPolicy.h:
+        * tao/PortableServer/LifespanStrategy.cpp:
+        * tao/PortableServer/LifespanStrategy.h:
+        * tao/PortableServer/LifespanStrategyFactory.h:
+        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyFactoryImpl.h:
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+        * tao/PortableServer/LifespanStrategyPersistent.h:
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h:
+        * tao/PortableServer/LifespanStrategyTransient.cpp:
+        * tao/PortableServer/LifespanStrategyTransient.h:
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.h:
+        * tao/PortableServer/Local_Servant_Base.cpp:
+        * tao/PortableServer/Local_Servant_Base.h:
+        * tao/PortableServer/Local_Servant_Base.inl:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Non_Servant_Upcall.h:
+        * tao/PortableServer/Non_Servant_Upcall.inl:
+        * tao/PortableServer/ORT_Adapter.cpp:
+        * tao/PortableServer/ORT_Adapter.h:
+        * tao/PortableServer/ORT_Adapter_Factory.cpp:
+        * tao/PortableServer/ORT_Adapter_Factory.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Object_Adapter.i:
+        * tao/PortableServer/Object_Adapter_Factory.cpp:
+        * tao/PortableServer/Object_Adapter_Factory.h:
+        * tao/PortableServer/Object_SArg_Traits.h:
+        * tao/PortableServer/Object_SArgument_T.cpp:
+        * tao/PortableServer/Object_SArgument_T.h:
+        * tao/PortableServer/Object_SArgument_T.inl:
+        * tao/PortableServer/Operation_Table.cpp:
+        * tao/PortableServer/Operation_Table.h:
+        * tao/PortableServer/Operation_Table_Binary_Search.cpp:
+        * tao/PortableServer/Operation_Table_Binary_Search.h:
+        * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp:
+        * tao/PortableServer/Operation_Table_Dynamic_Hash.h:
+        * tao/PortableServer/Operation_Table_Linear_Search.cpp:
+        * tao/PortableServer/Operation_Table_Linear_Search.h:
+        * tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
+        * tao/PortableServer/Operation_Table_Perfect_Hash.h:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/POAManager.i:
+        * tao/PortableServer/POA_Cached_Policies.cpp:
+        * tao/PortableServer/POA_Cached_Policies.h:
+        * tao/PortableServer/POA_Cached_Policies.i:
+        * tao/PortableServer/POA_Current.cpp:
+        * tao/PortableServer/POA_Current.h:
+        * tao/PortableServer/POA_Current.inl:
+        * tao/PortableServer/POA_Current_Factory.cpp:
+        * tao/PortableServer/POA_Current_Factory.h:
+        * tao/PortableServer/POA_Current_Impl.cpp:
+        * tao/PortableServer/POA_Current_Impl.h:
+        * tao/PortableServer/POA_Current_Impl.inl:
+        * tao/PortableServer/POA_Guard.cpp:
+        * tao/PortableServer/POA_Guard.h:
+        * tao/PortableServer/POA_Policy_Set.cpp:
+        * tao/PortableServer/POA_Policy_Set.h:
+        * tao/PortableServer/POA_Policy_Set.i:
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/PortableServer.h:
+        * tao/PortableServer/PortableServer_Functions.cpp:
+        * tao/PortableServer/PortableServer_Functions.h:
+        * tao/PortableServer/PortableServer_WFunctions.cpp:
+        * tao/PortableServer/PortableServer_WFunctions.h:
+        * tao/PortableServer/Regular_POA.cpp:
+        * tao/PortableServer/Regular_POA.h:
+        * tao/PortableServer/Regular_POA.inl:
+        * tao/PortableServer/RequestProcessingPolicy.cpp:
+        * tao/PortableServer/RequestProcessingPolicy.h:
+        * tao/PortableServer/RequestProcessingStrategy.cpp:
+        * tao/PortableServer/RequestProcessingStrategy.h:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h:
+        * tao/PortableServer/RequestProcessingStrategyFactory.h:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
+        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.h:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.h:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h:
+        * 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/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Root_POA.inl:
+        * tao/PortableServer/SArg_Traits_T.h:
+        * tao/PortableServer/ServantRetentionPolicy.cpp:
+        * tao/PortableServer/ServantRetentionPolicy.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.h:
+        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Base.h:
+        * tao/PortableServer/Servant_Base.i:
+        * tao/PortableServer/Servant_Dispatcher.cpp:
+        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/PortableServer/Servant_Location.h:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/Servant_Upcall.h:
+        * tao/PortableServer/Servant_Upcall.inl:
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
+        * tao/PortableServer/Special_Basic_SArgument_T.h:
+        * tao/PortableServer/Special_Basic_SArgument_T.inl:
+        * tao/PortableServer/Special_Basic_SArguments.h:
+        * tao/PortableServer/StrategyFactory.cpp:
+        * tao/PortableServer/StrategyFactory.h:
+        * tao/PortableServer/ThreadPolicy.cpp:
+        * tao/PortableServer/ThreadPolicy.h:
+        * tao/PortableServer/ThreadStrategy.cpp:
+        * tao/PortableServer/ThreadStrategy.h:
+        * tao/PortableServer/ThreadStrategyFactory.h:
+        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategyFactoryImpl.h:
+        * tao/PortableServer/ThreadStrategyORBControl.cpp:
+        * tao/PortableServer/ThreadStrategyORBControl.h:
+        * tao/PortableServer/ThreadStrategySingle.cpp:
+        * tao/PortableServer/ThreadStrategySingle.h:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+        * tao/PortableServer/TypeCode_SArg_Traits.h:
+        * tao/PortableServer/UB_String_SArgument_T.cpp:
+        * tao/PortableServer/UB_String_SArgument_T.h:
+        * tao/PortableServer/UB_String_SArgument_T.inl:
+        * tao/PortableServer/UB_String_SArguments.h:
+        * tao/PortableServer/Upcall_Command.cpp:
+        * tao/PortableServer/Upcall_Command.h:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/PortableServer/Upcall_Wrapper.h:
+        * tao/PortableServer/Var_Array_SArgument_T.cpp:
+        * tao/PortableServer/Var_Array_SArgument_T.h:
+        * tao/PortableServer/Var_Array_SArgument_T.inl:
+        * tao/PortableServer/get_arg.h:
+        * tao/PortableServer/poa_macros.h:
+        * tao/RTCORBA/Continuous_Priority_Mapping.cpp:
+        * tao/RTCORBA/Continuous_Priority_Mapping.h:
+        * tao/RTCORBA/Direct_Priority_Mapping.cpp:
+        * tao/RTCORBA/Direct_Priority_Mapping.h:
+        * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp:
+        * tao/RTCORBA/Linear_Network_Priority_Mapping.h:
+        * tao/RTCORBA/Linear_Priority_Mapping.cpp:
+        * tao/RTCORBA/Linear_Priority_Mapping.h:
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
+        * tao/RTCORBA/Multi_Priority_Mapping.h:
+        * tao/RTCORBA/Network_Priority_Mapping.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping.h:
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.i:
+        * tao/RTCORBA/Priority_Mapping.cpp:
+        * tao/RTCORBA/Priority_Mapping.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.cpp:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.i:
+        * tao/RTCORBA/RTCORBA.cpp:
+        * tao/RTCORBA/RTCORBA.h:
+        * tao/RTCORBA/RT_Current.cpp:
+        * tao/RTCORBA/RT_Current.h:
+        * tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp:
+        * tao/RTCORBA/RT_Endpoint_Selector_Factory.h:
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
+        * tao/RTCORBA/RT_Endpoint_Utils.h:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h:
+        * tao/RTCORBA/RT_Mutex.cpp:
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_ORB_Loader.h:
+        * tao/RTCORBA/RT_PolicyFactory.cpp:
+        * tao/RTCORBA/RT_PolicyFactory.h:
+        * tao/RTCORBA/RT_Policy_i.cpp:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.h:
+        * tao/RTCORBA/RT_Stub.cpp:
+        * tao/RTCORBA/RT_Stub.h:
+        * tao/RTCORBA/RT_Stub_Factory.cpp:
+        * tao/RTCORBA/RT_Stub_Factory.h:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h:
+        * tao/RTCORBA/RT_Transport_Descriptor.cpp:
+        * tao/RTCORBA/RT_Transport_Descriptor.h:
+        * tao/RTCORBA/RT_Transport_Descriptor.inl:
+        * tao/RTCORBA/RT_Transport_Descriptor_Property.cpp:
+        * tao/RTCORBA/RT_Transport_Descriptor_Property.h:
+        * tao/RTCORBA/RT_Transport_Descriptor_Property.inl:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTCORBA/Thread_Pool.h:
+        * tao/RTCORBA/Thread_Pool.inl:
+        * tao/RTCORBA/rtcorba_typedefs.h:
+        * tao/RTPortableServer/RTPortableServer.cpp:
+        * tao/RTPortableServer/RTPortableServer.h:
+        * tao/RTPortableServer/RT_Acceptor_Filters.cpp:
+        * tao/RTPortableServer/RT_Acceptor_Filters.h:
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+        * tao/RTPortableServer/RT_Collocation_Resolver.h:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.h:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_POA.h:
+        * tao/RTPortableServer/RT_POA.i:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.h:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/Current.h:
+        * tao/RTScheduling/Distributable_Thread.cpp:
+        * tao/RTScheduling/Distributable_Thread.h:
+        * tao/RTScheduling/RTScheduler.cpp:
+        * tao/RTScheduling/RTScheduler.h:
+        * tao/RTScheduling/RTScheduler_Initializer.cpp:
+        * tao/RTScheduling/RTScheduler_Initializer.h:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.h:
+        * tao/RTScheduling/RTScheduler_Manager.cpp:
+        * tao/RTScheduling/RTScheduler_Manager.h:
+        * tao/RTScheduling/RTScheduler_Manager.i:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * tao/RTScheduling/Request_Interceptor.h:
+        * tao/RTScheduling/ThreadAction.h:
+        * tao/Valuetype/AbstractBase_Invocation_Adapter.h:
+
+          Added versioned namespace support.
+
+          Removed unnecessary *_Export keywords from symbols that need not
+          be exported from the shared library within which they reside.
+
+        * tao/AnyTypeCode/TC_Constants_Forward.h:
+
+          Removed this unused file.
+
+        * tao/Makefile.am (nobase_include_HEADERS):
+
+          Removed `AnyTypeCode/TC_Constants_Forward.h' header from this
+          list.
+
+Thu Nov  3 09:11:51 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+          (visit_valuetype_scope):
+
+          Removed unused variable.
+
+Thu Nov  3 05:30:41 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+        * tao/tao.mpc:
+
+          Fix tipo.  Change Version_Namespace.h to Versioned_Namespace.h.
+
+Wed Nov  2 09:07:48 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/TAO_Singleton.h:
+
+          Include "tao/Versioned_Namespace.h" to pull in
+          "TAO_BEGIN_VERSIONED_NAMESPACE_DECL" macro definition.
+          Addresses VC++ 6 build errors.
+
+Wed Nov  2 09:39:27 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+
+          Commented the if/endif with TAO_HAS_INTERCEPTORS because the code
+          guarded by the macro is commented out already.
+
+Wed Nov  2 08:30:41 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * tao/Synch_Invocation.cpp:
+        * tao/LocalRequest_Invocation.cpp:
+
+          Reverted "Fri Aug 26 11:33:07 2005  Justin Michel
+          <michel_j@ociweb.com>" since the change was wrong. Chris
+          Cleeland is informed, and he has accepted to do a right fix
+          when he gets time.
+
+        * tao/orbconf.h:
+
+          Removed TAO_RESET_OUTPUT_CDR_AFTER_SEND #define, since it is of no
+          use anymore.
+
+Wed Nov  2 14:17:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+          Fixed logic for generating commas separating base
+          constructor call and member inits in generated valuetype
+          initializing constructor.
+
+Wed Nov  2 13:19:02 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp:
+
+          Add explicit exclude of forward request exception header to
+          try and fix Solaris build error.
+
+Wed Nov  2 12:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Intrusive_Ref_Count_Handle_T.inl:
+          Fixed compile error
+
+Wed Nov  2 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2289_Regression/MyStruct*.*:
+          Readded these files to get things building, having hand modified
+          generated file in the repo is not the right things todo.
+
+Wed Nov  2 08:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
+          Changed include for the time being
+
+Tue Nov  1 14:49:40 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp (end_anyop_header):
+          (end_anyop_source, end_client_header, end_client_inline):
+          (end_client_stubs, end_server_header, end_server_inline):
+          (end_server_skeletons, end_server_template_skeletons):
+          (end_server_template_inline, end_server_template_header):
+          (gen_stub_hdr_includes):
+          (start_anyop_source, start_anyop_header, start_client_header):
+          (start_client_inline, start_client_stubs):
+          (start_server_template_inline, start_server_header):
+          (start_server_inline, start_server_template_skeletons):
+          (start_server_skeletons, start_server_template_header):
+
+          Generate versioned namespace macro/declaration in the
+          appropriate location.
+
+        * TAO_IDL/be_include/be_codegen.h (end_client_inline):
+          (end_client_stubs, end_server_inline):
+
+          New methods that (currently) add ending versioned namespace
+          macro/declaration to the corresponding file.
+
+        * TAO_IDL/be/be_visitor_root/root.cpp (visit_root):
+
+          Added calls to end client stubs, and client and server inline
+          files.
+
+        * tao/Makefile.am (nobase_include_HEADERS):
+        * tao/tao.mpc:
+
+          Added new "tao/Versioned_Namespace.h" header.
+
+        * tao/Versioned_Namespace.h:
+
+          TAO-specific versioned namespace macros.
+
+        * tao/Abstract_Servant_Base.cpp:
+        * tao/Abstract_Servant_Base.h:
+        * tao/Acceptor_Filter.cpp:
+        * tao/Acceptor_Filter.h:
+        * tao/Acceptor_Impl.cpp:
+        * tao/Acceptor_Impl.h:
+        * tao/Acceptor_Registry.cpp:
+        * tao/Acceptor_Registry.h:
+        * tao/Acceptor_Registry.i:
+        * tao/Adapter.cpp:
+        * tao/Adapter.h:
+        * tao/Adapter_Factory.cpp:
+        * tao/Adapter_Factory.h:
+        * tao/Adapter_Registry.cpp:
+        * tao/Adapter_Registry.h:
+        * tao/Allocator.h:
+        * tao/AnyTypeCode_Adapter.cpp:
+        * tao/AnyTypeCode_Adapter.h:
+        * tao/Any_Insert_Policy_T.h:
+        * tao/Arg_Traits_T.h:
+        * tao/Argument.cpp:
+        * tao/Argument.h:
+        * tao/Array_VarOut_T.cpp:
+        * tao/Array_VarOut_T.h:
+        * tao/Array_VarOut_T.inl:
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * tao/Asynch_Reply_Dispatcher_Base.h:
+        * tao/Asynch_Reply_Dispatcher_Base.i:
+        * tao/Auto_Functor.h:
+        * tao/BD_String_Argument_T.cpp:
+        * tao/BD_String_Argument_T.h:
+        * tao/BD_String_Argument_T.inl:
+        * tao/Base_Transport_Property.cpp:
+        * tao/Base_Transport_Property.h:
+        * tao/Base_Transport_Property.inl:
+        * tao/Basic_Argument_T.cpp:
+        * tao/Basic_Argument_T.h:
+        * tao/Basic_Argument_T.inl:
+        * tao/Basic_Arguments.h:
+        * tao/Basic_Types.h:
+        * tao/BiDir_Adapter.cpp:
+        * tao/BiDir_Adapter.h:
+        * tao/Bind_Dispatcher_Guard.cpp:
+        * tao/Bind_Dispatcher_Guard.h:
+        * tao/Bind_Dispatcher_Guard.i:
+        * tao/Block_Flushing_Strategy.cpp:
+        * tao/Block_Flushing_Strategy.h:
+        * tao/Blocked_Connect_Strategy.cpp:
+        * tao/Blocked_Connect_Strategy.h:
+        * tao/Buffer_Allocator_T.cpp:
+        * tao/Buffer_Allocator_T.h:
+        * tao/Buffering_Constraint_Policy.cpp:
+        * tao/Buffering_Constraint_Policy.h:
+        * tao/Buffering_Constraint_Policy.i:
+        * tao/CDR.cpp:
+        * tao/CDR.h:
+        * tao/CDR.i:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/CORBALOC_Parser.h:
+        * tao/CORBALOC_Parser.i:
+        * tao/CORBANAME_Parser.cpp:
+        * tao/CORBANAME_Parser.h:
+        * tao/CORBANAME_Parser.i:
+        * tao/CORBA_String.cpp:
+        * tao/CORBA_String.h:
+        * tao/CORBA_String.inl:
+        * tao/Cache_Entries.cpp:
+        * tao/Cache_Entries.h:
+        * tao/Cache_Entries.inl:
+        * tao/Cleanup_Func_Registry.cpp:
+        * tao/Cleanup_Func_Registry.h:
+        * tao/Cleanup_Func_Registry.inl:
+        * tao/ClientRequestInterceptor_Adapter.cpp:
+        * tao/ClientRequestInterceptor_Adapter.h:
+        * tao/ClientRequestInterceptor_Adapter_Factory.cpp:
+        * tao/ClientRequestInterceptor_Adapter_Factory.h:
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Client_Strategy_Factory.h:
+        * tao/Codeset_Descriptor_Base.h:
+        * tao/Codeset_Manager.cpp:
+        * tao/Codeset_Manager.h:
+        * tao/Codeset_Manager_Factory_Base.cpp:
+        * tao/Codeset_Manager_Factory_Base.h:
+        * tao/Codeset_Translator_Base.cpp:
+        * tao/Codeset_Translator_Base.h:
+        * tao/Collocated_Invocation.cpp:
+        * tao/Collocated_Invocation.h:
+        * tao/Collocation_Proxy_Broker.cpp:
+        * tao/Collocation_Proxy_Broker.h:
+        * tao/Collocation_Resolver.cpp:
+        * tao/Collocation_Resolver.h:
+        * tao/Condition.cpp:
+        * tao/Condition.h:
+        * tao/Condition.inl:
+        * tao/Connect_Strategy.cpp:
+        * tao/Connect_Strategy.h:
+        * tao/Connection_Handler.cpp:
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.inl:
+        * tao/Connection_Purging_Strategy.cpp:
+        * tao/Connection_Purging_Strategy.h:
+        * tao/Connection_Purging_Strategy.inl:
+        * tao/Connector_Impl.cpp:
+        * tao/Connector_Impl.h:
+        * tao/Connector_Registry.cpp:
+        * tao/Connector_Registry.h:
+        * tao/Connector_Registry.i:
+        * tao/DLL_Parser.cpp:
+        * tao/DLL_Parser.h:
+        * tao/DLL_Parser.i:
+        * tao/Default_Collocation_Resolver.cpp:
+        * tao/Default_Collocation_Resolver.h:
+        * tao/Default_Endpoint_Selector_Factory.cpp:
+        * tao/Default_Endpoint_Selector_Factory.h:
+        * tao/Default_Protocols_Hooks.cpp:
+        * tao/Default_Protocols_Hooks.h:
+        * tao/Default_Stub_Factory.cpp:
+        * tao/Default_Stub_Factory.h:
+        * tao/Default_Thread_Lane_Resources_Manager.cpp:
+        * tao/Default_Thread_Lane_Resources_Manager.h:
+        * tao/Dynamic_Adapter.cpp:
+        * tao/Dynamic_Adapter.h:
+        * tao/Endpoint.cpp:
+        * tao/Endpoint.h:
+        * tao/Endpoint.i:
+        * tao/Endpoint_Selector_Factory.cpp:
+        * tao/Endpoint_Selector_Factory.h:
+        * tao/Environment.cpp:
+        * tao/Environment.h:
+        * tao/Environment.i:
+        * tao/Exception.cpp:
+        * tao/Exception.h:
+        * tao/Exception.i:
+        * tao/Exception_Data.h:
+        * tao/Exclusive_TMS.cpp:
+        * tao/Exclusive_TMS.h:
+        * tao/FILE_Parser.cpp:
+        * tao/FILE_Parser.h:
+        * tao/FILE_Parser.i:
+        * tao/Fault_Tolerance_Service.cpp:
+        * tao/Fault_Tolerance_Service.h:
+        * tao/Fault_Tolerance_Service.i:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Array_Argument_T.h:
+        * tao/Fixed_Array_Argument_T.inl:
+        * tao/Fixed_Size_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.h:
+        * tao/Fixed_Size_Argument_T.inl:
+        * tao/FlResource_Factory.cpp:
+        * tao/FlResource_Factory.h:
+        * tao/FlResource_Loader.cpp:
+        * tao/FlResource_Loader.h:
+        * tao/Flushing_Strategy.cpp:
+        * tao/Flushing_Strategy.h:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Generator_Parser.cpp:
+        * tao/GIOP_Message_Generator_Parser.h:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.h:
+        * tao/GIOP_Message_Generator_Parser_11.cpp:
+        * tao/GIOP_Message_Generator_Parser_11.h:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.h:
+        * tao/GIOP_Message_Generator_Parser_Impl.h:
+        * tao/GIOP_Message_Generator_Parser_Impl.inl:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Lite.h:
+        * tao/GIOP_Message_Locate_Header.cpp:
+        * tao/GIOP_Message_Locate_Header.h:
+        * tao/GIOP_Message_Locate_Header.i:
+        * tao/GIOP_Message_State.cpp:
+        * tao/GIOP_Message_State.h:
+        * tao/GIOP_Message_State.inl:
+        * tao/GIOP_Message_Version.h:
+        * tao/GIOP_Message_Version.inl:
+        * tao/GIOP_Utils.cpp:
+        * tao/GIOP_Utils.h:
+        * tao/GUIResource_Factory.cpp:
+        * tao/GUIResource_Factory.h:
+        * tao/IFR_Client_Adapter.cpp:
+        * tao/IFR_Client_Adapter.h:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Acceptor.i:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Connector.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Endpoint.i:
+        * tao/IIOP_Factory.cpp:
+        * tao/IIOP_Factory.h:
+        * tao/IIOP_Lite_Factory.cpp:
+        * tao/IIOP_Lite_Factory.h:
+        * tao/IIOP_Profile.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/IIOP_Transport.cpp:
+        * tao/IIOP_Transport.h:
+        * tao/IORInterceptor_Adapter.cpp:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/IORInterceptor_Adapter_Factory.cpp:
+        * tao/IORInterceptor_Adapter_Factory.h:
+        * tao/IOR_Parser.cpp:
+        * tao/IOR_Parser.h:
+        * tao/Incoming_Message_Queue.cpp:
+        * tao/Incoming_Message_Queue.h:
+        * tao/Incoming_Message_Queue.inl:
+        * tao/Intrusive_Ref_Count_Base_T.cpp:
+        * tao/Intrusive_Ref_Count_Base_T.h:
+        * tao/Intrusive_Ref_Count_Base_T.inl:
+        * tao/Intrusive_Ref_Count_Handle_T.cpp:
+        * tao/Intrusive_Ref_Count_Handle_T.h:
+        * tao/Intrusive_Ref_Count_Handle_T.inl:
+        * tao/Invocation_Adapter.cpp:
+        * tao/Invocation_Adapter.h:
+        * tao/Invocation_Adapter.inl:
+        * tao/Invocation_Base.cpp:
+        * tao/Invocation_Base.h:
+        * tao/Invocation_Base.inl:
+        * tao/Invocation_Endpoint_Selectors.cpp:
+        * tao/Invocation_Endpoint_Selectors.h:
+        * tao/Invocation_Utils.h:
+        * tao/LF_CH_Event.cpp:
+        * tao/LF_CH_Event.h:
+        * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Event.cpp:
+        * tao/LF_Event.h:
+        * tao/LF_Event.inl:
+        * tao/LF_Event_Binder.cpp:
+        * tao/LF_Event_Binder.h:
+        * tao/LF_Event_Binder.inl:
+        * tao/LF_Event_Loop_Thread_Helper.cpp:
+        * tao/LF_Event_Loop_Thread_Helper.h:
+        * tao/LF_Event_Loop_Thread_Helper.inl:
+        * tao/LF_Follower.cpp:
+        * tao/LF_Follower.h:
+        * tao/LF_Follower.inl:
+        * tao/LF_Follower_Auto_Adder.cpp:
+        * tao/LF_Follower_Auto_Adder.h:
+        * tao/LF_Follower_Auto_Adder.inl:
+        * tao/LF_Follower_Auto_Ptr.cpp:
+        * tao/LF_Follower_Auto_Ptr.h:
+        * tao/LF_Follower_Auto_Ptr.inl:
+        * tao/LF_Invocation_Event.cpp:
+        * tao/LF_Invocation_Event.h:
+        * tao/LF_Strategy.cpp:
+        * tao/LF_Strategy.h:
+        * tao/LF_Strategy_Complete.cpp:
+        * tao/LF_Strategy_Complete.h:
+        * tao/LF_Strategy_Complete.inl:
+        * tao/LRU_Connection_Purging_Strategy.cpp:
+        * tao/LRU_Connection_Purging_Strategy.h:
+        * tao/Leader_Follower.cpp:
+        * tao/Leader_Follower.h:
+        * tao/Leader_Follower.i:
+        * tao/Leader_Follower_Flushing_Strategy.cpp:
+        * tao/Leader_Follower_Flushing_Strategy.h:
+        * tao/LocalObject.cpp:
+        * tao/LocalObject.h:
+        * tao/LocalObject.i:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/LocateRequest_Invocation.h:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/LocateRequest_Invocation_Adapter.h:
+        * tao/MCAST_Parser.cpp:
+        * tao/MCAST_Parser.h:
+        * tao/MCAST_Parser.i:
+        * tao/MProfile.cpp:
+        * tao/MProfile.h:
+        * tao/MProfile.i:
+        * tao/Managed_Types.cpp:
+        * tao/Managed_Types.h:
+        * tao/Managed_Types.i:
+        * tao/Muxed_TMS.cpp:
+        * tao/Muxed_TMS.h:
+        * tao/NVList_Adapter.cpp:
+        * tao/NVList_Adapter.h:
+        * tao/New_Leader_Generator.cpp:
+        * tao/New_Leader_Generator.h:
+        * tao/ORB.cpp:
+        * tao/ORB.h:
+        * tao/ORB.i:
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORBInitializer_Registry.h:
+        * tao/ORBInitializer_Registry_Adapter.cpp:
+        * tao/ORBInitializer_Registry_Adapter.h:
+        * tao/ORB_Constants.h:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.i:
+        * tao/ORB_Core_Auto_Ptr.cpp:
+        * tao/ORB_Core_Auto_Ptr.h:
+        * tao/ORB_Core_Auto_Ptr.inl:
+        * tao/ORB_Core_TSS_Resources.cpp:
+        * tao/ORB_Core_TSS_Resources.h:
+        * tao/ORB_Table.cpp:
+        * tao/ORB_Table.h:
+        * tao/ORB_Table.inl:
+        * tao/Object.cpp:
+        * tao/Object.h:
+        * tao/Object.i:
+        * tao/ObjectKey_Table.cpp:
+        * tao/ObjectKey_Table.h:
+        * tao/Object_Argument_T.cpp:
+        * tao/Object_Argument_T.h:
+        * tao/Object_Argument_T.inl:
+        * tao/Object_Loader.cpp:
+        * tao/Object_Loader.h:
+        * tao/Object_Proxy_Broker.cpp:
+        * tao/Object_Proxy_Broker.h:
+        * tao/Object_Ref_Table.cpp:
+        * tao/Object_Ref_Table.h:
+        * tao/Object_Ref_Table.inl:
+        * tao/Object_T.cpp:
+        * tao/Object_T.h:
+        * tao/Objref_VarOut_T.cpp:
+        * tao/Objref_VarOut_T.h:
+        * tao/Parser_Registry.cpp:
+        * tao/Parser_Registry.h:
+        * tao/Parser_Registry.i:
+        * tao/Pluggable_Messaging.cpp:
+        * tao/Pluggable_Messaging.h:
+        * tao/Pluggable_Messaging_Utils.cpp:
+        * tao/Pluggable_Messaging_Utils.h:
+        * tao/Pluggable_Messaging_Utils.i:
+        * tao/PolicyFactory_Registry_Adapter.cpp:
+        * tao/PolicyFactory_Registry_Adapter.h:
+        * tao/Policy_Current.cpp:
+        * tao/Policy_Current.h:
+        * tao/Policy_Current.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.i:
+        * tao/Policy_Set.cpp:
+        * tao/Policy_Set.h:
+        * tao/Policy_Set.i:
+        * tao/Policy_Validator.cpp:
+        * tao/Policy_Validator.h:
+        * tao/Principal.cpp:
+        * tao/Principal.h:
+        * tao/Principal.i:
+        * tao/Profile.cpp:
+        * tao/Profile.h:
+        * tao/Profile.i:
+        * tao/Profile_Transport_Resolver.cpp:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/Profile_Transport_Resolver.inl:
+        * tao/Protocol_Factory.cpp:
+        * tao/Protocol_Factory.h:
+        * tao/Protocols_Hooks.cpp:
+        * tao/Protocols_Hooks.h:
+        * tao/Pseudo_VarOut_T.cpp:
+        * tao/Pseudo_VarOut_T.h:
+        * tao/Pseudo_VarOut_T.inl:
+        * tao/QtResource_Factory.cpp:
+        * tao/QtResource_Factory.h:
+        * tao/QtResource_Loader.cpp:
+        * tao/QtResource_Loader.h:
+        * tao/Queued_Message.cpp:
+        * tao/Queued_Message.h:
+        * tao/Reactive_Connect_Strategy.cpp:
+        * tao/Reactive_Connect_Strategy.h:
+        * tao/Reactive_Flushing_Strategy.cpp:
+        * tao/Reactive_Flushing_Strategy.h:
+        * tao/Refcounted_ObjectKey.cpp:
+        * tao/Refcounted_ObjectKey.h:
+        * tao/Refcounted_ObjectKey.inl:
+        * tao/Remote_Invocation.cpp:
+        * tao/Remote_Invocation.h:
+        * tao/Remote_Object_Proxy_Broker.cpp:
+        * tao/Remote_Object_Proxy_Broker.h:
+        * tao/Reply_Dispatcher.cpp:
+        * tao/Reply_Dispatcher.h:
+        * tao/Reply_Dispatcher.i:
+        * tao/Request_Dispatcher.cpp:
+        * tao/Request_Dispatcher.h:
+        * tao/Resource_Factory.cpp:
+        * tao/Resource_Factory.h:
+        * tao/Resume_Handle.cpp:
+        * tao/Resume_Handle.h:
+        * tao/Resume_Handle.inl:
+        * tao/Seq_Out_T.cpp:
+        * tao/Seq_Out_T.h:
+        * tao/Seq_Out_T.inl:
+        * tao/Seq_Var_T.cpp:
+        * tao/Seq_Var_T.h:
+        * tao/Seq_Var_T.inl:
+        * tao/Sequence.cpp:
+        * tao/Sequence.h:
+        * tao/Sequence.i:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/Sequence_T.i:
+        * tao/ServerRequestInterceptor_Adapter.cpp:
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/ServerRequestInterceptor_Adapter_Factory.cpp:
+        * tao/ServerRequestInterceptor_Adapter_Factory.h:
+        * tao/Server_Strategy_Factory.cpp:
+        * tao/Server_Strategy_Factory.h:
+        * tao/Service_Callbacks.cpp:
+        * tao/Service_Callbacks.h:
+        * tao/Service_Context.cpp:
+        * tao/Service_Context.h:
+        * tao/Service_Context.inl:
+        * tao/Services_Activate.cpp:
+        * tao/Services_Activate.h:
+        * tao/Special_Basic_Argument_T.cpp:
+        * tao/Special_Basic_Argument_T.h:
+        * tao/Special_Basic_Argument_T.inl:
+        * tao/Special_Basic_Arguments.h:
+        * tao/Stub.cpp:
+        * tao/Stub.h:
+        * tao/Stub.i:
+        * tao/Stub_Factory.cpp:
+        * tao/Stub_Factory.h:
+        * tao/Synch_Invocation.cpp:
+        * tao/Synch_Invocation.h:
+        * tao/Synch_Invocation.inl:
+        * tao/Synch_Queued_Message.cpp:
+        * tao/Synch_Queued_Message.h:
+        * tao/Synch_Reply_Dispatcher.cpp:
+        * tao/Synch_Reply_Dispatcher.h:
+        * tao/SystemException.cpp:
+        * tao/SystemException.h:
+        * tao/SystemException.inl:
+        * tao/TAO_Internal.cpp:
+        * tao/TAO_Server_Request.cpp:
+        * tao/TAO_Server_Request.h:
+        * tao/TAO_Server_Request.i:
+        * tao/TAO_Singleton.cpp:
+        * tao/TAO_Singleton.h:
+        * tao/TAO_Singleton.inl:
+        * tao/TAO_Singleton_Manager.cpp:
+        * tao/TAO_Singleton_Manager.h:
+        * tao/TAO_Singleton_Manager.inl:
+        * tao/TSS_Resources.cpp:
+        * tao/TSS_Resources.h:
+        * tao/Tagged_Components.cpp:
+        * tao/Tagged_Components.h:
+        * tao/Tagged_Components.i:
+        * tao/Tagged_Profile.cpp:
+        * tao/Tagged_Profile.h:
+        * tao/Tagged_Profile.i:
+        * tao/Thread_Lane_Resources.cpp:
+        * tao/Thread_Lane_Resources.h:
+        * tao/Thread_Lane_Resources_Manager.cpp:
+        * tao/Thread_Lane_Resources_Manager.h:
+        * tao/Thread_Per_Connection_Handler.cpp:
+        * tao/Thread_Per_Connection_Handler.h:
+        * tao/TkResource_Factory.cpp:
+        * tao/TkResource_Factory.h:
+        * tao/TkResource_Loader.cpp:
+        * tao/TkResource_Loader.h:
+        * tao/Transport.cpp:
+        * tao/Transport.h:
+        * tao/Transport.inl:
+        * tao/Transport_Acceptor.cpp:
+        * tao/Transport_Acceptor.h:
+        * tao/Transport_Acceptor.inl:
+        * tao/Transport_Cache_Manager.cpp:
+        * tao/Transport_Cache_Manager.h:
+        * tao/Transport_Cache_Manager.inl:
+        * tao/Transport_Connector.cpp:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.inl:
+        * tao/Transport_Descriptor_Interface.cpp:
+        * tao/Transport_Descriptor_Interface.h:
+        * tao/Transport_Descriptor_Interface.inl:
+        * tao/Transport_Mux_Strategy.cpp:
+        * tao/Transport_Mux_Strategy.h:
+        * tao/Transport_Queueing_Strategies.cpp:
+        * tao/Transport_Queueing_Strategies.h:
+        * tao/Transport_Timer.cpp:
+        * tao/Transport_Timer.h:
+        * tao/TypeCodeFactory_Adapter.h:
+        * tao/UB_String_Argument_T.cpp:
+        * tao/UB_String_Argument_T.h:
+        * tao/UB_String_Argument_T.inl:
+        * tao/UB_String_Arguments.h:
+        * tao/UserException.cpp:
+        * tao/UserException.h:
+        * tao/UserException.inl:
+        * tao/Valuetype_Adapter.cpp:
+        * tao/Valuetype_Adapter.h:
+        * tao/VarOut_T.cpp:
+        * tao/VarOut_T.h:
+        * tao/VarOut_T.inl:
+        * tao/Var_Array_Argument_T.cpp:
+        * tao/Var_Array_Argument_T.h:
+        * tao/Var_Array_Argument_T.inl:
+        * tao/Var_Size_Argument_T.cpp:
+        * tao/Var_Size_Argument_T.h:
+        * tao/Var_Size_Argument_T.inl:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/Wait_On_Leader_Follower.cpp:
+        * tao/Wait_On_Leader_Follower.h:
+        * tao/Wait_On_Reactor.cpp:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.cpp:
+        * tao/Wait_On_Read.h:
+        * tao/Wait_Strategy.cpp:
+        * tao/Wait_Strategy.h:
+        * tao/corba.h:
+        * tao/corbafwd.cpp:
+        * tao/debug.cpp:
+        * tao/debug.h:
+        * tao/default_client.cpp:
+        * tao/default_client.h:
+        * tao/default_environment.h:
+        * tao/default_resource.cpp:
+        * tao/default_resource.h:
+        * tao/default_server.cpp:
+        * tao/objectid.h:
+        * tao/operation_details.cpp:
+        * tao/operation_details.h:
+        * tao/operation_details.i:
+        * tao/orbconf.h:
+        * tao/params.cpp:
+        * tao/params.h:
+        * tao/params.i:
+        * tao/varbase.h:
+
+          Added versioned namespace support.
+
+          Removed some empty and/or unnecessary `.cpp' and `.inl' files.
+
+          Improved exception safety in some assignment operators.
+
+Tue Nov  1 14:27:36 USMST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool2/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool3/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool4/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool5/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool6/run_test.pl:
+        * performance-tests/CSD_Strategy/TestApps/run_test.pl:
+        * tests/CSD_Strategy_Tests/Broken/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl:
+
+          Changed to enable these scripts to run from autobuild for VxWorks builds.
+
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+
+          Removed duplicated log message.
+
+Tue Nov  1 14:30:05 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+
+        Added missing project dependancies to fix errors/warnings for the
+        strict OS X linker.
+
+Tue Nov  1 19:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2289_Regression/MyInterfaceImpl.h:
+          Fixed fuzz error
+
+Tue Nov  1 19:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
+          Added regression for bug 2201
+
+Tue Nov  1 19:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+          Added regression for bug 2201
+
+Tue Nov  1 19:06:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Fixed addition of default paths to preprocess command line,
+          for the case where only $ACE_ROOT, and not $TAO_ROOT, is
+          defined in the environment. Thanks to Chris Cleeland
+          <cleeland_c@ociweb.cpm> for reporting the problem.
+
+Tue Nov  1 19:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+        * tests/Sequence_Unit_Tests/run_test.pl:
+        * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
+          Added new tests for unbounded octet sequences, a specialization
+          for octet sequences will follow in the near future
+
+Tue Nov  1 18:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/bounded_value_sequence.hpp:
+          Fixed incorrect guards
+
+Tue Nov  1 17:55:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+          Fixed bug in code generation of valuetype initialzing
+          constructor when there is a generated call to the
+          valuetype's base class constrcutor.
+
+Tue Nov  1 15:44:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+
+          Eliminated unused local variable.
+
+Tue Nov  1 15:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+          Fixed two bugs in this tester, it expected that the sequence
+          always expects int which is not true, made it generic so
+          that it can also be used for sequences of other types
+
+Tue Nov  1 15:37:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h:
+
+          Fixed generation of valuetype initializing constructor for
+          array members. These cannot be handled in the constructor's
+          initialization list, so they are handled in the constructor
+          body.
+
+Tue Nov  1 14:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
+          Added a regression for bug 2201
+
+        * tests/Sequence_Unit_Tests/value_traits.hpp:
+          Implement initialize_range and zero_range as fix for bug
+          2201 which also seemed to exist in the new sequence implementation
+
+Tue Nov  1 14:42:14 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+          Fixed bug in generation of constructor initializing member
+          values that failed to screen out attributes when traversing
+          the valuetype's scope for stub source file generation.
+
+Tue Nov  1 14:14:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Managed_Types.h:
+        * tao/Managed_Types.i:
+
+          Added constructors for TAO_String_Manager and
+          TAO_WString_Manager from const char* and const CORBA::WChar*
+          respectively (each constructor makes a copy). These new
+          constructors are used in generated code for valuetypes, in
+          the initializing constructor added in
+
+          Fri Oct 28 23:55:14 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Tue Nov  1 12:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2074_Regression/*:
+        * orbsvcs/tests/Bug_2074_Regression/*:
+          Moved test to orbsvs
+
+Tue Nov  1 11:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/generic_sequence.hpp:
+          Fixed typo
+
+Tue Nov  1 10:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/File_IO/File_i.cpp:
+          64bit fix
+
+Tue Nov  1 10:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp:
+          Fixed 64bit conversion warnings
+
+Tue Nov  1 10:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.cpp:
+          Use prefix operators to modify the refcount
+
+Tue Nov  1 09:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1495_Regression/Client_Task.cpp:
+          Extended this test to do multiple calls. It will fail now
+
+        * tests/Bug_2289_Regression/MyStruct*.{h,cpp,inl}:
+          Removed generated files, shouldn't be in the repo
+
+Tue Nov  1 09:35:36 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2289_Regression/Bug_2289_Regression.mpc:
+        * tests/Bug_2289_Regression/MyInterfaceImpl.cpp:
+        * tests/Bug_2289_Regression/MyInterfaceImpl.h:
+        * tests/Bug_2289_Regression/MyStruct.idl:
+        * tests/Bug_2289_Regression/MyStructC.cpp:
+        * tests/Bug_2289_Regression/MyStructC.h:
+        * tests/Bug_2289_Regression/MyStructC.inl:
+        * tests/Bug_2289_Regression/MyStructS.cpp:
+        * tests/Bug_2289_Regression/MyStructS.h:
+        * tests/Bug_2289_Regression/MyStructS.inl:
+        * tests/Bug_2289_Regression/MyStructS_T.cpp:
+        * tests/Bug_2289_Regression/MyStructS_T.h:
+        * tests/Bug_2289_Regression/MyStructS_T.inl:
+        * tests/Bug_2289_Regression/README:
+        * tests/Bug_2289_Regression/Test.idl:
+        * tests/Bug_2289_Regression/client.cpp:
+        * tests/Bug_2289_Regression/run_test.pl:
+        * tests/Bug_2289_Regression/server.cpp:
+
+          Added regression test for this bug. Bug is not yet fixed so it
+          *will* fail.
+
+Mon Oct 31 15:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/mock_reference.hpp:
+        * tests/Sequence_Unit_Tests/range_checking.hpp:
+          Small doxygen improvements
+
+Mon Oct 31 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2084_Regression/*:
+          Integrated regression for bug 2084. Thanks to David Faure
+          <dfaure at klaralvdalens-datakonsult dot se> for creating this
+          test. It seems this bug has already been resolved in the past
+          but to prevent to reappear it in the future added the test
+          to our regression suite.
+
+Mon Oct 31 11:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2074_Regression/*:
+          Integrated regression for bug 2074. Thanks to Robert Hancock
+          <hancockr at shaw dot ca> for creating this test
+
+Sat Oct 29 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+          Fixed compile error
+
+Fri Oct 28 23:55:14 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_type.cpp:
+
+          Cosmetic changes.
+
+        * TAO_IDL/include/ast_attribute.h:
+
+          Removed legacy comment.
+
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h:
+
+          Added generation of valuetype constructor that initializes all
+          members, including inherited members, as specified in the CORBA
+          C++ mapping (03-06-03) section 1.17.2. This fix closes
+          [BUGID:2270].
+
+Thu Oct 27 14:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Dynamic/server_interceptor.cpp:
+          Reordered includes to fix gcc4 errors
+
+Fri Oct 28 15:35:54 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2287_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+
+          More unused arg warnings and 'EXCEPTION' in the debug output
+          was incorrectly marking this as a 'fail'.
+
+Fri Oct 28 09:53:24 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+
+          Fixed debian full build error - residual ACE cast macro.
+
+Thu Oct 27 14:20:35 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+
+          Modified change in
+
+          Wed Oct 26 18:57:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          to handle the use case where skeleton files are generated
+          from a .pidl file, for example tao/ImR_Client/ImplRepo.pidl.
+          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
+          reporting the problem.
+
+Thu Oct 27 14:31:12 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2287_Regression/Hello.cpp:
+
+          Fix gcc unused arg warning.
+
+Thu Oct 27 13:36:53 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2285_Regression/Hello.h:
+        * orbsvcs/tests/Bug_2287_Regression/Hello.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h:
+        * orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h:
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h:
+
+          Fix the obligatory fuzz errors.
+
+Thu Oct 27 11:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * tao/GIOP_Utils.cpp:
+        * tao/Transport_Connector.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+          64bit fixes
+
+Thu Oct 27 11:30:59 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/operation_details.h:
+        * tao/operation_details.i:
+
+          Add members (with accessors) for the FT request retention ID and
+          expiration time.
+
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI/ClientRequestInfo.h:
+
+          Add accessors for the FT request retention ID and expiration time
+          of the underlying request operation details (see above).
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+
+          Transmit the correct retention ID and request expiration time in
+          the request service context. Bound retries by the expiration time.
+
+          This fixes bus #2285 and #2287.
+
+        * orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc:
+        * orbsvcs/tests/Bug_2285_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/Hello.h:
+        * orbsvcs/tests/Bug_2285_Regression/README:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h:
+        * orbsvcs/tests/Bug_2285_Regression/Test.idl:
+        * orbsvcs/tests/Bug_2285_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2285_Regression/run_test2.pl:
+        * orbsvcs/tests/Bug_2285_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/server2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc:
+        * orbsvcs/tests/Bug_2287_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/Hello.h:
+        * orbsvcs/tests/Bug_2287_Regression/README:
+        * orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h:
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h:
+        * orbsvcs/tests/Bug_2287_Regression/Test.idl:
+        * orbsvcs/tests/Bug_2287_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2287_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2287_Regression/server.cpp:
+
+          Regression tests for these bugs.
+
+Thu Oct 27 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sequence_T.{h,cpp}:
+          Applied the fix of bug 2201, when shrinking a sequence we
+          re initialize the elements. Fixes bugzilla 2201.
+          Thanks to Frank Pilhofer <fp at mc dot com> for reporting this
+          and supplying the patch.
+
+Thu Oct 27 09:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2201_Regression/*:
+          Added regression for bug 2201 to the cvs archive
+
+Thu Oct 27 06:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+          Fixed conversion warnings
+
+Wed Oct 26 17:22:12 2005  Don Busch  <busch_d@ociweb.com>
+
+        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+        * orbsvcs/examples/ORT/ORT.mpc
+        * orbsvcs/orbsvcs/CosEvent.mpc
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * tao/CSD_Framework.mpc
+
+          This is a footprint reduction fix, eliminating a library dependency.
+          TAO 1.4 introduced a new dependency on the Messaging, Valuetype,
+          PI, and CodecFactory libraries for the CosNaming_Serv and
+          CosEvent_Serv libraries.  Turning off CORBA Messaging did not remove
+          this dependency. Thus, any application that uses CosNaming_Serv or
+          CosEvent_Serv, but not CORBA Messaging, depends on those libraries
+          anyway. This change eliminates the CosNaming_Serv and CosEvent_Serv
+          dependencies on Messaging (and thus PI, CodecFactory, and Valuetype)
+          when CORBA Messaging and Interceptors are turned off.  It reduces
+          the footprint in that case by about 600K.
+          There is a ACE ChangeLog entry with the same timestamp that
+          descibes the MPC config file changes.
+
+Wed Oct 26 19:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/IOP_Codec_includeA.h:
+          Added new file
+
+        * tao/Makefile.am:
+          Updated
+
+Wed Oct 26 18:57:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp (be_change_idl_file_extension):
+
+          Changed logic to ignore a header extension set by the -hc
+          option and use "C.h", if we are processing a .pidl file,
+          and we are not generating an *A.h file. Thanks to
+          Johnny Willemsen <jwillemsen@remedy.nl> for reporting
+          the problem.
+
+Wed Oct 26 18:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ClientRequestInfoA.cpp
+        * tao/PI/ClientRequestInfoC.cpp
+        * tao/PI/ClientRequestInfoC.h
+        * tao/PI/ClientRequestInfoS.h
+        * tao/PI/ClientRequestInterceptorA.cpp
+        * tao/PI/ClientRequestInterceptorC.cpp
+        * tao/PI/ClientRequestInterceptorC.h
+        * tao/PI/ClientRequestInterceptorS.h
+        * tao/PI/InterceptorA.cpp
+        * tao/PI/InterceptorC.cpp
+        * tao/PI/InterceptorC.h
+        * tao/PI/InterceptorS.h
+        * tao/PI/ORBInitInfoC.cpp
+        * tao/PI/ORBInitInfoC.h
+        * tao/PI/ORBInitInfoS.h
+        * tao/PI/ORBInitializerA.cpp
+        * tao/PI/ORBInitializerC.cpp
+        * tao/PI/ORBInitializerC.h
+        * tao/PI/ORBInitializerS.h
+        * tao/PI/PIForwardRequestA.cpp
+        * tao/PI/PIForwardRequestC.cpp
+        * tao/PI/PIForwardRequestC.h
+        * tao/PI/PIForwardRequestS.h
+        * tao/PI/PolicyFactoryA.cpp
+        * tao/PI/PolicyFactoryC.cpp
+        * tao/PI/PolicyFactoryC.h
+        * tao/PI/PolicyFactoryS.h
+        * tao/PI/RequestInfoA.cpp
+        * tao/PI/RequestInfoC.cpp
+        * tao/PI/RequestInfoC.h
+        * tao/PI/RequestInfoS.h
+        * tao/PI_Server/ServerRequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInfoC.cpp
+        * tao/PI_Server/ServerRequestInfoC.h
+        * tao/PI_Server/ServerRequestInfoS.h
+        * tao/PI_Server/ServerRequestInterceptorA.cpp
+        * tao/PI_Server/ServerRequestInterceptorC.cpp
+        * tao/PI_Server/ServerRequestInterceptorC.h
+        * tao/PI_Server/ServerRequestInterceptorS.h
+        * tao/IORInterceptor/IORInfoC.cpp
+        * tao/IORInterceptor/IORInfoC.h
+          Regenerated
+
+        * tao/IORInterceptor/IORInfo.pidl
+        * tao/PI/ORBInitInfo.pidl
+          Updated regeneration instructions
+
+        * tao/PI/ORBInitInfoA.cpp:
+          Removed
+
+        * tao/PI/ClientRequestInfoA.h
+        * tao/PI/ClientRequestInterceptorA.h
+        * tao/PI/InterceptorA.h
+        * tao/PI/ORBInitializerA.h
+        * tao/PI/PIForwardRequestA.h
+        * tao/PI/PolicyFactoryA.h
+        * tao/PI/RequestInfoA.h
+        * tao/PI_Server/ServerRequestInfoA.h
+        * tao/PI_Server/ServerRequestInterceptorA.h
+          New generated files
+
+        * tao/PortableServer/POA_Cached_Policies.cpp
+          Layout fix
+
+        * tao/Makefile.am
+          Added new files
+
+        * tao/IORInterceptor/IORInterceptor.pidl
+        * tao/IORInterceptor/IORInterceptorC.cpp
+        * tao/IORInterceptor/IORInterceptorC.h
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+          Splitted PortableInterceptor::IORInterceptor into IORInterceptor
+          and IORInterceptor_3_0. This is triggered by bug 1271 which contained
+          issues about CORBA Compliance. In the 3.0.3 spec the IORInterceptor
+          was splitted. This fixes bug 1271.
+
+          IMPORTANT!!!
+          If you use IORInterceptor methods components_established,
+          adapter_manger_state_changed and adapter_state_changed you have to
+          derive your implementation from IORInterceptor_3_0 else these
+          methods don't get called!!!
+
+        * tests/ORT/ORT_test_IORInterceptor.h
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+        * tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+        * tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+          Changes for IORInterceptor_3_0.
+
+Wed Oct 26 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/diffs/ServerRequestInterceptor.diff:
+        * tao/PI_Server/diffs/ServerRequestInterceptor.diff:
+          Moved this diff to the PI_Server directory, it belongs there
+
+Wed Oct 26 09:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+          Removed the equals and make_profiles methods which where
+          commented out. That these exist in the IDL of CORBA 3.0.3
+          is an editorial error. See also OMG issue 9112
+
+Tue Oct 25 22:24:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/LocateRequest_Invocation.cpp (invoke):
+        * tao/Synch_Invocation.cpp (remote_oneway, remote_twoway):
+
+          Changed OutputCDR_Auto_Reset to ACE_OutputCDR_Auto_Reset to
+          match corresponding changes made to ACE.
+
+Tue Oct 25 21:50:46 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * utils/wxNamingViewer/wxNamingViewer.cpp:
+        * utils/wxNamingViewer/wxNamingViewerFrame.cpp: Added some #include
+          files to get things working again on Linux.  Thanks to Matt
+          Gillen <mgillen@bbn.com> for these fixes.
+
+Tue Oct 25 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp:
+          Fixed warning in MinGW build
+
+Tue Oct 25 07:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current_Impl.cpp:
+          Implemented POA_Current::get_reference. This is the last item
+          of bugzilla bug 1917, which is now totally fixed
+
+Mon Oct 24 19:08:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/util/utl_scope.cpp:
+        * TAO_IDL/util/utl_string.cpp:
+
+          Added immediate exits when name clash errors are encountered,
+          since trying to continue parsing from these points can lead to a
+          crash. Thanks to Ian Zagorskih <ianzag@megasignal.com> for
+          reporting the problem. This fix closes [BUGID:2281].
+
+Mon Oct 24 18:39:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_interface_header.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/include/fe_interface_header.h:
+
+          For IDL types that are added to the IDL compiler's
+          AST via an FE_*Header class (interfaces, valuetypes,
+          eventtypes, components, and homes), modified the
+          creation of this class to pass in a scoped name
+          created on the heap instead of on the stack.
+          Memory allocated within this scoped name was being
+          freed in a different scope, and it's dangerous
+          to assume that the stack address would still be
+          valid. Also added a destroy() method to the
+          FE_InterfaceHeader class (base class to all the
+          others) that handles the destruction of the scoped
+          name member and its contents, if it is nonzero.
+          Thanks to Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
+          for reporting the problem.
+
+Mon Oct 24 18:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+          Added validation whether the requested codesets are supported
+
+        * tao/Codeset/Codeset_Manager_i.{h,cpp}:
+        * tao/Codeset_Manager.h:
+          Added get_ncs to be able to check whether a codeset is supported.
+          Thanks to Phil Mesnier for helping with this issue.
+
+Mon Oct 24 17:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Codec/client.cpp:
+          Added missing return
+
+Mon Oct 24 06:53:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/IFR_Service/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Mon Oct 24 13:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Codec/client.cpp:
+        * tests/Codec/Codec.mpc:
+          Extended this test
+
+Mon Oct 24 13:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/CDR_Encaps_Codec.{h,cpp}
+        * tao/CodecFactory/CodecFactory_impl.{h,cpp}:
+        * tao/CodecFactory/IOP_Codec.pidl:
+        * tao/CodecFactory/IOP_Codec_includeC.h:
+        * tao/CodecFactory/IOP_Codec_includeS.h:
+        * tao/CodecFactory/IOP_CodecC.{h,cpp}:
+          The current Codec just encode/decodes wstring without
+          using the codesets. When wstrings are encoded/decoded
+          this causes problems. We found that there has been
+          raised already an issue at the OMG for this: issue 6050,
+          see http://www.omg.org/issues/issue6050.txt
+          This proposes a new IDL method on CodecFactory,
+          CodecFactory::create_codec_with_codesets.
+          With this method a Codec can be created with specific
+          codesets in place. We implemented this method in TAO,
+          the only thing we will add soon is the extra check whether
+          the requested codeset is supported, this is not possible
+          at this moment because the codeset interfaces are not really
+          setup in a way to do this.
+
+        * tao/CodecFactory/IOP_CodecA.cpp:
+          Removed
+
+        * tao/Codeset_Manager.h:
+        * tao/Codeset_Descriptor_Base.h:
+          Small layout/doxygen fixes
+
+        * tao/Makefile.am:
+          Removed tao/CodecFactory/IOP_CodecA.cpp
+
+        * tao/CodecFactory/diff/IOP_Codec.diff:
+          Updated
+
+Mon Oct 24 12:59:07 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/Messaging/ExceptionHolder_i.cpp:
+
+          Fixed compile error with VC++ 6.
+
+Mon Oct 24 07:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Adapter_Registry.cpp:
+        * ORB_Core.cpp:
+        * Object.cpp:
+        * BiDir_GIOP/BiDirGIOP.cpp:
+        * CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * Messaging/Messaging_Loader.cpp:
+        * PortableServer/Root_POA.cpp:
+        * RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Don't pass %P, %t, \n to ACE_PRINT_EXCEPTION, it
+          does this itself already.
+
+        * Codeset/Codeset_Manager_i.cpp:
+          Layout improvements
+
+Fri Oct 21 14:12:49 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+
+          Added PI.h include to force statically initialization happen
+          before the TAO_CSD_Object_Adapter::init() is called. This would
+          resolve the problem that CSD test failures on static builds.
+
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+
+          Added dependency on pi base project since the PI.h is included
+          in the test application.
+
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+
+          Corrected the conversion specifier (using %u) for unsigned value.
+
+Fri Oct 21 12:25:56 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/PI_Server/PI_Server_Loader.cpp:
+
+          Removed the %P|%t in the ACE_PRINT_EXCEPTION info parameter.
+
+Fri Oct 21 11:17:10 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+
+          Made the number of threads to use the default value 1 if the
+          number of threads is not specified in the service config file.
+
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+
+          Replaced the unsigned* with unsigned int* to fix a parse error
+          compilation error on some compilers.
+
+Fri Oct 21 07:19:32 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+
+          Fix tipo in server project that caused it not to depend on IDL
+          project.
+
+Fri Oct 21 13:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CodeSets/simple/client.cpp:
+          Fixed signed/unsigned warning
+
+Fri Oct 21 10:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp:
+          Don't use barrier as variable name, can be a macro. fixes bugzila
+          bug 2271. Thanks to Francesco Salvestrini
+          <f dot salvestrini at nextworks dot it> for reporting this.
+
+        * tests/Nested_Upcall_Crash/Clock_Ticks.{h,cpp}:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * tests/CodeSets/simple/client.cpp:
+          64bit fixes
+
+        * examples/Simple/echo/Echo_i.cpp:
+          Initialise pointer with 0
+
+        * tao/PortableServer/POA_Current.{h,cpp}:
+        * tao/PortableServer/POA_Current_Impl.{h,cpp}:
+        * tao/PortableServer/PS_CurrentA.cpp:
+        * tao/PortableServer/PS_CurrentC.{h,cpp}:
+        * tao/PortableServer/PS_Current.pidl:
+          Added Current::get_reference as to be implemented method, that will
+          be done soon. Generated the pidl file as a result of AnyTypeCode
+          refactoring the PS_CurrentA.cpp is not usable for this file, so
+          zapped it.
+
+        * tao/Makefile.am:
+          Removed PS_CurrentA.cpp
+
+Fri Oct 21 09:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/ExceptionHolder_i.h:
+          Fixed forward declaration
+
+Thu Oct 20 12:24:30 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+
+          Made the ACE_Thread_Manager instance wait for CSD task threads
+          exit. This should fix test failure shown on scoreboard.
+
+Thu Oct 20 11:54:38 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h:
+
+          Removed the duplicated inheritence of PortableServer::ServantBase.
+
+        * tao/CSD_Framework/CSD_Framework.pidl:
+
+          Fixed fuzz errors.
+
+        * tao/CSD_Framework/CSD_FrameworkA.cpp:
+        * tao/CSD_Framework/CSD_FrameworkA.h:
+        * tao/CSD_Framework/CSD_FrameworkC.cpp:
+        * tao/CSD_Framework/CSD_FrameworkC.h:
+        * tao/CSD_Framework/diffs/CSD_Framework.diff:
+
+          Regenerated files from pidl file and updated to resolve error
+          message from compiler.
+
+        * tao/CSD_Framework/CSD_FrameworkC.inl:
+
+          Removed the empty file to fix fuzz error.
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.h:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h:
+
+          Fixed fuzz errors and compilation errors shown on scoreboard.
+
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl:
+
+          Updated to be the same as in $TAO_ROOT/tests/Hello test.
+
+Thu Oct 20 14:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp:
+          Fixed argument not used warning
+
+Thu Oct 20 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Enabled the new AMI implementation as described in the CORBA
+        3.0.3 specification. All tests and examples are updated to the
+        new spec but if you want to use the old specification for
+        your application then define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER
+        in your config.h and rebuild the core libs and the TAO IDL compiler.
+        This deprecated AMI support will be kept alive until x.5.1 has
+        been released and then we will zap it completely from the
+        TAO distribution.
+
+        When you want to update the application code for the new mapping,
+        all _excep methods in the reply handler must be updated. Change
+        the interface specific exceptionholder in the interface to
+        ::Messaging::ExceptionHolder, change in the implementation the
+        raise_x call to raise_exception.
+
+        * TAO_IDL/be_include/be_global.h:
+        * tao/orbconf.h:
+          Removed define of TAO_HAS_DEPRECATED_EXCEPTION_HOLDER, we
+          are switching now to the new AMI implementation
+
+        * docs/tutorials/Quoter/AMI/Handler_i.{h,cpp}:
+        * docs/tutorials/Quoter/On_Demand_Activation/Handler_i.{h,cpp}:
+        * examples/AMI/FL_Callback/Peer_i.{h,cpp}:
+        * examples/Buffered_AMI/client.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.h:
+        * examples/Content_Server/AMI_Observer/Callback_Handler.{h,cpp}:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.{h,cpp}:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.{h,cpp}:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.{h,cpp}:
+        * orbsvcs/tests/HTIOP/AMI/client.cpp
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+        * performance-tests/Latency/AMI/Roundtrip_Handler.{h,cpp}:
+        * performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.{h,cpp}:
+        * tests/AMI/client.cpp:
+        * tests/AMI/simple_client.cpp:
+        * tests/AMI_Buffering/Reply_Handler.{h,cpp}:
+        * tests/AMI_Timeouts/timeout_i.{h,cpp}:
+        * tests/Big_AMI/client.cpp:
+        * tests/Bug_1482_Regression/Reply_Handler.{h,cpp}:
+        * tests/Bug_1551_Regression/Reply_Handler.{h,cpp}:
+        * tests/LongUpcalls/AMI_Manager.{h,cpp}:
+        * tests/LongUpcalls/Manager_Handler.{h,cpp}:
+        * tests/Portable_Interceptors/AMI/Echo_Handler.{h,cpp}:
+          Updated for the new AMI mapping
+
+Thu Oct 20 12:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/compiler.html:
+          Documented AMI behaviour and fixed some incorrect links
+
+Thu Oct 20 12:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/releasenotes/index.html:
+          Fixed html tag
+
+Thu Oct 20 10:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+          Fixed problem with the exceptionholder in the new AMI mapping, it
+          was created for each interface in an idl file, it should only
+          be created once
+
+Thu Oct 20 09:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+          Guarded another part of code with TAO_HAS_DEPRECATED_EXCEPTION_HOLDER,
+          it is not needed with the new AMI implementation
+
+Wed Oct 19 14:09:44 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * tao/Messaging/AMH_Response_Handler.cpp:
+
+          Release the lock in the destructor before calling
+          _tao_rh_send_exception (). The said method is well
+          protected. Calling this method with the lock held could create a
+          deadlock. Thanks to Anton Bakanovskiy <Anton dot Bakanovskiy at
+          bercut dot ru> and Toha Bakanovsky <im-scooter at yandex.ru> for
+          reporting the problem. This fixes [BUGID 2269].
+
+Wed Oct 19 11:30:23 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+
+          Removed extra ";" from the POAManager forward declaration.
+
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+
+          Removed the argument name from the csd hook interfaces instead
+          of using ACE_UNUSED_ARG.
+
+        * docs/libraries.html:
+
+          Added CSD_Framework and CSD_ThreadPool library descriptions.
+
+        * examples/CSD_Strategy/ThreadPool/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+
+          Replaced deprecated RefCountServantBase with ServantBase.
+
+Wed Oct 19 10:01:03 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/Valuetype/Value_VarOut_T.cpp (operator=):
+
+          Implement assignment operators in terms of their constructor
+          counterparts using the canonical copy and (non-throwing) swap
+          technique.  Provides strong exception safety guarantee, obviates
+          need for self-assignment check and reduces code duplication
+          between constructors and assignment operators.  This change also
+          reverts "Tue Jun 21 13:38:23 2005  Gary Maxey <gary.maxey@...>",
+          and fixes a memory leak reported by Mickael P. Golovin <migel at
+          garant dot ru>.
+
+Wed Oct 19 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/ExceptionHolder_i.cpp:
+          Added todo that code could be simplified when missing valuetype
+          constructor is generated
+
+Wed Oct 19 10:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_global.h:
+          Added define of TAO_HAS_DEPRECATED_EXCEPTION_HOLDER. This way
+          I can the new AMI support to the IDL compiler in the repo
+          and build it on multiple boxes by removing this define by hand.
+          At the moment the new AMI support is fully ready I will remove
+          this define and then it is up to the user to set it.
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+          Added support for the new AMI mapping, is enabled when
+          TAO_HAS_DEPRECATED_EXCEPTION_HOLDER is not defined, so by
+          default it is disabled at this moment
+
+Wed Oct 19 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/ExceptionHolder_i.{h,cpp}:
+          Added new Messaging::ExceptionHolder implementation, will be used
+          for the new AMI mapping
+
+        * tao/Makefile.am:
+          Added new files above
+
+Wed Oct 19 08:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be/be_global.cpp:
+          Added member to store the new Messaging::ExceptionHolder
+          for the latest AMI mapping
+
+Wed Oct 19 00:35:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add default AM_CONDITIONAL for BUILD_WFMO.
+
+Wed Oct 19 07:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+          Fixed MinGW warning
+
+Wed Oct 19 00:11:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
+
+          Regenerate.
+
+        * examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc:
+
+          Changed to inherit from wfmo instead of using a verbatim section
+          to disable building on systems without the ACE_WFMO_Reactor.
+
+Tue Oct 18 23:43:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am
+
+          Regenerate.
+
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_ThreadPool.mpc:
+
+          Add Pkconfig_Files section for new pkg-config templates.
+
+        * tao/CSD_Framework/TAO_CSD_Framework.pc.in:
+
+          New file, pkg-config *.pc template for TAO_CSD_Framework
+          library.
+
+        * tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in:
+
+          New file, pkg-config *.pc template for TAO_CSD_ThreadPool
+          library.
+
+Tue Oct 18 20:56:24 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/CSD_ThreadPool.mpc:
+
+          Changed to inherit from core.mpb base project.
+
+Tue Oct 18 18:35:26 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerate due to CSD.
+
+Tue Oct 18 18:33:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+
+          Regenerate due to change in Kokyu_dsrt_schedulers.mpb.
+
+Tue Oct 18 17:24:26 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        Merged in the CSD (Custom Servant Dispatching) feature from OCI.
+
+        The main changes to existing code are:
+
+          - Four hooks are added to TAO_Root_POA to notify the CSD when poa
+            is activated/deactivated and servant is activated/deactivated.
+            Some areas of the code were instrumented to call these hooks to
+            notify the CSD Strategy object of POA activation and deactivation
+            "events".  Likewise, code was added to notify the CSD Strategy object
+            of servant activation and deactivation "events".
+          - A virtual method do_dispatch() is added to the TAO_Object_Adapter so
+            the CSD object adpater can override the default implementation to
+            dispatch the requests to the CSD strategy.
+          - The remote requests and the collocated oneway requests are cloned when
+            they are dispatched to the CSD strategy. To support the TAO_ServerRequest
+            clone in the CSD library, the friendship is added to the TAO_ServerRequest
+            class and it's data member classes such as TAO_Service_Context class,
+            TAO_Operation_Details class and TAO_Tagged_Profile class.
+
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+
+          Added four hooks.
+
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+
+          Instrumented to call the hooks.
+
+        * tao/operation_details.h:
+        * tao/Service_Context.h:
+        * tao/Tagged_Profile.h:
+
+          Added friendship with CSD_FW_Server_Request_Wrapper to support
+          the TAO_ServerRequest clone in CSD library.
+
+        * tao/TAO_Server_Request.h:
+
+          - Changed the operation_details_ to be pointer to const
+          TAO_Operation_Details object instead of const pointer to const
+          TAO_Operation_Details object. This change is made to accommodate
+          the change of TAO_ServerRequest clone in the CSD library.
+          - Added friendship with CSD_FW_Server_Request_Wrapper to support
+          the TAO_ServerRequest clone in CSD library.
+
+        * tao/PortableServer/get_arg.h:
+
+          Made the get_in_arg template function check whether the
+          detail argument is nil. If the detail is not nil and the
+          argument list in detail is nil(collocated oneway case) then it
+          will demarshall the input CDR stream and get arguments. This
+          change is made to accommodate the changes in TAO_Operation_Details
+          clone that writes the argument list to the input CDR of the
+          TAO_ServerRequest object.
+
+        * tao/Intrusive_Ref_Count_Base_T.cpp:
+        * tao/Intrusive_Ref_Count_Base_T.h:
+        * tao/Intrusive_Ref_Count_Base_T.inl:
+        * tao/Intrusive_Ref_Count_Handle_T.cpp:
+        * tao/Intrusive_Ref_Count_Handle_T.h:
+        * tao/Intrusive_Ref_Count_Handle_T.inl:
+
+          These are two new classes that provide infrastructure-level support
+          for classes that need an "intrusive" reference counting mechanism.
+
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+        * tao/CSD_Framework/CSD_Framework.pidl:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
+        * tao/CSD_Framework/CSD_Framework_Loader.h:
+        * tao/CSD_Framework/CSD_FrameworkA.cpp:
+        * tao/CSD_Framework/CSD_FrameworkA.h:
+        * tao/CSD_Framework/CSD_FrameworkC.cpp:
+        * tao/CSD_Framework/CSD_FrameworkC.h:
+        * tao/CSD_Framework/CSD_FrameworkC.inl:
+        * tao/CSD_Framework/CSD_FW_Export.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl:
+        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter.h:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.h:
+        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
+        * tao/CSD_Framework/CSD_ORBInitializer.h:
+        * tao/CSD_Framework/CSD_POA.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_POA.inl:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+        * tao/CSD_Framework/CSD_Strategy_Base.inl:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.h:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.inl:
+        * tao/CSD_Framework/CSD_Strategy_Repository.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Repository.h:
+        * tao/CSD_Framework/diffs/CSD_Framework.diff:
+
+          All of the files listed above are brand new and are used to build
+          the new CSD Framework library. This framework implements the base
+          classes for the concrete strategy implementation and implements
+          the service objects for CSD strategy static and dynamic loading
+          via the service configuration file.
+
+        * tao/CSD_ThreadPool.mpc:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.cpp:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Export.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * tao/CSD_ThreadPool/CSD_TP_Task.inl:
+
+          All of the files listed above are brand new and are used to build
+          the new CSD ThreadPool library.  Collectively, these classes
+          represent the reference-implementation for the CSD Strategy feature.
+
+        * examples/CSD_Strategy/README:
+        * examples/CSD_Strategy/ThreadPool/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool/README:
+        * examples/CSD_Strategy/ThreadPool/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool2/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool2/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool2/README:
+        * examples/CSD_Strategy/ThreadPool2/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool2/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool3/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool3/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool3/OrbTask.cpp:
+        * examples/CSD_Strategy/ThreadPool3/OrbTask.h:
+        * examples/CSD_Strategy/ThreadPool3/README:
+        * examples/CSD_Strategy/ThreadPool3/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool3/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool4/Callback.idl:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.h:
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+        * examples/CSD_Strategy/ThreadPool4/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool4/README:
+        * examples/CSD_Strategy/ThreadPool4/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool4/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool5/Callback.idl:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool5/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.h:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool5/OrbTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/OrbTask.h:
+        * examples/CSD_Strategy/ThreadPool5/README:
+        * examples/CSD_Strategy/ThreadPool5/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool5/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool6/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        * examples/CSD_Strategy/ThreadPool6/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool6/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool6/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool6/README:
+        * examples/CSD_Strategy/ThreadPool6/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool6/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.h:
+        * performance-tests/CSD_Strategy/TestApps/client_main.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ClientApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ClientApp.h:
+        * performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc:
+        * performance-tests/CSD_Strategy/TestApps/run_test.pl:
+        * performance-tests/CSD_Strategy/TestApps/server_main.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.h:
+        * performance-tests/CSD_Strategy/TestApps/README:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.h:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.h:
+        * performance-tests/CSD_Strategy/TestInf/CancelledException.idl:
+        * performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ClientEngine.h:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.h:
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
+        * performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h:
+        * performance-tests/CSD_Strategy/TestInf/CustomException.idl:
+        * performance-tests/CSD_Strategy/TestInf/FooException.idl:
+        * performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbRunner.h:
+        * performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h:
+        * performance-tests/CSD_Strategy/TestInf/OrbTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbTask.h:
+        * performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ServantList_T.h:
+        * performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp:
+        * performance-tests/CSD_Strategy/TestInf/TestAppBase.h:
+        * performance-tests/CSD_Strategy/TestInf/TestAppException.idl:
+        * performance-tests/CSD_Strategy/TestInf/TestAppMain.h:
+        * performance-tests/CSD_Strategy/TestInf/README:
+        * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc:
+        * performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo.idl:
+        * performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h:
+        * performance-tests/CSD_Strategy/TestServant/README:
+        * tests/CSD_Strategy_Tests/README:
+        * tests/CSD_Strategy_Tests/Broken/client_main.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.h:
+        * tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc:
+        * tests/CSD_Strategy_Tests/Broken/run_test.pl:
+        * tests/CSD_Strategy_Tests/Broken/server_main.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Common/CustomException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/FooException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h:
+        * tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_4/README:
+        * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/README:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/README:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf:
+
+          All of the files above are part of the examples, tests and performance
+          tests added for the CSD feature.
 
 Tue Oct 18 13:23:21 2005  Chris Cleeland  <cleeland_c@ociweb.com>
 
@@ -65,7 +12593,7 @@ Tue Oct 18 00:08:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
         * tao/ORB.cpp (resolve_service):
 
-          Use snprintf() to simplify integer to-tring conversion and
+          Use snprintf() to simplify integer-to-string conversion and
           string concatenation.  Thanks to Jiang Wei <jw dot tao at sduept
           dot com> for providing a patch.
 
@@ -76,8 +12604,8 @@ Tue Oct 18 00:08:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
           (resolve_initial_references):
 
-          Updated to calls to resolve_service() to reflect new signature
-          and void return type.
+          Updated calls to resolve_service() to reflect new signature and
+          void return type.
 
         * tao/ORB_Core.cpp (init):
 
@@ -1673,24 +14201,24 @@ Mon Oct  3 18:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Oct  3 10:48:45 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * TAO/TAO_IDL/tao_idl.mpc:
-        * TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc:
-        * TAO/orbsvcs/orbsvcs/Svc_Utils.mpc:
-        * TAO/tao/Strategies.mpc:
+        * TAO_IDL/tao_idl.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+        * orbsvcs/orbsvcs/Svc_Utils.mpc:
+        * tao/Strategies.mpc:
 
           Added "ace_for_tao" ACE library subset support.
 
-        * TAO/TAO_IDL/driver/drv_preproc.cpp:
-        * TAO/TAO_IDL/fe/fe_extern.cpp:
-        * TAO/TAO_IDL/fe/fe_init.cpp:
-        * TAO/TAO_IDL/include/fe_extern.h:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/fe/fe_extern.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/include/fe_extern.h:
 
           Removed use of ACE_UUID.  Rely on ACE_OS::mkstemp() instead to
           avoid depending on more areas of ACE than necessary.
 
-        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
-        * TAO/tao/default_resource.cpp:
-        * TAO/tao/Strategies/advanced_resource.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * tao/default_resource.cpp:
+        * tao/Strategies/advanced_resource.cpp:
 
           Include appropriate headers to address incomplete type
           definition related compile-time errors.  Necessitated by header
@@ -1913,11 +14441,11 @@ Fri Sep 30 12:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Sep 30 12:22:51 2005  Simon McQueen  <sm@prismtech.com>
 
-        * TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
 
           Add minimum_corba.
 
-        * TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
 
           ACE_CHECK to ACE_CHECK_RETURN.
 
@@ -3959,7 +16487,7 @@ Fri Aug 26 23:48:25 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
         * tao/default_client.cpp:
         * tao/default_client.h:
 
-          New strategy ORBCOnnectionHandlerCleanup .
+          New strategy ORBConnectionHandlerCleanup .
 
         * tao/Connection_Handler.cpp:
 
@@ -4387,8 +16915,8 @@ Wed Aug 24 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
           Only store and use the typecode of an user exception when
           interceptors are enabled
 
-        * TAO/tao/ImR_Client/ImplRepo.pidl:
-        * TAO/tao/ImR_Client/ServerObject.pidl:
+        * tao/ImR_Client/ImplRepo.pidl:
+        * tao/ImR_Client/ServerObject.pidl:
           Updated regeneration instructions to not use -GA
 
         * tao/ImR_Client/ImplRepoA.h
@@ -4405,8 +16933,8 @@ Wed Aug 24 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
         * tao/ImR_Client/ServerObjectS.h
           Regenerated
 
-        * TAO/tao/ImR_Client/ImplRepoA.cpp
-        * TAO/tao/ImR_Client/ServerObjectA.cpp
+        * tao/ImR_Client/ImplRepoA.cpp
+        * tao/ImR_Client/ServerObjectA.cpp
           Removed
 
         * tao/Makefile.am:
@@ -8240,8410 +20768,8 @@ Fri Aug 05 07:49:26 2005  Simon Massey  <sma@prismtech.com>
 
         * TAO version 1.4.7 released.
 
-Tue Aug  2 21:18:02 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/y.tab.cpp:
-
-          Fixed some mismatched allocate/deallocate errors. Thanks to
-          Johnny Willemsen <jwillemsen@rememdy.nl> for pointing them
-          out.
-
-Tue Aug  2 13:01:58 2005  Steve Totten  <totten_s@ociweb.com>
-
-        Applied the following change from the OCI TAO 1.4a repository on
-        behalf of Abdel Rigumye:
-
-        Fri Jul 29 14:30 2005 Abdel Rigumye   <rigumyea@ociweb.com>
-
-        * orbsvc/Naming_Service/README:
-
-          Added and documented the existence of the -u and -r persistence
-          options
-
-Tue Aug  2 09:53:23 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/tests/Bug_1630_Regression/test.mpc:
-
-          Use imr_client base project.
-
-Mon Aug  1 07:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-          Added ImR_Client
-
-Sat Jul 30 10:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1395_Regression/Test_i.cpp:
-          Fixed casing of include
-
-Fri Jul 29 17:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/LifespanStrategyPersistent.cpp:
-          Added missing ACE_CHECK
-
-Fri Jul 29 18:41:50 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/ImR_Client/ImR_Client.cpp:
-
-          Fixed typo.
-
-        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
-        * orbsvcs/tests/Bug_1395_Regression/Test_i.cpp:
-
-          Forced link of ImR_Client to fix error on static builds.
-
-Fri Jul 29 17:55:23 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-
-          Add accessor for use_implrepo_ value.
-
-        * tao/ImR_Client/ImR_Client.cpp:
-
-          Make calling imr_notify_startup when the ImR ref cannot be
-          found or narrowed into an error condition.
-
-        * tao/PortableServer/LifespanStrategyPersistent.h:
-        * tao/PortableServer/LifespanStrategyPersistent.cpp:
-
-          Read the use_imr_ value from the ORB core. Only try and load
-          the ImR_Client and call imr_notify_startup if use_imr_ set.
-
-Fri Jul 29 14:15:11 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Bug_1020_Basic_Regression/Server_Task.cpp:
-
-          Added ACE_NOTREACHED to unreachable code to fix warning on
-          HP non stop build.
-
-Thu Jul 28 12:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
-          Added include of IFR_Client_Adapter_Impl, this should make sure
-          the IFR_Client is linked into the exe and the static initializers
-          are called. This should fix this test in the Windows static
-          builds
-
-Thu Jul 28 10:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OctetSeq/client.cpp:
-          Don't test _repository_id in a minimum corba build
-
-Thu Jul 28 00:43:34 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/CORBA_String.h:
-        * tao/CORBA_String.inl:
-
-          Removed operator==({W}String_var,{W}String_var) from the CORBA
-          namespace.  It was TAO-specific, only existed so that
-          {W}String_var could be used as map key, and polluted the CORBA
-          namespace.  Replaced with TAO::String_Var_Equal_To equality
-          functor.
-
-        * tao/ORB.cpp (_downcast):
-
-          Removed redundant/unnecessary repository ID string comparison
-          from ORB::InvalidName::_downcast() method.  A simple
-          dynamic_cast<>-based check is sufficient.
-
-          (ORB_init):
-
-          Removed ORB shutdown check.  The goal of the check was to cause
-          the CORBA::BAD_INV_ORDER system exception to be thrown if the
-          ORB was shutdown.  However, that only applies to ORB methods,
-          not CORBA::ORB_init().  Just return the ORB.  ORB methods
-          already check for ORB shutdown.
-
-        * tao/ORB_Table.cpp (bind):
-
-          Moved pair creation before the lock acquisition.  Pair creation
-          in this case need not be synchronized across threads.
-
-          (unbind):
-
-          Pass the iterator returned from the underlaying map's find()
-          call to erase().  Saves us a duplicate element search found in
-          the erase() overload that accepts a key_type instead of an
-          iterator.
-
-          Removed work around described here in ChangeLog entry "Fri Jul
-          22 10:07:12 UTC 2005  Johnny Willemsen
-          <jwillemsen@remedy.nl>".  It is no longer necessary due to
-          changes in the ACE_Array_Map implementation.  Also addresses
-          missing key object destruction in the workaround.
-
-        * tao/ORB_Table.h:
-        * tao/ORB_Table.inl:
-
-          Removed the ORB_Core_Ref_Counter equality operator.  It is a
-          vestige of a transitional ORB_Table and ORB_Core_Ref_Counter
-          implementation, and is no longer needed.
-
-          Set the ACE_Array_Map equality functor template parameter to
-          TAO::String_Var_Equal_To.  See changes to CORBA_String.h above
-          for details.
-
-        * tao/Object_Ref_Table.h:
-
-          Set the ACE_Array_Map equality functor template parameter to
-          TAO::String_Var_Equal_To.  See changes to CORBA_String.h above
-          for details.
-
-        * tao/Object_Ref_Table.cpp (bind):
-
-          Moved pair creation before the lock acquisition.  Pair creation
-          in this case need not be synchronized across threads.
-
-        * tao/PortableServer/Servant_Base.cpp:
-        * tao/PortableServer/Servant_Base.h:
-        * tao/PortableServer/Servant_Base.i:
-
-          Inlined one-liners.  Reduces footprint.
-
-          Use the ACE_Atomic_Op<long> specialization as the underlying
-          synchronized reference counting mechanism instead of
-          ACE_Atomic_Op<CORBA::ULong>.  Improves performance and reduces
-          footprint.
-
-Wed Jul 27 21:35:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-
-          Regenerated.
-
-Wed Jul 27 15:59:54 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
-
-          When generating Any insertion and extraction operators
-          conditionally put them in a namespace that corresponds to their
-          enclosing module (if any).  Addresses problem reported in
-          Bugzilla report #2071.  Since some compilers do not implement
-          symbol lookup correctly the changed code is controlled by the
-          ACE_ANY_OPS_USE_NAMESPACE macro.  Use this macro in config*.h if
-          your compiler implements symbol lookup correctly.  Without the
-          macro the IDL generated code is as it was.
-
-Wed Jul 27 10:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Wait_On_Leader_Follower.h:
-          Fixed typo in documentation
-
-Wed Jul 27 09:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
-          Fixed compile error in minimum build
-
-Wed Jul 27 07:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          Fixed conversion warning
-
-Wed Jul 27 07:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/Event_Service/index.html:
-          Updated documentation how to run this tutorial. Thanks to
-          Frederick Heckel <fwph at cse dot wustl dot edu> for
-          reporting that things didn't work.
-
-Tue Jul 26 12:11:36 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-
-          Plugged some memory leaks.
-
-Tue Jul 26 14:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Options.html:
-          Small link improvements
-
-Tue Jul 26 12:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp (destroy_interceptors):
-          Fixed memory leak of client/server request interceptor lists
-
-Tue Jul 26 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.{h,cpp}:
-          Added a CORBA::ULongSeq as out argument to the server_test
-          method to test for bug 2158. It seems this problem doesn't
-          exists anymore
-
-Tue Jul 26 11:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_interface.cpp:
-          Fixed problem in dynamic hash lookup table generation
-
-Tue Jul 26 10:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1020_Basic_Regression/Server_Task.cpp:
-          Added return 0
-
-Tue Jul 26 10:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Remote_Object_Proxy_Broker.cpp:
-          Fixed compile error in minimum build
-
-Tue Jul 26 09:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PICurrent.{h,cpp}:
-        * tao/PICurrent_Loader.cpp:
-          Overruled _get_orb and store an ORB_Core reference instead of
-          a pointer
-
-Tue Jul 26 09:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/params.h:
-          Removed some old comment
-
-Tue Jul 26 08:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          Added some missing CORBA::string_dup calls which caused this tet
-          to fail in a static build
-
-Tue Jul 26 08:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-          No need to check for a nill pointer, the dynamic_cast handles that
-
-Tue Jul 26 08:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1020_Regression/client.cpp:
-          Initialise pointer with 0
-
-Tue Jul 26 07:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/IdAssignmentStrategy.h:
-        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
-        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
-        * tao/PortableServer/IdAssignmentStrategySystem.h:
-        * tao/PortableServer/IdAssignmentStrategyUser.cpp:
-        * tao/PortableServer/IdAssignmentStrategyUser.h:
-        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
-        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.h:
-        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
-        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
-        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
-        * tao/PortableServer/ImplicitActivationStrategy.h:
-        * tao/PortableServer/ImplicitActivationStrategyExplicit.cpp:
-        * tao/PortableServer/ImplicitActivationStrategyExplicit.h:
-        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
-        * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h:
-        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
-        * tao/PortableServer/LifespanStrategy.h:
-        * tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
-        * tao/PortableServer/LifespanStrategyPersistent.h:
-        * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
-        * tao/PortableServer/LifespanStrategyTransient.h:
-        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
-        * tao/PortableServer/Policy_Strategy.h:
-        * tao/PortableServer/RequestProcessingStrategy.h:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.h:
-        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.h:
-        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantManager.h:
-        * tao/PortableServer/ServantRetentionStrategy.h:
-        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
-        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
-        * tao/PortableServer/ServantRetentionStrategyRetain.h:
-        * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
-        * tao/PortableServer/StrategyFactory.h:
-        * tao/PortableServer/ThreadStrategy.h:
-        * tao/PortableServer/ThreadStrategyFactory.h:
-        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
-        * tao/PortableServer/ThreadStrategySingle.cpp:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
-          Reduced the number of exports. This will reduce footprint in
-          Windows and GCC 4 builds.
-
-Tue Jul 26 06:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-          Added missing include
-
-Tue Jul 26 06:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Notify/lib/Task_Callback.{h,cpp}:
-          Added virtual destructor
-
-Mon Jul 25 15:48:05 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-
-          Plugged some memory leaks.
-
-Mon Jul 25 12:49:44 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Array_VarOut_T.h:
-        * tao/Array_VarOut_T.inl:
-        * tao/Fixed_Array_Argument_T.inl:
-        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
-
-          Removed "out" method from class TAO_Array_Var_Base_T and added
-          the method to classes TAO_FixedArray_Var_T and
-          TAO_VarArray_Var_T.  For fixed arrays the "out" method now
-          returns T_slice * for fixed arrays.  For variable arrays the
-          "out" method returns T_slice *& (same as previously).
-
-Mon Jul 25 12:37:34 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-
-          Fixed platform-specific compilation warnings.
-
-Mon Jul 25 13:34:03 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/airplane_server.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-
-          Add suicide capability to the server. This won't help any tests
-        pass, but should prevent airplane server processes from hanging.
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-
-          Change the both_ir test to work as documented. The test should run
-        once with the servers running, and then once with the servers launched
-        by the activator. This works around some weird startup problems on
-        Windows.
-
-Mon Jul 25 18:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ThreadStrategyORBControl.{h,cpp}:
-          Don't export this, this is only used internally in the
-          portableserver library.
-
-Mon Jul 25 18:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * tao/Abstract_Servant_Base.h:
-        * tao/LocalObject.{h,cpp}:
-        * tao/Object.{h,cpp}:
-        * tao/Object_Proxy_Broker.h:
-        * tao/Remote_Object_Proxy_Broker.{h,cpp}:
-        * tao/PortableServer/Collocated_Object_Proxy_Broker.{h,cpp}:
-        * tao/PortableServer/Servant_Base.{h,cpp}:
-          Added CORBA::Object::_repository_id, this fixes bugzilla 2180
-
-        * tests/OctetSeq/client.cpp:
-          Call _repository_id
-
-        * tao/PortableServer/Active_Object_Map.h:
-          No need to export this class
-
-Mon Jul 25 15:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
-          Initialise pointers to 0 and fixed some typos in comments
-
-        * tao/PortableServer/Root_POA.{h,cpp}:
-        * tao/PortableServer/POAManager.{h,cpp}:
-          Overruled _get_orb as required by the CORBA spec
-
-Mon Jul 25 13:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
-          Ensured access to codeset manager is guarded by a nil check.
-
-Mon Jul 25 07:38:47 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Strategies/DIOP_Acceptor.cpp:
-        * tao/Strategies/SCIOP_Acceptor.cpp:
-        * tao/Strategies/SHMIOP_Acceptor.cpp:
-        * tao/Strategies/UIOP_Acceptor.cpp:
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
-
-          Ensured access to codeset manager is guarded by a nil check.
-
-Sat Jul 23 19:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        * tao/PortableServer/Active_Object_Map.{h,i}:
-          Fixed a bug when we tried to deactivate a reference created with
-          a user id using a POA that uses servant activator.
-
-Sat Jul 23 12:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/Etherealization/Etherealization.cpp:
-          Extended this test with two test cases where we create a
-          reference with user created id using a POA that has a
-          servant activator but don't do any calls and just deactivate
-          the object again. This is the same problem as we are seeing
-          in CIAO and this needs to be resolved as P1 bug
-
-Sat Jul 23 10:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1020_Basic_Regression/Server_Task.cpp:
-          Fixed warning in MinGW build
-
-Fri Jul 22 15:39:18 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-
-          Guard against null pointers returned from _downcast()
-
-Fri Jul 22 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry.cpp:
-          Fixed compile error on AIX. Thanks to Ventimiglia Chere
-          <Ventimiglia_Chere at emc dot com> for reporting this.
-
-Fri Jul 22 12:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp:
-          Updated for obj_ref_table interface change
-
-Fri Jul 22 12:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitInfo.cpp:
-          Fixed emulated excepton
-
-        * tao/Object_Ref_Table.{h,inl}:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.i:
-        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
-        * tao/RTScheduling/Current.cpp:
-          Changed resolve_initial_references to resolve_initial_reference
-          on the object ref table, this way the fuzz build doesn't trigger.
-
-Fri Jul 22 11:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
-        * tao/RTPortableServer/RT_Policy_Validator.cpp:
-        * tao/RTScheduling/RTScheduler_Manager.i:
-        * tao/RTScheduling/Current.cpp:
-          Fixed problems with emulated exceptions
-
-Fri Jul 22 11:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.{h,i}:
-          Removed exception macros from resolve_rt_orb and removed the
-          resolve_rt_current method because it is not used at all
-
-Fri Jul 22 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.i:
-          Removed environment macro to resolve_initial_references on
-          objreftable
-
-Fri Jul 22 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitInfo.cpp:
-        * tao/ORB.cpp:
-        * tao/Object_Ref_Table.{h,inl}:
-          Corrected exceptions that should be thrown when a duplicate or
-          invalid name is passed with register_initial_reference. Also
-          removed some not needed exception argument macros. Fixes bug
-          2087 and the associated regression test now works fine
-
-Fri Jul 22 10:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Object_Ref_Table.inl (register_initial_reference):
-          When passed a nil object reference, throw a BAD_PARAM exception with
-          minor code 27
-
-Fri Jul 22 10:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Table.cpp:
-          In the unbind, assign a default constructed refcount so that we
-          drop the refcount on the orb at this moment. The array_map uses
-          lazy destruction and only destructs then the ORB at process exit
-          and this causes then crashes with RTCorba.
-
-Fri Jul 22 09:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          Fixed invalid remove_ref call
-
-Fri Jul 22 09:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-          Fixed implicit conversion warning
-
-Fri Jul 22 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          When assigning a hardcoded string, use CORBA::string_dup else
-          we get a crash when trying to free the string with some
-          runtimes.
-
-Fri Jul 22 09:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          Fixed compile errors with Borland
-
-        * tao/Valuetype/ValueBase.{h,cpp}:
-          Use Atomic_Op for the refcount, initialize the refcount to 1 in
-          the copy constructor.
-
-Thu Jul 21 15:07:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-
-          Regenerated.
-
-Thu Jul 21 08:29:13 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/LogMgr_i.cpp:
-
-          Fix typo in last change.
-
-Thu Jul 21 07:42:40 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/LogMgr_i.cpp:
-
-          Don't set the servant retention policy when creating the log POA
-          in minimum CORBA builds.
-
-Thu Jul 21 07:26:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbscvs/orbsvcs/Hash_LogStore.cpp:
-        * orbsvcs/orbsvcs/Hash_LogRecordStore.cpp:
-
-          Use ACE_SYNCH_RW_MUTEX instead of ACE_RW_Thread_Mutex to fix
-          single threaded builds.
-
-Thu Jul 21 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Valuebox/client.cpp:
-          Fixed problem with emulated exceptions
-
-Thu Jul 21 13:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
-          Fixed compile error with Borland
-
-Thu Jul 21 07:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.{h,cpp}:
-          Fixed problem with emulated exceptions
-
-Thu Jul 21 06:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/Simple/Client/index.html:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/index.html:
-        * docs/tutorials/Quoter/Simple/Server/index.html:
-          Updated GNU makefile names with the MPC generated files.
-          Thanks to <gomezt at saic dot com> for reporting this.
-
-Wed Jul 20 13:48:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Wed Jul 20 11:06:57 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp
-        * tests/OBV/ValueBox/valuebox.idl
-        * tests/OBV/ValueBox/Test_impl.cpp
-        * tests/OBV/ValueBox/Test_impl.h
-
-          Resolved some test problems.
-
-Wed Jul 20 11:16:07 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
-        * orbsvcs/orbsvcs/Notify/Peer.h:
-        * orbsvcs/orbsvcs/Notify/Peer.cpp:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
-
-          More cleanup to eliminate compile errors related to template
-        instantiation and #includes. The primary change consisted of
-        moving some ESF Worker classes to Event_Manager.cpp from
-        Event_Manager.h.
-
-        * orbsvcs/orbsvcs/Notify/Event_Manager.inl:
-        * orbsvcs/orbsvcs/Notify/Method_Request.inl:
-        * orbsvcs/orbsvcs/Notify/Peer.inl:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.inl:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.inl:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl:
-
-          Removed these files.
-
-Wed Jul 20 07:06:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
-
-          Update callers.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.h:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-        * orbsvcs/orbsvcs/Log/LogStore.h:
-
-          Added emulated exception goo to ::exists() and ::remove()
-          methods.
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-
-          Work around MSV6 not supporting scoping of variables declared in
-          for loops.
-
-Wed Jul 20 13:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Connection_Timeout/client.cpp:
-          Changed this test to test the timeout in a separate method so that
-          also in case of failure we cleanly destroy the ORB.
-
-Wed Jul 20 12:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/default_resource.cpp:
-          Delete the codeset_manager_, fixes a memory leak
-
-        * tao/Codeset/Codeset_Descriptor.cpp:
-          Use ACE_OS::free to delete the name, it is allocated with
-          ACE_OS::strdup, fixes an invalid read error with valgrind
-
-Wed Jul 20 12:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp:
-          Emulated exception fix
-
-Wed Jul 20 12:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
-          Removed %P|%t from the print exception, this is already done
-          by the print exception itself
-
-Wed Jul 20 11:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-          Fixed compile problem with emulated exceptions
-
-Wed Jul 20 11:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-          Fixed compile problem with emulated exceptions
-
-Wed Jul 20 10:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/Messaging_Loader.cpp:
-          Small layout improvement. Last change in my workspace for the
-          upcoming beta
-
-Wed Jul 20 10:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Object_Proxy_Impl.{h,cpp}:
-          Removed these files, class is not used anymore, we will do soon
-          some cleanup in the TAO_IDL compiler related to this
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Removed file above
-
-Wed Jul 20 07:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_Adapter.h:
-          Removed activate call, we are using the init() call to register
-          the ORBInitializer
-
-        * tao/ORB_Core.{h,cpp}:
-          Removed bidirectional_giop_init, this is not needed anymore, get
-          the BiDIR adapter just in load_policy_validators
-
-        * tao/TAO_Internal:
-          Init BiDIR GIOP library as the other libs
-
-        * tao/BiDIR_GIOP/BiDirGIOP.{h,cpp}:
-          Use init() instead of activate() to register the ORBInitializer.
-
-          All these changes make sure that the BiDIR ORBInitializer is
-          registered before the ORBInitializer::pre_init() call, previously
-          if was registered after pre_init which resulted in the problem that
-          after fixing a bug now it doesn't get called anymore in post_init()
-
-Tue Jul 19 18:45:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.h
-
-          Use ACE_SYNCH_RW_MUTEX instead of ACE_RW_Thread_Mutex to fix
-          single threaded builds.
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h
-        * orbsvcs/orbsvcs/Log/LogStore.h
-
-          Made constructor protected.
-          Made destructor virtual.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Fixed typo introduced in:
-          Tue Jul 19 14:14:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Tue Jul 19 16:40:37 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
-
-          Exclude unsigned long long case in store_label() if platform
-          does not allow this type.
-
-Tue Jul 19 14:14:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogStore.h:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
-
-          Fix assorted build errors, mostly related to emulated
-          exceptions.  Thanks to Simon Massey and Don Sharp for
-          pointing out these problems.
-
-Tue Jul 19 16:02:32 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-
-        Free process_map_ entries in handle_exit(). Thanks to
-        Yevgen Galchenko <yevgeng at softcomputer dot com> for finding
-        this memory leak.
-
-        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
-        * orbsvcs/orbsvcs/Notify/Consumer.inl:
-        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Delivery_Request.inl:
-        * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp:
-        * orbsvcs/orbsvcs/Notify/Event.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.inl:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request.inl:
-        * orbsvcs/orbsvcs/Notify/Method_Request.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
-        * orbsvcs/orbsvcs/Notify/Object.h:
-        * orbsvcs/orbsvcs/Notify/Peer.inl:
-        * orbsvcs/orbsvcs/Notify/Peer.cpp:
-        * orbsvcs/orbsvcs/Notify/Property.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
-        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
-        * orbsvcs/orbsvcs/Notify/Topology_Loader.h:
-        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
-
-          My previous checkin caused problems depending on the compiler
-        and the setting for __ACE_INLINE__. I took the opportunity to
-        clean up the #includes a little, and hopefully this fixes the
-        compile errors on all platforms.
-
-Tue Jul 19 19:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer_Registry_Impl.cpp:
-          Fixed emulated exception error
-
-Tue Jul 19 10:26:03 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
-
-          When parse error occurs flush input buffer so a subsequent parse
-          does not see tokens from the current one.
-
-Tue Jul 19 10:21:05 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp:
-        * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp:
-        * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp.diff:
-        * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp.diff:
-
-          When parse error occurs flush input buffer so a subsequent parse
-          does not see tokens from the current one.
-
-Tue Jul 19 10:21:17 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Admin.cpp:
-        * orbsvcs/orbsvcs/Notify/Builder.cpp:
-        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
-        * orbsvcs/orbsvcs/Notify/Object.h:
-        * orbsvcs/orbsvcs/Notify/Object.cpp:
-
-          Fix some problems with compilers that use early template
-        instantiation.
-
-        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp:
-
-          Fix a warning about signed/unsigned comparison.
-
-Tue Jul 19 15:52:19 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/Union_TypeCode.cpp:
-
-          Put unreachable code back with ACE_NOTREACHED macro to fix
-          warning on Redhat implicit templates build.
-
-Tue Jul 19 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Register_Initial_References/*
-          Added a new regression for register_initial_references on the ORB
-          and the ORBInitInfo. It seems we have some bugs to resolve. This is
-          to test for bugzilla bug 2087
-
-Tue Jul 19 13:14:51 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-
-          Fixed error in generation of inheritance list for impl
-          class declaration. Thanks to Steven Hattons
-          <hattons@globalsymmetry.com> for reporting the bug.
-
-Tue Jul 19 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-          Fixed bug when generating the implementation class, I removed
-          the base RefCountServantBase generation, but then also public
-          virtual shouldn't be generated. Thanks to Steven T. Hatton
-          <hattons at globalsymmetry dot com> for bringing this to my
-          attention.
-
-Tue Jul 19 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer_Registry_Impl.{h,cpp}:
-          Use a recursive mutex instead of a normal mutex to allow an
-          ORBInitializer to register another ORBInitializer during
-          pre/post init. Also use the mutex in the fini method to
-          prevent race conditions there. This fixes bugzilla bug
-          2089.
-
-Tue Jul 19 12:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjectKey_Table.cpp:
-          Removed explicit templates
-
-        * tao/ORB.cpp:
-        * tao/ORBInitializer_Registry_Adapter.h:
-        * tao/PI/ORBInitializer_Registry_Impl.{h,cpp}:
-          Change the interface to the ORBInitializer_Registry related to
-          bugzilla bug 2089. An ORBInitializer can register another
-          ORBInitializer during pre_init/post_init. I found that when
-          during pre_init a new ORBInitializer is registered, this is called
-          during post_init directly, but that shouldn't happen, the new
-          one should only be called when another ORB is initialized.
-          Changed the interface to the registry in such a way the pre_init
-          returns the number of initializers called, this is then passed
-          to post_init so that we only invoke the number of initializers
-          that where called during pre_init.
-
-        * tao/tests/Portable_Interceptors/Recursive_ORBInitializer/*:
-          New regression to test an ORBInitializer that registers
-          itself another ORBInitializer
-
-Tue Jul 19 11:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Bug_2088/client.cpp:
-          Rewrote this test to test the draft 3.1 spec behaviour which
-          matches the current implementation. The 3.0.3 behaviour about
-          which I made this report doesn't seem usable for end users.
-          Fixes bugzilla bug 2088
-
-Tue Jul 19 11:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/Gateway_i.cpp:
-          Initialise pointer with 0
-
-        * tao/Object_Loader.cpp:
-        * tao/NVList.cpp:
-          Removed explicit templates
-
-Tue Jul 19 10:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor_Adapter_Factory.{h,cpp}:
-          Added virtual destructor to fix gcc4 runtime error
-
-Tue Jul 19 10:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
-          Simplified this MPC file
-
-Tue Jul 19 10:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/Server_Request.h:
-        * tao/DynamicInterface/Request.h:
-          Fixed documentation typo
-
-        * tao/DynamicInterface/Server_Request.cpp:
-          Use prefix operators for the refcount
-
-        * tao/DynamicInterface/Context.{h,cpp}:
-        * tao/True_RefCount_Policy.{h,inl}:
-        * tao/Principal.{h,cpp,i}:
-        * tao/NVList.{h,cpp}:
-          Use ACE_Atomic_Op for the refcount
-
-        * tao/Synch_Refcountable.{h,cpp,inl}:
-        * tao/Utils/Synch_Refcountable.{h,cpp,inl}:
-          Moved TAO_Synch_Refcountable to the Utils lib, it is a utility
-          class and not used anywhere in the complete TAO distribution
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Updated for change above
-
-Tue Jul 19 09:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Object.cpp:
-          Fixed the _non_existent to catch a OBJECT_NOT_EXIST and then return
-          true.
-
-        * tao/PortableServer/Servant_Base.cpp (_non_existent) :
-          Return false instead of 0
-
-        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
-          Removed try/catch. This is done in CORBA::Object.
-
-          This fixes bugzills 2174. Thanks to Torsten Kuepper
-          <torsten dot kuepper at nokia dot com> for reporting this
-
-Mon Jul 18 14:53:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Changed to compute size of log record only once.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Update for below change.
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-
-          Changed TAO_LogRecordStore::log()'s log record parameter to a
-          const reference.
-
-          Prior to this change, TAO_Log_i::write_recordlist() copied the
-          indexed record (from the list) to a temporary before invoking
-          TAO_LogRecordStore::log(), since that updated the id and time-
-          stamp fields.  Since this is not always true with dynamically
-          loaded strategies, we make the concrete LogRecordStore class
-          do the copy.
-
-Mon Jul 18 13:12:15 2005  Ciju John  <john_c@ociweb.com>
-
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-
-        Linked in the ValueType library to the NamingService. This is
-        required in case the event embedds a valuetype. The event body
-          consists of several CORBA anys. The current implementation
-          demarshalls an any before touching app code. Thus if the any
-          were to contain a valuetype, the valuetype library will be
-          called upon to demarshall the data.
-
-Mon Jul 18 15:34:01 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/DynamicInterface/DII_Invocation.cpp:
-        * tao/PI_Server/PI_Server_Loader.cpp:
-        * tao/Union_TypeCode.cpp:
-        * tao/Union_TypeCode_Static.cpp:
-        * tests/Bug_1020_Basic_Regression/Server_Task.cpp:
-
-          Removed unreachable statements identified by HP non stop
-          MIPS build warnings.
-
-Mon Jul 18 14:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2174_Regression/client.cpp:
-          Don't print the transient exception, this is expected
-
-        * tests/Bug_2174_Regression/server.cpp:
-          Removed commented out code
-
-Mon Jul 18 09:20:46 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Added notes about codeset refactoring.
-
-Mon Jul 18 14:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Any_Impl.cpp:
-          Fixed crash in Any cleanup
-
-Mon Jul 18 15:05:03 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
-
-          Fixed a bunch of warnings.
-
-Mon Jul 18 08:13:14 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Admin.cpp:
-
-          Attempt to fix compile errors on Irix resulting from partially
-        defined types.
-
-Mon Jul 18 05:15:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          #include "ace/OS_NS_sys_time.h" to bring ACE_OS::gettimeofday()
-          definition into scope for noinline builds.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp:
-
-          #include "ace/Auto_Ptr.h" to bring auto_ptr<> template into
-          scope for noinline builds.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-
-          #include "ace/OS_NS_stdio.h" to bring ACE_OS::sprintf()
-          definition into scope for noinline builds.
-
-Mon Jul 18 06:53:00 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-
-          Fixed a bug where using reference_to_servant() with the
-          DefaultServant strategy incremented the reference count by two
-          instead of one.
-
-        * tests/POA/Default_Servant/Default_Servant.cpp:
-
-          Added tests to check that the reference count is correctly
-          maintained when using reference_to_servant() with the Root POA
-          and the Default Servant POA.
-
-Mon Jul 18 08:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Any_Impl.{h,cpp}:
-        * tao/LocalObject.{h,cpp,i}:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/Valuetype/ValueFactory.{h,cpp}:
-          Use ACE_Atomic_Op for the refcount
-
-Mon Jul 18 08:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Codeset_Descriptor_Base.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-          Fixed fuzz errors
-
-Sun Jul 17 18:57:26 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp (operator):
-
-          Fixed a typo resulting from an earlier edit.
-
-Sun Jul 17 16:39:01 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset_Descriptor_Base.h:
-        * tao/Codeset_Manager.cpp:
-        * tao/Codeset_Manager.h:
-        * tao/Codeset_Manager_Factory_Base.cpp:
-        * tao/Codeset_Manager_Factory_Base.h:
-        * tao/Makefile.am:
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/Resource_Factory.cpp:
-        * tao/Resource_Factory.h:
-        * tao/default_resource.cpp:
-        * tao/default_resource.h:
-        * tao/tao.mpc:
-        * tao/Codeset/Codeset_Manager_Factory.cpp:
-        * tao/Codeset/Codeset_Manager_Factory.h:
-        * tao/Codeset/Codeset_Manager_i.cpp:
-        * tao/Codeset/Codeset_Manager_i.h:
-        * tao/Codeset/Codeset_Translator_Factory.cpp:
-        * tao/Codeset/UTF16_BOM_Translator.cpp:
-        * tao/Codeset/Codeset_Descriptor.cpp:
-        * tao/Codeset/Codeset_Descriptor.h:
-
-          Moved the remaining codeset-specific details out of the ORB core
-          and into TAO_Codeset. This is accomplished by moving the codeset
-          descriptor interface out of the Resource_Factory.h and making it
-          accessible only through the Codeset_Manager interface. This
-          means that the codeset manager must be created earlier in
-          the start-up if the library is available. If one assumes that
-          specifying a native [w]char codeset, or translators in the
-          svc.conf file, one expects to use codeset negotiation, then this
-          earlier loading is not a problem. If no codeset configuration is
-          supplied and -ORBNegotiateCodesets 0 is supplied to ORB_init,
-          then the TAO_Codeset library will not be loaded.
-
-          With static linked applications, if TAO_Codeset is not linked in
-          and tao/Codeset/Codeset.h is not included, then any codeset
-          specific configuration is ignored by the resource factory.
-
-          This change requires regenerating makefiles for TAO and
-          TAO_Codeset. If rebuilding in an existing workspace, rebuilding
-          dependencies for these libraries is recommended.
-
-
-Sat Jul 16 18:01:26 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Changed init() method to not set the administrative and
-          forwarding states, since those may be from a persistent
-          data store.
-
-Sat Jul 16 17:48:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp
-
-          Remove stray ACE_DEBUGs.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Fix inverted conditional in set_administative_state().
-
-Sat Jul 16 17:17:30 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Changed log record to use log_record_size() instead of sizeof()
-          when checking whether log is full.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Use the thread-safe interface pattern for remove() method.
-          Change all callers who already have the write lock to call
-          new remove_i() method.  Avoids deadlock found by unit test.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Changed flush method to invoke flush on log record store.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h
-
-          Added flush method to ensure log records have been written
-          to persistent media.
-
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-
-          Make remove_old_records public so it can be called by log
-          compaction timer.
-
-        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp:
-
-          Changed to invoke remove_old_records() on log now that
-          Hash_LogRecordStore is protected by read/write locks.
-
-Sat Jul 16 15:46:21 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
-
-          Refactor identical code to create the factory and log channel
-          POAs out of *LogFactory_i and into base class TAO_LogMgr_i.
-
-Sat Jul 16 14:46:36 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Hash_LogRecordStore.cpp:
-
-          Add missing read/write guards.
-
-        * orbsvcs/orbsvcs/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Hash_LogRecordStore.h:
-        * orbsvcs/orbsvcs/Hash_LogRecordStore.cpp:
-
-          Suppored emulated exceptions on all LogRecordStore methods.
-
-        * orbsvcs/orbsvcs/Log_Persistence_Strategy.h:
-        * orbsvcs/orbsvcs/LogStore.h:
-
-          New files that should have been committed as part of:
-          Fri Jul 15 17:01:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Sat Jul 16 16:12:04 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp (dispatch):
-          Don't put the ACE_GUARDs in the TAO_GroupId*::operator() methods.
-          Thanks to J.T. for noticing this.
-
-Sat Jul 16 18:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/Request.inl:
-          Added include of NVList.h to fix compile errors in builds with
-          inlining enabled
-
-Sat Jul 16 10:24:36 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.{cpp,h}: Added
-          a lock to prevent race conditions.  Thanks to Frank Hunleth
-          <frank@hunleth.com> and Felix Perez Alamillo
-          <fpalamillo@indra.es> for helping with this.
-
-Sat Jul 16 02:18:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-
-          Changed code generation of the _boxed_out() method for
-          boxed array types to return the type of the valuebox
-          member's .out() method. The _boxed_out() method previously
-          returned the member's .inout() method, which could
-          potentially cause a memory leak if the member _var's
-          contained pointer is non-zero when _boxed_out() is
-          called.
-
-Fri Jul 15 17:01:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-
-          Added Hash_Persistence_Strategy.*, Hash_LogStore.*, and
-          Hash_LogRecordStore.* to DsLogAdmin_Serv project.
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-
-          Use dynamically loaded persistence strategy to create
-          LogStore.
-
-        * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h:
-        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h:
-
-          New TAO_Log_Persistence_Strategy abstract base class which
-          strategizes the log parameter and log record storage, with
-          concrete TAO_Hash_Persistence_Strategy.h implementation.
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
-        * orbsvcs/orbsvcs/Log/LogStore.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogStore.h:
-
-          Refactor LogMgr_i class so it bridges to new LogStore abstract
-          base class, with concrete TAO_Hash_LogStore implementation.
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h:
-        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h:
-
-          Refactor TAO_LogRecordStore class into an abstract base class
-          with a concrete TAO_Hash_LogRecordStore implementartion.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (write_recordlist):
-
-          Throw DsLogAdmin::LogOffDuty if log is off duty.
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-
-          Use poa_ instead of _default_POA for collocated event channel.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-
-          Update callers.
-
-        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-
-          Added poa_ member variable.
-
-          Changed constructor to take poa parameter.
-
-          Changed destroy to use poa_ member variable instead of using
-          _default_POA(), since there are now multiple POAs in play.
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-
-          Update callers.
-
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (object_creation):
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-
-           Removed unused Log argument.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
-
-          Create persistent POAs for the log factory and log channels.
-
-          Activate factory and log channel objects explicitly instead
-          of using _this().
-
-          Fix assorted resource leaks, unchecked emulated exceptions.
-
-Fri Jul 15 16:17:34 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/Options.html:
-        * tao/Codeset_Manager.cpp:
-        * tao/Codeset_Manager.h:
-        * tao/Makefile.am:
-        * tao/ORB_Core.cpp:
-        * tao/orbconf.h:
-        * tao/tao.mpc:
-        * tao/Codeset/Codeset.cpp:
-        * tao/Codeset/Codeset_Manager_Factory.cpp:
-        * tao/Codeset/Codeset_Manager_Factory.h:
-        * tao/Codeset/UTF16_BOM_Factory.cpp:
-        * tao/Codeset/UTF8_Latin1_Factory.cpp:
-
-          Another round of changes to reconcile the differences between
-          static and dynamic libraries. Static applications must
-          explicitly link libTAO_Codeset and include "tao/Codeset/Codeset"
-          to enable codeset support. Failing to do the include will cause
-          none of the TAO_Codeset code to actually link. Thus merely
-          adding -lTAO_Codeset to the link line is benign if no codeset
-          support is desired. The link line is modified automatically for
-          MPC projects depending on taoexe if the negotiate_codesets
-          feature is enabled in default.features.
-
-Fri Jul 15 11:00:03 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-
-          Fixed platform-specific errors.
-
-Fri Jul 15 08:48:55 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-
-          Fixed platform-specific errors.
-
-Fri Jul 15 17:18:44 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-
-          Fixed a number of warnings.
-
-Fri Jul 15 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.h:
-          Added forward declaration NVList
-
-        * tao/tao.mpc:
-        * tao/extra_core.mpb:
-          Moved ClientRequestInterceptor_Adapter and ServerRequestInterceptor_
-          Adapter to extra_core, don't need them in a minimum build. Removed
-          tao.mpc from tao.mpv, it is already in extra_core.mpb
-
-Fri Jul 15 13:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/Context.cpp:
-        * tao/DynamicInterface/DII_Invocation.cpp:
-        * tao/DynamicInterface/Request.{h,cpp}:
-        * tao/DynamicInterface/Server_Request.{h,cpp,inl}:
-          Use more forward declarations and reduced the includes done, doxygen
-          improvement and removed explicit templates
-
-Fri Jul 15 11:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/NVList.cpp:
-          Initialise pointers with 0
-
-Fri Jul 15 10:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Any.h:
-          Removed not needed forward declaration of CORBA_NVList
-
-Thu Jul 14 22:15:02 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset/Codeset.cpp:
-        * tao/Codeset/Codeset.h:
-        * tao/Codeset/Codeset_Manager_Factory.cpp:
-        * tao/Codeset/Codeset_Manager_Factory.h:
-        * tao/Codeset/Codeset_Manager_i.cpp:
-        * tao/Codeset/Codeset_Manager_i.h:
-
-          Separated the classes responsible for initailizing the codeset
-          library from the codeset manager implementation. This is an
-          effort to improve the integration with either static or shared
-          libraries.
-
-        * tao/Makefile.am:
-
-          Added the new files mentioned above.
-
-        * tao/orbconf.h:
-
-          Changed the default for codeset negotiation to be 0 for static
-          builds.
-
-Thu Jul 14 22:52:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/PortableServer/Fixed_Array_SArgument_T.h:
-        * tao/PortableServer/Fixed_Array_SArgument_T.inl:
-
-          Changed the Fixed_Array_SArg_Traits_T typedef
-          'out_arg_type' for fixed arrays to
-          be <array>_slice* instead of <array>_slice*&, and
-          changed the Out_Fixed_Array_SArgument_T::arg() method
-          to return a slice pointer instead of a slice pointer
-          reference. Since the array is of fixed size, the slice
-          pointer can be declared on the stack, and no heap
-          allocation is necessary, for an OUT arg of this type on
-          the skeleton side. Thanks to Chad Elliott
-          <elliott_c@ociweb.com> for pointing this out.
-
-Thu Jul 14 15:04:41 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-Thu Jul 14 21:42:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/performance.html:
-
-          Updated section on ways to reduce compile-time footprint.
-
-Thu Jul 14 12:20:59 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Codeset.mpc:
-
-          Added PIDL_Files and Resource_Files definitions so that bogus
-          definitions aren't added to the project.
-
-Thu Jul 14 10:51:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
-
-          Add *_IDL projects for compiling *.idl files.  This eliminates
-          duplicate rules that would otherwise result when Makefile.am's
-          are aggregated in the automake build.
-
-Thu Jul 14 08:38:48 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
-        * tests/OBV/ValueBox/Test_impl.cpp
-        * tests/OBV/ValueBox/client.cpp
-        * tests/OBV/ValueBox/server.cpp:
-
-          Fixed platform-specific errors.
-
-Thu Jul 14 09:06:53 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset/codeset_export.h:
-
-          Another round of fixes.
-
-Thu Jul 14 08:11:27 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset/codeset_export.h:
-        * tao/Codeset/Codeset_Manager_i.cpp:
-        * tao/Codeset/UTF16_BOM_Factory.cpp:
-        * tao/Codeset/UTF8_Latin1_Factory.cpp:
-        * tao/Codeset/UTF8_Latin1_Translator.cpp:
-
-          Fixed more platform-specific errors.
-
-Thu Jul 14 08:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.i:
-          Removed not needed ;
-
-Thu Jul 14 09:37:54 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-
-          Fixed a number of fuzz errors.
-
-Wed Jul 13 21:51:15 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/ORB_Core.h:
-
-          I forgot to take out the unneeded CORBA::Environment arg from
-          load_codeset_manager. This was caught by a No Exceptions build.
-
-Wed Jul 13 16:46:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ETCL.mpc:
-
-          Added Header_Files, Inline_Files, and Template_Files sections
-          so headers and inlines are installed for the automake build.
-
-Wed Jul 13 16:37:41 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Codeset.mpc
-        * tao/Codeset_Manager.cpp
-        * tao/Codeset_Manager.h
-        * tao/Codeset_Translator_Base.cpp
-        * tao/Codeset_Translator_Base.h
-        * tao/Codeset_Translator_Factory.h
-        * tao/GIOP_Message_Base.cpp
-        * tao/GIOP_Message_Lite.cpp
-        * tao/IIOP_Acceptor.cpp
-        * tao/ORB_Core.cpp
-        * tao/ORB_Core.h
-        * tao/ORB_Core.i
-        * tao/Profile_Transport_Resolver.cpp
-        * tao/Resource_Factory.cpp
-        * tao/Resource_Factory.h
-        * tao/Transport.cpp
-        * tao/Transport.h
-        * tao/Transport.inl
-        * tao/default_resource.cpp
-        * tao/default_resource.h
-        * tao/orbconf.h
-        * tao/params.cpp
-        * tao/params.h
-        * tao/params.i
-        * tao/tao.mpc
-        * tao/Codeset/Codeset_Manager_i.cpp
-        * tao/Codeset/Codeset_Manager_i.h
-        * tao/Codeset/Codeset_Translator_Factory.cpp
-        * tao/Codeset/Codeset_Translator_Factory.h
-        * tao/Codeset/Codeset_Translator_Factory_T.cpp
-        * tao/Codeset/Codeset_Translator_Factory_T.h
-        * tao/Codeset/UTF16_BOM_Factory.cpp
-        * tao/Codeset/UTF16_BOM_Factory.h
-        * tao/Codeset/UTF16_BOM_Translator.cpp
-        * tao/Codeset/UTF16_BOM_Translator.h
-        * tao/Codeset/UTF8_Latin1_Factory.cpp
-        * tao/Codeset/UTF8_Latin1_Factory.h
-        * tao/Codeset/UTF8_Latin1_Translator.cpp
-        * tao/Codeset/UTF8_Latin1_Translator.h
-        * tao/Codeset/codeset_export.h
-
-          Refactored the support for codeset negotiation. All logic is now
-          maintained in a separate library, TAO_Codeset. The class
-          TAO_Codeset_Manager is now an abstract base class, providing the
-          interface, when needed, to the traditional codeset assignment
-          and translator selection functions. Since the instance of the
-          codeset manager is now optional, all places that reference it
-          must test for a non-null pointer. The initialization of the
-          codeset manager is now deferred. The resource factory now
-          populates a collection of codeset descriptors based on the
-          supplied configuration options. The ORB Core loads an instance
-          of the codeset manager on demand if the negotiate_codesets
-          option is set. The tao/Codeset_Translator_Factory.h file remains
-          as a shell to support backwards compatibility at the code level,
-          but the base class for the translators is now in the Codeset
-          library.
-
-        * tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
-        * tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
-
-          Added a reference to the new MPC base project, codeset.
-
-        * tests/CodeSets/simple/CodeSets_simple.mpc
-        * tests/CodeSets/simple/wcs_test.conf
-
-          Fixed misc. typos and odd dependancies.
-
-        * docs/Options.html:
-        * NEWS:
-
-          Added description of Codeset changes.
-
-Wed Jul 13 13:26:45 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * NEWS:
-
-          Added information about availability of the Boxed Value Type.
-
-Wed Jul 13 13:17:56 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tests/OBV/ValueBox/client.cpp:
-        * tests/OBV/ValueBox/run_test.pl:
-        * tests/OBV/ValueBox/server.cpp:
-        * tests/OBV/ValueBox/Test_impl.cpp:
-        * tests/OBV/ValueBox/Test_impl.h:
-        * tests/OBV/ValueBox/valuebox.idl:
-        * tests/OBV/ValueBox/valuebox.mpc:
-        * tests/OBV/ValueBox/vb_basic.idl:
-        * tests/OBV/ValueBox/vb_struct.idl:
-        * tests/OBV/ValueBox/vb_union.idl:
-
-          New test for valuebox feature
-
-Wed Jul 13 15:14:46 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * NEWS:
-
-          Added information about recent Notification Service changes.
-
-Wed Jul 13 18:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ServerRequestInterceptor_Adapter_Factory.{h,cpp}:
-        * tao/ClientRequestInterceptor_Adapter_Factory.{h,cpp}:
-          Added virtual destructor to resolve gcc4 runtime errors, the cpp
-          file is new
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Added new files
-
-        * tao/Thread_Lane_Resources_Manager.cpp:
-          Removed explicit templates
-
-Wed Jul 13 18:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Pollable.pidl:
-        * tao/PollableC.{h,cpp}:
-        * tao/PollableS.h:
-          Moved these files to the Messaging library
-
-        * tao/Messaging/*C.{h,cpp}:
-          Regenerated
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Updated because of file move above
-
-Wed Jul 13 12:53:34 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp:
-
-          Added a missing ACE_CHECK_RETURN.
-
-Wed Jul 13 16:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-          Updated some debug statements to get the same layout as in other places
-
-Wed Jul 13 11:18:44 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp:
-
-          Update the test to be more tolerant of differing thread behavior
-        on the various platforms.
-
-Wed Jul 13 10:24:39 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
-
-          Print an error if the registry option is used on a non-Windows OS.
-
-        * orbsvcs/examples/ImR/Advanced/run_test.pl:
-
-          When "using" Getopts::Long, take everything to be compatible with
-          Perl 5.6.1.
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-
-          Simplify the persistence project by using a wildcard.
-
-        * tao/ImR_Client/ImR_Client.h:
-        * tao/ImR_Client/ImR_Client.cpp:
-
-          Added a constructor to initialize the server_object_ pointer.
-
-        * tao/PortableServer/Root_POA.cpp:
-
-          Do not put the passed in POAManager in the safe_poa_manager as we
-          do not want it to be destroyed in case an exception is thrown
-          during the create_POA_i() method.
-
-Wed Jul 13 08:01:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
-
-          Fixed typo introduced in:
-          Tue Jul 12 17:12:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Wed Jul 13 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Encodable.{h,cpp}:
-        * tao/Utils/Encodable.{h,cpp}:
-          Moved Encodable from the TAO lib to the Utils lib. It is a utility
-          class that is not used in TAO and its tests. This way anyone using
-          it can keep using it.
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Updated for change above
-
-Wed Jul 13 12:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTCORBA/RT_ORB_Loader.cpp:
-          Create the _var later on the stack
-
-        * tao/RTCORBA/RT_ORBInitializer.cpp:
-          Initialise pointer
-
-        * tao/RTCORBA/RTCORBAC.h:
-          No need to derive ProtocolProperties from TAO_Encodable
-
-        * tao/RTCORBA/diffs/RTCORBA.diff:
-          Updated
-
-Wed Jul 13 10:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Acceptor.cpp:
-          Updated some debug statements so that they have the same formatting
-          as the other statements
-
-Wed Jul 13 10:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/performance.html:
-          Started with documenting the defines that have impact on runtime
-          footprint
-
-Tue Jul 12 17:43:55 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Tue Jul 12 17:12:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
-        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
-
-          Add *_IDL projects for compiling *.idl files.  This eliminates
-          duplicate rules that would otherwise result when Makefile.am's
-          are aggregated in the automake build.
-
-Tue Jul 12 13:39:21 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-
-          Make _IDL projects unconditional now that Chad has enhanced
-          MPC to support custom_only builds for VC++ projects.
-
-Tue Jul 12 18:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-          Fixed compile errors with msvc6
-
-Tue Jul 12 18:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
-          Added missing include
-
-Tue Jul 12 17:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.{h,cpp}:
-          Fixed compile errors
-
-Tue Jul 12 08:56:03 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-
-          Ensure that old exe files are deleted before new ones are copied in
-        the nt_service_ir test.
-          Make the nt_service_ir test fail more quickly when an error occurs.
-
-Tue Jul 12 08:33:05 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/RTCORBA/Banded_Connections/bands.irix:
-        * tests/RTCORBA/Banded_Connections/run_test.pl:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
-
-          Added support for IRIX.
-
-        * tests/RTCORBA/Collocation/continuous.conf:
-        * tests/RTCORBA/Collocation/continuous.conf.xml:
-        * tests/RTCORBA/Collocation/run_test.pl:
-        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf:
-        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml:
-        * tests/RTCORBA/Destroy_Thread_Pool/run_test.pl:
-        * tests/RTCORBA/Persistent_IOR/continuous.conf:
-        * tests/RTCORBA/Persistent_IOR/continuous.conf.xml:
-        * tests/RTCORBA/Persistent_IOR/run_test.pl:
-        * tests/RTCORBA/Persistent_IOR/server.cpp:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp:
-        * tests/RTCORBA/Server_Declared/continuous.conf:
-        * tests/RTCORBA/Server_Declared/continuous.conf.xml:
-        * tests/RTCORBA/Server_Declared/run_test.pl:
-        * tests/RTCORBA/Thread_Pool/continuous.conf:
-        * tests/RTCORBA/Thread_Pool/continuous.conf.xml:
-        * tests/RTCORBA/Thread_Pool/run_test.pl:
-
-          For HP-UX, the only priority mapping that makes sense is
-          continuous.  For each of these tests, I added a configurator file
-          to set the priority mapping and only use it on HP-UX.
-
-        * tests/RTCORBA/common_args.cpp:
-
-          sscanf wasn't working properly (at least with aCC 3.60) so I
-          switched to strtoul.
-
-Tue Jul 12 13:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/Persistent_IOR/client.cpp:
-          Added check for nil reference
-
-        * tao/Thread_Lane_Resources.cpp (cleanup_rw_transports):
-          If we are already finalized (transport_cache pointer is zero)
-          directly return.
-
-Tue Jul 12 13:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/Persistent_IOR/test.idl:
-          Made the shutdown call a oneway
-
-Tue Jul 12 12:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Thread_Lane_Resources.cpp:
-          Set pointers to zero after deleting them
-
-Tue Jul 12 12:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ClientRequestInfo.h:
-          Removed invalid export macro
-
-Tue Jul 12 11:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTCORBA/RT_ORB.cpp:
-          Initialise pointers with 0
-
-Tue Jul 12 11:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1639_Regression/test.mpc:
-          Simplified this mpc file
-
-Tue Jul 12 10:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
-          Don't build the client when minimum_corba is set
-
-        * tao/CONV_FRAME.pidl:
-        * tao/GIOP.pidl
-          Updated regeneration instructions
-
-        * tao/CONV_FRAMES_T.h:
-        * tao/GIOPS_T.h
-          Removed this file
-
-        * tao/ClientRequestInfo.{h,cpp}
-        * tao/ClientRequestInfo.pidl:
-        * tao/ClientRequestInfoA.cpp
-        * tao/ClientRequestInfoC.{h,cpp}:
-        * tao/ClientRequestInfoS.h:
-        * tao/PIForwardRequest.pidl
-        * tao/PIForwardRequestA.cpp
-        * tao/PIForwardRequestC.{h,cpp}:
-        * tao/PIForwardRequestS.h
-        * tao/RequestInfo.pidl
-        * tao/RequestInfoA.cpp:
-        * tao/RequestInfoC.{h,cpp}:
-        * tao/RequestInfoS.h:
-          These files are moved to the PI library
-
-        * tao/ClientRequestInterceptor_Adapter.h:
-          Don't pass TAO_ClientRequestInfo with each invocation,
-          an instance is allocated within the adapter implementation.
-          Also added a method to get the PortableInterceptor::ReplyStatus
-          from a TAO::Invocation_Base
-
-        * tao/Collocation_Resolver.cpp:
-        * tao/Protocol_Factory.cpp:
-        * tao/Protocols_Hooks.cpp:
-        * tao/Tagged_Components.cpp:
-          Removed explicit template instantiations
-
-        * tao/IIOP_Profile.h:
-        * tao/Profile.h:
-          Moved destructor to protected part to make sure an instance
-          is only removed by the _decr_refcnt
-
-        * tao/Invocation_Base.{h,cpp,inl}:
-          Reworked the invocation path to invoke the client request
-          interceptor when it is set and don't create a TAO_ClientRequestInfo
-          on the stack, this is done in the PI adapter. Store the invoke_status
-          and caught_exception as members in this class, this was done
-          previously in the TAO_ClientRequestInfo, but this is now not
-          used anymore in the TAO lib
-
-        * tao/MProfile.h:
-          Doxygen improvement
-
-        * tao/Makefile.am:
-          Updated because of moving of files
-
-        * tao/ORB_Core.h:
-          No need to forward declare TAO_ServerRequest
-
-        * tao/PortableInterceptor.pidl:
-        * tao/PortableInterceptorC.h:
-          Removed the files we moved to PI/PI_Server
-
-        * tao/ServerRequestInfo.pidl:
-        * tao/ServerRequestInfoA.cpp:
-        * tao/ServerRequestInfoC.{h,cpp}:
-        * tao/ServerRequestInfoS.h:
-          Moved to the PI_Server lib
-
-        * tao/ServerRequestInterceptor_Adapter.h:
-          Updated to not pass TAO_ServerRequestInfo with each call, pass
-          the difference exception info
-
-        * tao/Stub.{h,cpp}:
-          Removed service_profile_selection(), this was marked deprecated for
-          a long time.
-
-        * tao/Synch_Invocation.cpp:
-          Fixed incorrect emulated exception usage
-
-        * tao/TAO_Server_Request.{h,cpp,i}:
-          Added data members which where previous in TAO_ServerRequestInfo
-
-        * tao/Transport.{h,cpp,inl}:
-          Removed TAO_Transport_Refcount_Guard, not used
-
-        * tao/tao.mpc:
-          Updated
-
-        * tao/PI/ClientRequestInfo.{cpp,h}:
-        * tao/PI/ClientRequestInfo.pidl:
-        * tao/PI/ClientRequestInfoA.cpp"
-        * tao/PI/ClientRequestInfoC.{h,cpp}:
-        * tao/PI/ClientRequestInfoS.h:
-          These files moved here from the TAO core library
-
-        * tao/PI/ClientRequestInterceptor.pidl:
-          Updated includes because of moved files
-
-        * tao/PI/ClientRequestInterceptorA.cpp:
-        * tao/PI/ClientRequestInterceptorC.{h,cpp}:
-        * tao/PI/ClientRequestInterceptorS.h:
-          Regenerated
-
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.{h,cpp}:
-          Allocate a TAO_ClientRequestInfo on the stack for each
-          interception point and updated for base interface
-
-        * tao/PI/InterceptorA.cpp
-        * tao/PI/InterceptorC.{h,cpp}:
-        * tao/PI/InterceptorS.h:
-        * tao/PI/ORBInitInfoA.cpp:
-        * tao/PI/ORBInitInfoC.{h,cpp}:
-        * tao/PI/ORBInitInfoS.h:
-        * tao/PI/ORBInitializerA.cpp:
-        * tao/PI/ORBInitializerC.{h,cpp}:
-        * tao/PI/ORBInitializerS.h:
-          Regenerated
-
-        * tao/PI/PI.h:
-          Include new *C.h files
-
-        * tao/PI/PIForwardRequest.pidl
-        * tao/PI/PIForwardRequestA.cpp
-        * tao/PI/PIForwardRequestC.{h,cpp}:
-        * tao/PI/PIForwardRequestS.h:
-        * tao/PI/RequestInfo.pidl:
-        * tao/PI/RequestInfoA.cpp:
-        * tao/PI/RequestInfoC.{h,cpp}:
-        * tao/PI/RequestInfoS.h:
-          Moved from the TAO lib
-
-        * tao/PI_Server/PI_Server.h:
-          Added new *C.h files
-
-        * tao/PI_Server/ServerInterceptorAdapter.{h,cpp}:
-          Allocate a TAO_ServerRequestInfo for each interception point
-
-        * tao/PI_Server/ServerRequestInfo.{h,cpp,inl}:
-        * tao/PI_Server/ServerRequestInfo.pidl:
-        * tao/PI_Server/ServerRequestInfoA.cpp:
-        * tao/PI_Server/ServerRequestInfoC.{h,cpp}:
-        * tao/PI_Server/ServerRequestInfoS.h:
-          Moved from the PortableServer lib
-
-        * tao/PI_Server/ServerRequestInterceptor.pidl:
-          Updated includes
-
-        * tao/PI_Server/ServerRequestInterceptorC.h:
-          Regenerated
-
-        * tao/PortableServer/Basic_SArguments.cpp:
-        * tao/PortableServer/Special_Basic_SArguments.cpp:
-        * tao/PortableServer/UB_String_SArguments.cpp
-          Removed, not needed
-
-        * tao/PortableServer/ServerRequestInfo.{h,cpp,inl}:
-          Moved to the PI_Server lib
-
-        * tao/PortableServer/Local_Servant_Base.inl:
-          Removed commented out code
-
-        * tao/PortableServer/ORT_Adapter.cpp:
-        * tao/PortableServer/ORT_Adapter_Factory.cpp:
-        * tao/PortableServer/StrategyFactory.cpp:
-          Removed explicit templates
-
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-          Updated code because of changes ServerRequestInterceptor
-          adapter change
-
-        * tao/RTCORBA/RT_ORBInitializer.cpp:
-          Initialise pointer with 0
-
-        * tao/RTScheduling/RTScheduler.pidl:
-          Updated include
-
-        * tao/RTScheduling/RTSchedulerC.h:
-          Regenerated
-
-        * tests/Big_Twoways/Peer.cpp:
-          Initialise pointer with 0
-
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h:
-          Added needed include
-
-Mon Jul 11 13:39:34 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-
-          Updated to solve cross platform compilation problems.
-
-Mon Jul 11 21:08:17 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Gate/Export.h:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.mpc:
-
-        Added export macro.
-
-Mon Jul 11 09:07:26 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Admin.cpp:
-
-          Add missing include of Event_Manager.h
-
-Mon Jul 11 07:23:49 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-
-          Set the stack size for windows based project types to 16Mb to
-          allow this test to complete on Windows.
-
-Mon Jul 11 11:12:42 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-
-          Add explicit return statements to main (which is renamed
-          to ace_main_i and, as a result, doesn't have proper main
-          semantics).
-
-Mon Jul 11 08:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-          Removed not needed base projects
-
-Mon Jul 11 08:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-          Simplified this mpc file
-
-        * tests/Bug_2174_Regression/*:
-          New regression for bug 2174. _non_existent should return
-          true/false, not raise OBJECT_NOT_EXIST. Thanks to
-          Torsten Kuepper <torsten dot kuepper at nokia dot com>
-          for making this regression. The bugfix for this will follow
-          later this week.
-
-Fri Jul  8 12:59:38 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl:
-
-          Added a sleep(1) at the end of this script to allow the socket to
-          get flushed before the process exits.  On windows, the socket data
-          is lost if the socket isn't flushed by the OS before the process
-          completes.
-
-Fri Jul  8 11:15:00 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/lib/PushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/PushSupplier.cpp:
-        * orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp:
-        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp:
-
-          Add NOT_USED where appropriate to exception macros.
-
-Fri Jul  8 16:03:46 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-
-          Made the code compile on platforms with emulated exceptions.
-
-Fri Jul  8 14:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Cache_Manager.h:
-          Removed virtual from destructor, no need for this.
-
-Fri Jul  8 15:32:36 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-
-          Changed all references to TAO_Notify_Service:init to read
-          init_service because somebody decided for some reason to
-          rename this function. Also made the code compilable by VC6.
-
-Fri Jul  8 12:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/LocalObject.cpp:
-          Removed some remarks about possible corba spec mismatch. Checked
-          the latest corba spec and we throw the correct error
-
-Fri Jul  8 12:20:47 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Bug_2183_Regression/server.conf:
-
-          Used the wrong comment character in this file.
-
-Thu Jul  7 16:29:47 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
-
-          Cleanup the output when enqueueing fails.
-
-Thu Jul  7 15:39:54 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml:
-
-          Fix test failure due to premature orb->shutdown().
-          Update conf files to reflect changes in Notify options.
-
-Thu Jul 07 12:46:22 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/fe/idl.ll
-        * TAO_IDL/fe/lex.yy.cpp
-        * TAO_IDL/fe/lex.yy.cpp.diff
-
-          Added to regular expression for IDL_STRING_LITERAL and
-          IDL_WSTRING_LITERAL to allow additional escape sequences
-          specified by OMG.
-
-Thu Jul  7 19:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/performance.html:
-          Added some info about how to reduce compilation footprint
-
-Thu Jul  7 19:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTScheduling/Current.cpp:
-          Fixed conversion warning
-
-Thu Jul  7 11:33:09 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB_Table.inl (operator==):
-
-          Improved slightly by adding a TAO_ORB_Core pointer equality
-          check.
-
-Thu Jul  7 11:23:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB_Table.inl (ORB_Core_Ref_Counter):
-
-          Fixed seg faults caused by calling methods through a nil
-          TAO_ORB_Core pointer by verifying that the pointer is non-nil
-          before doing so.  Thanks to Johnny for pointing out the
-          corresponding crash.
-
-Thu Jul  7 18:13:24 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
-        * TAO_IDL/util/utl_global.cpp (string_to_scoped_name):
-
-          Minor fix to the logic of string_to_scoped_name(), and
-          removed the "malformed scoped name string" error since
-          the lookup now catches it if it's incorrect.
-
-Thu Jul  7 16:56:55 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/ORB_Core.cpp:
-        * tao/params.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/IIOP_Connection_Handler.cpp:
-
-          Add configuration property '-ORBNoServerSideNameLookups' so
-          that server side client name lookups can still be prevented
-          when '-ORBDottedDecimalAddresses 1' is not used.
-
-        * docs/Options.html:
-
-          Document the above.
-
-Thu Jul  7 10:01:26 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Builder.cpp:
-        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp:
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.h:
-        * orbsvcs/tests/Notify/Basic/Events.h:
-        * orbsvcs/tests/Notify/Basic/Filter.h:
-        * orbsvcs/tests/Notify/Basic/MultiTypes.h:
-        * orbsvcs/tests/Notify/Basic/Sequence.h:
-        * orbsvcs/tests/Notify/Basic/Simple.h:
-        * orbsvcs/tests/Notify/Basic/Updates.h:
-        * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Reconnecting/Consumer.h:
-        * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h:
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h:
-        * tests/Bug_2183_Regression/Hello.h:
-
-          Fix problems with ACE exception macros and fuzz errors.
-
-Thu Jul  7 15:18:01 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * orbsvcs/examples/Notify/Federation/federation.mwc:
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
-        * orbsvcs/examples/Notify/Federation/Agent/Agent.mpc:
-        * orbsvcs/examples/Notify/Federation/Agent/README:
-        * orbsvcs/examples/Notify/Federation/Agent/agent.dia:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
-        * orbsvcs/examples/Notify/Federation/Gate/Gate.mpc:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/README:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc:
-
-          Added a set of examples and support code that show how to set
-          up a multicast-based federation of  Notification Services.
-
-        * NEWS:
-
-          Announce new examples.
-
-Thu Jul  7 11:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core_TSS_Resources.cpp:
-          Removed not needed include
-
-Thu Jul  7 08:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Basic_Arguments.cpp:
-        * tao/Special_Basic_Arguments.cpp:
-        * tao/UB_String_Arguments.cpp:
-          Removed these files
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Updated for changes above
-
-        * tao/Object.cpp (_get_orb):
-          Updated to comply with coding guidelines. Thanks to Ossama to
-          point out a few minor items
-
-Wed Jul  6 23:10:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Object_Ref_Table.cpp (bind):
-
-          "Transfer" ownership of the object reference being inserted to the
-          object reference table by increasing the reference count.
-          Addresses seg faults in code that accesses object references
-          from the this table.
-
-Wed Jul  6 15:06:17 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
-        * orbsvcs/tests/Notify/Blocking/common.cpp:
-        * orbsvcs/tests/Notify/Discarding/common.cpp:
-        * orbsvcs/tests/Notify/Ordering/common.cpp:
-        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp:
-        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
-        * orbsvcs/tests/Notify/lib/Task_Stats.inl:
-        * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
-
-          Some ACE_*_cast macros were inadvertently reintroduced when porting notification
-        service fixes from 1.4a.
-
-Wed Jul  6 12:15:49 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Object_Ref_Table.h (TAO_Object_Ref_Table):
-
-          Re-exported this class until code that accesses it directly is
-          updated to use the standard interface.
-
-        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
-        * tao/RTScheduling/Current.cpp:
-        * tao/RTScheduling/RTScheduler_Manager.i:
-
-          Reverted changes below due to potential order of initialization
-          problems.
-
-Wed Jul  6 11:06:22 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
-        * tao/RTScheduling/Current.cpp:
-        * tao/RTScheduling/RTScheduler_Manager.i:
-
-          Register and retrieve initial references through the standard
-          ORB interface, not directly through the underlying table.  The
-          table is no longer exported.
-
-Wed Jul 06 10:48:04 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/include/ast_expression.h:
-
-          Fix for broken mod (%) operator in constant expressions.
-
-Wed Jul  6 08:11:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp (create_with_id):
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (create_with_id):
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp (create_with_id):
-
-          Fix cut-n-pasto introduced in:
-          Tue Jul  5 18:01:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Wed Jul  6 15:44:16 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/IIOP_Connection_Handler.cpp (open):
-
-          Set server side sockets to be non-blocking even if the
-          client connection policy is blocking. This fixes bugzilla
-          #2183.
-
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-        * tests/Bug_2183_Regression/Hello.cpp:
-        * tests/Bug_2183_Regression/Hello.h:
-        * tests/Bug_2183_Regression/README:
-        * tests/Bug_2183_Regression/Test.idl:
-        * tests/Bug_2183_Regression/client.cpp:
-        * tests/Bug_2183_Regression/hang_client.pl:
-        * tests/Bug_2183_Regression/run_test.pl:
-        * tests/Bug_2183_Regression/server.conf:
-        * tests/Bug_2183_Regression/server.cpp:
-
-          Added regression test for the above.
-
-Wed Jul  6 09:47:47 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/Event.inl:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp:
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.h:
-
-          Fix misc problems with exception macros.
-          Fix problem with renamed init() method.
-          Fix problem with use of ACE_Thread_Mutex instead of TAO_SYNCH_MUTEX.
-
-Tue Jul  5 18:01:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp (create_with_id):
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp (create_with_id):
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (create_with_id):
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp (create_with_id):
-
-          Throw DsLogAdmin::InvalidLogFullAction when passed an
-          unknown/unsupported log full action.
-
-Tue Jul  5 17:22:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp (create_with_id):
-
-          Uncomment ACE_CHECK_RETURN(...) after call to object_creation()
-          to align behavior between native and emulated exceptions and to
-          match cooresponding checks in NotifyLogFactory_i.cpp and
-          RTEventLogFactory_i.cpp.
-
-Tue Jul  5 17:06:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (set_log_full_action):
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-
-          Throw DsLogAdmin::InvalidLogFullAction when passed an
-          unknown/unsupported log full action.
-
-Tue Jul  5 23:03:27 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-
-          - Added a check to code that converts a string to a
-            ScopedName class in the IDL compiler. The check
-            detects certain kinds (not all) of malformed strings.
-
-          - Fixed a bug in the string handling code that processes
-            a #pragma ID directive. There was confusion if the
-            target node name was not scoped (contained no double
-            colon) but the ID string did.
-
-          Thanks to Gar Maxey <gary.maxey@hp.com> for sending in
-          the example IDL file that uncovered these problems.
-
-Tue Jul  5 14:12:07 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-
-          Cleanup generated files such as IORs and the copy of the server
-          executable.
-
-Tue Jul 05 11:49:13 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/StringValueC.inl:
-
-          Avoid error when compiling with HPUX compiler.
-
-Tue Jul  5 10:15:29 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp:
-
-          Ensure that OS_NS_unistd.h is included where we use ACE_OS::unlink().
-
-Tue Jul  5 07:48:44 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
-
-          Fix case of include for tao/TypeCode.h
-
-Tue Jul  5 07:41:12 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/Basic/AdminProperties.cpp:
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp:
-        * orbsvcs/tests/Notify/Basic/Events.cpp:
-        * orbsvcs/tests/Notify/Basic/MultiTypes.cpp:
-        * orbsvcs/tests/Notify/Basic/Sequence.cpp:
-        * orbsvcs/tests/Notify/Basic/Simple.cpp:
-        * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/go.idl:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl:
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp:
-        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
-
-          Fix misc problems with use of ACE_ENV macros.
-          Add missing go.idl files
-
-Tue Jul  5 03:07:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/CORBA_String.h:
-        * tao/CORBA_String.inl:
-
-          Added TAO-specific equality operators.  Allows
-          CORBA::{W}String_var to be used as map key.
-
-        * tao/ORB.cpp (resolve_initial_references):
-
-          The initial reference map is now an ACE_Array_Map, which
-          implements an STL-like map interface.  Updated map iteration
-          accordingly.
-
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Table.cpp:
-        * tao/ORB_Table.h:
-        * tao/ORB_Table.inl:
-        * tao/Object_Ref_Table.cpp:
-        * tao/Object_Ref_Table.h:
-        * tao/Object_Ref_Table.inl:
-        * tao/params.cpp:
-        * tao/params.h:
-        * tao/params.i:
-
-          Replaced ACE_Hash_Map_Manager_Ex usage with light weight
-          ACE_Array_Map.  Hash map benefits were not worth the larger
-          footprint.
-
-          Inlined a number very small functions.  Reduces footprint.
-
-        * tao/Object_Ref_Table.h (TAO_Object_Ref_Table):
-
-          Do not export this class from the TAO shared library.  It is
-          meant for internal use alone.
-
-        * tao/ORB_Core_Auto_Ptr.h (TAO_ORB_Core_Auto_Ptr):
-
-          Uncommented "explicit" constructor keyword.  Support for it has
-          been required in ACE and TAO for a while now.
-
-        * tao/Makefile.am (nobase_include_HEADERS):
-
-          Added new Object_Ref_Table.inl inline soure file.
-
-Mon Jul  4 18:56:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/PortableGroup/MIOP.h:
-          Added closing } that was removed by accident earlier today
-
-Mon Jul  4 14:34:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
-          Fixed compile error
-
-Mon Jul  4 14:12:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.h:
-        * tao/params.h:
-        * tao/Server_Strategy_Factory.h:
-          Removed not needed forward declarations
-
-Mon Jul  4 13:52:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Stub.h:
-          Removed not needed forward declarations
-
-Mon Jul  4 13:42:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/orb_types.pidl:
-          Don't use -GA with regeneration, we then get an A.cpp with contents
-          but the C.cpp file is empty, so just generate everything in C.cpp
-
-        * tao/orb_typesC.{h,cpp}:
-        * tao/orb_typesS.h:
-          Regenerated
-
-        * tao/orb_typesA.cpp:
-          Removed
-
-        * tao/Makefile.am:
-        * tao/tao.mpc:
-          Removed file above
-
-Mon Jul  4 13:37:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Makefile.am:
-          Added missing Messaging_PolicyValueA.cpp
-
-        * tao/tao.mpc:
-          Added missing Messaging_PolicyValueA.cpp and
-          Messaging_PolicyValueC.cpp
-
-Mon Jul  4 13:12:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Protocols_Hooks.h:
-          Removed several not needed forward declarations
-
-Mon Jul  4 13:07:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Visibility.pidl:
-          Don't use -GA with regeneration, we then get an A.cpp with contents
-          but the C.cpp file is empty, so just generate everything in C.cpp
-
-        * tao/VisibilityC.{h,cpp}:
-        * tao/VisibilityS.h:
-          Regenerated
-
-        * tao/VisibilityA.cpp:
-          Removed
-
-        * tao/Makefile.am:
-        * tao/tao.mpc:
-          Removed file above
-
-Mon Jul  4 12:59:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PredefinedType_Seq_Tmplinst.cpp:
-          Removed this file, explicit templates are not working with TAO
-          and will not work anymore in the future
-
-        * tao/Makefile.am:
-        * tao/tao.mpc:
-          Removed file above
-
-Mon Jul  4 12:05:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
-        * orbsvcs/orbsvcs/PortableGroup/MIOP.h:
-        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h:
-        * tao/PICurrent_Loader.h:
-        * tao/BiDir_GIOP/BiDirGIOP.h:
-        * tao/CodecFactory/CodecFactory.h:
-        * tao/DynamicAny/DynamicAny.h:
-        * tao/DynamicInterface/Dynamic_Adapter_Impl.h:
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
-        * tao/IORManipulation/IORManip_Loader.h:
-        * tao/IORTable/IORTable.h:
-        * tao/ImR_Client/ImR_Client.h:
-        * tao/Messaging/Messaging.h:
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
-        * tao/PI/PI.h:
-        * tao/PI/PolicyFactory_Loader.h:
-        * tao/PI_Server/PI_Server.h:
-        * tao/PortableServer/PortableServer.h:
-        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h:
-        * tao/TypeCodeFactory/TypeCodeFactory_Loader.h:
-        * tao/Valuetype/Valuetype_Adapter_Impl.h:
-          Removed usage of ACE_HAS_BROKEN_STATIC_CONSTRUCTORS. This seems
-          to be used for older broken VxWorks versions but we don't need
-          this anymore. Zapped the usage of this and the workaround we
-          had in TAO. This fixes bugzilla bug 2177
-
-Mon Jul  4 11:01:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry_Adapter.{h,cpp}:
-          Added virtual destructor in new cpp file, hopefully this fixes the
-          gcc 4 runtime errors
-
-        * tao/tao.mpc
-        * tao/Makefile.am:
-          Added new file
-
-Mon Jul  4 10:31:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server/PI_Server.cpp:
-        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.{h,cpp}:
-        * tao/PI/PI.cpp:
-        * tao/PI/ClientRequestInterceptor_Factory_Impl.{h,cpp}:
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.{h,cpp}:
-          Added guards for when interceptors are disabled. The complete
-          PI/PI_Server lib shouldn't get build when interceptors are
-          disabled but that is not yet possible because the
-          ORBInitializers are used internally by some core libs.
-
-Mon Jul  4 09:23:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/AMH/Sink_Server/AMH_Servant.h:
-        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
-        * examples/Content_Server/AMI_Iterator/Iterator_Handler.h:
-        * examples/Content_Server/AMI_Observer/Callback_Handler.h:
-        * examples/Content_Server/AMI_Observer/Callback_i.h:
-        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
-        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
-        * examples/Load_Balancing/Identity_i.h:
-        * examples/Load_Balancing/Load_Balancer_i.h:
-        * examples/Load_Balancing_persistent/Identity_i.h:
-        * examples/Load_Balancing_persistent/Load_Balancer_i.h:
-        * examples/POA/Forwarding/test_i.h:
-        * examples/RTCORBA/Activity/Job_i.h:
-        * examples/RTScheduling/Job_i.h:
-        * examples/Simple/time-date/Time_Date_i.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
-        * orbsvcs/ImplRepo_Service/Iterator.h:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h:
-        * orbsvcs/examples/ImR/Advanced/Manager_i.h:
-        * orbsvcs/examples/ImR/Advanced/Messenger_i.h:
-        * orbsvcs/examples/ImR/Combined_Service/dynserver.h:
-        * orbsvcs/examples/LoadBalancing/RPS_Monitor.h:
-        * orbsvcs/examples/LoadBalancing/StockFactory.h:
-        * orbsvcs/examples/Log/Notify/Notify_Consumer.h:
-        * orbsvcs/examples/Log/Notify/Notify_Supplier.h:
-        * orbsvcs/examples/Notify/Filter/Filter.h:
-        * orbsvcs/examples/Notify/Lanes/Consumer.h:
-        * orbsvcs/examples/Notify/Lanes/Supplier.h:
-        * orbsvcs/examples/Notify/Subscribe/Subscribe.h:
-        * orbsvcs/examples/Notify/ThreadPool/Consumer.h:
-        * orbsvcs/examples/Notify/ThreadPool/Supplier.h:
-        * orbsvcs/examples/ORT/Gateway_i.h:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
-        * orbsvcs/orbsvcs/AV/Flows_T.h:
-        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h:
-        * orbsvcs/orbsvcs/Log/BasicLog_i.h:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
-        * orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.h:
-        * orbsvcs/orbsvcs/Trader/Trader_T.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Consumer.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Control.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Loopback.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h:
-        * orbsvcs/performance-tests/RTEvent/lib/Supplier.h:
-        * orbsvcs/tests/CosEvent/Basic/Random.h:
-        * orbsvcs/tests/Event/Basic/Random.h:
-        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h:
-        * orbsvcs/tests/HTIOP/Hello/Hello.h:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h:
-        * orbsvcs/tests/Miop/McastHello/McastHello.h:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h:
-        * orbsvcs/tests/Notify/lib/Peer_T.h:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
-        * orbsvcs/tests/RTCosScheduling/Object1_i.h:
-        * orbsvcs/tests/Security/Callback/client_i.h:
-        * orbsvcs/tests/Security/Callback/server_i.h:
-        * orbsvcs/tests/Security/Secure_Invocation/Foo_i.h:
-        * performance-tests/Protocols/Protocols.mpc
-        * tests/AMI_Buffering/AMI_Buffering.h:
-        * tests/AMI_Buffering/AMI_Buffering_Admin.h:
-        * tests/AMI_Buffering/Reply_Handler.h:
-        * tests/Any/Recursive/Hello.h:
-        * tests/BiDirectional_NestedUpcall/test_i.h:
-        * tests/Big_Reply/Big_Reply_i.h:
-        * tests/Big_Request_Muxing/Payload_Receiver.h:
-        * tests/Big_Twoways/Peer.h:
-        * tests/Blocking_Sync_None/Blocking_Sync_None.h:
-        * tests/Bug_1476_Regression/Sender_i.h:
-        * tests/Bug_1482_Regression/Hello.h:
-        * tests/Bug_1495_Regression/test_i.h:
-        * tests/Bug_1551_Regression/Hello.h:
-        * tests/Bug_1551_Regression/Reply_Handler.h:
-        * tests/Cache_Growth_Test/Hello.h:
-        * tests/Client_Leaks/Process.h:
-        * tests/Client_Leaks/Process_Factory.h:
-        * tests/Client_Leaks/Startup_Callback.h:
-        * tests/Collocation_Tests/Hello.h:
-        * tests/Connect_Strategy_Test/Hello.h:
-        * tests/Connection_Purging/test_i.h:
-        * tests/Crash_On_Write/Oneway_Receiver.h:
-        * tests/Crashed_Callback/Crashed_Callback.h:
-        * tests/Crashed_Callback/Service.h:
-        * tests/Faults/ping_i.h:
-        * tests/Faults/test_i.h:
-        * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h:
-        * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h:
-        * tests/Hang_Shutdown/test_i.h:
-        * tests/Hello/Hello.h:
-        * tests/ICMG_Any_Bug/Hello.h:
-        * tests/ICMG_Any_Bug/HelloWorld.h:
-        * tests/IOR_Endpoint_Hostnames/bogus_i.h:
-        * tests/LongUpcalls/AMI_Manager.h:
-        * tests/LongUpcalls/Controller.h:
-        * tests/LongUpcalls/Manager.h:
-        * tests/LongUpcalls/Manager_Handler.h:
-        * tests/MT_BiDir/Receiver_i.h:
-        * tests/MT_BiDir/Sender_i.h:
-        * tests/MT_Timeout/Sleep_Service.h:
-        * tests/Nested_Upcall_Crash/Client_Peer.h:
-        * tests/Nested_Upcall_Crash/Server_Peer.h:
-        * tests/OBV/Supports/Supports_Test_impl.h:
-        * tests/ORB_shutdown/Foo_Bar.h:
-        * tests/Object_Loader/Test_i.h:
-        * tests/Oneway_Buffering/Oneway_Buffering.h:
-        * tests/Oneway_Buffering/Oneway_Buffering_Admin.h:
-        * tests/Oneways_Invoking_Twoways/Receiver_i.h:
-        * tests/Oneways_Invoking_Twoways/Sender_i.h:
-        * tests/POA/Deactivate_Object/Hello.h:
-        * tests/Portable_Interceptors/AMI/Echo.h:
-        * tests/Portable_Interceptors/AMI/Echo_Handler.h:
-        * tests/Portable_Interceptors/Collocated/Dynamic/test_i.h:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h:
-        * tests/RTCORBA/Thread_Pool/test_i.h:
-        * tests/Reliable_Oneways/Oneway_Receiver.h:
-        * tests/Reliable_Oneways/Shutdown_Helper.h:
-        * tests/Servant_To_Reference_Test/Test_i.h:
-        * tests/Server_Connection_Purging/Test_i.h:
-        * tests/Server_Leaks/Ping_Service.h:
-        * tests/Server_Port_Zero/Hello.h:
-        * tests/Stack_Recursion/Sender.h:
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-        * docs/tutorials/Quoter/Event_Service/Stock_i.h:
-        * docs/tutorials/Quoter/RT_Event_Service/Stock_i.h:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h:
-        * examples/POA/Adapter_Activator/server.cpp:
-        * examples/POA/Reference_Counted_Servant/server.cpp:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp:
-        * orbsvcs/examples/ImR/Combined_Service/combined.cpp:
-        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
-        * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
-        * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp:
-        * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp:
-        * orbsvcs/tests/ImplRepo/scale/server_i.cpp:
-        * orbsvcs/tests/Redundant_Naming/client.cpp:
-        * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-        * performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h:
-        * performance-tests/Latency/AMI/Roundtrip.h:
-        * performance-tests/Latency/AMI/Roundtrip_Handler.h:
-        * performance-tests/Latency/Collocation/Roundtrip.h:
-        * performance-tests/Latency/DII/Roundtrip.h:
-        * performance-tests/Latency/DSI/Roundtrip.h:
-        * performance-tests/Latency/Deferred/Roundtrip.h:
-        * performance-tests/Latency/Single_Threaded/Roundtrip.h:
-        * performance-tests/Latency/Thread_Per_Connection/Roundtrip.h:
-        * performance-tests/Latency/Thread_Pool/Roundtrip.h:
-        * performance-tests/Memory/IORsize/Foo_i.h:
-        * performance-tests/Memory/IORsize/Memory_Growth.h:
-        * performance-tests/Memory/Single_Threaded/Memory_Growth.h:
-        * performance-tests/POA/Implicit_Activation/Factory.h:
-        * performance-tests/POA/Implicit_Activation/Simple.h:
-        * performance-tests/Protocols/Protocols.mpc
-        * performance-tests/Protocols/distributor.cpp:
-        * performance-tests/Protocols/receiver.cpp:
-        * performance-tests/RTCorba/Thread_Pool/server.cpp:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h:
-        * performance-tests/Sequence_Latency/AMI/Roundtrip.h:
-        * performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h:
-        * performance-tests/Sequence_Latency/DII/Roundtrip.h:
-        * performance-tests/Sequence_Latency/DSI/Roundtrip.h:
-        * performance-tests/Sequence_Latency/Deferred/Roundtrip.h:
-        * performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h:
-        * performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h:
-        * performance-tests/Throughput/Receiver.h:
-        * performance-tests/Throughput/Receiver_Factory.h:
-        * tao/ImR_Client/ServerObject_i.h:
-        * tests/AMH_Exceptions/server.cpp:
-        * tests/AMH_Oneway/server.cpp:
-        * tests/Bug_1568_Regression/server.cpp:
-        * tests/Bug_1670_Regression/server.cpp:
-        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
-        * tests/Faults/test_i.h:
-        * tests/Objref_Sequence_Test/server.cpp:
-        * tests/POA/Etherealization/Etherealization.cpp:
-        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
-        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp:
-        * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp:
-        * tests/POA/Persistent_ID/server.cpp:
-        * tests/RTCORBA/Collocation/Collocation.cpp:
-        * tests/RTCORBA/Linear_Priority/server.cpp:
-        * tests/RTCORBA/Persistent_IOR/server.cpp:
-        * tests/RTCORBA/Policy_Combinations/server.cpp:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
-        * tests/UNKNOWN_Exception/server.cpp:
-          All servants are reference counted by default, no need anymore to
-          derive the servant from RefCountServantBase. Also removed the msvc
-          pragma push/pop when it was not needed anymore
-
-        * tao/Object.{h,cpp}:
-          Corrected implementation _get_orb()
-
-        * tao/SystemException.cpp:
-          Initailize pointers with 0
-
-Mon Jul  4 07:11:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Twoways/Coordinator.h:
-        * tests/Big_Twoways/Session.h:
-        * tests/Big_Twoways/Session_Control.h:
-        * tests/Big_Oneways/Coordinator.h:
-        * tests/Big_Oneways/Peer.h:
-        * tests/Big_Oneways/Session.h:
-        * tests/Big_Oneways/Session_Control.h:
-          No need to derive from RefCountServantBase, Servants are
-          reference counted now by defailt.
-
-        * tests/Big_Twoways/run_test.pl:
-        * tests/Big_Oneways/run_test.pl:
-          Use WaitKill for the server, if the server is still running, it
-          is an error
-
-        * tests/Big_Twoways/server.cpp:
-        * tests/Big_Oneways/server.cpp:
-          No need to do a _remove_ref, the _var handle this
-
-Sun Jul  3 15:09:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-
-          Fix typo in ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA case.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-
-          Change create() method parameter name from max_rec_size to
-          max_size, as it specifies the size of the whole log, not a
-          single log record.
-
-Sun Jul  3 15:00:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * tao/tao.mpc:
-
-          Removed Interceptor_List.h from Header_Files and
-          Interceptor_List.cpp from Template_Files sections.
-
-Fri Jul 01 15:14:06 2005   Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/StringValueC.inl:
-
-          Avoid error when compiling with MSVC6 compiler.
-
-Fri Jul  1 16:14:16 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp:
-        * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
-
-          Fix some typos with the previous checkin.
-
-Fri Jul  1 14:43:27 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/Notify_Service/Notify_Service.cpp:
-        * orbsvcs/Notify_Service/README:
-        * orbsvcs/Notify_Service/svc.conf:
-        * orbsvcs/Notify_Service/svc.conf.xml:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosNotifyComm.idl:
-        * orbsvcs/orbsvcs/Notify/Admin.h:
-        * orbsvcs/orbsvcs/Notify/Admin.inl:
-        * orbsvcs/orbsvcs/Notify/Admin.cpp:
-        * orbsvcs/orbsvcs/Notify/AdminProperties.h:
-        * orbsvcs/orbsvcs/Notify/AdminProperties.inl:
-        * orbsvcs/orbsvcs/Notify/AdminProperties.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
-        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
-        * orbsvcs/orbsvcs/Notify/Builder.cpp:
-        * orbsvcs/orbsvcs/Notify/Consumer.h:
-        * orbsvcs/orbsvcs/Notify/Consumer.inl:
-        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Delivery_Request.h:
-        * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
-        * orbsvcs/orbsvcs/Notify/Event.h:
-        * orbsvcs/orbsvcs/Notify/Event.inl:
-        * orbsvcs/orbsvcs/Notify/Event.cpp:
-        * orbsvcs/orbsvcs/Notify/EventChannel.h:
-        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
-        * orbsvcs/orbsvcs/Notify/EventChannelFactory.h:
-        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
-        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.inl:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
-        * orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h:
-        * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
-        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request.inl:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp:
-        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Object.h:
-        * orbsvcs/orbsvcs/Notify/Object.inl:
-        * orbsvcs/orbsvcs/Notify/Object.cpp:
-        * orbsvcs/orbsvcs/Notify/Peer.h:
-        * orbsvcs/orbsvcs/Notify/Peer.cpp:
-        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h:
-        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
-        * orbsvcs/orbsvcs/Notify/Properties.cpp:
-        * orbsvcs/orbsvcs/Notify/Proxy.h:
-        * orbsvcs/orbsvcs/Notify/Proxy.cpp:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.inl:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.inl:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
-        * orbsvcs/orbsvcs/Notify/Proxy_T.cpp:
-        * orbsvcs/orbsvcs/Notify/QoSProperties.h:
-        * orbsvcs/orbsvcs/Notify/QoSProperties.inl:
-        * orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
-        * orbsvcs/orbsvcs/Notify/README:
-        * orbsvcs/orbsvcs/Notify/RT_Builder.cpp:
-        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.h:
-        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/Random_File.h:
-        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp:
-        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
-        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.h:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
-        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Service.h:
-        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h:
-        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
-        * orbsvcs/orbsvcs/Notify/Supplier.h:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
-        * orbsvcs/orbsvcs/Notify/Timer.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
-        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
-        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
-        * orbsvcs/orbsvcs/Notify/Worker_Task.h:
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.inl:
-        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp:
-
-          Ported over the refactoring of the Notify Service by Dave Giovannini
-        <giovannini_d at ociweb dot com>. These changes primarily fix memory leaks
-        and crashes.
-          Ported over my own changes that reimplement the OrderPolicy, BlockingPolicy, and
-        DiscardPolicy features.
-
-        * orbsvcs/tests/Notify/Basic/AdminProperties.h:
-        * orbsvcs/tests/Notify/Basic/AdminProperties.cpp:
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.h:
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp:
-        * orbsvcs/tests/Notify/Basic/Events.h:
-        * orbsvcs/tests/Notify/Basic/Events.cpp:
-        * orbsvcs/tests/Notify/Basic/Filter.h:
-        * orbsvcs/tests/Notify/Basic/Filter.cpp:
-        * orbsvcs/tests/Notify/Basic/IdAssignment.cpp:
-        * orbsvcs/tests/Notify/Basic/LifeCycle.cpp:
-        * orbsvcs/tests/Notify/Basic/MultiTypes.h:
-        * orbsvcs/tests/Notify/Basic/MultiTypes.cpp:
-        * orbsvcs/tests/Notify/Basic/Sequence.h:
-        * orbsvcs/tests/Notify/Basic/Sequence.cpp:
-        * orbsvcs/tests/Notify/Basic/Simple.h:
-        * orbsvcs/tests/Notify/Basic/Simple.cpp:
-        * orbsvcs/tests/Notify/Basic/Updates.h:
-        * orbsvcs/tests/Notify/Basic/Updates.cpp:
-        * orbsvcs/tests/Notify/Basic/adminproperties.conf:
-        * orbsvcs/tests/Notify/Basic/notify.mt.conf:
-        * orbsvcs/tests/Notify/Basic/notify.reactive.conf:
-        * orbsvcs/tests/Notify/Basic/notify.rt.conf:
-        * orbsvcs/tests/Notify/Basic/run_test.pl:
-        * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Blocking/common.cpp:
-        * orbsvcs/tests/Notify/Blocking/go.idl:
-        * orbsvcs/tests/Notify/Blocking/notify.conf:
-        * orbsvcs/tests/Notify/Blocking/notify.conf.xml:
-        * orbsvcs/tests/Notify/Blocking/run_test.pl:
-        * orbsvcs/tests/Notify/Destroy/main.cpp:
-        * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Discarding/common.cpp:
-        * orbsvcs/tests/Notify/Discarding/go.idl:
-        * orbsvcs/tests/Notify/Discarding/notify.conf:
-        * orbsvcs/tests/Notify/Discarding/notify.conf.xml:
-        * orbsvcs/tests/Notify/Discarding/run_test.pl:
-        * orbsvcs/tests/Notify/Driver/main.cpp:
-        * orbsvcs/tests/Notify/Lanes/consumer.conf:
-        * orbsvcs/tests/Notify/Lanes/notify.conf:
-        * orbsvcs/tests/Notify/Lanes/run_test.pl:
-        * orbsvcs/tests/Notify/Lanes/run_test_consumer.pl:
-        * orbsvcs/tests/Notify/Lanes/run_test_notify.pl:
-        * orbsvcs/tests/Notify/Lanes/run_test_supplier.pl:
-        * orbsvcs/tests/Notify/Lanes/supplier.conf:
-        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h:
-        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/MT_Dispatching/go.idl:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml:
-        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
-        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Ordering/common.cpp:
-        * orbsvcs/tests/Notify/Ordering/go.idl:
-        * orbsvcs/tests/Notify/Ordering/notify.conf:
-        * orbsvcs/tests/Notify/Ordering/notify.conf.xml:
-        * orbsvcs/tests/Notify/Ordering/run_test.pl:
-        * orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h:
-        * orbsvcs/tests/Notify/PluggableTopology/main.cpp:
-        * orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf:
-        * orbsvcs/tests/Notify/Reconnecting/Consumer.h:
-        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp:
-        * orbsvcs/tests/Notify/Reconnecting/README:
-        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
-        * orbsvcs/tests/Notify/Reconnecting/event.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_mt.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_st.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf:
-        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl:
-        * orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
-        * orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Filter/notify.conf:
-        * orbsvcs/tests/Notify/Structured_Filter/run_test.pl:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp:
-        * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h:
-        * orbsvcs/tests/Notify/ThreadPool/consumer.conf:
-        * orbsvcs/tests/Notify/ThreadPool/notify.conf:
-        * orbsvcs/tests/Notify/ThreadPool/run_test.pl:
-        * orbsvcs/tests/Notify/ThreadPool/supplier.conf:
-        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
-        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
-        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
-        * orbsvcs/tests/Notify/lib/Command.cpp:
-        * orbsvcs/tests/Notify/lib/Consumer_T.h:
-        * orbsvcs/tests/Notify/lib/Consumer_T.cpp:
-        * orbsvcs/tests/Notify/lib/Driver.h:
-        * orbsvcs/tests/Notify/lib/Driver.cpp:
-        * orbsvcs/tests/Notify/lib/EventChannel_Command.cpp:
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.h:
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp:
-        * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
-        * orbsvcs/tests/Notify/lib/Peer_T.h:
-        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
-        * orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp:
-        * orbsvcs/tests/Notify/lib/PushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/PushSupplier.cpp:
-        * orbsvcs/tests/Notify/lib/README:
-        * orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp:
-        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp:
-        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp:
-        * orbsvcs/tests/Notify/lib/Supplier_T.h:
-        * orbsvcs/tests/Notify/lib/Supplier_T.cpp:
-        * orbsvcs/tests/Notify/lib/Task_Callback.h:
-        * orbsvcs/tests/Notify/lib/Task_Stats.inl:
-        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
-        * orbsvcs/tests/Notify/performance-tests/Filter/go.idl:
-        * orbsvcs/tests/Notify/performance-tests/Filter/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_3/other_paths.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl:
-        * orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtlistener.conf:
-        * orbsvcs/tests/Notify/MT_Dispatching/notify_mtlistener.conf.xml:
-        * orbsvcs/tests/Notify/Structured_Filter/control.idl:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/control.idl:
-
-          Dave G also refactored the tests somewhat to resolve various problems.
-          Many tests were rewritten to more fully test the broken QoS features.
-
-
-Fri Jul  1 17:46:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
-          By accident ami was removed as base project of server
-
-Fri Jul  1 17:04:50 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
-
-          When generating the base class name in the constructor of
-          a sequence, changed the call to be_sequence::gen_base_class_name
-          to pass the current scope (as is already done for the same call
-          in the stub header visitor) instead of the global scope. This
-          change fixes a problem with nested anonymous sequences, for
-          example, 'sequence<sequence<short> >, in the generated
-          constructor initialization list.
-
-Fri Jul  1 11:33:12 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be_include/be_helper.h:
-
-          When generating template specializations, do not add the stream
-          type suffix.  This allows users to combine the idl generated .cpp
-          files into one which with some compilers decreases build times.
-
-Fri Jul  1 15:16:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
-          Cleanup generated test files at the start, there can be an old file
-          when things failed in the previous run
-
-Fri Jul  1 15:02:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Callback/Callback.mpc:
-        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Latency/AMI/AMI.mpc:
-        * performance-tests/Latency/Collocation/Collocation.mpc:
-        * performance-tests/Latency/DII/DII.mpc:
-        * performance-tests/Latency/DSI/DSI.mpc:
-        * performance-tests/Latency/Deferred/Deferred.mpc:
-        * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc:
-        * performance-tests/Latency/Thread_Pool/Thread_Pool.mpc:
-        * performance-tests/Memory/IORsize/Memory_IORsize.mpc:
-        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
-        * performance-tests/POA/Create_Reference/Create_Reference.mpc:
-        * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
-          Use better base projects to simplify things
-
-Fri Jul  1 14:51:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-          Added pi_server to the client project also
-
-Fri Jul  1 14:40:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Invocation_Base.cpp:
-          Fixed compilation error when interceptors are disabled
-
-Fri Jul  1 07:18:44 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-
-          Changed so-called "convenience libraries" projects to inherit
-          from conv_lib.mpb.
-
-Fri Jul  1 13:58:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
-          Corrected export macro
-
-Fri Jul  1 13:16:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_produce.cpp:
-
-          Moved the conditional initialization of the *A.cpp file stream
-          from before the stub header visitor executes to after the
-          stub header visitor and before the stub source visitor. This
-          move allows the checks for recursive types that happen in
-          the stub header visitor to complete, giving correct results
-          when the presence of recursive types is checked in the
-          generation of includes for the *A.cpp file, if it is generated.
-          The *A.cpp includes must also be generated before the *C.cpp
-          file since the *A.cpp file, if generated, will steal some
-          includes that would go in the *C.cpp file if the -GA option
-          was not used.
-
-Fri Jul  1 12:54:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h:
-          Added include of PI_Server.h
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-          Added PI_Server as base project
-
-Fri Jul  1 11:30:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo.{h,cpp,inl}:
-          Doxygen fix and moved check_validity to the cpp file and removed
-          the inline file
-
-        * tao/ClientRequestInterceptor.pidl:
-        * tao/ClientRequestInterceptorA.cpp:
-        * tao/ClientRequestInterceptorC.{h,cpp}:
-        * tao/ClientRequestInterceptorS.h:
-          Moved to the PI library
-
-        * tao/ClientRequestInterceptor_Adapter.{h,cpp,inl}:
-          Made this a base class, real functionality is in the PI lib.
-          Remove the .inl file
-
-        * tao/ClientRequestInterceptor_Adapter_Factory.h:
-          New factory base for creating a ClientRequestInterceptor_Adapter
-
-        * tao/Interceptor.pidl:
-        * tao/InterceptorA.cpp:
-        * tao/InterceptorC.{h,cpp}:
-        * tao/InterceptorS.h:
-        * tao/Interceptor_List.{cpp,h}:
-          Moved to the PI lib
-
-        * tao/Invocation_Base.{h,cpp,inl}:
-          Store the PI stack size in the invocation base and handle that
-          the ClientRequestInterceptor pointer can be 0.
-
-        * tao/IORInterceptor_Adapter.h:
-          Removed several not needed forward declarations
-
-        * tao/ORB_Core.{h,cpp,i}:
-          Added methods to get the Client/Server Request interceptor adapters.
-          Added the moment an interceptor is registered an adapter will be
-          created on demand. Later on we just retrieve the pointer
-
-        * tao/PortableInterceptor.pidl:
-        * tao/PortableInterceptorC.h:
-          Updated for the moved files
-
-        * tao/RTScheduler.mpc:
-          Needs PI_Server
-
-        * tao/ServerRequestInterceptor.pidl:
-        * tao/ServerRequestInterceptorA.cpp:
-        * tao/ServerRequestInterceptorC.{h,cpp}:
-        * tao/ServerRequestInterceptorS.h:
-          Moved to the PI_Server library
-
-        * tao/ServerRequestInterceptor_Adapter.{h,cpp}:
-          New adapter
-
-        * tao/ServerRequestInterceptor_Adapter_Factory.h:
-          New factory
-
-        * tao/tao.mpc:
-          Updated for all moved files.
-
-        * tao/IORInterceptor/IORInterceptor.pidl
-        * tao/IORInterceptor/IORInterceptorC.h
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}:
-          Updated for Interceptor_List changes
-
-        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
-          Improved debug statement
-
-        * tao/PI/ClientRequestInterceptor.pidl:
-        * tao/PI/ClientRequestInterceptorA.cpp:
-        * tao/PI/ClientRequestInterceptorC.{h,cpp}:
-        * tao/PI/ClientRequestInterceptorS.h:
-          Moved from TAO lib
-
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.{h,cpp,inl}:
-          Implemented ClientRequestInterceptor Adapter which calls the
-          interceptors
-        * tao/PI/ClientRequestInterceptor_Factory_Impl.{h,cpp}:
-          Implemented factory interface.
-
-        * tao/PI/Interceptor.pidl:
-        * tao/PI/InterceptorA.cpp:
-        * tao/PI/InterceptorC.{h,cpp}:
-        * tao/PI/InterceptorS.h:
-          Moved from TAO lib
-
-        * tao/PI/Interceptor_List_T.{h,cpp}:
-          Moved from TAO lib and updated interfaces to not expose any
-          internal knowledge
-
-        * tao/PI/PI.{h,cpp}:
-          Add some process directives
-
-        * tao/PI/diff/ORBInitializer.diff
-          New diff
-
-        * tao/PI_Server/PI_Server.{h,cpp}:
-          Add some process directives
-
-        * tao/PI_Server/PS_CurrentA.cpp
-        * tao/PI_Server/PS_CurrentC.{h,cpp}:
-          Regenerated
-
-        * tao/PI_Server/ServerInterceptorAdapter.{h,cpp}:
-          From portableserver library, adapter that invokes server
-          request interceptors
-
-        * tao/PI_Server/ServerRequestInterceptor.pidl
-        * tao/PI_Server/ServerRequestInterceptorA.cpp
-        * tao/PI_Server/ServerRequestInterceptorC.cpp
-        * tao/PI_Server/ServerRequestInterceptorC.h
-        * tao/PI_Server/ServerRequestInterceptorS.h
-          Moved from TAO lib
-
-        * tao/PI_Server/ServerRequestInterceptor_Factory_Impl.{h,cpp}:
-          New factory to create an instance of the adapter
-
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-          Be aware the Server Request Interceptor adapter is a pointer and
-          can be zero
-
-        * tao/PortableServer/ServerInterceptorAdapter.{h,cpp,inl}:
-          Removed, moved to the PI_Server lib
-
-        * tao/PortableServer/ServerRequestInfo.{h,inl}:
-          Export this classes, need it from the PI_Server lib
-
-        * tao/RTCORBA/RTCORBAA.cpp
-        * tao/RTCORBA/RTCORBAC.h
-          Regenerated
-
-        * tao/RTScheduling/RTScheduler.pidl
-        * tao/RTScheduling/RTSchedulerA.cpp
-        * tao/RTScheduling/RTSchedulerC.h
-        * tao/RTScheduling/Request_Interceptor.h
-          Updated for PI changes
-
-        * tests/Bug_1495_Regression/interceptors.cpp
-        * tests/Bug_1495_Regression/interceptors.h
-        * tests/Portable_Interceptors/Benchmark/interceptors.cpp
-        * tests/Portable_Interceptors/Benchmark/interceptors.h
-        * tests/Portable_Interceptors/Dynamic/interceptors.cpp
-        * tests/Portable_Interceptors/Dynamic/interceptors.h
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
-        * tests/Portable_Interceptors/Bug_1559/interceptors.cpp
-        * tests/Portable_Interceptors/Bug_1559/interceptors.h
-          Removed these files, replaced by seperate client/server files below
-
-        * tests/Bug_1495_Regression/client_interceptor.cpp
-        * tests/Bug_1495_Regression/client_interceptor.h
-        * tests/Bug_1495_Regression/server_interceptor.cpp
-        * tests/Bug_1495_Regression/server_interceptor.h
-        * tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
-        * tests/Portable_Interceptors/Benchmark/client_interceptors.h
-        * tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
-        * tests/Portable_Interceptors/Benchmark/server_interceptors.h
-        * tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
-        * tests/Portable_Interceptors/Bug_1559/client_interceptor.h
-        * tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
-        * tests/Portable_Interceptors/Bug_1559/server_interceptor.h
-        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
-        * tests/Portable_Interceptors/Dynamic/client_interceptor.h
-        * tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
-        * tests/Portable_Interceptors/Dynamic/server_interceptor.h
-        * tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
-        * tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
-          New files
-
-        * tests/Bug_1495_Regression/Bug_1495.mpc
-        * tests/Bug_1495_Regression/Server_ORBInitializer.cpp
-        * tests/Bug_1495_Regression/Server_ORBInitializer.h
-        * tests/Bug_1495_Regression/Threaded_Server.cpp
-        * tests/Portable_Interceptors/AMI/Client_Interceptor.h
-        * tests/Portable_Interceptors/AMI/PI_AMI.mpc
-        * tests/Portable_Interceptors/AMI/Server_Interceptor.h
-        * tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
-        * tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Benchmark/client.cpp
-        * tests/Portable_Interceptors/Benchmark/server.cpp
-        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
-        * tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Bug_1559/client.cpp
-        * tests/Portable_Interceptors/Bug_1559/server.cpp
-        * tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
-        * tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
-        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
-        * tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
-        * tests/Portable_Interceptors/Dynamic/client.cpp
-        * tests/Portable_Interceptors/Dynamic/server.cpp
-        * tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
-        * tests/Portable_Interceptors/ForwardRequest/test.idl
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
-        * tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
-        * tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
-        * tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
-        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
-        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
-        * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
-        * tests/RTCORBA/Client_Propagated/interceptors.h
-        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
-        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
-        * orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
-        * orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
-        * orbsvcs/orbsvcs/CosLoadBalancing.mpc
-        * orbsvcs/orbsvcs/FTORB.mpc
-        * orbsvcs/orbsvcs/FaultTolerance.mpc
-        * orbsvcs/orbsvcs/FtRtEvent.mpc
-        * orbsvcs/orbsvcs/Security.mpc
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
-        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
-          Update for PI change
-
-Fri Jul  1 000:27:47 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_exception.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/ast/ast_structure.cpp:
-        * TAO_IDL/ast/ast_union.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-
-          Moved evaluation of the in_recursion_ member of structs unions
-          and valuetypes to happen soon enough to make the generation of
-          the file include of Recursive_Type_TypeCode.h conditional on
-          whether a recursive type has been seen or not. Thanks to
-          Ossama Othman <ossama@dre.vanderbilt.edu> for suggesting
-          the conditional include.
-
-Thu Jun 30 18:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1551_Regression/client.cpp:
-          When we get a timeout on the client threads output an error but
-          first nicely destroy the POA and ORB before shutting down
-
-Thu Jun 30 10:21:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (get_current_size, get_n_records,
-          flush):
-
-          Changed argument list to use ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-          instead of ACE_ENV_SINGLE_ARG_DECL, since these methods do not
-          throw exceptions.
-
-Thu Jun 30 09:50:46 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Profile.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/Profile.cpp:
-        * tao/Profile.h:
-        * tao/PortableServer/Default_Acceptor_Filter.cpp:
-          This restores the behavior of IIOP_Profile::encode_endpoints so
-          that it always creates only TAO_TAG_ENDPOINT component.
-          Initially, the new TAG_ALTERNATE_IIOP_ADDRESS support was added
-          to this method, with an internal test if the endpoint priority
-          was TAO_INVALID_PRIORITY or not. If it was not, both kinds of
-          tagged components were created, if the priority was invalid,
-          only the new tagged component was created. But this causes
-          trouble for RT_CORBA with multiple nics. It also generates
-          redundant components.
-
-          A new method, encode_alternate_endpoints is added to support the
-          generation of combined endpoints in non-RT ORBs. This new method
-          is called from Default_Acceptor_Filter.cpp. The base TAO_Profile
-          supplies a null implementation of encode_alternate_endpoints so
-          that existing, non-IIOP profiles don't have to be altered.
-
-        * tao/params.cpp:
-          To address the issue raised by bugzilla #2173, I've set the
-          default for using shared profiles (non-RT) to 0. This avoids a
-          side-effect of making shared profiles with endpoints that do not
-          have a priority set in an RT environment.
-
-        * tests/AlternateIIOP/run_test.pl:
-          Add an explicit -ORBUseSharedProfile 1 to the server.
-
-Thu Jun 30 09:29:56 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/StringValueC.inl
-
-          Latest attempt at getting rid of warning from gcc compiler
-
-Thu Jun 30 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTScheduling/RTSchedulerC.cpp:
-          Regenerated with the latest version of the idl compiler
-
-Thu Jun 30 13:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-          Added missing .in()
-
-Thu Jun 30 13:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInfoC.cpp:
-        * tao/IORInterceptor/IORInterceptorC.cpp:
-        * tao/RTCORBA/RTCORBAC.cpp:
-          Regenerated with the latest version of the idl compiler
-
-Thu Jun 30 12:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Any/Recursive/client.cpp:
-          Added include of TypeCodeFactory_Loader.h so that the
-          TypeCodeFactory is loaded. Fixes crashing of the test on
-          windows
-
-Thu Jun 30 11:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * utils/catior/catior.cpp:
-          Fixed retrieval and printing of port number in
-          cat_tag_alternate_endpoints.
-
-Wed Jun 29 20:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Client.h:
-          Added include of naming_client.h
-
-Wed Jun 29 20:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IOR_Parser.h:
-          Emulated exception macro fix
-
-Wed Jun 29 12:02:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Invocation_Base.cpp:
-
-          Moved "PortableInterceptor.h" include directive out of
-          TAO_HAS_INTERCEPTORS preprocessor block.  It should always be
-          visible.  Fixes errors in builds with interceptors disabled.
-
-Wed Jun 29 18:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * utils/catior/catior.cpp:
-          Added an extra identation for priority and priority model so that it
-          is clear they belong to a certain priority and added
-          PRIORITY_BANDED_CONNECTION_POLICY_TYPE as one of the types we
-          recognize.
-
-Wed Jun 29 10:13:54 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-
-          Change type of orb_ member variable from _ptr to _var.
-
-Wed Jun 29 10:00:31 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO/tao/Valuetype/StringValueC.inl
-
-          Change to avoid compiler warnings from some compilers.
-
-Wed Jun 29 07:22:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-
-          Regenerated.
-
-        * TAO_IDL/tao_idl.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-
-          Changed so-called "convenience libraries" projects to inherit
-          from conv_lib.mpb.
-
-Tue Jun 28 22:21:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Invocation_Base.inl (reply_received):
-        * tao/Invocation_Base.cpp (reply_received):
-
-          Moved this method out-of-line.  It calls a method on its
-          TAO_ClientRequestInfo field.  Inlining this method exposes the
-          unexported TAO_ClientRequestInfo class to code outside of the
-          TAO shared library, which results in "unresolved_symbol"
-          link-time errors when attempting to call
-          Invocation_Base::reply_received() directly or indirectly
-          (e.g. via TAO::Reply_Guard::~Reply_Guard()).  Fixes g++ 4.0
-          link-time errors.
-
-        * tao/Synch_Invocation.h (Reply_Guard):
-
-          Improved const-correctness by making an immutable pointer member
-          "const".
-
-Tue Jun 28 20:52:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/TAO_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-
-          Regenerated.
-
-Tue Jun 28 19:51:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-
-          Added a *_IDL project, currently only for automake builds, that
-          only compiles the *.idl files.  This ensures that all generated
-          files will be included in the lists of sources, headers,
-          inlines, templates, etc. instead of only those used in the stub
-          libraries.  Other build types continue to compile *.idl files as
-          part of the stub library projects.  When this is prefected, most
-          build methods can use the automake build mechanism.
-
-        * orbsvcs/orbsvcs/CosProperty.mpc:
-
-          Added missing *.h, *.inl, and *S_T.* files to Header_Files,
-          Inline_Files, and Template_Files so that they're installed.
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-
-          Added explicit Header_Files and Inline_Files sections so all
-          files are installed.
-
-Tue Jun 28 16:11:50 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
-
-          Backing out namespace code generation change of Mon Jun 27
-          for now due to problems getting it to work across multiple
-          compilers.
-
-Tue Jun 28 13:31:01 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO/tao/Valuetype/StringValueC.cpp
-          Change to allow operation in non-exception environments
-
-Tue Jun 28 10:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Dynamic_ParameterC.h:
-          Remove generated include of TypeCode.h. This seems to cause problems
-          in some builds.
-
-Tue Jun 28 07:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Object.cpp (_get_orb):
-          Return the orb related to the TAO_Stub, the orb_core_ member
-          could sometimes be zero. Thanks to Bala for giving feedback
-          on this.
-
-Mon Jun 27 14:54:53 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Mon Jun 27 13:54:27 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_util.cpp
-        * TAO_IDL/be_include/be_util.h
-        * TAO_IDL/be/be_visitor_interface.cpp
-        * TAO_IDL/be/be_visitor_interface_fwd.cpp
-        * TAO_IDL/be/be_visitor_valuebox.cpp
-        * TAO_IDL/be/be_visitor_valuetype.cpp
-        * TAO_IDL/be/be_visitor_valuetype_fwd.cpp
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
-
-          When generating Any insertion and extraction operators put them
-          in a namespace that corresponds to their enclosing module (if
-          any).  Addresses problem reported in Bugzilla report #2071.
-
-Mon Jun 27 13:08:01 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Added missing copy constructor implementation
-
-        * TAO/tao/Valuetype/StringValueC.inl
-          Change to avoid warnings by some compilers
-
-Mon Jun 27 12:19:01 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
-          (TAO): Changed the comment to "Using default value of 1.5
-          seconds".  Thanks to Simon Massey and Bala for resolving this.
-
-Mon Jun 27 11:09:34 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Exposed_Policies/Policy_Verifier.h:
-        * tests/Exposed_Policies/Policy_Verifier.cpp:
-        * tests/Exposed_Policies/client.cpp:
-
-          Modified this test to not run if the initialization failed.  This
-          avoids a core dump.
-
-        * tests/Exposed_Policies/run_test.pl:
-
-          Remove the ior files before running the server and cut the wait
-          times in half.
-
-Mon Jun 27 09:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-          Added requires dummy_label. The RTCosScheduling library uses
-          a non compliant way to register its interceptors. This is
-          causing problems with the PI refactory so disable the building
-          of this lib until that has been fixed. See also bugzilla 2163.
-
-Mon Jun 27 09:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be_include/be_visitor_operation/ami_cs.h:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-          Removed gen_marshal_and_invoke method. It wasn't used and contained
-          a lot of generation of old code that we don't use anymore
-
-Mon Jun 27 09:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Policy_Validator.h:
-          Fixed small typo in comment
-
-Mon Jun 27 08:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Valuetype/ValueBase.cpp:
-          Fixed implicit conversion warning and use ACE_OS::strcmp instead of
-          strcmp directly
-
-Mon Jun 27 07:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO/tao/*C.{h,cpp,inl}:
-        * TAO/tao/*A.cpp:
-        * TAO/tao/PortableServer/*C.{h,cpp,inl}:
-        * TAO/tao/PortableServer/*A.cpp:
-        * TAO/tao/Messaging/*C.{h,cpp,inl}:
-        * TAO/tao/Messaging*A.cpp:
-          Regenerated
-
-Sat Jun 25 06:39:03 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO/tao/Valuetype/StringValueC.inl
-          Change to avoid warnings by some compilers
-
-Sat Jun 25 06:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/AdapterActivatorC.cpp:
-        * tao/PortableServer/ForwardRequestC.cpp:
-        * tao/PortableServer/IdAssignmentPolicyC.cpp:
-          Regenerated to see what the footprint results are from the latest idl
-          compiler change
-
-Fri Jun 24 23:11:45 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Messaging/TAO_Messaging.pc.in:
-        * tao/RTPortableServer/TAO_RTPortableServer.pc.in:
-
-          Update with current list of dependencies based on values from
-          MPC base project files.
-
-        * tao/PI_Server.mpc:
-
-          Added Pkgconfig_Files definition.
-
-        * tao/PI_Server/TAO_PI_Server.pc.in:
-
-          New file, pkg-config *.pc template for TAO_PI_Server library.
-
-Fri Jun 24 22:50:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Fri Jun 24 13:15:03 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_codegen.cpp
-          Generated additional include files in stub header for Value Box
-
-        * TAO/tao/Valuetype/StringValue.pidl
-        * TAO/tao/Valuetype/StringValueC.cpp
-        * TAO/tao/Valuetype/StringValueC.h
-        * TAO/tao/Valuetype/StringValueC.inl
-          Standard OMG Value Box Definitions
-
-Fri Jun 24 19:42:03 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-
-          For local interfaces, changed generated code for _narrow()
-          and _unchecked_narrow() methods. For local interfaces, all
-          that needs to be done is return a duplicate of a
-          dynamic_cast<>, for both methods. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for pointing out the opportunity to
-          shrink generated code, and to Ossama Othman
-          <ossama@dre.vanderbilt.edu> for an informative discussion on
-          the possible benefits of inlining these methods.
-
-Fri Jun 24 13:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo.{cpp,inl}:
-          Moved a few methods out of the inline file to the cpp file
-
-Fri Jun 24 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Server_Request.h:
-          Corrected ifdef guards in this file to match the real filename
-
-        * tao/Dynamic_Adapter.h:
-          Removed forward declaration of TAO_GIOP_Twoway_Invocation
-
-        * tao/DynamicInterface/DII_Invocation.{h,cpp,inl}:
-          The inl file has some constructors that are ifdef'd with #if 0.
-          These used a base class that is not there, so zapped them and
-          because the inl file is now empty, removed that from the archive
-
-Fri Jun 24 06:56:11 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-
-          Avoid ambiguity error from Visual C++ 6.0.
-
-Fri Jun 24 11:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo.{h,cpp,inl}:
-        * tao/ClientRequestInfo_i.{h,cpp,inl}:
-          Moved the implementation from ClientRequestInfo_i to
-          ClientRequestInfo. The ClientRequestInfo was split into
-          two parts, this is causing problems with the PI refactoring
-          and after checking with Ossama we decided to merge these
-          two again. This maybe has a small performance impact
-          at the moment no interceptors are registered but that
-          will be resolved soon with the PI refactoring itself.
-
-        * tao/ClientRequestInterceptor_Adapter.{h,cpp}:
-          Updated to use TAO_ClientRequestInfo
-
-        * tao/Invocation_Base.{h,cpp}:
-          Updated to use TAO_ClientRequestInfo
-
-        * tao/ORB_Core_TSS_Resources.{h,cpp}:
-          No need anymore to store TAO_ClientRequestInfo in TSS.
-          This decouples the ClientRequestInfo from the ORB TSS which was the
-          main reason to do this.
-
-        * tao/tao.mpc:
-          Removed the ClientRequestInfo_i.{h,cpp,inl} files
-
-Fri Jun 24 10:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/AMI/client.cpp:
-          Added some more checks to see if things are gone fine.
-
-Fri Jun 24 09:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo_i.{h,cpp}:
-          No need to have virtual methods, this is not a base and removed
-          the destructor using an Abstract base, it is not used
-
-Fri Jun 24 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
-        * tao/ClientRequestInfo.cpp
-        * tao/ClientRequestInfo.h
-        * tao/ClientRequestInfo_i.cpp
-        * tao/ClientRequestInfo_i.h
-        * tao/ClientRequestInfo_i.inl
-        * tao/Codeset_Manager.h
-        * tao/Protocols_Hooks.h
-        * tao/Stub.h
-        * tao/PortableServer/ServerRequestInfo.cpp
-        * tao/RTCORBA/RT_Endpoint_Utils.h
-          Removed TAO_GIOP_Invocation forward declaration and remarks
-          about this. This class doesn't exist anymore already for a long
-          time
-
-Fri Jun 24 07:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Leader_Follower.h:
-          Added missing include for single threaded builds
-
-Thu Jun 23 11:02:11 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-
-          Use an IORTable::Locator_var instead of an INS_Locator to avoid a
-          deletion of a stack variable.
-
-Thu Jun 23 08:21:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp (handle_timeout):
-        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp (handle_timeout):
-
-          Catch and squelch any exceptions that might be thrown.  Also
-          fixes emulated exception builds.  Thanks to Simon Massey for
-          pointing out this issue.
-
-Thu Jun 23 14:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/operation_details.{h,cpp}:
-          The exception_list method should only be build when interceptors
-          are enabled
-
-Thu Jun 23 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.{h,cpp}:
-        * tao/ORB_Core_TSS_Resources.{h,cpp}:
-          Moved ORB_Core_TSS_Resources back to its own file. Problem was
-          easier then on first sight, orbconf.h was not includes so the
-          TSS file was build without interceptor support
-
-Thu Jun 23 12:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.{h,cpp}:
-        * tao/ORB_Core_TSS_Resources.{h,cpp}:
-          Moved ORB_Core_TSS_Resources to the ORB_Core file again. The
-          PI tests now break and I have not an idea why but moving it
-          back fixes it now. Will sort this out soon.
-
-Thu Jun 23 09:52:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp:
-
-          Replaced ACE_UNUSED_ARG() with native C++ unnamed parameters
-          in responce to Ossama's request that the macro is only used
-          in places where normal practices are not available.
-
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-
-          Removed unused arg.
-
-Wed Jun 22 18:49:03 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/ORB_Core.h:
-
-          Added include of ORB_Core_TSS_Resources.h, so when the
-          ACE_TSS_TYPE tss_resources_ member is declared, there
-          will be knowledge of a default constructor.
-
-Wed Jun 22 11:34:12 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/fe/y.tab.cpp
-        * TAO_IDL/fe/idl.yy
-
-          Added valuebox support
-
-Wed Jun 22 08:23:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp (handle_timeout):
-
-          Catch and squelch any exceptions that might be thrown by
-          destroy().  Thanks to Don Sharp for pointing out this
-          issue.
-
-        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h:
-        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.h:
-
-          #include "ace/Time_Value.h", needed by no-inline builds.  Thanks
-          to Simon Massey for pointing out this issue.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (set_records_attribute):
-
-          Changed method to process any excess records returned by the
-          query iterator.
-
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/EventLog_i.h:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
-
-          Removed write_recordlist() method, as it just called
-          write_recordlist() on the base class.
-
-Wed Jun 22 14:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.{h,cpp,i}:
-        * tao/ORB_Core_TSS_Resources.{h,cpp}:
-          Moved TAO_ORB_Core_TSS_Resources to its own file. Makes it much easier
-          to just see where things are used.
-
-        * tao/tao.mpc:
-          Added new files
-
-        * tao/Leader_Follower.{h,cpp,i}:
-        * tao/Leader_Follower_Flushing_Strategy.cpp:
-        * tao/LF_Connect_Strategy.cpp:
-        * tao/LF_Event.cpp LF_Strategy_Complete.cpp:
-        * tao/ORB.cpp:
-        * tao/PICurrent.cpp:
-        * tao/Thread_Lane_Resources.cpp:
-        * tao/Transport.cpp:
-        * tao/Wait_On_Leader_Follower.cpp:
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/ClientRequestInterceptor_Adapter.cpp:
-        * tao/RTCORBA/Thread_Pool.cpp:
-        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
-        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-          Added missing includes now we get less for free from ORB_Core
-
-Wed Jun 22 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo_i.{h,cpp,inl}:
-          Removed reply_status and response_expected methods, they had a
-          comment that they need to go and they are not used in the TAO
-          libs so it is now time to zap them
-
-Wed Jun 22 12:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp:
-          Added checks in the destroy that start and end interception
-          point calls must not be zero. If they are zero there is a bug
-          in TAO
-
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp:
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-          Explicitly destroy the ORB. When this is not done explicitly the
-          destroy operation of the registered interceptors is not called and
-          then our checks are not triggered in the destoy operation of the
-          registered interceptors
-
-Wed Jun 22 10:27:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp:
-
-          Added ACE_UNUSED_ARG() to the above files.
-
-Tue Jun 21 17:50:26 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Interceptor_List.cpp:
-
-          Include "tao/debug.h" to pull in TAO_debug_level global variable
-          declaration.
-
-Tue Jun 21 14:41:01 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-
-          Add missing "int" return type to method definitions.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-
-          Added flush and compaction handlers to class.  The flush handler
-          is scheduled when the QoS is set to QoSFlush.  The compaction
-          handler is scheduled when the max record life is set.
-
-          Removed explicit calls to remove_old_records(), that is now done
-          via the compaction handler.
-
-        * orbvcs/orbsvcs/DsLogAdmin.mpc:
-
-          Added Log_Flush_Handler.cpp and Log_Compaction_Handler.cpp to
-          the DsLogAdmin_Serv project's list of Source Files.
-
-        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp:
-        * orbsvcs/orbsvcs/Log/Log_Flush_Handler.h:
-
-          New files.  Added TAO_Log_Flush_Handler class that manages an
-          interval timer that calls flush() on the log when it fires.  The
-          interval is currently set to 300 seconds.  This should probably
-          be a parameter that is specified when the service is started.
-
-        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp:
-        * orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h:
-
-          New files.  Added TAO_Log_Compaction_Handler class that manages
-          an interval timer that calls remove_old_records() on the log
-          when it fires.  The interval is currently set to 60 seconds.
-          This should probably be a parameter that is specified when the
-          service is started.
-
-Tue Jun 21 14:27:12 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/ValueBase.h
-        * tao/Valuetype/ValueBase.cpp
-          Added support method for valuebox demarshalling.
-
-Tue Jun 21 13:38:23 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * tao/Valuetype/Value_VarOut_T.cpp
-          Added missing add_ref in TAO_Value_Var_T assignment operator
-
-Tue Jun 21 13:35:00 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be_include/be_visitor_arg_traits.h
-        * TAO_IDL/be_include/be_visitor_argument/arglist.h
-        * TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
-        * TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
-        * TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
-        * TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
-        * TAO_IDL/be_include/be_visitor_array/array.h
-        * TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
-        * TAO_IDL/be_include/be_visitor_exception/ctor.h
-        * TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
-        * TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
-        * TAO_IDL/be_include/be_visitor_field/field_ch.h
-        * TAO_IDL/be_include/be_visitor_operation/rettype.h
-        * TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
-        * TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
-        * TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
-        * TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
-        * TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
-        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h
-        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h
-        * TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h
-        * TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
-        * TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
-        * TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
-        * TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
-        * TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
-        * TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
-        * TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
-        * TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
-        * TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
-        * TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
-        * TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
-        * TAO_IDL/be/be_sequence.cpp
-        * TAO_IDL/be/be_visitor_arg_traits.cpp
-        * TAO_IDL/be/be_visitor_argument.cpp
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp
-        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
-        * TAO_IDL/be/be_visitor_array.cpp
-        * TAO_IDL/be/be_visitor_array/array.cpp
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
-        * TAO_IDL/be/be_visitor_exception.cpp
-        * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
-        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
-        * TAO_IDL/be/be_visitor_field.cpp
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
-        * TAO_IDL/be/be_visitor_operation.cpp
-        * TAO_IDL/be/be_visitor_operation/rettype.cpp
-        * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
-        * TAO_IDL/be/be_visitor_sequence.cpp
-        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
-        * TAO_IDL/be/be_visitor_tmplinst.cpp
-        * TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
-        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp
-        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp
-        * TAO_IDL/be/be_visitor_typecode.cpp
-        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
-        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
-        * TAO_IDL/be/be_visitor_typedef.cpp
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
-        * TAO_IDL/be/be_visitor_union_branch.cpp
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
-        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
-        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype.cpp
-        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
-        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
-
-          Changes and additions to IDL compiler back-end for
-          valuebox support.
-
-Tue Jun 21 16:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/releasenotes/rtc10_sched.html:
-          Removed remark about generated include of PortableServerS.h,
-          that is not valid anymore.
-
-Tue Jun 21 08:06:00 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
-          Minor changes to deal with warnings on some compilers.
-
-Tue Jun 21 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTScheduling/Current/Thread_Task.cpp:
-          Layout fixes
-
-Tue Jun 21 11:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.h:
-          Added a todo for client_request_interceptors and
-          server_request_interceptors methods that these should be removed
-          when RTCosScheduling doesn't use them anymore
-
-Tue Jun 21 10:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Interceptor_List.{h,cpp}:
-          Added destroy_interceptors method that goes through the list of
-          interceptors and calls destroy on each interceptor
-
-        * tao/IORInterceptor_Adapter.h:
-          Removed empty throw spec from destroy_interceptors and removed the
-          interceptor_list method which returns the list build up, this is
-          internal data which the outside doesn't need to have.
-
-        * tao/ORB_Core.{h,cpp} (destroy_interceptors):
-          Use the new destoy_interceptors of the Interceptor_List template
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}:
-          Use the new destoy_interceptors of the Interceptor_List template
-          and removed interceptor_list method
-
-Tue Jun 21 08:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry_Adapter.h:
-          Added export macro.
-
-Mon Jun 20 23:17:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          Fixed fuzz build errors related to missing ACE_ENV_ARG_PARAMETER
-          in call to resolve_initial_references().
-
-Mon Jun 20 21:49:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-
-          Added iterator inactivity timer that causes the iterator to self
-          destruct after 1 hour of inactivity.  This should probably be a
-          parameter that is specified when the service is started.
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Pass reactor to Iterator constructor.
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          Removed the debug messages that indicated the log service was
-          starting, and the name the ior was registered with the naming
-          service.  TAO's other ORBservice implementations don't output
-          this sort of mundane information.
-
-Mon Jun 20 12:21:00 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/be_include/be_generator.h
-        * TAO_IDL/be_include/be_valuebox.h
-        * TAO_IDL/be_include/be_visitor.h
-        * TAO_IDL/be_include/be_visitor_valuebox.h
-        * TAO_IDL/be_include/be_visitor_module/module.h
-        * TAO_IDL/be_include/be_visitor_root/root.h
-        * TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
-        * TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
-        * TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
-        * TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
-        * TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
-        * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
-        * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
-        * TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
-        * TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
-        * TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
-        * TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
-        * TAO_IDL/be/be_generator.cpp
-        * TAO_IDL/be/be_valuebox.cpp
-        * TAO_IDL/be/be_visitor.cpp
-        * TAO_IDL/be/be_visitor_root.cpp
-        * TAO_IDL/be/be_visitor_module.cpp
-        * TAO_IDL/be/be_visitor_valuebox.cpp
-        * TAO_IDL/be/be_visitor_module/module.cpp
-        * TAO_IDL/be/be_visitor_root/root.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
-          Changes and additions to IDL compiler back-end for
-          valuebox support.
-
-Mon Jun 20 09:18:00 2005  Gary Maxey <gary.maxey@hp.com>
-        * orbsvcs/IFR_Service/ifr_visitor.cpp
-        * orbsvcs/IFR_Service/ifr_visitor.h
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp
-        * orbsvcs/IFR_Service/ifr_adding_visitor.h
-          Add visitors for valuebox support.
-
-Mon Jun 20 08:51:17 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          Added missing semi-colon; bug was hidden by use of emulated
-          exception macros.
-
-Mon Jun 20 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-          Reverted change to add ami as base project and added -GC again to
-          one set of IDL files.
-
-        * orbsvcs/ImplRepo_Service/Forwarder.{h,cpp}:
-        * orbsvcs/examples/ORT/Gateway_i.h:
-          Corrected includes
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-        * orbsvcs/examples/ORT/ORT.mpc:
-          Added pi_server as base project
-
-Mon Jun 20 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/Dynamic_Implementation.cpp:
-          Fixed emulated exception errors related to the fact that
-          POA_Current_Impl doesn't use them anymore
-
-Mon Jun 20 11:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-          Fixed emulated exception errors related to the fact that
-          POA_Current_Impl doesn't use them anymore
-
-Mon Jun 20 10:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server.mpc:
-          New MPC file to build the new PI_Server library
-
-        * examples/POA/DSI/Database_i.h:
-        * examples/POA/Default_Servant/File_i.cpp:
-        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp:
-        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
-        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
-        * orbsvcs/tests/FtRtEvent/PushConsumer.cpp:
-        * orbsvcs/tests/FtRtEvent/PushSupplier.cpp:
-        * orbsvcs/tests/ImplRepo/scale/server_i.cpp:
-        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
-        * tests/File_IO/File_i.cpp:
-        * tests/ORT/ServerRequestInterceptor.h:
-        * tests/POA/Current/Current.cpp:
-        * tests/POA/Persistent_ID/server.cpp:
-        * tests/POA/Policies/Policies.cpp:
-          Added include of tao/PI_Server/PI_Server.h because of the
-          pi_server refactoring. This is needed because these files
-          use functionality that is now in the pi_server lib
-
-        * tests/File_IO/File_IO.mpc:
-        * tests/ORT/ORT.mpc:
-        * tests/POA/Current/Current.mpc:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-        * tests/POA/Policies/Policies.mpc:
-        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
-        * tests/Collocation_Opportunities/Collocation_Opportunities.mpc:
-        * examples/POA/DSI/POA_DSI.mpc:
-        * examples/POA/Default_Servant/POA_Default_Servant.mpc:
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc:
-          Added pi_server as base project
-
-        * tao/Messaging.mpc:
-          Added pi as base project, messaging needs pi stuff
-
-        * tao/PortableServer.mpc:
-          PortableServer is not dependent on pi anymore
-
-        * tao/TAO_Internal.cpp:
-          If the PI_Server_Loader is available, initialize it, this way
-          we get the needed services available
-
-        * tao/PortableServer/Object_Adapter_Factory.{cpp,h}:
-          No need to register the ORBInitializer, this is now in the pi_server
-          library
-
-        * tao/PortableServer/POA_Current_Impl.{h,cpp}:
-          Removed exception throw spec and environment macros. These are
-          coming from POA::Curent but are not used here and just make
-          things dependent on IDL generated code which it doesn't need
-          to be.
-
-        * tao/RTPortableServer/RT_Object_Adapter_Factory.{h,cpp}:
-          No need to register POA::Current, this is in the pi_server lib.
-          Also the adapter can be derived from TAO_Adapter_Factory
-
-        * tao/PortableServer/POA_Current.cpp
-        * tao/PortableServer/POA_Current.h
-        * tao/PortableServer/POA_Current.inl
-        * tao/PortableServer/PS_Current.pidl
-        * tao/PortableServer/PS_CurrentA.cpp
-        * tao/PortableServer/PS_CurrentC.cpp
-        * tao/PortableServer/PS_CurrentC.h
-        * tao/PortableServer/Policy_Creator_T.h
-        * tao/PortableServer/PortableServer_ORBInitializer.cpp
-        * tao/PortableServer/PortableServer_ORBInitializer.h
-        * tao/PortableServer/PortableServer_PolicyFactory.cpp
-        * tao/PortableServer/PortableServer_PolicyFactory.h
-          Removed these files, they are now in the pi_server library.
-          If you included one of these files or used the functionality
-          of the classes in one of these files, include
-          tao/PI_Server/PI_Server.h and link the new pi_server library.
-
-Sat Jun 18 18:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CORBA_String.{h,inl}:
-          Added missing operator = (const WChar*) to WString_out. Thanks to
-          Jean-Marc Prud'Homme <jprudhomme at interstarinc dot com> for
-          reporting this and deliver the patch. This fixes bugzilla bug
-          2159
-
-Sat Jun 18 15:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
-          Fixed crashing of notication service in mt configuration
-
-Fri Jun 17 19:54:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h (LOG_DEFAULT_MAX_REC_LIST_LEN):
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h (LOG_DEFAULT_MAX_REC_LIST_LEN):
-
-          Changed the maximum number of records that can be returned by
-          query() without using an iterator from 30 to 100.  This should
-          probably be a parameter that is specified when the service is
-          started, but until it is, 100 is a more reasonable default.
-
-          From documentation available on line, the Orbix log service
-          implementation defaults to 100 records, the VisiBroker
-          implementation defaults to 1000.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (query_i):
-
-          The ACE_LACKS_LONGLONG_T case cast the 64 bit log record fields
-          "id" and "time" to 32 bits, but the format directive still used
-          %Q.  Changed to "%d".
-
-Fri Jun 17 19:02:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          Moved code for the IOR file and pid file output.  It had been
-          mistakenly added inside a commented out section of the code.
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          From documentation available on-line, VisiBroker's and Orbix's
-          log service implementations support using corbaloc IORs and
-          resolve_initial_references() to obtain the log factory object
-          reference.  Changed TAO's implementation to support the same by
-          registering the factory IORs in the IORTable:
-
-            * "BasicLogService" for the Basic_Logging_Service
-            * "EventLogService" for the Event_Logging_Service
-            * "NotifyLogService" for the Notify_Logging_Service
-            * "RTEventLogService" for the RTEvent_Logging_Service
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-
-          Changed to inherit from iortable.
-
-Fri Jun 17 23:45:00 UTC 2005  Gary Maxey <gary.maxey@hp.com>
-
-        * TAO_IDL/include/ast_decl.h
-        * TAO_IDL/include/ast_generator.h
-        * TAO_IDL/include/ast_module.h
-        * TAO_IDL/include/ast_valuebox.h
-        * TAO_IDL/include/ast_visitor.h
-        * TAO_IDL/include/idl_global.h
-        * TAO_IDL/include/utl_err.h
-        * TAO_IDL/include/utl_scope.h
-        * TAO_IDL/util/utl_err.cpp
-        * TAO_IDL/util/utl_scope.cpp
-        * TAO_IDL/ast/ast_generator.cpp
-        * TAO_IDL/ast/ast_module.cpp
-        * TAO_IDL/ast/ast_redef.cpp
-        * TAO_IDL/ast/ast_valuebox.cpp
-          Changes and additions to IDL compiler front-end for
-          valuebox support.
-
-Fri Jun 17 15:40:51 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/orbsvcs.rc:
-        * orbsvcs/orbsvcs/orbsvcs_export.h:
-
-          Remove stray bits left over from when orbsvcs was a single
-          library.
-
-Fri Jun 17 19:09:56 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Reverted the change of
-
-          Thu Jun 16 18:54:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          It seems this problem is appearing in other places besides
-          generated code, and that making lots of modifications to
-          TAO code to work around what is essentially an HP compiler
-          bug is not the right approach. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for advice on this matter.
-
-Fri Jun 17 17:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.cpp:
-          Fixed resolve_initial_references of the CodecFactory
-
-Fri Jun 17 12:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server/*:
-          First commit of the PI_Server library. Will contain the parts
-          of the PortableServer that are dependent on PortableInterceptors.
-          These files will be used soon when the MPC files are updated
-
-Fri Jun 17 11:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DLL_ORB/client.cpp:
-          Fixed process_directive call
-
-Fri Jun 17 09:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.cpp:
-          Corrected wrong compare in resolve_initial_references
-
-Fri Jun 17 09:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Param_Test/Param_Test.mpc:
-          Added explicit after so that we don't compile the same idl file
-          at the same time multiple times
-
-Fri Jun 17 09:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.{h,cpp}:
-          Removed some unneeded emulated exeption macros
-
-Fri Jun 17 09:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-          Fixed typo in exename, wanted to commit this yesterday but couldn't
-          reach cvs
-
-Fri Jun 17 09:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DLL_ORB/client.cpp:
-        * tests/DLL_ORB/server.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
-          Use the new macro ACE_DYNAMIC_SERVICE_DIRECTIVE to load the
-          libraries
-
-Fri Jun 17 09:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1551_Regression/test.mpc:
-          Simplified this mpc file
-
-Fri Jun 17 09:56:44 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/Valuetype/ValueBase.cpp:
-
-          Add support for stream encoded repository ID indirection as per
-          "15.3.4.3 Scope of the Indirections" in 02-06-33.
-          This fixes bug #2156.
-
-Fri Jun 17 08:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry.cpp:
-        * tao/PI/ORBInitInfo.cpp:
-        * tao/PortableServer/LifespanStrategyPersistent.cpp:
-        * tao/RTCORBA/RT_ORBInitializer.cpp:
-        * tao/ORB_Core.cpp:
-          Use the new macro ACE_DYNAMIC_SERVICE_DIRECTIVE to load the
-          libraries
-
-        * tao/Messaging/Messaging.cpp:
-          Return the value of the process_directive call
-
-        * tao/Messaging/Messaging_ORBInitializer.{h,cpp}:
-          Don't keep a PolicyFactory as member, just create an instance for
-          each ORB. Keeping an instance can cause crashes when the unloading
-          of the DLL already has happened before the PolicyFactory registry
-          is destructed.
-
-        * tao/PortableServer/Servant_Upcall.h:
-          Added forward declaration of CORBA::Object. Need it soon because
-          of even more subsetting
-
-        * tao/ORB_Core.cpp:
-        * tao/ORB.{h,cpp}:
-          Changed the way we throw an InvalidName exception from
-          resolve_initial_references. Instead of throwing it from each
-          resolve_x_method, just let those methods return a nil object
-          and then throw the exception at the end of
-          resolve_initial_references when then the object reference is nil.
-          This reduces some needs for exception emulation macros but more
-          important it guarantees that we always throw the exception instad
-          of returning a nil reference. During testing I found that a rir
-          of POACurrent returned a nil reference when the PortableServer
-          library was not loaded instead of throwing an exception.
-
-Fri Jun 17 08:49:09 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
-
-          Use _retn () instead of out () for the return value from
-          _get_component ().
-          This fixes bug #2155.
-
-Thu Jun 16 14:23:08 MST 2005  Trevor Fields  <fields_t@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
-
-          Fix warning about unsigned long arg.
-
-Thu Jun 16 18:54:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Added conditional (for HPUX compiler only) code generation of
-          include of ace/SString.h in the stub source file, apparently
-          necessary when the HP compiler has optimize=1. Thanks to
-          Kris Dekeyser <Kris.Dekeyser@lms.be> for reporting the problem.
-
-Thu Jun 16 17:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Internal.cpp:
-          Do the initialisation of the messaging loader earlier
-
-Thu Jun 16 16:47:42 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/IFR_Service/be_produce.cpp:
-
-          Check repository ptr is not null before use in BE_cleanup.
-          This fixes bug #2154.
-
-Thu Jun 16 07:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer_Registry_Impl.{h,cpp}:
-          Implemented fini call, at the moment the ORBInitializer Registry
-          is removed by service config we release all registered
-          ORBInitializers
-
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-          Simplified this MPC file
-
-Thu Jun 16 06:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Param_Test/Param_Test.mpc:
-          Set exename for anyop
-
-Wed Jun 15 13:46:48 MST 2005  Trevor Fields  <fields_t@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_module/serializer_op.cpp:
-        * TAO_IDL/be/be_visitor_root/serializer_op.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
-        * TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_module/serializer_op.h:
-        * TAO_IDL/be_include/be_visitor_root/serializer_op.h:
-        * TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h:
-
-          Addin additional files for providing serialization for sending
-          in DDS.
-
-Wed Jun 15 12:36:04 MST 2005  Trevor Fields  <fields_t@ociweb.com>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_array.cpp:
-        * TAO_IDL/be/be_visitor_enum.cpp:
-        * TAO_IDL/be/be_visitor_field.cpp:
-        * TAO_IDL/be/be_visitor_module.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_structure.cpp:
-        * TAO_IDL/be/be_visitor_typedef.cpp:
-        * TAO_IDL/be/be_visitor_union.cpp:
-        * TAO_IDL/be/be_visitor_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef.cpp:
-        * TAO_IDL/be/be_visitor_union/union.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_array.h:
-        * TAO_IDL/be_include/be_visitor_enum.h:
-        * TAO_IDL/be_include/be_visitor_field.h:
-        * TAO_IDL/be_include/be_visitor_module.h:
-        * TAO_IDL/be_include/be_visitor_root.h:
-        * TAO_IDL/be_include/be_visitor_sequence.h:
-        * TAO_IDL/be_include/be_visitor_structure.h:
-        * TAO_IDL/be_include/be_visitor_typedef.h:
-        * TAO_IDL/be_include/be_visitor_union.h:
-        * TAO_IDL/be_include/be_visitor_union_branch.h:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          Adding idl support for the new DDS DCPS implementation over TAO.
-
-Wed Jun 15 17:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Collocation_Proxy_Broker.h:
-          Added include to get size_t. This should fix the LynxOS build
-
-Wed Jun 15 10:46:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/PortableServer/TAO_PortableServer.pc.in:
-
-          Added TAO_PI to list of required libraries.
-
-        * tao/PI.mpc:
-
-          Added Pkgconfig_Files definition.
-
-        * tao/PI/TAO_PI.pc.in:
-
-          New file, pkg-config *.pc template for TAO_PI library.
-
-Wed Jun 15 13:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POA_Current_Impl.cpp:
-        * tao/PortableServer/Root_POA.cpp:
-          Removed several not needed includes
-
-Wed Jun 15 11:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Param_Test/Param_Test.mpc:
-          Simplified this MPC file, server anyop are not using messaging
-
-        * tao/RTScheduling/RTScheduler_Loader.h:
-          Removed not needed forward declaration
-
-        * tao/Messaging/Messaging_ORBInitializer.h:
-          Removed not needed forward declaration
-
-        * tao/Messaging/Messaging_Loader.{h,cpp}:
-        * tao/Messaging/Messaging.cpp:
-          We have an initialisation problem in the Messaging library, it
-          registers it ORBInitializer in a static object but the
-          ORBInitializer_Registry then doesn't need to be loaded yet.
-          Added a Messaging_Loader, this loader is just add to the
-          service config registry in the static object, from TAO_Internal
-          we then intialize the Message_Loader when it is available,
-          which then will register the ORBInitializer. Maybe this problem
-          exists with more libs, the regression tests will show it.
-
-        * tao/TAO_Internal.cpp:
-          Initialise the Messaging Loader when available
-
-        * tao/PI/ORBInitializer_Registry_Impl.h:
-          Removed old documentation
-
-        * tao/RTCORBA/RT_ORBInitializer.cpp:
-          Initialise pointer with 0
-
-Wed Jun 15 10:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/RTScheduling/Distributable_Thread.cpp:
-        * tao/RTScheduling/Request_Interceptor.h:
-        * tao/RTScheduling/RTScheduler_Initializer.cpp:
-        * tao/RTScheduling/RTScheduler_Loader.cpp:
-          Fixed some potential memory leaks when things go wrong and some
-          minor formatting changes
-
-Wed Jun 15 09:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry.cpp:
-          Don't try to load the ORBInitializer registry in a static
-          build
-
-Wed Jun 15 08:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-          Fixed conversion warning
-
-Tue Jun 14 21:35:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/PolicyFactory_Registry_Adapter.cpp:
-
-          Removed stray semi-colon.
-
-Tue Jun 14 20:57:00 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        From Lothar Werzinger <lothar@xcerla.com>
-        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp (init_new_naming):
-
-          Register with the ORB's resolve_initial_references() mechanism.
-          Primarily useful for dynamically loaded Name Services.
-          [Bug 2150]
-
-Tue Jun 14 14:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Server_Request.h:
-          Just include Object.h to get CORBA::Object instead of a forward
-          declaration, we get else problems in an inline build.
-
-Tue Jun 14 14:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/SCIOP_Profile.cpp:
-          Include tao/StringSeqC.h to get StringSeq. It seems the refactoring
-          of some PI reveales a lot of includes which are previously
-          gotten for free.
-
-Tue Jun 14 14:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Upcall_Wrapper.cpp:
-          Added include of tao/Argument.h, this is not pulled in when
-          interceptors are disabled
-
-Tue Jun 14 14:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Server_Request.h:
-          Added forward declaration of CORBA::Object. This is not pulled in
-          when interceptors are disabled
-
-Tue Jun 14 14:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/check_supported_priorities.cpp
-        * tests/RTCORBA/common_args.cpp
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
-        * tests/RTCORBA/Banded_Connections/client.cpp
-        * tests/RTCORBA/Banded_Connections/server.cpp
-        * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
-        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
-        * tests/RTCORBA/Client_Propagated/client.cpp
-        * tests/RTCORBA/Client_Propagated/server.cpp
-        * tests/RTCORBA/Collocation/Collocation.cpp
-        * tests/RTCORBA/Linear_Priority/client.cpp
-        * tests/RTCORBA/Linear_Priority/server.cpp
-        * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
-        * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
-        * tests/RTCORBA/Policy_Combinations/client.cpp
-        * tests/RTCORBA/Policy_Combinations/server.cpp
-        * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
-        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
-        * tests/RTCORBA/Server_Declared/server.cpp
-        * tests/RTCORBA/Thread_Pool/client.cpp
-        * tests/RTCORBA/Thread_Pool/server.cpp
-          Return 2 instead of -1 when the check_support_priorities fail.
-          The test scripts expect then a return value of 2
-
-Tue Jun 14 14:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Updated Borland build instructions
-
-Tue Jun 14 13:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer_Registry_Impl.cpp:
-          Corrected include
-
-Tue Jun 14 13:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.{h,cpp}:
-          Updated includes
-
-Tue Jun 14 12:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h:
-          Updated include, missed in a previous checkin
-
-Tue Jun 14 12:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/ORBInitializer_Registry.{h,cpp}:
-          Renamed to ORBInitializer_Registry_Impl.{h,cpp} This prevents
-          confusion if we have the file in the tao or tao/PI directory
-
-        * tao/PI/PI.cpp:
-          Updated include
-
-Tue Jun 14 11:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.h:
-        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h:
-        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h:
-          Added missing include of CodecFactory.h
-
-Tue Jun 14 11:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-          Fixed problem with emulated exceptions
-
-Tue Jun 14 10:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IOPS_T.h:
-          Removed, not included by IOPS.h anymore
-
-        * tao/tao.mpc:
-          Removed tao/tao.mpc
-
-Tue Jun 14 10:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
-          Added missing includes
-
-Tue Jun 14 10:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h:
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h:
-          Added missing includes
-
-Tue Jun 14 10:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/AV/SCTP_SEQ.h:
-          Added missing include
-
-Tue Jun 14 09:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_1693_Test/client.cpp:
-        * tests/RTCORBA/Thread_Pool/client.cpp:
-        * tests/Codec/client.cpp:
-          Fixed compile errors
-
-        * tao/ORB.cpp:
-        * tao/ORB_Core.{h,cpp}:
-          Changed the way we use the ORBInitializer registry. When it is
-          requested from the ORB_Core, get it from the service config
-          registry but in a static build don't try to load it on demand
-
-Tue Jun 14 08:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI/*:
-          New PI library. Contains ORBInitializer registry, ORBInitInfo and
-          PolicyFactory. This will be extended in the future with more classes
-          but this is the first step. If you use any of these classes in
-          your app, add the include of tao/PI/PI.h to your application code.
-          This will make sure the service config registry is filled with
-          the loadable modules.
-
-        * tao/BiDir_GIOP.mpc:
-          The BiDir library uses a PolicyFactory so it must link with the PI
-          library
-
-        * tao/Interceptor_List.{h,cpp}:
-          Changed the list to return a value indicating whether it was possible
-          to add the interceptor or not. The caller in the PI or IORInterceptor
-          library will then throw the correct exception. This way the list
-          template can stay in the TAO lib because the exception DuplicateName
-          is now in the PI library
-
-        * tao/IORInterceptor.mpc:
-          Added PI as base project
-
-        * tao/IORInterceptor_Adapter.{h,cpp}:
-          Removed throw clause from add_interceptor method. The clause was
-          not correct also, it could throw a DuplicateName exception also.
-          This way we are not dependent on the PI library. Also the adapter
-          doesn't need to be derived from ACE_Service_Object, this class
-          is not loaded, the factory that creates it is.
-
-        * tao/IORInterceptor_Adapter_Factory.{h,cpp}:
-          Removed destructor, it is not needed
-
-        * tao/ORB.cpp:
-          Updated to use the new ORBInitializer Factory adapter and Policy
-          Factory adapter
-
-        * tao/ORB_Core.{h,cpp,i}:
-          Updated for new adapters and interceptor list changes. Also added
-          a get_orbinitializer_registry which returns the current pointer
-          without trying to load the PI library. This is used by the ORB
-          to call alls orbinitializers. When the library is not loaded yet,
-          no user code caused this so we don't have to do this also
-
-        * tao/ORBInitializer.pidl:
-        * tao/ORBInitializerA.cpp:
-        * tao/ORBInitializerC.{h,cpp,inl}:
-        * tao/ORBInitializerS.h:
-        * tao/ORBInitInfo.pidl:
-        * tao/ORBInitInfoA.cpp:
-        * tao/ORBInitInfoC.{h,cpp,inl}:
-        * tao/ORBInitInfoS.h:
-        * tao/ORBInitInfo.{h,cpp,inl}:
-        * tao/PolicyFactory.pidl:
-        * tao/PolicyFactory_Registry.{h,cpp}:
-        * tao/PolicyFactoryA.cpp:
-        * tao/PolicyFactoryC.{h,cpp,inl}:
-          Moved to the PI library
-
-        * tao/IOP_Codec.pidl:
-        * tao/IOP_CodecA.cpp:
-        * tao/IOP_CodecC.{h,cpp,inl}:
-          Moved to the CodecFactory library
-
-        * tao/IOP.pidl:
-          Removed include of IOP_Codec.pidl
-
-        * tao/ORBInitializer_Registry.{h,cpp}:
-          Removed all code except register_orb_initializer, which now tries
-          to load the ORBInitializer Registry on demand. The code is moved to
-          the PI library
-
-        * tao/PI.mpc:
-          New file
-
-        * tao/PolicyFactory_Registry_Adapter.{h,cpp}:
-          New adapter for PolicyFactory_Registry
-
-        * tao/PolicyFactory_Registry_Factory.h:
-          New factory for creating a PolicyFactory for each ORB
-
-        * tao/PortableInterceptor.pidl:
-          Removed files that moved to the PI library
-
-        * tao/PortableInterceptorA.cpp:
-          Removed, empty
-
-        * tao/PortableInterceptorC.{cpp,h}:
-          Regenerated
-
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/Utils.mpc
-          Based on the new PI. These all use something of the PI library.
-          Because of this only a client gets benefits from this, but the
-          server will be handled in the next iteration
-
-        * tao/tao.mpc:
-          Updated for all changes
-
-        * tao/BiDir_GIOP/BiDirGIOP.cpp:
-          Added include of ORBInitializer_Registry.h
-
-        * tao/BiDir_GIOP/BiDir_ORBInitializer.{h,cpp}:
-        * tao/BiDir_GIOP/BiDir_PolicyFactory.h:
-          Include tao/PI/PI.h
-
-        * tao/CodecFactory/CodecFactory.h:
-          Include IOP_CodecC.h
-
-        * tao/CodecFactory/IOP_CodecC.{h,cpp}:
-        * tao/CodecFactory/IOP_CodecA.cpp:
-        * tao/CodecFactory/IOP_CodecS.h:
-          Files moved from the tao lib
-
-        * tao/CodecFactory/IOP_Codec_include.pidl:
-        * tao/CodecFactory/IOP_Codec_includeC.h:
-        * tao/CodecFactory/IOP_Codec_includeS.h:
-          New files for apps that include IOP_Codec.pidl in the past, they
-          should now use this pidl file
-
-        * tao/CodecFactory/CDR_Encaps_Codec.h:
-        * tao/CodecFactory/CodecFactory.h:
-        * tao/CodecFactory/CodecFactory_imp.h:
-          Updated for moving of IOP_Codec.pidl
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}:
-          Updated for interceptor list change
-
-        * tao/Messaging/Messaging_ORBInitializer.h:
-        * tao/Messaging/Messaging_PolicyFactory.h:
-        * tao/PortableServer/PortableServer_ORBInitializer.{h,cpp}:
-        * tao/PortableServer/PortableServer_PolicyFactory.h:
-        * tao/RTCORBA/RT_ORBInitializer.cpp:
-        * tao/RTCORBA/RT_PolicyFactory.h
-        * tao/RTScheduling/RTScheduling_Initializer.{h,cpp}:
-        * tao/Utils/RIR_Narrow.h:
-          Changed includes to include tao/PI/PI.h
-
-        * tao/docs/libraries.html:
-          Added PI
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
-        * orbsvcs/examples/LoadBalancing/ORBInitializer.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
-        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
-        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
-        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
-        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
-        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
-        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
-        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
-        * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
-        * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc
-        * tests/Bug_1495_Regression/Bug_1495.mpc
-        * tests/Bug_1495_Regression/Client_ORBInitializer.h
-        * tests/Bug_1495_Regression/Server_ORBInitializer.h
-        * tests/ORT/ORT.mpc
-        * tests/ORT/ServerORBInitializer.h
-        * tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
-        * tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
-        * tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
-        * tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
-        * tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
-        * tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
-        * tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
-        * tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
-        * tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
-        * tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
-        * tests/Portable_Interceptors/PICurrent/client.cpp
-        * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
-        * tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
-          Updated for the new PI library
-
-        * tests/RTCORBA/check_supported_priorities.cpp
-        * tests/RTCORBA/common_args.cpp
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
-        * tests/RTCORBA/Banded_Connections/client.cpp
-        * tests/RTCORBA/Banded_Connections/server.cpp
-        * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
-        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
-        * tests/RTCORBA/Client_Propagated/client.cpp
-        * tests/RTCORBA/Client_Propagated/server.cpp
-        * tests/RTCORBA/Collocation/Collocation.cpp
-        * tests/RTCORBA/Linear_Priority/client.cpp
-        * tests/RTCORBA/Linear_Priority/server.cpp
-        * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
-        * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
-        * tests/RTCORBA/Policy_Combinations/client.cpp
-        * tests/RTCORBA/Policy_Combinations/server.cpp
-        * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
-        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
-        * tests/RTCORBA/Server_Declared/server.cpp
-        * tests/RTCORBA/Thread_Pool/client.cpp
-        * tests/RTCORBA/Thread_Pool/server.cpp
-          Instead of doing an ACE_OS::exit() when the needed priorities
-          are not available, return from the main with a -1. Will reduce
-          the number of memory leaks reported by valgrind a lot.
-
-Tue Jun 14 07:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp:
-          Added missing include
-
-Mon Jun 13 17:27:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp (get):
-
-          Change to return a zero-length sequence before destroying
-          iterator as required by the spec.
-
-Mon Jun 13 17:18:44 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-
-          Change type of constraint member variable to CORBA::String_var
-          so we don't dereference a dangling char * in get().
-
-Mon Jun 13 12:10:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Changed to interpret "position" as the index in the complete
-          sequence of records that match the constraint instead of the
-          index in the sequence of all records.
-
-          Changed TAO_Iterator_i constructor to take new "current" and
-          "end" iterator parameters.  This allows us to avoid scanning
-          and skipping records returned as part of the initial query().
-
-          Simplify iterating over record store by using ACE_Hash_Map's
-          STL-like API.
-
-Mon Jun 13 18:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h:
-          Converted comments to doxygen style
-
-Mon Jun 13 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp:
-          Include ORBInitializer_Registry.h, needed for the upcoming PI library
-
-Mon Jun 13 05:07:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
-
-          Made public destructors protected since the objects in question
-          are reference counted, i.e. memory management should be
-          performed through the reference counting mechanism, not operator
-          delete();
-
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h (TAO_FlowSpec_Entry):
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i:
-
-          Fixed a memory leak.
-
-Mon Jun 13 09:32:38 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/IIOP_Profile.cpp:
-        * tao/Tagged_Component.cpp:
-        * tao/Tagged_Component.h:
-
-          Reverted the change to TAO_Tagged_Component::get_component.
-
-Mon Jun 13 12:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/Client_Propagated/client.cpp:
-          Added include of ORBInitializer_Registry.h
-
-Mon Jun 13 11:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
-        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
-        * tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc:
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
-        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc:
-        * tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
-          Use interceptors as base project instead of the requires
-          interceptors
-
-Mon Jun 13 08:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies/SCIOP_Endpoint.cpp:
-          Fixed compile error
-
-Mon Jun 13 08:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Messaging/Asynch_Invocation_Adapter.{h,cpp}:
-          Fixed ambiguity warnings with Borland.
-
-Sun Jun 12 23:09:36 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp (TAO_Log_Constraint_Visitor):
-
-          Add property list bindings for each item in the log record's
-          attribute list.
-
-Sun Jun 12 23:38:02 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/GIOP_Message_Base.h (process_request, process_locate_request):
-
-          Made the above calls virtual since it makes it easier to do
-          implementation inheritance, and override behaviours.
-
-Sun Jun 12 14:24:05 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (query_i, match_i, remove_old_records):
-
-          Simplify iterating over record store by using ACE_Hash_Map's
-          STL-like API.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (query_i):
-
-          Changed from LOG_HASH_MAP_ITER to LOG_RECORD_STORE_ITER.
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.h (TAO_LogRecordStore):
-
-          Added LOG_RECORD_STORE_ENTRY typedef.
-
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp: (TAO_Iterator_i):
-        * orbsvcs/orbsvcs/Log/Iterator_i.h (TAO_Iterator_i):
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (query_i):
-
-          Removed max_store_size argument from constructor.
-          Removed (unused) max_store_size member variable.
-
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
-
-          Changed constructor to directly assign log record's .info field
-          to property list value binding instead of stashing it in an the
-          Any.  This allows the value to be queried via ETCL constraints.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (remove_old_records):
-
-          Changed conditional in constraint as it was casing new, not old,
-          records to be deleted.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (validate_capacity_alarm_thresholds):
-        * orbsvcs/orbsvcs/Log/Log_i.h (validate_capacity_alarm_thresholds):
-
-          Move validate_capacity_alarm_thresholds method from public to
-          protected visibility.
-
-        * tao/Makefile.am:
-
-          Updated to remove Queued_Message.inl.
-
-Sun Jun 12 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Collocation_Proxy_Broker.h:
-          Added forward declaration of environment
-
-Sun Jun 12 13:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.{h,cpp}:
-        * tao/RTCORBA/RT_ORBInitializer.{h,cpp}:
-          Updated the way the policyfactory is registered in a way that things
-          are not dependent on the destruction order and we only have one
-          instance of the factory in runtime
-
-Sun Jun 12 12:37:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-
-        * rules.tao.GNU:
-          Fixed problem with TAO version detection when default Make
-          shell is CMD.EXE.
-
-Sat Jun 11 23:45:07 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_operation.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be_include/be_visitor_operation.h:
-        * TAO_IDL/be_include/be_visitor_sequence.h:
-
-          Removed includes of unused files.
-
-        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
-
-          Fixed incorrect visitor names in error messages.
-
-        * TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_is.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_post_invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_pre_invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp:
-        * TAO_IDL/be/be_visitor_sequence/elemtype.cpp:
-        * TAO_IDL/be_include/be_visitor_argument/post_invoke_cs.h:
-        * TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h:
-        * TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_is.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_post_invoke_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h:
-        * TAO_IDL/be_include/be_visitor_sequence/elemtype.h:
-
-          Removed from the repository visitors that are no longer used.
-          Thanks to Gary Maxey <gary.maxey@hp.com> for pointing out
-          most of them.
-
-Sat Jun 11 14:43:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogConsumer.cpp (push):
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp (push):
-
-          Add ACE_TRY_CATCH after call to write_recordlist() for emulated
-          exception builds.
-
-Sat Jun 11 13:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PolicyFactory_Registry.cpp:
-          Fixed memory leak at the moment the registering of a policy
-          factory fails
-
-Sat Jun 11 12:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/RTCORBA/Linear_Priority/run_test.pl:
-          When the server can't be started end this test directly
-
-        * tao/RTCORBA/RT_ORBInitializer.{h,cpp}:
-          Changed the way we register the PolicyFactory. Don't store it as
-          member in the ORBInitializer, this gives problems now we start
-          loading the PI stuff on demand. The order of destruction seems to
-          be changed causing crashes in the RTCorba tests. This fixes these
-          crashes
-
-Sat Jun 11 11:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Queued_Message.{h,inl,cpp}:
-          Removed the .inl file, it is empty
-
-Fri Jun 10 14:58:23 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Fri Jun 10 13:07:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Collocation_Proxy_Broker.cpp:
-        * tao/Collocation_Proxy_Broker.h:
-        * tao/Connection_Handler.cpp:
-        * tao/Connection_Handler.inl:
-        * tao/GIOP_Message_Generator_Parser.cpp:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/Invocation_Adapter.cpp:
-        * tao/Invocation_Adapter.inl:
-        * tao/New_Leader_Generator.cpp:
-        * tao/New_Leader_Generator.h:
-        * tao/Object.cpp:
-        * tao/Object.i:
-        * tao/Policy_Manager.cpp:
-        * tao/Policy_Manager.i:
-        * tao/Queued_Message.cpp:
-        * tao/Queued_Message.inl:
-        * tao/SystemException.cpp:
-        * tao/SystemException.h:
-        * tao/UTF16_BOM_Translator.cpp:
-        * tao/UTF16_BOM_Translator.h:
-        * tao/Messaging/MessagingS.cpp:
-        * tao/Messaging/MessagingS.h:
-        * tao/PortableServer/PolicyS.cpp:
-        * tao/PortableServer/PolicyS.h:
-        * tao/PortableServer/Upcall_Command.cpp:
-        * tao/PortableServer/Upcall_Command.h:
-
-          Moved inlined virtual methods out of line.  Inlinging them
-          causes RTTI issues when using g++ 4.0's hidden symbol
-          visibility.
-
-        * tao/Messaging/Asynch_Invocation_Adapter.cpp:
-        * tao/Messaging/Asynch_Invocation_Adapter.h (invoke):
-        * tao/Messaging/Asynch_Invocation_Adapter.inl:
-
-          Removed unnecessary virtual function override.  All it was
-          forward the call to the base class implementation.
-
-          Removed empty inline source file.
-
-        * tao/Makefile.am:
-        * tao/tao.mpc:
-
-          Updated source file lists.
-
-Fri Jun 10 13:00:49 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/PICurrent_Loader.h:
-
-          Include "tao/orbconf.h" to pull in default TAO_HAS_INTERCEPTORS
-          preprocessor symbol definition.  Fixes link-time errors related
-          to missing static constructor definition.
-
-        * tao/PICurrent_Loader.cpp:
-
-          Reorganized include directives so that interceptor related
-          headers are not included when compile-time interceptor support
-          is not enabled.
-
-Fri Jun 10 12:51:44 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-
-          Generate out of line virtual methods.  Inlined ones prevent RTTI
-          from working when enabling hidden symbols with g++ 4.0's
-          visibility support.
-
-        * tao/GIOP_Message_Generator_Parser_Impl.inl (check_revision):
-
-          Made "max_allowable_version" variable a static constant instead
-          of a non-const variable.  Reduces run-time overhead since this
-          value may be computed at compile-time.
-
-Fri Jun 10 18:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.cpp:
-        * tao/ORB_Core.{h,i}:
-        * tao/PICurrent_Loader.{h,cpp}:
-          Fixed compile errors when interceptors are disabled
-
-Fri Jun 10 17:21:28 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/tests/Bug_2137_Regression/run_test.pl:
-
-          Fix wrong 'use lib'.
-
-Fri Jun 10 09:59:17 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/default_client.cpp:
-
-          Ensure that all TAO related options are consistently case
-          insensitive.
-
-Fri Jun 10 13:16:27 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/fe_extern (FE_generate_UUID):
-
-          Added arguments (which were passed by default value before) to
-          the generateUUID() call on the ACE UUID_GENERATOR singleton.
-          These arguments trigger the inclusion of the thread id in the
-          formation of the uuid, along with the process id and timestamp
-          that were already being used. In some experiments we have done
-          with the Visual Studio 2005 beta (which can take advantage of
-          multiple processors to do parallel builds), the process id
-          and timestamp alone were apparently not enough to ensure a
-          unique id when creating one for use in the temporary file name,
-          and multiple threads corresponding to multiple builds in the
-          same directory were trying to open temporary files with the
-          same name.
-
-Fri Jun 10 08:21:47 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp:
-        * examples/RTScheduling/Thread_Task.cpp:
-
-          Addressed data initialization and memcpy issues which mainly
-          showed up in a 64-bit Solaris build.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
-
-          Use ACE_SCOPE_THREAD on AIX and MacOS X instead of
-          ACE_SCOPE_PROCESS since it's not supported.
-
-Fri Jun 10 07:51:36 2005  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/Options.html:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/ORB_Core.cpp:
-        * tao/Tagged_Components.cpp:
-        * tao/Tagged_Components.h:
-        * tao/params.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/PortableServer/Default_Acceptor_Filter.cpp:
-        * tests/AlternateIIOP:
-        * utils/catior/catior.cpp:
-
-          Added support for TAG_ALTERNATE_IIOP_ADDRESS to combine many
-          endpoints into a single profile when not using RTCORBA. This may
-          be overridden by using the ORB_init argument
-          -ORBUseSharedProfiles 0. It is enabled by default. Unlike the
-          TAO-specific TAO_TAG_ENDPOINTS, the TAG_ALTERNATE_IIOP_ADDRESS
-          component contains a single host:port pair, but many such
-          components may be added to a profile to carry as many endpoints
-          as required.
-
-Fri Jun 10 10:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CodecFactory/*:
-          New CodecFactory library. When users want to use the CodecFactory
-          they have to include tao/CodecFactory/CodecFactory.h
-
-        * tao/Bind_Dispatcher_Guard.h:
-          Doxygen improvement
-
-        * tao/IOP_IOR.pidl:
-          Updated numbers for reliable multicast as mentioned in omg document
-          03-01-11
-
-        * tao/CDR_Encaps_Codec.{h,cpp}:
-        * tao/CodecFactory.{h,cpp}:
-          These files are moved to the CodecFactory library
-
-        * tao/CodecFactory.mpc:
-          New MPC file for the CodecFactory library
-
-        * tao/ClientRequestInfo_i.h:
-        * tao/ClientRequestInterceptor_Adapter.{h,cpp}:
-        * tao/Collocated_Invocation.cpp:
-        * tao/Invocation_Base.cpp:
-        * tao/PICurrent_Copy_Callback.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/TAO_Server_Request.h:
-        * tao/TSS_Resources.h:
-        * tao/Messaging/Asynch_Invocation.cpp:
-        * tao/PortableServer/ServerRequestInfo.h:
-          Changed includes and added some more forward declarations because
-          of reduced header dependencies
-
-        * tao/Tagged_Components.h:
-          Removed commented out code
-
-        * tao/tao.mpc:
-          Updated for all these changes
-
-        * tao/ClientRequestInfo_i.i:
-          Added needed include
-
-        * tao/CodecFactory_ORBInitializer.{h,cpp}:
-          Removed, we don't use an ORBInitializer anymore for the CodecFactory
-
-        * tao/ORB.cpp:
-        * tao/ORB_Core.{h,cpp,i}:
-          Changed the way we retrieve the CodecFactory and PICurrent. Instead
-          of an ORBInitializer we try to load them using svc.conf
-
-        * tao/ORBInitInfo.cpp:
-          Use svc.conf to get the CodecFactory instead of allocating a new
-          instance here
-
-        * tao/Parser_Registry.cpp:
-          Removed empty explicit template instantiation block
-
-        * tao/PICurrent.{h,cpp,inl}:
-        * tao/PICurrent_Impl.{h,cpp,inl}:
-          Moved TAO::PICurrent_Impl to its own file
-
-        * tao/PICurrent.pidl:
-        * tao/PICurrentA.cpp:
-        * tao/PICurrentC.{h,cpp}:
-        * tao/PICurrentS.h:
-          Moved PICurrent to its own file
-
-        * tao/PICurrent_Loader.{h,cpp}:
-          Use svc.conf to get PICurrent
-
-        * tao/PICurrent_ORBInitializer.{h,cpp}:
-          Removed these files
-
-        * tao/Policy_Manager.{h,cpp,i}:
-        * tao/Policy_Current.{h,cpp,inl}:
-        * tao/Policy_Current_Impl.{h,cpp,inl}:
-          Moved Policy_Current and Policy_Current_Impl to their own files
-
-        * tao/PortableInterceptor.pidl:
-        * tao/PortableInterceptorA.cpp:
-        * tao/PortableInterceptorC.{h,cpp}:
-        * tao/PortableInterceptorS.h:
-          Moved PICurrent out of this file and regenerated
-
-        * tao/Services_Activate.cpp:
-          Removed explicit templates
-
-        * tao/ServicesS_T.h:
-          Removed
-
-        * tao/orbconf.h:
-          Added deablfine for RootPOAManager name, will be used later
-
-        * tao/objectid.h:
-          Added define for POAManagerFactory
-
-        * tao/LocalObject.{h,cpp}:
-          Override _get_orb to throw a no implement with minor code 8
-
-        * tao/Object.{h,cpp}:
-          Added _get_orb()
-
-        * docs/libraries.html:
-          Added codecfactory
-
-        * tests/Bug_1693_Test/Bug_1693_Test.mpc:
-        * tests/Bug_1693_Test/client.cpp:
-        * tests/Codec/client.cpp:
-        * tests/Codec/Codec.mpc:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp:
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
-        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc:
-        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
-        * orbsvcs/PSS/PSDL_Code_Gen.cpp:
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp:
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
-          Updated because of new CodecFactory library
-
-Fri Jun 10 10:15:17 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Bug_2144_Regression/Bug_2144_Regression.mpc:
-
-          Add valuetype to dependencies to (hopefully) fix Linux error.
-
-        * tao/Profile.cpp:
-
-          Fix warning on Linux.
-
-Thu Jun 10 08:40:00 UTC 2005  Simon Massey  <sma@prismtech.com>
-
-        * tao/orbsvcs/tests/Bug_2137_Regression/client.cpp:
-          Corrected const char * problem.
-
-Thu Jun  9 18:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Tagged_Components.h:
-          Removed commented out code
-
-Thu Jun  9 18:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ServicesS_T.h:
-          Removed this file, was not included at all
-
-Thu Jun  9 18:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/FaultTolerance/ChangeLog:
-          Removed this file, we have a main changelog
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
-          Minor formatting issues. Fixes bugzilla bug 2139. Thanks to
-          <jmegq at radiance dot com>
-
-Thu Jun  9 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/Reference_Counting/*
-          New reference counting test, regression for bug 2142.
-          Thanks to Frank Pilhofer <fp@mc.com>
-
-Thu Jun  9 15:33:52 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-
-          Change valuetype acessor declaration to return a pointer
-          rather than a _ptr.
-
-          This fixes bugzilla #2144.
-
-        * tests/Bug_2144_Regression/Bug_2144_Regression.mpc:
-        * tests/Bug_2144_Regression/README:
-        * tests/Bug_2144_Regression/test.cpp:
-        * tests/Bug_2144_Regression/test.idl:
-
-          Regression test for the above.
-
-Thu Jun  9 07:24:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/EventLogConsumer.cpp (push):
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp (push):
-
-          Catch log service exceptions and rethrow the corresponding
-          system exception.
-
-Thu Jun  9 07:11:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (write_records, write_recordlist):
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-
-          Add DsLogAdmin::LogOffDuty to exception specification.
-
-Thu Jun  9 07:05:36 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerate.
-
-        * orbsvcs/orbsvcs/Security.mpc:
-
-          Add security_export.h to Header File section.
-
-Thu Jun  9 12:54:41 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/Profile.cpp:
-        * tao/Profile.h:
-        * tao/Service_Callbacks.cpp:
-        * tao/Service_Callbacks.h:
-
-          Changed the signature of the service callbacks is_equivalent
-          hook so that a service can completely override the default
-          profile comparison mechanism as required by the FT spec.
-
-          This fixes bugzilla # 2137.
-
-        * orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc:
-        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2137_Regression/ep1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep1_d1_g1_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep1_d1_g1_v2.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep1_d1_g2_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep1_d2_g1_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep2.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep2_d1_g1_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep2_d1_g1_v2.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep2_d1_g2_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/ep2_d2_g1_v1.ior:
-        * orbsvcs/tests/Bug_2137_Regression/README:
-        * orbsvcs/tests/Bug_2137_Regression/run_test.pl:
-
-          Committed regression test for the above.
-
-Thu Jun  9 09:31:28 2005  Simon McQueen  <sm@prismtech.com>
-
-        * NEWS:
-
-          Updated with late release note submissions.
-
-Wed Jun 08 08:46:48 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO version 1.4.6 released.
-
-Wed Jun  8 11:21:50 2005  Simon McQueen  <sm@prismtech.com>
-
-        * NEWS:
-
-          Updated with release note entries.
-
-Mon Jun  6 18:05:52 2005  unknown  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
-
-          Escape more strings written to the xml file. This should fix bug 2129.
-
-Mon Jun  6 16:48:21 2005    <cleeland_c@ociweb.com>
-
-        * tao/IIOP_Acceptor.cpp (create_new_profile): Reverse the order of
-          comparisons so that port numbers get compared first.  This
-          should make comparisons marginally faster when hostnames are
-          ridiculously long if the ports don't match.
-
-        * tao/IIOP_Acceptor.cpp (create_shared_profile): Make port numbers
-          a part of the comparison so that RTCORBA connections work
-          properly.
-
-Mon Jun  6 02:10:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/TypeCode.cpp (equivalent):
-
-          Pass the unaliased TypeCode to the subclass equivalent_i()
-          template method instead of the potentially aliased one.  Fixes
-          equivalence failures between an aliased TypeCode and unaliased
-          TypeCode.  Thanks to Jiang Wei <jiangwei_1976 at yahoo dot com
-          dot cn> for reporting the problem and providing a simple test
-          case.  [Bug 2140]
-
-Fri Jun  3 10:21:50 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Any/Recursive/client.cpp:
-
-          Fixed unused argument warnings in emulated exception builds.
-
-          Fixed syntax errors in minimum CORBA builds.
-
-Fri Jun  3 09:17:13 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main):
-
-          Since this code was copied from
-          TAO_IIOP_Acceptor::probe_interfaces(), update this code to look
-          like the code there.  This was also in response to seemingly
-          nonsense complaints on one platform in the line containing
-          ACE_static_cast(), so hopefully the change to static_cast<>
-          remedies that as well.
-
-Fri Jun  3 14:49:14 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
-
-          This test was trying to use the old (and superior :-) ) form
-          of the FT service context and was subsequently failing to
-          extract the group version correctly. Fixed.
-
-Thu Jun  2 14:04:23 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-
-          Fix exception macros.
-
-Thu Jun  2 11:06:05 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-
-          Add an explicit constructor to work around BCB6 compiler
-          warnings about implicit char* to string conversion.
-
-Thu Jun  2 09:10:38 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp (main): Added
-          explicit OrbId to ORB_init() call to fix errors on emulated
-          exception builds.
-
-Thu Jun  2 07:04:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerate.
-
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-
-          Add svc_utils_export.h to Header File section.
-
-Thu Jun  2 09:19:50 2005  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-
-          Exception macro fix. Thanks to jmegq@radiance.com for the
-          report and fix. This fixes bug #2135.
-
-Wed Jun  1 14:05:31 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-
-          Fix the persistent_ir test for unix platforms.
-
-Wed Jun  1 09:26:14 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-
-          More fixes for exception macros.
-
-Wed Jun  1 08:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Root_POA.cpp:
-          Increment refcount on the servant in the id_to_servant method.
-
-        * tests/POA/Identity/Identity.cpp:
-          Use ServantBase_var to store the servant pointer
-
-Wed Jun  1 02:50:28 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tests/Muxing/Receiver.h:
-
-          Removed inheritance from PortableServer::RefcountServantBase
-          since reference is on by default. Please see  "Thu May 26
-          10:17:12 UTC 2005  Johnny Willemsen
-          <jwillemsen@remedy.nl>". Many tests need to be changed
-          similarly.
-
-        * tests/Muxing/svc.conf:
-
-          Added -ORBConnectionCacheMax option to the test.
-
-Tue May 31 22:43:10 2005    <cleeland_c@ociweb.com>
-
-        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main):
-        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp (main):
-
-          Fixed warnings related to unused args or variables.
-
-Tue May 31 19:28:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
-
-          Since the typecode of a user-defined IDL exception is required
-          by any IDL operation that raises it, changed the logic of the
-          -St option to be ignored for user exceptions. An informative
-          message is also output for each user exception encountered if
-          the -St option is used. Formerly, the simultaneous appearance
-          of -St and user exceptions would be made apparent only by a
-          C++ compile failure.
-
-        * docs/compiler.html:
-
-          Updated IDL compiler documentation to reflect the above change.
-
-Tue May 31 10:08:27 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * tao/IIOP_Endpoint.cpp:
-
-          Add ACE_UNUSED_ARG for variable only used in assert.
-
-Tue May 31 09:19:10 2005  Chris Cleeland  <cleeland@ociweb.com>
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp (dotted_decimal_address):
-
-          Removed '#if 0' bracketing around this method.  I don't know why
-          this method was removed in the first place, but the originator
-          of that change is unavailable for consultation for the next
-          week, so I will err on the side of making things compile.
-
-        * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc:
-        * tests/IOR_Endpoint_Hostnames/bogus_i.h:
-
-          Fixed fuzz build errors related to RCS Id strings and MSC
-          version checks, etc.
-
-Tue May 31 09:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORBInitializer_Registry.cpp:
-          Reverted my change of Mon May 30 13:14:12 UTC 2005. With my change
-          we are 3.0.3 corba compliant but this is not usable for our users.
-          The draft 3.1 seems to describe the wanted behaviour better. I keep
-          the regression test in the archive, the bugzilla entry is reopened.
-          We will look at bug 2088 again
-
-Mon May 30 22:19:54 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Transport.h (post_connect_hook):
-        * tao/Transport.cpp:
-
-          Added post_connect_hook () method which is invoked just after
-          connection establishment (or after a connection is fetched from
-          cache). The return value signifies whether the invoker should
-          proceed with post connection establishment
-          activities or not. There are a wide range of use cases, for
-          example protocols like SSLIOP  need this to verify whether
-          connections already established have valid
-          certificates. Validation of certificates/credentials can be done
-          inside this  method. Implementations of this method can even
-          tear down the connection, and return a false to the
-          invoker. There  are no pre_connect_hooks () since the  transport
-          doesn't exist before a connection establishment. :-). A default
-          noop implementation has been provided.
-
-        * tao/Transport_Connector.cpp:
-
-          Invoke post_connect_hook () after grabbing a connection from
-          cache.
-
-Mon May 30 22:11:35 2005  Chris Cleeland  <cleeland@ociweb.com>
-
-        * tests/IOR_Endpoint_Hostnames/bogus_i.cpp:
-        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp:
-
-          Fix ACE_RCSID macro usage that prevented compilation.
-
-Mon May 30 18:27:22 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Fixed discrepancies in the signature of look_in_previous()
-          between the no-op UTL_Scope version and the AST_Module
-          version. These discrepancies were causing warnings with
-          the Borland compiler.
-
-Mon May 30 10:23:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (get_log_qos, set_log_qos):
-
-          Fixed compilation on systems where new() does not throw an
-          exception on failure (i.e. ACE_NEW_THROWS_EXCEPTIONS is not
-          set).
-
-Mon May 30 13:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Bug_2088/*:
-          Added a regression for bugzilla bug 2088. When an ORBInitializer
-          throws an exception, this should be ignored and the next
-          ORBInitializer should be called. Previously an exception was
-          propagated back to the caller of ORB::init(). See also 21.7.3.1
-          of the corba spec.
-
-        * tao/ORBInitializer_Registry.cpp:
-          Fixed bug 2088, catch exceptions locally.
-
-Mon May 30 12:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Cleanup_Func_Registry.h:
-          Removed not needed friend classes
-
-Sat May 28 08:59:32 2005  Emre Turkay  <turkaye@dre.vanderbilt.edu>
-
-        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
-
-          Now there is an mpb file in ACE_MPC for the boost related
-          settings. Changed the mpc base project accordingly.
-
-Fri May 27 20:14:56 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (check_grammar):
-
-          Changed to accept TCL, ETCL, and EXTENDED_TCL like the
-          Notification Service.
-
-Fri May 27 15:19:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-
-          Changed class to store a single QoS property instead of list, as
-          the currently specified properties are mutually exclusive.  This
-          greatly simplifies the get_log_qos and set_log_qos methods.
-
-          Changed set_log_qos to return all of the unknown/unsupported QoS
-          properties when throwing the UnsupportedQoS exception.
-
-Fri May 27 17:01:24 2005  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/IIOP_Connection_Handler.cpp:
-
-          Corrected a problem whereby, when listen points received in a
-          bidirectional context get processed, the key for the entry made
-          in the transport cache was created using the receiver's notion
-          of whether dotted decimal addresses (-ORBDottedDecimalAddresses)
-          should be used, rather than how the listen points were sent by
-          the sender.  In doing so, when, for example, a CORBA server was
-          using -ORBDottedDecimalAddresses and the client was not, the
-          client's listen point got cached using its IP address rather
-          than its hostname.  However, all the IORs distributed by the
-          client would use the hostname, and, thus, the server would not
-          be able to find a match for the client's endpoint in its cache,
-          and subsequently try to create a new one.
-
-          The change now creates an entry in the cache using, for the
-          hostname portion of the key, the host name however the client
-          sent the hostname.  This should insure that a receiver of a
-          bidirectional context will have the ability to find a match in
-          the transport cache.
-
-          This change supercedes the following changelog entry:
-
-          Thu Sep 13 11:05:13 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-          * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-          * tao/IIOP_Connection_Handler.cpp (process_listen_point_list):
-
-            When creating an IIOP Endpoint, passed in the value of the
-            ORBDottedDecimal address value from the ORB_Core. This is a real
-            stupid mistake :(. Added a debug statement. Thanks to Werner
-            Buchert <w.buchert@medat.de> for reporting this problem.
-
-        * tao/IIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
-        * tao/IIOP_Acceptor.h:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Transport.cpp:
-
-          Modified the IIOP Acceptor so that the behavior for the host
-          identifier (hostname or IP address) that appears in IIOP
-          profiles is consistent with the following:
-
-          1. value from "hostname_in_ior", if specified;
-          2. setting of -ORBDottedDecimalAddresses option
-          3. value for <hostname> used in -ORBEndpoint iiop://<hostname>
-          4. whatever TAO magically comes up with
-
-          The significant change here is that previous to this change,
-          numbers 1 and 2 were reversed, i.e., -ORBDottedDecimalAddresses
-          took precedence over hostname_in_ior.
-
-        * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc:
-        * tests/IOR_Endpoint_Hostnames/bogus.idl:
-        * tests/IOR_Endpoint_Hostnames/bogus_i.cpp:
-        * tests/IOR_Endpoint_Hostnames/bogus_i.h:
-        * tests/IOR_Endpoint_Hostnames/generate_ior.cpp:
-        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
-        * tests/IOR_Endpoint_Hostnames/run_test.pl:
-
-          Added a new functionality/regression test for the change listed
-          above.  The run_test.pl prints out a matrix for permutations and
-          expected results, and indicates whether each permutation
-          succeeds or fails.  It also depends upon a new option to catior,
-          found in the next entry.
-
-        * orbsvcs/tests/Security/BiDirectional/server.conf:
-
-          Removed some hardcoded paths to OCI personal home directories.
-
-        * utils/catior/catior.cpp:
-
-          Added a "-x" option that works like "-f" except that it reads
-          the IOR from standard input (stdin or cin) rather than from a
-          file.  This makes catior much more like the unix "cat" command,
-          and enables it to be used in a pipeline.
-
-Fri May 27 15:54:44 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * docs/Options.html:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/params.cpp:
-
-          Reimplemented the -ORBPreferredInterfaces option to support
-          wildcards.
-
-Fri May 27 15:30:21 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/Activator_NT_Service.h:
-        * orbsvcs/ImplRepo_Service/Locator_NT_Service.h:
-        * tao/TypeCode_Base_Attributes.h:
-        * tao/TypeCode_Case.h:
-        * tao/TypeCode_Case_T.h:
-        * tao/TypeCode_Struct_Field.h:
-        * tao/TypeCode_Value_Field.h:
-        * utils/wxNamingViewer/pch.h:
-
-          These files #included config.h which isn't safe, because it
-          won't necessarilly pick up the correct symbols. For example, I
-          caught this by trying to build ACE on Windows with
-          __ACE_INLINE__ = 0. The files that #included config.h directly
-          saw that it was defined as 0, but changing them to #include
-          config-all.h instead, correctly saw that the symbol was
-          undefined.
-
-Fri May 27 13:12:10 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Any/Recursive/Test.idl:
-
-          Added new user exception to be used when reporting Any
-          demarshaling errors.
-
-        * tests/Any/Recursive/client.cpp:
-
-          Fixed unused argument warnings.
-
-          Use the new user exception when report Any demarshaling
-          failures, instead of CORBA::INV_OBJREF.
-
-Fri May 27 08:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/Default_Servant/Default_Servant.cpp:
-          Slightly modified this test to test reference_to_servant with
-          reference counting
-
-        * tests/POA/Deactivate_Object/server.cpp:
-          Added a call to reference_to_servant. This as a regression for
-          a bug where we didn't increment the reference count on the
-          servant before returning it.
-
-        * tao/PortableServer/Root_POA.cpp (reference_to_servant_i):
-          Increment the reference count on the servant before returning it.
-          Thanks to Konstantinos Lykiardopoulos <klyk at intracom dot gr>
-          and  Lothar Werzinger <lothar at xcerla dot com> for reporting
-          this problem.
-
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-          In system_id_to_servant() don't increment the refcount on the
-          servant, this is done by the POA.
-
-Fri May 27 08:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Servant_Base.cpp:
-          Fixed typo in comment
-
-Fri May 27 08:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-          Fixed conversion warnings
-
-Fri May 27 00:36:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/Any/Recursive/Hello.cpp:
-        * tests/Any/Recursive/Hello.h:
-        * tests/Any/Recursive/README:
-        * tests/Any/Recursive/RecursiveHello.mpc:
-        * tests/Any/Recursive/Test.idl:
-        * tests/Any/Recursive/client.cpp:
-        * tests/Any/Recursive/run_test.pl:
-        * tests/Any/Recursive/server.cpp:
-
-          New test that verifies properly functioning recursive type Any
-          insertion and extraction support.  It also indirectly verifies
-          that recursive TypeCode support is working.
-
-Thu May 26 16:09:50 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-
-          Functions with two or more try blocks must use ACE_TRY_EX.
-
-        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
-
-          Use getline() instead of operator>> to read in lines of
-          text from a file into a std::string. Use string::c_str() with
-          operator<< instead of relying on existence of ostream extraction
-          operators for strings. A more useful solution might be to
-          provide insertion/extraction operators for platforms that are
-          missing them.
-
-Thu May 26 16:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp:
-        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
-          Updated for interceptor_list changes
-
-Thu May 26 14:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Interceptor_List.cpp:
-          Fixed gnu warning
-
-Thu May 26 10:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Made the Interceptor_List a template which is now used instead of a
-        base class with derived specific list classes. This is now in the TAO
-        namespace instead of using a TAO_ prefix.
-
-        * tao/Interceptor_List.{h,cpp}:
-          The Interceptor_List is now a template
-
-        * tao/ClientRequestInterceptor_List.{h,cpp,inl}:
-        * tao/ServerRequestInterceptor_List.{h,cpp,inl}:
-        * tao/IORInterceptor/IORInterceptor_List.{h,cpp,inl}:
-          Removed these files, we have now template instantiations instead
-          of specific classes
-
-        * tao/ORB_Core.{h,cpp,i}:
-          Update for changes above.
-
-        * tao/IORInterceptor_Adapter.h:
-          Updated for interceptor list change
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
-          Updated for interceptor_list change and also implemented
-          adapter_state_changed in this class because we don't have
-          a specific IORInterceptor list anymore where this was
-          implemented.
-
-        * tao/ClientRequestInterceptor_Adapter.{h,cpp,inl}:
-          Updated because of ClientInterceptorList change
-
-        * PortableServer/ServerInterceptorAdapter.h:
-          Updated because of ServerRequestInterceptor List change
-
-        * tao/tao.mpc:
-        * tao/Makefile.am:
-          Updated for changes above
-
-Thu May 26 10:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        According to the latest C++ mapping, reference counting is mandatory;
-        the RefCountServantBase class is now a legacy artifact. Thanks to
-        Frank Pilhofer <fpilhofe at mc dot com> for reporting this.
-        This fixes bugzilla [1952].
-
-        * tao/Abstract_Servant_Base.{h,cpp}:
-          Made the add_ref/remove_ref methods pure virtual and added
-          _refcount_value
-
-        * tao/PortableServer/Servant_Base.{h,cpp}:
-          Added reference counting to TAO_ServantBase and removed
-          TAO_RefCountServantBase
-
-        * tao/PortableServer/PS_ForwardC.h:
-          Make RefCountServantBase a noop struct
-
-        * tao/PortableServer/diffs/PS_Forward.diff:
-          Updated
-
-Thu May 26 09:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.h:
-          Removed commented out code
-
-        * tao/QtResource_Factory.h:
-          Doxygen improvement
-
-Thu May 26 08:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp:
-          Retrieve the object_id in the receive_request. According to
-          Konstantinos Lykiardopoulos <klyk at intracom dot gr> this failed
-          with the 1.4.5 release of TAO but it works now again. Added this
-          as regression so that we don't have a problem in the future again
-
-Thu May 26 07:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ImR_Client/ImplRepo.pidl:
-        * tao/ImR_Client/ServerObject.pidl:
-          Updated regeneration instructions
-
-Thu May 26 07:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/LifespanStrategyPersistent.cpp:
-          Also add a process directive that uses the xml svc.conf way of
-          specifying this. This fixes bugzilla 2127. Thanks to Lothar
-          Werzinger <lothar at xcerla dot com> for reporting this.
-
-Wed May 25 23:42:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-
-          Changed to pass the ORB pointer to the factories' activate()
-          method.
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-          Changed to pass the ORB pointer to the factory's init() method.
-
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
-        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
-        * orbsvcs/orbsvcs/Log/EventLogFactory_i.h
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
-
-          Changed to stash away ORB pointer in the activate() method, and
-          to pass it to the Log servant constructors.
-
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
-
-          Changed to stash away ORB pointer in the init() method, and to
-          pass it to the RTEventLog servant constructor.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp
-        * orbsvcs/orbsvcs/Log/Log_i.h
-        * orbsvcs/orbsvcs/Log/BasicLog_i.cpp
-        * orbsvcs/orbsvcs/Log/BasicLog_i.h
-        * orbsvcs/orbsvcs/Log/EventLog_i.cpp
-        * orbsvcs/orbsvcs/Log/EventLog_i.h
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
-        * orbsvcs/orbsvcs/Log/NotifyLog_i.h
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
-        * orbsvcs/orbsvcs/Log/RTEventLog_i.h
-
-          Changed constructor to take an ORB pointer instead of a Reactor
-          pointer.  The latter had defaulted to use the Reactor Singleton
-          instance, but using the servant ORB's reactor ensures the event
-          loop will be active.  Curiously, the old reactor pointer wasn't
-          being used.  That will change soon, as we'll be adding timer
-          handlers for database flush and compaction.
-
-Wed May 25 20:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
-          Use rtevent_serv as base project
-
-Wed May 25 20:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-          Changed order of the projects.
-
-Wed May 25 12:24:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/DynamicInterface/Unknown_User_Exception.h (_type):
-        * tao/DynamicInterface/Unknown_User_Exception.h (_type):
-
-          Renamed this method to "_tao_type" since it is meant to be an
-          override for the CORBA::Exception::_tao_type() base class
-          method.  Addresses CORBA::UnknownUserException Any insertion
-          problems.
-
-Tue May 24 21:13:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Invocation_Adapter.cpp (invoke_collocated_i):
-
-          Updated ACE_ASSERT condition to reflect new thru POA case.
-          Thanks to Lothar Werzinger for reporting the assertion.
-
-Tue May 24 19:57:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Multiple/Makefile.am:
-        * orbsvcs/tests/EC_Throughput/Makefile.am:
-        * orbsvcs/tests/Event/Basic/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
-        * orbsvcs/tests/Event/Performance/Makefile.am:
-        * orbsvcs/tests/Event/lib/Makefile.am:
-        * orbsvcs/tests/FtRtEvent/Makefile.am:
-
-          Regenerate for removal of RTOLDEvent and split of RTEvent
-          libraries.
-
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerate for change below.
-
-        * orbsvcs/orbsvcs/CosTime.mpc:
-
-          Inherit from svc_utils.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
-
-          Use new ORBSVCS_Time::Time_Value_to_TimeT() method from the
-          Svc_Utils library to convert timestamp to a TimeBase::TimeT.
-
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp:
-        * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
-
-          The specification requires that a structured or typed event
-          should be stored as an Any as specified by the Notification
-          Service, so connect to the channel as an Any consumer.
-
-Tue May 24 14:29:14 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-Tue May 24 14:15:36 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
-
-          Removed RTEvent MPC group.  This causes problems when project
-          Makefile.am's are aggregated.
-
-Tue May 24 11:59:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Time_Utilities.cpp:
-        * orbsvcs/orbsvcs/Time_Utilities.h:
-        * orbsvcs/orbsvcs/Time_Utilities.i:
-
-          Updated comments to Doxygen format.
-
-          Added new methods for converting absolute timestamps between
-          ACE_Time_Value and TimeBase::TimeT.
-
-Tue May 24 10:32:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-Tue May 24 10:58:53 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
-
-          Add missing include.
-
-Tue May 24 09:47:52 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-
-          Disable fuzz check, because it can't detect the try/catch
-        in the calling function.
-
-Tue May 24 09:14:57 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/TestServer.h:
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-
-          This example was simply copied from 1.4a, and I forgot to make
-        the adjustments required by the POA refactoring.
-
-        * tao/ImR_Client/ImplRepoC.h:
-
-          The ImplRepo.pidl had #include ServerObject.pidl, but didn't include
-        ServerObjectC.h. For now, I manually added the include, but this isn't
-        a final solution.
-
-Mon May 23 14:50:27 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
-
-          Changed from requires += exceptions to inheriting from exceptions. Hopefully
-        this will eliminate fuzz errors.
-
-Mon May 23 18:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
-          Updated for RTEvent library split
-
-Mon May 23 18:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Simulator/Event_Supplier/Event_Supplier.mpc:
-          Updated for RTEvent library split
-
-Mon May 23 13:24:41 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * tao/ImR_Client/ImplRepo.pidl:
-        * tao/ImR_Client/ImplRepoA.cpp:
-        * tao/ImR_Client/ImplRepoC.h:
-        * tao/ImR_Client/ImplRepoC.inl:
-        * tao/ImR_Client/ImplRepoC.cpp:
-        * tao/ImR_Client/ImplRepoS.h:
-        * tao/ImR_Client/ImplRepoS.cpp:
-
-          Re-added the -GA option and updated the command in the pidl to save
-        footprint for static builds.
-
-Mon May 23 18:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.{h,cpp}:
-          Fixed service config macros
-
-Mon May 23 12:38:31 2005  Justin Michel  <michel_j@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/Activator_Options.cpp:
-        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
-        * orbsvcs/ImplRepo_Service/ImR_Activator.idl:
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.h:
-        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-        * orbsvcs/ImplRepo_Service/Locator_Options.h:
-        * orbsvcs/ImplRepo_Service/Locator_Options.cpp:
-        * orbsvcs/ImplRepo_Service/Locator_Repository.h:
-        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
-        * orbsvcs/ImplRepo_Service/README.txt:
-        * orbsvcs/ImplRepo_Service/tao_imr_i.h:
-        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
-        * tao/ImR_Client/ImR_Client.cpp:
-        * tao/ImR_Client/ImplRepo.pidl:
-        * tao/ImR_Client/ImplRepoC.h:
-        * tao/ImR_Client/ImplRepoC.inl:
-        * tao/ImR_Client/ImplRepoC.cpp:
-        * tao/ImR_Client/ImplRepoS.h:
-        * tao/ImR_Client/ImplRepoS.cpp:
-
-          Several bug fixes and enhancments to the ImR.
-          Cleaned up the perl to use strict and compile without warnings.
-          Displayed a message that the poa was being registered with the
-        ImR even when -orbuseimr 0 was specified.
-          Stop printing the exception details for unexpected exceptions
-        that happen during a call to server->shutdown(). At least on
-        windows, we often get COMM_FAILURE or TRANSIENT, because the
-        socket is not shutdown gracefully by the server.
-          Don't print the exception when a TRANSIENT is received while
-        pinging the server. This is not an error. Not sure why we were
-        getting 'No usable profile in IOR' messages though, when we
-        expect a 'POA in holding state'.
-          Merge in changes to support ImplRepo_Service -e, which
-        will clear the repository on startup. This makes it easier to write
-        persistence tests, and might be useful in general.
-          Updated to automatically set the ImplRepoServiceIOR and
-        TAO_USE_IMR environment variables, obviating the need to pass
-        -orbuseimr or -orbinitref ImplRepoService=... when using an
-        Activator to start a server.
-          Add -orbuseimr 0 to the cmd line args, so that the TAO_USE_IMR=1
-        environment variable can be used safely.
-          Fix incorrect exception specifications in activator.
-          Fix command line help descriptions.
-          Combine add/update operations in the imr and imr util.
-          Support clean shutdown using ctrl-c as well as the
-        imr util shutdown-repo command.
-          Add detection of server process death, and an option to
-        notify the ImR when this happens, to the activator.
-          Fix some problems with exception macros and unused vars.
-          Fix bug with case-insensitive activator name and binary persistence.
-
-
-        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
-        * orbsvcs/examples/ImR/Advanced/Manager.idl:
-        * orbsvcs/examples/ImR/Advanced/Manager_i.h:
-        * orbsvcs/examples/ImR/Advanced/Manager_i.cpp:
-        * orbsvcs/examples/ImR/Advanced/Messenger.idl:
-        * orbsvcs/examples/ImR/Advanced/Messenger_i.h:
-        * orbsvcs/examples/ImR/Advanced/Messenger_i.cpp:
-        * orbsvcs/examples/ImR/Advanced/README:
-        * orbsvcs/examples/ImR/Advanced/TestClient.h:
-        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
-        * orbsvcs/examples/ImR/Advanced/TestServer.h:
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-        * orbsvcs/examples/ImR/Advanced/client_main.cpp:
-        * orbsvcs/examples/ImR/Advanced/drivers/all:
-        * orbsvcs/examples/ImR/Advanced/drivers/defaults:
-        * orbsvcs/examples/ImR/Advanced/drivers/environment:
-        * orbsvcs/examples/ImR/Advanced/drivers/invocation:
-        * orbsvcs/examples/ImR/Advanced/drivers/persistence:
-        * orbsvcs/examples/ImR/Advanced/drivers/retry:
-        * orbsvcs/examples/ImR/Advanced/drivers/use_environment:
-        * orbsvcs/examples/ImR/Advanced/drivers/use_invocation:
-        * orbsvcs/examples/ImR/Advanced/drivers/use_persistence:
-        * orbsvcs/examples/ImR/Advanced/manager_main.cpp:
-        * orbsvcs/examples/ImR/Advanced/run_test.pl:
-        * orbsvcs/examples/ImR/Advanced/server_main.cpp:
-
-          Dave Giovannini's new test which provides greater
-        coverage of ImR features. Some tests are still failing, so
-        this is not ready to be enabled for nightly builds.
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
-
-          Fixed bug in unregistration, and updated log messages
-        to show the name of the class and method being logged.
-
-        * orbsvcs/orbsvcs/Notify/XML_Saver.h:
-        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
-
-          Updated to use the new ACEXML_escape_string() function.
-
-        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-
-          Updated to work on Windows.
-
-        * orbsvcs/tests/ImplRepo/airplane_server_i.h:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/scale/server_i.cpp:
-
-          Basic code cleanup to match latest 1.4a.
-          Some tests were not shutting down correctly, and were
-        activating the poa manager too soon.
-          Nestea test prints the contents of ImplRepoServiceIOR and TAO_USE_IMR.
-          Stop passing -orbuseimr 1 and imr_init_ref in the command lines
-        registered with the ImR.
-
-
-        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
-
-          Use -ORBObjRefStyle URL so that the XML file has consistent
-        contents, and can be compared for equality. This should let this
-        test pass on more (all?) platforms.
-
-        * tao/ORB_Core.cpp:
-
-          Add missing support for -ORBObjRefStyle IOR.
-
-        * tao/ImR_Client/ImplRepoA.cpp:
-
-          Removed this file, because the idl command line wasn't set to generate it.
-
-
-Mon May 23 06:12:01 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::remove_old_records):
-
-          Fixed typo introduced in last change.
-
-Mon May 23 12:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2119_Regression/test.mpc:
-          Simplified this mpc file
-
-Mon May 23 11:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/ECG_Adapters.h:
-        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h:
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h:
-        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
-        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
-        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h:
-        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
-        * orbsvcs/orbsvcs/Event/EC_And_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h:
-        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h:
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h:
-        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h:
-        * orbsvcs/orbsvcs/Event/event_export.h:
-          Include the RTEvent_Serv file and updated export macro
-
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Serv.rc:
-        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Skel.rc:
-        * orbsvcs/orbsvcs/Event/event_serv_export.h:
-        * orbsvcs/orbsvcs/Event/event_skel_export.h:
-          New files for the new RTEvent Serv and Skel libraries
-
-        * orbsvcs/Event_Service/Event_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
-        * orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc:
-        * orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc:
-        * orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc:
-        * orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc:
-        * orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc:
-        * orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc:
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/RTKokyuEvent.mpc:
-        * orbsvcs/orbsvcs/RTSchedEvent.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-        * orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.mpc:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.mpc:
-        * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc:
-        * orbsvcs/tests/Event/Basic/rteventtestexe.mpb
-        * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc:
-        * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc:
-        * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc:
-        * orbsvcs/tests/Event/Performance/Event_Performance.mpc:
-        * orbsvcs/tests/Event/lib/Event_lib.mpc:
-          Updated because of splitted RTEvent library
-
-Mon May 23 09:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-          No need to specify the type of the event service anymore
-
-Mon May 23 05:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Event/BCU.cpp BCU.h:
-        * orbsvcs/orbsvcs/Event/Debug_Macros.h:
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.{h,cpp,i}:
-        * orbsvcs/orbsvcs/Event/Event_Channel.{h,cpp,i}:
-        * orbsvcs/orbsvcs/Event/Event_Manip.{h,cpp,i}:
-        * orbsvcs/orbsvcs/Event/Fast_Reactor.h
-        * orbsvcs/orbsvcs/Event/GPlot_File.{h,cpp,i}:
-        * orbsvcs/orbsvcs/Event/Local_ESTypes.{h,cpp}:
-        * orbsvcs/orbsvcs/Event/Memory_Pools.{h,cpp,i}:
-        * orbsvcs/orbsvcs/Event/Module_Factory.{h,cpp}:
-        * orbsvcs/orbsvcs/Event/old_event_export.h:
-        * orbsvcs/orbsvcs/Event/ReactorTask.{h,cpp}:
-        * orbsvcs/orbsvcs/Event/RT_Task.{cpp,h,i}:
-        * orbsvcs/orbsvcs/Event/Timer_Module.{h,cpp,i}:
-          Removed the old RTEvent implementation. This is already deprecated
-          for years. This fixes bugzilla bug 2047
-
-        * orbsvcs/orbsvcs/Event_Service_Constants.h:
-          Removed the constants that are for the old ec
-
-Mon May 23 05:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/Event_Service/Event_Service.{h,cpp}:
-          Removed module_factory_, it was for the old ec
-
-Mon May 23 05:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
-          Fixed casing of include
-
-Sun May 22 22:10:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp (display_records)
-        (delete_records):
-
-        Changed query language parameter from "TCL" to "EXTENDED_TCL".
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (QUERY_LANG_SUPPORTED_BY_LOG):
-
-        Changed from "TCL" to "EXTENDED_TCL".
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::delete_records_by_id)
-        (TAO_Log_i::delete_records, TAO_Log_i::remove_old_records):
-
-        Don't bother checking whether current_size is less than max_size
-        if not log_full.  Avoids potentially costly calls into log store
-        (if/when we support strategized stores).
-
-Sun May 22 18:02:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::delete_records)
-        (TAO_Log_i::remove_old_records):
-
-        Like delete_records_by_id(), reset "log_full" if "current_size"
-        is less than "max_size".
-
-Sun May 22 17:01:56 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::scheduled):
-
-        Removed duplicate fetch of current time.
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::remove_old_records):
-
-        Corrected calculation of purge time.  Arithmetic was being done on
-        time values without normalizing units first.
-
-Sun May 22 16:37:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Sun May 22 20:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.{cpp,h}:
-        * orbsvcs/Event_Service/Event_Service.{h,cpp}:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.{h,cpp}:
-        * examples/Simulator/Event_Supplier/DualEC_Sup.{h,cpp}:
-        * orbsvcs/tests/Event/lib/Driver.{h,cpp}:
-        * orbsvcs/examples/RtEC/Kokyu/Service.cpp:
-        * orbsvcs/examples/RtEC/Schedule/Service.cpp:
-          Removed support for the old rt event service, this will be removed
-          soon.
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-          Removed not needed includes
-
-        * orbsvcs/Event_Service/Event_Service.mpc:
-        * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc:
-        * orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc:
-        * examples/Simulator/Event_Supplier/Event_Supplier.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-          Removed rtoldevent as base project
-
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-          Updated because we just only have one RTEvent implementation
-
-        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-          Removed workaround for very old Sun compiler
-
-        * orbsvcs/examples/RtEC/Schedule/Consumer.cpp:
-        * orbsvcs/examples/RtEC/Schedule/Supplier.cpp:
-          Removed empty explicit instantiation block
-
-        * orbsvcs/examples/RtEC/Schedule/Service.cpp:
-        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
-          Removed not needed includes of old rtevent files
-
-Sun May 22 10:33:34 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/PortableServer/Root_POA.cpp (create_POA_i):
-
-          Increment the reference count immediately after binding the
-          child POA to children map.  Addresses a seg fault introduced by
-          the leak fix described in ChangeLog entry "Sun May 22 00:00:31
-          2005  Ossama Othman  <ossama@dre.vanderbilt.edu>".
-
-        * tao/PortableServer/Root_POA.h (create_POA_i):
-
-          No need to return a pointer to TAO_Root_POA.  Return a
-          PortableServer::POA_ptr instead.  Allows implementation to be
-          slightly simplified.
-
-Sun May 22 14:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.mpc:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-          Converted this test to use the new RTEC instead of the old one
-          which will be removed soon. Also removed a workaround for the Sun 4.2
-          compiler which we don't support already for a long time
-
-Sun May 22 14:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PICurrent.h:
-          Fixed warning
-
-Sun May 22 11:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ClientRequestInfo_i.h:
-        * tao/ClientRequestInterceptor_Adapter.h:
-        * tao/ClientRequestInterceptor_List.cpp:
-        * tao/ClientRequestInterceptor_List.h:
-        * tao/ClientRequestInterceptor_List.inl:
-        * tao/Interceptor_List.cpp:
-        * tao/Interceptor_List.h:
-        * tao/Interceptor_List.inl:
-        * tao/ORB_Core.h:
-        * tao/PICurrent.h:
-        * tao/PICurrent_Copy_Callback.h:
-        * tao/PICurrent_ORBInitializer.h:
-        * tao/ServerRequestInterceptor_List.cpp:
-        * tao/ServerRequestInterceptor_List.h:
-        * tao/ServerRequestInterceptor_List.inl:
-        * tao/tao.mpc:
-        * tao/PortableServer/ServerInterceptorAdapter.h:
-          Moved ClientRequestInterceptor_List and
-          ServerRequestInterceptor_List to their own files and updated
-          includes.
-
-Sun May 22 11:54:16 2005  Olli Savia  <ops@iki.fi>
-
-        * tao/Collocated_Invocation.cpp:
-
-          Fixed a typo in comment.
-
-Sun May 22 00:00:31 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-
-        * tao/Any.h (to_object, to_abstract_base, to_value):
-
-          Made these constructors explicit, in keeping with the CORBA spec
-          since it requires that the other "to_" helper structs have
-          explicit single argument constructors if supported by the C++
-          compiler.
-
-        * tao/PortableServer/Root_POA.cpp (create_POA_i):
-
-          Do not duplicate POA returned from the other create_POA_i()
-          override called in this method since we are returning it
-          directly to the caller and do not need to retain ownership.
-          Fixes a number of memory leaks.
-
-        * tests/ORT/ObjectReferenceFactory.h:
-
-          CORBA::DefaultValueRefCountBase mix-in class should be the last
-          in the inheritance chain.  Addresses potential memory leaks.
-
-        * tests/Param_Test/options.cpp:
-        * tests/Param_Test/options.h:
-
-          Store the test IOR in a CORBA::String_var and drop the explicit
-          calls to CORBA::string_free().  Simplifies memory management and
-          fixes a memory leak.
-
-Sat May 21 18:38:12 UTC 2005   Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.cpp:
-          Fixed unused argument warning when messaging is disabled.
-
-Sat May 21 18:34:12 UTC 2005   Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2124_Regression/Bug_2124_Regression.mpc:
-          Use taoserver as base project to fix unresolved link errors
-
-Fri May 20 20:47:00 2005    Huang-Ming Huang <hh1@cse.wustl.edu>
-
-        * tao/MProfile.cpp:
-        * tao/Profile.h:
-        * tao/Profile.cpp
-        * tao/Stub.cpp:
-
-          Removed the association of TAO_Profile to TAO_Stub. This allows an
-          instance of TAO_Profile to be shared between different TAO_MProfile
-          objects.
-
-Fri May 20 16:51:35 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp (TAO_LogRecoreStore::log):
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
-
-          Use "%d" instead of "%Q" log format directive for ACE_UINT64_TO_U32
-          parameter.
-
-        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp (TAO_LogRecordStore::update):
-        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp:
-
-          Subtract size of existing record and Add size of new record to
-          current size.
-
-Fri May 20 16:44:54 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Fri May 20 17:10:00 2005    Huang-Ming Huang <hh1@cse.wustl.edu>
-
-        * tao/IIOP_Endpoint:
-
-          Fixed problem in TAO_IIOP_Endpoint::is_preferred_network()
-          which should check for empty string rather than null pointer.
-
-Fri May 20 17:00:00 2005    Huang-Ming Huang <hh1@cse.wustl.edu>
-
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-
-          Fixed problem in ServantRetentionStrategyRetain::find_servant()
-          where servant_upcall.user_id is assigned to a local variable which
-          causes memory access violation when ServerReqeustInfo::object_id()
-          is accessed inside interceptors.
-
-Fri May 20 18:30:23 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp:
-        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp:
-
-          Added global '::' qualifier to several instances of code
-          generation of a scoped name used as a template argument,
-          to avoid ambiguity if there are two modules with the same
-          name at different levels of nesting. This fix closes
-          [BUGID:2125].
-
-        * tests/IDL_Test/array.idl:
-        * tests/IDL_Test/nested_scope.idl:
-        * tests/IDL_Test/typedef.idl:
-
-          Added various IDL snips provided by Simon McQueen
-          <sm@prismtech.com> in various (now closed) Bugzilla entries.
-
-Fri May 20 12:13:13 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * orbsvcs/Naming_Service/NT_Naming_Service.h:
-        * orbsvcs/Naming_Service/NT_Naming_Service.cpp:
-
-          Fixed build problems with Visual C++ 6 on Windows
-
-Fri May 20 15:22:42 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
-
-          Changed the copy constructor for generated skeleton-side
-          valuetype classes private and unimplemented. Skeleton
-          code is generated for valuetypes only if they support a
-          concrete interface. However, these valuetypes also inherit
-          from the stub-side valuetype class, which has a private
-          unimplemented copy constructor. This fact makes it
-          problematic to generate a valid copy constructor for the
-          skeleton-side class, since C++ (and many compilers) require each
-          base class copy constructor to be called in the
-          initialization list.
-
-Fri May 20 15:40:17 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/ORB_Core.i:
-
-          Further to Fri May 20 11:27:02 2005  Simon McQueen:
-          I forgot to commit the accessor implementation. Not
-          my finest hour.
-
-Fri May 20 14:19:08 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/ast/ast_array.cpp:
-
-          Arrays need to take on the "constructed ?" status of the
-          type they are an array of as they do with the size type.
-
-          This fixes bug #2126.
-
-        * tests/Bug_2126_Regression/Bug_2126_Regression.mpc:
-        * tests/Bug_2126_Regression/README:
-        * tests/Bug_2126_Regression/test.cpp:
-        * tests/Bug_2126_Regression/Test.idl:
-
-          A regression test for the above fix.
-
-Fri May 20 12:38:34 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Check for alias before bailing out of ::visit_string.
-
-          This fixes bug #2124.
-
-        * tests/Bug_2124_Regression/Bug_2124_Regression.mpc:
-        * tests/Bug_2124_Regression/README:
-        * tests/Bug_2124_Regression/test.cpp:
-        * tests/Bug_2124_Regression/Test.idl:
-
-          A regression test for the above fix.
-
-Fri May 20 10:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Current.pidl:
-          Updated header to doxygen style and removed remark about patching
-          generated files, this is not needed anymore
-
-Fri May 20 11:27:02 2005  Simon McQueen  <sm@prismtech.com>
-
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-
-          Add orb init option -ORBIMREndpointsInIMR to allow control over
-          whether the ImR enpoint is encoded into persistent policy object
-          refs whhen the POA has been registered with the ImR. Default is true.
-
-        * tao/PortableServer/Root_POA.cpp:
-
-          Check whether the above property is set before encoding ImR location
-          in preference to the local listener address into object references.
-
-        * docs/Options.html:
-
-          Document the above new option.
-
-          This fixes bug #2123.
-
-Fri May 20 08:55:03 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Generate a guard macro definition based upon the bound length
-          and local name of bound strings to prevent duplicate definitions
-          when a string of the same length is defined with the same name
-          in two different scopes.
-
-          This fixes bug #2122.
-
-        * tests/Bug_2122_Regression/Bug_2122_Regression.mpc:
-        * tests/Bug_2122_Regression/README:
-        * tests/Bug_2122_Regression/test.cpp:
-        * tests/Bug_2122_Regression/Test.idl:
-
-          A regression test for the above.
-
-Thu May 19 11:52:39 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp:
-
-          Fixed emulated exception usage.
-
-Thu May 19 15:03:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/include/ast_module.h:
-
-          Modified look_in_previous() by adding a boolean parameter to
-          optionally ignore forward declared types when iterating
-          over the declarations in previous openings of a module. This
-          new parameter is false by default, so that ordinary lookups
-          will behave as always. In AST_Module::referenced() however,
-          the argument is passed as true explicitly, to avoid
-          redefinition errors for forward delcared types that appear
-          in an opening of a module previous to the one in which they
-          are fully defined, and also referenced before the full
-          definition appears. Thanks to Aaron <crackajaxx@gmail.com>
-          for reporting the problem and sending example IDL files>.
-
-        * tests/IDL_Test/full.idl:
-
-          Cosmetic changes.
-
-Thu May 19 09:42:22 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/tests/Trading/Trading.mpc:
-
-          I accidentally removed the utils base project from 3 of the
-          projects in this mpc file.
-
-Thu May 19 08:55:36 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * orbsvcs/tests/Security/BiDirectional/server.cpp:
-
-          Added an include file for ACE_OS::fopen() to fix VC6 build
-          errors.
-
-        * orbsvcs/tests/Security/BiDirectional/test_i.cpp:
-
-          Changed reference to a non-existent test_i.i file to fix
-          problems with builds that do not have inline.
-
-Thu May 19 00:55:20 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Valuetype/ValueFactory_Map.cpp (instance):
-        * tao/Valuetype/ValueFactory_Map.h (instance):
-
-          Avoid multiple singleton instances by hiding singleton
-          template instance behind this new static method.  See
-          TSS_Resources.* changes below for additional details.
-
-Thu May 19 00:29:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/TSS_Resources.cpp (instance):
-        * tao/TSS_Resources.h (instance):
-
-          Hide TAO_TSS_Singleton behind new TAO_TSS_Resources::instance()
-          method.  Addresses multiple TAO_TSS_Singleton instances on
-          platforms/compilers that support symbol hiding, but for which we
-          do not yet have an appropriate *_SINGLETON_DECLARATION() macro,
-          such as g++ 4.0.  Fixes problems where an incorrect singleton
-          instance is returned to the caller.
-
-          Removed unnecessary zero pointer check before operator delete()
-          call.  Calling operator delete() on a zero pointer is perfectly
-          valid.
-
-Wed May 18 16:23:01 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-
-          Moved generated virtual methods out of line.  Inlining them
-          causes RTTI problems when the stubs are compiled with g++ 4.0's
-          "-fvisibility-inlines-hidden" command line option, and the
-          classes in the stubs are exported from a DSO/DLL.
-
-        * tao/Messaging/MessagingC.cpp:
-        * tao/Messaging/MessagingC.inl:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.inl:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.inl:
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/AbstractBase.inl:
-        * tao/Valuetype/Sequence_T.cpp:
-        * tao/Valuetype/Sequence_T.inl:
-
-          Moved virtual methods out of line.  See above for the motivation
-          behind these changes.
-
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
-
-          Moved preprocessor "#else" to the first column for portability
-          reasons.
-
-        * tao/PortableServer/ORT_Adapter_Factory.cpp:
-        * tao/PortableServer/ORT_Adapter_Factory.h (ORT_Adapter_Factory):
-
-          Added a virtual destructor.  Even though this class only defines
-          an interface, an out-of-line virtual destructor is necessary to
-          avoid dynamic_cast<> failures when using g++ 4.0's
-          -fvisibility-inlines-hidden command line option.  Apparently the
-          compiler generated destructor is inlined.
-
-Wed May 18 14:56:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Wed May 18 15:03:15 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
-
-          Renamed the BiDirectional.mpc to avoid build problems on Windows
-          platforms, caused by duplicate (case-insensitive) project names.
-          It conflicts with tests/BiDirectional/BiDirectional.mpc
-
-        * orbsvcs/tests/Security/BiDirectional/BiDirectional.mpc:
-
-          Removed this file.
-
-Wed May 18 14:38:15 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * orbsvcs/Naming_Service/NT_Naming_Service.h:
-
-        Fixing a build problem with Borland on Windows.
-
-Wed May 18 13:05:48 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * tao/Transport_Cache_Manager.cpp:
-
-          Reverted changes that added printing of the stringified
-          endpoint address, because it is not possible to pre-determine
-          the lenght of the character representation for all protocols'
-          endpoints. Thanks Johny and Ossama.
-
-Wed May 18 17:13:53 2005  Simon McQueen  <sm@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-        * TAO_IDL/be_include/be_visitor_valuetype/field_ch.h:
-
-          Make valuetype anonymous private sequence member definitions
-          public rather than private.
-
-          This fixes Bugzilla #2119.
-
-        * tests/Bug_2119_Regression/README:
-        * tests/Bug_2119_Regression/test.idl:
-        * tests/Bug_2119_Regression/test.mpc:
-
-          Regression test for the above.
-
-        * tao/Synch_Invocation.cpp:
-
-          Add COMM_FAILURE to the list of SystemExceptions that can be
-          retried in a fault tolerant configuration.
-
-          This fixes Bugzilla #2118.
-
-Wed May 18 10:29:33 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * tao/Transport_Cache_Manager.cpp:
-          Fixed Borland build problems and some stylistic improvements
-          to logging.
-
-Wed May 18 15:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PIForwardRequest.pidl:
-          Fixed fuzz error
-
-Wed May 18 13:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.h:
-          Doxygen improvement
-
-Wed May 18 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/corba.h:
-          Removed duplicate includes
-
-Wed May 18 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableInterceptor.pidl:
-          Moved several interfaces to their own file
-
-        * tao/ClientRequestInterceptor.pidl:
-        * tao/Interceptor.pidl:
-        * tao/PIForwardRequest.pidl:
-        * tao/ServerRequestInterceptor.pidl:
-          New files, contains parts of the original PortableInterceptor.pidl
-
-        * tao/ClientRequestInterceptorA.cpp:
-        * tao/ClientRequestInterceptorC.cpp:
-        * tao/ClientRequestInterceptorC.h:
-        * tao/ClientRequestInterceptorS.h:
-        * tao/InterceptorA.cpp:
-        * tao/InterceptorC.cpp:
-        * tao/InterceptorC.h:
-        * tao/InterceptorS.h:
-        * tao/PIForwardRequestA.cpp:
-        * tao/PIForwardRequestC.cpp:
-        * tao/PIForwardRequestC.h:
-        * tao/PIForwardRequestS.h:
-        * tao/PortableInterceptorA.cpp:
-        * tao/PortableInterceptorC.cpp:
-        * tao/PortableInterceptorC.h:
-        * tao/PortableInterceptorS.h:
-        * tao/ServerRequestInterceptorA.cpp:
-        * tao/ServerRequestInterceptorC.cpp:
-        * tao/ServerRequestInterceptorC.h:
-        * tao/ServerRequestInterceptorS.h:
-          Mew generated files
-
-        * tao/tao.mpc:
-          Added new files
-
-        * tao/diffs/PortableInterceptor.diff:
-          Removed, not needed anymore
-
-        * tao/diffs/ServerRequestInterceptor.diff:
-          New diff file
-
-Wed May 18 06:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Security/BiDirectional/BiDirectional.mpc:
-          Give this project an unique name so that MPC doesn't complain about
-          duplicate names
-
-        * orbsvcs/tests/Security/BiDirectional/test.idl:
-          Converted documentation to doxygen style
-
-Tue May 17 15:55:35 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-        * orbsvcs/Naming_Service/NT_Naming_Service.{h,cpp}:
-
-          For Windows platforms, changed how the handle_control() stops
-          the ORB. Instead of having to explicitly stop the reactor loop
-          it only needs to call ORB::shutdown(). This also avoids a
-          potential race condition that may occur as the ORB gets
-          destroy()-ed between the two calls. Added an AutoFinalizer
-          class, whose destructor notifies the Windows SCM by calling
-          ACE_NT_Service::report_status() when an instance goes out of
-          scope. This is helpful in the presence of unexpected
-          exceptions.  This patch was forward-ported from 1.3a_p9, based
-          upon RT4982.
-
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-
-          Added ACE_TEXT_ALWAYS_CHAR ()
-
-Tue May 17 15:14:55 2005  Iliyan Jeliazkov  <jeliazkov_i@ociweb.com>
-
-          This change allows bi-directional policy to work with SSLIOP
-          endpoints.  When a server accepts a client-initiated
-          connection or a listen point list, there is no data available
-          about the IIOP endpoints, underlying the SSLIOP endpoints.
-          There is also no data for most of the attributes of the secure
-          connection.  Therefore the "server" must synthesize those,
-          however this can not be done correctly. The problem becomes
-          evident when bi-directional policy is in effect for both
-          peers: a "server" during callback, needs to use the same
-          connection the "client" has initiated, but the secure endpoint
-          obtained from an IOR can not yield the same hash value as the
-          synthesized endpoint (from an LPL), used to cache the
-          connection.  Also, such endpoints can not be equivalent, in
-          terms of the is_equivalent () method. The IOR from the client
-          contains the real (non-synthetic) port number for the IIOP
-          endpoint underlying the SSL endpoint.  This causes the server
-          to decide that it deals with a different endpoint and try to
-          open a new connection. When the ORBs are using bi-directional
-          policies and are behind a firewall, this will fail
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-
-          Creates an instance of the new SSLIOP_Synthetic_Endpoint,
-          which it then uses to re-cache the transport.
-          TAO_SSLIOP_Connection_Handler::add_transport_to_cache()
-          ultimately uses the is_equivalent () method to compare
-          endpoints. That method must not compare the underlying IIOP
-          port numbers, because in some cases SSLIOP endpoints are
-          instantiated with limited amount of information available. For
-          example, when accepting a connections in server role, the
-          underlying IIOP endpoint's port is unknown an is merely
-          assigned to be the same as the secure port, effectively
-          precludes the ability of the server to find a connection
-          cached with these parameters later.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.{h,cpp):
-
-          Introduced a new SSLIOP_Synthetic_Endpoint, which relaxes the
-          equivalence comparison with another SSLIOP_Endpoint to limit
-          it to only hostname, SSL port and QoP.
-          Changed the hash() implementation in SSLIOP_Endpoint to
-          eliminate any influence the embedded IIOP endpoint has on the
-          hash value. This allows the SSLIOP_Synthetic_Endpoint to hash
-          just like an SSLIOP_Endpoint and makes possible that synthetic
-          endpoints to be used to find previously cached transports.
-
-        * orbsvcs/tests/Security/BiDirectional/BiDirectional.mpc:
-        * orbsvcs/tests/Security/BiDirectional/README:
-        * orbsvcs/tests/Security/BiDirectional/client.conf:
-        * orbsvcs/tests/Security/BiDirectional/client.cpp:
-        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
-        * orbsvcs/tests/Security/BiDirectional/server.conf:
-        * orbsvcs/tests/Security/BiDirectional/server.cpp:
-        * orbsvcs/tests/Security/BiDirectional/test.idl:
-        * orbsvcs/tests/Security/BiDirectional/test_i.h:
-        * orbsvcs/tests/Security/BiDirectional/test_i.i:
-        * orbsvcs/tests/Security/BiDirectional/test_i.cpp:
-
-          A test that demonstrates the problem. Uses TAO-specific
-          interfaces to the ORB core to obtain the number of currently
-          open connections before and after an invocation. This is done
-          both in the servant and in the client.
-
-        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
-
-          Client and server certificates and keys. Also, a script to
-          regenerate them all.
-
-
-        * tao/Transport_Cache_Manager.cpp:
-
-          Added more informative logging.
-
-Tue May 17 09:18:15 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * utils/NamingViewer/NamingViewer.mpc:
-
-          Removed unnecessary Resource_Files section.
-
-        * utils/utils.mwc:
-
-          Added the NamingViewer directory.
-
-Tue May 17 05:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp:
-          Use ACE_SIZE_T_FORMAT_SPECIFIER to print out an size_t variable
-          with ACE_OS::sprintf
-
-Tue May 17 05:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Event/Basic/Atomic_Reconnect.h:
-        * orbsvcs/tests/Event/Basic/Control.h:
-          Removed not needed include of Channel_Clients.h. This file has
-          been removed and the include was not needed.
-
-Mon May 16 19:22:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp:
-
-          #include "orbsvcs/PortableGroup/PG_Operators.h" and remove the
-          "bool operator==(const FTRT::Location&, const FTRT::Location&)"
-          implementation.  FTRT::Location is typedef for CosNaming::Name,
-          and the operator== implementation for that in the PortableGroup
-          library conflict on MacOSX.
-
-Mon May 16 12:15:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/include/ast_component.h
-          (AST_Component::port_descriptor):
-
-          Added an inlined constructor to this structure to make sure all
-          fields are initialized prior to use.  Fixes a g++ 4.0 "variable
-          is used initialized" warning.
-
-Mon May 16 14:08:35 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/idl.ll (idl_store_pragma):
-        * TAO_IDL/fe/lex.yy.cpp (idl_store_pragma):
-
-          Added code to eat extra whitespace in a #pragma directive,
-          need when using preprocessors that don't do it automatically.
-          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
-          discovering this quirk about the preprocessor used with the
-          Intel C++ compiler. This fixes bugzilla bug [2110]
-
-Mon May 16 18:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CDR.h:
-        * tao/Codeset_Manager.h:
-        * tao/Codeset_Translator_Factory_T.h:
-        * tao/Reply_Dispatcher.h:
-        * tao/Sequence.h:
-        * tao/Transport_Acceptor.h:
-        * tao/SmartProxies/Smart_Proxies.h:
-          Doxygen improvements
-
-Mon May 16 10:09:45 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_operation):
-
-          Added check for imported node, skipping code generation if the
-          node is imported. For all other node types in this visitor, arg
-          traits specializations must be generated, since an IDL type
-          declared in an included file could be used as a parameter in
-          an operation in the main file. But when visiting an operation
-          itself, the only thing that triggers an arg traits specialization
-          is an anonymous bounded string parameter (deprecated but still
-          legal). Since this type of declaration is not visible outside
-          the operation's scope, it should not trigger code generation
-          if the node is imported. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for pointing out that this code generation
-          for an imported operation causes a C++ compilation failure, due
-          to the lack of a proper #include of tao/BD_String_Arg_Traits.h.
-
-Mon May 16 15:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/Context.h:
-        * tao/DynamicInterface/DII_Arguments.h:
-        * tao/DynamicInterface/DII_Invocation.h:
-        * tao/DynamicInterface/DII_Invocation_Adapter.h:
-        * tao/DynamicInterface/DII_Reply_Dispatcher.h:
-        * tao/DynamicInterface/Dynamic_Adapter_Impl.h:
-        * tao/DynamicInterface/Dynamic_Implementation.h:
-        * tao/DynamicInterface/ExceptionList.h:
-        * tao/DynamicInterface/Server_Request.h:
-          Doxygen improvements
-
-Mon May 16 14:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Channel_Clients.{h,cpp}:
-          Removed, not needed anymore
-
-        * orbsvcs/orbsvcs/Channel_Clients_T.h:
-        * orbsvcs/orbsvcs/Scheduler_Utilities.h:
-          Doxygen fixes
-
-        * orbsvcs/orbsvcs/Makefile.am:
-          Removed Channel_Clients files
-
-        * orbsvcs/orbsvcs/Scheduler_Utilities.cpp:
-          Removed not needed include of OS.h
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
-          Doxygen improvement
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
-        * orbsvcs/tests/Event/lib/Counting_Supplier.h:
-          Include Channel_Clients_T.h instead of Channel_Clients.h
-
-Mon May 16 14:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-          Added Channel_Clients_T.cpp, it belongs to this project
-
-        * orbsvcs/orbsvcs/AV.mpc:
-          Removed Channel_Clients_T files, they don't belong to the AV service
-
-Mon May 16 14:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/RTScheduling/Job_i.cpp:
-        * examples/RTScheduling/Thread_Task.cpp:
-        * examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp:
-          Use ACE_SIZE_T_FORMAT_SPECIFIER to print out an size_t variable
-          with ACE_OS::sprintf
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
-          Moved the Serv and Skel projects to their own file. This makes it
-          possible to create a workspace with just one of the projects
-
-Mon May 16 09:18:26 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-        * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc:
-        * orbsvcs/tests/Event/lib/Event_lib.mpc:
-        * orbsvcs/tests/Trading/Trading.mpc:
-
-          Removed redundant base projects.
-
-        * orbsvcs/examples/ImR/Combined_Service/test.cpp:
-
-          Modified the assertTrue macro so that it would build on LynxOS.
-
-        * orbsvcs/tests/EC_MT_Mcast/run_test.pl:
-
-          Generate a unique multicast address and port to avoid collisions
-          on the same network.
-
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
-
-          On Windows, we use a configurator file to switch from the default
-          reactor (TP) to Select MT.  The LoadManager, on Windows only,
-          requires a reactor that supports registering signal handlers and
-          the TP Reactor no longer supports that sort of thing.
-
-        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
-
-          Committing a change from Dale Wilson <wilson_d@ociweb.com>.
-
-          Change shut down timeout from hard coded 1 to symbolic 10
-          to eliminate intermittent timeouts on various platforms.
-
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
-
-          Committing a change from Trevor Fields <fields_t@ociweb.com>.
-
-          Added delay between iterations of the test to allow
-          complete shutdown of Naming service.  The problem showed
-          up on dual processor machines.
-
-        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
-
-          Added an include of the CosNotification library initializer header
-          to work around static construction issues on SunOS and MacOS X.
-
-        * orbsvcs/tests/Redundant_Naming/run_test.pl:
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-
-          Allow the user to determine the location of the persistence file
-          by the TMPDIR, TEMP and TMP environment variables.  This will work
-          around NFS locking issues.
-
-        * orbsvcs/tests/Simple_Naming/process-m-output.pl:
-
-          Committing a change from Yan Dai <dai_y@ociweb.com>.
-
-          Modified the test scripts to accept the empty line, the
-          "CommandLine" line and the "WARNING" lines from
-          orbsvcs/orbsvcs/Shutdown_Utilities.cpp.
-
-Mon May 16 08:25:53 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-
-          Set the default name to "ScheduleService".
-
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
-
-          Allocate an RtecScheduler::Dependency_Set into the out parameter
-          if it doesn't contain one yet.
-
-        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
-
-          Switched the types for the generated code to match up with actual
-          types for the POD_Dependency_Info and POD_Config_Info structures.
-
-Mon May 16 08:21:34 2005  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Warn the user if the parameter to -ORBCollocation is not
-          recognized.
-
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h:
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp:
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h:
-        * tao/Strategies/SCIOP_Connector.cpp:
-        * tao/Strategies/SCIOP_Endpoint.h:
-        * tao/Strategies/SCIOP_Endpoint.cpp:
-
-          Corrected many build issues dealing with SCTP.
-
-Sat May 14 06:09:23 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO version 1.4.5 released.
-
 Local Variables:
-add-log-time-format: current-time-string
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
 End:
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 08e8f96a5ff..534cb5db6d1 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -12,14 +12,26 @@
 AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I ../m4
+ACLOCAL_AMFLAGS = -I m4 -I ../m4
 
 SUBDIRS = \
         TAO_IDL \
         tao \
 	orbsvcs \
-        docs \
+        docs
+
+if BUILD_EXAMPLES
+SUBDIRS += \
+	examples
+endif
+
+if BUILD_TESTS
+SUBDIRS += \
 	performance-tests \
+	interop-tests
+endif
+
+SUBDIRS += \
 	utils
 
 ## For some reason, automake doesn't include acconfig.h in the distribution
@@ -30,8 +42,6 @@ EXTRA_DIST =  \
   LICENSE.sun \
   README.sun
 
-DISTCLEANFILES = tao-config tao-config.1
-
 ## release:
 ##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
 release:
diff --git a/TAO/NEWS b/TAO/NEWS
index 05f4bd3acbc..d542bb7f205 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,29 +1,192 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
-. (JTC/Ossama) autoconf support for TAO tests and examples
+. (JTC) provide example Telecom Log Service Persistance Strategies that
+  use BerkeleyDB, ODBC, etc.  Refine Strategy interface as required.
 
-. (Ossama) Remainder of CSIv2 code that didn't make it into TAO 1.4.2
+. (JTC) autoconf support for tests and examples subdirectories.
 
-. Reenable support in the Notification service for BlockingPolicy,
+. (OCI) Reenable support in the Notification service for BlockingPolicy,
   DiscardPolicy, and OrderPolicy. (Note: BlockingPolicy requires -ORBWaitStrategy rw)
 
-. Fix various memory and thread leaks in the Notification Service.
+. (OCI) Fix various memory and thread leaks in the Notification Service.
 
-. Fix Notification Service use of PacingInterval and MaximumBatchSize.
+. (OCI) Fix Notification Service use of PacingInterval and MaximumBatchSize.
 
-. Fix Notification Service detection of dead consumers.
+. (OCI) Fix Notification Service detection of dead consumers.
 
-PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.9
+PLANNED MAJOR CHANGES TARGETED FOR TAO-1.5.2
 ====================================================
 
-. (Remedy) Add possibility to set customer allocators to be used by the ORB for
-  marshaling and demarshaling
+. (Remedy/Ossama) Add the ability to use the sendfile API to send out data
+  on the transport
 
-. (Remedy) Improve CORBA compliance by fixing bugzilla bugs 1917 and 1271.
+. (OCI) Make TAO compilable when ACE_USES_WCHAR is set
 
-. (Remedy) Support the latest AMI mapping, the old mapping will be kept working
-  until 1.5.1 has been released.
+USER VISIBLE CHANGES BETWEEN TAO-1.5.1 and TAO-1.5.2
+====================================================
+
+. Integrate new sequence implementation made by Carlos O'Ryan. This
+  also includes a rework of the TAO_String_Managers and CORBA::(W)String
+  implementations.
+
+. Store Value Factories per orb instead of per process and made the
+  storage thread safe.
+
+. Add on demand write functionality that writes out GIOP fragments to
+  reduce the memory usage
+
+USER VISIBLE CHANGES BETWEEN TAO-1.5 and TAO-1.5.1
+====================================================
+
+. Fixed LOCATION_FORWARD_PERM handling. See bugzilla #1777 for full details.
+
+. Fixed bug in detecting name clashes between existing identifiers and
+  extra code generated for AMI and AMH.
+
+. Fixed bug in connection closure. See bugzilla # 2391
+
+. Added support for the --enable-fl-reactor configure option to the
+  autoconf build infrastructure to build the TAO_FlResource library.
+
+. Added support for the --enable-qt-reactor configure option to the
+  autoconf build infrastructure to build the TAO_QtResource library.
+
+. Added support for the --enable-xt-reactor configure option to the
+  autoconf build infrastructure to build the TAO_XtResource library.
+
+. Fixed a race condition involving two threads active in the same
+  connection handler at the same time. See bug# 1647 for details.
+
+. Changed #include "..." preprocessor directives to use fully
+  qualified (from $(ACE_ROOT), $(TAO_ROOT), or $(TAO_ROOT)/orbsvcs)
+  paths.  We had been depending on non-standard behavior where files
+  #included with "..." are first looked for in the current directory
+  and then in the same directories used by #include <...>.  See bug
+  #2448 for details.
+
+USER VISIBLE CHANGES BETWEEN TAO-1.4.10 and TAO-1.5.0
+====================================================
+
+. Fixed Transport to handle incoming fragmented messages propperly, abstract
+  interfaces TAO_Pluggable_Messaging and TAO_Transport have been
+  modified. Custom transport/messaging implementations require
+  interface modification.
+
+. Fix collocation optimisation when a location forward is received directing a
+  client to a collocated object.
+
+. Prevent an OBJ_ADAPTER exception when using an object reference containing
+  an ObjectID that corresponds to a collocated IORTable entry.
+
+. Reverted solution that allowed POA-level control over access to
+  security-enabled objects due to conflicts with the specification,
+  i.e. the  Security::SecQoP* are not server-side policies.
+
+. When suppressing any and typecodes during IDL compilation this will not
+  trigger compile errors due to missing any insert operations
+
+. Bug fix in IFR when creating typecodes for nested structs and unions.
+
+. Added support for the --enable-tk-reactor configure option to the
+  autoconf build infrastructure to build the TAO_TkResource library.
+
+IDL COMPILER
+------------
+
+. Fix problem with missing includes in the skeleton files for imported arg
+  trait declarations.
+
+USER VISIBLE CHANGES BETWEEN TAO-1.4.9 and TAO-1.4.10
+====================================================
+
+. Fixed a bug, which allowed security unaware clients to make
+  invocations on secure objects, when the ORB was configured with
+  support for Security::SecQoPNoProtection.
+
+. Fixed Bugzilla #2145, which was preventing the building of
+  the IDL compiler on HPUX.
+
+. Added boxed valuetype support to the Interface Repository
+  loader.
+
+. Fixed several bugs in the PICurrent implementation
+
+. Fixed GOA factory name
+
+. Fixed -ORBConnectionHandlerCleanup arguments to accept 0 and 1.
+
+. Improved Portable Interceptor implementation.
+
+. Autoconfig improvements.
+
+. Improved Real-time CORBA support for dynamic threads.
+
+IDL COMPILER:
+-------------
+
+. Some bug fixes. See bug #2375 and #2390.
+
+USER VISIBLE CHANGES BETWEEN TAO-1.4.8 and TAO-1.4.9
+====================================================
+
+. Added new endpoint selector implementation - Optimized
+  Connection Endpoint Selector. A member of the tao/Strategies library,
+  use svc.conf file to load the OC_Endpoint_Factory object. See
+  tests/AlternateIIOP/svc.conf for an example.
+
+. Continued splitting ORB Services into stub, skeleton, and
+  implementation libraries.  Changes to the Concurrency Service,
+  Property Service, and RTEventLog Admin Service (TAO's RTEvent
+  varient of the OMG Telecom Log Service) have been committed.
+
+. Added a new ORB run-time option "-ORBUseLocalMemoryPool [0|1]" which
+  controls an individual application's use of TAO's Local Memory Pool.
+  TAO can use a local memory pool to satisfy some of its needs for
+  heap storage, as it is often more efficient than using the
+  platform's default memory allocator. The pool will always grow as
+  large as necessary to satisfy memory allocations, but it will never
+  shrink. This means that sometimes a process can retain memory that
+  it no longer needs. If the default allocator is used then TAO gives
+  memory back as soon as it is not needed.
+  The UseLocalMemoryPool option selects between using the local memory
+  pool or using the default allocator, where 0 means don't use the pool,
+  1 means use the pool. The default is still controlled by the original
+  compile-time option controlled by the #define TAO_USE_LOCAL_MEMORY_POOL
+  which defaults to 1 if not specified.
+
+. Add a property -ORBKeepalive to allow a user to specify that
+  SO_KEEPALIVE is set on IIOP connections. See docs/Options.html
+  and Bugzilla #2374.
+
+. Add support for RTCORBA::TCPPrototocolProperties::keep_alive, when
+  RTCORBA is used, and the application is using a Server or Client
+  ProtocolPolicy.
+
+. Refined the Telecom Log Service Strategy Interface.  Added methods
+  to fetch/store capacity alarm thresholds, log QoS, and "week mask".
+  Rework locking to avoid race conditions and to improve performance.
+
+IDL COMPILER:
+-------------
+
+. Fixed bug in computation of repository ids for predefined types.
+
+. Fixed bug in the handling of TAO_IDL_INCLUDE_DIR.
+
+Interface Repository:
+---------------------
+
+. Fixed bug in the lookup of a valuetype member's type using its
+  repository id.
+
+. Fixed bug in IFR loader in checking for pre-existence before
+  creating an entry corresponding to an IDL typedef.
+
+. Fixed bug in lookup when checking for a local name clash.
+
+. Fixed bug in the describe_interface() operation when the IDL
+  interface being described has multiple parents.
 
 USER VISIBLE CHANGES BETWEEN TAO-1.4.7 and TAO-1.4.8
 ====================================================
@@ -53,6 +216,84 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.7 and TAO-1.4.8
   maintenance at that moment the macros will be removed from TAO.
   See also http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2256
 
+. Support the latest AMI mapping, the old mapping will be kept working
+  until 1.5.1 has been released. If you need the old mapping add
+  the define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER to your config.h
+  file before you build TAO and the TAO_IDL compiler
+
+. Added CodecFactory::create_codec_with_codesets to create a codec with
+  a specific codeset. See OMG issue 6050 for the background.
+
+. PortableInterceptor::IORInterceptor has been splitted in IORInterceptor
+  and IORInterceptor_3_0. If you use IORInterceptors read the ChangeLog for
+  the details, maybe you have to update your code!
+
+. Added the new Custom Servant Dispatching (CSD) feature to provide user
+  applications with the ability to implement and "plug-in" custom strategies
+  to handle the dispatching of requests to servants. This new feature is not
+  currently tested for VxWorks. See TAO release notes for more information.
+
+. Added support for an TAO "versioned" namespace.  When enabled, TAO
+  library sources will be placed within a namespace of the user's
+  choice or a namespace of the form TAO_1_4_7 by default, where
+  "1_4_7" is the TAO major, minor and beta versions.  The default may
+  be overridden by defining the TAO_VERSIONED_NAMESPACE_NAME
+  preprocessor symbol.  Enable overall versioned namespace support by
+  adding "versioned_namespace=1" to your MPC default.features file.
+
+. Changed generated signatures of some valuetype member
+  accessor/mutator pairs to be consistent with IN
+  parameter semantics.
+
+. Added spec-required generation of member-initializing
+  constructor for valuetypes. See C++ mapping (03-06-03)
+  section 1.17.2. Closes Bugzilla #2270.
+
+. Added default include paths $TAO_ROOT, $TAO_ROOT/tao,
+  $TAO_ROOT/orbsvcs, and $CIAO_ROOT/ciao to IDL compiler
+  execution, eliminating the need to add them explicitly
+  to the command line.
+
+. Added immediate exits to IDL compiler when some name clash
+  errors are encountered, avoiding a crash if parsing is
+  continued. Closes Bugzilla #2281.
+
+. Changed the behavior of the _default() method (generated
+  for IDL unions that have an explicit or implicit default
+  case label) to clean up memory used by the freed member,
+  if necessary.
+
+. Fixed bug in IDL compiler when handling a native exception
+  in an operation declared in Messaging::ExceptionHolder.
+
+. Although not presently supported by CIAO, added error
+  checking to the IDL compiler's parsing of IDL home
+  primary keys, which constrain the basic valuetype
+  syntax in several ways.
+
+. Fixed order of generated base class stub constructor calls
+  when the IDL interface has both concrete and abstract parents.
+
+. Fixed a bug in the handling of forward declared interfaces
+  that have both concrete and abstract parents.
+
+. Fixed the command line parsing to preserve the literal
+  quotes if they are used in an include path that has a space.
+  Closes Bugzilla #2219.
+
+. Many changes related to refactoring of Anys and Typecodes
+  into a separate library (POC is Johnny Willemsen
+  <jwillemsen@remedy.nl>).
+
+. Merging of many Notification Service changes/fixes from OCITAO to
+  the DOC version.  These generally addressed stability issues such as
+  memory leaks, thread leaks, etc.
+
+. Introduction of the versioned namespaces changed the name of the
+  factory function used for dynamically loading the Notification
+  Service persistence mechanisms.  See the service configurator file
+  in orbsvcs/tests/Notify/XML_Persistence for an example.
+
 USER VISIBLE CHANGES BETWEEN TAO-1.4.6 and TAO-1.4.7
 ====================================================
 
@@ -429,8 +670,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.1 and TAO-1.4.2
 . Added CPU utilization load monitor to TAO's Cygnus load balancer.
 
 . Added basic CSIv2 support, which is the latest CORBA Security
-  architecture specification.  Advanced CSIv2 features will be
-  available in the next beta.
+  architecture specification.
 
 USER VISIBLE CHANGES BETWEEN TAO-1.4 and TAO-1.4.1
 ==================================================
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 786e42ebb4b..35fff13d40c 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.4.7
-    ACE VERSION: 5.4.7
+    TAO VERSION: 1.5.1
+    ACE VERSION: 5.5.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -91,3 +91,4 @@ transcript if at all possible.  ]
 
     SAMPLE FIX/WORKAROUND:
 [If available ]
+
diff --git a/TAO/Release b/TAO/Release
index db52ff5985b..9e124881936 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -14,36 +14,37 @@ CONTROLLED_FILES = \
 	TAO/COPYING* \
 	TAO/ChangeLog* \
 	TAO/LICENSE.sun \
+	TAO/Makefile.am \
+	TAO/NEWS \
 	TAO/PROBLEM-REPORT-FORM \
-	TAO/Release \
 	TAO/README* \
+	TAO/Release \
 	TAO/TAO-INSTALL.html \
-	TAO/TAOACE* \
 	TAO/TAO.mwc \
+	TAO/TAO_ACE* \
 	TAO/TAO_IDL \
 	TAO/VERSION \
+	TAO/configure.ac \
 	TAO/docs \
-	TAO/NEWS \
 	TAO/examples \
 	TAO/interop-tests \
+	TAO/m4 \
 	TAO/orbsvcs \
 	TAO/performance-tests \
 	TAO/rules.tao.GNU \
 	TAO/tao \
-	TAO/Makefile.am \
-	TAO/configure.ac \
 	TAO/tests \
 	TAO/utils
 
-
 RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
+                ACE_wrappers/TAO/TAO-INSTALL \
 		ACE_wrappers/TAO/GNUmake* \
 		ACE_wrappers/TAO/*.dsw \
         	ACE_wrappers/TAO/*.sln \
         	ACE_wrappers/TAO/*.bor \
-        	ACE_wrappers/TAO/configure \
         	ACE_wrappers/TAO/Makefile.in \
-                ACE_wrappers/TAO/TAO-INSTALL
+        	ACE_wrappers/TAO/configure \
+		ACE_wrappers/TAO/aclocal.m4
 
 
 .PHONY: INSTALL
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index ac86d804dbb..29d2b6385d5 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -23,19 +23,22 @@
 <H4><A NAME="build">Building and Installing TAO from a distribution</H4>
 
 
-<p>The following table summarizes platforms on which TAO runs:<P>
+<p>The following table summarizes platforms on which TAO runs, see the 
+<a href="../ACE-INSTALL.html#platforms">ACE installation notes</A> for an 
+overview of all the platforms ACE runs on, these are all candidates
+to run TAO on:<P>
 
 <table width="100%" border=1>
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
     <td>Solaris 7, 8 and 9, Windows 2000/XP (6.x, and 7.1 and
-        Borland C++ Builder 6), and Linux/Intel (Redhat,
-        Debian and SuSe),  Linux/Alpha (SuSe).
+        Borland C++ Builder 6/2006), and Linux/Intel (Redhat,
+        Debian and SuSe), Linux/Alpha (SuSe), VxWorks 5.5.1
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
    <td><b>Nearly fully supported, i.e., periodically tested</b></td>
-   <td>Windows 9x/ME, HP/UX 11.x, VxWorks 5.5.1, LynxOS, and AIX 4.x
+   <td>Windows 9x/ME, HP/UX 11.x, LynxOS, and AIX 4.x
    </td>
   </tr>
   <tr valign=top>
@@ -137,7 +140,7 @@ bundle as a single piece instead of trying to mix and match things up.<P>
           the right places (4) Delete all the GNUmakefiles (or dsp and
           dsw file as the case may be) from the TAO distrbution using
           the 'find' command. (5) Change directory to $TAO_ROOT. (6)
-          Run MPC like this, $ACE_ROOT/bin/mwc.pl TAOACE.mwc. (7) Run
+          Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc. (7) Run
           'make'. This will create all the required libraries for TAO
           and TAO orbsvcs. In step 6, use -type vc6 if you want to
           generate VC6 project and workspace files for Win32. Please
@@ -204,27 +207,22 @@ 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/TAO_IDL/tao_idl</CODE> and that the GPERF tool
+      <CODE>$TAO_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 two lines in your
-      platform_macros.GNU file, as follows:
+    <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:
 <PRE>
-$ echo 'TAO_IDL := /your/path/tao_idl' \
+$ 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
-$ echo 'TAO_IDLFLAGS := -g /your/path/gperf' \
 </PRE>
-    <P>You could even use:
-<PRE>
-$ echo 'TAO_IDL := tao_idl' \
-     >> platform_macros.GNU
-$ echo 'TAO_IDLFLAGS := -g gperf' \
-</PRE>
-    if the tools are in your path.
 
     <P>Obviously you must first build the tools for the host platform,
       typically you would do this as follows:
@@ -290,9 +288,9 @@ $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
   <li><code>cd ACE_wrappers</code>
   <li><code>bin/create_ace_build SunOS5_g++</code>
   <li><code>bin/create_ace_build vxworks</code>
-  <li><code>cd build/vxworks/TAO</code>
-  <li><code>/bin/rm -r TAO_IDL</code>
-  <li><code>ln -s ../../SunOS5_g++/TAO/TAO_IDL</code>
+  <li><code>cd build/vxworks/bin</code>
+  <li><code>/bin/rm -r tao_idl</code>
+  <li><code>ln -s ../../SunOS5_g++/bin/tao_idl</code>
 </ol>
 
       <P>To build on the host:
@@ -414,7 +412,7 @@ make -f Makefile.bor
 
 For more detailed information on building and using TAO with Borland's
 C++ Builder environment, please see the <A
-HREF="http://www.tenermerx.com/tao_bcb/index.html">online</A> help
+HREF="http://www.tenermerx.com/programming/corba/tao_bcb/index.html">online</A> help
 provided by <A HREF="mailto:chris@kohlhoff.com">Christopher
 Kohlhoff</A>. <P>
 
@@ -533,12 +531,12 @@ quickly.
   VC71 project and solution files.<p>
    <LI> Build ACE+TAO together in one shot. To do that please issue
   the following commands: <p>
-  <CODE> $ACE_ROOT/bin/mwc.pl TAOACE.mwc </CODE> <p>
+  <CODE> $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc </CODE> <p>
    from <CODE>$TAO_ROOT</CODE>. This will generate GNUmakefiles for
   ACE, gperf, and core ACE+TAO libraries. Issuing a
   <CODE>'make'</CODE> from <CODE>$TAO_ROOT </CODE> will build all of
   the above in one shot. You can use <CODE> -type vc6 </CODE> to
-  generate VC6 project and workspace files. <CODE>TAOACE.dsw</CODE>
+  generate VC6 project and workspace files. <CODE>TAO_ACE.dsw</CODE>
   can be used by users to build ACE+TAO from a single workspace
   file. Users can use <CODE> -type vc71 </CODE> to generate the VC71
   solutions files. <p>
diff --git a/TAO/TAOACE.mwc b/TAO/TAOACE.mwc
deleted file mode 100644
index 38830f933d9..00000000000
--- a/TAO/TAOACE.mwc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  ../ace
-  ../apps/gperf/src
-  ../ACEXML/common
-  ../ACEXML/parser/parser
-  ../ACEXML/apps/svcconf
-  ../Kokyu/Kokyu.mpc
-  ../protocols
-  tao
-  TAO_IDL
-  utils
-  orbsvcs
-  exclude {
-    orbsvcs/tests
-    orbsvcs/performance-tests
-    orbsvcs/examples
-  }
-}
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index 84267807b07..01dc2b42dc1 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -141,7 +141,6 @@ noinst_HEADERS = \
   include/fe_interface_header.h \
   include/fe_private.h \
   include/global_extern.h \
-  include/idl_bool.h \
   include/idl_defines.h \
   include/idl_global.h \
   include/idl_narrow.h \
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index cb42418defe..a34026cedee 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Log_Msg.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (ast, 
-           ast_array, 
+ACE_RCSID (ast,
+           ast_array,
            "$Id$")
 
 // Constructor(s) and destructor.
@@ -98,13 +98,13 @@ AST_Array::AST_Array (void)
 AST_Array::AST_Array (UTL_ScopedName *n,
                       unsigned long nd,
                       UTL_ExprList *ds,
-                      idl_bool local,
-                      idl_bool abstract)
+                      bool local,
+                      bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_array,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_array,
               n),
     AST_ConcreteType (AST_Decl::NT_array,
@@ -188,7 +188,7 @@ AST_Array::compute_size_type (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_array::compute_size_type - "
-                         "bad base type\n"), 
+                         "bad base type\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index 7f19a28e6be..bbc7f6deec5 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -79,8 +79,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "global_extern.h"
 
-ACE_RCSID (ast, 
-           ast_attribute, 
+ACE_RCSID (ast,
+           ast_attribute,
            "$Id$")
 
 // Constructor(s) and destructor.
@@ -88,17 +88,17 @@ AST_Attribute::AST_Attribute (void)
   : COMMON_Base (),
     AST_Decl (),
     AST_Field (),
-    pd_readonly (I_TRUE),
+    pd_readonly (true),
     pd_get_exceptions (0),
     pd_set_exceptions (0)
 {
 }
 
-AST_Attribute::AST_Attribute (idl_bool ro,
+AST_Attribute::AST_Attribute (bool ro,
                               AST_Type *ft,
                               UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_attr,
@@ -122,7 +122,7 @@ AST_Attribute::~AST_Attribute (void)
 void
 AST_Attribute::dump (ACE_OSTREAM_TYPE &o)
 {
-  this->dump_i (o, (this->pd_readonly == I_TRUE ?
+  this->dump_i (o, (this->pd_readonly == true ?
                     "readonly attribute " : "attribute "));
   AST_Field::dump (o);
 }
@@ -167,7 +167,7 @@ AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t)
 
 // Data accessors.
 
-idl_bool
+bool
 AST_Attribute::readonly (void) const
 {
   return this->pd_readonly;
@@ -201,7 +201,7 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
       nl_n = nl_i.item ();
 
       d = this->defined_in ()->lookup_by_name (nl_n,
-                                               I_TRUE);
+                                               true);
 
       if (d == 0 || d->node_type() != AST_Decl::NT_except)
         {
@@ -256,7 +256,7 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
       nl_n = nl_i.item ();
 
       d = this->defined_in ()->lookup_by_name (nl_n,
-                                               I_TRUE);
+                                               true);
 
       if (d == 0 || d->node_type() != AST_Decl::NT_except)
         {
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index b83509eff93..6c9e2054984 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -8,8 +8,8 @@
 #include "utl_err.h"
 #include "global_extern.h"
 
-ACE_RCSID (ast, 
-           ast_component, 
+ACE_RCSID (ast,
+           ast_component,
            "$Id$")
 
 AST_Component::AST_Component (void)
@@ -28,8 +28,8 @@ AST_Component::AST_Component (UTL_ScopedName *n,
                               long n_supports,
                               AST_Interface **supports_flat,
                               long n_supports_flat)
-  : COMMON_Base (I_FALSE,
-                 I_FALSE),
+  : COMMON_Base (false,
+                 false),
     AST_Decl (AST_Decl::NT_component,
               n),
     AST_Type (AST_Decl::NT_component,
@@ -40,8 +40,8 @@ AST_Component::AST_Component (UTL_ScopedName *n,
                    n_supports,
                    supports_flat,
                    n_supports_flat,
-                   I_FALSE,
-                   I_FALSE),
+                   false,
+                   false),
     pd_base_component (base_component)
 {
 }
@@ -75,22 +75,22 @@ AST_Component::redefine (AST_Interface *from)
 
 AST_Decl *
 AST_Component::look_in_inherited (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
+                                  bool treat_as_ref)
 {
   AST_Decl *d = 0;
-  
+
   if (this->pd_base_component != 0)
     {
       d = this->pd_base_component->lookup_by_name (e, treat_as_ref);
     }
-  
+
   return d;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_Component::look_in_supported (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
+                                  bool treat_as_ref)
 {
   AST_Decl *d = 0;
   AST_Interface **is = 0;
@@ -121,7 +121,7 @@ AST_Component::look_in_supported (UTL_ScopedName *e,
           break;
         }
     }
-    
+
   return d;
 }
 
@@ -137,7 +137,7 @@ AST_Component::supports (void) const
   return this->inherits ();
 }
 
-long 
+long
 AST_Component::n_supports (void) const
 {
   return this->n_inherits ();
@@ -223,7 +223,7 @@ AST_Component::ast_accept (ast_visitor *visitor)
   return visitor->visit_component (this);
 }
 
-idl_bool
+bool
 AST_Component::redef_clash (void)
 {
   if (this->AST_Interface::redef_clash ())
diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
index ad7a9a93d56..3f4a10f8a93 100644
--- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
@@ -4,8 +4,8 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-ACE_RCSID( ast, 
-           ast_component_fwd, 
+ACE_RCSID( ast,
+           ast_component_fwd,
            "$Id$")
 
 AST_ComponentFwd::AST_ComponentFwd (void)
@@ -18,8 +18,8 @@ AST_ComponentFwd::AST_ComponentFwd (void)
 
 AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
-  : COMMON_Base (I_TRUE,
-                 I_FALSE),
+  : COMMON_Base (true,
+                 false),
     AST_Decl (AST_Decl::NT_component_fwd,
               n),
     AST_Type (AST_Decl::NT_component_fwd,
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index 9b82fd3fc8f..6a73e6d8e9a 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -77,8 +77,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_generator.h"
 #include "nr_extern.h"
 
-ACE_RCSID (ast, 
-           ast_constant, 
+ACE_RCSID (ast,
+           ast_constant,
            "$Id$")
 
 // Static functions.
@@ -140,27 +140,27 @@ AST_Constant::AST_Constant (void)
 
 // Used in constructing AST_EnumVal nodes.
 AST_Constant::AST_Constant (AST_Expression::ExprType t,
-			                      AST_Decl::NodeType nt,
-			                      AST_Expression *v,
-			                      UTL_ScopedName *n)
+                            AST_Decl::NodeType nt,
+                            AST_Expression *v,
+                            UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (nt,
               n),
-	  pd_constant_value (v),
-	  pd_et (t),
+    pd_constant_value (v),
+    pd_et (t),
     ifr_added_ (0)
 {
 }
 
 // Used when constructing AST_Constant nodes.
 AST_Constant::AST_Constant (AST_Expression::ExprType t,
-			                      AST_Expression *v,
-			                      UTL_ScopedName *n)
+                            AST_Expression *v,
+                            UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_const,
               n),
-	  pd_constant_value (v),
-	  pd_et (t),
+    pd_constant_value (v),
+    pd_et (t),
     ifr_added_ (0)
 {
   // Avoids a truncation warning on MSVC when assigning a decimal
@@ -171,7 +171,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
   // of truncation would not apply.
   if (t == AST_Expression::EV_float && v->ev ()->et == AST_Expression::EV_double)
     {
-      AST_Expression::AST_ExprValue *ev = 
+      AST_Expression::AST_ExprValue *ev =
         this->pd_constant_value->ev ();
       ev->et = t;
       ev->u.fval = (float) ev->u.dval;
@@ -236,14 +236,14 @@ AST_Constant::et (void)
   return this->pd_et;
 }
 
-idl_bool
+bool
 AST_Constant::ifr_added (void)
 {
   return this->ifr_added_;
 }
 
 void
-AST_Constant::ifr_added (idl_bool val)
+AST_Constant::ifr_added (bool val)
 {
   this->ifr_added_ = val;
 }
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index f877e5ef2c9..7283af70e0b 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -86,6 +86,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 #include "utl_identifier.h"
+#include "utl_string.h"
 #include "utl_scope.h"
 #include "utl_err.h"
 #include "ace/OS_NS_stdio.h"
@@ -97,20 +98,20 @@ ACE_RCSID (ast,
            ast_decl,
            "$Id$")
 
-COMMON_Base::COMMON_Base (idl_bool local,
-                          idl_bool abstract)
+COMMON_Base::COMMON_Base (bool local,
+                          bool abstract)
   : is_local_ (local),
     is_abstract_ (abstract)
 {
 }
 
-idl_bool
+bool
 COMMON_Base::is_local (void)
 {
   return this->is_local_;
 }
 
-idl_bool
+bool
 COMMON_Base::is_abstract (void)
 {
   return this->is_abstract_;
@@ -128,20 +129,19 @@ AST_Decl::AST_Decl (void)
     repoID_ (0),
     flat_name_ (0),
     contains_wstring_ (-1),
-    pd_imported (I_FALSE),
-    pd_in_main_file (I_FALSE),
+    pd_imported (false),
+    pd_in_main_file (false),
     pd_defined_in (0),
     pd_node_type (NT_module),
     pd_line (-1),
-    pd_file_name (0),
     pd_local_name (0),
     pd_original_local_name (0),
-    pd_added (I_FALSE),
+    pd_added (false),
     full_name_ (0),
     prefix_ (0),
     version_ (0),
-    anonymous_ (I_FALSE),
-    typeid_set_ (I_FALSE),
+    anonymous_ (false),
+    typeid_set_ (false),
     last_referenced_as_ (0),
     prefix_scope_ (0)
 {
@@ -149,7 +149,7 @@ AST_Decl::AST_Decl (void)
 
 AST_Decl::AST_Decl (NodeType nt,
                     UTL_ScopedName *n,
-                    idl_bool anonymous)
+                    bool anonymous)
   : COMMON_Base (),
     repoID_ (0),
     flat_name_ (0),
@@ -161,19 +161,22 @@ AST_Decl::AST_Decl (NodeType nt,
                      : 0),
     pd_node_type (nt),
     pd_line (idl_global->lineno ()),
-    pd_file_name (idl_global->filename ()),
     pd_name (0),
     pd_local_name (n == 0 ? 0 : n->last_component ()->copy ()),
     pd_original_local_name (0),
-    pd_added (I_FALSE),
+    pd_added (false),
     full_name_ (0),
     prefix_ (0),
     version_ (0),
     anonymous_ (anonymous),
-    typeid_set_ (I_FALSE),
+    typeid_set_ (false),
     last_referenced_as_ (0),
     prefix_scope_ (0)
 {
+  // If this is the root node, the filename won't have been set yet.
+  UTL_String *fn = idl_global->filename ();
+  this->pd_file_name = (fn != 0 ? fn->get_string () : "");
+
   this->compute_full_name (n);
 
   char *prefix = 0;
@@ -275,7 +278,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
     {
       AST_Decl *decl = ScopeAsDecl (this->prefix_scope_);
 
-      idl_bool overridden =
+      bool overridden =
         decl->has_ancestor (ScopeAsDecl (appeared_in));
 
       if (overridden)
@@ -351,8 +354,8 @@ AST_Decl::compute_full_name (void)
   else
     {
       size_t namelen = 0;
-      long first = I_TRUE;
-      long second = I_FALSE;
+      long first = true;
+      long second = false;
       char *name = 0;
 
       for (UTL_IdListActiveIterator i (this->name ());
@@ -365,7 +368,7 @@ AST_Decl::compute_full_name (void)
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -377,11 +380,11 @@ AST_Decl::compute_full_name (void)
               if (ACE_OS::strcmp (name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -390,8 +393,8 @@ AST_Decl::compute_full_name (void)
                char[namelen + 1]);
 
       this->full_name_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
+      first = true;
+      second = false;
 
       for (UTL_IdListActiveIterator j (this->name ());
            !j.is_done ();
@@ -403,7 +406,7 @@ AST_Decl::compute_full_name (void)
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -415,11 +418,11 @@ AST_Decl::compute_full_name (void)
               if (ACE_OS::strcmp (name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -436,8 +439,8 @@ AST_Decl::compute_repoID (void)
     }
 
   size_t namelen = 4; // for the prefix "IDL:"
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
   char *name = 0;
   const char *prefix = (this->prefix_ ? this->prefix_ : "");
   UTL_Scope *scope = this->defined_in ();
@@ -494,7 +497,7 @@ AST_Decl::compute_repoID (void)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       // Print the identifier.
@@ -515,11 +518,11 @@ AST_Decl::compute_repoID (void)
           if (ACE_OS::strcmp (name, "") != 0)
             {
               // Does not start with a "".
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
@@ -541,8 +544,8 @@ AST_Decl::compute_repoID (void)
       ACE_OS::strcat (this->repoID_, "/");
     }
 
-  first = I_TRUE;
-  second = I_FALSE;
+  first = true;
+  second = false;
 
   for (UTL_IdListActiveIterator j (this->name ());
        !j.is_done ();
@@ -554,7 +557,7 @@ AST_Decl::compute_repoID (void)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       // Print the identifier.
@@ -576,11 +579,11 @@ AST_Decl::compute_repoID (void)
           if (ACE_OS::strcmp (name, "") != 0)
             {
               // Does not start with a "".
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
@@ -623,8 +626,8 @@ AST_Decl::compute_flat_name (void)
   else
     {
       size_t namelen = 0;
-      long first = I_TRUE;
-      long second = I_FALSE;
+      long first = true;
+      long second = false;
       char *item_name = 0;
 
       // In the first loop, compute the total length.
@@ -638,7 +641,7 @@ AST_Decl::compute_flat_name (void)
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -650,11 +653,11 @@ AST_Decl::compute_flat_name (void)
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -663,8 +666,8 @@ AST_Decl::compute_flat_name (void)
                char[namelen + 1]);
 
       this->flat_name_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
+      first = true;
+      second = false;
 
       for (UTL_IdListActiveIterator j (this->name ());
            !j.is_done ();
@@ -676,7 +679,7 @@ AST_Decl::compute_flat_name (void)
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -688,11 +691,11 @@ AST_Decl::compute_flat_name (void)
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -701,12 +704,12 @@ AST_Decl::compute_flat_name (void)
 
 // Return TRUE if one of my ancestor scopes is "s"
 // and FALSE otherwise.
-idl_bool
+bool
 AST_Decl::has_ancestor (AST_Decl *s)
 {
   if (this == s)
     {
-      return I_TRUE;
+      return true;
     }
 
   if (s->node_type () == AST_Decl::NT_module)
@@ -718,7 +721,7 @@ AST_Decl::has_ancestor (AST_Decl *s)
         {
           if (this == other_opening)
             {
-              return I_TRUE;
+              return true;
             }
 
           other_opening = enclosing->lookup_by_name_local (s->local_name (),
@@ -728,13 +731,13 @@ AST_Decl::has_ancestor (AST_Decl *s)
 
   if (this->pd_defined_in == 0)
     {
-      return I_FALSE;
+      return false;
     }
 
   return ScopeAsDecl (this->pd_defined_in)->has_ancestor (s);
 }
 
-idl_bool
+bool
 AST_Decl::is_child (AST_Decl *s)
 {
   if (this->defined_in ())
@@ -755,7 +758,7 @@ AST_Decl::is_child (AST_Decl *s)
   return 0; // Not a child.
 }
 
-idl_bool
+bool
 AST_Decl::is_nested (void)
 {
   AST_Decl *d = ScopeAsDecl (this->defined_in ());
@@ -764,10 +767,10 @@ AST_Decl::is_nested (void)
   // then we are defined at some nesting level.
   if (d != 0 && d->node_type () != AST_Decl::NT_root)
     {
-      return I_TRUE;
+      return true;
     }
 
-  return I_FALSE;
+  return false;
 }
 
 // Dump this AST_Decl to the ostream o.
@@ -955,26 +958,26 @@ AST_Decl::version (char *value)
     }
 }
 
-idl_bool
+bool
 AST_Decl::anonymous (void) const
 {
   return this->anonymous_;
 }
 
 void
-AST_Decl::anonymous (idl_bool val)
+AST_Decl::anonymous (bool val)
 {
   this->anonymous_ = val;
 }
 
-idl_bool
+bool
 AST_Decl::typeid_set (void) const
 {
   return this->typeid_set_;
 }
 
 void
-AST_Decl::typeid_set (idl_bool val)
+AST_Decl::typeid_set (bool val)
 {
   this->typeid_set_ = val;
 }
@@ -1030,7 +1033,7 @@ AST_Decl::set_id_with_typeid (char *value)
   delete [] this->repoID_;
   this->repoID_ = 0;
   this->repoID (value);
-  this->typeid_set_ = I_TRUE;
+  this->typeid_set_ = true;
 }
 
 void
@@ -1059,38 +1062,38 @@ AST_Decl::set_prefix_with_typeprefix (const char *value)
                                       DeclAsScope (this));
 }
 
-idl_bool
+bool
 AST_Decl::imported (void)
 {
   return this->pd_imported;
 }
 
 void
-AST_Decl::set_imported (idl_bool is_it)
+AST_Decl::set_imported (bool is_it)
 {
   this->pd_imported = is_it;
 }
 
-idl_bool
+bool
 AST_Decl::in_main_file (void)
 {
   return this->pd_in_main_file;
 }
 
 void
-AST_Decl::set_in_main_file (idl_bool is_it)
+AST_Decl::set_in_main_file (bool is_it)
 {
   this->pd_in_main_file = is_it;
 }
 
-idl_bool
+bool
 AST_Decl::added (void)
 {
   return this->pd_added;
 }
 
 void
-AST_Decl::set_added (idl_bool is_it)
+AST_Decl::set_added (bool is_it)
 {
   this->pd_added = is_it;
 }
@@ -1125,14 +1128,14 @@ AST_Decl::set_line (long l)
   this->pd_line = l;
 }
 
-UTL_String *
+ACE_CString
 AST_Decl::file_name (void)
 {
   return this->pd_file_name;
 }
 
 void
-AST_Decl::set_file_name (UTL_String *s)
+AST_Decl::set_file_name (ACE_CString s)
 {
   this->pd_file_name = s;
 }
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 23bde0b68b7..cb18dc00c99 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "utl_indenter.h"
 
-ACE_RCSID (ast, 
-           ast_enum, 
+ACE_RCSID (ast,
+           ast_enum,
            "$Id$")
 
 AST_Enum::AST_Enum (void)
@@ -82,24 +82,24 @@ AST_Enum::AST_Enum (void)
     AST_Type (),
     AST_ConcreteType (),
     UTL_Scope (),
-	  pd_enum_counter (0),
+    pd_enum_counter (0),
     member_count_ (-1)
 {
   this->size_type (AST_Type::FIXED);
 }
 
 AST_Enum::AST_Enum (UTL_ScopedName *n,
-                    idl_bool local,
-                    idl_bool abstract)
+                    bool local,
+                    bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_enum,
               n),
-	  AST_Type (AST_Decl::NT_enum,
+    AST_Type (AST_Decl::NT_enum,
               n),
-	  AST_ConcreteType (AST_Decl::NT_enum,
+    AST_ConcreteType (AST_Decl::NT_enum,
                       n),
-	  UTL_Scope (AST_Decl::NT_enum),
+    UTL_Scope (AST_Decl::NT_enum),
     pd_enum_counter (0),
     member_count_ (-1)
 {
@@ -150,7 +150,7 @@ AST_Enum::lookup_by_value (const AST_Expression *v)
   AST_EnumVal *item = 0;
   AST_Decl *d = 0;
 
-  for (UTL_ScopeActiveIterator i (this, IK_decls); 
+  for (UTL_ScopeActiveIterator i (this, IK_decls);
        !i.is_done ();
        i.next ())
     {
@@ -220,8 +220,8 @@ AST_Enum::compute_member_count (void)
   // If there are elements in this scope
   if (this->nmembers () > 0)
     {
-      for (UTL_ScopeActiveIterator i (this, IK_decls); 
-           !i.is_done (); 
+      for (UTL_ScopeActiveIterator i (this, IK_decls);
+           !i.is_done ();
            i.next ())
         {
           // Get the next AST decl node.
@@ -247,7 +247,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
       t1 = idl_global->gen ()->create_enum_val (tmp,
                                                 t->name ());
 
-      UTL_ScopedName *sn = 
+      UTL_ScopedName *sn =
         munge_name_for_enumval ((UTL_IdList *) t->name ()->copy (),
                                 t->local_name ());
 
@@ -260,7 +260,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -293,7 +293,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   // Add it to enclosing scope.
diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp
index 41b5d656a06..7338bf6ef3d 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp
@@ -7,8 +7,8 @@
 #include "utl_indenter.h"
 #include "global_extern.h"
 
-ACE_RCSID (ast, 
-           ast_eventtype, 
+ACE_RCSID (ast,
+           ast_eventtype,
            "$Id$")
 
 AST_EventType::AST_EventType (void)
@@ -30,10 +30,10 @@ AST_EventType::AST_EventType (UTL_ScopedName *n,
                               AST_Interface **supports,
                               long n_supports,
                               AST_Interface *supports_concrete,
-                              idl_bool abstract,
-                              idl_bool truncatable,
-                              idl_bool custom)
-  : COMMON_Base (I_FALSE,
+                              bool abstract,
+                              bool truncatable,
+                              bool custom)
+  : COMMON_Base (false,
                  abstract),
     AST_Decl (AST_Decl::NT_eventtype,
               n),
@@ -45,7 +45,7 @@ AST_EventType::AST_EventType (UTL_ScopedName *n,
                    n_inherits,
                    inherits_flat,
                    n_inherits_flat,
-                   I_FALSE,
+                   false,
                    abstract),
     AST_ValueType (n,
                    inherits,
diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
index 8699d274f9f..6bff9695525 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
@@ -5,8 +5,8 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-ACE_RCSID( ast, 
-           ast_eventtype_fwd, 
+ACE_RCSID( ast,
+           ast_eventtype_fwd,
            "$Id$")
 
 AST_EventTypeFwd::AST_EventTypeFwd (void)
@@ -20,7 +20,7 @@ AST_EventTypeFwd::AST_EventTypeFwd (void)
 
 AST_EventTypeFwd::AST_EventTypeFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
-  : COMMON_Base (I_FALSE,
+  : COMMON_Base (false,
                  dummy->is_abstract ()),
     AST_Decl (AST_Decl::NT_eventtype_fwd,
               n),
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index e0cc7761758..62a91cd53e4 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_identifier.h"
 #include "utl_indenter.h"
 
-ACE_RCSID (ast, 
-           ast_exception, 
+ACE_RCSID (ast,
+           ast_exception,
            "$Id$")
 
 AST_Exception::AST_Exception (void)
@@ -93,8 +93,8 @@ AST_Exception::AST_Exception (void)
 }
 
 AST_Exception::AST_Exception (UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_except,
@@ -118,14 +118,14 @@ AST_Exception::~AST_Exception (void)
 // Public operations.
 
 // Are we or the parameter node involved in any recursion?
-idl_bool
+bool
 AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   // Proceed if the number of members in our scope is greater than 0.
   if (this->nmembers () > 0)
     {
       list.enqueue_tail (this);
-        
+
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator i (this, IK_decls);!i.is_done ();i.next ())
         {
@@ -178,7 +178,7 @@ AST_Exception::fe_add_field (AST_Field *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -211,7 +211,7 @@ AST_Exception::fe_add_field (AST_Field *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *ft = t->field_type ();
@@ -220,7 +220,7 @@ AST_Exception::fe_add_field (AST_Field *t)
   if (mru != 0)
     {
       this->add_to_referenced (ft,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
 
@@ -236,7 +236,7 @@ AST_Exception::fe_add_union (AST_Union *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -269,7 +269,7 @@ AST_Exception::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -283,7 +283,7 @@ AST_Exception::fe_add_structure (AST_Structure *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -315,7 +315,7 @@ AST_Exception::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -328,7 +328,7 @@ AST_Exception::fe_add_enum (AST_Enum *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -361,7 +361,7 @@ AST_Exception::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -377,7 +377,7 @@ AST_Exception::fe_add_enum_val (AST_EnumVal *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -410,7 +410,7 @@ AST_Exception::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index b321283717c..285f4cfca7f 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -198,9 +198,8 @@ AST_Expression::AST_Expression (long lv)
   this->pd_ev->u.lval = lv;
 }
 
-// An AST_Expression denoting a long integer being used as a boolean.
-AST_Expression::AST_Expression (long lv,
-                                ExprType t)
+// An AST_Expression denoting a boolean.
+AST_Expression::AST_Expression (bool b)
   : pd_ec (EC_none),
     pd_ev (0),
     pd_v1 (0),
@@ -213,9 +212,8 @@ AST_Expression::AST_Expression (long lv,
   ACE_NEW (this->pd_ev,
            AST_ExprValue);
 
-  this->pd_ev->et = EV_long;
-  this->pd_ev->et = t;
-  this->pd_ev->u.lval = lv;
+  this->pd_ev->et = EV_bool;
+  this->pd_ev->u.bval = b;
 }
 
 // An AST_Expression denoting an unsigned long integer.
@@ -1029,24 +1027,24 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
       switch (ev->et)
         {
         case AST_Expression::EV_short:
-          ev->u.bval = (ev->u.sval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.sval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_ushort:
-          ev->u.bval = (ev->u.usval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.usval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_long:
-          ev->u.bval = (ev->u.lval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.lval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_ulong:
-          ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.ulval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-          ev->u.bval = (ev->u.llval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.llval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -1054,7 +1052,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
        case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-          ev->u.bval = (ev->u.ullval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.ullval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -1063,23 +1061,23 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_bool:
           return ev;
         case AST_Expression::EV_float:
-          ev->u.bval = (ev->u.fval == 0.0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.fval == 0.0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_double:
-          ev->u.bval = (ev->u.dval == 0.0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.dval == 0.0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_char:
-          ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.cval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_wchar:
-          ev->u.bval = (ev->u.wcval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.wcval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_octet:
-          ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE;
+          ev->u.bval = (ev->u.oval == 0) ? false : true;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_longdouble:
@@ -1133,7 +1131,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           return 0;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
         case AST_Expression::EV_bool:
-          ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0);
+          ev->u.fval = (float) ((ev->u.bval == true) ? 1.0 : 0.0);
           ev->et = AST_Expression::EV_float;
           return ev;
         case AST_Expression::EV_float:
@@ -1213,7 +1211,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           return NULL;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
         case AST_Expression::EV_bool:
-          ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0;
+          ev->u.dval = (ev->u.bval == true) ? 1.0 : 0.0;
           ev->et = AST_Expression::EV_double;
           return ev;
         case AST_Expression::EV_float:
@@ -1546,7 +1544,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           return 0;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
         case AST_Expression::EV_bool:
-          ev->u.oval = (unsigned char) ((ev->u.bval == I_FALSE) ? 1 : 0);
+          ev->u.oval = (unsigned char) ((ev->u.bval == false) ? 1 : 0);
           ev->et = AST_Expression::EV_octet;
           return ev;
         case AST_Expression::EV_float:
@@ -1638,7 +1636,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
 
 // Integer literals may not be assigned to floating point constants,
 // and vice versa.
-static idl_bool
+static bool
 incompatible_types (AST_Expression::ExprType t1,
                     AST_Expression::ExprType t2)
 {
@@ -1746,7 +1744,7 @@ eval_kind(AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
 // its sub-expressions.
 // Operations supported: '+', '-', '*', '/'
 AST_Expression::AST_ExprValue *
-AST_Expression::eval_bin_op (void)
+AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
 {
   AST_ExprValue *retval = 0;
 
@@ -1755,16 +1753,10 @@ AST_Expression::eval_bin_op (void)
       return 0;
     }
 
-  this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
-
-  if (this->pd_v1->ev () == 0)
-    {
-      return 0;
-    }
-
-  this->pd_v2->set_ev (this->pd_v2->coerce (EV_double));
+  this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
+  this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
-  if (pd_v2->ev () == 0)
+  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
     {
       return 0;
     }
@@ -1773,42 +1765,106 @@ AST_Expression::eval_bin_op (void)
                   AST_ExprValue,
                   0);
 
-  retval->et = EV_double;
+#if !defined (ACE_LACKS_LONGLONG_T)
+  if (ek == EK_ulonglong)
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulonglong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulonglong));
+      retval->et = EV_ulonglong;
 
-  switch (this->pd_ec)
+      switch (this->pd_ec)
+  {
+  case EC_add:
+    retval->u.ullval =
+      this->pd_v1->ev ()->u.ullval + this->pd_v2->ev ()->u.ullval;
+    break;
+  case EC_minus:
+    retval->u.ullval =
+      this->pd_v1->ev ()->u.ullval - this->pd_v2->ev ()->u.ullval;
+    break;
+  case EC_mul:
+    retval->u.ullval =
+      this->pd_v1->ev ()->u.ullval * this->pd_v2->ev ()->u.ullval;
+    break;
+  case EC_div:
+    if (this->pd_v2->ev ()->u.ullval == 0)
+      {
+        return 0;
+      }
+
+    retval->u.ullval =
+      this->pd_v1->ev ()->u.ullval / this->pd_v2->ev  ()->u.ullval;
+    break;
+  default:
+    return 0;
+  }
+    }
+  else if (ek == EK_longlong)
     {
-    case EC_mod:
-      if (this->pd_v2->ev ()->u.lval == 0)
-        {
-          return 0;
-        }
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong));
+      retval->et = EV_longlong;
 
-      retval->u.lval =
-        this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
-      break;
-    case EC_add:
-      retval->u.dval =
-        this->pd_v1->ev ()->u.dval + this->pd_v2->ev ()->u.dval;
-      break;
-    case EC_minus:
-      retval->u.dval =
-        this->pd_v1->ev ()->u.dval - this->pd_v2->ev ()->u.dval;
-      break;
-    case EC_mul:
-      retval->u.dval =
-        this->pd_v1->ev ()->u.dval * this->pd_v2->ev ()->u.dval;
-      break;
-    case EC_div:
-      if (this->pd_v2->ev ()->u.dval == 0.0)
-        {
-          return 0;
-        }
+      switch (this->pd_ec)
+  {
+  case EC_add:
+    retval->u.llval =
+      this->pd_v1->ev ()->u.llval + this->pd_v2->ev ()->u.llval;
+    break;
+  case EC_minus:
+    retval->u.llval =
+      this->pd_v1->ev ()->u.llval - this->pd_v2->ev ()->u.llval;
+    break;
+  case EC_mul:
+    retval->u.llval =
+      this->pd_v1->ev ()->u.llval * this->pd_v2->ev ()->u.llval;
+    break;
+  case EC_div:
+    if (this->pd_v2->ev ()->u.llval == 0)
+      {
+        return 0;
+      }
 
-      retval->u.dval =
-        this->pd_v1->ev ()->u.dval / this->pd_v2->ev  ()->u.dval;
-      break;
-    default:
-      return 0;
+    retval->u.llval =
+      this->pd_v1->ev ()->u.llval / this->pd_v2->ev  ()->u.llval;
+    break;
+  default:
+    return 0;
+  }
+    }
+  else
+#endif
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_double));
+      retval->et = EV_double;
+
+      switch (this->pd_ec)
+  {
+  case EC_add:
+    retval->u.dval =
+      this->pd_v1->ev ()->u.dval + this->pd_v2->ev ()->u.dval;
+    break;
+  case EC_minus:
+    retval->u.dval =
+      this->pd_v1->ev ()->u.dval - this->pd_v2->ev ()->u.dval;
+    break;
+  case EC_mul:
+    retval->u.dval =
+      this->pd_v1->ev ()->u.dval * this->pd_v2->ev ()->u.dval;
+    break;
+  case EC_div:
+    if (this->pd_v2->ev ()->u.dval == 0.0)
+      {
+        return 0;
+      }
+
+    retval->u.dval =
+      this->pd_v1->ev ()->u.dval / this->pd_v2->ev  ()->u.dval;
+    break;
+  default:
+    return 0;
+  }
     }
 
   return retval;
@@ -1817,7 +1873,7 @@ AST_Expression::eval_bin_op (void)
 // its sub-expressions.
 // Operations supported: '%'
 AST_Expression::AST_ExprValue *
-AST_Expression::eval_mod_op (void)
+AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
 {
   AST_ExprValue *retval = 0;
 
@@ -1826,34 +1882,82 @@ AST_Expression::eval_mod_op (void)
       return 0;
     }
 
-  this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
+  this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
+  this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
 
-  if (this->pd_v1->ev () == 0)
+  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
     {
       return 0;
     }
 
-  this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
+  ACE_NEW_RETURN (retval,
+                  AST_ExprValue,
+                  0);
 
-  if (pd_v2->ev () == 0)
+#if !defined (ACE_LACKS_LONGLONG_T)
+  if (ek == EK_ulonglong)
     {
-      return 0;
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulonglong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulonglong));
+      retval->et = EV_ulonglong;
+
+      if (this->pd_v2->ev ()->u.ullval == 0)
+  {
+    return 0;
+  }
+
+      retval->u.ullval =
+  this->pd_v1->ev ()->u.ullval % this->pd_v2->ev ()->u.ullval;
     }
+  else if (ek == EK_longlong)
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong));
+      retval->et = EV_longlong;
 
-  ACE_NEW_RETURN (retval,
-                  AST_ExprValue,
-                  0);
+      if (this->pd_v2->ev ()->u.llval == 0)
+  {
+    return 0;
+  }
+
+      retval->u.llval =
+  this->pd_v1->ev ()->u.llval % this->pd_v2->ev ()->u.llval;
+    }
+  else
+#endif
+  if (ek == EK_ulong)
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong));
+      retval->et = EV_ulong;
+
+      if (this->pd_v2->ev ()->u.ulval == 0)
+  {
+    return 0;
+  }
+
+      retval->u.ulval =
+  this->pd_v1->ev ()->u.ulval % this->pd_v2->ev ()->u.ulval;
+    }
+  else if (ek == EK_long)
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
+      retval->et = EV_long;
 
-  retval->et = EV_long;
+      if (this->pd_v2->ev ()->u.lval == 0)
+  {
+    return 0;
+  }
 
-  if (this->pd_v2->ev ()->u.lval == 0)
+      retval->u.lval =
+  this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
+    }
+  else
     {
       return 0;
     }
 
-  retval->u.lval =
-    this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
-
   return retval;
 }
 
@@ -1882,35 +1986,81 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
                   AST_ExprValue,
                   0);
 
-  // @@(JP) The rest will have to be expanded to handle 64-bit ints.
-  if (ek == EK_ulong)
-    {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulong));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong));
-      retval->et = EV_ulong;
-    }
-  else if (ek == EK_bool)
+#if !defined (ACE_LACKS_LONGLONG_T)
+  if (ek == EK_ulonglong)
     {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_bool));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_bool));
-      retval->et = EV_bool;
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulonglong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulonglong));
+      retval->et = EV_ulonglong;
+
+      switch (this->pd_ec)
+  {
+        case EC_or:
+          retval->u.ullval =
+            this->pd_v1->ev ()->u.ullval | this->pd_v2->ev ()->u.ullval;
+          break;
+        case EC_xor:
+          retval->u.ullval =
+            this->pd_v1->ev ()->u.ullval ^ this->pd_v2->ev ()->u.ullval;
+          break;
+        case EC_and:
+          retval->u.ullval =
+            this->pd_v1->ev ()->u.ullval & this->pd_v2->ev ()->u.ullval;
+          break;
+        case EC_left:
+          retval->u.ullval =
+            this->pd_v1->ev ()->u.ullval << this->pd_v2->ev ()->u.ullval;
+          break;
+        case EC_right:
+          retval->u.ullval =
+            this->pd_v1->ev ()->u.ullval >> this->pd_v2->ev ()->u.ullval;
+          break;
+        default:
+          return 0;
+  }
     }
-  else
+  else if (ek == EK_longlong)
     {
-      this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
-      this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
-      retval->et = EV_long;
-    }
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong));
+      retval->et = EV_longlong;
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
-    {
-      return 0;
+      switch (this->pd_ec)
+  {
+        case EC_or:
+          retval->u.llval =
+            this->pd_v1->ev ()->u.llval | this->pd_v2->ev ()->u.llval;
+          break;
+        case EC_xor:
+          retval->u.llval =
+            this->pd_v1->ev ()->u.llval ^ this->pd_v2->ev ()->u.llval;
+          break;
+        case EC_and:
+          retval->u.llval =
+            this->pd_v1->ev ()->u.llval & this->pd_v2->ev ()->u.llval;
+          break;
+        case EC_left:
+          retval->u.llval =
+            this->pd_v1->ev ()->u.llval << this->pd_v2->ev ()->u.llval;
+          break;
+        case EC_right:
+          retval->u.llval =
+            this->pd_v1->ev ()->u.llval >> this->pd_v2->ev ()->u.llval;
+          break;
+        default:
+          return 0;
+  }
     }
-
+  else
+#endif
   if (ek == EK_ulong)
     {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulong));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong));
+      retval->et = EV_ulong;
+
       switch (this->pd_ec)
-      {
+  {
         case EC_or:
           retval->u.ulval =
             this->pd_v1->ev ()->u.ulval | this->pd_v2->ev ()->u.ulval;
@@ -1933,12 +2083,16 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           return 0;
-      }
+  }
     }
-  else
+  else if (ek == EK_long)
     {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
+      retval->et = EV_long;
+
       switch (this->pd_ec)
-      {
+  {
         case EC_or:
           retval->u.lval =
             this->pd_v1->ev ()->u.lval | this->pd_v2->ev ()->u.lval;
@@ -1961,8 +2115,44 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           return 0;
+  }
+    }
+  else if (ek == EK_bool)
+    {
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_bool));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_bool));
+      retval->et = EV_bool;
+
+      switch (this->pd_ec)
+      {
+        case EC_or:
+          retval->u.bval =
+            this->pd_v1->ev ()->u.bval | this->pd_v2->ev ()->u.bval;
+          break;
+        case EC_xor:
+          retval->u.bval =
+            this->pd_v1->ev ()->u.bval ^ this->pd_v2->ev ()->u.bval;
+          break;
+        case EC_and:
+          retval->u.bval =
+            this->pd_v1->ev ()->u.bval & this->pd_v2->ev ()->u.bval;
+          break;
+        case EC_left:
+          retval->u.bval =
+            this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval;
+          break;
+        case EC_right:
+          retval->u.bval =
+            this->pd_v1->ev ()->u.ulval >> this->pd_v2->ev ()->u.ulval;
+          break;
+        default:
+          return 0;
       }
     }
+  else
+    {
+      return 0;
+    }
 
   return retval;
 }
@@ -2100,7 +2290,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
 
   // Do lookup.
   d = s->lookup_by_name (this->pd_n,
-                         I_TRUE);
+                         true);
 
   if (d == 0)
     {
@@ -2128,7 +2318,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
   return c->constant_value ()->eval_internal (ek);
 }
 
-idl_bool
+bool
 AST_Expression::type_mismatch (AST_Expression::ExprType t)
 {
   if (this->pd_ev != 0)
@@ -2136,8 +2326,8 @@ AST_Expression::type_mismatch (AST_Expression::ExprType t)
       return incompatible_types (this->pd_ev->et, t);
     }
 
-  idl_bool v1_mismatch = 0;
-  idl_bool v2_mismatch = 0;
+  bool v1_mismatch = 0;
+  bool v2_mismatch = 0;
 
   if (this->pd_v1 != 0)
     {
@@ -2348,11 +2538,11 @@ AST_Expression::eval_internal (AST_Expression::EvalKind ek)
     case EC_minus:
     case EC_mul:
     case EC_div:
-       this->pd_ev = this->eval_bin_op ();
+      this->pd_ev = this->eval_bin_op (ek);
       return eval_kind (this->pd_ev,
                         ek);
     case EC_mod:
-      this->pd_ev = this->eval_mod_op ();
+      this->pd_ev = this->eval_mod_op (ek);
       return eval_kind (this->pd_ev,
                         ek);
     case EC_or:
@@ -2501,7 +2691,7 @@ AST_Expression::compare (AST_Expression *vc)
 {
   if (this->pd_ec != vc->ec ())
     {
-      return I_FALSE;
+      return false;
     }
 
   this->evaluate (EK_const);
@@ -2509,68 +2699,68 @@ AST_Expression::compare (AST_Expression *vc)
 
   if (this->pd_ev == 0 || vc->ev () == 0)
     {
-      return I_FALSE;
+      return false;
     }
 
   if (this->pd_ev->et != vc->ev ()->et)
     {
-      return I_FALSE;
+      return false;
     }
 
   switch (this->pd_ev->et)
     {
     case EV_short:
-      return this->pd_ev->u.sval == vc->ev ()->u.sval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.sval == vc->ev ()->u.sval ? true : false;
     case EV_ushort:
-      return this->pd_ev->u.usval == vc->ev ()->u.usval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.usval == vc->ev ()->u.usval ? true : false;
     case EV_long:
-      return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false;
     case EV_ulong:
-      return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? true : false;
     case EV_float:
-      return this->pd_ev->u.fval == vc->ev ()->u.fval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.fval == vc->ev ()->u.fval ? true : false;
     case EV_double:
-      return this->pd_ev->u.dval == vc->ev ()->u.dval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.dval == vc->ev ()->u.dval ? true : false;
     case EV_char:
-      return this->pd_ev->u.cval == vc->ev ()->u.cval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.cval == vc->ev ()->u.cval ? true : false;
     case EV_wchar:
-      return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? true : false;
     case EV_octet:
-      return this->pd_ev->u.oval == vc->ev ()->u.oval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.oval == vc->ev ()->u.oval ? true : false;
     case EV_bool:
-      return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false;
     case EV_string:
       if (this->pd_ev->u.strval == 0)
         {
           if (vc->ev ()->u.strval == 0)
             {
-                    return I_TRUE;
+                    return true;
             }
           else
             {
-                    return I_FALSE;
+                    return false;
             }
         }
       else if (vc->ev ()->u.strval == 0)
         {
-          return I_FALSE;
+          return false;
         }
       else
         {
-          return this->pd_ev->u.strval == vc->ev ()->u.strval ? I_TRUE : I_FALSE;
+          return this->pd_ev->u.strval == vc->ev ()->u.strval ? true : false;
         }
 
     case EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      return this->pd_ev->u.llval == vc->ev ()->u.llval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.llval == vc->ev ()->u.llval ? true : false;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return I_FALSE;
+      return false;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? I_TRUE : I_FALSE;
+      return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? true : false;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return I_FALSE;
+      return false;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case EV_longdouble:
     case EV_wstring:
@@ -2579,10 +2769,10 @@ AST_Expression::compare (AST_Expression *vc)
     case EV_none:
     case EV_any:
     case EV_object:
-      return I_FALSE;
+      return false;
     }
 
-  return I_FALSE;
+  return false;
 }
 
 AST_Decl *
@@ -2658,7 +2848,7 @@ dump_expr_val (ACE_OSTREAM_TYPE &o,
       o << ev->u.oval;
       break;
     case AST_Expression::EV_bool:
-      o << (ev->u.bval == I_TRUE ? "TRUE" : "FALSE");
+      o << (ev->u.bval == true ? "TRUE" : "FALSE");
       break;
     case AST_Expression::EV_string:
       if (ev->u.strval != 0)
diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp
index f78d0a09027..f168d1d7738 100644
--- a/TAO/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO/TAO_IDL/ast/ast_factory.cpp
@@ -83,7 +83,7 @@ ACE_RCSID (ast,
            "$Id$")
 
 AST_Factory::AST_Factory (void)
-  : COMMON_Base (), 
+  : COMMON_Base (),
     AST_Decl (),
     UTL_Scope (),
     pd_exceptions (0),
@@ -234,7 +234,7 @@ AST_Factory::fe_add_argument (AST_Argument *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -254,7 +254,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
       nl_n = nl_i.item ();
 
       d = this->lookup_by_name (nl_n,
-                                I_TRUE);
+                                true);
 
       if (d == 0 || d->node_type() != AST_Decl::NT_except)
         {
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 2d66450d03c..b4f39f33ec5 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -98,8 +98,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_generator.h"
 
-ACE_RCSID (ast, 
-           ast_generator, 
+ACE_RCSID (ast,
+           ast_generator,
            "$Id$")
 
 AST_PredefinedType *
@@ -202,8 +202,8 @@ AST_Generator::create_interface (UTL_ScopedName *n,
                                  long n_inherits,
                                  AST_Interface **inherits_flat,
                                  long n_inherits_flat,
-                                 idl_bool local,
-                                 idl_bool abstract)
+                                 bool local,
+                                 bool abstract)
 {
   AST_Interface *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -221,8 +221,8 @@ AST_Generator::create_interface (UTL_ScopedName *n,
 
 AST_InterfaceFwd *
 AST_Generator::create_interface_fwd (UTL_ScopedName *n,
-                                     idl_bool local,
-                                     idl_bool abstract)
+                                     bool local,
+                                     bool abstract)
 {
   AST_InterfaceFwd *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -249,9 +249,9 @@ AST_Generator::create_valuetype (UTL_ScopedName *n,
                                  AST_Interface **supports,
                                  long n_supports,
                                  AST_Interface *supports_concrete,
-                                 idl_bool abstract,
-                                 idl_bool truncatable,
-                                 idl_bool custom)
+                                 bool abstract,
+                                 bool truncatable,
+                                 bool custom)
 {
   AST_ValueType *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -282,7 +282,7 @@ AST_Generator::create_valuetype (UTL_ScopedName *n,
 
 AST_ValueTypeFwd *
 AST_Generator::create_valuetype_fwd (UTL_ScopedName *n,
-                                     idl_bool abstract)
+                                     bool abstract)
 {
   AST_ValueType *dummy = this->create_valuetype (n,
                                                  0,
@@ -294,8 +294,8 @@ AST_Generator::create_valuetype_fwd (UTL_ScopedName *n,
                                                  0,
                                                  0,
                                                  abstract,
-                                                 I_FALSE,
-                                                 I_FALSE);
+                                                 false,
+                                                 false);
 
   AST_ValueTypeFwd *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -316,9 +316,9 @@ AST_Generator::create_eventtype (UTL_ScopedName *n,
                                  AST_Interface **supports,
                                  long n_supports,
                                  AST_Interface *supports_concrete,
-                                 idl_bool abstract,
-                                 idl_bool truncatable,
-                                 idl_bool custom)
+                                 bool abstract,
+                                 bool truncatable,
+                                 bool custom)
 {
   AST_EventType *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -349,7 +349,7 @@ AST_Generator::create_eventtype (UTL_ScopedName *n,
 
 AST_EventTypeFwd *
 AST_Generator::create_eventtype_fwd (UTL_ScopedName *n,
-                                     idl_bool abstract)
+                                     bool abstract)
 {
   AST_EventType *dummy = this->create_eventtype (n,
                                                  0,
@@ -361,8 +361,8 @@ AST_Generator::create_eventtype_fwd (UTL_ScopedName *n,
                                                  0,
                                                  0,
                                                  abstract,
-                                                 I_FALSE,
-                                                 I_FALSE);
+                                                 false,
+                                                 false);
 
   AST_EventTypeFwd *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -440,8 +440,8 @@ AST_Generator::create_home (UTL_ScopedName *n,
 
 AST_Exception *
 AST_Generator::create_exception (UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract)
+                                 bool local,
+                                 bool abstract)
 {
   AST_Exception *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -455,8 +455,8 @@ AST_Generator::create_exception (UTL_ScopedName *n,
 
 AST_Structure *
 AST_Generator::create_structure (UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract)
+                                 bool local,
+                                 bool abstract)
 {
   AST_Structure *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -485,8 +485,8 @@ AST_Generator::create_structure_fwd (UTL_ScopedName *n)
 
 AST_Enum *
 AST_Generator::create_enum (UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
 {
   AST_Enum *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -502,8 +502,8 @@ AST_Operation *
 AST_Generator::create_operation (AST_Type *rt,
                                  AST_Operation::Flags fl,
                                  UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract)
+                                 bool local,
+                                 bool abstract)
 {
   AST_Operation *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -548,11 +548,11 @@ AST_Generator::create_argument (AST_Argument::Direction d,
 }
 
 AST_Attribute *
-AST_Generator::create_attribute (idl_bool ro,
+AST_Generator::create_attribute (bool ro,
                                  AST_Type *ft,
                                  UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract)
+                                 bool local,
+                                 bool abstract)
 {
   AST_Attribute *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -569,8 +569,8 @@ AST_Generator::create_attribute (idl_bool ro,
 AST_Union *
 AST_Generator::create_union (AST_ConcreteType *dt,
                              UTL_ScopedName *n,
-                             idl_bool local,
-                             idl_bool abstract)
+                             bool local,
+                             bool abstract)
 {
   AST_Union *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -693,13 +693,11 @@ AST_Generator::create_expr (long v)
 }
 
 AST_Expression *
-AST_Generator::create_expr (long v,
-                            AST_Expression::ExprType t)
+AST_Generator::create_expr (bool b)
 {
   AST_Expression *retval = 0;
   ACE_NEW_RETURN (retval,
-                  AST_Expression (v,
-                                  t),
+                  AST_Expression (b),
                   0);
 
   return retval;
@@ -711,7 +709,7 @@ AST_Generator::create_expr (idl_uns_long v,
 {
   AST_Expression *retval = 0;
   ACE_NEW_RETURN (retval,
-                  AST_Expression (v, 
+                  AST_Expression (v,
                                   t),
                   0);
 
@@ -790,8 +788,8 @@ AST_Array *
 AST_Generator::create_array (UTL_ScopedName *n,
                              unsigned long ndims,
                              UTL_ExprList *dims,
-                             idl_bool local,
-                             idl_bool abstract)
+                             bool local,
+                             bool abstract)
 {
   AST_Array *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -809,8 +807,8 @@ AST_Sequence *
 AST_Generator::create_sequence (AST_Expression *ms,
                                 AST_Type *bt,
                                 UTL_ScopedName *n,
-                                idl_bool local,
-                                idl_bool abstract)
+                                bool local,
+                                bool abstract)
 {
   AST_Sequence *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -867,8 +865,8 @@ AST_Generator::create_wstring (AST_Expression *ms)
 AST_Typedef *
 AST_Generator::create_typedef (AST_Type *bt,
                                UTL_ScopedName *n,
-                               idl_bool local,
-                               idl_bool abstract)
+                               bool local,
+                               bool abstract)
 {
   AST_Typedef *retval = 0;
   ACE_NEW_RETURN (retval,
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index 865a6d122d9..1b927cbcbdf 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -10,8 +10,8 @@
 #include "utl_err.h"
 #include "global_extern.h"
 
-ACE_RCSID (ast, 
-           ast_home, 
+ACE_RCSID (ast,
+           ast_home,
            "$Id$")
 
 AST_Home::AST_Home (void)
@@ -34,8 +34,8 @@ AST_Home::AST_Home (UTL_ScopedName *n,
                     long n_supports,
                     AST_Interface **supports_flat,
                     long n_supports_flat)
-  : COMMON_Base (I_FALSE,
-                 I_FALSE),
+  : COMMON_Base (false,
+                 false),
     AST_Decl (AST_Decl::NT_home,
               n),
     AST_Type (AST_Decl::NT_home,
@@ -46,8 +46,8 @@ AST_Home::AST_Home (UTL_ScopedName *n,
                    n_supports,
                    supports_flat,
                    n_supports_flat,
-                   I_FALSE,
-                   I_FALSE),
+                   false,
+                   false),
     pd_base_home (base_home),
     pd_managed_component (managed_component),
     pd_primary_key (primary_key)
@@ -64,22 +64,22 @@ AST_Home::~AST_Home (void)
 
 AST_Decl *
 AST_Home::look_in_inherited (UTL_ScopedName *e,
-                             idl_bool treat_as_ref)
+                             bool treat_as_ref)
 {
   AST_Decl *d = 0;
-  
+
   if (this->pd_base_home != 0)
     {
       d = this->pd_base_home->lookup_by_name (e, treat_as_ref);
     }
-  
+
   return d;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_Home::look_in_supported (UTL_ScopedName *e,
-                             idl_bool treat_as_ref)
+                             bool treat_as_ref)
 {
   AST_Decl *d = 0;
   AST_Interface **is = 0;
@@ -110,7 +110,7 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
           break;
         }
     }
-    
+
   return d;
 }
 
@@ -129,7 +129,7 @@ AST_Home::supports (void) const
   return this->pd_base_home ? this->inherits () + 1 : this->inherits ();
 }
 
-long 
+long
 AST_Home::n_supports (void) const
 {
   return this->n_inherits ();
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 791e335f79e..b6fa8f38f18 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -110,10 +110,10 @@ AST_Interface::AST_Interface (void)
     pd_n_inherits (0),
     pd_inherits_flat (0),
     pd_n_inherits_flat (0),
-    home_equiv_ (I_FALSE)
+    home_equiv_ (false)
 {
   this->size_type (AST_Type::VARIABLE); // Always the case.
-  this->has_constructor (I_TRUE);      // Always the case.
+  this->has_constructor (true);      // Always the case.
 }
 
 AST_Interface::AST_Interface (UTL_ScopedName *n,
@@ -121,8 +121,8 @@ AST_Interface::AST_Interface (UTL_ScopedName *n,
                               long nih,
                               AST_Interface **ih_flat,
                               long nih_flat,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_interface,
@@ -134,10 +134,10 @@ AST_Interface::AST_Interface (UTL_ScopedName *n,
     pd_n_inherits (nih),
     pd_inherits_flat (ih_flat),
     pd_n_inherits_flat (nih_flat),
-    home_equiv_ (I_FALSE)
+    home_equiv_ (false)
 {
   this->size_type (AST_Type::VARIABLE); // always the case
-  this->has_constructor (I_TRUE);      // always the case
+  this->has_constructor (true);      // always the case
 }
 
 AST_Interface::~AST_Interface (void)
@@ -155,10 +155,10 @@ AST_Interface::be_replace_operation (AST_Decl *old_op,
                             new_op);
 }
 
-void
+AST_Operation *
 AST_Interface::be_add_operation (AST_Operation *op)
 {
-  (void) this->fe_add_operation (op);
+  return this->fe_add_operation (op);
 }
 
 // Add an AST_Constant node (a constant declaration) to this scope.
@@ -177,7 +177,7 @@ AST_Interface::fe_add_constant (AST_Constant *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -210,7 +210,7 @@ AST_Interface::fe_add_constant (AST_Constant *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -232,7 +232,7 @@ AST_Interface::fe_add_exception (AST_Exception *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -265,7 +265,7 @@ AST_Interface::fe_add_exception (AST_Exception *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -288,7 +288,7 @@ AST_Interface::fe_add_attribute (AST_Attribute *t)
   /*
    * Already defined and cannot be redefined? Or already used?
    */
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -321,7 +321,7 @@ AST_Interface::fe_add_attribute (AST_Attribute *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -335,7 +335,7 @@ AST_Interface::fe_add_field (AST_Field *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -368,7 +368,7 @@ AST_Interface::fe_add_field (AST_Field *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *ft = t->field_type ();
@@ -377,7 +377,7 @@ AST_Interface::fe_add_field (AST_Field *t)
   if (mru != 0)
     {
       this->add_to_referenced (ft,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
 
@@ -400,7 +400,7 @@ AST_Interface::fe_add_operation (AST_Operation *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -427,7 +427,7 @@ AST_Interface::fe_add_operation (AST_Operation *t)
           return 0;
         }
     }
-  else if ((d = this->look_in_inherited (t->name (), I_FALSE)) != 0)
+  else if ((d = this->look_in_inherited (t->name (), false)) != 0)
     {
       if (d->node_type () == AST_Decl::NT_op)
         {
@@ -444,7 +444,7 @@ AST_Interface::fe_add_operation (AST_Operation *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -457,7 +457,7 @@ AST_Interface::fe_add_structure (AST_Structure *t)
   AST_Decl *predef = 0;
   AST_StructureFwd *fwd = 0;
 
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_struct_fwd)
@@ -523,7 +523,7 @@ AST_Interface::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -537,7 +537,7 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -598,7 +598,7 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   // Must check later that all struct and union forward declarations
@@ -623,7 +623,7 @@ AST_Interface::fe_add_enum (AST_Enum *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -656,7 +656,7 @@ AST_Interface::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -669,7 +669,7 @@ AST_Interface::fe_add_union (AST_Union *t)
   AST_Decl *predef = 0;
   AST_UnionFwd *fwd = 0;
 
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_union_fwd)
@@ -735,7 +735,7 @@ AST_Interface::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -749,7 +749,7 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -810,7 +810,7 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   // Must check later that all struct and union forward declarations
@@ -838,7 +838,7 @@ AST_Interface::fe_add_enum_val (AST_EnumVal *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -871,7 +871,7 @@ AST_Interface::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -893,7 +893,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -926,7 +926,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *bt = t->base_type ();
@@ -936,7 +936,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t)
     {
       this->add_to_referenced (
           bt,
-          I_FALSE,
+          false,
           mru->first_component ()
         );
     }
@@ -960,7 +960,7 @@ AST_Interface::fe_add_native (AST_Native *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -993,7 +993,7 @@ AST_Interface::fe_add_native (AST_Native *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1219,21 +1219,21 @@ AST_Interface::redef_clash_populate_r (AST_Interface *t)
     }
 }
 
-idl_bool
+bool
 AST_Interface::home_equiv (void) const
 {
   return this->home_equiv_;
 }
 
 void
-AST_Interface::home_equiv (idl_bool val)
+AST_Interface::home_equiv (bool val)
 {
   this->home_equiv_ = val;
 }
 
 int
 AST_Interface::insert_non_dup (AST_Interface *t,
-                               idl_bool abstract_paths_only)
+                               bool abstract_paths_only)
 {
   // Now check if the dequeued element has any ancestors. If yes, insert
   // them inside the queue making sure that there are no duplicates.
@@ -1328,7 +1328,7 @@ AST_Interface::redefine (AST_Interface *from)
   this->set_imported (idl_global->imported ());
   this->set_in_main_file (idl_global->in_main_file ());
   this->set_line (idl_global->lineno ());
-  this->set_file_name (idl_global->filename ());
+  this->set_file_name (idl_global->filename ()->get_string ());
   this->ifr_added_ = from->ifr_added_;
   this->ifr_fwd_added_ = from->ifr_fwd_added_;
 }
@@ -1371,7 +1371,7 @@ AST_Interface::get_del_queue (void)
   return this->del_queue;
 }
 
-idl_bool
+bool
 AST_Interface::redef_clash (void)
 {
   this->insert_queue.reset ();
@@ -1454,7 +1454,7 @@ AST_Interface::redef_clash (void)
 
                   Identifier *pid2 = group2_member_item->local_name ();
 
-                  if (pid1->compare (pid2) == I_TRUE)
+                  if (pid1->compare (pid2) == true)
                     {
                       idl_global->err ()->error3 (
                                               UTL_Error::EIDL_REDEF,
@@ -1464,7 +1464,7 @@ AST_Interface::redef_clash (void)
                                             );
                       return 1;
                     }
-                  else if (pid1->case_compare_quiet (pid2) == I_TRUE)
+                  else if (pid1->case_compare_quiet (pid2) == true)
                     {
                       if (idl_global->case_diff_error ())
                         {
@@ -1498,7 +1498,7 @@ AST_Interface::redef_clash (void)
 // Look through inherited interfaces.
 AST_Decl *
 AST_Interface::look_in_inherited (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
+                                  bool treat_as_ref)
 {
   AST_Decl *d = 0;
   AST_Decl *d_before = 0;
@@ -1567,7 +1567,7 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
 
 AST_Decl *
 AST_Interface::lookup_for_add (AST_Decl *d,
-                               idl_bool /* treat_as_ref */)
+                               bool /* treat_as_ref */)
 {
   if (d == 0)
     {
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 9f1dd7028d9..ad57956a211 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -74,8 +74,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-ACE_RCSID( ast, 
-           ast_interface_fwd, 
+ACE_RCSID( ast,
+           ast_interface_fwd,
            "$Id$")
 
 AST_InterfaceFwd::AST_InterfaceFwd (void)
@@ -107,18 +107,18 @@ AST_InterfaceFwd::~AST_InterfaceFwd (void)
 
 // Private operations.
 
-idl_bool
+bool
 AST_InterfaceFwd::is_local (void)
 {
   return this->full_definition ()->is_local ();
 }
 
-idl_bool AST_InterfaceFwd::is_valuetype (void)
+bool AST_InterfaceFwd::is_valuetype (void)
 {
   return this->full_definition ()->node_type () == AST_Decl::NT_valuetype;
 }
 
-idl_bool
+bool
 AST_InterfaceFwd::is_abstract_valuetype (void)
 {
   return (this->full_definition ()->is_abstract ()
@@ -167,7 +167,7 @@ AST_InterfaceFwd::set_full_definition (AST_Interface *nfd)
   this->pd_full_definition = nfd;
 }
 
-idl_bool
+bool
 AST_InterfaceFwd::is_defined (void)
 {
   return this->pd_full_definition->is_defined ();
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index eb7aff2a1bc..f3c43f66947 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -127,7 +127,7 @@ AST_Module::fe_add_predefined_type (AST_PredefinedType *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -160,7 +160,7 @@ AST_Module::fe_add_predefined_type (AST_PredefinedType *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -193,7 +193,7 @@ AST_Module::fe_add_module (AST_Module *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -252,7 +252,7 @@ AST_Module::fe_add_module (AST_Module *t)
 
       // Add it to set of locally referenced symbols.
       this->add_to_referenced (t,
-                               I_FALSE,
+                               false,
                                t->local_name ());
     }
 
@@ -272,7 +272,7 @@ AST_Module::fe_add_interface (AST_Interface *t)
   AST_Interface *fwd = 0;
 
   // Already defined?
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_interface)
@@ -342,7 +342,7 @@ AST_Module::fe_add_interface (AST_Interface *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
   return t;
 }
@@ -355,7 +355,7 @@ AST_Module::fe_add_valuebox (AST_ValueBox *t)
   AST_Decl *predef = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (predef))
         {
@@ -389,7 +389,7 @@ AST_Module::fe_add_valuebox (AST_ValueBox *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
   return t;
 }
@@ -408,7 +408,7 @@ AST_Module::fe_add_valuetype (AST_ValueType *t)
   AST_ValueType *fwd = 0;
 
   // Already defined?
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_valuetype)
@@ -477,7 +477,7 @@ AST_Module::fe_add_valuetype (AST_ValueType *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
   return t;
 }
@@ -495,7 +495,7 @@ AST_Module::fe_add_eventtype (AST_EventType *t)
   AST_EventType *fwd = 0;
 
   // Already defined?
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_eventtype)
@@ -564,7 +564,7 @@ AST_Module::fe_add_eventtype (AST_EventType *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
   return t;
 }
@@ -582,7 +582,7 @@ AST_Module::fe_add_component (AST_Component *t)
   AST_Component *fwd = 0;
 
   // Already defined?
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_component)
@@ -651,7 +651,7 @@ AST_Module::fe_add_component (AST_Component *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
   return t;
 }
@@ -663,7 +663,7 @@ AST_Module::fe_add_home (AST_Home *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -709,7 +709,7 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (i, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (i, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -770,7 +770,7 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (i,
-                           I_FALSE,
+                           false,
                            i->local_name ());
 
   return i;
@@ -784,7 +784,7 @@ AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (v, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (v, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -851,7 +851,7 @@ AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (v,
-                           I_FALSE,
+                           false,
                            v->local_name ());
 
   return v;
@@ -865,7 +865,7 @@ AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (v, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (v, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -932,7 +932,7 @@ AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (v,
-                           I_FALSE,
+                           false,
                            v->local_name ());
 
   return v;
@@ -946,7 +946,7 @@ AST_Module::fe_add_component_fwd (AST_ComponentFwd *c)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (c, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (c, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -1013,7 +1013,7 @@ AST_Module::fe_add_component_fwd (AST_ComponentFwd *c)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (c,
-                           I_FALSE,
+                           false,
                            c->local_name ());
 
   return c;
@@ -1026,7 +1026,7 @@ AST_Module::fe_add_constant (AST_Constant *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1059,7 +1059,7 @@ AST_Module::fe_add_constant (AST_Constant *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1072,7 +1072,7 @@ AST_Module::fe_add_exception (AST_Exception *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1105,7 +1105,7 @@ AST_Module::fe_add_exception (AST_Exception *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1116,7 +1116,7 @@ AST_Union *
 AST_Module::fe_add_union (AST_Union *t)
 {
   AST_UnionFwd *fwd = 0;
-  AST_Decl *predef = this->lookup_for_add (t, I_FALSE);
+  AST_Decl *predef = this->lookup_for_add (t, false);
 
   if (predef != 0)
     {
@@ -1188,7 +1188,7 @@ AST_Module::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1202,7 +1202,7 @@ AST_Module::fe_add_union_fwd (AST_UnionFwd *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -1262,7 +1262,7 @@ AST_Module::fe_add_union_fwd (AST_UnionFwd *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   // Must check later that all struct and union forward declarations
@@ -1278,7 +1278,7 @@ AST_Module::fe_add_structure (AST_Structure *t)
   AST_Decl *predef = 0;
   AST_StructureFwd *fwd = 0;
 
-  if ((predef = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((predef = this->lookup_for_add (t, false)) != 0)
     {
       // Treat fwd declared interfaces specially
       if (predef->node_type () == AST_Decl::NT_struct_fwd)
@@ -1348,7 +1348,7 @@ AST_Module::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1362,7 +1362,7 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       AST_Decl::NodeType nt = d->node_type ();
 
@@ -1422,7 +1422,7 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t)
 
   // Add it to set of locally referenced symbols
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   // Must check later that all struct and union forward declarations
@@ -1438,7 +1438,7 @@ AST_Module::fe_add_enum (AST_Enum *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1471,7 +1471,7 @@ AST_Module::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1487,7 +1487,7 @@ AST_Module::fe_add_enum_val (AST_EnumVal *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add(t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add(t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1520,7 +1520,7 @@ AST_Module::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1533,7 +1533,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add(t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add(t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1566,7 +1566,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *bt = t->base_type ();
@@ -1575,7 +1575,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t)
   if (mru != 0)
     {
       this->add_to_referenced (bt,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
 
@@ -1589,7 +1589,7 @@ AST_Module::fe_add_native (AST_Native *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1622,7 +1622,7 @@ AST_Module::fe_add_native (AST_Native *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1660,7 +1660,7 @@ AST_Module::set_has_nested_valuetype (void)
   this->pd_has_nested_valuetype = 1;
 }
 
-idl_bool
+bool
 AST_Module::has_nested_valuetype (void)
 {
   return this->pd_has_nested_valuetype;
@@ -1676,7 +1676,7 @@ AST_Module::be_add_interface (AST_Interface *i,
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (i,
-                           I_FALSE,
+                           false,
                            i->local_name (),
                            ix);
 
@@ -1684,17 +1684,17 @@ AST_Module::be_add_interface (AST_Interface *i,
 }
 
 // Has this node been referenced here before?
-idl_bool
+bool
 AST_Module::referenced (AST_Decl *e,
                         Identifier *id)
 {
-  idl_bool refd = this->UTL_Scope::referenced (e, id);
-  
+  bool refd = this->UTL_Scope::referenced (e, id);
+
   if (refd)
     {
-      return I_TRUE;
+      return true;
     }
-    
+
   return this->look_in_previous (e->local_name (), true) != 0;
 }
 
@@ -1763,11 +1763,11 @@ AST_Module::look_in_previous (Identifier *e, bool ignore_fwd)
        iter.advance ())
     {
       iter.next (d);
-      
+
       if (ignore_fwd)
         {
           AST_Decl::NodeType nt = (*d)->node_type ();
-          
+
           if (nt == AST_Decl::NT_interface_fwd
               || nt == AST_Decl::NT_eventtype_fwd
               || nt == AST_Decl::NT_component_fwd
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
index c9bf8bd59d2..baf2ff321be 100644
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ b/TAO/TAO_IDL/ast/ast_native.cpp
@@ -3,8 +3,8 @@
 #include "ast_native.h"
 #include "ast_visitor.h"
 
-ACE_RCSID (ast, 
-           ast_native, 
+ACE_RCSID (ast,
+           ast_native,
            "$Id$")
 
 AST_Native::AST_Native (void)
@@ -29,11 +29,11 @@ AST_Native::AST_Native (UTL_ScopedName *n)
     UTL_Scope (AST_Decl::NT_native),
     AST_Structure (AST_Decl::NT_native,
                    n,
-                   I_TRUE,
-                   I_FALSE),
+                   true,
+                   false),
     AST_Exception (n,
-                   I_TRUE,
-                   I_FALSE)
+                   true,
+                   false)
 {
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index 5a98f6298cd..fd4abf11824 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -87,8 +87,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_strlist.h"
 #include "global_extern.h"
 
-ACE_RCSID (ast, 
-           ast_operation, 
+ACE_RCSID (ast,
+           ast_operation,
            "$Id$")
 
 AST_Operation::AST_Operation (void)
@@ -107,8 +107,8 @@ AST_Operation::AST_Operation (void)
 AST_Operation::AST_Operation (AST_Type *rt,
                               Flags fl,
                               UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl(AST_Decl::NT_op,
@@ -332,7 +332,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
   for (UTL_NamelistActiveIterator nl_i (t); !nl_i.is_done (); nl_i.next ())
     {
       nl_n = nl_i.item ();
-      d = this->lookup_by_name (nl_n, I_TRUE);
+      d = this->lookup_by_name (nl_n, true);
 
       if (d == 0)
         {
@@ -429,7 +429,7 @@ AST_Operation::fe_add_argument (AST_Argument *t)
 
   // This error is not caught in y.tab.cpp so we check for it here.
   if (arg_type->node_type () == AST_Decl::NT_array
-      && arg_type->anonymous () == I_TRUE)
+      && arg_type->anonymous () == true)
     {
       idl_global->err ()->syntax_error (idl_global->parse_state ());
     }
@@ -439,7 +439,7 @@ AST_Operation::fe_add_argument (AST_Argument *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   UTL_ScopedName *mru = arg_type->last_referenced_as ();
@@ -447,7 +447,7 @@ AST_Operation::fe_add_argument (AST_Argument *t)
   if (mru != 0)
     {
       this->add_to_referenced (arg_type,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
 
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index ae9fb0a9493..0f45b9b9a34 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -76,9 +76,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_identifier.h"
 #include "global_extern.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ast, 
-           ast_predefined_type, 
+ACE_RCSID (ast,
+           ast_predefined_type,
            "$Id$")
 
 AST_PredefinedType::AST_PredefinedType (void)
@@ -95,7 +96,7 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_pre_defined,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_pre_defined,
               n),
     AST_ConcreteType (AST_Decl::NT_pre_defined,
@@ -209,6 +210,22 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
       new_name->nconc (conc_name);
     }
 
+  // The repo id computation in the AST_Decl constructor can't
+  // be easily modified to work for predefined types.
+  ACE_CString repo_id = ACE_CString ("IDL:omg.org/CORBA/")
+                        + id->get_string ()
+                        + ":"
+                        + this->version ();
+  delete [] this->repoID_;
+  size_t len = repo_id.length ();
+  ACE_NEW (this->repoID_,
+           char[len + 1]);
+  this->repoID_[0] = '\0';
+  ACE_OS::sprintf (this->repoID_,
+                   "%s",
+                   repo_id.c_str ());
+  this->repoID_[len] = '\0';
+
   this->set_name (new_name);
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index d95c3cc6cd4..1603b184a0b 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -84,11 +84,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 
-ACE_RCSID (ast, 
-           ast_recursive, 
+ACE_RCSID (ast,
+           ast_recursive,
            "$Id$")
 
-idl_bool
+bool
 AST_illegal_interface_recursion (AST_Decl *t)
 {
   // Can't be 0 since we know we have an interface or valuetype.
@@ -100,34 +100,34 @@ AST_illegal_interface_recursion (AST_Decl *t)
        i.next ())
     {
       d = ScopeAsDecl (i.item ());
-      
+
       // Exceptions cannot be recursive, but may contain a reference
       // to the interface they are defined in.
       if (d->node_type () == AST_Decl::NT_except)
         {
-          return I_FALSE;
+          return false;
         }
-      
+
       if (d == t)
         {
-          return I_TRUE;
+          return true;
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
-idl_bool
+bool
 AST_illegal_recursive_type (AST_Decl *t)
 {
   if (t == 0)
     {
-      return I_FALSE;
+      return false;
     }
-  
+
   AST_Decl::NodeType nt;
   AST_Type *ut = AST_Type::narrow_from_decl (t);
-  
+
   if (ut != 0)
     {
       ut = ut->unaliased_type ();
@@ -137,7 +137,7 @@ AST_illegal_recursive_type (AST_Decl *t)
     {
       nt = t->node_type ();
     }
-    
+
   if (nt == AST_Decl::NT_interface)
     {
       // Check for interface->struct/union->....->interface nesting.
@@ -146,37 +146,37 @@ AST_illegal_recursive_type (AST_Decl *t)
   else if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union)
     {
       // Structs and unions fall through to the check below.
-      return I_FALSE;	// NOT ILLEGAL.
+      return false;  // NOT ILLEGAL.
     }
 
-  idl_bool check_for_struct = I_FALSE;
-	idl_bool check_for_union = I_FALSE;
-  AST_Structure	*st1 = 0;
-  AST_Union	*un1 = 0;
+  bool check_for_struct = false;
+  bool check_for_union = false;
+  AST_Structure  *st1 = 0;
+  AST_Union  *un1 = 0;
 
   // Narrow the type appropriately so comparison will work.
   if (t->node_type () == AST_Decl::NT_struct)
     {
-      check_for_struct = I_TRUE;
+      check_for_struct = true;
       st1 = AST_Structure::narrow_from_decl (t);
 
       if (st1 == 0)
         {
-          return I_FALSE;	// NOT ILLEGAL.
+          return false;  // NOT ILLEGAL.
         }
     }
   else if (t->node_type () == AST_Decl::NT_union)
     {
-      check_for_union = I_TRUE;
+      check_for_union = true;
       un1 = AST_Union::narrow_from_decl (t);
 
       if (un1 == 0)
         {
-          return I_FALSE;	// NOT ILLEGAL.
+          return false;  // NOT ILLEGAL.
         }
     }
 
-  UTL_Scope	*s = 0;
+  UTL_Scope  *s = 0;
   AST_Structure *st2 = 0;
   AST_Union *un2 = 0;
 
@@ -191,33 +191,33 @@ AST_illegal_recursive_type (AST_Decl *t)
       // a sequence, where recursive types may be used.
       if (s == 0)
         {
-          return I_FALSE;	// NOT ILLEGAL.
+          return false;  // NOT ILLEGAL.
         }
 
       // OK, must check this scope.
       if (s->scope_node_type () == AST_Decl::NT_struct
-          && check_for_struct == I_TRUE)
+          && check_for_struct == true)
         {
           st2 = AST_Structure::narrow_from_scope (s);
 
           if (st2 != 0 && st2 == st1)
             {
-              return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE.
+              return true;  // ILLEGAL RECURSIVE TYPE USE.
             }
         }
       else if (s->scope_node_type () == AST_Decl::NT_union
-               && check_for_union == I_TRUE)
+               && check_for_union == true)
         {
           un2 = AST_Union::narrow_from_scope (s);
 
           if (un2 != 0 && un2 == un1)
             {
-	            return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE.
+              return true;  // ILLEGAL RECURSIVE TYPE USE.
             }
         }
     }
 
   // No more scopes to check. This type was used legally.
-  return I_FALSE;		// NOT ILLEGAL.
+  return false;    // NOT ILLEGAL.
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
index d729fe93466..92043ccba80 100644
--- a/TAO/TAO_IDL/ast/ast_redef.cpp
+++ b/TAO/TAO_IDL/ast/ast_redef.cpp
@@ -66,13 +66,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_decl.h"
 
-ACE_RCSID (ast, 
-           ast_redef, 
+ACE_RCSID (ast,
+           ast_redef,
            "$Id$")
 
 // Return TRUE if the node d represents an IDL construct whose name
 // can be redefined.
-idl_bool
+bool
 can_be_redefined (AST_Decl *d)
 {
   switch (d->node_type ())
@@ -102,7 +102,7 @@ can_be_redefined (AST_Decl *d)
     case AST_Decl::NT_enum:
     case AST_Decl::NT_typedef:
     case AST_Decl::NT_valuebox:
-      return I_TRUE;
+      return true;
 
     case AST_Decl::NT_union_branch:
     case AST_Decl::NT_field:
@@ -111,7 +111,7 @@ can_be_redefined (AST_Decl *d)
     case AST_Decl::NT_pre_defined:
     case AST_Decl::NT_factory:
     default:
-      return I_FALSE;
+      return false;
     }
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index bf57edf78eb..f580f1ab215 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ast, 
-           ast_sequence, 
+ACE_RCSID (ast,
+           ast_sequence,
            "$Id$")
 
 AST_Sequence::AST_Sequence (void)
@@ -99,13 +99,13 @@ AST_Sequence::AST_Sequence (void)
 AST_Sequence::AST_Sequence (AST_Expression *ms,
                             AST_Type *bt,
                             UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (bt->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_sequence,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_sequence,
               n),
     AST_ConcreteType (AST_Decl::NT_sequence,
@@ -117,11 +117,11 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
   // unbounded.
   if (ms->ev ()->u.ulval == 0)
     {
-      this->unbounded_ = I_TRUE;
+      this->unbounded_ = true;
     }
   else
     {
-      this->unbounded_ = I_FALSE;
+      this->unbounded_ = false;
     }
 
   // A sequence data type is always VARIABLE.
@@ -134,7 +134,7 @@ AST_Sequence::~AST_Sequence (void)
 
 // Public operations.
 
-idl_bool
+bool
 AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   // We should calculate this only once. If it has already been
@@ -154,16 +154,16 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                          ACE_TEXT ("bad base type\n")),
                         0);
     }
-    
+
   if (type->node_type () == AST_Decl::NT_typedef)
     {
       AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
       type = td->primitive_base_type ();
       AST_Decl::NodeType nt = type->node_type ();
-      
+
       if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union)
         {
-          return I_FALSE;
+          return false;
         }
     }
 
@@ -180,12 +180,12 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
       ACE_Unbounded_Queue<AST_Type *> scope_list = list;
       scope_list.enqueue_tail (this);
       this->in_recursion_ = type->in_recursion (scope_list);
-      
+
       if (this->in_recursion_ == 1)
         {
           idl_global->recursive_type_seen_ = true;
         }
-      
+
       return this->in_recursion_;
     }
 }
@@ -223,7 +223,7 @@ AST_Sequence::base_type (void) const
   return this->pd_base_type;
 }
 
-idl_bool
+bool
 AST_Sequence::unbounded (void) const
 {
   return this->unbounded_;
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index bb40ae6a7bf..cb24793fa37 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -101,7 +101,7 @@ AST_String::AST_String (AST_Decl::NodeType nt,
   : COMMON_Base (),
     AST_Decl (nt,
 		          n,
-              I_TRUE),
+              true),
     AST_Type (nt,
 		          n),
     AST_ConcreteType (nt,
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index c632a6e89ac..dbcc25a7beb 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -74,11 +74,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_enum.h"
 #include "ast_enum_val.h"
 #include "ast_visitor.h"
+#include "utl_string.h"
 #include "utl_err.h"
 #include "utl_indenter.h"
 
-ACE_RCSID (ast, 
-           ast_structure, 
+ACE_RCSID (ast,
+           ast_structure,
            "$Id$")
 
 AST_Structure::AST_Structure (void)
@@ -93,8 +94,8 @@ AST_Structure::AST_Structure (void)
 }
 
 AST_Structure::AST_Structure (UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_struct,
@@ -111,8 +112,8 @@ AST_Structure::AST_Structure (UTL_ScopedName *n,
 
 AST_Structure::AST_Structure (AST_Decl::NodeType nt,
                               UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (nt,
@@ -132,7 +133,7 @@ AST_Structure::~AST_Structure (void)
 }
 
 // Are we or the parameter node involved in any recursion?
-idl_bool
+bool
 AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   // We should calculate this only once. If it has already been
@@ -147,11 +148,11 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
     {
       ACE_Unbounded_Queue<AST_Type *> scope_list = list;
       scope_list.enqueue_tail (this);
-        
+
       // Initialize an iterator to iterate over our scope.
       // Continue until each element is visited.
-      for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); 
-           !si.is_done (); 
+      for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
+           !si.is_done ();
            si.next ())
         {
           AST_Field *field = AST_Field::narrow_from_decl (si.item ());
@@ -179,7 +180,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
                                  ACE_TEXT ("bad field type\n")),
                                 0);
             }
-            
+
           if (type->in_recursion (scope_list))
             {
               this->in_recursion_ = 1;
@@ -220,7 +221,7 @@ AST_Structure::field (AST_Field **&result,
                             slot);
 }
 
-idl_bool
+bool
 AST_Structure::is_local (void)
 {
   if (this->local_struct_ == -1)
@@ -242,7 +243,7 @@ AST_Structure::is_local (void)
                 {
                   if (si.item ()->is_local ())
                     {
-                      this->local_struct_ = I_TRUE;
+                      this->local_struct_ = true;
                       break;
                     }
                 }
@@ -290,17 +291,17 @@ AST_Structure::legal_for_primary_key (void) const
           si.next ())
         {
           AST_Field *f = AST_Field::narrow_from_decl (si.item ());
-        
+
           if (f != 0 && !f->field_type ()->legal_for_primary_key ())
             {
               retval = false;
               break;
             }
         }
-        
+
       this->recursing_in_legal_pk_ = false;
     }
-    
+
   return retval;
 }
 
@@ -313,7 +314,7 @@ AST_Structure::fe_add_field (AST_Field *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -346,7 +347,7 @@ AST_Structure::fe_add_field (AST_Field *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *ft = t->field_type ();
@@ -355,7 +356,7 @@ AST_Structure::fe_add_field (AST_Field *t)
   if (mru != 0)
     {
       this->add_to_referenced (ft,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
 
@@ -371,7 +372,7 @@ AST_Structure::fe_add_structure (AST_Structure *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -404,7 +405,7 @@ AST_Structure::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -417,7 +418,7 @@ AST_Structure::fe_add_union (AST_Union *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -450,7 +451,7 @@ AST_Structure::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -463,7 +464,7 @@ AST_Structure::fe_add_enum (AST_Enum *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -496,7 +497,7 @@ AST_Structure::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -512,7 +513,7 @@ AST_Structure::fe_add_enum_val (AST_EnumVal *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -545,7 +546,7 @@ AST_Structure::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -692,7 +693,7 @@ AST_Structure::redefine (AST_Structure *from)
   this->set_imported (idl_global->imported ());
   this->set_in_main_file (idl_global->in_main_file ());
   this->set_line (idl_global->lineno ());
-  this->set_file_name (idl_global->filename ());
+  this->set_file_name (idl_global->filename ()->get_string ());
   this->ifr_added_ = from->ifr_added_;
   this->ifr_fwd_added_ = from->ifr_fwd_added_;
   this->fields_ = from->fields_;
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index 60906a704bf..9faabb96eb7 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -10,8 +10,8 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-ACE_RCSID( ast, 
-           ast_structure_fwd, 
+ACE_RCSID( ast,
+           ast_structure_fwd,
            "$Id$")
 
 AST_StructureFwd::AST_StructureFwd (void)
@@ -69,7 +69,7 @@ AST_StructureFwd::set_full_definition (AST_Structure *nfd)
   this->pd_full_definition = nfd;
 }
 
-idl_bool
+bool
 AST_StructureFwd::is_defined (void)
 {
   return (this->pd_full_definition != 0);
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 06115de836d..7719f80bb5c 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -157,14 +157,14 @@ AST_Type::compute_size_type (void)
   return 0;
 }
 
-idl_bool
+bool
 AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> &)
 {
   // By default we are not involved in recursion.
   return 0;
 }
 
-idl_bool
+bool
 AST_Type::is_defined (void)
 {
   // AST_Interface, AST_Structure, and AST_Union will
@@ -172,41 +172,41 @@ AST_Type::is_defined (void)
   return 1;
 }
 
-idl_bool
+bool
 AST_Type::ifr_added (void)
 {
   return this->ifr_added_;
 }
 
 void
-AST_Type::ifr_added (idl_bool val)
+AST_Type::ifr_added (bool val)
 {
   this->ifr_added_ = val;
 }
 
-idl_bool
+bool
 AST_Type::ifr_fwd_added (void)
 {
   return this->ifr_fwd_added_;
 }
 
 void
-AST_Type::ifr_fwd_added (idl_bool val)
+AST_Type::ifr_fwd_added (bool val)
 {
   this->ifr_fwd_added_ = val;
 }
 
-idl_bool
+bool
 AST_Type::has_constructor (void)
 {
   return this->has_constructor_;
 }
 
 void
-AST_Type::has_constructor (idl_bool value)
+AST_Type::has_constructor (bool value)
 {
   // Similarly to be_decl::size_type_, once this
-  // gets set to I_TRUE, we don't want it to
+  // gets set to true, we don't want it to
   // change back.
   if (this->has_constructor_ == 0)
     {
@@ -345,9 +345,7 @@ AST_Type::nested_name (const char* local_name,
       use_next = ACE_OS::strstr (use_curr, "::");
 
       // If the scopes are identical, don't supply them.
-      if  (ACE_OS::strcmp (def_name,
-                         use_name)
-             == 0)
+      if  (ACE_OS::strcmp (def_name, use_name) == 0)
         {
           if (prefix != 0)
             {
@@ -403,11 +401,6 @@ AST_Type::nested_name (const char* local_name,
                            len_to_match)
             == 0)
         {
-          // Initial prefix matches i.e., they have a common root.
-          // Start by initializing the macro.
-          ACE_OS::sprintf (this->nested_type_name_,
-                           "ACE_NESTED_CLASS (");
-
           // Initialize the first argument.
           ACE_OS::strncat (this->nested_type_name_,
                            def_curr,
@@ -481,7 +474,7 @@ AST_Type::nested_name (const char* local_name,
             }
 
           // Start the 2nd argument of the macro.
-          ACE_OS::strcat (this->nested_type_name_, ", ");
+          ACE_OS::strcat (this->nested_type_name_, "::");
 
           // Copy the remaining def_name (if any are left).
           if (def_curr != 0)
@@ -508,9 +501,6 @@ AST_Type::nested_name (const char* local_name,
                               suffix);
             }
 
-          ACE_OS::strcat (this->nested_type_name_,
-                          ")");
-
           return this->nested_type_name_;
         } // End of if the root prefixes match.
     }
@@ -533,7 +523,7 @@ AST_Type::nested_name (const char* local_name,
   return this->nested_type_name_;
 }
 
-idl_bool
+bool
 AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list)
 {
   for (ACE_Unbounded_Queue_Iterator<AST_Type *> iter (list);
@@ -548,11 +538,11 @@ AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list)
       if (!ACE_OS::strcmp (t->full_name (),
                            (*temp)->full_name ()))
         {
-          return I_TRUE;
+          return true;
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
 int
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 25986ef56cc..e96bdcc802c 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -76,8 +76,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ast, 
-           ast_typedef, 
+ACE_RCSID (ast,
+           ast_typedef,
            "$Id$")
 
 AST_Typedef::AST_Typedef (void)
@@ -90,8 +90,8 @@ AST_Typedef::AST_Typedef (void)
 
 AST_Typedef::AST_Typedef (AST_Type *bt,
                           UTL_ScopedName *n,
-                          idl_bool local,
-                          idl_bool abstract)
+                          bool local,
+                          bool abstract)
   : COMMON_Base (bt->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_typedef,
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index d350900e71f..498fa278ac7 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -89,8 +89,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-ACE_RCSID (ast, 
-           ast_union, 
+ACE_RCSID (ast,
+           ast_union,
            "$Id$")
 
 AST_Union::AST_Union (void)
@@ -106,8 +106,8 @@ AST_Union::AST_Union (void)
 
 AST_Union::AST_Union (AST_ConcreteType *dt,
                       UTL_ScopedName *n,
-                      idl_bool local,
-                      idl_bool abstract)
+                      bool local,
+                      bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_union,
@@ -240,7 +240,7 @@ AST_Union::default_index (void)
 }
 
 // Are we or the parameter node involved in any recursion?
-idl_bool
+bool
 AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   // Proceed if the number of members in our scope is greater than 0.
@@ -248,14 +248,14 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
     {
       ACE_Unbounded_Queue<AST_Type *> scope_list = list;
       scope_list.enqueue_tail (this);
-        
+
       // Initialize an iterator to iterate thru our scope.
       // Continue until each element is visited.
       for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
            !si.is_done ();
            si.next ())
         {
-          AST_UnionBranch *field = 
+          AST_UnionBranch *field =
             AST_UnionBranch::narrow_from_decl (si.item ());
 
           if (field == 0)
@@ -418,7 +418,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
   // See if the symbol defines a constant in the discriminator enum.
   UTL_ScopedName *sn = lv->n ();
   d = e->lookup_by_name (sn,
-                         I_TRUE);
+                         true);
 
   if (d == 0 || d->defined_in () != e)
     {
@@ -816,7 +816,7 @@ AST_Union::compute_default_value (void)
                           if (this->default_value_.u.bool_val
                                 == expr->ev ()->u.bval)
                             {
-                              this->default_value_.u.bool_val++;
+                              this->default_value_.u.bool_val ^= true;
                               break_loop = 1;
                             }
 
@@ -939,7 +939,7 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t)
     }
 
   // If branch with same field name exists, complain.
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -980,7 +980,7 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   AST_Type *ft = t->field_type ();
@@ -989,10 +989,10 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t)
   if (mru != 0)
     {
       this->add_to_referenced (ft,
-                               I_FALSE,
+                               false,
                                mru->first_component ());
     }
-    
+
   this->fields_.enqueue_tail (t);
 
   return t;
@@ -1005,7 +1005,7 @@ AST_Union::fe_add_union (AST_Union *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1038,7 +1038,7 @@ AST_Union::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1051,7 +1051,7 @@ AST_Union::fe_add_structure (AST_Structure *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1084,7 +1084,7 @@ AST_Union::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1097,7 +1097,7 @@ AST_Union::fe_add_enum (AST_Enum *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1130,7 +1130,7 @@ AST_Union::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
@@ -1146,7 +1146,7 @@ AST_Union::fe_add_enum_val (AST_EnumVal *t)
   AST_Decl *d = 0;
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -1179,7 +1179,7 @@ AST_Union::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           I_FALSE,
+                           false,
                            t->local_name ());
 
   return t;
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index 7ffda49ed57..ebe7e2a2be1 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -20,7 +20,7 @@ AST_ValueBox::AST_ValueBox (UTL_ScopedName *n,
                             AST_Type       *boxed_type)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_valuebox,
-              n, I_TRUE),
+              n, true),
     AST_Type (AST_Decl::NT_valuebox,
               n),
     AST_ConcreteType (AST_Decl::NT_valuebox, n),
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 966040bc31b..d4ecbddf35b 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -15,8 +15,8 @@
 
 #include "ace/streams.h"
 
-ACE_RCSID (ast, 
-           ast_valuetype, 
+ACE_RCSID (ast,
+           ast_valuetype,
            "$Id$")
 
 AST_ValueType::AST_ValueType (void)
@@ -29,8 +29,8 @@ AST_ValueType::AST_ValueType (void)
     pd_n_supports (0),
     pd_inherits_concrete (0),
     pd_supports_concrete (0),
-    pd_truncatable (I_FALSE),
-    pd_custom (I_FALSE)
+    pd_truncatable (false),
+    pd_custom (false)
 {
 }
 
@@ -43,10 +43,10 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
                               AST_Interface **supports,
                               long n_supports,
                               AST_Interface *supports_concrete,
-                              idl_bool abstract,
-                              idl_bool truncatable,
-                              idl_bool custom)
-  : COMMON_Base (I_FALSE,
+                              bool abstract,
+                              bool truncatable,
+                              bool custom)
+  : COMMON_Base (false,
                  abstract),
     AST_Decl (AST_Decl::NT_valuetype,
               n),
@@ -58,7 +58,7 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
                    n_inherits,
                    inherits_flat,
                    n_inherits_flat,
-                   I_FALSE,
+                   false,
                    abstract),
     pd_supports (supports),
     pd_n_supports (n_supports),
@@ -117,28 +117,28 @@ AST_ValueType::supports_concrete (void) const
   return this->pd_supports_concrete;
 }
 
-idl_bool
+bool
 AST_ValueType::truncatable (void) const
 {
   return this->pd_truncatable;
 }
 
-idl_bool
+bool
 AST_ValueType::custom (void) const
 {
   return this->pd_custom;
 }
 
-idl_bool
+bool
 AST_ValueType::will_have_factory (void)
 {
-  return I_FALSE;
+  return false;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_ValueType::look_in_supported (UTL_ScopedName *e,
-                                  idl_bool treat_as_ref)
+                                  bool treat_as_ref)
 {
   AST_Decl *d = 0;
   AST_Decl *d_before = 0;
@@ -214,10 +214,10 @@ AST_ValueType::legal_for_primary_key (void) const
     {
       return false;
     }
-    
+
   bool has_public_member = false;
   bool retval = true;
-  
+
   if (!this->recursing_in_legal_pk_)
     {
       this->recursing_in_legal_pk_ = true;
@@ -228,14 +228,14 @@ AST_ValueType::legal_for_primary_key (void) const
           i.next ())
         {
           AST_Field *f = AST_Field::narrow_from_decl (i.item ());
-          
+
           // We're not interested in any valuetype decls that aren't fields.
           if (f == 0)
             {
               continue;
             }
-          
-          // Private members are not allowed in primary keys.  
+
+          // Private members are not allowed in primary keys.
           if (f->visibility () == AST_Field::vis_PRIVATE)
             {
               retval = false;
@@ -256,7 +256,7 @@ AST_ValueType::legal_for_primary_key (void) const
               has_public_member = true;
             }
         }
-        
+
         this->recursing_in_legal_pk_ = false;
     }
 
@@ -349,7 +349,7 @@ AST_ValueType::fe_add_factory (AST_Factory *f)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (f, I_FALSE)) != 0)
+  if ((d = this->lookup_for_add (f, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -382,7 +382,7 @@ AST_ValueType::fe_add_factory (AST_Factory *f)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (f,
-                           I_FALSE,
+                           false,
                            f->local_name ());
 
   return f;
@@ -401,20 +401,20 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
     {
       return true;
     }
-    
+
   AST_ValueType *concrete_parent = node->inherits_concrete ();
-  
+
   if (this->derived_from_primary_key_base (concrete_parent, pk_base))
     {
       return true;
     }
-  
+
   AST_Interface **v = node->pd_inherits;
-    
+
   for (long i = 0; i < node->pd_n_inherits; ++i)
     {
       AST_ValueType *tmp = AST_ValueType::narrow_from_decl (v[i]);
-      
+
       if (this->derived_from_primary_key_base (tmp, pk_base))
         {
           return true;
@@ -428,17 +428,17 @@ AST_ValueType *
 AST_ValueType::lookup_primary_key_base (void) const
 {
   AST_ValueType *retval = idl_global->primary_key_base ();
-  
+
   if (retval == 0)
     {
       Identifier local_id ("PrimaryKeyBase");
       UTL_ScopedName local_name (&local_id, 0);
-      
+
       Identifier scope_name ("Components");
       UTL_ScopedName pk_name (&scope_name, &local_name);
       AST_Decl *d =
-        const_cast<AST_ValueType *> (this)->lookup_by_name (&pk_name, I_TRUE);
-      
+        const_cast<AST_ValueType *> (this)->lookup_by_name (&pk_name, true);
+
       local_id.destroy ();
       scope_name.destroy ();
 
@@ -455,7 +455,7 @@ AST_ValueType::lookup_primary_key_base (void) const
           idl_global->err ()->valuetype_expected (d);
           return 0;
         }
-        
+
       idl_global->primary_key_base (retval);
     }
 
diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
index 4ddccedeeee..8f436fbcd21 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -5,8 +5,8 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-ACE_RCSID( ast, 
-           ast_valuetype_fwd, 
+ACE_RCSID( ast,
+           ast_valuetype_fwd,
            "$Id$")
 
 AST_ValueTypeFwd::AST_ValueTypeFwd (void)
@@ -19,7 +19,7 @@ AST_ValueTypeFwd::AST_ValueTypeFwd (void)
 
 AST_ValueTypeFwd::AST_ValueTypeFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
-  : COMMON_Base (I_FALSE,
+  : COMMON_Base (false,
                  dummy->is_abstract ()),
     AST_Decl (AST_Decl::NT_valuetype_fwd,
               n),
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
index 1aafd25caa1..e5cbeadc83a 100644
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ b/TAO/TAO_IDL/be/be_argument.cpp
@@ -58,7 +58,7 @@ be_argument::be_argument (AST_Argument::Direction d,
   // If there have been previous errors, dcl may be 0,
   // and we don't want to crash, so we check for non-zero.
   // Also, we don't want to set the bit if the operation is
-  // declared in an included file UNLESS the enclosing 
+  // declared in an included file UNLESS the enclosing
   // interface is abstract, in which case we regenerate the
   // operation.
   if (dcl != 0
@@ -66,8 +66,9 @@ be_argument::be_argument (AST_Argument::Direction d,
       && (idl_global->in_main_file () || dcl->is_abstract ()))
     {
       be_type *bt = be_type::narrow_from_decl (ft);
-      bt->seen_in_operation (I_TRUE);
+      bt->seen_in_operation (true);
       this->set_arg_seen_bit (bt);
+      idl_global->need_skeleton_includes_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 179208e68c4..3c13a4589b2 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -48,13 +48,13 @@ be_array::be_array (void)
 be_array::be_array (UTL_ScopedName *n,
                     unsigned long ndims,
                     UTL_ExprList *dims,
-                    idl_bool local,
-                    idl_bool abstract)
+                    bool local,
+                    bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_array,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_array,
               n),
     AST_ConcreteType (AST_Decl::NT_array,
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index 2f62f94e7cc..ad9b0daf940 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -47,11 +47,11 @@ be_attribute::be_attribute (void)
   this->set_strategy_ = bods;
 }
 
-be_attribute::be_attribute (idl_bool ro,
+be_attribute::be_attribute (bool ro,
                             AST_Type *ft,
                             UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_attr,
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index fa375c5e5c3..f7d56338d4f 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -30,7 +30,7 @@ ACE_RCSID (be,
            be_codegen,
            "$Id$")
 
-TAO_IDL_BE_Export TAO_CodeGen *tao_cg = 0;
+TAO_CodeGen * tao_cg = 0;
 
 TAO_CodeGen::TAO_CodeGen (void)
   : client_header_ (0),
@@ -68,7 +68,7 @@ TAO_CodeGen::~TAO_CodeGen (void)
   delete this->server_inline_;
   delete this->server_template_inline_;
   delete this->anyop_source_;
-#if !defined (linux) && !defined (__QNX__)
+#if !defined (linux) && !defined (__QNX__) && !defined(__GLIBC__)
   // This causes a seg fault on Linux RH 5.1.  Let it leak . . .
   delete this->gperf_input_stream_;
 #endif /* ! linux */
@@ -106,9 +106,9 @@ TAO_CodeGen::upcase (const char *str)
   // Convert letters in str to upper case.
   for (unsigned int i = 0; i < ACE_OS::strlen (str); ++i)
     {
-      if (isalpha (str [i]))
+      if (isalpha (str[i]))
         {
-          upcase_str[i] = (char) toupper (str[i]);
+          upcase_str[i] = static_cast<char> (toupper (str[i]));
         }
       else
         {
@@ -243,6 +243,11 @@ TAO_CodeGen::start_client_header (const char *fname)
   *this->client_header_ << "#define TAO_EXPORT_MACRO "
                         << be_global->stub_export_macro ();
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->client_header_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -294,6 +299,10 @@ TAO_CodeGen::start_client_stubs (const char *fname)
       *this->client_stubs_ << "\n#endif /* !defined INLINE */";
     }
 
+  // Begin versioned namespace support after all headers have been
+  // included, but before any code is generated.
+  *this->client_stubs_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -327,6 +336,10 @@ TAO_CodeGen::start_client_inline (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->client_inline_);
 
+  // Begin versioned namespace support after initial headers, if any,
+  // have been included.
+  *this->client_inline_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -429,7 +442,7 @@ TAO_CodeGen::start_server_header (const char *fname)
   if (idl_global->non_local_iface_seen_)
     {
       // Include the Messaging files if AMI is enabled.
-      if (be_global->ami_call_back () == I_TRUE)
+      if (be_global->ami_call_back () == true)
         {
           // Include Messaging skeleton file.
           this->gen_standard_include (this->server_header_,
@@ -464,6 +477,11 @@ TAO_CodeGen::start_server_header (const char *fname)
                             << be_global->skel_export_macro ();
     }
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_header_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -517,6 +535,11 @@ TAO_CodeGen::start_server_template_header (const char *fname)
                                      << "\"";
     }
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_template_header_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -590,6 +613,11 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
       *this->server_skeletons_ << "#endif /* !defined INLINE */";
     }
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_skeletons_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -651,6 +679,11 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       << "\"";
   *this->server_template_skeletons_ << "\n#endif /* !defined INLINE */\n\n";
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_template_skeletons_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -684,6 +717,10 @@ TAO_CodeGen::start_server_inline (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_inline_);
 
+  // Begin versioned namespace support after initial headers, if any, have been
+  // included.
+  *this->server_inline_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -719,6 +756,11 @@ TAO_CodeGen::start_server_template_inline (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_inline_);
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_template_inline_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -829,7 +871,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
               ACE_CString final_hdr = "tao/AnyTypeCode/";
-              int pos = work_hdr.rfind ('/');
+              ssize_t pos = work_hdr.rfind ('/');
 
               if (pos != ACE_SString::npos)
                 {
@@ -866,6 +908,11 @@ TAO_CodeGen::start_anyop_header (const char *fname)
     }
   *this->anyop_header_ << "\n";
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->anyop_header_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -906,6 +953,11 @@ TAO_CodeGen::start_anyop_source (const char *fname)
 
   this->gen_typecode_includes (this->anyop_source_);
 
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->anyop_source_ << be_global->versioning_begin ();
+
   return 0;
 }
 
@@ -1022,7 +1074,6 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
   return 0;
 }
 
-
 // Get the implementation header stream.
 TAO_OutStream *
 TAO_CodeGen::implementation_skeleton (void)
@@ -1037,21 +1088,25 @@ TAO_CodeGen::end_client_header (void)
   // Generate the <<= and >>= operators here.
 
   *this->client_header_ << be_nl << be_nl << "// TAO_IDL - Generated from"
-                        << be_nl << "// " << __FILE__ << ":" << __LINE__;
+                        << be_nl << "// " << __FILE__ << ":" <<
+    __LINE__ << be_nl;
+
+  // End versioned namespace support before remaining include
+  // directives at end of file.
+  *this->client_header_ << be_global->versioning_end ();
 
   // Only when we generate a client inline file generate the include
   if (be_global->gen_client_inline ())
     {
       // Insert the code to include the inline file.
-      *this->client_header_ << "\n\n#if defined (__ACE_INLINE__)\n";
+      *this->client_header_ << "#if defined (__ACE_INLINE__)\n";
       *this->client_header_ << "#include \""
                             << be_global->be_get_client_inline_fname (1)
                             << "\"\n";
-      *this->client_header_ << "#endif /* defined INLINE */";
+      *this->client_header_ << "#endif /* defined INLINE */\n\n";
     }
 
   // Code to put the last #endif.
-  *this->client_header_ << "\n\n";
 
   if (be_global->post_include () != 0)
     {
@@ -1065,6 +1120,26 @@ TAO_CodeGen::end_client_header (void)
   return 0;
 }
 
+void
+TAO_CodeGen::end_client_inline (void)
+{
+  *this->client_inline_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->client_inline_ << be_global->versioning_end ();
+}
+
+void
+TAO_CodeGen::end_client_stubs (void)
+{
+  *this->client_stubs_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->client_stubs_ << be_global->versioning_end ();
+}
+
 int
 TAO_CodeGen::end_server_header (void)
 {
@@ -1072,6 +1147,10 @@ TAO_CodeGen::end_server_header (void)
                         << be_nl << "// " << __FILE__ << ":" << __LINE__
                         << be_nl << be_nl;
 
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_header_ << be_global->versioning_end ();
+
   // Insert the template header.
   if (be_global->gen_tie_classes ())
     {
@@ -1105,14 +1184,20 @@ TAO_CodeGen::end_server_header (void)
   return 0;
 }
 
+void
+TAO_CodeGen::end_server_inline (void)
+{
+  *this->server_inline_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_inline_ << be_global->versioning_end ();
+}
+
 int
 TAO_CodeGen::end_implementation_header (const char *fname)
 {
-  static char macro_name [NAMEBUFSIZE];
-
-  ACE_OS::memset (macro_name,
-                  '\0',
-                  NAMEBUFSIZE);
+  char macro_name [NAMEBUFSIZE] = { 0 };
 
   const char *suffix = ACE_OS::strrchr (fname, '.');
 
@@ -1136,7 +1221,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
     {
       if (isalpha (fname [i]))
         {
-          macro_name[i] = (char) toupper (fname [i]);
+          macro_name[i] = static_cast<char> (toupper (fname [i]));
         }
       else if (isdigit (fname [i]))
         {
@@ -1162,10 +1247,14 @@ TAO_CodeGen::end_server_template_header (void)
 {
   *this->server_template_header_ << be_nl << be_nl << "// TAO_IDL - Generated from "
                                  << be_nl << "// "
-                                 << __FILE__ << ":" << __LINE__;
+                                 << __FILE__ << ":" << __LINE__ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_template_header_ << be_global->versioning_end ();
 
   // Insert the code to include the inline file.
-  *this->server_template_header_ << "\n\n#if defined (__ACE_INLINE__)";
+  *this->server_template_header_ << "#if defined (__ACE_INLINE__)";
   *this->server_template_header_
       << "\n#include \""
       << be_global->be_get_server_template_inline_fname (1)
@@ -1207,7 +1296,11 @@ TAO_CodeGen::end_server_template_header (void)
 int
 TAO_CodeGen::end_server_template_inline (void)
 {
-  *this->server_template_inline_ << "\n\n";
+  *this->server_template_inline_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_template_inline_ << be_global->versioning_end ();
 
   return 0;
 }
@@ -1215,6 +1308,10 @@ TAO_CodeGen::end_server_template_inline (void)
 int
 TAO_CodeGen::end_server_template_skeletons (void)
 {
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_template_skeletons_ << be_global->versioning_end ();
+
   // Code to put the last #endif.
   *this->server_template_skeletons_ << "\n#endif /* ifndef */\n";
 
@@ -1224,6 +1321,10 @@ TAO_CodeGen::end_server_template_skeletons (void)
 int
 TAO_CodeGen::end_server_skeletons (void)
 {
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_skeletons_ << be_global->versioning_end ();
+
   // Code to put the last #endif.
   *this->server_skeletons_ << "\n\n#endif /* ifndef */\n";
 
@@ -1233,6 +1334,11 @@ TAO_CodeGen::end_server_skeletons (void)
 int
 TAO_CodeGen::end_anyop_header (void)
 {
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->anyop_header_ << be_global->versioning_end ();
+
+
   if (be_global->post_include () != 0)
     {
       *this->anyop_header_ << "\n\n#include /**/ \""
@@ -1249,6 +1355,10 @@ TAO_CodeGen::end_anyop_header (void)
 int
 TAO_CodeGen::end_anyop_source (void)
 {
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->anyop_source_ << be_global->versioning_end ();
+
   *this->anyop_source_ << "\n";
 
   return 0;
@@ -1262,7 +1372,7 @@ TAO_CodeGen::end_anyop_source (void)
 void
 TAO_CodeGen::gperf_input_stream (TAO_OutStream *os)
 {
-#if !defined (linux) && !defined (__QNX__)
+#if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
   // This causes a seg fault on Linux RH 5.1.  Let it leak . . .
   delete this->gperf_input_stream_;
 #endif /* ! linux */
@@ -1335,11 +1445,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
                                 const char *prefix,
                                 const char *suffix)
 {
-  static char macro_name [NAMEBUFSIZE];
-
-  ACE_OS::memset (macro_name,
-                  '\0',
-                  NAMEBUFSIZE);
+  char macro_name [NAMEBUFSIZE] = { 0 };
 
   const char *extension = ACE_OS::strrchr (fname, '.');
 
@@ -1359,7 +1465,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
     {
       if (isalpha (fname [i]))
         {
-          macro_name[i + offset] = (char) toupper (fname [i]);
+          macro_name[i + offset] = static_cast<char> (toupper (fname [i]));
         }
       else if (isdigit (fname [i]))
         {
@@ -1424,7 +1530,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                                   "tao/Valuetype/AbstractBase.h");
 
       // Turn on generation of the rest of the Valuetype library includes.
-      idl_global->valuetype_seen_ = I_TRUE;
+      idl_global->valuetype_seen_ = true;
     }
 
   if (idl_global->valuebase_seen_)
@@ -1448,7 +1554,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
         }
 
       this->gen_standard_include (this->client_header_,
-                                  "tao/Valuetype/Valuetype_Adapter_Impl.h");
+                                  "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h");
 
       // Check for setting this bit performed in y.tab.cpp, actual checking
       // code is in be_valuetype.cpp.
@@ -1528,8 +1634,14 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
       this->client_header_
     );
 
+  // Generated if (w)string member of struct/union/exception/array/valuetype
+  // has been seen.
+  this->gen_cond_file_include (idl_global->string_member_seen_,
+                               "tao/String_Manager_T.h",
+                               this->client_header_);
+
   // Include the Messaging library entry point, if AMI is enabled.
-  if (be_global->ami_call_back () == I_TRUE)
+  if (be_global->ami_call_back () == true)
     {
       // Include Messaging skeleton file.
       this->gen_standard_include (this->client_header_,
@@ -1537,7 +1649,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     }
 
   // Include the smart proxy base class if smart proxies are enabled.
-  if (be_global->gen_smart_proxies () == I_TRUE)
+  if (be_global->gen_smart_proxies () == true)
     {
       this->gen_standard_include (this->client_header_,
                                   "tao/SmartProxies/Smart_Proxies.h");
@@ -1570,7 +1682,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
               ACE_CString final_hdr = "tao/AnyTypeCode/";
-              int pos = work_hdr.rfind ('/');
+              ssize_t pos = work_hdr.rfind ('/');
 
               if (pos != ACE_SString::npos)
                 {
@@ -1607,6 +1719,10 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 
   // _vars and _outs are typedefs of template class instantiations.
   this->gen_var_file_includes ();
+
+  // Versioned namespace support.
+  this->gen_standard_include (this->client_header_,
+                              "tao/Versioned_Namespace.h");
 }
 
 void
@@ -1665,25 +1781,13 @@ TAO_CodeGen::gen_stub_src_includes (void)
         );
     }
 
-  if (be_global->ami_call_back () == I_TRUE)
+  if (be_global->ami_call_back () == true)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Messaging/Asynch_Invocation_Adapter.h");
 
-      // If a valuetype has been seen, this will already be in the header file.
-      if (!idl_global->valuetype_seen_)
-        {
-          // This may already be in the generated header file.
-          if (!idl_global->valuebase_seen_)
-            {
-              // For AMI exception holders.
-              this->gen_standard_include (this->client_stubs_,
-                                          "tao/Valuetype/ValueBase.h");
-            }
-
-          this->gen_standard_include (this->client_stubs_,
-                                      "tao/Valuetype/Valuetype_Adapter_Impl.h");
-        }
+      this->gen_standard_include (this->client_stubs_,
+                                  "tao/Messaging/ExceptionHolder_i.h");
     }
 
   // If valuefactory_seen_ was set, this was generated in the stub header file,
@@ -1744,7 +1848,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "ace/OS_NS_string.h");
     }
 
-  if (be_global->gen_amh_classes () == I_TRUE)
+  if (be_global->gen_amh_classes () == true)
     {
       // Necessary for the AIX compiler.
       this->gen_standard_include (this->client_stubs_,
@@ -1756,7 +1860,8 @@ void
 TAO_CodeGen::gen_skel_src_includes (void)
 {
   // Only non-local interfaces generate anything in the skeleton.
-  if (!idl_global->non_local_iface_seen_)
+  if (!(idl_global->non_local_iface_seen_
+        || idl_global->need_skeleton_includes_))
     {
       return;
     }
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index 291bd1079fc..a19d6a27eb1 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -23,8 +23,8 @@
 #include "global_extern.h"
 #include "utl_err.h"
 
-ACE_RCSID (be, 
-           be_component, 
+ACE_RCSID (be,
+           be_component,
            "$Id$")
 
 be_component::be_component (void)
@@ -39,7 +39,7 @@ be_component::be_component (void)
     be_interface ()
 {
   this->size_type (AST_Type::VARIABLE);
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 }
 
 be_component::be_component (UTL_ScopedName *n,
@@ -48,8 +48,8 @@ be_component::be_component (UTL_ScopedName *n,
                             long n_supports,
                             AST_Interface **supports_flat,
                             long n_supports_flat)
-  : COMMON_Base (I_FALSE,
-                 I_FALSE),
+  : COMMON_Base (false,
+                 false),
     AST_Decl (AST_Decl::NT_component,
               n),
     AST_Type (AST_Decl::NT_component,
@@ -60,8 +60,8 @@ be_component::be_component (UTL_ScopedName *n,
                    n_supports,
                    supports_flat,
                    n_supports_flat,
-                   I_FALSE,
-                   I_FALSE),
+                   false,
+                   false),
     AST_Component (n,
                    base_component,
                    supports,
@@ -76,11 +76,11 @@ be_component::be_component (UTL_ScopedName *n,
                   n_supports,
                   supports_flat,
                   n_supports_flat,
-                  I_FALSE,
-                  I_FALSE)
+                  false,
+                  false)
 {
   this->size_type (AST_Type::VARIABLE);
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 }
 
 be_component::~be_component (void)
@@ -110,7 +110,7 @@ be_component::accept (be_visitor *visitor)
       idl_global->err ()->ignore_idl3_error (this);
       return -1;
     }
-    
+
   return visitor->visit_component (this);
 }
 
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 75afab4cbcb..a492b119e8d 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -52,49 +52,49 @@ ACE_RCSID (be,
 be_decl::be_decl (void)
   : COMMON_Base (),
     AST_Decl (),
-    cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    impl_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    impl_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    cli_hdr_any_op_gen_ (I_FALSE),
-    cli_stub_any_op_gen_ (I_FALSE),
-    cli_hdr_cdr_op_gen_ (I_FALSE),
-    cli_stub_cdr_op_gen_ (I_FALSE),
-    cli_inline_cdr_op_gen_ (I_FALSE),
-    cli_inline_cdr_decl_gen_ (I_FALSE),
-    cli_hdr_serializer_op_gen_ (I_FALSE),
-    cli_stub_serializer_op_gen_ (I_FALSE),
-    cli_inline_serializer_op_gen_ (I_FALSE),
-    cli_inline_serializer_decl_gen_ (I_FALSE),
-    cli_traits_gen_ (I_FALSE),
-    cli_arg_traits_gen_ (I_FALSE),
-    srv_arg_traits_gen_ (I_FALSE),
-    srv_sarg_traits_gen_ (I_FALSE),
-    cli_tmpl_class_gen_ (I_FALSE),
-    cli_pragma_inst_gen_ (I_FALSE),
-    cli_inarg_tmpl_class_gen_ (I_FALSE),
-    cli_inarg_pragma_inst_gen_ (I_FALSE),
-    cli_inoutarg_tmpl_class_gen_ (I_FALSE),
-    cli_inoutarg_pragma_inst_gen_ (I_FALSE),
-    cli_outarg_tmpl_class_gen_ (I_FALSE),
-    cli_outarg_pragma_inst_gen_ (I_FALSE),
-    cli_retarg_tmpl_class_gen_ (I_FALSE),
-    cli_retarg_pragma_inst_gen_ (I_FALSE),
-    srv_tmpl_class_gen_ (I_FALSE),
-    srv_pragma_inst_gen_ (I_FALSE),
-    srv_inarg_tmpl_class_gen_ (I_FALSE),
-    srv_inarg_pragma_inst_gen_ (I_FALSE),
-    srv_inoutarg_tmpl_class_gen_ (I_FALSE),
-    srv_inoutarg_pragma_inst_gen_ (I_FALSE),
-    srv_outarg_tmpl_class_gen_ (I_FALSE),
-    srv_outarg_pragma_inst_gen_ (I_FALSE),
-    srv_retarg_tmpl_class_gen_ (I_FALSE),
-    srv_retarg_pragma_inst_gen_ (I_FALSE),
-    ccm_pre_proc_gen_ (I_FALSE)
+    cli_hdr_gen_ (false),
+    cli_stub_gen_ (false),
+    cli_inline_gen_ (false),
+    srv_hdr_gen_ (false),
+    impl_hdr_gen_ (false),
+    srv_skel_gen_ (false),
+    impl_skel_gen_ (false),
+    srv_inline_gen_ (false),
+    cli_hdr_any_op_gen_ (false),
+    cli_stub_any_op_gen_ (false),
+    cli_hdr_cdr_op_gen_ (false),
+    cli_stub_cdr_op_gen_ (false),
+    cli_inline_cdr_op_gen_ (false),
+    cli_inline_cdr_decl_gen_ (false),
+    cli_hdr_serializer_op_gen_ (false),
+    cli_stub_serializer_op_gen_ (false),
+    cli_inline_serializer_op_gen_ (false),
+    cli_inline_serializer_decl_gen_ (false),
+    cli_traits_gen_ (false),
+    cli_arg_traits_gen_ (false),
+    srv_arg_traits_gen_ (false),
+    srv_sarg_traits_gen_ (false),
+    cli_tmpl_class_gen_ (false),
+    cli_pragma_inst_gen_ (false),
+    cli_inarg_tmpl_class_gen_ (false),
+    cli_inarg_pragma_inst_gen_ (false),
+    cli_inoutarg_tmpl_class_gen_ (false),
+    cli_inoutarg_pragma_inst_gen_ (false),
+    cli_outarg_tmpl_class_gen_ (false),
+    cli_outarg_pragma_inst_gen_ (false),
+    cli_retarg_tmpl_class_gen_ (false),
+    cli_retarg_pragma_inst_gen_ (false),
+    srv_tmpl_class_gen_ (false),
+    srv_pragma_inst_gen_ (false),
+    srv_inarg_tmpl_class_gen_ (false),
+    srv_inarg_pragma_inst_gen_ (false),
+    srv_inoutarg_tmpl_class_gen_ (false),
+    srv_inoutarg_pragma_inst_gen_ (false),
+    srv_outarg_tmpl_class_gen_ (false),
+    srv_outarg_pragma_inst_gen_ (false),
+    srv_retarg_tmpl_class_gen_ (false),
+    srv_retarg_pragma_inst_gen_ (false),
+    ccm_pre_proc_gen_ (false)
 {
 }
 
@@ -104,49 +104,49 @@ be_decl::be_decl (AST_Decl::NodeType type,
   : COMMON_Base (),
     AST_Decl (type,
               n),
-    cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    impl_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    impl_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    cli_hdr_any_op_gen_ (I_FALSE),
-    cli_stub_any_op_gen_ (I_FALSE),
-    cli_hdr_cdr_op_gen_ (I_FALSE),
-    cli_stub_cdr_op_gen_ (I_FALSE),
-    cli_inline_cdr_op_gen_ (I_FALSE),
-    cli_inline_cdr_decl_gen_ (I_FALSE),
-    cli_hdr_serializer_op_gen_ (I_FALSE),
-    cli_stub_serializer_op_gen_ (I_FALSE),
-    cli_inline_serializer_op_gen_ (I_FALSE),
-    cli_inline_serializer_decl_gen_ (I_FALSE),
-    cli_traits_gen_ (I_FALSE),
-    cli_arg_traits_gen_ (I_FALSE),
-    srv_arg_traits_gen_ (I_FALSE),
-    srv_sarg_traits_gen_ (I_FALSE),
-    cli_tmpl_class_gen_ (I_FALSE),
-    cli_pragma_inst_gen_ (I_FALSE),
-    cli_inarg_tmpl_class_gen_ (I_FALSE),
-    cli_inarg_pragma_inst_gen_ (I_FALSE),
-    cli_inoutarg_tmpl_class_gen_ (I_FALSE),
-    cli_inoutarg_pragma_inst_gen_ (I_FALSE),
-    cli_outarg_tmpl_class_gen_ (I_FALSE),
-    cli_outarg_pragma_inst_gen_ (I_FALSE),
-    cli_retarg_tmpl_class_gen_ (I_FALSE),
-    cli_retarg_pragma_inst_gen_ (I_FALSE),
-    srv_tmpl_class_gen_ (I_FALSE),
-    srv_pragma_inst_gen_ (I_FALSE),
-    srv_inarg_tmpl_class_gen_ (I_FALSE),
-    srv_inarg_pragma_inst_gen_ (I_FALSE),
-    srv_inoutarg_tmpl_class_gen_ (I_FALSE),
-    srv_inoutarg_pragma_inst_gen_ (I_FALSE),
-    srv_outarg_tmpl_class_gen_ (I_FALSE),
-    srv_outarg_pragma_inst_gen_ (I_FALSE),
-    srv_retarg_tmpl_class_gen_ (I_FALSE),
-    srv_retarg_pragma_inst_gen_ (I_FALSE),
-    ccm_pre_proc_gen_ (I_FALSE)
+    cli_hdr_gen_ (false),
+    cli_stub_gen_ (false),
+    cli_inline_gen_ (false),
+    srv_hdr_gen_ (false),
+    impl_hdr_gen_ (false),
+    srv_skel_gen_ (false),
+    impl_skel_gen_ (false),
+    srv_inline_gen_ (false),
+    cli_hdr_any_op_gen_ (false),
+    cli_stub_any_op_gen_ (false),
+    cli_hdr_cdr_op_gen_ (false),
+    cli_stub_cdr_op_gen_ (false),
+    cli_inline_cdr_op_gen_ (false),
+    cli_inline_cdr_decl_gen_ (false),
+    cli_hdr_serializer_op_gen_ (false),
+    cli_stub_serializer_op_gen_ (false),
+    cli_inline_serializer_op_gen_ (false),
+    cli_inline_serializer_decl_gen_ (false),
+    cli_traits_gen_ (false),
+    cli_arg_traits_gen_ (false),
+    srv_arg_traits_gen_ (false),
+    srv_sarg_traits_gen_ (false),
+    cli_tmpl_class_gen_ (false),
+    cli_pragma_inst_gen_ (false),
+    cli_inarg_tmpl_class_gen_ (false),
+    cli_inarg_pragma_inst_gen_ (false),
+    cli_inoutarg_tmpl_class_gen_ (false),
+    cli_inoutarg_pragma_inst_gen_ (false),
+    cli_outarg_tmpl_class_gen_ (false),
+    cli_outarg_pragma_inst_gen_ (false),
+    cli_retarg_tmpl_class_gen_ (false),
+    cli_retarg_pragma_inst_gen_ (false),
+    srv_tmpl_class_gen_ (false),
+    srv_pragma_inst_gen_ (false),
+    srv_inarg_tmpl_class_gen_ (false),
+    srv_inarg_pragma_inst_gen_ (false),
+    srv_inoutarg_tmpl_class_gen_ (false),
+    srv_inoutarg_pragma_inst_gen_ (false),
+    srv_outarg_tmpl_class_gen_ (false),
+    srv_outarg_pragma_inst_gen_ (false),
+    srv_retarg_tmpl_class_gen_ (false),
+    srv_retarg_pragma_inst_gen_ (false),
+    ccm_pre_proc_gen_ (false)
 {
 }
 
@@ -186,7 +186,7 @@ be_decl::compute_full_name  (const char *prefix,
   else
     {
       // Get scope name.
-      be_decl *parent = 
+      be_decl *parent =
         be_scope::narrow_from_scope (this->defined_in ())->decl ();
 
       if (parent == 0)
@@ -288,7 +288,7 @@ be_decl::destroy (void)
 }
 
 void
-be_decl::set_local (idl_bool val)
+be_decl::set_local (bool val)
 {
   this->is_local_ = val;
 }
@@ -343,259 +343,259 @@ be_decl::scope (void)
 }
 
 // Boolean methods to test if code was already generated.
-idl_bool
+bool
 be_decl::cli_hdr_gen (void)
 {
   return this->cli_hdr_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_stub_gen (void)
 {
   return this->cli_stub_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_hdr_any_op_gen (void)
 {
   return this->cli_hdr_any_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_stub_any_op_gen (void)
 {
   return this->cli_stub_any_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_hdr_cdr_op_gen (void)
 {
   return this->cli_hdr_cdr_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_stub_cdr_op_gen (void)
 {
   return this->cli_stub_cdr_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inline_cdr_op_gen (void)
 {
   return this->cli_inline_cdr_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inline_cdr_decl_gen (void)
 {
   return this->cli_inline_cdr_decl_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_hdr_serializer_op_gen (void)
 {
   return this->cli_hdr_serializer_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_stub_serializer_op_gen (void)
 {
   return this->cli_stub_serializer_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inline_serializer_op_gen (void)
 {
   return this->cli_inline_serializer_op_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inline_serializer_decl_gen (void)
 {
   return this->cli_inline_cdr_decl_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_traits_gen (void)
 {
   return this->cli_traits_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_arg_traits_gen (void)
 {
   return this->cli_arg_traits_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_arg_traits_gen (void)
 {
   return this->srv_arg_traits_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_sarg_traits_gen (void)
 {
   return this->srv_sarg_traits_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_tmpl_class_gen (void)
 {
   return this->cli_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_pragma_inst_gen (void)
 {
   return this->cli_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inarg_tmpl_class_gen (void)
 {
   return this->cli_inarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inarg_pragma_inst_gen (void)
 {
   return this->cli_inarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inoutarg_tmpl_class_gen (void)
 {
   return this->cli_inoutarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inoutarg_pragma_inst_gen (void)
 {
   return this->cli_inoutarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_outarg_tmpl_class_gen (void)
 {
   return this->cli_outarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_outarg_pragma_inst_gen (void)
 {
   return this->cli_outarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_retarg_tmpl_class_gen (void)
 {
   return this->cli_retarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_retarg_pragma_inst_gen (void)
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_tmpl_class_gen (void)
 {
   return this->srv_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_pragma_inst_gen (void)
 {
   return this->srv_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_inarg_tmpl_class_gen (void)
 {
   return this->srv_inarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_inarg_pragma_inst_gen (void)
 {
   return this->srv_inarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_inoutarg_tmpl_class_gen (void)
 {
   return this->srv_inoutarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_inoutarg_pragma_inst_gen (void)
 {
   return this->srv_inoutarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_outarg_tmpl_class_gen (void)
 {
   return this->srv_outarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_outarg_pragma_inst_gen (void)
 {
   return this->srv_outarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_retarg_tmpl_class_gen (void)
 {
   return this->srv_retarg_tmpl_class_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_retarg_pragma_inst_gen (void)
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
-idl_bool
+bool
 be_decl::cli_inline_gen (void)
 {
   return this->cli_inline_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_hdr_gen (void)
 {
   return this->srv_hdr_gen_;
 }
 
-idl_bool
+bool
 be_decl::impl_hdr_gen (void)
 {
   return this->impl_hdr_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_skel_gen (void)
 {
   return this->srv_skel_gen_;
 }
 
-idl_bool
+bool
 be_decl::impl_skel_gen (void)
 {
   return this->impl_skel_gen_;
 }
 
-idl_bool
+bool
 be_decl::srv_inline_gen (void)
 {
   return this->srv_inline_gen_;
 }
 
-idl_bool
+bool
 be_decl::ccm_pre_proc_gen (void)
 {
   return this->ccm_pre_proc_gen_;
@@ -603,254 +603,254 @@ be_decl::ccm_pre_proc_gen (void)
 
 // Set the flag indicating that code generation is done.
 void
-be_decl::cli_hdr_gen (idl_bool val)
+be_decl::cli_hdr_gen (bool val)
 {
   this->cli_hdr_gen_ = val;
 }
 
 void
-be_decl::cli_stub_gen (idl_bool val)
+be_decl::cli_stub_gen (bool val)
 {
   this->cli_stub_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_any_op_gen (idl_bool val)
+be_decl::cli_hdr_any_op_gen (bool val)
 {
   this->cli_hdr_any_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_any_op_gen (idl_bool val)
+be_decl::cli_stub_any_op_gen (bool val)
 {
   this->cli_stub_any_op_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_cdr_op_gen (idl_bool val)
+be_decl::cli_hdr_cdr_op_gen (bool val)
 {
   this->cli_hdr_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_cdr_op_gen (idl_bool val)
+be_decl::cli_stub_cdr_op_gen (bool val)
 {
   this->cli_stub_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_cdr_op_gen (idl_bool val)
+be_decl::cli_inline_cdr_op_gen (bool val)
 {
   this->cli_inline_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_cdr_decl_gen (idl_bool val)
+be_decl::cli_inline_cdr_decl_gen (bool val)
 {
   this->cli_inline_cdr_decl_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_serializer_op_gen (idl_bool val)
+be_decl::cli_hdr_serializer_op_gen (bool val)
 {
   this->cli_hdr_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_serializer_op_gen (idl_bool val)
+be_decl::cli_stub_serializer_op_gen (bool val)
 {
   this->cli_stub_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_serializer_op_gen (idl_bool val)
+be_decl::cli_inline_serializer_op_gen (bool val)
 {
   this->cli_inline_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_serializer_decl_gen (idl_bool val)
+be_decl::cli_inline_serializer_decl_gen (bool val)
 {
   this->cli_inline_serializer_decl_gen_ = val;
 }
 
 void
-be_decl::cli_inline_gen (idl_bool val)
+be_decl::cli_inline_gen (bool val)
 {
   this->cli_inline_gen_ = val;
 }
 
 void
-be_decl::cli_traits_gen (idl_bool val)
+be_decl::cli_traits_gen (bool val)
 {
   this->cli_traits_gen_ = val;
 }
 
 void
-be_decl::cli_arg_traits_gen (idl_bool val)
+be_decl::cli_arg_traits_gen (bool val)
 {
   this->cli_arg_traits_gen_ = val;
 }
 
 void
-be_decl::srv_arg_traits_gen (idl_bool val)
+be_decl::srv_arg_traits_gen (bool val)
 {
   this->srv_arg_traits_gen_ = val;
 }
 
 void
-be_decl::srv_sarg_traits_gen (idl_bool val)
+be_decl::srv_sarg_traits_gen (bool val)
 {
   this->srv_sarg_traits_gen_ = val;
 }
 
 void
-be_decl::cli_tmpl_class_gen (idl_bool val)
+be_decl::cli_tmpl_class_gen (bool val)
 {
   this->cli_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_pragma_inst_gen (idl_bool val)
+be_decl::cli_pragma_inst_gen (bool val)
 {
   this->cli_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_inarg_tmpl_class_gen (idl_bool val)
+be_decl::cli_inarg_tmpl_class_gen (bool val)
 {
   this->cli_inarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_inarg_pragma_inst_gen (idl_bool val)
+be_decl::cli_inarg_pragma_inst_gen (bool val)
 {
   this->cli_inarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_inoutarg_tmpl_class_gen (idl_bool val)
+be_decl::cli_inoutarg_tmpl_class_gen (bool val)
 {
   this->cli_inoutarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_inoutarg_pragma_inst_gen (idl_bool val)
+be_decl::cli_inoutarg_pragma_inst_gen (bool val)
 {
   this->cli_inoutarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_outarg_tmpl_class_gen (idl_bool val)
+be_decl::cli_outarg_tmpl_class_gen (bool val)
 {
   this->cli_outarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_outarg_pragma_inst_gen (idl_bool val)
+be_decl::cli_outarg_pragma_inst_gen (bool val)
 {
   this->cli_outarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_retarg_tmpl_class_gen (idl_bool val)
+be_decl::cli_retarg_tmpl_class_gen (bool val)
 {
   this->cli_retarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_retarg_pragma_inst_gen (idl_bool val)
+be_decl::cli_retarg_pragma_inst_gen (bool val)
 {
   this->cli_retarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_tmpl_class_gen (idl_bool val)
+be_decl::srv_tmpl_class_gen (bool val)
 {
   this->srv_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_pragma_inst_gen (idl_bool val)
+be_decl::srv_pragma_inst_gen (bool val)
 {
   this->srv_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_inarg_tmpl_class_gen (idl_bool val)
+be_decl::srv_inarg_tmpl_class_gen (bool val)
 {
   this->srv_inarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_inarg_pragma_inst_gen (idl_bool val)
+be_decl::srv_inarg_pragma_inst_gen (bool val)
 {
   this->srv_inarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_inoutarg_tmpl_class_gen (idl_bool val)
+be_decl::srv_inoutarg_tmpl_class_gen (bool val)
 {
   this->srv_inoutarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_inoutarg_pragma_inst_gen (idl_bool val)
+be_decl::srv_inoutarg_pragma_inst_gen (bool val)
 {
   this->srv_inoutarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_outarg_tmpl_class_gen (idl_bool val)
+be_decl::srv_outarg_tmpl_class_gen (bool val)
 {
   this->srv_outarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_outarg_pragma_inst_gen (idl_bool val)
+be_decl::srv_outarg_pragma_inst_gen (bool val)
 {
   this->srv_outarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_retarg_tmpl_class_gen (idl_bool val)
+be_decl::srv_retarg_tmpl_class_gen (bool val)
 {
   this->srv_retarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_retarg_pragma_inst_gen (idl_bool val)
+be_decl::srv_retarg_pragma_inst_gen (bool val)
 {
   this->srv_retarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_hdr_gen (idl_bool val)
+be_decl::srv_hdr_gen (bool val)
 {
   this->srv_hdr_gen_ = val;
 }
 
 void
-be_decl::impl_hdr_gen (idl_bool val)
+be_decl::impl_hdr_gen (bool val)
 {
   this->impl_hdr_gen_ = val;
 }
 
 
 void
-be_decl::srv_skel_gen (idl_bool val)
+be_decl::srv_skel_gen (bool val)
 {
   this->srv_skel_gen_ = val;
 }
 
 void
-be_decl::srv_inline_gen (idl_bool val)
+be_decl::srv_inline_gen (bool val)
 {
   this->srv_inline_gen_ = val;
 }
 
 void
-be_decl::ccm_pre_proc_gen (idl_bool val)
+be_decl::ccm_pre_proc_gen (bool val)
 {
   this->ccm_pre_proc_gen_ = val;
 }
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 8890a95eff9..35256b01780 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -24,8 +24,8 @@
 
 #include "global_extern.h"
 
-ACE_RCSID (be, 
-           be_enum, 
+ACE_RCSID (be,
+           be_enum,
            "$Id$")
 
 be_enum::be_enum (void)
@@ -42,8 +42,8 @@ be_enum::be_enum (void)
 }
 
 be_enum::be_enum (UTL_ScopedName *n,
-                  idl_bool local,
-                  idl_bool abstract)
+                  bool local,
+                  bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_enum,
diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp
index 6f770a3158d..75c484d39c3 100644
--- a/TAO/TAO_IDL/be/be_eventtype.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype.cpp
@@ -51,9 +51,9 @@ be_eventtype::be_eventtype (UTL_ScopedName *n,
                             AST_Interface **supports,
                             long n_supports,
                             AST_Interface *supports_concrete,
-                            idl_bool abstract,
-                            idl_bool truncatable,
-                            idl_bool custom)
+                            bool abstract,
+                            bool truncatable,
+                            bool custom)
   : COMMON_Base (0,
                  abstract),
     AST_Decl (AST_Decl::NT_eventtype,
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index ffc5e2b1129..9982658aa41 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -25,8 +25,8 @@
 
 #include "global_extern.h"
 
-ACE_RCSID (be, 
-           be_exception, 
+ACE_RCSID (be,
+           be_exception,
            "$Id$")
 
 be_exception::be_exception (void)
@@ -45,8 +45,8 @@ be_exception::be_exception (void)
 }
 
 be_exception::be_exception (UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_except,
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
index 3c940b81abd..40da1b84eea 100644
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ b/TAO/TAO_IDL/be/be_expression.cpp
@@ -22,8 +22,8 @@
 #include "be_expression.h"
 #include "be_visitor.h"
 
-ACE_RCSID (be, 
-           be_expression, 
+ACE_RCSID (be,
+           be_expression,
            "$Id$")
 
 be_expression::be_expression (UTL_ScopedName *n)
@@ -51,16 +51,14 @@ be_expression::be_expression (long l)
 {
 }
 
-be_expression::be_expression (long l,
-                              AST_Expression::ExprType t)
-  : AST_Expression (l,
-                    t)
+be_expression::be_expression (bool b)
+  : AST_Expression (b)
 {
 }
 
 be_expression::be_expression (idl_uns_long l,
                               AST_Expression::ExprType t)
-  : AST_Expression (l, 
+  : AST_Expression (l,
                     t)
 {
 }
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index 8e638ba6acc..567c8799ab2 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -22,6 +22,7 @@
 #include "be_field.h"
 #include "be_visitor.h"
 #include "be_type.h"
+#include "global_extern.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (be, 
@@ -49,6 +50,14 @@ be_field::be_field (AST_Type *ft,
     be_decl (AST_Decl::NT_field,
              n)
 {
+  // This covers valuetype fields as well, which is what we want.
+  AST_Decl::NodeType nt =
+    ft->unaliased_type ()->node_type ();
+    
+  if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
+    {
+      idl_global->string_member_seen_ = true;
+    }
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index a0f32ba09d1..da42383c03c 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -206,8 +206,8 @@ be_generator::create_interface (UTL_ScopedName *n,
                                 long nih,
                                 AST_Interface **ih_flat,
                                 long nih_flat,
-                                idl_bool l,
-                                idl_bool a)
+                                bool l,
+                                bool a)
 {
   be_interface *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -225,11 +225,11 @@ be_generator::create_interface (UTL_ScopedName *n,
 
 AST_InterfaceFwd *
 be_generator::create_interface_fwd (UTL_ScopedName *n,
-                                    idl_bool local,
-                                    idl_bool abstract)
+                                    bool local,
+                                    bool abstract)
 {
   AST_Decl *d =
-    idl_global->scopes ().top_non_null ()->lookup_by_name (n, I_TRUE);
+    idl_global->scopes ().top_non_null ()->lookup_by_name (n, true);
 
   AST_Interface *dummy = this->create_interface (n,
                                                  0,
@@ -276,9 +276,9 @@ be_generator::create_valuetype (UTL_ScopedName *n,
                                 AST_Interface **supports,
                                 long n_supports,
                                 AST_Interface *supports_concrete,
-                                idl_bool abstract,
-                                idl_bool truncatable,
-                                idl_bool custom)
+                                bool abstract,
+                                bool truncatable,
+                                bool custom)
 {
   be_valuetype *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -301,7 +301,7 @@ be_generator::create_valuetype (UTL_ScopedName *n,
 
 AST_ValueTypeFwd *
 be_generator::create_valuetype_fwd (UTL_ScopedName *n,
-                                    idl_bool abstract)
+                                    bool abstract)
 {
   AST_ValueType *dummy = this->create_valuetype (n,
                                                  0,
@@ -335,9 +335,9 @@ be_generator::create_eventtype (UTL_ScopedName *n,
                                 AST_Interface **supports,
                                 long n_supports,
                                 AST_Interface *supports_concrete,
-                                idl_bool abstract,
-                                idl_bool truncatable,
-                                idl_bool custom)
+                                bool abstract,
+                                bool truncatable,
+                                bool custom)
 {
   be_eventtype *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -360,7 +360,7 @@ be_generator::create_eventtype (UTL_ScopedName *n,
 
 AST_EventTypeFwd *
 be_generator::create_eventtype_fwd (UTL_ScopedName *n,
-                                    idl_bool abstract)
+                                    bool abstract)
 {
   AST_EventType *dummy = this->create_eventtype (n,
                                                  0,
@@ -451,8 +451,8 @@ be_generator::create_home (UTL_ScopedName *n,
 
 AST_Exception *
 be_generator::create_exception (UTL_ScopedName *n,
-                                idl_bool local,
-                                idl_bool abstract)
+                                bool local,
+                                bool abstract)
 {
   be_exception *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -466,8 +466,8 @@ be_generator::create_exception (UTL_ScopedName *n,
 
 AST_Structure *
 be_generator::create_structure (UTL_ScopedName *n,
-                                idl_bool local,
-                                idl_bool abstract)
+                                bool local,
+                                bool abstract)
 {
   be_structure *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -497,8 +497,8 @@ be_generator::create_structure_fwd (UTL_ScopedName *n)
 
 AST_Enum *
 be_generator::create_enum (UTL_ScopedName *n,
-                           idl_bool local,
-                           idl_bool abstract)
+                           bool local,
+                           bool abstract)
 {
   be_enum *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -514,8 +514,8 @@ AST_Operation *
 be_generator::create_operation (AST_Type *rt,
                                 AST_Operation::Flags fl,
                                 UTL_ScopedName *n,
-                                idl_bool local,
-                                idl_bool abstract)
+                                bool local,
+                                bool abstract)
 {
   be_operation *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -560,11 +560,11 @@ be_generator::create_argument (AST_Argument::Direction d,
 }
 
 AST_Attribute *
-be_generator::create_attribute (idl_bool ro,
+be_generator::create_attribute (bool ro,
                                 AST_Type *ft,
                                 UTL_ScopedName *n,
-                                idl_bool local,
-                                idl_bool abstract)
+                                bool local,
+                                bool abstract)
 {
   be_attribute *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -581,8 +581,8 @@ be_generator::create_attribute (idl_bool ro,
 AST_Union *
 be_generator::create_union (AST_ConcreteType *dt,
                             UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
 {
   be_union *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -705,13 +705,11 @@ be_generator::create_expr (long l)
 }
 
 AST_Expression *
-be_generator::create_expr (long l,
-                           AST_Expression::ExprType t)
+be_generator::create_expr (bool b)
 {
   be_expression *retval = 0;
   ACE_NEW_RETURN (retval,
-                  be_expression (l,
-                                 t),
+                  be_expression (b),
                   0);
 
   return retval;
@@ -802,8 +800,8 @@ AST_Array *
 be_generator::create_array (UTL_ScopedName *n,
                             unsigned long ndims,
                             UTL_ExprList *dims,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
 {
   be_array *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -821,8 +819,8 @@ AST_Sequence *
 be_generator::create_sequence (AST_Expression *v,
                                AST_Type *bt,
                                UTL_ScopedName *n,
-                               idl_bool local,
-                               idl_bool abstract)
+                               bool local,
+                               bool abstract)
 {
   be_sequence *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -880,8 +878,8 @@ be_generator::create_wstring (AST_Expression *v)
 AST_Typedef *
 be_generator::create_typedef (AST_Type *bt,
                               UTL_ScopedName *n,
-                              idl_bool local,
-                              idl_bool abstract)
+                              bool local,
+                              bool abstract)
 {
   be_typedef *retval = 0;
   ACE_NEW_RETURN (retval,
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 0bfa528a933..0385f93b7fc 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -45,6 +45,10 @@ BE_GlobalData::BE_GlobalData (void)
     pch_include_ (0),
     pre_include_ (0),
     post_include_ (0),
+    core_versioning_begin_ ("\nTAO_BEGIN_VERSIONED_NAMESPACE_DECL\n"),
+    core_versioning_end_   ("\nTAO_END_VERSIONED_NAMESPACE_DECL\n"),
+    versioning_begin_ (),
+    versioning_end_ (),
     client_hdr_ending_ (ACE::strnew ("C.h")),
     client_stub_ending_ (ACE::strnew ("C.cpp")),
     client_inline_ending_ (ACE::strnew ("C.inl")),
@@ -62,35 +66,36 @@ BE_GlobalData::BE_GlobalData (void)
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
     anyop_output_dir_ (0),
-    any_support_ (I_TRUE),
-    tc_support_ (I_TRUE),
+    any_support_ (true),
+    tc_support_ (true),
     obv_opt_accessor_ (0),
-    gen_impl_files_ (I_FALSE),
-    gen_impl_debug_info_ (I_FALSE),
-    gen_copy_ctor_ (I_FALSE),
-    gen_assign_op_ (I_FALSE),
-    gen_thru_poa_collocation_ (I_TRUE), // Default is thru_poa.
-    gen_direct_collocation_ (I_FALSE),
+    gen_impl_files_ (false),
+    gen_impl_debug_info_ (false),
+    gen_copy_ctor_ (false),
+    gen_assign_op_ (false),
+    gen_thru_poa_collocation_ (true), // Default is thru_poa.
+    gen_direct_collocation_ (false),
 #ifdef ACE_HAS_EXCEPTIONS
-    exception_support_ (I_TRUE),
+    exception_support_ (true),
 #else
-    exception_support_ (I_FALSE),
+    exception_support_ (false),
 #endif /* ACE_HAS_EXCEPTIONS */
-    use_raw_throw_ (I_FALSE),
-    opt_tc_ (I_FALSE),
-    ami_call_back_ (I_FALSE),
-    gen_amh_classes_ (I_FALSE),
-    gen_tie_classes_ (I_TRUE),
-    gen_smart_proxies_ (I_FALSE),
-    gen_inline_constants_ (I_TRUE),
-    gen_dcps_type_support_ (I_FALSE),
+    use_raw_throw_ (false),
+    opt_tc_ (false),
+    ami_call_back_ (false),
+    gen_amh_classes_ (false),
+    gen_tie_classes_ (true),
+    gen_smart_proxies_ (false),
+    gen_inline_constants_ (true),
+    gen_dcps_type_support_ (false),
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
     ccmobject_ (0),
-    gen_anyop_files_ (I_FALSE),
-    gen_skel_files_ (I_TRUE),
-    gen_client_inline_ (I_TRUE),
-    gen_server_inline_ (I_TRUE)
+    exceptionholder_ (0),
+    gen_anyop_files_ (false),
+    gen_skel_files_ (true),
+    gen_client_inline_ (true),
+    gen_server_inline_ (true)
 {
 }
 
@@ -218,8 +223,15 @@ const char *
 BE_GlobalData::be_get_client_hdr (UTL_String *idl_file_name,
                                   int base_name_only)
 {
+  // User-defined file extensions don't apply to .pidl files.
+  ACE_CString fn (idl_file_name->get_string ());
+  ACE_CString fn_ext = fn.substr (fn.length () - 5);
+  bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL");
+
   return be_change_idl_file_extension (idl_file_name,
-                                       be_global->client_hdr_ending (),
+                                       orb_file
+                                         ? "C.h"
+                                         : be_global->client_hdr_ending (),
                                        base_name_only);
 }
 
@@ -243,8 +255,15 @@ const char *
 BE_GlobalData::be_get_server_hdr (UTL_String *idl_file_name,
                                   int base_name_only)
 {
+  // User-defined file extensions don't apply to .pidl files.
+  ACE_CString fn (idl_file_name->get_string ());
+  ACE_CString fn_ext = fn.substr (fn.length () - 5);
+  bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL");
+
   return be_change_idl_file_extension (idl_file_name,
-                                       be_global->server_hdr_ending (),
+                                       orb_file
+                                         ? "S.h"
+                                         : be_global->server_hdr_ending (),
                                        base_name_only);
 }
 
@@ -547,6 +566,54 @@ BE_GlobalData::post_include (const char *s)
   this->post_include_ = ACE_OS::strdup (s);
 }
 
+void
+BE_GlobalData::versioning_begin (const char * s)
+{
+  this->versioning_begin_ =
+    ACE_CString ("\n\n")
+    + ACE_CString (s)
+    + ACE_CString ("\n\n");
+
+  this->core_versioning_end_ += this->versioning_begin_;  // Yes, "begin".
+}
+
+const char *
+BE_GlobalData::versioning_begin (void) const
+{
+  return this->versioning_begin_.c_str ();
+}
+
+const char *
+BE_GlobalData::core_versioning_begin (void) const
+{
+  return this->core_versioning_begin_.c_str ();
+}
+
+void
+BE_GlobalData::versioning_end (const char * s)
+{
+  this->versioning_end_ =
+    ACE_CString ("\n\n")
+    + ACE_CString (s)
+    + ACE_CString ("\n\n");
+
+  this->core_versioning_begin_ =
+    this->versioning_end_  // Yes, "end".
+    + this->core_versioning_begin_;  // Initialized in constructor.
+}
+
+const char *
+BE_GlobalData::versioning_end (void) const
+{
+  return this->versioning_end_.c_str ();
+}
+
+const char *
+BE_GlobalData::core_versioning_end (void) const
+{
+  return this->core_versioning_end_.c_str ();
+}
+
 // Set the client_hdr_ending.
 void
 BE_GlobalData::client_hdr_ending (const char* s)
@@ -772,215 +839,215 @@ BE_GlobalData::anyop_output_dir (void) const
 }
 
 void
-BE_GlobalData::any_support (idl_bool val)
+BE_GlobalData::any_support (bool val)
 {
   this->any_support_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::any_support (void) const
 {
   return this->any_support_;
 }
 
 void
-BE_GlobalData::tc_support (idl_bool val)
+BE_GlobalData::tc_support (bool val)
 {
   this->tc_support_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::tc_support (void) const
 {
   return this->tc_support_;
 }
 
 void
-BE_GlobalData::obv_opt_accessor (idl_bool val)
+BE_GlobalData::obv_opt_accessor (bool val)
 {
   this->obv_opt_accessor_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::obv_opt_accessor (void) const
 {
   return this->obv_opt_accessor_;
 }
 
 void
-BE_GlobalData::gen_impl_files (idl_bool val)
+BE_GlobalData::gen_impl_files (bool val)
 {
   this->gen_impl_files_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_impl_files (void) const
 {
   return this->gen_impl_files_;
 }
 
 void
-BE_GlobalData::gen_impl_debug_info (idl_bool val)
+BE_GlobalData::gen_impl_debug_info (bool val)
 {
   this->gen_impl_debug_info_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_impl_debug_info (void) const
 {
   return this->gen_impl_debug_info_;
 }
 
 void
-BE_GlobalData::gen_copy_ctor (idl_bool val)
+BE_GlobalData::gen_copy_ctor (bool val)
 {
   this->gen_copy_ctor_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_copy_ctor (void) const
 {
   return this->gen_copy_ctor_;
 }
 
 void
-BE_GlobalData::gen_assign_op (idl_bool val)
+BE_GlobalData::gen_assign_op (bool val)
 {
   this->gen_assign_op_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_assign_op (void) const
 {
   return this->gen_assign_op_;
 }
 
 void
-BE_GlobalData::gen_thru_poa_collocation (idl_bool val)
+BE_GlobalData::gen_thru_poa_collocation (bool val)
 {
   this->gen_thru_poa_collocation_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_thru_poa_collocation (void) const
 {
   return this->gen_thru_poa_collocation_;
 }
 
 void
-BE_GlobalData::gen_direct_collocation (idl_bool val)
+BE_GlobalData::gen_direct_collocation (bool val)
 {
   this->gen_direct_collocation_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_direct_collocation (void) const
 {
   return this->gen_direct_collocation_;
 }
 
 void
-BE_GlobalData::exception_support (idl_bool val)
+BE_GlobalData::exception_support (bool val)
 {
   this->exception_support_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::exception_support (void) const
 {
   return this->exception_support_;
 }
 
 void
-BE_GlobalData::use_raw_throw (idl_bool val)
+BE_GlobalData::use_raw_throw (bool val)
 {
   this->use_raw_throw_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::use_raw_throw (void) const
 {
   return this->use_raw_throw_;
 }
 
 void
-BE_GlobalData::opt_tc (idl_bool val)
+BE_GlobalData::opt_tc (bool val)
 {
   this->opt_tc_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::opt_tc (void) const
 {
   return this->opt_tc_;
 }
 
 void
-BE_GlobalData::ami_call_back (idl_bool val)
+BE_GlobalData::ami_call_back (bool val)
 {
   this->ami_call_back_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::ami_call_back (void) const
 {
   return this->ami_call_back_;
 }
 
 void
-BE_GlobalData::gen_amh_classes (idl_bool val)
+BE_GlobalData::gen_amh_classes (bool val)
 {
   this->gen_amh_classes_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_amh_classes (void) const
 {
   return this->gen_amh_classes_;
 }
 
 void
-BE_GlobalData::gen_tie_classes (idl_bool val)
+BE_GlobalData::gen_tie_classes (bool val)
 {
   this->gen_tie_classes_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_tie_classes (void) const
 {
   return this->gen_tie_classes_;
 }
 
 void
-BE_GlobalData::gen_smart_proxies (idl_bool val)
+BE_GlobalData::gen_smart_proxies (bool val)
 {
   this->gen_smart_proxies_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_smart_proxies (void) const
 {
   return this->gen_smart_proxies_;
 }
 
 void
-BE_GlobalData::gen_inline_constants (idl_bool val)
+BE_GlobalData::gen_inline_constants (bool val)
 {
   this->gen_inline_constants_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_inline_constants (void) const
 {
   return this->gen_inline_constants_;
 }
 void
-BE_GlobalData::gen_dcps_type_support (idl_bool val)
+BE_GlobalData::gen_dcps_type_support (bool val)
 {
   this->gen_dcps_type_support_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_dcps_type_support (void) const
 {
   return this->gen_dcps_type_support_;
@@ -1086,50 +1153,62 @@ BE_GlobalData::ccmobject (be_interface *val)
   this->ccmobject_ = val;
 }
 
-idl_bool
+be_valuetype *
+BE_GlobalData::exceptionholder (void) const
+{
+  return this->exceptionholder_;
+}
+
+void
+BE_GlobalData::exceptionholder (be_valuetype *val)
+{
+  this->exceptionholder_ = val;
+}
+
+bool
 BE_GlobalData::gen_anyop_files (void) const
 {
   return this->gen_anyop_files_;
 }
 
 void
-BE_GlobalData::gen_anyop_files (idl_bool val)
+BE_GlobalData::gen_anyop_files (bool val)
 {
   this->gen_anyop_files_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_skel_files (void) const
 {
   return this->gen_skel_files_;
 }
 
 void
-BE_GlobalData::gen_skel_files (idl_bool val)
+BE_GlobalData::gen_skel_files (bool val)
 {
   this->gen_skel_files_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_client_inline (void) const
 {
   return this->gen_client_inline_;
 }
 
 void
-BE_GlobalData::gen_client_inline (idl_bool val)
+BE_GlobalData::gen_client_inline (bool val)
 {
   this->gen_client_inline_ = val;
 }
 
-idl_bool
+bool
 BE_GlobalData::gen_server_inline (void) const
 {
   return this->gen_server_inline_;
 }
 
 void
-BE_GlobalData::gen_server_inline (idl_bool val)
+BE_GlobalData::gen_server_inline (bool val)
 {
   this->gen_server_inline_ = val;
 }
@@ -1476,18 +1555,18 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'C')
           {
             // AMI with Call back.
-            be_global->ami_call_back (I_TRUE);
+            be_global->ami_call_back (true);
           }
         else if (av[i][2] == 'H')
           {
             // AMH classes.
-            be_global->gen_amh_classes (I_TRUE);
+            be_global->gen_amh_classes (true);
           }
         else if (av[i][2] == 'A')
           {
             // TAO-team-only, undocumented option to generate
             // Any operators into a separate set of files.
-            be_global->gen_anyop_files (I_TRUE);
+            be_global->gen_anyop_files (true);
           }
         else if (av[i][2] == 'e')
           {
@@ -1508,7 +1587,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             if (av[i][3] == 'p')
               {
                 // smart proxies
-                be_global->gen_smart_proxies (I_TRUE);
+                be_global->gen_smart_proxies (true);
               }
             else
               {
@@ -1529,7 +1608,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             if (av[i][3] == 'c')
               {
                 // inline constants
-                be_global->gen_inline_constants (I_FALSE);
+                be_global->gen_inline_constants (false);
               }
             else
               {
@@ -1562,7 +1641,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
-                    be_global->gen_dcps_type_support (I_TRUE);
+                    be_global->gen_dcps_type_support (true);
                   }
                 else
                   {
@@ -1671,31 +1750,31 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'a')
           {
             // suppress Any support
-            be_global->any_support (I_FALSE);
+            be_global->any_support (false);
           }
         else if (av[i][2] == 't')
           {
             // suppress typecode support
             // Anys must be suppressed as well
-            be_global->tc_support (I_FALSE);
-            be_global->any_support (I_FALSE);
+            be_global->tc_support (false);
+            be_global->any_support (false);
           }
         else if (av[i][2] == 'p')
           {
             // suppress generating Thru_POA collocated stubs
-            be_global->gen_thru_poa_collocation (I_FALSE);
+            be_global->gen_thru_poa_collocation (false);
           }
         else if (av[i][2] == 'd')
           {
             // suppress generating Direct collocated stubs
-            be_global->gen_direct_collocation (I_FALSE);
+            be_global->gen_direct_collocation (false);
           }
         else if (av[i][2] == 'c')
           {
             if (av[i][3] == 'i')
               {
                 // no client inline
-                be_global->gen_client_inline (I_FALSE);
+                be_global->gen_client_inline (false);
               }
             else
               {
@@ -1711,14 +1790,14 @@ BE_GlobalData::parse_args (long &i, char **av)
         else if (av[i][2] == 'S')
           {
             // disable skeleton file generation.
-            be_global->gen_skel_files (I_FALSE);
+            be_global->gen_skel_files (false);
           }
         else if (av[i][2] == 's')
           {
             if (av[i][3] == 'i')
               {
                 // no client inline
-                be_global->gen_server_inline (I_FALSE);
+                be_global->gen_server_inline (false);
               }
             else
               {
@@ -1757,18 +1836,21 @@ BE_GlobalData::parse_args (long &i, char **av)
 void
 BE_GlobalData::prep_be_arg (char *s)
 {
-  const char arg_macro[] = "export_macro=";
-  const char arg_include[] = "export_include=";
-  const char skel_arg_macro[] = "skel_export_macro=";
-  const char skel_arg_include[] = "skel_export_include=";
-  const char stub_arg_macro[] = "stub_export_macro=";
-  const char stub_arg_include[] = "stub_export_include=";
-  const char anyop_arg_macro[] = "anyop_export_macro=";
-  const char anyop_arg_include[] = "anyop_export_include=";
-  const char arg_pch_include[] = "pch_include=";
-  const char arg_pre_include[] = "pre_include=";
-  const char arg_post_include[] = "post_include=";
-  const char obv_opt_accessor[] = "obv_opt_accessor";
+  static const char arg_macro[]            = "export_macro=";
+  static const char arg_include[]          = "export_include=";
+  static const char skel_arg_macro[]       = "skel_export_macro=";
+  static const char skel_arg_include[]     = "skel_export_include=";
+  static const char stub_arg_macro[]       = "stub_export_macro=";
+  static const char stub_arg_include[]     = "stub_export_include=";
+  static const char anyop_arg_macro[]      = "anyop_export_macro=";
+  static const char anyop_arg_include[]    = "anyop_export_include=";
+  static const char arg_pch_include[]      = "pch_include=";
+  static const char arg_pre_include[]      = "pre_include=";
+  static const char arg_post_include[]     = "post_include=";
+  static const char arg_versioning_begin[] = "versioning_begin=";
+  static const char arg_versioning_end[]   = "versioning_end=";
+  static const char obv_opt_accessor[]     = "obv_opt_accessor";
+
 
   char* last = 0;
 
@@ -1837,6 +1919,16 @@ BE_GlobalData::prep_be_arg (char *s)
         {
           be_global->obv_opt_accessor (1);
         }
+      else if (ACE_OS::strstr (arg, arg_versioning_begin) == arg)
+        {
+          char const * const val = arg + sizeof (arg_versioning_begin) - 1;
+          be_global->versioning_begin (val);
+        }
+      else if (ACE_OS::strstr (arg, arg_versioning_end) == arg)
+        {
+          char const * const val = arg + sizeof (arg_versioning_end) - 1;
+          be_global->versioning_end (val);
+        }
       else
         {
           ACE_ERROR ((LM_ERROR,
@@ -1915,6 +2007,83 @@ BE_GlobalData::usage (void) const
 {
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -Wb,export_macro=<macro name>\t\t\tsets export macro ")
+      ACE_TEXT ("for all files\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,export_include=<include path>\t\tsets export include ")
+      ACE_TEXT ("file for all files\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,stub_export_macro=<macro name>\t\tsets export ")
+      ACE_TEXT ("macro for client files only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,stub_export_include=<include path>\t\tsets export ")
+      ACE_TEXT ("include file for client only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,skel_export_macro=<macro name>\t\tsets export ")
+      ACE_TEXT ("macro for server files only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,skel_export_include=<include path>\t\tsets export ")
+      ACE_TEXT ("include file for server only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,anyop_export_macro=<macro name>\t\tsets export macro ")
+      ACE_TEXT ("for typecode/Any operator files only, when -GA option ")
+      ACE_TEXT ("is used\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,anyop_export_include=<include path>\tsets export ")
+      ACE_TEXT ("include file typecode/Any operator files only, when -GA ")
+      ACE_TEXT ("option is used\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,pch_include=<include path>\t\t\tsets include ")
+      ACE_TEXT ("file for precompiled header mechanism\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,pre_include=<include path>\t\t\tsets include ")
+      ACE_TEXT ("file generate before any other includes\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,post_include=<include path>\t\tsets include ")
+      ACE_TEXT ("file generated at the end of the file\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
+      ACE_TEXT ("data in valuetypes\n")
+    ));
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,versioning_begin\t\t\tSet text that opens a ")
+      ACE_TEXT ("a \"versioned\" namespace\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,versioning_end\t\t\tSet text that closes a ")
+      ACE_TEXT ("a \"versioned\" namespace\n")
+    ));
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -ci\t\t\tClient inline file name ending. Default is C.inl\n")
     ));
   ACE_DEBUG ((
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 5e86db063a8..c8ba868ba4b 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -21,6 +21,7 @@
 
 #include "be_helper.h"
 #include "be_codegen.h"
+#include "be_extern.h"
 #include "idl_defines.h"
 #include "ace/OS_NS_string.h"
 
@@ -57,6 +58,7 @@ static const char copyright[] =
 
 TAO_NL::TAO_NL (void)
 {
+  ACE_UNUSED_ARG (copyright);
 }
 
 TAO_INDENT::TAO_INDENT (int do_now)
@@ -75,6 +77,44 @@ const TAO_INDENT be_idt_nl (1);
 const TAO_UNINDENT be_uidt;
 const TAO_UNINDENT be_uidt_nl (1);
 
+TAO_ENV_ARG::TAO_ENV_ARG (bool with_defaults,
+                          bool single,
+                          bool arg,
+                          bool not_used)
+  : with_defaults_ (with_defaults),
+    single_ (single),
+    arg_ (arg),
+    not_used_ (not_used)
+{
+}
+
+const TAO_ENV_ARG env_decl;
+const TAO_ENV_ARG env_dflts (true);
+const TAO_ENV_ARG env_sngl (false, true);
+const TAO_ENV_ARG env_sngl_dflts (true, true);
+const TAO_ENV_ARG env_not (false, false, false, true);
+const TAO_ENV_ARG env_sngl_not (false, true, false, true);
+const TAO_ENV_ARG env_arg (false, false, true);
+const TAO_ENV_ARG env_sngl_arg (false, true, true);
+
+TAO_ACE_CHECK::TAO_ACE_CHECK (const char *retval,
+                              bool do_return)
+  : retval_ (retval),
+    do_return_ (retval != 0 || do_return)
+{
+}
+
+TAO_ACE_TRY_CHECK::TAO_ACE_TRY_CHECK (void)
+{
+}
+
+TAO_ACE_ENDTRY::TAO_ACE_ENDTRY (void)
+{
+}
+
+const TAO_ACE_TRY_CHECK ace_try_check;
+const TAO_ACE_ENDTRY ace_endtry;
+
 // Methods of the TAO_OutStream class.
 
 TAO_OutStream::TAO_OutStream (void)
@@ -459,6 +499,63 @@ TAO_OutStream::operator<< (const TAO_UNINDENT& i)
 }
 
 TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ENV_ARG& i)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_ENV_"
+              << (i.single_ ? "SINGLE_" : "")
+              << "ARG_"
+              << (i.arg_ ? "PARAMETER" : "DECL")
+              << (i.with_defaults_ ? "_WITH_DEFAULTS" : "")
+              << (i.not_used_ ? "_NOT_USED" : "");
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_CHECK& i)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_CHECK"
+              << (i.do_return_ ? "_RETURN (" : "")
+              << (i.retval_ ? i.retval_ : "")
+              << (i.do_return_ ? ")" : "")
+              << ";";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_TRY_CHECK&)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_TRY_CHECK;";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const TAO_ACE_ENDTRY&)
+{
+  if (!be_global->use_raw_throw ())
+    {
+      (*this) << be_nl
+              << "ACE_ENDTRY;";
+    }
+
+  return *this;
+}
+
+TAO_OutStream &
 TAO_OutStream::operator<< (Identifier *id)
 {
   return this->print (id);
diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp
index 1d1bfb89860..4ebcd57d557 100644
--- a/TAO/TAO_IDL/be/be_home.cpp
+++ b/TAO/TAO_IDL/be/be_home.cpp
@@ -49,8 +49,8 @@ be_home::be_home (UTL_ScopedName *n,
                   long n_supports,
                   AST_Interface **supports_flat,
                   long n_supports_flat)
-  : COMMON_Base (I_FALSE,
-                 I_FALSE),
+  : COMMON_Base (false,
+                 false),
     AST_Decl (AST_Decl::NT_home,
               n),
     AST_Type (AST_Decl::NT_home,
@@ -61,8 +61,8 @@ be_home::be_home (UTL_ScopedName *n,
                    n_supports,
                    supports_flat,
                    n_supports_flat,
-                   I_FALSE,
-                   I_FALSE),
+                   false,
+                   false),
     AST_Home (n,
               base_home,
               managed_component,
@@ -79,11 +79,11 @@ be_home::be_home (UTL_ScopedName *n,
                   n_supports,
                   supports_flat,
                   n_supports_flat,
-                  I_FALSE,
-                  I_FALSE)
+                  false,
+                  false)
 {
   this->size_type (AST_Type::VARIABLE);
-  
+
   // Some previous error may have caused a lookup failure, in which
   // case we'll crash if we do the narrow below.
   if (managed_component == 0)
@@ -95,7 +95,7 @@ be_home::be_home (UTL_ScopedName *n,
   be_component *bt =
      be_component::narrow_from_decl (managed_component);
 
-  bt->seen_in_operation (I_TRUE);
+  bt->seen_in_operation (true);
 
   idl_global->object_arg_seen_ = true;
 }
@@ -120,7 +120,7 @@ be_home::accept (be_visitor *visitor)
       idl_global->err ()->ignore_idl3_error (this);
       return -1;
     }
-    
+
   return visitor->visit_home (this);
 }
 
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 996a705dd41..228129670f8 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -73,8 +73,8 @@ be_interface::be_interface (UTL_ScopedName *n,
                             long nih,
                             AST_Interface **ih_flat,
                             long nih_flat,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_interface,
@@ -228,8 +228,8 @@ be_interface::compute_full_skel_name (const char *prefix,
   else
     {
       size_t namelen = ACE_OS::strlen (prefix);
-      long first = I_TRUE;
-      long second = I_FALSE;
+      long first = true;
+      long second = false;
       char *item_name = 0;
 
       // In the first loop compute the total length.
@@ -243,7 +243,7 @@ be_interface::compute_full_skel_name (const char *prefix,
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -256,11 +256,11 @@ be_interface::compute_full_skel_name (const char *prefix,
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -268,8 +268,8 @@ be_interface::compute_full_skel_name (const char *prefix,
       ACE_NEW (skelname,
                char [namelen+1]);
       skelname[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
+      first = true;
+      second = false;
       ACE_OS::strcat (skelname, prefix);
 
       for (UTL_IdListActiveIterator j (this->name ());
@@ -282,7 +282,7 @@ be_interface::compute_full_skel_name (const char *prefix,
             }
           else if (second)
             {
-              first = second = I_FALSE;
+              first = second = false;
             }
 
           // Print the identifier.
@@ -294,11 +294,11 @@ be_interface::compute_full_skel_name (const char *prefix,
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = I_FALSE;
+                  first = false;
                 }
               else
                 {
-                  second = I_TRUE;
+                  second = true;
                 }
             }
         }
@@ -541,7 +541,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
           << "TAO_ORB_Core *oc" << be_uidt_nl
           << ")" << be_nl
           << ": ";
-          
+
       bool the_check =
         (this->has_mixed_parentage_
          && !this->is_abstract_
@@ -551,20 +551,20 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
 
       if (this->has_mixed_parentage_)
         {
-          *os << "ACE_NESTED_CLASS (::CORBA, "
+          *os << "::CORBA::"
               << (the_check ? "AbstractBase" : "Object")
-              << ") ("
+              << " ("
               << be_idt << be_idt << be_idt_nl
               << "objref," << be_nl
               << "_tao_collocated," << be_nl
               << "servant"
               << (the_check ? "" : ", oc") << be_uidt_nl
               << ")" << be_uidt;
-              
+
           if (!the_check)
             {
               *os << "," << be_nl
-                  << "ACE_NESTED_CLASS (CORBA, AbstractBase) ("
+                  << "::CORBA::AbstractBase ("
                   << be_idt << be_idt_nl
                   << "objref," << be_nl
                   << "_tao_collocated," << be_nl
@@ -577,7 +577,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
             this->traverse_inheritance_graph (
                       be_interface::gen_abstract_init_helper,
                       os,
-                      I_TRUE
+                      true
                     );
 
           if (status == -1)
@@ -591,7 +591,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
         {
           *os << be_idt;
         }
-        
+
       if (the_check && !this->is_abstract_)
         {
           *os << "," << be_uidt_nl;
@@ -600,13 +600,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
       if (!this->is_abstract_
           && (!this->has_mixed_parentage_ || the_check))
         {
-          *os << "ACE_NESTED_CLASS (CORBA, Object) ("
-              << be_idt << be_idt_nl
-              << "objref," << be_nl
-              << "_tao_collocated," << be_nl
-              << "servant," << be_nl
-              << "oc" << be_uidt_nl
-              << ")" << be_uidt;
+          *os << "::CORBA::Object (objref, _tao_collocated, servant, oc)";
         }
 
       *os << "," << be_nl
@@ -771,7 +765,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
         {
           // Hack to force the generation of the pure virtual ' = 0'
           // at the end of the operation declaration.
-          d->set_local (I_TRUE);
+          d->set_local (true);
 
           if (d->accept (this->visitor_) == -1)
             {
@@ -781,7 +775,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
                                 -1);
             }
 
-          d->set_local (I_FALSE);
+          d->set_local (false);
         }
     }
 
@@ -1294,7 +1288,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
                                         be_interface *ancestor,
                                         AST_Decl *d,
                                         const char *prefix,
-                                        idl_bool /* direct */,
+                                        bool /* direct */,
                                         UTL_ExceptList *list,
                                         TAO_OutStream *os)
 {
@@ -1308,8 +1302,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
       << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
-      << "int num_args" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "int num_args" << env_decl << be_uidt_nl
       << ")";
 
   be_interface::gen_throw_spec (list, os);
@@ -1320,8 +1313,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
       << "::" << prefix << d->local_name () << " (" << be_idt << be_idt_nl
       << "servant," << be_nl
       << "args," << be_nl
-      << "num_args" << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "num_args" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}"<< be_nl;
 
@@ -1351,7 +1343,7 @@ be_interface::analyze_parentage (void)
     }
 
   AST_Decl::NodeType nt = this->node_type ();
-  idl_bool can_be_mixed = nt == AST_Decl::NT_interface
+  bool can_be_mixed = nt == AST_Decl::NT_interface
                           || nt == AST_Decl::NT_component
                           || nt == AST_Decl::NT_home;
 
@@ -1385,7 +1377,7 @@ be_code_emitter_wrapper::emit (be_interface *derived_interface,
 int
 be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
                                           TAO_OutStream *os,
-                                          idl_bool abstract_paths_only)
+                                          bool abstract_paths_only)
 {
   // Make sure the queues are empty.
   this->insert_queue.reset ();
@@ -1412,7 +1404,7 @@ int
 be_interface::traverse_inheritance_graph (
     TAO_IDL_Inheritance_Hierarchy_Worker &worker,
     TAO_OutStream *os,
-    idl_bool abstract_paths_only
+    bool abstract_paths_only
   )
 {
   AST_Interface *intf = 0;  // element inside the queue
@@ -1926,8 +1918,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request, " << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_nl
-                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                      << "void * servant" << env_dflts << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -1940,8 +1931,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_nl
-                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                      << "void * servant" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -1955,8 +1945,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << be_nl
-                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -1980,8 +1969,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_nl
-                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                      << "void * servant" << env_dflts << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -1994,8 +1982,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & server_request," << be_nl
                       << "void * servant_upcall," << be_nl
-                      << "void * servant" << be_nl
-                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                      << "void * servant" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -2009,8 +1996,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << be_nl
-                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -2028,8 +2014,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest & server_request," << be_nl
                           << "void * servant_upcall," << be_nl
-                          << "void * servant" << be_nl
-                          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                          << "void * servant" << env_dflts << be_uidt_nl
                           << ");" << be_uidt;
                     }
                   else
@@ -2043,8 +2028,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest & server_request," << be_nl
                           << "void * servant_upcall," << be_nl
-                          << "void * servant" << be_nl
-                          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                          << "void * servant" << env_decl << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl;
 
@@ -2058,8 +2042,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "server_request," << be_nl
                           << "servant_upcall," << be_nl
-                          << "impl" << be_nl
-                          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                          << "impl" << env_arg << be_uidt_nl
                           << ");" << be_uidt << be_uidt_nl
                           << "}";
                     }
@@ -2112,8 +2095,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << d->local_name () << " (" << be_idt << be_idt_nl
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
-              << "int num_args" << be_nl
-              << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+              << "int num_args" << env_dflts << be_uidt_nl
               << ")";
 
           list = be_operation::narrow_from_decl (d)->exceptions ();
@@ -2135,8 +2117,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << "_get_" << d->local_name () << " (" << be_idt << be_idt_nl
               << "TAO_Abstract_ServantBase *servant, " << be_nl
               << "TAO::Argument ** args," << be_nl
-              << "int num_args" << be_nl
-              << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+              << "int num_args" << env_dflts << be_uidt_nl
               << ")";
 
           list = attr->get_get_exceptions ();
@@ -2154,8 +2135,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
                   << "_set_" << d->local_name () << " (" << be_idt << be_idt_nl
                   << "TAO_Abstract_ServantBase *servant, " << be_nl
                   << "TAO::Argument ** args," << be_nl
-                  << "int num_args" << be_nl
-                  << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                  << "int num_args" << env_dflts << be_uidt_nl
                   << ")";
 
               list = attr->get_set_exceptions ();
@@ -2211,7 +2191,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                                                       ancestor,
                                                       d,
                                                       "",
-                                                      I_TRUE,
+                                                      true,
                                                       op->exceptions (),
                                                       os);
             }
@@ -2232,7 +2212,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                   ancestor,
                   d,
                   "_get_",
-                  I_TRUE,
+                  true,
                   attr->get_get_exceptions (),
                   os
                 );
@@ -2247,7 +2227,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                       ancestor,
                       d,
                       "_set_",
-                      I_TRUE,
+                      true,
                       attr->get_set_exceptions (),
                       os
                     );
@@ -2273,20 +2253,20 @@ be_interface::copy_ctor_helper (be_interface *derived,
 
   *os << "," << be_idt_nl;
 
-  idl_bool is_rh_base =
+  bool is_rh_base =
     (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0);
 
   if (is_rh_base)
     {
-      *os << "ACE_NESTED_CLASS (POA_Messaging, ReplyHandler) (rhs)";
+      *os << "::POA_Messaging::ReplyHandler (rhs)";
     }
   else if (base->is_nested ())
     {
       be_decl *scope;
       scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
 
-      *os << "ACE_NESTED_CLASS (POA_" << scope->name () << ", "
-          << base->local_name () << ") (rhs)";
+      *os << "POA_" << scope->name () << "::"
+          << base->local_name () << " (rhs)";
     }
   else
     {
@@ -2347,9 +2327,9 @@ be_interface::gen_abstract_init_helper (be_interface *node,
       UTL_Scope *parent_scope = base->defined_in ();
       AST_Decl *parent_decl = ScopeAsDecl (parent_scope);
 
-      *os << "ACE_NESTED_CLASS ("
-          << parent_decl->name () << ", "
-          << base->local_name ()<< ") (" << be_idt << be_idt_nl;
+      *os << ""
+          << parent_decl->name () << "::"
+          << base->local_name ()<< " (" << be_idt << be_idt_nl;
     }
   else
     {
@@ -2477,7 +2457,7 @@ be_interface::session_component_child (void)
 
       AST_Decl *session_component =
         const_cast<be_interface*> (this)->scope ()->lookup_by_name (&sn,
-                                                                    I_TRUE);
+                                                                    true);
 
       tail_id.destroy ();
       head_id.destroy ();
@@ -2507,7 +2487,7 @@ be_interface::session_component_child (void)
   return this->session_component_child_;
 }
 
-idl_bool
+bool
 be_interface::is_event_consumer (void)
 {
   return
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index a74eeceded9..6577daeeabf 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -64,7 +64,7 @@ be_interface_fwd::~be_interface_fwd (void)
 }
 
 void
-be_interface_fwd::seq_elem_tmplinst (idl_bool val)
+be_interface_fwd::seq_elem_tmplinst (bool val)
 {
   this->be_type::seq_elem_tmplinst (val);
   be_interface *fd =
@@ -73,7 +73,7 @@ be_interface_fwd::seq_elem_tmplinst (idl_bool val)
 }
 
 void
-be_interface_fwd::seen_in_sequence (idl_bool val)
+be_interface_fwd::seen_in_sequence (bool val)
 {
   this->be_type::seen_in_sequence (val);
   be_interface *fd =
@@ -82,7 +82,7 @@ be_interface_fwd::seen_in_sequence (idl_bool val)
 }
 
 void
-be_interface_fwd::seen_in_operation (idl_bool val)
+be_interface_fwd::seen_in_operation (bool val)
 {
   this->be_type::seen_in_operation (val);
   be_interface *fd =
diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp
index d4f10163cd0..be5d28e0091 100644
--- a/TAO/TAO_IDL/be/be_native.cpp
+++ b/TAO/TAO_IDL/be/be_native.cpp
@@ -19,8 +19,8 @@
 #include "be_native.h"
 #include "be_visitor.h"
 
-ACE_RCSID (be, 
-           be_native, 
+ACE_RCSID (be,
+           be_native,
            "$Id$")
 
 
@@ -50,19 +50,19 @@ be_native::be_native (UTL_ScopedName *n)
     UTL_Scope (AST_Decl::NT_native),
     AST_Structure (AST_Decl::NT_native,
                    n,
-                   I_TRUE,
-                   I_FALSE),
+                   true,
+                   false),
     AST_Exception (n,
-                   I_TRUE,
-                   I_FALSE),
+                   true,
+                   false),
     AST_Native (n),
     be_decl (AST_Decl::NT_native,
              n),
     be_type (AST_Decl::NT_native,
              n),
     be_exception (n,
-                  I_TRUE,
-                  I_FALSE)
+                  true,
+                  false)
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index ad495310970..7fc7ba0f21b 100644
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ b/TAO/TAO_IDL/be/be_operation.cpp
@@ -45,8 +45,8 @@ be_operation::be_operation (void)
 be_operation::be_operation (AST_Type *rt,
                             AST_Operation::Flags fl,
                             UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_op,
@@ -68,13 +68,13 @@ be_operation::be_operation (AST_Type *rt,
     {
       return;
     }
-    
+
   idl_global->operation_seen_ = true;
 
   if (!this->is_local ())
     {
       be_type *bt = be_type::narrow_from_decl (rt);
-      bt->seen_in_operation (I_TRUE);
+      bt->seen_in_operation (true);
       this->set_arg_seen_bit (bt);
       idl_global->non_local_op_seen_ = true;
     }
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 657e90f8c03..613be8a7c7c 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -48,7 +48,7 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_pre_defined,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_pre_defined,
               n),
     AST_ConcreteType (AST_Decl::NT_pre_defined,
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 268c0316121..6ba6f9af99d 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -39,7 +39,6 @@ ACE_RCSID (be,
            be_sequence,
            "$Id$")
 
-
 be_sequence::be_sequence (void)
   : COMMON_Base (),
     AST_Decl (),
@@ -54,19 +53,19 @@ be_sequence::be_sequence (void)
     field_node_ (0)
 {
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 }
 
 be_sequence::be_sequence (AST_Expression *v,
                           AST_Type *t,
                           UTL_ScopedName *n,
-                          idl_bool local,
-                          idl_bool abstract)
+                          bool local,
+                          bool abstract)
   : COMMON_Base (t->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_sequence,
               n,
-              I_TRUE),
+              true),
     AST_Type (AST_Decl::NT_sequence,
               n),
     AST_ConcreteType (AST_Decl::NT_sequence,
@@ -86,7 +85,7 @@ be_sequence::be_sequence (AST_Expression *v,
     field_node_ (0)
 {
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 
   // Don't want to set any bits below for imported nodes.
   if (this->imported ())
@@ -216,7 +215,7 @@ be_sequence::gen_name (void)
     }
 
   // Append the size (if any).
-  if (this->unbounded () == I_FALSE)
+  if (this->unbounded () == false)
     {
       char ulval_str [NAMEBUFSIZE];
       ACE_OS::sprintf (ulval_str,
@@ -433,13 +432,13 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Unbounded_Object_Sequence_%s",
+                           "_TAO_unbounded_object_reference_sequence_%s",
                            prim_type->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Bounded_Object_Sequence_%s_%lu",
+                           "_TAO_bounded_object_reference_sequence_%s_%lu",
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -449,13 +448,13 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Unbounded_Valuetype_Sequence_%s",
+                           "_TAO_unbounded_valuetype_sequence_%s",
                            prim_type->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Bounded_Valuetype_Sequence_%s_%lu",
+                           "_TAO_bounded_valuetype_sequence_%s_%lu",
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -465,12 +464,12 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO_Unbounded_String_Sequence");
+                           "TAO::unbounded_string_sequence");
         }
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Bounded_String_Sequence_%s",
+                           "_TAO_unbounded_string_sequence_%s",
                            prim_type->local_name ()->get_string ());
         }
 
@@ -479,12 +478,12 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO_Unbounded_WString_Sequence");
+                           "TAO::unbounded_wstring_sequence");
         }
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Bounded_WString_Sequence_%s",
+                           "_TAO_bounded_wstring_sequence_%s",
                            prim_type->local_name ()->get_string ());
         }
 
@@ -501,19 +500,19 @@ be_sequence::instance_name ()
               && predef->pt() == AST_PredefinedType::PT_octet)
             {
               ACE_OS::sprintf (namebuf,
-                               "TAO_Unbounded_Sequence<CORBA::Octet>");
+                               "TAO::unbounded_value_sequence<CORBA::Octet>");
             }
           else
             {
               ACE_OS::sprintf (namebuf,
-                               "_TAO_Unbounded_Sequence_%s",
+                               "_TAO_unbounded_value_sequence_%s",
                                prim_type->local_name ()->get_string ());
             }
         }
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_Bounded_Sequence_%s_%lu",
+                           "_TAO_bounded_value_sequence_%s_%lu",
                             prim_type->local_name ()->get_string (),
                             this->max_size ()->ev ()->u.ulval);
         }
@@ -535,9 +534,10 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
   switch (this->managed_type ())
     {
     case be_sequence::MNG_OBJREF:
+    case be_sequence::MNG_PSEUDO:
       if (this->unbounded ())
         {
-          *os << "TAO_Unbounded_Object_Sequence<" << linebreak
+          *os << "TAO::unbounded_object_reference_sequence<" << linebreak
               << be_idt << be_idt_nl
               << elem->nested_type_name (ctx_scope) << "," << linebreak
               << be_nl;
@@ -547,7 +547,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         }
       else
         {
-          *os << "TAO_Bounded_Object_Sequence<" << linebreak
+          *os << "TAO::bounded_object_reference_sequence<" << linebreak
               << be_idt << be_idt_nl
               << elem->nested_type_name (ctx_scope) << "," << linebreak << be_nl;
           *os << elem->nested_type_name (ctx_scope, "_var") << ","
@@ -557,30 +557,10 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         }
 
       break;
-    case be_sequence::MNG_PSEUDO:
-      if (this->unbounded ())
-        {
-          *os << "TAO_Unbounded_Pseudo_Sequence<" << linebreak
-              << be_idt << be_idt_nl
-              << elem->nested_type_name (ctx_scope) << linebreak << be_uidt_nl
-              << ">" << be_uidt;
-        }
-      else
-        {
-          *os << "TAO_Bounded_Pseudo_Sequence<" << linebreak
-              << be_idt << be_idt_nl
-              << elem->nested_type_name (ctx_scope) << "," << linebreak
-              << be_nl
-              << this->max_size ()->ev ()->u.ulval << linebreak
-              << be_uidt_nl
-              << ">" << be_uidt;
-        }
-
-      break;
     case be_sequence::MNG_VALUE:
       if (this->unbounded ())
         {
-          *os << "TAO_Unbounded_Valuetype_Sequence<" << linebreak
+          *os << "TAO::unbounded_valuetype_sequence<" << linebreak
               << be_idt << be_idt_nl
               << elem->nested_type_name (ctx_scope) << "," << linebreak
               << be_nl;
@@ -590,7 +570,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         }
       else
         {
-          *os << "TAO_Bounded_Valuetype_Sequence<" << linebreak
+          *os << "TAO::bounded_valuetype_sequence<" << linebreak
               << be_idt << be_idt_nl
               << elem->nested_type_name (ctx_scope) << "," << linebreak
               << be_nl;
@@ -604,11 +584,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_STRING:
       if (this->unbounded ())
         {
-          *os << "TAO_Unbounded_String_Sequence";
+          *os << "TAO::unbounded_string_sequence";
         }
       else
         {
-          *os << "TAO_Bounded_String_Sequence<"
+          *os << "TAO::bounded_string_sequence<"
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
@@ -616,11 +596,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_WSTRING:
       if (this->unbounded ())
         {
-          *os << "TAO_Unbounded_WString_Sequence";
+          *os << "TAO::unbounded_wstring_sequence";
         }
       else
         {
-          *os << "TAO_Bounded_WString_Sequence<"
+          *os << "TAO::bounded_wstring_sequence<"
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
@@ -631,7 +611,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
           case AST_Decl::NT_array:
             if (this->unbounded ())
               {
-                *os << "TAO_Unbounded_Array_Sequence<" << linebreak
+                *os << "TAO::unbounded_array_sequence<" << linebreak
                     << be_idt << be_idt_nl
                     << elem->nested_type_name (ctx_scope) << "," << linebreak
                     << be_nl;
@@ -643,7 +623,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
               }
             else
               {
-                *os << "TAO_Bounded_Array_Sequence<" << linebreak
+                *os << "TAO::bounded_array_sequence<" << linebreak
                     << be_idt << be_idt_nl
                     << elem->nested_type_name (ctx_scope) << "," << linebreak
                     << be_nl;
@@ -660,7 +640,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
           default:
             if (this->unbounded ())
               {
-                *os << "TAO_Unbounded_Sequence<" << linebreak
+                *os << "TAO::unbounded_value_sequence<" << linebreak
                     << be_idt << be_idt_nl
                     << elem->nested_type_name (ctx_scope) << linebreak
                     << be_uidt_nl
@@ -668,7 +648,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
               }
             else
               {
-                *os << "TAO_Bounded_Sequence<" << linebreak
+                *os << "TAO::bounded_value_sequence<" << linebreak
                     << be_idt << be_idt_nl
                     << elem->nested_type_name (ctx_scope) << "," << linebreak
                     << be_nl
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index 497dcec1d39..2b1bdf520b4 100644
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ b/TAO/TAO_IDL/be/be_string.cpp
@@ -48,7 +48,7 @@ be_string::be_string (AST_Decl::NodeType nt,
   : COMMON_Base (),
     AST_Decl (nt,
               n,
-              I_TRUE),
+              true),
     AST_Type (nt,
               n),
     AST_String (nt,
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 438c8fa4668..dae08f4df58 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -30,8 +30,8 @@
 #include "idl_defines.h"
 #include "global_extern.h"
 
-ACE_RCSID (be, 
-           be_structure, 
+ACE_RCSID (be,
+           be_structure,
            "$Id$")
 
 be_structure::be_structure (void)
@@ -48,8 +48,8 @@ be_structure::be_structure (void)
 }
 
 be_structure::be_structure (UTL_ScopedName *n,
-                            idl_bool local,
-                            idl_bool abstract)
+                            bool local,
+                            bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_struct,
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
index 0dec1f2b844..06be8962802 100644
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ b/TAO/TAO_IDL/be/be_sunsoft.cpp
@@ -9,8 +9,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (be, 
-           be_sunsoft, 
+ACE_RCSID (be,
+           be_sunsoft,
            "$Id$")
 
 TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
@@ -34,8 +34,8 @@ TAO_SunSoft_OutStream::print (Identifier *id)
 TAO_OutStream &
 TAO_SunSoft_OutStream::print (UTL_IdList *idl)
 {
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
   Identifier *id = 0;
 
   for (UTL_IdListActiveIterator i (idl); !i.is_done (); i.next ())
@@ -46,7 +46,7 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       // Print the identifier.
@@ -58,11 +58,11 @@ TAO_SunSoft_OutStream::print (UTL_IdList *idl)
           if (ACE_OS::strcmp (id->get_string (), "") != 0)
             {
               // Does not start with a "".
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
@@ -126,8 +126,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX)
             this->TAO_OutStream::print ("%hd", ev->u.cval);
           else if (isprint (ev->u.cval))
-	          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-	        else if (iscntrl (ev->u.cval))
+            this->TAO_OutStream::print ("'%c'", ev->u.cval);
+          else if (iscntrl (ev->u.cval))
             switch (ev->u.cval)
               {
                 case '\n':
@@ -157,8 +157,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
               default:
                 this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
               }
- 	        else
-	          this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
+           else
+            this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
           this->TAO_OutStream::print ("L'%lc'", ev->u.wcval);
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 802d23f47b1..599e9018584 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -38,10 +38,10 @@ be_type::be_type (void)
     AST_Type (),
     be_decl (),
     tc_name_ (0),
-    common_varout_gen_ (I_FALSE),
-    seq_elem_tmplinst_ (I_FALSE),
-    seen_in_sequence_ (I_FALSE),
-    seen_in_operation_ (I_FALSE)
+    common_varout_gen_ (false),
+    seq_elem_tmplinst_ (false),
+    seen_in_sequence_ (false),
+    seen_in_operation_ (false)
 {
 }
 
@@ -55,10 +55,10 @@ be_type::be_type (AST_Decl::NodeType nt,
     be_decl (nt,
              n),
     tc_name_ (0),
-    common_varout_gen_ (I_FALSE),
-    seq_elem_tmplinst_ (I_FALSE),
-    seen_in_sequence_ (I_FALSE),
-    seen_in_operation_ (I_FALSE)
+    common_varout_gen_ (false),
+    seq_elem_tmplinst_ (false),
+    seen_in_sequence_ (false),
+    seen_in_operation_ (false)
 {
   if (n != 0)
     {
@@ -292,38 +292,38 @@ be_type::gen_common_varout (TAO_OutStream *os)
   this->common_varout_gen_ = 1;
 }
 
-idl_bool
+bool
 be_type::seq_elem_tmplinst (void) const
 {
   return this->seq_elem_tmplinst_;
 }
 
 void
-be_type::seq_elem_tmplinst (idl_bool val)
+be_type::seq_elem_tmplinst (bool val)
 {
   this->seq_elem_tmplinst_ = val;
 }
 
-idl_bool
+bool
 be_type::seen_in_sequence (void) const
 {
   return this->seen_in_sequence_;
 }
 
 void
-be_type::seen_in_sequence (idl_bool val)
+be_type::seen_in_sequence (bool val)
 {
   this->seen_in_sequence_ = val;
 }
 
-idl_bool
+bool
 be_type::seen_in_operation (void) const
 {
   return this->seen_in_operation_;
 }
 
 void
-be_type::seen_in_operation (idl_bool val)
+be_type::seen_in_operation (bool val)
 {
   this->seen_in_operation_ = val;
 }
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 453ecaab484..0c0274172b2 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -39,8 +39,8 @@ be_typedef::be_typedef (void)
 
 be_typedef::be_typedef (AST_Type *bt,
                         UTL_ScopedName *n,
-                        idl_bool local,
-                        idl_bool abstract)
+                        bool local,
+                        bool abstract)
   : COMMON_Base (bt->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_typedef,
@@ -61,26 +61,26 @@ be_typedef::be_typedef (AST_Type *bt,
 
   if (nt == AST_Decl::NT_sequence)
     {
-      pbt->anonymous (I_FALSE);
+      pbt->anonymous (false);
     }
 }
 
 void
-be_typedef::seq_elem_tmplinst (idl_bool val)
+be_typedef::seq_elem_tmplinst (bool val)
 {
   this->be_type::seq_elem_tmplinst (val);
   this->primitive_base_type ()->seq_elem_tmplinst (val);
 }
 
 void
-be_typedef::seen_in_sequence (idl_bool val)
+be_typedef::seen_in_sequence (bool val)
 {
   this->be_type::seen_in_sequence (val);
   this->primitive_base_type ()->seen_in_sequence (val);
 }
 
 void
-be_typedef::seen_in_operation (idl_bool val)
+be_typedef::seen_in_operation (bool val)
 {
   this->be_type::seen_in_operation (val);
   this->primitive_base_type ()->seen_in_operation (val);
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index c483a315565..b5ce7cbd7d5 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -48,13 +48,13 @@ be_union::be_union (void)
     be_type ()
 {
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 }
 
 be_union::be_union (AST_ConcreteType *dt,
                     UTL_ScopedName *n,
-                    idl_bool local,
-                    idl_bool abstract)
+                    bool local,
+                    bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_union,
@@ -79,7 +79,7 @@ be_union::be_union (AST_ConcreteType *dt,
              n)
 {
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 
   if (!this->imported ())
     {
@@ -97,7 +97,7 @@ be_union::redefine (AST_Structure *from)
   AST_Union::redefine (from);
 }
 
-idl_bool
+bool
 be_union::has_duplicate_case_labels (void)
 {
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
@@ -110,11 +110,11 @@ be_union::has_duplicate_case_labels (void)
 
       if (ub->label_list_length () > 1)
         {
-          return I_TRUE;
+          return true;
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
 void
@@ -132,38 +132,38 @@ be_union::accept (be_visitor *visitor)
   return visitor->visit_union (this);
 }
 
-idl_bool
+bool
 be_union::gen_empty_default_label (void)
 {
   // A non-empty explicit default label will be generated.
   if (this->default_index () != -1)
     {
-      return I_FALSE;
+      return false;
     }
-    
+
   AST_ConcreteType *disc = this->disc_type ();
   AST_Decl::NodeType nt = disc->node_type ();
-  
+
   if (nt == AST_Decl::NT_enum)
     {
-      return I_TRUE;
+      return true;
     }
-  
+
   AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc);
-  
+
   if (pdt == 0)
     {
-      return I_TRUE;
+      return true;
     }
-    
+
   unsigned long n_labels = this->nlabels ();
-      
+
   if (pdt->pt () == AST_PredefinedType::PT_boolean && n_labels == 2)
     {
-      return I_FALSE;
+      return false;
     }
-    
-  return I_TRUE;
+
+  return true;
 }
 
 unsigned long
@@ -180,11 +180,11 @@ be_union::nlabels (void)
         AST_UnionBranch::narrow_from_decl (d);
 
       if (ub != 0)
-        {     
+        {
           retval += ub->label_list_length ();
         }
     }
-    
+
   return retval;
 }
 
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 9fb566a5fdf..dc168c5d8bc 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -58,7 +58,7 @@ be_valuetype::be_valuetype (void)
     }
 
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 }
 
 // Constructor used to build the AST.
@@ -71,9 +71,9 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                             AST_Interface **supports,
                             long n_supports,
                             AST_Interface *supports_concrete,
-                            idl_bool abstract,
-                            idl_bool truncatable,
-                            idl_bool custom)
+                            bool abstract,
+                            bool truncatable,
+                            bool custom)
   : COMMON_Base (0,
                  abstract),
     AST_Decl (AST_Decl::NT_valuetype,
@@ -129,13 +129,13 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
     }
 
   // Always the case.
-  this->has_constructor (I_TRUE);
+  this->has_constructor (true);
 
   for (long i = 0; i < this->pd_n_supports; ++i)
     {
       if (this->pd_supports[i]->is_abstract ())
         {
-          this->supports_abstract_ = I_TRUE;
+          this->supports_abstract_ = true;
           break;
         }
     }
@@ -170,7 +170,7 @@ be_valuetype::redefine (AST_Interface *from)
 
 // Is true if non-virtual accessor and modifier should be generated
 // If #pragma TAO OBV opt_accessor (todo) is used or -Wb,obv_opt_accessor.
-idl_bool
+bool
 be_valuetype::opt_accessor (void)
 {
   return be_global->obv_opt_accessor ();
@@ -214,8 +214,8 @@ be_valuetype::determine_factory_style (void)
     }
 
   // Check whether we have at least one operation or not.
-  idl_bool have_operation = this->have_operation ();
-  idl_bool have_factory = 0;
+  bool have_operation = this->have_operation ();
+  bool have_factory = 0;
 
   // Try only our own scope.
   if (this->nmembers () > 0)
@@ -266,12 +266,12 @@ be_valuetype::determine_factory_style (void)
   return factory_style;
 }
 
-idl_bool
+bool
 be_valuetype::have_operation (void)
 {
   // Check whatever scope we get for operations/attributes.
 
-  idl_bool have_operation = I_FALSE;
+  bool have_operation = false;
 
   // Operations are either operations or attributes of:
   // -its own
@@ -304,7 +304,7 @@ be_valuetype::have_operation (void)
 
           if (nt == AST_Decl::NT_op || nt == AST_Decl::NT_attr)
             {
-              have_operation = I_TRUE;
+              have_operation = true;
               break;
             }
         } // end of for loop
@@ -323,7 +323,7 @@ be_valuetype::have_operation (void)
 
           if (vt != 0 && vt->have_operation ())
             {
-              have_operation = I_TRUE;
+              have_operation = true;
               break;
             }
         }
@@ -348,15 +348,15 @@ be_valuetype::have_operation (void)
   return have_operation;
 }
 
-idl_bool
+bool
 be_valuetype::have_supported_op (be_interface * node)
 {
 
-  idl_bool have_supported_op = 0;
+  bool have_supported_op = 0;
 
   if (node->nmembers () == 0)
     {
-      return I_FALSE;
+      return false;
     }
 
   // Initialize an iterator for supported interface elements
@@ -410,7 +410,7 @@ be_valuetype::have_supported_op (be_interface * node)
   return have_supported_op;
 }
 
-idl_bool
+bool
 be_valuetype::will_have_factory (void)
 {
   FactoryStyle fs = this->determine_factory_style ();
@@ -418,18 +418,47 @@ be_valuetype::will_have_factory (void)
   return (fs == FS_ABSTRACT_FACTORY || fs == FS_CONCRETE_FACTORY);
 }
 
-int
-be_valuetype::gen_helper_header (char*,
-                                 char*)
+bool
+be_valuetype::has_member (void)
 {
-  TAO_OutStream *os = 0;
+  AST_ValueType *parent = this->pd_inherits_concrete;
+
+  // We're looking for inherited members too.
+  if (parent != 0)
+    {
+      be_valuetype *be_parent =
+        be_valuetype::narrow_from_decl (parent);
+
+      if (be_parent->has_member ())
+        {
+          return true;
+        }
+    }
+
+  for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
+       !si.is_done ();
+       si.next())
+    {
+      if (si.item ()->node_type () == AST_Decl::NT_field)
+        {
+          return true;
+        }
+    }
 
-  os = tao_cg->client_header ();
+  return false;
+}
+
+int
+be_valuetype::gen_helper_header (char *, char *)
+{
+  TAO_OutStream *os = tao_cg->client_header ();
 
   *os << be_nl << be_nl
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << "namespace CORBA" << be_nl
       << "{"
       << be_idt_nl
@@ -441,16 +470,15 @@ be_valuetype::gen_helper_header (char*,
   *os <<  be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   return 0;
 }
 
 int
-be_valuetype::gen_helper_inline (char*,
-                                 char*)
+be_valuetype::gen_helper_inline (char *, char *)
 {
-  TAO_OutStream *os = 0;
-
-  os = tao_cg->client_inline ();
+  TAO_OutStream *os = tao_cg->client_inline ();
 
   // There is a problem, here. Looks like the if defined __ACE_INLINE
   // is not getting generated... Actually this is a much bigger
@@ -460,6 +488,7 @@ be_valuetype::gen_helper_inline (char*,
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "#if defined (__ACE_INLINE__)" << be_nl << be_nl
+      << be_global->core_versioning_begin () << be_nl
       << "namespace CORBA" << be_nl
       << "{"
       << be_idt_nl
@@ -469,6 +498,7 @@ be_valuetype::gen_helper_inline (char*,
       << this->full_name () << " *);"
       <<  be_uidt_nl
       << "}" << be_nl << be_nl
+      << be_global->core_versioning_end () << be_nl
       << "#endif /*__ACE_INLINE__*/";
 
   return 0;
@@ -476,12 +506,9 @@ be_valuetype::gen_helper_inline (char*,
 
 
 int
-be_valuetype::gen_helper_stubs (char* ,
-                                char* )
+be_valuetype::gen_helper_stubs (char *, char *)
 {
-  TAO_OutStream *os = 0;
-
-  os = tao_cg->client_stubs ();
+  TAO_OutStream *os = tao_cg->client_stubs ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
@@ -623,7 +650,7 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
   return count;
 }
 
-idl_bool
+bool
 be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   list.enqueue_tail (this);
@@ -701,7 +728,7 @@ be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   return this->in_recursion_;
 }
 
-idl_bool
+bool
 be_valuetype::supports_abstract (void) const
 {
   return this->supports_abstract_;
@@ -714,11 +741,11 @@ int
 be_valuetype::traverse_supports_list_graphs (
     be_interface::tao_code_emitter gen,
     TAO_OutStream *os,
-    idl_bool use_abstract_paths,
-    idl_bool use_concrete_paths
+    bool use_abstract_paths,
+    bool use_concrete_paths
   )
 {
-  idl_bool abstract_paths_only = use_abstract_paths && !use_concrete_paths;
+  bool abstract_paths_only = use_abstract_paths && !use_concrete_paths;
 
   long n_supports = this->n_supports ();
 
@@ -866,8 +893,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req, " << be_nl
                       << "void *obj," << be_nl
-                      << "void *context" << be_nl
-                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                      << "void *context" << env_dflts << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -879,8 +905,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
-                      << "void *context" << be_nl
-                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                      << "void *context" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -893,8 +918,7 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "req," << be_nl
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
-                      << "context" << be_nl
-                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "context" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index a0ddcb7bb2a..138ed412013 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -83,10 +83,10 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node)
   // interfaces, not because we want to generate code for them, but
   // because the (imported-AMH-) node could be needed to generate a
   // non-imported, AMH node, for example, for a derived interface.
-  
+
   // (JP) Havinq AMH_* nodes inherit directly from AMH_* base classes
   // is also a problem if the base interface is abstract, since at
-  // the moment, no AMH code is generated for such interfaces. It 
+  // the moment, no AMH code is generated for such interfaces. It
   // would be desirable to mimic the AMI design, where all AMI-related
   // classes inherit from a single base class, no matter what the
   // parentage of the IDL interface. Until we solve the problem of
@@ -107,7 +107,7 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node)
     this->create_exception_holder (node);
   excep_holder->set_defined_in (node->defined_in ());
   excep_holder->original_interface (node);
-  
+
   AST_Module *module =
     AST_Module::narrow_from_scope (node->defined_in ());
   module->set_has_nested_valuetype ();
@@ -155,7 +155,7 @@ be_visitor_amh_pre_proc::create_response_handler (
     dynamic_cast<UTL_ScopedName*> (node->name ()->copy ());
   Identifier *local_name = amh_name->last_component ();
   local_name->replace_string (class_name.c_str ());
-  
+
   UTL_Scope *s = node->defined_in ();
   idl_global->scopes ().push (s);
 
@@ -175,7 +175,7 @@ be_visitor_amh_pre_proc::create_response_handler (
                                 1,          // local
                                 0),         // non-abstract
                   0);
-                  
+
   idl_global->scopes ().pop ();
 
   response_handler->set_name (amh_name);
@@ -229,7 +229,7 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node,
                 this->create_response_handler_attribute (attr,
                                                          response_handler,
                                                          exception_holder);
-                                                        
+
               if (status == -1)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -250,7 +250,7 @@ be_visitor_amh_pre_proc::add_rh_node_members ( be_interface *node,
                 this->create_response_handler_operation (operation,
                                                          response_handler,
                                                          exception_holder);
-                                                        
+
               if (status == -1)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -319,12 +319,12 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
       delete gos;
       gos = 0;
     }
-    
+
   int status =
     this->create_response_handler_operation (get_operation,
                                              response_handler,
                                              exception_holder);
-                                             
+
   if (status == -1)
     {
       return -1;
@@ -334,7 +334,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
     {
       return 0;
     }
-    
+
   // Temporarily generate the set operation.
   be_operation *set_operation = this->generate_set_operation (node);
 
@@ -361,7 +361,7 @@ be_visitor_amh_pre_proc::create_response_handler_attribute (
     this->create_response_handler_operation (set_operation,
                                              response_handler,
                                              exception_holder);
-                                             
+
   if (status == -1)
     {
       return -1;
@@ -427,7 +427,11 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
   node_excep->be_add_argument (argument);
 
   node_excep->set_defined_in (response_handler);
-  response_handler->be_add_operation (node_excep);
+
+  if (0 == response_handler->be_add_operation (node_excep))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -552,7 +556,10 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
   // After having generated the operation we insert it into the
   // response handler interface.
-  response_handler->be_add_operation (operation);
+  if (0 == response_handler->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -600,7 +607,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
   UTL_ScopedName *excep_holder_name =
     node->compute_name ("AMH_",
                         "ExceptionHolder");
-                        
+
   UTL_Scope *s = node->defined_in ();
   idl_global->scopes ().push (s);
 
@@ -619,7 +626,7 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
-                  
+
   idl_global->scopes ().pop ();
 
   excep_holder->set_name (excep_holder_name);
@@ -788,7 +795,10 @@ be_visitor_amh_pre_proc::create_raise_operation (
 
   // After having generated the operation we insert it into the
   // exceptionholder valuetype.
-  excep_holder->be_add_operation (operation);
+  if (0 == excep_holder->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 61eedb3a7cd..c656e056e55 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -34,6 +34,8 @@
 #include "be_attribute.h"
 #include "be_predefined_type.h"
 #include "be_argument.h"
+#include "be_global.h"
+#include "be_extern.h"
 #include "utl_identifier.h"
 #include "nr_extern.h"
 #include "global_extern.h"
@@ -107,11 +109,9 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
     }
 
   be_valuetype *excep_holder = 0;
+  be_valuetype *global_excep_holder = be_global->exceptionholder ();
 
-  if (! node->imported ())
-    {
-      excep_holder = this->create_exception_holder (node);
-    }
+  excep_holder = this->create_exception_holder (node);
 
   be_interface *reply_handler = this->create_reply_handler (node,
                                                             excep_holder);
@@ -139,14 +139,6 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
                         -1);
     }
 
-  // After generating the reply handler for imported nodes, so they
-  // can be looked up as possible parents of a reply handler from
-  // a non-imported node, we can skip the rest of the function.
-  if (node->imported ())
-    {
-      return 0;
-    }
-
   // Set the proper strategy.
   be_interface_ami_strategy *bias = 0;
   ACE_NEW_RETURN (bias,
@@ -161,7 +153,10 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
       old_strategy = 0;
     }
 
-  if (excep_holder)
+  // Only do this when we have created a new exceptionholder. In the old
+  // AMI setup the global_excep_holder is always 0, in the new setup it
+  // is only 0 in the first case.
+  if (excep_holder && !global_excep_holder)
     {
       excep_holder->set_defined_in (node->defined_in ());
       // Insert the exception holder after the original node,
@@ -191,14 +186,16 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ami_pre_proc::"
-                         "visit_interface - "
-                         "creating the exception holder failed\n"),
-                        -1);
+      if (!excep_holder)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_ami_pre_proc::"
+                             "visit_interface - "
+                             "creating the exception holder failed\n"),
+                            -1);
+        }
     }
 
-
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -312,6 +309,12 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
 be_valuetype *
 be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
 {
+  be_valuetype *global = be_global->exceptionholder ();
+  if (global != 0)
+    {
+      return global;
+    }
+
   Identifier *id = 0;
   UTL_ScopedName *sn = 0;
 
@@ -328,7 +331,7 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
   ACE_NEW_RETURN (msg,
                   be_module (sn),
                   0);
-                  
+
   idl_global->scopes ().push (msg);
 
   ACE_NEW_RETURN (id,
@@ -369,24 +372,21 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
-                  
-  idl_global->scopes ().pop ();
 
   inherit_vt->set_name (inherit_name);
+  inherit_vt->seen_in_operation (true);
 
   // Notice the valuetype "ExceptionHolder" that it is defined in the
   // "Messaging" module
   inherit_vt->set_defined_in (msg);
   inherit_vt->set_prefix_with_typeprefix ("omg.org");
 
-  // Create the excpetion holder name
+  // Create the exception holder name
   ACE_CString excep_holder_local_name;
-  this->generate_name (excep_holder_local_name,
-                       "AMI_",
-                       node->name ()->last_component ()->get_string(),
-                       "ExceptionHolder");
+  excep_holder_local_name = "ExceptionHolder";
 
-  UTL_ScopedName *excep_holder_name =
+  UTL_ScopedName *excep_holder_name = 0;
+  excep_holder_name =
     static_cast<UTL_ScopedName *> (node->name ()->copy ());
   excep_holder_name->last_component ()->replace_string (
                                             excep_holder_local_name.rep ()
@@ -398,16 +398,13 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                   0);
 
   p_intf[0] = inherit_vt;
-  
-  UTL_Scope *s = node->defined_in ();
-  idl_global->scopes ().push (s);
 
   be_valuetype *excep_holder = 0;
   ACE_NEW_RETURN (excep_holder,
                   be_valuetype (excep_holder_name,
                                 p_intf,
                                 1,
-                                inherit_vt,
+                                0,
                                 0,
                                 0,
                                 0,
@@ -417,70 +414,13 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
-                  
-  idl_global->scopes ().pop ();
-
-  excep_holder->set_defined_in (s);
-  excep_holder->set_name (excep_holder_name);
-  excep_holder->seen_in_operation (I_TRUE);
-
-  // Now our customized valuetype is created, we have to
-  // add now the operations and attributes to the scope.
-
-  if (node->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-           !si.is_done ();
-           si.next ())
-        {
-          AST_Decl *d = si.item ();
-
-          if (d == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_ami_pre_proc::visit_interface - "
-                                 "bad node in this scope\n"),
-                                0);
-
-            }
 
-          be_decl *op = be_decl::narrow_from_decl (d);
-          AST_Decl::NodeType nt = d->node_type ();
-
-          if (nt == AST_Decl::NT_attr)
-            {
-              AST_Attribute *attribute = AST_Attribute::narrow_from_decl (d);
-
-              if (!attribute)
-                {
-                  return 0;
-                }
-
-              this->create_raise_operation (op,
-                                            excep_holder,
-                                            GET_OPERATION);
-
-              if (!attribute->readonly ())
-                {
-                  this->create_raise_operation (op,
-                                                excep_holder,
-                                                SET_OPERATION);
-                }
+  idl_global->scopes ().pop ();
+  excep_holder->seen_in_operation (true);
+  excep_holder->cli_hdr_gen (true);
+  excep_holder->set_imported (true);
 
-            }
-          else if (nt == AST_Decl::NT_op)
-            {
-              this->create_raise_operation (op,
-                                            excep_holder,
-                                            NORMAL);
-            }
-          else
-            {
-              continue;
-            }
-        } // end of while loop
-    } // end of if
+  be_global->exceptionholder (excep_holder);
 
   return excep_holder;
 }
@@ -570,12 +510,9 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
               this->create_reply_handler_operation (get_operation,
                                                     reply_handler);
 
-              if (!node->imported ())
-                {
-                  this->create_excep_operation (get_operation,
-                                                reply_handler,
-                                                excep_holder);
-                }
+              this->create_excep_operation (get_operation,
+                                            reply_handler,
+                                            excep_holder);
 
               if (!attribute->readonly ())
                 {
@@ -584,12 +521,9 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (set_operation,
                                                         reply_handler);
 
-                  if (!node->imported ())
-                    {
-                      this->create_excep_operation (set_operation,
-                                                    reply_handler,
-                                                    excep_holder);
-                    }
+                  this->create_excep_operation (set_operation,
+                                                reply_handler,
+                                                excep_holder);
                 }
             }
           else
@@ -601,12 +535,9 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (operation,
                                                         reply_handler);
 
-                  if (!node->imported ())
-                    {
-                      this->create_excep_operation (operation,
-                                                    reply_handler,
-                                                    excep_holder);
-                    }
+                  this->create_excep_operation (operation,
+                                                reply_handler,
+                                                excep_holder);
                 }
             }
         } // end of while loop
@@ -697,6 +628,7 @@ be_visitor_ami_pre_proc::create_raise_operation (
   operation->set_name (op_name);
   operation->set_defined_in (excep_holder);
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
   if (operation_kind == NORMAL)
     {
       if (orig_op)
@@ -709,6 +641,7 @@ be_visitor_ami_pre_proc::create_raise_operation (
             }
         }
     }
+#endif
 
   // Set the proper strategy.
   be_operation_ami_exception_holder_raise_strategy *boaehrs = 0;
@@ -726,7 +659,10 @@ be_visitor_ami_pre_proc::create_raise_operation (
 
   // After having generated the operation we insert it into the
   // exceptionholder valuetype.
-  excep_holder->be_add_operation (operation);
+  if (0 == excep_holder->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -1048,12 +984,21 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
 
   operation->set_defined_in (reply_handler);
 
-  // We do not copy the exceptions because the exceptions
-  // are delivered by the excep methods.
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+  // Copy the exceptions.
+  if (node->exceptions ())
+    {
+      UTL_ExceptList *exceptions = node->exceptions ();
+      operation->be_add_exceptions (exceptions);
+    }
+#endif
 
   // After having generated the operation we insert it into the
   // reply handler interface.
-  reply_handler->be_add_operation (operation);
+  if (0 == reply_handler->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -1157,7 +1102,10 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
 
   // After having generated the operation we insert it into the
   // reply handler interface.
-  reply_handler->be_add_operation (operation);
+  if (0 == reply_handler->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -1385,7 +1333,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
       ACE_NEW_RETURN (msg,
                       be_module (sn),
                       0);
-                      
+
       idl_global->scopes ().push (msg);
 
       // Create a virtual module named "Messaging" and an interface "ReplyHandler"
@@ -1424,7 +1372,7 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 
       inherit_intf->set_name (inherit_name);
       inherit_intf->set_prefix_with_typeprefix ("omg.org");
-      
+
       idl_global->scopes ().pop ();
 
       // Notice the interface "ReplyHandler" that it is defined in the
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index f7a77246c3f..d7936cbd2ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -41,6 +41,7 @@
 #include "be_extern.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
+#include "ace/Log_Msg.h"
 
 #include <string>
 
@@ -69,6 +70,8 @@ be_visitor_arg_traits::visit_root (be_root *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_nl << be_nl
       << "// Arg traits specializations." << be_nl
       << "namespace TAO" << be_nl
@@ -85,6 +88,8 @@ be_visitor_arg_traits::visit_root (be_root *node)
   *os << be_uidt_nl
       << "}" << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   return 0;
 }
 
@@ -158,7 +163,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -183,7 +188,7 @@ be_visitor_arg_traits::visit_interface_fwd (be_interface_fwd *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -233,7 +238,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
       os.gen_endif ();
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -291,7 +296,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -318,7 +323,7 @@ be_visitor_arg_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -364,11 +369,11 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
           *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__;
 
-          idl_bool wide = (str->width () != 1);
+          bool wide = (str->width () != 1);
 
           *os << be_nl << be_nl;
 
-          idl_bool const skel =
+          bool const skel =
             (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
           // Avoid generating a duplicate structure in the skeleton
@@ -415,7 +420,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -446,7 +451,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  idl_bool wide = (st->width () != 1);
+  bool wide = (st->width () != 1);
 
   // It is legal IDL to declare a bounded (w)string as an operation
   // parameter type. There could be any number of identical
@@ -457,7 +462,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 
   *os << be_nl;
 
-  idl_bool const skel =
+  bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -491,7 +496,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
       << "{" << be_nl
       << "};";
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -527,7 +532,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  idl_bool wide = (st->width () != 1);
+  bool wide = (st->width () != 1);
 
   // It is legal IDL to declare a bounded (w)string as an operation
   // parameter type. There could be any number of identical
@@ -537,7 +542,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
   // parameter for Arg_Traits<>.
   *os << be_nl << be_nl;
 
-  idl_bool const skel =
+  bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -571,7 +576,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       << "{" << be_nl
       << "};";
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -613,7 +618,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
 
   os->gen_endif ();
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -637,7 +642,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       return 0;
     }
 
-  idl_bool wide = (node->width () != 1);
+  bool wide = (node->width () != 1);
 
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -680,7 +685,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       delete [] bound_string;
     }
 
-  idl_bool const skel =
+  bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -739,7 +744,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
 
   os->gen_endif ();
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -828,7 +833,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
 
   os->gen_endif ();
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -868,7 +873,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 
   os->gen_endif ();
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -936,7 +941,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
      will not cause infinite recursion in this visitor.
   */
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
 
   if (this->visit_scope (node) != 0)
     {
@@ -969,7 +974,7 @@ be_visitor_arg_traits::visit_field (be_field *node)
   // field *type* may not have been reached yet) and return.
   if (bt->base_node_type () == AST_Decl::NT_valuetype)
     {
-      node->cli_traits_gen (I_TRUE);
+      node->cli_traits_gen (true);
       return 0;
     }
 
@@ -982,8 +987,8 @@ be_visitor_arg_traits::visit_field (be_field *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
-  this->generated (bt, I_TRUE);
+  this->generated (node, true);
+  this->generated (bt, true);
   return 0;
 }
 
@@ -1053,7 +1058,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
      will not cause infinite recursion in this visitor.
   */
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
 
   int status = this->visit_scope (node);
 
@@ -1091,7 +1096,7 @@ be_visitor_arg_traits::visit_union_branch (be_union_branch *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
@@ -1113,11 +1118,11 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node)
     }
 
   this->ctx_->alias (0);
-  this->generated (node, I_TRUE);
+  this->generated (node, true);
   return 0;
 }
 
-idl_bool
+bool
 be_visitor_arg_traits::generated (be_decl *node) const
 {
   if (ACE_OS::strcmp (this->S_, "") == 0)
@@ -1138,24 +1143,24 @@ be_visitor_arg_traits::generated (be_decl *node) const
 
 void
 be_visitor_arg_traits::generated (be_decl *node,
-                                  idl_bool )
+                                  bool )
 {
   if (ACE_OS::strcmp (this->S_, "") == 0)
     {
       switch (this->ctx_->state ())
         {
           case TAO_CodeGen::TAO_ROOT_CS:
-            node->cli_arg_traits_gen (I_TRUE);
+            node->cli_arg_traits_gen (true);
             return;
           case TAO_CodeGen::TAO_ROOT_SS:
-            node->srv_arg_traits_gen (I_TRUE);
+            node->srv_arg_traits_gen (true);
             return;
           default:
             return;
         }
     }
 
-  node->srv_sarg_traits_gen (I_TRUE);
+  node->srv_sarg_traits_gen (true);
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index edac236eaa3..97293ddf2a3 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_argument, 
-           arglist, 
+ACE_RCSID (be_visitor_argument,
+           arglist,
            "$Id$")
 
 
@@ -218,9 +218,9 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
            || pt == AST_PredefinedType::PT_object)
     {
       // The only PT_pseudo that doesn't take a _ptr suffix.
-      idl_bool is_tckind =
+      bool is_tckind =
         (ACE_OS::strcmp (node->local_name ()->get_string (), "TCKind") == 0);
-        
+
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index 950690a142f..b3ec2642578 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -52,11 +52,15 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << "_forany &);" << be_nl;
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_forany &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_hdr_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 06073cb6f91..facda38a048 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -54,6 +54,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -125,6 +127,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   node->cli_stub_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
index c03f8a00798..0ce6c5133ad 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           array, 
+ACE_RCSID (be_visitor_array,
+           array,
            "$Id$")
 
 
@@ -83,7 +83,7 @@ be_visitor_array::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   AST_PredefinedType::PredefinedType pt = node->pt ();
-  
+
   *os << "::";
 
   if (pt == AST_PredefinedType::PT_pseudo
@@ -112,11 +112,11 @@ be_visitor_array::visit_string (be_string *node)
 
   if (node->width () == (long) sizeof (char))
     {
-      *os << "TAO_String_Manager";
+      *os << "TAO::String_Manager";
     }
   else
     {
-      *os << "TAO_WString_Manager";
+      *os << "TAO::WString_Manager";
     }
 
   return 0;
@@ -142,20 +142,20 @@ be_visitor_array::visit_typedef (be_typedef *node)
   AST_Decl::NodeType nt = pbt->node_type ();
   AST_PredefinedType::PredefinedType pt = AST_PredefinedType:: PT_void;
   int result = 0;
-  
+
   // We check for these first, because in these cases, we replace the
   // entire slice type with one of the strings below, instead of using
   // the node's type name, possibly suffixed with '_var'.
   if (nt == AST_Decl::NT_string)
     {
-      *os << "TAO_String_Manager";
-      
+      *os << "TAO::String_Manager";
+
       return 0;
     }
   else if (nt == AST_Decl::NT_wstring)
     {
-      *os << "TAO_WString_Manager";
-      
+      *os << "TAO::WString_Manager";
+
       return 0;
     }
 
@@ -169,7 +169,7 @@ be_visitor_array::visit_typedef (be_typedef *node)
 
   // We must append a "_var" for typedefs of interfaces, CORBA::Objects or
   // typecodes.
-  if (nt == AST_Decl::NT_interface 
+  if (nt == AST_Decl::NT_interface
       || nt == AST_Decl::NT_interface_fwd
       || pt == AST_PredefinedType::PT_pseudo
       || pt == AST_PredefinedType::PT_object)
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 9923d6f7ee9..e965d27c1db 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -122,7 +122,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
         }
     }
 
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "typedef ";
 
   if (bt->accept (this) == -1)
@@ -199,9 +199,9 @@ int be_visitor_array_ch::visit_array (be_array *node)
     }
 
   *os << ";";
-  
+
   *os << be_nl
-      << "struct " << anon_p << node->nested_type_name (scope, "_tag") 
+      << "struct " << anon_p << node->nested_type_name (scope, "_tag")
       << " {};";
 
   // No _var or _out class for an anonymous (non-typedef'd) array.
@@ -307,6 +307,12 @@ int be_visitor_array_ch::visit_array (be_array *node)
           << "const ";
       *os << node->nested_type_name (scope, "_slice")
           << " *_tao_from" << be_uidt_nl
+          << ");" << be_uidt << be_nl;
+      *os << storage_class << "void" << be_nl
+          << node->nested_type_name (scope, "_zero")
+          << " (" << be_idt << be_idt_nl;
+      *os << node->nested_type_name (scope, "_slice") << " *_tao_slice"
+          << be_uidt_nl
           << ");" << be_uidt;
     }
   else
@@ -339,6 +345,12 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << node->nested_type_name (scope, "_slice", "_")
           << " *_tao_from" << be_uidt_nl
           << ");" << be_uidt;
+      *os << storage_class << "void" << be_nl
+          << node->nested_type_name (scope, "_zero", "_")
+          << " (" << be_idt << be_idt_nl;
+      *os << node->nested_type_name (scope, "_slice", "_")
+          << " *_tao_slice" << be_uidt_nl
+          << ");" << be_uidt;
     }
 
   // Generate the endif macro.
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 f863ede4891..04647bc8abb 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -188,7 +188,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
   unique += "_traits";
 
   *os << be_nl << be_nl
-//       << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << "TAO::Array_Traits<" << be_idt << be_idt_nl
@@ -203,7 +202,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << "}";
 
   *os << be_nl << be_nl
-//       << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
       << "TAO::Array_Traits<" << be_idt << be_idt_nl
@@ -218,7 +216,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << "}";
 
   *os << be_nl << be_nl
-//       << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << "TAO::Array_Traits<" << be_idt << be_idt_nl
@@ -234,7 +231,20 @@ int be_visitor_array_ci::visit_array (be_array *node)
       << "}";
 
   *os << be_nl << be_nl
-//       << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl
+      << "ACE_INLINE" << be_nl
+      << "void" << be_nl
+      << "TAO::Array_Traits<" << be_idt << be_idt_nl
+      << fname << "," << be_nl
+      << fname << "_slice," << be_nl
+      << fname << "_tag" << be_uidt_nl
+      << ">::zero (" << be_idt_nl
+      << fname << "_slice * _tao_slice" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << fname << "_zero (_tao_slice);" << be_uidt_nl
+      << "}";
+
+  *os << be_nl << be_nl
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
       << "TAO::Array_Traits<" << be_idt << be_idt_nl
@@ -248,6 +258,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   *os << be_nl;
 
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index d99afdcc692..326815963b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           array_cs, 
+ACE_RCSID (be_visitor_array,
+           array_cs,
            "$Id$")
 
 // ************************************************************************
@@ -62,17 +62,17 @@ int be_visitor_array_cs::visit_array (be_array *node)
   // To hold the full and local.
   char fname [NAMEBUFSIZE];
   char lname [NAMEBUFSIZE];
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::memset (lname, 
-                  '\0', 
+  ACE_OS::memset (lname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (this->ctx_->tdef ())
     {
       // Typedefed node.
-      ACE_OS::sprintf (fname, "%s", 
+      ACE_OS::sprintf (fname, "%s",
                        node->full_name ());
       ACE_OS::sprintf (lname, "%s",
                        node->local_name ()->get_string ());
@@ -84,22 +84,22 @@ int be_visitor_array_cs::visit_array (be_array *node)
       // our local name. This needs to be inserted after the parents's name.
       if (node->is_nested ())
         {
-          be_decl *parent = 
+          be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, 
+          ACE_OS::sprintf (lname,
                            "_%s",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            node->full_name ());
-          ACE_OS::sprintf (lname, 
+          ACE_OS::sprintf (lname,
                            "_%s",
                            node->local_name ()->get_string ());
         }
@@ -289,6 +289,104 @@ int be_visitor_array_cs::visit_array (be_array *node)
       *os << be_uidt_nl << "}" << be_uidt;
     }
 
+  *os << be_uidt_nl << "}" << be_nl << be_nl;
+
+  // zero method.
+  *os << "void " << be_nl;
+  *os << fname << "_zero (" << be_idt << be_idt_nl
+      << fname << "_slice * _tao_slice" << be_uidt_nl
+      << ")" << be_uidt_nl;
+  *os << "{" << be_idt_nl;
+  *os << "// Zero each individual element." << be_nl;
+
+  // Generate nested loops for as many dimensions as there are.
+  for (i = 0; i < ndims; ++i)
+    {
+      // Retrieve the ith dimension value.
+      AST_Expression *expr = node->dims ()[i];
+
+      if ((expr == 0) || ((expr != 0) && (expr->ev () == 0)))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_array_cs::"
+                             "visit_array - "
+                             "bad array dimension\n"),
+                            -1);
+        }
+
+      if (expr->ev ()->et == AST_Expression::EV_ulong)
+        {
+          // Generate a loop for each dimension.
+          *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < "
+              << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl
+              << "{" << be_idt_nl;
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_array_cs::"
+                             "visit_array - "
+                             "bad array dimension value\n"),
+                            -1);
+        }
+    }
+
+  if (primitive_type)
+    {
+      // The base type is a typedef to another array type, so
+      // we use the base type's copy method.
+      *os << "// call the underlying _zero" << be_nl;
+
+      if (bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_array_cs::"
+                             "visit_array - "
+                             "base type decl failed\n"),
+                            -1);
+        }
+
+      *os << "_zero (_tao_slice";
+
+      for (i = 0; i < ndims; ++i)
+        {
+          *os << "[i" << i << "]";
+        }
+
+      *os << ");";
+    }
+  else
+    {
+      // The base type is not a typedef to possibly another array type. In
+      // such a case, assign each element.
+
+      *os << "_tao_slice";
+
+      for (i = 0; i < ndims; ++i)
+        {
+          *os << "[i" << i << "]";
+        }
+
+      *os << " = ";
+
+      if (bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_array_ch::"
+                             "visit_array - "
+                             "base type decl failed\n"),
+                            -1);
+        }
+
+      *os << " ();";
+    }
+
+  for (i = 0; i < ndims; ++i)
+    {
+      // Add closing braces as many times as the number of dimensions.
+      *os << be_uidt_nl << "}" << be_uidt;
+    }
+
   *os << be_uidt_nl << "}";
 
   AST_Decl::NodeType nt = bt->node_type ();
@@ -352,7 +450,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
         }
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index 00d3ecc3ff0..5cc70fe22a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -115,6 +115,8 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // Generate the CDR << and >> operator declarations.
   *os << be_global->stub_export_macro () << " CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const ";
@@ -150,6 +152,8 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
       *os << node->name () << "_forany &);";
     }
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
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 a3725dc31d4..262dce2236d 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
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           cdr_op_cs, 
+ACE_RCSID (be_visitor_array,
+           cdr_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -44,13 +44,13 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
 {
   if (this->ctx_->alias ())
     {
-      // We are here because we are visiting base type 
+      // We are here because we are visiting base type
       // of the array node which is itself an
       // array, i.e., this is a case of array of array.
       return this->visit_node (node);
     }
 
-  if (node->cli_stub_cdr_op_gen () 
+  if (node->cli_stub_cdr_op_gen ()
       || node->imported ()
       || node->is_local ())
     {
@@ -136,8 +136,8 @@ be_visitor_array_cdr_op_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 (this->ctx_->tdef ())
@@ -148,22 +148,22 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
     {
       // 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 
+      // to our local name. This needs to be inserted after the parents's
       // name.
 
       if (node->is_nested ())
         {
-          be_decl *parent = 
+          be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            node->full_name ());
         }
     }
@@ -176,6 +176,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
   *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
@@ -213,6 +215,8 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
 
   *os << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_stub_cdr_op_gen (1);
   return 0;
 }
@@ -273,7 +277,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
                          "visit_predefined_type - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     default:
       // All other primitive types. Handle them as shown below.
@@ -540,7 +544,7 @@ be_visitor_array_cdr_op_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -567,7 +571,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
     }
 
   // Initialize a boolean variable.
-  *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl;
+  *os << "CORBA::Boolean _tao_marshal_flag = true;" << be_nl;
 
   unsigned long ndims = node->n_dims ();
 
@@ -593,10 +597,10 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
       if (expr->ev ()->et == AST_Expression::EV_ulong)
         {
           // Generate a loop for each dimension.
-          *os << be_nl << "for ( ::CORBA::ULong i" << i 
+          *os << be_nl << "for ( ::CORBA::ULong i" << i
               << " = 0; i" << i << " < "
-              << expr->ev ()->u.ulval << " && _tao_marshal_flag; i" << i
-              << "++)" << be_idt_nl
+              << expr->ev ()->u.ulval << " && _tao_marshal_flag; ++i" << i
+              << ")" << be_idt_nl
               << "{" << be_idt;
         }
       else
@@ -704,13 +708,13 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
           *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
           *os << "_tao_marshal_flag = (strm << tmp);";
         }
-      else if (nt == AST_Decl::NT_interface 
+      else if (nt == AST_Decl::NT_interface
                || nt == AST_Decl::NT_interface_fwd)
         {
           *os << "_tao_marshal_flag = " << be_idt_nl
               << "TAO::Objref_Traits<" << bt->name () << ">::"
               << "marshal (_tao_array";
-          
+
           for (i = 0; i < ndims; ++i)
             {
               *os << "[i" << i << "]";
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 15ca782da82..e5e8505c325 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
@@ -11,17 +11,17 @@
 //    serializer_op_cs.cpp
 //
 // = DESCRIPTION
-//    Visitor for code generation of Arrays for the 
+//    Visitor for code generation of Arrays for the
 //    TAO::DCPS::Serializer operators in the client stubs.
 //
 // = AUTHOR
-//    Scott Harris <harris_s@ociweb.com> based on code by 
+//    Scott Harris <harris_s@ociweb.com> based on code by
 //    Jeff Parsons <parsons@cs.wustl.edu>
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           serializer_op_cs, 
+ACE_RCSID (be_visitor_array,
+           serializer_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -45,13 +45,13 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
 {
   if (this->ctx_->alias ())
     {
-      // We are here because we are visiting base type 
+      // We are here because we are visiting base type
       // of the array node which is itself an
       // array, i.e., this is a case of array of array.
       return this->visit_node (node);
     }
 
-  if (node->cli_stub_serializer_op_gen () 
+  if (node->cli_stub_serializer_op_gen ()
       || node->imported ()
       || node->is_local ())
     {
@@ -137,8 +137,8 @@ be_visitor_array_serializer_op_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 (this->ctx_->tdef ())
@@ -149,22 +149,22 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
     {
       // 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 
+      // to our local name. This needs to be inserted after the parents's
       // name.
 
       if (node->is_nested ())
         {
-          be_decl *parent = 
+          be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            node->full_name ());
         }
     }
@@ -181,7 +181,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
   this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE);
   *os << "size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl
       << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl 
+      <<")" << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (bt->accept (this) == -1)
@@ -199,7 +199,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
   this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
   *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
       << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl 
+      <<")" << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (bt->accept (this) == -1)
@@ -217,7 +217,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node)
   this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE);
   *os << "size_t _dcps_find_size (" << be_idt << be_idt_nl
       << "const " << fname << "_forany &_tao_array" << be_uidt_nl
-      <<")" << be_uidt_nl 
+      <<")" << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (bt->accept (this) == -1)
@@ -302,7 +302,7 @@ be_visitor_array_serializer_op_cs::visit_enum (be_enum *node)
       *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl
           << "return true; // array of enum" << be_uidt_nl;
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
       {
         *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl;
@@ -402,7 +402,7 @@ be_visitor_array_serializer_op_cs::visit_predefined_type (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_serializer_op_cs::"
                          "visit_predefined_type - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     default:
       // All other primitive types. Handle them as shown below.
@@ -441,7 +441,7 @@ be_visitor_array_serializer_op_cs::visit_predefined_type (
 
     // all predefined types are fixed size so
     //      _dcps_find_size() = _dcps_max_marshaled_size
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
       switch (node->pt ())
         {
@@ -737,7 +737,7 @@ be_visitor_array_serializer_op_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_serializer_op_cs::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -812,7 +812,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
               *os << "return _tao_is_bounded_size (tmp);";
             break;
           default:
-            *os << "return _tao_is_bounded_size (*(_tao_array.in ()));"; 
+            *os << "return _tao_is_bounded_size (*(_tao_array.in ()));";
             break;
           }
           *os << be_uidt_nl;
@@ -861,7 +861,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
           default:
             // array size = slice type size * length
             // note: *(_tao_array.in ()) is the array's slice; hence base type
-            *os << "return (_dcps_max_marshaled_size (*(_tao_array.in ()))"; 
+            *os << "return (_dcps_max_marshaled_size (*(_tao_array.in ()))";
             break;
           }
         *os << " * ";
@@ -920,7 +920,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
           else
             {
               // Initialize a boolean variable.
-              *os << "::CORBA::Boolean _tao_marshal_flag = 1;" << be_nl;
+              *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl;
             }
 
     unsigned long ndims = node->n_dims ();
@@ -947,7 +947,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
         if (expr->ev ()->et == AST_Expression::EV_ulong)
           {
             // Generate a loop for each dimension.
-            *os << be_nl << "for ( ::CORBA::ULong i" << i 
+            *os << be_nl << "for ( ::CORBA::ULong i" << i
                 << " = 0; i" << i << " < "
                 << expr->ev ()->u.ulval;
 
@@ -991,7 +991,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
           else
             {
               if (AST_Decl::NT_string == bnt ||
-                  AST_Decl::NT_wstring == bnt ) 
+                  AST_Decl::NT_wstring == bnt )
                 *os << "the_length += _dcps_max_marshaled_size_ulong() + "
                     << "ACE_OS::strlen(_tao_array";
               else
@@ -1002,7 +1002,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
                   *os << "[i" << i << "]";
                 }
               if (AST_Decl::NT_string == bnt ||
-                  AST_Decl::NT_wstring == bnt ) 
+                  AST_Decl::NT_wstring == bnt )
                 *os << ".in()";
 
               *os << ");";
@@ -1100,13 +1100,13 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
             *os << bt->name () << "_forany tmp (tmp_var.inout ());" << be_nl;
             *os << "_tao_marshal_flag = (strm << tmp);";
           }
-        else if (nt == AST_Decl::NT_interface 
+        else if (nt == AST_Decl::NT_interface
                 || nt == AST_Decl::NT_interface_fwd)
           {
             *os << "_tao_marshal_flag = " << be_idt_nl;
 
             if (bt->is_defined ())
-              {    
+              {
                 *os << "_tao_array";
 
                 for (i = 0; i < ndims; ++i)
@@ -1118,8 +1118,8 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
               }
             else
               {
-                
-                AST_Decl *parent = 
+
+                AST_Decl *parent =
                   ScopeAsDecl (bt->defined_in ());
 
                 if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
@@ -1129,7 +1129,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
 
                 *os << "TAO::Objref_Traits<" << bt->name () << ">::"
                     << "tao_marshal (_tao_array";
-                
+
                 for (i = 0; i < ndims; ++i)
                   {
                     *os << "[i" << i << "]";
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 bb8acd5e5fc..2df3027db28 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -255,7 +255,7 @@ be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node)
     {
       return 0;
     }
-    
+
   if (this->create_event_consumer (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -265,16 +265,16 @@ be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node)
                         -1);
     }
 
-  node->ccm_pre_proc_gen (I_TRUE);
+  node->ccm_pre_proc_gen (true);
   return 0;
 }
 
 int
 be_visitor_ccm_pre_proc::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
-  be_eventtype *fd = 
+  be_eventtype *fd =
     be_eventtype::narrow_from_decl (node->full_definition ());
-    
+
   return this->visit_eventtype (fd);
 }
 
@@ -307,7 +307,11 @@ be_visitor_ccm_pre_proc::gen_provides (be_component *node)
       provides_op->set_defined_in (node);
       provides_op->set_imported (node->imported ());
       provides_op->set_name (op_name);
-      node->be_add_operation (provides_op);
+
+      if (0 == node->be_add_operation (provides_op))
+        {
+          return -1;
+        }
     }
 
   return 0;
@@ -325,7 +329,7 @@ be_visitor_ccm_pre_proc::gen_uses (be_component *node)
     {
       iter.next (pd);
 
-      if (pd->is_multiple == I_FALSE)
+      if (pd->is_multiple == false)
         {
           if (this->gen_connect_single (node, pd) == -1)
             {
@@ -509,7 +513,10 @@ be_visitor_ccm_pre_proc::gen_factories (be_home *node,
                             -1);
         }
 
-      xplicit->be_add_operation (*item);
+      if (0 == xplicit->be_add_operation (*item))
+        {
+          return -1;
+        }
     }
 
   return 0;
@@ -543,7 +550,10 @@ be_visitor_ccm_pre_proc::gen_finders (be_home *node,
                             -1);
         }
 
-      xplicit->be_add_operation (*item);
+      if (0 == xplicit->be_add_operation (*item))
+        {
+          return -1;
+        }
     }
 
   return 0;
@@ -651,7 +661,12 @@ be_visitor_ccm_pre_proc::gen_connect_single (
                                   tail),
                  -1);
   op->be_add_exceptions (connect_single);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -688,7 +703,12 @@ be_visitor_ccm_pre_proc::gen_disconnect_single (
                                   0),
                  -1);
   op->be_add_exceptions (disconnect_single);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -718,7 +738,12 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (
                   -1);
   op->set_name (op_full_name);
   op->set_defined_in (node);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -772,7 +797,12 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (
                                   tail),
                  -1);
   op->be_add_exceptions (connect_multiple);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -820,7 +850,12 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (
                                   0),
                  -1);
   op->be_add_exceptions (disconnect_multiple);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -849,7 +884,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (
   UTL_ScopedName connections_name (&connections_id,
                                    0);
   AST_Decl *d = node->lookup_by_name (&connections_name,
-                                      I_TRUE);
+                                      true);
   be_typedef *td = be_typedef::narrow_from_decl (d);
   connections_id.destroy ();
 
@@ -864,7 +899,12 @@ be_visitor_ccm_pre_proc::gen_get_connection_multiple (
   op->set_name (op_full_name);
   op->set_defined_in (node);
   op->set_imported (node->imported ());
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -882,8 +922,8 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
                                 0,
-                                I_FALSE,
-                                I_FALSE),
+                                false,
+                                false),
                   -1);
   push_op->set_defined_in (consumer);
   push_op->set_imported (node->imported ());
@@ -903,7 +943,12 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
                   -1);
   arg_id.destroy ();
   push_op->be_add_argument (arg);
-  consumer->be_add_operation (push_op);
+
+  if (0 == consumer->be_add_operation (push_op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -955,7 +1000,12 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_component *node,
                                   0),
                   -1);
   op->be_add_exceptions (subscribe);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1006,7 +1056,12 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_component *node,
                                   0),
                   -1);
   op->be_add_exceptions (unsubscribe);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1059,7 +1114,12 @@ be_visitor_ccm_pre_proc::gen_emits_connect (
                                   0),
                   -1);
   op->be_add_exceptions (emits_connect);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1102,7 +1162,12 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (
                                   0),
                   -1);
   op->be_add_exceptions (emits_disconnect);
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1139,7 +1204,12 @@ be_visitor_ccm_pre_proc::gen_get_consumer (
   op->set_name (op_name);
   op->set_defined_in (node);
   op->set_imported (node->imported ());
-  node->be_add_operation (op);
+
+  if (0 == node->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1196,7 +1266,12 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node,
   op->be_add_exceptions (exceps);
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
-  implicit->be_add_operation (op);
+
+  if (0 == implicit->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1247,7 +1322,12 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node,
   op->be_add_exceptions (exceps);
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
-  implicit->be_add_operation (op);
+
+  if (0 == implicit->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1298,7 +1378,12 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node,
   op->be_add_exceptions (exceps);
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
-  implicit->be_add_operation (op);
+
+  if (0 == implicit->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1332,7 +1417,12 @@ be_visitor_ccm_pre_proc::gen_get_primary_key (be_home *node,
   op->be_add_argument (arg);
   op->set_defined_in (implicit);
   op->set_imported (node->imported ());
-  implicit->be_add_operation (op);
+
+  if (0 == implicit->be_add_operation (op))
+    {
+      return -1;
+    }
+
   return 0;
 }
 
@@ -1353,7 +1443,7 @@ be_visitor_ccm_pre_proc::lookup_ccmobject (void)
                      &local_name);
   AST_Decl *d =
     idl_global->scopes ().top_non_null ()->lookup_by_name (&sn,
-                                                           I_TRUE);
+                                                           true);
 
   if (d == 0)
     {
@@ -1375,7 +1465,7 @@ be_visitor_ccm_pre_proc::lookup_cookie (be_component *node)
       UTL_ScopedName cookie_name (&this->module_id_,
                                   &local_name);
       AST_Decl *d = node->lookup_by_name (&cookie_name,
-                                          I_TRUE);
+                                          true);
       local_id.destroy ();
 
       if (d == 0)
@@ -1438,7 +1528,7 @@ be_visitor_ccm_pre_proc::lookup_one_exception (be_component *node,
   UTL_ScopedName scoped_name (&this->module_id_,
                               &local_name);
   AST_Decl *d = node->lookup_by_name (&scoped_name,
-                                      I_TRUE);
+                                      true);
   id.destroy ();
 
   if (d == 0)
@@ -1484,17 +1574,17 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
                             0);
   FE_InterfaceHeader header (consumer_name,
                               &parent_list,
-                              I_FALSE,
-                              I_FALSE,
-                              I_TRUE);
+                              false,
+                              false,
+                              true);
   ACE_NEW_RETURN (event_consumer,
                   be_interface (header.name (),
                                 header.inherits (),
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                I_FALSE,
-                                I_FALSE),
+                                false,
+                                false),
                   -1);
   parent_id.destroy ();
 
@@ -1504,7 +1594,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   event_consumer->set_defined_in (s);
   event_consumer->set_imported (node->imported ());
   event_consumer->set_name (consumer_name);
-  
+
   // Set repo id to 0, so it will be recomputed on the next access,
   // and set the prefix to the eventtype's prefix. All this is
   // necessary in case the eventtype's prefix was modified after
@@ -1512,7 +1602,7 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   // derived event consumer interface should have the same prefix.
   event_consumer->repoID (0);
   event_consumer->prefix (const_cast<char*> (node->prefix ()));
-  
+
   be_type::narrow_from_decl (event_consumer)->gen_fwd_helper_name ();
   m->be_add_interface (event_consumer);
   return this->gen_push_op (node,
@@ -1551,9 +1641,9 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node)
   UTL_NameList *parent_list = this->compute_inheritance (node);
   FE_InterfaceHeader header (0,
                              parent_list,
-                             I_FALSE,
-                             I_FALSE,
-                             I_TRUE);
+                             false,
+                             false,
+                             true);
   parent_list->destroy ();
   UTL_ScopedName *explicit_name =
   this->create_scoped_name (0,
@@ -1573,8 +1663,8 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node)
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                I_FALSE,
-                                I_FALSE),
+                                false,
+                                false),
                   0);
 
   // Back to reality.
@@ -1635,9 +1725,9 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
 
   FE_InterfaceHeader header (0,
                              parent_list_ptr,
-                             I_FALSE,
-                             I_FALSE,
-                             I_TRUE);
+                             false,
+                             false,
+                             true);
   parent_id.destroy ();
 
   // We're at global scope here so we need to fool the scope stack
@@ -1652,8 +1742,8 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                I_FALSE,
-                                I_FALSE),
+                                false,
+                                false),
                   0);
 
   // Back to reality.
@@ -1685,9 +1775,9 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                             &tail);
   FE_InterfaceHeader header (0,
                              &parent_list,
-                             I_FALSE,
-                             I_FALSE,
-                             I_TRUE);
+                             false,
+                             false,
+                             true);
 
   // We're at global scope here so we need to fool the scope stack
   // for a minute so the correct repo id can be calculated at
@@ -1701,15 +1791,15 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                I_FALSE,
-                                I_FALSE),
+                                false,
+                                false),
                   0);
 
   // Back to reality.
   idl_global->scopes ().pop ();
-  
+
   // So we can skip typecode generation.
-  retval->home_equiv (I_TRUE);
+  retval->home_equiv (true);
 
   retval->set_name (equiv_name);
   retval->set_defined_in (s);
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index d73a9054403..6841108b42b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -116,8 +116,7 @@ be_visitor_component_ch::visit_component (be_component *node)
       << node->local_name () << "_ptr obj);" << be_nl << be_nl
       << "static " << node->local_name () << "_ptr "
       << "_narrow (" << be_idt << be_idt_nl
-      << "::CORBA::Object_ptr obj" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // This method is defined in the header file to workaround old
@@ -166,8 +165,7 @@ be_visitor_component_ch::visit_component (be_component *node)
 
   *os << be_nl << be_nl
       << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char *type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "const char *type_id" << env_dflts << be_uidt_nl
       << ");" << be_uidt;
 
   // The _interface_repository_id method.
@@ -274,6 +272,6 @@ be_visitor_component_ch::visit_component (be_component *node)
         }
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
index 4458f9f847a..4b485a558af 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
@@ -61,11 +61,11 @@ be_visitor_component_ci::visit_component (be_component *node)
       << "IOP::IOR *ior," << be_nl
       << "TAO_ORB_Core *oc" << be_uidt_nl
       << ")" << be_uidt_nl
-      << ": ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc)" << be_uidt_nl
+      << ": ::CORBA::Object (ior, oc)" << be_uidt_nl
       << "{" << be_nl
       << "}" ;
 
   os->gen_endif ();
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index 0dddeb5100a..4e8cc346e23 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -97,7 +97,7 @@ be_visitor_component_cs::visit_component (be_component *node)
           << "::CORBA::Boolean" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
           << be_idt << be_idt_nl
-          << node->name () << "_ptr p," << be_nl
+          << "const " << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
@@ -124,7 +124,7 @@ be_visitor_component_cs::visit_component (be_component *node)
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::Object_ptr obj = p;" << be_nl
-          << "return CORBA::is_nil (obj);" << be_uidt_nl
+          << "return ::CORBA::is_nil (obj);" << be_uidt_nl
           << "}";
     }
 
@@ -196,7 +196,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       *os << "void" << be_nl
           << node->name () << "::_add_ref (void)" << be_nl
           << "{" << be_idt_nl
-          << "this->ACE_NESTED_CLASS ( ::CORBA, Object)::_add_ref ();"
+          << "this->::CORBA::Object::_add_ref ();"
           << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
@@ -205,8 +205,7 @@ be_visitor_component_cs::visit_component (be_component *node)
   *os << node->full_name () << "_ptr" << be_nl << node->full_name ()
       << "::_narrow (" << be_idt << be_idt_nl
       << "::CORBA::Object_ptr"
-      << " _tao_objref" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << " _tao_objref" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -219,8 +218,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "\"" << node->repoID () << "\"," << be_nl
       << node->flat_client_enclosing_scope ()
       << node->base_proxy_broker_name ()
-      << "_Factory_function_pointer" << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "_Factory_function_pointer" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -230,7 +228,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << bt->nested_type_name (this->ctx_->scope ())
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "if (! CORBA::is_nil (obj))" << be_idt_nl
+      << "if (! ::CORBA::is_nil (obj))" << be_idt_nl
       << "{" << be_idt_nl
       << "obj->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -240,8 +238,7 @@ be_visitor_component_cs::visit_component (be_component *node)
   // The is_a method.
   *os << "::CORBA::Boolean" << be_nl
       << node->full_name () << "::_is_a (" << be_idt << be_idt_nl
-      << "const char *value" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "const char *value" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (" << be_idt << be_idt_nl;
@@ -268,10 +265,9 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a ("
+      << "return this->::CORBA::Object::_is_a ("
       << be_idt << be_idt_nl
-      << "value" << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "value" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
index 5a26b0e29f5..f08209f25a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -161,60 +161,53 @@ be_visitor_component_sh::visit_component (be_component *node)
 
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "const char* logical_type_id" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _is_a method.
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // _this
-  *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
-      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+  *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt
+      << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // _interface_repository_id
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
index 62fd3026576..87eb012138e 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_constant, 
-           constant_ch, 
+ACE_RCSID (be_visitor_constant,
+           constant_ch,
            "$Id$")
 
 
@@ -89,7 +89,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
       *os << " " << node->local_name ();
     }
   // We are nested inside an interface or a valuetype.
-  else 
+  else
     {
       if (snt != AST_Decl::NT_module)
         {
@@ -126,31 +126,22 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
     }
 
   // If this is true, can't generate inline constants.
-  bool forbidden_in_class = (snt != AST_Decl::NT_root 
-                             && snt != AST_Decl::NT_module 
+  bool forbidden_in_class = (snt != AST_Decl::NT_root
+                             && snt != AST_Decl::NT_module
                              && (etype == AST_Expression::EV_string
                                  || etype == AST_Expression::EV_wstring
                                  || etype == AST_Expression::EV_float
                                  || etype == AST_Expression::EV_double
                                  || etype == AST_Expression::EV_longdouble));
 
-  // (JP) Workaround for VC6's broken handling of inline constants
-  // until the day comes when we no longer support it. This won't
-  // work for cross-compiling - hopefully the whole issue will soon
-  // be moot.
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
   if (!node->is_nested ()
-      || (snt == AST_Decl::NT_module && be_global->gen_inline_constants ()))
-#else
-  if (!node->is_nested () 
       || (be_global->gen_inline_constants () && !forbidden_in_class))
-#endif
     {
       *os << " = " << node->constant_value ();
     }
 
   *os << ";";
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index 77cf1e95d81..7323ebf54b6 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -42,37 +42,26 @@ int
 be_visitor_constant_cs::visit_constant (be_constant *node)
 {
 
-  if (node->cli_stub_gen () 
+  if (node->cli_stub_gen ()
       || node->imported ())
     {
       return 0;
     }
-    
+
   AST_Expression::ExprType etype = node->et ();
   AST_Decl::NodeType snt = node->defined_in ()->scope_node_type ();
 
   // If this is true, can't generate inline constants.
-  bool forbidden_in_class = (snt != AST_Decl::NT_root 
-                             && snt != AST_Decl::NT_module 
+  bool forbidden_in_class = (snt != AST_Decl::NT_root
+                             && snt != AST_Decl::NT_module
                              && (etype == AST_Expression::EV_string
                                  || etype == AST_Expression::EV_wstring
                                  || etype == AST_Expression::EV_float
                                  || etype == AST_Expression::EV_double
                                  || etype == AST_Expression::EV_longdouble));
 
-  // (JP) Workaround for VC6's broken handling of inline constants
-  // until the day comes when we no longer support it. This won't
-  // work for cross-compiling - hopefully the whole issue will soon
-  // be moot.
-
-  // Was the constant value already assigned in *C.h?
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-  if (snt == AST_Decl::NT_module
-      && be_global->gen_inline_constants ())
-#else
-  if (!node->is_nested () 
+  if (!node->is_nested ()
       || (be_global->gen_inline_constants () && !forbidden_in_class))
-#endif
     {
       return 0;
     }
@@ -88,7 +77,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
 
       *os << be_nl << be_nl
           << "const ";
-      
+
       if (node->et () == AST_Expression::EV_enum)
         {
           *os << node->enum_full_name ();
@@ -97,13 +86,13 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
         {
           *os << node->exprtype_to_string ();
         }
-       
+
       *os << " "
           << node->name () << " = " << node->constant_value ()
           << ";";
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
index ce5bc752dbe..287f3853b9c 100644
--- a/TAO/TAO_IDL/be/be_visitor_context.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_context.cpp
@@ -42,8 +42,8 @@
 
 #include "be_visitor_context.h"
 
-ACE_RCSID (be, 
-           be_visitor_context, 
+ACE_RCSID (be,
+           be_visitor_context,
            "$Id$")
 
 
@@ -216,24 +216,24 @@ be_visitor_context::attribute (void)
 }
 
 void
-be_visitor_context::exception (idl_bool ib)
+be_visitor_context::exception (bool ib)
 {
   this->exception_ = ib;
 }
 
-idl_bool
+bool
 be_visitor_context::exception (void)
 {
   return this->exception_;
 }
 
 void
-be_visitor_context::comma (idl_bool ib)
+be_visitor_context::comma (bool ib)
 {
   this->comma_ = ib;
 }
 
-idl_bool
+bool
 be_visitor_context::comma (void)
 {
   return this->comma_;
@@ -648,7 +648,7 @@ const char *
 be_visitor_context::non_null_export_macro (void) const
 {
   const char *anyop_export = be_global->anyop_export_macro ();
-  
+
   return (ACE_OS::strcmp (anyop_export, "") == 0
           ? be_global->stub_export_macro ()
           : anyop_export);
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index 91c1fde0c47..4b815165473 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -51,6 +51,8 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // Generate the Any <<= and >>= operators.
   *os << be_nl << be_nl
       << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -58,6 +60,8 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_hdr_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index f35cc47839a..71f18bac4f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -51,6 +51,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -109,6 +111,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   node->cli_stub_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
index 0315d8d709b..395390ba4fd 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
@@ -49,12 +49,16 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // generate the CDR << and >> operators
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, " << node->name () << ");" << be_nl;
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (TAO_InputCDR &, " << node->name () << " &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index 03fe27f85e6..71bf537308b 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -50,6 +50,8 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << "::CORBA::Boolean operator<< (TAO_OutputCDR & strm, "
       << node->name () << " _tao_enumerator)" << be_nl
       << "{" << be_idt_nl
@@ -71,6 +73,8 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
       << "return _tao_success;" << be_uidt_nl
       << "}";
 
-  node->cli_stub_cdr_op_gen (I_TRUE);
+  *os << be_global->core_versioning_end () << be_nl;
+
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
index 0ed02f95883..583b177c659 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
@@ -92,7 +92,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node)
         }
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
index 3bd120f3687..452cfeb3a7a 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
@@ -65,6 +65,6 @@ be_visitor_enum_cs::visit_enum (be_enum *node)
         }
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
index 6410c05b30a..8ee3eab7b30 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
@@ -71,6 +71,6 @@ be_visitor_enum_serializer_op_cs::visit_enum (be_enum *node)
       << "return _tao_result;" << be_uidt_nl
       << "}";
 
-  node->cli_stub_serializer_op_gen (I_TRUE);
+  node->cli_stub_serializer_op_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index 4be883ec90b..3682ee0670d 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -52,6 +52,8 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << be_nl << be_nl
       << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
@@ -62,7 +64,8 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
-
+  *os << be_global->core_versioning_end () << be_nl;
+  
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
     {
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 9dbed0d7913..f432f30d54a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -49,6 +49,8 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   if (!node->is_local ())
     {
       *os << be_nl << be_nl
@@ -66,16 +68,21 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
-          << "ACE_TRY_NEW_ENV" << be_idt_nl
+          << (be_global->use_raw_throw () ? "try" :"ACE_TRY_NEW_ENV")
+          << be_idt_nl
           << "{" << be_idt_nl
-          << "this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);" << be_nl
-          << "ACE_TRY_CHECK;" << be_uidt_nl
+          << "this->value_->_tao_decode (cdr"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          <<  ");" << ace_try_check << be_uidt_nl
           << "}" << be_uidt_nl
-          << "ACE_CATCHANY" << be_idt_nl
+          << (be_global->use_raw_throw ()
+                ? "catch ( ::CORBA::Exception &)"
+                : "ACE_CATCHANY")
+          << be_idt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
-          << "}" << be_uidt_nl
-          << "ACE_ENDTRY;" << be_nl << be_nl
+          << "}" << be_uidt
+          << ace_endtry << be_nl << be_nl
           << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}";
@@ -174,6 +181,8 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
index bea4c76931f..920e14412e7 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
@@ -51,6 +51,8 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_nl << be_nl
       << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
@@ -59,6 +61,7 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node)
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
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 66756dd7705..ce9d86f8d83 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
@@ -59,6 +59,8 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -164,6 +166,8 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
   *os << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_stub_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index dea21701546..0bfdc169d89 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -99,12 +99,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
       << "_tao_duplicate (void) const;\n" << be_nl
       << "virtual void _raise (void) const;\n" << be_nl
       << "virtual void _tao_encode (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
       << ") const;" << be_uidt_nl << be_nl
       << "virtual void _tao_decode (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
       << ");" << be_uidt;
 
   // Generate constructor that takes each member as a parameter. We need a
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
index 676c51401bc..25edecd0bac 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
@@ -54,6 +54,6 @@ int be_visitor_exception_ci::visit_exception (be_exception *node)
                         -1);
     }
 
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 69014b8c6d5..376e6244a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -114,7 +114,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << node->name () << "::operator= (const ::"
       << node->name () << " &_tao_excp)" << be_nl
       << "{" << be_idt_nl
-      << "this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= "
+      << "this->::CORBA::UserException::operator= "
       << "(_tao_excp);";
 
   // Assign each individual member.
@@ -196,8 +196,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   if (!node->is_local ())
     {
-      *os << "TAO_OutputCDR &cdr" << be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      *os << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
           << ") const" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr << *this)" << be_idt_nl
@@ -218,8 +217,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_OutputCDR &" << be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      *os << "TAO_OutputCDR &" << env_decl << be_uidt_nl
           << ") const" << be_uidt_nl
           << "{" << be_idt_nl;
 
@@ -240,8 +238,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   if (!node->is_local ())
     {
-      *os << "TAO_InputCDR &cdr" << be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      *os << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr >> *this)" << be_idt_nl
@@ -262,8 +259,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_InputCDR &" << be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      *os << "TAO_InputCDR &" << env_decl << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl;
 
@@ -360,6 +356,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
         }
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
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 af2c94920ab..c515722ae14 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -22,8 +22,8 @@
 #include "be_visitor_sequence/sequence_ch.h"
 #include "nr_extern.h"
 
-ACE_RCSID (be_visitor_field, 
-           field_ch, 
+ACE_RCSID (be_visitor_field,
+           field_ch,
            "$Id$")
 
 // **********************************************
@@ -281,12 +281,12 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
     {
       bt = node;
     }
-  
+
   // If we are a typedef of a basic type, ACE_NESTED_CLASS might
   // be emitted as part of the type name, in which case the '::'
-  // would be incorrect for certain expansions of the macro. 
+  // would be incorrect for certain expansions of the macro.
   if (td == 0)
-    {  
+    {
       *os << "::";
     }
 
@@ -362,7 +362,7 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
     {
       // Put the field node into the (anonymous) sequence node, to be
       // used later for unique name generation.
-      be_field *member_node = 
+      be_field *member_node =
         be_field::narrow_from_decl (this->ctx_->node ());
       node->field_node (member_node);
 
@@ -430,11 +430,11 @@ be_visitor_field_ch::visit_string (be_string *node)
 
   if (node->width () == (long) sizeof (char))
     {
-      *os << "TAO_String_Manager";
+      *os << "TAO::String_Manager";
     }
   else
     {
-      *os << "TAO_WString_Manager";
+      *os << "TAO::WString_Manager";
     }
 
   return 0;
@@ -603,5 +603,3 @@ be_visitor_field_ch::visit_eventtype_fwd (
 {
   return this->visit_valuetype_fwd (node);
 }
-
-
diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp
index 3ef51b8fe8e..b3c720138a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_home.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home.cpp
@@ -26,6 +26,7 @@
 #include "be_visitor_context.h"
 #include "be_helper.h"
 #include "be_extern.h"
+#include "ace/Log_Msg.h"
 
 #include "be_visitor_home/home_ch.cpp"
 #include "be_visitor_home/home_cs.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
index 4b5a5d8d1ac..cbe0a71da1e 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
@@ -75,6 +75,6 @@ be_visitor_home_ch::visit_home (be_home *node)
           }
       }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
index 61552720cba..d57f034cc09 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
@@ -59,6 +59,6 @@ be_visitor_home_cs::visit_home (be_home *node)
           }
       }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 94e476b2a82..2e7e3ff277f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -51,6 +51,7 @@
 #include "be_visitor_operation.h"
 #include "be_visitor_typecode.h"
 #include "be_visitor_context.h"
+#include "ace/Auto_Ptr.h"
 
 #include "be_visitor_interface/interface.cpp"
 #include "be_visitor_interface/interface_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index 94b5bb12b7d..560bb8e72ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -98,6 +98,6 @@ be_visitor_amh_interface_ch::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index f62b5150a47..19e7340f37c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -121,8 +121,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "virtual ~" << class_name.c_str () << " (void);\n\n"
       << be_nl
       << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "const char* logical_type_id" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 //   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
@@ -133,47 +132,41 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -384,7 +377,10 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 
   // After having generated the operation we insert it into the
   // AMH node interface.
-  amh_node->be_add_operation (operation);
+  if (0 == amh_node->be_add_operation (operation))
+    {
+      return -1;
+    }
 
   return 0;
 }
@@ -431,7 +427,7 @@ be_visitor_amh_interface_sh::this_method (be_interface *node)
   // interfaces is "special", because the returned type is not exactly
   // the type of the class, but the original class that "implied" the
   // AMH one.
-  *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl
-      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+  *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt
+      << env_dflts << be_uidt_nl
       << ");\n" << be_uidt;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
index 5bbea728b19..10118851bcf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -135,8 +135,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "TAO_ServerRequest & req," << be_nl
                   << "void * context," << be_nl
-                  << "void * obj" << be_nl
-                  << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                  << "void * obj" << env_decl << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
               *os << ancestor_amh_name
@@ -148,8 +147,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << be_nl
-                  << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                  << "impl" << env_arg << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
             }
@@ -173,8 +171,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "TAO_ServerRequest & req," << be_nl
                   << "void * context," << be_nl
-                  << "void * obj" << be_nl
-                  << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                  << "void * obj" << env_decl << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
 
@@ -188,8 +185,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << be_nl
-                  << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                  << "impl" << env_arg << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
 
@@ -207,8 +203,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest & req," << be_nl
                       << "void * context," << be_nl
-                      << "void * obj" << be_nl
-                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+                      << "void * obj" << env_decl << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -222,8 +217,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "req," << be_nl
                       << "context," << be_nl
-                      << "impl" << be_nl
-                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "impl" << env_arg << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index d7b6ef96b1d..3760418d94b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -71,11 +71,13 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
-      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "::_this ("
+      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
       << "{" << be_idt_nl
-      << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
-      << be_nl
-      << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
+      << "TAO_Stub *stub = this->_create_stub ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << TAO_ACE_CHECK ("0") << be_nl << be_nl;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
       << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
@@ -128,15 +130,13 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
   *os << "void" << be_nl
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * context" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * context" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl
       << "req," << be_nl
       << "context," << be_nl
-      << "this" << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "this" << env_arg << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}";
 }
@@ -148,7 +148,6 @@ be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os)
       << "server_request.tao_send_reply ();";
 }
 
-
 int
 be_visitor_amh_interface_ss::generate_amh_classes (be_interface *)
 {
@@ -244,8 +243,8 @@ emit (be_interface *derived,
       be_decl *scope;
       scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
 
-      *os << "ACE_NESTED_CLASS (POA_" << scope->name () << ", AMH_"
-          << base->local_name () << ") (rhs)";
+      *os << "POA_" << scope->name () << "::AMH_"
+          << base->local_name () << " (rhs)";
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 21681f94492..e87982b4447 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -92,6 +92,8 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -99,6 +101,8 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_ptr &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
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 9bcbcba0496..87e0899c0b2 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
@@ -53,6 +53,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
   // All template specializations must be generated before the instantiations
   // in the operators.
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   if (! node->is_abstract ())
     {
       *os << be_nl << be_nl
@@ -121,6 +123,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "}";
     }
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
 
@@ -196,6 +199,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       *os << "#else\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << be_nl << be_nl
       << "// Copying insertion." << be_nl
       << "void" << be_nl
@@ -241,6 +246,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index f006fb845da..916f4cb041d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-ACE_RCSID (be_visitor_interface, 
-           base_proxy_broker_ch, 
+ACE_RCSID (be_visitor_interface,
+           base_proxy_broker_ch,
            "$Id$")
 
 be_visitor_interface_base_proxy_broker_ch::
@@ -26,7 +26,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << be_nl
-      << "///////////////////////////////////////////////////////////////////////" 
+      << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//                 Base Proxy Broker Declaration " << be_nl
       << "//" << be_nl << be_nl;
@@ -50,8 +50,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+  *os << node->local_name () << " *object" << env_dflts << be_uidt_nl
       << ") = 0;"
       << be_uidt_nl  // idt = 1
       << be_uidt_nl; // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index 845866a7568..7f580e93811 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           cdr_op_ch, 
+ACE_RCSID (be_visitor_interface,
+           cdr_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -42,7 +42,7 @@ int
 be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 {
   // No CDR operations for locality constraint interfaces.
-  if (node->cli_hdr_cdr_op_gen () 
+  if (node->cli_hdr_cdr_op_gen ()
       || node->imported ()
       || node->is_local ())
     {
@@ -52,7 +52,9 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+
+  *os << be_global->core_versioning_begin () << be_nl;
 
   // Generate the CDR << and >> operator declarations.
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean "
@@ -60,7 +62,9 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
       << "_ptr );" << be_nl;
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean "
       << "operator>> (TAO_InputCDR &, "
-      << node->full_name () << "_ptr &);";
+      << node->full_name () << "_ptr &);" << be_nl;
+
+  *os << be_global->core_versioning_end () << be_nl;
 
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
@@ -70,7 +74,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cdr_op_ch::"
                          "visit_interface - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
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 d115c4671c6..468e5c56e06 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
@@ -60,7 +60,9 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+
+  *os << be_global->core_versioning_begin () << be_nl;
 
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
@@ -137,8 +139,10 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "_Factory_function_pointer" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
-  *os << "return 1;" << be_uidt_nl
-      << "}";
+  *os << "return true;" << be_uidt_nl
+      << "}" << be_nl;
+
+  *os << be_global->core_versioning_end () << be_nl;
 
   node->cli_stub_cdr_op_gen (1);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index b5cb1aa8d6b..eb7c5cda9d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -40,7 +40,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
   *os << "class " << be_global->skel_export_macro ()
       << " " << node->direct_proxy_impl_name ();
 
-  idl_bool first_concrete = I_TRUE;
+  bool first_concrete = true;
 
   if (node->n_inherits () > 0)
     {
@@ -60,17 +60,17 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
 
           if (first_concrete)
             {
-              *os << be_nl 
+              *os << be_nl
                   << "  : " << be_idt << be_idt;
             }
           else
             {
-	            *os << "," << be_nl;
+              *os << "," << be_nl;
             }
 
-          first_concrete = I_FALSE;
+          first_concrete = false;
 
-          *os << "public virtual ::" 
+          *os << "public virtual ::"
               << inherited->full_direct_proxy_impl_name ();
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index b1148857606..dc72c8a0ead 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -110,7 +110,7 @@ be_visitor_interface::visit_scope (be_scope *node)
   int status =
     intf->traverse_inheritance_graph (helper,
                                       this->ctx_->stream (),
-                                      I_FALSE);
+                                      false);
 
   if (status == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 959a01e914c..6c26766524a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -213,15 +213,15 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       *os << "// These two are inherited from SessionComponent."
           << be_nl << be_nl
-          << "virtual void ciao_preactivate (" << be_idt << be_idt_nl
-          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "virtual void ciao_preactivate (" << be_idt << be_idt
+          << env_sngl_dflts << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC ((" << be_idt_nl
           << "::CORBA::SystemException," << be_nl
           << "::Components::CCMException" << be_uidt_nl
           << "));" << be_uidt_nl << be_nl
-          << "virtual void ciao_postactivate (" << be_idt << be_idt_nl
-          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "virtual void ciao_postactivate (" << be_idt << be_idt
+          << env_sngl_dflts << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC ((" << be_idt_nl
           << "::CORBA::SystemException," << be_nl
@@ -238,8 +238,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // The _is_a method
   *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char *type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "const char *type_id" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // The _interface_repository_id method.
@@ -386,7 +385,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
 
@@ -452,14 +451,14 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar,
 
   if (node->is_abstract ())
     {
-      *os << "::CORBA::AbstractBase_ptr obj" << be_nl;
+      *os << "::CORBA::AbstractBase_ptr obj";
     }
   else
     {
-      *os << "::CORBA::Object_ptr obj" << be_nl;
+      *os << "::CORBA::Object_ptr obj";
     }
 
-  *os << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+  *os << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   return true;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 4f95cccade4..5f81239c45a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -54,7 +54,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
   // Nothing to generate for a local interface except from it scope.
   if (node->is_local ())
     {
-      node->cli_inline_gen (I_TRUE);
+      node->cli_inline_gen (true);
       return 0;
     }
 
@@ -82,7 +82,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
       *os << "ACE_INLINE" << be_nl
           << node->name () << "::" << node->local_name ()
           << " (const " << node->local_name () << " &rhs)" << be_idt_nl
-          << ": ACE_NESTED_CLASS ( ::CORBA, AbstractBase) (rhs)" << be_uidt_nl
+          << ": ::CORBA::AbstractBase (rhs)" << be_uidt_nl
           << "{}";
     }
 
@@ -99,14 +99,14 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
           << "IOP::IOR *ior," << be_nl
           << "TAO_ORB_Core *oc" << be_uidt_nl
           << ")" << be_nl;
-      *os << ": ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc)," << be_idt_nl
-          << "the"<< node->base_proxy_broker_name () << "_ (0)" 
+      *os << ": ::CORBA::Object (ior, oc)," << be_idt_nl
+          << "the"<< node->base_proxy_broker_name () << "_ (0)"
           << be_uidt << be_uidt_nl
           << "{" << be_nl
           << "}" ;
     }
 
   os->gen_endif ();
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 1609e409b05..194d1359c97 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -81,7 +81,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << "CORBA::release (p);" << be_uidt_nl
+          << "::CORBA::release (p);" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -96,7 +96,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "::CORBA::Boolean" << be_nl
           << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
           << be_idt << be_idt_nl
-          << node->name () << "_ptr p," << be_nl
+          << "const " << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
@@ -124,7 +124,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::AbstractBase_ptr abs = p;" << be_nl
-          << "CORBA::release (abs);" << be_uidt_nl
+          << "::CORBA::release (abs);" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -134,7 +134,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::Object_ptr obj = p;" << be_nl
-          << "return CORBA::is_nil (obj);" << be_uidt_nl
+          << "return ::CORBA::is_nil (obj);" << be_uidt_nl
           << "}";
     }
 
@@ -271,7 +271,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl
           << "static_cast<"
           << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
-          << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
+          << "::CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
@@ -280,7 +280,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "void" << be_nl
           << node->name () << "::_add_ref (void)" << be_nl
           << "{" << be_idt_nl
-          << "this->ACE_NESTED_CLASS ( ::CORBA, Object)::_add_ref ();"
+          << "this->::CORBA::Object::_add_ref ();"
           << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
@@ -315,7 +315,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << bt->local_name ()
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "if (! CORBA::is_nil (obj))" << be_idt_nl
+      << "if (! ::CORBA::is_nil (obj))" << be_idt_nl
       << "{" << be_idt_nl
       << "obj->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -328,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << bt->local_name ()
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "CORBA::release (obj);" << be_uidt_nl
+      << "::CORBA::release (obj);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
 
@@ -339,8 +339,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << be_nl << be_nl
           << "void" << be_nl
           << node->full_name () << "::ciao_preactivate ("
-          << be_idt << be_idt_nl
-          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
           << ")" << be_uidt_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
           << "                 ::Components::CCMException))" << be_uidt_nl
@@ -348,8 +348,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "}" << be_nl << be_nl
           << "void" << be_nl
           << node->full_name () << "::ciao_postactivate ("
-          << be_idt << be_idt_nl
-          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
           << ")" << be_uidt_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
           << "                 ::Components::CCMException))" << be_uidt_nl
@@ -359,12 +359,16 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << "::CORBA::Boolean" << be_nl
       << node->full_name () << "::_is_a (" << be_idt << be_idt_nl
-      << "const char *value" << be_nl;
+      << "const char *value";
 
   if (node->is_local () || node->is_abstract ())
-    *os << "ACE_ENV_ARG_DECL_NOT_USED";
+    {
+      *os << env_not;
+    }
   else
-    *os << "ACE_ENV_ARG_DECL";
+    {
+      *os << env_decl;
+    }
 
   *os << be_uidt_nl << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -428,10 +432,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
   else
     {
-      *os << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a ("
+      *os << "return this->::CORBA::Object::_is_a ("
           << be_idt << be_idt_nl
-          << "value" << be_nl
-          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+          << "value" << env_arg << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
 
@@ -524,9 +527,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
       *os << "::CORBA::Object_ptr";
     }
 
-  *os << " _tao_objref" << be_nl
-      << "ACE_ENV_ARG_DECL"
-      << (node->is_local () ? "_NOT_USED" : "")
+  *os << " _tao_objref"
+      << (node->is_local () ? env_not : env_decl)
       << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
@@ -554,8 +556,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "\"" << node->repoID () << "\"," << be_nl
           << node->flat_client_enclosing_scope ()
           << node->base_proxy_broker_name ()
-          << "_Factory_function_pointer" << be_nl
-          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+          << "_Factory_function_pointer" << env_arg << be_uidt_nl
           << ");" << be_uidt << be_nl
           << "return TAO_" << node->flat_name ()
           << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);"
@@ -582,8 +583,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "\"" << node->repoID () << "\"," << be_nl
           << node->flat_client_enclosing_scope ()
           << node->base_proxy_broker_name ()
-          << "_Factory_function_pointer" << be_nl
-          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+          << "_Factory_function_pointer" << env_arg << be_uidt_nl
           << ");" << be_uidt << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index fa25566ca54..a7579c1a921 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -20,8 +20,8 @@
 // Interface visitor for implementation skeletons.
 // ************************************************************
 
-ACE_RCSID (be_visitor_interface, 
-           interface_is, 
+ACE_RCSID (be_visitor_interface,
+           interface_is,
            "$Id$")
 
 be_visitor_interface_is::be_visitor_interface_is (be_visitor_context *ctx)
@@ -88,7 +88,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
           << be_global->impl_class_suffix () << "& rhs)" << be_idt_nl
           << ": TAO_Abstract_ServantBase (rhs)," << be_nl
           << "  TAO_ServantBase (rhs)";
-          
+
       if (node->traverse_inheritance_graph (be_interface::copy_ctor_helper,
                                             os)
            == -1)
@@ -108,8 +108,8 @@ be_visitor_interface_is::visit_interface (be_interface *node)
               be_decl *scope;
               scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-              *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ", "
-                  << node->local_name () << ") (rhs)";
+              *os << "  POA_" << scope->name () << "::"
+                  << node->local_name () << " (rhs)";
             }
           else
             {
@@ -150,7 +150,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
 
   int status =
     node->traverse_inheritance_graph (
-              be_visitor_interface_is::method_helper, 
+              be_visitor_interface_is::method_helper,
               os
             );
 
@@ -186,7 +186,7 @@ be_visitor_interface_is::method_helper (be_interface *derived,
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_interface_is::"
-                             "method_helper\n"), 
+                             "method_helper\n"),
                             -1);
         }
 
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 8af48e1e422..1e5817b65ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -84,31 +84,27 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the skeleton class name.
-  *os << "class " << class_name.c_str () << ";" << be_nl;
+  *os << be_nl << be_nl
+      << "class " << class_name.c_str () << ";" << be_nl;
 
   // Generate the _ptr declaration.
   *os << "typedef " << class_name.c_str () << " *" << class_name.c_str ()
-      << "_ptr;" << be_nl << be_nl;
+      << "_ptr;";
 
 
   if (be_global->gen_direct_collocation ())
     {
-      *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
+      *os << be_nl << be_nl
+          << "class " << node->direct_proxy_impl_name () << ";" << be_nl
+          << "class " << node->strategized_proxy_broker_name () << ";";
     }
 
-  if (be_global->gen_direct_collocation ())
-    {
-      *os << "class " << node->strategized_proxy_broker_name ()
-          << ";" << be_nl;
-    }
-
-  *os << be_nl;
-
   // Now generate the class definition.
-  *os << "class " << be_global->skel_export_macro ()
+  *os << be_nl << be_nl
+      << "class " << be_global->skel_export_macro ()
       << " " << class_name.c_str () << be_idt_nl << ": " << be_idt;
 
   long n_parents = node->n_inherits ();
@@ -169,8 +165,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
           << be_nl
           << "virtual ::CORBA::Boolean ciao_is_substitutable ("
           << be_idt << be_idt_nl
-          << "const char *event_repo_id" << be_nl
-          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "const char *event_repo_id" << env_dflts << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException));"
           << be_uidt_nl << be_nl;
@@ -178,56 +173,49 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "const char* logical_type_id" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _is_a method.
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _repository_id method.
   *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -392,7 +380,7 @@ be_visitor_interface_sh::this_method (be_interface *node)
 
   // Print out the _this() method.
   *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
-      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << env_dflts << be_uidt_nl
       << ");" << be_uidt << be_nl;
 }
 
@@ -400,7 +388,7 @@ int
 be_visitor_interface_sh::generate_amh_classes (be_interface *node)
 {
   // We have to check for any abstract ancestor until AMH is integrated
-  // with abstract interfaces. If the node itself is abstract, this 
+  // with abstract interfaces. If the node itself is abstract, this
   // visitor would not be created.
   if (be_global->gen_amh_classes () && !node->has_mixed_parentage ())
   {
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 8c9c767d55c..1a4cecb0056 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -204,14 +204,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   is_a_upcall_command_name.c_str ());
 
-    *os << "void " << full_skel_name
+    *os << be_nl << be_nl
+        << "void " << full_skel_name
         << "::_is_a_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_nl
-        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt_nl;
+    *os << "{" << be_idt;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -276,13 +276,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
-        << "ACE_CHECK;" << be_nl;
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
+        << "}";
   }
 
   // Generate code for the _non_existent skeleton.
@@ -308,14 +309,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   non_exist_upcall_command_name.c_str ());
 
-    *os << "void " << full_skel_name
+    *os << be_nl << be_nl
+        << "void " << full_skel_name
         << "::_non_existent_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_nl
-        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt_nl;
+    *os << "{" << be_idt;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -379,14 +380,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
-        << "ACE_CHECK;" << be_nl;
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
-
+        << "}";
   }
 
   // Generate code for the _repository_id skeleton.
@@ -416,14 +417,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   repository_id_upcall_command_name.c_str ());
 
-    *os << "void " << full_skel_name
+    *os << be_nl << be_nl
+        << "void " << full_skel_name
         << "::_repository_id_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_nl
-        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt_nl;
+    *os << "{" << be_idt;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -487,26 +488,25 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
-        << "ACE_CHECK;" << be_nl;
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK ();
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
-
+        << "}";
   }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_nl << be_nl
       << "void " << full_skel_name
       << "::_interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & server_request, " << be_nl
       << "void * /* servant_upcall */," << be_nl
-      << "void * servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
@@ -516,8 +516,10 @@ 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
-      << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1," << be_nl
-      << "                                  ::CORBA::COMPLETED_NO));" << be_uidt_nl
+      << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,"
+      << be_nl
+      << "                                  ::CORBA::COMPLETED_NO));"
+      << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
   // Get the right object implementation.
@@ -527,9 +529,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << be_uidt_nl;
 
   *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl
-      << "impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);"
-      << be_uidt_nl
-      << "ACE_CHECK;" << be_nl << be_nl
+      << "impl->_get_interface ("
+      << (be_global->use_raw_throw ()
+            ? ""
+            : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK () << be_nl << be_nl
       << "server_request.init_reply ();" << be_nl
       << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
       << be_nl << be_nl
@@ -548,7 +553,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   this->generate_send_reply (os);
 
   *os << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}";
 
 
   // Generate code for the _component skeleton.
@@ -576,15 +581,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   get_component_upcall_command_name.c_str());
 
-    *os << "void " << full_skel_name
+    *os << be_nl << be_nl
+        << "void " << full_skel_name
         << "::_component_skel (" << be_idt << be_idt_nl
         << "TAO_ServerRequest & server_request, " << be_nl
         << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_nl
-        << "ACE_ENV_ARG_DECL" << be_uidt_nl
+        << "void * servant" << env_decl << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt_nl;
-
+    *os << "{" << be_idt;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -647,19 +651,18 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
-        << "ACE_CHECK;" << be_nl;
-
-    *os << be_uidt_nl
-        << "}" << be_nl << be_nl;
+        << "                       "
+        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+        << ");" << TAO_ACE_CHECK () << be_uidt_nl
+        << "}";
   }
 
   // Generate code for the _is_a override.
 
-  *os << "::CORBA::Boolean " << full_skel_name
+  *os << be_nl << be_nl
+      << "::CORBA::Boolean " << full_skel_name
       << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* value" << be_nl
-      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+      << "const char* value" << env_not << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
@@ -704,8 +707,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       *os << be_nl << be_nl
           << "::CORBA::Boolean " << full_skel_name
           << "::ciao_is_substitutable (" << be_idt << be_idt_nl
-          << "const char * /* event_repo_id */" << be_nl
-          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "const char * /* event_repo_id */" << env_not << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
           << "{" << be_idt_nl
@@ -815,11 +817,14 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // the _this () operation.
   *os << node->full_name () << " *" << be_nl
       << node->full_skel_name ()
-      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "::_this ("
+      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
       << "{" << be_idt_nl
-      << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
-      << be_nl
-      << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
+      << "TAO_Stub *stub = this->_create_stub ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");"
+      << TAO_ACE_CHECK ("0") << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
   *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();"
@@ -864,14 +869,15 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
   *os << "void " << node->full_skel_name ()
       << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant_upcall" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "this->synchronous_upcall_dispatch (req," << be_nl
       << "                                   servant_upcall," << be_nl
       << "                                   this" << be_nl
-      << "                                   ACE_ENV_ARG_PARAMETER);"
+      << "                                   "
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+      << ");"
       << be_uidt_nl;
   *os << "}";
 }
@@ -880,7 +886,7 @@ int
 be_visitor_interface_ss::generate_amh_classes (be_interface *node)
 {
   // We have to check for any abstract ancestor until AMH is integrated
-  // with abstract interfaces. If the node itself is abstract, this 
+  // with abstract interfaces. If the node itself is abstract, this
   // visitor would not be created.
   if (be_global->gen_amh_classes () && !node->has_mixed_parentage ())
     {
@@ -988,7 +994,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
           << node->flat_client_enclosing_scope ()
           << node->base_proxy_broker_name ()
           << "_Factory_Initializer)" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl << be_nl;
+          << ");" << be_uidt << be_uidt;
     }
 
   if (be_global->gen_direct_collocation ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index f0f00ab4c50..12c8f672665 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -31,7 +31,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (
   os->indent ();
 
   *os << be_nl
-      << "///////////////////////////////////////////////////////////////////////" 
+      << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//                 Remote Proxy Broker Declaration " << be_nl
       << "//" << be_nl << be_nl;
@@ -54,12 +54,11 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (
       << be_nl << be_nl;
 
   // Accessor Method
-  *os << "virtual " << node->base_proxy_impl_name () << " &" 
+  *os << "virtual " << node->base_proxy_impl_name () << " &"
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+  *os << node->local_name () << " *object" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
   *os << "private:" << be_idt_nl
@@ -71,7 +70,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (
   // Factory Member Function declaration.
   *os << "// This member function is used to get an handle to the "
       << "unique instance" << be_nl
-      << "// of the Remote Proxy Broker that is available for a given" 
+      << "// of the Remote Proxy Broker that is available for a given"
       << be_nl
       << "// interface." << be_nl
       << "static " << node->remote_proxy_broker_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 4399b3509d1..30d5a00dd13 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -2,8 +2,8 @@
 // $Id$
 //
 
-ACE_RCSID (be_visitor_interface, 
-           remote_proxy_broker_cs, 
+ACE_RCSID (be_visitor_interface,
+           remote_proxy_broker_cs,
            "$Id$")
 
 be_visitor_interface_remote_proxy_broker_cs::
@@ -34,7 +34,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (
   os->indent ();
 
   *os << be_nl
-      << "///////////////////////////////////////////////////////////////////////" 
+      << "///////////////////////////////////////////////////////////////////////"
       << be_nl
       << "//           Remote & Base  Proxy Broker Implementation" << be_nl
       << "//" << be_nl << be_nl;
@@ -84,9 +84,9 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (
   *os << node->full_base_proxy_impl_name () << "&" << be_nl
       <<node->full_remote_proxy_broker_name () << "::"
       << "select_proxy (" << be_idt << be_idt_nl
-      << "::" << node->full_name () << " *" << be_nl
-      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")"
-      << be_uidt_nl << "{" << be_idt_nl // idt = 1
+      << "::" << node->full_name () << " *" << env_not << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl // idt = 1
       << "return this->remote_proxy_impl_;"
       << be_uidt_nl << "}";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index 8d4031086ae..c55d08b839e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           smart_proxy_ch, 
+ACE_RCSID (be_visitor_interface,
+           smart_proxy_ch,
            "$Id$")
 
 
@@ -75,8 +75,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "virtual "<< node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
       << node->local_name ()
-      << "_ptr proxy" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "_ptr proxy" << env_dflts << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "};\n\n";
 
@@ -89,16 +88,14 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl
       << "void register_proxy_factory (" << be_idt << be_idt_nl
       << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
-      << "int one_shot_factory = 1" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "int one_shot_factory = 1" << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
-      << "void unregister_proxy_factory (" << be_idt << be_idt_nl
-      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "void unregister_proxy_factory (" << be_idt << be_idt
+      << env_dflts << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
       << node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
-      << node->local_name () << "_ptr proxy" << be_nl
-      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << node->local_name () << "_ptr proxy" << env_dflts << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "protected:" << be_idt_nl
       << "TAO_" << node->flat_name ()
@@ -160,11 +157,11 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
 
   *os << "{" << be_nl
       << "public:" << be_idt_nl
-      << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" 
+      << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);"
       << be_nl
       // Just to keep Old g++ complier (version: 2.7.2.3) happy it's
       // necesssary to declare and define the destructor explicitly.
-      << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" 
+      << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);"
       << be_nl
       // This method will delegate this method to the <base_proxy_>
       // member of the smart proxy and so the smart proxy's (nil)
@@ -185,7 +182,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_ch::"
                          "visit_interface - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index f2b65b7f3d3..4c4c41b8013 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -97,8 +97,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy" << be_nl
-          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "_ptr proxy" << env_not << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return proxy;" << be_uidt_nl
@@ -158,8 +157,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt << be_idt_nl
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory *df," << be_nl
-          << "int one_shot_factory" << be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+          << "int one_shot_factory" << env_decl << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
@@ -169,9 +167,13 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "this->lock_" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << ");" <<be_uidt_nl << be_nl
-          << "// Remove any existing <proxy_factory_> and replace with the new one." << be_nl
-          << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl
-          << "ACE_CHECK;" << be_nl
+          << "// Remove any existing <proxy_factory_> and "
+          << "replace with the new one." << be_nl
+          << "this->unregister_proxy_factory ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_nl
           << "this->proxy_factory_ = df;" << be_nl
           << "this->one_shot_factory_ = one_shot_factory;" << be_uidt_nl
           << "}\n\n";
@@ -186,8 +188,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::unregister_proxy_factory ("
-          << be_idt << be_idt_nl
-          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
+          << be_idt << be_idt
+          << env_sngl_not << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
@@ -222,8 +224,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy" << be_nl
-          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "_ptr proxy" << env_not << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
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 8a446d8eda1..baf3709e1b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -53,8 +53,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
   *os << be_nl << be_nl
       << "TAO::Collocation_Strategy" << be_nl
       << "get_strategy (" << be_idt << be_idt_nl
-      << "::CORBA::Object_ptr obj" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt;
 
@@ -67,13 +66,12 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
       << "int num_args," << be_nl
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
-      << "TAO::Collocation_Strategy strategy" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::Exception));";
 
   *os << be_uidt_nl << be_nl
-      << "static " << node->strategized_proxy_broker_name () 
+      << "static " << node->strategized_proxy_broker_name ()
       << " *" << be_nl
       << "the" << node->strategized_proxy_broker_name ()
       << " (void);" << be_uidt_nl;
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 4a2479fa48d..80ce04b3f3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -65,17 +65,18 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
 
   // get_strategy() impementation.
   *os << "TAO::Collocation_Strategy" << be_nl
-      <<node->full_strategized_proxy_broker_name () << "::"
+      << node->full_strategized_proxy_broker_name () << "::"
       << "get_strategy (" << be_idt << be_idt_nl
-      << "::CORBA::Object_ptr obj" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Collocation_Strategy strategy =" << be_idt_nl
-      << "TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);"
-      << be_uidt_nl
-      << "ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);" << be_nl << be_nl
+      << "TAO_ORB_Core::collocation_strategy (obj"
+      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK ("TAO::TAO_CS_REMOTE_STRATEGY")
+      << be_nl << be_nl
       << "return strategy;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -89,21 +90,20 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "int num_args," << be_nl
       << "const char * op," << be_nl
       << "size_t op_len," << be_nl
-      << "TAO::Collocation_Strategy strategy" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::Exception))" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;" << be_nl
       << "collocation_upcall_wrapper.upcall (" << be_idt_nl
-      << "obj, " << be_nl
-      << "forward_obj, " << be_nl
-      << "args, " << be_nl
-      << "num_args, " << be_nl
-      << "op, " << be_nl
-      << "op_len, " << be_nl
-      << "strategy " << be_nl
-      << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl
+      << "obj," << be_nl
+      << "forward_obj," << be_nl
+      << "args," << be_nl
+      << "num_args," << be_nl
+      << "op," << be_nl
+      << "op_len," << be_nl
+      << "strategy" << env_arg
+      << ");" << be_uidt << be_uidt_nl
       << "}";
 
   *os << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index aecd1107492..d5d3c41885a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           tie_sh, 
+ACE_RCSID (be_visitor_interface,
+           tie_sh,
            "$Id$")
 
 // ************************************************************
@@ -91,37 +91,37 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
   *os << "class " << " " << tiename << " : public " << namebuf << be_nl;
   *os << "{" << be_nl
       << "public:" << be_idt_nl
+      << "/// the T& ctor" << be_nl
       << tiename << " (T &t);" << be_nl
-      << "// the T& ctor" << be_nl
+      << "/// ctor taking a POA" << be_nl
       << tiename << " (T &t, PortableServer::POA_ptr poa);" << be_nl
-      << "// ctor taking a POA" << be_nl
-      << tiename << " (T *tp, ::CORBA::Boolean release = 1);" << be_nl
-      << "// ctor taking pointer and an ownership flag" << be_nl
+      << "/// ctor taking pointer and an ownership flag" << be_nl
+      << tiename << " (T *tp, ::CORBA::Boolean release = true);" << be_nl
+      << "/// ctor with T*, ownership flag and a POA" << be_nl
       << tiename << " (" << be_idt << be_idt_nl
       << "T *tp," << be_nl
       << "PortableServer::POA_ptr poa," << be_nl
-      << "::CORBA::Boolean release = 1" << be_uidt_nl
+      << "::CORBA::Boolean release = true" << be_uidt_nl
       << ");" << be_uidt_nl
-      << "// ctor with T*, ownership flag and a POA" << be_nl
+      << "/// dtor" << be_nl << be_nl
       << "~" << tiename << " (void);" << be_nl
-      << "// dtor" << be_nl << be_nl
       << "// TIE specific functions" << be_nl
+      << "/// return the underlying object" << be_nl
       << "T *_tied_object (void);" << be_nl
-      << "// return the underlying object" << be_nl
+      << "/// set the underlying object" << be_nl
       << "void _tied_object (T &obj);" << be_nl
-      << "// set the underlying object" << be_nl
-      << "void _tied_object (T *obj, ::CORBA::Boolean release = 1);" << be_nl
-      << "// set the underlying object and the ownership flag" << be_nl
+      << "/// set the underlying object and the ownership flag" << be_nl
+      << "void _tied_object (T *obj, ::CORBA::Boolean release = true);" << be_nl
+      << "/// do we own it" << be_nl
       << "::CORBA::Boolean _is_owner (void);" << be_nl
-      << "// do we own it" << be_nl
+      << "/// set the ownership" << be_nl << be_nl
       << "void _is_owner ( ::CORBA::Boolean b);" << be_nl
-      << "// set the ownership" << be_nl << be_nl
       << "// overridden ServantBase operations" << be_nl
-      << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl
-      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt
+      << env_sngl_dflts << be_uidt_nl
       << ");" << be_uidt;
 
-  int status = 
+  int status =
     node->traverse_inheritance_graph (
               be_visitor_interface_tie_sh::method_helper,
               os
@@ -161,7 +161,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
                                             TAO_OutStream *os)
 {
   // Any methods from abstract parents have already been
-  // "added" to the derived interface scope by the overridden 
+  // "added" to the derived interface scope by the overridden
   // visit_scope() method in be_visitor_interface, so we can skip
   // this base interface, if it is abstract.
   if (node->is_abstract ())
@@ -178,7 +178,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "be_visitor_interface_tie_sh::"
-                         "method_helper\n"), 
+                         "method_helper\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index 46e93a19938..b92c0a98860 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           tie_si, 
+ACE_RCSID (be_visitor_interface,
+           tie_si,
            "$Id$")
 
 
@@ -42,8 +42,8 @@ be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void)
 int
 be_visitor_interface_tie_si::visit_interface (be_interface *node)
 {
-  if (node->srv_inline_gen () 
-      || node->imported () 
+  if (node->srv_inline_gen ()
+      || node->imported ()
       || node->is_abstract ())
     {
       return 0;
@@ -53,13 +53,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   static char localtiename [NAMEBUFSIZE];
   static char localskelname [NAMEBUFSIZE];
 
-  ACE_OS::memset (fulltiename, 
-                  '\0', 
+  ACE_OS::memset (fulltiename,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::memset (localtiename, 
-                  '\0', 
+  ACE_OS::memset (localtiename,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::memset (localskelname, 
+  ACE_OS::memset (localskelname,
                   '\0',
                    NAMEBUFSIZE);
 
@@ -67,25 +67,25 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   // class name.
 
   // We are outermost.
-  ACE_OS::sprintf (fulltiename, 
-                   "%s_tie", 
+  ACE_OS::sprintf (fulltiename,
+                   "%s_tie",
                    node->full_skel_name ());
 
   if (!node->is_nested ())
     {
-      ACE_OS::sprintf (localskelname, 
+      ACE_OS::sprintf (localskelname,
                        "POA_%s",
                        node->local_name ());
-      ACE_OS::sprintf (localtiename, 
+      ACE_OS::sprintf (localtiename,
                        "POA_%s_tie",
                        node->local_name ());
     }
   else
     {
-      ACE_OS::sprintf (localskelname, 
+      ACE_OS::sprintf (localskelname,
                        "%s",
                        node->local_name ());
-      ACE_OS::sprintf (localtiename, 
+      ACE_OS::sprintf (localtiename,
                        "%s_tie",
                        node->local_name ());
     }
@@ -180,19 +180,24 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   *os << "template <class T> ACE_INLINE "
       << "PortableServer::POA_ptr" << be_nl
       << fulltiename
-      << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "<T>::_default_POA ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_DECL")
+      << ")" << be_nl
       << "{" << be_idt_nl
-      << "if (! CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
+      << "if (! ::CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
-      << "return PortableServer::POA::_duplicate (this->poa_.in ());" << be_uidt_nl
+      << "return PortableServer::POA::_duplicate (this->poa_.in ());"
+      << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "return this->" << localskelname
-      << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
+      << "::_default_POA ("
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
+      << ");" << be_uidt_nl
       << "}";
 
   int status =
     node->traverse_inheritance_graph (
-              be_visitor_interface_tie_si::method_helper, 
+              be_visitor_interface_tie_si::method_helper,
               os
             );
 
@@ -220,7 +225,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived,
                                             TAO_OutStream *os)
 {
   // Any methods from abstract parents have already been
-  // "added" to the derived interface scope by the overridden 
+  // "added" to the derived interface scope by the overridden
   // visit_scope() method in be_visitor_interface, so we can skip
   // this base interface, if it is abstract.
   if (node->is_abstract ())
@@ -239,7 +244,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived,
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "be_visitor_interface_tie_si::"
-                         "method_helper\n"), 
+                         "method_helper\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index 471b498584b..75cf81f5be5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -101,6 +101,8 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << macro << " void"
       << " operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
@@ -111,6 +113,8 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index cbf5ebac938..325ba44622c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -65,6 +65,8 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean "
       << "operator<< (TAO_OutputCDR &, const " << node->full_name ()
       << "_ptr );" << be_nl;
@@ -72,6 +74,8 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
       << "operator>> (TAO_InputCDR &, "
       << node->full_name () << "_ptr &);\n";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index 8be0d364095..5985b56e260 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -56,6 +56,6 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
   // Copy the fwd helper name back to the forward declared interface node.
   node->fwd_helper_name (bfd->fwd_helper_name ());
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 1a858a5f1b6..63ebeb95fa8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -66,7 +66,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
   buf = 0;
 
   // Step 1 : Generate return type: always void
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl 
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "void" << be_nl
@@ -158,34 +158,44 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
       operation_name[idx] = '\0';
 
       *os << be_nl << "{" << be_idt_nl
-          << "ACE_TRY" << be_nl
+          << (be_global->use_raw_throw () ? "try" : "ACE_TRY") << be_nl
           << "{" << be_idt_nl
           << "holder->raise_" << operation_name.c_str ()
-          << " (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl
-          << "ACE_TRY_CHECK;" << be_uidt_nl
+          << " ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << ace_try_check << be_uidt_nl
           << "}" << be_nl
-          << "ACE_CATCH ( ::CORBA::Exception, ex)" << be_nl
-          << "{" << be_nl
-          << "  this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);" 
+          << (be_global->use_raw_throw ()
+                ? "catch ( ::CORBA::Exception& ex)"
+                : "ACE_CATCH ( ::CORBA::Exception, ex)")
           << be_nl
-          << "  ACE_CHECK;" << be_nl
-          << "}" << be_nl
-          << "ACE_ENDTRY;" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "this->_tao_rh_send_exception (ex"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_uidt_nl
+          << "}" << ace_endtry << be_uidt_nl
           << "}";
     }
   else
     {
       // Step 3: Generate actual code for the method
       *os << be_nl << "{" << be_idt_nl
-          << "this->_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_PARAMETER);" 
-          << be_nl
-          << "ACE_CHECK;" << be_nl << be_nl;
+          << "this->_tao_rh_init_reply ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << TAO_ACE_CHECK () << be_nl << be_nl;
 
       this->marshal_params (node);
 
       *os << be_nl
-          << "this->_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_PARAMETER);" 
-          << be_uidt_nl
+          << "this->_tao_rh_send_reply ("
+          << (be_global->use_raw_throw ()
+                ? ""
+                : "ACE_ENV_SINGLE_ARG_PARAMETER")
+          << ");" << be_uidt_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 6a01601d05e..c1071830315 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           amh_sh, 
+ACE_RCSID (be_visitor_operation,
+           amh_sh,
            "$Id$")
 
 // ******************************************************
@@ -83,9 +83,8 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << be_nl
-      << "ACE_ENV_ARG_DECL"
-      << be_uidt_nl << ")" << be_uidt_nl;
+  *os << env_decl << be_uidt_nl
+      << ")" << be_uidt_nl;
 
   if (be_global->use_raw_throw ())
     {
@@ -108,7 +107,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
     }
 
   *os << " = 0;";
-  
+
   return 0;
 }
 
@@ -120,11 +119,10 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << be_nl
-          << "ACE_ENV_ARG_DECL";
+      *os << env_decl;
     }
 
-  *os << be_uidt_nl 
+  *os << be_uidt_nl
       << ")" << be_uidt_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
 
@@ -150,7 +148,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << be_nl << "ACE_ENV_ARG_DECL";
+      *os << env_decl;
     }
 
   *os << be_uidt_nl << ")" << be_uidt_nl
@@ -174,8 +172,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_req," << be_nl
       << "void *_tao_obj," << be_nl
-      << "void *_tao_servant_upcall" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void *_tao_servant_upcall" << env_decl << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // We need the interface node in which this operation was defined. However,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 373bc2f88a2..bdb5192bb28 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -174,7 +174,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
           }
       }
 
-    *os << be_nl << "ACE_ENV_ARG_PARAMETER";
+    *os << env_arg;
   }
 
   if (this->generate_shared_epilogue (os) == -1)
@@ -202,8 +202,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       return -1;
     }
 
-  *os << be_nl
-      << "ACE_ENV_ARG_PARAMETER";
+  *os << env_arg;
 
   if (this->generate_shared_epilogue (os) == -1)
     {
@@ -282,7 +281,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       }
   }
 
-  *os << be_nl << "ACE_ENV_ARG_PARAMETER";
+  *os << env_arg;
 
   if (this->generate_shared_epilogue (os) == -1)
     {
@@ -332,8 +331,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & _tao_server_request," << be_nl
       << "void * /* context */," << be_nl
-      << "void * _tao_servant" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * _tao_servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 3b315ed6045..9601c14d2ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -160,7 +160,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       *os << be_nl
           << "if (!this->is_evaluated ())" << be_idt_nl
           << "{" << be_idt_nl
-          << "ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);"
+          << "::CORBA::Object::tao_object_initialize (this);"
           << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
@@ -176,7 +176,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
       << "TAO::Arg_Traits<void>::ret_val _tao_retval;";
 
   // Declare the argument helper classes.
-  this->gen_stub_body_arglist (ami_op, os, I_TRUE);
+  this->gen_stub_body_arglist (ami_op, os, true);
 
   // Assemble the arg helper class pointer array.
   *os << be_nl << be_nl
@@ -255,10 +255,9 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   *os << "AMI_" << parent->local_name () << "Handler::"
       << opname.fast_rep () + (this->ctx_->attribute () != 0)
-      << "_reply_stub" << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "ACE_CHECK;";
+      << "_reply_stub" << env_arg << be_uidt_nl
+      << ");" << be_uidt
+      << TAO_ACE_CHECK ();
 
   *os << be_uidt_nl
       << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index 6a9cf40648b..07a98139f2d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -41,172 +41,8 @@ be_visitor_operation_ami_exception_holder_operation_cs::
 
 int
 be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
-    be_operation *node
+    be_operation *
   )
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-  this->ctx_->node (node);
-
-  // Start with the current indentation level.
-  os->indent ();
-
-  // Init the return type variable.
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "(%N:%l) be_visitor_ami_exception_holder_operation_cs::"
-          "visit_operation - "
-          "Bad return type\n"
-        ),
-        -1
-      );
-    }
-
-  // Generate the return type. Return type is simply void.
-  *os << "void " << be_nl;
-
-  // Get the scope name.
-  be_decl *parent =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-  if (parent == 0)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "(%N:%l) be_visitor_operation_ami_exception_holder_operation_cs::"
-          "visit_operation - "
-          "scopeless operation :-<\n"
-        ),
-        -1
-      );
-    }
-
-  be_interface *parent_interface = be_interface::narrow_from_decl (parent);
-  AST_Decl::NodeType nt =
-    parent_interface->defined_in ()->scope_node_type ();
-
-  if (parent_interface->is_nested () && nt == AST_Decl::NT_module)
-    {
-      *os << "OBV_";
-    }
-
-  // Here we do not have our overridden be_interface methods,
-  // so the interface type strategy does not work here.
-  // We have to go by foot.
-  // Genereate scope name.
-  *os << parent->compute_name ("_tao_", "");
-
-  // Generate the operation name.
-  *os << "::";
-
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        {
-          *os << "set_";
-        }
-      else
-        {
-          *os << "get_";
-        }
-    }
-  *os << node->local_name () << "(";
-
-  if (!be_global->exception_support ())
-    {
-      *os << "ACE_ENV_SINGLE_ARG_DECL";
-    }
-
-  *os << ")";
-
-  // now generate the throw specs
-  if (this->gen_throw_spec (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%N:%l) be_visitor_operation_ami_")
-                         ACE_TEXT ("exception_holder_operation_cs::")
-                         ACE_TEXT ("::visit_operation - ")
-                         ACE_TEXT ("Failed to generate throw spec\n")),
-                        -1);
-    }
-
-  *os << be_nl << "{" << be_idt_nl;
-
-  *os << this->gen_environment_var () << be_nl;
-
-  const char *exception_data_arg = "0";
-  const char *exception_count_arg = "0";
-
-  // Don't do anything if the exception list is empty.
-  if (node->exceptions ())
-    {
-      *os << "static TAO::Exception_Data " << "exceptions_data [] = " << be_nl;
-      *os << "{" << be_idt_nl;
-
-      int excep_count = 0;
-
-      be_exception *ex = 0;
-
-      // Initialize an iterator to iterate thru the exception list.
-      // Continue until each element is visited.
-      // Iterator must be explicitly advanced inside the loop.
-      for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
-           !ei.is_done ();)
-        {
-          ex = be_exception::narrow_from_decl (ei.item ());
-
-          *os << "{" << be_idt_nl
-              << "\"" << ex->repoID () << "\"," << be_nl;
-          // Allocator method.
-          *os << ex->name () << "::_alloc"
-              << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl;
-
-          if (be_global->tc_support ())
-            {
-              *os << ", " << ex->tc_name ();
-            }
-          else
-            {
-              *os << ", 0";
-            }
-
-          *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
-              << "}";
-
-          ++excep_count;
-          ei.next ();
-
-          if (!ei.is_done ())
-            {
-              *os << "," << be_nl;
-            }
-
-        }
-
-      *os << be_uidt_nl << "};\n\n";
-
-      os->indent ();
-      *os << "::CORBA::ULong exceptions_count = "
-          << excep_count << ";\n" << be_nl;
-
-      exception_data_arg = "exceptions_data";
-      exception_count_arg = "exceptions_count";
-    }
-
-  *os << "TAO_Messaging_Helper::exception_holder_raise (" << be_idt_nl
-      << exception_data_arg << "," << be_nl
-      << exception_count_arg << "," << be_nl
-      << "this->marshaled_exception ().get_buffer ()," << be_nl
-      << "this->marshaled_exception ().length ()," << be_nl
-      << "this->byte_order ()," << be_nl
-      << "this->is_system_exception ()" << be_nl
-      << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl;
-
-  *os << "}\n\n";
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
index 0b6e0b99818..75921685b61 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
@@ -20,8 +20,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           ami_handler_reply_stub_operation_ch, 
+ACE_RCSID (be_visitor_operation,
+           ami_handler_reply_stub_operation_ch,
            "$Id$")
 
 // ************************************************************
@@ -52,7 +52,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (
   if (!node->has_native ())
     {
       // Next line.
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << "static void ";
 
       // Check if we are an attribute node in disguise
@@ -73,11 +73,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (
           << "_reply_stub (" << be_idt << be_idt_nl;
 
       *os << "TAO_InputCDR &_tao_reply_cdr," << be_nl
-          << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
+          << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
           << "::CORBA::ULong reply_status";
 
-      *os << be_nl
-          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      *os << env_dflts << be_uidt_nl
           << ");" << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index be325370a40..f2be62d4586 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -128,48 +128,20 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
 
   // Generate the argument list.
   *os << "TAO_InputCDR &_tao_in, " << be_nl
-      << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
-      << "::CORBA::ULong reply_status";
-
-  *os << be_nl
-      << "ACE_ENV_ARG_DECL";
-
-  *os << ")" << be_uidt << be_uidt_nl;
-
-  // Generate the actual code for the stub. However, if any of the argument
-  // types is "native", we flag a MARSHAL exception.
-  // last argument - is always ACE_ENV_ARG_PARAMETER
-  *os << "{\n" << be_idt;
-
-  // Generate any pre stub info if and only if none of our parameters is of the
-  // native type.
-  if (!node->has_native ())
-    {
-      // native type does not exist.
-
-      // Generate any "pre" stub information such as tables or declarations
-      // This is a template method and the actual work will be done by the
-      // derived class
-      if (this->gen_pre_stub_info (node, bt) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "gen_pre_stub_info failed\n"),
-                            -1);
-        }
-    }
-
-  os->indent();
+      << "::Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
+      << "::CORBA::ULong reply_status"
+      << env_decl << ")" << be_uidt << be_uidt_nl
+      << "{" << be_idt_nl;
 
   *os << "// Retrieve Reply Handler object." << be_nl;
   *os << parent->full_name () << "_var "
       << "_tao_reply_handler_object =" << be_idt_nl;
 
   *os << parent->full_name ();
-  *os << "::_narrow (_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl;
-
-  *os << "ACE_CHECK;" << be_nl << be_nl
+  *os << "::_narrow (_tao_reply_handler"
+      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+      << ");" << be_uidt
+      << TAO_ACE_CHECK () << be_nl << be_nl
       << "// Exception handling" << be_nl
       << "switch (reply_status)" << be_nl
       << "{" << be_idt_nl
@@ -205,7 +177,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "case TAO_AMI_REPLY_USER_EXCEPTION:" << be_nl
       << "case TAO_AMI_REPLY_SYSTEM_EXCEPTION:" << be_nl
       << "{" << be_idt_nl
-      << "const ACE_Message_Block* cdr = _tao_in.start ();" << be_nl << be_nl;
+      << "const ACE_Message_Block* cdr = _tao_in.start ();" << be_nl ;
 
   be_interface *original =
     (be_interface::narrow_from_decl (parent))->original_interface ();
@@ -219,29 +191,63 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
                         -1);
     }
 
+  const char *exception_data_arg = "0";
+  const char *exception_count_arg = "0";
 
-  *os << original->compute_local_name ("AMI_", "ExceptionHolder")
-      << "_var exception_holder_var;" << be_nl
-      << "ACE_NEW (" << be_idt << be_idt_nl
-      << "exception_holder_var," << be_nl;
-
-  if (original->defined_in ()->scope_node_type () == AST_Decl::NT_module)
+  // Don't do anything if the exception list is empty.
+  if (node->exceptions ())
     {
-      be_decl *scope =
-        be_scope::narrow_from_scope (original->defined_in ())->decl ();
+      *os << be_nl << "static TAO::Exception_Data " << "exceptions_data [] = " << be_nl;
+      *os << "{" << be_idt_nl;
 
-      *os << "OBV_" << scope->name() << "::"
-          << "_tao_"
-          << original->compute_local_name ("AMI_", "ExceptionHolder");
-    }
-  else
-    {
-      *os << "_tao_"
-          << original->compute_local_name ("AMI_", "ExceptionHolder");
-    }
+      int excep_count = 0;
+
+      be_exception *ex = 0;
+
+      // Initialize an iterator to iterate thru the exception list.
+      // Continue until each element is visited.
+      // Iterator must be explicitly advanced inside the loop.
+      for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
+           !ei.is_done ();)
+        {
+          ex = be_exception::narrow_from_decl (ei.item ());
+
+          *os << "{" << be_idt_nl
+              << "\"" << ex->repoID () << "\"," << be_nl;
+          // Allocator method.
+          *os << ex->name () << "::_alloc"
+              << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl;
+
+          if (be_global->tc_support ())
+            {
+              *os << ", " << ex->tc_name ();
+            }
+          else
+            {
+              *os << ", 0";
+            }
+
+          *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
+              << "}";
+
+          ++excep_count;
+          ei.next ();
+
+          if (!ei.is_done ())
+            {
+              *os << "," << be_nl;
+            }
+
+        }
+
+      *os << be_uidt_nl << "};" << be_nl << be_nl;
 
-  *os << " ()" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
+      *os << "::CORBA::ULong exceptions_count = "
+          << excep_count << ";\n" << be_nl;
+
+      exception_data_arg = "exceptions_data";
+      exception_count_arg = "exceptions_count";
+    }
 
   *os << "::CORBA::OctetSeq "
       << "_tao_marshaled_exception (" << be_idt << be_idt_nl
@@ -249,18 +255,23 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
       << "reinterpret_cast <unsigned char*> (cdr->rd_ptr ())," << be_nl
       << "0" << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "exception_holder_var->marshaled_exception (_tao_marshaled_exception);"
-      << be_nl << be_nl;
-
-  *os << "if (reply_status == TAO_AMI_REPLY_SYSTEM_EXCEPTION)" << be_idt_nl
-      << "exception_holder_var->is_system_exception (1);" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "exception_holder_var->is_system_exception (0);"
-      << be_uidt_nl << be_nl
-      << "exception_holder_var->byte_order (_tao_in.byte_order ());" << be_nl
-      << be_nl
-      << "_tao_reply_handler_object->"
+      << ");" << be_uidt_nl;
+
+ *os  << "::Messaging::ExceptionHolder* exception_holder_ptr = 0;" << be_nl
+      << "ACE_NEW (" << be_idt << be_idt_nl
+      << "exception_holder_ptr," << be_nl
+      << "::TAO::ExceptionHolder (" << be_idt_nl
+      << "(reply_status == TAO_AMI_REPLY_SYSTEM_EXCEPTION)," << be_nl
+      << "_tao_in.byte_order ()," << be_nl
+      << "_tao_marshaled_exception," << be_nl
+      << exception_data_arg << "," << be_nl
+      << exception_count_arg << ")" << be_uidt_nl
+      << ");" << be_uidt_nl << be_uidt_nl;
+
+  *os << "::Messaging::ExceptionHolder_var exception_holder_var = "
+      << "exception_holder_ptr;" << be_nl;
+
+  *os << "_tao_reply_handler_object->"
       << node->local_name () << "_excep (" << be_idt << be_idt_nl
       << "exception_holder_var";
 
@@ -443,8 +454,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke
                         -1);
     }
 
-  *os << be_uidt_nl << ");" << be_uidt_nl;
-  *os << "ACE_CHECK;" << be_nl;
+  *os << be_uidt_nl << ");" << be_uidt
+      << TAO_ACE_CHECK () << be_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 527d3d27916..fcd2fa84244 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           argument, 
+ACE_RCSID (be_visitor_operation,
+           argument,
            "$Id$")
 
 // ************************************************************
@@ -100,11 +100,11 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
           // whether the operation node has parameters.
           if (node->argument_count () > 0)
             {
-              *os << be_nl << "ACE_ENV_ARG_PARAMETER";
+              *os << env_arg;
             }
           else
             {
-              *os << be_nl << "ACE_ENV_SINGLE_ARG_PARAMETER";
+              *os << env_sngl_arg;
             }
 
           break;
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 35266a34b06..76b2b20752a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -68,8 +68,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     }
 
   *os << "," << be_nl
-      << "int " << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "int" << env_decl << be_uidt_nl
       << ")";
 
   if (this->gen_throw_spec (node) != 0)
@@ -146,8 +145,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
 
   if (si.is_done ())
     {
-      *os << be_nl
-          << "ACE_ENV_SINGLE_ARG_PARAMETER" << be_uidt_nl
+      *os << env_sngl_arg << be_uidt_nl
           << ");";
 
       return 0;
@@ -187,8 +185,7 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
     }
 
   // End the upcall
-  *os << be_nl
-      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+  *os << env_arg << be_uidt_nl
       << ");";
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
index d8d4d18784d..1dcdda82daa 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -41,8 +41,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node)
 {
   TAO_OutStream * const os = this->ctx_->stream ();
 
-  *os << be_nl
-      << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl;
+  *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl;
 
   // When there are exceptions and typecode support is enabled, then generate
   // the typecodes of the user exceptions this operation can throw.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index a76bcfc4f49..2d3b4d6c5e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -315,64 +315,6 @@ be_visitor_operation::gen_raise_exception (be_type *return_type,
 }
 
 int
-be_visitor_operation::gen_check_exception (be_type *return_type)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (return_type == 0 || this->void_return_type (return_type))
-    {
-      *os << "ACE_CHECK;" << be_nl;
-      return 0;
-    }
-
-  // Non-void return type....
-  *os << "ACE_CHECK_RETURN (";
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_operation_rettype_return_cs visitor (&ctx);
-
-  if (return_type->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation::"
-                         "gen_check_exception - "
-                         "codegen for return var failed\n"),
-                        -1);
-    }
-
-  *os << ");" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_operation::gen_check_interceptor_exception (be_type *return_type)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (return_type == 0 || this->void_return_type (return_type))
-    {
-      *os << "TAO_INTERCEPTOR_CHECK;\n";
-      return 0;
-    }
-
-  // Non-void return type.
-  *os << "TAO_INTERCEPTOR_CHECK_RETURN (";
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_operation_rettype_return_cs visitor (&ctx);
-
-  if (return_type->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation::"
-                         "gen_check_exception - "
-                         "codegen for return var failed\n"),
-                        -1);
-    }
-
-  *os << ");\n";
-  return 0;
-}
-
-int
 be_visitor_operation::gen_stub_operation_body (
     be_operation *node,
     be_type *return_type
@@ -423,7 +365,7 @@ be_visitor_operation::gen_stub_operation_body (
       // be null.  Initialize it now.
       *os << "if (!this->is_evaluated ())" << be_idt_nl
           << "{" << be_idt_nl
-          << "ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);"
+          << "::CORBA::Object::tao_object_initialize (this);"
           << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)"
@@ -528,24 +470,23 @@ be_visitor_operation::gen_stub_operation_body (
       *os << "_tao_call.invoke (" << be_idt << be_idt_nl
           << "_tao_" << node->flat_name ()
           << "_exceptiondata," << be_nl
-          << node->exceptions ()->length () << be_nl
-          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+          << node->exceptions ()->length () << env_arg << be_uidt_nl
           << ");" << be_uidt;
     }
   else
     {
-      *os << "_tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);";
+      *os << "_tao_call.invoke (0, 0"
+          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
+          << ");";
     }
 
-  *os << be_nl;
-
   if (this->void_return_type (return_type))
     {
-      *os << "ACE_CHECK;";
+      *os << TAO_ACE_CHECK ();
     }
   else
     {
-      *os << "ACE_CHECK_RETURN (_tao_retval.excp ());";
+      *os << TAO_ACE_CHECK ("_tao_retval.excp ()");
     }
 
   if (!this->void_return_type (return_type))
@@ -633,7 +574,7 @@ be_visitor_operation::gen_raise_interceptor_exception (
 void
 be_visitor_operation::gen_stub_body_arglist (be_operation *node,
                                              TAO_OutStream *os,
-                                             idl_bool ami)
+                                             bool ami)
 {
   AST_Argument *arg = 0;
   UTL_ScopeActiveIterator arg_decl_iter (node, UTL_Scope::IK_decls);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 32530788656..7bba7f41d3b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           operation_sh, 
+ACE_RCSID (be_visitor_operation,
+           operation_sh,
            "$Id$")
 
 // ************************************************************
@@ -113,8 +113,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
           << "_skel (" << be_idt << be_idt_nl
           << "TAO_ServerRequest & server_request," << be_nl
           << "void * servant_upcall," << be_nl
-          << "void * servant"<< be_nl
-          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+          << "void * servant" << env_decl << be_uidt_nl
           << ");" << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index df29bd7302a..34adf67cb75 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -161,8 +161,6 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
                         -1);
     }
 
-  *os << be_nl;
-
   ACE_CString upcall_command_name =
     ACE_CString (node->local_name ()->get_string()) + "_"  +
     ACE_CString (intf->local_name());
@@ -211,14 +209,13 @@ 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_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "void * servant" << env_decl << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the
   // argument types is "native", we do not generate any skeleton
   // last argument - is always CORBA::Environment.
-  *os << "{" << be_idt_nl;
+  *os << "{" << be_idt;
 
   // Generate all the tables and other pre-skel info.
   if (this->gen_pre_skel_info (node) == -1)
@@ -301,11 +298,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "                       , exceptions" << be_nl
       << "                       , nexceptions"
       << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-      << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
-      << "ACE_CHECK;" << be_nl;
-
-
-  *os << be_uidt_nl
+      << "                       "
+      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
+      << ");" << TAO_ACE_CHECK () << be_uidt_nl
       << "}";
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index 7287ac5668d..2990b9fde70 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -42,8 +42,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
   *os << node->local_name () << " (" << be_idt << be_idt_nl
       << "TAO_Abstract_ServantBase *servant," << be_nl
       << "TAO::Argument ** args," << be_nl
-      << "int num_args" << be_nl
-      << "ACE_ENV_ARG_DECL" << be_uidt_nl
+      << "int num_args" << env_decl << be_uidt_nl
       << ")";
 
   if (this->gen_throw_spec (node) != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
index 8bfc9f75869..ffa3758d8c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           tie_si, 
+ACE_RCSID (be_visitor_operation,
+           tie_si,
            "$Id$")
 
 // ************************************************************
@@ -64,10 +64,43 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
                         -1);
     }
 
+  // Although unlikely it is possible that the 'T' in 'template class<T>' will
+  // conflict with an argument name...
+  ACE_CString template_name ("T");
+  bool template_name_ok = false;
+
+  while (!template_name_ok)
+    {
+      template_name_ok = true;
+
+      for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+          ! si.is_done () && template_name_ok;
+          si.next ())
+        {
+          // Check for conflicts between the arg name and the proposed template
+          // class identifier
+          AST_Argument *arg =
+            AST_Argument::narrow_from_decl (si.item ());
+
+          if (! ACE_OS::strcmp (arg->local_name ()->get_string (),
+                                template_name.c_str ()))
+            {
+              // clash !
+              template_name_ok = false;
+            }
+        }
+
+      if (! template_name_ok)
+        {
+          // We had a clash - postfix an underscore and try again
+          template_name += "_";
+        }
+    }
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE\n";
+  *os << "template <class " << template_name.c_str () << "> ACE_INLINE\n";
 
   // Generate the return type mapping (same as in the header file).
   be_visitor_context ctx (*this->ctx_);
@@ -82,7 +115,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << " " << intf->full_skel_name () << "_tie<T>::"
+  *os << " " << intf->full_skel_name () << "_tie<" << template_name.c_str () << ">::"
       << node->local_name () << " ";
 
   // STEP 4: generate the argument list with the appropriate mapping (same as
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 3f81493bdb5..b1bbcb64a7e 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
@@ -173,12 +173,14 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
   // initializer for the class argument array member/attribute.
   if (!node->void_return_type () || node->argument_count () > 0)
     {
-      os << be_nl;
+      os << be_idt_nl;
 
       if (be_global->gen_thru_poa_collocation ())
-        os << ", operation_details_ (operation_details)" << be_nl;
+        {
+          os << ", operation_details_ (operation_details)" << be_nl;
+        }
 
-      os << ", args_ (args)";
+      os << ", args_ (args)" << be_uidt;
     }
 
   os << be_uidt_nl;
@@ -187,7 +189,9 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
      << "}" << be_nl << be_nl;
 
   // Generate execute() method.
-  os << "virtual void execute (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+  os << "virtual void execute ("
+     << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
+     << ")" << be_nl
      << "{" << be_idt_nl;
 
   if (!node->void_return_type ())
@@ -267,7 +271,7 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
     }
 
   os << be_uidt_nl
-     << "};" << be_nl;
+     << "};";
 
   if (module != 0)
     {
@@ -421,24 +425,34 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
     }
 
   os << "this->servant_->" << node->local_name () << " ("
-     << be_idt_nl;
+     << be_idt;
 
   size_t const count = node->argument_count ();
 
   for (unsigned int i = 0; i < count; ++i)
-    os << (i == 0 ? "" : ", ") << "arg_" << i + 1 << be_nl;
+    {
+      os << be_nl
+         << (i == 0 ? "" : ", ") << "arg_" << i + 1;
+    }
 
   if (count > 0)
-    os << "ACE_ENV_ARG_PARAMETER);";
+    {
+      os << env_arg;
+    }
   else
-    os << "ACE_ENV_SINGLE_ARG_PARAMETER);";
+    {
+      os << env_sngl_arg;
+    }
+
+  os << ");";
 
   if (!node->void_return_type ())
     {
       os << be_uidt;
     }
 
-  os << be_uidt_nl << "ACE_CHECK;" << be_uidt_nl;
+  os << be_uidt
+     << TAO_ACE_CHECK () << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index dffe0c0f3e5..9c3ce0b4462 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -197,6 +197,8 @@ int be_visitor_root::visit_root (be_root *node)
           *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+          *os << be_global->core_versioning_begin () << be_nl;
+
           *os << "// Overrides of CORBA::release and CORBA::is_nil for"
               << be_nl
               << "// interfaces that inherit from both CORBA::Object" << be_nl
@@ -220,13 +222,15 @@ int be_visitor_root::visit_root (be_root *node)
         {
           *os << be_uidt_nl
               << "}";
+
+          *os << be_global->core_versioning_end () << be_nl;
         }
     }
 
   // Make one more pass over the entire tree and generate the OBV_ namespaces
   // and OBV_ classes.
 
-  idl_bool obv = 1;
+  bool obv = 1;
   status = 0;
 
   switch (this->ctx_->state ())
@@ -455,6 +459,12 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_CH:
       (void) tao_cg->end_client_header ();
       break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+      tao_cg->end_client_inline ();
+      break;
+    case TAO_CodeGen::TAO_ROOT_CS:
+      tao_cg->end_client_stubs ();
+      break;
     case TAO_CodeGen::TAO_ROOT_SH:
       (void) tao_cg->end_server_header ();
       break;
@@ -471,6 +481,7 @@ int be_visitor_root::visit_root (be_root *node)
           (void) tao_cg->end_server_template_inline ();
         }
 
+      tao_cg->end_server_inline ();
       break;
     case TAO_CodeGen::TAO_ROOT_SS:
       if (be_global->gen_tie_classes ())
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
index 095d73b3fc8..26ab72be1cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -61,6 +61,8 @@ be_visitor_root_ch::init (void)
           << "// TAO_IDL - Generated from " << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
+      *os << be_global->core_versioning_begin () << be_nl;
+      
       *os << be_nl << be_nl
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl;
@@ -72,7 +74,10 @@ be_visitor_root_ch::init (void)
           *os << "template<typename T> class AbstractBase_Narrow_Utils;" << be_nl;
         }
 
-      *os << "template<typename T> class Narrow_Utils;" << be_uidt_nl << "}" ;
+      *os << "template<typename T> class Narrow_Utils;" << be_uidt_nl
+          << "}" ;
+
+      *os << be_global->core_versioning_end () << be_nl;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index b00aaced949..52504b81847 100644
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp
@@ -25,8 +25,8 @@
 #include "be_visitor_context.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (be, 
-           be_visitor_scope, 
+ACE_RCSID (be,
+           be_visitor_scope,
            "$Id$")
 
 // ******************************************************
@@ -196,7 +196,7 @@ be_visitor_scope::next_elem (be_decl *elem,
   return 0;
 }
 
-idl_bool
+bool
 be_visitor_scope::last_node (be_decl *bd)
 {
   be_decl *next = 0;
@@ -213,7 +213,7 @@ be_visitor_scope::last_node (be_decl *bd)
   return 1;
 }
 
-idl_bool
+bool
 be_visitor_scope::last_inout_or_out_node (be_decl *)
 {
   // Return true if we are the last inout or out argument.
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index 772e2435db0..9195f4c7d3e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -52,6 +52,8 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   // Generate the Any <<= and >>= operators.
   *os << macro;
   *os << " void"
@@ -74,6 +76,8 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
   *os << node->name ();
   *os << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   node->cli_hdr_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index a614ac55509..a4699901a26 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -53,6 +53,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -149,6 +151,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   node->cli_stub_any_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index 6b0e1e24d2b..c4a48dd236e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -79,6 +79,8 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
           << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_nl << be_nl 
       << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (" << be_idt << be_idt_nl
@@ -91,6 +93,8 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
       << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (!tdef)
     {
       *os << "\n\n#endif /* _TAO_CDR_OP_"
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index fdb63147f1b..2b45fca1bbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -93,12 +93,14 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-    << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+    << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << "#if !defined _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_" << be_nl
       << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
-      << be_nl << be_nl;
+      << be_nl;
+
+  *os << be_global->core_versioning_begin () << be_nl;
 
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
@@ -110,149 +112,32 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  // First encode the sequence length.
-  *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
-      << be_nl << be_nl;
-  *os << "if (strm << _tao_seq_len)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  // Now encode the sequence elements.
-  *os << "// Encode all elements." << be_nl;
-
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_cdr_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
+  *os << "return TAO::marshal_sequence(strm, _tao_sequence);"
+      << be_uidt_nl;
 
-  *os << "}" << be_uidt_nl << be_nl
-      << "return false;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+  *os << "}" << be_nl << be_nl;
 
   //  Set the sub state as generating code for the input operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
 
   *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &";
-
-  if (! bt->is_local ())
-    {
-      *os << "strm";
-    }
+      << "TAO_InputCDR &strm";
 
   *os << "," << be_nl
-      << node->name () << " &";
-
-  if (! bt->is_local ())
-    {
-      *os << "_tao_sequence";
-    }
+      << node->name () << " &_tao_sequence";
 
   *os << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  if (! bt->is_local ())
-    {
-      // First retrieve the length and adjust the sequence length accordingly.
-      *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
-      *os << "if (strm >> _tao_seq_len)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      // Add a sanity check for the length of a sequence.
-      *os << "// Add a check to the length of the sequence" << be_nl;
-      *os << "// to make sure it does not exceed the length" << be_nl;
-      *os << "// of the stream. (See bug 58.)" << be_nl;
-      *os << "if (_tao_seq_len > strm.length ())" << be_idt_nl
-          << "{" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl
-          << "}" << be_uidt_nl << be_nl;
-
-      // Now check if the length does not exceed the maximum. We do this only
-      // for bounded sequences
-      AST_Expression *expr = node->max_size ();
-
-      if (expr == 0 || (expr != 0 && expr->ev () == 0))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                             "visit_sequence - "
-                             "bad sequence dimension\n"),
-                            -1);
-        }
-
-      if (expr->ev ()->et == AST_Expression::EV_ulong)
-        {
-          if (expr->ev ()->u.ulval > 0)
-            {
-              // We are dealing with a bounded sequence. Check if we are within
-              // bounds.
-              *os << "if (_tao_seq_len <= _tao_sequence.maximum ())" << be_idt_nl
-                  << "{" << be_idt_nl;
-            }
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                             "visit_sequence - "
-                             "bad sequence dimension value\n"),
-                            -1);
-        }
-
-      *os << "// Set the length of the sequence." << be_nl
-          << "_tao_sequence.length (_tao_seq_len);" << be_nl << be_nl;
+  *os << "return TAO::demarshal_sequence(strm, _tao_sequence);"
+      << be_uidt_nl;
 
-      // Now we do a check for the sequence length to be non zero.
-      // If length is 0 we return true.
-      *os << "// If length is 0 we return true." << be_nl;
-      *os << "if (0 >= _tao_seq_len) " << be_idt_nl
-          << "{" << be_idt_nl;
-      *os << "return true;" << be_uidt_nl
-          << "}" << be_uidt_nl << be_nl;
+  *os << "}";
 
-      *os << "// Retrieve all the elements." << be_nl;
+  *os << be_nl << be_global->core_versioning_end ();
 
-      if (bt->node_type () == AST_Decl::NT_sequence)
-        {
-          this->visit_node (node);
-        }
-      else
-        {
-          if (bt->accept (this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_sequence_cdr_op_cs::"
-                                 "visit_sequence - "
-                                 "Base type codegen failed\n"),
-                                -1);
-            }
-        }
-
-      if (expr->ev ()->u.ulval > 0)
-        {
-          // We are dealing with a bounded sequence.
-          *os << be_nl << "}" << be_uidt << be_uidt;
-        }
-
-      *os << be_nl << "}" << be_uidt_nl << be_nl;
-    }
-
-  *os << "return false;" << be_uidt_nl
-      << "}";
-
-  *os << be_nl << be_nl
+  *os << be_nl
       << "#endif /* _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_ */";
 
@@ -337,208 +222,7 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
     be_predefined_type *node
   )
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_object:
-    case AST_PredefinedType::PT_value:
-    case AST_PredefinedType::PT_pseudo:
-    case AST_PredefinedType::PT_any:
-      return this->visit_node (node);
-    case AST_PredefinedType::PT_void:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_predefined_type - "
-                         "Bad primitive type\n"),
-                        -1);
-    default:
-      break;
-    };
-
-  // We get here if the "type" of individual elements of the sequence is a
-  // primitive type. In this case, we treat the sequence as a single
-  // dimensional sequence (even of it was multi-dimensional), and pass
-  // the total length of the sequence as a cross product of the
-  // dimensions.
-
-  be_sequence *sequence = this->ctx_->be_node_as_sequence ();
-
-  if (!sequence)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sequence node\n"),
-                        -1);
-    }
-
-  // Handle octet sequences using the optimizations provided by the TAO ORB
-  // Core. If these optimizations are not available, then use the normal form.
-
-  if (node->pt () == AST_PredefinedType::PT_octet && sequence->unbounded ())
-    {
-      *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl;
-
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_CDR_INPUT:
-          {
-            *os << "if (ACE_BIT_DISABLED (strm.start ()->flags ()," << be_nl
-                << "ACE_Message_Block::DONT_DELETE))" << be_nl
-                << "{" << be_idt_nl
-                <<  "TAO_ORB_Core* orb_core = strm.orb_core ();" << be_nl
-                << "if (orb_core != 0 &&" << be_nl
-                << "strm.orb_core ()->resource_factory ()->" << be_nl
-                << "input_cdr_allocator_type_locked () == 1)" << be_nl
-                << "{" << be_idt_nl
-                << "TAO_Unbounded_Sequence< ::CORBA::Octet> *oseq = " << be_nl
-                << "  static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> ("
-                << "&_tao_sequence);" << be_nl
-                << "oseq->replace (_tao_seq_len, strm.start ());"
-                << be_nl
-                << "oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + "
-                << "_tao_seq_len);" << be_nl
-                << "strm.skip_bytes (_tao_seq_len);" << be_nl
-                << "return 1;" << be_uidt_nl
-                << "}" << be_uidt_nl
-                << "}" << be_nl
-                << "return strm.read_octet_array ("
-                << "_tao_sequence.get_buffer (), _tao_seq_len);";
-          }
-          break;
-        case TAO_CodeGen::TAO_CDR_OUTPUT:
-          {
-            *os << "{" << be_idt_nl
-                << "TAO_Unbounded_Sequence< ::CORBA::Octet> *_tao_octet_seq = " << be_nl
-                << "  static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> "
-                << "(const_cast<" << sequence->name () << " *> (&_tao_sequence));" << be_nl
-                << "if (_tao_octet_seq->mb ())" << be_idt_nl
-                << "return strm.write_octet_array_mb (_tao_octet_seq->mb ());"
-                << be_uidt_nl
-                << "else" << be_idt_nl
-                << "return strm.write_octet_array ("
-                << "_tao_sequence.get_buffer (), _tao_sequence.length ());"
-                << be_uidt << be_uidt_nl
-                << "}" << be_nl;
-          }
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                             "visit_predefined_type - "
-                             "bad sub state\n"),
-                            -1);
-        }
-
-      *os << "\n#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */" << be_nl;
-    }
-
-  *os << "return strm.";
-
-  // Based on our substate, we may be reading from a stream or writing into a
-  // stream/
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "read_";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "write_";
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_predefined_type - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  // Determine what kind of sequence are we reading/writing.
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_long:
-      *os << "long_array";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "ulong_array";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "short_array";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "ushort_array";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "octet_array";
-      break;
-    case AST_PredefinedType::PT_char:
-      *os << "char_array";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "wchar_array";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "float_array";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "double_array";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "longlong_array";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "ulonglong_array";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "longdouble_array";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "boolean_array";
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_predefined_type - "
-                         "bad primitive type for optimized code gen\n"),
-                        -1);
-    }
-
-  // Handle special case to avoid compiler errors.
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_char:
-      switch (this->ctx_->sub_state ())
-        {
-        case TAO_CodeGen::TAO_CDR_INPUT:
-          *os << " ((char *)_tao_sequence.get_buffer (), ";
-          break;
-        case TAO_CodeGen::TAO_CDR_OUTPUT:
-          *os << " ((const char *)_tao_sequence.get_buffer (), ";
-          break;
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cdr_op_cs"
-                             "::visit_predefined_type - "
-                             "bad codegen substate\n"),
-                            -1);
-        }
-      break;
-    default:
-      *os << " (_tao_sequence.get_buffer (), ";
-      break;
-    }
-
-  *os << "_tao_sequence.length ());" << be_uidt_nl;
-
-  if (node->pt () == AST_PredefinedType::PT_octet && sequence->unbounded ())
-    {
-      *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */" << be_nl;
-    }
-
-  return 0;
+  return this->visit_node (node);
 }
 
 int
@@ -562,373 +246,11 @@ be_visitor_sequence_cdr_op_cs::visit_union (be_union *node)
 int
 be_visitor_sequence_cdr_op_cs::visit_typedef (be_typedef *node)
 {
-  this->ctx_->alias (node);
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
+  return this->visit_node (node);
 }
 
 int
-be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
+be_visitor_sequence_cdr_op_cs::visit_node (be_type *)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_sequence *node = this->ctx_->be_node_as_sequence ();
-
-  if (!node)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_node - "
-                         "bad sequence node\n"),
-                        -1);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  // Initialize a boolean variable.
-  *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
-
-  // We get here if the "type" of individual elements of the sequence is not a
-  // primitive type. In this case, we are left with no other alternative but
-  // to encode/decode element by element.
-
-  AST_Expression *expr = node->max_size ();
-
-  if (expr == 0 || (expr != 0 && expr->ev () == 0))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_node - "
-                         "bad sequence dimension\n"),
-                        -1);
-    }
-
-  if (expr->ev ()->et == AST_Expression::EV_ulong)
-    {
-      *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len"
-          << " && _tao_marshal_flag; "
-          << "++i)" << be_idt_nl
-          << "{" << be_idt_nl;
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_node - "
-                         "bad sequence dimension value\n"),
-                        -1);
-    }
-
-  AST_Decl::NodeType nt = bt->node_type ();
-  be_typedef *td = 0;
-
-  if (nt == AST_Decl::NT_typedef)
-    {
-      td = be_typedef::narrow_from_decl (bt);
-      nt = td->base_node_type ();
-    }
-
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      switch (nt)
-        {
-        case AST_Decl::NT_array:
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_forany tmp (";
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_alloc ());" << be_nl;
-          *os << "_tao_marshal_flag = (strm >> tmp);" << be_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_copy (_tao_sequence[i], tmp.in ());" << be_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_free (tmp.inout ());" << be_uidt_nl;
-
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-          {
-            be_string *str =
-              be_string::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!str)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                   "visit_node - "
-                                   "bad string node\n"),
-                                  -1);
-              }
-
-            if (str->max_size ()->ev ()->u.ulval == 0)
-              {
-                // Unbounded.
-                *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());"
-                    << be_uidt_nl;
-              }
-            else
-              {
-                if (str->width () == (long) sizeof (char))
-                  {
-                    *os << "_tao_marshal_flag = (strm >> "
-                        << "::ACE_InputCDR::to_string (_tao_sequence[i].out (), ";
-                  }
-                else
-                  {
-                    *os << "_tao_marshal_flag = (strm >> "
-                        << "::ACE_InputCDR::to_wstring (_tao_sequence[i].out (), ";
-                  }
-
-                *os << str->max_size ()->ev ()->u.ulval << "));"
-                    << be_uidt_nl;
-              }
-          }
-          break;
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_valuetype:
-        case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_valuebox:
-          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());";
-
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            // We need to separately handle this case of pseudo objects
-            // because they have a _var type.
-            be_predefined_type *pt =
-              be_predefined_type::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!pt)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                   "visit_node - "
-                                   "bad predefined type node\n"),
-                                  -1);
-              }
-
-            switch (pt->pt ())
-              {
-                case AST_PredefinedType::PT_pseudo:
-                case AST_PredefinedType::PT_object:
-                case AST_PredefinedType::PT_value:
-                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());";
-                  break;
-                case AST_PredefinedType::PT_char:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_char (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_wchar:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_wchar (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_boolean:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_boolean (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_octet:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::ACE_InputCDR::to_octet (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                default:
-                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);";
-                  break;
-              }
-          }
-
-          break;
-        default:
-          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);";
-
-          break;
-        }
-
-      *os << be_uidt_nl
-          << "}";
-
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      switch (nt)
-        {
-        case AST_Decl::NT_array:
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_var tmp_var (" << be_idt << be_idt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_dup (_tao_sequence[i])" << be_uidt_nl
-              << ");" << be_uidt_nl;
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                 "visit_node - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_forany tmp (tmp_var.inout ());" << be_nl;
-          *os << "_tao_marshal_flag = (strm << tmp);";
-
-          break;
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-          *os << "_tao_marshal_flag =" << be_idt_nl
-              << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
-              << be_idt << be_idt_nl
-              << "_tao_sequence[i].in (), strm" << be_uidt_nl
-              << ");" << be_uidt << be_uidt;
-
-          break;
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_wstring:
-        case AST_Decl::NT_valuetype:
-        case AST_Decl::NT_valuetype_fwd:
-        case AST_Decl::NT_valuebox:
-          *os << "_tao_marshal_flag = (strm << _tao_sequence[i].in ());";
-
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            be_predefined_type *pt =
-              be_predefined_type::narrow_from_decl (
-                  td == 0 ? bt : td->primitive_base_type ()
-                );
-
-            if (!pt)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                                   "visit_node - "
-                                   "bad predefined type node\n"),
-                                  -1);
-              }
-
-            switch (pt->pt ())
-              {
-                case AST_PredefinedType::PT_pseudo:
-                case AST_PredefinedType::PT_object:
-                case AST_PredefinedType::PT_value:
-                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i].in ());";
-                  break;
-                case AST_PredefinedType::PT_char:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_char (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_wchar:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_wchar (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_boolean:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_boolean (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                case AST_PredefinedType::PT_octet:
-                  *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::ACE_OutputCDR::from_octet (_tao_sequence[i]));"
-                      << be_uidt;
-                  break;
-                default:
-                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-                  break;
-              }
-          }
-
-          break;
-        default:
-          *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
-
-          break;
-        }
-
-      *os << be_uidt_nl
-          << "}";
-
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_node - "
-                         "bad sub state\n"),
-                        -1);
-    }
-
-  *os << be_uidt_nl << be_nl;
-  *os << "return _tao_marshal_flag;" << be_uidt_nl;
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index cc10b86b3bb..6621711d7f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -71,7 +71,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  bt->seen_in_sequence (I_TRUE);
+  bt->seen_in_sequence (true);
   AST_Decl::NodeType nt = bt->node_type ();
 
   // If our base type is an anonymouse sequence, we must create a  name
@@ -170,7 +170,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
     }
 
   *os << "* buffer, " << be_nl
-      << "::CORBA::Boolean release = 0" << be_uidt_nl
+      << "::CORBA::Boolean release = false" << be_uidt_nl
       << ");" << be_uidt_nl;
   *os << node->local_name () << " (const " << node->local_name ()
       << " &);" << be_nl;
@@ -178,14 +178,14 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   if (be_global->any_support () && !node->anonymous ())
     {
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << "static void _tao_any_destructor (void *);";
     }
 
   // Generate the _var_type typedef (only if we are not anonymous).
   if (this->ctx_->tdef () != 0)
     {
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << "typedef " << node->local_name () << "_var _var_type;";
     }
 
@@ -220,7 +220,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                 << "::CORBA::ULong length," << be_nl
                 << "const ACE_Message_Block* mb" << be_uidt_nl
                 << ")" << be_uidt_nl
-                << "  : TAO_Unbounded_Sequence< ::CORBA::Octet>"
+                << "  : TAO::unbounded_value_sequence< ::CORBA::Octet>"
                 << " (length, mb) {}" << "\n"
                 << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
     }
@@ -239,145 +239,25 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
                                              be_type *elem)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_decl *scope = this->ctx_->scope ();
 
   *os << be_nl << be_nl;
 
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      *os << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << "TAO_Object_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << "," << be_nl;
-      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl << ">"
-          << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_var;" << be_uidt;
+    AST_Type::SIZE_TYPE st = elem->size_type ();
 
-      *os << be_nl << be_nl
-          << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << node->local_name () << "_var," << be_nl
-          << "TAO_Object_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << "," << be_nl;
-      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl << ">"
-          << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_out;" << be_uidt;
-
-      break;
-    case be_sequence::MNG_PSEUDO:
-      *os << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << be_uidt_nl
-          << ">" << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_var;" << be_uidt;
+    *os << "typedef" << be_idt_nl
+        << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<"
+                                  : "TAO_VarSeq_Var_T<")
+        << be_idt << be_idt_nl
+        << node->local_name ();
 
-      *os << be_nl << be_nl
-          << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << node->local_name () << "_var," << be_nl
-          << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << be_uidt_nl
-          << ">" << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_out;" << be_uidt;
-
-      break;
-    case be_sequence::MNG_VALUE:
-      *os << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << "," << be_nl;
-      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl
-          << ">" << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_var;" << be_uidt;
+    *os << be_uidt_nl
+        << ">" << be_uidt_nl
+        << node->local_name () << "_var;" << be_uidt;
 
-      *os << be_nl << be_nl
-          << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << node->local_name () << "_var," << be_nl
-          << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
-          << elem->nested_type_name (scope) << "," << be_nl;
-      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl
-          << ">" << be_uidt << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_out;" << be_uidt;
-
-      break;
-    case be_sequence::MNG_STRING:
-      *os << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << "TAO_SeqElem_String_Manager" << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_var;" << be_uidt;
-
-      *os << be_nl << be_nl
-          << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << node->local_name () << "_var," << be_nl
-          << "TAO_SeqElem_String_Manager" << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_out;" << be_uidt;
-
-      break;
-    case be_sequence::MNG_WSTRING:
-      *os << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << "TAO_SeqElem_WString_Manager" << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_var;" << be_uidt;
-
-      *os << be_nl << be_nl
-          << "typedef" << be_idt_nl
-          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
-          << node->local_name () << "," << be_nl
-          << node->local_name () << "_var," << be_nl
-          << "TAO_SeqElem_WString_Manager" << be_uidt_nl
-          << ">" << be_uidt_nl
-          << node->local_name () << "_out;" << be_uidt;
-
-      break;
-    default: // Not a managed type.
-      {
-        AST_Type::SIZE_TYPE st = elem->size_type ();
-
-        *os << "typedef" << be_idt_nl
-            << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<"
-                                      : "TAO_VarSeq_Var_T<")
-            << be_idt << be_idt_nl
-            << node->local_name () << "," << be_nl
-            << elem->nested_type_name (scope);
-
-        *os << be_uidt_nl
-            << ">" << be_uidt_nl
-            << node->local_name () << "_var;" << be_uidt;
-
-        *os << be_nl << be_nl
-            << "typedef" << be_idt_nl
-            << "TAO_Seq_Out_T<" << be_idt << be_idt_nl
-            << node->local_name () << "," << be_nl
-            << node->local_name () << "_var," << be_nl
-            << elem->nested_type_name (scope);
-
-        *os << be_uidt_nl
-            << ">" << be_uidt_nl
-            << node->local_name () << "_out;" << be_uidt;
-      }
-
-      break;
-    }
+    *os << be_nl << be_nl
+        << "typedef" << be_idt_nl
+        << "TAO_Seq_Out_T<" << be_idt << be_idt_nl
+        << node->local_name () << be_uidt_nl
+        << ">" << be_uidt_nl
+        << node->local_name () << "_out;" << be_uidt;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index 63782abb8d7..c96fb72bab1 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -193,6 +193,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
   os->gen_endif ();
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
index 1736ea2ea14..451061df12d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
@@ -779,7 +779,6 @@ be_visitor_sequence_serializer_op_cs::visit_node (be_type *bt)
       nt = td->base_node_type ();
     }
 
-
 switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
@@ -1011,7 +1010,7 @@ switch (this->ctx_->sub_state ())
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       {
     // Initialize a boolean variable.
-  *os << "::CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl;
+  *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
 
 
   if (expr->ev ()->et == AST_Expression::EV_ulong)
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index c1a351406d4..3d30576a792 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -52,6 +52,8 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -61,6 +63,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index bbb3250ab5f..ec9ee323817 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -53,6 +53,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -150,6 +152,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
index f29f1e5a5fd..8986fd0f56b 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
@@ -53,6 +53,8 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &);" << be_nl;
@@ -60,6 +62,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node)
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
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 73841a9b18e..2463764b749 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
@@ -60,6 +60,8 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -135,7 +137,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   *os << be_uidt_nl << "}";
 
-  node->cli_stub_cdr_op_gen (I_TRUE);
+  *os << be_global->core_versioning_end () << be_nl;
+
+  node->cli_stub_cdr_op_gen (true);
   return 0;
 }
 
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 4083ce2c89c..f99dbf45b27 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
@@ -244,7 +244,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node)
 
   *os << be_uidt_nl << "}";
 
-  node->cli_stub_serializer_op_gen (I_TRUE);
+  node->cli_stub_serializer_op_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index 27bcd6acaf7..f7e7d2751a6 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -98,6 +98,6 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
         }
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
index f3a7520ba70..8feffbd15ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
@@ -53,6 +53,6 @@ int be_visitor_structure_ci::visit_structure (be_structure *node)
                         -1);
     }
 
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index fe7103074a5..98c015f982e 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -91,6 +91,6 @@ be_visitor_structure_cs::visit_structure (be_structure *node)
                         -1);
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
index 1e8b3b26b0a..0df96e7e10a 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
@@ -50,6 +50,6 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node)
   // This will be a no-op if it has already been done for this node.
   fd->gen_common_varout (os);
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index 2b36f4e51b5..920bc63e736 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -17,7 +17,9 @@
 #include "be_root.h"
 #include "be_module.h"
 #include "be_interface.h"
+#include "be_valuebox.h"
 #include "be_valuetype.h"
+#include "be_valuebox.h"
 #include "be_interface_fwd.h"
 #include "be_valuetype_fwd.h"
 #include "be_eventtype.h"
@@ -60,6 +62,8 @@ be_visitor_traits::visit_root (be_root *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_nl << be_nl
       << "// Traits specializations." << be_nl
       << "namespace TAO" << be_nl
@@ -76,6 +80,8 @@ be_visitor_traits::visit_root (be_root *node)
   *os << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   return 0;
 }
 
@@ -125,7 +131,7 @@ be_visitor_traits::visit_interface (be_interface *node)
           << ");" << be_uidt_nl
           << "static ::" << node->name () << "_ptr nil (void);" << be_nl
           << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr p," << be_nl
+          << "const ::" << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "};";
@@ -141,7 +147,7 @@ be_visitor_traits::visit_interface (be_interface *node)
                         -1);
     }
 
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -166,7 +172,7 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node)
                         -1);
     }
 
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -211,7 +217,7 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -238,7 +244,42 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
                         -1);
     }
 
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
+  return 0;
+}
+
+int
+be_visitor_traits::visit_valuebox (be_valuebox *node)
+{
+  if (node->cli_traits_gen ())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // I think we need to generate this only for non-defined forward
+  // declarations.
+  if (!node->imported ())
+    {
+      os->gen_ifdef_macro (node->flat_name (), "traits", false);
+
+      *os << be_nl << be_nl
+          << "template<>" << be_nl
+          << "struct " << be_global->stub_export_macro () << " Value_Traits<"
+          << node->name () << ">" << be_nl
+          << "{" << be_idt_nl
+          << "static void add_ref (" << node->name () << " *);" << be_nl
+          << "static void remove_ref (" << node->name () << " *);"
+          << be_nl
+          << "static void release (" << node->name () << " *);"
+          << be_uidt_nl
+          << "};";
+
+      os->gen_endif ();
+    }
+
+  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -411,12 +452,17 @@ be_visitor_traits::visit_array (be_array *node)
       << be_uidt_nl
       << ");" << be_uidt_nl
       << "static " << name << "_slice * alloc (void);"
+      << "static void zero (" << be_idt << be_idt_nl
+      << name << "_slice * _tao_slice"
+      << be_uidt_nl
+      << ");" << be_uidt_nl
+
       << be_uidt_nl
       << "};";
 
 //  os->gen_endif ();
 
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
   return 0;
 }
 
@@ -438,6 +484,6 @@ be_visitor_traits::visit_typedef (be_typedef *node)
     }
 
   this->ctx_->alias (0);
-  node->cli_traits_gen (I_TRUE);
+  node->cli_traits_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 9a5328f90a7..ee9a79df3e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -645,7 +645,10 @@ be_visitor_typecode_defn::visit_array (be_array *node)
   // @todo Can we automate duplicate detection within the IDL compiler
   //       itself?
   os << "\n#ifndef _TAO_TYPECODE_" << node->flat_name () << "_GUARD"
-     << "\n#define _TAO_TYPECODE_" << node->flat_name () << "_GUARD" << be_nl;
+     << "\n#define _TAO_TYPECODE_" << node->flat_name () << "_GUARD"
+     << be_nl;
+
+  os << be_global->core_versioning_begin () << be_nl;
 
   // namespace begin
   os << "namespace TAO" << be_nl
@@ -728,6 +731,8 @@ be_visitor_typecode_defn::visit_array (be_array *node)
      << "}" << be_uidt_nl
      << "}" << be_nl << be_nl;
 
+  os << be_global->core_versioning_end () << be_nl;
+  
   os << "\n#endif /* _TAO_TYPECODE_" << node->flat_name () << "_GUARD */"
      << be_nl;
 
@@ -962,6 +967,9 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
      << "\n#define _TAO_TYPECODE_" << node->flat_name () << "_GUARD" << be_nl;
 
   // namespace begin
+
+  os << be_global->core_versioning_begin () << be_nl;
+
   os << "namespace TAO" << be_nl
      << "{" << be_idt_nl
      << "namespace TypeCode" << be_nl
@@ -998,6 +1006,8 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
      << "}" << be_uidt_nl
      << "}" << be_nl << be_nl;
 
+  os << be_global->core_versioning_end () << be_nl;
+
   os << "\n#endif /* _TAO_TYPECODE_" << node->flat_name () << "_GUARD */"
      << be_nl << be_nl;
 
@@ -1030,6 +1040,9 @@ be_visitor_typecode_defn::visit_string (be_string * node)
      << "\n#define _TAO_TYPECODE_" << node->flat_name () << "_GUARD" << be_nl;
 
   // namespace begin
+
+  os << be_global->core_versioning_begin () << be_nl;
+
   os << "namespace TAO" << be_nl
      << "{" << be_idt_nl
      << "namespace TypeCode" << be_nl
@@ -1055,6 +1068,8 @@ be_visitor_typecode_defn::visit_string (be_string * node)
      << "}" << be_uidt_nl
      << "}" << be_nl << be_nl;
 
+  os << be_global->core_versioning_end () << be_nl;
+
   os << "\n#endif /* _TAO_TYPECODE_" << node->flat_name () << "_GUARD */"
      << be_nl << be_nl;
 
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 f178ba8ba6c..2dff033c741 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -12,10 +12,6 @@
  */
 //=============================================================================
 
-
-#include <string>
-
-
 TAO::be_visitor_value_typecode::be_visitor_value_typecode (
   be_visitor_context * ctx)
   : be_visitor_typecode_defn (ctx)
@@ -28,7 +24,9 @@ int
 TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
 {
   if (!node->is_defined ())
-    return this->gen_forward_declared_typecode (node);
+    {
+      return this->gen_forward_declared_typecode (node);
+    }
 
   // Check if we are repeated.
   be_visitor_typecode_defn::QNode const * const qnode =
@@ -52,7 +50,9 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
     }
 
   if (this->recursion_detect_ || this->is_nested_)
+    {
     return 0;
+    }
 
   this->is_nested_ = true;
 
@@ -63,141 +63,110 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   if (this->gen_member_typecodes (node) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO::be_visitor_value_typecode::visit_valuetype - "
-                       "Unable to generate valuetype/eventtype field "
-                       "TypeCodes.\n"),
-                      -1);
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        "TAO::be_visitor_value_typecode::visit_valuetype - "
+                        "Unable to generate valuetype/eventtype field "
+                        "TypeCodes.\n"),
+                        -1);
+    }
 
   size_t const count =
     node->data_members_count (AST_Field::vis_PUBLIC)
     + node->data_members_count (AST_Field::vis_PRIVATE);
 
-  /*
-  if (count == 1 &&
-      count == node->nmembers ()  // Verify no operations.
-      && node->n_inherits () == 0)
-    {
-      // Generate a value box TypeCode.  It is more compact than a
-      // valuetype TypeCode.
-
-      UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+  ACE_CString const fields_name (ACE_CString ("_tao_fields_")
+                                 + node->flat_name ());
 
-      AST_Decl * const d = si.item ();
+  // Generate array containing value field characteristics.
+  os << "static TAO::TypeCode::Value_Field<char const *, "
+     << "::CORBA::TypeCode_ptr const *> const ";
 
-      ACE_ASSERT (d);
-
-      AST_Field * const field = AST_Field::narrow_from_decl (d);
-
-      ACE_ASSERT (field);
-
-      be_type * const member_type =
-        be_type::narrow_from_decl (field->field_type ());
-
-      // Generate the TypeCode instantiation.
-      os
-        << "static TAO::TypeCode::Value_Box<char const *," << be_nl
-        << "                                TAO::Null_RefCount_Policy>"
-        << be_idt_nl
-        << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
-        << "\"" << node->repoID () << "\"," << be_nl
-        << "\"" << node->original_local_name () << "\"," << be_nl
-        << "&"  << member_type->tc_name () << ");" << be_uidt_nl
-        << be_uidt_nl;
+  if (count == 0)
+    {
+      os << "* const " << fields_name.c_str () << " = 0;" << be_nl;
     }
   else
-  */
     {
-      std::string const fields_name (std::string ("_tao_fields_")
-                                     + node->flat_name ());
-
-      // Generate array containing value field characteristics.
-      os << "static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const ";
+      os << fields_name.c_str () << "[] =" << be_idt_nl
+         << "{" << be_idt_nl;
 
-      if (count == 0)
-        {
-          os << "* const " << fields_name.c_str () << " = 0;" << be_nl;
-        }
-      else
+      if (this->visit_members (node) != 0)
         {
-          os << fields_name.c_str () << "[] =" << be_idt_nl
-             << "{" << be_idt_nl;
-
-          if (this->visit_members (node) != 0)
-            return -1;
-
-          os << be_uidt_nl
-             << "};" << be_uidt_nl;
+          return -1;
         }
 
-      // Generate the TypeCode instantiation.
+      os << be_uidt_nl
+         << "};" << be_uidt_nl;
+    }
 
-      static char const StringType[]      = "char const *";
-      static char const TypeCodeType[]    = "::CORBA::TypeCode_ptr const *";
-      static char const MemberArrayType[] =
-        "TAO::TypeCode::Value_Field<char const *, "
-        "::CORBA::TypeCode_ptr const *> const *";
+  // Generate the TypeCode instantiation.
 
-      os << "static ";
+  static char const StringType[]      = "char const *";
+  static char const TypeCodeType[]    = "::CORBA::TypeCode_ptr const *";
+  static char const MemberArrayType[] =
+    "TAO::TypeCode::Value_Field<char const *, "
+    "::CORBA::TypeCode_ptr const *> const *";
 
-      if (this->is_recursive_)
-        {
-          os << "TAO::TypeCode::Recursive_Type<" << be_idt_nl;
-        }
+  os << "static ";
 
-      // -- TypeCodeBase --
-      os
-        << "TAO::TypeCode::Value<" << StringType << "," << be_nl
-        << "                     " << TypeCodeType << "," << be_nl
-        << "                     " << MemberArrayType << "," << be_nl
-        << "                     TAO::Null_RefCount_Policy>";
+  if (this->is_recursive_)
+    {
+      os << "TAO::TypeCode::Recursive_Type<" << be_idt_nl;
+    }
 
-      if (this->is_recursive_)
-        {
-          os << "," << be_nl
-             << TypeCodeType << "," << be_nl
-             << MemberArrayType << " >" << be_uidt_nl;
-        }
+  // -- TypeCodeBase --
+  os
+    << "TAO::TypeCode::Value<" << StringType << "," << be_nl
+    << "                     " << TypeCodeType << "," << be_nl
+    << "                     " << MemberArrayType << "," << be_nl
+    << "                     TAO::Null_RefCount_Policy>";
 
-      os << be_idt_nl
-         << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
-         << "::CORBA::tk_"
-         << (dynamic_cast<be_eventtype *> (node) ? "event" : "value")
-         << "," << be_nl
-         << "\"" << node->repoID () << "\"," << be_nl
-         << "\"" << node->original_local_name () << "\"," << be_nl;
-
-      // ValueModifier
-      //
-      // TAO doesn't support CUSTOM or TRUNCATABLE valuetypes.  Go
-      // with VM_NONE or VM_ABSTRACT.
-      os << "::CORBA::"
-         << (node->is_abstract () ? "VM_ABSTRACT" : "VM_NONE") << "," << be_nl;
-
-      // Concrete base type.
-      AST_ValueType * const concrete_base =
-        node->inherits_concrete ();
-
-      if (concrete_base)
-        {
-          be_type * const base_type =
-            be_type::narrow_from_decl (concrete_base);
+  if (this->is_recursive_)
+    {
+      os << "," << be_nl
+         << TypeCodeType << "," << be_nl
+         << MemberArrayType << " >" << be_uidt_nl;
+    }
 
-          ACE_ASSERT (base_type);
+  os << be_idt_nl
+     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
+     << "::CORBA::tk_"
+     << (dynamic_cast<be_eventtype *> (node) ? "event" : "value")
+     << "," << be_nl
+     << "\"" << node->repoID () << "\"," << be_nl
+     << "\"" << node->original_local_name () << "\"," << be_nl;
+
+  // ValueModifier
+  //
+  // TAO doesn't support CUSTOM or TRUNCATABLE valuetypes.  Go
+  // with VM_NONE or VM_ABSTRACT.
+  os << "::CORBA::"
+     << (node->is_abstract () ? "VM_ABSTRACT" : "VM_NONE") << "," << be_nl;
+
+  // Concrete base type.
+  AST_ValueType * const concrete_base =
+    node->inherits_concrete ();
+
+  if (concrete_base)
+    {
+      be_type * const base_type =
+        be_type::narrow_from_decl (concrete_base);
 
-          os << "&" << base_type->tc_name () << "," << be_nl;
-        }
-      else
-        {
-          // No concrete base.
-          os << "&::CORBA::_tc_null," << be_nl;
-        }
+      ACE_ASSERT (base_type);
 
-      // Fields
-      os << "_tao_fields_" << node->flat_name () << "," << be_nl
-         << count << ");" << be_uidt_nl
-         << be_uidt_nl;
+      os << "&" << base_type->tc_name () << "," << be_nl;
     }
+  else
+    {
+      // No concrete base.
+      os << "&::CORBA::_tc_null," << be_nl;
+    }
+
+  // Fields
+  os << "_tao_fields_" << node->flat_name () << "," << be_nl
+     << count << ");" << be_uidt_nl
+     << be_uidt_nl;
 
   return
     this->gen_typecode_ptr (be_type::narrow_from_decl (node));
@@ -233,9 +202,13 @@ TAO::be_visitor_value_typecode::gen_member_typecodes (be_valuetype * node)
         be_type::narrow_from_decl (field->field_type ());
 
       if (this->is_typecode_generation_required (member_type))
-        member_type->accept (this);
+        {
+          member_type->accept (this);
+        }
       else if (member_type == static_cast<be_type *> (node))
-        this->is_recursive_ = true;
+        {
+          this->is_recursive_ = true;
+        }
     }
 
   return 0;
@@ -276,7 +249,9 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
       AST_Field::Visibility const vis = field->visibility ();
 
       if (vis == AST_Field::vis_NA)
-        continue;
+        {
+          continue;
+        }
 
       be_decl * const member_decl =
         be_decl::narrow_from_decl (field);
@@ -310,7 +285,9 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
       os << " }";
 
       if (i < count - 1)
-        os << ",";
+        {
+          os << ",";
+        }
 
       os << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 352deb05e42..b76e320f440 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -188,7 +188,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
 
       // Base type is simply an alias to an array node. Simply output the
       // required typedefs.
-      
+
       // Typedef the type and the _slice type.
       *os << "typedef " << bt->nested_type_name (scope)
           << " " << tdef->nested_type_name (scope) << ";" << be_nl;
@@ -212,16 +212,16 @@ be_visitor_typedef_ch::visit_array (be_array *node)
 
       const char *static_decl = "";
       AST_Module *scope = AST_Module::narrow_from_scope (tdef->defined_in ());
-      
-      // If the typedef is not declared globally or in a module, the 
+
+      // If the typedef is not declared globally or in a module, the
       // associated array memory management function must be static.
       if (scope == 0)
         {
           static_decl = "static ";
         }
-        
+
       const char *td_name = tdef->nested_type_name (scope);
-      
+
       // If the array and the typedef are both declared inside
       // an interface or valuetype, for example, nested_type_name()
       // generates the scoped name, which, for the header file,
@@ -253,6 +253,12 @@ be_visitor_typedef_ch::visit_array (be_array *node)
           << td_name << "_slice *_tao_to," << be_nl
           << "const " << td_name << "_slice *_tao_from" << be_uidt_nl
           << ");" << be_uidt_nl;
+      // _zero
+      *os << be_nl
+          << "ACE_INLINE " << static_decl << be_nl
+          << "void " << td_name << "_zero (" << be_idt << be_idt_nl
+          << td_name << "_slice *_tao_slice" << be_uidt_nl
+          << ");" << be_uidt_nl;
       // _free
       *os << be_nl
           << "ACE_INLINE " << static_decl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index 24a47afb53f..53a2404ad2d 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -218,9 +218,19 @@ be_visitor_typedef_ci::visit_array (be_array *node)
       *os << "{" << be_idt_nl;
       *os << bt->name () << "_free (_tao_src);" << be_uidt_nl;
       *os << "}" << be_nl << be_nl;
+
+      // zero method
+      *os << "ACE_INLINE" << be_nl
+          << "void" << be_nl;
+      *os << tdef->name () << "_zero (" << be_idt << be_idt_nl
+          << tdef->name () << "_slice *_tao_src" << be_uidt_nl
+          << ")" << be_uidt_nl;
+      *os << "{" << be_idt_nl;
+      *os << bt->name () << "_zero (_tao_src);" << be_uidt_nl;
+      *os << "}" << be_nl << be_nl;
     }
 
-  bt->cli_inline_gen (I_TRUE);
+  bt->cli_inline_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index fe951a47060..897acca7ad6 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -52,6 +52,8 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
@@ -61,6 +63,8 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 62532ab116b..b84932013c1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -53,6 +53,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // Since we don't generate CDR stream operators for types that
   // explicitly contain a local interface (at some level), we
   // must override these Any template class methods to avoid
@@ -150,6 +152,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   // All we have to do is to visit the scope and generate code.
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index c65afad6779..f55a5c83d83 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -53,6 +53,8 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
       << " &);" << be_nl;
@@ -60,6 +62,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);";
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 6c12a1dd7b1..59a621cf4b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -66,6 +66,8 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -203,6 +205,8 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
       << "return result;" << be_uidt_nl
       << "}";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_stub_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
index 749f93c564f..2d3c9e0f119 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union, 
-           discriminant_ci, 
+ACE_RCSID (be_visitor_union,
+           discriminant_ci,
            "$Id$")
 
 // *************************************************************************
@@ -78,7 +78,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
           << "void " << be_nl
           << bu->name () << "::_default ()" << be_nl
           << "{" << be_idt_nl
-          << "this->_reset (this->disc_, false);" << be_nl
+          << "this->_reset ();" << be_nl
           << "this->disc_ = ";
 
       be_type* dt =
@@ -169,11 +169,11 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
       // Only if all cases are not covered AND there is no explicit
       // default, we get the _default () method.
 
-      *os << "ACE_INLINE" << be_nl 
+      *os << "ACE_INLINE" << be_nl
           << "void " << be_nl
           << bu->name () << "::_default ()" << be_nl
           << "{" << be_idt_nl
-          << "this->_reset (this->disc_, false);" << be_nl
+          << "this->_reset ();" << be_nl
           << "this->disc_ = ";
 
       switch (bu->udisc_type ())
@@ -255,7 +255,7 @@ be_visitor_union_discriminant_ci::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_discriminant_ci::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index 331ef16974f..304c53f522b 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -46,7 +46,7 @@ int be_visitor_union_ch::visit_union (be_union *node)
   // the recursive typecode include in the stub source file.
   ACE_Unbounded_Queue<AST_Type *> list;
   (void) node->in_recursion (list);
-        
+
   // Instantiate a visitor context with a copy of our context. This info
   // will be modified based on what type of node we are visiting.
   be_visitor_context ctx (*this->ctx_);
@@ -180,9 +180,8 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   // The reset method (TAO extension).
   *os << be_nl << be_nl
-      << "// TAO extension - frees any allocated storage." << be_nl;
-  *os << "void _reset (" << bt->nested_type_name (node)
-      << ", ::CORBA::Boolean /* finalize */);";
+      << "/// TAO extension - frees any allocated storage." << be_nl;
+  *os << "void _reset (void);";
 
   *os << be_uidt_nl << "};";
 
@@ -203,6 +202,6 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   os->gen_endif ();
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 6333a8f4945..e0d5784c355 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -91,6 +91,6 @@ int be_visitor_union_ci::visit_union (be_union *node)
                         -1);
     }
 
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
   return 0;
 }
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 83721c478b6..8e8d563605c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -119,12 +119,12 @@ int be_visitor_union_cs::visit_union (be_union *node)
   // Get the first label in its list.
   AST_UnionLabel *ul = ub->label (0);
   AST_Union::DefaultValue dv;
-  
+
   // This can indicate an error in the return value, but it is
   // caught elsewhere.
   (void) node->default_value (dv);
-    
-  bool test = dv.computed_ == 0 
+
+  bool test = dv.computed_ == 0
               && ul->label_kind () == AST_UnionLabel::UL_label;
 
   if (test)
@@ -182,7 +182,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       << " (void)" << be_nl
       << "{" << be_idt_nl
       << "// Finalize." << be_nl
-      << "this->_reset (this->disc_, 1);" << be_uidt_nl
+      << "this->_reset ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   if (be_global->any_support ())
@@ -214,7 +214,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       << "return *this;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
   // Reset and set the discriminant.
-  *os << "this->_reset (u.disc_, 0);" << be_nl;
+  *os << "this->_reset ();" << be_nl;
   *os << "this->disc_ = u.disc_;" << be_nl << be_nl;
   // now switch based on the disc value
   *os << "switch (this->disc_)" << be_nl;
@@ -249,10 +249,9 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
   // The reset method.
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS);
-  
-  *os << "// Reset method to reset old values of a union." << be_nl;
-  *os << "void " << node->name () << "::_reset (" << bt->name ()
-      << ", ::CORBA::Boolean /*finalize*/)" << be_nl;
+
+  *os << "/// Reset method to reset old values of a union." << be_nl;
+  *os << "void " << node->name () << "::_reset (void)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "switch (this->disc_)" << be_nl;
   *os << "{" << be_idt_nl;
@@ -298,6 +297,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
         }
     }
 
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index c4644d2e2a4..202730f42c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -235,7 +235,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  idl_bool bt_is_defined = node->is_defined ();
+  bool bt_is_defined = node->is_defined ();
 
   *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -266,7 +266,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
         }
 
       *os << "duplicate (" << be_idt << be_idt_nl
-          << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
+          << "u.u_." << ub->local_name () << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
@@ -289,7 +289,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 
       *os << "duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name ()
-          << "_->ptr ()" << be_uidt_nl
+          << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -332,7 +332,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
+  bool bt_is_defined = node->full_definition ()->is_defined ();
 
   *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -363,7 +363,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
         }
 
       *os << "duplicate (" << be_idt << be_idt_nl
-          << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
+          << "u.u_." << ub->local_name () << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
@@ -386,7 +386,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
       *os << "duplicate (" << be_idt << be_idt_nl
           << "u.u_." << ub->local_name ()
-          << "_->ptr ()" << be_uidt_nl
+          << "_->in ()" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -465,7 +465,7 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
       // We are generating the copy constructor.
       *os << "ACE_NEW (" << be_idt << be_idt_nl
           << "this->u_." << ub->local_name () << "_," << be_nl
-          << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->ptr ())"
+          << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->in ())"
           << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
@@ -474,7 +474,7 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
       // We are generating the assignment operator.
       *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
           << "this->u_." << ub->local_name () << "_," << be_nl
-          << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->ptr ()),"
+          << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->in ()),"
           << be_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
@@ -531,7 +531,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
               << "this->u_." << ub->local_name () << "_," << be_nl
               << "OBJECT_FIELD ( ::CORBA::Object"
               << "::_duplicate (u.u_." << ub->local_name ()
-              << "_->ptr ()))" << be_uidt_nl
+              << "_->in ()))" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl;
         }
       else
@@ -541,7 +541,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
               << "this->u_." << ub->local_name () << "_," << be_nl
               << "OBJECT_FIELD ( ::CORBA::Object"
               << "::_duplicate (u.u_." << ub->local_name ()
-              << "_->ptr ()))," << be_nl
+              << "_->in ()))," << be_nl
               << "*this" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index ab48fae03db..afcf5ee165f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -172,26 +172,17 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
       << " val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   // Default label.
   else
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -201,7 +192,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
       << "}" << be_nl << be_nl;
 
   // Get method.
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << fname << "_slice *" << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
@@ -244,33 +235,24 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
       << " val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   // Default label.
   else
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -279,7 +261,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
       << "}" << be_nl << be_nl;
 
   // Get method.
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
@@ -322,36 +304,27 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
       << "_ptr val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   // Default label.
   else
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
-  idl_bool bt_is_defined = node->is_defined ();
+  bool bt_is_defined = node->is_defined ();
 
   *os << ";" << be_nl
       << "typedef "
@@ -376,12 +349,12 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
       << "}" << be_nl << be_nl;
 
   // Get method.
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "_ptr " << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
-      << "return this->u_." << ub->local_name () << "_->ptr ();" << be_uidt_nl
+      << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
 
   return 0;
@@ -419,36 +392,27 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
       << "_ptr val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   // Default label.
   else
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
-  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
+  bool bt_is_defined = node->full_definition ()->is_defined ();
 
   *os << ";" << be_nl
       << "typedef "
@@ -473,12 +437,12 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
       << "}" << be_nl << be_nl;
 
   // Get method.
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "_ptr " << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
-      << "return this->u_." << ub->local_name () << "_->ptr ();" << be_uidt_nl
+      << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
 
   return 0;
@@ -541,26 +505,17 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
       << " *val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   // Default label.
   else
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -575,12 +530,12 @@ be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
       << "}" << be_nl << be_nl;
 
   // Get method.
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << "* " << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
-      << "return this->u_." << ub->local_name () << "_->ptr ();" << be_uidt_nl
+      << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl
       << "}";
 
   return 0;
@@ -649,26 +604,17 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
   *os << " val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl;
@@ -719,20 +665,20 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
     {
     case AST_PredefinedType::PT_object:
       // Get method.
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "::" << bt->name () << "_ptr" << be_nl
           << bu->name () << "::" << ub->local_name ()
           << " (void) const" << be_nl
           << "{" << be_idt_nl;
       *os << "return this->u_." << ub->local_name ()
-          << "_->ptr ();" << be_uidt_nl;
+          << "_->in ();" << be_uidt_nl;
       *os << "}";
 
       break;
     case AST_PredefinedType::PT_pseudo:
       // Get method.
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "::" << bt->name () << "_ptr" << be_nl
           << bu->name () << "::" << ub->local_name ()
@@ -745,7 +691,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
       break;
     case AST_PredefinedType::PT_value:
       // Get method.
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "::" << bt->name () << " *" << be_nl
           << bu->name () << "::" << ub->local_name ()
@@ -758,7 +704,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
       break;
     case AST_PredefinedType::PT_any:
       // Get method with read-only access.
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "const ::" << bt->name () << " &" << be_nl
           << bu->name () << "::" << ub->local_name ()
@@ -768,7 +714,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
           << "}" << be_nl << be_nl;
 
       // Get method with read/write access
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "::" << bt->name () << " &" << be_nl
           << bu->name () << "::" << ub->local_name ()
@@ -781,7 +727,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
       break;
     default:
       // Get method.
-      *os << "// Retrieve the member." << be_nl
+      *os << "/// Retrieve the member." << be_nl
           << "ACE_INLINE" << be_nl
           << "::" << bt->name () << be_nl
           << bu->name () << "::" << ub->local_name ()
@@ -828,33 +774,24 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // (1) Set from a const.
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name ()
       << " (const " << bt->name () << " &val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -865,7 +802,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << "}" << be_nl << be_nl;
 
   // Readonly get method.
-  *os << "// Readonly get method." << be_nl
+  *os << "/// Readonly get method." << be_nl
       << "ACE_INLINE" << be_nl
       << "const " << bt->name () << " &" << be_nl
       << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
@@ -874,7 +811,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
       << "}" << be_nl << be_nl;
 
   // Read/write get method.
-  *os << "// Read/write get method." << be_nl
+  *os << "/// Read/write get method." << be_nl
       << "ACE_INLINE" << be_nl
       << bt->name () << " &" << be_nl
       << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
@@ -908,7 +845,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl;
 
@@ -925,26 +862,17 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
   *os << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -967,26 +895,17 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
     }
 
   *os << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -1005,7 +924,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
     }
 
   // (3) Set from const String_var& or WString_var&
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name ();
@@ -1021,26 +940,17 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
 
   *os << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
@@ -1137,33 +1047,24 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // (1) Set from a const.
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << "ACE_INLINE" << be_nl
       << "void" << be_nl
       << bu->name () << "::" << ub->local_name ()
       << " (const " << bt->name () << " &val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl;
@@ -1309,26 +1210,17 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << " (const " << bt->name () << " &val)" << be_nl
       << "{" << be_idt_nl
       << "// Set the discriminant value." << be_nl
-      << "this->_reset (";
+      << "this->_reset ();" << be_nl
+      << "this->disc_ = ";
 
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       ub->gen_label_value (os);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_label_value (os);
     }
   else
   // We have an explicit default case.
     {
       ub->gen_default_label_value (os, bu);
-
-      *os << ", 0);" << be_nl
-          << "this->disc_ = ";
-
-      ub->gen_default_label_value (os, bu);
     }
 
   *os << ";" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
index 474c49e7075..a589e8eb0c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
@@ -48,6 +48,6 @@ be_visitor_union_fwd_ch::visit_union_fwd (be_union_fwd *node)
   // This will be a no-op if it has already been done for this node.
   fd->gen_common_varout (os);
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
index 394ec3fe36f..c6d4bb2eaed 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
@@ -42,6 +42,7 @@
 #include "be_visitor_typecode.h"
 #include "be_visitor_union.h"
 #include "be_visitor_valuebox.h"
+#include "ace/Log_Msg.h"
 
 #include "be_visitor_valuebox/valuebox.cpp"
 #include "be_visitor_valuebox/valuebox_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
index 91ab4bab216..e763f9917c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
@@ -69,7 +69,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
                             -1);
         }
 
-      // Some compilers handle "any" operators in a namespace
+      // Some compilers handle "any" operatorrs in a namespace
       // corresponding to their module, others do not.
       *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
 
@@ -94,6 +94,8 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
@@ -103,6 +105,8 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   if (module != 0)
     {
       *os << "\n\n#endif";
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 b4945e33bf9..cde4eff0f7c 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
@@ -55,6 +55,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // All template specializations must be generated before the instantiations
   // in the operators.
   *os << be_nl << be_nl
@@ -73,6 +75,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << "}" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
  
@@ -146,6 +149,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << "// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
@@ -189,6 +194,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
index e6984d70a1f..29e474db40b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
@@ -49,6 +49,8 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_global->stub_export_macro () << " "
       << "::CORBA::Boolean operator<< (TAO_OutputCDR &, const "
       << node->full_name () << " *);" << be_nl;
@@ -57,6 +59,8 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
       << "::CORBA::Boolean operator>> (TAO_InputCDR &, "
       << node->full_name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
index 44534680d0e..3b4856930e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -46,11 +46,13 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  node->cli_stub_cdr_op_gen (I_TRUE);
+  node->cli_stub_cdr_op_gen (true);
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+*os << be_global->core_versioning_begin () << be_nl;
+  
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -83,6 +85,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
index 645379236ce..c183b8ef2cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
@@ -19,8 +19,8 @@
 //    Gary Maxey
 //
 // ============================================================================
-ACE_RCSID (be_visitor_valuebox, 
-           field_ci, 
+ACE_RCSID (be_visitor_valuebox,
+           field_ci,
            "$Id$")
 
 be_visitor_valuebox_field_ci::be_visitor_valuebox_field_ci (
@@ -44,7 +44,7 @@ be_visitor_valuebox_field_ci::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -55,7 +55,7 @@ be_visitor_valuebox_field_ci::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -86,15 +86,15 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_array - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
   char fname [NAMEBUFSIZE];
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (bt->node_type () != AST_Decl::NT_typedef)
@@ -106,30 +106,30 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
         {
           be_decl *parent =
                  be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            bt->full_name ());
         }
     }
   else
     {
       // Typedefed node.
-      ACE_OS::sprintf (fname, 
-                       "%s", 
+      ACE_OS::sprintf (fname,
+                       "%s",
                        bt->full_name ());
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Modifier to set the member." << be_nl;
+  *os << "/// Modifier to set the member." << be_nl;
 
   *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::" << field->local_name ()
@@ -140,7 +140,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node)
       << ", val);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "// Accessor to retrieve the member." << be_nl;
+  *os << "/// Accessor to retrieve the member." << be_nl;
 
   *os << "ACE_INLINE const " << fname << "_slice *" << be_nl
       << vb_node->name () << "::" << field->local_name ()
@@ -175,7 +175,7 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_enum - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -213,7 +213,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -223,17 +223,17 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "// Modifier to set the member." << be_nl;
-  
+
   *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::" << field->local_name ()
       << " (" << bt->name () << "_ptr val)"
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
-      << " = " << "TAO::Objref_Traits< ::" << bt->name () 
+      << " = " << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  this->emit_member_get (vb_node, field, bt, "", "_ptr", "const", ".ptr ()");
+  this->emit_member_get (vb_node, field, bt, "", "_ptr", "const", ".in ()");
 
   return 0;
 }
@@ -260,7 +260,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_interface_fwd - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -270,17 +270,17 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "// Modifier to set the member." << be_nl;
-  
+
   *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::" << field->local_name ()
       << " (" << bt->name () << "_ptr val)"
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value->" << field->local_name ()
-      << " = " << "TAO::Objref_Traits< ::" << bt->name () 
+      << " = " << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  this->emit_member_get (vb_node, field, bt, "", "_ptr", "const", ".ptr ()");
+  this->emit_member_get (vb_node, field, bt, "", "_ptr", "const", ".in ()");
 
   return 0;
 }
@@ -335,7 +335,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_predefined_type - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -399,7 +399,7 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_sequence - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -437,7 +437,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_predefined_type - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -496,7 +496,7 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_structure - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -523,7 +523,7 @@ be_visitor_valuebox_field_ci::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -553,7 +553,7 @@ be_visitor_valuebox_field_ci::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_field_ci::"
                          "visit_union - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -601,7 +601,7 @@ be_visitor_valuebox_field_ci::emit_member_get (be_decl *vb_node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "// Accessor to retrieve the member." << be_nl;
+  *os << "/// Accessor to retrieve the member." << be_nl;
 
   *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix
       << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
index 0e1e291cb9c..792894f619a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
@@ -19,7 +19,7 @@
 //    Gary Maxey
 //
 // ============================================================================
-ACE_RCSID (be_visitor_valuebox, 
+ACE_RCSID (be_visitor_valuebox,
            union_member_ci,
            "$Id$")
 
@@ -44,7 +44,7 @@ be_visitor_valuebox_union_member_ci::visit_union_member (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_union_member - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -55,7 +55,7 @@ be_visitor_valuebox_union_member_ci::visit_union_member (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_union_member - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -86,15 +86,15 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_array - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
   char fname [NAMEBUFSIZE];
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (bt->node_type () != AST_Decl::NT_typedef)
@@ -106,30 +106,30 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
         {
           be_decl *parent =
                  be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            bt->full_name ());
         }
     }
   else
     {
       // Typedefed node.
-      ACE_OS::sprintf (fname, 
-                       "%s", 
+      ACE_OS::sprintf (fname,
+                       "%s",
                        bt->full_name ());
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Modifier to set the member." << be_nl;
+  *os << "/// Modifier to set the member." << be_nl;
 
   *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::" << field->local_name ()
@@ -139,7 +139,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node)
       << " (val);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "// Accessor to retrieve the member." << be_nl;
+  *os << "/// Accessor to retrieve the member." << be_nl;
 
   *os << "ACE_INLINE const " << fname << "_slice *" << be_nl
       << vb_node->name () << "::" << field->local_name ()
@@ -174,7 +174,7 @@ be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_enum - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -212,7 +212,7 @@ be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -249,7 +249,7 @@ be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_interface_fwd - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -300,7 +300,7 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type *
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_predefined_type - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -354,7 +354,7 @@ be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_sequence - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -392,7 +392,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_predefined_type - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -451,7 +451,7 @@ be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_structure - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -478,7 +478,7 @@ be_visitor_valuebox_union_member_ci::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -508,7 +508,7 @@ be_visitor_valuebox_union_member_ci::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuebox_union_member_ci::"
                          "visit_union - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -555,7 +555,7 @@ be_visitor_valuebox_union_member_ci::emit_member_get (be_decl *vb_node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "// Accessor to retrieve the member." << be_nl;
+  *os << "/// Accessor to retrieve the member." << be_nl;
 
   *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix
       << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index ec713d6758e..c0f28c78a64 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuebox, 
-           valuebox_ch, 
+ACE_RCSID (be_visitor_valuebox,
+           valuebox_ch,
            "$Id: valuebox_ch.cpp Exp")
 
 // ******************************************************
@@ -67,16 +67,16 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << "TAO_Value_Out_T<" << be_idt << be_idt_nl
       << node->local_name () << be_uidt_nl
       << ">" << be_uidt_nl
-      << node->local_name () << "_out;" << be_uidt; 
+      << node->local_name () << "_out;" << be_uidt;
 
   *os << be_nl << be_nl << "class " << be_global->stub_export_macro ()
       << " " << node->local_name ();
   *os << be_idt_nl <<": public virtual ::CORBA::DefaultValueRefCountBase";
 
-  *os << be_uidt << be_nl 
+  *os << be_uidt << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << be_nl;  
+      << be_nl;
 
   // _downcast method
   *os << "static " << node->local_name () << "* "
@@ -98,7 +98,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << node->local_name () << " *&" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
-  be_type *bt = be_type::narrow_from_decl (node->boxed_type ()); 
+  be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -110,7 +110,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
                        -1);
     }
 
- 
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -131,7 +131,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
   *os << "void operator= (const " << node->local_name () << " & val);"
       << be_nl;
 
-  *os << be_uidt_nl 
+  *os << be_uidt_nl
       << "};";
 
   os->gen_endif ();
@@ -153,7 +153,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
     }
 
   // Indicate that code is already generated for this node.
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
 
   return 0;
 }
@@ -180,31 +180,31 @@ be_visitor_valuebox_ch::visit_array (be_array *node)
   // Public assignment operator that takes a const array argument
   this->emit_assignment (node, "", "const ", "");
 
-  // Public accessor and modifier methods        
+  // Public accessor and modifier methods
   *os << "// accessors and modifier" << be_nl;
 
   *os << "const " << node->full_name () << "_slice* "
       << "_value (void) const;" << be_nl;
 
   *os << node->full_name () << "_slice* " << "_value (void);" << be_nl;
-        
+
   *os << "void" << " _value (const " << node->full_name () << " val);"
       << be_nl << be_nl;
 
   // Overloaded subscript operators
   *os << "const " << node->full_name ()
       << "_slice & operator[] ( ::CORBA::ULong index) const;" << be_nl;
-  
+
   *os << node->full_name ()
       << "_slice &  operator[] ( ::CORBA::ULong index);" << be_nl << be_nl;
 
   // Explicit conversion functions
-  *os << "const " << node->full_name () << "_slice * _boxed_in (void) const;" 
+  *os << "const " << node->full_name () << "_slice * _boxed_in (void) const;"
       << be_nl;
 
   *os << node->full_name () << "_slice * _boxed_inout (void);" << be_nl;
- 
-  *os << node->full_name () << "_slice * _boxed_out (void);" << be_nl 
+
+  *os << node->full_name () << "_slice * _boxed_out (void);" << be_nl
       << be_nl;
 
   // Member variable of underlying type;
@@ -276,7 +276,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
     }
 
   // Indicate that this type has been used as a sequence element.
-  bt->seen_in_sequence (I_TRUE);
+  bt->seen_in_sequence (true);
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
@@ -310,9 +310,9 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-  
+
   *os << " * buf," << be_nl
-      << "::CORBA::Boolean release = 0" << be_uidt_nl << ");" << be_uidt_nl;
+      << "::CORBA::Boolean release = false" << be_uidt_nl << ");" << be_uidt_nl;
 
   // Public constructor with single argument of type const T&
   this->emit_constructor_one_arg (node, "", "const ", "&");
@@ -358,9 +358,9 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node)
 
 
   *os << "::CORBA::ULong maximum (void) const;" << be_nl;
- 
+
   *os << "::CORBA::ULong length (void) const;" << be_nl;
- 
+
   *os << "void length ( ::CORBA::ULong len);" << be_nl << be_nl;
 
   // Member variable of underlying type;
@@ -398,7 +398,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
 
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
-  
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
@@ -432,7 +432,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node)
   *os << "// accessor" << be_nl;
 
   // Accessor function takes no arguments and returns a const char *
-  *os << "const " << node->full_name () 
+  *os << "const " << node->full_name ()
       << " _value (void) const;" << be_nl << be_nl;
 
   *os << "// modifiers" << be_nl;
@@ -593,7 +593,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 
   // Public accessor and modifier methods
   this->emit_accessor_modifier (node);
- 
+
   // Access to the boxed value for method signatures
   if (node->size_type() == AST_Type::FIXED)
     {
@@ -671,7 +671,7 @@ be_visitor_valuebox_ch::visit_union (be_union *node)
 
   // Member variable of underlying type;
   this->emit_boxed_member_var (node, "_var");
-  
+
   return 0;
 }
 
@@ -814,7 +814,7 @@ be_visitor_valuebox_ch::emit_boxed_access (be_decl *node,
 
   *os << node->full_name () << type_suffix << "&"
       << " _boxed_inout (void);" << be_nl;
- 
+
   *os << node->full_name () << type_suffix << out_ref_modifier << "&"
       << " _boxed_out (void);" << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index 6dd4b94aa4d..4acc14aaca8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -65,18 +65,8 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
       << "return \"" << node->repoID () << "\";" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // _tao_unmarshal_v method.  Generated because ValueBase interface
-  // requires it.  But there is nothing for it to do in the valuebox
-  // case.
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << node->name ()
-      << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
-      << "{" << be_idt_nl
-      << "return true;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   // Indicate that code is already generated for this node.
-  node->cli_inline_gen (I_TRUE);
+  node->cli_inline_gen (true);
 
   return 0;
 }
@@ -84,7 +74,6 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
 int
 be_visitor_valuebox_ci::visit_array (be_array *node)
 {
-
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
@@ -119,8 +108,8 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
   *os << "ACE_INLINE" << be_nl
       << vb_node->name () << "::" << vb_node->local_name () << " (const "
       << vb_node->local_name () << "& val)" << be_idt_nl
-      << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl
-      << "  ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)"
+      << ": ::CORBA::ValueBase (val)," << be_nl
+      << "  ::CORBA::DefaultValueRefCountBase (val)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name ()
@@ -191,30 +180,19 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "return this->_pd_value.out ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << node->name () << "_forany temp (this->_pd_value.ptr ());" << be_nl
-      << "return (strm << temp);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
 int
 be_visitor_valuebox_ci::visit_enum (be_enum *node)
 {
-  return this->emit_for_predef_enum (node, "", false,
-                                     "this->_pd_value");
+  return this->emit_for_predef_enum (node, "", false);
 }
 
 int
 be_visitor_valuebox_ci::visit_interface (be_interface *node)
 {
-  return this->emit_for_predef_enum (node, "_ptr", false,
-                                     "this->_pd_value");
+  return this->emit_for_predef_enum (node, "_ptr", false);
 }
 
 int
@@ -248,8 +226,10 @@ be_visitor_valuebox_ci::visit_predefined_type (be_predefined_type *node)
 
     default:
       marshal_arg = "this->_pd_value";
+      break;
     }
-  return this->emit_for_predef_enum (node, "", is_any, marshal_arg);
+
+  return this->emit_for_predef_enum (node, "", is_any);
 }
 
 int
@@ -264,7 +244,6 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   this->emit_default_constructor_alloc (node);
-  this->emit_destructor ();
   this->emit_constructor_one_arg_alloc (node);
   this->emit_copy_constructor_alloc (node);
   this->emit_assignment_alloc (node);
@@ -292,14 +271,6 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
       << "this->_pd_value->length (length);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
@@ -335,7 +306,6 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   this->emit_default_constructor ();
-  this->emit_destructor ();
   this->emit_constructor_one_arg (node, "");
   this->emit_copy_constructor ();
   this->emit_assignment (node, "");
@@ -440,15 +410,6 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "return this->_pd_value[slot];" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << "return (strm << this->_pd_value);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
@@ -464,7 +425,6 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   this->emit_default_constructor_alloc (node);
-  this->emit_destructor ();
   this->emit_constructor_one_arg_alloc (node);
   this->emit_copy_constructor_alloc (node);
   this->emit_assignment_alloc (node);
@@ -513,14 +473,6 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
         }
     }
 
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
@@ -554,7 +506,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   this->emit_default_constructor_alloc (node);
-  this->emit_destructor ();
   this->emit_constructor_one_arg_alloc (node);
   this->emit_copy_constructor_alloc (node);
   this->emit_assignment_alloc (node);
@@ -629,15 +580,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
       << "return this->_pd_value->_d ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
@@ -646,8 +588,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
 int
 be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
                                               const char * type_suffix,
-                                              bool is_any,
-                                              const char * marshal_arg)
+                                              bool is_any)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -657,8 +598,6 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  this->emit_destructor ();
-
   if (is_any)
     {
       this->emit_default_constructor_alloc (node);
@@ -712,14 +651,6 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
 
     }
 
-  // _tao_marshal_v method
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << vb_node->name ()
-      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl
-      << "return (strm << " << marshal_arg << ");" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   return 0;
 }
 
@@ -750,7 +681,7 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node)
   *os << "ACE_INLINE " << be_nl
       << vb_node->name () << "::" << vb_node->local_name () << " (void)"
       << be_nl << "{" << be_idt_nl
-      << node->full_name () << "* p;" << be_nl
+      << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " ());" << be_uidt_nl
@@ -758,22 +689,6 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node)
       << "}" << be_nl << be_nl;
 }
 
-
-void
-be_visitor_valuebox_ci::emit_destructor (void)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the node being visited by this be_visitor_valuebox_ci.
-  be_decl * vb_node = this->ctx_->node ();
-
-  // Protected destructor
-  *os << "ACE_INLINE " << be_nl
-      << vb_node->name () << "::~" << vb_node->local_name () << " (void)"
-      << be_nl << "{}" << be_nl << be_nl;
-}
-
-
 void
 be_visitor_valuebox_ci::emit_constructor_one_arg (be_decl *node,
                                                   const char * type_suffix)
@@ -805,7 +720,7 @@ be_visitor_valuebox_ci::emit_constructor_one_arg_alloc (be_decl *node)
       << vb_node->name () << "::" << vb_node->local_name ()
       << " (const " << node->full_name () << "& value)" << be_nl
       << "{" << be_idt_nl
-      << node->full_name () << "* p;" << be_nl
+      << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (value));" << be_uidt_nl
@@ -825,8 +740,8 @@ be_visitor_valuebox_ci::emit_copy_constructor (void)
   *os << "ACE_INLINE " << be_nl
       << vb_node->name () << "::" << vb_node->local_name ()
       << " (const " << vb_node->full_name () << "& val)" << be_idt_nl
-      << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl
-      << "  ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)"
+      << ": ::CORBA::ValueBase (val)," << be_nl
+      << "  ::CORBA::DefaultValueRefCountBase (val)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val._pd_value;" << be_uidt_nl
@@ -845,11 +760,11 @@ be_visitor_valuebox_ci::emit_copy_constructor_alloc (be_decl *node)
   *os << "ACE_INLINE " << be_nl
       << vb_node->name () << "::" << vb_node->local_name () << " (const "
       << vb_node->full_name () << "& val)" << be_idt_nl
-      << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl
-      << "  ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)"
+      << ": ::CORBA::ValueBase (val)," << be_nl
+      << "  ::CORBA::DefaultValueRefCountBase (val)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << node->full_name () << "* p;" << be_nl
+      << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (val._pd_value.in ()));" << be_uidt_nl
@@ -890,7 +805,7 @@ be_visitor_valuebox_ci::emit_assignment_alloc (be_decl *node)
       << vb_node->name () << "::operator= (const "
       << node->full_name () << "& value)" << be_nl
       << "{" << be_idt_nl
-      << node->full_name () << "* p;" << be_nl
+      << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW_RETURN (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (value)," << be_nl
@@ -928,7 +843,7 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node)
       << vb_node->name () << "::_value (const "
       << node->full_name () << "& value)" << be_nl
       << "{" << be_idt_nl
-      << node->full_name () << "* p;" << be_nl
+      << node->full_name () << "* p = 0;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (value));" << be_uidt_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 4c04dd07508..6a66cc503ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -62,15 +62,49 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  if (node->is_defined ())
+    {
+      *os << be_nl << be_nl
+          << "void" << be_nl
+          << "TAO::Value_Traits<" << node->name  () << ">::add_ref ("
+          << be_idt << be_idt_nl
+          << node->name () << " * p" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "::CORBA::add_ref (p);" << be_uidt_nl
+          << "}";
+
+      *os << be_nl << be_nl
+          << "void" << be_nl
+          << "TAO::Value_Traits<" << node->name () << ">::remove_ref ("
+          << be_idt << be_idt_nl
+          << node->name () << " * p" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "::CORBA::remove_ref (p);" << be_uidt_nl
+          << "}";
+
+      *os << be_nl << be_nl
+          << "void" << be_nl
+          << "TAO::Value_Traits<" << node->name () << ">::release ("
+          << be_idt << be_idt_nl
+          << node->name () << " * p" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "::CORBA::remove_ref (p);" << be_uidt_nl
+          << "}";
+    }
+
   // The _downcast method.
-  *os << be_nl << node->name () << " *" << be_nl
+  *os << be_nl << be_nl
+      << node->name () << " *" << be_nl
       << node->name () << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
       << "return dynamic_cast< ::" << node->name () << " * > (v);"
       << be_uidt_nl << "}" << be_nl << be_nl;
 
   // _copy_value method
-  *os << be_nl << "::CORBA::ValueBase *" << be_nl
+  *os << "::CORBA::ValueBase *" << be_nl
       << node->name () << "::_copy_value (void)" << be_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *result = 0;" << be_nl
@@ -161,6 +195,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "vb_object," << be_nl
       << node->local_name () << "," << be_nl
       << "false);" << be_nl << be_uidt_nl;
+
   if (is_array)
     {
       *os << at->full_name() << "_forany temp (vb_object->_boxed_inout ());"
@@ -169,7 +204,15 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   *os << "return (strm >> " << unmarshal_arg << ");" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-
+  // _tao_unmarshal_v method.  Generated because ValueBase interface
+  // requires it.  But there is nothing for it to do in the valuebox
+  // case.
+  *os << "::CORBA::Boolean " << be_nl
+      << node->name ()
+      << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
+      << "{" << be_idt_nl
+      << "return true;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -182,20 +225,57 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
     }
 
   // Indicate that code is already generated for this node.
-  node->cli_stub_gen (I_TRUE);
+  node->cli_stub_gen (true);
 
   return 0;
 }
 
 int
-be_visitor_valuebox_cs::visit_array (be_array *)
+be_visitor_valuebox_cs::visit_array (be_array * node)
 {
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << node->name () << "_forany temp (this->_pd_value.ptr ());" << be_nl
+     << "return (strm << temp);" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
   return 0;
 }
 
 int
 be_visitor_valuebox_cs::visit_enum (be_enum *)
 {
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  this->emit_destructor ();
+
+  static char const marshal_arg[] = "this->_pd_value";
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << "return (strm << " << marshal_arg << ");" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
   return 0;
 }
 
@@ -203,13 +283,42 @@ be_visitor_valuebox_cs::visit_enum (be_enum *)
 int
 be_visitor_valuebox_cs::visit_interface (be_interface *)
 {
-  return 0;
+  return this->emit_for_predef_enum ("this->_pd_value");
 }
 
 int
-be_visitor_valuebox_cs::visit_predefined_type (be_predefined_type *)
+be_visitor_valuebox_cs::visit_predefined_type (be_predefined_type * node)
 {
-  return 0;
+  char const * marshal_arg;
+
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_boolean:
+      marshal_arg = "::ACE_OutputCDR::from_boolean (this->_pd_value)";
+      break;
+
+    case AST_PredefinedType::PT_char:
+      marshal_arg = "::ACE_OutputCDR::from_char (this->_pd_value)";
+      break;
+
+    case AST_PredefinedType::PT_wchar:
+      marshal_arg = "::ACE_OutputCDR::from_wchar (this->_pd_value)";
+      break;
+
+    case AST_PredefinedType::PT_octet:
+      marshal_arg = "::ACE_OutputCDR::from_octet (this->_pd_value)";
+      break;
+
+    case AST_PredefinedType::PT_any:
+      marshal_arg = "this->_pd_value.in ()";
+      break;
+
+    default:
+      marshal_arg = "this->_pd_value";
+      break;
+    }
+
+  return this->emit_for_predef_enum (marshal_arg);
 }
 
 int
@@ -311,6 +420,8 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   // end: Public constructor for sequence with supplied buffer
 
+  this->emit_destructor ();
+
   // Accessor: non const
   if (bt->accept (&bt_visitor) == -1)
     {
@@ -385,18 +496,62 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node)
 
   *os << "}" << be_nl << be_nl;
 
+  // _tao_marshal_v method
+  *os << "::CORBA::Boolean " << be_nl
+      << vb_node->name ()
+      << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+      << "{" << be_idt_nl
+      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
   return 0;
 }
 
 int
 be_visitor_valuebox_cs::visit_string (be_string *)
 {
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  this->emit_destructor ();
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << "return (strm << this->_pd_value);" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
   return 0;
 }
 
 int
 be_visitor_valuebox_cs::visit_structure (be_structure *)
 {
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  this->emit_destructor ();
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << "return (strm << this->_pd_value.in ());" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
   return 0;
 }
 
@@ -421,5 +576,60 @@ be_visitor_valuebox_cs::visit_typedef (be_typedef *node)
 int
 be_visitor_valuebox_cs::visit_union (be_union *)
 {
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  this->emit_destructor ();
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << "return (strm << this->_pd_value.in ());" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
+  return 0;
+}
+
+void
+be_visitor_valuebox_cs::emit_destructor (void)
+{
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  // Protected destructor
+  os << vb_node->name () << "::~" << vb_node->local_name () << " (void)"
+     << be_nl << "{" << be_nl << "}" << be_nl << be_nl;
+}
+
+int
+be_visitor_valuebox_cs::emit_for_predef_enum (char const * marshal_arg)
+{
+  TAO_OutStream & os = *this->ctx_->stream ();
+
+  // Retrieve the node being visited by this be_visitor_valuebox_cs.
+  be_decl * const vb_node = this->ctx_->node ();
+
+  os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  this->emit_destructor ();
+
+  // _tao_marshal_v method
+  os << "::CORBA::Boolean " << be_nl
+     << vb_node->name ()
+     << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
+     << "{" << be_idt_nl
+     << "return (strm << " << marshal_arg << ");" << be_uidt_nl
+     << "}" << be_nl << be_nl;
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
index 32ebe90e547..84d1bd214c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           ami_exception_holder_ch, 
+ACE_RCSID (be_visitor_valuetype,
+           ami_exception_holder_ch,
            "$Id$")
 
 // ******************************************************
@@ -38,58 +38,17 @@ be_visitor_valuetype_ami_exception_holder_ch::
 }
 
 int
-be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (
-    be_valuetype *node
-  )
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Generate the implemenation of the Messaging aware ORB.
-  *os << be_nl << be_nl
-      << "class _tao_" << node->local_name () << be_idt_nl
-      << ": public ";
-
-  if (!node->is_nested ())
-    {
-      *os << "OBV_";
-    }
-
-  *os << node->local_name () << "," << be_nl
-      << "  public virtual OBV_Messaging::ExceptionHolder," << be_nl
-      << "  public virtual ::CORBA::DefaultValueRefCountBase" << be_uidt_nl
-      << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-  *os << "_tao_" << node->local_name () << " ();" << be_nl << be_nl;
-  *os << "~_tao_" << node->local_name () << " ();";
-
-  if (this->visit_valuetype_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ami_"
-                         "exception_holder_cs::"
-                         "visit_valuetype - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  *os << be_uidt_nl
-      << "};";
-
-  return 0;
-}
-
-int
 be_visitor_valuetype_ami_exception_holder_ch::visit_operation (
     be_operation *node
   )
 {
   be_visitor_context ctx (*this->ctx_);
-  
+
   // Using the implementation class visitor is strange, but we
   // do it here because it's the only one that generates the
   // environment variable in the operation signature without
   // the trailing _WITH_DEFAULTS, which is what we want.
-  // For performance reasons, we would rather there be a 
+  // For performance reasons, we would rather there be a
   // compile error if the user does not pass an environment
   // variable, than create a default one, which causes extra
   // TSS activity.
@@ -106,7 +65,7 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_operation (
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   *os << be_uidt;
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
index 924091b2ace..726706a8ff1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           ami_exception_holder_cs, 
+ACE_RCSID (be_visitor_valuetype,
+           ami_exception_holder_cs,
            "$Id$")
 
 // ************************************************************
@@ -42,36 +42,7 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype (
     be_valuetype *node
   )
 {
- TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->is_nested () 
-      && node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      *os << "OBV_";
-    }
-
-  *os << node->compute_name ("_tao_", "") << "::"
-      << node->compute_local_name ("_tao_", "") << " () { }" << be_nl << be_nl;
-
-  if (node->is_nested () 
-      && node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
-    {
-      *os << "OBV_";
-    }
-
-  *os << node->compute_name ("_tao_", "") << "::~"
-      << node->compute_local_name ("_tao_", "") << " () { }" << be_nl << be_nl;
-
-  // Generate code for the elements of the interface
-  if (this->visit_valuetype_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ami_exception_holder_cs::"
-                         "visit_valuetype - "
-                         "codegen for scope failed\n"), 
-                        -1);
-    }
-
+  ACE_UNUSED_ARG (node);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index 85a3231b538..4d3b75db1e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -95,6 +95,8 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
@@ -104,6 +106,8 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 53d1bc7234d..aa784e3a0e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -56,6 +56,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // All template specializations must be generated before the instantiations
   // in the operators.
   *os << be_nl << be_nl
@@ -70,13 +72,14 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "{" << be_idt_nl
       << "::CORBA::add_ref (this->value_);" << be_nl
       << "_tao_elem = this->value_;" << be_nl
-      << "return 1;" << be_uidt_nl
+      << "return true;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -147,6 +150,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       *os << "#else\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << "// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
@@ -190,6 +195,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 7daff5dc7c3..87186a23ea3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -41,7 +41,7 @@ be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist (void)
 {
 }
 
-idl_bool
+bool
 be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node)
 {
   UTL_Scope *scope = node->defined_in ();
@@ -56,18 +56,18 @@ be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node)
           if (last_E != 0
               && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
             {
-              return I_TRUE;
+              return true;
             }
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
 int
 be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
 {
-  idl_bool amh_valuetype = this->is_amh_exception_holder (node);
+  bool amh_valuetype = this->is_amh_exception_holder (node);
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << " (";
@@ -99,7 +99,9 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
           /***********************************************************/
           if (amh_valuetype)
             {
-              *os << "ACE_ENV_SINGLE_ARG_DECL";
+              *os << (be_global->use_raw_throw ()
+                        ? ""
+                        : "ACE_ENV_SINGLE_ARG_DECL");
             }
           /***********************************************************/
           else
@@ -109,11 +111,15 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
 
               if (node->argument_count () == 0)
                 {
-                  *os << " ACE_ENV_SINGLE_ARG_DECL";
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : " ACE_ENV_SINGLE_ARG_DECL");
                 }
               else
                 {
-                  *os << " ACE_ENV_ARG_DECL";
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : " ACE_ENV_ARG_DECL");
                 }
             }
 
@@ -123,7 +129,9 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
                 {
                 case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
                   // Last argument - is always ACE_ENV_ARG_DECL.
-                  *os << "_WITH_DEFAULTS";
+                  *os << (be_global->use_raw_throw ()
+                            ? ""
+                            : "_WITH_DEFAULTS");
                   break;
                 default:
                   break;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 2ee76042dcb..df4f4fa224f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -60,6 +60,8 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << be_global->stub_export_macro () << " "
       << "::CORBA::Boolean operator<< (TAO_OutputCDR &, const "
       << node->full_name () << " *);" << be_nl;
@@ -68,6 +70,8 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << "::CORBA::Boolean operator>> (TAO_InputCDR &, "
       << node->full_name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index 35084bec6c4..8e41015613f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -58,7 +58,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  node->cli_stub_cdr_op_gen (I_TRUE);
+  node->cli_stub_cdr_op_gen (true);
 
   if (this->visit_scope (node) == -1)
     {
@@ -72,6 +72,8 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -104,6 +106,8 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (!node->is_abstract ())
     {
       // Functions that marshal state.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
index 60a7ea8026c..c89015e7bcd 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
@@ -952,8 +952,6 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
                          "visit_array - "),
                         -1);
     }
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
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 9ba043d54a0..5a245ed5c27 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -20,8 +20,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           field_ch, 
+ACE_RCSID (be_visitor_valuetype,
+           field_ch,
            "$Id$")
 
 be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch (
@@ -51,7 +51,7 @@ be_visitor_valuetype_field_ch::visit_field (be_field *node)
     }
 
   this->ctx_->node (node); // save the node
-  
+
   this->visibility_ = node->visibility ();
 
   if (bt->accept (this) == -1)
@@ -136,10 +136,10 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node)
     {
       // Now use this array as a "type" for the subsequent declarator.
       // The set method.
-      *os << pre_op () << "void " << ub->local_name () << " ("
+      *os << pre_op () << "void " << ub->local_name () << " (const "
           << bt->name () << ")" << post_op () << be_nl;
       // The get method.
-      *os << pre_op()
+      *os << pre_op ()
           << bt->name () << "_slice *" << ub->local_name ()
           << " (void)" << post_op () << be_nl;
       // The get (read/write) method.
@@ -483,8 +483,8 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       break;
     case AST_PredefinedType::PT_any:
       // Set method.
-      *os << pre_op () << "void " << ub->local_name () << " ( ::"
-          << bt->name () << " &)"
+      *os << pre_op () << "void " << ub->local_name ()
+          << " (const ::"  << bt->name () << " &)"
           << post_op () << be_nl;
       // Get method (read-only).
       *os << pre_op () << "const ::" << bt->name () << " &"
@@ -499,11 +499,12 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       break;
     default:
       // Set method.
-      *os << pre_op () << "void " << ub->local_name () << " (::"
-          << bt->name () << ")"
+      *os << pre_op () << "void " << ub->local_name ()
+          << " (const ::" << bt->name () << ")"
           << post_op () << be_nl;
       // Get method.
-      *os << pre_op () << "::" << bt->name () << " " << ub->local_name ()
+      *os << pre_op () << "::" << bt->name ()
+          << " " << ub->local_name ()
           << " (void) const" << post_op ();
     }
 
@@ -545,14 +546,14 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
   if (bt->node_type () != AST_Decl::NT_typedef
       && bt->is_child (bu))
     {
-      be_field *member_node = 
+      be_field *member_node =
         be_field::narrow_from_decl (this->ctx_->node ());
       node->field_node (member_node);
 
       be_visitor_context ctx (*this->ctx_);
       ctx.node (node);
       be_visitor_sequence_ch visitor (&ctx);
-      
+
       if (this->visibility_ == AST_Field::vis_PRIVATE)
         {
           *os << be_uidt_nl << "public:" << be_idt_nl;
@@ -566,7 +567,7 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
                              "codegen failed\n"),
                             -1);
         }
-        
+
       if (this->visibility_ == AST_Field::vis_PRIVATE)
         {
           *os << be_uidt_nl << be_nl << "protected:" << be_idt;
@@ -619,13 +620,13 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
   if (node->width () == (long) sizeof (char))
     {
       *os << pre_op ()
-          << "void " << ub->local_name () << " (char *)"
+          << "void " << ub->local_name () << " (char *val)"
           << post_op () << be_nl;
       *os << pre_op ()
-          << "void " << ub->local_name () << " (const char *)"
+          << "void " << ub->local_name () << " (const char *val)"
           << post_op () << be_nl;
       *os << pre_op ()
-          << "void " << ub->local_name () << " (const ::CORBA::String_var&)"
+          << "void " << ub->local_name () << " (const ::CORBA::String_var &val)"
           << post_op () << be_nl;
       // Get method.
       *os << pre_op () << "const char *" << ub->local_name ()
@@ -634,13 +635,13 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node)
   else
     {
       *os << pre_op ()
-          << "void " << ub->local_name () << " ( ::CORBA::WChar *)"
+          << "void " << ub->local_name () << " ( ::CORBA::WChar *val)"
           << post_op () << be_nl;
       *os << pre_op ()
-          << "void " << ub->local_name () << " (const ::CORBA::WChar *)"
+          << "void " << ub->local_name () << " (const ::CORBA::WChar *val)"
           << post_op () << be_nl;
       *os << pre_op ()
-          << "void " << ub->local_name () << " (const ::CORBA::WString_var&)"
+          << "void " << ub->local_name () << " (const ::CORBA::WString_var &val)"
           << post_op () << be_nl;
       // Get method.
       *os << pre_op() << "const ::CORBA::WChar *" << ub->local_name ()
@@ -800,7 +801,7 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node)
 }
 
 void
-be_visitor_valuetype_field_ch::setenclosings (const char *pre, 
+be_visitor_valuetype_field_ch::setenclosings (const char *pre,
                                               const char *post)
 {
   pre_op_ = pre;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index 5c896c1888f..f5ae7a8e2de 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -20,8 +20,8 @@
 //    derived from be_visitor_union_branch/public_ci.cpp
 //
 // ============================================================================
-ACE_RCSID (be_visitor_valuetype, 
-           field_cs, 
+ACE_RCSID (be_visitor_valuetype,
+           field_cs,
            "$Id$")
 
 be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs (
@@ -47,7 +47,7 @@ be_visitor_valuetype_field_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cs::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -58,7 +58,7 @@ be_visitor_valuetype_field_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cs::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -89,7 +89,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_array - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -107,7 +107,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cs::"
                              "visit_array - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -115,8 +115,8 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
   // 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];
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (bt->node_type () != AST_Decl::NT_typedef
@@ -129,23 +129,23 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
         {
           be_decl *parent =
                  be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s", 
+          ACE_OS::sprintf (fname,
+                           "%s::_%s",
                            parent->full_name (),
                            bt->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (fname, 
-                           "_%s", 
+          ACE_OS::sprintf (fname,
+                           "_%s",
                            bt->full_name ());
         }
     }
   else
     {
       // Typedefed node.
-      ACE_OS::sprintf (fname, 
-                       "%s", 
+      ACE_OS::sprintf (fname,
+                       "%s",
                        bt->full_name ());
     }
 
@@ -156,18 +156,18 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
-                 os); 
-  
-  *os << "::" << ub->local_name () << " (" << fname
+                 os);
+
+  *os << "::" << ub->local_name () << " (const " << fname
       << " val)" << be_nl
       << "{" << be_idt_nl;
   *os << fname << "_copy ("
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ", val);" << be_uidt_nl;
   *os << "}" << be_nl;
 
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << "const " << fname << "_slice *" << be_nl;
 
   this->op_name (bu,
@@ -180,7 +180,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
       << bu->field_pd_postfix () << ";" << be_uidt_nl
       << "}\n" << be_nl;
 
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << fname << "_slice *" << be_nl;
 
       this->op_name (bu,
@@ -218,7 +218,7 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_enum - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -227,7 +227,7 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op() << "void" << be_nl;
 
       this->op_name (bu,
@@ -238,13 +238,13 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
       << "{" << be_idt_nl;
 
   *os << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
 
   *os << "}" << be_nl;
 
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << bt->name () << be_nl;
 
       this->op_name (bu,
@@ -255,7 +255,7 @@ be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
       << "{" << be_idt_nl;
 
   *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () 
+      << bu->field_pd_prefix() << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl;
 
@@ -286,7 +286,7 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -295,7 +295,7 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
       this->op_name (bu,
@@ -306,13 +306,13 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
       << "{" << be_idt_nl;
 
   *os << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix () << " =" << be_idt_nl
-      << "TAO::Objref_Traits< ::" << bt->name () 
+      << "TAO::Objref_Traits< ::" << bt->name ()
       << ">::duplicate (val);" << be_uidt << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << bt->name () << "_ptr " << be_nl;
 
       this->op_name (bu,
@@ -323,9 +323,9 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
       << "{" << be_idt_nl;
 
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
-      << ".ptr ();" << be_uidt_nl;
+      << ".in ();" << be_uidt_nl;
 
   *os << "}";
 
@@ -354,7 +354,7 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -374,12 +374,12 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
       << "{" << be_idt_nl;
 
   *os << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = " << bt->name () << "::_duplicate (val);" << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 
-  *os << "// Retrieve the member" << be_nl
+  *os << "/// Retrieve the member" << be_nl
       << this->pre_op () << bt->name () << "_ptr " << be_nl;
 
   this->op_name (bu,
@@ -390,9 +390,9 @@ be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
       << "{" << be_idt_nl;
 
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
-      << ".ptr ();" << be_uidt_nl;
+      << ".in ();" << be_uidt_nl;
 
   *os << "}";
 
@@ -427,7 +427,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -436,7 +436,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -448,12 +448,12 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
 
   *os << "::CORBA::add_ref (val);" << be_nl
       << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 
-  *os << "// Retrieve the member" << be_nl
+  *os << "/// Retrieve the member" << be_nl
       << this->pre_op () << bt->name () << " *" << be_nl;
 
   this->op_name (bu,
@@ -464,9 +464,9 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node)
       << "{" << be_idt_nl;
 
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
-      << ".ptr ();" << be_uidt_nl;
+      << ".in ();" << be_uidt_nl;
 
   *os << "}";
 
@@ -507,7 +507,7 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_interface - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -516,10 +516,10 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
-  this->op_name (bu, 
+  this->op_name (bu,
                  os);
 
   *os << "::" << ub->local_name () << " (" << bt->name ()
@@ -528,15 +528,15 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   *os << "::CORBA::add_ref (val);" << be_nl
       << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 
-  *os << "// Retrieve the member." << be_nl
+  *os << "/// Retrieve the member." << be_nl
       << this->pre_op () << bt->name () << " *" << be_nl;
 
-  this->op_name (bu, 
+  this->op_name (bu,
                  os);
 
   *os << "::" << ub->local_name () << " () const"
@@ -544,10 +544,10 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
       << "{" << be_idt_nl;
 
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix
       ()
-      << ".ptr ();" << be_uidt_nl;
+      << ".in ();" << be_uidt_nl;
 
   *os << "}";
 
@@ -582,7 +582,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_predef... - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -596,13 +596,16 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
 
   this->op_name (bu, os);
 
-  *os << "::" << ub->local_name ()
-      << " (" << bt->name ();
-
   AST_PredefinedType::PredefinedType pt = node->pt ();
+  bool is_object = (pt == AST_PredefinedType::PT_object
+                    || pt == AST_PredefinedType::PT_pseudo);
+
+  // IN parameter semantics call for 'const' qualifier except
+  // for interface types, which here are Object and TypeCode.
+  *os << "::" << ub->local_name ()
+      << " (" << (is_object ? "" : "const ") << bt->name ();
 
-  if (pt == AST_PredefinedType::PT_pseudo
-      || pt == AST_PredefinedType::PT_object)
+  if (is_object)
     {
       *os << "_ptr";
     }
@@ -655,7 +658,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
           << " (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
-          << bu->field_pd_prefix () << ub->local_name () 
+          << bu->field_pd_prefix () << ub->local_name ()
           << bu->field_pd_postfix ()
           << ".in ();" << be_uidt_nl
           << "}";
@@ -671,7 +674,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
           << " (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
-          << bu->field_pd_prefix () << ub->local_name () 
+          << bu->field_pd_prefix () << ub->local_name ()
           << bu->field_pd_postfix ()
           << ";" << be_uidt_nl
           << "}" << be_nl << be_nl;
@@ -685,7 +688,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
           << " (void)" << be_nl
           << "{" << be_idt_nl
           << "return this->"
-          << bu->field_pd_prefix () << ub->local_name () 
+          << bu->field_pd_prefix () << ub->local_name ()
           << bu->field_pd_postfix ()
           << ";" << be_uidt_nl
           << "}";
@@ -703,7 +706,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
           << " (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->"
-          << bu->field_pd_prefix () << ub->local_name () 
+          << bu->field_pd_prefix () << ub->local_name ()
           << bu->field_pd_postfix ()
           << ";" << be_uidt_nl
           << "}";
@@ -736,7 +739,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_sequence - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -754,7 +757,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cs::"
                              "visit_sequence - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -789,7 +792,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -803,7 +806,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
   *os << "::" << ub->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix()
       << ";" << be_uidt_nl
       << "}";
@@ -822,7 +825,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_string - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -851,7 +854,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
   *os << be_nl
       << "{" << be_idt_nl;
   *os << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = (val);" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -877,7 +880,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
 
   *os << "// Set the value." << be_nl
       << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = ";
 
@@ -923,7 +926,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
 
   *os << "_var = val;" << be_nl
       << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = "
       << ub->local_name () << "_var._retn ();" << be_uidt_nl;
@@ -945,7 +948,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       << " (void) const // get method" << be_nl
       << "{" << be_idt_nl
       << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl
       << "}";
@@ -975,7 +978,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_structure - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -993,7 +996,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cs::"
                              "visit_structure - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -1013,7 +1016,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
       << "{" << be_idt_nl;
 
   *os << "this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << " = val;" << be_uidt_nl;
 
@@ -1028,7 +1031,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
   *os << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl;
   *os << "}" << be_nl;
@@ -1042,7 +1045,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
   *os << "::" << ub->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl;
   *os << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl;
   *os << "}";
@@ -1061,7 +1064,7 @@ be_visitor_valuetype_field_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -1091,7 +1094,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cs::"
                          "visit_union - "
-                         "bad context information\n"), 
+                         "bad context information\n"),
                         -1);
     }
 
@@ -1109,7 +1112,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_field_cs::"
                              "visit_union - "
-                             "codegen failed\n"), 
+                             "codegen failed\n"),
                             -1);
         }
     }
@@ -1139,7 +1142,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
   *os << "::" << ub->local_name () << " (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl
       << "}" << be_nl;
@@ -1153,7 +1156,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
   *os << "::" << ub->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->"
-      << bu->field_pd_prefix () << ub->local_name () 
+      << bu->field_pd_prefix () << ub->local_name ()
       << bu->field_pd_postfix ()
       << ";" << be_uidt_nl
       << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index c13746e8dae..3632cdef765 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -174,9 +174,8 @@ be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node,
       be_decl *scope =
         be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-      *os << "ACE_NESTED_CLASS ("
-          << scope->name () << ","
-          << node->local_name () << ")";
+      *os << scope->name () << "::"
+          << node->local_name ();
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index f1748719882..58f53155d48 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           valuetype, 
+ACE_RCSID (be_visitor_valuetype,
+           valuetype,
            "$Id$")
 
 be_visitor_valuetype::be_visitor_valuetype (be_visitor_context *ctx)
@@ -35,7 +35,6 @@ be_visitor_valuetype::~be_visitor_valuetype (void)
 int
 be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
 {
-  int n_processed = 0;
   this->elem_number_ = 0;
 
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
@@ -48,20 +47,10 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
-                             "bad node in this scope\n"), 
+                             "bad node in this scope\n"),
                             -1);
         }
 
-      AST_Field *field = AST_Field::narrow_from_decl (d);
-
-      if (field && field->visibility () == AST_Field::vis_PRIVATE)
-        {
-          continue;      
-          // Ignore private fields in this run
-          // AST_Attribute derives from AST_Field, so test for
-          // vis_PRIVATE is ok (the attribute has it set to vis_NA)
-        }
-
       be_decl *bd = be_decl::narrow_from_decl (d);
       // Set the scope node as "node" in which the code is being
       // generated so that elements in the node's scope can use it
@@ -71,63 +60,24 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
       this->ctx_->node (bd);
       this->elem_number_++;
 
-      if (bd == 0 || bd->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_scope::visit_scope - "
-                             "codegen for scope failed\n"), 
-                            -1);
-          
-        }
-    }
-
-  this->elem_number_ = 0;
-
-  for (UTL_ScopeActiveIterator sj (node, UTL_Scope::IK_decls);
-       !sj.is_done ();
-       sj.next())
-    {
-      AST_Decl *d = sj.item ();
-
-      if (!d)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_scope::visit_scope - "
-                             "bad node in this scope\n"), 
-                            -1);
-        }
-
       AST_Field *field = AST_Field::narrow_from_decl (d);
 
-      if (!field 
-          || (field && field->visibility () != AST_Field::vis_PRIVATE))
+      if (field != 0 && field->visibility () == AST_Field::vis_PRIVATE)
         {
-          // Only private fields.
-          continue;
+          this->begin_private ();
         }
-
-      ++ n_processed;
-
-      if (n_processed == 1)
+      else
         {
-          this->begin_private ();
+          this->begin_public ();
         }
 
-      be_decl *bd = be_decl::narrow_from_decl (d);
-      // Set the scope node as "node" in which the code is being
-      // generated so that elements in the node's scope can use it
-      // for code generation.
-
-      this->ctx_->scope (node->decl ());
-      this->ctx_->node (bd);
-      this->elem_number_++;
-
       if (bd == 0 || bd->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
                              "codegen for scope failed\n"),
                             -1);
+
         }
     }
 
@@ -256,7 +206,7 @@ be_visitor_valuetype::visit_constant (be_constant *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_valuetype::"
                            "visit_constant - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -333,7 +283,7 @@ be_visitor_valuetype::visit_enum (be_enum *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_valuetype::"
                            "visit_enum - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -343,7 +293,7 @@ be_visitor_valuetype::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_enum - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -366,7 +316,7 @@ be_visitor_valuetype::visit_exception (be_exception *node)
         break;
       }
     case TAO_CodeGen::TAO_ROOT_CI:
-      {        
+      {
         be_visitor_exception_ci visitor (&ctx);
         status = node->accept (&visitor);
         break;
@@ -410,7 +360,7 @@ be_visitor_valuetype::visit_exception (be_exception *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface::"
                          "visit_exception - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -477,7 +427,7 @@ be_visitor_valuetype::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_structure - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -510,7 +460,7 @@ be_visitor_valuetype::visit_structure_fwd (be_structure_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_structure_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -582,7 +532,7 @@ be_visitor_valuetype::visit_union (be_union *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_valuetype::"
                            "visit_union - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -592,7 +542,7 @@ be_visitor_valuetype::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_union - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -625,7 +575,7 @@ be_visitor_valuetype::visit_union_fwd (be_union_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_union_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -697,7 +647,7 @@ be_visitor_valuetype::visit_typedef (be_typedef *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_valuetype::"
                            "visit_typedef - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -707,7 +657,7 @@ be_visitor_valuetype::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype::"
                          "visit_typedef - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -739,7 +689,7 @@ be_visitor_valuetype::gen_pd (be_valuetype *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
-                             "bad node in this scope\n"), 
+                             "bad node in this scope\n"),
                             -1);
         }
 
@@ -765,7 +715,7 @@ be_visitor_valuetype::gen_pd (be_valuetype *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_scope::visit_scope - "
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
     }
@@ -788,7 +738,7 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_ch::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -805,11 +755,11 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_ch::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
-  // Now output the field name.  
+  // Now output the field name.
   *os << " " << vt->field_pd_prefix ()
       << node->local_name ()
       << vt->field_pd_postfix () << ";";
@@ -817,6 +767,54 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
   return 0;
 }
 
+void
+be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
+                                                     unsigned long &index)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  AST_ValueType *parent = node->inherits_concrete ();
+
+  // Generate for inherited members first.
+  if (parent != 0)
+    {
+      be_valuetype *be_parent =
+        be_valuetype::narrow_from_decl (parent);
+      this->gen_obv_init_constructor_args (be_parent, index);
+    }
+
+  be_visitor_context ctx (*this->ctx_);
+  be_visitor_args_arglist visitor (&ctx);
+
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+       !si.is_done ();
+       si.next())
+    {
+      be_field *f = be_field::narrow_from_decl (si.item ());
+
+      if (f == 0)
+        {
+          continue;
+        }
+
+      *os << (index++ != 0 ? "," : "") << be_nl;
+
+      ACE_CString arg_name ("_tao_init_");
+      arg_name += f->local_name ()->get_string ();
+      Identifier id (arg_name.c_str ());
+      UTL_ScopedName sn (&id, 0);
+      be_type *ft = be_type::narrow_from_decl (f->field_type ());
+      bool seen = ft->seen_in_operation ();
+
+      // This sets ft->seen_in_operation (true), so we have to
+      // restore the original value below.
+      be_argument arg (AST_Argument::dir_IN,
+                       ft,
+                       &sn);
+      ft->seen_in_operation (seen);
+      visitor.visit_argument (&arg);
+      id.destroy ();
+    }
+}
 
 // Generate the _init definition.
 int
@@ -862,18 +860,18 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local _out names
 
-  ACE_OS::memset (fname, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, 
-                   "%s_init", 
+  ACE_OS::sprintf (fname,
+                   "%s_init",
                    node->full_name ());
 
-  ACE_OS::memset (lname, 
-                  '\0', 
+  ACE_OS::memset (lname,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, 
-                   "%s_init", 
+  ACE_OS::sprintf (lname,
+                   "%s_init",
                    node->local_name ());
 
   // Destructor.
@@ -890,7 +888,7 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node)
   return 0;
 }
 
-idl_bool
+bool
 be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
 {
   // VT needs RefCounter if it has concrete factory or supports an
@@ -905,7 +903,7 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
   // Now go thru our base VTs and see if one has already.
   for (int i = 0; i < node->n_inherits (); ++i)
     {
-      be_valuetype *vt = 
+      be_valuetype *vt =
         be_valuetype::narrow_from_decl (node->inherits ()[i]);
 
       if (vt != 0)
@@ -920,7 +918,7 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
   return 1;
 }
 
-idl_bool
+bool
 be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
 {
 
@@ -952,20 +950,20 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
   return 0;
 }
 
-idl_bool
+bool
 be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node)
 {
  if (ACE_OS::strncmp (node->local_name (), "AMH_", 4) == 0)
    {
-     const char *last_E = 
+     const char *last_E =
       ACE_OS::strrchr (node->full_name (), 'E');
 
      if (last_E != 0
          && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
        {
-         return I_TRUE;
+         return true;
        }
    }
 
-  return I_FALSE;
+  return false;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 5760338f9b8..1ceb6962140 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -78,7 +78,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   // Node valuetype inherits from other valuetypes (OMG 20.17.9)
   // (ordinary (not abstract) interfaces ignored).
 
-  *os << be_idt_nl <<": " << be_idt;
+  *os << be_idt_nl << ": " << be_idt;
 
   long i;  // loop index
   be_valuetype *inherited = 0;
@@ -134,13 +134,13 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   **      2.3) Make the destructor public (instead of protected)
   **      2.4) Generate a private CORBA::Exception* field.
   **      2.5) Generate the tao_marshal and tao_unmarshal methods as
-  **           non-abstarct.
+  **           non-abstract.
   **      2.6) Generate the right throw spec for the AMH ExceptionHolders
   ************************************************************************/
 
   /****************************************************************/
   // 1) Find out if the ValueType is an AMH_*ExceptionHolder
-  idl_bool is_an_amh_exception_holder = this->is_amh_exception_holder (node);
+  bool is_an_amh_exception_holder = this->is_amh_exception_holder (node);
 
   if (is_an_amh_exception_holder)
     {
@@ -151,8 +151,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
       *os << "public virtual ::CORBA::DefaultValueRefCountBase";
     }
-
-  if (node->node_type () == AST_Decl::NT_eventtype)
+  else if (node->node_type () == AST_Decl::NT_eventtype)
     {
       if (inherits_eventtype == 0)
         {
@@ -166,11 +165,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     }
   else if (n_inherits == 0)
     {
-      if (is_an_amh_exception_holder)
-        {
-          *os << "," << be_nl;
-        }
-
       *os << "public virtual ::CORBA::ValueBase";
     }
 
@@ -200,12 +194,12 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     }
 
   *os << "static " << node->local_name () << "* "
-      << "_downcast ( ::CORBA::ValueBase *);" << be_nl
+      << "_downcast ( ::CORBA::ValueBase *v);" << be_nl
       << be_nl
       << "// (TAO extensions or internals)" << be_nl
       << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &," << be_nl
-      << node->local_name () << " *&" << be_uidt_nl
+      << "TAO_InputCDR &strm," << be_nl
+      << node->local_name () << " *&new_object" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
       << "virtual const char* "
       << "_tao_obv_repository_id (void) const;"
@@ -234,8 +228,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     node->traverse_supports_list_graphs (
         be_visitor_valuetype_ch::gen_supported_ops,
         os,
-        I_FALSE,
-        I_TRUE
+        false,
+        true
       );
 
   if (status == -1)
@@ -265,7 +259,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   // instantiate us.
   *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl
       << node->local_name ()
-      << " (void);" << be_nl << be_nl;
+      << " (void);" << be_nl;
 
   if (!is_an_amh_exception_holder)
     {
@@ -379,7 +373,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
         }
     }
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
 
   return 0;
 }
@@ -482,7 +476,8 @@ be_visitor_valuetype_ch::begin_public (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << "public:" << be_idt_nl;
+  *os << be_uidt_nl << be_nl << "public:"
+      << be_idt;
 }
 
 void
@@ -490,7 +485,8 @@ be_visitor_valuetype_ch::begin_private (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_uidt_nl << be_nl << "protected:" << be_idt;
+  *os << be_uidt_nl << be_nl << "protected:"
+      << be_idt;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 8e9a6f25b3f..db8e1cfbccc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -47,7 +47,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   if (be_global->tc_support ())
     {
       be_visitor_context ctx (*this->ctx_);
-      // ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       TAO::be_visitor_value_typecode tc_visitor (&ctx);
 
       if (tc_visitor.visit_valuetype (node) == -1)
@@ -137,7 +136,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl;
   *os << "{}\n" << be_nl;
 
-  idl_bool is_an_amh_exception_holder =
+  bool is_an_amh_exception_holder =
     this->is_amh_exception_holder (node);
 
   // Nothing to marshal if abstract valuetype.
@@ -155,10 +154,9 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           be_decl *scope =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-          *os << "ACE_NESTED_CLASS ("
-              << scope->name () << ","
-              << node->local_name () << ")"
-              <<"::_tao_marshal_state (strm);" << be_uidt_nl;
+          *os << scope->name () << "::"
+              << node->local_name ()
+              << "::_tao_marshal_state (strm);" << be_uidt_nl;
         }
       else
         {
@@ -180,9 +178,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           be_decl *scope =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
-          *os << "ACE_NESTED_CLASS ("
-              << scope->name () << ","
-              << node->local_name () << ")"
+          *os << scope->name () << "::"
+              << node->local_name ()
               <<"::_tao_unmarshal_state (strm);" << be_uidt_nl;
         }
       else
@@ -205,7 +202,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name () << "::_tao_marshal_v (TAO_OutputCDR &) const"
           << be_nl
           << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
+          << "return true;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       // The virtual _tao_unmarshal_v method.
@@ -213,7 +210,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name () << "::_tao_unmarshal_v (TAO_InputCDR &)"
           << be_nl
           << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
+          << "return true;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
 
@@ -223,14 +220,14 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
               << node->name () << "::_tao_marshal__" << node->flat_name ()
               << " (TAO_OutputCDR &) const" << be_nl
               << "{" << be_idt_nl
-              << "return 1;" << be_uidt_nl
+              << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
 
           *os << "::CORBA::Boolean" << be_nl
               << node->name () << "::_tao_unmarshal__" << node->flat_name ()
               << " (TAO_InputCDR &)" << be_nl
               << "{" << be_idt_nl
-              << "return 1;" << be_uidt_nl
+              << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
         }
     }
@@ -252,21 +249,21 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "base," << be_nl
       << node->local_name () << "::_tao_obv_static_repository_id ()" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
-      << "if (retval == 0)" << be_idt_nl
+      << "if (retval == false)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "if (factory.in () != 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "base = factory->create_for_unmarshal ();" << be_nl << be_nl
       << "if (base == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return 0;  // %! except.?" << be_uidt_nl
+      << "return false;  // %! except.?" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "retval = base->_tao_unmarshal_v (strm);" << be_nl << be_nl
-      << "if (retval == 0)" << be_idt_nl
+      << "if (retval == false)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "// Now base must be null or point to the unmarshaled object." << be_nl
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 c0c9e8e97f6..ba41ba1371a 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
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype_init, 
-           arglist_ch, 
+ACE_RCSID (be_visitor_valuetype_init,
+           arglist_ch,
            "$Id$")
 
 be_visitor_valuetype_init_arglist_ch::be_visitor_valuetype_init_arglist_ch (
@@ -42,9 +42,9 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node)
   TAO_OutStream& os = *(this->ctx_->stream ());
 
   os << " (";
-  
+
   if (node->nmembers () > 0)
-    {  
+    {
       os << be_idt << be_idt_nl;
 
       // All we do is hand over code generation to our scope.
@@ -121,20 +121,21 @@ be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  const char *throw_spec_open = "throw (";
-  const char *throw_spec_close = ")";
-
-  if (!be_global->use_raw_throw ())
+  if (node->exceptions ())
     {
-      throw_spec_open = "ACE_THROW_SPEC ((";
-      throw_spec_close = "))";
-    }
+      const char *throw_spec_open = "throw (";
+      const char *throw_spec_close = ")";
 
-  *os << be_nl << throw_spec_open;
-  *os << be_idt_nl << "::CORBA::SystemException";
+      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;
 
-  if (node->exceptions ())
-    {
       // Initialize an iterator to iterate thru the exception list.
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done ();
@@ -153,13 +154,15 @@ be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node)
 
             }
 
-          *os << "," << be_nl;
-          *os << excp->name ();
+          *os << (first ? "" : ",") << be_nl
+              << excp->name ();
+              
+           first = false;
         }
+        
+      *os << be_uidt_nl << throw_spec_close << be_uidt;
     }
 
-  *os << be_uidt_nl << throw_spec_close << be_uidt;
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 704fd460b48..c68a18b7670 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -108,16 +108,16 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
       os << be_nl << be_nl
          << "virtual ::CORBA::ValueBase *" << be_nl
          << "create_for_unmarshal ("
-         << be_idt << be_idt_nl
-         << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+         << be_idt << be_idt
+         << env_sngl_dflts << be_uidt_nl
          << ");" << be_uidt;
 
       if (node->supports_abstract ())
         {
           os << be_nl << be_nl
              << "virtual ::CORBA::AbstractBase_ptr" << be_nl
-             << "create_for_unmarshal_abstract (" << be_idt << be_idt_nl
-             << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+             << "create_for_unmarshal_abstract (" << be_idt << be_idt
+             << env_sngl_dflts << be_uidt_nl
              << ");" << be_uidt;
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 37c2eb0a2da..07d27795d03 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -99,7 +99,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       << node->name () << "_init *" << be_nl << node->name ()
       << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "return dynamic_cast< ::" << node->name () 
+      << "return dynamic_cast< ::" << node->name ()
       << "_init * > (v);" << be_uidt_nl
       << "}";
 
@@ -118,8 +118,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       // generate create_for_unmarshal()
       *os << be_nl << be_nl
           << "::CORBA::ValueBase *" << be_nl
-          << fname << "::create_for_unmarshal" << " "
-          << "(ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+          << fname << "::create_for_unmarshal" << " ("
+          << (be_global->use_raw_throw ()
+                ? "void"
+                : "ACE_ENV_SINGLE_ARG_DECL")
+          << ")" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::ValueBase *ret_val = 0;" << be_nl
           << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
@@ -134,7 +137,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
           {
             *os << be_nl << be_nl
                 << "::CORBA::AbstractBase_ptr" << be_nl
-                << fname << "::create_for_unmarshal_abstract (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
+                << fname << "::create_for_unmarshal_abstract ("
+                << (be_global->use_raw_throw ()
+                      ? "void"
+                      : "ACE_ENV_SINGLE_ARG_DECL")
+                << ")" << be_nl
                 << "{" << be_idt_nl
                 << "::CORBA::AbstractBase *ret_val = 0;" << be_nl
                 << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index e0d5cb52626..843711ebdb3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -142,33 +142,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
       // STEP 2: Generate the body ==
 
-      *os << "{" << be_nl;
-
-      this->begin_public ();
-
-      // Default constructor and destructor are public if OBV class is concrete
-      if (!node->have_operation ())
-        {
-
-          *os << be_nl;
-
-          if (! node->is_nested ())
-            {
-              *os << "OBV_";
-            }
-
-          *os << node->local_name () << " (void);";
-
-          *os << be_nl << "virtual ~";
-
-          if (! node->is_nested ())
-            {
-              *os << "OBV_";
-            }
-
-          *os << node->local_name () << " (void);";
-        }
-
+      *os << "{";
 
       // Generate code for the OBV_ class definition.
       if (this->visit_valuetype_scope (node) == -1)
@@ -194,27 +168,52 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
       if (node->have_operation ())
         {
-           // Default constructor and destructor are protected if OBV class is abstract
-          *os << be_nl << be_uidt_nl << "protected:" << be_idt;
+          this->begin_private ();
+        }
+      else
+        {
+          this->begin_public ();
+        }
+      
+      *os << be_nl;
+      
+      // Default constructor.
+      if (! node->is_nested ())
+        {
+          *os << "OBV_";
+        }
 
+      *os << node->local_name () << " (void);";
+      
+      // Initializing constructor.
+      if (node->has_member ())
+        {
           *os << be_nl;
+        
           if (! node->is_nested ())
             {
               *os << "OBV_";
             }
+            
+          *os << node->local_name () << " (" << be_idt << be_idt;
+          
+          unsigned long index = 0;
+          this->gen_obv_init_constructor_args (node, index);
+
+          *os << be_uidt_nl
+              << ");" << be_uidt;
+        }
 
-          *os << node->local_name () << " (void);";
-
-          *os << be_nl << "virtual ~";
+      // Virtual destructor.
+      *os << be_nl << "virtual ~";
 
-          if (! node->is_nested ())
-            {
-              *os << "OBV_";
-            }
-
-          *os << node->local_name () << " (void);";
+      if (! node->is_nested ())
+        {
+          *os << "OBV_";
         }
 
+      *os << node->local_name () << " (void);";
+
       // Map fields to private data.
       if (!node->opt_accessor ())
         {
@@ -287,14 +286,23 @@ be_visitor_valuetype_obv_ch::visit_field (be_field *node)
 void
 be_visitor_valuetype_obv_ch::begin_public (void)
 {
+  AST_Decl::NodeType nt = this->ctx_->node ()->node_type ();
+  
+  // These types are skipped in the OBV class.
+  if (nt == AST_Decl::NT_attr || nt == AST_Decl::NT_op)
+    {
+      return;
+    }
+    
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "public:" << be_idt;
+  *os << be_uidt_nl << be_nl
+      << "public:" << be_idt;
 }
 
 void
 be_visitor_valuetype_obv_ch::begin_private (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << be_uidt_nl << be_nl;
-  *os << "protected:" << be_idt;
+  *os << be_uidt_nl << be_nl
+      << "protected:" << be_idt;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index 34dd41725df..9a77076dcfd 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -33,7 +33,7 @@ ACE_RCSID (be_visitor_valuetype,
 be_visitor_valuetype_obv_cs::be_visitor_valuetype_obv_cs (
     be_visitor_context *ctx
   )
-  : be_visitor_scope (ctx)
+  : be_visitor_valuetype (ctx)
 {
 }
 
@@ -57,6 +57,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  // Default constructor.
   *os << node->full_obv_skel_name () << "::";
 
   if (! node->is_nested ())
@@ -67,6 +68,32 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
   *os << node->local_name () << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
 
+  // Initializing constructor.
+  if (node->has_member ())
+    {
+      *os << node->full_obv_skel_name () << "::";
+
+      if (! node->is_nested ())
+        {
+          *os << "OBV_";
+        }
+
+      *os << node->local_name () << " (" << be_idt << be_idt;
+
+      unsigned long index = 0;
+      this->gen_obv_init_constructor_args (node, index);
+
+      *os << be_uidt_nl
+          << ")" << be_uidt << be_uidt_nl
+          << "{" << be_idt;
+
+      this->gen_obv_init_constructor_inits (node);
+
+      *os << be_uidt_nl
+          << "}" << be_nl << be_nl;
+    }
+
+  // Destructor.
   *os << node->full_obv_skel_name () << "::~";
 
   if (! node->is_nested ())
@@ -116,7 +143,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
               << node->full_obv_skel_name ()
               << "::_add_ref (void)" << be_nl
               << "{" << be_idt_nl
-              << "this->ACE_NESTED_CLASS ( ::CORBA,DefaultValueRefCountBase)::_add_ref ();"
+              << "this->::CORBA::DefaultValueRefCountBase::_add_ref ();"
               << be_uidt_nl
               << "}" << be_nl;
 
@@ -124,7 +151,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
               << node->full_obv_skel_name ()
               << "::_remove_ref (void)" << be_nl
               << "{" << be_idt_nl
-              << "this->ACE_NESTED_CLASS ( ::CORBA,DefaultValueRefCountBase)::_remove_ref ();"
+              << "this->::CORBA::DefaultValueRefCountBase::_remove_ref ();"
               << be_uidt_nl
               << "}";
         }
@@ -157,3 +184,74 @@ be_visitor_valuetype_obv_cs::visit_field (be_field *node)
 
   return 0;
 }
+
+void
+be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
+    be_valuetype *node,
+    unsigned long &index
+  )
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  AST_ValueType *parent = node->inherits_concrete ();
+
+  // Generate for inherited members first.
+  if (parent != 0)
+    {
+      be_valuetype *be_parent =
+        be_valuetype::narrow_from_decl (parent);
+      this->gen_obv_init_base_constructor_args (be_parent, index);
+    }
+    
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+       !si.is_done ();
+       si.next())
+    {
+      // be_attribute doesn't inherit from be_field (unlike the
+      // AST_* counterparts, so this screens attributes and operations.
+      be_field *f = be_field::narrow_from_decl (si.item ());
+      
+      if (f == 0)
+        {
+          continue;
+        }
+        
+      *os << (index++ != 0 ? "," : "") << be_nl
+          << "_tao_init_" << f->local_name ();          
+    }
+}
+
+void
+be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits (
+    be_valuetype *node
+  )
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  AST_ValueType *parent = node->inherits_concrete ();
+
+  // Generate for inherited members first.
+  if (parent != 0)
+    {
+      be_valuetype *be_parent = be_valuetype::narrow_from_decl (parent);
+      this->gen_obv_init_constructor_inits (be_parent);
+    }
+    
+  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+       !si.is_done ();
+       si.next())
+    {
+      be_field *f = be_field::narrow_from_decl (si.item ());
+      
+      // be_attribute doesn't inherit from be_field (unlike the
+      // AST_* counterparts, so this screens attributes and operations.
+      if (f == 0)
+        {
+          continue;
+        }
+        
+      *os << be_nl
+          << f->local_name () << " (_tao_init_" << f->local_name ()
+          << ");";
+    }
+}
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index 19292f71621..65c98639643 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -91,7 +91,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
       << local_name_prefix << node_local_name
       << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
-      
+
 // @@@ (JP) I'm commenting out the copy constructor for now. The
 // declaration in the skeleton header file has been made private. These
 // valuetypes (only if a concrete interface is supported) inherit
@@ -113,8 +113,8 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
     {
       AST_Decl *scope = ScopeAsDecl (concrete->defined_in ());
 
-      *os << "ACE_NESTED_CLASS (POA_" << scope->name () << ", "
-          << concrete->local_name () << ") (rhs)," << be_nl;
+      *os << "POA_" << scope->name () << "::"
+          << concrete->local_name () << " (rhs)," << be_nl;
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index 899854c0915..ff1c24cacc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -85,6 +85,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
       // corresponding to their module, others do not.
       *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
 
+      *os << be_global->core_versioning_begin () << be_nl;
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
@@ -99,10 +100,12 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
           << node->local_name () << " *&);";
 
       be_util::gen_nested_namespace_end (os, module);
-
+      *os << be_global->core_versioning_end () << be_nl;
       // emit #else
       *os << "#else\n\n";
     }
+  
+  *os << be_global->core_versioning_begin () << be_nl;
 
   *os << macro << " void"
       << " operator<<= ( ::CORBA::Any &, " << node->name ()
@@ -113,7 +116,8 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   *os << macro << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
-
+  
+  *os << be_global->core_versioning_end () << be_nl;
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index 2280f0d5444..cb45192558c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -78,6 +78,8 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
   *os << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << be_global->stub_export_macro ()
       << " ::CORBA::Boolean operator<< (TAO_OutputCDR &, const "
       << node->full_name () << " *);" << be_nl;
@@ -85,9 +87,11 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
   *os << be_global->stub_export_macro ()
       << " ::CORBA::Boolean operator>> (TAO_InputCDR &, "
       << node->full_name () << " *&);" << be_nl;
+  
+  *os << be_global->core_versioning_end () << be_nl;
 
-  node->cli_hdr_cdr_op_gen (I_TRUE);
-  bfd->cli_hdr_cdr_op_gen (I_TRUE);
+  node->cli_hdr_cdr_op_gen (true);
+  bfd->cli_hdr_cdr_op_gen (true);
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
index 307fd0c236d..2b1638de626 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
@@ -92,6 +92,6 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd (
       << node->full_name () << " *&);";
 
   // Done with this.
-  node->cli_inline_cdr_op_gen (I_TRUE);
+  node->cli_inline_cdr_op_gen (true);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
index 10c14850898..d5c8ecd8e5c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
@@ -53,7 +53,7 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   // Copy the fwd helper name back to the forward declared interface node.
   node->fwd_helper_name (bfd->fwd_helper_name ());
 
-  node->cli_hdr_gen (I_TRUE);
+  node->cli_hdr_gen (true);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index b9ed9ab1979..70f5f309ac0 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -39,8 +39,8 @@ public:
   be_array (UTL_ScopedName *n,
             unsigned long ndims,
             UTL_ExprList *dims,
-            idl_bool local,
-            idl_bool abstract);
+            bool local,
+            bool abstract);
   // Constructor.
 
   ~be_array (void);
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
index 882ee417deb..74f245a48e6 100644
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_attribute.h
@@ -36,11 +36,11 @@ public:
   be_attribute (void);
   // Default constructor.
 
-  be_attribute (idl_bool ro,
+  be_attribute (bool ro,
                 AST_Type *ft,
                 UTL_ScopedName *n,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
   // Constructor.
 
   // Visiting.
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 20836ad4468..356ed54b3c6 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -264,7 +264,7 @@ public:
 
   int start_server_template_skeletons (const char *fname);
   // Set the server template skeletons stream.
-  
+
   int start_anyop_header (const char *fname);
   // Set the anyop header stream.
 
@@ -272,12 +272,21 @@ public:
   // Set the anyop source stream.
 
   int end_client_header (void);
-  // Generate code at the end such as the <<= and >>= operators alongwith the
-  // ending #endif statement.
+  // Generate code at the end such as the <<= and >>= operators along
+  // with the ending #endif statement.
+
+  /// Generate necessary code at end of client inline file.
+  void end_client_inline (void);
+
+  /// Generate necessary code at end of client stub file.
+  void end_client_stubs (void);
 
   int end_server_header (void);
   // Put a last #endif in the server header.
 
+  /// Generate necessary code at end of server inline file.
+  void end_server_inline (void);
+
   int end_implementation_header (const char *fname);
   // Put a last #endif in the server header.
 
@@ -295,7 +304,7 @@ public:
 
   int end_server_skeletons (void);
   // Put a last #endif in the server skeletons.
-  
+
   int end_anyop_header (void);
   // Put a last #endif in the anyop header.
 
@@ -337,7 +346,7 @@ public:
 
   TAO_OutStream *anyop_header (void);
   // Get the anyop header stream.
-  
+
   TAO_OutStream *anyop_source (void);
   // Get the anyop source stream.
 
@@ -435,7 +444,7 @@ private:
 
   TAO_OutStream *server_template_inline_;
   // Server side template inline file.
-  
+
   TAO_OutStream *anyop_header_;
   // Anyop header file.
 
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index e3af070c35a..0b49ae63732 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -70,101 +70,101 @@ public:
 
   virtual void destroy (void);
   // Cleanup function.
-  
-  void set_local (idl_bool val);
+
+  void set_local (bool val);
   // Temporarily set this node's is_local_ flag.
 
   // Boolean methods to test if code was already generated.
-  idl_bool cli_hdr_gen (void);
-  idl_bool cli_stub_gen (void);
-  idl_bool cli_inline_gen (void);
-  idl_bool srv_hdr_gen (void);
-  idl_bool impl_hdr_gen (void);
-  idl_bool srv_skel_gen (void);
-  idl_bool impl_skel_gen (void);
-  idl_bool srv_inline_gen (void);
-  idl_bool cli_hdr_any_op_gen (void);
-  idl_bool cli_stub_any_op_gen (void);
-  idl_bool cli_hdr_cdr_op_gen (void);
-  idl_bool cli_stub_cdr_op_gen (void);
-  idl_bool cli_inline_cdr_op_gen (void);
-  idl_bool cli_inline_cdr_decl_gen (void);
-  idl_bool cli_hdr_serializer_op_gen (void);
-  idl_bool cli_stub_serializer_op_gen (void);
-  idl_bool cli_inline_serializer_op_gen (void);
-  idl_bool cli_inline_serializer_decl_gen (void);
-
-  idl_bool cli_traits_gen (void);
-  idl_bool cli_arg_traits_gen (void);
-  idl_bool srv_arg_traits_gen (void);
-  idl_bool srv_sarg_traits_gen (void);
-  idl_bool cli_tmpl_class_gen (void);
-  idl_bool cli_pragma_inst_gen (void);
-  idl_bool cli_inarg_tmpl_class_gen (void);
-  idl_bool cli_inarg_pragma_inst_gen (void);
-  idl_bool cli_inoutarg_tmpl_class_gen (void);
-  idl_bool cli_inoutarg_pragma_inst_gen (void);
-  idl_bool cli_outarg_tmpl_class_gen (void);
-  idl_bool cli_outarg_pragma_inst_gen (void);
-  idl_bool cli_retarg_tmpl_class_gen (void);
-  idl_bool cli_retarg_pragma_inst_gen (void);
-  idl_bool srv_tmpl_class_gen (void);
-  idl_bool srv_pragma_inst_gen (void);
-  idl_bool srv_inarg_tmpl_class_gen (void);
-  idl_bool srv_inarg_pragma_inst_gen (void);
-  idl_bool srv_inoutarg_tmpl_class_gen (void);
-  idl_bool srv_inoutarg_pragma_inst_gen (void);
-  idl_bool srv_outarg_tmpl_class_gen (void);
-  idl_bool srv_outarg_pragma_inst_gen (void);
-  idl_bool srv_retarg_tmpl_class_gen (void);
-  idl_bool srv_retarg_pragma_inst_gen (void);
-  idl_bool ccm_pre_proc_gen (void);
+  bool cli_hdr_gen (void);
+  bool cli_stub_gen (void);
+  bool cli_inline_gen (void);
+  bool srv_hdr_gen (void);
+  bool impl_hdr_gen (void);
+  bool srv_skel_gen (void);
+  bool impl_skel_gen (void);
+  bool srv_inline_gen (void);
+  bool cli_hdr_any_op_gen (void);
+  bool cli_stub_any_op_gen (void);
+  bool cli_hdr_cdr_op_gen (void);
+  bool cli_stub_cdr_op_gen (void);
+  bool cli_inline_cdr_op_gen (void);
+  bool cli_inline_cdr_decl_gen (void);
+  bool cli_hdr_serializer_op_gen (void);
+  bool cli_stub_serializer_op_gen (void);
+  bool cli_inline_serializer_op_gen (void);
+  bool cli_inline_serializer_decl_gen (void);
+
+  bool cli_traits_gen (void);
+  bool cli_arg_traits_gen (void);
+  bool srv_arg_traits_gen (void);
+  bool srv_sarg_traits_gen (void);
+  bool cli_tmpl_class_gen (void);
+  bool cli_pragma_inst_gen (void);
+  bool cli_inarg_tmpl_class_gen (void);
+  bool cli_inarg_pragma_inst_gen (void);
+  bool cli_inoutarg_tmpl_class_gen (void);
+  bool cli_inoutarg_pragma_inst_gen (void);
+  bool cli_outarg_tmpl_class_gen (void);
+  bool cli_outarg_pragma_inst_gen (void);
+  bool cli_retarg_tmpl_class_gen (void);
+  bool cli_retarg_pragma_inst_gen (void);
+  bool srv_tmpl_class_gen (void);
+  bool srv_pragma_inst_gen (void);
+  bool srv_inarg_tmpl_class_gen (void);
+  bool srv_inarg_pragma_inst_gen (void);
+  bool srv_inoutarg_tmpl_class_gen (void);
+  bool srv_inoutarg_pragma_inst_gen (void);
+  bool srv_outarg_tmpl_class_gen (void);
+  bool srv_outarg_pragma_inst_gen (void);
+  bool srv_retarg_tmpl_class_gen (void);
+  bool srv_retarg_pragma_inst_gen (void);
+  bool ccm_pre_proc_gen (void);
 
   // Set the flag indicating that code generation is done.
-  void cli_hdr_gen (idl_bool);
-  void cli_stub_gen (idl_bool);
-  void cli_inline_gen (idl_bool);
-  void srv_hdr_gen (idl_bool);
-  void impl_hdr_gen (idl_bool);
-  void srv_skel_gen (idl_bool);
-  void impl_skel_gen (idl_bool);
-  void srv_inline_gen (idl_bool);
-  void cli_hdr_any_op_gen (idl_bool);
-  void cli_stub_any_op_gen (idl_bool);
-  void cli_hdr_cdr_op_gen (idl_bool);
-  void cli_stub_cdr_op_gen (idl_bool);
-  void cli_inline_cdr_op_gen (idl_bool);
-  void cli_inline_cdr_decl_gen (idl_bool);
-  void cli_hdr_serializer_op_gen (idl_bool);
-  void cli_stub_serializer_op_gen (idl_bool);
-  void cli_inline_serializer_op_gen (idl_bool);
-  void cli_inline_serializer_decl_gen (idl_bool);
-
-  void cli_traits_gen (idl_bool);
-  void cli_arg_traits_gen (idl_bool);
-  void srv_arg_traits_gen (idl_bool);
-  void srv_sarg_traits_gen (idl_bool);
-  void cli_tmpl_class_gen (idl_bool);
-  void cli_pragma_inst_gen (idl_bool);
-  void cli_inarg_tmpl_class_gen (idl_bool);
-  void cli_inarg_pragma_inst_gen (idl_bool);
-  void cli_inoutarg_tmpl_class_gen (idl_bool);
-  void cli_inoutarg_pragma_inst_gen (idl_bool);
-  void cli_outarg_tmpl_class_gen (idl_bool);
-  void cli_outarg_pragma_inst_gen (idl_bool);
-  void cli_retarg_tmpl_class_gen (idl_bool);
-  void cli_retarg_pragma_inst_gen (idl_bool);
-  void srv_tmpl_class_gen (idl_bool);
-  void srv_pragma_inst_gen (idl_bool);
-  void srv_inarg_tmpl_class_gen (idl_bool);
-  void srv_inarg_pragma_inst_gen (idl_bool);
-  void srv_inoutarg_tmpl_class_gen (idl_bool);
-  void srv_inoutarg_pragma_inst_gen (idl_bool);
-  void srv_outarg_tmpl_class_gen (idl_bool);
-  void srv_outarg_pragma_inst_gen (idl_bool);
-  void srv_retarg_tmpl_class_gen (idl_bool);
-  void srv_retarg_pragma_inst_gen (idl_bool);
-  void ccm_pre_proc_gen (idl_bool);
+  void cli_hdr_gen (bool);
+  void cli_stub_gen (bool);
+  void cli_inline_gen (bool);
+  void srv_hdr_gen (bool);
+  void impl_hdr_gen (bool);
+  void srv_skel_gen (bool);
+  void impl_skel_gen (bool);
+  void srv_inline_gen (bool);
+  void cli_hdr_any_op_gen (bool);
+  void cli_stub_any_op_gen (bool);
+  void cli_hdr_cdr_op_gen (bool);
+  void cli_stub_cdr_op_gen (bool);
+  void cli_inline_cdr_op_gen (bool);
+  void cli_inline_cdr_decl_gen (bool);
+  void cli_hdr_serializer_op_gen (bool);
+  void cli_stub_serializer_op_gen (bool);
+  void cli_inline_serializer_op_gen (bool);
+  void cli_inline_serializer_decl_gen (bool);
+
+  void cli_traits_gen (bool);
+  void cli_arg_traits_gen (bool);
+  void srv_arg_traits_gen (bool);
+  void srv_sarg_traits_gen (bool);
+  void cli_tmpl_class_gen (bool);
+  void cli_pragma_inst_gen (bool);
+  void cli_inarg_tmpl_class_gen (bool);
+  void cli_inarg_pragma_inst_gen (bool);
+  void cli_inoutarg_tmpl_class_gen (bool);
+  void cli_inoutarg_pragma_inst_gen (bool);
+  void cli_outarg_tmpl_class_gen (bool);
+  void cli_outarg_pragma_inst_gen (bool);
+  void cli_retarg_tmpl_class_gen (bool);
+  void cli_retarg_pragma_inst_gen (bool);
+  void srv_tmpl_class_gen (bool);
+  void srv_pragma_inst_gen (bool);
+  void srv_inarg_tmpl_class_gen (bool);
+  void srv_inarg_pragma_inst_gen (bool);
+  void srv_inoutarg_tmpl_class_gen (bool);
+  void srv_inoutarg_pragma_inst_gen (bool);
+  void srv_outarg_tmpl_class_gen (bool);
+  void srv_outarg_pragma_inst_gen (bool);
+  void srv_retarg_tmpl_class_gen (bool);
+  void srv_retarg_pragma_inst_gen (bool);
+  void ccm_pre_proc_gen (bool);
 
   // Narrowing
   DEF_NARROW_METHODS1 (be_decl, AST_Decl);
@@ -177,50 +177,50 @@ protected:
 private:
   // Variables that indicate if the code generation for that node is already
   // been done. This way we avoid regenerating same code.
-  idl_bool cli_hdr_gen_;
-  idl_bool cli_stub_gen_;
-  idl_bool cli_inline_gen_;
-  idl_bool srv_hdr_gen_;
-  idl_bool impl_hdr_gen_;
-  idl_bool srv_skel_gen_;
-  idl_bool impl_skel_gen_;
-  idl_bool srv_inline_gen_;
-  idl_bool cli_hdr_any_op_gen_;
-  idl_bool cli_stub_any_op_gen_;
-  idl_bool cli_hdr_cdr_op_gen_;
-  idl_bool cli_stub_cdr_op_gen_;
-  idl_bool cli_inline_cdr_op_gen_;
-  idl_bool cli_inline_cdr_decl_gen_;
-  idl_bool cli_hdr_serializer_op_gen_;
-  idl_bool cli_stub_serializer_op_gen_;
-  idl_bool cli_inline_serializer_op_gen_;
-  idl_bool cli_inline_serializer_decl_gen_;
-
-  idl_bool cli_traits_gen_;
-  idl_bool cli_arg_traits_gen_;
-  idl_bool srv_arg_traits_gen_;
-  idl_bool srv_sarg_traits_gen_;
-  idl_bool cli_tmpl_class_gen_;
-  idl_bool cli_pragma_inst_gen_;
-  idl_bool cli_inarg_tmpl_class_gen_;
-  idl_bool cli_inarg_pragma_inst_gen_;
-  idl_bool cli_inoutarg_tmpl_class_gen_;
-  idl_bool cli_inoutarg_pragma_inst_gen_;
-  idl_bool cli_outarg_tmpl_class_gen_;
-  idl_bool cli_outarg_pragma_inst_gen_;
-  idl_bool cli_retarg_tmpl_class_gen_;
-  idl_bool cli_retarg_pragma_inst_gen_;
-  idl_bool srv_tmpl_class_gen_;
-  idl_bool srv_pragma_inst_gen_;
-  idl_bool srv_inarg_tmpl_class_gen_;
-  idl_bool srv_inarg_pragma_inst_gen_;
-  idl_bool srv_inoutarg_tmpl_class_gen_;
-  idl_bool srv_inoutarg_pragma_inst_gen_;
-  idl_bool srv_outarg_tmpl_class_gen_;
-  idl_bool srv_outarg_pragma_inst_gen_;
-  idl_bool srv_retarg_tmpl_class_gen_;
-  idl_bool srv_retarg_pragma_inst_gen_;
-  idl_bool ccm_pre_proc_gen_;
+  bool cli_hdr_gen_;
+  bool cli_stub_gen_;
+  bool cli_inline_gen_;
+  bool srv_hdr_gen_;
+  bool impl_hdr_gen_;
+  bool srv_skel_gen_;
+  bool impl_skel_gen_;
+  bool srv_inline_gen_;
+  bool cli_hdr_any_op_gen_;
+  bool cli_stub_any_op_gen_;
+  bool cli_hdr_cdr_op_gen_;
+  bool cli_stub_cdr_op_gen_;
+  bool cli_inline_cdr_op_gen_;
+  bool cli_inline_cdr_decl_gen_;
+  bool cli_hdr_serializer_op_gen_;
+  bool cli_stub_serializer_op_gen_;
+  bool cli_inline_serializer_op_gen_;
+  bool cli_inline_serializer_decl_gen_;
+
+  bool cli_traits_gen_;
+  bool cli_arg_traits_gen_;
+  bool srv_arg_traits_gen_;
+  bool srv_sarg_traits_gen_;
+  bool cli_tmpl_class_gen_;
+  bool cli_pragma_inst_gen_;
+  bool cli_inarg_tmpl_class_gen_;
+  bool cli_inarg_pragma_inst_gen_;
+  bool cli_inoutarg_tmpl_class_gen_;
+  bool cli_inoutarg_pragma_inst_gen_;
+  bool cli_outarg_tmpl_class_gen_;
+  bool cli_outarg_pragma_inst_gen_;
+  bool cli_retarg_tmpl_class_gen_;
+  bool cli_retarg_pragma_inst_gen_;
+  bool srv_tmpl_class_gen_;
+  bool srv_pragma_inst_gen_;
+  bool srv_inarg_tmpl_class_gen_;
+  bool srv_inarg_pragma_inst_gen_;
+  bool srv_inoutarg_tmpl_class_gen_;
+  bool srv_inoutarg_pragma_inst_gen_;
+  bool srv_outarg_tmpl_class_gen_;
+  bool srv_outarg_pragma_inst_gen_;
+  bool srv_retarg_tmpl_class_gen_;
+  bool srv_retarg_pragma_inst_gen_;
+  bool ccm_pre_proc_gen_;
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 99f8893dde7..97994833b64 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -38,8 +38,8 @@ public:
   // Default constructor.
 
   be_enum (UTL_ScopedName *n,
-           idl_bool local,
-           idl_bool abstract);
+           bool local,
+           bool abstract);
   // Constructor.
 
   virtual void destroy (void);
diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h
index 2f68e756ad3..65455fa64ba 100644
--- a/TAO/TAO_IDL/be_include/be_eventtype.h
+++ b/TAO/TAO_IDL/be_include/be_eventtype.h
@@ -43,9 +43,9 @@ public:
                 AST_Interface **supports,
                 long n_supports,
                 AST_Interface *supports_concrete,
-                idl_bool abstract,
-                idl_bool truncatable,
-                idl_bool custom);
+                bool abstract,
+                bool truncatable,
+                bool custom);
   // Constructor that sets its scoped name <n>, a list of inherited valuetypes
   // and supported interfaces <ih>, and the number of inherited interfaces <nih>
 
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 1221d3be876..67657b1e54b 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -19,8 +19,8 @@ public:
   // Default constructor.
 
   be_exception (UTL_ScopedName *n,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
   // Constructor.
 
   virtual void destroy (void);
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index b5954dc8135..405000f5649 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -42,8 +42,7 @@ public:
 
   be_expression (long l);
 
-  be_expression (long l,
-                 AST_Expression::ExprType t);
+  be_expression (bool b);
 
   be_expression (idl_uns_long l,
                  AST_Expression::ExprType t);
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 44e39df7e0f..ddbed2d438b 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -95,12 +95,12 @@ public:
                                            long nih,
                                            AST_Interface **ih_flat,
                                            long nih_flat,
-                                           idl_bool local,
-                                           idl_bool abstract);
+                                           bool local,
+                                           bool abstract);
 
   virtual AST_InterfaceFwd *create_interface_fwd (UTL_ScopedName *n,
-                                                  idl_bool local,
-                                                  idl_bool abstract);
+                                                  bool local,
+                                                  bool abstract);
 
   // Create a node representing a boxed value type
   virtual AST_ValueBox *create_valuebox (UTL_ScopedName *n,
@@ -115,12 +115,12 @@ public:
                                            AST_Interface **supports,
                                            long n_supports,
                                            AST_Interface *supports_concrete,
-                                           idl_bool abstract,
-                                           idl_bool truncatable,
-                                           idl_bool custom);
+                                           bool abstract,
+                                           bool truncatable,
+                                           bool custom);
 
   virtual AST_ValueTypeFwd *create_valuetype_fwd (UTL_ScopedName *n,
-                                                  idl_bool abstract);
+                                                  bool abstract);
 
   virtual AST_EventType *create_eventtype (UTL_ScopedName *n,
                                            AST_Interface **inherits,
@@ -131,12 +131,12 @@ public:
                                            AST_Interface **supports,
                                            long n_supports,
                                            AST_Interface *supports_concrete,
-                                           idl_bool abstract,
-                                           idl_bool truncatable,
-                                           idl_bool custom);
+                                           bool abstract,
+                                           bool truncatable,
+                                           bool custom);
 
   virtual AST_EventTypeFwd *create_eventtype_fwd (UTL_ScopedName *n,
-                                                  idl_bool abstract);
+                                                  bool abstract);
 
   virtual AST_Component *create_component (UTL_ScopedName *n,
                                            AST_Component *base_component,
@@ -157,24 +157,24 @@ public:
                                  long n_supports_flat);
 
   virtual AST_Exception *create_exception (UTL_ScopedName *n,
-                                           idl_bool local,
-                                           idl_bool abstract);
+                                           bool local,
+                                           bool abstract);
 
   virtual AST_Structure *create_structure (UTL_ScopedName *n,
-                                           idl_bool local,
-                                           idl_bool abstract);
+                                           bool local,
+                                           bool abstract);
 
   virtual AST_StructureFwd *create_structure_fwd (UTL_ScopedName *n);
 
   virtual AST_Enum *create_enum (UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract);
+                                 bool local,
+                                 bool abstract);
 
   virtual AST_Operation *create_operation (AST_Type *rt,
                                            AST_Operation::Flags fl,
                                            UTL_ScopedName *n,
-                                           idl_bool local,
-                                           idl_bool abstract);
+                                           bool local,
+                                           bool abstract);
 
   virtual AST_Field *create_field (AST_Type *ft, UTL_ScopedName *n,
                                    AST_Field::Visibility vis =
@@ -184,16 +184,16 @@ public:
                                          AST_Type *ft,
                                          UTL_ScopedName *n);
 
-  virtual AST_Attribute *create_attribute (idl_bool ro,
+  virtual AST_Attribute *create_attribute (bool ro,
                                            AST_Type *ft,
                                            UTL_ScopedName *n,
-                                           idl_bool local,
-                                           idl_bool abstract);
+                                           bool local,
+                                           bool abstract);
 
   virtual AST_Union *create_union (AST_ConcreteType *dt,
                                    UTL_ScopedName *n,
-                                   idl_bool local,
-                                   idl_bool abstract);
+                                   bool local,
+                                   bool abstract);
 
   virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n);
 
@@ -217,15 +217,14 @@ public:
                                        AST_Expression *v1,
                                        AST_Expression *v2);
 
-  virtual AST_Expression *create_expr(long v);
+  virtual AST_Expression *create_expr (long v);
 
-  virtual AST_Expression *create_expr (long v,
-                                       AST_Expression::ExprType t);
+  virtual AST_Expression *create_expr (bool b);
 
   virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr(UTL_String *s);
+  virtual AST_Expression *create_expr( UTL_String *s);
 
   virtual AST_Expression *create_expr (char *s);
 
@@ -241,14 +240,14 @@ public:
   virtual AST_Array *create_array (UTL_ScopedName *n,
                                    unsigned long ndims,
                                    UTL_ExprList *dims,
-                                   idl_bool local,
-                                   idl_bool abstract);
+                                   bool local,
+                                   bool abstract);
 
   virtual AST_Sequence *create_sequence (AST_Expression *v,
                                          AST_Type *bt,
                                          UTL_ScopedName *n,
-                                         idl_bool local,
-                                         idl_bool abstract);
+                                         bool local,
+                                         bool abstract);
 
   virtual AST_String *create_string (AST_Expression *v);
 
@@ -256,8 +255,8 @@ public:
 
   virtual AST_Typedef *create_typedef (AST_Type *bt,
                                        UTL_ScopedName *n,
-                                       idl_bool local,
-                                       idl_bool abstract);
+                                       bool local,
+                                       bool abstract);
 
   // Create a node representing a native
   virtual AST_Native *create_native (UTL_ScopedName *n);
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 21c5e016cf7..cc20432939c 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -1,4 +1,5 @@
-/* -*- c++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -21,11 +22,12 @@
 #define _BE_GLOBAL_H
 
 #include "TAO_IDL_BE_Export.h"
-#include "idl_bool.h"
+
 #include "ace/Unbounded_Queue.h"
 #include "ace/SString.h"
 
 class be_interface;
+class be_valuetype;
 class be_interface_fwd;
 class UTL_String;
 class AST_PredefinedType;
@@ -205,6 +207,26 @@ public:
   // set the name of the include file to be put at the bottom of every
   // header file.
 
+  /// Set text that opens a "versioned" namespace.
+  void versioning_begin (const char* s);
+
+  /// Get text that opens a "versioned" namespace.
+  const char * versioning_begin (void) const;
+
+  /// Get text that opens a "versioned" namespace for core TAO/orbsvcs
+  /// related code.
+  const char * core_versioning_begin (void) const;
+
+  /// Set text that closes a "versioned" namespace.
+  void versioning_end (const char* s);
+
+  /// Get text that closes a "versioned" namespace.
+  const char * versioning_end (void) const;
+
+  /// Get text that closes a "versioned" namespace for core TAO/orbsvcs
+  /// related code.
+  const char * core_versioning_end (void) const;
+
   // = Set and get methods for different file name endings.
 
   void client_hdr_ending (const char* s);
@@ -287,13 +309,13 @@ public:
 
   void anyop_header_ending (const char* s);
   // Set the anyop_header_ending.
-  
+
   const char* anyop_header_ending (void) const;
   // Get the anyop_header_ending.
-  
+
   void anyop_source_ending (const char* s);
   // Set the anyop_source_ending.
-    
+
   const char* anyop_source_ending (void) const;
   // Get the anyop_source_ending.
 
@@ -317,117 +339,117 @@ public:
   // to be kept. Default  is current directory from which the
   // <tao_idl> is called.
 
-  void any_support (idl_bool);
+  void any_support (bool);
   // Set any support.
 
-  idl_bool any_support (void) const;
+  bool any_support (void) const;
   // Check Any support.
 
-  void tc_support (idl_bool);
+  void tc_support (bool);
   // Set TypeCode support.
 
-  idl_bool tc_support (void) const;
+  bool tc_support (void) const;
   // Check TypeCode support
 
-  void obv_opt_accessor (idl_bool);
+  void obv_opt_accessor (bool);
   // Set optimized valuetype member accessor generation.
 
-  idl_bool obv_opt_accessor (void) const;
+  bool obv_opt_accessor (void) const;
   // Check optimized valuetype member accessor generation.
 
-  void gen_impl_files (idl_bool);
+  void gen_impl_files (bool);
   // Set generation of implementation files.
 
-  idl_bool gen_impl_files (void) const;
+  bool gen_impl_files (void) const;
   // Check if we want to generate implementation files.
 
-  void gen_impl_debug_info (idl_bool);
+  void gen_impl_debug_info (bool);
   // Set generation of source file and line number for implementation files.
 
-  idl_bool gen_impl_debug_info (void) const;
+  bool gen_impl_debug_info (void) const;
   // Check generation of source file and line number implementation files.
 
-  void gen_copy_ctor (idl_bool);
+  void gen_copy_ctor (bool);
   // Set generation of copy constructor.
 
-  idl_bool gen_copy_ctor (void) const;
+  bool gen_copy_ctor (void) const;
   // Check if we want to generate the copy constructor.
 
-  void gen_assign_op (idl_bool);
+  void gen_assign_op (bool);
   // Set the generation of the assignment operator.
 
-  idl_bool gen_assign_op (void) const;
+  bool gen_assign_op (void) const;
   // Check if we want to generate the assignment operator.
 
-  void gen_thru_poa_collocation (idl_bool);
+  void gen_thru_poa_collocation (bool);
   // Set whether we want to generate Thru_POA collocation stubs.
 
-  idl_bool gen_thru_poa_collocation (void) const;
+  bool gen_thru_poa_collocation (void) const;
   // Check if we want to generate Thru_POA collocation stubs.
 
-  void gen_direct_collocation (idl_bool);
+  void gen_direct_collocation (bool);
   // Set whether we want to generate Direct collocation stubs.
 
-  idl_bool gen_direct_collocation (void) const;
+  bool gen_direct_collocation (void) const;
   // Check if we want to generate Direct collocation stubs.
 
-  void exception_support (idl_bool);
+  void exception_support (bool);
   // Set real C++ exception support.
 
-  idl_bool exception_support (void) const;
+  bool exception_support (void) const;
   // Check if real C++ exception support is enabled.
 
-  void use_raw_throw (idl_bool);
+  void use_raw_throw (bool);
   // Set replacement of 'ACE_THROW_SPEC' with 'throw'.
 
-  idl_bool use_raw_throw (void) const;
+  bool use_raw_throw (void) const;
   // Check if raw 'throw' generation option is set.
 
-  void opt_tc (idl_bool);
+  void opt_tc (bool);
   // Set optimized typecodes.
 
-  idl_bool opt_tc (void) const;
+  bool opt_tc (void) const;
   // Check if TypeCodes are optimized.
 
-  void ami_call_back (idl_bool value);
+  void ami_call_back (bool value);
   // To enable or disable AMI call back feature of the Messaging
   // specification in the generated code.
 
-  idl_bool ami_call_back (void) const;
+  bool ami_call_back (void) const;
   // Return the flag.
 
-  void gen_amh_classes (idl_bool value);
+  void gen_amh_classes (bool value);
   // To enable or disable AMH in the generated code.
 
-  idl_bool gen_amh_classes (void) const;
+  bool gen_amh_classes (void) const;
   // Return the flag.
 
-  void gen_tie_classes (idl_bool value);
+  void gen_tie_classes (bool value);
   // Set the generation of tie classes and files.
 
-  idl_bool gen_tie_classes (void) const;
+  bool gen_tie_classes (void) const;
   // Return the flag.
 
-  void gen_smart_proxies (idl_bool value);
+  void gen_smart_proxies (bool value);
   // To enable or disable AMI call back feature of the Messaging
   // specification in the generated code.
 
-  idl_bool gen_smart_proxies (void) const;
+  bool gen_smart_proxies (void) const;
   // Return the flag.
 
-  void gen_inline_constants (idl_bool value);
+  void gen_inline_constants (bool value);
   // Set the flag.
 
-  idl_bool gen_inline_constants (void) const;
+  bool gen_inline_constants (void) const;
   // Return the flag.
 
-  void gen_dcps_type_support (idl_bool value);
+  void gen_dcps_type_support (bool value);
   // Set the flag.
 
-  idl_bool gen_dcps_type_support (void) const;
+  bool gen_dcps_type_support (void) const;
   // Return the flag.
 
-  idl_bool gen_tmplinst (void) const;
+  bool gen_tmplinst (void) const;
   // Return the flag.
 
   void lookup_strategy (LOOKUP_STRATEGY s);
@@ -461,20 +483,24 @@ public:
   void ccmobject (be_interface *val);
   // Accessors for the member.
 
-  idl_bool gen_anyop_files (void) const;
-  void gen_anyop_files (idl_bool val);
+  be_valuetype *exceptionholder (void) const;
+  void exceptionholder (be_valuetype *val);
+  // Accessors for the member.
+
+  bool gen_anyop_files (void) const;
+  void gen_anyop_files (bool val);
   // Accessors for the member.
 
-  idl_bool gen_skel_files (void) const;
-  void gen_skel_files (idl_bool val);
+  bool gen_skel_files (void) const;
+  void gen_skel_files (bool val);
   // Accessors for the member gen_skel_files_.
 
-  idl_bool gen_client_inline (void) const;
-  void gen_client_inline (idl_bool val);
+  bool gen_client_inline (void) const;
+  void gen_client_inline (bool val);
   // Accessors for the member gen_client_inline_.
 
-  idl_bool gen_server_inline (void) const;
-  void gen_server_inline (idl_bool val);
+  bool gen_server_inline (void) const;
+  void gen_server_inline (bool val);
   // Accessors for the member gen_server_inline_.
 
   ACE_CString spawn_options (void);
@@ -507,7 +533,7 @@ private:
   char* skel_export_include_;
   char* stub_export_macro_;
   char* stub_export_include_;
-  
+
   // Macro and include used on ORB .pidl files generating to the
   // AnyTypeCode library.
   char* anyop_export_macro_;
@@ -517,6 +543,20 @@ private:
   char* pre_include_;
   char* post_include_;
 
+  /// Text that opens a "versioned" namespace for core TAO and orbsvcs
+  /// related code.
+  ACE_CString core_versioning_begin_;
+
+  /// Text that closes a "versioned" namespace for core TAO and
+  /// orbsvcs related code.
+  ACE_CString core_versioning_end_;
+
+  /// Text that opens a "versioned" namepace.
+  ACE_CString versioning_begin_;
+
+  /// Text that closes a "versioned" namepace.
+  ACE_CString versioning_end_;
+
   // Client's header file name ending. Default is "C.h".
   char* client_hdr_ending_;
 
@@ -559,7 +599,7 @@ private:
 
   // Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
-  
+
   // Anyop source file name ending. Default is "A.cpp".
   char* anyop_src_ending_;
 
@@ -573,63 +613,63 @@ private:
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
 
-  idl_bool any_support_;
+  bool any_support_;
   // do we support Any operators?
 
-  idl_bool tc_support_;
+  bool tc_support_;
   // do we support typecodes?
 
-  idl_bool obv_opt_accessor_;
+  bool obv_opt_accessor_;
   // do we optimize valuetype accessors?
 
-  idl_bool gen_impl_files_;
+  bool gen_impl_files_;
   // are we generating implementation files?
 
-  idl_bool gen_impl_debug_info_;
+  bool gen_impl_debug_info_;
   // are we generating source file and line numbers for implementation files?
 
-  idl_bool gen_copy_ctor_;
+  bool gen_copy_ctor_;
   // are we generating the copy constructor?
 
-  idl_bool gen_assign_op_;
+  bool gen_assign_op_;
   // are we generating the assignment operator?
 
-  idl_bool gen_thru_poa_collocation_;
+  bool gen_thru_poa_collocation_;
   // are we generating Thru_POA collocated stubs?
 
-  idl_bool gen_direct_collocation_;
+  bool gen_direct_collocation_;
   // are we generating Direct collocated stubs?
 
-  idl_bool exception_support_;
+  bool exception_support_;
   // do we support real C++ exceptions (strict mapping) for stubs/skeletons?
 
-  idl_bool use_raw_throw_;
+  bool use_raw_throw_;
   // Another possible option if the above is TRUE.
 
-  idl_bool opt_tc_;
+  bool opt_tc_;
   // do we generate optimized typecodes?
 
-  idl_bool ami_call_back_;
+  bool ami_call_back_;
   // Flag to indicate whether the AMI Call back feature of the
   // Messaging specification should be enabled for the generated files
   // or not.
 
-  idl_bool gen_amh_classes_;
+  bool gen_amh_classes_;
   // Flag for generating AMH classes.
 
-  idl_bool gen_tie_classes_;
+  bool gen_tie_classes_;
   // Flag to indicate whether we generate the tie classes and
   // files or not.
 
-  idl_bool gen_smart_proxies_;
+  bool gen_smart_proxies_;
   // Flag to indicate whether smart proxies classes will be generated
   // or not.
 
-  idl_bool gen_inline_constants_;
+  bool gen_inline_constants_;
   // Flag to indicate whether we are using an inline form of constant
   // generation that pleases the C++ compiler better on some platforms.
 
-  idl_bool gen_dcps_type_support_;
+  bool gen_dcps_type_support_;
   // Flag to indicate whether we are supporting DDS DCPS type definitions.
   // Includes Serializer operators (like TAO_Input/OutuptCDR).
 
@@ -642,18 +682,21 @@ private:
   be_interface *ccmobject_;
   // Reference holder for component skeleton visitors.
 
-  idl_bool gen_anyop_files_;
+  be_valuetype *exceptionholder_;
+  // Reference holder for the exceptionholder.
+
+  bool gen_anyop_files_;
   // Separate files for generated Any operators?
 
-  idl_bool gen_skel_files_;
+  bool gen_skel_files_;
   // True by default, but a command line option can turn this off so
   // we generate only an empty *S.h file on the skeleton side.
 
-  idl_bool gen_client_inline_;
+  bool gen_client_inline_;
   // True by default, but a command line option can turn this off so
   // that we don't generate a client inline file
 
-  idl_bool gen_server_inline_;
+  bool gen_server_inline_;
   // True by default, but a command line option can turn this off so
   // that we don't generate a server inline file
 };
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 9823766e2a1..450d1c1a970 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -29,11 +29,10 @@ class Identifier;
 class UTL_IdList;
 class AST_Expression;
 
-// a dummy structure to inform TAO_OutStream's << operator to  put a newline
+// A dummy structure to inform TAO_OutStream's << operator to  put a newline
 // and use the current indentation for the succeeding line
 struct TAO_NL
 {
-public:
   TAO_NL (void);
 };
 
@@ -71,6 +70,58 @@ extern const TAO_INDENT be_idt_nl;
 extern const TAO_UNINDENT be_uidt;
 extern const TAO_UNINDENT be_uidt_nl;
 
+// A structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and some form of "ACE_ENV_*".
+struct TAO_ENV_ARG
+{
+  TAO_ENV_ARG (bool with_defaults = false,
+               bool single = false,
+               bool arg = false,
+               bool not_used = false);
+
+  bool with_defaults_;
+  bool single_;
+  bool arg_;
+  bool not_used_;
+};
+
+extern const TAO_ENV_ARG env_decl;
+extern const TAO_ENV_ARG env_dflts;
+extern const TAO_ENV_ARG env_sngl;
+extern const TAO_ENV_ARG env_sngl_dflts;
+extern const TAO_ENV_ARG env_not;
+extern const TAO_ENV_ARG env_sngl_not;
+extern const TAO_ENV_ARG env_arg;
+extern const TAO_ENV_ARG env_sngl_arg;
+
+// A structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and some form of "ACE_CHECK".
+struct TAO_ACE_CHECK
+{
+  TAO_ACE_CHECK (const char *retval = 0,
+                 bool do_return = false);
+
+  const char *retval_;
+  bool do_return_;
+};
+
+// A dummy structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and "ACE_TRY_CHECK".
+struct TAO_ACE_TRY_CHECK
+{
+  TAO_ACE_TRY_CHECK (void);
+};
+
+// A structure to inform TAO_OutStream's << operator to
+// conditionally output a newline and "ACE_ENDTRY.
+struct TAO_ACE_ENDTRY
+{
+  TAO_ACE_ENDTRY (void);
+};
+
+extern const TAO_ACE_TRY_CHECK ace_try_check;
+extern const TAO_ACE_ENDTRY ace_endtry;
+
 class TAO_OutStream
 {
   // =TITLE
@@ -185,6 +236,18 @@ public:
   TAO_OutStream &operator<< (const TAO_INDENT& i);
   TAO_OutStream &operator<< (const TAO_UNINDENT& i);
 
+  TAO_OutStream &operator<< (const TAO_ENV_ARG& i);
+  // Conditional and generic output for all forms of "ACE_ENV_*".
+
+  TAO_OutStream &operator<< (const TAO_ACE_CHECK& i);
+  // Conditional and generic output for all forms of "ACE_CHECK".
+
+  TAO_OutStream &operator<< (const TAO_ACE_TRY_CHECK& i);
+  // Conditional and generic output for all forms of "ACE_ENV_*".
+
+  TAO_OutStream &operator<< (const TAO_ACE_ENDTRY& i);
+  // Conditional and generic output for all forms of "ACE_CHECK".
+
   // The following will be provided by specialized classes
 
   TAO_OutStream &operator<< (Identifier *id);
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 90bebac52b2..c4af6c6d1c4 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -66,8 +66,8 @@ public:
                 long nih,
                 AST_Interface **ih_flat,
                 long nih_flat,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
   // Constructor that sets its scoped name <n>, a list of inherited interfaces
   // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>.
 
@@ -188,7 +188,7 @@ public:
   int traverse_inheritance_graph (
       TAO_IDL_Inheritance_Hierarchy_Worker &worker,
       TAO_OutStream *os,
-      idl_bool abstract_paths_only = I_FALSE
+      bool abstract_paths_only = false
     );
 
   /// Wrap the @c gen parameter and call the generic version of
@@ -196,7 +196,7 @@ public:
   int traverse_inheritance_graph (
       tao_code_emitter gen,
       TAO_OutStream *os,
-      idl_bool abstract_paths_only = I_FALSE
+      bool abstract_paths_only = false
     );
 
   int in_mult_inheritance (void);
@@ -294,7 +294,7 @@ public:
                                         be_interface *ancestor,
                                         AST_Decl *d,
                                         const char *prefix,
-                                        idl_bool direct,
+                                        bool direct,
                                         UTL_ExceptList *list,
                                         TAO_OutStream *os);
   // Common code called from gen_colloc_op_defn_helper().
@@ -329,8 +329,8 @@ public:
 
   int session_component_child (void);
   // Is Components::SessionComponent an immediate parent?
-  
-  idl_bool is_event_consumer (void);
+
+  bool is_event_consumer (void);
   // Is EventConsumerBase our parent?
 
 private:
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 6c2d84f7614..1c15e862428 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -48,9 +48,9 @@ public:
   virtual ~be_interface_fwd (void);
   // Destructor.
 
-  virtual void seq_elem_tmplinst (idl_bool val);
-  virtual void seen_in_sequence (idl_bool val);
-  virtual void seen_in_operation (idl_bool val);
+  virtual void seq_elem_tmplinst (bool val);
+  virtual void seen_in_sequence (bool val);
+  virtual void seen_in_operation (bool val);
   // Mutator overrides for be_type members. If we have been
   // defined, we want the full definition to be set as well.
 
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
index 0e004b3b682..49b837e3467 100644
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ b/TAO/TAO_IDL/be_include/be_operation.h
@@ -43,8 +43,8 @@ public:
   be_operation (AST_Type *rt,
                 AST_Operation::Flags fl,
                 UTL_ScopedName *n,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
   // Constructor
 
   ~be_operation (void);
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index f6ae364d559..8a4f21fb3d9 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -61,8 +61,8 @@ public:
   be_sequence (AST_Expression *v,
                AST_Type *bt,
                UTL_ScopedName *n,
-               idl_bool local,
-               idl_bool abstract);
+               bool local,
+               bool abstract);
   // Constructor.
 
   virtual int create_name (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 6a48bd892f7..61e5646d95a 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -38,8 +38,8 @@ public:
   // Default constructor.
 
   be_structure (UTL_ScopedName *n,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
   // Constructor.
 
   virtual void redefine (AST_Structure *from);
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 17dd1ee6984..4f4faf15d71 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -63,16 +63,16 @@ public:
   void gen_common_varout (TAO_OutStream *os);
   // Generate _var and _out typedefs for structs and unions.
 
-  idl_bool seq_elem_tmplinst (void) const;
-  virtual void seq_elem_tmplinst (idl_bool val);
+  bool seq_elem_tmplinst (void) const;
+  virtual void seq_elem_tmplinst (bool val);
   // Accessors for the member.
 
-  idl_bool seen_in_sequence (void) const;
-  virtual void seen_in_sequence (idl_bool val);
+  bool seen_in_sequence (void) const;
+  virtual void seen_in_sequence (bool val);
   // Accessors for the member.
 
-  idl_bool seen_in_operation (void) const;
-  virtual void seen_in_operation (idl_bool val);
+  bool seen_in_operation (void) const;
+  virtual void seen_in_operation (bool val);
   // Accessors for the member.
 
   virtual AST_Decl::NodeType base_node_type (void) const;
@@ -101,17 +101,17 @@ protected:
   ACE_CString fwd_helper_name_;
   // Used by interfaces, valuetypes and arrays to name helper structs.
 
-  idl_bool common_varout_gen_;
+  bool common_varout_gen_;
   // Have we generated our _var and _out class typedefs yet?
 
-  idl_bool seq_elem_tmplinst_;
+  bool seq_elem_tmplinst_;
   // Have we generated an explicit template instantiation for a sequence
   // with this element?
 
-  idl_bool seen_in_sequence_;
+  bool seen_in_sequence_;
   // Has this declaration been used as a sequence element?
 
-  idl_bool seen_in_operation_;
+  bool seen_in_operation_;
   // Has this declaration been used as a return type or parameter?
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index 94af3381b5f..4f5f1b69591 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -36,13 +36,13 @@ public:
 
   be_typedef (AST_Type *bt,
               UTL_ScopedName *n,
-              idl_bool l,
-              idl_bool a);
+              bool l,
+              bool a);
   // Constructor.
 
-  virtual void seq_elem_tmplinst (idl_bool val);
-  virtual void seen_in_sequence (idl_bool val);
-  virtual void seen_in_operation (idl_bool val);
+  virtual void seq_elem_tmplinst (bool val);
+  virtual void seen_in_sequence (bool val);
+  virtual void seen_in_operation (bool val);
   // Mutator overrides for be_type members. If we have been
   // defined, we want the underlying type to be set as well.
 
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index e5564f38d7a..7ebe974875a 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -39,14 +39,14 @@ public:
 
   be_union (AST_ConcreteType *dt,
             UTL_ScopedName *n,
-            idl_bool local,
-            idl_bool abstract);
+            bool local,
+            bool abstract);
   // Constructor.
 
   virtual void redefine (AST_Structure *from);
   // Catch BE-specific member values before delegating to the base class.
 
-  virtual idl_bool has_duplicate_case_labels (void);
+  virtual bool has_duplicate_case_labels (void);
   // Do we have at least one member with multiple case labels?
 
   virtual void destroy (void);
@@ -55,10 +55,10 @@ public:
   virtual int accept (be_visitor *visitor);
   // Visiting.
 
-  idl_bool gen_empty_default_label (void);
+  bool gen_empty_default_label (void);
   // Decides whether a default switch case label in the generated copy
   // constructor, assignment operator, etc. is needed.
-  
+
   unsigned long nlabels (void);
   // Returns total number of labels, useful when the union has
   // multiple case labels.
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index b3c81fa052f..9acbfe5ebb7 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -47,9 +47,9 @@ public:
                 AST_Interface **supports,
                 long n_supports,
                 AST_Interface *supports_concrete,
-                idl_bool abstract,
-                idl_bool truncatable,
-                idl_bool custom);
+                bool abstract,
+                bool truncatable,
+                bool custom);
   // Constructor that sets its scoped name <n>, a list of inherited valuetypes
   // and supported interfaces <ih>, and the number of inherited interfaces <nih>
 
@@ -58,7 +58,7 @@ public:
 
   virtual void redefine (AST_Interface *from);
 
-  idl_bool opt_accessor (void);
+  bool opt_accessor (void);
   // Should generate optimized form?
 
   virtual int gen_helper_header (char *local_name = 0,
@@ -92,8 +92,8 @@ public:
   int traverse_supports_list_graphs (
       tao_code_emitter gen,
       TAO_OutStream *os,
-      idl_bool use_abstract_paths = I_TRUE,
-      idl_bool use_concrete_paths = I_TRUE
+      bool use_abstract_paths = true,
+      bool use_concrete_paths = true
     );
 
   /// Load the insert queue with the concrete interface we support, and
@@ -103,7 +103,7 @@ public:
       TAO_OutStream *os
     );
 
-  idl_bool supports_abstract (void) const;
+  bool supports_abstract (void) const;
   // Do we support at least one abstract interface?
 
   // Visiting.
@@ -125,7 +125,7 @@ public:
     );
   // Compute the count of private/public/all data members.
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Check if we are in recursion.
 
   static int abstract_supports_helper (be_interface *node,
@@ -166,21 +166,24 @@ public:
   FactoryStyle determine_factory_style (void);
   // Determine what kind of factory needed.
 
-  idl_bool have_operation (void);
+  bool have_operation (void);
   // Recurse down the inheritance tree to determine
   // if valuetype has at least one operation/attribute.
 
-	static idl_bool have_supported_op (be_interface *node);
+  static bool have_supported_op (be_interface *node);
   // Check if VT supports an interface with at least 1 operation.
 
-  virtual idl_bool will_have_factory (void);
+  virtual bool will_have_factory (void);
   // Use the above enum and methods to determine this after the
   // node's scope is visited but before code generation.
 
+  bool has_member (void);
+  // Decides whether to generate the initializing contstructor or not.
+
 private:
   char *full_obv_skel_name_;
 
-  idl_bool supports_abstract_;
+  bool supports_abstract_;
   // Do we support at least one abstract interface?
 
   int var_out_seq_decls_gen_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 9a5ef1055fc..8246fc5d7c4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -77,9 +77,9 @@ public:
 
 private:
 
-  idl_bool generated (be_decl *node) const;
+  bool generated (be_decl *node) const;
   void generated (be_decl *node,
-                  idl_bool val);
+                  bool val);
 
   const char *insert_policy (void);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index 292f18a3bbc..c2837eaec91 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -27,7 +27,7 @@
 #define TAO_BE_VISITOR_CONTEXT_H
 
 #include "be_codegen.h"
-#include "idl_bool.h"
+
 
 class TAO_OutStream;
 class be_decl;
@@ -128,16 +128,16 @@ public:
   be_attribute *attribute (void);
   // get the attribute node
 
-  void exception (idl_bool);
+  void exception (bool);
   // is it the special ctor for exceptions?
 
-  idl_bool exception (void);
+  bool exception (void);
   // is it the special ctor for exceptions?
 
-  void comma (idl_bool);
+  void comma (bool);
   // scope supoorts generation of comma after each element
 
-  idl_bool comma (void);
+  bool comma (void);
   // are we supposed to generate a comma?
 
   be_interface *interface (void) const;
@@ -243,10 +243,10 @@ public:
 
   be_union *be_scope_as_union (void);
   // return the scope as union if possible
-  
+
   const char *export_macro (void) const;
   // return the export macro currently in force
-  
+
   const char *non_null_export_macro (void) const;
   // if anyop export macro is empty, check stub.
 
@@ -275,10 +275,10 @@ private:
   be_attribute *attr_;
   // attribute node stored here while generating its code
 
-  idl_bool exception_;
+  bool exception_;
   // is it the special ctor for exceptions?
 
-  idl_bool comma_;
+  bool comma_;
   // whether scope should generate a comma after every element
 
   be_interface* interface_;
@@ -288,5 +288,5 @@ private:
 #if defined (interface)
 # define interface aceinterface
 #endif /* interface */
- 
+
 #endif /* BE_VISITOR_CONTEXT_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index 6142a9c9ab9..062923f54cd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -74,13 +74,6 @@ public:
                                    const char *exception_arguments);
   // helper that generates code for raising an exception
 
-  virtual int gen_check_exception (be_type *return_type);
-  // helper that generates code for checking for an exception
-
-  virtual int gen_check_interceptor_exception (be_type *);
-  // helper that generates code for checking for an exception within
-  // an interceptor try block.
-
   virtual int gen_stub_operation_body (be_operation *node,
                                        be_type *return_type);
   // Generates the code from opening brace to closing brace for
@@ -102,7 +95,7 @@ public:
 
   void gen_stub_body_arglist (be_operation *node,
                               TAO_OutStream *os,
-                              idl_bool ami = I_FALSE);
+                              bool ami = false);
 
   void gen_arg_template_param_name (AST_Decl *scope,
                                     AST_Type *bt,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h
index 6aa0a2be7b6..061aa2c158f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h
@@ -22,7 +22,7 @@
 #define TAO_BE_VISITOR_SCOPE_H
 
 #include "be_visitor_decl.h"
-#include "idl_bool.h"
+
 
 class be_visitor_scope : public be_visitor_decl
 {
@@ -57,10 +57,10 @@ public:
   virtual int next_elem (be_decl *elem, be_decl *&);
   // get the successor to elem
 
-  virtual idl_bool last_node (be_decl *bd);
+  virtual bool last_node (be_decl *bd);
   // Is bd the last node in the scope
 
-  idl_bool last_inout_or_out_node (be_decl *bd);
+  bool last_inout_or_out_node (be_decl *bd);
   // Is bd the last inout or out in the scope
 
 protected:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h
index 0268a2e5f26..939b0b6bf17 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h
@@ -40,6 +40,8 @@ public:
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
 
+  virtual int visit_valuebox (be_valuebox *node);
+
   virtual int visit_component (be_component *node);
 
   virtual int visit_component_fwd (be_component_fwd *node);
@@ -47,17 +49,17 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  
+
   virtual int visit_field (be_field *node);
 
   virtual int visit_union_branch (be_union_branch *node);
-  
+
   virtual int visit_exception (be_exception *node);
-  
+
   virtual int visit_structure (be_structure *node);
-  
+
   virtual int visit_union (be_union *node);
-  
+
   virtual int visit_array (be_array *node);
 
   virtual int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
index 46c7f80f895..f51b7934c0b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
@@ -71,17 +71,14 @@ public:
   // visit union.
 
 private:
-  int emit_for_predef_enum(be_type *node,
-                           const char * type_suffix,
-                           bool is_any,
-                           const char * marshal_arg);
+  int emit_for_predef_enum (be_type *node,
+                            const char * type_suffix,
+                            bool is_any);
 
   void emit_default_constructor (void);
 
   void emit_default_constructor_alloc (be_decl *node);
 
-  void emit_destructor (void);
-
   void emit_constructor_one_arg (be_decl *node,
                                 const char * type_suffix);
 
@@ -91,8 +88,8 @@ private:
 
   void emit_copy_constructor_alloc (be_decl *node);
 
-  void emit_assignment( be_decl *node,
-                       const char * type_suffix);
+  void emit_assignment (be_decl *node,
+                        const char * type_suffix);
 
   void emit_assignment_alloc (be_decl *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
index 4b92f3c3aa6..cfc363a37ca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
@@ -70,6 +70,13 @@ public:
   virtual int visit_union (be_union *node);
   // visit union.
 
+private:
+
+  /// Generate virtual destructor.
+  void emit_destructor (void);
+
+  int emit_for_predef_enum (char const * marshal_arg);
+
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
index a23c7e444fb..139d488f9ac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
@@ -41,8 +41,6 @@ public:
   ~be_visitor_valuetype_ami_exception_holder_ch (void);
   // destructor
 
-  virtual int visit_valuetype (be_valuetype *node);
-
   virtual int visit_operation (be_operation *node);
 
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
index 229f6a2252c..d407c637573 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
@@ -41,7 +41,7 @@ public:
   ~be_visitor_obv_operation_arglist (void);
   // destructor
 
-  idl_bool is_amh_exception_holder (be_operation *node);
+  bool is_amh_exception_holder (be_operation *node);
   // special arglist generation for amh_exceptionholders
 
   int visit_operation (be_operation *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
index fe0e43b1909..4803e64cfee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
@@ -62,8 +62,8 @@ public:
   void op_name (be_valuetype *node, TAO_OutStream *os);
   // if (in_obv_space_) print OBV_name else print name
 
-  idl_bool in_obv_space_;
-  
+  bool in_obv_space_;
+
 private:
   const char *pre_op_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
index 1699deef3d9..b8ce769a27b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -93,7 +93,7 @@ public:
   void op_name (be_valuetype *node, TAO_OutStream *os);
   // if (in_obv_space_) print OBV_name else print name
 
-  idl_bool in_obv_space_;
+  bool in_obv_space_;
 private:
   const char *pre_op_;
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
index 1789d83b667..e88c4509dfb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -97,16 +97,20 @@ public:
   virtual int gen_init_impl (be_valuetype *node);
   // generate the _init implementation
 
+  void gen_obv_init_constructor_args (be_valuetype *node,
+                                      unsigned long &index);
+  // Recursively generate args for the initializing constuctor.
+
 protected:
-  static idl_bool obv_need_ref_counter (be_valuetype *node);
+  static bool obv_need_ref_counter (be_valuetype *node);
   // check is VT needs a RefCounter mix-in in OBV_ class
   // suppose that we are deciding for this node
 
-  static idl_bool obv_have_ref_counter (be_valuetype *node);
+  static bool obv_have_ref_counter (be_valuetype *node);
   // recurse down the inheritance tree to see
   // if node or one of its OBV_ base class already has RefCounter
 
-  idl_bool is_amh_exception_holder (be_valuetype *node);
+  bool is_amh_exception_holder (be_valuetype *node);
   // Predicate common to _ch and _cs visitors.
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
index d3960113f7e..08d463d53f7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
@@ -45,7 +45,7 @@ public:
 
   virtual int visit_field (be_field *node);
 private:
-  idl_bool opt_accessor_;
+  bool opt_accessor_;
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
index b6a05417462..05d584190ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
@@ -24,7 +24,7 @@
 #ifndef _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
 #define _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
 
-class be_visitor_valuetype_obv_cs : public be_visitor_scope
+class be_visitor_valuetype_obv_cs : public be_visitor_valuetype
 {
   //
   // = TITLE
@@ -43,8 +43,15 @@ public:
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
-
   virtual int visit_field (be_field *node);
+  
+private:
+  void gen_obv_init_constructor_inits (be_valuetype *node);
+  // Generate member assignments for the initializing constructor.
+  
+  void gen_obv_init_base_constructor_args (be_valuetype *node,
+                                           unsigned long &index);
+  // Called by method above to generate base class constructor call.
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_OBV_CS_H_ */
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 1d94b68f1c3..aef8a8394f0 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -84,10 +84,15 @@ extern long DRV_nfiles;
 extern const char *DRV_files[];
 
 // Push a file into the list of files to be processed
-static void
+void
 DRV_push_file (const char *s)
 {
-  DRV_files[DRV_nfiles++] = s;
+  // If filenames come from the command line, there is no
+  // need to duplicate the string, but some backends have
+  // an option to recurse over a directory and add all
+  // IDL files found. In this latter case we have to
+  // duplicate the file name string.
+  DRV_files[DRV_nfiles++] = ACE::strnew (s);
 }
 
 // Prepare a CPP argument
@@ -186,71 +191,9 @@ DRV_usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Wb,export_macro=<macro name>\t\t\tsets export macro ")
-      ACE_TEXT ("for all files\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,export_include=<include path>\t\tsets export include ")
-      ACE_TEXT ("file for all files\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,stub_export_macro=<macro name>\t\tsets export ")
-      ACE_TEXT ("macro for client files only\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,stub_export_include=<include path>\t\tsets export ")
-      ACE_TEXT ("include file for client only\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,skel_export_macro=<macro name>\t\tsets export ")
-      ACE_TEXT ("macro for server files only\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,skel_export_include=<include path>\t\tsets export ")
-      ACE_TEXT ("include file for server only\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,anyop_export_macro=<macro name>\t\tsets export macro ")
-      ACE_TEXT ("for typecode/Any operator files only, when -GA option ")
-      ACE_TEXT ("is used\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,anyop_export_include=<include path>\tsets export ")
-      ACE_TEXT ("include file typecode/Any operator files only, when -GA ")
-      ACE_TEXT ("option is used\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,pch_include=<include path>\t\t\tsets include ")
-      ACE_TEXT ("file for precompiled header mechanism\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,pre_include=<include path>\t\t\tsets include ")
-      ACE_TEXT ("file generate before any other includes\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,post_include=<include path>\t\tsets include ")
-      ACE_TEXT ("file generated at the end of the file\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
-      ACE_TEXT ("data in valuetypes\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
       ACE_TEXT (" -Yp,path\t\tdefines location of preprocessor\n")
     ));
-    
+
   be_global->usage ();
 }
 
@@ -333,16 +276,16 @@ DRV_parse_args (long ac, char **av)
                   if (i < ac - 1)
                     {
                       idl_global->append_idl_flag (av[i + 1]);
-                      
+
                       has_space = idl_global->hasspace (av[i + 1]);
-                      
+
                       // If the include path has a space, we need to
                       // add literal "s.
                       ACE_CString arg = av[i];
                       arg += (has_space ? "\"" : "");
                       arg += av[i + 1];
                       arg += (has_space ? "\"" : "");
-                      
+
                       DRV_cpp_putarg (arg.c_str ());
                       idl_global->add_include_path (arg.substr (2).c_str ());
                       i++;
@@ -362,14 +305,14 @@ DRV_parse_args (long ac, char **av)
               else
                 {
                   has_space = idl_global->hasspace (av[i]);
-                  
+
                   // If the include path has a space, we need to
                   // add literal "s.
                   ACE_CString arg (av[i], 2);
                   arg += (has_space ? "\"" : "");
                   arg += av[i] + 2;
                   arg += (has_space? "\"" : "");
-                  
+
                   idl_global->add_include_path (arg.substr (2).c_str ());
                   DRV_cpp_putarg (arg.c_str ());
                 }
@@ -488,12 +431,12 @@ DRV_parse_args (long ac, char **av)
               if (av[i][2] == 'e')
                 {
                   // ...report an error.
-                  idl_global->case_diff_error (I_TRUE);
+                  idl_global->case_diff_error (true);
                 }
               else if (av[i][2] == 'w')
                 {
                   // ...report a warning (default for now)
-                  idl_global->case_diff_error (I_FALSE);
+                  idl_global->case_diff_error (false);
                 }
               else
                 {
@@ -570,6 +513,6 @@ DRV_parse_args (long ac, char **av)
 
       idl_global->temp_dir (tmpdir);
     }
-    
+
   DRV_cpp_post_init ();
 }
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 75110ff21f0..eb363f4e257 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -66,7 +66,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Pass an IDL file through the C preprocessor
 
-#include "idl_bool.h"
+
 #include "idl_defines.h"
 #include "global_extern.h"
 #include "fe_extern.h"
@@ -78,6 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Env_Value_T.h"
 #include "ace/ARGV.h"
 #include "ace/UUID.h"
+#include "ace/Dirent.h"
+#include "ace/OS_NS_sys_stat.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -96,6 +98,18 @@ static const char *arglist[128];
 static const char *output_arg_format = 0;
 static long output_arg_index = 0;
 
+const char *DIR_DOT = ".";
+const char *DIR_DOT_DOT = "..";
+
+// File names.
+static char tmp_file [MAXPATHLEN + 1] = { 0 };
+static char tmp_ifile[MAXPATHLEN + 1] = { 0 };
+
+// Lines can be 1024 chars long intially - it will expand as required.
+#define LINEBUF_SIZE 1024
+static char* drv_line = 0;
+static size_t drv_line_size = LINEBUF_SIZE + 1;
+
 // Push the new CPP location if we got a -Yp argument.
 void
 DRV_cpp_new_location (const char *new_loc)
@@ -145,48 +159,72 @@ DRV_cpp_expand_output_arg (const char *filename)
     }
 }
 
-// Lines can be 1024 chars long.
-#define LINEBUF_SIZE 1024
-static char drv_line[LINEBUF_SIZE + 1];
-
 // Get a line from stdin.
 static long
 DRV_get_line (FILE *f)
 {
     char *l = fgets (drv_line,
-                     LINEBUF_SIZE,
+                     drv_line_size,
                      f);
-    size_t i = 0;
 
     if (l == 0)
       {
-        return I_FALSE;
+        return false;
       }
 
     if (*l == '\0' && feof (f))
       {
-        return I_FALSE;
+        return false;
       }
 
     if (*l == '\0')
       {
-        return I_TRUE;
+        return true;
       }
 
-    i = strlen(l) - 1;
+    while (strchr(drv_line, '\n') == NULL)
+      {
+        // Haven't got to a newline yet
+        // Create a bigger buffer and keep reading
+        size_t temp_size;
+        temp_size = drv_line_size * 2;
+        char *temp = 0;
+        ACE_NEW_RETURN (temp,
+                        char[temp_size],
+                        false);
+        strcpy (temp, drv_line);
+        delete [] drv_line;
+        drv_line = temp;
+        drv_line_size = temp_size;
+
+        l = fgets (drv_line + strlen (drv_line),
+                   drv_line_size - strlen(drv_line),
+                   f);
+
+        if (l == 0 || *l == '\0')
+          {
+            break;
+          }
+      }
+
+    size_t i = strlen (drv_line) - 1;
 
-    if (l[i] == '\n')
+    if (drv_line[i] == '\n')
       {
-        l[i] = '\0';
+        drv_line[i] = '\0';
       }
 
-    return I_TRUE;
+    return true;
 }
 
 // Initialize the cpp argument list.
 void
 DRV_cpp_init (void)
 {
+  // Create the line buffer
+  ACE_NEW (drv_line,
+           char [drv_line_size]);
+
   const char *cpp_loc = FE_get_cpp_loc_from_env ();
   DRV_cpp_putarg (cpp_loc);
 
@@ -199,7 +237,7 @@ DRV_cpp_init (void)
                    ACE_MAJOR_VERSION,
                    ACE_MINOR_VERSION,
                    ACE_BETA_VERSION);
-                   
+
   DRV_cpp_putarg (version_option);
   DRV_cpp_putarg ("-I.");
   const char *cpp_args = FE_get_cpp_args_from_env ();
@@ -220,12 +258,12 @@ DRV_cpp_init (void)
 #endif /* TAO_IDL_PREPROCESSOR_ARGS */
 
       // So we can find OMG IDL files, such as `orb.idl'.
-      
+
       ACE_OS::strcpy (option1, "-I");
       ACE_OS::strcpy (option2, "-I");
       char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT");
       size_t len = 0;
-      
+
       if (TAO_ROOT != 0)
         {
           len = ACE_OS::strlen (TAO_ROOT);
@@ -261,8 +299,10 @@ DRV_cpp_init (void)
               ACE_OS::strcat (option1, ACE_ROOT);
               ACE_OS::strcat (option2, ACE_ROOT);
 #if defined (ACE_WIN32)
+              ACE_OS::strcat (option1, "\\TAO");
               ACE_OS::strcat (option2, "\\TAO\\tao");
 #else
+              ACE_OS::strcat (option1, "/TAO");
               ACE_OS::strcat (option2, "/TAO/tao");
 #endif
             }
@@ -271,8 +311,8 @@ DRV_cpp_init (void)
 #if defined (TAO_IDL_INCLUDE_DIR)
               // TAO_IDL_INCLUDE_DIR should be in quotes,
               // e.g. "/usr/local/include/tao"
-              ACE_OS::strcat (option1,
-                              TAO_IDL_INCLUDE_DIR);
+              ACE_OS::strcat (option1, TAO_IDL_INCLUDE_DIR);
+              ACE_OS::strcat (option2, ".");
 #else
               ACE_ERROR ((LM_WARNING,
                           "NOTE: The environment variables "
@@ -281,14 +321,13 @@ DRV_cpp_init (void)
                           "locate orb.idl\n"));
 
               ACE_OS::strcat (option1, ".");
-              ACE_OS::strcat (option2, ".");
 #endif  /* TAO_IDL_INCLUDE_DIR */
             }
         }
 
       DRV_cpp_putarg (option1);
-      DRV_cpp_putarg (option2);
       idl_global->add_include_path (ACE_CString (option1 + 2).c_str ());
+      DRV_cpp_putarg (option2);
       idl_global->add_include_path (ACE_CString (option2 + 2).c_str ());
       idl_global->tao_root (option1 + 2);
     }
@@ -313,6 +352,96 @@ DRV_cpp_init (void)
     }
 }
 
+int
+DRV_sweep_dirs (const char *rel_path,
+                const char *base_path)
+{
+  // Zero rel_path means we're not using this option, and
+  // so we become a no-op.
+  if (rel_path == 0)
+    {
+      return 0;
+    }
+
+  if (ACE_OS::chdir (rel_path) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "DRV_sweep_dirs: chdir %s failed\n",
+                         rel_path),
+                        -1);
+    }
+
+  ACE_Dirent dir (DIR_DOT);
+  ACE_CString bname (base_path);
+  bname += (bname.length () > 0 ? "/" : "");
+  bname += rel_path;
+  bool include_added = false;
+
+  for (dirent *dir_entry; (dir_entry = dir.read ()) != 0;)
+    {
+      // Skip the ".." and "." files in each directory.
+      if (ACE_OS::strcmp (dir_entry->d_name, DIR_DOT) == 0
+          || ACE_OS::strcmp (dir_entry->d_name, DIR_DOT_DOT) == 0)
+        {
+          continue;
+        }
+
+      ACE_CString lname (dir_entry->d_name);
+      ACE_stat stat_buf;
+
+      if (ACE_OS::lstat (lname.c_str (), &stat_buf) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "DRV_sweep_dirs: ACE_OS::lstat (%s) failed\n",
+                             lname.c_str ()),
+                            -1);
+        }
+
+      size_t len = 0;
+
+      switch (stat_buf.st_mode & S_IFMT)
+        {
+        case S_IFREG: // Either a regular file or an executable.
+          len = lname.length ();
+
+          if (len > 4 && lname.substr (len - 4) == ".idl")
+            {
+              if (!include_added)
+                {
+                  ACE_CString incl_arg ("-I");
+                  incl_arg += bname;
+                  DRV_cpp_putarg (incl_arg.c_str ());
+                  include_added = true;
+                }
+
+              ACE_CString fname (bname);
+              fname += "/";
+              fname += lname;
+              DRV_push_file (fname.c_str ());
+            }
+
+          break;
+        case S_IFDIR: // Subdirectory.
+          DRV_sweep_dirs (lname.c_str (), bname.c_str ());
+          break;
+        case S_IFLNK: // Either a file link or directory link.
+        default: // Some other type of file (PIPE/FIFO/device).
+          break;
+        }
+    }
+
+  // Move back up a level.
+  if (ACE_OS::chdir (DIR_DOT_DOT) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "DRV_sweep_dirs: chdir .. (from %s) failed\n",
+                         rel_path),
+                        -1);
+    }
+
+  return 0;
+}
+
 // Adds additional include paths, but after parse_args() has
 // added user-defined include paths.
 void
@@ -321,14 +450,14 @@ DRV_cpp_post_init (void)
   char option3[BUFSIZ];
   char option4[BUFSIZ];
   char option5[BUFSIZ];
-  
+
   ACE_OS::strcpy (option3, "-I");
   ACE_OS::strcpy (option4, "-I");
   ACE_OS::strcpy (option5, "-I");
 
   char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT");
   size_t len = 0;
-  
+
   if (TAO_ROOT != 0)
     {
       len = ACE_OS::strlen (TAO_ROOT);
@@ -381,21 +510,51 @@ DRV_cpp_post_init (void)
         }
       else
         {
-#if !defined (TAO_IDL_INCLUDE_DIR)
           ACE_OS::strcat (option3, ".");
           ACE_OS::strcat (option4, ".");
           ACE_OS::strcat (option5, ".");
-#endif
         }
     }
 
   DRV_cpp_putarg (option3);
   DRV_cpp_putarg (option4);
   DRV_cpp_putarg (option5);
-  
+
   idl_global->add_include_path (ACE_CString (option3 + 2).c_str ());
   idl_global->add_include_path (ACE_CString (option4 + 2).c_str ());
   idl_global->add_include_path (ACE_CString (option5 + 2).c_str ());
+
+  // Save path of current directory, in case the call to DRV_sweep_dirs()
+  // below is not a no-op - then the current working directory will
+  // have to be restored.
+  char cwd_path[MAXPATHLEN];
+  if (ACE_OS::getcwd (cwd_path, sizeof (cwd_path)) == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DRV_cpp_post_init: ACE_OS::getcwd failed\n"));
+      return;
+    }
+
+  // If first arg is non-zero, adds an include path and filename
+  // for every IDL file found in all subdirectories. This is a
+  // no-op for most backends.
+  if (DRV_sweep_dirs (idl_global->recursion_start (), "") == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DRV_cpp_post_init: DRV_sweep_dirs (%s) failed\n",
+                  idl_global->recursion_start ()));
+
+      return;
+    }
+
+  // This is redundant for most backends, but not if the call to
+  // DRV_sweep_dirs() above is more than a no-op.
+  if (ACE_OS::chdir (cwd_path) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "DRV_cpp_post_init: ACE_OS::chdir (%s) failed\n",
+                  cwd_path));
+    }
 }
 
 // We really need to know whether this line is a "#include ...". If
@@ -478,7 +637,7 @@ DRV_check_for_include (const char* buf)
   if (*h == '\0')
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("IDL: No input files\n")));
+                  ACE_TEXT ("IDL: No friggin' input files\n")));
 
       ACE_OS::exit (99);
     }
@@ -520,7 +679,7 @@ DRV_check_for_include (const char* buf)
 
   // Terminate this string.
   file_name [i] = '\0';
-  
+
   size_t len = ACE_OS::strlen (file_name);
   ACE_CString name_str (file_name);
   ACE_CString simple ("orb.idl");
@@ -557,6 +716,93 @@ DRV_check_for_include (const char* buf)
     }
 }
 
+// This method turns a line like '#include "a.idl"' into the
+// line '#include <a.idl>'
+void
+DRV_convert_includes (const char* buf)
+{
+  // Remove constness
+  char* r = const_cast<char*> (buf);
+
+  // Skip the tabs and spaces.
+  while (*r == ' ' || *r == '\t')
+    {
+      ++r;
+    }
+
+  // Skip initial '#'.
+  if (*r != '#')
+    {
+      return;
+    }
+  else
+    {
+      r++;
+    }
+
+  // Skip the tabs and spaces.
+  while (*r == ' ' || *r == '\t')
+    {
+      ++r;
+    }
+
+  // Probably we are at the word `include`. If not return.
+  if (*r != 'i')
+    {
+      return;
+    }
+
+  // Check whether this word is `include` or no.
+  const char* include_str = "include";
+
+  for (size_t ii = 0;
+       ii < strlen ("include") && *r != '\0' && *r != ' ' && *r != '\t';
+       ++r, ++ii)
+    {
+      // Return if it doesn't match.
+      if (include_str [ii] != *r)
+        {
+          return;
+        }
+    }
+
+  // Next thing is finding the file that has been `#include'd. Skip
+  // all the blanks and tabs and reach the startng " character.
+  for (; (*r != '"'); ++r)
+    {
+      if (*r == '\n' || *r == '\0')
+        {
+          return;
+        }
+    }
+
+  // Replace the opening quote with an angle bracket.
+  *r = '<';
+
+  // We're not handling redirection from stdin.
+  // n.b. I neither know nor care what all this is about.
+  // It came free with the cut-and-paste of DRV_check_for_include. sm.
+  if (*r == '\0')
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("IDL: No friggin' input files\n")));
+
+      ACE_OS::exit (99);
+    }
+
+  // Find the closing '"' character.
+  for (; *r != '"'; ++r)
+    {
+      continue;
+    }
+
+  // Swap it for a '>'
+  if (*r == '"')
+    {
+      *r = '>';
+    }
+}
+
 void
 DRV_get_orb_idl_includes (void)
 {
@@ -640,6 +886,8 @@ DRV_copy_input (FILE *fin,
 
   while (DRV_get_line (fin))
     {
+      DRV_convert_includes (drv_line);
+
       // Print the line to the temporary file.
       ACE_OS::fprintf (f,
                        "%s\n",
@@ -687,10 +935,6 @@ DRV_stripped_name (char *fn)
     return n;
 }
 
-// File names.
-static char tmp_file [MAXPATHLEN + 1] = { 0 };
-static char tmp_ifile[MAXPATHLEN + 1] = { 0 };
-
 // Pass input through preprocessor.
 void
 DRV_pre_proc (const char *myfile)
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
index b1e16bcc6fd..2492fe8d451 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -162,7 +162,17 @@ FE_Declarator::compose (AST_Decl *d)
   if (this->pd_complex_part->node_type () == AST_Decl::NT_array)
     {
       arr = AST_Array::narrow_from_decl (this->pd_complex_part);
-      arr->set_base_type (ct);
+      
+      // The base type of an array isn't set until after the array
+      // has been created, so the check below gets done at this point.
+      arr->set_base_type (ct);      
+      AST_Decl::NodeType nt = ct->unaliased_type ()->node_type ();
+      
+      if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring)
+        {
+          idl_global->string_member_seen_ = true;
+        }
+        
       return arr;
     }
 
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 80fa9bc722f..f73ca581725 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -613,8 +613,8 @@ FE_init (void)
   idl_global->set_main_filename (0);
   idl_global->set_real_filename (0);
   idl_global->set_stripped_filename (0);
-  idl_global->set_import (I_TRUE);
-  idl_global->set_in_main_file (I_FALSE);
+  idl_global->set_import (true);
+  idl_global->set_in_main_file (false);
   idl_global->set_lineno (-1);
   idl_global->set_prog_name (0);
 
@@ -628,7 +628,7 @@ FE_init (void)
   idl_global->set_include_file_names (0);
   idl_global->set_n_include_file_names (0);
   idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
-  idl_global->preserve_cpp_keywords (I_FALSE);
+  idl_global->preserve_cpp_keywords (false);
 
   // Put an empty prefix on the stack for the global scope.
   idl_global->pragma_prefixes ().push (ACE::strnew (""));
@@ -673,7 +673,7 @@ FE_populate (void)
   fe_populate_global_scope (idl_global->root ());
 
   // Set flag to indicate we are processing the main file now.
-  idl_global->set_in_main_file (I_TRUE);
+  idl_global->set_in_main_file (true);
 
   // Populate the IDL keyword container, for checking local identifiers.
   fe_populate_idl_keywords ();
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 33ab6af6ba6..5113d78c566 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 
-ACE_RCSID (fe, 
-           fe_interface_header, 
+ACE_RCSID (fe,
+           fe_interface_header,
            "$Id$")
 
 #undef  INCREMENT
@@ -179,11 +179,11 @@ already_seen (AST_Interface *ip)
     {
       if (iseen[i] == ip)
         {
-          return I_TRUE;
+          return true;
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
 // Have we already seen this interface in the flat list?
@@ -194,11 +194,11 @@ already_seen_flat (AST_Interface *ip)
     {
       if (iseen_flat[i] == ip)
         {
-          return I_TRUE;
+          return true;
         }
     }
 
-  return I_FALSE;
+  return false;
 }
 
 // @@@ (JP) Here are the rules for interface inheritance and
@@ -231,14 +231,14 @@ interface, a derived valuetype may also be declared to support an
 interface, as long as it is derived from all interfaces that are
 supported by any base valuetypes.  Here is an example:
 
-interface I1 { }; 
-interface I2 { }; 
-interface I3: I1, I2 { }; 
+interface I1 { };
+interface I2 { };
+interface I3: I1, I2 { };
 
-abstract valuetype V1 supports I1 { }; 
-abstract valuetype V2 supports I2 { }; 
-valuetype V3: V1, V2 supports I3 { }; // legal 
-valuetype V4: V1 supports I2 { }; // illegal 
+abstract valuetype V1 supports I1 { };
+abstract valuetype V2 supports I2 { };
+valuetype V3: V1, V2 supports I3 { }; // legal
+valuetype V4: V1 supports I2 { }; // illegal
 
 This last rule was made to guarantee that any given valuetype supported
 at most one most-derived interface.  We didn't want valuetypes to extend
@@ -248,9 +248,9 @@ interfaces.
 
 FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n,
                                         UTL_NameList *inherits,
-                                        idl_bool is_local,
-                                        idl_bool is_abstract,
-                                        idl_bool compile_now)
+                                        bool is_local,
+                                        bool is_abstract,
+                                        bool compile_now)
   : pd_interface_name (n),
     pd_inherits (0),
     pd_n_inherits (0),
@@ -262,7 +262,7 @@ FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n,
   if (compile_now)
     {
       this->compile_inheritance (inherits,
-                                 I_FALSE);
+                                 false);
     }
 }
 
@@ -270,18 +270,31 @@ FE_InterfaceHeader::~FE_InterfaceHeader (void)
 {
 }
 
-idl_bool
+bool
 FE_InterfaceHeader::is_local (void) const
 {
   return this->pd_is_local;
 }
 
-idl_bool
+bool
 FE_InterfaceHeader::is_abstract (void) const
 {
   return this->pd_is_abstract;
 }
 
+void
+FE_InterfaceHeader::destroy (void)
+{
+  if (this->pd_interface_name == 0)
+    {
+      return;
+    }
+
+  this->pd_interface_name->destroy ();
+  delete this->pd_interface_name;
+  this->pd_interface_name = 0;
+}
+
 // Add this interface to the list of inherited if not already there.
 void
 FE_InterfaceHeader::compile_one_inheritance (AST_Interface *i)
@@ -308,8 +321,8 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Interface *i)
     }
 
   // Add i's parents to the flat list.
-  AST_Interface **parents = i->inherits ();
-  long num_parents = i->n_inherits ();
+  AST_Interface **parents = i->inherits_flat ();
+  long num_parents = i->n_inherits_flat ();
 
   for (long j = 0; j < num_parents; ++j)
     {
@@ -327,7 +340,7 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Interface *i)
 // Compute the list of top-level interfaces this one inherits from.
 void
 FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
-                                         idl_bool for_valuetype)
+                                         bool for_valuetype)
 {
   if (ifaces == 0)
     {
@@ -355,7 +368,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       if (idl_global->scopes ().top () == 0)
         {
           idl_global->err ()->lookup_error (item);
-      
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -365,7 +378,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              I_TRUE);
+                              true);
 
       if (d == 0)
         {
@@ -383,7 +396,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       if (d == 0)
         {
           idl_global->err ()->lookup_error (item);
-      
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -464,11 +477,11 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
 
 int
 FE_InterfaceHeader::check_inherit (AST_Interface *i,
-                                   idl_bool for_valuetype)
+                                   bool for_valuetype)
 {
   // We use the narrow instead of node_type() here so we can get a
   // match with both valuetypes and eventtypes.
-  idl_bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0);
+  bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0);
 
   if (
       // Non-local interfaces may not inherit from local ones.
@@ -522,14 +535,15 @@ FE_InterfaceHeader::n_inherits_flat (void) const
 FE_OBVHeader::FE_OBVHeader (UTL_ScopedName *n,
                             UTL_NameList *inherits,
                             UTL_NameList *supports,
-                            idl_bool truncatable,
-                            idl_bool is_eventtype)
+                            bool truncatable,
+                            bool is_eventtype)
   : FE_InterfaceHeader (n,
                         inherits,
-                        I_FALSE,
-                        I_FALSE,
-                        I_FALSE),
+                        false,
+                        false,
+                        false),
     pd_supports (0),
+    pd_n_supports (0),
     pd_inherits_concrete (0),
     pd_supports_concrete (0),
     pd_truncatable (truncatable)
@@ -571,7 +585,7 @@ FE_OBVHeader::supports_concrete (void) const
   return this->pd_supports_concrete;
 }
 
-idl_bool
+bool
 FE_OBVHeader::truncatable (void) const
 {
   return this->pd_truncatable;
@@ -579,10 +593,10 @@ FE_OBVHeader::truncatable (void) const
 
 void
 FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
-                                   idl_bool is_eventtype)
+                                   bool is_eventtype)
 {
   this->FE_InterfaceHeader::compile_inheritance (vtypes,
-                                                 I_TRUE);
+                                                 true);
 
   if (this->pd_n_inherits > 0)
     {
@@ -590,7 +604,7 @@ FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
       AST_ValueType *vt = AST_ValueType::narrow_from_decl (iface);
 
       if (vt != 0
-          && vt->is_abstract () == I_FALSE)
+          && vt->is_abstract () == false)
         {
           this->pd_inherits_concrete = vt;
         }
@@ -647,7 +661,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       if (idl_global->scopes ().top () == 0)
         {
           idl_global->err ()->lookup_error (item);
-      
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -657,7 +671,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              I_TRUE);
+                              true);
 
       if (d == 0)
         {
@@ -675,7 +689,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       if (d == 0)
         {
           idl_global->err ()->lookup_error (item);
-      
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -731,7 +745,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
     }
 }
 
-idl_bool 
+bool
 FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
 {
   AST_ValueType *vt = 0;
@@ -770,12 +784,12 @@ FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
 FE_EventHeader::FE_EventHeader (UTL_ScopedName *n,
                                 UTL_NameList *inherits,
                                 UTL_NameList *supports,
-                                idl_bool truncatable)
+                                bool truncatable)
   : FE_OBVHeader (n,
                   inherits,
                   supports,
                   truncatable,
-                  I_TRUE)
+                  true)
 {
 }
 
@@ -785,15 +799,15 @@ FE_EventHeader::~FE_EventHeader (void)
 
 //************************************************************************
 
-FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n, 
-                                        UTL_ScopedName *base_component, 
+FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n,
+                                        UTL_ScopedName *base_component,
                                         UTL_NameList *supports,
-                                        idl_bool /* compile_now */)
+                                        bool /* compile_now */)
   : FE_InterfaceHeader (n,
                         supports,
-                        I_FALSE,
-                        I_FALSE,
-                        I_FALSE),
+                        false,
+                        false,
+                        false),
     pd_base_component (0)
 {
   if (base_component != 0 && supports != 0)
@@ -823,7 +837,7 @@ FE_ComponentHeader::supports (void) const
   return this->pd_inherits;
 }
 
-long 
+long
 FE_ComponentHeader::n_supports (void) const
 {
   return this->pd_n_inherits;
@@ -850,20 +864,20 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component)
     {
       return;
     }
-    
+
   UTL_Scope *s = idl_global->scopes ().top_non_null ();
   AST_Decl *d = s->lookup_by_name (base_component,
-                                   I_TRUE);
+                                   true);
 
   if (d == 0)
     {
       idl_global->err ()->lookup_error (base_component);
-      
+
       // This is probably the result of bad IDL.
       // We will crash if we continue from here.
       exit (99);
     }
- 
+
   if (d->node_type () == AST_Decl::NT_typedef)
     {
       d = AST_Typedef::narrow_from_decl (d)->primitive_base_type ();
@@ -914,7 +928,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       if (idl_global->scopes ().top () == 0)
         {
           idl_global->err ()->lookup_error (item);
-      
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -924,7 +938,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              I_TRUE);
+                              true);
 
       if (d == 0)
         {
@@ -942,7 +956,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       if (d == 0)
         {
           idl_global->err ()->lookup_error (item);
-          
+
           // This is probably the result of bad IDL.
           // We will crash if we continue from here.
           exit (99);
@@ -962,7 +976,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
           idl_global->err ()->interface_expected (d);
           continue;
         }
-        
+
       // Undefined interface?
       if (!i->is_defined ())
         {
@@ -1024,7 +1038,7 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
   : FE_ComponentHeader (n,
                         0,
                         supports,
-                        I_FALSE),
+                        false),
     pd_base_home (0),
     pd_primary_key (0)
 {
@@ -1073,12 +1087,12 @@ FE_HomeHeader::compile_inheritance (UTL_ScopedName *base_home)
 
   UTL_Scope *s = idl_global->scopes ().top_non_null ();
   AST_Decl *d = s->lookup_by_name (base_home,
-                                   I_TRUE);
+                                   true);
 
   if (d == 0)
     {
       idl_global->err ()->lookup_error (base_home);
-      
+
       // This is probably the result of bad IDL.
       // We will crash if we continue from here.
       exit (99);
@@ -1108,12 +1122,12 @@ FE_HomeHeader::compile_managed_component (UTL_ScopedName *managed_component)
 
   UTL_Scope *s = idl_global->scopes ().top_non_null ();
   AST_Decl *d = s->lookup_by_name (managed_component,
-                                   I_TRUE);
+                                   true);
 
   if (d == 0)
     {
       idl_global->err ()->lookup_error (managed_component);
-      
+
       // This is probably the result of bad IDL.
       // We will crash if we continue from here.
       exit (99);
@@ -1140,20 +1154,20 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key)
     {
       return;
     }
-    
+
   UTL_Scope *s = idl_global->scopes ().top_non_null ();
   AST_Decl *d = s->lookup_by_name (primary_key,
-                                   I_TRUE);
+                                   true);
 
   if (d == 0)
     {
       idl_global->err ()->lookup_error (primary_key);
-      
+
       // This is probably the result of bad IDL.
       // We will crash if we continue from here.
       exit (99);
     }
-    
+
   AST_Decl::NodeType nt = d->node_type ();
 
   if (nt == AST_Decl::NT_typedef)
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 4fc8898cb4a..060223d558f 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -254,7 +254,7 @@ oneway          return IDL_ONEWAY;
 (\"([^\\\"]*|\\[ntvbrfax\\\?\'\"]|\\[0-7]{1,3})*\"[ \t]*)+ {
                   /* Skip the quotes */
                   char *tmp = ace_yytext;
-                  for(int i = strlen(tmp) - 1; i >= 0; --i) {
+                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -262,7 +262,7 @@ oneway          return IDL_ONEWAY;
                       break;
                     }
                   }
-                  tmp[strlen (tmp) - 1] = '\0';
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
                   ACE_NEW_RETURN (yylval.sval,
                                   UTL_String (tmp + 1),
                                   IDL_STRING_LITERAL);
@@ -271,7 +271,15 @@ 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);
-                  tmp[strlen (tmp) - 1] = '\0';
+                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                    if (isspace(tmp[i])) {
+                      tmp[i] = '\0';
+                    }
+                    else {
+                      break;
+                    }
+                  }
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
                   yylval.wsval = idl_wstring_escape_reader(tmp + 2);
                   return IDL_WSTRING_LITERAL;
                 }
@@ -312,7 +320,7 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" {
 ^\?\?=[ \t]*file[ \t].*{NL} {/* ignore file */
                   idl_global->set_lineno(idl_global->lineno() + 1);
                 }
-^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} |
+^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)*{NL} |
 ^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} {
                   idl_parse_line_and_file(ace_yytext);
                 }
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 826830b48fb..46eb5e1ac98 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -533,7 +533,7 @@ interface :
               (void) s->fe_add_interface (i);
 
               // This FE_InterfaceHeader class isn't destroyed with the AST.
-              $1->name ()->destroy ();
+              $1->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -598,10 +598,12 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($1,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName ($1, 0),
+                          1);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               $2,
                                               I_FALSE,
                                               I_FALSE,
@@ -620,10 +622,12 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($2,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName ($2, 0),
+                          1);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               $3,
                                               I_TRUE,
                                               I_FALSE,
@@ -642,10 +646,12 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($2,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName ($2, 0),
+                          1);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               $3,
                                               I_FALSE,
                                               I_TRUE,
@@ -728,6 +734,11 @@ value_concrete_decl :
                */
               v = AST_ValueType::narrow_from_decl (i);
               (void) s->fe_add_valuetype (v);
+
+              // FE_OBVHeader is not automatically destroyed in the AST
+              $1->destroy ();
+              delete $1;
+              $1 = 0;
             }
 
           /*
@@ -855,8 +866,7 @@ value_header :
 
           UTL_ScopedName *sn = 0;
           ACE_NEW_RETURN (sn,
-                          UTL_ScopedName ($1,
-                                          0),
+                          UTL_ScopedName ($1, 0),
                           1);
           ACE_NEW_RETURN ($$,
                           FE_OBVHeader (sn,
@@ -926,7 +936,7 @@ value_forward_decl :
           if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
-                                                           I_TRUE);
+                                                            I_TRUE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -958,7 +968,7 @@ value_box_decl
         {
 // value_box_decl : value_decl type_spec
         idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen);
-              
+
         UTL_Scope *s = idl_global->scopes ().top_non_null ();
         UTL_ScopedName n ($1,
                           0);
@@ -967,7 +977,7 @@ value_box_decl
           {
             /*
              * Get the type_spec associated with the valuebox
-             */ 
+             */
             AST_Type *tp = 0;
             AST_Typedef *td
               = AST_Typedef::narrow_from_decl ($2);
@@ -1730,14 +1740,12 @@ literal
         | IDL_TRUETOK
         {
 //      | IDL_TRUETOK
-          $$ = idl_global->gen ()->create_expr ((idl_bool) I_TRUE,
-                                                AST_Expression::EV_bool);
+          $$ = idl_global->gen ()->create_expr (true);
         }
         | IDL_FALSETOK
         {
 //      | IDL_FALSETOK
-          $$ = idl_global->gen ()->create_expr ((idl_bool) I_FALSE,
-                                                AST_Expression::EV_bool);
+          $$ = idl_global->gen ()->create_expr (false);
         }
         ;
 
@@ -2650,6 +2658,9 @@ switch_type_spec :
           if ($$ == 0)
             {
               idl_global->err ()->lookup_error ($1);
+
+              /* If we don't return here, we'll crash later.*/
+              return 1;
             }
         }
         ;
@@ -4282,7 +4293,7 @@ component_decl :
               (void) s->fe_add_component (c);
 
               // This FE_ComponentHeader class isn't destroyed with the AST.
-              $1->name ()->destroy ();
+              $1->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -4335,10 +4346,12 @@ component_header :
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName n ($2,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName ($2, 0),
+                          1);
           ACE_NEW_RETURN ($$,
-                          FE_ComponentHeader (&n,
+                          FE_ComponentHeader (n,
                                               $4,
                                               $6,
                                               I_FALSE),
@@ -4711,7 +4724,7 @@ home_decl :
               (void) s->fe_add_home (h);
 
               // This FE_HomeHeader class isn't destroyed with the AST.
-              $1->name ()->destroy ();
+              $1->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -4771,10 +4784,12 @@ home_header :
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName n ($3,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName ($3, 0),
+                          1);
           ACE_NEW_RETURN ($$,
-                          FE_HomeHeader (&n,
+                          FE_HomeHeader (n,
                                          $5,
                                          $7,
                                          $11,
@@ -5232,6 +5247,11 @@ event_decl :
                */
               e = AST_EventType::narrow_from_decl (i);
               (void) s->fe_add_eventtype (e);
+
+              // FE_EventHeader is not automatically destroyed in the AST
+              $2->destroy ();
+              delete $2;
+              $2 = 0;
             }
 
           /*
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 50fad64a1ca..09ff7d3add0 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -9,6 +9,7 @@
 #define TAO_YY_FLEX_MINOR_VERSION 5
 
 #include "ace/os_include/os_stdio.h"
+#include "ace/os_include/os_ctype.h"
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -21,7 +22,6 @@
 
 #ifdef __cplusplus
 
-#include "ace/os_include/os_ctype.h"
 
 /* Use prototypes in function declarations. */
 #define TAO_YY_USE_PROTOS
@@ -393,70 +393,70 @@ static tao_yyconst int tao_yy_meta[60] =
 
 static tao_yyconst short int tao_yy_base[586] =
     {   0,
-        0,   58, 1092, 1093,   59, 1093, 1093,   56, 1057,   54,
-       57,   65,   68,   73, 1073, 1071, 1068,    0, 1065,   69,
-     1050, 1056,   45, 1035,   56,   37,   48,   67, 1044, 1033,
-       61, 1032,   65, 1045,   79,   63,   82,   83,   71,   71,
-       93,   92,  134,  144, 1058,  130,   97,  148,  129, 1070,
-      147,  152,  158,  184,  210, 1093,  148,  161,  197,  203,
-      229,    0,  239, 1093, 1093, 1093,    0, 1050,  151, 1042,
-     1031, 1042, 1020, 1013, 1017, 1021, 1016, 1033,  116, 1014,
-     1026, 1010, 1021, 1008, 1023, 1024, 1023,  123, 1010, 1004,
-     1010, 1006,  129,  155, 1007, 1016, 1007,  998,  997, 1011,
-
-      995,  146, 1012, 1004, 1011,  150,  996,  992,  993,  999,
-      986,  990,  167, 1000,  992,  994,  994,  981,  226,    0,
-      192, 1093, 1028,  243,  990,  994,  988,  978, 1010,  260,
-      173,  180,  246, 1093, 1020, 1019,  259, 1018,  267,    0,
-      272,  261, 1093,  286, 1093,  289,    0,  254,  287,    0,
-      995,  196,  292,  284, 1016,  277,  984,  998,  967,    0,
-      968,  973,  979,  965,  966,  251,  961,  979,  977,  958,
-      964,  962,  970,  954,  969,  967,  970,  952,  964,  953,
-      946,  961,  964,  957,  962,  941,  941,  951,  954,  935,
-        0,  253,  935,  944,  936,  950,  932,  934,  933,  186,
-
-      934,  929,  934,  942,  931,  936,  925,  922,  938,  940,
-      922,  967,  966,  925,  931,  921,  933,  338,  302, 1093,
-     1093,  307,  959,    0,  309,  330, 1093,  942,  324,  959,
-      314,  352,    0, 1093,    0,  927,    0,  911,  919,  922,
-        0,    0,  911,  276,  920,  909,  902,  910,  902,    0,
-      900,  903,  903,  912,  912,  895,  913,    0,  895,  892,
-      893,  898,    0,  902,  896,  898,  884,  885,  903,  902,
-      901,  892,  891,  894,  883,  892,  895,  875,  880,  890,
-      877,  888,  887,  318,  875,  881,    0,  882,    0,  868,
-      876,  912,  359,  878,  868,  876,  873,  867, 1093,  289,
-
-      386,  869,  873,  867,  857,  331, 1093,  900, 1093,  899,
-        0,  379,  408,  898,  851,  869,  867,  867,  853,    0,
-      853,  841,  851,  851,  857,    0,  841,  840,  841,  840,
-        0,    0,  848,  836,    0,  849,    0,  849,  848,  836,
-      846,    0,  825,  831,  828,  843,  169,  827,  831,  830,
-      834,    0,  835,  821,  822,  831,  837,  832,  832,  817,
-        0,  820,  813,    0,  818, 1093,  394,  345,  811,  390,
-      817,  857,  856,  815,  821,  811,  823,  343,  435, 1093,
-      849,    0,  819,  800,  806,  814,  813,  797,    0,  796,
-        0,  790,  805,  788,    0,  793,    0,  702,  683,    0,
-
-      674,    0,    0,  632,  649,  648,    0,  629,    0,  613,
-      620,  603,    0,    0,  601,    0,  599,  612,    0,  611,
-      610,  589,  606,  462, 1093,  477,  408,  367,  423,  497,
-      610,  632,  413,  592,  571,  568,  555,  505,  586,  531,
-      526,    0,  530,  503,    0,    0,  503,  490,    0,  497,
-      489,    0,  485,  478,    0,  457,  465,  436,  455,  451,
-      436,  450,    0,  444,  425,  412,    0,  493,  432, 1093,
-      465,  484,  529, 1093,  455,  369, 1093,  544,  377,  402,
-      552,  407,  369,  433,    0,  401,  373,    0,  387,  373,
+        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,  534, 1093,  548,  322,  558,  560,
-      568, 1093,  572,  587,  450,  590,  595,  501,  283,    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,  595, 1093,  599,  609,  611, 1093,  614,  618,  150,
-      127,  520,    0,   55,    0,  623, 1093,  625,   61,  630,
-      633,    0, 1093,  637, 1093,  639, 1093,  660,  669,  674,
-      681,  689,  698,  703,  709,  718,  724,  726,  730,  739,
-      745,  747,  749,  752,  758,  764,  770,  776,  782,  791,
-      800,  809,  818,  827,  836
+        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[586] =
@@ -527,7 +527,7 @@ static tao_yyconst short int tao_yy_def[586] =
       557,  557,  557,  557,  557
     } ;
 
-static tao_yyconst short int tao_yy_nxt[1153] =
+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,
@@ -582,83 +582,83 @@ static tao_yyconst short int tao_yy_nxt[1153] =
       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,  425,  425,  425,  473,  474,
-
-      474,  473,  475,  496,  507,  541,  468,  468,  468,  495,
-      430,  430,  430,  425,  518,  518,  518,  474,  483,  483,
-      483,  551,  494,  493,  551,  492,  483,  483,  483,  483,
-      473,  474,  474,  473,  475,  491,  506,  507,  490,  483,
-      483,  483,  483,  483,  483,  511,  512,  512,  511,  474,
-      506,  507,  489,  516,  507,  488,  517,  513,  513,  513,
-      474,  474,  533,  534,  512,  518,  518,  518,  507,  511,
-      512,  512,  511,  511,  512,  512,  511,  487,  474,  486,
-      534,  535,  535,  535,  485,  513,  513,  513,  512,  537,
-      538,  516,  512,  380,  517,  482,  516,  533,  534,  517,
-
-      540,  533,  534,  518,  518,  518,  481,  538,  518,  518,
-      518,  512,  512,  537,  538,  534,  537,  538,  480,  534,
-      547,  548,  535,  535,  535,  547,  548,  547,  548,  512,
-      479,  538,  553,  553,  538,  555,  556,  433,  548,  555,
-      556,  555,  556,  548,  476,  548,  467,  466,  465,  464,
-      553,  463,  462,  556,  461,  460,  459,  556,  458,  556,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   50,
-      457,   50,   50,   50,   50,   50,   50,   50,   67,   67,
-       67,   67,   67,  132,  132,  132,  456,  455,  132,  135,
-      454,  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,  453,
-      155,  155,  155,  155,  155,  155,  155,  223,  223,  223,
-      224,  224,  231,  231,  231,  452,  451,  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,  450,  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,
+      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,  557,  557
     } ;
 
-static tao_yyconst short int tao_yy_chk[1153] =
+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,
@@ -713,80 +713,80 @@ static tao_yyconst short int tao_yy_chk[1153] =
       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,  468,  468,  426,  430,  430,
-
-      430,  430,  430,  457,  472,  518,  468,  468,  468,  456,
-      430,  430,  430,  468,  518,  518,  518,  430,  438,  438,
-      438,  542,  454,  453,  542,  451,  438,  438,  438,  438,
-      473,  473,  473,  473,  473,  450,  505,  505,  448,  438,
-      438,  438,  438,  438,  438,  478,  478,  478,  478,  473,
-      507,  507,  447,  481,  505,  444,  481,  478,  478,  478,
-      509,  509,  510,  510,  478,  481,  481,  481,  507,  511,
-      511,  511,  511,  513,  513,  513,  513,  443,  509,  441,
-      510,  511,  511,  511,  440,  513,  513,  513,  511,  514,
-      514,  516,  513,  439,  516,  437,  517,  532,  532,  517,
-
-      517,  534,  534,  516,  516,  516,  436,  514,  517,  517,
-      517,  535,  535,  536,  536,  532,  538,  538,  435,  534,
-      539,  539,  535,  535,  535,  546,  546,  548,  548,  535,
-      434,  536,  550,  550,  538,  551,  551,  432,  539,  554,
-      554,  556,  556,  546,  431,  548,  423,  422,  421,  420,
-      550,  418,  417,  551,  415,  412,  411,  554,  410,  556,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  559,
-      408,  559,  559,  559,  559,  559,  559,  559,  560,  560,
-      560,  560,  560,  561,  561,  561,  406,  405,  561,  562,
-      404,  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,  401,
-      566,  566,  566,  566,  566,  566,  566,  567,  567,  567,
-      568,  568,  569,  569,  569,  399,  398,  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,  396,  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,
+      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,  557,  557
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -806,7 +806,7 @@ static char *tao_yy_last_accepting_cpos;
 char tao_yytext[TAO_YYLMAX];
 char *tao_yytext_ptr;
 #define INITIAL 0
-/*  $Id: idl.ll,v 1.97 2005/07/05 23:09:58 parsons Exp
+/*  idl.ll,v 1.98 2005/07/07 19:55:08 gmaxey Exp
 
 COPYRIGHT
 
@@ -902,7 +902,7 @@ static idl_uns_long     idl_atoui (char *, long);
 static void             idl_parse_line_and_file (char *);
 static void             idl_store_pragma (char *);
 static char *           idl_get_pragma_string (char *);
-static idl_bool         idl_valid_version (char *);
+static bool         idl_valid_version (char *);
 static AST_Decl *       idl_find_node (char *);
 
 #define ace_tao_yytext tao_yytext
@@ -1120,7 +1120,7 @@ tao_yy_match:
                         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] != 1093 );
+                while ( tao_yy_base[tao_yy_current_state] != 1095 );
 
 tao_yy_find_action:
                 tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1513,7 +1513,7 @@ TAO_YY_RULE_SETUP
 {
                   /* Skip the quotes */
                   char *tmp = ace_tao_yytext;
-                  for(int i = strlen(tmp) - 1; i >= 0; --i) {
+                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -1521,7 +1521,7 @@ TAO_YY_RULE_SETUP
                       break;
                     }
                   }
-                  tmp[strlen (tmp) - 1] = '\0';
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
                   ACE_NEW_RETURN (tao_yylval.sval,
                                   UTL_String (tmp + 1),
                                   IDL_STRING_LITERAL);
@@ -1533,7 +1533,15 @@ TAO_YY_RULE_SETUP
 {
                   /* Skip the bookends */
                   char *tmp = ACE_OS::strdup (ace_tao_yytext);
-                  tmp[strlen (tmp) - 1] = '\0';
+                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                    if (isspace(tmp[i])) {
+                      tmp[i] = '\0';
+                    }
+                    else {
+                      break;
+                    }
+                  }
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
                   tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
                   return IDL_WSTRING_LITERAL;
                 }
@@ -2655,9 +2663,9 @@ idl_parse_line_and_file (char *buf)
     }
 
   UTL_String *fname = idl_global->filename ();
-  idl_bool in_main_file = I_FALSE;
-  idl_bool is_real_filename = fname->compare (idl_global->real_filename ());
-  idl_bool is_main_filename = I_FALSE;
+  bool in_main_file = false;
+  bool is_real_filename = fname->compare (idl_global->real_filename ());
+  bool is_main_filename = false;
 
   if (!is_real_filename)
     {
@@ -2666,7 +2674,7 @@ idl_parse_line_and_file (char *buf)
 
   if (is_real_filename || is_main_filename)
     {
-      in_main_file = I_TRUE;
+      in_main_file = true;
     }
 
   idl_global->set_in_main_file (in_main_file);
@@ -2738,13 +2746,13 @@ idl_store_pragma (char *buf)
 
   if (ACE_OS::strstr (buf + 8, "import") != 0)
     {
-      idl_global->set_import (I_TRUE);
+      idl_global->set_import (true);
       return;
     }
 
   if (ACE_OS::strstr (buf + 8, "include") != 0)
     {
-      idl_global->set_import (I_FALSE);
+      idl_global->set_import (false);
       return;
     }
 
@@ -2770,7 +2778,7 @@ idl_store_pragma (char *buf)
 
           if (depth > 1)
             {
-              top_scope->has_prefix (I_TRUE);
+              top_scope->has_prefix (true);
               ScopeAsDecl (top_scope)->prefix_scope (top_scope);
             }
 
@@ -2779,8 +2787,8 @@ idl_store_pragma (char *buf)
           if (idl_global->in_main_file ())
             {
               idl_global->root ()->prefix (new_prefix);
-              idl_global->root ()->set_imported (I_FALSE);
-              top_scope->has_prefix (I_TRUE);
+              idl_global->root ()->set_imported (false);
+              top_scope->has_prefix (true);
             }
 
           ACE_CString ext_id;
@@ -2871,7 +2879,7 @@ idl_store_pragma (char *buf)
             }
 
           d->repoID (new_id);
-          d->typeid_set (I_TRUE);
+          d->typeid_set (true);
         }
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_TYPE", 14) == 0)
@@ -2887,14 +2895,14 @@ idl_store_pragma (char *buf)
       char *foo_type = tmp;
       while (*tmp && !isspace(*tmp))
         tmp++;
-      while (isspace(*tmp)) 
+      while (isspace(*tmp))
         {
           *tmp = '\0';
           tmp++;
         }
       char *key = tmp;
 
-      if (!idl_global->add_dcps_data_key(foo_type, key)) 
+      if (!idl_global->add_dcps_data_key(foo_type, key))
         {
           ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%s\" not found for key \"%s\"\n",
             foo_type, key));
@@ -3205,7 +3213,7 @@ idl_get_pragma_string (char *pragma)
   return retval;
 }
 
-static idl_bool
+static bool
 idl_valid_version (char *s)
 {
   // Nothing preceding decimal point.
@@ -3268,7 +3276,7 @@ idl_find_node (char *s)
   if (node != 0)
     {
       d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
-                                                                 I_TRUE);
+                                                                 true);
     }
 
   if (d == 0)
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index 16ba056ee02..82b0b590534 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,6 +1,6 @@
 --- lex.yy.cpp.orig	2005-07-07 11:05:08.066403000 -0700
 +++ lex.yy.cpp	2005-07-07 10:51:41.804932200 -0700
-@@ -1058,7 +1058,7 @@
+@@ -1134,7 +1134,7 @@
  TAO_YY_DECL
          {
          register tao_yy_state_type tao_yy_current_state;
@@ -9,14 +9,16 @@
          register int tao_yy_act;
  
  
-@@ -1591,42 +1591,42 @@
+@@ -1664,42 +1664,42 @@
                    idl_global->set_lineno(idl_global->lineno() + 1);
                    idl_store_pragma(ace_tao_yytext);
                  }
 -        TAO_YY_BREAK
 +        break;
  case 87:
+ /* rule 87 can match eol */
  case 88:
+ /* rule 88 can match eol */
  TAO_YY_RULE_SETUP
  {/* ignore file */
                    idl_global->set_lineno(idl_global->lineno() + 1);
@@ -24,7 +26,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 89:
+ /* rule 89 can match eol */
  case 90:
+ /* rule 90 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -32,7 +36,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 91:
+ /* rule 91 can match eol */
  case 92:
+ /* rule 92 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -40,7 +46,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 93:
+ /* rule 93 can match eol */
  case 94:
+ /* rule 94 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -48,7 +56,9 @@
 -        TAO_YY_BREAK
 +        break;
  case 95:
+ /* rule 95 can match eol */
  case 96:
+ /* rule 96 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_parse_line_and_file(ace_tao_yytext);
@@ -56,15 +66,18 @@
 -        TAO_YY_BREAK
 +        break;
  case 97:
+ /* rule 97 can match eol */
  case 98:
+ /* rule 98 can match eol */
  TAO_YY_RULE_SETUP
-@@ -1634,14 +1634,14 @@
+ {
                    /* ignore cpp ident */
                    idl_global->set_lineno(idl_global->lineno() + 1);
                  }
 -        TAO_YY_BREAK
 +        break;
  case 99:
+ /* rule 99 can match eol */
  TAO_YY_RULE_SETUP
  {
                    /* ignore comments */
@@ -75,7 +88,16 @@
  case 100:
  TAO_YY_RULE_SETUP
  {
-@@ -1658,17 +1658,17 @@
+                   for(;;) {
+                     char c = tao_yyinput();
+                     if (c == '*') {
+                       char next = tao_yyinput();
+                       if (next == '/')
+                         break;
+                       else
+                         tao_yyunput(c, 0);
+                       if (c == '\n')
+                         idl_global->set_lineno(idl_global->lineno() + 1);
                      }
                    }
                  }
@@ -87,6 +109,7 @@
 -        TAO_YY_BREAK
 +        break;
  case 102:
+ /* rule 102 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_global->set_lineno(idl_global->lineno() + 1);
@@ -96,41 +119,3 @@
  case 103:
  TAO_YY_RULE_SETUP
  return ace_tao_yytext [0];
-@@ -1676,7 +1676,7 @@
- case 104:
- TAO_YY_RULE_SETUP
- TAO_YY_ECHO;
--        TAO_YY_BREAK
-+        break;
- case TAO_YY_STATE_EOF(INITIAL):
-         tao_yyterminate();
- 
-@@ -2059,6 +2059,7 @@
- #endif        /* ifndef TAO_YY_NO_UNPUT */
- 
- 
-+#ifndef TAO_YY_NO_INPUT
- #ifdef __cplusplus
- static int tao_yyinput()
- #else
-@@ -2131,7 +2132,7 @@
- 
-         return c;
-         }
--
-+#endif /* TAO_YY_NO_INPUT */
- 
- #ifdef TAO_YY_USE_PROTOS
- void tao_yyrestart( FILE *input_file )
-@@ -2242,11 +2243,6 @@
-         }
- 
- 
--#ifndef TAO_YY_ALWAYS_INTERACTIVE
--#ifndef TAO_YY_NEVER_INTERACTIVE
--extern int isatty TAO_YY_PROTO(( int ));
--#endif
--#endif
- 
- #ifdef TAO_YY_USE_PROTOS
- void tao_yy_init_buffer( TAO_YY_BUFFER_STATE b, FILE *file )
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 77cacf52da5..d39fc8c66e0 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,8 +1,8 @@
 // $Id$
-/* A Bison parser, made by GNU Bison 1.875c.  */
+/* A Bison parser, made by GNU Bison 1.875d.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -306,7 +306,7 @@ typedef union TAO_YYSTYPE {
   AST_Argument::Direction       dival;          /* Argument direction   */
   AST_Operation::Flags          ofval;          /* Operation flags      */
   FE_Declarator                 *deval;         /* Declarator value     */
-  idl_bool                      bval;           /* Boolean value        */
+  bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
   idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
@@ -380,7 +380,7 @@ typedef union TAO_YYSTYPE {
 /* A type that is properly aligned for any stack member.  */
 union tao_yyalloc
 {
-  short tao_yyss;
+  short int tao_yyss;
   TAO_YYSTYPE tao_yyvs;
   };
 
@@ -390,7 +390,7 @@ union tao_yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define TAO_YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (TAO_YYSTYPE))                                \
+     ((N) * (sizeof (short int) + sizeof (TAO_YYSTYPE))                        \
       + TAO_YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
@@ -432,7 +432,7 @@ union tao_yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char tao_yysigned_char;
 #else
-   typedef short tao_yysigned_char;
+   typedef short int tao_yysigned_char;
 #endif
 
 /* TAO_YYFINAL -- State number of the termination state. */
@@ -498,7 +498,7 @@ static const unsigned char tao_yytranslate[] =
 #if TAO_YYDEBUG
 /* TAO_YYPRHS[TAO_YYN] -- Index of the first RHS symbol of rule number TAO_YYN in
    TAO_YYRHS.  */
-static const unsigned short tao_yyprhs[] =
+static const unsigned short int tao_yyprhs[] =
 {
        0,     0,     3,     5,     8,     9,    10,    14,    15,    19,
       20,    24,    25,    29,    30,    34,    35,    39,    40,    44,
@@ -551,7 +551,7 @@ static const unsigned short tao_yyprhs[] =
 };
 
 /* TAO_YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short tao_yyrhs[] =
+static const short int tao_yyrhs[] =
 {
      101,     0,    -1,   102,    -1,   102,   103,    -1,    -1,    -1,
      190,   104,    79,    -1,    -1,   351,   105,    79,    -1,    -1,
@@ -677,56 +677,56 @@ static const short tao_yyrhs[] =
 };
 
 /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined.  */
-static const unsigned short tao_yyrline[] =
+static const unsigned short int tao_yyrline[] =
 {
-       0,   319,   319,   322,   323,   328,   327,   338,   337,   348,
-     347,   358,   357,   368,   367,   378,   377,   388,   387,   398,
-     397,   408,   407,   418,   417,   428,   427,   438,   437,   451,
-     456,   480,   485,   450,   501,   502,   507,   546,   551,   506,
-     569,   568,   582,   611,   633,   658,   657,   669,   676,   677,
-     678,   679,   683,   694,   699,   738,   743,   698,   772,   811,
-     816,   770,   835,   833,   871,   870,   884,   890,   897,   904,
-     911,   933,   956,   970,   971,   975,   976,   977,   983,   982,
-     990,   989,   999,  1000,  1005,  1004,  1015,  1014,  1025,  1024,
-    1035,  1034,  1045,  1044,  1055,  1054,  1065,  1064,  1075,  1074,
-    1088,  1101,  1099,  1129,  1136,  1147,  1146,  1172,  1170,  1191,
-    1202,  1239,  1263,  1290,  1295,  1300,  1305,  1289,  1354,  1355,
-    1356,  1357,  1358,  1359,  1360,  1372,  1377,  1448,  1450,  1452,
-    1453,  1467,  1468,  1482,  1483,  1496,  1497,  1507,  1520,  1521,
-    1531,  1544,  1545,  1555,  1565,  1578,  1579,  1589,  1599,  1612,
-    1642,  1643,  1652,  1657,  1664,  1669,  1674,  1679,  1685,  1690,
-    1696,  1705,  1779,  1778,  1788,  1793,  1798,  1803,  1826,  1835,
-    1834,  1887,  1888,  1892,  1900,  1901,  1929,  1930,  1931,  1932,
-    1933,  1934,  1935,  1936,  1940,  1941,  1942,  1946,  1947,  1948,
-    1952,  1953,  1957,  1970,  1968,  1998,  2005,  2006,  2010,  2023,
-    2021,  2051,  2058,  2075,  2094,  2095,  2099,  2104,  2109,  2117,
-    2122,  2127,  2135,  2140,  2145,  2153,  2167,  2172,  2180,  2188,
-    2196,  2204,  2213,  2212,  2228,  2258,  2263,  2227,  2282,  2285,
-    2286,  2290,  2290,  2300,  2305,  2299,  2364,  2363,  2378,  2377,
-    2392,  2397,  2402,  2407,  2450,  2455,  2391,  2479,  2487,  2501,
-    2511,  2519,  2520,  2617,  2620,  2621,  2626,  2631,  2625,  2661,
-    2660,  2674,  2685,  2707,  2715,  2714,  2730,  2735,  2729,  2752,
-    2751,  2800,  2820,  2841,  2846,  2875,  2880,  2840,  2906,  2911,
-    2909,  2916,  2920,  2955,  2960,  2953,  3017,  3072,  3082,  3071,
-    3097,  3102,  3095,  3134,  3158,  3168,  3173,  3166,  3203,  3226,
-    3235,  3234,  3264,  3275,  3297,  3305,  3310,  3304,  3338,  3339,
-    3344,  3349,  3354,  3359,  3343,  3420,  3425,  3430,  3435,  3419,
-    3501,  3506,  3532,  3537,  3500,  3555,  3560,  3613,  3618,  3553,
-    3655,  3661,  3668,  3675,  3676,  3688,  3694,  3731,  3687,  3753,
-    3752,  3763,  3762,  3775,  3780,  3778,  3785,  3790,  3795,  3789,
-    3832,  3831,  3842,  3841,  3854,  3859,  3857,  3864,  3869,  3874,
-    3868,  3917,  3925,  3926,  3927,  3970,  3975,  3980,  3989,  3994,
-    3988,  4006,  4014,  4019,  4013,  4031,  4039,  4044,  4038,  4056,
-    4064,  4069,  4063,  4081,  4088,  4101,  4099,  4127,  4134,  4155,
-    4185,  4186,  4190,  4216,  4256,  4261,  4215,  4280,  4285,  4278,
-    4311,  4310,  4321,  4328,  4329,  4334,  4333,  4344,  4343,  4354,
-    4353,  4364,  4363,  4374,  4373,  4384,  4383,  4396,  4437,  4455,
-    4480,  4530,  4536,  4543,  4577,  4611,  4646,  4645,  4695,  4700,
-    4705,  4710,  4715,  4720,  4694,  4747,  4746,  4757,  4764,  4771,
-    4779,  4784,  4778,  4796,  4797,  4801,  4803,  4802,  4813,  4812,
-    4827,  4862,  4825,  4896,  4931,  4894,  4963,  4964,  4965,  4969,
-    4970,  4974,  4998,  5025,  5066,  5071,  5023,  5088,  5098,  5117,
-    5129,  5128,  5161,  5202,  5207,  5159,  5224,  5229
+       0,   320,   320,   323,   324,   329,   328,   339,   338,   349,
+     348,   359,   358,   369,   368,   379,   378,   389,   388,   399,
+     398,   409,   408,   419,   418,   429,   428,   439,   438,   452,
+     457,   481,   486,   451,   502,   503,   508,   547,   552,   507,
+     570,   569,   583,   614,   638,   665,   664,   676,   683,   684,
+     685,   686,   690,   701,   706,   750,   755,   705,   784,   823,
+     828,   782,   847,   845,   882,   881,   895,   901,   908,   915,
+     922,   944,   967,  1020,  1021,  1025,  1026,  1027,  1033,  1032,
+    1040,  1039,  1049,  1050,  1055,  1054,  1065,  1064,  1075,  1074,
+    1085,  1084,  1095,  1094,  1105,  1104,  1115,  1114,  1125,  1124,
+    1138,  1151,  1149,  1179,  1186,  1197,  1196,  1222,  1220,  1241,
+    1252,  1289,  1313,  1340,  1345,  1350,  1355,  1339,  1404,  1405,
+    1406,  1407,  1408,  1409,  1410,  1422,  1427,  1498,  1500,  1502,
+    1503,  1517,  1518,  1532,  1533,  1546,  1547,  1557,  1570,  1571,
+    1581,  1594,  1595,  1605,  1615,  1628,  1629,  1639,  1649,  1662,
+    1692,  1693,  1702,  1707,  1714,  1719,  1724,  1729,  1735,  1740,
+    1746,  1755,  1829,  1828,  1838,  1843,  1848,  1853,  1876,  1885,
+    1884,  1937,  1938,  1942,  1950,  1951,  1979,  1980,  1981,  1982,
+    1983,  1984,  1985,  1986,  1990,  1991,  1992,  1996,  1997,  1998,
+    2002,  2003,  2007,  2020,  2018,  2048,  2055,  2056,  2060,  2073,
+    2071,  2101,  2108,  2125,  2144,  2145,  2149,  2154,  2159,  2167,
+    2172,  2177,  2185,  2190,  2195,  2203,  2217,  2222,  2230,  2238,
+    2246,  2254,  2263,  2262,  2278,  2308,  2313,  2277,  2332,  2335,
+    2336,  2340,  2340,  2350,  2355,  2349,  2414,  2413,  2428,  2427,
+    2442,  2447,  2452,  2457,  2500,  2505,  2441,  2529,  2537,  2551,
+    2561,  2569,  2570,  2667,  2670,  2671,  2676,  2681,  2675,  2711,
+    2710,  2724,  2735,  2757,  2765,  2764,  2780,  2785,  2779,  2802,
+    2801,  2850,  2870,  2891,  2896,  2925,  2930,  2890,  2956,  2961,
+    2959,  2966,  2970,  3005,  3010,  3003,  3067,  3122,  3132,  3121,
+    3147,  3152,  3145,  3184,  3208,  3218,  3223,  3216,  3253,  3276,
+    3285,  3284,  3314,  3325,  3347,  3355,  3360,  3354,  3388,  3389,
+    3394,  3399,  3404,  3409,  3393,  3470,  3475,  3480,  3485,  3469,
+    3551,  3556,  3582,  3587,  3550,  3605,  3610,  3663,  3668,  3603,
+    3705,  3711,  3718,  3725,  3726,  3738,  3744,  3781,  3737,  3803,
+    3802,  3813,  3812,  3825,  3830,  3828,  3835,  3840,  3845,  3839,
+    3882,  3881,  3892,  3891,  3904,  3909,  3907,  3914,  3919,  3924,
+    3918,  3967,  3975,  3976,  3977,  4020,  4025,  4030,  4039,  4044,
+    4038,  4056,  4064,  4069,  4063,  4081,  4089,  4094,  4088,  4106,
+    4114,  4119,  4113,  4131,  4138,  4151,  4149,  4177,  4184,  4205,
+    4235,  4236,  4240,  4266,  4306,  4311,  4265,  4330,  4335,  4328,
+    4363,  4362,  4373,  4380,  4381,  4386,  4385,  4396,  4395,  4406,
+    4405,  4416,  4415,  4426,  4425,  4436,  4435,  4448,  4489,  4507,
+    4532,  4583,  4589,  4596,  4630,  4664,  4699,  4698,  4748,  4753,
+    4758,  4763,  4768,  4773,  4747,  4802,  4801,  4812,  4819,  4826,
+    4834,  4839,  4833,  4851,  4852,  4856,  4858,  4857,  4868,  4867,
+    4882,  4917,  4880,  4951,  4986,  4949,  5018,  5019,  5020,  5024,
+    5025,  5029,  5053,  5080,  5121,  5126,  5078,  5143,  5153,  5172,
+    5184,  5183,  5216,  5262,  5267,  5214,  5284,  5289
 };
 #endif
 
@@ -822,7 +822,7 @@ static const char *const tao_yytname[] =
 # ifdef TAO_YYPRINT
 /* TAO_YYTOKNUM[TAO_YYLEX-NUM] -- Internal token number corresponding to
    token TAO_YYLEX-NUM.  */
-static const unsigned short tao_yytoknum[] =
+static const unsigned short int tao_yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -838,7 +838,7 @@ static const unsigned short tao_yytoknum[] =
 # endif
 
 /* TAO_YYR1[TAO_YYN] -- Symbol number of symbol that rule TAO_YYN derives.  */
-static const unsigned short tao_yyr1[] =
+static const unsigned short int tao_yyr1[] =
 {
        0,   100,   101,   102,   102,   104,   103,   105,   103,   106,
      103,   107,   103,   108,   103,   109,   103,   110,   103,   111,
@@ -946,7 +946,7 @@ static const unsigned char tao_yyr2[] =
 /* TAO_YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when TAO_YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned short tao_yydefact[] =
+static const unsigned short int tao_yydefact[] =
 {
        4,     0,     0,     1,    27,   113,    29,    40,   162,   222,
      238,   273,   320,     0,     0,     0,     0,    64,     0,     0,
@@ -1019,7 +1019,7 @@ static const unsigned short tao_yydefact[] =
 };
 
 /* TAO_YYDEFGOTO[NTERM-NUM]. */
-static const short tao_yydefgoto[] =
+static const short int tao_yydefgoto[] =
 {
       -1,     1,     2,    23,   146,   150,   151,   145,   149,    96,
       95,   100,   152,   154,   156,    67,    24,    69,   225,   310,
@@ -1059,7 +1059,7 @@ static const short tao_yydefgoto[] =
 /* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing
    STATE-NUM.  */
 #define TAO_YYPACT_NINF -483
-static const short tao_yypact[] =
+static const short int tao_yypact[] =
 {
     -483,    49,  1047,  -483,  -483,  -483,  -483,  -483,  -483,  -483,
     -483,  -483,  -483,    61,    60,    66,    68,  -483,    61,    61,
@@ -1132,7 +1132,7 @@ static const short tao_yypact[] =
 };
 
 /* TAO_YYPGOTO[NTERM-NUM].  */
-static const short tao_yypgoto[] =
+static const short int tao_yypgoto[] =
 {
     -483,  -483,   189,  -483,  -483,  -483,  -483,  -483,  -483,  -483,
     -483,  -483,  -483,  -483,  -483,  -483,  -483,  -483,  -483,  -483,
@@ -1174,7 +1174,7 @@ static const short tao_yypgoto[] =
    number is the opposite.  If zero, do what TAO_YYDEFACT says.
    If TAO_YYTABLE_NINF, syntax error.  */
 #define TAO_YYTABLE_NINF -475
-static const short tao_yytable[] =
+static const short int tao_yytable[] =
 {
       77,    78,   138,    92,    94,    88,    89,   169,   170,   134,
      119,   135,   350,    38,   136,   163,   118,   166,   137,   167,
@@ -1290,7 +1290,7 @@ static const short tao_yytable[] =
       21,    22
 };
 
-static const short tao_yycheck[] =
+static const short int tao_yycheck[] =
 {
       13,    13,    34,    21,    22,    18,    19,    68,    68,    34,
       34,    34,   286,     2,    34,    68,    34,    68,    34,    68,
@@ -1408,7 +1408,7 @@ static const short tao_yycheck[] =
 
 /* TAO_YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned short tao_yystos[] =
+static const unsigned short int tao_yystos[] =
 {
        0,   101,   102,     0,     1,     4,     5,     6,     7,    20,
       21,    23,    27,    40,    41,    42,    43,    49,    50,    53,
@@ -1591,12 +1591,12 @@ do {                                                                \
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-tao_yy_stack_print (short *bottom, short *top)
+tao_yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 tao_yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    short int *bottom;
+    short int *top;
 #endif
 {
   TAO_YYFPRINTF (stderr, "Stack now");
@@ -1853,9 +1853,9 @@ tao_yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short        tao_yyssa[TAO_YYINITDEPTH];
-  short *tao_yyss = tao_yyssa;
-  register short *tao_yyssp;
+  short int tao_yyssa[TAO_YYINITDEPTH];
+  short int *tao_yyss = tao_yyssa;
+  register short int *tao_yyssp;
 
   /* The semantic value stack.  */
   TAO_YYSTYPE tao_yyvsa[TAO_YYINITDEPTH];
@@ -1892,6 +1892,7 @@ tao_yyparse ()
   tao_yyssp = tao_yyss;
   tao_yyvsp = tao_yyvs;
 
+
   goto tao_yysetstate;
 
 /*------------------------------------------------------------.
@@ -1917,7 +1918,7 @@ tao_yyparse ()
            these so that the &'s don't force the real ones into
            memory.  */
         TAO_YYSTYPE *tao_yyvs1 = tao_yyvs;
-        short *tao_yyss1 = tao_yyss;
+        short int *tao_yyss1 = tao_yyss;
 
 
         /* Each stack pointer address is followed by the size of the
@@ -1945,7 +1946,7 @@ tao_yyparse ()
         tao_yystacksize = TAO_YYMAXDEPTH;
 
       {
-        short *tao_yyss1 = tao_yyss;
+        short int *tao_yyss1 = tao_yyss;
         union tao_yyalloc *tao_yyptr =
           (union tao_yyalloc *) TAO_YYSTACK_ALLOC (TAO_YYSTACK_BYTES (tao_yystacksize));
         if (! tao_yyptr)
@@ -2363,7 +2364,7 @@ tao_yyreduce:
               (void) s->fe_add_interface (i);
 
               // This FE_InterfaceHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].ihval->name ()->destroy ();
+              tao_yyvsp[0].ihval->destroy ();
               delete tao_yyvsp[0].ihval;
               tao_yyvsp[0].ihval = 0;
             }
@@ -2440,14 +2441,16 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n (tao_yyvsp[-1].idval,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
+                          1);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               tao_yyvsp[0].nlval,
-                                              I_FALSE,
-                                              I_FALSE,
-                                              I_TRUE),
+                                              false,
+                                              false,
+                                              true),
                           1);
         }
     break;
@@ -2464,14 +2467,16 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n (tao_yyvsp[-1].idval,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
+                          1);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               tao_yyvsp[0].nlval,
-                                              I_TRUE,
-                                              I_FALSE,
-                                              I_TRUE),
+                                              true,
+                                              false,
+                                              true),
                           1);
         }
     break;
@@ -2488,14 +2493,16 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n (tao_yyvsp[-1].idval,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
+                          1);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (&n,
+                          FE_InterfaceHeader (n,
                                               tao_yyvsp[0].nlval,
-                                              I_FALSE,
-                                              I_TRUE,
-                                              I_TRUE),
+                                              false,
+                                              true,
+                                              true),
                           1);
         }
     break;
@@ -2560,9 +2567,9 @@ tao_yyreduce:
                     tao_yyvsp[0].vhval->supports (),
                     tao_yyvsp[0].vhval->n_supports (),
                     tao_yyvsp[0].vhval->supports_concrete (),
-                    I_FALSE,
+                    false,
                     tao_yyvsp[0].vhval->truncatable (),
-                    I_FALSE
+                    false
                   );
               i = AST_Interface::narrow_from_decl (v);
               AST_Interface::fwd_redefinition_helper (i,
@@ -2572,6 +2579,11 @@ tao_yyreduce:
                */
               v = AST_ValueType::narrow_from_decl (i);
               (void) s->fe_add_valuetype (v);
+
+              // FE_OBVHeader is not automatically destroyed in the AST
+              tao_yyvsp[0].vhval->destroy ();
+              delete tao_yyvsp[0].vhval;
+              tao_yyvsp[0].vhval = 0;
             }
 
           /*
@@ -2641,9 +2653,9 @@ tao_yyreduce:
                     tao_yyvsp[0].vhval->supports (),
                     tao_yyvsp[0].vhval->n_supports (),
                     tao_yyvsp[0].vhval->supports_concrete (),
-                    I_TRUE,
-                    I_FALSE,
-                    I_FALSE
+                    true,
+                    false,
+                    false
                   );
               i = AST_Interface::narrow_from_decl (v);
               AST_Interface::fwd_redefinition_helper (i,
@@ -2718,14 +2730,13 @@ tao_yyreduce:
 
           UTL_ScopedName *sn = 0;
           ACE_NEW_RETURN (sn,
-                          UTL_ScopedName (tao_yyvsp[-3].idval,
-                                          0),
+                          UTL_ScopedName (tao_yyvsp[-3].idval, 0),
                           1);
           ACE_NEW_RETURN (tao_yyval.vhval,
                           FE_OBVHeader (sn,
                                         tao_yyvsp[-2].nlval,
                                         tao_yyvsp[0].nlval,
-                                        tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE),
+                                        tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : false),
                           1);
         }
     break;
@@ -2751,7 +2762,7 @@ tao_yyreduce:
 
     {
 // opt_truncatable : IDL_TRUNCATABLE
-          tao_yyval.bval = I_TRUE;
+          tao_yyval.bval = true;
         }
     break;
 
@@ -2759,7 +2770,7 @@ tao_yyreduce:
 
     {
 /*      |  EMPTY */
-          tao_yyval.bval = I_FALSE;
+          tao_yyval.bval = false;
         }
     break;
 
@@ -2796,7 +2807,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
-                                                           I_TRUE);
+                                                            true);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -2819,7 +2830,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
-                                                            I_FALSE);
+                                                            false);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -2830,7 +2841,7 @@ tao_yyreduce:
     {
 // value_box_decl : value_decl type_spec
         idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen);
-              
+
         UTL_Scope *s = idl_global->scopes ().top_non_null ();
         UTL_ScopedName n (tao_yyvsp[-1].idval,
                           0);
@@ -2839,7 +2850,7 @@ tao_yyreduce:
           {
             /*
              * Get the type_spec associated with the valuebox
-             */ 
+             */
             AST_Type *tp = 0;
             AST_Typedef *td
               = AST_Typedef::narrow_from_decl (tao_yyvsp[0].dcval);
@@ -2875,7 +2886,7 @@ tao_yyreduce:
                 (void) s->fe_add_valuebox (vb);
               }
           }
-    }
+        }
     break;
 
   case 78:
@@ -3361,7 +3372,7 @@ tao_yyreduce:
            */
           AST_Decl *d =
             s->lookup_by_name (tao_yyvsp[0].idlist,
-                               I_TRUE);
+                               true);
 
           if (s != 0  && d != 0)
             {
@@ -3601,7 +3612,7 @@ tao_yyreduce:
            */
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                            I_TRUE);
+                                            true);
 
           /*
            * If the scoped name is an IDL constant, it may be used in an
@@ -3695,8 +3706,7 @@ tao_yyreduce:
 
     {
 //      | IDL_TRUETOK
-          tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_TRUE,
-                                                AST_Expression::EV_bool);
+          tao_yyval.exval = idl_global->gen ()->create_expr (true);
         }
     break;
 
@@ -3704,8 +3714,7 @@ tao_yyreduce:
 
     {
 //      | IDL_FALSETOK
-          tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_FALSE,
-                                                AST_Expression::EV_bool);
+          tao_yyval.exval = idl_global->gen ()->create_expr (false);
         }
     break;
 
@@ -3934,7 +3943,7 @@ tao_yyreduce:
           if (s != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                     I_TRUE);
+                                     true);
             }
 
           if (d == 0)
@@ -4592,7 +4601,7 @@ tao_yyreduce:
           AST_Decl *d = 0;
           AST_PredefinedType *p = 0;
           AST_Typedef *t = 0;
-          idl_bool found = I_FALSE;
+          bool found = false;
 
           /*
            * The discriminator is a scoped name. Try to resolve to
@@ -4601,7 +4610,7 @@ tao_yyreduce:
            * chain.
            */
           d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                 I_TRUE);
+                                 true);
 
           if (s != 0 && d != 0)
             {
@@ -4611,7 +4620,7 @@ tao_yyreduce:
                   {
                     case AST_Decl::NT_enum:
                       tao_yyval.dcval = d;
-                      found = I_TRUE;
+                      found = true;
                       break;
                     case AST_Decl::NT_pre_defined:
                       p = AST_PredefinedType::narrow_from_decl (d);
@@ -4629,7 +4638,7 @@ tao_yyreduce:
                             case AST_PredefinedType::PT_char:
                             case AST_PredefinedType::PT_boolean:
                               tao_yyval.dcval = p;
-                              found = I_TRUE;
+                              found = true;
                               break;
                             case AST_PredefinedType::PT_wchar:
                             case AST_PredefinedType::PT_octet:
@@ -4638,18 +4647,18 @@ tao_yyreduce:
                                   UTL_Error::EIDL_DISC_TYPE
                                 );
                               tao_yyval.dcval = 0;
-                              found = I_TRUE;
+                              found = true;
                               break;
                             default:
                               tao_yyval.dcval = 0;
-                              found = I_TRUE;
+                              found = true;
                               break;
                           }
                         }
                       else
                         {
                           tao_yyval.dcval = 0;
-                          found = I_TRUE;
+                          found = true;
                         }
 
                       break;
@@ -4664,7 +4673,7 @@ tao_yyreduce:
                       break;
                     default:
                       tao_yyval.dcval = 0;
-                      found = I_TRUE;
+                      found = true;
                       break;
                   }
                 }
@@ -4677,6 +4686,9 @@ tao_yyreduce:
           if (tao_yyval.dcval == 0)
             {
               idl_global->err ()->lookup_error (tao_yyvsp[0].idlist);
+
+              /* If we don't return here, we'll crash later.*/
+              return 1;
             }
         }
     break;
@@ -5542,7 +5554,7 @@ tao_yyreduce:
 
                   a =
                     idl_global->gen ()->create_attribute (
-                                            I_TRUE,
+                                            true,
                                             tp,
                                             (UTL_IdList *) d->name ()->copy (),
                                             s->is_local (),
@@ -5630,7 +5642,7 @@ tao_yyreduce:
 
                   a =
                     idl_global->gen ()->create_attribute (
-                                            I_FALSE,
+                                            false,
                                             tp,
                                             (UTL_IdList *) d->name ()->copy (),
                                             s->is_local (),
@@ -5758,7 +5770,7 @@ tao_yyreduce:
                 {
                   AST_Decl *d = ScopeAsDecl (s);
                   AST_Decl::NodeType nt = d->node_type ();
-                  idl_bool local =
+                  bool local =
                     s->is_local ()
                     || nt == AST_Decl::NT_valuetype
                     || nt == AST_Decl::NT_eventtype;
@@ -6148,7 +6160,7 @@ tao_yyreduce:
           if (s != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                     I_TRUE);
+                                     true);
             }
 
           if (d == 0)
@@ -6392,7 +6404,7 @@ tao_yyreduce:
 // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6421,7 +6433,7 @@ tao_yyreduce:
           if (d->name ()->compare (tao_yyvsp[-1].idlist) != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                     I_TRUE);
+                                     true);
             }
 
           if (d == 0)
@@ -6492,7 +6504,7 @@ tao_yyreduce:
               (void) s->fe_add_component (c);
 
               // This FE_ComponentHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].chval->name ()->destroy ();
+              tao_yyvsp[0].chval->destroy ();
               delete tao_yyvsp[0].chval;
               tao_yyvsp[0].chval = 0;
             }
@@ -6559,13 +6571,15 @@ tao_yyreduce:
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName n (tao_yyvsp[-4].idval,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName (tao_yyvsp[-4].idval, 0),
+                          1);
           ACE_NEW_RETURN (tao_yyval.chval,
-                          FE_ComponentHeader (&n,
+                          FE_ComponentHeader (n,
                                               tao_yyvsp[-2].idlist,
                                               tao_yyvsp[0].nlval,
-                                              I_FALSE),
+                                              false),
                           1);
         }
     break;
@@ -6700,7 +6714,7 @@ tao_yyreduce:
           if (c != 0)
             {
               AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                               I_TRUE);
+                                               true);
               if (d == 0)
                 {
                   idl_global->err ()->lookup_error (tao_yyvsp[-1].idlist);
@@ -6735,7 +6749,7 @@ tao_yyreduce:
 // interface_type : scoped_name
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6781,7 +6795,7 @@ tao_yyreduce:
 // uses_decl : IDL_USES opt_multiple interface_type id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6810,7 +6824,7 @@ tao_yyreduce:
               ud.is_multiple = tao_yyvsp[-2].bval;
               c->uses ().enqueue_tail (ud);
 
-              if (ud.is_multiple == I_TRUE
+              if (ud.is_multiple == true
                   && !idl_global->using_ifr_backend ()
                   && !idl_global->ignore_idl3 ())
                 {
@@ -6827,7 +6841,7 @@ tao_yyreduce:
 
     {
 // opt_multiple : IDL_MULTIPLE
-          tao_yyval.bval = I_TRUE;
+          tao_yyval.bval = true;
         }
     break;
 
@@ -6835,7 +6849,7 @@ tao_yyreduce:
 
     {
 /*      |  EMPTY */
-          tao_yyval.bval = I_FALSE;
+          tao_yyval.bval = false;
         }
     break;
 
@@ -6845,7 +6859,7 @@ tao_yyreduce:
 // emits_decl : IDL_EMITS scoped_name id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6877,7 +6891,7 @@ tao_yyreduce:
 // publishes_decl : IDL_PUBLISHES scoped_name id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6909,7 +6923,7 @@ tao_yyreduce:
 // consumes_decl : IDL_CONSUMES scoped_name id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                           I_TRUE);
+                                           true);
 
           if (d == 0)
             {
@@ -6964,7 +6978,7 @@ tao_yyreduce:
               (void) s->fe_add_home (h);
 
               // This FE_HomeHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].hhval->name ()->destroy ();
+              tao_yyvsp[0].hhval->destroy ();
               delete tao_yyvsp[0].hhval;
               tao_yyvsp[0].hhval = 0;
             }
@@ -7045,10 +7059,12 @@ tao_yyreduce:
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName n (tao_yyvsp[-10].idval,
-                            0);
+          UTL_ScopedName *n = 0;
+          ACE_NEW_RETURN (n,
+                          UTL_ScopedName (tao_yyvsp[-10].idval, 0),
+                          1);
           ACE_NEW_RETURN (tao_yyval.hhval,
-                          FE_HomeHeader (&n,
+                          FE_HomeHeader (n,
                                          tao_yyvsp[-8].idlist,
                                          tao_yyvsp[-6].nlval,
                                          tao_yyvsp[-2].idlist,
@@ -7175,8 +7191,8 @@ tao_yyreduce:
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
                                         &n,
-                                        I_FALSE,
-                                        I_FALSE
+                                        false,
+                                        false
                                       );
               home->factories ().enqueue_tail (o);
             }
@@ -7249,8 +7265,8 @@ tao_yyreduce:
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
                                         &n,
-                                        I_FALSE,
-                                        I_FALSE
+                                        false,
+                                        false
                                       );
               home->finders ().enqueue_tail (o);
             }
@@ -7318,7 +7334,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
-                                                            I_FALSE);
+                                                            false);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -7341,7 +7357,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
-                                                            I_TRUE);
+                                                            true);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -7370,9 +7386,9 @@ tao_yyreduce:
                     tao_yyvsp[0].ehval->supports (),
                     tao_yyvsp[0].ehval->n_supports (),
                     tao_yyvsp[0].ehval->supports_concrete (),
-                    I_TRUE,
-                    I_FALSE,
-                    I_FALSE
+                    true,
+                    false,
+                    false
                   );
               i = AST_Interface::narrow_from_decl (e);
               AST_Interface::fwd_redefinition_helper (i,
@@ -7484,7 +7500,7 @@ tao_yyreduce:
                           FE_EventHeader (0,
                                           tao_yyvsp[-2].nlval,
                                           tao_yyvsp[0].nlval,
-                                          tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE),
+                                          tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : false),
                           1);
         }
     break;
@@ -7512,9 +7528,9 @@ tao_yyreduce:
                     tao_yyvsp[0].ehval->supports (),
                     tao_yyvsp[0].ehval->n_supports (),
                     tao_yyvsp[0].ehval->supports_concrete (),
-                    I_FALSE,
+                    false,
                     tao_yyvsp[0].ehval->truncatable (),
-                    I_FALSE
+                    false
                   );
               i = AST_Interface::narrow_from_decl (e);
               AST_Interface::fwd_redefinition_helper (i,
@@ -7524,6 +7540,11 @@ tao_yyreduce:
                */
               e = AST_EventType::narrow_from_decl (i);
               (void) s->fe_add_eventtype (e);
+
+              // FE_EventHeader is not automatically destroyed in the AST
+              tao_yyvsp[0].ehval->destroy ();
+              delete tao_yyvsp[0].ehval;
+              tao_yyvsp[0].ehval = 0;
             }
 
           /*
@@ -7581,7 +7602,7 @@ tao_yyreduce:
 
     }
 
-/* Line 1000 of yacc.c.  */
+/* Line 1010 of yacc.c.  */
 
 
   tao_yyvsp -= tao_yylen;
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff
index 0357abf4ae1..6dceda2e081 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp.diff
+++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff
@@ -1,6 +1,6 @@
 --- y.tab.cpp.orig	2005-01-28 10:00:07.000000000 -0600
 +++ y.tab.cpp	2005-01-28 10:07:56.000000000 -0600
-@@ -1758,11 +1758,6 @@
+@@ -1759,11 +1759,6 @@
    else
      TAO_YYFPRINTF (tao_yyoutput, "nterm %s (", tao_yytname[tao_yytype]);
  
@@ -12,7 +12,7 @@
    TAO_YYFPRINTF (tao_yyoutput, ")");
  }
  
-@@ -1782,14 +1777,9 @@
+@@ -1778,14 +1778,9 @@
  #endif
  {
    /* Pacify ``unused variable'' warnings.  */
@@ -26,9 +26,8 @@
 -        break;
 -    }
  }
- 
  
-@@ -7687,7 +7677,7 @@
+@@ -7741,7 +7741,7 @@
  `---------------------------------------------------*/
  tao_yyerrorlab:
  
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 3667943b930..ffd1faa3772 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -210,7 +210,7 @@ typedef union TAO_YYSTYPE {
   AST_Argument::Direction       dival;          /* Argument direction   */
   AST_Operation::Flags          ofval;          /* Operation flags      */
   FE_Declarator                 *deval;         /* Declarator value     */
-  idl_bool                      bval;           /* Boolean value        */
+  bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
   idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index f202333fd4d..19b1cfa3f13 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -88,8 +88,8 @@ public:
   AST_Array (UTL_ScopedName *n,
              unsigned long ndims,
              UTL_ExprList *dims,
-             idl_bool local,
-             idl_bool abstract);
+             bool local,
+             bool abstract);
 
   // Destructor.
   virtual ~AST_Array (void);
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index faecd45b815..14610600371 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -73,9 +73,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class UTL_ExceptList;
 class UTL_NameList;
 
-// Representation of attribute declaration:
-// An attribute is a field with a readonly property.
-
 class TAO_IDL_FE_Export AST_Attribute : public virtual AST_Field
 {
 public:
@@ -84,18 +81,18 @@ public:
   // Constructor(s).
   AST_Attribute (void);
 
-  AST_Attribute (idl_bool readonly,
+  AST_Attribute (bool readonly,
                  AST_Type *ft,
                  UTL_ScopedName *n,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   // Destructor.
   virtual ~AST_Attribute (void);
 
   // Data Accessors.
 
-  idl_bool readonly (void) const;
+  bool readonly (void) const;
   UTL_ExceptList *get_get_exceptions (void) const;
   UTL_ExceptList *get_set_exceptions (void) const;
 
@@ -116,7 +113,7 @@ public:
 private:
   // Data.
 
-  const idl_bool pd_readonly;
+  const bool pd_readonly;
   // Is attribute read-only?
 
   UTL_ExceptList *pd_get_exceptions;
diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h
index 6e41a2d41ec..b3369adf483 100644
--- a/TAO/TAO_IDL/include/ast_component.h
+++ b/TAO/TAO_IDL/include/ast_component.h
@@ -26,11 +26,11 @@ public:
 
   // Extend lookup to the base component.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
+                                       bool treat_as_ref);
 
   // Extend lookup to the supported interfaces.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
+                                       bool treat_as_ref);
 
   // Utility data structure for port declarations.
   struct port_description
@@ -41,7 +41,7 @@ public:
     // Fields.
     Identifier *id;
     AST_Type *impl;
-    idl_bool is_multiple;
+    bool is_multiple;
   };
 
   // Accessors.
@@ -74,7 +74,7 @@ public:
 
   // Check if we have redefined any of our parents' operations or attributes,
   // and check if there is such a clash among the parents
-  virtual idl_bool redef_clash (void);
+  virtual bool redef_clash (void);
 
 private:
   AST_Component *pd_base_component;
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index c94aae1ff6a..9ce723c00d8 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -102,8 +102,8 @@ public:
   AST_Expression::ExprType et (void);
 
   // Accessors for the private member.
-  idl_bool ifr_added (void);
-  void ifr_added (idl_bool val);
+  bool ifr_added (void);
+  void ifr_added (bool val);
 
   const char *exprtype_to_string (void);
   // Returns the appropriate type.
@@ -134,7 +134,7 @@ protected:
   AST_Expression::ExprType pd_et;
   // Its expression type.
 
-  idl_bool ifr_added_;
+  bool ifr_added_;
   // Has this node been added to the IFR?
 };
 
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index ce6cedc495b..ae56c2b8201 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -77,6 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scoped_name.h"
 #include "idl_narrow.h"
 #include "ace/os_include/sys/os_types.h"
+#include "ace/SString.h"
 
 // This is for AIX w/IBM C++
 class Identifier;
@@ -95,13 +96,13 @@ class TAO_IDL_FE_Export COMMON_Base
 {
 public:
 
-  COMMON_Base (idl_bool local = I_FALSE,
-               idl_bool abstract = I_FALSE);
+  COMMON_Base (bool local = false,
+               bool abstract = false);
 
   virtual ~COMMON_Base (void) {}
 
-  virtual idl_bool is_local (void);
-  virtual idl_bool is_abstract (void);
+  virtual bool is_local (void);
+  virtual bool is_abstract (void);
 
   // A no-op, overridden in the child classes.
   virtual void destroy (void);
@@ -110,8 +111,8 @@ public:
   DEF_NARROW_METHODS0(COMMON_Base);
 
 protected:
-  idl_bool is_local_;
-  idl_bool is_abstract_;
+  bool is_local_;
+  bool is_abstract_;
 };
 
 class TAO_IDL_FE_Export AST_Decl : public virtual COMMON_Base
@@ -163,17 +164,17 @@ public:
 
   AST_Decl (NodeType type,
             UTL_ScopedName *n,
-            idl_bool anonymous = I_FALSE);
+            bool anonymous = false);
 
   virtual ~AST_Decl (void);
 
   // Data Accessors.
 
-  idl_bool imported (void);
-  void set_imported (idl_bool is_it);
+  bool imported (void);
+  void set_imported (bool is_it);
 
-  idl_bool in_main_file (void);
-  void set_in_main_file (idl_bool is_it);
+  bool in_main_file (void);
+  void set_in_main_file (bool is_it);
 
   UTL_Scope *defined_in (void);
   void set_defined_in (UTL_Scope *);
@@ -183,8 +184,8 @@ public:
   long line (void);
   void set_line (long l);
 
-  UTL_String *file_name (void);
-  void set_file_name (UTL_String *s);
+  ACE_CString file_name (void);
+  void set_file_name (ACE_CString s);
 
   UTL_ScopedName *name (void);
 
@@ -220,12 +221,12 @@ public:
   void version (char *value);
   // Accessors for the version_ member.
 
-  idl_bool anonymous (void) const;
-  void anonymous (idl_bool val);
+  bool anonymous (void) const;
+  void anonymous (bool val);
   // Accessors for the anonymous_ member.
 
-  idl_bool typeid_set (void) const;
-  void typeid_set (idl_bool val);
+  bool typeid_set (void) const;
+  void typeid_set (bool val);
   // Accessors for the typeid_set_ member.
 
   void set_id_with_typeid (char *value);
@@ -244,8 +245,8 @@ public:
   Identifier *original_local_name (void);
   void original_local_name (Identifier *);
 
-  idl_bool added (void);
-  void set_added (idl_bool is_it);
+  bool added (void);
+  void set_added (bool is_it);
 
   // Narrowing.
   DEF_NARROW_METHODS0(AST_Decl);
@@ -263,12 +264,12 @@ public:
   // Other operations
 
   // Return TRUE if "this" has "s" as an ancestor.
-  idl_bool has_ancestor (AST_Decl *s);
+  bool has_ancestor (AST_Decl *s);
 
   // Return TRUE if "this" is a child of "s".
-  idl_bool is_child (AST_Decl *s);
+  bool is_child (AST_Decl *s);
 
-  idl_bool is_nested (void);
+  bool is_nested (void);
   // Determines if we are inside of a nested scope or not.
 
   UTL_ScopedName *last_referenced_as (void) const;
@@ -310,10 +311,10 @@ protected:
 private:
   // Data
 
-  idl_bool pd_imported;
+  bool pd_imported;
   // Imported?
 
-  idl_bool pd_in_main_file;
+  bool pd_in_main_file;
   // Defined in main file?
 
   UTL_Scope *pd_defined_in;
@@ -325,7 +326,7 @@ private:
   long pd_line;
   // Line defined in.
 
-  UTL_String *pd_file_name;
+  ACE_CString pd_file_name;
   // What file defined in.
 
   UTL_ScopedName *pd_name;
@@ -336,7 +337,7 @@ private:
   Identifier *pd_original_local_name;
   // _cxx_ removed if any.
 
-  idl_bool pd_added;
+  bool pd_added;
   // Already added.
 
   char *full_name_;
@@ -348,10 +349,10 @@ private:
   char *version_;
   // Set by #pragma version.
 
-  idl_bool anonymous_;
+  bool anonymous_;
   // Are we an anonymous (no repo ID) type?
 
-  idl_bool typeid_set_;
+  bool typeid_set_;
   // Has our repo id been set by a typeId declaration?
 
   UTL_ScopedName *last_referenced_as_;
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index e563f48c217..9add0c75bc7 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -78,8 +78,8 @@ class TAO_IDL_FE_Export AST_Enum : public virtual AST_ConcreteType,
 public:
   AST_Enum (void);
   AST_Enum (UTL_ScopedName *n,
-            idl_bool local,
-            idl_bool abstract);
+            bool local,
+            bool abstract);
 
   virtual ~AST_Enum (void);
 
diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h
index 97c9bc35169..d1fe9509207 100644
--- a/TAO/TAO_IDL/include/ast_eventtype.h
+++ b/TAO/TAO_IDL/include/ast_eventtype.h
@@ -20,9 +20,9 @@ public:
                  AST_Interface **supports,
                  long n_supports,
                  AST_Interface *supports_concrete,
-                 idl_bool abstract,
-                 idl_bool truncatable,
-                 idl_bool custom);
+                 bool abstract,
+                 bool truncatable,
+                 bool custom);
 
   virtual ~AST_EventType (void);
 
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index 16b7f2d16a7..e6c5e52c77a 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -83,12 +83,12 @@ public:
   AST_Exception (void);
 
   AST_Exception (UTL_ScopedName *n,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   virtual ~AST_Exception (void);
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Check if we or the parameter node is in recursion.
 
   // Narrowing
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 390454145b9..f379f6cd1d6 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -167,7 +167,7 @@ public:
           unsigned short      usval;    // Contains unsigned short expr value.
           long                lval;     // Contains long expression value.
           unsigned long       ulval;    // Contains unsigned long expr value.
-          unsigned long       bval;     // Contains boolean expression value.
+          bool                bval;     // Contains boolean expression value.
 #if ! defined (ACE_LACKS_LONGLONG_T)
           ACE_CDR::LongLong   llval;   // Contains long long expr value.
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -205,8 +205,7 @@ public:
 
   AST_Expression (long l);
 
-  AST_Expression (long l,
-                  ExprType t);
+  AST_Expression (bool b);
 
   AST_Expression (unsigned long ul);
 
@@ -291,9 +290,9 @@ public:
 
 protected:
   // Evaluate different sets of operators.
-  AST_ExprValue *eval_bin_op (void);
+  AST_ExprValue *eval_bin_op (EvalKind ek);
 
-  AST_ExprValue *eval_mod_op (void);
+  AST_ExprValue *eval_mod_op (EvalKind ek);
 
   AST_ExprValue *eval_bit_op (EvalKind ek);
 
@@ -301,7 +300,7 @@ protected:
 
   AST_ExprValue *eval_symbol (EvalKind ek);
 
-  idl_bool type_mismatch (ExprType et);
+  bool type_mismatch (ExprType et);
 
 private:
   UTL_Scope *pd_defined_in;
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index e585686937b..b58e8ed493f 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -67,7 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_EXTERN_AST_EXTERN_HH
 #define _AST_EXTERN_AST_EXTERN_HH
 
-#include "idl_bool.h"
+
 
 class AST_Type;
 class AST_Decl;
@@ -81,8 +81,8 @@ class AST_Decl;
 
 extern void AST_record_fwd_decl (AST_Type *i);
 extern TAO_IDL_FE_Export void AST_check_fwd_decls (void);
-extern idl_bool AST_illegal_recursive_type (AST_Decl *t);
-extern idl_bool AST_illegal_interface_recursion (AST_Decl *t);
+extern bool AST_illegal_recursive_type (AST_Decl *t);
+extern bool AST_illegal_interface_recursion (AST_Decl *t);
 
 #endif           // _AST_EXTERN_AST_EXTERN_HH
 
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index b3604e4a00f..6d71b7be83b 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -109,15 +109,15 @@ public:
       long n_inherits,
       AST_Interface **inherits_flat,
       long n_inherits_flat,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a forward declaration of an interface.
   virtual AST_InterfaceFwd *create_interface_fwd (
       UTL_ScopedName *n,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a valuetype.
@@ -131,15 +131,15 @@ public:
       AST_Interface **supports,
       long n_supports,
       AST_Interface *supports_concrete,
-      idl_bool abstract,
-      idl_bool truncatable,
-      idl_bool custom
+      bool abstract,
+      bool truncatable,
+      bool custom
     );
 
   // Create a node representing a forward declaration of a valuetype.
   virtual AST_ValueTypeFwd *create_valuetype_fwd (
       UTL_ScopedName *n,
-      idl_bool abstract
+      bool abstract
     );
 
   // Create a node representing an eventtype.
@@ -153,15 +153,15 @@ public:
       AST_Interface **supports,
       long n_supports,
       AST_Interface *supports_concrete,
-      idl_bool abstract,
-      idl_bool truncatable,
-      idl_bool custom
+      bool abstract,
+      bool truncatable,
+      bool custom
     );
 
   // Create a node representing a forward declaration of an eventtype.
   virtual AST_EventTypeFwd *create_eventtype_fwd (
       UTL_ScopedName *n,
-      idl_bool abstract
+      bool abstract
     );
 
   // Create a node representing a component.
@@ -194,15 +194,15 @@ public:
   // Create a node representing an exception.
   virtual AST_Exception *create_exception (
       UTL_ScopedName *n,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a structure.
   virtual AST_Structure *create_structure (
       UTL_ScopedName *n,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a forward declaration of a structure.
@@ -210,16 +210,16 @@ public:
 
   // Create a node representing an enum.
   virtual AST_Enum *create_enum (UTL_ScopedName *n,
-                                 idl_bool local,
-                                 idl_bool abstract);
+                                 bool local,
+                                 bool abstract);
 
   // Create a node representing an operation on an interface.
   virtual AST_Operation *create_operation (
       AST_Type *rt,
       AST_Operation::Flags fl,
       UTL_ScopedName *n,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a field in a structure, exception or
@@ -238,18 +238,18 @@ public:
 
   // Create a node representing an attribute.
   virtual AST_Attribute *create_attribute (
-      idl_bool ro,
+      bool ro,
       AST_Type *ft,
       UTL_ScopedName *n,
-      idl_bool local,
-      idl_bool abstract
+      bool local,
+      bool abstract
     );
 
   // Create a node representing a union.
   virtual AST_Union *create_union (AST_ConcreteType *dt,
                                    UTL_ScopedName *n,
-                                   idl_bool local,
-                                   idl_bool abstract);
+                                   bool local,
+                                   bool abstract);
 
   // Create a node representing a forward declaration of a union.
   virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n);
@@ -284,8 +284,7 @@ public:
 
   virtual AST_Expression *create_expr (long v);
 
-  virtual AST_Expression *create_expr (long v,
-                                       AST_Expression::ExprType t);
+  virtual AST_Expression *create_expr (bool b);
 
   virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
@@ -308,15 +307,15 @@ public:
   virtual AST_Array *create_array (UTL_ScopedName *n,
                                    unsigned long ndims,
                                    UTL_ExprList *dims,
-                                   idl_bool local,
-                                   idl_bool abstract);
+                                   bool local,
+                                   bool abstract);
 
   // Create a node representing a sequence type.
   virtual AST_Sequence *create_sequence (AST_Expression *v,
                                          AST_Type *bt,
                                          UTL_ScopedName *n,
-                                         idl_bool local,
-                                         idl_bool abstract);
+                                         bool local,
+                                         bool abstract);
 
   // Create a node representing a string type.
   virtual AST_String *create_string (AST_Expression *v);
@@ -327,8 +326,8 @@ public:
   // Create a node representing a type renaming (typedef).
   virtual AST_Typedef*create_typedef (AST_Type *bt,
                                       UTL_ScopedName *n,
-                                      idl_bool local,
-                                      idl_bool abstract);
+                                      bool local,
+                                      bool abstract);
 
   // Create a node representing a native.
   virtual AST_Native *create_native (UTL_ScopedName *n);
diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h
index 1bf5818b68c..02456b18065 100644
--- a/TAO/TAO_IDL/include/ast_home.h
+++ b/TAO/TAO_IDL/include/ast_home.h
@@ -29,18 +29,18 @@ public:
 
   // Extend lookup to the base home.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
+                                       bool treat_as_ref);
 
   // Extend lookup to the supported interfaces.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-                                       
+                                       bool treat_as_ref);
+
   // Accessors.
 
   AST_Home *base_home (void) const;
 
   AST_Interface **supports (void) const;
-  
+
   long n_supports (void) const;
 
   AST_Component *managed_component (void) const;
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 913743ba7f9..a173d6d05d6 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -86,8 +86,8 @@ public:
                  long nih,
                  AST_Interface **ih_flat,
                  long nih_flat,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   virtual ~AST_Interface (void);
 
@@ -109,7 +109,7 @@ public:
   ACE_Unbounded_Queue<AST_Interface *> &get_insert_queue (void);
   ACE_Unbounded_Queue<AST_Interface *> &get_del_queue (void);
 
-  void be_add_operation (AST_Operation *);
+  AST_Operation *be_add_operation (AST_Operation *);
 
   void be_replace_operation (AST_Decl *old_op,
                              AST_Decl *new_op);
@@ -117,23 +117,23 @@ public:
   // Is this interface defined? This predicate returns FALSE when an
   // interface was forward declared but not defined yet, and TRUE in
   // all other cases.
-  idl_bool is_defined (void)
+  bool is_defined (void)
   {
-    return (pd_n_inherits < 0) ? I_FALSE : I_TRUE;
+    return (pd_n_inherits < 0) ? false : true;
   }
 
   // Check if we have redefined any of our parents' operations or attributes,
   // and check if there is such a clash among the parents
-  virtual idl_bool redef_clash (void);
-  
+  virtual bool redef_clash (void);
+
   // Accessors for the member.
-  idl_bool home_equiv (void) const;
-  void home_equiv (idl_bool val);
+  bool home_equiv (void) const;
+  void home_equiv (bool val);
 
   // Look through inherited interfaces.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       idl_bool treat_as_ref);
-                                       
+                                       bool treat_as_ref);
+
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
@@ -178,9 +178,9 @@ protected:
 
   // Queue of dequeued nodes to be searched for the above case.
   ACE_Unbounded_Queue<AST_Interface *> del_queue;
-  
+
   // Are we the equivalent interface of a home?
-  idl_bool home_equiv_;
+  bool home_equiv_;
 
 protected:
   // Scope Management Protocol.
@@ -216,7 +216,7 @@ protected:
   // Lookup based on the local name, override of UTL_Scope definition.
   // This version checks for redefinitions of attributes or operations.
   AST_Decl *lookup_for_add (AST_Decl *d,
-                            idl_bool treat_as_ref);
+                            bool treat_as_ref);
 
   void redef_clash_populate_r (AST_Interface *t);
   // Populate the insert queue with our parents, and, if we are a
@@ -224,7 +224,7 @@ protected:
   // supported interfaces.
 
   int insert_non_dup (AST_Interface *t,
-                      idl_bool abstract_paths_only = I_FALSE);
+                      bool abstract_paths_only = false);
   // Do non-duplicating insert of bi, by searching both the
   // insert queue and the delete queue.
 };
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index dd7db4a8060..10490254d1d 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -86,11 +86,11 @@ public:
   AST_Interface *full_definition (void);
   void set_full_definition (AST_Interface *nfd);
 
-  virtual idl_bool is_defined (void);
+  virtual bool is_defined (void);
 
-  virtual idl_bool is_local (void);
-  virtual idl_bool is_valuetype (void);
-  virtual idl_bool is_abstract_valuetype (void);
+  virtual bool is_local (void);
+  virtual bool is_valuetype (void);
+  virtual bool is_abstract_valuetype (void);
 
   // Cleanup function.
   virtual void destroy (void);
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index e220bb8579f..62afe2b1ff1 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -100,7 +100,7 @@ public:
 
   // Involved in OBV_ namespace generation.
   void set_has_nested_valuetype (void);
-  idl_bool has_nested_valuetype (void);
+  bool has_nested_valuetype (void);
 
   // Allows adding an interface to a later point
   // The interface i is inserted after interface ix, if
@@ -110,7 +110,7 @@ public:
 
   // Has this node been referenced here already?
   // Override of method in UTL_Scope.
-  virtual idl_bool referenced (AST_Decl *e,
+  virtual bool referenced (AST_Decl *e,
                                Identifier *id = 0);
 
   // Add decls from previous opening of this module to the
@@ -181,7 +181,7 @@ private:
 
   virtual AST_ValueBox *fe_add_valuebox (AST_ValueBox *vb);
 
-  idl_bool pd_has_nested_valuetype;
+  bool pd_has_nested_valuetype;
 
   ACE_Unbounded_Set<AST_Decl *> previous_;
   // Container for declaration from previous openings of this module.
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index e3716c3947c..95f38818309 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -90,8 +90,8 @@ public:
   AST_Operation (AST_Type *return_type,
                  Flags flags,
                  UTL_ScopedName *n,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   // Destructor.
   virtual ~AST_Operation (void);
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index 0da4d06d455..2bdcfb4c264 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _AST_SEQUENCE_AST_SEQUENCE_HH
 
 #include "ast_concrete_type.h"
-#include "idl_bool.h"
+
 
 class AST_Expression;
 class AST_Type;
@@ -83,12 +83,12 @@ public:
   AST_Sequence (AST_Expression *max_size,
                 AST_Type *bt,
                 UTL_ScopedName *n,
-                idl_bool local,
-                idl_bool abstract);
+                bool local,
+                bool abstract);
 
   virtual ~AST_Sequence (void);
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
 
   // Data Accessors.
@@ -96,7 +96,7 @@ public:
 
   AST_Type *base_type (void) const;
 
-  virtual idl_bool unbounded (void) const;
+  virtual bool unbounded (void) const;
   // Is this sequence bounded or not.
 
   // Recursively called on valuetype to check for legal use as
@@ -122,7 +122,7 @@ private:
   AST_Type *pd_base_type;
   // Sequence base type.
 
-  idl_bool unbounded_;
+  bool unbounded_;
   // Whether we are bounded or unbounded.
 };
 
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index 1ff0d431aed..98d228d833c 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -88,13 +88,13 @@ public:
   AST_Structure (void);
 
   AST_Structure (UTL_ScopedName *n,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   AST_Structure (AST_Decl::NodeType nt,
                  UTL_ScopedName *n,
-                 idl_bool local,
-                 idl_bool abstract);
+                 bool local,
+                 bool abstract);
 
   virtual ~AST_Structure (void);
 
@@ -120,10 +120,10 @@ public:
                      size_t slot) const;
   // Get an individual field node.
 
-  virtual idl_bool is_local (void);
+  virtual bool is_local (void);
   // Overwrite the is_local method.
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
 
   virtual int contains_wstring (void);
@@ -132,7 +132,7 @@ public:
   // Is this struct or union defined? This predicate returns FALSE when a
   // forward declaration is not defined yet, and TRUE in
   // all other cases.
-  idl_bool is_defined (void)
+  bool is_defined (void)
   {
     return this->size_type () != AST_Type::SIZE_UNKNOWN;
   }
@@ -181,7 +181,7 @@ private:
   int member_count_;
   // Number of members.
 
-  idl_bool local_struct_;
+  int local_struct_;
   // We also need to determine whether we contain any local type.
 };
 
diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h
index c447182c240..031b46ab61b 100644
--- a/TAO/TAO_IDL/include/ast_structure_fwd.h
+++ b/TAO/TAO_IDL/include/ast_structure_fwd.h
@@ -23,7 +23,7 @@ public:
   AST_Structure *full_definition (void);
   void set_full_definition (AST_Structure *nfd);
 
-  virtual idl_bool is_defined (void);
+  virtual bool is_defined (void);
 
   // Cleanup function.
   virtual void destroy (void);
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index 97c275bcbe6..e7c5967b92b 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -97,14 +97,14 @@ public:
 
   virtual ~AST_Type (void);
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Determine if we are involved in some kind of limited recursion.
   // Most types cannot be involved except structs and unions.
   // If the parameter is 0, we are trying to determine this for ourselves.
 
   // To be overridden by the subclasses interface, struct, union, and
   // the corresponding forward declaration classes.
-  virtual idl_bool is_defined (void);
+  virtual bool is_defined (void);
 
   virtual void size_type (SIZE_TYPE);
   // Set the size type.
@@ -114,26 +114,26 @@ public:
 
   // Accessors/mutators for the private members.
 
-  idl_bool has_constructor (void);
+  bool has_constructor (void);
   // Accessor for protected member.
 
-  void has_constructor (idl_bool value);
+  void has_constructor (bool value);
   // Mutator for protected member.
 
-  idl_bool ifr_added (void);
-  void ifr_added (idl_bool val);
+  bool ifr_added (void);
+  void ifr_added (bool val);
 
-  idl_bool ifr_fwd_added (void);
-  void ifr_fwd_added (idl_bool val);
+  bool ifr_fwd_added (void);
+  void ifr_fwd_added (bool val);
 
   const char *nested_type_name (AST_Decl *d,
                                 const char *suffix = 0,
                                 const char *prefix = 0);
   // Type name of a node used when generating declarations.
-  
+
   AST_Type *unaliased_type (void);
   // Utility function to make sure we are using the unaliased type.
-  
+
   virtual bool legal_for_primary_key (void) const;
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
@@ -159,30 +159,30 @@ protected:
                            const char *suffix,
                            const char *prefix);
   // Type name of a node used when generating declarations.
-  
-  idl_bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list);
-  
+
+  bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list);
+
 protected:
   // Has the full definition been added to the Interface Repository?
   // Used for types which can have members and can be forward declared.
-  idl_bool ifr_added_;
+  bool ifr_added_;
 
   // Has this node been forward declared in this IDL file?
-  idl_bool ifr_fwd_added_;
+  bool ifr_fwd_added_;
 
   SIZE_TYPE size_type_;
   // Whether we are fixed or variable size (by default fixed).
 
-  idl_bool has_constructor_;
+  bool has_constructor_;
   // Attribute that helps a union determine whether a member
   // should be included by value or by reference.
 
   char *nested_type_name_;
   // For the corresponding method.
-  
+
   long in_recursion_;
   // Storage once the value has been computed.
-  
+
   mutable bool recursing_in_legal_pk_;
   // Node-specific flag to abort recursion in legal_for_primary_key().
 };
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index 073715168c5..e1fddbea1e5 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -82,8 +82,8 @@ public:
 
   AST_Typedef (AST_Type *base_type,
                UTL_ScopedName *n,
-               idl_bool local,
-               idl_bool abstract);
+               bool local,
+               bool abstract);
 
   virtual ~AST_Typedef (void);
 
@@ -93,7 +93,7 @@ public:
 
   // Data Accessors.
   AST_Type *base_type (void) const;
-  
+
   virtual bool legal_for_primary_key (void) const;
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index fdc784341fc..e412e49ea60 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -87,8 +87,8 @@ public:
 
   AST_Union (AST_ConcreteType *disc_type,
              UTL_ScopedName *n,
-             idl_bool local,
-             idl_bool abstract);
+             bool local,
+             bool abstract);
 
   // Destructor.
   virtual ~AST_Union (void);
@@ -96,7 +96,7 @@ public:
   // This also calls the base class version.
   virtual void redefine (AST_Structure *from);
 
-  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the parameter node involved in some kind of recursion?
 
   // Data Accessors.
@@ -116,7 +116,7 @@ public:
     {
       char char_val;
       ACE_CDR::WChar wchar_val;
-      unsigned long bool_val;
+      bool bool_val;
       ACE_INT16 short_val;
       ACE_UINT16 ushort_val;
       ACE_INT32 long_val;
@@ -185,7 +185,7 @@ private:
   virtual AST_Enum *fe_add_enum (AST_Enum *e);
 
   virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
-  
+
   virtual int compute_default_value (void);
   // Compute the default value (if any).
 
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index 8e787eed3f6..8283d388664 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -20,9 +20,9 @@ public:
                  AST_Interface **supports,
                  long n_supports,
                  AST_Interface *supports_concrete,
-                 idl_bool abstract,
-                 idl_bool truncatable,
-                 idl_bool custom);
+                 bool abstract,
+                 bool truncatable,
+                 bool custom);
 
   virtual ~AST_ValueType (void);
 
@@ -37,16 +37,16 @@ public:
 
   AST_Interface *supports_concrete (void) const;
 
-  idl_bool truncatable (void) const;
-  idl_bool custom (void) const;
+  bool truncatable (void) const;
+  bool custom (void) const;
 
-  virtual idl_bool will_have_factory (void);
+  virtual bool will_have_factory (void);
   // Called from y.tab.cpp to set the factory decl seen bit.
 
   // Look up a scoped name in the supported interface list.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       idl_bool treat_as_ref);
-                                       
+                                       bool treat_as_ref);
+
   // Recursively called on valuetype to check for legal use as
   // a primary key. Overridden for valuetype, struct, sequence,
   // union, array, typedef, and interface.
@@ -72,8 +72,8 @@ protected:
   AST_ValueType *pd_inherits_concrete;
   AST_Interface *pd_supports_concrete;
 
-  idl_bool pd_truncatable;
-  idl_bool pd_custom;
+  bool pd_truncatable;
+  bool pd_custom;
 
 protected:
   virtual AST_Factory *fe_add_factory (AST_Factory *f);
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
index 7467e0d282f..181d9fd5604 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -81,4 +81,7 @@ extern void DRV_cpp_putarg (const char *str);
 extern void DRV_cpp_new_location (const char *new_loc);
 extern void DRV_get_orb_idl_includes (void);
 
+// Not used by all backends.
+extern void DRV_push_file (const char *s);
+
 #endif           // _DRV_EXTERN_DRV_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index 2784321974b..a3ecb1d9e9c 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -89,9 +89,9 @@ class TAO_IDL_FE_Export FE_InterfaceHeader
 public:
   FE_InterfaceHeader (UTL_ScopedName *n,
                       UTL_NameList *inherits,
-                      idl_bool is_local,
-                      idl_bool is_abstract,
-                      idl_bool compile_now);
+                      bool is_local,
+                      bool is_abstract,
+                      bool compile_now);
 
   virtual ~FE_InterfaceHeader (void);
 
@@ -102,12 +102,15 @@ public:
   AST_Interface **inherits_flat (void) const;
   long n_inherits_flat (void) const;
 
-  idl_bool is_local (void) const;
+  bool is_local (void) const;
   // See if we are a local interface.
 
-  idl_bool is_abstract (void) const;
+  bool is_abstract (void) const;
   // See if we are an abstract interface.
 
+  void destroy (void);
+  // Destroy anything allocated for this class.
+
   // Data.
 protected:
   UTL_ScopedName *pd_interface_name;
@@ -120,8 +123,8 @@ protected:
   AST_Interface  **pd_inherits_flat;
   long pd_n_inherits_flat;
 
-  idl_bool pd_is_local;
-  idl_bool pd_is_abstract;
+  bool pd_is_local;
+  bool pd_is_abstract;
 
   // Operations.
 
@@ -129,24 +132,24 @@ protected:
   // interface inherits from.
 protected:
   void compile_inheritance (UTL_NameList *ifaces,
-                            idl_bool for_valuetype);
+                            bool for_valuetype);
 
   void compile_one_inheritance (AST_Interface *i);
 
   // Called from compile_inheritance().
   int check_inherit (AST_Interface *i,
-                     idl_bool for_valuetype);
+                     bool for_valuetype);
 };
 
 class TAO_IDL_FE_Export FE_OBVHeader : public FE_InterfaceHeader
 {
 public:
 
-  FE_OBVHeader (UTL_ScopedName *n, 
-                UTL_NameList *inherits, 
+  FE_OBVHeader (UTL_ScopedName *n,
+                UTL_NameList *inherits,
                 UTL_NameList *supports,
-                idl_bool truncatable,
-                idl_bool is_eventtype = I_FALSE);
+                bool truncatable,
+                bool is_eventtype = false);
   virtual ~FE_OBVHeader (void);
 
   // Data Accessors.
@@ -154,7 +157,7 @@ public:
   long n_supports (void) const;
   AST_ValueType *inherits_concrete (void) const;
   AST_Interface *supports_concrete (void) const;
-  idl_bool truncatable (void) const;
+  bool truncatable (void) const;
 
 protected:
   // Supported interfaces.
@@ -165,38 +168,38 @@ protected:
   AST_Interface *pd_supports_concrete;
 
   // Currently ignored.
-  idl_bool pd_truncatable;
+  bool pd_truncatable;
 
 protected:
   void compile_inheritance (UTL_NameList *vtypes,
-                            idl_bool is_eventtype);
+                            bool is_eventtype);
   void compile_supports (UTL_NameList *supports);
-  idl_bool check_concrete_supported_inheritance (AST_Interface *d);
+  bool check_concrete_supported_inheritance (AST_Interface *d);
 };
 
 class TAO_IDL_FE_Export FE_EventHeader : public FE_OBVHeader
 {
 public:
 
-  FE_EventHeader (UTL_ScopedName *n, 
-                  UTL_NameList *inherits, 
+  FE_EventHeader (UTL_ScopedName *n,
+                  UTL_NameList *inherits,
                   UTL_NameList *supports,
-                  idl_bool truncatable);
+                  bool truncatable);
   virtual ~FE_EventHeader (void);
 };
 
 // Unlike value types, a component's supported interfaces are simply
 // added to the inheritance list in generated code, so we use the
-// existing base class mechanism for managing the inheritance list 
+// existing base class mechanism for managing the inheritance list
 // to manage the derived class's supported interface list.
 class TAO_IDL_FE_Export FE_ComponentHeader : public FE_InterfaceHeader
 {
 public:
 
-  FE_ComponentHeader (UTL_ScopedName *n, 
-                      UTL_ScopedName *base_component, 
+  FE_ComponentHeader (UTL_ScopedName *n,
+                      UTL_ScopedName *base_component,
                       UTL_NameList *supports,
-                      idl_bool compile_now);
+                      bool compile_now);
   virtual ~FE_ComponentHeader (void);
 
   // Data Accessors.
@@ -205,7 +208,7 @@ public:
   long n_supports (void) const;
   AST_Interface **supports_flat (void) const;
   long n_supports_flat (void) const;
-  
+
 protected:
   void compile_inheritance (UTL_ScopedName *base_component);
   void compile_supports (UTL_NameList *supports);
@@ -223,8 +226,8 @@ class TAO_IDL_FE_Export FE_HomeHeader : public FE_ComponentHeader
 {
 public:
 
-  FE_HomeHeader (UTL_ScopedName *n, 
-                 UTL_ScopedName *base_home, 
+  FE_HomeHeader (UTL_ScopedName *n,
+                 UTL_ScopedName *base_home,
                  UTL_NameList *supports,
                  UTL_ScopedName *managed_component,
                  UTL_ScopedName *primary_key);
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
index dce69d00c37..1f10dabf63e 100644
--- a/TAO/TAO_IDL/include/global_extern.h
+++ b/TAO/TAO_IDL/include/global_extern.h
@@ -69,7 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "TAO_IDL_FE_Export.h"
 #include "idl_global.h"
-#include "idl_bool.h"
+
 
 class AST_Decl;
 
@@ -82,6 +82,6 @@ extern TAO_IDL_FE_Export IDL_GlobalData *idl_global;
 
 // Return TRUE when the name of this AST_Decl can be reused in
 // a definition in this scope
-extern idl_bool can_be_redefined (AST_Decl *);
+extern bool can_be_redefined (AST_Decl *);
 
 #endif           // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h
deleted file mode 100644
index b7356d80247..00000000000
--- a/TAO/TAO_IDL/include/idl_bool.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-*/
-
-#ifndef _IDL_BOOL_IDL_BOOL_HH
-#define _IDL_BOOL_IDL_BOOL_HH
-
-/*
- * This is interim. When porting to a new platform, this file will be
- * modified to incorporate definitions for the boolean type suitable
- * for the new platform.
- */
-
-#ifndef I_TRUE
-#define I_TRUE  1
-#endif
-
-#ifndef I_FALSE
-#define I_FALSE 0
-#endif
-
-typedef long idl_bool;
-
-#endif           // _IDL_BOOL_IDL_BOOL_HH
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 405c0dd0b35..a1914105d42 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -73,7 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Containers_T.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
-#include "idl_bool.h"
+
 #include "ast_expression.h"
 #include "ast_predefined_type.h"
 #include "ast_component.h"
@@ -306,6 +306,7 @@ public:
   bool short_seq_seen_;
   bool special_basic_arg_seen_;
   bool string_seen_;
+  bool string_member_seen_;
   bool string_seq_seen_;
   bool typecode_seen_;
   bool ub_string_arg_seen_;
@@ -322,6 +323,9 @@ public:
   bool wchar_seq_seen_;
   bool wstring_seq_seen_;
 
+  // flag to force generation of skeleton includes (see bug #2419).
+  bool need_skeleton_includes_;
+
   // Constructor
   IDL_GlobalData (void);
   // Destructor
@@ -364,12 +368,12 @@ public:
   virtual UTL_String       *stripped_filename (void);   // Stripped filename
   virtual void             set_stripped_filename (UTL_String *);  // Set it
 
-  virtual idl_bool         imported (void);             // Are we imported?
-  virtual idl_bool         import (void);               // Is import on?
-  virtual void             set_import (idl_bool);       // Set it
+  virtual bool             imported (void);             // Are we imported?
+  virtual bool             import (void);               // Is import on?
+  virtual void             set_import (bool);       // Set it
 
-  virtual idl_bool         in_main_file (void);         // Are we?
-  virtual void             set_in_main_file (idl_bool); // Set it
+  virtual bool             in_main_file (void);         // Are we?
+  virtual void             set_in_main_file (bool); // Set it
 
   virtual const char       *prog_name (void);           // Invoked as..
   virtual void             set_prog_name (const char *);  // Set it
@@ -413,7 +417,7 @@ public:
   // FE calls when #pragma DCPS_DATA_TYPE is processed
   virtual void add_dcps_data_type(const char* id);
   // FE calls when #pragma DCPS_DATA_KEY is processed
-  virtual idl_bool add_dcps_data_key(const char* id, const char* key);
+  virtual bool add_dcps_data_key(const char* id, const char* key);
   // returns null if not matching; otherwise pointer to the info
   virtual DCPS_Data_Type_Info* is_dcps_type(UTL_ScopedName* target);
 
@@ -481,17 +485,17 @@ public:
   virtual const char *ident_string (void) const;
   // Get the value of the #ident string.
 
-  virtual void case_diff_error (idl_bool);
+  virtual void case_diff_error (bool);
   // report an error (1) for indentifiers in the same scope
   // that differ only by case, or report a warning (0).
 
-  virtual idl_bool case_diff_error (void);
+  virtual bool case_diff_error (void);
   // are we strict about case-only differences or not?
 
-  virtual void nest_orb (idl_bool);
+  virtual void nest_orb (bool);
   // Set on or off whether we are using the NEST ORB.
 
-  virtual idl_bool nest_orb (void);
+  virtual bool nest_orb (void);
   // are we beIng used with the NEST ORB?
 
   virtual void destroy (void);
@@ -523,8 +527,8 @@ public:
   void last_seen_index (long val);
   // Accessors for last_seen_index_ member.
 
-  idl_bool repeat_include (void) const;
-  void repeat_include (idl_bool val);
+  bool repeat_include (void) const;
+  void repeat_include (bool val);
   // Accessors for repeat_include_ member.
 
   const char *stripped_preproc_include (const char *name);
@@ -532,12 +536,12 @@ public:
   // strips off any command line -I prefix that may have been
   // prepended.
 
-  virtual idl_bool preserve_cpp_keywords (void);
+  virtual bool preserve_cpp_keywords (void);
   // Whether we should not mung idl element names that are
   // C++ keywords e.g. delete, operator etc. with _cxx_ prefix.
   // Should be true when being used by the IFR Service
 
-  virtual void preserve_cpp_keywords (idl_bool);
+  virtual void preserve_cpp_keywords (bool);
   // Set whether we should not mung idl element names that are C++
   // keywords e.g. delete, operator etc. with _cxx_ prefix.
   // Is set by the IFR Service.
@@ -549,8 +553,8 @@ public:
   file_prefixes (void);
   // Accessor for the IDL file prefix container.
 
-  idl_bool pass_orb_idl (void) const;
-  void pass_orb_idl (idl_bool val);
+  bool pass_orb_idl (void) const;
+  void pass_orb_idl (bool val);
   // Accessor for the pass_orb_idl_ member.
 
   bool using_ifr_backend (void) const;
@@ -574,19 +578,23 @@ public:
 
   int path_cmp (const char *s, const char *t);
   // Case insensitive for Windows, otherwise not.
-  
+
   bool hasspace (const char *s);
   // To tell if we have to handle a Windows path with spaces.
-  
+
   ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (void);
   // Accessor for the member.
-  
+
   void check_primary_keys (void);
   // Called affer yy_parse() returns - iterates over our list
   // of primary keys. Must be called this late so that we can
   // be sure that all forward declared stucts or unions that
   // might be used in such a valuetype are fully defined.
 
+  const char *recursion_start (void) const;
+  void recursion_start (const char *val);
+  // Accessors for the member.
+
 private:
   // Data
   UTL_ScopeStack             pd_scopes;              // Store scopes stack
@@ -600,8 +608,8 @@ private:
   UTL_String                 *pd_main_filename;      // What main filename
   UTL_String                 *pd_real_filename;      // What real filename
   UTL_String                 *pd_stripped_filename;  // Stripped filename
-  idl_bool                   pd_import;              // Is import on?
-  idl_bool                   pd_in_main_file;        // Are we in it?
+  bool                   pd_import;              // Is import on?
+  bool                   pd_in_main_file;        // Are we in it?
   const char                 *pd_prog_name;          // Argv[0]
   const char                 *pd_cpp_location;       // Where to find CPP
   long                       pd_compile_flags;       // Compile flags
@@ -640,11 +648,11 @@ private:
   // Holds a string that begins with #ident, to be passed from the IDL
   // file to the generated files.
 
-  idl_bool case_diff_error_;
+  bool case_diff_error_;
   // Do we report an error for indentifiers in the same scope that differ
   // only by case? or just a warning?
 
-  idl_bool nest_orb_;
+  bool nest_orb_;
   // Is this front end being used for the NEST ORB?
 
   ACE_CString idl_flags_;
@@ -656,10 +664,10 @@ private:
   ACE_Unbounded_Stack<char *> pragma_prefixes_;
   // Container for all the #pragma prefix declarations.
 
-  idl_bool repeat_include_;
+  bool repeat_include_;
   // Has this IDL file been included before?
 
-  idl_bool preserve_cpp_keywords_;
+  bool preserve_cpp_keywords_;
   // Do we allow C++ keywords as identifiers in the idl to stay as they are ?
 
   ACE_Unbounded_Queue<char *> include_paths_;
@@ -668,7 +676,7 @@ private:
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_;
   // Associates a prefix with a file.
 
-  idl_bool pass_orb_idl_;
+  bool pass_orb_idl_;
   // Treat orb.idl like any other included IDL file.
 
   bool using_ifr_backend_;
@@ -679,9 +687,13 @@ private:
   // we don't want to try to generate another event consumer.
   DCPS_Type_Info_Map dcps_type_info_map_ ;
   // Map of #pragma DCPS_DATA_TYPE and DCPS_DATA_KEY infomation.
-  
+
   ACE_Unbounded_Queue<AST_ValueType *>primary_keys_;
   // List of valuetypes used as a primary key.
+
+  char *recursion_start_;
+  // Path to directory subtree we are iterating/recursing over.
+  // Not used by all backends.
 };
 
 
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
index 769256dde2d..57742738473 100644
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ b/TAO/TAO_IDL/include/utl_identifier.h
@@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
 
 #include "TAO_IDL_FE_Export.h"
-#include "idl_bool.h"
+
 #include "ace/iosfwd.h"
 
 class TAO_IDL_FE_Export Identifier
@@ -91,19 +91,19 @@ public:
   void replace_string (const char * s);
   // Replace the underlying string and free the old one.
 
-  long compare (Identifier *other);
+  bool compare (Identifier *other);
   // Compare with other Identifier.
 
-  long case_compare (Identifier *other);
+  bool case_compare (Identifier *other);
   // Also check for case-only difference.
 
-  long case_compare_quiet (Identifier *other);
+  bool case_compare_quiet (Identifier *other);
   // Like the above but suppressing error or warning I/O
 
   Identifier *copy (void);
   // Create a deep copy.
 
-  idl_bool escaped (void) const;
+  bool escaped (void) const;
   // Accessor for the member.
 
   virtual void dump (ACE_OSTREAM_TYPE &o);
@@ -117,7 +117,7 @@ private:
     char *pv_string;
 
     // Did the IDL string have a leading underscore?
-    idl_bool escaped_;
+    bool escaped_;
 };
 
 #endif          // _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index ac4f9c34f72..3e88833bc7b 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -76,7 +76,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 //       public virtual inheritance.
 
 #include "TAO_IDL_FE_Export.h"
-#include "idl_bool.h"
+
 
 // Forward declare active iterator for UTL_List.
 class  UTL_ListActiveIterator;
@@ -130,7 +130,7 @@ public:
   virtual void next (void);
 
   // Are we at the end of this list?
-  virtual idl_bool is_done (void);
+  virtual bool is_done (void);
 
 protected:
   // On what to iterate?
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
index db5c5ed465d..5ab4995f3e0 100644
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_namelist.h
@@ -80,22 +80,22 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export UTL_NameList : public UTL_List
 {
 public:
-  UTL_NameList (UTL_ScopedName *s, 
+  UTL_NameList (UTL_ScopedName *s,
                 UTL_NameList *cdr);
 
   // Get list item.
   UTL_ScopedName *head (void);
 
   // Accessors.
-  idl_bool truncatable (void) const;
-  void truncatable (idl_bool val);
+  bool truncatable (void) const;
+  void truncatable (bool val);
 
 private:
   // List item.
   UTL_ScopedName *pd_car_data;
 
   // Used only with valuetye inheritance list. Defualts to 0.
-  idl_bool pd_truncatable;
+  bool pd_truncatable;
 };
 
 // Active iterator for UTL_NameList.
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 81e53e1265e..6e22b9a986c 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -229,8 +229,8 @@ public:
 
   // Name Lookup Mechanism
   AST_Decl *lookup_by_name (UTL_ScopedName *,
-                            idl_bool treat_as_ref,
-                            idl_bool in_parent = 1);
+                            bool treat_as_ref,
+                            bool in_parent = 1);
 
   // Look up the Identifier * specified only in the local scope.
   AST_Decl *lookup_by_name_local (Identifier *,
@@ -261,8 +261,8 @@ public:
   void add_to_name_referenced (Identifier *id);
 
   // Accessors for the has_prefix_ member.
-  idl_bool has_prefix (void);
-  void has_prefix (idl_bool val);
+  bool has_prefix (void);
+  void has_prefix (bool val);
 
   // Cleanup function.
   virtual void destroy (void);
@@ -289,37 +289,37 @@ protected:
   // If ex is not 0 'e' will be inserted at the position
   // after ex, which is already in the list.
   void add_to_referenced (AST_Decl *e,
-                          idl_bool recursive,
+                          bool recursive,
                           Identifier *id,
                           AST_Decl *ex = 0);
-                          
+
   // Add to local types. Node represents a local manifest type.
   void add_to_local_types (AST_Decl *e);
 
   // Has this node been referenced here already?
-  virtual idl_bool referenced (AST_Decl *e,
+  virtual bool referenced (AST_Decl *e,
                                Identifier *id = 0);
 
   // Look up a scoped name in the inherited list.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *,
-                                       idl_bool treat_as_ref);
-                                       
+                                       bool treat_as_ref);
+
   // Look up a scoped name in the supported interface list.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       idl_bool treat_as_ref);
-                                       
+                                       bool treat_as_ref);
+
   // Lookup based on the local name.
   AST_Decl *lookup_for_add (AST_Decl *d,
-                            idl_bool treat_as_ref);
+                            bool treat_as_ref);
 
   // Is there a (case-insensitive) clash between a local name
   // and an IDL keyword?
   int idl_keyword_clash (Identifier *e);
 
   // Checks for modules, or defns of forward declared struct or unions.
-  idl_bool redef_clash (AST_Decl::NodeType new_nt,
+  bool redef_clash (AST_Decl::NodeType new_nt,
                         AST_Decl::NodeType scope_elem_nt);
-                        
+
   void check_for_predef_seq (AST_Decl *d);
   // Set the appropriate *_seen_ flag if we are seeing a spec-defined
   // sequence of a basic type.
@@ -354,7 +354,7 @@ protected:
   long pd_name_referenced_used;       // How many used?
 
   // Have we seen a #pragma prefix declaration in this scope?
-  idl_bool has_prefix_;
+  bool has_prefix_;
 
   // Friend class UTL_ScopeActiveIterator defines active iterator for
   // UTL_Scope. Definition follows below.
@@ -450,7 +450,7 @@ public:
   AST_Decl *item (void);
 
   // Have we iterated over entire scope?
-  idl_bool is_done (void);
+  bool is_done (void);
 
   // What kind of iterator is this?
   UTL_Scope::ScopeIterationKind iteration_kind (void);
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 2b98d823525..ff470c900ae 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _STRING_STRING_HH
 
 #include "TAO_IDL_FE_Export.h"
-#include "idl_bool.h"
+
 #include "ace/iosfwd.h"
   /* Basic_Types.h are needed in QNX for size_t type. */
 #include "ace/Basic_Types.h"
@@ -98,7 +98,7 @@ public:
   // Get canonical representation. This is (implemented as) the all upper
   // case corresponding string.
 
-  idl_bool compare (UTL_String *s);
+  bool compare (UTL_String *s);
   // Compare two UTL_String *
 
   long compare_quiet (UTL_String *s);
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
index 8fee4504360..ea4f418a276 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
@@ -79,7 +79,7 @@
 #include        "utl_identifier.h"
 #include        "utl_string.h"
 #include        "ast_expression.h"
-#include        "idl_bool.h"
+#include        "bool.h"
 #include        "utl_scope.h"
 #include        "ast_decl.h"
 #include        "ast_type.h"
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index d91c83fbbfd..b372aa4cfba 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -108,11 +108,11 @@ DRV_init (int &argc, char *argv[])
 {
   // Initialize BE.
   FE_init ();
-  
+
   // Initialize driver private data
   DRV_nfiles = 0;
   DRV_file_index = 0;
-  
+
 #if defined (TAO_IDL_PREPROCESSOR)
   idl_global->set_cpp_location (TAO_IDL_PREPROCESSOR);
 #elif defined (ACE_CC_PREPROCESSOR)
@@ -140,8 +140,8 @@ DRV_refresh (void)
   idl_global->set_main_filename (0);
   idl_global->set_real_filename (0);
   idl_global->set_stripped_filename (0);
-//  idl_global->set_import (I_TRUE);
-//  idl_global->set_in_main_file (I_FALSE);
+//  idl_global->set_import (true);
+//  idl_global->set_in_main_file (false);
   idl_global->set_lineno (-1);
   idl_global->reset_flag_seen ();
 }
@@ -195,7 +195,7 @@ DRV_drive (const char *s)
     }
 
   FE_yyparse ();
-  
+
   // We must do this as late as possible to make sure any
   // forward declared structs or unions contained in a
   // primary key at some level have been fully defined.
@@ -264,7 +264,7 @@ DRV_drive (const char *s)
     {
       ACE_OS::exit (static_cast<int> (error_count));
     }
-    
+
   DRV_refresh ();
 }
 
@@ -305,8 +305,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_OS::exit (0);
     }
 
-  // If there are no input files, no sense going any further.
-  if (DRV_nfiles == 0)
+  // If there are no input files, and we are not using the
+  // directory recursion option, there's no sense going any further.
+  if (DRV_nfiles == 0 && idl_global->recursion_start () == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("IDL: No input files\n")));
@@ -329,7 +330,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else
     {
       idl_global->set_gen (gen);
-    } 
+    }
 
   // Initialize AST and load predefined types.
   FE_populate ();
@@ -343,15 +344,22 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       DRV_drive (DRV_files[DRV_file_index]);
     }
-    
-  be_global->destroy ();  
+
+  be_global->destroy ();
   delete be_global;
   be_global = 0;
-  
-  idl_global->fini ();  
+
+  idl_global->fini ();
   delete idl_global;
   idl_global = 0;
 
+  for (DRV_file_index = 0;
+       DRV_file_index < DRV_nfiles;
+       ++DRV_file_index)
+    {
+      ACE::strdelete (const_cast<char *> (DRV_files[DRV_file_index]));
+    }
+
   ACE_OS::exit (0);
 
   // NOT REACHED
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 51ee324c4b9..48d4049f05d 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,14 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL_EXE) : aceexe, acethreadslib_for_tao, core, tao_output, crosscompile {
+project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
   exename      = tao_idl
   libs        += TAO_IDL_BE TAO_IDL_FE
-  includes    += include be_include fe
   install      = $(ACE_ROOT)/bin
   after       += TAO_IDL_BE TAO_IDL_FE gperf
   avoids      += uses_wchar
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
+  } else {
+    includes    += include be_include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the exe
     // with optimization turned on doesn't seem to work (at least not with
@@ -23,7 +28,11 @@ project(TAO_IDL_EXE) : aceexe, acethreadslib_for_tao, core, tao_output, crosscom
 
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
-      CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
+      ifeq ($(ACE_CC_PREPROCESSOR),)
+        CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
+      else
+        CPPFLAGS += -DACE_CC_PREPROCESSOR=\\\"$(subst \\,\\,$(ACE_CC_PREPROCESSOR))\\\"
+      endif
     else
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(subst \\,\\,$(TAO_IDL_PREPROCESSOR))\\\"
     endif
@@ -41,13 +50,18 @@ project(TAO_IDL_EXE) : aceexe, acethreadslib_for_tao, core, tao_output, crosscom
 }
 
 
-project(TAO_IDL_BE) : acelib, acethreadslib_for_tao, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_BE
   libs        += TAO_IDL_FE
-  includes    += include be_include fe
   dynamicflags = TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_FE
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
+  } else {
+    includes    += include be_include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the backend
     // with optimization turned on doesn't seem to work (at least not with
@@ -66,11 +80,16 @@ project(TAO_IDL_BE) : acelib, acethreadslib_for_tao, conv_lib, tao_output, cross
 }
 
 
-project(TAO_IDL_FE) : acelib, acethreadslib_for_tao, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_FE) : acelib, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_FE
-  includes    += include fe
   dynamicflags = TAO_IDL_FE_BUILD_DLL
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/fe
+  } else {
+    includes    += include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the frontend
     // with optimization turned on doesn't seem to work (at least not with
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index db47cd9df03..f412e4c0d09 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -81,6 +81,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+#include "ace/Log_Msg.h"
+
 ACE_RCSID (util,
            utl_err,
            "$Id$")
@@ -221,12 +223,12 @@ error_string (UTL_Error::ErrorCode c)
 static void
 idl_error_header (UTL_Error::ErrorCode c,
                   long lineno,
-                  UTL_String *s)
+                  ACE_CString s)
 {
   ACE_ERROR ((LM_ERROR,
               "%s: \"%s\", line %d: %s",
               idl_global->prog_name (),
-              s->get_string (),
+              s.c_str (),
               lineno == -1 ? idl_global->lineno () : lineno,
               error_string (c)));
 }
@@ -624,7 +626,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
 {
   idl_error_header (EIDL_SYNTAX_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               parse_state_to_error_message (ps)));
@@ -636,7 +638,7 @@ UTL_Error::error0 (UTL_Error::ErrorCode c)
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -648,7 +650,7 @@ UTL_Error::error1 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -662,7 +664,7 @@ UTL_Error::error2 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -680,7 +682,7 @@ UTL_Error::error3 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -700,7 +702,7 @@ UTL_Error::warning0 (UTL_Error::ErrorCode c)
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\n"));
     }
@@ -714,7 +716,7 @@ UTL_Error::warning1 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   "\n"));
@@ -730,7 +732,7 @@ UTL_Error::warning2 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -750,7 +752,7 @@ UTL_Error::warning3 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -770,7 +772,7 @@ UTL_Error::coercion_error (AST_Expression *v,
 {
   idl_error_header (EIDL_COERCION_FAILURE,
                     v->line (),
-                    v->file_name ());
+                    v->file_name ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " to %s\n",
@@ -784,7 +786,7 @@ UTL_Error::lookup_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_LOOKUP_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -797,7 +799,7 @@ UTL_Error::version_number_error (char *n)
 {
   idl_error_header (EIDL_ILLEGAL_VERSION,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               n));
@@ -810,7 +812,7 @@ UTL_Error::version_reset_error (void)
 {
   idl_error_header (EIDL_VERSION_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -823,7 +825,7 @@ UTL_Error::id_reset_error (const char *o,
 {
   idl_error_header (EIDL_ID_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s, %s\n",
               o,
@@ -858,7 +860,7 @@ UTL_Error::inheritance_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               " attempts to inherit from "));
@@ -895,7 +897,7 @@ UTL_Error::supports_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " attempts to support "));
@@ -911,7 +913,7 @@ UTL_Error::derived_supports_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "derived component or home "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -927,7 +929,7 @@ UTL_Error::abstract_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " abstract valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -946,7 +948,7 @@ UTL_Error::abstract_support_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -965,7 +967,7 @@ UTL_Error::unconstrained_interface_expected (UTL_ScopedName *c,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " component or home "));
   c->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -983,7 +985,7 @@ UTL_Error::concrete_supported_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1003,7 +1005,7 @@ UTL_Error::eval_error (AST_Expression *v)
 {
   idl_error_header (EIDL_EVAL_ERROR,
                     v->line (),
-                    v->file_name ());
+                    v->file_name ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1016,7 +1018,7 @@ UTL_Error::incompatible_type_error (AST_Expression *v)
 {
   idl_error_header (EIDL_INCOMPATIBLE_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1050,7 +1052,7 @@ UTL_Error::interface_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_INTERFACE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1065,7 +1067,7 @@ UTL_Error::valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_VALUETYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1080,7 +1082,7 @@ UTL_Error::concrete_valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_CONCRETE_VT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1096,7 +1098,7 @@ UTL_Error::abstract_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_ABSTRACT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1112,7 +1114,7 @@ UTL_Error::eventtype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_EVENTTYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1127,7 +1129,7 @@ UTL_Error::primary_key_error (AST_Decl *d)
 {
   idl_error_header (EIDL_PRIMARY_KEY_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "primary key "));
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1186,7 +1188,7 @@ UTL_Error::redef_error (char *b,
 {
   idl_error_header (EIDL_REDEF,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1201,7 +1203,7 @@ UTL_Error::name_case_error (char *b,
 {
   idl_error_header (EIDL_NAME_CASE_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1217,7 +1219,7 @@ UTL_Error::name_case_warning (char *b,
     {
       idl_error_header (EIDL_NAME_CASE_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\" and \"%s\"\n",
                   b,
@@ -1230,7 +1232,7 @@ UTL_Error::idl_keyword_error (char *n)
 {
   idl_error_header (EIDL_KEYWORD_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\"\n",
               n));
@@ -1244,7 +1246,7 @@ UTL_Error::idl_keyword_warning (char *n)
     {
       idl_error_header (EIDL_KEYWORD_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\"\n",
                   n));
@@ -1294,7 +1296,7 @@ UTL_Error::fwd_decl_lookup (AST_Interface *d,
 {
   idl_error_header (EIDL_FWD_DECL_LOOKUP,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "trying to look up "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
@@ -1329,7 +1331,7 @@ UTL_Error::not_a_type (AST_Decl *d)
 {
   idl_error_header (EIDL_NOT_A_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   if (d == 0 || d->name () == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1351,7 +1353,7 @@ UTL_Error::back_end (long lineno,
 {
   idl_error_header (EIDL_BACK_END,
                     lineno,
-                    s);
+                    s->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1362,7 +1364,7 @@ UTL_Error::illegal_infix (void)
 {
   idl_error_header (EIDL_ILLEGAL_INFIX,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 4081da3cdb0..4fa1996aa22 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -104,8 +104,8 @@ IDL_GlobalData::IDL_GlobalData (void)
     pd_main_filename (0),
     pd_real_filename (0),
     pd_stripped_filename (0),
-    pd_import (I_FALSE),
-    pd_in_main_file (I_FALSE),
+    pd_import (false),
+    pd_in_main_file (false),
     pd_prog_name (0),
     pd_cpp_location (0),
     pd_compile_flags (0),
@@ -123,13 +123,14 @@ IDL_GlobalData::IDL_GlobalData (void)
     gperf_path_ (0),
     temp_dir_ (0),
     ident_string_ (0),
-    case_diff_error_ (I_TRUE),
-    nest_orb_ (I_FALSE),
+    case_diff_error_ (true),
+    nest_orb_ (false),
     idl_flags_ (""),
-    preserve_cpp_keywords_ (I_TRUE),
-    pass_orb_idl_ (I_FALSE),
+    preserve_cpp_keywords_ (true),
+    pass_orb_idl_ (false),
     using_ifr_backend_ (false),
-    ignore_idl3_ (false)
+    ignore_idl3_ (false),
+    recursion_start_ (0)  // Not used by all backends.
 {
   // Path for the perfect hash generator(gperf) program.
   // Default is $ACE_ROOT/bin/gperf unless ACE_GPERF is defined.
@@ -237,6 +238,7 @@ IDL_GlobalData::reset_flag_seen (void)
   short_seq_seen_ = false;
   special_basic_arg_seen_ = false;
   string_seen_ = false;
+  string_member_seen_ = false;
   string_seq_seen_ = false;
   typecode_seen_ = false;
   ub_string_arg_seen_ = false;
@@ -252,6 +254,8 @@ IDL_GlobalData::reset_flag_seen (void)
   vt_seq_seen_ = false;
   wchar_seq_seen_ = false;
   wstring_seq_seen_ = false;
+
+  need_skeleton_includes_ = false;
 }
 
 // Get or set scopes stack
@@ -400,33 +404,33 @@ IDL_GlobalData::set_real_filename (UTL_String *n)
 }
 
 // Get or set indicator whether import is on
-idl_bool
+bool
 IDL_GlobalData::imported (void)
 {
-  return this->pd_in_main_file ? I_FALSE : pd_import;
+  return this->pd_in_main_file ? false : pd_import;
 }
 
-idl_bool
+bool
 IDL_GlobalData::import (void)
 {
   return this->pd_import;
 }
 
 void
-IDL_GlobalData::set_import (idl_bool is_in)
+IDL_GlobalData::set_import (bool is_in)
 {
   this->pd_import = is_in;
 }
 
 // Get or set indicator whether we're reading the main file now
-idl_bool
+bool
 IDL_GlobalData::in_main_file (void)
 {
   return this->pd_in_main_file;
 }
 
 void
-IDL_GlobalData::set_in_main_file (idl_bool is_in)
+IDL_GlobalData::set_in_main_file (bool is_in)
 {
   this->pd_in_main_file = is_in;
 }
@@ -972,24 +976,24 @@ IDL_GlobalData::ident_string (void) const
 }
 
 void
-IDL_GlobalData::case_diff_error (idl_bool val)
+IDL_GlobalData::case_diff_error (bool val)
 {
   this->case_diff_error_ = val;
 }
 
-idl_bool
+bool
 IDL_GlobalData::case_diff_error (void)
 {
   return this->case_diff_error_;
 }
 
 void
-IDL_GlobalData::nest_orb (idl_bool val)
+IDL_GlobalData::nest_orb (bool val)
 {
   this->nest_orb_ = val;
 }
 
-idl_bool
+bool
 IDL_GlobalData::nest_orb (void)
 {
   return this->nest_orb_;
@@ -1062,6 +1066,9 @@ IDL_GlobalData::destroy (void)
   this->n_included_idl_files_ = 0;
 
   this->pd_root->destroy ();
+
+  ACE::strdelete (this->recursion_start_);
+  this->recursion_start_ = 0;
 }
 
 void
@@ -1285,7 +1292,7 @@ IDL_GlobalData::stripped_preproc_include (const char *name)
  C++ keywords e.g. delete, operator etc. with _cxx_ prefix.
  Should be true when being used by the IFR Service
  */
-idl_bool
+bool
 IDL_GlobalData::preserve_cpp_keywords (void)
 {
   return preserve_cpp_keywords_;
@@ -1297,7 +1304,7 @@ IDL_GlobalData::preserve_cpp_keywords (void)
  Is unset by the tao_idl compiler.
  */
 void
-IDL_GlobalData::preserve_cpp_keywords (idl_bool val)
+IDL_GlobalData::preserve_cpp_keywords (bool val)
 {
   preserve_cpp_keywords_ = val;
 }
@@ -1314,14 +1321,14 @@ IDL_GlobalData::file_prefixes (void)
   return this->file_prefixes_;
 }
 
-idl_bool
+bool
 IDL_GlobalData::pass_orb_idl (void) const
 {
   return this->pass_orb_idl_;
 }
 
 void
-IDL_GlobalData::pass_orb_idl (idl_bool val)
+IDL_GlobalData::pass_orb_idl (bool val)
 {
   this->pass_orb_idl_ = val;
 }
@@ -1417,8 +1424,7 @@ IDL_GlobalData::check_gperf (void)
 #if defined (ACE_WIN32)
   // No wait or anything in Win32.
   return 0;
-#endif /* ACE_WIN32 */
-
+#else
   // Wait for gperf to complete.
   ACE_exitcode wait_status = 0;
   if (process.wait (&wait_status) == -1)
@@ -1456,6 +1462,7 @@ IDL_GlobalData::check_gperf (void)
           return -1;
         }
     }
+#endif /* ACE_WIN32 */
 }
 
 void
@@ -1514,7 +1521,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
   UTL_ScopedName scoped_name (&module_id,
                               &local_name);
   AST_Decl *d = c->lookup_by_name (&scoped_name,
-                                   I_TRUE);
+                                   true);
   local_id.destroy ();
   module_id.destroy ();
 
@@ -1612,9 +1619,9 @@ void
 IDL_GlobalData::check_primary_keys (void)
 {
   AST_ValueType *holder = 0;
-  
+
   while (!this->primary_keys_.is_empty ())
-    {  
+    {
       // Dequeue the element at the head of the queue.
       if (this->primary_keys_.dequeue_head (holder))
         {
@@ -1630,6 +1637,19 @@ IDL_GlobalData::check_primary_keys (void)
     }
 }
 
+const char *
+IDL_GlobalData::recursion_start (void) const
+{
+  return this->recursion_start_;
+}
+
+void
+IDL_GlobalData::recursion_start (const char *val)
+{
+  ACE::strdelete (this->recursion_start_);
+  this->recursion_start_ = ACE::strnew (val);
+}
+
 void
 IDL_GlobalData::add_dcps_data_type(const char* id)
 {
@@ -1668,7 +1688,7 @@ IDL_GlobalData::add_dcps_data_type(const char* id)
 
 }
 
-idl_bool
+bool
 IDL_GlobalData::add_dcps_data_key(const char* id, const char* key)
 {
   // Search the map for the type.
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index c12115c8e1b..f993627e94e 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-ACE_RCSID (util, 
-           utl_identifier, 
+ACE_RCSID (util,
+           utl_identifier,
            "$Id$")
 
 Identifier::Identifier (void)
@@ -84,7 +84,7 @@ Identifier::Identifier (void)
 
 Identifier::Identifier (const char *s)
 {
-  idl_bool shift = 0;
+  bool shift = 0;
   this->escaped_ = 0;
 
   if (*s == '_')
@@ -149,35 +149,35 @@ Identifier::replace_string (const char * s)
 }
 
 // Compare two Identifier *
-long
+bool
 Identifier::compare (Identifier *o)
 {
   if (o == 0)
     {
-      return I_FALSE;
+      return false;
     };
 
   if (this->pv_string == 0 || o->get_string () == 0)
     {
-      return I_FALSE;
+      return false;
     }
 
   if (this->escaped_ ^ o->escaped_)
     {
-      return I_FALSE;
+      return false;
     }
 
   return (ACE_OS::strcmp (this->pv_string, o->get_string ()) == 0);
 }
 
 // Report the appropriate error if the two identifiers differ only in case.
-long
+bool
 Identifier::case_compare (Identifier *o)
 {
   UTL_String member (this->pv_string);
   UTL_String other (o->get_string ());
 
-  long result = member.compare (&other);
+  bool result = member.compare (&other);
 
   member.destroy ();
   other.destroy ();
@@ -186,13 +186,13 @@ Identifier::case_compare (Identifier *o)
 }
 
 // Report no error if the two identifiers differ only in case.
-long
+bool
 Identifier::case_compare_quiet (Identifier *o)
 {
   UTL_String member (this->pv_string);
   UTL_String other (o->pv_string);
 
-  long result = member.compare_quiet (&other);
+  bool result = member.compare_quiet (&other);
 
   member.destroy ();
   other.destroy ();
@@ -213,7 +213,7 @@ Identifier::copy (void)
   return retval;
 }
 
-idl_bool
+bool
 Identifier::escaped (void) const
 {
   return this->escaped_;
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
index 194c57a7f1c..26985395686 100644
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_idlist.cpp
@@ -68,9 +68,9 @@ 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_idlist.h"
 #include "utl_identifier.h"
@@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-ACE_RCSID (util, 
-           utl_idlist, 
+ACE_RCSID (util,
+           utl_idlist,
            "$Id$")
 
 // Constructor
@@ -164,7 +164,7 @@ UTL_IdList::compare (UTL_IdList *other)
         {
           return 1;
         }
-     
+
       return ((UTL_IdList *) this_tail)->compare (other);
     }
 
@@ -210,8 +210,8 @@ UTL_IdList::compare (UTL_IdList *other)
 void
 UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
 {
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
 
   for (UTL_IdListActiveIterator i (this);
        !i.is_done ();
@@ -223,7 +223,7 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       i.item ()->dump (o);
@@ -232,11 +232,11 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
         {
           if (ACE_OS::strcmp (i.item ()->get_string (), "::") != 0)
             {
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
index 9cdc10ea09b..1e1f23a0657 100644
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_list.cpp
@@ -68,19 +68,19 @@ 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_list.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (util, 
-           utl_list, 
+ACE_RCSID (util,
+           utl_list,
            "$Id$")
 
 UTL_List::UTL_List (UTL_List *c)
-	: pd_cdr_data (c)
+  : pd_cdr_data (c)
 {
 }
 
@@ -179,10 +179,10 @@ UTL_ListActiveIterator::UTL_ListActiveIterator (UTL_List *s)
 }
 
 // Is iterator done?
-idl_bool
+bool
 UTL_ListActiveIterator::is_done (void)
 {
-  return (this->source == 0) ? I_TRUE : I_FALSE;
+  return (this->source == 0) ? true : false;
 }
 
 // Advance to next item.
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
index a15ebd3f200..e88da13f0f0 100644
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_namelist.cpp
@@ -68,21 +68,21 @@ 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_namelist.h"
 
-ACE_RCSID (util, 
-           utl_namelist, 
+ACE_RCSID (util,
+           utl_namelist,
            "$Id$")
 
-UTL_NameList::UTL_NameList (UTL_ScopedName *s, 
+UTL_NameList::UTL_NameList (UTL_ScopedName *s,
                             UTL_NameList *cdr)
-	: UTL_List (cdr),
-	  pd_car_data (s),
-    pd_truncatable (I_FALSE)
+  : UTL_List (cdr),
+    pd_car_data (s),
+    pd_truncatable (false)
 {
 }
 
@@ -93,20 +93,20 @@ UTL_NameList::head (void)
   return this->pd_car_data;
 }
 
-idl_bool
+bool
 UTL_NameList::truncatable (void) const
 {
   return this->pd_truncatable;
 }
 
 void
-UTL_NameList::truncatable (idl_bool val)
+UTL_NameList::truncatable (bool val)
 {
   this->pd_truncatable = val;
 }
 
 UTL_NamelistActiveIterator::UTL_NamelistActiveIterator (UTL_NameList *s)
-	: UTL_ListActiveIterator(s)
+  : UTL_ListActiveIterator(s)
 {
 }
 
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 10d65e8bf0d..ac011b7d84f 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -347,7 +347,7 @@ add_type (AST_Type *type)
 // be used only by the CFE add_xxx functions.
 AST_Decl *
 UTL_Scope::lookup_for_add (AST_Decl *d,
-                           idl_bool)
+                           bool)
 {
   if (d == 0)
     {
@@ -402,7 +402,7 @@ UTL_Scope::idl_keyword_clash (Identifier *e)
   return 0;
 }
 
-idl_bool
+bool
 UTL_Scope::redef_clash (AST_Decl::NodeType new_nt,
                         AST_Decl::NodeType scope_elem_nt)
 {
@@ -437,7 +437,7 @@ UTL_Scope::redef_clash (AST_Decl::NodeType new_nt,
       return (scope_elem_nt != AST_Decl::NT_eventtype_fwd
               && scope_elem_nt != AST_Decl::NT_eventtype);
     default:
-      return I_TRUE;
+      return true;
   }
 }
 
@@ -455,7 +455,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
 
   AST_Type *bt = 0;
   AST_Decl::NodeType nt = d->node_type ();
-  
+
   // We are interested only in members, arguments and typedefs.
   switch (nt)
     {
@@ -471,33 +471,33 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
       default:
         return;
     }
-  
+
   // Check to eliminate more candidates.
   if (!bt->imported () || bt->node_type () != AST_Decl::NT_typedef)
     {
       return;
     }
-    
-  bt = AST_Typedef::narrow_from_decl (bt)->base_type ();  
+
+  bt = AST_Typedef::narrow_from_decl (bt)->base_type ();
   nt = bt->node_type ();
-  
+
   // Must be a sequence with only one level of typedef.
   if (nt != AST_Decl::NT_sequence)
     {
       return;
     }
-    
-  // Must be defined in the CORBA module.  
+
+  // Must be defined in the CORBA module.
   AST_Decl *p = ScopeAsDecl (bt->defined_in ());
   if (ACE_OS::strcmp (p->local_name ()->get_string (), "CORBA") != 0)
     {
       return;
     }
-    
-  // We know this narrowing will be successful.  
+
+  // We know this narrowing will be successful.
   bt = AST_Sequence::narrow_from_decl (bt)->base_type ();
   nt = bt->node_type ();
-  
+
   // First check for string or wstring base type.
   if (nt == AST_Decl::NT_string)
     {
@@ -509,14 +509,14 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
       idl_global->wstring_seq_seen_ = true;
       return;
     }
-  
+
   // Now check for predefined base type.
   AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (bt);
   if (pdt == 0)
     {
       return;
     }
-    
+
   switch (pdt->pt ())
     {
       case AST_PredefinedType::PT_long:
@@ -582,7 +582,7 @@ UTL_Scope::add_predefined_type (AST_PredefinedType *p)
       return 0;
     }
 
-  p->set_added (I_TRUE);
+  p->set_added (true);
   return p;
 }
 
@@ -594,7 +594,7 @@ UTL_Scope::add_module (AST_Module *m)
       return 0;
     }
 
-  m->set_added (I_TRUE);
+  m->set_added (true);
   return m;
 }
 
@@ -606,7 +606,7 @@ UTL_Scope::add_interface (AST_Interface *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -618,7 +618,7 @@ UTL_Scope::add_interface_fwd (AST_InterfaceFwd *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -630,7 +630,7 @@ UTL_Scope::add_valuetype (AST_ValueType *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -642,7 +642,7 @@ UTL_Scope::add_valuetype_fwd (AST_ValueTypeFwd *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -654,7 +654,7 @@ UTL_Scope::add_eventtype (AST_EventType *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -666,7 +666,7 @@ UTL_Scope::add_eventtype_fwd (AST_EventTypeFwd *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -678,7 +678,7 @@ UTL_Scope::add_component (AST_Component *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -690,7 +690,7 @@ UTL_Scope::add_component_fwd (AST_ComponentFwd *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -702,7 +702,7 @@ UTL_Scope::add_home (AST_Home *i)
       return 0;
     }
 
-  i->set_added (I_TRUE);
+  i->set_added (true);
   return i;
 }
 
@@ -714,7 +714,7 @@ UTL_Scope::add_exception (AST_Exception *e)
       return 0;
     }
 
-  e->set_added (I_TRUE);
+  e->set_added (true);
   return e;
 }
 
@@ -726,7 +726,7 @@ UTL_Scope::add_constant (AST_Constant *c)
       return 0;
     }
 
-  c->set_added (I_TRUE);
+  c->set_added (true);
   return c;
 }
 
@@ -750,7 +750,7 @@ UTL_Scope::add_attribute (AST_Attribute *a)
       return 0;
     }
 
-  a->set_added (I_TRUE);
+  a->set_added (true);
 
   if (!a->field_type ()->added ())
     {
@@ -770,7 +770,7 @@ UTL_Scope::add_operation (AST_Operation *o)
       return 0;
     }
 
-  o->set_added (I_TRUE);
+  o->set_added (true);
 
   if (!o->return_type ()->added ())
     {
@@ -790,7 +790,7 @@ UTL_Scope::add_argument (AST_Argument *a)
       return 0;
     }
 
-  a->set_added (I_TRUE);
+  a->set_added (true);
 
   if (!a->field_type ()->added ())
     {
@@ -810,7 +810,7 @@ UTL_Scope::add_union (AST_Union *u)
       return 0;
     }
 
-  u->set_added (I_TRUE);
+  u->set_added (true);
   return u;
 }
 
@@ -822,7 +822,7 @@ UTL_Scope::add_union_fwd (AST_UnionFwd *u)
       return 0;
     }
 
-  u->set_added (I_TRUE);
+  u->set_added (true);
   return u;
 }
 
@@ -834,7 +834,7 @@ UTL_Scope::add_union_branch (AST_UnionBranch *u)
       return 0;
     }
 
-  u->set_added (I_TRUE);
+  u->set_added (true);
 
   if (!u->field_type ()->added ())
     {
@@ -854,7 +854,7 @@ UTL_Scope::add_structure (AST_Structure *s)
       return 0;
     }
 
-  s->set_added (I_TRUE);
+  s->set_added (true);
   return s;
 }
 
@@ -866,7 +866,7 @@ UTL_Scope::add_structure_fwd (AST_StructureFwd *s)
       return 0;
     }
 
-  s->set_added (I_TRUE);
+  s->set_added (true);
   return s;
 }
 
@@ -878,7 +878,7 @@ UTL_Scope::add_field (AST_Field *f)
       return 0;
     }
 
-  f->set_added (I_TRUE);
+  f->set_added (true);
 
   if (!f->field_type ()->added ())
     {
@@ -898,7 +898,7 @@ UTL_Scope::add_enum (AST_Enum *e)
       return 0;
     }
 
-  e->set_added (I_TRUE);
+  e->set_added (true);
   return e;
 }
 
@@ -910,7 +910,7 @@ UTL_Scope::add_enum_val (AST_EnumVal *e)
       return 0;
     }
 
-  e->set_added (I_TRUE);
+  e->set_added (true);
   return e;
 }
 
@@ -922,7 +922,7 @@ UTL_Scope::add_typedef (AST_Typedef *t)
       return 0;
     }
 
-  t->set_added (I_TRUE);
+  t->set_added (true);
   if (!t->base_type ()->added ())
     {
       return add_type (t->base_type ()) ? t : 0;
@@ -941,7 +941,7 @@ UTL_Scope::add_sequence (AST_Sequence *s)
       return 0;
     }
 
-  s->set_added (I_TRUE);
+  s->set_added (true);
 
   if (!s->base_type ()->added ())
     {
@@ -961,7 +961,7 @@ UTL_Scope::add_string (AST_String *s)
       return 0;
     }
 
-  s->set_added (I_TRUE);
+  s->set_added (true);
   return s;
 }
 
@@ -973,7 +973,7 @@ UTL_Scope::add_array (AST_Array *a)
       return 0;
     }
 
-  a->set_added (I_TRUE);
+  a->set_added (true);
 
   if (!a->base_type ()->added ())
     {
@@ -993,7 +993,7 @@ UTL_Scope::add_native (AST_Native *n)
       return 0;
     }
 
-  n->set_added (I_TRUE);
+  n->set_added (true);
   return n;
 }
 
@@ -1006,7 +1006,7 @@ UTL_Scope::add_factory (AST_Factory *f)
       return 0;
     }
 
-  f->set_added (I_TRUE);
+  f->set_added (true);
   return f;
 }
 
@@ -1341,17 +1341,17 @@ UTL_Scope::lookup_pseudo (Identifier *e)
   AST_Decl *d = 0;
   UTL_ScopeActiveIterator *i = 0;
   char *name_string = e->get_string ();
-  idl_bool tc_lookup = I_FALSE;
-  idl_bool obj_lookup = I_FALSE;
-  idl_bool vb_lookup = I_FALSE;
+  bool tc_lookup = false;
+  bool obj_lookup = false;
+  bool vb_lookup = false;
 
   if (ACE_OS::strcasecmp (name_string, "Object") == 0)
     {
-      obj_lookup = I_TRUE;
+      obj_lookup = true;
     }
   else if (ACE_OS::strcasecmp (name_string, "ValueBase") == 0)
     {
-      vb_lookup = I_TRUE;
+      vb_lookup = true;
     }
 
   if (obj_lookup || vb_lookup)
@@ -1374,7 +1374,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
                       UTL_ScopeActiveIterator (this,
                                                UTL_Scope::IK_decls),
                       0);
-      tc_lookup = I_TRUE;
+      tc_lookup = true;
     }
   else
     {
@@ -1562,7 +1562,7 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
 // Look through inherited list. Overridden in AST_Interface.
 AST_Decl *
 UTL_Scope::look_in_inherited (UTL_ScopedName *,
-                              idl_bool )
+                              bool )
 {
   return 0;
 }
@@ -1570,7 +1570,7 @@ UTL_Scope::look_in_inherited (UTL_ScopedName *,
 // Look through supported interface list. Overridden where necessary.
 AST_Decl *
 UTL_Scope::look_in_supported (UTL_ScopedName *,
-                              idl_bool)
+                              bool)
 {
   return 0;
 }
@@ -1600,7 +1600,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
 
   Identifier *item_name = 0;
 
-  idl_bool in_corba =
+  bool in_corba =
     ACE_OS::strcmp (e->get_string (), "CORBA") == 0;
 
   // Iterate over this scope. We need IK_both here for the legacy
@@ -1687,8 +1687,8 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
 // Implements lookup by name for scoped names.
 AST_Decl *
 UTL_Scope::lookup_by_name (UTL_ScopedName *e,
-                           idl_bool treat_as_ref,
-                           idl_bool in_parent)
+                           bool treat_as_ref,
+                           bool in_parent)
 {
   AST_Decl *d = 0;
   UTL_Scope *t = 0;
@@ -1734,7 +1734,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       if (treat_as_ref && d != 0)
         {
           add_to_referenced (d,
-                             I_FALSE,
+                             false,
                              0);
         }
 
@@ -1755,7 +1755,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
         {
           // A no-op unless d can inherit.
           d = look_in_inherited (e, treat_as_ref);
-          
+
           if (d == 0)
             {
               // A no-op unless d can support interfaces.
@@ -1813,7 +1813,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                                  && nt != AST_Decl::NT_root)
                             {
                               s->add_to_referenced (d,
-                                                    I_FALSE,
+                                                    false,
                                                     d->local_name ());
 
                               s = parent->defined_in ();
@@ -1858,7 +1858,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
       if (treat_as_ref && d != 0)
         {
           add_to_referenced (d,
-                             I_FALSE,
+                             false,
                              0);
         }
 
@@ -1877,7 +1877,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
 // Add a node to set of nodes referenced in this scope.
 void
 UTL_Scope::add_to_referenced (AST_Decl *e,
-                              idl_bool recursive,
+                              bool recursive,
                               Identifier *id,
                               AST_Decl *ex)
 {
@@ -1914,8 +1914,8 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
     {
       return;
     }
-    
-  // Sets the appropriate *_seen_ flag for future use.  
+
+  // Sets the appropriate *_seen_ flag for future use.
   this->check_for_predef_seq (e);
 
   // Make sure there's space for one more decl.
@@ -1954,7 +1954,7 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
               break;
             }
         }
-      
+
       if (this->pd_referenced_used > 0)
         {
           ++this->pd_referenced_used;
@@ -2077,17 +2077,18 @@ UTL_Scope::add_to_scope (AST_Decl *e,
       AST_Decl::NodeType new_nt = e->node_type ();
       AST_Decl::NodeType scope_elem_nt = (*tmp)->node_type ();
 
-      if (decl_name->compare (ref_name) == I_TRUE
-          && this->redef_clash (new_nt, scope_elem_nt) == I_TRUE)
+      if (decl_name->compare (ref_name) == true
+          && this->redef_clash (new_nt, scope_elem_nt) == true)
         {
           idl_global->err ()->redef_error (decl_string,
                                            ref_string);
 
-          return;
+          // if we try to continue from here, we risk a crash.
+          ACE_OS::exit (99);
         }
       // If the spellings differ only by case, it's also an error,
       // unless one, but not both of the identifiers were escaped.
-      else if (decl_name->case_compare_quiet (ref_name) == I_TRUE
+      else if (decl_name->case_compare_quiet (ref_name) == true
                && !(decl_name->escaped () ^ ref_name->escaped ()))
         {
           if (idl_global->case_diff_error ())
@@ -2095,7 +2096,9 @@ UTL_Scope::add_to_scope (AST_Decl *e,
               idl_global->err ()->name_case_error (decl_string,
                                                    ref_string);
 
-              return;
+
+              // if we try to continue from here, we risk a crash.
+              ACE_OS::exit (99);
             }
           else
             {
@@ -2117,14 +2120,17 @@ UTL_Scope::add_to_scope (AST_Decl *e,
     {
       Identifier *parent_name = d->local_name ();
 
-      if (decl_name->compare (parent_name) == I_TRUE)
+      if (decl_name->compare (parent_name) == true)
         {
           idl_global->err ()->redef_error (
                                   decl_name->get_string (),
                                   parent_name->get_string ()
                                 );
+
+          // if we try to continue from here, we risk a crash.
+          ACE_OS::exit (99);
         }
-      else if (decl_name->case_compare_quiet (parent_name) == I_TRUE)
+      else if (decl_name->case_compare_quiet (parent_name) == true)
         {
           if (idl_global->case_diff_error ())
             {
@@ -2132,7 +2138,10 @@ UTL_Scope::add_to_scope (AST_Decl *e,
                                       decl_name->get_string (),
                                       parent_name->get_string ()
                                     );
-            }
+
+              // if we try to continue from here, we risk a crash.
+              ACE_OS::exit (99);
+           }
           else
             {
               idl_global->err ()->name_case_warning (
@@ -2220,7 +2229,7 @@ UTL_Scope::add_to_local_types (AST_Decl *e)
 }
 
 // Has this node been referenced here before?
-idl_bool
+bool
 UTL_Scope::referenced (AST_Decl *e,
                        Identifier *id)
 {
@@ -2234,22 +2243,22 @@ UTL_Scope::referenced (AST_Decl *e,
       // Same node?
       if (*tmp == e)
         {
-          return I_TRUE;
+          return true;
         }
 
       // Are we definging a forward declared struct, union, or interface,
       // or reopening a module?
-      idl_bool forward_redef = this->redef_clash (e->node_type (),
+      bool forward_redef = this->redef_clash (e->node_type (),
                                                   (*tmp)->node_type ());
 
-      if (forward_redef == I_FALSE)
+      if (forward_redef == false)
         {
           member = (*tmp)->local_name ();
           test = e->local_name ();
 
-          if (member->compare (test) == I_TRUE)
+          if (member->compare (test) == true)
             {
-              return I_FALSE;
+              return false;
             }
         }
     }
@@ -2273,17 +2282,17 @@ UTL_Scope::referenced (AST_Decl *e,
           // scope, then it's a type name for something else
           // that was, and it can appear any number of times
           // in this scope without a clash.
-          if (id->compare (*name_tmp) == I_TRUE
+          if (id->compare (*name_tmp) == true
               && e->node_type () != AST_Decl::NT_module
               && e->defined_in () == this)
             {
               idl_global->err ()->redef_error (id->get_string (),
                                                (*name_tmp)->get_string ());
 
-              return I_TRUE;
+              return true;
             }
           // No clash if one or the other of the identifiers was escaped.
-          else if (id->case_compare_quiet (*name_tmp) == I_TRUE
+          else if (id->case_compare_quiet (*name_tmp) == true
                    && !(id->escaped () ^ (*name_tmp)->escaped ()))
             {
               if (idl_global->case_diff_error ())
@@ -2301,23 +2310,23 @@ UTL_Scope::referenced (AST_Decl *e,
                                         );
                 }
 
-              return I_TRUE;
+              return true;
             }
         }
     }
 
   // Not found
-  return I_FALSE;
+  return false;
 }
 
-idl_bool
+bool
 UTL_Scope::has_prefix (void)
 {
   return this->has_prefix_;
 }
 
 void
-UTL_Scope::has_prefix (idl_bool val)
+UTL_Scope::has_prefix (bool val)
 {
   this->has_prefix_ = val;
 }
@@ -2471,7 +2480,7 @@ UTL_ScopeActiveIterator::item (void)
 }
 
 // Is this iteration done?
-idl_bool
+bool
 UTL_ScopeActiveIterator::is_done (void)
 {
   long limit =
@@ -2484,19 +2493,19 @@ UTL_ScopeActiveIterator::is_done (void)
       // Last element?
       if (this->il < limit)
         {
-          return I_FALSE;
+          return false;
         }
 
       // Only want decls?
       if (this->stage == UTL_Scope::IK_decls)
         {
-          return I_TRUE;
+          return true;
         }
 
       // Already done local types?
       if (this->ik == UTL_Scope::IK_localtypes)
         {
-          return I_TRUE;
+          return true;
         }
 
       // Switch to next stage.
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index 31a3393b7c7..a5b1b944b12 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -68,19 +68,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scope.h"
 #include "global_extern.h"
 
-ACE_RCSID (util, 
-           utl_stack, 
+ACE_RCSID (util,
+           utl_stack,
            "$Id$")
 
-#undef	INCREMENT
-#define	INCREMENT	64
+#undef  INCREMENT
+#define  INCREMENT  64
 
 UTL_ScopeStack::UTL_ScopeStack (void)
   : pd_stack_data_nalloced (INCREMENT),
     pd_stack_top (0)
 {
   ACE_NEW (this->pd_stack_data,
-           UTL_Scope *[INCREMENT]); 
+           UTL_Scope *[INCREMENT]);
 }
 
 UTL_ScopeStack::~UTL_ScopeStack (void)
@@ -95,7 +95,7 @@ UTL_ScopeStack::~UTL_ScopeStack (void)
 UTL_ScopeStack *
 UTL_ScopeStack::push (UTL_Scope *el)
 {
-  UTL_Scope	**tmp;
+  UTL_Scope  **tmp;
   long ostack_data_nalloced;
   long i;
 
@@ -187,18 +187,18 @@ UTL_ScopeStack::depth (void)
 UTL_Scope *
 UTL_ScopeStack::next_to_top (void)
 {
-  UTL_Scope	*tmp, *retval;
+  UTL_Scope  *tmp, *retval;
 
   if (this->depth () < 2)
     {
       return 0;
     }
 
-  tmp = top ();		// Save top
-  (void) pop ();		// Pop it
-  retval = top ();	// Get next one down
-  (void) push (tmp);	// Push top back
-  return retval;	// Return next one down
+  tmp = top ();    // Save top
+  (void) pop ();    // Pop it
+  retval = top ();  // Get next one down
+  (void) push (tmp);  // Push top back
+  return retval;  // Return next one down
 }
 
 // Return topmost non-NULL element.
@@ -217,8 +217,8 @@ UTL_ScopeStack::top_non_null (void)
 }
 
 UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator (UTL_ScopeStack &s)
-	: source (s),
-		il (s.pd_stack_top - 1)
+  : source (s),
+    il (s.pd_stack_top - 1)
 {
 }
 
@@ -247,9 +247,9 @@ UTL_ScopeStackActiveIterator::is_done (void)
 {
   if (this->il >= 0)
     {
-      return I_FALSE;
+      return false;
     }
 
-  return I_TRUE;
+  return true;
 }
 
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index b75a160224e..067f26d0820 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -155,35 +155,38 @@ UTL_String::canonicalize (void)
 }
 
 // Compare two UTL_String *.
-idl_bool
+bool
 UTL_String::compare (UTL_String *s)
 {
   char *s_c_str;
-  long result;
+  bool result;
 
   if (this->c_str == 0
       || s == 0
       || (s_c_str = s->get_canonical_rep ()) == 0)
     {
-      result = I_FALSE;
+      result = false;
     }
   else
     {
       result =
-        (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? I_TRUE : I_FALSE;
+        (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? true : false;
     }
 
   // Check that the names are typed consistently.
-  if (result == I_TRUE
+  if (result == true
       && ACE_OS::strcmp (this->p_str, s->get_string ()) != 0)
     {
       // Prevents redundant error reporting if we're in this branch.
-      result = I_FALSE;
+      result = false;
 
       if (idl_global->case_diff_error ())
         {
           idl_global->err ()->name_case_error (this->p_str,
                                                s->get_string ());
+
+            // if we try to continue from here, we risk a crash.
+            ACE_OS::exit (99);
         }
       else
         {
@@ -205,19 +208,19 @@ UTL_String::compare_quiet (UTL_String *s)
       || s == 0
       || (s_c_str = s->get_canonical_rep ()) == 0)
     {
-      result = I_FALSE;
+      result = false;
     }
   else if (ACE_OS::strcmp (this->c_str, s_c_str) != 0)
     {
-      result = I_FALSE;
+      result = false;
     }
   else if (ACE_OS::strcmp (this->p_str, s->get_string ()) != 0)
     {
-      result = I_TRUE;
+      result = true;
     }
   else
     {
-      result = I_FALSE;
+      result = false;
     }
 
   return result;
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index 511dd08d277..004c415fd5f 100644
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_strlist.cpp
@@ -68,9 +68,9 @@ 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_strlist.h"
 #include "utl_string.h"
@@ -81,11 +81,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (util, 
-           utl_strlist, 
+ACE_RCSID (util,
+           utl_strlist,
            "$Id$")
 
-UTL_StrList::UTL_StrList (UTL_String *s, 
+UTL_StrList::UTL_StrList (UTL_String *s,
                           UTL_StrList *cdr)
   : UTL_List(cdr),
     pd_car_data(s)
@@ -131,14 +131,14 @@ UTL_StrList::copy (void)
   if (this->tail () == 0)
     {
       ACE_NEW_RETURN (retval,
-                      UTL_StrList (head (), 
+                      UTL_StrList (head (),
                                    0),
                       0);
     }
   else
     {
       ACE_NEW_RETURN (retval,
-                      UTL_StrList (head (), 
+                      UTL_StrList (head (),
                                    (UTL_StrList *) this->tail ()->copy ()),
                       0);
     }
@@ -165,10 +165,10 @@ void
 UTL_StrList::dump (ACE_OSTREAM_TYPE &o)
 {
   char *s = 0;
-  idl_bool first = I_TRUE;
-  idl_bool second = I_FALSE;
+  bool first = true;
+  bool second = false;
 
-  for (UTL_StrlistActiveIterator i (this); !i.is_done(); i.next ()) 
+  for (UTL_StrlistActiveIterator i (this); !i.is_done(); i.next ())
     {
       if (!first)
         {
@@ -176,21 +176,21 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       s = i.item ()->get_string ();
       o << s;
 
-      if (first) 
+      if (first)
         {
           if (ACE_OS::strcmp (s, "::") != 0)
             {
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
index becb6e8d3d1..3f4780aa82e 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
@@ -94,10 +94,10 @@ UTL_IdList::last_component (void)
 void
 UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
 {
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
 
-  for (UTL_IdListActiveIterator (this); !i.is_done (); i.next ()) 
+  for (UTL_IdListActiveIterator (this); !i.is_done (); i.next ())
     {
       if (!first)
         {
@@ -105,20 +105,20 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       i.item ()->dump (o);
 
-      if (first) 
+      if (first)
         {
           if (ACE_OS::strcmp (i.item ()->get_string (), "::") != 0)
             {
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
index 4bdee8e19cb..15b3abb62c6 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
@@ -56,9 +56,9 @@
 //
 // Implementation of generic single-linked lists
 
-#include	<stddef.h>
-#include	<utl_list.hh>
-#include	<idl_bool.hh>
+#include  <stddef.h>
+#include  <utl_list.hh>
+#include  <bool.hh>
 
 ACE_RCSID(utl_tmpl, utl_list, "$Id$")
 
@@ -68,8 +68,8 @@ ACE_RCSID(utl_tmpl, utl_list, "$Id$")
 
 template<class L, class T>
 UTL_List<L, T>::UTL_List(T *c, L *l)
-	: pd_car_data(c),
-	  pd_cdr_data(l)
+  : pd_car_data(c),
+    pd_cdr_data(l)
 {
 }
 
@@ -168,7 +168,7 @@ UTL_List<L, T>::length()
 
 template<class L, class T>
 UTL_ListActiveIterator<L, T>::UTL_ListActiveIterator(UTL_List<L, T> *s)
-		      : source(s)
+          : source(s)
 {
 }
 
@@ -185,7 +185,7 @@ template<class L, class T>
 long
 UTL_ListActiveIterator<L, T>::is_done()
 {
-  return (source == NULL) ? I_TRUE : I_FALSE;
+  return (source == NULL) ? true : false;
 }
 
 // Get current item
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
index baeeb6b0f77..3ee0b417f08 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
@@ -93,10 +93,10 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o)
 {
   char *s = 0;;
   UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator (this);
-  long first = I_TRUE;
-  long second = I_FALSE;
+  long first = true;
+  long second = false;
 
-  for (UTL_StrlistActiveIterator (this); !i.is_done(); i.next ()) 
+  for (UTL_StrlistActiveIterator (this); !i.is_done(); i.next ())
     {
       if (!first)
         {
@@ -104,21 +104,21 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o)
         }
       else if (second)
         {
-          first = second = I_FALSE;
+          first = second = false;
         }
 
       s = i.item ()->get_string ();
       o << s;
 
-      if (first) 
+      if (first)
         {
           if (ACE_OS::strcmp (s, "::") != 0)
             {
-              first = I_FALSE;
+              first = false;
             }
           else
             {
-              second = I_TRUE;
+              second = true;
             }
         }
     }
diff --git a/TAO/VERSION b/TAO/VERSION
index c5420605352..32a44b98f08 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.4.7, released Fri Aug 05 07:49:26 2005.
+This is TAO version 1.5.1, released Tue Apr 18 20:51:48 2006.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
@@ -9,3 +9,4 @@ see responses, please do one of the following:
        contents "subscribe tao-users" to majordomo@cs.wustl.edu.
 
     2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 57635d79f29..e12647824b2 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -44,6 +44,7 @@ AC_PREREQ([2.58])
 AC_CONFIG_SRCDIR([tao/TAO_Internal.cpp])
 
 AC_CONFIG_AUX_DIR([../aux_config])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_MACRO_DIR([../m4])
 
 dnl Check what platform we are running on.
@@ -155,16 +156,18 @@ AC_SUBST([TAO_BETA])
 
 dnl We should have --with/--enable flags for these options.
 dnl Until we do, set them to reasonable defaults.
+TAO_ENABLE_MINIMUM_CORBA
 AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false)
+AM_CONDITIONAL(BUILD_ACE_FOR_TAO, false)
 AM_CONDITIONAL(BUILD_RT_CORBA, true)
 AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true)
-AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false)
 AM_CONDITIONAL(BUILD_INTERCEPTORS, true)
 AM_CONDITIONAL(BUILD_ACE_UUID, true)
 AM_CONDITIONAL(BUILD_AMI, true)
 AM_CONDITIONAL(BUILD_REPO, false)
 AM_CONDITIONAL(BUILD_THREADS, true)
 AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
+AM_CONDITIONAL(BUILD_WFMO, false)
 
 ACE_ENABLE_ACEXML
 ACE_ENABLE_SSL
@@ -173,6 +176,9 @@ ACE_ENABLE_QT_REACTOR
 ACE_ENABLE_TK_REACTOR
 ACE_ENABLE_XT_REACTOR
 
+TAO_ENABLE_EXAMPLES
+TAO_ENABLE_TESTS
+
 
 dnl
 dnl SECTION 16: AC_CONFIG_FILES([FILE...])
@@ -200,73 +206,6 @@ AC_CONFIG_FILES([
   docs/tutorials/Quoter/Simple/Persistent/Makefile
   docs/tutorials/Quoter/Simple/Server/Makefile
   docs/tutorials/Quoter/idl/Makefile
-  examples/AMH/Makefile
-  examples/AMH/Sink_Server/Makefile
-  examples/AMI/FL_Callback/Makefile
-  examples/AMI/Makefile
-  examples/Advanced/Makefile
-  examples/Advanced/ch_3/Makefile
-  examples/Buffered_AMI/Makefile
-  examples/Buffered_Oneways/Makefile
-  examples/Callback_Quoter/Makefile
-  examples/Content_Server/AMI_Iterator/Makefile
-  examples/Content_Server/AMI_Observer/Makefile
-  examples/Content_Server/Makefile
-  examples/Content_Server/SMI_Iterator/Makefile
-  examples/Event_Comm/Makefile
-  examples/Kokyu_dsrt_schedulers/Makefile
-  examples/Kokyu_dsrt_schedulers/fp_example/Makefile
-  examples/Kokyu_dsrt_schedulers/mif_example/Makefile
-  examples/Kokyu_dsrt_schedulers/muf_example/Makefile
-  examples/Load_Balancing/Makefile
-  examples/Load_Balancing_persistent/Makefile
-  examples/Logging/Makefile
-  examples/Makefile
-  examples/OBV/Makefile
-  examples/OBV/Typed_Events/Makefile
-  examples/POA/Adapter_Activator/Makefile
-  examples/POA/DSI/Makefile
-  examples/POA/Default_Servant/Makefile
-  examples/POA/Explicit_Activation/Alt_Resources/Makefile
-  examples/POA/Explicit_Activation/Makefile
-  examples/POA/FindPOA/Makefile
-  examples/POA/Forwarding/Makefile
-  examples/POA/Generic_Servant/Makefile
-  examples/POA/Loader/Makefile
-  examples/POA/Makefile
-  examples/POA/NewPOA/Makefile
-  examples/POA/On_Demand_Activation/Makefile
-  examples/POA/On_Demand_Loading/Makefile
-  examples/POA/POA_BiDir/Makefile
-  examples/POA/Reference_Counted_Servant/Makefile
-  examples/POA/RootPOA/Makefile
-  examples/POA/TIE/Makefile
-  examples/Persistent_Grid/Makefile
-  examples/PluggableUDP/Makefile
-  examples/PluggableUDP/tests/Basic/Makefile
-  examples/PluggableUDP/tests/Makefile
-  examples/PluggableUDP/tests/Performance/Makefile
-  examples/PluggableUDP/tests/SimplePerformance/Makefile
-  examples/Quoter/Makefile
-  examples/RTCORBA/Activity/Makefile
-  examples/RTCORBA/Makefile
-  examples/RTScheduling/Fixed_Priority_Scheduler/Makefile
-  examples/RTScheduling/MIF_Scheduler/Makefile
-  examples/RTScheduling/Makefile
-  examples/Simple/Makefile
-  examples/Simple/bank/Makefile
-  examples/Simple/chat/Makefile
-  examples/Simple/echo/Makefile
-  examples/Simple/grid/Makefile
-  examples/Simple/time-date/Makefile
-  examples/Simple/time/Makefile
-  examples/Simulator/Event_Supplier/Makefile
-  examples/Simulator/Makefile
-  examples/TypeCode_Creation/Makefile
-  examples/ior_corbaloc/Makefile
-  examples/mfc/Makefile
-  interop-tests/Makefile
-  interop-tests/wchar/Makefile
   orbsvcs/Concurrency_Service/Makefile
   orbsvcs/CosEvent_Service/Makefile
   orbsvcs/Dump_Schedule/Makefile
@@ -294,225 +233,312 @@ AC_CONFIG_FILES([
   orbsvcs/TAO_Service/Makefile
   orbsvcs/Time_Service/Makefile
   orbsvcs/Trading_Service/Makefile
-  orbsvcs/examples/CosEC/Factory/Makefile
-  orbsvcs/examples/CosEC/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile
-  orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
-  orbsvcs/examples/CosEC/Simple/Makefile
-  orbsvcs/examples/CosEC/TypedSimple/Makefile
-  orbsvcs/examples/FaultTolerance/Makefile
-  orbsvcs/examples/FaultTolerance/RolyPoly/Makefile
-  orbsvcs/examples/ImR/Advanced/Makefile
-  orbsvcs/examples/ImR/Combined_Service/Makefile
-  orbsvcs/examples/ImR/Makefile
-  orbsvcs/examples/LoadBalancing/Makefile
-  orbsvcs/examples/Log/Basic/Makefile
-  orbsvcs/examples/Log/Event/Makefile
-  orbsvcs/examples/Log/Makefile
-  orbsvcs/examples/Log/Notify/Makefile
-  orbsvcs/examples/Log/RTEvent/Makefile
-  orbsvcs/examples/Makefile
-  orbsvcs/examples/Notify/Federation/Agent/Makefile
-  orbsvcs/examples/Notify/Federation/Gate/Makefile
-  orbsvcs/examples/Notify/Federation/Makefile
-  orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile
-  orbsvcs/examples/Notify/Filter/Makefile
-  orbsvcs/examples/Notify/Lanes/Makefile
-  orbsvcs/examples/Notify/Makefile
-  orbsvcs/examples/Notify/Subscribe/Makefile
-  orbsvcs/examples/Notify/ThreadPool/Makefile
-  orbsvcs/examples/ORT/Makefile
-  orbsvcs/examples/RtEC/IIOPGateway/Makefile
-  orbsvcs/examples/RtEC/Kokyu/Makefile
-  orbsvcs/examples/RtEC/MCast/Makefile
-  orbsvcs/examples/RtEC/Makefile
-  orbsvcs/examples/RtEC/Schedule/Makefile
-  orbsvcs/examples/RtEC/Simple/Makefile
-  orbsvcs/examples/Security/Makefile
-  orbsvcs/examples/Security/Send_File/Makefile
   orbsvcs/orbsvcs/Makefile
-  orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile
-  orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile
-  orbsvcs/performance-tests/LoadBalancing/Makefile
-  orbsvcs/performance-tests/Makefile
-  orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/Makefile
-  orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
-  orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
-  orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
-  orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
-  orbsvcs/performance-tests/RTEvent/lib/Makefile
-  orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
-  orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
-  orbsvcs/tests/AVStreams/Component_Switching/Makefile
-  orbsvcs/tests/AVStreams/Full_Profile/Makefile
-  orbsvcs/tests/AVStreams/Latency/Makefile
-  orbsvcs/tests/AVStreams/Makefile
-  orbsvcs/tests/AVStreams/Modify_QoS/Makefile
-  orbsvcs/tests/AVStreams/Multicast/Makefile
-  orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
-  orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
-  orbsvcs/tests/AVStreams/Pluggable/Makefile
-  orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
-  orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
-  orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
-  orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
-  orbsvcs/tests/BiDir_CORBALOC/Makefile
-  orbsvcs/tests/Bug_1334_Regression/Makefile
-  orbsvcs/tests/Bug_1393_Regression/Makefile
-  orbsvcs/tests/Bug_1395_Regression/Makefile
-  orbsvcs/tests/Bug_1630_Regression/Makefile
-  orbsvcs/tests/Bug_2137_Regression/Makefile
-  orbsvcs/tests/Bug_2247_Regression/Makefile
-  orbsvcs/tests/Bug_2248_Regression/Makefile
-  orbsvcs/tests/Concurrency/Makefile
-  orbsvcs/tests/CosEvent/Basic/Makefile
-  orbsvcs/tests/CosEvent/Makefile
-  orbsvcs/tests/CosEvent/lib/Makefile
-  orbsvcs/tests/EC_Custom_Marshal/Makefile
-  orbsvcs/tests/EC_MT_Mcast/Makefile
-  orbsvcs/tests/EC_Mcast/Makefile
-  orbsvcs/tests/EC_Multiple/Makefile
-  orbsvcs/tests/EC_Throughput/Makefile
-  orbsvcs/tests/Event/Basic/Makefile
-  orbsvcs/tests/Event/Makefile
-  orbsvcs/tests/Event/Mcast/Common/Makefile
-  orbsvcs/tests/Event/Mcast/Complex/Makefile
-  orbsvcs/tests/Event/Mcast/Makefile
-  orbsvcs/tests/Event/Mcast/Simple/Makefile
-  orbsvcs/tests/Event/Mcast/Two_Way/Makefile
-  orbsvcs/tests/Event/Performance/Makefile
-  orbsvcs/tests/Event/lib/Makefile
-  orbsvcs/tests/FT_App/Makefile
-  orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
-  orbsvcs/tests/FaultTolerance/IOGR/Makefile
-  orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
-  orbsvcs/tests/FaultTolerance/Makefile
-  orbsvcs/tests/FtRtEvent/Makefile
-  orbsvcs/tests/HTIOP/AMI/Makefile
-  orbsvcs/tests/HTIOP/BiDirectional/Makefile
-  orbsvcs/tests/HTIOP/Hello/Makefile
-  orbsvcs/tests/HTIOP/Makefile
-  orbsvcs/tests/IOR_MCast/Makefile
-  orbsvcs/tests/ImplRepo/Makefile
-  orbsvcs/tests/ImplRepo/NameService/Makefile
-  orbsvcs/tests/ImplRepo/scale/Makefile
-  orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
-  orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile
-  orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
-  orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
-  orbsvcs/tests/InterfaceRepo/Makefile
-  orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
-  orbsvcs/tests/Interoperable_Naming/Makefile
-  orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
-  orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile
-  orbsvcs/tests/LoadBalancing/GenericFactory/Makefile
-  orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile
-  orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile
-  orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile
-  orbsvcs/tests/LoadBalancing/Makefile
-  orbsvcs/tests/Log/Basic_Log_Test/Makefile
-  orbsvcs/tests/Log/Makefile
-  orbsvcs/tests/Makefile
-  orbsvcs/tests/Miop/Makefile
-  orbsvcs/tests/Miop/McastHello/Makefile
-  orbsvcs/tests/Notify/Basic/Makefile
-  orbsvcs/tests/Notify/Blocking/Makefile
-  orbsvcs/tests/Notify/Destroy/Makefile
-  orbsvcs/tests/Notify/Discarding/Makefile
-  orbsvcs/tests/Notify/Driver/Makefile
-  orbsvcs/tests/Notify/MT_Dispatching/Makefile
-  orbsvcs/tests/Notify/Makefile
-  orbsvcs/tests/Notify/Ordering/Makefile
-  orbsvcs/tests/Notify/PluggableTopology/Makefile
-  orbsvcs/tests/Notify/RT_lib/Makefile
-  orbsvcs/tests/Notify/Reconnecting/Makefile
-  orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
-  orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
-  orbsvcs/tests/Notify/Structured_Filter/Makefile
-  orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
-  orbsvcs/tests/Notify/Test_Filter/Makefile
-  orbsvcs/tests/Notify/XML_Persistence/Makefile
-  orbsvcs/tests/Notify/lib/Makefile
-  orbsvcs/tests/Notify/performance-tests/Filter/Makefile
-  orbsvcs/tests/Notify/performance-tests/Makefile
-  orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
-  orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
-  orbsvcs/tests/Property/Makefile
-  orbsvcs/tests/Redundant_Naming/Makefile
-  orbsvcs/tests/Sched/Makefile
-  orbsvcs/tests/Sched_Conf/Makefile
-  orbsvcs/tests/Security/BiDirectional/Makefile
-  orbsvcs/tests/Security/Big_Request/Makefile
-  orbsvcs/tests/Security/Callback/Makefile
-  orbsvcs/tests/Security/Crash_Test/Makefile
-  orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
-  orbsvcs/tests/Security/MT_SSLIOP/Makefile
-  orbsvcs/tests/Security/Makefile
-  orbsvcs/tests/Security/Secure_Invocation/Makefile
-  orbsvcs/tests/Security/ssliop_corbaloc/Makefile
-  orbsvcs/tests/Simple_Naming/Makefile
-  orbsvcs/tests/Time/Makefile
-  orbsvcs/tests/Trading/Makefile
-  orbsvcs/tests/ior_corbaname/Makefile
-  orbsvcs/tests/tests_svc_loader/Makefile
-  performance-tests/Makefile
-  performance-tests/Anyop/Makefile
-  performance-tests/Callback/Makefile
-  performance-tests/Cubit/Makefile
-  performance-tests/Cubit/TAO/Makefile
-  performance-tests/Cubit/TAO/IDL_Cubit/Makefile
-  performance-tests/Cubit/TAO/DII_Cubit/Makefile
-  performance-tests/Cubit/TAO/MT_Cubit/Makefile
-  performance-tests/Latency/Makefile
-  performance-tests/Latency/AMH_Single_Threaded/Makefile
-  performance-tests/Latency/AMI/Makefile
-  performance-tests/Latency/Collocation/Makefile
-  performance-tests/Latency/DII/Makefile
-  performance-tests/Latency/DSI/Makefile
-  performance-tests/Latency/Deferred/Makefile
-  performance-tests/Latency/Single_Threaded/Makefile
-  performance-tests/Latency/Thread_Per_Connection/Makefile
-  performance-tests/Latency/Thread_Pool/Makefile
-  performance-tests/Memory/Makefile
-  performance-tests/Memory/IORsize/Makefile
-  performance-tests/Memory/Single_Threaded/Makefile
-  performance-tests/POA/Makefile
-  performance-tests/POA/Create_Reference/Makefile
-  performance-tests/POA/Demux/Makefile
-  performance-tests/POA/Implicit_Activation/Makefile
-  performance-tests/POA/Object_Creation_And_Registration/Makefile
-  performance-tests/Pluggable/Makefile
-  performance-tests/Protocols/Makefile
-  performance-tests/RTCorba/Makefile
-  performance-tests/RTCorba/Multiple_Endpoints/Makefile
-  performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
-  performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
-  performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
-  performance-tests/RTCorba/Oneways/Makefile
-  performance-tests/RTCorba/Oneways/Reliable/Makefile
-  performance-tests/RTCorba/Thread_Pool/Makefile
-  performance-tests/Sequence_Latency/Makefile
-  performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile
-  performance-tests/Sequence_Latency/AMI/Makefile
-  performance-tests/Sequence_Latency/DII/Makefile
-  performance-tests/Sequence_Latency/DSI/Makefile
-  performance-tests/Sequence_Latency/Deferred/Makefile
-  performance-tests/Sequence_Latency/Single_Threaded/Makefile
-  performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile
-  performance-tests/Sequence_Latency/Thread_Pool/Makefile
-  performance-tests/Throughput/Makefile
   tao/Makefile
   utils/Makefile
   utils/catior/Makefile
   utils/nslist/Makefile
  ])
 
+if test $tao_build_examples = yes; then
+  AC_CONFIG_FILES([
+    examples/AMH/Makefile
+    examples/AMH/Sink_Server/Makefile
+    examples/AMI/FL_Callback/Makefile
+    examples/AMI/Makefile
+    examples/Advanced/Makefile
+    examples/Advanced/ch_3/Makefile
+    examples/Buffered_AMI/Makefile
+    examples/Buffered_Oneways/Makefile
+    examples/Callback_Quoter/Makefile
+    examples/Content_Server/AMI_Iterator/Makefile
+    examples/Content_Server/AMI_Observer/Makefile
+    examples/Content_Server/Makefile
+    examples/Content_Server/SMI_Iterator/Makefile
+    examples/Event_Comm/Makefile
+    examples/Kokyu_dsrt_schedulers/Makefile
+    examples/Kokyu_dsrt_schedulers/fp_example/Makefile
+    examples/Kokyu_dsrt_schedulers/mif_example/Makefile
+    examples/Kokyu_dsrt_schedulers/muf_example/Makefile
+    examples/Load_Balancing/Makefile
+    examples/Load_Balancing_persistent/Makefile
+    examples/Logging/Makefile
+    examples/Makefile
+    examples/OBV/Makefile
+    examples/OBV/Typed_Events/Makefile
+    examples/POA/Adapter_Activator/Makefile
+    examples/POA/DSI/Makefile
+    examples/POA/Default_Servant/Makefile
+    examples/POA/Explicit_Activation/Alt_Resources/Makefile
+    examples/POA/Explicit_Activation/Makefile
+    examples/POA/FindPOA/Makefile
+    examples/POA/Forwarding/Makefile
+    examples/POA/Generic_Servant/Makefile
+    examples/POA/Loader/Makefile
+    examples/POA/Makefile
+    examples/POA/NewPOA/Makefile
+    examples/POA/On_Demand_Activation/Makefile
+    examples/POA/On_Demand_Loading/Makefile
+    examples/POA/POA_BiDir/Makefile
+    examples/POA/Reference_Counted_Servant/Makefile
+    examples/POA/RootPOA/Makefile
+    examples/POA/TIE/Makefile
+    examples/Persistent_Grid/Makefile
+    examples/PluggableUDP/Makefile
+    examples/PluggableUDP/tests/Basic/Makefile
+    examples/PluggableUDP/tests/Makefile
+    examples/PluggableUDP/tests/Performance/Makefile
+    examples/PluggableUDP/tests/SimplePerformance/Makefile
+    examples/Quoter/Makefile
+    examples/RTCORBA/Activity/Makefile
+    examples/RTCORBA/Makefile
+    examples/RTScheduling/Fixed_Priority_Scheduler/Makefile
+    examples/RTScheduling/MIF_Scheduler/Makefile
+    examples/RTScheduling/Makefile
+    examples/Simple/Makefile
+    examples/Simple/bank/Makefile
+    examples/Simple/chat/Makefile
+    examples/Simple/echo/Makefile
+    examples/Simple/grid/Makefile
+    examples/Simple/time-date/Makefile
+    examples/Simple/time/Makefile
+    examples/Simulator/Event_Supplier/Makefile
+    examples/Simulator/Makefile
+    examples/TypeCode_Creation/Makefile
+    examples/ior_corbaloc/Makefile
+    examples/mfc/Makefile
+    orbsvcs/examples/CosEC/Factory/Makefile
+    orbsvcs/examples/CosEC/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile
+    orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
+    orbsvcs/examples/CosEC/Simple/Makefile
+    orbsvcs/examples/CosEC/TypedSimple/Makefile
+    orbsvcs/examples/FaultTolerance/Makefile
+    orbsvcs/examples/FaultTolerance/RolyPoly/Makefile
+    orbsvcs/examples/ImR/Advanced/Makefile
+    orbsvcs/examples/ImR/Combined_Service/Makefile
+    orbsvcs/examples/ImR/Makefile
+    orbsvcs/examples/LoadBalancing/Makefile
+    orbsvcs/examples/Log/Basic/Makefile
+    orbsvcs/examples/Log/Event/Makefile
+    orbsvcs/examples/Log/Makefile
+    orbsvcs/examples/Log/Notify/Makefile
+    orbsvcs/examples/Log/RTEvent/Makefile
+    orbsvcs/examples/Makefile
+    orbsvcs/examples/Notify/Federation/Agent/Makefile
+    orbsvcs/examples/Notify/Federation/Gate/Makefile
+    orbsvcs/examples/Notify/Federation/Makefile
+    orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile
+    orbsvcs/examples/Notify/Filter/Makefile
+    orbsvcs/examples/Notify/Lanes/Makefile
+    orbsvcs/examples/Notify/Makefile
+    orbsvcs/examples/Notify/Subscribe/Makefile
+    orbsvcs/examples/Notify/ThreadPool/Makefile
+    orbsvcs/examples/ORT/Makefile
+    orbsvcs/examples/RtEC/IIOPGateway/Makefile
+    orbsvcs/examples/RtEC/Kokyu/Makefile
+    orbsvcs/examples/RtEC/MCast/Makefile
+    orbsvcs/examples/RtEC/Makefile
+    orbsvcs/examples/RtEC/Schedule/Makefile
+    orbsvcs/examples/RtEC/Simple/Makefile
+    orbsvcs/examples/Security/Makefile
+    orbsvcs/examples/Security/Send_File/Makefile
+  ])
+fi
+
+if test $tao_build_tests = yes; then
+  AC_CONFIG_FILES([
+    interop-tests/Makefile
+    interop-tests/wchar/Makefile
+    performance-tests/Anyop/Makefile
+    performance-tests/CSD_Strategy/Makefile
+    performance-tests/CSD_Strategy/TestApps/Makefile
+    performance-tests/CSD_Strategy/TestInf/Makefile
+    performance-tests/CSD_Strategy/TestServant/Makefile
+    performance-tests/Callback/Makefile
+    performance-tests/Cubit/Makefile
+    performance-tests/Cubit/TAO/DII_Cubit/Makefile
+    performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+    performance-tests/Cubit/TAO/MT_Cubit/Makefile
+    performance-tests/Cubit/TAO/Makefile
+    performance-tests/Latency/AMH_Single_Threaded/Makefile
+    performance-tests/Latency/AMI/Makefile
+    performance-tests/Latency/Collocation/Makefile
+    performance-tests/Latency/DII/Makefile
+    performance-tests/Latency/DSI/Makefile
+    performance-tests/Latency/Deferred/Makefile
+    performance-tests/Latency/Makefile
+    performance-tests/Latency/Single_Threaded/Makefile
+    performance-tests/Latency/Thread_Per_Connection/Makefile
+    performance-tests/Latency/Thread_Pool/Makefile
+    performance-tests/Makefile
+    performance-tests/Memory/IORsize/Makefile
+    performance-tests/Memory/Makefile
+    performance-tests/Memory/Single_Threaded/Makefile
+    performance-tests/POA/Create_Reference/Makefile
+    performance-tests/POA/Demux/Makefile
+    performance-tests/POA/Implicit_Activation/Makefile
+    performance-tests/POA/Makefile
+    performance-tests/POA/Object_Creation_And_Registration/Makefile
+    performance-tests/Pluggable/Makefile
+    performance-tests/Protocols/Makefile
+    performance-tests/RTCorba/Makefile
+    performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
+    performance-tests/RTCorba/Multiple_Endpoints/Makefile
+    performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
+    performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
+    performance-tests/RTCorba/Oneways/Makefile
+    performance-tests/RTCorba/Oneways/Reliable/Makefile
+    performance-tests/RTCorba/Thread_Pool/Makefile
+    performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile
+    performance-tests/Sequence_Latency/AMI/Makefile
+    performance-tests/Sequence_Latency/DII/Makefile
+    performance-tests/Sequence_Latency/DSI/Makefile
+    performance-tests/Sequence_Latency/Deferred/Makefile
+    performance-tests/Sequence_Latency/Makefile
+    performance-tests/Sequence_Latency/Single_Threaded/Makefile
+    performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile
+    performance-tests/Sequence_Latency/Thread_Pool/Makefile
+    performance-tests/Throughput/Makefile
+    orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile
+    orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile
+    orbsvcs/performance-tests/LoadBalancing/Makefile
+    orbsvcs/performance-tests/Makefile
+    orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
+    orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
+    orbsvcs/performance-tests/RTEvent/Makefile
+    orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
+    orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
+    orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
+    orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
+    orbsvcs/performance-tests/RTEvent/lib/Makefile
+    orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
+    orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
+    orbsvcs/tests/AVStreams/Component_Switching/Makefile
+    orbsvcs/tests/AVStreams/Full_Profile/Makefile
+    orbsvcs/tests/AVStreams/Latency/Makefile
+    orbsvcs/tests/AVStreams/Makefile
+    orbsvcs/tests/AVStreams/Modify_QoS/Makefile
+    orbsvcs/tests/AVStreams/Multicast/Makefile
+    orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
+    orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
+    orbsvcs/tests/AVStreams/Pluggable/Makefile
+    orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
+    orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
+    orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
+    orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
+    orbsvcs/tests/BiDir_CORBALOC/Makefile
+    orbsvcs/tests/Bug_1334_Regression/Makefile
+    orbsvcs/tests/Bug_1393_Regression/Makefile
+    orbsvcs/tests/Bug_1395_Regression/Makefile
+    orbsvcs/tests/Bug_1630_Regression/Makefile
+    orbsvcs/tests/Bug_2074_Regression/Makefile
+    orbsvcs/tests/Bug_2137_Regression/Makefile
+    orbsvcs/tests/Bug_2247_Regression/Makefile
+    orbsvcs/tests/Bug_2248_Regression/Makefile
+    orbsvcs/tests/Bug_2285_Regression/Makefile
+    orbsvcs/tests/Bug_2287_Regression/Makefile
+    orbsvcs/tests/Bug_2316_Regression/Makefile
+    orbsvcs/tests/Bug_2377_Regression/Makefile
+    orbsvcs/tests/Concurrency/Makefile
+    orbsvcs/tests/CosEvent/Basic/Makefile
+    orbsvcs/tests/CosEvent/Makefile
+    orbsvcs/tests/CosEvent/lib/Makefile
+    orbsvcs/tests/EC_Custom_Marshal/Makefile
+    orbsvcs/tests/EC_MT_Mcast/Makefile
+    orbsvcs/tests/EC_Mcast/Makefile
+    orbsvcs/tests/EC_Multiple/Makefile
+    orbsvcs/tests/EC_Throughput/Makefile
+    orbsvcs/tests/Event/Basic/Makefile
+    orbsvcs/tests/Event/Makefile
+    orbsvcs/tests/Event/Mcast/Common/Makefile
+    orbsvcs/tests/Event/Mcast/Complex/Makefile
+    orbsvcs/tests/Event/Mcast/Makefile
+    orbsvcs/tests/Event/Mcast/Simple/Makefile
+    orbsvcs/tests/Event/Mcast/Two_Way/Makefile
+    orbsvcs/tests/Event/Performance/Makefile
+    orbsvcs/tests/Event/lib/Makefile
+    orbsvcs/tests/FT_App/Makefile
+    orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
+    orbsvcs/tests/FaultTolerance/IOGR/Makefile
+    orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+    orbsvcs/tests/FaultTolerance/Makefile
+    orbsvcs/tests/FtRtEvent/Makefile
+    orbsvcs/tests/HTIOP/AMI/Makefile
+    orbsvcs/tests/HTIOP/BiDirectional/Makefile
+    orbsvcs/tests/HTIOP/Hello/Makefile
+    orbsvcs/tests/HTIOP/Makefile
+    orbsvcs/tests/IOR_MCast/Makefile
+    orbsvcs/tests/ImplRepo/Makefile
+    orbsvcs/tests/ImplRepo/NameService/Makefile
+    orbsvcs/tests/ImplRepo/scale/Makefile
+    orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/Makefile
+    orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
+    orbsvcs/tests/Interoperable_Naming/Makefile
+    orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
+    orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile
+    orbsvcs/tests/LoadBalancing/GenericFactory/Makefile
+    orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile
+    orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile
+    orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile
+    orbsvcs/tests/LoadBalancing/Makefile
+    orbsvcs/tests/Log/Basic_Log_Test/Makefile
+    orbsvcs/tests/Log/Makefile
+    orbsvcs/tests/Makefile
+    orbsvcs/tests/Miop/Makefile
+    orbsvcs/tests/Miop/McastHello/Makefile
+    orbsvcs/tests/Notify/Basic/Makefile
+    orbsvcs/tests/Notify/Blocking/Makefile
+    orbsvcs/tests/Notify/Destroy/Makefile
+    orbsvcs/tests/Notify/Discarding/Makefile
+    orbsvcs/tests/Notify/Driver/Makefile
+    orbsvcs/tests/Notify/MT_Dispatching/Makefile
+    orbsvcs/tests/Notify/Makefile
+    orbsvcs/tests/Notify/Ordering/Makefile
+    orbsvcs/tests/Notify/PluggableTopology/Makefile
+    orbsvcs/tests/Notify/RT_lib/Makefile
+    orbsvcs/tests/Notify/Reconnecting/Makefile
+    orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+    orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+    orbsvcs/tests/Notify/Structured_Filter/Makefile
+    orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+    orbsvcs/tests/Notify/Test_Filter/Makefile
+    orbsvcs/tests/Notify/XML_Persistence/Makefile
+    orbsvcs/tests/Notify/lib/Makefile
+    orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+    orbsvcs/tests/Notify/performance-tests/Makefile
+    orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+    orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
+    orbsvcs/tests/Property/Makefile
+    orbsvcs/tests/Redundant_Naming/Makefile
+    orbsvcs/tests/Sched/Makefile
+    orbsvcs/tests/Sched_Conf/Makefile
+    orbsvcs/tests/Security/BiDirectional/Makefile
+    orbsvcs/tests/Security/Big_Request/Makefile
+    orbsvcs/tests/Security/Callback/Makefile
+    orbsvcs/tests/Security/Crash_Test/Makefile
+    orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
+    orbsvcs/tests/Security/MT_SSLIOP/Makefile
+    orbsvcs/tests/Security/Makefile
+    orbsvcs/tests/Security/Secure_Invocation/Makefile
+    orbsvcs/tests/Security/ssliop_corbaloc/Makefile
+    orbsvcs/tests/Simple_Naming/Makefile
+    orbsvcs/tests/Time/Makefile
+    orbsvcs/tests/Trading/Makefile
+    orbsvcs/tests/ior_corbaname/Makefile
+    orbsvcs/tests/tests_svc_loader/Makefile
+  ])
+fi
+
 dnl Note that the "TAO_VERSION" in the message below is an M4 macro
 dnl that expands to the version of TAO being configured.
 AC_CONFIG_COMMANDS([default],[
diff --git a/TAO/docs/INS.html b/TAO/docs/INS.html
index 62533e9fce7..38d924cb9de 100644
--- a/TAO/docs/INS.html
+++ b/TAO/docs/INS.html
@@ -47,7 +47,7 @@ multicast to resolve the service. <P>
 The Naming Service process acts as an IIOP Agent to respond with the
 IOR for the given service name. If the service being resolved is the
 Naming Service or the Trading Service, TAO checks the appropriate <A
-HREF="Options.html#ev">environment variables</A> prior to using
+HREF="Options.html#EV">environment variables</A> prior to using
 multicast to obtain the appropriate port number or IOR.<p>
 
 The following diagram illustrates the order in which these various
diff --git a/TAO/docs/Makefile.am b/TAO/docs/Makefile.am
index 177b995fd7a..0c191d44985 100644
--- a/TAO/docs/Makefile.am
+++ b/TAO/docs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         tutorials
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 9879190f110..894192e0a1e 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -401,7 +401,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBInitRef MyService=shmiop://1.1@hostname:port/service_name
+          -ORBInitRef MyService=corbaloc:shmiop:1.1@hostname:port/service_name
         </CODE>
     </BLOCKQUOTE>
 
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index a957abe042f..c5151b03d56 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -201,7 +201,7 @@ same host:
 % NameService.exe -ORBEndpoint iiop://localhost:12345
 </code></p>
 <p><code>
-% client.exe -ORBInitRef NameService=iiop://localhost:12345
+% client.exe -ORBInitRef NameService=corbaloc:iiop:localhost:12345/NameService
 </code></p>
 <p>An explanation of these command-line options appears below. </p>
 <p></p>
@@ -326,6 +326,12 @@ current message block contains enough space for it -- the octet
 sequence is copied instead of appended to the CDR stream. </td>
       </tr>
       <tr>
+        <td><code>-ORBMaxMessageSize</code> <em>maxsize</em></td>
+        <td><a name="-ORBMaxMessageSize"></a>Set maximum size of
+              outgoing GIOP request/reply.  The request or reply
+              being sent will be fragmented, if necessary.</td>
+      </tr>
+      <tr>
         <td><code>-ORBCollocation</code> <em>global/per-orb/no</em></td>
         <td><a name="-ORBCollocation"></a>Specifies the use of
 collocation object optimization. If <code>global</code> is specified
@@ -409,8 +415,7 @@ preferences over normal I/O, thereby causing priority inversion.</p>
         </td>
       </tr>
       <tr>
-       <td><code>-ORBDisableRTCollocation</code> <em>boolean
-       (0|1)</em></td> <td><a name="-ORBDisableRTCollocation"></a>This
+       <td><code>-ORBDisableRTCollocation</code> <em>boolean (0|1)</em></td> <td><a name="-ORBDisableRTCollocation"></a>This
        option controls whether the application wants to use or discard
        RT collocation decisions made by the RT ORB. A value of
        <CODE>1</CODE> (true) disables RT collocation decisions and falls back on the default
@@ -420,6 +425,24 @@ preferences over normal I/O, thereby causing priority inversion.</p>
        decisions for better performance. The default value is
        <code>0</code> (false). </td>
        </tr>
+      <tr>
+        <td><code>-ORBUseLocalMemoryPool</code> <em>boolean (0|1)</em></td>
+        <td><a name="-ORBUseLocalMemoryPool"></a>TAO can use a local memory pool
+         to satisfy some of its needs for heap storage, as it is often more
+         efficient than using the platform's default memory allocator. The local
+         pool will always grow as large as necessary to satisfy memory allocations,
+         but it will never shrink. This means that sometimes a process can retain
+         memory that it no longer needs. If the default allocator is used then
+         TAO gives memory back as soon as it is not needed which allows for better
+         resource sharing at the expense of memory deallocation time.
+         <p>If this option is disabled (<code>0</code>), the ORB will use the
+        default allocator for the platform.</p>
+         <p>If this option is enabled (<code>1</code>), the orb will use the
+         local memory pool.</p>
+        <p> This option defaults to the compile-time option specified by
+        <code>TAO_USES_LOCAL_MEMORY_POOL</code>.</p>
+        </td>
+      </tr>
     </tbody>
   </table>
   </p>
@@ -498,16 +521,25 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td>
         </tr>
       <tr>
         <td><code>-ORBEnforcePreferredInterfaces</code>
-        <em>Yes/No</em></td>
-        <td><a name="-ORBEnforcePreferredInterfaces"></a> If this option is specified, then TAO will only try to use the interfaces
-    specified by the -ORBPreferredInterfaces option. By default, if a connection
-    cannot be made using a preferred interface, then TAO will attempt to use
-    the default interface. (INADDR_ANY)
-    Note : If none of the preferred interfaces apply to an outgoing connection
-    then they will not be enforced. Therefore, for this option to have any effect,
-    the connection through a legal preferred interface must fail.
+        <em>boolean (0|1)</em></td>
+        <td><a name="-ORBEnforcePreferredInterfaces"></a> If this
+            option is set to <CODE>1</CODE> (true), then TAO will only try to use the
+            interfaces specified by the <CODE>-ORBPreferredInterfaces</CODE> option.
+            The default is <CODE>0</CODE> (false), in which case if a connection
+            cannot be made using a preferred interface, TAO will
+            attempt to use the default interface (<CODE>INADDR_ANY</CODE>).
+            Note: If none of the preferred interfaces apply to an outgoing connection
+            then they will not be enforced.  For this option to have
+            any effect, therefore, the connection through a legal preferred interface must fail.
         </tr>
       <tr>
+        <td><code>-ORBKeepalive</code> <em>boolean (0|1)</em></td>
+        <td><a name="-ORBKeepalive"></a>This option allows users to
+        specify that the SO_KEEPALIVE option is set on TCP sockets.
+        The default is <code>0</code> (false).
+        </td>
+      </tr>
+      <tr>
         <td><code>-ORBLingerTimeout</code> <em>timeout</em></td>
         <td><a name="-ORBLingerTimeout"></a> This option allows users to
         set the linger timeout on a TCP socket before closing it.  Hence,
@@ -675,21 +707,21 @@ is set. The default is true. </td>
         </td>
       </tr>
       <tr>
-        <td><code>-ORBPreferIPV6Interfaces</code> <em>Yes/No</em></td>
+        <td><code>-ORBPreferIPV6Interfaces</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBPreferIPV6Interfaces"></a>
-          This option directs the default endpoint selector for client connections
-          to first attempt to connect any IIOP endpoints from a provided IOR specifying
-          IPv6 interfaces.
-          Only when none of these can be found or sucessfully connected IPv4
-          interfaces will be tried.
+          If option is <CODE>1</CODE> (true) it directs the default
+          endpoint selector for client connections to first attempt to
+          connect any IIOP endpoints from a provided IOR specifying
+          IPv6 interfaces.  Only when none of these can be found or sucessfully connected IPv4
+          interfaces will be tried.  The default is <CODE>0</CODE> (false).
           <p>
-          This option is only available for IPv6 enabled builds of TAO (ACE_HAS_IPV6).
+          This option is only available for IPv6 enabled builds of TAO (<CODE>ACE_HAS_IPV6</CODE>).
         </td>
       </tr>
       <tr>
-        <td><code>-ORBConnectIPV6Only</code> <em>Yes/No</em></td>
+        <td><code>-ORBConnectIPV6Only</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBConnectIPV6Only"></a>
-          This option directs a server ORB to:<br><p>
+          If this option is <CODE>1</CODE> (true) it directs a server ORB to:<br><p>
           <li>allow only IPv6 interfaces as listening endpoints</li>
           <li>encode only IPv6 interfaces in the IOR profile</li>
           <li>prevent (depending on availability of IPV6_V6ONLY socket option)
@@ -697,8 +729,8 @@ is set. The default is true. </td>
           <p>
           This option directs the default endpoint selector for client connections
           to only attempt to connect any IIOP endpoints from a provided IOR specifying
-          IPv6 interfaces.
-          Any available IPv4 interfaces will be ignored.
+          IPv6 interfaces.  Any available IPv4 interfaces will be
+              ignored.  The default setting is <CODE>0</CODE> (false).
           <p>
           This option is only available for IPv6 enabled builds of TAO (ACE_HAS_IPV6).
         </td>
@@ -894,7 +926,7 @@ can improve performance by reducing the number of kernel level locks. </td>
         <td><code>-ORBProtocolFactory</code> <em>factory</em></td>
         <td><a name="-ORBProtocolFactory"></a>Specify which pluggable
 protocol factory to load. By default, only the factory for the IIOP
-protocol (<code>IIOP_Factory</code> is loaded.
+protocol (<code>IIOP_Factory</code>) is loaded.
         <p>For example, if some protocol called <em><code>Foo</code></em>
 whose factory was called <em><code>Foo_Factory</code></em> was
 available, then it could be loaded into TAO by specifying <code>-ORBProtocolFactory
@@ -999,7 +1031,7 @@ until all the data is sent.
         </td>
       </tr>
       <tr>
-        <td><code>-ORBDropRepliesDuringShutdown</code> <em>0|1</em></td>
+        <td><code>-ORBDropRepliesDuringShutdown</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBDropRepliesDuringShutdown"></a> Strategy to
         make the ORB wait for replies to show up even if the ORB is
         shutdown. The default is to drop replies. For example, clients
@@ -1347,7 +1379,7 @@ allowed when no forwarding is used or only a single threaded client. </td>
         </em>
 </td>
         <td><em>Please note that these two options are synonymous and can be used interchangeably.</em>
-	<p><a name="-ORBClientConnectionHandler"></a><em>ST</em> means
+        <p><a name="-ORBClientConnectionHandler"></a><em>ST</em> means
 use the single-threaded client connection handler, i.e., the leader
 follower model will not be used. However, <em>ST</em> does support
 nested upcalls and handling of new requests while waiting for the reply
@@ -1361,7 +1393,8 @@ instead of waiting in the Reactor using the Leader/Followers
 pattern. The <em>RW</em> strategy only works when the application
 does not have to worry about new request showing up when waiting for a
 response. Further, this strategy cannot be used with Asynchronous
-Method Invocation (AMI) calls. Therefore, this strategy is appropriate
+Method Invocation (AMI) calls and when using BiDIR GIOP.
+Therefore, this strategy is appropriate
 only for "pure" synchronous clients. Note that applications that
 require nested upcalls are not "pure" synchronous clients. Also note that this
 strategy will only affect two way calls, since there is no waiting for
@@ -1382,6 +1415,32 @@ I'm not sure what the affect of AMI on this option is.
         <p>Default for this option is <em>MT</em>. </p>
         </td>
       </tr>
+
+      <tr>
+        <td><code>-ORBConnectionHandlerCleanup</code> <em>0 | 1</em><br>
+        </td>
+	<td><a name="-ORBConnectionHandlerCleanup"></a>Setting this
+        option to <em>1</em> lets the ORB know that connection
+        handlers setup for sending messages need to  be cleaned up
+        when errors occur. This option has an  effect only for
+        <em> -ORBClientConnectionHandler RW </em>. Rest of  the
+        options for <em> -ORBCleintConnectionHandler </em> have been
+        automatically set up for cleaning the connection
+        handlers. Setting the option to <em> 1 </em> has a side
+        effect of registering and unregistering the connection
+        handlers with the Reactor for  every invocation, which has a
+        negative impact on performance. Setting  the option to <em> 0
+        </em> prevents this performance impact but leads  to problems
+        outlined
+ <A
+ href="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2186">
+ here</A> and  <a
+ href="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2224">
+ here</A>
+        <p>Default for this option is <em>0</em>. </p>
+        </td>
+      </tr>
+
       <tr>
         <td><code>-ORBTransportMuxStrategy</code> <em>EXCLUSIVE | MUXED</em></td>
         <td><a name="ORBTransportMuxStrategy"></a><em>EXCLUSIVE</em>
diff --git a/TAO/docs/Security/SSLIOP-INSTALL.html b/TAO/docs/Security/SSLIOP-INSTALL.html
index 04868995bcf..b2e5dae3dd4 100644
--- a/TAO/docs/Security/SSLIOP-INSTALL.html
+++ b/TAO/docs/Security/SSLIOP-INSTALL.html
@@ -17,7 +17,10 @@
 <p>The first step for all platforms is to build and install the <A HREF="http://www.openssl.org/">OpenSSL</A>
   distribution. Then the TAO SSLIOP pluggable protocol library must be built according
   to the instructions below. Refer to the <a href="SSLIOP.html">TAO SSLIOP usage
-  instructions</a> for details about how to use the SSLIOP pluggable protocol.</p>
+  instructions</a> for details about how to use the SSLIOP pluggable protocol. 
+  See the <a href="../../../ACE-INSTALL.html#sslinstall">ACE 
+  installation notes</A> for how to build ACE_SSL after you have build OpenSSL.
+</p>
 <h3>UNIX</h3>
 <OL>
   <LI>Make sure the OpenSSL header file directory is in your compiler's include
@@ -43,8 +46,8 @@
     </table>
     <br>
 
-  <LI>Build ACE and TAO as described in the <A HREF="http://cvs.doc.wustl.edu/viewcvs.cgi/*checkout*//ACE-INSTALL.html?rev=HEAD&content-type=text/html">ACE
-    installation</A> instructions and the <A HREF="http://cvs.doc.wustl.edu/viewcvs.cgi/*checkout*/TAO/TAO-INSTALL.html?rev=HEAD&content-type=text/html">TAO
+  <LI>Build ACE and TAO as described in the <A HREF="../../../ACE-INSTALL.html">ACE
+    installation</A> instructions and the <A HREF="../../../TAO/TAO-INSTALL.html">TAO
     installation</A> instructions, respectively. When building ACE and TAO, add
     &quot;<font face="Courier New, Courier, mono">ssl=1</font>&quot; to your <font face="Courier New, Courier, mono">make</font>
     command line invocation, or add it to your <font face="Courier New, Courier, mono">platform_macros.GNU</font>
@@ -62,8 +65,8 @@
   <li>Set the OpenSSL library directory path under the <b><i>Directories</i></b>
     tab - <i><b>Library Files</b></i> setting in the <i><b>Tools-&gt;Options</b></i>
     dialog. A typical value would be something like: <code>openssl-0.9.6\out32dll</code></li>
-  <li>Open the <code>TAOACE.dsw</code> workspace, and refer to the <a href="http://cvs.doc.wustl.edu/viewcvs.cgi/*checkout*//ACE-INSTALL.html?rev=HEAD&content-type=text/html">ACE
-    installation</a> and the <a href="http://cvs.doc.wustl.edu/viewcvs.cgi/*checkout*/TAO/TAO-INSTALL.html?rev=HEAD&content-type=text/html">TAO
+  <li>Open the <code>TAOACE.dsw</code> workspace, and refer to the <a href="../../../ACE-INSTALL.html">ACE
+    installation</a> and the <a href="../../../TAO/TAO-INSTALL.html">TAO
     installation</a> instructions for details on creating a <code>config.h</code>
     configuration header for this platform. Once the config.h file has been created,
     build <code>SSLIOP</code> project. All project dependencies are already set,
@@ -91,7 +94,6 @@
           <code>SSL_ROOT</code> environment variable to point to the
           location of OpenSSL. For example:
         <p><code>set SSL_ROOT=c:\openssl-0.9.6h</code>
-        <p>Now build ACE+TAO as normal.
     </ol>
 
 <p>&nbsp;</p>
diff --git a/TAO/docs/Smart_Proxies.html b/TAO/docs/Smart_Proxies.html
index a2106a2af45..c29a03ac88f 100644
--- a/TAO/docs/Smart_Proxies.html
+++ b/TAO/docs/Smart_Proxies.html
@@ -274,7 +274,7 @@ protected:
 
 };
 
-// ----------------- User Implemenatation Begins here----------------
+// ----------------- User Implementation Begins here----------------
 
 // Note: This has to be implemented by the user
 class SmartFactory : public TAO_Default_Proxy_Factory
diff --git a/TAO/docs/TAO-metrics.html b/TAO/docs/TAO-metrics.html
index ad4d79f904a..d35912ae7f9 100644
--- a/TAO/docs/TAO-metrics.html
+++ b/TAO/docs/TAO-metrics.html
@@ -12,7 +12,7 @@ bgcolor="#ffffff">
 <HR>
 <H3> TAO (ACE ORB) Performance Metrics</H3>
 
-<A HREf="http://www.dre/vanderbilt.edu/TAO">TAO</A>'s
+<A HREf="http://www.dre.vanderbilt.edu/TAO">TAO</A>'s
 efficiency, scalability, and predictability have been measured on many
 different real-time operating systems with different features.  Here
 are some pointers to obtain more information on the evaluation and
diff --git a/TAO/docs/TAO-tutorials.html b/TAO/docs/TAO-tutorials.html
index f63bb7b0e2f..2b680c10fba 100644
--- a/TAO/docs/TAO-tutorials.html
+++ b/TAO/docs/TAO-tutorials.html
@@ -18,15 +18,12 @@
 HREF="tutorials/Quoter/">Quoter
     tutorial</A> <P>
 
-<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> This
-    document is a PDF version of <A
-HREF="http://download.ociweb.com/tao_dev_guide_getting_started.pdf">chapter 3</A> from <A
+<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> There
+are several <A HREF="http://www.theaceorb.com/downloads/1.4a/index.html">documents</A> from <A
 HREF="http://www.theaceorb.com/">OCI</A>'s <A
 HREF="http://www.theaceorb.com/product/">TAO
-Developer's Guide</A>.  It
-    details the process of building and running a simple client and
-    server using TAO. 
-</A> <P>
+Developer's Guide</A> that describe the process of building and running a simple client and
+    server using TAO and MPC. <P>
 
             <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> 
 Additional tutorials are available in the <A
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index e30da68326f..3bd5e56ad8b 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -17,14 +17,14 @@ TAO IDL Compiler User's Guide</h3>
 <h3> Scope</h3> This document describes the options and features of
 TAO IDL compiler.  It is not a reference manual or tutorial on OMG
 IDL.  For more information on OMG IDL see the <A
-HREF="http://cgi.omg.org/library/c2indx.html">online CORBA
-specification</A> and the <A
+HREF="http://www.omg.org/technology/documents/corba_spec_catalog.htm">
+online CORBA specification</A> and the <A
 HREF="http://www.triodia.com/staff/michi-henning.html">Advanced CORBA
 Programming with C++</A> book.  More information on the design of
 TAO's IDL compiler is also available <A
 HREF="http://www.cs.wustl.edu/~schmidt/PDF/ami1.pdf">online</A>.
 Finally, comprehensive documentation on TAO's IDL compiler is
-available in the OCI <A HREF="http://www.theaceorb.com/product/">TAO
+available in the OCI <A HREF="http://www.theaceorb.com/product/index.html">TAO
 Developer's Guide</A>.<P>
 
 <HR><P>
@@ -165,6 +165,12 @@ Note that if you can't use perfect hashing for some reason the next
 best operation demuxing strategy is binary search, which can be
 configured using TAO's IDL compiler <A HREF="#options">options</A>.<P>
 
+<HR><P>
+<h3>AMI support</h3>
+
+The TAO_IDL compiler generates AMI stubs and skeletons as
+described in the CORBA 3.0.3 specification. 
+
 <hr><p>
 <h3><a name="collocation-stubs">Collocation Strategies</a></h3>
 
@@ -272,7 +278,7 @@ also receives other options that are specific to it.<p>
     <td><tt>anyop_export_macro=</tt><i>macro_name</i></td>
 
     <td>The compiler will emit <i>macro_name</i> before each Any operator
-        or <tt>extern</tt> typecode declaration in the generated stub code, 
+        or <tt>extern</tt> typecode declaration in the generated stub code,
         this is needed for Windows, which requires special directives to
         export symbols from DLLs, usually the definition is just a
         space on unix platforms. This option works only in conjuction with
@@ -287,7 +293,7 @@ also receives other options that are specific to it.<p>
 
     <td>The compiler will generate code to include <i>include_path</i> at the
         top of the anyop file header, this is usually a good place to define the export
-        macro. This option works in conjuction with the -GA option, which generates Any 
+        macro. This option works in conjuction with the -GA option, which generates Any
         operators and typecodes into a separate set of files.</td>
   </tr>
 
@@ -312,7 +318,7 @@ also receives other options that are specific to it.<p>
     <td>This option has the same effect as specifying<br>
         <tt>-Wb,stub_export_include=</tt><i>include_path</i><br>
         <tt>-Wb,skel_export_include=</tt><i>include_path</i><br>
-        <tt>-Wb,anyop_export_include=</tt><i>include_path</i>.<br> 
+        <tt>-Wb,anyop_export_include=</tt><i>include_path</i>.<br>
         This option goes with the previous option to build DLL containing
         both stubs and skeletons.</td>
   </tr>
@@ -609,17 +615,20 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="Ge flag">
     <td><tt>-Ge </tt><i>flag</i></td>
-
-    <td>If the value of the flag is 0, tao_idl will generate code that
-        will use native C++ exceptions. If the value of the flag is 1,
-        tao_idl will generate code that will use the <CODE>CORBA::Environment</CODE> variable for
-        passing exceptions. If the value of the flag is 2, the C++ 'throw' keyword will be used
-        in place of ACE_THROW_SPEC, ACE_THROW, and ACE_RETHROW (ACE_THROW_RETURN and
-        TAO_INTERCEPTOR_THROW will still be used). The default depends on how TAO_IDL
-	has been built. If TAO_IDL is built with native exceptions enabled, the IDL
-	compiler will not generate the emulated exception macros. If IDL compiler is
-	built with native exceptions disabled, macros would be generated by default. </td>
-    <td>&nbsp;</td>
+    <td>If the value of the flag is 0, operations generated from application IDL will
+        use native C++ exceptions. If the value of the flag is 1, such operations will
+        use the <CODE>CORBA::Environment</CODE> variable for passing exceptions. If the
+        value of the flag is 2, the C++ 'throw' keyword will be used in place of
+        ACE_THROW_SPEC, ACE_THROW, and ACE_RETHROW (ACE_THROW_RETURN and
+        TAO_INTERCEPTOR_THROW will still be used). This flag value will also disable
+        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.</td>
   </tr>
 
   <tr><a name="Gp">
@@ -664,9 +673,9 @@ also receives other options that are specific to it.<p>
 
     <td>Generate uninlined constant if defined in a module</td>
     <td>Inlined (assigned a value in the C++ header file) by default, but this causes a
-	    problem with some compilers when using pre-compiled headers. Constants declared
-		at global scope are always generated inline, while those declared in an interface
-		or a valuetype never are - neither case is affected by this option.</td>
+      problem with some compilers when using pre-compiled headers. Constants declared
+    at global scope are always generated inline, while those declared in an interface
+    or a valuetype never are - neither case is affected by this option.</td>
   </tr>
 
   <tr>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index 735643e1fb5..1938d361c18 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -262,7 +262,7 @@ Roadmap</h3>
       </ol><p>
 
       Please see the <code><a
-      href="../orbsvcs/orbsvcs/Makefile">ORBSVCS
+      href="../orbsvcs/orbsvcs/GNUMakefile">ORBSVCS
       Makefile</a></code> for the default setting of
       <code>TAO_ORBSVCS</code>.<p>
 
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index c172809bc82..26ddf36c89e 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -246,6 +246,21 @@ and the dependencies outlined below are the same. <P>
     this library </td> 
    <td>valuetype.mpb</td>
    </tr>
+   <tr align=left>
+   <th>libTAO_CSD_Framework.so</th>
+   <td>Support framework for Custom Servant Dispatching (CSD) feature. The CSD_ThreadPool
+    depends on this library</td> 
+   <td>csd_framework.mpb</td>
+   </tr>
+   <tr align=left>
+   <th>libTAO_CSD_ThreadPool.so</th>
+   <td>Support for ThreadPool Custom Servant Dispatching (CSD) Strategy. This library can 
+    be loaded statically or dynamically. Applications are required to
+    <code> #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
+    </code> for static loading and provide service configuration file for dynamic loading.
+   </td> 
+   <td>csd_threadpool.mpb</td>
+   </tr>
 </tr>
 </table>
 
diff --git a/TAO/docs/pluggable_messaging.html b/TAO/docs/pluggable_messaging.html
index e1d222fd2c1..dd3d37b184a 100644
--- a/TAO/docs/pluggable_messaging.html
+++ b/TAO/docs/pluggable_messaging.html
@@ -59,8 +59,14 @@
           mapped on to TCP/IP he would load IIOP_Lite using the
           svc.conf file. The format is given below </P>
           
-          <P>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</P>
-          <P>static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory". </P>
+          <P><code>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</code></P>
+          <P><code>static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory". </code></P>
+
+          <P>At the moment the TAO Strategies library is used the 
+          svc.conf file should contain: </P>
+
+          <P><code>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</code></P>
+          <P><code>static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory". </code></P>
 
           <P>Please see the documentation of the pluggable protocol
           framework for exact meaning of the above syntax. The same
diff --git a/TAO/docs/pluggable_protocols/index.html b/TAO/docs/pluggable_protocols/index.html
index 9eedd2329d7..21fc5208a62 100644
--- a/TAO/docs/pluggable_protocols/index.html
+++ b/TAO/docs/pluggable_protocols/index.html
@@ -374,7 +374,7 @@ object, hiding the transport- and strategy-specific details of the acceptor.
 
 <P>
 TAO's <TT>Acceptor</TT> interface, shown below, is declared in the  file
-<TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+<TT>&lt;<A HREF="../../tao/Transport_Acceptor.h">tao/Transport_Acceptor.h</A>&gt;</TT>.
 All <TT>Acceptor</TT> implementations must inherit from the <TT>TAO_Acceptor</TT>
 abstract base class.
 
@@ -969,7 +969,8 @@ object and to the <TT>Transport</TT> objects that were created.
 </H3>
 
 <P>
-TAO's <TT>Connector</TT> interface, shown below, is declared in the file <TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+TAO's <TT>Connector</TT> interface, shown below, is declared in the file <TT>&lt;
+<A HREF="../../tao/Transport_Connector.h">tao/Transport_Connector.h</A>&gt;</TT>.
 All <TT>Connector</TT> implementations must inherit from the <TT>TAO_Connector</TT>
 abstract base class.
 
@@ -2199,7 +2200,7 @@ class.
 
 <P>
 All TAO pluggable protocol <TT>Transport</TT> classes must inherit from the
-<TT>TAO_Transport</TT> abstract base class defined in <TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+<TT>TAO_Transport</TT> abstract base class defined in <TT>&lt;<A HREF="../../tao/Transport.h">tao/Transport.h</A>&gt;</TT>.
 The <TT>TAO_Transport</TT> interface is shown below. Again, only the methods
 that should be implemented for a given pluggable protocol are shown:
 
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index fc52188f985..7cb99ccd7e3 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -193,8 +193,8 @@ the following to your header file:
 
 To see the above example in detail, checkout <A
 HREF="../examples/POA/Reference_Counted_Servant">TAO/examples/POA/Reference_Counted_Servant</A>
-and/or <A HREF="../tao/PortableServer/POA.cpp">POA.cpp</A> and <A
-HREF="../tao/PortableServer/POA.h">POA.h</A>. </li> <p>
+and/or <A HREF="../tao/PortableServer/Root_POA.cpp">Root_POA.cpp</A> and <A
+HREF="../tao/PortableServer/Root_POA.h">Root_POA.h</A>. </li> <p>
 
 </ul>
 
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 9fb8f7a3fbb..30cb40e3a61 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -60,6 +60,9 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a>:
 <a href="#ami">Asynchronous Method Invocation (AMI)</a></li>
 
 <li>
+<a href="#csd">Custom Servant Dispatching (CSD)</a></li>
+
+<li>
 <a href="../dynany/index.html">Dynamic Any</a></li>
 
 <li>
@@ -108,7 +111,7 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a>:
 
 
 <li>
-<a href="../rtcorba/">Real-Time CORBA</a></li>
+<a href="../rtcorba/index.html">Real-Time CORBA</a></li>
 
 <li>
 <a href="#sciop">SCIOP Support in TAO</a></li>
@@ -1055,12 +1058,14 @@ POA. This also allows multiple threads to dispatch requests on the same
 POA simultaneous.</li>
 
 <li>
-TAO now supports reference counting between POA and servants, including
+Before 1.4.6 TAO supports reference counting between POA and servants, including
 the new RefCountServantBase and ServantBase_var classes. RefCountServantBase
 is a reference counted base class that was added to the CORBA specification
 to avoid race conditions for servant deletion in threaded servers. <a href="ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf">ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf</a>
 contains the relevant text. Check <a href="../poa_migration.html#Reference counting Servants">here</a>
-on some hints to avoid trouble.</li>
+on some hints to avoid trouble. From TAO 1.4.6 reference counting is always
+enabled for servants and RefCountServantBase is a noop struct you don't
+need anymore.</li>
 
 <li>
 The POA now supports active demultiplexing of servants in the SYSTEM_ID
@@ -2281,7 +2286,7 @@ and
 <ul>We've implemented the callback model of the
 <a href="http://www.omg.org/cgi-bin/doc?formal/01-12-60">CORBA
 Messaging specification</a>. To activate the AMI for TAO and the TAO IDL
-compiler define <tt>TAO_HAS_CORBA_MESSAGING</tt>>,
+compiler define <tt>TAO_HAS_CORBA_MESSAGING</tt>,
 <tt>TAO_HAS_AMI_CALLBACK</tt>
 in your config.h file. The TAO IDL compiler can generate the AMI "callback"
 stubs, ReplyHandler und reply stubs using the <tt>-GC</tt> switch.
@@ -2311,13 +2316,70 @@ Parsons</a></li>
 <li>
 Support for timeouts in combination with AMI calls, response handler gets
 CORBA::TIMEOUT exception on timeout</li>
+<li>
+The AMI support in TAO 1.4.7 is as described in the 2.6 spec, from 1.4.8 we support
+by default the 3.0.3 described mapping.</li>
 </ul>
 Future Work:
 <ul>
 <li>
 Implementation of the poller model.</li>
 </ul>
+<hr>
+<h3>
+<a NAME="csd"></a>Custom Servant Dispatching</h3>
+Points of contact: <a href="mailto:bradley_t@ociweb.com">Tim Bradley</a>
+<h4>
+Current Status:</h4>
+<ul>This Custom Servant Dispatching (CSD) feature provides user applications with the ability to implement and "plug-in" custom strategies to handle the dispatching of requests to servants.
+<p>A concrete CSD Strategy implementation has also been added to serve as a "reference implementation".  This is being called the CSD Thread Pool Strategy (TP_Strategy).  The TP_Strategy provides a means to decouple the threads (ORB threads) that receive requests from the underlying transport from the thread that will ultimately dispatch the request to the target servant object.  The TP_Strategy implements a "request queue" as the integral part of the mechanism that allows an ORB thread to "hand-off" a request to one of the TP_Strategy object's worker threads.  The TP_Strategy reference implementation is provided as an example of how concrete CSD Strategy could be implemented.
+<p>Two approaches are supported for applying CSD strategy to an application.
+<ol>
+<li>Explicitly calling CSD interfaces. 
+<p>Here is an example application code showing how a TP_Strategy object can be created and applied to a POA:
+
+<pre>
+
+  PortableServer::POA_var poa = ...; // create the poa.
+
+  // Create a new TP_Strategy object and save it into a "smart pointer" variable.
+  TAO::CSD::TP_Strategy_Handle csd_strategy = new TAO::CSD::TP_Strategy();
+
+  // Set the number of threads before calling apply_to().
+  csd_strategy->set_num_threads(2);
+
+  // Set the servant serialization flag before calling apply_to().
+  csd_strategy->set_servant_serialization (false);
 
+  // Tell the strategy to apply itself to the poa.
+  if (csd_strategy->apply_to(poa.in()) == false) 
+    {
+      ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to the poa.\n"));
+      return -1;
+    }
+</pre>
+<li>Service Configurator
+
+ <p>The format of the CSD specific parameters for creating the TP_Strategy service object is:          
+ <pre>-CSDtp &lt;poa_name&gt;:&lt;csd_thread_number&gt;:[OFF]</pre>
+
+ <p>The last portion of the parameter is the servant serialization flag. It's only needed when the servant serialization needs be turned off, otherwise the servant serialization is always on. When servant serialization is on (the default), the TP_Strategy will serialize requests to any particular servant.  Requests to different servant objects can occur in parallel, but requests to any particular servant will be dispatched serially (ie, one at a time).
+
+ <p>Here is an example of the svc.conf file.
+
+ <pre>
+  dynamic TAO_CSD_TP_Strategy_Factory Service_Object * 
+	TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
+ </pre>
+</ol>
+</ul>
+<h4>
+Known Issues:</h4>
+<ul>
+<li>
+This feature is not currently tested for VxWorks.
+</li>
+</ul>
 <hr>
 <h3>
 <a NAME="interceptor"></a>Portable Interceptors</h3>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index 580ea7fc92b..78ee249f584 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -51,7 +51,7 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
   <li><p> The multi-profile parsing code in TAO hasnt been tested well
       and we have been able to identify some issues with it. The
       details are documented in our  <A
-      HREF="http://deuce.doc.wustl.edu/bugzilla/">bug tracking
+      HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">bug tracking
 	    system</A> under id's  <A
       HREF="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1237">1237</A>, <A
       HREF="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1238">
diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html
index 794cfe8d795..d360ee31c2d 100644
--- a/TAO/docs/rtcorba/features.html
+++ b/TAO/docs/rtcorba/features.html
@@ -206,6 +206,13 @@ See <a href="#mappings">Priority Mappings</a> section for more details.</td>
 <li>
 ThreadPools are now fully supported. Endpoint priorities are no longer
 supported.</li>
+<li>
+By default dynamic RTCorba threads live forever after they are created.
+When using the <code>RTORBDynamicThreadIdleTimeout</code> from the 
+<code>RT_ORB_Loader</code> it
+can be specified that the dynamic threads should end after a given
+idle time. Timeout must be specified in microseconds, 0 means the threads
+will stay alive forever.
 </ul>
 
 <h3>
diff --git a/TAO/docs/rtcorba/issues.html b/TAO/docs/rtcorba/issues.html
index 9a8584da8c3..43c3e1979b0 100644
--- a/TAO/docs/rtcorba/issues.html
+++ b/TAO/docs/rtcorba/issues.html
@@ -12,7 +12,7 @@
 <h3><a name="top">Known Issues and TO-DO Items</a></h3>
 <p>This page contains a list of known RTCORBA-related issues and to-do
 items. The list does not include any of the reports from the bug tracking
-system, so be sureto <a href="http://ace.cs.wustl.edu/bugzilla/query.cgi">query
+system, so be sureto <a href="http://deuce.doc.wustl.edu/bugzilla/index.cgi">query
 Bugzilla</a> for RTCORBA entries. </p>
 <ol>
   <li><a href="#7">Integrating protocol policies with the Pluggable Protocols framework</a></li>
@@ -54,7 +54,7 @@ each protocol.<br>
 this is done, remove (or deprecate) <i>-ORBSndSock</i>, <i>-ORBRcvSock</i>,
 and <i>-ORBNodelay</i> ORB options.<br>
   </li>
-  <li>Add support for <i>TCPProtocolProperties::keep_alive</i> and <i>TCPProtocolProperties::dont_route</i>
+  <li>Add support for <i>TCPProtocolProperties::dont_route</i>
     in IIOP.<br> </li>
   <li>Add support for protocol properties configuration in SHMIOP. (SHMIOP
     properties are defined in <i>RTCORBA::SharedMemoryProtocolProperties</i>, but
diff --git a/TAO/docs/tutorials/Makefile.am b/TAO/docs/tutorials/Makefile.am
index 54b8a57d438..324e1e3c1ed 100644
--- a/TAO/docs/tutorials/Makefile.am
+++ b/TAO/docs/tutorials/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Quoter
diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp b/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
index 178a4767bab..1167c78c3e0 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
@@ -25,7 +25,7 @@ Single_Query_Stock_Handler_i::get_price_and_names (CORBA::Double ami_return_val,
 
 void
 Single_Query_Stock_Handler_i::
-    get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
+    get_price_and_names_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
   // We ignore the exception, but this counts as a reponse, otherwise
@@ -45,7 +45,7 @@ Single_Query_Stock_Handler_i::get_symbol (const char *)
 
 void
 Single_Query_Stock_Handler_i::
-    get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
+    get_symbol_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -60,7 +60,7 @@ Single_Query_Stock_Handler_i::get_full_name (const char *)
 
 void
 Single_Query_Stock_Handler_i::
-   get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
+   get_full_name_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
     throw CORBA::NO_IMPLEMENT ();
@@ -75,7 +75,7 @@ Single_Query_Stock_Handler_i::price (double)
 
 void
 Single_Query_Stock_Handler_i::
-    price_excep (Quoter::AMI_StockExceptionHolder *)
+    price_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
     throw CORBA::NO_IMPLEMENT ();
diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
index 60848fb3aec..fd3e78ec36e 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
@@ -17,22 +17,22 @@ public:
                            const char *full_name)
       throw (CORBA::SystemException);
 
-  void get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
+  void get_price_and_names_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_symbol(const char *)
     throw (CORBA::SystemException);
-  void get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
+  void get_symbol_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_full_name (const char *)
     throw (CORBA::SystemException);
-  void get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
+  void get_full_name_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void price (double)
     throw (CORBA::SystemException);
-  void price_excep (Quoter::AMI_StockExceptionHolder *)
+  void price_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
index bfd314dc850..7132b9e650a 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Quoter.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
index c6b2c646f98..9a67de6ba77 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Quoter.idl
+
 ## Makefile.Quoter_Event_Service_Client.am
 
 if BUILD_EXCEPTIONS
diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am
index db05429c322..9a0053b5806 100644
--- a/TAO/docs/tutorials/Quoter/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMI \
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
index 3fc227750ee..fd4e2356bae 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
index b2c40ecdac1..797e2569292 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -4,7 +4,12 @@
 project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../idl
+  }
   includes += ../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
 project(*server) : orbsvcsexe, portableserver, naming, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../idl
+  }
   includes += ../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
index 178a4767bab..1167c78c3e0 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
@@ -25,7 +25,7 @@ Single_Query_Stock_Handler_i::get_price_and_names (CORBA::Double ami_return_val,
 
 void
 Single_Query_Stock_Handler_i::
-    get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
+    get_price_and_names_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
   // We ignore the exception, but this counts as a reponse, otherwise
@@ -45,7 +45,7 @@ Single_Query_Stock_Handler_i::get_symbol (const char *)
 
 void
 Single_Query_Stock_Handler_i::
-    get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
+    get_symbol_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
   throw CORBA::NO_IMPLEMENT ();
@@ -60,7 +60,7 @@ Single_Query_Stock_Handler_i::get_full_name (const char *)
 
 void
 Single_Query_Stock_Handler_i::
-   get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
+   get_full_name_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
     throw CORBA::NO_IMPLEMENT ();
@@ -75,7 +75,7 @@ Single_Query_Stock_Handler_i::price (double)
 
 void
 Single_Query_Stock_Handler_i::
-    price_excep (Quoter::AMI_StockExceptionHolder *)
+    price_excep (::Messaging::ExceptionHolder *)
   throw (CORBA::SystemException)
 {
     throw CORBA::NO_IMPLEMENT ();
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
index d6a66153074..b595d53be86 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
@@ -17,22 +17,22 @@ public:
                            const char *full_name)
       throw (CORBA::SystemException);
 
-  void get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
+  void get_price_and_names_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_symbol(const char *)
     throw (CORBA::SystemException);
-  void get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
+  void get_symbol_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_full_name (const char *)
     throw (CORBA::SystemException);
-  void get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
+  void get_full_name_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
   void price (double)
     throw (CORBA::SystemException);
-  void price_excep (Quoter::AMI_StockExceptionHolder *)
+  void price_excep (::Messaging::ExceptionHolder *)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
index 66d9661afcd..a64c2897b16 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Quoter.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
index 5ebb6457432..73e5000bf36 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,10 +50,14 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Quoter.idl
+
 ## Makefile.Quoter_RT_Event_Service_Client.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -88,6 +92,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
@@ -95,6 +100,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -132,6 +138,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
index 0bfcfd867b2..dd3addbb2f3 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
index a77542f12ee..d1f999594f1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -4,5 +4,9 @@
 project : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific(automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
index a1e084fad23..be1c8727300 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
index fb71f91e9f1..e15b2b37572 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -4,7 +4,12 @@
 project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
 project(*server) : taoserver, rtevent, naming, iortable, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
index 0b5fae765c3..b66ca814609 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index 984a4c86db8..fda3b450dd6 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -2,5 +2,9 @@
 project : taoserver, minimum_corba, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Makefile.am
index 3981d37da9c..dbb1885fecd 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Client \
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
index cb841195769..1e20d49fdfa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
index 28e9ac91d0f..c8c3a2ad4ae 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -4,7 +4,12 @@
 project(*client) : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : taoexe, portableserver, exceptions {
 project(*server) : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
index 5500cfaa35d..553f4e013be 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
index 82e81030a07..dc8789b784c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -4,5 +4,9 @@
 project : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
 }
diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am
index 770f8eaef4a..9e243a20c6a 100644
--- a/TAO/docs/tutorials/Quoter/idl/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/AMH/Makefile.am b/TAO/examples/AMH/Makefile.am
index 4aedf24fe5c..ca360d86a6b 100644
--- a/TAO/examples/AMH/Makefile.am
+++ b/TAO/examples/AMH/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Sink_Server
diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am
index 6df470c1810..47efc759658 100644
--- a/TAO/examples/AMH/Sink_Server/Makefile.am
+++ b/TAO/examples/AMH/Sink_Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,52 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Sink_Server_Client.am
+## Makefile.Sink_Server_IDL.am
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
   TestC.inl \
+  TestS.cpp \
   TestS.h \
   TestS.inl \
   TestS_T.cpp \
   TestS_T.h \
   TestS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Test-stamp \
   TestC.cpp \
   TestC.h \
   TestC.inl \
+  TestS.cpp \
   TestS.h \
   TestS.inl \
   TestS_T.cpp \
   TestS_T.h \
   TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Test.idl
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.Sink_Server_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -63,12 +74,8 @@ client_SOURCES = \
   Client_Task.cpp \
   TestC.cpp \
   client.cpp \
-  Client_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl
+  Base_Server.inl \
+  Client_Task.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -81,40 +88,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Sink_Server_Mt_Server.am
 
 if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += mt_server
 
@@ -136,11 +116,6 @@ mt_server_SOURCES = \
   Base_Server.h \
   Base_Server.inl \
   MT_AMH_Server.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl \
   Timer_Handler.h
 
 mt_server_LDADD = \
@@ -154,40 +129,13 @@ mt_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Sink_Server_St_Server.am
 
 if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += st_server
 
@@ -207,11 +155,6 @@ st_server_SOURCES = \
   AMH_Servant.h \
   Base_Server.h \
   Base_Server.inl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl \
   Timer_Handler.h
 
 st_server_LDADD = \
@@ -225,6 +168,7 @@ st_server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 17f57558bd0..873085457c1 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,30 +1,49 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL) : taoidldefaults, amh {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only =1
+}
+
 project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
+  after += *IDL
   Source_Files {
     st_server.cpp
     Base_Server.cpp
     AMH_Servant.cpp
     Timer_Handler.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
+  after += *IDL
   Source_Files {
     mt_server.cpp
     MT_AMH_Server.cpp
     Base_Server.cpp
     AMH_Servant.cpp
     Timer_Handler.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): taoexe, strategies, valuetype, amh, portableserver  {
+  after += *IDL
   Source_Files {
     Client_Task.cpp
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am
index 2aa510507e6..a75b00738c2 100644
--- a/TAO/examples/AMI/FL_Callback/Makefile.am
+++ b/TAO/examples/AMI/FL_Callback/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -60,6 +63,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += peer
 
@@ -87,6 +91,7 @@ peer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -106,7 +111,8 @@ progress_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
+  -I$(TAO_BUILDDIR) \
+  $(ACE_FLTK_CPPFLAGS)
 
 progress_SOURCES = \
   Progress_i.cpp \
@@ -115,6 +121,9 @@ progress_SOURCES = \
   testS.cpp \
   Progress_i.h
 
+progress_LDFLAGS = \
+ $(ACE_FLTK_LDFLAGS)
+
 progress_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \
   $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
@@ -125,7 +134,8 @@ progress_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_FLTK_LIBS)
 
 endif BUILD_X11
 endif BUILD_TAO_FLRESOURCE
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 6d04cad3f50..f4e81a5b099 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -25,15 +25,12 @@ Peer_Handler_i::request (CORBA::Long retval
 
 void
 Peer_Handler_i::request_excep (
-    AMI_PeerExceptionHolder * excep_holder
-    ACE_ENV_ARG_DECL)
+    ::Messaging::ExceptionHolder *
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (excep_holder);
-  ACE_ENV_ARG_NOT_USED;
 }
 
-
 void
 Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index b5593adc52a..251ca6e57c6 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -31,7 +31,7 @@ public:
                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_excep (AMI_PeerExceptionHolder * excep_holder
+  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder
                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/examples/AMI/Makefile.am b/TAO/examples/AMI/Makefile.am
index 3a54e807ea9..66e37fc0b72 100644
--- a/TAO/examples/AMI/Makefile.am
+++ b/TAO/examples/AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         FL_Callback
diff --git a/TAO/examples/Advanced/Makefile.am b/TAO/examples/Advanced/Makefile.am
index 14d8bfb8e8b..1118bffdf3b 100644
--- a/TAO/examples/Advanced/Makefile.am
+++ b/TAO/examples/Advanced/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         ch_3
diff --git a/TAO/examples/Advanced/ch_12/icp.cpp b/TAO/examples/Advanced/ch_12/icp.cpp
index dc6e3c0386e..cabb2faee5c 100644
--- a/TAO/examples/Advanced/ch_12/icp.cpp
+++ b/TAO/examples/Advanced/ch_12/icp.cpp
@@ -199,17 +199,6 @@ actual_temp (const StateMap::iterator & pos)
 
 //---------------------------------------------------------------
 
-
-#if (_MSC_VER < 1300)
-namespace std
-{
-    size_t min (const size_t len1, const size_t len2)
-    {
-      return ( len1 < len2 ? len1:len2 );
-    }
-}
-#endif/*_MSC_VER*/
-
 // ICP_get () returns an attribute value of the device with the given
 // id. The attribute is named by the attr parameter. The value is
 // copied into the buffer pointed to by the value pointer. The len
diff --git a/TAO/examples/Advanced/ch_18/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp
index e17477df643..ef2de583c30 100644
--- a/TAO/examples/Advanced/ch_18/icp.cpp
+++ b/TAO/examples/Advanced/ch_18/icp.cpp
@@ -216,19 +216,6 @@ actual_temp(const StateMap::iterator & pos)
 //---------------------------------------------------------------
 
 
-#if (_MSC_VER < 1300)
-namespace std
-{
-    size_t min (const size_t len1, const size_t len2)
-    {
-      return ( len1 < len2 ? len1:len2 );
-    }
-}
-#endif/*_MSC_VER*/
-
-
-//----------------------------------------------------------------
-
 // ICP_get() returns an attribute value of the device with the
 // given id. The attribute is named by the attr parameter. The
 // value is copied into the buffer pointed to by the value
diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp
index 43d14faf6c8..33d4bf9e072 100644
--- a/TAO/examples/Advanced/ch_21/icp.cpp
+++ b/TAO/examples/Advanced/ch_21/icp.cpp
@@ -214,20 +214,6 @@ actual_temp(const StateMap::iterator & pos)
 
 //---------------------------------------------------------------
 
-
-#if (_MSC_VER < 1300)
-namespace std
-{
-    size_t min (const size_t len1, const size_t len2)
-    {
-      return ( len1 < len2 ? len1:len2 );
-    }
-}
-#endif/*_MSC_VER*/
-
-
-//----------------------------------------------------------------
-
 // ICP_get() returns an attribute value of the device with the
 // given id. The attribute is named by the attr parameter. The
 // value is copied into the buffer pointed to by the value
diff --git a/TAO/examples/Advanced/ch_3/Makefile.am b/TAO/examples/Advanced/ch_3/Makefile.am
index 8702a5e12bf..2eccef5cf7a 100644
--- a/TAO/examples/Advanced/ch_3/Makefile.am
+++ b/TAO/examples/Advanced/ch_3/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,6 +52,9 @@ time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  time.idl
+
 endif BUILD_EXCEPTIONS
 
 ## Makefile.Advanced_Ch_3_Client.am
diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp
index 8a934637a70..994e668d249 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -23,6 +23,8 @@
 #include <ace/streams.h>
 #include "ace/Argv_Type_Converter.h"
 
+#include "tao/Policy_ForwardC.h"
+
 // The following header is #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
 //#include <iostream.h>
@@ -31,10 +33,10 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
-  try 
+  try
     {
       // Check arguments
-      if  (argc != 2) 
+      if  (argc != 2)
         {
           cerr << "Usage: client IOR_string" << endl;
           throw 0;
@@ -45,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Destringify argv[1]
       CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]);
-      if  (CORBA::is_nil (obj.in ())) 
+      if  (CORBA::is_nil (obj.in ()))
         {
           cerr << "Nil Time reference" << endl;
           throw 0;
@@ -54,7 +56,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Narrow
       Time_var tm = Time::_narrow (obj.in ());
 
-      if  (CORBA::is_nil (tm.in ())) 
+      if  (CORBA::is_nil (tm.in ()))
         {
           cerr << "Argument is not a Time reference" << endl;
           throw 0;
@@ -73,14 +75,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
            << setw (2) << setfill ('0') << tod.minute << ":"
            << setw (2) << setfill ('0') << tod.second << endl;
     }
-  catch  (const CORBA::Exception &x) 
+  catch  (const CORBA::Exception &x)
     {
       ACE_PRINT_EXCEPTION (x,
                            "Who is the culprit \n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
-  catch  (...) 
+  catch  (...)
     {
       return 1;
     }
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index be27a730d67..82d603e836a 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -20,9 +20,13 @@
 // ============================================================================
 
 #include "server.h"
+
+#include "tao/CORBA_String.h"
+
 #include <ace/streams.h>
 #include "ace/Argv_Type_Converter.h"
 
+
 // The following headers are #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
 //#include <time.h>
@@ -51,7 +55,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
-  try 
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
@@ -78,18 +82,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Accept requests
       orb->run ();
     }
-  catch (const CORBA::Exception &) 
+  catch (const CORBA::Exception &)
     {
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
   return 0;
 }
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.cpp b/TAO/examples/Advanced/ch_8_and_10/icp.cpp
index 68306365109..5922fef8674 100644
--- a/TAO/examples/Advanced/ch_8_and_10/icp.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/icp.cpp
@@ -210,19 +210,6 @@ actual_temp(const StateMap::iterator & pos)
 
 //---------------------------------------------------------------
 
-
-#if (_MSC_VER < 1300)
-namespace std
-{
-    size_t min (const size_t len1, const size_t len2)
-    {
-        return ( len1 < len2 ? len1:len2 );
-    }
-}
-#endif/*_MSC_VER*/
-
-//----------------------------------------------------------------
-
 // ICP_get() returns an attribute value of the device with the
 // given id. The attribute is named by the attr parameter. The
 // value is copied into the buffer pointed to by the value
diff --git a/TAO/examples/Borland/ChatClient.bpr b/TAO/examples/Borland/ChatClient.bpr
index 14c585eb2cc..36bab973fd7 100644
--- a/TAO/examples/Borland/ChatClient.bpr
+++ b/TAO/examples/Borland/ChatClient.bpr
@@ -2,10 +2,10 @@
 <!-- C++Builder XML Project -->
 <PROJECT>
   <MACROS>
-    <VERSION value="BCB.05.03"/>
+    <VERSION value="BCB.06.00"/>
     <PROJECT value="ChatClient.exe"/>
-    <OBJFILES value="obj\ChatClient.obj obj\ChatClientWnd.obj obj\BroadcasterC.obj 
-      obj\BroadcasterS.obj obj\ReceiverC.obj obj\ReceiverS.obj 
+    <OBJFILES value="obj\ChatClient.obj obj\ChatClientWnd.obj obj\BroadcasterC.obj
+      obj\BroadcasterS.obj obj\ReceiverC.obj obj\ReceiverS.obj
       obj\ReceiverImpl.obj obj\ORBThread.obj"/>
     <RESFILES value="ChatClient.res"/>
     <IDLFILES value=""/>
@@ -13,11 +13,11 @@
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES) ChatClientWnd.dfm"/>
     <LIBFILES value=""/>
-    <LIBRARIES value="ACE_bd.lib TAO_bd.lib TAO_PortableServer_bd.lib"/>
-    <SPARELIBS value="vcl50.lib TAO_PortableServer_bd.lib TAO_bd.lib ACE_bd.lib"/>
-    <PACKAGES value="vcl50.bpi vclx50.bpi vcljpg50.bpi bcbsmp50.bpi qrpt50.bpi vcldb50.bpi 
-      vclbde50.bpi ibsmp50.bpi vcldbx50.bpi teeui50.bpi teedb50.bpi tee50.bpi 
-      nmfast50.bpi dclocx50.bpi"/>
+    <LIBRARIES value="ACE_bd.lib TAO_bd.lib TAO_PortableServer_bd.lib TAO_AnyTypeCode_bd.lib"/>
+    <SPARELIBS value="rtl.lib vcl.lib TAO_AnyTypeCode_bd.lib TAO_PortableServer_bd.lib TAO_bd.lib ACE_bd.lib"/>
+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi vcljpg.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi
+      vcldb.bpi bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi
+      nmfast.bpi dclocx.bpi"/>
     <PATHCPP value=".;"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
@@ -29,25 +29,42 @@
     <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
     <MAINSOURCE value="ChatClient.cpp"/>
     <INCLUDEPATH value="$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.."/>
-    <LIBPATH value="$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Debug"/>
+    <LIBPATH value="$(BCB)\lib\debug;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib"/>
     <WARNINGS value="-w-rvl -w-rch -w-par -w-obs -w-8027 -w-8026 -w-aus"/>
     <WARNOPTSTR value=""/>
+    <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\.. -I..\.. -src_suffix cpp 
+    <IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\.. -I..\.. -src_suffix cpp
       -DACE_HAS_VCL=1 -boa"/>
-    <CFLAG1 value="-Og -Ov -OS -H=obj\ChatClient.csm -Hh=pch.h -Hc -Vx -Ve -X- -a8 -b- -k- 
+    <CFLAG1 value="-Og -Ov -OS -H=obj\ChatClient.csm -Hh=pch.h -Hc -Vx -Ve -X- -a8 -b- -k-
       -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -JPHNE -M"/>
+    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zn"/>
     <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -x -Gn"/>
+    <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
     <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+    <OTHERFILES value=""/>
   </LINKER>
+  <FILELIST>
+      <FILE FILENAME="ChatClient.cpp" FORMNAME="" UNITNAME="ChatClient" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ChatClient.res" FORMNAME="" UNITNAME="ChatClient" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ChatClientWnd.cpp" FORMNAME="ChatClientWindow" UNITNAME="ChatClientWnd" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="BroadcasterC.cpp" FORMNAME="" UNITNAME="BroadcasterC" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="BroadcasterS.cpp" FORMNAME="" UNITNAME="BroadcasterS" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ReceiverC.cpp" FORMNAME="" UNITNAME="ReceiverC" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ReceiverS.cpp" FORMNAME="" UNITNAME="ReceiverS" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ReceiverImpl.cpp" FORMNAME="" UNITNAME="ReceiverImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ORBThread.cpp" FORMNAME="" UNITNAME="ORBThread" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
   <IDEOPTIONS>
 [Version Info]
 IncludeVerInfo=0
@@ -82,8 +99,8 @@ Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\..
 
 [HistoryLists\hlLibraryPath]
 Count=2
-Item0=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Debug
-Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal
+Item0=$(BCB)\lib\debug;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib
+Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib
 
 [HistoryLists\hlConditionals]
 Count=2
@@ -103,9 +120,14 @@ DebugSourceDirs=
 
 [Parameters]
 RunParams=
+Launcher=
+UseLauncher=0
+DebugCWD=
 HostApplication=
 RemoteHost=
 RemotePath=
+RemoteLauncher=
+RemoteCWD=
 RemoteDebug=0
 
 [Compiler]
@@ -113,14 +135,9 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
 [Language]
 ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
+</PROJECT>
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index d3090a82aa1..581ba38a9aa 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -5,14 +5,7 @@
 #include "ace/ace.h"
 #include "tao/corba.h"
 #include "ChatClientWnd.h"
-USERES("ChatClient.res");
 USEFORM("ChatClientWnd.cpp", ChatClientWindow);
-USEUNIT("BroadcasterC.cpp");
-USEUNIT("BroadcasterS.cpp");
-USEUNIT("ReceiverC.cpp");
-USEUNIT("ReceiverS.cpp");
-USEUNIT("ReceiverImpl.cpp");
-USEUNIT("ORBThread.cpp");
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 
@@ -35,7 +28,7 @@ WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
       Application->Initialize ();
       Application->Title = "CORBA Chat Client";
       Application->CreateForm(__classid(TChatClientWindow), &ChatClientWindow);
-       Application->Run ();
+      Application->Run ();
     }
   catch (Exception &exception)
     {
diff --git a/TAO/examples/Borland/ChatClient.res b/TAO/examples/Borland/ChatClient.res
index 39b9f668653..f9a73d9bd42 100644
--- a/TAO/examples/Borland/ChatClient.res
+++ b/TAO/examples/Borland/ChatClient.res
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index 10b653ce555..c77a5f43e1e 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -81,8 +81,8 @@ void __fastcall TChatClientWindow::WMMessageReceived (TMessage& Message)
   delete str;
 }
 //---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::FormClose (TObject *Sender,
-      TCloseAction &Action)
+void __fastcall TChatClientWindow::FormClose (TObject *,
+      TCloseAction &)
 {
   try
     {
@@ -96,7 +96,7 @@ void __fastcall TChatClientWindow::FormClose (TObject *Sender,
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::InputMemoKeyPress (TObject *Sender, char &Key)
+void __fastcall TChatClientWindow::InputMemoKeyPress (TObject *, char &Key)
 {
   if (Key == '\n' || Key == '\r')
     {
diff --git a/TAO/examples/Borland/README b/TAO/examples/Borland/README
index 5e81dd95a76..ff39370bbd1 100644
--- a/TAO/examples/Borland/README
+++ b/TAO/examples/Borland/README
@@ -3,14 +3,14 @@ $Id$
 Before compiling the example in The Borland C++ Builder IDE
 you must generate the client and server stubs using build_idl.bat.
 Please update the location of the tao_idl dependent on your build
-configuration. The default location is for a BCB4 Dynamic Debug
-Pascal configuration.
+configuration. The default location is for a BCB6 Dynamic Debug
+configuration.
 
 In the project file you must also update the names of the ACE and
-TAO libraries that you use. The configured names are for the BCB4
-Dynamic Debug Pascal configuration.
+TAO libraries that you use. The configured names are for the BCB6
+Dynamic Debug configuration.
 
 This directory illustrates how to write a Borland C++ Builder
-application using ACE+TAO.  Please contact Jody Hagins
-<jody@atdesk.com> if you have any questions.
+application using ACE+TAO.  Please contact Johnny Willemsen
+<jwillemsen@remedy.nl> if you have any questions.
 
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 5f43c5681ad..5194742ca10 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,15 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, ami {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): messaging, taoserver, ami {
+  exename = server
+  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami {
+project(*Client): messaging, taoserver, ami {
+  exename = client
+  after += *IDL
   Source_Files {
     client.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Buffered_AMI/Makefile.am b/TAO/examples/Buffered_AMI/Makefile.am
index f0cab01d2ea..159aa357bcc 100644
--- a/TAO/examples/Buffered_AMI/Makefile.am
+++ b/TAO/examples/Buffered_AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,16 +16,14 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Buffered_AMI_Client.am
+## Makefile.Buffered_AMI_IDL.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
@@ -36,7 +34,7 @@ BUILT_SOURCES += \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
@@ -54,6 +52,18 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.Buffered_AMI_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -66,11 +76,7 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -90,35 +96,6 @@ endif BUILD_AMI
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -132,11 +109,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index bdccbf35b74..9a0f6eaeb6d 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -14,9 +14,12 @@
 // ================================================================
 
 #include "testS.h"
+
+#include "tao/Policy_ForwardC.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/TAOA.h"
+
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Argv_Type_Converter.h"
@@ -66,13 +69,13 @@ public:
         received_all_replies = 1;
     }
 
-  void method_excep (AMI_testExceptionHolder *holder
+  void method_excep (::Messaging::ExceptionHolder *holder
                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -87,13 +90,13 @@ public:
   {
   }
 
-  void shutdown_excep (AMI_testExceptionHolder *holder
+  void shutdown_excep (::Messaging::ExceptionHolder *holder
                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 72443e37bb9..fc42ba1afc5 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "tao/CORBA_String.h"
+
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index 4377ad161f0..15d4771a09c 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,15 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver, messaging {
+  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): taoclient, messaging {
+  after += *IDL
   Source_Files {
     client.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Buffered_Oneways/Makefile.am b/TAO/examples/Buffered_Oneways/Makefile.am
index 596a38dd0b8..daaab0db9ab 100644
--- a/TAO/examples/Buffered_Oneways/Makefile.am
+++ b/TAO/examples/Buffered_Oneways/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Buffered_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
+## Makefile.Buffered_Oneways_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
@@ -35,7 +31,7 @@ BUILT_SOURCES += \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
@@ -50,9 +46,17 @@ CLEANFILES += \
 testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.Buffered_Oneways_Client.am
+
+if BUILD_CORBA_MESSAGING
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -64,12 +68,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -87,35 +86,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -129,11 +99,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index b55bdff6842..587407e555f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -18,7 +18,7 @@ ClientApp::~ClientApp()
 int
 ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb 
+  CORBA::ORB_var orb
     = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -32,7 +32,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
+  CORBA::Object_var obj
     = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -81,7 +81,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
       ACE_ENDTRY;
     }
@@ -139,4 +139,3 @@ ClientApp::usage_statement()
              "\t[-?]\n\n",
              this->exe_name_.c_str()));
 }
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
index a2cd204a762..82f03b349d5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
@@ -142,7 +142,7 @@ ClientTask::svc()
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       CORBA::String_var buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
-      bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1, buffer1);
+      bd_var_size_string->replace (ACE_OS::strlen (buffer1.in()) + 1, buffer1);
       this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -150,7 +150,7 @@ ClientTask::svc()
       CORBA::String_var buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
       ub_var_size_string->replace (ub_var_size_string->maximum (),
-                                   ACE_OS::strlen (buffer2) + 1,
+                                   ACE_OS::strlen (buffer2.in()) + 1,
                                    buffer2);
       this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
                                                ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
index 49c5cc14841..b5cbbd9a272 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
@@ -157,7 +157,7 @@ ClientTask::svc()
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       CORBA::String_var  buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
-      bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1,
+      bd_var_size_string->replace (ACE_OS::strlen (buffer1.in()) + 1,
                                    buffer1);
       this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
                                              ACE_ENV_ARG_PARAMETER);
@@ -166,7 +166,7 @@ ClientTask::svc()
       CORBA::String_var  buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
       ub_var_size_string->replace (ub_var_size_string->maximum (),
-                                   ACE_OS::strlen (buffer2) + 1,
+                                   ACE_OS::strlen (buffer2.in()) + 1,
                                    buffer2);
       this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
                                                ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 8cef65ef65d..6f8864086d4 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,29 +1,55 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Consumer.idl
+    Notifier.idl
+  }
+  custom_only = 1
+}
+
 project(Callback_Quoter notifier): namingexe, utils {
+  after += *IDL
   Source_Files {
     Notifier_i.cpp
     Notifier_Input_Handler.cpp
     notifier.cpp
+    NotifierS.cpp
+    NotifierC.cpp
+    ConsumerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(Callback_Quoter consumer): namingexe, portableserver {
+  after += *IDL
   Source_Files {
     Consumer_Input_Handler.cpp
     Consumer_Signal_Handler.cpp
     Consumer_Handler.cpp
     consumer.cpp
     Consumer_i.cpp
+    ConsumerS.cpp
+    ConsumerC.cpp
+    NotifierC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(Callback_Quoter supplier): namingexe, portableserver {
+  after += *IDL
   Source_Files {
     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/Makefile.am b/TAO/examples/Callback_Quoter/Makefile.am
index b973cd3ca47..c61248c5317 100644
--- a/TAO/examples/Callback_Quoter/Makefile.am
+++ b/TAO/examples/Callback_Quoter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Callback_Quoter_consumer.am
+## Makefile.Callback_Quoter_IDL.am
 
 BUILT_SOURCES = \
   ConsumerC.cpp \
@@ -44,7 +44,7 @@ CLEANFILES = \
 ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl ConsumerS_T.cpp ConsumerS_T.h ConsumerS_T.inl: Consumer-stamp
 
 Consumer-stamp: $(srcdir)/Consumer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Consumer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Consumer.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -73,9 +73,16 @@ CLEANFILES += \
 NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl NotifierS_T.cpp NotifierS_T.h NotifierS_T.inl: Notifier-stamp
 
 Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Notifier.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Notifier.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Consumer.idl \
+  Notifier.idl
+
+## Makefile.Callback_Quoter_consumer.am
+
 noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
@@ -94,22 +101,11 @@ consumer_SOURCES = \
   Consumer_Signal_Handler.cpp \
   Consumer_i.cpp \
   NotifierC.cpp \
-  NotifierS.cpp \
   consumer.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.h \
-  ConsumerS_T.h \
-  ConsumerS_T.inl \
   Consumer_Handler.h \
   Consumer_Input_Handler.h \
   Consumer_Signal_Handler.h \
-  Consumer_i.h \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.h \
-  NotifierS_T.h \
-  NotifierS_T.inl
+  Consumer_i.h
 
 consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -120,64 +116,6 @@ consumer_LDADD = \
 
 ## Makefile.Callback_Quoter_notifier.am
 
-BUILT_SOURCES += \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl \
-  ConsumerS_T.cpp \
-  ConsumerS_T.h \
-  ConsumerS_T.inl
-
-CLEANFILES += \
-  Consumer-stamp \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl \
-  ConsumerS_T.cpp \
-  ConsumerS_T.h \
-  ConsumerS_T.inl
-
-ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl ConsumerS_T.cpp ConsumerS_T.h ConsumerS_T.inl: Consumer-stamp
-
-Consumer-stamp: $(srcdir)/Consumer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Consumer.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl \
-  NotifierS_T.cpp \
-  NotifierS_T.h \
-  NotifierS_T.inl
-
-CLEANFILES += \
-  Notifier-stamp \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl \
-  NotifierS_T.cpp \
-  NotifierS_T.h \
-  NotifierS_T.inl
-
-NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl NotifierS_T.cpp NotifierS_T.h NotifierS_T.inl: Notifier-stamp
-
-Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Notifier.idl
-	@touch $@
-
 noinst_PROGRAMS += notifier
 
 notifier_CPPFLAGS = \
@@ -190,22 +128,11 @@ notifier_CPPFLAGS = \
 
 notifier_SOURCES = \
   ConsumerC.cpp \
-  ConsumerS.cpp \
   NotifierC.cpp \
   NotifierS.cpp \
   Notifier_Input_Handler.cpp \
   Notifier_i.cpp \
   notifier.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.h \
-  ConsumerS_T.h \
-  ConsumerS_T.inl \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.h \
-  NotifierS_T.h \
-  NotifierS_T.inl \
   Notifier_Input_Handler.h \
   Notifier_i.h
 
@@ -221,64 +148,6 @@ notifier_LDADD = \
 
 ## Makefile.Callback_Quoter_supplier.am
 
-BUILT_SOURCES += \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl \
-  ConsumerS_T.cpp \
-  ConsumerS_T.h \
-  ConsumerS_T.inl
-
-CLEANFILES += \
-  Consumer-stamp \
-  ConsumerC.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.cpp \
-  ConsumerS.h \
-  ConsumerS.inl \
-  ConsumerS_T.cpp \
-  ConsumerS_T.h \
-  ConsumerS_T.inl
-
-ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl ConsumerS_T.cpp ConsumerS_T.h ConsumerS_T.inl: Consumer-stamp
-
-Consumer-stamp: $(srcdir)/Consumer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Consumer.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl \
-  NotifierS_T.cpp \
-  NotifierS_T.h \
-  NotifierS_T.inl
-
-CLEANFILES += \
-  Notifier-stamp \
-  NotifierC.cpp \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.cpp \
-  NotifierS.h \
-  NotifierS.inl \
-  NotifierS_T.cpp \
-  NotifierS_T.h \
-  NotifierS_T.inl
-
-NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl NotifierS_T.cpp NotifierS_T.h NotifierS_T.inl: Notifier-stamp
-
-Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Notifier.idl
-	@touch $@
-
 noinst_PROGRAMS += supplier
 
 supplier_CPPFLAGS = \
@@ -294,21 +163,10 @@ supplier_SOURCES = \
   ConsumerS.cpp \
   Consumer_i.cpp \
   NotifierC.cpp \
-  NotifierS.cpp \
   Supplier_Timer_Handler.cpp \
   Supplier_i.cpp \
   supplier.cpp \
-  ConsumerC.h \
-  ConsumerC.inl \
-  ConsumerS.h \
-  ConsumerS_T.h \
-  ConsumerS_T.inl \
   Consumer_i.h \
-  NotifierC.h \
-  NotifierC.inl \
-  NotifierS.h \
-  NotifierS_T.h \
-  NotifierS_T.inl \
   Supplier_Timer_Handler.h \
   Supplier_i.h
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 04081ddaae5..3172a2ddd7f 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,17 +1,38 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+project(*IDL): taoidldefaults, ami {
+  IDL_Files {
+    Web_Server.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): messaging, taoserver, ami, namingexe {
+  exename = server
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
-  }  
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
+  }
 }
- 
-project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+
+project(*Client): messaging, taoserver, ami, namingexe {
+  exename = client
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     client.cpp
     Iterator_Handler.cpp
-  }  
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index c4f9b8d6dad..2f65d26faab 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -58,7 +58,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void next_chunk_excep (
-      Web_Server::AMI_Content_IteratorExceptionHolder *
+      ::Messaging::ExceptionHolder *
       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
@@ -66,7 +66,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_excep (
-      Web_Server::AMI_Content_IteratorExceptionHolder *
+      ::Messaging::ExceptionHolder *
       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
index af1a6daf815..3cec49ea991 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,16 +16,14 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.AMI_Iterator_Client.am
+## Makefile.AMI_Iterator_IDL.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
@@ -36,7 +34,7 @@ BUILT_SOURCES += \
   Web_ServerS_T.h \
   Web_ServerS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Web_Server-stamp \
   Web_ServerC.cpp \
   Web_ServerC.h \
@@ -51,9 +49,22 @@ CLEANFILES += \
 Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
 
 Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Web_Server.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Web_Server.idl
+
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.AMI_Iterator_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -69,12 +80,7 @@ client_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerS.cpp \
   client.cpp \
-  Iterator_Handler.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Iterator_Handler.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -87,6 +93,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,35 +101,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-CLEANFILES += \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -141,12 +120,7 @@ server_SOURCES = \
   Web_ServerS.cpp \
   server.cpp \
   Content_Iterator_i.h \
-  Iterator_Factory_i.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Iterator_Factory_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -159,6 +133,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index 1a370ff20ec..9ebc2e75c6c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,18 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+project(*IDL): taoidldefaults, ami {
+  IDL_Files {
+    Push_Web_Server.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): messaging, taoserver, ami, namingexe {
+  exename = server
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Callback_Handler.cpp
     Push_Iterator_Factory_i.cpp
     server.cpp
-  }  
+    Push_Web_ServerS.cpp
+    Push_Web_ServerC.cpp
+  }
+  IDL_Files {
+  }
 }
- 
-project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+
+project(*Client): messaging, taoserver, ami, namingexe {
+  exename = client
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     client.cpp
     Callback_i.cpp
     Push_Iterator_Handler.cpp
-  }  
+    Push_Web_ServerS.cpp
+    Push_Web_ServerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 1ff4769adec..5052e229ce2 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -86,7 +86,7 @@ Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 Callback_Handler::next_chunk_excep
-  (Web_Server::AMI_CallbackExceptionHolder *excep_holder
+  (::Messaging::ExceptionHolder *excep_holder
    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -98,7 +98,7 @@ Callback_Handler::next_chunk_excep
       this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      excep_holder->raise_next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index 96a560fc5ec..db3f8bb2656 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -81,7 +81,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback for this reply handler.
 
-  virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *
+  virtual void next_chunk_excep (::Messaging::ExceptionHolder *
                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
index 01da83b3ce9..ade2973b097 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,16 +16,14 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.AMI_Observer_Client.am
+## Makefile.AMI_Observer_IDL.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Push_Web_ServerC.cpp \
   Push_Web_ServerC.h \
   Push_Web_ServerC.inl \
@@ -36,7 +34,7 @@ BUILT_SOURCES += \
   Push_Web_ServerS_T.h \
   Push_Web_ServerS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Push_Web_Server-stamp \
   Push_Web_ServerC.cpp \
   Push_Web_ServerC.h \
@@ -51,9 +49,22 @@ CLEANFILES += \
 Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl Push_Web_ServerS_T.cpp Push_Web_ServerS_T.h Push_Web_ServerS_T.inl: Push_Web_Server-stamp
 
 Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Push_Web_Server.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Push_Web_Server.idl
+
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.AMI_Observer_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -71,12 +82,7 @@ client_SOURCES = \
   Push_Web_ServerS.cpp \
   client.cpp \
   Callback_i.h \
-  Push_Iterator_Handler.h \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
+  Push_Iterator_Handler.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -89,6 +95,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -96,35 +103,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl \
-  Push_Web_ServerS_T.cpp \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
-
-CLEANFILES += \
-  Push_Web_Server-stamp \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl \
-  Push_Web_ServerS_T.cpp \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
-
-Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl Push_Web_ServerS_T.cpp Push_Web_ServerS_T.h Push_Web_ServerS_T.inl: Push_Web_Server-stamp
-
-Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -143,12 +122,7 @@ server_SOURCES = \
   Push_Web_ServerS.cpp \
   server.cpp \
   Callback_Handler.h \
-  Push_Iterator_Factory_i.h \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
+  Push_Iterator_Factory_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -161,6 +135,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
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 26093e6ccf0..8b8254550da 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -85,7 +85,7 @@ private:
   // corresponding server method is received.
 
   virtual void register_callback_excep
-  (Web_Server::AMI_Iterator_FactoryExceptionHolder *
+  (::Messaging::ExceptionHolder *
    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
diff --git a/TAO/examples/Content_Server/Makefile.am b/TAO/examples/Content_Server/Makefile.am
index a03c919cbfb..1e9e7090841 100644
--- a/TAO/examples/Content_Server/Makefile.am
+++ b/TAO/examples/Content_Server/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMI_Iterator \
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
index ebf508db7e1..4d383d66692 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,12 +16,15 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.SMI_Iterator_Client.am
+noinst_PROGRAMS =
+
+## Makefile.SMI_Iterator_IDL.am
 
 BUILT_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
+  Web_ServerS.cpp \
   Web_ServerS.h \
   Web_ServerS.inl \
   Web_ServerS_T.cpp \
@@ -33,19 +36,28 @@ CLEANFILES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
+  Web_ServerS.cpp \
   Web_ServerS.h \
   Web_ServerS.inl \
   Web_ServerS_T.cpp \
   Web_ServerS_T.h \
   Web_ServerS_T.inl
 
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
+Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
 
 Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Web_Server.idl
 	@touch $@
 
-noinst_PROGRAMS = client
+
+noinst_HEADERS = \
+  Web_Server.idl
+
+## Makefile.SMI_Iterator_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -58,11 +70,8 @@ client_CPPFLAGS = \
 client_SOURCES = \
   Web_ServerC.cpp \
   client.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Content_Iterator_i.h \
+  Iterator_Factory_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -70,36 +79,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.SMI_Iterator_Server.am
-
-BUILT_SOURCES += \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-CLEANFILES += \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+endif !BUILD_ACE_FOR_TAO
 
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
+## Makefile.SMI_Iterator_Server.am
 
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -118,12 +102,7 @@ server_SOURCES = \
   Web_ServerS.cpp \
   server.cpp \
   Content_Iterator_i.h \
-  Iterator_Factory_i.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Iterator_Factory_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -132,6 +111,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 02d4eecf462..4675543c102 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,18 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Web_Server.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): namingexe, portableserver {
+  exename = server
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): namingexe {
+  exename = client
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Web_ServerC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index 9426da76b79..43cb7b7ec2f 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,28 +1,50 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Event_Comm.idl
+  }
+  custom_only = 1
+}
+
 project(*notifier): namingexe, utils {
+  after += *IDL
   Source_Files {
     Event_Comm_i.cpp
     Notifier_Server.cpp
     notifier.cpp
+    Event_CommS.cpp
+    Event_CommC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*consumer): namingexe, portableserver {
+  after += *IDL
   Source_Files {
     Consumer_Input_Handler.cpp
     Consumer_Handler.cpp
     consumer.cpp
     Event_Comm_i.cpp
+    Event_CommS.cpp
+    Event_CommC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*supplier): namingexe, portableserver {
+  after += *IDL
   Source_Files {
     Event_Comm_i.cpp
     Supplier_Input_Handler.cpp
     supplier.cpp
     Notifier_Handler.cpp
+    Event_CommS.cpp
+    Event_CommC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Event_Comm/Makefile.am b/TAO/examples/Event_Comm/Makefile.am
index 8dc7b42f0fd..6209c54aea0 100644
--- a/TAO/examples/Event_Comm/Makefile.am
+++ b/TAO/examples/Event_Comm/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Event_Comm_Consumer.am
+## Makefile.Event_Comm_IDL.am
 
 BUILT_SOURCES = \
   Event_CommC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl Event_CommS_T.cpp Event_CommS_T.h Event_CommS_T.inl: Event_Comm-stamp
 
 Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Event_Comm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Comm.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Event_Comm.idl
+
+## Makefile.Event_Comm_Consumer.am
+
 noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
@@ -66,11 +72,6 @@ consumer_SOURCES = \
   consumer.cpp \
   Consumer_Handler.h \
   Consumer_Input_Handler.h \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.h \
-  Event_CommS_T.h \
-  Event_CommS_T.inl \
   Event_Comm_i.h
 
 consumer_LDADD = \
@@ -82,35 +83,6 @@ consumer_LDADD = \
 
 ## Makefile.Event_Comm_Notifier.am
 
-BUILT_SOURCES += \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl \
-  Event_CommS_T.cpp \
-  Event_CommS_T.h \
-  Event_CommS_T.inl
-
-CLEANFILES += \
-  Event_Comm-stamp \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl \
-  Event_CommS_T.cpp \
-  Event_CommS_T.h \
-  Event_CommS_T.inl
-
-Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl Event_CommS_T.cpp Event_CommS_T.h Event_CommS_T.inl: Event_Comm-stamp
-
-Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Event_Comm.idl
-	@touch $@
-
 noinst_PROGRAMS += notifier
 
 notifier_CPPFLAGS = \
@@ -127,11 +99,6 @@ notifier_SOURCES = \
   Event_Comm_i.cpp \
   Notifier_Server.cpp \
   notifier.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.h \
-  Event_CommS_T.h \
-  Event_CommS_T.inl \
   Event_Comm_i.h \
   Notifier_Server.h \
   notifier.h
@@ -148,35 +115,6 @@ notifier_LDADD = \
 
 ## Makefile.Event_Comm_Supplier.am
 
-BUILT_SOURCES += \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl \
-  Event_CommS_T.cpp \
-  Event_CommS_T.h \
-  Event_CommS_T.inl
-
-CLEANFILES += \
-  Event_Comm-stamp \
-  Event_CommC.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.cpp \
-  Event_CommS.h \
-  Event_CommS.inl \
-  Event_CommS_T.cpp \
-  Event_CommS_T.h \
-  Event_CommS_T.inl
-
-Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl Event_CommS_T.cpp Event_CommS_T.h Event_CommS_T.inl: Event_Comm-stamp
-
-Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Event_Comm.idl
-	@touch $@
-
 noinst_PROGRAMS += supplier
 
 supplier_CPPFLAGS = \
@@ -194,11 +132,6 @@ supplier_SOURCES = \
   Notifier_Handler.cpp \
   Supplier_Input_Handler.cpp \
   supplier.cpp \
-  Event_CommC.h \
-  Event_CommC.inl \
-  Event_CommS.h \
-  Event_CommS_T.h \
-  Event_CommS_T.inl \
   Event_Comm_i.h \
   Notifier_Handler.h \
   Supplier_Input_Handler.h \
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index c4c81385ac1..911fc6abf7d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -14,9 +14,9 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ()
 FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
     const FP_Segment_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   FP_Scheduling::SegmentSchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 3bb789fd3da..43dac21d14a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -14,9 +14,9 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy ()
 MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
     const MIF_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   MIF_Scheduling::SchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 2ee40930b0e..dec4a6e5211 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -14,9 +14,9 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy ()
 MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
     const MUF_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   MUF_Scheduling::SchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
index d32fb6fc841..5dc752fb652 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
index 3b50f8c52a4..0971502bcc0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
@@ -1,5 +1,7 @@
 //$Id$
 
+#include "ace/Log_Msg.h"
+
 ACE_INLINE int
 Task_Stats::sample (ACE_UINT32 thr_run_time, int thr_count)
 {
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
index 386c0449d09..009efc90a5f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,47 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.fp_client.am
-
-if BUILD_RT_CORBA
+## Makefile.fp_example_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.fp_client.am
+
+if BUILD_RT_CORBA
+
 noinst_PROGRAMS += fp_client
 
 fp_client_CPPFLAGS = \
@@ -59,16 +65,14 @@ fp_client_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 fp_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h \
+  test_i.i
 
 fp_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -89,35 +93,6 @@ endif BUILD_RT_CORBA
 
 if BUILD_RT_CORBA
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += fp_server
 
 fp_server_CPPFLAGS = \
@@ -126,18 +101,14 @@ fp_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 fp_server_SOURCES = \
   server.cpp \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h \
   test_i.i
 
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 e55eb8fc152..a9d12fa4794 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
@@ -1,19 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(fp_server): kokyu_dsrt_scheduler_server {
   exename = fp_server
+  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(fp_client): kokyu_dsrt_scheduler_client {
   exename = fp_client
+  after += *IDL
   Source_Files {
     testC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
index ec056f1b1dd..f31bae377ea 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,47 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.mif_client.am
+## Makefile.mif_example_IDL.am
 
-if BUILD_RT_CORBA
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.mif_example_client.am
+
+if BUILD_RT_CORBA
+
 noinst_PROGRAMS += mif_client
 
 mif_client_CPPFLAGS = \
@@ -59,16 +65,14 @@ mif_client_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 mif_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h \
+  test_i.i
 
 mif_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -85,39 +89,10 @@ mif_client_LDADD = \
 
 endif BUILD_RT_CORBA
 
-## Makefile.mif_server.am
+## Makefile.mif_example_server.am
 
 if BUILD_RT_CORBA
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += mif_server
 
 mif_server_CPPFLAGS = \
@@ -126,18 +101,14 @@ mif_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 mif_server_SOURCES = \
   server.cpp \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h \
   test_i.i
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
index cda0301f0bc..9b222313347 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
@@ -1,19 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
-project(mif_server): kokyu_dsrt_scheduler_server {
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*server): kokyu_dsrt_scheduler_server {
   exename = mif_server
+  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(mif_client): kokyu_dsrt_scheduler_client {
+project(*client): kokyu_dsrt_scheduler_client {
   exename = mif_client
+  after += *IDL
   Source_Files {
     testC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
index e805aefff64..80d7a1d37cb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,47 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.muf_client.am
-
-if BUILD_RT_CORBA
+## Makefile.muf_example_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.muf_client.am
+
+if BUILD_RT_CORBA
+
 noinst_PROGRAMS += muf_client
 
 muf_client_CPPFLAGS = \
@@ -61,16 +67,14 @@ muf_client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 muf_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h \
+  test_i.i
 
 muf_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -92,35 +96,6 @@ endif BUILD_RT_CORBA
 
 if BUILD_RT_CORBA
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += muf_server
 
 muf_server_CPPFLAGS = \
@@ -129,18 +104,14 @@ muf_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
+  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
 
 muf_server_SOURCES = \
   server.cpp \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h \
   test_i.i
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
index 3fa7f6dcd1e..ed79bd08918 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
@@ -1,19 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(muf_server): kokyu_dsrt_scheduler_server {
   exename = muf_server
+  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(muf_client): orbsvcsexe, svc_utils, kokyu_dsrt_scheduler_client {
   exename = muf_client
+  after += *IDL
   Source_Files {
     testC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 4ac1ff98374..2a8d5776792 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -160,7 +160,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
               id_list->length ()));
   for (CORBA::ULong i = 0; i < id_list->length (); ++i)
     ACE_DEBUG ((LM_DEBUG, "                 <%s>\n",
-                (id_list[i]).in ()));
+                static_cast<char const*>((id_list[i]))));
 
   // Perform <number_of_invocations_> method calls on <Identity>
   // objects, which are members of the <Object_Group>.  Before each
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 736a82ad8ed..e636694850c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,13 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoserver, utils {
-  avoids += repo
-
+project(*IDL): taoidldefaults {
   IDL_Files {
     Identity.idl
     Load_Balancer.idl
   }
+  custom_only = 1
+}
+
+project(*Server): taoserver, utils {
+  avoids += repo
+  after += *IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     IdentityC.cpp
@@ -20,10 +27,12 @@ project(*server): taoserver, utils {
 
 project(*Client): taoclient, utils, portableserver {
   avoids += repo
+  after += *IDL
+
+  // XXX is this dependency necessary?
+  after += *Server
 
   IDL_Files {
-    Identity.idl
-    Load_Balancer.idl
   }
 
   Source_Files {
@@ -33,12 +42,12 @@ project(*Client): taoclient, utils, portableserver {
   }
 }
 
-project(*Balancer): taoexe, utils, portableserver {
+project(*Balancer): taoserver, utils  {
   exename = load_balancer
-  avoids += repo
+  avoids += repo ace_for_tao
+  after += *IDL
 
   IDL_Files {
-    Load_Balancer.idl
   }
 
   Source_Files {
diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am
index cafe82d3d47..007dc37e81d 100644
--- a/TAO/examples/Load_Balancing/Makefile.am
+++ b/TAO/examples/Load_Balancing/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,13 +16,38 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Load_Balancing_Balancer.am
+## Makefile.Load_Balancing_IDL.am
 
-if !BUILD_REPO
+BUILT_SOURCES = \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+CLEANFILES = \
+  Identity-stamp \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
+
+Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
+	@touch $@
 
 BUILT_SOURCES += \
   Load_BalancerC.cpp \
@@ -50,9 +75,19 @@ CLEANFILES += \
 Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
 
 Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Identity.idl \
+  Load_Balancer.idl
+
+## Makefile.Load_Balancing_Balancer.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_REPO
+
 noinst_PROGRAMS += load_balancer
 
 load_balancer_CPPFLAGS = \
@@ -66,11 +101,6 @@ load_balancer_SOURCES = \
   Load_BalancerS.cpp \
   Load_Balancer_i.cpp \
   Load_Balancing_Service.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl \
   Load_Balancer_i.h \
   Load_Balancing_Service.h
 
@@ -84,90 +114,30 @@ load_balancer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.Load_Balancing_Client.am
+## Makefile.Load_Balancing_Server.am
 
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
+server_SOURCES = \
   IdentityC.cpp \
-  Identity_Client.cpp \
+  IdentityS.cpp \
+  Identity_Server.cpp \
+  Identity_i.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
-  Identity_Client.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_Server.h \
+  Identity_i.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -178,94 +148,25 @@ client_LDADD = \
 
 endif !BUILD_REPO
 
-## Makefile.Load_Balancing_Server.am
+## Makefile.Load_Balancing_Client.am
 
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
+client_SOURCES = \
   IdentityC.cpp \
-  IdentityS.cpp \
-  Identity_Server.cpp \
-  Identity_i.cpp \
+  Identity_Client.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
-  Identity_Server.h \
-  Identity_i.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_Client.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 0dae720f4ca..d122b750da3 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -200,7 +200,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
               "The group contains %d members:\n",
               id_list->length ()));
   for (CORBA::ULong i = 0; i < id_list->length (); ++i)
-    ACE_DEBUG ((LM_DEBUG, "%s\n", (id_list[i]).in ()));
+    ACE_DEBUG ((LM_DEBUG, "%s\n", static_cast<char const*>(id_list[i])));
 
   // Perform <number_of_invocations_> method calls on <Identity>
   // objects, which are members of the <Object_Group>.  Before each
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 62afdc4ba28..311b6c25c61 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -1000,7 +1000,7 @@ RR_Object_Group::unbind (const char *id
   this->allocator_->free (iter.next ());
   iter.remove ();
 
-  int curr_size = this->members_->current_size ();
+  size_t curr_size = this->members_->current_size ();
 
   // Update <next_> if necessary to reflect the deletion.
   if (position < next_)
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index f93b076aa74..746dfa9c23a 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,12 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Identity.idl
+    Load_Balancer.idl
+  }
+  custom_only = 1
+}
+
 project(*balancer): taoexe, utils, portableserver, minimum_corba {
-  avoids += repo
+  avoids += repo ace_for_tao
   exename = load_balancer
+  after += *IDL
 
   IDL_Files {
-    Load_Balancer.idl
   }
 
   Source_Files {
@@ -19,6 +27,11 @@ project(*balancer): taoexe, utils, portableserver, minimum_corba {
 
 project(*server): taoserver, utils, minimum_corba {
   avoids += repo
+  exename = server
+  after += *IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     IdentityC.cpp
@@ -32,6 +45,10 @@ project(*server): taoserver, utils, minimum_corba {
 project(*client): taoclient, utils, portableserver, minimum_corba {
   avoids += repo
   exename = client
+  after += *IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     IdentityC.cpp
@@ -39,4 +56,3 @@ project(*client): taoclient, utils, portableserver, minimum_corba {
     Identity_Client.cpp
   }
 }
-
diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am
index 933762f77cf..34d05a3d0bb 100644
--- a/TAO/examples/Load_Balancing_persistent/Makefile.am
+++ b/TAO/examples/Load_Balancing_persistent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,14 +16,38 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Load_Balancing_Persistent_Balancer.am
+## Makefile.Load_Balancing_Persistent_IDL.am
 
-if !BUILD_MINIMUM_CORBA
-if !BUILD_REPO
+BUILT_SOURCES = \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+CLEANFILES = \
+  Identity-stamp \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
+
+Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
+	@touch $@
 
 BUILT_SOURCES += \
   Load_BalancerC.cpp \
@@ -51,9 +75,20 @@ CLEANFILES += \
 Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
 
 Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Identity.idl \
+  Load_Balancer.idl
+
+## Makefile.Load_Balancing_Persistent_Balancer.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
+if !BUILD_REPO
+
 noinst_PROGRAMS += load_balancer
 
 load_balancer_CPPFLAGS = \
@@ -67,11 +102,6 @@ load_balancer_SOURCES = \
   Load_BalancerS.cpp \
   Load_Balancer_i.cpp \
   Load_Balancing_Service.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl \
   Load_Balancer_i.h \
   Load_Balancing_Service.h
 
@@ -86,66 +116,13 @@ load_balancer_LDADD = \
 
 endif !BUILD_REPO
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Load_Balancing_Persistent_Client.am
 
 if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -158,17 +135,7 @@ client_SOURCES = \
   IdentityC.cpp \
   Identity_Client.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
-  Identity_Client.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_Client.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -187,62 +154,6 @@ endif !BUILD_MINIMUM_CORBA
 if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -257,18 +168,8 @@ server_SOURCES = \
   Identity_Server.cpp \
   Identity_i.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
   Identity_Server.h \
-  Identity_i.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 06360a5bb93..afd58b15f05 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,17 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Logger.idl
+  }
+  custom_only = 1
+}
+
 project(*Service): namingexe, utils {
+  after += *IDL
   Source_Files {
     Logger_i.cpp
     Logging_Service.cpp
     Logging_Service_i.cpp
+    LoggerS.cpp
+    LoggerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Test): namingexe, utils {
+  after += *IDL
   Source_Files {
     Logging_Test.cpp
     Logging_Test_i.cpp
+    LoggerS.cpp
+    LoggerC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Logging/Makefile.am b/TAO/examples/Logging/Makefile.am
index b421072f5b7..36204c43693 100644
--- a/TAO/examples/Logging/Makefile.am
+++ b/TAO/examples/Logging/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Logging_Service.am
+## Makefile.Logging_IDL.am
 
 BUILT_SOURCES = \
   LoggerC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 LoggerC.cpp LoggerC.h LoggerC.inl LoggerS.cpp LoggerS.h LoggerS.inl LoggerS_T.cpp LoggerS_T.h LoggerS_T.inl: Logger-stamp
 
 Logger-stamp: $(srcdir)/Logger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Logger.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Logger.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Logger.idl
+
+## Makefile.Logging_Service.am
+
 noinst_PROGRAMS = Logging_Service
 
 Logging_Service_CPPFLAGS = \
@@ -63,11 +69,6 @@ Logging_Service_SOURCES = \
   Logger_i.cpp \
   Logging_Service.cpp \
   Logging_Service_i.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.h \
-  LoggerS_T.h \
-  LoggerS_T.inl \
   Logger_i.h \
   Logging_Service_i.h
 
@@ -83,35 +84,6 @@ Logging_Service_LDADD = \
 
 ## Makefile.Logging_Test.am
 
-BUILT_SOURCES += \
-  LoggerC.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.cpp \
-  LoggerS.h \
-  LoggerS.inl \
-  LoggerS_T.cpp \
-  LoggerS_T.h \
-  LoggerS_T.inl
-
-CLEANFILES += \
-  Logger-stamp \
-  LoggerC.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.cpp \
-  LoggerS.h \
-  LoggerS.inl \
-  LoggerS_T.cpp \
-  LoggerS_T.h \
-  LoggerS_T.inl
-
-LoggerC.cpp LoggerC.h LoggerC.inl LoggerS.cpp LoggerS.h LoggerS.inl LoggerS_T.cpp LoggerS_T.h LoggerS_T.inl: Logger-stamp
-
-Logger-stamp: $(srcdir)/Logger.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Logger.idl
-	@touch $@
-
 noinst_PROGRAMS += Logging_Test
 
 Logging_Test_CPPFLAGS = \
@@ -127,11 +99,6 @@ Logging_Test_SOURCES = \
   LoggerS.cpp \
   Logging_Test.cpp \
   Logging_Test_i.cpp \
-  LoggerC.h \
-  LoggerC.inl \
-  LoggerS.h \
-  LoggerS_T.h \
-  LoggerS_T.inl \
   Logging_Test_i.h
 
 Logging_Test_LDADD = \
diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am
index 9bfcbcbd5be..d018c52d276 100644
--- a/TAO/examples/Makefile.am
+++ b/TAO/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMH \
@@ -27,10 +27,11 @@ SUBDIRS = \
         PluggableUDP \
         Quoter \
         RTCORBA \
-        RTScheduling \
         Simple \
         Simulator \
         TypeCode_Creation \
         ior_corbaloc \
         mfc
 
+#	CSD_Strategy
+#	RTScheduling
diff --git a/TAO/examples/OBV/Makefile.am b/TAO/examples/OBV/Makefile.am
index 2dbc98e2150..bbe993485ca 100644
--- a/TAO/examples/OBV/Makefile.am
+++ b/TAO/examples/OBV/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Typed_Events
diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am
index 28dfec76787..c40d23c139c 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile.am
+++ b/TAO/examples/OBV/Typed_Events/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Typed_Events_Client.am
-
-if !BUILD_MINIMUM_CORBA
+## Makefile.Typed_Events_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Event_TypesC.cpp \
   Event_TypesC.h \
   Event_TypesC.inl \
@@ -35,7 +31,7 @@ BUILT_SOURCES += \
   Event_TypesS_T.h \
   Event_TypesS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Event_Types-stamp \
   Event_TypesC.cpp \
   Event_TypesC.h \
@@ -50,9 +46,17 @@ CLEANFILES += \
 Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl Event_TypesS_T.cpp Event_TypesS_T.h Event_TypesS_T.inl: Event_Types-stamp
 
 Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Event_Types.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Types.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Event_Types.idl
+
+## Makefile.Typed_Events_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -70,11 +74,6 @@ client_SOURCES = \
   client.cpp \
   ../Simple_util.h \
   Client_i.h \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.h \
-  Event_TypesS_T.h \
-  Event_TypesS_T.inl \
   Event_Types_impl.h
 
 client_LDADD = \
@@ -93,35 +92,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  Event_TypesC.cpp \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.cpp \
-  Event_TypesS.h \
-  Event_TypesS.inl \
-  Event_TypesS_T.cpp \
-  Event_TypesS_T.h \
-  Event_TypesS_T.inl
-
-CLEANFILES += \
-  Event_Types-stamp \
-  Event_TypesC.cpp \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.cpp \
-  Event_TypesS.h \
-  Event_TypesS.inl \
-  Event_TypesS_T.cpp \
-  Event_TypesS_T.h \
-  Event_TypesS_T.inl
-
-Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl Event_TypesS_T.cpp Event_TypesS_T.h Event_TypesS_T.inl: Event_Types-stamp
-
-Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Event_Types.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -138,11 +108,6 @@ server_SOURCES = \
   Server_i.cpp \
   server.cpp \
   ../Simple_util.h \
-  Event_TypesC.h \
-  Event_TypesC.inl \
-  Event_TypesS.h \
-  Event_TypesS_T.h \
-  Event_TypesS_T.inl \
   Event_Types_impl.h \
   Server_i.h
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 0c610fb3b12..0893047771e 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -140,7 +140,7 @@ Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // The skeleton should not steal our list by decrementing
   // the reference counter.
 
-  CORBA::add_ref (alarms.ptr ());
+  CORBA::add_ref (alarms.in ());
 
   // alarms._retn () would reset and destroy our alarms.
 
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index 9431556642e..82cd71b5df0 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,20 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, utils, portableserver, valuetype, minimum_corba {
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Event_Types.idl
+  }
+  custom_only = 1
+}
+
+project(*server): taoserver, utils, valuetype, minimum_corba {
+  exename = server
+  after += *IDL
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
     ../Simple_util.cpp
     server.cpp
+    Event_TypesS.cpp
+    Event_TypesC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*client): taoexe, utils, portableserver, valuetype, minimum_corba {
+project(*client): taoserver, utils, valuetype, minimum_corba {
+  exename = client
+  after += *IDL
   Source_Files {
     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/Makefile.am b/TAO/examples/POA/Adapter_Activator/Makefile.am
index 5528f3f1fb5..d65122b0690 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile.am
+++ b/TAO/examples/POA/Adapter_Activator/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 89d427ced0e..7b4048912d9 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -2,9 +2,14 @@
 // $Id$
 
 project(*Server): taoserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific(automake) {
+     includes += $(srcdir)/../Generic_Servant
+   }
+   includes += ../Generic_Servant
+
    Source_Files {
     server.cpp
   }
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index 016b1663ab0..33b45a6a390 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -54,7 +54,12 @@ unlink $iorfile_3;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am
index b5e40f2c807..9a6c7149a25 100644
--- a/TAO/examples/POA/DSI/Makefile.am
+++ b/TAO/examples/POA/DSI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,42 +16,48 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.POA_DSI_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
+## Makefile.POA_DSI_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   DatabaseC.cpp \
   DatabaseC.h \
   DatabaseC.inl \
+  DatabaseS.cpp \
   DatabaseS.h \
   DatabaseS.inl \
   DatabaseS_T.cpp \
   DatabaseS_T.h \
   DatabaseS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Database-stamp \
   DatabaseC.cpp \
   DatabaseC.h \
   DatabaseC.inl \
+  DatabaseS.cpp \
   DatabaseS.h \
   DatabaseS.inl \
   DatabaseS_T.cpp \
   DatabaseS_T.h \
   DatabaseS_T.inl
 
-DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
+DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
 
 Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Database.idl
+
+## Makefile.POA_DSI_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -63,11 +69,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   DatabaseC.cpp \
   client.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.h \
-  DatabaseS_T.h \
-  DatabaseS_T.inl
+  Database_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -87,35 +89,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  DatabaseC.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.cpp \
-  DatabaseS.h \
-  DatabaseS.inl \
-  DatabaseS_T.cpp \
-  DatabaseS_T.h \
-  DatabaseS_T.inl
-
-CLEANFILES += \
-  Database-stamp \
-  DatabaseC.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.cpp \
-  DatabaseS.h \
-  DatabaseS.inl \
-  DatabaseS_T.cpp \
-  DatabaseS_T.h \
-  DatabaseS_T.inl
-
-DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
-
-Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -129,11 +102,6 @@ server_SOURCES = \
   DatabaseS.cpp \
   Database_i.cpp \
   server.cpp \
-  DatabaseC.h \
-  DatabaseC.inl \
-  DatabaseS.h \
-  DatabaseS_T.h \
-  DatabaseS_T.inl \
   Database_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 62a433a23c3..508a5b3f898 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,14 +1,29 @@
 //$Id$
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Database.idl
+  }
+  custom_only = 1
+}
+
 project(*Client) : taoclient, messaging, minimum_corba {
+  after += *IDL
   source_files {
     DatabaseC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba {
+  after += *IDL
   source_files {
     Database_i.cpp
     server.cpp
+    DatabaseS.cpp
+    DatabaseC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am
index 9a72843cfc9..92b793755c4 100644
--- a/TAO/examples/POA/Default_Servant/Makefile.am
+++ b/TAO/examples/POA/Default_Servant/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,47 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.POA_Default_Servant_Client.am
-
-if !BUILD_MINIMUM_CORBA
+## Makefile.POA_Default_Servant_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   FileC.cpp \
   FileC.h \
   FileC.inl \
+  FileS.cpp \
   FileS.h \
   FileS.inl \
   FileS_T.cpp \
   FileS_T.h \
   FileS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   File-stamp \
   FileC.cpp \
   FileC.h \
   FileC.inl \
+  FileS.cpp \
   FileS.h \
   FileS.inl \
   FileS_T.cpp \
   FileS_T.h \
   FileS_T.inl
 
-FileC.cpp FileC.h FileC.inl FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp
+FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp
 
 File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  File.idl
+
+## Makefile.POA_Default_Servant_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -62,11 +68,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   FileC.cpp \
   client.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.h \
-  FileS_T.h \
-  FileS_T.inl
+  File_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -79,35 +81,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl \
-  FileS_T.cpp \
-  FileS_T.h \
-  FileS_T.inl
-
-CLEANFILES += \
-  File-stamp \
-  FileC.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.cpp \
-  FileS.h \
-  FileS.inl \
-  FileS_T.cpp \
-  FileS_T.h \
-  FileS_T.inl
-
-FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp
-
-File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -121,11 +94,6 @@ server_SOURCES = \
   FileS.cpp \
   File_i.cpp \
   server.cpp \
-  FileC.h \
-  FileC.inl \
-  FileS.h \
-  FileS_T.h \
-  FileS_T.inl \
   File_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 897515a3602..55d3216ddfb 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,16 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, anytypecode {
+  IDL_Files {
+    File.idl
+  }
+  custom_only = 1
+}
+
 project(*Client) : taoclient, anytypecode, minimum_corba {
+  after += *IDL
   source_files {
     FileC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Server) : taoserver, minimum_corba {
+  after += *IDL
   source_files {
     File_i.cpp
     server.cpp
+    FileS.cpp
+    FileC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index c232bbd92b8..babb006e009 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -16,7 +16,12 @@ unlink $iorfile;
 $SV = new PerlACE::Process ("server", "-o $iorfile");
 $CL = new PerlACE::Process ("client", "-k $iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
index 577eb5f2de0..3c97f87aade 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
@@ -1,19 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taolib {
+project: taolib, wfmo {
   sharedname = Alt_Resource_Factory
   dynamicflags = Alt_Resource_Factory_BUILD_DLL
-
-  verbatim(gnuace, top) {
-    ifneq ($(MAKE),)
-    include $(ACE_ROOT)/include/makeinclude/macros.GNU
-    TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
-    $(TARGETS_NESTED):
-    "	@echo alt_resource will only build on Windows"
-    else
-  }
-  verbatim(gnuace, bottom) {
-    endif
-  }
 }
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
index d5937ed3027..ea05d7984b0 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
@@ -6,15 +6,18 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.Alt_Resource.am
 
+if BUILD_WFMO
+
 noinst_LTLIBRARIES = libAlt_Resource_Factory.la
 
 libAlt_Resource_Factory_la_CPPFLAGS = \
@@ -31,6 +34,8 @@ noinst_HEADERS = \
   Alt_Resource_Factory.h \
   Resource_Factory.h
 
+endif BUILD_WFMO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.am b/TAO/examples/POA/Explicit_Activation/Makefile.am
index f5b4e5ade81..e95bac97658 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,8 +14,8 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 SUBDIRS = \
-        Alt_Resources \
-        .
+        . \
+        Alt_Resources
 
 
 ## Makefile.POA_Explicit_Activation_Server.am
@@ -29,7 +29,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 7f01d95962a..60b77c13641 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -2,9 +2,14 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   } 
+   includes += ../Generic_Servant
+
    Source_Files {
     server.cpp
   }
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 3d4ad7d4afb..9c695ee3141 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -55,7 +55,12 @@ $status = 0;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 10) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 1b84668cb10..a7e69aafb9a 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -33,7 +33,7 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
                        const char *child_poa_name,
                        int activate)
 {
-  int expected_exception_raised = 0;
+  bool expected_exception_raised = false;
 
   // New environment.
   ACE_TRY_NEW_ENV
@@ -47,14 +47,14 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
     }
   ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo)
     {
-      expected_exception_raised = 1;
+      expected_exception_raised = true;
     }
   ACE_ENDTRY;
 
-  ACE_ASSERT (expected_exception_raised);
-
-  // In non-debug compiles, asserts will disappear.
-  ACE_UNUSED_ARG (expected_exception_raised);
+  if (!expected_exception_raised)
+    ACE_ERROR ((LM_ERROR, "ERROR: Caught incorrect exception\n"));
+  else
+    ACE_DEBUG ((LM_DEBUG, "Caught correct exception\n"));
 }
 
 int
diff --git a/TAO/examples/POA/FindPOA/Makefile.am b/TAO/examples/POA/FindPOA/Makefile.am
index e4999c98d0c..be8760ad264 100644
--- a/TAO/examples/POA/FindPOA/Makefile.am
+++ b/TAO/examples/POA/FindPOA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am
index 1c92b99e274..0793f92917e 100644
--- a/TAO/examples/POA/Forwarding/Makefile.am
+++ b/TAO/examples/POA/Forwarding/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,47 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.POA_Forwarding_Client.am
-
-if !BUILD_MINIMUM_CORBA
+## Makefile.POA_Forwarding_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.POA_Forwarding_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -62,11 +68,8 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  Servant_Activator.h \
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -79,35 +82,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -123,11 +97,6 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   Servant_Activator.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 8f35adb7f26..758ca27605f 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,17 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL) : taoidldefaults, anytypecode {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Client) : taoclient, anytypecode, minimum_corba {
+  after += *IDL
   source_files {
     client.cpp
     testC.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Server) : taoserver, minimum_corba {
+  after += *IDL
   source_files {
     test_i.cpp
     server.cpp
     Servant_Activator.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am
index 1d60d8b179a..c2b6c115364 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile.am
+++ b/TAO/examples/POA/Generic_Servant/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -78,6 +78,7 @@ endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.POA_Generic_Servant_Client.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
@@ -101,6 +102,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index 0cc793eef25..3c249a12a2e 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -9,8 +9,9 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba {
 }
 
 project(*client): taoexe, portableserver, minimum_corba {
-  after += *lib
-  libs += Generic_Servant
+  avoids += ace_for_tao
+  after  += *lib
+  libs   += Generic_Servant
   idl_files {
   }
   Source_Files {
diff --git a/TAO/examples/POA/Loader/Makefile.am b/TAO/examples/POA/Loader/Makefile.am
index d23f94d5553..8fe08c1419f 100644
--- a/TAO/examples/POA/Loader/Makefile.am
+++ b/TAO/examples/POA/Loader/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 24b69e01972..7d723f1796d 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -52,7 +52,12 @@ unlink $iorfile_2;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/Makefile.am b/TAO/examples/POA/Makefile.am
index abde9d124d7..542c6cf19dc 100644
--- a/TAO/examples/POA/Makefile.am
+++ b/TAO/examples/POA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         DSI \
diff --git a/TAO/examples/POA/NewPOA/Makefile.am b/TAO/examples/POA/NewPOA/Makefile.am
index e69f60167ae..4c013aa8649 100644
--- a/TAO/examples/POA/NewPOA/Makefile.am
+++ b/TAO/examples/POA/NewPOA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 30e1426c7a3..1a4293ecc61 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -29,8 +29,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (NewPOA, 
-           NewPOA, 
+ACE_RCSID (NewPOA,
+           NewPOA,
            "$Id$")
 
 void
@@ -72,7 +72,7 @@ print_poa (PortableServer::POA_ptr poa
        index != children->length ();
        ++index)
     {
-      print_poa (children[index].in ()
+      print_poa (children[index]
                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.am b/TAO/examples/POA/On_Demand_Activation/Makefile.am
index a2ac2c2ca91..87903538300 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   Servant_Activator.cpp \
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 57a09f749b8..7b2742cdd86 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -2,9 +2,14 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   }
+   includes += ../Generic_Servant
+
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index b61752d6930..84d6e385867 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -53,7 +53,12 @@ $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $status = 0;
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.am b/TAO/examples/POA/On_Demand_Loading/Makefile.am
index b4ddf7e443a..0867d2d51ea 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 50321c85844..118c807c2c6 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -111,7 +111,7 @@ ServantManager_i::parse_string (const char *s)
 
   ACE_CString str (s);
 
-  int index = str.find (':');
+  ssize_t index = str.find (':');
   // On error, npos is returned.
   if (index == ACE_CString::npos)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 4b87c9f280b..2b8e2439321 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -55,7 +55,12 @@ $CL1 = new PerlACE::Process ("../Generic_Servant/client",
 $CL2 = new PerlACE::Process ("../Generic_Servant/client",
                              "$extra_args $oneway -i $iterations -k file://$iorfile2 -x"); 
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
diff --git a/TAO/examples/POA/POA_BiDir/Makefile.am b/TAO/examples/POA/POA_BiDir/Makefile.am
index f2273beac5b..36820860827 100644
--- a/TAO/examples/POA/POA_BiDir/Makefile.am
+++ b/TAO/examples/POA/POA_BiDir/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index 32ed0e1b3f0..cfe114ea1ea 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -69,7 +69,7 @@ print_poa (PortableServer::POA_ptr poa
        index != children->length ();
        ++index)
     {
-      print_poa (children[index].in ()
+      print_poa (children[index]
                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
index b5515bc32b4..c639802ca9f 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 0b54971c2cb..71264867f12 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -2,11 +2,15 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   }
+   includes += ../Generic_Servant
+
    Source_Files {
     server.cpp
   }
 }
-
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index b8a67aa7ed4..4df2b4a645d 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -49,7 +49,12 @@ $CL = new PerlACE::Process ("../Generic_Servant/client", "$extra_args $oneway -i
 
 $status = 0;
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/examples/POA/RootPOA/Makefile.am b/TAO/examples/POA/RootPOA/Makefile.am
index d60bccc1ae3..4916916d912 100644
--- a/TAO/examples/POA/RootPOA/Makefile.am
+++ b/TAO/examples/POA/RootPOA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am
index 84100c426b3..71637e5ebf1 100644
--- a/TAO/examples/POA/TIE/Makefile.am
+++ b/TAO/examples/POA/TIE/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,41 +16,48 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.POA_TIE_Client.am
-
-if !BUILD_MINIMUM_CORBA
+## Makefile.POA_TIE_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
   testC.inl \
+  testS.cpp \
   testS.h \
   testS.inl \
   testS_T.cpp \
   testS_T.h \
   testS_T.inl
 
-testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.POA_TIE_Client.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -62,11 +69,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -74,40 +77,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.POA_TIE_Server.am
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -121,11 +96,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index 585af3c0dfc..bb4d3be3634 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,16 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL) : taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Client) : taoclient, anytypecode, minimum_corba {
+  after += *IDL
+  avoids += ace_for_tao
   source_files {
     client.cpp
     testC.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Server) : taoserver, minimum_corba {
+  after += *IDL
   source_files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am
index c1536d162a7..2deee112123 100644
--- a/TAO/examples/Persistent_Grid/Makefile.am
+++ b/TAO/examples/Persistent_Grid/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,12 +16,14 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Persistent_Grid_Client.am
+
+## Makefile.Persistent_Grid_IDL.am
 
 BUILT_SOURCES = \
   GridC.cpp \
   GridC.h \
   GridC.inl \
+  GridS.cpp \
   GridS.h \
   GridS.inl \
   GridS_T.cpp \
@@ -33,18 +35,25 @@ CLEANFILES = \
   GridC.cpp \
   GridC.h \
   GridC.inl \
+  GridS.cpp \
   GridS.h \
   GridS.inl \
   GridS_T.cpp \
   GridS_T.h \
   GridS_T.inl
 
-GridC.cpp GridC.h GridC.inl GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
+GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
 
 Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Grid.idl
+
+## Makefile.Persistent_Grid_Client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -58,11 +67,6 @@ client_SOURCES = \
   Grid_Client_i.cpp \
   Simple_util.cpp \
   client.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_Client_i.h \
   Simple_util.h
 
@@ -77,33 +81,6 @@ client_LDADD = \
 
 ## Makefile.Persistent_Grid_Persistent_Client.am
 
-BUILT_SOURCES += \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-CLEANFILES += \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-GridC.cpp GridC.h GridC.inl GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
-	@touch $@
-
 noinst_PROGRAMS += persistent_client
 
 persistent_client_CPPFLAGS = \
@@ -117,11 +94,6 @@ persistent_client_SOURCES = \
   Persistent_Client_i.cpp \
   Simple_util.cpp \
   persistent_client.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Simple_util.h
 
 persistent_client_LDADD = \
@@ -135,34 +107,7 @@ persistent_client_LDADD = \
 
 ## Makefile.Persistent_Grid_Server.am
 
-BUILT_SOURCES += \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-CLEANFILES += \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -178,11 +123,6 @@ server_SOURCES = \
   Grid_i.cpp \
   Simple_util.cpp \
   server.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_i.h \
   Simple_util.h
 
@@ -195,6 +135,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index d4d326d3fc1..ee446f09b4c 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,28 +1,47 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Grid.idl
+  }
+  custom_only = 1
+}
+
 project(*server): taoserver, utils {
+  after += *IDL
+  avoids += ace_for_tao
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
     server.cpp
+    GridS.cpp
+    GridC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): taoexe, utils, portableserver {
+  after += *IDL
   Source_Files {
     GridC.cpp
     Simple_util.cpp
     Grid_Client_i.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*persistent client): taoexe, utils, portableserver {
+  after += *IDL
   Source_Files {
     GridC.cpp
     Simple_util.cpp
     Persistent_Client_i.cpp
     persistent_client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/examples/PluggableUDP/Makefile.am b/TAO/examples/PluggableUDP/Makefile.am
index 22e8dfc439f..1040f6689d5 100644
--- a/TAO/examples/PluggableUDP/Makefile.am
+++ b/TAO/examples/PluggableUDP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         tests
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index c3a57d77905..4c296c2067d 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -1,23 +1,43 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*IDL): taoidldefaults {
   idlflags += -Sp -Sd
 
+  IDL_Files {
+    UDP.idl
+  }
+
+  custom_only = 1
+}
+
+project(*server): taoserver, strategies {
+  exename = server
+  after += *IDL
+
   Source_Files {
-    UDP_Client_i.cpp
     server.cpp
+    UDP_Client_i.cpp
     UDP_i.cpp
+    UDPS.cpp
+    UDPC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
-  idlflags += -Sp -Sd
+project(*client): taoserver, strategies {
+  exename = client
+  after += *IDL
 
   Source_Files {
     client.cpp
     UDP_Client_i.cpp
     UDP_i.cpp
+    UDPS.cpp
+    UDPC.cpp
+  }
+  IDL_Files {
   }
 }
 
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
index b94ec10dfd3..5cbf1074b07 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Basic_Client.am
+noinst_PROGRAMS =
+
+## Makefile.Basic_IDL.am
 
 BUILT_SOURCES = \
   UDPC.cpp \
@@ -44,10 +46,18 @@ CLEANFILES = \
 UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp
 
 UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/UDP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/UDP.idl
 	@touch $@
 
-noinst_PROGRAMS = client
+
+noinst_HEADERS = \
+  UDP.idl
+
+## Makefile.Basic_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -61,11 +71,6 @@ client_SOURCES = \
   UDP_Client_i.cpp \
   UDP_i.cpp \
   client.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.h \
-  UDPS_T.h \
-  UDPS_T.inl \
   UDP_Client_i.h \
   UDP_i.h
 
@@ -76,36 +81,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Basic_Server.am
-
-BUILT_SOURCES += \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl \
-  UDPS_T.cpp \
-  UDPS_T.h \
-  UDPS_T.inl
-
-CLEANFILES += \
-  UDP-stamp \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl \
-  UDPS_T.cpp \
-  UDPS_T.h \
-  UDPS_T.inl
+endif !BUILD_ACE_FOR_TAO
 
-UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp
+## Makefile.Basic_Server.am
 
-UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/UDP.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -121,11 +101,6 @@ server_SOURCES = \
   UDP_Client_i.cpp \
   UDP_i.cpp \
   server.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.h \
-  UDPS_T.h \
-  UDPS_T.inl \
   UDP_Client_i.h \
   UDP_i.h
 
@@ -136,6 +111,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/PluggableUDP/tests/Makefile.am b/TAO/examples/PluggableUDP/tests/Makefile.am
index cb0614e4bea..cda6e61bb69 100644
--- a/TAO/examples/PluggableUDP/tests/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic \
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
index 7ed7c655c77..3af4c109dc8 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Performance_Client.am
+noinst_PROGRAMS =
+
+## Makefile.Performance_IDL.am
 
 BUILT_SOURCES = \
   UDPC.cpp \
@@ -44,10 +46,18 @@ CLEANFILES = \
 UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp
 
 UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sd -Sp $(srcdir)/UDP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sd -Sp $(srcdir)/UDP.idl
 	@touch $@
 
-noinst_PROGRAMS = client
+
+noinst_HEADERS = \
+  UDP.idl
+
+## Makefile.Performance_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -61,11 +71,6 @@ client_SOURCES = \
   UDP_PerformanceClient.cpp \
   UDP_i.cpp \
   client.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.h \
-  UDPS_T.h \
-  UDPS_T.inl \
   UDP_PerformanceClient.h \
   UDP_i.h
 
@@ -76,36 +81,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Performance_Server.am
-
-BUILT_SOURCES += \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl \
-  UDPS_T.cpp \
-  UDPS_T.h \
-  UDPS_T.inl
-
-CLEANFILES += \
-  UDP-stamp \
-  UDPC.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.cpp \
-  UDPS.h \
-  UDPS.inl \
-  UDPS_T.cpp \
-  UDPS_T.h \
-  UDPS_T.inl
+endif !BUILD_ACE_FOR_TAO
 
-UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp
+## Makefile.Performance_Server.am
 
-UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sd -Sp $(srcdir)/UDP.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -120,11 +100,6 @@ server_SOURCES = \
   UDPS.cpp \
   UDP_i.cpp \
   server.cpp \
-  UDPC.h \
-  UDPC.inl \
-  UDPS.h \
-  UDPS_T.h \
-  UDPS_T.inl \
   UDP_i.h
 
 server_LDADD = \
@@ -134,6 +109,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index bd68605887a..1ecc26f0279 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,22 +1,40 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*IDL): taoidldefaults {
   idlflags += -Sd -Sp
 
+  IDL_Files {
+    UDP.idl
+  }
+
+  custom_only = 1
+}
+
+project(*server): taoserver, strategies {
+  exename = server
+  after += *IDL
   Source_Files {
     UDP_i.cpp
     server.cpp
+    UDPS.cpp
+    UDPC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
-  idlflags += -Sd -Sp
-
+project(*client): taoserver, strategies {
+  exename = client
+  after += *IDL
   Source_Files {
     client.cpp
     UDP_i.cpp
     UDP_PerformanceClient.cpp
+    UDPS.cpp
+    UDPC.cpp
+  }
+  IDL_Files {
   }
 }
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
index 398ba1b6b8c..59e9a849534 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.SimplePerformance_Client.am
+noinst_PROGRAMS =
+
+## Makefile.SimplePerformance_IDL.am
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -44,10 +46,18 @@ CLEANFILES = \
 testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/test.idl
 	@touch $@
 
-noinst_PROGRAMS = client
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.SimplePerformance_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -58,12 +68,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
@@ -72,36 +77,11 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.SimplePerformance_Server.am
+endif !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-CLEANFILES += \
-  test-stamp \
-  testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.cpp \
-  testS.h \
-  testS.inl \
-  testS_T.cpp \
-  testS_T.h \
-  testS_T.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+## Makefile.SimplePerformance_Server.am
 
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl
-	@touch $@
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -116,11 +96,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
@@ -130,6 +105,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index 45de340b324..ed5ce859b74 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,20 +1,41 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*IDL): taoidldefaults {
   idlflags += -Sp -Sd
 
+  IDL_Files {
+    test.idl
+  }
+
+  custom_only = 1
+}
+
+project(*server): taoserver, strategies {
+  exename = server
+  after += *IDL
+
   Source_Files {
     server.cpp
     test_i.cpp
+    testS.cpp
+    testC.cpp
+  }
+
+  IDL_Files {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
-  idlflags += -Sp -Sd
+project(*client): taoserver, strategies {
+  exename = client
+  after += *IDL
 
   Source_Files {
     client.cpp
+    testC.cpp
+  }
+
+  IDL_Files {
   }
 }
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 6161db6281d..0f8f2217a1d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -26,7 +26,7 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN testClient
 #endif
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index 688660a679e..6fe540360ff 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -26,11 +26,12 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN testServer
 #endif
 
+
 const char *ior_output_file = "test.ior";
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index de53842ce82..8c3afbbbffe 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -36,7 +36,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
       factory_Finder_Name.length (2);
       factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
-      if (this->quoterNamingContext_var_.ptr () != 0)
+      if (!CORBA::is_nil (this->quoterNamingContext_var_.in ()))
         this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 871941f0e53..db7d0eec12f 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -21,8 +21,8 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Quoter, 
-           Factory_Finder_i, 
+ACE_RCSID (Quoter,
+           Factory_Finder_i,
            "$Id$")
 
 // Constructor
@@ -95,7 +95,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
       ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
 
     // insert the object reference
-    (*factories_ptr)[0] = CORBA::Object::_duplicate (quoterFactoryObject_var.ptr());
+    (*factories_ptr)[0] = CORBA::Object::_duplicate (quoterFactoryObject_var.in());
 
     if (this->debug_level_ > 1)
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 0c68c46d822..fca74893051 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -18,8 +18,8 @@
 #include "orbsvcs/LifeCycleServiceC.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (Quoter, 
-           Generic_Factory, 
+ACE_RCSID (Quoter,
+           Generic_Factory,
            "$Id$")
 
 Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
@@ -37,7 +37,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
-      if (this->quoterNamingContext_var_.ptr () != 0)
+      if (!CORBA::is_nil (this->quoterNamingContext_var_.in ()))
         this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/examples/Quoter/Makefile.am b/TAO/examples/Quoter/Makefile.am
index 36ca9402333..31ec9e91a30 100644
--- a/TAO/examples/Quoter/Makefile.am
+++ b/TAO/examples/Quoter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Quoter_Client.am
-
-if !BUILD_MINIMUM_CORBA
+## Makefile.Quoter_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -35,7 +31,7 @@ BUILT_SOURCES += \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -50,9 +46,17 @@ CLEANFILES += \
 QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
 
 Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Quoter.idl
+
+## Makefile.Quoter_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -65,13 +69,7 @@ client_CPPFLAGS = \
 
 client_SOURCES = \
   QuoterC.cpp \
-  QuoterS.cpp \
   client.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   client.h
 
 client_LDADD = \
@@ -88,35 +86,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += Factory_Finder
 
 Factory_Finder_CPPFLAGS = \
@@ -133,12 +102,7 @@ Factory_Finder_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   Factory_Finder.h \
-  Factory_Finder_i.h \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl
+  Factory_Finder_i.h
 
 Factory_Finder_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -157,35 +121,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += Generic_Factory
 
 Generic_Factory_CPPFLAGS = \
@@ -202,12 +137,7 @@ Generic_Factory_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   Generic_Factory.h \
-  Generic_Factory_i.h \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl
+  Generic_Factory_i.h
 
 Generic_Factory_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -226,35 +156,6 @@ endif !BUILD_MINIMUM_CORBA
 
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -270,11 +171,6 @@ server_SOURCES = \
   QuoterS.cpp \
   Quoter_i.cpp \
   server.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Quoter_i.h \
   server.h
 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index e4ac4c10b0d..a5ed3d19def 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -1,30 +1,55 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Quoter.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, lifecycle, minimum_corba, utils {
+  after += *IDL
   Source_Files {
     server.cpp
     Quoter_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): namingexe, lifecycle, minimum_corba {
+  after += *IDL
   Source_Files {
     client.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils {
+  after += *IDL
   Source_Files {
     Factory_Finder.cpp
     Factory_Finder_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils {
+  after += *IDL
   Source_Files {
     Generic_Factory.cpp
     Generic_Factory_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 582af47ef1c..7b8d054358b 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void)
       factory_name.length (2);
       factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_name[1].id = CORBA::string_dup ("Quoter_Factory");
-      if (this->namingContext_var_.ptr () != 0)
+      if (!CORBA::is_nil (this->namingContext_var_.in ()))
         this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       factory_name.length (1);
-      if (this->namingContext_var_.ptr () != 0)
+      if (!CORBA::is_nil (this->namingContext_var_.in ()))
         this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 8720611ff4e..f4f40d917a1 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -1,7 +1,9 @@
 //$Id$
+
+
 #include "Activity.h"
-#include "Thread_Task.h"
 #include "Job_i.h"
+#include "Thread_Task.h"
 #include "POA_Holder.h"
 #include "Builder.h"
 
@@ -12,7 +14,7 @@
 #include "ace/Barrier.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Service_Config.h"
-#include "ace/Arg_Shifter.h"
+//#include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Signal.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index ea5cef35093..346b2c6a414 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -24,7 +24,10 @@
 #include "activity_export.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class Job_i;
 class Periodic_Task;
 class Builder;
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index ef8cc8a0296..0d7054ff5b0 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -5,7 +5,7 @@ project : orbsvcslib, namingexe, rt_server {
   exename = activity
   // We use macros instead of dynamicflags so that 
   // the symbols will be exported from an exe. 
-  macros = ACTIVITY_BUILD_DLL
+  macros += ACTIVITY_BUILD_DLL
   Source_Files {
     Activity.cpp
     Builder.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 8e5d263de0b..10e77ebc9a3 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -16,16 +16,16 @@
 #include "orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
-class Periodic_Task;
-class Job_i;
-class POA_Holder;
-
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "activity_export.h"
 #include "ace/Arg_Shifter.h"
 
+
 class Activity;
+class Periodic_Task;
+class Job_i;
+class POA_Holder;
 
 typedef POA_Holder** POA_LIST;
 typedef Periodic_Task** TASK_LIST;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index f20cad63015..98f0fee4a44 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -25,6 +25,9 @@ Job_i::poa (void)
 int
 Job_i::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
+  int tmpInt = 1;
+  char ** tmp;
+  ACE_TArg_Shifter<char> arg_shifter_(tmpInt, tmp);
   job_name_ = arg_shifter.get_current (); // Read the name of the Job
   arg_shifter.consume_arg ();
 
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index c4df011e570..3594aa49416 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -18,6 +18,10 @@
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter<char>;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class Job_i
  *
diff --git a/TAO/examples/RTCORBA/Activity/Makefile.am b/TAO/examples/RTCORBA/Activity/Makefile.am
index a3bc3322339..e2d3f23ee49 100644
--- a/TAO/examples/RTCORBA/Activity/Makefile.am
+++ b/TAO/examples/RTCORBA/Activity/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 8591c1df86a..1e44b40d6b1 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -19,6 +19,10 @@
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter<char>;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class POA_Holder
  *
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index a82180a1adf..3fb8ed12a82 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -21,7 +21,10 @@
 #include "activity_export.h"
 #include "ace/Arg_Shifter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class Task_Stats;
 
 /**
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.inl b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
index 0e9aa2b2bb7..78ce13d05bc 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.inl
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
@@ -1,5 +1,7 @@
 //$Id$
 
+#include "ace/Log_Msg.h"
+
 ACE_INLINE int
 Task_Stats::sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time)
 {
diff --git a/TAO/examples/RTCORBA/Makefile.am b/TAO/examples/RTCORBA/Makefile.am
index 1ffe1b56eae..481bc3e73a0 100644
--- a/TAO/examples/RTCORBA/Makefile.am
+++ b/TAO/examples/RTCORBA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Activity
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index 94170a05b78..6a27728be15 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -8,6 +8,8 @@
 #include "DT_Creator.h"
 #include "tao/RTScheduling/Current.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
 
 int
@@ -136,7 +138,7 @@ DT_Creator::init (int argc, char *argv [])
 	      delete this->job_list_[job_count];
 	      return -1;
 	    }
-	  else 
+	  else
 	    job_count++;
 	}
       else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile")))
@@ -216,10 +218,10 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
 	      "Synch Name %s\n",
 	      synch_name.c_str ()));
-  
+
   ACE_NEW (synch_,
 	   Synch_i);
-  
+
   Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -274,7 +276,7 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
 				 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   for (int i = 0; i < poa_count_; ++i)
     {
       poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
@@ -454,13 +456,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
   ACE_DEBUG ((LM_DEBUG,
               "Waiting to Synch\n"));
-  
+
   while (!this->synch ()->synched ())
     {
       this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   CORBA::Policy_var sched_param;
   sched_param = CORBA::Policy::_duplicate (this->sched_param (100));
   const char * name = 0;
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index b29a76501c9..59aef8feb37 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Starter): namingexe, rtscheduling_server {
+  after += MIF_Scheduler_Starter
   idlflags += -o ..
 
   IDL_Files {
@@ -18,6 +19,8 @@ project(*Starter): namingexe, rtscheduling_server {
 }
 
 project(*test) : namingexe, rtscheduling_server {
+  after += *Starter
+
   idlflags += -o ..
 
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
index 349110136a1..be0a5ca65a1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 3fa80cbb8ae..b8aee4ede56 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -66,8 +66,6 @@ Job_i::work (CORBA::ULong work,
 		    dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
 		    sizeof (dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
 
-
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"%t Guid is %d, Importance is %d\n",
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 149120fa698..6b290a7e7a6 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -16,8 +16,13 @@
 #include "JobS.h"
 #include "Task_Stats.h"
 #include "ace/SString.h"
+
 #include "ace/Arg_Shifter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter<char>;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class DT_Creator;
 
 /**
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index bab97a4c297..6c02c305435 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -42,10 +42,11 @@ MIF_DT_Creator::yield (int suspend_time,
 {
   ACE_TRY_NEW_ENV
     {
+      ACE_Time_Value const sus_time_value (suspend_time);
       ACE_Time_Value now (ACE_OS::gettimeofday ());
-      while (((now - *base_time_) < suspend_time) || (suspend_time == 1))
+      while (((now - *base_time_) < sus_time_value) || (suspend_time == 1))
         {
-          
+
           ACE_OS::sleep (1);
           CORBA::Policy_var sched_param;
           sched_param = CORBA::Policy::_duplicate (this->sched_param (100));
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index 1f77c6cc45e..1e6daba4900 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -19,6 +19,7 @@ project(*Starter): namingexe, rtscheduling_server {
 }
 
 project(*test) : namingexe, rtscheduling_server {
+  after += *Starter
   idlflags += -o ..
 
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
index d252d45676d..28177944450 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client
index 8ecfba1b6ac..90735c209d1 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client
@@ -2,7 +2,7 @@
 
 # Note! priority values are for Linux
 
-static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
 static RTScheduler_Loader ""
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server
index 0c5429ea100..97bcc0114a0 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server
@@ -2,7 +2,7 @@
 
 # Note! priority values are for Linux
 
-static RT_ORB_Loader "-ORBSchedPolicy SCHED_OTHER -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+static RT_ORB_Loader "-ORBSchedPolicy SCHED_OTHER -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
 #static MIF_DT_Creator "-DT_Count 4 -DT_Task -Importance 4 -Start_Time 0 -Load 1000 -DT_Task -Importance 5 -Start_Time 20 -Load 100 -DT_Task -Importance 8 -Start_Time 60 -Load 1000 -DT_Task -Importance 10 -Start_Time 100 -Load 100"
 
diff --git a/TAO/examples/RTScheduling/Makefile.am b/TAO/examples/RTScheduling/Makefile.am
index f29d3c5acc4..c907e515a5a 100644
--- a/TAO/examples/RTScheduling/Makefile.am
+++ b/TAO/examples/RTScheduling/Makefile.am
@@ -6,9 +6,9 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
-        Fixed_Priority_Scheduler \
-        MIF_Scheduler
+        MIF_Scheduler \
+        Fixed_Priority_Scheduler
 
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 8319c86ef1a..b155203b515 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -17,10 +17,14 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-//#include "activity_export.h"
 #include "ace/SString.h"
+
 #include "ace/Arg_Shifter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter<char>;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class POA_Holder
  *
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index a9b20909662..339c225e7bb 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -15,7 +15,7 @@ Synch_i::go (CORBA::Long base_time
   ACE_DEBUG ((LM_DEBUG,
 	      "GO\n"));
   this->synched_ = 1;
-  this->base_time_.set (base_time, 0);
+  this->base_time_.set (static_cast<time_t>(base_time), 0);
 }
 
 int
diff --git a/TAO/examples/Simple/Makefile.am b/TAO/examples/Simple/Makefile.am
index ca63e3a9d79..19db928b1da 100644
--- a/TAO/examples/Simple/Makefile.am
+++ b/TAO/examples/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         bank \
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 21321e449c3..ebae834858d 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -34,7 +34,9 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Manager;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class AccountManager_i : public POA_Bank::AccountManager
 {
diff --git a/TAO/examples/Simple/bank/Makefile.am b/TAO/examples/Simple/bank/Makefile.am
index 7ce89d77efd..c42e3f3e95b 100644
--- a/TAO/examples/Simple/bank/Makefile.am
+++ b/TAO/examples/Simple/bank/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.bank_client.am
+## Makefile.bank_IDL.am
 
 BUILT_SOURCES = \
   BankC.cpp \
   BankC.h \
   BankC.inl \
+  BankS.cpp \
   BankS.h \
   BankS.inl \
   BankS_T.cpp \
@@ -33,18 +34,25 @@ CLEANFILES = \
   BankC.cpp \
   BankC.h \
   BankC.inl \
+  BankS.cpp \
   BankS.h \
   BankS.inl \
   BankS_T.cpp \
   BankS_T.h \
   BankS_T.inl
 
-BankC.cpp BankC.h BankC.inl BankS.h BankS.inl BankS_T.cpp BankS_T.h BankS_T.inl: Bank-stamp
+BankC.cpp BankC.h BankC.inl BankS.cpp BankS.h BankS.inl BankS_T.cpp BankS_T.h BankS_T.inl: Bank-stamp
 
 Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Bank.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Bank.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Bank.idl
+
+## Makefile.bank_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -61,11 +69,6 @@ client_SOURCES = \
   Bank_Client_i.cpp \
   client.cpp \
   ../Simple_util.h \
-  BankC.h \
-  BankC.inl \
-  BankS.h \
-  BankS_T.h \
-  BankS_T.inl \
   Bank_Client_i.h
 
 client_LDADD = \
@@ -81,35 +84,6 @@ client_LDADD = \
 
 ## Makefile.bank_server.am
 
-BUILT_SOURCES += \
-  BankC.cpp \
-  BankC.h \
-  BankC.inl \
-  BankS.cpp \
-  BankS.h \
-  BankS.inl \
-  BankS_T.cpp \
-  BankS_T.h \
-  BankS_T.inl
-
-CLEANFILES += \
-  Bank-stamp \
-  BankC.cpp \
-  BankC.h \
-  BankC.inl \
-  BankS.cpp \
-  BankS.h \
-  BankS.inl \
-  BankS_T.cpp \
-  BankS_T.h \
-  BankS_T.inl
-
-BankC.cpp BankC.h BankC.inl BankS.cpp BankS.h BankS.inl BankS_T.cpp BankS_T.h BankS_T.inl: Bank-stamp
-
-Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Bank.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -129,12 +103,7 @@ server_SOURCES = \
   server.cpp \
   ../Simple_util.h \
   AccountManager_i.h \
-  Account_i.h \
-  BankC.h \
-  BankC.inl \
-  BankS.h \
-  BankS_T.h \
-  BankS_T.inl
+  Account_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 237fef618dd..df8debec262 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,22 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, anytypecode {
+  IDL_Files {
+    Bank.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, iortable, utils {
+  exename = server
+  after += *IDL
   Source_Files {
     Account_i.cpp
     AccountManager_i.cpp
     ../Simple_util.cpp
     server.cpp
+    BankS.cpp
+    BankC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): namingexe, iortable, utils {
   exename = client
-
+  after += *IDL
   Source_Files {
     BankC.cpp
     client.cpp
     ../Simple_util.cpp
     Bank_Client_i.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/examples/Simple/chat/Makefile.am b/TAO/examples/Simple/chat/Makefile.am
index e8dc4f71719..3c0935beda5 100644
--- a/TAO/examples/Simple/chat/Makefile.am
+++ b/TAO/examples/Simple/chat/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.chat_client.am
+## Makefile.chat_IDL.am
 
 BUILT_SOURCES = \
   ReceiverC.cpp \
@@ -44,7 +44,7 @@ CLEANFILES = \
 ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl ReceiverS_T.cpp ReceiverS_T.h ReceiverS_T.inl: Receiver-stamp
 
 Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Receiver.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -73,9 +73,16 @@ CLEANFILES += \
 BroadcasterC.cpp BroadcasterC.h BroadcasterC.inl BroadcasterS.cpp BroadcasterS.h BroadcasterS.inl BroadcasterS_T.cpp BroadcasterS_T.h BroadcasterS_T.inl: Broadcaster-stamp
 
 Broadcaster-stamp: $(srcdir)/Broadcaster.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Broadcaster.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Broadcaster.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Broadcaster.idl \
+  Receiver.idl
+
+## Makefile.chat_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -86,23 +93,12 @@ client_CPPFLAGS = \
 
 client_SOURCES = \
   BroadcasterC.cpp \
-  BroadcasterS.cpp \
   Client_i.cpp \
   ReceiverC.cpp \
   ReceiverS.cpp \
   Receiver_i.cpp \
   client.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.h \
-  BroadcasterS_T.h \
-  BroadcasterS_T.inl \
   Client_i.h \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.h \
-  ReceiverS_T.h \
-  ReceiverS_T.inl \
   Receiver_i.h
 
 client_LDADD = \
@@ -116,64 +112,6 @@ client_LDADD = \
 
 ## Makefile.chat_server.am
 
-BUILT_SOURCES += \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl \
-  ReceiverS_T.cpp \
-  ReceiverS_T.h \
-  ReceiverS_T.inl
-
-CLEANFILES += \
-  Receiver-stamp \
-  ReceiverC.cpp \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.cpp \
-  ReceiverS.h \
-  ReceiverS.inl \
-  ReceiverS_T.cpp \
-  ReceiverS_T.h \
-  ReceiverS_T.inl
-
-ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl ReceiverS_T.cpp ReceiverS_T.h ReceiverS_T.inl: Receiver-stamp
-
-Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Receiver.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  BroadcasterC.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.cpp \
-  BroadcasterS.h \
-  BroadcasterS.inl \
-  BroadcasterS_T.cpp \
-  BroadcasterS_T.h \
-  BroadcasterS_T.inl
-
-CLEANFILES += \
-  Broadcaster-stamp \
-  BroadcasterC.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.cpp \
-  BroadcasterS.h \
-  BroadcasterS.inl \
-  BroadcasterS_T.cpp \
-  BroadcasterS_T.h \
-  BroadcasterS_T.inl
-
-BroadcasterC.cpp BroadcasterC.h BroadcasterC.inl BroadcasterS.cpp BroadcasterS.h BroadcasterS.inl BroadcasterS_T.cpp BroadcasterS_T.h BroadcasterS_T.inl: Broadcaster-stamp
-
-Broadcaster-stamp: $(srcdir)/Broadcaster.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Broadcaster.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -187,20 +125,9 @@ server_SOURCES = \
   BroadcasterS.cpp \
   Broadcaster_i.cpp \
   ReceiverC.cpp \
-  ReceiverS.cpp \
   Server_i.cpp \
   server.cpp \
-  BroadcasterC.h \
-  BroadcasterC.inl \
-  BroadcasterS.h \
-  BroadcasterS_T.h \
-  BroadcasterS_T.inl \
   Broadcaster_i.h \
-  ReceiverC.h \
-  ReceiverC.inl \
-  ReceiverS.h \
-  ReceiverS_T.h \
-  ReceiverS_T.inl \
   Server_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index d5a6f5699f6..5b3a353ea50 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,26 +1,38 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server) : taoserver, utils, iortable {
+project(*IDL): taoidldefaults {
   IDL_Files {
     Receiver.idl
     Broadcaster.idl
   }
+  custom_only = 1
+}
+
+project(*server) : taoserver, utils, iortable {
+  after += *IDL
+  IDL_Files {
+  }
   Source_Files {
     Broadcaster_i.cpp
     Server_i.cpp
     server.cpp
+    BroadcasterS.cpp
+    BroadcasterC.cpp
+    ReceiverC.cpp 
   }
 }
 
 project(*client): taoexe, portableserver, utils {
+  after += *IDL
   IDL_Files {
-    Receiver.idl
-    Broadcaster.idl
   }
   Source_Files {
     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 4e0c5f95808..aeef101e78d 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -34,7 +34,7 @@ Echo_i::echo_list (const char *
   Echo::List_var list;
 
   {
-    Echo::List *tmp;
+    Echo::List *tmp = 0;
     ACE_NEW_RETURN (tmp,
                     Echo::List (3),
                     0);
diff --git a/TAO/examples/Simple/echo/Makefile.am b/TAO/examples/Simple/echo/Makefile.am
index 371ddaa2e2a..f95d9deffd6 100644
--- a/TAO/examples/Simple/echo/Makefile.am
+++ b/TAO/examples/Simple/echo/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.echo_client.am
+## Makefile.echo_IDL.am
 
 BUILT_SOURCES = \
   EchoC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 EchoC.cpp EchoC.h EchoC.inl EchoS.cpp EchoS.h EchoS.inl EchoS_T.cpp EchoS_T.h EchoS_T.inl: Echo-stamp
 
 Echo-stamp: $(srcdir)/Echo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Echo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Echo.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Echo.idl
+
+## Makefile.echo_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -60,15 +66,9 @@ client_CPPFLAGS = \
 client_SOURCES = \
   ../Simple_util.cpp \
   EchoC.cpp \
-  EchoS.cpp \
   Echo_Client_i.cpp \
   client.cpp \
   ../Simple_util.h \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.h \
-  EchoS_T.h \
-  EchoS_T.inl \
   Echo_Client_i.h
 
 client_LDADD = \
@@ -84,35 +84,6 @@ client_LDADD = \
 
 ## Makefile.echo_server.am
 
-BUILT_SOURCES += \
-  EchoC.cpp \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.cpp \
-  EchoS.h \
-  EchoS.inl \
-  EchoS_T.cpp \
-  EchoS_T.h \
-  EchoS_T.inl
-
-CLEANFILES += \
-  Echo-stamp \
-  EchoC.cpp \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.cpp \
-  EchoS.h \
-  EchoS.inl \
-  EchoS_T.cpp \
-  EchoS_T.h \
-  EchoS_T.inl
-
-EchoC.cpp EchoC.h EchoC.inl EchoS.cpp EchoS.h EchoS.inl EchoS_T.cpp EchoS_T.h EchoS_T.inl: Echo-stamp
-
-Echo-stamp: $(srcdir)/Echo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Echo.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -130,11 +101,6 @@ server_SOURCES = \
   Echo_i.cpp \
   server.cpp \
   ../Simple_util.h \
-  EchoC.h \
-  EchoC.inl \
-  EchoS.h \
-  EchoS_T.h \
-  EchoS_T.inl \
   Echo_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index dea68094fe2..bf60819c91b 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,20 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Echo.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, iortable, utils {
+  exename = server
+  after += *IDL
   Source_Files {
     Echo_i.cpp
     ../Simple_util.cpp
     server.cpp
+    EchoS.cpp
+    EchoC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): namingexe, iortable, utils {
   exename = client
-
+  after += *IDL
   Source_Files {
     Echo_Client_i.cpp
     ../Simple_util.cpp
     client.cpp
+    EchoC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Simple/grid/Makefile.am b/TAO/examples/Simple/grid/Makefile.am
index d319d1ef7ce..da2f84bc38d 100644
--- a/TAO/examples/Simple/grid/Makefile.am
+++ b/TAO/examples/Simple/grid/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.grid_client.am
+## Makefile.grid_IDL.am
 
 BUILT_SOURCES = \
   GridC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
 
 Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Grid.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Grid.idl
+
+## Makefile.grid_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -60,15 +66,9 @@ client_CPPFLAGS = \
 client_SOURCES = \
   ../Simple_util.cpp \
   GridC.cpp \
-  GridS.cpp \
   Grid_Client_i.cpp \
   client.cpp \
   ../Simple_util.h \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_Client_i.h
 
 client_LDADD = \
@@ -84,35 +84,6 @@ client_LDADD = \
 
 ## Makefile.grid_server.am
 
-BUILT_SOURCES += \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-CLEANFILES += \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Grid.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -130,11 +101,6 @@ server_SOURCES = \
   Grid_i.cpp \
   server.cpp \
   ../Simple_util.h \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index fcc341dc775..2bdacb54e58 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,20 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Grid.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, iortable, utils {
+  exename = server
+  after += *IDL
   Source_Files {
     Grid_i.cpp
     server.cpp
     ../Simple_util.cpp
+    GridS.cpp
+    GridC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): namingexe, iortable, utils {
   exename = client
-
+  after += *IDL
   Source_Files {
     client.cpp
     ../Simple_util.cpp
     Grid_Client_i.cpp
+    GridC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am
index a48bed07ad1..29a52296199 100644
--- a/TAO/examples/Simple/time-date/Makefile.am
+++ b/TAO/examples/Simple/time-date/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -65,7 +65,6 @@ libTime_Date_la_SOURCES = \
 
 noinst_HEADERS = \
   Alt_Resource_Factory.h \
-  Time_Date.h \
   Time_Date.idl \
   Time_DateC.h \
   Time_DateC.inl \
diff --git a/TAO/examples/Simple/time/Makefile.am b/TAO/examples/Simple/time/Makefile.am
index 8320e0598b6..5ced411949e 100644
--- a/TAO/examples/Simple/time/Makefile.am
+++ b/TAO/examples/Simple/time/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.time_client.am
+## Makefile.time_IDL.am
 
 BUILT_SOURCES = \
   TimeC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 TimeC.cpp TimeC.h TimeC.inl TimeS.cpp TimeS.h TimeS.inl TimeS_T.cpp TimeS_T.h TimeS_T.inl: Time-stamp
 
 Time-stamp: $(srcdir)/Time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Time.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Time.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Time.idl
+
+## Makefile.time_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -60,15 +66,9 @@ client_CPPFLAGS = \
 client_SOURCES = \
   ../Simple_util.cpp \
   TimeC.cpp \
-  TimeS.cpp \
   Time_Client_i.cpp \
   client.cpp \
   ../Simple_util.h \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.h \
-  TimeS_T.h \
-  TimeS_T.inl \
   Time_Client_i.h
 
 client_LDADD = \
@@ -84,35 +84,6 @@ client_LDADD = \
 
 ## Makefile.time_server.am
 
-BUILT_SOURCES += \
-  TimeC.cpp \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.cpp \
-  TimeS.h \
-  TimeS.inl \
-  TimeS_T.cpp \
-  TimeS_T.h \
-  TimeS_T.inl
-
-CLEANFILES += \
-  Time-stamp \
-  TimeC.cpp \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.cpp \
-  TimeS.h \
-  TimeS.inl \
-  TimeS_T.cpp \
-  TimeS_T.h \
-  TimeS_T.inl
-
-TimeC.cpp TimeC.h TimeC.inl TimeS.cpp TimeS.h TimeS.inl TimeS_T.cpp TimeS_T.h TimeS_T.inl: Time-stamp
-
-Time-stamp: $(srcdir)/Time.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Time.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -130,11 +101,6 @@ server_SOURCES = \
   Time_i.cpp \
   server.cpp \
   ../Simple_util.h \
-  TimeC.h \
-  TimeC.inl \
-  TimeS.h \
-  TimeS_T.h \
-  TimeS_T.inl \
   Time_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index 5f35f32332a..91288d3e8b4 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,20 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Time.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, iortable, utils {
+  exename = server
+  after += *IDL
   Source_Files {
     Time_i.cpp
     server.cpp
     ../Simple_util.cpp
+    TimeS.cpp
+    TimeC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): namingexe, iortable, utils {
   exename = client
-
+  after += *IDL
   Source_Files {
     client.cpp
     ../Simple_util.cpp
     Time_Client_i.cpp
+    TimeC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 1004129d82c..2a760e659f3 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -355,19 +355,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (ec.ptr() == 0)
+      if (CORBA::is_nil (ec.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Not able to get the Event Service reference.\n"),
                           -1);
 
       // Create consumer.
 
-      Demo_Consumer *demo_consumer;
+      Demo_Consumer *demo_consumer = 0;
       ACE_NEW_RETURN (demo_consumer,
                       Demo_Consumer (),
                       -1);
 
-      if (demo_consumer->open_consumer (ec.ptr (),
+      if (demo_consumer->open_consumer (ec.in (),
                                         "demo_consumer") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Someone was feeling introverted.\n"),
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index 256cd9840a2..dd3b916adb2 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,51 +1,65 @@
 // $Id$
-project(*Event_Sup): rtevent_skel, rtsched, namingexe, utils {
-  exename = Event_Sup
 
+project(*IDL): taoidldefaults, anytypecode {
   IDL_Files {
     gendir = .
     ../NavWeap.idl
   }
+  custom_only = 1
+}
+
+project(*Event_Sup): rtevent_skel, rtsched, namingexe, utils {
+  exename = Event_Sup
+  after += *IDL
+
+  IDL_Files {
+  }
+
   Source_Files {
     Event_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*Event_Con): rtevent_skel, rtsched, namingexe {
   exename = Event_Con
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     Event_Con.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*Logging_Sup): rtevent_skel, rtsched, namingexe, utils {
   exename = Logging_Sup
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     Logging_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*DualEC_Sup): rtevent_serv, rtsched, namingexe, utils {
   exename = DualEC_Sup
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     DualEC_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapS.cpp
+    NavWeapC.cpp
   }
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am
index 0c3736b6fc9..b4f030325f1 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile.am
+++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.Event_Supplier_DualEC_Sup.am
-
-if BUILD_CORBA_MESSAGING
+## Makefile.Event_Supplier_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
   ./NavWeapC.inl \
@@ -35,7 +31,7 @@ BUILT_SOURCES += \
   ./NavWeapS_T.h \
   ./NavWeapS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   ./NavWeap-stamp \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
@@ -51,9 +47,18 @@ CLEANFILES += \
 
 ./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
 	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/../NavWeap.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  ../NavWeap.idl
+
+## Makefile.Event_Supplier_DualEC_Sup.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += DualEC_Sup
 
 DualEC_Sup_CPPFLAGS = \
@@ -65,15 +70,10 @@ DualEC_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 DualEC_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   DualEC_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
+  NavWeapS.cpp \
   DOVE_Supplier.h \
   DualEC_Sup.h
 
@@ -94,42 +94,13 @@ DualEC_Sup_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Supplier_Event_Con.am
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Event_Con
 
 Event_Con_CPPFLAGS = \
@@ -141,14 +112,8 @@ Event_Con_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Con_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   Event_Con.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   Event_Con.h
 
 Event_Con_LDADD = \
@@ -172,36 +137,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Event_Sup
 
 Event_Sup_CPPFLAGS = \
@@ -213,15 +148,9 @@ Event_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Event_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   DOVE_Supplier.h \
   Event_Sup.h
 
@@ -247,36 +176,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Logging_Sup
 
 Logging_Sup_CPPFLAGS = \
@@ -288,15 +187,9 @@ Logging_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Logging_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Logging_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   DOVE_Supplier.h \
   Logging_Sup.h
 
diff --git a/TAO/examples/Simulator/Makefile.am b/TAO/examples/Simulator/Makefile.am
index 1a769851cfd..d6c8532d025 100644
--- a/TAO/examples/Simulator/Makefile.am
+++ b/TAO/examples/Simulator/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Event_Supplier
diff --git a/TAO/examples/TypeCode_Creation/Makefile.am b/TAO/examples/TypeCode_Creation/Makefile.am
index db06e8b7c59..7034636ff35 100644
--- a/TAO/examples/TypeCode_Creation/Makefile.am
+++ b/TAO/examples/TypeCode_Creation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am
index 45f9cfb65a5..6039e121b3c 100644
--- a/TAO/examples/ior_corbaloc/Makefile.am
+++ b/TAO/examples/ior_corbaloc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.ior_corbaloc_client.am
+## Makefile.ior_corbaloc_IDL.am
 
 BUILT_SOURCES = \
   corbalocC.cpp \
@@ -44,9 +44,15 @@ CLEANFILES = \
 corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
 
 corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaloc.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  corbaloc.idl
+
+## Makefile.ior_corbaloc_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -60,17 +66,10 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   corbalocC.cpp \
-  corbalocS.cpp \
   ior_corbaloc_client_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
   ior_corbaloc_client_i.h
 
 client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -78,95 +77,26 @@ client_LDADD = \
 
 ## Makefile.ior_corbaloc_corbaname_client.am
 
-BUILT_SOURCES += \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-CLEANFILES += \
-  corbaloc-stamp \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
-
-corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
-	@touch $@
-
 noinst_PROGRAMS += corbaname_client
 
 corbaname_client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)
 
 corbaname_client_SOURCES = \
   corbalocC.cpp \
-  corbalocS.cpp \
   corbaname_client.cpp \
-  status_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
+  ior_corbaloc_client_i.h \
   status_i.h
 
 corbaname_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ior_corbaloc_server.am
 
-BUILT_SOURCES += \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-CLEANFILES += \
-  corbaloc-stamp \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
-
-corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -182,11 +112,6 @@ server_SOURCES = \
   corbalocS.cpp \
   server.cpp \
   status_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
   status_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 0ad26d5ee23..a91683c5637 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -12,7 +12,7 @@
  */
 //=============================================================================
 
-#include "ior_corbaloc_client_i.h"
+#include "corbalocC.h"
 #include "ace/Log_Msg.h"
 #include "ace/Argv_Type_Converter.h"
 
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index e461065f445..84647e7b5a1 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,24 +1,48 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    corbaloc.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, portableserver {
+  exename = server
+
+  after += *IDL
   Source_Files {
     status_i.cpp
     server.cpp
+    corbalocS.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*client): namingexe, portableserver {
+project(*client): namingexe {
+  exename = client
+
+  after += *IDL
   Source_Files {
     ior_corbaloc_client_i.cpp
     client.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*corbaname client): namingexe, portableserver {
+project(*corbaname client): taoclient {
+  exename = corbaname_client
+
+  after += *IDL
   Source_Files {
-    status_i.cpp
     corbaname_client.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am
index ebb22b1c0d6..15f0d7ff5dd 100644
--- a/TAO/examples/mfc/Makefile.am
+++ b/TAO/examples/mfc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/interop-tests/Makefile.am b/TAO/interop-tests/Makefile.am
index 1720e8021f6..ad94502f7dd 100644
--- a/TAO/interop-tests/Makefile.am
+++ b/TAO/interop-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         wchar
diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am
index 0a382f2f055..a77b1ea2cda 100644
--- a/TAO/interop-tests/wchar/Makefile.am
+++ b/TAO/interop-tests/wchar/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.Interop_Wchar_Client.am
+## Makefile.interop_wchar_IDL.am
 
 BUILT_SOURCES = \
   interop_wcharC.cpp \
   interop_wcharC.h \
   interop_wcharC.inl \
+  interop_wcharS.cpp \
   interop_wcharS.h \
   interop_wcharS.inl \
   interop_wcharS_T.cpp \
@@ -33,18 +34,25 @@ CLEANFILES = \
   interop_wcharC.cpp \
   interop_wcharC.h \
   interop_wcharC.inl \
+  interop_wcharS.cpp \
   interop_wcharS.h \
   interop_wcharS.inl \
   interop_wcharS_T.cpp \
   interop_wcharS_T.h \
   interop_wcharS_T.inl
 
-interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
+interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
 
 interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  interop_wchar.idl
+
+## Makefile.Interop_Wchar_Client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -57,11 +65,6 @@ client_SOURCES = \
   client.cpp \
   interop_wcharC.cpp \
   wchar_reference.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.h \
-  interop_wcharS_T.h \
-  interop_wcharS_T.inl \
   wchar_reference.h
 
 client_LDADD = \
@@ -71,35 +74,6 @@ client_LDADD = \
 
 ## Makefile.Interop_Wchar_Server.am
 
-BUILT_SOURCES += \
-  interop_wcharC.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.cpp \
-  interop_wcharS.h \
-  interop_wcharS.inl \
-  interop_wcharS_T.cpp \
-  interop_wcharS_T.h \
-  interop_wcharS_T.inl
-
-CLEANFILES += \
-  interop_wchar-stamp \
-  interop_wcharC.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.cpp \
-  interop_wcharS.h \
-  interop_wcharS.inl \
-  interop_wcharS_T.cpp \
-  interop_wcharS_T.h \
-  interop_wcharS_T.inl
-
-interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
-
-interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -114,11 +88,6 @@ server_SOURCES = \
   interop_wchar_i.cpp \
   server.cpp \
   wchar_reference.cpp \
-  interop_wcharC.h \
-  interop_wcharC.inl \
-  interop_wcharS.h \
-  interop_wcharS_T.h \
-  interop_wcharS_T.inl \
   interop_wchar_i.h \
   wchar_reference.h
 
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index a6175869bf6..1e82e0edc94 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -1,18 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, anytypecode {
+  IDL_Files {
+    interop_wchar.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver {
+  after += *IDL
   Source_Files {
     interop_wchar_i.cpp
     wchar_reference.cpp
     server.cpp
+    interop_wcharS.cpp
+    interop_wcharC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *IDL
   Source_Files {
     interop_wcharC.cpp
     wchar_reference.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 570c6f1fa2c..621ff2fb675 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -27,6 +27,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
+#include "ace/String_Base.h"
+
 #include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 #include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 32c594fa4db..f18e0fc5ba6 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, concurrency, naming, utils {
+project : orbsvcsexe, core, concurrency_serv, naming, utils {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index b1fbdf6f104..b0aae6c44ac 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -34,8 +34,10 @@ Concurrency_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index 2bdb8761528..90263aae047 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging, portableserver {
+project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index 4517c9fe8e3..fe84d063565 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index aefc694c05b..c286f12f251 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 493b761ff98..f5f934274fe 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Service.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = Event_Service
 
@@ -50,6 +51,7 @@ Event_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index 64fd3722ff6..9238edf51b0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -18,10 +18,12 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "TP_Task.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace POA_RtecScheduler
 {
     class Scheduler;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class FT_EventService : private TAO_FTEC_Become_Primary_Listener
 {
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index 9445c3fe356..c5bdcdfdd92 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.FTRT_Event_Service.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrt_eventservice
@@ -61,6 +62,7 @@ ftrt_eventservice_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
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 9a2ae93019f..fd6725e9b77 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -178,7 +178,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   char ior[5000] = {'0'};
   int n = 0;
   int byteRead=0;
-  while ((n = stream.recv(ior+byteRead, 5000-byteRead)))  {
+  while (0 != (n = stream.recv(ior+byteRead, 5000-byteRead)))  {
     byteRead += n;
   }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index 520e6d6aec8..b8ea78d6e4a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrtec_factory_service
@@ -59,6 +60,7 @@ ftrtec_factory_service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index b31a1b82f0a..ca82a24c1a3 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = ftrtec_gateway_service
@@ -58,6 +59,7 @@ ftrtec_gateway_service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
index e71a9615f39..f8817324df0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Event_Service \
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 0691e8174f8..770d8ef9870 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -24,6 +24,9 @@ ACE_RCSID (FT_DefaultFaultAnalyzer,
            FT_DefaultFaultAnalyzer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_DefaultFaultAnalyzer::FT_DefaultFaultAnalyzer ()
 {
@@ -163,3 +166,5 @@ int TAO::FT_DefaultFaultAnalyzer::analyze_fault_event (
   // no-op
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index e5b1b0b8292..0901c34e63b 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -28,6 +28,8 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "FT_FaultAnalyzer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -80,6 +82,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_DEFAULT_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
index 97f0af6e56c..bd2d2d8d059 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (FT_FaultAnalyzer,
            FT_FaultAnalyzer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_FaultAnalyzer::FT_FaultAnalyzer ()
 {
@@ -27,3 +29,4 @@ TAO::FT_FaultAnalyzer::~FT_FaultAnalyzer ()
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 814162e6662..253421fe577 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -25,6 +25,8 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -79,6 +81,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 88fe7abdc4d..5a6a3043b65 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -25,6 +25,9 @@ ACE_RCSID (FT_FaultConsumer,
            FT_FaultConsumer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_FaultConsumer::FT_FaultConsumer ()
   : poa_ (PortableServer::POA::_nil ())
@@ -290,3 +293,4 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
     ));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index a8d0b7f1477..4ba96cdee31 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -26,6 +26,8 @@
 #include "orbsvcs/FT_NotifierC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -160,6 +162,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_CONSUMER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index f571d022324..ac26ed56e19 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -23,6 +23,8 @@ ACE_RCSID (FT_FaultEventDescriptor,
            FT_FaultEventDescriptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor.
 TAO::FT_FaultEventDescriptor::FT_FaultEventDescriptor ()
   : all_at_location_failed (0)
@@ -86,3 +88,5 @@ void TAO::FT_FaultEventDescriptor::dump ()
     ));
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index d0b64b49e4f..fe174448fb2 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -26,6 +26,8 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /// Helper class for describing the properties in a fault event.
@@ -70,6 +72,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_EVENT_DESCRIPTOR_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 205f9f96d63..0268c527fbb 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::FT_Property_Validator::FT_Property_Validator (void)
   : replication_style_ (1),
     membership_style_ (1),
@@ -240,3 +242,5 @@ TAO::FT_Property_Validator::validate_criteria (
       ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index cc5912f9b36..954d7f29ded 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -22,6 +22,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -88,6 +90,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index b82d8cb9c2d..81c83a7f821 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -69,6 +69,8 @@ ACE_RCSID (FT_ReplicationManager,
 #define TODO
 //#define TODO int todo; // warn on todos
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::FT_ReplicationManager::FT_ReplicationManager ()
   : orb_ (CORBA::ORB::_nil ())
   , poa_ (PortableServer::POA::_nil ())
@@ -1024,8 +1026,8 @@ TAO::FT_ReplicationManager::create_object (
     // that knows about the factory, too.
 
  // Allocate a new FactoryCreationId for use as an "out" parameter.
-  PortableGroup::GenericFactory::FactoryCreationId_var factory_id = 0;
-  ACE_NEW_THROW_EX (factory_id,
+  PortableGroup::GenericFactory::FactoryCreationId_ptr factory_id_ptr = 0;
+  ACE_NEW_THROW_EX (factory_id_ptr,
                     PortableGroup::GenericFactory::FactoryCreationId,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
@@ -1033,6 +1035,7 @@ TAO::FT_ReplicationManager::create_object (
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  PortableGroup::GenericFactory::FactoryCreationId_var factory_id = factory_id_ptr;
   PortableGroup::ObjectGroupId group_id = group->get_object_group_id ();
   factory_id <<= group_id;
   factory_creation_id = factory_id._retn();
@@ -1085,69 +1088,4 @@ int TAO::FT_ReplicationManager::write_ior ()
   return result;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 7914745a0e5..a38ed1ec911 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -34,6 +34,7 @@
 #include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -519,6 +520,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_REPLICATION_MANAGER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 85c25861333..5a6788d8cc4 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -26,6 +26,8 @@ ACE_RCSID (FT_ReplicationManagerFaultAnalyzer,
            FT_ReplicationManagerFaultAnalyzer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Constructor.
 TAO::FT_ReplicationManagerFaultAnalyzer::FT_ReplicationManagerFaultAnalyzer (
   const TAO::FT_ReplicationManager * replication_manager)
@@ -1084,3 +1086,5 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index f15238af5bf..6b2e263ee85 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -27,8 +27,12 @@
 #include "orbsvcs/FT_CORBAC.h"
 
 // Forward declarations.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class T> class ACE_Unbounded_Set;
 template <class T> class ACE_Unbounded_Set_Iterator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -188,6 +192,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_REPLICATION_MANAGER_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index f8d2336a8b5..1f7d9f4e065 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la
@@ -46,6 +47,7 @@ noinst_HEADERS = \
   FT_FaultEventDescriptor.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -55,6 +57,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = FT_ReplicationManager
@@ -102,6 +105,7 @@ FT_ReplicationManager_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 626a9d7b3fb..977cd36be76 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -14,6 +14,7 @@
 #include "Fault_Detector_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/PortableGroup/PG_Property_Set.h"
 
@@ -42,6 +43,8 @@
     return /* value goes here */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////////////////
 // FT_FaultDetectorFactory_i  Construction/destruction
 
@@ -708,3 +711,4 @@ CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL
     1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 7333ffb7a87..a28eebffe56 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -23,13 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  FT_FaultDetectorFactory_i;
-}
-
 /////////////////////////////////
 // Includes needed by this header
 #include <ace/Vector_T.h>
@@ -37,6 +30,9 @@ namespace TAO
 #include <orbsvcs/FT_ReplicationManagerC.h>
 #include <ace/Thread_Manager.h>
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////
 // Forward references
 
@@ -344,5 +340,7 @@ namespace TAO
   };
 }   // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* FT_FAULTDETECTORFACTORY_I_H_  */
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index bba77092823..60d749ef0dd 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -15,6 +15,8 @@
 #include "FT_FaultDetectorFactory_i.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////////
 // Fault_Detector_i static data
 
@@ -124,7 +126,7 @@ void TAO::Fault_Detector_i::run()
 
 void TAO::Fault_Detector_i::notify()
 {
-  CosNotification::StructuredEvent_var  vEvent;
+  CosNotification::StructuredEvent_var vEvent;
   ACE_NEW_NORETURN(vEvent, CosNotification::StructuredEvent );
   if (vEvent.ptr() != 0)
   {
@@ -201,3 +203,4 @@ ACE_THR_FUNC_RETURN TAO::Fault_Detector_i::thr_func (void * arg)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
index d5882ad1a15..03642de4b48 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
@@ -28,18 +28,13 @@
 
 #include <ace/Manual_Event.h>
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  Fault_Detector_i;
-}
-
 
 #include "orbsvcs/FT_NotifierC.h"
 #include "orbsvcs/FT_ReplicaC.h"
 #include "ace/Time_Value.h"
 
+// Classes declared in this header
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -181,5 +176,8 @@ namespace TAO
     int quit_requested_;
   };
 }   // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ <ace/post.h>
 #endif // FAULT_DETECTOR_I_H_
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index 12d58097bbc..a0033227cea 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Fault_Detector
@@ -60,6 +61,7 @@ Fault_Detector_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index f71b484a819..76ed9f3bb32 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -49,6 +49,8 @@
   return /* value goes here */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO::FT_FaultNotifier_i::FT_FaultNotifier_i ()
   : orb_ (0)
@@ -768,3 +770,5 @@ TAO::FT_FaultNotifier_i::ProxyInfo::ProxyInfo (const ProxyInfo & rhs)
   , proxyVar_ (rhs.proxyVar_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index dd1d000722d..1f5e672eaed 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -27,14 +27,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  FT_FaultNotifier_i;
-}
-
-
 #include <orbsvcs/FT_NotifierS.h>
 #include <orbsvcs/FT_ReplicationManagerC.h>
 #include <orbsvcs/Notify/Notify_EventChannelFactory_i.h>
@@ -43,6 +35,7 @@ namespace TAO
 /////////////////////
 // Forward references
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class  FT_FaultNotifier_i : public virtual POA_FT::FaultNotifier
@@ -272,6 +265,8 @@ namespace TAO
 
   };
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FT_NOTIFIER_I_H_  */
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index 155f96c821d..23e094d7a5b 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS = Fault_Notifier
@@ -64,6 +65,7 @@ Fault_Notifier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index b9aa1d58dcf..af35aebcf86 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ bin_PROGRAMS =
 
 ## Makefile.IFR_Service.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += IFR_Service
@@ -50,6 +51,7 @@ IFR_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.TAO_IFR_BE.am
 
@@ -102,6 +104,7 @@ tao_ifr_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs/IFR_Service \
   -I$(TAO_ROOT)/TAO_IDL/include \
   -I$(TAO_ROOT)/TAO_IDL/fe \
   -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\""
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index f7283b8d3d0..023d4cb3c96 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -29,29 +29,29 @@ ACE_RCSID (IFR_Service,
 TAO_IFR_BE_Export BE_GlobalData *be_global = 0;
 
 BE_GlobalData::BE_GlobalData (void)
-  : removing_ (I_FALSE),
+  : removing_ (false),
     holding_scope_name_ (CORBA::string_dup ("TAO_IFR_holding_scope_module")),
     filename_ (0),
-    enable_locking_ (I_FALSE),
-    do_included_files_ (I_TRUE)
+    enable_locking_ (false),
+    do_included_files_ (true)
 {
   // At this point, the FE has been initialized.  We can
   // now instruct it that we want to preserve c++ keywords.
-  idl_global->preserve_cpp_keywords (I_TRUE);
+  idl_global->preserve_cpp_keywords (true);
 }
 
 BE_GlobalData::~BE_GlobalData (void)
 {
 }
 
-idl_bool
+bool
 BE_GlobalData::removing (void) const
 {
   return this->removing_;
 }
 
 void
-BE_GlobalData::removing (idl_bool value)
+BE_GlobalData::removing (bool value)
 {
   this->removing_ = value;
 }
@@ -121,26 +121,26 @@ BE_GlobalData::filename (char *fname)
   this->filename_ = fname;
 }
 
-idl_bool
+bool
 BE_GlobalData::enable_locking (void) const
 {
   return this->enable_locking_;
 }
 
 void
-BE_GlobalData::enable_locking (idl_bool value)
+BE_GlobalData::enable_locking (bool value)
 {
   this->enable_locking_ = value;
 }
 
-idl_bool
+bool
 BE_GlobalData::do_included_files (void) const
 {
   return this->do_included_files_;
 }
 
 void
-BE_GlobalData::do_included_files (idl_bool val)
+BE_GlobalData::do_included_files (bool val)
 {
   this->do_included_files_ = val;
 }
@@ -169,10 +169,10 @@ BE_GlobalData::parse_args (long &i, char **av)
   switch (av[i][1])
     {
       case 'L':
-        be_global->enable_locking (I_TRUE);
+        be_global->enable_locking (true);
         break;
       case 'r':
-        be_global->removing (I_TRUE);
+        be_global->removing (true);
         break;
       case 'S':
         // Suppress ...
diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h
index ad2b2bb5d21..6a0c17fccca 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.h
+++ b/TAO/orbsvcs/IFR_Service/be_global.h
@@ -22,7 +22,6 @@
 
 #include "TAO_IFR_BE_Export.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "idl_bool.h"
 #include "tao/ORB.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
@@ -52,8 +51,8 @@ public:
 
   // Data accessors.
 
-  idl_bool removing (void) const;
-  void removing (idl_bool value);
+  bool removing (void) const;
+  void removing (bool value);
 
   CORBA::ORB_ptr orb (void) const;
   void orb (CORBA::ORB_ptr orb);
@@ -74,11 +73,11 @@ public:
   const char *filename (void) const;
   void filename (char *fname);
 
-  idl_bool enable_locking (void) const;
-  void enable_locking (idl_bool value);
+  bool enable_locking (void) const;
+  void enable_locking (bool value);
 
-  idl_bool do_included_files (void) const;
-  void do_included_files (idl_bool val);
+  bool do_included_files (void) const;
+  void do_included_files (bool val);
 
   ACE_CString orb_args (void) const;
   void orb_args (const ACE_CString& args);
@@ -103,7 +102,7 @@ public:
   // Create an AST node generator.
 
 private:
-  idl_bool removing_;
+  bool removing_;
   // Are we removing IR objects from the repository?
 
   CORBA::ORB_var orb_;
@@ -125,10 +124,10 @@ private:
   char *filename_;
   // Name of the IDL file we are processing.
 
-  idl_bool enable_locking_;
+  bool enable_locking_;
   // Option to lock at the IDL file level.
 
-  idl_bool do_included_files_;
+  bool do_included_files_;
   // Option to process included IDL files.
 
   ACE_CString orb_args_;
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 017c1402ec3..e6827113322 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -31,8 +31,8 @@ BE_save_orb_args (int &argc, char *argv[])
 
           // If the arg ends with either .idl or .pidl, we're done.
 
-          int len = static_cast<int> (tmp.length ());
-          int pos = tmp.find (".idl");
+          size_t len = tmp.length ();
+          ssize_t pos = tmp.find (".idl");
 
           if (len - pos == 4)
             {
@@ -56,7 +56,7 @@ BE_save_orb_args (int &argc, char *argv[])
           ++i;
         }
     }
-    
+
   be_global->orb_args (holder);
 
   return 0;
@@ -103,14 +103,14 @@ TAO_IFR_BE_Export int
 BE_init (int &argc, char *argv[])
 {
   int status = BE_save_orb_args (argc, argv);
-  
+
   if (status != 0)
     {
       return status;
     }
-    
+
   idl_global->using_ifr_backend (true);
-    
+
   return BE_ifr_orb_init (argc, argv);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 302c6ca84b6..a678f6729fb 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -85,36 +85,6 @@ void
 BE_cleanup (void)
 {
   idl_global->destroy ();
-
-  // Remove the holding scope entry from the repository.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      if (be_global->repository ())
-        {
-          CORBA::Contained_var result =
-            be_global->repository ()->lookup_id (be_global->holding_scope_name ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (!CORBA::is_nil (result.in ()))
-            {
-              CORBA::ModuleDef_var scope =
-                CORBA::ModuleDef::_narrow (result.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              scope->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("BE_cleanup"));
-    }
-  ACE_ENDTRY;
 }
 
 // Abort this run of the BE.
@@ -140,6 +110,7 @@ BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
+  // Will live until the repository goes away for good.
   if (CORBA::is_nil (result.in ()))
     {
       scope =
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index c418fe74a16..6037b5f477f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -190,25 +190,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
             prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          // If the line below is true, we are clobbering a previous
-          // entry from another IDL file. In that
-          // case we do what other ORB vendors do, and destroy the
-          // original entry, create the new one, and let the user beware.
-          if (kind != CORBA::dk_Module)
-            {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              // This call will take the brach where prev_def.in() is 0.
-              return this->visit_module (node);
-            }
-          else
+          if (kind == CORBA::dk_Module)
             {
               // We are either in a reopened module, are processing an IDL
               // IDL file for the second time, or are in a module whose
               // name already exists by coincidence - there is no way to
               // tell the difference. So any members whose repository ID
-              // already exists in this case will be skipped.
+              // already exists in this case will throw BAD_PARAM
+              // when we attempt to add them to the repository.
               this->in_reopened_ = 1;
 
               new_def =
@@ -398,7 +387,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                                                   ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  if (CORBA::is_nil (bases[i].in ()))
+                  if (CORBA::is_nil (bases[i]))
                     {
                       ACE_ERROR_RETURN ((
                           LM_ERROR,
@@ -588,12 +577,60 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 }
 
 int
-ifr_adding_visitor::visit_valuebox (AST_ValueBox *)
+ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
 {
+  if (node->imported () && !be_global->do_included_files ())
+    {
+      return 0;
+    }
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->element_type (node->boxed_type ()
+                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Container_ptr current_scope =
+        CORBA::Container::_nil ();
+
+      if (be_global->ifr_scopes ().top (current_scope) == 0)
+        {
+          this->ir_current_ =
+            current_scope->create_value_box (
+                node->repoID (),
+                node->local_name ()->get_string (),
+                node->version (),
+                this->ir_current_.in ()
+                ACE_ENV_ARG_PARAMETER
+              );
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((
+              LM_ERROR,
+              ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_valuebox -")
+              ACE_TEXT (" scope stack is empty\n")
+            ),
+            -1
+          );
+        }
+
+      node->ifr_added (1);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           ACE_TEXT ("visit_valuebox"));
+
+      return -1;
+    }
+  ACE_ENDTRY;
+
   return 0;
 }
 
-
 int
 ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
 {
@@ -2392,70 +2429,37 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      // Is this typedef already in the respository?
-      CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
+      this->element_type (node->base_type ()
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // If not, create a new entry.
-      if (CORBA::is_nil (prev_def.in ()))
-        {
-          this->element_type (node->base_type ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::Container_ptr current_scope =
-            CORBA::Container::_nil ();
+      CORBA::Container_ptr current_scope =
+        CORBA::Container::_nil ();
 
-          if (be_global->ifr_scopes ().top (current_scope) == 0)
-            {
-              this->ir_current_ =
-                current_scope->create_alias (
-                   node->repoID (),
-                   node->local_name ()->get_string (),
-                   node->version (),
-                   this->ir_current_.in ()
-                   ACE_ENV_ARG_PARAMETER
-                 );
-              ACE_TRY_CHECK;
-            }
-          else
-            {
-              ACE_ERROR_RETURN ((
-                  LM_ERROR,
-                  ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
-                  ACE_TEXT (" scope stack is empty\n")
-                ),
-                -1
+      if (be_global->ifr_scopes ().top (current_scope) == 0)
+        {
+          this->ir_current_ =
+            current_scope->create_alias (
+                node->repoID (),
+                node->local_name ()->get_string (),
+                node->version (),
+                this->ir_current_.in ()
+                ACE_ENV_ARG_PARAMETER
               );
-            }
-
-          node->ifr_added (1);
+          ACE_TRY_CHECK;
         }
       else
         {
-          // If the line below is true, we are clobbering a previous
-          // entry (from another IDL file) of another type. In that
-          // case we do what other ORB vendors do, and destroy the
-          // original entry, create the new one, and let the user beware.
-          // Unless we are in a module that has been seen before, in
-          // which case we might be just processing and IDL file a
-          // second time and we want to just update ir_current_.
-          if (node->ifr_added () == 0 && this->in_reopened_ == 0)
-            {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              // This call will take the other branch.
-              return this->visit_typedef (node);
-            }
-
-          this->ir_current_ =
-            CORBA::TypedefDef::_narrow (prev_def.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ACE_ERROR_RETURN ((
+              LM_ERROR,
+              ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
+              ACE_TEXT (" scope stack is empty\n")
+            ),
+            -1
+          );
         }
+
+      node->ifr_added (1);
     }
   ACE_CATCHANY
     {
@@ -2858,7 +2862,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
               ACE_CHECK_RETURN (-1);
             }
 
-          if (CORBA::is_nil (abs_bases[i].in ()))
+          if (CORBA::is_nil (abs_bases[i]))
             {
               ACE_ERROR_RETURN ((
                   LM_ERROR,
@@ -2913,7 +2917,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
               ACE_CHECK_RETURN (-1);
             }
 
-          if (CORBA::is_nil (bases[i].in ()))
+          if (CORBA::is_nil (bases[i]))
             {
               ACE_ERROR_RETURN ((
                   LM_ERROR,
@@ -3554,18 +3558,41 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
   ACE_TRY_NEW_ENV
     {
       AST_Type *bt = node->field_type ();
-
-      /// This will put the repo entry into ir_current_ whether it exists
-      /// already or not.
-      if (bt->ast_accept (this) != 0)
+      AST_Decl::NodeType nt = bt->node_type ();
+
+      // We can't use lookup_id() on these, because
+      // they don't inherit from Contained.
+      if (nt == AST_Decl::NT_pre_defined
+          || nt == AST_Decl::NT_string
+          || nt == AST_Decl::NT_wstring
+          || nt == AST_Decl::NT_array
+          || nt == AST_Decl::NT_sequence)
         {
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_member -")
-              ACE_TEXT (" visit base type failed\n")
-            ),
-            -1
-          );
+          /// This will put the repo entry into ir_current_.
+          if (bt->ast_accept (this) != 0)
+            {
+              ACE_ERROR_RETURN ((
+                  LM_ERROR,
+                  ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
+                  ACE_TEXT ("create_value_member -")
+                  ACE_TEXT (" visit base type failed\n")
+                ),
+                -1
+              );
+            }
+        }
+      else
+        {
+          // If the IDL is legal, this will succeed.
+          CORBA::Contained_var holder =
+                be_global->repository ()->lookup_id (bt->repoID ()
+                                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          this->ir_current_ =
+            CORBA::IDLType::_narrow (holder.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
         }
 
       CORBA::Visibility vis = CORBA::PUBLIC_MEMBER;
@@ -3853,7 +3880,7 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
     {
       AST_Interface **list = node->inherits ();
       CORBA::ULong u_length = static_cast<CORBA::ULong> (s_length);
-      idl_bool first_abs = list[0]->is_abstract ();
+      bool first_abs = list[0]->is_abstract ();
       result.length (first_abs ? u_length : u_length - 1);
 
       for (CORBA::ULong i = 0; i < u_length; ++i)
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 069b9886882..d22c22c825b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -68,7 +68,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
           AST_Type *ft = (*f)->field_type ();
 
-          idl_bool defined_here = ft->is_child (this->scope_);
+          bool defined_here = ft->is_child (this->scope_);
 
           // If the struct member is defined in the struct, we have to
           // do some visiting - otherwise we can just look up the entry.
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index b65ad0a9442..6e3f4a4bbe5 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -62,7 +62,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
             }
 
           AST_Type *ft = (*f)->field_type ();
-          idl_bool defined_here = ft->is_child (this->scope_);
+          bool defined_here = ft->is_child (this->scope_);
 
           // If the struct member is defined in the struct, we have to
           // do some visiting - otherwise we can just look up the entry.
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 6052f26afff..57e82d66ddb 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -73,7 +73,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 
           AST_Type *ft = (*f)->field_type ();
 
-          idl_bool defined_here = ft->is_child (this->scope_);
+          bool defined_here = ft->is_child (this->scope_);
 
           // If the union member is defined in the union, we have to
           // do some visiting - otherwise we can just look up the entry.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 4429f6eba49..9f222a54739 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -4,27 +4,27 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Task.h"
 
-class ImR_Activator_ORB_Runner : public ACE_Task_Base 
+class ImR_Activator_ORB_Runner : public ACE_Task_Base
 {
   ImR_Activator_Loader& service_;
 public:
-  ImR_Activator_ORB_Runner(ImR_Activator_Loader& service)
-    : service_(service)
+  ImR_Activator_ORB_Runner (ImR_Activator_Loader& service)
+    : service_ (service)
   {
   }
-  virtual int svc() 
+  virtual int svc ()
   {
     // Block until service_.fini() calls orb->destroy()
-    this->service_.run();
+    this->service_.run ();
     return 0;
   }
 };
 
-ImR_Activator_Loader::ImR_Activator_Loader(void) 
+ImR_Activator_Loader::ImR_Activator_Loader (void)
 {
 }
 
-// For now, we will assume that it's sufficient to start 
+// For now, we will assume that it's sufficient to start
 // the service in its own thread. Later, if necessary, we
 // can add a command line option to allow the imr to use
 // the same orb as other tao services, however the imr
@@ -35,20 +35,20 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      int err = this->opts_.init(argc, argv);
-      if (err != 0) 
+      int err = this->opts_.init (argc, argv);
+      if (err != 0)
         return -1;
 
       // Creates it's own internal orb, which we must run later
-      err = this->service_.init(this->opts_ ACE_ENV_ARG_PARAMETER);
+      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (err != 0)
         return -1;
 
       // Create a thread in which to run the service
-      ACE_ASSERT(this->runner_.get() == 0);
-      this->runner_.reset(new ImR_Activator_ORB_Runner(*this));
-      this->runner_->activate();
+      ACE_ASSERT (this->runner_.get () == 0);
+      this->runner_.reset (new ImR_Activator_ORB_Runner (*this));
+      this->runner_->activate ();
     }
   ACE_CATCHANY
     {
@@ -61,23 +61,22 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 int
 ImR_Activator_Loader::fini (void)
 {
-  ACE_ASSERT(this->runner_.get() != 0);
+  ACE_ASSERT (this->runner_.get() != 0);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    int ret = this->service_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    this->runner_->wait();
-    this->runner_.reset(0);
-    return ret;
-  }
+      this->runner_->wait ();
+      this->runner_.reset (0);
+      return ret;
+    }
   ACE_CATCHANY
-  {
-    return -1;
-  }
+    {
+      return -1;
+    }
   ACE_ENDTRY;
-  return -1;
 }
 
 CORBA::Object_ptr
@@ -87,26 +86,24 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
                                   ACE_ENV_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), CORBA::Object::_nil());
+  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ());
 }
 
 int
-ImR_Activator_Loader::run(void)
+ImR_Activator_Loader::run (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    return this->service_.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
-    return -1;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
+      return -1;
+    }
   ACE_ENDTRY;
-  return 0;
 }
 
 ACE_FACTORY_DEFINE (Activator, ImR_Activator_Loader)
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index db401dd8cfe..2871c38e56b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -1,4 +1,7 @@
+// -*- C++ -*-
+//
 // $Id$
+
 #ifndef TAO_IMR_ACTIVATOR_LOADER_H
 #define TAO_IMR_ACTIVATOR_LOADER_H
 
@@ -39,8 +42,9 @@ private:
   ACE_Auto_Ptr<ImR_Activator_ORB_Runner> runner_;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (ImR_Activator_Loader (const ImR_Activator_Loader &))
-  ACE_UNIMPLEMENTED_FUNC (ImR_Activator_Loader &operator = (const ImR_Activator_Loader &))
+  // Disallow copying and assignment.
+  ImR_Activator_Loader (const ImR_Activator_Loader &);
+  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &);
 };
 
 ACE_FACTORY_DECLARE (Activator, ImR_Activator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 4f672896791..eac94f086bb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -63,10 +63,10 @@ Activator_NT_Service::svc (void)
   Activator_Options opts;
 
   if (opts.init_from_registry() != 0)
-  {
-    report_status (SERVICE_STOPPED);
-    return -1;
-  }
+    {
+      report_status (SERVICE_STOPPED);
+      return -1;
+    }
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 71ee1a8baf2..2629a4c8c39 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -36,7 +36,7 @@ int
 Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter shifter (argc, argv);
- 
+
   while (shifter.is_anything_left ())
     {
       if (ACE_OS::strcasecmp (shifter.get_current (),
@@ -53,25 +53,25 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[])
 
           if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("install")) == 0)
-          {
-            this->service_command_ = SC_INSTALL;
-          }
+            {
+              this->service_command_ = SC_INSTALL;
+            }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("remove")) == 0)
-          {
-            this->service_command_ = SC_REMOVE;
-          }
+            {
+              this->service_command_ = SC_REMOVE;
+            }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("install_no_imr")) == 0)
-          {
-            this->service_command_ = SC_INSTALL_NO_LOCATOR;
-          }
+            {
+              this->service_command_ = SC_INSTALL_NO_LOCATOR;
+            }
           else
-          {
-            ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
-            this->print_usage ();
-            return -1;
-          }
+            {
+              ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
+              this->print_usage ();
+              return -1;
+            }
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
@@ -149,15 +149,14 @@ Activator_Options::init (int argc, ACE_TCHAR *argv[])
   // This may also run the commands to install or remove the nt service.
   int result = this->parse_args (argc, argv);
   if (result != 0)
-  {
-    return result;
-  }
+    {
+      return result;
+    }
 
   for (int i = 0; i < argc; ++i)
   {
     this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" ");
   }
-
   return 0;
 }
 
@@ -201,6 +200,7 @@ Activator_Options::save_registry_options()
                              &key,
                              NULL
                              );
+
   if (err != ERROR_SUCCESS) {
     return -1;
   }
@@ -221,12 +221,13 @@ Activator_Options::save_registry_options()
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   DWORD tmpint = this->notify_imr_;
+
   err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("NotifyImR"), 0, REG_DWORD,
     (LPBYTE) &tmpint , sizeof(tmpint));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ::RegCloseKey(key);
-  ACE_ASSERT(err == ERROR_SUCCESS);
+  err = ::RegCloseKey (key);
+  ACE_ASSERT (err == ERROR_SUCCESS);
 #endif
   return 0;
 }
@@ -243,24 +244,30 @@ Activator_Options::load_registry_options ()
                              KEY_READ,
                              &key
                              );
+
   if (err != ERROR_SUCCESS) {
     // If there aren't any saved parameters, then that's ok.
     return 0;
   }
   ACE_TCHAR tmpstr[4096];
   DWORD sz = sizeof(tmpstr);
+
   DWORD type = 0;
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type,
-    (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz - 1] = '\0';
-    this->cmdline_ = tmpstr;
-  }
+                                 (LPBYTE) tmpstr, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_SZ);
+      tmpstr[sz - 1] = '\0';
+      this->cmdline_ = tmpstr;
+    }
 
   sz = sizeof(tmpstr);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type,
     (LPBYTE) tmpstr, &sz);
+
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
     tmpstr[sz - 1] = '\0';
@@ -268,15 +275,19 @@ Activator_Options::load_registry_options ()
   }
 
   sz = sizeof(debug_);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type,
     (LPBYTE) &this->debug_ , &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-  }
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+    }
 
   sz = sizeof(tmpstr);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Name"), 0, &type,
     (LPBYTE) tmpstr, &sz);
+
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
     tmpstr[sz - 1] = '\0';
@@ -285,14 +296,16 @@ Activator_Options::load_registry_options ()
 
   DWORD tmpint = 0;
   sz = sizeof(tmpint);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("NotifyImR"), 0, &type,
     (LPBYTE) &tmpint , &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-  }
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+    }
   this->notify_imr_ = tmpint != 0;
 
-  err = ::RegCloseKey(key);
+  err = ::RegCloseKey (key);
   ACE_ASSERT(err == ERROR_SUCCESS);
 #endif /* ACE_WIN32 */
   return 0;
@@ -323,7 +336,7 @@ Activator_Options::ior_filename (void) const
 }
 
 Activator_Options::SERVICE_COMMAND
-Activator_Options::service_command(void) const
+Activator_Options::service_command (void) const
 {
   return this->service_command_;
 }
@@ -334,6 +347,7 @@ Activator_Options::cmdline(void) const {
 }
 
 const ACE_CString&
-Activator_Options::name(void) const {
+Activator_Options::name (void) const
+{
   return this->name_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index a6e486da09e..0c687f5e198 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -32,7 +32,7 @@
 class Activator_Export Activator_Options
 {
 public:
- 
+
   enum SERVICE_COMMAND {
     SC_NONE,
     SC_INSTALL,
@@ -50,7 +50,7 @@ public:
   /// Service Mode
   bool service (void) const;
 
-  /// Notify the ImR when server processes die. 
+  /// Notify the ImR when server processes die.
   /// Note : Currently this only works on Unix.
   bool notify_imr (void) const;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index 04cf4f5e647..e68bdbcf4f9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -13,13 +13,13 @@
 
 #include "ace/Log_Msg.h"
 
-ImR_Adapter::ImR_Adapter(void)
-: servant_locator_(0)
+ImR_Adapter::ImR_Adapter (void)
+: servant_locator_ (0)
 {
 }
 
 void
-ImR_Adapter::init(PortableServer::ServantLocator_ptr servant)
+ImR_Adapter::init (PortableServer::ServantLocator_ptr servant)
 {
   servant_locator_ = servant;
 }
@@ -30,8 +30,8 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_ASSERT(! CORBA::is_nil(parent));
-  ACE_ASSERT(name != 0);
+  ACE_ASSERT (! CORBA::is_nil(parent));
+  ACE_ASSERT (name != 0);
   CORBA::PolicyList policies (2);
   policies.length (2);
 
@@ -76,7 +76,7 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter, set_servant_manager";
-      child->set_servant_manager(this->servant_locator_ ACE_ENV_ARG_PARAMETER);
+      child->set_servant_manager (this->servant_locator_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
index dded9d60d2b..2cebbc590bd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -7,18 +7,19 @@
 
 using namespace ImplementationRepository;
 
-AsyncStartupWaiter_i::PendingData::PendingData(const char* p, const char* i)
-: partial_ior(p)
-, ior(i)
+AsyncStartupWaiter_i::PendingData::PendingData (const char* p, const char* i)
+: partial_ior (p)
+, ior( i)
 {
 }
 
-AsyncStartupWaiter_i::PendingData::PendingData()
+AsyncStartupWaiter_i::PendingData::PendingData ()
 {
 }
 
 
-void AsyncStartupWaiter_i::debug(bool dbg) {
+void AsyncStartupWaiter_i::debug (bool dbg)
+{
   debug_ = dbg;
 }
 
@@ -27,32 +28,35 @@ void AsyncStartupWaiter_i::wait_for_startup (AMH_AsyncStartupWaiterResponseHandl
 {
   PendingListPtr plst;
   pending_.find(name, plst);
-  if (! plst.null() && plst->size() > 0) {
-    PendingList& tmp = *plst;
-    PendingData& pd = tmp[tmp.size() - 1];
-    tmp.pop_back();
- 
-    if (debug_)
-      ACE_DEBUG((LM_DEBUG, "ImR: Skipping wait due to queued startup info for <%s>.\n", name));
- 
-    send_response(*rh, name, pd.partial_ior.c_str(), pd.ior.c_str());
-
-  } else {
-    RHListPtr lst;
-    waiting_.find(name, lst);
-    if (lst.null())
+  if (! plst.null () && plst->size () > 0)
+    {
+      PendingList& tmp = *plst;
+      PendingData& pd = tmp[tmp.size () - 1];
+      tmp.pop_back ();
+
+      if (debug_)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Skipping wait due to queued startup info for <%s>.\n", name));
+
+      send_response (*rh, name, pd.partial_ior.c_str(), pd.ior.c_str());
+
+    }
+  else
     {
-      lst = RHListPtr(new RHList);
-      int err = waiting_.bind(name, lst);
-      ACE_ASSERT(err == 0);
-      ACE_UNUSED_ARG(err);
+      RHListPtr lst;
+      waiting_.find (name, lst);
+      if (lst.null ())
+      {
+        lst = RHListPtr (new RHList);
+        int err = waiting_.bind (name, lst);
+        ACE_ASSERT (err == 0);
+        ACE_UNUSED_ARG (err);
+      }
+      lst->push_back (AMH_AsyncStartupWaiterResponseHandler::_duplicate (rh));
     }
-    lst->push_back(AMH_AsyncStartupWaiterResponseHandler::_duplicate(rh));
-  }
 }
 
 void
-AsyncStartupWaiter_i::send_response(ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler& rh,
+AsyncStartupWaiter_i::send_response (ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler& rh,
                                     const char* name, const char* partial_ior, const char* ior)
 {
   StartupInfo_var si = new StartupInfo();
@@ -62,51 +66,52 @@ AsyncStartupWaiter_i::send_response(ImplementationRepository::AMH_AsyncStartupWa
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    rh.wait_for_startup(si.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      rh.wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHANY
-  {
-    if (debug_)
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::send_response()");
-  }
+    {
+      if (debug_)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::send_response ()");
+    }
   ACE_ENDTRY;
 }
 
 void
-AsyncStartupWaiter_i::unblock_one(const char* name, const char* partial_ior, const char* ior, bool queue) {
+AsyncStartupWaiter_i::unblock_one (const char* name, const char* partial_ior, const char* ior, bool queue) {
   ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var rh = get_one_waiter(name);
-  if (! CORBA::is_nil(rh.in())) {
- 
-    send_response(*rh.in (), name, partial_ior, ior);
-
-  } else if (queue) {
-
-    if (debug_)
-      ACE_DEBUG((LM_DEBUG, "ImR: Queuing startup info.\n"));
-
-    PendingListPtr lst;
-    pending_.find(name, lst);
-    if (lst.null()) {
-      lst = PendingListPtr(new PendingList);
-      int err = pending_.bind(name, lst);
-      ACE_ASSERT(err == 0);
-      ACE_UNUSED_ARG(err);
+  if (! CORBA::is_nil(rh.in ()))
+    {
+      send_response (*rh.in (), name, partial_ior, ior);
+    }
+  else if (queue)
+    {
+      if (debug_)
+        ACE_DEBUG((LM_DEBUG, "ImR: Queuing startup info.\n"));
+
+      PendingListPtr lst;
+      pending_.find (name, lst);
+      if (lst.null ())
+        {
+          lst = PendingListPtr (new PendingList);
+          int err = pending_.bind (name, lst);
+          ACE_ASSERT (err == 0);
+          ACE_UNUSED_ARG (err);
+        }
+      lst->push_back (PendingData (partial_ior, ior));
     }
-    lst->push_back(PendingData(partial_ior, ior));
-  }
 }
 
 void
-AsyncStartupWaiter_i::unblock_all(const char* name) {
+AsyncStartupWaiter_i::unblock_all (const char* name) {
   RHList tmp;
 
-  get_all_waiters(name, tmp);
+  get_all_waiters (name, tmp);
 
   // This startup info should be ignored when unblocking all, because we
   // don't know the ior or partial_ior at this point.
-  StartupInfo_var si = new StartupInfo();
+  StartupInfo_var si = new StartupInfo ();
   si->name = name;
 
   // Note : This method may be called when there are no waiters.
@@ -115,48 +120,52 @@ AsyncStartupWaiter_i::unblock_all(const char* name) {
   {
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
-    {
-      ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& rh = tmp[i];
- 
-      rh->wait_for_startup(si.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
+      {
+        ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& rh = tmp[i];
+
+        rh->wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
     ACE_CATCHANY
-    {
-      if (debug_)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::unblock_all()");
-    }
+      {
+        if (debug_)
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::unblock_all ()");
+      }
     ACE_ENDTRY;
   }
 }
 
 ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr
-AsyncStartupWaiter_i::get_one_waiter(const char* name) {
+AsyncStartupWaiter_i::get_one_waiter (const char* name)
+{
   RHListPtr lst;
-  waiting_.find(name, lst);
-  if (! lst.null() && lst->size() > 0) {
-    RHList& rhlst = *lst;
-    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& tmp = rhlst[rhlst.size() - 1];
-    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr ret = tmp._retn();
-    rhlst.pop_back();
-    return ret;
-  }
-  return ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler::_nil();
+  waiting_.find (name, lst);
+  if (! lst.null() && lst->size () > 0)
+    {
+      RHList& rhlst = *lst;
+      ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& tmp = rhlst[rhlst.size () - 1];
+      ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr ret = tmp._retn ();
+      rhlst.pop_back ();
+      return ret;
+    }
+  return ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler::_nil ();
 }
 
 void
-AsyncStartupWaiter_i::get_all_waiters(const char* name, RHList& ret) {
+AsyncStartupWaiter_i::get_all_waiters (const char* name, RHList& ret)
+{
   RHListPtr lst;
-  waiting_.find(name, lst);
-  if (! lst.null()) {
-    for (size_t i = 0; i < lst->size(); ++i) {
-      RHList& tmp = *lst;
-      ret.push_back(tmp[i]);
-      // The ACE_Vector will not destruct the elements when cleared, so we must
-      // make sure to do so here.
-      tmp[i] = ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler::_nil();
-    }
-    lst->clear();
+  waiting_.find (name, lst);
+  if (! lst.null ()) {
+    for (size_t i = 0; i < lst->size (); ++i)
+      {
+        RHList& tmp = *lst;
+        ret.push_back (tmp[i]);
+        // The ACE_Vector will not destruct the elements when cleared, so we must
+        // make sure to do so here.
+        tmp[i] = ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler::_nil ();
+      }
+    lst->clear ();
   }
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
index ba65d51b561..b4b527e1d40 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
@@ -45,7 +45,7 @@ class Locator_Export AsyncStartupWaiter_i : public virtual POA_ImplementationRep
     ACE_Null_Mutex> WaitingMap;
 
 public:
- 
+
   void wait_for_startup (
    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr rh,
    const char* name ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 991e1012870..7337af511e9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -33,24 +33,24 @@ ImR_Forwarder::ImR_Forwarder (ImR_Locator_i& imr_impl)
 }
 
 void
-ImR_Forwarder::init(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+ImR_Forwarder::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT(! CORBA::is_nil(orb));
+  ACE_ASSERT (! CORBA::is_nil(orb));
   this->orb_ = orb;
   ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var tmp =
-      orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    this->poa_current_var_ =
-      PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      CORBA::Object_var tmp =
+        orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      this->poa_current_var_ =
+        PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHANY
-  {
-    ACE_DEBUG((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
+    }
   ACE_ENDTRY;
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (this->poa_current_var_.in ()));
@@ -72,71 +72,71 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
-  ACE_ASSERT(! CORBA::is_nil(poa));
+  ACE_ASSERT (! CORBA::is_nil(poa));
   CORBA::Object_var forward_obj;
 
   ACE_TRY
-  {
-    CORBA::String_var server_name = poa->the_name();
-
-    if (locator_.debug() > 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", server_name.in()));
-
-    // The activator stores a partial ior with each server. We can
-    // just tack on the current ObjectKey to get a valid ior for
-    // the desired server.
-    CORBA::String_var pior = locator_.activate_server_by_name(server_name.in(), false ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    ACE_CString ior = pior.in();
-
-    // Check that the returned ior is the expected partial ior with
-    // missing ObjectKey.
-    if (ior.find("corbaloc:") != 0 || ior[ior.length() - 1] != '/')
     {
-      ACE_ERROR((LM_ERROR, "ImR_Forwarder::preinvoke() Invalid corbaloc ior.\n\t<%s>\n", ior.c_str()));
-      ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST (
+      CORBA::String_var server_name = poa->the_name();
+
+      if (locator_.debug() > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", server_name.in()));
+
+      // The activator stores a partial ior with each server. We can
+      // just tack on the current ObjectKey to get a valid ior for
+      // the desired server.
+      CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_CString ior = pior.in ();
+
+      // Check that the returned ior is the expected partial ior with
+      // missing ObjectKey.
+      if (ior.find ("corbaloc:") != 0 || ior[ior.length () - 1] != '/')
+        {
+          ACE_ERROR ((LM_ERROR, "ImR_Forwarder::preinvoke () Invalid corbaloc ior.\n\t<%s>\n", ior.c_str()));
+          ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST (
+            CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+            CORBA::COMPLETED_NO));
+        }
+
+      CORBA::String_var key_str;
+      // Unlike POA Current, this implementation cannot be cached.
+      TAO::Portable_Server::POA_Current* tao_current =
+        dynamic_cast <TAO::Portable_Server::POA_Current*> (this->poa_current_var_.in ());
+
+      ACE_ASSERT(tao_current != 0);
+      TAO::Portable_Server::POA_Current_Impl* impl = tao_current->implementation ();
+      TAO::ObjectKey::encode_sequence_to_string (key_str.out (), impl->object_key ());
+
+      ior += key_str.in();
+
+      if (locator_.debug() > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", server_name.in(), ior.c_str()));
+
+      forward_obj =
+        this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+    {
+      ACE_TRY_THROW (CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
         CORBA::COMPLETED_NO));
     }
-
-    CORBA::String_var key_str;
-    // Unlike POA Current, this implementation cannot be cached.
-    TAO::Portable_Server::POA_Current* tao_current =
-      dynamic_cast <TAO::Portable_Server::POA_Current*> (this->poa_current_var_.in ());
-
-    ACE_ASSERT(tao_current != 0);
-    TAO::Portable_Server::POA_Current_Impl* impl = tao_current->implementation ();
-    TAO::ObjectKey::encode_sequence_to_string (key_str.out(), impl->object_key ());
-
-    ior += key_str.in();
-
-    if (locator_.debug() > 0)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", server_name.in(), ior.c_str()));
-
-    forward_obj =
-      this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
-  {
-    ACE_TRY_THROW (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-  {
-    ACE_TRY_THROW (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
+    {
+      ACE_TRY_THROW (CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+        CORBA::COMPLETED_NO));
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder");
-    ACE_TRY_THROW (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder");
+      ACE_TRY_THROW (CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+        CORBA::COMPLETED_NO));
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
 
@@ -150,8 +150,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
 }
 
 void
-ImR_Forwarder::postinvoke (
-                           const PortableServer::ObjectId &,
+ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            PortableServer::POA_ptr,
                            const char *,
                            PortableServer::ServantLocator::Cookie,
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 600024e1c80..3057a8d6622 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -23,43 +23,42 @@ char *
 INS_Locator::locate (const char* object_key ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
-  ACE_ASSERT(object_key != 0);
+  ACE_ASSERT (object_key != 0);
   ACE_TRY
-  {
-    ACE_CString key(object_key);
-    ssize_t poaidx = key.find('/');
-    if (poaidx >= 0)
     {
-      key = key.substring(0, poaidx);
-    }
+      ACE_CString key (object_key);
+      ssize_t poaidx = key.find ('/');
+      if (poaidx >= 0)
+      {
+        key = key.substring (0, poaidx);
+      }
 
-    if (imr_locator_.debug() > 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", key.c_str()));
+      if (imr_locator_.debug () > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", key.c_str ()));
 
-    CORBA::String_var located =
-      this->imr_locator_.activate_server_by_object(key.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CORBA::String_var located =
+        this->imr_locator_.activate_server_by_object (key.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    ACE_CString tmp = located.in();
-    tmp += object_key;
+      ACE_CString tmp = located.in ();
+      tmp += object_key;
 
-    if (imr_locator_.debug() > 0)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", key.c_str(), tmp.c_str()));
+      if (imr_locator_.debug () > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", key.c_str (), tmp.c_str()));
 
-    return CORBA::string_dup(tmp.c_str());
-  }
-  ACE_CATCH(ImplementationRepository::CannotActivate, ex)
-  {
-    ACE_TRY_THROW (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
-  ACE_CATCH(ImplementationRepository::NotFound, ex)
-  {
-    ACE_TRY_THROW (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
+      return CORBA::string_dup (tmp.c_str ());
+    }
+  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+    {
+      ACE_TRY_THROW (CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+        CORBA::COMPLETED_NO));
+    }
+  ACE_CATCH (ImplementationRepository::NotFound, ex)
+    {
+      ACE_TRY_THROW (CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+        CORBA::COMPLETED_NO));
+    }
   ACE_ENDTRY;
-  return 0;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index ecaf693dde9..e40c8e6028a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -10,7 +10,7 @@
 class ImR_Activator_Shutdown : public Shutdown_Functor
 {
 public:
-  ImR_Activator_Shutdown(ImR_Activator_i& act);
+  ImR_Activator_Shutdown (ImR_Activator_i& act);
 
   void operator() (int which_signal);
 private:
@@ -28,7 +28,7 @@ ImR_Activator_Shutdown::operator() (int /*which_signal*/)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
-    this->act_.shutdown(true ACE_ENV_ARG_PARAMETER);
+    this->act_.shutdown (true ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
@@ -44,7 +44,7 @@ run_standalone (Activator_Options& opts)
   ImR_Activator_i server;
 
   ImR_Activator_Shutdown killer (server);
-  Service_Shutdown kill_contractor(killer);
+  Service_Shutdown kill_contractor (killer);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -117,7 +117,7 @@ run_service (void)
 static int
 run_service_command (Activator_Options& opts)
 {
-  if (opts.service_command() == Activator_Options::SC_NONE)
+  if (opts.service_command () == Activator_Options::SC_NONE)
     return 0;
 
 #if defined (ACE_WIN32)
@@ -129,44 +129,47 @@ run_service_command (Activator_Options& opts)
       const DWORD MAX_PATH_LENGTH = 4096;
       ACE_TCHAR pathname[MAX_PATH_LENGTH];
 
-      DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH);
-      if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
+        DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH);
+        if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
+          {
+            ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n"));
+            return -1;
+          }
+
+        // Append the command used for running the implrepo as a service
+        ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
+        int ret = -1;
+        if (opts.service_command () == Activator_Options::SC_INSTALL)
+          {
+            const ACE_TCHAR* DEPENDS_ON = ACE_TEXT("TAOImR"); // Must match Locator_NT_Service.h
+
+            ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
+                                                SERVICE_ERROR_NORMAL,
+                                                pathname,
+                                                0, // group
+                                                0, // tag
+                                                DEPENDS_ON
+                                                );
+          }
+        else
+          {
+            ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
+                                                SERVICE_ERROR_NORMAL,
+                                                pathname);
+          }
+      if (ret != -1)
         {
-          ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n"));
-          return -1;
+          ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
+          opts.save_registry_options ();
         }
-
-      // Append the command used for running the implrepo as a service
-      ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
-      int ret = -1;
-      if (opts.service_command() == Activator_Options::SC_INSTALL)
-      {
-        const ACE_TCHAR* DEPENDS_ON = ACE_TEXT("TAOImR"); // Must match Locator_NT_Service.h
-
-        ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
-                                            SERVICE_ERROR_NORMAL,
-                                            pathname,
-                                            0, // group
-                                            0, // tag
-                                            DEPENDS_ON
-                                            );
-      }
       else
-      {
-        ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
-                                            SERVICE_ERROR_NORMAL,
-                                            pathname);
-      }
-      if (ret != -1) {
-        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
-        opts.save_registry_options();
-      } else {
-        ACE_ERROR((LM_ERROR, "Error: Failed to install service.\n"));
-      }
+        {
+          ACE_ERROR ((LM_ERROR, "Error: Failed to install service.\n"));
+        }
       if (ret == 0)
         return 1;
     }
-  else if (opts.service_command() == Activator_Options::SC_REMOVE)
+  else if (opts.service_command () == Activator_Options::SC_REMOVE)
     {
       int ret = SERVICE::instance ()->remove ();
       ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n"));
@@ -174,11 +177,11 @@ run_service_command (Activator_Options& opts)
         return 1; // If successfull, then we don't want to continue.
     }
   else
-  {
-    ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
-      opts.service_command()));
-    return -1;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
+        opts.service_command ()));
+      return -1;
+    }
 
   return -1;
 
@@ -199,15 +202,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else if (result > 0)
     return 0;  // No error, but we should exit anyway.
 
-  result = run_service_command(opts);
+  result = run_service_command (opts);
   if (result < 0)
     return 1;  // Error
   else if (result > 0)
     return 0;  // No error, but we should exit anyway.
 
-  if (opts.service())
-    return run_service();
+  if (opts.service ())
+    return run_service ();
 
   return run_standalone (opts);
 }
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index ec784f19c86..74f2dea1b4d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -13,7 +13,7 @@
 #include "ace/os_include/os_netdb.h"
 #include "ace/Argv_Type_Converter.h"
 
-static ACE_CString getHostName()
+static ACE_CString getHostName ()
 {
   char host_name[MAXHOSTNAMELEN];
   ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
@@ -24,92 +24,95 @@ ImR_Activator_i::ImR_Activator_i (void)
 : registration_token_(0)
 , debug_(0)
 , notify_imr_ (false)
-, name_(getHostName())
+, name_ (getHostName ())
 {
 }
 
 static PortableServer::POA_ptr
-createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL) {
-
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL)
+{
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy(PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   CORBA::PolicyList pols;
-  pols.length(2);
-  pols[0] = PortableServer::LifespanPolicy::_duplicate(life.in());
-  pols[1] = PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
+  pols.length (2);
+  pols[0] = PortableServer::LifespanPolicy::_duplicate (life.in ());
+  pols[1] = PortableServer::IdAssignmentPolicy::_duplicate (assign.in ());
 
-  PortableServer::POAManager_var mgr = root_poa->the_POAManager();
+  PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA(poa_name, mgr.in(), pols ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_POA(poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(PortableServer::POA::_nil ());
 
-  life->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
-  assign->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+  life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  return poa._retn();
+  return poa._retn ();
 }
 
 // It's ok if we can't register with the ImR. It just
 // means we won't be able to notify it of any events
 // (Currently, just that we're shutting down.)
 void
-ImR_Activator_i::register_with_imr(ImplementationRepository::Activator_ptr activator)
+ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr activator)
 {
   ACE_TRY_NEW_ENV
-  {
-    if (this->debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n"));
+    {
+      if (this->debug_ > 1)
+        ACE_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n"));
 
-    // First, resolve the ImR, without this we can go no further
-    CORBA::Object_var obj =
-      orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      // First, resolve the ImR, without this we can go no further
+      CORBA::Object_var obj =
+        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
-      this->orb_->orb_core ()->reactor ());
+      this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
+        this->orb_->orb_core ()->reactor ());
 
-    locator_ = ImplementationRepository::Locator::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      locator_ = ImplementationRepository::Locator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    this->registration_token_ =
-      locator_->register_activator (name_.c_str(), activator ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      if (!CORBA::is_nil (locator_.in ()))
+        {
+          this->registration_token_ =
+            locator_->register_activator (name_.c_str (), activator ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-    if (debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n"));
+          if (debug_ > 0)
+            ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n"));
 
-    return;
-  }
+          return;
+        }
+    }
   ACE_CATCHANY
-  {
-    if (debug_ > 1)
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: Can't register with ImR.");
-  }
+    {
+      if (debug_ > 1)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: Can't register with ImR.");
+    }
   ACE_ENDTRY;
 
   if (debug_ > 0)
-    ACE_DEBUG((LM_DEBUG, "ImR Activator: Not registered with ImR.\n"));
+    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n"));
 }
 
 int
-ImR_Activator_i::init_with_orb(CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL)
+ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT(! CORBA::is_nil(orb));
-  orb_ = CORBA::ORB::_duplicate(orb);
-  debug_ = opts.debug();
-  notify_imr_ = opts.notify_imr();
-  if (opts.name().length() > 0)
-  {
-    name_ = opts.name();
-  }
+  ACE_ASSERT(! CORBA::is_nil (orb));
+  orb_ = CORBA::ORB::_duplicate (orb);
+  debug_ = opts.debug ();
+  notify_imr_ = opts.notify_imr ();
+  if (opts.name ().length () > 0)
+    {
+      name_ = opts.name();
+    }
 
   ACE_TRY
   {
@@ -183,13 +186,14 @@ ImR_Activator_i::init_with_orb(CORBA::ORB_ptr orb, const Activator_Options& opts
       }
       ACE_OS::fprintf(fp, "%s", ior.in());
       ACE_OS::fclose(fp);
+
     }
   }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
-    ACE_RE_THROW;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
+      ACE_RE_THROW;
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
@@ -201,6 +205,7 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
   ACE_TString cmdline = opts.cmdline();
   // Must use IOR style objrefs, because URLs sometimes get mangled when passed
   // to ACE_Process::spawn().
+
   cmdline += ACE_TEXT("-ORBUseImR 0 -ORBObjRefStyle IOR ");
   ACE_ARGV av(cmdline.c_str());
   int argc = av.argc();
@@ -209,9 +214,10 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
 
   CORBA::ORB_var orb =
     CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
+
   ACE_CHECK_RETURN(-1);
 
-  int ret = this->init_with_orb(orb.in(), opts ACE_ENV_ARG_PARAMETER);
+  int ret = this->init_with_orb(orb.in (), opts ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
   return ret;
@@ -220,54 +226,54 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
 int
 ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_TRY_EX(try_block_1)
-  {
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Shutting down...\n"));
+  ACE_TRY_EX (try_block_1)
+    {
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n"));
 
-    this->process_mgr_.close();
+      this->process_mgr_.close ();
 
-    this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(try_block_1);
+      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK_EX (try_block_1);
 
-    if (! CORBA::is_nil(this->locator_.in()) && this->registration_token_ != 0)
-    {
-      this->locator_->unregister_activator (name_.c_str(),
-        this->registration_token_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(try_block_1);
+      if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
+        {
+          this->locator_->unregister_activator (name_.c_str(),
+            this->registration_token_ ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (try_block_1);
+        }
     }
-  }
   ACE_CATCH(CORBA::COMM_FAILURE, ex)
-  {
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
-  }
+    {
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
+    }
   ACE_CATCH(CORBA::TRANSIENT, ex)
-  {
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
-  }
+    {
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
+    }
   ACE_CATCHANY
   {
     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini");
-    ACE_RE_THROW_EX(try_block_1);
+    ACE_RE_THROW_EX (try_block_1);
   }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  ACE_TRY_EX(try_block_2)
-  {
-    this->orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(try_block_2);
+  ACE_TRY_EX (try_block_2)
+    {
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK_EX (try_block_2);
 
-    if (debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR Activator: Shut down successfully.\n"));
-  }
+      if (debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n"));
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini 2");
-    ACE_RE_THROW_EX(try_block_2);
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini 2");
+      ACE_RE_THROW_EX (try_block_2);
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
@@ -276,7 +282,7 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 int
 ImR_Activator_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
@@ -285,13 +291,13 @@ void
 ImR_Activator_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  shutdown(false ACE_ENV_ARG_PARAMETER);
+  shutdown (false ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ImR_Activator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
 {
-  this->orb_->shutdown(wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -316,6 +322,7 @@ ImR_Activator_i::start_server(const char* name,
   proc_opts.handle_inheritence (0);
 
   proc_opts.setenv(ACE_TEXT("TAO_USE_IMR"), ACE_TEXT("1"));
+
   if (!CORBA::is_nil (this->locator_.in ()))
   {
     CORBA::String_var ior = orb_->object_to_string(locator_.in());
@@ -323,40 +330,40 @@ ImR_Activator_i::start_server(const char* name,
   }
 
   for (CORBA::ULong i = 0; i < env.length(); ++i) {
-    proc_opts.setenv (ACE_TEXT_TO_TCHAR_IN(env[i].name.in()), 
+    proc_opts.setenv (ACE_TEXT_TO_TCHAR_IN(env[i].name.in()),
                       ACE_TEXT_TO_TCHAR_IN(env[i].value.in()));
   }
 
   int pid = this->process_mgr_.spawn (proc_opts);
   if (pid == ACE_INVALID_PID)
-  {
-    ACE_ERROR ((LM_ERROR,
-      "ImR Activator: Cannot start server <%s> using <%s>\n", name, cmdline));
+    {
+      ACE_ERROR ((LM_ERROR,
+        "ImR Activator: Cannot start server <%s> using <%s>\n", name, cmdline));
 
-    ACE_THROW(ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed")));
-    return;
-  }
+      ACE_THROW(ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed")));
+      return;
+    }
   else
-  {
-    if (debug_ > 1)
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR Activator: register death handler for process %d\n", pid));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG((LM_DEBUG,
+            "ImR Activator: register death handler for process %d\n", pid));
+        }
+      this->process_mgr_.register_handler (this, pid);
+
+      // We only bind to the process_map_ if we want to notify
+      // the locator of a process' death.
+      if (notify_imr_)
+        {
+          this->process_map_.rebind (pid, name);
+        }
     }
-    this->process_mgr_.register_handler (this, pid);
 
-    // We only bind to the process_map_ if we want to notify
-    // the locator of a process' death.
-    if (notify_imr_)
+  if (debug_ > 0)
     {
-      this->process_map_.rebind (pid, name);
+      ACE_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>. \n", name));
     }
-  }
-
-  if (debug_ > 0)
-  {
-    ACE_DEBUG((LM_DEBUG, "ImR Activator: Successfully started <%s>. \n", name));
-  }
 }
 
 int
@@ -367,29 +374,29 @@ ImR_Activator_i::handle_exit (ACE_Process * process)
   // when this happens.
 
   if (debug_ > 0)
-  {
-    ACE_DEBUG
-      ((LM_DEBUG,
-      ACE_TEXT ("Process %d exited with exit code %d\n"),
-      process->getpid (), process->return_value ()));
-  }
+    {
+      ACE_DEBUG
+        ((LM_DEBUG,
+        ACE_TEXT ("Process %d exited with exit code %d\n"),
+        process->getpid (), process->return_value ()));
+    }
 
   ACE_CString name;
   if (this->process_map_.find (process->getpid (), name) == 0)
-  {
-    this->process_map_.unbind (process->getpid ());
-
-    if (!CORBA::is_nil (this->locator_.in ()))
     {
-      if (debug_ > 1)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT ("ImR Activator: Notifying ImR that %s has exited.\n"),
-          name.c_str()));
-      }
-      this->locator_->notify_child_death(name.c_str());
+      this->process_map_.unbind (process->getpid ());
+
+      if (!CORBA::is_nil (this->locator_.in ()))
+        {
+          if (debug_ > 1)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("ImR Activator: Notifying ImR that %s has exited.\n"),
+                name.c_str()));
+            }
+          this->locator_->notify_child_death (name.c_str());
+        }
     }
-  }
 
   return 0;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 91c69c9b312..6ee3210d575 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -8,7 +8,7 @@
 class ImR_Locator_Shutdown : public Shutdown_Functor
 {
 public:
-  ImR_Locator_Shutdown(ImR_Locator_i& imr);
+  ImR_Locator_Shutdown (ImR_Locator_i& imr);
 
   void operator() (int which_signal);
 private:
@@ -21,18 +21,18 @@ ImR_Locator_Shutdown::ImR_Locator_Shutdown (ImR_Locator_i &imr)
 }
 
 void
-ImR_Locator_Shutdown::operator() (int /*which_signal*/)
+ImR_Locator_Shutdown::operator () (int /*which_signal*/)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_.shutdown(true ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      this->imr_.shutdown (true ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: ");
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: ");
+    }
   ACE_ENDTRY;
 }
 
@@ -116,18 +116,18 @@ run_service (void)
 static int
 run_service_command (Options& opts)
 {
-  if (opts.service_command() == Options::SC_NONE)
+  if (opts.service_command () == Options::SC_NONE)
     return 0;
 
 #if defined (ACE_WIN32)
   SERVICE::instance()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
 
-  if (opts.service_command() == Options::SC_INSTALL)
+  if (opts.service_command () == Options::SC_INSTALL)
     {
       const DWORD MAX_PATH_LENGTH = 4096;
       ACE_TCHAR pathname[MAX_PATH_LENGTH];
 
-      DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH);
+      DWORD length = ACE_TEXT_GetModuleFileName (NULL, pathname, MAX_PATH_LENGTH);
       if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
         {
           ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n"));
@@ -140,16 +140,19 @@ run_service_command (Options& opts)
       int ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
                                            SERVICE_ERROR_NORMAL,
                                            pathname);
-      if (ret != -1) {
-        ACE_DEBUG ((LM_DEBUG, "ImR: Service installed.\n"));
-        opts.save_registry_options();
-      } else {
-        ACE_ERROR((LM_ERROR, "Error: Failed to install service. error:%d\n", errno));
-      }
+      if (ret != -1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: Service installed.\n"));
+          opts.save_registry_options ();
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR, "Error: Failed to install service. error:%d\n", errno));
+        }
       if (ret == 0)
         return 1;
     }
-  else if (opts.service_command() == Options::SC_REMOVE)
+  else if (opts.service_command () == Options::SC_REMOVE)
     {
       int ret = SERVICE::instance ()->remove ();
       ACE_DEBUG ((LM_DEBUG, "ImR: Service removed.\n"));
@@ -157,11 +160,11 @@ run_service_command (Options& opts)
         return 1; // If successfull, then we don't want to continue.
     }
   else
-  {
-    ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
-      opts.service_command()));
-    return -1;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
+        opts.service_command ()));
+      return -1;
+    }
 
   return -1;
 
@@ -188,7 +191,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else if (result > 0)
     return 0;  // No error, but we should exit anyway.
 
-  if (opts.service())
+  if (opts.service ())
   {
     return run_service ();
   }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
index 3fced0b1150..acae98bb07f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
@@ -10,7 +10,7 @@ module ImplementationRepository
   {
     // returns a token that can be used (along with activator name) to unregister the activator.
     long register_activator (in string name, in Activator act);
- 
+
     // You must pass in the token returned from register_activator.
     void unregister_activator (in string name, in long token);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index b4374928d61..63974066cfd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -23,54 +23,54 @@ static const int DEFAULT_START_LIMIT = 1;
 
 static const int PING_RETRY_SCHEDULE[] = {0, 10, 100, 500, 1000, 1000, 1000, 1000, 5000, 5000};
 
-static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT(0, 10 * 1000); // 10ms
+static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT (0, 10 * 1000); // 10ms
 // We want to give shutdown a little more time to work, so that we
 // can guarantee to the tao_imr utility that it has shutdown. The tao_imr
 // utility prints a different message depending on whether shutdown succeeds
 // or times out.
-static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT(0, 5000 * 1000);
+static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000);
 
 static PortableServer::POA_ptr
-createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL) {
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL) {
 
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy(PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   CORBA::PolicyList pols;
-  pols.length(2);
-  pols[0] = PortableServer::LifespanPolicy::_duplicate(life.in());
-  pols[1] = PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
+  pols.length (2);
+  pols[0] = PortableServer::LifespanPolicy::_duplicate (life.in ());
+  pols[1] = PortableServer::IdAssignmentPolicy::_duplicate (assign.in ());
 
-  PortableServer::POAManager_var mgr = root_poa->the_POAManager();
+  PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA(poa_name, mgr.in(), pols ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+    root_poa->create_POA (poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  life->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
-  assign->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil());
+  life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  return poa._retn();
+  return poa._retn ();
 }
 
 ImR_Locator_i::ImR_Locator_i (void)
-  : forwarder_(*this)
-  , ins_locator_(0)
-  , debug_(0)
-  , read_only_(false)
+  : forwarder_ (*this)
+  , ins_locator_ (0)
+  , debug_ (0)
+  , read_only_ (false)
 {
   // Visual C++ 6.0 is not smart enough to do a direct assignment
   // while allocating the INS_Locator.  So, we have to do it in
   // two steps.
   INS_Locator* locator;
-  ACE_NEW(locator,
-          INS_Locator(*this));
+  ACE_NEW (locator,
+          INS_Locator (*this));
   ins_locator_ = locator;
 }
 
@@ -86,21 +86,21 @@ ImR_Locator_i::~ImR_Locator_i (void)
 int
 ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL)
 {
-  orb_ = CORBA::ORB::_duplicate(orb);
-  debug_ = opts.debug();
-  read_only_ = opts.readonly();
-  startup_timeout_ = opts.startup_timeout();
-  ping_interval_ = opts.ping_interval();
+  orb_ = CORBA::ORB::_duplicate (orb);
+  debug_ = opts.debug ();
+  read_only_ = opts.readonly ();
+  startup_timeout_ = opts.startup_timeout ();
+  ping_interval_ = opts.ping_interval ();
 
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
+  ACE_ASSERT (! CORBA::is_nil (this->root_poa_.in ()));
 
-  this->forwarder_.init(orb ACE_ENV_ARG_PARAMETER);
-  this->adapter_.init(& this->forwarder_);
+  this->forwarder_.init (orb ACE_ENV_ARG_PARAMETER);
+  this->adapter_.init (& this->forwarder_);
 
   // Register the Adapter_Activator reference to be the RootPOA's
   // Adapter Activator.
@@ -108,31 +108,31 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ACE_CHECK_RETURN (-1);
 
   // Use a persistent POA so that any IOR
-  this->imr_poa_ = createPersistentPOA(this->root_poa_.in(),
-    "ImplRepo_Service" ACE_ENV_ARG_PARAMETER);
+  this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
+                                        "ImplRepo_Service" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  ACE_ASSERT(! CORBA::is_nil(this->imr_poa_.in()));
+  ACE_ASSERT (! CORBA::is_nil (this->imr_poa_.in ()));
 
-  waiter_svt_.debug(debug_ > 1);
+  waiter_svt_.debug (debug_ > 1);
   PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
-  this->imr_poa_->activate_object_with_id(id.in(), &waiter_svt_ ACE_ENV_ARG_PARAMETER);
+  this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
+  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (startup_timeout_ > ACE_Time_Value::zero)
-  {
-    obj = set_timeout_policy(obj.in(), startup_timeout_);
-  }
-  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    {
+      obj = set_timeout_policy (obj.in (), startup_timeout_);
+    }
+  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id = PortableServer::string_to_ObjectId ("ImplRepo_Service");
-  this->imr_poa_->activate_object_with_id(id.in(), this ACE_ENV_ARG_PARAMETER);
+  this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
+  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  CORBA::String_var ior = this->orb_->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the ImR for use with INS
@@ -140,7 +140,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ACE_CHECK_RETURN (-1);
   IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
+  ACE_ASSERT (! CORBA::is_nil (ior_table.in ()));
   ior_table->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ior_table->bind ("ImR", ior.in () ACE_ENV_ARG_PARAMETER);
@@ -149,12 +149,12 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ACE_CHECK_RETURN (-1);
 
   // Set up multicast support (if enabled)
-  if (opts.multicast())
-  {
-    ACE_Reactor* reactor = orb->orb_core()->reactor();
-    if (this->setup_multicast (reactor, ior.in()) != 0)
-      return -1;
-  }
+  if (opts.multicast ())
+    {
+      ACE_Reactor* reactor = orb->orb_core ()->reactor ();
+      if (this->setup_multicast (reactor, ior.in ()) != 0)
+        return -1;
+    }
 
   // Initialize the persistent storage. This will load any values that
   // may have been persisted before.
@@ -163,9 +163,9 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   int init_result =
     this->repository_.init (opts);
   if (init_result == -1)
-  {
-    ACE_ERROR_RETURN ((LM_ERROR, "Repository failed to initialize\n"), -1);
-  }
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Repository failed to initialize\n"), -1);
+    }
 
   // Activate the two poa managers
   PortableServer::POAManager_var poaman =
@@ -185,17 +185,17 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
     if (fp == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-        "ImR: Could not open file: %s\n", opts.ior_filename().c_str()), -1);
+                         "ImR: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1);
     }
-    ACE_OS::fprintf(fp, "%s", ior.in());
-    ACE_OS::fclose(fp);
+    ACE_OS::fprintf (fp, "%s", ior.in ());
+    ACE_OS::fclose (fp);
   }
 
   return 0;
 }
 
 int
-ImR_Locator_i::init(Options& opts ACE_ENV_ARG_DECL)
+ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
 {
   ACE_TString cmdline = opts.cmdline();
   cmdline += ACE_TEXT(" -orbcollocation no -orbuseimr 0");
@@ -205,16 +205,17 @@ ImR_Locator_i::init(Options& opts ACE_ENV_ARG_DECL)
 
   ACE_Argv_Type_Converter convert (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 
+  CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(),
                           "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
   int err = this->init_with_orb(orb.in(), opts ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
+
   return err;
 }
 
 int
-ImR_Locator_i::run(ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (debug_ > 0)
   {
@@ -233,109 +234,110 @@ ImR_Locator_i::run(ACE_ENV_SINGLE_ARG_DECL)
       read_only_ ? "True" : "False"));
   }
   this->auto_start_servers(ACE_ENV_SINGLE_ARG_PARAMETER);
+
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 void
-ImR_Locator_i::shutdown(CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
                         ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (servers != 0 && this->repository_.servers().current_size() > 0)
-  {
-    // Note : shutdown is oneway, so we can't throw
-    ACE_ERROR((LM_ERROR, "ImR: Shutdown of all servers not implemented.\n"));
-  }
-  if (activators != 0 && this->repository_.activators().current_size() > 0)
-  {
-    ACE_Vector<ImplementationRepository::Activator_var> acts;
-    Locator_Repository::AIMap::ENTRY* entry = 0;
-    Locator_Repository::AIMap::ITERATOR it(this->repository_.activators());
-    for (;it.next(entry) != 0; it.advance())
+  if (servers != 0 && this->repository_.servers ().current_size () > 0)
     {
-      Activator_Info_Ptr info = entry->int_id_;
-      ACE_ASSERT(! info.null());
-      connect_activator(*info);
-      if (! CORBA::is_nil(info->activator.in()))
-        acts.push_back(info->activator);
+      // Note : shutdown is oneway, so we can't throw
+      ACE_ERROR ((LM_ERROR, "ImR: Shutdown of all servers not implemented.\n"));
     }
+  if (activators != 0 && this->repository_.activators ().current_size () > 0)
+    {
+      ACE_Vector<ImplementationRepository::Activator_var> acts;
+      Locator_Repository::AIMap::ENTRY* entry = 0;
+      Locator_Repository::AIMap::ITERATOR it (this->repository_.activators ());
+      for (;it.next (entry) != 0; it.advance ())
+        {
+          Activator_Info_Ptr info = entry->int_id_;
+          ACE_ASSERT (! info.null ());
+          connect_activator (*info);
+          if (! CORBA::is_nil (info->activator.in ()))
+            acts.push_back (info->activator);
+        }
 
-    int shutdown_errs = 0;
+      int shutdown_errs = 0;
 
-    for (size_t i = 0; i < acts.size(); ++i)
-    {
-      ACE_TRY
-      {
-        acts[i]->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        acts[i] = ImplementationRepository::Activator::_nil();
-      }
-      ACE_CATCHANY
-      {
-        ++shutdown_errs;
-        if (debug_ > 1)
+      for (size_t i = 0; i < acts.size (); ++i)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: shutdown activator");
+          ACE_TRY
+            {
+              acts[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              acts[i] = ImplementationRepository::Activator::_nil ();
+            }
+          ACE_CATCHANY
+            {
+              ++shutdown_errs;
+              if (debug_ > 1)
+                {
+                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: shutdown activator");
+                }
+            }
+          ACE_ENDTRY;
+          ACE_CHECK;
+        }
+      if (debug_ > 0 && shutdown_errs > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: Some activators could not be shut down.\n"));
         }
-      }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-    if (debug_ > 0 && shutdown_errs > 0)
-    {
-      ACE_DEBUG((LM_DEBUG, "ImR: Some activators could not be shut down.\n"));
     }
-  }
   // Technically, we should wait for all the activators to unregister, but
   // ,for now at least, it doesn't seem worth it.
-  shutdown(false ACE_ENV_ARG_PARAMETER);
+  shutdown (false ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ImR_Locator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
 {
-  this->orb_->shutdown(wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
 }
 
 int
 ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
-  {
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Shutting down...\n"));
+    {
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down...\n"));
 
-    teardown_multicast();
+      teardown_multicast ();
 
-    this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    this->orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR: Shut down successfully.\n"));
-  }
+      if (debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Shut down successfully.\n"));
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::fini");
-    ACE_RE_THROW;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::fini");
+      ACE_RE_THROW;
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 void
-ImR_Locator_i::teardown_multicast()
+ImR_Locator_i::teardown_multicast ()
 {
-  ACE_Reactor* r = ior_multicast_.reactor();
+  ACE_Reactor* r = ior_multicast_.reactor ();
   if (r != 0) {
-    r->remove_handler(&ior_multicast_, ACE_Event_Handler::READ_MASK);
-    ior_multicast_.reactor(0);
+    r->remove_handler (&ior_multicast_, ACE_Event_Handler::READ_MASK);
+    ior_multicast_.reactor (0);
   }
 }
 
@@ -346,49 +348,49 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior)
   ACE_ASSERT (ior != 0);
 #if defined (ACE_HAS_IP_MULTICAST)
 
-  TAO_ORB_Core* core = TAO_ORB_Core_instance();
+  TAO_ORB_Core* core = TAO_ORB_Core_instance ();
   // See if the -ORBMulticastDiscoveryEndpoint option was specified.
-  ACE_CString mde (core->orb_params()->mcast_discovery_endpoint());
+  ACE_CString mde (core->orb_params ()->mcast_discovery_endpoint ());
 
   if (mde.length () != 0)
-  {
-    if (this->ior_multicast_.init(ior,
-      mde.c_str(), TAO_SERVICEID_IMPLREPOSERVICE) == -1)
     {
-      return -1;
+      if (this->ior_multicast_.init (ior,
+                                     mde.c_str (), TAO_SERVICEID_IMPLREPOSERVICE) == -1)
+        {
+          return -1;
+        }
     }
-  }
   else
-  {
-    // Port can be specified as param, env var, or default
-    CORBA::UShort port =
-      core->orb_params()->service_port (TAO::MCAST_IMPLREPOSERVICE);
-    if (port == 0)
     {
-      // Check environment var. for multicast port.
-      const char* port_number = ACE_OS::getenv ("ImplRepoServicePort");
+      // Port can be specified as param, env var, or default
+      CORBA::UShort port =
+        core->orb_params ()->service_port (TAO::MCAST_IMPLREPOSERVICE);
+      if (port == 0)
+        {
+          // Check environment var. for multicast port.
+          const char* port_number = ACE_OS::getenv ("ImplRepoServicePort");
 
-      if (port_number != 0)
-        port = ACE_OS::atoi (port_number);
-    }
-    if (port == 0)
-      port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
+          if (port_number != 0)
+            port = static_cast<CORBA::UShort> (ACE_OS::atoi (port_number));
+        }
+      if (port == 0)
+        port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
 
-    if (this->ior_multicast_.init(ior, port,
-      ACE_DEFAULT_MULTICAST_ADDR, TAO_SERVICEID_IMPLREPOSERVICE) == -1)
-    {
-      return -1;
+      if (this->ior_multicast_.init (ior, port,
+                                     ACE_DEFAULT_MULTICAST_ADDR, TAO_SERVICEID_IMPLREPOSERVICE) == -1)
+        {
+          return -1;
+        }
     }
-  }
 
   // Register event handler for the ior multicast.
   if (reactor->register_handler (&this->ior_multicast_,
-    ACE_Event_Handler::READ_MASK) == -1)
-  {
-    if (debug_ >= 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR: cannot register Event handler\n"));
-    return -1;
-  }
+                                 ACE_Event_Handler::READ_MASK) == -1)
+    {
+      if (debug_ >= 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: cannot register Event handler\n"));
+      return -1;
+    }
 #else /* ACE_HAS_IP_MULTICAST*/
   ACE_UNUSED_ARG (reactor);
   ACE_UNUSED_ARG (ior);
@@ -402,23 +404,23 @@ ImR_Locator_i::register_activator (const char* aname,
                                    ACE_ENV_ARG_DECL)
                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_ASSERT(aname != 0);
-  ACE_ASSERT(! CORBA::is_nil(activator));
+  ACE_ASSERT (aname != 0);
+  ACE_ASSERT (! CORBA::is_nil (activator));
 
   // Before we can register the activator, we need to ensure that any existing
   // registration is purged.
-  this->unregister_activator_i(aname);
-  ACE_CHECK_RETURN(0);
+  this->unregister_activator_i (aname);
+  ACE_CHECK_RETURN (0);
 
   CORBA::String_var ior =
     this->orb_->object_to_string (activator ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::Long token = ACE_OS::gettimeofday().msec();
+  CORBA::Long token = ACE_OS::gettimeofday ().msec ();
 
-  int err = this->repository_.add_activator (aname, token, ior.in(), activator);
-  ACE_ASSERT(err == 0);
-  ACE_UNUSED_ARG(err);
+  int err = this->repository_.add_activator (aname, token, ior.in (), activator);
+  ACE_ASSERT (err == 0);
+  ACE_UNUSED_ARG (err);
 
   if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Activator registered for %s.\n", aname));
@@ -432,64 +434,63 @@ ImR_Locator_i::unregister_activator (const char* aname,
                                      ACE_ENV_ARG_DECL)
                                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_ASSERT(aname != 0);
+  ACE_ASSERT (aname != 0);
   Activator_Info_Ptr info = this->get_activator (aname);
 
-  if (! info.null())
-  {
-    if (info->token != token && this->debug_ > 0)
+  if (! info.null ())
     {
-      ACE_DEBUG((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Wrong token.\n", aname));
-      return;
-    }
+      if (info->token != token && this->debug_ > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Wrong token.\n", aname));
+          return;
+        }
 
-    this->unregister_activator_i(aname);
-    ACE_CHECK;
+      this->unregister_activator_i (aname);
+      ACE_CHECK;
 
-    if (this->debug_ > 0)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname));
-  }
+      if (this->debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname));
+    }
   else
-  {
-    if (this->debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Unknown activator.\n", aname));
-  }
+    {
+      if (this->debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Unknown activator.\n", aname));
+    }
 }
 
 void
-ImR_Locator_i::unregister_activator_i(const char* aname)
+ImR_Locator_i::unregister_activator_i (const char* aname)
 {
-  ACE_ASSERT(aname != 0);
+  ACE_ASSERT (aname != 0);
   int err = this->repository_.remove_activator (aname);
-  ACE_UNUSED_ARG(err);
+  ACE_UNUSED_ARG (err);
 }
 
-
 void
 ImR_Locator_i::notify_child_death (const char* name ACE_ENV_ARG_DECL_NOT_USED)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_ASSERT(name != 0);
+  ACE_ASSERT (name != 0);
 
   if (this->debug_ > 1)
-    ACE_DEBUG((LM_DEBUG, "ImR: Server has died <%s>.\n", name));
+    ACE_DEBUG ((LM_DEBUG, "ImR: Server has died <%s>.\n", name));
 
-  Server_Info_Ptr info = this->repository_.get_server(name);
-  if (! info.null())
-  {
-    info->ior = "";
-    info->partial_ior = "";
+  Server_Info_Ptr info = this->repository_.get_server (name);
+  if (! info.null ())
+    {
+      info->ior = "";
+      info->partial_ior = "";
 
-    int err = this->repository_.update_server(*info);
-    ACE_ASSERT(err == 0);
-    ACE_UNUSED_ARG(err);
-  }
+      int err = this->repository_.update_server (*info);
+      ACE_ASSERT (err == 0);
+      ACE_UNUSED_ARG (err);
+    }
   else
-  {
-    if (this->debug_ > 1)
-      ACE_DEBUG((LM_DEBUG,
-      "ImR: Failed to find server in repository.\n"));
-  }
+    {
+      if (this->debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG,
+                    "ImR: Failed to find server in repository.\n"));
+    }
 }
 
 void
@@ -503,7 +504,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
   // This is the version called by tao_imr to activate the server, manually
   // starting it if necessary.
-  activate_server_by_name(server, true ACE_ENV_ARG_PARAMETER);
+  activate_server_by_name (server, true ACE_ENV_ARG_PARAMETER);
 }
 
 char*
@@ -514,16 +515,16 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 {
   // Activate the server, starting it if necessary. Don't start MANUAL
   // servers unless manual_start=true
-  ACE_ASSERT(name != 0);
+  ACE_ASSERT (name != 0);
 
-  Server_Info_Ptr info = this->repository_.get_server(name);
-  if (info.null())
-  {
-    ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name));
-    ACE_THROW_RETURN(ImplementationRepository::NotFound (), 0);
-  }
+  Server_Info_Ptr info = this->repository_.get_server (name);
+  if (info.null ())
+    {
+      ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name));
+      ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
+    }
 
-  return activate_server_i(*info, manual_start ACE_ENV_ARG_PARAMETER);
+  return activate_server_i (*info, manual_start ACE_ENV_ARG_PARAMETER);
 }
 
 char*
@@ -532,16 +533,16 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
 {
-  ACE_ASSERT(object_name != 0);
+  ACE_ASSERT (object_name != 0);
 
   // We assume that the first part of the object name is the server name.
   // So a name of foo/bar means that the server name is foo.
-  ACE_CString server_name(object_name);
+  ACE_CString server_name (object_name);
   ssize_t pos = server_name.find ('/');
   if (pos != ACE_CString::npos)
-    server_name = server_name.substr(pos + 1);
+    server_name = server_name.substr (pos + 1);
 
-  return activate_server_by_name(server_name.c_str(), false ACE_ENV_ARG_PARAMETER);
+  return activate_server_by_name (server_name.c_str (), false ACE_ENV_ARG_PARAMETER);
 }
 
 char*
@@ -551,47 +552,47 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::CannotActivate))
 {
   if (info.activation_mode == ImplementationRepository::PER_CLIENT)
-  {
-    return activate_perclient_server_i(info, manual_start ACE_ENV_ARG_PARAMETER);
-  }
+    {
+      return activate_perclient_server_i (info, manual_start ACE_ENV_ARG_PARAMETER);
+    }
 
-  while(true)
-  {
-    if (is_alive(info))
+  while (true)
     {
-      if (debug_ > 1)
-      {
-        ACE_DEBUG((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n",
-          info.name.c_str(), info.partial_ior.c_str()));
-      }
-      info.start_count = 0;
+      if (is_alive (info))
+        {
+          if (debug_ > 1)
+            {
+              ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n",
+                          info.name.c_str (), info.partial_ior.c_str ()));
+            }
+          info.start_count = 0;
 
-      waiter_svt_.unblock_all(info.name.c_str());
+          waiter_svt_.unblock_all (info.name.c_str ());
 
-      return CORBA::string_dup(info.partial_ior.c_str());
-    }
+          return CORBA::string_dup (info.partial_ior.c_str ());
+        }
 
-    info.reset();
+      info.reset ();
 
-    if (! info.starting && info.start_count >= info.start_limit)
-    {
-      if (this->debug_ > 0)
-      {
-        ACE_DEBUG((LM_DEBUG,
-          "ImR: Cannot Activate <%s>.\n", info.name.c_str()));
-      }
+      if (! info.starting && info.start_count >= info.start_limit)
+        {
+          if (this->debug_ > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "ImR: Cannot Activate <%s>.\n", info.name.c_str ()));
+            }
 
-      waiter_svt_.unblock_all(info.name.c_str());
+          waiter_svt_.unblock_all (info.name.c_str ());
 
-      ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-        (CORBA::string_dup ("Cannot start server.")), 0);
-    }
+          ACE_THROW_RETURN (ImplementationRepository::CannotActivate
+                            (CORBA::string_dup ("Cannot start server.")), 0);
+        }
 
-    // Note : We already updated info with StartupInfo in server_is_running()
-    ImplementationRepository::StartupInfo_var si =
-      start_server(info, manual_start ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
-  }
+      // Note : We already updated info with StartupInfo in server_is_running ()
+      ImplementationRepository::StartupInfo_var si =
+        start_server (info, manual_start ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
 }
 
 char*
@@ -601,198 +602,198 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::CannotActivate))
 {
   do
-  {
-    ImplementationRepository::StartupInfo* psi =
-      start_server(info, manual_start ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
-
-    if (psi != 0)
     {
-      ImplementationRepository::StartupInfo_var si = psi;
-      ACE_ASSERT(info.name == si->name.in());
-      info.partial_ior = si->partial_ior.in();
-      info.ior = si->ior.in();
+      ImplementationRepository::StartupInfo* psi =
+        start_server (info, manual_start ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
 
-      if (is_alive(info))
-      {
-        if (debug_ > 1)
+      if (psi != 0)
         {
-          ACE_DEBUG((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n",
-            info.name.c_str(), info.partial_ior.c_str()));
+          ImplementationRepository::StartupInfo_var si = psi;
+          ACE_ASSERT (info.name == si->name.in ());
+          info.partial_ior = si->partial_ior.in ();
+          info.ior = si->ior.in ();
+
+          if (is_alive (info))
+            {
+              if (debug_ > 1)
+                {
+                  ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n",
+                              info.name.c_str (), info.partial_ior.c_str ()));
+                }
+              return CORBA::string_dup (info.partial_ior.c_str ());
+            }
+          info.reset ();
         }
-        return CORBA::string_dup(info.partial_ior.c_str());
-      }
-      info.reset();
-    }
-  } while (info.start_count < info.start_limit);
+    } while (info.start_count < info.start_limit);
 
   if (this->debug_ > 0)
-  {
-    ACE_DEBUG((LM_DEBUG,
-      "ImR: Cannot Activate <%s>.\n", info.name.c_str()));
-  }
+    {
+      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);
+                    (CORBA::string_dup ("Cannot start server.")), 0);
 }
 
 ImplementationRepository::StartupInfo*
-ImR_Locator_i::start_server(Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::start_server (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
 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);
-  }
-  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);
-  }
-
-  Activator_Info_Ptr ainfo = get_activator(info.activator);
-
-  if (ainfo.null() || CORBA::is_nil(ainfo->activator.in()))
-  {
-    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);
-  }
+    {
+      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);
+    }
+  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);
+    }
 
-  ACE_TRY
-  {
-    ++ info.waiting_clients;
+  Activator_Info_Ptr ainfo = get_activator (info.activator);
 
-    if (info.waiting_clients <= 1 || info.activation_mode == ImplementationRepository::PER_CLIENT)
+  if (ainfo.null () || CORBA::is_nil (ainfo->activator.in ()))
     {
-      info.starting = true;
-      ++info.start_count;
-      ACE_ASSERT(info.start_count <= info.start_limit);
-      if (this->debug_ > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%s>. Attempt %d/%d.\n",
-          info.name.c_str(), info.start_count, info.start_limit));
-      }
-      ainfo->activator->start_server(
-        info.name.c_str(),
-        info.cmdline.c_str(),
-        info.dir.c_str(),
-        info.env_vars
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      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);
     }
 
-    if (info.partial_ior.length() == 0)
+  ACE_TRY
     {
-      if (this->debug_ > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%s> to start...\n", info.name.c_str()));
-      }
+      ++ info.waiting_clients;
 
-      ImplementationRepository::StartupInfo_var si =
-        waiter_->wait_for_startup(info.name.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      if (info.waiting_clients <= 1 || info.activation_mode == ImplementationRepository::PER_CLIENT)
+        {
+          info.starting = true;
+          ++info.start_count;
+          ACE_ASSERT (info.start_count <= info.start_limit);
+          if (this->debug_ > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%s>. Attempt %d/%d.\n",
+                          info.name.c_str (), info.start_count, info.start_limit));
+            }
+          ainfo->activator->start_server (
+                                          info.name.c_str (),
+                                          info.cmdline.c_str (),
+                                          info.dir.c_str (),
+                                          info.env_vars
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
-      -- info.waiting_clients;
-      info.starting = false;
+      if (info.partial_ior.length () == 0)
+        {
+          if (this->debug_ > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%s> to start...\n", info.name.c_str ()));
+            }
+
+          ImplementationRepository::StartupInfo_var si =
+            waiter_->wait_for_startup (info.name.c_str () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          -- info.waiting_clients;
+          info.starting = false;
 
-      return si._retn();
+          return si._retn ();
+        }
+      else // The server_is_running () came in before the wait_for_startup ()
+        {
+          if (this->debug_ > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Skipping wait. Already started.\n", info.name.c_str ()));
+            }
+          -- info.waiting_clients;
+          info.starting = false;
+        }
     }
-    else // The server_is_running() came in before the wait_for_startup()
+  ACE_CATCH (CORBA::TIMEOUT, ex)
     {
-      if (this->debug_ > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Skipping wait. Already started.\n", info.name.c_str()));
-      }
       -- info.waiting_clients;
       info.starting = false;
+      // We may have connected successfully, because the timeout could occur before
+      // the AsyncStartupWaiter manages to return. In fact, when the ImR is very busy
+      // this is the most likely code path.
+      if (info.partial_ior.length () == 0)
+        {
+          if (debug_ > 0)
+            ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str ()));
+          info.reset ();
+        }
     }
-  }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
-  {
-    -- info.waiting_clients;
-    info.starting = false;
-    // We may have connected successfully, because the timeout could occur before
-    // the AsyncStartupWaiter manages to return. In fact, when the ImR is very busy
-    // this is the most likely code path.
-    if (info.partial_ior.length() == 0)
+  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
     {
+      -- info.waiting_clients;
+      info.starting = false;
+      info.reset ();
       if (debug_ > 0)
-        ACE_DEBUG((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str()));
-      info.reset();
+        ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ()));
     }
-  }
-  ACE_CATCH(ImplementationRepository::CannotActivate, ex)
-  {
-    -- info.waiting_clients;
-    info.starting = false;
-    info.reset();
-    if (debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str()));
-  }
   ACE_CATCHANY
-  {
-    -- info.waiting_clients;
-    info.starting = false;
-    if (debug_ > 0)
-      ACE_DEBUG((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str()));
-    if (debug_ > 1)
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
-    ainfo->reset();
-    info.reset();
-  }
+    {
+      -- info.waiting_clients;
+      info.starting = false;
+      if (debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str ()));
+      if (debug_ > 1)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ainfo->reset ();
+      info.reset ();
+    }
   ACE_ENDTRY;
   return 0; // This is not a corba call, so a zero should be ok
 }
 
 CORBA::Object_ptr
-ImR_Locator_i::set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to)
+ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to)
 {
-  CORBA::Object_var ret(CORBA::Object::_duplicate(obj));
+  CORBA::Object_var ret (CORBA::Object::_duplicate (obj));
 
   ACE_TRY_NEW_ENV
-  {
-    TimeBase::TimeT timeout;
-    ORBSVCS_Time::Time_Value_to_TimeT (timeout, to);
-    CORBA::Any tmp;
-    tmp <<= timeout;
-
-    CORBA::PolicyList policies(1);
-    policies.length(1);
-    policies[0] = orb_->create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      TimeBase::TimeT timeout;
+      ORBSVCS_Time::Time_Value_to_TimeT (timeout, to);
+      CORBA::Any tmp;
+      tmp <<= timeout;
+
+      CORBA::PolicyList policies (1);
+      policies.length (1);
+      policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    policies[0]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (CORBA::is_nil(ret.in()))
-    {
-      if (this->debug_ > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ImR: Unable to set timeout policy.\n"));
-      }
-      ret = CORBA::Object::_duplicate(obj);
+      if (CORBA::is_nil (ret.in ()))
+        {
+          if (this->debug_ > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG, "ImR: Unable to set timeout policy.\n"));
+            }
+          ret = CORBA::Object::_duplicate (obj);
+        }
     }
-  }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy()");
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy ()");
+    }
   ACE_ENDTRY;
 
-  return ret._retn();
+  return ret._retn ();
 }
 
 void
@@ -802,213 +803,213 @@ ImR_Locator_i::add_or_update_server (const char* server,
                                 ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
-  ACE_ASSERT(server != 0);
+  ACE_ASSERT (server != 0);
 
   if (this->read_only_)
-  {
-    ACE_DEBUG((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server));
-    ACE_THROW (CORBA::NO_PERMISSION (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server));
+      ACE_THROW (CORBA::NO_PERMISSION (
+                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+                                       CORBA::COMPLETED_NO));
+    }
 
   if (debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Add/Update server <%s>.\n", server));
 
   int limit = options.start_limit;
   if (limit < 0)
-  {
-    limit = -limit;
-  }
+    {
+      limit = -limit;
+    }
   else if (limit == 0)
-  {
-    limit = 1;
-  }
+    {
+      limit = 1;
+    }
 
-  Server_Info_Ptr info = this->repository_.get_server(server);
-  if (info.null())
-  {
-    if (this->debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Adding server <%s>.\n", server));
-
-    this->repository_.add_server (server,
-      options.activator.in(),
-      options.command_line.in (),
-      options.environment,
-      options.working_directory.in (),
-      options.activation,
-      limit);
-  }
+  Server_Info_Ptr info = this->repository_.get_server (server);
+  if (info.null ())
+    {
+      if (this->debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Adding server <%s>.\n", server));
+
+      this->repository_.add_server (server,
+                                    options.activator.in (),
+                                    options.command_line.in (),
+                                    options.environment,
+                                    options.working_directory.in (),
+                                    options.activation,
+                                    limit);
+    }
   else
-  {
-    if (this->debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Updating server <%s>.\n", server));
-
-    info->activator = options.activator.in();
-    info->cmdline = options.command_line.in();
-    info->env_vars = options.environment;
-    info->dir = options.working_directory.in();
-    info->activation_mode = options.activation;
-    info->start_limit = limit;
-    info->start_count = 0;
-    int err = this->repository_.update_server(*info);
-    ACE_ASSERT(err == 0);
-    ACE_UNUSED_ARG(err);
-  }
+    {
+      if (this->debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Updating server <%s>.\n", server));
+
+      info->activator = options.activator.in ();
+      info->cmdline = options.command_line.in ();
+      info->env_vars = options.environment;
+      info->dir = options.working_directory.in ();
+      info->activation_mode = options.activation;
+      info->start_limit = limit;
+      info->start_count = 0;
+      int err = this->repository_.update_server (*info);
+      ACE_ASSERT (err == 0);
+      ACE_UNUSED_ARG (err);
+    }
 
   if (this->debug_ > 1)
-  {
-    // Note : The info var may be null, so we use options.
-    ACE_DEBUG ((LM_DEBUG, "ImR: Server: %s\n"
-      "\tActivator: %s\n"
-      "\tCommand Line: %s\n"
-      "\tWorking Directory: %s\n"
-      "\tActivation: %s\n"
-      "\tStart Limit: %d\n"
-      "\n",
-      server,
-      options.activator.in(),
-      options.command_line.in (),
-      options.working_directory.in (),
-      ImR_Utils::activationModeToString(options.activation).c_str(),
-      limit
-      ));
-
-    for (CORBA::ULong i = 0; i < options.environment.length(); ++i)
-      ACE_DEBUG ((LM_DEBUG, "Environment variable %s=%s\n",
-      options.environment[i].name.in(),
-      options.environment[i].value.in()));
-  }
+    {
+      // Note : The info var may be null, so we use options.
+      ACE_DEBUG ((LM_DEBUG, "ImR: Server: %s\n"
+                  "\tActivator: %s\n"
+                  "\tCommand Line: %s\n"
+                  "\tWorking Directory: %s\n"
+                  "\tActivation: %s\n"
+                  "\tStart Limit: %d\n"
+                  "\n",
+                  server,
+                  options.activator.in (),
+                  options.command_line.in (),
+                  options.working_directory.in (),
+                  ImR_Utils::activationModeToString (options.activation).c_str (),
+                  limit
+                  ));
+
+      for (CORBA::ULong i = 0; i < options.environment.length (); ++i)
+        ACE_DEBUG ((LM_DEBUG, "Environment variable %s=%s\n",
+                    options.environment[i].name.in (),
+                    options.environment[i].value.in ()));
+    }
 }
 
 void
 ImR_Locator_i::remove_server (const char* name ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  ACE_ASSERT(name != 0);
+  ACE_ASSERT (name != 0);
   if (this->read_only_)
-  {
-    ACE_ERROR ((LM_ERROR,
-      "ImR: Can't remove server <%s> due to locked database.\n", name));
-    ACE_THROW (CORBA::NO_PERMISSION (
-      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-      CORBA::COMPLETED_NO));
-  }
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "ImR: Can't remove server <%s> due to locked database.\n", name));
+      ACE_THROW (CORBA::NO_PERMISSION (
+                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+                                       CORBA::COMPLETED_NO));
+    }
 
   // Note : This will be safe, because any Server_Info_Ptr objects will still
   // be valid, and the actual Server_Info will be destroyed when the last
   // one goes out of scope.
 
-  Server_Info_Ptr info = this->repository_.get_server(name);
-  if (! info.null())
-  {
-    if (this->repository_.remove_server (name) == 0)
+  Server_Info_Ptr info = this->repository_.get_server (name);
+  if (! info.null ())
     {
-      if (this->debug_ > 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name));
-
-      PortableServer::POA_var poa = findPOA(name);
-      ACE_CHECK;
-      if (! CORBA::is_nil(poa.in()))
-      {
-        bool etherealize = true;
-        bool wait = false;
-        poa->destroy(etherealize, wait ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-      if (this->debug_ > 0)
-        ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name));
+      if (this->repository_.remove_server (name) == 0)
+        {
+          if (this->debug_ > 1)
+            ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name));
+
+          PortableServer::POA_var poa = findPOA (name);
+          ACE_CHECK;
+          if (! CORBA::is_nil (poa.in ()))
+            {
+              bool etherealize = true;
+              bool wait = false;
+              poa->destroy (etherealize, wait ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          if (this->debug_ > 0)
+            ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name));
+        }
     }
-  }
   else
-  {
-    ACE_ERROR ((LM_ERROR,
-      "ImR: Can't remove unknown server <%s>.\n", name));
-    ACE_THROW (ImplementationRepository::NotFound ());
-  }
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "ImR: Can't remove unknown server <%s>.\n", name));
+      ACE_THROW (ImplementationRepository::NotFound ());
+    }
 }
 
 PortableServer::POA_ptr
-ImR_Locator_i::findPOA(const char* name)
+ImR_Locator_i::findPOA (const char* name)
 {
   ACE_TRY_NEW_ENV
-  {
-    bool activate_it = false;
-    return root_poa_->find_POA(name, activate_it ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      bool activate_it = false;
+      return root_poa_->find_POA (name, activate_it ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHANY
-  {// Ignore
-  }
+    {// Ignore
+    }
   ACE_ENDTRY;
-  return PortableServer::POA::_nil();
+  return PortableServer::POA::_nil ();
 }
 
 void
 ImR_Locator_i::shutdown_server (const char* server ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  ACE_ASSERT(server != 0);
+  ACE_ASSERT (server != 0);
 
   if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down server <%s>.\n", server));
 
-  Server_Info_Ptr info = this->repository_.get_server(server);
-  if (info.null())
-  {
-    ACE_ERROR ((LM_ERROR,
-      "ImR: shutdown_server() Cannot find info for server <%s>\n", server));
-    ACE_THROW(ImplementationRepository::NotFound());
-  }
+  Server_Info_Ptr info = this->repository_.get_server (server);
+  if (info.null ())
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "ImR: shutdown_server () Cannot find info for server <%s>\n", server));
+      ACE_THROW (ImplementationRepository::NotFound ());
+    }
 
-  connect_server(*info);
+  connect_server (*info);
 
-  if (CORBA::is_nil(info->server.in()))
-  {
-    ACE_ERROR ((LM_ERROR,
-      "ImR: shutdown_server() Cannot connect to server <%s>\n", server));
-    ACE_THROW(ImplementationRepository::NotFound());
-  }
+  if (CORBA::is_nil (info->server.in ()))
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "ImR: shutdown_server () Cannot connect to server <%s>\n", server));
+      ACE_THROW (ImplementationRepository::NotFound ());
+    }
 
   ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj = set_timeout_policy(info->server.in(), DEFAULT_SHUTDOWN_TIMEOUT);
-    ImplementationRepository::ServerObject_var server =
-      ImplementationRepository::ServerObject::_unchecked_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
-  {
-    info->reset();
-    int err = this->repository_.update_server(*info);
-    ACE_ASSERT(err == 0);
-    ACE_UNUSED_ARG(err);
-    // Note : This is a good thing. It means we didn't waste our time waiting for
-    // the server to finish shutting down.
-    if (this->debug_ > 1)
     {
-      ACE_DEBUG((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server));
+      CORBA::Object_var obj = set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
+      ImplementationRepository::ServerObject_var server =
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::TIMEOUT, ex)
+    {
+      info->reset ();
+      int err = this->repository_.update_server (*info);
+      ACE_ASSERT (err == 0);
+      ACE_UNUSED_ARG (err);
+      // Note : This is a good thing. It means we didn't waste our time waiting for
+      // the server to finish shutting down.
+      if (this->debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server));
+        }
+      ACE_RE_THROW;
     }
-    ACE_RE_THROW;
-  }
   ACE_CATCHANY
-  {
-    if (this->debug_ > 1)
     {
-      ACE_DEBUG((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server));
+      if (this->debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server));
+        }
     }
-  }
   ACE_ENDTRY;
 
-  // Note : In most cases this has already been done in the server_is_shutting_down()
+  // Note : In most cases this has already been done in the server_is_shutting_down ()
   // operation, but it doesn't hurt to update it again.
-  info->reset();
+  info->reset ();
 
-  int err = this->repository_.update_server(*info);
-  ACE_ASSERT(err == 0);
-  ACE_UNUSED_ARG(err);
+  int err = this->repository_.update_server (*info);
+  ACE_ASSERT (err == 0);
+  ACE_UNUSED_ARG (err);
 }
 
 void
@@ -1019,9 +1020,9 @@ ImR_Locator_i::server_is_running (const char* name,
                                   ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
-  ACE_ASSERT(name != 0);
-  ACE_ASSERT(partial_ior != 0);
-  ACE_ASSERT(! CORBA::is_nil(server));
+  ACE_ASSERT (name != 0);
+  ACE_ASSERT (partial_ior != 0);
+  ACE_ASSERT (! CORBA::is_nil (server));
 
   if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name, partial_ior));
@@ -1030,71 +1031,71 @@ ImR_Locator_i::server_is_running (const char* name,
   ACE_CHECK;
 
   if (this->debug_ > 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name, ior.in()));
+    ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name, ior.in ()));
 
-  Server_Info_Ptr info = this->repository_.get_server(name);
-  if (info.null())
-  {
-    if (this->debug_ > 0)
-      ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%s>.\n", name));
-
-    ImplementationRepository::EnvironmentList env(0);
-    this->repository_.add_server (name,
-      "", // no activator
-      "", // no cmdline
-      ImplementationRepository::EnvironmentList(),
-      "", // no working dir
-      ImplementationRepository::NORMAL,
-      DEFAULT_START_LIMIT,
-      partial_ior,
-      ior.in(),
-      ImplementationRepository::ServerObject::_nil() // Will connect at first access
-      );
-  }
+  Server_Info_Ptr info = this->repository_.get_server (name);
+  if (info.null ())
+    {
+      if (this->debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%s>.\n", name));
+
+      ImplementationRepository::EnvironmentList env (0);
+      this->repository_.add_server (name,
+                                    "", // no activator
+                                    "", // no cmdline
+                                    ImplementationRepository::EnvironmentList (),
+                                    "", // no working dir
+                                    ImplementationRepository::NORMAL,
+                                    DEFAULT_START_LIMIT,
+                                    partial_ior,
+                                    ior.in (),
+                                    ImplementationRepository::ServerObject::_nil () // Will connect at first access
+                                    );
+    }
   else
-  {
-    if (info->activation_mode != ImplementationRepository::PER_CLIENT) {
-      info->ior = ior.in();
-      info->partial_ior = partial_ior;
-      info->server = ImplementationRepository::ServerObject::_nil(); // Will connect at first access
-
-      int err = this->repository_.update_server(*info);
-      ACE_ASSERT(err == 0);
-      ACE_UNUSED_ARG(err);
-
-      waiter_svt_.unblock_one(name, partial_ior, ior.in(), false);
-    } else {
-      // Note : There's no need to unblock all the waiting request until
-      // we know the final status of the server.
-      waiter_svt_.unblock_one(name, partial_ior, ior.in(), true);
+    {
+      if (info->activation_mode != ImplementationRepository::PER_CLIENT) {
+        info->ior = ior.in ();
+        info->partial_ior = partial_ior;
+        info->server = ImplementationRepository::ServerObject::_nil (); // Will connect at first access
+
+        int err = this->repository_.update_server (*info);
+        ACE_ASSERT (err == 0);
+        ACE_UNUSED_ARG (err);
+
+        waiter_svt_.unblock_one (name, partial_ior, ior.in (), false);
+      } else {
+        // Note : There's no need to unblock all the waiting request until
+        // we know the final status of the server.
+        waiter_svt_.unblock_one (name, partial_ior, ior.in (), true);
+      }
     }
-  }
 }
 
 void
 ImR_Locator_i::server_is_shutting_down (const char* server ACE_ENV_ARG_DECL_NOT_USED)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  ACE_ASSERT(server != 0);
-  Server_Info_Ptr info = this->repository_.get_server(server);
-  if (info.null())
-  {
-    if (this->debug_ > 1)
+  ACE_ASSERT (server != 0);
+  Server_Info_Ptr info = this->repository_.get_server (server);
+  if (info.null ())
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server));
+      if (this->debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server));
+        }
+      return;
     }
-    return;
-  }
 
   if (this->debug_ > 0)
-    ACE_DEBUG((LM_DEBUG, "ImR: Server <%s> is shutting down.\n", server));
+    ACE_DEBUG ((LM_DEBUG, "ImR: Server <%s> is shutting down.\n", server));
 
-  info->reset();
+  info->reset ();
 
-  int err = this->repository_.update_server(*info);
-  ACE_ASSERT(err == 0);
-  ACE_UNUSED_ARG(err);
+  int err = this->repository_.update_server (*info);
+  ACE_ASSERT (err == 0);
+  ACE_UNUSED_ARG (err);
 }
 
 void
@@ -1103,22 +1104,22 @@ ImR_Locator_i::find (const char* server,
                      ACE_ENV_ARG_DECL)
                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_ASSERT(server != 0);
+  ACE_ASSERT (server != 0);
   ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
 
-  Server_Info_Ptr info = this->repository_.get_server(server);
-  if (! info.null())
-  {
-  imr_info = info->createImRServerInfo(ACE_ENV_SINGLE_ARG_PARAMETER);
+  Server_Info_Ptr info = this->repository_.get_server (server);
+  if (! info.null ())
+    {
+      imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  if (this->debug_ > 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server));
-}
+      if (this->debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server));
+    }
   else
-  {
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Cannot find server <%s>\n", server));
-  }
+    {
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%s>\n", server));
+    }
 }
 
 void
@@ -1133,400 +1134,405 @@ ImR_Locator_i::list (CORBA::ULong how_many,
 
   // Initialize the out variables, so if we return early, they will
   // not be dangling.
-  server_iterator = ImplementationRepository::ServerInformationIterator::_nil();
+  server_iterator = ImplementationRepository::ServerInformationIterator::_nil ();
   ACE_NEW_THROW_EX (server_list,
-    ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
+                    ImplementationRepository::ServerInformationList (0), CORBA::NO_MEMORY ());
 
   Locator_Repository::SIMap::ENTRY* entry = 0;
-  Locator_Repository::SIMap::ITERATOR it(this->repository_.servers());
+  Locator_Repository::SIMap::ITERATOR it (this->repository_.servers ());
 
   // Number of servers that will go into the server_list.
-  CORBA::ULong n = this->repository_.servers().current_size();
+  CORBA::ULong n = this->repository_.servers ().current_size ();
   if (how_many > 0 && n > how_many)
-  {
-    n = how_many;
-  }
+    {
+      n = how_many;
+    }
 
-  server_list->length(n);
+  server_list->length (n);
 
   if (this->debug_ > 1)
     ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Filling ServerList with %d servers\n", n));
 
   for (CORBA::ULong i = 0; i < n; i++)
-  {
-    it.next(entry);
-    it.advance();
-    ACE_ASSERT(entry != 0);
+    {
+      it.next (entry);
+      it.advance ();
+      ACE_ASSERT (entry != 0);
 
-    Server_Info_Ptr info = entry->int_id_;
+      Server_Info_Ptr info = entry->int_id_;
 
-    ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo(ACE_ENV_SINGLE_ARG_PARAMETER);
-    server_list[i] = *imr_info;
-  }
+      ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
+      server_list[i] = *imr_info;
+    }
 
-  if (this->repository_.servers().current_size() > n)
-  {
-    if (this->debug_ > 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Creating ServerInformation Iterator\n"));
+  if (this->repository_.servers ().current_size () > n)
+    {
+      if (this->debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Creating ServerInformation Iterator\n"));
 
-    ImR_Iterator* imr_iter;
+      ImR_Iterator* imr_iter;
 
-    ACE_NEW_THROW_EX (imr_iter,
-      ImR_Iterator (n, this->repository_, this->imr_poa_.in()),
-      CORBA::NO_MEMORY ());
+      ACE_NEW_THROW_EX (imr_iter,
+                        ImR_Iterator (n, this->repository_, this->imr_poa_.in ()),
+                        CORBA::NO_MEMORY ());
 
-    PortableServer::ServantBase_var tmp(imr_iter);
+      PortableServer::ServantBase_var tmp (imr_iter);
 
-    ACE_TRY
-    {
-      PortableServer::ObjectId_var id =
-        this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var obj = this->imr_poa_->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      server_iterator = ImplementationRepository::
-        ServerInformationIterator::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-    ACE_CATCHANY
-    {
-      ACE_RE_THROW;
+      ACE_TRY
+        {
+          PortableServer::ObjectId_var id =
+            this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          server_iterator = ImplementationRepository::
+            ServerInformationIterator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
 }
 
 Activator_Info_Ptr
 ImR_Locator_i::get_activator (const ACE_CString& aname)
 {
   Activator_Info_Ptr info = this->repository_.get_activator (aname);
-  if (! info.null())
-  {
-    this->connect_activator (*info);
-  }
+  if (! info.null ())
+    {
+      this->connect_activator (*info);
+    }
   return info;
 }
 
 void
 ImR_Locator_i::connect_activator (Activator_Info& info)
 {
-  if (! CORBA::is_nil(info.activator.in()) || info.ior.length() == 0)
+  if (! CORBA::is_nil (info.activator.in ()) || info.ior.length () == 0)
     return;
 
   ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj =
-      this->orb_->string_to_object (info.ior.c_str()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (CORBA::is_nil(obj.in()))
     {
-      info.reset();
-      return;
-    }
+      CORBA::Object_var obj =
+        this->orb_->string_to_object (info.ior.c_str ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (startup_timeout_ > ACE_Time_Value::zero)
-    {
-      obj = set_timeout_policy(obj.in(), startup_timeout_);
-    }
+      if (CORBA::is_nil (obj.in ()))
+        {
+          info.reset ();
+          return;
+        }
 
-    info.activator =
-      ImplementationRepository::Activator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      if (startup_timeout_ > ACE_Time_Value::zero)
+        {
+          obj = set_timeout_policy (obj.in (), startup_timeout_);
+        }
 
-    if (CORBA::is_nil(info.activator.in()))
-    {
-      info.reset();
-      return;
-    }
+      info.activator =
+        ImplementationRepository::Activator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str()));
-  }
+      if (CORBA::is_nil (info.activator.in ()))
+        {
+          info.reset ();
+          return;
+        }
+
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str ()));
+    }
   ACE_CATCHANY
-  {
-    info.reset();
-  }
+    {
+      info.reset ();
+    }
   ACE_ENDTRY;
 }
 
 void
-ImR_Locator_i::auto_start_servers(ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->repository_.servers().current_size() == 0)
+  if (this->repository_.servers ().current_size () == 0)
     return;
 
   Locator_Repository::SIMap::ENTRY* server_entry;
-  Locator_Repository::SIMap::ITERATOR server_iter(this->repository_.servers());
+  Locator_Repository::SIMap::ITERATOR server_iter (this->repository_.servers ());
 
   // For each of the entries in the Locator_Repository, get the startup
   // information and activate the servers, if they are not already
   // running.
-  for (;server_iter.next(server_entry) != 0; server_iter.advance())
-  {
-    Server_Info_Ptr info = server_entry->int_id_;
-    ACE_ASSERT(! info.null());
-
-    ACE_TRY
+  for (;server_iter.next (server_entry) != 0; server_iter.advance ())
     {
-      if (info->activation_mode == ImplementationRepository::AUTO_START
-        && info->cmdline.length() > 0)
-      {
-        this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    }
-    ACE_CATCHANY
-    {
-      if (this->debug_ > 1)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-          "ImR: AUTO_START Could not activate <%s>\n",
-          server_entry->ext_id_.c_str ()));
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
-      }
-      // Ignore exceptions
+      Server_Info_Ptr info = server_entry->int_id_;
+      ACE_ASSERT (! info.null ());
+
+      ACE_TRY
+        {
+          if (info->activation_mode == ImplementationRepository::AUTO_START
+              && info->cmdline.length () > 0)
+            {
+              this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+        }
+      ACE_CATCHANY
+        {
+          if (this->debug_ > 1)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "ImR: AUTO_START Could not activate <%s>\n",
+                          server_entry->ext_id_.c_str ()));
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
+            }
+          // Ignore exceptions
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
 }
 
 void
-ImR_Locator_i::connect_server(Server_Info& info)
+ImR_Locator_i::connect_server (Server_Info& info)
 {
-  if (! CORBA::is_nil(info.server.in()))
-  {
-    return; // already connected
-  }
+  if (! CORBA::is_nil (info.server.in ()))
+    {
+      return; // already connected
+    }
 
-  if (info.ior.length() == 0)
-  {
-    info.reset();
-    return; // can't connect
-  }
+  if (info.ior.length () == 0)
+    {
+      info.reset ();
+      return; // can't connect
+    }
 
   ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (CORBA::is_nil(obj.in()))
     {
-      info.reset();
-      return;
-    }
+      CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    obj = set_timeout_policy(obj.in(), DEFAULT_SERVER_TIMEOUT);
+      if (CORBA::is_nil (obj.in ()))
+        {
+          info.reset ();
+          return;
+        }
 
-    info.server =
-      ImplementationRepository::ServerObject::_unchecked_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      obj = set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
 
-    if (CORBA::is_nil(info.server.in()))
-    {
-      info.reset();
-      return;
-    }
+      info.server =
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (debug_ > 1)
-      ACE_DEBUG((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str()));
-  }
+      if (CORBA::is_nil (info.server.in ()))
+        {
+          info.reset ();
+          return;
+        }
+
+      if (debug_ > 1)
+        ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str ()));
+    }
   ACE_CATCHANY
-  {
-    info.reset();
-  }
+    {
+      info.reset ();
+    }
   ACE_ENDTRY;
 }
 
 bool
-ImR_Locator_i::is_alive(Server_Info& info)
+ImR_Locator_i::is_alive (Server_Info& info)
 {
-  for (size_t i = 0; i < sizeof(PING_RETRY_SCHEDULE) + 1; ++i)
-  {
-    int status = this->is_alive_i(info);
-    if (status == 0)
-      return false;
-    if (status == 1)
-      return true;
-
-    // This is evil, but there's not much else we can do for now. We should never
-    // reach this code once the ImR Servers are fixed so that they don't lie about
-    // server_is_running. Currently, they send this notification during poa creation.
-    // We have to run the orb, because the very thing that may be slowing the
-    // aliveness of the servers is the fact that they're trying to register more
-    // objects with us.
-    // In practical testing, we never retried the ping more than once, because
-    // the second ping always timed out, even if the servers poa manager had
-    // not been activated. The only way we saw multiple retries was if we ran
-    // the orb on the server before the poa manager was activated.
-    // For this reason, the first retry is immediate, and the orb->run() call
-    // is not required. The call will likely timeout, and is_alive will return true.
-    if (PING_RETRY_SCHEDULE[i] > 0)
-    {
-      ACE_Time_Value tv(0, PING_RETRY_SCHEDULE[i] * 1000);
-      this->orb_->run(tv);
+  const size_t table_size = sizeof (PING_RETRY_SCHEDULE) /
+                            sizeof (*PING_RETRY_SCHEDULE);
+
+  for (size_t i = 0; i < table_size; ++i)
+    {
+      int status = this->is_alive_i (info);
+      if (status == 0)
+        return false;
+      if (status == 1)
+        return true;
+
+      // This is evil, but there's not much else we can do for now. We
+      // should never reach this code once the ImR Servers are fixed
+      // so that they don't lie about server_is_running. Currently,
+      // they send this notification during poa creation.  We have to
+      // run the orb, because the very thing that may be slowing the
+      // aliveness of the servers is the fact that they're trying to
+      // register more objects with us.  In practical testing, we
+      // never retried the ping more than once, because the second
+      // ping always timed out, even if the servers poa manager had
+      // not been activated. The only way we saw multiple retries was
+      // if we ran the orb on the server before the poa manager was
+      // activated.  For this reason, the first retry is immediate,
+      // and the orb->run () call is not required. The call will
+      // likely timeout, and is_alive will return true.
+      if (PING_RETRY_SCHEDULE[i] > 0)
+        {
+          ACE_Time_Value tv (0, PING_RETRY_SCHEDULE[i] * 1000);
+          this->orb_->run (tv);
+        }
     }
-  }
   if (debug_ > 0)
-  {
-    ACE_DEBUG((LM_DEBUG,
-      "ImR: <%s> Ping retry count exceeded. alive=maybe.\n", info.name.c_str()));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "ImR: <%s> Ping retry count exceeded. alive=maybe.\n", info.name.c_str ()));
+    }
   // We return true here, because the server *might* be alive, it's just not starting in a timely
   // manner. We can't return false, because then we'll just try to start another instance, and the
   // same thing will likely happen.
-  info.last_ping = ACE_OS::gettimeofday();
+  info.last_ping = ACE_OS::gettimeofday ();
   return true;
 }
 
 int
-ImR_Locator_i::is_alive_i(Server_Info& info)
+ImR_Locator_i::is_alive_i (Server_Info& info)
 {
   // This is used by the ACE_TRY below when exceptions are turned off.
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  if (info.ior.length() == 0 || info.partial_ior.length() == 0)
-  {
-    if (debug_ > 1)
+  if (info.ior.length () == 0 || info.partial_ior.length () == 0)
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> not running. alive=false.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> not running. alive=false.\n", info.name.c_str ()));
+        }
+      info.last_ping = ACE_Time_Value::zero;
+      return 0;
     }
-    info.last_ping = ACE_Time_Value::zero;
-    return 0;
-  }
 
   if (ping_interval_ == ACE_Time_Value::zero)
-  {
-    if (debug_ > 1)
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str ()));
+        }
+      return 1;
     }
-    return 1;
-  }
 
-  if ((ACE_OS::gettimeofday() - info.last_ping) < ping_interval_)
-  {
-    if (debug_ > 1)
+  if ((ACE_OS::gettimeofday () - info.last_ping) < ping_interval_)
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str ()));
+        }
+      return 1;
     }
-    return 1;
-  }
 
   // If we don't have enough information to start the server if it isn't already
   // then we might as well assume it is running. That way the client can get the
   // status directly from the server.
-  if (info.cmdline.length() == 0 || ! repository_.has_activator(info.activator))
-  {
-    if (debug_ > 1)
+  if (info.cmdline.length () == 0 || ! repository_.has_activator (info.activator))
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str ()));
+        }
+      return 1;
     }
-    return 1;
-  }
 
-  connect_server(info);
+  connect_server (info);
 
-  if (CORBA::is_nil (info.server.in()))
-  {
-    if (debug_ > 1)
+  if (CORBA::is_nil (info.server.in ()))
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str ()));
+        }
+      return 0;
     }
-    return 0;
-  }
 
   ACE_TRY
-  {
-    // Make a copy, in case the info is updated during the ping.
-    ImplementationRepository::ServerObject_var server = info.server;
+    {
+      // Make a copy, in case the info is updated during the ping.
+      ImplementationRepository::ServerObject_var server = info.server;
 
-    // This will timeout if it takes too long
-    server->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      // This will timeout if it takes too long
+      server->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (debug_ > 1)
-    {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> Ping successful. alive=true\n", info.name.c_str()));
-    }
-    info.last_ping = ACE_OS::gettimeofday();
-  }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
-  {
-    const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80;
-    switch (ex.minor() & BITS_5_THRU_12_MASK)
-    {
-    case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
-      {
-        if (debug_ > 1)
-        {
-          ACE_DEBUG((LM_DEBUG,
-            "ImR: <%s> Local TRANSIENT. alive=false.\n", info.name.c_str()));
-        }
-      }
-      info.last_ping = ACE_Time_Value::zero;
-      return 0;
-    case TAO_POA_DISCARDING:
-    case TAO_POA_HOLDING:
-      {
-        if (debug_ > 1)
+      if (debug_ > 1)
         {
-          ACE_DEBUG((LM_DEBUG,
-            "ImR: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> Ping successful. alive=true\n", info.name.c_str ()));
         }
-      }
-      return -1; // We keep trying to ping, because returning 1 now, would just lead
-      // to clients getting the same exception. If we can't ping after several
-      // attempts, then we'll give up and return 1, letting the client worry about it.
-    default:
-      {
-        if (debug_ > 1)
+      info.last_ping = ACE_OS::gettimeofday ();
+    }
+  ACE_CATCH (CORBA::TRANSIENT, ex)
+    {
+      const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80;
+      switch (ex.minor () & BITS_5_THRU_12_MASK)
         {
-          ACE_DEBUG((LM_DEBUG,
-            "ImR: <%s> TRANSIENT exception. alive=false.\n", info.name.c_str()));
-        }
+        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+          {
+            if (debug_ > 1)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                            "ImR: <%s> Local TRANSIENT. alive=false.\n", info.name.c_str ()));
+              }
+          }
         info.last_ping = ACE_Time_Value::zero;
-      }
-      return 0;
+        return 0;
+        case TAO_POA_DISCARDING:
+        case TAO_POA_HOLDING:
+          {
+            if (debug_ > 1)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                            "ImR: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str ()));
+              }
+          }
+        return -1; // We keep trying to ping, because returning 1 now, would just lead
+        // to clients getting the same exception. If we can't ping after several
+        // attempts, then we'll give up and return 1, letting the client worry about it.
+        default:
+          {
+            if (debug_ > 1)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                            "ImR: <%s> TRANSIENT exception. alive=false.\n", info.name.c_str ()));
+              }
+            info.last_ping = ACE_Time_Value::zero;
+          }
+        return 0;
+        }
     }
-  }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
-  {
-    if (debug_ > 1)
+  ACE_CATCH (CORBA::TIMEOUT, ex)
     {
-      ACE_DEBUG((LM_DEBUG,
-        "ImR: <%s> Ping timed out. alive=true.\n", info.name.c_str()));
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ImR: <%s> Ping timed out. alive=true.\n", info.name.c_str ()));
+        }
+      return 1; // This is "alive" as far as we're concerned. Presumably the client
+      // will have a less stringent timeout policy, or will want to know
+      // about the timeout. In any case, we're only guaranteeing that the
+      // server is alive, not that it's responsive.
     }
-    return 1; // This is "alive" as far as we're concerned. Presumably the client
-    // will have a less stringent timeout policy, or will want to know
-    // about the timeout. In any case, we're only guaranteeing that the
-    // server is alive, not that it's responsive.
-  }
   ACE_CATCHANY
-  {
-    if (debug_ > 1)
     {
-      ACE_DEBUG((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str()));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\n");
+      if (debug_ > 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str ()));
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\n");
+        }
+      info.last_ping = ACE_Time_Value::zero;
+      return false;
     }
-    info.last_ping = ACE_Time_Value::zero;
-    return false;
-  }
   ACE_ENDTRY;
   return 1;
 }
 
 int
-ImR_Locator_i::debug() const
+ImR_Locator_i::debug () const
 {
   return debug_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 0953931eca8..7dd3033bcbc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -22,7 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class INS_Locator;
 
 // Gets a request from a client and depending on the POA name,
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 3649e86daad..7246a1dcd86 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client {
+project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client, tao_versioning_idl_defaults {
   sharedname = TAO_ImR_Activator_IDL
   dynamicflags = ACTIVATOR_IDL_BUILD_DLL
   idlflags += -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h
@@ -16,7 +16,7 @@ project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client {
   }
 }
 
-project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_client, messaging {
+project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_client, messaging, tao_versioning_idl_defaults {
   sharedname   = TAO_ImR_Locator_IDL
   after       += ImR_Activator_IDL
   libs        += TAO_ImR_Activator_IDL
@@ -45,7 +45,7 @@ project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_
   }
 }
 
-project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, portableserver, imr_client {
+project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, portableserver, imr_client, messaging, pi, codecfactory {
   sharedname   = TAO_ImR_Activator
   dynamicflags = ACTIVATOR_BUILD_DLL
   after       += ImR_Activator_IDL ImR_Locator_IDL
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 4afae0cfc76..1ed369991c2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -30,49 +30,49 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
 
   Locator_Repository::SIMap::ENTRY* entry = 0;
-  Locator_Repository::SIMap::ITERATOR it(this->repo_.servers());
+  Locator_Repository::SIMap::ITERATOR it (this->repo_.servers ());
 
   // Number of servers that will go into the server_list.
   CORBA::ULong n = this->repo_.servers().current_size();
   if (n <= this->count_)
-  {
-    return 0; // We already finished.
-  }
+    {
+      return 0; // We already finished.
+    }
   else
-  {
-    n -= this->count_;
-  }
+    {
+      n -= this->count_;
+    }
 
   if (how_many > 0 && n > how_many)
-  {
-    n = how_many;
+    {
+      n = how_many;
   }
 
-  server_list->length(n);
+  server_list->length (n);
 
   CORBA::ULong i = 0;
   for (; i < this->count_; ++i)
-  {
-    it.advance();
-  }
+    {
+      it.advance ();
+    }
 
   for (i = 0; i < n; ++i)
-  {
-    it.next(entry);
-    it.advance();
-    ACE_ASSERT(entry != 0);
-
-    Server_Info_Ptr info = entry->int_id_;
-
-    server_list[i].server = info->name.c_str();
-    server_list[i].startup.command_line = info->cmdline.c_str();
-    server_list[i].startup.environment = info->env_vars;
-    server_list[i].startup.working_directory = info->dir.c_str();
-    server_list[i].startup.activation = info->activation_mode;
-    server_list[i].startup.activator = info->activator.c_str();
-    server_list[i].startup.start_limit = info->start_limit;
-    server_list[i].partial_ior = info->partial_ior.c_str();
-  }
+    {
+      it.next (entry);
+      it.advance ();
+      ACE_ASSERT(entry != 0);
+
+      Server_Info_Ptr info = entry->int_id_;
+
+      server_list[i].server = info->name.c_str ();
+      server_list[i].startup.command_line = info->cmdline.c_str ();
+      server_list[i].startup.environment = info->env_vars;
+      server_list[i].startup.working_directory = info->dir.c_str ();
+      server_list[i].startup.activation = info->activation_mode;
+      server_list[i].startup.activator = info->activator.c_str ();
+      server_list[i].startup.start_limit = info->start_limit;
+      server_list[i].partial_ior = info->partial_ior.c_str ();
+    }
 
   this->count_ += n;
 
@@ -84,7 +84,7 @@ void
 ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = poa_->servant_to_id(this ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var oid = poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index 9811c2be488..be8dd5e0e1f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -4,23 +4,24 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Task.h"
 
-class ImR_Locator_ORB_Runner : public ACE_Task_Base 
+class ImR_Locator_ORB_Runner : public ACE_Task_Base
 {
-  ImR_Locator_Loader& service_;
 public:
-  ImR_Locator_ORB_Runner(ImR_Locator_Loader& service)
-    : service_(service)
+  ImR_Locator_ORB_Runner (ImR_Locator_Loader& service)
+    : service_ (service)
   {
   }
-  virtual int svc() 
+  virtual int svc ()
   {
-    // Block until service_.fini() calls orb->destroy()
-    this->service_.run();
+    // Block until service_.fini () calls orb->destroy ()
+    this->service_.run ();
     return 0;
   }
+private:
+  ImR_Locator_Loader& service_;
 };
 
-ImR_Locator_Loader::ImR_Locator_Loader() 
+ImR_Locator_Loader::ImR_Locator_Loader()
 {
 }
 
@@ -30,19 +31,19 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int err = this->opts_.init(argc, argv);
-      if (err != 0) 
+      int err = this->opts_.init (argc, argv);
+      if (err != 0)
         return -1;
 
-      err = this->service_.init(this->opts_ ACE_ENV_ARG_PARAMETER);
+      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (err != 0)
         return -1;
 
       // Create a thread in which to run the service
-      ACE_ASSERT(this->runner_.get() == 0);
-      this->runner_.reset(new ImR_Locator_ORB_Runner(*this));
-      this->runner_->activate();
+      ACE_ASSERT(this->runner_.get () == 0);
+      this->runner_.reset(new ImR_Locator_ORB_Runner (*this));
+      this->runner_->activate ();
     }
   ACE_CATCHANY
     {
@@ -55,20 +56,20 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 int
 ImR_Locator_Loader::fini (void)
 {
-  ACE_ASSERT(this->runner_.get() != 0);
+  ACE_ASSERT(this->runner_.get () != 0);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    int ret = this->service_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    this->runner_->wait();
-    this->runner_.reset(0);
-    return ret;
-  }
+      this->runner_->wait ();
+      this->runner_.reset (0);
+      return ret;
+    }
   ACE_CATCHANY
-  {
-  }
+    {
+    }
   ACE_ENDTRY;
   return -1;
 }
@@ -80,7 +81,7 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
                                   ACE_ENV_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), CORBA::Object::_nil());
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), CORBA::Object::_nil ());
 }
 
 int
@@ -88,17 +89,16 @@ ImR_Locator_Loader::run(void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    return this->service_.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
+    {
+      return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
-    return -1;
-  }
+    {
+      ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner ()\n"));
+      return -1;
+    }
   ACE_ENDTRY;
-  return 0;
 }
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index dc44718b2ba..ca90c61c6fb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -1,4 +1,7 @@
+// -*- C++ -*-
+//
 // $Id$
+
 #ifndef TAO_IMR_LOCATOR_LOADER_H
 #define TAO_IMR_LOCATOR_LOADER_H
 
@@ -29,7 +32,7 @@ public:
                                            ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
- // Unlike other service objects, we have our own orb. 
+ // Unlike other service objects, we have our own orb.
  int run(void);
 
 private:
@@ -37,8 +40,9 @@ private:
   Options opts_;
   ACE_Auto_Ptr<ImR_Locator_ORB_Runner> runner_;
 private:
-  ACE_UNIMPLEMENTED_FUNC (ImR_Locator_Loader (const ImR_Locator_Loader &))
-  ACE_UNIMPLEMENTED_FUNC (ImR_Locator_Loader &operator = (const ImR_Locator_Loader &))
+  // Disallow copying and assignment.
+  ImR_Locator_Loader (const ImR_Locator_Loader &);
+  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &);
 };
 
 ACE_FACTORY_DECLARE (Locator, ImR_Locator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 8cc1728b610..e13a4f8080f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -62,11 +62,11 @@ Locator_NT_Service::svc (void)
   ImR_Locator_i server;
   Options opts;
 
-  if (opts.init_from_registry() != 0)
-  {
-    report_status (SERVICE_STOPPED);
-    return -1;
-  }
+  if (opts.init_from_registry () != 0)
+    {
+      report_status (SERVICE_STOPPED);
+      return -1;
+    }
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index b99f1e3477e..cdd4d0939ee 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -62,20 +62,20 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
 
           if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("install")) == 0)
-          {
-            this->service_command_ = SC_INSTALL;
-          }
+            {
+              this->service_command_ = SC_INSTALL;
+            }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("remove")) == 0)
-          {
-            this->service_command_ = SC_REMOVE;
-          }
+            {
+              this->service_command_ = SC_REMOVE;
+            }
           else
-          {
-            ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
-            this->print_usage ();
-            return -1;
-          }
+            {
+              ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
+              this->print_usage ();
+              return -1;
+            }
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
@@ -215,21 +215,22 @@ Options::init (int argc, ACE_TCHAR *argv[])
   // This may also run the commands to install or remove the nt service.
   int result = this->parse_args (argc, argv);
   if (result != 0)
-  {
-    return result;
-  }
+    {
+      return result;
+    }
 
   for (int i = 0; i < argc; ++i)
   {
     this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" ");
   }
+
   return 0;
 }
 
 int
 Options::init_from_registry (void)
 {
-  this->load_registry_options();
+  this->load_registry_options ();
   return 0;
 }
 
@@ -256,7 +257,7 @@ Options::print_usage (void) const
 }
 
 int
-Options::save_registry_options()
+Options::save_registry_options ()
 {
 #if defined (ACE_WIN32)
   HKEY key = 0;
@@ -271,6 +272,7 @@ Options::save_registry_options()
                              &key,
                              NULL
                              );
+
   if (err != ERROR_SUCCESS) {
     return -1;
   }
@@ -296,27 +298,31 @@ Options::save_registry_options()
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   tmp = this->readonly_ ? 1 : 0;
+
   err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Lock"), 0, REG_DWORD,
     (LPBYTE) &tmp, sizeof(DWORD));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   tmp = this->repo_mode_;
+
   err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistType"), 0, REG_DWORD,
     (LPBYTE) &tmp, sizeof(DWORD));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   tmp = this->startup_timeout_.sec();
+
   err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Timeout"), 0, REG_DWORD,
     (LPBYTE) &tmp, sizeof(DWORD));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   tmp = multicast_ ? 1 : 0;
+
   err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Multicast"), 0, REG_DWORD,
     (LPBYTE) &tmp, sizeof(DWORD));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ::RegCloseKey(key);
-  ACE_ASSERT(err == ERROR_SUCCESS);
+  err = ::RegCloseKey (key);
+  ACE_ASSERT (err == ERROR_SUCCESS);
 #endif
   return 0;
 }
@@ -333,91 +339,110 @@ Options::load_registry_options ()
                              KEY_READ,
                              &key
                              );
-  if (err != ERROR_SUCCESS) {
-    // If there aren't any saved parameters, then that's ok.
-    return 0;
-  }
+  if (err != ERROR_SUCCESS)
+    {
+      // If there aren't any saved parameters, then that's ok.
+      return 0;
+    }
   ACE_TCHAR tmpstr[4096];
-  DWORD sz = sizeof(tmpstr);
+  DWORD sz = sizeof (tmpstr);
   DWORD type = 0;
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type,
-    (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz - 1] = '\0';
-    this->cmdline_ = tmpstr;
-  }
+                                 (LPBYTE) tmpstr, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_SZ);
+      tmpstr[sz - 1] = '\0';
+      this->cmdline_ = tmpstr;
+    }
 
   sz = sizeof(tmpstr);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type,
-    (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz - 1] = '\0';
-    this->ior_output_file_ = tmpstr;
-  }
+                                 (LPBYTE) tmpstr, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_SZ);
+      tmpstr[sz - 1] = '\0';
+      this->ior_output_file_ = tmpstr;
+    }
 
   sz = sizeof(debug_);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type,
-    (LPBYTE) &this->debug_ , &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-  }
+                                 (LPBYTE) &this->debug_ , &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+    }
 
   DWORD tmp = 0;
   sz = sizeof(tmp);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PingInterval"), 0, &type,
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    ping_interval_.msec(tmp);
-  }
+                                 (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+      ping_interval_.msec (tmp);
+    }
 
   tmp = 0;
   sz = sizeof(tmp);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Lock"), 0, &type,
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    readonly_ = tmp != 0;
-  }
+                                 (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+      readonly_ = tmp != 0;
+    }
 
   sz = sizeof(this->repo_mode_);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type,
-    (LPBYTE) &this->repo_mode_, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-  }
+                                 (LPBYTE) &this->repo_mode_, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+    }
 
   tmp = 0;
   sz = sizeof(tmp);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Timeout"), 0, &type,
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    this->startup_timeout_.sec(tmp);
-  }
+                                 (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+      this->startup_timeout_.sec (tmp);
+    }
 
   tmp = 0;
   sz = sizeof(tmp);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Multicast"), 0, &type,
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    this->multicast_ = tmp != 0;
-  }
+                                 (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_DWORD);
+      this->multicast_ = tmp != 0;
+    }
 
   sz = sizeof(tmpstr);
+
   err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistFile"), 0, &type,
-    (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz - 1] = '\0';
-    this->persist_file_name_ = tmpstr;
-  }
+                                 (LPBYTE) tmpstr, &sz);
+  if (err == ERROR_SUCCESS)
+    {
+      ACE_ASSERT (type == REG_SZ);
+      tmpstr[sz - 1] = '\0';
+      this->persist_file_name_ = tmpstr;
+    }
 
-  err = ::RegCloseKey(key);
-  ACE_ASSERT(err == ERROR_SUCCESS);
+  err = ::RegCloseKey (key);
+  ACE_ASSERT (err == ERROR_SUCCESS);
 #endif
   return 0;
 }
@@ -491,4 +516,3 @@ Options::readonly (void) const
 {
   return this->readonly_;
 }
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 9fb3b25183f..fbbd9077915 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -127,7 +127,7 @@ private:
 
   /// The amount of time between successive "are you started yet?" pings.
   ACE_Time_Value ping_interval_;
- 
+
   /// The amount of time to wait for a server to response after starting it.
   ACE_Time_Value startup_timeout_;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 31cb10005ae..a125cf0fd53 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -27,18 +27,20 @@ static const ACE_TCHAR* TOKEN = ACE_TEXT("Token");
 static const ACE_TCHAR* WIN32_REG_KEY = ACE_TEXT("Software\\TAO\\ImplementationRepository");
 #endif
 
-static ACE_CString lcase(const ACE_CString& s) {
+static ACE_CString lcase (const ACE_CString& s)
+{
   ACE_CString ret(s);
-  for (size_t i = 0; i < ret.length(); ++i) {
-    ret[i] = static_cast<char>(ACE_OS::ace_tolower(s[i]));
-  }
+  for (size_t i = 0; i < ret.length (); ++i)
+    {
+      ret[i] = static_cast<char>(ACE_OS::ace_tolower (s[i]));
+    }
   return ret;
 }
 
-static void loadActivatorsAsBinary(ACE_Configuration& config, Locator_Repository::AIMap& map)
+static void loadActivatorsAsBinary (ACE_Configuration& config, Locator_Repository::AIMap& map)
 {
   ACE_Configuration_Section_Key root;
-  int err = config.open_section(config.root_section(), ACTIVATORS_ROOT_KEY, 0, root);
+  int err = config.open_section (config.root_section (), ACTIVATORS_ROOT_KEY, 0, root);
   if (err == 0)
   {
     int index = 0;
@@ -58,7 +60,7 @@ static void loadActivatorsAsBinary(ACE_Configuration& config, Locator_Repository
 
       ACE_CString name2(ACE_TEXT_TO_CHAR_IN(name.fast_rep()));
       Activator_Info_Ptr info(new Activator_Info(
-                            name2, 
+                            name2,
                             token,
                             ACE_TEXT_TO_CHAR_IN(ior.fast_rep())));
       map.bind (lcase(name2), info);
@@ -70,7 +72,7 @@ static void loadActivatorsAsBinary(ACE_Configuration& config, Locator_Repository
 static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::SIMap& map)
 {
   ACE_Configuration_Section_Key root;
-  int err = config.open_section(config.root_section(), SERVERS_ROOT_KEY, 0, root);
+  int err = config.open_section (config.root_section (), SERVERS_ROOT_KEY, 0, root);
   if (err == 0)
   {
     int index = 0;
@@ -104,13 +106,13 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S
 
       ACE_CString name2(ACE_TEXT_TO_CHAR_IN(name.fast_rep()));
       Server_Info_Ptr info(new Server_Info(
-              name2, 
-              ACE_TEXT_TO_CHAR_IN(aname.fast_rep()), 
+              name2,
+              ACE_TEXT_TO_CHAR_IN(aname.fast_rep()),
               ACE_TEXT_TO_CHAR_IN(cmdline.fast_rep()),
-              env_vars, 
-              ACE_TEXT_TO_CHAR_IN(dir.fast_rep()), 
-              amode, start_limit, 
-              ACE_TEXT_TO_CHAR_IN(partial_ior.fast_rep()), 
+              env_vars,
+              ACE_TEXT_TO_CHAR_IN(dir.fast_rep()),
+              amode, start_limit,
+              ACE_TEXT_TO_CHAR_IN(partial_ior.fast_rep()),
               ACE_TEXT_TO_CHAR_IN(ior.fast_rep())));
       map.bind (name2, info);
       index++;
@@ -118,59 +120,61 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S
   }
 }
 
-static void loadAsBinary(ACE_Configuration& config, Locator_Repository& repo)
+static void loadAsBinary (ACE_Configuration& config, Locator_Repository& repo)
 {
-  loadServersAsBinary(config, repo.servers());
-  loadActivatorsAsBinary(config, repo.activators());
+  loadServersAsBinary (config, repo.servers ());
+  loadActivatorsAsBinary (config, repo.activators ());
 }
 
 // Note : There is no saveAsBinary(), because the ACE_Configuration class
 // supports saving of individual entries.
 
-static void convertEnvList(const Locator_XMLHandler::EnvList& in, ImplementationRepository::EnvironmentList& out)
+static void convertEnvList (const Locator_XMLHandler::EnvList& in, ImplementationRepository::EnvironmentList& out)
 {
-  CORBA::ULong sz = in.size();
-  out.length(sz);
+  CORBA::ULong sz = in.size ();
+  out.length (sz);
   for (CORBA::ULong i = 0; i < sz; ++i)
-  {
-    out[i].name = in[i].name.c_str();
-    out[i].value = in[i].value.c_str();
-  }
+    {
+      out[i].name = in[i].name.c_str ();
+      out[i].value = in[i].value.c_str ();
+    }
 }
 
-class Server_Repo_XML_Callback : public Locator_XMLHandler::Callback {
-  Locator_Repository& repo_;
+class Server_Repo_XML_Callback : public Locator_XMLHandler::Callback
+{
 public:
   Server_Repo_XML_Callback(Locator_Repository& repo)
-    : repo_(repo)
+    : repo_ (repo)
   {
   }
-  virtual void next_server(const ACE_CString& name,
+  virtual void next_server (const ACE_CString& name,
     const ACE_CString& aname, const ACE_CString& cmdline,
     const Locator_XMLHandler::EnvList& envlst, const ACE_CString& dir,
     const ACE_CString& amodestr, int start_limit,
     const ACE_CString& partial_ior, const ACE_CString& ior)
   {
     ImplementationRepository::ActivationMode amode =
-      ImR_Utils::parseActivationMode(amodestr);
+      ImR_Utils::parseActivationMode (amodestr);
 
     ImplementationRepository::EnvironmentList env_vars;
-    convertEnvList(envlst, env_vars);
+    convertEnvList (envlst, env_vars);
 
     int limit = start_limit < 1 ? 1 : start_limit;
 
-    Server_Info_Ptr si(new Server_Info(name, aname, cmdline,
+    Server_Info_Ptr si (new Server_Info (name, aname, cmdline,
       env_vars, dir, amode, limit, partial_ior, ior));
 
-    this->repo_.servers().bind(name, si);
+    this->repo_.servers ().bind (name, si);
   }
   virtual void next_activator (const ACE_CString& aname,
     long token,
     const ACE_CString& ior)
   {
-    Activator_Info_Ptr si(new Activator_Info(aname, token, ior));
-    this->repo_.activators().bind(lcase(aname), si);
+    Activator_Info_Ptr si (new Activator_Info (aname, token, ior));
+    this->repo_.activators ().bind (lcase (aname), si);
   }
+private:
+  Locator_Repository& repo_;
 };
 
 static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) {
@@ -184,14 +188,14 @@ static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) {
     return 0;
   }
 
-  Server_Repo_XML_Callback cb(repo);
+  Server_Repo_XML_Callback cb (repo);
 
-  Locator_XMLHandler handler(cb);
+  Locator_XMLHandler handler (cb);
 
   ACEXML_Parser parser;
 
   // InputSource takes ownership
-  ACEXML_InputSource input(fstm);
+  ACEXML_InputSource input (fstm);
 
   parser.setContentHandler (&handler);
   parser.setDTDHandler (&handler);
@@ -199,16 +203,16 @@ static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) {
   parser.setEntityResolver (&handler);
 
   ACEXML_TRY_NEW_ENV
-  {
-    parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-    ACEXML_TRY_CHECK;
-  }
+    {
+      parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
+      ACEXML_TRY_CHECK;
+    }
   ACEXML_CATCH (ACEXML_Exception, ex)
-  {
-    ACE_ERROR((LM_ERROR, "Error during load of ImR persistence xml file."));
-    ex.print();
-    return -1;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Error during load of ImR persistence xml file."));
+      ex.print ();
+      return -1;
+    }
   ACEXML_ENDTRY;
   return 0;
 }
@@ -216,16 +220,18 @@ static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) {
 // Note : Would pass servers by const&, but ACE hash map const_iterator is broken.
 static void saveAsXML(const ACE_TString& fname, Locator_Repository& repo) {
   FILE* fp = ACE_OS::fopen (fname.c_str(), ACE_TEXT("w"));
+
   if (fp == 0)
-  {
-    ACE_ERROR((LM_ERROR, "Couldn't write to file %s\n", fname.c_str()));
-    return;
-  }
-  ACE_OS::fprintf(fp,"<?xml version=\"1.0\"?>\n");
-  ACE_OS::fprintf(fp,"<%s>\n", Locator_XMLHandler::ROOT_TAG);
+    {
+      ACE_ERROR ((LM_ERROR, "Couldn't write to file %s\n", fname.c_str()));
+      return;
+    }
+  ACE_OS::fprintf (fp,"<?xml version=\"1.0\"?>\n");
+  ACE_OS::fprintf (fp,"<%s>\n", Locator_XMLHandler::ROOT_TAG);
 
   // Save servers
   Locator_Repository::SIMap::ENTRY* sientry = 0;
+
   Locator_Repository::SIMap::ITERATOR siit(repo.servers());
   for (; siit.next(sientry); siit.advance()) {
     Server_Info_Ptr& info = sientry->int_id_;
@@ -258,97 +264,103 @@ static void saveAsXML(const ACE_TString& fname, Locator_Repository& repo) {
       ACE_OS::fprintf(fp,"/>\n");
     }
 
-    ACE_OS::fprintf(fp,"\t</%s>\n", Locator_XMLHandler::SERVER_INFO_TAG);
-  }
+    ACE_OS::fprintf(fp,ACE_TEXT("\t</%s>\n"), Locator_XMLHandler::SERVER_INFO_TAG);
+    }
 
   // Save Activators
   Locator_Repository::AIMap::ENTRY* aientry = 0;
-  Locator_Repository::AIMap::ITERATOR aiit(repo.activators());
-  for (; aiit.next(aientry); aiit.advance()) {
-    ACE_CString aname = aientry->ext_id_;
-    Activator_Info_Ptr& info = aientry->int_id_;
-    ACE_OS::fprintf(fp,"\t<%s", Locator_XMLHandler::ACTIVATOR_INFO_TAG);
-    ACE_OS::fprintf(fp," name=\"%s\"", aname.c_str());
-    ACE_OS::fprintf(fp," token=\"%d\"", info->token);
-    ACE_OS::fprintf(fp," ior=\"%s\"", info->ior.c_str ());
-    ACE_OS::fprintf(fp,"/>\n");
-  }
+  Locator_Repository::AIMap::ITERATOR aiit (repo.activators ());
+  for (; aiit.next (aientry); aiit.advance ())
+    {
+      ACE_CString aname = aientry->ext_id_;
+      Activator_Info_Ptr& info = aientry->int_id_;
+      ACE_OS::fprintf (fp,"\t<%s", Locator_XMLHandler::ACTIVATOR_INFO_TAG);
+      ACE_OS::fprintf( fp," name=\"%s\"", aname.c_str ());
+      ACE_OS::fprintf (fp," token=\"%d\"", info->token);
+      ACE_OS::fprintf (fp," ior=\"%s\"", info->ior.c_str ());
+      ACE_OS::fprintf (fp,"/>\n");
+    }
 
-  ACE_OS::fprintf(fp,"</%s>\n", Locator_XMLHandler::ROOT_TAG);
-  ACE_OS::fclose(fp);
+  ACE_OS::fprintf (fp,"</%s>\n", Locator_XMLHandler::ROOT_TAG);
+  ACE_OS::fclose (fp);
 }
 
-Locator_Repository::Locator_Repository()
-: rmode_(Options::REPO_NONE)
-, config_(0)
+Locator_Repository::Locator_Repository ()
+: rmode_ (Options::REPO_NONE)
+, config_ (0)
 {
 }
 
 int
 Locator_Repository::init(const Options& opts)
 {
-  this->rmode_ = opts.repository_mode();
-  this->fname_ = opts.persist_file_name();
+  this->rmode_ = opts.repository_mode ();
+  this->fname_ = opts.persist_file_name ();
 
   int err = 0;
-  switch (this->rmode_) {
-  case Options::REPO_NONE:
-    {
-      break;
-    }
-  case Options::REPO_HEAP_FILE:
+  switch (this->rmode_)
     {
-      if (opts.repository_erase())
+    case Options::REPO_NONE:
       {
-        ACE_OS::unlink( this->fname_.c_str() );
+        break;
       }
-      ACE_Configuration_Heap* heap = new ACE_Configuration_Heap();
-      this->config_.reset(heap);
-      err = heap->open(this->fname_.c_str());
-      if (err == 0)
+    case Options::REPO_HEAP_FILE:
       {
-        loadAsBinary(*this->config_, *this);
+        if (opts.repository_erase ())
+        {
+          ACE_OS::unlink ( this->fname_.c_str () );
+        }
+        ACE_Configuration_Heap* heap = new ACE_Configuration_Heap ();
+        this->config_.reset (heap);
+        err = heap->open (this->fname_.c_str ());
+        if (err == 0)
+        {
+          loadAsBinary (*this->config_, *this);
+        }
+        break;
       }
-      break;
-    }
-  case Options::REPO_REGISTRY:
-    {
-#if defined (ACE_WIN32)
-      if (opts.repository_erase())
+    case Options::REPO_REGISTRY:
       {
-        ACE_Configuration_Win32Registry config( HKEY_LOCAL_MACHINE );
-        ACE_Configuration_Section_Key root;
-        config.open_section( config.root_section(), ACE_TEXT("Software\\TAO"), 0, root );
-        config.remove_section( root, ACE_TEXT("ImplementationRepository"), 1 );
-      }
-      HKEY root = ACE_Configuration_Win32Registry::
-        resolve_key(HKEY_LOCAL_MACHINE, WIN32_REG_KEY);
-      this->config_.reset(new ACE_Configuration_Win32Registry(root));
-      loadAsBinary(*this->config_, *this);
+#if defined (ACE_WIN32)
+        if (opts.repository_erase ())
+          {
+            ACE_Configuration_Win32Registry config ( HKEY_LOCAL_MACHINE );
+            ACE_Configuration_Section_Key root;
+            config.open_section( config.root_section(), ACE_TEXT("Software\\TAO"), 0, root );
+            config.remove_section( root, ACE_TEXT("ImplementationRepository"), 1 );
+            /*
+            config.open_section (config.root_section(), "Software\\TAO", 0, root);
+            config.remove_section (root, "ImplementationRepository", 1);
+            */
+          }
+        HKEY root = ACE_Configuration_Win32Registry::
+          resolve_key (HKEY_LOCAL_MACHINE, WIN32_REG_KEY);
+        this->config_.reset (new ACE_Configuration_Win32Registry( root));
+        loadAsBinary (*this->config_, *this);
 #else
-      ACE_ERROR ((LM_ERROR, "Registry persistence is only "
-                            "supported on Windows\n"));
-      err = -1;
+        ACE_ERROR ((LM_ERROR, "Registry persistence is only "
+                              "supported on Windows\n"));
+        err = -1;
 #endif
-      break;
-    }
-  case Options::REPO_XML_FILE:
-    {
-      if (opts.repository_erase())
+        break;
+      }
+    case Options::REPO_XML_FILE:
       {
-        ACE_OS::unlink( this->fname_.c_str() );
+        if (opts.repository_erase ())
+          {
+            ACE_OS::unlink ( this->fname_.c_str() );
+          }
+        err = loadAsXML (this->fname_, *this);
+        break;
+      }
+    default:
+      {
+        bool invalid_rmode_specified = false;
+        ACE_ASSERT (invalid_rmode_specified);
+        ACE_UNUSED_ARG (invalid_rmode_specified);
+        err = -1;
       }
-      err = loadAsXML(this->fname_, *this);
-      break;
-    }
-  default:
-    {
-      bool invalid_rmode_specified = false;
-      ACE_ASSERT(invalid_rmode_specified);
-      ACE_UNUSED_ARG(invalid_rmode_specified);
-      err = -1;
     }
-  }
   return err;
 }
 
@@ -365,15 +377,15 @@ Locator_Repository::add_server (const ACE_CString& name,
                         ImplementationRepository::ServerObject_ptr svrobj)
 {
   int limit = start_limit < 1 ? 1 : start_limit;
-  Server_Info_Ptr info(new Server_Info(name, aname, startup_command,
+  Server_Info_Ptr info(new Server_Info (name, aname, startup_command,
     env_vars, working_dir, activation, limit, partial_ior, ior, svrobj));
 
-  int err = servers().bind (name, info);
+  int err = servers ().bind (name, info);
   if (err != 0)
-  {
-    return err;
-  }
-  this->update_server(*info);
+    {
+      return err;
+    }
+  this->update_server (*info);
   return 0;
 }
 
@@ -383,14 +395,14 @@ Locator_Repository::add_activator (const ACE_CString& name,
                         const ACE_CString& ior,
                         ImplementationRepository::Activator_ptr act)
 {
-  Activator_Info_Ptr info(new Activator_Info(name, token, ior, act));
+  Activator_Info_Ptr info (new Activator_Info (name, token, ior, act));
 
-  int err = activators().bind (lcase(name), info);
+  int err = activators ().bind (lcase (name), info);
   if (err != 0)
-  {
-    return err;
-  }
-  this->update_activator(*info);
+    {
+      return err;
+    }
+  this->update_activator (*info);
   return 0;
 }
 
@@ -398,25 +410,26 @@ int
 Locator_Repository::update_server (const Server_Info& info)
 {
   if (rmode_ == Options::REPO_HEAP_FILE || rmode_ == Options::REPO_REGISTRY)
-  {
-    ACE_ASSERT(this->config_.get() != 0);
+    {
+      ACE_ASSERT (this->config_.get () != 0);
 
-    ACE_Configuration& cfg = *this->config_;
+      ACE_Configuration& cfg = *this->config_;
+
+      ACE_Configuration_Section_Key root;
+      ACE_Configuration_Section_Key key;
+      int err = cfg.open_section (cfg.root_section(), SERVERS_ROOT_KEY, 1, root);
+      if (err != 0)
+        {
+          ACE_ERROR ((LM_ERROR, "Unable to open config section:%s\n", SERVERS_ROOT_KEY));
+          return err;
+        }
 
-    ACE_Configuration_Section_Key root;
-    ACE_Configuration_Section_Key key;
-    int err = cfg.open_section (cfg.root_section(), SERVERS_ROOT_KEY, 1, root);
-    if (err != 0)
-    {
-      ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", SERVERS_ROOT_KEY));
-      return err;
-    }
     err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
     if (err != 0)
-    {
-      ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
-      return err;
-    }
+      {
+        ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
+        return err;
+      }
 
     ACE_CString envstr = ImR_Utils::envListToString(info.env_vars);
 
@@ -428,11 +441,12 @@ Locator_Repository::update_server (const Server_Info& info)
     cfg.set_integer_value (key, START_LIMIT, info.start_limit);
     cfg.set_string_value (key, PARTIAL_IOR, ACE_TEXT_TO_TCHAR_IN(info.partial_ior.c_str()));
     cfg.set_string_value (key, IOR, ACE_TEXT_TO_TCHAR_IN(info.ior.c_str()));
-  }
+    }
   else if (rmode_ == Options::REPO_XML_FILE)
   {
     saveAsXML(this->fname_, *this);
   }
+
   return 0;
 }
 
@@ -440,57 +454,59 @@ int
 Locator_Repository::update_activator (const Activator_Info& info)
 {
   if (rmode_ == Options::REPO_HEAP_FILE || rmode_ == Options::REPO_REGISTRY)
-  {
-    ACE_ASSERT(this->config_.get() != 0);
+    {
+      ACE_ASSERT(this->config_.get () != 0);
 
-    ACE_Configuration& cfg = *this->config_;
+      ACE_Configuration& cfg = *this->config_;
 
-    ACE_Configuration_Section_Key root;
-    ACE_Configuration_Section_Key key;
-    int err = cfg.open_section (cfg.root_section(), ACTIVATORS_ROOT_KEY, 1, root);
-    if (err != 0)
-    {
-      ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", ACTIVATORS_ROOT_KEY));
-      return err;
+      ACE_Configuration_Section_Key root;
+      ACE_Configuration_Section_Key key;
+      int err = cfg.open_section (cfg.root_section(), ACTIVATORS_ROOT_KEY, 1, root);
+      if (err != 0)
+        {
+          ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", ACTIVATORS_ROOT_KEY));
+          return err;
+        }
+      //err = cfg.open_section (root, info.name.c_str (), 1, key);
+      err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
+      if (err != 0)
+        {
+          ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
+          return err;
+        }
+
+      cfg.set_integer_value (key, TOKEN, info.token);
+      cfg.set_string_value (key, IOR, ACE_TEXT_TO_TCHAR_IN(info.ior.c_str()));
     }
-    err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
-    if (err != 0)
+  else if (rmode_ == Options::REPO_XML_FILE)
     {
-      ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
-      return err;
+    saveAsXML(this->fname_, *this);
     }
 
-    cfg.set_integer_value (key, TOKEN, info.token);
-    cfg.set_string_value (key, IOR, ACE_TEXT_TO_TCHAR_IN(info.ior.c_str()));
-  }
-  else if (rmode_ == Options::REPO_XML_FILE)
-  {
-    saveAsXML(this->fname_, *this);
-  }
   return 0;
 }
 
 Server_Info_Ptr
 Locator_Repository::get_server (const ACE_CString& name)
 {
-  Server_Info_Ptr server(0);
-  servers().find (name, server);
+  Server_Info_Ptr server (0);
+  servers ().find (name, server);
   return server;
 }
 
 Activator_Info_Ptr
 Locator_Repository::get_activator (const ACE_CString& name)
 {
-  Activator_Info_Ptr activator(0);
-  activators().find (lcase(name), activator);
+  Activator_Info_Ptr activator (0);
+  activators ().find (lcase (name), activator);
   return activator;
 }
 
 bool
 Locator_Repository::has_activator (const ACE_CString& name)
 {
-  Activator_Info_Ptr activator(0);
-  return activators().find (lcase(name), activator) == 0;
+  Activator_Info_Ptr activator (0);
+  return activators().find (lcase (name), activator) == 0;
 }
 
 int
@@ -498,26 +514,27 @@ Locator_Repository::remove_server (const ACE_CString& name)
 {
   int ret = this->servers().unbind (name);
   if (ret != 0)
-  {
-    return ret;
-  }
+    {
+      return ret;
+    }
 
   if (rmode_ == Options::REPO_HEAP_FILE || rmode_ == Options::REPO_REGISTRY)
-  {
-    ACE_ASSERT(this->config_.get() != 0);
-    ACE_Configuration& cfg = *this->config_;
-    ACE_Configuration_Section_Key root;
-    int err = cfg.open_section (cfg.root_section(), SERVERS_ROOT_KEY, 0, root);
-    if (err != 0)
     {
-      return 0; // Already gone.
+      ACE_ASSERT (this->config_.get() != 0);
+      ACE_Configuration& cfg = *this->config_;
+      ACE_Configuration_Section_Key root;
+      int err = cfg.open_section (cfg.root_section (), SERVERS_ROOT_KEY, 0, root);
+      if (err != 0)
+        {
+          return 0; // Already gone.
+        }
+
+      ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
     }
-    ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
-  }
   else if (rmode_ == Options::REPO_XML_FILE)
-  {
-    saveAsXML(this->fname_, *this);
-  }
+    {
+      saveAsXML (this->fname_, *this);
+    }
   return ret;
 }
 
@@ -526,37 +543,38 @@ Locator_Repository::remove_activator (const ACE_CString& name)
 {
   int ret = activators().unbind (lcase(name));
   if (ret != 0)
-  {
-    return ret;
-  }
+    {
+      return ret;
+    }
 
   if (rmode_ == Options::REPO_HEAP_FILE || rmode_ == Options::REPO_REGISTRY)
-  {
-    ACE_ASSERT(this->config_.get() != 0);
-    ACE_Configuration& cfg = *this->config_;
-    ACE_Configuration_Section_Key root;
-    int err = cfg.open_section (cfg.root_section(), ACTIVATORS_ROOT_KEY, 0, root);
-    if (err != 0)
     {
-      return 0; // Already gone.
+      ACE_ASSERT (this->config_.get () != 0);
+      ACE_Configuration& cfg = *this->config_;
+      ACE_Configuration_Section_Key root;
+      int err = cfg.open_section (cfg.root_section (), ACTIVATORS_ROOT_KEY, 0, root);
+      if (err != 0)
+      {
+        return 0; // Already gone.
+      }
+
+      ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
     }
-    ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
-  }
   else if (rmode_ == Options::REPO_XML_FILE)
   {
-    saveAsXML(this->fname_, *this);
+    saveAsXML (this->fname_, *this);
   }
   return ret;
 }
 
 Locator_Repository::SIMap&
-Locator_Repository::servers(void)
+Locator_Repository::servers (void)
 {
   return server_infos_;
 }
 
 Locator_Repository::AIMap&
-Locator_Repository::activators(void)
+Locator_Repository::activators (void)
 {
   return activator_infos_;
 }
@@ -568,7 +586,7 @@ Locator_Repository::repo_mode()
   {
   case Options::REPO_XML_FILE:
   case Options::REPO_HEAP_FILE:
-    return fname_.c_str();
+    return fname_.c_str ();
   case Options::REPO_REGISTRY:
     return ACE_TEXT("Registry");
   case Options::REPO_NONE:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 59035e49b9b..1a60f46ae26 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -10,8 +10,8 @@ const ACE_TCHAR* Locator_XMLHandler::SERVER_INFO_TAG = ACE_TEXT("Servers");
 const ACE_TCHAR* Locator_XMLHandler::ACTIVATOR_INFO_TAG = ACE_TEXT("Activators");
 const ACE_TCHAR* Locator_XMLHandler::ENVIRONMENT_TAG = ACE_TEXT("EnvironmentVariables");
 
-Locator_XMLHandler::Locator_XMLHandler(Callback& cb)
-: callback_(cb)
+Locator_XMLHandler::Locator_XMLHandler (Callback& cb)
+: callback_ (cb)
 {
 }
 
@@ -22,27 +22,29 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
                                   ACEXML_Attributes* attrs ACEXML_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((ACEXML_SAXException))
 {
-  ACE_ASSERT(qName != 0);
+  ACE_ASSERT (qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0)
-  {
-    // We'll use this as a key to determine if we've got a valid record
-    this->server_name_ = "";
-    this->env_vars_.clear();
-
-    if (attrs != 0 && attrs->getLength () == 8)
     {
-      this->server_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
-      this->activator_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
-      this->command_line_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2)));
-      this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)3)));
-      this->activation_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)4)));
+      // We'll use this as a key to determine if we've got a valid record
+      this->server_name_ = "";
       this->env_vars_.clear();
-      int limit = ACE_OS::atoi (attrs->getValue((size_t)5));
-      this->start_limit_ = limit;
-      this->partial_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)6)));
-      this->server_object_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)7)));
+
+      if (attrs != 0 && attrs->getLength () == 8)
+        {
+          this->server_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
+          this->activator_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
+          this->command_line_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2)));
+          this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)3)));
+          this->activation_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)4)));
+
+            this->env_vars_.clear();
+
+            int limit = ACE_OS::atoi (attrs->getValue((size_t)5));
+            this->start_limit_ = limit;
+            this->partial_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)6)));
+            this->server_object_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)7)));
+        }
     }
-  }
   else if (ACE_OS::strcasecmp (qName, ACTIVATOR_INFO_TAG) == 0)
   {
     if (attrs != 0 && attrs->getLength () == 3)
@@ -55,15 +57,15 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
     }
   }
   else if (ACE_OS::strcasecmp (qName, ENVIRONMENT_TAG) == 0)
-  {
-    if (attrs != 0 && attrs->getLength() == 2)
     {
-      EnvVar ev;
-      ev.name.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
-      ev.value.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
-      this->env_vars_.push_back(ev);
+      if (attrs != 0 && attrs->getLength() == 2)
+        {
+          EnvVar ev;
+          ev.name.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
+          ev.value.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
+          this->env_vars_.push_back(ev);
+        }
     }
-  }
 }
 
 void
@@ -74,9 +76,9 @@ Locator_XMLHandler::endElement (const ACEXML_Char*,
 {
   ACE_ASSERT(qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0
-    && this->server_name_.length() > 0)
+    && this->server_name_.length () > 0)
   {
-    this->callback_.next_server(this->server_name_,
+    this->callback_.next_server (this->server_name_,
       this->activator_name_, this->command_line_,
       this->env_vars_, this->working_dir_, this->activation_,
       this->start_limit_, this->partial_ior_, this->server_object_ior_);
@@ -85,13 +87,12 @@ Locator_XMLHandler::endElement (const ACEXML_Char*,
 }
 
 bool
-Locator_XMLHandler::EnvVar::operator==(const EnvVar& rhs) const
+Locator_XMLHandler::EnvVar::operator== (const EnvVar& rhs) const
 {
   return name == rhs.name && value == rhs.value;
 }
 bool
-Locator_XMLHandler::EnvVar::operator!=(const EnvVar& rhs) const
+Locator_XMLHandler::EnvVar::operator!= (const EnvVar& rhs) const
 {
   return ! (rhs == *this);
 }
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
index 8431371c8d3..f63f2fa9d85 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -44,7 +44,7 @@ public:
 
   struct Callback {
     virtual ~Callback() {}
- 
+
     virtual void next_server (const ACE_CString& server_name,
       const ACE_CString& aname, const ACE_CString& startup_cmd,
       const EnvList& env_vars, const ACE_CString& working_dir,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index fdcda8567ac..0d6b50362df 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -46,7 +46,7 @@ CLEANFILES = \
 ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl ImR_ActivatorS_T.cpp ImR_ActivatorS_T.h ImR_ActivatorS_T.inl: ImR_Activator-stamp
 
 ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
 	@touch $@
 
 noinst_LTLIBRARIES = libTAO_ImR_Activator_IDL.la
@@ -104,7 +104,7 @@ CLEANFILES += \
 ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl ImR_LocatorS_T.cpp ImR_LocatorS_T.h ImR_LocatorS_T.inl: ImR_Locator-stamp
 
 ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -133,7 +133,7 @@ CLEANFILES += \
 AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl AsyncStartupWaiterS_T.cpp AsyncStartupWaiterS_T.h AsyncStartupWaiterS_T.inl: AsyncStartupWaiter-stamp
 
 AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
 	@touch $@
 
 noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la
@@ -176,6 +176,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES += libTAO_ImR_Activator.la
@@ -202,6 +203,7 @@ noinst_HEADERS += \
   activator_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -209,6 +211,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImR_Activator
@@ -245,6 +248,7 @@ ImR_Activator_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -252,6 +256,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES += libTAO_ImR_Locator.la
@@ -297,6 +302,7 @@ noinst_HEADERS += \
   utils.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -304,6 +310,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImplRepo_Service
@@ -342,6 +349,7 @@ ImplRepo_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 70ed15854f9..91f8d7fa1be 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -14,52 +14,53 @@ Server_Info::Server_Info
  const ACE_CString& server_ior,
  ImplementationRepository::ServerObject_ptr svrobj
  )
- : name(server_name)
- , activator(aname)
- , cmdline(cmdline)
- , env_vars(env)
- , dir(working_dir)
- , activation_mode(amode)
+ : name (server_name)
+ , activator (aname)
+ , cmdline( cmdline)
+ , env_vars (env)
+ , dir (working_dir)
+ , activation_mode (amode)
  , start_limit (limit)
- , partial_ior(partial_ior)
- , ior(server_ior)
- , server(ImplementationRepository::ServerObject::_duplicate(svrobj))
- , start_count(0)
- , waiting_clients(0)
- , starting(false)
+ , partial_ior (partial_ior)
+ , ior (server_ior)
+ , server(ImplementationRepository::ServerObject::_duplicate (svrobj))
+ , start_count (0)
+ , waiting_clients (0)
+ , starting (false)
 {
 }
 
 ImplementationRepository::ServerInformation*
-Server_Info::createImRServerInfo(ACE_ENV_SINGLE_ARG_DECL)
+Server_Info::createImRServerInfo (ACE_ENV_SINGLE_ARG_DECL)
 {
   ImplementationRepository::ServerInformation* info;
-  ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY());
+  ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
 
-  info->server = name.c_str();
-  info->startup.command_line = cmdline.c_str();
+  info->server = name.c_str ();
+  info->startup.command_line = cmdline.c_str ();
   info->startup.environment = env_vars;
-  info->startup.working_directory = dir.c_str();
+  info->startup.working_directory = dir.c_str ();
   info->startup.activation = activation_mode;
-  info->startup.activator = activator.c_str();
-  if (start_count >= start_limit) {
-    info->startup.start_limit = -start_limit;
-  }
+  info->startup.activator = activator.c_str ();
+  if (start_count >= start_limit)
+    {
+      info->startup.start_limit = -start_limit;
+    }
   else
-  {
-    info->startup.start_limit = start_limit;
-  }
+    {
+      info->startup.start_limit = start_limit;
+    }
   info->partial_ior = partial_ior.c_str();
 
   return info;
 }
 
 void
-Server_Info::reset(void)
+Server_Info::reset (void)
 {
   ior = "";
   partial_ior = "";
   last_ping = ACE_Time_Value::zero;
-  server = ImplementationRepository::ServerObject::_nil();
+  server = ImplementationRepository::ServerObject::_nil ();
   // start_count = 0; Note : We can't do this, because it would be reset during startup.
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 7f454c63773..a65f0aefd38 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -27,11 +27,11 @@ TAO_IMR_i::~TAO_IMR_i (void)
 int
 TAO_IMR_i::run ()
 {
-  if (this->op_.get() == 0)
-  {
-    ACE_ERROR ((LM_ERROR, "Unknown operation"));
-    return TAO_IMR_Op::UNKNOWN;
-  }
+  if (this->op_.get () == 0)
+    {
+      ACE_ERROR ((LM_ERROR, "Unknown operation"));
+      return TAO_IMR_Op::UNKNOWN;
+    }
 
   return this->op_->run ();
 }
@@ -47,7 +47,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv)
   ACE_TRY
   {
     // Retrieve the ORB.
-    this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 
+    this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                     "tao_imr_i" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
@@ -60,32 +60,32 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv)
       orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (CORBA::is_nil (obj.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n"));
-      return -1;
-    }
+      if (CORBA::is_nil (obj.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n"));
+          return -1;
+        }
 
-    exception_message = "While narrowing ImR";
+      exception_message = "While narrowing ImR";
 
-    this->imr_ =
-      ImplementationRepository::Administration::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->imr_ =
+        ImplementationRepository::Administration::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (imr_.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n"));
+          return -1;
+        }
 
-    if (CORBA::is_nil (imr_.in ()))
+      this->op_->set_imr (this->imr_.in ());
+    }
+  ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n"));
+      ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
       return -1;
     }
-
-    this->op_->set_imr(this->imr_.in ());
-  }
-  ACE_CATCHANY
-  {
-    ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
-    return -1;
-  }
   ACE_ENDTRY;
 
   return 0;
@@ -148,10 +148,10 @@ TAO_IMR_Op *
 TAO_IMR_Op::make_op (const ACE_TCHAR *op_name)
 {
   if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("activate")) == 0)
-  {
-    ACE_ERROR((LM_ERROR, "Warning: The activate option has been renamed to start.\n"));
-    return new TAO_IMR_Op_Activate ();
-  }
+    {
+      ACE_ERROR((LM_ERROR, "Warning: The activate option has been renamed to start.\n"));
+      return new TAO_IMR_Op_Activate ();
+    }
   else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("start")) == 0)
     return new TAO_IMR_Op_Activate ();
   else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("add")) == 0)
@@ -207,10 +207,10 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
 
   int limit = info.startup.start_limit;
   if (info.startup.start_limit < 0)
-  {
-    limit = -limit;
-    locked_out = "  Locked Out\n";
-  }
+    {
+      limit = -limit;
+      locked_out = "  Locked Out\n";
+    }
 
   ACE_DEBUG ((LM_DEBUG,
     "  Activator: %s\n"
@@ -231,14 +231,15 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
     info.startup.environment[i].value.in ()));
 
   if (info.startup.activation == ImplementationRepository::PER_CLIENT)
-    ACE_DEBUG ((LM_DEBUG, "  No running info available for PER_CLIENT mode\n"));
-  else if (ACE_OS::strlen (info.partial_ior.in()) > 0)
     ACE_DEBUG ((LM_DEBUG,
-    "  Running at endpoint: %s\n",
-    info.partial_ior.in ()));
+                "  No running info available for PER_CLIENT mode\n"));
+  else if (ACE_OS::strlen (info.partial_ior.in ()) > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "  Running at endpoint: %s\n",
+                info.partial_ior.in ()));
   else   // I am assuming that a blank partial_ior means currently not running.
     ACE_DEBUG ((LM_DEBUG,
-    "  Not currently running\n"));
+                "  Not currently running\n"));
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
 }
@@ -279,10 +280,10 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-  {
-    this->print_usage ();
-    return -1;
-  }
+    {
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "activate" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
@@ -291,17 +292,18 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'h':
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
+    {
+      switch (c)
+      {
+      case 'h':
+        this->print_usage ();
+        return -1;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
     }
-
   return 0;
 }
 
@@ -322,17 +324,18 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'h':  // display help
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
-
+    {
+      switch (c)
+      {
+      case 'h':  // display help
+        this->print_usage ();
+        return -1;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
+    }
   return 0;
 }
 
@@ -356,38 +359,40 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-  {
-    this->print_usage ();
-    return -1;
-  }
+    {
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "ior" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hf:"));
 
   this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
   if (this->server_name_.length() == 0 || this->server_name_[0] == '-')
-  {
-    ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
-    this->print_usage ();
-    return -1;
-  }
+    {
+      ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
+      this->print_usage ();
+      return -1;
+    }
 
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'f':  // File name
-      this->filename_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
-      break;
-    case 'h':  // display help
-      this->print_usage();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
+    {
+      switch (c)
+        {
+        case 'f':  // File name
+          this->filename_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
+          break;
+        case 'h':  // display help
+          this->print_usage();
+          return -1;
+        default:
+          ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+          this->print_usage ();
+          return -1;
+        }
+    }
 
   return 0;
 }
@@ -423,20 +428,21 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'v': // verbose server display
-      this->verbose_server_information_ = 1;
-      break;
-    case 'h':  // display help
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
-
+    {
+      switch (c)
+      {
+      case 'v': // verbose server display
+        this->verbose_server_information_ = 1;
+        break;
+      case 'h':  // display help
+        this->print_usage ();
+        return -1;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
+    }
   return 0;
 }
 
@@ -456,10 +462,10 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-  {
-    this->print_usage ();
-    return -1;
-  }
+    {
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "remove" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
@@ -468,17 +474,18 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'h':
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
-
+    {
+      switch (c)
+      {
+      case 'h':
+        this->print_usage ();
+        return -1;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
+    }
   return 0;
 }
 
@@ -498,10 +505,10 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-  {
-    this->print_usage ();
-    return -1;
-  }
+    {
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "shutdown" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
@@ -510,17 +517,18 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'h':
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
-
+    {
+      switch (c)
+      {
+      case 'h':
+        this->print_usage ();
+        return -1;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
+    }
   return 0;
 }
 
@@ -545,10 +553,10 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
+    {
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "shutdown-repo" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("ha"));
@@ -556,21 +564,21 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-  {
-    switch (c)
     {
-    case 'h':
-      this->print_usage ();
-      return -1;
-    case 'a':
-      activators_ = true;
-      break;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
+      switch (c)
+      {
+      case 'h':
+        this->print_usage ();
+        return -1;
+      case 'a':
+        activators_ = true;
+        break;
+      default:
+        ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+        this->print_usage ();
+        return -1;
+      }
     }
-  }
 
   return 0;
 }
@@ -614,11 +622,11 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-  {
-    ACE_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n"));
-    this->print_usage ();
-    return -1;
-  }
+    {
+      ACE_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n"));
+      this->print_usage ();
+      return -1;
+    }
 
   // Skip both the program name and the "update" command
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hc:w:a:e:r:R:l:"));
@@ -627,58 +635,60 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv)
   int c;
 
   while ((c = get_opts ()) != -1)
-    switch (c)
-  {
-    case 'c':  // Command line arguments
-      this->set_command_line_ = true;
-      this->command_line_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
-      break;
-    case 'e':  // set environment variables
-      this->set_environment_vars_ = true;
-      this->addenv( get_opts.opt_arg () );
-      break;
-    case 'w':  // Working Directory
-      this->set_working_dir_ = true;
-      this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
-      break;
-    case 'a':  // Activation Mode
-      this->set_activation_ = true;
-      if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("NORMAL")) == 0)
-        this->activation_ = ImplementationRepository::NORMAL;
-      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("MANUAL")) == 0)
-        this->activation_ = ImplementationRepository::MANUAL;
-      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("PER_CLIENT")) == 0)
-        this->activation_ = ImplementationRepository::PER_CLIENT;
-      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("AUTO_START")) == 0)
-        this->activation_ = ImplementationRepository::AUTO_START;
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-        "Unknown Activation Mode <%s>.\n",
-        get_opts.opt_arg ()),
-        -1);
-      break;
-    case 'r':
-    case 'R':   // startup/ping Retry Count
-      {
-        this->set_retry_count_ = true;
-        int rc = ACE_OS::atoi(get_opts.optarg);
-        if (rc > 0)
-          this->retry_count_ = rc;
-      }
-      break;
-    case 'l': /// hostname of the activator
-      this->activator_.set (ACE_TEXT_TO_CHAR_IN (get_opts.optarg));
-      this->set_activator_ = true;
-      break;
-    case 'h':  // display help
-      this->print_usage ();
-      return -1;
-    default:
-      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
-      this->print_usage ();
-      return -1;
-  }
+    {
+      switch (c)
+        {
+        case 'c':  // Command line arguments
+          this->set_command_line_ = true;
+          this->command_line_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
+          break;
+        case 'e':  // set environment variables
+          this->set_environment_vars_ = true;
+          this->addenv( get_opts.opt_arg () );
+          break;
+        case 'w':  // Working Directory
+          this->set_working_dir_ = true;
+          this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
+          break;
+        case 'a':  // Activation Mode
+          this->set_activation_ = true;
+          if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("NORMAL")) == 0)
+            this->activation_ = ImplementationRepository::NORMAL;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("MANUAL")) == 0)
+            this->activation_ = ImplementationRepository::MANUAL;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("PER_CLIENT")) == 0)
+            this->activation_ = ImplementationRepository::PER_CLIENT;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("AUTO_START")) == 0)
+            this->activation_ = ImplementationRepository::AUTO_START;
+          else
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Unknown Activation Mode <%s>.\n",
+                               get_opts.opt_arg ()),
+                              -1);
+          break;
+        case 'r':
+        case 'R':   // startup/ping Retry Count
+          {
+            this->set_retry_count_ = true;
+            int rc = ACE_OS::atoi(get_opts.optarg);
+            if (rc > 0)
+            this->retry_count_ = rc;
+          }
+          break;
+        case 'l': /// hostname of the activator
+          this->activator_.set (ACE_TEXT_TO_CHAR_IN (get_opts.optarg));
+          this->set_activator_ = true;
+          break;
+        case 'h':  // display help
+          this->print_usage ();
+          return -1;
+        default:
+          ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+          this->print_usage ();
+          return -1;
+        }
 
+    }
   return 0;
 }
 
@@ -693,34 +703,34 @@ TAO_IMR_Op_Activate::run (void)
   ACE_ASSERT(! CORBA::is_nil(imr_));
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_->activate_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    ACE_DEBUG ((LM_DEBUG,
-      "Successfully Activated server <%s>\n",
-      this->server_name_.c_str ()));
-  }
+    {
+      this->imr_->activate_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_DEBUG,
+        "Successfully Activated server <%s>\n",
+        this->server_name_.c_str ()));
+    }
   ACE_CATCH (ImplementationRepository::CannotActivate, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
-      this->server_name_.c_str (),
-      ex.reason.in ()));
-    return TAO_IMR_Op::CANNOT_ACTIVATE;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
+        this->server_name_.c_str (),
+        ex.reason.in ()));
+      return TAO_IMR_Op::CANNOT_ACTIVATE;
+    }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
-    return TAO_IMR_Op::NOT_FOUND;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
+      return TAO_IMR_Op::NOT_FOUND;
+    }
   ACE_CATCH (PortableServer::ForwardRequest, ex)
-  {
-    ACE_RE_THROW;
-  }
+    {
+      ACE_RE_THROW;
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -729,43 +739,43 @@ TAO_IMR_Op_Activate::run (void)
 int
 TAO_IMR_Op_Autostart::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT(! CORBA::is_nil (imr_));
 
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_->list (0,
-      server_list,
-      server_iter
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    ACE_ASSERT(CORBA::is_nil(server_iter.in()));
-
-    CORBA::ULong len = server_list->length ();
-    for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY_EX (inside)
-      {
-        this->imr_->activate_server(server_list[i].server.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (inside);
-      }
-      ACE_CATCHANY
-      {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
-        // Ignore exception
-      }
-      ACE_ENDTRY;
+      this->imr_->list (0,
+        server_list,
+        server_iter
+        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_ASSERT(CORBA::is_nil (server_iter.in ()));
+
+      CORBA::ULong len = server_list->length ();
+      for (CORBA::ULong i = 0; i < len; ++i)
+        {
+          ACE_TRY_EX (inside)
+            {
+              this->imr_->activate_server (server_list[i].server.in () ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK_EX (inside);
+            }
+          ACE_CATCHANY
+            {
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
+              // Ignore exception
+            }
+          ACE_ENDTRY;
+        }
     }
-  }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -774,79 +784,79 @@ TAO_IMR_Op_Autostart::run (void)
 int
 TAO_IMR_Op_IOR::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT (! CORBA::is_nil(imr_));
 
   // Create a corbaloc string
   // Todo : Most of this logic duplicates that in the POA.cpp
   ACE_TRY_NEW_ENV
-  {
-    if (CORBA::is_nil (this->imr_)
-      || !this->imr_->_stubobj ()
-      || !this->imr_->_stubobj ()->profile_in_use ())
     {
-      ACE_ERROR_RETURN ((
-        LM_ERROR,
-        ACE_TEXT ("Invalid ImR IOR.\n")
-        ), -1);
-    }
+      if (CORBA::is_nil (this->imr_)
+        || !this->imr_->_stubobj ()
+        || !this->imr_->_stubobj ()->profile_in_use ())
+      {
+        ACE_ERROR_RETURN ((
+          LM_ERROR,
+          ACE_TEXT ("Invalid ImR IOR.\n")
+          ), -1);
+      }
 
-    CORBA::String_var imr_str =
-      this->imr_->_stubobj ()->
-      profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CORBA::String_var imr_str =
+        this->imr_->_stubobj ()->
+        profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    // Search for "corbaloc:" alone, without the protocol.  This code
-    // should be protocol neutral.
-    const char corbaloc[] = "corbaloc:";
-    char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+      // Search for "corbaloc:" alone, without the protocol.  This code
+      // should be protocol neutral.
+      const char corbaloc[] = "corbaloc:";
+      char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
 
-    if (pos == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
-    }
-    else
-    {
-      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-      pos = ACE_OS::strchr (pos + 1,
-        this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-      if (pos)
+      if (pos == 0)
       {
-        *(pos + 1) = 0;  // Crop the string
+        ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
       }
       else
       {
-        ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
+        pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
+        pos = ACE_OS::strchr (pos + 1,
+          this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
+
+        if (pos)
+        {
+          *(pos + 1) = 0;  // Crop the string
+        }
+        else
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
+        }
       }
-    }
-    ACE_CString ior (imr_str.in ());
+      ACE_CString ior (imr_str.in ());
 
-    // Add the key
-    ior += this->server_name_;
+      // Add the key
+      ior += this->server_name_;
 
-    ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
+      ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
 
-    if (this->filename_.length () > 0)
-    {
-      FILE *file = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT("w"));
+      if (this->filename_.length () > 0)
+        {
+          FILE *file = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT("w"));
 
-      if (file == 0)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-          "Error: Unable to open %s for writing: %p\n",
-          this->filename_.c_str ()),
-          -1);
-      }
+          if (file == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "Error: Unable to open %s for writing: %p\n",
+                                 this->filename_.c_str ()),
+                                -1);
+            }
 
-      ACE_OS::fprintf (file, "%s", ior.c_str ());
-      ACE_OS::fclose (file);
+        ACE_OS::fprintf (file, "%s", ior.c_str ());
+        ACE_OS::fclose (file);
+      }
     }
-  }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -855,57 +865,57 @@ TAO_IMR_Op_IOR::run (void)
 int
 TAO_IMR_Op_List::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT (! CORBA::is_nil(imr_));
 
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    // If there is a server name, list only that server.  Otherwise, look
-    // at all of them.
-    if (this->server_name_.length () == 0)
     {
-      this->imr_->list (0,
-        server_list.out(),
-        server_iter.out()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // If there is a server name, list only that server.  Otherwise, look
+      // at all of them.
+      if (this->server_name_.length () == 0)
+        {
+          this->imr_->list (0,
+            server_list.out(),
+            server_iter.out()
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (server_list->length() == 0)
+          {
+            ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
+            return TAO_IMR_Op::NORMAL;
+          }
+
+          for (CORBA::ULong i = 0; i < server_list->length (); i++)
+            this->display_server_information (server_list[i]);
+
+          ACE_ASSERT (CORBA::is_nil (server_iter.in ()));
+        }
+      else
+        {
+          ImplementationRepository::ServerInformation_var si;
 
-      if (server_list->length() == 0)
-      {
-        ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
-        return TAO_IMR_Op::NORMAL;
-      }
+          this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-      for (CORBA::ULong i = 0; i < server_list->length (); i++)
-        this->display_server_information (server_list[i]);
+          this->verbose_server_information_ = 1;
 
-      ACE_ASSERT (CORBA::is_nil (server_iter.in ()));
+          this->display_server_information (si.in ());
+        }
     }
-    else
+  ACE_CATCH (ImplementationRepository::NotFound, ex)
     {
-      ImplementationRepository::ServerInformation_var si;
-
-      this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->verbose_server_information_ = 1;
-
-      this->display_server_information (si.in ());
+      ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
+      return TAO_IMR_Op::NOT_FOUND;
     }
-  }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
-    return TAO_IMR_Op::NOT_FOUND;
-  }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -914,33 +924,33 @@ TAO_IMR_Op_List::run (void)
 int
 TAO_IMR_Op_Remove::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT (! CORBA::is_nil(imr_));
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_->remove_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      this->imr_->remove_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
-      this->server_name_.c_str ()));
-  }
+      ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
+        this->server_name_.c_str ()));
+    }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n",
-      this->server_name_.c_str ()));
-    return TAO_IMR_Op::NOT_FOUND;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n",
+        this->server_name_.c_str ()));
+      return TAO_IMR_Op::NOT_FOUND;
+    }
   ACE_CATCH (CORBA::NO_PERMISSION, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
-    return TAO_IMR_Op::NO_PERMISSION;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+      return TAO_IMR_Op::NO_PERMISSION;
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -949,32 +959,32 @@ TAO_IMR_Op_Remove::run (void)
 int
 TAO_IMR_Op_Shutdown::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT (! CORBA::is_nil(imr_));
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
-      this->server_name_.c_str ()));
-  }
+      ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
+        this->server_name_.c_str ()));
+    }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "Server <%s> already shut down.\n", this->server_name_.c_str ()));
-    return TAO_IMR_Op::NOT_FOUND;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "Server <%s> already shut down.\n", this->server_name_.c_str ()));
+      return TAO_IMR_Op::NOT_FOUND;
+    }
   ACE_CATCH(CORBA::TIMEOUT, ex)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%s> to shutdown.\n",
-      this->server_name_.c_str ()));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%s> to shutdown.\n",
+        this->server_name_.c_str ()));
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -987,22 +997,22 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    bool servers = false; // not implemented yet, if ever
-    this->imr_->shutdown(activators_, servers ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      bool servers = false; // not implemented yet, if ever
+      this->imr_->shutdown (activators_, servers ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n"));
-  }
+      ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n"));
+    }
   ACE_CATCH(CORBA::TIMEOUT, ex)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n"));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n"));
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down ImR");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down ImR");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -1011,7 +1021,7 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 int
 TAO_IMR_Op_Register::run (void)
 {
-  ACE_ASSERT(! CORBA::is_nil(imr_));
+  ACE_ASSERT (! CORBA::is_nil(imr_));
 
   ImplementationRepository::ServerInformation_var server_information;
   ImplementationRepository::StartupOptions  local;
@@ -1019,67 +1029,73 @@ TAO_IMR_Op_Register::run (void)
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    this->imr_->find(this->server_name_.c_str (),
-      server_information.out() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (server_name_ == server_information->server.in())
-    {
-      if (is_add_)
-      {
-        ACE_DEBUG((LM_DEBUG, "Server <%s> already registered.\n", this->server_name_.c_str()));
-        return ALREADY_REGISTERED;
-      }
-      options = &server_information->startup;
-    }
-    else
     {
-      is_add_ = true;
-      options = &local;
-    }
-
-    if (this->set_command_line_)
-      options->command_line = CORBA::string_dup (this->command_line_.c_str ());
-
-    if (this->set_environment_vars_)
-      options->environment = this->environment_vars_;
-
-    if (this->set_working_dir_)
-      options->working_directory = CORBA::string_dup (this->working_dir_.c_str ());
-
-    if (this->set_activation_ || is_add_)
-      options->activation = this->activation_;
+      this->imr_->find(this->server_name_.c_str (),
+        server_information.out() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (this->set_retry_count_ || is_add_)
-      options->start_limit = this->retry_count_ + 1;
+      if (server_name_ == server_information->server.in())
+        {
+          if (is_add_)
+            {
+              ACE_DEBUG((LM_DEBUG, "Server <%s> already registered.\n", this->server_name_.c_str ()));
+              return ALREADY_REGISTERED;
+            }
+          options = &server_information->startup;
+        }
+      else // not found
+        {
+          if (!is_add_)
+          {
+            ACE_DEBUG((LM_DEBUG, "Adding Server <%s> on update command.\n", this->server_name_.c_str ()));
+            is_add_ = true;
+          }
+          options = &local;
+        }
+
+      if (this->set_command_line_)
+        options->command_line = CORBA::string_dup (this->command_line_.c_str ());
+
+      if (this->set_environment_vars_)
+        options->environment = this->environment_vars_;
+
+      if (this->set_working_dir_)
+        options->working_directory = CORBA::string_dup (this->working_dir_.c_str ());
+
+      if (this->set_activation_ || is_add_)
+        options->activation = this->activation_;
+
+      if (this->set_retry_count_ || is_add_)
+        options->start_limit = this->retry_count_ + 1;
+
+      if (this->set_activator_)
+        options->activator = CORBA::string_dup(this->activator_.c_str ());
+      // If the command line is set, we must have an activator
+      else if (this->set_command_line_ &&
+              (options->activator.in () == 0 || *options->activator.in () == 0))
+        {
+          char host_name[MAXHOSTNAMELEN + 1];
+          ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
+          options->activator = CORBA::string_dup (host_name);
+          ACE_DEBUG ((LM_DEBUG, "Updating Server <%s> with default activator of <%s>.\n",
+            this->server_name_.c_str (), options->activator.in ()));
+        }
+
+      this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    if (this->set_activator_)
-  {
-      options->activator = CORBA::string_dup(this->activator_.c_str());
-  }
-    else if (is_add_)
-  {
-      char host_name[MAXHOSTNAMELEN + 1];
-      ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
-      options->activator = CORBA::string_dup (host_name);
+      ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
     }
-
-    this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
-  }
   ACE_CATCH (CORBA::NO_PERMISSION, ex)
-  {
-    ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
-    return TAO_IMR_Op::NO_PERMISSION;
-  }
+    {
+      ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+      return TAO_IMR_Op::NO_PERMISSION;
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
-    return TAO_IMR_Op::UNKNOWN;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
+      return TAO_IMR_Op::UNKNOWN;
+    }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 06eccfc1104..6c8727c5070 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba, utils {
+project : orbsvcsexe, lifecycle, naming, trading_serv, minimum_corba, utils {
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 8d7c3fa3c49..1a997b187d7 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 if !BUILD_MINIMUM_CORBA
 
-bin_PROGRAMS = LifeCycle_Service
+noinst_PROGRAMS = LifeCycle_Service
 
 LifeCycle_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -43,6 +43,7 @@ LifeCycle_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index 0c2a8f29fec..4956f9d2aa2 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 275cfcbd9c0..284d60bdcb4 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index d6937fbf230..fcc727eb83c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
index 76a35fff27b..12d820f5b52 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic_Logging_Service \
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index d491faeff1a..cb94e524129 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 1e6258a1cff..bc87d82f809 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RTEvent_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = RTEvent_Logging_Service
 
@@ -33,16 +34,17 @@ RTEvent_Logging_Service_SOURCES = \
   RTEvent_Logging_Service.h
 
 RTEvent_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -50,12 +52,14 @@ RTEvent_Logging_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
index 0eea7744c42..1cc973fa4e7 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
-project: namingexe, iortable, core, rtevent_serv, rteventlogadmin {
+project: namingexe, iortable, core, rteventlogadmin_serv {
   exename   = RTEvent_Logging_Service
 }
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index f079ecca777..94851fb27c9 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         TAO_Service \
@@ -28,8 +28,16 @@ SUBDIRS = \
         Event_Service \
         Dump_Schedule \
         CosEvent_Service \
-        Concurrency_Service \
+        Concurrency_Service
+
+if BUILD_TESTS
+SUBDIRS += \
         performance-tests \
-        tests \
+        tests
+endif
+
+if BUILD_EXAMPLES
+SUBDIRS += \
         examples
+endif
 
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index dcc66b40f3c..71a9c6d8b6b 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,7 +17,7 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Naming_Service.am
 
-if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS += NT_Naming_Service
 
@@ -51,11 +51,11 @@ NT_Naming_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_CORBA_MESSAGING
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Naming_Service.am
 
-if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS += Naming_Service
 
@@ -73,6 +73,7 @@ Naming_Service_SOURCES = \
   Naming_Service.h
 
 Naming_Service_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -87,7 +88,7 @@ Naming_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_CORBA_MESSAGING
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 8b86409fafe..65631eb726e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -6,6 +6,8 @@
 #include "orbsvcs/Shutdown_Utilities.h"
 #include "tao/debug.h"
 
+#include "tao/ImR_Client/ImR_Client.h"
+
 class Naming_Svc_Shutdown : public Shutdown_Functor
 {
 public:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 7a96a9e6d25..ecf246cc003 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming_serv {
+project : orbsvcsexe, core, naming_serv, imr_client {
   exename  = Naming_Service
   Source_Files {
     Naming_Server.cpp
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
index 2739ad56e5e..495bfc915db 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Notify_Service.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += NT_Notify_Service
@@ -55,6 +56,7 @@ NT_Notify_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Notify_Service.am
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 5e355715826..2e74141b15d 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
 #include "Notify_Service.h"
+
+// Must include this file to get a static initializer
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+
 #include "ace/OS_main.h"
 
 #include "orbsvcs/Shutdown_Utilities.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index f3626d462e4..781bb0851b1 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -1,26 +1,29 @@
 // $Id$
 
 #include "Notify_Service.h"
+
+#include "orbsvcs/Notify/Service.h"
+
 #include "tao/debug.h"
 #include "tao/IORTable/IORTable.h"
+#include "tao/ORB_Core.h"
+
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/Synch.h"
 #include "ace/Argv_Type_Converter.h"
-#include "tao/ORB_Core.h"
 #include "ace/Dynamic_Service.h"
-#include "orbsvcs/Notify/Service.h"
 
 TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
-  : notify_service_ (0),
-    bootstrap_ (0),
-    use_name_svc_ (1),
-    ior_output_file_ (0),
-    notify_factory_name_ (NOTIFY_KEY),
-    notify_channel_name_ (NOTIFY_CHANNEL_NAME),
-    register_event_channel_ (0),
-    nthreads_ (1)
+: notify_service_ (0)
+, bootstrap_ (0)
+, use_name_svc_ (1)
+, ior_output_file_ (0)
+, notify_factory_name_ (NOTIFY_KEY)
+, notify_channel_name_ (NOTIFY_CHANNEL_NAME)
+, register_event_channel_ (0)
+, nthreads_ (1)
 {
   // No-Op.
 }
@@ -71,7 +74,7 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, char *argv []
 
 int
 TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
-                          ACE_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_Argv_Type_Converter convert (argc, argv);
 
@@ -81,7 +84,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   // initalize the ORB.
   if (this->init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                       ACE_ENV_ARG_PARAMETER) != 0)
-  return -1;
+    return -1;
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
 
@@ -91,17 +94,17 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
     }
 
   if (this->notify_service_ == 0)
-  {
-      ACE_DEBUG ((LM_DEBUG, "Service not found! check conf.file\n"));
+    {
+      ACE_DEBUG ((LM_DEBUG, "Service not found. Check service configurator file.\n"));
       return -1;
-  }
+    }
 
   this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
     {
-      ACE_DEBUG ((LM_DEBUG, "Running %d server threads\n", this->nthreads_));
+      ACE_DEBUG ((LM_DEBUG, "Running %d ORB threads\n", this->nthreads_));
       worker_.orb (this->orb_.in ());
 
       // Task activation flags.
@@ -110,8 +113,9 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
         THR_JOINABLE |
         this->orb_->orb_core ()->orb_params ()->thread_creation_flags ();
 
-      int priority = ACE_Sched_Params::priority_min (this->orb_->orb_core ()->orb_params ()->sched_policy (),
-                                                     this->orb_->orb_core ()->orb_params ()->scope_policy ());
+      int priority =
+        ACE_Sched_Params::priority_min (this->orb_->orb_core ()->orb_params ()->sched_policy (),
+                                        this->orb_->orb_core ()->orb_params ()->scope_policy ());
 
       if (worker_.activate (flags,
                             this->nthreads_, 0, priority) != 0)
@@ -135,14 +139,12 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   // Activate the factory
   this->notify_factory_ =
-    notify_service_->create (this->poa_.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    notify_service_->create (this->poa_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
-  // Make it bootstrappable, if asked.
-  if (this->bootstrap_)
+  if (this->bootstrap_) // Enable corbaloc usage
     {
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
@@ -154,7 +156,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       ACE_CHECK_RETURN (-1);
       if (CORBA::is_nil (adapter.in ()))
         {
-          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
+          ACE_ERROR ((LM_ERROR, "Nil IORTable. corbaloc support not enabled.\n"));
         }
       else
         {
@@ -172,10 +174,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   // Register with the Name service, if asked
   if (this->use_name_svc_)
     {
-      // Register the Factory
       ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
-
       CosNaming::Name_var name =
         this->naming_->to_name (this->notify_factory_name_.c_str ()
                                 ACE_ENV_ARG_PARAMETER);
@@ -183,8 +183,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
 
       this->naming_->rebind (name.in (),
-                            this->notify_factory_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+                             this->notify_factory_.in ()
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       ACE_DEBUG ((LM_DEBUG,
@@ -201,19 +201,18 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
           CosNotifyChannelAdmin::EventChannel_var ec =
             this->notify_factory_->create_channel (initial_qos,
-                                                  initial_admin,
-                                                  id
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                   initial_admin,
+                                                   id
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
-          name = this->naming_->to_name (
-            this->notify_channel_name_.c_str ()
-            ACE_ENV_ARG_PARAMETER);
+          name = this->naming_->to_name (this->notify_channel_name_.c_str ()
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           this->naming_->rebind (name.in (),
-                                ec.in ()
-                                ACE_ENV_ARG_PARAMETER);
+                                 ec.in ()
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -226,21 +225,22 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   // Write IOR to a file, if asked.
   // Note: do this last to ensure that we're up and running before the file is written
   CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in () ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (this->notify_factory_.in ()
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->ior_output_file_)
     {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
+      ACE_OS::fprintf (this->ior_output_file_, "%s", str.in ());
       ACE_OS::fclose (this->ior_output_file_);
       this->ior_output_file_ = 0;
-  }
+    }
   else if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "The Notification Event Channel Factory IOR is <%s>\n",
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "The Notification Event Channel Factory IOR is <%s>\n",
+                  str.in ()));
+    }
 
   return 0;
 }
@@ -260,8 +260,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -290,18 +289,18 @@ void
 TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
-  if (this->use_name_svc_)
-  {
-    // Unbind from the naming service.
-    CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->naming_->unbind (name.in ()
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
+  if (this->use_name_svc_ && !CORBA::is_nil (this->naming_.in ()))
+    {
+      // Unbind from the naming service.
+      CosNaming::Name_var name =
+        this->naming_->to_name (this->notify_factory_name_.c_str ()
+                                ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->naming_->unbind (name.in ()
+                             ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -311,12 +310,12 @@ TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_Arg_Shifter arg_shifter (argc, argv);
 
-    const ACE_TCHAR* current_arg = 0;
-    while (arg_shifter.is_anything_left ())
+  const ACE_TCHAR* current_arg = 0;
+  while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory"))))
+      if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory"))))
         {
           this->notify_factory_name_.set (ACE_TEXT_TO_CHAR_IN(current_arg));
           arg_shifter.consume_arg ();
@@ -342,7 +341,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput"))))
         {
           this->ior_output_file_ = ACE_OS::fopen (current_arg, ACE_TEXT("w"));
           if (this->ior_output_file_ == 0)
@@ -351,7 +350,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
                                current_arg), -1);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName"))))
         {
           this->notify_channel_name_.set(ACE_TEXT_TO_CHAR_IN(current_arg));
           arg_shifter.consume_arg ();
@@ -363,14 +362,14 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor"))))
         {
           ACE_DEBUG((LM_DEBUG, "-Notify_TPReactor option is deprecated, use -ORBRunThreads option\n"));
 
           this->nthreads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads"))))
         {
           this->nthreads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
@@ -381,10 +380,10 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
                      "usage: %s -Factory factory_name "
                      "-Boot -[No]NameSvc "
                      "-IORoutput file_name "
-                     "-Channel -ChannelName channel_name\n"
+                     "-Channel -ChannelName channel_name "
+                     "-ORBRunThreads threads\n"
                      "default: %s -Factory NotifyEventChannelFactory "
-                     "-NameSvc -Channel NotifyEventChannel\n",
-                     "-ORBRunThreads [threads]\n",
+                     "-NameSvc -Channel NotifyEventChannel -ORBRunThreads 1\n",
                      argv[0], argv[0]));
 
           arg_shifter.consume_arg ();
@@ -393,12 +392,10 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
         }
       else
         {
-          /*ACE_DEBUG((LM_DEBUG, "Unrecognized command %s",
-            arg_shifter.get_current ()));*/
-            arg_shifter.ignore_arg ();
+          arg_shifter.ignore_arg ();
         }
     }
-    return 0;
+  return 0;
 }
 
 /*****************************************************************/
@@ -416,6 +413,13 @@ Worker::orb (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
+#if 0
+  // ACE_Thread::getprio() fails on systems that do not support thread
+  // priorities.  While we could just treat the failure as benign, I'm
+  // just disabling it altogether.  It doesn't provide much value, and
+  // makes service startup needlessly more verbose.  See bugzilla 2477
+  // for details.
+
   ACE_hthread_t current;
   ACE_Thread::self (current);
 
@@ -427,6 +431,7 @@ Worker::svc (void)
     }
 
   ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
+#endif
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 835941e860a..33e1c5c86a3 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -25,7 +25,9 @@
 #include "../orbsvcs/Notify/CosNotify_Initializer.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Service;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #define NOTIFY_KEY "NotifyEventChannelFactory"
 #define NOTIFY_CHANNEL_NAME "NotifyEventChannel"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 5b13cba568e..251a4660756 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -13,6 +13,7 @@ project : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
 }
 
 project(NT_Notify_Service) : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
+  avoids += ace_for_tao
   exename  = NT_Notify_Service
   Source_Files {
     Notify_Service.cpp
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index 9036806a9bc..b9644240c23 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -90,12 +90,12 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
 {
   // Get a pointer to PSDL_Stream of the stub header.
   TAO_PSDL_Stream *ps_sh = TAO_PSDL_Scope::instance ()->get_sh ();
-  
+
   // Code that should be generated to the stub (idlC.h) according to
   // the specification.
   ps_sh->nl ();
   ps_sh->nl ();
-  
+
   ACE_CString name_space =
     TAO_PSDL_Scope::instance ()->get_name_space ();
 
@@ -120,7 +120,7 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
         {
           if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
             {
-              *ps_sh << "      " << "TAO_String_Manager"
+              *ps_sh << "      " << "TAO::String_Manager"
                    << " " << this->identifiers_[i+1]
                    << ";\n";
             }
diff --git a/TAO/orbsvcs/PSS/PSDL_Node.h b/TAO/orbsvcs/PSS/PSDL_Node.h
index 5dbe3fb02a5..464bcdc53bf 100644
--- a/TAO/orbsvcs/PSS/PSDL_Node.h
+++ b/TAO/orbsvcs/PSS/PSDL_Node.h
@@ -36,7 +36,7 @@
 class TAO_PSDL_Node_Visitor;
 class TAO_PSDL_Scope_Visitor;
 
-class TAO_String_Manager;
+class TAO::String_Manager;
 
 class TAO_PSDL_Export TAO_PSDL_Node
 {
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 20d21d2d669..49f72b07b7e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -55,7 +55,7 @@ TAO_PSDL_Struct_Visitor::visit_type_spec (TAO_PSDL_Type_Spec *type_spec)
       if (ACE_OS::strcmp (type.c_str (), "char *") == 0)
         {
           ps_sh->indent ();
-          *ps_sh << " TAO_String_Manager ";
+          *ps_sh << " TAO::String_Manager ";
         }
       else
         {
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index 43995bc6e1a..bb32c5e219f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am
index f98eda1cf61..22bb2e9a651 100644
--- a/TAO/orbsvcs/TAO_Service/Makefile.am
+++ b/TAO/orbsvcs/TAO_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index d4a28eb22ae..474b5debdad 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index 96e60ad6770..611a96415c7 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -32,6 +32,7 @@ Trading_Service_SOURCES = \
 
 Trading_Service_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
index 662a48bf280..5dcf0b5c9d1 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP
 	@touch $@
 
 
+noinst_HEADERS = \
+  CosEventChannelFactory.idl
+
 ## Makefile.CosEC_Factory_Client.am
 
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/examples/CosEC/Makefile.am b/TAO/orbsvcs/examples/CosEC/Makefile.am
index f8f648efc77..fc83f662130 100644
--- a/TAO/orbsvcs/examples/CosEC/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Factory \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
index 04535daeb37..8c8daad071b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         lib \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index be02495ba03..d74001a0687 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -3,7 +3,13 @@
 
 project : orbsvcsexe, rtevent_serv, event_skel, naming {
   after += CosEC_RtEC_Based_lib
-  includes += ../lib
   libs += CosEC_RtEC_Based
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
+
   libpaths += ../lib
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
index bd084639c8c..74f7f1dd02d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_bin.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = RtEC_Based_CosEC
@@ -54,6 +55,7 @@ RtEC_Based_CosEC_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
index aec74e8c7f4..fd3d67b82b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_lib.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libCosEC_RtEC_Based.la
@@ -49,6 +50,7 @@ noinst_HEADERS = \
   rtec_cosec_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 9bc366679f7..d3d306ab424 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -3,7 +3,13 @@
 
 project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    includes += ../../lib
+  }
+
   libpaths += ../../lib
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
index 03514fff03a..cd377c8edb7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Basic
@@ -59,6 +60,7 @@ Basic_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
index d6b34018ff9..6e509ce0f24 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index 3018aa6b8df..8b13ff7e584 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,22 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
   libpaths += ../../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    includes += ../../lib
+  }
+
   source_files {
     Consumer.cpp
     Multiple.cpp
   }
 }
 
-project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
   libpaths += ../../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    includes += ../../lib
+  }
+
   source_files {
     Supplier.cpp
     Multiple.cpp
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
index b001df4e92d..40a10fb6254 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.CosEC_RtEC_Based_Mult_Cons.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
@@ -40,6 +41,8 @@ Consumer_SOURCES = \
 
 Consumer_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
@@ -56,11 +59,13 @@ Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.CosEC_RtEC_Based_Mult_Supp.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
@@ -83,6 +88,8 @@ Supplier_SOURCES = \
 
 Supplier_LDADD = \
   $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
@@ -99,6 +106,7 @@ Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
index 2bf40c26247..9938d9c430d 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
index 2011068ce33..6fc82c5814c 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/FaultTolerance/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
index de68f48e20a..8dd0d109288 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         RolyPoly
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
index 802a5a425c0..05608d3ae59 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,12 +50,16 @@ RolyPoly-stamp: $(srcdir)/RolyPoly.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  RolyPoly.idl
+
 ## Makefile.RolyPoly_Client.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -102,6 +106,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
@@ -114,6 +119,7 @@ if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -163,6 +169,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
 endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ee990f2230b..ed3b767e2f4 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -2,6 +2,7 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
+#include "ace/Auto_Ptr.h"
 #include "tao/corba.h"
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index eb8ba7d797e..210009bf339 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -308,7 +308,7 @@ ReplicaController::send_reply (
 
   CORBA::OctetSeq_var reply;
 
-  ACE_NEW (reply, CORBA::OctetSeq (cdr.total_length ()));
+  ACE_NEW (reply.out (), CORBA::OctetSeq (cdr.total_length ()));
 
   reply->length (cdr.total_length ());
 
@@ -372,7 +372,7 @@ ReplicaController::send_reply (
 
     CORBA::OctetSeq_var msg;
 
-    ACE_NEW (msg, CORBA::OctetSeq (size));
+    ACE_NEW (msg.out (), CORBA::OctetSeq (size));
 
     msg->length (size);
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
index 86ef79f0ee1..536da453345 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -79,6 +79,10 @@ Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Manager.idl \
+  Messenger.idl
+
 ## Makefile.Advanced_Client.am
 
 if BUILD_EXCEPTIONS
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 4b0ec533a33..a96a0c6c277 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -8,9 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/Get_Opt.h"
-#include "ace/streams.h"
-
-using std::string;
 
 TestClient::TestClient(CORBA::ORB_ptr orb, int argc, char* argv[])
 : orb_(CORBA::ORB::_duplicate(orb))
@@ -119,9 +116,9 @@ void TestClient::pause(int milliseconds)
 
 void TestClient::run()
 {
-  cout << "Starting Client." << endl;
+  ACE_DEBUG((LM_DEBUG, "Starting Client.\n"));
   pause(startupPause_);
-  cout << "* Client started." << endl;
+  ACE_DEBUG((LM_DEBUG, "* Client started.\n"));
 
   buildIORList();
 
@@ -131,19 +128,21 @@ void TestClient::run()
   }
   wait();
 
-  cout << "* Client ended." << endl;
+  ACE_DEBUG((LM_DEBUG, "* Client ended.\n"));
+
 }
 
 // Read in the stringified object references into an array
 // Warning: The file may contain many separate IORs separated by linefeeds.
 void TestClient::buildIORList()
 {
-  ifstream iorFile("imr_test.ior");
-  while (! iorFile.fail())
+  FILE* iorFile = ACE_OS::fopen ("imr_test.ior", "r");
+  if ( iorFile == NULL )
+    ACE_ERROR ((LM_ERROR, "Fail to open imr_test.ior\n"));
+
+  ACE_TString ior;
+  while (getline(iorFile, ior) != EOF )
   {
-    string ior;
-    std::getline(iorFile, ior, '\n');
- 
     if (ior.length() > 0)
       iors_.push_back(ior);
     else
@@ -156,14 +155,16 @@ int TestClient::svc()
   // Every invocation of svc increates the thread count
   instance_++;
   int threadNum = instance_;
-  cout << "* Client Thread started (" << threadNum << "." << iterations_
-    << "." << iors_.size() << "." << requestCount_ << ")" << endl;
+  size_t vec_size = iors_.size();
+
+  ACE_DEBUG((LM_DEBUG, "* Client Thread started (%d.%d.%d.%d)\n",
+             threadNum, iterations_, vec_size, requestCount_));
 
   int     i           = 0;
   size_t  objIter     = 0;
   int     requestIter = 0;
 
-  string currentIOR;
+  ACE_TString currentIOR;
 
   ACE_OS::srand(ACE_OS::time());
 
@@ -176,7 +177,7 @@ int TestClient::svc()
     for (i = 1; i <= iterations_; i++)
     {
       // For each object reference read from file
-      for (objIter = 1; objIter <= iors_.size(); objIter++)
+      for (objIter = 1; objIter <= vec_size; objIter++)
       {
         requestIter = -1;
         // Get a imr_test_var
@@ -205,8 +206,8 @@ int TestClient::svc()
                 // If these exceptions are expected record the number of instances, otherwise rethrow
                 if (expectHolding_ == true && ex.minor() == TAO_POA_HOLDING)
                 {
-                  cout << "Caught expected holding exception with ("
-                    << threadNum << "." << objIter << "." << requestIter << ") " << endl;
+                   ACE_ERROR((LM_ERROR, "Caught expected holding exception with (%d.%d.%d)\n",
+                     threadNum, objIter, requestIter));
                   holdingCount++;
                 }
                 else
@@ -216,8 +217,8 @@ int TestClient::svc()
                 if (expectNoProfile_ == true
                   && ex.minor() == TAO_INVOCATION_SEND_REQUEST_MINOR_CODE)
                 {
-                  cout << "Caught expected no profile exception with ("
-                    << threadNum << "." << objIter << "." << requestIter << ") " << endl;
+                   ACE_ERROR((LM_ERROR, "Caught expected holding exception with (%d.%d.%d)\n",
+                     threadNum, objIter, requestIter));
                   noProfileCount++;
                 }
                 else
@@ -235,22 +236,22 @@ int TestClient::svc()
     // Report expected exceptions
     if (holdingCount > 0)
     {
-      cout << "Client thread " << threadNum << " received "
-        << holdingCount << " holding error(s)." << endl;
+      ACE_DEBUG((LM_DEBUG,"Client thread %d received %d holding error(s).\n",
+                 threadNum, holdingCount));
     }
 
     if (noProfileCount > 0)
     {
-      cout << "Client thread " << threadNum << " received "
-        << noProfileCount << " no profile error(s)." << endl;
+      ACE_DEBUG((LM_DEBUG,"Client thread %d received %d no profile error(s).\n",
+                 threadNum, noProfileCount));
     }
 
     return 0;
   } // try
   catch (CORBA::Exception& ex)
   {
-    cerr << "CORBA client error with (" << threadNum << "." << i
-      << "." << objIter << "." << requestIter << "):" << currentIOR.c_str() << endl;
+    ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
+               threadNum, i, objIter, requestIter, currentIOR.c_str()));
     ACE_PRINT_EXCEPTION(ex, "");
   }
   return 1;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
index d2f989111cc..237437daa5c 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
@@ -5,8 +5,9 @@
 
 #include <vector>
 #include <string>
+#include "ace/Capabilities.h"
 
-class TestClient : public ACE_Task_Base
+class TestClient : public ACE_Task_Base, public ACE_Capabilities
 {
 public:
   TestClient(CORBA::ORB_ptr orb, int argc, char* argv[]);
@@ -22,7 +23,7 @@ private:
   virtual int svc();
 
   CORBA::ORB_var     orb_;
-  std::vector<std::string> iors_;
+  std::vector<ACE_TString> iors_;
 
   char               pauseType_;
   int                startupPause_;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index cb83d318cb1..da11974ffca 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -279,9 +279,8 @@ bool TestServer::verifyEnvironment() const
   string currentDir = getWorkingPath();
   if (expectedDir_.empty() == false && currentDir != expectedDir_)
   {
-    cout << "Error: directory paths ("
-      << currentDir << ", " << expectedDir_
-      << ") do not match." << endl;
+    ACE_DEBUG((LM_DEBUG, "Error: directory paths (%s,%s) do not match.\n",
+               currentDir.c_str(), expectedDir_.c_str()));
     err |= true;
   }
 
@@ -291,16 +290,14 @@ bool TestServer::verifyEnvironment() const
     const char* realValue = ACE_OS::getenv(expectedEnv_[i].first.c_str()) ;
     if (realValue == NULL)
     {
-      cout << "Error: env variable '"
-        << expectedEnv_[i].first
-        << "' not found." << endl;
+      ACE_DEBUG((LM_DEBUG, "Error, env variable '%s' not found\n",
+                 expectedEnv_[i].first.c_str()));
       err |= true;
     }
     else if (expectedEnv_[i].second != realValue)
     {
-      cout << "Error: env variable '" << expectedEnv_[i].first << "' values ("
-        << realValue << ", " << expectedEnv_[i].second
-        << ") do not match." << endl;
+      ACE_DEBUG((LM_DEBUG, "Error, env variable '%s' values (%s,%s) do not match.\n",
+                 expectedEnv_[i].first.c_str(), realValue, expectedEnv_[i].second.c_str()));
       err |= true;
     }
   }
@@ -343,7 +340,8 @@ void TestServer::run()
   if (registerWithManager() == false)
     return;
 
-  cout << "* Server (" << serverID_ << "." << serverInstanceID_ << ") started." << endl;
+  ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) started.\n",
+             serverID_, serverInstanceID_));
 
   if (useIORTable_ == true)
   {
@@ -372,13 +370,13 @@ void TestServer::run()
 
   if (orb_->orb_core()->has_shutdown() != 0)
   {
-    cout << "* Server (" << serverID_ << "."
-      << serverInstanceID_ << ") ended." << endl;
+    ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) ended.\n",
+               serverID_, serverInstanceID_));
   }
   else
   {
-    cout << "* Server (" << serverID_ << "."
-      << serverInstanceID_ << ") self terminated." << endl;
+    ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) self terminated.\n",
+               serverID_, serverInstanceID_));
   }
 }
 
@@ -410,7 +408,7 @@ bool TestServer::registerWithManager()
       int diff = manager->endRetry();
       if (diff != 0)
       {
-        cout << "* Server Error: Not all retry attempts were made." << endl;
+        ACE_DEBUG((LM_DEBUG, "* Server Error: Not all retry attempts were made.\n"));
       }
       return false;
     }
@@ -419,8 +417,8 @@ bool TestServer::registerWithManager()
       serverInstanceID_  = manager->registerServer();
       if (serverInstanceID_ == -1)
       {
-        cout << "* Server (" << serverID_ << "."
-          << serverInstanceID_ << ") could not register." << endl;
+        ACE_DEBUG((LM_DEBUG, "* Server (%d,%d) could not register.\n",
+                   serverID_, serverInstanceID_));
         return false;
       }
     }
@@ -454,7 +452,7 @@ void TestServer::buildObjects()
       poaName = poaStream.str();
     }
 
-    cout << "* Creating POA:  " <<  poaName << endl;
+    ACE_DEBUG((LM_DEBUG, "* Creating POA: %s\n", poaName.c_str()));
 
     PortableServer::POA_var sub_poa = root_->create_POA(poaName.c_str(), mgr_.in(), policies);
 
@@ -469,7 +467,7 @@ void TestServer::buildObjects()
         objStream << "OBJ_" << serverID_ << "_" << (i + 1) << "_" << (j + 1);
         objName = objStream.str();
       }
-      cout << "* Activating Obj:  " << objName << endl;
+      ACE_DEBUG((LM_DEBUG, "* Activating Obj: %s\n", objName.c_str()));
 
       PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId(objName.c_str());
       sub_poa->activate_object_with_id(oid.in(), servant_.get());
@@ -508,7 +506,7 @@ void TestServer::buildObjects()
           corbaloc += key;
 
           // Write out corbaloc
-          iorFile << corbaloc << endl;
+          iorFile << corbaloc.c_str() << endl;
         }
       }
     }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
index 163e1365165..b063eebe7dc 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -79,6 +79,10 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  service_config.idl \
+  test.idl
+
 ## Makefile.ImR_Combined_Service.am
 
 if BUILD_EXCEPTIONS
@@ -149,7 +153,7 @@ libDynServer_la_SOURCES = \
   testC.cpp \
   testS.cpp
 
-noinst_HEADERS = \
+noinst_HEADERS += \
   dynserver.h \
   dynserver_export.h
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 83ba21920a8..807f4a68a0f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -3,18 +3,21 @@
 
 #include "testC.h"
 
-#include <stdexcept>
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Argv_Type_Converter.h"
 
+#include <stdexcept>
+#include <string>
+
+
 #define assertTrue(CONDITION) \
     if (CONDITION == false) { \
-      ACE_CString str("Error : "#CONDITION" "__FILE__":"); \
+      ACE_CString str ("Error : "#CONDITION" "__FILE__":"); \
       char line[32]; \
-      ACE_OS::sprintf(line, "%d", __LINE__); \
-      throw std::runtime_error(str.c_str()); \
+      ACE_OS::sprintf (line, "%d", __LINE__); \
+      throw std::runtime_error (str.c_str ()); \
     }
 
 using namespace CORBA;
@@ -23,23 +26,25 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
 
-  try {
- 
-    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
+  try
+    {
+      ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
-    Object_var obj = orb->resolve_initial_references("Test");
-    test_var test = test::_narrow(obj.in());
-    assertTrue(! is_nil(test.in()));
+      Object_var obj = orb->resolve_initial_references ("Test");
+      test_var test = test::_narrow (obj.in ());
+      assertTrue (!is_nil (test.in ()));
 
-    Long n = test->get();
-    Long m = test->get();
-    assertTrue(m == n + 1);
- 
-    ACE_DEBUG((LM_DEBUG, "All tests ran successfully.\n"));
+      Long n = test->get ();
+      Long m = test->get ();
+      assertTrue (m == n + 1);
 
-    return 0;
-  } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "test:");
-  }
+      ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n"));
+
+      return 0;
+    }
+  catch (CORBA::Exception& e)
+    {
+      ACE_PRINT_EXCEPTION (e, "test:");
+    }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Makefile.am b/TAO/orbsvcs/examples/ImR/Makefile.am
index a2e0227610a..0b48755fb65 100644
--- a/TAO/orbsvcs/examples/ImR/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Advanced \
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index 7901322f062..3797e1cd0af 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -7,7 +7,8 @@ project(*idl) : taoidldefaults, anytypecode {
 }
 
 project(*Server): taoexe, loadbalancing, pi_server, exceptions {
-  after += *idl
+  avoids += ace_for_tao
+  after  += *idl
   Source_Files {
     ServerRequestInterceptor.cpp
     ORBInitializer.cpp
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
index be112a74267..cdfb9d9bfd1 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
 
 ## Makefile.LoadBalancing_Idl.am
 
@@ -49,9 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.LoadBalancing_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -74,11 +80,14 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.LoadBalancing_Server.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -124,6 +133,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 189a1cad016..7768134b610 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -31,7 +31,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_LB_LoadAlert;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ServerRequestInterceptor
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
index df4614a7f86..9d3b10cddcc 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am
index 32a750f2032..5fad8b3b991 100644
--- a/TAO/orbsvcs/examples/Log/Event/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/Makefile.am b/TAO/orbsvcs/examples/Log/Makefile.am
index 0ac9d35f6a2..2ce0dbc980d 100644
--- a/TAO/orbsvcs/examples/Log/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic \
diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
index 6db9cd17c3e..46d235ac030 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
index 15f071cbc2a..0c83282a06d 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,12 +35,6 @@ RTEvent_Consumer_SOURCES = \
 
 RTEvent_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -77,12 +71,6 @@ RTEvent_Supplier_SOURCES = \
 
 RTEvent_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
diff --git a/TAO/orbsvcs/examples/Makefile.am b/TAO/orbsvcs/examples/Makefile.am
index 6946fc50461..b93a6688dc9 100644
--- a/TAO/orbsvcs/examples/Makefile.am
+++ b/TAO/orbsvcs/examples/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         CosEC \
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index 897298573c4..1083905d845 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -5,5 +5,10 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = agent
   after += Gate
   libs += Gate
-  includes += ..
+
+  specific (automake) {
+    includes += $(srcdir)/..
+  } else {
+    includes += ..
+  }
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
index d501c88ddad..ae1c7216075 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Agent.am
 
 if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = agent
@@ -54,6 +55,7 @@ agent_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
index e08d005cca6..30fdd5a97a3 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Gate.am
 
 if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libGate.la
@@ -40,6 +41,7 @@ noinst_HEADERS = \
   Gate.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
index e2cd22eac8a..3e06864939a 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Gate \
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
index 0b95a973522..dc08a9bae17 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.SpaceCraft.am
 
 if BUILD_THREADS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = craft
@@ -54,6 +55,7 @@ craft_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_THREADS
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index e5d56c9be40..8c44304de30 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -5,5 +5,10 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = craft
   after += Gate
   libs += Gate
-  includes += ..
+
+  specific (automake) {
+    includes += $(srcdir)/..
+  } else {
+    includes += ..
+  }
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/federation.mwc b/TAO/orbsvcs/examples/Notify/Federation/federation.mwc
deleted file mode 100644
index 5be03124c71..00000000000
--- a/TAO/orbsvcs/examples/Notify/Federation/federation.mwc
+++ /dev/null
@@ -1,5 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-workspace {
-}
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
index 1b9aea27185..f7fb9130144 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
index 1797a1486f7..3115e27c5f6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Notify_Lanes_Consumer.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -45,9 +46,14 @@ Consumer_SOURCES = \
 Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -64,6 +70,7 @@ Consumer_LDADD = \
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Notify_Lanes_Supplier.am
 
diff --git a/TAO/orbsvcs/examples/Notify/Makefile.am b/TAO/orbsvcs/examples/Notify/Makefile.am
index f7629bec5f9..2ddbd449fb9 100644
--- a/TAO/orbsvcs/examples/Notify/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Federation \
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
index 3064ac4889d..fcbd47a2d9c 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = main
+noinst_PROGRAMS = Subscribe
 
-main_CPPFLAGS = \
+Subscribe_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -29,12 +29,12 @@ main_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL
 
-main_SOURCES = \
+Subscribe_SOURCES = \
   Subscribe.cpp \
   main.cpp \
   Subscribe.h
 
-main_LDADD = \
+Subscribe_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index 6684e2215b1..39521d11a30 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, notification, notification_skel, naming, minimum_corba {
+  exename = Subscribe
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
index a1ebe89bc56..130c85fa5b5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Notify_ThreadPool_Consumer.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -45,6 +46,11 @@ Consumer_SOURCES = \
 Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
@@ -65,9 +71,11 @@ Consumer_LDADD = \
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Notify_ThreadPool_Supplier.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -96,6 +104,11 @@ Supplier_SOURCES = \
 Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
@@ -116,6 +129,7 @@ Supplier_LDADD = \
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
index bbc3ee76c13..066749b8639 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile.am
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -112,6 +112,11 @@ sum_server-stamp: $(srcdir)/sum_server.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Gateway.idl \
+  ObjectReferenceFactory.idl \
+  sum_server.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.ORT_Gateway.am
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index ebe74844f8d..82fc927aab8 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -42,7 +42,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori
 }
 
 project(*Client) : orbsvcsexe, event, minimum_corba {
-  after += *Server
+  after += *Idl *Server
   source_files {
     client.cpp
     sum_serverC.cpp
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index f81c30f78ae..4fc119dfc39 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -49,7 +49,7 @@ Server_IORInterceptor::components_established (
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  Gateway_ObjRef_Factory *my_factory;
+  Gateway_ObjRef_Factory *my_factory = 0;
 
   PortableInterceptor::ObjectReferenceFactory_var current_factory =
     ior_info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 372f50ec150..a77551ad136 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -20,7 +20,7 @@
 #endif /* _MSC_VER */
 
 class Server_IORInterceptor
-  : public virtual PortableInterceptor::IORInterceptor,
+  : public virtual PortableInterceptor::IORInterceptor_3_0,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
index 011e6455fee..73c1ace16cb 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.RtEC_IIOPGateway.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Gateway
 
@@ -48,6 +49,7 @@ Gateway_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_IIOPGateway_Consumer.am
@@ -87,6 +89,7 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.RtEC_IIOPGateway_EC.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += EC
 
@@ -117,6 +120,7 @@ EC_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_IIOPGateway_Supplier.am
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
index bfc7bc5aa08..f2e00e44bc0 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtECKokyu.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
 
@@ -54,6 +55,7 @@ Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
index 1f85d98f452..48805140016 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_MCast.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
 
@@ -53,6 +54,7 @@ MCast_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/Makefile.am b/TAO/orbsvcs/examples/RtEC/Makefile.am
index 3e45d927786..7fc730d6850 100644
--- a/TAO/orbsvcs/examples/RtEC/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         IIOPGateway \
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
index d4b3c2e8f48..84401da731f 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_Schedule.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
 
@@ -52,6 +53,7 @@ Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
index 904b8f97d78..d9066e3eddc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,6 +52,7 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.RtEC_Simple_Service.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Service
 
@@ -83,6 +84,7 @@ Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RtEC_Simple_Supplier.am
diff --git a/TAO/orbsvcs/examples/Security/Makefile.am b/TAO/orbsvcs/examples/Security/Makefile.am
index e65ff9e291b..9772a9daeed 100644
--- a/TAO/orbsvcs/examples/Security/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Send_File
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
index 4d148a8f862..22de7dc4c4f 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Security_Send_File_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 77e99306a29..1a2b0bdadab 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(AV) : orbsvcslib, core, property, naming, qos {
+project(AV) : orbsvcslib, core, property_serv, naming, qos, tao_versioning_idl_defaults {
+  avoids       += ace_for_tao
   sharedname    = TAO_AV
   idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h
   dynamicflags  = TAO_AV_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index ab7e90ef875..1a686da4f39 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -14,10 +14,10 @@
 //
 // ============================================================================
 
-#include "AVStreams_i.h"
-#include "sfp.h"
-#include "MCast.h"
-#include "RTCP.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/AV/sfp.h"
+#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/AV/RTCP.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -25,13 +25,15 @@
 #include "ace/OS_NS_arpa_inet.h"
 
 #if !defined (__ACE_INLINE__)
-#include "AVStreams_i.i"
+#include "orbsvcs/AV/AVStreams_i.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (AV,
            AVStreams_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_Qos
 //------------------------------------------------------------
@@ -812,7 +814,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               ACE_TRY_CHECK_EX (set_source_id);
               AVStreams::flowSpec_var flows;
               *flows_any >>= flows.out ();
-              for (u_int i=0; i< flows->length ();i++)
+              for (CORBA::ULong i=0; i< flows->length ();++i)
                 {
                   CORBA::Object_var fep_obj =
                     this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER);
@@ -828,7 +830,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                   ACE_CATCHANY
                     {
                       if (TAO_debug_level > 0)
-                        ACE_DEBUG ((LM_DEBUG, " %s ", flows[i].in ()));
+                        ACE_DEBUG ((LM_DEBUG, " %s ", static_cast<char const*>(flows[i])));
 
                       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "producer_check: not a producer");
 
@@ -1104,28 +1106,28 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           0);
           for (i=0; i< flow_spec.length ();i++)
             {
-              TAO_Forward_FlowSpec_Entry *entry;
+              TAO_Forward_FlowSpec_Entry *entry = 0;
               ACE_NEW_RETURN (entry,
                               TAO_Forward_FlowSpec_Entry,
                               0);
-              entry->parse (flow_spec[i].in ());
+              entry->parse (flow_spec[i]);
               ACE_CString fep_key (entry->flowname ());
               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].in ()), 0);
+                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on A side for flowname: %s\n", flow_spec[i]), 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].in ()));
+                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i]));
 
               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].in ()), 0);
+                ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on B side for flowname: %s\n", flow_spec[i]), 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].in ()));
+                if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i]));
             }
           map_a = spec_fep_map_a;
           map_b = spec_fep_map_b;
@@ -1447,7 +1449,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
           for (u_int i=0;i < flowspec.length ();i++)
             {
               TAO_Forward_FlowSpec_Entry entry;
-              entry.parse (flowspec [i].in ());
+              entry.parse (flowspec [i]);
               int direction = entry.direction ();
               if (direction == 0)
                 {
@@ -1851,8 +1853,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
           for (u_int i=0;i<peer_protocols.length ();i++)
             {
               for (u_int j=0;j<this->protocols_.length ();j++)
-                if (ACE_OS::strcmp (peer_protocols [i].in(),
-                                    this->protocols_[j].in()) == 0)
+                if (ACE_OS::strcmp (static_cast<const char*>(peer_protocols [i]),
+                                    static_cast<const char*>(this->protocols_[j])) == 0)
                   {
                     // we'll agree upon the first protocol that matches.
                     this->protocol_ = CORBA::string_dup (peer_protocols [i]);
@@ -1942,7 +1944,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
           ACE_NEW_RETURN (entry,
                           TAO_Reverse_FlowSpec_Entry,
                           0);
-          if (entry->parse (flow_spec[i].in ()) == -1)
+          if (entry->parse (flow_spec[i]) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Reverse_Flow_Spec_Set::parse failed\n"),
                               0);
@@ -2014,17 +2016,17 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
                begin != end; ++begin)
             {
               TAO_Forward_FlowSpec_Entry entry;
-               entry.parse (flow_spec[i].in ());
-               if (ACE_OS::strcmp ((*begin)->flowname (), entry.flowname ()) == 0)
-                {
-                  TAO_FlowSpec_Entry *entry = *begin;
-                  //                  (*begin)->protocol_object ()->stop ();
-                  if (entry->handler() != 0)
-                    entry->handler ()->stop (entry->role ());
-                  if (entry->control_handler () != 0)
-                    entry->control_handler ()->stop (entry->role ());
-                  break;
-                }
+              entry.parse (flow_spec[i]);
+              if (ACE_OS::strcmp ((*begin)->flowname (), entry.flowname ()) == 0)
+               {
+                 TAO_FlowSpec_Entry *entry = *begin;
+                 //                  (*begin)->protocol_object ()->stop ();
+                 if (entry->handler() != 0)
+                   entry->handler ()->stop (entry->role ());
+                 if (entry->control_handler () != 0)
+                   entry->control_handler ()->stop (entry->role ());
+                 break;
+               }
             }
         }
     }
@@ -2067,7 +2069,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
                forward_begin != end; ++forward_begin)
             {
               TAO_FlowSpec_Entry *entry = *forward_begin;
-              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2086,7 +2088,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
                reverse_begin != end; ++reverse_begin)
             {
               TAO_FlowSpec_Entry *entry = *reverse_begin;
-              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2286,7 +2288,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
     ACE_DEBUG ((LM_DEBUG,
                 "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
 
-
   int result = 0;
   ACE_TRY
     {
@@ -2308,10 +2309,9 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
-                    "flowspec has length = %d"
-                    "and the strings are:",
+                    "flowspec has length = %d and the strings are:\n",
                     flow_spec.length ()));
-      u_int i;
+      CORBA::ULong i;
 
       for (i=0;i<flow_spec.length ();i++)
         {
@@ -2320,18 +2320,24 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                           TAO_Forward_FlowSpec_Entry,
                           0);
 
+          CORBA::String_var string_entry = CORBA::string_dup (flow_spec[i]);
+
           if(TAO_debug_level > 0)
-             ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() ));
+             ACE_DEBUG(( LM_DEBUG,
+                         "%N:%l Parsing flow spec: [%s]\n",
+                         string_entry.in ()));
 
-          if (entry->parse (flow_spec[i]) == -1)
+          if (entry->parse (string_entry.in ()) == -1)
           {
             if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG, "%N:%l Error parsing flow_spec: %s\n", flow_spec[i].in() ));
+              ACE_DEBUG ((LM_DEBUG,
+                          "%N:%l Error parsing flow_spec: [%s]\n",
+                          string_entry.in ()));
             return 0;
           }
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO_StreamEndPoint::request_connection Flow Spec %s",
+                        "TAO_StreamEndPoint::request_connection flow spec [%s]\n",
                         entry->entry_to_string ()));
 
           this->forward_flow_spec_set.insert (entry);
@@ -2373,7 +2379,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
   for (int i = 0; (unsigned) i < the_flows.length (); i++)
     {
       TAO_Forward_FlowSpec_Entry entry;
-      entry.parse (the_flows [i].in ());
+      entry.parse (the_flows [i]);
       ACE_CString flow_name_key (entry.flowname ());
       Flow_Handler_Map_Entry *handler_entry;
       if (this->flow_handler_map_.find (flow_name_key,
@@ -2618,7 +2624,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
       // redefine the "Flows" property
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0)
+        if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -3842,7 +3848,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name
 
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0)
+        if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -4460,10 +4466,13 @@ TAO_FlowEndPoint::open (const char *flowname,
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
       for (u_int i=0;i<protocols.length ();i++)
         {
-          CORBA::String_var address = CORBA::string_dup (protocols [i].in ());
+          CORBA::String_var address = CORBA::string_dup (protocols [i]);
           TAO_Forward_FlowSpec_Entry entry ("", "", "", "", address.in ());
           protocol_spec [i] = CORBA::string_dup (entry.carrier_protocol_str ());
-          if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ()));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "[%s]\n",
+                        static_cast<char const*>(protocol_spec[i])));
         }
       this->set_protocol_restriction (protocol_spec
                                       ACE_ENV_ARG_PARAMETER);
@@ -4655,7 +4664,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
       for (i=0;i<protocols.length ();i++)
         {
-          const char *protocol = (protocols)[i].in ();
+          const char *protocol = (protocols)[i];
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol));
         }
       CORBA::Any AvailableProtocols_property;
@@ -4672,7 +4681,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
       for (i=0;i<temp_spec->length ();i++)
         {
-          const char *protocol = (*temp_spec)[i].in ();
+          const char *protocol = (*temp_spec)[i];
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol));
         }
       this->protocols_ = protocols;
@@ -5296,3 +5305,5 @@ TAO_Tokenizer::operator [] (size_t index) const
 
   return this->token_array_[index];
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index c40d26c3e1e..8e23294c9bc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -15,6 +15,18 @@
 #define AVSTREAMS_I_H
 #include /**/ "ace/pre.h"
 
+#include "orbsvcs/AV/AV_Core.h"
+
+#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/CosPropertyS.h"
+#include "orbsvcs/AVStreamsS.h"
+#include "orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/Null_MediaCtrlS.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+
 #include "ace/OS.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/ATM_Addr.h"
@@ -28,19 +40,11 @@
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
 
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/CosPropertyS.h"
-#include "orbsvcs/AVStreamsS.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/Null_MediaCtrlS.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-
 #define FLOWSPEC_MAX 5
 // for the Hash_Map helper classes.
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Hash_Map_Manager <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex>  FlowEndPoint_Map;
 typedef ACE_Hash_Map_Entry <ACE_CString,AVStreams::FlowEndPoint_var> FlowEndPoint_Map_Entry;
 typedef ACE_Hash_Map_Iterator <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex>  FlowEndPoint_Map_Iterator;
@@ -50,7 +54,6 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E
 typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex>  Flow_Handler_Map_Iterator;
 
 
-#include "AV_Core.h"
 
 class TAO_AV_Export AV_Null_MediaCtrl
   : public virtual POA_Null_MediaCtrl
@@ -1518,15 +1521,16 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#include "Transport.h"
+#include "orbsvcs/AV/Transport.h"
 
 #if defined (__ACE_INLINE__)
 #include "tao/debug.h"
-#include "AVStreams_i.i"
+#include "orbsvcs/AV/AVStreams_i.i"
 #endif /* __ACE_INLINE__ */
 
-#include "Flows_T.h"
+#include "orbsvcs/AV/Flows_T.h"
 
 #include /**/ "ace/post.h"
 #endif /* AVSTREAMS_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
index e192b5f05a0..81731c09f05 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// AVStreams_i.i
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_AV_QoS &
@@ -58,4 +59,4 @@ TAO_AV_QoS::get_flow_qos (const char *flowname,
   return 0;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index de9876a3e7b..1525b981483 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -24,6 +24,8 @@
 
 #include "ace/Dynamic_Service.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_Core
 //------------------------------------------------------------
@@ -1167,7 +1169,6 @@ TAO_AV_Core::get_flowname (const char *flow_spec_entry_str)
   return CORBA::string_dup (flow_name.c_str ());
 }
 
-
 ACE_CString
 TAO_AV_Core::get_control_flowname(const char *flowname)
 {
@@ -1181,3 +1182,5 @@ TAO_AV_Core::get_control_flowname(const char *flowname)
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 75cb061cf05..4a8f29aa137 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -23,6 +23,12 @@
 #include "ace/Unbounded_Set.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Base_StreamEndPoint;
 class TAO_AV_Connector_Registry;
 class TAO_AV_Acceptor_Registry;
@@ -33,7 +39,6 @@ class TAO_AV_Transport_Item;
 class TAO_AV_Transport_Factory;
 class TAO_AV_Flow_Protocol_Item;
 class TAO_AV_Flow_Protocol_Factory;
-class ACE_Reactor;
 
 typedef ACE_Unbounded_Set <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSet;
 typedef ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSetItor;
@@ -170,5 +175,7 @@ TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex)
 
 typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AV_CORE_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index e3650819d12..866a1386f9e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#include "Endpoint_Strategy.h"
+#include "orbsvcs/AV/Endpoint_Strategy.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -23,6 +23,8 @@
 
 ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ----------------------------------------------------------------------
 // TAO_AV_Endpoint_Strategy
 // ----------------------------------------------------------------------
@@ -429,3 +431,5 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
   ACE_CHECK_RETURN (-1);
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 61a55dd05d5..2cc9158853b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,7 +15,8 @@
 #define TAO_AV_ENDPOINT_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+#include "ace/os_include/os_netdb.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -25,6 +25,12 @@
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Process_Options;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_AV_Endpoint_Strategy
  *
@@ -171,8 +177,10 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Include the templates here.
-#include "Endpoint_Strategy_T.h"
+#include "orbsvcs/AV/Endpoint_Strategy_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index afc93eb5ddc..b52287ef621 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -1,19 +1,22 @@
 // $Id$
 
-#ifndef TAO_AV_ENDPOINT_STRATEGY_T_C
-#define TAO_AV_ENDPOINT_STRATEGY_T_C
+#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP
+#define TAO_AV_ENDPOINT_STRATEGY_T_CPP
 
-#include "Endpoint_Strategy_T.h"
+#include "orbsvcs/AV/Endpoint_Strategy_T.h"
 
 #include "tao/debug.h"
 
 #include "ace/Process_Semaphore.h"
+#include "ace/OS_NS_unistd.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ----------------------------------------------------------------------
 // TAO_AV_Endpoint_Reactive_Strategy
 // ----------------------------------------------------------------------
 
-
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void)
    :  stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0),
@@ -829,4 +832,6 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro
 {
 }
 
-#endif /* TAO_AV_ENDPOINT_STRATEGY_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_AV_ENDPOINT_STRATEGY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 7f4c6de12f4..45210da5406 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -12,13 +11,13 @@
  */
 //=============================================================================
 
-
-
 #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H
 #define TAO_AV_ENDPOINT_STRATEGY_T_H
 #include /**/ "ace/pre.h"
 
-#include "Endpoint_Strategy.h"
+#include "orbsvcs/AV/Endpoint_Strategy.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_AV_Endpoint_Reactive_Strategy
@@ -280,8 +279,10 @@ public:
   virtual ~TAO_AV_Child_Process_B (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Endpoint_Strategy_T.cpp"
+#include "orbsvcs/AV/Endpoint_Strategy_T.cpp"
 #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index 6aa86653c46..e7cca074af3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -1,12 +1,13 @@
-// Fill_ACE_QoS.cpp
 // $Id$
 
-#include "Fill_ACE_QoS.h"
+#include "orbsvcs/AV/Fill_ACE_QoS.h"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
 ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const iovec Fill_ACE_QoS::iov_ = {0,0};
 
 Fill_ACE_QoS::Fill_ACE_QoS (void)
@@ -69,4 +70,6 @@ Fill_ACE_QoS::map (void)
   return this->flow_spec_map_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index edec3a1b093..ede10e0e1ec 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,12 +18,16 @@
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Synch.h"
 #include "ace/ACE.h"
 #include "ace/OS_QoS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class Fill_ACE_QoS
  * 
@@ -76,5 +80,7 @@ private:
   FLOW_SPEC_HASH_MAP flow_spec_map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
 #endif /* FILL_ACE_QOS_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 8e9913ab68f..772a72b9356 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -4,17 +4,19 @@
 // TAO_FlowSpec_Entry
 //------------------------------------------------------------
 
-#include "FlowSpec_Entry.h"
-#include "Protocol_Factory.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
 
 #include "tao/debug.h"
 
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "FlowSpec_Entry.i"
+#include "orbsvcs/AV/FlowSpec_Entry.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // constructor.
 TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
   :address_ (0),
@@ -238,7 +240,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
                                    TAO_AV_Core::Flow_Component flow_comp)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address %s\n", address));
+    ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address [%s]\n", address));
 
   if (address == 0)
     return 0;
@@ -379,7 +381,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
                 }
             }
 
-          short control_port = ACE_OS::atoi(port_tokenizer[0]) + 1;
+          short control_port = static_cast<short> (ACE_OS::atoi(port_tokenizer[0])) + 1;
           char control_port_str[6];
           sprintf (control_port_str, "%d", control_port);
 
@@ -545,7 +547,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
 
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO_Forward_FlowSpec_Entry::parse %s\n",
+                  "TAO_Forward_FlowSpec_Entry::parse [%s]\n",
                   flowSpec_entry));
 
   if (tokenizer [TAO_AV_DIRECTION] != 0)
@@ -898,7 +900,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "TAO_Reverse_FlowSpec_Entry::parse %s\n",
+                "TAO_Reverse_FlowSpec_Entry::parse [%s]\n",
                 flowSpec_entry));
 
   if (tokenizer [TAO_AV_ADDRESS] != 0)
@@ -1015,3 +1017,5 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Reverse entry_to_string: entry = %s\n",this->entry_.c_str() ));
   return this->entry_.c_str();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index f55250dbbb3..58f018bc45e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 // ============================================================================
 /**
@@ -17,11 +16,14 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/AV/AV_export.h"
-#include "AV_Core.h"
+#include "orbsvcs/AV/AV_Core.h"
 #include "ace/Addr.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Tokenizer
  * @brief
@@ -260,10 +262,9 @@ protected:
 
 /**
  * @class TAO_Forward_FlowSpec_Entry
- * @brief
  */
 class TAO_AV_Export TAO_Forward_FlowSpec_Entry
-  :public TAO_FlowSpec_Entry
+  : public TAO_FlowSpec_Entry
 {
 public:
   enum Position {TAO_AV_FLOWNAME = 0,
@@ -346,10 +347,12 @@ public:
   virtual int parse (const char* flowSpec_entry);
 };
 
-#include "Transport.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/AV/Transport.h"
 
 #if defined (__ACE_INLINE__)
-#include "FlowSpec_Entry.i"
+#include "orbsvcs/AV/FlowSpec_Entry.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
index 7d02df695ea..3af4438dd98 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
@@ -1,11 +1,11 @@
 // -*- C++ -*-
-
+//
 // $Id$
 
-// FlowSpec_Entry.i
-
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 int
 TAO_FlowSpec_Entry::set_direction (const char *direction)
@@ -343,3 +343,5 @@ TAO_FlowSpec_Entry::role (TAO_FlowSpec_Entry::Role role)
 {
   this->role_ = role;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 86cef7e0568..c2e6683d223 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -1,11 +1,12 @@
 //$Id$
 
-#ifndef TAO_AV_FLOWS_T_C
-#define TAO_AV_FLOWS_T_C
+#ifndef TAO_AV_FLOWS_T_CPP
+#define TAO_AV_FLOWS_T_CPP
 
-#include "Flows_T.h"
+#include "orbsvcs/AV/Flows_T.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ------------------------------------------------------------
 // TAO_FDev
@@ -246,4 +247,6 @@ TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamEndPoint::destroy failed\n"));
 }
 
-#endif /* TAO_AV_FLOWS_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_AV_FLOWS_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index 087fce312fb..d0810ab65e1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,7 +15,9 @@
 #define TAO_AV_FLOWS_T_H
 #include /**/ "ace/pre.h"
 
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_FDev
@@ -115,9 +116,10 @@ protected:
   CORBA::String_var flowname_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Flows_T.cpp"
+#include "orbsvcs/AV/Flows_T.cpp"
 #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 02d46a85566..5ccb9148c4f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "MCast.h"
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/AV/AVStreams_i.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-#include "MCast.i"
+#include "orbsvcs/AV/MCast.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 //TAO_AV_UDP_MCast_Flow_Handler
 //------------------------------------------------------------
@@ -207,7 +209,6 @@ TAO_AV_UDP_MCast_Transport::recv (char *buf,
                                                     timeout);
 }
 
-
 ssize_t
 TAO_AV_UDP_MCast_Transport::recv (iovec *iov,
                                   int /*iovcnt*/,
@@ -215,3 +216,5 @@ TAO_AV_UDP_MCast_Transport::recv (iovec *iov,
 {
   return handler_->get_mcast_socket ()->recv (iov,this->peer_addr_,0,timeout);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index 710be13f63c..fde288896ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,11 +15,13 @@
 #define TAO_AV_MCAST_H
 #include /**/ "ace/pre.h"
 
-#include "FlowSpec_Entry.h"
-#include "Protocol_Factory.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_AV_UDP_MCast_Flow_Handler;
 
 /**
@@ -105,8 +107,10 @@ protected:
   ACE_SOCK_Dgram_Mcast *dgram_mcast_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "MCast.i"
+#include "orbsvcs/AV/MCast.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.i b/TAO/orbsvcs/orbsvcs/AV/MCast.i
index e77e9b4cd79..08d994f23ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.i
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.i
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_UDP_MCast_Flow_Handler
 //-----------------------------------------------------------
@@ -9,6 +14,4 @@ TAO_AV_UDP_MCast_Flow_Handler::get_mcast_socket (void) const
   return this->dgram_mcast_;
 }
 
-
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index 6701affedc8..0fa94820c07 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -1,26 +1,26 @@
 // $Id$
 
-#include "FlowSpec_Entry.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
 #include "tao/debug.h"
-#include "Policy.h"
+#include "orbsvcs/AV/Policy.h"
 
 #if !defined(__ACE_INLINE__)
-#include "Policy.i"
+#include "orbsvcs/AV/Policy.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_AV_Policy::TAO_AV_Policy (CORBA::ULong type)
   :type_ (type)
 {
 }
 
-
 TAO_AV_SSRC_Policy::TAO_AV_SSRC_Policy (CORBA::ULong ssrc)
   :TAO_AV_Policy (TAO_AV_SSRC_POLICY),
    ssrc_ (ssrc)
 {
 }
 
-
 TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type)
   :TAO_AV_Policy (TAO_AV_PAYLOAD_TYPE_POLICY),
    payload_type_ (payload_type)
@@ -146,3 +146,5 @@ TAO_AV_Callback::schedule_timer (void)
 {
   return this->handler_->schedule_timer ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 222e50afd51..a34a9604e22 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,6 +13,7 @@
 
 #ifndef TAO_AV_POLICY_H
 #define TAO_AV_POLICY_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Addr.h"
@@ -23,6 +23,13 @@
 #include "ace/Time_Value.h"
 #include "orbsvcs/AV/AV_export.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct TAO_AV_frame_info
 {
   CORBA::Boolean boundary_marker;
@@ -94,9 +101,8 @@ protected:
   int value_;
 };
 
-typedef TAO_Unbounded_Sequence<TAO_AV_Policy*> TAO_AV_PolicyList;
+typedef TAO::unbounded_value_sequence<TAO_AV_Policy*> TAO_AV_PolicyList;
 
-class ACE_Message_Block;
 class TAO_AV_Protocol_Object;
 class TAO_AV_Transport;
 class TAO_AV_Flow_Handler;
@@ -159,8 +165,12 @@ protected:
   TAO_AV_Flow_Handler *handler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "Policy.i"
+#include "orbsvcs/AV/Policy.i"
 #endif /* __ACE_INLINE__ */
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_AV_POLICY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.i b/TAO/orbsvcs/orbsvcs/AV/Policy.i
index 0994186e6ed..3ff570e0e6f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.i
@@ -1,5 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //--------------------------------------------------
 // TAO_AV_Policy
 //--------------------------------------------------
@@ -73,3 +77,5 @@ TAO_AV_SFP_Credit_Policy::value (void)
 {
   return this->value_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index 1f00f0573e4..55f5767c9ca 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
 
-#include "Protocol_Factory.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_AV_Flow_Protocol_Factory
 TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void)
 {
@@ -124,3 +127,5 @@ TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *,
     ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n"));
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
index b5b93170f82..f18774d3006 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,11 +15,12 @@
 #define TAO_AV_PROTOCOL_FACTORY_T_H
 #include /**/ "ace/pre.h"
 
-#include "FlowSpec_Entry.h"
-#include "Policy.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/Policy.h"
 
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_AV_Protocol_Object
@@ -96,5 +97,7 @@ public:
   int ref_count;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AV_PROTOCOL_FACTORY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 837733689de..57c734d5c9b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
 
-#include "QoS_UDP.h"
+#include "orbsvcs/AV/QoS_UDP.h"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
-#include "UDP.h"
+#include "orbsvcs/AV/UDP.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/MCast.h"
 #include "orbsvcs/AV/Fill_ACE_QoS.h"
@@ -21,6 +21,8 @@
 static int resv_error = 0;
 static int resv_confirm = 0;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
                iovec* iov,
@@ -1511,6 +1513,8 @@ TAO_AV_UDP_QoS_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
   return object;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Flow_Factory,
                        ACE_TEXT ("UDP_QoS_Flow_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index 8e99c0ad7da..7100217f263 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // $Id$
 // ============================================================================
@@ -12,7 +12,6 @@
 // = AUTHOR
 //    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
 //
-//
 // ============================================================================
 
 #ifndef TAO_AV_QOS_UDP_H
@@ -24,14 +23,15 @@
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
+#include "orbsvcs/AV/Protocol_Factory.h"
+
 #include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/QoS/QoS_Session_Factory.h"
 #include "ace/QoS/QoS_Decorator.h"
 #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h"
 
-#include "orbsvcs/AV/Protocol_Factory.h"
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
 {
@@ -287,6 +287,8 @@ public:
 	       TAO_AV_UDP_QoS_Flow_Handler *handler);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_QoS_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory)
 
@@ -295,7 +297,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory)
 
 
 #if defined(__ACE_INLINE__)
-#include "QoS_UDP.i"
+#include "orbsvcs/AV/QoS_UDP.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
index 8a98bafa896..9ae1b828b0f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
@@ -1,10 +1,13 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //----------------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //----------------------------------------------------------------------
+
 ACE_INLINE
 ACE_SOCK_Dgram_Mcast_QoS *
 TAO_AV_UDP_QoS_Flow_Handler::get_socket (void)
@@ -74,3 +77,5 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (void)
 {
   return this->av_core_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 0d7124705fe..e0466db3a3c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 1994-1995 Regents of the University of California.
  * All rights reserved.
  *
@@ -33,17 +33,19 @@
  */
 
 // $Id$
-#include "ntp-time.h"
-#include "RTCP.h"
-#include "media_timer.h"
+#include "orbsvcs/AV/ntp-time.h"
+#include "orbsvcs/AV/RTCP.h"
+#include "orbsvcs/AV/media_timer.h"
 #include "tao/debug.h"
-#include "global.h"
-#include "md5.h"
+#include "orbsvcs/AV/global.h"
+#include "orbsvcs/AV/md5.h"
 
-#include "RTCP_Packet.h"
+#include "orbsvcs/AV/RTCP_Packet.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data,
                                              const ACE_Addr &peer_address)
@@ -811,6 +813,7 @@ TAO_AV_RTCP_Callback::ts_offset (ACE_UINT32 offset)
   this->timestamp_offset_ = offset;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTCP_Flow_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_RTCP_Flow_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 38555b63efd..58688376837 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -1,5 +1,6 @@
-/* -*- C++ -*- */
-/*-
+// -*- C++ -*-
+
+/**
  * Copyright (c) 1993-1994 The Regents of the University of California.
  * All rights reserved.
  *
@@ -48,16 +49,18 @@
 #define TAO_AV_RTCP_H
 #include /**/ "ace/pre.h"
 
+#include "orbsvcs/AV/RTCP_Channel.h"
+
 // FUZZ: disable check_for_math_include
-#include "ace/OS.h"
-#include "ace/Hash_Map_Manager.h"
+
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/AV/RTP.h"
+#include "ace/Hash_Map_Manager_T.h"
 #include <math.h>
 #include <stdlib.h>
-#include "orbsvcs/AV/RTP.h"
 
-#include "RTCP_Channel.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_AV_RTCP_Callback;
 
@@ -244,7 +247,7 @@ private:
   ACE_UINT32 ssrc_;
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE (TAO_AV_RTCP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTCP_Flow_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index 45f1012972e..7011dab5371 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -1,10 +1,10 @@
 // $Id$
-#include "ace/OS.h"
 
+#include "orbsvcs/AV/RTCP_Channel.h"
+#include "orbsvcs/AV/RTP.h"
 #include "tao/debug.h"
 
-#include "RTCP_Channel.h"
-#include "RTP.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc,
                                   const ACE_Addr *peer_addr)
@@ -361,3 +361,4 @@ RTCP_Channel_Out::active (void)
   return this->active_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index 7e9d4d44857..a9d717a33b0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -5,12 +5,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/AV/RTCP_Packet.h"
+
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
 
-#include "RTP.h"
-#include "RTCP_Packet.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class RTCP_Channel_In
@@ -216,5 +217,7 @@ private:
   unsigned int octets_sent_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* RTCP_CHANNEL_INCLUDE */
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 04037b0791f..8ef82e30bb3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -1,6 +1,8 @@
 // $Id$
-#include "RTCP_Packet.h"
-#include "RTP.h"
+#include "orbsvcs/AV/RTCP_Packet.h"
+#include "orbsvcs/AV/RTP.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 RTCP_Packet::RTCP_Packet(void)
 {
@@ -34,7 +36,7 @@ RTCP_Packet::~RTCP_Packet(void)
 void
 RTCP_Packet::get_packet_data(char **buffer, ACE_UINT16 &length)
 {
-  length = this->packet_size();
+  length = static_cast<ACE_UINT16> (this->packet_size());
 
   // buiidPacket is defined for each child of RTCP_Packet
   // buildPacket creates a snapshot of the RTCP packet in the buffer pktData
@@ -103,7 +105,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list,
     this->reason_length_ = 0;
 
   // Set the packet length
-  this->chd_.length_ = this->chd_.count_ + (this->reason_length_+1)/4;
+  this->chd_.length_ = static_cast<ACE_UINT16> (this->chd_.count_ + (this->reason_length_+1)/4);
   if ((this->reason_length_+1)%4)
     this->chd_.length_++;
 
@@ -169,7 +171,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void)
 unsigned int
 RTCP_BYE_Packet::packet_size(void)
 {
-  ACE_UINT16 size = (1+chd_.count_) * 4;
+  ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4);
 
   if (this->reason_length_ > 0)
     {
@@ -215,9 +217,9 @@ RTCP_BYE_Packet::build_packet(void)
            char[this->packet_size()]);
 
   index = 0;
-  this->packet_data_[index] = (this->chd_.ver_ << 6) |
-                              (this->chd_.pad_ << 5) |
-                               this->chd_.count_;
+  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
+                                                 (this->chd_.pad_ << 5) |
+                                                 this->chd_.count_);
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
@@ -282,7 +284,7 @@ RTCP_RR_Packet::RTCP_RR_Packet(ACE_UINT32 ssrc, RR_Block *blocks)
       block_ptr = block_ptr->next_;
     }
 
-  this->chd_.length_ = 1+6*this->chd_.count_; // + profile specific extensions ??
+  this->chd_.length_ = static_cast<ACE_UINT16> (1+6*(this->chd_.count_)); // + profile specific extensions ??
 
   this->packet_data_ = 0;
 }
@@ -364,7 +366,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void)
 unsigned int
 RTCP_RR_Packet::packet_size(void)
 {
-    ACE_UINT16 size = (2+this->chd_.count_*6) * 4;
+    ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4);
     return size;
 }
 
@@ -383,9 +385,9 @@ RTCP_RR_Packet::build_packet(void)
            char [this->packet_size ()]);
 
   index = 0;
-  this->packet_data_[index] = (this->chd_.ver_ << 6) |
-                              (this->chd_.pad_ << 5) |
-                              this->chd_.count_;
+  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
+                                                 (this->chd_.pad_ << 5) |
+                                                 this->chd_.count_);
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
@@ -806,7 +808,7 @@ RTCP_SDES_Packet::packet_size(void)
       cp = cp->next_;
     }
 
-  chd_.length_ = size/4 - 1;
+  chd_.length_ = static_cast<ACE_UINT16> (size/4 - 1);
 
   return size;
 }
@@ -827,7 +829,9 @@ RTCP_SDES_Packet::build_packet(void)
            char[this->packet_size()]);
 
   index = 0;
-  this->packet_data_[index] = (chd_.ver_ << 6) | (chd_.pad_ << 5) | chd_.count_;
+  this->packet_data_[index] = static_cast<char> ((chd_.ver_ << 6) |
+                                                 (chd_.pad_ << 5) |
+			                         chd_.count_);
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
@@ -1013,7 +1017,7 @@ RTCP_SR_Packet::RTCP_SR_Packet(ACE_UINT32 ssrc,
       block_ptr = block_ptr->next_;
     }
 
-  this->chd_.length_ = 6 + 6*chd_.count_; //+profile specific extensions ??
+  this->chd_.length_ = static_cast<ACE_UINT16> (6 + 6*(chd_.count_)); //+profile specific extensions ??
 
   this->packet_data_ = 0;
 }
@@ -1104,7 +1108,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void)
 
 unsigned int RTCP_SR_Packet::packet_size (void)
 {
-  ACE_UINT16 size  = (2+chd_.count_*6) * 4; // + profile specific extensions ?
+  ACE_UINT16 size  = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ?
   size += 20; // the first line is the same as RR; 20 more bytes for SR
 
   return size;
@@ -1123,7 +1127,9 @@ void RTCP_SR_Packet::build_packet(void)
   ACE_NEW (this->packet_data_,
            char[this->packet_size()]);
 
-  this->packet_data_[index] = (this->chd_.ver_ << 6) | (this->chd_.pad_ << 5) | this->chd_.count_;
+  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
+                                                 (this->chd_.pad_ << 5) | 
+			                          this->chd_.count_);
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
@@ -1202,3 +1208,5 @@ RTCP_SR_Packet::dump (void)
       ++count;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index e2fd18dcc64..696378258af 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef RTCP_PACKET_INCLUDE
@@ -5,7 +7,11 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Basic_Types.h"
+#include "tao/orbconf.h"
+#include "tao/Versioned_Namespace.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @struct RTCP_Common_Header
@@ -45,7 +51,7 @@ public:
   RTCP_Packet(char *buffer);
 
   /// Destructor
-  virtual ~RTCP_Packet() = 0;
+  virtual ~RTCP_Packet();
 
   /// Returns a pointer to a local buffer containing the packet.
   void get_packet_data(char **buffer, ACE_UINT16 &length);
@@ -393,5 +399,7 @@ private:
   RR_Block *rr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /*  RTCP_PACKET_INCLUDE  */
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index b29f5bfb890..7118a24c14c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -34,13 +34,15 @@
 
 // $Id$
 
-#include "RTP.h"
-#include "RTCP.h"
+#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/AV/RTCP.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_arpa_inet.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // RTP_Packet
 
 // Constructor for RTP packets received
@@ -70,8 +72,8 @@ RTP_Packet::RTP_Packet(char* buffer, int length)
   else
     this->extension_bytes_ = 0;
 
-  this->packet_size_ = length;
-  this->payload_size_ = length-index;
+  this->packet_size_ = static_cast<ACE_UINT16> (length);
+  this->payload_size_ = static_cast<ACE_UINT16> (length-index);
 
   // This is necessary only for payload types that have 16 bit values to correct
   //  the network byte ordering.
@@ -137,7 +139,7 @@ RTP_Packet::RTP_Packet(unsigned char padding,
   this->packet_[index] = ((marker & 0x1) << 7 ) |
                          ((payload_type & 0x7f));
   index++;
-  *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(seq_num);
+  *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(static_cast<u_short> (seq_num));
   index+=2;
   *((ACE_UINT32*)&this->packet_[index]) = (ACE_UINT32)htonl(timestamp);
   index+=4;
@@ -256,7 +258,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info)
   frame_info->timestamp = this->ts();
   frame_info->ssrc = this->ssrc();
   frame_info->sequence_num = this->sn();
-  frame_info->format = this->pt();
+  frame_info->format = static_cast<CORBA::Octet> (this->pt());
 }
 
 int
@@ -292,7 +294,7 @@ void
 RTP_Packet::get_csrc_list (ACE_UINT32 **csrc_list, ACE_UINT16 &length)
 {
   *csrc_list = this->host_byte_order_csrc_list_;
-  length = this->cc ();
+  length = static_cast<ACE_UINT16> (this->cc ());
 }
 
 void
@@ -396,11 +398,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   frame_info->boundary_marker,  // marker
-                                  this->format_,                // payload type
+                                  static_cast<unsigned char> (this->format_),                // payload type
                                   frame_info->sequence_num,     // sequence num
                                   frame_info->timestamp,        // time stamp
                                   this->ssrc_,                  // ssrc
-                                  csrc_count,                   // csrc count
+                                  static_cast<unsigned char> (csrc_count),                   // csrc count
                                   csrc_list,                    // csrc list
                                   frame->rd_ptr (),             // data
                                   (ACE_UINT16)frame->length ()),// data size
@@ -452,11 +454,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   0,                            // marker
-                                  this->format_,                // payload type
+                                  static_cast<unsigned char> (this->format_),                // payload type
                                   this->sequence_num_,          // sequence num
                                   ts,                           // time stamp
                                   this->ssrc_,                  // ssrc
-                                  csrc_count,                   // csrc count
+                                  static_cast<unsigned char> (csrc_count),                   // csrc count
                                   csrc_list,                    // csrc list
                                   frame->rd_ptr (),             // data
                                   (ACE_UINT16)frame->length ()),// data size
@@ -506,7 +508,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       if (frame_info->format != this->format_)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_AV_RTP_Object::send_frame - error: format type mismatch"));
-      this->sequence_num_ = frame_info->sequence_num;
+      this->sequence_num_ = static_cast<ACE_UINT16> (frame_info->sequence_num);
       if (frame_info->ssrc != 0)
         this->ssrc_ = frame_info->ssrc;
 
@@ -519,11 +521,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   frame_info->boundary_marker,  // marker
-                                  this->format_,                // payload type
+                                  static_cast<unsigned char> (this->format_),                // payload type
                                   frame_info->sequence_num,     // sequence num
                                   frame_info->timestamp,        // time stamp
                                   this->ssrc_,                  // ssrc
-                                  csrc_count,                   // csrc count
+                                  static_cast<unsigned char> (csrc_count),                   // csrc count
                                   csrc_list,                    // csrc list
                                   (char *)iov[0].iov_base,      // data
                                   data_size),                   // data size
@@ -577,11 +579,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   0,                            // marker
-                                  this->format_,                // payload type
+                                  static_cast<unsigned char> (this->format_),                // payload type
                                   this->sequence_num_,          // sequence num
                                   ts,                           // time stamp
                                   this->ssrc_,                  // ssrc
-                                  csrc_count,                   // csrc count
+                                  static_cast<unsigned char> (csrc_count),                   // csrc count
                                   csrc_list,                    // csrc list
                                   (char *)iov[0].iov_base,      // data
                                   data_size),                   // data size
@@ -623,7 +625,7 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback,
    control_object_ (0),
    connection_gone_ (0)
 {
-  this->sequence_num_ = ACE_OS::rand ();
+  this->sequence_num_ = static_cast<ACE_UINT16> (ACE_OS::rand ());
   this->timestamp_offset_ = ACE_OS::rand ();
 
   char buf [BUFSIZ];
@@ -771,6 +773,8 @@ TAO_AV_RTP_Flow_Factory::control_flow_factory (void)
   return "RTCP";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTP_Flow_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory,
                        ACE_TEXT ("RTP_Flow_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 14e17886ab0..8cc883386a4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 /*-
  * Copyright (c) 1993-1994 The Regents of the University of California.
@@ -137,9 +137,11 @@
 
 #define MAXHDR 24
 
-#include "Policy.h"
-#include "FlowSpec_Entry.h"
-#include "MCast.h"
+#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/MCast.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //------------------------------------------------------------
 // TAO_AV_RTP
@@ -412,6 +414,8 @@ public:
   virtual const char*control_flow_factory (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_RTP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_RTP_Flow_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index aa50d43203d..a14a9087531 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Resource_Factory.h
@@ -20,6 +22,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_AV_Resource_Factory
  *
@@ -30,7 +34,6 @@
  *  
  *
  */
-
 class TAO_AV_Export TAO_AV_Resource_Factory
 : public ACE_Service_Object 
 {
@@ -45,5 +48,7 @@ public:
   
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AV_DEFAULT_RESOURCE_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index 59a3ea87259..1197d709257 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "SCTP_SEQ.h"
+#include "orbsvcs/AV/SCTP_SEQ.h"
 
 #if defined (ACE_HAS_SCTP)
 
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/AVStreams_i.h"
 #include "ace/Multihomed_INET_Addr.h"
 #include "tao/debug.h"
 #include "ace/Arg_Shifter.h"
@@ -13,6 +13,8 @@ ACE_RCSID (AV,
            SCTP_SEQ,
            "SCTP_SEQ.cpp,v 1.3 2003/11/05 21:06:53 yamuna Exp")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_SCTP_SEQ_Transport
 //------------------------------------------------------------
@@ -907,6 +909,8 @@ TAO_AV_SCTP_SEQ_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
   return object;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_SCTP_SEQ_Flow_Factory,
                        ACE_TEXT ("SCTP_SEQ_Flow_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
index 3c6d297dd94..4e3ec871b71 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,13 +14,13 @@
 #define TAO_AV_SCTP_SEQ_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if defined (ACE_HAS_SCTP)
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Service_Config.h"
-#include "Protocol_Factory.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 #include "ace/SOCK_SEQPACK_Connector.h"
@@ -29,6 +29,7 @@ extern "C" {
 #include <netinet/sctp.h>
 };
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Unbounded_Set <ACE_CString> Interface_Seq;
 typedef ACE_Unbounded_Set_Iterator <ACE_CString> Interface_Seq_Itor;
@@ -291,6 +292,8 @@ public:
                                                 TAO_AV_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_SCTP_SEQ_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SCTP_SEQ_Flow_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 2170d7dc6b8..10547d39fef 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "TCP.h"
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/TCP.h"
+#include "orbsvcs/AV/AVStreams_i.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_TCP_Transport
 //------------------------------------------------------------
@@ -694,6 +696,8 @@ TAO_AV_TCP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
   return TAO_AV_Flow_Handler::handle_timeout (tv,arg);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_AV_TCP_Flow_Factory,
                        ACE_TEXT ("TCP_Flow_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index 51bb5235fd6..1f51a7329be 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,10 +15,13 @@
 #define TAO_AV_TCP_H
 #include /**/ "ace/pre.h"
 
-#include "Protocol_Factory.h"
-#include "FlowSpec_Entry.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
 
 #include "ace/Service_Config.h"
+#include "ace/Svc_Handler.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_AV_TCP_Factory
@@ -268,6 +271,8 @@ public:
                                                 TAO_AV_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_TCP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_TCP_Flow_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 4cce7ccdd8c..03047ef23e6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#include "AVStreams_i.h"
-#include "sfp.h"
-#include "MCast.h"
-#include "RTCP.h"
-#include "RTP.h"
-#include "UDP.h"
-#include "TCP.h"
-#include "FlowSpec_Entry.h"
-#include "AV_Core.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/AV/sfp.h"
+#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/AV/RTCP.h"
+#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/AV/TCP.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/AV_Core.h"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-#include "QoS_UDP.h"
+#include "orbsvcs/AV/QoS_UDP.h"
 #endif /* defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) */
 
 #include "tao/debug.h"
@@ -19,9 +19,12 @@
 #include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Transport.i"
+#include "orbsvcs/AV/Transport.i"
 #endif /* __ACE_INLINE__ */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_Transport_Item
 //------------------------------------------------------------
@@ -675,3 +678,5 @@ TAO_AV_Transport_Factory::make_connector (void)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 8de06427317..e494a20b9d4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,6 +15,12 @@
 #define TAO_AV_TRANSPORT_H
 #include /**/ "ace/pre.h"
 
+
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/AV_Core.h"
+
+#include "orbsvcs/AV/AV_export.h"
+
 #include "ace/Service_Object.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
@@ -22,9 +28,9 @@
 #include "ace/Connector.h"
 #include "ace/Addr.h"
 #include "ace/SOCK_Dgram.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "FlowSpec_Entry.h"
-#include "AV_Core.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations.
 class TAO_AV_Core;
@@ -329,9 +335,10 @@ public:
   int ref_count;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "Transport.i"
+#include "orbsvcs/AV/Transport.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.i b/TAO/orbsvcs/orbsvcs/AV/Transport.i
index 851a27a8b95..c05c2474e2b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.i
@@ -1,9 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Transport.i
-
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //------------------------------------------------------------
 // TAO_AV_Transport_Item
@@ -108,3 +107,5 @@ TAO_AV_Connector::flowname (void)
 {
   return this->flowname_.c_str ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 7d0484593b1..8f6953ca8b1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "UDP.h"
-#include "AVStreams_i.h"
-#include "MCast.h"
+#include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/AV/MCast.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "UDP.i"
+#include "orbsvcs/AV/UDP.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (AV,
            UDP,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //------------------------------------------------------------
@@ -1072,6 +1074,8 @@ TAO_AV_UDP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
   return object;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_UDP_Flow_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_Flow_Factory,
                        ACE_TEXT ("UDP_Flow_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index 1c228004bcf..f582af25ec7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,12 +13,15 @@
 
 #ifndef TAO_AV_UDP_H
 #define TAO_AV_UDP_H
+
 #include /**/ "ace/pre.h"
 
-#include "Protocol_Factory.h"
+#include "orbsvcs/AV/Protocol_Factory.h"
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_AV_UDP_Factory
  * @brief
@@ -275,6 +278,8 @@ public:
                                                 TAO_AV_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Flow_Factory)
 
@@ -283,8 +288,9 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory)
 
 
 #if defined(__ACE_INLINE__)
-#include "UDP.i"
+#include "orbsvcs/AV/UDP.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_AV_UDP_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.i b/TAO/orbsvcs/orbsvcs/AV/UDP.i
index 4ea0abde89a..72025b94dd5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.i
@@ -1,10 +1,13 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //----------------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //----------------------------------------------------------------------
+
 ACE_INLINE
 const ACE_SOCK_Dgram *
 TAO_AV_UDP_Flow_Handler::get_socket (void) const
@@ -25,3 +28,5 @@ TAO_AV_UDP_Flow_Handler::close (void)
 {
   return  this->sock_dgram_.close ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index e29c8e154ce..708bfd80308 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -6,6 +6,8 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void)
 {
   if (TAO_debug_level > 0)
@@ -88,6 +90,8 @@ TAO_AV_Default_Resource_Factory::init (int argc, char *argv[])
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 // ****************************************************************
 
@@ -101,11 +105,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_Default_Resource_Factory,
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_Default_Resource_Factory)
 
 // ****************************************************************
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
index 01420bb907f..0bf2a7b930f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   default_resource.h
@@ -22,6 +24,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_AV_Default_Resource_Factory
  *
@@ -34,7 +38,7 @@
  */
 
 class TAO_AV_Export TAO_AV_Default_Resource_Factory
-: public TAO_AV_Resource_Factory
+  : public TAO_AV_Resource_Factory
 {
 public:
 
@@ -53,6 +57,8 @@ public:
   
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_AV, TAO_AV_Default_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_Default_Resource_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
index ad1865f947e..aa4a99f8fb3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
@@ -25,8 +25,8 @@ documentation and/or software.
 
 /* $Id$ */
 
-#include "global.h"
-#include "md5.h"
+#include "orbsvcs/AV/global.h"
+#include "orbsvcs/AV/md5.h"
 
 /* Constants for MD5Transform routine.
  */
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
index 098515b27d5..1a5b9cd1e42 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
@@ -37,11 +37,13 @@ static const char rcsid[] =
     "@(#) $Header$";
 */
 
-#include "media_timer.h"
+#include "orbsvcs/AV/media_timer.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdlib.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 MediaTimer* MediaTimer::instance_;
 
 MediaTimer::MediaTimer()
@@ -89,3 +91,5 @@ ACE_UINT32 MediaTimer::ref_ts()
 {
         return (media_ts());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
index 408ecb7136b..e7e060d5cb4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -1,5 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
+
 /*
  * Copyright (c) 1995 Regents of the University of California.
  * All rights reserved.
@@ -39,9 +41,13 @@
 #define TAO_AV_MEDIA_TIMER_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Basic_Types.h"
+#include "tao/orbconf.h"
+#include "tao/Versioned_Namespace.h"
+
 //long random (void);
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class MediaTimer
 {
  public:
@@ -57,5 +63,7 @@ class MediaTimer
   ACE_UINT32 offset_;   /* random offset */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AV_MEDIA_TIMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index d2e4b5da547..11dcd720911 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 /*
  * Copyright (c) 1995 The Regents of the University of California.
@@ -31,15 +32,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#) $Header$
  */
+
 #ifndef TAO_AV_NTP_TIME_H
 #define TAO_AV_NTP_TIME_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
-#include "RTCP.h"
+#include "orbsvcs/AV/RTCP.h"
 
 /*
  * convert microseconds to fraction of second * 2^32 (i.e., the lsw of
@@ -49,8 +48,8 @@
  */
 ACE_INLINE u_int usec2ntp(u_int usec)
 {
-        u_int t = (usec * 1825) >> 5;
-        return ((usec << 12) + (usec << 8) - t);
+  u_int const t = (usec * 1825) >> 5;
+  return ((usec << 12) + (usec << 8) - t);
 }
 
 /*
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 9c9cccf126a..0046ce08f85 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1,20 +1,21 @@
 // $Id$
 
-#include "sfp.h"
-#include "ace/ARGV.h"
-
+#include "orbsvcs/AV/sfp.h"
 #include "tao/debug.h"
+#include "ace/ARGV.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // default arguments to pass to use for the ORB
-const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBObjRefStyle URL";
+const char TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS[] = "-ORBObjRefStyle URL";
 
 // SFP magic numbers
-const char *TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER = "=SFP";
-const char *TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG";
-const char *TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER = "=STA";
-const char *TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE";
-const char *TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR";
+const char TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER[] = "=SFP";
+const char TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER[] = "FRAG";
+const char TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER[] = "=STA";
+const char TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER[] = "=CRE";
+const char TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER[] = "=STR";
 
 // SFP version 1.0
 const unsigned char TAO_SFP_Base::TAO_SFP_MAJOR_VERSION = 1;
@@ -495,7 +496,7 @@ TAO_SFP_Base::start_frame (CORBA::Octet flags,
   frame_header.magic_number [2] = 'F';
   frame_header.magic_number [3] = 'P';
   frame_header.flags = flags;
-  frame_header.message_type = type;
+  frame_header.message_type = static_cast<CORBA::Octet> (type);
   frame_header.message_size = 0;
   if (!(msg << frame_header))
     return 0;
@@ -1323,6 +1324,8 @@ TAO_SFP_Frame_State::reset (void)
 template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_AV_SFP_Factory,
                        ACE_TEXT ("SFP_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index 1885a633231..35ab492f34f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -15,15 +15,19 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/AV/AV_export.h"
+
+#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/AV/UDP.h"
+
 #include "orbsvcs/sfpC.h"
+
+#include "tao/CDR.h"
+
 #include "ace/SOCK_Dgram.h"
 #include "ace/INET_Addr.h"
 
-#include "tao/CDR.h"
-#include "Policy.h"
-#include "MCast.h"
-#include "AVStreams_i.h"
-#include "UDP.h"
 
 #define TAO_SFP_MAGIC_NUMBER_LEN 4
 #define TAO_SFP_MESSAGE_TYPE_OFFSET 5
@@ -31,6 +35,8 @@
 
 #define TAO_SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_SFP_Fragment_Node
  * @brief
@@ -38,9 +44,7 @@
 class TAO_SFP_Fragment_Node
 {
 public:
-  TAO_SFP_Fragment_Node (void)
-    :data_ (0)
-    {}
+  TAO_SFP_Fragment_Node (void) : data_ (0) {}
   flowProtocol::fragment fragment_info_;
   ACE_Message_Block *data_;
   friend bool operator< (const TAO_SFP_Fragment_Node& left,
@@ -103,14 +107,14 @@ class TAO_AV_Export TAO_SFP_Base
 {
 public:
   // default arguments to pass to use for the ORB
-  static const char *TAO_SFP_ORB_ARGUMENTS;
+  static const char TAO_SFP_ORB_ARGUMENTS[];
 
   // SFP magic numbers
-  static const char *TAO_SFP_MAGIC_NUMBER;
-  static const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER;
-  static const char *TAO_SFP_START_MAGIC_NUMBER;
-  static const char *TAO_SFP_CREDIT_MAGIC_NUMBER;
-  static const char *TAO_SFP_STARTREPLY_MAGIC_NUMBER;
+  static const char TAO_SFP_MAGIC_NUMBER[];
+  static const char TAO_SFP_FRAGMENT_MAGIC_NUMBER[];
+  static const char TAO_SFP_START_MAGIC_NUMBER[];
+  static const char TAO_SFP_CREDIT_MAGIC_NUMBER[];
+  static const char TAO_SFP_STARTREPLY_MAGIC_NUMBER[];
 
   // SFP version 1.0
   static const unsigned char TAO_SFP_MAJOR_VERSION;
@@ -293,6 +297,8 @@ public:
                                                         TAO_AV_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AV_SFP_Flow_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_SFP_Flow_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/CSIIOP.idl b/TAO/orbsvcs/orbsvcs/CSIIOP.idl
index 1807ab38d40..548ddb0f76d 100644
--- a/TAO/orbsvcs/orbsvcs/CSIIOP.idl
+++ b/TAO/orbsvcs/orbsvcs/CSIIOP.idl
@@ -13,7 +13,7 @@
 #ifndef _CSIIOP_IDL_
 #define _CSIIOP_IDL_
 
-//#include <IOP.pidl>
+//#include <tao/IOP.pidl>
 #include "tao/IOP_IOR.pidl"
 #include "CSI.idl"
 //import ::IOP
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index a8a79821a67..80eeaf1d7ac 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
-#ifndef ACE_CHANNEL_CLIENTS_T_C
-#define ACE_CHANNEL_CLIENTS_T_C
+#ifndef ACE_CHANNEL_CLIENTS_T_CPP
+#define ACE_CHANNEL_CLIENTS_T_CPP
 
 #include "orbsvcs/Channel_Clients_T.h"
 
-ACE_RCSID (orbsvcs, 
-           Channel_Clients_T, 
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/Channel_Clients_T.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events
                                         ACE_ENV_ARG_DECL)
@@ -38,4 +36,6 @@ ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
   target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-#endif /* ACE_CHANNEL_CLIENTS_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_CHANNEL_CLIENTS_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index de0933ec05c..10071d978ea 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -27,6 +28,8 @@
 
 #include "orbsvcs/RtecEventCommS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_PushConsumer_Adapter
  *
@@ -78,6 +81,8 @@ private:
   TARGET *target_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/Channel_Clients_T.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
index 620b6fd04a8..3c21f6c9bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
@@ -1,6 +1,8 @@
+// -*- C++ -*-
 //
 // $Id$
-//
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TARGET> ACE_INLINE
 ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t)
@@ -14,4 +16,4 @@ ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *t)
 {
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 5ab30c57eb0..3e62837cfdb 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -17,13 +17,15 @@
 //
 // ============================================================================
 
-#include "CC_Lock.h"
+#include "orbsvcs/Concurrency/CC_Lock.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (Concurrency, 
            CC_Lock, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CC_Lock::CC_Lock (void)
   : mode_ (CosConcurrencyControl::intention_read),
     lock_held_ (0)
@@ -229,7 +231,7 @@ void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 CC_LockModeIterator::IsDone (void)
 {
-  if (current_==CosConcurrencyControl::write)
+  if (current_ == CosConcurrencyControl::write)
     return 1;
   else
     return 0;
@@ -240,3 +242,5 @@ CC_LockModeIterator::GetLockMode (void)
 {
   return current_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 668ee73708b..622f973a9df 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,13 +26,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosConcurrencyControlC.h"
-#include "concurrency_export.h"
+#include "orbsvcs/Concurrency/concurrency_serv_export.h"
 
 /// This constant defines the number of lock modes. There is really no
 /// way to set this constant dynamically because the nuber of lock
 /// modes are not stated as part of the IDL.
 #define NUMBER_OF_LOCK_MODES 5
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class CC_Lock
  *
@@ -45,7 +47,7 @@
  * which is essentially a write lock since it is not allowed to
  * have more than one lock pr. servant in this implementation.
  */
-class TAO_Concurrency_Export CC_Lock
+class TAO_Concurrency_Serv_Export CC_Lock
 {
 public:
   /// Creates the lock with mode = intention_read (weakest)
@@ -114,7 +116,7 @@ private:
  * weakest (intention read) to the strongest (write).
  * Ordering: IR -> R -> U -> IW -> W
  */
-class TAO_Concurrency_Export CC_LockModeIterator
+class TAO_Concurrency_Serv_Export CC_LockModeIterator
 {
 public:
   /// Default constructor
@@ -140,5 +142,7 @@ private:
   CosConcurrencyControl::lock_mode current_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* !defined (_CC_LOCK_H) */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index bfbfb34f812..91ef3d63be5 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -13,12 +13,15 @@
 //
 // ============================================================================
 
-#include "CC_LockSet.h"
+#include "orbsvcs/Concurrency/CC_LockSet.h"
 
 ACE_RCSID (Concurrency,
            CC_LockSet,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor.
 
 CC_LockSet::CC_LockSet (void)
@@ -314,9 +317,14 @@ CC_LockSet::dump (void)
               lock_[CC_W]));
 }
 
-CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={
-  {1, 1, 1, 1, 0},
-  {1, 1, 1, 0, 0},
-  {1, 1, 0, 0, 0},
-  {1, 0, 0, 1, 0},
-  {0, 0, 0, 0, 0}};
+CORBA::Boolean const
+CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] =
+  {
+    {1, 1, 1, 1, 0},
+    {1, 1, 1, 0, 0},
+    {1, 1, 0, 0, 0},
+    {1, 0, 0, 1, 0},
+    {0, 0, 0, 0, 0}
+  };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 75bb4e1a88f..1d01ebeef27 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -45,7 +45,7 @@
 #include "ace/Unbounded_Queue.h"
 
 #include "orbsvcs/CosConcurrencyControlS.h"
-#include "concurrency_export.h"
+#include "orbsvcs/Concurrency/concurrency_serv_export.h"
 
 #if defined (lock_held)
 #undef lock_held
@@ -56,6 +56,8 @@
 /// modes are not stated as part of the IDL.
 #define NUMBER_OF_LOCK_MODES 5
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Enummeration representing the lock modes. The incoming request is
 /// always converted to this representation. There are two reasons for
 /// this: Firstly the lock modes are ordered from weakest to strongest
@@ -73,7 +75,7 @@ typedef enum {CC_EM=-1, CC_IR=0, CC_R, CC_U, CC_IW, CC_W} CC_LockModeEnum;
  * detailed descriptions apart from the comments in this file At
  * present the lock set is not really a set, but only one lock.
  */
-class TAO_Concurrency_Export CC_LockSet :  public POA_CosConcurrencyControl::LockSet
+class TAO_Concurrency_Serv_Export CC_LockSet :  public POA_CosConcurrencyControl::LockSet
 {
 public:
 
@@ -181,7 +183,7 @@ private:
 
   /// Mapping between requested and held lock modes. Used by compatible
   /// (...).  Uses the internal enumeration as indices.
-  static CORBA::Boolean compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES];
+  static CORBA::Boolean const compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES];
 
   /// Lock to ensure that race conditions does not occur.
   TAO_SYNCH_MUTEX mlock_;
@@ -190,6 +192,8 @@ private:
   ACE_Unbounded_Queue <CC_LockModeEnum> lock_queue_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* _CC_LOCKSET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 48a66786043..dfe17f3913a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file   CC_LockSetFactory.cpp
@@ -10,11 +9,13 @@
 //=============================================================================
 
 
-#include "CC_LockSetFactory.h"
-#include "CC_LockSet.h"
+#include "orbsvcs/Concurrency/CC_LockSetFactory.h"
+#include "orbsvcs/Concurrency/CC_LockSet.h"
 
 ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor
 CC_LockSetFactory::CC_LockSetFactory (void)
 {
@@ -57,3 +58,5 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
 
   return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index b49944528d8..6a02b8ed68d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,7 +21,9 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosConcurrencyControlS.h"
-#include "concurrency_export.h"
+#include "orbsvcs/Concurrency/concurrency_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class CC_LockSetFactory
@@ -33,7 +35,7 @@
  * file for detailed descriptions apart from the comments in
  * this file.
  */
-class TAO_Concurrency_Export CC_LockSetFactory 
+class TAO_Concurrency_Serv_Export CC_LockSetFactory 
   : public POA_CosConcurrencyControl::LockSetFactory
 {
 public:
@@ -59,6 +61,8 @@ private:
   TAO_SYNCH_MUTEX lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* _CC_LOCKSETFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 0fc686a1bc3..67f2284ace1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -13,20 +13,20 @@
 //   Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 // ================================================================
 
-#include "Concurrency_Loader.h"
+#include "orbsvcs/Concurrency/Concurrency_Loader.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Concurrency_Loader::TAO_Concurrency_Loader (void)
 {
-  // Constructor
 }
 
 TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void)
 {
-  // Destructor
 }
 
 int
@@ -86,4 +86,6 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
   return this->concurrency_server_.init (orb, poa.in ());
 }
 
-ACE_FACTORY_DEFINE (TAO_Concurrency, TAO_Concurrency_Loader)
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DEFINE (TAO_Concurrency_Serv, TAO_Concurrency_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 92b0575271c..50083e67f28 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+
 // $Id$
 
-// ===========================================================================================
+// ===========================================================================
 // FILENAME
 //   Concurrency_Loader.h
 //
@@ -12,7 +14,7 @@
 //   Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 //   Priyanka Gontla <pgontla<ece.uci.edu>
 //
-// ==========================================================================================
+// ===========================================================================
 
 #ifndef TAO_CONCURRENCY_LOADER_H
 #define TAO_CONCURRENCY_LOADER_H
@@ -25,7 +27,9 @@
 
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 
-class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader
 {
 public:
 
@@ -57,10 +61,14 @@ public:
 
 private:
 
-ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader (const TAO_Concurrency_Loader &))
-ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &))
+  // Disallow copying and assignment.
+  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &);
+  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &);
+
 };
 
-ACE_FACTORY_DECLARE (TAO_Concurrency, TAO_Concurrency_Loader)
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DECLARE (TAO_Concurrency_Serv, TAO_Concurrency_Loader)
 
 #endif /* TAO_CONCURRENCY_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 5aaa4d8d70b..570cef2f20f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    Concurrency_Utils.cpp
@@ -13,12 +12,14 @@
 #include "ace/streams.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "tao/debug.h"
-#include "Concurrency_Utils.h"
+#include "orbsvcs/Concurrency/Concurrency_Utils.h"
 
 ACE_RCSID (Concurrency,
            Concurrency_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor
 TAO_Concurrency_Server::TAO_Concurrency_Server (void)
 {
@@ -121,3 +122,5 @@ TAO_Concurrency_Server::GetLockSetFactory(void)
 TAO_Concurrency_Server::~TAO_Concurrency_Server (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index ac92e019ecb..bd2b7173f37 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +23,11 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosConcurrencyControlC.h"
-#include "CC_LockSetFactory.h"
-#include "concurrency_export.h"
+#include "orbsvcs/Concurrency/CC_LockSetFactory.h"
+#include "orbsvcs/Concurrency/concurrency_serv_export.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Concurrency_Server
@@ -35,7 +38,7 @@
  * This class takes an orb and Poa reference and activates the
  * concurrency service lock set factory object under them.
  */
-class TAO_Concurrency_Export TAO_Concurrency_Server
+class TAO_Concurrency_Serv_Export TAO_Concurrency_Server
 {
 public:
   // = Initialization and termination methods.
@@ -68,5 +71,7 @@ private:
   PortableServer::POA_var poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* _CONCURRENCY_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 3f313dae277..99fab62e680 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,30 +1,106 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosConcurrency) : orbsvcslib, core, portableserver {
+project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults {
+  custom_only = 1
+  idlflags   += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
+
+  IDL_Files {
+    CosConcurrencyControl.idl
+  }
+}
+
+project(CosConcurrency) : orbsvcslib, core {
   sharedname   = TAO_CosConcurrency
-  idlflags    += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
   tagchecks   += Concurrency
-  pch_header   =
-  pch_source   =
+  after       += CosConcurrency_IDL
 
   IDL_Files {
-    CosConcurrencyControl.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    Concurrency {
-      CosConcurrencyControlC.cpp
-      CosConcurrencyControlS.cpp
-      Concurrency
-    }
+  Source_Files {
+    CosConcurrencyControlC.cpp
+  }
+
+  Header_Files {
+    CosConcurrencyControlC.h
+    Concurrency/concurrency_export.h
+  }
+
+  Inline_Files {
+    CosConcurrencyControlC.inl
   }
 
   Template_Files {
   }
 
+  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
+  Resource_Files {
+  }
+
   Pkgconfig_Files {
     TAO_CosConcurrency.pc.in
   }
 }
+
+project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver {
+  sharedname   = TAO_CosConcurrency_Skel
+  dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL
+  tagchecks   += Concurrency
+  after       += CosConcurrency_IDL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosConcurrencyControlS.cpp
+  }
+
+  Header_Files {
+    CosConcurrencyControlS.h
+    Concurrency/concurrency_skel_export.h
+  }
+
+  Inline_Files {
+    CosConcurrencyControlS.inl
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosConcurrency_Skel.pc.in
+  }
+}
+
+project(CosConcurrency_Serv) : orbsvcslib, core, concurrency_skel {
+  sharedname   = TAO_CosConcurrency_Serv
+  dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL
+  tagchecks   += Concurrency
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Concurrency
+  }
+
+  Header_Files {
+    Concurrency
+    ^Concurrency/concurrency_export.h
+    ^Concurrency/concurrency_skel_export.h
+  }
+
+  Inline_Files {
+    Concurrency
+  }
+
+  Template_Files {
+    Concurrency
+  }
+
+  Pkgconfig_Files {
+    TAO_CosConcurrency_Serv.pc.in
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 3fbee5cf0b8..c3666a5ddfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,22 +1,20 @@
 // $Id$
 
-project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl {
-
-  idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
+  custom_only = 1
+  idlflags   += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
 
   IDL_Files {
     CosEventComm.idl
     CosEventChannelAdmin.idl
   }
-
-  custom_only = 1
 }
 
 project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   sharedname   = TAO_CosEvent
   dynamicflags = TAO_EVENT_BUILD_DLL
-
-  after += CosEvent_IDL
+  tagchecks   += CosEvent
+  after       += CosEvent_IDL
 
   IDL_Files {
   }
@@ -54,6 +52,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
 project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel {
   sharedname   = TAO_CosEvent_Skel
   dynamicflags = TAO_EVENT_SKEL_BUILD_DLL
+  tagchecks   += CosEvent
 
   IDL_Files {
   }
@@ -89,7 +88,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver
 }
 
 
-project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils {
+project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils {
   sharedname   = TAO_CosEvent_Serv
   dynamicflags = TAO_EVENT_SERV_BUILD_DLL
   tagchecks   += CosEvent
@@ -97,28 +96,34 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_
   IDL_Files {
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    CosEvent {
-      CosEvent/CEC_ConsumerAdmin.cpp
-      CosEvent/CEC_ConsumerControl.cpp
-      CosEvent/CEC_Default_Factory.cpp
-      CosEvent/CEC_Dispatching.cpp
-      CosEvent/CEC_Dispatching_Task.cpp
-      CosEvent/CEC_EventChannel.cpp
-      CosEvent/CEC_Event_Loader.cpp
-      CosEvent/CEC_Factory.cpp
-      CosEvent/CEC_MT_Dispatching.cpp
-      CosEvent/CEC_ProxyPullConsumer.cpp
-      CosEvent/CEC_ProxyPullSupplier.cpp
-      CosEvent/CEC_ProxyPushConsumer.cpp
-      CosEvent/CEC_ProxyPushSupplier.cpp
-      CosEvent/CEC_Pulling_Strategy.cpp
-      CosEvent/CEC_Reactive_ConsumerControl.cpp
-      CosEvent/CEC_Reactive_Pulling_Strategy.cpp
-      CosEvent/CEC_Reactive_SupplierControl.cpp
-      CosEvent/CEC_SupplierAdmin.cpp
-      CosEvent/CEC_SupplierControl.cpp
-    }
+  Source_Files {
+    CosEvent/CEC_ConsumerAdmin.cpp
+    CosEvent/CEC_ConsumerControl.cpp
+    CosEvent/CEC_Default_Factory.cpp
+    CosEvent/CEC_Dispatching.cpp
+    CosEvent/CEC_Dispatching_Task.cpp
+    CosEvent/CEC_EventChannel.cpp
+    CosEvent/CEC_Event_Loader.cpp
+    CosEvent/CEC_Factory.cpp
+    CosEvent/CEC_MT_Dispatching.cpp
+    CosEvent/CEC_ProxyPullConsumer.cpp
+    CosEvent/CEC_ProxyPullSupplier.cpp
+    CosEvent/CEC_ProxyPushConsumer.cpp
+    CosEvent/CEC_ProxyPushSupplier.cpp
+    CosEvent/CEC_Pulling_Strategy.cpp
+    CosEvent/CEC_Reactive_ConsumerControl.cpp
+    CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+    CosEvent/CEC_Reactive_SupplierControl.cpp
+    CosEvent/CEC_SupplierAdmin.cpp
+    CosEvent/CEC_SupplierControl.cpp
+  }
+
+  Header_Files {
+    CosEvent/CEC_Defaults.h
+    CosEvent/event_serv_export.h
+  }
+
+  Inline_Files {
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 01b587f9343..298c8981d9d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_ProxyPullSupplier.h"
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_ConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_ConsumerAdmin,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
   :  event_channel_ (ec),
      push_admin_ (ec),
@@ -135,3 +137,5 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier
 {
   supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 980431bedbb..529e6a28197 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 //=============================================================================
 /**
  *  @file   CEC_ConsumerAdmin.h
@@ -23,9 +23,11 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_ProxyPullSupplier.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -144,8 +146,10 @@ private:
   CORBA::Any event_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_ConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
index 254a5bdd1fa..d7761a1f51d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
@@ -31,3 +35,5 @@ TAO_CEC_Propagate_Event_Pull::TAO_CEC_Propagate_Event_Pull (const CORBA::Any& ev
   :  event_ (event)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index c069c20808b..5c0068aa874 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "CEC_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
 
 ACE_RCSID (CosEvent,
            CEC_ConsumerControl,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void)
 {
 }
@@ -55,3 +58,5 @@ void
 TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index d25785b24aa..b0c0f22ceaa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_ConsumerControl.h
@@ -23,6 +24,8 @@
 
 #include "tao/PortableServer/PortableServer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushSupplier;
 class TAO_CEC_ProxyPullSupplier;
@@ -90,5 +93,7 @@ public:
   virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index de4862d67f0..57bb93b8fab 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#include "CEC_Default_Factory.h"
-#include "CEC_MT_Dispatching.h"
-#include "CEC_Reactive_Pulling_Strategy.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_SupplierAdmin.h"
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_ProxyPullConsumer.h"
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_ProxyPullSupplier.h"
-#include "CEC_EventChannel.h"
-#include "CEC_Reactive_ConsumerControl.h"
-#include "CEC_Reactive_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h"
 
 #include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 #include "orbsvcs/ESF/ESF_Delayed_Changes.h"
@@ -23,21 +23,27 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Null_Mutex.h"
+#include "ace/Null_Condition.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedConsumerAdmin.h"
-#include "CEC_TypedSupplierAdmin.h"
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_Default_Factory.i"
+#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_Default_Factory,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
 {
     if (orbid_dupped_ != 0)
@@ -1316,6 +1322,8 @@ TAO_CEC_Default_Factory::destroy_supplier_control (TAO_CEC_SupplierControl* x)
   delete x;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 80572e0054f..2704a7ca92c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Default_Factory.h
@@ -15,17 +16,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_Factory.h"
+#include "orbsvcs/CosEvent/CEC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CEC_Defaults.h"
+#include "orbsvcs/CosEvent/CEC_Defaults.h"
 
 #include "ace/Service_Config.h"
 #include "ace/Time_Value.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_Default_Factory
  *
@@ -204,8 +207,10 @@ private:
   unsigned int proxy_disconnect_retries_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_Default_Factory.i"
+#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
index b039316d2cb..0dd3d37f8cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void)
   :  dispatching_ (TAO_CEC_DEFAULT_DISPATCHING),
@@ -24,3 +28,5 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void)
      proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
index 5a97e4bd902..f7fabae1b16 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Defaults.h
@@ -8,7 +9,6 @@
  * In this file we set the compile time defaults for the event
  * channel.
  *
- *
  *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
  */
 //=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index ef98d25450d..14c6d6c21ca 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "CEC_Dispatching.h"
-#include "CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
 
 ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void)
 {
 }
@@ -58,3 +60,5 @@ TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
   proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index e6aff0650d3..48806cdafba 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -1,5 +1,5 @@
-// $Id$
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Dispatching.h
@@ -18,12 +18,14 @@
 
 #include "orbsvcs/CosEventCommC.h"
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_ProxyPushSupplier;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 class TAO_CEC_TypedEvent;
@@ -110,6 +112,8 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CEC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 49849ae3f89..363d2600717 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "CEC_Dispatching_Task.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
 
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_errno.h"
 
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_Dispatching_Task.i"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_errno.h"
@@ -16,6 +16,8 @@ ACE_RCSID (CosEvent,
            CEC_Dispatching,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_CEC_Dispatching_Task::svc (void)
 {
@@ -150,3 +152,5 @@ TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
   return 0;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index b9c15af22fd..fcdcb8a564a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
 
 #include "tao/Basic_Types.h"
 
@@ -32,9 +32,11 @@
 #include "ace/Task.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedEvent.h"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_Dispatching_Task
  *
@@ -152,8 +154,10 @@ private:
 };
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_Dispatching_Task.i"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
index 0bf5b92e030..1432528492a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_Dispatching_Task::
 TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager)
@@ -77,3 +81,5 @@ TAO_CEC_Invoke_Command::TAO_CEC_Invoke_Command (TAO_CEC_ProxyPushSupplier* proxy
   this->proxy_->_incr_refcnt ();
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index ee2fc24cb05..75813fad39b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -2,16 +2,18 @@
 //
 // $Id$
 
-#include "CEC_DynamicImplementation.h"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h"
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "tao/debug.h"
-#include "CEC_TypedEvent.h"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
 
 #if !defined(__ACE_INLINE__)
-#include "CEC_DynamicImplementation.i"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Destructor
 TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
 {
@@ -173,3 +175,5 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
   request->set_result (result_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index aa3d1bb7800..98c4b91c1cd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_DynamicImplementation.h
@@ -13,12 +14,15 @@
 #ifndef TAO_CEC_DYNAMICIMPLEMENTATION_H
 #define TAO_CEC_DYNAMICIMPLEMENTATION_H
 
-#include "CEC_TypedProxyPushConsumer.h"
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/ORB.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation
 {
   // = TITLE
@@ -71,8 +75,10 @@ private:
   CORBA::RepositoryId repository_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "CEC_DynamicImplementation.i"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_CEC_DYNAMICIMPLEMENTATION_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
index 5058927e3c9..2f1bff715f7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
@@ -1,7 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer 
+TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer
         (PortableServer::POA_ptr poa,
          TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer,
          TAO_CEC_TypedEventChannel *typed_event_channel)
@@ -12,3 +16,4 @@ TAO_CEC_DynamicImplementationServer::TAO_CEC_DynamicImplementationServer
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 65bbebb51cf..c24469dae73 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "CEC_EventChannel.h"
-#include "CEC_Dispatching.h"
-#include "CEC_Pulling_Strategy.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_SupplierAdmin.h"
-#include "CEC_ConsumerControl.h"
-#include "CEC_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_EventChannel.i"
+#include "orbsvcs/CosEvent/CEC_EventChannel.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_EventChannel::
 TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr,
                       TAO_CEC_Factory* factory,
@@ -229,3 +231,5 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 62f4884fe88..5be1829ce43 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_EventChannel.h
@@ -20,7 +21,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_Factory.h"
+#include "orbsvcs/CosEvent/CEC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,10 +29,12 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "CEC_Defaults.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/CEC_Defaults.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 #include "ace/Hash_Map_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_EventChannel_Attributes
  *
@@ -298,8 +301,10 @@ private:
   ServantRetryMap retry_map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_EventChannel.i"
+#include "orbsvcs/CosEvent/CEC_EventChannel.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
index 256d518b72a..23f8e906f7c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_EventChannel_Attributes::
 TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa,
@@ -197,3 +201,5 @@ TAO_CEC_EventChannel::get_servant_retry_map (void)
 {
   return this->retry_map_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 0563ba518bb..2b02ea077fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -15,7 +15,7 @@
 //
 //===========================================================================
 
-#include "CEC_Event_Loader.h"
+#include "orbsvcs/CosEvent/CEC_Event_Loader.h"
 #include "ace/Dynamic_Service.h"
 
 #include "orbsvcs/CosNamingC.h"
@@ -32,7 +32,16 @@ ACE_RCSID (CosEvent,
            CEC_Event_Loader,
            "$Id$")
 
-TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) :
+  attributes_ (0)
+  , factory_ (0)
+  , ec_impl_ (0)
+#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
+  , typed_attributes_ (0)
+  , typed_ec_impl_ (0)
+#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 {
   // Constructor
 }
@@ -159,13 +168,13 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                           argv[0]));
 #else
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Usage: %s "
-                          "-n service_name "
-                          "-o ior_file_name "
-                          "-p pid_file_name "
-                          "-x [disable naming service bind] "
-                          "-r [rebind, no AlreadyBound failures] "
-                          "\n"),
+                          ACE_TEXT ("Usage: %s ")
+                          ACE_TEXT ("-n service_name ")
+                          ACE_TEXT ("-o ior_file_name ")
+                          ACE_TEXT ("-p pid_file_name ")
+                          ACE_TEXT ("-x [disable naming service bind] ")
+                          ACE_TEXT ("-r [rebind, no AlreadyBound failures] ")
+                          ACE_TEXT ("\n"),
                           argv[0]));
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
               return CORBA::Object::_nil ();
@@ -396,7 +405,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               ACE_TRY_CHECK;
 
               this->channel_name_.length (1);
-              this->channel_name_[0].id = CORBA::string_dup (service_name);
+              this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
 
               if (use_rebind)
                 {
@@ -425,8 +434,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       return CORBA::Object::_nil ();
     }
   ACE_ENDTRY;
-
-  return 0;
 }
 
 int
@@ -439,22 +446,25 @@ TAO_CEC_Event_Loader::fini (void)
   ACE_TRY
     {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-      // Release the resources of the Typed Event Channel
-      this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      if(this->typed_ec_impl_)
+        {
+          // Release the resources of the Typed Event Channel
+          this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-      // Deactivate the Typed EC
-      // This will raise an exception if destroy == 1
-      PortableServer::POA_var t_poa =
-        this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          // Deactivate the Typed EC
+          // This will raise an exception if destroy == 1
+          PortableServer::POA_var t_poa =
+          this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-      PortableServer::ObjectId_var t_id =
-        t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::ObjectId_var t_id =
+          t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-      t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 #else
       // Release the resources of the Event Channel
       this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -490,14 +500,13 @@ TAO_CEC_Event_Loader::fini (void)
           ACE_TRY_CHECK_EX (foo);
         }
 
-      // Since we created them, we also have to delete them.
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
+      // Since we created them, we also have to delete them.
       delete this->typed_attributes_;
       delete this->typed_ec_impl_;
-#else
+#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
       delete this->attributes_;
       delete this->ec_impl_;
-#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     }
   ACE_CATCHANY
     {
@@ -510,4 +519,6 @@ TAO_CEC_Event_Loader::fini (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index d48c98c3705..28bfe57bad7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 /**
  * @file CEC_Event_Loader.h
  *
@@ -17,16 +19,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 #include "orbsvcs/CosNamingC.h"
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_Event_Loader
  *
@@ -94,10 +98,13 @@ protected:
   CosNaming::Name channel_name_;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &))
+  // Disallow copying and assignment.
+  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &);
+  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader)
 
 #endif /* TAO_CEC_EVENT_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index 4a746e0b71c..e2ffe759211 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
-#include "CEC_Factory.h"
+#include "orbsvcs/CosEvent/CEC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID(CosEvent, CEC_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_Factory::~TAO_CEC_Factory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 5c1272ab1a5..f7c6950815f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Factory.h
@@ -15,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +24,13 @@
 
 #include "ace/Service_Object.h"
 
+#include "tao/Versioned_Namespace.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -214,5 +221,7 @@ public:
       destroy_supplier_control (TAO_CEC_SupplierControl*) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index ddeddeb2ece..41f29d8a59e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -1,9 +1,14 @@
 // $Id$
 
-#include "CEC_MT_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
 
 ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
+
 TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads,
                                                 int thread_creation_flags,
                                                 int thread_priority,
@@ -99,3 +104,5 @@ TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
   this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index c19647c53d1..458110cad9a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_MT_Dispatching.h
@@ -15,13 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CEC_Dispatching_Task.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -90,6 +93,8 @@ private:
   int active_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CEC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index fd172f89e1d..039ccb5f5f8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "CEC_ProxyPullConsumer.h"
-#include "CEC_EventChannel.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_SupplierControl.h"
-#include "CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_ProxyPullConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_ProxyPullConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
 TAO_CEC_ProxyPullConsumer::
@@ -389,3 +391,5 @@ TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 35fae60d38e..f47959a2933 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_ProxyPullConsumer.h
@@ -9,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_CEC_PROXYPULLCONSUMER_H
 #define TAO_CEC_PROXYPULLCONSUMER_H
 
@@ -22,7 +22,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
@@ -133,8 +135,10 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_ProxyPullConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
index 86003baa1c4..3c22bfb9af4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::is_connected_i (void) const
 {
@@ -34,3 +38,5 @@ TAO_CEC_ProxyPullConsumer::supplier (CosEventComm::PullSupplier_ptr supplier)
 
   this->supplier_i (supplier);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 7bbc442b000..fb3f757e79c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -1,19 +1,21 @@
 // $Id$
 
-#include "CEC_ProxyPullSupplier.h"
-#include "CEC_Dispatching.h"
-#include "CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_ProxyPullSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_ProxyPullSupplier,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
 TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec)
@@ -355,3 +357,5 @@ TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 1f7a0a603d4..8fe65754426 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -26,7 +26,9 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Unbounded_Queue.h"
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPullConsumer;
@@ -157,8 +159,10 @@ private:
   ACE_Unbounded_Queue<CORBA::Any> queue_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_ProxyPullSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
index e4c07d62a81..8519794c295 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::is_connected_i (void) const
 {
@@ -35,3 +39,5 @@ TAO_CEC_ProxyPullSupplier::consumer (CosEventComm::PullConsumer_ptr consumer)
 
   this->consumer_i (consumer);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index e6b54a8e24a..76d85c4b0c0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -1,27 +1,29 @@
 // $Id$
 
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_EventChannel.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_ProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_ProxyPushConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
 TAO_CEC_ProxyPushConsumer::
     TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec)
   : event_channel_ (ec),
     refcount_ (1),
-    connected_ (0)
+    connected_ (false)
 {
   this->lock_ =
     this->event_channel_->create_consumer_lock ();
@@ -95,15 +97,15 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
         CORBA::INTERNAL ());
     ACE_CHECK_RETURN (0);
 
-    disconnected = 0;
-    if (this->is_connected_i () == 0)
+    disconnected = false;
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
     if (CORBA::is_nil (this->supplier_.in ()))
       {
-        return 0;
+        return false;
       }
     supplier = CORBA::Object::_duplicate (this->supplier_.in ());
   }
@@ -111,7 +113,7 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
-  return 0;
+  return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
@@ -128,7 +130,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_CHECK;
 
     supplier = this->supplier_._retn ();
-    this->connected_ = 0;
+    this->connected_ = false;
   }
 
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -155,7 +157,7 @@ TAO_CEC_ProxyPushConsumer::cleanup_i (void)
 {
   this->supplier_ =
     CosEventComm::PushSupplier::_nil ();
-  this->connected_ = 0;
+  this->connected_ = false;
 }
 
 CORBA::ULong
@@ -170,7 +172,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return this->refcount_;
   }
@@ -224,7 +226,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
       }
     this->supplier_ =
       CosEventComm::PushSupplier::_duplicate (push_supplier);
-    this->connected_ = 1;
+    this->connected_ = true;
   }
 
   // Notify the event channel...
@@ -262,7 +264,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
@@ -322,7 +324,7 @@ TAO_CEC_ProxyPushConsumer_Guard::
      refcount_ (refcount),
      event_channel_ (ec),
      proxy_ (proxy),
-     locked_ (0)
+     locked_ (false)
 {
   ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
   // If the guard fails there is not much we can do, raising an
@@ -332,11 +334,11 @@ TAO_CEC_ProxyPushConsumer_Guard::
   // @@ Returning something won't work either, the error should be
   // logged though!
 
-  if (proxy->is_connected_i () == 0)
+  if (!proxy->is_connected_i ())
     return;
 
-  this->locked_ = 1;
-  this->refcount_++;
+  this->locked_ = true;
+  ++this->refcount_;
 }
 
 TAO_CEC_ProxyPushConsumer_Guard::
@@ -356,10 +358,11 @@ TAO_CEC_ProxyPushConsumer_Guard::
     // @@ Returning something won't work either, the error should be
     // logged though!
 
-    this->refcount_--;
+    --this->refcount_;
     if (this->refcount_ != 0)
       return;
   }
   this->event_channel_->destroy_proxy (this->proxy_);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index d16697cb4bd..63ba4bddad2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_ProxyPushConsumer.h
@@ -16,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosEventChannelAdminS.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +25,8 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
 class TAO_CEC_ProxyPushSupplier;
@@ -41,7 +44,7 @@ class TAO_CEC_ProxyPushSupplier;
  * The object commits suicide when disconnect_push_consumer() is
  * called.
  */
-class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer 
+class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer
   : public POA_CosEventChannelAdmin::ProxyPushConsumer
 {
 public:
@@ -64,7 +67,7 @@ public:
   virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Return 0 if no supplier is connected...
+  /// Return false if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
 
   /// Return the consumer object reference. It returns nil() if it has
@@ -131,9 +134,9 @@ private:
   /// The supplier....
   CosEventComm::PushSupplier_var supplier_;
 
-  /// If the flag is not zero then we are connected, notice that the
+  /// If the flag is true then we are connected, notice that the
   /// supplier can be nil.
-  int connected_;
+  bool connected_;
 
   /// Store the default POA.
   PortableServer::POA_var default_POA_;
@@ -163,8 +166,8 @@ public:
   /// Destructor
   ~TAO_CEC_ProxyPushConsumer_Guard (void);
 
-  /// Returns 1 if the reference count successfully acquired
-  int locked (void) const;
+  /// Returns true if the reference count successfully acquired
+  bool locked (void) const;
 
 private:
   /// The lock used to protect the reference count
@@ -179,13 +182,15 @@ private:
   /// The proxy whose lifetime is controlled by the reference count
   TAO_CEC_ProxyPushConsumer *proxy_;
 
-  /// This flag is set to 1 if the reference count was successfully
+  /// This flag is set to true if the reference count was successfully
   /// acquired.
-  int locked_;
+  bool locked_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_ProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
index a9eca16ca37..422c95863c6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::is_connected_i (void) const
 {
@@ -37,8 +41,10 @@ TAO_CEC_ProxyPushConsumer::supplier (CosEventComm::PushSupplier_ptr supplier)
 
 // ****************************************************************
 
-ACE_INLINE int
+ACE_INLINE bool
 TAO_CEC_ProxyPushConsumer_Guard::locked (void) const
 {
   return this->locked_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 4dac60736bf..028bf6e4b28 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -6,16 +6,16 @@
 // question when using compilers like g++ 3.4.x.
 #include "tao/DynamicInterface/DII_CORBA_methods.h"
 
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_Dispatching.h"
-#include "CEC_EventChannel.h"
-#include "CEC_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 #include "tao/debug.h"
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedEvent.h"
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 #include "tao/DynamicInterface/Request.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
@@ -23,13 +23,15 @@
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_ProxyPushSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_ProxyPushSupplier,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
 // TAO_CEC_ProxyPushSupplier Constructure (Un-typed EC)
@@ -322,7 +324,7 @@ TAO_CEC_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_;
   }
@@ -920,3 +922,5 @@ TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 820a1b705ea..5ebed2713c7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_ProxyPushSupplier.h
@@ -22,12 +23,14 @@
 #include "orbsvcs/CosTypedEventChannelAdminS.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushConsumer;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -193,8 +196,10 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_ProxyPushSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
index e7453b533dc..9f92df16b06 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::is_connected_i (void) const
 {
@@ -82,11 +86,13 @@ TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const
 {
   if (this->typed_event_channel_ != 0)
   {
-    return 1;
+    return true;
   }
   else
   {
-    return 0;
+    return false;
   }
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index 5367a8c4eda..eeb8c998046 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -1,9 +1,13 @@
 // $Id$
 
-#include "CEC_Pulling_Strategy.h"
+#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
 
 ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index c63ef0f1cdc..791dda5c1d2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Pulling_Strategy.h
@@ -23,6 +24,7 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_CEC_Pulling_Strategy
@@ -63,5 +65,7 @@ public:
 #endif /* 0 */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_PULLING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 3ac9f33ba07..934fc6e4c82 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -4,33 +4,38 @@
 // the Typed and Un-typed Event Channels.  A check must be made in the code
 // to ensure the correct EC is referenced. 
 
-#include "CEC_EventChannel.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_Reactive_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedEventChannel.h"
-#include "CEC_TypedConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_ProxyPullSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
 
 #include "orbsvcs/Time_Utilities.h"
 
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 #include "tao/Messaging/Messaging.h"
+#endif
+
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_Reactive_ConsumerControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_Reactive_ConsumerControl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC
 TAO_CEC_Reactive_ConsumerControl::
      TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
@@ -43,7 +48,9 @@ TAO_CEC_Reactive_ConsumerControl::
     retries_ (retries),
     adapter_ (this),
     event_channel_ (ec),
+#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     typed_event_channel_ (0),
+#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     orb_ (CORBA::ORB::_duplicate (orb))
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
@@ -482,3 +489,4 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 6599729cb7f..f1cc2e40767 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Reactive_ConsumerControl.h
@@ -19,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,7 @@
 #include "ace/Event_Handler.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -200,8 +202,10 @@ private:
   TAO_CEC_ConsumerControl *control_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_Reactive_ConsumerControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
index ce73a433eba..cd61d83efce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_Ping_Push_Consumer::
     TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control)
@@ -15,3 +19,5 @@ TAO_CEC_Ping_Pull_Consumer::
   :  control_ (control)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index bd6bd46f9d7..55063132e47 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -1,24 +1,30 @@
 // $Id$
 
-#include "CEC_ProxyPullConsumer.h"
-#include "CEC_EventChannel.h"
-#include "CEC_SupplierAdmin.h"
-#include "CEC_ConsumerAdmin.h"
-#include "CEC_Reactive_Pulling_Strategy.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h"
 
 #include "orbsvcs/Time_Utilities.h"
 
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 #include "tao/Messaging/Messaging.h"
+#endif
+
 #include "tao/ORB_Core.h"
 
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_Reactive_Pulling_Strategy.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_Reactive_Pulling_Strategy::
     TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate,
                                        const ACE_Time_Value &relative_timeout,
@@ -195,3 +201,4 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index e4fe8452768..a43c423f3a3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_Reactive_Pulling_Strategy.h
@@ -15,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_Pulling_Strategy.h"
+#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,6 +29,9 @@
 
 #include "ace/Event_Handler.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_ProxyPullConsumer;
 class TAO_CEC_EventChannel;
 class TAO_CEC_ConsumerAdmin;
@@ -136,8 +140,10 @@ private:
   TAO_CEC_SupplierControl *supplier_control_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_Reactive_Pulling_Strategy.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
index 729db4ab9f8..319de5688f5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
                                         TAO_CEC_SupplierControl *control)
@@ -7,3 +11,5 @@ TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
      supplier_control_ (control)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 1c4c713d48e..b7a49603b36 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -4,34 +4,39 @@
 // the Typed and Un-typed Event Channels.  A check must be made in the code
 // to ensure the correct EC is referenced. 
 
-#include "CEC_EventChannel.h"
-#include "CEC_SupplierAdmin.h"
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_Reactive_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "CEC_TypedEventChannel.h"
-#include "CEC_TypedSupplierAdmin.h"
-#include "CEC_TypedProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
 
 #include "orbsvcs/Time_Utilities.h"
 
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 #include "tao/Messaging/Messaging.h"
+#endif
+
 #include "tao/ORB_Core.h"
 
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_Reactive_SupplierControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_Reactive_SupplierControl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC
 TAO_CEC_Reactive_SupplierControl::
      TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
@@ -44,6 +49,9 @@ TAO_CEC_Reactive_SupplierControl::
     retries_ (retries),
     adapter_ (this),
     event_channel_ (ec),
+#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
+    typed_event_channel_ (0),
+#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     orb_ (CORBA::ORB::_duplicate (orb))
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
@@ -67,6 +75,7 @@ TAO_CEC_Reactive_SupplierControl::
     timeout_ (timeout),
     retries_ (retries),
     adapter_ (this),
+    event_channel_ (0),
     typed_event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -525,3 +534,4 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 27d9ae5c2bd..bd7cbe1fd94 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CEC_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +31,8 @@
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_EventChannel;
 class TAO_CEC_Reactive_SupplierControl;
 
@@ -216,8 +218,10 @@ private:
   TAO_CEC_SupplierControl *control_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_Reactive_SupplierControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
index 2f242bef904..e166f46ecf6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_Ping_Push_Supplier::
     TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control)
@@ -26,3 +30,5 @@ TAO_CEC_Ping_Pull_Supplier::
   :  control_ (control)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index e73a071e546..e667fe96e0d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -1,19 +1,22 @@
 // $Id$
 
-#include "CEC_SupplierAdmin.h"
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_ProxyPullConsumer.h"
-#include "CEC_EventChannel.h"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_SupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (CosEvent,
            CEC_SupplierAdmin,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
   :  event_channel_ (ec),
      push_admin_ (ec),
@@ -98,3 +101,5 @@ TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 38f312bdc53..a1e67f65c71 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_SupplierAdmin.h
@@ -13,7 +14,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_CEC_SUPPLIERADMIN_H
 #define TAO_CEC_SUPPLIERADMIN_H
 
@@ -27,9 +27,11 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "CEC_ProxyPushConsumer.h"
-#include "CEC_ProxyPullConsumer.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -114,8 +116,10 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_SupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
index dc20a41a684..ec420d2c576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
@@ -15,3 +19,5 @@ TAO_CEC_SupplierAdmin::
 {
   this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index f8f3edccd29..e9b79b992cd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "CEC_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
 
 ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void)
 {
 }
@@ -62,3 +64,4 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 8282081586d..4de8fc0c3f6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_SupplierControl.h
@@ -10,7 +11,6 @@
  * More details can be found in:
  *
  * http://doc.ece.uci.edu/~coryan/EC/
- *
  */
 //=============================================================================
 
@@ -29,6 +29,8 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushConsumer;
 class TAO_CEC_ProxyPullConsumer;
@@ -104,5 +106,7 @@ public:
   virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 223438df8ed..69c08a7b739 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -2,14 +2,17 @@
 //
 // $Id$
 
-#include "CEC_TypedConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
 
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_TypedConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel *ec)
   :  typed_event_channel_ (ec),
@@ -128,3 +131,5 @@ TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier
 {
   supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 1e08da77de5..72925fb2c00 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -1,9 +1,11 @@
-// $Id$
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_TypedConsumerAdmin.h
  *
+ *  $Id$
+ *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
  *  Based on the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu)
@@ -24,8 +26,10 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "CEC_ProxyPushSupplier.h"
-#include "CEC_TypedEvent.h"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_TypedEventChannel;
 
@@ -115,8 +119,10 @@ private:
   TAO_CEC_TypedEventChannel* typed_event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_TypedConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
index b534a67483b..37a0dd30d28 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_CEC_TypedConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
@@ -9,9 +13,12 @@ TAO_CEC_TypedConsumerAdmin::
 }
 
 ACE_INLINE
-TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event,
-                                                              TAO_CEC_TypedEventChannel* typed_event_channel)
+TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (
+  const TAO_CEC_TypedEvent& typed_event,
+  TAO_CEC_TypedEventChannel* typed_event_channel)
   :  typed_event_ (typed_event),
      typed_event_channel_ (typed_event_channel)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
index feb1e04e569..9142e04e6bb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "CEC_TypedEvent.h"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_TypedEvent.i"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index 8a7157b0e0a..8dff16f8bf1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -1,9 +1,11 @@
-// $Id$
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_TypedEvent.h
  *
+ *  $Id$
+ *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  */
 //=============================================================================
@@ -12,7 +14,7 @@
 #define TAO_CEC_TYPEDEVENT_H_
 #include /**/ "ace/pre.h"
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -23,6 +25,9 @@
 #include "tao/CORBA_methods.h"
 
 // ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_TypedEvent
  *
@@ -53,8 +58,10 @@ private:
   CORBA::String_var operation_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_TypedEvent.i"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
index 6b7203639b1..4c8f0aab997 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void)
 {
@@ -22,3 +26,5 @@ TAO_CEC_TypedEvent::operator= (const TAO_CEC_TypedEvent& other)
 
   return *this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 8f6fa6f6021..ffb80d8158c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -2,20 +2,22 @@
 //
 // $Id$
 
-#include "CEC_TypedEventChannel.h"
-#include "CEC_Dispatching.h"
-#include "CEC_TypedConsumerAdmin.h"
-#include "CEC_TypedSupplierAdmin.h"
-#include "CEC_ConsumerControl.h"
-#include "CEC_SupplierControl.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
+#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_TypedEventChannel.i"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
 #endif /* __ACE_INLINE__ */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO_CEC_TypedEventChannel::
 TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr,
@@ -287,7 +289,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
                 {
                   ACE_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("***** Base interface %s found on interface %s *****\n"),
-                              fid->base_interfaces[base].in(),
+                              static_cast<char const*>(fid->base_interfaces[base]),
                               interface_ ));
                 }
             }
@@ -437,8 +439,6 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
         }
       return result;
     }
-  // Should not get here!
-  return -1;
 }
 
 // A supplier is attempting to register its supported_interface.
@@ -503,8 +503,6 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
         }
       return result;
     }
-  // Should not get here!
-  return -1;
 }
 
 // Function creates a NVList and populates it from the parameter information.
@@ -567,3 +565,4 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index e055adfb7eb..e98f9b28375 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -1,11 +1,13 @@
-// $Id$
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_TypedEventChannel.h
  *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
+ *  $Id$
+ *
  * A new implementation of the COS Typed Event Channel, based on
  * the untyped version by Carlos O'Ryan (coryan@cs.wustl.edu)
  *
@@ -16,17 +18,17 @@
 #define TAO_CEC_TYPEDEVENTCHANNEL_H_
 #include /**/ "ace/pre.h"
 
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CEC_Defaults.h"
+#include "orbsvcs/CosEvent/CEC_Defaults.h"
 
 #include "orbsvcs/CosTypedEventChannelAdminS.h"
 
-#include "CEC_Factory.h"
+#include "orbsvcs/CosEvent/CEC_Factory.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/AnyTypeCode/NVList.h"
@@ -35,6 +37,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CEC_TypedEventChannel_Attributes
  *
@@ -374,9 +378,10 @@ private:
   TAO_CEC_Param * parameters_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "CEC_TypedEventChannel.i"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
index c4821662fa2..ec52c543383 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CEC_TypedEventChannel_Attributes::
 TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa,
@@ -160,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<char *> (this->base_interfaces_[index].in ());
+  return const_cast <CORBA::RepositoryId>(this->base_interfaces_[index]);
 }
 
 ACE_INLINE CORBA::ULong
@@ -197,3 +201,5 @@ TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void)
 {
   delete [] parameters_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 444bc9444b3..f745c5a942c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -2,18 +2,20 @@
 //
 // $Id$
 
-#include "CEC_TypedProxyPushConsumer.h"
-#include "CEC_TypedEventChannel.h"
-#include "CEC_TypedConsumerAdmin.h"
-#include "CEC_DynamicImplementation.h"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h"
 #include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_TypedProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Reverse_Lock_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_CEC_Unlock;
 
 // Implementation skeleton constructor
@@ -417,3 +419,4 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
   this->typed_event_channel_->destroy_proxy (this->proxy_);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index de3210df73b..fa9e936dd78 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -1,9 +1,10 @@
-// $Id$
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   CEC_TypedProxyPushConsumer.h
  *
+ *  $Id$
  *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
@@ -23,7 +24,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "event_serv_export.h"
+#include "orbsvcs/CosEvent/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_TypedEvent;
 class TAO_CEC_TypedEventChannel;
@@ -183,8 +186,10 @@ private:
   int locked_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_TypedProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
index 6a1312c7e3e..86eee941060 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const
 {
@@ -13,3 +17,5 @@ TAO_CEC_TypedProxyPushConsumer_Guard::locked (void) const
 {
   return this->locked_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 00421b15a46..a156440cc16 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -1,15 +1,15 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "CEC_TypedSupplierAdmin.h"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
 
-#include "CEC_TypedEventChannel.h"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "CEC_TypedSupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel *ec)
   :  typed_event_channel_ (ec),
@@ -107,3 +107,5 @@ TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index ac42bd0ca8b..eaa3747387f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -1,11 +1,10 @@
-// $Id$
+// -*- C++ -*-
 
-/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_TypedSupplierAdmin.h
  *
- *  $Id:
+ *  $Id$
  *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
@@ -27,7 +26,9 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "CEC_TypedProxyPushConsumer.h"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_TypedEventChannel;
 
@@ -97,8 +98,10 @@ private:
     typed_push_admin_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "CEC_TypedSupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
index 2d6dd17e750..4a3111bc176 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_CEC_TypedSupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
@@ -7,3 +11,5 @@ TAO_CEC_TypedSupplierAdmin::
 {
   this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 5aabc0ad101..e6ceedced03 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
+project(CosLifeCycle) : orbsvcslib, core, naming, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLifeCycle
   idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h
   dynamicflags = TAO_LIFECYCLE_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index 88c5793a5a5..7ea375e45af 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor {
+project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLoadBalancing
   idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
   dynamicflags = TAO_LOADBALANCING_BUILD_DLL
@@ -22,14 +22,9 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba,
       LoadBalancing/LB_LoadAverage.cpp
       LoadBalancing/LB_LoadAlert.cpp
       LoadBalancing/LB_LoadAlertInfo.cpp
-      LoadBalancing/LB_LoadAlertMap.cpp
       LoadBalancing/LB_LoadAlert_Handler.cpp
-      LoadBalancing/LB_LoadListMap.cpp
       LoadBalancing/LB_LoadManager.cpp
-      LoadBalancing/LB_LoadMap.cpp
-      LoadBalancing/LB_Location_Index_Map.cpp
       LoadBalancing/LB_MemberLocator.cpp
-      LoadBalancing/LB_MonitorMap.cpp
       LoadBalancing/LB_Pull_Handler.cpp
       LoadBalancing/LB_Random.cpp
       LoadBalancing/LB_RoundRobin.cpp
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index e73440e773b..991012a2a9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_IDL) : orbsvcslib, core {
-
+project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only =	1
-
-  idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
 
   IDL_Files {
     CosNaming.idl
@@ -15,8 +13,8 @@ project(CosNaming_IDL) : orbsvcslib, core {
 project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
-
-  after	+= CosNaming_IDL
+  tagchecks   += Naming
+  after	      += CosNaming_IDL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 02066295e7f..02f81cd7b59 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -1,7 +1,9 @@
 // -*- MPC -*-
+//
 // $Id$
 
-project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging, svc_utils, iortable {
+project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging_optional, svc_utils, iortable {
+  avoids      += ace_for_tao  // Requires MMAP_Memory_Pool
   sharedname   = TAO_CosNaming_Serv
   dynamicflags = TAO_NAMING_SERV_BUILD_DLL
   tagchecks   += Naming
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index 3055bf526ee..c5859a1c573 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -4,6 +4,7 @@
 project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
   sharedname   = TAO_CosNaming_Skel
   dynamicflags = TAO_NAMING_SKEL_BUILD_DLL
+  tagchecks   += Naming
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 5c7c8eadebc..87fab05f21c 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification_IDL) : orbsvcslib, core, event {
-
+project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
 
   IDL_Files {
     CosNotification.idl
@@ -20,8 +18,8 @@ project(CosNotification_IDL) : orbsvcslib, core, event {
 project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
-
-  after += CosNotification_IDL
+  tagchecks   += Notify
+  after       += CosNotification_IDL
 
   IDL_Files {
   }
@@ -72,6 +70,7 @@ project(CosNotification) : orbsvcslib, core, event {
 project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver {
   sharedname   = TAO_CosNotification_Skel
   dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL
+  tagchecks   += Notify
 
   IDL_Files {
   }
@@ -144,91 +143,96 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel,
   // The following could be simplified if RT stuff was
   // put into another subdirectory.
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    Notify {
-      Notify/Admin.cpp
-      Notify/AdminProperties.cpp
-      Notify/Bit_Vector.cpp
-      Notify/Buffering_Strategy.cpp
-      Notify/Builder.cpp
-      Notify/Consumer.cpp
-      Notify/ConsumerAdmin.cpp
-      Notify/CosNotify_Initializer.cpp
-      Notify/CosNotify_Service.cpp
-      Notify/Default_Factory.cpp
-      Notify/Delivery_Request.cpp
-      Notify/ETCL_Filter.cpp
-      Notify/ETCL_FilterFactory.cpp
-      Notify/Event.cpp
-      Notify/EventChannel.cpp
-      Notify/EventChannelFactory.cpp
-      Notify/EventType.cpp
-      Notify/EventTypeSeq.cpp
-      Notify/Event_Manager.cpp
-      Notify/Event_Persistence_Factory.cpp
-      Notify/FilterAdmin.cpp
-      Notify/ID_Factory.cpp
-      Notify/Method_Request.cpp
-      Notify/Method_Request_Dispatch.cpp
-      Notify/Method_Request_Event.cpp
-      Notify/Method_Request_Lookup.cpp
-      Notify/Method_Request_Shutdown.cpp
-      Notify/Method_Request_Updates.cpp
-      Notify/Name_Value_Pair.cpp
-      Notify/Notify_Constraint_Interpreter.cpp
-      Notify/Notify_Constraint_Visitors.cpp
-      Notify/Notify_Default_Collection_Factory.cpp
-      Notify/Notify_Default_CO_Factory.cpp
-      Notify/Notify_Default_EMO_Factory.cpp
-      Notify/Notify_Default_POA_Factory.cpp
-      Notify/Notify_EventChannelFactory_i.cpp
-      Notify/Object.cpp
-      Notify/Peer.cpp
-      Notify/Persistent_File_Allocator.cpp
-      Notify/POA_Helper.cpp
-      Notify/Properties.cpp
-      Notify/PropertySeq.cpp
-      Notify/Property_Boolean.cpp
-      Notify/Proxy.cpp
-      Notify/ProxyConsumer.cpp
-      Notify/ProxySupplier.cpp
-      Notify/QoSProperties.cpp
-      Notify/Random_File.cpp
-      Notify/Reactive_Task.cpp
-      Notify/Refcountable.cpp
-      Notify/Reconnection_Registry.cpp
-      Notify/Routing_Slip.cpp
-      Notify/Routing_Slip_Persistence_Manager.cpp
-      Notify/Routing_Slip_Queue.cpp
-      Notify/Service.cpp
-      Notify/Subscription_Change_Worker.cpp
-      Notify/Supplier.cpp
-      Notify/SupplierAdmin.cpp
-      Notify/Standard_Event_Persistence.cpp
-      Notify/ThreadPool_Task.cpp
-      Notify/Timer_Queue.cpp
-      Notify/Timer_Reactor.cpp
-      Notify/Topology_Loader.cpp
-      Notify/Topology_Object.cpp
-      Notify/Topology_Saver.cpp
-      Notify/Worker_Task.cpp
-      Notify/Any/AnyEvent.cpp
-      Notify/Any/CosEC_ProxyPushConsumer.cpp
-      Notify/Any/CosEC_ProxyPushSupplier.cpp
-      Notify/Any/ProxyPushConsumer.cpp
-      Notify/Any/ProxyPushSupplier.cpp
-      Notify/Any/PushConsumer.cpp
-      Notify/Any/PushSupplier.cpp
-      Notify/Sequence/SequenceProxyPushConsumer.cpp
-      Notify/Sequence/SequenceProxyPushSupplier.cpp
-      Notify/Sequence/SequencePushConsumer.cpp
-      Notify/Sequence/SequencePushSupplier.cpp
-      Notify/Structured/StructuredEvent.cpp
-      Notify/Structured/StructuredProxyPushConsumer.cpp
-      Notify/Structured/StructuredProxyPushSupplier.cpp
-      Notify/Structured/StructuredPushConsumer.cpp
-      Notify/Structured/StructuredPushSupplier.cpp
-    }
+  Source_Files {
+    Notify/Admin.cpp
+    Notify/AdminProperties.cpp
+    Notify/Bit_Vector.cpp
+    Notify/Buffering_Strategy.cpp
+    Notify/Builder.cpp
+    Notify/Consumer.cpp
+    Notify/ConsumerAdmin.cpp
+    Notify/CosNotify_Initializer.cpp
+    Notify/CosNotify_Service.cpp
+    Notify/Default_Factory.cpp
+    Notify/Delivery_Request.cpp
+    Notify/ETCL_Filter.cpp
+    Notify/ETCL_FilterFactory.cpp
+    Notify/Event.cpp
+    Notify/EventChannel.cpp
+    Notify/EventChannelFactory.cpp
+    Notify/EventType.cpp
+    Notify/EventTypeSeq.cpp
+    Notify/Event_Manager.cpp
+    Notify/Event_Persistence_Factory.cpp
+    Notify/FilterAdmin.cpp
+    Notify/ID_Factory.cpp
+    Notify/Method_Request.cpp
+    Notify/Method_Request_Dispatch.cpp
+    Notify/Method_Request_Event.cpp
+    Notify/Method_Request_Lookup.cpp
+    Notify/Method_Request_Shutdown.cpp
+    Notify/Method_Request_Updates.cpp
+    Notify/Name_Value_Pair.cpp
+    Notify/Notify_Constraint_Interpreter.cpp
+    Notify/Notify_Constraint_Visitors.cpp
+    Notify/Notify_Default_Collection_Factory.cpp
+    Notify/Notify_Default_CO_Factory.cpp
+    Notify/Notify_Default_EMO_Factory.cpp
+    Notify/Notify_Default_POA_Factory.cpp
+    Notify/Notify_EventChannelFactory_i.cpp
+    Notify/Object.cpp
+    Notify/Peer.cpp
+    Notify/Persistent_File_Allocator.cpp
+    Notify/POA_Helper.cpp
+    Notify/Properties.cpp
+    Notify/PropertySeq.cpp
+    Notify/Property_Boolean.cpp
+    Notify/Proxy.cpp
+    Notify/ProxyConsumer.cpp
+    Notify/ProxySupplier.cpp
+    Notify/QoSProperties.cpp
+    Notify/Random_File.cpp
+    Notify/Reactive_Task.cpp
+    Notify/Refcountable.cpp
+    Notify/Reconnection_Registry.cpp
+    Notify/Routing_Slip.cpp
+    Notify/Routing_Slip_Persistence_Manager.cpp
+    Notify/Routing_Slip_Queue.cpp
+    Notify/Service.cpp
+    Notify/Subscription_Change_Worker.cpp
+    Notify/Supplier.cpp
+    Notify/SupplierAdmin.cpp
+    Notify/Standard_Event_Persistence.cpp
+    Notify/ThreadPool_Task.cpp
+    Notify/Timer_Queue.cpp
+    Notify/Timer_Reactor.cpp
+    Notify/Topology_Loader.cpp
+    Notify/Topology_Object.cpp
+    Notify/Topology_Saver.cpp
+    Notify/Worker_Task.cpp
+    Notify/Any/AnyEvent.cpp
+    Notify/Any/CosEC_ProxyPushConsumer.cpp
+    Notify/Any/CosEC_ProxyPushSupplier.cpp
+    Notify/Any/ProxyPushConsumer.cpp
+    Notify/Any/ProxyPushSupplier.cpp
+    Notify/Any/PushConsumer.cpp
+    Notify/Any/PushSupplier.cpp
+    Notify/Sequence/SequenceProxyPushConsumer.cpp
+    Notify/Sequence/SequenceProxyPushSupplier.cpp
+    Notify/Sequence/SequencePushConsumer.cpp
+    Notify/Sequence/SequencePushSupplier.cpp
+    Notify/Structured/StructuredEvent.cpp
+    Notify/Structured/StructuredProxyPushConsumer.cpp
+    Notify/Structured/StructuredProxyPushSupplier.cpp
+    Notify/Structured/StructuredPushConsumer.cpp
+    Notify/Structured/StructuredPushSupplier.cpp
+  }
+
+  Header_Files {
+    Notify/notify_serv_export.h
+  }
+
+  Inline_Files {
   }
 
   Template_Files {
@@ -252,6 +256,7 @@ project(CosNotification_Persist) : notification_serv, core, acexml {
   }
 
   Header_Files {
+    Notify/notify_persist_export.h
   }
 
   Inline_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index e4aa9fbbfde..cc73a0a5fc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,13 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosProperty) : orbsvcslib, core, portableserver {
-  sharedname   = TAO_CosProperty
-  idlflags    += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h
-  dynamicflags = TAO_PROPERTY_BUILD_DLL
-  tagchecks   += Property
-  pch_header   =
-  pch_source   =
+project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
+  custom_only = 1
+  idlflags   += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
 
   IDL_Files {
     CosProperty.idl
@@ -15,29 +11,71 @@ project(CosProperty) : orbsvcslib, core, portableserver {
     // This is a wrappper for backwards compatibility
     CosPropertyService.idl
   }
+}
+
+project(CosProperty) : orbsvcslib, core {
+  sharedname   = TAO_CosProperty
+  dynamicflags = TAO_PROPERTY_BUILD_DLL
+  tagchecks   += Property
+  after       += CosProperty_IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     CosPropertyC.cpp
-    CosPropertyS.cpp
     CosPropertyServiceC.cpp
-    CosPropertyServiceS.cpp
-    Property
   }
 
   Header_Files {
     CosPropertyC.h
-    CosPropertyS.h
     CosPropertyServiceC.h
-    CosPropertyServiceS.h
-    Property
+    Property/property_export.h
   }
 
   Inline_Files {
     CosPropertyC.inl
-    CosPropertyS.inl
     CosPropertyServiceC.inl
+  }
+
+  Template_Files {
+  }
+
+  // explicit Resource_Files to avoid including _Skel and _Serv rc files.
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosProperty.pc.in
+  }
+}
+
+project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
+  sharedname   = TAO_CosProperty_Skel
+  dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL
+  tagchecks   += Property
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosPropertyS.cpp
+    CosPropertyServiceS.cpp
+  }
+
+  Header_Files {
+    CosPropertyS.h
+    CosPropertyS_T.h
+    CosPropertyServiceS.h
+    CosPropertyServiceS_T.h
+    Property/property_skel_export.h
+  }
+
+  Inline_Files {
+    CosPropertyS.inl
+    CosPropertyS_T.inl
     CosPropertyServiceS.inl
-    Property
+    CosPropertyServiceS_T.inl
   }
 
   Template_Files {
@@ -46,6 +84,37 @@ project(CosProperty) : orbsvcslib, core, portableserver {
   }
 
   Pkgconfig_Files {
-    TAO_CosProperty.pc.in
+    TAO_CosProperty_Skel.pc.in
+  }
+}
+
+project(CosProperty_Serv) : orbsvcslib, core, property_skel {
+  sharedname   = TAO_CosProperty_Serv
+  dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL
+  tagchecks   += Property
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Property
+  }
+
+  Header_Files {
+    Property
+    ^Property/property_export.h
+    ^Property/property_skel_export.h
+  }
+
+  Inline_Files {
+    Property
+  }
+
+  Template_Files {
+    Property
+  }
+
+  Pkgconfig_Files {
+    TAO_CosProperty_Serv.pc.in
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index a20d078718e..417a1c0d6ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTime) : orbsvcslib, svc_utils, core, portableserver {
+project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosTime
   idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
@@ -11,12 +11,17 @@ project(CosTime) : orbsvcslib, svc_utils, core, portableserver {
     TimeService.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    Time {
-      TimeServiceC.cpp
-      TimeServiceS.cpp
-      Time
-    }
+  Source_Files {
+    TimeServiceC.cpp
+    TimeServiceS.cpp
+    Time
+  }
+
+  Header_Files {
+    Time/time_export.h
+  }
+
+  Inline_Files {
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index e42e484b382..ef436ac2479 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading_IDL) : orbsvcslib, core {
-
+project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
   IDL_Files {
     CosTrading.idl
@@ -18,8 +16,8 @@ project(CosTrading_IDL) : orbsvcslib, core {
 project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
-
-  after += CosTrading_IDL
+  tagchecks   += Trader
+  after       += CosTrading_IDL
 
   IDL_Files {
   }
@@ -60,6 +58,7 @@ project(CosTrading) : orbsvcslib, core {
 project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
   sharedname   = TAO_CosTrading_Skel
   dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
+  tagchecks   += Trader
 
   IDL_Files {
   }
@@ -104,7 +103,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
 }
 
 
-project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils {
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils, iortable {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
@@ -114,10 +113,12 @@ project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils
   IDL_Files {
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    Trader {
-      Trader
-    }
+  Source_Files {
+    Trader
+  }
+
+  Header_Files {
+    Trader/trading_serv_export.h
   }
 
   Inline_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 246397fd193..4322406dedc 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event {
-
+project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults {
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
 
   IDL_Files {
     DsEventLogAdmin.idl
@@ -15,8 +13,8 @@ project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event {
 project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
-
-  after += DsEventLogAdmin_IDL
+  tagchecks   += EventLog
+  after       += DsEventLogAdmin_IDL
 
   IDL_Files {
   }
@@ -50,6 +48,7 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
 project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
   sharedname   = TAO_DsEventLogAdmin_Skel
   dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL
+  tagchecks   += EventLog
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl b/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
index 3d776a1943d..9e5fa09bae9 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
@@ -64,6 +64,8 @@ module DsLogAdmin
     TimeT stop;
   };
 
+  typedef sequence<TimeInterval> TimeIntervalSeq;
+
   struct LogRecord
   {
     RecordId id;
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 469f7720e3a..d0d9a4dea5e 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin_IDL) : orbsvcslib, core {
-
+project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
 
   IDL_Files {
     DsLogAdmin.idl
@@ -16,8 +14,8 @@ project(DsLogAdmin_IDL) : orbsvcslib, core {
 project(DsLogAdmin) : orbsvcslib, core {
   sharedname   = TAO_DsLogAdmin
   dynamicflags = TAO_LOG_BUILD_DLL
-
-  after += DsLogAdmin_IDL
+  tagchecks   += Log
+  after       += DsLogAdmin_IDL
 
   IDL_Files {
   }
@@ -55,6 +53,7 @@ project(DsLogAdmin) : orbsvcslib, core {
 project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
   sharedname   = TAO_DsLogAdmin_Skel
   dynamicflags = TAO_LOG_SKEL_BUILD_DLL
+  tagchecks   += Log
 
   IDL_Files {
   } 
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index ddfb9af7cc6..bf66701ee09 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
-
+project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
 
   IDL_Files {
     DsNotifyLogAdmin.idl
@@ -15,8 +13,8 @@ project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, e
 project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
   sharedname   = TAO_DsNotifyLogAdmin
   dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
-
-  after += DsNotifyLogAdmin_IDL
+  tagchecks   += Log
+  after       += DsNotifyLogAdmin_IDL
 
   IDL_Files {
   }
@@ -51,6 +49,7 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event
 project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
   sharedname   = TAO_DsNotifyLogAdmin_Skel
   dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL
+  tagchecks   += Log
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index a4e11e8837a..0cca17fb185 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_ESF_BUSY_LOCK_CPP
 #define TAO_ESF_BUSY_LOCK_CPP
 
-#include "ESF_Busy_Lock.h"
+#include "orbsvcs/ESF/ESF_Busy_Lock.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Busy_Lock.i"
+#include "orbsvcs/ESF/ESF_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Busy_Lock, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
 int TAO_ESF_Busy_Lock_Adapter<T>::remove (void)
@@ -59,4 +59,6 @@ int TAO_ESF_Busy_Lock_Adapter<T>::tryacquire_write (void)
   return this->adaptee_->busy ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_BUSY_LOCK_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
index bb2ea3d2a4a..2c112e4f25e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -18,6 +18,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Adapt classes that implement the "busy lock" protocol, to conform
 /// to the ACE Lock interface.
 /**
@@ -61,12 +63,14 @@ private:
   Adaptee* adaptee_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Busy_Lock.i"
+#include "orbsvcs/ESF/ESF_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Busy_Lock.cpp"
+#include "orbsvcs/ESF/ESF_Busy_Lock.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
index 6723e66b926..8c39a00c2e9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
@@ -1,8 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T> ACE_INLINE
 TAO_ESF_Busy_Lock_Adapter<T>::TAO_ESF_Busy_Lock_Adapter (T* adaptee)
   :  adaptee_ (adaptee)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 55055171241..ea15a0e703e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -3,10 +3,10 @@
 #ifndef TAO_ESF_COPY_ON_READ_CPP
 #define TAO_ESF_COPY_ON_READ_CPP
 
-#include "ESF_Copy_On_Read.h"
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
-ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
@@ -115,4 +115,6 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
   this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_COPY_ON_READ_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index f0b704632f6..d5c7c22fcd8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Copy_On_Read.h
  *
@@ -12,12 +13,14 @@
 #ifndef TAO_ESF_COPY_ON_READ_H
 #define TAO_ESF_COPY_ON_READ_H
 
-#include "ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class Target> class TAO_ESF_Worker;
 
 // ****************************************************************
@@ -58,8 +61,10 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Copy_On_Read.cpp"
+#include "orbsvcs/ESF/ESF_Copy_On_Read.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 58c09ac03ed..169f5eac972 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -3,15 +3,15 @@
 #ifndef TAO_ESF_COPY_ON_WRITE_CPP
 #define TAO_ESF_COPY_ON_WRITE_CPP
 
-#include "ESF_Copy_On_Write.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Copy_On_Write.i"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Environment.h"
 
-ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
 TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
@@ -203,4 +203,6 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_COPY_ON_WRITE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index 972c3f33b11..a34659b6e57 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Copy_On_Write.h
  *
@@ -12,7 +13,7 @@
 #ifndef TAO_ESF_COPY_ON_WRITE_H
 #define TAO_ESF_COPY_ON_WRITE_H
 
-#include "ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "tao/Basic_Types.h"
 
@@ -20,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class COLLECTION, class ITERATOR>
 class TAO_ESF_Copy_On_Write_Collection
 {
@@ -164,12 +167,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Copy_On_Write.i"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Copy_On_Write.cpp"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
index e4aff9e9491..d3ad3d108c7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class COLLECTION, class ITERATOR> ACE_INLINE
 TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
     TAO_ESF_Copy_On_Write_Collection (void)
@@ -34,3 +38,4 @@ TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h
index 9d391cccf2b..7eaa3a6d306 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Defaults.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   ESF_Defaults.h
  *
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index b51648f5f68..5398387800c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -3,22 +3,19 @@
 #ifndef TAO_ESF_DELAYED_CHANGES_CPP
 #define TAO_ESF_DELAYED_CHANGES_CPP
 
-#include "ESF_Delayed_Changes.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Delayed_Changes.i"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ESF_Defaults.h"
-#include "ESF_Worker.h"
-#include "ESF_Delayed_Command.h"
+#include "orbsvcs/ESF/ESF_Defaults.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Delayed_Command.h"
 
 #include "ace/Functor.h"
 
-ACE_RCSID(ESF,
-          ESF_Delayed_Changes,
-          "$Id$")
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
@@ -214,4 +211,6 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_DELAYED_CHANGES_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 5428426f924..2bf47dd49b4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   ESF_Delayed_Changes.h
  *
@@ -12,25 +12,27 @@
 #ifndef TAO_ESF_DELAYED_CHANGES_H
 #define TAO_ESF_DELAYED_CHANGES_H
 
-#include "ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ESF_Busy_Lock.h"
+#include "orbsvcs/ESF/ESF_Busy_Lock.h"
 
 #include "ace/Containers.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Command_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class Target,class Object> class TAO_ESF_Connected_Command;
 template<class Target,class Object> class TAO_ESF_Disconnected_Command;
 template<class Target,class Object> class TAO_ESF_Reconnected_Command;
 template<class Target> class TAO_ESF_Shutdown_Command;
 
-class ACE_Command_Base;
-
 /**
  * @class TAO_ESF_Delayed_Changes
  *
@@ -141,12 +143,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Delayed_Changes.i"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Delayed_Changes.cpp"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
index 7ba390a202f..4a2192e5a18 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     connected_i (PROXY *proxy
@@ -30,3 +34,5 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 {
   this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 96f57baac44..fe0a7812db0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -3,15 +3,13 @@
 #ifndef TAO_ESF_DELAYED_COMMAND_CPP
 #define TAO_ESF_DELAYED_COMMAND_CPP
 
-#include "ESF_Delayed_Command.h"
+#include "orbsvcs/ESF/ESF_Delayed_Command.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Delayed_Command.i"
+#include "orbsvcs/ESF/ESF_Delayed_Command.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (ESF, 
-           ESF_Delayed_Command, 
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class Target, class Object> int
 TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
@@ -94,4 +92,6 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_DELAYED_COMMAND_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
index ee0ab0f3ada..a827c4e6415 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Delayed_Command.h
  *
@@ -18,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Connected_Command
  *
@@ -167,12 +170,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Delayed_Command.i"
+#include "orbsvcs/ESF/ESF_Delayed_Command.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Delayed_Command.cpp"
+#include "orbsvcs/ESF/ESF_Delayed_Command.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
index 5465f38c4bd..3ffe5697959 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class Target, class Object>
 TAO_ESF_Connected_Command<Target,Object>::
       TAO_ESF_Connected_Command (Target *target,
@@ -39,3 +43,5 @@ TAO_ESF_Shutdown_Command<Target>::
   : target_ (target)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 302ab13da41..c1bbac9dad0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -3,15 +3,15 @@
 #ifndef TAO_ESF_IMMEDIATE_CHANGES_CPP
 #define TAO_ESF_IMMEDIATE_CHANGES_CPP
 
-#include "ESF_Immediate_Changes.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Immediate_Changes.i"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
-ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
@@ -44,4 +44,6 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_IMMEDIATE_CHANGES_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index 8d08c77b968..bcd9b19edd4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   ESF_Immediate_Changes.h
  *
@@ -12,12 +12,14 @@
 #ifndef TAO_ESF_IMMEDIATE_CHANGES_H
 #define TAO_ESF_IMMEDIATE_CHANGES_H
 
-#include "ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Immediate_Changes
  *
@@ -50,12 +52,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Immediate_Changes.i"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Immediate_Changes.cpp"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
index d90394ed395..ac26e4d5800 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     connected (PROXY *proxy
@@ -40,3 +44,5 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
   this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index b2b99d61a83..40afd8d452f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -3,9 +3,9 @@
 #ifndef TAO_ESF_PEER_ADMIN_CPP
 #define TAO_ESF_PEER_ADMIN_CPP
 
-#include "ESF_Peer_Workers.h"
+#include "orbsvcs/ESF/ESF_Peer_Workers.h"
 
-ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
@@ -53,4 +53,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
   this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PEER_ADMIN_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 8cb50b3d57c..95a188cf661 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Peer_Admin.h
  *
@@ -12,12 +13,14 @@
 #ifndef TAO_ESF_PEER_ADMIN_H
 #define TAO_ESF_PEER_ADMIN_H
 
-#include "ESF_Proxy_Admin.h"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Peer_Admin
  *
@@ -92,8 +95,10 @@ public:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Peer_Admin.cpp"
+#include "orbsvcs/ESF/ESF_Peer_Admin.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index ad0678ae0a7..354daec8bed 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_ESF_PEER_WORKERS_CPP
 #define TAO_ESF_PEER_WORKERS_CPP
 
-#include "ESF_Peer_Workers.h"
+#include "orbsvcs/ESF/ESF_Peer_Workers.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Peer_Workers.i"
+#include "orbsvcs/ESF/ESF_Peer_Workers.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class P, class R> void
 TAO_ESF_Peer_Connected<P,R>::work (P *proxy
@@ -48,4 +48,6 @@ TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PEER_WORKERS_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index 9998a29d19f..793e41f422e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Peer_Workers.h
  *
@@ -12,12 +13,14 @@
 #ifndef TAO_ESF_PEER_WORKERS_H
 #define TAO_ESF_PEER_WORKERS_H
 
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Peer_Connected
  *
@@ -87,12 +90,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Peer_Workers.i"
+#include "orbsvcs/ESF/ESF_Peer_Workers.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Peer_Workers.cpp"
+#include "orbsvcs/ESF/ESF_Peer_Workers.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
index 0ff67b7692e..02201bde5d5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class P, class R>
 TAO_ESF_Peer_Connected<P,R>::TAO_ESF_Peer_Connected (R *peer)
   :  peer_ (peer)
@@ -23,3 +27,5 @@ TAO_ESF_Peer_Disconnected<P,R>::TAO_ESF_Peer_Disconnected (R *peer)
 }
 
 // ****************************************************************
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index b74bb231759..8449b48d0b2 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -3,15 +3,13 @@
 #ifndef TAO_ESF_PROXY_ADMIN_CPP
 #define TAO_ESF_PROXY_ADMIN_CPP
 
-
-
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Proxy_Admin.i"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ESF_Shutdown_Proxy.h"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
-ACE_RCSID(ESF, ESF_Proxy_Admin, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
@@ -107,4 +105,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PROXY_ADMIN_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index babfd4a4fcc..5c56884654e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Proxy_Admin.h
  *
@@ -12,13 +13,15 @@
 #ifndef TAO_ESF_PROXY_ADMIN_H
 #define TAO_ESF_PROXY_ADMIN_H
 
-#include "ESF_Proxy_Collection.h"
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Proxy_Admin
  *
@@ -73,7 +76,7 @@ public:
                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
+  // @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
   // to choose for the lesser evil.  The code works because TAO uses
   // pointers to implement the _ptr types, and that is OK because this
@@ -147,12 +150,14 @@ private:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Proxy_Admin.i"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Proxy_Admin.cpp"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
index f6b4d29bc6f..882e6c9c056 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+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
@@ -25,3 +29,4 @@ TAO_ESF_RefCountedRef<C>::~TAO_ESF_RefCountedRef ()
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 798a34d0cb9..1691a2dcc02 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -3,12 +3,10 @@
 #ifndef TAO_ESF_PROXY_COLLECTION_CPP
 #define TAO_ESF_PROXY_COLLECTION_CPP
 
-#include "ESF_Proxy_Collection.h"
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
-ACE_RCSID (ESF,
-           ESF_Proxy_Collection,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
@@ -17,4 +15,6 @@ TAO_ESF_Proxy_Collection<PROXY>::~TAO_ESF_Proxy_Collection (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PROXY_COLLECTION_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index 7777d37e830..ceaeda03db0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Proxy_Collection.h
  *
@@ -19,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class Target> class TAO_ESF_Worker;
 
 /**
@@ -157,8 +160,10 @@ public:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Proxy_Collection.cpp"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 04702e9feed..ebe73ce7996 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -3,17 +3,16 @@
 #ifndef TAO_ESF_PROXY_LIST_CPP
 #define TAO_ESF_PROXY_LIST_CPP
 
-#include "ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Proxy_List.i"
+#include "orbsvcs/ESF/ESF_Proxy_List.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Proxy_List, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_List<PROXY>::
-      TAO_ESF_Proxy_List (void)
+TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
 {
 }
 
@@ -89,4 +88,6 @@ TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->impl_.reset ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PROXY_LIST_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index 52f1a14c014..f2697bd7dbf 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Proxy_List.h
  *
@@ -19,6 +20,8 @@
 #include "ace/Unbounded_Set.h"
 #include "ace/Containers.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// A concrete proxy collection.
 /**
  * Based on the ACE_Unbounded_Set<> collection, used a double
@@ -68,12 +71,14 @@ private:
   ACE_Unbounded_Set<PROXY*> impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Proxy_List.i"
+#include "orbsvcs/ESF/ESF_Proxy_List.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Proxy_List.cpp"
+#include "orbsvcs/ESF/ESF_Proxy_List.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
index 881283569ba..67d752fdc6c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
 TAO_ESF_Proxy_List<PROXY>::begin (void)
 {
@@ -17,3 +21,5 @@ TAO_ESF_Proxy_List<PROXY>::size (void) const
 {
   return this->impl_.size ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 9e6993882d8..000b91f27d9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -3,17 +3,16 @@
 #ifndef TAO_ESF_PROXY_RB_TREE_CPP
 #define TAO_ESF_PROXY_RB_TREE_CPP
 
-#include "ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Proxy_RB_Tree.i"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Proxy_RB_Tree, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY>
-TAO_ESF_Proxy_RB_Tree<PROXY>::
-      TAO_ESF_Proxy_RB_Tree (void)
+TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void)
 {
 }
 
@@ -87,4 +86,6 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->impl_.clear ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PROXY_RB_TREE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index 1c824f3ad54..e4c6ce6f9a0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Proxy_RB_Tree.h
  *
@@ -18,6 +19,8 @@
 
 #include "ace/RB_Tree.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Iterator class for a ACE_ESF_RB_Tree
 template<class PROXY>
 class TAO_ESF_Proxy_RB_Tree_Iterator
@@ -94,12 +97,14 @@ private:
   Implementation impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Proxy_RB_Tree.i"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Proxy_RB_Tree.cpp"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
index 0ba0e20e129..b67178bf7b5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> ACE_INLINE
 TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::
@@ -64,3 +65,5 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::size (void) const
 {
   return this->impl_.current_size ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index 83a1490530f..5e236899e02 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
 #define TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
 
-#include "ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Proxy_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Proxy_RefCount_Guard, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EC, class P>
 TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void)
@@ -24,4 +24,6 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void)
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index bf1206ade34..7e2f9e4c160 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Proxy_RefCount_Guard.h
  *
@@ -18,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_Proxy_RefCount_Guard
  *
@@ -59,12 +62,14 @@ protected:
   PROXY *proxy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Proxy_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Proxy_RefCount_Guard.cpp"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
index 7639a89ee12..d0d4fc80ac1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class EC, class P> ACE_INLINE
 TAO_ESF_Proxy_RefCount_Guard<EC,P>::
     TAO_ESF_Proxy_RefCount_Guard (CORBA::ULong &refcount,
@@ -10,3 +14,5 @@ TAO_ESF_Proxy_RefCount_Guard<EC,P>::
      proxy_ (proxy)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 432189332bb..ae87b7f97f1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -3,10 +3,10 @@
 #ifndef TAO_ESF_REFCOUNT_GUARD_CPP
 #define TAO_ESF_REFCOUNT_GUARD_CPP
 
-#include "ESF_RefCount_Guard.h"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index 1489d6fcce1..84569c79bb6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_RefCount_Guard.h
  *
@@ -18,6 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ESF_RefCount_Guard
  *
@@ -45,12 +50,14 @@ protected:
   T &refcount_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_RefCount_Guard.cpp"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
index b69511a8382..de454aaefe0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T> ACE_INLINE
 TAO_ESF_RefCount_Guard<T>::
     TAO_ESF_RefCount_Guard (T &refcount)
@@ -14,3 +18,5 @@ TAO_ESF_RefCount_Guard<T>::
 {
   this->refcount_--;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 3775862b315..a0db9862e3f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -3,14 +3,14 @@
 #ifndef TAO_ESF_SHUTDOWN_PROXY_CPP
 #define TAO_ESF_SHUTDOWN_PROXY_CPP
 
-#include "ESF_Shutdown_Proxy.h"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 #include "ace/CORBA_macros.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ESF_Shutdown_Proxy.i"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> void
 TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
@@ -28,4 +28,6 @@ TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_SHUTDOWN_PROXY_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index feffd2ccb3a..7263e4b2445 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Shutdown_Proxy.h
  *
@@ -13,12 +14,14 @@
 #ifndef TAO_ESF_SHUTDOWN_PROXY_H
 #define TAO_ESF_SHUTDOWN_PROXY_H
 
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// A worker to invoke the shutdown method of each proxy.
 template<class PROXY>
 class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
@@ -32,12 +35,14 @@ public:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ESF_Shutdown_Proxy.i"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Shutdown_Proxy.cpp"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
index 5266f0aa225..51955993b3d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
@@ -1,6 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class PROXY> ACE_INLINE
 TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index 6ffea97b026..ef8c4ad0f37 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -3,9 +3,9 @@
 #ifndef TAO_ESF_WORKER_CPP
 #define TAO_ESF_WORKER_CPP
 
-#include "ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
-ACE_RCSID(ESF, ESF_Worker, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class Object>
 TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void)
@@ -17,4 +17,6 @@ void TAO_ESF_Worker<Object>::set_size (size_t)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ESF_WORKER_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index 0acfb7b660d..94041cc6555 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ESF_Worker.h
  *
@@ -19,6 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class Object;
 
 namespace CORBA
@@ -49,8 +54,10 @@ public:
                      ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ESF_Worker.cpp"
+#include "orbsvcs/ESF/ESF_Worker.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
index 06f67230fdc..1fbff1cbffc 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
@@ -1,7 +1,7 @@
 %option noyywrap
 
 %{
-// ETCL.ll,v 1.3 2002/01/14 19:52:28 parsons Exp
+// ETCL.ll,v 1.3.176.1 2006/04/26 19:52:34 john_c Exp
 // ========================================================================
 //
 // = LIBRARY
@@ -21,6 +21,8 @@
 #include "ETCL_Constraint.h"
 #include "ETCL_y.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 static const char * extract_string(char*);
 
 #define TAO_YY_LEX_DEBUG
@@ -155,3 +157,5 @@ yywrap (void)
 {
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy
index ae9fd433bc7..14c9eaad182 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy
@@ -18,6 +18,8 @@
 #include "ETCL_Constraint.h"
 #include "ETCL_Interpreter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 extern int yylex (void);
 
 static void yyerror (const char *)
@@ -256,3 +258,4 @@ union_val:  /* empty */
 
 %%
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 86c6fdd4fa2..092af3fa7f8 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -1,25 +1,26 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ETCL_Constraint.h"
-#include "ETCL_Constraint_Visitor.h"
-#include "ETCL_y.h"
+#include "orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
+#include "orbsvcs/ETCL/ETCL_y.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/Managed_Types.h"
 #include "tao/Environment.h"
 #include "tao/CDR.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ETCL_Constraint.inl"
+#include "orbsvcs/ETCL/ETCL_Constraint.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ETCL,
            ETCL_Constraint,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ETCL_Constraint::TAO_ETCL_Constraint (void)
 {
 }
@@ -951,3 +952,5 @@ TAO_ETCL_Preference::accept (TAO_ETCL_Constraint_Visitor *visitor)
 TAO_ETCL_Constraint_Visitor::~TAO_ETCL_Constraint_Visitor (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
index 3427dc9774d..688b2df872c 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -18,7 +19,7 @@
 #ifndef TAO_ETCL_CONSTRAINT_H
 #define TAO_ETCL_CONSTRAINT_H
 
-#include "etcl_export.h"
+#include "orbsvcs/ETCL/etcl_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,11 +29,12 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef unsigned short TAO_Literal_Type;
 #define TAO_UNKNOWN 999
 
 class TAO_ETCL_Constraint_Visitor;
-class TAO_String_Manager;
 
 namespace CORBA
 {
@@ -419,8 +421,10 @@ private:
   TAO_ETCL_Constraint *subexpr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ETCL_Constraint.inl"
+#include "orbsvcs/ETCL/ETCL_Constraint.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_ETCL_CONSTRAINT_H */
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
deleted file mode 100644
index 93f2187496c..00000000000
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
+++ /dev/null
@@ -1,373 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_ETCL_Boolean_Literal::TAO_ETCL_Boolean_Literal (int value)
-  :  value_ (value)
-{
-}
-
-ACE_INLINE int
-TAO_ETCL_Boolean_Literal::value (void) const
-{
-  return this->value_;
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Integer_Literal::TAO_ETCL_Integer_Literal (long value)
-  :  value_ (value)
-{
-}
-
-ACE_INLINE long
-TAO_ETCL_Integer_Literal::value (void) const
-{
-  return this->value_;
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Float_Literal::TAO_ETCL_Float_Literal (double value)
-  :  value_ (value)
-{
-}
-
-ACE_INLINE double
-TAO_ETCL_Float_Literal::value (void) const
-{
-  return this->value_;
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_String_Literal::TAO_ETCL_String_Literal (const char *value)
-  :  string_ (value)
-{
-}
-
-ACE_INLINE const char *
-TAO_ETCL_String_Literal::value (void) const
-{
-  return this->string_.c_str ();
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Identifier::TAO_ETCL_Identifier (const char *value)
-  :  string_ (value)
-{
-}
-
-ACE_INLINE const char *
-TAO_ETCL_Identifier::value (void) const
-{
-  return this->string_.c_str ();
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign,
-                                            TAO_ETCL_Constraint *integer)
-  :  sign_ (sign),
-     string_ (0)
-{
-  this->integer_ =
-    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
-}
-
-ACE_INLINE
-TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string)
-  :  sign_ (0),
-     integer_ (0)
-{
-  this->string_ =
-    dynamic_cast<TAO_ETCL_String_Literal*> (string);
-}
-
-ACE_INLINE int
-TAO_ETCL_Union_Value::sign (void) const
-{
-  return this->sign_;
-}
-
-ACE_INLINE TAO_ETCL_Integer_Literal *
-TAO_ETCL_Union_Value::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE TAO_ETCL_String_Literal *
-TAO_ETCL_Union_Value::string (void) const
-{
-  return this->string_;
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value,
-                                        TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-  this->union_value_ =
-    dynamic_cast<TAO_ETCL_Union_Value*> (union_value);
-}
-    
-ACE_INLINE TAO_ETCL_Union_Value *
-TAO_ETCL_Union_Pos::union_value (void) const
-{
-  return this->union_value_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Union_Pos::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (TAO_ETCL_Constraint *integer,
-                                                TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-  this->integer_ =
-    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
-}
-
-ACE_INLINE TAO_ETCL_Integer_Literal *
-TAO_ETCL_Component_Pos::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Component_Pos::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (TAO_ETCL_Constraint *identifier,
-                                                TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-  this->identifier_ =
-    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
-}
-
-ACE_INLINE TAO_ETCL_Identifier *
-TAO_ETCL_Component_Assoc::identifier (void) const
-{
-  return this->identifier_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Component_Assoc::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (TAO_ETCL_Constraint *integer,
-                                                TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-  this->integer_ =
-    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
-}
-
-ACE_INLINE TAO_ETCL_Integer_Literal *
-TAO_ETCL_Component_Array::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Component_Array::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Special::TAO_ETCL_Special (int type)
-  :  type_ (type)
-{
-}
-
-ACE_INLINE int
-TAO_ETCL_Special::type (void) const
-{
-  return this->type_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier,
-                                        TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-  this->identifier_ =
-    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
-}
-
-ACE_INLINE TAO_ETCL_Identifier *
-TAO_ETCL_Component::identifier (void) const
-{
-  return this->identifier_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Component::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Dot::TAO_ETCL_Dot (TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Dot::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Eval::TAO_ETCL_Eval (TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Eval::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Default::TAO_ETCL_Default (TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Default::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Exist::TAO_ETCL_Exist (TAO_ETCL_Constraint *component)
-  :  component_ (component)
-{
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Exist::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Unary_Expr::TAO_ETCL_Unary_Expr (int type,
-                                          TAO_ETCL_Constraint *subexpr)
-  :  type_ (type),
-     subexpr_ (subexpr)
-{
-}
-
-ACE_INLINE int
-TAO_ETCL_Unary_Expr::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Unary_Expr::subexpr (void) const
-{
-  return this->subexpr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Binary_Expr::TAO_ETCL_Binary_Expr (int type,
-                                            TAO_ETCL_Constraint *lhs,
-                                            TAO_ETCL_Constraint *rhs)
-  :  type_ (type),
-     lhs_ (lhs),
-     rhs_ (rhs)
-{
-}
-
-ACE_INLINE int
-TAO_ETCL_Binary_Expr::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Binary_Expr::rhs (void) const
-{
-  return this->rhs_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Binary_Expr::lhs (void) const
-{
-  return this->lhs_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_ETCL_Preference::TAO_ETCL_Preference (int type,
-                                          TAO_ETCL_Constraint *subexpr)
-  :  type_ (type),
-     subexpr_ (subexpr)
-{
-}
-
-ACE_INLINE int
-TAO_ETCL_Preference::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE TAO_ETCL_Constraint *
-TAO_ETCL_Preference::subexpr (void) const
-{
-  return this->subexpr_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h
index 3cf751e3229..0f23f7a02c0 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 //=============================================================================
 /**
  * @file ETCL_Constraint_Visitor.h
@@ -14,12 +14,16 @@
 #ifndef TAO_ETCL_CONSTRAINT_VISITOR_H
 #define TAO_ETCL_CONSTRAINT_VISITOR_H
 
-#include "etcl_export.h"
+#include "orbsvcs/ETCL/etcl_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ETCL_Literal_Constraint;
 class TAO_ETCL_Identifier;
 class TAO_ETCL_Union_Value;
@@ -61,4 +65,6 @@ public:
   virtual int visit_preference (TAO_ETCL_Preference *) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ETCL_CONSTRAINT_VISITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
index 5446ebe6eca..2f083900155 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
@@ -1,13 +1,16 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ETCL_Interpreter.h"
-#include "ETCL_Constraint.h"
+#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "ace/Guard_T.h"
 #include "ace/Thread_Mutex.h"
 
 ACE_RCSID(ETCL, ETCL_Interpreter, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SYNCH_MUTEX TAO_ETCL_Interpreter::parserMutex__;
 
 TAO_ETCL_Interpreter::TAO_ETCL_Interpreter (void)
@@ -105,3 +108,5 @@ TAO_Lex_String_Input::reset (char* input_string)
   TAO_Lex_String_Input::end_ = 
     input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
index 964e32736e5..81210143c38 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,7 +16,7 @@
 #define TAO_ETCL_INTERPRETER_H
 #include /**/ "ace/pre.h"
 
-#include "etcl_export.h"
+#include "orbsvcs/ETCL/etcl_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 #include "tao/orbconf.h"
 #include "ace/Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ETCL_Constraint;
 
 /**
@@ -102,5 +104,7 @@ typedef union
 extern YYSTYPE yylval;
 extern YYSTYPE yyval;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ETCL_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
index e7fab71275c..1d5fbb80ccb 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
@@ -20,6 +20,7 @@
 
 #ifdef __cplusplus
 
+#include "tao/orbconf.h"
 #include "ace/OS.h"
 
 /* Use prototypes in function declarations. */
@@ -94,6 +95,8 @@
 /* Size of default input buffer. */
 #define YY_BUF_SIZE 16384
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 extern int yyleng;
@@ -444,6 +447,9 @@ static char *yy_last_accepting_cpos;
 char *yytext;
 //#line 1 "ETCL/ETCL.ll"
 #define INITIAL 0
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //#line 4 "ETCL/ETCL.ll"
 // $Id$
 // ========================================================================
@@ -460,9 +466,11 @@ char *yytext;
 //
 // ========================================================================
 
-#include "ETCL_Interpreter.h"
-#include "ETCL_Constraint.h"
-#include "ETCL_y.h"
+#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/ETCL/ETCL_y.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 static const char* extract_string(char*);
 //static const char * extract_string(char*);
@@ -470,7 +478,7 @@ static const char* extract_string(char*);
 #define TAO_YY_LEX_DEBUG
 
 #ifdef TAO_CONSTRAINT_DEBUG
-#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
+#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
 #endif /* TAO_CONSTRAINT_DEBUG */
 
 //#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
@@ -527,6 +535,8 @@ static int yy_top_state YY_PROTO(( void ));
 #define YY_NO_TOP_STATE 1
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
@@ -618,6 +628,8 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
@@ -1868,3 +1880,5 @@ yywrap (void)
 {
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp
index 97d5b128d8d..1c07ea5d3a7 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp
@@ -66,9 +66,11 @@
 //
 // ========================================================================
 
-#include "ETCL_y.h"
-#include "ETCL_Constraint.h"
-#include "ETCL_Interpreter.h"
+#include "orbsvcs/ETCL/ETCL_y.h"
+#include "orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 extern int yylex (void);
 extern void yyflush_current_buffer (void);
@@ -79,8 +81,12 @@ static void yyerror (const char *)
   // Ignore error messages
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include <stdio.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #ifndef __cplusplus
 #ifndef __STDC__
 #define const
@@ -324,6 +330,8 @@ static const short yycheck[] = {    17,
   It was written by Richard Stallman by simplifying the hairy parser
   used when %semantic_parser is specified.  */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifndef YYSTACK_USE_ALLOCA
 #ifdef alloca
 #define YYSTACK_USE_ALLOCA
@@ -424,6 +432,8 @@ while (0)
 #endif /* not YYLSP_NEEDED */
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /* If nonreentrant, generate the variables here */
 
 #ifndef YYPURE
@@ -1282,3 +1292,4 @@ yyerrhandle:
 //#line 257 "ETCL/ETCL.yy"
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
index 412bff4ee3d..8813fee591c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
-#include "ECG_Adapters.h"
+#include "orbsvcs/Event/ECG_Adapters.h"
 
 ACE_RCSID (Event,
            ECG_Adapters,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void)
 {
@@ -14,3 +15,5 @@ TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void)
 TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 85ef35fe098..8c79e6415f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  * @file ECG_Adapters.h
  *
@@ -16,7 +17,7 @@
 #define TAO_ECG_ADAPTERS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -25,7 +26,11 @@
 
 #include "ace/Refcounted_Auto_Ptr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Dgram;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_ECG_Handler_Shutdown
@@ -68,6 +73,7 @@ public:
 typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown,
   ACE_Null_Mutex> TAO_ECG_Refcounted_Handler;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_ADAPTERS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
deleted file mode 100644
index 86b0590e956..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-#include "ECG_Address_Server_Base.h"
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 847b38a7208..2490b33d051 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   ECG_Address_Server_Base.h
  *
@@ -12,11 +12,13 @@
 #define TAO_ECG_ADDRESS_SERVER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminS.h"
-#include "EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
 #include "ace/Auto_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ECG_Address_Server_Base
  *
@@ -26,13 +28,15 @@
  * Adds init () virtual method so that all AddrServer implementations can be
  * initialized in the same fasion.
  */
-class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base :
-  public virtual POA_RtecUDPAdmin::AddrServer
+class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base
+  : public virtual POA_RtecUDPAdmin::AddrServer
 {
 public:
 
   virtual int init (const char *arg) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_ADDRESS_SERVER_BASE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 0116054cb7d..faf377fd386 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ECG_CDR_Message_Receiver.h"
-#include "ECG_CDR_Message_Sender.h"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
 
 #include "tao/Exception.h"
 
@@ -10,13 +10,14 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_CDR_Message_Receiver.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            ECG_CDR_Message_Receiver,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void)
 {
@@ -603,3 +604,5 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index e63c40c571f..8159a4e2f15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file ECG_CDR_Message_Receiver.h
  *
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 #include "ace/INET_Addr.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ECG_CDR_Processor
  *
@@ -305,8 +307,10 @@ private:
   size_t min_purge_count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_CDR_Message_Receiver.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
index 95530584ccd..078166a6088 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ECG_CDR_Message_Receiver::Requests::Requests (void)
   : fragmented_requests_ (0)
@@ -44,3 +48,4 @@ TAO_ECG_CDR_Message_Receiver::init (TAO_ECG_Refcounted_Endpoint ignore_from
 //      }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 98a17c5dc68..be2af5fe269 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "ECG_CDR_Message_Sender.h"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
 #include "tao/CDR.h"
 #include "ace/SOCK_Dgram.h"
 #include "ace/INET_Addr.h"
 #include "ace/ACE.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_CDR_Message_Sender.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_ECG_CDR_Message_Sender::init (
       TAO_ECG_Refcounted_Endpoint endpoint_rptr
@@ -79,7 +81,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
       iov[iovcnt].iov_base = rd_ptr;
       iov[iovcnt].iov_len  = l;
       fragment_size += l;
-      iovcnt++;
+      ++iovcnt;
       while (fragment_size > max_fragment_payload)
         {
           // This fragment is full, we have to send it...
@@ -100,7 +102,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                iovcnt
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          fragment_id++;
+          ++fragment_id;
           fragment_offset += max_fragment_payload;
 
           // Reset, but don't forget that the last Message_Block
@@ -128,7 +130,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                iovcnt
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          fragment_id++;
+          ++fragment_id;
           fragment_offset += max_fragment_payload;
 
           iovcnt = 1;
@@ -149,7 +151,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                iovcnt
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          fragment_id++;
+          ++fragment_id;
           fragment_offset += fragment_size;
 
           iovcnt = 1;
@@ -173,7 +175,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                            iovcnt
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      fragment_id++;
+      ++fragment_id;
       fragment_offset += fragment_size;
 
       // reset, not needed here...
@@ -301,11 +303,11 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
       CORBA::ULong l = b->length ();
       total_length += l;
       fragment_size += l;
-      iovcnt++;
+      ++iovcnt;
       while (fragment_size > max_fragment_payload)
         {
           // Ran out of space, must create a fragment...
-          fragment_count++;
+          ++fragment_count;
 
           // The next iovector will contain what remains of this
           // buffer, but also consider
@@ -315,14 +317,14 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
         }
       if (fragment_size == max_fragment_payload)
         {
-          fragment_count++;
+          ++fragment_count;
           iovcnt = 1;
           fragment_size = 0;
         }
       if (iovcnt >= iov_size)
         {
           // Ran out of space in the iovector....
-          fragment_count++;
+          ++fragment_count;
           iovcnt = 1;
           fragment_size = 0;
         }
@@ -330,7 +332,9 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
   if (iovcnt != 1)
     {
       // Send the remaining data in another fragment
-      fragment_count++;
+      ++fragment_count;
     }
   return fragment_count;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 9b4d1e55c42..0f7d8b723ba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ECG_CDR_Message_Sender.h
  *
@@ -13,19 +14,21 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 
 #include "ace/INET_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ECG_CDR_Message_Sender
  *
@@ -176,8 +179,10 @@ private:
   CORBA::Boolean checksum_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_CDR_Message_Sender.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
index 59eeae30034..aa1242d07fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
@@ -1,7 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc)
   :  endpoint_rptr_ ()
@@ -48,3 +52,5 @@ TAO_ECG_CDR_Message_Sender::mtu (CORBA::ULong new_mtu)
   this->mtu_ = new_mtu;
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index 446b8a5dc40..3091fb79acf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "ECG_Complex_Address_Server.h"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.h"
 #include "ace/SString.h"
 #include "ace/streams.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_Complex_Address_Server.i"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server (
                                               int is_source_mapping)
   : is_source_mapping_ (is_source_mapping)
@@ -164,3 +166,5 @@ TAO_ECG_Complex_Address_Server::dump_content (void)
                   this->default_addr_.get_port_number ()));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index f74b4a8c969..bbe55390465 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -14,14 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/INET_Addr.h"
 #include "ace/Null_Mutex.h"
 
-#include "EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_ECG_Complex_Address_Server
@@ -105,8 +107,10 @@ private:
   ACE_INET_Addr default_addr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_Complex_Address_Server.i"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
index a04e3966aa2..b47e2db3e68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
@@ -1,5 +1,8 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Complex_Address_Server>
 TAO_ECG_Complex_Address_Server::create (int is_source_mapping)
@@ -10,3 +13,5 @@ TAO_ECG_Complex_Address_Server::create (int is_source_mapping)
                   s);
   return s;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index c08698cff1e..b5b65cc294b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "ECG_ConsumerEC_Control.h"
+#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
 ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
 {
 }
@@ -37,3 +39,4 @@ TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *,
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index ccb9430a14a..a8141829787 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_ConsumerEC_Control.h
  *
@@ -20,7 +21,9 @@
 
 #include "tao/Basic_Types.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Gateway_IIOP;
 class TAO_EC_ProxyPushSupplier;
@@ -73,6 +76,8 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_ConsumerEC_Control_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h
index a3b6d0c7358..77dd5a28dae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_Defaults.h
  *
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 557ef8d5771..359db71579f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -10,22 +10,24 @@
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_Mcast_EH.i"
+#include "orbsvcs/Event/ECG_Mcast_EH.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, ECG_Mcast_EH, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv,
                                     const ACE_TCHAR *net_if,
                                     CORBA::ULong sz)
-  : net_if_ (net_if?ACE_OS::strdup (net_if):0)
-    , subscriptions_ ()
-    , receiver_ (recv)
-    , recvbuf_size_ (sz)
-    , observer_ ()
-    , auto_observer_disconnect_ ()
+  : net_if_ (net_if ? ACE_OS::strdup (net_if) : 0)
+  , subscriptions_ ()
+  , receiver_ (recv)
+  , recvbuf_size_ (sz)
+  , observer_ ()
+  , auto_observer_disconnect_ ()
 {
-    ACE_ASSERT (this->receiver_);
+  ACE_ASSERT (this->receiver_);
 }
 
 TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
@@ -285,3 +287,5 @@ TAO_ECG_Mcast_EH::Observer::shutdown (void)
   this->eh_ = 0;
   this->deactivator_.deactivate ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 19bebc66dc6..6808a8bbd0d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  * @file ECG_Mcast_EH.h
  *
@@ -28,10 +29,12 @@
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include /**/ "event_serv_export.h"
-#include "ECG_Adapters.h"
-#include "EC_Lifetime_Utils.h"
-#include "EC_Lifetime_Utils_T.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/ECG_Adapters.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_ECG_Mcast_EH
@@ -280,8 +283,10 @@ private:
   TAO_EC_Auto_Command<Observer_Disconnect_Command> auto_observer_disconnect_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_Mcast_EH.i"
+#include "orbsvcs/Event/ECG_Mcast_EH.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
index 611a8486570..587c2721944 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ECG_Mcast_EH::
 Observer_Disconnect_Command::Observer_Disconnect_Command (void)
@@ -56,3 +59,5 @@ Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 //***************************************************************************
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index b57326600f7..d9a82b5fe5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "ECG_Mcast_Gateway.h"
+#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
 
-#include "EC_Lifetime_Utils_T.h"
-#include "ECG_Simple_Address_Server.h"
-#include "ECG_Complex_Address_Server.h"
-#include "ECG_Simple_Mcast_EH.h"
-#include "ECG_Mcast_EH.h"
-#include "ECG_UDP_EH.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.h"
+#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h"
+#include "orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/Event/ECG_UDP_EH.h"
 
 #include "orbsvcs/Event_Utilities.h"
 
@@ -17,11 +17,14 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ECG_Mcast_Gateway.i"
+#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef TAO_EC_Shutdown_Command<TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> >
 UDP_Sender_Shutdown;
 
@@ -689,6 +692,8 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
   sender_shutdown.disallow_command ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_ECG_Mcast_Gateway,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index cdfdf2b060f..827d6ae20ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_Mcast_Gateway.h
  *
@@ -11,22 +12,26 @@
 #define TAO_ECG_MCAST_GATEWAY_H
 #include /**/ "ace/pre.h"
 
-#include "ECG_UDP_Sender.h"
+#include "orbsvcs/Event/ECG_UDP_Sender.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ECG_Defaults.h"
-#include /**/ "event_serv_export.h"
-#include "ECG_UDP_Receiver.h"
-#include "ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/Event/ECG_Defaults.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "ace/SString.h"
 #include "ace/os_include/os_stdint.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Event_Handler;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_ECG_Mcast_Gateway
@@ -272,8 +277,10 @@ private:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ECG_Mcast_Gateway.i"
+#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_ECG_Mcast_Gateway)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
index f4c39d5f7b2..8e126abb9b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void)
   : service_type_ (TAO_ECG_DEFAULT_SERVICE)
@@ -26,3 +30,5 @@ TAO_ECG_Mcast_Gateway::Attributes::Attributes (void)
   , non_blocking (TAO_ECG_DEFAULT_NON_BLOCKING)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 40d40bcbf51..0906d59820f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "EC_Gateway_IIOP.h"
-#include "ECG_Reactive_ConsumerEC_Control.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 
@@ -9,6 +9,8 @@
 
 ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Reactive_ConsumerEC_Control::
      TAO_ECG_Reactive_ConsumerEC_Control (const ACE_Time_Value &rate,
                                           const ACE_Time_Value &timeout,
@@ -248,3 +250,4 @@ TAO_ECG_Reactive_ConsumerEC_Control_Adapter::handle_timeout (
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index 6c745ac5655..e7ccad73c2a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_Reactive_ConsumerEC_Control.h
  *
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ECG_ConsumerEC_Control.h"
+#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,9 +23,10 @@
 #include "tao/ORB.h"
 #include "tao/PolicyC.h"
 
-
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ECG_Reactive_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
 
@@ -124,6 +126,8 @@ private:
 #endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_REACTIVE_CONSUMEREC_CONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 7b547c02424..2e14b4da681 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "EC_Gateway_IIOP.h"
-#include "ECG_Reconnect_ConsumerEC_Control.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
 ACE_RCSID(Event, ECG_Reconnect_ConsumerEventChannelControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Reconnect_ConsumerEC_Control::
      TAO_ECG_Reconnect_ConsumerEC_Control (const ACE_Time_Value &rate,
                                            const ACE_Time_Value &timeout,
@@ -313,3 +315,5 @@ TAO_ECG_Reconnect_ConsumerEC_Control_Adapter::handle_timeout (
   this->adaptee_->handle_timeout (tv, arg);
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index 1b9733b2989..b1f4a6c2987 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_Reconnect_ConsumerEC_Control.h
  *
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ECG_ConsumerEC_Control.h"
+#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +25,8 @@
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ECG_Reconnect_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
 
@@ -137,6 +140,8 @@ private:
 #endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_RECONNECT_CONSUMEREC_CONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 42533aa07b0..064d5c35183 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "ECG_Simple_Address_Server.h"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_Simple_Address_Server.i"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void)
 {
 }
@@ -21,13 +23,16 @@ TAO_ECG_Simple_Address_Server::init (const char *mcast_addr)
 }
 
 void
-TAO_ECG_Simple_Address_Server::get_addr (const RtecEventComm::EventHeader& /*header*/,
-                                         RtecUDPAdmin::UDP_Addr_out addr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ECG_Simple_Address_Server::get_addr (
+    const RtecEventComm::EventHeader& /*header*/,
+    RtecUDPAdmin::UDP_Addr_out addr
+    ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // unsigned long
   addr.ipaddr = this->addr_.get_ip_address ();
   // unsigned short
   addr.port = this->addr_.get_port_number ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index fa9c83fcbf7..4c0cb219ccc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ECG_Simple_Address_Server.h
  *
@@ -13,9 +14,11 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include "EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ace/INET_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ECG_Simple_Address_Server
  *
@@ -56,8 +59,10 @@ private:
   ACE_INET_Addr addr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_Simple_Address_Server.i"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
index 6ff6f63b977..0aa18cada97 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+//
 // $Id$
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_Simple_Address_Server>
 TAO_ECG_Simple_Address_Server::create (void)
@@ -11,3 +13,5 @@ TAO_ECG_Simple_Address_Server::create (void)
                   s);
   return s;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index ae4c0aa8e57..fa40043a50f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "ECG_Simple_Mcast_EH.h"
+#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h"
 #include "ace/Log_Msg.h"
 #include "ace/Reactor.h"
 #include "ace/os_include/os_fcntl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv)
   : receiver_ (recv)
 {
@@ -92,3 +94,5 @@ TAO_ECG_Simple_Mcast_EH::handle_input (ACE_HANDLE /* fd */)
 {
   return this->receiver_->handle_input (this->dgram_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index e1b4bdfd13c..d15ff0c82c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  * @file ECG_Simple_Mcast_EH.h
  *
@@ -17,10 +18,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
-#include "ECG_Adapters.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/ECG_Adapters.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ECG_Simple_Mcast_EH
  *
@@ -86,5 +90,7 @@ private:
   TAO_ECG_Dgram_Handler* receiver_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_SIMPLE_Mcast_EH_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index d57d733eefc..257a8ff2c3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "ECG_UDP_EH.h"
+#include "orbsvcs/Event/ECG_UDP_EH.h"
 #include "ace/Reactor.h"
 #include "ace/INET_Addr.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_UDP_EH.i"
+#include "orbsvcs/Event/ECG_UDP_EH.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, ECG_UDP_EH, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv)
   :  receiver_ (recv)
 {
@@ -82,4 +84,6 @@ TAO_ECG_UDP_EH::handle_input (ACE_HANDLE)
   return this->receiver_->handle_input (this->dgram_);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index c5fbe539767..b87d4d9c745 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_UDP_EH.h
  *
@@ -20,12 +21,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
-#include "ECG_Adapters.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/ECG_Adapters.h"
 #include "ace/SOCK_Dgram.h"
 
-class TAO_ECG_UDP_Receiver;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_ECG_UDP_Receiver;
 
 /**
  * @class TAO_ECG_UDP_EH
@@ -98,8 +100,10 @@ private:
   TAO_ECG_Dgram_Handler* receiver_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_UDP_EH.i"
+#include "orbsvcs/Event/ECG_UDP_EH.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
index 08757211897..d84f70937b8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
@@ -1,9 +1,13 @@
+// -*- C++ -*-
 //
 // $Id$
-//
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_SOCK_Dgram&
 TAO_ECG_UDP_EH::dgram (void)
 {
   return this->dgram_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 9b3cd513e9d..5d5366ab294 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -1,21 +1,22 @@
 // $Id$
 
-#include "ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
 #include "ace/INET_Addr.h"
 #include "ace/Sock_Connect.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_UDP_Out_Endpoint.i"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void)
 {
   this->dgram_.close ();
 
-  delete[] this->ifs_;
-  this->ifs_ = 0;
+  delete [] this->ifs_;
 }
 
 CORBA::Boolean
@@ -51,7 +52,6 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from)
   return 0;
 }
 
-
 TAO_ECG_UDP_Out_Endpoint&
 TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs)
 {
@@ -79,3 +79,5 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs)
 
   return *this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index 1dd40b093d9..a967401e6e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ECG_UDP_Out_Endpoint.h
  *
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +27,11 @@
 #include "ace/SOCK_Dgram.h"
 #include "ace/Atomic_Op.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_INET_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_ECG_UDP_Out_Endpoint
@@ -92,8 +97,10 @@ private:
  */
 typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> TAO_ECG_Refcounted_Endpoint;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_UDP_Out_Endpoint.i"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
index 7b625aa93cb..9f8fd0df5f3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
@@ -1,6 +1,8 @@
+// -*- C++ -*-
 //
 // $Id$
-//
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void)
@@ -32,3 +34,4 @@ TAO_ECG_UDP_Out_Endpoint::next_request_id (void)
   return this->request_id_generator_++;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
deleted file mode 100644
index 6cbbad89ff0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-/**
- * @file ECG_UDP_Protocol.h
- *
- * @brief Document the protocol to federate multiple Real-time Event
- * Channels via UDP.
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- *
- * http://doc.ece.uci.edu/~coryan/EC/index.html
- *
- */
-#ifndef TAO_ECG_UDP_PROTOCOL_H
-#define TAO_ECG_UDP_PROTOCOL_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-/**
- * @class TAO_ECG_UDP_Protocol
- *
- * @brief Define the protocol parameters to federate TAO's Real-time
- * Event Service via UDP.
- *
- * <H2>MESSAGE FORMAT</H2>
- * The messages header are encapsulated using CDR, with the
- * following format:
- *
- * <CODE>
- * struct Header {
- * octet byte_order_flags;<BR>
- * // bit 0 represents the byte order as in GIOP 1.1<BR>
- * // bit 1 is set if this is the last fragment<BR>
- * unsigned long request_id;<BR>
- * // The request ID, protocols must not send two requests with<BR>
- * // the same ID, protocols can be distinguished using recvfrom..<BR>
- * unsigned long request_size;<BR>
- * // The size of this request, this can be used to pre-allocate<BR>
- * // the request buffer.<BR>
- * unsgined long fragment_size;<BR>
- * // The size of this fragment, excluding the header...<BR>
- * unsigned long fragment_offset;<BR>
- * // Where does this fragment fit in the complete message...<BR>
- * unsigned long fragment_id;<BR>
- * // The ID of this fragment...<BR>
- * unsigned long fragment_count;<BR>
- * // The total number of fragments to expect in this request<BR>
- *<BR>
- * // @todo This could be eliminated if efficient reassembly<BR>
- * // could be implemented without it.<BR>
- * octet padding[4];<BR>
- *<BR>
- * // Ensures the header ends at an 8-byte boundary.<BR>
- * }; // size (in CDR stream) = 32<BR>
- *
- */
-class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Protocol
-{
-public:
-  enum {
-    ECG_HEADER_SIZE = 32,
-    ECG_MIN_MTU = 32 + 8,
-    ECG_MAX_MTU = 65536, // Really optimistic...
-    ECG_DEFAULT_MTU = 1024
-  };
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ECG_UDP_PROTOCOL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 5a26c45edef..1a492f72d66 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -5,7 +5,7 @@
 #include "ace/SString.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_UDP_Receiver.i"
+#include "orbsvcs/Event/ECG_UDP_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -15,6 +15,8 @@ ACE_RCSID (Event,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void)
 {
   this->consumer_proxy_ =
@@ -244,3 +246,5 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
   ACE_ENDTRY;
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index e5de7f78b19..3b5a4f686dc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   ECG_UDP_Receiver.h
  *
@@ -44,15 +45,20 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
-#include "ECG_Adapters.h"
-#include "EC_Lifetime_Utils.h"
-#include "EC_Lifetime_Utils_T.h"
-#include "ECG_CDR_Message_Receiver.h"
+#include "orbsvcs/Event/ECG_Adapters.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
 
-class TAO_ECG_UDP_Out_Endpoint;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ECG_UDP_Out_Endpoint;
 
 /**
  * @class TAO_ECG_UDP_Receiver_Disconnect_Command
@@ -223,9 +229,10 @@ private:
   ECG_Receiver_Auto_Proxy_Disconnect auto_proxy_disconnect_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(__ACE_INLINE__)
-#include "ECG_UDP_Receiver.i"
+#include "orbsvcs/Event/ECG_UDP_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
index 39ff8265264..47eb3d83958 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ECG_UDP_Receiver_Disconnect_Command::
 TAO_ECG_UDP_Receiver_Disconnect_Command (void)
@@ -98,3 +102,5 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
   this->addr_server_->get_addr (header, addr
                                 ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index ed7b42c08ce..2cfc4b5f35f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -14,7 +14,7 @@
 #include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
-#include "ECG_UDP_Sender.inl"
+#include "orbsvcs/Event/ECG_UDP_Sender.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -23,6 +23,8 @@ ACE_RCSID (Event,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void)
 {
 }
@@ -230,3 +232,5 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 0f631502117..6210db74d1d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  * @file ECG_UDP_Sender.h
  *
@@ -44,14 +45,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include "EC_Lifetime_Utils.h"
-#include "EC_Lifetime_Utils_T.h"
-#include "ECG_CDR_Message_Sender.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Dgram;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ECG_UDP_Out_Endpoint;
 
 /**
@@ -214,8 +220,10 @@ private:
   ECG_Sender_Auto_Proxy_Disconnect auto_proxy_disconnect_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "ECG_UDP_Sender.inl"
+#include "orbsvcs/Event/ECG_UDP_Sender.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index bc7e81f477a..c58a7a81ca8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
 TAO_ECG_UDP_Sender::create (CORBA::Boolean crc)
 {
@@ -89,3 +92,5 @@ TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
   release_proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index ff3a295b1cc..715979d31a9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "EC_And_Filter.h"
+#include "orbsvcs/Event/EC_And_Filter.h"
 
 ACE_RCSID(Event, EC_And_Filter, "$Id$")
 
-TAO_EC_And_Filter::
-    TAO_EC_And_Filter (TAO_EC_Filter* children[],
-                               size_t n)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[],
+                                      size_t n)
   :  children_ (children),
      n_ (n)
 {
@@ -165,3 +166,5 @@ TAO_EC_And_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 96d3d536d54..67c9614af70 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_And_Filter.h
  *
@@ -16,12 +17,14 @@
 #define TAO_EC_AND_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_And_Filter
  *
@@ -69,10 +72,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_And_Filter
-                              (const TAO_EC_And_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_And_Filter& operator=
-                              (const TAO_EC_And_Filter&))
+  TAO_EC_And_Filter (const TAO_EC_And_Filter&);
+  TAO_EC_And_Filter& operator= (const TAO_EC_And_Filter&);
 
 private:
   /// The children
@@ -82,5 +83,7 @@ private:
   size_t n_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_AND_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 78e8387fb41..e9bc5dcb730 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -1,19 +1,19 @@
 // $Id$
 
-#include "EC_Basic_Factory.h"
-#include "EC_Reactive_Dispatching.h"
-#include "EC_Basic_Filter_Builder.h"
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "EC_Default_ProxyConsumer.h"
-#include "EC_Default_ProxySupplier.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_Reactive_Timeout_Generator.h"
-#include "EC_Reactive_ConsumerControl.h"
-#include "EC_Reactive_SupplierControl.h"
-#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
+#include "orbsvcs/Event/EC_Basic_Factory.h"
+#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/Event/EC_Null_Scheduling.h"
+#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Delayed_Changes.h"
@@ -24,6 +24,8 @@ ACE_RCSID (Event,
            EC_Basic_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
 {
 }
@@ -257,3 +259,4 @@ TAO_EC_Basic_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index 9a886ff0c04..aa942b26492 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Basic_Factory.h
  *
@@ -17,12 +18,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Factory.h"
+#include "orbsvcs/Event/EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Basic_Factory
  *
@@ -110,6 +113,8 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_BASIC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index b1b7b1ca222..e8149330316 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,22 +1,25 @@
 // $Id$
 
 #include "orbsvcs/Event_Service_Constants.h"
-#include "EC_Basic_Filter_Builder.h"
-#include "EC_Type_Filter.h"
-#include "EC_Conjunction_Filter.h"
-#include "EC_Disjunction_Filter.h"
-#include "EC_And_Filter.h"
-#include "EC_Negation_Filter.h"
-#include "EC_Bitmask_Filter.h"
-#include "EC_Masked_Type_Filter.h"
-#include "EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Type_Filter.h"
+#include "orbsvcs/Event/EC_Conjunction_Filter.h"
+#include "orbsvcs/Event/EC_Disjunction_Filter.h"
+#include "orbsvcs/Event/EC_And_Filter.h"
+#include "orbsvcs/Event/EC_Negation_Filter.h"
+#include "orbsvcs/Event/EC_Bitmask_Filter.h"
+#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Basic_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
 {
 }
@@ -196,3 +199,5 @@ TAO_EC_Basic_Filter_Builder::
     }
   return count;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 98288fd5a2f..f6627fc35c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Basic_Filter_Builder.h
  *
@@ -17,14 +18,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
 
@@ -67,8 +70,10 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Basic_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
index c4cffeb9f08..ebf53c20045 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Basic_Filter_Builder::
       TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base *ec)
   :  event_channel_ (ec)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 30605712f32..7701ba4d1d1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
-#include "EC_Bitmask_Filter.h"
+#include "orbsvcs/Event/EC_Bitmask_Filter.h"
 
 ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
 
-TAO_EC_Bitmask_Filter::
-    TAO_EC_Bitmask_Filter (CORBA::ULong source_mask,
-                           CORBA::ULong type_mask,
-                           TAO_EC_Filter* child)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask,
+					      CORBA::ULong type_mask,
+					      TAO_EC_Filter* child)
   :  source_mask_ (source_mask),
      type_mask_ (type_mask),
      child_ (child)
@@ -117,3 +118,5 @@ TAO_EC_Bitmask_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 6403738045f..bc2a3469d00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Bitmask_Filter.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_BITMASK_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
-#include /**/ "event_serv_export.h"
+#include "orbsvcs/Event/EC_Filter.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Bitmask_Filter
  *
@@ -86,10 +89,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter
-                              (const TAO_EC_Bitmask_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter& operator=
-                              (const TAO_EC_Bitmask_Filter&))
+  TAO_EC_Bitmask_Filter (const TAO_EC_Bitmask_Filter&);
+  TAO_EC_Bitmask_Filter& operator= (const TAO_EC_Bitmask_Filter&);
 
 private:
   /// The bitmasks
@@ -100,5 +101,7 @@ private:
   TAO_EC_Filter* child_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_BITMASK_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index e85b8a15dab..f2cce60ee21 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_EC_BUSY_LOCK_CPP
 #define TAO_EC_BUSY_LOCK_CPP
 
-#include "EC_Busy_Lock.h"
+#include "orbsvcs/Event/EC_Busy_Lock.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Busy_Lock.i"
+#include "orbsvcs/Event/EC_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_Busy_Lock, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
 int TAO_EC_Busy_Lock_Adapter<T>::remove (void)
@@ -59,4 +59,6 @@ int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void)
   return this->adaptee_->busy ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_EC_BUSY_LOCK_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index 099c708e3c1..1640d5b8bf2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Busy_Lock.h
  *
@@ -22,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class Adaptee>
 class TAO_EC_Busy_Lock_Adapter
 {
@@ -45,12 +48,14 @@ private:
   Adaptee* adaptee_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Busy_Lock.i"
+#include "orbsvcs/Event/EC_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Busy_Lock.cpp"
+#include "orbsvcs/Event/EC_Busy_Lock.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
index dd4c3e7a956..670ad09dd63 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
@@ -1,8 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T> ACE_INLINE
 TAO_EC_Busy_Lock_Adapter<T>::TAO_EC_Busy_Lock_Adapter (T* adaptee)
   :  adaptee_ (adaptee)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index 1f7e055cde8..3759342a5e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -6,7 +6,9 @@
  * @author Marina Spivak <marina@atdesk.com>
  */
 
-#include "EC_Channel_Destroyer.h"
+#include "orbsvcs/Event/EC_Channel_Destroyer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Channel_Destroyer_Functor::operator() (
@@ -24,3 +26,5 @@ TAO_EC_Channel_Destroyer_Functor::operator() (
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
index 90ae3a9b1ea..4b18ad808fd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 /**
  * @file EC_Channel_Destroyer.h
  *
@@ -8,10 +10,12 @@
 #ifndef EC_CHANNEL_DESTROYER__H_
 #define EC_CHANNEL_DESTROYER__H_
 
-#include /**/ "event_serv_export.h"
-#include "EC_Event_Channel_Base.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @struct TAO_EC_Channel_Destroyer_Functor
  *
@@ -37,5 +41,6 @@ typedef ACE_Utils::Auto_Functor<
             TAO_EC_Channel_Destroyer_Functor>
         TAO_EC_Channel_Destroyer;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // EC_CHANNEL_DESTROYER__H_
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 696320fde99..e8fae3ae659 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_Conjunction_Filter.h"
+#include "orbsvcs/Event/EC_Conjunction_Filter.h"
 
 ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT;
 
 TAO_EC_Conjunction_Filter::
@@ -203,3 +205,5 @@ TAO_EC_Conjunction_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index 80493b3838d..e50d6b37867 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Conjunction_Filter.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_CONJUNCTION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
-#include /**/ "event_serv_export.h"
+#include "orbsvcs/Event/EC_Filter.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Conjunction_Filter
  *
@@ -76,10 +79,8 @@ private:
   /// Determine if all the children have received their events.
   int all_received (void) const;
 
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter
-                              (const TAO_EC_Conjunction_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter& operator=
-                              (const TAO_EC_Conjunction_Filter&))
+  TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&);
+  TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&);
 
 private:
   /// The children
@@ -106,5 +107,7 @@ private:
   ChildrenIterator current_child_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_CONJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 3ba08f2c8fb..73bf25fff47 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "EC_ConsumerAdmin.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/ESF/ESF_Peer_Workers.h"
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
@@ -12,6 +12,8 @@ ACE_RCSID (Event,
            EC_ConsumerAdmin,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
   :  TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec)
 {
@@ -35,3 +37,5 @@ TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index e6d2ee2f90f..60e45de355a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_ConsumerAdmin.h
  *
@@ -17,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,12 +26,13 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushConsumer;
 
-
 /**
  * @class TAO_EC_ConsumerAdmin
  *
@@ -72,6 +74,8 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index e393fdea4b6..007d90bd404 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_ConsumerControl.h"
+#include "orbsvcs/Event/EC_ConsumerControl.h"
 
 ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
 {
 }
@@ -37,3 +39,4 @@ TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 4ad494b96fe..281fe09f0d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_ConsumerControl.h
  *
@@ -18,12 +19,16 @@
 #include /**/ "ace/pre.h"
 #include "ace/CORBA_macros.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
 
@@ -62,15 +67,17 @@ public:
    * reclaim all the resources attached to that object.
    */
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL);
 
   /// Some system exception was raised while trying to contact the
   /// consumer
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 71b5d6d4c8d..b51714d2f4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -1,23 +1,23 @@
 // $Id$
 
-#include "EC_Default_Factory.h"
-#include "EC_Reactive_Dispatching.h"
-#include "EC_MT_Dispatching.h"
-#include "EC_Basic_Filter_Builder.h"
-#include "EC_Prefix_Filter_Builder.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "EC_Default_ProxyConsumer.h"
-#include "EC_Default_ProxySupplier.h"
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_Per_Supplier_Filter.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_Group_Scheduling.h"
-#include "EC_Reactive_Timeout_Generator.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_Reactive_ConsumerControl.h"
-#include "EC_Reactive_SupplierControl.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
+#include "orbsvcs/Event/EC_MT_Dispatching.h"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/Event/EC_Null_Scheduling.h"
+#include "orbsvcs/Event/EC_Group_Scheduling.h"
+#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
@@ -35,11 +35,13 @@
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Default_Factory.i"
+#include "orbsvcs/Event/EC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Default_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void)
 {
 }
@@ -988,6 +990,8 @@ TAO_EC_Default_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 406739f25b8..a5bce5d5df3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -17,18 +17,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Factory.h"
+#include "orbsvcs/Event/EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Defaults.h"
+#include "orbsvcs/Event/EC_Defaults.h"
 
 #include "ace/Service_Config.h"
 #include "ace/SString.h"
 #include "ace/Time_Value.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Queue_Full_Service_Object;
 
 /**
@@ -185,8 +187,10 @@ protected:
   int consumer_validate_connection_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Default_Factory.i"
+#include "orbsvcs/Event/EC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
index 3ff451b166a..2564cd3b0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Default_Factory::TAO_EC_Default_Factory (void)
   :  dispatching_ (TAO_EC_DEFAULT_DISPATCHING),
@@ -51,3 +55,5 @@ TAO_EC_Default_Factory::orb_id (void) const
 {
   return this->orbid_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index ab836a8dcbf..e3bca47a2d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "EC_Default_ProxyConsumer.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_Supplier_Filter_Builder.h"
-#include "EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
 #include "ace/Synch_T.h"
 
 ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
 TAO_EC_Default_ProxyPushConsumer::
@@ -186,3 +188,5 @@ TAO_EC_Default_ProxyPushConsumer::object_id (ACE_ENV_SINGLE_ARG_DECL)
     this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   return result.in ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 7b0f7648cef..e08d7d4c092 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Default_ProxyConsumer.h
  *
@@ -21,7 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -75,6 +78,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index 1265d53d656..a431afb219f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "EC_Default_ProxySupplier.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
 
 #include "ace/Reverse_Lock_T.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (Event,
            EC_ProxySupplier,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
 TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier (
@@ -222,3 +224,5 @@ TAO_EC_Default_ProxyPushSupplier::object_id (ACE_ENV_SINGLE_ARG_DECL)
 
   return result.in ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index 2284340aad3..ae59254ea93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Default_ProxySupplier.h
  *
@@ -20,7 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Default_ProxyPushSupplier
@@ -28,9 +31,9 @@
  * @brief Implement the ReliableEventChannelAdmin::ProxyPushSupplier
  *         interface
  */
-class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier :
-  public POA_RtecEventChannelAdmin::ProxyPushSupplier,
-  public TAO_EC_ProxyPushSupplier
+class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier
+  : public POA_RtecEventChannelAdmin::ProxyPushSupplier,
+    public TAO_EC_ProxyPushSupplier
 {
 public:
 
@@ -72,6 +75,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index ffd6030faa8..9016401e2f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_Disjunction_Filter.h"
+#include "orbsvcs/Event/EC_Disjunction_Filter.h"
 
 ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Disjunction_Filter::
     TAO_EC_Disjunction_Filter (TAO_EC_Filter* children[],
                                size_t n)
@@ -157,3 +159,5 @@ TAO_EC_Disjunction_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index c8886235d9a..06585acb46d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Disjunction_Filter.h
  *
@@ -16,12 +17,14 @@
 #define TAO_EC_DISJUNCTION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Disjunction_Filter
  *
@@ -70,10 +73,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter
-                              (const TAO_EC_Disjunction_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter& operator=
-                              (const TAO_EC_Disjunction_Filter&))
+  TAO_EC_Disjunction_Filter (const TAO_EC_Disjunction_Filter&);
+  TAO_EC_Disjunction_Filter& operator= (const TAO_EC_Disjunction_Filter&);
 
 private:
   /// The children
@@ -83,5 +84,7 @@ private:
   size_t n_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_DISJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index a38dcbbdce7..4e2ead6d6e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "EC_Dispatching.h"
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 
 ACE_RCSID(Event, EC_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 8d125229aa1..14fc0cc7860 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Dispatching.h
  *
@@ -19,12 +20,14 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_QOS_Info;
 class TAO_EC_ProxyPushSupplier;
 
@@ -74,6 +77,8 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index b45fcc7d5f5..5c17293ac4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -1,21 +1,24 @@
 // $Id$
 
-#include "EC_Dispatching_Task.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Defaults.h"
+#include "orbsvcs/Event/EC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Defaults.h"
 
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Dispatching_Task.i"
+#include "orbsvcs/Event/EC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Dispatching,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
   : queue_full_action_return_value_ (WAIT_TO_EMPTY)
 {
@@ -26,7 +29,6 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
 int
 TAO_EC_Simple_Queue_Full_Action::init_svcs (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Queue_Full_Action::init_svcs()\n"));
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action);
 }
@@ -75,6 +77,8 @@ TAO_EC_Simple_Queue_Full_Action::queue_full_action (TAO_EC_Dispatching_Task * /*
   return this->queue_full_action_return_value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action,
                        ACE_TEXT (TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME),
                        ACE_SVC_OBJ_T,
@@ -84,7 +88,7 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action,
 ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action)
 
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 int
 TAO_EC_Queue::is_full_i (void)
 {
@@ -101,7 +105,7 @@ TAO_EC_Dispatching_Task::svc (void)
     {
       ACE_TRY_NEW_ENV
         {
-          ACE_Message_Block *mb;
+          ACE_Message_Block *mb = 0;
           if (this->getq (mb) == -1)
             if (ACE_OS::last_error () == ESHUTDOWN)
               return 0;
@@ -170,11 +174,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                    event,
                                    this->data_block_.duplicate (),
                                    this->allocator_);
-  ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size before putq: %d\n",
-              this, this->the_queue_.message_count ()));
   this->putq (mb);
-  ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size after putq: %d\n",
-              this, this->the_queue_.message_count ()));
 }
 
 // ****************************************************************
@@ -207,3 +207,4 @@ TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 81eb4d05e47..370bc10524a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -18,20 +18,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventCommC.h"
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "ace/Task.h"
 #include "ace/Message_Block.h"
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Service_Config.h"
 #include "ace/Global_Macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl
 class TAO_EC_Dispatching_Task;
 
@@ -183,8 +185,10 @@ private:
   RtecEventComm::EventSet event_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Dispatching_Task.i"
+#include "orbsvcs/Event/EC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Simple_Queue_Full_Action)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
index 12694120844..37930e408fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Queue::
     TAO_EC_Queue (size_t high_water_mark,
@@ -87,3 +91,5 @@ TAO_EC_Push_Command::TAO_EC_Push_Command (
 
   this->proxy_->_incr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index fa498a4d514..b35602065d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "EC_Event_Channel.h"
-#include "EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID(Event, EC_Event_Channel, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Event_Channel::
 TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr,
                       TAO_EC_Factory* factory,
@@ -31,3 +33,5 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr,
 
   this->create_strategies ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 04b1ce0cfb9..a2aa9b95643 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Event_Channel.h
  *
@@ -19,12 +20,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Event_Channel
  *
@@ -52,6 +55,8 @@ public:
                         int own_factory = 0);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 4a9d5cd7f34..cdb208fbb4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "EC_Event_Channel_Base.h"
-#include "EC_Dispatching.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "EC_Timeout_Generator.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_ConsumerControl.h"
-#include "EC_SupplierControl.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/Event/EC_SupplierControl.h"
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Event_Channel_Base.i"
+#include "orbsvcs/Event/EC_Event_Channel_Base.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Event_Channel_Base::
 TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr,
                            TAO_EC_Factory* factory,
@@ -347,3 +349,5 @@ TAO_EC_Event_Channel_Base::for_each_supplier (
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 39b168a4c85..b42632c4c43 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Event_Channel_Base.h
  *
@@ -19,16 +20,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Factory.h"
+#include "orbsvcs/Event/EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Defaults.h"
+#include "orbsvcs/Event/EC_Defaults.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class> class TAO_ESF_Worker;
 
 /**
@@ -363,8 +366,10 @@ protected:
   int status_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Event_Channel_Base.i"
+#include "orbsvcs/Event/EC_Event_Channel_Base.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
index f3a4d6a784d..1883f84ef11 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Event_Channel_Attributes::
 TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
@@ -198,3 +202,5 @@ TAO_EC_Event_Channel_Base::destroyed (void)
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return (this->status_ == EC_S_DESTROYED);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 6ce94287fd6..0612521f408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
-#include "EC_Factory.h"
+#include "orbsvcs/Event/EC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID(Event, EC_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Factory::~TAO_EC_Factory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 71c1a0ebfa3..a3cd903d4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Factory.h
  *
@@ -17,15 +17,21 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 
@@ -156,6 +162,8 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 220a8403b96..55f0de96038 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
-#include "EC_Filter.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Filter.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #include "tao/ORB_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Filter.i"
+#include "orbsvcs/Event/EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Filter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Filter::~TAO_EC_Filter (void)
 {
 }
@@ -124,3 +126,5 @@ TAO_EC_Null_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index 63ec4618f78..d092917ab4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Filter.h
  *
@@ -19,12 +19,14 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_QOS_Info;
 
 /**
@@ -212,8 +214,10 @@ public:
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Filter.i"
+#include "orbsvcs/Event/EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
index 3820754ed5a..a5b9e121522 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Filter::TAO_EC_Filter (void)
   :  parent_ (0)
@@ -37,3 +41,5 @@ TAO_EC_Null_Filter::TAO_EC_Null_Filter (void)
 }
 
 // ****************************************************************
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 8b8cc5ddbe7..07934456276 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "EC_Filter_Builder.h"
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Filter_Builder, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void)
 {
 }
@@ -27,3 +29,5 @@ TAO_EC_Null_Filter_Builder::build (
 {
   return new TAO_EC_Null_Filter;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 92a5a6353a8..5d639e8d7e0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Filter_Builder.h
  *
@@ -19,12 +19,14 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Filter;
 class TAO_EC_ProxyPushSupplier;
 
@@ -77,10 +79,12 @@ public:
                         ACE_ENV_ARG_DECL) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 #if defined (__ACE_INLINE__)
-#include "EC_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
index 2592a19f93b..89d32fe656e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
@@ -1,6 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 8ef8d8c7ef0..8addbb46165 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Event,
            EC_Gateway, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Gateway::TAO_EC_Gateway (void)
   :  handle_ (0)
 {
@@ -27,3 +29,4 @@ TAO_EC_Gateway::observer_handle (void) const
   return this->handle_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index c5a4253e0ca..965e6a9daf6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Gateway.h
  *
@@ -17,11 +18,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Gateway
  *
@@ -60,6 +64,8 @@ private:
   RtecEventChannelAdmin::Observer_Handle handle_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_EC_GATEWAY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 5ae4f0d558c..cf58d8cbd06 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -5,8 +5,8 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Time_Utilities.h"
 
-#include "EC_Gateway_IIOP_Factory.h"
-#include "ECG_ConsumerEC_Control.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
+#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -14,6 +14,8 @@ ACE_RCSID (Event,
            EC_Gateway_IIOP,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
   :  busy_count_ (0),
      update_posted_ (0),
@@ -709,3 +711,5 @@ TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL)
       supplier_ec_suspended_ = 0;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 178b73e93f7..6f957042c3a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -19,8 +19,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
-#include "EC_Gateway.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "orbsvcs/Event/EC_Gateway.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -29,6 +29,8 @@
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ECG_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP_Factory;
 
@@ -246,6 +248,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_EC_GATEWAY_IIOP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index 4cc2098d2b8..89a9ddb76ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -8,20 +8,22 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
 
-#include "ECG_ConsumerEC_Control.h"
-#include "ECG_Reactive_ConsumerEC_Control.h"
-#include "ECG_Reconnect_ConsumerEC_Control.h"
-#include "EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
+#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h"
+#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "EC_Gateway_IIOP_Factory.i"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Gateway_IIOP_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_EC_Gateway_IIOP_Factory::init_svcs (void)
 {
@@ -199,6 +201,8 @@ TAO_EC_Gateway_IIOP_Factory::destroy_consumerec_control (
    delete x;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory,
                        ACE_TEXT ("EC_Gateway_IIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 58746f928d9..1fbd4a03b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Gateway_IIOP_Factory.h
  *
@@ -22,7 +23,11 @@
 #include "ace/Service_Object.h"
 #include "ace/SString.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ECG_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
@@ -96,11 +101,13 @@ protected:
   int use_consumer_proxy_map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory)
 ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory)
 
 #if defined (__ACE_INLINE__)
-#include "EC_Gateway_IIOP_Factory.i"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
index 85ac825fd2f..45dbd3f9d3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_EC_Gateway_IIOP_Factory::use_ttl (void) const
 {
@@ -12,3 +16,4 @@ TAO_EC_Gateway_IIOP_Factory::use_consumer_proxy_map (void) const
   return this->use_consumer_proxy_map_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index cb8453bdef8..1b1a0d4479e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "EC_Gateway_Sched.h"
+#include "orbsvcs/Event/EC_Gateway_Sched.h"
 #include "orbsvcs/Time_Utilities.h"
 
 ACE_RCSID (Event, 
            EC_Gateway_sched, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void)
   :  TAO_EC_Gateway_IIOP ()
 {
@@ -76,3 +78,5 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 3ab5e935271..5267546de17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Gateway_Sched.h
  *
@@ -18,12 +18,14 @@
 #define TAO_EC_GATEWAY_SCHED_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
 #include "orbsvcs/RtecSchedulerC.h"
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Gateway_Sched
  *
@@ -48,8 +50,10 @@ public:
              RtecScheduler::Scheduler_ptr consumer_sched,
              const char* consumer_name,
              const char* supplier_name
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_EC_GATEWAY_SCHED_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 4634f940e41..9e39ef1f631 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "EC_Group_Scheduling.h"
-#include "EC_QOS_Info.h"
-#include "EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Group_Scheduling.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Group_Scheduling.inl"
+#include "orbsvcs/Event/EC_Group_Scheduling.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Group_Scheduling, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index 7e6510b065c..1a9b35f07e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -16,7 +16,7 @@
 #define TAO_EC_GROUP_SCHEDULING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,14 +44,12 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling
-                              (const TAO_EC_Group_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling& operator=
-                              (const TAO_EC_Group_Scheduling&))
+  TAO_EC_Group_Scheduling (const TAO_EC_Group_Scheduling&);
+  TAO_EC_Group_Scheduling& operator= (const TAO_EC_Group_Scheduling&);
 };
 
 #if defined (__ACE_INLINE__)
-#include "EC_Group_Scheduling.inl"
+#include "orbsvcs/Event/EC_Group_Scheduling.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index aecf424ef41..206d87f18a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "EC_Kokyu_Dispatching.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxySupplier.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/RtecSchedulerC.h"
@@ -15,13 +15,15 @@
 #include "Kokyu/Kokyu.h"
 
 #if     ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Dispatching.i"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Kokyu_Dispatching,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope)
   :allocator_ (0),
    dispatcher_ (0),
@@ -204,3 +206,5 @@ TAO_EC_Kokyu_Push_Command::execute ()
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index ec54bc03226..d9079a271ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -18,20 +18,22 @@
 #define TAO_EC_KOKYU_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Dispatching.h"
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "rtkokyu_event_export.h"
+#include "orbsvcs/Event/rtkokyu_event_export.h"
 
 #include "ace/Thread_Manager.h"
 
 #include "Kokyu/Kokyu.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 
 /**
@@ -135,8 +137,10 @@ private:
   RtecEventComm::EventSet event_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Dispatching.i"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
index b7645af1170..0c116874fad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
@@ -1,12 +1,16 @@
+// -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_INLINE
 TAO_EC_Kokyu_Shutdown_Command::
-TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator* allocator)
+TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator*)
   :  Kokyu::Dispatch_Command ()
 {
-  ACE_UNUSED_ARG (allocator);
 }
 
 // ****************************************************************
@@ -34,3 +38,5 @@ TAO_EC_Kokyu_Push_Command::TAO_EC_Kokyu_Push_Command (
 
   this->proxy_->_incr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 0e5448fdafd..2df728b8920 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "EC_Kokyu_Factory.h"
-#include "EC_Kokyu_Dispatching.h"
-#include "EC_Kokyu_Scheduling.h"
-#include "EC_Kokyu_Filter_Builder.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Kokyu_Factory.h"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.h"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.h"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
@@ -12,13 +12,15 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Factory.i"
+#include "orbsvcs/Event/EC_Kokyu_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Kokyu_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void)
 {
 }
@@ -257,6 +259,8 @@ TAO_EC_Kokyu_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec)
   return this->TAO_EC_Default_Factory::create_scheduling_strategy (ec);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_EC_Kokyu_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
index 9a1f9ddd4d2..4e2f413ca42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Kokyu_Factory.h
  *
@@ -17,13 +17,15 @@
 #define TAO_EC_KOKYU_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtkokyu_event_export.h"
+#include "orbsvcs/Event/rtkokyu_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Kokyu_Factory
@@ -63,8 +65,10 @@ private:
   int disp_sched_scope_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Factory.i"
+#include "orbsvcs/Event/EC_Kokyu_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Kokyu_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
index cc78b5b83c8..7119373733f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void)
   :  TAO_EC_Default_Factory (),
@@ -7,3 +11,5 @@ TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void)
      disp_sched_scope_ (ACE_SCOPE_THREAD)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index 03e5d7011dd..ab2015ea52d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "EC_Kokyu_Filter.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Kokyu_Filter.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index a737b93cb55..09f521997d4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -16,14 +16,14 @@
 #define TAO_EC_KOKYU_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "rtkokyu_event_export.h"
+#include "orbsvcs/Event/rtkokyu_event_export.h"
 #include "ace/SString.h"
 
 //#define EC_KOKYU_LOGGING
@@ -87,10 +87,8 @@ public:
                              ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter
-                              (const TAO_EC_Kokyu_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter& operator=
-                              (const TAO_EC_Kokyu_Filter&))
+  TAO_EC_Kokyu_Filter (const TAO_EC_Kokyu_Filter&);
+  TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 0f2eee83b7a..a522ce4d5ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#include "EC_Kokyu_Filter.h"
+#include "orbsvcs/Event/EC_Kokyu_Filter.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "EC_Kokyu_Filter_Builder.h"
-#include "EC_Type_Filter.h"
-#include "EC_Conjunction_Filter.h"
-#include "EC_Disjunction_Filter.h"
-#include "EC_Timeout_Filter.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Type_Filter.h"
+#include "orbsvcs/Event/EC_Conjunction_Filter.h"
+#include "orbsvcs/Event/EC_Disjunction_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -35,6 +35,8 @@ const char* designator (long dsgn)
   return "---";
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void)
 {
 }
@@ -507,3 +509,5 @@ TAO_EC_Kokyu_Filter_Builder::
     }
   return i - 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index b36d1e80350..83ac33a6456 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Kokyu_Filter_Builder.h
  *
@@ -17,13 +17,15 @@
 #define TAO_EC_KOKYU_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtkokyu_event_export.h"
+#include "orbsvcs/Event/rtkokyu_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
@@ -77,8 +79,10 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
index db27e8da5db..8e0cd624a7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
@@ -1,8 +1,15 @@
+// -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Kokyu_Filter_Builder::
-      TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec)
-  :  event_channel_ (ec)
+  TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base *ec)
+  : event_channel_ (ec)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 48453663f23..979cd0913fa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "EC_Kokyu_Scheduling.h"
-#include "EC_QOS_Info.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Scheduling.i"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void)
 {
 }
@@ -93,3 +95,5 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 5eb6ef5dc35..105241d217a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Kokyu_Scheduling.h
  *
@@ -17,14 +18,16 @@
 #define TAO_EC_KOKYU_SCHEDULING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "rtkokyu_event_export.h"
+#include "orbsvcs/Event/rtkokyu_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Kokyu_Scheduling
@@ -53,10 +56,8 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Scheduling
-                              (const TAO_EC_Kokyu_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Scheduling& operator=
-                              (const TAO_EC_Kokyu_Scheduling&))
+  TAO_EC_Kokyu_Scheduling (const TAO_EC_Kokyu_Scheduling&);
+  TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -66,8 +67,10 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Scheduling.i"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
index b9dbd7d9dfc..1afeb35fa05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Kokyu_Scheduling::TAO_EC_Kokyu_Scheduling (
        RtecScheduler::Scheduler_ptr scheduler)
   :  scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
index 8bb0dcc711c..9750da7a5d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
 
 #if !defined(__ACE_INLINE__)
-#include "EC_Lifetime_Utils.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 9c180506dd6..d34ce3ab484 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file EC_Lifetime_Utils.h
  *
@@ -17,7 +18,7 @@
 #define TAO_EC_LIFETIME_UTILS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
@@ -26,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Object_Deactivator
  *
@@ -204,9 +207,10 @@ private:
   RtecEventChannelAdmin::EventChannel_var ec_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "EC_Lifetime_Utils.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
index 535eda1f85d..2884f04108d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void)
   : poa_ ()
@@ -171,3 +175,5 @@ TAO_EC_Event_Channel_Holder::init (
 {
   this->ec_ = ec_var;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index a66ff2d6412..8a8d4934d40 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -3,12 +3,14 @@
 #ifndef TAO_EC_LIFETIME_UTILS_T_CPP
 #define TAO_EC_LIFETIME_UTILS_T_CPP
 
-#include "EC_Lifetime_Utils_T.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Lifetime_Utils_T.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename T>
 void
 activate (T & obj_ref,
@@ -44,5 +46,6 @@ activate (T & obj_ref,
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_EC_LIFETIME_UTILS_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 0aeff3e86d7..85b98439126 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Lifetime_Utils_T.h
  *
@@ -16,12 +17,14 @@
 #ifndef TAO_EC_LIFETIME_UTILS_T_H
 #define TAO_EC_LIFETIME_UTILS_T_H
 
-#include "EC_Lifetime_Utils.h"
+#include "orbsvcs/Event/EC_Lifetime_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @brief Helper for activating objects.
  * Activates @a servant with @a poa and returns the object reference via
@@ -183,12 +186,14 @@ bool operator!=(TAO_EC_Servant_Var<X> const & x,
                 TAO_EC_Servant_Var<Y> const & y);
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Lifetime_Utils_T.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Lifetime_Utils_T.cpp"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
index fb527b3fe5e..e93998fee0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_INLINE
 TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void)
@@ -109,11 +113,15 @@ TAO_EC_Shutdown_Command<T>::execute (ACE_ENV_SINGLE_ARG_DECL)
 //***************************************************************************
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Life would be much easier if _add_ref() and _remove_ref()
 // had throw specs of "throw ()"
 
 #include <algorithm>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_INLINE TAO_EC_Servant_Var<T>::
 TAO_EC_Servant_Var(T * p)
@@ -328,3 +336,5 @@ operator!=(TAO_EC_Servant_Var<X> const & x,
 {
   return x.in() != y.in();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index d243e05c7ab..096ae4c3ba0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -1,9 +1,12 @@
 // $Id$
 
-#include "EC_MT_Dispatching.h"
+#include "orbsvcs/Event/EC_MT_Dispatching.h"
 
 ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
                                               int thread_creation_flags,
                                               int thread_priority,
@@ -86,3 +89,4 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
   this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 293fce9464b..b38b5a160fd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_MT_Dispatching.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_MT_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Dispatching.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_Dispatching_Task.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_MT_Dispatching
@@ -89,5 +92,7 @@ private:
   TAO_EC_Queue_Full_Service_Object* queue_full_service_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 6e6e6a0fde6..0ab3197ef29 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_Masked_Type_Filter.h"
+#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
 
 ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Masked_Type_Filter::
     TAO_EC_Masked_Type_Filter (CORBA::ULong source_mask,
                                CORBA::ULong type_mask,
@@ -122,3 +124,5 @@ TAO_EC_Masked_Type_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 09027897e7f..97a83d622ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Masked_Type_Filter.h
  *
@@ -16,12 +17,14 @@
 #define TAO_EC_MASKED_TYPE_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Masked_Type_Filter
  *
@@ -71,10 +74,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter
-                              (const TAO_EC_Masked_Type_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter& operator=
-                              (const TAO_EC_Masked_Type_Filter&))
+  TAO_EC_Masked_Type_Filter (const TAO_EC_Masked_Type_Filter&);
+  TAO_EC_Masked_Type_Filter& operator= (const TAO_EC_Masked_Type_Filter&);
 
 private:
   /// The bitmasks
@@ -86,5 +87,7 @@ private:
   CORBA::ULong type_value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MASKED_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index de13c0f59a2..204685379ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
-#include "EC_Negation_Filter.h"
+#include "orbsvcs/Event/EC_Negation_Filter.h"
 
 ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
 
-TAO_EC_Negation_Filter::
-    TAO_EC_Negation_Filter (TAO_EC_Filter* child)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
   :  child_ (child)
 {
   this->adopt_child (this->child_);
@@ -109,3 +110,5 @@ TAO_EC_Negation_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 3dadaa50f5a..f4f141f0e27 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Negation_Filter.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_NEGATION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
-#include /**/ "event_serv_export.h"
+#include "orbsvcs/Event/EC_Filter.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Negation_Filter
  *
@@ -69,15 +72,15 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter
-                              (const TAO_EC_Negation_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter& operator=
-                              (const TAO_EC_Negation_Filter&))
+  TAO_EC_Negation_Filter (const TAO_EC_Negation_Filter&);
+  TAO_EC_Negation_Filter& operator= (const TAO_EC_Negation_Filter&);
 
 private:
   /// The child
   TAO_EC_Filter* child_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NEGATION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 9414cb975d9..5b829d361c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -1,19 +1,19 @@
 // $Id$
 
-#include "EC_Null_Factory.h"
-#include "EC_Reactive_Dispatching.h"
-#include "EC_Filter_Builder.h"
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "EC_Default_ProxyConsumer.h"
-#include "EC_Default_ProxySupplier.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_Reactive_Timeout_Generator.h"
-#include "EC_ConsumerControl.h"
-#include "EC_SupplierControl.h"
-#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
+#include "orbsvcs/Event/EC_Null_Factory.h"
+#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/Event/EC_Null_Scheduling.h"
+#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
@@ -21,6 +21,8 @@
 
 ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
 {
 }
@@ -236,3 +238,4 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 9a93caef484..ca583ca5d13 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Null_Factory.h
  *
@@ -16,12 +17,14 @@
 #define TAO_EC_NULL_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Factory.h"
+#include "orbsvcs/Event/EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Null_Factory
  *
@@ -107,5 +110,7 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NULL_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 5b032866004..e17a6de3910 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "EC_Null_Scheduling.h"
-#include "EC_QOS_Info.h"
-#include "EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Null_Scheduling.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Null_Scheduling.i"
+#include "orbsvcs/Event/EC_Null_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 26d8cbd0cbe..90857214aeb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -47,14 +47,12 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling
-                              (const TAO_EC_Null_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling& operator=
-                              (const TAO_EC_Null_Scheduling&))
+  TAO_EC_Null_Scheduling (const TAO_EC_Null_Scheduling&);
+  TAO_EC_Null_Scheduling& operator= (const TAO_EC_Null_Scheduling&);
 };
 
 #if defined (__ACE_INLINE__)
-#include "EC_Null_Scheduling.i"
+#include "orbsvcs/Event/EC_Null_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 0263f42c989..e5c5a9bc11d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "EC_ObserverStrategy.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_ObserverStrategy.i"
+#include "orbsvcs/Event/EC_ObserverStrategy.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 {
 }
@@ -510,3 +512,5 @@ TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer
       this->headers_.insert (event.header, 1);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index ca86257c99c..55b8874db7c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -32,9 +32,14 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_ProxyPushSupplier;
@@ -346,8 +351,10 @@ private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_ObserverStrategy.i"
+#include "orbsvcs/Event/EC_ObserverStrategy.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
index 07fa7ae19d0..231db3f9417 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void)
 {
@@ -73,3 +77,5 @@ TAO_EC_Accumulate_Consumer_Headers::
   : headers_ (h)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 1eb2794a909..fe0ed5c6cc8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -1,22 +1,24 @@
 // $Id$
 
-#include "EC_Per_Supplier_Filter.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_Scheduling_Strategy.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Per_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Per_Supplier_Filter::
     TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec)
   :  event_channel_ (ec),
@@ -207,3 +209,5 @@ TAO_EC_Per_Supplier_Filter_Builder::destroy (
 {
   delete x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index ea5f674daf6..868c15d4e00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Per_Supplier_Filter.h
  *
@@ -16,14 +16,16 @@
 #define TAO_EC_PER_SUPPLIER_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Supplier_Filter.h"
-#include "EC_Supplier_Filter_Builder.h"
-#include /**/ "event_serv_export.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class PROXY> class TAO_ESF_Proxy_Collection;
 class TAO_EC_Event_Channel_Base;
 
@@ -110,8 +112,10 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Per_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
index 416f6b68726..4c950811fcc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Per_Supplier_Filter_Builder::
 TAO_EC_Per_Supplier_Filter_Builder (TAO_EC_Event_Channel_Base* ec)
   :  event_channel_ (ec)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index ed97744f809..61b79c68726 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,22 +1,24 @@
 // $Id$
 
 #include "orbsvcs/Event_Service_Constants.h"
-#include "EC_Prefix_Filter_Builder.h"
-#include "EC_Type_Filter.h"
-#include "EC_Conjunction_Filter.h"
-#include "EC_Disjunction_Filter.h"
-#include "EC_And_Filter.h"
-#include "EC_Negation_Filter.h"
-#include "EC_Bitmask_Filter.h"
-#include "EC_Masked_Type_Filter.h"
-#include "EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Type_Filter.h"
+#include "orbsvcs/Event/EC_Conjunction_Filter.h"
+#include "orbsvcs/Event/EC_Disjunction_Filter.h"
+#include "orbsvcs/Event/EC_And_Filter.h"
+#include "orbsvcs/Event/EC_Negation_Filter.h"
+#include "orbsvcs/Event/EC_Bitmask_Filter.h"
+#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Prefix_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
 {
 }
@@ -152,3 +154,5 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build (
   pos++; // Consume the event
   return new TAO_EC_Type_Filter (e.header);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 5a3cfafd7ad..7938278e895 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -16,12 +16,15 @@
 #define TAO_EC_PREFIX_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
 
@@ -59,8 +62,10 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Prefix_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
index c078591f226..c4ddf4074b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Prefix_Filter_Builder::
       TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base *ec)
   :  event_channel_ (ec)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 2942b19527f..1e41905c0ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "EC_Priority_Dispatching.h"
-#include "EC_Dispatching_Task.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Priority_Dispatching.h"
+#include "orbsvcs/Event/EC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/RtecSchedulerC.h"
@@ -12,6 +12,8 @@
 
 ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
   :  ntasks_ (0),
      tasks_ (0)
@@ -135,3 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
 
   this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 68e7f4b927b..ebbb6cd6085 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Priority_Dispatching.h
  *
@@ -16,17 +17,19 @@
 #define TAO_EC_PRIORITY_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Dispatching.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
 
 #include "ace/Thread_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Dispatching_Task;
 class TAO_EC_Event_Channel_Base;
 
@@ -81,5 +84,7 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_PRIORITY_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index ce5fd2843e5..0bf92510d54 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "EC_Priority_Scheduling.h"
-#include "EC_QOS_Info.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Priority_Scheduling.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Priority_Scheduling.i"
+#include "orbsvcs/Event/EC_Priority_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
 {
 }
@@ -94,3 +96,5 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index a8a1fee8960..ef5be319f06 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Priority_Scheduling.h
  *
@@ -16,14 +17,16 @@
 #define TAO_EC_PRIORITY_SCHEDULING_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Priority_Scheduling
@@ -52,10 +55,8 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling
-                              (const TAO_EC_Priority_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling& operator=
-                              (const TAO_EC_Priority_Scheduling&))
+  TAO_EC_Priority_Scheduling (const TAO_EC_Priority_Scheduling&);
+  TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -65,8 +66,10 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Priority_Scheduling.i"
+#include "orbsvcs/Event/EC_Priority_Scheduling.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
index af004f6fcde..2de353d965e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Priority_Scheduling::TAO_EC_Priority_Scheduling (
        RtecScheduler::Scheduler_ptr scheduler)
   :  scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index dde5347cec6..f16960141c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "EC_ProxyConsumer.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_Supplier_Filter.h"
-#include "EC_Supplier_Filter_Builder.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_ProxyConsumer.i"
+#include "orbsvcs/Event/EC_ProxyConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_ProxyConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
 TAO_EC_ProxyPushConsumer::
@@ -304,3 +306,5 @@ TAO_EC_ProxyPushConsumer_Guard::
 
   this->proxy_->refcount_zero_hook ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index b61ee0885c7..e70e0ee6ca2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_ProxyConsumer.h
  *
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
@@ -25,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_Supplier_Filter;
@@ -225,8 +227,10 @@ private:
   int locked_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_ProxyConsumer.i"
+#include "orbsvcs/Event/EC_ProxyConsumer.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
index c6890fff743..44ef91ef2e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_EC_ProxyPushConsumer::is_connected_i (void) const
 {
@@ -63,3 +67,5 @@ TAO_EC_ProxyPushConsumer_Guard::locked (void) const
 {
   return this->locked_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 1fb8ea7bbfe..37204dcf67b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -1,26 +1,28 @@
 // $Id$
 
-#include "EC_ProxySupplier.h"
-#include "EC_Dispatching.h"
-#include "EC_Filter_Builder.h"
-#include "EC_QOS_Info.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_Scheduling_Strategy.h"
-#include "EC_ConsumerControl.h"
-#include "EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_ProxySupplier,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
 TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection)
@@ -529,3 +531,5 @@ TAO_EC_ProxyPushSupplier::add_dependencies (
                                          qos_info
                                          ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 769dc42ef80..bb14e56895b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_ProxySupplier.h
  *
@@ -19,12 +19,14 @@
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushConsumer;
 
@@ -218,8 +220,10 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
index d0e06a7b0a6..c64085ea2e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_EC_ProxyPushSupplier::suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -91,3 +95,5 @@ TAO_EC_ProxyPushSupplier::subscriptions (void) const
 
   return this->qos_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index c53100ca0c6..557a2b4f708 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -6,7 +6,9 @@
  * @author Carlos O'Ryan <coryan@atdesk.com>
  */
 
-#include "EC_Proxy_Disconnector.h"
+#include "orbsvcs/Event/EC_Proxy_Disconnector.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
@@ -41,3 +43,5 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index da6b6a2972e..8aeda423586 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 /**
  * @file EC_Proxy_Disconnector.h
  *
@@ -8,10 +10,12 @@
 #ifndef EC_PROXY_DISCONNECTOR__H_
 #define EC_PROXY_DISCONNECTOR__H_
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 #include "orbsvcs/RtecEventCommC.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @struct TAO_EC_Supplier_Proxy_Disconnect_Functor
  *
@@ -67,4 +71,6 @@ typedef ACE_Utils::Auto_Functor<
         TAO_EC_Consumer_Proxy_Disconnector;
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // EC_PROXY_DISCONNECTOR__H_
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index a2c8154ff76..4680bda962f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_QOS_Info.i"
+#include "orbsvcs/Event/EC_QOS_Info.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_QOS_Info, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 966ebb90667..88c9387e382 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_QOS_Info.h
  *
@@ -19,12 +20,14 @@
 
 #include "orbsvcs/RtecBaseC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_QOS_Info
  *
@@ -56,8 +59,10 @@ public:
   long timer_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_QOS_Info.i"
+#include "orbsvcs/Event/EC_QOS_Info.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
index 40a0f0facd8..eab42f031bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_QOS_Info::TAO_EC_QOS_Info (void)
   :  rt_info (-1),
@@ -15,3 +19,5 @@ TAO_EC_QOS_Info::TAO_EC_QOS_Info (const TAO_EC_QOS_Info &rhs)
      timer_id_ (rhs.timer_id_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 3de61363002..f57b86ae813 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "EC_RTCORBA_Dispatching.h"
+#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
 #include "tao/RTCORBA/Priority_Mapping.h"
 
 ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_RTCORBA_Dispatching::
   TAO_EC_RTCORBA_Dispatching (const RTCORBA::ThreadpoolLanes &lanes,
                               RTCORBA::PriorityMapping *mapping,
@@ -100,3 +102,5 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       break;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index a4f80a3beb0..cb6e87fdad2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file EC_RTCORBA_Dispatching.h
  *
@@ -16,16 +16,17 @@
 #define TAO_EC_RTCORBA_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_event_export.h"
-#include "EC_Dispatching.h"
+#include "orbsvcs/Event/rtcorba_event_export.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_Dispatching_Task.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_RTCORBA_Dispatching
@@ -75,5 +76,7 @@ private:
   TAO_EC_Dispatching_Task *tasks_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 3473a34d4db..4e96a5ce513 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "EC_RTCORBA_Dispatching.h"
-#include "EC_RTCORBA_Factory.h"
+#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
+#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
 
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
 ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_RTCORBA_Factory::
     TAO_EC_RTCORBA_Factory (TAO_EC_Factory *body,
                             const RTCORBA::ThreadpoolLanes &lanes)
@@ -271,3 +273,4 @@ TAO_EC_RTCORBA_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   this->body_->destroy_supplier_control (x);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index ae5a45dc710..c85724ed43b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file EC_RTCORBA_Factory.h
  *
@@ -16,14 +16,16 @@
 #define TAO_EC_RTCORBA_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_event_export.h"
-#include "EC_Factory.h"
+#include "orbsvcs/Event/rtcorba_event_export.h"
+#include "orbsvcs/Event/EC_Factory.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_RTCORBA_Factory
  *
@@ -115,5 +117,7 @@ protected:
   RTCORBA::ThreadpoolLanes lanes_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 8fe8f6cbcff..a8aafe81f0b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "EC_ConsumerAdmin.h"
-#include "EC_Reactive_ConsumerControl.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
@@ -12,11 +12,13 @@
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_ConsumerControl.i"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Reactive_ConsumerControl::
      TAO_EC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
                                       const ACE_Time_Value &timeout,
@@ -270,3 +272,5 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 1a3728d790f..d6e8cf176d5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Reactive_ConsumerControl.h
  *
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_ConsumerControl.h"
+#include "orbsvcs/Event/EC_ConsumerControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +30,8 @@
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 
 class TAO_EC_Reactive_ConsumerControl;
@@ -142,8 +144,10 @@ private:
   TAO_EC_ConsumerControl *control_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Reactive_ConsumerControl.i"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
index 08e2174e57d..d365ca2ae4d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Ping_Consumer::TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control)
   :  control_ (control)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index ee376503697..eb7b1bd5b7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "EC_Reactive_Dispatching.h"
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 
 ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
   : TAO_EC_Dispatching ()
 {
@@ -39,3 +41,5 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
 {
   proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index d5c3f56873d..0ef3be3bedb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Reactive_Dispatching.h
  *
@@ -17,14 +18,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Dispatching.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Reactive_Dispatching
  *
@@ -55,6 +58,8 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index cdb3dc88a4d..10cdcd05bdb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "EC_SupplierAdmin.h"
-#include "EC_Reactive_SupplierControl.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h" // @@ MSVC 6 bug
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h" // @@ MSVC 6 bug
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
@@ -12,11 +12,13 @@
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_SupplierControl.i"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Reactive_SupplierControl::
      TAO_EC_Reactive_SupplierControl (const ACE_Time_Value &rate,
                                       const ACE_Time_Value &timeout,
@@ -260,3 +262,5 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index cf0fdbc0a88..141ddf9668c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Reactive_SupplierControl.h
  *
@@ -17,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_SupplierControl.h"
+#include "orbsvcs/Event/EC_SupplierControl.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
@@ -30,6 +31,8 @@
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 
 class TAO_EC_Reactive_SupplierControl;
@@ -152,8 +155,10 @@ private:
   TAO_EC_SupplierControl *control_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Reactive_SupplierControl.i"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
index 0bd62d884aa..3ffaf226464 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
@@ -1,8 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Ping_Supplier::TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control)
   :  control_ (control)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 984ca0f7a7d..fbdfb022768 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "EC_Reactive_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
 #include "ace/Reactor.h"
 
 ACE_RCSID (Event,
            EC_Reactive_Timeout_Generator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Reactive_Timeout_Generator::
       TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor)
  : reactor_ (reactor)
@@ -50,3 +52,5 @@ TAO_EC_Reactive_Timeout_Generator::cancel_timer (
 
   return this->reactor_->cancel_timer (id, &vp);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index 454596f6ef7..8ab4d18da31 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Reactive_Timeout_Generator.h
  *
@@ -17,12 +18,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Timeout_Generator.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Reactive_Timeout_Generator
  *
@@ -60,6 +63,8 @@ private:
   TAO_EC_Timeout_Adapter event_handler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 47abbb9b9ed..66c4afcc9ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "EC_Sched_Factory.h"
-#include "EC_Priority_Dispatching.h"
-#include "EC_Priority_Scheduling.h"
-#include "EC_Sched_Filter_Builder.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Sched_Factory.h"
+#include "orbsvcs/Event/EC_Priority_Dispatching.h"
+#include "orbsvcs/Event/EC_Priority_Scheduling.h"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
@@ -12,11 +12,13 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Factory.i"
+#include "orbsvcs/Event/EC_Sched_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Sched_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void)
 {
 }
@@ -210,6 +212,8 @@ TAO_EC_Sched_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base* ec)
   return this->TAO_EC_Sched_Factory::create_scheduling_strategy (ec);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_EC_Sched_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
index 14901aba015..b7b82d791fc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Sched_Factory.h
  *
@@ -16,13 +16,15 @@
 #define TAO_EC_SCHED_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Sched_Factory
@@ -56,8 +58,10 @@ public:
 private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Sched_Factory.i"
+#include "orbsvcs/Event/EC_Sched_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_Sched_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
index f3b79f082a5..84cbe2d4a4d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void)
   :  TAO_EC_Default_Factory ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 514d483c9ce..3eb8e03e214 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "EC_Sched_Filter.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Sched_Filter.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Sched_Filter::
     TAO_EC_Sched_Filter (const char* name,
                          RtecScheduler::handle_t rt_info,
@@ -277,3 +279,5 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
 
   this->rt_info_computed_ = 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index af1d172d130..5645a6eac92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_Sched_Filter.h
  *
@@ -16,16 +16,18 @@
 #define TAO_EC_SCHED_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Sched_Filter
  *
@@ -85,10 +87,8 @@ public:
                              ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter
-                              (const TAO_EC_Sched_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter& operator=
-                              (const TAO_EC_Sched_Filter&))
+  TAO_EC_Sched_Filter (const TAO_EC_Sched_Filter&);
+  TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -123,5 +123,7 @@ private:
   RtecScheduler::Info_Type_t info_type_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_SCHED_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 2070df1c0d0..95ef9e1886e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,21 +1,24 @@
 // $Id$
 
-#include "EC_Sched_Filter.h"
+#include "orbsvcs/Event/EC_Sched_Filter.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "EC_Sched_Filter_Builder.h"
-#include "EC_Type_Filter.h"
-#include "EC_Conjunction_Filter.h"
-#include "EC_Disjunction_Filter.h"
-#include "EC_Timeout_Filter.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Type_Filter.h"
+#include "orbsvcs/Event/EC_Conjunction_Filter.h"
+#include "orbsvcs/Event/EC_Disjunction_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
 {
 }
@@ -328,3 +331,5 @@ TAO_EC_Sched_Filter_Builder::
     }
   return i - 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 229ee5a8ea5..c649518ecbe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Sched_Filter_Builder.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_SCHED_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Filter_Builder.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "sched_event_export.h"
+#include "orbsvcs/Event/sched_event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
@@ -76,8 +79,10 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Sched_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
index 06ca9c32485..a00dfd725c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Sched_Filter_Builder::
       TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base *ec)
   :  event_channel_ (ec)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index 311f0a86447..76be60d02ec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
-#include "EC_Scheduling_Strategy.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index adc320a3167..08d3a6bf5c2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Scheduling_Strategy.h
  *
@@ -17,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #include "orbsvcs/RtecBaseC.h"
 #include "orbsvcs/RtecEventCommC.h"
@@ -26,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_Supplier_Filter;
@@ -63,6 +66,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SCHEDULING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index f980f81485e..fb555cf3e95 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "EC_SupplierAdmin.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/ESF/ESF_Peer_Workers.h"
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
   : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier> (ec)
 {
@@ -33,3 +35,5 @@ TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 4b55624fcd7..44e9edb8dc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_SupplierAdmin.h
  *
@@ -17,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +26,9 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -63,6 +66,8 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 94c7a2f58b0..7d73bfbaf53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_SupplierControl.h"
+#include "orbsvcs/Event/EC_SupplierControl.h"
 
 ACE_RCSID(Event, EC_SupplierControl, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
 {
 }
@@ -37,3 +39,4 @@ TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *,
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 364a782928f..e4247d13b5b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_SupplierControl.h
  *
@@ -22,7 +23,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_ProxyPushConsumer;
 
@@ -69,6 +74,8 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 9267b8c4bbd..1f424fd0575 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "EC_Supplier_Filter.h"
-#include "EC_ProxySupplier.h"
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Supplier_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
 {
 }
@@ -23,3 +25,5 @@ TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier
   TAO_EC_QOS_Info qos_info = this->event_info_;
   supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 081348d3a3a..898fdc45e02 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Supplier_Filter.h
  *
@@ -20,12 +21,14 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_QOS_Info;
@@ -137,8 +140,10 @@ private:
   const TAO_EC_QOS_Info &event_info_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Supplier_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
index 4e4eae7779b..9b09afb3d74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
                                             const TAO_EC_QOS_Info &event_info)
@@ -7,3 +11,5 @@ TAO_EC_Filter_Worker::TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
      event_info_ (event_info)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index a090b438772..63203a004fa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -1,9 +1,13 @@
 // $Id$
 
-#include "EC_Supplier_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
 
 ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 627c07825c7..d81cab67d94 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Supplier_Filter_Builder.h
  *
@@ -19,12 +20,14 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Supplier_Filter;
 class TAO_EC_ProxyPushConsumer;
 
@@ -55,6 +58,8 @@ public:
       destroy (TAO_EC_Supplier_Filter *filter) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index d90ca8c4678..1b06a04dca7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,9 +1,7 @@
 // $Id$
 
-extern unsigned long EC_TPC_debug_level;
-
-#include "EC_TPC_Dispatching.h"
-#include "EC_Defaults.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching.h"
+#include "orbsvcs/Event/EC_Defaults.h"
 
 #include <ace/Dynamic_Service.h>
 
@@ -13,6 +11,10 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
 #define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+extern unsigned long EC_TPC_debug_level;
+
 TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so)
   : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
   , queue_full_service_object_(so)
@@ -130,7 +132,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry;
+      MAPTYPE::ENTRY* entry = 0;
       if (! iter.next(entry))
         continue;
 
@@ -145,7 +147,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry;
+      MAPTYPE::ENTRY* entry = 0;
       if (! iter.next(entry))
         continue;
 
@@ -192,3 +194,5 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index ca00b72aa90..b8c7ea49cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_TPC_Dispatching.h
  *
@@ -13,14 +14,17 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/Null_Mutex.h"
 
-#include "EC_Dispatching.h"
+#include "orbsvcs/Event/EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_TPC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 
@@ -75,5 +79,7 @@ private:
                                 // @@ check to see how the factory gets released...
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_TPC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
index 5de281b24cd..f70fb6aeac9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
-#include "EC_TPC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
 
-//ACE_RCS_ID(RTEvent, EC_TPC_Dispatching_Task, "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task
 (ACE_Thread_Manager* thr_mgr,
@@ -12,9 +13,10 @@ TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task
 }
 
 int
-TAO_EC_TPC_Dispatching_Task::close (u_long flags)
+TAO_EC_TPC_Dispatching_Task::close (u_long /* flags */)
 {
-  ACE_UNUSED_ARG (flags);
   delete this;
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h
index a952937da1f..ff92abce00b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_TPC_Dispatching_Task.h
  *
@@ -11,12 +12,14 @@
 #define TAO_EC_TPC_DISPATCHING_TASK_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Dispatching_Task.h"
+#include "orbsvcs/Event/EC_Dispatching_Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTEvent_Serv_Export TAO_EC_TPC_Dispatching_Task : public TAO_EC_Dispatching_Task
 {
 public:
@@ -25,5 +28,7 @@ public:
   virtual int close (u_long flags = 0);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_TPC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 5d5120c3898..ab1cc0a43f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "EC_TPC_Factory.h"
+#include "orbsvcs/Event/EC_TPC_Factory.h"
 
-#include "EC_TPC_Dispatching.h"
-#include "EC_TPC_ProxySupplier.h"
-#include "EC_TPC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching.h"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
 
 #include "tao/ORB_Core.h"
 
@@ -14,6 +14,8 @@
 
 ACE_RCSID(Event, EC_TPC_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void)
@@ -106,6 +108,7 @@ TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec)
   return new TAO_EC_TPC_ProxyPushConsumer (ec);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index 414c44d20e9..6b17d72660f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_TPC_Factory.h
  *
@@ -10,12 +10,14 @@
 #define TAO_EC_TPC_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_TPC_Factory
  *
@@ -56,6 +58,8 @@ public:
 
 extern unsigned long EC_TPC_debug_level;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_EC_TPC_Factory)
 ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_TPC_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index c3abe25b30a..6a7cc347cb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "EC_TPC_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
 
 ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
 
-#include "EC_Event_Channel_Base.h"
-#include "EC_TPC_Dispatching.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 extern unsigned long EC_TPC_debug_level;
 
@@ -49,3 +51,5 @@ TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (
   BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index a098c3f8c4e..9fb7ff1dc0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_TPC_ProxyConsumer.h
  *
@@ -12,12 +13,14 @@
 #define TAO_EC_TPC_PROXYCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Default_ProxyConsumer.h"
+#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Dispatching;
 class TAO_EC_TPC_Dispatching;
 
@@ -40,6 +43,8 @@ private:
   TAO_EC_TPC_Dispatching* tpc_dispatching ();
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index b431002f2bb..6ead39a342e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "EC_TPC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_TPC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
 
-#include "EC_Event_Channel_Base.h"
-#include "EC_TPC_Dispatching.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_TPC_Dispatching.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 extern unsigned long EC_TPC_debug_level;
 
@@ -71,3 +73,4 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   tpcdispatcher->add_consumer (push_consumer ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 0bb31a1698f..345b17c0619 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 /**
  *  @file   EC_TPC_ProxySupplier.h
  *
@@ -12,12 +12,14 @@
 #define TAO_EC_TPC_PROXYSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Default_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Dispatching;
 class TAO_EC_TPC_Dispatching;
 
@@ -51,8 +53,10 @@ private:
   TAO_EC_TPC_Dispatching* tpc_dispatching ();
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_TPC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
index 7120a4017f2..6a31a5fc0d1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 extern unsigned long EC_TPC_debug_level;
 
 ACE_INLINE
@@ -10,3 +14,4 @@ TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index e4e812f95b9..3b479983a13 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "EC_Timeout_Filter.h"
-#include "EC_Timeout_Generator.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Timeout_Filter.i"
+#include "orbsvcs/Event/EC_Timeout_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event, 
            EC_Timeout_Filter, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter (
       TAO_EC_Event_Channel_Base *event_channel,
       TAO_EC_ProxyPushSupplier *supplier,
@@ -165,3 +167,5 @@ TAO_EC_Timeout_Filter::add_dependencies (
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 8e1bf7b45ac..0658f0b0b46 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Timeout_Filter.h
  *
@@ -17,13 +18,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -82,10 +85,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter
-                              (const TAO_EC_Timeout_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter& operator=
-                              (const TAO_EC_Timeout_Filter&))
+  TAO_EC_Timeout_Filter (const TAO_EC_Timeout_Filter&);
+  TAO_EC_Timeout_Filter& operator= (const TAO_EC_Timeout_Filter&);
 
 private:
   /// The event channel.
@@ -108,8 +109,10 @@ private:
   long id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Timeout_Filter.i"
+#include "orbsvcs/Event/EC_Timeout_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
index f47bb605f57..a6e30773801 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const TAO_EC_QOS_Info&
 TAO_EC_Timeout_Filter::qos_info (void) const
 {
@@ -11,3 +15,5 @@ TAO_EC_Timeout_Filter::type (void) const
 {
   return this->type_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index caa5d55a189..23d098ceba6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "EC_Timeout_Generator.h"
-#include "EC_Timeout_Filter.h"
+#include "orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Timeout_Generator.i"
+#include "orbsvcs/Event/EC_Timeout_Generator.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event, 
            EC_Timeout_Generator, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void)
 {
 }
@@ -55,3 +57,5 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 52eb6031054..44a6642de69 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Timeout_Generator.h
  *
@@ -22,9 +23,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+#include "orbsvcs/Event/EC_Timeout_Filter.h"
 
-#include "EC_Timeout_Filter.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_EC_QOS_Info;
 
@@ -87,8 +90,10 @@ private:
                               const void *act);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EC_Timeout_Generator.i"
+#include "orbsvcs/Event/EC_Timeout_Generator.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
index e5024c3fb1d..aba1263d609 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
@@ -1,6 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 3cf2b87baf0..c5d3dc1b72c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_Event_Channel_Base.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_ProxySupplier.h"
-#include "EC_QOS_Info.h"
-#include "EC_Scheduling_Strategy.h"
-#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug
+#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
 ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Trivial_Supplier_Filter::
     TAO_EC_Trivial_Supplier_Filter (TAO_EC_Event_Channel_Base* ec)
   :  event_channel_ (ec)
@@ -106,3 +108,5 @@ TAO_EC_Trivial_Supplier_Filter_Builder::destroy (
     TAO_EC_Supplier_Filter*)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 054905e1a49..617bd87f6d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Trivial_Supplier_Filter.h
  *
@@ -17,15 +18,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "EC_Supplier_Filter.h"
-#include "EC_Supplier_Filter_Builder.h"
+#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
 
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier_Set;
 
@@ -99,6 +102,8 @@ private:
   TAO_EC_Trivial_Supplier_Filter filter_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index ef39e461f86..d52f1d869aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "EC_Type_Filter.h"
+#include "orbsvcs/Event/EC_Type_Filter.h"
 
 ACE_RCSID(Event, EC_Type_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
   : header_ (header)
 {
@@ -145,3 +147,4 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index ca52d200834..12a0660bf72 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Type_Filter.h
  *
@@ -16,13 +17,15 @@
 #define TAO_EC_TYPE_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "EC_Filter.h"
-#include /**/ "event_serv_export.h"
+#include "orbsvcs/Event/EC_Filter.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EC_Type_Filter
  *
@@ -59,10 +62,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter
-                              (const TAO_EC_Type_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter& operator=
-                              (const TAO_EC_Type_Filter&))
+  TAO_EC_Type_Filter (const TAO_EC_Type_Filter&);
+  TAO_EC_Type_Filter& operator= (const TAO_EC_Type_Filter&);
 
   /// Filter an EventSet that contains more than one event.
   int filter_set (const RtecEventComm::EventSet& event,
@@ -74,5 +75,7 @@ private:
   RtecEventComm::EventHeader header_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 37374a6f760..eba83581c8d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Event,
            EC_UDP_Admin, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port)
   : port_ (port)
 {
@@ -19,8 +21,10 @@ void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
                                     RtecUDPAdmin::UDP_Addr_out addr
                                     ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
   addr.port = this->port_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 0ce13cc24ad..7e5ccff9920 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_UDP_Admin.h
  *
@@ -17,7 +18,9 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include /**/ "event_serv_export.h"
+#include /**/ "orbsvcs/Event/event_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_Simple_AddrServer
@@ -51,5 +54,7 @@ private:
   CORBA::UShort port_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_UDP_ADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index d430e70b5f7..6a5e6836feb 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -25,6 +25,8 @@
 
 #include "orbsvcs/Time_Utilities.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // = Predefined event types.  All application defined types should be
 // relative to ACE_ES_EVENT_UNDEFINED.
 const long ACE_ES_EVENT_ANY = 0;
@@ -75,6 +77,8 @@ const u_long ACE_Scheduler_MAX_SUB_PRIORITY =
 const u_long ACE_Scheduler_MIN_SUB_PRIORITY =
       ACE_Message_Block::MB_NORMAL;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_ES_CONSTANTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 3d45c411eaf..4c66ec5087d 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (orbsvcs,
            Event_Utilities, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ConsumerQOS_Factory::
     ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer)
   : designator_set_ (0),
@@ -203,7 +205,7 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q
 
   for (u_int i = 0; i < qos.publications.length (); ++i)
     {
-      char buf[128];
+      char buf[128] = { 0 };
       ACE_OS::sprintf (buf, " publications[%d]", i);
       event_debug (buf, qos.publications[i].event);
       ACE_DEBUG ((LM_DEBUG,
@@ -215,3 +217,5 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q
   ACE_DEBUG ((LM_DEBUG, "}\n"));
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index 9bc493d5ea3..01be03b7517 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,10 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-#include "Event/event_export.h"
+#include "orbsvcs/Event/event_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 
 typedef void (*TAO_EC_Event_Initializer) (RtecEventComm::Event&);
 
@@ -242,6 +245,7 @@ private:
   TAO_EC_Event_Initializer event_initializer_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/Event_Utilities.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
index 0c2bcc74875..20c09b0a0fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
@@ -1,6 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source,
@@ -146,3 +148,5 @@ ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (voi
 {
   return qos_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 226721c3de6..8254fb8f2de 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
@@ -30,6 +30,7 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup
 }
 
 project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors {
+  avoids      += ace_for_tao      // Requires ace/UUID
   sharedname   = TAO_FT_ClientORB
   dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL
   tagchecks   += FT_ClientORB
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 7ea57b8282e..0b6911d2473 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba {
+project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_FaultTolerance
   idlflags    += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 11daa44e90d..03d6f4a56b6 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -1,10 +1,8 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "FT_ClientORBInitializer.h"
-#include "FT_ClientPolicyFactory.h"
-#include "FT_ClientRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
@@ -13,13 +11,14 @@ ACE_RCSID (FaultTolerance,
            FT_ClientORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -112,3 +111,5 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index d5fd561e3ad..c0383c99cbc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -30,10 +30,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// FT ORB initializer.
-class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ClientORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -60,6 +62,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 5a1b5dd4e2d..852e1c2c97b 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -1,9 +1,7 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "FT_ClientPolicyFactory.h"
-#include "FT_ClientPolicy_i.h"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
@@ -11,6 +9,7 @@ ACE_RCSID (FaultTolerance,
            FT_ClientPolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
@@ -31,3 +30,5 @@ TAO_FT_ClientPolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 6d05145d5fc..7ee620338b9 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -31,12 +31,14 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ClientORB_Export TAO_FT_ClientPolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_ClientPolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -47,6 +49,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 2acb4be7939..b53265cbfa5 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -1,5 +1,5 @@
 //$Id$
-#include "FT_ClientPolicy_i.h"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
 
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
@@ -7,11 +7,13 @@
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
-#include "FT_ClientPolicy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -188,3 +190,4 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 02e9ac09308..a1bbf81174e 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_ClientPolicy_i.h
@@ -22,7 +23,9 @@
 #endif /* _MSC_VER */
 
 #include "tao/LocalObject.h"
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_FT_Request_Duration_Policy
@@ -39,7 +42,7 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy
+class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -92,7 +95,7 @@ private:
  * If this  policy is set, it enables the client ORB to send
  * heartbeats to the server ORB over the open connections.
  */
-class TAO_FT_ClientORB_Export TAO_FT_Heart_Beat_Policy
+class TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -147,12 +150,14 @@ private:
   TimeBase::TimeT heartbeat_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-#include "FT_ClientPolicy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 7b63b76de72..637356ff8ec 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
     const TimeBase::TimeT &duration
@@ -11,9 +16,9 @@ ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
     const TAO_FT_Request_Duration_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+    CORBA::Policy (),
+    CORBA::LocalObject (),
     FT::RequestDurationPolicy (),
     TAO_Local_RefCounted_Object (),
     request_duration_ (rhs.request_duration_)
@@ -36,9 +41,9 @@ ACE_INLINE
 TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
     const TAO_FT_Heart_Beat_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+    CORBA::Policy (),
+    CORBA::LocalObject (),
     FT::HeartbeatPolicy (),
     TAO_Local_RefCounted_Object (),
     heartbeat_ (rhs.heartbeat_),
@@ -47,4 +52,4 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
 {
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index a1a47f277b6..ad331580af6 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -1,23 +1,27 @@
 // $Id$
 
-#include "FT_ClientRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
+#include "tao/PI/ClientRequestInfo.h"
 
 #include "ace/UUID.h"
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Lock.h"
 #include "ace/Synch_Traits.h"
-#include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID (FaultTolerance,
            FT_ORBInitializer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void)
@@ -43,11 +47,6 @@ namespace TAO
     delete this->lock_;
   }
 
-  FT_TSS *
-  FT_ClientRequest_Interceptor::tss_resources (void)
-  {
-    return ACE_TSS_GET (&this->tss_,FT_TSS);
-  }
   char *
   FT_ClientRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -104,17 +103,66 @@ namespace TAO
     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    this->tss_resources ()->clean_flag_ = true;
   }
 
   void
   FT_ClientRequest_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
+    TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri);
+
+    if (!tao_ri)
+      {
+        ACE_THROW (CORBA::INTERNAL ());
+      }
+
+    TimeBase::TimeT expires = tao_ri->tao_ft_expiration_time ();
 
+    if (!expires)
+      {
+        // Not an FT request
+        return;
+      }
+
+    PortableInterceptor::ReplyStatus status = -1;
+
+    ACE_TRY
+    {
+       status = ri->reply_status(ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+    ACE_CATCHANY
+    {
+       // No reply status => Not a location forward.
+       return;
+    }
+    ACE_ENDTRY;
+
+    if (status ==  PortableInterceptor::LOCATION_FORWARD)
+      {
+        // We are in an FT request and a location forward has been received.
+
+        if (expires < TAO_FT_Service_Callbacks::now ())
+          {
+            // The request has already expired...
+
+            if (TAO_debug_level > 3)
+              {
+                ACE_DEBUG ((LM_DEBUG,
+                        "TAO_FT (%P|%t): FT_ClientRequest_Interceptor::receive_other - LOCATION_FORWARD received after request expiration.\n"));
+              }
+
+            // The spec says throw a SYSTEM_EXCEPTION, but doesn't specify which one.
+            // I think a TRANSIENT is the most suitable.
+            ACE_THROW (CORBA::TRANSIENT (
+              CORBA::SystemException::_tao_minor_code (
+              TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
+              errno),
+              CORBA::COMPLETED_NO));
+          }
+      }
   }
 
   void
@@ -274,7 +322,6 @@ namespace TAO
       IOP::ServiceContext sc;
       sc.context_id = IOP::FT_REQUEST;
 
-
       CORBA::Policy_var policy =
         ri->get_request_policy (FT::REQUEST_DURATION_POLICY
         ACE_ENV_ARG_PARAMETER);
@@ -283,33 +330,34 @@ namespace TAO
       FT::FTRequestServiceContext ftrsc;
       ftrsc.client_id =
         CORBA::string_dup (this->uuid_->to_string ()->c_str ());
-      ftrsc.expiration_time =
-        this->request_expiration_time (policy.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      FT_TSS *tss =
-        this->tss_resources ();
 
-      if (tss->clean_flag_)
-      {
-        ACE_GUARD  (ACE_Lock,
-          guard,
-          *this->lock_);
+      TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri);
 
-        ftrsc.retention_id = ++this->retention_id_;
+      if (!tao_ri)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
 
-      //  ACE_DEBUG ((LM_DEBUG,
-      //    ACE_TEXT ("TAO_FT (%P|%t) - Retention id [%d]\n"),
-      //    ftrsc.retention_id));
-        tss->retention_id_ = ftrsc.retention_id;
-        tss->clean_flag_ = false;
-      }
+      if (tao_ri->tao_ft_expiration_time ())
+        {
+          ftrsc.retention_id = tao_ri->tao_ft_retention_id ();
+          ftrsc.expiration_time = tao_ri->tao_ft_expiration_time ();
+        }
       else
-      {
-        ftrsc.retention_id =
-          tss->retention_id_;
-      }
+        {
+          ACE_GUARD  (ACE_Lock,
+                      guard,
+                      *this->lock_);
+
+          ftrsc.retention_id = ++this->retention_id_;
+          ftrsc.expiration_time =
+              this->request_expiration_time (policy.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          tao_ri->tao_ft_retention_id (ftrsc.retention_id);
+          tao_ri->tao_ft_expiration_time (ftrsc.expiration_time);
+        }
 
       TAO_OutputCDR ocdr;
       if (!(ocdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
@@ -361,7 +409,7 @@ namespace TAO
       {
         p =  FT::RequestDurationPolicy::_narrow (policy
                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        ACE_CHECK_RETURN (0);
       }
 
     TimeBase::TimeT t = 0;
@@ -384,16 +432,10 @@ namespace TAO
       }
 
     // Calculaton of the expiration time
-
-    // Grab the localtime on the machine where this is running
-    ACE_Time_Value time_val = ACE_OS::gettimeofday ();
-
-    TimeBase::TimeT sec_part  = time_val.sec () * 10000000;
-    TimeBase::TimeT usec_part = time_val.usec ()* 10;
-
-    // Now we have the total time
-    t += (sec_part + usec_part);
+    t += TAO_FT_Service_Callbacks::now ();
 
     return t;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 8f82b1f8089..c4115555085 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file     FT_ClientRequest_Interceptor.h
@@ -12,7 +13,7 @@
 #define TAO_FT_CLIENT_REQUEST_INTERCEPTOR_H
 #include /**/ "ace/pre.h"
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,11 +32,14 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_Utils
 {
   class UUID;
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -63,7 +67,7 @@ namespace TAO
    *
    *  @@TODO
    */
-  class TAO_FT_ClientORB_Export FT_ClientRequest_Interceptor
+  class FT_ClientRequest_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
       public virtual TAO_Local_RefCounted_Object
   {
@@ -71,8 +75,6 @@ namespace TAO
 
     FT_ClientRequest_Interceptor (void);
 
-    ~FT_ClientRequest_Interceptor (void);
-
     /// Canonical name of the interceptor.
     virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -104,6 +106,10 @@ namespace TAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
+  protected:
+
+    ~FT_ClientRequest_Interceptor (void);
+
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri
@@ -118,8 +124,6 @@ namespace TAO
                                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    FT_TSS *tss_resources (void);
-
   private:
 
     /// Name of the interceptor
@@ -128,16 +132,16 @@ namespace TAO
     /// UUID for this client
     ACE_Utils::UUID *uuid_;
 
-    /// TSS data
-    ACE_TSS_TYPE (FT_TSS) tss_;
-
-  /// @@ Need a resource factory for this too
+    /// @@ Need a resource factory for this too
     ACE_Lock *lock_;
 
     /// Retention id generated by the client
     CORBA::Long retention_id_;
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 4dc19d2f66a..7adfd628330 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -1,7 +1,7 @@
-#include "FT_ClientService_Activate.h"
-#include "FT_Service_Callbacks.h"
-#include "FT_ClientORBInitializer.h"
-#include "FT_Endpoint_Selector_Factory.h"
+#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -11,6 +11,8 @@ ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void)
 {
 }
@@ -67,6 +69,8 @@ TAO_FT_ClientService_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT_ClientORB,TAO_FT_ClientService_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_ClientService_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index feb04749ae6..c6b8c863e6f 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_ClientService_Activate.h
@@ -14,7 +16,7 @@
 #define TAO_FT_CLIENTACTIVATE_H
 #include /**/ "ace/pre.h"
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +25,8 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -55,14 +59,15 @@ public:
 
   /// Used to force the initialization.
   static int Initializer (void);
-
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate)
-ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate)
-
 static int
 TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate)
+ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate)
+
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_CLIENTACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index bd37bc897c2..280b95cab98 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "FT_Endpoint_Selector_Factory.h"
-#include "FT_Invocation_Endpoint_Selectors.h"
+#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
+#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 
@@ -10,16 +10,16 @@ ACE_RCSID (FaultTolerance,
            FT_Endpoint_Selector_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void)
-  :ft_endpoint_selector_ (0)
+  : ft_endpoint_selector_ (0)
 {
 }
 
 TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 {
-  if (this->ft_endpoint_selector_)
-    delete this->ft_endpoint_selector_;
+  delete this->ft_endpoint_selector_;
 }
 
 
@@ -47,6 +47,8 @@ TAO_FT_Endpoint_Selector_Factory::get_selector (
   return this->ft_endpoint_selector_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_Endpoint_Selector_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index dd7e9c57751..d2a6462b4e0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,7 +7,6 @@
  *  $Id$
  *
  *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *
  */
 //=============================================================================
 #ifndef TAO_FT_ENDPOINT_SELECTOR_FACTORY_H
@@ -15,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +26,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FT_Invocation_Endpoint_Selector;
 /**
  * @class TAO_FT_Endpoint_Selector_Factory
@@ -64,6 +65,8 @@ private:
   TAO_SYNCH_MUTEX mutex_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //extern TAO_FT_ClientORB_Export ACE_Static_Svc_Descriptor ace_svc_desc_TAO_FT_Endpoint_Selector_Factory;
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory)
 ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_Endpoint_Selector_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index ddadd6e6cca..413bce96aaf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -1,4 +1,4 @@
-#include "FT_IOGR_Property.h"
+#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -16,9 +16,10 @@ ACE_RCSID (FaultTolerance,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "FT_IOGR_Property.inl"
+# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
@@ -423,3 +424,5 @@ TAO_FT_IOGR_Property::remove_primary_tag (
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index b98dc52a200..cc888e28e31 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -26,13 +26,15 @@
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/IOPC.h"
-#include "FT_ORB_Utils_export.h"
+#include "orbsvcs/FaultTolerance/FT_ORB_Utils_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 /**
@@ -131,13 +133,14 @@ private:
   FT::TagFTGroupTaggedComponent *ft_group_tagged_component_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "FT_IOGR_Property.inl"
+# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i
deleted file mode 100644
index 43e3c57df8d..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-ACE_INLINE
-TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
-    FT::TagFTGroupTaggedComponent &ft_group)
-  :ft_group_tagged_component_ (&ft_group)
-{
-}
-
-ACE_INLINE
-TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void)
-  :ft_group_tagged_component_ (0)
-{
-}
-
-ACE_INLINE
-TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void)
-{
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_FT_IOGR_Property::reset_tagged_components (
-    FT::TagFTGroupTaggedComponent &ft_group)
-{
-  this->ft_group_tagged_component_ =
-    &ft_group;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
index 43e3c57df8d..5e3a8417714 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
     FT::TagFTGroupTaggedComponent &ft_group)
@@ -29,3 +31,5 @@ TAO_FT_IOGR_Property::reset_tagged_components (
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 4545579404e..3243d7ea5fd 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "FT_Invocation_Endpoint_Selectors.h"
+#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/Stub.h"
@@ -15,6 +15,8 @@ ACE_RCSID (FaultTolerance,
            FT_Invocation_Endpoint_Selectors,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void)
   : TAO_Default_Endpoint_Selector ()
 {
@@ -229,3 +231,5 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
 
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 0b737f36a92..ae3a473ea34 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +29,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/ORB_Constants.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 /**
@@ -87,6 +89,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 1060bbacfba..3e2a732dd62 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -2,10 +2,10 @@
 //
 // $Id$
 
-#include "FT_ORBInitializer.h"
-#include "FT_PolicyFactory.h"
-#include "FT_ClientRequest_Interceptor.h"
-#include "FT_ServerRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 
@@ -13,13 +13,15 @@
 ACE_RCSID (FaultTolerance,
            FT_ORBInitializer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -39,9 +41,6 @@ TAO_FT_ORBInitializer::post_init (
   this->register_client_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
-
-
 }
 
 void
@@ -137,3 +136,5 @@ TAO_FT_ORBInitializer::register_client_request_interceptors (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index e6ca50c065c..8493a77ddac 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -22,7 +22,7 @@
 
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
-#include "fault_tol_export.h"
+#include "orbsvcs/FaultTolerance/fault_tol_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -31,10 +31,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class TAO_FT_Export TAO_FT_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -66,6 +68,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 2072fe7bbd1..74758912067 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -2,16 +2,15 @@
 //
 // $Id$
 
-#include "FT_PolicyFactory.h"
-#include "FT_Policy_i.h"
+#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_Policy_i.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
 
 ACE_RCSID (FaultTolerance, FT_PolicyFactory, "$Id$")
 
-
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
@@ -35,3 +34,5 @@ TAO_FT_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index 486581ad26a..bb71603c077 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -33,12 +33,14 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "fault_tol_export.h"
+#include "orbsvcs/FaultTolerance/fault_tol_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_Export TAO_FT_PolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_PolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -49,6 +51,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 09f2735fd09..c24aa921d17 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -1,14 +1,16 @@
 //$Id$
-#include "FT_Policy_i.h"
+#include "orbsvcs/FaultTolerance/FT_Policy_i.h"
 
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-#include "FT_Policy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_Policy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -253,3 +255,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 36458e3e3bf..8fd5f3a1fc8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_Policy_i.h
@@ -21,6 +22,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_FT_Request_Duration_Policy
  *
@@ -36,7 +40,7 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Export TAO_FT_Request_Duration_Policy
+class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -198,12 +202,14 @@ private:
   CORBA::Boolean heartbeat_enabled_value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-#include "FT_Policy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_Policy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
deleted file mode 100644
index 4caf44a0faf..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
+++ /dev/null
@@ -1,70 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
-    const TimeBase::TimeT &duration
-  )
-  : request_duration_ (duration)
-{
-}
-
-ACE_INLINE
-TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
-    const TAO_FT_Request_Duration_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::RequestDurationPolicy (),
-    TAO_Local_RefCounted_Object (),
-    request_duration_ (rhs.request_duration_)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
-    const CORBA::Boolean heartbeat,
-    const TimeBase::TimeT &interval,
-    const TimeBase::TimeT &timeout
-  )
-  : heartbeat_ (heartbeat),
-    heartbeat_interval_ (interval),
-    heartbeat_timeout_ (timeout)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
-    const TAO_FT_Heart_Beat_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::HeartbeatPolicy (),
-    TAO_Local_RefCounted_Object (),
-    heartbeat_ (rhs.heartbeat_),
-    heartbeat_interval_ (rhs.heartbeat_interval_),
-    heartbeat_timeout_ (rhs.heartbeat_timeout_)
-{
-}
-
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
-    const CORBA::Boolean heartbeat
-  )
-  : heartbeat_enabled_value_ (heartbeat)
-{
-}
-
-ACE_INLINE
-TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
-    const TAO_FT_Heart_Beat_Enabled_Policy &rhs
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
-    FT::HeartbeatEnabledPolicy (),
-    TAO_Local_RefCounted_Object (),
-    heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
index 579d6c3467b..3aa80e1b0a1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::TimeT &duration)
   :ACE_NESTED_CLASS (CORBA, Object) ()
@@ -71,3 +76,5 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 117b2e95280..77b99f3035a 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -1,10 +1,8 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "FT_ServerORBInitializer.h"
-#include "FT_ServerPolicyFactory.h"
-#include "FT_ServerRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
 #include "tao/ORB_Constants.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
@@ -13,13 +11,15 @@
 ACE_RCSID (FaultTolerance,
            FT_ServerORBInitializer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_FT_ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
 }
 
 void
@@ -35,7 +35,6 @@ TAO_FT_ServerORBInitializer::post_init (
   this->register_server_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
 }
 
 void
@@ -98,3 +97,4 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors (
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 6f88080afd2..0e2711ed429 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "FT_ServerORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -30,10 +30,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class TAO_FT_ServerORB_Export TAO_FT_ServerORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ServerORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -61,6 +63,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e6269801482..e1c8fcea33b 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "FT_ServerPolicyFactory.h"
-#include "FT_ServerPolicy_i.h"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (FaultTolerance,
            FT_ServerPolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -28,3 +30,5 @@ TAO_FT_ServerPolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index fc1cb12b093..2ae22af9f48 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -31,12 +31,14 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "FT_ServerORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ServerORB_Export TAO_FT_ServerPolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_ServerPolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -47,11 +49,12 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FT_POLICY_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 9a12142d0e0..25e079b7692 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -1,16 +1,18 @@
 //$Id$
-#include "FT_ServerPolicy_i.h"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
-#include "FT_ServerPolicy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -71,9 +73,10 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
   return copy;
 }
 
-
 void
 TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 4a69e2db662..6019cdc8f70 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   FT_ServerPolicy_i.h
@@ -21,9 +22,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "FT_ServerORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_FT_Heart_Beat_Enabled_Policy
@@ -34,9 +36,9 @@
  * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of
  * the IOR that it exposes
  */
-class TAO_FT_ServerORB_Export TAO_FT_Heart_Beat_Enabled_Policy
-  : public FT::HeartbeatEnabledPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_FT_Heart_Beat_Enabled_Policy
+  : public FT::HeartbeatEnabledPolicy
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -79,12 +81,14 @@ private:
   CORBA::Boolean heartbeat_enabled_value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-#include "FT_ServerPolicy_i.inl"
+#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index d8dd25b8384..21dfaed4af7 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
     const CORBA::Boolean heartbeat
@@ -12,11 +16,13 @@ ACE_INLINE
 TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
     const TAO_FT_Heart_Beat_Enabled_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-    ACE_NESTED_CLASS (CORBA, Policy) (),
-    ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+    CORBA::Policy (),
+    CORBA::LocalObject (),
     FT::HeartbeatEnabledPolicy (),
     TAO_Local_RefCounted_Object (),
     heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index f082c613dd9..64866cc36ed 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,6 +1,4 @@
-// -*- C++ -*-
-
-#include "FT_ServerRequest_Interceptor.h"
+#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
 #include "tao/IOP_IORC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/DynamicC.h"
@@ -14,6 +12,8 @@ ACE_RCSID (FaultTolerance,
            FT_ServerRequest_Interceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void)
@@ -28,7 +28,6 @@ namespace TAO
   {
   }
 
-
   char *
   FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -207,16 +206,17 @@ namespace TAO
       ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    if (param->length () > 2 ||
-        param->length () == 0)
+    // this is only for checking the tao_update_object_group operation
+    // which accepts three parameters, i.e.,an iogr as a string,
+    // a version object and a boolean.
+    if (param->length () != 3 )
       ACE_THROW (CORBA::TRANSIENT ());
 
-
     const char *str = 0;
 
-
     (*param)[0].argument >>= str;
     (*param)[1].argument >>= this->object_group_ref_version_;
+    (*param)[2].argument >>= CORBA::Any::to_boolean(this->is_primary_);
 
     CORBA::String_var obj (str);
 
@@ -233,3 +233,5 @@ namespace TAO
       ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ());
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 230267e209a..78c188d597d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -15,7 +15,7 @@
 #ifndef TAO_FT_SERVER_REQUEST_INTERCEPTOR_H
 #define TAO_FT_SERVER_REQUEST_INTERCEPTOR_H
 
-#include "FT_ServerORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace IOP
 {
   struct ServiceContext;
@@ -45,9 +47,9 @@ namespace TAO
    *
    *
    */
-  class TAO_FT_ServerORB_Export FT_ServerRequest_Interceptor
-    : public virtual PortableInterceptor::ServerRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+  class FT_ServerRequest_Interceptor
+    : public virtual PortableInterceptor::ServerRequestInterceptor
+    , public virtual TAO_Local_RefCounted_Object
   {
   public:
 
@@ -109,8 +111,6 @@ namespace TAO
       ACE_THROW_SPEC ((CORBA::SystemException,
            PortableInterceptor::ForwardRequest));
 
-    bool is_primary (void);
-
     void update_iogr (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL)
@@ -120,7 +120,7 @@ namespace TAO
 
     CORBA::ULong object_group_ref_version_;
 
-    bool is_primary_;
+    CORBA::Boolean is_primary_;
 
     CORBA::Object_var iogr_;
 
@@ -128,6 +128,9 @@ namespace TAO
   };
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index 3047cec219d..be4448486c8 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -1,5 +1,5 @@
-#include "FT_ServerService_Activate.h"
-#include "FT_ServerORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,6 +9,8 @@ ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void)
 {
 }
@@ -17,8 +19,6 @@ TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void)
 {
 }
 
-
-
 int
 TAO_FT_ServerService_Activate::Initializer (void)
 {
@@ -43,6 +43,8 @@ TAO_FT_ServerService_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT_ServerORB,TAO_FT_ServerService_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_ServerService_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index 3f85518f093..7c57a64a2c2 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_ServerService_Activate.h
@@ -14,7 +16,7 @@
 #define TAO_FT_SERVERACTIVATE_H
 #include /**/ "ace/pre.h"
 
-#include "FT_ServerORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +25,8 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -33,7 +37,8 @@ class TAO_Service_Callbacks;
  * to the ORB.
  *
  */
-class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object
+class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate
+: public ACE_Service_Object
 {
 
 public:
@@ -48,11 +53,13 @@ public:
 
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate)
-ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate)
-
 static int
 TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate)
+ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate)
+
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_ACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index fea264b08f1..9c0e8ed16a2 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -1,7 +1,7 @@
-#include "FT_Service_Activate.h"
-#include "FT_Service_Callbacks.h"
-#include "FT_ORBInitializer.h"
-#include "FT_Endpoint_Selector_Factory.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
+#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
+#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "ace/Dynamic_Service.h"
@@ -10,6 +10,8 @@ ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$")
 
 static bool initialized = false;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Service_Activate::TAO_FT_Service_Activate (void)
 {
 }
@@ -18,7 +20,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))
@@ -66,6 +67,8 @@ TAO_FT_Service_Activate::Initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_FT,TAO_FT_Service_Activate)
 
 ACE_STATIC_SVC_DEFINE (TAO_FT_Service_Activate,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
index 6ddf858f628..f6d261f2246 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
@@ -13,7 +13,7 @@
 #ifndef TAO_FT_ACTIVATE_H
 #define TAO_FT_ACTIVATE_H
 
-#include "FT_ClientService_Activate.h"
-#include "FT_ServerService_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
 
 #endif /*TAO_FT_ACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 6ec1eaafe2a..0739fe2f51d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -1,7 +1,9 @@
 // $Id$
 
-#include "FT_Service_Callbacks.h"
-#include "FT_ClientPolicy_i.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
+#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
+
+#include "ace/OS_NS_sys_time.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -16,15 +18,14 @@ ACE_RCSID (FaultTolerance,
            FT_Service_Callbacks,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (
     TAO_ORB_Core *orb_core)
 
   : orb_core_ (orb_core),
-    profile_lock_ (0),
-    primary_failed_ (0),
-    secondary_set_ (0),
-    group_component_ (),
-    group_component_flag_ (0)
+    profile_lock_ (0)
 {
   this->profile_lock_ =
     this->orb_core_->client_factory ()->create_profile_lock ();
@@ -167,6 +168,71 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p,
   return (CORBA::ULong) group_component.object_group_id % max;
 }
 
+CORBA::Boolean
+TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr obj,
+                                                          const TAO_Service_Context &service_context) const
+{
+  // do as much as possible outside of lock
+  IOP::ServiceContext sc;
+  sc.context_id = IOP::FT_GROUP_VERSION;
+
+  if (service_context.get_context (sc) == 0)
+      return false; /* false */
+
+  IOP::TaggedComponent tc;
+  tc.tag = IOP::TAG_FT_GROUP;
+
+  const TAO_Stub * stub = obj->_stubobj ();
+  // check for forward_profiles, branching to speed up operation on base_profiles
+  if (stub->forward_profiles ())
+    {
+      // set lock, as forward_profiles might be deleted concurrently
+      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+                                guard,
+                                *stub->profile_lock (),
+                                0));
+
+      // even now, the forward profiles might have been deleted in the meanwhile
+      const TAO_MProfile &mprofile = stub->forward_profiles()
+          ? *(stub->forward_profiles())
+          : stub->base_profiles();
+
+      if (mprofile.profile_count() == 0)
+        // releasing lock
+        return false;
+
+      // assuming group-attributes are set for all profiles, check
+      // only the first profile
+      const TAO_Tagged_Components &tagged_components =
+              mprofile.get_profile (0)->tagged_components ();
+
+      if (tagged_components.get_component (tc) == 0)
+        // releasing lock
+        return false; /* false */
+
+      return true; /* true */
+
+      // releasing lock
+    }
+  else /* operate on constant basic_profiles */
+    {
+      const TAO_MProfile &mprofile = stub->base_profiles();
+
+      if (mprofile.profile_count() == 0)
+        return false;
+
+      // assuming group-attributes are set for all profiles, check only the first profile
+      const TAO_Tagged_Components &tagged_components =
+              mprofile.get_profile (0)->tagged_components ();
+
+      if (tagged_components.get_component (tc) == 0)
+        return false; /* false */
+
+      return true; /* true */
+    }
+}
+
+
 TAO::Invocation_Status
 TAO_FT_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &context_list,
@@ -223,8 +289,19 @@ TAO_FT_Service_Callbacks::restart_policy_check (
         {
           if (service_list[i].context_id == IOP::FT_REQUEST)
             {
-              // Success
-              return 1;
+              // This would be a heck of a lot easier if we had the invocation
+              // here rather than just the contexts, but lemons -> lemonade I guess.
+              TAO_InputCDR cdr (reinterpret_cast <const char*> (service_list[i].context_data.get_buffer ()),
+                                service_list[i].context_data.length ());
+              CORBA::Boolean byte_order;
+              if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
+                return 0;
+              cdr.reset_byte_order (static_cast <int> (byte_order));
+              FT::FTRequestServiceContext ftsrc;
+              if ((cdr >> ftsrc) == 0)
+                return 0;
+
+              return (ftsrc.expiration_time > now ());
             }
         }
     }
@@ -232,3 +309,17 @@ TAO_FT_Service_Callbacks::restart_policy_check (
   // Failure
   return 0;
 }
+
+TimeBase::TimeT
+TAO_FT_Service_Callbacks::now (void)
+{
+  // Grab the localtime on the machine where this is running
+  ACE_Time_Value time_val = ACE_OS::gettimeofday ();
+  TimeBase::TimeT sec_part  = ((TimeBase::TimeT)time_val.sec ()) * 10000000;
+  TimeBase::TimeT usec_part = ((TimeBase::TimeT)time_val.usec ()) * 10;
+
+  // Add the offset to convert from posix time.
+  return (sec_part + usec_part + ACE_UINT64_LITERAL (0x1B21DD213814000));
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index c3a83efba4c..b8f0b2a4d1f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file FT_Service_Callbacks.h
@@ -14,7 +16,7 @@
 #define TAO_FT_CALLBACKS_H
 #include /**/ "ace/pre.h"
 
-#include "FT_ClientORB_export.h"
+#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +25,8 @@
 #include "tao/Service_Callbacks.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 class TAO_MProfile;
 class TAO_ORB_Core;
@@ -57,6 +61,13 @@ public:
   virtual CORBA::ULong hash_ft (TAO_Profile *p,
                                 CORBA::ULong m);
 
+
+  /// Verify condition for  permanent forward is given,
+  /// both parameters must provide group attributes.
+  virtual CORBA::Boolean is_permanent_forward_condition
+  (const CORBA::Object_ptr obj,
+   const TAO_Service_Context &service_context) const;
+
   /// Check whether we need to raise an exception or go for a
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_comm_failure (
@@ -71,6 +82,8 @@ public:
       TAO_Profile *profile
       ACE_ENV_ARG_DECL);
 
+  static TimeBase::TimeT now (void);
+
 private:
 
   /// Check whether the right flags are available so that we can issue a
@@ -85,28 +98,10 @@ private:
   /// Mutex to protect access to the profile that gets passed along
   /// @@ Lock needs to be removed...
   ACE_Lock* profile_lock_;
-
-  /**
-   * A flag that indicates that the primary has already failed. So any
-   * more calls to select_profile () should not reset the profile
-   * pointer to the primary.
-   */
-  CORBA::Boolean primary_failed_;
-
-  /**
-   * A flag to indicate that a secondary has been selected for
-   * invocation. We do this only once in the cycle. When we get there
-   * again we dont select a primary again and again.
-   */
-  CORBA::Boolean secondary_set_;
-
-  /// FT group component in the IOGR
-  FT::TagFTGroupTaggedComponent group_component_;
-
-  /// A flag to indicate whether we have extracted the
-  /// <group_component> before.
-  CORBA::Boolean group_component_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /*TAO_FT_CALLBACKS_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 027eb1dd61c..b510974a944 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults {
   sharedname   = TAO_FtRtEvent
-
-  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
+  idlflags    += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
-  tagchecks    = FtRtEvent
+  tagchecks   += FtRtEvent
 
   IDL_Files {
     idlflags += -GC
@@ -40,7 +39,7 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimu
 project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, core {
   sharedname   = TAO_FTRT_ClientORB
   dynamicflags = TAO_FTRT_BUILD_DLL
-  tagchecks    = FTRT_ClientORB
+  tagchecks   += FTRT_ClientORB
 
   IDL_Files {
   }
@@ -61,7 +60,7 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, core {
 project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging {
   sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
-  tagchecks    = FTRT_EventChannel
+  tagchecks   += FTRT_EventChannel
   after       += FTORB_Utils
 
   IDL_Files {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index 8f207a5b953..e4ee1d43f28 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
-#include "FTRT_ClientORB_Initializer.h"
-#include "FTRT_ClientORB_Interceptor.h"
+#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
+#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
 
 ACE_RCSID (ClientORB,
            FTRT_ClientORB_Initializer,
            "$Id$")
 
-#include "tao/debug.h"
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth)
-: client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) )
+  : client_interceptor_ ( new FTRT_ClientORB_Interceptor(transaction_depth) )
 {
 }
 
@@ -33,4 +32,4 @@ FTRT_ClientORB_Initializer::post_init (
                                         ACE_ENV_ARG_PARAMETER);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
index 3667ea1db7b..7bfd0791eb1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -31,10 +31,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class FTRT_ClientORB_Initializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class FTRT_ClientORB_Initializer
+  : public virtual PortableInterceptor::ORBInitializer,
+    public virtual TAO_Local_RefCounted_Object
 {
 public:
   /// Priority mapping types
@@ -51,6 +53,8 @@ private:
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 14cd1f6dbec..1cc5d2fd2de 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "FTRT_ClientORB_Interceptor.h"
+#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
 #include "tao/MProfile.h"
 #include "tao/Stub.h"
 #include "tao/CDR.h"
@@ -10,6 +10,8 @@ ACE_RCSID (ClientORB,
            FTRT_ClientORB_Interceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace FTRT {
   const unsigned FT_TRANSACTION_DEPTH = 30;
   const unsigned FT_FORWARD = 32;
@@ -45,7 +47,6 @@ FTRT_ClientORB_Interceptor::send_poll (
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Do Nothing
 }
 
 void
@@ -150,10 +151,11 @@ FTRT_ClientORB_Interceptor::receive_other (
 
 void
 FTRT_ClientORB_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
+    PortableInterceptor::ClientRequestInfo_ptr /* ri */
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-    ACE_UNUSED_ARG(ri);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index 98cbc108bbe..81512859796 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -33,6 +33,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FTRT_ClientORB_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
@@ -79,6 +80,8 @@ private:
   CORBA::Long transaction_depth_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 62b1e5828ea..febf8fbe014 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "FTRT_ClientORB_Loader.h"
+#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-#include "FTRT_ClientORB_Initializer.h"
+#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -14,6 +14,8 @@ ACE_RCSID (ClientORB,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRT {
   FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void)
   {
@@ -82,16 +84,24 @@ namespace TAO_FTRT {
 
       return 0;
   }
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-  ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader)
-  ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader,
-    ACE_TEXT ("FTRT_ClientORB_Service"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (FTRT_ClientORB_Loader),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRT,
+  FTRT_ClientORB_Loader,
+  TAO_FTRT::FTRT_ClientORB_Loader)
+
+ACE_STATIC_SVC_DEFINE (
+  FTRT_ClientORB_Loader,
+  ACE_TEXT ("FTRT_ClientORB_Service"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (FTRT_ClientORB_Loader),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
+
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index 9e64f2d288c..e66f632a2e8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ftrt_clientorb_export.h"
+#include "orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h"
 
 #include "tao/orbconf.h"
 
@@ -26,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 namespace TAO_FTRT {
@@ -43,12 +45,13 @@ namespace TAO_FTRT {
     virtual int init (int argc,
       ACE_TCHAR* []);
   };
+}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader)
-  ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader)
-  ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader)
+ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader)
+ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader)
 
 #include /**/ "ace/post.h"
 #endif //FTRT_CLIENTORB_LOADER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 9e6b48d3f06..8dc99941883 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "AMI_Primary_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
 #include "ace/Synch_T.h"
-#include "GroupInfoPublisher.h"
-#include "Request_Context_Repository.h"
-#include "create_persistent_poa.h"
-#include "Update_Manager.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "ObjectGroupManagerHandler.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
 #include "tao/Utils/Implicit_Deactivator.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/ScopeGuard.h"
@@ -17,8 +17,11 @@ ACE_RCSID (EventChannel,
            AMI_Primary_Replication_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 AMI_Primary_Replication_Strategy::AMI_Primary_Replication_Strategy(bool mt)
-: handler_(this), mutex_(mt ? new ACE_SYNCH_RW_MUTEX : 0)
+  : handler_(this),
+    mutex_ (mt ? new ACE_SYNCH_RW_MUTEX : 0)
 {
 }
 
@@ -104,8 +107,8 @@ AMI_Primary_Replication_Strategy::replicate_request(
   ACE_ENV_ARG_DECL)
 {
    ACE_Auto_Event event;
-   Update_Manager* manager;
-   bool success;
+   Update_Manager* manager = 0;
+   bool success = false;
 
     FTRT::TransactionDepth transaction_depth =
       Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -157,7 +160,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
    if (!success) { // replication failed, transaction depth too high
      for (size_t i =0; i < num_backups; ++i)  {
        ACE_TRY_EX(block2) {
-         (backups[i].in()->*rollback)(oid ACE_ENV_ARG_PARAMETER);
+         (backups[i]->*rollback)(oid ACE_ENV_ARG_PARAMETER);
          ACE_TRY_CHECK_EX(block2);
        }
        ACE_CATCHALL {
@@ -198,10 +201,10 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
 
   for (unsigned i = 0; i < num_backups; ++i) {
     ACE_TRY {
-      backups[i].in()->sendc_add_member(handler.in(),
-                                        info,
-                                        object_group_ref_version
-                                        ACE_ENV_ARG_PARAMETER);
+      backups[i]->sendc_add_member(handler.in(),
+                                   info,
+                                   object_group_ref_version
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHALL {
@@ -215,3 +218,5 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
 
   event.wait();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 07caec84c43..24d44799505 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -13,8 +13,8 @@
 #ifndef AMI_PRIMARY_REPLICATION_STRATEGY_H
 #define AMI_PRIMARY_REPLICATION_STRATEGY_H
 
-#include "UpdateableHandler.h"
-#include "Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class  AMI_Primary_Replication_Strategy.
  *
@@ -60,4 +62,6 @@ private:
   ACE_SYNCH_RW_MUTEX* mutex_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // AMI_PRIMARY_REPLICATION_STRATEGY_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index c9dee536cf3..b4073479419 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "AMI_Replication_Strategy.h"
-#include "AMI_Primary_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -10,9 +10,10 @@ ACE_RCSID (EventChannel,
            AMI_Replication_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt)
-: mt_(mt)
+  : mt_(mt)
 {
 }
 
@@ -66,3 +67,5 @@ int  AMI_Replication_Strategy::release (void)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 28e38c23db7..8c25f96305d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -13,7 +13,7 @@
 #ifndef AMI_REPLICATION_STRATEGY_H
 #define AMI_REPLICATION_STRATEGY_H
 
-#include "Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,14 +23,14 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Task.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class  AMI_Replication_Strategy.
  *
  * @brief Used by backup replicas when AMI calls are used for replicating requests.
  */
-
-class AMI_Replication_Strategy: public Replication_Strategy
+class AMI_Replication_Strategy : public Replication_Strategy
 {
 public:
   /**
@@ -54,5 +54,6 @@ private:
   bool mt_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 4068101a592..319840261ec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "Basic_Replication_Strategy.h"
-#include "GroupInfoPublisher.h"
-#include "FTEC_Event_Channel.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "../Utils/Log.h"
 
 ACE_RCSID (EventChannel,
            Basic_Replication_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// The mutex has to be recursive; otherwise, if the second replicate_request() is
 /// called while the first replicate_request() is waiting for reply, we will get
 /// a deadlock.
 Basic_Replication_Strategy::Basic_Replication_Strategy(bool mt)
-: sequence_num_(0)
-, mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0)
+  : sequence_num_(0)
+  , mutex_(mt ? new ACE_SYNCH_RECURSIVE_MUTEX : 0)
 {
 }
 
@@ -152,3 +154,5 @@ int  Basic_Replication_Strategy::release (void)
 {
   return mutex_ ? mutex_->release() : 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index d75089fbaf0..50b18dd95ee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -11,13 +11,15 @@
 //=============================================================================
 #ifndef BASIC_REPLICATION_STRATEGY_H
 #define BASIC_REPLICATION_STRATEGY_H
-#include "Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class  Basic_Replication_Strategy
  *
@@ -52,4 +54,6 @@ private:
   ACE_SYNCH_RECURSIVE_MUTEX* mutex_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 1ac36e19653..a14d2c327eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_PEER_STREAM_1>
 int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 {
@@ -91,3 +93,4 @@ int ConnectionDetectHandler<ACE_PEER_STREAM_2>::close (u_long )
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
index 27e5bd379ee..37a7597914d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
@@ -19,6 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_PEER_STREAM_1>
 class ConnectionAcceptHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH>
 {
@@ -36,7 +40,11 @@ private:
    ACE_Reactor* reactor_;
 };
 
-#include "FTEC_Group_Manager.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <ACE_PEER_STREAM_1>
 class ConnectionDetectHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH>
@@ -53,8 +61,10 @@ private:
   TAO_FTEC_Fault_Listener* listener_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ConnectionHandler_T.cpp"
+#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
index ae9cc29a74f..264de9de473 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Dynamic_Bitset.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
 #include <assert.h>
 #include <algorithm>
 
 #if !defined (__ACE_INLINE__)
-#include "Dynamic_Bitset.inl"
+#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl"
 #endif /* __ACE_INLINE__ */
 
 inline unsigned ceil(unsigned numerator, unsigned denominator)
@@ -13,6 +13,8 @@ inline unsigned ceil(unsigned numerator, unsigned denominator)
   return numerator/denominator+ (numerator%denominator ? 1 : 0);
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Dynamic_Bitset::Dynamic_Bitset(Dynamic_Bitset::size_type size)
   : buffer_size_(ceil(size,BITS_PER_BLOCK))
   , bit_size_(size)
@@ -119,3 +121,5 @@ bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs)
   mask >>= (Dynamic_Bitset::BITS_PER_BLOCK-bit_pos);
   return ((lhs.buffer_[i] ^ rhs.buffer_[i]) & mask ) == 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
index 980edb46fce..c4da90b00af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
@@ -13,12 +13,15 @@
 #define DYNAMIC_BITSET_H
 
 #include "ace/config-all.h"
+
+#include "tao/Versioned_Namespace.h"
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  *
  */
-
 class Dynamic_Bitset
 {
   typedef unsigned block;
@@ -64,8 +67,10 @@ private:
 bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs);
 Dynamic_Bitset operator & (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Dynamic_Bitset.inl"
+#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
index 19bc921fb7d..d9a1168d994 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
@@ -10,6 +10,8 @@
  */
 //=============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 Dynamic_Bitset::~Dynamic_Bitset()
 {
@@ -64,3 +66,4 @@ Dynamic_Bitset::reference Dynamic_Bitset::operator[](Dynamic_Bitset::size_type b
   return Dynamic_Bitset::reference(this, bit);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
index b378fb7d71c..7f567ab80bb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
@@ -1,8 +1,11 @@
 // $Id$
 
-#include "FTEC_Become_Primary_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FTEC_Become_Primary_Listener::~TAO_FTEC_Become_Primary_Listener()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h
index 87f4f8cb889..c2a056e29dc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h
@@ -13,7 +13,11 @@
 #ifndef TAO_FTEC_BECOME_PRIMARY_LISTENER_H
 #define TAO_FTEC_BECOME_PRIMARY_LISTENER_H
 
-#include "ftrtec_export.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
+
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_FTRTEC_Export TAO_FTEC_Become_Primary_Listener
 {
@@ -22,4 +26,6 @@ public:
   virtual void become_primary()=0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // TAO_FTEC_BECOME_PRIMARY_LISTENER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index fa2c3cf0dbd..14ec7a5c533 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -2,14 +2,16 @@
 
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "FTEC_ConsumerAdmin.h"
-#include "FTEC_ProxySupplier.h"
-#include "ProxySupplierStateWorker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
 
 ACE_RCSID (EventChannel,
            TAO_FTEC_ConsumerAdmin,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const FtRtecEventChannelAdmin::OperationType
 TAO_FTEC_ConsumerAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_SUPPLIER;
 
@@ -46,3 +48,4 @@ TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 267162a8b4b..042172fc555 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -18,8 +18,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "FT_ProxyAdmin_T.h"
-#include "ProxySupplierStateWorker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FtRtecEventChannelAdmin {
   struct ConsumerAdminState;
@@ -65,5 +67,7 @@ public:
   void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index aef9a1f62e5..a2e2b7a29cd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -1,29 +1,31 @@
 // $Id$
 
 #include "ace/Dynamic_Service.h"
-#include "FTEC_Event_Channel.h"
-#include "FTEC_Event_Channel_Impl.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
 #include "../Utils/activate_with_id.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/UUID.h"
-#include "Fault_Detector_Loader.h"
-#include "Fault_Detector.h"
-#include "Request_Context_Repository.h"
-#include "Replication_Service.h"
-#include "Identification_Service.h"
-#include "create_persistent_poa.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 
 ACE_RCSID (EventChannel,
            TAO_FTEC_Event_Channel,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb,
                                                PortableServer::POA_var poa)
-:    orb_(orb)
-,    poa_(poa)
-,    ec_impl_(NULL)
+  : orb_(orb)
+  , poa_(poa)
+  , ec_impl_(NULL)
 {
 }
 
@@ -210,7 +212,7 @@ TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr observer
+TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
@@ -221,11 +223,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr obs
   /// throw an exception for the moment
   ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0);
 
-  return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  //return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
+TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
@@ -236,7 +238,7 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
   /// throw an exception for the moment
   ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
 
-  ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  //ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -404,7 +406,7 @@ TAO_FTEC_Event_Channel::resume_push_supplier (
       ))
 {
   ec_impl_->resume_push_supplier(oid
-                       ACE_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -418,7 +420,9 @@ TAO_FTEC_Event_Channel::push (
         , FtRtecEventComm::InvalidObjectID
       ))
 {
-  ec_impl_->push(oid, data
-       ACE_ENV_ARG_PARAMETER);
+  ec_impl_->push(oid,
+                 data
+                 ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index ff7d20f47ff..397aa0af43e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -12,13 +12,15 @@
 #ifndef FTEC_EVENT_CHANNEL_H
 #define FTEC_EVENT_CHANNEL_H
 
-#include "ftrtec_export.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
 #include "orbsvcs/FtRtecEventChannelAdminS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Event_Channel_Impl;
 class TAO_FTEC_Become_Primary_Listener;
 
@@ -177,4 +179,6 @@ private:
   TAO_FTEC_Event_Channel_Impl* ec_impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
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 73c5ff4fce7..0d85bbe8155 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "FTEC_Event_Channel_Impl.h"
-#include "FTEC_Factory.h"
-#include "FTEC_SupplierAdmin.h"
-#include "FTEC_ConsumerAdmin.h"
-#include "FTEC_ProxyConsumer.h"
-#include "FTEC_ProxySupplier.h"
-#include "FtEventServiceInterceptor.h"
-#include "FT_ProxyAdmin_Base.h"
-#include "IOGR_Maker.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FtRtecEventCommC.h"
 
@@ -18,6 +18,8 @@ ACE_RCSID (EventChannel,
            FTEC_Event_Channel_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
                           FtRtecEventChannelAdmin::Operation& op
                           ACE_ENV_ARG_DECL)
@@ -215,7 +217,7 @@ typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec,
                                FtRtecEventChannelAdmin::Operation& op
                                ACE_ENV_ARG_DECL);
 
-Set_update_fun update_table[] = {
+Set_update_fun const update_table[] = {
     &obtain_push_supplier,
     &obtain_push_consumer,
     &disconnect_push_supplier,
@@ -576,3 +578,5 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd
   ACE_ENDTRY;
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 4ddb93d6450..ba6c2e1bc0d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -15,14 +15,16 @@
 #include "ace/Synch_T.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "FTEC_Factory.h"
-#include "FTEC_Group_Manager.h"
-#include "IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_ProxyPushSupplier;
 class TAO_FTEC_ProxyPushConsumer;
 class TAO_FTEC_SupplierAdmin;
@@ -128,4 +130,6 @@ private:
   IOGR_Maker iogr_maker_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index b46188a9458..c0bb7566afa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,16 +1,18 @@
 // $Id$
 #include "orbsvcs/Event/EC_Event_Channel.h"
-#include "FTEC_Event_Channel.h"
-#include "FTEC_Factory.h"
-#include "FTEC_ProxySupplier.h"
-#include "FTEC_ProxyConsumer.h"
-#include "FTEC_SupplierAdmin.h"
-#include "FTEC_ConsumerAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
 
 ACE_RCSID (EventChannel,
            FTEC_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void)
 {
 }
@@ -51,3 +53,4 @@ TAO_FTEC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* p
   delete proxy;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
index d253716dba1..5fd7cb8e131 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -18,6 +18,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory
 {
 public:
@@ -40,5 +43,7 @@ public:
       destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
index a2106a68aa3..c2eb737544e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
@@ -13,6 +13,9 @@
 #ifndef TAO_FTEC_FAULT_LISTENER_H
 #define TAO_FTEC_FAULT_LISTENER_H
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_FTEC_Fault_Listener
 {
@@ -21,4 +24,6 @@ public:
   virtual void connection_closed()=0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 2057cf72ad7..2b92cb3cf38 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "FTEC_Group_Manager.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
 #include "ace/Synch_T.h"
-#include "Replication_Service.h"
-#include "Fault_Detector.h"
-#include "IOGR_Maker.h"
-#include "GroupInfoPublisher.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "../Utils/Log.h"
 #include "tao/CDR.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
@@ -15,6 +15,7 @@ ACE_RCSID (EventChannel,
            TAO_FTEC_Group_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int find_by_location(const FTRT::ManagerInfoList& list,
                 const FTRT::Location & location)
@@ -374,4 +375,4 @@ void TAO_FTEC_Group_Manager::connection_closed()
 
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index f2720fa1393..0d06c156bf5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -14,12 +14,15 @@
 #define TAO_FTEC_GROUP_MANAGER_H
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "FTEC_Fault_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct TAO_FTEC_Group_Manager_Impl;
 
 class TAO_FTEC_Group_Manager : private TAO_FTEC_Fault_Listener
@@ -72,4 +75,6 @@ protected:
   TAO_FTEC_Group_Manager_Impl* impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // TAO_FTEC_GROUP_MANAGER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 884b769ffa0..410377e8a80 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
 
-#include "FTEC_ORBInitializer.h"
-#include "Set_Update_Interceptor.h"
-#include "ForwardCtrlServerInterceptor.h"
-#include "FtEventServiceInterceptor.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
 ACE_RCSID (EventChannel,
            FTEC_ORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 FTEC_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -33,8 +35,9 @@ FTEC_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_ptr ctmp;
 
   ACE_NEW_THROW_EX(ctmp,
-                TAO_Set_Update_Interceptor,
-                CORBA::NO_MEMORY());
+                   TAO_Set_Update_Interceptor,
+                   CORBA::NO_MEMORY());
+  ACE_CHECK;
 
   client_interceptor = ctmp;
 
@@ -61,3 +64,5 @@ FTEC_ORBInitializer::post_init (
   info->add_server_request_interceptor (server_interceptor.in()
                                         ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
index 947ea61cafa..07377cd40e1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class FTEC_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
   , public virtual TAO_Local_RefCounted_Object
@@ -34,5 +36,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* FTEC_ORBINITIALIZER__H_ */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 90f14052e48..3f489f9540f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "FTEC_ProxyConsumer.h"
-#include "Request_Context_Repository.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "../Utils/activate_with_id.h"
 
 ACE_RCSID (EventChannel,
            TAO_FTEC_ProxyPushConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const TAO_FTEC_ProxyPushConsumer::RollbackOperation
   TAO_FTEC_ProxyPushConsumer::rollback_obtain =
     &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer;
@@ -128,3 +130,5 @@ void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyP
                      ACE_ENV_ARG_PARAMETER);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 15bba1e940e..518e4f73eb0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -15,12 +15,14 @@
 #include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
 #include "ace/SString.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_ProxyPushConsumer : public TAO_EC_Default_ProxyPushConsumer
 {
   typedef TAO_EC_Default_ProxyPushConsumer Inherited;
@@ -60,4 +62,6 @@ private:
   FtRtecEventChannelAdmin::ObjectId_var object_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index e400cc7e2eb..62fad4ef9d7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "FTEC_ProxySupplier.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
 #include "../Utils/activate_with_id.h"
-#include "Request_Context_Repository.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 
 ACE_RCSID (EventChannel,
            TAO_FTEC_ProxyPushSupplier,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const TAO_FTEC_ProxyPushSupplier::RollbackOperation
   TAO_FTEC_ProxyPushSupplier::rollback_obtain =
     &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier;
@@ -196,3 +198,5 @@ void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyP
       Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index a1ca15aeaff..34c38f96400 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -15,12 +15,14 @@
 #include "orbsvcs/Event/EC_Default_ProxySupplier.h"
 #include "ace/SString.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_ProxyPushSupplier : public TAO_EC_Default_ProxyPushSupplier
 {
   typedef TAO_EC_Default_ProxyPushSupplier Inherited;
@@ -65,4 +67,6 @@ private:
   FtRtecEventChannelAdmin::ObjectId_var object_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index b67a0fe6a3a..74a666746cc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -2,14 +2,15 @@
 
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "FTEC_SupplierAdmin.h"
-#include "FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
 #include "tao/Stub.h"
 
 ACE_RCSID (EventChannel,
            TAO_FTEC_SupplierAdmin,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const FtRtecEventChannelAdmin::OperationType
 TAO_FTEC_SupplierAdmin::OBTAIN_ID = FtRtecEventChannelAdmin::OBTAIN_PUSH_CONSUMER;
@@ -45,7 +46,4 @@ TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr
   ACE_ENDTRY;
 }
 
-
-
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 9bbdca262ed..814061c0263 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -14,9 +14,9 @@
 #define TAO_FTEC_SUPPLIERADMIN_H
 #include /**/ "ace/pre.h"
 
-#include "FTEC_ProxyConsumer.h"
-#include "FT_ProxyAdmin_T.h"
-#include "ProxyConsumerStateWorker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -25,6 +25,8 @@
 
 #include "orbsvcs/Event/EC_SupplierAdmin.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Event_Channel_Impl;
 
 namespace FtRtecEventChannelAdmin {
@@ -71,5 +73,7 @@ public:
   void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_FTEC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
index d0988b09021..9666d6e5480 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
@@ -3,9 +3,9 @@
 #ifndef FTRTEC_SERVICE_ACTIVATE_H
 #define FTRTEC_SERVICE_ACTIVATE_H
 
-#include "Fault_Detector_Loader.h"
-#include "Identification_Service.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index f833b81b70c..5fb7d08ad06 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "FT_ProxyAdmin_Base.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -10,9 +10,11 @@ ACE_RCSID (EventChannel,
            FT_ProxyAdmin_Base,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 FT_ProxyAdmin_Base::FT_ProxyAdmin_Base(PortableServer::ServantBase* servant,
                            PortableServer::POA_var poa)
-: servant_(servant), poa_(poa)
+  : servant_(servant), poa_(poa)
 {
 }
 
@@ -20,8 +22,9 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base()
 {
 }
 
-void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
-              ACE_ENV_ARG_DECL)
+void
+FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
+                             ACE_ENV_ARG_DECL)
 {
   poa_->activate_object_with_id(
     reinterpret_cast<const PortableServer::ObjectId&> (oid), 
@@ -32,17 +35,18 @@ void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
 }
 
 
-const FtRtecEventComm::ObjectId& FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+const FtRtecEventComm::ObjectId&
+FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
 {
   return object_id_;
 }
 
 
-CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::Object_var
+FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const
 {
-  return  poa_->servant_to_reference(servant_
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->servant_to_reference(servant_
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 21bf1a7b9ca..2c639c0ce6f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -22,6 +22,7 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FT_ProxyAdmin_Base
 {
@@ -46,7 +47,7 @@ protected:
   FtRtecEventComm::ObjectId object_id_;
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 99d1749fa62..00c658cef95 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "IOGR_Maker.h"
-#include "Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "ace/Synch_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::FT_ProxyAdmin(
@@ -139,3 +141,5 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
     ACE_CHECK;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index a0bff3fb0c8..92e2bf0ad6d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -12,14 +12,16 @@
 #ifndef FT_PROXYADMIN_H
 #define FT_PROXYADMIN_H
 
-#include "FT_ProxyAdmin_Base.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
 #include "../Utils/ScopeGuard.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 class FT_ProxyAdmin : public FT_ProxyAdmin_Base
@@ -31,8 +33,7 @@ public:
   FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
               PortableServer::POA_var poa);
 
-  ProxyInterface_ptr
-      obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// this is used for updating the state
   void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op
@@ -44,8 +45,10 @@ private:
   EC_PROXY_ADMIN* admin_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "FT_ProxyAdmin_T.cpp"
+#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index d141db9a2f5..7e225602e4b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
 #include "ace/Reactor.h"
-#include "Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
 #include "ace/Select_Reactor.h"
 
 ACE_RCSID (EventChannel,
            Fault_Detector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Fault_Detector::ReactorTask::ReactorTask()
-: reactor_(new ACE_Select_Reactor, 1)
+  : reactor_(new ACE_Select_Reactor, 1)
 {
 }
 
@@ -69,3 +71,5 @@ int Fault_Detector::parse_conf(int , ACE_TCHAR** )
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
index 10d93e3705d..a10fdf62f8f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Fault_Listener;
 
 class Fault_Detector
@@ -57,4 +59,6 @@ protected:
   TAO_FTEC_Fault_Listener* listener_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif //FAULT_DETECTOR_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 59af4a913d7..56d8c25b846 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Fault_Detector_Loader.h"
-#include "Fault_Detector_T.h"
-#include "FTEC_Fault_Listener.h"
-#include "SCTP_Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
-#include "ConnectionHandler_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h"
 
 #include "ace/Acceptor.h"
 #include "ace/OS_NS_strings.h"
@@ -15,6 +15,8 @@ ACE_RCSID (EventChannel,
            Fault_Detector_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace FTRTEC {
   typedef Fault_Detector_T<
     ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_STREAM> , ACE_SOCK_ACCEPTOR>,
@@ -67,16 +69,22 @@ namespace FTRTEC {
   {
     return detector_.get();
   }
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader)
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Fault_Detector_Loader,
+  FTRTEC::Fault_Detector_Loader)
 
-  ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader,
-    ACE_TEXT ("FTRTEC_Fault_Detector"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Fault_Detector_Loader),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
-}
+ACE_STATIC_SVC_DEFINE (
+  Fault_Detector_Loader,
+  ACE_TEXT ("FTRTEC_Fault_Detector"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Fault_Detector_Loader),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
index 777cb73de7b..dbe29fe82da 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ftrtec_export.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
 
 #include "tao/orbconf.h"
 
@@ -27,6 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class Fault_Detector;
 
@@ -46,12 +47,13 @@ namespace FTRTEC {
   private:
     auto_ptr<Fault_Detector> detector_;
   };
+}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader)
-  ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader)
+ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader)
 
 #include /**/ "ace/post.h"
 #endif //FAULT_DETECTOR_LOADER_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index 168e0ed8006..573a6cb8464 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -4,6 +4,8 @@
 #include "ace/INET_Addr.h"
 #include "ace/os_include/os_netdb.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER>
 Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::Fault_Detector_T()
 {
@@ -65,3 +67,5 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::connect(const FTRT::Lo
 
     return result ;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
index 6c9ed952bce..45be158a522 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
@@ -13,12 +13,14 @@
 #ifndef FAULT_DETECTOR_T_H
 #define FAULT_DETECTOR_T_H
 
-#include "Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACCEPTOR, class CONNECTOR, class DETECTION_HANDLER>
 class Fault_Detector_T : public Fault_Detector
 {
@@ -33,8 +35,10 @@ private:
   virtual int init_acceptor();
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Fault_Detector_T.cpp"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h
index a8bcb0bb35d..e66914b0c29 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h
@@ -17,6 +17,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Fault_Listener
 {
 public:
@@ -24,4 +28,6 @@ public:
   virtual void connection_closed()=0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index dd523803cd6..cb23d1aa537 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ForwardCtrlServerInterceptor.h"
-#include "GroupInfoPublisher.h"
-#include "IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
@@ -17,6 +17,8 @@ ACE_RCSID (EventChannel,
            ForwardCtrlServerInterceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri
                              ACE_ENV_ARG_DECL)
 {
@@ -254,3 +256,5 @@ void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerReques
                        PortableInterceptor::ForwardRequest))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index de0c52f7b14..d53dc682b0e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -19,8 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ForwardCtrlServerInterceptor :
-  public PortableInterceptor::ServerRequestInterceptor
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class ForwardCtrlServerInterceptor
+  : public PortableInterceptor::ServerRequestInterceptor
 {
 public:
   ForwardCtrlServerInterceptor();
@@ -57,4 +59,7 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index eed535d3292..7ff6e8951e4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -2,8 +2,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
-#include "FtEventServiceInterceptor.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "../Utils/Log.h"
 
@@ -11,6 +11,8 @@ ACE_RCSID (EventChannel,
            FtEventServiceInterceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 CachedRequestTable::is_new_request(const ACE_CString& client_id, CORBA::Long retention_id)
 {
@@ -334,3 +336,5 @@ FtEventServiceInterceptor::set_state(const FtRtecEventChannelAdmin::CachedOption
 {
   request_table_.set_state(state);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index eb0e60fa1ea..09a28a81257 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -25,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Event_Channel_Impl;
 typedef FtRtecEventChannelAdmin::CachedResult CachedRequestInfo;
 
@@ -93,6 +95,6 @@ private:
   CachedRequestTable request_table_;
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index ed7ad362aeb..94b7ca5acb7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 #include "../Utils/resolve_init.h"
-#include "IOGR_Maker.h"
-#include "Identification_Service.h"
-#include "FTEC_Become_Primary_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "../Utils/Log.h"
 
 //#include "../Utils/log_obj_endpoints.h"
@@ -14,9 +14,10 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 GroupInfoPublisherBase::GroupInfoPublisherBase()
-: info_(new Info)
+  : info_(new Info)
 {
   info_->primary = false;
 }
@@ -170,3 +171,5 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex> *ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 1e010ee35df..8268bb2dd89 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Become_Primary_Listener;
 
 class GroupInfoPublisherBase
@@ -75,4 +77,7 @@ private:
 };
 
 typedef ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX> GroupInfoPublisher;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index e5390fc7e05..e64501e5e18 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "IOGR_Maker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 #include "tao/Stub.h"
@@ -10,15 +10,16 @@
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "GroupInfoPublisher.h"
+#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 
 ACE_RCSID (EventChannel,
            IOGR_Maker,
            "$Id$")
 
-
 static IOGR_Maker* maker;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 IOGR_Maker::IOGR_Maker()
 {
 }
@@ -51,7 +52,7 @@ IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
   if (list.length() != 1)
     obj = iorm_->merge_iors(list ACE_ENV_ARG_PARAMETER);
   else
-    obj = CORBA::Object::_duplicate(list[0].in());
+    obj = CORBA::Object::_duplicate(list[0]);
   return obj._retn();
 }
 
@@ -66,7 +67,7 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
   ACE_CHECK_RETURN(CORBA::Object::_nil());
 
   FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_);
-  /// the generated IOGR should use a new object_group_ref_version 
+  /// the generated IOGR should use a new object_group_ref_version
   ft_tag_component.object_group_ref_version = object_group_ref_version;
   set_tag_components(obj.in(), list[0], ft_tag_component
                      ACE_ENV_ARG_PARAMETER);
@@ -86,7 +87,7 @@ CORBA::Object_ptr
 IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
                        ACE_ENV_ARG_DECL)
 {
-  /// forge an IOGR whose object_key is the same with that of \a obj. 
+  /// forge an IOGR whose object_key is the same with that of \a obj.
   CORBA::Object_var merged;
   // make a copy of the object
   FtRtecEventChannelAdmin::EventChannel_var successor
@@ -265,3 +266,4 @@ IOGR_Maker::set_tag_components(
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index 29b0e512316..cbc933a61c8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class IOGR_Maker
 {
 public:
@@ -68,4 +70,6 @@ private:
   FT::TagFTGroupTaggedComponent ft_tag_component_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 26536108070..78fe674a026 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Identification_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
 #include "../Utils/UUID.h"
 
 ACE_RCSID (EventChannel,
@@ -8,6 +8,8 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace FTRTEC {
 
   namespace {
@@ -79,14 +81,20 @@ namespace FTRTEC {
   {
     return name_;
   }
-
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service)
-
-  ACE_STATIC_SVC_DEFINE (Identification_Service,
-    ACE_TEXT ("FTRTEC_Identification"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Identification_Service),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Identification_Service,
+  FTRTEC::Identification_Service)
+
+ACE_STATIC_SVC_DEFINE (
+  Identification_Service,
+  ACE_TEXT ("FTRTEC_Identification"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Identification_Service),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index 0fb06766859..a932c92b789 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -17,12 +17,14 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/FTRTC.h"
 #include "orbsvcs/FtRtecEventCommC.h"
-#include "ftrtec_export.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace FTRTEC
 {
   class Identification_Service : public ACE_Service_Object
@@ -44,11 +46,12 @@ namespace FTRTEC
     FtRtecEventComm::ObjectId object_id_;
     CosNaming::Name name_;
   };
+}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service)
-  ACE_STATIC_SVC_REQUIRE(Identification_Service)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service)
+ACE_STATIC_SVC_REQUIRE(Identification_Service)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service)
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index e6ce13f51ce..fbb8c4166a4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -1,5 +1,7 @@
 // $Id$
-#include "ObjectGroupManagerHandler.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ObjectGroupManagerHandler::ObjectGroupManagerHandler(
   ACE_Auto_Event& evt, int num_backups)
@@ -7,7 +9,7 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler(
 {
 }
 
-void 
+void
 ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
                                   const FTRT::Location & the_location
                                   ACE_ENV_ARG_DECL_NOT_USED)
@@ -17,12 +19,11 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
   ACE_UNUSED_ARG(the_location);
 }
 
-void 
-ObjectGroupManagerHandler::start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+void
+ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *
                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(excep_holder);
 }
 
 void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -31,15 +32,14 @@ void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 
-void 
-ObjectGroupManagerHandler::create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+void
+ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *
                                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(excep_holder);
 }
 
-void 
+void
 ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -47,25 +47,25 @@ ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     evt_.signal();
 }
 
-void 
-ObjectGroupManagerHandler::add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+void
+ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *
                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(excep_holder);
   this->add_member(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
+void
 ObjectGroupManagerHandler::set_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void 
-ObjectGroupManagerHandler::set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+void
+ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *
                                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(excep_holder);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8b5b14f8acd..8a3938a6c65 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -15,7 +15,10 @@
 #include "orbsvcs/FTRT_GroupManagerS.h"
 #include "ace/Auto_Event.h"
 
-class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class ObjectGroupManagerHandler
+  : public POA_FTRT::AMI_ObjectGroupManagerHandler
 {
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
@@ -24,28 +27,28 @@ public:
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void create_group (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder
                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void add_member (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_state (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
+  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
@@ -53,4 +56,6 @@ private:
   ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 5b2f764197e..8708b6a33d7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ProxyConsumerStateWorker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
@@ -8,9 +8,11 @@ ACE_RCSID (EventChannel,
            ProxyConsumerStateWorker,
            "$Id$")
 
-ProxyConsumerStateWorker::ProxyConsumerStateWorker
-  (FtRtecEventChannelAdmin::ProxyConsumerStates& states)
-: consumerStates_(states)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ProxyConsumerStateWorker::ProxyConsumerStateWorker (
+  FtRtecEventChannelAdmin::ProxyConsumerStates& states)
+  : consumerStates_(states)
 {
 }
 
@@ -25,9 +27,10 @@ void ProxyConsumerStateWorker::set_size(size_t size)
 }
 
 void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object
-            ACE_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_FTEC_ProxyPushConsumer* proxy =
     static_cast<TAO_FTEC_ProxyPushConsumer*> (object);
   proxy->get_state(consumerStates_[index_++]);
-}
+
+TAO_END_VERSIONED_NAMESPACE_DECL}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
index 772fd16538e..1610cd90ef1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -15,13 +15,16 @@
 
 #include "orbsvcs/Event/EC_SupplierAdmin.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "FTEC_ProxyConsumer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ProxyConsumerStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class ProxyConsumerStateWorker
+  : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 {
 public:
   ProxyConsumerStateWorker(FtRtecEventChannelAdmin::ProxyConsumerStates& states);
@@ -29,10 +32,12 @@ public:
 
   virtual void set_size(size_t size);
   virtual void work(TAO_EC_ProxyPushConsumer* object
-            ACE_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 private:
   int index_;
   FtRtecEventChannelAdmin::ProxyConsumerStates& consumerStates_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 45b6c1f47d9..5618c2d373f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "ProxySupplierStateWorker.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 
@@ -9,10 +9,11 @@ ACE_RCSID (EventChannel,
            ProxySupplierStateWorker,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ProxySupplierStateWorker::ProxySupplierStateWorker
-  (FtRtecEventChannelAdmin::ProxySupplierStates& states)
-: supplierStates_(states)
+ProxySupplierStateWorker::ProxySupplierStateWorker (
+  FtRtecEventChannelAdmin::ProxySupplierStates& states)
+  : supplierStates_(states)
 {
 }
 
@@ -33,3 +34,5 @@ void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object
     static_cast<TAO_FTEC_ProxyPushSupplier*> (object);
   proxy->get_state(supplierStates_[index_++]);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
index aa6681719de..cf9516d100d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -15,13 +15,16 @@
 
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "FTEC_ProxySupplier.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ProxySupplierStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class ProxySupplierStateWorker
+  : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 {
 public:
   ProxySupplierStateWorker(FtRtecEventChannelAdmin::ProxySupplierStates& states);
@@ -35,4 +38,6 @@ private:
   FtRtecEventChannelAdmin::ProxySupplierStates& supplierStates_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 12ced50ab33..dacd04341ae 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Replication_Service.h"
-#include "AMI_Replication_Strategy.h"
-#include "Basic_Replication_Strategy.h"
-#include "FTEC_ORBInitializer.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h"
 #include "../Utils/Log.h"
 
 #include "tao/ORBInitializer_Registry.h"
@@ -17,6 +17,7 @@ ACE_RCSID (EventChannel,
            Replication_Service,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRTEC
 {
@@ -190,14 +191,20 @@ namespace FTRTEC
   int Replication_Service::threads() const {
     return FTRTEC::threads;
   }
-
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service)
-
-  ACE_STATIC_SVC_DEFINE (Replication_Service,
-    ACE_TEXT ("FTRTEC_Replication"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (Replication_Service),
-    ACE_Service_Type::DELETE_THIS
-    | ACE_Service_Type::DELETE_OBJ,
-    0)
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_FTRTEC,
+  Replication_Service,
+  FTRTEC::Replication_Service)
+
+ACE_STATIC_SVC_DEFINE (
+  Replication_Service,
+  ACE_TEXT ("FTRTEC_Replication"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (Replication_Service),
+  ACE_Service_Type::DELETE_THIS
+  | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index f01503ef6ae..e1deca2f103 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -14,15 +14,17 @@
 #define REPLCATION_SERVICE_H
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "FTEC_Become_Primary_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "tao/PortableInterceptorC.h"
 #include "ace/Service_Object.h"
-#include "ftrtec_export.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace FTRTEC
 {
   class TAO_FTRTEC_Export Replication_Service
@@ -72,11 +74,12 @@ namespace FTRTEC
 
     int threads() const;
   };
+}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service)
-  ACE_STATIC_SVC_REQUIRE(Replication_Service)
-  ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service)
-}
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service)
+ACE_STATIC_SVC_REQUIRE(Replication_Service)
+ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service)
 
 #endif //REPLCATION_SERVICE_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index 0501abb2557..f7cc5f524f7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "Replication_Strategy.h"
-#include "FTEC_Event_Channel.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
 
 ACE_RCSID (EventChannel,
            Replication_Strategy,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Replication_Strategy::Replication_Strategy()
 {
 }
@@ -29,3 +31,5 @@ Replication_Strategy::make_primary_strategy()
 {
   return this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 3e44f33ff41..8c661ee0ee8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTEC {
   struct ManagerInfo;
@@ -61,7 +62,7 @@ public:
                           CORBA::ULong object_group_ref_version
                           ACE_ENV_ARG_DECL)=0;
 
-    virtual Replication_Strategy* make_primary_strategy();
+  virtual Replication_Strategy* make_primary_strategy();
 
   virtual int  acquire_read (void)=0;
   virtual int  acquire_write (void)=0;
@@ -69,5 +70,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index e9c77862e25..f04af729152 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/UUID.h"
 
@@ -24,6 +24,7 @@ CORBA::ORB_ptr orb;
 ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid;
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
@@ -311,3 +312,5 @@ Request_Context_Repository::get_transaction_depth(
   return result;
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 7267d1346f7..542f58937ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -1,4 +1,4 @@
-// -pe*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FTEC_Event_Channel_Impl;
 
 namespace PortableInterceptor
@@ -109,4 +111,6 @@ public:
     ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /// REQUEST_CONTEXT_REPOSITORY_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index a54588c9423..222d5daa3fb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "SCTP_Fault_Detector.h"
+#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h"
 
 #if (TAO_HAS_SCIOP == 1)
 
-#include "FTEC_Fault_Listener.h"
+#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
 
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -20,6 +20,7 @@ ACE_RCSID (EventChannel,
 #define SOL_SCTP 132
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 SCTP_Connector::SCTP_Connector()
 : heart_beat_(0)
@@ -90,4 +91,6 @@ int SCTP_Fault_Detector::parse_conf(int argc, char** argv)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_SCTP == 1 */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h
index 9411df45f4c..4e9978afa7f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h
@@ -26,8 +26,8 @@
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 #include "ace/SOCK_SEQPACK_Connector.h"
 #include "ace/Multihomed_INET_Addr.h"
-#include "ConnectionHandler_T.h"
-#include "Fault_Detector_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,6 +45,7 @@ extern "C" {
 #define SCTP_NODELAY 1
 #endif // SCTP_NODELAY
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Acceptor<ConnectionAcceptHandler<ACE_SOCK_SEQPACK_ASSOCIATION>, ACE_SOCK_SEQPACK_ACCEPTOR>
                       SCTP_ConnectionAcceptHandler;
@@ -78,6 +79,8 @@ private:
     virtual int parse_conf(int argc, char** argv);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP */
 
 #endif /* SCTP_FAULT_DETECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index f94e75c0152..58e96befd06 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,16 +1,17 @@
 // $Id$
 
 #include "tao/CDR.h"
-#include "Set_Update_Interceptor.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
 #include "orbsvcs/FTRTC.h"
-#include "Request_Context_Repository.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
 
 ACE_RCSID (EventChannel,
            Set_Update_Intercetpor,
            "$Id$")
 
-TAO_Set_Update_Interceptor::
-TAO_Set_Update_Interceptor ()
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor ()
 : myname_ ("TAO_Set_Update_Interceptor")
 {
 }
@@ -140,28 +141,28 @@ TAO_Set_Update_Interceptor::send_request (
 
 void
 TAO_Set_Update_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr ri
+  PortableInterceptor::ClientRequestInfo_ptr
   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(ri);
 }
 
 void
 TAO_Set_Update_Interceptor::receive_other (
-                                       PortableInterceptor::ClientRequestInfo_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
-                                       ACE_THROW_SPEC ((CORBA::SystemException,
-                                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::receive_exception (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-  PortableInterceptor::ForwardRequest))
+                   PortableInterceptor::ForwardRequest))
 {
-  ACE_UNUSED_ARG(ri);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index 835ecab637c..c164c238281 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -27,6 +27,8 @@
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Set_Update_Interceptor
  *
@@ -79,4 +81,6 @@ private:
   const char *myname_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // TAO_SET_UPDATE_INTERCEPTOR_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index 033b41ec2b5..c207baefd16 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -1,22 +1,23 @@
 // $Id$
 
-#include "Update_Manager.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
 
 ACE_RCSID (EventChannel,
            Update_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Update_Manager::Update_Manager(ACE_Auto_Event& evt,
                                int num_backups,
                                int transaction_depth,
                                bool& success)
-: evt_(evt)
-, replied_(num_backups)
-, suicide_condition_(num_backups)
-, num_backups_(num_backups)
-, transaction_level_(transaction_depth)
-, success_(success)
+  : evt_(evt)
+  , replied_(num_backups)
+  , suicide_condition_(num_backups)
+  , num_backups_(num_backups)
+  , transaction_level_(transaction_depth)
+  , success_(success)
 {
   suicide_condition_.flip();
   signal_condition_.resize(transaction_depth, true);
@@ -56,3 +57,5 @@ void Update_Manager::handle_exception(int id)
   if (replied_ == suicide_condition_)
     delete this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
index fa64b9e9f10..caacd63fffe 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
@@ -14,14 +14,15 @@
 #define UPDATE_MANAGER_H
 
 #include "ace/Synch_T.h"
-#include "Dynamic_Bitset.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-typedef Dynamic_Bitset bit_vector;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+typedef Dynamic_Bitset bit_vector;
 
 class Update_Manager
 {
@@ -46,4 +47,6 @@ private:
   ACE_SYNCH_MUTEX mutex_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 77d43f4d398..fadeb16f0e0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "UpdateableHandler.h"
-#include "Update_Manager.h"
-#include "AMI_Primary_Replication_Strategy.h"
+#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
+#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
+#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
 #include "../Utils/resolve_init.h"
 
 ACE_RCSID (EventChannel,
@@ -10,8 +10,10 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy)
-: strategy_(strategy)
+  : strategy_(strategy)
 {
 }
 
@@ -75,7 +77,7 @@ void UpdateableHandler::set_update (
   dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER);
 }
 void UpdateableHandler::set_update_excep (
-  FTRT::AMI_UpdateableExceptionHolder * excep_holder
+  ::Messaging::ExceptionHolder * excep_holder
   ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -84,7 +86,7 @@ void UpdateableHandler::set_update_excep (
 {
   ACE_DEBUG((LM_DEBUG, "Received Exception from"));
   ACE_TRY {
-    excep_holder->raise_set_update();
+    excep_holder->raise_exception();
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY {
@@ -94,3 +96,5 @@ void UpdateableHandler::set_update_excep (
 
   dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index a1ba493264f..48f621bc1ef 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -18,6 +18,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class AMI_Primary_Replication_Strategy;
 class Update_Manager;
 
@@ -42,7 +44,7 @@ public:
         CORBA::SystemException
         ));
     virtual void set_update_excep (
-        FTRT::AMI_UpdateableExceptionHolder * excep_holder
+        ::Messaging::ExceptionHolder * excep_holder
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -52,4 +54,7 @@ public:
 private:
   AMI_Primary_Replication_Strategy* strategy_;
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index da10c2f1a7f..fe5cd5dbe41 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "create_persistent_poa.h"
+#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
 
 ACE_RCSID (EventChannel,
            create_persistent_poa,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
@@ -43,3 +45,5 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
index 875ac649b29..cd41683ea61 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
@@ -17,9 +17,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
                                               CORBA::PolicyList& policy_list
                                               ACE_ENV_ARG_DECL);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
index d190e31c099..8b902ac91bc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
@@ -13,10 +13,11 @@ ACE_RCSID (EventChannel,
 /// file conflicts with the use of auto_ptr in the
 /// VxWorks5.5.1_PPC85XX_DIAB platform.
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void replace_key(char* ior, char* end_ior,
-                const TAO::ObjectKey& oldkey,
-                const TAO::ObjectKey& newkey)
+                 const TAO::ObjectKey& oldkey,
+                 const TAO::ObjectKey& newkey)
 {
   size_t keylen = oldkey.length();
   ACE_ASSERT(keylen == newkey.length());
@@ -30,3 +31,5 @@ void replace_key(char* ior, char* end_ior,
     pos+= keylen;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 85c5b6174b3..afbbaf3d051 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -1,7 +1,7 @@
-#include "FTEC_Gateway.h"
-#include "activate_with_id.h"
-#include "UUID.h"
-#include "resolve_init.h"
+#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/FtRtEvent/Utils/activate_with_id.h"
+#include "orbsvcs/FtRtEvent/Utils/UUID.h"
+#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtecEventCommS.h"
 #include "tao/ORB_Core.h"
 
@@ -10,9 +10,10 @@ ACE_RCSID (Utils,
            "$Id$")
 
 #if !defined(__ACE_INLINE__)
-#include "FTEC_Gateway.inl"
+#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
 class FTEC_Gateway_ConsumerAdmin
@@ -95,7 +96,7 @@ public:
   virtual void push (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
+  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -511,9 +512,12 @@ void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
-void PushConsumerHandler::push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *
+                                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG(excep_holder);
-}
 }
+
+}  // TAO_FTRTEC
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 9cafa79f8f8..3db7660c7ad 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file  FTEC_Gateway.h
@@ -16,6 +17,8 @@
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRTEC
 {
   struct FTEC_Gateway_Impl;
@@ -69,8 +72,10 @@ namespace TAO_FTRTEC
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "FTEC_Gateway.inl"
+#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/  "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index e8175e14573..4a4869aece4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRTEC {
   ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
     FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL)
@@ -8,3 +12,5 @@ namespace TAO_FTRTEC {
     return activate(poa.in() ACE_ENV_ARG_PARAMETER);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index 603e18fab4e..44476a3fc23 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -1,10 +1,12 @@
 //$Id$
-#include "Log.h"
+#include "orbsvcs/FtRtEvent/Utils/Log.h"
 
 #if !defined(__ACE_INLINE__)
-#include "Log.inl"
+#include "orbsvcs/FtRtEvent/Utils/Log.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRTEC {
 
 unsigned int Log::log_level_;
@@ -23,3 +25,5 @@ unsigned int Log::log_level_;
   }
 #endif
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
index 5ca4cfade59..71b95a8a28e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Log.h
@@ -12,10 +13,13 @@
 #define FTRTEC_LOG_H
 
 #include /**/ "ace/pre.h"
-#include "ftrtevent_export.h"
+#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRTEC {
 
   /**
@@ -34,8 +38,10 @@ namespace TAO_FTRTEC {
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "Log.inl"
+#include "orbsvcs/FtRtEvent/Utils/Log.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
index a4875315803..7008345edee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_FTRTEC {
 #ifndef NDEBUG
   ACE_INLINE
@@ -43,3 +47,5 @@ namespace TAO_FTRTEC {
   }
 #endif
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
index b15359f97be..96f0abfbad5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
@@ -1,9 +1,9 @@
-#include "Safe_InputCDR.h"
+#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
 
 ACE_RCSID (Utils,
            Safe_InputCDR,
            "$Id$")
 
 #if !defined(__ACE_INLINE__)
-#include "Safe_InputCDR.inl"
+#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h
index ec59ca1b758..b4aede7f570 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h
@@ -12,9 +12,11 @@
 #define SAFE_INPUTCDR_H
 #include /**/ "ace/pre.h"
 
-#include "ftrtevent_export.h"
+#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FtRtEvent_Export Safe_InputCDR : public TAO_InputCDR
 {
 public:
@@ -28,8 +30,10 @@ public:
   Safe_InputCDR(const char* buf, int size);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "Safe_InputCDR.inl"
+#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
index a83166e8987..a4712c153f5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
@@ -1,6 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
+
 #include "ace/OS_Memory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 Safe_InputCDR::Safe_InputCDR(const char* buf, int size)
 : TAO_InputCDR((ACE_Message_Block*)0)
@@ -14,3 +19,5 @@ Safe_InputCDR::Safe_InputCDR(const char* buf, int size)
     this->start_.wr_ptr(size);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
index 47a187bc3b4..1b0dc0bc02d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
@@ -13,6 +13,8 @@
 #ifndef SCOPEGUARD_H_
 #define SCOPEGUARD_H_
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 class RefHolder
 {
@@ -286,6 +288,8 @@ inline ObjScopeGuardImpl2<Obj, MemFun, P1, P2> MakeObjGuard(Obj& obj, MemFun mem
   return ObjScopeGuardImpl2<Obj, MemFun, P1, P2>::MakeObjGuard(obj, memFun, p1, p2);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define CONCATENATE_DIRECT(s1, s2) s1##s2
 #define CONCATENATE(s1, s2) CONCATENATE_DIRECT(s1, s2)
 #define ANONYMOUS_VARIABLE(str) CONCATENATE(str, __LINE__)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 217f701283e..6a34e95164b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -1,13 +1,15 @@
 //$Id$
-#include "UUID.h"
+#include "orbsvcs/FtRtEvent/Utils/UUID.h"
 
 ACE_RCSID (Utils,
            UUID,
            "$Id$")
 #if !defined(__ACE_INLINE__)
-#include "UUID.inl"
+#include "orbsvcs/FtRtEvent/Utils/UUID.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 static union
 {
   struct
@@ -161,3 +163,5 @@ UUID::create (unsigned char *buffer)
 
   memcpy(buffer + 10, &node, 6);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index ffdef9e1738..19b81c44354 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -12,7 +12,8 @@
 #define UUID_H
 #include /**/ "ace/pre.h"
 
-#include "ftrtevent_export.h"
+#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/OS.h"
 #include "ace/SString.h"
 
@@ -28,6 +29,8 @@
 #define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * This is an implementation of Global Unique Identifier
  * which follows the document draft-leach-uuids-guids-01.txt. The
@@ -110,8 +113,10 @@ class TAO_FtRtEvent_Export  UUID
     } rep_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "UUID.inl"
+#include "orbsvcs/FtRtEvent/Utils/UUID.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
index 3093cf873dd..e1238a12ff1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 UUID::UUID()
 {
@@ -50,3 +54,5 @@ void UUID::to_string(ACE_CString& string) const
   string.resize(STRING_LENGTH-1);
   this->to_string(&string[0]);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
index be09a2870a5..9913cc8c8c9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -11,24 +11,33 @@
 #ifndef ACTIVATE_WITH_ID_H
 #define ACTIVATE_WITH_ID_H
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T>
 void
 activate_object_with_id (T * &result,
                          PortableServer::POA_ptr poa,
                          PortableServer::ServantBase *servant,
                          const FtRtecEventComm::ObjectId &oid
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL)
 {
-  const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid);
+  const PortableServer::ObjectId& id =
+    reinterpret_cast<const PortableServer::ObjectId&> (oid);
   poa->activate_object_with_id(id,
-    servant ACE_ENV_ARG_PARAMETER);
-
+                               servant
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var object = poa->
-    id_to_reference(id ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object =
+    poa->id_to_reference(id
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
index 0cefc3da7e9..c489912d527 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
@@ -11,6 +11,10 @@
 #ifndef RESOVLE_INIT_H
 #define RESOVLE_INIT_H
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T>
 typename T::_ptr_type
 resolve_init (CORBA::ORB_ptr orb,
@@ -63,4 +67,7 @@ resolve (CosNaming::NamingContext_ptr context,
     return ref._retn();
 }
 #endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 7db3241bbed..ca871c00ff7 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project : htbp, orbsvcslib, core {
+project : htbp, orbsvcslib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_HTIOP
   idlflags    += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h
   dynamicflags = HTIOP_BUILD_DLL
@@ -20,4 +20,8 @@ project : htbp, orbsvcslib, core {
       HTIOP
     }
   }
+
+  Pidl_Files {
+    HTIOP
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index a0415542e35..190285b3b0f 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -1,8 +1,8 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "HTIOP_Acceptor.h"
-#include "HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
 #include "ace/HTBP/HTBP_Environment.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 
@@ -16,13 +16,15 @@
 #include "ace/Auto_Ptr.h"
 
 #if !defined(__ACE_INLINE__)
-#include "HTIOP_Acceptor.i"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(HTIOP,
           TAO_HTIOP_Acceptor,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env,
                                 int is_inside)
   : TAO_Acceptor (OCI_TAG_HTIOP_PROFILE),
@@ -753,7 +755,8 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major, minor;
+  CORBA::Octet major;
+  CORBA::Octet minor = CORBA::Octet();
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -881,3 +884,5 @@ TAO::HTIOP::Acceptor::parse_options (const char *str)
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
index bff5b395142..6abbb6f23e9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,8 +18,8 @@
 #define HTIOP_ACCEPTOR_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Completion_Handler.h"
-#include "HTIOP_Connection_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,6 +34,7 @@
 
 #include "ace/SOCK_Acceptor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -41,6 +42,9 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -225,8 +229,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "HTIOP_Acceptor.i"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
index d843a900f46..6b3279c0c04 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE::HTBP::Addr&
 TAO::HTIOP::Acceptor::address (void) const
 {
@@ -21,3 +24,5 @@ TAO::HTIOP::Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
index dbc2c7afb7c..f990f16ce1b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
@@ -1,11 +1,10 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #ifndef HTIOP_ACCEPTOR_IMPL_CPP
 #define HTIOP_ACCEPTOR_IMPL_CPP
 
-#include "HTIOP_Acceptor_Impl.h"
-#include "HTIOP_Completion_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h"
+#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,9 +22,7 @@
 
 #include "ace/Object_Manager.h"
 
-ACE_RCSID(HTIOP,
-          TAO_HTIOP_Acceptor_Impl,
-          "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -320,4 +317,6 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handle
   return this->creation_strategy_->make_svc_handler (sh);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* HTIOP_ACCEPTOR_IMPL_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
index 842d65a7e0d..9bfc69280c4 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #include "tao/corbafwd.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -140,8 +142,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "HTIOP_Acceptor_Impl.cpp"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index 81e2b1b6d16..de9b6a14cd2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "HTIOP_Completion_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
 
-#include "HTIOP_Transport.h"
-#include "HTIOP_Endpoint.h"
+#include "orbsvcs/HTIOP/HTIOP_Transport.h"
+#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
@@ -21,6 +21,8 @@ ACE_RCSID (HTIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t)
   : COMPLETION_BASE(t,0,0),
     orb_core_ (0),
@@ -175,3 +177,5 @@ TAO::HTIOP::Completion_Handler::handle_close (ACE_HANDLE,
   delete this;
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
index 4fce97d6a85..63ba0a96b34 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -24,8 +24,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "HTIOP_Export.h"
-#include "HTIOP_Connection_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 // ****************************************************************
@@ -91,5 +93,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* HTIOP_COMPLETION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 504c114f8ba..ad4b080297b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "HTIOP_Connection_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
 
-#include "HTIOP_Transport.h"
-#include "HTIOP_Endpoint.h"
+#include "orbsvcs/HTIOP/HTIOP_Transport.h"
+#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
@@ -25,6 +25,9 @@ ACE_RCSID (HTIOP,
            TAO_HTIOP_Connection_Handler,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t)
   : SVC_HANDLER (t,0,0),
     TAO_Connection_Handler (0)
@@ -277,7 +280,10 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list
 }
 
 int
-TAO::HTIOP::Connection_Handler::set_dscp_codepoint (CORBA::Boolean /*enable_network_priority*/)
+TAO::HTIOP::Connection_Handler::set_dscp_codepoint (
+  CORBA::Boolean /*enable_network_priority*/)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index 76ca95eb810..2651dafebd0 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -14,7 +14,7 @@
 #define HTIOP_CONNECTION_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Transport.h"
+#include "orbsvcs/HTIOP/HTIOP_Transport.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -29,6 +29,7 @@
 #include "ace/Reactor.h"
 #include "ace/Svc_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -127,5 +128,8 @@ namespace TAO
     };
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* HTIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index c0e5007c2f5..0cdab0c09ef 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "HTIOP_Connector.h"
-#include "HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/HTIOP_Connector.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
@@ -23,6 +23,8 @@ ACE_RCSID (HTIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env)
   : TAO_Connector (OCI_TAG_HTIOP_PROFILE),
     connect_creation_strategy_ (),
@@ -166,7 +168,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r,
     return 0;
 
   ACE_NEW_RETURN (proxy,
-                  ACE_INET_Addr(proxy_port,proxy_host.c_str()),
+                  ACE_INET_Addr(static_cast<u_short> (proxy_port),proxy_host.c_str()),
                   0);
 
   session_id.peer_ = htiop_endpoint->object_addr ();
@@ -414,3 +416,5 @@ TAO::HTIOP::Connector::remote_endpoint (TAO_Endpoint *endpoint)
 
   return htiop_endpoint;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 97e94cab63e..62e06d6a988 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "HTIOP_Connection_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
 
 #include "tao/Transport_Connector.h"
 
@@ -32,7 +32,7 @@
 #include "ace/Connector.h"
 #include "ace/OS.h"
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -40,9 +40,12 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace HTIOP
@@ -127,5 +130,8 @@ namespace TAO
     };
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* HTIOP_CONNECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
index 8cf576af02b..8c891ddaf38 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -3,11 +3,9 @@
 #ifndef HTIOP_CONNECTOR_IMPL_CPP
 #define HTIOP_CONNECTOR_IMPL_CPP
 
-#include "HTIOP_Connector_Impl.h"
+#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.h"
 
-ACE_RCSID(HTIOP,
-          TAO_HTIOP_Connector_Impl,
-          "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SVC_HANDLER>
 TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>::
@@ -59,5 +57,6 @@ activate_svc_handler (SVC_HANDLER *sh,
                                                                       arg);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* HTIOP_CONNECTOR_IMPL_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
index 39d8aa62734..5658b346919 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -1,5 +1,5 @@
-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   HTIOP_Connector_Impl.h
@@ -14,7 +14,7 @@
 #define HTIOP_CONNECTOR_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,13 @@
 #include "tao/corbafwd.h"
 #include "ace/Strategies_T.h"
 
-class TAO_ORB_Core;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Thread_Manager;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ORB_Core;
 
 namespace TAO
 {
@@ -109,8 +114,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "HTIOP_Connector_Impl.cpp"
+#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index 48b08e11eae..2d3e6da6299 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#include "HTIOP_Endpoint.h"
-#include "HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
 
 #include "ace/os_include/os_netdb.h"
+#include "ace/Log_Msg.h"
 
 #include "tao/IOPC.h"
 #include "tao/debug.h"
@@ -14,9 +15,11 @@ ACE_RCSID (HTIOP,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "HTIOP_Endpoint.i"
+# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Endpoint::Endpoint (const ACE::HTBP::Addr &addr,
                                         int use_dotted_decimal_addresses)
   : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE),
@@ -218,3 +221,5 @@ TAO::HTIOP::Endpoint::hash (void)
     return ACE::hash_pjw(this->htid_.in());
   return this->object_addr ().get_ip_address () + this->port ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
index 435328da5c5..2fa800fd7a4 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -9,7 +8,6 @@
  *
  *   HTIOP implementation of PP Framework Endpoint interface.
  *
- *
  *  @author  Marina Spivak <marina@cs.wustl.edu>
  */
 //=============================================================================
@@ -19,7 +17,7 @@
 #define HTIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +28,8 @@
 #include "tao/Endpoint.h"
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace HTIOP
@@ -152,8 +152,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "HTIOP_Endpoint.i"
+# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
index b7de055271c..dffd4f6705b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE::HTBP::Addr &
 TAO::HTIOP::Endpoint::object_addr (void) const
 {
@@ -72,3 +75,5 @@ TAO::HTIOP::Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index 5f9b7d26c5c..9f8d638a5b6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "HTIOP_Factory.h"
-#include "HTIOP_Acceptor.h"
-#include "HTIOP_Connector.h"
-#include "HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/HTIOP_Factory.h"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
+#include "orbsvcs/HTIOP/HTIOP_Connector.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
 
 #include "ace/HTBP/HTBP_Environment.h"
 #include "tao/IOPC.h"
@@ -12,7 +12,9 @@ ACE_RCSID (HTIOP,
            TAOHTIOP_Factory,
            "$Id$")
 
-  static const char prefix_[] = "htiop";
+static const char the_prefix[] = "htiop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::HTIOP::Protocol_Factory::Protocol_Factory (void)
   :  TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE),
@@ -32,13 +34,13 @@ int
 TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO::HTIOP::Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -123,6 +125,8 @@ TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_HTIOP_Protocol_Factory,
                        ACE_TEXT ("HTIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
index 746b8a83707..276d0f1199e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h
@@ -15,7 +15,7 @@
 #define HTIOP_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +24,7 @@
 #include "tao/Protocol_Factory.h"
 #include "ace/Service_Config.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -31,6 +32,9 @@ namespace ACE
     class Environment;
   }
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -81,6 +85,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Note that these declarations are placed outside of the scope of the
 // namespace. The generated functions use a C style signature which does
 // not accomodate namespaces, so assuming namespace concatination is an
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 6cc0c041d50..63d4a82db22 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -1,8 +1,8 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "HTIOP_Profile.h"
-#include "htiop_endpointsC.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/htiop_endpointsC.h"
 
 #include "ace/os_include/os_netdb.h"
 
@@ -16,7 +16,9 @@ ACE_RCSID(HTIOP,
           TAO_HTIOP_Profile,
           "$Id$")
 
-static const char prefix_[] = "htiop";
+static const char the_prefix[] = "htiop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char TAO::HTIOP::Profile::object_key_delimiter_ = '/';
 
@@ -291,7 +293,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   size_t buflen = (8 /* "corbaloc" */ +
                    1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
+                   ACE_OS::strlen (::the_prefix) +
                    1 /* colon separator */ +
                    1 /* major version */ +
                    1 /* decimal point */ +
@@ -309,7 +311,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
+                   ::the_prefix,
                    digits [this->version_.major],
                    digits [this->version_.minor],
                    this->endpoint_.host (),
@@ -325,7 +327,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO::HTIOP::Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 void
@@ -467,3 +469,5 @@ TAO::HTIOP::Profile::decode_endpoints (void)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index e8556b345d2..938666a6bfc 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Object_KeyC.h"
-#include "HTIOP_Endpoint.h"
+#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
 
 #include "ace/Synch.h"
 
@@ -32,6 +32,8 @@
 # define OCI_TAG_HTIOP_PROFILE 0x4f434902U
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace HTIOP
@@ -143,5 +145,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* HTIOP_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index bc6475d58bb..6325f6920dd 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "HTIOP_Transport.h"
+#include "orbsvcs/HTIOP/HTIOP_Transport.h"
 
-#include "HTIOP_Connection_Handler.h"
-#include "HTIOP_Acceptor.h"
-#include "HTIOP_Profile.h"
+#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
+#include "orbsvcs/HTIOP/HTIOP_Profile.h"
 #include "ace/HTBP/HTBP_Session.h"
 
 #include "tao/Acceptor_Registry.h"
@@ -26,6 +26,8 @@ ACE_RCSID (HTIOP,
            TAO_HTIOP_Transport,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h,
                                   TAO_ORB_Core *orb_core,
                                   CORBA::Boolean flag)
@@ -43,7 +45,7 @@ TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h,
     {
       // Use the normal GIOP object
       ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
+               TAO_GIOP_Message_Base (orb_core, this));
     }
 }
 
@@ -450,3 +452,5 @@ TAO::HTIOP::Transport::invalidate_event_handler_i (void)
   this->connection_handler_ = 0;
   return eh;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 209622ac41a..6db9ca8dcfc 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -1,6 +1,5 @@
-
-// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   HTIOP_Transport.h
@@ -16,7 +15,7 @@
 #define TAO_HTIOP_TRANSPORT_H
 #include /**/ "ace/pre.h"
 
-#include "HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +31,14 @@
 #include "ace/Svc_Handler.h"
 //#include "HTIOP/HTIOPC.h"
 
+# if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
+#   define ACE_HTBP_STREAM ACE::HTBP::Stream
+# else /* If TEMPLATES are broken in some form or another */
+#   define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr
+#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_ORB_Core;
 class TAO_Operation_Details;
@@ -39,12 +46,6 @@ class TAO_Pluggable_Messaging;
 class TAO_Acceptor;
 class TAO_Adapter;
 
-# if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-#   define ACE_HTBP_STREAM ACE::HTBP::Stream
-# else /* If TEMPLATES are broken in some form or another */
-#   define ACE_HTBP_STREAM ACE::HTBP::Stream, ACE::HTBP::Addr
-#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
-
 namespace TAO
 {
   namespace HTIOP
@@ -161,5 +162,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
index 5bb8026bb9f..e0db9e121f9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
@@ -36,7 +36,7 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "htiop_endpointsC.h"
+#include "orbsvcs/HTIOP/htiop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,6 +46,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -94,7 +96,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence (void)
 HTIOPEndpointSequence::HTIOPEndpointSequence (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         HTIOP_Endpoint_Info
       >
     (max)
@@ -106,7 +108,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence (
     HTIOP_Endpoint_Info * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         HTIOP_Endpoint_Info
       >
     (max, length, buffer, release)
@@ -115,7 +117,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence (
 HTIOPEndpointSequence::HTIOPEndpointSequence (
     const HTIOPEndpointSequence &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         HTIOP_Endpoint_Info
       >
     (seq)
@@ -204,22 +206,7 @@ CORBA::Boolean operator<< (
     const HTIOPEndpointSequence &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -227,40 +214,9 @@ CORBA::Boolean operator>> (
     HTIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
index 095a5e35674..30e51641075 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
@@ -40,13 +40,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "HTIOP_Export.h"
+#include "orbsvcs/HTIOP/HTIOP_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/String_Manager_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,6 +63,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_type.cpp:258
 
@@ -86,11 +89,11 @@ typedef
 struct HTIOP_Export HTIOP_Endpoint_Info
 {
   typedef HTIOP_Endpoint_Info_var _var_type;
-  
-  
-  TAO_String_Manager host;
+
+
+  TAO::String_Manager host;
   CORBA::Short port;
-  TAO_String_Manager htid;
+  TAO::String_Manager htid;
 };
 
 // TAO_IDL - Generated from
@@ -108,22 +111,19 @@ class HTIOPEndpointSequence;
 
 typedef
   TAO_VarSeq_Var_T<
-      HTIOPEndpointSequence,
-      HTIOP_Endpoint_Info
+      HTIOPEndpointSequence
     >
   HTIOPEndpointSequence_var;
 
 typedef
   TAO_Seq_Out_T<
-      HTIOPEndpointSequence,
-      HTIOPEndpointSequence_var,
-      HTIOP_Endpoint_Info
+      HTIOPEndpointSequence
     >
   HTIOPEndpointSequence_out;
 
 class HTIOP_Export HTIOPEndpointSequence
   : public
-      TAO_Unbounded_Sequence<
+      TAO::unbounded_value_sequence<
           HTIOP_Endpoint_Info
         >
 {
@@ -133,12 +133,12 @@ public:
   HTIOPEndpointSequence (
       CORBA::ULong max,
       CORBA::ULong length,
-      HTIOP_Endpoint_Info* buffer, 
-      CORBA::Boolean release = 0
+      HTIOP_Endpoint_Info* buffer,
+      CORBA::Boolean release = false
     );
   HTIOPEndpointSequence (const HTIOPEndpointSequence &);
   ~HTIOPEndpointSequence (void);
-  
+
   typedef HTIOPEndpointSequence_var _var_type;
 };
 
@@ -180,6 +180,8 @@ HTIOP_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_H_ */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 2cd7439e464..e0c158052da 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba {
+  avoids      += ace_for_tao    // Requires ace/Configuration
   sharedname   = TAO_IFRService
   dynamicflags = TAO_IFRSERVICE_BUILD_DLL
   tagchecks   += IFRService
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 32aa79e1770..9c7831e7387 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "AbstractInterfaceDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            AbstractInterfaceDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -57,3 +58,5 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
   return this->TAO_InterfaceDef_i::is_a_i (interface_id
                                            ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index 7a5ca4c9e44..b753a1afa16 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_ABSTRACTINTERFACEDEF_I_H
 #define TAO_ABSTRACTINTERFACEDEF_I_H
 
-#include "InterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_AbstractInterfaceDef_i
 	: public virtual TAO_InterfaceDef_i
 {
@@ -67,6 +70,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 1bcc20308ff..308a637d9ac 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "AliasDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/AliasDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (IFRService,
            AliasDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -136,3 +137,5 @@ TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
                                             "original_type",
                                             original_type);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 621ecf462de..7cc9c8826ca 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_ALIASDEF_I_H
 #define TAO_ALIASDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_AliasDef_i : public virtual TAO_TypedefDef_i
 {
 public:
@@ -89,6 +92,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index d3a5a59a641..70022598977 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ArrayDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/ArrayDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (IFRService,
            ArrayDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -274,3 +275,5 @@ TAO_ArrayDef_i::destroy_element_type (
       break;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index e0f4acf028f..ec0d6966f8d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_ARRAYDEF_I_H
 #define TAO_ARRAYDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ArrayDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -136,6 +139,8 @@ private:
   // Destroys an anonymous non-primitive element type.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index c8322e6823b..0d9ce3b6a42 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "AttributeDef_i.h"
-#include "Repository_i.h"
-#include "IDLType_i.h"
-#include "ExceptionDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -13,6 +13,7 @@ ACE_RCSID (IFRService,
            AttributeDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AttributeDef_i::TAO_AttributeDef_i (
     TAO_Repository_i *repo
@@ -392,3 +393,5 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   return retval._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index 86cd2f55589..d08b3dfa119 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_ATTRIBUTEDEF_I_H
 #define TAO_ATTRIBUTEDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_AttributeDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -140,10 +143,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_ATTRIBUTEDEF_I_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 374a2ee2f02..43e5f4b3ffa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -1,18 +1,20 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ComponentContainer_i.h"
-#include "Repository_i.h"
-#include "InterfaceDef_i.h"
-#include "ComponentDef_i.h"
-#include "ValueDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/ComponentContainer_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/ComponentDef_i.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
-           ComponentContainer_i, 
+ACE_RCSID (IFRService,
+           ComponentContainer_i,
            "$Id$")
-           
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0;
 
 TAO_ComponentContainer_i::TAO_ComponentContainer_i (TAO_Repository_i *repo)
@@ -25,7 +27,7 @@ TAO_ComponentContainer_i::~TAO_ComponentContainer_i (void)
 {
 }
 
-CORBA::ComponentIR::ComponentDef_ptr 
+CORBA::ComponentIR::ComponentDef_ptr
 TAO_ComponentContainer_i::create_component (
     const char *id,
     const char *name,
@@ -49,7 +51,7 @@ TAO_ComponentContainer_i::create_component (
                                    ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::ComponentDef_ptr 
+CORBA::ComponentIR::ComponentDef_ptr
 TAO_ComponentContainer_i::create_component_i (
     const char *id,
     const char *name,
@@ -62,7 +64,7 @@ TAO_ComponentContainer_i::create_component_i (
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (
         this->def_kind (),
         CORBA::dk_Component,
@@ -80,9 +82,9 @@ TAO_ComponentContainer_i::create_component_i (
 
   if (! CORBA::is_nil (base_component))
     {
-      const char *base_path = 
+      const char *base_path =
         TAO_IFR_Service_Utils::reference_to_path (base_component);
-          
+
       // Get the servant's key into the temporary key holder, because
       // the name clash checker for base valuetypes is static, and has
       // no other way to know about a specific key.
@@ -98,7 +100,7 @@ TAO_ComponentContainer_i::create_component_i (
                                           CORBA::dk_Component
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
-          
+
       // Store the id for this - that's what ComponentDescription takes.
       ACE_TString base_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -130,9 +132,9 @@ TAO_ComponentContainer_i::create_component_i (
       for (i = 0; i < count; ++i)
         {
           stringified = TAO_IFR_Service_Utils::int_to_string (i);
-          supported_path = 
+          supported_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                supports_interfaces[i].in ()
+                supports_interfaces[i]
               );
           this->repo_->config ()->set_string_value (supports_key,
                                                     stringified,
@@ -152,7 +154,7 @@ TAO_ComponentContainer_i::create_component_i (
                                                     ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::HomeDef_ptr 
+CORBA::ComponentIR::HomeDef_ptr
 TAO_ComponentContainer_i::create_home (
     const char *id,
     const char *name,
@@ -180,7 +182,7 @@ TAO_ComponentContainer_i::create_home (
                               ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::HomeDef_ptr 
+CORBA::ComponentIR::HomeDef_ptr
 TAO_ComponentContainer_i::create_home_i (
     const char *id,
     const char *name,
@@ -195,7 +197,7 @@ TAO_ComponentContainer_i::create_home_i (
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (
         this->def_kind (),
         CORBA::dk_Home,
@@ -223,7 +225,7 @@ TAO_ComponentContainer_i::create_home_i (
 
   if (! CORBA::is_nil (managed_component))
     {
-      base_path = 
+      base_path =
         TAO_IFR_Service_Utils::reference_to_path (managed_component);
       this->repo_->config ()->set_string_value (new_key,
                                                 "managed",
@@ -249,9 +251,9 @@ TAO_ComponentContainer_i::create_home_i (
 
       for (i = 0; i < length; ++i)
         {
-          supported_path = 
+          supported_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                supports_interfaces[i].in ()
+                supports_interfaces[i]
               );
           stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (supports_key,
@@ -262,7 +264,7 @@ TAO_ComponentContainer_i::create_home_i (
 
   if (! CORBA::is_nil (primary_key))
     {
-      char *primary_key_path = 
+      char *primary_key_path =
         TAO_IFR_Service_Utils::reference_to_path (primary_key);
         this->repo_->config ()->set_string_value (new_key,
                                                   "primary_key",
@@ -281,7 +283,7 @@ TAO_ComponentContainer_i::create_home_i (
                                                ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef_ptr
 TAO_ComponentContainer_i::create_event (
     const char *id,
     const char *name,
@@ -315,7 +317,7 @@ TAO_ComponentContainer_i::create_event (
                                ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef_ptr
 TAO_ComponentContainer_i::create_event_i (
     const char *id,
     const char *name,
@@ -333,7 +335,7 @@ TAO_ComponentContainer_i::create_event_i (
 {
   TAO_ComponentContainer_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (
         this->def_kind (),
         CORBA::dk_Event,
@@ -363,9 +365,9 @@ TAO_ComponentContainer_i::create_event_i (
 
   if (!CORBA::is_nil (base_value))
     {
-      const char *base_path = 
+      const char *base_path =
         TAO_IFR_Service_Utils::reference_to_path (base_value);
-          
+
       // Get the servant's key into the temporary key holder, because
       // the name clash checker for base valuetypes is static, and has
       // no other way to know about a specific key.
@@ -381,7 +383,7 @@ TAO_ComponentContainer_i::create_event_i (
                                           CORBA::dk_Value
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
-          
+
       ACE_TString base_value_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
                                                 "id",
@@ -407,9 +409,9 @@ TAO_ComponentContainer_i::create_event_i (
 
       for (i = 0; i < length; ++i)
         {
-          base_path = 
+          base_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                abstract_base_values[i].in ()
+                abstract_base_values[i]
               );
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (bases_key,
@@ -435,9 +437,9 @@ TAO_ComponentContainer_i::create_event_i (
 
       for (i = 0; i < length; ++i)
         {
-          supported_path = 
+          supported_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                supported_interfaces[i].in ()
+                supported_interfaces[i]
               );
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (supported_key,
@@ -504,7 +506,7 @@ TAO_ComponentContainer_i::create_event_i (
                       initializers[i].members[j].name.in ()
                     );
 
-                  path = 
+                  path =
                     TAO_IFR_Service_Utils::reference_to_path (
                               initializers[i].members[j].type_def.in ()
                             );
@@ -560,6 +562,8 @@ TAO_ComponentContainer_i::create_event_i (
 int
 TAO_ComponentContainer_i::same_as_tmp_name (const char *name)
 {
-  return 
+  return
     ACE_OS::strcmp (TAO_ComponentContainer_i::tmp_name_holder_, name) == 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index e72459b8a84..bc1c9e9fec6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,22 @@
 #ifndef TAO_COMPONENTCONTAINER_I_H
 #define TAO_COMPONENTCONTAINER_I_H
 
-#include "Container_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ComponentContainer_i
   : public virtual TAO_Container_i
 {
@@ -131,6 +134,9 @@ protected:
   static const char *tmp_name_holder_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index b6a6810f039..eb42f8bb52b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "ComponentDef_i.h"
-#include "ProvidesDef_i.h"
-#include "UsesDef_i.h"
-#include "EmitsDef_i.h"
-#include "PublishesDef_i.h"
-#include "ConsumesDef_i.h"
-#include "ExtAttributeDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ComponentDef_i.h"
+#include "orbsvcs/IFRService/ProvidesDef_i.h"
+#include "orbsvcs/IFRService/UsesDef_i.h"
+#include "orbsvcs/IFRService/EmitsDef_i.h"
+#include "orbsvcs/IFRService/PublishesDef_i.h"
+#include "orbsvcs/IFRService/ConsumesDef_i.h"
+#include "orbsvcs/IFRService/ExtAttributeDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -17,6 +17,7 @@ ACE_RCSID (IFRService,
            ComponentDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Specialization.
 template<>
@@ -431,7 +432,7 @@ TAO_ComponentDef_i::supported_interfaces_i (
     {
       supported_path =
         TAO_IFR_Service_Utils::reference_to_path (
-            supported_interfaces[i].in ()
+            supported_interfaces[i]
           );
 
       // Get the servant's key into the temporary key holder, because
@@ -789,3 +790,5 @@ TAO_ComponentDef_i::name_clash (const char *name)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index 772128114d5..0c05918d563 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,21 +21,23 @@
 #ifndef TAO_COMPONENTDEF_I_H
 #define TAO_COMPONENTDEF_I_H
 
-#include "ExtInterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ComponentsS.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ComponentDef_i
   : public virtual TAO_ExtInterfaceDef_i
 {
@@ -234,6 +237,8 @@ public:
   // are a base component.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
index 16a5f34a9a7..474f85baf57 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -1,12 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "ComponentModuleDef_i.h"
+#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
 
 ACE_RCSID (IFRService, 
            ComponentModuleDef_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -17,3 +19,5 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo)
 TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
index cd04c6ee327..6556910861c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_COMPONENTMODULEDEF_I_H
 #define TAO_COMPONENTMODULEDEF_I_H
 
-#include "ComponentContainer_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ComponentContainer_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ComponentModuleDef_i
   : public virtual TAO_ComponentContainer_i
 {
@@ -50,6 +53,8 @@ public:
   // Destructor
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index f2e1f1dee39..f0efb71adb1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -1,23 +1,26 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ComponentRepository_i.h"
-#include "ModuleDef_i.h"
-#include "ComponentDef_i.h"
-#include "HomeDef_i.h"
-#include "EventDef_i.h"
-#include "FinderDef_i.h"
-#include "FactoryDef_i.h"
-#include "EmitsDef_i.h"
-#include "PublishesDef_i.h"
-#include "ConsumesDef_i.h"
-#include "ProvidesDef_i.h"
-#include "UsesDef_i.h"
+#include "orbsvcs/IFRService/ComponentRepository_i.h"
+#include "orbsvcs/IFRService/ModuleDef_i.h"
+#include "orbsvcs/IFRService/ComponentDef_i.h"
+#include "orbsvcs/IFRService/HomeDef_i.h"
+#include "orbsvcs/IFRService/EventDef_i.h"
+#include "orbsvcs/IFRService/FinderDef_i.h"
+#include "orbsvcs/IFRService/FactoryDef_i.h"
+#include "orbsvcs/IFRService/EmitsDef_i.h"
+#include "orbsvcs/IFRService/PublishesDef_i.h"
+#include "orbsvcs/IFRService/ConsumesDef_i.h"
+#include "orbsvcs/IFRService/ProvidesDef_i.h"
+#include "orbsvcs/IFRService/UsesDef_i.h"
 
 ACE_RCSID (IFRService, 
            ComponentRepository_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ComponentRepository_i::TAO_ComponentRepository_i (
     CORBA::ORB_ptr orb,
     PortableServer::POA_ptr poa,
@@ -239,4 +242,4 @@ TAO_ComponentRepository_i::select_poa (
   }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index a59740f7284..7690ee20edc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,14 +21,17 @@
 #ifndef TAO_COMPONENTREPOSITORY_I_H
 #define TAO_COMPONENTREPOSITORY_I_H
 
-#include "Repository_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ComponentContainer_i.h"
+#include "orbsvcs/IFRService/ComponentContainer_i.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ModuleDef_i;
 class TAO_ComponentDef_i;
@@ -116,6 +120,8 @@ protected:
   // Servants for each IR Object type, created at startup.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 4ef6a3dd900..3ca04650d04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ConstantDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
-#include "IDLType_i.h"
+#include "orbsvcs/IFRService/ConstantDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
@@ -16,6 +16,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ConstantDef_i::TAO_ConstantDef_i (
     TAO_Repository_i *repo
   )
@@ -307,3 +309,5 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
                                             mb->base (),
                                             mb->length ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index 05ef7b30c2f..f9243f6d58c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_CONSTANTDEF_I_H
 #define TAO_CONSTANTDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ConstantDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -120,6 +123,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index e730f4203cc..0b6b8311b7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
-#include "Repository_i.h"
-#include "ConsumesDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ConsumesDef_i.h"
 
 ACE_RCSID (IFRService, 
            ConsumesDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ConsumesDef_i::TAO_ConsumesDef_i (
     TAO_Repository_i *repo
   )
@@ -28,3 +31,4 @@ TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Consumes;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 4cb2a0bbe0d..2bbbef43916 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_CONSUMESDEF_I_H
 #define TAO_CONSUMESDEF_I_H
 
-#include "EventPortDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/EventPortDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ConsumesDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -56,6 +59,8 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 2204768af19..b61b34ea4a1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "concrete_classes.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/concrete_classes.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char *TAO_Contained_i::tmp_name_holder_ = 0;
 
 TAO_Contained_i::TAO_Contained_i (
@@ -1253,3 +1255,5 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index 3ed5648427a..5729837ce3b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_CONTAINED_I_H
 #define TAO_CONTAINED_I_H
 
-#include "IRObject_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IRObject_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_Contained_i : public virtual TAO_IRObject_i
 {
   // = TITLE
@@ -223,6 +226,9 @@ private:
   static const char *tmp_name_holder_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 6c9c5cb3498..e8810ebd680 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "InterfaceDef_i.h"
-#include "ValueDef_i.h"
-#include "ExtValueDef_i.h"
-#include "IFR_Service_Utils.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/ExtValueDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
@@ -19,6 +19,7 @@ ACE_RCSID (IFRService,
            Container_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char *TAO_Container_i::tmp_name_holder_ = 0;
 
@@ -200,7 +201,7 @@ TAO_Container_i::lookup_i (const char *search_name
   ACE_TString section_name;
   int status = 0;
   int index = 0;
-  int pos = 0;
+  ssize_t pos = 0;
   int so_far_so_good = 0;
   u_int kind = 0;
   CORBA::DefinitionKind def_kind = CORBA::dk_none;
@@ -1167,7 +1168,7 @@ TAO_Container_i::create_enum_i (const char *id,
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "name",
-                                                members[i].in ());
+                                                members[i]);
     }
 
   CORBA::DefinitionKind def_kind =
@@ -1319,7 +1320,7 @@ TAO_Container_i::create_interface_i (const char *id,
         {
           inherited_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                base_interfaces[i].in ()
+                base_interfaces[i]
               );
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (inherited_key,
@@ -1486,7 +1487,7 @@ TAO_Container_i::create_value_box_i (const char *id,
   ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
 
   return CORBA::ValueBoxDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ExceptionDef_ptr
@@ -2424,7 +2425,7 @@ TAO_Container_i::update_refs (const char *path,
                                                 "name",
                                                 ref_name);
 
-      int pos = ref_name.find (this->repo_->extension ());
+      ssize_t pos = ref_name.find (this->repo_->extension ());
 
       // If one of the names has been mangled by move(), fix it.
       if (pos != ACE_TString::npos)
@@ -2575,7 +2576,7 @@ TAO_Container_i::create_value_common (
         {
           base_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                abstract_base_values[i].in ()
+                abstract_base_values[i]
               );
 
           // Get the servant's key into the temporary key holder, because
@@ -2628,7 +2629,7 @@ TAO_Container_i::create_value_common (
         {
           supported_path =
             TAO_IFR_Service_Utils::reference_to_path (
-                supported_interfaces[i].in ()
+                supported_interfaces[i]
               );
 
           // Get the servant's key into the temporary key holder, because
@@ -2679,3 +2680,5 @@ TAO_Container_i::create_value_common (
 
   return path;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index a5c85dfb59a..ab8e833579b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_CONTAINER_I_H
 #define TAO_CONTAINER_I_H
 
-#include "IRObject_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IRObject_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Repository_i;
 
 class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i
@@ -467,6 +470,8 @@ protected:
   static const char *tmp_name_holder_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index 66b5c985cd6..0cbe4a4093d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -1,13 +1,15 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "EmitsDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/EmitsDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            EmitsDef_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -26,3 +28,5 @@ TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Emits;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index 184415fc1ae..5d8e93fdeba 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_EMITSDEF_I_H
 #define TAO_EMITSDEF_I_H
 
-#include "EventPortDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/EventPortDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_EmitsDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -56,6 +59,8 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index a97939c8184..5273788b6de 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "EnumDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/EnumDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (IFRService,
            EnumDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -152,9 +153,11 @@ TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
                                             1,
                                             member_key);
 
-      ACE_TString member_name (members[i].in ());
+      ACE_TString member_name (members[i]);
       this->repo_->config ()->set_string_value (member_key,
                                                 "name",
                                                 member_name);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 5842bc5ebef..0bd5b265451 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_ENUMDEF_I_H
 #define TAO_ENUMDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_EnumDef_i : public virtual TAO_TypedefDef_i
 {
 public:
@@ -89,6 +92,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index 2a697660c7f..cd62666f25d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -1,13 +1,15 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
-#include "EventDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/EventDef_i.h"
 
 ACE_RCSID (IFRService, 
            EventDef_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -96,3 +98,4 @@ TAO_EventDef_i::is_a_i (const char *event_id
                                        ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index dcd60a7ac1e..a1e280a2882 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_EVENTDEF_I_H
 #define TAO_EVENTDEF_I_H
 
-#include "ExtValueDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ExtValueDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_EventDef_i : public virtual TAO_ExtValueDef_i
 {
   // = TITLE
@@ -90,11 +93,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_EVENTDEF_I_H */
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index b81e87ba6d8..f3d1a44a8f4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "EventPortDef_i.h"
-#include "EventDef_i.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/EventPortDef_i.h"
+#include "orbsvcs/IFRService/EventDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -12,6 +13,7 @@ ACE_RCSID (IFRService,
            EventPortDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -194,3 +196,5 @@ TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CORBA::dk_none;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index 2ca1f2b0ce5..dc84527d41f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,22 @@
 #ifndef TAO_EVENTPORTDEF_I_H
 #define TAO_EVENTPORTDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_EventPortDef_i
   : public virtual TAO_Contained_i
 {
@@ -109,6 +112,8 @@ private:
   // in this 'abstract' base class.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 1c6fa2b4fd7..33b7c9eee99 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ExceptionDef_i.h"
-#include "Repository_i.h"
-#include "IDLType_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (IFRService,
            ExceptionDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExceptionDef_i::TAO_ExceptionDef_i (
     TAO_Repository_i *repo
@@ -346,3 +347,5 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
                                                  count);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index bf00881ff37..88dd3e8bbd5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,9 +21,9 @@
 #ifndef TAO_EXCEPTIONDEF_I_H
 #define TAO_EXCEPTIONDEF_I_H
 
-#include "Contained_i.h"
-#include "Container_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i,
                                                  public virtual TAO_Container_i
 {
@@ -112,6 +115,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 16b2c30b1b9..82ffce83d05 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "ExtAbstractInterfaceDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtAbstractInterfaceDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -39,3 +40,4 @@ TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index 12e4ec7f016..e79471d8e11 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,23 @@
 #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H
 #define TAO_EXTABSTRACTINTERFACEDEF_I_H
 
-#include "AbstractInterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "InterfaceAttrExtension_i.h"
+#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i
 	: public virtual TAO_AbstractInterfaceDef_i,
     public virtual TAO_InterfaceAttrExtension_i
@@ -57,10 +61,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_EXTABSTRACTINTERFACEDEF_I_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 020ae781324..62405fe8393 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ExtAttributeDef_i.h"
-#include "Repository_i.h"
-#include "ExceptionDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/ExtAttributeDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -13,6 +13,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -309,3 +311,5 @@ TAO_ExtAttributeDef_i::exceptions (const char *sub_section,
                                                 path);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index 687a5c90e35..f4d9e54b665 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_EXTATTRIBUTEDEF_I_H
 #define TAO_EXTATTRIBUTEDEF_I_H
 
-#include "AttributeDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExtAttributeDef_i
   : public virtual TAO_AttributeDef_i
 {
@@ -121,9 +124,10 @@ private:
                    const CORBA::ExcDescriptionSeq &exceptions);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_EXTATTRIBUTEDEF_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
index 8bac0da9e13..30f003136b2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -1,13 +1,15 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "ExtInterfaceDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtInterfaceDef_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -24,3 +26,4 @@ TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
index e28f2377505..11fecc1e6a5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,23 @@
 #ifndef TAO_EXTINTERFACEDEF_I_H
 #define TAO_EXTINTERFACEDEF_I_H
 
-#include "InterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "InterfaceAttrExtension_i.h"
+#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExtInterfaceDef_i
   : public virtual TAO_InterfaceDef_i,
     public virtual TAO_InterfaceAttrExtension_i
@@ -52,9 +56,10 @@ public:
   // Destructor
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_EXTINTERFACEDEF_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index ea0ea0e3c41..3b802bcb762 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "ExtLocalInterfaceDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtLocalInterfaceDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -39,3 +40,4 @@ TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index 69ce82a4b8c..1e5eec3bcf2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,22 @@
 #ifndef TAO_EXTLOCALINTERFACEDEF_I_H
 #define TAO_EXTLOCALINTERFACEDEF_I_H
 
-#include "LocalInterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "InterfaceAttrExtension_i.h"
+#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExtLocalInterfaceDef_i
 	: public virtual TAO_LocalInterfaceDef_i,
     public virtual TAO_InterfaceAttrExtension_i
@@ -57,6 +60,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 25da09c1ec8..410fd91c7d9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "ExtValueDef_i.h"
-#include "ExceptionDef_i.h"
-#include "IFR_Service_Utils.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ExtValueDef_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -13,6 +13,7 @@ ACE_RCSID (IFRService,
            ExtValueDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -962,7 +963,7 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       type_path =
-        TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
+        TAO_IFR_Service_Utils::reference_to_path (exceptions[i]);
 
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (excepts_key,
@@ -970,3 +971,5 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
                                                 type_path);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index 28be501b651..d2390a47c4a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_EXTVALUEDEF_I_H
 #define TAO_EXTVALUEDEF_I_H
 
-#include "ValueDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ExtValueDef_i : public virtual TAO_ValueDef_i
 {
   // = TITLE
@@ -123,10 +126,10 @@ private:
                    const CORBA::ExceptionDefSeq &exceptions);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_EXTVALUEDEF_I_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index 111e0c74c85..f1fd5ae8157 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
-#include "FactoryDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/FactoryDef_i.h"
 
 ACE_RCSID (IFRService, 
            FactoryDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FactoryDef_i::TAO_FactoryDef_i (
     TAO_Repository_i *repo
   )
@@ -28,3 +29,4 @@ TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Factory;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index b43598a81d5..38a366914ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_FACTORYDEF_I_H
 #define TAO_FACTORYDEF_I_H
 
-#include "OperationDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_FactoryDef_i : public virtual TAO_OperationDef_i
 {
   // = TITLE
@@ -54,12 +57,10 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_FACTORYDEF_I_H */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index ce796fdf494..6fffd784ad3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -1,13 +1,15 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
-#include "FinderDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/FinderDef_i.h"
 
 ACE_RCSID (IFRService, 
            FinderDef_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -26,3 +28,4 @@ TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Finder;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index c3b5f9364f1..e8ad0a283d7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_FINDERDEF_I_H
 #define TAO_FINDERDEF_I_H
 
-#include "OperationDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_FinderDef_i : public virtual TAO_OperationDef_i
 {
   // = TITLE
@@ -54,12 +58,10 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_FINDERDEF_I_H */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index f25e95d10ca..f8fdc472f04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
-#include "FixedDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/FixedDef_i.h"
 
 ACE_RCSID (IFRService, 
            FixedDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
@@ -148,3 +149,4 @@ TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
   // TODO
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index 6a9b432ba6b..326bc90185b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_FIXEDDEF_I_H
 #define TAO_FIXEDDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_FixedDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -121,9 +124,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_FIXEDDEF_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index d427ebe6dc2..4e8a1741f56 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "HomeDef_i.h"
-#include "FactoryDef_i.h"
-#include "FinderDef_i.h"
-#include "ValueDef_i.h"
-#include "ExceptionDef_i.h"
-#include "AttributeDef_i.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/HomeDef_i.h"
+#include "orbsvcs/IFRService/FactoryDef_i.h"
+#include "orbsvcs/IFRService/FinderDef_i.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -17,6 +18,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -385,7 +388,7 @@ TAO_HomeDef_i::supported_interfaces_i (
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       path =
         TAO_IFR_Service_Utils::reference_to_path (
-            supported_interfaces[i].in ()
+            supported_interfaces[i]
           );
       this->repo_->config ()->set_string_value (supported_key,
                                                 stringified,
@@ -732,7 +735,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
       for (i = 0; i < length; ++i)
         {
           type_path =
-            TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
+            TAO_IFR_Service_Utils::reference_to_path (exceptions[i]);
 
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (excepts_key,
@@ -1051,3 +1054,5 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
 
   ead.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 81489528a24..7436829cb68 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,20 +21,23 @@
 #ifndef TAO_HOMEDEF_I_H
 #define TAO_HOMEDEF_I_H
 
-#include "ExtInterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_HomeDef_i
   : public virtual TAO_ExtInterfaceDef_i
 {
@@ -273,12 +277,10 @@ private:
                        ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HOMEDEF_I_H */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
index 7a011af0830..83c64aff90e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -1,12 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "IDLType_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
 
 ACE_RCSID (IFRService, 
            IDLType_i, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo)
 {
@@ -16,3 +18,4 @@ TAO_IDLType_i::~TAO_IDLType_i (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index 1d50ed0348c..8935d63aae6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -20,8 +20,8 @@
 #ifndef TAO_IDLTYPE_I_H
 #define TAO_IDLTYPE_I_H
 
-#include "IRObject_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IRObject_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Repository_i;
 
 class TAO_IFRService_Export TAO_IDLType_i : public virtual TAO_IRObject_i
@@ -64,9 +66,10 @@ public:
   // Defined in concrete classes.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDLTYPE_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index ecbccbdaf1a..4a7fcfd2d6b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_
 #define _TAO_IDL_ORIG_IFR_BASES_CPP_
 
 
-#include "IFR_BaseS.h"
+#include "orbsvcs/IFRService/IFR_BaseS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -69,22 +69,24 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseS.inl"
+#include "orbsvcs/IFRService/IFR_BaseS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -96,13 +98,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -116,13 +118,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_)
 #define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::Contained::Description>
     : public
@@ -136,13 +138,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -156,13 +158,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -176,13 +178,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -196,13 +198,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_MODULEDEF__SARG_TRAITS_)
 #define _CORBA_MODULEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ModuleDef>
     : public
@@ -216,13 +218,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_)
 #define _CORBA_CONSTANTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ConstantDef>
     : public
@@ -236,13 +238,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -256,13 +258,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_)
 #define _CORBA_STRUCTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::StructDef>
     : public
@@ -276,13 +278,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_UNIONDEF__SARG_TRAITS_)
 #define _CORBA_UNIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::UnionDef>
     : public
@@ -296,13 +298,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ENUMDEF__SARG_TRAITS_)
 #define _CORBA_ENUMDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::EnumDef>
     : public
@@ -316,13 +318,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ALIASDEF__SARG_TRAITS_)
 #define _CORBA_ALIASDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AliasDef>
     : public
@@ -336,13 +338,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -356,13 +358,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -376,13 +378,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExceptionDef>
     : public
@@ -396,13 +398,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_)
 #define _CORBA_NATIVEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::NativeDef>
     : public
@@ -416,13 +418,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -436,13 +438,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -456,13 +458,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_)
 #define _CORBA_VALUEBOXDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueBoxDef>
     : public
@@ -476,13 +478,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AbstractInterfaceDef>
     : public
@@ -496,13 +498,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -516,13 +518,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::LocalInterfaceDef>
     : public
@@ -536,13 +538,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtValueDef>
     : public
@@ -556,13 +558,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTAINEDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContainedSeq>
     : public
@@ -576,13 +578,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::StructMemberSeq>
     : public
@@ -596,13 +598,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -616,13 +618,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -636,13 +638,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -656,13 +658,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -685,13 +687,13 @@ namespace TAO
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -703,13 +705,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -724,13 +726,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Contained::Description>
     : public
@@ -744,13 +746,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -765,13 +767,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -786,13 +788,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -806,13 +808,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
 #define _CORBA_MODULEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
     : public
@@ -827,13 +829,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
 #define _CORBA_CONSTANTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
     : public
@@ -848,13 +850,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -869,13 +871,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
 #define _CORBA_STRUCTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::StructDef>
     : public
@@ -890,13 +892,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
 #define _CORBA_UNIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::UnionDef>
     : public
@@ -911,13 +913,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
 #define _CORBA_ENUMDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::EnumDef>
     : public
@@ -932,13 +934,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
 #define _CORBA_ALIASDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AliasDef>
     : public
@@ -953,13 +955,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -974,13 +976,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -994,13 +996,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
     : public
@@ -1015,13 +1017,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
 #define _CORBA_NATIVEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::NativeDef>
     : public
@@ -1036,13 +1038,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -1057,13 +1059,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -1077,13 +1079,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
 #define _CORBA_VALUEBOXDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
     : public
@@ -1098,13 +1100,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
     : public
@@ -1119,13 +1121,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -1139,13 +1141,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
     : public
@@ -1160,13 +1162,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
     : public
@@ -1181,13 +1183,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContainedSeq>
     : public
@@ -1201,13 +1203,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -1221,13 +1223,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -1241,13 +1243,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -1261,13 +1263,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -1281,13 +1283,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -1430,9 +1432,9 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1444,7 +1446,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::IRObject::IRObject (void)
@@ -1464,11 +1466,11 @@ POA_CORBA::IRObject::~IRObject (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_def_kind_IRObject
     : public TAO::Upcall_Command
   {
@@ -1482,30 +1484,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->def_kind (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::IRObject::_get_def_kind_skel (
@@ -1515,22 +1517,22 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
 
@@ -1538,7 +1540,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1551,15 +1553,15 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class destroy_IRObject
     : public TAO::Upcall_Command
   {
@@ -1569,22 +1571,22 @@ namespace POA_CORBA
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::IRObject::destroy_skel (
@@ -1594,28 +1596,28 @@ void POA_CORBA::IRObject::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
 
   destroy_IRObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1628,19 +1630,19 @@ void POA_CORBA::IRObject::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1654,67 +1656,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IRObject::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _is_a_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1727,16 +1729,16 @@ void POA_CORBA::IRObject::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1750,58 +1752,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IRObject::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _non_existent_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1814,16 +1816,16 @@ void POA_CORBA::IRObject::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1837,58 +1839,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IRObject::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _repository_id_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1901,18 +1903,18 @@ void POA_CORBA::IRObject::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::IRObject::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -1922,30 +1924,30 @@ void POA_CORBA::IRObject::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -1954,11 +1956,11 @@ void POA_CORBA::IRObject::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1972,58 +1974,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IRObject::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _get_component_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2036,7 +2038,7 @@ void POA_CORBA::IRObject::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::IRObject::_is_a (
@@ -2085,22 +2087,22 @@ POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::IRObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2215,9 +2217,9 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
-       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14,
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2266,9 +2268,9 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Contained_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2280,7 +2282,7 @@ CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Contained::Contained (void)
@@ -2292,7 +2294,7 @@ POA_CORBA::Contained::Contained (void)
 POA_CORBA::Contained::Contained (const Contained& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs)
+    POA_CORBA::IRObject (rhs)
 {
 }
 
@@ -2301,11 +2303,11 @@ POA_CORBA::Contained::~Contained (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_id_Contained
     : public TAO::Upcall_Command
   {
@@ -2319,30 +2321,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_id_skel (
@@ -2352,22 +2354,22 @@ void POA_CORBA::Contained::_get_id_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2375,7 +2377,7 @@ void POA_CORBA::Contained::_get_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2388,15 +2390,15 @@ void POA_CORBA::Contained::_get_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_id_Contained
     : public TAO::Upcall_Command
   {
@@ -2410,7 +2412,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
@@ -2418,23 +2420,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->id (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_set_id_skel (
@@ -2444,24 +2446,24 @@ void POA_CORBA::Contained::_set_id_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2469,7 +2471,7 @@ void POA_CORBA::Contained::_set_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2482,15 +2484,15 @@ void POA_CORBA::Contained::_set_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2504,30 +2506,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->name (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_name_skel (
@@ -2537,22 +2539,22 @@ void POA_CORBA::Contained::_get_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Identifier>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2560,7 +2562,7 @@ void POA_CORBA::Contained::_get_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2573,15 +2575,15 @@ void POA_CORBA::Contained::_get_name_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2595,7 +2597,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
@@ -2603,23 +2605,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->name (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_set_name_skel (
@@ -2629,24 +2631,24 @@ void POA_CORBA::Contained::_set_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_name
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2654,7 +2656,7 @@ void POA_CORBA::Contained::_set_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2667,15 +2669,15 @@ void POA_CORBA::Contained::_set_name_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_version_Contained
     : public TAO::Upcall_Command
   {
@@ -2689,30 +2691,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->version (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_version_skel (
@@ -2722,22 +2724,22 @@ void POA_CORBA::Contained::_get_version_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2745,7 +2747,7 @@ void POA_CORBA::Contained::_get_version_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2758,15 +2760,15 @@ void POA_CORBA::Contained::_get_version_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_version_Contained
     : public TAO::Upcall_Command
   {
@@ -2780,7 +2782,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_1 =
@@ -2788,23 +2790,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->version (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_set_version_skel (
@@ -2814,24 +2816,24 @@ void POA_CORBA::Contained::_set_version_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_version
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2839,7 +2841,7 @@ void POA_CORBA::Contained::_set_version_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2852,15 +2854,15 @@ void POA_CORBA::Contained::_set_version_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_defined_in_Contained
     : public TAO::Upcall_Command
   {
@@ -2874,30 +2876,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Container, TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->defined_in (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_defined_in_skel (
@@ -2907,22 +2909,22 @@ void POA_CORBA::Contained::_get_defined_in_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Container>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2930,7 +2932,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2943,15 +2945,15 @@ void POA_CORBA::Contained::_get_defined_in_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_absolute_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2965,30 +2967,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ScopedName, TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->absolute_name (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_absolute_name_skel (
@@ -2998,22 +3000,22 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ScopedName>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3021,7 +3023,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3034,15 +3036,15 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_containing_repository_Contained
     : public TAO::Upcall_Command
   {
@@ -3056,30 +3058,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Repository, TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->containing_repository (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::_get_containing_repository_skel (
@@ -3089,22 +3091,22 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Repository>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3112,7 +3114,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3125,15 +3127,15 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_Contained
     : public TAO::Upcall_Command
   {
@@ -3147,30 +3149,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained::Description, TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::describe_skel (
@@ -3180,22 +3182,22 @@ void POA_CORBA::Contained::describe_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3203,7 +3205,7 @@ void POA_CORBA::Contained::describe_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3216,15 +3218,15 @@ void POA_CORBA::Contained::describe_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class move_Contained
     : public TAO::Upcall_Command
   {
@@ -3238,7 +3240,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Container>::in_arg_type arg_1 =
@@ -3246,19 +3248,19 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       this->servant_->move (
         arg_1
         , arg_2
@@ -3266,17 +3268,17 @@ namespace POA_CORBA
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Contained::move_skel (
@@ -3286,18 +3288,18 @@ void POA_CORBA::Contained::move_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -3305,9 +3307,9 @@ void POA_CORBA::Contained::move_skel (
       &_tao_new_name,
       &_tao_new_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3315,7 +3317,7 @@ void POA_CORBA::Contained::move_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3328,19 +3330,19 @@ void POA_CORBA::Contained::move_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3354,67 +3356,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Contained::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _is_a_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3427,16 +3429,16 @@ void POA_CORBA::Contained::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3450,58 +3452,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Contained::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _non_existent_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3514,16 +3516,16 @@ void POA_CORBA::Contained::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3537,58 +3539,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Contained::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _repository_id_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3601,18 +3603,18 @@ void POA_CORBA::Contained::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::Contained::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -3622,30 +3624,30 @@ void POA_CORBA::Contained::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -3654,11 +3656,11 @@ void POA_CORBA::Contained::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3672,58 +3674,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Contained::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _get_component_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3736,7 +3738,7 @@ void POA_CORBA::Contained::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::Contained::_is_a (
@@ -3789,22 +3791,22 @@ POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Contained STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3926,9 +3928,9 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -44, 
-      -12,  -2, -42,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  27,  28,  -1,  -1,  29,  -1,  30, 
+       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -44,
+      -12,  -2, -42,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22,
+       -1,  -1,  23,  24,  25,  26,  27,  28,  -1,  -1,  29,  -1,  30,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3977,9 +3979,9 @@ CORBA__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Container_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3991,7 +3993,7 @@ CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Container::Container (void)
@@ -4003,7 +4005,7 @@ POA_CORBA::Container::Container (void)
 POA_CORBA::Container::Container (const Container& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs)
+    POA_CORBA::IRObject (rhs)
 {
 }
 
@@ -4012,11 +4014,11 @@ POA_CORBA::Container::~Container (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_Container
     : public TAO::Upcall_Command
   {
@@ -4030,37 +4032,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained, TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ScopedName, TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->lookup (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::lookup_skel (
@@ -4070,24 +4072,24 @@ void POA_CORBA::Container::lookup_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_search_name
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4095,7 +4097,7 @@ void POA_CORBA::Container::lookup_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4108,15 +4110,15 @@ void POA_CORBA::Container::lookup_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class contents_Container
     : public TAO::Upcall_Command
   {
@@ -4130,26 +4132,26 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq, TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->contents (
           arg_1
@@ -4157,17 +4159,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::contents_skel (
@@ -4177,26 +4179,26 @@ void POA_CORBA::Container::contents_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4204,7 +4206,7 @@ void POA_CORBA::Container::contents_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4217,15 +4219,15 @@ void POA_CORBA::Container::contents_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_name_Container
     : public TAO::Upcall_Command
   {
@@ -4239,38 +4241,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq, TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Long, TAO::SArg_Traits< ::CORBA::Long>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->lookup_name (
           arg_1
@@ -4280,17 +4282,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::lookup_name_skel (
@@ -4300,19 +4302,19 @@ void POA_CORBA::Container::lookup_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4321,9 +4323,9 @@ void POA_CORBA::Container::lookup_name_skel (
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4331,7 +4333,7 @@ void POA_CORBA::Container::lookup_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4344,15 +4346,15 @@ void POA_CORBA::Container::lookup_name_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_contents_Container
     : public TAO::Upcall_Command
   {
@@ -4366,32 +4368,32 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Container::DescriptionSeq, TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Long, TAO::SArg_Traits< ::CORBA::Long>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->describe_contents (
           arg_1
@@ -4400,17 +4402,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::describe_contents_skel (
@@ -4420,18 +4422,18 @@ void POA_CORBA::Container::describe_contents_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4439,9 +4441,9 @@ void POA_CORBA::Container::describe_contents_skel (
       &_tao_exclude_inherited,
       &_tao_max_returned_objs
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4449,7 +4451,7 @@ void POA_CORBA::Container::describe_contents_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4462,15 +4464,15 @@ void POA_CORBA::Container::describe_contents_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_module_Container
     : public TAO::Upcall_Command
   {
@@ -4484,32 +4486,32 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ModuleDef, TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->create_module (
           arg_1
@@ -4518,17 +4520,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_module_skel (
@@ -4538,18 +4540,18 @@ void POA_CORBA::Container::create_module_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4557,9 +4559,9 @@ void POA_CORBA::Container::create_module_skel (
       &_tao_name,
       &_tao_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4567,7 +4569,7 @@ void POA_CORBA::Container::create_module_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4580,15 +4582,15 @@ void POA_CORBA::Container::create_module_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_constant_Container
     : public TAO::Upcall_Command
   {
@@ -4602,44 +4604,44 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ConstantDef, TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Any, TAO::SArg_Traits< ::CORBA::Any>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_constant (
           arg_1
@@ -4650,17 +4652,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_constant_skel (
@@ -4670,20 +4672,20 @@ void POA_CORBA::Container::create_constant_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4693,9 +4695,9 @@ void POA_CORBA::Container::create_constant_skel (
       &_tao_type,
       &_tao_value
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4703,7 +4705,7 @@ void POA_CORBA::Container::create_constant_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4716,15 +4718,15 @@ void POA_CORBA::Container::create_constant_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_struct_Container
     : public TAO::Upcall_Command
   {
@@ -4738,38 +4740,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructDef, TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_struct (
           arg_1
@@ -4779,17 +4781,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_struct_skel (
@@ -4799,19 +4801,19 @@ void POA_CORBA::Container::create_struct_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4820,9 +4822,9 @@ void POA_CORBA::Container::create_struct_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4830,7 +4832,7 @@ void POA_CORBA::Container::create_struct_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4843,15 +4845,15 @@ void POA_CORBA::Container::create_struct_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_union_Container
     : public TAO::Upcall_Command
   {
@@ -4865,44 +4867,44 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UnionDef, TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq, TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_union (
           arg_1
@@ -4913,17 +4915,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_union_skel (
@@ -4933,20 +4935,20 @@ void POA_CORBA::Container::create_union_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UnionDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type;
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4956,9 +4958,9 @@ void POA_CORBA::Container::create_union_skel (
       &_tao_discriminator_type,
       &_tao_members
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4966,7 +4968,7 @@ void POA_CORBA::Container::create_union_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4979,15 +4981,15 @@ void POA_CORBA::Container::create_union_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_enum_Container
     : public TAO::Upcall_Command
   {
@@ -5001,38 +5003,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::EnumDef, TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq, TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_enum (
           arg_1
@@ -5042,17 +5044,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_enum_skel (
@@ -5062,19 +5064,19 @@ void POA_CORBA::Container::create_enum_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::EnumDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5083,9 +5085,9 @@ void POA_CORBA::Container::create_enum_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5093,7 +5095,7 @@ void POA_CORBA::Container::create_enum_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5106,15 +5108,15 @@ void POA_CORBA::Container::create_enum_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_alias_Container
     : public TAO::Upcall_Command
   {
@@ -5128,38 +5130,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AliasDef, TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_alias (
           arg_1
@@ -5169,17 +5171,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_alias_skel (
@@ -5189,19 +5191,19 @@ void POA_CORBA::Container::create_alias_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AliasDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5210,9 +5212,9 @@ void POA_CORBA::Container::create_alias_skel (
       &_tao_version,
       &_tao_original_type
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5220,7 +5222,7 @@ void POA_CORBA::Container::create_alias_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5233,15 +5235,15 @@ void POA_CORBA::Container::create_alias_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_interface_Container
     : public TAO::Upcall_Command
   {
@@ -5255,38 +5257,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_interface (
           arg_1
@@ -5296,17 +5298,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_interface_skel (
@@ -5316,19 +5318,19 @@ void POA_CORBA::Container::create_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5337,9 +5339,9 @@ void POA_CORBA::Container::create_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5347,7 +5349,7 @@ void POA_CORBA::Container::create_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5360,15 +5362,15 @@ void POA_CORBA::Container::create_interface_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_Container
     : public TAO::Upcall_Command
   {
@@ -5382,74 +5384,74 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           9);
-        
+
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_10 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq, TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           10);
-        
+
       retval =
         this->servant_->create_value (
           arg_1
@@ -5465,17 +5467,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_value_skel (
@@ -5485,13 +5487,13 @@ void POA_CORBA::Container::create_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5503,7 +5505,7 @@ void POA_CORBA::Container::create_value_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5518,9 +5520,9 @@ void POA_CORBA::Container::create_value_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5528,7 +5530,7 @@ void POA_CORBA::Container::create_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5541,15 +5543,15 @@ void POA_CORBA::Container::create_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_box_Container
     : public TAO::Upcall_Command
   {
@@ -5563,38 +5565,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueBoxDef, TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_value_box (
           arg_1
@@ -5604,17 +5606,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_value_box_skel (
@@ -5624,19 +5626,19 @@ void POA_CORBA::Container::create_value_box_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5645,9 +5647,9 @@ void POA_CORBA::Container::create_value_box_skel (
       &_tao_version,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5655,7 +5657,7 @@ void POA_CORBA::Container::create_value_box_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5668,15 +5670,15 @@ void POA_CORBA::Container::create_value_box_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_exception_Container
     : public TAO::Upcall_Command
   {
@@ -5690,38 +5692,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDef, TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_exception (
           arg_1
@@ -5731,17 +5733,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_exception_skel (
@@ -5751,19 +5753,19 @@ void POA_CORBA::Container::create_exception_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5772,9 +5774,9 @@ void POA_CORBA::Container::create_exception_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5782,7 +5784,7 @@ void POA_CORBA::Container::create_exception_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5795,15 +5797,15 @@ void POA_CORBA::Container::create_exception_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_native_Container
     : public TAO::Upcall_Command
   {
@@ -5817,32 +5819,32 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::NativeDef, TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->create_native (
           arg_1
@@ -5851,17 +5853,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_native_skel (
@@ -5871,18 +5873,18 @@ void POA_CORBA::Container::create_native_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::NativeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5890,9 +5892,9 @@ void POA_CORBA::Container::create_native_skel (
       &_tao_name,
       &_tao_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5900,7 +5902,7 @@ void POA_CORBA::Container::create_native_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5913,15 +5915,15 @@ void POA_CORBA::Container::create_native_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_abstract_interface_Container
     : public TAO::Upcall_Command
   {
@@ -5935,38 +5937,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AbstractInterfaceDef, TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AbstractInterfaceDefSeq, TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_abstract_interface (
           arg_1
@@ -5976,17 +5978,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_abstract_interface_skel (
@@ -5996,19 +5998,19 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6017,9 +6019,9 @@ void POA_CORBA::Container::create_abstract_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -6027,7 +6029,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6040,15 +6042,15 @@ void POA_CORBA::Container::create_abstract_interface_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_local_interface_Container
     : public TAO::Upcall_Command
   {
@@ -6062,38 +6064,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::LocalInterfaceDef, TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_local_interface (
           arg_1
@@ -6103,17 +6105,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_local_interface_skel (
@@ -6123,19 +6125,19 @@ void POA_CORBA::Container::create_local_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6144,9 +6146,9 @@ void POA_CORBA::Container::create_local_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -6154,7 +6156,7 @@ void POA_CORBA::Container::create_local_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6167,15 +6169,15 @@ void POA_CORBA::Container::create_local_interface_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_value_Container
     : public TAO::Upcall_Command
   {
@@ -6189,74 +6191,74 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef, TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           9);
-        
+
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           10);
-        
+
       retval =
         this->servant_->create_ext_value (
           arg_1
@@ -6272,17 +6274,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Container::create_ext_value_skel (
@@ -6292,13 +6294,13 @@ void POA_CORBA::Container::create_ext_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6310,7 +6312,7 @@ void POA_CORBA::Container::create_ext_value_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6325,9 +6327,9 @@ void POA_CORBA::Container::create_ext_value_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -6335,7 +6337,7 @@ void POA_CORBA::Container::create_ext_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6348,19 +6350,19 @@ void POA_CORBA::Container::create_ext_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6374,67 +6376,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Container::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _is_a_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6447,16 +6449,16 @@ void POA_CORBA::Container::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6470,58 +6472,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Container::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _non_existent_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6534,16 +6536,16 @@ void POA_CORBA::Container::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6557,58 +6559,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Container::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _repository_id_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6621,18 +6623,18 @@ void POA_CORBA::Container::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::Container::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -6642,30 +6644,30 @@ void POA_CORBA::Container::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -6674,11 +6676,11 @@ void POA_CORBA::Container::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6692,58 +6694,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Container::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _get_component_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6756,7 +6758,7 @@ void POA_CORBA::Container::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::Container::_is_a (
@@ -6809,22 +6811,22 @@ POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Container STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6960,9 +6962,9 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_IDLType_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6974,7 +6976,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::IDLType::IDLType (void)
@@ -6986,7 +6988,7 @@ POA_CORBA::IDLType::IDLType (void)
 POA_CORBA::IDLType::IDLType (const IDLType& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs)
+    POA_CORBA::IRObject (rhs)
 {
 }
 
@@ -6995,11 +6997,11 @@ POA_CORBA::IDLType::~IDLType (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_IDLType
     : public TAO::Upcall_Command
   {
@@ -7013,30 +7015,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::IDLType::_get_type_skel (
@@ -7046,22 +7048,22 @@ void POA_CORBA::IDLType::_get_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
 
@@ -7069,7 +7071,7 @@ void POA_CORBA::IDLType::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7082,19 +7084,19 @@ void POA_CORBA::IDLType::_get_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7108,67 +7110,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IDLType::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _is_a_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7181,16 +7183,16 @@ void POA_CORBA::IDLType::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7204,58 +7206,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IDLType::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _non_existent_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7268,16 +7270,16 @@ void POA_CORBA::IDLType::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7291,58 +7293,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IDLType::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _repository_id_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7355,18 +7357,18 @@ void POA_CORBA::IDLType::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::IDLType::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -7376,30 +7378,30 @@ void POA_CORBA::IDLType::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7408,11 +7410,11 @@ void POA_CORBA::IDLType::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7426,58 +7428,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::IDLType::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _get_component_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7490,7 +7492,7 @@ void POA_CORBA::IDLType::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::IDLType::_is_a (
@@ -7543,22 +7545,22 @@ POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::IDLType STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7674,9 +7676,9 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7725,9 +7727,9 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7739,7 +7741,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::TypedefDef::TypedefDef (void)
@@ -7751,9 +7753,9 @@ POA_CORBA::TypedefDef::TypedefDef (void)
 POA_CORBA::TypedefDef::TypedefDef (const TypedefDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -7761,16 +7763,16 @@ POA_CORBA::TypedefDef::~TypedefDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7784,67 +7786,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::TypedefDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _is_a_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7857,16 +7859,16 @@ void POA_CORBA::TypedefDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7880,58 +7882,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::TypedefDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _non_existent_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7944,16 +7946,16 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7967,58 +7969,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::TypedefDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _repository_id_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8031,18 +8033,18 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::TypedefDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -8052,30 +8054,30 @@ void POA_CORBA::TypedefDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -8084,11 +8086,11 @@ void POA_CORBA::TypedefDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8102,58 +8104,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::TypedefDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _get_component_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8166,7 +8168,7 @@ void POA_CORBA::TypedefDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
@@ -8227,22 +8229,22 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::TypedefDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8253,3 +8255,4 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index ef308b15c7f..02963091e2a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -48,6 +48,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -1242,10 +1244,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-#include "IFR_BaseS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/IFRService/IFR_BaseS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseS.inl"
+#include "orbsvcs/IFRService/IFR_BaseS.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
index 1b61891e2f7..1ec728b1667 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -403,3 +404,5 @@ POA_CORBA::TypedefDef::_get_type_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
index c2d66dc74a8..4dff6ffb090 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_
 #define _TAO_IDL_ORIG_IFR_BASES_T_CPP_
 
-#include "IFR_BaseS_T.h"
+#include "orbsvcs/IFRService/IFR_BaseS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseS_T.inl"
+#include "orbsvcs/IFRService/IFR_BaseS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index 3d6746ad09f..1313c456c1d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -903,12 +905,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseS_T.inl"
+#include "orbsvcs/IFRService/IFR_BaseS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IFR_BaseS_T.cpp"
+#include "orbsvcs/IFRService/IFR_BaseS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index 0a48000f77e..4514816a147 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -1503,3 +1504,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 0b600368c9b..ccc03ffd241 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_
 #define _TAO_IDL_ORIG_IFR_BASICS_CPP_
 
 
-#include "IFR_BasicS.h"
+#include "orbsvcs/IFRService/IFR_BasicS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -69,22 +69,24 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicS.inl"
+#include "orbsvcs/IFRService/IFR_BasicS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -96,13 +98,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -116,13 +118,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -136,13 +138,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -156,13 +158,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -176,13 +178,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
@@ -196,13 +198,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -216,13 +218,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::StructMemberSeq>
     : public
@@ -236,13 +238,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExcDescriptionSeq>
     : public
@@ -256,13 +258,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -276,13 +278,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -296,13 +298,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_)
 #define _CORBA_PRIMITIVEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::PrimitiveDef>
     : public
@@ -316,13 +318,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_STRINGDEF__SARG_TRAITS_)
 #define _CORBA_STRINGDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::StringDef>
     : public
@@ -336,13 +338,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_)
 #define _CORBA_SEQUENCEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::SequenceDef>
     : public
@@ -356,13 +358,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_)
 #define _CORBA_ARRAYDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ArrayDef>
     : public
@@ -376,13 +378,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_)
 #define _CORBA_WSTRINGDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::WstringDef>
     : public
@@ -396,13 +398,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_)
 #define _CORBA_FIXEDDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::FixedDef>
     : public
@@ -416,13 +418,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_)
 #define _CORBA_PRIMITIVEKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::PrimitiveKind>
     : public
@@ -434,13 +436,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -454,13 +456,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AttributeMode>
     : public
@@ -472,13 +474,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
     : public
@@ -492,13 +494,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtAttributeDescription>
     : public
@@ -512,13 +514,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -532,13 +534,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -550,13 +552,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -570,13 +572,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -590,13 +592,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::OperationDef>
     : public
@@ -610,13 +612,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
@@ -639,13 +641,13 @@ namespace TAO
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -657,13 +659,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -678,13 +680,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -699,13 +701,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -720,13 +722,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -741,13 +743,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
@@ -761,13 +763,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -781,13 +783,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -801,13 +803,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
@@ -821,13 +823,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -841,13 +843,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -861,13 +863,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
 #define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::PrimitiveDef>
     : public
@@ -882,13 +884,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
 #define _CORBA_STRINGDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::StringDef>
     : public
@@ -903,13 +905,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
 #define _CORBA_SEQUENCEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::SequenceDef>
     : public
@@ -924,13 +926,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
 #define _CORBA_ARRAYDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ArrayDef>
     : public
@@ -945,13 +947,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
 #define _CORBA_WSTRINGDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::WstringDef>
     : public
@@ -966,13 +968,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
 #define _CORBA_FIXEDDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::FixedDef>
     : public
@@ -987,13 +989,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::PrimitiveKind>
     : public
@@ -1005,13 +1007,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -1025,13 +1027,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
@@ -1043,13 +1045,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -1064,13 +1066,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtAttributeDescription>
     : public
@@ -1084,13 +1086,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -1105,13 +1107,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -1123,13 +1125,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -1143,13 +1145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -1163,13 +1165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -1184,13 +1186,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
@@ -1329,11 +1331,11 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12,  13, 
-       14,  15,  16, -19,  -2, -22,  -2,  17,  18, -63,  -1,  21, -64,  24, 
-       -1,  25,  -1,  26,  27,  28,  29,  30,  31,  32,  33,  -1,  34,  35, 
-       36,  37,  38,  39,  -1,  40,  -1,  -1,  -1,  41,  42,  -1,  -1,  -1, 
-       -1,  43, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12,  13,
+       14,  15,  16, -19,  -2, -22,  -2,  17,  18, -63,  -1,  21, -64,  24,
+       -1,  25,  -1,  26,  27,  28,  29,  30,  31,  32,  33,  -1,  34,  35,
+       36,  37,  38,  39,  -1,  40,  -1,  -1,  -1,  41,  42,  -1,  -1,  -1,
+       -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1382,9 +1384,9 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Repository_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1396,7 +1398,7 @@ CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Repository::Repository (void)
@@ -1408,8 +1410,8 @@ POA_CORBA::Repository::Repository (void)
 POA_CORBA::Repository::Repository (const Repository& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs)
 {
 }
 
@@ -1418,11 +1420,11 @@ POA_CORBA::Repository::~Repository (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_id_Repository
     : public TAO::Upcall_Command
   {
@@ -1436,37 +1438,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained, TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->lookup_id (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::lookup_id_skel (
@@ -1476,24 +1478,24 @@ void POA_CORBA::Repository::lookup_id_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_search_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1501,7 +1503,7 @@ void POA_CORBA::Repository::lookup_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1514,15 +1516,15 @@ void POA_CORBA::Repository::lookup_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_canonical_typecode_Repository
     : public TAO::Upcall_Command
   {
@@ -1536,37 +1538,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->get_canonical_typecode (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::get_canonical_typecode_skel (
@@ -1576,24 +1578,24 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_tc
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1601,7 +1603,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1614,15 +1616,15 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_primitive_Repository
     : public TAO::Upcall_Command
   {
@@ -1636,37 +1638,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveDef, TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::PrimitiveKind, TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->get_primitive (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::get_primitive_skel (
@@ -1676,24 +1678,24 @@ void POA_CORBA::Repository::get_primitive_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_kind
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1701,7 +1703,7 @@ void POA_CORBA::Repository::get_primitive_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1714,15 +1716,15 @@ void POA_CORBA::Repository::get_primitive_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_string_Repository
     : public TAO::Upcall_Command
   {
@@ -1736,37 +1738,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StringDef, TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->create_string (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::create_string_skel (
@@ -1776,24 +1778,24 @@ void POA_CORBA::Repository::create_string_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1801,7 +1803,7 @@ void POA_CORBA::Repository::create_string_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1814,15 +1816,15 @@ void POA_CORBA::Repository::create_string_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_wstring_Repository
     : public TAO::Upcall_Command
   {
@@ -1836,37 +1838,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::WstringDef, TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->create_wstring (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::create_wstring_skel (
@@ -1876,24 +1878,24 @@ void POA_CORBA::Repository::create_wstring_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::WstringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1901,7 +1903,7 @@ void POA_CORBA::Repository::create_wstring_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1914,15 +1916,15 @@ void POA_CORBA::Repository::create_wstring_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_sequence_Repository
     : public TAO::Upcall_Command
   {
@@ -1936,26 +1938,26 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::SequenceDef, TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_sequence (
           arg_1
@@ -1963,17 +1965,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::create_sequence_skel (
@@ -1983,26 +1985,26 @@ void POA_CORBA::Repository::create_sequence_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound,
       &_tao_element_type
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -2010,7 +2012,7 @@ void POA_CORBA::Repository::create_sequence_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2023,15 +2025,15 @@ void POA_CORBA::Repository::create_sequence_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_array_Repository
     : public TAO::Upcall_Command
   {
@@ -2045,26 +2047,26 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ArrayDef, TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_array (
           arg_1
@@ -2072,17 +2074,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::create_array_skel (
@@ -2092,26 +2094,26 @@ void POA_CORBA::Repository::create_array_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_length,
       &_tao_element_type
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -2119,7 +2121,7 @@ void POA_CORBA::Repository::create_array_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2132,15 +2134,15 @@ void POA_CORBA::Repository::create_array_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_fixed_Repository
     : public TAO::Upcall_Command
   {
@@ -2154,26 +2156,26 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::FixedDef, TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UShort, TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Short, TAO::SArg_Traits< ::CORBA::Short>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_fixed (
           arg_1
@@ -2181,17 +2183,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Repository::create_fixed_skel (
@@ -2201,26 +2203,26 @@ void POA_CORBA::Repository::create_fixed_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::FixedDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
   TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_digits,
       &_tao_scale
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -2228,7 +2230,7 @@ void POA_CORBA::Repository::create_fixed_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2241,19 +2243,19 @@ void POA_CORBA::Repository::create_fixed_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2267,67 +2269,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Repository::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _is_a_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2340,16 +2342,16 @@ void POA_CORBA::Repository::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2363,58 +2365,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Repository::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _non_existent_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2427,16 +2429,16 @@ void POA_CORBA::Repository::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2450,58 +2452,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Repository::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _repository_id_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2514,18 +2516,18 @@ void POA_CORBA::Repository::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::Repository::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -2535,30 +2537,30 @@ void POA_CORBA::Repository::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -2567,11 +2569,11 @@ void POA_CORBA::Repository::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2585,58 +2587,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Repository::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _get_component_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2649,7 +2651,7 @@ void POA_CORBA::Repository::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::Repository::_is_a (
@@ -2706,22 +2708,22 @@ POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Repository STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2854,11 +2856,11 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67, 
-       -9,  -2, -65,  11,  -1, -19,  -2,  12,  13,  14,  -1,  15,  16,  17, 
-       18, -73,  21,  22,  23, -26,  -2,  24,  25, -67,  28,  -1,  29, -32, 
-       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  37,  -1, 
-       -1,  -1,  -1,  -1,  38,  -1,  -1,  39, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67,
+       -9,  -2, -65,  11,  -1, -19,  -2,  12,  13,  14,  -1,  15,  16,  17,
+       18, -73,  21,  22,  23, -26,  -2,  24,  25, -67,  28,  -1,  29, -32,
+       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  37,  -1,
+       -1,  -1,  -1,  -1,  38,  -1,  -1,  39,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2907,9 +2909,9 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2921,7 +2923,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ModuleDef::ModuleDef (void)
@@ -2933,9 +2935,9 @@ POA_CORBA::ModuleDef::ModuleDef (void)
 POA_CORBA::ModuleDef::ModuleDef (const ModuleDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -2943,16 +2945,16 @@ POA_CORBA::ModuleDef::~ModuleDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2966,67 +2968,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ModuleDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _is_a_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3039,16 +3041,16 @@ void POA_CORBA::ModuleDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3062,58 +3064,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ModuleDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _non_existent_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3126,16 +3128,16 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3149,58 +3151,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ModuleDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _repository_id_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3213,18 +3215,18 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ModuleDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -3234,30 +3236,30 @@ void POA_CORBA::ModuleDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -3266,11 +3268,11 @@ void POA_CORBA::ModuleDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3284,58 +3286,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ModuleDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _get_component_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3348,7 +3350,7 @@ void POA_CORBA::ModuleDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
@@ -3409,22 +3411,22 @@ POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ModuleDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3544,9 +3546,9 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  48, -46,  -1, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  48, -46,  -1, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3595,9 +3597,9 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3609,7 +3611,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ConstantDef::ConstantDef (void)
@@ -3621,8 +3623,8 @@ POA_CORBA::ConstantDef::ConstantDef (void)
 POA_CORBA::ConstantDef::ConstantDef (const ConstantDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -3631,11 +3633,11 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3649,30 +3651,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstantDef::_get_type_skel (
@@ -3682,22 +3684,22 @@ void POA_CORBA::ConstantDef::_get_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3705,7 +3707,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3718,15 +3720,15 @@ void POA_CORBA::ConstantDef::_get_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3740,30 +3742,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstantDef::_get_type_def_skel (
@@ -3773,22 +3775,22 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3796,7 +3798,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3809,15 +3811,15 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3831,7 +3833,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -3839,23 +3841,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstantDef::_set_type_def_skel (
@@ -3865,24 +3867,24 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3890,7 +3892,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3903,15 +3905,15 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_value_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3925,30 +3927,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Any>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Any, TAO::SArg_Traits< ::CORBA::Any>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->value (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstantDef::_get_value_skel (
@@ -3958,22 +3960,22 @@ void POA_CORBA::ConstantDef::_get_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Any>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3981,7 +3983,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3994,15 +3996,15 @@ void POA_CORBA::ConstantDef::_get_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_value_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -4016,7 +4018,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_1 =
@@ -4024,23 +4026,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->value (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstantDef::_set_value_skel (
@@ -4050,24 +4052,24 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_value
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -4075,7 +4077,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4088,19 +4090,19 @@ void POA_CORBA::ConstantDef::_set_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4114,67 +4116,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstantDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _is_a_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4187,16 +4189,16 @@ void POA_CORBA::ConstantDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4210,58 +4212,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstantDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _non_existent_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4274,16 +4276,16 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4297,58 +4299,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstantDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _repository_id_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4361,18 +4363,18 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ConstantDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -4382,30 +4384,30 @@ void POA_CORBA::ConstantDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -4414,11 +4416,11 @@ void POA_CORBA::ConstantDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4432,58 +4434,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstantDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _get_component_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4496,7 +4498,7 @@ void POA_CORBA::ConstantDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
@@ -4553,22 +4555,22 @@ POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ConstantDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4704,11 +4706,11 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
-      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
-       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
-       40,  41,  42,  -1,  43, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15,
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1,
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62,
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1,
+       40,  41,  42,  -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4757,9 +4759,9 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_StructDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -4771,7 +4773,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::StructDef::StructDef (void)
@@ -4783,11 +4785,11 @@ POA_CORBA::StructDef::StructDef (void)
 POA_CORBA::StructDef::StructDef (const StructDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs),
+    POA_CORBA::Container (rhs)
 {
 }
 
@@ -4796,11 +4798,11 @@ POA_CORBA::StructDef::~StructDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_StructDef
     : public TAO::Upcall_Command
   {
@@ -4814,30 +4816,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->members (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::StructDef::_get_members_skel (
@@ -4847,22 +4849,22 @@ void POA_CORBA::StructDef::_get_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
 
@@ -4870,7 +4872,7 @@ void POA_CORBA::StructDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4883,15 +4885,15 @@ void POA_CORBA::StructDef::_get_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_StructDef
     : public TAO::Upcall_Command
   {
@@ -4905,7 +4907,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
@@ -4913,23 +4915,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::StructDef::_set_members_skel (
@@ -4939,24 +4941,24 @@ void POA_CORBA::StructDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
 
@@ -4964,7 +4966,7 @@ void POA_CORBA::StructDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4977,19 +4979,19 @@ void POA_CORBA::StructDef::_set_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5003,67 +5005,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StructDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _is_a_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5076,16 +5078,16 @@ void POA_CORBA::StructDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5099,58 +5101,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StructDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _non_existent_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5163,16 +5165,16 @@ void POA_CORBA::StructDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5186,58 +5188,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StructDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _repository_id_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5250,18 +5252,18 @@ void POA_CORBA::StructDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::StructDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -5271,30 +5273,30 @@ void POA_CORBA::StructDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -5303,11 +5305,11 @@ void POA_CORBA::StructDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5321,58 +5323,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StructDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _get_component_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5385,7 +5387,7 @@ void POA_CORBA::StructDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::StructDef::_is_a (
@@ -5454,22 +5456,22 @@ POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::StructDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5608,13 +5610,13 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -87,  10,  11,  -1,  -1, 
-       -1,  -1,  -1,  -1,  12,  -1,  -1, -14,  -2,  13,  -1, -17,  -2, -91, 
-      -21,  -2,  16,  -1, -92,  -1, -23,  -2,  19,  20, -95, -25,  -2, -92, 
-      -88,  27,  -1,  -1,  28,  29,  30,  31,  32,  33,  34,  35,  -1,  36, 
-       37,  38,  39,  -1, -40,  -2, -87,  -1,  -1,  -1,  -1,  42,  -1,  -1, 
-       -1,  -1,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44, 
-       -1,  45, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -87,  10,  11,  -1,  -1,
+       -1,  -1,  -1,  -1,  12,  -1,  -1, -14,  -2,  13,  -1, -17,  -2, -91,
+      -21,  -2,  16,  -1, -92,  -1, -23,  -2,  19,  20, -95, -25,  -2, -92,
+      -88,  27,  -1,  -1,  28,  29,  30,  31,  32,  33,  34,  35,  -1,  36,
+       37,  38,  39,  -1, -40,  -2, -87,  -1,  -1,  -1,  -1,  42,  -1,  -1,
+       -1,  -1,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,
+       -1,  45,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5663,9 +5665,9 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_UnionDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5677,7 +5679,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::UnionDef::UnionDef (void)
@@ -5689,11 +5691,11 @@ POA_CORBA::UnionDef::UnionDef (void)
 POA_CORBA::UnionDef::UnionDef (const UnionDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs),
+    POA_CORBA::Container (rhs)
 {
 }
 
@@ -5702,11 +5704,11 @@ POA_CORBA::UnionDef::~UnionDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_discriminator_type_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5720,30 +5722,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->discriminator_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::UnionDef::_get_discriminator_type_skel (
@@ -5753,22 +5755,22 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5776,7 +5778,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5789,15 +5791,15 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_discriminator_type_def_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5811,30 +5813,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->discriminator_type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
@@ -5844,22 +5846,22 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5867,7 +5869,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5880,15 +5882,15 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_discriminator_type_def_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5902,7 +5904,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -5910,23 +5912,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->discriminator_type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
@@ -5936,24 +5938,24 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_discriminator_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5961,7 +5963,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5974,15 +5976,15 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5996,30 +5998,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UnionMemberSeq, TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->members (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::UnionDef::_get_members_skel (
@@ -6029,22 +6031,22 @@ void POA_CORBA::UnionDef::_get_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -6052,7 +6054,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6065,15 +6067,15 @@ void POA_CORBA::UnionDef::_get_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_UnionDef
     : public TAO::Upcall_Command
   {
@@ -6087,7 +6089,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_1 =
@@ -6095,23 +6097,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::UnionDef::_set_members_skel (
@@ -6121,24 +6123,24 @@ void POA_CORBA::UnionDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -6146,7 +6148,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6159,19 +6161,19 @@ void POA_CORBA::UnionDef::_set_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6185,67 +6187,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::UnionDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _is_a_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6258,16 +6260,16 @@ void POA_CORBA::UnionDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6281,58 +6283,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::UnionDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _non_existent_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6345,16 +6347,16 @@ void POA_CORBA::UnionDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6368,58 +6370,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::UnionDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _repository_id_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6432,18 +6434,18 @@ void POA_CORBA::UnionDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::UnionDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -6453,30 +6455,30 @@ void POA_CORBA::UnionDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -6485,11 +6487,11 @@ void POA_CORBA::UnionDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6503,58 +6505,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::UnionDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _get_component_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6567,7 +6569,7 @@ void POA_CORBA::UnionDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::UnionDef::_is_a (
@@ -6636,22 +6638,22 @@ POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::UnionDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6769,9 +6771,9 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6820,9 +6822,9 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_EnumDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6834,7 +6836,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::EnumDef::EnumDef (void)
@@ -6846,10 +6848,10 @@ POA_CORBA::EnumDef::EnumDef (void)
 POA_CORBA::EnumDef::EnumDef (const EnumDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs)
 {
 }
 
@@ -6858,11 +6860,11 @@ POA_CORBA::EnumDef::~EnumDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_EnumDef
     : public TAO::Upcall_Command
   {
@@ -6876,30 +6878,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::EnumMemberSeq, TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->members (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::EnumDef::_get_members_skel (
@@ -6909,22 +6911,22 @@ void POA_CORBA::EnumDef::_get_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
 
@@ -6932,7 +6934,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6945,15 +6947,15 @@ void POA_CORBA::EnumDef::_get_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_EnumDef
     : public TAO::Upcall_Command
   {
@@ -6967,7 +6969,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_1 =
@@ -6975,23 +6977,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::EnumDef::_set_members_skel (
@@ -7001,24 +7003,24 @@ void POA_CORBA::EnumDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
 
@@ -7026,7 +7028,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7039,19 +7041,19 @@ void POA_CORBA::EnumDef::_set_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7065,67 +7067,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::EnumDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _is_a_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7138,16 +7140,16 @@ void POA_CORBA::EnumDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7161,58 +7163,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::EnumDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _non_existent_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7225,16 +7227,16 @@ void POA_CORBA::EnumDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7248,58 +7250,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::EnumDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _repository_id_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7312,18 +7314,18 @@ void POA_CORBA::EnumDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::EnumDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -7333,30 +7335,30 @@ void POA_CORBA::EnumDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7365,11 +7367,11 @@ void POA_CORBA::EnumDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7383,58 +7385,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::EnumDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _get_component_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7447,7 +7449,7 @@ void POA_CORBA::EnumDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::EnumDef::_is_a (
@@ -7512,22 +7514,22 @@ POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::EnumDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7645,9 +7647,9 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7696,9 +7698,9 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AliasDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7710,7 +7712,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AliasDef::AliasDef (void)
@@ -7722,10 +7724,10 @@ POA_CORBA::AliasDef::AliasDef (void)
 POA_CORBA::AliasDef::AliasDef (const AliasDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs)
 {
 }
 
@@ -7734,11 +7736,11 @@ POA_CORBA::AliasDef::~AliasDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_original_type_def_AliasDef
     : public TAO::Upcall_Command
   {
@@ -7752,30 +7754,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->original_type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AliasDef::_get_original_type_def_skel (
@@ -7785,22 +7787,22 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
 
@@ -7808,7 +7810,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7821,15 +7823,15 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_original_type_def_AliasDef
     : public TAO::Upcall_Command
   {
@@ -7843,7 +7845,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -7851,23 +7853,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->original_type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AliasDef::_set_original_type_def_skel (
@@ -7877,24 +7879,24 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
 
@@ -7902,7 +7904,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7915,19 +7917,19 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7941,67 +7943,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AliasDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _is_a_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8014,16 +8016,16 @@ void POA_CORBA::AliasDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8037,58 +8039,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AliasDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _non_existent_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8101,16 +8103,16 @@ void POA_CORBA::AliasDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8124,58 +8126,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AliasDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _repository_id_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8188,18 +8190,18 @@ void POA_CORBA::AliasDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::AliasDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -8209,30 +8211,30 @@ void POA_CORBA::AliasDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -8241,11 +8243,11 @@ void POA_CORBA::AliasDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8259,58 +8261,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AliasDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _get_component_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8323,7 +8325,7 @@ void POA_CORBA::AliasDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::AliasDef::_is_a (
@@ -8388,22 +8390,22 @@ POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AliasDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8519,9 +8521,9 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8570,9 +8572,9 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_NativeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8584,7 +8586,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::NativeDef::NativeDef (void)
@@ -8596,10 +8598,10 @@ POA_CORBA::NativeDef::NativeDef (void)
 POA_CORBA::NativeDef::NativeDef (const NativeDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs)
 {
 }
 
@@ -8607,16 +8609,16 @@ POA_CORBA::NativeDef::~NativeDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8630,67 +8632,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::NativeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _is_a_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8703,16 +8705,16 @@ void POA_CORBA::NativeDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8726,58 +8728,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::NativeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _non_existent_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8790,16 +8792,16 @@ void POA_CORBA::NativeDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8813,58 +8815,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::NativeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _repository_id_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8877,18 +8879,18 @@ void POA_CORBA::NativeDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::NativeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -8898,30 +8900,30 @@ void POA_CORBA::NativeDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -8930,11 +8932,11 @@ void POA_CORBA::NativeDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8948,58 +8950,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::NativeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _get_component_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9012,7 +9014,7 @@ void POA_CORBA::NativeDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::NativeDef::_is_a (
@@ -9077,22 +9079,22 @@ POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::NativeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9229,9 +9231,9 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -9243,7 +9245,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::PrimitiveDef::PrimitiveDef (void)
@@ -9255,8 +9257,8 @@ POA_CORBA::PrimitiveDef::PrimitiveDef (void)
 POA_CORBA::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -9265,11 +9267,11 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_kind_PrimitiveDef
     : public TAO::Upcall_Command
   {
@@ -9283,30 +9285,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveKind, TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->kind (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::PrimitiveDef::_get_kind_skel (
@@ -9316,22 +9318,22 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
 
@@ -9339,7 +9341,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9352,19 +9354,19 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9378,67 +9380,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::PrimitiveDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _is_a_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9451,16 +9453,16 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9474,58 +9476,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::PrimitiveDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _non_existent_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9538,16 +9540,16 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9561,58 +9563,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::PrimitiveDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _repository_id_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9625,18 +9627,18 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::PrimitiveDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -9646,30 +9648,30 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -9678,11 +9680,11 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9696,58 +9698,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::PrimitiveDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _get_component_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9760,7 +9762,7 @@ void POA_CORBA::PrimitiveDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
@@ -9817,22 +9819,22 @@ POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::PrimitiveDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9939,8 +9941,8 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12,  13,  14, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12,  13,  14,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9989,9 +9991,9 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_StringDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -10003,7 +10005,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::StringDef::StringDef (void)
@@ -10015,8 +10017,8 @@ POA_CORBA::StringDef::StringDef (void)
 POA_CORBA::StringDef::StringDef (const StringDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -10025,11 +10027,11 @@ POA_CORBA::StringDef::~StringDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_StringDef
     : public TAO::Upcall_Command
   {
@@ -10043,30 +10045,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->bound (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::StringDef::_get_bound_skel (
@@ -10076,22 +10078,22 @@ void POA_CORBA::StringDef::_get_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
 
@@ -10099,7 +10101,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10112,15 +10114,15 @@ void POA_CORBA::StringDef::_get_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_StringDef
     : public TAO::Upcall_Command
   {
@@ -10134,7 +10136,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -10142,23 +10144,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::StringDef::_set_bound_skel (
@@ -10168,24 +10170,24 @@ void POA_CORBA::StringDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
 
@@ -10193,7 +10195,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10206,19 +10208,19 @@ void POA_CORBA::StringDef::_set_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10232,67 +10234,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StringDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _is_a_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10305,16 +10307,16 @@ void POA_CORBA::StringDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10328,58 +10330,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StringDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _non_existent_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10392,16 +10394,16 @@ void POA_CORBA::StringDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10415,58 +10417,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StringDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _repository_id_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10479,18 +10481,18 @@ void POA_CORBA::StringDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::StringDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -10500,30 +10502,30 @@ void POA_CORBA::StringDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -10532,11 +10534,11 @@ void POA_CORBA::StringDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10550,58 +10552,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::StringDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _get_component_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10614,7 +10616,7 @@ void POA_CORBA::StringDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::StringDef::_is_a (
@@ -10671,22 +10673,22 @@ POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::StringDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -10793,8 +10795,8 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12,  13,  14, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12,  13,  14,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10843,9 +10845,9 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_WstringDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -10857,7 +10859,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::WstringDef::WstringDef (void)
@@ -10869,8 +10871,8 @@ POA_CORBA::WstringDef::WstringDef (void)
 POA_CORBA::WstringDef::WstringDef (const WstringDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -10879,11 +10881,11 @@ POA_CORBA::WstringDef::~WstringDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_WstringDef
     : public TAO::Upcall_Command
   {
@@ -10897,30 +10899,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->bound (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::WstringDef::_get_bound_skel (
@@ -10930,22 +10932,22 @@ void POA_CORBA::WstringDef::_get_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
 
@@ -10953,7 +10955,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10966,15 +10968,15 @@ void POA_CORBA::WstringDef::_get_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_WstringDef
     : public TAO::Upcall_Command
   {
@@ -10988,7 +10990,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -10996,23 +10998,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::WstringDef::_set_bound_skel (
@@ -11022,24 +11024,24 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
 
@@ -11047,7 +11049,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11060,19 +11062,19 @@ void POA_CORBA::WstringDef::_set_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11086,67 +11088,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::WstringDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _is_a_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11159,16 +11161,16 @@ void POA_CORBA::WstringDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11182,58 +11184,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::WstringDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _non_existent_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11246,16 +11248,16 @@ void POA_CORBA::WstringDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11269,58 +11271,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::WstringDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _repository_id_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11333,18 +11335,18 @@ void POA_CORBA::WstringDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::WstringDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -11354,30 +11356,30 @@ void POA_CORBA::WstringDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -11386,11 +11388,11 @@ void POA_CORBA::WstringDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11404,58 +11406,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::WstringDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _get_component_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11468,7 +11470,7 @@ void POA_CORBA::WstringDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::WstringDef::_is_a (
@@ -11525,22 +11527,22 @@ POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::WstringDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11650,9 +11652,9 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -29,  -1,  -1,   9, 
-       10,  11, -15,  -2,  12,  13,  14, -32,  -1,  -1,  -1,  -1,  -1,  17, 
-      
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -29,  -1,  -1,   9,
+       10,  11, -15,  -2,  12,  13,  14, -32,  -1,  -1,  -1,  -1,  -1,  17,
+
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11701,9 +11703,9 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -11715,7 +11717,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::SequenceDef::SequenceDef (void)
@@ -11727,8 +11729,8 @@ POA_CORBA::SequenceDef::SequenceDef (void)
 POA_CORBA::SequenceDef::SequenceDef (const SequenceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -11737,11 +11739,11 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11755,30 +11757,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->bound (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::SequenceDef::_get_bound_skel (
@@ -11788,22 +11790,22 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11811,7 +11813,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11824,15 +11826,15 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11846,7 +11848,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -11854,23 +11856,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::SequenceDef::_set_bound_skel (
@@ -11880,24 +11882,24 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11905,7 +11907,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11918,15 +11920,15 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11940,30 +11942,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->element_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::SequenceDef::_get_element_type_skel (
@@ -11973,22 +11975,22 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11996,7 +11998,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12009,15 +12011,15 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_def_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -12031,30 +12033,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->element_type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::SequenceDef::_get_element_type_def_skel (
@@ -12064,22 +12066,22 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -12087,7 +12089,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12100,15 +12102,15 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_element_type_def_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -12122,7 +12124,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -12130,23 +12132,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->element_type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::SequenceDef::_set_element_type_def_skel (
@@ -12156,24 +12158,24 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_element_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -12181,7 +12183,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12194,19 +12196,19 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12220,67 +12222,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::SequenceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _is_a_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12293,16 +12295,16 @@ void POA_CORBA::SequenceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12316,58 +12318,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::SequenceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _non_existent_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12380,16 +12382,16 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12403,58 +12405,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::SequenceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _repository_id_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12467,18 +12469,18 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::SequenceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -12488,30 +12490,30 @@ void POA_CORBA::SequenceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -12520,11 +12522,11 @@ void POA_CORBA::SequenceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12538,58 +12540,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::SequenceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _get_component_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12602,7 +12604,7 @@ void POA_CORBA::SequenceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
@@ -12659,22 +12661,22 @@ POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::SequenceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12784,8 +12786,8 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11, 
-       12,  13,  -1,  14,  15, -16,  -2, -23, 
+       -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11,
+       12,  13,  -1,  14,  15, -16,  -2, -23,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12834,9 +12836,9 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -12848,7 +12850,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ArrayDef::ArrayDef (void)
@@ -12860,8 +12862,8 @@ POA_CORBA::ArrayDef::ArrayDef (void)
 POA_CORBA::ArrayDef::ArrayDef (const ArrayDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -12870,11 +12872,11 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_length_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12888,30 +12890,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->length (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ArrayDef::_get_length_skel (
@@ -12921,22 +12923,22 @@ void POA_CORBA::ArrayDef::_get_length_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12944,7 +12946,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12957,15 +12959,15 @@ void POA_CORBA::ArrayDef::_get_length_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_length_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12979,7 +12981,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -12987,23 +12989,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->length (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ArrayDef::_set_length_skel (
@@ -13013,24 +13015,24 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_length
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -13038,7 +13040,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13051,15 +13053,15 @@ void POA_CORBA::ArrayDef::_set_length_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -13073,30 +13075,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->element_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ArrayDef::_get_element_type_skel (
@@ -13106,22 +13108,22 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -13129,7 +13131,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13142,15 +13144,15 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_def_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -13164,30 +13166,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->element_type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ArrayDef::_get_element_type_def_skel (
@@ -13197,22 +13199,22 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -13220,7 +13222,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13233,15 +13235,15 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_element_type_def_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -13255,7 +13257,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -13263,23 +13265,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->element_type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ArrayDef::_set_element_type_def_skel (
@@ -13289,24 +13291,24 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_element_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -13314,7 +13316,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13327,19 +13329,19 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13353,67 +13355,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ArrayDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _is_a_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13426,16 +13428,16 @@ void POA_CORBA::ArrayDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13449,58 +13451,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ArrayDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _non_existent_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13513,16 +13515,16 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13536,58 +13538,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ArrayDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _repository_id_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13600,18 +13602,18 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ArrayDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -13621,30 +13623,30 @@ void POA_CORBA::ArrayDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -13653,11 +13655,11 @@ void POA_CORBA::ArrayDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13671,58 +13673,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ArrayDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _get_component_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13735,7 +13737,7 @@ void POA_CORBA::ArrayDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
@@ -13792,22 +13794,22 @@ POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ArrayDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -13943,11 +13945,11 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
-      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
-       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
-       40,  41,  42,  -1,  43, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15,
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1,
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62,
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1,
+       40,  41,  42,  -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -13996,9 +13998,9 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -14010,7 +14012,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExceptionDef::ExceptionDef (void)
@@ -14022,9 +14024,9 @@ POA_CORBA::ExceptionDef::ExceptionDef (void)
 POA_CORBA::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::Container (rhs)
 {
 }
 
@@ -14033,11 +14035,11 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -14051,30 +14053,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExceptionDef::_get_type_skel (
@@ -14084,22 +14086,22 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -14107,7 +14109,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14120,15 +14122,15 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -14142,30 +14144,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->members (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExceptionDef::_get_members_skel (
@@ -14175,22 +14177,22 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -14198,7 +14200,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14211,15 +14213,15 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -14233,7 +14235,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
@@ -14241,23 +14243,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExceptionDef::_set_members_skel (
@@ -14267,24 +14269,24 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -14292,7 +14294,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14305,19 +14307,19 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14331,67 +14333,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExceptionDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _is_a_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14404,16 +14406,16 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14427,58 +14429,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExceptionDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _non_existent_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14491,16 +14493,16 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14514,58 +14516,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExceptionDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _repository_id_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14578,18 +14580,18 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExceptionDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -14599,30 +14601,30 @@ void POA_CORBA::ExceptionDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -14631,11 +14633,11 @@ void POA_CORBA::ExceptionDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14649,58 +14651,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExceptionDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _get_component_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14713,7 +14715,7 @@ void POA_CORBA::ExceptionDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
@@ -14774,22 +14776,22 @@ POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExceptionDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -14909,9 +14911,9 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -9,  -5, -15,  -2,   4,   5,  -1,  50,   8, -45,  14,  -1, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -6,  -2,  23,  -1,  -1, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+       -9,  -5, -15,  -2,   4,   5,  -1,  50,   8, -45,  14,  -1, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -6,  -2,  23,  -1,  -1, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -14960,9 +14962,9 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -14974,7 +14976,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AttributeDef::AttributeDef (void)
@@ -14986,8 +14988,8 @@ POA_CORBA::AttributeDef::AttributeDef (void)
 POA_CORBA::AttributeDef::AttributeDef (const AttributeDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -14996,11 +14998,11 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -15014,30 +15016,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AttributeDef::_get_type_skel (
@@ -15047,22 +15049,22 @@ void POA_CORBA::AttributeDef::_get_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -15070,7 +15072,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15083,15 +15085,15 @@ void POA_CORBA::AttributeDef::_get_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -15105,30 +15107,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AttributeDef::_get_type_def_skel (
@@ -15138,22 +15140,22 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -15161,7 +15163,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15174,15 +15176,15 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -15196,7 +15198,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -15204,23 +15206,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AttributeDef::_set_type_def_skel (
@@ -15230,24 +15232,24 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -15255,7 +15257,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15268,15 +15270,15 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_mode_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -15290,30 +15292,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->mode (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AttributeDef::_get_mode_skel (
@@ -15323,22 +15325,22 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -15346,7 +15348,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15359,15 +15361,15 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_mode_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -15381,7 +15383,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_1 =
@@ -15389,23 +15391,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->mode (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::AttributeDef::_set_mode_skel (
@@ -15415,24 +15417,24 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -15440,7 +15442,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15453,19 +15455,19 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15479,67 +15481,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AttributeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _is_a_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15552,16 +15554,16 @@ void POA_CORBA::AttributeDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15575,58 +15577,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AttributeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _non_existent_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15639,16 +15641,16 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15662,58 +15664,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AttributeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _repository_id_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15726,18 +15728,18 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::AttributeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -15747,30 +15749,30 @@ void POA_CORBA::AttributeDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -15779,11 +15781,11 @@ void POA_CORBA::AttributeDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15797,58 +15799,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AttributeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _get_component_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15861,7 +15863,7 @@ void POA_CORBA::AttributeDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
@@ -15918,22 +15920,22 @@ POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AttributeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -16058,10 +16060,10 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -6,  -5,   4,   5,  -1, -12,  -2, -50,  11,  -1, -48,  -1, 
-       -1,  14, -16,  -4,  15, -46, -20,  -2, -45,  22,  -1,  -1,  -1,  23, 
-       24,  25,  -1,  26,  -1,  27,  -1,  -1, -28,  -2, -45,  -1,  30,  -1, 
-       -1,  31, 
+       -1,  -1,  -6,  -5,   4,   5,  -1, -12,  -2, -50,  11,  -1, -48,  -1,
+       -1,  14, -16,  -4,  15, -46, -20,  -2, -45,  22,  -1,  -1,  -1,  23,
+       24,  25,  -1,  26,  -1,  27,  -1,  -1, -28,  -2, -45,  -1,  30,  -1,
+       -1,  31,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -16110,9 +16112,9 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -16124,7 +16126,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtAttributeDef::ExtAttributeDef (void)
@@ -16136,9 +16138,9 @@ POA_CORBA::ExtAttributeDef::ExtAttributeDef (void)
 POA_CORBA::ExtAttributeDef::ExtAttributeDef (const ExtAttributeDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, AttributeDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::AttributeDef (rhs)
 {
 }
 
@@ -16147,11 +16149,11 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_get_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -16165,30 +16167,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->get_exceptions (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
@@ -16198,22 +16200,22 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16221,7 +16223,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16234,15 +16236,15 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_get_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -16256,7 +16258,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
@@ -16264,23 +16266,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->get_exceptions (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
@@ -16290,24 +16292,24 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_get_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16315,7 +16317,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16328,15 +16330,15 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_set_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -16350,30 +16352,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->set_exceptions (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
@@ -16383,22 +16385,22 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16406,7 +16408,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16419,15 +16421,15 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_set_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -16441,7 +16443,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
@@ -16449,23 +16451,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->set_exceptions (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
@@ -16475,24 +16477,24 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16500,7 +16502,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16513,15 +16515,15 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_attribute_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -16535,30 +16537,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDescription, TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe_attribute (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
@@ -16568,22 +16570,22 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16591,7 +16593,7 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16604,19 +16606,19 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16630,67 +16632,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAttributeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _is_a_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16703,16 +16705,16 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16726,58 +16728,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAttributeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _non_existent_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16790,16 +16792,16 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16813,58 +16815,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAttributeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _repository_id_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16877,18 +16879,18 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExtAttributeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -16898,30 +16900,30 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -16930,11 +16932,11 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16948,58 +16950,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAttributeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _get_component_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17012,7 +17014,7 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a (
@@ -17073,22 +17075,22 @@ POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtAttributeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -17219,7 +17221,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -17320,9 +17322,9 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_OperationDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -17334,7 +17336,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::OperationDef::OperationDef (void)
@@ -17346,8 +17348,8 @@ POA_CORBA::OperationDef::OperationDef (void)
 POA_CORBA::OperationDef::OperationDef (const OperationDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -17356,11 +17358,11 @@ POA_CORBA::OperationDef::~OperationDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_result_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17374,30 +17376,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->result (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_result_skel (
@@ -17407,22 +17409,22 @@ void POA_CORBA::OperationDef::_get_result_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17430,7 +17432,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17443,15 +17445,15 @@ void POA_CORBA::OperationDef::_get_result_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_result_def_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17465,30 +17467,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->result_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_result_def_skel (
@@ -17498,22 +17500,22 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17521,7 +17523,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17534,15 +17536,15 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_result_def_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17556,7 +17558,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -17564,23 +17566,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->result_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_set_result_def_skel (
@@ -17590,24 +17592,24 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_result_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17615,7 +17617,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17628,15 +17630,15 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_params_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17650,30 +17652,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->params (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_params_skel (
@@ -17683,22 +17685,22 @@ void POA_CORBA::OperationDef::_get_params_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17706,7 +17708,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17719,15 +17721,15 @@ void POA_CORBA::OperationDef::_get_params_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_params_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17741,7 +17743,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_1 =
@@ -17749,23 +17751,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->params (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_set_params_skel (
@@ -17775,24 +17777,24 @@ void POA_CORBA::OperationDef::_set_params_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_params
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17800,7 +17802,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17813,15 +17815,15 @@ void POA_CORBA::OperationDef::_set_params_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_mode_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17835,30 +17837,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->mode (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_mode_skel (
@@ -17868,22 +17870,22 @@ void POA_CORBA::OperationDef::_get_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationMode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17891,7 +17893,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17904,15 +17906,15 @@ void POA_CORBA::OperationDef::_get_mode_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_mode_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17926,7 +17928,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_1 =
@@ -17934,23 +17936,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->mode (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_set_mode_skel (
@@ -17960,24 +17962,24 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17985,7 +17987,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17998,15 +18000,15 @@ void POA_CORBA::OperationDef::_set_mode_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_contexts_OperationDef
     : public TAO::Upcall_Command
   {
@@ -18020,30 +18022,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->contexts (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_contexts_skel (
@@ -18053,22 +18055,22 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -18076,7 +18078,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18089,15 +18091,15 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_contexts_OperationDef
     : public TAO::Upcall_Command
   {
@@ -18111,7 +18113,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_1 =
@@ -18119,23 +18121,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->contexts (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_set_contexts_skel (
@@ -18145,24 +18147,24 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -18170,7 +18172,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18183,15 +18185,15 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_exceptions_OperationDef
     : public TAO::Upcall_Command
   {
@@ -18205,30 +18207,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->exceptions (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_get_exceptions_skel (
@@ -18238,22 +18240,22 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -18261,7 +18263,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18274,15 +18276,15 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_exceptions_OperationDef
     : public TAO::Upcall_Command
   {
@@ -18296,7 +18298,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_1 =
@@ -18304,23 +18306,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->exceptions (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::OperationDef::_set_exceptions_skel (
@@ -18330,24 +18332,24 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -18355,7 +18357,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18368,19 +18370,19 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -18394,67 +18396,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::OperationDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _is_a_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18467,16 +18469,16 @@ void POA_CORBA::OperationDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -18490,58 +18492,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::OperationDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _non_existent_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18554,16 +18556,16 @@ void POA_CORBA::OperationDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -18577,58 +18579,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::OperationDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _repository_id_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18641,18 +18643,18 @@ void POA_CORBA::OperationDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::OperationDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -18662,30 +18664,30 @@ void POA_CORBA::OperationDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -18694,11 +18696,11 @@ void POA_CORBA::OperationDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -18712,58 +18714,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::OperationDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _get_component_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18776,7 +18778,7 @@ void POA_CORBA::OperationDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::OperationDef::_is_a (
@@ -18833,22 +18835,22 @@ POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::OperationDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -18988,12 +18990,12 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -19042,9 +19044,9 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -19056,7 +19058,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::InterfaceDef::InterfaceDef (void)
@@ -19068,10 +19070,10 @@ POA_CORBA::InterfaceDef::InterfaceDef (void)
 POA_CORBA::InterfaceDef::InterfaceDef (const InterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -19080,11 +19082,11 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_base_interfaces_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19098,30 +19100,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->base_interfaces (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
@@ -19131,22 +19133,22 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19154,7 +19156,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19167,15 +19169,15 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_base_interfaces_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19189,7 +19191,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
@@ -19197,23 +19199,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->base_interfaces (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
@@ -19223,24 +19225,24 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19248,7 +19250,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19261,15 +19263,15 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class is_a_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19283,37 +19285,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::is_a_skel (
@@ -19323,24 +19325,24 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19348,7 +19350,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19361,15 +19363,15 @@ void POA_CORBA::InterfaceDef::is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_interface_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19383,30 +19385,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef::FullInterfaceDescription, TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe_interface (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::describe_interface_skel (
@@ -19416,22 +19418,22 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19439,7 +19441,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19452,15 +19454,15 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_attribute_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19474,44 +19476,44 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef, TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_attribute (
           arg_1
@@ -19522,17 +19524,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::create_attribute_skel (
@@ -19542,20 +19544,20 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -19565,9 +19567,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
       &_tao_type,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19575,7 +19577,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19588,15 +19590,15 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_operation_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -19610,62 +19612,62 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef, TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       retval =
         this->servant_->create_operation (
           arg_1
@@ -19679,17 +19681,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceDef::create_operation_skel (
@@ -19699,13 +19701,13 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -19715,7 +19717,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -19728,9 +19730,9 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 9;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19738,7 +19740,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19751,19 +19753,19 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19777,67 +19779,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _is_a_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19850,16 +19852,16 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19873,58 +19875,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _non_existent_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19937,16 +19939,16 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19960,58 +19962,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _repository_id_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20024,18 +20026,18 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::InterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -20045,30 +20047,30 @@ void POA_CORBA::InterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -20077,11 +20079,11 @@ void POA_CORBA::InterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20095,58 +20097,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _get_component_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20159,7 +20161,7 @@ void POA_CORBA::InterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
@@ -20224,22 +20226,22 @@ POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::InterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -20375,9 +20377,9 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -20389,7 +20391,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::InterfaceAttrExtension::InterfaceAttrExtension (void)
@@ -20409,11 +20411,11 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_ext_interface_InterfaceAttrExtension
     : public TAO::Upcall_Command
   {
@@ -20427,30 +20429,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe_ext_interface (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
@@ -20460,22 +20462,22 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
 
@@ -20483,7 +20485,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20496,15 +20498,15 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_attribute_InterfaceAttrExtension
     : public TAO::Upcall_Command
   {
@@ -20518,56 +20520,56 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef, TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       retval =
         this->servant_->create_ext_attribute (
           arg_1
@@ -20580,17 +20582,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
@@ -20600,13 +20602,13 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -20615,7 +20617,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -20627,9 +20629,9 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
 
@@ -20637,7 +20639,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20650,19 +20652,19 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20676,67 +20678,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _is_a_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20749,16 +20751,16 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20772,58 +20774,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _non_existent_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20836,16 +20838,16 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20859,58 +20861,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _repository_id_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20923,18 +20925,18 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::InterfaceAttrExtension::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -20944,30 +20946,30 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -20976,11 +20978,11 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20994,58 +20996,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::InterfaceAttrExtension::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _get_component_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21058,7 +21060,7 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a (
@@ -21107,22 +21109,22 @@ POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::InterfaceAttrExtension STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21264,12 +21266,12 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21318,9 +21320,9 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -21332,7 +21334,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
@@ -21344,12 +21346,12 @@ POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
 POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (const ExtInterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceAttrExtension) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs),
+    POA_CORBA::InterfaceAttrExtension (rhs)
 {
 }
 
@@ -21357,16 +21359,16 @@ POA_CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21380,67 +21382,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _is_a_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21453,16 +21455,16 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21476,58 +21478,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _non_existent_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21540,16 +21542,16 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21563,58 +21565,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _repository_id_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21627,18 +21629,18 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExtInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -21648,30 +21650,30 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -21680,11 +21682,11 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21698,58 +21700,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _get_component_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21762,7 +21764,7 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a (
@@ -21835,22 +21837,22 @@ POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21990,12 +21992,12 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22044,9 +22046,9 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -22058,7 +22060,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
@@ -22070,11 +22072,11 @@ POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
 POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (const AbstractInterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs)
 {
 }
 
@@ -22082,16 +22084,16 @@ POA_CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22105,67 +22107,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _is_a_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22178,16 +22180,16 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22201,58 +22203,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _non_existent_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22265,16 +22267,16 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22288,58 +22290,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _repository_id_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22352,18 +22354,18 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::AbstractInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -22373,30 +22375,30 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -22405,11 +22407,11 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22423,58 +22425,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::AbstractInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _get_component_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22487,7 +22489,7 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
@@ -22556,22 +22558,22 @@ POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AbstractInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -22713,12 +22715,12 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22767,9 +22769,9 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -22781,7 +22783,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
@@ -22793,13 +22795,13 @@ POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
 POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, AbstractInterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceAttrExtension) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs),
+    POA_CORBA::AbstractInterfaceDef (rhs),
+    POA_CORBA::InterfaceAttrExtension (rhs)
 {
 }
 
@@ -22807,16 +22809,16 @@ POA_CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22830,67 +22832,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _is_a_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22903,16 +22905,16 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22926,58 +22928,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _non_existent_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22990,16 +22992,16 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23013,58 +23015,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _repository_id_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23077,18 +23079,18 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -23098,30 +23100,30 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -23130,11 +23132,11 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23148,58 +23150,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _get_component_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23212,7 +23214,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a (
@@ -23289,22 +23291,22 @@ POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtAbstractInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -23444,12 +23446,12 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -23498,9 +23500,9 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr
 int
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -23512,7 +23514,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
@@ -23524,11 +23526,11 @@ POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
 POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (const LocalInterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs)
 {
 }
 
@@ -23536,16 +23538,16 @@ POA_CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23559,67 +23561,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::LocalInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _is_a_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23632,16 +23634,16 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23655,58 +23657,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _non_existent_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23719,16 +23721,16 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23742,58 +23744,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _repository_id_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23806,18 +23808,18 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::LocalInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -23827,30 +23829,30 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -23859,11 +23861,11 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23877,58 +23879,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::LocalInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _get_component_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23941,7 +23943,7 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
@@ -24010,22 +24012,22 @@ POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::LocalInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -24167,12 +24169,12 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -24221,9 +24223,9 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -24235,7 +24237,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
@@ -24247,13 +24249,13 @@ POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
 POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (const ExtLocalInterfaceDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, LocalInterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceAttrExtension) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs),
+    POA_CORBA::LocalInterfaceDef (rhs),
+    POA_CORBA::InterfaceAttrExtension (rhs)
 {
 }
 
@@ -24261,16 +24263,16 @@ POA_CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -24284,67 +24286,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _is_a_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -24357,16 +24359,16 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -24380,58 +24382,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _non_existent_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -24444,16 +24446,16 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -24467,58 +24469,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _repository_id_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -24531,18 +24533,18 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -24552,30 +24554,30 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -24584,11 +24586,11 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -24602,58 +24604,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _get_component_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -24666,7 +24668,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a (
@@ -24743,22 +24745,22 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtLocalInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -24769,3 +24771,4 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 83ceea96c6a..f1a3050b67c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "IFR_BaseS.h"
+#include "orbsvcs/IFRService/IFR_BaseS.h"
 #include "tao/ParameterModeS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -48,6 +48,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -7879,10 +7881,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-#include "IFR_BasicS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/IFRService/IFR_BasicS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicS.inl"
+#include "orbsvcs/IFRService/IFR_BasicS.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
index ce9eeacd9e4..145677a50a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -9652,3 +9653,5 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
index 1b3eeebb76a..03d51e6bba8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
 
-#include "IFR_BasicS_T.h"
+#include "orbsvcs/IFRService/IFR_BasicS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicS_T.inl"
+#include "orbsvcs/IFRService/IFR_BasicS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index e51d59c3efa..ebca0c6b9fe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -7947,12 +7949,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicS_T.inl"
+#include "orbsvcs/IFRService/IFR_BasicS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IFR_BasicS_T.cpp"
+#include "orbsvcs/IFRService/IFR_BasicS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index dc17374df92..3db89111ce8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
@@ -13430,3 +13432,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 31dcee3fd14..9f40c2ba255 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
 
 
-#include "IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -67,22 +67,24 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsS.inl"
+#include "orbsvcs/IFRService/IFR_ComponentsS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -94,13 +96,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -114,13 +116,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -134,13 +136,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -154,13 +156,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -174,13 +176,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -194,13 +196,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -214,13 +216,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -234,13 +236,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -254,13 +256,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -274,13 +276,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -294,13 +296,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -312,13 +314,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -332,13 +334,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -352,13 +354,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
@@ -372,13 +374,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::HomeDef>
     : public
@@ -392,13 +394,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EventDef>
     : public
@@ -412,13 +414,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
@@ -432,13 +434,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::UsesDef>
     : public
@@ -452,13 +454,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
@@ -472,13 +474,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
@@ -492,13 +494,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
@@ -512,13 +514,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
@@ -532,13 +534,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FinderDef>
     : public
@@ -561,13 +563,13 @@ namespace TAO
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -579,13 +581,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -600,13 +602,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -621,13 +623,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -642,13 +644,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -663,13 +665,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -683,13 +685,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -704,13 +706,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -724,13 +726,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -744,13 +746,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -764,13 +766,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -784,13 +786,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -802,13 +804,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -822,13 +824,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -842,13 +844,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
@@ -863,13 +865,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
     : public
@@ -884,13 +886,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
     : public
@@ -905,13 +907,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
@@ -926,13 +928,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
     : public
@@ -947,13 +949,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
@@ -968,13 +970,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
@@ -989,13 +991,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
@@ -1010,13 +1012,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
@@ -1031,13 +1033,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
     : public
@@ -1203,14 +1205,14 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed short lookup[] =
     {
-       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
-       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
-        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
-        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
-        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
-        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10,
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17,
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32,
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139,
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53,
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1259,9 +1261,9 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1273,7 +1275,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EventDef::EventDef (void)
@@ -1285,12 +1287,12 @@ POA_CORBA::ComponentIR::EventDef::EventDef (void)
 POA_CORBA::ComponentIR::EventDef::EventDef (const EventDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ValueDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ExtValueDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::ValueDef (rhs),
+    POA_CORBA::ExtValueDef (rhs)
 {
 }
 
@@ -1298,18 +1300,18 @@ POA_CORBA::ComponentIR::EventDef::~EventDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1323,69 +1325,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _is_a_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1398,18 +1400,18 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1423,60 +1425,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _non_existent_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1489,18 +1491,18 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1514,60 +1516,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _repository_id_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1580,18 +1582,18 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::EventDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -1601,30 +1603,30 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -1635,11 +1637,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1653,60 +1655,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _get_component_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1719,7 +1721,7 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a (
@@ -1792,22 +1794,22 @@ POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EventDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1932,10 +1934,10 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,   7,  -1, -10,  -2,   8,   9, -50, 
-      -12,  -2, -48,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  27,  28,  29,  -1,  30,  -1,  31,  32, 
-       33,  -1,  -1,  -1,  34, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,   7,  -1, -10,  -2,   8,   9, -50,
+      -12,  -2, -48,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22,
+       -1,  -1,  23,  24,  25,  26,  27,  28,  29,  -1,  30,  -1,  31,  32,
+       33,  -1,  -1,  -1,  34,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1984,9 +1986,9 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1998,7 +2000,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::Container::Container (void)
@@ -2010,8 +2012,8 @@ POA_CORBA::ComponentIR::Container::Container (void)
 POA_CORBA::ComponentIR::Container::Container (const Container& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs)
 {
 }
 
@@ -2022,11 +2024,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_component_Container
       : public TAO::Upcall_Command
     {
@@ -2040,44 +2042,44 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_component (
             arg_1
@@ -2088,19 +2090,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::Container::create_component_skel (
@@ -2110,20 +2112,20 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2133,9 +2135,9 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
       &_tao_base_component,
       &_tao_supports_interfaces
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2143,7 +2145,7 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2156,17 +2158,17 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_home_Container
       : public TAO::Upcall_Command
     {
@@ -2180,56 +2182,56 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_6 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             6);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_7 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             7);
-          
+
         retval =
           this->servant_->create_home (
             arg_1
@@ -2242,19 +2244,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::Container::create_home_skel (
@@ -2264,13 +2266,13 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2279,7 +2281,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2291,9 +2293,9 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
       &_tao_supports_interfaces,
       &_tao_primary_key
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2301,7 +2303,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2314,17 +2316,17 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_event_Container
       : public TAO::Upcall_Command
     {
@@ -2338,74 +2340,74 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             6);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
             this->operation_details_,
             this->args_,
             7);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             8);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             9);
-          
+
         TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             10);
-          
+
         retval =
           this->servant_->create_event (
             arg_1
@@ -2421,19 +2423,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::Container::create_event_skel (
@@ -2443,13 +2445,13 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2461,7 +2463,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2476,9 +2478,9 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2486,7 +2488,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2499,21 +2501,21 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2527,69 +2529,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Container::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _is_a_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2602,18 +2604,18 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2627,60 +2629,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Container::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _non_existent_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2693,18 +2695,18 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2718,60 +2720,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Container::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _repository_id_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2784,18 +2786,18 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::Container::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -2805,30 +2807,30 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -2839,11 +2841,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2857,60 +2859,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Container::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _get_component_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2923,7 +2925,7 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a (
@@ -2980,22 +2982,22 @@ POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::Container STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3131,11 +3133,11 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1, -11,  -2, -13,  -2,   7,   8, -25,  -2,   9,  10, -67, 
-      -27,  -2, -68,  15,  -1,  16,  -1,  17,  18, -35,  -2,  19,  20,  21, 
-       22,  -1,  23,  24, -80,  -1, -77,  29,  30,  -1,  31,  32,  33,  34, 
-      -76,  37,  -1,  38,  39,  -1,  40,  -1,  41,  42,  43,  44,  -1,  -1, 
-       -1,  45, 
+       -1,  -1,  -1, -11,  -2, -13,  -2,   7,   8, -25,  -2,   9,  10, -67,
+      -27,  -2, -68,  15,  -1,  16,  -1,  17,  18, -35,  -2,  19,  20,  21,
+       22,  -1,  23,  24, -80,  -1, -77,  29,  30,  -1,  31,  32,  33,  34,
+      -76,  37,  -1,  38,  39,  -1,  40,  -1,  41,  42,  43,  44,  -1,  -1,
+       -1,  45,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3184,9 +3186,9 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3198,7 +3200,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ModuleDef::ModuleDef (void)
@@ -3210,11 +3212,11 @@ POA_CORBA::ComponentIR::ModuleDef::ModuleDef (void)
 POA_CORBA::ComponentIR::ModuleDef::ModuleDef (const ModuleDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ModuleDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA::ComponentIR, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::ModuleDef (rhs),
+    POA_CORBA::ComponentIR::Container (rhs)
 {
 }
 
@@ -3222,18 +3224,18 @@ POA_CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3247,69 +3249,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _is_a_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3322,18 +3324,18 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3347,60 +3349,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _non_existent_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3413,18 +3415,18 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3438,60 +3440,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _repository_id_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3504,18 +3506,18 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -3525,30 +3527,30 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -3559,11 +3561,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3577,60 +3579,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _get_component_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3643,7 +3645,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a (
@@ -3712,22 +3714,22 @@ POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ModuleDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3861,12 +3863,12 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12, -28, 
-       -2,  13,  14,  15,  16,  -1,  17,  18,  19,  20,  21,  22,  23,  24, 
-       25, -31,  -2,  26,  27, -97,  -1,  30, -84,  33,  34,  35,  36,  37, 
-       38,  39,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  44,  -1,  -1, 
-       -1,  45,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  46, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12, -28,
+       -2,  13,  14,  15,  16,  -1,  17,  18,  19,  20,  21,  22,  23,  24,
+       25, -31,  -2,  26,  27, -97,  -1,  30, -84,  33,  34,  35,  36,  37,
+       38,  39,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  44,  -1,  -1,
+       -1,  45,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3915,9 +3917,9 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3929,7 +3931,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::Repository::Repository (void)
@@ -3941,10 +3943,10 @@ POA_CORBA::ComponentIR::Repository::Repository (void)
 POA_CORBA::ComponentIR::Repository::Repository (const Repository& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Repository) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA::ComponentIR, Container) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Repository (rhs),
+    POA_CORBA::ComponentIR::Container (rhs)
 {
 }
 
@@ -3952,18 +3954,18 @@ POA_CORBA::ComponentIR::Repository::~Repository (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3977,69 +3979,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Repository::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _is_a_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4052,18 +4054,18 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4077,60 +4079,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _non_existent_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4143,18 +4145,18 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4168,60 +4170,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _repository_id_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4234,18 +4236,18 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::Repository::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -4255,30 +4257,30 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -4289,11 +4291,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4307,60 +4309,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::Repository::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _get_component_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4373,7 +4375,7 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a (
@@ -4438,22 +4440,22 @@ POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::Repository STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4570,9 +4572,9 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18, -53,  21,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -19,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18, -53,  21,  -9,  -2,  22,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4621,9 +4623,9 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -4635,7 +4637,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
@@ -4647,8 +4649,8 @@ POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
 POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -4659,11 +4661,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_interface_type_ProvidesDef
       : public TAO::Upcall_Command
     {
@@ -4677,32 +4679,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->interface_type (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
@@ -4712,22 +4714,22 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
 
@@ -4735,7 +4737,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4748,17 +4750,17 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_interface_type_ProvidesDef
       : public TAO::Upcall_Command
     {
@@ -4772,7 +4774,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
@@ -4780,25 +4782,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->interface_type (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
@@ -4808,24 +4810,24 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
 
@@ -4833,7 +4835,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4846,21 +4848,21 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4874,69 +4876,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _is_a_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4949,18 +4951,18 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4974,60 +4976,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _non_existent_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5040,18 +5042,18 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5065,60 +5067,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _repository_id_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5131,18 +5133,18 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -5152,30 +5154,30 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -5186,11 +5188,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5204,60 +5206,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _get_component_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5270,7 +5272,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a (
@@ -5327,22 +5329,22 @@ POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ProvidesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5461,9 +5463,9 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-      -17,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14, 
-       15,  16, -52,  19,  20, -53,  23, -12,  -2,  24,  -9,  -2,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
+      -17,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14,
+       15,  16, -52,  19,  20, -53,  23, -12,  -2,  24,  -9,  -2,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5512,9 +5514,9 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
 int
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5526,7 +5528,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::UsesDef::UsesDef (void)
@@ -5538,8 +5540,8 @@ POA_CORBA::ComponentIR::UsesDef::UsesDef (void)
 POA_CORBA::ComponentIR::UsesDef::UsesDef (const UsesDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -5550,11 +5552,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_interface_type_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5568,32 +5570,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->interface_type (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
@@ -5603,22 +5605,22 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5626,7 +5628,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5639,17 +5641,17 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_interface_type_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5663,7 +5665,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
@@ -5671,25 +5673,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->interface_type (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
@@ -5699,24 +5701,24 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5724,7 +5726,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5737,17 +5739,17 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_is_multiple_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5761,32 +5763,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->is_multiple (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
@@ -5796,22 +5798,22 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5819,7 +5821,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5832,17 +5834,17 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_is_multiple_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5856,7 +5858,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -5864,25 +5866,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->is_multiple (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
@@ -5892,24 +5894,24 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_multiple
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5917,7 +5919,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5930,21 +5932,21 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5958,69 +5960,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _is_a_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6033,18 +6035,18 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6058,60 +6060,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _non_existent_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6124,18 +6126,18 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6149,60 +6151,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _repository_id_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6215,18 +6217,18 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -6236,30 +6238,30 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -6270,11 +6272,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6288,60 +6290,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::UsesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _get_component_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6354,7 +6356,7 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a (
@@ -6411,22 +6413,22 @@ POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::UsesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6544,9 +6546,9 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6595,9 +6597,9 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6609,7 +6611,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EventPortDef::EventPortDef (void)
@@ -6621,8 +6623,8 @@ POA_CORBA::ComponentIR::EventPortDef::EventPortDef (void)
 POA_CORBA::ComponentIR::EventPortDef::EventPortDef (const EventPortDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -6633,11 +6635,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_event_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6651,32 +6653,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->event (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
@@ -6686,22 +6688,22 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6709,7 +6711,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6722,17 +6724,17 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_event_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6746,7 +6748,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_1 =
@@ -6754,25 +6756,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->event (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
@@ -6782,24 +6784,24 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_event
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6807,7 +6809,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6820,17 +6822,17 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class is_a_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6844,39 +6846,39 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_->is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
@@ -6886,24 +6888,24 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_event_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6911,7 +6913,7 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6924,21 +6926,21 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6952,69 +6954,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _is_a_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7027,18 +7029,18 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7052,60 +7054,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _non_existent_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7118,18 +7120,18 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7143,60 +7145,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _repository_id_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7209,18 +7211,18 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -7230,30 +7232,30 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7264,11 +7266,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7282,60 +7284,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _get_component_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7348,7 +7350,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a (
@@ -7405,22 +7407,22 @@ POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EventPortDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7538,9 +7540,9 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7589,9 +7591,9 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7603,7 +7605,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EmitsDef::EmitsDef (void)
@@ -7615,9 +7617,9 @@ POA_CORBA::ComponentIR::EmitsDef::EmitsDef (void)
 POA_CORBA::ComponentIR::EmitsDef::EmitsDef (const EmitsDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA::ComponentIR, EventPortDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::ComponentIR::EventPortDef (rhs)
 {
 }
 
@@ -7625,18 +7627,18 @@ POA_CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7650,69 +7652,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _is_a_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7725,18 +7727,18 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7750,60 +7752,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _non_existent_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7816,18 +7818,18 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7841,60 +7843,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _repository_id_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7907,18 +7909,18 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -7928,30 +7930,30 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7962,11 +7964,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7980,60 +7982,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _get_component_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8046,7 +8048,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a (
@@ -8107,22 +8109,22 @@ POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EmitsDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8240,9 +8242,9 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8291,9 +8293,9 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8305,7 +8307,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::PublishesDef::PublishesDef (void)
@@ -8317,9 +8319,9 @@ POA_CORBA::ComponentIR::PublishesDef::PublishesDef (void)
 POA_CORBA::ComponentIR::PublishesDef::PublishesDef (const PublishesDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA::ComponentIR, EventPortDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::ComponentIR::EventPortDef (rhs)
 {
 }
 
@@ -8327,18 +8329,18 @@ POA_CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8352,69 +8354,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _is_a_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8427,18 +8429,18 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8452,60 +8454,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _non_existent_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8518,18 +8520,18 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8543,60 +8545,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _repository_id_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8609,18 +8611,18 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -8630,30 +8632,30 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -8664,11 +8666,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8682,60 +8684,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _get_component_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8748,7 +8750,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a (
@@ -8809,22 +8811,22 @@ POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::PublishesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8942,9 +8944,9 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8993,9 +8995,9 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -9007,7 +9009,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
@@ -9019,9 +9021,9 @@ POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
 POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA::ComponentIR, EventPortDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::ComponentIR::EventPortDef (rhs)
 {
 }
 
@@ -9029,18 +9031,18 @@ POA_CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -9054,69 +9056,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _is_a_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9129,18 +9131,18 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -9154,60 +9156,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _non_existent_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9220,18 +9222,18 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -9245,60 +9247,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _repository_id_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9311,18 +9313,18 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -9332,30 +9334,30 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -9366,11 +9368,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -9384,60 +9386,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _get_component_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9450,7 +9452,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a (
@@ -9511,22 +9513,22 @@ POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ConsumesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9677,13 +9679,13 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,   -8,   -2,  -10,   -3,    5,   -1,    6,    7,  -97, 
-       -15,   -2,  -98,   13,  -21,   -2,   14,  -96,   17,   18,   -1,   19,   20,  -98, 
-       -23,   -2,  -91,   25,   26,   27,  -32,   -3,   28,   -1,  -40,   -2,   29,   30, 
-        -1,   31,  -99,   35,   36,   37,   38,   -1,   39,   -1, -103,   42,   -1,   43, 
-        -1,   44,   -1,   -1,   -1,   45,   -1,   -1,   -1,  -46,   -2,  -91,  -48,   -2, 
-       -91,  -52,   -2,   50,   51,  -93,   -1,   -1,   -1,   -1,   54,   -1,   -1,   55, 
-        -1,   -1,   -1,  -56,   -2,  -91, 
+        -1,   -1,   -1,   -1,    4,   -8,   -2,  -10,   -3,    5,   -1,    6,    7,  -97,
+       -15,   -2,  -98,   13,  -21,   -2,   14,  -96,   17,   18,   -1,   19,   20,  -98,
+       -23,   -2,  -91,   25,   26,   27,  -32,   -3,   28,   -1,  -40,   -2,   29,   30,
+        -1,   31,  -99,   35,   36,   37,   38,   -1,   39,   -1, -103,   42,   -1,   43,
+        -1,   44,   -1,   -1,   -1,   45,   -1,   -1,   -1,  -46,   -2,  -91,  -48,   -2,
+       -91,  -52,   -2,   50,   51,  -93,   -1,   -1,   -1,   -1,   54,   -1,   -1,   55,
+        -1,   -1,   -1,  -56,   -2,  -91,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9732,9 +9734,9 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -9746,7 +9748,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ComponentDef::ComponentDef (void)
@@ -9758,13 +9760,13 @@ POA_CORBA::ComponentIR::ComponentDef::ComponentDef (void)
 POA_CORBA::ComponentIR::ComponentDef::ComponentDef (const ComponentDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceAttrExtension) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ExtInterfaceDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs),
+    POA_CORBA::InterfaceAttrExtension (rhs),
+    POA_CORBA::ExtInterfaceDef (rhs)
 {
 }
 
@@ -9775,11 +9777,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_base_component_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9793,32 +9795,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->base_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
@@ -9828,22 +9830,22 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9851,7 +9853,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9864,17 +9866,17 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_base_component_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9888,7 +9890,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
@@ -9896,25 +9898,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->base_component (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
@@ -9924,24 +9926,24 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_component
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9949,7 +9951,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9962,17 +9964,17 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_supported_interfaces_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9986,32 +9988,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->supported_interfaces (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
@@ -10021,22 +10023,22 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10044,7 +10046,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10057,17 +10059,17 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_supported_interfaces_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10081,7 +10083,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
@@ -10089,25 +10091,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->supported_interfaces (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
@@ -10117,24 +10119,24 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10142,7 +10144,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10155,17 +10157,17 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_provides_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10179,38 +10181,38 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ProvidesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_provides (
             arg_1
@@ -10220,19 +10222,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
@@ -10242,19 +10244,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10263,9 +10265,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
       &_tao_version,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10273,7 +10275,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10286,17 +10288,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_uses_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10310,44 +10312,44 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::UsesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_uses (
             arg_1
@@ -10358,19 +10360,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
@@ -10380,20 +10382,20 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10403,9 +10405,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
       &_tao_interface_type,
       &_tao_is_multiple
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10413,7 +10415,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10426,17 +10428,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_emits_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10450,38 +10452,38 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EmitsDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_emits (
             arg_1
@@ -10491,19 +10493,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
@@ -10513,19 +10515,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10534,9 +10536,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10544,7 +10546,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10557,17 +10559,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_publishes_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10581,38 +10583,38 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::PublishesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_publishes (
             arg_1
@@ -10622,19 +10624,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
@@ -10644,19 +10646,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10665,9 +10667,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10675,7 +10677,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10688,17 +10690,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_consumes_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10712,38 +10714,38 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ConsumesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_consumes (
             arg_1
@@ -10753,19 +10755,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
@@ -10775,19 +10777,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10796,9 +10798,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10806,7 +10808,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10819,21 +10821,21 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10847,69 +10849,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _is_a_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10922,18 +10924,18 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10947,60 +10949,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _non_existent_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11013,18 +11015,18 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11038,60 +11040,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _repository_id_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11104,18 +11106,18 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -11125,30 +11127,30 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -11159,11 +11161,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11177,60 +11179,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _get_component_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11243,7 +11245,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a (
@@ -11320,22 +11322,22 @@ POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ComponentDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11466,7 +11468,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -11567,9 +11569,9 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -11581,7 +11583,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::FactoryDef::FactoryDef (void)
@@ -11593,9 +11595,9 @@ POA_CORBA::ComponentIR::FactoryDef::FactoryDef (void)
 POA_CORBA::ComponentIR::FactoryDef::FactoryDef (const FactoryDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, OperationDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::OperationDef (rhs)
 {
 }
 
@@ -11603,18 +11605,18 @@ POA_CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11628,69 +11630,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _is_a_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11703,18 +11705,18 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11728,60 +11730,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _non_existent_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11794,18 +11796,18 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11819,60 +11821,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _repository_id_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11885,18 +11887,18 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -11906,30 +11908,30 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -11940,11 +11942,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11958,60 +11960,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _get_component_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12024,7 +12026,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a (
@@ -12085,22 +12087,22 @@ POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::FactoryDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12231,7 +12233,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -12332,9 +12334,9 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -12346,7 +12348,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::FinderDef::FinderDef (void)
@@ -12358,9 +12360,9 @@ POA_CORBA::ComponentIR::FinderDef::FinderDef (void)
 POA_CORBA::ComponentIR::FinderDef::FinderDef (const FinderDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, OperationDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::OperationDef (rhs)
 {
 }
 
@@ -12368,18 +12370,18 @@ POA_CORBA::ComponentIR::FinderDef::~FinderDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12393,69 +12395,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _is_a_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12468,18 +12470,18 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12493,60 +12495,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _non_existent_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12559,18 +12561,18 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12584,60 +12586,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _repository_id_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12650,18 +12652,18 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -12671,30 +12673,30 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -12705,11 +12707,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12723,60 +12725,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::FinderDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _get_component_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12789,7 +12791,7 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a (
@@ -12850,22 +12852,22 @@ POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::FinderDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -13017,14 +13019,14 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -102,   10,   11,  -12,   -2, 
-      -102,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -104, -103, 
-        20,   -1,  -21,   -2, -102,   23,   24,   25,   26,   27,   28,   -1,  -32,   -2, 
-        29,   -1,  -36,   -2,  -38,   -2,  -40,   -3,   30,  -43,   -2,   31,   -1, -115, 
-        34,   35, -114,   -1, -114, -113, -111,   45,   -1,   46,   47,   48,   -1,   49, 
-        50,   -1,   51,   -1,   -1,   -1,   -1,   52,   -1,  -53,   -2, -102,   -1,   -1, 
-        -1,   -1,   -1,   -1,   55,   -1,   -1,   -1,   56,   -1,   -1,   -1,   -1,   -1, 
-        57,   -1,   58, 
+        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -102,   10,   11,  -12,   -2,
+      -102,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -104, -103,
+        20,   -1,  -21,   -2, -102,   23,   24,   25,   26,   27,   28,   -1,  -32,   -2,
+        29,   -1,  -36,   -2,  -38,   -2,  -40,   -3,   30,  -43,   -2,   31,   -1, -115,
+        34,   35, -114,   -1, -114, -113, -111,   45,   -1,   46,   47,   48,   -1,   49,
+        50,   -1,   51,   -1,   -1,   -1,   -1,   52,   -1,  -53,   -2, -102,   -1,   -1,
+        -1,   -1,   -1,   -1,   55,   -1,   -1,   -1,   56,   -1,   -1,   -1,   -1,   -1,
+        57,   -1,   58,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -13073,9 +13075,9 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
 int
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -13087,7 +13089,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::HomeDef::HomeDef (void)
@@ -13099,13 +13101,13 @@ POA_CORBA::ComponentIR::HomeDef::HomeDef (void)
 POA_CORBA::ComponentIR::HomeDef::HomeDef (const HomeDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, InterfaceAttrExtension) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ExtInterfaceDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::InterfaceDef (rhs),
+    POA_CORBA::InterfaceAttrExtension (rhs),
+    POA_CORBA::ExtInterfaceDef (rhs)
 {
 }
 
@@ -13116,11 +13118,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_base_home_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13134,32 +13136,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->base_home (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
@@ -13169,22 +13171,22 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13192,7 +13194,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13205,17 +13207,17 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_base_home_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13229,7 +13231,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_1 =
@@ -13237,25 +13239,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->base_home (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
@@ -13265,24 +13267,24 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_home
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13290,7 +13292,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13303,17 +13305,17 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_supported_interfaces_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13327,32 +13329,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->supported_interfaces (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
@@ -13362,22 +13364,22 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13385,7 +13387,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13398,17 +13400,17 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_supported_interfaces_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13422,7 +13424,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
@@ -13430,25 +13432,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->supported_interfaces (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
@@ -13458,24 +13460,24 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13483,7 +13485,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13496,17 +13498,17 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_managed_component_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13520,32 +13522,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->managed_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
@@ -13555,22 +13557,22 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13578,7 +13580,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13591,17 +13593,17 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_managed_component_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13615,7 +13617,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
@@ -13623,25 +13625,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->managed_component (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
@@ -13651,24 +13653,24 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_managed_component
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13676,7 +13678,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13689,17 +13691,17 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_primary_key_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13713,32 +13715,32 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_->primary_key (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
@@ -13748,22 +13750,22 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13771,7 +13773,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13784,17 +13786,17 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_primary_key_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13808,7 +13810,7 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
@@ -13816,25 +13818,25 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->primary_key (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
@@ -13844,24 +13846,24 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_primary_key
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13869,7 +13871,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13882,17 +13884,17 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_factory_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13906,44 +13908,44 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FactoryDef, TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_factory (
             arg_1
@@ -13954,19 +13956,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
@@ -13976,20 +13978,20 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -13999,9 +14001,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -14009,7 +14011,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14022,17 +14024,17 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_finder_HomeDef
       : public TAO::Upcall_Command
     {
@@ -14046,44 +14048,44 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FinderDef, TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_finder (
             arg_1
@@ -14094,19 +14096,19 @@ namespace POA_CORBA
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
@@ -14116,20 +14118,20 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -14139,9 +14141,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -14149,7 +14151,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14162,21 +14164,21 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -14190,69 +14192,69 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
             arg_1
             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _is_a_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14265,18 +14267,18 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -14290,60 +14292,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _non_existent (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _non_existent_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14356,18 +14358,18 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -14381,60 +14383,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _repository_id (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _repository_id_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14447,18 +14449,18 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -14468,30 +14470,30 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -14502,11 +14504,11 @@ namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -14520,60 +14522,60 @@ namespace POA_CORBA
         , args_ (args)
       {
       }
-      
+
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
           this->servant_-> _get_component (
             ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
-    
+
   }
-  
+
 }
 void POA_CORBA::ComponentIR::HomeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _get_component_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14586,7 +14588,7 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a (
@@ -14663,22 +14665,22 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::HomeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -14689,3 +14691,4 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index 1bc5fc2a6e4..91a17a070cc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
-#include "IFR_ExtendedS.h"
+#include "orbsvcs/IFRService/IFR_ExtendedS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -47,6 +47,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -5100,10 +5102,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-#include "IFR_ComponentsS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/IFRService/IFR_ComponentsS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsS.inl"
+#include "orbsvcs/IFRService/IFR_ComponentsS.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
index 7027d026daa..75931686c79 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -6961,3 +6962,5 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
index b2d75f94608..9ea48d226df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
 
-#include "IFR_ComponentsS_T.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsS_T.inl"
+#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 7d1ccb307aa..cad66ac774e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -5363,12 +5365,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsS_T.inl"
+#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IFR_ComponentsS_T.cpp"
+#include "orbsvcs/IFRService/IFR_ComponentsS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index 1ab68c0aadd..547d5af6150 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -9010,3 +9011,4 @@ template <class T> ACE_INLINE
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 989fae38f6c..6376a89c18e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
 
 
-#include "IFR_ExtendedS.h"
+#include "orbsvcs/IFRService/IFR_ExtendedS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -67,22 +67,24 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedS.inl"
+#include "orbsvcs/IFRService/IFR_ExtendedS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -94,13 +96,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -114,13 +116,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -134,13 +136,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -154,13 +156,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -174,13 +176,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -194,13 +196,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
@@ -214,13 +216,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -234,13 +236,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -254,13 +256,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
@@ -274,13 +276,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -294,13 +296,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -314,13 +316,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AttributeMode>
     : public
@@ -332,13 +334,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
     : public
@@ -352,13 +354,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -372,13 +374,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -390,13 +392,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -410,13 +412,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -430,13 +432,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::OperationDef>
     : public
@@ -450,13 +452,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueMemberDef>
     : public
@@ -479,13 +481,13 @@ namespace TAO
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -497,13 +499,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -518,13 +520,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -539,13 +541,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -560,13 +562,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -580,13 +582,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -601,13 +603,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
@@ -621,13 +623,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -641,13 +643,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -661,13 +663,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
@@ -681,13 +683,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -701,13 +703,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -721,13 +723,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
@@ -739,13 +741,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -760,13 +762,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -781,13 +783,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:846
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -799,13 +801,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -819,13 +821,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -839,13 +841,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -860,13 +862,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
     : public
@@ -984,8 +986,8 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13, 
-       14,  15,  -1,  -1,  16, 
+       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13,
+       14,  15,  -1,  -1,  16,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1034,9 +1036,9 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1048,7 +1050,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::FixedDef::FixedDef (void)
@@ -1060,8 +1062,8 @@ POA_CORBA::FixedDef::FixedDef (void)
 POA_CORBA::FixedDef::FixedDef (const FixedDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -1070,11 +1072,11 @@ POA_CORBA::FixedDef::~FixedDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_digits_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1088,30 +1090,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::UShort>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UShort, TAO::SArg_Traits< ::CORBA::UShort>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->digits (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::FixedDef::_get_digits_skel (
@@ -1121,22 +1123,22 @@ void POA_CORBA::FixedDef::_get_digits_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UShort>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1144,7 +1146,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1157,15 +1159,15 @@ void POA_CORBA::FixedDef::_get_digits_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_digits_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1179,7 +1181,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
@@ -1187,23 +1189,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->digits (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::FixedDef::_set_digits_skel (
@@ -1213,24 +1215,24 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_digits
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1238,7 +1240,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1251,15 +1253,15 @@ void POA_CORBA::FixedDef::_set_digits_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_scale_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1273,30 +1275,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Short>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Short, TAO::SArg_Traits< ::CORBA::Short>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->scale (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::FixedDef::_get_scale_skel (
@@ -1306,22 +1308,22 @@ void POA_CORBA::FixedDef::_get_scale_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Short>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1329,7 +1331,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1342,15 +1344,15 @@ void POA_CORBA::FixedDef::_get_scale_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_scale_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1364,7 +1366,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_1 =
@@ -1372,23 +1374,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->scale (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::FixedDef::_set_scale_skel (
@@ -1398,24 +1400,24 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_scale
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1423,7 +1425,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1436,19 +1438,19 @@ void POA_CORBA::FixedDef::_set_scale_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1462,67 +1464,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::FixedDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _is_a_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1535,16 +1537,16 @@ void POA_CORBA::FixedDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1558,58 +1560,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::FixedDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _non_existent_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1622,16 +1624,16 @@ void POA_CORBA::FixedDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1645,58 +1647,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::FixedDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _repository_id_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1709,18 +1711,18 @@ void POA_CORBA::FixedDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::FixedDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -1730,30 +1732,30 @@ void POA_CORBA::FixedDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -1762,11 +1764,11 @@ void POA_CORBA::FixedDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1780,58 +1782,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::FixedDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _get_component_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1844,7 +1846,7 @@ void POA_CORBA::FixedDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::FixedDef::_is_a (
@@ -1901,22 +1903,22 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::FixedDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2036,9 +2038,9 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 
   static const signed char lookup[] =
     {
-      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2087,9 +2089,9 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2101,7 +2103,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueMemberDef::ValueMemberDef (void)
@@ -2113,8 +2115,8 @@ POA_CORBA::ValueMemberDef::ValueMemberDef (void)
 POA_CORBA::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs)
 {
 }
 
@@ -2123,11 +2125,11 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2141,30 +2143,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode, TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueMemberDef::_get_type_skel (
@@ -2174,22 +2176,22 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2197,7 +2199,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2210,15 +2212,15 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2232,30 +2234,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueMemberDef::_get_type_def_skel (
@@ -2265,22 +2267,22 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2288,7 +2290,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2301,15 +2303,15 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2323,7 +2325,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -2331,23 +2333,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueMemberDef::_set_type_def_skel (
@@ -2357,24 +2359,24 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2382,7 +2384,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2395,15 +2397,15 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_access_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2417,30 +2419,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Visibility>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Visibility, TAO::SArg_Traits< ::CORBA::Visibility>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->access (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueMemberDef::_get_access_skel (
@@ -2450,22 +2452,22 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Visibility>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2473,7 +2475,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2486,15 +2488,15 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_access_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2508,7 +2510,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_1 =
@@ -2516,23 +2518,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->access (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueMemberDef::_set_access_skel (
@@ -2542,24 +2544,24 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_access
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2567,7 +2569,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2580,19 +2582,19 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2606,67 +2608,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueMemberDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _is_a_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2679,16 +2681,16 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2702,58 +2704,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueMemberDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _non_existent_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2766,16 +2768,16 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2789,58 +2791,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueMemberDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _repository_id_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2853,18 +2855,18 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ValueMemberDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -2874,30 +2876,30 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -2906,11 +2908,11 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2924,58 +2926,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueMemberDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _get_component_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2988,7 +2990,7 @@ void POA_CORBA::ValueMemberDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
@@ -3045,22 +3047,22 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueMemberDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3213,14 +3215,14 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed short lookup[] =
     {
-        -8,   -2,  -11,   -2,    4,    5,    6,   -1,  -14,   -2,    7,   -1, -116,   10, 
-      -116,   13, -112,   -1,  -20,   -2,  -22,   -2,  -27,   -4,  -34,   -3,   16,   17, 
-        18,   -1,   19, -117, -116,   -1,   24,   -1,   25,   -1,   26,   -1, -122,   31, 
-        32,   -1,   33,  -39,   -2,  -41,   -2, -129,   37,   38,   -1,  -44,   -2, -114, 
-        -1, -114,   43, -110,   -1,   -1,   -1,   46,   47,  -49,   -2,   48, -107,  -51, 
-        -3, -106,   54,   -1,   -1,   -1,   -1,   55,   -1,   -1,   56,   -1,   57,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        58,   -1,   -1,   -1,   -1,   -1,   59, 
+        -8,   -2,  -11,   -2,    4,    5,    6,   -1,  -14,   -2,    7,   -1, -116,   10,
+      -116,   13, -112,   -1,  -20,   -2,  -22,   -2,  -27,   -4,  -34,   -3,   16,   17,
+        18,   -1,   19, -117, -116,   -1,   24,   -1,   25,   -1,   26,   -1, -122,   31,
+        32,   -1,   33,  -39,   -2,  -41,   -2, -129,   37,   38,   -1,  -44,   -2, -114,
+        -1, -114,   43, -110,   -1,   -1,   -1,   46,   47,  -49,   -2,   48, -107,  -51,
+        -3, -106,   54,   -1,   -1,   -1,   -1,   55,   -1,   -1,   56,   -1,   57,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        58,   -1,   -1,   -1,   -1,   -1,   59,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3269,9 +3271,9 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3283,7 +3285,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueDef::ValueDef (void)
@@ -3295,10 +3297,10 @@ POA_CORBA::ValueDef::ValueDef (void)
 POA_CORBA::ValueDef::ValueDef (const ValueDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs)
 {
 }
 
@@ -3307,11 +3309,11 @@ POA_CORBA::ValueDef::~ValueDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_supported_interfaces_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3325,30 +3327,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->supported_interfaces (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
@@ -3358,22 +3360,22 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3381,7 +3383,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3394,15 +3396,15 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_supported_interfaces_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3416,7 +3418,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
@@ -3424,23 +3426,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->supported_interfaces (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
@@ -3450,24 +3452,24 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3475,7 +3477,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3488,15 +3490,15 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_initializers_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3510,30 +3512,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InitializerSeq, TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->initializers (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_initializers_skel (
@@ -3543,22 +3545,22 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3566,7 +3568,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3579,15 +3581,15 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_initializers_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3601,7 +3603,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_1 =
@@ -3609,23 +3611,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->initializers (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_initializers_skel (
@@ -3635,24 +3637,24 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3660,7 +3662,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3673,15 +3675,15 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_base_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3695,30 +3697,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->base_value (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_base_value_skel (
@@ -3728,22 +3730,22 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3751,7 +3753,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3764,15 +3766,15 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_base_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3786,7 +3788,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
@@ -3794,23 +3796,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->base_value (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_base_value_skel (
@@ -3820,24 +3822,24 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_value
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3845,7 +3847,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3858,15 +3860,15 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_abstract_base_values_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3880,30 +3882,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->abstract_base_values (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
@@ -3913,22 +3915,22 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3936,7 +3938,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3949,15 +3951,15 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_abstract_base_values_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3971,7 +3973,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_1 =
@@ -3979,23 +3981,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->abstract_base_values (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
@@ -4005,24 +4007,24 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_abstract_base_values
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4030,7 +4032,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4043,15 +4045,15 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_abstract_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4065,30 +4067,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->is_abstract (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_is_abstract_skel (
@@ -4098,22 +4100,22 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4121,7 +4123,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4134,15 +4136,15 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_abstract_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4156,7 +4158,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -4164,23 +4166,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_abstract (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_is_abstract_skel (
@@ -4190,24 +4192,24 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_abstract
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4215,7 +4217,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4228,15 +4230,15 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_custom_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4250,30 +4252,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->is_custom (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_is_custom_skel (
@@ -4283,22 +4285,22 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4306,7 +4308,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4319,15 +4321,15 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_custom_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4341,7 +4343,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -4349,23 +4351,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_custom (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_is_custom_skel (
@@ -4375,24 +4377,24 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_custom
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4400,7 +4402,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4413,15 +4415,15 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_truncatable_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4435,30 +4437,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->is_truncatable (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_get_is_truncatable_skel (
@@ -4468,22 +4470,22 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4491,7 +4493,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4504,15 +4506,15 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_truncatable_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4526,7 +4528,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -4534,23 +4536,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_truncatable (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::_set_is_truncatable_skel (
@@ -4560,24 +4562,24 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_truncatable
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4585,7 +4587,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4598,15 +4600,15 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class is_a_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4620,37 +4622,37 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::is_a_skel (
@@ -4660,24 +4662,24 @@ void POA_CORBA::ValueDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4685,7 +4687,7 @@ void POA_CORBA::ValueDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4698,15 +4700,15 @@ void POA_CORBA::ValueDef::is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4720,30 +4722,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef::FullValueDescription, TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe_value (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::describe_value_skel (
@@ -4753,22 +4755,22 @@ void POA_CORBA::ValueDef::describe_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4776,7 +4778,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4789,15 +4791,15 @@ void POA_CORBA::ValueDef::describe_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_member_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4811,44 +4813,44 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueMemberDef, TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Visibility, TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_value_member (
           arg_1
@@ -4859,17 +4861,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::create_value_member_skel (
@@ -4879,20 +4881,20 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4902,9 +4904,9 @@ void POA_CORBA::ValueDef::create_value_member_skel (
       &_tao_type,
       &_tao_access
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4912,7 +4914,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4925,15 +4927,15 @@ void POA_CORBA::ValueDef::create_value_member_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_attribute_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4947,44 +4949,44 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef, TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_attribute (
           arg_1
@@ -4995,17 +4997,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::create_attribute_skel (
@@ -5015,20 +5017,20 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5038,9 +5040,9 @@ void POA_CORBA::ValueDef::create_attribute_skel (
       &_tao_type,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -5048,7 +5050,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5061,15 +5063,15 @@ void POA_CORBA::ValueDef::create_attribute_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_operation_ValueDef
     : public TAO::Upcall_Command
   {
@@ -5083,62 +5085,62 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef, TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       retval =
         this->servant_->create_operation (
           arg_1
@@ -5152,17 +5154,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueDef::create_operation_skel (
@@ -5172,13 +5174,13 @@ void POA_CORBA::ValueDef::create_operation_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5188,7 +5190,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5201,9 +5203,9 @@ void POA_CORBA::ValueDef::create_operation_skel (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 9;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -5211,7 +5213,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5224,19 +5226,19 @@ void POA_CORBA::ValueDef::create_operation_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5250,67 +5252,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _is_a_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5323,16 +5325,16 @@ void POA_CORBA::ValueDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5346,58 +5348,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _non_existent_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5410,16 +5412,16 @@ void POA_CORBA::ValueDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5433,58 +5435,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _repository_id_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5497,18 +5499,18 @@ void POA_CORBA::ValueDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ValueDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -5518,30 +5520,30 @@ void POA_CORBA::ValueDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -5550,11 +5552,11 @@ void POA_CORBA::ValueDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5568,58 +5570,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _get_component_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5632,7 +5634,7 @@ void POA_CORBA::ValueDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ValueDef::_is_a (
@@ -5697,22 +5699,22 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5869,14 +5871,14 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed short lookup[] =
     {
-       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
-       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
-        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
-        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
-        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
-        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10,
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17,
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32,
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139,
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53,
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5925,9 +5927,9 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5939,7 +5941,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtValueDef::ExtValueDef (void)
@@ -5951,11 +5953,11 @@ POA_CORBA::ExtValueDef::ExtValueDef (void)
 POA_CORBA::ExtValueDef::ExtValueDef (const ExtValueDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, ValueDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Container (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::ValueDef (rhs)
 {
 }
 
@@ -5964,11 +5966,11 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_ext_initializers_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -5982,30 +5984,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->ext_initializers (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
@@ -6015,22 +6017,22 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6038,7 +6040,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6051,15 +6053,15 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_ext_initializers_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -6073,7 +6075,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_1 =
@@ -6081,23 +6083,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->ext_initializers (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
@@ -6107,24 +6109,24 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_ext_initializers
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6132,7 +6134,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6145,15 +6147,15 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_ext_value_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -6167,30 +6169,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef::ExtFullValueDescription, TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->describe_ext_value (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtValueDef::describe_ext_value_skel (
@@ -6200,22 +6202,22 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6223,7 +6225,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6236,15 +6238,15 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_attribute_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -6258,56 +6260,56 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef, TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       retval =
         this->servant_->create_ext_attribute (
           arg_1
@@ -6320,17 +6322,17 @@ namespace POA_CORBA
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
@@ -6340,13 +6342,13 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6355,7 +6357,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6367,9 +6369,9 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6377,7 +6379,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6390,19 +6392,19 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6416,67 +6418,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtValueDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _is_a_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6489,16 +6491,16 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6512,58 +6514,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtValueDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _non_existent_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6576,16 +6578,16 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6599,58 +6601,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtValueDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _repository_id_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6663,18 +6665,18 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ExtValueDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -6684,30 +6686,30 @@ void POA_CORBA::ExtValueDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -6716,11 +6718,11 @@ void POA_CORBA::ExtValueDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6734,58 +6736,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ExtValueDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _get_component_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6798,7 +6800,7 @@ void POA_CORBA::ExtValueDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ExtValueDef::_is_a (
@@ -6867,22 +6869,22 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7000,9 +7002,9 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7051,9 +7053,9 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7065,7 +7067,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueBoxDef::ValueBoxDef (void)
@@ -7077,10 +7079,10 @@ POA_CORBA::ValueBoxDef::ValueBoxDef (void)
 POA_CORBA::ValueBoxDef::ValueBoxDef (const ValueBoxDef& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IRObject) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, TypedefDef) (rhs)
+    POA_CORBA::IRObject (rhs),
+    POA_CORBA::Contained (rhs),
+    POA_CORBA::IDLType (rhs),
+    POA_CORBA::TypedefDef (rhs)
 {
 }
 
@@ -7089,11 +7091,11 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_original_type_def_ValueBoxDef
     : public TAO::Upcall_Command
   {
@@ -7107,30 +7109,30 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_->original_type_def (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
@@ -7140,22 +7142,22 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
 
@@ -7163,7 +7165,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7176,15 +7178,15 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_original_type_def_ValueBoxDef
     : public TAO::Upcall_Command
   {
@@ -7198,7 +7200,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
@@ -7206,23 +7208,23 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->original_type_def (
         arg_1
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
@@ -7232,24 +7234,24 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
 
@@ -7257,7 +7259,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7270,19 +7272,19 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7296,67 +7298,67 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueBoxDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _is_a_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7369,16 +7371,16 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7392,58 +7394,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueBoxDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _non_existent_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7456,16 +7458,16 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7479,58 +7481,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueBoxDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _repository_id_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7543,18 +7545,18 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_CORBA::ValueBoxDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -7564,30 +7566,30 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
                                         ::CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
+  ::CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7596,11 +7598,11 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7614,58 +7616,58 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ValueBoxDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _get_component_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7678,7 +7680,7 @@ void POA_CORBA::ValueBoxDef::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 ::CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
@@ -7743,22 +7745,22 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueBoxDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7769,3 +7771,4 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 96b05e5d1ae..a1385081787 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/IFR_Client/IFR_ExtendedC.h"
-#include "IFR_BasicS.h"
+#include "orbsvcs/IFRService/IFR_BasicS.h"
 #include "tao/AnyTypeCode/VisibilityS.h"
 #include "tao/AnyTypeCode/ValueModifierS.h"
 
@@ -49,6 +49,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -2121,10 +2123,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-#include "IFR_ExtendedS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/IFRService/IFR_ExtendedS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedS.inl"
+#include "orbsvcs/IFRService/IFR_ExtendedS.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
index a1780252eee..52ed37c258a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 POA_CORBA::FixedDef::_get_def_kind_skel (
@@ -2221,3 +2223,5 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
index 7821ed96169..0c4b6e67e52 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
 
-#include "IFR_ExtendedS_T.h"
+#include "orbsvcs/IFRService/IFR_ExtendedS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedS_T.inl"
+#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index c6f26a31235..9f6d959523c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -33,6 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -2008,12 +2010,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedS_T.inl"
+#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IFR_ExtendedS_T.cpp"
+#include "orbsvcs/IFRService/IFR_ExtendedS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index 8c2b0803d8d..6a35508b490 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -3333,3 +3334,4 @@ void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index 0e861af9cd7..a5e914dcf87 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -10,7 +10,7 @@
 //   Priyanka Gontla <pgontla@ece.uci.edu>
 // ================================================================
 
-#include "IFR_Service_Loader.h"
+#include "orbsvcs/IFRService/IFR_Service_Loader.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
@@ -18,6 +18,8 @@ ACE_RCSID (IFR_Service,
            IFR_Service_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void)
 {
   // Constructor
@@ -93,4 +95,6 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_IFRService, TAO_IFR_Service_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index b695b99908e..4ed289fb58b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+
 // $Id$
 
-// ===========================================================================================
+// ===========================================================================
 // FILENAME
 //   IFR_Service_Loader.h
 //
@@ -12,7 +14,7 @@
 //   Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 //   Priyanka Gontla <pgontla@ece.uci.edu>
 //
-// ==========================================================================================
+// ===========================================================================
 
 #ifndef TAO_IFR_SERVICE_LOADER_H
 #define TAO_IFR_SERVICE_LOADER_H
@@ -23,7 +25,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader
 {
@@ -52,16 +56,21 @@ public:
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
- protected:
+protected:
   TAO_IFR_Server ifr_server_;
   // Instance of the TAO_IFR_Server
 
 private:
 
-ACE_UNIMPLEMENTED_FUNC (TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &))
-ACE_UNIMPLEMENTED_FUNC (TAO_IFR_Service_Loader &operator = (const TAO_IFR_Service_Loader &))
+  // Disallowing copying/assignment.
+  TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &);
+  TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &);
+
 };
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_IFRService, TAO_IFR_Service_Loader)
 
 #endif /* TAO_IFR_SERVICE_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 3b9b184b3cf..492f0aaad44 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "IFR_Service_Utils.h"
-#include "IDLType_i.h"
-#include "Container_i.h"
-#include "Contained_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/Contained_i.h"
 #include "orbsvcs/IFRService/ComponentRepository_i.h"
 #include "orbsvcs/IFRService/Options.h"
 #include "orbsvcs/IFRService/IFR_ComponentsS.h"
@@ -21,6 +21,8 @@ ACE_RCSID (IFR_Service,
            IFR_Service,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0;
 
 TAO_IFR_Server::TAO_IFR_Server (void)
@@ -423,7 +425,7 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
         ACE_OS::getenv ("InterfaceRepoServicePort");
 
       if (port_number != 0)
-        port = ACE_OS::atoi (port_number);
+        port = static_cast<u_short> (ACE_OS::atoi (port_number));
     }
 
   // Port wasn't specified on the command-line or in environment -
@@ -587,7 +589,7 @@ TAO_IFR_Service_Utils::valid_container (
 void
 TAO_IFR_Service_Utils::pre_exist (
     const char *id,
-    TAO_IFR_Service_Utils::name_clash_checker checker,
+    name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
@@ -626,7 +628,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
 
 void
 TAO_IFR_Service_Utils::name_exists (
-    TAO_IFR_Service_Utils::name_clash_checker checker,
+    name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
@@ -634,9 +636,10 @@ TAO_IFR_Service_Utils::name_exists (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int index = 0;
   int status = 0;
   ACE_TString section_name;
+  u_int count = 0;
+  char *stringified = 0;
 
   // Check the members defined elsewhere, if any.
   ACE_Configuration_Section_Key refs_key;
@@ -648,14 +651,17 @@ TAO_IFR_Service_Utils::name_exists (
 
   if (status == 0)
     {
-      while (repo->config ()->enumerate_sections (refs_key,
-                                                  index++,
-                                                  section_name)
-              == 0)
+      repo->config ()->get_integer_value (refs_key,
+                                          "count",
+                                          count);
+
+      for (CORBA::ULong i = 0; i < count; ++i)
         {
           ACE_Configuration_Section_Key member_key;
+          stringified = TAO_IFR_Service_Utils::int_to_string (i);
+
           repo->config ()->open_section (refs_key,
-                                         section_name.c_str (),
+                                         stringified,
                                          0,
                                          member_key);
 
@@ -681,16 +687,17 @@ TAO_IFR_Service_Utils::name_exists (
                                    defns_key);
   if (status == 0)
     {
-      index = 0;
+      repo->config ()->get_integer_value (defns_key,
+                                          "count",
+                                          count);
 
-      while (repo->config ()->enumerate_sections (defns_key,
-                                                  index++,
-                                                  section_name)
-              == 0)
+      for (CORBA::ULong i = 0; i < count; ++i)
         {
           ACE_Configuration_Section_Key defn_key;
+          stringified = TAO_IFR_Service_Utils::int_to_string (i);
+
           repo->config ()->open_section (defns_key,
-                                         section_name.c_str (),
+                                         stringified,
                                          0,
                                          defn_key);
 
@@ -823,7 +830,7 @@ TAO_IFR_Service_Utils::valid_creation (
     CORBA::DefinitionKind container_kind,
     CORBA::DefinitionKind contained_kind,
     const char *id,
-    TAO_IFR_Service_Utils::name_clash_checker checker,
+    name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
     ACE_ENV_ARG_DECL
@@ -1002,7 +1009,7 @@ TAO_IFR_Service_Utils::set_exceptions (
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       type_path =
-        TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
+        TAO_IFR_Service_Utils::reference_to_path (exceptions[i]);
 
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       config->set_string_value (excepts_key,
@@ -1087,9 +1094,11 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
 
   CORBA::ValueMemberSeq vm_seq;
   vm_seq.length (0);
-//  this->fill_vm_seq (vm_seq
-//                     ACE_ENV_ARG_PARAMETER);
-//  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  TAO_IFR_Service_Utils::fill_valuemember_seq (vm_seq,
+                                               key,
+                                               repo
+                                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return
     repo->tc_factory ()->create_value_tc (id.c_str (),
@@ -1154,8 +1163,8 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
                                          "version",
                                          holder);
       vm_seq[i].version = holder.fast_rep ();
-      repo->config ()->get_string_value (repo->repo_ids_key (),
-                                         vm_seq[i].id.in (),
+      repo->config ()->get_string_value (member_key,
+                                         "type_path",
                                          holder);
       TAO_IDLType_i *impl =
         TAO_IFR_Service_Utils::path_to_idltype (holder,
@@ -1433,3 +1442,4 @@ TAO_IFR_Service_Utils::oid_to_string (PortableServer::ObjectId &oid)
   return oid_string;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 8978bc212bf..2b91098a1ee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -24,16 +25,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
 #include "ace/Configuration.h"
 
-// Forward decl;
-class TAO_IOR_Multicast;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Configuration;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_IOR_Multicast;
 class TAO_Repository_i;
 class TAO_IDLType_i;
 class TAO_Container_i;
@@ -246,6 +251,8 @@ public:
   static TAO_Repository_i *repo_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IFR_SERVICE_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 02e14e8859e..848677edd13 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_IFR_SERVICE_UTILS_T_CPP
 #define TAO_IFR_SERVICE_UTILS_T_CPP
 
-#include "IFR_Service_Utils_T.h"
-#include "IFR_Service_Utils.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 #include "ace/SString.h"
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 void
@@ -276,17 +276,13 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions (
 template<typename T_desc_seq>
 void
 TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple (
-    T_desc_seq &desc_seq,
-    ACE_Configuration *config,
-    ACE_Configuration_Section_Key &key,
-    CORBA::ULong index
+    T_desc_seq & /* desc_seq */,
+    ACE_Configuration * /* config */,
+    ACE_Configuration_Section_Key & /* key */,
+    CORBA::ULong /* index */
   )
 {
   // All types except UsesDescription have no is_multiple member.
-  ACE_UNUSED_ARG (desc_seq);
-  ACE_UNUSED_ARG (config);
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (index);
 }
 
 template<typename T_desc_seq>
@@ -361,16 +357,33 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                      ACE_ENV_ARG_PARAMETER);
 }
 
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
+// Borland gives warnings about argument not used on the construct as used
+// for the other compilers. This has been reported to Borland, adding
+// a workaround to suppress these warnings so that the real important ones
+// are not missed.
 template<typename T>
 void
 TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple,
-                                    ACE_Configuration *config,
+                                    ACE_Configuration * config,
                                     ACE_Configuration_Section_Key &key)
 {
-  /// Do nothing for eveything except UsesDef.
   ACE_UNUSED_ARG (is_multiple);
   ACE_UNUSED_ARG (config);
   ACE_UNUSED_ARG (key);
+  // Do nothing for everything except UsesDef.
 }
+#else
+template<typename T>
+void
+TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */,
+                                    ACE_Configuration * /* config */,
+                                    ACE_Configuration_Section_Key & /* key */)
+{
+  // Do nothing for everything except UsesDef.
+}
+#endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_IFR_SERVICE_UTILS_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
index 52159d58543..056582e494a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
@@ -31,6 +31,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Repository_i;
 
 template<typename T>
@@ -108,8 +110,10 @@ public:
                                ACE_Configuration_Section_Key &key);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IFR_Service_Utils_T.cpp"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 5fd3d758894..9846d186808 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "IRObject_i.h"
-#include "Repository_i.h"
-#include "IDLType_i.h"
-#include "Contained_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IRObject_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POA_Current_Impl.h"
@@ -16,6 +16,8 @@ ACE_RCSID (IFR_Service,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo)
   : repo_ (repo)
 {
@@ -83,3 +85,5 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index 65908ea60ff..a6bbdc4adfa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -21,19 +22,21 @@
 #define TAO_IROBJECT_I_H
 
 #include "ace/Configuration.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ExtendedS.h"
+#include "orbsvcs/IFRService/IFR_ExtendedS.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Repository_i;
 class TAO_IDLType_i;
 class TAO_Contained_i;
@@ -87,6 +90,8 @@ protected:
   // Our ACE_Configuration section key.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index e8725ba91a0..943a6082e1f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "InterfaceAttrExtension_i.h"
-#include "Repository_i.h"
-#include "InterfaceDef_i.h"
-#include "OperationDef_i.h"
-#include "AttributeDef_i.h"
-#include "ExtAttributeDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/ExtAttributeDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -15,10 +15,10 @@ ACE_RCSID (IFRService,
            InterfaceAttrExtension_i,
            "$Id$")
 
-
-
 // =====================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i (
     TAO_Repository_i *repo
   )
@@ -84,11 +84,19 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
   CORBA::ULong j = 0;
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
 
+  // Store our section key for later restoration after we have
+  // traversed entries for inherited interfaces.
+  ACE_Configuration_Section_Key key_holder = this->section_key_;
+
   // Operations
   TAO_InterfaceDef_i iface (this->repo_);
   iface.section_key (this->section_key_);
   iface.inherited_operations (key_queue);
 
+  // Restore our original section key.
+  //   I am not sure this is needed but it will not hurt.
+  this->section_key (key_holder);
+
   ACE_Configuration_Section_Key ops_key, op_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -136,9 +144,18 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       ACE_CHECK_RETURN (0);
     }
 
+  // Restore our original section key.
+  //   It may have been overwritten by a superclass key as part of the
+  //   make_description() call.
+  this->section_key (key_holder);
+
   // Attributes.
   iface.inherited_attributes (key_queue);
 
+  // Restore our original section key.
+  //   I am not sure this is needed but it will not hurt.
+  this->section_key (key_holder);
+
   ACE_Configuration_Section_Key attrs_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -187,6 +204,11 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       ACE_CHECK_RETURN (0);
     }
 
+  // Restore our original section key.
+  //   It may have been overwritten by a superclass key as part of the
+  //   fill_description() call.
+  this->section_key (key_holder);
+
   CORBA::InterfaceDefSeq_var bases =
     iface.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -317,3 +339,5 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
 
   return retval._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index 37694831b1b..f330fe3dec6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -20,8 +20,8 @@
 #ifndef TAO_INTERFACEATTREXTENSION_I_H
 #define TAO_INTERFACEATTREXTENSION_I_H
 
-#include "IRObject_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IRObject_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_InterfaceAttrExtension_i
   : public virtual TAO_IRObject_i
 {
@@ -86,9 +88,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_INTERFACEATTREXTENSION_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index a1ecd8af581..9fd69d6cb63 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "InterfaceDef_i.h"
-#include "Repository_i.h"
-#include "AttributeDef_i.h"
-#include "OperationDef_i.h"
-#include "IFR_Service_Utils.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -14,6 +14,7 @@ ACE_RCSID (IFRService,
            InterfaceDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_InterfaceDef_i::TAO_InterfaceDef_i (
     TAO_Repository_i *repo
@@ -310,7 +311,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       inherited_path =
-        TAO_IFR_Service_Utils::reference_to_path (base_interfaces[i].in ());
+        TAO_IFR_Service_Utils::reference_to_path (base_interfaces[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            inherited_path,
@@ -458,9 +459,17 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong j = 0;
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
 
+  // Store our section key for later restoration after we have
+  // traversed entries for inherited interfaces.
+  ACE_Configuration_Section_Key key_holder = this->section_key_;
+
   // Operations
   this->inherited_operations (key_queue);
 
+  // Restore our original section key.
+  //   I am not sure this is needed but it will not hurt.
+  this->section_key (key_holder);
+
   ACE_Configuration_Section_Key ops_key, op_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -508,9 +517,18 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK_RETURN (0);
     }
 
+  // Restore our original section key.
+  //   It may have been overwritten by a superclass key as part of the
+  //   make_description() call.
+  this->section_key (key_holder);
+
   // Attributes
   this->inherited_attributes (key_queue);
 
+  // Restore our original section key.
+  //   I am not sure this is needed but it will not hurt.
+  this->section_key (key_holder);
+
   ACE_Configuration_Section_Key attrs_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -559,6 +577,11 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK_RETURN (0);
     }
 
+  // Restore our original section key.
+  //   It may have been overwritten by a superclass key as part of the
+  //   make_description() call.
+  this->section_key (key_holder);
+
   CORBA::InterfaceDefSeq_var bases =
     this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -856,7 +879,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
       for (i = 0; i < length; ++i)
         {
           type_path =
-            TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
+            TAO_IFR_Service_Utils::reference_to_path (exceptions[i]);
 
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
           this->repo_->config ()->set_string_value (excepts_key,
@@ -882,7 +905,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].in ());
+                                                    contexts[i]);
         }
     }
 
@@ -1258,3 +1281,5 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 5e445e692eb..4d010fa0d48 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,10 +21,10 @@
 #ifndef TAO_INTERFACEDEF_I_H
 #define TAO_INTERFACEDEF_I_H
 
-#include "Container_i.h"
-#include "Contained_i.h"
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,6 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_InterfaceDef_i
   : public virtual TAO_Container_i,
     public virtual TAO_Contained_i,
@@ -224,6 +227,8 @@ private:
   // attribute name.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 87aef1f0854..dab11360086 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "LocalInterfaceDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            LocalInterfaceDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -58,3 +59,4 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
                                            ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 3c9e5cc0568..92bfd1be945 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_LOCALINTERFACEDEF_I_H
 #define TAO_LOCALINTERFACEDEF_I_H
 
-#include "InterfaceDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/InterfaceDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_LocalInterfaceDef_i : public virtual TAO_InterfaceDef_i
 {
   // = TITLE
@@ -66,10 +69,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_LOCALINTERFACEDEF_I_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 012996b39ee..731d9aaf511 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ModuleDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/ModuleDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 #include "ace/SString.h"
 
@@ -11,6 +11,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -105,3 +107,5 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   return retval._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index dbb2a96fc96..8c178c7cf50 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -21,9 +22,9 @@
 #define TAO_MODULEDEF_I_H
 
 //#include "Container_i.h"
-#include "Contained_i.h"
-#include "ComponentModuleDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,6 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ModuleDef_i
   : public virtual TAO_Contained_i,
     public virtual TAO_ComponentModuleDef_i
@@ -82,6 +85,8 @@ public:
   // From Contained_i's pure virtual function.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index d5ec549fa53..e207ffe8823 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "NativeDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/NativeDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 #include "ace/SString.h"
 
@@ -11,6 +11,8 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -60,3 +62,5 @@ TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                                        name.c_str ()
                                                        ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index 068e48b200b..d6960a185e9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_NATIVEDEF_I_H
 #define TAO_NATIVEDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_NativeDef_i : public virtual TAO_TypedefDef_i
 {
 public:
@@ -67,9 +70,10 @@ public:
   // From IDLType_i's pure virtual function.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_NATIVEDEF_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 5a521a51e04..ee94729fa59 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "OperationDef_i.h"
-#include "Repository_i.h"
-#include "IDLType_i.h"
-#include "ExceptionDef_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -14,6 +14,7 @@ ACE_RCSID (IFRService,
            OperationDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_OperationDef_i::TAO_OperationDef_i (
     TAO_Repository_i *repo
@@ -494,7 +495,7 @@ 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].in ());
+                                                contexts[i]);
     }
 }
 
@@ -745,3 +746,5 @@ TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index df4f19f4b33..f11a2850319 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_OPERATIONDEF_I_H
 #define TAO_OPERATIONDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -172,6 +175,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index 466cc0cceb1..cc505817e48 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "Options.h"
+#include "orbsvcs/IFRService/Options.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-// Default Constructor
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Options::Options ()
   : ior_output_file_ (ACE_OS::strdup ("if_repo.ior")),
     persistent_ (0),
@@ -117,3 +118,5 @@ Options::support_multicast_discovery (void) const
 {
   return this->support_multicast_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
index 5251791c96c..f1453559b03 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -22,7 +23,11 @@
 #define OPTIONS_H
 
 #include "ace/Singleton.h"
-#include "ifr_service_export.h"
+#include "ace/Null_Mutex.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IFRService_Export Options
 {
@@ -84,5 +89,7 @@ private:
 // Typedef an Options Singleton.
 typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* OPTIONS_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index b7f83ae5605..f9789c4282b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
-#include "PrimitiveDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/PrimitiveDef_i.h"
 
 ACE_RCSID (IFRService, 
            PrimitiveDef_i, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (
     TAO_Repository_i *repo
   )
@@ -138,3 +139,4 @@ TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return static_cast<CORBA::PrimitiveKind> (pkind);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index e8cbba4016a..05103c5c7ed 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_PRIMITIVEDEF_I_H
 #define TAO_PRIMITIVEDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_PrimitiveDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -87,10 +90,11 @@ public:
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_PRIMITIVEDEF_I_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index 597cf85946d..f9bf6490763 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "ProvidesDef_i.h"
-#include "IFR_ComponentsS.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ProvidesDef_i.h"
+#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index 95df79a19d2..e07923a3fee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -20,8 +20,8 @@
 #ifndef TAO_PROVIDESDEF_I_H
 #define TAO_PROVIDESDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ProvidesDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -88,6 +90,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 8b6df87e6b6..1a06feb5687 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "PublishesDef_i.h"
-#include "Repository_i.h"
+#include "orbsvcs/IFRService/PublishesDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
 
 ACE_RCSID (IFRService, 
            PublishesDef_i, 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index d4c8a0d1c3d..613bc9010e1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -20,8 +20,8 @@
 #ifndef TAO_PUBLISHESDEF_I_H
 #define TAO_PUBLISHESDEF_I_H
 
-#include "EventPortDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/EventPortDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_PublishesDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -56,6 +58,8 @@ public:
   // Return our definition kind.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
index 404060f8a6e..a6e4c6a6051 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "RecursDef_i.h"
+#include "orbsvcs/IFRService/RecursDef_i.h"
 
 
 ACE_RCSID (IFRService,
@@ -8,6 +8,8 @@ ACE_RCSID (IFRService,
            "RecursDef_i.cpp,v 1.1 2004/10/18 09:00:00 SMA Exp")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //-----------------------------------------------------------------------------
 // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and
 // UnionDef_i.h files. It creates a stack of outer structure definitions, used
@@ -41,3 +43,5 @@ bool TAO_RecursiveDef_OuterScopes::SeenBefore( const ACE_TString &id )
 
 const TAO_RecursiveDef_OuterScopes
   *TAO_RecursiveDef_OuterScopes::pIDsSeenAlready= 0;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
index c9f4d9ba083..5fdf5b7e7a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h
@@ -21,7 +21,7 @@
 #ifndef TAO_RECURSDEF_I_H
 #define TAO_RECURSDEF_I_H
 
-#include "TypedefDef_i.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdlib.h"
 
@@ -34,6 +34,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //-----------------------------------------------------------------------------
 // Class TAO_RecursiveDef_OuterScopes is a support class for StructDef_i.h and
 // UnionDef_i.h files. It creates a stack of outer structure definitions, used
@@ -56,6 +59,8 @@ private: // Data
   static const TAO_RecursiveDef_OuterScopes *pIDsSeenAlready;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index c9b85b4a2bd..028f07f18cc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "concrete_classes.h"
-#include "Repository_i.h"
-#include "IDLType_i.h"
-#include "Options.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/concrete_classes.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/Options.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "tao/ORB.h"
 #include "tao/Object_KeyC.h"
@@ -18,6 +18,8 @@ ACE_RCSID (IFR_Service,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
                                     PortableServer::POA_ptr poa,
                                     ACE_Configuration *config)
@@ -1100,7 +1102,7 @@ TAO_Repository_i::lock (void) const
   return *this->lock_;
 }
 
-const char *TAO_Repository_i::TAO_IFR_primitive_kinds[] =
+const char * TAO_Repository_i::TAO_IFR_primitive_kinds[] =
   {
     "pk_null",
     "pk_void",
@@ -1144,3 +1146,5 @@ TAO_Repository_i::shutdown (void)
 {
   this->orb_->shutdown (0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 4df8834e7fb..06cbfdc2360 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef REPOSITORY_I_H
 #define REPOSITORY_I_H
 
-#include "Container_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,10 +33,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "IFR_macro.h"
+#include "orbsvcs/IFRService/IFR_macro.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 #include "tao/CORBA_String.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class IFR_Servant_Factory;
 
 class TAO_IDLType_i;
@@ -362,7 +365,7 @@ protected:
 #undef GEN_IR_OBJECT
 
 private:
-  static const char *TAO_IFR_primitive_kinds[];
+  static const char * TAO_IFR_primitive_kinds[];
   // Set of strings corresponding to the CORBA::PrimitiveKind
   // enum values.
 
@@ -374,6 +377,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index a510114bcc6..5f7465b47fe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "SequenceDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/SequenceDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -12,6 +12,7 @@ ACE_RCSID (IFRService,
            SequenceDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SequenceDef_i::TAO_SequenceDef_i (
     TAO_Repository_i *repo
@@ -264,3 +265,5 @@ TAO_SequenceDef_i::destroy_element_type (
       break;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index bbd6be78144..cbed0039d88 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef SEQUENCEDEF_I_H
 #define SEQUENCEDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_SequenceDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -138,6 +141,8 @@ private:
   // Destroys an anonymous non-primitive element type.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 48f03cc741c..b8068cdb642 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "StringDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/StringDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,6 +10,7 @@ ACE_RCSID (IFRService,
            StringDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -126,3 +127,5 @@ TAO_StringDef_i::bound_i (CORBA::ULong bound
                                              "bound",
                                              bound);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index 757f117e7c0..5f1e402b8ce 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_STRINGDEF_I_H
 #define TAO_STRINGDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_StringDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -100,9 +103,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_STRINGDEF_I_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 8bd307d707d..e4cef6229e6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "StructDef_i.h"
-#include "RecursDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/StructDef_i.h"
+#include "orbsvcs/IFRService/RecursDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -13,6 +13,7 @@ ACE_RCSID (IFRService,
            StructDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -207,6 +208,9 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_Configuration_Section_Key member_key;
   TAO_IDLType_i *impl = 0;
 
+  // Store to replace below.
+  ACE_Configuration_Section_Key key_holder = this->section_key_;
+
   for (CORBA::ULong k = 0; k < size; ++k)
     {
       name_queue.dequeue_head (name);
@@ -238,6 +242,11 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
       retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
+
+      // If this struct contains a nested struct (of another type) at
+      // some level, the above code will have changed the section key
+      // so we have to replace it with the value we stored above.
+      this->section_key (key_holder);
     }
 
   return retval._retn ();
@@ -304,3 +313,5 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
                                              "count",
                                              count);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index fe09f286177..a679e5ff3dd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,9 +21,9 @@
 #ifndef TAO_STRUCTDEF_I_H
 #define TAO_STRUCTDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "Container_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_StructDef_i : public virtual TAO_TypedefDef_i,
                                               public virtual TAO_Container_i
 {
@@ -101,6 +104,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index c97b5cc48a0..3261a380750 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "TypedefDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,6 +10,7 @@ ACE_RCSID (IFRService,
            TypedefDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypedefDef_i::TAO_TypedefDef_i (
     TAO_Repository_i *repo
@@ -77,3 +78,5 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   return retval._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index 32cab9bc159..1d836a105d2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,9 +21,9 @@
 #ifndef TAO_TYPEDEFDEF_I_H
 #define TAO_TYPEDEFDEF_I_H
 
-#include "Contained_i.h"
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_TypedefDef_i : public virtual TAO_Contained_i,
                                                public virtual TAO_IDLType_i
 {
@@ -63,6 +66,8 @@ public:
   // From Contained_i's pure virtual function.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 96600c3ac55..efc0446c718 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "UnionDef_i.h"
-#include "RecursDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/UnionDef_i.h"
+#include "orbsvcs/IFRService/RecursDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -16,6 +16,7 @@ ACE_RCSID (IFRService,
            UnionDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -288,6 +289,9 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj;
   TAO_IDLType_i *impl = 0;
 
+  // Store to replace below.
+  ACE_Configuration_Section_Key key_holder = this->section_key_;
+
   for (CORBA::ULong k = 0; k < size; ++k)
     {
       key_queue.dequeue_head (next_key);
@@ -325,6 +329,11 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
       retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
+
+      // If this union contains a nested union (of another type) at
+      // some level, the above code will have changed the section key
+      // so we have to replace it with the value we stored above.
+      this->section_key (key_holder);
     }
 
   return retval._retn ();
@@ -473,3 +482,5 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
       break;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index 47e5c3d87bf..feace1c2ec5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,9 +21,9 @@
 #ifndef TAO_UNIONDEF_I_H
 #define TAO_UNIONDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "Container_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/Container_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
                                              public virtual TAO_Container_i
 {
@@ -137,11 +140,12 @@ private:
       const ACE_Configuration_Section_Key member_key,
       CORBA::UnionMember &member
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 3caa8264b41..833a7fd0c6a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "UsesDef_i.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/UsesDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -11,6 +12,7 @@ ACE_RCSID (IFRService,
            UsesDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -208,3 +210,5 @@ TAO_UsesDef_i::is_multiple_i (
                                              "is_multiple",
                                              is_multiple);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index 52bdd5664a9..c0daa00be10 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_USESDEF_I_H
 #define TAO_USESDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_UsesDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -110,6 +113,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index 3c7bf2f5440..c8a710dcc23 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ValueBoxDef_i.h"
-#include "Repository_i.h"
-#include "IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/ValueBoxDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -12,6 +12,7 @@ ACE_RCSID (IFRService,
            ValueBoxDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueBoxDef_i::TAO_ValueBoxDef_i (
     TAO_Repository_i *repo
@@ -135,3 +136,5 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
                                             "boxed_type",
                                             boxed_type);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index ad655c50b46..9fd68ca1cc8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_VALUEBOXDEF_I_H
 #define TAO_VALUEBOXDEF_I_H
 
-#include "TypedefDef_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ValueBoxDef_i : public virtual TAO_TypedefDef_i
 {
 public:
@@ -89,6 +92,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 4d2ba44ff04..d4ff826a40b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "ValueDef_i.h"
-#include "AttributeDef_i.h"
-#include "OperationDef_i.h"
-#include "IFR_Service_Utils.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/OperationDef_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -14,6 +14,7 @@ ACE_RCSID (IFRService,
            ValueDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
@@ -248,7 +249,7 @@ TAO_ValueDef_i::supported_interfaces_i (
     {
       supported_path =
         TAO_IFR_Service_Utils::reference_to_path (
-            supported_interfaces[i].in ()
+            supported_interfaces[i]
           );
 
       // Get the servant's key into the temporary key holder, because
@@ -641,7 +642,7 @@ TAO_ValueDef_i::abstract_base_values_i (
     {
       base_path =
         TAO_IFR_Service_Utils::reference_to_path (
-            abstract_base_values[i].in ()
+            abstract_base_values[i]
           );
 
       // Get the servant's key into the temporary key holder, because
@@ -1760,7 +1761,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].in ());
+                                                    contexts[i]);
         }
     }
 
@@ -1852,3 +1853,5 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
                                             holder);
   desc.base_value = holder.fast_rep ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 7dd25212117..0d5dd9d7f9f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,9 +21,9 @@
 #ifndef TAO_VALUEDEF_I_H
 #define TAO_VALUEDEF_I_H
 
-#include "Contained_i.h"
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ValueDef_i : public virtual TAO_Container_i,
                                              public virtual TAO_Contained_i,
                                              public virtual TAO_IDLType_i
@@ -341,11 +344,10 @@ public:
                                ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_VALUEDEF_I_H */
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 3d25b96ed3b..bb6b101ddd0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "ValueMemberDef_i.h"
-#include "IDLType_i.h"
-#include "IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/ValueMemberDef_i.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "orbsvcs/IFRService/IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -12,6 +13,7 @@ ACE_RCSID (IFRService,
            ValueMemberDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (
     TAO_Repository_i *repo
@@ -218,3 +220,5 @@ TAO_ValueMemberDef_i::access_i (CORBA::Visibility access
                                              "access",
                                              access);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index d512e45f406..1da19410d15 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_VALUEMEMBERDEF_I_H
 #define TAO_VALUEMEMBERDEF_I_H
 
-#include "Contained_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/Contained_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_ValueMemberDef_i : public virtual TAO_Contained_i
 {
   // = TITLE
@@ -120,6 +123,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 7f8c8bcc350..252050a2855 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Repository_i.h"
-#include "WstringDef_i.h"
+#include "orbsvcs/IFRService/Repository_i.h"
+#include "orbsvcs/IFRService/WstringDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,6 +10,7 @@ ACE_RCSID (IFRService,
            WstringDef_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_WstringDef_i::TAO_WstringDef_i (
     TAO_Repository_i *repo
@@ -126,3 +127,5 @@ TAO_WstringDef_i::bound_i (CORBA::ULong bound
                                              "bound",
                                              bound);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index 62e9242c6c1..c1317c0a888 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -20,8 +21,8 @@
 #ifndef TAO_WSTRINGDEF_I_H
 #define TAO_WSTRINGDEF_I_H
 
-#include "IDLType_i.h"
-#include "ifr_service_export.h"
+#include "orbsvcs/IFRService/IDLType_i.h"
+#include "orbsvcs/IFRService/ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IFRService_Export TAO_WstringDef_i : public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -100,6 +103,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
index 917db83e7a4..27407fa581c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h
@@ -19,36 +19,36 @@
 #ifndef CONCRETE_CLASSES_H
 #define CONCRETE_CLASSES_H
 
-#include "PrimitiveDef_i.h"
-#include "StringDef_i.h"
-#include "WstringDef_i.h"
-#include "SequenceDef_i.h"
-#include "ArrayDef_i.h"
-#include "FixedDef_i.h"
-#include "EnumDef_i.h"
-#include "AliasDef_i.h"
-#include "NativeDef_i.h"
-#include "ValueBoxDef_i.h"
-#include "UnionDef_i.h"
-#include "StructDef_i.h"
-#include "ValueMemberDef_i.h"
-#include "FactoryDef_i.h"
-#include "AttributeDef_i.h"
-#include "ConstantDef_i.h"
-#include "ValueDef_i.h"
-#include "ExceptionDef_i.h"
-#include "ModuleDef_i.h"
-#include "ExtAbstractInterfaceDef_i.h"
-#include "ExtLocalInterfaceDef_i.h"
+#include "orbsvcs/IFRService/PrimitiveDef_i.h"
+#include "orbsvcs/IFRService/StringDef_i.h"
+#include "orbsvcs/IFRService/WstringDef_i.h"
+#include "orbsvcs/IFRService/SequenceDef_i.h"
+#include "orbsvcs/IFRService/ArrayDef_i.h"
+#include "orbsvcs/IFRService/FixedDef_i.h"
+#include "orbsvcs/IFRService/EnumDef_i.h"
+#include "orbsvcs/IFRService/AliasDef_i.h"
+#include "orbsvcs/IFRService/NativeDef_i.h"
+#include "orbsvcs/IFRService/ValueBoxDef_i.h"
+#include "orbsvcs/IFRService/UnionDef_i.h"
+#include "orbsvcs/IFRService/StructDef_i.h"
+#include "orbsvcs/IFRService/ValueMemberDef_i.h"
+#include "orbsvcs/IFRService/FactoryDef_i.h"
+#include "orbsvcs/IFRService/AttributeDef_i.h"
+#include "orbsvcs/IFRService/ConstantDef_i.h"
+#include "orbsvcs/IFRService/ValueDef_i.h"
+#include "orbsvcs/IFRService/ExceptionDef_i.h"
+#include "orbsvcs/IFRService/ModuleDef_i.h"
+#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
+#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
 
-#include "ComponentDef_i.h"
-#include "HomeDef_i.h"
-#include "FinderDef_i.h"
-#include "ConsumesDef_i.h"
-#include "PublishesDef_i.h"
-#include "EmitsDef_i.h"
-#include "EventDef_i.h"
-#include "ProvidesDef_i.h"
-#include "UsesDef_i.h"
+#include "orbsvcs/IFRService/ComponentDef_i.h"
+#include "orbsvcs/IFRService/HomeDef_i.h"
+#include "orbsvcs/IFRService/FinderDef_i.h"
+#include "orbsvcs/IFRService/ConsumesDef_i.h"
+#include "orbsvcs/IFRService/PublishesDef_i.h"
+#include "orbsvcs/IFRService/EmitsDef_i.h"
+#include "orbsvcs/IFRService/EventDef_i.h"
+#include "orbsvcs/IFRService/ProvidesDef_i.h"
+#include "orbsvcs/IFRService/UsesDef_i.h"
 
 #endif /* CONCRETE_CLASSES_H */
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 83543b4416f..ea4ae89e71a 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,15 +1,18 @@
 // $Id$
 
-#include "IOR_Multicast.h"
+#include "orbsvcs/IOR_Multicast.h"
 
 #include "tao/debug.h"
 
 #include "ace/SOCK_Connector.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (orbsvcs,
            IOR_Multicast,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_HANDLE
 TAO_IOR_Multicast::get_handle (void) const
 {
@@ -315,4 +318,4 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   return 0;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 013fcebf5af..9963e2fa222 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -34,6 +35,8 @@
 #include "ace/Reactor.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
   // = TITLE
@@ -105,5 +108,7 @@ private:
   ACE_CString mcast_nic_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IOR_MULTICAST_H */
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 105c2f6a738..5ea2a76ec77 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -1,4 +1,4 @@
-#include "LB_CPU_Load_Average_Monitor.h"
+#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -14,9 +14,11 @@ ACE_RCSID (LoadBalancing,
            LB_CPU_Load_Average_Monitor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (const char * location_id,
-                                                                  const char * location_kind)
+TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (
+  const char * location_id,
+  const char * location_kind)
   : location_ (1)
 {
   this->location_.length (1);
@@ -238,3 +240,5 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 #endif  /* linux || sun || __hpux  || __NetBSD__ || __APPLE__ */
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
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 16e5a456e46..12bb7c1df80 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -24,6 +24,7 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_CPU_Load_Average_Monitor
@@ -95,6 +96,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_CPU_LOAD_AVERAGE_MONITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 11ae897574e..48a8267e189 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -1,4 +1,4 @@
-#include "LB_CPU_Utilization_Monitor.h"
+#include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -11,6 +11,8 @@ ACE_RCSID (LoadBalancing,
            LB_CPU_Utilization_Monitor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 double calc_cpu_loading (void)
 {
   static char buf[1024];
@@ -164,3 +166,5 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 #endif  /* linux || sun */
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index 85798d6a44d..c369ce8e2c0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *          Ossama Othman <ossama@uci.edu>
+ *  @author Ossama Othman <ossama@uci.edu>
  */
 //=============================================================================
 
@@ -25,6 +25,7 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_CPU_Utilization_Monitor
@@ -92,6 +93,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_CPU_UTILIZATION_MONITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index 57e266921c3..abfe60c3f23 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -1,5 +1,5 @@
-#include "LB_ClientComponent.h"
-#include "LB_ClientORBInitializer.h"
+#include "orbsvcs/LoadBalancing/LB_ClientComponent.h"
+#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -8,6 +8,8 @@ ACE_RCSID (LoadBalancing,
            LB_ClientComponent,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[])
 {
@@ -55,6 +57,7 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DEFINE (TAO_LB_ClientComponent,
                        ACE_TEXT ("LB_ClientComponent"),
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 4d960d74884..8431950aff4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -26,6 +26,8 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_ClientComponent
  *
@@ -54,6 +56,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_ClientComponent)
 ACE_STATIC_SVC_REQUIRE (TAO_LB_ClientComponent)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 4ab071fd528..10ef40d2a54 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -1,5 +1,5 @@
-#include "LB_ClientORBInitializer.h"
-#include "LB_ClientRequestInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
+#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -7,6 +7,8 @@ ACE_RCSID (LoadBalancing,
            LB_ClientORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_LB_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -37,3 +39,5 @@ TAO_LB_ClientORBInitializer::post_init (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 38338336bf3..595c7198ea0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -31,6 +31,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_ORBInitializer
@@ -66,6 +67,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index fd3240d0bcd..870a88577d2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,4 +1,4 @@
-#include "LB_ClientRequestInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
@@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing,
            TAO_LB_ClientRequestInterceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO_LB_ClientRequestInterceptor::name (
@@ -109,3 +110,5 @@ TAO_LB_ClientRequestInterceptor::receive_other (
                    PortableInterceptor::ForwardRequest))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 6dbb4b71ae3..124a845a989 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -30,6 +30,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_ClientRequestInterceptor
  *
@@ -103,6 +105,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 156ae61ed77..3e12f2f41e9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -1,5 +1,5 @@
-#include "LB_Component.h"
-#include "LB_ORBInitializer.h"
+#include "orbsvcs/LoadBalancing/LB_Component.h"
+#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing,
            LB_Component,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 {
@@ -131,6 +133,7 @@ TAO_LB_Component::register_orb_initializer (
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DEFINE (TAO_LB_Component,
                        ACE_TEXT ("LB_Component"),
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 0f290d8412b..26273daab93 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -26,6 +26,8 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_Component
  *
@@ -56,6 +58,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_LoadBalancing, TAO_LB_Component)
 ACE_STATIC_SVC_REQUIRE (TAO_LB_Component)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 5a5e40d8275..6af1cad1b42 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -1,6 +1,6 @@
-#include "LB_IORInterceptor.h"
-#include "LB_ObjectReferenceFactory.h"
-#include "LB_LoadAlert.h"
+#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing,
            LB_IORInterceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
   const CORBA::StringSeq & object_groups,
   const CORBA::StringSeq & repository_ids,
@@ -183,3 +185,5 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ENDTRY;
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index dc168cdec0d..ca4b6f7ea01 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -29,6 +29,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_LB_LoadAlert;
 
@@ -47,7 +49,7 @@ class TAO_LB_LoadAlert;
  * @see LB_ObjectReferenceFactory.h for details.
  */
 class TAO_LB_IORInterceptor
-  : public virtual PortableInterceptor::IORInterceptor,
+  : public virtual PortableInterceptor::IORInterceptor_3_0,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
@@ -141,6 +143,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 7c65cc62d62..00c4fa6203d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -1,6 +1,6 @@
-#include "LB_LeastLoaded.h"
-#include "LB_LoadMap.h"
-#include "LB_Random.h"
+#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -17,9 +17,10 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "LB_LeastLoaded.inl"
+#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl"
 #endif /* defined INLINE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
@@ -636,3 +637,5 @@ TAO_LB_LeastLoaded::extract_float_property (
     ACE_THROW (PortableGroup::InvalidProperty (property.nam,
                                                property.val));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index df043e104f3..a7843028c66 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -27,6 +27,8 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_LB
 {
   /**
@@ -215,9 +217,11 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
-#include "LB_LeastLoaded.inl"
+#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
index cb650c93ba0..e59193f3c6f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Float
 TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load,
                                     CORBA::Float new_load)
@@ -21,3 +23,5 @@ TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load,
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 3c51e755ee5..a57212dbce6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -1,4 +1,4 @@
-#include "LB_LoadAlert.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 
 ACE_RCSID (LoadBalancer,
@@ -6,18 +6,20 @@ ACE_RCSID (LoadBalancer,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "LB_LoadAlert.inl"
+# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_LoadAlert::TAO_LB_LoadAlert (void)
   : alerted_ (0),
     lock_ ()
 {
 }
 
-// TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
-// {
-// }
+TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
+{
+}
 
 void
 TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -36,3 +38,5 @@ TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   this->alerted_ = 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index 5c356ef3b41..f5345ef7f07 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -24,6 +24,7 @@
 
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LoadBalancing_Export TAO_LB_LoadAlert
   : public virtual POA_CosLoadBalancing::LoadAlert
@@ -55,16 +56,15 @@ public:
   /// by the LoadManager.
   CORBA::Boolean alerted (void) const;
 
-protected:
-
+// protected:
 
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  //~TAO_LB_LoadAlert (void);
-
+  virtual ~TAO_LB_LoadAlert (void);
+  
 private:
 
   /// Has this LoadAlert servant been alerted of a high load condition
@@ -76,9 +76,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "LB_LoadAlert.inl"
+# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
index 0f574a49206..abff1d3087e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_LB_LoadAlert::alerted (void) const
 {
@@ -10,3 +12,5 @@ TAO_LB_LoadAlert::alerted (void) const
 
   return this->alerted_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 78eeeb187f6..0378e9f584e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,12 +1,16 @@
-#include "LB_LoadAlertInfo.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
 ACE_RCSID (LoadBalancing,
            LB_LoadAlertInfo,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void)
   : load_alert (),
     alerted (0)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 6736448e92c..47c3f7b384c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -24,6 +24,7 @@
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_LoadAlertInfo
@@ -46,6 +47,7 @@ struct TAO_LB_LoadAlertInfo
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp
deleted file mode 100644
index 23586970f71..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-
-#include "LB_LoadAlertMap.h"
-
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadAlertMap,
-           "$Id$")
-
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
index 620ec2d3acb..5451acafddb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
@@ -22,13 +22,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "LB_LoadAlertInfo.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
 
 #include "orbsvcs/PortableGroup/PG_Location_Hash.h"
 #include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// LoadAlertInfo hash map typedef.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -38,6 +39,7 @@ typedef ACE_Hash_Map_Manager_Ex<
   TAO_PG_Location_Equal_To,
   ACE_Null_Mutex> TAO_LB_LoadAlertMap;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 749f96a61d0..ca2bf1b5116 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -1,4 +1,4 @@
-#include "LB_LoadAlert_Handler.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
 
 #include "tao/debug.h"
 
@@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing,
            LB_LoadAlert_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 {
@@ -20,7 +21,7 @@ TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
-    CosLoadBalancing::AMI_LoadAlertExceptionHolder *
+    ::Messaging::ExceptionHolder *
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -38,7 +39,7 @@ TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
-    CosLoadBalancing::AMI_LoadAlertExceptionHolder *
+    ::Messaging::ExceptionHolder *
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -47,3 +48,5 @@ TAO_LB_LoadAlert_Handler::disable_alert_excep (
                 ACE_TEXT ("Exception caught when invoking ")
                 ACE_TEXT ("LoadAlert::disable_alert()\n")));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index d6a4f386926..d19518ce96d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -26,6 +26,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_LoadAlert_Handler
  *
@@ -45,7 +47,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void enable_alert_excep (
-      CosLoadBalancing::AMI_LoadAlertExceptionHolder *
+      ::Messaging::ExceptionHolder *
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -53,7 +55,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert_excep (
-      CosLoadBalancing::AMI_LoadAlertExceptionHolder *
+      ::Messaging::ExceptionHolder *
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -65,6 +67,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 68515987188..c6a0d0c3fa3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -1,6 +1,6 @@
-#include "LB_LoadAverage.h"
-#include "LB_LoadMap.h"
-#include "LB_Random.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -17,9 +17,10 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "LB_LoadAverage.inl"
+#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl"
 #endif /* defined INLINE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
@@ -449,3 +450,5 @@ TAO_LB_LoadAverage::extract_float_property (
     ACE_THROW (PortableGroup::InvalidProperty (property.nam,
                                                property.val));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 5fbf7360a43..4af286ee527 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- *  @author Ossama Othman <jai@dre.vanderbilt.edu>
+ *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -28,6 +28,8 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_LB
 {
   /**
@@ -171,9 +173,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "LB_LoadAverage.inl"
+#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
index 807367ef5c1..347374c1a7c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Float
 TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load,
@@ -21,3 +22,5 @@ TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load,
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp
deleted file mode 100644
index 5c084408100..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-
-#include "LB_LoadListMap.h"
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadListMap,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
index ebfbb3b6cb7..4dd83f2e2b9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
@@ -29,6 +29,7 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// LoadList hash map.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -38,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   TAO_PG_Location_Equal_To,
   ACE_Null_Mutex> TAO_LB_LoadListMap;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_LOAD_LIST_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index d30a2b159f1..10b42090791 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1,12 +1,12 @@
-#include "LB_LoadManager.h"
-#include "LB_MemberLocator.h"
-#include "LB_LoadAlert_Handler.h"
-#include "LB_RoundRobin.h"
-#include "LB_Random.h"
-#include "LB_LoadMinimum.h"
-#include "LB_LoadAverage.h"
-#include "LB_LeastLoaded.h"
-#include "LB_conf.h"
+#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
+#include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
+#include "orbsvcs/LoadBalancing/LB_Random.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
+#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
+#include "orbsvcs/LoadBalancing/LB_conf.h"
 
 #include "orbsvcs/PortableGroup/PG_Property_Utils.h"
 #include "orbsvcs/PortableGroup/PG_conf.h"
@@ -27,6 +27,7 @@ ACE_RCSID (LoadBalancing,
            LB_LoadManager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadManager::TAO_LB_LoadManager (void)
   : reactor_ (0),
@@ -99,7 +100,7 @@ TAO_LB_LoadManager::push_loads (
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       PortableGroup::ObjectGroup_ptr object_group =
-        groups[i].in ();
+        groups[i];
 
       ACE_TRY
         {
@@ -1290,3 +1291,5 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 //     this->poa_->reference_to_id (
 //   this->poa_->deactivate_object ();
 // }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index cc9b4ff0bf5..42ce6c006c4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -23,10 +23,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "LB_LoadAlertMap.h"
-#include "LB_MonitorMap.h"
-#include "LB_LoadListMap.h"
-#include "LB_Pull_Handler.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlertMap.h"
+#include "orbsvcs/LoadBalancing/LB_MonitorMap.h"
+#include "orbsvcs/LoadBalancing/LB_LoadListMap.h"
+#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -34,6 +34,7 @@
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LoadBalancing_Export TAO_LB_LoadManager
   : public virtual POA_CosLoadBalancing::LoadManager
@@ -511,6 +512,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp
deleted file mode 100644
index 8a40fdb1c95..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-
-#include "LB_LoadMap.h"
-
-ACE_RCSID (LoadBalancing,
-           LB_LoadMap,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
index 6e5778f4a55..2e75bbba1f3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
@@ -29,6 +29,7 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Load hash map.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -38,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   TAO_PG_Location_Equal_To,
   ACE_Null_Mutex> TAO_LB_LoadMap;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_LOAD_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 50a13794544..b271606a0fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -1,7 +1,7 @@
-#include "LB_LoadMinimum.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
 #include "ace/OS_NS_sys_time.h"
-#include "LB_LoadMap.h"
-#include "LB_Random.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -18,9 +18,10 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "LB_LoadMinimum.inl"
+#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl"
 #endif /* defined INLINE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
@@ -659,3 +660,5 @@ TAO_LB_LoadMinimum::extract_float_property (
     ACE_THROW (PortableGroup::InvalidProperty (property.nam,
                                                property.val));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index 7d894bb090a..c979845aa0c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LB_LoadMap.h"
+#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -28,6 +28,9 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_LB
 {
   /**
@@ -194,9 +197,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "LB_LoadMinimum.inl"
+#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
index 4f096fa4040..dc120b38783 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Float
 TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load,
                                     CORBA::Float new_load)
@@ -20,3 +22,5 @@ TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load,
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp
deleted file mode 100644
index 703c0515709..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-
-#include "LB_Location_Index_Map.h"
-
-ACE_RCSID (LoadBalancing,
-           LB_Location_Index,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
index b99c5437779..a08694dd2d0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
@@ -27,6 +27,7 @@
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Location index map.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -36,6 +37,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   ACE_Equal_To<ACE_UINT64>,
   ACE_Null_Mutex> TAO_LB_Location_Index_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_LOCATION_INDEX_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 8d4b359b479..31c4e10977e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -1,5 +1,5 @@
-#include "LB_LoadManager.h"
-#include "LB_MemberLocator.h"
+#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
 
 #include "tao/debug.h"
 
@@ -8,6 +8,7 @@ ACE_RCSID (LoadBalancing,
            LB_MemberLocator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_MemberLocator::TAO_LB_MemberLocator (
   TAO_LB_LoadManager * lm)
@@ -71,3 +72,5 @@ TAO_LB_MemberLocator::postinvoke (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index ccdc9af7247..e376937f0a5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -25,6 +25,8 @@
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_LB_LoadManager;
 
@@ -83,6 +85,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_MEMBER_LOCATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp
deleted file mode 100644
index ad8142f3e24..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- C++ -*-
-
-#include "LB_LoadMap.h"
-
-
-ACE_RCSID (LoadBalancing,
-           LB_MonitorMap,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 035486af6d3..e7e7eeb4443 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -1,6 +1,6 @@
-#include "LB_ORBInitializer.h"
-#include "LB_IORInterceptor.h"
-#include "LB_ServerRequestInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
+#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
@@ -10,6 +10,9 @@ ACE_RCSID (LoadBalancing,
            LB_ORBInitializer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
   const CORBA::StringSeq & object_groups,
   const CORBA::StringSeq & repository_ids,
@@ -87,3 +90,5 @@ TAO_LB_ORBInitializer::post_init (
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index ffac81934f0..292e36558ab 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -16,14 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LB_LoadAlert.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/LocalObject.h"
 #include "tao/PI/PI.h"
+#include "tao/LocalObject.h"
+#include "tao/Versioned_Namespace.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -32,6 +33,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_ORBInitializer
@@ -97,6 +99,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index d525001fc3d..d70b23fa4f1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,10 +1,9 @@
-#include "LB_ObjectReferenceFactory.h"
+#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
 
 ACE_RCSID (LoadBalancing,
            LB_ObjectReferenceFactory,
            "$Id$")
 
-
 #include "tao/debug.h"
 
 #include "ace/SString.h"
@@ -12,6 +11,8 @@ ACE_RCSID (LoadBalancing,
 #include "ace/OS_NS_string.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // The number of different object groups to support.
 #ifndef TAO_LB_ORF_GROUP_TABLE_SIZE
 const size_t TAO_LB_ORF_GROUP_TABLE_SIZE = 16;
@@ -184,7 +185,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
   PortableGroup::ObjectGroup_var group;
   if (this->table_.find (repository_id, group) != 0)
     {
-      if (ACE_OS::strcasecmp (this->object_groups_[index].in (),
+      if (ACE_OS::strcasecmp (this->object_groups_[index],
                               "CREATE") == 0)
         {
           PortableGroup::Criteria criteria (1);
@@ -217,7 +218,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
       else
         {
           group =
-            this->orb_->string_to_object (this->object_groups_[index].in ()
+            this->orb_->string_to_object (this->object_groups_[index]
                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
@@ -247,9 +248,11 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id,
 
   const CORBA::ULong len = this->repository_ids_.length ();
   for (i = 0; i < len; ++i)
-    if (ACE_OS::strcmp (this->repository_ids_[i].in (), repository_id) == 0)
+    if (ACE_OS::strcmp (this->repository_ids_[i], repository_id) == 0)
       return 1;
 
   return 0;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 729ac23aca5..81fddbe05bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -33,6 +33,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_ObjectReferenceFactory
  *
@@ -165,6 +167,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index eb431a84ade..5e8cdf226ec 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -1,5 +1,5 @@
-#include "LB_Pull_Handler.h"
-#include "LB_LoadManager.h"
+#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
+#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
 
 #include "tao/debug.h"
 
@@ -9,6 +9,8 @@ ACE_RCSID (LoadBalancing,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void)
   : monitor_map_ (0),
     load_manager_ (0)
@@ -78,3 +80,5 @@ TAO_LB_Pull_Handler::handle_timeout (
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
index 5649c74f263..a18efd9d961 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
@@ -22,15 +22,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "LB_MonitorMap.h"
+#include "orbsvcs/LoadBalancing/LB_MonitorMap.h"
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class TAO_LB_LoadManager;
 
-
 /**
  * @class TAO_LB_Pull_Handler
  *
@@ -65,6 +65,9 @@ private:
   TAO_LB_LoadManager * load_manager_;
 
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LB_PULL_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index ff1f158b0e3..56c39655f2d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "LB_Random.h"
+#include "orbsvcs/LoadBalancing/LB_Random.h"
 
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
@@ -14,12 +14,13 @@ ACE_RCSID (LoadBalancing,
 static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT;
 #endif  /* ACE_HAS_PTHREADS_STD */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 extern "C" void tao_lb_random_init_routine (void)
 {
   ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ()));
 }
 
-
 TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa))
 {
@@ -175,3 +176,5 @@ TAO_LB_Random::init (void)
   ::tao_lb_random_init_routine ();
 #endif  /* ACE_HAS_PTHREADS_STD */
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 92eb9881ce8..af5bea2b038 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -23,6 +23,8 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_Random
  *
@@ -114,6 +116,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 28507f0b1d6..ab865f8020e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "LB_RoundRobin.h"
+#include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -11,6 +11,8 @@ ACE_RCSID (LoadBalancing,
            LB_RoundRobin,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
     lock_ (),
@@ -165,3 +167,5 @@ TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index 04f810908d1..a96a1120223 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -26,6 +26,9 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LB_RoundRobin_Strategy
  *
@@ -117,6 +120,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* LB_ROUND_ROBIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 6b9a9a48be3..10bb3303a39 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -1,5 +1,5 @@
-#include "LB_ServerRequestInterceptor.h"
-#include "LB_LoadAlert.h"
+#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
 
 #include "tao/debug.h"
 
@@ -10,6 +10,7 @@ ACE_RCSID (LoadBalancing,
            LB_ServerRequestInterceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor (
   TAO_LB_LoadAlert & load_alert)
@@ -177,3 +178,5 @@ TAO_LB_ServerRequestInterceptor::send_other (
                     ACE_TEXT ("LOCATION FORWARDED\n")));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index dc41b7dbf7b..a3a94008a27 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -33,6 +33,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LB_LoadAlert;
 
@@ -113,6 +114,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h
index 6b1fcfd8b98..9c65aba972c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h
@@ -22,6 +22,9 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #ifndef TAO_LB_PULL_HANDLER_INTERVAL
 /// The interval in seconds the load balancer queries registered load
@@ -35,6 +38,7 @@ const long TAO_LB_PULL_HANDLER_INTERVAL = 5;
 const long TAO_LB_PULL_HANDLER_RESTART = 5;
 #endif  /* TAO_LB_PULL_HANDLER_RESTART */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 977e11d580b..b8704fe0988 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (Log,
            BasicLogFactory_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void)
 {
 }
@@ -118,7 +120,7 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
 CORBA::RepositoryId
 TAO_BasicLogFactory_i::create_repositoryid ()
 {
-  return CORBA::string_dup("IDL:omg.org/DsLogAdmin:BasicLog:1.0");
+  return CORBA::string_dup ("IDL:omg.org/DsLogAdmin:BasicLog:1.0");
 }
 
 PortableServer::ServantBase*
@@ -141,3 +143,5 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id
 
   return basic_log_i;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index 2d3820014a3..f6cc8f4113a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -11,7 +11,7 @@
  *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
- *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -35,6 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_BasicLogActivator;
 
 /**
@@ -97,6 +99,8 @@ protected:
   DsLogAdmin::LogMgr_var        log_mgr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index b02b0d7e1f0..ab9dc1cdee9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Log,
            BasicLog_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb,
 				PortableServer::POA_ptr poa,
                                 TAO_LogMgr_i &logmgr_i,
@@ -88,3 +90,5 @@ TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 				 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 965f0261c6a..1ee94e0799c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/Log/Log_i.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -37,6 +37,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 
 /**
@@ -91,6 +93,8 @@ protected:
   PortableServer::POA_var	poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 852317d4d42..5e005ee70c6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (Log,
            EventLogConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
 : log_ (log)
 {  
@@ -95,4 +97,4 @@ TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index 72f5a5b772e..fac7eb9bbb9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -30,13 +30,15 @@
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
-#include "eventlog_serv_export.h"
+#include "orbsvcs/Log/eventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_EventLog_i;
 class TAO_EventLogFactory_i;
@@ -90,6 +92,8 @@ private:
   TAO_EventLog_i *log_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index c6d7c41be56..ceac8976ab8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (Log,
            EventLogFactory_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
 {
   TAO_CEC_Default_Factory::init_svcs ();
@@ -246,3 +248,5 @@ TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
 {
   return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index 230c3c54882..ea8e6e5c63f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,8 +10,7 @@
  *
  *
  *  @author Rob Ruff <rruff@scires.com>
- *  @David A. Hanvey <d.hanvey@qub.ac.uk>
- *
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -31,13 +30,15 @@
 #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
-#include "EventLog_i.h"
+#include "orbsvcs/Log/EventLog_i.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_EventLog_i;
 class TAO_EventLogNotification;
 
@@ -141,6 +142,8 @@ protected:
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 7efe128c8b3..130274497d7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (Log,
            EventLogNotification,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec)
 : TAO_LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec))
 {
@@ -47,4 +49,4 @@ TAO_EventLogNotification::send_notification (const CORBA::Any& any
   consumer_->push (any ACE_ENV_ARG_PARAMETER);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index c73bcf2efba..88306c2eac7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,10 +8,7 @@
  *
  *  Methods to enable log-generated events.
  *
- *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
- *
- *
  */
 //=============================================================================
 
@@ -30,13 +27,15 @@
 #include "orbsvcs/DsEventLogAdminS.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "orbsvcs/CosEventCommS.h"
-#include "eventlog_serv_export.h"
+#include "orbsvcs/Log/eventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_EventLogNotification
  *
@@ -83,6 +82,8 @@ private:
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index a7d8a257ff7..87df3394e48 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -6,6 +6,9 @@ ACE_RCSID (Log,
            EventLog_i,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
 				PortableServer::POA_ptr poa,
                                 TAO_LogMgr_i &logmgr_i,
@@ -129,3 +132,5 @@ TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 24e0eaeae36..65c2f4798a9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // ============================================================================
 /**
@@ -11,7 +11,7 @@
  *  to write events to the Log.
  *
  *  @author Rob Ruff <rruff@scires.com>
- *  @D A Hanvey <d.hanvey@qub.ac.uk>
+ *  @author D A Hanvey <d.hanvey@qub.ac.uk>
  */
 // ============================================================================
 
@@ -32,13 +32,15 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/Log/EventLogConsumer.h"
 
-#include "eventlog_serv_export.h"
+#include "orbsvcs/Log/eventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_EventLog_i;
 class TAO_EventLogFactory_i;
@@ -125,6 +127,8 @@ private:
   PortableServer::POA_var	poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 8a578c28207..f23b113e3d0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -1,4 +1,4 @@
-#include "Hash_Iterator_i.h"
+#include "orbsvcs/Log/Hash_Iterator_i.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "orbsvcs/DsLogAdminC.h"
@@ -7,14 +7,18 @@ ACE_RCSID (Log,
            Hash_Iterator_i,
            "$Id$")
 
-TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (ACE_Reactor* reactor,
-                                          TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter,
-                                          TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end,
-                                          CORBA::ULong start,
-                                          const char *constraint,
-                                          CORBA::ULong max_rec_list_len
-                                          )
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Hash_Iterator_i::TAO_Hash_Iterator_i (
+  ACE_Reactor* reactor,
+  TAO_Hash_LogRecordStore* recordstore,
+  TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter,
+  TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end,
+  CORBA::ULong start,
+  const char *constraint,
+  CORBA::ULong max_rec_list_len)
   : TAO_Iterator_i(reactor),
+    recordstore_ (recordstore),
     iter_ (iter),
     iter_end_ (iter_end),
     current_position_(start),
@@ -36,6 +40,12 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   if (position < current_position_)
     {
       ACE_THROW_RETURN (DsLogAdmin::InvalidParam (), 0);
@@ -95,3 +105,5 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
 
   return rec_list;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 548b1df2004..ec2b78ffca1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,10 +8,8 @@
  *
  *  Implementation of the DsLogAdmin::Iterator interface.
  *
- *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
- *
  */
 //=============================================================================
 
@@ -34,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Hash_Iterator_i
  *
@@ -48,6 +48,7 @@ public:
 
   /// Constructor.
   TAO_Hash_Iterator_i (ACE_Reactor* reactor,
+		       TAO_Hash_LogRecordStore* recordstore,
                        TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter,
                        TAO_Hash_LogRecordStore::LOG_RECORD_STORE_ITER iter_end,
                        CORBA::ULong start,
@@ -65,6 +66,8 @@ public:
                      DsLogAdmin::InvalidParam));
 
 private:
+  /// Pointer to record store
+  TAO_Hash_LogRecordStore* recordstore_;
 
   /// Current Iterator.
   TAO_Hash_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter_;
@@ -82,6 +85,8 @@ private:
   CORBA::ULong max_rec_list_len_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index cc0da373600..4155a5cf494 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -12,12 +12,14 @@ ACE_RCSID (Log,
            Hash_LogRecordStore,
            "$Id$")
 
-TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (CORBA::ORB_ptr orb,
-                                                  DsLogAdmin::LogId logid,
-                                                  DsLogAdmin::LogFullActionType log_full_action,
-                                                  CORBA::ULongLong max_size,
-                                                  const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-                                                  )
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (
+  CORBA::ORB_ptr orb,
+  DsLogAdmin::LogId logid,
+  DsLogAdmin::LogFullActionType log_full_action,
+  CORBA::ULongLong max_size,
+  const DsLogAdmin::CapacityAlarmThresholdList* thresholds)
   : maxid_ (0),
     max_size_ (max_size),
     id_ (logid),
@@ -42,6 +44,9 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (CORBA::ORB_ptr orb,
       this->thresholds_.length(1);
       this->thresholds_[0] = 100;
     }
+
+  this->log_qos_.length(1);
+  this->log_qos_[0] = DsLogAdmin::QoSNone;
 }
 
 TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void)
@@ -65,24 +70,12 @@ TAO_Hash_LogRecordStore::close (void)
 CORBA::ULongLong
 TAO_Hash_LogRecordStore::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   return this->current_size_;
 }
 
 CORBA::ULongLong
 TAO_Hash_LogRecordStore::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   return this->num_records_;
 }
 
@@ -90,12 +83,6 @@ int
 TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec
 			      ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
   // Get log record size...
   size_t record_size = log_record_size (const_rec);
 
@@ -142,12 +129,6 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::RecordId id,
 				   DsLogAdmin::LogRecord &rec
 				   ACE_ENV_ARG_DECL)
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			   guard,
-			   lock_,
-			   CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
   int retval = rec_hash_.find (id, rec);
   return retval;
 }
@@ -156,12 +137,6 @@ int
 TAO_Hash_LogRecordStore::update (DsLogAdmin::LogRecord &rec
 				 ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
   DsLogAdmin::LogRecord oldrec;
 
   if (rec_hash_.unbind (rec.id, oldrec) != 0)
@@ -203,12 +178,6 @@ int
 TAO_Hash_LogRecordStore::remove (DsLogAdmin::RecordId id
 				 ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
   return remove_i (id);
 }
 
@@ -216,12 +185,6 @@ TAO_Hash_LogRecordStore::remove (DsLogAdmin::RecordId id
 int
 TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
-
   CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U;
 
   if (num_records_to_purge < 1)
@@ -339,6 +302,7 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
       TAO_Hash_Iterator_i *iter_query = 0;
       ACE_NEW_THROW_EX (iter_query,
                         TAO_Hash_Iterator_i (this->reactor_,
+					     this,
                                              iter,
                                              iter_end,
                                              count,
@@ -367,12 +331,6 @@ TAO_Hash_LogRecordStore::query (const char *grammar,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			   guard,
-			   lock_,
-			   CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -389,12 +347,6 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			   guard,
-			   lock_,
-			   CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   // Decide between forward vs backward retrieval.
   char constraint[32];
   char uint64_formating[32];
@@ -470,12 +422,6 @@ TAO_Hash_LogRecordStore::match (const char* grammar,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			   guard,
-			   lock_,
-			   CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -494,12 +440,6 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -515,12 +455,6 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i
                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   CORBA::ULong count (0);
 
   for (CORBA::ULong i = 0; i < ids.length (); i++)
@@ -537,12 +471,6 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i
 CORBA::ULong
 TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    lock_,
-			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   if (this->max_record_life_ == 0) {
     return 0;
   }
@@ -587,6 +515,13 @@ TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   return count;
 }
 
+ACE_SYNCH_RW_MUTEX&
+TAO_Hash_LogRecordStore::lock()
+{
+  return lock_;
+}
+
+
 void
 TAO_Hash_LogRecordStore::check_grammar (const char* grammar
                                         ACE_ENV_ARG_DECL)
@@ -604,12 +539,6 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar
 DsLogAdmin::AdministrativeState
 TAO_Hash_LogRecordStore::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (this->admin_state_);
-
   return this->admin_state_;
 }
 
@@ -617,12 +546,6 @@ void
 TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state
                                                    ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->admin_state_ = state;
 }
 
@@ -630,12 +553,6 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta
 DsLogAdmin::CapacityAlarmThresholdList*
 TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   DsLogAdmin::CapacityAlarmThresholdList* ret_val;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
@@ -649,12 +566,6 @@ void
 TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
                                                         ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->thresholds_ = thresholds;
 }
 
@@ -663,12 +574,6 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci
 DsLogAdmin::ForwardingState
 TAO_Hash_LogRecordStore::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (this->forward_state_);
-
   return this->forward_state_;
 }
 
@@ -676,24 +581,12 @@ void
 TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state
                                                ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->forward_state_ = state;
 }
 
 DsLogAdmin::TimeInterval
 TAO_Hash_LogRecordStore::get_interval (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (this->interval_);
-
   return this->interval_;
 }
 
@@ -701,12 +594,6 @@ void
 TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval
                                        ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->interval_ = interval;
 }
 
@@ -714,12 +601,6 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval
 DsLogAdmin::LogFullActionType
 TAO_Hash_LogRecordStore::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (this->log_full_action_);
-
   return this->log_full_action_;
 }
 
@@ -727,25 +608,31 @@ void
 TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action
                                               ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->log_full_action_ = action;
 }
 
+DsLogAdmin::QoSList *
+TAO_Hash_LogRecordStore::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const
+{
+  DsLogAdmin::QoSList* ret_val;
+  ACE_NEW_THROW_EX (ret_val,
+                    DsLogAdmin::QoSList (this->log_qos_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return ret_val;
+}
+
+void
+TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos
+				      ACE_ENV_ARG_DECL)
+{
+  this->log_qos_ = qos;
+}
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   return this->max_record_life_;
 }
 
@@ -753,24 +640,12 @@ void
 TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life
                                               ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->max_record_life_ = max_record_life;
 }
 
 CORBA::ULongLong
 TAO_Hash_LogRecordStore::get_max_size (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           lock_,
-                           CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
   return this->max_size_;
 }
 
@@ -778,11 +653,26 @@ void
 TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size
                                        ACE_ENV_ARG_DECL)
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                            guard,
-                            lock_,
-                            CORBA::INTERNAL ());
-  ACE_CHECK;
-
   this->max_size_ = size;
 }
+
+DsLogAdmin::WeekMask*
+TAO_Hash_LogRecordStore::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+{
+  DsLogAdmin::WeekMask* ret_val;
+  ACE_NEW_THROW_EX (ret_val,
+                    DsLogAdmin::WeekMask (this->weekmask_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return ret_val;
+}
+
+void
+TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks
+					ACE_ENV_ARG_DECL)
+{
+  this->weekmask_ = masks;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index 7073383de53..cd50f3a621b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -29,10 +29,12 @@
 #include "ace/Null_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Reactor.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 #define LOG_DEFAULT_MAX_REC_LIST_LEN 100
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Hash_LogRecordStore
  *
@@ -116,6 +118,15 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
     set_log_full_action(DsLogAdmin::LogFullActionType action
                         ACE_ENV_ARG_DECL);
 
+  /// Get the list of the QoS properties supported by the log.
+  virtual DsLogAdmin::QoSList*
+    get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const;
+
+  /// Set the list of the QoS properties supported by the log.
+  virtual void
+    set_log_qos (const DsLogAdmin::QoSList& qos
+		 ACE_ENV_ARG_DECL);
+
   /// Gets the max record life
   virtual CORBA::ULong
     get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const;
@@ -133,7 +144,16 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual void
     set_max_size (CORBA::ULongLong size
                   ACE_ENV_ARG_DECL);
-
+  
+  /// Get the weekly scheduling parameters
+  virtual DsLogAdmin::WeekMask*
+    get_week_mask (ACE_ENV_SINGLE_ARG_DECL);
+  
+  /// Set the weekly scheduling parameters.
+  virtual void
+    set_week_mask (const DsLogAdmin::WeekMask & masks
+		   ACE_ENV_ARG_DECL);
+  
 
   // = LogRecordStore status methods
 
@@ -225,6 +245,9 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   virtual CORBA::ULong
     remove_old_records (ACE_ENV_SINGLE_ARG_DECL);
+  
+  /// Read-Write Lock
+  virtual ACE_SYNCH_RW_MUTEX& lock();
 
 /* protected: */
   /// Defines macros to represent the hash that maps ids to
@@ -305,13 +328,22 @@ protected:
   /// The action to take if the log reaches max capacity
   DsLogAdmin::LogFullActionType         log_full_action_;
 
+  /// The list of the QoS properties supported by the log.
+  DsLogAdmin::QoSList			log_qos_;
+
   /// The maximum record lifetime
   CORBA::ULong                          max_record_life_;
 
+  /// The days of the week that the log should be operational
+  DsLogAdmin::WeekMask			weekmask_;
+  
+
   ACE_Reactor*                          reactor_;
 
   mutable ACE_SYNCH_RW_MUTEX		lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_HASH_LOG_RECORD_STORE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 2eca24c2127..16a3d50b9c8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (Log,
            Hash_LogStore,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Hash_LogStore::TAO_Hash_LogStore(CORBA::ORB_ptr orb, TAO_LogMgr_i* mgr)
   : next_id_ (0),
     orb_ (CORBA::ORB::_duplicate (orb)),
@@ -256,3 +258,5 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id
 
   return recordstore;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index 16b9f300e6c..e56fd676a30 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,7 +8,7 @@
  *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
- *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -27,9 +27,14 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_Hash_LogRecordStore;
 
@@ -120,6 +125,8 @@ private:
   TAO_LogMgr_i*         mgr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TLS_HASH_LOGSTORE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
index 9c2164d58bd..91f7c455423 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (Log,
            Hash_Persistence_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy()
 {
 }
@@ -20,3 +22,5 @@ TAO_Hash_Persistence_Strategy::create_log_store(CORBA::ORB_ptr orb,
 {
   return new TAO_Hash_LogStore (orb, mgr);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h
index 44386117ce6..3c55c9a730f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,7 +8,7 @@
  *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
- *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -24,6 +24,8 @@
 
 #include "orbsvcs/Log/Log_Persistence_Strategy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Hash_Persistence_Strategy
  *
@@ -50,6 +52,8 @@ public:
 private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TLS_HASH_PERSISTENCE_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 8c9c1331526..d26dc48d882 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -4,6 +4,9 @@ ACE_RCSID (Log,
            Iterator_i,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // iterator inactivity timeout
 ACE_Time_Value
 TAO_Iterator_i::timeout_(60 * 60);
@@ -66,3 +69,5 @@ TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index ad3b1eec975..acfa7b89f63 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,7 +27,7 @@
 #include "orbsvcs/DsLogAdminS.h"
 #include "ace/Event_Handler.h"
 #include "ace/Reactor.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -36,6 +36,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Iterator_i
  *
@@ -79,6 +81,8 @@ protected:
   virtual int handle_timeout (const ACE_Time_Value&, const void *);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index c61096e9fed..5f7c64cd724 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (Log,
 #if (TAO_HAS_MINIMUM_POA == 0)
 #include "orbsvcs/Log/LogMgr_i.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LogActivator::TAO_LogActivator (TAO_LogMgr_i &logmgr_i)
   : logmgr_i_ (logmgr_i)
 {
@@ -51,4 +53,6 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
    }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
index 52905fa6988..c25f466b0ed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,11 +18,13 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/ServantActivatorC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // forward declarations
 class TAO_LogMgr_i;
 
@@ -68,6 +70,8 @@ private:
   TAO_LogMgr_i&			logmgr_i_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 3cba3e42944..1137822914f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,5 +1,5 @@
-#include "LogMgr_i.h"
-#include "LogActivator.h"
+#include "orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/Log/LogActivator.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/Log/Hash_Persistence_Strategy.h"
@@ -10,6 +10,9 @@ ACE_RCSID (Log,
            LogMgr_i,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LogMgr_i::TAO_LogMgr_i ()
   : logstore_ (0)
 {
@@ -271,3 +274,5 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
 				   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index bf8dc3c9483..8ce52e13977 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -26,7 +26,9 @@
 
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/Log/Log_Persistence_Strategy.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LogMgr_i
@@ -188,5 +190,7 @@ private:
   TAO_LogStore*			logstore_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TLS_LOGMGR_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 027f9ad103d..e7f422dd36b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -8,14 +8,14 @@ ACE_RCSID (Log,
            LogNotification,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LogNotification::TAO_LogNotification (void)
 {
-  // No-Op.
 }
 
 TAO_LogNotification::~TAO_LogNotification (void)
 {
-  // No-Op.
 }
 
 void
@@ -98,12 +98,12 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
   CORBA::Any any;
   DsLogNotification::AttributeValueChange event;
 
-  event.logref = log;
+  event.logref = DsLogAdmin::Log::_duplicate (log);
   event.id = id;
 
   TimeBase::TimeT current_time;
   ACE_Time_Value now = ACE_OS::gettimeofday ();
-  ORBSVCS_Time::Time_Value_to_TimeT(current_time, now);
+  ORBSVCS_Time::Time_Value_to_TimeT (current_time, now);
 
   event.time = current_time;
 
@@ -290,7 +290,7 @@ TAO_LogNotification::quality_of_service_value_change (
 }
 
 void
-TAO_LogNotification::state_change (DsLogAdmin::Log_ptr /* log */,
+TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
                                    DsLogAdmin::LogId id,
                                    DsLogNotification::StateType type,
                                    CORBA::Any newValue
@@ -300,12 +300,12 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr /* log */,
   CORBA::Any any;
   DsLogNotification::StateChange event;
 
-  // The log id.
+  event.logref = DsLogAdmin::Log::_duplicate (log);
   event.id = id;
 
   TimeBase::TimeT current_time;
   ACE_Time_Value now = ACE_OS::gettimeofday ();
-  ORBSVCS_Time::Time_Value_to_TimeT(current_time, now);
+  ORBSVCS_Time::Time_Value_to_TimeT (current_time, now);
   event.time = current_time;
 
   // Administrative, Operational or Forwarding state.
@@ -378,7 +378,7 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
 
 void
 TAO_LogNotification::threshold_alarm (
-    DsLogAdmin::Log_ptr /* log */,
+    DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     DsLogAdmin::Threshold crossedValue,
     DsLogAdmin::Threshold observedValue,
@@ -389,6 +389,7 @@ TAO_LogNotification::threshold_alarm (
   CORBA::Any any;
   DsLogNotification::ThresholdAlarm event;
 
+  event.logref = DsLogAdmin::Log::_duplicate (log);
   event.id = id;
 
   TimeBase::TimeT current_time;
@@ -413,3 +414,5 @@ TAO_LogNotification::send_notification (const CORBA::Any & /* any */
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index dc562f6e2ca..32b68ecae1f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -25,8 +25,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogNotificationS.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LogNotification
@@ -177,6 +178,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_TLS_LOG_NOTIFICATION_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index 885e0c756a9..278039ac40e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -4,12 +4,14 @@ ACE_RCSID (Log,
            LogRecordStore,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LogRecordStore::TAO_LogRecordStore (void)
 {
-  //No-Op.
 }
 
 TAO_LogRecordStore::~TAO_LogRecordStore (void)
 {
-  // No-Op.
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 59b055aa9ea..a16fd00e5f5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -23,7 +23,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogAdminC.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LogRecordStore
@@ -87,15 +89,24 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     set_interval (const DsLogAdmin::TimeInterval& interval
 		  ACE_ENV_ARG_DECL)				= 0;
   
-  /// Gets the log full action
+  /// Get the log full action
   virtual DsLogAdmin::LogFullActionType
     get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
   
-  /// Sets the log full action
+  /// Set the log full action
   virtual void
     set_log_full_action(DsLogAdmin::LogFullActionType action
 			ACE_ENV_ARG_DECL)			= 0;
 
+  /// Get the list of the QoS properties supported by the log.
+  virtual DsLogAdmin::QoSList*
+    get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const			= 0;
+
+  /// Set the list of the QoS properties supported by the log.
+  virtual void
+    set_log_qos (const DsLogAdmin::QoSList& qos
+		 ACE_ENV_ARG_DECL)				= 0;
+
   /// Gets the max record life
   virtual CORBA::ULong
     get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
@@ -114,6 +125,15 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     set_max_size (CORBA::ULongLong size
 		  ACE_ENV_ARG_DECL)				= 0;
 
+  /// Get the weekly scheduling parameters
+  virtual DsLogAdmin::WeekMask*
+    get_week_mask (ACE_ENV_SINGLE_ARG_DECL)			= 0;
+  
+  /// Set the weekly scheduling parameters.
+  virtual void
+    set_week_mask (const DsLogAdmin::WeekMask& masks
+		  ACE_ENV_ARG_DECL)				= 0;
+
   
   // = LogRecordStore status methods
 
@@ -209,7 +229,9 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual CORBA::ULong
     remove_old_records (ACE_ENV_SINGLE_ARG_DECL)		= 0;
 
-
+  /// Read-Write Lock
+  virtual ACE_SYNCH_RW_MUTEX& lock()				= 0;
+    
 protected:
   /// Constructor.
   TAO_LogRecordStore (void);
@@ -218,5 +240,7 @@ protected:
 private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_LOG_RECORD_STORE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
index 2af2f073dfd..c3e164fdf1b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (Log,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LogRecordStore::TAO_LogRecordStore (CORBA::ULongLong max_size,
                                         DsLogAdmin::LogId logid,
                                         CORBA::ULong max_rec_list_len)
@@ -204,3 +206,5 @@ TAO_LogRecordStore::get_storage (void)
 {
   return rec_hash_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
index 67519082f4e..d87124c3df1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
@@ -31,13 +31,15 @@
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "log_serv_export.h"
-#include "PersistStore.h"
+#include "orbsvcs/Log/log_serv_export.h"
+#include "orbsvcs/Log/PersistStore.h"
 
 #define PERSISTENT_LOG_FILE_NAME "LOG.DATA"
 
 #define LOG_DEFAULT_MAX_REC_LIST_LEN 100
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LogRecordStore
  *
@@ -152,5 +154,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   char file_name_[256];
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_LOG_RECORD_STORE_PERSIST_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 20e788e1769..78773abffb9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -23,7 +23,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogAdminC.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LogRecordStore;
 
@@ -99,6 +101,8 @@ protected:
 private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TLS_LOGSTORE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index db312eca963..d153bbe2714 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -6,6 +6,9 @@ ACE_RCSID (Log,
            Log_Compaction_Handler,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Log_Compaction_Handler::TAO_Log_Compaction_Handler (ACE_Reactor* reactor,
                                                         TAO_Log_i* log,
                                                         const ACE_Time_Value& interval)
@@ -59,3 +62,5 @@ TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&,
   
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
index 4294d8a68b9..3e51de61602 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
@@ -12,12 +12,23 @@
 #ifndef TAO_TLS_COMPACTION_HANDLER_H
 #define TAO_TLS_COMPACTION_HANDLER_H
 
+#include "orbsvcs/Log/log_serv_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Event_Handler.h"
 #include "ace/Time_Value.h"
-#include "log_serv_export.h"
 
-// forward decls
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Log_i;
 
 /// @class TAO_Log_Compaction_Handler
@@ -50,4 +61,6 @@ private:
   const ACE_Time_Value          interval_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_LOG_COMPACTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 68687e3124e..e741de09004 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,11 +1,12 @@
-#include "Log_Constraint_Interpreter.h"
+#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 
-#include "Log_Constraint_Visitors.h"
+#include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
 ACE_RCSID (Log,
            Log_Constraint_Interpreter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     const char *constraints
@@ -44,3 +45,5 @@ TAO_Log_Constraint_Interpreter::evaluate (
 
   return retval;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 7fd1a319398..18f754d8c79 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,7 +27,9 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/DsLogAdminC.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Log_Constraint_Visitor;
 
@@ -61,5 +63,8 @@ public:
   /// the evaluator.
   CORBA::Boolean evaluate (TAO_Log_Constraint_Visitor &evaluator);
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LOG_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 5ce626f3703..9d8fe567d40 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,4 +1,4 @@
-#include "Log_Constraint_Visitors.h"
+#include "orbsvcs/Log/Log_Constraint_Visitors.h"
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
@@ -17,67 +17,38 @@ ACE_RCSID (Log,
            Log_Constraint_Visitors,
            "$Id$")
 
-TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
-  DsLogAdmin::LogRecord &rec)
-  :rec_ (rec)
-{
-  ACE_CString name1 = (ACE_CString)"id";
-  ACE_CString name2 = (ACE_CString)"time";
-  ACE_CString name3 = (ACE_CString)"info";
-
-  CORBA::Any* value;
-  ACE_NEW (value, CORBA::Any);
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec)
+  : property_lookup_ (property_lookup_size_)
+{
+  CORBA::Any val_id;
 #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-  *value <<= ACE_U64_TO_U32 (this->rec_.id);
+  val_id <<= ACE_U64_TO_U32 (rec.id);
 #else
-  *value <<= static_cast<ACE_UINT32> ((this->rec_.id));
+  val_id <<= static_cast<ACE_UINT32> (rec.id);
 #endif
-  if (value != 0)
-    {
-      // @@ Where's the error check?
-      this->property_lookup_.bind (name1, value);
-    }
+  this->property_lookup_.bind (ACE_CString("id", 0, 0), val_id);
 
-  CORBA::Any* value2;
-  ACE_NEW (value2, CORBA::Any);
 
+  CORBA::Any val_time;
 #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-  *value2 <<= ACE_U64_TO_U32 (this->rec_.time);
+  val_time <<= ACE_U64_TO_U32 (rec.time);
 #else
-  *value2 <<= static_cast<ACE_UINT32> ((this->rec_.time));
+  val_time <<= static_cast<ACE_UINT32> (rec.time);
 #endif
-  if (value2 != 0)
-    {
-      // @@ Where's the error check?
-      this->property_lookup_.bind (name2, value2);
-    }
-
-  CORBA::Any* value3;
-  ACE_NEW (value3, CORBA::Any);
+  this->property_lookup_.bind (ACE_CString("time", 0, 0), val_time);
 
-  *value3 = this->rec_.info;
-
-  if (value3 != 0)
-    {
-      // @@ Where's the error check?
-      this->property_lookup_.bind (name3, value3);
-    }
+  this->property_lookup_.bind (ACE_CString("info", 0, 0), rec.info);
 
   // Bind an entry for each item in the record's attribute list.
-  CORBA::Long len = this->rec_.attr_list.length();
+  CORBA::Long len = rec.attr_list.length();
   for (CORBA::Long i = 0; i < len; ++i)
     {
-      const char* name = this->rec_.attr_list[i].name;
-
-      CORBA::Any* value;
-      ACE_NEW(value, CORBA::Any);
-
-      if (value != 0)
-	{
-	  *value = this->rec_.attr_list[i].value;
-	  this->property_lookup_.bind (name, value);
-	}
+      this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name,
+					       0,
+					       0),
+				   rec.attr_list[i].value);
     }
 }
 
@@ -119,12 +90,15 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
   const char *name = ident->value ();
   ACE_CString key (name, 0, 0);
 
-  CORBA::Any_var any;
+  CORBA::Any any;
 
   if (this->property_lookup_.find (key, any) == 0)
     {
-      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any.ptr ()));
-      return_value = 0;
+      if (any.impl() != 0)
+        {
+	  this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any));
+	  return_value = 0;
+        }
     }
 
   return return_value;
@@ -314,8 +288,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 int
@@ -410,8 +382,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 int
@@ -428,27 +398,29 @@ TAO_Log_Constraint_Visitor::visit_component_assoc (
   // basis, while keeping in mind that a clearer interpretation of
   // the spec may come along someday.
 
-  const char *name = assoc->identifier ()->value ();
-  ACE_CString key (name, 0, 0);
-  CORBA::Any_var any;
+  CORBA::Any any;
+  ACE_CString key (assoc->identifier ()->value (), 
+		   0, 
+		   0);
 
-  if (this->property_lookup_.find (key, any) != 0)
+  if (this->property_lookup_.find (key, any) != 0
+      || any.impl () == 0)
     {
       return -1;
     }
 
   TAO_ETCL_Constraint *comp = assoc->component ();
+  CORBA::Any *any_ptr = 0;
 
   if (comp == 0)
     {
-      TAO_ETCL_Literal_Constraint result (any.ptr ());
+      TAO_ETCL_Literal_Constraint result (&any);
       this->queue_.enqueue_head (result);
       return 0;
     }
 
-  CORBA::Any *any_ptr = 0;
   ACE_NEW_RETURN (any_ptr,
-                  CORBA::Any (any.in ()),
+                  CORBA::Any (any),
                   -1);
   this->current_member_ = any_ptr;
   return comp->accept (this);
@@ -547,8 +519,6 @@ TAO_Log_Constraint_Visitor::visit_component_array (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 int
@@ -622,8 +592,6 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 int
@@ -720,8 +688,6 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 int
@@ -1317,8 +1283,6 @@ TAO_Log_Constraint_Visitor::union_does_contain (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
-
-  return 0;
 }
 
 CORBA::Boolean
@@ -1377,3 +1341,7 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type,
       return 0;
   }
 }
+
+const size_t TAO_Log_Constraint_Visitor::property_lookup_size_ = 31;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index 06a6549aff3..f9067132c3b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,8 +27,11 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
 #include "orbsvcs/DsLogAdminC.h"
+#include "ace/Null_Mutex.h"
 
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ETCL_Constraint;
 class TAO_ETCL_Literal_Constraint;
@@ -45,7 +48,7 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor :
 public:
 
   /// Constructor.
-  TAO_Log_Constraint_Visitor (DsLogAdmin::LogRecord &rec);
+  TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec);
 
   /**
    * Returns 1 if the offer satisfies the constraint
@@ -100,10 +103,13 @@ private:
                                     CORBA::TCKind tc_kind);
 
 private:
+  /// Size of property_lookup_ hash map.
+  /// TODO: define inline once VC6 support is deprecated.
+  static const size_t property_lookup_size_;
 
   typedef ACE_Hash_Map_Manager <ACE_CString,
-                                CORBA::Any_var,
-                                TAO_SYNCH_MUTEX> HASH_MAP;
+                                CORBA::Any,
+                                ACE_Null_Mutex> HASH_MAP;
 
   typedef HASH_MAP::ENTRY HASH_ENTRY;
 
@@ -116,10 +122,9 @@ private:
   /// Holder for a value found in property_lookup_ or for a
   /// nested type within that value.
   CORBA::Any_var current_member_;
-
-  /// Local LogRecord.
-  DsLogAdmin::LogRecord &rec_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LOG_CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index 38d31de5774..122d35c486c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (Log,
            Log_Flush_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Log_Flush_Handler::TAO_Log_Flush_Handler (ACE_Reactor* reactor,
                                               TAO_Log_i* log,
                                               const ACE_Time_Value& interval)
@@ -53,3 +55,5 @@ TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *)
   
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
index c659fde95ae..f61d40ad999 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
@@ -12,12 +12,23 @@
 #ifndef TAO_TLS_FLUSH_HANDLER_H
 #define TAO_TLS_FLUSH_HANDLER_H
 
+#include "orbsvcs/Log/log_serv_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Event_Handler.h"
 #include "ace/Time_Value.h"
-#include "log_serv_export.h"
 
-// forward decls
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Log_i;
 
 /// @class TAO_Log_Flush_Handler
@@ -50,4 +61,6 @@ private:
   ACE_Time_Value                interval_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_LOG_FLUSH_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
index 796c12663ef..3e16a89a70d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -17,14 +17,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogStore;
 class TAO_LogMgr_i;
 
@@ -51,6 +54,8 @@ public:
 private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TLS_PERSISTENCE_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 5f4dfbce233..207cae2e7e2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (Log,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Log Compaction Interval
 const ACE_Time_Value
 TAO_Log_i::log_compaction_interval_ = ACE_Time_Value(60);
@@ -26,42 +28,77 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
                       DsLogAdmin::LogMgr_ptr factory,
                       DsLogAdmin::LogId logid,
                       TAO_LogNotification *log_notifier)
-  : factory_ (DsLogAdmin::LogMgr::_duplicate (factory)),
+  : logmgr_i_(logmgr_i),
+    factory_ (DsLogAdmin::LogMgr::_duplicate (factory)),
     logid_ (logid),
     op_state_ (DsLogAdmin::disabled),
     reactor_ (orb->orb_core()->reactor()),
-    log_compaction_handler_(reactor_, this, log_compaction_interval_),
-    log_flush_handler_(reactor_, this, log_flush_interval_)
+    notifier_ (log_notifier),
+    log_compaction_handler_ (reactor_, this, log_compaction_interval_),
+    log_flush_handler_ (reactor_, this, log_flush_interval_)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  recordstore_ = logmgr_i.get_log_record_store (logid
-						ACE_ENV_ARG_PARAMETER);
-
   // TODO: get log parameters from (persistent?) store.
   avail_status_.off_duty = 0;
   avail_status_.log_full = 0;
-  this->notifier_ = log_notifier;
-  this->current_threshold_ = 0;
-  this->thresholds_.length(1);
-  this->thresholds_[0] = 100;
-  this->qostype_ = DsLogAdmin::QoSNone;
 }
 
 void
 TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (recordstore_->open () ==-1)
+#if 0
+  // @@ Calling create_log_reference () here leads to an infinate loop.
+  // When this is fixed, this can be enabled.
+  this->log_ =
+    logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+#endif
+
+  this->recordstore_ =
+    logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (this->recordstore_->open () ==-1)
     ACE_THROW (CORBA::UNKNOWN ());
 
-  if (this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER) != 0)
-    {
-      this->log_compaction_handler_.schedule ();
-    }
+  // fetch the capacity alarm thresholds from the log record store
+  DsLogAdmin::CapacityAlarmThresholdList_var thresholds =
+    this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
-  if (this->qostype_ == DsLogAdmin::QoSFlush)
+  // initialize the internal representation
+  this->thresholds_ = thresholds.in ();
+  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+
+  // fetch the log QoS from the log record store
+  DsLogAdmin::QoSList_var qos =
+    this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // initialize the internal representation.
+  this->reset_log_qos (qos.in ());
+
+
+  // fetch the week mask from the log record store
+  DsLogAdmin::WeekMask_var week_mask =
+    this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // initialize the internal representation
+  this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+
+  // fetch the maximum record life from the log record store
+  CORBA::ULong max_record_life =
+    this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // if set, activate the compaction handler
+  if (max_record_life != 0)
     {
-      this->log_flush_handler_.schedule ();
+      this->log_compaction_handler_.schedule ();
     }
 
   this->op_state_ = DsLogAdmin::enabled;
@@ -90,6 +127,12 @@ DsLogAdmin::QoSList*
 TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   // @@ The current revision of the specification (formal/03-07-01)
   // states that get_log_qos() returns a list of the QoS properties
   // supported by the log, not the current value.  However, because
@@ -98,17 +141,7 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
   // have submitted a defect report to the OMG for clarification.
   //    --jtc
 
-  DsLogAdmin::QoSList* ret_ptr;
-  ACE_NEW_THROW_EX (ret_ptr,
-                    DsLogAdmin::QoSList (1),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  DsLogAdmin::QoSList_var ret_val = ret_ptr;
-  ret_val->length(1);
-  ret_val[0] = qostype_;
-
-  return ret_val._retn ();
+  return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -117,6 +150,12 @@ 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,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   // @@ The current revision of the specification (formal/03-07-01)
   // does not clearly define the semantics to follow when the QoSList
   // contains mutually exclusive, unsupported, or unknown properties.
@@ -127,71 +166,44 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
   // were found, an UnsupportedQoS exception is thrown.
   //    --jtc
 
-  DsLogAdmin::QoSType old_qos = this->qostype_;
-  DsLogAdmin::QoSType qostype = old_qos;
-  DsLogAdmin::QoSList denied;
+  validate_log_qos (qos);
 
-  // validate properties..
-  for (CORBA::ULong i = 0; i < qos.length (); ++i)
-    {
-      qostype = qos[i];
-      if (qostype != DsLogAdmin::QoSNone &&
-	  qostype != DsLogAdmin::QoSFlush &&
-          qostype != DsLogAdmin::QoSReliability)
-        {
-	  CORBA::ULong len = denied.length();
-	  denied.length(len + 1);
-	  denied[len] = qostype;
-        }
-    }
-
-  // if there were any unknown/unsupported properties, thrown an
-  // exception.
-  if (denied.length() != 0)
-    {
-      ACE_THROW (DsLogAdmin::UnsupportedQoS (denied));
-    }
+  DsLogAdmin::QoSList_var old_qos =
+    this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
-  if (qostype == old_qos)
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
+  if (qos == old_qos.in ())
     return;
 
-  this->qostype_ = qostype;
+  this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  if (this->qostype_ == DsLogAdmin::QoSFlush)
-    this->log_flush_handler_.schedule ();
-  else
-    this->log_flush_handler_.cancel ();
+  reset_log_qos (qos);
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      DsLogAdmin::QoSList* old_qoslist_ptr;
-      ACE_NEW_THROW_EX (old_qoslist_ptr,
-			DsLogAdmin::QoSList (1),
-			CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      DsLogAdmin::QoSList_var old_qoslist = old_qoslist_ptr;
-      old_qoslist->length(1);
-      old_qoslist[0] = old_qos;
-
-      DsLogAdmin::QoSList* new_qoslist_ptr;
-      ACE_NEW_THROW_EX (new_qoslist_ptr,
-			DsLogAdmin::QoSList (1),
-			CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      DsLogAdmin::QoSList_var new_qoslist = new_qoslist_ptr;
-      new_qoslist->length(1);
-      new_qoslist[0] = qostype;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->quality_of_service_value_change (log.in (),
-                                                  logid_,
-                                                  old_qoslist.in (),
-                                                  new_qoslist.in ()
+      notifier_->quality_of_service_value_change (this->log_.in (),
+                                                  this->logid_,
+                                                  old_qos.in (),
+                                                  qos
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -201,6 +213,12 @@ CORBA::ULong
 TAO_Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return
     this->recordstore_->get_max_record_life(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -210,14 +228,28 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong old_life;
-  old_life = this->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  CORBA::ULong old_life =
+    this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
   if (life == old_life)
     return;
 
-  this->recordstore_->set_max_record_life(life ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (life != 0)
@@ -227,12 +259,18 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->max_record_life_value_change (log.in (),
-                                               logid_,
+      notifier_->max_record_life_value_change (this->log_.in (),
+                                               this->logid_,
                                                old_life,
                                                life
                                                ACE_ENV_ARG_PARAMETER);
@@ -244,6 +282,12 @@ CORBA::ULongLong
 TAO_Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -253,41 +297,90 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
-  // size == 0 => infinite size.
-  CORBA::ULongLong old_size;
-  old_size = this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
   ACE_CHECK;
 
-  if ((size != 0) && (size <
-      this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER)))
-    {
-      ACE_THROW (DsLogAdmin::InvalidParam ());
-    }
-  else
+  CORBA::ULongLong old_size =
+    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
+  if (size == old_size)
+    return;
+
+  // size == 0 => infinite size.
+  if (size != 0)
     {
-      this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
+      CORBA::ULongLong current_size =
+	this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (notifier_ && old_size != size)
-        {
-          DsLogAdmin::Log_var log =
-            this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+      if (size < current_size)
+	ACE_THROW (DsLogAdmin::InvalidParam ());
+    }
 
-          notifier_->max_log_size_value_change (log.in (),
-                                                logid_,
-                                                old_size,
-                                                size
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
+  this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (notifier_)
+    {
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
+
+      notifier_->max_log_size_value_change (this->log_.in (),
+					    this->logid_,
+					    old_size,
+					    size
+					    ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
+
+  // @@ The current revision of the specification (formal/03-07-01)
+  // doesn't specify the interaction between set_max_size() and the
+  // capacity alarm thresholds list.  Publicly available documentation
+  // I've read for other log service implementations doesn't offer any
+  // guidance either.  I have submitted a defect report to the OMG for
+  // clarification.
+  //
+  // In the mean time, we will call reset_capacity_alarm_threshold()
+  // to reset the "current_threshold_" index.  This will result in
+  // ThresholdAlarm being sent when the next threshold is crossed.  An
+  // argument could be made that an event should be be sent for each
+  // threshold that has already been crossed.  Hopefully, this will be
+  // clarified when/if the OMG charters a RTF for the log service.
+  //    --jtc
+  //
+  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 CORBA::ULongLong
 TAO_Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -295,6 +388,12 @@ CORBA::ULongLong
 TAO_Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -302,8 +401,13 @@ DsLogAdmin::LogFullActionType
 TAO_Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return
-    this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  return this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -312,13 +416,27 @@ 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,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt)
     ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
 
   DsLogAdmin::LogFullActionType old_action =
-    this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
   if (action == old_action)
     return;
 
@@ -327,23 +445,53 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->log_full_action_value_change (log.in (),
-                                               logid_,
+      notifier_->log_full_action_value_change (this->log_.in (),
+                                               this->logid_,
                                                old_action,
                                                action
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
    }
+
+  // @@ The current revision of the specification (formal/03-07-01)
+  // doesn't specify the interaction between set_log_full_action() and the
+  // capacity alarm thresholds list.  Publicly available documentation
+  // I've read for other log service implementations doesn't offer any
+  // guidance either.  I have submitted a defect report to the OMG for
+  // clarification.
+  //
+  // In the mean time, we will call reset_capacity_alarm_threshold()
+  // to reset the "current_threshold_" index.  This will result in
+  // ThresholdAlarm being sent when the next threshold is crossed.  An
+  // argument could be made that an event should be be sent for each
+  // threshold that has already been crossed.  Hopefully, this will be
+  // clarified when/if the OMG charters a RTF for the log service.
+  //    --jtc
+  //
+  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 DsLogAdmin::AdministrativeState
 TAO_Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -352,10 +500,24 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   DsLogAdmin::AdministrativeState old_state =
-    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
   if (state == old_state)
     return;
 
@@ -364,12 +526,18 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->administrative_state_change (log.in (),
-                                              logid_,
+      notifier_->administrative_state_change (this->log_.in (),
+                                              this->logid_,
                                               state
                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -380,6 +548,12 @@ DsLogAdmin::ForwardingState
 TAO_Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return
     this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -389,10 +563,24 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   DsLogAdmin::ForwardingState old_state =
-    this->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
   if (state == old_state)
     return;
 
@@ -401,22 +589,30 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->forwarding_state_change (log.in (),
-                                          logid_,
+      notifier_->forwarding_state_change (this->log_.in (),
+                                          this->logid_,
                                           state
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  }
+    }
 }
 
 DsLogAdmin::OperationalState
 TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // No locks are necessary, since op_state_ is set in ::init() and
+  // never changed.
   return this->op_state_;
 }
 
@@ -424,6 +620,12 @@ DsLogAdmin::TimeInterval
 TAO_Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -434,7 +636,13 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
 
+  // validate interval
   if (interval.start != 0)
     {
       if (interval.start >= interval.stop)
@@ -442,11 +650,18 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
     }
 
   DsLogAdmin::TimeInterval old_interval =
-    this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (interval.start == old_interval.start &&
-      interval.stop  == old_interval.stop)
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
+  if (interval == old_interval)
     return;
 
   this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER);
@@ -454,14 +669,20 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
       if (interval.start != old_interval.start)
         {
-          notifier_->start_time_value_change (log.in (),
-                                              logid_,
+          notifier_->start_time_value_change (this->log_.in (),
+                                              this->logid_,
                                               old_interval.start,
                                               interval.start
                                               ACE_ENV_ARG_PARAMETER);
@@ -470,8 +691,8 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 
       if (interval.stop != old_interval.stop)
         {
-          notifier_->stop_time_value_change (log.in (),
-                                             logid_,
+          notifier_->stop_time_value_change (this->log_.in (),
+                                             this->logid_,
                                              old_interval.stop,
                                              interval.stop
                                              ACE_ENV_ARG_PARAMETER);
@@ -484,6 +705,19 @@ DsLogAdmin::AvailabilityStatus
 TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  return this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+DsLogAdmin::AvailabilityStatus
+TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
   // The log is considered "on duty" if all the following are true:
   //   * operational state is enabled
   //   * adminstrative state is unlocked
@@ -495,7 +729,7 @@ TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (this->avail_status_);
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->avail_status_);
 
   if (this->op_state_ == DsLogAdmin::enabled
@@ -515,13 +749,13 @@ DsLogAdmin::CapacityAlarmThresholdList*
 TAO_Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  DsLogAdmin::CapacityAlarmThresholdList* ret_val;
-  ACE_NEW_THROW_EX (ret_val,
-                    DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
-                    CORBA::NO_MEMORY ());
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return ret_val;
+  return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -532,6 +766,12 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidThreshold))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   const CORBA::Boolean validated =
     TAO_Log_i::validate_capacity_alarm_thresholds (threshs
                                                    ACE_ENV_ARG_PARAMETER);
@@ -540,37 +780,76 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   if (!validated)
     ACE_THROW (DsLogAdmin::InvalidThreshold ());
 
-  DsLogAdmin::CapacityAlarmThresholdList old_threshs;
-  old_threshs = thresholds_;
+  DsLogAdmin::CapacityAlarmThresholdList_var old_threshs =
+    this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
-  this->thresholds_ = threshs;
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
+  if (threshs == old_threshs.in ())
+      return;
+
+  this->recordstore_->set_capacity_alarm_thresholds (threshs
+						     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->capacity_alarm_threshold_value_change (log.in (),
-                                                        logid_,
-                                                        old_threshs,
+      notifier_->capacity_alarm_threshold_value_change (this->log_.in (),
+                                                        this->logid_,
+                                                        old_threshs.in (),
                                                         threshs
                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
+
+  // @@ The current revision of the specification (formal/03-07-01)
+  // doesn't completly describe the behavior of changing the capacity
+  // alarm threshold list.  Publicly available documentation I've read
+  // for other log service implementations doesn't offer much guidance
+  // either.  I have submitted a defect report to the OMG for
+  // clarification.
+  //
+  // In the mean time, we will call reset_capacity_alarm_threshold()
+  // to reset the "current_threshold_" index.  This will result in
+  // ThresholdAlarm being sent when the next threshold is crossed.  An
+  // argument could be made that an event should be be sent for each
+  // threshold that has already been crossed.  Hopefully, this will be
+  // clarified when/if the OMG charters a RTF for the log service.
+  //    --jtc
+  //
+  this->thresholds_ = threshs;
+  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 DsLogAdmin::WeekMask*
 TAO_Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  DsLogAdmin::WeekMask* ret_val;
-  ACE_NEW_THROW_EX (ret_val,
-                    DsLogAdmin::WeekMask (this->weekmask_),
-                    CORBA::NO_MEMORY ());
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return ret_val;
+  return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -581,86 +860,51 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
                    DsLogAdmin::InvalidTimeInterval,
                    DsLogAdmin::InvalidMask))
 {
-  for (CORBA::ULong i = 0; i < masks.length (); ++i)
-    {
-      if (masks[i].days > (DsLogAdmin::Sunday +
-                           DsLogAdmin::Monday +
-                           DsLogAdmin::Tuesday +
-                           DsLogAdmin::Wednesday +
-                           DsLogAdmin::Thursday +
-                           DsLogAdmin::Friday +
-                           DsLogAdmin::Saturday)
-          )
-        ACE_THROW (DsLogAdmin::InvalidMask ());
-
-      for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j)
-        {
-          if (masks[i].intervals[j].start.hour > 23 ||
-              masks[i].intervals[j].start.minute > 59 ||
-              masks[i].intervals[j].stop.hour > 23 ||
-              masks[i].intervals[j].stop.minute > 59)
-            ACE_THROW (DsLogAdmin::InvalidTime ());
-
-          if (masks[i].intervals[j].stop.hour <
-              masks[i].intervals[j].start.hour)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
-
-          if (masks[i].intervals[j].stop.hour ==
-              masks[i].intervals[j].start.hour &&
-              masks[i].intervals[j].stop.minute <=
-              masks[i].intervals[j].start.minute)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
-
-        }
-    }
-
-  DsLogAdmin::WeekMask old_masks;
-  old_masks = weekmask_;
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
 
-  DsLogAdmin::TimeInterval temp_interval;
-  CORBA::ULong count = 0;
-  weekly_intervals_.length (100);
+  validate_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  // convert the weekmask into a sequence of time intervals.
-  for (CORBA::ULong k = 0; k < masks.length (); ++k)
-    {
-      for (CORBA::ULong j = 0; j < masks[k].intervals.length (); ++j)
-        {
-          for (int d = 0; d < 7; ++d)
-            {
-              if ( (1 << d) & masks[k].days)
-                {
-                  temp_interval.start =
-                    CORBA::ULongLong (
-                      (d * 3600* 24) +
-                      (masks[k].intervals[j].start.hour * 3600) +
-                      (masks[k].intervals[j].start.minute * 60)) * 10000000;
+  DsLogAdmin::WeekMask_var old_masks =
+    this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
-                  temp_interval.stop =
-                    CORBA::ULongLong (
-                      (d * 3600* 24) +
-                      (masks[k].intervals[j].stop.hour * 3600) +
-                      (masks[k].intervals[j].stop.minute * 60)) * 10000000;
+  // @@ The current revision of the specification (formal/03-07-01) is
+  // unclear whether an AttributeValueChange event should be sent if a
+  // log attribute was changed (to a new value), or whether the events
+  // should be sent unconditionally.  I have submitted a defect report
+  // to the OMG for clarification.
+  //
+  // In the mean time, we're interepreting it to mean that events are
+  // only sent when the value has changed.
+  if (masks == old_masks.in ())
+    return;
 
-                  weekly_intervals_[count] = temp_interval;
-                  ++count;
-                }
-            }
-        }
-    }
-  weekly_intervals_.length (count);
+  this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  //TODO: SORT AND CLEAN
+  this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (notifier_)
     {
-      DsLogAdmin::Log_var log =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      // @@ Calling create_log_reference () in the ctor or in ::init()
+      // leads to an infinate loop.  This should be removed when that
+      // is fixed.
+      if (CORBA::is_nil (this->log_.in ()))
+	{
+	  this->log_ = logmgr_i_.create_log_reference (this->logid_
+						       ACE_ENV_ARG_PARAMETER);
+	  ACE_CHECK;
+	}
 
-      notifier_->week_mask_value_change (log.in (),
-                                         logid_,
-                                         old_masks,
+      notifier_->week_mask_value_change (this->log_.in (),
+                                         this->logid_,
+                                         old_masks.in (),
                                          masks
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -677,6 +921,12 @@ TAO_Log_i::query (const char *grammar,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->query (grammar,
 				    constraint,
 				    iter_out
@@ -691,6 +941,12 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   return this->recordstore_->retrieve (from_time,
 				       how_many,
 				       iter_out
@@ -706,6 +962,12 @@ TAO_Log_i::match (const char* grammar,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
+  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                           guard,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   CORBA::ULong count =
     this->recordstore_->match (grammar,
 			       constraint
@@ -724,6 +986,12 @@ TAO_Log_i::delete_records (const char *grammar,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   CORBA::ULong count =
     this->recordstore_->delete_records (grammar,
 					constraint
@@ -733,11 +1001,11 @@ TAO_Log_i::delete_records (const char *grammar,
   if (avail_status_.log_full && count > 0)
     {
       const CORBA::ULongLong current_size =
-        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       const CORBA::ULongLong max_size =
-        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current_size < max_size)
@@ -758,6 +1026,12 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   CORBA::ULong count =
     this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -765,11 +1039,11 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
   if (avail_status_.log_full && count > 0)
     {
       const CORBA::ULongLong current_size =
-        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       const CORBA::ULongLong max_size =
-        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current_size < max_size)
@@ -816,12 +1090,18 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
                    DsLogAdmin::LogLocked,
                    DsLogAdmin::LogDisabled))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   DsLogAdmin::LogFullActionType log_full_action =
-    this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -834,7 +1114,7 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
   // specific LogLocked and LogDisabled exceptions will be thrown.
 
   DsLogAdmin::AvailabilityStatus avail_stat =
-    this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (avail_stat.log_full == 1
@@ -911,6 +1191,12 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   // TODO: validate attributes here.
 
   DsLogAdmin::LogRecord rec;
@@ -937,6 +1223,12 @@ TAO_Log_i::set_records_attribute (const char *grammar,
                      DsLogAdmin::InvalidConstraint,
                      DsLogAdmin::InvalidAttribute))
 {
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+			    guard,
+			    this->recordstore_->lock (),
+			    CORBA::INTERNAL ());
+  ACE_CHECK;
+
   DsLogAdmin::Iterator_var iter_out;
 
   DsLogAdmin::RecordList_var rec_list =
@@ -988,6 +1280,12 @@ 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,
+                           this->recordstore_->lock (),
+                           CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
   DsLogAdmin::LogRecord rec;
 
   int retval = this->recordstore_->retrieve (id, rec ACE_ENV_ARG_PARAMETER);
@@ -1013,6 +1311,7 @@ TAO_Log_i::flush (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS))
 {
+  /// XXX locks?
   this->recordstore_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -1021,7 +1320,7 @@ TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::TimeInterval interval =
-    this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TimeBase::TimeT current_time;
@@ -1158,11 +1457,11 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   if (avail_status_.log_full && count > 0)
     {
       const CORBA::ULongLong current_size =
-        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const CORBA::ULongLong max_size =
-        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (current_size < max_size)
@@ -1180,7 +1479,7 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULongLong max_size =
-    this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (max_size != 0 && this->thresholds_.length () > 0)
@@ -1202,12 +1501,18 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 
           if (notifier_)
             {
-              DsLogAdmin::Log_var log =
-                this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-
+	      // @@ Calling create_log_reference () in the ctor or in ::init()
+	      // leads to an infinate loop.  This should be removed when that
+	      // is fixed.
+	      if (CORBA::is_nil (this->log_.in ()))
+		{
+		  this->log_ = logmgr_i_.create_log_reference (this->logid_
+							       ACE_ENV_ARG_PARAMETER);
+		  ACE_CHECK;
+		}
+		  
               notifier_->threshold_alarm (
-                log.in (),
+                this->log_.in (),
                 logid_,
                 this->thresholds_[this->current_threshold_],
                 percent,
@@ -1239,7 +1544,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULongLong max_size =
-    this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (max_size != 0 && this->thresholds_.length() > 0)
@@ -1283,3 +1588,327 @@ TAO_Log_i::validate_capacity_alarm_thresholds (
 
   return true;
 }
+
+void
+TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
+			  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  // @@ The current revision of the specification (formal/03-07-01)
+  // does not clearly define the semantics to follow when the QoSList
+  // contains mutually exclusive, unsupported, or unknown properties.
+  // I have submitted a defect report to the OMG for clarification.
+  //
+  // In the mean time, the last property found in the QoSList takes
+  // presidence. 
+  //    --jtc
+
+  DsLogAdmin::QoSType qostype = DsLogAdmin::QoSNone;
+
+  for (CORBA::ULong i = 0; i < qos.length (); ++i) 
+    {
+      qostype = qos[i];
+    }
+
+  this->qostype_ = qostype;
+
+  if (this->qostype_ == DsLogAdmin::QoSFlush)
+    this->log_flush_handler_.schedule ();
+  else
+    this->log_flush_handler_.cancel ();
+}
+
+void
+TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos 
+			     ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS))
+{
+  DsLogAdmin::QoSList denied;
+
+  // validate properties..
+  for (CORBA::ULong i = 0; i < qos.length (); ++i)
+    {
+      DsLogAdmin::QoSType qostype = qos[i];
+      if (qostype != DsLogAdmin::QoSNone &&
+	  qostype != DsLogAdmin::QoSFlush &&
+          qostype != DsLogAdmin::QoSReliability)
+        {
+	  CORBA::ULong len = denied.length();
+	  denied.length(len + 1);
+	  denied[len] = qostype;
+        }
+    }
+
+  // if there were any unknown/unsupported properties, thrown an
+  // exception.
+  if (denied.length() != 0)
+    {
+      ACE_THROW (DsLogAdmin::UnsupportedQoS (denied));
+    }
+}
+
+void
+TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks 
+			    ACE_ENV_ARG_DECL_NOT_USED)
+{
+  CORBA::ULong count = 0;
+  weekly_intervals_.length (100);
+
+  // convert the weekmask into a sequence of time intervals.
+  for (CORBA::ULong k = 0; k < masks.length (); ++k)
+    {
+      for (CORBA::ULong j = 0; j < masks[k].intervals.length (); ++j)
+        {
+          for (int d = 0; d < 7; ++d)
+            {
+              if ( (1 << d) & masks[k].days)
+                {
+		  DsLogAdmin::TimeInterval temp_interval;
+
+                  temp_interval.start =
+                    CORBA::ULongLong (
+                      (d * 3600* 24) +
+                      (masks[k].intervals[j].start.hour * 3600) +
+                      (masks[k].intervals[j].start.minute * 60)) * 10000000;
+
+                  temp_interval.stop =
+                    CORBA::ULongLong (
+                      (d * 3600* 24) +
+                      (masks[k].intervals[j].stop.hour * 3600) +
+                      (masks[k].intervals[j].stop.minute * 60)) * 10000000;
+
+                  weekly_intervals_[count] = temp_interval;
+                  ++count;
+                }
+            }
+        }
+    }
+  weekly_intervals_.length (count);
+
+  //TODO: SORT AND CLEAN
+}
+
+void
+TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
+			       ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
+		   DsLogAdmin::InvalidTimeInterval,
+		   DsLogAdmin::InvalidMask))
+{
+  for (CORBA::ULong i = 0; i < masks.length (); ++i)
+    {
+      if (masks[i].days > (DsLogAdmin::Sunday +
+                           DsLogAdmin::Monday +
+                           DsLogAdmin::Tuesday +
+                           DsLogAdmin::Wednesday +
+                           DsLogAdmin::Thursday +
+                           DsLogAdmin::Friday +
+                           DsLogAdmin::Saturday)
+          )
+        ACE_THROW (DsLogAdmin::InvalidMask ());
+
+      for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j)
+        {
+          if (masks[i].intervals[j].start.hour > 23 ||
+              masks[i].intervals[j].start.minute > 59 ||
+              masks[i].intervals[j].stop.hour > 23 ||
+              masks[i].intervals[j].stop.minute > 59)
+            ACE_THROW (DsLogAdmin::InvalidTime ());
+
+          if (masks[i].intervals[j].stop.hour <
+              masks[i].intervals[j].start.hour)
+            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+
+          if (masks[i].intervals[j].stop.hour ==
+              masks[i].intervals[j].start.hour &&
+              masks[i].intervals[j].stop.minute <=
+              masks[i].intervals[j].start.minute)
+            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+        }
+    }
+}
+
+
+bool
+operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
+           const DsLogAdmin::CapacityAlarmThresholdList& lhs)
+{
+  const CORBA::ULong length = rhs.length ();
+
+  if (length != lhs.length ())
+    {
+      return false;
+    }
+
+  for (CORBA::ULong i = 0; i < length; ++i) 
+    {
+      if (rhs[i] != lhs[i]) 
+	{
+	  return false;
+	}
+    }
+
+  return true;
+}
+
+bool
+operator!=(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
+           const DsLogAdmin::CapacityAlarmThresholdList& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::IntervalsOfDay& rhs,
+           const DsLogAdmin::IntervalsOfDay& lhs)
+{
+  const CORBA::ULong length = rhs.length ();
+
+  if (length != lhs.length ())
+    {
+      return false;
+    }
+
+  for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      if (rhs[i] != lhs[i])
+        {
+           return false;
+        }
+    }
+
+  return true;
+}
+
+bool
+operator!=(const DsLogAdmin::IntervalsOfDay& rhs,
+           const DsLogAdmin::IntervalsOfDay& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::QoSList& rhs,
+           const DsLogAdmin::QoSList& lhs)
+{
+  const CORBA::ULong length = rhs.length ();
+
+  if (length != lhs.length ())
+    {
+      return false;
+    }
+
+  for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      if (rhs[i] != lhs[i])
+        {
+           return false;
+        }
+    }
+
+  return true;
+}
+
+bool
+operator!=(const DsLogAdmin::QoSList& rhs,
+           const DsLogAdmin::QoSList& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::Time24& rhs,
+           const DsLogAdmin::Time24& lhs)
+{
+  return (rhs.hour   == lhs.hour &&
+          rhs.minute == lhs.minute);
+}
+
+bool
+operator!=(const DsLogAdmin::Time24& rhs,
+           const DsLogAdmin::Time24& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::Time24Interval& rhs,
+           const DsLogAdmin::Time24Interval& lhs)
+{
+  return (rhs.start == lhs.start &&
+          rhs.stop  == lhs.stop);
+}
+
+bool
+operator!=(const DsLogAdmin::Time24Interval& rhs,
+           const DsLogAdmin::Time24Interval& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::TimeInterval& rhs,
+           const DsLogAdmin::TimeInterval& lhs)
+{
+  return (rhs.start == lhs.start &&
+          rhs.stop  == lhs.stop);
+}
+
+bool
+operator!=(const DsLogAdmin::TimeInterval& rhs,
+           const DsLogAdmin::TimeInterval& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::WeekMaskItem& rhs,
+           const DsLogAdmin::WeekMaskItem& lhs)
+{
+  return (rhs.days      == lhs.days &&
+          rhs.intervals == lhs.intervals);
+}
+
+bool
+operator!=(const DsLogAdmin::WeekMaskItem& rhs,
+           const DsLogAdmin::WeekMaskItem& lhs)
+{
+  return !(lhs == rhs);
+}
+
+
+bool
+operator==(const DsLogAdmin::WeekMask& rhs,
+	   const DsLogAdmin::WeekMask& lhs)
+{
+  const CORBA::ULong length = rhs.length ();
+
+  if (length != lhs.length ())
+    {
+      return false;
+    }
+ 
+  for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      if (rhs[i] != lhs[i]) 
+        {
+          return false;
+        }
+    }
+
+  return true;
+}
+
+bool
+operator!=(const DsLogAdmin::WeekMask& rhs,
+	   const DsLogAdmin::WeekMask& lhs)
+{
+  return !(lhs == rhs);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 502199bab26..38d0ffa0e54 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -32,7 +32,9 @@
 #include "orbsvcs/Log/LogRecordStore.h"
 #include "orbsvcs/DsLogAdminS.h"
 #include "ace/Reactor.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LogMgr_i;
 
@@ -323,7 +325,14 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
+  /// Get the availability status
+  /// @note must be called with locks held
+  DsLogAdmin::AvailabilityStatus
+  get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   /// Tells if the Log is scheduled to run now.
+  /// @note must be called with locks held
   CORBA::Boolean scheduled (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -346,18 +355,52 @@ protected:
    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Reset Log QoS
+  void reset_log_qos (const DsLogAdmin::QoSList& qos
+		      ACE_ENV_ARG_DECL);
+
+  /// Validate log QoS
+  void validate_log_qos (const DsLogAdmin::QoSList& qos
+			 ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS));
+
+  /// Reset Week Mask
+  ///
+  /// Used to initialize internal data structures that represent the
+  /// week mask list when the log service starts, and to reinitialize
+  /// them when they are changed.
+  ///
+  void reset_week_mask (const DsLogAdmin::WeekMask& masks
+			ACE_ENV_ARG_DECL);
+
+  /// Validate Week Mask
+  ///
+  /// 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_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
+                     DsLogAdmin::InvalidTimeInterval,
+                     DsLogAdmin::InvalidMask));
+
 protected:
+  /// Reference to the LogMgr servant
+  TAO_LogMgr_i& logmgr_i_;
+
+  /// The log's object reference
+  DsLogAdmin::Log_var log_;
 
-  /// The factory of the log
+  /// The log's factory's object reference
   DsLogAdmin::LogMgr_var factory_;
 
-  /// The id of the log
+  /// The log's id 
   DsLogAdmin::LogId logid_;
 
-  /// The operational state of the log
+  /// The log's operational state
   DsLogAdmin::OperationalState op_state_;
 
-  /// The availability of the log
+  /// The log's availability status
   DsLogAdmin::AvailabilityStatus avail_status_;
 
   /// The list of points at which the log should generate events
@@ -367,11 +410,8 @@ protected:
   /// The next capacity alarm threshold.
   CORBA::ULong current_threshold_;
 
-  /// The days of the week that the log should be operational
-  DsLogAdmin::WeekMask weekmask_;
-
   /// A Sequence of the weekly intervals when the log is in operation.
-  TAO_Unbounded_Sequence<DsLogAdmin::TimeInterval> weekly_intervals_;
+  DsLogAdmin::TimeIntervalSeq weekly_intervals_;
 
   /// The QoS type of the log
   DsLogAdmin::QoSType qostype_;
@@ -398,6 +438,72 @@ protected:
   static const ACE_Time_Value	log_flush_interval_;
 };
 
+bool TAO_Log_Serv_Export 
+operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
+           const DsLogAdmin::CapacityAlarmThresholdList& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
+           const DsLogAdmin::CapacityAlarmThresholdList& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::IntervalsOfDay& rhs,
+           const DsLogAdmin::IntervalsOfDay& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::IntervalsOfDay& rhs,
+           const DsLogAdmin::IntervalsOfDay& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::QoSList& rhs,
+           const DsLogAdmin::QoSList& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::QoSList& rhs,
+           const DsLogAdmin::QoSList& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::Time24& rhs,
+           const DsLogAdmin::Time24& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::Time24& rhs,
+           const DsLogAdmin::Time24& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::Time24Interval& rhs,
+           const DsLogAdmin::Time24Interval& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::Time24Interval& rhs,
+           const DsLogAdmin::Time24Interval& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::TimeInterval& rhs,
+           const DsLogAdmin::TimeInterval& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::TimeInterval& rhs,
+           const DsLogAdmin::TimeInterval& lhs);
+
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::WeekMaskItem& rhs,
+           const DsLogAdmin::WeekMaskItem& lhs);
+	
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::WeekMaskItem& rhs,
+           const DsLogAdmin::WeekMaskItem& lhs);
+	
+bool TAO_Log_Serv_Export
+operator==(const DsLogAdmin::WeekMask& rhs,
+           const DsLogAdmin::WeekMask& lhs);
+
+bool TAO_Log_Serv_Export
+operator!=(const DsLogAdmin::WeekMask& rhs,
+           const DsLogAdmin::WeekMask& lhs);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_TLS_LOG_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 45d006584a2..97f1a9803f1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -6,19 +6,21 @@ ACE_RCSID (Log,
            NotifyLogConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log)
 : log_ (log)
 {
-  // No-Op.
 }
 
 TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void)
 {
-  // No-Op.
 }
 
 void
-TAO_Notify_LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_LogConsumer::connect (
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+  ACE_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::PushConsumer_var objref =
@@ -137,6 +139,6 @@ TAO_Notify_LogConsumer::disconnect_push_consumer
                    CORBA::SystemException
                    ))
 {
-  // No-Op.
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index 7035fc44e3a..c464e91f8d4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -27,13 +27,15 @@
 #include "orbsvcs/DsNotifyLogAdminS.h"
 #include "orbsvcs/Log/Log_i.h"
 
-#include "notifylog_serv_export.h"
+#include "orbsvcs/Log/notifylog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_NotifyLog_i;
 class TAO_NotifyLogFactory_i;
@@ -105,6 +107,8 @@ protected:
   TAO_NotifyLog_i *log_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index a0156b4153b..32af058cd1c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -7,9 +7,10 @@ ACE_RCSID (Log,
            NotifyLogFactory_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
 {
-  // No-Op.
 }
 
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
@@ -457,3 +458,5 @@ TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 {
   consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index 6d75d41f3bc..bbe8127c077 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -26,13 +26,15 @@
 
 #include "orbsvcs/DsLogAdminS.h"
 #include "orbsvcs/Log/LogMgr_i.h"
-#include "NotifyLog_i.h"
+#include "orbsvcs/Log/NotifyLog_i.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_NotifyLog_i;
 class TAO_NotifyLogNotification;
 
@@ -269,6 +271,8 @@ protected:
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 53434e73a9b..1a3762a4d51 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -7,8 +7,13 @@ ACE_RCSID (Log,
            NotifyLogNotification,
            "$Id$")
 
-TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec)
-: TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_NotifyLogNotification::TAO_NotifyLogNotification (
+  CosNotifyChannelAdmin::EventChannel_ptr ec)
+  : TAO_LogNotification (),
+    event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   
@@ -79,3 +84,5 @@ TAO_NotifyLogNotification::disconnect_push_supplier
 
   this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index ce9c7dcfc7e..00e86066473 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,10 +8,7 @@
  *
  *  Methods to enable log-generated events.
  *
- *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
- *
- *
  */
 //=============================================================================
 
@@ -30,13 +27,15 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
-#include "notifylog_serv_export.h"
+#include "orbsvcs/Log/notifylog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_NotifyLogNotification
  *
@@ -99,6 +98,8 @@ private:
   CosNotifyChannelAdmin::EventChannel_var event_channel_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index a515cac8e58..f89d8acf1c0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (Log,
 #define CA_FILTER "threshold > 10"
 #define TCL_GRAMMAR "TCL"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
 				  PortableServer::POA_ptr poa,
                                   TAO_LogMgr_i &logmgr_i,
@@ -187,13 +189,12 @@ TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_UNUSED_ARG (filter);
-
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 
   //TODO: need to add impl
@@ -324,30 +325,25 @@ TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  ACE_UNUSED_ARG (qos);
-
   ACE_THROW (CORBA::NO_IMPLEMENT ());
   //TODO: need to add later
 }
 
 void
-TAO_NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS,
-      CORBA::SystemException
-    ))
+TAO_NotifyLog_i::validate_qos (
+    const CosNotification::QoSProperties& /* required_qos */,
+    CosNotification::NamedPropertyRangeSeq_out /* available_qos */
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CosNotification::UnsupportedQoS,
+                   CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (required_qos);
-
-  ACE_UNUSED_ARG (available_qos);
-
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 
   //TODO: need to add later
@@ -372,3 +368,5 @@ TAO_NotifyLog_i::for_suppliers (
 {
   return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index e75de7ef71e..ff1c8bb70f3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -29,13 +29,15 @@
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/Log/NotifyLogConsumer.h"
 
-#include "notifylog_serv_export.h"
+#include "orbsvcs/Log/notifylog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_NotifyLog_i;
 class TAO_NotifyLogFactory_i;
@@ -233,6 +235,8 @@ private:
   PortableServer::POA_var	poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index 857d07740f2..cd4de8a0606 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -1,4 +1,4 @@
-#include "PersistStore.h"
+#include "orbsvcs/Log/PersistStore.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_time.h"
@@ -11,6 +11,8 @@ ACE_RCSID (Log,
            PersistStore,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size,
                                     CORBA::ULong max_rec_list_len)
   : maxid_ (0),
@@ -19,12 +21,10 @@ TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size,
     num_records_ (0),
     max_rec_list_len_ (max_rec_list_len)
 {
-  // No-Op.
 }
 
 TAO_PersistStore::~TAO_PersistStore (void)
 {
-  // No-Op.
 }
 
 int
@@ -225,3 +225,5 @@ TAO_PersistStore::get_percentage_full (void)
 
   return static_cast<unsigned short> ((100U * this->current_size_ / this->max_size_));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index ef769afb0df..4b6a7e0fcc3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -26,10 +26,12 @@
 
 #include "orbsvcs/DsLogAdminC.h"
 #include "ace/Mutex.h"
-#include "log_serv_export.h"
+#include "orbsvcs/Log/log_serv_export.h"
 
 #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct PersistentData
 {
   DsLogAdmin::RecordId id;
@@ -120,5 +122,7 @@ class TAO_Log_Serv_Export TAO_PersistStore
   ACE_Mutex write_lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_PERSIST_STORE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 018bc2388e4..08a2cfd036e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -17,16 +17,15 @@ ACE_RCSID (Log,
            RTEventLogConsumer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log)
-: log_ (log)
+  : log_ (log)
 {
-  // No-Op.
 }
 
 TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void)
 {
-  // No-Op.
 }
 
 void
@@ -62,6 +61,8 @@ void
 TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (
+    ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 3e8f5ab382f..05fdb9d65f4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -9,7 +9,6 @@
  *  The RTEventLogConsumer connects to the RTEventLog and logs the events
  *  that are pushed to the RTEventLog.
  *
- *
  *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
@@ -31,13 +30,16 @@
 #include "orbsvcs/Event/EC_Factory.h"
 #include "orbsvcs/Event/EC_Defaults.h"
 
-#include "rteventlog_export.h"
+#include "orbsvcs/Log/rteventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_RTEventLog_i;
 class TAO_RTEventLogFactory_i;
@@ -51,7 +53,7 @@ class TAO_RTEventLogFactory_i;
  * Log when events are 'pushed' to the RTEventLog which is an
  * EventChannel.
  */
-class TAO_RTEventLog_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer
+class TAO_RTEventLog_Serv_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer
 {
 public:
   // = Initialization and Termination methods.
@@ -83,6 +85,7 @@ private:
   TAO_RTEventLog_i *log_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index fe2ef5b3dfb..eb4a1c91e2b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -21,14 +21,15 @@ ACE_RCSID (Log,
            RTEventLogFactory_i,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void)
 {
-  // No-Op.
 }
 
 TAO_RTEventLogFactory_i::~TAO_RTEventLogFactory_i()
 {
-  // No-Op.
 }
 
 int
@@ -236,3 +237,5 @@ TAO_RTEventLogFactory_i::obtain_push_supplier (
 {
   return consumer_admin_->obtain_push_supplier();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index ac5fd564578..d416bd028ec 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -8,7 +8,6 @@
  *
  *  Implements the Factory for NotifyLog Objects.
  *
- *
  *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
@@ -29,14 +28,16 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecSchedulerS.h"
 
-#include "RTEventLog_i.h"
-#include "rteventlog_export.h"
+#include "orbsvcs/Log/RTEventLog_i.h"
+#include "orbsvcs/Log/rteventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTEventLog_i;
 class TAO_RTEventLogNotification;
 
@@ -45,7 +46,7 @@ class TAO_RTEventLogNotification;
  *
  * @brief The TAO_RTEventLogFactory is a factory that is used to create RTEventLogs which are event-aware.
  */
-class TAO_RTEventLog_Export TAO_RTEventLogFactory_i :
+class TAO_RTEventLog_Serv_Export TAO_RTEventLogFactory_i :
   public POA_RTEventLogAdmin::EventLogFactory,
   public TAO_LogMgr_i
 {
@@ -130,6 +131,8 @@ protected:
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 27bae02833b..d3ceeb987e8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -22,9 +22,12 @@ ACE_RCSID (Log,
            RTEventLogNotification,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTEventLogNotification::TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr ec)
-: TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
+TAO_RTEventLogNotification::TAO_RTEventLogNotification (
+  RtecEventChannelAdmin::EventChannel_ptr ec)
+  : TAO_LogNotification (),
+    event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -84,4 +87,4 @@ TAO_RTEventLogNotification::send_notification (const CORBA::Any& any)
   consumer_->push(event);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index 5ba126799b0..785efe87c79 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,10 +8,7 @@
  *
  *  Methods to enable log-generated events.
  *
- *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
- *
- *
  */
 //=============================================================================
 
@@ -33,19 +30,21 @@
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 
-#include "rteventlog_export.h"
+#include "orbsvcs/Log/rteventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RTEventLogNotification
  *
  * @brief Used to forward log generated events to a logging server.
  */
-class TAO_RTEventLog_Export TAO_RTEventLogNotification :
+class TAO_RTEventLog_Serv_Export TAO_RTEventLogNotification :
   public TAO_LogNotification,
   public POA_RtecEventComm::PushSupplier
 {
@@ -84,6 +83,8 @@ private:
   RtecEventChannelAdmin::ProxyPushConsumer_var consumer_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 2e1ecb377a2..d4ef5923221 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -17,6 +17,7 @@ ACE_RCSID (Log,
            RTEventLog_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
 				    PortableServer::POA_ptr poa,
@@ -144,7 +145,8 @@ TAO_RTEventLog_i::append_observer (
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer
+                                                    ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -158,3 +160,5 @@ TAO_RTEventLog_i::remove_observer (
 {
   this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index c52cadac6ca..7573fe87887 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -31,13 +31,15 @@
 #include "orbsvcs/Event/EC_Defaults.h"
 #include "orbsvcs/Log/RTEventLogConsumer.h"
 
-#include "rteventlog_export.h"
+#include "orbsvcs/Log/rteventlog_serv_export.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LogMgr_i;
 class TAO_RTEventLog_i;
 class TAO_RTEventLogFactory_i;
@@ -50,7 +52,7 @@ class TAO_RTEventLogFactory_i;
  * It is used to log events that pass through the EventChannel.
  * The class supports the @c destroy> method to destroy the Log.
  */
-class TAO_RTEventLog_Export TAO_RTEventLog_i :
+class TAO_RTEventLog_Serv_Export TAO_RTEventLog_i :
   public TAO_Log_i,
   public POA_RTEventLogAdmin::EventLog
 {
@@ -127,6 +129,8 @@ public:
   PortableServer::POA_var	poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index ea296af397a..00b53838722 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -6,9 +6,9 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
-includedir = @includedir@/orbsvcs/orbsvcs
+includedir = @includedir@/orbsvcs
 pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)/..
@@ -48,10 +48,13 @@ CLEANFILES = \
 CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl CosNamingS_T.cpp CosNamingS_T.h CosNamingS_T.inl: CosNaming-stamp
 
 CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
 	@touch $@
 
 
+nobase_include_HEADERS = \
+  CosNaming.idl
+
 ## Makefile.CosNaming.am
 
 lib_LTLIBRARIES = libTAO_CosNaming.la
@@ -77,7 +80,7 @@ libTAO_CosNaming_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS = \
+nobase_include_HEADERS += \
   CosNamingC.h \
   CosNamingC.inl \
   Naming/Naming_Client.h \
@@ -97,7 +100,7 @@ EXTRA_DIST = \
   TAO_CosNaming.pc.in
 
 
-## Makefile.CosProperty.am
+## Makefile.CosProperty_IDL.am
 
 BUILT_SOURCES += \
   CosPropertyC.cpp \
@@ -125,7 +128,7 @@ CLEANFILES += \
 CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp
 
 CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosProperty.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -154,9 +157,16 @@ CLEANFILES += \
 CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp
 
 CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl
 	@touch $@
 
+
+nobase_include_HEADERS += \
+  CosProperty.idl \
+  CosPropertyService.idl
+
+## Makefile.CosProperty.am
+
 lib_LTLIBRARIES += libTAO_CosProperty.la
 
 libTAO_CosProperty_la_CPPFLAGS = \
@@ -170,56 +180,137 @@ libTAO_CosProperty_la_CPPFLAGS = \
 
 libTAO_CosProperty_la_SOURCES = \
   CosPropertyC.cpp \
-  CosPropertyS.cpp \
-  CosPropertyServiceC.cpp \
-  CosPropertyServiceS.cpp \
-  Property/CosPropertyService_i.cpp
+  CosPropertyServiceC.cpp
 
 libTAO_CosProperty_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosProperty_la_LIBADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  CosProperty.idl \
   CosPropertyC.h \
   CosPropertyC.inl \
+  CosPropertyServiceC.h \
+  CosPropertyServiceC.inl \
+  Property/property_export.h
+
+pkgconfig_DATA += \
+  TAO_CosProperty.pc
+
+CLEANFILES += \
+  TAO_CosProperty.pc
+
+TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in
+
+EXTRA_DIST += \
+  TAO_CosProperty.pc.in
+
+
+## Makefile.CosProperty_Skel.am
+
+lib_LTLIBRARIES += libTAO_CosProperty_Skel.la
+
+libTAO_CosProperty_Skel_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_PROPERTY_SKEL_BUILD_DLL
+
+libTAO_CosProperty_Skel_la_SOURCES = \
+  CosPropertyS.cpp \
+  CosPropertyServiceS.cpp
+
+libTAO_CosProperty_Skel_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CosProperty_Skel_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
   CosPropertyS.h \
   CosPropertyS.inl \
   CosPropertyS_T.cpp \
   CosPropertyS_T.h \
   CosPropertyS_T.inl \
-  CosPropertyService.idl \
-  CosPropertyServiceC.h \
-  CosPropertyServiceC.inl \
   CosPropertyServiceS.h \
   CosPropertyServiceS.inl \
   CosPropertyServiceS_T.cpp \
   CosPropertyServiceS_T.h \
   CosPropertyServiceS_T.inl \
+  Property/property_skel_export.h
+
+pkgconfig_DATA += \
+  TAO_CosProperty_Skel.pc
+
+CLEANFILES += \
+  TAO_CosProperty_Skel.pc
+
+TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in
+
+EXTRA_DIST += \
+  TAO_CosProperty_Skel.pc.in
+
+
+## Makefile.CosProperty_Serv.am
+
+lib_LTLIBRARIES += libTAO_CosProperty_Serv.la
+
+libTAO_CosProperty_Serv_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_PROPERTY_SERV_BUILD_DLL
+
+libTAO_CosProperty_Serv_la_SOURCES = \
+  Property/CosPropertyService_i.cpp
+
+libTAO_CosProperty_Serv_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CosProperty_Serv_la_LIBADD = \
+  libTAO_CosProperty_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
   Property/CosPropertyService_i.h \
-  Property/property_export.h
+  Property/property_serv_export.h
 
 pkgconfig_DATA += \
-  TAO_CosProperty.pc
+  TAO_CosProperty_Serv.pc
 
 CLEANFILES += \
-  TAO_CosProperty.pc
+  TAO_CosProperty_Serv.pc
 
-TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in
+TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in
 
 EXTRA_DIST += \
-  CosProperty.rc \
-  TAO_CosProperty.pc.in
+  TAO_CosProperty_Serv.pc.in
 
 
 ## Makefile.AV.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES += \
   AVStreamsC.cpp \
   AVStreamsC.h \
@@ -244,7 +335,7 @@ CLEANFILES += \
 AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl AVStreamsS_T.cpp AVStreamsS_T.inl: AVStreams-stamp
 
 AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -271,7 +362,7 @@ CLEANFILES += \
 Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl Null_MediaCtrlS_T.cpp Null_MediaCtrlS_T.inl: Null_MediaCtrl-stamp
 
 Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -298,7 +389,7 @@ CLEANFILES += \
 sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-stamp
 
 sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_AV.la
@@ -346,8 +437,10 @@ libTAO_AV_la_LDFLAGS = \
 
 libTAO_AV_la_LIBADD = \
   libTAO_CosNaming.la \
-  libTAO_CosProperty.la \
+  libTAO_CosProperty_Serv.la \
+  libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -411,11 +504,13 @@ nobase_include_HEADERS += \
   sfpS_T.inl \
   sfpS_T.inl
 
+endif !BUILD_ACE_FOR_TAO
+
 EXTRA_DIST += \
   AV.rc
 
 
-## Makefile.CosConcurrency.am
+## Makefile.CosConcurrency_IDL.am
 
 BUILT_SOURCES += \
   CosConcurrencyControlC.cpp \
@@ -443,9 +538,15 @@ CLEANFILES += \
 CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp
 
 CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl
 	@touch $@
 
+
+nobase_include_HEADERS += \
+  CosConcurrencyControl.idl
+
+## Makefile.CosConcurrency.am
+
 lib_LTLIBRARIES += libTAO_CosConcurrency.la
 
 libTAO_CosConcurrency_la_CPPFLAGS = \
@@ -458,19 +559,105 @@ libTAO_CosConcurrency_la_CPPFLAGS = \
   -DTAO_CONCURRENCY_BUILD_DLL
 
 libTAO_CosConcurrency_la_SOURCES = \
+  CosConcurrencyControlC.cpp
+
+libTAO_CosConcurrency_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CosConcurrency_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  Concurrency/concurrency_export.h \
+  CosConcurrencyControlC.h \
+  CosConcurrencyControlC.inl
+
+pkgconfig_DATA += \
+  TAO_CosConcurrency.pc
+
+CLEANFILES += \
+  TAO_CosConcurrency.pc
+
+TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in
+
+EXTRA_DIST += \
+  TAO_CosConcurrency.pc.in
+
+
+## Makefile.CosConcurrency_Skel.am
+
+lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la
+
+libTAO_CosConcurrency_Skel_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_CONCURRENCY_SKEL_BUILD_DLL
+
+libTAO_CosConcurrency_Skel_la_SOURCES = \
+  CosConcurrencyControlS.cpp
+
+libTAO_CosConcurrency_Skel_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CosConcurrency_Skel_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosConcurrency.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  Concurrency/concurrency_skel_export.h \
+  CosConcurrencyControlS.h \
+  CosConcurrencyControlS.inl
+
+pkgconfig_DATA += \
+  TAO_CosConcurrency_Skel.pc
+
+CLEANFILES += \
+  TAO_CosConcurrency_Skel.pc
+
+TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in
+
+EXTRA_DIST += \
+  TAO_CosConcurrency_Skel.pc.in
+
+
+## Makefile.CosConcurrency_Serv.am
+
+lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la
+
+libTAO_CosConcurrency_Serv_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_CONCURRENCY_SERV_BUILD_DLL
+
+libTAO_CosConcurrency_Serv_la_SOURCES = \
   Concurrency/CC_Lock.cpp \
   Concurrency/CC_LockSet.cpp \
   Concurrency/CC_LockSetFactory.cpp \
   Concurrency/Concurrency_Loader.cpp \
-  Concurrency/Concurrency_Utils.cpp \
-  CosConcurrencyControlC.cpp \
-  CosConcurrencyControlS.cpp
+  Concurrency/Concurrency_Utils.cpp
 
-libTAO_CosConcurrency_la_LDFLAGS = \
+libTAO_CosConcurrency_Serv_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosConcurrency_la_LIBADD = \
+libTAO_CosConcurrency_Serv_la_LIBADD = \
+  libTAO_CosConcurrency_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosConcurrency.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -481,27 +668,19 @@ nobase_include_HEADERS += \
   Concurrency/CC_LockSetFactory.h \
   Concurrency/Concurrency_Loader.h \
   Concurrency/Concurrency_Utils.h \
-  CosConcurrencyControl.idl \
-  CosConcurrencyControlC.h \
-  CosConcurrencyControlC.inl \
-  CosConcurrencyControlS.h \
-  CosConcurrencyControlS_T.cpp \
-  CosConcurrencyControlS_T.h \
-  CosConcurrencyControlS_T.inl \
-  CosConcurrencyControlS_T.inl
+  Concurrency/concurrency_serv_export.h
 
 pkgconfig_DATA += \
-  TAO_CosConcurrency.pc
+  TAO_CosConcurrency_Serv.pc
 
 CLEANFILES += \
-  TAO_CosConcurrency.pc
+  TAO_CosConcurrency_Serv.pc
 
-TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in
+TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in
 
 EXTRA_DIST += \
-  CosConcurrency.rc \
-  TAO_CosConcurrency.pc.in
+  TAO_CosConcurrency_Serv.pc.in
 
 
 ## Makefile.CosEvent_IDL.am
@@ -592,7 +771,7 @@ CLEANFILES += \
 CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h CosEventCommS_T.inl: CosEventComm-stamp
 
 CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -621,10 +800,16 @@ CLEANFILES += \
 CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h CosEventChannelAdminS_T.inl: CosEventChannelAdmin-stamp
 
 CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  CosEventChannelAdmin.idl \
+  CosEventComm.idl \
+  CosTypedEventChannelAdmin.idl \
+  CosTypedEventComm.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosEvent.am
@@ -710,7 +895,7 @@ CLEANFILES += \
 TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBaseS_T.cpp TimeBaseS_T.inl: TimeBase-stamp
 
 TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -737,7 +922,7 @@ CLEANFILES += \
 RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBaseS_T.cpp RtecBaseS_T.inl: RtecBase-stamp
 
 RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_Svc_Utils.la
@@ -942,6 +1127,7 @@ nobase_include_HEADERS += \
   CosEvent/CEC_ConsumerControl.h \
   CosEvent/CEC_Default_Factory.h \
   CosEvent/CEC_Default_Factory.i \
+  CosEvent/CEC_Defaults.h \
   CosEvent/CEC_Dispatching.h \
   CosEvent/CEC_Dispatching_Task.h \
   CosEvent/CEC_Dispatching_Task.i \
@@ -979,7 +1165,8 @@ nobase_include_HEADERS += \
   CosEvent/CEC_TypedProxyPushConsumer.h \
   CosEvent/CEC_TypedProxyPushConsumer.i \
   CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEvent/CEC_TypedSupplierAdmin.i
+  CosEvent/CEC_TypedSupplierAdmin.i \
+  CosEvent/event_serv_export.h
 
 pkgconfig_DATA += \
   TAO_CosEvent_Serv.pc
@@ -1026,7 +1213,7 @@ CLEANFILES += \
 CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl CosLifeCycleS_T.cpp CosLifeCycleS_T.h CosLifeCycleS_T.inl: CosLifeCycle-stamp
 
 CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1055,7 +1242,7 @@ CLEANFILES += \
 LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl LifeCycleServiceS_T.cpp LifeCycleServiceS_T.h LifeCycleServiceS_T.inl: LifeCycleService-stamp
 
 LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosLifeCycle.la
@@ -1146,7 +1333,7 @@ CLEANFILES += \
 miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp
 
 miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1167,7 +1354,7 @@ CLEANFILES += \
 PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS-stamp
 
 PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1194,7 +1381,7 @@ CLEANFILES += \
 PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl PortableGroupS_T.cpp PortableGroupS_T.inl: PortableGroup-stamp
 
 PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_PortableGroup.la
@@ -1213,18 +1400,14 @@ libTAO_PortableGroup_la_SOURCES = \
   PortableGroup/MIOP.cpp \
   PortableGroup/PG_Default_Property_Validator.cpp \
   PortableGroup/PG_FactoryRegistry.cpp \
-  PortableGroup/PG_Factory_Map.cpp \
-  PortableGroup/PG_Factory_Set.cpp \
   PortableGroup/PG_GenericFactory.cpp \
   PortableGroup/PG_Group_Factory.cpp \
   PortableGroup/PG_Group_Guard.cpp \
   PortableGroup/PG_Location_Equal_To.cpp \
   PortableGroup/PG_Location_Hash.cpp \
-  PortableGroup/PG_Location_Map.cpp \
   PortableGroup/PG_MemberInfo.cpp \
   PortableGroup/PG_Null_Property_Validator.cpp \
   PortableGroup/PG_ObjectGroupManager.cpp \
-  PortableGroup/PG_ObjectGroup_Map.cpp \
   PortableGroup/PG_Object_Adapter_Factory.cpp \
   PortableGroup/PG_Object_Group.cpp \
   PortableGroup/PG_Object_Group_Manipulator.cpp \
@@ -1277,8 +1460,6 @@ nobase_include_HEADERS += \
   PortableGroup/MIOP.h \
   PortableGroup/PG_Default_Property_Validator.h \
   PortableGroup/PG_FactoryRegistry.h \
-  PortableGroup/PG_Factory_Map.h \
-  PortableGroup/PG_Factory_Set.h \
   PortableGroup/PG_GenericFactory.h \
   PortableGroup/PG_Group_Factory.h \
   PortableGroup/PG_Group_Guard.h \
@@ -1286,11 +1467,9 @@ nobase_include_HEADERS += \
   PortableGroup/PG_Location_Equal_To.inl \
   PortableGroup/PG_Location_Hash.h \
   PortableGroup/PG_Location_Hash.inl \
-  PortableGroup/PG_Location_Map.h \
   PortableGroup/PG_MemberInfo.h \
   PortableGroup/PG_Null_Property_Validator.h \
   PortableGroup/PG_ObjectGroupManager.h \
-  PortableGroup/PG_ObjectGroup_Map.h \
   PortableGroup/PG_Object_Adapter_Factory.h \
   PortableGroup/PG_Object_Group.h \
   PortableGroup/PG_Object_Group_Manipulator.h \
@@ -1385,7 +1564,7 @@ CLEANFILES += \
 CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl CosLoadBalancingS_T.cpp CosLoadBalancingS_T.h CosLoadBalancingS_T.inl: CosLoadBalancing-stamp
 
 CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1410,7 +1589,7 @@ CLEANFILES += \
 LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.inl: LB_ORT-stamp
 
 LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosLoadBalancing.la
@@ -1438,16 +1617,11 @@ libTAO_CosLoadBalancing_la_SOURCES = \
   LoadBalancing/LB_LeastLoaded.cpp \
   LoadBalancing/LB_LoadAlert.cpp \
   LoadBalancing/LB_LoadAlertInfo.cpp \
-  LoadBalancing/LB_LoadAlertMap.cpp \
   LoadBalancing/LB_LoadAlert_Handler.cpp \
   LoadBalancing/LB_LoadAverage.cpp \
-  LoadBalancing/LB_LoadListMap.cpp \
   LoadBalancing/LB_LoadManager.cpp \
-  LoadBalancing/LB_LoadMap.cpp \
   LoadBalancing/LB_LoadMinimum.cpp \
-  LoadBalancing/LB_Location_Index_Map.cpp \
   LoadBalancing/LB_MemberLocator.cpp \
-  LoadBalancing/LB_MonitorMap.cpp \
   LoadBalancing/LB_ORBInitializer.cpp \
   LoadBalancing/LB_ObjectReferenceFactory.cpp \
   LoadBalancing/LB_Pull_Handler.cpp \
@@ -1501,18 +1675,13 @@ nobase_include_HEADERS += \
   LoadBalancing/LB_LoadAlert.h \
   LoadBalancing/LB_LoadAlert.inl \
   LoadBalancing/LB_LoadAlertInfo.h \
-  LoadBalancing/LB_LoadAlertMap.h \
   LoadBalancing/LB_LoadAlert_Handler.h \
   LoadBalancing/LB_LoadAverage.h \
   LoadBalancing/LB_LoadAverage.inl \
-  LoadBalancing/LB_LoadListMap.h \
   LoadBalancing/LB_LoadManager.h \
-  LoadBalancing/LB_LoadMap.h \
   LoadBalancing/LB_LoadMinimum.h \
   LoadBalancing/LB_LoadMinimum.inl \
-  LoadBalancing/LB_Location_Index_Map.h \
   LoadBalancing/LB_MemberLocator.h \
-  LoadBalancing/LB_MonitorMap.h \
   LoadBalancing/LB_ORBInitializer.h \
   LoadBalancing/LB_ObjectReferenceFactory.h \
   LoadBalancing/LB_Pull_Handler.h \
@@ -1588,7 +1757,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosNaming_Serv.am
 
-if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_CosNaming_Serv.la
 
@@ -1660,7 +1829,7 @@ CLEANFILES += \
 TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in
 
-endif BUILD_CORBA_MESSAGING
+endif !BUILD_ACE_FOR_TAO
 
 EXTRA_DIST += \
   CosNaming_Serv.rc \
@@ -1697,7 +1866,7 @@ CLEANFILES += \
 CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl CosNotificationS_T.cpp CosNotificationS_T.h CosNotificationS_T.inl: CosNotification-stamp
 
 CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1726,7 +1895,7 @@ CLEANFILES += \
 CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl CosNotifyCommS_T.cpp CosNotifyCommS_T.h CosNotifyCommS_T.inl: CosNotifyComm-stamp
 
 CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1755,7 +1924,7 @@ CLEANFILES += \
 CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl CosNotifyFilterS_T.cpp CosNotifyFilterS_T.h CosNotifyFilterS_T.inl: CosNotifyFilter-stamp
 
 CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1784,7 +1953,7 @@ CLEANFILES += \
 CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminS_T.h CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin-stamp
 
 CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1813,7 +1982,7 @@ CLEANFILES += \
 NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl NotifyExtS_T.cpp NotifyExtS_T.h NotifyExtS_T.inl: NotifyExt-stamp
 
 NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1842,10 +2011,18 @@ CLEANFILES += \
 Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl Event_ForwarderS_T.cpp Event_ForwarderS_T.h Event_ForwarderS_T.inl: Event_Forwarder-stamp
 
 Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  CosNotification.idl \
+  CosNotifyChannelAdmin.idl \
+  CosNotifyComm.idl \
+  CosNotifyFilter.idl \
+  Event_Forwarder.idl \
+  NotifyExt.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosNotification.am
@@ -1943,7 +2120,6 @@ libTAO_ETCL_la_LIBADD = \
 
 nobase_include_HEADERS += \
   ETCL/ETCL_Constraint.h \
-  ETCL/ETCL_Constraint.i \
   ETCL/ETCL_Constraint.inl \
   ETCL/ETCL_Constraint_Visitor.h \
   ETCL/ETCL_Interpreter.h \
@@ -2271,7 +2447,8 @@ nobase_include_HEADERS += \
   Notify/Topology_Object.h \
   Notify/Topology_Object.inl \
   Notify/Topology_Saver.h \
-  Notify/Worker_Task.h
+  Notify/Worker_Task.h \
+  Notify/notify_serv_export.h
 
 pkgconfig_DATA += \
   TAO_CosNotification_Serv.pc
@@ -2292,6 +2469,7 @@ EXTRA_DIST += \
 ## Makefile.CosNotification_Persist.am
 
 if BUILD_ACEXML
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification_Persist.la
@@ -2334,9 +2512,11 @@ libTAO_CosNotification_Persist_la_LIBADD = \
 nobase_include_HEADERS += \
   Notify/XML_Loader.h \
   Notify/XML_Saver.h \
-  Notify/XML_Topology_Factory.h
+  Notify/XML_Topology_Factory.h \
+  Notify/notify_persist_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
 ## Makefile.CosTime.am
@@ -2347,9 +2527,7 @@ BUILT_SOURCES += \
   TimeServiceC.inl \
   TimeServiceS.cpp \
   TimeServiceS.h \
-  TimeServiceS.inl \
   TimeServiceS_T.cpp \
-  TimeServiceS_T.h \
   TimeServiceS_T.inl
 
 CLEANFILES += \
@@ -2359,15 +2537,13 @@ CLEANFILES += \
   TimeServiceC.inl \
   TimeServiceS.cpp \
   TimeServiceS.h \
-  TimeServiceS.inl \
   TimeServiceS_T.cpp \
-  TimeServiceS_T.h \
   TimeServiceS_T.inl
 
-TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp TimeServiceS_T.h TimeServiceS_T.inl: TimeService-stamp
+TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS_T.cpp TimeServiceS_T.inl: TimeService-stamp
 
 TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosTime.la
@@ -2406,13 +2582,12 @@ nobase_include_HEADERS += \
   Time/TAO_Time_Service_Server.h \
   Time/TAO_UTO.h \
   Time/Timer_Helper.h \
+  Time/time_export.h \
   TimeService.idl \
   TimeServiceC.h \
   TimeServiceC.inl \
   TimeServiceS.h \
   TimeServiceS_T.cpp \
-  TimeServiceS_T.h \
-  TimeServiceS_T.inl \
   TimeServiceS_T.inl
 
 pkgconfig_DATA += \
@@ -2457,7 +2632,7 @@ CLEANFILES += \
 CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl CosTradingS_T.cpp CosTradingS_T.h CosTradingS_T.inl: CosTrading-stamp
 
 CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2486,7 +2661,7 @@ CLEANFILES += \
 CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl CosTradingReposS_T.cpp CosTradingReposS_T.h CosTradingReposS_T.inl: CosTradingRepos-stamp
 
 CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2515,10 +2690,15 @@ CLEANFILES += \
 CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl CosTradingDynamicS_T.cpp CosTradingDynamicS_T.h CosTradingDynamicS_T.inl: CosTradingDynamic-stamp
 
 CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  CosTrading.idl \
+  CosTradingDynamic.idl \
+  CosTradingRepos.idl
+
 ## Makefile.CosTrading.am
 
 lib_LTLIBRARIES += libTAO_CosTrading.la
@@ -2662,6 +2842,7 @@ libTAO_CosTrading_Serv_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_CosTrading_Serv_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -2690,7 +2871,8 @@ nobase_include_HEADERS += \
   Trader/Trader_Interfaces.h \
   Trader/Trader_T.cpp \
   Trader/Trader_Utils.h \
-  Trader/Trading_Loader.h
+  Trader/Trading_Loader.h \
+  Trader/trading_serv_export.h
 
 pkgconfig_DATA += \
   TAO_CosTrading_Serv.pc
@@ -2734,7 +2916,7 @@ CLEANFILES += \
 DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl DsLogAdminS_T.cpp DsLogAdminS_T.h DsLogAdminS_T.inl: DsLogAdmin-stamp
 
 DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2763,10 +2945,14 @@ CLEANFILES += \
 DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl DsLogNotificationS_T.cpp DsLogNotificationS_T.h DsLogNotificationS_T.inl: DsLogNotification-stamp
 
 DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  DsLogAdmin.idl \
+  DsLogNotification.idl
+
 ## Makefile.DsLogAdmin.am
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin.la
@@ -2843,10 +3029,13 @@ CLEANFILES += \
 DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl DsEventLogAdminS_T.cpp DsEventLogAdminS_T.h DsEventLogAdminS_T.inl: DsEventLogAdmin-stamp
 
 DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  DsEventLogAdmin.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsEventLogAdmin.am
@@ -3194,10 +3383,13 @@ CLEANFILES += \
 DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.cpp DsNotifyLogAdminS_T.h DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin-stamp
 
 DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
 	@touch $@
 
 
+nobase_include_HEADERS += \
+  DsNotifyLogAdmin.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsNotifyLogAdmin.am
@@ -3382,6 +3574,57 @@ EXTRA_DIST += \
   TAO_DsNotifyLogAdmin_Serv.pc.in
 
 
+## Makefile.ESF.am
+
+
+nobase_include_HEADERS += \
+  ESF/ESF_Busy_Lock.cpp \
+  ESF/ESF_Busy_Lock.h \
+  ESF/ESF_Busy_Lock.i \
+  ESF/ESF_Copy_On_Read.cpp \
+  ESF/ESF_Copy_On_Read.h \
+  ESF/ESF_Copy_On_Write.cpp \
+  ESF/ESF_Copy_On_Write.h \
+  ESF/ESF_Copy_On_Write.i \
+  ESF/ESF_Defaults.h \
+  ESF/ESF_Delayed_Changes.cpp \
+  ESF/ESF_Delayed_Changes.h \
+  ESF/ESF_Delayed_Changes.i \
+  ESF/ESF_Delayed_Command.cpp \
+  ESF/ESF_Delayed_Command.h \
+  ESF/ESF_Delayed_Command.i \
+  ESF/ESF_Immediate_Changes.cpp \
+  ESF/ESF_Immediate_Changes.h \
+  ESF/ESF_Immediate_Changes.i \
+  ESF/ESF_Peer_Admin.cpp \
+  ESF/ESF_Peer_Admin.h \
+  ESF/ESF_Peer_Workers.cpp \
+  ESF/ESF_Peer_Workers.h \
+  ESF/ESF_Peer_Workers.i \
+  ESF/ESF_Proxy_Admin.cpp \
+  ESF/ESF_Proxy_Admin.h \
+  ESF/ESF_Proxy_Admin.i \
+  ESF/ESF_Proxy_Collection.cpp \
+  ESF/ESF_Proxy_Collection.h \
+  ESF/ESF_Proxy_List.cpp \
+  ESF/ESF_Proxy_List.h \
+  ESF/ESF_Proxy_List.i \
+  ESF/ESF_Proxy_RB_Tree.cpp \
+  ESF/ESF_Proxy_RB_Tree.h \
+  ESF/ESF_Proxy_RB_Tree.i \
+  ESF/ESF_Proxy_RefCount_Guard.cpp \
+  ESF/ESF_Proxy_RefCount_Guard.h \
+  ESF/ESF_Proxy_RefCount_Guard.i \
+  ESF/ESF_RefCount_Guard.cpp \
+  ESF/ESF_RefCount_Guard.h \
+  ESF/ESF_RefCount_Guard.i \
+  ESF/ESF_Shutdown_Proxy.cpp \
+  ESF/ESF_Shutdown_Proxy.h \
+  ESF/ESF_Shutdown_Proxy.i \
+  ESF/ESF_Worker.cpp \
+  ESF/ESF_Worker.h \
+  ESF/esf_export.h
+
 ## Makefile.FTORB_Utils.am
 
 if BUILD_CORBA_MESSAGING
@@ -3413,7 +3656,7 @@ CLEANFILES += \
 FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.cpp FT_CORBA_ORBS_T.h FT_CORBA_ORBS_T.inl: FT_CORBA_ORB-stamp
 
 FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FTORB_Utils.la
@@ -3458,7 +3701,7 @@ nobase_include_HEADERS += \
   FT_CORBA_ORBS_T.inl \
   FT_CORBA_ORBS_T.inl \
   FaultTolerance/FT_IOGR_Property.h \
-  FaultTolerance/FT_IOGR_Property.i \
+  FaultTolerance/FT_IOGR_Property.inl \
   FaultTolerance/FT_ORB_Utils_export.h
 
 pkgconfig_DATA += \
@@ -3535,7 +3778,7 @@ CLEANFILES += \
 RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp
 
 RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3554,7 +3797,7 @@ CLEANFILES += \
 RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp
 
 RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3573,7 +3816,7 @@ CLEANFILES += \
 RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp
 
 RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3592,7 +3835,7 @@ CLEANFILES += \
 RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp
 
 RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_RTEvent.la
@@ -3641,8 +3884,18 @@ nobase_include_HEADERS += \
   RtecUDPAdminC.h \
   RtecUDPAdminC.inl
 
+pkgconfig_DATA += \
+  TAO_RTEvent.pc
+
+CLEANFILES += \
+  TAO_RTEvent.pc
+
+TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in
+
 EXTRA_DIST += \
-  RTEvent.rc
+  RTEvent.rc \
+  TAO_RTEvent.pc.in
 
 
 ## Makefile.RTEvent_Skel.am
@@ -3692,15 +3945,26 @@ nobase_include_HEADERS += \
   RtecUDPAdminS.h \
   RtecUDPAdminS.inl
 
+pkgconfig_DATA += \
+  TAO_RTEvent_Skel.pc
+
+CLEANFILES += \
+  TAO_RTEvent_Skel.pc
+
+TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in
+
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
-  RTEvent_Skel.rc
+  RTEvent_Skel.rc \
+  TAO_RTEvent_Skel.pc.in
 
 
 ## Makefile.RTEvent_Serv.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTEvent_Serv.la
 
@@ -3715,7 +3979,6 @@ libTAO_RTEvent_Serv_la_CPPFLAGS = \
 
 libTAO_RTEvent_Serv_la_SOURCES = \
   Event/ECG_Adapters.cpp \
-  Event/ECG_Address_Server_Base.cpp \
   Event/ECG_CDR_Message_Receiver.cpp \
   Event/ECG_CDR_Message_Sender.cpp \
   Event/ECG_Complex_Address_Server.cpp \
@@ -3807,7 +4070,6 @@ nobase_include_HEADERS += \
   Channel_Clients_T.h \
   Channel_Clients_T.i \
   Event/ECG_Adapters.h \
-  Event/ECG_Address_Server_Base.h \
   Event/ECG_CDR_Message_Receiver.h \
   Event/ECG_CDR_Message_Receiver.i \
   Event/ECG_CDR_Message_Sender.h \
@@ -3916,15 +4178,27 @@ nobase_include_HEADERS += \
   Event/EC_Type_Filter.h \
   Event/EC_UDP_Admin.h
 
+pkgconfig_DATA += \
+  TAO_RTEvent_Serv.pc
+
+CLEANFILES += \
+  TAO_RTEvent_Serv.pc
+
+TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in
+
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
-  RTEvent_Serv.rc
+  RTEvent_Serv.rc \
+  TAO_RTEvent_Serv.pc.in
 
 
 ## Makefile.FtRtEvent.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -3953,7 +4227,7 @@ CLEANFILES += \
 FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FTRTS_T.inl: FTRT-stamp
 
 FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3982,7 +4256,7 @@ CLEANFILES += \
 FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl FtRtecEventCommS_T.cpp FtRtecEventCommS_T.h FtRtecEventCommS_T.inl: FtRtecEventComm-stamp
 
 FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4011,7 +4285,7 @@ CLEANFILES += \
 FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.cpp FTRT_GroupManagerS_T.h FTRT_GroupManagerS_T.inl: FTRT_GroupManager-stamp
 
 FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4040,7 +4314,7 @@ CLEANFILES += \
 FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin-stamp
 
 FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FtRtEvent.la
@@ -4133,11 +4407,13 @@ nobase_include_HEADERS += \
   FtRtecEventCommS_T.inl
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.FTRT_EventChannel.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la
@@ -4255,6 +4531,7 @@ nobase_include_HEADERS += \
   FtRtEvent/EventChannel/ftrtec_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.FT_ClientORB.am
@@ -4262,6 +4539,7 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_FT_ClientORB.la
@@ -4323,6 +4601,7 @@ TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc
 	${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -4403,6 +4682,7 @@ EXTRA_DIST += \
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -4429,7 +4709,7 @@ CLEANFILES += \
 FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBAS_T.cpp FT_CORBAS_T.inl: FT_CORBA-stamp
 
 FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4456,7 +4736,7 @@ CLEANFILES += \
 FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl FT_ReplicaS_T.cpp FT_ReplicaS_T.inl: FT_Replica-stamp
 
 FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4483,7 +4763,7 @@ CLEANFILES += \
 FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl FT_NotifierS_T.cpp FT_NotifierS_T.inl: FT_Notifier-stamp
 
 FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4510,7 +4790,7 @@ CLEANFILES += \
 FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory-stamp
 
 FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4537,7 +4817,7 @@ CLEANFILES += \
 FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.cpp FT_ReplicationManagerS_T.inl: FT_ReplicationManager-stamp
 
 FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FaultTolerance.la
@@ -4634,6 +4914,7 @@ TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultToleranc
 	${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -4645,6 +4926,8 @@ EXTRA_DIST += \
 
 ## Makefile.HTIOP.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES += \
   HTIOPC.cpp \
   HTIOPC.h \
@@ -4669,7 +4952,7 @@ CLEANFILES += \
 HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h HTIOPS.inl HTIOPS_T.cpp HTIOPS_T.h HTIOPS_T.inl: HTIOP-stamp
 
 HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_HTIOP.la
@@ -4721,6 +5004,7 @@ nobase_include_HEADERS += \
   HTIOP/HTIOP_Factory.h \
   HTIOP/HTIOP_Profile.h \
   HTIOP/HTIOP_Transport.h \
+  HTIOP/htiop_endpoints.pidl \
   HTIOP/htiop_endpointsC.h \
   HTIOPC.h \
   HTIOPC.inl \
@@ -4729,8 +5013,11 @@ nobase_include_HEADERS += \
   HTIOPS_T.h \
   HTIOPS_T.inl
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.IFRService.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_IFRService.la
@@ -4883,6 +5170,7 @@ nobase_include_HEADERS += \
   IFRService/WstringDef_i.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 EXTRA_DIST += \
   IFRService.rc
@@ -4892,6 +5180,7 @@ EXTRA_DIST += \
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTCORBAEvent.la
 
@@ -4931,9 +5220,103 @@ nobase_include_HEADERS += \
   Event/EC_RTCORBA_Dispatching.h \
   Event/EC_RTCORBA_Factory.h
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
+## Makefile.RTEventLogAdmin_IDL.am
+
+if BUILD_CORBA_MESSAGING
+
+BUILT_SOURCES += \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.cpp \
+  RTEventLogAdminS.h \
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
+
+CLEANFILES += \
+  RTEventLogAdmin-stamp \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.cpp \
+  RTEventLogAdminS.h \
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
+
+RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp
+
+RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl
+	@touch $@
+
+
+nobase_include_HEADERS += \
+  RTEventLogAdmin.idl
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RTEventLogAdmin.am
+
+if BUILD_CORBA_MESSAGING
+
+lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
+
+libTAO_RTEventLogAdmin_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_RTEVENTLOG_BUILD_DLL
+
+libTAO_RTEventLogAdmin_la_SOURCES = \
+  RTEventLogAdminC.cpp
+
+libTAO_RTEventLogAdmin_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_RTEventLogAdmin_la_LIBADD = \
+  libTAO_RTEvent.la \
+  libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  Log/rteventlog_export.h \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl
+
+pkgconfig_DATA += \
+  TAO_RTEventLogAdmin.pc
+
+CLEANFILES += \
+  TAO_RTEventLogAdmin.pc
+
+TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in
+
+endif BUILD_CORBA_MESSAGING
+
+EXTRA_DIST += \
+  TAO_RTEventLogAdmin.pc.in
+
+
 ## Makefile.RTSched.am
 
 BUILT_SOURCES += \
@@ -4962,7 +5345,7 @@ CLEANFILES += \
 RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl RtecSchedulerS_T.cpp RtecSchedulerS_T.h RtecSchedulerS_T.inl: RtecScheduler-stamp
 
 RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_RTSched.la
@@ -4983,7 +5366,6 @@ libTAO_RTSched_la_SOURCES = \
   Sched/Config_Scheduler.cpp \
   Sched/DynSched.cpp \
   Sched/Reconfig_Sched_Utils.cpp \
-  Sched/Reconfig_Scheduler.cpp \
   Sched/SchedEntry.cpp \
   Sched/Scheduler.cpp \
   Sched/Scheduler_Generic.cpp \
@@ -5017,8 +5399,6 @@ nobase_include_HEADERS += \
   Sched/DynSched.i \
   Sched/Reconfig_Sched_Utils.h \
   Sched/Reconfig_Sched_Utils_T.cpp \
-  Sched/Reconfig_Scheduler.h \
-  Sched/Reconfig_Scheduler_T.cpp \
   Sched/SchedEntry.h \
   Sched/SchedEntry.i \
   Sched/Scheduler.h \
@@ -5033,71 +5413,103 @@ EXTRA_DIST += \
   RTSched.rc
 
 
-## Makefile.RTEventLogAdmin.am
+## Makefile.RTEventLogAdmin_Skel.am
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.cpp \
+lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la
+
+libTAO_RTEventLogAdmin_Skel_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_RTEVENTLOG_SKEL_BUILD_DLL
+
+libTAO_RTEventLogAdmin_Skel_la_SOURCES = \
+  RTEventLogAdminS.cpp
+
+libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_RTEventLogAdmin_Skel_la_LIBADD = \
+  libTAO_RTEvent_Skel.la \
+  libTAO_DsLogAdmin_Skel.la \
+  libTAO_RTEventLogAdmin.la \
+  libTAO_RTEvent.la \
+  libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  Log/rteventlog_skel_export.h \
   RTEventLogAdminS.h \
   RTEventLogAdminS.inl \
   RTEventLogAdminS_T.cpp \
   RTEventLogAdminS_T.h \
   RTEventLogAdminS_T.inl
 
+pkgconfig_DATA += \
+  TAO_RTEventLogAdmin_Skel.pc
+
 CLEANFILES += \
-  RTEventLogAdmin-stamp \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.cpp \
-  RTEventLogAdminS.h \
-  RTEventLogAdminS.inl \
-  RTEventLogAdminS_T.cpp \
-  RTEventLogAdminS_T.h \
-  RTEventLogAdminS_T.inl
+  TAO_RTEventLogAdmin_Skel.pc
 
-RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp
+TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
 
-RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl
-	@touch $@
+endif BUILD_CORBA_MESSAGING
 
-lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
+EXTRA_DIST += \
+  TAO_RTEventLogAdmin_Skel.pc.in
 
-libTAO_RTEventLogAdmin_la_CPPFLAGS = \
+
+## Makefile.RTEventLogAdmin_Serv.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
+lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la
+
+libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_RTEVENTLOG_BUILD_DLL
+  -DTAO_RTEVENTLOG_SERV_BUILD_DLL
 
-libTAO_RTEventLogAdmin_la_SOURCES = \
+libTAO_RTEventLogAdmin_Serv_la_SOURCES = \
   Log/RTEventLogConsumer.cpp \
   Log/RTEventLogFactory_i.cpp \
   Log/RTEventLogNotification.cpp \
-  Log/RTEventLog_i.cpp \
-  RTEventLogAdminC.cpp \
-  RTEventLogAdminS.cpp
+  Log/RTEventLog_i.cpp
 
-libTAO_RTEventLogAdmin_la_LDFLAGS = \
+libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_RTEventLogAdmin_la_LIBADD = \
+libTAO_RTEventLogAdmin_Serv_la_LIBADD = \
+  libTAO_RTSched.la \
+  libTAO_CosNaming.la \
+  libTAO_RTEvent_Serv.la \
   libTAO_DsLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_DsLogAdmin_Skel.la \
-  libTAO_DsLogAdmin.la \
-  libTAO_RTSched.la \
-  libTAO_RTEvent_Serv.la \
+  libTAO_RTEventLogAdmin_Skel.la \
   libTAO_RTEvent_Skel.la \
+  libTAO_DsLogAdmin_Skel.la \
+  libTAO_RTEventLogAdmin.la \
   libTAO_RTEvent.la \
   libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -5105,7 +5517,7 @@ libTAO_RTEventLogAdmin_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
+  libTAO_DsLogAdmin.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -5115,20 +5527,28 @@ nobase_include_HEADERS += \
   Log/RTEventLogFactory_i.h \
   Log/RTEventLogNotification.h \
   Log/RTEventLog_i.h \
-  RTEventLogAdmin.idl \
-  RTEventLogAdminC.h \
-  RTEventLogAdminC.inl \
-  RTEventLogAdminS.h \
-  RTEventLogAdminS_T.cpp \
-  RTEventLogAdminS_T.h \
-  RTEventLogAdminS_T.inl \
-  RTEventLogAdminS_T.inl
+  Log/rteventlog_serv_export.h
 
+pkgconfig_DATA += \
+  TAO_RTEventLogAdmin_Serv.pc
+
+CLEANFILES += \
+  TAO_RTEventLogAdmin_Serv.pc
+
+TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in
+
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
+EXTRA_DIST += \
+  TAO_RTEventLogAdmin_Serv.pc.in
+
+
 ## Makefile.RTKokyuEvent.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTKokyuEvent.la
 
@@ -5180,11 +5600,13 @@ nobase_include_HEADERS += \
   Event/EC_Kokyu_Scheduling.h \
   Event/EC_Kokyu_Scheduling.i
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTSchedEvent.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTSchedEvent.la
 
@@ -5235,6 +5657,7 @@ nobase_include_HEADERS += \
   Event/EC_Sched_Filter_Builder.h \
   Event/EC_Sched_Filter_Builder.i
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
@@ -5325,7 +5748,7 @@ CLEANFILES += \
 CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp
 
 CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5346,7 +5769,7 @@ CLEANFILES += \
 CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp
 
 CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5367,7 +5790,7 @@ CLEANFILES += \
 GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp
 
 GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5394,7 +5817,7 @@ CLEANFILES += \
 SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl SecurityS_T.cpp SecurityS_T.inl: Security-stamp
 
 Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5421,7 +5844,7 @@ CLEANFILES += \
 SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl SecurityLevel1S_T.cpp SecurityLevel1S_T.inl: SecurityLevel1-stamp
 
 SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5448,7 +5871,7 @@ CLEANFILES += \
 SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl SecurityLevel2S_T.cpp SecurityLevel2S_T.inl: SecurityLevel2-stamp
 
 SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5469,7 +5892,7 @@ CLEANFILES += \
 SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3-stamp
 
 SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_Security.la
@@ -5591,6 +6014,7 @@ EXTRA_DIST += \
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
   SSLIOPC.cpp \
@@ -5608,7 +6032,7 @@ CLEANFILES += \
 SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS_T.cpp: SSLIOP-stamp
 
 SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_SSLIOP.la
@@ -5646,11 +6070,9 @@ libTAO_SSLIOP_la_SOURCES = \
   SSLIOP/SSLIOP_ORBInitializer.cpp \
   SSLIOP/SSLIOP_OwnCredentials.cpp \
   SSLIOP/SSLIOP_Profile.cpp \
-  SSLIOP/SSLIOP_SSL.cpp \
   SSLIOP/SSLIOP_TargetCredentials.cpp \
   SSLIOP/SSLIOP_Transport.cpp \
   SSLIOP/SSLIOP_Util.cpp \
-  SSLIOP/SSLIOP_X509.cpp \
   SSLIOP/params_dup.c \
   SSLIOP/ssl_endpointsC.cpp \
   SSLIOPC.cpp
@@ -5660,10 +6082,10 @@ libTAO_SSLIOP_la_LDFLAGS = \
 
 libTAO_SSLIOP_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
   libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -5710,10 +6132,12 @@ nobase_include_HEADERS += \
   SSLIOP/SSLIOP_Util.h \
   SSLIOP/SSLIOP_X509.h \
   SSLIOP/params_dup.h \
+  SSLIOP/ssl_endpoints.pidl \
   SSLIOP/ssl_endpointsC.h \
   SSLIOPC.h \
   SSLIOPC.inl
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
index 3a04aca99f0..42663238c81 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
@@ -3,10 +3,10 @@
 #ifndef METRICS_FRAME_MANAGER_CPP
 #define METRICS_FRAME_MANAGER_CPP
 
-#include "Metrics_FrameManager.h"
+#include "orbsvcs/Metrics/Metrics_FrameManager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Metrics_FrameManager.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
index f1ad017f20d..689ed44ee6f 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
@@ -15,13 +15,15 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
-#include "Metrics_Utils.h"
+#include "orbsvcs/Metrics/Metrics_Utils.h"
 
 #if defined (__ACE_INLINE__)
-#include "Metrics_FrameManager.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager.i"
 #endif /* __ACE_INLINE__ */
 
-#include "Metrics_FrameManager_T.h"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX>
 TAO_METRICS_FRAME_MGR_TYPE;
@@ -29,6 +31,7 @@ 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_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
index 64bf39f09f8..d8ff5ef8e8b 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
@@ -3,10 +3,10 @@
 #ifndef METRICS_FRAME_MANAGER_T_CPP
 #define METRICS_FRAME_MANAGER_T_CPP
 
-#include "Metrics_FrameManager_T.h"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Metrics_FrameManager_T.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
index 6eefdbf19f9..a3226d8647c 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
@@ -262,7 +262,7 @@ protected:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Metrics_FrameManager_T.cpp"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
@@ -270,7 +270,7 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if defined (__ACE_INLINE__)
-#include "Metrics_FrameManager_T.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* METRICS_FRAME_MANAGER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
index 73933c27eb1..c1b7f9eb788 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
@@ -3,10 +3,10 @@
 #ifndef METRICS_LOCAL_CACHE_CPP
 #define METRICS_LOCAL_CACHE_CPP
 
-#include "Metrics_LocalCache.h"
+#include "orbsvcs/Metrics/Metrics_LocalCache.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Metrics_LocalCache.i"
+#include "orbsvcs/Metrics/Metrics_LocalCache.i"
 #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
index df418913117..71fcb092381 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
@@ -24,13 +24,15 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/MetricsC.h"
 
-#include "Metrics_Utils.h"
+#include "orbsvcs/Metrics/Metrics_Utils.h"
 
 #if defined (ACE_METRICS_COLLECTION)
 
 #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
 
-#include "Metrics_LocalCache_T.h"
+#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;
@@ -97,8 +99,11 @@ PROBE_TYPE, \
 METRICS_LOGGER_REF); \
 } } while (0)
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Metrics_LocalCache.i"
+#include "orbsvcs/Metrics/Metrics_LocalCache.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
index a73236d2652..2478ce10532 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
@@ -3,14 +3,16 @@
 #ifndef METRICS_LOCAL_CACHE_T_CPP
 #define METRICS_LOCAL_CACHE_T_CPP
 
-#include "Metrics_LocalCache_T.h"
+#include "orbsvcs/Metrics/Metrics_LocalCache_T.h"
 
 #if defined VXWORKS
 #include <cacheLib.h>
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////
-// Class TAO_Metrics_LocalTimeprobe //g
+// Class TAO_Metrics_LocalTimeprobe //
 //////////////////////////////////////
 
 // Default constructor.
@@ -481,8 +483,6 @@ flush_TAO_Metrics_LocalCache ()
 #endif
 }
 
-#if !defined (__ACE_INLINE__)
-#include "Metrics_LocalCache_T.i"
-#endif /* __ACE_INLINE__ */
+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
index db031b72f32..97d51de3248 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef METRICS_LOCAL_CACHE_T_H
@@ -18,6 +20,8 @@
 #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;
@@ -312,16 +316,14 @@ public:
   // Flush the TAO metrics local cache into shared memory.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Metrics_LocalCache_T.cpp"
+#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 */
 
-#if defined (__ACE_INLINE__)
-#include "Metrics_LocalCache_T.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* METRICS_LOCAL_CACHE_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index dd7f2de0b01..71f0e444678 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Metrics_Logger.h"
+#include "orbsvcs/Metrics/Metrics_Logger.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/ace_wchar.h"
 
@@ -10,8 +10,9 @@ ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
 
-const int    OPEN_CLOSE_BANNER_CYCLE = 4;
+static const int OPEN_CLOSE_BANNER_CYCLE = 4;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////////////
 // class TAO_Metrics_Logger //
@@ -864,5 +865,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se
     }
 }
 
+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
index 3a1c3c0d0de..f836ca5faf3 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef METRICS_LOGGER_H
@@ -30,7 +32,7 @@
 #include "orbsvcs/MetricsS.h"
 #include "orbsvcs/RtecEventCommS.h"
 
-#include "Metrics_Utils.h"
+#include "orbsvcs/Metrics/Metrics_Utils.h"
 
 #if defined (METRICS_LOGGER_SENDS_EVENTS)
 #include "MetricsC.h"
@@ -41,6 +43,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Metrics_Export TAO_Metrics_Logger_Data
 {
   // = TITLE
@@ -212,6 +216,8 @@ 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 */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
index d593c8aa5ca..fe4ec645da8 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
@@ -3,14 +3,14 @@
 #ifndef METRICS_UPCALL_MONITOR_CPP
 #define METRICS_UPCALL_MONITOR_CPP
 
-#include "Metrics_UpcallMonitor.h"
+#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 "Metrics_UpcallMonitor.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
 #endif /* __ACE_INLINE__ */
 
 #else
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index 2d18b1678e1..69dde8b966c 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef METRICS_UPCALL_MONITOR_H
@@ -22,9 +24,11 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/MetricsS.h"
 
-#include "Metrics_LocalCache.h"
-#include "Metrics_FrameManager.h"
-#include "Metrics_Utils.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
@@ -222,13 +226,16 @@ private:
   // The monitor we're wrapping.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "Metrics_UpcallMonitor.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
 #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;
 
@@ -249,6 +256,8 @@ 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 */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
index 41c3b8ff649..9b028ba293b 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 // @METRICS@
@@ -13,6 +15,7 @@
 #   define METRICS_USES_OP_CANCELLATION
 # endif /* ! METRICS_USES_OP_CANCELLATION */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////////////
 // Class TAO_Metrics_UpcallMonitor //
@@ -373,4 +376,6 @@ TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS (
   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
index 7065e9bea6d..333b49c3ff6 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
@@ -3,14 +3,15 @@
 #ifndef METRICS_UPCALL_MONITOR_T_CPP
 #define METRICS_UPCALL_MONITOR_T_CPP
 
-#include "Metrics_UpcallMonitor_T.h"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Metrics_UpcallMonitor_T.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i"
 #endif /* __ACE_INLINE__ */
 
-// Virtual destructor: destroy actual consumer if we own it.
+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 ()
@@ -21,5 +22,7 @@ TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
     }
 }
 
+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
index 10bccb4f8e1..4c5958cb09e 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef METRICS_UPCALL_MONITOR_T_H
@@ -11,8 +13,8 @@
 
 #endif /* ! VXWORKS */
 
-#include "Metrics_LocalCache.h"
-#include "Metrics_FrameManager.h"
+#include "orbsvcs/Metrics/Metrics_LocalCache.h"
+#include "orbsvcs/Metrics/Metrics_FrameManager.h"
 
 #include "ace/Hash_Map_Manager.h"
 
@@ -22,6 +24,9 @@
 
 #include "orbsvcs/Metrics/Metrics_UpcallMonitor.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCK, class ALLOCATOR>
 class TAO_Metrics_UpcallMonitorAdapter
   : public RtecEventComm::PushConsumer
@@ -40,7 +45,7 @@ public:
     TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> & cache,
     TAO_Metrics_FrameManager<ACE_LOCK> & frame_manager,
     POA_RtecEventComm::PushConsumer & consumer,
-    TAO_String_Manager entry_point,
+    TAO::String_Manager entry_point,
     RtecScheduler::handle_t handle,
     RtecScheduler::Period_t period,
     RtecScheduler::Time wcet,
@@ -62,11 +67,11 @@ public:
   // Set the current period for the adapter.
 
   void push (const RtecEventComm::EventSet & data,
-             CORBA::Environment &ACE_TRY_ENV = 
+             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 = 
+  void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV =
                                  CORBA::Environment::default_environment ());
   // Delegates to the actual PushConsumer for which we're a proxy
 
@@ -122,14 +127,14 @@ public:
     TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR> & cache,
     TAO_Metrics_FrameManager<ACE_LOCK> & frame_manager,
     POA_RtecEventComm::PushConsumer & consumer,
-    TAO_String_Manager entry_point,
+    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 
+  // Constructor that takes a reference to a logger object and
   // info needed to construct or base class.
 
 protected:
@@ -141,17 +146,19 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i"
+#endif /* __ACE_INLINE__ */
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Metrics_UpcallMonitor_T.cpp"
+#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 */
 
-#if defined (__ACE_INLINE__)
-#include "Metrics_UpcallMonitor_T.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* METRICS_UPCALL_MONITOR_T_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
index 33dd8d54bfb..08b866de338 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
@@ -16,6 +16,8 @@
 # endif /* ! METRICS_USES_OP_CANCELLATION */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ////////////////////////////////////////////
 // class TAO_Metrics_UpcallMonitorAdapter //
 ////////////////////////////////////////////
@@ -33,7 +35,7 @@ TAO_Metrics_UpcallMonitorAdapter (
   TAO_Metrics_LocalCache<ACE_LOCK, ALLOCATOR> &cache,
   TAO_Metrics_FrameManager<ACE_LOCK> &frame_manager,
   POA_RtecEventComm::PushConsumer & consumer,
-  TAO_String_Manager entry_point,
+  TAO::String_Manager entry_point,
   RtecScheduler::handle_t handle,
   RtecScheduler::Period_t period,
   RtecScheduler::Time wcet,
@@ -227,7 +229,7 @@ TAO_Metrics_ReportingUpcallMonitorAdapter (
   TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR> &cache,
   TAO_Metrics_FrameManager<ACE_LOCK> &frame_manager,
   POA_RtecEventComm::PushConsumer & consumer,
-  TAO_String_Manager entry_point,
+  TAO::String_Manager entry_point,
   RtecScheduler::handle_t handle,
   RtecScheduler::Period_t period,
   RtecScheduler::Time wcet,
@@ -256,4 +258,6 @@ TAO_Metrics_ReportingUpcallMonitorAdapter (
                                      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
index e4b4dab16bf..99c51fe77b7 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -9,11 +9,10 @@
 
 
 #include "ace/Metrics_Cache.h"
-#include "Metrics_Utils.h"
-#include "Metrics_LocalCache.h"
-
-
+#include "orbsvcs/Metrics/Metrics_Utils.h"
+#include "orbsvcs/Metrics/Metrics_LocalCache.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////
 // Class TAO_Metrics_Utils //
@@ -521,10 +520,10 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles ()
 #endif /* TAO_USES_REPORTING_METRICS */
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if !defined (__ACE_INLINE__)
-#include "Metrics_Utils.i"
+#include "orbsvcs/Metrics/Metrics_Utils.i"
 #endif /* __ACE_INLINE__ */
 
 #else
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
index 7b86fb1c94d..5e0e0ebd36d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef METRICS_UTILS_H
@@ -20,12 +22,14 @@
 #include "ace/Singleton.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/MetricsC.h"
-#include "metrics_export.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
@@ -171,11 +175,10 @@ PROBE_TYPE, \
 METRICS_LOGGER_REF); \
 } } while (0)
 
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "Metrics_Utils.i"
+#include "orbsvcs/Metrics/Metrics_Utils.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
index e66bd0c7d62..04a77bddb52 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
@@ -1,8 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #ifndef METRICS_UTILS_I
 #define METRICS_UTILS_I
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////
 // Class TAO_Metrics_Utils //
 /////////////////////////////
@@ -30,4 +34,6 @@ 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/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 951021dea65..bee9ae0c932 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -3,17 +3,20 @@
 #ifndef TAO_BINDINGS_ITERATOR_T_CPP
 #define TAO_BINDINGS_ITERATOR_T_CPP
 
-#include "Bindings_Iterator_T.h"
+#include "orbsvcs/Naming/Bindings_Iterator_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context,
-                                                                     ITERATOR *hash_iter,
-                                                                     PortableServer::POA_ptr poa,
-                                                                     TAO_SYNCH_RECURSIVE_MUTEX &lock)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
+  TAO_Hash_Naming_Context *context,
+  ITERATOR *hash_iter,
+  PortableServer::POA_ptr poa,
+  TAO_SYNCH_RECURSIVE_MUTEX &lock)
   : destroyed_ (0),
     context_ (context),
     hash_iter_ (hash_iter),
@@ -36,14 +39,16 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 
 // Return the Default POA of this Servant
 template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (
+  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
-                                                        ACE_ENV_ARG_DECL)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
+    CosNaming::Binding_out b
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
@@ -99,9 +104,10 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
 }
 
 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_ENV_ARG_DECL)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
+    CORBA::ULong how_many,
+    CosNaming::BindingList_out bl
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
@@ -194,8 +200,9 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class ITERATOR, class TABLE_ENTRY> int
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *hash_entry,
-                                                                CosNaming::Binding &b)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (
+  TABLE_ENTRY *hash_entry,
+  CosNaming::Binding &b)
 {
   b.binding_type = hash_entry->int_id_.type_;
   b.binding_name.length (1);
@@ -220,4 +227,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *has
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_BINDINGS_ITERATOR_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 8247c6db8d2..6bed837d729 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Bindings_Iterator_T.h
@@ -14,7 +15,10 @@
 #define TAO_BINDINGS_ITERATOR_T_H
 #include /**/ "ace/pre.h"
 
-#include "Hash_Naming_Context.h"
+#include "orbsvcs/Naming/Hash_Naming_Context.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Bindings_Iterator
@@ -127,8 +131,10 @@ private:
   PortableServer::POA_var poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Bindings_Iterator_T.cpp"
+#include "orbsvcs/Naming/Bindings_Iterator_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
index 965839c7a93..5fddba2a270 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -13,10 +13,13 @@
 //
 // ============================================================================
 
-#include "Entries.h"
+#include "orbsvcs/Naming/Entries.h"
 
 ACE_RCSID(Naming, Entries, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IntId::TAO_IntId (void)
   : type_ (CosNaming::nobject)
 {
@@ -120,3 +123,5 @@ TAO_ExtId::hash (void) const
 
   return temp.hash ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 26f4d5703b3..e41d9bdf258 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,7 +24,9 @@
 #include "ace/SString.h"
 
 #include "orbsvcs/CosNamingC.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_IntId
@@ -131,5 +133,7 @@ public:
   const char * kind (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index ae4dcfe9e4c..c7de112dd11 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -3,7 +3,7 @@
 //-----------------------------------------------------------------------------
 // Flat File class implementations
 //-----------------------------------------------------------------------------
-#include "Flat_File_Persistence.h"
+#include "orbsvcs/Naming/Flat_File_Persistence.h"
 
 #include "ace/config-all.h"
 #include "ace/Log_Msg.h"
@@ -11,6 +11,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NS_FlatFileStream::TAO_NS_FlatFileStream (const ACE_CString & file,
                                               const char * mode)
   : fl_ (0)
@@ -339,9 +341,9 @@ TAO_NS_FlatFileStream::operator >>(
 }
 
 
-TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream(
-                                                       const ACE_CString & file,
-                                                       const ACE_TCHAR * mode)
+TAO_Storable_Base *
+TAO_NS_FlatFileFactory::create_stream (const ACE_CString & file,
+                                       const ACE_TCHAR * mode)
 {
   ACE_TRACE("TAO_NS_FlatFileFactory::create_stream");
   TAO_Storable_Base *stream = 0;
@@ -351,3 +353,5 @@ TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream(
                   0);
   return stream;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
index 242a49d531d..8c76dbc99a3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Flat_File_Persistence.h
@@ -12,9 +13,11 @@
 #ifndef TAO_FLAT_FILE_PERSISTENCE_H
 #define TAO_FLAT_FILE_PERSISTENCE_H
 
-#include "Storable.h"
+#include "orbsvcs/Naming/Storable.h"
 #include "ace/OS_NS_stdio.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //------------------------------------------------------------------------
 // The Flat File concrete classes
 //------------------------------------------------------------------------
@@ -87,5 +90,6 @@ public:
                                            const ACE_TCHAR * mode);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 6caa0472771..3cb59bd6da9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -13,8 +13,8 @@
 //
 // ============================================================================
 
-#include "Hash_Naming_Context.h"
-#include "nsconf.h"
+#include "orbsvcs/Naming/Hash_Naming_Context.h"
+#include "orbsvcs/Naming/nsconf.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (Naming,
@@ -22,6 +22,8 @@ ACE_RCSID (Naming,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // -------------------------------------------------
 
 TAO_Bindings_Map::~TAO_Bindings_Map (void)
@@ -154,9 +156,6 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
         }
       ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
         {
-          ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::bind(), Caught CORBA::TIMEOUT exception");
-          // throw a CannotProceed exception back to the client
-          //
           ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                          (context.in (), simple_name));
         }
@@ -220,9 +219,6 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
         }
       ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
         {
-          ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::rebind(), Caught CORBA::TIMEOUT exception");
-          // throw a CannotProceed exception back to the client
-          //
           ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                          (context.in (), simple_name));
         }
@@ -292,7 +288,6 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
         }
       ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
         {
-          ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::bind_context (), Caught CORBA::TIMEOUT exception");
           ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                          (context.in (), simple_name));
         }
@@ -356,7 +351,6 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
         }
       ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
         {
-          ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::rebind_context (), Caught CORBA::TIMEOUT exception");
           ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                          (context.in (), simple_name));
         }
@@ -473,9 +467,6 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
             }
           ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
             {
-              ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::resolve (), Caught CORBA::TIMEOUT exception");
-              // throw a CannotProceed exception back to the client
-              //
               ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                              (context.in (), rest_of_name));
             }
@@ -527,7 +518,6 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
         }
       ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
         {
-          ACE_PRINT_EXCEPTION (timeoutEx, "Hash_Naming_Context::unbind (), Caught CORBA::TIMEOUT exception");
           ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
                          (context.in (), simple_name));
         }
@@ -686,3 +676,5 @@ TAO_Hash_Naming_Context::interface (void)
 {
   return this->interface_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index d3853190a0c..21fb9d571f3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -16,8 +16,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Naming_Context_Interface.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/Naming_Context_Interface.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
 
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/SString.h"
@@ -35,6 +35,8 @@
 #undef interface
 #endif  // interface
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Bindings_Map
  *
@@ -271,6 +273,8 @@ protected:
   ACE_CString poa_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_HASH_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index e45aacd76e1..ac7c42f87d0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Naming_Client.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 
@@ -8,6 +8,8 @@ ACE_RCSID (Naming,
            Naming_Client,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CosNaming::NamingContext_ptr
 TAO_Naming_Client::operator -> (void) const
 {
@@ -18,7 +20,7 @@ CosNaming::NamingContext_ptr
 TAO_Naming_Client::get_context (void) const
 {
   // Must duplicate this pointer so it can be stored in a _var.
-  return CosNaming::NamingContext::_duplicate (this->naming_context_.ptr ());
+  return CosNaming::NamingContext::_duplicate (this->naming_context_.in ());
 }
 
 int
@@ -61,3 +63,5 @@ TAO_Naming_Client::~TAO_Naming_Client (void)
 {
   // Do nothing
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
index 9f829de7de0..56b48d7f37d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
@@ -24,6 +24,8 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/naming_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Naming_Client
  *
@@ -70,5 +72,7 @@ protected:
   CosNaming::NamingContext_var naming_context_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NAMING_CLIENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 5b06cdc83f9..809c1795a42 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -13,11 +13,13 @@
 //
 // ============================================================================
 
-#include "Naming_Context_Interface.h"
+#include "orbsvcs/Naming/Naming_Context_Interface.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl)
   : impl_ (impl)
 {
@@ -533,3 +535,5 @@ TAO_Naming_Context::resolve_str (const char * n
 TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 1c532b8f5d7..54140eb5e57 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -17,9 +17,11 @@
 
 #include "orbsvcs/CosNamingS.h"
 
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Naming_Context_Impl;
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -413,6 +415,8 @@ public:
   virtual PortableServer::POA_ptr _default_POA (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_NAMING_CONTEXT_INTERFACE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 2a098d198c8..6426cb81819 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -13,12 +13,15 @@
 //   Carlos O'Ryan <coryan@uci.edu>
 // ================================================================
 
-#include "Naming_Loader.h"
+#include "orbsvcs/Naming/Naming_Loader.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Naming, Naming_Loader, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Naming_Loader::TAO_Naming_Loader (void)
 {
   // Constructor
@@ -90,4 +93,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 4e34848a46d..9f9543ce3f9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+
 // $Id$
 
-// ===========================================================================================
+// ============================================================================
 // FILENAME
 //   Naming_Loader.h
 //
@@ -11,7 +13,7 @@
 // AUTHORS
 //   Priyanka Gontla <pgontla@ece.uci.edu>
 //
-// ==========================================================================================
+// ============================================================================
 
 #ifndef TAO_NAMING_LOADER_H
 #define TAO_NAMING_LOADER_H
@@ -24,6 +26,8 @@
 
 #include "orbsvcs/Naming/Naming_Server.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader
 {
 public:
@@ -56,10 +60,12 @@ public:
   TAO_Naming_Server naming_server_;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader (const TAO_Naming_Loader &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader &operator = (const TAO_Naming_Loader &))
+  TAO_Naming_Loader (const TAO_Naming_Loader &);
+  TAO_Naming_Loader &operator = (const TAO_Naming_Loader &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader)
 
 #endif /* TAO_NAMING_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 495eafbdb3b..db1876ab5f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Naming_Server.h"
-#include "Transient_Naming_Context.h"
-#include "Persistent_Context_Index.h"
-#include "Storable_Naming_Context.h"
-#include "Storable_Naming_Context_Activator.h"
-#include "Flat_File_Persistence.h"
+#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Transient_Naming_Context.h"
+#include "orbsvcs/Naming/Persistent_Context_Index.h"
+#include "orbsvcs/Naming/Storable_Naming_Context.h"
+#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
+#include "orbsvcs/Naming/Flat_File_Persistence.h"
 #include "orbsvcs/CosNamingC.h"
 
 #include "tao/debug.h"
@@ -13,7 +13,11 @@
 #include "tao/ORB_Core.h"
 
 #include "tao/IORTable/IORTable.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 #include "tao/Messaging/Messaging.h"
+#endif
+
 #include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Arg_Shifter.h"
@@ -25,6 +29,8 @@ ACE_RCSID (Naming,
            Naming_Server,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Naming_Server::TAO_Naming_Server (void)
   : naming_context_ (),
     ior_multicast_ (0),
@@ -648,6 +654,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
   ACE_UNUSED_ARG (enable_multicast);
 #endif /* ACE_HAS_IP_MULTICAST */
 
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0  
       if (use_round_trip_timeout == 1)
       {
         TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout;
@@ -675,6 +682,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         ACE_TRY_CHECK;
         polList[0] = CORBA::Policy::_nil ();
       }
+#else
+  ACE_UNUSED_ARG (use_round_trip_timeout);
+#endif /* TAO_HAS_CORBA_MESSAGING */
     }
   ACE_CATCHANY
     {
@@ -754,3 +764,5 @@ TAO_Naming_Server::~TAO_Naming_Server (void)
     delete this->servant_activator_;
 #endif /* TAO_HAS_MINIMUM_POA */
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index 9777c7244d5..5d7c3919fb6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -11,7 +11,7 @@
  *
  *  @author Nagarajan Surendran (naga@cs.wustl.edu)
  *  @author Matt Braun <mjb2@cs.wustl.edu>
- *  @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>.
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>.
  */
 //=============================================================================
 
@@ -23,8 +23,10 @@
 #include "tao/ORB.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/IOR_Multicast.h"
-#include "Naming_Context_Interface.h"
-#include "nsconf.h"
+#include "orbsvcs/Naming/Naming_Context_Interface.h"
+#include "orbsvcs/Naming/nsconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decl;
 class TAO_Persistent_Context_Index;
@@ -231,5 +233,7 @@ protected:
   int use_round_trip_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NAMING_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
index eec01316dc3..a9d8fd2b50b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp
@@ -13,8 +13,8 @@
 // ============================================================================
 
 
-#ifndef NS_CONTAINER_C
-#define NS_CONTAINER_C
+#ifndef NS_CONTAINER_CPP
+#define NS_CONTAINER_CPP
 
 #include "ace/Malloc_Base.h"
 
@@ -22,7 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Naming_Service_Container.h"
+#include "orbsvcs/Naming/Naming_Service_Container.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node)
 
@@ -367,7 +369,6 @@ ACE_Unbounded_List_Iterator<T>::operator!= (const ACE_Unbounded_List_Iterator<T>
   //ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator!=");
   return (this->set_ != rhs.set_ || this->current_ != rhs.current_);
 }
-/* -*- C++ -*- */
 
 // ---
 
@@ -385,5 +386,7 @@ ACE_Unbounded_List<T>::is_full (void) const
   return 0; // We should implement a "node of last resort for this..."
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
-#endif /* NS_CONTAINERS_T_C */
+#endif /* NS_CONTAINERS_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 7bd568a592a..0d4a61f123f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Naming_Service_Container.h
@@ -21,17 +22,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "tao/orbconf.h"
+
 // Need by ACE_DLList_Node.
 #include "ace/Containers.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Forward declarations.
 template <class T> class ACE_Unbounded_List;
 template <class T> class ACE_Unbounded_List_Iterator;
 
-
 /**
  * @class ACE_NS_Node
  *
@@ -44,8 +49,6 @@ public:
   friend class ACE_Unbounded_List<T>;
   friend class ACE_Unbounded_List_Iterator<T>;
 
-
-
 # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// This isn't necessary, but it keeps some compilers happy.
   ~ACE_NS_Node (void);
@@ -64,10 +67,6 @@ private:
   T item_;
 };
 
-
-
-
-
 /**
  * @class ACE_Unbounded_List_Iterator
  *
@@ -221,9 +220,10 @@ private:
   ACE_Allocator *allocator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Naming_Service_Container.cpp"
+#include "orbsvcs/Naming/Naming_Service_Container.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index c2563037d21..97c2407a6bb 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "Persistent_Context_Index.h"
-#include "Persistent_Naming_Context.h"
+#include "orbsvcs/Naming/Persistent_Context_Index.h"
+#include "orbsvcs/Naming/Persistent_Naming_Context.h"
 
 #include "tao/debug.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Persistent_Context_Index::unbind (const char *poa_id)
 {
@@ -304,3 +306,5 @@ TAO_Persistent_Context_Index::create_index_helper (void *buffer)
   this->index_ = new (buffer) CONTEXT_INDEX (this->allocator_);
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index a524d5e39ac..97bd7b76018 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,14 +15,16 @@
 #define TAO_PERSISTENT_CONTEXT_INDEX_H
 #include /**/ "ace/pre.h"
 
-#include "Persistent_Entries.h"
-#include "naming_serv_export.h"
-#include "nsconf.h"
+#include "orbsvcs/Naming/Persistent_Entries.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
+#include "orbsvcs/Naming/nsconf.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Malloc_T.h"
 #include "ace/MMAP_Memory_Pool.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Persistent_Context_Index
  *
@@ -163,5 +165,7 @@ private:
   CosNaming::NamingContext_var root_context_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
index 355ccb73261..f5d31b0874c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -13,9 +13,11 @@
 //
 // ============================================================================
 
-#include "Persistent_Entries.h"
+#include "orbsvcs/Naming/Persistent_Entries.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Persistent_IntId::TAO_Persistent_IntId (void)
   : ref_ (0),
     type_ (CosNaming::nobject)
@@ -202,3 +204,5 @@ TAO_Persistent_Index_ExtId::hash (void) const
   ACE_CString temp (poa_id_);
   return temp.hash ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 59a65b3dd85..d418414a945 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,12 +17,14 @@
 
 #include "ace/Hash_Map_With_Allocator_T.h"
 #include "orbsvcs/CosNamingC.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Persistent_IntId
  *
@@ -225,5 +227,7 @@ public:
   const char * poa_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PERSISTENT_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 4a0e122ff90..80b4a7f4aa7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -1,6 +1,6 @@
-#include "Persistent_Naming_Context.h"
-#include "Persistent_Context_Index.h"
-#include "Bindings_Iterator_T.h"
+#include "orbsvcs/Naming/Persistent_Naming_Context.h"
+#include "orbsvcs/Naming/Persistent_Context_Index.h"
+#include "orbsvcs/Naming/Bindings_Iterator_T.h"
 #include "ace/OS_NS_stdio.h"
 
 // The following #pragma is needed to disable a warning that occurs
@@ -19,6 +19,7 @@ ACE_RCSID (Naming,
            Persistent_Naming_Context,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 TAO_Persistent_Bindings_Map::unbind (const char *id,
@@ -536,3 +537,5 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index d3baab97b89..4ad3b2e61c0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Persistent_Naming_Context.h
@@ -14,9 +15,11 @@
 #define TAO_PERSISTENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
-#include "Hash_Naming_Context.h"
-#include "Persistent_Entries.h"
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/Hash_Naming_Context.h"
+#include "orbsvcs/Naming/Persistent_Entries.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Persistent_Bindings_Map
@@ -29,7 +32,8 @@
  * from persistent storage) to make bindings persistent and
  * supports TAO_Bindings_Map interface.  Used by TAO_Persistent_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map
+class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map
+  : public TAO_Bindings_Map
 {
 public:
 
@@ -263,5 +267,7 @@ protected:
   TAO_Persistent_Context_Index *index_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
index 8fdb58357be..b04ee7c389d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
@@ -13,10 +13,10 @@
 //
 // ============================================================================
 
-#include "Storable.h"
+#include "orbsvcs/Naming/Storable.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Storable.inl"
+#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 4e82d203852..b21cf124b71 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h
@@ -1,22 +1,34 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Storable.h
  *
  *  $Id$
  *
- *  @author Bruce Trask <trask_b@ociweb.com> Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ *  @author Bruce Trask <trask_b@ociweb.com>
+ *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com>
  */
 //=============================================================================
 
 
-#ifndef STORABLE_H
-#define STORABLE_H
+#ifndef TAO_NAMING_STORABLE_H
+#define TAO_NAMING_STORABLE_H
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/SString.h"
 
-const int szInt =  sizeof(int);
-const int szChar = sizeof(char);
-const int szBool = sizeof(int);
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+static const int szInt =  sizeof(int);
+static const int szChar = sizeof(char);
+static const int szBool = sizeof(int);
 
 class TAO_NS_Persistence_Header
 {
@@ -144,8 +156,10 @@ public:
                                            const ACE_TCHAR * mode) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Storable.inl"
+#include "orbsvcs/Naming/Storable.inl"
 #endif /* __ACE_INLINE_ */
 
-#endif
+#endif  /* TAO_NAMING_STORABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
index c6eff092b53..50a149a9c0c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -13,6 +15,8 @@
 //
 // ============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_NS_Persistence_Header::size (unsigned int size)
 {
@@ -162,3 +166,5 @@ TAO_Storable_Base::fail (void) const
 {
   return (this->state_ & failbit);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 3ae15097ad0..3f2c4253a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,5 +1,5 @@
-#include "Storable_Naming_Context.h"
-#include "Bindings_Iterator_T.h"
+#include "orbsvcs/Naming/Storable_Naming_Context.h"
+#include "orbsvcs/Naming/Bindings_Iterator_T.h"
 
 #include "tao/debug.h"
 
@@ -16,16 +16,18 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_stdio.h"
 
+ACE_RCSID (Naming,
+           Storable_Naming_Context,
+           "$Id$")
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char * TAO_Storable_Naming_Context::root_name_;
 ACE_UINT32 TAO_Storable_Naming_Context::gcounter_;
 ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_;
 int TAO_Storable_Naming_Context::redundant_;
 
-ACE_RCSID (Naming,
-           Storable_Naming_Context,
-           "$Id$")
-
 TAO_Storable_IntId::TAO_Storable_IntId (void)
   : ref_ (CORBA::string_dup ("")),
     type_ (CosNaming::nobject)
@@ -1454,7 +1456,12 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
     }
 }
 
-#include "Naming_Service_Container.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/Naming/Naming_Service_Container.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                                CORBA::ORB_ptr orb,
                                PortableServer::POA_ptr poa,
@@ -1539,3 +1546,5 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
 
   return result._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index a8d6c62f634..87f8bb203a2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -14,15 +14,18 @@
 #define TAO_STORABLE_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
-#include "Hash_Naming_Context.h"
+#include "orbsvcs/Naming/Hash_Naming_Context.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Auto_Ptr.h"
 
-#include "Storable.h"
+#include "orbsvcs/Naming/Storable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Naming_Serv_Export TAO_Storable_IntId
 {
 public:
@@ -465,6 +468,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_STORABLE_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 306b7bd00a6..c37f66d6b8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -12,19 +12,21 @@
 //
 // ============================================================================
 
-#include "Storable_Naming_Context_Activator.h"
+#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-#include "Naming_Context_Interface.h"
-#include "Storable_Naming_Context.h"
-#include "Storable.h"
+#include "orbsvcs/Naming/Naming_Context_Interface.h"
+#include "orbsvcs/Naming/Storable_Naming_Context.h"
+#include "orbsvcs/Naming/Storable.h"
 #include "ace/Auto_Ptr.h"
 
-TAO_Storable_Naming_Context_Activator::
-TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb,
-                                       TAO_Naming_Service_Persistence_Factory *factory,
-                                       const ACE_TCHAR *persistence_directory,
-                                       size_t context_size)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator (
+  CORBA::ORB_ptr orb,
+  TAO_Naming_Service_Persistence_Factory *factory,
+  const ACE_TCHAR *persistence_directory,
+  size_t context_size)
   : orb_(orb),
     factory_(factory),
     persistence_directory_(persistence_directory),
@@ -38,9 +40,10 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator ()
 }
 
 PortableServer::Servant
-TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId &oid,
-                                                  PortableServer::POA_ptr poa
-                                                  ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context_Activator::incarnate (
+    const PortableServer::ObjectId &oid,
+    PortableServer::POA_ptr poa
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -103,12 +106,13 @@ TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId
 }
 
 void
-TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::ObjectId &/*oid*/,
-                                                    PortableServer::POA_ptr /*adapter*/,
-                                                    PortableServer::Servant servant,
-                                                    CORBA::Boolean /*cleanup_in_progress*/,
-                                                    CORBA::Boolean remaining_activations
-                                                    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Storable_Naming_Context_Activator::etherealize (
+    const PortableServer::ObjectId &/*oid*/,
+    PortableServer::POA_ptr /*adapter*/,
+    PortableServer::Servant servant,
+    CORBA::Boolean /*cleanup_in_progress*/,
+    CORBA::Boolean remaining_activations
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations) {
@@ -116,4 +120,6 @@ TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::Object
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index e2bce0b2951..d8799fd1137 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -24,7 +25,9 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "naming_serv_export.h"
+#include "orbsvcs/Naming/naming_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Naming_Service_Persistence_Factory;
 
@@ -80,6 +83,8 @@ private:
   size_t context_size_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 8a81829332d..06eb43a44b5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -13,12 +13,14 @@
 //
 // ============================================================================
 #include "ace/Auto_Ptr.h"
-#include "Transient_Naming_Context.h"
-#include "Bindings_Iterator_T.h"
+#include "orbsvcs/Naming/Transient_Naming_Context.h"
+#include "orbsvcs/Naming/Bindings_Iterator_T.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Transient_Bindings_Map::unbind (const char *id,
                                     const char *kind)
@@ -338,3 +340,5 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 94ba088fb30..2c3de8a61f3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Transient_Naming_Context.h
@@ -14,14 +15,17 @@
 #define TAO_TRANSIENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
-#include "Hash_Naming_Context.h"
-#include "Entries.h"
+#include "orbsvcs/Naming/Hash_Naming_Context.h"
+#include "orbsvcs/Naming/Entries.h"
 #include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Transient_Bindings_Map
  *
@@ -194,5 +198,7 @@ protected:
   TAO_Transient_Bindings_Map *transient_context_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TRANSIENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 8cf67d318c6..48a0a7d9de0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "Admin.h"
+#include "orbsvcs/Notify/Admin.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Admin.inl"
+#include "orbsvcs/Notify/Admin.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -11,16 +11,16 @@ ACE_RCSID (Notify,
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 
-#include "Container_T.h"
-#include "Proxy.h"
-#include "EventChannel.h"
-#include "Topology_Saver.h"
-#include "Save_Persist_Worker_T.h"
-#include "Reconnect_Worker_T.h"
-#include "Consumer_Map.h"
-#include "Supplier_Map.h"
-#include "ConsumerAdmin.h"
-#include "SupplierAdmin.h"
+#include "orbsvcs/Notify/Container_T.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+#include "orbsvcs/Notify/Save_Persist_Worker_T.h"
+#include "orbsvcs/Notify/Reconnect_Worker_T.h"
+#include "orbsvcs/Notify/Consumer_Map.h"
+#include "orbsvcs/Notify/Supplier_Map.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
 
 #include "tao/debug.h"
 
@@ -29,13 +29,16 @@ ACE_RCSID (Notify,
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Admin::TAO_Notify_Admin ()
   : ec_ (0)
   , filter_operator_ (CosNotifyChannelAdmin::OR_OP)
   , is_default_ (false)
 {
-  // Initialize all Admin objects to initially be subscribed for all events.
-  // This is a reasonable default and is required to allow Cos Event consumers/suppliers to send/receive events,
+  // Initialize all Admin objects to initially be subscribed for all
+  // events.  This is a reasonable default and is required to allow
+  // Cos Event consumers/suppliers to send/receive events,
   this->subscribed_types_.insert (TAO_Notify_EventType::special ());
 }
 
@@ -91,7 +94,9 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
 int
 TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (1);
+  if (sd_ret == 1)
     return 1;
 
   this->proxy_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -114,40 +119,44 @@ TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
   this->self_changed_ = false;
 
   if (is_persistent ())
-  {
-    TAO_Notify::NVPList attrs;
-    this->save_attrs(attrs);
-
-    const char* type = this->get_admin_type_name();
+    {
+      TAO_Notify::NVPList attrs;
+      this->save_attrs(attrs);
 
-    bool want_all_children =
-      saver.begin_object(this->id(), type, attrs, changed ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      const char* type = this->get_admin_type_name();
 
-    if (want_all_children || this->filter_admin_.is_changed ())
-    {
-      this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      bool want_all_children =
+        saver.begin_object(this->id(), type, attrs, changed
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-    }
-    if (want_all_children || this->subscribed_types_.is_changed ())
-    {
-      this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
 
-    TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy> wrk(saver, want_all_children);
-    this->proxy_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      if (want_all_children || this->filter_admin_.is_changed ())
+        {
+          this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+      if (want_all_children || this->subscribed_types_.is_changed ())
+        {
+          this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy>
+        wrk(saver, want_all_children);
+      this->proxy_container().collection()->for_each(&wrk
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
-    saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
-  }
+      saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+    }
 }
 
 void
 TAO_Notify_Admin::save_attrs (TAO_Notify::NVPList& attrs)
 {
   TAO_Notify_Object::save_attrs(attrs);
-  attrs.push_back(TAO_Notify::NVP("InterFilterGroupOperator", this->filter_operator_));
+  attrs.push_back(TAO_Notify::NVP("InterFilterGroupOperator",
+                                  this->filter_operator_));
   if (this->is_default_)
     {
       attrs.push_back (TAO_Notify::NVP ("default", "yes"));
@@ -163,37 +172,42 @@ TAO_Notify_Admin::load_attrs(const TAO_Notify::NVPList& attrs)
     {
       this->filter_operator_ = static_cast <CosNotifyChannelAdmin::InterFilterGroupOperator> (ACE_OS::atoi (value));
     }
+
   if (attrs.find ("default", value))
-  {
-    this->is_default_ = (ACE_OS::strcmp (value, "yes") == 0);
-  }
+    {
+      this->is_default_ = (ACE_OS::strcmp (value, "yes") == 0);
+    }
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_Admin::load_child (const ACE_CString &type,
-  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED)
+                              CORBA::Long id,
+                              const TAO_Notify::NVPList& attrs
+                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_UNUSED_ARG (attrs);
   TAO_Notify::Topology_Object* result = this;
   if (type == "subscriptions")
-  {
-    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Admin reload subscription %d\n")
-      , static_cast<int> (id)
-      ));
-    // since we initialized our subscribed types to everything
-    // in the constructor. we have to clear it out first.
-    this->subscribed_types_.reset();
-    result = &this->subscribed_types_;
-  }
+    {
+      if (DEBUG_LEVEL)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("(%P|%t) Admin reload subscription %d\n"),
+                    static_cast<int> (id)
+                    ));
+      // since we initialized our subscribed types to everything
+      // in the constructor. we have to clear it out first.
+      this->subscribed_types_.reset();
+      result = &this->subscribed_types_;
+    }
   else if (type == "filter_admin")
-  {
-    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n")
-      , static_cast<int> (id)
-      ));
-    result = & this->filter_admin_;
-  }
+    {
+      if (DEBUG_LEVEL)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n"),
+                    static_cast<int> (id)
+                    ));
+      result = & this->filter_admin_;
+    }
   return result;
 }
 
@@ -205,3 +219,4 @@ TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index 3af6e864fae..a7a9487c8c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -14,17 +14,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "FilterAdmin.h"
-#include "EventTypeSeq.h"
-#include "Topology_Object.h"
-#include "EventChannel.h"
+#include "orbsvcs/Notify/FilterAdmin.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/EventChannel.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Proxy;
 template <class TYPE> class TAO_Notify_Container_T;
@@ -114,8 +115,10 @@ private:
   ACE_Auto_Ptr< TAO_Notify_Proxy_Container > proxy_container_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Admin.inl"
+#include "orbsvcs/Notify/Admin.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
index eef513ea103..d7cb523081e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Notify_EventChannel *
 TAO_Notify_Admin::event_channel () const
@@ -46,3 +50,5 @@ TAO_Notify_Admin::proxy_container()
   ACE_ASSERT( proxy_container_.get() != 0 );
   return *proxy_container_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index afb3a1cb63a..37798f3088f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "AdminProperties.h"
+#include "orbsvcs/Notify/AdminProperties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "AdminProperties.inl"
+#include "orbsvcs/Notify/AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -12,6 +12,8 @@ ACE_RCSID (Notify,
 
 #include "orbsvcs/CosNotificationC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void)
   : max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
   , max_consumers_ (CosNotification::MaxConsumers, 0)
@@ -88,3 +90,5 @@ TAO_Notify_AdminProperties::queue_full (void)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index 0361cfc5d46..163e22dc13c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -14,16 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PropertySeq.h"
-#include "Property_T.h"
-#include "Property.h"
-#include "Property_Boolean.h"
+#include "orbsvcs/Notify/PropertySeq.h"
+#include "orbsvcs/Notify/Property_T.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Property_Boolean.h"
 
 #include "tao/orbconf.h"
 
@@ -31,6 +31,8 @@
 #include "ace/Bound_Ptr.h"
 #include "ace/Condition_Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_AdminProperties
  *
@@ -120,8 +122,10 @@ protected:
 };
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "AdminProperties.inl"
+#include "orbsvcs/Notify/AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index e88a34cec6a..bc93ae89184 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const TAO_Notify_Property_Long&
 TAO_Notify_AdminProperties::max_global_queue_length (void) const
 {
@@ -77,3 +81,5 @@ TAO_Notify_AdminProperties::suppliers (void)
 {
   return this->suppliers_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
index da60c80fa33..e7b1b61ea8a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
@@ -3,7 +3,7 @@
 #define ALLOC_TRACKER_H
 #include /**/"ace/pre.h"
 
-#include "notify_export.h"
+#include "orbsvcs/Notify/notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -72,7 +72,7 @@ private:
 };
 } //namespace
 #define ACE_WIN32_HEAP_MONITOR(name) \
-  CrtHeapDumper heap_check___(name); \
+  CRT::CrtHeapDumper heap_check___(name); \
   ACE_UNUSED_ARG (heap_check___)
 #else // _MSC_VER etc
  #define ACE_WIN32_HEAP_MONITOR(name)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 2f09a9836a1..2c47a4225ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "AnyEvent.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
 
 ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
 
-#include "../Consumer.h"
+#include "orbsvcs/Notify/Consumer.h"
 
 #include "tao/corba.h"
 #include "tao/debug.h"
@@ -14,6 +14,8 @@ ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_EventType TAO_Notify_AnyEvent_No_Copy::event_type_;
 
 TAO_Notify_AnyEvent_No_Copy::TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event)
@@ -92,7 +94,7 @@ TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSuppli
 void
 TAO_Notify_AnyEvent_No_Copy::marshal (TAO_OutputCDR & cdr) const
 {
-  static const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY;
+  const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY;
   cdr.write_octet (ANY_CODE);
   cdr << (*this->event_);
 }
@@ -122,7 +124,7 @@ TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 }
 
 
-/*****************************************************************************************************/
+/*****************************************************************************/
 
 TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event)
   : TAO_Notify_AnyEvent_No_Copy (event)
@@ -134,3 +136,5 @@ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event)
 TAO_Notify_AnyEvent::~TAO_Notify_AnyEvent ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index a66d994474c..49c5604065f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -14,17 +14,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "../Event.h"
-#include "../EventType.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/EventType.h"
 
 #include "orbsvcs/CosNotificationC.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Consumer;
 class TAO_Notify_AnyEvent;
 /**
@@ -81,14 +84,15 @@ protected:
 
 protected:
 
-  /// Any Event
+  // This must be a pointer rather than a reference, because the derived
+  // class needs to redirect it to a new copy
   const CORBA::Any* event_;
 
   /// Our event type.
   static TAO_Notify_EventType event_type_;
 };
 
-/*****************************************************************************************************/
+/****************************************************************************/
 
 /**
  * @class TAO_Notify_AnyEvent
@@ -110,6 +114,8 @@ protected:
   CORBA::Any any_copy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_ANYEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index a68926d13da..bcaef713001 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "CosEC_ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
-#include "../AdminProperties.h"
-#include "../Method_Request_Lookup.h"
-#include "../Worker_Task.h"
-#include "AnyEvent.h"
-#include "PushSupplier.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Method_Request_Lookup.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
+#include "orbsvcs/Notify/Any/PushSupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void)
 {
@@ -84,3 +86,5 @@ TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const
 {
   return "ec_proxy_push_consumer";
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 47dfb5c400f..4690fc1fcdd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "../ProxyConsumer_T.h"
+#include "orbsvcs/Notify/ProxyConsumer_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_CosEC_ProxyPushConsumer
  *
@@ -73,6 +75,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index b6bc7eaffcc..694b6c378b5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "CosEC_ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "PushConsumer.h"
+#include "orbsvcs/Notify/Any/PushConsumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void)
 {
@@ -59,3 +61,5 @@ TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const
 {
   return "ec_proxy_push_supplier";
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index a216d9f9527..0858c51475e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "../ProxySupplier_T.h"
+#include "orbsvcs/Notify/ProxySupplier_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Serv_Export
 TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
@@ -76,6 +78,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 4101bd52b2f..2ae0cda9608 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
-#include "../AdminProperties.h"
-#include "../Properties.h"
-#include "AnyEvent.h"
-#include "PushSupplier.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
+#include "orbsvcs/Notify/Any/PushSupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void)
 {
@@ -21,7 +23,6 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer ()
 void
 TAO_Notify_ProxyPushConsumer::release (void)
 {
-
   delete this;
   //@@ inform factory
 }
@@ -99,29 +100,35 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
-  {
-    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-    {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::PushSupplier_var ps =
-        CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      // minor hack: suppress generating subscription updates during reload.
-      bool save_updates = this->updates_off_;
-      this->updates_off_ = true;
-      this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->updates_off_ = save_updates;
-    }
-    ACE_CATCHALL
+  if (attrs.load("PeerIOR", ior))
     {
-      ACE_ASSERT(0);
+      CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          ACE_TRY_CHECK;
+          CosNotifyComm::PushSupplier_var ps = CosNotifyComm::PushSupplier::_nil();
+          if ( ior.length() > 0 )
+            {
+              CORBA::Object_var obj =
+                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+          // minor hack: suppress generating subscription updates during reload.
+          bool save_updates = this->updates_off_;
+          this->updates_off_ = true;
+          this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          this->updates_off_ = save_updates;
+        }
+      ACE_CATCHALL
+        {
+          ACE_ASSERT(0);
+        }
+      ACE_ENDTRY;
     }
-    ACE_ENDTRY;
-  }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 1766a878f1a..5d7bb8b4b8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -14,20 +14,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "../ProxyConsumer_T.h"
+#include "orbsvcs/Notify/ProxyConsumer_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_ProxyPushConsumer
  *
@@ -84,6 +86,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index 10180736830..d478b3253cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "PushConsumer.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Any/PushConsumer.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void)
 {
@@ -19,7 +21,6 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier ()
 void
 TAO_Notify_ProxyPushSupplier::release (void)
 {
-
   delete this;
   //@@ inform factory
 }
@@ -79,24 +80,31 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
-  {
-    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+  if (attrs.load("PeerIOR", ior))
     {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::PushConsumer_var pc =
-        CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          CosNotifyComm::PushConsumer_var pc =
+            CosNotifyComm::PushConsumer::_nil();
+          if (ior.length() > 0)
+            {
+              CORBA::Object_var obj =
+                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+          this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          // if we can't reconnect, tough...
+        }
+      ACE_ENDTRY;
     }
-    ACE_CATCHANY
-    {
-      // if we can't reconnect, tough...
-    }
-    ACE_ENDTRY;
-  }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 82dd07722ad..e9450202c1c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,13 +23,15 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/Event_ForwarderS.h"
 
-#include "../ProxySupplier_T.h"
+#include "orbsvcs/Notify/ProxySupplier_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Serv_Export
 TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
@@ -85,6 +87,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index a912b7f5706..8048c1dcaa5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "PushConsumer.h"
+#include "orbsvcs/Notify/Any/PushConsumer.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_PushConsumer,
@@ -8,8 +8,10 @@ ACE_RCSID (Notify,
 
 #include "ace/Bound_Ptr.h"
 #include "orbsvcs/CosEventCommC.h"
-#include "../Event.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
   :TAO_Notify_Consumer (proxy)
@@ -21,15 +23,25 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
 }
 
 void
-TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
+                               ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT ( push_consumer != 0 && this->push_consumer_.in() == 0 );
+  // Initialize only once
+  ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
+
+  // push_consumer not optional
+  if (CORBA::is_nil (push_consumer))
+  {
+    ACE_THROW (CORBA::BAD_PARAM());
+  }
 
   this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
 
   ACE_TRY
     {
-      this->publish_ = CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
+      this->publish_ =
+        CosNotifyComm::NotifyPublish::_narrow (push_consumer
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -71,25 +83,22 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_
   // TODO exception?
 }
 
-
-
-bool
-TAO_Notify_PushConsumer::get_ior (ACE_CString & iorstr) const
+ACE_CString
+TAO_Notify_PushConsumer::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
-  }
+    {
+      CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      result = static_cast<const char*> (ior.in ());
+    }
   ACE_CATCHANY
-  {
-    ACE_ASSERT(0);
-  }
+    {
+      result.fast_clear();
+    }
   ACE_ENDTRY;
   return result;
 }
@@ -98,9 +107,12 @@ void
 TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
     ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_PushConsumer* tmp = dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
+  TAO_Notify_PushConsumer* tmp =
+    dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
   ACE_ASSERT(tmp != 0);
   this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->schedule_timer(false);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index b159ad6e702..b6d8a5827e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -13,14 +13,16 @@
 #define TAO_Notify_PUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "../Consumer.h"
+#include "orbsvcs/Notify/Consumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_PushConsumer
@@ -40,7 +42,6 @@ public:
   /// Init
   void init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
 
-
   /// Push <event> to this consumer.
 //  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
@@ -54,7 +55,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -71,5 +72,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index a554c4cc2cc..e60246795e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "PushSupplier.h"
+#include "orbsvcs/Notify/Any/PushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$")
-#include "../Properties.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -17,8 +19,8 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 void
 TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
-
+  // TODO: verify single init call
+  // push_supplier is optional
   this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier);
 
   ACE_TRY
@@ -39,23 +41,25 @@ TAO_Notify_PushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
-bool
-TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const
+
+ACE_CString
+TAO_Notify_PushSupplier::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT(0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 9c5cf56d9bc..47b7c94d0a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_PUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,7 +21,9 @@
 
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "../Supplier.h"
+#include "orbsvcs/Notify/Supplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ProxyConsumer;
 
@@ -43,9 +45,8 @@ public:
   /// Init
   void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
-
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
 protected:
   /// The Supplier
@@ -56,5 +57,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
index b63c36326cc..fd77791b525 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
-#include "Bit_Vector.h"
+#include "orbsvcs/Notify/Bit_Vector.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
@@ -108,3 +110,5 @@ Bit_Vector::find_first_bit_of(const size_t location, bool set)
 }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
index b9f090dac6d..46f668814bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,17 +15,20 @@
 #ifndef BIT_VECTOR_H
 #define BIT_VECTOR_H
 #include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
+#include "tao/Versioned_Namespace.h"
 
 #include "ace/Vector_T.h"
 #include "ace/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -72,5 +75,7 @@ private:
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* BIT_VECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 500df2b2925..08b6a810187 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "Buffering_Strategy.h"
+#include "orbsvcs/Notify/Buffering_Strategy.h"
 
 ACE_RCSID (Notify, Buffering_Strategy, "$Id$")
 
 
-#include "Method_Request.h"
-#include "Notify_Extensions.h"
-#include "QoSProperties.h"
-#include "Notify_Extensions.h"
+#include "orbsvcs/Notify/Method_Request.h"
+#include "orbsvcs/Notify/Notify_Extensions.h"
+#include "orbsvcs/Notify/QoSProperties.h"
+#include "orbsvcs/Notify/Notify_Extensions.h"
 
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -17,22 +17,24 @@ ACE_RCSID (Notify, Buffering_Strategy, "$Id$")
 
 #include "ace/Message_Queue.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy (
   TAO_Notify_Message_Queue& msg_queue,
-  TAO_Notify_AdminProperties::Ptr& admin_properties)
-  : msg_queue_ (msg_queue)
-  , admin_properties_ (admin_properties)
-  , global_queue_lock_ (admin_properties->global_queue_lock ())
-  , global_queue_length_ (admin_properties->global_queue_length ())
-  , max_queue_length_ (admin_properties->max_global_queue_length ())
-  , order_policy_ (CosNotification::OrderPolicy, CosNotification::AnyOrder)
-  , discard_policy_ (CosNotification::DiscardPolicy, CosNotification::AnyOrder)
-  , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer)
-  , blocking_policy_ (TAO_Notify_Extensions::BlockingPolicy)
-  , global_not_full_ (admin_properties->global_queue_not_full())
-  , local_not_full_ (global_queue_lock_)
-  , local_not_empty_ (global_queue_lock_)
-  , shutdown_ (false)
+  const TAO_Notify_AdminProperties::Ptr& admin_properties)
+: msg_queue_ (msg_queue)
+, admin_properties_ (admin_properties)
+, global_queue_lock_ (admin_properties->global_queue_lock ())
+, global_queue_length_ (admin_properties->global_queue_length ())
+, max_queue_length_ (admin_properties->max_global_queue_length ())
+, order_policy_ (CosNotification::OrderPolicy, CosNotification::AnyOrder)
+, discard_policy_ (CosNotification::DiscardPolicy, CosNotification::AnyOrder)
+, max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer)
+, blocking_policy_ (TAO_Notify_Extensions::BlockingPolicy)
+, global_not_full_ (admin_properties->global_queue_not_full())
+, local_not_full_ (global_queue_lock_)
+, local_not_empty_ (global_queue_lock_)
+, shutdown_ (false)
 {
 }
 
@@ -42,7 +44,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy ()
 
 void
 TAO_Notify_Buffering_Strategy::update_qos_properties
-(const TAO_Notify_QoSProperties& qos_properties)
+  (const TAO_Notify_QoSProperties& qos_properties)
 {
   this->order_policy_.set (qos_properties);
   this->discard_policy_.set (qos_properties);
@@ -68,7 +70,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void)
 }
 
 int
-TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable& method_request)
+TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* method_request)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
@@ -84,54 +86,56 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable& met
     this->global_queue_length_ >= this->max_queue_length_.value ();
 
   while (local_overflow || global_overflow)
-  {
-    if (blocking_policy_.is_valid())
     {
-      ACE_Time_Value timeout;
-      ORBSVCS_Time::TimeT_to_Time_Value(timeout, blocking_policy_.value());
-      // Condition variables take an absolute time
-      timeout += ACE_OS::gettimeofday();
-      if (local_overflow)
-      {
-        local_not_full_.wait(&timeout);
-      }
-      else
-      {
-        global_not_full_.wait(&timeout);
-      }
-      if (errno != ETIME)
-      {
-        local_overflow = this->max_events_per_consumer_.is_valid() &&
-          static_cast <CORBA::Long> (this->msg_queue_.message_count ()) >= this->max_events_per_consumer_.value();
-        global_overflow = this->max_queue_length_.value () != 0 &&
-          this->global_queue_length_ >= this->max_queue_length_.value ();
-        continue;
-      }
+      if (blocking_policy_.is_valid())
+        {
+          ACE_Time_Value timeout;
+          ORBSVCS_Time::TimeT_to_Time_Value(timeout, blocking_policy_.value());
+          // Condition variables take an absolute time
+          timeout += ACE_OS::gettimeofday();
+          if (local_overflow)
+            {
+              local_not_full_.wait(&timeout);
+            }
+          else
+            {
+              global_not_full_.wait(&timeout);
+            }
+          if (errno != ETIME)
+            {
+              local_overflow =
+                this->max_events_per_consumer_.is_valid() &&
+                static_cast <CORBA::Long> (this->msg_queue_.message_count ()) >= this->max_events_per_consumer_.value();
+              global_overflow =
+                this->max_queue_length_.value () != 0 &&
+                this->global_queue_length_ >= this->max_queue_length_.value ();
+              continue;
+            }
+        }
+
+      discarded_existing = this->discard(method_request);
+      if (discarded_existing)
+        {
+          --this->global_queue_length_;
+          local_not_full_.signal();
+          global_not_full_.signal();
+        }
+      break;
     }
 
-    discarded_existing = this->discard(method_request);
-    if (discarded_existing)
-    {
-      --this->global_queue_length_;
-      local_not_full_.signal();
-      global_not_full_.signal();
-    }
-    break;
-  }
-
   if (! (local_overflow || global_overflow) || discarded_existing)
-  {
-    if (this->queue (method_request) == -1)
     {
-      if (! this->shutdown_)
-        ACE_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! failed to enqueue event\n"));
-      return -1;
-    }
+      if (this->queue (method_request) == -1)
+        {
+          ACE_DEBUG((LM_DEBUG,
+                     "Notify (%P|%t) - Panic! failed to enqueue event\n"));
+          return -1;
+        }
 
-    ++this->global_queue_length_;
+      ++this->global_queue_length_;
 
-    local_not_empty_.signal ();
-  }
+      local_not_empty_.signal ();
+    }
   return this->msg_queue_.message_count ();
 }
 
@@ -146,15 +150,15 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me
     return -1;
 
   while (this->msg_queue_.message_count () == 0)
-  {
-    this->local_not_empty_.wait (abstime);
+    {
+      this->local_not_empty_.wait (abstime);
 
-    if (this->shutdown_)
-      return -1;
+      if (this->shutdown_)
+        return -1;
 
-    if (errno == ETIME)
-      return 0;
-  }
+      if (errno == ETIME)
+        return 0;
+    }
 
   if (this->msg_queue_.dequeue (mb) == -1)
     return -1;
@@ -172,7 +176,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me
 }
 
 int
-TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable& method_request)
+TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable* method_request)
 {
   if ( this->shutdown_ )
     return -1;
@@ -180,80 +184,83 @@ TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable& metho
   CORBA::Short order = this->order_policy_.value();
 
   if (! this->order_policy_.is_valid() ||
-    order == CosNotification::AnyOrder ||
-    order == CosNotification::FifoOrder)
-  {
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n"));
-    return this->msg_queue_.enqueue_tail (&method_request);
-  }
+      order == CosNotification::AnyOrder ||
+      order == CosNotification::FifoOrder)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n"));
+      return this->msg_queue_.enqueue_tail (method_request);
+    }
 
   if (order == CosNotification::PriorityOrder)
-  {
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n"));
-    return this->msg_queue_.enqueue_prio (&method_request);
-  }
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n"));
+      return this->msg_queue_.enqueue_prio (method_request);
+    }
 
   if (order == CosNotification::DeadlineOrder)
-  {
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n"));
-    return this->msg_queue_.enqueue_deadline (&method_request);
-  }
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n"));
+      return this->msg_queue_.enqueue_deadline (method_request);
+    }
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n"));
-  return this->msg_queue_.enqueue_tail (&method_request);
+  return this->msg_queue_.enqueue_tail (method_request);
 }
 
 bool
-TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable& method_request)
+TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* method_request)
 {
   if (this->shutdown_)
-  {
-    return false;
-  }
+    {
+      return false;
+    }
 
   ACE_Message_Block* mb = 0;
   int result = -1;
+
   if (this->discard_policy_.is_valid() == 0 ||
-    this->discard_policy_ == CosNotification::AnyOrder ||
-    this->discard_policy_ == CosNotification::FifoOrder)
-  {
-    result = this->msg_queue_.dequeue_head (mb);
-  }
+      this->discard_policy_ == CosNotification::AnyOrder ||
+      this->discard_policy_ == CosNotification::FifoOrder)
+    {
+      result = this->msg_queue_.dequeue_head (mb);
+    }
   else if (this->discard_policy_ == CosNotification::LifoOrder)
-  {
-    // The most current message is NOT the newest one in the queue. It's
-    // the one we're about to add to the queue.
-    result = -1;
-  }
+    {
+      // The most current message is NOT the newest one in the queue. It's
+      // the one we're about to add to the queue.
+      result = -1;
+    }
   else if (this->discard_policy_ == CosNotification::DeadlineOrder)
-  {
-    result = this->msg_queue_.dequeue_deadline (mb);
-  }
+    {
+      result = this->msg_queue_.dequeue_deadline (mb);
+    }
   else if (this->discard_policy_ == CosNotification::PriorityOrder)
-  {
-    result = this->msg_queue_.dequeue_prio (mb);
-    if (mb->msg_priority() >= method_request.msg_priority())
     {
-      this->msg_queue_.enqueue_prio (mb);
-      result = -1;
+      result = this->msg_queue_.dequeue_prio (mb);
+      if (mb->msg_priority() >= method_request->msg_priority())
+        {
+          this->msg_queue_.enqueue_prio (mb);
+          result = -1;
+        }
     }
-  }
   else
-  {
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n"));
-    result = this->msg_queue_.dequeue_head (mb);
-  }
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n"));
+      result = this->msg_queue_.dequeue_head (mb);
+    }
 
   if (result != -1)
-  {
-    ACE_Message_Block::release (mb);
-    return true;
-  }
+    {
+      ACE_Message_Block::release (mb);
+      return true;
+    }
 
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index dce50b6cc63..7baa636a2d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,9 +25,11 @@
 
 #include "orbsvcs/TimeBaseC.h"
 
-#include "Property.h"
-#include "Property_T.h"
-#include "AdminProperties.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Property_T.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Method_Request_Queueable;
 class TAO_Notify_QoSProperties;
@@ -44,8 +46,8 @@ class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy
 {
 public:
   TAO_Notify_Buffering_Strategy (
-      TAO_Notify_Message_Queue& msg_queue,
-    TAO_Notify_AdminProperties::Ptr& admin_properties);
+    TAO_Notify_Message_Queue& msg_queue,
+    const TAO_Notify_AdminProperties::Ptr& admin_properties);
 
   ~TAO_Notify_Buffering_Strategy ();
 
@@ -53,12 +55,11 @@ public:
   /// Order Policy
   /// Discard Policy
   /// MaxEventsPerConsumer
-  /// TAO_Notify_Extensions::BlockingPolicy
   void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Enqueue according the enqueing strategy.
   /// Return -1 on error else the number of items in the queue.
-  int enqueue (TAO_Notify_Method_Request_Queueable& method_request);
+  int enqueue (TAO_Notify_Method_Request_Queueable* method_request);
 
   /// Dequeue batch. This method will block for @a abstime if non-zero or else blocks till an item is available.
   /// Return -1 on error or if nothing is available, else the number of items actually dequeued (1).
@@ -71,10 +72,10 @@ public:
 private:
 
   /// Apply the Order Policy and queue. return -1 on error.
-  int queue (TAO_Notify_Method_Request_Queueable& method_request);
+  int queue (TAO_Notify_Method_Request_Queueable* method_request);
 
   /// Discard as per the Discard Policy.
-  bool discard (TAO_Notify_Method_Request_Queueable& method_request);
+  bool discard (TAO_Notify_Method_Request_Queueable* method_request);
 
   ///= Data Members
 
@@ -113,6 +114,8 @@ private:
   bool shutdown_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_BUFFERING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index d6b4fdb7318..bab9d61ecf0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "Builder.h"
+#include "orbsvcs/Notify/Builder.h"
 
 ACE_RCSID (Notify,
            Builder,
@@ -9,32 +9,34 @@ ACE_RCSID (Notify,
 
 #include "tao/PortableServer/PortableServerC.h"
 
-#include "Factory.h"
-#include "Properties.h"
-#include "POA_Helper.h"
-#include "ID_Factory.h"
-#include "EventChannelFactory.h"
-#include "EventChannel.h"
-#include "SupplierAdmin.h"
-#include "ConsumerAdmin.h"
-#include "Worker_Task.h"
-#include "Reactive_Task.h"
-#include "ThreadPool_Task.h"
-#include "FilterFactory.h"
-#include "Object.h"
-#include "EventType.h"
-#include "Event.h"
-#include "Any/AnyEvent.h"
-#include "Any/ProxyPushConsumer.h"
-#include "Any/ProxyPushSupplier.h"
-#include "Any/CosEC_ProxyPushConsumer.h"
-#include "Any/CosEC_ProxyPushSupplier.h"
-#include "Structured/StructuredProxyPushConsumer.h"
-#include "Structured/StructuredProxyPushSupplier.h"
-#include "Sequence/SequenceProxyPushConsumer.h"
-#include "Sequence/SequenceProxyPushSupplier.h"
-#include "ETCL_FilterFactory.h"
-#include "Container_T.h"
+#include "orbsvcs/Notify/Factory.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/POA_Helper.h"
+#include "orbsvcs/Notify/ID_Factory.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Reactive_Task.h"
+#include "orbsvcs/Notify/ThreadPool_Task.h"
+#include "orbsvcs/Notify/FilterFactory.h"
+#include "orbsvcs/Notify/Object.h"
+#include "orbsvcs/Notify/EventType.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
+#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
+#include "orbsvcs/Notify/ETCL_FilterFactory.h"
+#include "orbsvcs/Notify/Container_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY_IMPL,
           class PROXY,
@@ -586,3 +588,5 @@ TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const
   // No lane support
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index 737026ad329..7ed2c219c65 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,11 +23,12 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/NotifyExtC.h"
 
-#include "AdminProperties.h"
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Topology_Object.h"
 
 #include "tao/PortableServer/PortableServer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_EventChannelFactory;
 class TAO_Notify_EventChannel;
@@ -167,6 +168,8 @@ public:
     );
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 2941ca9bbc9..7b19b418ebc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "Consumer.h"
+#include "orbsvcs/Notify/Consumer.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Consumer.inl"
+#include "orbsvcs/Notify/Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$")
 
-#include "Timer.h"
-#include "ProxySupplier.h"
-#include "Method_Request_Event.h"
+#include "orbsvcs/Notify/Timer.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Method_Request_Event.h"
 
 #include "orbsvcs/Time_Utilities.h"
 
@@ -20,20 +20,21 @@ ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$")
 #include "ace/Bound_Ptr.h"
 #include "ace/Unbounded_Queue.h"
 
-//#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
 static const int DEFAULT_RETRY_TIMEOUT = 10;//120; // Note : This should be a config param or qos setting
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy)
-  : proxy_ (proxy)
-  , is_suspended_ (0)
-  , pacing_ (proxy->qos_properties_.pacing_interval ())
-  , max_batch_size_ (CosNotification::MaximumBatchSize, 0)
-  , timer_id_ (-1)
-  , timer_ (0)
+: proxy_ (proxy)
+, is_suspended_ (0)
+, pacing_ (proxy->qos_properties_.pacing_interval ())
+, max_batch_size_ (CosNotification::MaximumBatchSize, 0)
+, timer_id_ (-1)
+, timer_ (0)
 {
   Request_Queue* pending_events = 0;
   ACE_NEW (pending_events, TAO_Notify_Consumer::Request_Queue ());
@@ -45,10 +46,10 @@ TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy)
 TAO_Notify_Consumer::~TAO_Notify_Consumer ()
 {
   if (this->timer_.isSet())
-    {
-      this->cancel_timer ();
-      this->timer_.reset ();
-    }
+  {
+    this->cancel_timer ();
+    this->timer_.reset ();
+  }
 }
 
 TAO_Notify_Proxy*
@@ -76,12 +77,13 @@ TAO_Notify_Consumer::enqueue_request (
   TAO_Notify_Method_Request_Event * request
   ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Event::Ptr event_var (
-    request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
+  TAO_Notify_Event::Ptr event (
+    request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
+
   TAO_Notify_Method_Request_Event_Queueable * queue_entry;
   ACE_NEW_THROW_EX (queue_entry,
-    TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+    TAO_Notify_Method_Request_Event_Queueable (*request, event),
     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -101,18 +103,20 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock (), false);
   if (! this->pending_events().is_empty ())
     {
-      if (DEBUG_LEVEL > 3)ACE_DEBUG ( (LM_DEBUG,
-        ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        request->sequence ()
-          ));
-      TAO_Notify_Event::Ptr event_var (
-        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
+      if (DEBUG_LEVEL > 3)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    request->sequence ()
+                    ));
+      TAO_Notify_Event::Ptr event (
+        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK_RETURN (false);
       TAO_Notify_Method_Request_Event_Queueable * queue_entry;
       ACE_NEW_THROW_EX (queue_entry,
-        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
-        CORBA::NO_MEMORY ());
+                        TAO_Notify_Method_Request_Event_Queueable (*request,
+                                                                   event),
+                        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
@@ -120,18 +124,20 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
     }
   if (this->is_suspended_ == 1)
     {
-      if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG,
-        ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        request->sequence ()
-        ));
-      TAO_Notify_Event::Ptr event_var (
-        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
+      if (DEBUG_LEVEL > 3)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    request->sequence ()
+                    ));
+      TAO_Notify_Event::Ptr event (
+        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK_RETURN (false);
       TAO_Notify_Method_Request_Event_Queueable * queue_entry;
       ACE_NEW_THROW_EX (queue_entry,
-        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
-        CORBA::NO_MEMORY ());
+                        TAO_Notify_Method_Request_Event_Queueable (*request,
+                                                                   event),
+                        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
@@ -141,7 +147,8 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
 }
 
 void
-TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
+                              ACE_ENV_ARG_DECL)
 {
   // Increment reference counts (safely) to prevent this object and its proxy
   // from being deleted while the push is in progress.
@@ -152,56 +159,62 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_
     {
       DispatchStatus status = this->dispatch_request (request);
       switch (status)
-      {
-        case DISPATCH_SUCCESS:
         {
-          request->complete ();
-          break;
-        }
+        case DISPATCH_SUCCESS:
+          {
+            request->complete ();
+            break;
+          }
         case DISPATCH_RETRY:
-        {
-          if (DEBUG_LEVEL > 1) ACE_DEBUG ( (LM_DEBUG,
-            ACE_TEXT ("Consumer %d enqueing event %d due to failed dispatch.\n"),
-            static_cast<int> (this->proxy ()->id ()),
-            request->sequence ()));
-          this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->schedule_timer (true);
-          break;
-        }
+          {
+            if (DEBUG_LEVEL > 1)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("Consumer %d enqueing event %d due ")
+                          ACE_TEXT ("to failed dispatch.\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
+            this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
+            ACE_CHECK;
+            this->schedule_timer (true);
+            break;
+          }
         case DISPATCH_DISCARD:
-        {
-          if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
-            ACE_TEXT ("(%P|%t) Consumer %d: Error during direct dispatch. Discarding event:%d.\n"),
-            static_cast<int> (this->proxy ()->id ()),
-            request->sequence ()
-            ));
-          request->complete ();
-          break;
-        }
-        case DISPATCH_FAIL:
-        {
-          if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
-            ACE_TEXT ("(%P|%t) Consumer %d: Failed during direct dispatch :%d. Discarding event.\n"),
-            static_cast<int> (this->proxy ()->id ()),
-            request->sequence ()
-            ));
-          request->complete ();
-          ACE_DECLARE_NEW_ENV;
-          ACE_TRY
           {
-            this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            if (DEBUG_LEVEL  > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Consumer %d: Error during "
+                                    "direct dispatch. Discarding event:%d.\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()
+                          ));
+            request->complete ();
+            break;
           }
-          ACE_CATCHANY
+        case DISPATCH_FAIL:
           {
-            // todo is there something meaningful we can do here?
-            ;
+            if (DEBUG_LEVEL  > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Consumer %d: Failed during "
+                                    "direct dispatch :%d. Discarding event.\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()
+                          ));
+            request->complete ();
+            ACE_DECLARE_NEW_ENV;
+            ACE_TRY
+              {
+                this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
+            ACE_CATCHANY
+              {
+                // todo is there something meaningful we can do here?
+                ;
+              }
+            ACE_ENDTRY;
+            break;
           }
-          ACE_ENDTRY;
-          break;
         }
-      }
     }
 }
 
@@ -211,99 +224,133 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
   DispatchStatus result = DISPATCH_SUCCESS;
   ACE_DECLARE_NEW_ENV;
   ACE_TRY
-  {
-    request->event ()->push (this ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    if (DEBUG_LEVEL  > 8) ACE_DEBUG ( (LM_DEBUG,
-      ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
-      static_cast<int> (this->proxy ()->id ()),
-      request->sequence ()
-      ));
-  }
+    {
+      request->event ()->push (this ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      if (DEBUG_LEVEL  > 8)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    request->sequence ()
+                    ));
+    }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-  {
-    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
-        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) OBJECT_NOT_EXIST %s\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        ex._info ().c_str ()
-        ));
-    result = DISPATCH_FAIL;
-  }
+    {
+      if (DEBUG_LEVEL  > 0)
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
+                                "(request) %s\n"),
+                      static_cast<int> (this->proxy ()->id ()),
+                      ex._info ().c_str ()
+                      ));
+        }
+      result = DISPATCH_FAIL;
+    }
   ACE_CATCH (CORBA::TRANSIENT, ex)
-  {
-    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
-        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Transient (minor=%d) %s\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        ex.minor (),
-        ex._info ().c_str ()
-        ));
-    const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u;
-    switch (ex.minor () & 0xfffff000u)
-      {
-      case CORBA::OMGVMCID:
-        switch (ex.minor () & 0x00000fffu)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
+                              "(request) Transient (minor=%d) %s\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    ex.minor (),
+                    ex._info ().c_str ()
+                    ));
+      const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u;
+      switch (ex.minor () & 0xfffff000u)
         {
-        case 2: // No usable profile
-        case 3: // Request cancelled
-        case 4: // POA destroyed
-          result = DISPATCH_FAIL;
+        case CORBA::OMGVMCID:
+          switch (ex.minor () & 0x00000fffu)
+            {
+            case 2: // No usable profile
+            case 3: // Request cancelled
+            case 4: // POA destroyed
+              result = DISPATCH_FAIL;
+              break;
+            default:
+              result = DISPATCH_DISCARD;
+            }
           break;
+
+        case TAO::VMCID:
         default:
-          result = DISPATCH_DISCARD;
+          switch (ex.minor () & BITS_5_THRU_12_MASK)
+            {
+            case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+              result = DISPATCH_FAIL;
+              break;
+            case TAO_POA_DISCARDING:
+            case TAO_POA_HOLDING:
+            default:
+              result = DISPATCH_RETRY;
+            } break;
         }
-        break;
-
-      case TAO::VMCID:
-      default:
-        switch (ex.minor () & BITS_5_THRU_12_MASK)
-          {
-          case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
-            result = DISPATCH_FAIL;
-            break;
-          case TAO_POA_DISCARDING:
-          case TAO_POA_HOLDING:
-          default:
-            result = DISPATCH_RETRY;
-          } break;
-            }
-
-  }
+    }
+  ACE_CATCH (CORBA::TIMEOUT, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push "
+                              "(request) %s\n"),
+                    this->proxy ()->id (),
+                    ex._info().c_str ()
+                    ));
+      result = DISPATCH_FAIL;
+    }
+  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push "
+                              "(request) %s\n"),
+                    this->proxy ()->id (),
+                    ex._info().c_str ()
+                    ));
+      result = DISPATCH_FAIL;
+    }
   ACE_CATCH (CORBA::SystemException, ex)
-  {
-    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
-        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) SystemException %s\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        ex._info ().c_str ()
-        ));
-    result = DISPATCH_DISCARD;
-  }
+    {
+      if (DEBUG_LEVEL  > 0)
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
+                                "(request) SystemException %s\n"),
+                      static_cast<int> (this->proxy ()->id ()),
+                      ex._info ().c_str ()
+                      ));
+        }
+      result = DISPATCH_DISCARD;
+    }
   ACE_CATCHANY
-  {
-    ACE_ERROR ( (LM_ERROR,
-      ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Caught unexpected exception pushing event to consumer.\n"),
-      static_cast<int> (this->proxy ()->id ())
-      ));
-    result = DISPATCH_DISCARD;
-  }
+    {
+      ACE_ERROR ( (LM_ERROR,
+                   ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
+                             "(request) Caught unexpected exception "
+                             "pushing event to consumer.\n"),
+                   static_cast<int> (this->proxy ()->id ())
+                   ));
+      result = DISPATCH_DISCARD;
+    }
   ACE_ENDTRY;
 
   // for persistent events that haven't timed out
   // convert "FAIL" & "DISCARD" to "RETRY"
   // for transient events, convert RETRY to DISCARD (hey, best_effort.)
   if (result == DISPATCH_FAIL || result == DISPATCH_DISCARD)
-  {
-    if (request->should_retry ())
     {
-      result = DISPATCH_RETRY;
+      if (request->should_retry ())
+        {
+          result = DISPATCH_RETRY;
+        }
     }
-  }
   else if (result == DISPATCH_RETRY)
-  {
-    if (! request->should_retry ())
     {
-      result = DISPATCH_DISCARD;
+      if (! request->should_retry ())
+        {
+          result = DISPATCH_DISCARD;
+        }
     }
-  }
 
   return result;
 }
@@ -311,51 +358,122 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
 TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
 {
+  DispatchStatus result = DISPATCH_SUCCESS;
   ACE_DECLARE_NEW_ENV;
   ACE_TRY
-  {
-    this->push (batch ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
-  {
-    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
-        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch OBJECT_NOT_EXIST %s\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        not_exist._info ().c_str ()
-        ));
-    return DISPATCH_FAIL;
-  }
+    {
+      this->push (batch ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                              "%d::dispatch_batch() %s\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    ex._info ().c_str ()
+                    ));
+      result = DISPATCH_FAIL;
+    }
+  ACE_CATCH (CORBA::TRANSIENT, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                              "%d::dispatch_batch() Transient (minor=%d) %s\n"),
+                    static_cast<int> (this->proxy ()->id ()),
+                    ex.minor (),
+                    ex._info ().c_str ()
+                    ));
+      const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u;
+      switch (ex.minor () & 0xfffff000u)
+        {
+        case CORBA::OMGVMCID:
+          switch (ex.minor () & 0x00000fffu)
+            {
+            case 2: // No usable profile
+            case 3: // Request cancelled
+            case 4: // POA destroyed
+              result = DISPATCH_FAIL;
+              break;
+            default:
+              result = DISPATCH_DISCARD;
+            }
+          break;
+
+        case TAO::VMCID:
+        default:
+          switch (ex.minor () & BITS_5_THRU_12_MASK)
+            {
+            case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+              result = DISPATCH_FAIL;
+              break;
+            case TAO_POA_DISCARDING:
+            case TAO_POA_HOLDING:
+            default:
+              result = DISPATCH_RETRY;
+            } break;
+        }
+    }
+  ACE_CATCH (CORBA::TIMEOUT, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                              "%u::dispatch_batch() %s\n"),
+                    this->proxy ()->id (),
+                    ex._info().c_str ()
+                    ));
+      result = DISPATCH_FAIL;
+    }
+  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+    {
+      if (DEBUG_LEVEL  > 0)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                              "%u::dispatch_batch() %s\n"),
+                    this->proxy ()->id (),
+                    ex._info().c_str ()
+                    ));
+      result = DISPATCH_FAIL;
+    }
   ACE_CATCH (CORBA::SystemException, ex)
-  {
-    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
-        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch SystemException %s\n"),
-        static_cast<int> (this->proxy ()->id ()),
-        ex._info ().c_str ()
-        ));
-    // @@todo what to return here?
-    return DISPATCH_RETRY;
-  }
+    {
+      if (DEBUG_LEVEL  > 0)
+        {
+          ACE_DEBUG ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                                "%d::dispatch_batch() SystemException %s\n"),
+                      static_cast<int>  (this->proxy ()->id ()),
+                      ex._info ().c_str ()
+                      ));
+        }
+      result = DISPATCH_DISCARD;
+    }
   ACE_CATCHANY
-  {
-    ACE_ERROR ( (LM_ERROR,
-      ACE_TEXT ("(%P|%t) Consumer %d: Caught unexpected exception pushing EventBatch to consumer.\n"),
-      static_cast<int> (this->proxy ()->id ())
-      ));
-    return DISPATCH_FAIL;
-  }
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
+                            "%d::dispatch_batch() Caught unexpected "
+                            "exception pushing batch to consumer.\n"),
+                  static_cast<int> (this->proxy ()->id ())
+                  ));
+      result = DISPATCH_DISCARD;
+    }
   ACE_ENDTRY;
-  return DISPATCH_SUCCESS;
+  return result;
 }
 
 void
 TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
-    ACE_TEXT ("Consumer %d dispatching pending events.  Queue size: %d\n"),
-    static_cast<int> (this->proxy ()->id ()),
-    this->pending_events().size ()
-    ));
+  if (DEBUG_LEVEL  > 5)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("Consumer %d dispatching pending events.  Queue size: %d\n"),
+                static_cast<int> (this->proxy ()->id ()),
+                this->pending_events().size ()
+                ));
 
   // lock ourselves in memory for the duration
   TAO_Notify_Consumer::Ptr self_grd (this);
@@ -363,14 +481,16 @@ TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // dispatch events until: 1) the queue is empty; 2) the proxy shuts down, or 3) the dispatch fails
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
   bool ok = true;
-  while (ok && !this->proxy_supplier ()->has_shutdown () && !this->pending_events().is_empty ())
-  {
-    if (! dispatch_from_queue ( this->pending_events(), ace_mon))
+  while (ok
+         && !this->proxy_supplier ()->has_shutdown ()
+         && !this->pending_events().is_empty ())
     {
-      this->schedule_timer (true);
-      ok = false;
+      if (! dispatch_from_queue ( this->pending_events(), ace_mon))
+        {
+          this->schedule_timer (true);
+          ok = false;
+        }
     }
-  }
 }
 
 
@@ -381,82 +501,87 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
   bool result = true;
   TAO_Notify_Method_Request_Event_Queueable * request;
   if (requests.dequeue_head (request) == 0)
-  {
-    ace_mon.release ();
-    DispatchStatus status = this->dispatch_request (request);
-    switch (status)
     {
-      case DISPATCH_SUCCESS:
-      {
-        request->complete ();
-        request->release ();
-        result = true;
-        ace_mon.acquire ();
-        break;
-      }
-      case DISPATCH_RETRY:
-      {
-        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
-          ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
-          static_cast<int> (this->proxy ()->id ()),
-          request->sequence ()
-          ));
-        ace_mon.acquire ();
-        requests.enqueue_head (request); // put the failed event back where it was
-        result = false;
-        break;
-      }
-      case DISPATCH_DISCARD:
-      {
-        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
-          ACE_TEXT ("(%P|%t) Consumer %d: Error during dispatch. Discarding event:%d.\n"),
-          static_cast<int> (this->proxy ()->id ()),
-          request->sequence ()
-          ));
-        request->complete ();
-        ace_mon.acquire ();
-        result = true;
-        break;
-      }
-      case DISPATCH_FAIL:
-      {
-        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
-          ACE_TEXT ("(%P|%t) Consumer %d: Failed. Discarding event %d.\n"),
-          static_cast<int> (this->proxy ()->id ()),
-          request->sequence ()
-          ));
-        request->complete ();
-        ace_mon.acquire ();
-        while (requests.dequeue_head (request) == 0)
-        {
-          ace_mon.release ();
-          request->complete ();
-          ace_mon.acquire ();
-        }
-        ace_mon.release ();
-        ACE_DECLARE_NEW_ENV;
-        ACE_TRY
-        {
-          this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-        ACE_CATCHANY
+      ace_mon.release ();
+      DispatchStatus status = this->dispatch_request (request);
+      switch (status)
         {
-          // todo is there something reasonable to do here?
+        case DISPATCH_SUCCESS:
+          {
+            request->complete ();
+            request->release ();
+            result = true;
+            ace_mon.acquire ();
+            break;
+          }
+        case DISPATCH_RETRY:
+          {
+            if (DEBUG_LEVEL  > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()
+                          ));
+            ace_mon.acquire ();
+            requests.enqueue_head (request); // put the failed event back where it was
+            result = false;
+            break;
+          }
+        case DISPATCH_DISCARD:
+          {
+            if (DEBUG_LEVEL  > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Consumer %d: Error during "
+                                    "dispatch. Discarding event:%d.\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()
+                          ));
+            request->complete ();
+            ace_mon.acquire ();
+            result = true;
+            break;
+          }
+        case DISPATCH_FAIL:
+          {
+            if (DEBUG_LEVEL  > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) Consumer %d: Failed. "
+                                    "Discarding event %d.\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()
+                          ));
+            request->complete ();
+            ace_mon.acquire ();
+            while (requests.dequeue_head (request) == 0)
+              {
+                ace_mon.release ();
+                request->complete ();
+                ace_mon.acquire ();
+              }
+            ace_mon.release ();
+            ACE_DECLARE_NEW_ENV;
+            ACE_TRY
+              {
+                this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
+            ACE_CATCHANY
+              {
+                // todo is there something reasonable to do here?
+              }
+            ACE_ENDTRY;
+            ace_mon.acquire ();
+            result = true;
+            break;
+          }
+        default:
+          {
+            ace_mon.acquire ();
+            result = false;
+            break;
+          }
         }
-        ACE_ENDTRY;
-        ace_mon.acquire ();
-        result = true;
-        break;
-      }
-      default:
-      {
-        ace_mon.acquire ();
-        result = false;
-        break;
-      }
     }
-  }
   return result;
 }
 
@@ -466,14 +591,14 @@ void
 TAO_Notify_Consumer::schedule_timer (bool is_error)
 {
   if (this->timer_id_ != -1)
-  {
-    return; // We only want a single timeout scheduled.
-  }
+    {
+      return; // We only want a single timeout scheduled.
+    }
   // don't schedule timer if there's nothing that can be done
   if (this->is_suspended ())
-  {
-    return;
-  }
+    {
+      return;
+    }
 
   ACE_ASSERT (this->timer_.get() != 0);
 
@@ -483,43 +608,45 @@ TAO_Notify_Consumer::schedule_timer (bool is_error)
   ACE_Time_Value tv (DEFAULT_RETRY_TIMEOUT);
 
   if (! is_error)
-  {
-    if (this->pacing_.is_valid ())
     {
-      tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ());
+      if (this->pacing_.is_valid ())
+        {
+          tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ());
+        }
     }
-  }
 
-  if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
-    ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"),
-      static_cast<int> (this->proxy ()->id ()),
-      tv.msec ()));
+  if (DEBUG_LEVEL  > 5)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"),
+                  static_cast<int> (this->proxy ()->id ()), tv.msec ()));
+    }
 
-  this->timer_id_ = this->timer_->schedule_timer (
-    this,
-    tv,
-    ACE_Time_Value::zero);
+  this->timer_id_ =
+    this->timer_->schedule_timer (this, tv, ACE_Time_Value::zero);
   if (this->timer_id_ == -1)
-  {
-    ACE_ERROR ( (LM_ERROR,
-      ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () Error scheduling timer.\n"),
-      static_cast<int> (this->proxy ()->id ())
-      ));
-  }
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () "
+                            "Error scheduling timer.\n"),
+                  static_cast<int> (this->proxy ()->id ())
+                  ));
+    }
 }
 
 void
 TAO_Notify_Consumer::cancel_timer (void)
 {
   if (this->timer_.isSet() && this->timer_id_ != -1)
-  {
-    if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
-      ACE_TEXT ("Consumer %d canceling dispatch timer.\n"),
-      static_cast<int> (this->proxy ()->id ())
-      ));
+    {
+      if (DEBUG_LEVEL  > 5)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Consumer %d canceling dispatch timer.\n"),
+                    static_cast<int> (this->proxy ()->id ())
+                    ));
 
-    this->timer_->cancel_timer (timer_id_);
-  }
+      this->timer_->cancel_timer (timer_id_);
+    }
   this->timer_id_ = -1;
 }
 
@@ -552,10 +679,9 @@ TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     }
 }
 
-
 void
 TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
-                                     ACE_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (this->publish_.in ()))
     this->publish_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
@@ -572,3 +698,5 @@ TAO_Notify_Consumer::proxy_supplier (void)
 {
   return this->proxy_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 5f4e14af383..43b591b51e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,11 +23,14 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNotificationC.h"
 
-#include "Peer.h"
-#include "Event.h"
-#include "Timer.h"
+#include "orbsvcs/Notify/Peer.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Timer.h"
 #include "ace/Event_Handler.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_Proxy;
 class TAO_Notify_Method_Request_Event_Queueable;
@@ -172,10 +175,6 @@ protected:
   /// Timer Id.
   long timer_id_;
 
-// todo find some way to use this rather than Request_Queue
-//  /// The Buffering Strategy
-//  TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_;
-//
   /// The Timer Manager that we use.
   TAO_Notify_Timer::Ptr timer_;
 
@@ -185,8 +184,10 @@ private:
   ACE_Auto_Ptr< Request_Queue > pending_events_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Consumer.inl"
+#include "orbsvcs/Notify/Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index 83a73ad0019..c1dcd33bbe7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Notify_Consumer::Request_Queue&
 TAO_Notify_Consumer::pending_events()
@@ -19,3 +23,5 @@ TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->is_suspended_ = 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 37c29ecba36..7b10e3bd40b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,20 +1,20 @@
 // $Id$
 
-#include "ConsumerAdmin.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_ConsumerAdmin,
            "$Id$")
 
-#include "Subscription_Change_Worker.h"
-#include "Proxy.h"
-#include "EventChannel.h"
-#include "Properties.h"
-#include "Factory.h"
-#include "Builder.h"
-#include "Find_Worker_T.h"
-#include "Seq_Worker_T.h"
-#include "ProxySupplier.h"
+#include "orbsvcs/Notify/Subscription_Change_Worker.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/Find_Worker_T.h"
+#include "orbsvcs/Notify/Seq_Worker_T.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
 
 #include "tao/debug.h"
 
@@ -27,6 +27,8 @@ ACE_RCSID (RT_Notify,
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -90,10 +92,10 @@ TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return;
-
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  if ( result == 1)
+    return;
 
   this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -323,8 +325,10 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
     this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
   }
   this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 CosNotifyFilter::FilterID
@@ -480,3 +484,5 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier (
   }
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 73e3c31d381..a0c3c3b00a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 
 #include "orbsvcs/NotifyExtS.h"
 
-#include "Admin.h"
+#include "orbsvcs/Notify/Admin.h"
 class TAO_Notify_ProxySupplier;
 
 #if defined(_MSC_VER)
@@ -30,6 +30,8 @@ class TAO_Notify_ProxySupplier;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_ConsumerAdmin
  *
@@ -240,6 +242,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
index 7a296f0d5b5..eec7e570347 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -14,15 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "Event_Map_T.h"
-#include "ProxySupplier.h"
+#include "orbsvcs/Notify/Event_Map_T.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Consumer_Map
@@ -30,11 +32,12 @@
  * @brief The Event Map for Consumers.
  *
  */
-
 typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, 
                                TAO_SYNCH_RW_MUTEX> 
   TAO_Notify_Consumer_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_CONSUMER_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f3dddbcffe4..3656e3dca86 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -3,22 +3,20 @@
 #ifndef TAO_Notify_CONTAINER_T_CPP
 #define TAO_Notify_CONTAINER_T_CPP
 
-#include "Container_T.h"
+#include "orbsvcs/Notify/Container_T.h"
 
-#include "Properties.h"
-#include "Factory.h"
-#include "POA_Helper.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
+#include "orbsvcs/Notify/POA_Helper.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Container_T.inl"
+#include "orbsvcs/Notify/Container_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, 
-           Notify_Container_T, 
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE>
 TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void)
@@ -62,4 +60,6 @@ TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
   factory->create (this->collection_ ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_CONTAINER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 6713775b023..9c06930d1b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +22,8 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Container_T
  *
@@ -61,12 +63,14 @@ protected:
   COLLECTION* collection_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Container_T.inl"
+#include "orbsvcs/Notify/Container_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Container_T.cpp"
+#include "orbsvcs/Notify/Container_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
index d37030ab59d..ccf274aecbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_Notify_Container_T<TYPE>::COLLECTION*
 TAO_Notify_Container_T<TYPE>:: collection (void)
 {
   return this->collection_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 1479e18e46d..86d6e46106a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -1,13 +1,17 @@
 // $Id$
 
-#include "CosNotify_Initializer.h"
+#include "orbsvcs/Notify/CosNotify_Initializer.h"
 
 ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$")
 
-#include "CosNotify_Service.h"
+#include "orbsvcs/Notify/CosNotify_Service.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void)
 {
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
index 5dccf6d8084..ce08ffd76eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -13,12 +13,16 @@
 #define TAO_Notify_COSNOTIFY_INITIALIZER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_CosNotify_Initializer
  *
@@ -34,5 +38,7 @@ public:
 
 static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_COSNOTIFY_INITIALIZER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 7bf71e8d379..2128c1852a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "CosNotify_Service.h"
-#include "Properties.h"
-#include "Default_Factory.h"
-#include "Builder.h"
+#include "orbsvcs/Notify/CosNotify_Service.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Default_Factory.h"
+#include "orbsvcs/Notify/Builder.h"
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
@@ -15,6 +15,8 @@ ACE_RCSID (Notify,
            TAO_CosNotify_Service,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CosNotify_Service::TAO_CosNotify_Service (void)
 {
 }
@@ -32,10 +34,8 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
 
   // Default to an all reactive system.
   int ec_threads = 0;
-  int dispatching_threads = 0;
-  int listener_threads = 0;
-  int source_threads = 0;
-  int lookup_threads = 0;
+  int consumer_threads = 0;
+  int supplier_threads = 0;
 
   int task_per_proxy = 0;
 
@@ -45,58 +45,52 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
     {
       if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTDispatching")) == 0)
         {
-          // If Dispatching Threads are initalized, the option is implicit.
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads \n")));
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads"))))
         {
-          dispatching_threads = ACE_OS::atoi (current_arg);
+          consumer_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTSourceEval")) == 0)
         {
-          // If Source Threads are initalized, the option is implicit.
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads \n")));
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads"))))
         {
-          source_threads = ACE_OS::atoi (current_arg);
+          supplier_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTLookup")) == 0)
         {
-          // If Lookup Threads are initalized, the option is implicit.
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads \n")));
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads"))))
         {
-          // Since this option is always either added to source_threads
-          // or ignored, we'll deprecate it in favor of that option.
-          lookup_threads = ACE_OS::atoi (current_arg);
+          supplier_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads \n")));
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0)
         {
-          // If Listener Threads are initalized, the option is implicit.
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads \n")));
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads"))))
         {
-          // Since this option is always added to dispatching_threads, we'll
+          // Since this option is always added to consumer_threads, we'll
           // deprecate it in favor of that option.
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads \n")));
-          listener_threads = ACE_OS::atoi (current_arg);
+          consumer_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AsynchUpdates")) == 0)
@@ -142,15 +136,19 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
     {
       // Set the per ConsumerAdmin QoS
       {
+        if (consumer_threads > 0)
+          ACE_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads));
         CosNotification::QoSProperties qos;
-        this->set_threads (qos, dispatching_threads + listener_threads);
+        this->set_threads (qos, consumer_threads);
         properties->default_consumer_admin_qos_properties (qos);
       }
 
       // Set the per SupplierAdmin QoS
       {
+        if (supplier_threads > 0)
+          ACE_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads));
         CosNotification::QoSProperties qos;
-        this->set_threads (qos, lookup_threads + source_threads);
+        this->set_threads (qos, supplier_threads);
         properties->default_supplier_admin_qos_properties (qos);
       }
     }
@@ -158,15 +156,19 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
     {
       // Set the per ProxyConsumer QoS
       {
+        if (supplier_threads > 0)
+          ACE_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads));
         CosNotification::QoSProperties qos;
-        this->set_threads (qos, source_threads); // lookup thread per proxy doesn't make sense.
+        this->set_threads (qos, supplier_threads); // lookup thread per proxy doesn't make sense.
         properties->default_proxy_consumer_qos_properties (qos);
       }
 
       // Set the per ProxySupplier QoS
       {
+        if (consumer_threads > 0)
+          ACE_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads));
         CosNotification::QoSProperties qos;
-        this->set_threads (qos, dispatching_threads + listener_threads);
+        this->set_threads (qos, consumer_threads);
         properties->default_proxy_supplier_qos_properties (qos);
       }
     }
@@ -223,14 +225,14 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
     // Init the factory
     this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
+    ACE_CHECK;
     ACE_ASSERT( this->factory_.get() != 0 );
     TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
-    ACE_CHECK;
 
     this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
+    ACE_CHECK;
     ACE_ASSERT( this->builder_.get() != 0 );
     TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
-    ACE_CHECK;
 }
 
 TAO_Notify_Factory*
@@ -240,9 +242,9 @@ TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
   if (factory == 0)
     {
        ACE_NEW_THROW_EX (factory,
-                      TAO_Notify_Default_Factory (),
-                      CORBA::NO_MEMORY ());
-       ACE_CHECK_RETURN(0);
+                         TAO_Notify_Default_Factory (),
+                         CORBA::NO_MEMORY ());
+       ACE_CHECK_RETURN (0);
     }
   return factory;
 }
@@ -254,7 +256,7 @@ TAO_CosNotify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (builder,
                     TAO_Notify_Builder (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN(0);
+  ACE_CHECK_RETURN (0);
 
   return builder;
 }
@@ -285,6 +287,8 @@ TAO_CosNotify_Service::builder (void)
   return *this->builder_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 /*********************************************************************************************************************/
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 6cade3ddca9..cc91e77d372 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -13,15 +13,17 @@
 #define TAO_Notify_COSNOTIFY_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Service.h"
-#include "Builder.h"
-#include "Factory.h"
+#include "orbsvcs/Notify/Service.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/Factory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Properties;
 class TAO_Notify_EventChannelFactory;
@@ -82,6 +84,8 @@ private:
   ACE_Auto_Ptr< TAO_Notify_Builder > builder_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service)
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index a027e130433..990da34bdbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -1,30 +1,33 @@
 // $Id$
 
-#include "Default_Factory.h"
+#include "orbsvcs/Notify/Default_Factory.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_Default_Factory,
            "$Id$")
 
-#include "EventChannelFactory.h"
-#include "EventChannel.h"
-#include "Admin.h"
-#include "Proxy.h"
-#include "SupplierAdmin.h"
-#include "ConsumerAdmin.h"
-#include "Structured/StructuredProxyPushConsumer.h"
-#include "Structured/StructuredProxyPushSupplier.h"
-#include "Any/ProxyPushConsumer.h"
-#include "Any/ProxyPushSupplier.h"
-#include "Any/CosEC_ProxyPushConsumer.h"
-#include "Any/CosEC_ProxyPushSupplier.h"
-#include "Sequence/SequenceProxyPushConsumer.h"
-#include "Sequence/SequenceProxyPushSupplier.h"
-#include "Supplier.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Admin.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
+#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
+#include "orbsvcs/Notify/Supplier.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Copy_On_Write.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class PROXY>
 class COW_Collection_Default_Factory
 {
@@ -188,5 +191,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy
                     CORBA::NO_MEMORY ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 9c6ac6f56a2..106d7cb265d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -13,13 +13,15 @@
 #define TAO_Notify_DEFAULT_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Factory.h"
+#include "orbsvcs/Notify/Factory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Default_Factory
@@ -91,6 +93,8 @@ public:
   virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index c5c2fcffa31..a40986b1a0c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Delivery_Request.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Delivery_Request.inl"
+#include "orbsvcs/Notify/Delivery_Request.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "Routing_Slip.h"
+#include "orbsvcs/Notify/Routing_Slip.h"
 
 #include "tao/debug.h"
 #include "tao/corba.h"
@@ -16,6 +16,8 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -98,3 +100,4 @@ Delivery_Request::routing_slip () const
 
 } // namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index 413e245eac3..744bca7d733 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -5,15 +5,16 @@
 #define TAO_NOTIFY_DELIVERY_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Topology_Object.h"
-#include "Event.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/Event.h"
 #include <ace/Vector_T.h>
 #include <ace/Bound_Ptr.h>
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations of referenced classes
 class TAO_Notify_EventChannelFactory;
@@ -124,8 +125,10 @@ private:
 
 } // namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Delivery_Request.inl"
+#include "orbsvcs/Notify/Delivery_Request.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
index 33b7f71b7bd..a34687b5c64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -21,3 +24,4 @@ Delivery_Request::set_destination_id (IdVec & destination_id)
 } // namespace TAO_Notify
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index 664af405c97..ca9765dc57e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -1,12 +1,16 @@
 // $Id$
 
-#include "ETCL_Filter.h"
+#include "orbsvcs/Notify/ETCL_Filter.h"
 
-ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$")
+ACE_RCSID(Notify,
+          TAO_Notify_ETCL_Filter,
+          "$Id$")
 
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
-#include "Notify_Constraint_Visitors.h"
+#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void)
   :constraint_expr_ids_ (0)
@@ -289,7 +293,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
       if (iter.next (entry) != 0)
         {
           // Why do we cast to a const object?
-          // We want to force the TAO_String_Manager to make a
+          // We want to force the TAO::String_Manager to make a
           // copy of the string. It wouldn't unless we coax it to use
           // the correct assignment operator.
           infoseq[index].constraint_expression =
@@ -440,3 +444,5 @@ TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index a76ebdadfcf..758c3ea4e38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_ETCL_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Atomic_Op.h"
 #include "orbsvcs/CosNotifyFilterS.h"
-#include "Notify_Constraint_Interpreter.h"
+#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
 #include "ace/Null_Mutex.h"
 
 #if defined(_MSC_VER)
@@ -31,6 +31,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ETCL_Filter
  *
@@ -156,13 +158,15 @@ private:
 
   /// A list of the constraints stored in this filter.
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::ConstraintID,
-                                ACE_NESTED_CLASS (TAO_Notify_ETCL_Filter, TAO_Notify_Constraint_Expr*),
+                                TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,
                                 ACE_SYNCH_NULL_MUTEX>
   CONSTRAINT_EXPR_LIST;
 
   CONSTRAINT_EXPR_LIST constraint_expr_list_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 2f63881f0de..25d53cd5370 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "ETCL_FilterFactory.h"
+#include "orbsvcs/Notify/ETCL_FilterFactory.h"
 
 ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
 
-#include "ETCL_Filter.h"
+#include "orbsvcs/Notify/ETCL_Filter.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void)
 {
@@ -74,4 +76,6 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index f0a9f3a1b3d..615f010c0cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosNotifyFilterS.h"
 
-#include "FilterFactory.h"
+#include "orbsvcs/Notify/FilterFactory.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_ETCL_FilterFactory
  *
@@ -79,6 +81,8 @@ protected:
   PortableServer::POA_var filter_poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index 04e4e4ba7e8..98d7bfd48cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Event.h"
+#include "orbsvcs/Notify/Event.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Event.inl"
+#include "orbsvcs/Notify/Event.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -14,8 +14,10 @@ ACE_RCSID (Notify,
 #include "tao/CDR.h"
 #include "orbsvcs/CosNotificationC.h"
 // NOTE: unfortunately we must know about derived types to implement unmarshal
-#include "Any/AnyEvent.h"
-#include "Structured/StructuredEvent.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
+#include "orbsvcs/Notify/Structured/StructuredEvent.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Event::TAO_Notify_Event (void)
 : priority_ (CosNotification::Priority, CosNotification::DefaultPriority)
@@ -79,3 +81,4 @@ TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr)
   return result;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 38a2e5e4fab..1b44711ce46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -14,16 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Refcountable.h"
-#include "Property.h"
-#include "Property_Boolean.h"
-#include "Property_T.h"
+#include "orbsvcs/Notify/Refcountable.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Property_Boolean.h"
+#include "orbsvcs/Notify/Property_T.h"
 
 #include "orbsvcs/Event_ForwarderS.h"
 #include "orbsvcs/CosNotifyFilterC.h"
@@ -31,6 +31,8 @@
 
 #include "ace/Copy_Disabled.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Consumer;
 class TAO_Notify_EventType;
 
@@ -126,8 +128,10 @@ private:
   bool        is_on_heap_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Event.inl"
+#include "orbsvcs/Notify/Event.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 06203095422..36bdd57e0f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const TAO_Notify_Property_Short&
 TAO_Notify_Event::priority (void) const
 {
@@ -36,3 +40,4 @@ TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const
   return this->clone_.get();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 74d4783a14a..a55f5e44f6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "EventChannel.h"
-
-#include "Container_T.h"
-#include "EventChannelFactory.h"
-#include "ConsumerAdmin.h"
-#include "SupplierAdmin.h"
-#include "Properties.h"
-#include "Factory.h"
-#include "Builder.h"
-#include "Find_Worker_T.h"
-#include "Seq_Worker_T.h"
-#include "Topology_Saver.h"
-#include "Save_Persist_Worker_T.h"
-#include "Reconnect_Worker_T.h"
-#include "Proxy.h"
+#include "orbsvcs/Notify/EventChannel.h"
+
+#include "orbsvcs/Notify/Container_T.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/Find_Worker_T.h"
+#include "orbsvcs/Notify/Seq_Worker_T.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+#include "orbsvcs/Notify/Save_Persist_Worker_T.h"
+#include "orbsvcs/Notify/Reconnect_Worker_T.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Event_Manager.h"
+#include "orbsvcs/Notify/POA_Helper.h"
 
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
@@ -24,6 +26,8 @@
 
 ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
                              , CosNotifyChannelAdmin::ConsumerAdmin
                              , CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -155,7 +159,6 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
   this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-
   // Set the admin properties.
   TAO_Notify_AdminProperties* admin_properties = 0;
   ACE_NEW_THROW_EX (admin_properties,
@@ -206,7 +209,10 @@ TAO_Notify_EventChannel::release (void)
 int
 TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (1);
+
+  if (sd_ret == 1)
     return 1;
 
   this->ca_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -226,13 +232,18 @@ TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return;
+  TAO_Notify_EventChannel::Ptr guard( this );
 
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  if ( result == 1)
+    return;
 
   this->ecf_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+  this->sa_container_.reset( 0 );
+  this->ca_container_.reset( 0 );
 }
 
 void
@@ -671,3 +682,4 @@ TAO_Notify_EventChannel::sa_container()
   return *sa_container_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 086282ad2a5..2fe1c13ff05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -14,17 +14,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "Topology_Object.h"
-#include "Object.h"
-#include "EventChannelFactory.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/Object.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ConsumerAdmin;
 class TAO_Notify_SupplierAdmin;
@@ -34,7 +35,7 @@ class TAO_Notify_ProxySupplier;
 template <class TYPE> class TAO_Notify_Container_T;
 
 #if defined(_MSC_VER)
-  #pragma warning(push)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -95,7 +96,6 @@ public:
   TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
   TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
 
-
   /// Shutdown
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
@@ -243,6 +243,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 7358af79f29..2cf855c3009 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -1,22 +1,23 @@
 // $Id$
 
-#include "EventChannelFactory.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
 
 ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 
-#include "Properties.h"
-#include "Factory.h"
-#include "Builder.h"
-#include "Topology_Saver.h"
-#include "Topology_Loader.h"
-#include "Save_Persist_Worker_T.h"
-#include "Reconnect_Worker_T.h"
-#include "Event_Persistence_Strategy.h"
-#include "Routing_Slip_Persistence_Manager.h"
-#include "EventChannel.h"
-#include "Container_T.h"
-#include "Find_Worker_T.h"
-#include "Seq_Worker_T.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+#include "orbsvcs/Notify/Topology_Loader.h"
+#include "orbsvcs/Notify/Save_Persist_Worker_T.h"
+#include "orbsvcs/Notify/Reconnect_Worker_T.h"
+#include "orbsvcs/Notify/Event_Persistence_Strategy.h"
+#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Container_T.h"
+#include "orbsvcs/Notify/Find_Worker_T.h"
+#include "orbsvcs/Notify/Seq_Worker_T.h"
+#include "orbsvcs/Notify/POA_Helper.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -26,6 +27,18 @@ ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Include this here since this is the only file that
+// requires Topology_Factory.
+namespace TAO_Notify
+{
+  // virtual
+  Topology_Factory::~Topology_Factory ()
+  {
+  }
+}
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
                              , CosNotifyChannelAdmin::EventChannel
                              , CosNotifyChannelAdmin::EventChannel_ptr
@@ -39,7 +52,6 @@ TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void)
   , topology_factory_(0)
   , reconnect_registry_(*this)
   , loading_topology_ (false)
-
 {
 }
 
@@ -53,7 +65,9 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  if ( result == 1)
     return;
 
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -61,6 +75,8 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
   // Reset references to CORBA objects.
   properties->orb (CORBA::ORB::_nil ());
   properties->default_poa (PortableServer::POA::_nil ());
+
+  ec_container_.reset( 0 );
 }
 
 void
@@ -91,7 +107,7 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  auto_ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
+  ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
 
   object_poa->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -140,7 +156,10 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel A
 int
 TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (1);
+
+  if (sd_ret == 1)
     return 1;
 
   this->ec_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -172,9 +191,9 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
                                                                         , initial_admin
                                                                         , id
                                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
   this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
   return ec._retn ();
 }
 
@@ -219,6 +238,7 @@ TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
   this->loading_topology_ = true;
   if (this->topology_factory_ != 0)
   {
+    // create_loader will open and load the persistence file for validation
     auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
     if (tl.get () != 0)
     {
@@ -337,6 +357,7 @@ TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
           this->save_persistent(*saver ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN(false);
           saver->close (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (false);
         }
         this->topology_save_seq_ += 1;
       }
@@ -505,7 +526,10 @@ TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
   this->channel_factory_
     = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-                           CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
+  CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
+
   ACE_TRY_NEW_ENV
   {
     if (DEBUG_LEVEL > 9)
@@ -537,3 +561,4 @@ TAO_Notify_EventChannelFactory::ec_container()
   return *ec_container_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index d2eabf13760..be559fae20a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -14,28 +14,30 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Topology_Object.h"
-#include "Topology_Factory.h"
-#include "Reconnection_Registry.h"
-#include "Routing_Slip.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/Topology_Factory.h"
+#include "orbsvcs/Notify/Reconnection_Registry.h"
+#include "orbsvcs/Notify/Routing_Slip.h"
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/NotifyExtS.h"
 
-class TAO_Notify_EventChannel;
-template <class TYPE> class TAO_Notify_Container_T;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_Notify_EventChannel;
+template <class TYPE> class TAO_Notify_Container_T;
+
 /**
  * @class TAO_Notify_EventChannelFactory
  *
@@ -194,6 +196,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index 490317aa64f..3ad1b7d988c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "EventType.h"
+#include "orbsvcs/Notify/EventType.h"
 
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EventType.inl"
+#include "orbsvcs/Notify/EventType.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_EventType,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_EventType
 TAO_Notify_EventType::special (void)
 {
@@ -174,3 +176,5 @@ TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV
   saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index 2378fe6ba80..d6ba4bd1033 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -14,14 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotificationC.h"
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_EventType
@@ -93,8 +96,10 @@ protected:
   // The hash value computed.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "EventType.inl"
+#include "orbsvcs/Notify/EventType.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
index 1e0694b488e..95a07479666 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE u_long
 TAO_Notify_EventType::hash (void) const
 {
@@ -11,3 +15,5 @@ TAO_Notify_EventType::native (void) const
 {
   return event_type_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 8a55665daa1..bd9d489dd63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "EventTypeSeq.h"
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
 
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
@@ -11,6 +11,8 @@
 
 ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void)
 {
 }
@@ -29,7 +31,7 @@ TAO_Notify_EventTypeSeq::operator = (const TAO_Notify_EventTypeSeq & rhs)
 
 TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs)
   : TAO_Notify_Object ()
-  , ACE_NESTED_CLASS (TAO_Notify,Topology_Savable ())
+  , TAO_Notify::Topology_Savable ()
   , ACE_Unbounded_Set <TAO_Notify_EventType> (rhs)
   , TAO_Notify::Topology_Object ()
 {
@@ -42,7 +44,7 @@ TAO_Notify_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq
 
   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)
@@ -311,3 +313,5 @@ TAO_Notify_EventTypeSeq::release (void)
 {
   delete this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 1628fcada2b..cf66b603c04 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -13,15 +13,17 @@
 #define TAO_Notify_EVENTTYPESEQ_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EventType.h"
+#include "orbsvcs/Notify/EventType.h"
 #include "ace/Unbounded_Set.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_EventTypeSeq
  *
@@ -80,5 +82,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_EVENTTYPESEQ_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index faefec85e66..35264373bd4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -1,20 +1,23 @@
 // $Id$
 
-#include "Event_Manager.h"
+#include "orbsvcs/Notify/Event_Manager.h"
 
 ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 
-#include "ProxyConsumer.h"
-#include "ProxySupplier.h"
-#include "Consumer_Map.h"
-#include "Supplier_Map.h"
-#include "Event_Map_T.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Consumer_Map.h"
+#include "orbsvcs/Notify/Supplier_Map.h"
+#include "orbsvcs/Notify/Event_Map_T.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "tao/debug.h"
 
-/********************************************************************************/
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/*****************************************************************************/
 
 /**
  * @class TAO_Notify_ProxyConsumer_Update_Worker
@@ -111,10 +114,12 @@ void
 TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
 {
   this->consumer_map().connect (proxy_supplier ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Inform about offered types.
   TAO_Notify_EventTypeSeq removed;
   proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
@@ -164,14 +169,19 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s
   TAO_Notify_EventTypeSeq new_added, last_removed;
 
   this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
   this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map().updates_collection ();
 
   TAO_Notify_ProxyConsumer_Update_Worker worker (new_added, last_removed);
 
   if (updates_collection != 0)
-    updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    {
+      updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
 }
 
 void
@@ -281,7 +291,7 @@ TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy AC
   proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
 }
 
-/********************************************************************************/
+/*****************************************************************************/
 
 TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
   :added_ (added), removed_ (removed)
@@ -294,4 +304,6 @@ TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy AC
   proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
 }
 
-/********************************************************************************/
+/*****************************************************************************/
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index b6bfd97d181..ee897512072 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -15,8 +15,9 @@
 #include /**/ "ace/pre.h"
 #include "ace/Auto_Ptr.h"
 
-#include "Refcountable.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/Refcountable.h"
+
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +27,8 @@
 
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_ProxyConsumer;
 class TAO_Notify_EventTypeSeq;
@@ -112,6 +115,13 @@ protected:
   void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
 private:
+  // Disallow copying and assignment; we don't need them
+  // and if we let the compiler generate them it needs the
+  // full declaration of the template arguments for ACE_Auto_Ptr<>
+  // below.
+  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&);
+  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&);
+
   /// Consumer Map
   ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_;
 
@@ -119,6 +129,8 @@ private:
   ACE_Auto_Ptr< TAO_Notify_Supplier_Map > supplier_map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENT_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 089a32adca0..5488c3ad420 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -3,10 +3,10 @@
 #ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP
 #define TAO_Notify_EVENT_MAP_ENTRY_CPP
 
-#include "Event_Map_Entry_T.h"
+#include "orbsvcs/Notify/Event_Map_Entry_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Event_Map_Entry_T.inl"
+#include "orbsvcs/Notify/Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, 
@@ -14,8 +14,10 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "Properties.h"
-#include "Factory.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY>
 TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void)
@@ -51,4 +53,6 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL
   --count_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_EVENT_MAP_ENTRY_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index 869803a26b7..e362f9a7efb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 #include "tao/ORB_Constants.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T;
 template <class PROXY> class TAO_ESF_Proxy_Collection;
 
@@ -80,12 +82,14 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> usage_count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Event_Map_Entry_T.inl"
+#include "orbsvcs/Notify/Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Event_Map_Entry_T.cpp"
+#include "orbsvcs/Notify/Event_Map_Entry_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
index f01f9b0de6c..89da0eaed96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class PROXY> ACE_INLINE ACE_TYPENAME
 TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
 TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) {
@@ -23,3 +27,5 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void)
 {
   return --this->usage_count_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index c1dbe74c813..121d1f51fd0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -1,19 +1,19 @@
 // $Id$
 
-#ifndef TAO_Notify_EVENT_MAP_T_C
-#define TAO_Notify_EVENT_MAP_T_C
+#ifndef TAO_Notify_EVENT_MAP_T_CPP
+#define TAO_Notify_EVENT_MAP_T_CPP
 
-#include "Event_Map_T.h"
+#include "orbsvcs/Notify/Event_Map_T.h"
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "Event_Map_Entry_T.h"
-#include "Properties.h"
-#include "Factory.h"
+#include "orbsvcs/Notify/Event_Map_Entry_T.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Factory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Event_Map_T.inl"
+#include "orbsvcs/Notify/Event_Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Event_Map_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY, class ACE_LOCK>
 TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void)
@@ -161,4 +161,6 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
   return 0;
 }
 
-#endif /* TAO_Notify_EVENT_MAP_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_Notify_EVENT_MAP_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 27567a9c7a2..011cb6530da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_EVENT_MAP_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,9 +22,11 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/CORBA_macros.h"
 
-#include "EventType.h"
-#include "Event_Map_Entry_T.h"
-#include "EventTypeSeq.h"
+#include "orbsvcs/Notify/EventType.h"
+#include "orbsvcs/Notify/Event_Map_Entry_T.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Event_Map_T
@@ -103,12 +105,14 @@ protected:
   TAO_Notify_EventTypeSeq event_types_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Event_Map_T.inl"
+#include "orbsvcs/Notify/Event_Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Event_Map_T.cpp"
+#include "orbsvcs/Notify/Event_Map_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index c3368bddbbc..2b485893049 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class PROXY, class ACE_LOCK> ACE_INLINE  TAO_Notify_Event_Map_Entry_T<PROXY>*
 TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED)
 {
@@ -48,3 +52,5 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void)
 {
   return this->event_types_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
index b58c83c3b9f..3caa8a0c5a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -1,10 +1,13 @@
-#include "Event_Persistence_Factory.h"
+#include "orbsvcs/Notify/Event_Persistence_Factory.h"
 
 ACE_RCSID (Notify,
            Event_Persistence_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
index 2f36805859e..0abc936b92a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
@@ -15,13 +15,16 @@
 #ifndef EVENT_PERSISTENCE_FACTORY_H
 #define EVENT_PERSISTENCE_FACTORY_H
 #include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
@@ -45,5 +48,7 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* EVENT_PERSISTENCE_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
index 3ff9990b326..51019bac62a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
@@ -15,16 +15,18 @@
 #ifndef EVENT_PERSISTENCE_STRATEGY_H
 #define EVENT_PERSISTENCE_STRATEGY_H
 #include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
-
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   class Event_Persistence_Factory;
@@ -43,5 +45,7 @@ namespace TAO_Notify
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* EVENT_PERSISTENCE_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index d2b7122a09d..22fc4dcf653 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -18,10 +18,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Object;
 class TAO_Notify_EventChannelFactory;
 class TAO_Notify_EventChannel;
@@ -123,6 +129,8 @@ public:
   virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 0ff7ce87611..81b86902a36 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -1,17 +1,19 @@
 /* -*- C++ -*- $Id$ */
 
-#include "FilterAdmin.h"
+#include "orbsvcs/Notify/FilterAdmin.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "FilterAdmin.inl"
+#include "orbsvcs/Notify/FilterAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, FilterAdmin, "$Id$")
 
-#include "Topology_Saver.h"
-#include "Properties.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+#include "orbsvcs/Notify/Properties.h"
 #include "ace/Bound_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void)
 {
@@ -198,3 +200,5 @@ TAO_Notify_FilterAdmin::release (void)
 {
   delete this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index c1faf85d5eb..dfa0d7eb7af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 //=============================================================================
 /**
  *  @file   FilterAdmin.h
@@ -19,10 +20,12 @@
 
 #include "ace/Hash_Map_Manager.h"
 
-#include "ID_Factory.h"
-#include "Event.h"
-#include "notify_serv_export.h"
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/ID_Factory.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_FilterAdmin
@@ -103,8 +106,10 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
   TAO_Notify_ID_Factory filter_ids_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "FilterAdmin.inl"
+#include "orbsvcs/Notify/FilterAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 52627546951..3b30256fbb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -31,3 +35,5 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index 689aacf4857..a806f8d9437 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +24,8 @@
 
 #include "tao/PortableServer/PortableServer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_FilterFactory
  *
@@ -40,6 +42,8 @@ public:
       ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index 43110f20672..de2822ae61b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_Notify_FIND_WORKER_T_CPP
 #define TAO_Notify_FIND_WORKER_T_CPP
 
-#include "Find_Worker_T.h"
+#include "orbsvcs/Notify/Find_Worker_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Find_Worker_T.inl"
+#include "orbsvcs/Notify/Find_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Find_Worker_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
 TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void)
@@ -32,6 +32,7 @@ template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTE
 TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
 {
   this->find (id, container ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   if (this->result_ == 0)
     ACE_THROW_RETURN (EXCEPTION ()
@@ -41,7 +42,8 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_FIND_WORKER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index abc1533da56..c9c09eca0fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_FIND_WORKER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +21,10 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "Container_T.h"
-#include "Object.h"
+#include "orbsvcs/Notify/Container_T.h"
+#include "orbsvcs/Notify/Object.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Find_Worker_T
@@ -57,12 +59,14 @@ protected:
   TYPE* result_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Find_Worker_T.inl"
+#include "orbsvcs/Notify/Find_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Find_Worker_T.cpp"
+#include "orbsvcs/Notify/Find_Worker_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
index 04d4252383f..2b9af82e37a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -1,8 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void
 TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (type->id () == this->id_)
     this->result_ = type;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index b8bec81f68c..71f0721ee0e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "ID_Factory.h"
+#include "orbsvcs/Notify/ID_Factory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ID_Factory.inl"
+#include "orbsvcs/Notify/ID_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
   : seed_ (0)
 {
@@ -16,3 +18,5 @@ TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
 TAO_Notify_ID_Factory::~TAO_Notify_ID_Factory ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index b9f0bd8aef5..f6596be8410 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,9 @@
 
 #include "ace/Atomic_Op.h"
 
-#include "Object.h"
+#include "orbsvcs/Notify/Object.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_ID_Factory
@@ -49,9 +51,10 @@ private:
   TAO_SYNCH_MUTEX mtx_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "ID_Factory.inl"
+#include "orbsvcs/Notify/ID_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
index f9fb1f5e89b..6aa178a4421 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Notify_Object::ID
 TAO_Notify_ID_Factory::id (void)
 {
@@ -16,3 +20,5 @@ TAO_Notify_ID_Factory::set_last_used (const TAO_Notify_Object::ID id)
     this->seed_ = id;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index cf9160bae6a..e9dc45dbb07 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
-#include "Method_Request.h"
+#include "orbsvcs/Notify/Method_Request.h"
 
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Queueable, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void)
 {
 }
@@ -55,3 +58,5 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event)
     this->msg_deadline_time (deadline);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index c47d2ddc2f8..271c2d721b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request.h
  *
@@ -12,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +23,9 @@
 #include "ace/Bound_Ptr.h"
 #include "ace/OS_NS_sys_time.h"
 
-#include "Event.h"
+#include "orbsvcs/Notify/Event.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Method_Request_Queueable;
 
@@ -65,6 +68,8 @@ public:
   void init (const TAO_Notify_Event * event);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 74a2f0a60e8..af503aa3077 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -1,25 +1,26 @@
 // $Id$
 
-#include "Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 
-#include "ProxySupplier.h"
-#include "Consumer.h"
-#include "Admin.h"
-#include "ConsumerAdmin.h"
-#include "EventChannelFactory.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Consumer.h"
+#include "orbsvcs/Notify/Admin.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
 
 #include "tao/debug.h"
-#include "tao/corba.h"
+#include "tao/CDR.h"
 
 #include "ace/OS_NS_stdio.h"
 
-//#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constuct from event
 TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (
       const TAO_Notify_Event * event,
@@ -77,6 +78,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
                                                                   parent.filter_admin (),
                                                                   parent.filter_operator ()
                                                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
@@ -299,3 +301,4 @@ TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
   return request;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 73d0b028a3d..fed8d063cfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -1,29 +1,30 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request_Dispatch.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_DISPATCH_METHOD_REQUEST_H
 #define TAO_Notify_DISPATCH_METHOD_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request.h"
-#include "Refcountable.h"
-#include "Method_Request_Event.h"
-#include "ProxySupplier.h"
-#include "Delivery_Request.h"
+#include "orbsvcs/Notify/Method_Request.h"
+#include "orbsvcs/Notify/Refcountable.h"
+#include "orbsvcs/Notify/Method_Request_Event.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_EventChannelFactory;
 class TAO_InputCDR;
@@ -122,11 +123,11 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
-  const TAO_Notify_Event::Ptr event_var_;
+  TAO_Notify_Event::Ptr event_var_;
   TAO_Notify_ProxySupplier::Ptr proxy_guard_;
 };
 
-/*******************************************************************************************************/
+/*****************************************************************************/
 
 /**
  * @class TAO_Notify_Method_Request_Dispatch_No_Copy
@@ -161,7 +162,9 @@ public:
   virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-/*******************************************************************************************************/
+/*****************************************************************************/
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 4b479d58128..53ab33da14c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "Method_Request_Event.h"
-#include "Delivery_Request.h"
+#include "orbsvcs/Notify/Method_Request_Event.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
 
 ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (
       const TAO_Notify_Event * event)
   : event_ (event)
@@ -65,10 +67,10 @@ TAO_Notify_Method_Request_Event::should_retry ()
 
 TAO_Notify_Method_Request_Event_Queueable::TAO_Notify_Method_Request_Event_Queueable (
       const TAO_Notify_Method_Request_Event & prev_request,
-      const TAO_Notify_Event::Ptr & event_var)
-  : TAO_Notify_Method_Request_Queueable (event_var.get ())
-  , TAO_Notify_Method_Request_Event (prev_request, event_var.get ())
-  , event_var_ (event_var)
+      const TAO_Notify_Event::Ptr& event)
+  : TAO_Notify_Method_Request_Queueable (event.get ())
+  , TAO_Notify_Method_Request_Event (prev_request, event.get ())
+  , event_var_ (event)
 {
 }
 
@@ -96,3 +98,5 @@ TAO_Notify_Method_Request_Event::event() const
 {
   return this->event_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 437aa08187d..4acb97f10d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -1,30 +1,31 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request_Event.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_METHOD_REQUEST_EVENT_H
 #define TAO_Notify_METHOD_REQUEST_EVENT_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request.h"
-#include "Event.h"
-#include "ProxySupplier.h"
+#include "orbsvcs/Notify/Method_Request.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
 #include "tao/Basic_Types.h"
 #include "ace/CORBA_macros.h"
-#include "Delivery_Request.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Method_Request_Event
@@ -83,7 +84,7 @@ public:
   /// exceptions from the constructor if it's necessary to copy the event.
   TAO_Notify_Method_Request_Event_Queueable (
     const TAO_Notify_Method_Request_Event & prev_request,
-    const TAO_Notify_Event::Ptr & event_var);
+    const TAO_Notify_Event::Ptr & event);
 
   TAO_Notify_Method_Request_Event_Queueable (
     TAO_Notify::Delivery_Request_Ptr & request);
@@ -97,5 +98,7 @@ private:
   TAO_Notify_Event::Ptr event_var_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 3ae5412ccdd..bee058ab534 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -1,21 +1,27 @@
 // $Id$
 
-#include "Method_Request_Lookup.h"
+#include "orbsvcs/Notify/Method_Request_Lookup.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 
-#include "Consumer_Map.h"
-#include "ProxySupplier.h"
-#include "ProxyConsumer.h"
-#include "Proxy.h"
-#include "Admin.h"
-#include "SupplierAdmin.h"
-#include "Method_Request_Dispatch.h"
-#include "Delivery_Request.h"
-#include "EventChannelFactory.h"
+#include "orbsvcs/Notify/Consumer_Map.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Admin.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
+#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "orbsvcs/Notify/Event_Manager.h"
+#include "orbsvcs/Notify/Factory.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "tao/debug.h"
-#include "tao/corba.h"
+#include "tao/CDR.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup (
       const TAO_Notify_Event * event,
@@ -38,6 +44,7 @@ TAO_Notify_Method_Request_Lookup::work (
   {
     TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true);
     proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
   }
   else
   {
@@ -57,6 +64,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
                                                              parent.filter_admin (),
                                                              parent.filter_operator ()
                                                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   if (TAO_debug_level > 1)
     ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
@@ -78,7 +86,10 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
     consumers = entry->collection ();
 
     if (consumers != 0)
-      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+      {
+        consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (0);
+      }
 
     map.release (entry);
   }
@@ -87,7 +98,10 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   consumers = map.broadcast_collection ();
 
   if (consumers != 0)
-    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+    {
+      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
   this->complete ();
   return 0;
 }
@@ -206,13 +220,14 @@ TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_Method_Request_Queueable* request;
 
-  TAO_Notify_Event::Ptr event_var (
-    this->event_->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
+  TAO_Notify_Event::Ptr event(this->event_->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK_RETURN (0);
 
   ACE_NEW_THROW_EX (request,
-                    TAO_Notify_Method_Request_Lookup_Queueable (event_var, this->proxy_consumer_),
+                    TAO_Notify_Method_Request_Lookup_Queueable (event, this->proxy_consumer_),
                     CORBA::INTERNAL ());
 
   return request;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index b88af7fa181..d54bb62833e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -1,32 +1,33 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request_Lookup.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
-
 #ifndef TAO_Notify_LOOKUP_METHOD_REQUEST_H
 #define TAO_Notify_LOOKUP_METHOD_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request_Event.h"
-#include "ProxySupplier.h"
-#include "ProxyConsumer.h"
-#include "Consumer_Map.h"
-#include "Delivery_Request.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/Notify/Method_Request_Event.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/Consumer_Map.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Method_Request_Lookup_Queueable;
 class TAO_Notify_Event;
 
@@ -101,7 +102,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
-  const TAO_Notify_Event::Ptr event_var_;
+  TAO_Notify_Event::Ptr event_var_;
   TAO_Notify_ProxyConsumer::Ptr proxy_guard_;
 };
 
@@ -133,5 +134,7 @@ public:
   virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 69e6d0aa1ae..74ca99ef829 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "Method_Request_Shutdown.h"
-#include "ThreadPool_Task.h"
+#include "orbsvcs/Notify/Method_Request_Shutdown.h"
+#include "orbsvcs/Notify/ThreadPool_Task.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task)
   : task_ (task)
 {
@@ -29,3 +31,5 @@ TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->task_->msg_queue ()->deactivate ();
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index aa93b347070..af38f816524 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request_Shutdown.h
  *
@@ -13,13 +14,15 @@
 #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request.h"
+#include "orbsvcs/Notify/Method_Request.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ThreadPool_Task;
 
@@ -49,5 +52,7 @@ private:
   TAO_Notify_ThreadPool_Task* task_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 27c0c16d782..18ac5fa1841 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "Method_Request_Updates.h"
+#include "orbsvcs/Notify/Method_Request_Updates.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
 
 #include "tao/debug.h"
-#include "Proxy.h"
-#include "Peer.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Peer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Method_Request_Updates::TAO_Notify_Method_Request_Updates (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy)
   : TAO_Notify_Method_Request_Updates_Base (added, removed, proxy)
@@ -23,7 +25,7 @@ TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-/********************************************************************************************************/
+/*****************************************************************************/
 
 TAO_Notify_Method_Request_Updates_No_Copy::TAO_Notify_Method_Request_Updates_No_Copy (const TAO_Notify_EventTypeSeq& added
                                                                               , const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy)
@@ -38,11 +40,12 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No
 TAO_Notify_Method_Request_Queueable*
 TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Notify_Method_Request_Queueable* request;
+  TAO_Notify_Method_Request_Queueable* request = 0;
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
-                    CORBA::INTERNAL ());
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (request);
 
   return request;
 }
@@ -52,3 +55,5 @@ TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index b072288cf26..b9410188772 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -1,28 +1,29 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Method_Request_Updates.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_METHOD_REQUEST_UPDATES_H
 #define TAO_Notify_METHOD_REQUEST_UPDATES_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request_Updates_T.h"
-#include "Method_Request.h"
-#include "EventTypeSeq.h"
-#include "Proxy.h"
+#include "orbsvcs/Notify/Method_Request_Updates_T.h"
+#include "orbsvcs/Notify/Method_Request.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+#include "orbsvcs/Notify/Proxy.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
                                         , TAO_Notify_Proxy::Ptr
@@ -36,8 +37,9 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
-                                                        ,public TAO_Notify_Method_Request_Queueable
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates
+  : public TAO_Notify_Method_Request_Updates_Base
+  , public TAO_Notify_Method_Request_Queueable
 {
 public:
   /// Constuctor
@@ -50,7 +52,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-/***********************************************************************************************************************/
+/*****************************************************************************/
 
 typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
                                         , TAO_Notify_Proxy*
@@ -64,8 +66,9 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base
-                                                                ,public TAO_Notify_Method_Request
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy
+  : public TAO_Notify_Method_Request_Updates_No_Copy_Base
+  , public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
@@ -81,5 +84,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
index 5212ae6660c..19db54e852f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -1,14 +1,15 @@
 // $Id$
+
 #ifndef TAO_Notify_Method_Request_Updates_T_CPP
 #define TAO_Notify_Method_Request_Updates_T_CPP
 
-#include "Method_Request_Updates_T.h"
+#include "orbsvcs/Notify/Method_Request_Updates_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Method_Request_Updates_T.inl"
+#include "orbsvcs/Notify/Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, TAO_Notify_Method_Request_Updates_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
 TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed,
@@ -22,4 +23,6 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_No
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_Method_Request_Updates_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index bfe4e4de89f..53b6c1d7b30 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -14,14 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Environment;
@@ -59,12 +62,14 @@ protected:
   PROXY proxy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Method_Request_Updates_T.inl"
+#include "orbsvcs/Notify/Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Method_Request_Updates_T.cpp"
+#include "orbsvcs/Notify/Method_Request_Updates_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 1beed753ed5..657b6dd0929 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -1,7 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #include "tao/debug.h"
-#include "Peer.h"
+#include "orbsvcs/Notify/Peer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
 TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
@@ -28,3 +32,5 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 441cbc41493..efda609e5f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "Name_Value_Pair.h"
-#include "Property_T.h"
+#include "orbsvcs/Notify/Name_Value_Pair.h"
+#include "orbsvcs/Notify/Property_T.h"
 #include "ace/OS_String.h"
 #include "ace/OS_NS_stdio.h"
 
 namespace
 {
-  ACE_UINT64 string_to_uint64(const char * s)
+  ACE_UINT64 string_to_uint64 (const char * s)
   {
-    size_t len = ACE_OS::strlen (s);
+    size_t const len = ACE_OS::strlen (s);
     if (len == 0)
       return 0;
     if (! isdigit(s[0]))
@@ -29,6 +29,8 @@ namespace
   }
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   NVP::NVP()
@@ -205,8 +207,10 @@ namespace TAO_Notify
 
   const NVP& NVPList::operator[](size_t ndx) const
   {
-    ACE_ASSERT(ndx < list_.size());
+    ACE_ASSERT (ndx < list_.size());
     return list_[ndx];
   }
 
 } // namespace TAO_Notify
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
index f3b02be655b..6aa695f0e4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,9 +14,9 @@
 #define NAME_VALUE_PAIR_H
 #include /**/ "ace/pre.h"
 
-#include "Property.h"
-#include "Property_Boolean.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Property_Boolean.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #include "ace/SString.h"
 #include "ace/Vector_T.h"
@@ -25,6 +25,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   /**
@@ -94,5 +96,7 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* NAME_VALUE_PAIR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 277c20ec444..5d6f3e11e21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "Notify_Constraint_Interpreter.h"
-#include "Notify_Constraint_Visitors.h"
+#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
+#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
 
 ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void)
 {
 }
@@ -40,7 +43,7 @@ TAO_Notify_Constraint_Interpreter::build_tree (
 CORBA::Boolean
 TAO_Notify_Constraint_Interpreter::evaluate (TAO_Notify_Constraint_Visitor &evaluator)
 {
-  CORBA::Boolean retval = evaluator.evaluate_constraint (this->root_);
-
-  return retval;
+  return evaluator.evaluate_constraint (this->root_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 1eb9eac1efe..acb7c8b9d86 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -1,11 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notify_Constraint_Interpreter.h
  *
  *  $Id$
  *
- *
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
  */
 //=============================================================================
@@ -23,7 +23,9 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/CosNotifyFilterC.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Constraint_Visitor;
 
@@ -56,5 +58,8 @@ public:
   /// the evaluator.
   CORBA::Boolean evaluate (TAO_Notify_Constraint_Visitor &evaluator);
 };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index a76c30518d8..f342c7e93f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,6 +1,6 @@
-/* $Id$ */
+// $Id$
 
-#include "Notify_Constraint_Visitors.h"
+#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -12,45 +12,50 @@
 #include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
-  : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY)
+  : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY),
+    implicit_ids_(implicit_ids_size_),
+    filterable_data_(filterable_data_size_),
+    variable_header_(variable_header_size_)
 {
   (void) this->implicit_ids_.bind (ACE_CString ("filterable_data",
-                                                0,
-                                                0),
-                                   FILTERABLE_DATA);
+    0,
+    0),
+    FILTERABLE_DATA);
   (void) this->implicit_ids_.bind (ACE_CString ("header",
-                                                0,
-                                                0),
-                                   HEADER);
+    0,
+    0),
+    HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("remainder_of_body",
-                                                0,
-                                                0),
-                                   REMAINDER_OF_BODY);
+    0,
+    0),
+    REMAINDER_OF_BODY);
   (void) this->implicit_ids_.bind (ACE_CString ("fixed_header",
-                                                0,
-                                                0),
-                                   FIXED_HEADER);
+    0,
+    0),
+    FIXED_HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("variable_header",
-                                                0,
-                                                0),
-                                   VARIABLE_HEADER);
+    0,
+    0),
+    VARIABLE_HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("event_name",
-                                                0,
-                                                0),
-                                   EVENT_NAME);
+    0,
+    0),
+    EVENT_NAME);
   (void) this->implicit_ids_.bind (ACE_CString ("event_type",
-                                                0,
-                                                0),
-                                   EVENT_TYPE);
+    0,
+    0),
+    EVENT_TYPE);
   (void) this->implicit_ids_.bind (ACE_CString ("domain_name",
-                                                0,
-                                                0),
-                                   DOMAIN_NAME);
+    0,
+    0),
+    DOMAIN_NAME);
   (void) this->implicit_ids_.bind (ACE_CString ("type_name",
-                                                0,
-                                                0),
-                                   TYPE_NAME);
+    0,
+    0),
+    TYPE_NAME);
 }
 
 int
@@ -63,34 +68,34 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str
   CORBA::ULong index = 0;
 
   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, 0);
 
-      int status =
-        this->filterable_data_.bind (
-                                     name_str,
-                                     const_cast<CORBA::Any *> (&s_event.filterable_data[index].value)
-                                     );
+    int status =
+      this->filterable_data_.bind (
+        name_str,
+        s_event.filterable_data[index].value
+        );
 
-      if (status != 0)
-        return -1;
-    }
+    if (status != 0)
+      return -1;
+  }
 
   length = s_event.header.variable_header.length ();
 
   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, 0);
 
-      int status =
-        this->variable_header_.bind (
-                                     name_str,
-                                     const_cast<CORBA::Any *> (&s_event.header.variable_header[index].value)
-                                     );
+    int status =
+      this->variable_header_.bind (
+        name_str,
+        s_event.header.variable_header[index].value
+        );
 
-      if (status != 0)
-        return -1;
-    }
+    if (status != 0)
+      return -1;
+  }
 
   this->domain_name_ =
     CORBA::string_dup (s_event.header.fixed_header.event_type.domain_name);
@@ -108,7 +113,7 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::Str
 
 CORBA::Boolean
 TAO_Notify_Constraint_Visitor::evaluate_constraint (
-    TAO_ETCL_Constraint* root
+  TAO_ETCL_Constraint* root
   )
 {
   CORBA::Boolean result = 0;
@@ -116,15 +121,15 @@ TAO_Notify_Constraint_Visitor::evaluate_constraint (
 
   // Evaluate the constraint in root_;
   if (root != 0)
+  {
+    if ((root->accept (this) == 0) &&
+      (! this->queue_.is_empty ()))
     {
-      if ((root->accept (this) == 0) &&
-          (! this->queue_.is_empty ()))
-        {
-          TAO_ETCL_Literal_Constraint top;
-          this->queue_.dequeue_head (top);
-          result = (CORBA::Boolean) top;
-        }
+      TAO_ETCL_Literal_Constraint top;
+      this->queue_.dequeue_head (top);
+      result = (CORBA::Boolean) top;
     }
+  }
 
   // If a property couldn't be evaluated we must return 0.
   return result;
@@ -132,7 +137,7 @@ TAO_Notify_Constraint_Visitor::evaluate_constraint (
 
 int
 TAO_Notify_Constraint_Visitor::visit_literal (
-    TAO_ETCL_Literal_Constraint *literal
+  TAO_ETCL_Literal_Constraint *literal
   )
 {
   this->queue_.enqueue_head (*literal);
@@ -146,23 +151,23 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
   const char *name = ident->value ();
   ACE_CString key (name, 0, 0);
 
-  CORBA::Any *any = 0;
+  CORBA::Any any;
 
   if (this->filterable_data_.find (key, any) == 0)
+  {
+    if (any.impl() != 0)
     {
-      if (any != 0)
-        {
-          this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any));
-          return_value = 0;
-        }
+      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any));
+      return_value = 0;
     }
+  }
 
   return return_value;
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_union_value (
-    TAO_ETCL_Union_Value *union_value
+  TAO_ETCL_Union_Value *union_value
   )
 {
   switch (union_value->sign ())
@@ -185,308 +190,304 @@ TAO_Notify_Constraint_Visitor::visit_union_value (
 
 int
 TAO_Notify_Constraint_Visitor::visit_union_pos (
-    TAO_ETCL_Union_Pos *union_pos
+  TAO_ETCL_Union_Pos *union_pos
   )
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
+  {
+    if (union_pos->union_value ()->accept (this) == 0)
     {
-      if (union_pos->union_value ()->accept (this) == 0)
-        {
-          TAO_ETCL_Literal_Constraint disc_val;
-          this->queue_.dequeue_head (disc_val);
+      TAO_ETCL_Literal_Constraint disc_val;
+      this->queue_.dequeue_head (disc_val);
 
-          TAO_DynUnion_i dyn_union;
-          dyn_union.init (this->current_value_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      TAO_DynUnion_i dyn_union;
+      dyn_union.init (this->current_value_.in ()
+        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          CORBA::TypeCode_var tc = this->current_value_->type ();
+      CORBA::TypeCode_var tc = this->current_value_->type ();
+
+      switch (disc_val.expr_type ())
+      {
+      case TAO_ETCL_INTEGER:
+      case TAO_ETCL_SIGNED:
+      case TAO_ETCL_UNSIGNED:
+        {
+          CORBA::Any disc_any;
+          CORBA::TypeCode_var disc_tc =
+            tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          CORBA::TCKind disc_kind =
+            TAO_DynAnyFactory::unalias (disc_tc.in ()
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-          switch (disc_val.expr_type ())
+          switch (disc_kind)
+          {
+          case CORBA::tk_boolean:
+            disc_any <<= CORBA::Any::from_boolean ((CORBA::Boolean) disc_val);
+            break;
+          case CORBA::tk_short:
+            disc_any <<= (CORBA::Short) ((CORBA::Long) disc_val);
+            break;
+          case CORBA::tk_ushort:
+            disc_any <<= (CORBA::UShort) ((CORBA::ULong) disc_val);
+            break;
+          case CORBA::tk_long:
+            disc_any <<= (CORBA::Long) disc_val;
+            break;
+          case CORBA::tk_ulong:
+            disc_any <<= (CORBA::ULong) disc_val;
+            break;
+          case CORBA::tk_enum:
             {
-            case TAO_ETCL_INTEGER:
-            case TAO_ETCL_SIGNED:
-            case TAO_ETCL_UNSIGNED:
-              {
-                CORBA::Any disc_any;
-                CORBA::TypeCode_var disc_tc =
-                  tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                CORBA::TCKind disc_kind =
-                  TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                switch (disc_kind)
-                  {
-                  case CORBA::tk_boolean:
-                    disc_any <<= CORBA::Any::from_boolean ((CORBA::Boolean) disc_val);
-                    break;
-                  case CORBA::tk_short:
-                    disc_any <<= (CORBA::Short) ((CORBA::Long) disc_val);
-                    break;
-                  case CORBA::tk_ushort:
-                    disc_any <<= (CORBA::UShort) ((CORBA::ULong) disc_val);
-                    break;
-                  case CORBA::tk_long:
-                    disc_any <<= (CORBA::Long) disc_val;
-                    break;
-                  case CORBA::tk_ulong:
-                    disc_any <<= (CORBA::ULong) disc_val;
-                    break;
-                  case CORBA::tk_enum:
-                    {
-                      TAO_OutputCDR cdr;
-                      cdr.write_ulong ((CORBA::ULong) disc_val);
-                      TAO_InputCDR in_cdr (cdr);
-                      TAO::Unknown_IDL_Type *unk = 0;
-                      ACE_NEW_RETURN (unk,
-                                      TAO::Unknown_IDL_Type (disc_tc.in (),
-                                                             in_cdr),
-                                      -1);
-
-                      disc_any.replace (unk);
-                      break;
-                    }
-                  // @@@ (JP) I don't think ETCL handles 64-bit
-                  // integers at this point, and I also think that
-                  // chars and/or wchars will just come out in the
-                  // constraint as (w)strings of length 1.
-                  case CORBA::tk_longlong:
-                  case CORBA::tk_ulonglong:
-                  case CORBA::tk_char:
-                  case CORBA::tk_wchar:
-                  default:
-                    return -1;
-                  }
-
-                DynamicAny::DynAny_var dyn_any =
-                  TAO_DynAnyFactory::make_dyn_any (disc_any
-                                                   ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                dyn_union.set_discriminator (dyn_any.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                DynamicAny::DynAny_var u_member =
-                  dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                this->current_value_ =
-                  u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                break;
-              }
-            case TAO_ETCL_STRING:
-              {
-                const char *name = (const char *) disc_val;
-                CORBA::ULong count =
-                  tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                const char *member_name = 0;
-                CORBA::ULong i = 0;
-
-                for (i = 0; i < count; ++i)
-                  {
-                    member_name = tc->member_name (i
-                                                   ACE_ENV_ARG_PARAMETER);
-                    ACE_TRY_CHECK;
-
-                    if (ACE_OS::strcmp (name, member_name) == 0)
-                      break;
-                  }
-
-                // If there's no match, member_label will throw
-                // CORBA::TypeCode::Bounds and the catch block will
-                // return -1;
-                this->current_value_ = tc->member_label (i
-                                                         ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-
-                break;
-              }
-            // The TAO_ETCL_Union_Value that was put on the queue
-            // shouldn't have any other type.
-            default:
-              return -1;
+              TAO_OutputCDR cdr;
+              cdr.write_ulong ((CORBA::ULong) disc_val);
+              TAO_InputCDR in_cdr (cdr);
+              TAO::Unknown_IDL_Type *unk = 0;
+              ACE_NEW_RETURN (unk,
+                TAO::Unknown_IDL_Type (disc_tc.in (),
+                in_cdr),
+                -1);
+
+              disc_any.replace (unk);
+              break;
             }
+            // @@@ (JP) I don't think ETCL handles 64-bit
+            // integers at this point, and I also think that
+            // chars and/or wchars will just come out in the
+            // constraint as (w)strings of length 1.
+          case CORBA::tk_longlong:
+          case CORBA::tk_ulonglong:
+          case CORBA::tk_char:
+          case CORBA::tk_wchar:
+          default:
+            return -1;
+          }
 
-          TAO_ETCL_Constraint *nested = union_pos->component ();
+          DynamicAny::DynAny_var dyn_any =
+            TAO_DynAnyFactory::make_dyn_any (disc_any
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          dyn_union.set_discriminator (dyn_any.in ()
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          DynamicAny::DynAny_var u_member =
+            dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          this->current_value_ =
+            u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-          // If there's no nested component, then we just want the
-          // union member value on the queue. Otherwise, we want
-          // the member value in current_value_ while we visit
-          // the nested component.
-          if (nested == 0)
-            {
-              TAO_ETCL_Literal_Constraint lit (this->current_value_.ptr ());
-              this->queue_.enqueue_head (lit);
-              return 0;
-            }
-          else
-            return nested->accept (this);
+          break;
         }
-      else
+      case TAO_ETCL_STRING:
+        {
+          const char *name = (const char *) disc_val;
+          CORBA::ULong count =
+            tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          const char *member_name = 0;
+          CORBA::ULong i = 0;
+
+          for (i = 0; i < count; ++i)
+          {
+            member_name = tc->member_name (i
+              ACE_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK;
+
+            if (ACE_OS::strcmp (name, member_name) == 0)
+              break;
+          }
+
+          // If there's no match, member_label will throw
+          // CORBA::TypeCode::Bounds and the catch block will
+          // return -1;
+          this->current_value_ = tc->member_label (i
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          break;
+        }
+        // The TAO_ETCL_Union_Value that was put on the queue
+        // shouldn't have any other type.
+      default:
         return -1;
+      }
+
+      TAO_ETCL_Constraint *nested = union_pos->component ();
+
+      // If there's no nested component, then we just want the
+      // union member value on the queue. Otherwise, we want
+      // the member value in current_value_ while we visit
+      // the nested component.
+      if (nested == 0)
+      {
+        TAO_ETCL_Literal_Constraint lit (this->current_value_.ptr ());
+        this->queue_.enqueue_head (lit);
+        return 0;
+      }
+      else
+        return nested->accept (this);
     }
-  ACE_CATCHANY
-    {
+    else
       return -1;
-    }
+  }
+  ACE_CATCHANY
+  {
+    return -1;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_component_pos (
-    TAO_ETCL_Component_Pos *pos
+  TAO_ETCL_Component_Pos *pos
   )
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
+  {
+    // If we are here (from visit_component) the Any containing the
+    // component as found in filterable_data_ will be in current_value_.
+    CORBA::TypeCode_var tc = this->current_value_->type ();
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    DynamicAny::DynAny_var member;
+    CORBA::Boolean success = 0;
+    CORBA::ULong slot = (CORBA::ULong) *pos->integer ();
+
+    switch (kind)
     {
-      // If we are here (from visit_component) the Any containing the
-      // component as found in filterable_data_ will be in current_value_.
-      CORBA::TypeCode_var tc = this->current_value_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      DynamicAny::DynAny_var member;
-      CORBA::Boolean success = 0;
-      CORBA::ULong slot = (CORBA::ULong) *pos->integer ();
-
-      switch (kind)
+    case CORBA::tk_enum:
       {
-        case CORBA::tk_enum:
-          {
-            TAO_DynEnum_i dyn_enum;
-            dyn_enum.init (this->current_value_.in ()
-                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        TAO_DynEnum_i dyn_enum;
+        dyn_enum.init (this->current_value_.in ()
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            success = dyn_enum.seek (slot
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        success = dyn_enum.seek (slot
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            if (success == 0)
-              return -1;
+        if (success == 0)
+          return -1;
 
-            member =
-              dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        member =
+          dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            break;
-          }
-        case CORBA::tk_struct:
-          {
-            TAO_DynStruct_i dyn_struct;
-            dyn_struct.init (this->current_value_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        break;
+      }
+    case CORBA::tk_struct:
+      {
+        TAO_DynStruct_i dyn_struct;
+        dyn_struct.init (this->current_value_.in ()
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            success = dyn_struct.seek (slot
-                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        success = dyn_struct.seek (slot
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            if (success == 0)
-              return -1;
+        if (success == 0)
+          return -1;
 
-            member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            break;
-          }
-        // @@@ (JP) I think enums and structs are the only two cases
-        // handled by Component_Pos, since arrays and sequences are
-        // handled by Component_Array, and unions are handled by
-        // Union_Pos.
-        default:
-          return -1;
+        break;
       }
+      // @@@ (JP) I think enums and structs are the only two cases
+      // handled by Component_Pos, since arrays and sequences are
+      // handled by Component_Array, and unions are handled by
+      // Union_Pos.
+    default:
+      return -1;
+    }
 
-      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      TAO_ETCL_Constraint *comp = pos->component ();
+    TAO_ETCL_Constraint *comp = pos->component ();
 
-      if (comp == 0)
-        {
-          TAO_ETCL_Literal_Constraint result (value.ptr ());
-          this->queue_.enqueue_head (result);
-          return 0;
-        }
-      else
-        {
-          this->current_value_ = value._retn ();
-          return comp->accept (this);
-        }
+    if (comp == 0)
+    {
+      TAO_ETCL_Literal_Constraint result (value.ptr ());
+      this->queue_.enqueue_head (result);
+      return 0;
     }
-  ACE_CATCHANY
+    else
     {
-      return -1;
+      this->current_value_ = value._retn ();
+      return comp->accept (this);
     }
+  }
+  ACE_CATCHANY
+  {
+    return -1;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_component_assoc (
-    TAO_ETCL_Component_Assoc *assoc
+  TAO_ETCL_Component_Assoc *assoc
   )
 {
-  CORBA::Any *any = 0;
+  CORBA::Any any;
   ACE_CString name (assoc->identifier ()->value (),
-                    0,
-                    0);
+    0,
+    0);
 
   switch (this->implicit_id_)
   {
-    case FILTERABLE_DATA:
-      if (this->filterable_data_.find (name, any) != 0
-          || any == 0)
-        return -1;
-      break;
-    case VARIABLE_HEADER:
-      if (this->variable_header_.find (name, any) != 0
-          || any == 0)
-        return -1;
-      break;
+  case FILTERABLE_DATA:
+    if (this->filterable_data_.find (name, any) != 0
+      || any.impl() == 0)
+      return -1;
+    break;
+  case VARIABLE_HEADER:
+    if (this->variable_header_.find (name, any) != 0
+      || any.impl() == 0)
+      return -1;
+    break;
     // Only the sequence members of CosNotification::StructuredEvent
     // can be treated as associative arrays.
-    default:
-      return -1;
+  default:
+    return -1;
   }
 
   TAO_ETCL_Constraint *comp = assoc->component ();
   CORBA::Any *any_ptr = 0;
 
   if (comp == 0)
-    {
-      TAO_ETCL_Literal_Constraint result (any);
-      this->queue_.enqueue_head (result);
-
-      // If we're at the end of the line, put the name into
-      // current_value_ so visit_exist can use it.
-      ACE_NEW_RETURN (any_ptr,
-                      CORBA::Any,
-                      -1);
-      (*any_ptr) <<= name.c_str ();
-      this->current_value_ = any_ptr;
-
-      return 0;
-    }
+  {
+    TAO_ETCL_Literal_Constraint result (&any);
+    this->queue_.enqueue_head (result);
+
+    // If we're at the end of the line, put the name into
+    // current_value_ so visit_exist can use it.
+    ACE_NEW_RETURN (any_ptr,
+      CORBA::Any,
+      -1);
+    (*any_ptr) <<= name.c_str ();
+    this->current_value_ = any_ptr;
+
+    return 0;
+  }
   else
-    {
-  ACE_NEW_RETURN (any_ptr,
-                  CORBA::Any (*any),
-                  -1);
-  this->current_value_ = any_ptr;
-  return comp->accept (this);
-    }
+  {
+    ACE_NEW_RETURN (any_ptr,
+      CORBA::Any (any),
+      -1);
+    this->current_value_ = any_ptr;
+    return comp->accept (this);
+  }
 }
 
 int
@@ -494,90 +495,88 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
+  {
+    // If we are here (from visit_component) the Any containing the
+    // component as found in filterable_data_ will be in
+    // current_value_.
+    CORBA::TypeCode_var tc = this->current_value_->type ();
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    DynamicAny::DynAny_var member;
+    CORBA::Boolean success = 0;
+    CORBA::ULong slot = (CORBA::ULong) *array->integer ();
+
+    switch (kind)
     {
-      // If we are here (from visit_component) the Any containing the
-      // component as found in filterable_data_ will be in
-      // current_value_.
-      CORBA::TypeCode_var tc = this->current_value_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      DynamicAny::DynAny_var member;
-      CORBA::Boolean success = 0;
-      CORBA::ULong slot = (CORBA::ULong) *array->integer ();
-
-      switch (kind)
+    case CORBA::tk_array:
       {
-        case CORBA::tk_array:
-          {
-            TAO_DynEnum_i dyn_array;
-            dyn_array.init (this->current_value_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        TAO_DynEnum_i dyn_array;
+        dyn_array.init (this->current_value_.in ()
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            success = dyn_array.seek (slot
-                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        success = dyn_array.seek (slot
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            if (success == 0)
-              return -1;
+        if (success == 0)
+          return -1;
 
-            member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            break;
-          }
-        case CORBA::tk_sequence:
-          {
-            TAO_DynStruct_i dyn_sequence;
-            dyn_sequence.init (this->current_value_.in ()
-                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        break;
+      }
+    case CORBA::tk_sequence:
+      {
+        TAO_DynStruct_i dyn_sequence;
+        dyn_sequence.init (this->current_value_.in ()
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            success = dyn_sequence.seek (slot
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        success = dyn_sequence.seek (slot
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            if (success == 0)
-              return -1;
+        if (success == 0)
+          return -1;
 
-            member =
-              dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+        member =
+          dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
 
-            break;
-          }
-        // Enums and sequences are the only two cases handled
-        // by Component_Array.
-        default:
-          return -1;
+        break;
       }
+      // Enums and sequences are the only two cases handled
+      // by Component_Array.
+    default:
+      return -1;
+    }
 
-      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      TAO_ETCL_Constraint *comp = array->component ();
+    TAO_ETCL_Constraint *comp = array->component ();
 
-      if (comp == 0)
-        {
-          TAO_ETCL_Literal_Constraint result (value.ptr ());
-          this->queue_.enqueue_head (result);
-          return 0;
-        }
-      else
-        {
-          this->current_value_ = value._retn ();
-          return comp->accept (this);
-        }
+    if (comp == 0)
+    {
+      TAO_ETCL_Literal_Constraint result (value.ptr ());
+      this->queue_.enqueue_head (result);
+      return 0;
     }
-  ACE_CATCHANY
+    else
     {
-      return -1;
+      this->current_value_ = value._retn ();
+      return comp->accept (this);
     }
+  }
+  ACE_CATCHANY
+  {
+    return -1;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
@@ -585,111 +584,109 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      CORBA::TypeCode_var tc = this->current_value_->type ();
-      tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    CORBA::TypeCode_var tc = this->current_value_->type ();
+    tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
       CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      switch (special->type ())
-        {
-        case TAO_ETCL_LENGTH:
-          {
-            CORBA::ULong length;
+    switch (special->type ())
+    {
+    case TAO_ETCL_LENGTH:
+      {
+        CORBA::ULong length;
 
             switch (kind)
-              {
-              case CORBA::tk_sequence:
-                {
-                  TAO_DynSequence_i dyn_seq;
-                  dyn_seq.init (current_value_.in()
-                                ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-
-                  DynamicAny::AnySeq_var any_seq =
-                    dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-
-                  length = any_seq->length ();
-                }
-              break;
-              case CORBA::tk_array:
-                {
-                  length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                }
-              break;
-              default:
-                return -1;
-              }
-
-            TAO_ETCL_Literal_Constraint lit (length);
-            this->queue_.enqueue_head (lit);
-            return 0;
-          }
-        case TAO_ETCL_DISCRIMINANT:
+        {
+        case CORBA::tk_sequence:
           {
-            // If the TCKind is not a union, the call to init() will
-            // raise an exception, and the catch block will return -1;
-            TAO_DynUnion_i dyn_union;
-            dyn_union.init (this->current_value_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            DynamicAny::DynAny_var disc =
-              dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
+            TAO_DynSequence_i dyn_seq;
+            dyn_seq.init (current_value_.in()
+              ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+            DynamicAny::AnySeq_var any_seq =
+              dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
-            this->queue_.enqueue_head (lit);
-            return 0;
+            length = any_seq->length ();
           }
-        case TAO_ETCL_TYPE_ID:
-          {
-            const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            TAO_ETCL_Literal_Constraint lit (name);
-            this->queue_.enqueue_head (lit);
-            return 0;
-          }
-        case TAO_ETCL_REPOS_ID:
+          break;
+        case CORBA::tk_array:
           {
-            const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+            length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-
-            TAO_ETCL_Literal_Constraint lit (id);
-            this->queue_.enqueue_head (lit);
-            return 0;
           }
+          break;
         default:
           return -1;
         }
-    }
-  ACE_CATCHANY
-    {
+
+        TAO_ETCL_Literal_Constraint lit (length);
+        this->queue_.enqueue_head (lit);
+        return 0;
+      }
+    case TAO_ETCL_DISCRIMINANT:
+      {
+        // If the TCKind is not a union, the call to init() will
+        // raise an exception, and the catch block will return -1;
+        TAO_DynUnion_i dyn_union;
+        dyn_union.init (this->current_value_.in ()
+          ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        DynamicAny::DynAny_var disc =
+          dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
+        this->queue_.enqueue_head (lit);
+        return 0;
+      }
+    case TAO_ETCL_TYPE_ID:
+      {
+        const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        TAO_ETCL_Literal_Constraint lit (name);
+        this->queue_.enqueue_head (lit);
+        return 0;
+      }
+    case TAO_ETCL_REPOS_ID:
+      {
+        const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        TAO_ETCL_Literal_Constraint lit (id);
+        this->queue_.enqueue_head (lit);
+        return 0;
+      }
+    default:
       return -1;
     }
+  }
+  ACE_CATCHANY
+  {
+    return -1;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_component (
-    TAO_ETCL_Component *component
+  TAO_ETCL_Component *component
   )
 {
   TAO_ETCL_Constraint *nested = component->component ();
   TAO_ETCL_Identifier *identifier = component->identifier ();
   ACE_CString component_name (identifier->value (),
-                              0,
-                              0);
+    0,
+    0);
   CORBA::Any *any_ptr = 0;
 
   if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0)
@@ -704,71 +701,71 @@ TAO_Notify_Constraint_Visitor::visit_component (
   // names in CosNotification::StructuredEvent, we just visit the
   // nested component, if any.
   if (this->implicit_id_ == TAO_Notify_Constraint_Visitor::EMPTY)
+  {
+    if (nested == 0)
     {
-      if (nested == 0)
-        {
-          // If this is the end of the line, we put the component name
-          // into current_value_ so visit_exist can use it.
-          ACE_NEW_RETURN (any_ptr,
-                          CORBA::Any,
-                          -1);
-          (*any_ptr) <<= component_name.c_str ();
-          this->current_value_ = any_ptr;
-          return identifier->accept (this);
-        }
-      else
-        {
-          int result = identifier->accept (this);
+      // If this is the end of the line, we put the component name
+      // into current_value_ so visit_exist can use it.
+      ACE_NEW_RETURN (any_ptr,
+        CORBA::Any,
+        -1);
+      (*any_ptr) <<= component_name.c_str ();
+      this->current_value_ = any_ptr;
+      return identifier->accept (this);
+    }
+    else
+    {
+      int result = identifier->accept (this);
 
-          if (result != 0)
-            return result;
+      if (result != 0)
+        return result;
 
-          TAO_ETCL_Literal_Constraint id;
-          this->queue_.dequeue_head (id);
-          ACE_NEW_RETURN (any_ptr,
-                          CORBA::Any (*(const CORBA::Any *) id),
-                          -1);
-          this->current_value_ = any_ptr;
-        }
+      TAO_ETCL_Literal_Constraint id;
+      this->queue_.dequeue_head (id);
+      ACE_NEW_RETURN (any_ptr,
+        CORBA::Any (*(const CORBA::Any *) id),
+        -1);
+      this->current_value_ = any_ptr;
     }
+  }
 
   if (nested != 0)
     return nested->accept (this);
   else
+  {
+    switch (this->implicit_id_)
     {
-      switch (this->implicit_id_)
-        {
-        case TYPE_NAME:
-          {
-            TAO_ETCL_Literal_Constraint tn (this->type_name_.in ());
-            this->queue_.enqueue_head (tn);
-            return 0;
-          }
-        case EVENT_NAME:
-          {
-            TAO_ETCL_Literal_Constraint en (this->event_name_.in ());
-            this->queue_.enqueue_head (en);
-            return 0;
-          }
-        case DOMAIN_NAME:
-          {
-            TAO_ETCL_Literal_Constraint dn (this->domain_name_.in ());
-            this->queue_.enqueue_head (dn);
-            return 0;
-          }
-        case REMAINDER_OF_BODY:
-          {
-            TAO_ETCL_Literal_Constraint rob (&this->remainder_of_body_);
-            this->queue_.enqueue_head (rob);
-            return 0;
-          }
-        // The above cases are the leaves of the
-        // CosNotification::StructuredEvent "tree". Anything else and we
-        // should have a nested component. otherwise, it's an error.
-        default:
-          return -1;
-        }
+    case TYPE_NAME:
+      {
+        TAO_ETCL_Literal_Constraint tn (this->type_name_.in ());
+        this->queue_.enqueue_head (tn);
+        return 0;
+      }
+    case EVENT_NAME:
+      {
+        TAO_ETCL_Literal_Constraint en (this->event_name_.in ());
+        this->queue_.enqueue_head (en);
+        return 0;
+      }
+    case DOMAIN_NAME:
+      {
+        TAO_ETCL_Literal_Constraint dn (this->domain_name_.in ());
+        this->queue_.enqueue_head (dn);
+        return 0;
+      }
+    case REMAINDER_OF_BODY:
+      {
+        TAO_ETCL_Literal_Constraint rob (&this->remainder_of_body_);
+        this->queue_.enqueue_head (rob);
+        return 0;
+      }
+      // The above cases are the leaves of the
+      // CosNotification::StructuredEvent "tree". Anything else and we
+      // should have a nested component. otherwise, it's an error.
+    default:
+      return -1;
     }
+  }
 }
 
 int
@@ -800,36 +797,34 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      CORBA::TypeCode_var tc = this->current_value_->type ();
+  {
+    CORBA::TypeCode_var tc = this->current_value_->type ();
 
-      // If the current member is not a union, this call will throw
-      // BadKind and the catch block will return -1.
-      CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    // If the current member is not a union, this call will throw
+    // BadKind and the catch block will return -1.
+    CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // No default index.
-      if (default_index == -1)
-        {
-          TAO_ETCL_Literal_Constraint result ((CORBA::Boolean) 0);
-          this->queue_.enqueue_head (result);
-          return 0;
-        }
+    // No default index.
+    if (default_index == -1)
+    {
+      TAO_ETCL_Literal_Constraint result ((CORBA::Boolean) 0);
+      this->queue_.enqueue_head (result);
+      return 0;
+    }
 
-      // Okay, there's a default index, but is it active?
+    // Okay, there's a default index, but is it active?
 
-      TAO_ETCL_Literal_Constraint disc;
-      this->queue_.dequeue_head (disc);
-      TAO_ETCL_Literal_Constraint default_index_value (default_index);
-      return (disc == default_index_value);
-    }
+    TAO_ETCL_Literal_Constraint disc;
+    this->queue_.dequeue_head (disc);
+    TAO_ETCL_Literal_Constraint default_index_value (default_index);
+    return (disc == default_index_value);
+  }
   ACE_CATCHANY
-    {
-      return -1;
-    }
+  {
+    return -1;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 int
@@ -838,131 +833,131 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
   TAO_ETCL_Constraint *component = exist->component ();
 
   if (component->accept (this) == 0)
+  {
+    const char *value = 0;
+    CORBA::Boolean result = 0;
+
+    // For the two cases below, we don't want the item at the top of
+    // the queue, because it's the result of a hash table
+    // lookup. For an existence test, we want the key value, which
+    // is stored in the current_value_ member.
+    if (this->implicit_id_ == FILTERABLE_DATA
+      || this->implicit_id_ == VARIABLE_HEADER)
     {
-      const char *value = 0;
-      CORBA::Boolean result = 0;
-
-      // For the two cases below, we don't want the item at the top of
-      // the queue, because it's the result of a hash table
-      // lookup. For an existence test, we want the key value, which
-      // is stored in the current_value_ member.
-      if (this->implicit_id_ == FILTERABLE_DATA
-          || this->implicit_id_ == VARIABLE_HEADER)
-        {
-          TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ());
-          value = CORBA::string_dup ((const char *) current);
-        }
+      TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ());
+      value = CORBA::string_dup ((const char *) current);
+    }
 
-      switch (this->implicit_id_)
-      {
-        case FILTERABLE_DATA:
-          result =
-            (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0);
-          break;
-        case VARIABLE_HEADER:
-          result =
-            (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0);
-          break;
-        case TYPE_NAME:
-          result = (this->type_name_.in () != 0);
-          break;
-        case EVENT_NAME:
-          result = (this->event_name_.in () != 0);
-          break;
-        case DOMAIN_NAME:
-          result = (this->domain_name_.in () != 0);
-          break;
-        // Anything other than the above cases is an error.
-        default:
-          return -1;
-      }
+    switch (this->implicit_id_)
+    {
+    case FILTERABLE_DATA:
+      result =
+        (this->filterable_data_.find (ACE_CString (value, 0, 0)) == 0);
+      break;
+    case VARIABLE_HEADER:
+      result =
+        (this->variable_header_.find (ACE_CString (value, 0, 0)) == 0);
+      break;
+    case TYPE_NAME:
+      result = (this->type_name_.in () != 0);
+      break;
+    case EVENT_NAME:
+      result = (this->event_name_.in () != 0);
+      break;
+    case DOMAIN_NAME:
+      result = (this->domain_name_.in () != 0);
+      break;
+      // Anything other than the above cases is an error.
+    default:
+      return -1;
+    }
 
-      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+    this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
 
-      return 0;
-    }
+    return 0;
+  }
 
   return -1;
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_unary_expr (
-    TAO_ETCL_Unary_Expr *unary_expr
+  TAO_ETCL_Unary_Expr *unary_expr
   )
 {
   TAO_ETCL_Constraint *subexpr = unary_expr->subexpr ();
 
   if (subexpr->accept (this) == 0)
-    {
-      TAO_ETCL_Literal_Constraint subexpr_result;
-      CORBA::Boolean result = 0;
-      int op_type = unary_expr->type ();
+  {
+    TAO_ETCL_Literal_Constraint subexpr_result;
+    CORBA::Boolean result = 0;
+    int op_type = unary_expr->type ();
 
-      switch (op_type)
-      {
-        case TAO_ETCL_NOT:
-          this->queue_.dequeue_head (subexpr_result);
-          result = ! (CORBA::Boolean) subexpr_result;
-          this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-          return 0;
-        case TAO_ETCL_MINUS:
-          // The leading '-' was parsed separately, so we have to pull
-          // the literal constraint off the queue, apply the class' own
-          // unary minus operator, and put it back.
-          this->queue_.dequeue_head (subexpr_result);
-          this->queue_.enqueue_head (-subexpr_result);
-          return 0;
-        case TAO_ETCL_PLUS:
-          // Leave the literal constraint on the queue. The leading
-          // '+' was just syntactic sugar - no action is necessary.
-          return 0;
-        default:
-          // The parser should never construct a TAO_ETCL_Unary_Constraint
-          // behind any operators except the above three.
-          return -1;
-      }
+    switch (op_type)
+    {
+    case TAO_ETCL_NOT:
+      this->queue_.dequeue_head (subexpr_result);
+      result = ! (CORBA::Boolean) subexpr_result;
+      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+      return 0;
+    case TAO_ETCL_MINUS:
+      // The leading '-' was parsed separately, so we have to pull
+      // the literal constraint off the queue, apply the class' own
+      // unary minus operator, and put it back.
+      this->queue_.dequeue_head (subexpr_result);
+      this->queue_.enqueue_head (-subexpr_result);
+      return 0;
+    case TAO_ETCL_PLUS:
+      // Leave the literal constraint on the queue. The leading
+      // '+' was just syntactic sugar - no action is necessary.
+      return 0;
+    default:
+      // The parser should never construct a TAO_ETCL_Unary_Constraint
+      // behind any operators except the above three.
+      return -1;
     }
+  }
 
   return -1;
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_binary_expr (
-    TAO_ETCL_Binary_Expr *binary_expr
+  TAO_ETCL_Binary_Expr *binary_expr
   )
 {
   int bin_op_type = binary_expr->type ();
 
   switch (bin_op_type)
   {
-    case TAO_ETCL_OR:
-      return this->visit_or (binary_expr);
-    case TAO_ETCL_AND:
-      return this->visit_and (binary_expr);
-    case TAO_ETCL_LT:
-    case TAO_ETCL_LE:
-    case TAO_ETCL_GT:
-    case TAO_ETCL_GE:
-    case TAO_ETCL_EQ:
-    case TAO_ETCL_NE:
-    case TAO_ETCL_PLUS:
-    case TAO_ETCL_MINUS:
-    case TAO_ETCL_MULT:
-    case TAO_ETCL_DIV:
-      return this->visit_binary_op (binary_expr,
-                                    bin_op_type);
-    case TAO_ETCL_TWIDDLE:
-      return this->visit_twiddle (binary_expr);
-    case TAO_ETCL_IN:
-      return this->visit_in (binary_expr);
-    default:
-      return -1;
+  case TAO_ETCL_OR:
+    return this->visit_or (binary_expr);
+  case TAO_ETCL_AND:
+    return this->visit_and (binary_expr);
+  case TAO_ETCL_LT:
+  case TAO_ETCL_LE:
+  case TAO_ETCL_GT:
+  case TAO_ETCL_GE:
+  case TAO_ETCL_EQ:
+  case TAO_ETCL_NE:
+  case TAO_ETCL_PLUS:
+  case TAO_ETCL_MINUS:
+  case TAO_ETCL_MULT:
+  case TAO_ETCL_DIV:
+    return this->visit_binary_op (binary_expr,
+      bin_op_type);
+  case TAO_ETCL_TWIDDLE:
+    return this->visit_twiddle (binary_expr);
+  case TAO_ETCL_IN:
+    return this->visit_in (binary_expr);
+  default:
+    return -1;
   }
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_or (
-    TAO_ETCL_Binary_Expr *binary
+  TAO_ETCL_Binary_Expr *binary
   )
 {
   int return_value = -1;
@@ -970,27 +965,27 @@ TAO_Notify_Constraint_Visitor::visit_or (
   TAO_ETCL_Constraint *lhs = binary->lhs ();
 
   if (lhs->accept (this) == 0)
-    {
-      TAO_ETCL_Literal_Constraint lhs_result;
-      this->queue_.dequeue_head (lhs_result);
-      result = (CORBA::Boolean) lhs_result;
+  {
+    TAO_ETCL_Literal_Constraint lhs_result;
+    this->queue_.dequeue_head (lhs_result);
+    result = (CORBA::Boolean) lhs_result;
 
-      // Short-circuiting OR.
-      if (result == 0)
-        {
-          TAO_ETCL_Constraint *rhs = binary->rhs ();
+    // Short-circuiting OR.
+    if (result == 0)
+    {
+      TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-          if (rhs->accept (this) == 0)
-            {
-              TAO_ETCL_Literal_Constraint rhs_result;
-              this->queue_.dequeue_head (rhs_result);
-              result = (CORBA::Boolean) rhs_result;
-              return_value = 0;
-            }
-        }
-      else
+      if (rhs->accept (this) == 0)
+      {
+        TAO_ETCL_Literal_Constraint rhs_result;
+        this->queue_.dequeue_head (rhs_result);
+        result = (CORBA::Boolean) rhs_result;
         return_value = 0;
+      }
     }
+    else
+      return_value = 0;
+  }
 
   if (return_value == 0)
     this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
@@ -1006,27 +1001,27 @@ TAO_Notify_Constraint_Visitor::visit_and (TAO_ETCL_Binary_Expr *binary)
   TAO_ETCL_Constraint *lhs = binary->lhs ();
 
   if (lhs->accept (this) == 0)
-    {
-      TAO_ETCL_Literal_Constraint lhs_result;
-      this->queue_.dequeue_head (lhs_result);
-      result = (CORBA::Boolean) lhs_result;
+  {
+    TAO_ETCL_Literal_Constraint lhs_result;
+    this->queue_.dequeue_head (lhs_result);
+    result = (CORBA::Boolean) lhs_result;
 
-      // Short-circuiting AND.
-      if (result == 1)
-        {
-          TAO_ETCL_Constraint *rhs = binary->rhs ();
+    // Short-circuiting AND.
+    if (result == 1)
+    {
+      TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-          if (rhs->accept (this) == 0)
-            {
-              TAO_ETCL_Literal_Constraint rhs_result;
-              this->queue_.dequeue_head (rhs_result);
-              result = (CORBA::Boolean) rhs_result;
-              return_value = 0;
-            }
-        }
-      else
+      if (rhs->accept (this) == 0)
+      {
+        TAO_ETCL_Literal_Constraint rhs_result;
+        this->queue_.dequeue_head (rhs_result);
+        result = (CORBA::Boolean) rhs_result;
         return_value = 0;
+      }
     }
+    else
+      return_value = 0;
+  }
 
   if (return_value == 0)
     this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
@@ -1045,60 +1040,60 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (TAO_ETCL_Binary_Expr *binary,
   // Perform an operation on the results of evaluating the left and
   // right branches of this subtree.
   if (lhs->accept (this) == 0)
-    {
-      TAO_ETCL_Literal_Constraint left_operand;
-      this->queue_.dequeue_head (left_operand);
-      TAO_ETCL_Constraint *rhs = binary->rhs ();
+  {
+    TAO_ETCL_Literal_Constraint left_operand;
+    this->queue_.dequeue_head (left_operand);
+    TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-      if (rhs->accept (this) == 0)
-        {
-          TAO_ETCL_Literal_Constraint right_operand;
-          this->queue_.dequeue_head (right_operand);
-          return_value = 0;
+    if (rhs->accept (this) == 0)
+    {
+      TAO_ETCL_Literal_Constraint right_operand;
+      this->queue_.dequeue_head (right_operand);
+      return_value = 0;
 
-          switch (op_type)
-          {
-            case TAO_ETCL_LT:
-              result = left_operand < right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_LE:
-              result = left_operand <= right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_GT:
-              result = left_operand > right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_GE:
-              result = left_operand >= right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_EQ:
-              result = left_operand == right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_NE:
-              result = left_operand != right_operand;
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              break;
-            case TAO_ETCL_PLUS:
-              this->queue_.enqueue_head (left_operand + right_operand);
-              break;
-            case TAO_ETCL_MINUS:
-              this->queue_.enqueue_head (left_operand - right_operand);
-              break;
-            case TAO_ETCL_MULT:
-              this->queue_.enqueue_head (left_operand * right_operand);
-              break;
-            case TAO_ETCL_DIV:
-              this->queue_.enqueue_head (left_operand / right_operand);
-              break;
-            default:
-              return_value = -1;
-          }
-        }
+      switch (op_type)
+      {
+      case TAO_ETCL_LT:
+        result = left_operand < right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_LE:
+        result = left_operand <= right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_GT:
+        result = left_operand > right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_GE:
+        result = left_operand >= right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_EQ:
+        result = left_operand == right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_NE:
+        result = left_operand != right_operand;
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        break;
+      case TAO_ETCL_PLUS:
+        this->queue_.enqueue_head (left_operand + right_operand);
+        break;
+      case TAO_ETCL_MINUS:
+        this->queue_.enqueue_head (left_operand - right_operand);
+        break;
+      case TAO_ETCL_MULT:
+        this->queue_.enqueue_head (left_operand * right_operand);
+        break;
+      case TAO_ETCL_DIV:
+        this->queue_.enqueue_head (left_operand / right_operand);
+        break;
+      default:
+        return_value = -1;
+      }
     }
+  }
 
   return return_value;
 }
@@ -1111,22 +1106,22 @@ TAO_Notify_Constraint_Visitor::visit_twiddle (TAO_ETCL_Binary_Expr *binary)
 
   // Determine if the left operand is a substring of the right.
   if (lhs->accept (this) == 0)
-    {
-      TAO_ETCL_Literal_Constraint left;
-      this->queue_.dequeue_head (left);
-      TAO_ETCL_Constraint *rhs = binary->rhs ();
+  {
+    TAO_ETCL_Literal_Constraint left;
+    this->queue_.dequeue_head (left);
+    TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-      if (rhs->accept (this) == 0)
-        {
-          TAO_ETCL_Literal_Constraint right;
-          this->queue_.dequeue_head (right);
-          CORBA::Boolean result =
-            (ACE_OS::strstr ((const char *) right,
-                             (const char *) left) != 0);
-          this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-          return_value = 0;
-        }
+    if (rhs->accept (this) == 0)
+    {
+      TAO_ETCL_Literal_Constraint right;
+      this->queue_.dequeue_head (right);
+      CORBA::Boolean result =
+        (ACE_OS::strstr ((const char *) right,
+        (const char *) left) != 0);
+      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+      return_value = 0;
     }
+  }
 
   return return_value;
 }
@@ -1139,69 +1134,69 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
 
   // Determine if the left operand is contained in the right.
   if (lhs->accept (this) == 0)
+  {
+    TAO_ETCL_Literal_Constraint left;
+    this->queue_.dequeue_head (left);
+
+    TAO_ETCL_Constraint *rhs = binary->rhs ();
+
+    if (rhs->accept (this) == 0)
     {
-      TAO_ETCL_Literal_Constraint left;
-      this->queue_.dequeue_head (left);
+      TAO_ETCL_Literal_Constraint bag;
+      this->queue_.dequeue_head (bag);
 
-      TAO_ETCL_Constraint *rhs = binary->rhs ();
+      if (bag.expr_type () == TAO_ETCL_COMPONENT)
+      {
+        const CORBA::Any *component = (const CORBA::Any *) bag;
+        CORBA::TCKind kind = CORBA::tk_null;
 
-      if (rhs->accept (this) == 0)
+        ACE_DECLARE_NEW_CORBA_ENV;
+        ACE_TRY
+        {
+          CORBA::TypeCode_var tc = component->type ();
+          kind = TAO_DynAnyFactory::unalias (tc.in ()
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+        ACE_CATCHANY
         {
-          TAO_ETCL_Literal_Constraint bag;
-          this->queue_.dequeue_head (bag);
+          return return_value;
+        }
+        ACE_ENDTRY;
 
-          if (bag.expr_type () == TAO_ETCL_COMPONENT)
-            {
-              const CORBA::Any *component = (const CORBA::Any *) bag;
-              CORBA::TCKind kind = CORBA::tk_null;
-
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY
-                {
-                  CORBA::TypeCode_var tc = component->type ();
-                  kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                }
-              ACE_CATCHANY
-                {
-                  return return_value;
-                }
-              ACE_ENDTRY;
-
-              CORBA::Boolean result = 0;
-
-              switch (kind)
-                {
-                case CORBA::tk_sequence:
-                  result = this->sequence_does_contain (component,
-                                                        left);
-                  break;
-                case CORBA::tk_array:
-                  result = this->array_does_contain (component,
-                                                     left);
-                  break;
-                case CORBA::tk_struct:
-                  result = this->struct_does_contain (component,
-                                                      left);
-                  break;
-                case CORBA::tk_union:
-                  result = this->union_does_contain (component,
-                                                     left);
-                  break;
-                case CORBA::tk_any:
-                  result = this->any_does_contain (component,
-                                                   left);
-                  break;
-                default:
-                  return return_value;
-                }
-
-              this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-              return_value = 0;
-            }
+        CORBA::Boolean result = 0;
+
+        switch (kind)
+        {
+        case CORBA::tk_sequence:
+          result = this->sequence_does_contain (component,
+            left);
+          break;
+        case CORBA::tk_array:
+          result = this->array_does_contain (component,
+            left);
+          break;
+        case CORBA::tk_struct:
+          result = this->struct_does_contain (component,
+            left);
+          break;
+        case CORBA::tk_union:
+          result = this->union_does_contain (component,
+            left);
+          break;
+        case CORBA::tk_any:
+          result = this->any_does_contain (component,
+            left);
+          break;
+        default:
+          return return_value;
         }
+
+        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
+        return_value = 0;
+      }
     }
+  }
 
   return return_value;
 }
@@ -1222,47 +1217,49 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      CORBA::TypeCode_var type = any->type ();
-      CORBA::TypeCode_var base_type =
-        TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
-      CORBA::TypeCode_var content_type =
-        base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // The literal and the array elements must be
-      // of the same simple type.
-      CORBA::Boolean match = this->simple_type_match (item.expr_type (),
-                                                      kind);
-
-      if (match == 0)
-        return 0;
+  {
+    CORBA::TypeCode_var type = any->type ();
+    CORBA::TypeCode_var base_type =
+      TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    CORBA::TypeCode_var content_type =
+      base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    CORBA::TCKind kind =
+      TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    // The literal and the array elements must be
+    // of the same simple type.
+    CORBA::Boolean match = this->simple_type_match (item.expr_type (),
+      kind);
+
+    if (match == 0)
+      return 0;
 
-      TAO_DynSequence_i dyn_seq;
-      dyn_seq.init (*any
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    TAO_DynSequence_i dyn_seq;
+    dyn_seq.init (*any
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      DynamicAny::AnySeq_var any_seq =
-        dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    DynamicAny::AnySeq_var any_seq =
+      dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      CORBA::ULong length = any_seq->length ();
+    CORBA::ULong length = any_seq->length ();
 
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          TAO_ETCL_Literal_Constraint element (&any_seq[i]);
+    for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      TAO_ETCL_Literal_Constraint element (&any_seq[i]);
 
-          if (item == element)
-            return 1;
-        }
+      if (item == element)
+        return 1;
     }
+  }
   ACE_CATCHANY
-    {
-      return 0;
-    }
+  {
+    return 0;
+  }
   ACE_ENDTRY;
 
   return 0;
@@ -1274,43 +1271,43 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    CORBA::TypeCode_var type = any->type ();
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // The literal and the array elements must be
-      // of the same simple type.
-      CORBA::Boolean match = this->simple_type_match (item.expr_type (),
-                                                      kind);
+    // The literal and the array elements must be
+    // of the same simple type.
+    CORBA::Boolean match = this->simple_type_match (item.expr_type (),
+      kind);
 
-      if (match == 0)
-        return 0;
+    if (match == 0)
+      return 0;
 
-      TAO_DynArray_i dyn_array;
-      dyn_array.init (*any
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    TAO_DynArray_i dyn_array;
+    dyn_array.init (*any
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      DynamicAny::AnySeq_var any_seq =
-        dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    DynamicAny::AnySeq_var any_seq =
+      dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      CORBA::ULong length = any_seq->length ();
+    CORBA::ULong length = any_seq->length ();
 
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          TAO_ETCL_Literal_Constraint element (&any_seq[i]);
+    for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      TAO_ETCL_Literal_Constraint element (&any_seq[i]);
 
-          if (item == element)
-            return 1;
-        }
+      if (item == element)
+        return 1;
     }
+  }
   ACE_CATCHANY
-    {
-      return 0;
-    }
+  {
+    return 0;
+  }
   ACE_ENDTRY;
 
   return 0;
@@ -1322,45 +1319,45 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      TAO_DynStruct_i dyn_struct;
-      dyn_struct.init (*any
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    TAO_DynStruct_i dyn_struct;
+    dyn_struct.init (*any
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      DynamicAny::NameValuePairSeq_var members =
-        dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    DynamicAny::NameValuePairSeq_var members =
+      dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      CORBA::ULong length = members->length ();
-      CORBA::TypeCode_var tc;
-      CORBA::TCKind kind;
+    CORBA::ULong length = members->length ();
+    CORBA::TypeCode_var tc;
+    CORBA::TCKind kind;
 
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          tc = members[i].value.type ();
-          kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+    for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      tc = members[i].value.type ();
+      kind = TAO_DynAnyFactory::unalias (tc.in ()
+        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          // The literal and the struct member must be
-          // of the same simple type.
-          CORBA::Boolean match = this->simple_type_match (item.expr_type (),
-                                                          kind);
+      // The literal and the struct member must be
+      // of the same simple type.
+      CORBA::Boolean match = this->simple_type_match (item.expr_type (),
+        kind);
 
-          if (match == 0)
-            continue;
+      if (match == 0)
+        continue;
 
-          TAO_ETCL_Literal_Constraint element (&members[i].value);
+      TAO_ETCL_Literal_Constraint element (&members[i].value);
 
-          if (item == element)
-            return 1;
-        }
+      if (item == element)
+        return 1;
     }
+  }
   ACE_CATCHANY
-    {
-      return 0;
-    }
+  {
+    return 0;
+  }
   ACE_ENDTRY;
 
   return 0;
@@ -1372,56 +1369,54 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      TAO_DynUnion_i dyn_union;
-      dyn_union.init (*any
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    TAO_DynUnion_i dyn_union;
+    dyn_union.init (*any
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      DynamicAny::DynAny_var cc =
-        dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    DynamicAny::DynAny_var cc =
+      dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tc = member->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    CORBA::TypeCode_var tc = member->type ();
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // The literal and the union member must be
-      // of the same simple type.
-      CORBA::Boolean match = this->simple_type_match (item.expr_type (),
-                                                      kind);
+    // The literal and the union member must be
+    // of the same simple type.
+    CORBA::Boolean match = this->simple_type_match (item.expr_type (),
+      kind);
 
-      if (match == 0)
-        return 0;
+    if (match == 0)
+      return 0;
 
-      TAO_ETCL_Literal_Constraint element (&member.inout ());
+    TAO_ETCL_Literal_Constraint element (&member.inout ());
 
-      return (item == element);
-    }
+    return (item == element);
+  }
   ACE_CATCHANY
-    {
-      return 0;
-    }
+  {
+    return 0;
+  }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0);
 }
 
 CORBA::Boolean
 TAO_Notify_Constraint_Visitor::any_does_contain (
-    const CORBA::Any *any,
-    TAO_ETCL_Literal_Constraint &item
+  const CORBA::Any *any,
+  TAO_ETCL_Literal_Constraint &item
   )
 {
   const CORBA::Any *result = 0;
 
   *any >>= result;
 
-  TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *> (result));
+  TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *>(result));
   return item == element;
 }
 
@@ -1431,34 +1426,40 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type,
 {
   switch (expr_type)
   {
-    case TAO_ETCL_STRING:
-      if (tc_kind != CORBA::tk_string)
-        return 0;
-      break;
-    case TAO_ETCL_DOUBLE:
-      if (tc_kind != CORBA::tk_double
-          && tc_kind != CORBA::tk_float)
-        return 0;
-      break;
-    case TAO_ETCL_INTEGER:
-    case TAO_ETCL_SIGNED:
-      if (tc_kind != CORBA::tk_short
-          && tc_kind != CORBA::tk_long
-          && tc_kind != CORBA::tk_longlong)
-        return 0;
-      break;
-    case TAO_ETCL_UNSIGNED:
-      if (tc_kind != CORBA::tk_ushort
-          && tc_kind != CORBA::tk_ulong
-          && tc_kind != CORBA::tk_ulonglong)
-        return 0;
-      break;
-    case TAO_ETCL_BOOLEAN:
-      if (tc_kind != CORBA::tk_boolean)
-        return 0;
-      break;
-    default:
+  case TAO_ETCL_STRING:
+    if (tc_kind != CORBA::tk_string)
+      return 0;
+    break;
+  case TAO_ETCL_DOUBLE:
+    if (tc_kind != CORBA::tk_double
+      && tc_kind != CORBA::tk_float)
+      return 0;
+    break;
+  case TAO_ETCL_INTEGER:
+  case TAO_ETCL_SIGNED:
+    if (tc_kind != CORBA::tk_short
+      && tc_kind != CORBA::tk_long
+      && tc_kind != CORBA::tk_longlong)
       return 0;
+    break;
+  case TAO_ETCL_UNSIGNED:
+    if (tc_kind != CORBA::tk_ushort
+      && tc_kind != CORBA::tk_ulong
+      && tc_kind != CORBA::tk_ulonglong)
+      return 0;
+    break;
+  case TAO_ETCL_BOOLEAN:
+    if (tc_kind != CORBA::tk_boolean)
+      return 0;
+    break;
+  default:
+    return 0;
   }
   return 1;
 }
+
+const size_t TAO_Notify_Constraint_Visitor::implicit_ids_size_ = 27;
+const size_t TAO_Notify_Constraint_Visitor::filterable_data_size_ = 31;
+const size_t TAO_Notify_Constraint_Visitor::variable_header_size_ = 31;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index fb4d48ee3ff..2033737b4ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -1,11 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notify_Constraint_Visitors.h
  *
  *  $Id$
  *
- *
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
  *  @author Jeff Parsons <parsons@cs.wustl.edu>
  */
@@ -18,6 +18,7 @@
 #include /**/ "ace/pre.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Unbounded_Queue.h"
+#include "ace/Null_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,7 +28,9 @@
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/CosNotificationC.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Property_Constraint;
 
@@ -110,17 +113,32 @@ protected:
   /// Storage for the type of implicit id the component has (if any).
   structured_event_field implicit_id_;
 
+  /// Size of implicit_ids_ hash map.
+  /// @note A fixed set of 9 keys are stored in this map.  In the absence
+  /// of a minimal perfect hash, ACE's default hash_pjw() and a hash size
+  /// of 27 ensures each element is hashed to a unique bucket.
+  /// TODO: define inline once VC6 support is deprecated.
+  static const size_t implicit_ids_size_;
+
   /// Lookup table for the implicit ids, to avoid string comparisons in
   /// derived visitors.
-  ACE_Hash_Map_Manager <ACE_CString, structured_event_field, TAO_SYNCH_MUTEX>
+  ACE_Hash_Map_Manager <ACE_CString, structured_event_field, ACE_Null_Mutex>
     implicit_ids_;
 
-    /// Used to lookup names and values in the event's 'filterable_data' field.
-  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX>
+  /// Size of filterable_data_ hash map.
+  /// TODO: define inline once VC6 support is deprecated.
+  static const size_t filterable_data_size_;
+
+  /// Used to lookup names and values in the event's 'filterable_data' field.
+  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any, ACE_Null_Mutex>
     filterable_data_;
 
-    /// Used to lookup names and values in the event's 'variable_header' field.
-  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX>
+  /// Size of variable_header_ hash map.
+  /// TODO: define inline once VC6 support is deprecated.
+  static const size_t variable_header_size_;
+
+  /// Used to lookup names and values in the event's 'variable_header' field.
+  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any, ACE_Null_Mutex>
     variable_header_;
 
   /// Storage for string names under the structured event's
@@ -144,5 +162,7 @@ protected:
   CORBA::String_var current_name_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* NOTIFY_CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index fcc7dacc7df..5110d567625 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -1,12 +1,17 @@
 // $Id$
 
-#include "Notify_Default_CO_Factory.h"
+#include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
 
 ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Notify_Default_CO_Factory::init_svc (void)
 {
   // NOP.
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index c42ff3682a1..8976e345f10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -15,12 +15,16 @@
 #define NOTIFY_DEFAULT_CO_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Default_CO_Factory
  *
@@ -37,6 +41,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* NOTIFY_DEFAULT_CO_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index d1ac87b35e1..37a286dbb99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -1,12 +1,17 @@
 // $Id$
 
-#include "Notify_Default_Collection_Factory.h"
+#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
 
 ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Notify_Default_Collection_Factory::init_svc (void)
 {
   // NOP.
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index 42bbdb9af3c..c416d093de5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notify_Default_Collection_Factory.h
@@ -14,12 +15,16 @@
 #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Default_Collection_Factory
  *
@@ -36,5 +41,7 @@ public:
   static int init_svc (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* NOTIFY_DEFAULT_COLLECTION_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 5cfb1d7e8cb..2c9cc3f9237 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -1,12 +1,17 @@
 // $Id$
 
-#include "Notify_Default_EMO_Factory.h"
+#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
 
 ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Notify_Default_EMO_Factory::init_svc (void)
 {
   // NOP.
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index 7cb29c5264a..73023b439bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notify_Default_EMO_Factory.h
@@ -14,12 +15,16 @@
 #define NOTIFY_DEFAULT_EMO_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Default_EMO_Factory
  *
@@ -34,5 +39,7 @@ public:
   static int init_svc (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* NOTIFY_DEFAULT_EMO_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 046d1c507ff..6d32c554047 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -1,12 +1,17 @@
 // $Id$
 
-#include "Notify_Default_POA_Factory.h"
+#include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
 
 ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Notify_Default_POA_Factory::init_svc (void)
 {
   // NOP.
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index b80d61f9b53..62674479d29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notify_Default_POA_Factory.h
@@ -14,12 +15,16 @@
 #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Default_POA_Factory
  *
@@ -33,5 +38,7 @@ public:
   static int init_svc (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_DEFAULT_POA_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index fb3587a0e78..2bc881f15a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "Notify_EventChannelFactory_i.h"
+#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
 
-#include "Service.h"
+#include "orbsvcs/Notify/Service.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Core.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
 {
@@ -20,7 +22,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
     return notify_factory._retn ();
   }
 
-  TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*>(default_POA);
+  TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*> (default_POA);
 
   if (poa == 0)
     return notify_factory._retn ();
@@ -35,3 +37,5 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
 
   return notify_factory._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 91278b601ca..60ccb0b068d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file Notify_EventChannelFactory_i.h
@@ -14,12 +16,14 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_EventChannelFactory_i
  *
@@ -34,5 +38,7 @@ public:
   static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* NOTIFY_EVENTCHANNELFACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
index 64dc85743da..a73b9be6a6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
@@ -1,8 +1,12 @@
 // $Id$
 
-#include "Notify_Extensions.h"
+#include "orbsvcs/Notify/Notify_Extensions.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify_Extensions
 {
-  const char *const BlockingPolicy =  "BlockingPolicy";
+  const char BlockingPolicy[] = "BlockingPolicy";
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
index f79ffa1a0fe..247e7655d40 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
@@ -6,7 +6,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_export.h"
+#include "orbsvcs/Notify/notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -19,11 +19,15 @@
 #endif /* TAO_EXPORT_MACRO */
 #define TAO_EXPORT_MACRO TAO_Notify_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify_Extensions
 {
-  TAO_NAMESPACE_STORAGE_CLASS const char *const BlockingPolicy;
+  TAO_NAMESPACE_STORAGE_CLASS const char BlockingPolicy[];
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_NOTIFY_EXTENSIONS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index ceb2606ccfa..a00a6c374b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -1,31 +1,32 @@
 // $Id$
 
-#include "Object.h"
-#include "POA_Helper.h"
-#include "Worker_Task.h"
-#include "Properties.h"
-#include "Builder.h"
-#include "ThreadPool_Task.h"
-#include "Reactive_Task.h"
+#include "orbsvcs/Notify/Object.h"
+#include "orbsvcs/Notify/POA_Helper.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/ThreadPool_Task.h"
+#include "orbsvcs/Notify/Reactive_Task.h"
 #include "tao/debug.h"
+#include "orbsvcs/Notify/Event_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Object.inl"
+#include "orbsvcs/Notify/Object.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Object, "$Id$")
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Object::TAO_Notify_Object (void)
-  : poa_ (0)
-  , proxy_poa_ (0)
-  , own_proxy_poa_ (false)
-  , object_poa_ (0)
-  , own_object_poa_ (false)
-  , id_ (0)
-  , own_worker_task_ (false)
-  , shutdown_ (false)
+: poa_ (0)
+, proxy_poa_ (0)
+, own_proxy_poa_ (false)
+, object_poa_ (0)
+, own_object_poa_ (false)
+, id_ (0)
+, own_worker_task_ (false)
+, shutdown_ (false)
 {
   if (TAO_debug_level > 2 )
     ACE_DEBUG ((LM_DEBUG,"object:%x  created\n", this ));
@@ -88,19 +89,19 @@ void
 TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
-    {
-      this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Do not propagate any exceptions
-      if (TAO_debug_level > 2)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
-    ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
+    this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
   }
+  ACE_CATCHANY
+  {
+    // Do not propagate any exceptions
+    if (TAO_debug_level > 2)
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
+      ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
     }
+  }
   ACE_ENDTRY;
 }
 
@@ -117,6 +118,7 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (1);
 
   this->shutdown_worker_task ();
 
@@ -136,70 +138,70 @@ TAO_Notify_Object::shutdown_worker_task (void)
   TAO_Notify_Worker_Task::Ptr task( this->worker_task_ );
   this->worker_task_.reset();
   if ( task.isSet() )
-    {
+  {
     if ( this->own_worker_task_ )
     {
       task->shutdown ();
     }
-    }
+  }
 }
 
 void
 TAO_Notify_Object::destroy_proxy_poa (void)
 {
   if (this->proxy_poa_ != 0)
+  {
+    ACE_TRY_NEW_ENV
+    {
+      if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0;
+      if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0;
+
+      if ( this->own_proxy_poa_ == true )
+      {
+        this->own_proxy_poa_ = false;
+        ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ );
+        this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+      this->proxy_poa_ = 0;
+    }
+    ACE_CATCHANY
     {
-      ACE_TRY_NEW_ENV
-        {
-          if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0;
-          if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0;
-
-          if ( this->own_proxy_poa_ == true )
-          {
-            this->own_proxy_poa_ = false;
-          	ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ );
-          this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          }
-          this->proxy_poa_ = 0;
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 2)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Proxy shutdown error (%P|%t)\n");
-        }
-      ACE_ENDTRY;
+      if (TAO_debug_level > 2)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        "Proxy shutdown error (%P|%t)\n");
     }
+    ACE_ENDTRY;
+  }
 }
 
 void
 TAO_Notify_Object::destroy_object_poa (void)
 {
   if (this->object_poa_ != 0)
+  {
+    ACE_TRY_NEW_ENV
     {
-      ACE_TRY_NEW_ENV
-        {
-          if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0;
-          if ( this->object_poa_ == this->poa_ ) this->poa_ = 0;
-
-          if ( this->own_object_poa_ == true )
-          {
-            this->own_object_poa_ = false;
-          	ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ );
-          this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          }
-          this->object_poa_ = 0;
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 2)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Proxy shutdown error (%P|%t)\n");
-        }
-      ACE_ENDTRY;
+      if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0;
+      if ( this->object_poa_ == this->poa_ ) this->poa_ = 0;
+
+      if ( this->own_object_poa_ == true )
+      {
+        this->own_object_poa_ = false;
+        ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ );
+        this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+      this->object_poa_ = 0;
+    }
+    ACE_CATCHANY
+    {
+      if (TAO_debug_level > 2)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        "Proxy shutdown error (%P|%t)\n");
     }
+    ACE_ENDTRY;
+  }
 }
 
 /// Shutdown the current poa.
@@ -219,7 +221,6 @@ TAO_Notify_Object::set_worker_task (TAO_Notify_Worker_Task* worker_task)
   this->worker_task_.reset (worker_task);
 
   this->own_worker_task_ = true;
-
 }
 
 void
@@ -243,6 +244,7 @@ TAO_Notify_Object::set_object_poa (TAO_Notify_POA_Helper* object_poa)
 
   this->own_object_poa_ = true;
 }
+
 void
 TAO_Notify_Object::set_poa (TAO_Notify_POA_Helper* poa)
 {
@@ -261,16 +263,22 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A
 
   // Apply the appropriate concurrency QoS
   if (new_qos_properties.thread_pool ().is_valid ())
-    {
-      if (new_qos_properties.thread_pool ().value ().static_threads == 0)
+  {
+    if (new_qos_properties.thread_pool ().value ().static_threads == 0)
+      {
         TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
-      else
+        ACE_CHECK;
+      }
+    else
+      {
         TAO_Notify_PROPERTIES::instance()->builder()->
-          apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
-    }
+        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+  }
   else if (new_qos_properties.thread_pool_lane ().is_valid ())
     TAO_Notify_PROPERTIES::instance()->builder()->
-      apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
+    apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Update the Thread Task's QoS properties..
@@ -293,8 +301,8 @@ TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   CosNotification::QoSProperties_var properties;
 
   ACE_NEW_THROW_EX (properties,
-                    CosNotification::QoSProperties (),
-                    CORBA::NO_MEMORY ());
+    CosNotification::QoSProperties (),
+    CORBA::NO_MEMORY ());
 
   this->qos_properties_.populate (properties);
 
@@ -323,14 +331,16 @@ TAO_Notify_Object::timer (void)
   return this->worker_task_->timer ();
 }
 
-namespace {
+namespace
+{
   template<class T>
-    void add_qos_attr(TAO_Notify::NVPList& attrs, const T& prop) {
-      if (prop.is_valid())
-      {
-        attrs.push_back(TAO_Notify::NVP (prop));
-      }
+  void add_qos_attr(TAO_Notify::NVPList& attrs, const T& prop)
+  {
+    if (prop.is_valid())
+    {
+      attrs.push_back(TAO_Notify::NVP (prop));
     }
+  }
 } // namespace
 
 void
@@ -358,3 +368,5 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs)
   this->qos_properties_.init ();
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 4e10be4a79a..7b9cb510b6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Object.h
  *
@@ -14,23 +15,25 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "QoSProperties.h"
-#include "AdminProperties.h"
-#include "Worker_Task.h"
-#include "Refcountable.h"
-#include "Name_Value_Pair.h"
-#include "Event_Manager.h"
+#include "orbsvcs/Notify/QoSProperties.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Refcountable.h"
+#include "orbsvcs/Notify/Name_Value_Pair.h"
+#include "orbsvcs/Notify/Event_Manager.h"
 
 #include "orbsvcs/NotifyExtC.h"
 
 #include "tao/PortableServer/Servant_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_POA_Helper;
 class TAO_Notify_Timer;
 class TAO_Notify_RT_Builder;
@@ -171,14 +174,18 @@ private:
   /// Shutdown the current poa.
   void destroy_poa (void);
 
-  ///= Private data members.
+protected:
+
+  /// The mutex to serialize access to state variables.
+  TAO_SYNCH_MUTEX lock_;
+
+private:
 
   /// The POA in which the object is activated.
   TAO_Notify_POA_Helper* poa_;
 
   /// The POA in which the proxys are activated.
   TAO_Notify_POA_Helper* proxy_poa_;
-
   bool own_proxy_poa_;
 
   /// The POA in which the object's children are activated.
@@ -203,8 +210,10 @@ private:
   bool shutdown_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Object.inl"
+#include "orbsvcs/Notify/Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 8ea54d6f1f1..fcc77e8b4d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Long
 TAO_Notify_Object::id (void) const
 {
@@ -89,3 +93,5 @@ TAO_Notify_Object::admin_properties (void)
   ACE_ASSERT( this->admin_properties_.get() != 0 );
   return *this->admin_properties_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 6315d38f3e9..0137934dd22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "POA_Helper.h"
+#include "orbsvcs/Notify/POA_Helper.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "POA_Helper.inl"
+#include "orbsvcs/Notify/POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
@@ -14,6 +14,8 @@ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
 # define DEBUG_LEVEL TAO_debug_level
 #endif // DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void)
 {
 }
@@ -212,3 +214,5 @@ TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
   poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER);
  // The <wait_for_completion> flag = 0
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 7025c7aa0bb..57b4208324e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file POA_Helper.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_POA_Helper_H
@@ -14,18 +13,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ID_Factory.h"
+#include "orbsvcs/Notify/ID_Factory.h"
 
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Copy_Disabled.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_POA_Helper
  *
@@ -39,7 +40,9 @@ public:
   TAO_Notify_POA_Helper (void);
 
   /// Create a new PortableServer::POA.
-  void init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa,
+             const char* poa_name
+             ACE_ENV_ARG_DECL);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
@@ -54,34 +57,44 @@ public:
   void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Activate Object, the POA will assign an ID and return its value.
-  CORBA::Object_ptr activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr activate (PortableServer::Servant servant,
+                              CORBA::Long& id
+                              ACE_ENV_ARG_DECL);
 
   /// Activate Object, using existing ID
   CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL);
 
   /// Deactivate Object with ID
-  void deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const;
+  void deactivate (CORBA::Long id
+                   ACE_ENV_ARG_DECL) const;
 
   /// Convert ID to reference.
-  CORBA::Object_ptr id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const;
+  CORBA::Object_ptr id_to_reference (CORBA::Long id
+                                     ACE_ENV_ARG_DECL) const;
 
   /// Convert reference to pointer to servant
-  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const;
+  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr
+                                                      ACE_ENV_ARG_DECL) const;
 
   CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const;
 
 protected:
   /// Set default POA policies.
-  virtual void set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
+  virtual void set_policy (PortableServer::POA_ptr parent_poa,
+                           CORBA::PolicyList &policy_list
+                           ACE_ENV_ARG_DECL);
 
   /// Apply the polices and create child POA.
-  void create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
+  void create_i (PortableServer::POA_ptr parent_poa,
+                 const char* poa_name,
+                 CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
 
   /// Generate a unique id for each POA created.
   ACE_CString get_unique_id (void);
 
   /// Convert id to ObjectID
-  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const;
+  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id
+                                              ACE_ENV_ARG_DECL) const;
 
 protected:
   /// POA
@@ -91,8 +104,10 @@ protected:
   TAO_Notify_ID_Factory id_factory_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "POA_Helper.inl"
+#include "orbsvcs/Notify/POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
index e11089afb4d..dc559fb00c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE PortableServer::POA_ptr
 TAO_Notify_POA_Helper::poa (void)
 {
   return this->poa_.in ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 50659fef095..6caa4aa6552 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "Peer.h"
+#include "orbsvcs/Notify/Peer.h"
 
 ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$")
 
-#include "Proxy.h"
+#include "orbsvcs/Notify/Proxy.h"
 
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Peer::TAO_Notify_Peer (void)
 {
 }
@@ -79,7 +81,8 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
 
       if (cos_added.length () != 0 || cos_removed.length () != 0)
         {
-          TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
+          // Protect this object from being destroyed in this scope.
+          TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ());
 
           this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -118,3 +121,5 @@ TAO_Notify_Peer::_decr_refcnt (void)
 {
   return this->proxy ()->_decr_refcnt ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 3753ec2e596..142ef4484cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -1,26 +1,27 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Peer.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PEER_H
 #define TAO_Notify_PEER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotificationC.h"
-#include "EventTypeSeq.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Proxy;
 class TAO_Notify_QoSProperties;
@@ -47,7 +48,6 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-
   /// Shutdown the peer.
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -66,17 +66,20 @@ public:
   void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const = 0;
+  virtual ACE_CString get_ior (void) const = 0;
 
 protected:
   /// Implementation of Peer specific dispatch_updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
                                    const CosNotification::EventTypeSeq& removed
                                    ACE_ENV_ARG_DECL) = 0;
+
 private:
   /// Release
   virtual void release (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PEER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index 8e27e57dad0..18cda388126 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Persistent_File_Allocator.h"
+#include "orbsvcs/Notify/Persistent_File_Allocator.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
@@ -10,6 +10,8 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -394,3 +396,5 @@ Persistent_File_Allocator::run()
 }
 
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
index 05e50545173..718be6e8f54 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,17 +23,18 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
-#include "Random_File.h"
-#include "Bit_Vector.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Random_File.h"
+#include "orbsvcs/Notify/Bit_Vector.h"
 #include "ace/Containers_T.h"
 #include "ace/Unbounded_Queue.h"
 #include "ace/Thread_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
-
 /// \brief An interface to allow callbacks on completion of persistent storage
 /// requests.
 class TAO_Notify_Serv_Export Persistent_Callback
@@ -201,5 +202,7 @@ private:
 
 } /* namespace TAO_Notify */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* PERSISTENT_FILE_ALLOCATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index ff123bb9fc0..798f24fb7f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "Properties.h"
+#include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Properties.inl"
+#include "orbsvcs/Notify/Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
            TAO_Notify_Properties,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Properties::TAO_Notify_Properties (void)
   : factory_ (0)
   , builder_ (0)
@@ -38,3 +40,5 @@ TAO_Notify_Properties::~TAO_Notify_Properties ()
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template class TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex> *TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index e872da4d5de..7ab3ec74637 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Properties.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROPERTIES_H
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +26,8 @@
 #include "tao/TAO_Singleton.h"
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Factory;
 class TAO_Notify_Builder;
 
@@ -38,8 +39,6 @@ class TAO_Notify_Builder;
  */
 class TAO_Notify_Serv_Export TAO_Notify_Properties
 {
-  friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>;
-
 public:
   /// Constuctor
   TAO_Notify_Properties (void);
@@ -145,8 +144,10 @@ TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYN
 
 typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Properties.inl"
+#include "orbsvcs/Notify/Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index c8a7893f4d7..c53e7087f8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Notify_Factory*
 TAO_Notify_Properties::factory (void)
 {
@@ -143,3 +147,5 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat
 {
   this->pc_qos_ = pc_qos;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h
index 7479b98cc65..2d0ef880733 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,12 @@
 #include "tao/orbconf.h"
 #include "tao/TimeBaseC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class LOCK, class TYPE> class ACE_Atomic_Op;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> class TAO_Notify_Property_T;
 template <class TYPE> class TAO_Notify_StructProperty_T;
 
@@ -37,6 +42,8 @@ typedef TAO_Notify_Property_T<TimeBase::TimeT> TAO_Notify_Property_Time;
 typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams> TAO_Notify_Property_ThreadPool;
 typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams> TAO_Notify_Property_ThreadPoolLanes;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_PROPERTY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index df5beffdb21..bd8adc484f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "PropertySeq.h"
+#include "orbsvcs/Notify/PropertySeq.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "PropertySeq.inl"
+#include "orbsvcs/Notify/PropertySeq.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void)
 {
 }
@@ -59,3 +61,5 @@ TAO_Notify_PropertySeq::add(const ACE_CString& name, const CORBA::Any& val)
   ACE_ASSERT(ret >= 0);
   ACE_UNUSED_ARG (ret); // because the assert disappears in release builds
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index 1325b724e81..315aac46a0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file PropertySeq.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROPERTYSEQ_H
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +25,8 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_PropertySeq
  *
@@ -65,8 +66,10 @@ protected:
   PROPERTY_MAP property_map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "PropertySeq.inl"
+#include "orbsvcs/Notify/PropertySeq.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
index b96345cb11a..043f28ab9b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -1,7 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
-TAO_Notify_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const
+TAO_Notify_PropertySeq::find (const char* name,
+                              CosNotification::PropertyValue& value) const
 {
   ACE_CString str_name (name);
   return this->property_map_.find (str_name, value);
@@ -14,3 +19,4 @@ TAO_Notify_PropertySeq::size() const
   return this->property_map_.current_size();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index 6428fec8072..378ca42dc41 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "Property_Boolean.h"
+#include "orbsvcs/Notify/Property_Boolean.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Property_Boolean.inl"
+#include "orbsvcs/Notify/Property_Boolean.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$")
 
-#include "PropertySeq.h"
+#include "orbsvcs/Notify/PropertySeq.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name)
-  :name_ (name), valid_(0)
+  : name_ (name), valid_(0)
 {
 }
 
@@ -41,3 +43,5 @@ TAO_Notify_Property_Boolean::get (CosNotification::PropertySeq& prop_seq)
 
   prop_seq[prop_seq.length () - 1].value <<= CORBA::Any::from_boolean (this->value_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index e2d8487d0d8..53c0f441de9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Property_Boolean.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROPERTY_BOOLEAN_H
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +21,8 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_PropertySeq;
 
 /**
@@ -77,8 +78,10 @@ protected:
   CORBA::Boolean valid_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Property_Boolean.inl"
+#include "orbsvcs/Notify/Property_Boolean.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
index b1a469809bb..bccd42bed59 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Notify_Property_Boolean&
 TAO_Notify_Property_Boolean::operator= (const TAO_Notify_Property_Boolean& rhs)
 {
@@ -55,3 +58,5 @@ TAO_Notify_Property_Boolean::is_valid (void) const
 {
   return this->valid_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 0b6aad318ae..75b5675e2d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -3,37 +3,40 @@
 #ifndef TAO_Notify_PROPERTY_T_CPP
 #define TAO_Notify_PROPERTY_T_CPP
 
-#include "Property_T.h"
+#include "orbsvcs/Notify/Property_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Property_T.inl"
+#include "orbsvcs/Notify/Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, 
            TAO_Notify_Property_T, 
            "$Id$")
 
-#include "PropertySeq.h"
+#include "orbsvcs/Notify/PropertySeq.h"
 
-/*******************************************************************************/
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/*****************************************************************************/
 
 template <class TYPE>
 TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name)
-  :name_ (name), valid_(0)
+  : name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
 TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial)
-  :name_ (name), value_ (initial), valid_ (1)
+  : name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 template <class TYPE>
-TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs)
-:name_ (rhs.name_),
- value_ (rhs.value_),
- valid_ (rhs.valid_)
+TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (
+  const TAO_Notify_PropertyBase_T &rhs)
+  : name_ (rhs.name_),
+    value_ (rhs.value_),
+    valid_ (rhs.valid_)
 {
 
 }
@@ -108,7 +111,8 @@ TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name
 }
 
 template <class TYPE> int
-TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq)
+TAO_Notify_StructProperty_T<TYPE>::set (
+  const TAO_Notify_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
@@ -128,4 +132,6 @@ TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_s
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_PROPERTY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index b1b6b7c39f0..39a79608659 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Property_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROPERTY_T_H
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +23,8 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_PropertySeq;
 
 /**
@@ -151,12 +152,14 @@ protected:
   CORBA::Boolean valid_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Property_T.inl"
+#include "orbsvcs/Notify/Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Property_T.cpp"
+#include "orbsvcs/Notify/Property_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index 31d5290c72d..7f66d30c0c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> ACE_INLINE const TYPE&
 TAO_Notify_PropertyBase_T<TYPE>::value (void) const
 {
@@ -71,3 +73,5 @@ TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const
 {
   return this->valid_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 861dc279f09..a088943d05b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -1,23 +1,25 @@
 // $Id$
 
-#include "Proxy.h"
+#include "orbsvcs/Notify/Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Proxy.inl"
+#include "orbsvcs/Notify/Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$")
 
-#include "Peer.h"
-#include "Proxy.h"
-#include "Method_Request_Updates.h"
-#include "Worker_Task.h"
-#include "Properties.h"
-#include "POA_Helper.h"
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/Peer.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Method_Request_Updates.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/POA_Helper.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Proxy::TAO_Notify_Proxy (void)
-  :updates_off_ (0)
+  : updates_off_ (0)
 {
 }
 
@@ -74,10 +76,12 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
   if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
     {
       this->execute_task (request ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else // execute in the current thread context.
     {
       request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
 
@@ -166,11 +170,7 @@ TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs)
   TAO_Notify_Peer * peer = this->peer();
   if (peer != 0)
   {
-    ACE_CString ior;
-    if (peer->get_ior(ior))
-    {
-      attrs.push_back (TAO_Notify::NVP("PeerIOR", ior));
-    }
+    attrs.push_back (TAO_Notify::NVP("PeerIOR", peer->get_ior()));
   }
 }
 
@@ -195,3 +195,5 @@ TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
   }
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index c213387be0d..d6931ece562 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Proxy.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROXY_H
@@ -14,16 +13,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Topology_Object.h"
-#include "EventTypeSeq.h"
-#include "FilterAdmin.h"
-#include "Admin.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/EventTypeSeq.h"
+#include "orbsvcs/Notify/FilterAdmin.h"
+#include "orbsvcs/Notify/Admin.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Admin;
 class TAO_Notify_Peer;
@@ -127,8 +128,10 @@ protected:
   CORBA::Boolean updates_off_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Proxy.inl"
+#include "orbsvcs/Notify/Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index ef84390455c..6eff985b31e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Proxy::updates_off (void)
 {
@@ -32,3 +36,5 @@ TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
 
   return val;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 5d309383a26..cd7587bfacd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -1,31 +1,34 @@
 // $Id$
 
-#include "ProxyConsumer.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ProxyConsumer.inl"
+#include "orbsvcs/Notify/ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$")
 
 #include "tao/debug.h"
 #include "ace/Atomic_Op.h"
-#include "Supplier.h"
-#include "AdminProperties.h"
-#include "Property.h"
-#include "Proxy.h"
-#include "Event_Manager.h"
-#include "Method_Request_Lookup.h"
-#include "Worker_Task.h"
-#include "Properties.h"
-#include "SupplierAdmin.h"
-#include "EventChannel.h"
-#include "Routing_Slip.h"
+#include "orbsvcs/Notify/Supplier.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Event_Manager.h"
+#include "orbsvcs/Notify/Method_Request_Lookup.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Routing_Slip.h"
+
 //#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void)
   : supplier_admin_ (0)
 {
@@ -47,6 +50,7 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE
   ACE_ASSERT( this->supplier_admin_.get() == 0 );
 
   TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->supplier_admin_.reset (dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent));
   ACE_ASSERT (this->supplier_admin_.get() != 0);
@@ -83,15 +87,15 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
     // if supplier is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-            ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
-          }
+        ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+      }
 
     // Adopt the supplier
     this->supplier_ = auto_supplier;
 
     this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
     ACE_CHECK;
-      }
+  }
 
   // Inform QoS values.
   ACE_ASSERT (this->supplier_.get() != 0);
@@ -113,8 +117,7 @@ TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL)
 {
   if (this->supports_reliable_events ())
     {
-      TAO_Notify_Event::Ptr pevent (
-        event->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
+      TAO_Notify_Event::Ptr pevent(event->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
       TAO_Notify::Routing_Slip_Ptr routing_slip =
         TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER);
@@ -178,6 +181,7 @@ TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   if (this->supplier_.get() != 0)
   {
     this->supplier_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (1);
   }
   return 0;
 }
@@ -185,11 +189,16 @@ TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return;
-
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  if ( result == 1)
+    return;
 
   this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+  // Do not reset this->supplier_.
+  // It is not safe to delete the non-refcounted supplier here.
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index aa927dedbab..17890c772f2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ProxyConsumer.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROXYCONSUMER_H
@@ -14,10 +13,10 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Event.h"
-#include "Proxy.h"
-#include "SupplierAdmin.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +26,8 @@
 
 #include "ace/Auto_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Supplier;
 
 /**
@@ -35,7 +36,8 @@ class TAO_Notify_Supplier;
  * @brief Base class for all types of ProxyConsumer implementations.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy
+class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer
+  : public virtual TAO_Notify_Proxy
 {
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr;
@@ -93,8 +95,10 @@ private:
   virtual TAO_Notify_Peer* peer (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ProxyConsumer.inl"
+#include "orbsvcs/Notify/ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
index 4ad429ba0e5..b2b0c8bb5c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE bool
 TAO_Notify_ProxyConsumer::is_connected (void) const
 {
@@ -18,3 +22,5 @@ TAO_Notify_ProxyConsumer::supplier_admin (void)
   ACE_ASSERT( this->supplier_admin_.get() != 0 );
   return *this->supplier_admin_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 2f836c0302a..a47122b58d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -3,12 +3,12 @@
 #ifndef TAO_Notify_PROXYCONSUMER_T_CPP
 #define TAO_Notify_PROXYCONSUMER_T_CPP
 
-#include "ProxyConsumer_T.h"
-#include "SupplierAdmin.h"
+#include "orbsvcs/Notify/ProxyConsumer_T.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
 
-ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$")
+#include "orbsvcs/Notify/Event_Manager.h"
 
-#include "Event_Manager.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void)
@@ -62,16 +62,23 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
-  this->event_manager().offer_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
+  this->event_manager().offer_change (this,
+                                      seq_added,
+                                      seq_removed
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (
+    CosNotifyChannelAdmin::ObtainInfoMode mode
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain_types (mode, this->event_manager().subscription_types () ACE_ENV_ARG_PARAMETER);
+  return
+    this->obtain_types (mode, this->event_manager().subscription_types ()
+                        ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_PROXYCONSUMER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index f8ee14512bf..bcb0ada782b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ProxyConsumer_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROXYCONSUMER_T_H
@@ -14,14 +13,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Proxy_T.h"
-#include "ProxyConsumer.h"
+#include "orbsvcs/Notify/Proxy_T.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_ProxyConsumer_T
@@ -71,8 +72,10 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ProxyConsumer_T.cpp"
+#include "orbsvcs/Notify/ProxyConsumer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 0f1733335f3..4d7a0c3023d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#include "ProxySupplier.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "ProxySupplier.inl"
+#include "orbsvcs/Notify/ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$")
 
-#include "Event_Manager.h"
-#include "AdminProperties.h"
-#include "Consumer.h"
-#include "Method_Request_Dispatch.h"
-#include "Worker_Task.h"
-#include "Buffering_Strategy.h"
-#include "Properties.h"
-#include "ConsumerAdmin.h"
+#include "orbsvcs/Notify/Event_Manager.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Consumer.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Buffering_Strategy.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void)
   : consumer_admin_ (0)
@@ -32,6 +34,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
   ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0);
 
   TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->consumer_admin_.reset (consumer_admin);
 
@@ -39,6 +42,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
     TAO_Notify_PROPERTIES::instance ()->default_proxy_supplier_qos_properties ();
 
   this->set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 TAO_Notify_Peer*
@@ -73,8 +77,8 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
     // if consumer is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-            ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
-          }
+          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+      }
 
     // Adopt the consumer
     this->consumer_ = auto_consumer;
@@ -90,6 +94,7 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
   TAO_Notify_EventTypeSeq removed;
 
   this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -134,13 +139,16 @@ TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return;
-
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  if ( result == 1)
+    return;
 
   this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+  // Do not reset this->consumer_.
+  // It is not safe to delete the non-refcounted consumer here.
 }
 
 void
@@ -154,3 +162,5 @@ TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_prope
 {
   TAO_Notify_Proxy::qos_changed (qos_properties);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 31615beec88..17ced483590 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -1,30 +1,31 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ProxySupplier.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROXYSUPPLIER_H
 #define TAO_Notify_PROXYSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Event.h"
-#include "Proxy.h"
-#include "ConsumerAdmin.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
 
 #include "orbsvcs/CosEventChannelAdminC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Consumer;
 class TAO_Notify_Method_Request_Dispatch_No_Copy;
 /**
@@ -90,8 +91,10 @@ private:
   virtual TAO_Notify_Peer* peer (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ProxySupplier.inl"
+#include "orbsvcs/Notify/ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
index 46b16302e2e..c7afa257d59 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE bool
 TAO_Notify_ProxySupplier::is_connected (void) const
 {
@@ -18,3 +22,5 @@ TAO_Notify_ProxySupplier::consumer_admin (void)
   ACE_ASSERT( this->consumer_admin_.get() != 0 );
   return *this->consumer_admin_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index c926f4f5824..622acba3277 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -1,24 +1,24 @@
 // $Id$
 
-#ifndef TAO_Notify_PROXYSUPPLIER_T_C
-#define TAO_Notify_PROXYSUPPLIER_T_C
+#ifndef TAO_Notify_PROXYSUPPLIER_T_CPP
+#define TAO_Notify_PROXYSUPPLIER_T_CPP
 
-#include "ProxySupplier_T.h"
+#include "orbsvcs/Notify/ProxySupplier_T.h"
 
-ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$")
+#include "orbsvcs/Notify/Consumer.h"
+#include "orbsvcs/Notify/Structured/StructuredEvent.h"
+#include "orbsvcs/Notify/Any/AnyEvent.h"
 
-#include "Consumer.h"
-#include "Structured/StructuredEvent.h"
-#include "Any/AnyEvent.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Event_Manager.h"
+#include "orbsvcs/Notify/ConsumerAdmin.h"
 
-#include "Method_Request_Dispatch.h"
-#include "Worker_Task.h"
-#include "Event_Manager.h"
-#include "ConsumerAdmin.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void)
-  :is_suspended_ (0)
+  : is_suspended_ (0)
 {
 }
 
@@ -222,4 +222,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mapp
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-#endif /* #define TAO_Notify_PROXYSUPPLIER_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* #define TAO_Notify_PROXYSUPPLIER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index 5c18d79424e..f31cba76ee9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -1,26 +1,27 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ProxySupplier_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_PROXYSUPPLIER_T_H
 #define TAO_Notify_PROXYSUPPLIER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Proxy_T.h"
-#include "ProxySupplier.h"
+#include "orbsvcs/Notify/Proxy_T.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_ProxySupplier_T
@@ -146,8 +147,10 @@ protected:
   ));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ProxySupplier_T.cpp"
+#include "orbsvcs/Notify/ProxySupplier_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 4858f2da0c3..518db5e5c02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Proxy_T.h"
+#include "orbsvcs/Notify/Proxy_T.h"
 
 #ifndef TAO_Notify_PROXY_T_CPP
 #define TAO_Notify_PROXY_T_CPP
 
-ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SERVANT_TYPE>
 TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void)
@@ -160,4 +160,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_PROXY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index b9b0e26ee0f..2cdc149f502 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Proxy_T.h
  *
@@ -14,13 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Proxy.h"
+#include "orbsvcs/Notify/Proxy.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Proxy_T
@@ -143,8 +147,10 @@ template class TAO_Notify_Serv_Export
 TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Proxy_T.cpp"
+#include "orbsvcs/Notify/Proxy_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index a25544ae6a5..73d20823325 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -1,30 +1,32 @@
 // $Id$
 
-#include "QoSProperties.h"
+#include "orbsvcs/Notify/QoSProperties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "QoSProperties.inl"
+#include "orbsvcs/Notify/QoSProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$")
 
-#include "Property.h"
-#include "Notify_Extensions.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Notify_Extensions.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void)
-: event_reliability_(CosNotification::EventReliability)
-, connection_reliability_(CosNotification::ConnectionReliability)
-, priority_ (CosNotification::Priority)
-, timeout_ (CosNotification::Timeout)
-, stop_time_supported_ (CosNotification::StopTimeSupported)
-, maximum_batch_size_ (CosNotification::MaximumBatchSize)
-, pacing_interval_ (CosNotification::PacingInterval)
-, max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer)
-, discard_policy_ (CosNotification::DiscardPolicy)
-, order_policy_ (CosNotification::OrderPolicy)
-, thread_pool_ (NotifyExt::ThreadPool)
-, thread_pool_lane_ (NotifyExt::ThreadPoolLanes)
-, blocking_policy_(TAO_Notify_Extensions::BlockingPolicy)
+  : event_reliability_(CosNotification::EventReliability)
+  , connection_reliability_(CosNotification::ConnectionReliability)
+  , priority_ (CosNotification::Priority)
+  , timeout_ (CosNotification::Timeout)
+  , stop_time_supported_ (CosNotification::StopTimeSupported)
+  , maximum_batch_size_ (CosNotification::MaximumBatchSize)
+  , pacing_interval_ (CosNotification::PacingInterval)
+  , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer)
+  , discard_policy_ (CosNotification::DiscardPolicy)
+  , order_policy_ (CosNotification::OrderPolicy)
+  , thread_pool_ (NotifyExt::ThreadPool)
+  , thread_pool_lane_ (NotifyExt::ThreadPoolLanes)
+  , blocking_policy_(TAO_Notify_Extensions::BlockingPolicy)
 {
   unsupported_[0] = CosNotification::StartTimeSupported;
 }
@@ -212,3 +214,5 @@ TAO_Notify_QoSProperties::transfer (TAO_Notify_QoSProperties& qos_properties)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index 3f075a1dcbc..6ce71f0941c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file QoSProperties.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_QOSPROPERTIES_H
@@ -14,16 +13,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PropertySeq.h"
-#include "Property_T.h"
-#include "Property_Boolean.h"
-#include "Property.h"
+#include "orbsvcs/Notify/PropertySeq.h"
+#include "orbsvcs/Notify/Property_T.h"
+#include "orbsvcs/Notify/Property_Boolean.h"
+#include "orbsvcs/Notify/Property.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_QoSProperties
@@ -108,8 +109,10 @@ protected:
   TAO_Notify_Property_Time blocking_policy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "QoSProperties.inl"
+#include "orbsvcs/Notify/QoSProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
index cc822edf7e4..6cf7f8f44fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 const TAO_Notify_Property_Short&
 TAO_Notify_QoSProperties::event_reliability(void) const
@@ -155,3 +159,5 @@ TAO_Notify_QoSProperties::order_policy(void)
 {
   return this->order_policy_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/README b/TAO/orbsvcs/orbsvcs/Notify/README
index 454dc9367b7..c30991c4c95 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/README
+++ b/TAO/orbsvcs/orbsvcs/Notify/README
@@ -28,7 +28,7 @@ their push methods to be invoked. To decouple the consumers from one
 another we can deploy dispatching threads using this option.
 
 
--ListenerThreads
+-SourceThreads
 Deploys a thread pool after event receipt from the supplier.  All subsequent
 notification channel processing can happen on this thread and the original
 publishing push() can be ended.  Separates server side processing of the 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 99000054e16..98b297f069a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -1,19 +1,21 @@
 // $Id$
 
-#include "RT_Builder.h"
+#include "orbsvcs/Notify/RT_Builder.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
-#include "ETCL_FilterFactory.h"
-#include "RT_POA_Helper.h"
-#include "Properties.h"
+#include "orbsvcs/Notify/ETCL_FilterFactory.h"
+#include "orbsvcs/Notify/RT_POA_Helper.h"
+#include "orbsvcs/Notify/Properties.h"
 #include "orbsvcs/NotifyExtC.h"
-#include "Object.h"
+#include "orbsvcs/Notify/Object.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_RT_Builder,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
 {
 }
@@ -66,5 +68,6 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
 
   // Give ownership of proxy_poa
   object.set_proxy_poa (auto_proxy_poa.release ());
-
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index d8e5834d2e3..6e0b2bba087 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -1,25 +1,26 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Builder.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_RT_BUILDER_H
 #define TAO_Notify_RT_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Builder.h"
+#include "orbsvcs/Notify/Builder.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_RT_Builder
@@ -43,5 +44,7 @@ public:
   virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index 014c4da3984..af5484fed61 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "RT_Factory.h"
-#include "Structured/RT_StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/RT_Factory.h"
+#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void)
 {
 }
@@ -123,4 +126,6 @@ TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE
   TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_RT_Notify, TAO_Notify_RT_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 79de7f0749d..38bf46c4662 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -1,25 +1,26 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Factory.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_RT_FACTORY_H
 #define TAO_Notify_RT_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Default_Factory.h"
+#include "orbsvcs/Notify/Default_Factory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_RT_Factory
@@ -91,6 +92,8 @@ public:
   virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory)
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 189319af746..f9e4ce24128 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "RT_Notify_Service.h"
+#include "orbsvcs/Notify/RT_Notify_Service.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
 
 #include "ace/Dynamic_Service.h"
-#include "Properties.h"
-#include "RT_Properties.h"
-#include "RT_Factory.h"
-#include "RT_Builder.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/RT_Properties.h"
+#include "orbsvcs/Notify/RT_Factory.h"
+#include "orbsvcs/Notify/RT_Builder.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Notify_Service::TAO_RT_Notify_Service (void)
 {
@@ -91,4 +93,6 @@ TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
   return builder;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_RT_Notify,TAO_RT_Notify_Service)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 20d41834c10..6383e95fc34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Notify_Service.h
  *
@@ -13,19 +14,20 @@
 #define TAO_Notify_RT_NOTIFY_SERVICE_H
 
 #include /**/ "ace/pre.h"
-#include "rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CosNotify_Service.h"
+#include "orbsvcs/Notify/CosNotify_Service.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_RT_Notify_Service
  *
- * @brief Implementation of the TAO_Notify_Service interface for
- * RT Notification.
+ * @brief Implemetation of the TAO_Notify_Service interface for RT Notification.
  *
  */
 class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service
@@ -37,7 +39,6 @@ public:
   /// Destructor
   ~TAO_RT_Notify_Service ();
 
-
   /// Init the service.
   virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
 
@@ -52,6 +53,8 @@ protected:
   virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service)
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 2631faef282..81859ded60f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#include "RT_POA_Helper.h"
+#include "orbsvcs/Notify/RT_POA_Helper.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/debug.h"
 #include "orbsvcs/NotifyExtC.h"
-#include "RT_Properties.h"
+#include "orbsvcs/Notify/RT_Properties.h"
 #include "ace/SString.h"
 
-ACE_RCSID (RT_Notify,
+ACE_RCSID (Notify,
            TAO_Notify_RT_POA_Helper,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
 {
 }
@@ -160,3 +162,5 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D
 
   this->create_i (parent_poa, child_poa_name.c_str (), policy_list ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 23a14864aff..d272420ef98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -1,27 +1,28 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_POA_Helper.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_RT_POA_Helper_H
 #define TAO_Notify_RT_POA_Helper_H
 #include /**/ "ace/pre.h"
 
-#include "rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "POA_Helper.h"
+#include "orbsvcs/Notify/POA_Helper.h"
 #include "orbsvcs/NotifyExtC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_RT_POA_Helper
  *
@@ -56,5 +57,7 @@ public:
   void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_POA_Helper_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 07cca498c58..6a5aff084e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-#include "RT_Properties.h"
+#include "orbsvcs/Notify/RT_Properties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "RT_Properties.inl"
+#include "orbsvcs/Notify/RT_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void)
 {
 }
@@ -15,3 +18,5 @@ TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void)
 TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index 31cffb6d9db..124f8757145 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -1,19 +1,18 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Properties.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_RT_PROPERTIES_H
 #define TAO_Notify_RT_PROPERTIES_H
 #include /**/ "ace/pre.h"
 
-#include "rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +21,8 @@
 #include "tao/TAO_Singleton.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_RT_Properties
  *
@@ -57,8 +58,10 @@ TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SY
 
 typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "RT_Properties.inl"
+#include "orbsvcs/Notify/RT_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
index 8451193ea97..71fae93e7ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -1,5 +1,8 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE RTCORBA::RTORB_ptr
 TAO_Notify_RT_Properties::rt_orb (void)
@@ -24,3 +27,5 @@ TAO_Notify_RT_Properties::current (RTCORBA::Current_ptr current)
 {
   current_ = RTCORBA::Current::_duplicate (current);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index ca9b3cf010e..b0e528de02b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
-#include "Random_File.h"
+#include "orbsvcs/Notify/Random_File.h"
 
 #include "ace/OS.h"
+#include "ace/Log_Msg.h"
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -154,3 +157,5 @@ Random_File::sync()
 }
 
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
index a58e6f21e0e..c3ebfcd96bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,11 +22,14 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/FILE.h"
 #include "ace/streams.h"
 #include "ace/Synch_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -85,5 +88,7 @@ private:
 
 } /* namespace TAO_Notify */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* RANDOM_FILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index 6f03de8e3bb..be6bdd90518 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "Reactive_Task.h"
+#include "orbsvcs/Notify/Reactive_Task.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Reactive_Task.inl"
+#include "orbsvcs/Notify/Reactive_Task.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$")
 
-#include "Timer_Reactor.h"
+#include "orbsvcs/Notify/Timer_Reactor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void)
   :timer_ (0)
@@ -53,3 +55,5 @@ TAO_Notify_Reactive_Task::timer (void)
 {
   return this->timer_.get();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index 341e3f3789e..b7a602cd67c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Reactive_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_REACTIVE_TASK_H
@@ -14,23 +13,27 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Worker_Task.h"
-#include "AdminProperties.h"
-#include "Timer_Reactor.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Timer_Reactor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Reactive_Task
  *
- * @brief A reactive worker task. Simply executes the command in the caller's context.
+ * @brief A reactive worker task. Simply executes the command in the
+ *        caller's context.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task
+class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task
+  : public TAO_Notify_Worker_Task
 {
 public:
   /// Constuctor
@@ -39,7 +42,6 @@ public:
   /// Destructor
   virtual ~TAO_Notify_Reactive_Task ();
 
-
   /// Init the reactive task.
   void init (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -55,16 +57,19 @@ public:
   /// Returns NULL.
   virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void);
 
-protected:
+private:
   /// The timer.
   TAO_Notify_Timer_Reactor::Ptr timer_;
-private:
+
   /// Release
   virtual void release (void);
 };
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Reactive_Task.inl"
+#include "orbsvcs/Notify/Reactive_Task.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
index 239c919549b..d2b6ec811e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Notify_Buffering_Strategy*
 TAO_Notify_Reactive_Task::buffering_strategy (void)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
index 6557823e111..4c5857f45c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
 *  @file    Reconnect_Worker_T.cpp
@@ -13,12 +11,14 @@
 #ifndef RECONNECT_WORKER_CPP
 #define RECONNECT_WORKER_CPP
 
-#include "Reconnect_Worker_T.h"
+#include "orbsvcs/Notify/Reconnect_Worker_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   template<class TOPOOBJ>
@@ -36,4 +36,6 @@ namespace TAO_Notify
   }
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* RECONNECT_WORKER_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
index 8190037e3bd..a4c71244ec2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   /**
@@ -37,8 +39,10 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Reconnect_Worker_T.cpp"
+#include "orbsvcs/Notify/Reconnect_Worker_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 85681eafd55..8eba0d841ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -1,24 +1,33 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Reconnection_Registry.cpp
  *
  *  $Id$
  *
  *  @author Dale Wilson <wilson_d@ociweb.com>
- *
  */
-#include "Reconnection_Registry.h"
+#include "orbsvcs/Notify/Reconnection_Registry.h"
+
 #include "tao/debug.h"
-#include "Properties.h"
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
 #include "ace/Vector_T.h"
 //#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
+  const char REGISTRY_TYPE[] = "reconnect_registry";
+  const char RECONNECT_ID[] = "ReconnectId";
+  const char RECONNECT_IOR[] = "IOR";
+  const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback";
+
   Reconnection_Registry::Reconnection_Registry (Topology_Parent & parent)
     : highest_id_(0)
   {
@@ -80,6 +89,7 @@ namespace TAO_Notify
       //@@todo  throw something
     }
     this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
   }
 
   CORBA::Boolean
@@ -242,5 +252,6 @@ namespace TAO_Notify
     //@@ inform factory
   }
 
-
 } // namespace TAO_Notify
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 7fd7c455014..0c84190d5a9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -1,11 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Reconnection_Registry.h
  *
  *  $Id$
  *
  *  @author Dale Wilson <wilson_d@ociweb.com>
- *
  */
 
 #ifndef TAO_NOTIFY_RECONNECTION_REGISTRY_H
@@ -17,19 +17,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/Topology_Object.h"
 
 #include "orbsvcs/NotifyExtS.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
-  static const char REGISTRY_TYPE[] = "reconnect_registry";
-  static const char RECONNECT_ID[] = "ReconnectId";
-  static const char RECONNECT_IOR[] = "IOR";
-  static const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback";
+  extern const char REGISTRY_TYPE[];
+  extern const char RECONNECT_ID[];
+  extern const char RECONNECT_IOR[];
+  extern const char REGISTRY_CALLBACK_TYPE[];
 
   /**
    * @class Reconnection_Registry
@@ -92,5 +94,7 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ <ace/post.h>
 #endif /* TAO_NOTIFY_RECONNECTION_REGISTRY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 29f2061e5ba..0d06a3c0e05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -1,59 +1,252 @@
 // $Id$
 
-#include "Refcountable.h"
+#include "orbsvcs/Notify/Refcountable.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
+
 #include "ace/Guard_T.h"
 
 ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$")
 
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+
+#include <map>
+#include <string>
+#include <typeinfo.h>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class TAO_Notify_Tracker
+ *
+ * @brief A debugging tool to track the creation of TAO_Notify_Refcountable objects.
+ *
+ *        Usage:
+ *        Set USE_TAO_NOTIFY_TRACKER defined above to 1
+ *        At any significant point to check object usage
+ *          TAO_Notify_Tracker::get_instance().dump();
+ */
+class TAO_Notify_Tracker
+{
+public:
+  struct Entry
+  {
+    TAO_Notify_Refcountable*  obj;
+    std::string               class_name;
+  };
+
+  static TAO_Notify_Tracker& get_instance();
+
+  void add( TAO_Notify_Refcountable* p );
+
+  void remove( const TAO_Notify_Refcountable* p );
+
+  Entry find( const TAO_Notify_Refcountable* p ) const;
+
+  void dump( const char* title = 0 );
+
+private:
+  TAO_Notify_Tracker();
+  ~TAO_Notify_Tracker();
+
+  friend class std::auto_ptr< TAO_Notify_Tracker >;
+  static std::auto_ptr< TAO_Notify_Tracker > s_instance;
+  mutable TAO_SYNCH_MUTEX lock_;
+  typedef std::map<int, Entry> EntityMap;
+  EntityMap map_;
+  int id_counter_;
+  int last_dump_count_;
+};
+
+void
+TAO_Notify_Refcountable::diagnostic_dump( const char* title )
+{
+  TAO_Notify_Tracker::get_instance().dump( title );
+}
+
+#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */
+
+
 TAO_Notify_Refcountable::TAO_Notify_Refcountable (void)
 {
 }
 
 TAO_Notify_Refcountable::~TAO_Notify_Refcountable ()
 {
-  Counter refcount = this->refcount_.value();
-  if ( refcount != 0 )
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+  TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this );
+  if ( e.obj != 0 )
   {
-    ACE_ERROR ((LM_ERROR,"ERROR: object:%x delete with non-zero refcount = %d\n", this, refcount ));
-    ACE_ASSERT( refcount == 0 );
+    ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n",
+        e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() ));
+ 
+    if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ )
+    {
+      ACE_DEBUG ((LM_DEBUG, "  with an ID mismatch %x->%d != %x->%d!\n",
+        this, ref_id_, e.obj, e.obj->ref_id_));
+    }
+    TAO_Notify_Tracker::get_instance().remove( this );
   }
+#endif
+  CORBA::ULong refcount = this->refcount_.value();
+  ACE_ASSERT( refcount == 0 );
+  ACE_UNUSED_ARG(refcount);
 }
 
+
 CORBA::ULong
 TAO_Notify_Refcountable::_incr_refcnt (void)
 {
-  Counter refcount = ++this->refcount_;
+  CORBA::Long refcount = ++this->refcount_;
   if (TAO_debug_level > 1 )
   {
     ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount ));
   }
-  return static_cast< CORBA::ULong >( refcount );
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+  // Stack-instantiated-non-servants should never have _incr_refcnt called.
+  // We do not care about stack-instances. Stack-instantiated servants break
+  // the tracker.
+  if ( refcount == 1 )
+  {
+    TAO_Notify_Tracker::get_instance().add( this );
+  }
+#endif
+  return refcount;
 }
 
 CORBA::ULong
 TAO_Notify_Refcountable::_decr_refcnt (void)
 {
-  Counter refcount = --this->refcount_;
+  CORBA::Long refcount = --this->refcount_;
+
+  if (TAO_debug_level > 1 )
+  {
+    ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount ));
+  }
+
+  ACE_ASSERT(refcount >= 0);
+
+  if (refcount == 0)
+  {
+    #if ( USE_TAO_NOTIFY_TRACKER != 0 )
+      TAO_Notify_Tracker::get_instance().remove( this );
+    #endif
+    this->release ();
+  }
+  return refcount;
+}
+
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+
+std::auto_ptr< TAO_Notify_Tracker > TAO_Notify_Tracker::s_instance;
+
+TAO_Notify_Tracker::TAO_Notify_Tracker()
+: id_counter_(0)
+, last_dump_count_(0)
+{
+}
+
+
+TAO_Notify_Tracker::~TAO_Notify_Tracker()
+{
+  dump( "destruction" );
+}
 
-    if (TAO_debug_level > 1 )
+
+void
+TAO_Notify_Tracker::dump( const char* title )
+{
+  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+
+  ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump")));
+ 
+  EntityMap::const_iterator iter( map_.begin() );
+  while ( iter != map_.end() )
   {
-    ACE_DEBUG ((LM_DEBUG,"object:%x  decr refcount = %d\n", this, refcount ));
+    ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n",
+      iter->second.obj, iter->second.class_name, iter->first, iter->second.obj->refcount_.value() ));
+    iter++;
   }
 
-  // If error
-  if ( refcount < 0 )
+  EntityMap::size_type current_count = map_.size();
+  int diff = ( current_count - last_dump_count_ );
+  ACE_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff ));
+  last_dump_count_ = current_count;
+}
+
+
+TAO_Notify_Tracker&
+TAO_Notify_Tracker::get_instance()
+{
+  if ( s_instance.get() == 0 )
   {
-    ACE_ERROR ((LM_ERROR,"ERROR: object:%x _decr_refcnt (%d < 0)\n", this, refcount ));
-    ACE_ASSERT( refcount >= 0 );
+    s_instance.reset( new TAO_Notify_Tracker );
   }
+  return *s_instance;
+}
+
 
-  // Release if count is zero
-  else if ( refcount == 0 )
+void
+TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p )
+{
+  if ( p == 0 ) return;
+
+  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  int id = ++id_counter_;
+ 
+  Entry e = { p, typeid(*p).name() };
+  std::pair< EntityMap::iterator, bool > result =
+    map_.insert( std::make_pair( id, e ) );
+  EntityMap::iterator& it = result.first;
+  if ( result.second == false )
+  {
+    ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n",
+      it->second.obj, it->second.class_name.c_str(), it->first ));
+  }
+  else
   {
-  this->release ();
+    p->ref_id_ = id;
   }
+}
+
 
-  return static_cast< CORBA::ULong >( refcount );
+void
+TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p )
+{
+  if ( p == 0 ) return;
+
+  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  int ref_id = p->ref_id_;
+  EntityMap::iterator iter( map_.find( ref_id ) );
+  if ( iter == map_.end() )
+  {
+    const char* class_name = typeid(*iter->second.obj).name();
+    ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n",
+      p, class_name, ref_id ));
+  }
+  else
+  {
+    map_.erase( iter );
+  }
 }
+
+
+TAO_Notify_Tracker::Entry
+TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p ) const
+{
+  Entry e = { 0, "" };
+  if ( p == 0 ) return e;
+
+  ACE_Guard<TAO_SYNCH_MUTEX> grd(this->lock_);
+  int ref_id = p->ref_id_;
+  EntityMap::const_iterator iter( map_.find( ref_id ) );
+  if ( iter != map_.end() )
+  {
+    return iter->second;
+  }
+  return e;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index 1d03486f3d1..960c7e37a93 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Refcountable.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_REFCOUNTABLE_H
@@ -14,8 +13,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Refcountable_Guard_T.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Refcountable_Guard_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,33 +26,43 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
 
+// Debugging macros
+#ifndef TAO_NOTIFY_REFCOUNT_DIAGNOSTICS
+#define TAO_NOTIFY_REFCOUNT_DIAGNOSTICS 0
+#endif
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Refcountable
  *
  * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0.
  *
- *        The refcount is initialized to 0. When an instance of a derived class becomes owned
- *        by a managed pointer (Refcountable_Guard_T) the reference count becomes non-zero.
- *        A debug message is printed from the destructor if a refcounted is deleted with a
- *        non-zero refcount.
+ *        The refcount is initialized to 0. When an instance of a
+ *        derived class becomes owned by a managed pointer
+ *        (Refcountable_Guard_T) the reference count becomes non-zero.
  *
- *        Instances declared on the stack should always have a refcount of zero.
+ *        Instances declared on the stack should always have a
+ *        refcount of zero.
  *
- *        A method that creates or simply returns an instance of Refcountable should not
- *        increment the reference count. It is the responsibility of the client to increment
- *        the reference count (take ownership or guard against deletion). The client cannot
- *        know if the method will or will not incr the refcount in its behalf.
+ *        A method that creates or simply returns an instance of
+ *        Refcountable should not increment the reference count. It is
+ *        the responsibility of the client to increment the reference
+ *        count (take ownership or guard against deletion). The client
+ *        cannot know if the method will or will not incr the refcount
+ *        on its behalf.
  *
- *        Use Refcountable_Guard_T or similar service to guarantee the exception safe direct
- *        pairing of increments and decrements. Avoid calling _incr_refcnt and _decr_refcnt.
+ * Use Refcountable_Guard_T or similar service to guarantee the
+ * exception safe direct pairing of increments and decrements. Avoid
+ * calling _incr_refcnt and _decr_refcnt.
  */
+
 class TAO_Notify_Serv_Export TAO_Notify_Refcountable
 {
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Refcountable > Ptr;
-  typedef long Counter;
 
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Refcountable (void);
 
   /// Destructor
@@ -65,22 +74,26 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-protected:
-  /// The mutex to serialize access to state variables.
-  TAO_SYNCH_MUTEX lock_;
-
-  /// Accessor for debugging.
-#ifdef _DEBUG
-  Counter refcount (void) const;
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+  static void diagnostic_dump( const char* title = 0 );
 #endif
 
 private:
   /// The release method is called when the refcount reaches 0.
   virtual void release (void) = 0;
 
-  ACE_Atomic_Op< TAO_SYNCH_MUTEX, Counter > refcount_;
+  // Use a signed counter so that we can more easily detect
+  // boundary conditions such as too many _decr_refcnt() calls.
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::Long> refcount_;
+
+#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
+  friend class TAO_Notify_Tracker;
+  int ref_id_;
+#endif
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_REFCOUNTABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
index f1bc562fe65..9f037fef711 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -3,10 +3,10 @@
 #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
 #define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
 
-#include "Refcountable_Guard_T.h"
+#include "orbsvcs/Notify/Refcountable_Guard_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Refcountable_Guard_T.inl"
+#include "orbsvcs/Notify/Refcountable_Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, TAO_Notify_Refcountable_Guard_T, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
index 555c302e40e..67e8bd8bdbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Refcountable_Guard_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_H
@@ -14,12 +13,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Refcountable_Guard_T
  *
@@ -35,7 +38,7 @@ public:
   explicit TAO_Notify_Refcountable_Guard_T (T* t = 0);
 
   /// Copy constructor
-  explicit TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs);
+  TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs);
 
   /// Destructor
   ~TAO_Notify_Refcountable_Guard_T ();
@@ -67,12 +70,14 @@ private:
   T* t_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Refcountable_Guard_T.inl"
+#include "orbsvcs/Notify/Refcountable_Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Refcountable_Guard_T.cpp"
+#include "orbsvcs/Notify/Refcountable_Guard_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
index 45a92e04262..4ab55e0b75f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -1,7 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE
 TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (T *t)
   : t_ (t)
@@ -83,3 +87,5 @@ TAO_Notify_Refcountable_Guard_T<T>::swap(
   this->t_ = rhs.t_;
   rhs.t_ = temp;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 16b99f089a3..eb101ef2105 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "Routing_Slip.h"
-
-#include "Delivery_Request.h"
-#include "Worker_Task.h"
-#include "ProxyConsumer.h"
-#include "ProxySupplier.h"
-#include "Event_Persistence_Strategy.h"
-#include "Routing_Slip_Persistence_Manager.h"
-#include "Routing_Slip_Queue.h"
-#include "Method_Request_Lookup.h"
-#include "Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Routing_Slip.h"
+
+#include "orbsvcs/Notify/Delivery_Request.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Event_Persistence_Strategy.h"
+#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
+#include "orbsvcs/Notify/Routing_Slip_Queue.h"
+#include "orbsvcs/Notify/Method_Request_Lookup.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
 
 #include "tao/debug.h"
 #include "tao/corba.h"
@@ -24,6 +24,8 @@
 
 #define QUEUE_ALLOWED 1
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 ///////////////////////
@@ -117,7 +119,7 @@ Routing_Slip::create (
       {
         TAO_InputCDR cdr_event (event_mb);
         TAO_Notify_Event::Ptr event (TAO_Notify_Event::unmarshal (cdr_event));
-        if (event.get () != 0)
+        if (event.isSet())
         {
           result = create (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -907,6 +909,7 @@ Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL)
   for (size_t nmethod = 0; nmethod < count; ++nmethod)
   {
     this->delivery_methods_[nmethod]->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
   }
   this->delivery_methods_.clear ();
 }
@@ -925,6 +928,6 @@ Routing_Slip::should_retry () const
   return this->state_ != rssTRANSIENT;
 }
 
-
-
 } // namespace
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 5b77343bec8..5670dfc1d05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -1,24 +1,23 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Routing_Slip.h
  *
  *  $Id$
  *
  *  @author Dale Wilson <wilson_d@ociweb.com>
- *
- *
  */
 
 #ifndef TAO_NOTIFY_ROUTING_SLIP_H
 #define TAO_NOTIFY_ROUTING_SLIP_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Event.h"
-#include "Delivery_Request.h"
-#include "Event_Persistence_Factory.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Delivery_Request.h"
+#include "orbsvcs/Notify/Event_Persistence_Factory.h"
 
-#include "Persistent_File_Allocator.h"  // for Persistent_Callback
+#include "orbsvcs/Notify/Persistent_File_Allocator.h"  // for Persistent_Callback
 
 #include <ace/Vector_T.h>
 #include <ace/Malloc_Base.h>  // necessary?
@@ -27,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations of classes/pointers/collections
 // referenced from this header
 class TAO_Notify_EventChannelFactory;
@@ -235,5 +236,7 @@ private:
 
 } // namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_ROUTING_SLIP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index a19414c65b2..62915a67221 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -1,8 +1,10 @@
 // $Id$
 
-#include "Routing_Slip_Persistence_Manager.h"
-#include "Standard_Event_Persistence.h"
-#include "Persistent_File_Allocator.h"
+#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
+#include "orbsvcs/Notify/Standard_Event_Persistence.h"
+#include "orbsvcs/Notify/Persistent_File_Allocator.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
@@ -325,16 +327,16 @@ Routing_Slip_Persistence_Manager::Block_Header::put_header(
   data[pos++] = static_cast<unsigned char> ((serial_number >> 8) & 0xff);
   data[pos++] = static_cast<unsigned char> ((serial_number >> 0) & 0xff);
   // Store next_overflow
-  data[pos++] = next_overflow >> 24;
-  data[pos++] = (next_overflow >> 16) & 0xff;
-  data[pos++] = (next_overflow >> 8) & 0xff;
-  data[pos++] = next_overflow & 0xff;
+  data[pos++] = static_cast<unsigned char> (next_overflow >> 24);
+  data[pos++] = static_cast<unsigned char> ((next_overflow >> 16) & 0xff);
+  data[pos++] = static_cast<unsigned char> ((next_overflow >> 8) & 0xff);
+  data[pos++] = static_cast<unsigned char> (next_overflow & 0xff);
   // Store header_type
-  data[pos++] = (header_type >> 8) & 0xff;
-  data[pos++] = header_type & 0xff;
+  data[pos++] = static_cast<unsigned char> ((header_type >> 8) & 0xff);
+  data[pos++] = static_cast<unsigned char> (header_type & 0xff);
   // Store data_size
-  data[pos++] = (data_size >> 8) & 0xff;
-  data[pos++] = data_size & 0xff;
+  data[pos++] = static_cast<unsigned char> ((data_size >> 8) & 0xff);
+  data[pos++] = static_cast<unsigned char> (data_size & 0xff);
 
   return pos;
 }
@@ -384,10 +386,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header(
 
   unsigned char* data = psb.data();
   // Store next_routing_slip_block
-  data[pos++] = next_routing_slip_block >> 24;
-  data[pos++] = (next_routing_slip_block >> 16) & 0xff;
-  data[pos++] = (next_routing_slip_block >> 8) & 0xff;
-  data[pos++] = next_routing_slip_block & 0xff;
+  data[pos++] = static_cast<unsigned char> (next_routing_slip_block >> 24);
+  data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 16) & 0xff);
+  data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 8) & 0xff);
+  data[pos++] = static_cast<unsigned char> (next_routing_slip_block & 0xff);
   // Store serial_number
   data[pos++] = static_cast<unsigned char> ((next_serial_number >> 56) & 0xff);
   data[pos++] = static_cast<unsigned char> ((next_serial_number >> 48) & 0xff);
@@ -398,10 +400,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header(
   data[pos++] = static_cast<unsigned char> ((next_serial_number >> 8) & 0xff);
   data[pos++] = static_cast<unsigned char> ((next_serial_number >> 0) & 0xff);
   // Store event_block
-  data[pos++] = event_block >> 24;
-  data[pos++] = (event_block >> 16) & 0xff;
-  data[pos++] = (event_block >> 8) & 0xff;
-  data[pos++] = event_block & 0xff;
+  data[pos++] = static_cast<unsigned char> (event_block >> 24);
+  data[pos++] = static_cast<unsigned char> ((event_block >> 16) & 0xff);
+  data[pos++] = static_cast<unsigned char> ((event_block >> 8) & 0xff);
+  data[pos++] = static_cast<unsigned char> (event_block & 0xff);
   return pos;
 }
 
@@ -577,7 +579,8 @@ Routing_Slip_Persistence_Manager::build_chain(
     mblk = mblk->cont();
     remainder = this->fill_block(*first_block, pos, mblk, 0);
   }
-  first_header.data_size = data_size - remainder;
+  first_header.data_size = 
+    static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder);
   first_header.next_overflow = 0;
 
   Block_Header* prevhdr = &first_header;
@@ -594,7 +597,8 @@ Routing_Slip_Persistence_Manager::build_chain(
     prevhdr->next_overflow = curblk->block_number();
     prevhdr->put_header(*prevblk);
     pos = hdr->put_header(*curblk);
-    hdr->data_size = remainder;
+    hdr->data_size = 
+      static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
 
     size_t offset_into_msg = mblk->length() - remainder;
     remainder = this->fill_block(*curblk, pos, mblk, offset_into_msg);
@@ -605,7 +609,8 @@ Routing_Slip_Persistence_Manager::build_chain(
       remainder = this->fill_block(*curblk, pos, mblk, 0);
     }
 
-    hdr->data_size -= remainder;
+    hdr->data_size = hdr->data_size - 
+      static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
     if (prevblk != first_block)
     {
       // allocator obtains ownership, so write out and delete the header
@@ -795,3 +800,5 @@ Routing_Slip_Persistence_Manager::remove_from_dllist()
 }
 
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index d289e46eb87..0704a315884 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,17 +17,20 @@
 #ifndef ROUTING_SLIP_PERSISTENCE_MANAGER_H
 #define ROUTING_SLIP_PERSISTENCE_MANAGER_H
 #include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "notify_serv_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch_T.h"
 #include "ace/Containers_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 // Some forward declarations.
@@ -258,5 +261,7 @@ private:
 
 } /* namespace TAO_Notify */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ROUTING_SLIP_PERSISTENCE_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
index 609ca985cd3..4447981d06f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Routing_Slip_Queue.h"
+#include "orbsvcs/Notify/Routing_Slip_Queue.h"
 
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
@@ -10,6 +10,9 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   Routing_Slip_Queue::Routing_Slip_Queue (size_t allowed)
@@ -105,3 +108,5 @@ namespace TAO_Notify
     }
   }
 } // namespace
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 2a6a8dc3bb5..4d28e093c0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -1,16 +1,19 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
 #define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
 #include /**/ "ace/pre.h"
 
-#include "Routing_Slip.h"
+#include "orbsvcs/Notify/Routing_Slip.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   /**
@@ -84,5 +87,7 @@ namespace TAO_Notify
   };
 } // namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NOTIFY_ROUTING_SLIP_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
index 199c60aa032..1be68b66c33 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
 *  @file    Save_Persist_Worker_T.cpp
@@ -19,13 +17,14 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   template<class TOPOOBJ>
-  Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker(
-        Topology_Saver& saver,
-        bool want_all_children)
-    : saver_(saver)
+  Save_Persist_Worker<TOPOOBJ>::Save_Persist_Worker(Topology_Saver& saver,
+                                                    bool want_all_children)
+    : saver_ (saver)
     , want_all_children_ (want_all_children)
   {
   }
@@ -43,4 +42,6 @@ namespace TAO_Notify
   }
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* SAVE_PERSIST_WORKER_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
index 740b2128378..a9d425891f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,9 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   /**
@@ -45,8 +48,10 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Save_Persist_Worker_T.cpp"
+#include "orbsvcs/Notify/Save_Persist_Worker_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 98ef75a6bb6..a1a29b3eb35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -3,13 +3,13 @@
 #ifndef TAO_Notify_SEQ_WORKER_T_CPP
 #define TAO_Notify_SEQ_WORKER_T_CPP
 
-#include "Seq_Worker_T.h"
+#include "orbsvcs/Notify/Seq_Worker_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Seq_Worker_T.inl"
+#include "orbsvcs/Notify/Seq_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Seq_Worker_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
@@ -33,4 +33,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_Notify_SEQ_WORKER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 8c0f1949151..5e89210356e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -1,19 +1,18 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Seq_Worker_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_SEQ_WORKER_T_H
 #define TAO_Notify_SEQ_WORKER_T_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,7 +20,9 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "Container_T.h"
+#include "orbsvcs/Notify/Container_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Seq_Worker_T
@@ -30,7 +31,8 @@
  *
  */
 template <class TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE>
+class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T
+  : public TAO_ESF_Worker<TYPE>
 {
   typedef TAO_Notify_Container_T<TYPE> CONTAINER;
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
@@ -52,12 +54,14 @@ protected:
   SEQ_VAR seq_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Seq_Worker_T.inl"
+#include "orbsvcs/Notify/Seq_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Seq_Worker_T.cpp"
+#include "orbsvcs/Notify/Seq_Worker_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
index 08a858c55db..43dc3487646 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class TYPE> ACE_INLINE void
 TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
 {
@@ -7,3 +11,5 @@ TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
 
   this->seq_[this->seq_->length () - 1] = type->id ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 15bd1db1eca..a7c5adb49c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "SequenceProxyPushConsumer.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
-#include "SequencePushSupplier.h"
-#include "../AdminProperties.h"
-#include "../Structured/StructuredEvent.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Structured/StructuredEvent.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void)
 :pacing_interval_ (CosNotification::PacingInterval)
@@ -22,7 +24,6 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer ()
 void
 TAO_Notify_SequenceProxyPushConsumer::release (void)
 {
-
   delete this;
   //@@ inform factory
 }
@@ -106,17 +107,20 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
     {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::SequencePushSupplier_var ps =
-        CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosNotifyComm::SequencePushSupplier_var ps = CosNotifyComm::SequencePushSupplier::_nil();
+      if ( ior.length() > 0 )
+      {
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
@@ -132,3 +136,4 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 5e65ea9f03b..4db216993cb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "../ProxyConsumer_T.h"
+#include "orbsvcs/Notify/ProxyConsumer_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_SequenceProxyPushConsumer
  *
@@ -89,6 +91,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index c87728df2ab..be2f9f74299 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "SequenceProxyPushSupplier.h"
+#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "SequencePushConsumer.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
 {
@@ -19,7 +21,6 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier ()
 void
 TAO_Notify_SequenceProxyPushSupplier::release (void)
 {
-
   delete this;
   //@@ inform factory
 }
@@ -79,17 +80,20 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
     {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::SequencePushConsumer_var pc =
-        CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil();
+      if (ior.length() > 0)
+      {
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
       this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -100,3 +104,5 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
     ACE_ENDTRY;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 2d727b94e33..6603d5613e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "../ProxySupplier_T.h"
+#include "orbsvcs/Notify/ProxySupplier_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Serv_Export
 TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
@@ -86,6 +88,8 @@ public:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 689272a738d..19f972cd0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -1,25 +1,27 @@
 // $Id$
 
-#include "SequencePushConsumer.h"
+#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 
 #include "ace/Reactor.h"
 #include "tao/debug.h"
-#include "../QoSProperties.h"
-#include "../ProxySupplier.h"
-#include "../Worker_Task.h"
-#include "../Consumer.h"
-#include "../Method_Request_Dispatch.h"
-#include "../Method_Request_Event.h"
-#include "../Timer.h"
-#include "../Proxy.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/QoSProperties.h"
+#include "orbsvcs/Notify/ProxySupplier.h"
+#include "orbsvcs/Notify/Worker_Task.h"
+#include "orbsvcs/Notify/Consumer.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Method_Request_Event.h"
+#include "orbsvcs/Notify/Timer.h"
+#include "orbsvcs/Notify/Proxy.h"
+#include "orbsvcs/Notify/Properties.h"
 //#define DEBUG_LEVEL 10
 #ifndef DEBUG_LEVEL
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_SequencePushConsumer::TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy)
 : TAO_Notify_Consumer (proxy)
 {
@@ -30,17 +32,20 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT (this->push_consumer_.in() == 0);
-  ACE_ASSERT (push_consumer != 0);
+  // Initialize only once
+  ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
+
+  if (CORBA::is_nil (push_consumer))
+  {
+    ACE_THROW (CORBA::BAD_PARAM());
+  }
 
   this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
   this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
-
 }
 
-
 void
 TAO_Notify_SequencePushConsumer::release (void)
 {
@@ -52,16 +57,19 @@ bool
 TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
 {
   bool result = true;
-  if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+  if (DEBUG_LEVEL > 0)
+  {
+    ACE_DEBUG ( (LM_DEBUG,
       ACE_TEXT ("(%P|%t) SequencePushConsumer dispatch queued requests. queue size:%u\n"),
       requests.size ()));
+  }
 
   long queue_size = requests.size ();
   CORBA::Long max_batch_size = queue_size;
   if (this->max_batch_size_.is_valid () )
-    {
-      max_batch_size = this->max_batch_size_.value ();
-    }
+  {
+    max_batch_size = this->max_batch_size_.value ();
+  }
   CORBA::Long batch_size = queue_size;
   if (batch_size > max_batch_size)
   {
@@ -78,9 +86,12 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
     TAO_Notify_Method_Request_Event_Queueable * request = 0;
     while (pos < batch_size && requests.dequeue_head (request) == 0)
     {
-  if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
-        ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"),
-        request));
+      if (DEBUG_LEVEL > 0)
+      {
+        ACE_DEBUG ( (LM_DEBUG,
+          ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"),
+          request));
+      }
 
       const TAO_Notify_Event * ev = request->event ();
       ev->convert (batch [pos]);
@@ -98,7 +109,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
     ace_mon.acquire ();
     switch (status)
     {
-      case DISPATCH_SUCCESS:
+    case DISPATCH_SUCCESS:
       {
         TAO_Notify_Method_Request_Event_Queueable * request = 0;
         while (completed.dequeue_head (request) == 0)
@@ -109,43 +120,92 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
         result = true;
         break;
       }
-      // TODO: we should distinguish between these (someday)
-      case DISPATCH_FAIL:
-      case DISPATCH_DISCARD:
+    case DISPATCH_FAIL:
       {
-        TAO_Notify_Method_Request_Event_Queueable *  request = 0;
+        TAO_Notify_Method_Request_Event_Queueable * request = 0;
         while (completed.dequeue_head (request) == 0)
         {
           if (request->should_retry ())
           {
-            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
-              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Will retry\n"),
-              request->sequence ()
-              ));
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+                          static_cast <int> (this->proxy ()->id ()),
+                          request->sequence ()));
+            requests.enqueue_head (request);
+            result = false;
+          }
+          else
+          {
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
+            request->complete ();
+            request->release ();
+          }
+        }
+        while (requests.dequeue_head (request) == 0)
+        {
+          if (request->should_retry ())
+          {
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
             requests.enqueue_head (request);
             result = false;
           }
           else
           {
-            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
-              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Discarding event.\n"),
-              request->sequence ()
-              ));
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
             request->complete ();
             request->release ();
           }
         }
+        ace_mon.release();
+        ACE_DECLARE_NEW_ENV;
+        ACE_TRY
+        {
+          this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+        ACE_CATCHANY
+        {
+          // todo is there something meaningful we can do here?
+          ;
+        }
+        ACE_ENDTRY;
+        ace_mon.acquire();
         break;
       }
-      case DISPATCH_RETRY:
+    case DISPATCH_RETRY:
+    case DISPATCH_DISCARD:
       {
-        if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
-          ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
-          static_cast<int> (this->proxy ()->id ()),
-          request->sequence ()
-          ));
-        requests.enqueue_head (request); // put the failed event back where it was
-        result = false;
+        TAO_Notify_Method_Request_Event_Queueable *  request = 0;
+        while (completed.dequeue_head (request) == 0)
+        {
+          if (request->should_retry ())
+          {
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
+            requests.enqueue_head (request);
+            result = false;
+          }
+          else
+          {
+            if (DEBUG_LEVEL > 0)
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"),
+                          static_cast<int> (this->proxy ()->id ()),
+                          request->sequence ()));
+            request->complete ();
+            request->release ();
+          }
+        }
         break;
       }
     default:
@@ -160,8 +220,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
 
 bool
 TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
-    TAO_Notify_Method_Request_Event * request
-    ACE_ENV_ARG_DECL)
+  TAO_Notify_Method_Request_Event * request
+  ACE_ENV_ARG_DECL)
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n"));
@@ -173,6 +233,7 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
   if (this->pending_events().size() >= mbs || this->pacing_.is_valid () == 0)
   {
     this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (false);
   }
   else
   {
@@ -202,22 +263,21 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
   ACE_CHECK;
 }
 
-bool
-TAO_Notify_SequencePushConsumer::get_ior (ACE_CString & iorstr) const
+ACE_CString
+TAO_Notify_SequencePushConsumer::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb ();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT (0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;
@@ -233,3 +293,5 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o
   ACE_CHECK;
   this->schedule_timer(false);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 09cfbf71969..ac5661e674f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -13,20 +13,22 @@
 #define TAO_Notify_SEQUENCEPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Event_Handler.h"
-#include "../Event.h"
-#include "../Property.h"
-#include "../Property_T.h"
-#include "../Consumer.h"
-#include "../AdminProperties.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/Property.h"
+#include "orbsvcs/Notify/Property_T.h"
+#include "orbsvcs/Notify/Consumer.h"
+#include "orbsvcs/Notify/AdminProperties.h"
 #include "ace/Null_Condition.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_QoSProperties;
 class TAO_Notify_Timer;
@@ -69,7 +71,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -86,5 +88,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index adaaf0b24af..df010388763 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "SequencePushSupplier.h"
+#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$")
 
-#include "../Properties.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -18,10 +20,9 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 void
 TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
-  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
-
+  // TODO: verify single init call
+  // push_supplier is optional
   this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier);
-
   this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier);
 }
 
@@ -31,23 +32,25 @@ TAO_Notify_SequencePushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
-bool
-TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const
+
+ACE_CString
+TAO_Notify_SequencePushSupplier::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT(0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index 24d778e400f..2b2af2efc08 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -13,14 +13,16 @@
 #define TAO_Notify_SEQUENCEPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "../Supplier.h"
+#include "orbsvcs/Notify/Supplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ProxyConsumer;
 
@@ -46,12 +48,14 @@ public:
   virtual void release (void);
 
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
 protected:
   /// The Supplier
   CosNotifyComm::SequencePushSupplier_var push_supplier_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
index c26a1cd3897..f4cda660134 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
-#include "Service.h"
+#include "orbsvcs/Notify/Service.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_Service,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Service::~TAO_Notify_Service ()
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 7d60ea4bac7..6fdfd47f2ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -1,28 +1,31 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Service.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_SERVICE_H
 #define TAO_Notify_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   class POA;
@@ -67,6 +70,8 @@ public:
     ) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory"
 
 #define TAO_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
index 76674cef2b8..65389ef7c35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "Standard_Event_Persistence.h"
-#include "Persistent_File_Allocator.h"
+#include "orbsvcs/Notify/Standard_Event_Persistence.h"
+#include "orbsvcs/Notify/Persistent_File_Allocator.h"
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_strings.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -223,5 +225,10 @@ Standard_Event_Persistence_Factory::root()
   return this->root_;
 }
 
-ACE_FACTORY_DEFINE (TAO_Notify_Serv, Standard_Event_Persistence)
-}
+} // End TAO_Notify_Namespace
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Serv,
+                              TAO_Notify_Standard_Event_Persistence,
+                              TAO_Notify::Standard_Event_Persistence)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
index 240ae9533be..995577d761a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,12 +21,15 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Event_Persistence_Strategy.h"
-#include "Event_Persistence_Factory.h"
-#include "Persistent_File_Allocator.h"
-#include "Routing_Slip_Persistence_Manager.h"
+#include "orbsvcs/Notify/Event_Persistence_Strategy.h"
+#include "orbsvcs/Notify/Event_Persistence_Factory.h"
+#include "orbsvcs/Notify/Persistent_File_Allocator.h"
+#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
 #include <ace/SString.h>
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   static const ACE_UINT32 ROUTING_SLIP_ROOT_BLOCK_NUMBER = 0;
@@ -121,9 +124,11 @@ namespace TAO_Notify
     ACE_UINT32 block_size_; // set via -block_size
     Standard_Event_Persistence_Factory * factory_;
   };
-
-  ACE_FACTORY_DECLARE (TAO_Notify_Serv, Standard_Event_Persistence)
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Standard_Event_Persistence)
+
 #include /**/ "ace/post.h"
 #endif /* STANDARD_EVENT_PERSISTENCE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 96fb800047e..c4df69993b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "RT_StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
 #include "tao/debug.h"
 
 #include "tao/debug.h"
-#include "../Method_Request_Dispatch.h"
+#include "orbsvcs/Notify/Method_Request_Dispatch.h"
 
 ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
 {
 }
@@ -76,3 +78,4 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E
   ACE_ENDTRY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index 9a8c923f626..995a4ceeb31 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -13,13 +13,15 @@
 #define TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../rt_notify_export.h"
+#include "orbsvcs/Notify/rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_RT_StructuredProxyPushSupplier
@@ -55,5 +57,7 @@ private:
   Event_Forwarder::StructuredProxyPushSupplier_var event_forwarder_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 21d273c3fe7..86d312d8f4e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "StructuredEvent.h"
+#include "orbsvcs/Notify/Structured/StructuredEvent.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
-#include "../PropertySeq.h"
-#include "../Consumer.h"
+#include "orbsvcs/Notify/PropertySeq.h"
+#include "orbsvcs/Notify/Consumer.h"
 #include "tao/debug.h"
 #include "tao/corba.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
   : notification_ (&notification), type_ (notification.header.fixed_header.event_type)
 {
@@ -136,3 +138,5 @@ TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::S
 TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 516f40d35c4..5ed850afd93 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -12,16 +12,18 @@
 #define TAO_Notify_STRUCTUREDEVENT_H
 
 #include /**/ "ace/pre.h"
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "../Event.h"
-#include "../EventType.h"
+#include "orbsvcs/Notify/Event.h"
+#include "orbsvcs/Notify/EventType.h"
 #include "orbsvcs/CosNotificationC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_StructuredEvent;
 
 /**
@@ -81,7 +83,7 @@ protected:
   const TAO_Notify_EventType type_;
 };
 
-/*****************************************************************************************************/
+/*****************************************************************************/
 
 /**
  * @class TAO_Notify_StructuredEvent
@@ -104,5 +106,7 @@ protected:
   CosNotification::StructuredEvent notification_copy;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 2a4a1c5ee0d..d79e907a741 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#include "StructuredProxyPushConsumer.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 
 #include "ace/Bound_Ptr.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
-#include "StructuredPushSupplier.h"
-#include "StructuredEvent.h"
-#include "../AdminProperties.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
+#include "orbsvcs/Notify/Structured/StructuredEvent.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
 {
@@ -87,8 +89,8 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-
 }
+
 const char *
 TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const
 {
@@ -100,17 +102,21 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
     {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::StructuredPushSupplier_var ps =
-        CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil();
+      if ( ior.length() > 0 )
+      {
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
@@ -125,3 +131,5 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
     ACE_ENDTRY;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index d6dd54df0ce..82ec83de086 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,13 +22,15 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "../ProxyConsumer_T.h"
+#include "orbsvcs/Notify/ProxyConsumer_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_StructuredProxyPushConsumer
  *
@@ -92,6 +94,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index b2febd45d52..10e753f3437 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#include "StructuredProxyPushSupplier.h"
+#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
 
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
-#include "StructuredPushConsumer.h"
-#include "../Properties.h"
+#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
+#include "orbsvcs/Notify/Properties.h"
 
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
 {
 }
@@ -22,7 +24,6 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier
 void
 TAO_Notify_StructuredProxyPushSupplier::release (void)
 {
-
   delete this;
   //@@ inform factory
 }
@@ -82,17 +83,20 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
     {
-      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::StructuredPushConsumer_var pc =
-        CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushConsumer_var pc = CosNotifyComm::StructuredPushConsumer::_nil();
+      if (ior.length() > 0)
+      {
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
       this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -103,3 +107,5 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
     ACE_ENDTRY;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 6e7cef6146f..b3a3526dbe9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,13 +23,15 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/Event_ForwarderS.h"
 
-#include "../ProxySupplier_T.h"
+#include "orbsvcs/Notify/ProxySupplier_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Serv_Export
 TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
@@ -90,6 +92,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 69c05d5be02..feb1b56c29c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,12 +1,14 @@
 // $Id$
-#include "StructuredPushConsumer.h"
+#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
-#include "../Properties.h"
-#include "../Event.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Event.h"
 #include "ace/Bound_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy)
   :TAO_Notify_Consumer (proxy)
 {
@@ -17,9 +19,15 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 }
 
 void
-TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT (push_consumer != 0 && this->push_consumer_.in() == 0);
+  // Initialize only once
+  ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
+
+  if (CORBA::is_nil (push_consumer))
+  {
+    ACE_THROW (CORBA::BAD_PARAM());
+  }
 
   this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
 
@@ -70,23 +78,24 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer*
   this->schedule_timer(false);
 }
 
-bool
-TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const
+ACE_CString
+TAO_Notify_StructuredPushConsumer::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT(0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index b467d85c403..9b9d603d383 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -13,14 +13,16 @@
 #define TAO_Notify_STRUCTUREDPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "../Consumer.h"
+#include "orbsvcs/Notify/Consumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ProxySupplier;
 
@@ -55,7 +57,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -73,5 +75,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index e646558475c..69e28687a34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "StructuredPushSupplier.h"
+#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
-#include "../Properties.h"
+#include "orbsvcs/Notify/Properties.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -17,10 +19,9 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 void
 TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
-  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
-
+  // TODO: verify single init call
+  // push_supplier is optional
   this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier);
-
   this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier);
 }
 
@@ -31,23 +32,24 @@ TAO_Notify_StructuredPushSupplier::release (void)
   //@@ inform factory
 }
 
-bool
-TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const
+ACE_CString
+TAO_Notify_StructuredPushSupplier::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT(0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index ccbe0255735..b123bdb35d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -13,14 +13,16 @@
 #define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "../Supplier.h"
+#include "orbsvcs/Notify/Supplier.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ProxyConsumer;
 
@@ -42,9 +44,8 @@ public:
   /// Init
   void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
-
   /// Retrieve the ior of this peer
-  virtual bool get_ior (ACE_CString & iorstr) const;
+  virtual ACE_CString get_ior (void) const;
 
 protected:
   /// The Supplier
@@ -55,5 +56,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 4856d2a62b6..70e0e846b04 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -1,13 +1,18 @@
 // $Id$
 
-#include "Subscription_Change_Worker.h"
+#include "orbsvcs/Notify/Subscription_Change_Worker.h"
 
-#include "Proxy.h"
+#include "orbsvcs/Notify/Proxy.h"
 
 ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$")
 
-TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
-:added_ (added), removed_ (removed)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (
+  const CosNotification::EventTypeSeq & added,
+  const CosNotification::EventTypeSeq & removed)
+  : added_ (added), removed_ (removed)
 {
 }
 
@@ -20,3 +25,5 @@ TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG
 {
   proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index 873ad8cd3eb..dc17f2a64b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -1,19 +1,18 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Subscription_Change_Worker.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_SUBSCRIPTION_CHANGE_WORKER_H
 #define TAO_SUBSCRIPTION_CHANGE_WORKER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +21,8 @@
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Proxy;
 
 /**
@@ -47,5 +48,7 @@ protected:
   const CosNotification::EventTypeSeq & removed_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SUBSCRIPTION_CHANGE_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index 378463bf4b7..bf1d0eae7ee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
-#include "Supplier.h"
+#include "orbsvcs/Notify/Supplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Supplier.inl"
+#include "orbsvcs/Notify/Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$")
 
-#include "ProxyConsumer.h"
-#include "Proxy.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/Proxy.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify_Supplier::TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy)
-  :proxy_ (proxy)
+  : proxy_ (proxy)
 {
 }
 
@@ -27,9 +29,13 @@ TAO_Notify_Supplier::proxy (void)
 }
 
 void
-TAO_Notify_Supplier::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
-                                     ACE_ENV_ARG_DECL)
+TAO_Notify_Supplier::dispatch_updates_i (
+  const CosNotification::EventTypeSeq& added,
+  const CosNotification::EventTypeSeq& removed
+  ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (this->subscribe_.in ()))
     this->subscribe_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index f962cb09302..f8032aae3d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -1,27 +1,29 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Supplier.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_SUPPLIER_H
 #define TAO_Notify_SUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Peer.h"
+#include "orbsvcs/Notify/Peer.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_ProxyConsumer;
 
 /**
@@ -58,8 +60,10 @@ protected:
   CosNotifyComm::NotifySubscribe_var subscribe_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Supplier.inl"
+#include "orbsvcs/Notify/Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
index 6d1c528c149..19d48fb5634 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Notify_ProxyConsumer*
 TAO_Notify_Supplier::proxy_consumer (void)
 {
   return this->proxy_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 9affc97ebdd..71ff8590b4c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
-#include "SupplierAdmin.h"
+#include "orbsvcs/Notify/SupplierAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin,
            "$Id$")
 
-#include "Builder.h"
-#include "ProxyConsumer.h"
-#include "EventChannel.h"
-#include "Subscription_Change_Worker.h"
-#include "Find_Worker_T.h"
-#include "Seq_Worker_T.h"
-#include "Properties.h"
+#include "orbsvcs/Notify/Builder.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "orbsvcs/Notify/EventChannel.h"
+#include "orbsvcs/Notify/Subscription_Change_Worker.h"
+#include "orbsvcs/Notify/Find_Worker_T.h"
+#include "orbsvcs/Notify/Seq_Worker_T.h"
+#include "orbsvcs/Notify/Properties.h"
 
 #include "tao/debug.h"
 
@@ -23,10 +23,12 @@ ACE_RCSID (RT_Notify,
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
-                             , CosNotifyChannelAdmin::ProxyConsumer
-                             , CosNotifyChannelAdmin::ProxyConsumer_ptr
-                             , CosNotifyChannelAdmin::ProxyNotFound>
+                                 , CosNotifyChannelAdmin::ProxyConsumer
+                                 , CosNotifyChannelAdmin::ProxyConsumer_ptr
+                                 , CosNotifyChannelAdmin::ProxyNotFound>
 TAO_Notify_ProxyConsumer_Find_Worker;
 
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
@@ -83,10 +85,10 @@ TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return;
-
+  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  if ( result == 1)
+    return;
 
   this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -424,3 +426,5 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer (
   }
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 2b3dc033fdf..eeeaf0d40ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file SupplierAdmin.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_SUPPLIERADMIN_H
@@ -14,8 +13,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Admin.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Admin.h"
 
 #include "orbsvcs/NotifyExtS.h"
 
@@ -23,13 +22,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Notify_ProxyConsumer;
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Notify_ProxyConsumer;
+
 /**
  * @class TAO_Notify_SupplierAdmin
  *
@@ -207,6 +208,8 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
index 609f419193a..0a28afc1792 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
@@ -1,35 +1,37 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Supplier_Map.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_SUPPLIER_MAP_H
 #define TAO_Notify_SUPPLIER_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Event_Map_T.h"
-#include "ProxyConsumer.h"
+#include "orbsvcs/Notify/Event_Map_T.h"
+#include "orbsvcs/Notify/ProxyConsumer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
- * @class TAO_Notify_Supplier_Map
+ * @typedef TAO_Notify_Supplier_Map
  *
  * @brief The Event Map for Suppliers.
  *
  */
-
 typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SUPPLIER_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index a8299c2ecfa..01a7a51711f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -1,21 +1,22 @@
 // $Id$
 
-#include "ThreadPool_Task.h"
+#include "orbsvcs/Notify/ThreadPool_Task.h"
 
 ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
 
-#include "Properties.h"
-#include "Timer_Queue.h"
-#include "Buffering_Strategy.h"
+#include "orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Timer_Queue.h"
+#include "orbsvcs/Notify/Buffering_Strategy.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
 #include "ace/OS_NS_errno.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void)
-  : shutdown_ (false)
-  , shutdown_handler_(this)
+: shutdown_ (false)
 {
 }
 
@@ -36,27 +37,27 @@ TAO_Notify_ThreadPool_Task::timer (void)
 }
 
 void
-TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
+                                  const TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
   TAO_Notify_Timer_Queue* timer = 0;
   ACE_NEW_THROW_EX (timer,
-                    TAO_Notify_Timer_Queue (),
-                    CORBA::NO_MEMORY ());
+    TAO_Notify_Timer_Queue (),
+    CORBA::NO_MEMORY ());
   ACE_CHECK;
   this->timer_.reset (timer);
 
 
   TAO_Notify_Buffering_Strategy* buffering_strategy = 0;
   ACE_NEW_THROW_EX (buffering_strategy,
-                    TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
-                    CORBA::NO_MEMORY ());
+    TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
+    CORBA::NO_MEMORY ());
   this->buffering_strategy_.reset (buffering_strategy);
   ACE_CHECK;
 
-  long flags = THR_NEW_LWP | THR_JOINABLE;
-
+  long flags = THR_NEW_LWP | THR_DETACHED;
   CORBA::ORB_var orb =
     TAO_Notify_PROPERTIES::instance()->orb ();
 
@@ -73,28 +74,27 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
 
   // Become an active object.
   if (this->ACE_Task <ACE_NULL_SYNCH>::activate (flags,
-                                                 tp_params.static_threads,
-                                                 0,
-                                                 ACE_THR_PRI_OTHER_DEF) == -1)
+    tp_params.static_threads,
+    0,
+    ACE_THR_PRI_OTHER_DEF) == -1)
+  {
+    // Undo the ref counts on error
+    for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
     {
-      // Undo the ref counts on error
-      for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
-      {
-        this->_decr_refcnt();
-      }
+      this->_decr_refcnt();
+    }
 
-      if (TAO_debug_level > 0)
-        {
-          if (ACE_OS::last_error () == EPERM)
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Insufficient privilege.\n")));
-          else
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%t) task activation at priority %d failed\n")
-                        ACE_TEXT ("exiting!\n%a"),
-                        tp_params.default_priority));
-        }
-
-      ACE_THROW (CORBA::BAD_PARAM ());
+    if (TAO_debug_level > 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Insufficient privilege.\n")));
+      else
+        ACE_DEBUG ((LM_ERROR,
+        ACE_TEXT ("(%t) task activation at priority %d failed\n")
+        ACE_TEXT ("exiting!\n%a"),
+        tp_params.default_priority));
+    }
+    ACE_THROW (CORBA::BAD_PARAM ());
   }
 }
 
@@ -103,11 +103,15 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request A
 {
   if (!shutdown_)
   {
-    TAO_Notify_Method_Request_Queueable& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+    TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
 
-    // Ignore the return value, because we already print an error
-    // message if enqueing fails.
-    this->buffering_strategy_->enqueue (request_copy);
+    if (this->buffering_strategy_->enqueue (request_copy) == -1)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - "
+        "failed to enqueue\n"));
+    }
   }
 }
 
@@ -117,45 +121,45 @@ TAO_Notify_ThreadPool_Task::svc (void)
   TAO_Notify_Method_Request_Queueable* method_request;
 
   while (!shutdown_)
+  {
+    ACE_TRY_NEW_ENV
     {
-      ACE_TRY_NEW_ENV
-        {
-          ACE_Time_Value* dequeue_blocking_time = 0;
-          ACE_Time_Value earliest_time;
-
-          if (!this->timer_->impl().is_empty ())
-            {
-              earliest_time = this->timer_->impl().earliest_time ();
-              dequeue_blocking_time = &earliest_time;
-            }
-
-          // Dequeue 1 item
-          int result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time);
-
-          if (result > 0)
-            {
-              method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              ACE_Message_Block::release (method_request);
-            }
-          else if (errno == ETIME)
-            {
-              this->timer_->impl ().expire ();
-            }
-          else if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n"));
-            }
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ThreadPool_Task (%P|%t) exception in method request\n");
-        }
-      ACE_ENDTRY;
-    } /* while */
+      ACE_Time_Value* dequeue_blocking_time = 0;
+      ACE_Time_Value earliest_time;
+
+      if (!this->timer_->impl().is_empty ())
+      {
+        earliest_time = this->timer_->impl().earliest_time ();
+        dequeue_blocking_time = &earliest_time;
+      }
+
+      // Dequeue 1 item
+      int result = buffering_strategy_->dequeue (method_request, dequeue_blocking_time);
+
+      if (result > 0)
+      {
+        method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        ACE_Message_Block::release (method_request);
+      }
+      else if (errno == ETIME)
+      {
+        this->timer_->impl ().expire ();
+      }
+      else
+      {
+        if (TAO_debug_level > 0)
+          ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n"));
+      }
+    }
+    ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        "ThreadPool_Task (%P|%t) exception in method request\n");
+    }
+    ACE_ENDTRY;
+  } /* while */
 
   return 0;
 }
@@ -165,21 +169,12 @@ TAO_Notify_ThreadPool_Task::shutdown (void)
 {
   if (this->shutdown_)
   {
-  	return;
+    return;
   }
 
   this->shutdown_ = true;
 
   this->buffering_strategy_->shutdown ();
-
-  // be sure this object is not deleted until wait() returns
-  this->_incr_refcnt ();
-
-  // get another thread to wait() for the thread(s) running svc() to exit
-  // otherwise the thread is a zombie on Solaris and just hangs around
-  // on windows.
-  TAO_Notify_PROPERTIES::instance()
-           ->orb ()->orb_core ()->reactor ()->notify (&shutdown_handler_);
 }
 
 void
@@ -189,25 +184,17 @@ TAO_Notify_ThreadPool_Task::release (void)
 }
 
 int
-TAO_Notify_ThreadPool_Task::close (u_long /*flags*/)
+TAO_Notify_ThreadPool_Task::close (u_long)
 {
-  // Undo the thread spawn guard. close is called per thread spawned.
+  // _incr_refcnt() for each spawned thread in init()
   this->_decr_refcnt();
   return 0;
 }
 
 void
-TAO_Notify_ThreadPool_Task::wait_for_shutdown ()
-{
-  // wait for thread(s) running svc() to return.
-  this->wait ();
-
-  // Undo the shutdown request guard.
-  this->_decr_refcnt ();
-}
-
-void
 TAO_Notify_ThreadPool_Task::update_qos_properties (const TAO_Notify_QoSProperties& qos_properties)
 {
   this->buffering_strategy_->update_qos_properties (qos_properties);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 7c6ad778e5d..ffff9d3a1a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file ThreadPool_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_THREADPOOL_TASK_H
@@ -14,20 +13,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
-#include "Timer_Queue.h"
-#include "AdminProperties.h"
-#include "Worker_Task.h"
+#include "orbsvcs/Notify/Timer_Queue.h"
+#include "orbsvcs/Notify/AdminProperties.h"
+#include "orbsvcs/Notify/Worker_Task.h"
 
 #include "ace/Task.h"
 #include "ace/Message_Queue.h"
 #include "ace/Reactor.h"
+#include "ace/Null_Condition.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Notify_Buffering_Strategy;
 
 /**
@@ -36,7 +38,9 @@ class TAO_Notify_Buffering_Strategy;
  * @brief Implements a Thread Pool Worker Task.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH>
+class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task
+  : public TAO_Notify_Worker_Task
+  , public ACE_Task<ACE_NULL_SYNCH>
 {
   friend class TAO_Notify_Method_Request_Shutdown;
 
@@ -54,7 +58,7 @@ public:
   virtual int close (u_long flags);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL);
 
   /// Queue the request
   virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
@@ -76,9 +80,6 @@ private:
   /// Release
   virtual void release (void);
 
-  /// wait for all threads to exit svc()
-  virtual void wait_for_shutdown ();
-
   /// The buffering strategy to use.
   ACE_Auto_Ptr< TAO_Notify_Buffering_Strategy > buffering_strategy_;
 
@@ -87,31 +88,10 @@ private:
 
   /// The Queue based timer.
   TAO_Notify_Timer_Queue::Ptr timer_;
+};
 
-  // Since this class already inherited from ACE_Event_Handler
-  // I did not want to conflict with a possible parent
-  /// implementation of handle_exception.
-  class Shutdown_Handler : public ACE_Event_Handler
-  {
-  public:
-    Shutdown_Handler (TAO_Notify_ThreadPool_Task* owner) : owner_ (owner) {};
-
-    /// wait for all threads to complete in another thread
-    virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE)
-    {
-      ACE_UNUSED_ARG (fd);
-      owner_->wait_for_shutdown ();
-      return 0;
-    }
-  private:
-    TAO_Notify_ThreadPool_Task* owner_;
-  };
-
-  friend class Shutdown_Handler;
-
-  Shutdown_Handler shutdown_handler_;
 
-};
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index dad8bbe7c55..3b3a829f7e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -1,29 +1,32 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Timer.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_TIMER_H
 #define TAO_Notify_TIMER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Refcountable.h"
+#include "orbsvcs/Notify/Refcountable.h"
 
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Event_Handler;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Timer
@@ -47,5 +50,7 @@ public:
   virtual int cancel_timer (long timer_id) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index b083b78b6e8..642f313f2f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "Timer_Queue.h"
+#include "orbsvcs/Notify/Timer_Queue.h"
 
 ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
 {
 }
@@ -24,10 +26,11 @@ TAO_Notify_Timer_Queue::schedule_timer (ACE_Event_Handler *handler,
                                     const ACE_Time_Value &delay_time,
                                     const ACE_Time_Value &interval)
 {
-  return this->timer_queue_.schedule (handler,
-                                      0,
-                                      timer_queue_.gettimeofday () + delay_time,
-                                      interval);
+  return
+    this->timer_queue_.schedule (handler,
+                                 0,
+                                 timer_queue_.gettimeofday () + delay_time,
+                                 interval);
 }
 
 int
@@ -41,3 +44,5 @@ TAO_Notify_Timer_Queue::impl (void)
 {
   return this->timer_queue_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 61179a601bb..3f0f021e217 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -1,21 +1,20 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Timer_Queue.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_TIMER_QUEUE_H
 #define TAO_Notify_TIMER_QUEUE_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
-#include "Timer.h"
+#include "orbsvcs/Notify/Timer.h"
 
 #include "ace/Timer_Queue.h"
 #include "ace/Timer_Heap.h"
@@ -25,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Timer_Queue
  *
@@ -63,5 +64,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index d591dc652b9..8109a230c30 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#include "Timer_Reactor.h"
+#include "orbsvcs/Notify/Timer_Reactor.h"
 
 ACE_RCSID (Notify,
 	   Timer_Reactor,
 	   "$Id$")
 
-#include "Properties.h"
+#include "orbsvcs/Notify/Properties.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void)
   :reactor_ (0)
 {
@@ -36,7 +38,7 @@ TAO_Notify_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler,
                                const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval)
 {
-  return  this->reactor_->schedule_timer (handler, 0, delay_time, interval);
+  return this->reactor_->schedule_timer (handler, 0, delay_time, interval);
 }
 
 int
@@ -44,3 +46,5 @@ TAO_Notify_Timer_Reactor::cancel_timer (long timer_id)
 {
   return this->reactor_->cancel_timer (timer_id);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 1b3319df40a..31ef686604c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -1,32 +1,35 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Timer_Reactor.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_TIMER_REACTOR_H
 #define TAO_Notify_TIMER_REACTOR_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
-#include "Timer.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
+#include "orbsvcs/Notify/Timer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Timer_Reactor
  *
- * @brief Reactor::instance based timer. The timers are dispatched by the main thread.
- *
+ * @brief Reactor::instance based timer. The timers are dispatched by
+ *        the main thread.
  */
 class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer
 {
@@ -57,5 +60,7 @@ private:
   virtual void release (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h
index 30ffaadba58..33f313825a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h
@@ -1,17 +1,18 @@
+// -*- C++ -*-
+
 /**
  *  @file Topology_Factory.h
  *
  *  $Id$
  *
  *  @author Dale Wilson <wilson_d@ociweb.com>
- *
- *
  */
+
 #ifndef TAO_NOTIFY_TOPOLOGY_FACTORY_H
 #define TAO_NOTIFY_TOPOLOGY_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #include "ace/Service_Object.h"
 
@@ -19,6 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   class Topology_Saver;
@@ -39,8 +44,11 @@ namespace TAO_Notify
     /// \return a pointer to a Topology_Loader which must be deleted
     /// by the caller.
     virtual Topology_Loader* create_loader () = 0;
+    virtual ~Topology_Factory ();
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index 253f988ff37..27eeb6ad143 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
-#include "Topology_Loader.h"
+#include "orbsvcs/Notify/Topology_Loader.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify::Topology_Loader::Topology_Loader ()
 {
@@ -14,3 +16,5 @@ void
 TAO_Notify::Topology_Loader::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index b6b10232315..599afa07985 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,16 +14,24 @@
 #define TOPOLOGY_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #include "ace/config-all.h"
 
-#include "tao/corba.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+#include "ace/CORBA_macros.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace CORBA
+{
+  class Environment;
+}
+
 namespace TAO_Notify
 {
 
@@ -69,6 +77,8 @@ public:
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TOPOLOGY_LOADER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index f7be8f65e2c..ac174723aa3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/Topology_Object.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Topology_Object.inl"
+#include "orbsvcs/Notify/Topology_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 // question: is there a race_conditon with self_changed and children_changed?
@@ -13,6 +13,8 @@
 // children have been saved in Topology_Object::save_persistent ().
 // If these rules are followed, the only risk is a (harmless) extra save.
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   Topology_Savable::~Topology_Savable (void)
@@ -26,10 +28,10 @@ namespace TAO_Notify
 
   Topology_Object::Topology_Object ()
     : TAO_Notify_Object ()
-      , Topology_Savable ()
-      , self_changed_ (false)
-      , children_changed_ (false)
-      , topology_parent_ (0)
+    , Topology_Savable ()
+    , self_changed_ (false)
+    , children_changed_ (false)
+    , topology_parent_ (0)
   {
   }
 
@@ -40,7 +42,7 @@ namespace TAO_Notify
   void
   Topology_Object::initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL_NOT_USED)
   {
-  	ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0);
+    ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0);
     this->topology_parent_ = topology_parent;
     TAO_Notify_Object::initialize (topology_parent);
   }
@@ -66,13 +68,13 @@ namespace TAO_Notify
   {
     bool result = false;
     if (this->qos_properties_.event_reliability().is_valid ())
-      {
-        result = CosNotification::Persistent == this->qos_properties_.event_reliability().value ();
-      }
+    {
+      result = CosNotification::Persistent == this->qos_properties_.event_reliability().value ();
+    }
     else if (this->topology_parent () != 0)
-      {
-        result = this->topology_parent ()->is_persistent ();
-      }
+    {
+      result = this->topology_parent ()->is_persistent ();
+    }
     return result;
   }
 
@@ -116,6 +118,7 @@ namespace TAO_Notify
     if (parent != 0)
     {
       result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
     }
     return result;
   }
@@ -142,4 +145,7 @@ namespace TAO_Notify
     // if it is called in a release build, provide 'em a value
     return -1;
   }
+
 } // namespace TAO_Notify
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 19883f8ac3f..310b693d2aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,8 +14,8 @@
 #define TOPOLOGY_OBJECT_H
 #include /**/ "ace/pre.h"
 
-#include "Object.h"
-#include "Name_Value_Pair.h"
+#include "orbsvcs/Notify/Object.h"
+#include "orbsvcs/Notify/Name_Value_Pair.h"
 
 #include "ace/SString.h"
 #include "ace/Vector_T.h"
@@ -24,6 +24,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// \namespace TAO_Notify
 /// \brief A namespace to be used by all of TAO's Notification Service
@@ -45,7 +46,6 @@
 //
 namespace TAO_Notify
 {
-  static const ACE_TCHAR TOPOLOGY_ID_NAME[] = ACE_TEXT("TopologyID");
 
   class Topology_Saver;
   class Topology_Parent;
@@ -203,8 +203,10 @@ namespace TAO_Notify
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Topology_Object.inl"
+#include "orbsvcs/Notify/Topology_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
index efb34f9315f..14363a16d6f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   ACE_INLINE
@@ -18,3 +23,4 @@ namespace TAO_Notify
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index 91873af0136..65c9aa9f681 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Notify::Topology_Saver::~Topology_Saver ()
 {
@@ -9,5 +11,6 @@ TAO_Notify::Topology_Saver::~Topology_Saver ()
 void
 TAO_Notify::Topology_Saver::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 781da2721b7..91648109b7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,16 +14,17 @@
 #define TOPOLOGY_SAVER_H
 #include /**/ "ace/pre.h"
 
-#include "Topology_Object.h"
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/Topology_Object.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
-#include "tao/corba.h"
 #include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   /**
@@ -106,6 +107,8 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TOPOLOGY_SAVER */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index 7c1e767bd0f..6fb6d3c2e6b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "Worker_Task.h"
+#include "orbsvcs/Notify/Worker_Task.h"
 
 ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
 {
 }
@@ -16,3 +18,5 @@ void
 TAO_Notify_Worker_Task::update_qos_properties (const TAO_Notify_QoSProperties& /*qos_properties*/)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index bef6be6a23f..b1e529c56bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Worker_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_WORKER_TASK_H
@@ -14,14 +13,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "notify_serv_export.h"
+#include "orbsvcs/Notify/notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Method_Request.h"
-#include "Refcountable.h"
+#include "orbsvcs/Notify/Method_Request.h"
+#include "orbsvcs/Notify/Refcountable.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_AdminProperties;
 class TAO_Notify_QoSProperties;
@@ -64,5 +65,7 @@ protected:
   virtual ~TAO_Notify_Worker_Task ();
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_WORKER_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index f3ccc625d9b..f880fc28ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "XML_Loader.h"
-#include "Topology_Object.h"
+#include "orbsvcs/Notify/XML_Loader.h"
+#include "orbsvcs/Notify/Topology_Object.h"
 
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/parser/parser/Parser.h"
@@ -18,6 +18,14 @@
 
 using namespace TAO_Notify;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO_Notify {
+  extern const char TOPOLOGY_ID_NAME[];
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 namespace {
   CORBA::Long makeNVPList (NVPList& nvp, ACEXML_Attributes* attrs)
   {
@@ -26,7 +34,9 @@ namespace {
     {
       const ACE_TCHAR * name = attrs->getQName (i);
       const ACE_TCHAR * value = attrs->getValue (i);
-      if (ACE_OS::strcmp (name, TOPOLOGY_ID_NAME) == 0)
+      if (ACE_OS::strcmp (name,
+                          //TOPOLOGY_ID_NAME) == 0)
+                          TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0)
       {
         id = ACE_OS::atoi (value);
       }
@@ -37,6 +47,8 @@ namespace {
   }
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
   XML_Loader::XML_Loader ()
@@ -170,7 +182,7 @@ namespace TAO_Notify
     if (this->live_)
     {
       ACE_ASSERT (object_stack_.size () > 0);
-      Topology_Object* cur;
+      Topology_Object* cur = 0;
       if (object_stack_.top (cur) == 0)
       {
         ACE_DECLARE_NEW_ENV;
@@ -221,3 +233,5 @@ namespace TAO_Notify
   }
 
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index 7e35e9cae55..7069179d9bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,16 +21,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Topology_Loader.h"
+#include "orbsvcs/Notify/Topology_Loader.h"
 
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/parser/parser/Parser.h"
 #include "ACEXML/common/FileCharStream.h"
 
-#include "tao/corba.h"
-
 #include "ace/streams.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
  /// \brief Load Notification Service Topology from an XML file.
@@ -81,5 +81,7 @@ private:
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* XML_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index a586a197913..da7302b66d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "XML_Saver.h"
+#include "orbsvcs/Notify/XML_Saver.h"
 
 #include "ACEXML/common/XML_Util.h"
 
@@ -8,8 +8,12 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
+  extern const char TOPOLOGY_ID_NAME[];
+
   XML_Saver::XML_Saver(bool timestamp)
     : output_ (0)
     , close_out_ (false)
@@ -181,11 +185,11 @@ namespace TAO_Notify
     return true;
   }
 
-  void XML_Saver::end_object (CORBA::Long id,
-    const ACE_CString& type ACE_ENV_ARG_DECL_NOT_USED)
+  void XML_Saver::end_object (CORBA::Long /* id */,
+                              const ACE_CString& type
+                              ACE_ENV_ARG_DECL_NOT_USED)
   {
     ACE_ASSERT(this->output_ != 0);
-    ACE_UNUSED_ARG (id);
     FILE *out = this->output_;
     if (this->indent_.length() >= 2)
     {
@@ -195,3 +199,5 @@ namespace TAO_Notify
                      type.c_str(), ">\n");
   }
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index 2cbdbf643c0..f7c9afb87e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,15 +14,16 @@
 #define XML_SAVER_H
 #include /**/ "ace/pre.h"
 
-#include "Topology_Saver.h"
+#include "orbsvcs/Notify/Topology_Saver.h"
 
-#include "tao/corba.h"
 #include "ace/streams.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
 
@@ -80,5 +81,7 @@ private:
 
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* XML_SAVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
index 18faedac516..632ba0f0949 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
@@ -1,15 +1,19 @@
 // $Id$
 
-#include "XML_Topology_Factory.h"
-#include "XML_Saver.h"
-#include "XML_Loader.h"
+#include "orbsvcs/Notify/XML_Topology_Factory.h"
+#include "orbsvcs/Notify/XML_Saver.h"
+#include "orbsvcs/Notify/XML_Loader.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 //#include "ace/Service_Object.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
+  const char TOPOLOGY_ID_NAME[] = "TopologyID";
 
   XML_Topology_Factory::XML_Topology_Factory()
     : save_base_path_ ("./Notification_Service_Topology")
@@ -20,6 +24,11 @@ namespace TAO_Notify
   }
 
   // virtual
+  XML_Topology_Factory::~XML_Topology_Factory ()
+  {
+  }
+
+  // virtual
   Topology_Saver*
   XML_Topology_Factory::create_saver ()
   {
@@ -144,6 +153,10 @@ namespace TAO_Notify
     // nothing to do yet
     return 0;
   }
-
-  ACE_FACTORY_DEFINE (TAO_Notify_Persist, XML_Topology_Factory)
 } /* namespace TAO_Notify */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (TAO_Notify_Persist,
+                              TAO_Notify_XML_Topology_Factory,
+                              TAO_Notify::XML_Topology_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
index 88323bce2ed..b6dc0686d8a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,8 +14,8 @@
 #define XML_TOPOLOGY_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "Topology_Factory.h"
-#include "notify_persist_export.h"
+#include "orbsvcs/Notify/Topology_Factory.h"
+#include "orbsvcs/Notify/notify_persist_export.h"
 
 #include "tao/corba.h"
 #include "ace/SString.h"
@@ -25,8 +25,11 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify
 {
+  extern const char TOPOLOGY_ID_NAME[];
 
   /**
    * \brief Create XML topology savers and loaders
@@ -51,6 +54,7 @@ namespace TAO_Notify
   public:
     /// The constructor.
     XML_Topology_Factory ();
+    virtual ~XML_Topology_Factory ();
 
     ////////////////////////////////////
     // Override Topology_Factory methods
@@ -71,8 +75,11 @@ namespace TAO_Notify
     bool timestamp_;
   };
 
-  ACE_FACTORY_DECLARE (TAO_Notify_Persist, XML_Topology_Factory)
 } // namespace TAO_Notify
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_DECLARE (TAO_Notify_Persist, TAO_Notify_XML_Topology_Factory)
+
 #include /**/ "ace/post.h"
 #endif /* XML_TOPOLOGY_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 62979dc481d..2c63bc2bff5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,11 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
+project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export \
                  -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
+  tagchecks   += PortableGroup
 
   IDL_Files {
     miop.idl
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 322ebb548b8..829ca0cdef9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,4 +1,4 @@
-#include "GOA.h"
+#include "orbsvcs/PortableGroup/GOA.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -6,8 +6,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
-#include "PortableGroup_Acceptor_Registry.h"
-#include "PortableGroup_Request_Dispatcher.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -18,6 +18,8 @@ ACE_RCSID (PortableGroup,
 
 #include "ace/Auto_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableServer::ObjectId *
 TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
                                   ACE_ENV_ARG_DECL)
@@ -576,7 +578,7 @@ TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref,
   // Iterate through the tagged profiles, and
   // create acceptors for the multicast ones.
   slot = 0;
-  while ((profile = profiles.get_profile (slot)))
+  while (0 != (profile = profiles.get_profile (slot)))
     {
       if (this->find_group_component_in_profile (profile, group) == 0)
         return 0;
@@ -636,7 +638,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
   // Iterate through the tagged profiles, and
   // create acceptors for the multicast ones.
   slot = 0;
-  while ((profile = profiles.get_profile (slot)))
+  while (0 != (profile = profiles.get_profile (slot)))
     {
       if (profile->supports_multicast ())
         {
@@ -705,3 +707,5 @@ TAO_GOA::associate_group_with_ref (
   ACE_CHECK;
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 66cd21907bb..12af8d574a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 class TAO_PortableGroup_Acceptor_Registry;
 
@@ -314,6 +316,8 @@ protected:
                        PortableGroup::NotAGroupObject));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 8148eff7164..ac2bbec66cf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,13 +1,15 @@
-#include "MIOP.h"
-#include "UIPMC_Factory.h"
+#include "orbsvcs/PortableGroup/MIOP.h"
+#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
 #include "ace/Service_Config.h"
-#include "PortableGroup_Loader.h"
-#include "PG_Object_Adapter_Factory.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
+#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
 
 ACE_RCSID (PortableGroup,
            UIPMC_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /*static*/ int
@@ -23,3 +25,5 @@ namespace TAO
       ace_svc_desc_TAO_UIPMC_Protocol_Factory);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index 755901ffff3..7e6219a5e67 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -13,12 +13,16 @@
 #define TAO_MIOP_H
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,5 +39,7 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_MIOP_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index eefa86f14c7..fe3650caa71 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -1,5 +1,5 @@
-#include "PG_Default_Property_Validator.h"
-#include "PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -7,6 +7,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
   : membership_ (1),
     factories_ (1)
@@ -145,3 +147,5 @@ TAO_PG_Default_Property_Validator::validate_criteria (
       ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index da03189be1b..9f9ced075d9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -15,13 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Default_Property_Validator
@@ -78,6 +79,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 1a4a24f328a..8a901db4e19 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -1,16 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-#include "PG_FactoryRegistry.h"
+#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Vector_T.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/POAManagerC.h"
-#include "PG_Operators.h" // operator == on CosNaming::Name
+#include "orbsvcs/PortableGroup/PG_Operators.h" // operator == on CosNaming::Name
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
@@ -726,3 +729,5 @@ int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char
   }
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 3f9ae599e2b..b16268b5f66 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_FactoryRegistry.h
@@ -21,21 +22,25 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class PG_FactoryRegistry;
-}
+#include "tao/Versioned_Namespace.h"
 
 /////////////////////////////////
 // Includes needed by this header
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+//////////////////////////////////
+// Classes declared in this header
+namespace TAO
+{
+  class PG_FactoryRegistry;
+}
+
 /////////////////////
 // Forward references
 
@@ -46,7 +51,8 @@ namespace TAO
    * Note FactoryRegistry is not part of the OMG standard.  It was added
    * as part of the TAO implementation of Fault Tolerant CORBA
    */
-  class TAO_PortableGroup_Export PG_FactoryRegistry : public virtual POA_PortableGroup::FactoryRegistry
+  class TAO_PortableGroup_Export PG_FactoryRegistry
+    : public virtual POA_PortableGroup::FactoryRegistry
   {
     struct RoleInfo
     {
@@ -250,6 +256,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_FACTORYREGISTRY_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
deleted file mode 100644
index c731d88453f..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- C++ -*-
-
-#include "PG_Factory_Map.h"
-
-
-ACE_RCSID (PortableGroup,
-           PG_Factory_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
index ff2033929ff..33c4e1cf421 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -22,13 +22,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Factory_Set.h"
+#include "orbsvcs/PortableGroup/PG_Factory_Set.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Factory hash map.
 typedef ACE_Hash_Map_Manager_Ex<
   ACE_UINT32,
@@ -37,6 +39,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   ACE_Equal_To<ACE_UINT32>,
   ACE_Null_Mutex> TAO_PG_Factory_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_FACTORY_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
deleted file mode 100644
index e986c8d6cfc..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "PG_Factory_Set.h"
-
-ACE_RCSID (PortableGroup,
-           PG_Factory_Set,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
index 3bca619031f..9b545e49831 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -26,6 +26,7 @@
 
 #include "ace/Array_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Factory_Node
@@ -50,6 +51,7 @@ struct TAO_PG_Factory_Node
 
 typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 1a9c5f8b23f..0461276bea1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,9 +1,9 @@
-#include "PG_GenericFactory.h"
-#include "PG_MemberInfo.h"
-#include "PG_ObjectGroupManager.h"
-#include "PG_PropertyManager.h"
-#include "PG_Property_Utils.h"
-#include "PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
+#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
 
 #include "ace/OS_NS_stdio.h"
 
@@ -13,6 +13,9 @@ ACE_RCSID (PortableGroup,
            PG_GenericFactory,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_GenericFactory::TAO_PG_GenericFactory (
   TAO_PG_ObjectGroupManager & object_group_manager,
   TAO_PG_PropertyManager & property_manager)
@@ -773,3 +776,5 @@ TAO_PG_GenericFactory::create_member (
 
   return fcid._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 8123d3d3828..96b725c941a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -22,12 +22,13 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Factory_Map.h"
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/PG_Factory_Map.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class TAO_PG_ObjectGroupManager;
@@ -240,6 +241,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index bd6af066385..3c84812d454 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -10,11 +10,11 @@
  */
 //=============================================================================
 
-#include "PG_Group_Factory.h"
-#include "PG_Property_Utils.h"
-#include "PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_Group_Factory.h"
+#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
 #include "orbsvcs/PortableGroupC.h"
-#include "PG_Object_Group.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group.h"
 #include <orbsvcs/PortableGroup/PG_Utils.h>
 
 ACE_RCSID (PortableGroup,
@@ -22,6 +22,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PG_Group_Factory::PG_Group_Factory ()
   : orb_ (CORBA::ORB::_nil())
   , poa_ (PortableServer::POA::_nil())
@@ -226,3 +228,5 @@ TAO::PG_Group_Factory::groups_at_location (
   result->length (group_count);
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index 9ef00e3d20a..b9bd1309492 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Object_Group_Manipulator.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -30,6 +30,9 @@
 #include "ace/ACE.h"
 #include "ace/Hash_Map_Manager.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////
 // Forward reference
 namespace TAO
@@ -37,8 +40,6 @@ namespace TAO
   class PG_Property_Set;
 } // namespace TAO_PG
 
-
-
 namespace TAO
 {
   /////////////////////
@@ -176,6 +177,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_GROUP_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 7a7c359da50..dc93a9e2e2c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,7 +1,7 @@
-#include "PG_Group_Guard.h"
+#include "orbsvcs/PortableGroup/PG_Group_Guard.h"
 
-#include "PG_GenericFactory.h"
-#include "PG_ObjectGroupManager.h"
+#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -9,6 +9,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Group_Guard::TAO_PG_Group_Guard (
   TAO_PG_GenericFactory & generic_factory,
   TAO_PG_Factory_Set & factory_set,
@@ -54,3 +56,4 @@ TAO_PG_Group_Guard::release (void)
   this->released_ = 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
index 8fd7d844619..2c6ca8fe9ee 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -22,17 +22,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Factory_Set.h"
+#include "orbsvcs/PortableGroup/PG_Factory_Set.h"
 
 #include "tao/PortableServer/PortableServerC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class TAO_PG_GenericFactory;
 class TAO_PG_ObjectGroupManager;
 
-
-
 /**
  * @class TAO_PG_Group_Guard
  *
@@ -87,6 +86,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
index c95f86292b3..2fc8e11dadc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 
-#include "PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 ACE_RCSID (PortableGroup,
            PG_Location_Equal_To,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "PG_Location_Equal_To.inl"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
 #endif  /* !__ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
index 224daf9c011..cbfc12a8949 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -22,10 +22,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Operators.h"
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Location_Equal_To
@@ -47,9 +48,10 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "PG_Location_Equal_To.inl"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
 #endif  /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
index 2c9ab16375a..052d968242b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_PG_Location_Equal_To::operator () (
   const PortableGroup::Location &lhs,
@@ -9,3 +11,5 @@ TAO_PG_Location_Equal_To::operator () (
 {
   return lhs == rhs;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
index e4d1f963ba3..0197726bfe8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
@@ -2,10 +2,10 @@
 //
 // $Id$
 
-#include "PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
 
 #if !defined (__ACE_INLINE__)
-#include "PG_Location_Hash.inl"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableGroup,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
index 105ef25e6db..d59b5320ff0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/ACE.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Location_Hash
  *
@@ -40,9 +42,10 @@ public:
   CORBA::ULong operator() (const PortableGroup::Location &) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "PG_Location_Hash.inl"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
 #endif  /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
index 41fe3d62519..a0b591b1068 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_PG_Location_Hash::operator() (
   const PortableGroup::Location &location) const
@@ -19,3 +21,5 @@ TAO_PG_Location_Hash::operator() (
 
   return hash;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
deleted file mode 100644
index 0ff336e3c93..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-
-#include "PG_Location_Map.h"
-
-ACE_RCSID (PortableGroup,
-           PG_Location_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
index 6786897aa0f..e0eb6dbf756 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
@@ -22,8 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Location_Hash.h"
-#include "PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -31,6 +31,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 struct TAO_PG_ObjectGroup_Map_Entry;
 
@@ -45,6 +47,8 @@ typedef ACE_Hash_Map_Manager_Ex<
   TAO_PG_Location_Equal_To,
   ACE_Null_Mutex> TAO_PG_Location_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_LOCATION_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index 8746e2958ff..1485e8277d9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,10 +1,11 @@
-#include "PG_MemberInfo.h"
-#include "PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
 
 ACE_RCSID (PortableGroup,
            PG_MemberInfo,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs)
@@ -13,3 +14,5 @@ TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs)
   // important.
   return location == rhs.location;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
index 919c58f7ca5..41d428bd0bb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
@@ -25,6 +25,8 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/Unbounded_Set.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_MemberInfo
  *
@@ -51,9 +53,9 @@ struct TAO_PG_MemberInfo
 
 };
 
-
 typedef ACE_Unbounded_Set<TAO_PG_MemberInfo> TAO_PG_MemberInfo_Set;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index ef9eb998bb8..5251b3d7931 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,10 +1,11 @@
-#include "PG_Null_Property_Validator.h"
+#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
 
 
 ACE_RCSID (PortableGroup,
            PG_Null_Property_Validator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PG_Null_Property_Validator::validate_property (
@@ -25,3 +26,5 @@ TAO_PG_Null_Property_Validator::validate_criteria (
                    PortableGroup::CannotMeetCriteria))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 573430ccf66..41047a90c99 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,6 +23,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Null_Property_Validator
  *
@@ -58,6 +60,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 5152cdac17c..7b78ef895bc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,7 +1,7 @@
-#include "PG_ObjectGroupManager.h"
-#include "PG_GenericFactory.h"
-#include "PG_conf.h"
-#include "PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -14,6 +14,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
   : poa_ (),
     object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS),
@@ -865,3 +867,5 @@ TAO_PG_ObjectGroupManager::generic_factory (
 {
   this->generic_factory_ = generic_factory;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 962a9a1232a..b78cc4028f3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -16,20 +16,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_ObjectGroup_Map.h"
-#include "PG_Location_Map.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroup_Map.h"
+#include "orbsvcs/PortableGroup/PG_Location_Map.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServerC.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations
 class TAO_PG_GenericFactory;
 
@@ -305,6 +307,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
deleted file mode 100644
index 75e6324bce6..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "PG_ObjectGroup_Map.h"
-
-ACE_RCSID (PortableGroup,
-           PG_ObjectGroup_Map,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index b754df541a2..4673a79df0f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_MemberInfo.h"
+#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -32,6 +32,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_ObjectGroup_Map_Entry
  *
@@ -75,6 +77,7 @@ typedef ACE_Hash_Map_Manager_Ex<
   ACE_Equal_To<PortableServer::ObjectId>,
   ACE_Null_Mutex> TAO_PG_ObjectGroup_Map;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index 9cdce730ed6..f8545615ad6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "PG_Object_Adapter_Factory.h"
-#include "PG_Servant_Dispatcher.h"
+#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
+#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
 
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
@@ -10,6 +10,7 @@ ACE_RCSID (TAO_PortableGroup,
            PG_Object_Adapter_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
 {
@@ -36,6 +37,8 @@ TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   return object_adapter;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory,
                        ACE_TEXT ("TAO_GOA"),
@@ -43,4 +46,3 @@ ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory,
                        &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
index 189d77873a8..7edf4fe521e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Object_Adapter_Factory.h
@@ -13,7 +14,7 @@
 #define TAO_PG_OBJECT_ADAPTER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #include "tao/PortableServer/Object_Adapter_Factory.h"
 #include "tao/orbconf.h"
@@ -24,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory
 {
 public:
@@ -34,6 +37,8 @@ public:
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index e61dd872186..09d492e76a0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "PG_Object_Group.h"
-#include "PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
 
-#include "PG_Operators.h" // Borrow operator== on CosNaming::Name
-#include "PG_Utils.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h" // Borrow operator== on CosNaming::Name
+#include "orbsvcs/PortableGroup/PG_Utils.h"
 
 #include "tao/debug.h"
 
@@ -12,21 +12,21 @@
 #include "ace/Vector_T.h"
 
 
-// Borland C++ 6 Update Pack 4 and earlier give a warning about comparing
+// Borland Developer Studio 2006 and earlier give a warning about comparing
 // signed and unsigned values in the minimum_polulate() and
 // initial_populate() warnings. The comparison uses a unsigned long and
 // unsigned short and it seems that the compiler promotes the unsigned
 // short of an int and this then gives the warning. Just for Borland
 // disabled the warning in this file.
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
 # pragma option push -w-csu
 # pragma nopushoptwarn
 # pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */
+#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
 
 #define TODO int todo;
-//#define TODO
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Object_Group::MemberInfo::MemberInfo (
     CORBA::Object_ptr member,
@@ -886,9 +886,11 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location)
   return (0 == this->members_.find (location));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Restore original compiler flags.
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
 # pragma option pop
 # pragma nopushoptwarn
 # pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */
+#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 09f8ebba42c..aaf4628cda3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Object_Group.h
@@ -20,7 +21,7 @@
 #define TAO_PG_OBJECT_GROUP_H_
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -29,15 +30,17 @@
 
 /////////////////////////////////
 // Includes needed by this header
-#include "PG_Property_Set.h"
-#include "PG_Location_Hash.h"
-#include "PG_Location_Equal_To.h"
-#include "PG_Object_Group_Manipulator.h"
+#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/ACE.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////
 // Forward references
 
@@ -338,7 +341,7 @@ namespace TAO
      * the GroupTaggedComponent that defines this group
      * contains:
      *   GIOP::Version component_version;
-     *   TAO_String_Manager group_domain_id;
+     *   TAO::String_Manager group_domain_id;
      *   PortableGroup::ObjectGroupId object_group_id;
      *   PortableGroup::ObjectGroupRefVersion object_group_ref_version;
      */
@@ -372,6 +375,8 @@ namespace TAO
   };
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_OBJECT_GROUP_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index d55a858f22c..2fb57ae571a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -10,8 +10,8 @@
  */
 //=============================================================================
 
-#include "PG_Object_Group_Manipulator.h"
-#include "PG_Utils.h"
+#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h"
+#include "orbsvcs/PortableGroup/PG_Utils.h"
 
 #include "tao/debug.h"
 #include <ace/OS_NS_stdio.h>
@@ -20,6 +20,9 @@ ACE_RCSID (PortableGroup,
            PG_Object_Group_Manipulator,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator ()
   : orb_ (CORBA::ORB::_nil ())
   , poa_ (PortableServer::POA::_nil ())
@@ -68,7 +71,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
 
   // Create a reference for the ObjectGroup
   CORBA::Object_var object_group =
-    this->poa_->create_reference_with_id (ACE_U64_TO_U32 (group_id),
+    this->poa_->create_reference_with_id (oid.in(),
                                           type_id
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -183,3 +186,5 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member)
   }
 #endif
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 881a7437ade..4397cbfe8e0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -26,6 +26,8 @@
 
 #include "tao/IORManipulation/IORManip_Loader.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -114,6 +116,7 @@ namespace TAO
   };
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index 99436d883a5..9513dc724bb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,10 +1,12 @@
-#include "PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (PortableGroup,
            PG_Operators,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 operator== (const CosNaming::Name & lhs, const CosNaming::Name & rhs)
 {
@@ -27,3 +29,5 @@ operator!= (const CosNaming::Name & lhs, const CosNaming::Name & rhs)
 {
   return !(lhs == rhs);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
index 881c5330403..6218b5da005 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -25,6 +25,8 @@
 
 #include "orbsvcs/CosNamingC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Global CosNaming::Name equality operator.
 /**
  * Used for checking equality of PortableGroup::Location and
@@ -41,6 +43,7 @@ bool TAO_PortableGroup_Export operator== (const CosNaming::Name & lhs,
 bool TAO_PortableGroup_Export operator!= (const CosNaming::Name & lhs,
                                           const CosNaming::Name & rhs);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
index 5dc23baa0a8..de1fa1c7223 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.cpp
@@ -11,13 +10,15 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#include "PG_Properties_Encoder.h"
+#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 
 #if ! defined (__ACE_INLINE__)
-#include "PG_Properties_Encoder.inl"
+#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl"
 #endif /* !  __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////
 // Properties_Encoder
 TAO_PG::Properties_Encoder::Properties_Encoder ()
@@ -62,3 +63,5 @@ void TAO_PG::Properties_Encoder::encode (
     // nc.kind defaults to empty.  Leave it that way (for now)
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index d171ec5590a..d1780105873 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.h
@@ -21,11 +22,13 @@
 
 #include "orbsvcs/PortableGroupS.h"
 #include "orbsvcs/CosNamingC.h"
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #include "ace/Vector_T.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_PG
 {
   /**
@@ -89,8 +92,10 @@ namespace TAO_PG
 
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "PG_Properties_Encoder.inl"
+#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl"
 #endif /* __ACE_INLINE__ */
 #include /**/ "ace/post.h"
 #endif // TAO_PG_PROPERTIES_ENCODER_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
index 17fadf5df67..aa64246f6a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.inl
@@ -8,6 +9,9 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_PG
 {
   ACE_INLINE
@@ -57,3 +61,4 @@ namespace TAO_PG
 
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 907c2959ae2..cc8d023d899 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.cpp
@@ -11,7 +12,9 @@
  */
 //=============================================================================
 
-#include "PG_Properties_Support.h"
+#include "orbsvcs/PortableGroup/PG_Properties_Support.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Properties_Support::PG_Properties_Support ()
 {
@@ -144,3 +147,5 @@ TAO::PG_Properties_Support::find_typeid_properties (
   }
   return typeid_properties;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index a56bbc9a168..50e2f504ffd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.h
@@ -17,8 +18,10 @@
 #ifndef TAO_PG_PROPERTIES_SUPPORT_H
 #define TAO_PG_PROPERTIES_SUPPORT_H
 
-#include "PG_Property_Set.h"
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -206,4 +209,6 @@ namespace TAO
   };
 } //namespace TAO_PG
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // TAO_PG_PROPERTIES_SUPPORT_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index b09dc33d9de..f6d9fb2a13c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-#include "PG_PropertyManager.h"
-#include "PG_ObjectGroupManager.h"
-#include "PG_Property_Utils.h"
+#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (PortableGroup,
            PG_PropertyManager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_PropertyManager::TAO_PG_PropertyManager (
   TAO_PG_ObjectGroupManager & object_group_manager)
   : object_group_manager_ (object_group_manager),
@@ -362,3 +364,5 @@ TAO_PG_PropertyManager::remove_properties (
   // variable.
   properties = new_properties;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 7b748ac0d15..5d6c40fa063 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -21,8 +21,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PG_Default_Property_Validator.h"
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 
 #include "ace/SString.h"
@@ -30,6 +30,8 @@
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_PG_ObjectGroupManager;
 
@@ -183,6 +185,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PG_PROPERTY_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 8e41ae574ca..e63ff905d9d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Property_Set.cpp
@@ -14,9 +13,11 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#include "PG_Property_Set.h"
+#include "orbsvcs/PortableGroup/PG_Property_Set.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////
 // PG_Property_Set
 
@@ -25,7 +26,6 @@ TAO::PG_Property_Set::PG_Property_Set()
 {
 }
 
-
 TAO::PG_Property_Set::PG_Property_Set (
   const PortableGroup::Properties & property_set
     ACE_ENV_ARG_DECL)
@@ -246,9 +246,13 @@ int TAO::PG_Property_Set::find (
   return found;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //#define PG_PS_UNIT_TEST
 #ifdef PG_PS_UNIT_TEST
-#include "PG_Properties_Encoder.h"
+#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int TAO_PG::test_encode_decode ()
 {
@@ -350,4 +354,7 @@ int TAO_PG::test_encode_decode ()
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // PG_PS_UNIT_TEST
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 05c5f57f34b..44aae869da7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Property_Set.h
@@ -20,13 +21,15 @@
 #define TAO_PG_PROPERTY_SET
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -186,9 +189,11 @@ namespace TAO
 #endif // PG_PS_UNIT_TEST
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ////////////////////////////////////
 // include templated helper function
-#include "PG_Property_Set_Find.h"
+#include "orbsvcs/PortableGroup/PG_Property_Set_Find.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
index b06794df571..6f68524d8ac 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Property_Set_Find.h
@@ -20,10 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #include "ace/Hash_Map_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -45,6 +48,8 @@ namespace TAO
 
 } //namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif // TAO_PG_PROPERTY_SET_FIND_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 895c5bc8ad3..897facce517 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,10 +1,12 @@
-#include "PG_Property_Utils.h"
-#include "PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
 
 ACE_RCSID (PortableGroup,
            PG_Property_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_PG::get_property_value (const PortableGroup::Name & property_name,
                             const PortableGroup::Properties & properties,
@@ -76,3 +78,5 @@ TAO_PG::override_properties (
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index ca02b71a413..8e8395f2bc6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -22,9 +22,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_PG
 {
@@ -50,5 +51,7 @@ namespace TAO_PG
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_PG_PROPERTY_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 78280b2e7af..1c2b3a94b21 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -1,12 +1,14 @@
-// @(#) $Id$
+// $Id$
 
-#include "GOA.h"
-#include "PG_Servant_Dispatcher.h"
+#include "orbsvcs/PortableGroup/GOA.h"
+#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
 
 ACE_RCSID(PortableGroup,
           PG_Servant_Dispatcher,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
 {
 }
@@ -40,24 +42,29 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
 }
 
 void
-TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (TAO_Root_POA &,
-                                                      CORBA::Short,
-                                                      TAO_ServerRequest &,
-                                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO_ServerRequest &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &,
-                                                          CORBA::Short,
-                                                          TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &,
-                                        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
+TAO_PG_Servant_Dispatcher::post_invoke (
+  TAO_Root_POA &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index 2c40bef8cd3..c8c80d87a7f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,13 +14,15 @@
 #define TAO_PG_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 #include "tao/PortableServer/Servant_Dispatcher.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PG_Servant_Dispatcher
  *
@@ -64,5 +66,7 @@ public:
                                  ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PG_SERVANT_DISPATCHER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 58047cef329..a57079ffea8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,4 +1,4 @@
-#include "PG_Utils.h"
+#include "orbsvcs/PortableGroup/PG_Utils.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -13,6 +13,7 @@ ACE_RCSID (PortableGroup,
            PG_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -171,3 +172,5 @@ namespace TAO
     return cdr.good_bit ();
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
index f919cbbbba6..5552f38c3a3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    PG_Utils.h
@@ -20,7 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -50,7 +53,7 @@ namespace TAO
   };
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_PORTABLEGROUP_UTILS_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
index dcb0e3d5a5e..7f993ad8f71 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
@@ -24,6 +24,8 @@
 
 #include "orbsvcs/PortableGroupC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #ifndef TAO_PG_MAX_OBJECT_GROUPS  // @@ why create arbitrary limits?
 /// The maximum number of object groups to be managed by the
 /// ObjectGroupManager.  This number is also equal to the number of
@@ -55,6 +57,8 @@ const PortableGroup::MinimumNumberMembersValue TAO_PG_MINIMUM_NUMBER_MEMBERS =
   TAO_PG_INITIAL_NUMBER_MEMBERS;
 #endif  /* TAO_PG_MINIMUM_NUMBER_MEMBERS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_PG_CONF_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index 9f09c2ebf34..a22594ca04b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -1,8 +1,6 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "PortableGroup_Acceptor_Registry.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
 #include "tao/Protocol_Factory.h"
@@ -16,6 +14,8 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Acceptor_Registry,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
 {
 }
@@ -187,3 +187,5 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile,
 
    return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index 745cf1fdbb3..1ecc90efa4d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -25,11 +25,13 @@
 
 #include "ace/CORBA_macros.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/Resource_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 namespace CORBA
@@ -97,23 +99,19 @@ protected:
             Entry *&entry);
 
 private:
+
   // The acceptor registry should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_PortableGroup_Acceptor_Registry (
-                              const TAO_PortableGroup_Acceptor_Registry&
-                            ))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (
-                              const TAO_PortableGroup_Acceptor_Registry&
-                            ))
+  TAO_PortableGroup_Acceptor_Registry (
+    const TAO_PortableGroup_Acceptor_Registry&);
+  void operator= (const TAO_PortableGroup_Acceptor_Registry&);
 
 private:
   /// List of acceptors that are currently open.
   Acceptor_Registry registry_;
 };
 
-//#if defined(__ACE_INLINE__)
-//#include "tao/PortableGroup_Acceptor_Registry.i"
-//#endif /* __ACE_INLINE__ */
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLEGROUP_ACCEPTOR_REGISTRY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 31e3782daeb..2878d3db9a6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -1,10 +1,8 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "PortableGroup_Loader.h"
-#include "PG_Object_Adapter_Factory.h"
-#include "PortableGroup_ORBInitializer.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
+#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
+#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -13,6 +11,9 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Loader,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
 {
 }
@@ -71,6 +72,8 @@ TAO_PortableGroup_Loader::Initializer (void)
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader,
                        ACE_TEXT ("PortableGroup_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index c30fa026c6b..7dac70972c2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -16,15 +16,20 @@
 #define TAO_PORTABLEGROUP_LOADER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 
-#include "portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PortableGroup_Adapter
@@ -49,13 +54,15 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
-ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
-
 static int
 TAO_Requires_PortableGroup_Initializer =
   TAO_PortableGroup_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
+ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_LOADER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index bbfa405f7bc..870c6b75e59 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "PortableGroup_ORBInitializer.h"
-#include "PortableGroup_Request_Dispatcher.h"
+#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
 
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
@@ -12,9 +12,11 @@ ACE_RCSID (PortableGroup,
            PortableGroup_ORBInitializer,
            "$Id$")
 
-static const char pg_poa_factory_name[] = "TAO_PG_POA";
-static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE_A(
-  "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
+static const char pg_poa_factory_name[] = "TAO_GOA";
+static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+  "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
@@ -65,3 +67,5 @@ TAO_PortableGroup_ORBInitializer::post_init (
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 901e76e68d3..56f730edd59 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// PortableGroup ORB initializer.
 class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual PortableInterceptor::ORBInitializer,
@@ -48,6 +50,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 3fb03e3841d..ae3fbe2d941 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -1,10 +1,8 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "UIPMC_Profile.h"
-#include "PortableGroup_Request_Dispatcher.h"
-#include "PortableGroup_Loader.h"
+#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -13,6 +11,8 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Request_Dispatcher,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
 {
 }
@@ -57,3 +57,5 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index 0f0ae518206..fb6ae13e934 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -20,9 +20,11 @@
 
 #include "tao/Request_Dispatcher.h"
 
-#include "portablegroup_export.h"
-#include "Portable_Group_Map.h"
-#include "PortableGroup_Acceptor_Registry.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "orbsvcs/PortableGroup/Portable_Group_Map.h"
+#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations.
 class TAO_PortableGroup_Loader;
@@ -61,6 +63,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_REQUEST_DISPATCHER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 6d84be5bd71..a3515d8cf37 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Portable_Group_Map.h"
+#include "orbsvcs/PortableGroup/Portable_Group_Map.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
@@ -9,6 +9,7 @@ ACE_RCSID (PortableGroup,
            Portable_Group_Map,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
 TAO_Portable_Group_Map::TAO_Portable_Group_Map ()
@@ -175,3 +176,5 @@ TAO_GroupId_Equal_To::operator () (
     && lhs->object_group_id == rhs->object_group_id
     && lhs->object_group_ref_version == rhs->object_group_ref_version;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index 12ec9ee45a5..c6c69ae9e11 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,6 +28,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ServerRequest;
 
@@ -128,6 +129,8 @@ protected:
   GroupId_Table map_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //#if defined (__ACE_INLINE__)
 //# include "Portable_Group_Map.i"
 //#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index a6b2bf50b8e..8db8a3e7687 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "UIPMC_Profile.h"
-#include "UIPMC_Acceptor.h"
+#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
@@ -15,13 +15,14 @@
 #include "ace/os_include/os_netdb.h"
 
 #if !defined(__ACE_INLINE__)
-#include "UIPMC_Acceptor.i"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableGroup,
            UIPMC_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (CORBA::Boolean /*flag*/)
   : TAO_Acceptor (TAO_TAG_UIPMC_PROFILE),
@@ -347,3 +348,5 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 4022d3f4ec0..6c783e885c1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "UIPMC_Connection_Handler.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,9 @@
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO UIPMC_Acceptor concrete call defination
 
@@ -148,8 +150,10 @@ private:
   TAO_UIPMC_Connection_Handler *connection_handler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "UIPMC_Acceptor.i"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
index 3bda9ea1fca..ec296d0f9b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
@@ -1,6 +1,10 @@
 // -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_UIPMC_Acceptor::address (void) const
 {
@@ -21,3 +25,5 @@ TAO_UIPMC_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 930e364b656..df2fbd006c7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -3,9 +3,9 @@
 // $Id$
 
 
-#include "UIPMC_Connection_Handler.h"
-#include "UIPMC_Transport.h"
-#include "UIPMC_Endpoint.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
+#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
+#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
@@ -23,6 +23,7 @@ ACE_RCSID(PortableGroup,
           UIPMC_Connection_Handler,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIPMC_SVC_HANDLER (t, 0 , 0),
@@ -262,3 +263,5 @@ TAO_UIPMC_Connection_Handler::add_transport_to_cache (void)
           .transport_cache ().cache_transport (&prop,
                                                this->transport ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index 0ea83fc2966..51153c2d196 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "UIPMC_Transport.h"
+#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
 
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
@@ -32,6 +32,8 @@
 #include "ace/SOCK_Dgram.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -45,8 +47,6 @@ class TAO_Pluggable_Messaging;
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
 class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler :
   public TAO_UIPMC_SVC_HANDLER,
   public TAO_Connection_Handler
@@ -143,5 +143,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 370ff9fd142..d3ac960f0ca 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,9 +1,7 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "UIPMC_Profile.h"
-#include "UIPMC_Connector.h"
+#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -14,9 +12,11 @@
 #include "ace/Connector.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (PortableGroup,
            UIPMC_Connector, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Connector::TAO_UIPMC_Connector (CORBA::Boolean)
   : TAO_Connector (TAO_TAG_UIPMC_PROFILE)
 {
@@ -181,15 +181,15 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint)
   if (!endpoint || !*endpoint)
     return -1;  // Failure
 
-  const char *protocol[] = { "miop" };
+  static const char protocol[] = "miop";
+  static size_t const len = sizeof (protocol) - 1;
 
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-  size_t len0 = ACE_OS::strlen (protocol[0]);
+  size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
 
   // Check for the proper prefix in the IOR.  If the proper prefix
   // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
+  if (slot == len
+      && ACE_OS::strncasecmp (endpoint, protocol, len) == 0)
     return 0;
 
   return -1;
@@ -205,34 +205,11 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const
 
 int
 TAO_UIPMC_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
+  TAO_Connection_Handler * /* svc_handler */)
 {
-  ACE_UNUSED_ARG(svc_handler);
-
   // Noop
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash <ACE_INET_Addr>;
-template class ACE_Equal_To <ACE_INET_Addr>;
-template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr,
-                                       TAO_UIPMC_Connection_Handler *,
-                                       ACE_Hash <ACE_INET_Addr>,
-                                       ACE_Equal_To <ACE_INET_Addr>,
-                                       ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_INET_Addr,
-                                  TAO_UIPMC_Connection_Handler *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash <ACE_INET_Addr>
-#pragma instantiate ACE_Equal_To <ACE_INET_Addr>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, \
-                                            TAO_UIPMC_Connection_Handler *, \
-                                            ACE_Hash <ACE_INET_Addr>, \
-                                            ACE_Equal_To <ACE_INET_Addr>,
-                                            ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, \
-                                       TAO_UIPMC_Connection_Handler *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index b537b14a02c..43357053bd2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -17,17 +17,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "UIPMC_Connection_Handler.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
 
 #include "tao/Transport_Connector.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 /**
@@ -90,6 +92,8 @@ private:
     SvcHandlerIterator;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_UIPMC_CONNECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 04ef32df9ce..f10ce5cdafb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -1,8 +1,6 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "UIPMC_Endpoint.h"
+#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
 
 #include "tao/debug.h"
 #include "ace/Guard_T.h"
@@ -17,9 +15,11 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "UIPMC_Endpoint.i"
+# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void)
   : TAO_Endpoint (TAO_TAG_UIPMC_PROFILE),
     object_addr_ (),
@@ -145,3 +145,5 @@ TAO_UIPMC_Endpoint::hash (void)
 
   return this->hash_val_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index f7a23583d58..3c137d6c9ef 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -25,7 +25,9 @@
 
 #include "ace/INET_Addr.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIPMC_Endpoint
@@ -116,8 +118,10 @@ private:
   TAO_UIPMC_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "UIPMC_Endpoint.i"
+# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
index c89f5618806..7d91cc4d459 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr &
 TAO_UIPMC_Endpoint::object_addr (void) const
 {
@@ -46,3 +49,4 @@ TAO_UIPMC_Endpoint::update_object_addr (void)
                           this->uint_ip_addr ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index 19d65555a11..b006f1d1e1e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -1,17 +1,18 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "UIPMC_Factory.h"
-#include "UIPMC_Acceptor.h"
-#include "UIPMC_Connector.h"
+#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
 #include "ace/OS_NS_strings.h"
+#include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableGroup, 
            UIPMC_Factory, 
            "$Id$")
 
-static const char prefix_[] = "uipmc";
+static const char the_prefix[] = "uipmc";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIPMC_PROFILE),
@@ -28,13 +29,13 @@ int
 TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO_UIPMC_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -85,6 +86,8 @@ TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIPMC_Protocol_Factory,
                        ACE_TEXT ("UIPMC_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index 1da6283791f..b914111489e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -23,7 +23,9 @@
 
 #include "ace/Service_Config.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -60,6 +62,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIPMC_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_UIPMC_Protocol_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index 2f8473c5a73..4e3d4173fcf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
-#include "UIPMC_Message_Block_Data_Iterator.h"
+#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 UIPMC_Message_Block_Data_Iterator::UIPMC_Message_Block_Data_Iterator (iovec *iov, int iovcnt) :
   iov_ (iov),
@@ -83,3 +85,5 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
index 3f28eb5e7c6..0378e1aac7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class UIPMC_Message_Block_Data_Iterator
  *
@@ -60,5 +64,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_MESSAGE_BLOCK_DATA_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 8c1cfd4af4f..0f1ddbbb73b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -1,9 +1,7 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-#include "UIPMC_Profile.h"
-#include "miopconf.h"
+#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
+#include "orbsvcs/PortableGroup/miopconf.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/ORB.h"
@@ -19,12 +17,14 @@ ACE_RCSID (PortableGroup,
            UIPMC_Profile,
            "$Id$")
 
-static const char prefix_[] = "uipmc";
+static const char the_prefix[] = "uipmc";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
 // specification.
 static const CORBA::Short default_addressing_mode_ = TAO_Target_Specification::Profile_Addr;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_UIPMC_Profile::object_key_delimiter_ = '/';
 
 char
@@ -105,6 +105,59 @@ TAO_UIPMC_Profile::~TAO_UIPMC_Profile (void)
 }
 
 int
+TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr)
+{
+  // The following is a selective reproduction of TAO_Profile::decode
+
+  CORBA::ULong encap_len = cdr.length ();
+
+  // Read and verify major, minor versions, ignoring profiles
+  // whose versions we don't understand.
+  if (!(cdr.read_octet (this->version_.major)
+        && this->version_.major == TAO_DEF_GIOP_MAJOR
+        && cdr.read_octet (this->version_.minor)
+        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - Profile::decode - v%d.%d\n"),
+                      this->version_.major,
+                      this->version_.minor));
+        }
+
+      return -1;
+    }
+
+  // Transport specific details
+  if (this->decode_profile (cdr) < 0)
+    {
+      return -1;
+    }
+
+  // UIPMC profiles must have tagged components.
+  if (this->tagged_components_.decode (cdr) == 0)
+    {
+      return -1;
+    }
+
+  if (cdr.length () != 0 && TAO_debug_level)
+    {
+      // If there is extra data in the profile we are supposed to
+      // ignore it, but print a warning just in case...
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("%d bytes out of %d left after profile data\n"),
+                  cdr.length (),
+                  encap_len));
+    }
+
+  // We don't call ::decode_endpoints because it is implemented
+  // as ACE_NOTSUP_RETURN (-1) for this profile
+
+  return 1;
+}
+
+int
 TAO_UIPMC_Profile::decode_endpoints (void)
 {
   ACE_NOTSUP_RETURN (-1);
@@ -222,7 +275,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   ACE_CString ace_str (string, 0, 0);
 
   // Look for the group domain delimitor.
-  int pos = ace_str.find ('-');
+  ssize_t pos = ace_str.find ('-');
 
   if (pos == ACE_CString::npos)
     {
@@ -243,7 +296,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
 
   // Skip past the last '-'.
   pos++;
-  int end_pos = ace_str.find ('-',pos);
+  ssize_t end_pos = ace_str.find ('-',pos);
 
   CORBA::Boolean parse_group_ref_version_flag = 0;
 
@@ -398,7 +451,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ Frank: Update to pull out GroupID information...
 
-  size_t buflen = (ACE_OS::strlen (::prefix_) +
+  size_t buflen = (ACE_OS::strlen (::the_prefix) +
                    3 /* "loc" */ +
                    1 /* colon separator */ +
                    2 /* double-slash separator */ +
@@ -414,7 +467,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s://1.0@%s:%d",
-                   ::prefix_,
+                   ::the_prefix,
                    this->endpoint_.get_host_addr (),
                    this->endpoint_.port ());
   return buf;
@@ -423,7 +476,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_UIPMC_Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 IOP::TaggedProfile &
@@ -684,7 +737,8 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
 
   // Read and verify major, minor versions, ignoring UIPMC profiles
   // whose versions we don't understand.
-  CORBA::Octet major, minor;
+  CORBA::Octet major;
+  CORBA::Octet minor = CORBA::Octet();
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -742,3 +796,5 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index 3b5ee25dc3a..a6f8846eeb5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -17,13 +17,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "UIPMC_Endpoint.h"
+#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -33,6 +33,7 @@
 
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO UIPMC_Profile concrete Profile definitions
 /**
@@ -80,6 +81,11 @@ public:
   ~TAO_UIPMC_Profile (void);
 
   /// Template methods. Please see tao/Profile.h for documentation.
+  
+  /// N.B. We have to override the TAO_Profile default decode because
+  /// in UIPMC there is no object key marshalled and we do not implement
+  /// a useable ::decode_endpoints
+  virtual int decode (TAO_InputCDR& cdr);
   virtual void parse_string (const char *string
                              ACE_ENV_ARG_DECL);
   virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
@@ -153,5 +159,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index ea424e9816c..aeb70116179 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -1,12 +1,11 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "UIPMC_Profile.h"
-#include "UIPMC_Transport.h"
-#include "UIPMC_Connection_Handler.h"
-#include "UIPMC_Message_Block_Data_Iterator.h"
-#include "UIPMC_Acceptor.h"
-#include "UIPMC_Wait_Never.h"
+#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
+#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
+#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
+#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
+#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h"
 
 #include "tao/Acceptor_Registry.h"
 #include "tao/operation_details.h"
@@ -59,6 +58,8 @@ ACE_RCSID (PortableGroup,
 
 static const CORBA::Octet miop_magic[4] = { 0x4d, 0x49, 0x4f, 0x50 }; // 'M', 'I', 'O', 'P'
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct MIOP_Packet
 {
   iovec iov[ACE_IOV_MAX];
@@ -66,6 +67,7 @@ struct MIOP_Packet
   int length;
 };
 
+
 TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler,
                                           TAO_ORB_Core *orb_core,
                                           CORBA::Boolean /*flag*/)
@@ -77,6 +79,7 @@ TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler,
   // Use the normal GIOP object
   ACE_NEW (this->messaging_object_,
            TAO_GIOP_Message_Base (orb_core,
+                                  this,
                                   MIOP_MAX_DGRAM_SIZE));
 
   // Replace the default wait strategy with our own
@@ -266,7 +269,7 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt,
          current_fragment->iovcnt > 1)
     {
       // Fill in the packet length header field.
-      *packet_length = current_fragment->length;
+      *packet_length = static_cast<CORBA::UShort> (current_fragment->length);
 
       // If this is the last fragment, set the stop message flag.
       if (num_fragments == 1)
@@ -489,16 +492,34 @@ TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh,
   // Set the write pointer in the stack buffer.
   message_block.wr_ptr (n);
 
+
+  // Make a node of the message block..
+  TAO_Queued_Data qd (&message_block);
+  size_t mesg_length;
+
   // Parse the incoming message for validity. The check needs to be
   // performed by the messaging objects.
-  if (this->parse_incoming_messages (message_block) == -1)
+  if (this->messaging_object ()->parse_next_message (message_block,
+                                                     qd,
+                                                     mesg_length) == -1)
     {
       if (TAO_debug_level)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO: (%P|%t|%N|%l) parse_incoming_messages failed on transport %d after fault %p\n"),
-                      this->id (),
-                      ACE_TEXT ("handle_input_i ()\n")));
+                      ACE_TEXT ("TAO: (%P|%t|%N|%l) handle_input failed on transport %d after fault\n"),
+                      this->id () ));
+        }
+
+      return -1;
+    }
+
+  if (message_block.length () > mesg_length)
+    {
+      if (TAO_debug_level)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO: (%P|%t|%N|%l) handle_input  failed on transport %d after fault\n"),
+                      this->id () ));
         }
 
       return -1;
@@ -508,12 +529,6 @@ TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh,
   // missing data. We are assuming that ALL the data would be got in a
   // single read.
 
-  // Make a node of the message block..
-  TAO_Queued_Data qd (&message_block);
-
-  // Extract the data for the node..
-  this->messaging_object ()->get_message_data (&qd);
-
   // Process the message
   return this->process_parsed_messages (&qd, rh);
 }
@@ -586,8 +601,6 @@ TAO_UIPMC_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
-
-
 int
 TAO_UIPMC_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -596,3 +609,5 @@ TAO_UIPMC_Transport::messaging_init (CORBA::Octet major,
                                  minor);
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 164e8991e51..634b85c0b1a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -14,7 +14,7 @@
 #define TAO_UIPMC_TRANSPORT_H
 #include /**/ "ace/pre.h"
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_UIPMC_Connection_Handler;
 class TAO_ORB_Core;
@@ -123,5 +125,7 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index a640656a52a..0e1a0f1bc89 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "UIPMC_Wait_Never.h"
+#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h"
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, Wait_On_Leader_Follower, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
@@ -47,3 +49,5 @@ TAO_UIPMC_Wait_Never::wait (ACE_Time_Value *,
 {
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index 799d09e2e64..9f39cd77b91 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,7 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portablegroup_export.h"
+#include "orbsvcs/PortableGroup/portablegroup_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIPMC_Wait_Never
@@ -50,5 +52,7 @@ public:
   virtual bool can_process_upcalls (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_WAIT_NEVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 13f444a73e0..7b0e4d0db2e 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -19,6 +19,8 @@
 
 ACE_RCSID(Property, CosPropertyService_i, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // = Methods to deal with ACE_Hash_Map_Manager.
 
 CosProperty_Hash_Key::CosProperty_Hash_Key (void)
@@ -1882,3 +1884,5 @@ TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 33ee726d0ab..d887745dec3 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Property/property_export.h"
+#include "orbsvcs/Property/property_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,7 @@
 
 #include "orbsvcs/CosPropertyS.h"
 
+#include "tao/Sequence_T.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
@@ -33,9 +34,11 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
-class TAO_Property_Export CosProperty_Hash_Key
+class TAO_Property_Serv_Export CosProperty_Hash_Key
 {
   // = TITLE
   //     Key for the Hash Table. The EXT_ID of the
@@ -70,7 +73,7 @@ public:
   // Storage pointer.
 };
 
-class TAO_Property_Export CosProperty_Hash_Value
+class TAO_Property_Serv_Export CosProperty_Hash_Value
 {
   // = TITLE
   //     This will be the value part in the Hash_Table. The INT_ID of
@@ -107,7 +110,7 @@ class TAO_PropertySet;
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
+class TAO_Property_Serv_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
 {
   // = TITLE
   //     Factory class for the TAO_PropertySet class objects.
@@ -148,7 +151,7 @@ public:
   // modes".
 
 private:
-  TAO_Unbounded_Sequence<TAO_PropertySet*> propertyset_products_;
+  TAO::unbounded_value_sequence<TAO_PropertySet*> propertyset_products_;
   // The PropertySet objects new'ed and given to the client. Let us
   // keep track all of them so that we can delete them at the end.
 };
@@ -160,7 +163,7 @@ class TAO_PropertySetDef;
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
+class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
 {
   // = TITLE
   //     Factory class for the TAO_PropertySetDef objects.
@@ -199,14 +202,14 @@ public:
   // initial properties.
 
 private:
-  TAO_Unbounded_Sequence<TAO_PropertySetDef*> propertysetdef_products_;
+  TAO::unbounded_value_sequence<TAO_PropertySetDef*> propertysetdef_products_;
   // The PropertySet objects new'ed and given to the client. Let us
   // keep track all of them so that we can delete them at the end.
 };
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
+class TAO_Property_Serv_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
 {
   // = TITLE
   //    Gives operations for defining, deleting, enumerating and
@@ -342,8 +345,7 @@ private:
   TAO_PropertySet (const TAO_PropertySet &);
   // Not possible to copy
 
-// XXX:This public: is a hack to keep the compiler complain about access violation.
-public:
+public: // @todo make private
   COSPROPERTY_HASH_MAP hash_table_;
   // This Hash_Table manages storage for our properties.
 
@@ -363,7 +365,7 @@ protected:
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
+class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
                                               public virtual TAO_PropertySet
 {
   // = TITLE
@@ -486,7 +488,7 @@ public:
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertyNamesIterator
+class TAO_Property_Serv_Export TAO_PropertyNamesIterator
   : public virtual POA_CosPropertyService::PropertyNamesIterator
 {
   // = TITLE
@@ -547,7 +549,7 @@ private:
 
 // ============================================================================
 
-class TAO_Property_Export TAO_PropertiesIterator
+class TAO_Property_Serv_Export TAO_PropertiesIterator
   : public virtual POA_CosPropertyService::PropertiesIterator
 {
   // = TITLE
@@ -608,6 +610,8 @@ private:
   // The iterator object.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
index 117fed37089..0350cf8953f 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory {
+project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults {
   sharedname    = TAO_RTCosScheduling
   idlflags     += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h
   dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index 15df3752ffe..d13cfe93576 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,7 +10,7 @@
  */
 //=============================================================================
 
-#include "RTCosScheduling_ClientScheduler_i.h"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h"
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
@@ -20,6 +20,8 @@
 #include "tao/PortableInterceptorC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -518,3 +520,5 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 8ae82aaaba0..69ac688e910 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -38,6 +38,7 @@
 #include "tao/CodecFactory/CodecFactory.h"
 #include "tao/RTCORBA/Linear_Priority_Mapping.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO {
 
@@ -203,6 +204,8 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i :
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index 5ef02463424..2f10810d9c9 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -10,16 +10,18 @@
  */
 //=============================================================================
 
-#include "RTCosScheduling_PCP_Manager.h"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h"
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Thread.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "RTCosScheduling_PCP_Manager.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO {
 
 CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
@@ -513,3 +515,5 @@ PCP_Manager_Factory::~PCP_Manager_Factory()
 }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
index 69d71d1420f..b7d3cda9069 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -37,6 +37,7 @@
 #endif /* __BORLANDC__ */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO {
 
@@ -294,11 +295,12 @@ public:
 
 };
 
-
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "RTCosScheduling_PCP_Manager.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
index f6df426891f..15e9ced25a9 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -12,6 +12,8 @@
  */
 //=============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * Returns a pointer to the node containing the highest ceiling (the
  * first node in the list of held locks)
@@ -93,3 +95,4 @@ TAO::CosSchedulingLockNode::operator=(const CosSchedulingLockNode& L)
   return *this;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index ae3558de793..d0fb3c1c07b 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
  *  @file    RTCosScheduling_ServerScheduler_i.cpp
@@ -10,12 +8,12 @@
  */
 //=============================================================================
 
-#include "RTCosScheduling_ServerScheduler_i.h"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "RTCosScheduling_ServerScheduler_i.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/ORB_Core.h"
@@ -25,6 +23,8 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO {
 
 RTCosScheduling_ServerScheduler_i::
@@ -762,3 +762,5 @@ RTCosScheduling_ServerScheduler_i::resources(
 }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 0b7b3ff657e..beb95c8417c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,7 +23,7 @@
 #include "ace/SString.h"
 #include <orbsvcs/RTCosSchedulingS.h>
 #include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
-#include "RTCosScheduling_PCP_Manager.h"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 #include "tao/LocalObject.h"
@@ -39,6 +39,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #ifndef RTCOSSCHEDULING_SERVER_CONTAINERS
 #define RTCOSSCHEDULING_SERVER_CONTAINERS
@@ -295,8 +296,10 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "RTCosScheduling_ServerScheduler_i.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
index a8d071fc9fd..4bf50f13a5b 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,6 +10,9 @@
  */
 //=============================================================================
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Equal_To< COS_SCHEDULING_OBJECT_NAME_KEY >::operator () (
   COS_SCHEDULING_OBJECT_NAME_KEY lhs,
@@ -32,3 +35,5 @@ TAO::CosSchedulingInvocation_Hash_key::operator () (
 {
   return static_cast<u_long> (key);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index b42e56b56ab..72141564487 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent) : orbsvcslib, core, svc_utils {
+project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTEvent
   idlflags    += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
   dynamicflags = TAO_RTEVENT_BUILD_DLL
@@ -48,4 +48,8 @@ project(RTEvent) : orbsvcslib, core, svc_utils {
 
   Template_Files {
   }
+
+  Pkgconfig_Files {
+    TAO_RTEvent.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 88a06a5c1d1..5ecee5826dd 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,27 +1,107 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv {
+project(RTEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, rtevent, tao_versioning_idl_defaults {
+  custom_only = 1
+  idlflags   += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h
+
+  IDL_Files {
+    RTEventLogAdmin.idl
+  }
+}
+
+project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent {
   sharedname   = TAO_RTEventLogAdmin
-  idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
   tagchecks   += RTEventLog
+  after       += RTEventLogAdmin_IDL
 
   IDL_Files {
-    RTEventLogAdmin.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    RTEventLog {
-      RTEventLogAdminC.cpp
-      RTEventLogAdminS.cpp
-      Log/RTEventLogFactory_i.cpp
-      Log/RTEventLog_i.cpp
-      Log/RTEventLogConsumer.cpp
-      Log/RTEventLogNotification.cpp
-    }
+  Source_Files {
+    RTEventLogAdminC.cpp
+  }
+
+  Header_Files {
+    RTEventLogAdminC.h
+    Log/rteventlog_export.h
+  }
+
+  Inline_Files {
+    RTEventLogAdminC.inl
   }
 
   Template_Files {
   }
+
+  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_RTEventLogAdmin.pc.in
+  }
+}
+
+project(RTEventLogAdmin_Skel) : orbsvcslib, core, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver {
+  sharedname   = TAO_RTEventLogAdmin_Skel
+  dynamicflags = TAO_RTEVENTLOG_SKEL_BUILD_DLL
+  tagchecks   += RTEventLog
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    RTEventLogAdminS.cpp
+  }
+
+  Header_Files {
+    RTEventLogAdminS.h
+    RTEventLogAdminS_T.h
+    Log/rteventlog_skel_export.h
+  }
+
+  Inline_Files {
+    RTEventLogAdminS.inl
+    RTEventLogAdminS_T.inl
+  }
+
+  Template_Files {
+    RTEventLogAdminS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_RTEventLogAdmin_Skel.pc.in
+  }
+}
+
+project(RTEventLogAdmin_Serv) : orbsvcslib, core, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched {
+  sharedname   = TAO_RTEventLogAdmin_Serv
+  dynamicflags = TAO_RTEVENTLOG_SERV_BUILD_DLL
+  tagchecks   += RTEventLog
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Log/RTEventLogConsumer.cpp
+    Log/RTEventLogFactory_i.cpp
+    Log/RTEventLogNotification.cpp
+    Log/RTEventLog_i.cpp
+  }
+
+  Header_Files {
+    Log/rteventlog_serv_export.h
+  }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_RTEventLogAdmin_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index 3c19e408e47..1e9797263d9 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
+  avoids      += ace_for_tao  // Requires ACE_crc32
   sharedname   = TAO_RTEvent_Serv
   dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL
   tagchecks   += RTEvent
@@ -11,7 +12,6 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
 
   Source_Files {
     Event/ECG_Adapters.cpp
-    Event/ECG_Address_Server_Base.cpp
     Event/ECG_CDR_Message_Receiver.cpp
     Event/ECG_CDR_Message_Sender.cpp
     Event/ECG_Complex_Address_Server.cpp
@@ -92,5 +92,8 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
   Resource_Files{
     RTEvent_Serv.rc
   }
-}
 
+  Pkgconfig_Files {
+    TAO_RTEvent_Serv.pc.in
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index b443d655eb1..6a8bb6d38b6 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -4,6 +4,7 @@
 project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   sharedname   = TAO_RTEvent_Skel
   dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL
+  tagchecks   += RTEvent
 
   IDL_Files {
   }
@@ -36,4 +37,8 @@ project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   Resource_Files{
     RTEvent_Skel.rc
   }
+
+  Pkgconfig_Files {
+    TAO_RTEvent_Skel.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index ef34a2ec2a6..4659069665c 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
+project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTSched
   idlflags    += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
   dynamicflags = TAO_RTSCHED_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index fe038ea6723..f43b2825357 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
+project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv, tao_versioning_idl_defaults {
   sharedname   = TAO_RT_Notification
   idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
   dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl b/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
index 65fbbbe3661..ab51ef3a3bb 100644
--- a/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
@@ -15,10 +15,12 @@
 #ifndef TAO_RTEC_DEFAULTEVENTDATA_IDL
 #define TAO_RTEC_DEFAULTEVENTDATA_IDL
 
+#include <OctetSeq.pidl>
+
 #pragma prefix ""
 
 /// Define one of the common event payloads
-typedef sequence<octet> EventPayload;
+typedef CORBA::OctetSeq EventPayload;
 
 /**
  * @brief User defined Event Data
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 57df6a30ee3..7adb49300b7 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -8,7 +8,9 @@ ACE_RCSID (orbsvcs,
            Runtime_Scheduler,
            "$Id$")
 
-  // Constructor. Initialize the data from the POD_RT_Info array.
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Constructor. Initialize the data from the POD_RT_Info array.
 
 ACE_Runtime_Scheduler::
 ACE_Runtime_Scheduler (int config_count,
@@ -99,17 +101,17 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
 // Set characteristics of the RT_Info corresponding to the passed handle.
 
 void
-ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
-                                 RtecScheduler::Criticality_t criticality,
-                                 RtecScheduler::Time time,
-                                 RtecScheduler::Time typical_time,
-                                 RtecScheduler::Time cached_time,
-                                 RtecScheduler::Period_t period,
-                                 RtecScheduler::Importance_t importance,
-                                 RtecScheduler::Quantum_t quantum,
-                                 CORBA::Long threads,
-                                 RtecScheduler::Info_Type_t info_type
-                                 ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
+                            ::RtecScheduler::Criticality_t criticality,
+                            ::RtecScheduler::Time time,
+                            ::RtecScheduler::Time typical_time,
+                            ::RtecScheduler::Time cached_time,
+                            ::RtecScheduler::Period_t period,
+                            ::RtecScheduler::Importance_t importance,
+                            ::RtecScheduler::Quantum_t quantum,
+                            ::RtecScheduler::Threads_t threads,
+                            ::RtecScheduler::Info_Type_t info_type
+                            ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -147,7 +149,7 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle,
                               RtecScheduler::Period_t period,
                               RtecScheduler::Importance_t importance,
                               RtecScheduler::Quantum_t quantum,
-                              CORBA::Long threads,
+                              RtecScheduler::Threads_t threads,
                               RtecScheduler::Info_Type_t info_type
                               ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
@@ -548,3 +550,5 @@ ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*co
   // or a proprietary ACE_NOTSUP; -- Bala
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index caf18c8b441..f7afe874c75 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // ============================================================================
@@ -22,6 +23,8 @@
 #include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/Sched/sched_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler
 {
   // = TITLE
@@ -59,16 +62,16 @@ public:
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
 
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality_t criticality,
-                    RtecScheduler::Time time,
-                    RtecScheduler::Time typical_time,
-                    RtecScheduler::Time cached_time,
-                    RtecScheduler::Period_t period,
-                    RtecScheduler::Importance_t importance,
-                    RtecScheduler::Quantum_t quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type
+  virtual void set (::RtecScheduler::handle_t handle,
+                    ::RtecScheduler::Criticality_t criticality,
+                    ::RtecScheduler::Time time,
+                    ::RtecScheduler::Time typical_time,
+                    ::RtecScheduler::Time cached_time,
+                    ::RtecScheduler::Period_t period,
+                    ::RtecScheduler::Importance_t importance,
+                    ::RtecScheduler::Quantum_t quantum,
+                    ::RtecScheduler::Threads_t threads,
+                    ::RtecScheduler::Info_Type_t info_type
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
@@ -82,7 +85,7 @@ public:
                       RtecScheduler::Period_t period,
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
-                      CORBA::Long threads,
+                      RtecScheduler::Threads_t threads,
                       RtecScheduler::Info_Type_t info_type
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -279,5 +282,7 @@ private:
   // The array of precomputed RT_Info structures.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 1a0c75461a4..616f479f3ed 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors {
+project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults {
   sharedname   = TAO_SSLIOP
   idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h
   dynamicflags = TAO_SSLIOP_BUILD_DLL
@@ -31,4 +31,8 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors {
 
   Template_Files {
   }
+
+  Pidl_Files {
+    SSLIOP
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index ea425123143..89bea659c76 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,4 +1,4 @@
-#include "IIOP_SSL_Acceptor.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
@@ -8,6 +8,8 @@ ACE_RCSID (SSLIOP,
            IIOP_SSL_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (CORBA::Boolean flag)
   : TAO_IIOP_Acceptor (flag),
     base_acceptor_ (),
@@ -33,3 +35,5 @@ TAO::IIOP_SSL_Acceptor::close (void)
 {
   return this->base_acceptor_.close ();
 }
+
+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 4e1f3f2df8c..951e2ab73be 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IIOP_SSL_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "tao/IIOP_Acceptor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -77,6 +79,8 @@ namespace TAO
 
 } // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_IIOP_SSL_ACCEPTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index bd27221202e..fb9a61ba32b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,6 +1,6 @@
-#include "IIOP_SSL_Connection_Handler.h"
-#include "IIOP_SSL_Transport.h"
-#include "SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -13,12 +13,12 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-#include "IIOP_SSL_Connection_Handler.inl"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
+static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
 {
   "IIOP_SSL_Connection_Handler::handle_input - start",
   "IIOP_SSL_Connection_Handler::handle_input - end",
@@ -50,6 +50,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_SSL_Connect_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   ACE_Thread_Manager *t)
   : TAO_IIOP_Connection_Handler (t)
@@ -68,15 +70,15 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   CORBA::Boolean /* flag */)
   : TAO_IIOP_Connection_Handler (orb_core, 0)
 {
+  // Delete the transport with TAO_IIOP_Connection_Handler.
+  delete this->transport ();
+
   IIOP_SSL_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
            IIOP_SSL_Transport (this,
                                orb_core,
                                0));
 
-  // Delete the transport with TAO_IIOP_Connection_Handler.
-  delete this->transport ();
-
   // store this pointer
   this->transport (specific_transport);
 }
@@ -85,4 +87,4 @@ TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void)
 {
 }
 
-// ****************************************************************
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 0f9389753c7..3c81122ede9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -16,17 +16,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/IIOP_Connection_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -109,9 +110,10 @@ namespace TAO
 
 } // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "IIOP_SSL_Connection_Handler.inl"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
index 0d8b95058be..7a0b3d4b320 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::Null_SSL_State_Guard::Null_SSL_State_Guard (
   TAO::SSLIOP::Current_ptr current,
@@ -27,3 +29,5 @@ TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void)
   this->current_->teardown (this->previous_current_impl_,
                             this->setup_done_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index a8075b44aeb..51a3db9a486 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,4 +1,4 @@
-#include "IIOP_SSL_Connector.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -18,6 +18,8 @@ ACE_RCSID (SSLIOP,
            IIOP_SSL_Connector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (CORBA::Boolean flag)
   : TAO_IIOP_Connector (flag),
     connect_strategy_ (),
@@ -282,3 +284,5 @@ TAO::IIOP_SSL_Connector::cancel_svc_handler (
 
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index 87b3f5b280c..b051fa19cae 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IIOP_SSL_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "tao/IIOP_Connector.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -95,6 +97,8 @@ namespace TAO
 
 } // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_IIOP_SSL_CONNECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 9fa051b7821..1a5d1724a2e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,6 +1,6 @@
-#include "IIOP_SSL_Transport.h"
-#include "IIOP_SSL_Connection_Handler.h"
-#include "SSLIOP_Util.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -12,6 +12,7 @@ ACE_RCSID (SSLIOP,
            IIOP_SSL_Transport,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
     IIOP_SSL_Connection_Handler *handler,
@@ -49,3 +50,5 @@ TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh,
                                             max_wait_time,
                                             block);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index 1cd2555976b..a6c1aa7ea0f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -24,6 +24,7 @@
 
 #include "tao/IIOP_Transport.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 class TAO_Resume_Handle;
@@ -82,6 +83,8 @@ namespace TAO
 
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IIOP_SSL_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index b5f5607d416..20845593237 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,10 +1,11 @@
-#include "SSLIOP_Accept_Strategy.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
 
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Accept_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Accept_Strategy::Accept_Strategy (
   TAO_ORB_Core * orb_core,
@@ -58,3 +59,4 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler)
     return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
index 285376f4faa..0ce82cca857 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
@@ -24,12 +24,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 
 #include "tao/Acceptor_Impl.h"
 
 #include "ace/SSL/SSL_SOCK_Acceptor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -90,6 +91,7 @@ namespace TAO
   }  // End SSLIOP namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 08ca12a06cf..b4cd56e4806 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,5 +1,5 @@
-#include "SSLIOP_Acceptor.h"
-#include "SSLIOP_Profile.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
@@ -9,7 +9,7 @@
 #include "tao/debug.h"
 
 #if !defined(__ACE_INLINE__)
-#include "SSLIOP_Acceptor.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -17,6 +17,8 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop,
                                  const ACE_Time_Value & timeout)
   : TAO::IIOP_SSL_Acceptor (),
@@ -674,3 +676,5 @@ TAO::SSLIOP::Acceptor::verify_secure_configuration (TAO_ORB_Core *orb_core,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 2c4e9afcf5c..f8c12442dc3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -26,13 +26,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IIOP_SSL_Acceptor.h"
-#include "SSLIOP_Connection_Handler.h"
-#include "SSLIOP_Accept_Strategy.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
 
 #include "orbsvcs/SSLIOPC.h"  /* CSIv1 */
 #include "orbsvcs/CSIIOPC.h"  /* CSIv2 */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -43,7 +45,7 @@ namespace TAO
      *
      * @brief The SSLIOP-specific bridge class for the concrete acceptor.
      */
-    class TAO_SSLIOP_Export Acceptor
+    class Acceptor
       : public IIOP_SSL_Acceptor
     {
     public:
@@ -156,8 +158,10 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "SSLIOP_Acceptor.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
index d37f85ba422..9dd630f54ef 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
@@ -3,8 +3,12 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const SSLIOP::SSL &
 TAO::SSLIOP::Acceptor::ssl_component (void) const
 {
   return this->ssl_component_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index d22485f2af1..4cf1fe799fb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "SSLIOP_ClientCredentials.h"
-#include "SSLIOP_OwnCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,6 +9,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::ClientCredentials::ClientCredentials (
   X509 * cert,
   EVP_PKEY *evp,
@@ -136,3 +138,5 @@ TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index 5e030734636..ce621276918 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -35,6 +35,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -46,7 +48,7 @@ namespace TAO
      *
      *
      */
-    class TAO_SSLIOP_Export ClientCredentials
+    class ClientCredentials
       : public virtual SecurityLevel3::ClientCredentials,
         public virtual SSLIOP_Credentials
     {
@@ -140,6 +142,7 @@ namespace TAO
   } // End SSLIOP namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 8d288191435..3d652c1df81 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
-#include "SSLIOP_Connection_Handler.h"
-#include "SSLIOP_Endpoint.h"
-#include "SSLIOP_Util.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
 
 #include "tao/debug.h"
 #include "tao/Base_Transport_Property.h"
@@ -15,7 +15,7 @@
 #include "ace/os_include/os_netdb.h"
 
 #if !defined (__ACE_INLINE__)
-# include "SSLIOP_Connection_Handler.i"
+# include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (SSLIOP,
@@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Connection_Handler::Connection_Handler (
     ACE_Thread_Manager *t)
   : SVC_HANDLER (t, 0 , 0),
@@ -440,3 +442,4 @@ TAO::SSLIOP::Connection_Handler::teardown_ssl_state (
                             setup_done);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 06ad1f2b0ae..9ce3ba997af 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -23,14 +23,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Current.h"
-#include "SSLIOP_Transport.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
 
 #include "tao/Connection_Handler.h"
 #include "tao/IIOPC.h"
 
 #include "ace/Reactor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IIOP_Properties;
 
 namespace TAO
@@ -187,9 +189,11 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
-#include "SSLIOP_Connection_Handler.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
index 0131b083abc..193fc62f426 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::SSLIOP::State_Guard::State_Guard (
@@ -24,3 +25,5 @@ TAO::SSLIOP::State_Guard::~State_Guard (void)
   this->handler_->teardown_ssl_state (this->previous_current_impl_,
                                       this->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 7347aefe0b3..3635555cb98 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,7 +1,7 @@
-#include "SSLIOP_Connector.h"
-#include "SSLIOP_OwnCredentials.h"
-#include "SSLIOP_Profile.h"
-#include "SSLIOP_X509.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
+#include "orbsvcs/SSLIOP/SSLIOP_X509.h"
 
 #include "orbsvcs/SecurityLevel2C.h"
 
@@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Connector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Connector::Connector (::Security::QOP qop)
   : TAO::IIOP_SSL_Connector (),
     qop_ (qop),
@@ -43,7 +45,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core)
                   TAO_Blocked_Connect_Strategy (orb_core),
                   -1);
 
-  if (this->ACE_NESTED_CLASS (TAO, IIOP_SSL_Connector)::open (orb_core) == -1)
+  if (this->TAO::IIOP_SSL_Connector::open (orb_core) == -1)
     return -1;
 
   // Our connect creation strategy
@@ -75,7 +77,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core)
 int
 TAO::SSLIOP::Connector::close (void)
 {
-  (void) this->ACE_NESTED_CLASS (TAO, IIOP_SSL_Connector)::close ();
+  (void) this->TAO::IIOP_SSL_Connector::close ();
 
   delete this->base_connector_.creation_strategy ();
   delete this->base_connector_.concurrency_strategy ();
@@ -219,7 +221,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 TAO_Profile *
 TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile;
+  TAO_Profile *pfile = 0;
   ACE_NEW_RETURN (pfile,
                   TAO_SSLIOP_Profile (this->orb_core ()),
                   0);
@@ -404,7 +406,7 @@ TAO::SSLIOP::Connector::iiop_connect (
 
   // Note that the IIOP-only transport descriptor is used!
   return
-    this->ACE_NESTED_CLASS (TAO, IIOP_SSL_Connector)::connect (
+    this->TAO::IIOP_SSL_Connector::connect (
       resolver,
       &iiop_desc,
       timeout
@@ -483,7 +485,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
   // profile does not (and cannot) contain the desired QOP, trust, or
   // credential information which is necesary to uniquely identify
   // this connection.
-  if (!ssl_endpoint->credentials_set())
+  if (!ssl_endpoint->credentials_set ())
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_ERROR,
@@ -856,3 +858,5 @@ TAO::SSLIOP::Connector::cancel_svc_handler (
 
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index dd4cfef6ec4..99578662196 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -25,11 +25,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IIOP_SSL_Connector.h"
-#include "SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 
 #include "ace/SSL/SSL_SOCK_Connector.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_Base_Transport_Property;
 
@@ -50,7 +52,7 @@ namespace TAO
      * for establishing a connection with a server and is called from
      * the Connector_Registry.
      */
-    class TAO_SSLIOP_Export Connector : public TAO::IIOP_SSL_Connector
+    class Connector : public TAO::IIOP_SSL_Connector
     {
     public:
 
@@ -153,6 +155,8 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_CONNECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 2e70bec4633..9f8804ad604 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_Credentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -11,9 +11,10 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SSLIOP_Credentials.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
   : x509_ (TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (cert)),
@@ -263,3 +264,4 @@ tao_TAO_SSLIOP_Credentials_upcast (void *src)
   return *tmp;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 89b27c15a62..c60f0ce5d68 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -15,17 +15,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_X509.h"
-#include "SSLIOP_EVP_PKEY.h"
+#include "orbsvcs/SSLIOP/SSLIOP_X509.h"
+#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
 #include "orbsvcs/SecurityLevel3C.h"
 #include "tao/LocalObject.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class SSLIOP_Credentials;
@@ -169,8 +172,10 @@ namespace TAO
 //   } // End SSLIOP namespace
 }   // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "SSLIOP_Credentials.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
index 8c353c74cff..42970eb800f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ::X509 *
 TAO::SSLIOP_Credentials::x509 (void)
 {
@@ -15,3 +17,5 @@ TAO::SSLIOP_Credentials::evp (void)
   return
     TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 088255970f4..fcccd07cc67 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "SSLIOP_CredentialsAcquirer.h"
-#include "SSLIOP_OwnCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -21,12 +21,19 @@ ACE_RCSID (SSLIOP,
 
 // -------------------------------------------------------
 
+#if (defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1)
+# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_SSLIOP_password_callback)
+#else
+# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME TAO_SSLIOP_password_callback
+#endif  /* TAO_HAS_VERSIONED_NAMESPACE == 1 */
+
+
 extern "C"
 int
-TAO_SSLIOP_password_callback (char *buf,
-                              int size,
-                              int /* rwflag */,
-                              void *userdata)
+TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf,
+                                   int size,
+                                   int /* rwflag */,
+                                   void *userdata)
 {
   // @@ I'm probably over complicating this implementation, but that's
   //    what you get when you try to be overly efficient.  :-)
@@ -66,6 +73,8 @@ TAO_SSLIOP_password_callback (char *buf,
 
 // -------------------------------------------------------
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer (
    TAO::SL3::CredentialsCurator_ptr curator,
    const CORBA::Any & acquisition_arguments)
@@ -286,7 +295,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_X509 (const ::SSLIOP::File &certificate)
       // it to OpenSSL's internal X.509 format.
       x = PEM_read_X509 (fp,
                          0,
-                         TAO_SSLIOP_password_callback,
+                         TAO_SSLIOP_PASSWORD_CALLBACK_NAME,
                          const_cast<char *> (password));
     }
 
@@ -364,7 +373,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key)
       // OpenSSL's internal private key format.
       evp = PEM_read_PrivateKey (fp,
                                  0,
-                                 TAO_SSLIOP_password_callback,
+                                 TAO_SSLIOP_PASSWORD_CALLBACK_NAME,
                                  const_cast<char *> (password));
     }
 
@@ -375,3 +384,5 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key)
 
   return evp;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index a77db17cf59..734ca4d1884 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -44,6 +44,7 @@ extern "C"
   typedef struct evp_pkey_st EVP_PKEY;
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -142,6 +143,7 @@ namespace TAO
   } // End SSLIOP namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 1f5593c6108..06ac8c86977 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "SSLIOP_CredentialsAcquirerFactory.h"
-#include "SSLIOP_CredentialsAcquirer.h"
+#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
+#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,6 +9,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SSLIOP::CredentialsAcquirerFactory::make (
   TAO::SL3::CredentialsCurator_ptr curator,
@@ -24,3 +26,5 @@ TAO::SSLIOP::CredentialsAcquirerFactory::make (
 
   return ca;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index 6918b068b0d..dcc44e36919 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -27,6 +27,8 @@
 #include "orbsvcs/SecurityLevel3C.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -56,6 +58,7 @@ namespace TAO
   } // End SSLIOP namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index bf352552e64..9d39c05ba21 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 #include "tao/debug.h"
 
 
@@ -8,9 +8,10 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SSLIOP_Current.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core)
   : tss_slot_ (0),
@@ -193,3 +194,4 @@ tao_TAO_SSLIOP_Current_upcast (
   return *tmp;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index a71b824b845..2de37f5cbc6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Current_Impl.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/ORB_Core.h"
@@ -34,6 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -53,7 +54,7 @@ namespace TAO
      * SSL peer certificate chains for the current request can be
      * obtained from this object.
      */
-    class TAO_SSLIOP_Export Current
+    class Current
       : public ::SSLIOP::Current,
         public TAO_Local_RefCounted_Object
     {
@@ -141,8 +142,8 @@ namespace TAO
       /// Prevent copying through the copy constructor and the assignment
       /// operator.
       //@{
-      ACE_UNIMPLEMENTED_FUNC (Current (const Current &))
-      ACE_UNIMPLEMENTED_FUNC (void operator= (const Current &))
+      Current (const Current &);
+      void operator= (const Current &);
       //@}
 
     private:
@@ -152,15 +153,17 @@ namespace TAO
 
       /// Pointer to the ORB Core corresponding to the ORB with which this
       /// object is registered.
-      TAO_ORB_Core *orb_core_;
+      TAO_ORB_Core * const orb_core_;
 
     };
 
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "SSLIOP_Current.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
index cef3feb365c..1584b919606 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO::SSLIOP::Current::tss_slot (size_t slot)
 {
@@ -34,3 +36,5 @@ TAO::SSLIOP::Current::implementation (void)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 6ee7a07cffe..27f173dfaac 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_Current_Impl.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
 
 #include "ace/OS_String.h"
 
@@ -9,14 +9,17 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SSLIOP_Current_Impl.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "SSLIOP_X509.h"
-#include "SSLIOP_ClientCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_X509.h"
+#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
+
+#include "tao/ORB_Constants.h"
 
 #include <openssl/x509.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 {
@@ -121,3 +124,5 @@ TAO::SSLIOP::Current_Impl::tag (void) const
 {
   return ::SSLIOP::TAG_SSL_SEC_TRANS;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 5502393a62b..32bc8c7a283 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -23,10 +23,11 @@
 
 #include "orbsvcs/SSLIOPC.h"
 #include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
-#include "tao/ORB_Core.h"
 
 #include <openssl/ssl.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -101,8 +102,10 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "SSLIOP_Current_Impl.inl"
+# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
index 73f2e9a988b..d1f4b91ee81 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::SSLIOP::Current_Impl::Current_Impl (void)
   : ssl_ (0)
@@ -20,3 +22,5 @@ TAO::SSLIOP::Current_Impl::ssl (void)
 {
   return this->ssl_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 9ed92d48a82..020904b53d2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 
-#include "SSLIOP_EVP_PKEY.h"
+#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
 
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
-#include "params_dup.h"
+#include "orbsvcs/SSLIOP/params_dup.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -14,6 +14,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ::EVP_PKEY *
 TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
 {
@@ -45,7 +47,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dsa != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa));
+            ::EVP_PKEY_set1_DSA (p.in (), DSAPARAMS_DUP_WRAPPER_NAME (dsa));
             ::DSA_free (dsa);
           }
       }
@@ -57,7 +59,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dh != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh));
+            ::EVP_PKEY_set1_DH (p.in (), DHPARAMS_DUP_WRAPPER_NAME (dh));
             ::DH_free (dh);
           }
       }
@@ -71,3 +73,4 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
   return p._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
index 903828b73d5..8c43b8a5b68 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
@@ -21,11 +21,12 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -71,6 +72,7 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index 68a0492e95d..62061e03009 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_Endpoint.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 
 #include "tao/IIOP_Endpoint.h"
 
@@ -14,9 +14,11 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SSLIOP_Endpoint.i"
+# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component,
                                           TAO_IIOP_Endpoint *iiop_endp)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP),
@@ -377,3 +379,4 @@ TAO_SSLIOP_Synthetic_Endpoint::duplicate (void)
   return endpoint;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index a250f7424fd..a7032ee4648 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -18,13 +18,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OwnCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "orbsvcs/SecurityC.h"
@@ -32,6 +32,8 @@
 #include "tao/IIOP_Endpoint.h"
 #include "ace/INET_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /// Tag for storing multiple ssl endpoints within a single profile.
@@ -243,8 +245,10 @@ namespace TAO
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "SSLIOP_Endpoint.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
index 9b9f9e4d585..9ea9beb96b6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_IIOP_Endpoint *
 TAO_SSLIOP_Endpoint::iiop_endpoint (void) const
 {
@@ -64,3 +66,5 @@ TAO_SSLIOP_Endpoint::credentials_set (void) const
 {
   return this->credentials_set_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 28c6cc119c3..058f0aebf01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,7 +1,7 @@
-#include "SSLIOP_Factory.h"
-#include "SSLIOP_Acceptor.h"
-#include "SSLIOP_Connector.h"
-#include "SSLIOP_ORBInitializer.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Factory.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
+#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
 #include "ace/OS_NS_strings.h"
 
 #include "orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
@@ -23,16 +23,18 @@ static const unsigned char session_id_context_[] =
   "$Id$";
 
 // Protocol name prefix
-static const char *prefix_[] = {"iiop", "ssliop"};
+static const char * const the_prefix[] = {"iiop", "ssliop"};
 
 // An OS-dependent path separator character
-static const char *TAO_PATH_SEPARATOR_STRING =
+static ACE_TCHAR const TAO_PATH_SEPARATOR_STRING[] =
 #if defined(ACE_WIN32)
   ACE_TEXT (";");
 #else
   ACE_TEXT (":");
 #endif
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -57,8 +59,8 @@ int
 TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[0]) == 0)
-     || (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[1]) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[0]) == 0)
+     || (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[1]) == 0);
 }
 
 const char *
@@ -68,7 +70,7 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const
    // keeping it may make things more confusing - a Factory can
    // well be handling multiple protocol prefixes, not just one!
    // Shouldn't it be deprecated?
-  return ::prefix_[0];
+  return ::the_prefix[0];
 }
 
 char
@@ -95,10 +97,10 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void)
 // the buffer pointed to by arg!
 int
 TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg,
-                                                   char **path)
+                                                char **path)
 {
-  ACE_ASSERT (arg!= 0);
-  ACE_ASSERT (path!= 0);
+  ACE_ASSERT (arg != 0);
+  ACE_ASSERT (path != 0);
 
   char *lst = 0;
   const char *type_name = ACE_OS::strtok_r (arg, ":", &lst);
@@ -599,6 +601,7 @@ TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory,
                        ACE_TEXT ("SSLIOP_Factory"),
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index ad694e1ee78..4ca7a9cf601 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,10 +33,11 @@
 #include "ace/Service_Config.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-
 namespace TAO
 {
   namespace SSLIOP
@@ -120,7 +121,7 @@ namespace TAO
        * mechanism list of the @c CSIIOP::CompoundSecMechList IOR tagged
        * component.
        */
-      CSIIOP::TLS_SEC_TRANS * csiv2_component_;
+      // CSIIOP::TLS_SEC_TRANS * csiv2_component_;
 
     };
   }  // End SSLIOP namespace.
@@ -129,6 +130,8 @@ namespace TAO
 // Work around preprocessor tokenization.
 typedef TAO::SSLIOP::Protocol_Factory TAO_SSLIOP_Protocol_Factory;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory)
 ACE_STATIC_SVC_REQUIRE (TAO_SSLIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 0bac6e26251..5e90c389e80 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,15 +1,22 @@
-#include "SSLIOP_Invocation_Interceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 
-#include "tao/debug.h"
+#include "orbsvcs/SecurityLevel2C.h"
 
-// #include <openssl/x509.h>   // @@ For debugging code below
+#include "tao/ORB_Constants.h"
+#include "tao/PortableServer/PS_CurrentC.h"
+#include "tao/debug.h"
 
+#if defined(SSLIOP_DEBUG_PEER_CERTIFICATE)
+#include <openssl/x509.h>   // @@ For debugging code below
+#endif /* DEBUG_PEER_CERTIFICATES */
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Invocation_Interceptor,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor (
    ::SSLIOP::Current_ptr current,
    ::Security::QOP qop)
@@ -41,7 +48,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
+                                              PortableInterceptor::ServerRequestInfo_ptr /*ri*/
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
@@ -55,14 +62,17 @@ 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 no_ssl =
+  CORBA::Boolean const no_ssl =
     this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  if (TAO_debug_level >= 3)
+    ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl)));
+
   if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection)
     ACE_THROW (CORBA::NO_PERMISSION ());
 
-#if 0
+#if defined(DEBUG_PEER_CERTIFICATES)
   ACE_TRY
     {
       // If the request was not made through an SSL connection, then
@@ -84,7 +94,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
           X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ());
           if (peer != 0)
             {
-              char buf[BUFSIZ];
+              char buf[BUFSIZ] = { 0 };
 
               ::X509_NAME_oneline (::X509_get_subject_name (peer),
                                    buf,
@@ -123,9 +133,10 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
     }
   ACE_ENDTRY;
   ACE_CHECK;
-#endif /* 0 */
+#endif /* DEBUG_PEER_CERTIFICATES */
 }
 
+
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
@@ -160,3 +171,5 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_other (
                    PortableInterceptor::ForwardRequest))
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index b5c4ef41f70..9ab7aaffad1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,6 +34,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -47,7 +49,7 @@ namespace TAO
      * invocations if the effective target object policy requires
      * secure invocations.
      */
-    class TAO_SSLIOP_Export Server_Invocation_Interceptor
+    class Server_Invocation_Interceptor
       : public virtual PortableInterceptor::ServerRequestInterceptor,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -135,6 +137,8 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 52b1317b28e..6f36fa774c5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_ORBInitializer.h"
+#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -6,10 +6,10 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-#include "SSLIOP_Current.h"
-#include "SSLIOP_Invocation_Interceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 //#include "SSLIOP_IORInterceptor.h"
-#include "SSLIOP_CredentialsAcquirerFactory.h"
+#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
 
 #include "orbsvcs/Security/SL3_SecurityCurrent.h"
 #include "orbsvcs/Security/SL3_CredentialsCurator.h"
@@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP,
 #include "ace/Auto_Ptr.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::ORBInitializer::ORBInitializer (
   ::Security::QOP qop,
   CSIIOP::AssociationOptions csiv2_target_supports,
@@ -243,3 +245,4 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id (
   return security_current->tss_slot ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 6c180b4c107..905b526d000 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,6 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -47,9 +49,9 @@ namespace TAO
      * ORB initializer that registers all SSLIOP-specific interceptors and
      * object references.
      */
-    class TAO_SSLIOP_Export ORBInitializer :
-      public virtual PortableInterceptor::ORBInitializer,
-      public virtual TAO_Local_RefCounted_Object
+    class ORBInitializer
+      : public virtual PortableInterceptor::ORBInitializer,
+        public virtual TAO_Local_RefCounted_Object
     {
     public:
 
@@ -87,6 +89,8 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
index 0bf1723c320..f20eb554f4c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
@@ -3,20 +3,15 @@
 #ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP
 #define TAO_SSLIOP_OPENSSL_ST_T_CPP
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_OpenSSL_st_T,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
-#include "SSLIOP_OpenSSL_st_T.inl"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl"
 #endif  /* !__ACE_INLINE__ */
 
 #endif  /* TAO_SSLIOP_OPENSSL_ST_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index d08140d244e..1fee4c1504b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -21,6 +21,9 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -116,13 +119,15 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
-#include "SSLIOP_OpenSSL_st_T.inl"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl"
 #endif  /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "SSLIOP_OpenSSL_st_T.cpp"
+# include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
index 51b9e46a102..0233a73fc01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
@@ -5,6 +5,7 @@
 
 #include <openssl/crypto.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T> ACE_INLINE T *
 TAO::SSLIOP::_duplicate (T * st)
@@ -160,3 +161,5 @@ TAO::SSLIOP::OpenSSL_st_var<T>::ptr (void) const
 {
   return this->st_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index e0b181fc1a2..7d90833fff5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "SSLIOP_OwnCredentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -8,6 +8,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
   : SSLIOP_Credentials (cert, evp)
 {
@@ -72,3 +74,4 @@ TAO::SSLIOP::OwnCredentials::release_credentials (
   this->creds_state_ = SecurityLevel3::CS_PendingRelease;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 1b8f6dc3fe8..fd88fc7ce2a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -16,19 +16,21 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Credentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -47,7 +49,7 @@ namespace TAO
      * @c OwnCredentials are a representation of our identity, not our
      * peer's identity.
      */
-    class TAO_SSLIOP_Export OwnCredentials
+    class OwnCredentials
       : public virtual SecurityLevel3::OwnCredentials,
         public virtual SSLIOP_Credentials
     {
@@ -106,6 +108,8 @@ namespace TAO
 }  // End TAO namespace
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 4e9e5b43590..f9c084779cd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,5 +1,5 @@
-#include "SSLIOP_Profile.h"
-#include "ssl_endpointsC.h"
+#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"
@@ -9,6 +9,9 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Profile,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
                                const TAO::ObjectKey & object_key,
                                const TAO_GIOP_Message_Version & version,
@@ -350,3 +353,5 @@ TAO_SSLIOP_Profile::parse_string (const char * ior
             Security::NoProtection);
    }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 6dab11bcab0..849914f148d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -25,9 +25,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Endpoint.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 #include "tao/IIOP_Profile.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // namespace TAO
 // {
 //   namespace SSLIOP
@@ -43,7 +45,7 @@
      * This class extends TAO_IIOP_Profile to support secure
      * communication using SSL.
      */
-    class TAO_SSLIOP_Export TAO_SSLIOP_Profile : public TAO_IIOP_Profile
+    class TAO_SSLIOP_Profile : public TAO_IIOP_Profile
     {
     public:
       /// Profile constructor, same as above except the object_key has
@@ -170,6 +172,7 @@
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp
deleted file mode 100644
index 69c8af5bcea..00000000000
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-#include "SSLIOP_SSL.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_SSL,
-           "$Id$")
-
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
index b8e013b6f71..b9b01e4a85d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
@@ -23,12 +23,14 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/ssl.h>
 #include <openssl/crypto.h>
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -76,6 +78,7 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index dac7198565b..a081a95c168 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,11 +1,11 @@
-#include "SSLIOP_TargetCredentials.h"
-#include "tao/ORB_Constants.h"
+#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
            SSLIOP_TargetCredentials,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
                                                    ::EVP_PKEY *evp)
@@ -130,3 +130,5 @@ TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 98b4a75ec87..920db9d2e61 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Credentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -120,6 +122,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_TARGET_CREDENTIALS_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index f91dde34130..3f60b36bcdf 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,7 +1,7 @@
-#include "SSLIOP_Connection_Handler.h"
-#include "SSLIOP_Transport.h"
-#include "SSLIOP_Profile.h"
-#include "SSLIOP_Acceptor.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
 
 #include "tao/debug.h"
 
@@ -14,12 +14,15 @@
 #include "tao/debug.h"
 #include "tao/GIOP_Message_Base.h"
 #include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Transport,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Transport::Transport (
   TAO::SSLIOP::Connection_Handler *handler,
   TAO_ORB_Core *orb_core,
@@ -30,7 +33,7 @@ TAO::SSLIOP::Transport::Transport (
 {
   // Use the normal GIOP object
   ACE_NEW (this->messaging_object_,
-           TAO_GIOP_Message_Base (orb_core));
+           TAO_GIOP_Message_Base (orb_core, this));
 }
 
 TAO::SSLIOP::Transport::~Transport (void)
@@ -378,3 +381,5 @@ TAO::SSLIOP::Transport::get_listen_point (
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 67ff72eaac9..fec7a5ee95f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,6 +35,9 @@
 
 #include "ace/Svc_Handler.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_ORB_Core;
 class TAO_Pluggable_Messaging;
@@ -150,5 +153,7 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_SSLIOP_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 29c06c74f1c..385e58f64e2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,4 +1,4 @@
-#include "SSLIOP_Util.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -6,13 +6,15 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-#include "SSLIOP_Connection_Handler.h"
-#include "SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SSLIOP::Current_ptr
 TAO::SSLIOP::Util::current (
   TAO_ORB_Core *orb_core)
@@ -52,3 +54,5 @@ TAO::SSLIOP::Util::current (
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
index efe5dc406b1..15e3e5f1545 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
@@ -24,7 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Current.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 class TAO_IIOP_Properties;
@@ -55,6 +58,7 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
deleted file mode 100644
index 3c6bb2755e7..00000000000
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "SSLIOP_X509.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_X509,
-           "$Id$")
-
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
index 6937053169b..fc46e69fa9c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
@@ -21,12 +21,14 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_OpenSSL_st_T.h"
+#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/x509.h>
 #include <openssl/crypto.h>
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SSLIOP
@@ -75,6 +77,8 @@ namespace TAO
 }  // End TAO namespace.
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_X509_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
index e340018a65a..cea38d78e06 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
@@ -1,18 +1,19 @@
 // $Id$
 
+#include "params_dup.h"
+
 #include <openssl/asn1.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
 
 
 DSA *
-DSAparams_dup_wrapper (DSA *dsa)
+DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa)
 {
-	return DSAparams_dup (dsa);
+  return DSAparams_dup (dsa);
 }
 
 DH *
-DHparams_dup_wrapper (DH *dh)
+DHPARAMS_DUP_WRAPPER_NAME (DH * dh)
 {
-	return DHparams_dup (dh);
+  return DHparams_dup (dh);
 }
+
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
index ea9b5409325..350705ec2d0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
@@ -3,6 +3,11 @@
 #ifndef TAO_SSLIOP_PARAMS_DUP_H
 #define TAO_SSLIOP_PARAMS_DUP_H
 
+#include /**/ "ace/pre.h"
+
+#include "ace/config-macros.h"
+#include "tao/Versioned_Namespace.h"
+
 // As of 0.9.7e, OpenSSL's DSAparams_dup() and DHparams_dup() macros
 // contain casts that are invalid in C++.  These C wrapper functions
 // allows them to be called from C++.
@@ -10,15 +15,30 @@
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
 
+#if (defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1)
+
+# define DSAPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DSAparams_dup_wrapper)
+# define DHPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DHparams_dup_wrapper)
+
+#else
+
+# define DSAPARAMS_DUP_WRAPPER_NAME DSAparams_dup_wrapper
+# define DHPARAMS_DUP_WRAPPER_NAME  DHparams_dup_wrapper
+
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern DSA *DSAparams_dup_wrapper (DSA *dsa);
-extern DH  *DHparams_dup_wrapper (DH *dh);
+extern DSA *DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa);
+extern DH  *DHPARAMS_DUP_WRAPPER_NAME (DH *dh);
 
 #ifdef __cplusplus
 }
 #endif
 
+#include /**/ "ace/post.h"
+
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
index 327f9d92c1c..b9d85e7b2b7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
@@ -34,13 +34,15 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "ssl_endpointsC.h"
+#include "orbsvcs/SSLIOP/ssl_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
@@ -62,7 +64,7 @@ TAO_SSLEndpointSequence::TAO_SSLEndpointSequence (void)
 TAO_SSLEndpointSequence::TAO_SSLEndpointSequence (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         SSLIOP::SSL
       >
     (max)
@@ -74,7 +76,7 @@ TAO_SSLEndpointSequence::TAO_SSLEndpointSequence (
     SSLIOP::SSL * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         SSLIOP::SSL
       >
     (max, length, buffer, release)
@@ -83,7 +85,7 @@ TAO_SSLEndpointSequence::TAO_SSLEndpointSequence (
 TAO_SSLEndpointSequence::TAO_SSLEndpointSequence (
     const TAO_SSLEndpointSequence &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         SSLIOP::SSL
       >
     (seq)
@@ -147,22 +149,7 @@ CORBA::Boolean operator<< (
     const TAO_SSLEndpointSequence &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -170,40 +157,9 @@ CORBA::Boolean operator>> (
     TAO_SSLEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
index dd81bd66c6f..5d117696d17 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
@@ -63,6 +63,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_ch.cpp:101
 
@@ -73,22 +75,19 @@ class TAO_SSLEndpointSequence;
 
 typedef
   TAO_FixedSeq_Var_T<
-      TAO_SSLEndpointSequence,
-      SSLIOP::SSL
+      TAO_SSLEndpointSequence
     >
   TAO_SSLEndpointSequence_var;
 
 typedef
   TAO_Seq_Out_T<
-      TAO_SSLEndpointSequence,
-      TAO_SSLEndpointSequence_var,
-      SSLIOP::SSL
+      TAO_SSLEndpointSequence
     >
   TAO_SSLEndpointSequence_out;
 
 class TAO_SSLIOP_Export TAO_SSLEndpointSequence
   : public
-      TAO_Unbounded_Sequence<
+      TAO::unbounded_value_sequence<
           SSLIOP::SSL
         >
 {
@@ -98,12 +97,12 @@ public:
   TAO_SSLEndpointSequence (
       CORBA::ULong max,
       CORBA::ULong length,
-      SSLIOP::SSL* buffer, 
-      CORBA::Boolean release = 0
+      SSLIOP::SSL* buffer,
+      CORBA::Boolean release = false
     );
   TAO_SSLEndpointSequence (const TAO_SSLEndpointSequence &);
   ~TAO_SSLEndpointSequence (void);
-  
+
   typedef TAO_SSLEndpointSequence_var _var_type;
 };
 
@@ -139,6 +138,8 @@ TAO_SSLIOP_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_H_ */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index d253fa396c8..c8c56c6b5ac 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -7,10 +7,12 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Scheduler_Factory.h"
 
-#include "Config_Scheduler.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
 
 ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
   : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY))
@@ -35,7 +37,7 @@ ACE_Config_Scheduler::create (const char * entry_point
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
 
-  RtecScheduler::RT_Info** rt_info;
+  RtecScheduler::RT_Info** rt_info = 0;
   ACE_NEW_RETURN (rt_info, RT_Info_ptr[1], -1);
 
   ACE_NEW_RETURN (rt_info[0], RtecScheduler::RT_Info, -1);
@@ -668,3 +670,5 @@ void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_o
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 084a36a33f2..d6b378d8f82 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef ACE_CONFIG_SCHEDULER_H
@@ -14,7 +16,7 @@
 #include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-#include "sched_export.h"
+#include "orbsvcs/Sched/sched_export.h"
 
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
 #include "orbsvcs/Sched/Strategy_Scheduler.h"
@@ -22,6 +24,8 @@
 #include "orbsvcs/Sched/Scheduler_Generic.h"
 #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTSched_Export ACE_Config_Scheduler
 : public POA_RtecScheduler::Scheduler
   // = TITLE
@@ -307,15 +311,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_SCHEDULER_H */
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 0eaa050e615..90ec0a81889 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -16,18 +16,20 @@
 //
 // ============================================================================
 
-#include "DynSched.h"
+#include "orbsvcs/Sched/DynSched.h"
 #include "ace/Basic_Types.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Null_Mutex.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "DynSched.i"
+#include "orbsvcs/Sched/DynSched.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Sched, DynSched, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////
 // Helper functions //
 //////////////////////
@@ -2417,3 +2419,5 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading)
   return status;
 }
   // this prints the entire set of timeline outputs to the specified file
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index a3adb00f642..bae77c581a2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -30,10 +31,13 @@
 #include "ace/Map_Manager.h"
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
-#include "SchedEntry.h"
-#include "sched_export.h"
+#include "orbsvcs/Sched/SchedEntry.h"
+#include "orbsvcs/Sched/sched_export.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTSched_Export ACE_DynScheduler
   // = TITLE
   //    Dispatch scheduling interface.
@@ -460,8 +464,8 @@ private:
   // calculate utilization, frame size, etc.
 
   // the following functions are not implememented
-  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler (const ACE_DynScheduler &))
-  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler &operator= (const ACE_DynScheduler &))
+  ACE_DynScheduler (const ACE_DynScheduler &);
+  ACE_DynScheduler &operator= (const ACE_DynScheduler &);
 
   //////////////////////////
   // private data members //
@@ -528,8 +532,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "DynSched.i"
+#include "orbsvcs/Sched/DynSched.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
index 3eb2a3c0bda..8e27d24c28e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -16,6 +18,7 @@
 //
 // ============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ////////////////////////////
 // Class ACE_DynScheduler //
@@ -107,5 +110,4 @@ ACE_DynScheduler::max_dispatch_id () const
   return max_dispatch_id_;
 }
 
-
-// EOF
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index dac7ca3cd56..f3669c611c5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -18,8 +18,8 @@
 #ifndef TAO_RECONFIG_SCHED_UTILS_C
 #define TAO_RECONFIG_SCHED_UTILS_C
 
-#include "Reconfig_Sched_Utils_T.h"
-#include "Reconfig_Sched_Utils.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
 
 
 #include "orbsvcs/Time_Utilities.h"
@@ -27,6 +27,8 @@
 
 ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////
 // struct TAO_RT_Info_Ex //
 ///////////////////////////
@@ -1802,3 +1804,5 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::assign_config (RtecScheduler::Config_Info &
 
 
 #endif /* TAO_RECONFIG_SCHED_UTILS_C */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index f7e0ae3967c..408d42bb56f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -26,12 +27,14 @@
 
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecSchedulerS.h"
-#include "sched_export.h"
+#include "orbsvcs/Sched/sched_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct TAO_RTSched_Export TAO_RT_Info_Ex
   : public RtecScheduler::RT_Info
   // = TITLE
@@ -657,8 +660,10 @@ public:
   // on the operation characteristics of a representative scheduling entry.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Include the templates here.
-#include "Reconfig_Sched_Utils_T.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
 
 #include /**/ "ace/post.h"
 #endif /* TAO_RECONFIG_SCHED_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 8f8e5497ece..cfc7cfd332a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -15,10 +15,10 @@
 //
 // ============================================================================
 
-#ifndef TAO_RECONFIG_SCHED_UTILS_T_C
-#define TAO_RECONFIG_SCHED_UTILS_T_C
+#ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP
+#define TAO_RECONFIG_SCHED_UTILS_T_CPP
 
-#include "Reconfig_Sched_Utils_T.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
 #include "ace/Sched_Params.h"
 #include "ace/ACE.h"
 
@@ -26,7 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ////////////////////////////////
 // TAO_RSE_Dependency_Visitor //
@@ -122,8 +122,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
 
               // Reference the associated scheduling entry: the double cast is
               // needed to ensure that the size of the pointer and the size of the
-              // stored magic cookie are the same (see the definition of
-              // ptr_arith_t in ACE to grok how this works portably).
+              // stored magic cookie are the same
               next_rse =
                 ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                                      next_rt_info->volatile_token);
@@ -168,19 +167,18 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
   return 0;
 }
 
-/* WSOA merge - commented out
-// Performs an unconditional action when the entry is first reached.
-// Returns 0 for success, and -1 if an error occurred.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unconditional_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
-  return 0;
-}
-*/
+// WSOA merge - commented out
+// // Performs an unconditional action when the entry is first reached.
+// // Returns 0 for success, and -1 if an error occurred.
+
+// template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
+// TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
+// unconditional_action (TAO_Reconfig_Scheduler_Entry & /* rse */)
+// {
+//   // Default behavior: just return success.
+//   return 0;
+// }
+//
 
 // Tests whether or not any conditional actions should be taken for
 // the entry.  Returns 0 if the actions should be applied, 1 if the
@@ -202,10 +200,9 @@ precondition (TAO_Reconfig_Scheduler_Entry &rse)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
+prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */)
 {
   // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
   return 0;
 }
 
@@ -215,14 +212,11 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */,
+                    TAO_Reconfig_Scheduler_Entry & /* successor */,
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
   // Default behavior: just return success.
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (successor);
-  ACE_UNUSED_ARG (di);
   return 0;
 }
 
@@ -232,10 +226,9 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
+postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */)
 {
   // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
   return 0;
 }
 
@@ -297,13 +290,10 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */,
+                    TAO_Reconfig_Scheduler_Entry & successor,
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (di);
-
   // Enabled operations we reached via a dependency and that do not
   // specify a period are not thread delineators.
   if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED
@@ -445,10 +435,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                     TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
-  ACE_UNUSED_ARG (di);
-
   if  (successor.enabled_state () !=
          RtecScheduler::RT_INFO_DISABLED
        && successor.rev_dfs_status () ==
@@ -504,10 +492,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Reverse_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                     TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
-  ACE_UNUSED_ARG (di);
-
   // @TODO - check for conjunction nodes here and perform conjunctive
   // function on existing rate tuples.  Idea: treat conjunctive tuples
   // as skolem functions over the possible rates of their incedent
@@ -697,14 +683,13 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                     TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
   if (successor.enabled_state () == RtecScheduler::RT_INFO_DISABLED)
     {
       return 1;
     }
 
-  ACE_UNUSED_ARG (di);
   TAO_RT_Info_Tuple **tuple_ptr_ptr;
 
   TUPLE_SET_ITERATOR orig_tuple_iter (entry.orig_tuple_subset ());
@@ -1060,10 +1045,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_Criticality_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                     TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
+                    const RtecScheduler::Dependency_Info & /* di */)
 {
-  ACE_UNUSED_ARG (di);
-
 #ifdef SCHEDULER_LOGGING
   ACE_DEBUG ((LM_DEBUG,
               "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n",
@@ -1097,5 +1080,6 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */
+#endif /* 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 a63f3dba239..b66b0f389bd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -19,13 +20,15 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
-#include "Reconfig_Sched_Utils.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
 #include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////
 // Reconfig Sched Entry Visitor classes //
 //////////////////////////////////////////
@@ -473,8 +476,10 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Reconfig_Sched_Utils_T.cpp"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
deleted file mode 100644
index 9422209f27c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHEDULER_C
-#define TAO_RECONFIG_SCHEDULER_C
-
-#include "Reconfig_Scheduler_T.h"
-#include "Reconfig_Scheduler.h"
-
-
-ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$")
-
-#endif /* TAO_RECONFIG_SCHEDULER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index ba2cdcb82dd..1734634a104 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -25,14 +25,14 @@
 #include "ace/RB_Tree.h"
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecSchedulerS.h"
-#include "Reconfig_Sched_Utils.h"
+#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Include the templates here.
-#include "Reconfig_Scheduler_T.h"
+#include "orbsvcs/Sched/Reconfig_Scheduler_T.h"
 
 #include /**/ "ace/post.h"
 #endif /* 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 499b2d04518..d4d51e5294d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -18,7 +18,7 @@
 #ifndef TAO_RECONFIG_SCHEDULER_T_C
 #define TAO_RECONFIG_SCHEDULER_T_C
 
-#include "Reconfig_Scheduler_T.h"
+#include "orbsvcs/Sched/Reconfig_Scheduler_T.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/Auto_Ptr.h"
 
@@ -30,7 +30,7 @@
 //#define SCHEDULER_LOGGING 1
 //#endif
 
-ACE_RCSID(Sched, Reconfig_Scheduler_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////////////////////////////
 // Helper function type definition for sort //
@@ -555,16 +555,16 @@ get (RtecScheduler::handle_t handle
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set (RtecScheduler::handle_t handle,
-     RtecScheduler::Criticality_t criticality,
-     RtecScheduler::Time time,
-     RtecScheduler::Time typical_time,
-     RtecScheduler::Time cached_time,
-     RtecScheduler::Period_t period,
-     RtecScheduler::Importance_t importance,
-     RtecScheduler::Quantum_t quantum,
-     CORBA::Long threads,
-     RtecScheduler::Info_Type_t info_type
+set (::RtecScheduler::handle_t handle,
+     ::RtecScheduler::Criticality_t criticality,
+     ::RtecScheduler::Time time,
+     ::RtecScheduler::Time typical_time,
+     ::RtecScheduler::Time cached_time,
+     ::RtecScheduler::Period_t period,
+     ::RtecScheduler::Importance_t importance,
+     ::RtecScheduler::Quantum_t quantum,
+     ::RtecScheduler::Threads_t threads,
+     ::RtecScheduler::Info_Type_t info_type
      ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
@@ -1294,8 +1294,8 @@ compute_scheduling (CORBA::Long minimum_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-recompute_scheduling (CORBA::Long minimum_priority,
-                      CORBA::Long maximum_priority,
+recompute_scheduling (CORBA::Long /* minimum_priority */,
+                      CORBA::Long /* maximum_priority */,
                       RtecScheduler::Scheduling_Anomaly_Set_out anomalies
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -1316,8 +1316,8 @@ recompute_scheduling (CORBA::Long minimum_priority,
   ACE_CHECK;
 
   // @@ TO DO - use these to establish the bounds of priority assignment.
-  ACE_UNUSED_ARG (minimum_priority);
-  ACE_UNUSED_ARG (maximum_priority);
+  //      minimum_priority
+  //      maximum_priority
 
   // If everything is already up to date, we're done.
   if (SCHED_ALL_STABLE == stability_flags_)
@@ -3153,5 +3153,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecSch
 
 */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_RECONFIG_SCHEDULER_T_C */
+
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index c8b82223a21..ec7f53542bb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -19,12 +20,14 @@
 
 #include "ace/config-all.h"
 
-#include "Reconfig_Scheduler.h"
+#include "orbsvcs/Sched/Reconfig_Scheduler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 class TAO_Reconfig_Scheduler :
   public POA_RtecScheduler::Scheduler
@@ -146,16 +149,16 @@ public:
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Return a pointer to the RT_Info corresponding to the passed handle.
 
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality_t criticality,
-                    RtecScheduler::Time time,
-                    RtecScheduler::Time typical_time,
-                    RtecScheduler::Time cached_time,
-                    RtecScheduler::Period_t period,
-                    RtecScheduler::Importance_t importance,
-                    RtecScheduler::Quantum_t quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type
+  virtual void set (::RtecScheduler::handle_t handle,
+                    ::RtecScheduler::Criticality_t criticality,
+                    ::RtecScheduler::Time time,
+                    ::RtecScheduler::Time typical_time,
+                    ::RtecScheduler::Time cached_time,
+                    ::RtecScheduler::Period_t period,
+                    ::RtecScheduler::Importance_t importance,
+                    ::RtecScheduler::Quantum_t quantum,
+                    ::RtecScheduler::Threads_t threads,
+                    ::RtecScheduler::Info_Type_t info_type
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -759,8 +762,10 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 // arrays.  This function expands the array eagerly, to minimize time
 // overhead for memory allocation (at a cost of some unused space).
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Reconfig_Scheduler_T.cpp"
+#include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index ea7a1da14bb..5dc53ae9ffb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -16,16 +16,18 @@
 //
 // ============================================================================
 
-#include "SchedEntry.h"
+#include "orbsvcs/Sched/SchedEntry.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "SchedEntry.i"
+#include "orbsvcs/Sched/SchedEntry.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Sched, SchedEntry, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Task_Entry::Task_Entry (void)
   : rt_info_ (0),
     effective_period_(0),
@@ -932,3 +934,5 @@ TimeLine_Entry::TimeLine_Entry (Dispatch_Entry &dispatch_entry,
     prev_ (prev)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 87cf62c1668..e84ceb6cad3 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -21,11 +22,13 @@
 #define SCHEDENTRY_H
 #include /**/ "ace/pre.h"
 
-#include "sched_export.h"
+#include "orbsvcs/Sched/sched_export.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/Containers.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////
 // Helper Functions //
 //////////////////////
@@ -633,9 +636,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "SchedEntry.i"
+#include "orbsvcs/Sched/SchedEntry.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
index f133d00e95f..13f00111d67 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -17,6 +18,8 @@
 //
 // ============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////
 // Class Task_Entry //
 //////////////////////
@@ -437,6 +440,8 @@ TimeLine_Entry_Link::entry () const
 ACE_INLINE bool
 TimeLine_Entry_Link::operator < (const TimeLine_Entry_Link &l) const
 {
-  return (entry_ < l.entry_) ? true : false;
+  return (entry_ < l.entry_);
 }
   // comparison operator
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 5c6eb041289..13ecbf74fc0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -18,7 +18,7 @@
 
 #include "ace/Sched_Params.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "Scheduler.h"
+#include "orbsvcs/Sched/Scheduler.h"
 #include "ace/OS_NS_stdio.h"
 
 #include "ace/Lock_Adapter_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index 9400ba0ac67..8cad8d40736 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -35,7 +35,7 @@
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "sched_export.h"
+#include "orbsvcs/Sched/sched_export.h"
 
 class TAO_RTSched_Export ACE_Scheduler
   // = TITLE
@@ -287,8 +287,8 @@ private:
   u_int output_level_;
 
   // the following functions are not implememented
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler (const ACE_Scheduler &))
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler &operator= (const ACE_Scheduler &))
+  ACE_Scheduler (const ACE_Scheduler &);
+  ACE_Scheduler &operator= (const ACE_Scheduler &);
 };
 
 typedef ACE_Scheduler Scheduler;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 4d5cfdd4623..69448fa30b6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -18,11 +18,13 @@
 
 #include "ace/Sched_Params.h"
 
-#include "Scheduler_Generic.h"
+#include "orbsvcs/Sched/Scheduler_Generic.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // static functions
@@ -214,11 +216,9 @@ Scheduler_Generic::init (const int minimum_priority,
 
 
 Scheduler::status_t
-Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *>
-                               &anomaly_set)
+Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> &
+                             /* anomaly_set */)
 {
-  ACE_UNUSED_ARG (anomaly_set);
-
   ACE_GUARD_RETURN (LOCK, ace_mon, lock_, ACE_Scheduler::FAILED);
 
   // here goes . . .
@@ -240,15 +240,12 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *>
 
 
 int
-Scheduler_Generic::priority (const handle_t handle,
+Scheduler_Generic::priority (const handle_t /* handle */,
                              OS_Thread_Priority &priority,
                              Sub_Priority &subpriority,
                              Preemption_Priority &preemption_prio,
-                             const mode_t requested_mode) const
+                             const mode_t /* requested_mode */) const
 {
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (requested_mode);
-
   priority = minimum_priority_;
   subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
   preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY;
@@ -268,3 +265,5 @@ void
 Scheduler_Generic::print_schedule ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 5cfbf7b88d5..1b73b4d1c4b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -21,11 +22,13 @@
 #define SCHEDULER_INTERNAL_H
 #include /**/ "ace/pre.h"
 
-#include "Scheduler.h"
+#include "orbsvcs/Sched/Scheduler.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler
   // = TITLE
   //    Implementation of an off-line scheduler.
@@ -125,11 +128,12 @@ private:
   void print_schedule ();
   // Display the schedule, task-by-task.
 
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic (const Scheduler_Generic &))
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic &operator= (
-    const Scheduler_Generic &))
+  Scheduler_Generic (const Scheduler_Generic &);
+  Scheduler_Generic &operator= (const Scheduler_Generic &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* SCHEDULER_INTERNAL_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index f2e7c3c467f..8b27fdbd690 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#include "Strategy_Scheduler.h"
+#include "orbsvcs/Sched/Strategy_Scheduler.h"
 #include "ace/Sched_Params.h"
 
 ACE_RCSID (Sched,
@@ -43,6 +43,8 @@ typedef int (*COMP_FUNC) (const void*, const void*);
 
 // = Constructor.
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Strategy_Scheduler::ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy)
   : ACE_DynScheduler (),
     strategy_ (strategy)
@@ -860,9 +862,8 @@ ACE_MUF_Scheduler_Strategy::minimum_critical_priority ()
 // = Provides the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
-ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 {
-  ACE_UNUSED_ARG (entry);
   return RtecScheduler::LAXITY_DISPATCHING;
 }
 
@@ -951,12 +952,10 @@ ACE_RMS_Scheduler_Strategy::~ACE_RMS_Scheduler_Strategy ()
 // = All entries have the same dynamic subpriority value.
 
 long
-ACE_RMS_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 RtecScheduler::Time current_time)
+ACE_RMS_Scheduler_Strategy::dynamic_subpriority (
+  Dispatch_Entry & /* entry */,
+  RtecScheduler::Time /* current_time */)
 {
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (current_time);
-
   return 0;
 }
 
@@ -996,9 +995,8 @@ ACE_RMS_Scheduler_Strategy::minimum_critical_priority ()
 // = Provide the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
-ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 {
-  ACE_UNUSED_ARG (entry);
   return RtecScheduler::STATIC_DISPATCHING;
 }
 
@@ -1131,9 +1129,8 @@ ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 // = Provides the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
-ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 {
-  ACE_UNUSED_ARG (entry);
   return RtecScheduler::LAXITY_DISPATCHING;
 }
 
@@ -1257,9 +1254,8 @@ ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 // = Provides the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
-ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */)
 {
-  ACE_UNUSED_ARG (entry);
   return RtecScheduler::DEADLINE_DISPATCHING;
 }
 
@@ -1347,12 +1343,10 @@ ACE_Criticality_Scheduler_Strategy::~ACE_Criticality_Scheduler_Strategy ()
 // = All entries have the same dynamic subpriority value.
 
 long
-ACE_Criticality_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 RtecScheduler::Time current_time)
+ACE_Criticality_Scheduler_Strategy::dynamic_subpriority (
+  Dispatch_Entry & /* entry */,
+  RtecScheduler::Time /* current_time */)
 {
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (current_time);
-
   return 0;
 }
 
@@ -1391,8 +1385,10 @@ ACE_Criticality_Scheduler_Strategy::minimum_critical_priority ()
 // = Provides the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
-ACE_Criticality_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+ACE_Criticality_Scheduler_Strategy::dispatch_type (
+  const Dispatch_Entry & /* entry */)
 {
-  ACE_UNUSED_ARG (entry);
   return RtecScheduler::STATIC_DISPATCHING;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 57b5ff6133c..e323855d33e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 //
 // ============================================================================
@@ -21,7 +22,9 @@
 #define STRATEGY_SCHEDULER_H
 #include /**/ "ace/pre.h"
 
-#include "DynSched.h"
+#include "orbsvcs/Sched/DynSched.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // forward declaration of the abstract base class for scheduler strategies
 class ACE_Scheduler_Strategy;
@@ -76,9 +79,8 @@ private:
   ACE_Scheduler_Strategy &strategy_;
     // = Strategy for comparing and sorting dispatch entries.
 
-  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler &operator= (
-    const ACE_Strategy_Scheduler &))
+  ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &);
+  ACE_Strategy_Scheduler &operator= (const ACE_Strategy_Scheduler &);
 };
 
 
@@ -494,6 +496,9 @@ private:
 
 };
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* STRATEGY_SCHEDULER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index c3bd3387271..a4b7171a697 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -17,6 +17,8 @@ ACE_RCSID(orbsvcs,
           Scheduler_Factory,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initialize static class members.
 RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0;
 ACE_Scheduler_Factory::Factory_Status ACE_Scheduler_Factory::status_ =
@@ -789,3 +791,5 @@ ACE_Scheduler_Factory::set_preemption_priority
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex> *ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index aa43e530553..f0b9fdf91ab 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -28,6 +29,8 @@
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Sched/sched_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Reconfig_Scheduler_Entry;
 struct TAO_RT_Info_Tuple;
 typedef ACE_Ordered_MultiSet<TAO_RT_Info_Tuple *> TUPLE_SET;
@@ -267,18 +270,11 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/Scheduler_Factory.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_SCHEDULER_FACTORY_H */
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
index add09220816..2c01870582f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
@@ -1,9 +1,13 @@
+// -*- C++ -*-
+
 // ============================================================================
 //
 // $Id$
 //
 // ============================================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This helper function allows the application to determine whether
 // the factory is uninitialized, or in a config or runtime mode of
 // operation.
@@ -13,3 +17,5 @@ ACE_Scheduler_Factory::status (void)
 {
   return status_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 71b9446efb0..fb03dc6acc9 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype {
+project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults {
   sharedname   = TAO_Security
   idlflags    += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
   dynamicflags = TAO_SECURITY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index c600d1c71c9..0e7c1a01478 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CSI_Utils.h"
+#include "orbsvcs/Security/CSI_Utils.h"
 #include "orbsvcs/CSIC.h"
 
 #include "tao/CDR.h"
@@ -12,6 +12,7 @@ ACE_RCSID (Security,
            CSI_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::CSI_Utils::create_sas_service_context (
@@ -64,3 +65,5 @@ TAO::CSI_Utils::extract_sas_service_context (
 
   return (cdr >> sas_context);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h
index 5b1e5409858..8f233dbfd97 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h
@@ -18,6 +18,11 @@
 // the declared types/variables are not meant to be used outside TAO's
 // CSIv2 implementation.
 
+#include "tao/orbconf.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 namespace IOP
 {
@@ -46,4 +51,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_CSI_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 5fbdca1e5e7..20216f4a905 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "SL2_EstablishTrustPolicy.h"
+#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (Security,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy (
   const ::Security::EstablishTrust &trust)
   : trust_ (trust)
@@ -57,3 +59,5 @@ TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->trust_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index eeb4bc7ddc9..b7910c316d9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Security
@@ -49,7 +51,7 @@ namespace TAO
      * appropriate Security::EstablishTrust structure (inserted into a
      * CORBA::Any).
      */
-    class TAO_Security_Export EstablishTrustPolicy
+    class EstablishTrustPolicy
       : public virtual SecurityLevel2::EstablishTrustPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -90,13 +92,15 @@ namespace TAO
 
       /// Quality of protection which can be specified for an object
       /// reference and used to protect messages.
-      ::Security::EstablishTrust trust_;
+      ::Security::EstablishTrust const trust_;
 
     };
 
   } // End Security namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_ESTABLISH_TRUST_POLICY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 6d9748b209d..9175ac608b0 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "SL2_QOPPolicy.h"
+#include "orbsvcs/Security/SL2_QOPPolicy.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (Security,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop)
   : qop_ (qop)
 {
@@ -55,3 +57,5 @@ TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->qop_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index a349ef444a1..ff8b99e2309 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,7 @@
 
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -47,7 +48,7 @@ namespace TAO
      * Security::SecQOPPolicy policy type, and the appropriate
      * Security::QOP enumeration (inserted into a CORBA::Any).
      */
-    class TAO_Security_Export QOPPolicy
+    class QOPPolicy
       : public virtual SecurityLevel2::QOPPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -88,13 +89,15 @@ namespace TAO
 
       /// Quality of protection which can be specified for an object
       /// reference and used to protect messages.
-      ::Security::QOP qop_;
+      ::Security::QOP const qop_;
 
     };
 
   } // End Security namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SL2_QOP_POLICY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index e3d0ee246c4..22b8d7ad961 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "SL3_ContextEstablishmentPolicy.h"
+#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
 
 
 ACE_RCSID (Security,
            SL3_ContextEstablishmentPolicy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy (
   SecurityLevel3::CredsDirective             creds_directive,
@@ -121,3 +122,5 @@ TAO::SL3::ContextEstablishmentPolicy::destroy (
   this->use_confidentiality_ = SecurityLevel3::FD_UseDefault;
   this->use_integrity_       = SecurityLevel3::FD_UseDefault;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 5cbb4fe3d86..266c1dd31f6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -30,6 +30,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -41,7 +43,7 @@ namespace TAO
      *
      *
      */
-    class TAO_Security_Export ContextEstablishmentPolicy
+    class ContextEstablishmentPolicy
       : public virtual SecurityLevel3::ContextEstablishmentPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -121,6 +123,7 @@ namespace TAO
 
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 28e1650facf..80a5304154e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -1,11 +1,14 @@
-#include "SL3_CredentialsAcquirerFactory.h"
+#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
 
 ACE_RCSID (Security,
            SL3_CredentialsAcquirerFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 6e593d6345d..6320a50b252 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -26,6 +26,7 @@
 
 #include "orbsvcs/SecurityLevel3C.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -59,6 +60,8 @@ namespace TAO
   } // End SL3 namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index e0159269ff5..6555f46469c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
-#include "SL3_CredentialsCurator.h"
-#include "SL3_CredentialsAcquirerFactory.h"
+#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
 
 ACE_RCSID (Security,
            SL3_CredentialsCurator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -279,3 +280,5 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
  // CredentialsCurator nows owns the id.
   (void) credentials_id._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index e874a126628..e147100c6c0 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -34,6 +34,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -160,6 +163,8 @@ namespace TAO
 }  // End TAO namespace
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index c11ce4a57af..69cac1d1ae1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "SL3_ObjectCredentialsPolicy.h"
+#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -8,6 +8,8 @@ ACE_RCSID (Security,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy (
   const SecurityLevel3::OwnCredentialsList & creds)
   : creds_list_ (creds)
@@ -59,3 +61,5 @@ TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->creds_list_.length (0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index 84e1ada564d..c4479d9aa8e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -1,4 +1,3 @@
-
 // -*- C++ -*-
 
 //=============================================================================
@@ -31,6 +30,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -46,7 +48,7 @@ namespace TAO
      * POA will have the credentials contained within this Policy
      * associated with them.
      */
-    class TAO_Security_Export ObjectCredentialsPolicy
+    class ObjectCredentialsPolicy
       : public virtual SecurityLevel3::ObjectCredentialsPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -97,6 +99,7 @@ namespace TAO
 
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 7262bb8ce04..959a93e4885 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "SL3_PolicyFactory.h"
-#include "SL3_ContextEstablishmentPolicy.h"
-#include "SL3_ObjectCredentialsPolicy.h"
+#include "orbsvcs/Security/SL3_PolicyFactory.h"
+#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
+#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -10,6 +10,8 @@ ACE_RCSID (Security,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
                                         const CORBA::Any & value
@@ -57,3 +59,5 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
 
   return policy;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index 9cf82400061..9c3a36b0913 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -29,6 +29,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -71,6 +73,7 @@ namespace TAO
   }  // End SL3 namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index 2ad9a8ca9fc..db6609f803b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "SL3_SecurityCurrent.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent.h"
 
 
 ACE_RCSID (Security,
@@ -9,9 +9,10 @@ ACE_RCSID (Security,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SL3_SecurityCurrent.inl"
+# include "orbsvcs/Security/SL3_SecurityCurrent.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot,
                                             TAO_ORB_Core * oc)
@@ -55,3 +56,5 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
 
   return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index cd84dbbff61..b592530c19e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SL3_SecurityCurrent_Impl.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
 
 #include "orbsvcs/SecurityLevel3C.h"
 
@@ -33,6 +33,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
@@ -129,16 +130,17 @@ namespace TAO
 
       /// Pointer to the ORB Core corresponding to the ORB with which
       /// this object is registered.
-      TAO_ORB_Core *orb_core_;
+      TAO_ORB_Core * const orb_core_;
 
     };
 
   } // End SL3 namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "SL3_SecurityCurrent.inl"
+# include "orbsvcs/Security/SL3_SecurityCurrent.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
index ca53b8175b0..4194ffe1895 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
@@ -5,6 +5,8 @@
 #include "tao/ORB_Core.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE size_t
 TAO::SL3::SecurityCurrent::tss_slot (void) const
 {
@@ -20,3 +22,5 @@ TAO::SL3::SecurityCurrent::implementation (void)
 
   return impl;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index a0e96f0ed65..14b7a548c16 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -1,12 +1,16 @@
 // -*- C++ -*-
 
-#include "SL3_SecurityCurrent_Impl.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
 
 ACE_RCSID (Security,
            SL3_Security_Current_Impl,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 5b0b97162ad..59501c69339 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -21,9 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 #include "orbsvcs/SecurityLevel3C.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -75,6 +78,8 @@ namespace TAO
   }  // End Security namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SL3_SECURITY_CURRENT_IMPL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 8dede16ad3d..1cf548a4f2e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "SL3_SecurityManager.h"
-#include "SL3_ContextEstablishmentPolicy.h"
-#include "SL3_ObjectCredentialsPolicy.h"
+#include "orbsvcs/Security/SL3_SecurityManager.h"
+#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
+#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -10,6 +10,8 @@ ACE_RCSID (Security,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::SL3::SecurityManager::SecurityManager (
   SecurityLevel3::CredentialsCurator_ptr cc)
   : credentials_curator_ (SecurityLevel3::CredentialsCurator::_duplicate (cc))
@@ -78,3 +80,5 @@ TAO::SL3::SecurityManager::create_object_creds_policy (
 
   return policy;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 44d02adfcac..3f1ac2054ae 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -30,6 +30,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace SL3
@@ -41,7 +44,7 @@ namespace TAO
      *
      *
      */
-    class TAO_Security_Export SecurityManager
+    class SecurityManager
       : public virtual SecurityLevel3::SecurityManager,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -91,7 +94,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      ~SecurityManager (void);
+      virtual ~SecurityManager (void);
 
     private:
 
@@ -104,6 +107,8 @@ namespace TAO
   } // End SL3 namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 321151fc753..0470c54ab17 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "Security_Current.h"
+#include "orbsvcs/Security/Security_Current.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Security,
@@ -8,9 +8,11 @@ ACE_RCSID (Security,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "Security_Current.inl"
+# include "orbsvcs/Security/Security_Current.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Security_Current::TAO_Security_Current (size_t tss_slot,
                                             const char *orb_id)
   : tss_slot_ (tss_slot),
@@ -91,3 +93,5 @@ TAO_Security_Current::init (void)
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 693ffe05426..118689ca9d4 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/LocalObject.h"
 
-#include "Security_Current_Impl.h"
+#include "orbsvcs/Security/Security_Current_Impl.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -34,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Security_Current
  *
@@ -114,27 +116,28 @@ private:
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
   //@{
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_Security_Current (const TAO_Security_Current &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Security_Current &))
+  TAO_Security_Current (const TAO_Security_Current &);
+  void operator= (const TAO_Security_Current &);
   //@}
 
 private:
 
   /// TSS slot assigned to this object.
-  size_t tss_slot_;
+  size_t const tss_slot_;
 
   /// The ORBid of the ORB with which this object is registered.
   CORBA::String_var orb_id_;
 
   /// Pointer to the ORB Core corresponding to the ORB with which this
   /// object is registered.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * orb_core_;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Security_Current.inl"
+# include "orbsvcs/Security/Security_Current.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
index c194ecf4d1a..eee8c6c11fe 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE size_t
 TAO_Security_Current::tss_slot (void) const
 {
@@ -20,3 +22,5 @@ TAO_Security_Current::implementation (void)
 
   return impl;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index 57f35df99d7..a0239a9ca7d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -1,12 +1,15 @@
 // -*- C++ -*-
 
-#include "Security_Current_Impl.h"
+#include "orbsvcs/Security/Security_Current_Impl.h"
 
 ACE_RCSID (Security,
            SL3_Security_Current_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Security::Current_Impl::~Current_Impl (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index a297564e3fd..f92e121fddf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -21,9 +21,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 #include "orbsvcs/SecurityLevel2C.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Security
@@ -86,6 +88,8 @@ namespace TAO
   }  // End Security namespace.
 }  // End TAO namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SECURITY_CURRENT_IMPL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index ad129be0e9e..396f2116aa0 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "Security_ORBInitializer.h"
+#include "orbsvcs/Security/Security_ORBInitializer.h"
 
 ACE_RCSID (Security,
            Security_ORBInitializer,
@@ -8,9 +8,9 @@ ACE_RCSID (Security,
 
 
 // #include "Security_Current.h"
-#include "SL3_SecurityCurrent.h"
-#include "SL3_CredentialsCurator.h"
-#include "SL3_SecurityManager.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent.h"
+#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/Security/SL3_SecurityManager.h"
 
 #include "orbsvcs/SecurityC.h"
 
@@ -18,6 +18,7 @@ ACE_RCSID (Security,
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Security::ORBInitializer::pre_init (
@@ -235,3 +236,5 @@ TAO::Security::ORBInitializer::register_policy_factories (
 
   // ----------------------------------------------------------------
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index ec755fcb406..c6a17685f4d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,7 +29,7 @@
 #include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 
-#include "Security_PolicyFactory.h"
+#include "orbsvcs/Security/Security_PolicyFactory.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -38,6 +38,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Security ORB initializer.
 namespace TAO
 {
@@ -93,6 +95,8 @@ namespace TAO
   } // End Security namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 1f79aff69bf..96f0ddbb787 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -1,22 +1,24 @@
 // -*- C++ -*-
 
-#include "Security_PolicyFactory.h"
+#include "orbsvcs/Security/Security_PolicyFactory.h"
 
 ACE_RCSID (Security,
            Security_PolicyFactory,
            "$Id$")
 
-#include "SL2_QOPPolicy.h"
-#include "SL2_EstablishTrustPolicy.h"
+#include "orbsvcs/Security/SL2_QOPPolicy.h"
+#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
 
-#include "SL3_ContextEstablishmentPolicy.h"
-#include "SL3_ObjectCredentialsPolicy.h"
+#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
+#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
 
 #include "orbsvcs/SecurityLevel2C.h"
 #include "orbsvcs/SecurityLevel3C.h"
 
 #include "tao/ORB_Constants.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO::Security::PolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -153,3 +155,5 @@ TAO::Security::PolicyFactory::create_policy (
     ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                       CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index e9dc2e54fb5..24ca4b500db 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "security_export.h"
+#include "orbsvcs/Security/security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Security
@@ -44,7 +46,7 @@ namespace TAO
      *
      * Policy factory for all security related policies.
      */
-    class TAO_Security_Export PolicyFactory
+    class PolicyFactory
       : public PortableInterceptor::PolicyFactory,
         public CORBA::LocalObject
     {
@@ -60,6 +62,7 @@ namespace TAO
   } // End Security namespace
 }  // End TAO namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index 3de15da1e53..e243dfa2530 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "Shutdown_Utilities.h"
+#include "orbsvcs/Shutdown_Utilities.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID(orbsvcs,
           Shutdown_Utilities,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf)
   : functor_(sf)
 {
@@ -38,7 +41,7 @@ void
 Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
 {
   // iterate over all the signals in which_signals and register them...
-  int did_register = 0;
+  bool did_register = false;
   for (int i = 1; i < ACE_NSIG; ++i)
   {
     if (which_signals.is_member (i))
@@ -57,7 +60,12 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
               }
           }
         else
-          did_register = 1;
+          {
+            // Store that we have registered for this signal
+            // we have to unregister later for just these signals
+            this->registered_signals_.sig_add (i);
+            did_register = true;
+          }
       }
   }
   if (! did_register)
@@ -70,7 +78,12 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
 Service_Shutdown::~Service_Shutdown ()
 {
   for (int i = 1; i < ACE_NSIG; ++i)
-    this->shutdown_.remove_handler(i);
+    {
+      if (this->registered_signals_.is_member (i))
+        {
+          this->shutdown_.remove_handler(i);
+        }
+    }
 }
 
 int
@@ -80,3 +93,5 @@ Service_Shutdown::handle_signal (int signum,
   this->functor_(signum);
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
index a91705d3401..9d4983ffaaf 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -1,14 +1,20 @@
+// -*- C++ -*-
+
 #ifndef _SHUTDOWN_UTILS_H
 #define _SHUTDOWN_UTILS_H
 #include /**/ "ace/pre.h"
 
 // $Id$
 
-#include <ace/Event_Handler.h>
-#include <ace/Signal.h>
-
 #include "orbsvcs/svc_utils_export.h"
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Event_Handler.h"
+#include "ace/Signal.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * \brief Abstract definition for a Functor that shuts down a particular service.
  *
@@ -54,7 +60,10 @@ public:
 protected:
   Shutdown_Functor& functor_;
   ACE_Sig_Handler   shutdown_;
+  ACE_Sig_Set       registered_signals_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 8cf1f9a2feb..6d3f2ea5626 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Svc_Utils) : orbsvcslib, acesocketslib_for_tao, core, portableserver {
+project(Svc_Utils) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_Svc_Utils
   idlflags    += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
   dynamicflags = TAO_SVC_UTILS_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in
index 8a4f595de8f..d3f639711d0 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in
@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: TAO_CosConcurrency
-Description: TAO CosConcurrency Library
-Requires: TAO_PortableServer, TAO
+Description: TAO CosConcurrency Stub Library
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosConcurrency
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in
index c2e41dfb662..98cfefc9dbe 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosEvent
 Description: TAO CosEvent Stub Library
-Requires: TAO
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosEvent
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in
index 47b15e352e5..5f96ef5e7d8 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: TAO_CosNaming_Serv
-Description: TAO CosNaming Service Library
-Requires: TAO_CosNaming_Skel, TAO_Messaging, TAO_Svc_Utils, TAO_CosNaming, TAO_DynamicInterface, TAO_IFR_Client
+Name: TAO_CosEvent_Serv
+Description: TAO CosEvent Service Library
+Requires: TAO_CosEvent_Skel, TAO_DynamicInterface, TAO_IFR_Client, TAO_Messaging, TAO_CosNaming, TAO_Svc_Utils
 Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosNaming_Serv
+Libs: -L${libdir} -lTAO_CosEvent_Serv
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in
index 3af02c275ca..19899254747 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosNaming
 Description: TAO CosNaming Stub Library
-Requires: TAO
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosNaming
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in
index eca2cdda7dc..5fec272c552 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosNotification.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosNotification
 Description: TAO CosNotification Stub Library
-Requires: TAO
+Requires: TAO_CosEvent, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosNotification
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in
index 5b1034aa033..292003b1293 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosNotification_Skel
 Description: TAO CosNotification Skeleton Library
-Requires: TAO_CosNotification, TAO_PortableServer
+Requires: TAO_CosNotification, TAO_CosEvent_Skel, TAO_PortableServer
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosNotification_Skel
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in
index b36f4460953..67038f6d9e6 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosProperty.pc.in
@@ -4,8 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: TAO_CosProperty
-Description: TAO CosProperty Library
-Requires: TAO_PortableServer, TAO
+Description: TAO CosProperty Stub Library
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosProperty
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in
index f505f6744e3..517f619d0a4 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_CosTrading
 Description: TAO CosTrading Stub Library
-Requires: TAO
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosTrading
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in b/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in
index 27962a0b933..90bfd120c36 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_DsLogAdmin
 Description: TAO Basic Logging Service Stub Library
-Requires: TAO
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_DsLogAdmin
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in b/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in
index 6dd5a08e1a0..98825681b5b 100644
--- a/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in
+++ b/TAO/orbsvcs/orbsvcs/TAO_ETCL.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: TAO_ETCL
 Description: TAO Extended Trading Constraint Language Library
-Requires: TAO
+Requires: TAO_AnyTypeCode, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_ETCL
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 0da9f75664f..55708a8dc13 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -1,7 +1,8 @@
-// -*- C++ -*-
 // $Id$
 
-#include "TAO_TIO.h"
+#include "orbsvcs/Time/TAO_TIO.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
 TAO_TIO::TAO_TIO (TimeBase::TimeT lower,
@@ -69,7 +70,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
           ACE_NEW_RETURN (tio,
                           TAO_TIO (lb1, up1),
                           CosTime::OTNoOverlap);
-          overlap = tio->_this ();
+          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTOverlap;
         }
@@ -80,6 +82,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           CosTime::OTNoOverlap);
 
           overlap = tio->_this ();
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTContained;
         }
@@ -89,7 +92,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb2, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
+          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTContained;
         }
@@ -101,7 +105,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                               TAO_TIO (0, 0),
                               CosTime::OTNoOverlap);
 
-              overlap = tio->_this ();
+              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
               return CosTime::OTNoOverlap;
             }
@@ -110,7 +115,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
               ACE_NEW_RETURN (tio,
                               TAO_TIO (lb2, up1),
                               CosTime::OTNoOverlap);
-              overlap = tio->_this ();
+              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
               return CosTime::OTOverlap;
             }
@@ -122,7 +128,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (0, 0),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
+          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTNoOverlap;
         }
@@ -132,8 +139,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb1, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
-
+          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
         }
     }
   ACE_CATCHANY
@@ -180,7 +187,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this ();
+      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
       return CosTime::OTOverlap;
     }
@@ -191,7 +199,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this ();
+      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
       return CosTime::OTContained;
     }
@@ -202,7 +211,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this ();
+      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
       return CosTime::OTContained;
     }
@@ -214,7 +224,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                             TAO_TIO (0, 0),
                             CORBA::NO_MEMORY ());
           ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-          overlap = tio_i->_this ();
+          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTNoOverlap;
         }
@@ -225,7 +236,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                             CORBA::NO_MEMORY ());
           ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this ();
+          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTOverlap;
         }
@@ -237,7 +249,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this ();
+      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
       return CosTime::OTNoOverlap;
     }
@@ -269,5 +282,7 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this ();
+  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index cdebf3a0462..ff4f0e8ab36 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -19,8 +19,10 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "TAO_UTO.h"
-#include "time_export.h"
+#include "orbsvcs/Time/TAO_UTO.h"
+#include "orbsvcs/Time/time_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_TIO
@@ -87,5 +89,7 @@ private:
   TimeBase::IntervalT attr_time_interval;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TIO_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 2667b77f73a..710c8fad7ee 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -1,13 +1,15 @@
 // -*- C++ -*-
 // $Id$
 
-#include "TAO_Time_Service_Clerk.h"
-#include "TAO_TIO.h"
-#include "TAO_UTO.h"
+#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
+#include "orbsvcs/Time/TAO_TIO.h"
+#include "orbsvcs/Time/TAO_UTO.h"
 
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_sys_time.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
                                                 int timer_value_usecs,
@@ -175,3 +177,5 @@ TAO_Time_Service_Clerk::inaccuracy (TimeBase::InaccuracyT inaccuracy)
 {
   this->inaccuracy_ = inaccuracy;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 41357544e52..ef8d5a9a3dd 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -21,8 +21,11 @@
 #include "ace/Reactor.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "Timer_Helper.h"
-#include "time_export.h"
+#include "orbsvcs/Time/Timer_Helper.h"
+#include "orbsvcs/Time/time_export.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Time_Service_Clerk
@@ -132,5 +135,7 @@ private:
   Timer_Helper helper_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TIME_SERVICE_CLERK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 54422e753ff..6fc4cf2b98e 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -1,6 +1,6 @@
-#include "TAO_UTO.h"
-#include "TAO_TIO.h"
-#include "TAO_Time_Service_Server.h"
+#include "orbsvcs/Time/TAO_UTO.h"
+#include "orbsvcs/Time/TAO_TIO.h"
+#include "orbsvcs/Time/TAO_Time_Service_Server.h"
 #include "ace/OS_NS_sys_time.h"
 #include "orbsvcs/Time_Utilities.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (Time,
            TAO_Time_Service_Server,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
 TAO_Time_Service_Server::TAO_Time_Service_Server (void)
@@ -122,3 +123,5 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
 
   return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index f83b3cb5701..c87d563935a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -19,7 +19,9 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "time_export.h"
+#include "orbsvcs/Time/time_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Time_Service_Server
@@ -79,5 +81,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TIME_SERVICE_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 467d95525d2..c9ea818a549 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
-#include "TAO_UTO.h"
-#include "TAO_TIO.h"
+#include "orbsvcs/Time/TAO_UTO.h"
+#include "orbsvcs/Time/TAO_TIO.h"
 #include "ace/OS.h"
 
 
@@ -11,6 +11,8 @@ ACE_RCSID (Time,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UTO::TAO_UTO (TimeBase::TimeT time,
                   TimeBase::InaccuracyT inaccuracy,
                   TimeBase::TdfT tdf)
@@ -240,3 +242,5 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
 
   return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b705d2244d8..b4e72e090da 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -19,7 +19,9 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "time_export.h"
+#include "orbsvcs/Time/time_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UTO
@@ -111,5 +113,7 @@ private:
   TimeBase::UtcT attr_utc_time_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UTO_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index aa2c45aae47..47923f8dba3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,5 +1,5 @@
-#include "Timer_Helper.h"
-#include "TAO_Time_Service_Clerk.h"
+#include "orbsvcs/Time/Timer_Helper.h"
+#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
 
 #include "tao/debug.h"
 
@@ -11,6 +11,8 @@ ACE_RCSID (Time,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 Timer_Helper::Timer_Helper (void)
   : clerk_ (0)
 {
@@ -150,3 +152,5 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 5e89f43785d..9bfd7297661 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -25,7 +25,7 @@
 
 #include "ace/Event_Handler.h"
 #include "ace/Containers.h"
-#include "time_export.h"
+#include "orbsvcs/Time/time_export.h"
 
 #include "orbsvcs/TimeServiceS.h"
 
@@ -33,6 +33,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Time_Service_Clerk;
 
 /**
@@ -71,6 +73,8 @@ protected:
   typedef ACE_Array_Base<CosTime::TimeService_var> IORS;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TIMER_HELPER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index d47168b1212..80152580eb5 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Number of nanoseconds between CORBA and POSIX epochs.
 #ifdef ACE_LACKS_LONGLONG_T
 const ACE_UINT64
@@ -16,3 +18,5 @@ ORBSVCS_Time::Time_Base_Offset(0x82B60000, 0x0A990E2D6);
 const ACE_UINT64
 ORBSVCS_Time::Time_Base_Offset(ACE_UINT64_LITERAL(12218515200000000000));
 #endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index f342e67b3df..8a471f31521 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -22,6 +23,8 @@
 #include "orbsvcs/svc_utils_export.h"
 #include "ace/OS_NS_time.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ORBSVCS_Time
  * 
@@ -98,6 +101,8 @@ private:
   static const ACE_UINT64 Time_Base_Offset;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "orbsvcs/Time_Utilities.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
index 27ea1cdde34..f7531f657f3 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -4,6 +4,8 @@
 
 #include "ace/Time_Value.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TimeBase::TimeT
 ORBSVCS_Time::zero ()
 {
@@ -97,3 +99,5 @@ ORBSVCS_Time::to_Absolute_Time_Value (const TimeBase::TimeT& t)
   ORBSVCS_Time::Absolute_TimeT_to_Time_Value (r, t);
   return r;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 78672b1dab4..0db71ba50b0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
-#include "Constraint_Interpreter.h"
-#include "Trader_Constraint_Visitors.h"
+#include "orbsvcs/Trader/Constraint_Interpreter.h"
+#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
 
 ACE_RCSID (Trader,
            Constraint_Interpreter,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* constraints
@@ -248,3 +251,5 @@ TAO_Preference_Interpreter::num_offers (void)
 {
   return this->offers_.size ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index b3e7e3ec208..586f82080e4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -15,13 +15,15 @@
 #define TAO_CONSTRAINT_INTERPRETER_H
 #include /**/ "ace/pre.h"
 
-#include "Constraint_Nodes.h"
-#include "Constraint_Visitors.h"
-#include "Interpreter.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "orbsvcs/Trader/Interpreter.h"
 
 #include "orbsvcs/CosTradingS.h"
 #include "orbsvcs/CosTradingReposS.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
@@ -158,5 +160,7 @@ private:
   Ordered_Offers offers_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index d39235d4340..dd5ddc1e92b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -1,16 +1,17 @@
 // $Id$
 
-#include "Constraint_Nodes.h"
-#include "Constraint_Visitors.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/Trader/Constraint_Visitors.h"
 
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/Managed_Types.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Trader,
            Constraint_Nodes,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor)
 {
@@ -734,7 +735,7 @@ operator== (CORBA::Double left, const TAO_Literal_Constraint& right)
 }
 
 bool
-operator== (const TAO_String_Manager& left,
+operator== (const TAO::String_Manager& left,
             const TAO_Literal_Constraint& right)
 {
   bool result = false;
@@ -925,3 +926,5 @@ TAO_Literal_Constraint::copy (const TAO_Literal_Constraint& lit)
   else
     type_ = TAO_UNKNOWN;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 1e73a887e21..6e9ccd203fd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,9 +15,10 @@
 #define TAO_CONSTRAINT_NODES_H
 #include /**/ "ace/pre.h"
 
-#include "Constraint_Tokens.h"
+#include "orbsvcs/Trader/Constraint_Tokens.h"
 
 #include "tao/Basic_Types.h"
+#include "tao/String_Manager_T.h"
 
 #include "orbsvcs/Trader/trading_serv_export.h"
 
@@ -26,11 +27,11 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Constraint_Visitor;
 typedef unsigned short TAO_Expression_Type;
 
-class TAO_String_Manager;
-
 namespace CORBA
 {
   class Any;
@@ -293,7 +294,7 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
                 const TAO_Literal_Constraint& right);
 
   friend bool
-    operator== (const TAO_String_Manager& left,
+    operator== (const TAO::String_Manager& left,
                 const TAO_Literal_Constraint& right);
 
   // = Arithmetic operators.
@@ -347,6 +348,8 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 0281593f45c..edb16fd97b9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "Constraint_Visitors.h"
-#include "Constraint_Nodes.h"
-#include "Interpreter_Utils_T.h"
+#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/Trader/Interpreter_Utils_T.h"
 
 #include "tao/DynamicAny/DynSequence_i.h"
 
@@ -14,6 +14,8 @@ ACE_RCSID (Trader,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
 {
 }
@@ -1198,3 +1200,5 @@ TAO_Constraint_Validator::expr_returns_string (TAO_Expression_Type expr_type)
 
   return return_value;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index b1870a30889..9bbba2e8755 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -19,6 +19,8 @@
 #include "orbsvcs/Trader/trading_serv_export.h"
 #include "ace/Containers.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_DynSequence_i;
 
 class TAO_Constraint;
@@ -85,8 +87,12 @@ public:
   virtual int visit_property (TAO_Property_Constraint* literal) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "orbsvcs/Trader/Constraint_Nodes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Constraint_Validator
  *
@@ -437,5 +443,7 @@ public:
                    const char* element) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 2197337bab9..a451f98e6a9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -8,6 +8,7 @@
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
 
+#include "tao/orbconf.h"
 #include "ace/OS.h"
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -83,6 +84,8 @@
 /* Size of default input buffer. */
 #define YY_BUF_SIZE 16384
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 extern int yyleng;
@@ -405,6 +408,8 @@ char *yytext;
 
 #define INITIAL 0
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // $Id$
 // ========================================================================
 //
@@ -419,9 +424,11 @@ char *yytext;
 //
 // ========================================================================
 
-#include "Constraint_Interpreter.h"
-#include "Constraint_Nodes.h"
-#include "Constraint_Tokens.h"
+#include "orbsvcs/Trader/Constraint_Interpreter.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/Trader/Constraint_Tokens.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 static TAO_Literal_Constraint* extract_string(const char*);
 
@@ -488,6 +495,8 @@ static int yy_top_state YY_PROTO(( void ));
 #define YY_NO_TOP_STATE 1
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
@@ -579,6 +588,8 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
@@ -791,7 +802,7 @@ YY_RULE_SETUP
 
 { 
 		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Boolean) 1);
+		    new TAO_Literal_Constraint(true);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
 	ACE_NOTREACHED (YY_BREAK)
@@ -800,7 +811,7 @@ YY_RULE_SETUP
 
 { 
 		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Boolean) 0);
+		    new TAO_Literal_Constraint(false);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
 	ACE_NOTREACHED (YY_BREAK)
@@ -1775,3 +1786,5 @@ yywrap (void)
 {
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index df613be500b..4376a5b05ba 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -14,8 +14,10 @@
 // ========================================================================
 
 #include "ace/OS_NS_string.h"
-#include "Constraint_Interpreter.h"
-#include "Constraint_Nodes.h"
+#include "orbsvcs/Trader/Constraint_Interpreter.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //#define YYDEBUG 1
 # define TAO_GT 257
@@ -895,3 +897,4 @@ case 37:
 	goto yystack;		/* reset registers in driver code */
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 8205067b623..ff6f7b4a1e4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -1,8 +1,10 @@
 // $Id$
 
-#include "Interpreter.h"
+#include "orbsvcs/Trader/Interpreter.h"
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__;
 
 TAO_Interpreter::TAO_Interpreter (void)
@@ -95,3 +97,5 @@ TAO_Lex_String_Input::reset (char* input_string)
   TAO_Lex_String_Input::end_ = input_string +
     ACE_OS::strlen (TAO_Lex_String_Input::string_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 4575bc96e89..7971ed9e024 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,15 +10,16 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_TCL_INTERPRETER_H
 #define TAO_TCL_INTERPRETER_H
 #include /**/ "ace/pre.h"
 
-#include "Constraint_Nodes.h"
-#include "Constraint_Visitors.h"
+#include "orbsvcs/Trader/Constraint_Nodes.h"
+#include "orbsvcs/Trader/Constraint_Visitors.h"
 #include "orbsvcs/Trader/trading_serv_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
@@ -100,5 +101,7 @@ typedef union
 extern YYSTYPE yylval;
 extern YYSTYPE yyval;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TCL_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 22dd38b69d0..8ee0351020a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "Interpreter_Utils.h"
+#include "orbsvcs/Trader/Interpreter_Utils.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // = Methods to deal with ACE_Hash_Map_Manager.
 
 TAO_String_Hash_Key::TAO_String_Hash_Key (void)
@@ -94,3 +96,5 @@ sequence_type (CORBA::TypeCode* type_code
 
   return return_value;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index 509d455ec03..bd076791149 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -22,6 +22,8 @@
 
 #include "orbsvcs/Trader/trading_serv_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
 /**
@@ -55,6 +57,10 @@ public:
   // The function that computes a hash value.
 };
 
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+  template class TAO_Trading_Serv_Export TAO::String_var <char>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
 typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key,
                                 int,
                                 ACE_Hash<TAO_String_Hash_Key>,
@@ -86,6 +92,8 @@ public:
   // is <code>.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_INTERPRETER_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index f621f592ea9..5474d4fb694 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -7,6 +7,8 @@
 #include "orbsvcs/Trader/Constraint_Visitors.h"
 #include "tao/DynamicAny/DynSequence_i.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class OPERAND_TYPE> CORBA::Boolean
 TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
 {
@@ -45,4 +47,6 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   return return_value;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_INTERPRETER_UTILS_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
index 4127dc0ddc4..bbef8857006 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef TAO_INTERPRETER_UTILS_T_H
@@ -6,11 +8,15 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class OPERAND_TYPE>
 CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Interpreter_Utils_T.cpp"
+#include "orbsvcs/Trader/Interpreter_Utils_T.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
index a3b7cd2e7a2..e01ba419b43 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 222c8f5cfa6..367f7b9a9c5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#ifndef TAO_OFFER_DATABASE_C
-#define TAO_OFFER_DATABASE_C
+#ifndef TAO_OFFER_DATABASE_CPP
+#define TAO_OFFER_DATABASE_CPP
 
-#include "Offer_Database.h"
+#include "orbsvcs/Trader/Offer_Database.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Trader, Offer_Database, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class LOCK_TYPE>
 TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void)
@@ -384,4 +384,6 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void)
     this->offer_iter_->advance ();
 }
 
-#endif /* TAO_OFFER_DATABASE_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_OFFER_DATABASE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 4ec7cfef179..b7ad154a2ef 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,10 +15,12 @@
 #define TAO_OFFER_DATABASE_H
 #include /**/ "ace/pre.h"
 
-#include "Trader.h"
-#include "Offer_Iterators.h"
+#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/Trader/Offer_Iterators.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class LOCK_TYPE> class TAO_Service_Offer_Iterator;
 
 /**
@@ -199,9 +201,10 @@ class TAO_Service_Offer_Iterator
   const char* type_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Offer_Database.cpp"
+#include "orbsvcs/Trader/Offer_Database.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 4ccdb4d0b39..da8ad797031 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
-#include "Offer_Iterators.h"
+#include "orbsvcs/Trader/Offer_Iterators.h"
 
 ACE_RCSID(Trader, Offer_Iterators, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter)
   : pfilter_ (pfilter)
 {
@@ -316,3 +318,5 @@ TAO_Offer_Id_Iterator::insert_id (CosTrading::OfferId new_id)
 {
   this->ids_.enqueue_tail (new_id);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 2c836bf660d..247664b6f77 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,19 +16,21 @@
 #define TAO_OFFER_ITERATORS_H
 #include /**/ "ace/pre.h"
 
-#include "Trader_Utils.h"
+#include "orbsvcs/Trader/Trader_Utils.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
   // *************************************************************
   // TAO_Offer_Iterator
   // *************************************************************
 
-class TAO_Offer_Iterator :
-  public virtual POA_CosTrading::OfferIterator
+class TAO_Offer_Iterator
+  : public virtual POA_CosTrading::OfferIterator
 {
   // = TITLE
   //     This class implements CosTrading::OfferIterator IDL
@@ -286,6 +288,8 @@ class TAO_Offer_Id_Iterator :
   TAO_String_Queue ids_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index bf0c9c7ad7c..f8ad8bd3a6f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#ifndef TAO_OFFER_ITERATORS_T_C
-#define  TAO_OFFER_ITERATORS_T_C
+#ifndef TAO_OFFER_ITERATORS_T_CPP
+#define TAO_OFFER_ITERATORS_T_CPP
 
-#include "Offer_Iterators_T.h"
+#include "orbsvcs/Trader/Offer_Iterators_T.h"
 
-ACE_RCSID(Trader, Offer_Iterators_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class MAP_LOCK_TYPE>
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
@@ -92,4 +92,6 @@ next_n (CORBA::ULong n,
   return static_cast<CORBA::Boolean> (ret_offers != 0);
 }
 
-#endif /* TAO_REGISTER_OFFER_ITERATOR_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_REGISTER_OFFER_ITERATOR_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 440b4db8449..8aa992e9add 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,13 +16,17 @@
 #define TAO_REGISTER_OFFER_ITERATOR_H
 #include /**/ "ace/pre.h"
 
-#include "Offer_Iterators.h"
-#include "Offer_Database.h"
+#include "orbsvcs/Trader/Offer_Iterators.h"
+#include "orbsvcs/Trader/Offer_Database.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Register_Offer_Iterator
  *
@@ -78,9 +82,10 @@ private:
   TAO_String_Queue offer_ids_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Offer_Iterators_T.cpp"
+#include "orbsvcs/Trader/Offer_Iterators_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 1bc95e7bcdc..f596627fda1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Service_Type_Repository.h"
+#include "orbsvcs/Trader/Service_Type_Repository.h"
 
 #include "ace/Lock_Adapter_T.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (Trader,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Service_Type_Repository::
 TAO_Service_Type_Repository (ACE_Lock* lock)
   : lock_ (lock)
@@ -689,3 +691,5 @@ update_type_map (const char *name,
   TAO_String_Hash_Key type_name (name);
   this->type_map_.bind (type_name, type);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index b65b50bb49b..013061face7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,17 +16,20 @@
 #define TAO_SERVICE_TYPE_REPOSITORY_H
 #include /**/ "ace/pre.h"
 
-#include "Trader.h"
+#include "orbsvcs/Trader/Trader.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Service_Type_Repository
  *
  * @brief This class implements CosTradingRepos::ServiceTypeRepository
  * IDL interface.
  */
-class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository
+class TAO_Trading_Serv_Export TAO_Service_Type_Repository
+  : public POA_CosTradingRepos::ServiceTypeRepository
 {
 public:
   /**
@@ -318,5 +321,7 @@ private:
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber incarnation_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 2743d67bbdf..14d035ee0e5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Trader.h"
-#include "Offer_Iterators_T.h"
+#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/Trader/Offer_Iterators_T.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_strings.h"
@@ -9,12 +9,14 @@
 #include "ace/OS_NS_ctype.h"
 
 // The following #include is needed only for the instantiation pragmas.
-#include "Trader_Interfaces.h"
+#include "orbsvcs/Trader/Trader_Interfaces.h"
 
 ACE_RCSID (Trader,
            Trader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Trader_Base::TAO_Trader_Base (void)
   : trading_components_ (*this),
     import_attributes_ (*this),
@@ -632,8 +634,12 @@ operator== (const CosTrading::Admin::OctetSeq& left,
   return return_value;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "ace/Arg_Shifter.h"
-#include "Trader_T.h"
+#include "orbsvcs/Trader/Trader_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Trader_Factory::TAO_TRADER*
 TAO_Trader_Factory::create_trader (int& argc, ACE_TCHAR** argv)
@@ -856,3 +862,5 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv)
         arg_shifter.ignore_arg ();
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 25d731b8fbe..33206bd58fb 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,7 +17,7 @@
 #define TAO_TRADER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include "Interpreter_Utils.h"
+#include "orbsvcs/Trader/Interpreter_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,6 +35,8 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Declaration.
 class TAO_Trader_Base;
 
@@ -122,7 +124,7 @@ private:
  * Class used to remove the circular dependencies between the
  * Attribute classes and the Trader class.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
 // Work around Borland unresolved symbol errors concerning the
 // out-of-line virtual destructor.  The virtual destructor should
 // not be inlined, nor should we have to export TAO_Lockable from the
@@ -130,7 +132,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Lockable
 #else
 class TAO_Lockable
-#endif  /* __BORLANDC__ < 0x572 */
+#endif  /* __BORLANDC__ < 0x581 */
 {
 public:
   virtual ~TAO_Lockable (void);
@@ -513,6 +515,8 @@ bool
 operator== (const CosTrading::Admin::OctetSeq& left,
             const CosTrading::Admin::OctetSeq& right);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index a62b2d3773a..89c0ec8e1e5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
-#include "Trader_Constraint_Visitors.h"
+#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Trader_Constraint_Evaluator::
 TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer,
@@ -78,3 +80,5 @@ TAO_Trader_Constraint_Validator::
 ~TAO_Trader_Constraint_Validator ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index e5740b3dc86..3b132230630 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,12 +15,15 @@
 #define TAO_TRADER_CONSTRAINT_VISITOR_H
 #include /**/ "ace/pre.h"
 
-#include "Constraint_Visitors.h"
-#include "Trader.h"
-#include "Trader_Utils.h"
+#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/Trader/Trader_Utils.h"
 #include "orbsvcs/CosTradingC.h"
 
-class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator
+: public TAO_Constraint_Validator
 {
  public:
   /**
@@ -53,5 +57,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Const
   TAO_Property_Evaluator prop_eval_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TRADER_CONSTRAINT_VISITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 9b6b450eb52..fbc7e07777b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#if !defined (TAO_TRADER_INTERFACES_C)
-#define TAO_TRADER_INTERFACES_C
+#ifndef TAO_TRADER_INTERFACES_CPP
+#define TAO_TRADER_INTERFACES_CPP
 
-#include "Trader_Interfaces.h"
-#include "Trader_T.h"
+#include "orbsvcs/Trader/Trader_Interfaces.h"
+#include "orbsvcs/Trader/Trader_T.h"
 #include "ace/INET_Addr.h"
-#include "Trader_Constraint_Visitors.h"
+#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Trader, Trader_Interfaces, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
@@ -333,7 +333,7 @@ lookup_all_subtypes (const char* type,
 
       for (CORBA::ULong j = 0; j < num_super_types; j++)
         {
-          if (ACE_OS::strcmp (type_struct->super_types[j].in(), type) == 0)
+          if (ACE_OS::strcmp (static_cast<const char*>(type_struct->super_types[j]), type) == 0)
             {
               // Egads, a subtype! This type has the type passed
               // to query in its list of super_types.
@@ -365,9 +365,9 @@ fill_receptacles (const char* /* type */,
 {
   // BEGIN SPEC
   // The returned offers are passed back in one of two ways (or a
-  // combination of both). ° The "offers" return result conveys a list
+  // combination of both). ?The "offers" return result conveys a list
   // of offers and the "offer_itr" is a reference to an interface at
-  // which offers can be obtained. ° The "how_many" parameter states
+  // which offers can be obtained. ?The "how_many" parameter states
   // how many offers are to be returned via the "offers" result, any
   // remaining offers are available via the iterator interface. If the
   // "how_many" exceeds the number of offers to be returned, then the
@@ -609,7 +609,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
   // collection. The end result is a distributed tree of offer
   // iterators, which if traversed in its entirety is probably hugely
   // inefficient, but oh well, I can't think of a better solution.
-  TAO_Offer_Iterator_Collection* offer_iter_collection;
+  TAO_Offer_Iterator_Collection* offer_iter_collection = 0;
   ACE_NEW (offer_iter_collection,
            TAO_Offer_Iterator_Collection);
   offer_iter_collection->add_offer_iterator (offer_iter);
@@ -1326,7 +1326,7 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   // The default way -- eight random integers.
   else
     {
-      size_t time_value = ACE_OS::time ();
+      time_t time_value = ACE_OS::time ();
       ACE_OS::srand (static_cast<u_int> (time_value));
 
       this->stem_id_[0] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
@@ -1356,10 +1356,10 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_D
   // prefix. The sequence number is four octets long, the unique
   // prefix, also 4 bytes long.
 
-  this->stem_id_[8] = this->sequence_number_ & 0xff;
-  this->stem_id_[9] = (this->sequence_number_ >> 8) & 0xff;
-  this->stem_id_[10] = (this->sequence_number_ >> 16) & 0xff;
-  this->stem_id_[11] = (this->sequence_number_ >> 24) & 0xff;
+  this->stem_id_[8] = static_cast<CORBA::Octet> (this->sequence_number_ & 0xff);
+  this->stem_id_[9] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 8) & 0xff);
+  this->stem_id_[10] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 16) & 0xff);
+  this->stem_id_[11] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 24) & 0xff);
 
   // Increment the sequence number and return a copy of the stem_id.
   this->sequence_number_++;
@@ -1926,13 +1926,15 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
-                CosTrading::OfferIdSeq*&,
-                CosTrading::OfferIdIterator_ptr&
-                ACE_ENV_ARG_DECL)
+              CosTrading::OfferIdSeq*&,
+              CosTrading::OfferIdIterator_ptr&
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
   ACE_THROW (CORBA::UNKNOWN ());
 }
 
-#endif /* TAO_TRADER_INTERFACES_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_TRADER_INTERFACES_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index ece1de9a961..6c86c7a4840 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,15 +17,17 @@
 #define TAO_TRADER_INTERFACES_H
 #include /**/ "ace/pre.h"
 
-#include "Trader_Utils.h"
-#include "Constraint_Interpreter.h"
-#include "Offer_Iterators_T.h"
+#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/Trader/Constraint_Interpreter.h"
+#include "orbsvcs/Trader/Offer_Iterators_T.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Hack because g++ forced this inane circular dependecy!
 
 class TAO_Constraint_Interpreter;
@@ -39,7 +41,11 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Admin;
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Proxy;
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Link;
 
-#include "Trader_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "orbsvcs/Trader/Trader_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Lookup
@@ -999,8 +1005,10 @@ private:
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Trader_Interfaces.cpp"
+#include "orbsvcs/Trader/Trader_Interfaces.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 2b02ec5ffdc..74c5a327976 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#ifndef TAO_TRADER_C
-#define TAO_TRADER_C
+#ifndef TAO_TRADER_CPP
+#define TAO_TRADER_CPP
 
-#include "Trader_T.h"
-#include "Trader_Interfaces.h"
+#include "orbsvcs/Trader/Trader_T.h"
+#include "orbsvcs/Trader/Trader_Interfaces.h"
 
-ACE_RCSID(Trader, Trader_T, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
@@ -320,4 +320,6 @@ operator () (TAO_DynSequence_i& dyn_any,
   return 1;
 }
 
-#endif /* TAO_TRADER_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_TRADER_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index be1ec6a4149..cf892279bcc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,8 +17,8 @@
 #define TAO_TRADER_H
 #include /**/ "ace/pre.h"
 
-#include "Trader.h"
-#include "Offer_Database.h"
+#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/Trader/Offer_Database.h"
 #include "ace/Containers.h"
 #include "ace/Lock_Adapter_T.h"
 
@@ -31,6 +31,8 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_DynSequence_i;
 
 /**
@@ -262,8 +264,10 @@ public:
                    const ELEMENT_TYPE& element);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Trader_T.cpp"
+#include "orbsvcs/Trader/Trader_T.cpp"
 #endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 51464f76e93..afd9e8a8b7b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "Trader_Utils.h"
+#include "orbsvcs/Trader/Trader_Utils.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID(Trader, Trader_Utils, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Policy_Creator::TAO_Policy_Creator (int num_policies)
   : policies_ (num_policies),
     num_policies_ (0)
@@ -1522,3 +1524,5 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
     //      d_props.replace (length, length, props, 0);
     d_props = s_props;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 0fb91489fa4..a79c30f8136 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -16,13 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Trader.h"
+#include "orbsvcs/Trader/Trader.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Property_Evaluator
  *
@@ -769,6 +771,8 @@ private:
   CosTrading::Lookup::HowManyProps policy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 480c272f845..a4f3bfd4e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -14,10 +14,11 @@
 
 //===========================================================================
 
-#include "Trading_Loader.h"
+#include "orbsvcs/Trader/Trading_Loader.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/default_ports.h"
+#include "tao/IORTable/IORTable.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
@@ -247,6 +248,25 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
       ACE_OS::fclose (this->ior_output_file_);
     }
 
+  CORBA::Object_var table_object =
+    orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  IORTable::Table_var adapter =
+    IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  if (CORBA::is_nil (adapter.in ()))
+    {
+      ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
+    } 
+  else
+    {
+      adapter->bind ("TradingService",
+                     this->ior_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    }
+
   if (this->federate_)
     {
       // Only become a multicast server if we're the only trader
@@ -402,7 +422,7 @@ TAO_Trading_Loader::init_multicast_server (void)
         ACE_OS::getenv ("TradingServicePort");
 
       if (port_number != 0)
-        port = ACE_OS::atoi (port_number);
+        port = static_cast<u_short> (ACE_OS::atoi (port_number));
       else
         port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index a686d40422f..3b344cd9333 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 // ===========================================================================
@@ -58,7 +60,7 @@ public:
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
 
- protected:
+protected:
 
   int init_multicast_server (void);
   // Enable the Trading Service to answer multicast requests for its
@@ -101,9 +103,11 @@ public:
   CORBA::Boolean dumpior_;
   // Flag indication whether to dump the ior to standard output
 
- private:
-   ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader (const TAO_Trading_Loader &))
-   ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader &operator= (const TAO_Trading_Loader &))
+private:
+
+  // Disallow copying and assignment.
+  TAO_Trading_Loader (const TAO_Trading_Loader &);
+  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
index 955d62f9cfc..9d1aef05376 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    constraint.l
 //
@@ -18,6 +18,8 @@
 #include "Constraint_Nodes.h"
 #include "Constraint_Tokens.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 static TAO_Literal_Constraint* extract_string(const char*);
 
 #define TAO_YY_LEX_DEBUG
@@ -33,8 +35,8 @@ white_space     [ \t]
 letter		[a-zA-Z]
 digit		[0-9]
 alpha_num	({letter}|{digit})
-integer		[-+]?{digit}+ 
-float		({digit}*\.{digit}+)([eE][-+]?{digit}+)? 
+integer		[-+]?{digit}+
+float		({digit}*\.{digit}+)([eE][-+]?{digit}+)?
 string		'(([^'\\]*)|([^'\\]*\\')|([^'\\]*\\\\))*'
 ident		{letter}({alpha_num}|[_])*
 newline		\n
@@ -65,37 +67,37 @@ in		{ TAO_YY_LEX_DEBUG; return TAO_IN; }
 "!="		{ TAO_YY_LEX_DEBUG; return TAO_NE; }
 "("             { TAO_YY_LEX_DEBUG; return TAO_LPAREN; }
 ")"             { TAO_YY_LEX_DEBUG; return TAO_RPAREN; }
-TRUE		{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Boolean) 1);
+TRUE		{
+		  yylval.constraint_ =
+                    new TAO_Literal_Constraint(true);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
-FALSE		{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Boolean) 0);
+FALSE		{
+		  yylval.constraint_ =
+                    new TAO_Literal_Constraint(false);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
-{integer}	{ 
-		  yylval.constraint_ = 
+{integer}	{
+		  yylval.constraint_ =
 		    new TAO_Literal_Constraint((yytext[0] == '-' ?
                     (CORBA::Long)atoi(yytext) : (CORBA::ULong)atoi(yytext)));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
+		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
 		}
-{float}		{ 
-		  yylval.constraint_ = 
+{float}		{
+		  yylval.constraint_ =
 		    new TAO_Literal_Constraint((CORBA::Double)atof(yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
+		  TAO_YY_LEX_DEBUG; return TAO_NUMBER;
 		}
-{string}	{ 
+{string}	{
 		  yylval.constraint_ = extract_string(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_STRING; 
+		  TAO_YY_LEX_DEBUG; return TAO_STRING;
 		}
-{ident}		{ 
-		  yylval.constraint_ = 
+{ident}		{
+		  yylval.constraint_ =
 		    new TAO_Property_Constraint(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_IDENT; 
+		  TAO_YY_LEX_DEBUG; return TAO_IDENT;
 		}
-{unknown}       { 
+{unknown}       {
                   TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
                 }
 %%
@@ -103,7 +105,7 @@ FALSE		{
 TAO_Literal_Constraint*
 extract_string(const char* total)
 {
-  int prev_slash = 0, 
+  int prev_slash = 0,
     ctr = 0;
   char str[BUFSIZ],
    *tmp = (char*) total + 1;
@@ -129,4 +131,6 @@ extract_string(const char* total)
 
   str[ctr - 1] = '\0';
   return new TAO_Literal_Constraint(str);
-}
\ No newline at end of file
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
index 1e5ab5c81cf..7d32796775a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
@@ -17,6 +17,8 @@
 #include "Constraint_Interpreter.h"           
 #include "Constraint_Nodes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //#define YYDEBUG 1
 %}
 
@@ -133,4 +135,5 @@ factor:		TAO_LPAREN bool_or TAO_RPAREN
 
 %%
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 //extern int yydebug = 1;
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
index 86d9c19c060..b57bcab5758 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
@@ -4,14 +4,12 @@
 feature(ec_typed_events) : dynamicinterface, ifr_client {
   macros   += TAO_HAS_TYPED_EVENT_CHANNEL
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    CosEvent {
-      CosEvent/CEC_TypedEvent.cpp
-      CosEvent/CEC_TypedEventChannel.cpp
-      CosEvent/CEC_TypedProxyPushConsumer.cpp
-      CosEvent/CEC_TypedConsumerAdmin.cpp
-      CosEvent/CEC_TypedSupplierAdmin.cpp
-      CosEvent/CEC_DynamicImplementation.cpp
-    }
+  Source_Files {
+    CosEvent/CEC_TypedEvent.cpp
+    CosEvent/CEC_TypedEventChannel.cpp
+    CosEvent/CEC_TypedProxyPushConsumer.cpp
+    CosEvent/CEC_TypedConsumerAdmin.cpp
+    CosEvent/CEC_TypedSupplierAdmin.cpp
+    CosEvent/CEC_DynamicImplementation.cpp
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index e5d58747663..0a8ab39b698 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -4,16 +4,19 @@
 #ifndef TAO_SFP_IDL
 #define TAO_SFP_IDL
 
+#include <ULongSeq.pidl>
+#include <OctetSeq.pidl>
+
 module flowProtocol
 {
-  typedef sequence <unsigned long> my_seq_ulong;
+  typedef CORBA::ULongSeq my_seq_ulong;
   enum MsgType
   {
     // The MsgTypes Start and struct Start,StartReply and struct
-    // StartReply conflicts. 
-    // Also there are case-only differences for enumerator Credit and struct credit. 
+    // StartReply conflicts.
+    // Also there are case-only differences for enumerator Credit and struct credit.
     // We suffix _Msg to all enumerators until the AVStreams RTF fixes these.
-    // Messages in the forward direction 
+    // Messages in the forward direction
     //    Start,
     Start_Msg,
     EndofStream_Msg,
@@ -27,74 +30,74 @@ module flowProtocol
     Credit_Msg,
     // Addition of type for a fragment.
     Fragment_Msg
-  }; 
-  
+  };
+
   struct frameHeader
-  { 
+  {
     char magic_number[4];
     //    my_seq_char magic_number;
-    // '=', 'S', 'F', 'P' 
-    octet flags;   
-    // bit 0 = byte order, 
-    // 1 = fragments, 2-7 always 0 
-    octet message_type; 
-    unsigned long message_size; 
-    // Size following this header 
-  }; 
-  
+    // '=', 'S', 'F', 'P'
+    octet flags;
+    // bit 0 = byte order,
+    // 1 = fragments, 2-7 always 0
+    octet message_type;
+    unsigned long message_size;
+    // Size following this header
+  };
+
   struct fragment
-  { 
-    //    my_seq_char magic_number; 
+  {
+    //    my_seq_char magic_number;
     char magic_number[4];
-    // 'F', 'R', 'A', 'G' 
-    octet flags; 
-    // bit 1 = more fragments, %%bit 0 = byteorder 
-    unsigned long frag_number; 
-    // 1,..,n 
+    // 'F', 'R', 'A', 'G'
+    octet flags;
+    // bit 1 = more fragments, %%bit 0 = byteorder
+    unsigned long frag_number;
+    // 1,..,n
     unsigned long sequence_num;
-    unsigned long frag_sz; 
-    unsigned long source_id; 
-    // Required for UDP multicast with multiple sources 
-  };                    
-  
+    unsigned long frag_sz;
+    unsigned long source_id;
+    // Required for UDP multicast with multiple sources
+  };
+
   struct Start
-  { 
+  {
     char magic_number[4];
     //    my_seq_char magic_number;
-    // '=', 'S', 'T', 'A' 
-    octet major_version; 
-    octet minor_version; 
-    octet flags; 
-    // bit 0 = byte order 
-  }; 
-  
-  // Acknowledge successful processing of 
-  // Start 
-  
+    // '=', 'S', 'T', 'A'
+    octet major_version;
+    octet minor_version;
+    octet flags;
+    // bit 0 = byte order
+  };
+
+  // Acknowledge successful processing of
+  // Start
+
   struct StartReply
-  { 
+  {
     //    my_seq_char magic_number;
     char magic_number[4];
     // "=",'S','T','R'
-    octet flags; 
-    // bit 0 = byte order, 1 = exception 
-  }; 
-  
-  // If the message_type in frameHeader is sequencedFrame 
-  // the the frameHeader will be followed by this 
-  // (See also RTP note) 
-  
+    octet flags;
+    // bit 0 = byte order, 1 = exception
+  };
+
+  // If the message_type in frameHeader is sequencedFrame
+  // the the frameHeader will be followed by this
+  // (See also RTP note)
+
   struct sequencedFrame
-  { 
-    unsigned long sequence_num; 
-  }; 
-  // If the message_type is Frame then 
-  // the frameHeader is followed by this 
-  // See also RTP note 
-  
+  {
+    unsigned long sequence_num;
+  };
+  // If the message_type is Frame then
+  // the frameHeader is followed by this
+  // See also RTP note
+
   struct frame
-  { 
-    unsigned long timestamp; 
+  {
+    unsigned long timestamp;
     unsigned long synchSource;
     my_seq_ulong source_ids;
     unsigned long sequence_num;
@@ -105,9 +108,9 @@ module flowProtocol
   struct specialFrame
   {
     frameID context_id;
-    sequence<octet> context_data;
+    CORBA::OctetSeq context_data;
   };
-  
+
   struct credit
   {
     //    my_seq_char magic_number;
@@ -115,7 +118,7 @@ module flowProtocol
     // "=",'C','R','E'
     unsigned long cred_num;
   };
-  
+
 };
 
 #endif /* TAO_SFP_IDL */
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
index a655165d7b4..9aa3215a760 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         RPS
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index c9e53f44635..b2de604c940 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -22,6 +22,7 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -54,7 +55,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -62,6 +67,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -101,6 +107,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -108,6 +115,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -152,6 +160,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 86f905dd6cd..1e85d70efd2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -30,7 +30,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_LB_LoadAlert;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ServerRequestInterceptor
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
index 208beaea6b2..afd8e97163f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         LBPerf
diff --git a/TAO/orbsvcs/performance-tests/Makefile.am b/TAO/orbsvcs/performance-tests/Makefile.am
index 5894891929f..15ab91dc242 100644
--- a/TAO/orbsvcs/performance-tests/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         LoadBalancing \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
index 6a73189d618..18d1be0bb26 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -2,7 +2,12 @@
 project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     driver.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
index f5d3f7f311f..252262f26b7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = driver
@@ -55,6 +56,7 @@ driver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index d407bdb827c..993016d8b47 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -130,7 +130,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       int thread_count = 1 + options.nthreads;
 
-      ACE_Barrier barrier (thread_count);
+      ACE_Barrier the_barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -186,7 +186,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ec_poa.in (),
           ec_poa.in (),
           ec.in (),
-          &barrier
+          &the_barrier
           ACE_ENV_ARG_PARAMETER);
 
       if (options.high_priority_is_last)
@@ -203,7 +203,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                ACE_ES_EVENT_UNDEFINED,
                                experiment_id,
                                high_priority_group.supplier (),
-                               &barrier);
+                               &the_barrier);
       high_priority_task.thr_mgr (&my_thread_manager);
       {
         // Artificial scope to wait for the high priority task...
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
index 6e38d73e285..a6681bf941c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -2,6 +2,10 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {    
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  }
   includes += ../lib
 
   Source_Files {
@@ -12,6 +16,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
+  
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  }
   includes += ../lib
 
   Source_Files {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
index 77af854fa9f..6b11a5b9d3a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -57,6 +58,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -64,6 +66,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -102,6 +105,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 5a1371e5124..81b2d8a34cc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -217,7 +217,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
     thread_count += nthreads;
 #endif
 
-  ACE_Barrier barrier (thread_count);
+  ACE_Barrier the_barrier (thread_count);
 
   ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
   ACE_High_Res_Timer::calibrate ();
@@ -241,7 +241,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
           this->poa_.in (),
           this->poa_.in (),
           this->event_channel_.in (),
-          &barrier
+          &the_barrier
           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 #endif
@@ -266,7 +266,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
                            ACE_ES_EVENT_UNDEFINED,
                            experiment_id,
                            high_priority_group.supplier (),
-                           &barrier);
+                           &the_barrier);
   {
     // Artificial scope to wait for the high priority task...
     Task_Activator<Send_Task> high_priority_act (this->rt_class_->priority_high (),
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
index 6aae28f7b48..c4a6b0c9764 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         lib \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index bff7d6c6d77..20203d89bb5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -22,6 +22,7 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -54,7 +55,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -62,6 +67,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -101,6 +107,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -108,6 +115,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -149,6 +157,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index f4bc27d0c4c..188d5276fd9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -12,7 +12,12 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -29,7 +34,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index bb887ff5393..ab1160e9c6b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -28,9 +28,9 @@ class Roundtrip_Task : public ACE_Task_Base
 {
 public:
   Roundtrip_Task (Test::Roundtrip_ptr roundtrip,
-                  ACE_Barrier *barrier)
+                  ACE_Barrier *the_barrier)
     : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-    , barrier_ (barrier)
+    , barrier_ (the_barrier)
   {
   }
 
@@ -64,11 +64,11 @@ class High_Priority_Task : public Roundtrip_Task
 {
 public:
   High_Priority_Task (Test::Roundtrip_ptr roundtrip,
-                      ACE_Barrier *barrier,
+                      ACE_Barrier *the_barrier,
                       int iterations,
                       int period_in_usecs,
                       int workload)
-    : Roundtrip_Task (roundtrip, barrier)
+    : Roundtrip_Task (roundtrip, the_barrier)
     , sample_history (iterations)
     , iterations_ (iterations)
     , period_in_usecs_ (period_in_usecs)
@@ -112,10 +112,10 @@ class Low_Priority_Task : public Roundtrip_Task
 {
 public:
   Low_Priority_Task (Test::Roundtrip_ptr roundtrip,
-                     ACE_Barrier *barrier,
+                     ACE_Barrier *the_barrier,
                      int period_in_usecs,
                      int workload)
-    : Roundtrip_Task (roundtrip, barrier)
+    : Roundtrip_Task (roundtrip, the_barrier)
     , stopped_ (0)
     , period_in_usecs_ (period_in_usecs)
     , workload_ (workload)
@@ -216,7 +216,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       int thread_count = 1 + options.nthreads;
-      ACE_Barrier barrier (thread_count);
+      ACE_Barrier the_barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -227,7 +227,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       int per_thread_period = options.low_priority_period;
       if (options.global_low_priority_rate)
         per_thread_period = options.low_priority_period * options.nthreads;
-      Low_Priority_Task low_priority (roundtrip.in (), &barrier,
+      Low_Priority_Task low_priority (roundtrip.in (), &the_barrier,
                                       per_thread_period,
                                       options.low_priority_workload);
       low_priority.activate (rt_class.thr_sched_class ()
@@ -235,7 +235,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                              options.nthreads, 1,
                              rt_class.priority_low ());
 
-      High_Priority_Task high_priority (roundtrip.in (), &barrier,
+      High_Priority_Task high_priority (roundtrip.in (), &the_barrier,
                                         options.iterations,
                                         options.high_priority_period,
                                         options.high_priority_workload);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index 6042f1d8488..6f0e6bbb713 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -22,6 +22,7 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -54,7 +55,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -62,6 +67,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -103,6 +109,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -110,6 +117,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -153,6 +161,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index 23e8fc37941..bfd1de34f68 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -11,7 +11,12 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -29,7 +34,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 5bbaf5407dd..f3612f5f197 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -34,9 +34,9 @@ class Roundtrip_Task : public ACE_Task_Base
 {
 public:
   Roundtrip_Task (Test::Session_Factory_ptr session_factory,
-                  ACE_Barrier *barrier)
+                  ACE_Barrier *the_barrier)
     : session_factory_ (Test::Session_Factory::_duplicate (session_factory))
-    , barrier_ (barrier)
+    , the_barrier_ (the_barrier)
   {
   }
 
@@ -44,7 +44,7 @@ public:
 
   virtual int svc (void)
   {
-    this->barrier_->wait ();
+    this->the_barrier_->wait ();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
       {
@@ -63,18 +63,18 @@ public:
 protected:
   Test::Session_Factory_var session_factory_;
 
-  ACE_Barrier *barrier_;
+  ACE_Barrier *the_barrier_;
 };
 
 class High_Priority_Task : public Roundtrip_Task
 {
 public:
   High_Priority_Task (Test::Session_Factory_ptr session_factory,
-                      ACE_Barrier *barrier,
+                      ACE_Barrier *the_barrier,
                       PortableServer::POA_ptr poa,
                       int iterations,
                       int period_in_usecs)
-    : Roundtrip_Task (session_factory, barrier)
+    : Roundtrip_Task (session_factory, the_barrier)
     , callback (new Callback (iterations, poa))
     , iterations_ (iterations)
     , period_in_usecs_ (period_in_usecs)
@@ -130,10 +130,10 @@ class Low_Priority_Task : public Roundtrip_Task
 {
 public:
   Low_Priority_Task (Test::Session_Factory_ptr session_factory,
-                     ACE_Barrier *barrier,
+                     ACE_Barrier *the_barrier,
                      PortableServer::POA_ptr poa,
                      int period_in_usecs)
-    : Roundtrip_Task (session_factory, barrier)
+    : Roundtrip_Task (session_factory, the_barrier)
     , callback (new Callback (1, poa))
     , stopped_ (0)
     , period_in_usecs_ (period_in_usecs)
@@ -268,7 +268,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       int thread_count = 1 + options.nthreads;
-      ACE_Barrier barrier (thread_count);
+      ACE_Barrier the_barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -280,7 +280,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (options.global_low_priority_rate)
         per_thread_period = options.low_priority_period * options.nthreads;
       Low_Priority_Task low_priority (session_factory.in (),
-                                      &barrier,
+                                      &the_barrier,
                                       the_poa.in (),
                                       per_thread_period);
       low_priority.activate (rt_class.thr_sched_class ()
@@ -289,7 +289,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                              rt_class.priority_low ());
 
       High_Priority_Task high_priority (session_factory.in (),
-                                        &barrier,
+                                        &the_barrier,
                                         the_poa.in (),
                                         options.iterations,
                                         options.high_priority_period);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index f6e7e5aae07..6a138d998ad 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -56,6 +57,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -63,6 +65,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -100,6 +103,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 5dbfbef5e54..1921fed616b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -2,7 +2,12 @@
 project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -12,7 +17,12 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 95d19c31d18..f9e1d7b1974 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -113,7 +113,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       int thread_count = 1 + options.nthreads;
 
-      ACE_Barrier barrier (thread_count);
+      ACE_Barrier the_barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -169,7 +169,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           the_poa.in (),
           the_poa.in (),
           ec.in (),
-          &barrier
+          &the_barrier
           ACE_ENV_ARG_PARAMETER);
 
       if (options.high_priority_is_last)
@@ -186,7 +186,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                ACE_ES_EVENT_UNDEFINED,
                                experiment_id,
                                high_priority_group.supplier (),
-                               &barrier);
+                               &the_barrier);
       high_priority_task.thr_mgr (&my_thread_manager);
       {
         // Artificial scope to wait for the high priority task...
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 15506aebe5e..ce147a0d92d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -56,6 +57,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -63,6 +65,7 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -100,6 +103,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
index 0e3056c157b..bded52788ee 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -2,7 +2,12 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -12,7 +17,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib 
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index 0969a1e427f..2186d839335 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -28,7 +28,7 @@ class Scavenger_Task : public ACE_Task_Base
 {
 public:
   Scavenger_Task (char const * endpoint,
-                  ACE_Barrier * barrier,
+                  ACE_Barrier * the_barrier,
                   int period_in_usecs);
 
   void stop(void);
@@ -37,7 +37,7 @@ public:
 
 private:
   char const * endpoint_;
-  ACE_Barrier * barrier_;
+  ACE_Barrier * the_barrier_;
   int period_in_usecs_;
   ACE_SYNCH_MUTEX mutex_;
   int stopped_;
@@ -47,7 +47,7 @@ class Measuring_Task : public ACE_Task_Base
 {
 public:
   Measuring_Task (char const * endpoint,
-                  ACE_Barrier *barrier,
+                  ACE_Barrier *the_barrier,
                   int iterations,
                   int period_in_usecs);
 
@@ -57,7 +57,7 @@ public:
 
 private:
   char const * endpoint_;
-  ACE_Barrier * barrier_;
+  ACE_Barrier * the_barrier_;
   int iterations_;
   int period_in_usecs_;
 };
@@ -78,19 +78,19 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
   int thread_count = 1 + options.nthreads;
-  ACE_Barrier barrier (thread_count);
+  ACE_Barrier the_barrier (thread_count);
 
   int per_thread_period = options.low_priority_period;
   if (options.global_low_priority_rate)
     per_thread_period = options.low_priority_period * options.nthreads;
 
-  Scavenger_Task lo_task (lo_endpoint, &barrier,
+  Scavenger_Task lo_task (lo_endpoint, &the_barrier,
                           per_thread_period);
   lo_task.activate (rt_class.thr_sched_class () | THR_NEW_LWP | THR_JOINABLE,
                     options.nthreads, 1,
                     rt_class.priority_low ());
 
-  Measuring_Task hi_task (hi_endpoint, &barrier,
+  Measuring_Task hi_task (hi_endpoint, &the_barrier,
                           options.iterations,
                           options.high_priority_period);
   hi_task.activate (rt_class.thr_sched_class () | THR_NEW_LWP | THR_JOINABLE,
@@ -122,10 +122,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 // ****************************************************************
 
 Scavenger_Task::Scavenger_Task(char const * endpoint,
-                               ACE_Barrier * barrier,
+                               ACE_Barrier * the_barrier,
                                int period_in_usecs)
   : endpoint_ (endpoint)
-  , barrier_ (barrier)
+  , the_barrier_ (the_barrier)
   , period_in_usecs_ (period_in_usecs)
   , mutex_ ()
   , stopped_ (0)
@@ -142,7 +142,7 @@ Scavenger_Task::stop(void)
 int
 Scavenger_Task::svc(void)
 {
-  this->barrier_->wait ();
+  this->the_barrier_->wait ();
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting scavenger thread\n"));
 
   ACE_SOCK_Stream stream;
@@ -194,12 +194,12 @@ Scavenger_Task::svc(void)
 // ****************************************************************
 
 Measuring_Task::Measuring_Task (char const * endpoint,
-                                ACE_Barrier * barrier,
+                                ACE_Barrier * the_barrier,
                                 int iterations,
                                 int period_in_usecs)
   : sample_history (iterations)
   , endpoint_(endpoint)
-  , barrier_(barrier)
+  , the_barrier_(the_barrier)
   , iterations_ (iterations)
   , period_in_usecs_ (period_in_usecs)
 {
@@ -208,7 +208,7 @@ Measuring_Task::Measuring_Task (char const * endpoint,
 int
 Measuring_Task::svc ()
 {
-  this->barrier_->wait ();
+  this->the_barrier_->wait ();
 
   ACE_SOCK_Stream stream;
   {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
index 786dc52bfcd..677d68719d5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
@@ -18,6 +18,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter<char>;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 /// Parse the command-line client_options for the tests.
 /**
  * Note that some of the tests ignore some of the client_options, but it is
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
index e5aacff5db8..e6f5315abd0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -19,7 +19,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class RT_Class;
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Basic_Stats;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class Low_Priority_Setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
index 5cd875fdb43..e4a9190f3be 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -21,6 +21,7 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -166,6 +167,7 @@ noinst_HEADERS = \
   rtec_perf_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
index f3bebdd0188..64645bcbf18 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
@@ -18,7 +18,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_EC_Event_Channel;
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 class RTCORBA_Setup;
 
 /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
index 4e7284bea6c..318bb24e2aa 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -18,7 +18,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class Send_Task
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
index e82e1a6dfb1..8a7311e2ae6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Asynch_Three_Stage_Dist.am
 
-noinst_PROGRAMS = distributer
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -33,15 +37,21 @@ distributer_SOURCES = \
 
 distributer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Asynch_Three_Stage_Recv.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -60,15 +70,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Asynch_Three_Stage_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -87,13 +103,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
index dc231d1e091..7bf11f4dad7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Bidirectional_Flows_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Bidirectional_Flows_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -56,13 +66,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
index 6fd64befbb9..c003c046e46 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Component_Switching_Dist.am
 
-noinst_PROGRAMS = distributer
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -34,15 +38,21 @@ distributer_SOURCES = \
 distributer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Component_Switching_Recv.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -62,15 +72,21 @@ receiver_SOURCES = \
 receiver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Component_Switching_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -90,13 +106,17 @@ sender_SOURCES = \
 sender_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 76531078f4e..9aa2db8b1c0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -107,7 +107,7 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
        i++)
     {
       TAO_Forward_FlowSpec_Entry entry;
-      entry.parse (flowspec[i].in ());
+      entry.parse (flowspec[i]);
 
       //if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index d139e6f50f1..b1a6c0ee29a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -61,7 +61,7 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
        i++)
     {
       TAO_Forward_FlowSpec_Entry entry;
-      entry.parse (flowspec[i].in ());
+      entry.parse (flowspec[i]);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Handle Conection Requested flowname %s \n",
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 7170838c7c6..f5d4bff2bb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -110,7 +110,7 @@ Sender_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &flowspec)
        i++)
     {
       TAO_Forward_FlowSpec_Entry entry;
-      entry.parse (flowspec[i].in ());
+      entry.parse (flowspec[i]);
 
       ACE_CString flowname (entry.flowname ());
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
index b3189a2db61..3db5feff051 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Full_Profile_Ftp.am
 
-noinst_PROGRAMS = ftp
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Full_Profile_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -56,13 +66,17 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
index aaafa1ae1f0..20caef1661f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Latency_Cntl.am
 
-noinst_PROGRAMS = control
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += control
 
 control_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -33,15 +37,21 @@ control_SOURCES = \
 control_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Latency_Ping.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += ping
 
 ping_CPPFLAGS = \
@@ -59,15 +69,21 @@ ping_SOURCES = \
 ping_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Latency_Pong.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += pong
 
 pong_CPPFLAGS = \
@@ -85,13 +101,17 @@ pong_SOURCES = \
 pong_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
index aec144e3e5e..6f3ac2f1651 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Asynch_Three_Stage \
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
index 5c76b7a2a63..d4640caa093 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Modify_QoS_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Modify_QoS_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -56,13 +66,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
index 530a667e965..5027e738f6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Multicast_Ftp.am
 
-noinst_PROGRAMS = ftp
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -32,15 +36,21 @@ ftp_SOURCES = \
 ftp_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Multicast_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -58,13 +68,17 @@ server_SOURCES = \
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
index 2f937ebaf28..96a3601c4ce 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Multicast_Full_Profile_Ftp.am
 
-noinst_PROGRAMS = ftp
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Multicast_Full_Profile_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -56,13 +66,17 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
index 2a113649e1d..5db84134548 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Multiple_Flows_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Multiple_Flows_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -56,13 +66,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
index fe79de1bd83..23de00a8320 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Pluggable_Ftp.am
 
-noinst_PROGRAMS = ftp
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Pluggable_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -56,13 +66,17 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
index 177bb2529c8..b97da09530e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -56,15 +66,21 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_LTLIBRARIES = libTAO_TS.la
 
 libTAO_TS_la_CPPFLAGS = \
@@ -82,6 +98,8 @@ libTAO_TS_la_SOURCES = \
 noinst_HEADERS = \
   TimeStamp.h
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
index 81b5d08cd5c..b3e89ef417b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Simple_Three_Stage_Dist.am
 
-noinst_PROGRAMS = distributer
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ distributer_SOURCES = \
 
 distributer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Simple_Three_Stage_Recv.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -56,15 +66,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Simple_Three_Stage_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -81,13 +97,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
index 9ff7081788e..e4180cd8e0b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Simple_Two_Stage_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -34,15 +38,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Simple_Two_Stage_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -60,13 +70,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
index 9991f5eec28..0f573502d0c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
@@ -6,16 +6,20 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am
 
-noinst_PROGRAMS = receiver
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -31,15 +35,21 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -56,13 +66,17 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
index c89bbd54ce9..5be780ed678 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
index 85443a6b15b..e583ef1d567 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
index f3e6efbe608..b0af6b32252 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index eb9a7b96371..a573a085978 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -24,9 +24,9 @@ int ACE_TMAIN(int argc, ACE_TCHAR** argv)
 
 
       CORBA::ContainedSeq_var interfaces =
-                  repo_->contents (   CORBA::dk_Interface,    // Any type of contained object.
-                                      1                       // Exclude parents of interfaces.
-                                      ACE_ENV_ARG_PARAMETER);
+                  repo_->contents (CORBA::dk_Interface,    // Any type of contained object.
+                                   1                       // Exclude parents of interfaces.
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = interfaces->length ();
@@ -40,7 +40,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR** argv)
       CORBA::ULong first_one = 0;
 
       CORBA::InterfaceDef_var the_interface =
-            CORBA::InterfaceDef::_narrow (interfaces[first_one].in ()
+            CORBA::InterfaceDef::_narrow (interfaces[first_one]
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
index 0302979c756..9ae6193fc61 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Bug_1395_Regression_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
index 93b6484e6ed..a896cd99666 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
index 156a2f3583d..2d5d4b4e89f 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
@@ -50,6 +51,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index a95dc8ad9db..2326f722c53 100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -5,6 +5,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 #include "tao/corba.h"
+#include "tao/PI/PI.h"
 
 CORBA::ORB_var orb = CORBA::ORB::_nil ();
 
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
index 011806dfc29..654f6beebb4 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,11 +50,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Bug_2247_Regression_Manager.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Manager
@@ -90,6 +94,7 @@ Manager_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index cb7497ab800..215f6b349be 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -9,8 +9,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
 
 // Files which have the IOR
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
index 654f852076f..244772c3c63 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -67,11 +67,16 @@ tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl \
+  tests.idl
+
 ## Makefile.Bug_2248_Regression_Client.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -107,6 +112,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -116,6 +122,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -159,6 +166,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 33dc40e671e..629830580d0 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -7,8 +7,8 @@
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
 
 // Files which have the IOR
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am
index 76eaee8c0fc..d73d8319cc3 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -43,9 +43,9 @@ CC_client_SOURCES = \
 CC_client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
index 645efe41c5f..4677afe69e4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 0fce694b649..642435bb061 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -118,7 +118,7 @@ run_test (PortableServer::POA_ptr poa,
   ACE_NEW (consumer, CEC_Counting_Consumer*[n]);
   ACE_NEW (supplier, CEC_Counting_Supplier*[n]);
 
-  int i;
+  int i = 0;
   for (i = 0; i != n; ++i)
     {
       char consumer_name[64];
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index 2065860ebb8..87f5e92c38e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -4,5 +4,10 @@
 project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable {
   after    += CosEvent_Test_Lib
   libs     += CECTests
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am
index 23c08080066..19f692f256b 100644
--- a/TAO/orbsvcs/tests/CosEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         lib \
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
index 140039c09b1..a9b61c7c29f 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index d0e3410d7f6..a73bce90105 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -11,6 +11,7 @@ project(*IDL): rteventexe, rtsched, naming, iortable, messaging {
 }
 
 project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging {
+  avoids  += ace_for_tao
   exename  = ECM_Supplier
   Source_Files {
     ECM_Data.cpp
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
index 3768529cc23..bd97480abd1 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,6 +52,9 @@ data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  data.idl
+
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECM_Consumer.am
@@ -96,6 +99,7 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.ECM_Supplier.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECM_Supplier
 
@@ -131,6 +135,7 @@ ECM_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
index d32146f4edd..73788961680 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging {
+project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging, strategies {
   exename  = MCast
 }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index c5eb14c556d..c61ffba80fc 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -11,6 +11,7 @@
 #include "orbsvcs/Event/ECG_UDP_Sender.h"
 #include "orbsvcs/Event/ECG_UDP_Receiver.h"
 #include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "tao/Strategies/advanced_resource.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
index 0a53aee46bb..550d53a525c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_MT_Mcast.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
 
@@ -38,6 +39,7 @@ MCast_SOURCES = \
   Supplier.h
 
 MCast_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
@@ -51,6 +53,7 @@ MCast_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
index 904ca3d2fc8..0ccaf9b3f72 100755
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
@@ -22,10 +22,22 @@ $T1 = new PerlACE::Process ("MCast",
 $T2 = new PerlACE::Process ("MCast",
                             "-m $mcast_address -ORBSvcConf $svc_conf");
 
-$T1->Spawn ();
-$T2->Spawn ();
+$sp1 = $T1->Spawn ();
 
-$test1 = $T1->WaitKill (600);
+if ($sp1 != 0) {
+    print STDERR "ERROR: could not spawn MCast, returned $sp1\n";
+    exit 1;
+}
+
+@sp2 = $T2->Spawn ();
+
+if ($sp2 != 0) {
+    print STDERR "ERROR: could not spawn MCast, returned $sp2\n";
+    $T1->Kill ();
+    exit 1;
+}
+
+$test1 = $T1->WaitKill (300);
 
 if ($test1 != 0) {
     print STDERR "ERROR: test 1 returned $test1\n";
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf b/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
index f4f08f6b40b..c6fce32e1bc 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/svc.conf
@@ -2,4 +2,4 @@
 static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFiltering per-supplier"
 static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread"
-dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
+static Advanced_Resource_Factory "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index c32227f6770..0ded4dafb07 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Mcast.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Mcast
 
@@ -47,6 +48,7 @@ EC_Mcast_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
index 21219bb625c..7bfd35e6fcf 100755
--- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
@@ -21,8 +21,20 @@ $T2 = new PerlACE::Process ("EC_Mcast",
                             "-c $sample_cfg -ORBSvcConf $svc_conf "
                             . "-n 100 -t 50000 -f Set02");
 
-$T1->Spawn ();
-$T2->Spawn ();
+$sp1 = $T1->Spawn ();
+
+if ($sp1 != 0) {
+    print STDERR "ERROR: could not spawn EC_MCast, returned $sp1\n";
+    exit 1;
+}
+
+$sp2 = $T2->Spawn ();
+
+if ($sp2 != 0) {
+    print STDERR "ERROR: could not spawn EC_MCast, returned $sp2\n";
+    $T1->Kill ();
+    exit 1;
+}
 
 $test1 = $T1->WaitKill (60);
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
index ad74286d635..0f1ad4410cc 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Multiple.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Multiple
 
@@ -53,6 +54,7 @@ EC_Multiple_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 4b72bb9906b..1debc666c37 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -12,13 +12,17 @@
 #ifndef ECT_DRIVER_H
 #define ECT_DRIVER_H
 
+#include "tao/orbconf.h"
 #include "ace/Stats.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Environment;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 class ECT_Driver
 {
   //
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index 8eff053fc67..ebbb7c450a8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(ECT Supplier): rteventexe, rtevent, rtsched, naming, iortable, messaging {
+  avoids += ace_for_tao
   exename = ECT_Supplier
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 6b0948a4864..170b9b086cd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -58,6 +58,7 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.ECT_Supplier.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECT_Supplier
 
@@ -93,11 +94,13 @@ ECT_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECT_Throughput.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECT_Throughput
 
@@ -136,6 +139,7 @@ ECT_Throughput_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 8cbcfa4c368..3d1b701984a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -16,7 +16,9 @@
 #include "Driver.h"
 #include "orbsvcs/RtecUDPAdminS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_INET_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
index 0bfc80aa48a..b68828bdc89 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Event_Basic_Atomic_Reconnect.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Atomic_Reconnect
 
@@ -51,11 +52,13 @@ Atomic_Reconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_BCast.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += BCast
 
@@ -89,11 +92,13 @@ BCast_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Bitmask.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Bitmask
 
@@ -135,11 +140,13 @@ Bitmask_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Complex.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Complex
 
@@ -181,11 +188,13 @@ Complex_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Control.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Control
 
@@ -219,11 +228,13 @@ Control_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Disconnect
 
@@ -265,11 +276,13 @@ Disconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Gateway.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Gateway
 
@@ -311,11 +324,13 @@ Gateway_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_MT_Disconnect.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += MT_Disconnect
 
@@ -349,11 +364,13 @@ MT_Disconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Negation.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Negation
 
@@ -395,11 +412,13 @@ Negation_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Observer.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Observer
 
@@ -433,11 +452,13 @@ Observer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Random.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Random
 
@@ -471,11 +492,13 @@ Random_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Reconnect.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Reconnect
 
@@ -509,11 +532,13 @@ Reconnect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Shutdown.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Shutdown
 
@@ -547,11 +572,13 @@ Shutdown_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Timeout.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Timeout
 
@@ -593,11 +620,13 @@ Timeout_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Basic_Wildcard.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Wildcard
 
@@ -639,6 +668,7 @@ Wildcard_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
index b1e00841286..63ef09376f3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
@@ -4,5 +4,10 @@
 project : messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 }
diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am
index cc11c3318df..ad70d16ed4e 100644
--- a/TAO/orbsvcs/tests/Event/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Mcast \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 4ec7bdbb1a4..20031f40dc1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -12,7 +12,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_EC_Event_Channel;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class EC_Wrapper
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
index 371db182d37..27940a1cb2b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.ECMcastTests_lib.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECMcastTests.la
 
@@ -38,6 +39,7 @@ noinst_HEADERS = \
   EC_Wrapper.h \
   Gateway_EC.h
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index 92a78dbc85e..ee053554cb1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -4,7 +4,13 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = supplier
 
   Source_Files {
@@ -15,7 +21,13 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = consumer
 
   Source_Files {
@@ -26,11 +38,16 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
     gateway-ec.cpp
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
index 4056db11b5f..1b52b4fb3bd 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Complex_Consumer.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
 
@@ -50,11 +51,13 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Complex_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
 
@@ -87,11 +90,13 @@ gateway_ec_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Complex_Supplier.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += supplier
 
@@ -124,6 +129,7 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
index 86f91b490ee..8633ab9fcef 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Common \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
index 80709140dcb..617b25f0ec2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Simple_Consumer.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
 
@@ -50,11 +51,13 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Simple_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
 
@@ -87,11 +90,13 @@ gateway_ec_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Simple_Supplier.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += supplier
 
@@ -124,6 +129,7 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index a50e8101f2c..ee053554cb1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -4,7 +4,13 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = supplier
 
   Source_Files {
@@ -13,9 +19,15 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 }
 
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
-  after  += ECMcastTests_Lib
+  after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = consumer
 
   Source_Files {
@@ -26,11 +38,16 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
     gateway-ec.cpp
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
index 9ed902fb367..9ad215d370a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Two_Way_Application.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += application
 
@@ -50,11 +51,13 @@ application_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Two_Way_Gateway_Ec.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += gateway-ec
 
@@ -87,6 +90,7 @@ gateway_ec_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index cc30efcf4de..48da30505d0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -4,7 +4,13 @@
 project(*application): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = application
 
   Source_Files {
@@ -15,7 +21,13 @@ project(*application): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 3b6880e36b5..96a182baa25 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -25,7 +25,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Sample_History;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Simple consumer, receives events and record roundtrip delays.
 class EC_Latency_Consumer : public POA_RtecEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
index 22889225457..b37e6f11b58 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Event_Performance_Connect.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Connect
 
@@ -51,11 +52,13 @@ Connect_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Inversion.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Inversion
 
@@ -89,11 +92,13 @@ Inversion_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Latency.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Latency
 
@@ -128,11 +133,13 @@ Latency_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Latency_Server
 
@@ -170,11 +177,13 @@ Latency_Server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Event_Performance_Throughput.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Throughput
 
@@ -208,6 +217,7 @@ Throughput_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index f737ae537ba..67e95079156 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -4,6 +4,10 @@
 project: messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-  includes += ../lib
-}
 
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
+}
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 4ff4a1cffbe..31ac5df863e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -24,7 +24,10 @@
 #include "ace/Stats.h"
 #include "ace/Task.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_EC_Event_Channel_Attributes;
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 class TAO_Module_Factory;
 class EC_Consumer;
 class EC_Supplier;
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am
index 267242ae0ba..af04cdea2c4 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Test_Lib.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECTests.la
 
@@ -45,6 +46,7 @@ noinst_HEADERS = \
   Supplier.h \
   ectest_export.h
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 6b58f67c9ce..728d1e885ac 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -382,7 +382,7 @@ int FTClientMain::pass (
         }
         case 'S':
         {
-          if (state.in () != 0)
+          if (state->length () > 0)
           {
             if (this->verbose_ >= LOUD)
             {
@@ -412,7 +412,7 @@ int FTClientMain::pass (
         }
         case 'U':
         {
-          if (update.in () != 0)
+          if (update->length () > 0)
           {
             if (this->verbose_ >= LOUD)
             {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 912746e0fdb..14e2664fda9 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -14,9 +14,11 @@
 
 #ifndef FT_CREATOR_H
 #define FT_CREATOR_H
-#include <ace/ACE.h>
+
 #include /**/ "ace/pre.h"
 
+#include <ace/ACE.h>
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am
index af3e34c28b2..56c7968aa7a 100644
--- a/TAO/orbsvcs/tests/FT_App/Makefile.am
+++ b/TAO/orbsvcs/tests/FT_App/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -23,6 +23,7 @@ noinst_PROGRAMS =
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_analyzer
@@ -68,6 +69,7 @@ ft_analyzer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -104,11 +106,15 @@ FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  FT_TestReplica.idl
+
 ## Makefile.FT_App_Client.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_client
@@ -156,6 +162,7 @@ ft_client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -165,6 +172,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_create
@@ -205,6 +213,7 @@ ft_create_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -214,6 +223,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_registry
@@ -251,6 +261,7 @@ ft_registry_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -260,6 +271,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_fault_consumer
@@ -302,6 +314,7 @@ ft_fault_consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -311,6 +324,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_notifier
@@ -350,6 +364,7 @@ ft_notifier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -359,6 +374,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += replmgr_controller
@@ -405,6 +421,7 @@ replmgr_controller_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -414,6 +431,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_replica
@@ -457,6 +475,7 @@ ft_replica_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 5bf6c6aae58..2d3128b96d1 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -25,6 +25,7 @@
 #include <ace/SString.h>
 #include <ace/Vector_T.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class Object_Group_Creator
@@ -104,5 +105,6 @@ namespace TAO
   };
 
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // TAO_OBJECT_GROUP_CREATOR_H
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
index 58964b1cebd..b45a7aac512 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,11 +50,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.GroupRef_Manipulation_Client.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -92,6 +96,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -101,6 +106,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -142,6 +148,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
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 00fffe1a363..fe39a7dc7b6 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -24,6 +24,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 void
+Server_Request_Interceptor::reset (ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->request_count_ = 0;
+  this->forward_request_thrown_ = false;
+}
+
+void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
   CORBA::Object_ptr obj2
@@ -37,8 +45,22 @@ Server_Request_Interceptor::forward_references (
                    EINVAL),
                  CORBA::COMPLETED_NO));
 
-  this->obj_[0] = CORBA::Object::_duplicate (obj1);
-  this->obj_[1] = CORBA::Object::_duplicate (obj2);
+  char *argv[] = {NULL};
+  int   argc = 0;
+  
+  // Fetch the ORB having been initialized in main()
+  CORBA::ORB_var orb =
+    CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  CORBA::String_var str1 = orb->object_to_string (obj1 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  CORBA::String_var str2 = orb->object_to_string (obj2 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->obj_[0] = orb->string_to_object (str1.in () ACE_ENV_ARG_PARAMETER);
+  this->obj_[1] = orb->string_to_object (str2.in () ACE_ENV_ARG_PARAMETER);
 }
 
 char *
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 554d85d203a..d8a5ce664cf 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -55,6 +55,11 @@ public:
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Reset to initial state, like counter etc, keeps the object-references 
+  virtual void reset (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+
   /**
    * @name Methods Required by the Server Request Interceptor
    * Interface
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index b6723974f22..6057d7b5a50 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -64,6 +64,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      // Before and after the LOCATION_FORWARD_PERM the marshaled
+      // object reference must differ.
+
+      // Create a stringified/marshaled snapshot of Object reference
+      CORBA::String_var marshaled_obj_snapshot1 =
+          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+
       if (CORBA::is_nil (server.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -97,6 +104,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_OS::abort ();
         }
 
+      // One of the request triggerd a LOCATION_FORWARD_PERM, in
+      // consequence the marshaled representation of "server" should
+      // look different now, compare to snapshot1.
+      CORBA::String_var marshaled_obj_snapshot2 =
+          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+
+      if (strcmp (marshaled_obj_snapshot1.in (), marshaled_obj_snapshot2.in ()) == 0)
+        {
+          // Error, before and after the marhaled object references look equal
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) ERROR: Marshaled Object reference should differ after LOCATION_FORWARD_PERM\n"));
+          ACE_OS::abort ();
+        }
+
       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
index beadf9759da..f154942bbb7 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
@@ -24,6 +24,7 @@ module ForwardRequestTest
     void forward_references (in Object obj1,
                              in Object obj2);
 
+    void reset ();
   };
 
 };
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
index 187aeda3758..827bd93eee1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,11 +50,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.FaultTolerance_IOGR_Manager.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Manager
@@ -90,6 +94,7 @@ Manager_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -99,6 +104,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -136,6 +142,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
index bc20626bce5..ffcaf97f714 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = IOGRTest
@@ -52,6 +53,7 @@ IOGRTest_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
index fb53dddc289..fdc9d775202 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         GroupRef_Manipulation \
diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
index 3aff623247d..ddd9e05b1a2 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += consumer
@@ -60,6 +61,7 @@ consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
@@ -69,6 +71,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += supplier
@@ -109,6 +112,7 @@ supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index b286fd96926..dd9897ca66c 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -19,8 +19,6 @@
 #include "ace/Reactor.h"
 #include "ace/Time_Value.h"
 
-class ACE_Reactor;
-
 class PushSupplier_impl :
    public virtual ACE_Event_Handler
  , public virtual POA_RtecEventComm::PushSupplier
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
index 4172cd7f2bc..45ab7f82605 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  ami_test.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 6d45e1334b1..c4a9c06f609 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -117,7 +117,7 @@ public:
       number_of_replies--;
     };
 
-   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+   void foo_excep (::Messaging::ExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -126,7 +126,7 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -147,7 +147,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void get_yadda_excep (::Messaging::ExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -162,7 +162,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void set_yadda_excep (::Messaging::ExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index b66c6231b1d..e44e2b4a128 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -93,7 +93,7 @@ public:
         }
     };
 
-  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -103,7 +103,7 @@ public:
                                   "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
@@ -130,7 +130,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void get_yadda_excep (::Messaging::ExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -145,7 +145,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void set_yadda_excep (::Messaging::ExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
index e71ff1f5567..9ee33647b5a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.HTIOP_BiDirectional_Client.am
 
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
index 4e71c2e0fdb..62a3b28a230 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.HTIOP_Hello_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/orbsvcs/tests/HTIOP/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Makefile.am
index 1664d473a28..8493fa2444c 100644
--- a/TAO/orbsvcs/tests/HTIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMI \
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index 04b218fd78e..960ceea80d7 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -1,4 +1,4 @@
-// -*- C++ -*- 
+// -*- C++ -*-
 
 
 // ============================================================================
@@ -311,13 +311,9 @@ randomize (int array[], size_t size)
 
 typedef ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> ace_file_stream;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 #endif /* ACE_TEST_CONFIG_H */
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
index e9e87700b63..b3b7823697e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ MCast-stamp: $(srcdir)/MCast.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  MCast.idl
+
 ## Makefile.IOR_MCast_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index 47272f557d2..848b239d9ee 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -47,7 +47,8 @@ project(nestea_idl): taoidldefaults {
 }
 
 project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client {
-  after += nestea_idl
+  avoids += ace_for_tao
+  after  += nestea_idl
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
index 3e453817052..1d1a1acfaa7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -55,6 +55,9 @@ Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Airplane.idl
+
 ## Makefile.airplane_client.am
 
 if !BUILD_MINIMUM_CORBA
@@ -146,6 +149,9 @@ Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS += \
+  Nestea.idl
+
 ## Makefile.nestea_client.am
 
 if !BUILD_MINIMUM_CORBA
@@ -176,6 +182,7 @@ endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.nestea_server.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += nestea_server
@@ -204,6 +211,7 @@ nestea_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
index c5666334bc3..038d3a8f254 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index c11ca93dfef..db82e5938fa 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -143,44 +143,15 @@ sub nestea_test
     return $status;
 }
 
-###############################################################################
-# @todo: This test doesn't clean up too well if something fails
-
-sub nt_service_test
+sub nt_service_test_i
 {
-    my $result = 0;
-
-    # Just to show that it's possible, this test uses corbaloc instead of ior file.
-    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; 
-
-    # To avoid having to ensure that they LocalSystem account has the correct path
-    # we simply copy the imr executables to the same directory as the DLL's.
-    my $BIN_IMR_LOCATOR = new PerlACE::Process ("$ACE_ROOT/lib/ImplRepo_Service","");
-    my $BIN_IMR_ACTIVATOR = new PerlACE::Process ("$ACE_ROOT/lib/ImR_Activator","");
-    $BIN_IMR_LOCATOR->IgnoreExeSubDir(1);
-    $BIN_IMR_ACTIVATOR->IgnoreExeSubDir(1);
-
-    print "Copying ImplRepo services to the same location as the dlls.\n";
-    unlink $BIN_IMR_LOCATOR->Executable ();
-    copy ($IMR_LOCATOR->Executable (), $BIN_IMR_LOCATOR->Executable ());
-    unlink $BIN_IMR_ACTIVATOR->Executable ();
-    copy ($IMR_ACTIVATOR->Executable (), $BIN_IMR_ACTIVATOR->Executable ());
-
-    print "Stopping any existing TAO ImR Services\n";
-    system("net stop taoimractivator > nul 2>&1");
-    system("net stop taoimr > nul 2>&1");
-
-    print "Removing any existing TAO ImR Services\n";
-    $BIN_IMR_ACTIVATOR->Arguments ("-c remove");
-    $BIN_IMR_LOCATOR->Arguments ("-c remove");
-    $BIN_IMR_ACTIVATOR->SpawnWaitKill (5);
-    $BIN_IMR_LOCATOR->SpawnWaitKill (5);
+    my ($imr_initref, $BIN_IMR_ACTIVATOR, $BIN_IMR_LOCATOR) = @_;
 
     print "Installing TAO ImR Services\n";
     $BIN_IMR_ACTIVATOR->Arguments ("-c install $imr_initref -d 0");
     $BIN_IMR_LOCATOR->Arguments ("-c install -d 0 -orbendpoint iiop://:8888");
 
-    $result = $BIN_IMR_LOCATOR->SpawnWaitKill (5);
+    my $result = $BIN_IMR_LOCATOR->SpawnWaitKill (5);
     if ($result != 0) {
         print STDERR "ERROR: IMR Locator installation returned $result\n";
         return 1;
@@ -240,6 +211,41 @@ sub nt_service_test
         return 1;
     }
 
+    return 0;
+}
+
+sub nt_service_test
+{
+    my $result = 0;
+
+    # Just to show that it's possible, this test uses corbaloc instead of ior file.
+    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService";
+
+    # To avoid having to ensure that they LocalSystem account has the correct path
+    # we simply copy the imr executables to the same directory as the DLL's.
+    my $BIN_IMR_LOCATOR = new PerlACE::Process ("$ACE_ROOT/lib/ImplRepo_Service","");
+    my $BIN_IMR_ACTIVATOR = new PerlACE::Process ("$ACE_ROOT/lib/ImR_Activator","");
+    $BIN_IMR_LOCATOR->IgnoreExeSubDir(1);
+    $BIN_IMR_ACTIVATOR->IgnoreExeSubDir(1);
+
+    print "Copying ImplRepo services to the same location as the dlls.\n";
+    unlink $BIN_IMR_LOCATOR->Executable ();
+    copy ($IMR_LOCATOR->Executable (), $BIN_IMR_LOCATOR->Executable ());
+    unlink $BIN_IMR_ACTIVATOR->Executable ();
+    copy ($IMR_ACTIVATOR->Executable (), $BIN_IMR_ACTIVATOR->Executable ());
+
+    print "Stopping any existing TAO ImR Services\n";
+    system("net stop taoimractivator > nul 2>&1");
+    system("net stop taoimr > nul 2>&1");
+
+    print "Removing any existing TAO ImR Services\n";
+    $BIN_IMR_ACTIVATOR->Arguments ("-c remove");
+    $BIN_IMR_LOCATOR->Arguments ("-c remove");
+    $BIN_IMR_ACTIVATOR->SpawnWaitKill (5);
+    $BIN_IMR_LOCATOR->SpawnWaitKill (5);
+
+    $result = nt_service_test_i ($imr_initref, $BIN_IMR_ACTIVATOR, $BIN_IMR_LOCATOR);
+
     print "Stopping TAO Implementation Repository Service\n";
     system("net stop taoimractivator 2>&1");
     system("net stop taoimr 2>&1");
@@ -254,7 +260,7 @@ sub nt_service_test
     unlink $BIN_IMR_ACTIVATOR->Executable ();
     unlink $BIN_IMR_LOCATOR->Executable ();
 
-    return 0;
+    return $result;
 }
 
 ###############################################################################
@@ -286,7 +292,7 @@ sub airplane_ir_test
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     # Can use update to add servers.
-    $TAO_IMR->Arguments ("$imr_initref update airplane_server -c \"" 
+    $TAO_IMR->Arguments ("$imr_initref update airplane_server -c \""
 			 . $A_SVR->Executable ()
       . " -o $airplane_ior \"");
 
@@ -442,15 +448,15 @@ sub nestea_ir_test
         $status = 1;
     }
 
-    # This should destroy the POA, causing another to be created the next time 
-    # the server is spawned. 
+    # This should destroy the POA, causing another to be created the next time
+    # the server is spawned.
     $TAO_IMR->Arguments ("$imr_initref remove nestea_server");
     $result = $TAO_IMR->SpawnWaitKill (10);
     if ($result != 0) {
         print STDERR "ERROR: tao_imr 1 returned $result\n";
         $status = 1;
     }
-    
+
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TAO_IMR->Arguments ("$imr_initref add nestea_server -c \""
                          . $N_SVR->Executable ()
@@ -463,7 +469,7 @@ sub nestea_ir_test
         $IMR_LOCATOR->Kill ();
         return 1;
     }
-    
+
     # This should cause the activator to spawn another server.
     $result = $N_CLI->SpawnWaitKill (20);
     if ($result != 0) {
@@ -534,9 +540,9 @@ sub perclient
         $IMR_LOCATOR->Kill ();
         return 1;
     }
-    
+
     $N_CLI->Arguments("-k corbaloc::localhost:8888/nestea_server");
-    
+
     # Running the client should start a server instance
     $result = $N_CLI->SpawnWaitKill (10);
     if ($result != 0) {
@@ -551,7 +557,7 @@ sub perclient
     }
 
     unlink $nestea_ior;
-    
+
     $N_CLI->Arguments("-s -k corbaloc::localhost:8888/nestea_server");
 
     # Running the client again should start another server instance
@@ -570,7 +576,7 @@ sub perclient
     # Note : We have to wait long enough for the first server to self-destruct
     # or it will print out an exception when it can't notify the imr of its shutdown.
     sleep 10;
-        
+
     my $implrepo = $IMR_ACTIVATOR->TerminateWaitKill (5);
     if ($implrepo != 0) {
         print STDERR "ERROR: IMR_Activator returned $implrepo\n";
@@ -596,7 +602,7 @@ sub shutdown_repo
     my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
     unlink "test.repo";
-    
+
     # Specify an endpoint so that we can restart on the same port.
     # Specify persistence so that we can test that shutdown-repo -a works after reconnect
     $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior");
@@ -641,7 +647,7 @@ sub shutdown_repo
       $IMR_LOCATOR->Kill ();
       return 1;
     }
-    
+
     $TAO_IMR->Arguments ("$imr_initref shutdown-repo -a");
     $result = $TAO_IMR->SpawnWaitKill (5);
     if ($result != 0) {
@@ -664,7 +670,7 @@ sub shutdown_repo
     }
 
     unlink "test.repo";
-    
+
     return $status;
 }
 
@@ -701,10 +707,10 @@ sub persistent_ir_test
     # Copy the server to a path with spaces to ensure that these
     # work corrrectly.
     copy ($A_SVR->Executable(), $P_SVR->Executable());
-    chmod(0755, $P_SVR->Executable()); 
+    chmod(0755, $P_SVR->Executable());
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
-    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" 
+    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \""
         . '\"' . $P_SVR->Executable() . '\"' . "\" " . $refstyle);
     $result = $TAO_IMR->SpawnWaitKill (10);
 
@@ -718,7 +724,7 @@ sub persistent_ir_test
     ## This will write out the imr-ified IOR. Note : If you don't use -orbendpoint
     ## when starting the ImR, then this IOR will no longer be valid when the ImR
     ## restarts below. You can fix this by creating a new valid IOR, or starting
-    ## the ImR on a consistent endpoint. 
+    ## the ImR on a consistent endpoint.
     $A_SVR->Arguments ("-o $airplane_ior -ORBUseIMR 1 $refstyle $imr_initref");
     $A_SVR->Spawn ();
     if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
@@ -827,7 +833,7 @@ sub persistent_ir_test
     unlink $imr_activator_ior;
     unlink $airplane_ior;
 
-    return 0;   
+    return 0;
 }
 
 ###############################################################################
@@ -860,7 +866,7 @@ sub both_ir_test
     ## Note : It's crucial NOT to write out an IOR file when the activator
     ## starts the server, or at least to write out a different file name
     ## than the IOR files we're using for the clients. Otherwise a client
-    ## may attempt to use a partially written file. 
+    ## may attempt to use a partially written file.
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TAO_IMR->Arguments ("$imr_initref add nestea_server -c \""
 			 . $N_SVR->Executable ()
@@ -868,7 +874,7 @@ sub both_ir_test
     $TAO_IMR->SpawnWaitKill (10);
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
-    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" 
+    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \""
 			 . $A_SVR->Executable ()
        . " $refstyle\"");
     $TAO_IMR->SpawnWaitKill (10);
@@ -883,7 +889,7 @@ sub both_ir_test
         $N_SVR->Kill ();
         return 1;
     }
-    
+
     $A_SVR->Arguments (" -o $airplane_ior -ORBUseIMR 1 $imr_initref $refstyle");
     $A_SVR->Spawn ();
     if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
@@ -912,8 +918,8 @@ sub both_ir_test
     $TAO_IMR->Arguments ("$imr_initref shutdown airplane_server");
     $TAO_IMR->SpawnWaitKill (15);
 
-    $A_SVR->WaitKill();
-    $N_SVR->WaitKill();
+    $A_SVR->WaitKill(1);
+    $N_SVR->WaitKill(1);
 
     print "\n\n\n\n## Spawning multiple simultaneous clients with no servers running.\n";
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
index 596b67988b7..09395d6431b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.scaletest_client.am
 
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
index 7560baf4355..ed7e585eaab 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index ee38e71a861..7952549b52f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -181,7 +181,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       candidate =
-        CORBA::Container::_narrow (candidates[i].in ()
+        CORBA::Container::_narrow (candidates[i]
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN(-1);
 
@@ -218,7 +218,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
           this->target_def_ =
-            CORBA::InterfaceDef::_narrow (interfaces[j].in ()
+            CORBA::InterfaceDef::_narrow (interfaces[j]
                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN(-1);
         }
@@ -249,7 +249,7 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
       if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
         {
           this->op_ =
-            CORBA::OperationDef::_narrow (operations[i].in ()
+            CORBA::OperationDef::_narrow (operations[i]
                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
index e68556a58cc..34c2f1abb7d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 63339a65982..b0652fe8484 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -6,8 +6,8 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Application_Test, 
-           ifr_dii_client, 
+ACE_RCSID (Application_Test,
+           ifr_dii_client,
            "$Id$")
 
 // All the magic quantities are here at the top.
@@ -31,7 +31,7 @@ const CORBA::ULong ATTRS_LEN = 1;
 const CORBA::ULong OPS_LEN = 1;
 const CORBA::ULong FACTORY_LEN = 2;
 
-const char *ATTR_LOCAL_NAMES[] = 
+const char *ATTR_LOCAL_NAMES[] =
   {
     "c_attr1"
   };
@@ -73,14 +73,14 @@ const char *PARAM_NAMES[] =
     "outarg"
   };
 
-const CORBA::ULong OP_EXCEP_LEN[] = 
+const CORBA::ULong OP_EXCEP_LEN[] =
   {
     2
   };
 
 const CORBA::ULong COMP_SUPPORTED_LEN = 2;
 
-const char *COMP_SUPPORTED_IDS[] = 
+const char *COMP_SUPPORTED_IDS[] =
   {
     "IDL:help/c_supp1:1.0",
     "IDL:help/c_supp2:1.0"
@@ -152,7 +152,7 @@ const char *CONSUMES_IDS[] =
 
 const CORBA::ULong VT_SUPPORTED_LEN = 2;
 
-const char *VT_SUPPORTED_IDS[] = 
+const char *VT_SUPPORTED_IDS[] =
   {
     "IDL:help/v_supp1:1.0",
     "IDL:help/v_supp2:1.0"
@@ -278,7 +278,7 @@ IDL3_Client::init (int argc,
                         -1);
     }
 
-  this->repo_ = 
+  this->repo_ =
     CORBA::ComponentIR::Repository::_narrow (obj.in ()
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -384,7 +384,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::String_var str = 
+  CORBA::String_var str =
     result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -418,7 +418,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::TypeCode_var comp_tc = 
+  CORBA::TypeCode_var comp_tc =
     comp_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -559,7 +559,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::ValueDef_var pkey = 
+  CORBA::ValueDef_var pkey =
     home->primary_key (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -657,7 +657,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
       return -1;
     }
 
-  CORBA::ExtValueDef_var evd = 
+  CORBA::ExtValueDef_var evd =
     CORBA::ExtValueDef::_narrow (result.in ()
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -766,7 +766,7 @@ IDL3_Client::component_attribute_test (
           return -1;
         }
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -872,10 +872,10 @@ IDL3_Client::component_inheritance_test (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), COMP_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1199,7 +1199,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       return -1;
     }
 
-  CORBA::InterfaceDefSeq_var supported = 
+  CORBA::InterfaceDefSeq_var supported =
     vd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1220,10 +1220,10 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), VT_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1281,7 +1281,7 @@ IDL3_Client::valuetype_attribute_test (
           return -1;
         }
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -1377,7 +1377,7 @@ IDL3_Client::valuetype_operation_test (
           return -1;
         }
 
-      CORBA::TCKind ret_kind = 
+      CORBA::TCKind ret_kind =
         desc->operations[i].result.in ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -1423,7 +1423,7 @@ IDL3_Client::valuetype_operation_test (
                               "wrong name for operation #%d,"
                               "parameter #%d\n",
                               prefix,
-                              i + 1, 
+                              i + 1,
                               j + 1));
                 }
 
@@ -1560,7 +1560,7 @@ IDL3_Client::valuetype_factory_test (
         {
           tmp = desc->initializers[i].members[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, VT_FACTORY_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1597,7 +1597,7 @@ IDL3_Client::valuetype_factory_test (
         {
           tmp = desc->initializers[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, VT_FACTORY_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1622,7 +1622,7 @@ int
 IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
                                     ACE_ENV_ARG_DECL)
 {
-  CORBA::ComponentIR::HomeDef_var bhd = 
+  CORBA::ComponentIR::HomeDef_var bhd =
     hd->base_home (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1653,7 +1653,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
       return -1;
     }
 
-  CORBA::InterfaceDefSeq_var supported = 
+  CORBA::InterfaceDefSeq_var supported =
     bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1673,10 +1673,10 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), HOME_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1737,7 +1737,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->factories[i].parameters[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FACTORY_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1772,7 +1772,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->factories[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FACTORY_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1835,7 +1835,7 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->finders[i].parameters[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FINDER_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1870,7 +1870,7 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->finders[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FINDER_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1889,4 +1889,3 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
 
   return 0;
 }
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 189fae57f54..a1afbad818e 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -564,7 +564,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                       str.in ()));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].in()) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), static_cast<const char*>(members[i])) == 0);
     }
 
 
@@ -604,7 +604,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                       tmp));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (fellows[i].in(), members[i].in()) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (static_cast<const char*>(fellows[i]), static_cast<const char*>(members[i])) == 0);
     }
 
   evar->name ("another_enum"
@@ -2747,7 +2747,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      base_iface_id = ifd->base_interfaces[i].in ();
+      base_iface_id = ifd->base_interfaces[i];
 
       if (this->debug_)
         {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
index d2c977a2ee4..7df8ba75c5c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
index 29dedba0380..f2cf973217a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
@@ -1,3 +1,4 @@
 // $Id$
 project: ifr_client {
+  avoids += ace_for_tao
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
index 6f840ca3024..269964f7a1a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
@@ -6,15 +6,18 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.Latency_Test.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -34,6 +37,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
index 00e9d9fca48..8d7805a1da0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
@@ -6,11 +6,12 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Application_Test \
         IDL3_Test \
+        IFR_Inheritance_Test \
         IFR_Test \
         Latency_Test \
         Persistence_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
index 097f4eef9e3..9a124a27e7b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
index b239e7e47bf..c0c5d899c4d 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
index 2f7b0d81de7..0e48da06af5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Application_Controlled_Client.am
 
 if BUILD_AMI
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
index adf40fc12d3..56ac9428668 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Infrastructure_Controlled_Client.am
 
 if BUILD_AMI
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
index 6f19ef3852a..94ee8bc71d4 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Application_Controlled \
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
index ff4e4098aa3..18414832175 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
index da767330b57..f9c6fe2837e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
index 9e9e4861d5a..cc16d67d6f5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         CPU
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
index bad92936cf9..aa65f76e141 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         GenericFactory \
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index ef980bfa7f0..a82b7249d71 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,7 +1,5 @@
 #include "Basic_Log_Test.h"
 
-#include "orbsvcs/Time_Utilities.h"
-
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
index 7302c7ff649..b4e0f64554f 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Log/Makefile.am b/TAO/orbsvcs/tests/Log/Makefile.am
index 84b91cae2fc..af99ab0bd2b 100644
--- a/TAO/orbsvcs/tests/Log/Makefile.am
+++ b/TAO/orbsvcs/tests/Log/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic_Log_Test
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index d6120c54d79..3db8a30cb7f 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AVStreams \
@@ -15,9 +15,14 @@ SUBDIRS = \
         Bug_1393_Regression \
         Bug_1395_Regression \
         Bug_1630_Regression \
+        Bug_2074_Regression \
         Bug_2137_Regression \
         Bug_2247_Regression \
         Bug_2248_Regression \
+        Bug_2285_Regression \
+        Bug_2287_Regression \
+        Bug_2316_Regression \
+        Bug_2377_Regression \
         Concurrency \
         CosEvent \
         EC_Custom_Marshal \
diff --git a/TAO/orbsvcs/tests/Miop/Makefile.am b/TAO/orbsvcs/tests/Miop/Makefile.am
index 7c9aa89bf7b..2cf8fffb790 100644
--- a/TAO/orbsvcs/tests/Miop/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         McastHello
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
index 3dd323825c1..c5e71386ce3 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.McastHello_Client.am
 
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index f41844762f9..8ffdc65eb82 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Notify ConnectDisconnect): notifytest {
+  exename = ConnectDisconnect
   Source_Files {
     ConnectDisconnect.cpp
   }
@@ -9,54 +10,63 @@ project(*Notify ConnectDisconnect): notifytest {
 
 
 project(*Notify LifeCycle): notifytest {
+  exename = LifeCycle
   Source_Files {
     LifeCycle.cpp
   }
 }
 
 project(*Notify IdAssignment): notifytest {
+  exename = IdAssignment
   Source_Files {
     IdAssignment.cpp
   }
 }
 
 project(*Notify Events): notifytest {
+  exename = Events
   Source_Files {
     Events.cpp
   }
 }
 
 project(*Notify AdminProperties): notifytest {
+  exename = AdminProperties
   Source_Files {
     AdminProperties.cpp
   }
 }
 
 project(*Notify Simple): notifytest {
+  exename = Simple
   Source_Files {
     Simple.cpp
   }
 }
 
 project(*Notify MultiTypes): notifytest {
+  exename = MultiTypes
   Source_Files {
     MultiTypes.cpp
   }
 }
 
 project(*Notify Filter): notifytest {
+  exename = Filter
   Source_Files {
     Filter.cpp
   }
 }
 
 project(*Notify Updates): notifytest {
+  exename = Updates
   Source_Files {
     Updates.cpp
   }
 }
 
 project(*Notify Sequence): notifytest {
+  exename = Sequence
   Source_Files {
     Sequence.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index e27ed2f1dcc..f256f95c017 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -153,6 +153,7 @@ Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORB
 {
   expected_count = expected_count; // if we don;t do this, we get a warning on linux about arg not used.
   CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
   ACE_ASSERT (filter_seq->length () == expected_count);
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
index ced1d9899e8..3a4a36013ce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Basic_Notify_AdminProperties.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += AdminProperties
@@ -37,6 +38,13 @@ AdminProperties_SOURCES = \
 
 AdminProperties_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -52,9 +60,11 @@ AdminProperties_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_ConnectDisconnect.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ConnectDisconnect
@@ -75,6 +85,13 @@ ConnectDisconnect_SOURCES = \
 
 ConnectDisconnect_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -90,9 +107,11 @@ ConnectDisconnect_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Events.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Events
@@ -113,6 +132,13 @@ Events_SOURCES = \
 
 Events_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -128,9 +154,11 @@ Events_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Filter.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Filter
@@ -151,6 +179,13 @@ Filter_SOURCES = \
 
 Filter_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -166,9 +201,11 @@ Filter_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_IdAssignment.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += IdAssignment
@@ -189,6 +226,13 @@ IdAssignment_SOURCES = \
 
 IdAssignment_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -204,9 +248,11 @@ IdAssignment_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_LifeCycle.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += LifeCycle
@@ -227,6 +273,13 @@ LifeCycle_SOURCES = \
 
 LifeCycle_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -242,9 +295,11 @@ LifeCycle_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_MultiTypes.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += MultiTypes
@@ -265,6 +320,13 @@ MultiTypes_SOURCES = \
 
 MultiTypes_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -280,9 +342,11 @@ MultiTypes_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Sequence.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence
@@ -303,6 +367,13 @@ Sequence_SOURCES = \
 
 Sequence_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -318,9 +389,11 @@ Sequence_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Simple.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Simple
@@ -341,6 +414,13 @@ Simple_SOURCES = \
 
 Simple_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -356,9 +436,11 @@ Simple_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Basic_Notify_Updates.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Updates
@@ -379,6 +461,13 @@ Updates_SOURCES = \
 
 Updates_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -394,6 +483,7 @@ Updates_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 70367532e69..60461e451dc 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -101,6 +101,7 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "PushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -120,6 +121,7 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -139,6 +141,8 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer has been disconnected.\n"));
     consumer = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 4dd49a84bb0..32918c34390 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -72,7 +72,7 @@ Sequence::init (int argc,
                   "Options: event count = %d \n"
                   "supplier batch size = %d \n"
                   "consumer batch size = %d \n"
-                  "pacing = %d \n"
+                  "pacing = %d secs \n"
                   , event_count_
                   , supplier_batch_size_
                   , consumer_batch_size_
@@ -125,7 +125,7 @@ Sequence::init (int argc,
   properties[0].name = CORBA::string_dup (CosNotification::MaximumBatchSize);
   properties[0].value <<= (CORBA::Long) this->consumer_batch_size_;
   properties[1].name = CORBA::string_dup (CosNotification::PacingInterval);
-  properties[1].value <<= (TimeBase::TimeT) this->pacing_;
+  properties[1].value <<= (TimeBase::TimeT) (this->pacing_ * 1000 * 10000);
   properties[2].name = CORBA::string_dup (CosNotification::OrderPolicy);
   properties[2].value <<= this->order_policy_;
 
@@ -180,9 +180,9 @@ Sequence::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Pacing")))
+      else if ((current_arg = arg_shifter.get_the_parameter ("-Pacing"))) // in seconds
         {
-          this->pacing_ = (TimeBase::TimeT) ACE_OS::atoi (current_arg); // pacing
+          this->pacing_ = (TimeBase::TimeT) ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index c44a9f0ffde..a118126af0b 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -18,44 +18,44 @@ $status = 0;
   (
    {
     name => "AdminProperties",
-    args => "-ORBSvcConf adminproperties.conf -ORBConnectIPV6Only YES",
+    args => "-ORBSvcConf adminproperties.conf -ORBConnectIPV6Only 1",
    },
    {
     name => "ConnectDisconnect",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
     extra => 300,
    },
    {
     name => "Events",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "IdAssignment",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "LifeCycle",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "Simple",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "MultiTypes",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "Filter",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "Updates",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
    {
     name => "Sequence",
-    args => "-ORBConnectIPV6Only YES",
+    args => "-ORBConnectIPV6Only 1",
    },
   );
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
index db65b9d4bf6..7a7aa3a1a27 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -27,7 +27,6 @@ project(*Ntf Struct Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
index 099a4a73ecd..ec86f6dc54a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Blocking_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -69,13 +73,18 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -91,9 +100,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Blocking_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -112,11 +123,17 @@ Structured_Supplier_SOURCES = \
   Structured_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -132,6 +149,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 74e781eb3df..07e30148612 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -4,6 +4,7 @@
 // Include Section
 // ******************************************************************
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
deleted file mode 100644
index b842263a6f4..00000000000
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double> (static_cast<CORBA::LongLong> (ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h
deleted file mode 100644
index 0e37aa80491..00000000000
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
index 1e57ff1ede7..a16dbea16ed 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Test_Destroy.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Destroy
@@ -36,6 +37,13 @@ Notify_Tests_Destroy_SOURCES = \
 Notify_Tests_Destroy_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -51,6 +59,7 @@ Notify_Tests_Destroy_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index d2d18f86ace..f8e99b34ec2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -27,7 +27,6 @@ project(*Ntf Struct Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
@@ -54,7 +53,6 @@ project(*Ntf Seq Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
index eaac6e439f2..f6d1886d710 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Discarding_Ntf_Seq_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -69,13 +73,18 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -91,9 +100,11 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Seq_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -113,11 +124,17 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -153,13 +172,18 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -175,9 +199,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Discarding_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -197,11 +223,17 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -217,6 +249,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 c37bda7f2a9..50e50144748 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -131,7 +131,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
     this->client_.consumer_done (this);
   }
 
-  ACE_DEBUG((LM_DEBUG, "received %d\n", expected, id));
+  ACE_DEBUG((LM_DEBUG, "received %d\n", id));
 
   // We should receive mepc + 1, because the first event will be in-transit
   // before our sleep causes the notify to queue events.
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
deleted file mode 100644
index b842263a6f4..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double> (static_cast<CORBA::LongLong> (ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h
deleted file mode 100644
index 0e37aa80491..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
index 372ec0ad29c..a465090391d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf
@@ -1,4 +1,4 @@
 ## $Id$
 #
 ## Load the static Cos Notification Service
-static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -ListenerThreads 1"
+static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
index 580883c71de..aa14a71cd4f 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Test_Driver.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Driver
@@ -35,6 +36,13 @@ Notify_Tests_Driver_SOURCES = \
 
 Notify_Tests_Driver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -50,6 +58,7 @@ Notify_Tests_Driver_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index 7a7aa3a1a27..d576fd2920e 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*idl): taoidldefaults {
+  avoids += ace_for_tao
   IDL_Files {
     go.idl
   }
@@ -9,6 +10,7 @@ project(*idl): taoidldefaults {
 }
 
 project(*Ntf Struct Supp): notifytest {
+  avoids += ace_for_tao
   exename = Structured_Supplier
 
   after += *idl
@@ -22,6 +24,7 @@ project(*Ntf Struct Supp): notifytest {
 }
 
 project(*Ntf Struct Cons): notifytest {
+  avoids += ace_for_tao
   exename = Structured_Consumer
 
   after += *idl
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
index c3e7343081f..69bfdd60fb7 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,8 @@ noinst_PROGRAMS =
 
 ## Makefile.MT_Dispatching_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   goC.cpp \
   goC.h \
@@ -50,8 +52,15 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -74,6 +83,13 @@ Structured_Consumer_SOURCES = \
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -89,9 +105,13 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -114,6 +134,13 @@ Structured_Supplier_SOURCES = \
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -129,6 +156,8 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Makefile.am b/TAO/orbsvcs/tests/Notify/Makefile.am
index ea4f7e33e97..f334fe7a9f4 100644
--- a/TAO/orbsvcs/tests/Notify/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         PluggableTopology \
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
index fb05b3d2936..827cbb0d4ce 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Ordering_Ntf_Seq_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -69,13 +73,18 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -91,9 +100,11 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Seq_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -113,11 +124,17 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -153,13 +172,18 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -175,9 +199,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Ordering_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -197,11 +223,17 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -217,6 +249,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
index 3a3553e3753..c57d14c1ddc 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -27,7 +27,6 @@ project(*Ntf Struct Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
@@ -54,7 +53,6 @@ project(*Ntf Seq Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
deleted file mode 100644
index b842263a6f4..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double> (static_cast<CORBA::LongLong> (ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h
deleted file mode 100644
index 679adb0a42c..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Ordering
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
index 5454a6c5812..40b502a5abf 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index e348c77a2d3..3d0e525a0e0 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
@@ -38,11 +38,11 @@ namespace {
     qos[i].name = "Priority";
     qos[i++].value <<= (Short) 1234;
     qos[i].name = "Timeout";
-    qos[i++].value <<= (TimeBase::TimeT) 55555;
+    qos[i++].value <<= (TimeBase::TimeT) 55555; // 5.5555 ms
     qos[i].name = "MaximumBatchSize";
     qos[i++].value <<= (Long) 200;
     qos[i].name = "PacingInterval";
-    qos[i++].value <<= (TimeBase::TimeT) 42000;
+    qos[i++].value <<= (TimeBase::TimeT) 42000; // 4.2ms
     qos[i].name = "StopTimeSupported";
     qos[i++].value <<= Any::from_boolean(0);
     qos.length(i);
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
index acd2a5d29c0..e665d59cb88 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.RT_Notify_lib.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -45,6 +46,7 @@ noinst_HEADERS = \
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index ae74762fd3e..0d33874b2e2 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1814,6 +1814,8 @@ int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-4);
+ 
   if (this->disconnect_on_exit_)
   {
     if (!CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
index 5693bd22f7e..40c52148050 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Reconnecting_Consumer.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
@@ -37,6 +38,13 @@ Consumer_SOURCES = \
 
 Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -52,9 +60,11 @@ Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Reconnecting_Supplier.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Supplier
@@ -75,6 +85,13 @@ Supplier_SOURCES = \
 
 Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -90,6 +107,7 @@ Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index e50702d68b7..3420d2a1be4 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -1099,6 +1099,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
   if (this->disconnect_on_exit_)
   {
     this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (-4);
     if (!CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
     {
       if (this->verbose_)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
index 73faddd571b..1365667e20a 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
@@ -3,4 +3,4 @@ static TAO_CosNotify_Service "-AllowReconnect"
 #
 # This should fail because event perstence requires topology persistence
 #
-dynamic Event_Persistence Service_Object* TAO_CosNotification:_make_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
\ No newline at end of file
+dynamic Event_Persistence Service_Object* TAO_CosNotification:_make_TAO_Notify_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
index a58f9d9aef7..9022e30fee6 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
@@ -1,5 +1,5 @@
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
 #
-dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-base_path ./reconnect_test"
-dynamic Event_Persistence Service_Object* TAO_CosNotification_Persist:_make_Standard_Event_Persistence() "-file_path ./event_persist.db"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
+dynamic Event_Persistence Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_Standard_Event_Persistence() "-file_path ./event_persist.db"
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
index 06147c0fe8a..ede1e8d298c 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
@@ -1,3 +1,3 @@
 static TAO_CosNotify_Service "-DispatchingThreads 2 -SourceThreads 2 -AllowReconnect"
-dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-base_path ./reconnect_test"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
index 7edf3354d1e..c2da6f07cee 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf
@@ -1,4 +1,4 @@
 static TAO_CosNotify_Service "-AllowReconnect"
 #
-dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-v -base_path ./reconnect_test"
-dynamic Event_Persistence Service_Object* TAO_CosNotification_Persist:_make_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
+dynamic Event_Persistence Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
index e84d2c18713..daf2927299f 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
@@ -1,2 +1,2 @@
 static TAO_CosNotify_Service "-AllowReconnect"
-dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-v -base_path ./reconnect_test"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
index 137b9c7d10f..67ae9ef3f9f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,8 @@ noinst_PROGRAMS =
 
 ## Makefile.Seq_Multi_ETCL_Filter_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   goC.cpp \
   goC.h \
@@ -50,8 +52,15 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
 
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -69,13 +78,18 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -91,9 +105,13 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
 
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -112,11 +130,17 @@ Sequence_Supplier_SOURCES = \
   Sequence_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -132,6 +156,8 @@ Sequence_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 2eb56f40573..5c611a89efe 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
@@ -8,15 +8,15 @@
 #include "tao/debug.h"
 
 Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
-                                            const char* name,
-                                            unsigned int low,
-                                            unsigned int high,
-                                            Notify_Test_Client& client)
- : name_ (name),
-   low_ (low),
-   high_ (high),
-   count_ (0),
-   client_ (client)
+  const char* name,
+  unsigned int low,
+  unsigned int high,
+  Notify_Test_Client& client)
+  : name_ (name),
+  low_ (low),
+  high_ (high),
+  count_ (0),
+  client_ (client)
 {
   this->client_.consumer_start (this);
 }
@@ -24,8 +24,8 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
@@ -34,28 +34,25 @@ Notify_Sequence_Push_Consumer::_connect (
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
-      CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::SEQUENCE_EVENT,
+    proxy_id_
+    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosNotification::QoSProperties properties (3); //(4);
-  properties.length (3); //(4);
+  CosNotification::QoSProperties properties (3);
+  properties.length (3);
   properties[0].name = CORBA::string_dup (CosNotification::MaximumBatchSize);
-  properties[0].value <<= (CORBA::Long)5;
+  properties[0].value <<= (CORBA::Long) 3;
   properties[1].name = CORBA::string_dup (CosNotification::PacingInterval);
-  properties[1].value <<= (TimeBase::TimeT)4;
-  //properties[3].name = CORBA::string_dup (CosNotification::MaxEventsPerConsumer);
-  //properties[3].value <<= (CORBA::Long)2;
+  properties[1].value <<= (TimeBase::TimeT) 1 * 1000 * 10000;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (objref.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+  this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -66,45 +63,14 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-                          const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL)
+  const CosNotification::EventBatch& events
+  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG((LM_DEBUG, "-"));
+  ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
 
-  CORBA::ULong length = events.length ();
+  this->count_ += events.length();
 
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Received %u events:\n", length));
-
-  for (CORBA::ULong e = 0; e < length; e++)
-    {
-      CORBA::ULong hlength = events[e].header.variable_header.length ();
-      for (CORBA::ULong hi = 0; hi < hlength; hi++)
-        {
-          if (TAO_debug_level)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s = %s\n",
-                        (const char*)events[e].header.variable_header[hi].name,
-                        Any_String (events[e].header.variable_header[hi].value)));
-        }
-
-      CORBA::ULong flength = events[e].filterable_data.length ();
-      for (CORBA::ULong i = 0; i < flength; i++)
-        {
-          if (TAO_debug_level)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s = %s\n",
-                        (const char*)events[e].filterable_data[i].name,
-                        Any_String (events[e].filterable_data[i].value)));
-        }
-    }
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "-------------------------\n"));
-
-  this->count_++;
   if (this->count_ > this->high_)
     {
       this->client_.consumer_done (this);
@@ -117,8 +83,4 @@ Notify_Sequence_Push_Consumer::push_structured_events (
     {
       this->client_.consumer_done (this);
     }
-  else
-    {
-      ACE_OS::sleep (1);
-    }
 }
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 4d74cfe0ffe..5b4145b586f 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
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*idl): taoidldefaults {
+  avoids += ace_for_tao
   IDL_Files {
     go.idl
   }
@@ -9,6 +10,7 @@ project(*idl): taoidldefaults {
 }
 
 project(*Ntf Seq Supp): notifytest {
+  avoids += ace_for_tao
   exename = Sequence_Supplier
 
   after += *idl
@@ -22,12 +24,12 @@ project(*Ntf Seq Supp): notifytest {
 }
 
 project(*Ntf Seq Cons): notifytest {
+  avoids += ace_for_tao
   exename = Sequence_Consumer
 
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index db5d2e086a3..642b84cdb30 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -20,8 +20,8 @@
 // ******************************************************************
 
 static const char* ior = "file://supplier.ior";
-static unsigned int low = 6;
-static unsigned int high = 7;
+static unsigned int low = 32;
+static unsigned int high = 32;
 
 // ******************************************************************
 // Subroutine Section
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 6831136ed88..1f1fc1236f4 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
@@ -24,9 +24,9 @@
 // ******************************************************************
 // Data Section
 // ******************************************************************
-
+const int PER_BATCH = 16;
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
-static int max_events = 6;  // 6 sets of 16
+static int num_batches = 6;  // 6 sets of 16
 static const char* ior_output_file = "supplier.ior";
 
 // ******************************************************************
@@ -91,7 +91,7 @@ Supplier_Client::parse_args (int argc, char *argv[])
     switch (c)
   {
     case 'e':
-      max_events = ACE_OS::atoi (get_opts.optarg);
+      num_batches = ACE_OS::atoi (get_opts.optarg);
       break;
 
     case 'o':
@@ -135,6 +135,7 @@ SendEvents (int id ACE_ENV_ARG_DECL)
   CosNotification::EventBatch events;
 
   CosNotification::StructuredEvent event;
+
   event.header.fixed_header.event_type.domain_name =
     CORBA::string_dup ("Orbix 2000 Demos");
   event.header.fixed_header.event_type.type_name =
@@ -142,65 +143,44 @@ SendEvents (int id ACE_ENV_ARG_DECL)
 
   event.header.fixed_header.event_name = CORBA::string_dup ("test event");
 
-
   event.header.variable_header.length (2);
   event.header.variable_header[0].name =
     CORBA::string_dup (CosNotification::Priority);
-  event.header.variable_header[0].value <<= (CORBA::Short)
-    (id > max_events / 2 ?
-    -id : id);
   event.header.variable_header[1].name =
     CORBA::string_dup (CosNotification::Timeout);
-  event.header.variable_header[1].value <<= (TimeBase::TimeT)
-    ((max_events - id) * 60);
+
   event.filterable_data.length (3);
   event.filterable_data[0].name = CORBA::string_dup ("objectId");
-  event.filterable_data[0].value <<= (CORBA::Long)0xdad;
-
   event.filterable_data[1].name = CORBA::string_dup ("type");
-  event.filterable_data[1].value <<= types[id % 3];
-
   event.filterable_data[2].name = CORBA::string_dup ("enum");
-  event.filterable_data[2].value <<= (CORBA::Long)
-    (id > max_events / 2 ?
-    -id : id);
 
-  events.length (16);
-  events[0] = event;
+  events.length (PER_BATCH);
 
-  CosNotification::StructuredEvent revents[15];
-  for (int z = 0; z < 15; z++)
+  for (int z = 0; z < PER_BATCH; ++z)
   {
-    revents[z].header.fixed_header.event_type.domain_name =
-      CORBA::string_dup ("Orbix 2000 Demos");
-    revents[z].header.fixed_header.event_type.type_name =
-      CORBA::string_dup ("Extra Events");
-
-    revents[z].header.fixed_header.event_name = CORBA::string_dup ("test revents[z]");
-
-    revents[z].header.variable_header.length (1);
-    revents[z].header.variable_header[0].name =
-      CORBA::string_dup (CosNotification::Priority);
-    revents[z].header.variable_header[0].value <<= (CORBA::Short)
-      (id > max_events / 2 ?
+    event.header.variable_header[0].value <<= (CORBA::Short)
+      (id > num_batches / 2 ?
       -id : id);
 
-    revents[z].filterable_data.length (3);
-    revents[z].filterable_data[0].name = CORBA::string_dup ("objectId");
-    revents[z].filterable_data[0].value <<= (CORBA::Long)z;
-
-    revents[z].filterable_data[1].name = CORBA::string_dup ("type");
-    revents[z].filterable_data[1].value <<= types[2 - (id % 3)];
-
-    revents[z].filterable_data[2].name = CORBA::string_dup ("enum");
-    revents[z].filterable_data[2].value <<= (CORBA::Long)
-      (id > max_events / 2 ?
+    event.filterable_data[0].value <<= (CORBA::Long)z;
+    event.filterable_data[1].value <<= types[2 - (id % 3)];
+    event.filterable_data[2].value <<= (CORBA::Long)
+      (id > num_batches / 2 ?
       -id : id);
-    events[z + 1] = revents[z];
+
+    events[z] = event;
   }
 
-  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_TRY_NEW_ENV
+  {
+    supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCH (CORBA::Exception, e)
+  {
+    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+  }
+  ACE_ENDTRY;
 }
 
 static void
@@ -276,17 +256,19 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
         sig_impl->wait_for_startup();
 
-        ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d events...\n", max_events));
-        for (int i = 0; i < max_events; ++i)
+        ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d batches of %d events...\n", num_batches, PER_BATCH));
+        for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
           SendEvents (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-        ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
+        ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n"));
 
         sig_impl->wait_for_completion();
 
+        ACE_DEBUG((LM_DEBUG, "\nSupplier done.\n"));
+
         ACE_OS::unlink (ior_output_file);
 
         ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
deleted file mode 100644
index 9dc7bc650ff..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double>(static_cast<CORBA::LongLong>(ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
deleted file mode 100644
index 0e37aa80491..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
index 77a4f7f2e40..d2add1b2deb 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -69,13 +73,18 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -91,9 +100,11 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -112,11 +123,17 @@ Sequence_Supplier_SOURCES = \
   Sequence_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -132,6 +149,7 @@ Sequence_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 9ea168ea6e1..36cca406978 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
@@ -9,12 +9,10 @@
 
 Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
                                             const char* name,
-                                            CORBA::Short policy,
                                             unsigned int low,
                                             unsigned int high,
                                             Notify_Test_Client& client)
  : name_ (name),
-   discard_policy_ (policy),
    low_ (low),
    high_ (high),
    count_ (0),
@@ -56,9 +54,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[0].name = CORBA::string_dup(CosNotification::MaximumBatchSize);
   properties[0].value <<= (CORBA::Long)5;
   properties[1].name = CORBA::string_dup(CosNotification::PacingInterval);
-  properties[1].value <<= (TimeBase::TimeT)2;  // 4
-  properties[2].name = CORBA::string_dup(CosNotification::DiscardPolicy);
-  properties[2].value <<= this->discard_policy_;
+  properties[1].value <<= (TimeBase::TimeT) 2 * 1000 * 10000;
 
   proxy_->set_qos(properties);
   proxy_->connect_sequence_push_consumer (objref.in ()
@@ -74,45 +70,12 @@ Notify_Sequence_Push_Consumer::_connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
                           const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG((LM_DEBUG, "-"));
+  ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
 
-  CORBA::ULong length = events.length();
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Received %u events:\n", length));
-
-  for(CORBA::ULong e = 0; e < length; e++)
-    {
-      if (events[e].header.variable_header.length () > 0)
-        {
-          if (TAO_debug_level)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s = %s, ",
-                        (const char*)events[e].header.variable_header[0].name,
-                        Any_String (events[e].header.variable_header[0].value)));
-        }
-      for(CORBA::ULong i = 0; i < 3; i++)
-        {
-          if (TAO_debug_level)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s = %s   ",
-                        (const char*)events[e].filterable_data[i].name,
-                        Any_String (events[e].filterable_data[i].value)));
-        }
-
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n"));
-    }
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "-------------------------\n"));
-
-  this->count_++;
+  this->count_ += events.length();
   if (this->count_ > this->high_)
     {
       this->client_.consumer_done (this);
@@ -120,12 +83,8 @@ Notify_Sequence_Push_Consumer::push_structured_events(
                  ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ")
                  ACE_TEXT ("many events received.\n")));
     }
-  else if (this->count_ == this->low_)
+  else if (this->count_ >= this->low_)
     {
       this->client_.consumer_done (this);
     }
-  else
-    {
-      ACE_OS::sleep(1);
-    }
 }
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 7c673983ebc..1318d05545c 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
@@ -26,7 +26,6 @@ class Notify_Sequence_Push_Consumer : public TAO_Notify_Tests_SequencePushConsum
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
-                                 CORBA::Short policy,
                                  unsigned int low,
                                  unsigned int high,
                                  Notify_Test_Client& client);
@@ -43,7 +42,6 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
-  CORBA::Short discard_policy_;
   unsigned int low_;
   unsigned int high_;
   unsigned int count_;
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 e8363ad7659..47c8459df2a 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
@@ -27,7 +27,6 @@ project(*Ntf Seq Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 62ebda43d54..61abb9946ef 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -20,9 +20,8 @@
 // ******************************************************************
 
 static const char* ior = "file://supplier.ior";
-static CORBA::Short discard_policy = CosNotification::FifoOrder;
-static unsigned int low = 2;  // 10
-static unsigned int high = 4; // 13
+static unsigned int low = 10;
+static unsigned int high = 20;
 static CORBA::Boolean filter = 1;
 static const char* constraintString = "Number == 10";
 
@@ -44,58 +43,33 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-
-      case 'l':
-        low = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'h':
-        high = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'd':
-      {
-        const char* discard = get_opts.optarg;
-        if (ACE_OS::strcmp(discard, "fifo") == 0)
-          {
-            discard_policy = CosNotification::FifoOrder;
-          }
-        else if (ACE_OS::strcmp(discard, "priority") == 0)
-          {
-            discard_policy = CosNotification::PriorityOrder;
-          }
-        else if (ACE_OS::strcmp(discard, "lifo") == 0)
-          {
-            discard_policy = CosNotification::LifoOrder;
-          }
-        else
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unknown discard policy: %s\n",
-                               discard_policy),
-                              -1);
-          }
-        break;
-      }
-      case 'c':
-        constraintString = get_opts.optarg;
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-l <low expected events> "
-                           "-h <high expected events> "
-                           "-d <fifo|priority|lifo> "
-                           "-c <constraint string> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
+  {
+    case 'k':
+      ior = get_opts.optarg;
+      break;
+
+    case 'l':
+      low = ACE_OS::atoi (get_opts.optarg);
+      break;
+
+    case 'h':
+      high = ACE_OS::atoi (get_opts.optarg);
+      break;
+
+    case 'c':
+      constraintString = get_opts.optarg;
+      break;
+    default:
+      ACE_ERROR_RETURN ((LM_ERROR,
+        "usage:  %s "
+        "-k <ior> "
+        "-l <low expected events> "
+        "-h <high expected events> "
+        "-c <constraint string> "
+        "\n",
+        argv [0]),
+        -1);
+  }
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -108,8 +82,8 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+    adminid
+    ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -125,12 +99,11 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   // startup the first consumer
   Notify_Sequence_Push_Consumer* consumer_1;
   ACE_NEW_THROW_EX (consumer_1,
-                    Notify_Sequence_Push_Consumer ("consumer1",
-                                                   discard_policy,
-                                                   low,
-                                                   high,
-                                                   *client),
-                    CORBA::NO_MEMORY ());
+    Notify_Sequence_Push_Consumer ("consumer1",
+    low,
+    high,
+    *client),
+    CORBA::NO_MEMORY ());
   consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -147,94 +120,85 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   int status = 0;
+
   ACE_TRY_NEW_ENV
+  {
+    Consumer_Client client;
+
+    //int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    ACE_ASSERT(status == 0);
+    ACE_UNUSED_ARG(status);
+
+    CosNotifyChannelAdmin::EventChannel_var ec =
+      client.create_event_channel ("MyEventChannel", 1
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    CORBA::ORB_ptr orb = client.orb ();
+    CORBA::Object_var object =
+      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    ACE_ASSERT(! CORBA::is_nil (sig.in ()));
+
+    CosNotifyChannelAdmin::ConsumerAdmin_var admin =
+      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (filter)
     {
-      Consumer_Client client;
+      CosNotifyFilter::FilterFactory_var ffact =
+        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CosNotifyFilter::Filter_var filter =
+        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_ASSERT(! CORBA::is_nil(filter.in()));
+
+      CosNotifyFilter::ConstraintExpSeq constraint_list (1);
+      constraint_list.length(1);
+
+      constraint_list[0].event_types.length (0);
+      constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
+
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
 
-      status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (status == 0)
-        {
-          CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::ORB_ptr orb = client.orb ();
-          CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (sig.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Object reference <%s> is nil\n",
-                                 ior),
-                                1);
-            }
-
-          CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-
-          if (filter)
-            {
-              CosNotifyFilter::FilterFactory_var ffact =
-                ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              CosNotifyFilter::Filter_var filter =
-                ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              if(CORBA::is_nil(filter.in()))
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              " (%P|%t) Consumer unable to initialize filter.\n"));
-                  return 1;
-                }
-
-              CosNotifyFilter::ConstraintExpSeq constraint_list (1);
-              constraint_list.length(1);
-
-              constraint_list[0].event_types.length (0);
-              constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
-
-              filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              admin->add_filter(filter.in());
-            }
-
-          if (!CORBA::is_nil (admin.in ()))
-            {
-              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
-              ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-        }
+      admin->add_filter(filter.in());
     }
+
+    ACE_ASSERT (!CORBA::is_nil (admin.in ()));
+    create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    // Tell the supplier to go
+    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
+    ACE_TRY_CHECK;
+    ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
+
+    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    return 0;
+
+  }
   ACE_CATCH (CORBA::Exception, e)
-    {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
-      status = 1;
-    }
+  {
+    ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+  }
   ACE_ENDTRY;
 
-  return status;
+  return 1;
 }
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 2ce98df2f79..e6020243c2d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -26,9 +26,9 @@
 // ******************************************************************
 // Data Section
 // ******************************************************************
-
+const int PER_BATCH = 4;
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
-static int max_events = 2;  // 6 sets of 16
+static int num_batches = 10;
 static const char* ior_output_file = "supplier.ior";
 
 // ******************************************************************
@@ -92,7 +92,7 @@ Supplier_Client::parse_args (int argc, char *argv[])
     switch (c)
   {
     case 'e':
-      max_events = ACE_OS::atoi(get_opts.optarg);
+      num_batches = ACE_OS::atoi(get_opts.optarg);
       break;
 
     case 'o':
@@ -132,12 +132,11 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 SendEvents (int id ACE_ENV_ARG_DECL)
 {
-  const int MAX_EVENTS = 15;
-
   static const char* types[] = { "good", "bad", "ugly" };
   CosNotification::EventBatch events;
 
   CosNotification::StructuredEvent event;
+
   event.header.fixed_header.event_type.domain_name =
     CORBA::string_dup("Orbix 2000 Demos");
   event.header.fixed_header.event_type.type_name =
@@ -145,64 +144,44 @@ SendEvents (int id ACE_ENV_ARG_DECL)
 
   event.header.fixed_header.event_name = CORBA::string_dup("test event");
 
-
   event.header.variable_header.length (1);
   event.header.variable_header[0].name =
     CORBA::string_dup(CosNotification::Priority);
-  event.header.variable_header[0].value <<= (CORBA::Short)
-    (id > max_events / 2 ?
-    -id : id);
 
   event.filterable_data.length (3);
   event.filterable_data[0].name = CORBA::string_dup("Number");
-  event.filterable_data[0].value <<= (CORBA::Long)10;
-
   event.filterable_data[1].name = CORBA::string_dup("Index");
-  event.filterable_data[1].value <<= 0;
-
   event.filterable_data[2].name = CORBA::string_dup("enum");
-  event.filterable_data[2].value <<= types[id % 3];
 
-  events.length(16);
-  events[0] = event;
+  events.length(PER_BATCH);
 
-  CosNotification::StructuredEvent revents[15];
-  for(int z = 0; z < MAX_EVENTS; ++z) {
-    revents[z].header.fixed_header.event_type.domain_name =
-      CORBA::string_dup("Orbix 2000 Demos");
-    revents[z].header.fixed_header.event_type.type_name =
-      CORBA::string_dup("Sequence Notification Push Demo Event");
-
-    revents[z].header.fixed_header.event_name = CORBA::string_dup("test revents[z]");
-
-    revents[z].header.variable_header.length (1);
-    revents[z].header.variable_header[0].name =
-      CORBA::string_dup(CosNotification::Priority);
-    revents[z].header.variable_header[0].value <<= (CORBA::Short)
-      (id > max_events / 2 ?
+  for(int z = 0; z < PER_BATCH; ++z) {
+    event.header.variable_header[0].value <<= (CORBA::Short)
+      (id > num_batches / 2 ?
       -id : id);
 
-    revents[z].filterable_data.length (3);
-    revents[z].filterable_data[0].name = CORBA::string_dup("Number");
-
     if (z % 2 == 0) {
-      revents[z].filterable_data[0].value <<= (CORBA::Long)20;
+      event.filterable_data[0].value <<= (CORBA::Long)20;
     } else {
-      revents[z].filterable_data[0].value <<= (CORBA::Long)10;
+      event.filterable_data[0].value <<= (CORBA::Long)10;
     }
 
-    revents[z].filterable_data[1].name = CORBA::string_dup("Index");
-    revents[z].filterable_data[1].value <<= z+1;
+    event.filterable_data[1].value <<= z;
 
-    revents[z].filterable_data[2].name = CORBA::string_dup("enum");
-    revents[z].filterable_data[2].value <<= types[id % 3];
-    events[z + 1] = revents[z];
+    event.filterable_data[2].value <<= types[id % 3];
+    events[z] = event;
   }
 
-  ACE_DEBUG ((LM_DEBUG, "Sending events.\n"));
-
-  supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_TRY_NEW_ENV
+  {
+    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCH (CORBA::Exception, e)
+  {
+    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+  }
+  ACE_ENDTRY;
 }
 
 static void
@@ -280,17 +259,19 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
         sig_impl->wait_for_startup();
 
-        ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d events...\n", max_events));
-        for (int i = 0; i < max_events; ++i)
+        ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d batches of %d events...\n", num_batches, PER_BATCH));
+        for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
           SendEvents (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-        ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
+        ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n"));
 
         sig_impl->wait_for_completion();
 
+        ACE_DEBUG((LM_DEBUG, "\nSupplier finished.\n"));
+
         ACE_OS::unlink (ior_output_file);
 
         ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
deleted file mode 100644
index 9dc7bc650ff..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double>(static_cast<CORBA::LongLong>(ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
deleted file mode 100644
index 0e37aa80491..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index 3abd9a03714..490a0aa818c 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -13,7 +13,6 @@ $notifyior = PerlACE::LocalFile ("notify.ior");
 $notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext");
 $status = 0;
 
-unlink $notifyior;
 
 $port = PerlACE::uniqueid () + 10001;
 $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
@@ -31,8 +30,9 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
 $NS->Spawn ();
-$TS->Spawn ();
 
+unlink $notifyior;
+$TS->Spawn ();
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
     $TS->Kill ();
@@ -40,54 +40,46 @@ if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     exit 1;
 }
 
-if ($status == 0) {
-    $discard_policy = fifo;
-
-@low = (6, 3, 6, 3, 1);
-@high = (7, 4, 7, 4, 2);
+@low = (40, 20, 20, 20);
+@high = (40, 21, 21, 21);
 @constraintList = (
   "\"Number == 20 or Number == 10\"",
   "\"Number == 20 or Index == 7\"",
-  "\"Number == 20 or Number == 10\"",
   "\"Number == 20 or Index == 4\"",
-  "\"Number == 20 and Index == 1\"",
+  "\"Number == 10 or (Number == 20 and Index == 1)\"",
 );
 
-    $i = 0;
-    print "************** Running Sequence Consumer with the " .
-          "$discard_policy policy ************\n";
+$i = 0;
 
 foreach $constraintString (@constraintList) {
-       print "<*><*><*> Constraint String: $constraintString  <*><*><*>\n";
-
-    unlink $ior;
-    $SES->Spawn ();
+  print "<*><*><*> Constraint String: $constraintString  <*><*><*>\n";
 
-    if (PerlACE::waitforfile_timed ($ior, 20) == -1) {
-        print STDERR "ERROR: waiting for the supplier to start\n";
-        $SES->Kill ();
-        $TS->Kill ();
-        $NS->Kill ();
-        $status = 1;
-        last;
-    }
+  unlink $ior;
+  $SES->Spawn ();
+  if (PerlACE::waitforfile_timed ($ior, 20) == -1) {
+      print STDERR "ERROR: waiting for the supplier to start\n";
+      $SES->Kill ();
+      $TS->Kill ();
+      $NS->Kill ();
+      $status = 1;
+      last;
+  }
 
-    $SEC->Arguments($client_args . " -l $low[$i] -h $high[$i] -d $discard_policy -c $constraintString");
+  $SEC->Arguments($client_args . " -l $low[$i] -h $high[$i] -c $constraintString");
 
-    $i = $i + 1;
+  $i = $i + 1;
 
-    $client = $SEC->SpawnWaitKill (60);
-    if ($client != 0) {
-      print STDERR "ERROR: Sequence_Consumer did not run properly\n";
-      $status = 1;
-      last;
-    }
-    $server = $SES->WaitKill(5);
-    if ($server != 0) {
-      $TS->Kill ();
-      $NS->Kill ();
-      exit 1;
-    }
+  $client = $SEC->SpawnWaitKill (60);
+  if ($client != 0) {
+    print STDERR "ERROR: Sequence_Consumer did not run properly\n";
+    $status = 1;
+    last;
+  }
+  $server = $SES->WaitKill(5);
+  if ($server != 0) {
+    $TS->Kill ();
+    $NS->Kill ();
+    exit 1;
   }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
index bfd9e054fab..743e46d32be 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Struct_Filter_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -74,6 +78,13 @@ Structured_Consumer_SOURCES = \
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -89,9 +100,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Struct_Filter_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -114,6 +127,13 @@ Structured_Supplier_SOURCES = \
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -129,6 +149,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 16845443d3e..1c6720afa0c 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -184,6 +184,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
     {
       ACE_DEBUG((LM_DEBUG, "+"));
       send_event (i);
+      ACE_TRY_CHECK;
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
index 090ad0bb7c8..9db1d66b386 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,8 +50,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -74,6 +78,13 @@ Structured_Consumer_SOURCES = \
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -89,9 +100,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -115,6 +128,13 @@ Structured_Supplier_SOURCES = \
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -130,6 +150,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 36fbe655b2e..c7438cb868d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -261,6 +261,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
     {
       ACE_DEBUG((LM_DEBUG, "+"));
       send_event (i);
+      ACE_TRY_CHECK;
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
index 5f02315f6c4..98815fbca6e 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
index 0978c8e2e0f..78d0832f1b2 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
index 21c1ae518bd..141f3252109 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
@@ -1,4 +1,5 @@
 // $Id$
 
 project : orbsvcsexe, portableserver, notify_serv {
+  exename = main
 }
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 44e477e70b5..896da12b065 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -163,13 +163,13 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv)
       qosprops[i].name = CORBA::string_dup(CosNotification::Priority);
       qosprops[i++].value <<= CosNotification::HighestPriority;
       qosprops[i].name = CORBA::string_dup(CosNotification::Timeout);
-      qosprops[i++].value <<= (TimeBase::TimeT) 42000;
+      qosprops[i++].value <<= (TimeBase::TimeT) 42000; // 4.2 ms
       qosprops[i].name = CORBA::string_dup(CosNotification::StopTimeSupported);
       qosprops[i++].value <<= CORBA::Any::from_boolean(1);
       qosprops[i].name = CORBA::string_dup(CosNotification::MaximumBatchSize);
       qosprops[i++].value <<= (CORBA::Long) 555;
       qosprops[i].name = CORBA::string_dup(CosNotification::PacingInterval);
-      qosprops[i++].value <<= (TimeBase::TimeT) 34300;
+      qosprops[i++].value <<= (TimeBase::TimeT) 34300; // 3.4 ms
       qosprops.length(i);
 
       CosNotification::AdminProperties adminprops(4);
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
index ef713ea6961..8140370ffd8 100755
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl
@@ -31,7 +31,7 @@ cleanup();
 
 $ret = 0;
 
-$UTEST = new PerlACE::Process("main", "-ORBEndpoint iiop://:$port -pass 3");
+$UTEST = new PerlACE::Process("main", "-orbobjrefstyle url -ORBEndpoint iiop://:$port -pass 3");
 $ret = $UTEST->SpawnWaitKill(20);
 if ($ret != 0) {
   print "ERROR : main returned $ret\n";
@@ -44,7 +44,6 @@ if ($different) {
   exit 1;
 } else {
   print "Success : loadtest.xml == abc.xml\n";
-  cleanup();
 }
 
 
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
index 349d679e2cf..c0d276565cb 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/svc.conf
@@ -1,2 +1,2 @@
 static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
-dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_XML_Topology_Factory() "-save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_TAO_Notify_XML_Topology_Factory() "-v -save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 868e52895d9..b52176dbd22 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Task_Callback.h"
@@ -26,7 +27,9 @@
 #include "Periodic_Consumer.h"
 #include "Activation_ManagerS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Tests_Activation_Manager
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 65bb861b615..11f24ede767 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(lib, TAO_Application_Command, "$Id$")
 #include "Driver_Base.h"
 #include "Priority_Mapping.h"
 
+#include "ace/Arg_Shifter.h"
+
 TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void)
   : dump_samples_ (0)
 {
@@ -105,6 +107,7 @@ TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
 
   /// Activate the root POA.
   poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   TAO_Notify_Tests_Priority_Mapping* mapping = new TAO_Notify_Tests_Priority_Mapping ();
 
@@ -188,29 +191,36 @@ TAO_Notify_Tests_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == INIT)
     {
       this->handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == RUN)
     {
       this->handle_run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == WAIT_FOR_EVENTS)
     {
       this->handle_wait_for_completion (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SHUTDOWN)
     {
       this->handle_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DUMP_STATE)
     {
       this->handle_dump_stats (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SIGNAL_PEER)
     {
       this->handle_signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == WAIT_TO_START)
     {
       this->handle_wait_to_start (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 20b77126569..91c9e0c2c33 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -19,14 +19,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Environment;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Tests_Command
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index 6846f60c64c..2b7e3020db7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -160,17 +160,21 @@ TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE)
     {
       this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SUBSCRIPTION)
     {
       this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SET_QOS)
     {
       this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DUMP_STATE)
     {
       this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index c8689505bdb..6fb6f16accf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -76,6 +76,7 @@ TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_
 int
 TAO_Notify_Tests_Worker::svc (void)
 {
+#if 0
   ACE_hthread_t current;
   ACE_Thread::self (current);
 
@@ -87,6 +88,7 @@ TAO_Notify_Tests_Worker::svc (void)
     }
 
   ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority));
+#endif
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -129,6 +131,13 @@ TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
 int
 TAO_Notify_Tests_ORB_Run_Worker::svc (void)
 {
+#if 0
+  // ACE_Thread::getprio() fails on systems that do not support thread
+  // priorities.  While we could just treat the failure as benign, I'm
+  // just disabling it altogether.  It doesn't provide much value, and
+  // makes service startup needlessly more verbose.  See bugzilla 2477
+  // for details.
+  
   ACE_hthread_t current;
   ACE_Thread::self (current);
 
@@ -139,8 +148,8 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
       return -1;
     }
 
-
   ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority));
+#endif
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 8e2a2a1b596..76842ecce19 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -93,7 +93,7 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
   // The Service Object.
-  TAO_Notify_Service* notify_service;
+  TAO_Notify_Service* notify_service = 0;
 
   notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
 
@@ -205,17 +205,21 @@ TAO_Notify_Tests_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE)
     {
       this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DESTROY)
     {
       this->handle_destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SET_QOS)
     {
       this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DUMP_STATE)
     {
       this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 30843f6b0e7..368b1963b0c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -24,7 +24,9 @@
 #include "Command.h"
 //#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Service;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Tests_EventChannel_Command
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 404e401f706..4832672fe07 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -183,21 +183,26 @@ TAO_Notify_Tests_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE_FACTORY)
     {
       this->handle_create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == CREATE_FILTER)
     {
       this->handle_create_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == ADD_CONSTRAINT)
     {
       this->handle_add_constraint (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == ADD_FILTER)
     {
       this->handle_add_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DESTROY)
     {
       this->handle_destroy_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
index 0d4de28dd75..a6e9fa50e92 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.NotifyTests_Lib.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -97,7 +98,8 @@ libTAO_NotifyTests_la_SOURCES = \
   StructuredPushSupplier.cpp \
   SupplierAdmin_Command.cpp \
   Task_Callback.cpp \
-  Task_Stats.cpp
+  Task_Stats.cpp \
+  common.cpp
 
 noinst_HEADERS = \
   Activation_Manager.h \
@@ -165,9 +167,11 @@ noinst_HEADERS = \
   Task_Callback.h \
   Task_Stats.h \
   Task_Stats.inl \
+  common.h \
   notify_test_export.h
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index b4a0aacf126..293ba3bed29 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NotifyTests_Lib): orbsvcslib, notification_skel, naming, svc_utils {
+project(NotifyTests_Lib): orbsvcslib, notification_skel, notify_serv, naming, svc_utils {
   sharedname = TAO_NotifyTests
   dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 103533945d1..847cfaba864 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (lib,
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
+#include "ace/Arg_Shifter.h"
+
 
 TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 2f9dd8faf3b..7bbc3c3588c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -19,10 +19,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/CosNotificationC.h"
 
+#include "ace/Arg_Shifter.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//class ACE_TArg_Shifter< char >;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Notify_Tests_Options_Parser
  *
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 2d369b5ba2a..d9a3c8185da 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -22,8 +22,12 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/SString.h"
+
 #include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//template <typename> ACE_TArg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Notify_Tests_Peer
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index a59676d8871..e524f2537ad 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -5,6 +5,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Task.h"
 #include "tao/debug.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 6fb76b3e928..8858c155029 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -21,11 +21,15 @@
 
 #include "Task_Stats.h"
 #include "Notify_StructuredPushConsumer.h"
+
 #include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
 
-class TAO_Notify_Tests_Task_Callback;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+//class ACE_TArg_Shifter< char >;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+class TAO_Notify_Tests_Task_Callback;
 
 /**
  * @class TAO_Notify_Tests_Periodic_Consumer
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index d0e866144c5..12871ea3eb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -2,8 +2,8 @@
 
 #include "Periodic_Consumer_Command.h"
 
-ACE_RCSID (lib, 
-           TAO_Periodic_Consumer_Command, 
+ACE_RCSID (lib,
+           TAO_Periodic_Consumer_Command,
            "$Id$")
 
 #include "LookupManager.h"
@@ -243,25 +243,31 @@ TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE)
     {
       this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SUBSCRIPTION)
     {
       this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DISCONNECT)
     {
       this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DEACTIVATE)
     {
       this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else  if (this->command_ == DUMP_STATE)
     {
       this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SET_QOS)
     {
       this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index e6f13144512..906197cf38f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -24,11 +24,15 @@
 #include "StructuredEvent.h"
 #include "ace/Task.h"
 #include "ace/Barrier.h"
+
 #include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
 
-class TAO_Notify_Tests_Task_Callback;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+//class ACE_TArg_Shifter< char >;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+class TAO_Notify_Tests_Task_Callback;
 
 /**
  * @class TAO_Notify_Tests_Periodic_Supplier
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 10ada8a1929..f771ee167ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -2,8 +2,8 @@
 
 #include "Periodic_Supplier_Command.h"
 
-ACE_RCSID (lib, 
-           TAO_Periodic_Supplier_Command, 
+ACE_RCSID (lib,
+           TAO_Periodic_Supplier_Command,
            "$Id$")
 
 #include "LookupManager.h"
@@ -231,25 +231,31 @@ TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE)
     {
       this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == OFFER)
     {
       this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DISCONNECT)
     {
       this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DEACTIVATE)
     {
       this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else  if (this->command_ == DUMP_STATE)
     {
       this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SET_QOS)
     {
       this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index d9b9d96f665..c2a47b86e34 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -159,17 +159,21 @@ TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   if (this->command_ == CREATE)
     {
       this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == OFFER)
     {
       this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == SET_QOS)
     {
       this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
   else if (this->command_ == DUMP_STATE)
     {
       this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index 3be923f7f73..aed41117a3d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,6 +1,7 @@
 //$Id$
 
 #include "ace/High_Res_Timer.h"
+#include "ace/Log_Msg.h"
 
 ACE_INLINE double
 Task_Stats::diff_sec (ACE_UINT64 before, ACE_UINT64 after)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index bd3d85ca6cd..f2020bde1d3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -6,7 +6,7 @@ project(*idl): taoidldefaults, minimum_corba {
   }
   custom_only = 1
 }
-  
+
 project(*Ntf Perf Struct Supp): notifytest, minimum_corba {
   after += *idl
   exename = Structured_Supplier
@@ -24,7 +24,6 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
   exename = Structured_Consumer
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
@@ -49,7 +48,6 @@ project(*notify perf Sequence Consumer): notifytest, minimum_corba {
   exename = Sequence_Consumer
   Source_Files {
     goC.cpp
-    common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
index 86c5c6c75e1..7578a373f62 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,10 +52,14 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  go.idl
+
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -73,13 +77,18 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h \
-  common.h
+  Notify_Sequence_Push_Consumer.h
 
 Sequence_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -95,9 +104,11 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Seq_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -117,11 +128,17 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Sequence_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -137,9 +154,11 @@ Sequence_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Struct_Cons.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -157,13 +176,18 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
-  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -179,9 +203,11 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Filter_Ntf_Perf_Struct_Supp.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -201,11 +227,17 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h \
-  common.h
+  Notify_Structured_Push_Consumer.h
 
 Structured_Supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -221,6 +253,7 @@ Structured_Supplier_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 0d4ec17c912..76033fa9aed 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -151,8 +151,16 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z].filterable_data[0].value <<= type;
   }
 
-  supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_TRY_NEW_ENV
+  {
+    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCH (CORBA::Exception, e)
+  {
+    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+  }
+  ACE_ENDTRY;
 }
 
 static void
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
deleted file mode 100644
index b842263a6f4..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "common.h"
-
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-const char*
-Any_String (const CORBA::Any& any)
-{
-  static char out[256] = "";
-  CORBA::Short s;
-  CORBA::UShort us;
-  CORBA::Long l;
-  CORBA::ULong ul;
-  CORBA::ULongLong ull;
-  const char* str;
-
-  if (any >>= s)
-    {
-      ACE_OS::sprintf (out, "%d", s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, "%u", us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, "%d", l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, "%u", ul);
-    }
-  else if (any >>= str)
-    {
-      ACE_OS::strcpy (out, str);
-    }
-  else if (any >>= ull)
-    {
-#if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS::strcpy (out, ull.as_string (out));
-#else
-      double temp =
-# if defined (ACE_CONFIG_WIN32_H)
-      static_cast<double> (static_cast<CORBA::LongLong> (ull));
-# else
-              ull;
-# endif /* ACE_CONFIG_WIN32_H */
-
-      ACE_OS::sprintf (out, "%.0f", temp);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
deleted file mode 100644
index 0e37aa80491..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/Discarding
-//
-// = FILENAME
-//   common.h
-//
-// = DESCRIPTION
-//   A couple of useful functions
-//
-// = AUTHOR
-//    Chad Elliott <elliott_c@ociweb.com>
-//
-// ==========================================================================
-#ifndef TAO_COMMON_H
-#define TAO_COMMON_H
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-const char*
-Any_String (const CORBA::Any& any);
-
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
index 5c83447f6e0..de02210c1a5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Filter \
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
index 13325f1a783..56b72ea0e04 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.RedGreen_Ntf_Perf_RedGreen.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = RedGreen_Test
@@ -37,6 +38,13 @@ RedGreen_Test_SOURCES = \
 
 RedGreen_Test_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -52,6 +60,7 @@ RedGreen_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
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 c6228a6c1a2..9190355728b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -78,7 +78,30 @@ RedGreen_Test::~RedGreen_Test ()
 {
   if (!CORBA::is_nil (ec_.in ()))
     {
-      this->ec_->destroy ();
+      // Even though we still have a reference, there's no guarantee
+      // the EC is still around.  So, trap exceptions.
+      ACE_TRY_NEW_ENV
+        {
+          this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+        {
+          // Silently swallow this b/c this could mean the EC is gone
+          // or that the network is hosed.  Either way, we're not waiting
+          // around to figure out the problem.  Report the incident to the
+          // log and be done with it.
+          ACE_DEBUG ((LM_INFO,
+                      "INFO: Got a COMM_FAILURE exception while trying to \n"
+                      "      invoke `destroy()' on the Event Channel in the \n"
+                      "      RedGreen destructor.  This is likely not a problem.\n"));
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
+                              "in RedGreen destructor; swallowing.\n");
+        }
+      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
index 45fd2b7c7b9..3b6efe85d86 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Throughput_Ntf_Perf_Throughput.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Throughput
@@ -36,12 +37,15 @@ Throughput_SOURCES = \
   Throughput.h
 
 Throughput_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
+  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
@@ -57,6 +61,7 @@ Throughput_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am
index 79d0cf9b4e9..689e58209a1 100644
--- a/TAO/orbsvcs/tests/Property/Makefile.am
+++ b/TAO/orbsvcs/tests/Property/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -33,8 +33,8 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -60,8 +60,10 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index 53e3baba922..6e8b8e678f8 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, property, utils {
+project(*server): namingexe, property_serv, utils {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
index 40c74d48fe7..24be8509d30 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Sched/Makefile.am b/TAO/orbsvcs/tests/Sched/Makefile.am
index fc0f7e960d2..d561f875016 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
index 1815cca7111..3ea1fb05ab9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
index 8ca541b4c50..a09d0116670 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Secure_BiDir_SSL_Client.am
 
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 73fa2906d71..fa6d82bf742 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -159,7 +159,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      int pre_call_connections =
+      size_t pre_call_connections =
         orb->orb_core ()->lane_resources ().transport_cache ().current_size ();
 
       // A  method to kickstart callbacks from the server
@@ -179,7 +179,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      int cur_connections =
+      size_t cur_connections =
         orb->orb_core()->lane_resources().transport_cache().current_size ();
 
       if (cur_connections > pre_call_connections)
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 0e8ffca904c..af19f459239 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -57,9 +57,9 @@ Simple_Server_i::callback_object (Callback_ptr callback
 int
 Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int pre_call_connections = 
+  size_t pre_call_connections =
     this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
-  
+
   if (this->flag_)
     {
       for (int times = 0; times < this->no_iterations_; ++times)
@@ -67,9 +67,9 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
           this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          int cur_connections = 
+          size_t cur_connections =
             this->orb_->orb_core()->lane_resources().transport_cache().current_size ();
-          
+
           if (cur_connections > pre_call_connections)
             {
               ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
index e3418470a27..44f71ec54d3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,9 +50,13 @@ TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  TX_Object.idl
+
 ## Makefile.Big_Request_Security_Client.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -79,11 +83,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.Big_Request_Security_Server.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -113,6 +119,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
index f3cbaa0ebb1..9a7b56b9748 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -79,9 +79,14 @@ client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  client.idl \
+  server.idl
+
 ## Makefile.Callback_Security_Client.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -112,11 +117,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.Callback_Security_Server.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -147,6 +154,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
index 80ea536de9f..9394b52d046 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,11 +50,15 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Security_Crash_Test_Client.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -79,8 +83,11 @@ client_LDFLAGS = \
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -88,6 +95,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
@@ -97,6 +105,7 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -123,8 +132,11 @@ server_LDFLAGS = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -132,6 +144,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
index e2bc144527e..7229bd380e4 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoexe, portableserver, ssliop {
+project(*server): taoexe, portableserver, ssliop, pi_server, codecfactory, interceptors {
   after += *idl
   Source_Files {
     server.cpp
@@ -20,7 +20,7 @@ project(*server): taoexe, portableserver, ssliop {
   }
 }
 
-project(*client): taoexe, portableserver, ssliop {
+project(*client): taoexe, portableserver, ssliop, pi_server, codecfactory, interceptors {
   after += *idl
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 73d1d3af653..9203ea80711 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults {
   custom_only = 1
 }
 
-project(*security server): orbsvcslib, portableserver, ssl, ssliop {
+project(*security server): orbsvcslib, portableserver, ssl, ssliop, pi_server, codecfactory, interceptors {
   after += *idl
   Source_Files {
     Server_Worker.cpp
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
index 98aab9b9c67..3cd7c68369d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -49,6 +49,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.MT_IIOP_SSL_Security_Client.am
 
 noinst_PROGRAMS = client
@@ -78,6 +81,7 @@ client_LDADD = \
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -106,7 +110,10 @@ server_LDFLAGS = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -115,6 +122,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
index c02e03dc9c3..5a480d3f64e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,9 +50,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.MT_SSLIOP_Security_Client.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -81,11 +85,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Makefile.MT_SSLIOP_Security_Server.am
 
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -119,6 +125,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 
 ## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
index 0bdb4fe461c..d1480fd47d1 100755
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
@@ -1,3 +1,4 @@
+ 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am
index 0f6a98527c6..97c2e92a0ab 100644
--- a/TAO/orbsvcs/tests/Security/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         BiDirectional \
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
index eeebf6406c1..914f5bad0a6 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Foo.idl
+
 ## Makefile.Secure_Invocation_Security_Client.am
 
 if BUILD_CORBA_MESSAGING
@@ -72,6 +75,8 @@ client_SOURCES = \
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -86,6 +91,7 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -111,8 +117,11 @@ server_LDFLAGS = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -120,6 +129,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la \
   @ACE_TLS_LIBS@
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_SSL
 endif BUILD_INTERCEPTORS
 endif BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 89b98f15054..2cab2208413 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 {
+project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
   after += *idl
   Source_Files {
     Foo_i.cpp
@@ -20,7 +20,7 @@ project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop
   }
 }
 
-project(*security client): taoexe, orbsvcslib, security {
+project(*security client): taoexe, orbsvcslib, security, pi, codecfactory, interceptors {
   after += *idl
   Source_Files {
     FooC.cpp
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
index a68a8cb46a5..8ed48dd2fec 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
index 9c57ae11a6b..5ed4a4e6566 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Time/Makefile.am b/TAO/orbsvcs/tests/Time/Makefile.am
index 5aa2a4c54d3..1c540fee207 100644
--- a/TAO/orbsvcs/tests/Time/Makefile.am
+++ b/TAO/orbsvcs/tests/Time/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am
index feb4913884d..3eb947d9669 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile.am
+++ b/TAO/orbsvcs/tests/Trading/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -101,6 +101,7 @@ colocated_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
@@ -138,6 +139,7 @@ export_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
@@ -175,6 +177,7 @@ import_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index d25982b229e..201d04d92df 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -99,7 +99,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
           CORBA::ULong length = link_name_seq2->length ();
           for (i = 0; i < length; i++)
             {
-              if (ACE_OS::strcmp (link_name_seq2[i].in(), "Bootstrap") != 0)
+              if (ACE_OS::strcmp (static_cast<const char*>(link_name_seq2[i]), "Bootstrap") != 0)
                 break;
             }
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index c70370c4512..282c96ae920 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -76,7 +76,7 @@ TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.ptr () ACE_ENV_ARG_PARAMETER);
+  this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/Trading/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index 96adc9c093e..756f057e266 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -1,12 +1,14 @@
 // $Id$
 
+#include <orb.idl>
+
 module TAO_Trader_Test
 {
-  
+
 interface Remote_Output
 {
   void confirm ();
-  // Ensure that the object reference returned from the query actually 
+  // Ensure that the object reference returned from the query actually
   // works.
 };
 
@@ -26,15 +28,15 @@ interface PostScript_Printer : Remote_Output
 {
 };
 
-// Sequences used to test sequence type equivalence in the trader. 
-typedef sequence<short> ShortSeq;
-typedef sequence<unsigned short> UShortSeq;
-typedef sequence<long> LongSeq;
-typedef sequence<unsigned long> ULongSeq;
-typedef sequence<boolean> BooleanSeq;
-typedef sequence<float> FloatSeq;
-typedef sequence<double> DoubleSeq;
-typedef sequence<string> StringSeq;
+// Sequences used to test sequence type equivalence in the trader.
+typedef CORBA::ShortSeq ShortSeq;
+typedef CORBA::UShortSeq UShortSeq;
+typedef CORBA::LongSeq LongSeq;
+typedef CORBA::ULongSeq ULongSeq;
+typedef CORBA::BooleanSeq BooleanSeq;
+typedef CORBA::FloatSeq FloatSeq;
+typedef CORBA::DoubleSeq DoubleSeq;
+typedef CORBA::StringSeq StringSeq;
 
 };
 
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index efe8ed59005..008ef7449a7 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Lib): orbsvcslib, trading_serv, naming {
+project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory {
   sharedname = TTest
   idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
   dynamicflags = TAO_TTEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index b6057f38645..845aff2f28c 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -11,14 +11,18 @@ use PerlACE::Run_Test;
 $ior = PerlACE::LocalFile ("trading.ior");
 $ready_file = PerlACE::LocalFile ("export_test_ready");
 $sleeptime = 20;
+$port = PerlACE::random_port();
 
 unlink $ior;
 unlink $ready_file;
 
+## Specify and endpoint so that we may test the corbaloc in the
+## -ORBInitRef.  We retain one -ORBInitRef using the file just to test
+## both ways.
 $TS = new PerlACE::Process ("../../Trading_Service/Trading_Service",
-                            "-TSdumpior $ior");
+                            "-ORBEndpoint iiop://:$port -TSdumpior $ior");
 $E = new PerlACE::Process ("export_test",
-                           "-ORBInitRef TradingService=file://$ior -quiet");
+                           "-ORBInitRef TradingService=corbaloc:::$port/TradingService -quiet");
 $I = new PerlACE::Process ("import_test",
                            "-ORBInitRef TradingService=file://$ior -quiet");
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
index 7d4ba009d2a..d01838e6d30 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ corbaname-stamp: $(srcdir)/corbaname.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  corbaname.idl
+
 ## Makefile.ior_corbaname_client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
index ad709830bba..57d76e66aeb 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
+++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index 9a936c24fcc..bbf480e5258 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,5 +1,6 @@
 // $Id$
 project: taoexe, anytypecode {
+  avoids += ace_for_tao
   Source_Files {
     testC.cpp
     anyop.cpp
diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am
index 5d4ed75051f..0b04e9551c0 100644
--- a/TAO/performance-tests/Anyop/Makefile.am
+++ b/TAO/performance-tests/Anyop/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.Anyop.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   testC.cpp \
   testC.h \
@@ -67,6 +70,8 @@ anyop_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am
index 4d270500902..2c090b58d4e 100644
--- a/TAO/performance-tests/Callback/Makefile.am
+++ b/TAO/performance-tests/Callback/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,8 @@ noinst_PROGRAMS =
 
 ## Makefile.Callback_Perf_IDL.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   callbackC.cpp \
   callbackC.h \
@@ -50,9 +52,15 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  callback.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Callback_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -81,11 +89,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Callback_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -114,6 +124,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Cubit/Makefile.am b/TAO/performance-tests/Cubit/Makefile.am
index 312bfa75dbc..93fa7615065 100644
--- a/TAO/performance-tests/Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         TAO
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
index 8074da447ec..3eb5245793a 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.DII_Cubit_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -79,6 +80,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 9d1465095ef..05185538e7d 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -20,7 +20,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/debug.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
index 159763f75ca..328db06efcb 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.IDL_Cubit_IDL.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   cubitC.cpp \
   cubitC.h \
@@ -48,9 +52,16 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  cubit.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.IDL_Cubit_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -73,8 +84,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.IDL_Cubit_Collocation.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += collocation_test
 
 collocation_test_CPPFLAGS = \
@@ -106,8 +121,12 @@ collocation_test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.IDL_Cubit_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -139,6 +158,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 65dc11c07b5..f00701de174 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -1,10 +1,11 @@
 // $Id$
 
 #include "ace/config-all.h"
-#if defined (VXWORKS)
+
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN client
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "Cubit_Client.h"
 #include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index d80f66f2945..896f08a847c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -1,10 +1,11 @@
 // $Id$
 
 #include "ace/config-all.h"
-#if defined (VXWORKS)
+
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN server
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "Cubit_Server.h"
 #include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index cfc4b638fee..171458e98d7 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -104,7 +104,9 @@ argv = force_argv;
 // A constant to avoid the utility thread blocking the machine and to
 // bound its  number of computations.
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Globals
 {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
index c016b42aace..daf97728a6c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.MT_Cubit_IDL.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   cubitC.cpp \
   cubitC.h \
@@ -48,9 +52,16 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  cubit.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.MT_Cubit_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -86,8 +97,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.MT_Cubit_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -120,6 +135,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 9a739b662cb..334d9a5e43d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -1,10 +1,11 @@
 // $Id$
 
 #include "ace/config-all.h"
-#if defined (VXWORKS)
+
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN client
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "ace/Sched_Params.h"
 #include "tao/Strategies/advanced_resource.h"
@@ -19,7 +20,7 @@
 
 ACE_RCSID(MT_Cubit, client, "$Id$")
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
 u_int ctx = 0;
 u_int ct = 0;
 
@@ -45,22 +46,23 @@ switchHook (WIND_TCB *pOldTcb,    // pointer to old task's WIND_TCB.
   ACE_UNUSED_ARG (pOldTcb);
 
   // We create the client threads with names starting with "@".
-  if (pNewTcb->name[0] == '@')
-    ctx++;
+  char* name = ::taskName (::taskIdSelf ());
+  if (name[0] == '@')
+    ++ctx;
 
   if (ct < SWITCHES)
     {
       ACE_OS::strncpy (tInfo[ct].name,
-                       pNewTcb->name,
+                       name,
                        TASKNAME_LEN);
       tInfo[ct].tcb = pNewTcb;
       tInfo[ct].pc  = pNewTcb->regs.pc;
-      ct++;
+      ++ct;
     }
 
   return 0;
 }
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ && !ACE_HAS_PTHREADS */
 
 // Constructor.
 
@@ -119,7 +121,7 @@ Client_i::init (int argc, char *argv[])
   // Preliminary argument processing.
   for (int i=0;
        i< this->argc_;
-       i++)
+       ++i)
     {
       if (ACE_OS::strcmp (this->argv_[i],"-r") == 0)
         this->ts_->thread_per_rate_ = 1;
@@ -149,7 +151,7 @@ Client_i::run (void)
     this->do_thread_per_rate_test ();
 }
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
 void
 Client_i::output_taskinfo (void)
 {
@@ -166,7 +168,7 @@ Client_i::output_taskinfo (void)
   // This loop visits each client.  thread_count_ is the number of
   // clients.
 
-  for (u_int j = 0; j < SWITCHES; j ++)
+  for (u_int j = 0; j < SWITCHES; ++j)
     ACE_OS::fprintf(file_handle,
                     "\tname= %s\ttcb= %p\tpc= %p\n",
                     tInfo[j].name,
@@ -175,7 +177,7 @@ Client_i::output_taskinfo (void)
 
   ACE_OS::fclose (file_handle);
 }
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ && !ACE_HAS_PTHREADS */
 
 void
 Client_i::get_context_switches (void)
@@ -194,14 +196,14 @@ Client_i::get_context_switches (void)
     }
 #endif /* ACE_HAS_PRUSAGE_T || ACE_HAS_GETRUSAGE */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
   if (this->ts_->context_switch_test_ == 1)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Adding the context switch hook!\n"));
       taskSwitchHookAdd ((FUNCPTR) &switchHook);
     }
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 }
 
 void
@@ -225,7 +227,7 @@ Client_i::output_latency (void)
   // clients.
   for (u_int j = 0;
        j < this->ts_->thread_count_;
-       j++)
+       ++j)
     {
       ACE_OS::sprintf(buffer,
                       "%s #%d",
@@ -302,7 +304,7 @@ Client_i::calc_util_time (void)
 #else
   for (u_int i = 0;
        i < NUM_UTIL_COMPUTATIONS;
-       i++)
+       ++i)
     this->util_thread_->computation ();
 
   timer.stop ();
@@ -321,12 +323,12 @@ Client_i::activate_high_client (void)
                           0),
                   -1);
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   // Set a task_id string starting with "@", so we are able to
   // accurately count the number of context switches.
   ACE_OS::strcpy (this->task_id_,
                   "@High");
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
   this->high_priority_ =
     this->priority_.get_high_priority ();
@@ -386,7 +388,7 @@ Client_i::activate_low_client (void)
                               this->argv_,
                               i),
                       -1);
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
       // Pace the connection establishment on VxWorks.
       const ACE_Time_Value delay (0L, 500000L);
       ACE_OS::sleep (delay);
@@ -396,7 +398,7 @@ Client_i::activate_low_client (void)
       sprintf (this->task_id_,
                "@Low%u",
                i);
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
       ACE_DEBUG ((LM_DEBUG,
                   "Creating client with thread ID %d and priority %d\n",
                   i,
@@ -499,7 +501,7 @@ Client_i:: print_context_stats (void)
                   "Voluntary context switches=%d, Involuntary context switches=%d\n",
                   this->usage.ru_nvcsw,
                   this->usage.ru_nivcsw));
-#elif defined (VXWORKS) /* ACE_HAS_GETRUSAGE */
+#elif defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
       taskSwitchHookDelete ((FUNCPTR) &switchHook);
       ACE_DEBUG ((LM_DEBUG,
                   "Context switches=%d\n",
@@ -514,7 +516,7 @@ Client_i::print_latency_stats (void)
   // If running the utilization test, don't report latency nor jitter.
   if (this->ts_->use_utilization_test_ == 0)
     {
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
       ACE_DEBUG ((LM_DEBUG,
                   "Test done.\n"
                   "High priority client latency : %f usec, jitter: %f usec\n"
@@ -547,7 +549,7 @@ Client_i::print_latency_stats (void)
                   this->low_priority_client_[0]->get_low_priority_latency (),
                   this->low_priority_client_[0]->get_low_priority_jitter ()));
       // output_latency ();
-#endif /* !VXWORKS && !CHORUS_MVME */
+#endif /* !ACE_VXWORKS && !CHORUS_MVME */
     }
 }
 
@@ -634,12 +636,14 @@ int
 Client_i::do_priority_inversion_test (void)
 {
   this->timer_.start ();
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
+#  if !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
   ctx = 0;
+#  endif
   ACE_NEW_RETURN (this->task_id_,
                   char[TASK_ID_LEN],
                   -1);
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) <<<<<<< starting test on %D\n"));
   GLOBALS::instance ()->num_of_objs = 1;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 8ea6e1f423a..e134d0daa3c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -17,10 +17,11 @@
 // ============================================================================
 
 #include "ace/config-all.h"
-#if defined (VXWORKS)
+
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # undef ACE_MAIN
 # define ACE_MAIN server
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "server.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/TAO/Makefile.am b/TAO/performance-tests/Cubit/TAO/Makefile.am
index 69af71bf2fc..7d6467be3c4 100644
--- a/TAO/performance-tests/Cubit/TAO/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         IDL_Cubit \
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
index 60170a2336d..3e5f3d67387 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,11 +52,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -82,11 +86,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -114,6 +120,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am
index 738adcfac9c..bc0bc188023 100644
--- a/TAO/performance-tests/Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Latency/AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -60,6 +63,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -87,6 +91,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,6 +99,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -123,6 +129,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index 62d29914e6c..e2107878934 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -28,21 +28,21 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time
                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder
                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -59,13 +59,13 @@ Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index 4c944306dbb..213377e6629 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -32,13 +32,13 @@ public:
   virtual void test_method (Test::Timestamp send_time
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_method_excep (::Messaging::ExceptionHolder *holder
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am
index 1f423180146..cfe647ba103 100644
--- a/TAO/performance-tests/Latency/Collocation/Makefile.am
+++ b/TAO/performance-tests/Latency/Collocation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.Latency_Collocation.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -78,6 +81,8 @@ Collocated_Test_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am
index cc387fffbc9..35fca748f2a 100644
--- a/TAO/performance-tests/Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Latency/DII/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.DII_Latency_Idl.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -52,11 +53,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DII_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -85,10 +91,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.DII_Latency_Server.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -114,6 +122,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index fdd792a8ed4..6ea7ad4547c 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -2,7 +2,8 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
@@ -129,7 +130,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          request->add_in_arg("send_time") <<= start;
+          CORBA::ULongLong start_time = static_cast <CORBA::ULongLong> (start);
+          request->add_in_arg("send_time") <<= start_time;
 
           request->set_return_type (CORBA::_tc_ulonglong);
           request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am
index 8e04abd130b..37c739a94b0 100644
--- a/TAO/performance-tests/Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Latency/DSI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.DSI_Latency_Client.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -73,10 +74,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DSI_Latency_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -105,6 +108,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index d822a3588e0..5cd2f655186 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -2,7 +2,7 @@
 // $Id$
 //
 #include "Roundtrip.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am
index 5872d16a982..c8405f80c91 100644
--- a/TAO/performance-tests/Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Latency/Deferred/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Deferred_Latency_Idl.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -52,11 +53,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Deferred_Latency_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -85,10 +91,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Deferred_Latency_Server.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -114,6 +122,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index 7cd07a80e6d..abf63e338ce 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -5,7 +5,7 @@
 
 #include "TestC.h"
 
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/performance-tests/Latency/Makefile.am b/TAO/performance-tests/Latency/Makefile.am
index 4e889f529ec..5916ad0a66c 100644
--- a/TAO/performance-tests/Latency/Makefile.am
+++ b/TAO/performance-tests/Latency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMH_Single_Threaded \
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
index 707e24f9774..65061c9f141 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Single_Threaded_Latency_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Single_Threaded_Latency_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -69,8 +80,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Single_Threaded_Latency_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -93,6 +108,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
index 6463d9143d7..b993c56bfb2 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Thread_Per_Connection_Latency_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Per_Connection_Latency_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +81,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Per_Connection_Latency_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -94,6 +109,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
index 15b6ba7cab0..7182b371aeb 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Thread_Pool_Latency_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Pool_Latency_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +81,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Pool_Latency_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -96,6 +111,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Makefile.am b/TAO/performance-tests/Makefile.am
index acda8f4ea32..d50d88b6ce2 100644
--- a/TAO/performance-tests/Makefile.am
+++ b/TAO/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Anyop \
@@ -21,3 +21,4 @@ SUBDIRS = \
         Sequence_Latency \
         Throughput
 
+#	CSD_Strategy
diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am
index bbf4884e1aa..61c5376acde 100644
--- a/TAO/performance-tests/Memory/IORsize/Makefile.am
+++ b/TAO/performance-tests/Memory/IORsize/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Memory_IORsize_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/performance-tests/Memory/Makefile.am b/TAO/performance-tests/Memory/Makefile.am
index d0e4d72e0d3..b090b6edf6c 100644
--- a/TAO/performance-tests/Memory/Makefile.am
+++ b/TAO/performance-tests/Memory/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         IORsize \
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
index 30e45e924ba..1c93b9156a2 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Memory_Growth_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index ef17b715328..e0d5963b3d2 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project: taoserver {
+  avoids += ace_for_tao
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Create_Reference/Makefile.am b/TAO/performance-tests/POA/Create_Reference/Makefile.am
index 24eb4620f8e..873ee0da632 100644
--- a/TAO/performance-tests/POA/Create_Reference/Makefile.am
+++ b/TAO/performance-tests/POA/Create_Reference/Makefile.am
@@ -6,15 +6,18 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.Create_Reference.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS = create_reference
 
 create_reference_CPPFLAGS = \
@@ -32,6 +35,8 @@ create_reference_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am
index 6ccbbc296e5..550c0527074 100644
--- a/TAO/performance-tests/POA/Demux/Makefile.am
+++ b/TAO/performance-tests/POA/Demux/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ demux_test-stamp: $(srcdir)/demux_test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  demux_test.idl
+
 ## Makefile.Demux_Poa_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index bafe46cd208..b95d547dc66 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -27,7 +27,8 @@ project(*server): taoserver {
 }
 
 project(*client): taoclient {
-  after += *idl
+  avoids += ace_for_tao
+  after  += *idl
 
   Source_Files {
     TestC.cpp
@@ -39,8 +40,8 @@ project(*client): taoclient {
 }
 
 project(*collocated): taoserver {
-  after += *idl
-
+  avoids += ace_for_tao
+  after  += *idl
   exename = collocated
   Source_Files {
     Simple.cpp
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
index 889756f87a7..210867fe562 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
+++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Implicit_Activation_Idl.am
 
 BUILT_SOURCES = \
@@ -48,9 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Implicit_Activation_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -68,8 +75,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Implicit_Activation_Collocated.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += collocated
 
 collocated_CPPFLAGS = \
@@ -91,6 +102,8 @@ collocated_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Implicit_Activation_Server.am
 
 noinst_PROGRAMS += server
diff --git a/TAO/performance-tests/POA/Makefile.am b/TAO/performance-tests/POA/Makefile.am
index f79e14c1ed5..1d12b4bf748 100644
--- a/TAO/performance-tests/POA/Makefile.am
+++ b/TAO/performance-tests/POA/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Create_Reference \
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
index b1f0cf6bc15..46e46dfb461 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+
 ## Makefile.registration.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   testC.cpp \
   testC.h \
@@ -71,6 +74,8 @@ registration_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index c0302e86220..3ebd5ff6be4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project(registration): taoexe, portableserver {
+  avoids += ace_for_tao
   exename = registration
 }
diff --git a/TAO/performance-tests/Pluggable/Makefile.am b/TAO/performance-tests/Pluggable/Makefile.am
index b3c904afff6..51d522c97c8 100644
--- a/TAO/performance-tests/Pluggable/Makefile.am
+++ b/TAO/performance-tests/Pluggable/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -48,6 +48,9 @@ PP_Test-stamp: $(srcdir)/PP_Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  PP_Test.idl
+
 ## Makefile.Pluggable_Client.am
 
 noinst_PROGRAMS = client
diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am
index 3b4f19c77e2..f106715c2ff 100644
--- a/TAO/performance-tests/Protocols/Makefile.am
+++ b/TAO/performance-tests/Protocols/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Protocols_Distributor.am
 
 if BUILD_RT_CORBA
@@ -81,6 +84,8 @@ endif BUILD_RT_CORBA
 
 ## Makefile.Protocols_Receiver.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -100,9 +105,12 @@ receiver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Protocols_Sender.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += sender
 
@@ -125,6 +133,7 @@ sender_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 4e0c3ec233b..f5a235aa7de 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -9,7 +9,8 @@ project(*IDL): taoidldefaults {
 }
 
 project(*Receiver): taoserver {
-  after += *IDL
+  avoids += ace_for_tao
+  after  += *IDL
   exename = receiver
   Source_Files {
     receiver.cpp
@@ -33,8 +34,15 @@ project(*Distributor): rt_server {
 }
 
 project(*Sender): rt_client {
+  avoids += ace_for_tao
   after += *IDL
-  includes += ../../tests/RTCORBA/Diffserv
+
+  specific (automake ) {
+    includes += $(srcdir)/../../tests/RTCORBA/Diffserv
+  } else {
+    includes += ../../tests/RTCORBA/Diffserv
+  }
+
   Source_Files {
     sender.cpp
     testC.cpp
diff --git a/TAO/performance-tests/RTCorba/Makefile.am b/TAO/performance-tests/RTCorba/Makefile.am
index 685318c4ab8..6994b010362 100644
--- a/TAO/performance-tests/RTCorba/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Multiple_Endpoints \
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
index caf34e437fa..d191fe654c8 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am
index 545f220004c..980c96039b4 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Common \
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
index de9a9653587..896dea50b5f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.ORB_Per_Priority_Client.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -45,11 +46,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Makefile.ORB_Per_Priority_Server.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -78,6 +81,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
index dfdd3f80a7b..693baae47e7 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -18,6 +18,7 @@ noinst_PROGRAMS =
 ## Makefile.Single_Endpoint_Client.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -45,11 +46,13 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Makefile.Single_Endpoint_Server.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -78,6 +81,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/RTCorba/Oneways/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Makefile.am
index 534d294161d..bd593b38331 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Oneways/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Reliable
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
index 67da7096e45..406e86a0d38 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,6 +50,9 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Reliable_Oneways_Client_RT.am
 
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
index 945746e1894..4ff158508fe 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -50,9 +50,13 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  test.idl
+
 ## Makefile.Thread_Pool_RTCorba_Client.am
 
 if BUILD_RT_CORBA
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -76,6 +80,7 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 
 ## Makefile.Thread_Pool_RTCorba_Server.am
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 851d718f732..2049c723a97 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -20,7 +20,8 @@ project(*RTCorba server): rt_server, minimum_corba {
 }
 
 project(*RTCorba client): rt_client, minimum_corba {
-  after += *RTCorba_idl
+  avoids += ace_for_tao
+  after  += *RTCorba_idl
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
index 82597004129..a9425e5adaf 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -52,11 +52,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -82,11 +86,13 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Single_Threaded_AMH_Sequence_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -114,6 +120,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
index e948dff698b..8af9b72b447 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,6 +53,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -60,6 +63,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -87,6 +91,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -94,6 +99,7 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -123,6 +129,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 4ebe5921394..cbd5f79b272 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -30,21 +30,21 @@ Roundtrip_Handler::test_octet_method (Test::Timestamp send_time
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_octet_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -61,21 +61,21 @@ Roundtrip_Handler::test_char_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_char_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_char_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -92,21 +92,21 @@ Roundtrip_Handler::test_long_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_long_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_long_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -123,21 +123,21 @@ Roundtrip_Handler::test_short_method (Test::Timestamp send_time
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_short_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_short_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -154,21 +154,21 @@ Roundtrip_Handler::test_double_method (Test::Timestamp send_time
                                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_double_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder
                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_double_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -185,21 +185,21 @@ Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder
                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_longlong_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -219,13 +219,13 @@ Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 0589a8007ac..dd3b92aaf7d 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -33,7 +33,7 @@ public:
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -41,7 +41,7 @@ public:
   virtual void test_char_method (Test::Timestamp send_time
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_char_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder
                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -49,15 +49,15 @@ public:
   virtual void test_long_method  (Test::Timestamp send_time
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_long_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
+  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test short load
   virtual void test_short_method (Test::Timestamp send_time
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_short_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -65,7 +65,7 @@ public:
   virtual void test_longlong_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -73,7 +73,7 @@ public:
   virtual void test_double_method (Test::Timestamp send_time
                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_double_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder
                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,7 +81,7 @@ public:
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
index 1a8d21bd247..3673681e19e 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.DII_Sequence_Idl.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -52,11 +53,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DII_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -85,10 +91,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.DII_Sequence_Server.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -114,6 +122,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index b87d25a1cc1..fe091c21188 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -2,7 +2,8 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "TestC.h"
 
@@ -97,13 +98,14 @@ test_octet_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
   for (int i = 0; i < niterations; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
+      Test::Timestamp start_time = static_cast <Test::Timestamp> (start);
 
       CORBA::Request_var request =
         object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       request->add_in_arg("octet_load") <<= ol;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= start_time;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -153,7 +155,7 @@ test_long_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_CHECK;
 
       request->add_in_arg("long_load") <<= ll;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -203,7 +205,7 @@ test_short_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_CHECK;
 
       request->add_in_arg("short_load") <<= sl;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -253,7 +255,7 @@ test_char_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_CHECK;
 
       request->add_in_arg("char_load") <<= cl;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -303,7 +305,7 @@ test_double_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_CHECK;
 
       request->add_in_arg("double_load") <<= dl;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -353,7 +355,7 @@ test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_CHECK;
 
       request->add_in_arg("longlong_load") <<= ll;
-	  request->add_in_arg("send_time") <<= start;
+      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -440,8 +442,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::ULongLong dummy = 0;
-		  request->add_in_arg("octet_load") <<= oc;
+          Test::Timestamp dummy = 0;
+          request->add_in_arg("octet_load") <<= oc;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
index 83a4d0fa0f7..33792277792 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.DSI_Idl.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -52,10 +53,15 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DSI_Sequence_Client.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -78,10 +84,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.DSI_Sequence_Server.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -111,6 +119,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
index 860c6a9f410..7fbe1b7db19 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "TestC.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "Roundtrip.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 129c9ac8b46..2a49e587b0a 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -9,7 +9,7 @@ project(*sequence_idl): taoidldefaults, strategies, minimum_corba {
 }
 
 project(*sequence server): taoserver, strategies, minimum_corba {
-  after += *seqence_idl
+  after += *sequence_idl
 
   exename = server
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
index 94715ed715e..737faa0e7d6 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,7 @@ noinst_PROGRAMS =
 
 ## Makefile.Deferred_Sequence_Idl.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -52,11 +53,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.Deferred_Sequence_Client.am
 
 if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -85,10 +91,12 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Deferred_Sequence_Server.am
 
+if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -114,6 +122,7 @@ server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 3de63e13fba..42218309dbc 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -6,7 +6,7 @@
 #include "TestC.h"
 
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Makefile.am b/TAO/performance-tests/Sequence_Latency/Makefile.am
index c1ca6ff4b45..f3e5d4f61bb 100644
--- a/TAO/performance-tests/Sequence_Latency/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AMH_Single_Threaded \
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
index 7d394724f75..65f2394fc7f 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Single_Threaded_Sequence_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Single_Threaded_Sequence_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -69,8 +80,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Single_Threaded_Sequence_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -93,6 +108,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
index c1345f418cb..da40ff236fd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Thread_Per_Conn_Sequence_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Per_Conn_Sequence_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +81,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Per_Conn_Sequence_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -94,6 +109,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
index 4f71036524b..c562b58e14d 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Thread_Pool_Sequence_Idl.am
 
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -48,9 +52,16 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Pool_Sequence_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +81,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Thread_Pool_Sequence_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -96,6 +111,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am
index 22418be4cd2..166b558de5d 100644
--- a/TAO/performance-tests/Throughput/Makefile.am
+++ b/TAO/performance-tests/Throughput/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+noinst_PROGRAMS =
+
 ## Makefile.Throughput_Idl.am
 
 BUILT_SOURCES = \
@@ -48,9 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
+noinst_HEADERS = \
+  Test.idl
+
 ## Makefile.Throughput_Client.am
 
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +77,12 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Throughput_Server.am
 
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -96,6 +107,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 79ac824f5d4..f4a90012325 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -39,7 +39,7 @@ Receiver::receive_data (const Test::Message &the_message
         }
       this->last_message_id_ = the_message.message_id;
     }
-  this->message_count_++;
+  ++this->message_count_;
   this->byte_count_ += the_message.the_payload.length ();
   this->last_message_time_ = now;
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index c804588b9b6..c101aeee34e 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -15,7 +15,7 @@ Test::Receiver_ptr
 Receiver_Factory::create_receiver (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  Receiver *receiver_impl;
+  Receiver *receiver_impl = 0;
   ACE_NEW_THROW_EX (receiver_impl,
                     Receiver,
                     CORBA::NO_MEMORY ());
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index fbf91754ef9..ca5e5b74cac 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoserver, strategies {
   after += *idl
   Source_Files {
     Receiver_Factory.cpp
@@ -21,7 +21,7 @@ project(*server): taoexe, portableserver, strategies {
   }
 }
 
-project(*client):taoexe, strategies {
+project(*client): taoclient, strategies {
   after += *idl
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Throughput/run_test.pl b/TAO/performance-tests/Throughput/run_test.pl
index 216081e452d..38adfa5b275 100755
--- a/TAO/performance-tests/Throughput/run_test.pl
+++ b/TAO/performance-tests/Throughput/run_test.pl
@@ -23,7 +23,12 @@ $CL = new PerlACE::Process ("client",
                             " -ORBSvcConf $svc_conf -ORBNoDelay 1"
                             . " -x");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index adc1b27ec4a..1e48a102f8c 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (tao,
            Abstract_Servant_Base,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void)
 {
   // No-Op.
@@ -25,3 +27,5 @@ TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstra
 {
   return *this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 3ff31187f77..f84b36f3630 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -32,6 +32,8 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ServerRequest;
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
@@ -169,6 +171,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
index 2a7ca91f360..e0412bc4c07 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -4,7 +4,10 @@
 
 ACE_RCSID(tao, Acceptor_Filter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index aab2bad47fb..c628731eba5 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class ObjectKey;
@@ -47,9 +49,9 @@ public:
   virtual ~TAO_Acceptor_Filter (void);
 
   /**
-   * Populate <mprofile> with profiles. Profiles are created for
+   * Populate @a mprofile with profiles. Profiles are created for
    * selected acceptors (endpoints) from the array delimited by
-   * <acceptors_begin> and <acceptors_end>.
+   * @a acceptors_begin and @a acceptors_end.
    */
   virtual int fill_profile (const TAO::ObjectKey &object_key,
                             TAO_MProfile &mprofile,
@@ -62,5 +64,7 @@ public:
   virtual int encode_endpoints (TAO_MProfile &mprofile) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 2286ae6c4fd..f1b5d150049 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -25,17 +25,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Thread_Per_Connection_Handler.h"
-#include "Server_Strategy_Factory.h"
-#include "ORB_Core.h"
-#include "Transport_Cache_Manager.h"
-#include "Thread_Lane_Resources.h"
-#include "Transport.h"
-#include "debug.h"
-
-ACE_RCSID (tao,
-           Acceptor_Impl,
-           "$Id$")
+#include "tao/Thread_Per_Connection_Handler.h"
+#include "tao/Server_Strategy_Factory.h"
+#include "tao/ORB_Core.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport.h"
+#include "tao/debug.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -213,4 +211,6 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_H
 
 /////////////////////////////////////////////////////////////////////
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ACCEPTOR_IMPL_CPP */
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index ac978b8167d..1d2b60e3505 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -105,6 +107,8 @@ protected:
   TAO_ORB_Core *orb_core_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Acceptor_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 9187303f3da..838013e48dc 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -31,6 +31,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
   : acceptors_ (0),
     size_ (0)
@@ -893,3 +895,5 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index e51d9b32846..8b6ab5acc24 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -27,9 +27,13 @@
 #include "tao/Exception.h"
 #include "tao/params.h"
 
-// Forward declarations.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Addr;
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Acceptor;
 class TAO_Acceptor_Filter;
@@ -78,7 +82,7 @@ public:
   /// Returns the total number of endpoints in all of its acceptors.
   size_t endpoint_count (void);
 
-  /// Check if there is at least one profile in <mprofile> that
+  /// Check if there is at least one profile in @a mprofile that
   /// corresponds to a collocated object.
   int is_collocated (const TAO_MProfile& mprofile);
 
@@ -134,9 +138,10 @@ private:
               ACE_ENV_ARG_DECL);
 
 private:
+
   // The acceptor registry should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Acceptor_Registry&))
+  TAO_Acceptor_Registry (const TAO_Acceptor_Registry&);
+  void operator= (const TAO_Acceptor_Registry&);
 
 private:
   /// List of acceptors that are currently open.
@@ -146,6 +151,8 @@ private:
   size_t size_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "tao/Acceptor_Registry.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i
index 4a98e902fc1..b086cbf1c1b 100644
--- a/TAO/tao/Acceptor_Registry.i
+++ b/TAO/tao/Acceptor_Registry.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_AcceptorSetIterator
 TAO_Acceptor_Registry::begin (void)
 {
@@ -12,3 +15,5 @@ TAO_Acceptor_Registry::end (void)
 {
   return this->acceptors_ + this->size_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index f7eabbc56c0..d85ab3b7bac 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
-#include "Adapter.h"
+#include "tao/Adapter.h"
 
 ACE_RCSID (tao,
            Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Adapter::~TAO_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 5740575de0c..3a46c4a64b3 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -24,6 +24,8 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<Object> Object_var;
@@ -102,12 +104,13 @@ public:
   /// Create a collocated object using the given profile and stub.
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &) = 0;
-  /// Initialize a collocated object using the given stub and object
+  /// Initialize a collocated object using the given stub
   /// pointer for lazily evaluated object references.
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr) = 0;
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ADAPTER_H */
diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp
index 99c8ea348d9..104a5662569 100644
--- a/TAO/tao/Adapter_Factory.cpp
+++ b/TAO/tao/Adapter_Factory.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "Adapter_Factory.h"
+#include "tao/Adapter_Factory.h"
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Adapter_Factory::~TAO_Adapter_Factory (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h
index fc4d8d13b82..8fa53f30628 100644
--- a/TAO/tao/Adapter_Factory.h
+++ b/TAO/tao/Adapter_Factory.h
@@ -16,12 +16,18 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/TAO_Export.h"
-#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Service_Object.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Adapter;
 class TAO_ORB_Core;
 
@@ -35,6 +41,8 @@ public:
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 0f154f49f01..16aa66007e0 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -1,10 +1,11 @@
 // $Id$
 
-#include "Object.h"
-#include "Adapter_Registry.h"
-#include "Adapter.h"
-#include "SystemException.h"
-#include "debug.h"
+#include "tao/Object.h"
+#include "tao/Stub.h"
+#include "tao/Adapter_Registry.h"
+#include "tao/Adapter.h"
+#include "tao/SystemException.h"
+#include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
@@ -13,6 +14,8 @@ ACE_RCSID (tao,
            Adapter_Registry,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
   : orb_core_ (oc),
     adapters_capacity_ (16), // @@ Make it configurable
@@ -34,7 +37,6 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
 void
 TAO_Adapter_Registry::close (int wait_for_completion
                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
@@ -50,7 +52,7 @@ TAO_Adapter_Registry::close (int wait_for_completion
       if (TAO_debug_level > 3)
         {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO_Adapter_Registry::close () \n");
+                               "Exception in TAO_Adapter_Registry::close ()");
         }
       return;
     }
@@ -62,30 +64,15 @@ TAO_Adapter_Registry::close (int wait_for_completion
 void
 TAO_Adapter_Registry::check_close (int wait_for_completion
                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        {
-          this->adapters_[i]->check_close (wait_for_completion
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      this->adapters_[i]->check_close (wait_for_completion
+                                       ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
-  ACE_CATCHALL
-    {
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) Exception in TAO_Adapter_Registry::check_close () \n")));
-        }
-      return;
-    }
-  ACE_ENDTRY;
-
-  return;
 }
+
 void
 TAO_Adapter_Registry::insert (TAO_Adapter *adapter
                               ACE_ENV_ARG_DECL)
@@ -93,7 +80,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
   if (this->adapters_capacity_ == this->adapters_count_)
     {
       this->adapters_capacity_ *= 2;
-      TAO_Adapter **tmp;
+      TAO_Adapter **tmp = 0;
       ACE_NEW_THROW_EX (tmp,
                         TAO_Adapter*[this->adapters_capacity_],
                         CORBA::NO_MEMORY ());
@@ -105,7 +92,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
       this->adapters_ = tmp;
     }
 
-  int priority = adapter->priority ();
+  int const priority = adapter->priority ();
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
       if (this->adapters_[i]->priority () >= priority)
@@ -117,7 +104,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
               this->adapters_[j] = this->adapters_[j - 1];
             }
           this->adapters_[i] = adapter;
-          this->adapters_count_++;
+          ++this->adapters_count_;
           return;
         }
     }
@@ -132,10 +119,10 @@ TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      int r = this->adapters_[i]->dispatch (key,
-                                            request,
-                                            forward_to
-                                            ACE_ENV_ARG_PARAMETER);
+      int const r = this->adapters_[i]->dispatch (key,
+                                                  request,
+                                                  forward_to
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (r != TAO_Adapter::DS_MISMATCHED_KEY)
@@ -160,22 +147,38 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
         this->adapters_[i]->create_collocated_object (stub,
                                                       mprofile);
       if (x != 0)
-        return x;
+        {
+          if (!stub->collocated_servant ())
+            {
+              // This adapter created an object but it was not able to locate
+              // a servant so we need to give the rest of the adapters a chance to
+              // initialise the stub and find a servant or forward us or whatever.
+              for (CORBA::Long go_on = 1; go_on && i != this->adapters_count_; ++i)
+                {
+                  // initialize_collocated_object only returns 0 if it has completely
+                  // initialised the object.
+                  go_on = this->adapters_[i]->initialize_collocated_object (stub);
+                }
+            }
+          return x;
+        }
     }
   return 0;
 }
 
 CORBA::Long
-TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub,
-                                                    CORBA::Object_ptr obj)
+TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      int retval =
-        this->adapters_[i]->initialize_collocated_object (stub,
-                                                          obj);
-      if (retval != 0)
-        return retval;
+      int const retval =
+        this->adapters_[i]->initialize_collocated_object (stub);
+      if (retval == 0)
+        {
+          // initialize_collocated_object only returns 0 if it has completely
+          // initialised the object. We can return early.
+          return retval;
+        }
     }
   return 0;
 }
@@ -193,3 +196,4 @@ TAO_Adapter_Registry::find_adapter (const char *name) const
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index e184f1a81ca..9625a257fbd 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -29,6 +29,8 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<Object> Object_var;
@@ -61,8 +63,7 @@ public:
    * POA while performing an upcall).
    */
   void close (int wait_for_completion
-              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
+              ACE_ENV_ARG_DECL);
 
   /**
    * Verify if the close() call can be invoked in the current
@@ -70,8 +71,7 @@ public:
    * Raise the right exception if not.
    */
   void check_close (int wait_for_completion
-                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
+                    ACE_ENV_ARG_DECL);
 
   /// Insert a new adapter into the registry.
   void insert (TAO_Adapter *adapter
@@ -93,8 +93,7 @@ public:
 
   /// Initialize a collocated object using the given stub and object
   /// pointer for lazily evaluated object references.
-  CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                            CORBA::Object_ptr o);
+  CORBA::Long initialize_collocated_object (TAO_Stub *);
 
   /// Fetch the adapter named @a name
   TAO_Adapter *find_adapter (const char *name) const;
@@ -113,6 +112,8 @@ private:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h
index 65d0465d4fe..ec6567fc0dd 100644
--- a/TAO/tao/Allocator.h
+++ b/TAO/tao/Allocator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,6 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -40,5 +44,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ALLOCATOR_H */
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index 7a27a68e747..d968f65b205 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -15,6 +15,7 @@
 
 #include "ace/Dynamic_Service.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -198,4 +199,6 @@ TAO::TypeCode::Alias<StringType,
        Traits<StringType>::get_typecode (this->content_type_));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /*  TAO_ALIAS_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index e0d5dd2d06a..201f3f001fc 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -27,6 +27,7 @@
 #include "tao/TypeCodeFactory_Adapter.h"
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -123,6 +124,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Alias_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
index fb692130538..d781ee5641f 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename StringType,
          typename TypeCodeType,
@@ -20,9 +21,11 @@ TAO::TypeCode::Alias<StringType,
 #else
   TypeCodeType const & tc)
 #endif
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , attributes_ (id, name)
   , content_type_ (tc)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index bad91cccc89..46baeb1705f 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 
 #ifndef __ACE_INLINE__
-# include "Alias_TypeCode_Static.inl"
+# include "tao/AnyTypeCode/Alias_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-#include "TypeCode_Traits.h"
+#include "tao/AnyTypeCode/TypeCode_Traits.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/CDR.h"
@@ -19,6 +19,7 @@ ACE_RCSID (tao,
            Alias_TypeCode_Static,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Alias<char const *,
@@ -173,3 +174,5 @@ TAO::TypeCode::Alias<char const *,
      CORBA::TypeCode::_duplicate (
        Traits<char const *>::get_typecode (this->content_type_));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index 92541682efc..ce78541df83 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -27,6 +27,7 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -121,6 +122,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Alias_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
index a2665f5e461..0f077af6689 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -10,9 +12,11 @@ TAO::TypeCode::Alias<char const *,
   char const * id,
   char const * name,
   CORBA::TypeCode_ptr const * tc)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , attributes_ (id, name)
   , content_type_ (tc)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 0095966e1c6..588a45691e3 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -25,6 +25,8 @@ ACE_RCSID (tao,
            Any,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 using namespace TAO;
 
 CORBA::Any::Any (void)
@@ -192,7 +194,7 @@ CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
 {
   if (this->impl_ == 0)
     {
-      return 0;
+      return false;
     }
 
   return this->impl_->to_value (_tao_elem);
@@ -205,7 +207,7 @@ CORBA::Any::checked_to_abstract_base (
 {
   if (this->impl_ == 0)
     {
-      return 0;
+      return false;
     }
 
   return this->impl_->to_abstract_base (_tao_elem);
@@ -273,7 +275,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
 
   if ((cdr >> tc.out ()) == 0)
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -281,7 +283,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
                       TAO::Unknown_IDL_Type (tc.in ()),
-                      0);
+                      false);
 
       any.replace (impl);
       impl->_tao_decode (cdr
@@ -290,11 +292,11 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // =======================================================================
@@ -766,8 +768,8 @@ namespace TAO
     ) const
   {
     _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return 1;
+    return true;
   }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 38e3936b444..6100e206a89 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -29,6 +29,8 @@
 #include "ace/CDR_Stream.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class Any_Impl;
@@ -323,10 +325,14 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &,
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        const CORBA::WChar *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any.inl"
 #else
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Copying versions of insertion operators for basic types
 /// must also be defined for CORBA::Any_var.
 
@@ -391,6 +397,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_object);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl
index 281074ede88..dd987ea89f5 100644
--- a/TAO/tao/AnyTypeCode/Any.inl
+++ b/TAO/tao/AnyTypeCode/Any.inl
@@ -2,6 +2,9 @@
 //
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO::Any_Impl *
 CORBA::Any::impl (void) const
 {
@@ -366,3 +369,5 @@ CORBA::Any_out::operator-> (void)
 {
   return this->ptr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl
index fb3a570b657..f5e60ba8edd 100644
--- a/TAO/tao/AnyTypeCode/AnySeq.pidl
+++ b/TAO/tao/AnyTypeCode/AnySeq.pidl
@@ -13,6 +13,8 @@
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          AnySeq.pidl
  *
  */
diff --git a/TAO/tao/AnyTypeCode/AnySeqA.cpp b/TAO/tao/AnyTypeCode/AnySeqA.cpp
index 4b87880c61f..f379a5330db 100644
--- a/TAO/tao/AnyTypeCode/AnySeqA.cpp
+++ b/TAO/tao/AnyTypeCode/AnySeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "AnySeqA.h"
+#include "tao/AnyTypeCode/AnySeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/AnySeqA.h b/TAO/tao/AnyTypeCode/AnySeqA.h
index 16f1b2288f1..644c4af252f 100644
--- a/TAO/tao/AnyTypeCode/AnySeqA.h
+++ b/TAO/tao/AnyTypeCode/AnySeqA.h
@@ -60,6 +60,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -91,6 +93,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/AnySeqC.cpp b/TAO/tao/AnyTypeCode/AnySeqC.cpp
index f04c69e6e47..8100e8ddadf 100644
--- a/TAO/tao/AnyTypeCode/AnySeqC.cpp
+++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "AnySeqC.h"
+#include "tao/AnyTypeCode/AnySeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ANYSEQ_CS_)
@@ -57,7 +59,7 @@ CORBA::AnySeq::AnySeq (void)
 CORBA::AnySeq::AnySeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max)
@@ -69,7 +71,7 @@ CORBA::AnySeq::AnySeq (
     CORBA::Any * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max, length, buffer, release)
@@ -78,7 +80,7 @@ CORBA::AnySeq::AnySeq (
 CORBA::AnySeq::AnySeq (
     const AnySeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (seq)
@@ -109,22 +111,7 @@ CORBA::Boolean operator<< (
     const CORBA::AnySeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -132,40 +119,9 @@ CORBA::Boolean operator>> (
     CORBA::AnySeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/AnySeqC.h b/TAO/tao/AnyTypeCode/AnySeqC.h
index 12b744d0be4..20ac1a20c3e 100644
--- a/TAO/tao/AnyTypeCode/AnySeqC.h
+++ b/TAO/tao/AnyTypeCode/AnySeqC.h
@@ -67,6 +67,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -80,22 +82,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_out;
 
   class TAO_AnyTypeCode_Export AnySeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Any
           >
   {
@@ -106,7 +105,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::Any* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
@@ -164,6 +163,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index 0e35d292055..86a170d7639 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
@@ -6,10 +6,12 @@
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (AnyTypeCode,
            TAO_AnyTypeCode_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #define STANDARD_EXCEPTION_LIST \
     TAO_SYSTEM_EXCEPTION (UNKNOWN) \
     TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
@@ -90,6 +92,42 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Short va
 }
 
 void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::UShort value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Float value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Double value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongLong value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::ULongLong value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongDouble value)
+{
+  (*any) <<= value;
+}
+
+void
 TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy)
 {
   (*any) <<= policy;
@@ -139,6 +177,7 @@ TAO_AnyTypeCode_Adapter_Impl::Initializer (void)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DEFINE (
   TAO_AnyTypeCode_Adapter_Impl,
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
index ccee6c0a090..389623b086c 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
@@ -25,6 +25,8 @@
 #include "tao/AnyTypeCode_Adapter.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_AnyTypeCode_Adapter
  */
@@ -94,6 +96,18 @@ ANYTYPECODE__EXCEPTION_LIST
 
   virtual void insert_into_any (CORBA::Any * any, CORBA::Short value);
 
+  virtual void insert_into_any (CORBA::Any * any, CORBA::UShort value);
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Float value);
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Double value);
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::LongLong value);
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::ULongLong value);
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::LongDouble value);
+
   virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy);
 
   virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy);
@@ -109,6 +123,8 @@ ANYTYPECODE__EXCEPTION_LIST
   virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_AnyTypeCode_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl)
 
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h
index 92ddfa65a0b..d954af4b0ad 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h
@@ -30,6 +30,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class NamedValue;
@@ -51,6 +53,8 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_ANYTYPECODE_METHODS_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h
index 26e4b66a844..085a068aa6b 100644
--- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h
+++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 #include "tao/Var_Size_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -47,6 +49,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 258c469dd0e..a3d7f0db70a 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_ANY_ARRAY_IMPL_T_C
-#define TAO_ANY_ARRAY_IMPL_T_C
+#ifndef TAO_ANY_ARRAY_IMPL_T_CPP
+#define TAO_ANY_ARRAY_IMPL_T_CPP
 
 #include "tao/AnyTypeCode/Any_Array_Impl_T.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -18,9 +18,7 @@
 # include "tao/AnyTypeCode/Any_Array_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Any_Array_Impl_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T_slice, typename T_forany>
 TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
@@ -67,14 +65,14 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      const CORBA::Boolean _tao_equiv =
+      CORBA::Boolean const _tao_equiv =
         any_tc->equivalent (tc
                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == 0)
+      if (_tao_equiv == false)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -86,11 +84,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_);
-          return 1;
+          return true;
         }
 
       TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
@@ -99,7 +97,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
                       ARRAY_ANY_IMPL (destructor,
                                       any_tc,
                                       T_forany::tao_alloc ()),
-                      0);
+                      false);
 
       auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
           replacement
@@ -113,7 +111,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -121,11 +119,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
           _tao_elem = reinterpret_cast <T_slice*> (replacement->value_);
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
 
       // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
+      ::CORBA::release (any_tc);
     }
   ACE_CATCHANY
     {
@@ -146,7 +144,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
     }
 
   this->value_ = 0;
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
 }
 
 template<typename T_slice, typename T_forany>
@@ -160,4 +158,6 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-#endif /* TAO_ANY_ARRAY_IMPL_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index 4f0d7ce0dee..f7c0d1656ab 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -62,13 +64,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Array_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
index 876b658d0ae..c64d59e022c 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T_slice, typename T_forany>
 ACE_INLINE
 CORBA::Boolean
@@ -26,3 +28,5 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
 {
   return this->value_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 4f390f5be3e..d228f450e2a 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
            Any_Basic_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc,
@@ -107,9 +109,9 @@ namespace TAO
                               ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        if (_tao_equiv == 0)
+        if (!_tao_equiv)
           {
-            return 0;
+            return false;
           }
 
         TAO::Any_Impl *impl = any.impl ();
@@ -121,12 +123,12 @@ namespace TAO
 
             if (narrow_impl == 0)
               {
-                return 0;
+                return false;
               }
 
             Any_Basic_Impl::assign_value (_tao_elem,
                                           narrow_impl);
-            return 1;
+            return true;
           }
 
         TAO::Any_Basic_Impl *replacement =
@@ -148,7 +150,7 @@ namespace TAO
         // shared by another Any. This copies the state, not the buffer.
         TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-        CORBA::Boolean good_decode =
+        CORBA::Boolean const good_decode =
           replacement->demarshal_value (for_reading,
                                         static_cast<CORBA::Long> (tck));
 
@@ -159,18 +161,18 @@ namespace TAO
                                           tck);
             const_cast<CORBA::Any &> (any).replace (replacement);
             replacement_safety.release ();
-            return 1;
+            return true;
           }
 
         // Duplicated by Any_Impl base class constructor.
-        CORBA::release (any_tc);
+        ::CORBA::release (any_tc);
       }
     ACE_CATCHANY
       {
       }
     ACE_ENDTRY;
 
-    return 0;
+    return false;
   }
 
   CORBA::Boolean
@@ -380,3 +382,5 @@ namespace TAO
       }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
index 34f75baad1d..563a252d54a 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Any_Basic_Impl.h
@@ -20,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -92,6 +95,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ANY_BASIC_IMPL_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index d5fc92f2467..6adfea2fcd8 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_ANY_BASIC_IMPL_T_C
-#define TAO_ANY_BASIC_IMPL_T_C
+#ifndef TAO_ANY_BASIC_IMPL_T_CPP
+#define TAO_ANY_BASIC_IMPL_T_CPP
 
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -18,10 +18,7 @@
 # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Any_Basic_Impl_T,
-           "$Id$")
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
@@ -59,13 +56,13 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == 0)
+      if (_tao_equiv == false)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -77,11 +74,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = narrow_impl->value_;
-          return 1;
+          return true;
         }
 
       TAO::Any_Basic_Impl_T<T> *replacement =
@@ -97,7 +94,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -105,18 +102,18 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
 
       // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
+      ::CORBA::release (any_tc);
     }
   ACE_CATCHANY
     {
     }
   ACE_ENDTRY;
 
-  return 0;
+  return false;
 }
 
 template<typename T>
@@ -142,4 +139,6 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-#endif /* TAO_ANY_BASIC_IMPL_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_ANY_BASIC_IMPL_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
index d704f87b546..aff9109b34b 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -59,13 +61,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
index 4250b5f4f88..1cd0d1627dc 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -24,3 +28,4 @@ TAO::Any_Basic_Impl_T<T>::value (void) const
   return &this->value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 0bba1c76c46..f4acd760936 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -21,9 +21,7 @@
 # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Any_Dual_Impl_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
@@ -112,7 +110,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (_tao_equiv == 0)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -124,11 +122,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = narrow_impl->value_;
-          return 1;
+          return true;
         }
 
       T *empty_value = 0;
@@ -152,7 +150,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -160,11 +158,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
 
       // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
+      ::CORBA::release (any_tc);
     }
   ACE_CATCHANY
     {
@@ -184,7 +182,7 @@ TAO::Any_Dual_Impl_T<T>::free_value (void)
       this->value_destructor_ = 0;
     }
 
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
   this->value_ = 0;
 }
 
@@ -199,4 +197,6 @@ TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_ANY_DUAL_IMPL_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
index 8c06f69d64c..e09cdad1f77 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -74,13 +77,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
index bf3ecd90e33..8e97656a93a 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
@@ -1,5 +1,10 @@
+// -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -24,3 +29,4 @@ TAO::Any_Dual_Impl_T<T>::value (void) const
   return this->value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index a0192816d53..a1a6067f8f8 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "Any_Impl.h"
-#include "TypeCode.h"
-#include "Marshal.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Marshal.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
                          CORBA::TypeCode_ptr tc,
                          bool encoded)
@@ -33,7 +35,7 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
 {
   if ((cdr << this->type_) == 0)
     {
-      return 0;
+      return false;
     }
 
   return this->marshal_value (cdr);
@@ -43,7 +45,7 @@ void
 TAO::Any_Impl::free_value (void)
 {
   // We always have to do this.
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
 }
 
 CORBA::TypeCode_ptr
@@ -61,7 +63,7 @@ TAO::Any_Impl::_tao_get_typecode (void) const
 void
 TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
 {
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 }
 
@@ -114,19 +116,19 @@ TAO::Any_Impl::_tao_decode (TAO_InputCDR &
 CORBA::Boolean
 TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
 {
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
 TAO::Any_Impl::to_value (CORBA::ValueBase *&) const
 {
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
 TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
 {
-  return 0;
+  return false;
 }
 
 bool
@@ -135,3 +137,4 @@ TAO::Any_Impl::encoded (void) const
   return this->encoded_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h
index 128072e25cc..9eaf83b482d 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl.h
@@ -1,11 +1,13 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Any_Impl.h
  *
  *  $Id$
  *
- *  @authors  Carlos O'Ryan and Jeff Parsons
+ *  @author Carlos O'Ryan
+ *  @author Jeff Parsons
  */
 //=============================================================================
 
@@ -29,10 +31,14 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
-class ACE_Message_Block;
 
 namespace CORBA
 {
@@ -108,6 +114,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ANY_IMPL_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index f4a04cb568e..bf03b8280a4 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_ANY_IMPL_T_C
-#define TAO_ANY_IMPL_T_C
+#ifndef TAO_ANY_IMPL_T_CPP
+#define TAO_ANY_IMPL_T_CPP
 
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -19,9 +19,7 @@
 # include "tao/AnyTypeCode/Any_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Any_Impl_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
@@ -71,7 +69,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (_tao_equiv == 0)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -83,11 +81,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = (T *) narrow_impl->value_;
-          return 1;
+          return true;
         }
 
       TAO::Any_Impl_T<T> *replacement = 0;
@@ -95,7 +93,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                       TAO::Any_Impl_T<T> (destructor,
                                           any_tc,
                                           0),
-                      0);
+                      false);
 
       auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
 
@@ -107,7 +105,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -115,11 +113,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
           _tao_elem = const_cast<T *> (replacement->value_);
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
 
       // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
+      ::CORBA::release (any_tc);
     }
   ACE_CATCHANY
     {
@@ -139,7 +137,7 @@ TAO::Any_Impl_T<T>::free_value (void)
       this->value_destructor_ = 0;
     }
 
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
   this->value_ = 0;
 }
 
@@ -154,4 +152,6 @@ TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-#endif /* TAO_ANY_IMPL_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_ANY_IMPL_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index d79c5ce2135..bddd912ecc9 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -70,6 +72,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Impl_T.inl"
 
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl
index 1bbeebeea78..3b5b36ab5ed 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl
@@ -1,6 +1,9 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // These three are overridden in generated code where appropriate.
 
 template<typename T> 
@@ -51,3 +54,4 @@ TAO::Any_Impl_T<T>::value (void) const
   return this->value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index b584831329c..3c815466717 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_ANY_SPECIAL_IMPL_T_C
-#define TAO_ANY_SPECIAL_IMPL_T_C
+#ifndef TAO_ANY_SPECIAL_IMPL_T_CPP
+#define TAO_ANY_SPECIAL_IMPL_T_CPP
 
 #include "tao/AnyTypeCode/Any_Special_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -15,9 +15,7 @@
 # include "tao/AnyTypeCode/Any_Special_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Any_Special_Impl_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T, typename from_T, typename to_T>
 TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
@@ -105,7 +103,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       if (any_kind != try_kind)
         {
-          return 0;
+          return false;
         }
 
       CORBA::ULong length =
@@ -114,7 +112,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       if (length != bound)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -129,11 +127,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = (T *) narrow_impl->value_;
-          return 1;
+          return true;
         }
 
       TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
@@ -142,7 +140,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                 tc,
                                                 0,
                                                 bound),
-                      0);
+                      false);
 
       auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
           replacement
@@ -156,7 +154,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -164,11 +162,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
 
       // Duplicated by Any_Impl base class constructor.
-      CORBA::release (tc);
+      ::CORBA::release (tc);
     }
   ACE_CATCHANY
     {
@@ -188,7 +186,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
       this->value_destructor_ = 0;
     }
 
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
   this->value_ = 0;
 }
 
@@ -199,10 +197,18 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_ = 0;
+    }
+
   if (! this->demarshal_value (cdr))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
-#endif /* TAO_ANY_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_ANY_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c5fe808c64e..c166c9293ca 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -64,13 +66,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Any_Special_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
index bc8715b083f..cce6dbda782 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T, typename from_T, typename to_T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -28,3 +32,4 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
   return this->value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index d3a4b55193c..2a22d8f256c 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "Any_SystemException.h"
-#include "Any.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "Marshal.h"
-#include "TypeCode.h"
+#include "tao/AnyTypeCode/Any_SystemException.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "tao/CDR.h"
 #include "tao/Exception.h"
@@ -21,6 +21,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
                                                CORBA::TypeCode_ptr tc,
                                                CORBA::SystemException * const val)
@@ -90,13 +92,13 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == 0)
+      if (_tao_equiv == false)
         {
-          return 0;
+          return false;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -108,11 +110,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return 0;
+              return false;
             }
 
           _tao_elem = narrow_impl->value_;
-          return 1;
+          return true;
         }
 
       CORBA::SystemException *empty_value =  (*f) ();
@@ -122,7 +124,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
                       TAO::Any_SystemException (destructor,
                                                 any_tc,
                                                 empty_value),
-                      0);
+                      false);
 
       auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
 
@@ -134,7 +136,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
       // shared by another Any. This copies the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean good_decode =
+      CORBA::Boolean const good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -142,7 +144,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return 1;
+          return true;
         }
     }
   ACE_CATCHANY
@@ -179,13 +181,13 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
       this->value_->_tao_encode (cdr
                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      return 1;
+      return true;
     }
   ACE_CATCHANY
     {
     }
   ACE_ENDTRY;
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
@@ -196,11 +198,13 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
       this->value_->_tao_decode (cdr
                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      return 1;
+      return true;
     }
   ACE_CATCHANY
     {
     }
   ACE_ENDTRY;
-  return 0;
+  return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h
index 2856c6cf3f1..a26dacfe1c1 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.h
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -79,5 +81,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_ANY_SYSTEMEXCEPTION_H*/
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 062c906b303..9f60eca40f4 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
            Any_Unknown_IDL_Type,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Auto_Ptr<ACE_Lock> TAO::Unknown_IDL_Type::lock_(new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>());
 
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (
@@ -65,16 +67,16 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 
       if (status != TAO::TRAVERSE_CONTINUE)
         {
-          return 0;
+          return false;
         }
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 const void *
@@ -86,7 +88,7 @@ TAO::Unknown_IDL_Type::value (void) const
 void
 TAO::Unknown_IDL_Type::free_value (void)
 {
-  CORBA::release (this->type_);
+  ::CORBA::release (this->type_);
 }
 
 TAO_InputCDR &
@@ -225,17 +227,20 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
           return 0;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_value (this->cdr_, val);
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -272,17 +277,20 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
           return 0;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_abstract_base (this->cdr_,
                                                obj);
     }
@@ -293,3 +301,5 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
index 56d0cb2b1b4..1300b755249 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
@@ -1,11 +1,13 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Any_Unknown_IDL_Type.h
  *
  *  $Id$
  *
- *  @authors  Carlos O'Ryan and Jeff Parsons
+ *  @author Carlos O'Ryan
+ *  @author Jeff Parsons
  */
 //=============================================================================
 
@@ -23,8 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -68,6 +69,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */
diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp
index 051cf1ea18d..99a63b8332a 100644
--- a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "BooleanSeqA.h"
+#include "tao/AnyTypeCode/BooleanSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h
index e621d14fd31..9797a2afa66 100644
--- a/TAO/tao/AnyTypeCode/BooleanSeqA.h
+++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h
@@ -37,6 +37,8 @@
 #include "tao/BooleanSeqC.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::BooleanSeq*); /
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::BooleanSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::BooleanSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl
index c639e285fe5..707ab2b8158 100644
--- a/TAO/tao/AnyTypeCode/Bounds.pidl
+++ b/TAO/tao/AnyTypeCode/Bounds.pidl
@@ -15,6 +15,8 @@
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
+ *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *        Bounds.pidl
  *
  * and then:
diff --git a/TAO/tao/AnyTypeCode/BoundsA.cpp b/TAO/tao/AnyTypeCode/BoundsA.cpp
index 097395f4667..40891d21c2e 100644
--- a/TAO/tao/AnyTypeCode/BoundsA.cpp
+++ b/TAO/tao/AnyTypeCode/BoundsA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "BoundsA.h"
+#include "tao/AnyTypeCode/BoundsA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -145,3 +147,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/BoundsA.h b/TAO/tao/AnyTypeCode/BoundsA.h
index c3f5f3658a2..ed91bde89f4 100644
--- a/TAO/tao/AnyTypeCode/BoundsA.h
+++ b/TAO/tao/AnyTypeCode/BoundsA.h
@@ -62,6 +62,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -145,6 +147,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/BoundsC.cpp b/TAO/tao/AnyTypeCode/BoundsC.cpp
index fec4453680a..fcf15a8094e 100644
--- a/TAO/tao/AnyTypeCode/BoundsC.cpp
+++ b/TAO/tao/AnyTypeCode/BoundsC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "BoundsA.h"
+#include "tao/AnyTypeCode/BoundsA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -73,7 +75,7 @@ CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
 CORBA::Bounds&
 CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -171,3 +173,5 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/BoundsC.h b/TAO/tao/AnyTypeCode/BoundsC.h
index b228461b7b0..68a4721e7dc 100644
--- a/TAO/tao/AnyTypeCode/BoundsC.h
+++ b/TAO/tao/AnyTypeCode/BoundsC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -131,6 +133,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp
index e93d7b8e7f7..91fc0a664e3 100644
--- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp
+++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "CONV_FRAMEA.h"
+#include "tao/AnyTypeCode/CONV_FRAMEA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -425,3 +427,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h
index cbc76dd89aa..beffd197c43 100644
--- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h
+++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CONV_FRAME
 {
 
@@ -106,6 +108,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContex
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/CharSeqA.cpp b/TAO/tao/AnyTypeCode/CharSeqA.cpp
index e6867cf7452..eb3fd68c0e9 100644
--- a/TAO/tao/AnyTypeCode/CharSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/CharSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "CharSeqA.h"
+#include "tao/AnyTypeCode/CharSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h
index 59c6bfdb1f4..76758080b9e 100644
--- a/TAO/tao/AnyTypeCode/CharSeqA.h
+++ b/TAO/tao/AnyTypeCode/CharSeqA.h
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::CharSeq*); // n
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::CharSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::CharSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/CurrentA.cpp b/TAO/tao/AnyTypeCode/CurrentA.cpp
index d7946836b98..0501cc64e20 100644
--- a/TAO/tao/AnyTypeCode/CurrentA.cpp
+++ b/TAO/tao/AnyTypeCode/CurrentA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "CurrentA.h"
+#include "tao/AnyTypeCode/CurrentA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,6 +37,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Current (
@@ -51,3 +53,4 @@ namespace CORBA
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h
index e045f6a2882..5a505a5776d 100644
--- a/TAO/tao/AnyTypeCode/CurrentA.h
+++ b/TAO/tao/AnyTypeCode/CurrentA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -54,6 +56,8 @@ namespace CORBA
 
 } // module CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/DomainA.cpp b/TAO/tao/AnyTypeCode/DomainA.cpp
index 4bf71aa1cae..6f6db000bc2 100644
--- a/TAO/tao/AnyTypeCode/DomainA.cpp
+++ b/TAO/tao/AnyTypeCode/DomainA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DomainA.h"
+#include "tao/AnyTypeCode/DomainA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -294,3 +296,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/DomainA.h b/TAO/tao/AnyTypeCode/DomainA.h
index 9f8660d3545..72c5b0f95ac 100644
--- a/TAO/tao/AnyTypeCode/DomainA.h
+++ b/TAO/tao/AnyTypeCode/DomainA.h
@@ -58,6 +58,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -117,6 +119,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp
index 79331b8f617..a67a84fb0b5 100644
--- a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DoubleSeqA.h"
+#include "tao/AnyTypeCode/DoubleSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h
index f6bb35ddd49..c905c31a980 100644
--- a/TAO/tao/AnyTypeCode/DoubleSeqA.h
+++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::DoubleSeq*); //
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::DoubleSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::DoubleSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl
index 9cc2be7c43d..6a15c71045e 100644
--- a/TAO/tao/AnyTypeCode/Dynamic.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          Dynamic.pidl
  *
  */
@@ -23,8 +25,8 @@
 // File: Dynamic.idl
 // Used primarily for Interceptors
 
-#include "Dynamic_Parameter.pidl"
-#include "StringSeq.pidl"
+#include "tao/AnyTypeCode/Dynamic_Parameter.pidl"
+#include "tao/StringSeq.pidl"
 
 #ifndef _DYNAMIC_IDL_
 #define _DYNAMIC_IDL_
diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp
index 589213436f5..4f17ea24008 100644
--- a/TAO/tao/AnyTypeCode/DynamicA.cpp
+++ b/TAO/tao/AnyTypeCode/DynamicA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DynamicA.h"
+#include "tao/AnyTypeCode/DynamicA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +38,8 @@
 #include "tao/AnyTypeCode/StringSeqA.h"
 #include "tao/AnyTypeCode/Dynamic_ParameterA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD
 #define _TAO_TYPECODE_Dynamic_ParameterList_GUARD
 namespace TAO
@@ -285,3 +287,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/DynamicA.h b/TAO/tao/AnyTypeCode/DynamicA.h
index 944d9d28d76..a327a5a461a 100644
--- a/TAO/tao/AnyTypeCode/DynamicA.h
+++ b/TAO/tao/AnyTypeCode/DynamicA.h
@@ -60,6 +60,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 } // module CORBA
@@ -127,6 +129,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCod
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp
index 3b045863a7a..4cd49b59b28 100644
--- a/TAO/tao/AnyTypeCode/DynamicC.cpp
+++ b/TAO/tao/AnyTypeCode/DynamicC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,6 +39,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -56,7 +58,7 @@ Dynamic::ParameterList::ParameterList (void)
 Dynamic::ParameterList::ParameterList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Dynamic::Parameter
       >
     (max)
@@ -68,7 +70,7 @@ Dynamic::ParameterList::ParameterList (
     Dynamic::Parameter * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Dynamic::Parameter
       >
     (max, length, buffer, release)
@@ -77,7 +79,7 @@ Dynamic::ParameterList::ParameterList (
 Dynamic::ParameterList::ParameterList (
     const ParameterList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Dynamic::Parameter
       >
     (seq)
@@ -110,7 +112,7 @@ Dynamic::ExceptionList::ExceptionList (void)
 Dynamic::ExceptionList::ExceptionList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         CORBA::TypeCode,
         CORBA::TypeCode_var
       >
@@ -123,7 +125,7 @@ Dynamic::ExceptionList::ExceptionList (
     CORBA::TypeCode_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         CORBA::TypeCode,
         CORBA::TypeCode_var
       >
@@ -133,7 +135,7 @@ Dynamic::ExceptionList::ExceptionList (
 Dynamic::ExceptionList::ExceptionList (
     const ExceptionList &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         CORBA::TypeCode,
         CORBA::TypeCode_var
       >
@@ -165,22 +167,7 @@ CORBA::Boolean operator<< (
     const Dynamic::ParameterList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -188,40 +175,7 @@ CORBA::Boolean operator>> (
     Dynamic::ParameterList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-
-    }
-
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
@@ -238,25 +192,7 @@ CORBA::Boolean operator<< (
     const Dynamic::ExceptionList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::TypeCode>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -264,40 +200,9 @@ CORBA::Boolean operator>> (
     Dynamic::ExceptionList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-
-      return _tao_marshal_flag;
-
-    }
-
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h
index 76b095d02f0..92e2d9ba9b9 100644
--- a/TAO/tao/AnyTypeCode/DynamicC.h
+++ b/TAO/tao/AnyTypeCode/DynamicC.h
@@ -70,6 +70,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -96,22 +98,19 @@ namespace Dynamic
 
   typedef
     TAO_VarSeq_Var_T<
-        ParameterList,
-        Parameter
+        ParameterList
       >
     ParameterList_var;
 
   typedef
     TAO_Seq_Out_T<
-        ParameterList,
-        ParameterList_var,
-        Parameter
+        ParameterList
       >
     ParameterList_out;
 
   class TAO_AnyTypeCode_Export ParameterList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             Parameter
           >
   {
@@ -122,7 +121,7 @@ namespace Dynamic
         CORBA::ULong max,
         CORBA::ULong length,
         Parameter* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ParameterList (const ParameterList &);
     ~ParameterList (void);
@@ -151,29 +150,20 @@ namespace Dynamic
   class ExceptionList;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ExceptionList,
-        TAO_Object_Manager<
-            CORBA::TypeCode,
-            CORBA::TypeCode_var
-          >
+    TAO_VarSeq_Var_T<
+        ExceptionList
       >
     ExceptionList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ExceptionList,
-        ExceptionList_var,
-        TAO_Object_Manager<
-            CORBA::TypeCode,
-            CORBA::TypeCode_var
-          >
+    TAO_Seq_Out_T<
+        ExceptionList
       >
     ExceptionList_out;
 
   class TAO_AnyTypeCode_Export ExceptionList
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             CORBA::TypeCode,
             CORBA::TypeCode_var
           >
@@ -185,7 +175,7 @@ namespace Dynamic
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::TypeCode_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExceptionList (const ExceptionList &);
     ~ExceptionList (void);
@@ -251,6 +241,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
index f82dd8ba366..038b00daf99 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          Dynamic_Parameter.pidl
  *
  */
@@ -27,7 +29,7 @@
 #ifndef _DYNAMIC_PARAMETER_IDL_
 #define _DYNAMIC_PARAMETER_IDL_
 
-#include <ParameterMode.pidl>
+#include "tao/ParameterMode.pidl"
 
 module Dynamic
 {
diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp
index df1f94abd24..6376ab32799 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Dynamic_ParameterA.h"
+#include "tao/AnyTypeCode/Dynamic_ParameterA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,6 +37,8 @@
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/AnyTypeCode/ParameterModeA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -122,3 +124,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h
index 25b861466fd..facb3803731 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h
@@ -60,6 +60,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Dynamic
 {
 
@@ -89,6 +91,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dyn
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp
index b681433ed5e..093e3c79f27 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Dynamic_ParameterC.h"
+#include "tao/AnyTypeCode/Dynamic_ParameterC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,6 +39,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -80,3 +82,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.argument) &&
     (strm >> _tao_aggregate.mode);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h
index 1647bfc6b91..e5533c2b7dc 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Dynamic
 {
 
@@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Param
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 6f9f5589c15..1294bdd0fe6 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Empty_Param_TypeCode.h"
+#include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
 
 #ifndef __ACE_INLINE__
-# include "Empty_Param_TypeCode.inl"
+# include "tao/AnyTypeCode/Empty_Param_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
 
@@ -12,6 +12,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
                                          CORBA::ULong) const
@@ -44,7 +46,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
   // Equality has already been established in the
   // CORBA::TypeCode base class.
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -60,12 +62,12 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
   CORBA::TCKind const tc_kind =
     TAO::unaliased_kind (tc
                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_kind != this->kind_)
-    return 0;
+    return false;
 
-  return 1;
+  return true;
 }
 
 CORBA::TypeCode_ptr
@@ -81,3 +83,5 @@ TAO::TypeCode::Empty_Param::get_compact_typecode_i (
 
   return &compact_typecode;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index 4b39c0cf73a..62b9936a1a9 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -88,6 +90,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Empty_Param_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
index 85ec45fd029..0cf77cec3bc 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
@@ -2,9 +2,12 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k)
-  : CORBA::TypeCode (k)
+  : ::CORBA::TypeCode (k)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 112f3cc463e..b84a50f9b72 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -15,6 +15,7 @@
 # include "tao/AnyTypeCode/Enum_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 bool
@@ -89,10 +90,10 @@ TAO::TypeCode::Enum<StringType,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nenumerators != this->nenumerators_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
     {
@@ -102,13 +103,13 @@ TAO::TypeCode::Enum<StringType,
         Traits<StringType>::get_string (lhs_enumerator);
       char const * const rhs_name = tc->member_name (i
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
@@ -124,12 +125,12 @@ TAO::TypeCode::Enum<StringType,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nenumerators != this->nenumerators_)
-    return 0;
+    return false;
 
-  return 1;
+  return true;
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
@@ -218,4 +219,6 @@ TAO::TypeCode::Enum<StringType,
   return Traits<StringType>::get_string (this->enumerators_[index]);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_ENUM_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index e85387209d6..64a4d7bf9b0 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -25,6 +25,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -122,6 +123,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Enum_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
index 8b8e04f8632..64c14e65f51 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           class EnumeratorArrayType,
@@ -12,10 +13,12 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
   char const * name,
   EnumeratorArrayType const & enumerators,
   CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
+  : ::CORBA::TypeCode (CORBA::tk_enum)
   , RefCountPolicy ()
   , base_attributes_ (id, name)
   , nenumerators_ (nenumerators)
   , enumerators_ (enumerators)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 930fb10eaf2..64cd8f00d37 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -13,10 +13,11 @@
 #endif  /* !__ACE_INLINE__ */
 
 
-ACE_RCSID (tao,
+ACE_RCSID (AnyTypeCode,
            Enum_TypeCode_Static,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Enum<char const *,
@@ -86,10 +87,10 @@ TAO::TypeCode::Enum<char const *,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nenumerators != this->nenumerators_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
     {
@@ -99,13 +100,13 @@ TAO::TypeCode::Enum<char const *,
         Traits<char const *>::get_string (lhs_enumerator);
       char const * const rhs_name = tc->member_name (i
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -120,12 +121,12 @@ TAO::TypeCode::Enum<char const *,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nenumerators != this->nenumerators_)
-    return 0;
+    return false;
 
-  return 1;
+  return true;
 }
 
 CORBA::TypeCode_ptr
@@ -212,3 +213,5 @@ TAO::TypeCode::Enum<char const *,
 
   return Traits<char const *>::get_string (this->enumerators_[index]);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
index e8b78607c85..d9f22d44271 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -26,6 +26,7 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -127,6 +128,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
index 1d2ab5ca8cb..8d2f31eba9c 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
@@ -11,10 +13,12 @@ TAO::TypeCode::Enum<char const *,
   char const * name,
   char const * const * enumerators,
   CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (CORBA::tk_enum)
+  , ::TAO::Null_RefCount_Policy ()
   , base_attributes_ (id, name)
   , nenumerators_ (nenumerators)
   , enumerators_ (enumerators)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index ba97c942cdb..138d2bc2b6d 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ExceptionA.h"
-#include "Any_Dual_Impl_T.h"
+#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"
@@ -20,6 +20,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Specializations for CORBA::Exception Any operators.
 namespace TAO
 {
@@ -42,14 +44,14 @@ namespace TAO
                                    ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        return 1;
+        return true;
       }
     ACE_CATCHANY
       {
       }
     ACE_ENDTRY;
 
-    return 0;
+    return false;
   }
 
   template<>
@@ -62,14 +64,14 @@ namespace TAO
                                    ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        return 1;
+        return true;
       }
     ACE_CATCHANY
       {
       }
     ACE_ENDTRY;
 
-    return 0;
+    return false;
   }
 
   // This should never get called since we don't have extraction operators
@@ -85,7 +87,7 @@ namespace TAO
       const CORBA::Exception *&
     )
   {
-    return 0;
+    return false;
   }
 }
 
@@ -116,3 +118,5 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception)
     );
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h
index 05d608f4403..44f6cd6834c 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.h
+++ b/TAO/tao/AnyTypeCode/ExceptionA.h
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Exception.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -44,6 +46,8 @@ namespace CORBA
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/"ace/post.h"
 
 #endif /* TAO_EXCEPTIONA_H */
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index d0adfdcb7b0..0fae62d507c 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -10,6 +10,7 @@
 # include "tao/AnyTypeCode/Fixed_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class RefCountPolicy>
 bool
@@ -107,5 +108,6 @@ TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
   return this->scale_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_FIXED_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 740ae58de8e..3e300cb3658 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -95,6 +97,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Fixed_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
index 9db9ca2b26d..62f3e63aac5 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
@@ -2,13 +2,17 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
                                              CORBA::UShort scale)
-  : CORBA::TypeCode (CORBA::tk_fixed)
+  : ::CORBA::TypeCode (CORBA::tk_fixed)
   , RefCountPolicy ()
   , digits_ (digits)
   , scale_ (scale)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp
index 2d7b5761009..4f33cff12e0 100644
--- a/TAO/tao/AnyTypeCode/FloatSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/FloatSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "FloatSeqA.h"
+#include "tao/AnyTypeCode/FloatSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h
index 149932f1466..e43fd256d73 100644
--- a/TAO/tao/AnyTypeCode/FloatSeqA.h
+++ b/TAO/tao/AnyTypeCode/FloatSeqA.h
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::FloatSeq*); //
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::FloatSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::FloatSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/GIOPA.cpp b/TAO/tao/AnyTypeCode/GIOPA.cpp
index 2e6898c7486..6e5788601b7 100644
--- a/TAO/tao/AnyTypeCode/GIOPA.cpp
+++ b/TAO/tao/AnyTypeCode/GIOPA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "GIOPA.h"
+#include "tao/AnyTypeCode/GIOPA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +38,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -326,3 +328,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/GIOPA.h b/TAO/tao/AnyTypeCode/GIOPA.h
index b6b51cc4f1b..7971878edcc 100644
--- a/TAO/tao/AnyTypeCode/GIOPA.h
+++ b/TAO/tao/AnyTypeCode/GIOPA.h
@@ -39,6 +39,7 @@
 #include "tao/AnyTypeCode/IOP_IORA.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
@@ -95,6 +96,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); //
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/IIOPA.cpp b/TAO/tao/AnyTypeCode/IIOPA.cpp
index 89720b384a9..0af44ddaac6 100644
--- a/TAO/tao/AnyTypeCode/IIOPA.cpp
+++ b/TAO/tao/AnyTypeCode/IIOPA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IIOPA.h"
+#include "tao/AnyTypeCode/IIOPA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,6 +37,9 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -319,3 +322,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/IIOPA.h b/TAO/tao/AnyTypeCode/IIOPA.h
index 58fc4b53f3a..52931766bc1 100644
--- a/TAO/tao/AnyTypeCode/IIOPA.h
+++ b/TAO/tao/AnyTypeCode/IIOPA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace IIOP
 {
 
@@ -88,6 +90,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceCon
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp
index d528ac270c4..ce4520e630a 100644
--- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp
+++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IIOP_EndpointsA.h"
+#include "tao/AnyTypeCode/IIOP_EndpointsA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +38,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -231,3 +233,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h
index b62fc8976f1..e7f1f677145 100644
--- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h
+++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -106,6 +108,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/IOPA.cpp b/TAO/tao/AnyTypeCode/IOPA.cpp
index 77398cd1a3b..a6f7e67bc7c 100644
--- a/TAO/tao/AnyTypeCode/IOPA.cpp
+++ b/TAO/tao/AnyTypeCode/IOPA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IOPA.h"
+#include "tao/AnyTypeCode/IOPA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.cpp b/TAO/tao/AnyTypeCode/IOP_IORA.cpp
index 0c9e8f27150..0538c9143dc 100644
--- a/TAO/tao/AnyTypeCode/IOP_IORA.cpp
+++ b/TAO/tao/AnyTypeCode/IOP_IORA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IOP_IORA.h"
+#include "tao/AnyTypeCode/IOP_IORA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,6 +37,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -995,3 +997,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.h b/TAO/tao/AnyTypeCode/IOP_IORA.h
index 081015c697f..aecc75df280 100644
--- a/TAO/tao/AnyTypeCode/IOP_IORA.h
+++ b/TAO/tao/AnyTypeCode/IOP_IORA.h
@@ -39,6 +39,8 @@
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -182,6 +184,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*)
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp
index 98e266b808a..61f889f87c9 100644
--- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "LongDoubleSeqA.h"
+#include "tao/AnyTypeCode/LongDoubleSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h
index 1462f4a097c..7c4b3675985 100644
--- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -92,6 +94,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp
index 237cc42e778..1546a6a5106 100644
--- a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "LongLongSeqA.h"
+#include "tao/AnyTypeCode/LongLongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.h b/TAO/tao/AnyTypeCode/LongLongSeqA.h
index ba99c7410b9..12256367f76 100644
--- a/TAO/tao/AnyTypeCode/LongLongSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -92,6 +94,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/LongSeqA.cpp b/TAO/tao/AnyTypeCode/LongSeqA.cpp
index ac83fdac8db..fdf7bc45be2 100644
--- a/TAO/tao/AnyTypeCode/LongSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/LongSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "LongSeqA.h"
+#include "tao/AnyTypeCode/LongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/LongSeqA.h b/TAO/tao/AnyTypeCode/LongSeqA.h
index 29beb356664..0d639f5719c 100644
--- a/TAO/tao/AnyTypeCode/LongSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongSeqA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index f3cab27779d..22219d0a0e0 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -32,6 +32,8 @@ ACE_RCSID (tao,
            Marshal,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Marshal_Object::~TAO_Marshal_Object (void)
 {
 }
@@ -255,3 +257,4 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h
index 94e98d86f81..6232bc5f87d 100644
--- a/TAO/tao/AnyTypeCode/Marshal.h
+++ b/TAO/tao/AnyTypeCode/Marshal.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class TypeCode;
@@ -447,6 +449,8 @@ private:
   CORBA::Boolean nested_processing_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/Marshal.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl
index 8b78849a003..9c632873b55 100644
--- a/TAO/tao/AnyTypeCode/Marshal.inl
+++ b/TAO/tao/AnyTypeCode/Marshal.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Marshal_Object::TAO_Marshal_Object (void)
 {
@@ -75,3 +79,5 @@ TAO_Marshal_Value::TAO_Marshal_Value (void)
   : nested_processing_ (0)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp
index 6d77541a020..345f3034f92 100644
--- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp
+++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_PolicyValueA.h"
+#include "tao/AnyTypeCode/Messaging_PolicyValueA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -41,6 +41,8 @@
 #include "tao/AnyTypeCode/Policy_ForwardA.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -238,3 +240,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h
index f6d5e0d7474..ea8e563befd 100644
--- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h
+++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
   // TAO_IDL - Generated from
@@ -108,6 +110,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Mes
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index dcc9e9ec042..c7a98213742 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -3,11 +3,11 @@
 
 // Implementation of Named Value List and NamedValue classes
 
-#include "NVList.h"
-#include "BoundsC.h"
-#include "TypeCode.h"
-#include "Marshal.h"
-#include "Any_Impl.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/BoundsC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 
 #include "tao/SystemException.h"
 #include "tao/CORBA_String.h"
@@ -18,13 +18,15 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-# include "NVList.inl"
+# include "tao/AnyTypeCode/NVList.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            NVList,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Reference counting for DII Request object
 
 CORBA::ULong
@@ -80,7 +82,7 @@ CORBA::NVList::~NVList (void)
 
   for (iter.first (); !iter.done (); iter.advance ())
     {
-      CORBA::NamedValue_ptr *nv;
+      CORBA::NamedValue_ptr *nv = 0;
       (void) iter.next (nv);
       delete *nv;
     }
@@ -413,7 +415,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 
   for (i.first (); !i.done (); i.advance ())
     {
-      CORBA::NamedValue_ptr *item;
+      CORBA::NamedValue_ptr *item = 0;
       (void) i.next (item);
 
       CORBA::NamedValue_ptr nv = *item;
@@ -496,3 +498,4 @@ CORBA::NVList::_lazy_has_arguments (void) const
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index 0b7cf469847..48d5a65d5f9 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -33,7 +33,8 @@
 #include "ace/Atomic_Op.h"
 
 
-class TAO_ORB_Core;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_InputCDR;
 
 namespace CORBA
@@ -301,6 +302,8 @@ namespace CORBA
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/NVList.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl
index 035279feaf6..e89db0e4dfb 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::NamedValue_ptr nv)
 {
@@ -124,3 +126,5 @@ CORBA::NVList::_nil (void)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 212a10a3dbf..7ed8cb3d983 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (AnyTypeCode,
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_NVList_Adapter_Impl::create_list (
       CORBA::Long count,
@@ -68,6 +70,8 @@ TAO_NVList_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl,
                        ACE_TEXT ("TAO_NVList_Adapter"),
                        ACE_SVC_OBJ_T,
@@ -75,5 +79,3 @@ ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl,
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 ACE_FACTORY_DEFINE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl)
-
-
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
index 60593941e08..e24ebd357c5 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "tao/NVList_Adapter.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_NVList_Adapter
  */
@@ -44,13 +46,14 @@ public:
   static int Initializer (void);
 };
 
+static int TAO_Requires_NVList_Adapter_Impl_Initializer =
+  TAO_NVList_Adapter_Impl::Initializer ();
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_NVList_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl)
 
-static int
-TAO_Requires_NVList_Adapter_Impl_Initializer =
-  TAO_NVList_Adapter_Impl::Initializer ();
-
 
 #include /**/ "ace/post.h"
 #endif /* TAO_NVLIST_ADAPTER_IMPL_H */
diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
index 9206227ec0d..8a39b8e9c52 100644
--- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
@@ -24,6 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -73,6 +77,8 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_NULL_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp
index 409a8b0e341..5e1c5439010 100644
--- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp
+++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp
@@ -25,13 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectIdListA.h"
+#include "tao/AnyTypeCode/ObjectIdListA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -98,3 +100,5 @@ namespace CORBA
     &_tao_tc_CORBA_ORB_ObjectIdList;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.h b/TAO/tao/AnyTypeCode/ObjectIdListA.h
index 1fedb3c212a..50fc249bcf3 100644
--- a/TAO/tao/AnyTypeCode/ObjectIdListA.h
+++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -87,6 +89,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index bf53f06da69..c897143e4dc 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -10,9 +10,11 @@
 #endif  /* !__ACE_INLINE__ */
 
 #include "tao/CDR.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, class RefCountPolicy>
 bool
@@ -150,4 +152,6 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
   return this->attributes_.name ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /*  TAO_OBJREF_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index 0e2a0e03f3a..8444669513a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -32,6 +32,8 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -104,6 +106,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Objref_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
index e40aa1e10d9..de813439b87 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, class RefCountPolicy>
 ACE_INLINE
@@ -9,8 +10,10 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref (
   CORBA::TCKind kind,
   char const * id,
   char const * name)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , attributes_ (id, name)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 69a540da1f0..dc3605222a6 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -18,6 +18,7 @@ ACE_RCSID (tao,
            Objref_TypeCode_Static,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
@@ -147,3 +148,4 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
   return this->attributes_.name ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
index f12217caef9..f67bb980e66 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -108,6 +110,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Objref_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
index 07c5d36ece2..b9492be9bf2 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
@@ -2,14 +2,17 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
   CORBA::TCKind kind,
   char const * id,
   char const * name)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , attributes_ (id, name)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp
index 66b18534bb1..dd6b7864968 100644
--- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "OctetSeqA.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h
index 159132d2448..8b94976cb20 100644
--- a/TAO/tao/AnyTypeCode/OctetSeqA.h
+++ b/TAO/tao/AnyTypeCode/OctetSeqA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // non
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp
index 6d4394780cf..fe43b76ce42 100644
--- a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp
+++ b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PI_ForwardA.h"
+#include "tao/AnyTypeCode/PI_ForwardA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/StringSeqA.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -195,3 +197,4 @@ namespace PortableInterceptor
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h
index 70124737301..f99092e4ec1 100644
--- a/TAO/tao/AnyTypeCode/PI_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h
@@ -65,6 +65,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
 
@@ -176,6 +178,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.cpp b/TAO/tao/AnyTypeCode/ParameterModeA.cpp
index 7eeaa86618c..b4a65bb1787 100644
--- a/TAO/tao/AnyTypeCode/ParameterModeA.cpp
+++ b/TAO/tao/AnyTypeCode/ParameterModeA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ParameterModeA.h"
+#include "tao/AnyTypeCode/ParameterModeA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -89,3 +91,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.h b/TAO/tao/AnyTypeCode/ParameterModeA.h
index 85dbb46597e..91bb04bd510 100644
--- a/TAO/tao/AnyTypeCode/ParameterModeA.h
+++ b/TAO/tao/AnyTypeCode/ParameterModeA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -90,6 +92,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Pa
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp
index 0594672bf8f..9d49724bc2f 100644
--- a/TAO/tao/AnyTypeCode/PolicyA.cpp
+++ b/TAO/tao/AnyTypeCode/PolicyA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PolicyA.h"
+#include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -39,6 +39,8 @@
 
 #include "tao/AnyTypeCode/UShortSeqA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -555,3 +557,5 @@ operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h
index feae0030ce9..ed2c78d1e3a 100644
--- a/TAO/tao/AnyTypeCode/PolicyA.h
+++ b/TAO/tao/AnyTypeCode/PolicyA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -140,6 +142,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Po
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp
index aae38186b03..93e73bc4856 100644
--- a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp
+++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Policy_ForwardA.h"
+#include "tao/AnyTypeCode/Policy_ForwardA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -329,3 +331,5 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.h b/TAO/tao/AnyTypeCode/Policy_ForwardA.h
index 88c0b82f339..7626097a3b9 100644
--- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h
@@ -37,6 +37,7 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/Policy_ForwardC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
@@ -98,6 +99,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp
index 0ffe043ddbe..166de771bb6 100644
--- a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp
+++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableInterceptorA.h"
+#include "tao/AnyTypeCode/PortableInterceptorA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h
index e257fccb813..4de58d5653e 100644
--- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h
+++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
 
@@ -50,6 +52,8 @@ namespace PortableInterceptor
 
 } // module PortableInterceptor
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index a96abe13a0b..be526f4b094 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-
 #include "tao/CDR.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
 bool
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
@@ -129,10 +130,12 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
 
   // Top-level TypeCode case.
   if (!(this->in_recursion_))
-    return this->ACE_NESTED_CLASS (CORBA, TypeCode)::tao_marshal_kind (cdr);
+    return this->::CORBA::TypeCode::tao_marshal_kind (cdr);
 
   // Recursive/indirected TypeCode case.
   CORBA::ULong const indirection_kind = 0xffffffff;
 
   return (cdr << indirection_kind);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 08b0025560c..027100bb476 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -18,9 +18,11 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Recursive_Thread_Mutex.h"
 #include "tao/Basic_Types.h"
 #include "tao/Typecode_typesC.h"
+#include "ace/Recursive_Thread_Mutex.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -198,6 +200,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
index 7f7a5ea6fe8..efd9091a125 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
 ACE_INLINE
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
@@ -147,3 +149,5 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
   this->fields_        = fields;
   this->nfields_       = nfields;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h
index fd9a09754c5..d5e4f08d50d 100644
--- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h
+++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h
@@ -24,12 +24,14 @@
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class Null_RefCount_Policy;
   class True_RefCount_Policy;
 
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
   /**
    * @struct RefCount_Policy_Traits
    *
@@ -71,36 +73,10 @@ namespace TAO
       CORBA::release (ptr);
     }
   };
-
-#else
-
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an alternate implementation.
-
-  template<class RefCountPolicy> struct RefCount_Policy_Traits;
-
-  template<>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return false;
-    }
-  };
-
-  template<>
-  struct RefCount_Policy_Traits<True_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return true;
-    }
-  };
-
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
-
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REFCOUNT_POLICY_TRAITS_H */
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
index a3b7c2e458c..76016fe93fe 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -11,6 +11,7 @@
 # include "tao/AnyTypeCode/Sequence_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename TypeCodeType, class RefCountPolicy>
 bool
@@ -144,5 +145,6 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (
       Traits<TypeCodeType>::get_typecode (this->content_type_));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_SEQUENCE_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 555511402c0..3b8cd242ade 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -23,6 +23,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -115,6 +118,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Sequence_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
index 81e7add5646..eced0644709 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename TypeCodeType, class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
@@ -14,10 +16,12 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
   TypeCodeType const & content_type,
 #endif
   CORBA::ULong length)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , content_type_ (content_type)
   , length_ (length)
 {
   // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index d0ab50e8dde..e967f69c096 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -13,6 +13,7 @@ ACE_RCSID (tao,
            Sequence_TypeCode_Static,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
@@ -145,3 +146,5 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
     CORBA::TypeCode::_duplicate (
       Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
index 7975d403192..7c3d4746fbc 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -26,6 +26,7 @@
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -115,6 +116,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Sequence_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
index 27e98729656..84361bf52de 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
@@ -2,15 +2,19 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::Sequence (
   CORBA::TCKind kind,
   CORBA::TypeCode_ptr const * content_type,
   CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , content_type_ (content_type)
   , length_ (length)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp
index 2fa2316ff53..0030c4e2c44 100644
--- a/TAO/tao/AnyTypeCode/ServicesA.cpp
+++ b/TAO/tao/AnyTypeCode/ServicesA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServicesA.h"
+#include "tao/AnyTypeCode/ServicesA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -516,3 +518,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ServicesA.h b/TAO/tao/AnyTypeCode/ServicesA.h
index 87b6aca143f..7a422b3358a 100644
--- a/TAO/tao/AnyTypeCode/ServicesA.h
+++ b/TAO/tao/AnyTypeCode/ServicesA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp
index ed70a459f81..f876b863891 100644
--- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ShortSeqA.h"
+#include "tao/AnyTypeCode/ShortSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h
index f3f6f53c485..5c450473eb1 100644
--- a/TAO/tao/AnyTypeCode/ShortSeqA.h
+++ b/TAO/tao/AnyTypeCode/ShortSeqA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // non
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp
index df52b396d70..1016edf61df 100644
--- a/TAO/tao/AnyTypeCode/StringSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "StringSeqA.h"
+#include "tao/AnyTypeCode/StringSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -141,3 +143,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h
index a97892b5181..c26b6c77dee 100644
--- a/TAO/tao/AnyTypeCode/StringSeqA.h
+++ b/TAO/tao/AnyTypeCode/StringSeqA.h
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // no
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
index 8542fc7ce99..bae404af34e 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -10,6 +10,7 @@
 # include "tao/AnyTypeCode/String_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class RefCountPolicy>
 bool
@@ -87,5 +88,6 @@ TAO::TypeCode::String<RefCountPolicy>::length_i (
   return this->length_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_STRING_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 628e251c491..86a7270f12b 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -93,6 +95,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/String_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.inl b/TAO/tao/AnyTypeCode/String_TypeCode.inl
index 90e8e887c3b..c83c7be8667 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl
@@ -2,13 +2,17 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
                                                CORBA::ULong length)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , length_ (length)
 {
   // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index a0817ca8c31..60783babaec 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
   TAO_OutputCDR & cdr,
@@ -82,3 +84,5 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
 {
   return this->length_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
index 9bd90692793..8911843a9ee 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -26,6 +26,7 @@
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -97,6 +98,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/String_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
index 4d42413daa1..f9b3517f049 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
@@ -2,13 +2,17 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
   CORBA::TCKind kind,
   CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , length_ (length)
 {
   // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
index 14287963745..670e6a835ba 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
@@ -28,6 +28,9 @@
 #include "tao/AnyTypeCode/String_TypeCode.h"
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCodeFactory
@@ -71,6 +74,7 @@ namespace TAO
   }  // End namespace TypeCodeFactory
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index 65ad7720597..aa50e7bdf78 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -17,6 +17,7 @@
 
 #include "ace/Dynamic_Service.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -343,4 +344,6 @@ TAO::TypeCode::Struct<StringType,
       Traits<StringType>::get_typecode (this->fields_[index].type));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_STRUCT_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index dc356f07447..df44f2d2a3a 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -27,6 +27,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -137,6 +138,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Struct_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
index eb3da52ae7e..d064338ee22 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -17,7 +18,7 @@ TAO::TypeCode::Struct<StringType,
   char const * name,
   FieldArrayType const & fields,
   CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , base_attributes_ (id, name)
   , nfields_ (nfields)
@@ -36,7 +37,7 @@ TAO::TypeCode::Struct<StringType,
                       RefCountPolicy>::Struct (
   CORBA::TCKind kind,
   char const * id)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , base_attributes_ (id)
   , nfields_ (0)
@@ -45,3 +46,5 @@ TAO::TypeCode::Struct<StringType,
   // CORBA::tk_except is not allowed in the recursive TypeCode case.
   // ACE_ASSERT (kind == CORBA::tk_struct);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 41211b42d25..8228c5de001 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -314,3 +316,5 @@ TAO::TypeCode::Struct<char const *,
     CORBA::TypeCode::_duplicate (
       Traits<char const *>::get_typecode (this->fields_[index].type));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index b923b4c9917..dea9405238b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -28,6 +28,7 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -142,6 +143,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
index f32a858b845..7b2d60faa3f 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Struct<char const *,
@@ -14,10 +15,12 @@ TAO::TypeCode::Struct<char const *,
   char const * name,
   Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
   CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , base_attributes_ (id, name)
   , nfields_ (nfields)
   , fields_ (fields)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
index 44271253ab5..c11f3984ef3 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "SystemExceptionA.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
-#include "TypeCode_Constants.h"
-#include "Enum_TypeCode_Static.h"
-#include "TypeCode_Struct_Field.h"
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/SystemExceptionA.h"
+#include "tao/AnyTypeCode/Any_SystemException.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
 #include "tao/CORBA_String.h"
 
@@ -16,9 +16,12 @@ ACE_RCSID (tao,
            SystemExceptionA,
            "$Id$")
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 // List of standard/system exceptions ... used to create static
 // storage for their typecodes.
@@ -178,3 +181,5 @@ CORBA::Boolean operator>>= (const CORBA::Any &any, \
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.h b/TAO/tao/AnyTypeCode/SystemExceptionA.h
index 75fc6dfd459..b6ca62d2e55 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.h
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h
@@ -20,6 +20,8 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class TypeCode;
@@ -82,6 +84,8 @@ namespace CORBA
 
 } // End CORBA namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SYSTEMEXCEPTIONA_H */
diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp
index 4230f001fc7..cf036da5c50 100644
--- a/TAO/tao/AnyTypeCode/TAOA.cpp
+++ b/TAO/tao/AnyTypeCode/TAOA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TAOA.h"
+#include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,6 +37,8 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -162,3 +164,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TAOA.h b/TAO/tao/AnyTypeCode/TAOA.h
index 131c8b6eff0..1a68c91f64b 100644
--- a/TAO/tao/AnyTypeCode/TAOA.h
+++ b/TAO/tao/AnyTypeCode/TAOA.h
@@ -43,6 +43,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -74,6 +76,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h
index b66ae8db4d2..e0d8853654d 100644
--- a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h
+++ b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h
@@ -1,113 +1,20 @@
 // -*- C++ -*-
 
-//=============================================================================
+// -------------------------------------------------------------
 /**
- *  @file   TC_Constants_Forward.h
+ * @file TC_Constants_Forward.h
  *
- *  $Id$
+ * $Id$
  *
- *  Forward declare the type code constants used in the ORB.
+ * Backward compatibility header.
  *
- *  @author Jeff Parsons
+ * @deprecated Use TypeCode_Constants.h instead.
  */
-//=============================================================================
+// -------------------------------------------------------------
 
 #ifndef TAO_TC_CONSTANTS_FORWARD_H
 #define TAO_TC_CONSTANTS_FORWARD_H
 
-#include /**/ "ace/pre.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
-#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_null;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_void;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_short;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_long;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_float;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_double;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_char;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_octet;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_any;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Principal;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Object;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_string;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wstring;
-
-#define TAO_SYSTEM_EXCEPTION_LIST \
-  TAO_SYSTEM_EXCEPTION(UNKNOWN); \
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
-  TAO_SYSTEM_EXCEPTION(INTERNAL); \
-  TAO_SYSTEM_EXCEPTION(MARSHAL); \
-  TAO_SYSTEM_EXCEPTION(INITIALIZE); \
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
-  TAO_SYSTEM_EXCEPTION(TRANSIENT); \
-  TAO_SYSTEM_EXCEPTION(FREE_MEM); \
-  TAO_SYSTEM_EXCEPTION(INV_IDENT); \
-  TAO_SYSTEM_EXCEPTION(INV_FLAG); \
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
-  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
-  TAO_SYSTEM_EXCEPTION(REBIND); \
-  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
-  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
-  TAO_SYSTEM_EXCEPTION(BAD_QOS); \
-  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-  //@}
-
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_UnknownUserException;
-
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current;
-
-  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue;
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TC_CONSTANTS_FORWARD_H */
+#endif  /* TAO_TC_CONSTANTS_FORWARD_H */
diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp
index 444c8d69f0a..1cb54f59417 100644
--- a/TAO/tao/AnyTypeCode/TimeBaseA.cpp
+++ b/TAO/tao/AnyTypeCode/TimeBaseA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TimeBaseA.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -269,3 +271,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.h b/TAO/tao/AnyTypeCode/TimeBaseA.h
index c75cc8715c4..c18a4a4f8d2 100644
--- a/TAO/tao/AnyTypeCode/TimeBaseA.h
+++ b/TAO/tao/AnyTypeCode/TimeBaseA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TimeBase
 {
 
@@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Tim
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 3b5b3fab354..2c7190d82bf 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
 #ifndef  __ACE_INLINE__
 # include  "True_RefCount_Policy.inl"
@@ -11,7 +11,10 @@ ACE_RCSID (tao,
            True_RefCount_Policy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
index 89035c00f47..6bef507fae0 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -29,6 +29,8 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -106,6 +108,7 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/True_RefCount_Policy.inl"
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
index 87b1b1b9159..db9631237de 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::True_RefCount_Policy::True_RefCount_Policy (void)
@@ -23,3 +24,5 @@ TAO::True_RefCount_Policy::remove_ref (void)
   if (new_count == 0)
     delete this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index a84b422f4b0..cb811228132 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 ACE_RCSID (tao,
            TypeCode,
@@ -8,7 +8,7 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "TypeCode.inl"
+# include "tao/AnyTypeCode/TypeCode.inl"
 #endif /* ! __ACE_INLINE__ */
 
 #include "tao/SystemException.h"
@@ -18,6 +18,7 @@ ACE_RCSID (tao,
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::TypeCode::~TypeCode (void)
 {
@@ -332,7 +333,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
 CORBA::Exception *
 CORBA::TypeCode::BadKind::_tao_duplicate (void) const
 {
-  CORBA::Exception *result;
+  CORBA::Exception *result = 0;
   ACE_NEW_RETURN (result,
                   CORBA::TypeCode::BadKind (*this),
                   0);
@@ -454,7 +455,7 @@ namespace TAO
   void
   Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p)
   {
-    CORBA::release (p);
+    ::CORBA::release (p);
   }
 
   CORBA::TypeCode_ptr
@@ -485,3 +486,4 @@ TAO::unaliased_kind (CORBA::TypeCode_ptr tc
   return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index dd9a6d7b2bb..93edd808684 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -42,6 +42,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
@@ -579,6 +581,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/AnyTypeCode/TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl
index 64cd68fe7c1..f06f9f5ba2d 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode.inl
@@ -4,6 +4,8 @@
 
 #include "tao/Environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::TypeCode_ptr obj)
 {
@@ -153,6 +155,8 @@ CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
 ACE_INLINE void
 CORBA::TypeCode::_tao_any_destructor (void * x)
 {
-  CORBA::release (static_cast <CORBA::TypeCode_ptr> (x));
+  ::CORBA::release (static_cast <CORBA::TypeCode_ptr> (x));
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
index 6ff09fdf2cc..aa229493ecc 100644
--- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
 
 ACE_RCSID (tao,
@@ -9,6 +9,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -57,3 +59,5 @@ CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind =
 CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds =
   &TAO::TypeCode::tc_Bounds;
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
index 4771d75d95b..03740852534 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCode
@@ -77,6 +81,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Base_Attributes.inl"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
index d94e65040a6..915e4ed9411 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
@@ -4,6 +4,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Traits.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename STRING_TYPE>
 ACE_INLINE
@@ -49,3 +50,5 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name)
 
   this->name_ = the_name;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index 3ad634f15a7..769d6760258 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -1,35 +1,38 @@
 // $Id$
 
-#include "TypeCode_CDR_Extraction.h"
+#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h"
 
-#include "TypeCode_Constants.h"
-#include "True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
-#include "Alias_TypeCode.h"
-#include "Enum_TypeCode.h"
-#include "Fixed_TypeCode.h"
-#include "Objref_TypeCode.h"
-#include "Sequence_TypeCode.h"
-#include "String_TypeCode.h"
-#include "Struct_TypeCode.h"
-#include "Union_TypeCode.h"
-#include "Value_TypeCode.h"
+#include "tao/AnyTypeCode/Alias_TypeCode.h"
+#include "tao/AnyTypeCode/Enum_TypeCode.h"
+#include "tao/AnyTypeCode/Fixed_TypeCode.h"
+#include "tao/AnyTypeCode/Objref_TypeCode.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode.h"
+#include "tao/AnyTypeCode/String_TypeCode.h"
+#include "tao/AnyTypeCode/Struct_TypeCode.h"
+#include "tao/AnyTypeCode/Union_TypeCode.h"
+#include "tao/AnyTypeCode/Value_TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
 
-#include "Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 
-#include "TypeCode_Case_T.h"
-#include "TypeCode_Struct_Field.h"
-#include "TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Case_T.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 
 #include "tao/CDR.h"
 
 #include "ace/Array_Base.h"
+#include "ace/Value_Ptr.h"
 
 
 ACE_RCSID (tao,
            TypeCode_CDR_Extraction,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -102,7 +105,7 @@ namespace
                                  TAO::TypeCodeFactory::TC_Info_List & infos);
 
   bool find_recursive_tc (char const * id,
-                          CORBA::TypeCode_ptr & tc,
+                          TAO::TypeCodeFactory::TC_Info_List & tcs,
                           TAO::TypeCodeFactory::TC_Info_List & infos)
   {
     // See comments above for rationale behind using an array instead
@@ -116,12 +119,18 @@ namespace
 
         if (ACE_OS::strcmp (info.id, id) == 0)
           {
-            tc = info.type;
-            return true;
+            // We have a mathing 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;
+
+            TAO::TypeCodeFactory::TC_Info & new_info = tcs[old_size];
+            new_info.type = info.type;
           }
       }
 
-    return false;
+    return (tcs.size () > 0) ;
   }
 }
 
@@ -406,7 +415,8 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
 
 
   // Check if struct TypeCode is recursive.
-  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos))
+  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos))
     {
       // Set remaining parameters.
 
@@ -415,14 +425,23 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
                                             member_array_type>
         recursive_typecode_type;
 
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
+      size_t const len = recursive_tc.size ();
+
+      for (size_t i = 0; i < len; ++i)
+        {
+          TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i];
+
+          recursive_typecode_type * const rtc =
+            dynamic_cast<recursive_typecode_type *> (info.type);
 
-      ACE_ASSERT (rtc);
+          ACE_ASSERT (rtc);
 
-      rtc->struct_parameters (name.in (),
-                              fields,
-                              nfields);
+          rtc->struct_parameters (name.in (),
+                                  fields,
+                                  nfields);
+        }
+
+      tc = recursive_tc[0].type;
     }
   else
     {
@@ -493,7 +512,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
     {
       elem_type & member = cases[i];
 
-      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case;
+      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case = 0;
 
       // Ugly.  *sigh*
       switch (discriminant_kind)
@@ -644,8 +663,9 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
                                case_array_type,
                                TAO::True_RefCount_Policy> typecode_type;
 
-  // Check if union TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
+  // Check if we have recursive members, this could be multiple
+  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+  if (find_recursive_tc (id.in (), recursive_tc, infos))
     {
       // Set remaining parameters.
 
@@ -654,16 +674,25 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
                                             case_array_type>
         recursive_typecode_type;
 
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
+      size_t const len = recursive_tc.size ();
+
+      for (size_t i = 0; i < len; ++i)
+        {
+          TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i];
+
+          recursive_typecode_type * const rtc =
+            dynamic_cast<recursive_typecode_type *> (info.type);
 
-      ACE_ASSERT (rtc);
+          ACE_ASSERT (rtc);
 
-      rtc->union_parameters (name.in (),
-                             discriminant_type,
-                             cases,     // Will be copied.
-                             ncases,
-                             default_index);
+          rtc->union_parameters (name.in (),
+                                 discriminant_type,
+                                 cases,     // Will be copied.
+                                 ncases,
+                                 default_index);
+        }
+
+      tc = recursive_tc[0].type;
     }
   else
     {
@@ -990,7 +1019,8 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
     TAO::True_RefCount_Policy> typecode_type;
 
   // Check if valuetype/eventtype TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
+  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+  if (find_recursive_tc (id.in (), recursive_tc, infos))
     {
       // Set remaining parameters.
 
@@ -999,16 +1029,24 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
                                             member_array_type>
         recursive_typecode_type;
 
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
+      size_t const len = recursive_tc.size ();
+
+      for (size_t i = 0; i < len; ++i)
+        {
+          TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i];
+
+          recursive_typecode_type * const rtc =
+            dynamic_cast<recursive_typecode_type *> (info.type);
 
-      ACE_ASSERT (rtc);
+          ACE_ASSERT (rtc);
 
-      rtc->valuetype_parameters (name.in (),
-                                 type_modifier,
-                                 concrete_base,
-                                 fields,     // Will be copied.
-                                 nfields);
+          rtc->valuetype_parameters (name.in (),
+                                     type_modifier,
+                                     concrete_base,
+                                     fields,     // Will be copied.
+                                     nfields);
+        }
+      tc = recursive_tc[0].type;
     }
   else
     {
@@ -1220,94 +1258,132 @@ namespace
 
     // Don't bother demarshaling the rest of the parameters.  They will
     // be handled by the top-level TypeCode demarshaling call.
+    bool new_tc = false;
 
     switch (kind)
       {
       case CORBA::tk_struct:
         {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Struct_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Struct<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
+          // Check if we already have a tc for this type, if yes, use that
+          TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+          if (find_recursive_tc (id.in (), recursive_tc, infos))
+            {
+              tc = recursive_tc[0].type;
+            }
+          else
+            {
+              new_tc = true;
+
+              typedef ACE_Array_Base<
+                TAO::TypeCode::Struct_Field<
+                  CORBA::String_var,
+                  CORBA::TypeCode_var> > member_array_type;
+
+              typedef TAO::TypeCode::Struct<
+                CORBA::String_var,
+                CORBA::TypeCode_var,
+                member_array_type,
+                TAO::True_RefCount_Policy> typecode_type;
+
+              typedef TAO::TypeCode::Recursive_Type<typecode_type,
+                                                    CORBA::TypeCode_var,
+                                                    member_array_type>
+                recursive_typecode_type;
+
+              ACE_NEW_RETURN (tc,
+                              recursive_typecode_type (kind,
+                                                       id.in ()),
+                              false);
+            }
         }
         break;
       case CORBA::tk_union:
         {
-          typedef union_case_array_type member_array_type;
-
-          typedef TAO::TypeCode::Union<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
+          // Check if we already have a tc for this type, if yes, use that
+          TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+          if (find_recursive_tc (id.in (), recursive_tc, infos))
+            {
+              tc = recursive_tc[0].type;
+            }
+          else
+            {
+              new_tc = true;
+
+              typedef union_case_array_type member_array_type;
+
+              typedef TAO::TypeCode::Union<
+                CORBA::String_var,
+                CORBA::TypeCode_var,
+                member_array_type,
+                TAO::True_RefCount_Policy> typecode_type;
+
+              typedef TAO::TypeCode::Recursive_Type<typecode_type,
+                                                    CORBA::TypeCode_var,
+                                                    member_array_type>
+                recursive_typecode_type;
+
+              ACE_NEW_RETURN (tc,
+                              recursive_typecode_type (kind,
+                                                       id.in ()),
+                              false);
+            }
         }
         break;
       case CORBA::tk_value:
       case CORBA::tk_event:
         {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Value_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Value<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
+          // Check if we already have a tc for this type, if yes, use that
+          TAO::TypeCodeFactory::TC_Info_List recursive_tc;
+          if (find_recursive_tc (id.in (), recursive_tc, infos))
+            {
+              tc = recursive_tc[0].type;
+            }
+          else
+            {
+              new_tc = true;
+
+              typedef ACE_Array_Base<
+                TAO::TypeCode::Value_Field<
+                  CORBA::String_var,
+                  CORBA::TypeCode_var> > member_array_type;
+
+              typedef TAO::TypeCode::Value<
+                CORBA::String_var,
+                CORBA::TypeCode_var,
+                member_array_type,
+                TAO::True_RefCount_Policy> typecode_type;
+
+              typedef TAO::TypeCode::Recursive_Type<typecode_type,
+                                                    CORBA::TypeCode_var,
+                                                    member_array_type>
+                recursive_typecode_type;
+
+              ACE_NEW_RETURN (tc,
+                              recursive_typecode_type (kind,
+                                                       id.in ()),
+                              false);
+            }
         }
         break;
       default:
         return false;  // We should never get here.
       };
 
-    size_t const old_size = infos.size ();
-    if (infos.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
-      return false;
+     // Only when we created a new tc add it to the list.
+     if (new_tc)
+       {
+         size_t const old_size = infos.size ();
+         if (infos.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
+           return false;
 
-    TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
+         TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
 
-    ACE_DECLARE_NEW_CORBA_ENV;
-    info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);  // Should never throw!
+         ACE_DECLARE_NEW_CORBA_ENV;
+         info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (false);  // Should never throw!
 
-    info.type = tc;
+         info.type = tc;
+       }
 
     return true;
   }
@@ -1323,3 +1399,5 @@ operator>> (TAO_InputCDR & cdr,
 
   return tc_demarshal (cdr, tc, infos);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
index b7571fbfbf4..0e6d6015c97 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
@@ -23,8 +23,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class T> class ACE_Array_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -190,6 +193,7 @@ namespace TAO
   }  // End namespace TypeCodeFactory
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 9ed73f48bc8..67edee2d6b8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -3,13 +3,14 @@
 #ifndef TAO_TYPECODE_CASE_CPP
 #define TAO_TYPECODE_CASE_CPP
 
-#include "TypeCode_Case_Base_T.h"
+#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 #include "ace/OS_NS_string.h"
 
 #ifndef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, typename TypeCodeType>
 TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
@@ -83,4 +84,6 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
                             ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_TYPECODE_CASE_CPP */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index 2a646e7724a..638051bcb6a 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -23,6 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -167,6 +168,9 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -184,7 +188,9 @@ namespace ACE
     }
   };
 
-} // End namespace ACE namespace.
+} // End namespace ACE.
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 
 #ifdef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
index bf992fde3f3..4bd6b4f8a79 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
@@ -5,6 +5,7 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/TypeCode_Traits.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, typename TypeCodeType>
 ACE_INLINE
@@ -74,3 +75,5 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc)
   // case.
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index 579f968fd12..fc7533e98ae 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -3,7 +3,7 @@
 #ifndef TAO_TYPECODE_CASE_T_CPP
 #define TAO_TYPECODE_CASE_T_CPP
 
-#include "TypeCode_Case_T.h"
+#include "tao/AnyTypeCode/TypeCode_Case_T.h"
 
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -13,6 +13,7 @@
 # include "tao/AnyTypeCode/TypeCode_Case_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -143,7 +144,7 @@ TAO::TypeCode::Case_T<DiscriminatorType,
                       StringType,
                       TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  CORBA::Any * value;
+  CORBA::Any * value = 0;
 
   ACE_NEW_THROW_EX (value,
                     CORBA::Any,
@@ -158,5 +159,6 @@ TAO::TypeCode::Case_T<DiscriminatorType,
   return safe_value._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_TYPECODE_CASE_T_CPP */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index 516127d0054..c0cff25b880 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -25,6 +25,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -127,6 +128,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/TypeCode_Case_T.inl"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
index b6ac33bd18e..f95b599c795 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
@@ -2,6 +2,9 @@
 //
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename DiscriminatorType,
           typename StringType,
           typename TypeCodeType>
@@ -27,3 +30,5 @@ TAO::TypeCode::Case_T<DiscriminatorType,
   , label_ (member_label)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
index fe6b46d2c1f..eb9bd81746b 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 
-#include "TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 
 ACE_RCSID (tao,
@@ -9,11 +9,12 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-#include "Null_RefCount_Policy.h"
-#include "Empty_Param_TypeCode.h"
-#include "Objref_TypeCode_Static.h"
-#include "String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -109,3 +110,5 @@ namespace CORBA
   TypeCode_ptr const _tc_Home       = &TAO::TypeCode::tc_Home;
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.h b/TAO/tao/AnyTypeCode/TypeCode_Constants.h
index 8b057ace36d..2aea3471df7 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.h
@@ -21,6 +21,10 @@
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class TypeCode;
@@ -58,8 +62,63 @@ namespace CORBA
   extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Component;
   extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Home;
   //@}
+
+#define TAO_SYSTEM_EXCEPTION_LIST \
+  TAO_SYSTEM_EXCEPTION(UNKNOWN); \
+  TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
+  TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
+  TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
+  TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
+  TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
+  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
+  TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
+  TAO_SYSTEM_EXCEPTION(INTERNAL); \
+  TAO_SYSTEM_EXCEPTION(MARSHAL); \
+  TAO_SYSTEM_EXCEPTION(INITIALIZE); \
+  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
+  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
+  TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
+  TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
+  TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
+  TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
+  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
+  TAO_SYSTEM_EXCEPTION(TRANSIENT); \
+  TAO_SYSTEM_EXCEPTION(FREE_MEM); \
+  TAO_SYSTEM_EXCEPTION(INV_IDENT); \
+  TAO_SYSTEM_EXCEPTION(INV_FLAG); \
+  TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
+  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
+  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
+  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
+  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
+  TAO_SYSTEM_EXCEPTION(REBIND); \
+  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
+  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
+  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
+  TAO_SYSTEM_EXCEPTION(BAD_QOS); \
+  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \
+  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
+
+  // = Typecode constants for system exceptions.
+#define TAO_SYSTEM_EXCEPTION(name) \
+  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name
+  TAO_SYSTEM_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+  //@}
+
+  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current;
+
+  extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TYPECODE_CONSTANTS_H */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
index ad1fb0b35c2..1a3d8c9deb4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -83,6 +84,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
index 921f00717e8..7c1fe02b47e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class Null_RefCount_Policy;
@@ -117,6 +119,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
index 7fbfcb20501..c421189f0f5 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
@@ -23,6 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -85,6 +86,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp
index d77d9b59c07..5773812563a 100644
--- a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ULongLongSeqA.h"
+#include "tao/AnyTypeCode/ULongLongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h
index 0d5ca2d7bd9..65fb4366d8f 100644
--- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h
+++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h
@@ -37,6 +37,8 @@
 #include "tao/ULongLongSeqC.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::ULongLongSeq*);
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::ULongLongSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongSeqA.cpp
index f48c8306497..7acfbea8976 100644
--- a/TAO/tao/AnyTypeCode/ULongSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/ULongSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ULongSeqA.h"
+#include "tao/AnyTypeCode/ULongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.h b/TAO/tao/AnyTypeCode/ULongSeqA.h
index f093cec9617..ed4eac48536 100644
--- a/TAO/tao/AnyTypeCode/ULongSeqA.h
+++ b/TAO/tao/AnyTypeCode/ULongSeqA.h
@@ -38,6 +38,8 @@
 #include "tao/ULongSeqC.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // non
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated
 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp
index 8150d15bef7..582d15d69d0 100644
--- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "UShortSeqA.h"
+#include "tao/AnyTypeCode/UShortSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h
index 59de79c234c..824246509de 100644
--- a/TAO/tao/AnyTypeCode/UShortSeqA.h
+++ b/TAO/tao/AnyTypeCode/UShortSeqA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index c88e8ec1236..25aba5c6340 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -3,18 +3,19 @@
 #ifndef TAO_UNION_TYPECODE_CPP
 #define TAO_UNION_TYPECODE_CPP
 
-#include "Union_TypeCode.h"
-#include "TypeCode_Case_Base_T.h"
+#include "tao/AnyTypeCode/Union_TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 
 #ifndef __ACE_INLINE__
-# include "Union_TypeCode.inl"
+# include "tao/AnyTypeCode/Union_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
 #include "tao/SystemException.h"
-#include "Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Value_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -57,11 +58,22 @@ TAO::TypeCode::Union<StringType,
   if (!success)
     return false;
 
+  offset += enc.total_length ();
+
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
+      TAO_OutputCDR case_enc;
+      offset = ACE_align_binary (offset,
+                                 ACE_CDR::LONG_ALIGN);
+
       case_type const & c = *this->cases_[i];
 
-      if (!c.marshal (enc, offset + enc.total_length ()))
+      if (!c.marshal (case_enc, offset))
+        return false;
+
+      offset += case_enc.total_length ();
+
+      if (!enc.write_octet_array_mb (case_enc.begin ()))
         return false;
     }
 
@@ -115,28 +127,28 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return 0;
+    return false;
 
   // Check the discriminator type.
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equal_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equal_discriminators)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -155,13 +167,13 @@ TAO::TypeCode::Union<StringType,
         lhs_case.equal (i,
                         tc
                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equal_case)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 template <typename StringType,
@@ -181,27 +193,27 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equiv_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equiv_discriminators)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -220,13 +232,13 @@ TAO::TypeCode::Union<StringType,
         lhs_case.equivalent (i,
                              tc
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equivalent_case)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 template <typename StringType,
@@ -395,7 +407,7 @@ TAO::TypeCode::Union<StringType,
   if (this->default_index_ > -1
       && static_cast<CORBA::ULong> (this->default_index_) == index)
     {
-      CORBA::Any * any;
+      CORBA::Any * any = 0;
       ACE_NEW_THROW_EX (any,
                         CORBA::Any,
                         CORBA::NO_MEMORY ());
@@ -446,4 +458,6 @@ TAO::TypeCode::Union<StringType,
   return this->default_index_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_UNION_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 92117ba92fd..8089aeea48f 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -25,6 +25,7 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -160,6 +161,8 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Union_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.inl b/TAO/tao/AnyTypeCode/Union_TypeCode.inl
index 84dfb32fa0b..ab001d57baf 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename StringType,
           typename TypeCodeType,
           class CaseArrayType,
@@ -23,7 +25,7 @@ TAO::TypeCode::Union<StringType,
   CaseArrayType const & cases,
   CORBA::ULong ncases,
   CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
+  : ::CORBA::TypeCode (CORBA::tk_union)
   , RefCountPolicy ()
   , base_attributes_ (id, name)
   , discriminant_type_ (discriminant_type)
@@ -44,7 +46,7 @@ TAO::TypeCode::Union<StringType,
                      RefCountPolicy>::Union (
   CORBA::TCKind,
   char const * id)
-  : CORBA::TypeCode (CORBA::tk_union)
+  : ::CORBA::TypeCode (CORBA::tk_union)
   , RefCountPolicy ()
   , base_attributes_ (id)
   , discriminant_type_ (0)
@@ -53,3 +55,5 @@ TAO::TypeCode::Union<StringType,
   , cases_ ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 714b16cfa96..2d5677d317e 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -13,11 +13,13 @@
 #include "ace/Value_Ptr.h"
 
 
-ACE_RCSID (tao,
+ACE_RCSID (AnyTypeCode,
            Union_TypeCode_Static,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 bool
 TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -56,13 +58,23 @@ TAO::TypeCode::Union<char const *,
   if (!success)
     return false;
 
+  offset += enc.total_length ();
+
   // Note that we handle the default case below, too.
 
-  for (unsigned int i = 0; i < this->ncases_; ++i)
+  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
+      TAO_OutputCDR case_enc;
+      offset = ACE_align_binary (offset,
+                                 ACE_CDR::LONG_ALIGN);
       case_type const & c = *this->cases_[i];
 
-      if (!c.marshal (enc, offset + enc.total_length ()))
+      if (!c.marshal (case_enc, offset))
+        return false;
+
+      offset += case_enc.total_length ();
+
+      if (!enc.write_octet_array_mb (case_enc.begin ()))
         return false;
     }
 
@@ -105,28 +117,28 @@ TAO::TypeCode::Union<char const *,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return 0;
+    return false;
 
   // Check the discriminator type.
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equal_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equal_discriminators)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -145,13 +157,13 @@ TAO::TypeCode::Union<char const *,
         lhs_case.equal (i,
                         tc
                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equal_case)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -168,27 +180,27 @@ TAO::TypeCode::Union<char const *,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equiv_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equiv_discriminators)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -207,13 +219,13 @@ TAO::TypeCode::Union<char const *,
         lhs_case.equivalent (i,
                              tc
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equivalent_case)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::TypeCode_ptr
@@ -406,3 +418,5 @@ TAO::TypeCode::Union<char const *,
 {
   return this->default_index_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
index b0a507ca168..bf58345e03f 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -26,6 +26,7 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -159,6 +160,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Union_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
index 019a8ba2a2f..39b9465a2da 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -14,8 +16,8 @@ TAO::TypeCode::Union<char const *,
   Case<char const *, CORBA::TypeCode_ptr const *> const * const * cases,
   CORBA::ULong ncases,
   CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (CORBA::tk_union)
+  , ::TAO::Null_RefCount_Policy ()
   , base_attributes_ (id, name)
   , discriminant_type_ (discriminant_type)
   , default_index_ (default_index)
@@ -23,3 +25,5 @@ TAO::TypeCode::Union<char const *,
   , cases_ (cases)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl
index 4cd346c5049..2887587dddd 100644
--- a/TAO/tao/AnyTypeCode/ValueModifier.pidl
+++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          ValueModifier.pidl
  */
 // ================================================================
diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.cpp b/TAO/tao/AnyTypeCode/ValueModifierA.cpp
index 0a93f94dc26..5f23127315a 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierA.cpp
+++ b/TAO/tao/AnyTypeCode/ValueModifierA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ValueModifierA.h"
+#include "tao/AnyTypeCode/ValueModifierA.h"
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
@@ -33,6 +33,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -52,3 +54,4 @@ namespace CORBA
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h
index 479dc4c4052..ff165ad8eda 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierA.h
+++ b/TAO/tao/AnyTypeCode/ValueModifierA.h
@@ -58,6 +58,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
@@ -80,6 +82,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.cpp b/TAO/tao/AnyTypeCode/ValueModifierC.cpp
index 76644c8b3c0..9606aaf3d1b 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp
+++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "ValueModifierC.h"
+#include "tao/AnyTypeCode/ValueModifierC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,11 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.h b/TAO/tao/AnyTypeCode/ValueModifierC.h
index 2bfe5a25b4e..424e4e3b61b 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierC.h
+++ b/TAO/tao/AnyTypeCode/ValueModifierC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -106,6 +108,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 4be37413b75..8955d4be01b 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -16,6 +16,7 @@
 # include "tao/AnyTypeCode/Value_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -124,29 +125,29 @@ TAO::TypeCode::Value<StringType,
 
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_type_modifier != this->type_modifier_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equal_concrete_base_types =
     this->equal (rhs_concrete_base_type.in ()
                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equal_concrete_base_types)
-    return 0;
+    return false;
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nfields != this->nfields_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -157,37 +158,37 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (lhs_visibility != rhs_visibility)
-        return 0;
+        return false;
 
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_field.name);;
       char const * const rhs_name = tc->member_name (i
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
+        return false;
 
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equal_members)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 template <typename StringType,
@@ -204,32 +205,32 @@ TAO::TypeCode::Value<StringType,
 {
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_type_modifier != this->type_modifier_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equivalent_concrete_base_types =
     this->equivalent (rhs_concrete_base_type.in ()
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equivalent_concrete_base_types)
-    return 0;
+    return false;
 
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nfields != this->nfields_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -241,28 +242,28 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (lhs_visibility != rhs_visibility)
-        return 0;
+        return false;
 
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       CORBA::Boolean const equiv_types =
         lhs_tc->equivalent (rhs_tc.in ()
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equiv_types)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 template <typename StringType,
@@ -459,5 +460,6 @@ TAO::TypeCode::Value<StringType,
       Traits<StringType>::get_typecode (this->concrete_base_));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_VALUE_TYPECODE_CPP */
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index 2578a304b53..ffc18532e6f 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -28,6 +28,7 @@
 #include "tao/AnyTypeCode/ValueModifierC.h"
 #include "tao/AnyTypeCode/VisibilityC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -160,6 +161,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Value_TypeCode.inl"
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.inl b/TAO/tao/AnyTypeCode/Value_TypeCode.inl
index 9a8b31f0ddb..e5b0b3ab2f1 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -25,7 +26,7 @@ TAO::TypeCode::Value<StringType,
 #endif
   FieldArrayType const & fields,
   CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , base_attributes_ (id, name)
   , type_modifier_ (modifier)
@@ -46,7 +47,7 @@ TAO::TypeCode::Value<StringType,
                      RefCountPolicy>::Value (
   CORBA::TCKind kind,
   char const * id)
-  : CORBA::TypeCode (kind)
+  : ::CORBA::TypeCode (kind)
   , RefCountPolicy ()
   , base_attributes_ (id)
   , type_modifier_ (CORBA::VM_NONE)
@@ -55,3 +56,5 @@ TAO::TypeCode::Value<StringType,
   , fields_ ()
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 369aeae045c..c222edfa947 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -18,6 +18,7 @@ ACE_RCSID (tao,
            Value_TypeCode_Static,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Value<char const *,
@@ -115,29 +116,29 @@ TAO::TypeCode::Value<char const *,
 
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_type_modifier != this->type_modifier_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equal_concrete_base_types =
     this->equal (rhs_concrete_base_type.in ()
                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equal_concrete_base_types)
-    return 0;
+    return false;
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nfields != this->nfields_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -148,37 +149,37 @@ TAO::TypeCode::Value<char const *,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (lhs_visibility != rhs_visibility)
-        return 0;
+        return false;
 
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_field.name);;
       char const * const rhs_name = tc->member_name (i
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
+        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
                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equal_members)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -192,32 +193,32 @@ TAO::TypeCode::Value<char const *,
 {
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_type_modifier != this->type_modifier_)
-    return 0;
+    return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   CORBA::Boolean const equivalent_concrete_base_types =
     this->equivalent (rhs_concrete_base_type.in ()
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (!equivalent_concrete_base_types)
-    return 0;
+    return false;
 
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (false);
 
   if (tc_nfields != this->nfields_)
-    return 0;
+    return false;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -230,28 +231,28 @@ TAO::TypeCode::Value<char const *,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (lhs_visibility != rhs_visibility)
-        return 0;
+        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
                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       CORBA::Boolean const equiv_types =
         lhs_tc->equivalent (rhs_tc.in ()
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (false);
 
       if (!equiv_types)
-        return 0;
+        return false;
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::TypeCode_ptr
@@ -420,3 +421,5 @@ TAO::TypeCode::Value<char const *,
     CORBA::TypeCode::_duplicate (
       Traits<char const *>::get_typecode (this->concrete_base_));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index 9db721919f5..57ba318ab03 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -29,6 +29,7 @@
 #include "tao/AnyTypeCode/VisibilityC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -158,6 +159,7 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/AnyTypeCode/Value_TypeCode_Static.inl"
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
index 70c7d6cf1b1..c35fbce0b42 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -15,8 +17,8 @@ TAO::TypeCode::Value<char const *,
   CORBA::TypeCode_ptr const * concrete_base,
   Value_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
   CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
+  : ::CORBA::TypeCode (kind)
+  , ::TAO::Null_RefCount_Policy ()
   , base_attributes_ (id, name)
   , type_modifier_ (modifier)
   , concrete_base_ (concrete_base)
@@ -24,3 +26,5 @@ TAO::TypeCode::Value<char const *,
   , fields_ (fields)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl
index 44cece777a3..715b312bdf1 100644
--- a/TAO/tao/AnyTypeCode/Visibility.pidl
+++ b/TAO/tao/AnyTypeCode/Visibility.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          Visibilty.pidl
  */
 // ================================================================
diff --git a/TAO/tao/AnyTypeCode/VisibilityA.cpp b/TAO/tao/AnyTypeCode/VisibilityA.cpp
index 95ae55adc13..ce31b456908 100644
--- a/TAO/tao/AnyTypeCode/VisibilityA.cpp
+++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp
@@ -25,13 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "VisibilityA.h"
+#include "tao/AnyTypeCode/VisibilityA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -51,3 +53,4 @@ namespace CORBA
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h
index 04f9ebde904..c791d479e08 100644
--- a/TAO/tao/AnyTypeCode/VisibilityA.h
+++ b/TAO/tao/AnyTypeCode/VisibilityA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -82,6 +84,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/VisibilityC.cpp b/TAO/tao/AnyTypeCode/VisibilityC.cpp
index 76f74d94f2f..d8c674edc02 100644
--- a/TAO/tao/AnyTypeCode/VisibilityC.cpp
+++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "VisibilityC.h"
+#include "tao/AnyTypeCode/VisibilityC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,11 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/VisibilityC.h b/TAO/tao/AnyTypeCode/VisibilityC.h
index 124188ba2f7..4f6e607ba23 100644
--- a/TAO/tao/AnyTypeCode/VisibilityC.h
+++ b/TAO/tao/AnyTypeCode/VisibilityC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -96,6 +98,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.cpp b/TAO/tao/AnyTypeCode/WCharSeqA.cpp
index c8d8ecee99d..978836022a6 100644
--- a/TAO/tao/AnyTypeCode/WCharSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/WCharSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "WCharSeqA.h"
+#include "tao/AnyTypeCode/WCharSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,6 +34,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -140,3 +142,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h
index ab57e949bdd..8935210cc23 100644
--- a/TAO/tao/AnyTypeCode/WCharSeqA.h
+++ b/TAO/tao/AnyTypeCode/WCharSeqA.h
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WCharSeq*); //
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WCharSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WCharSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.cpp b/TAO/tao/AnyTypeCode/WStringSeqA.cpp
index 41067661a25..f3f468704e4 100644
--- a/TAO/tao/AnyTypeCode/WStringSeqA.cpp
+++ b/TAO/tao/AnyTypeCode/WStringSeqA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "WStringSeqA.h"
+#include "tao/AnyTypeCode/WStringSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -141,3 +143,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h
index 9f01c462bc2..b9357c80326 100644
--- a/TAO/tao/AnyTypeCode/WStringSeqA.h
+++ b/TAO/tao/AnyTypeCode/WStringSeqA.h
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WStringSeq*); /
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WStringSeq *&); // deprecated
 TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WStringSeq *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
index 7b37a76f712..9c6fd0a62f2 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "WrongTransactionA.h"
+#include "tao/AnyTypeCode/WrongTransactionA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -145,3 +147,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h
index 08bce947959..745c0aa5f39 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.h
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index bb14170a683..c28d735795a 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -38,6 +38,8 @@ ACE_RCSID (tao,
            append,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Encode instances of arbitrary data types based only on typecode.
 // "data" points to the data type; if it's not a primitve data type,
 // the TypeCode interpreter is used to recursively encode its
@@ -413,13 +415,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
   ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
+  CORBA::Short short_v = CORBA::Short();
+  CORBA::UShort ushort_v = CORBA::UShort();
+  CORBA::Long long_v = CORBA::Long();
+  CORBA::ULong ulong_v = CORBA::ULong();
+  CORBA::ULong enum_v = CORBA::ULong();
+  CORBA::Char char_v = CORBA::Char();
+  CORBA::WChar wchar_v = CORBA::WChar();
   CORBA::Boolean boolean_v = false;
 
   switch (kind)
@@ -1237,17 +1239,21 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
           return TAO::TRAVERSE_STOP;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = src->orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
@@ -1319,3 +1325,5 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/orb_typesA.cpp b/TAO/tao/AnyTypeCode/orb_typesA.cpp
index 92c9bc9bc46..e1967ebdfd8 100644
--- a/TAO/tao/AnyTypeCode/orb_typesA.cpp
+++ b/TAO/tao/AnyTypeCode/orb_typesA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "orb_typesA.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -33,6 +33,8 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -112,3 +114,4 @@ namespace CORBA
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h
index 1585e465596..84b2fcc5c0f 100644
--- a/TAO/tao/AnyTypeCode/orb_typesA.h
+++ b/TAO/tao/AnyTypeCode/orb_typesA.h
@@ -37,6 +37,7 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/orb_typesC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
@@ -69,6 +70,8 @@ namespace CORBA
 
 } // module CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index 31fd7a14552..a508b7c8f89 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -19,10 +19,10 @@
 //
 // ============================================================================
 
-#include "Marshal.h"
-#include "TypeCode.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "Any.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "tao/debug.h"
 #include "tao/Valuetype_Adapter.h"
@@ -36,12 +36,14 @@ ACE_RCSID (tao,
            skip,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
                              TAO_InputCDR *stream
                              ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // Status of skip operation.
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
@@ -86,8 +88,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
       retval = TAO::TRAVERSE_STOP;
       // we are not a primitive type
     }
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
+  if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -124,7 +125,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             TAO_InputCDR *stream
                             ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // Typecode kind.
   CORBA::ULong kind;
@@ -132,7 +133,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
   // Decode the "kind" field of the typecode from the stream.
   continue_skipping = stream->read_ulong (kind);
 
-  if (continue_skipping == 1)
+  if (continue_skipping)
     {
       // Typecodes with empty parameter lists all have preallocated
       // constants.  We use those to reduce memory consumption and
@@ -205,7 +206,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
         }
     }
 
-  if (continue_skipping == 1)
+  if (continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -225,7 +226,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
                              TAO_InputCDR *stream
                              ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // specifies the number of bytes in the Principal
   CORBA::ULong len;
@@ -236,7 +237,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
       continue_skipping = stream->skip_bytes (len);
     }
 
-  if (continue_skipping == 1)
+  if (continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -256,7 +257,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
                           ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // return status
   TAO::traverse_status retval =
@@ -298,8 +299,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         continue_skipping = stream->skip_bytes (encap_len);
       }
 
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
+  if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -366,15 +366,15 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
   ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;;
-
+  CORBA::Short short_v = CORBA::Short();
+  CORBA::UShort ushort_v = CORBA::UShort();
+  CORBA::Long long_v = CORBA::Long();
+  CORBA::ULong ulong_v = CORBA::ULong();
+  CORBA::ULong enum_v = CORBA::ULong();
+  CORBA::Char char_v = CORBA::Char();
+  CORBA::WChar wchar_v = CORBA::WChar();
+  CORBA::Boolean boolean_v = false;
+  
   switch (kind)
     {
     case CORBA::tk_short:
@@ -600,7 +600,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
                           ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // On decode, omit the check against specified string bounds, and
   // cope with illegal "zero length" strings (all lengths on the wire
@@ -611,7 +611,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
   // but we will accept them when it's clear how to do so.
 
   continue_skipping = stream->skip_string ();
-  if (continue_skipping == 1)
+  if (continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -708,7 +708,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
       break;
 
     default:
-      while (bounds-- && continue_skipping == 1)
+      while (bounds-- && continue_skipping)
         {
           continue_skipping =
             TAO_Marshal_Object::perform_skip (tc2.in (),
@@ -736,8 +736,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
                          ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = 1;
-
+  CORBA::Boolean continue_skipping = true;
 
   // retrieve the bounds of the array
   CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -800,7 +799,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
       break;
 
     default:
-      while (bounds-- && continue_skipping == 1)
+      while (bounds-- && continue_skipping)
         {
           int stop =
             TAO_Marshal_Object::perform_skip (tc2.in (),
@@ -808,7 +807,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
           if (stop == TAO::TRAVERSE_STOP)
-            continue_skipping = 0;
+            continue_skipping = false;
         }
       break;
     }// end of switch
@@ -832,7 +831,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // Status of decode operation.
   TAO::traverse_status retval =
@@ -848,7 +847,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 
   //  tc2->_decr_refcnt ();
   if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
+      && continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
 
   if (TAO_debug_level > 0)
@@ -916,7 +915,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
                            TAO_InputCDR *stream
                            ACE_ENV_ARG_DECL)
 {
-  ACE_CDR::Boolean continue_skipping = 1;
+  CORBA::Boolean continue_skipping = true;
 
   // On decode, omit the check against specified wstring bounds, and
   // cope with illegal "zero length" strings (all lengths on the wire
@@ -930,7 +929,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
 
   continue_skipping = stream->skip_wstring ();
 
-  if (continue_skipping == 1)
+  if (continue_skipping)
     return TAO::TRAVERSE_CONTINUE;
 
   if (TAO_debug_level > 0)
@@ -965,17 +964,21 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
           return TAO::TRAVERSE_STOP;
         }
 
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
+	  TAO_ORB_Core *orb_core = stream->orb_core ();
+      if (orb_core == 0)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
+          orb_core = TAO_ORB_Core_instance ();
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          "TAO (%P|%t) WARNING: extracting "
+                          "valuetype using default ORB_Core\n"));
+            }
         }
 
+      TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
@@ -1040,3 +1043,5 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
                                     CORBA::COMPLETED_MAYBE),
                     TAO::TRAVERSE_STOP);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
index ef7e0adf569..d9da63d780f 100644
--- a/TAO/tao/AnyTypeCode_Adapter.cpp
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/AnyTypeCode_Adapter.h"
 
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            TAO_AnyTypeCode_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h
index 5050a148c32..9fd002af542 100644
--- a/TAO/tao/AnyTypeCode_Adapter.h
+++ b/TAO/tao/AnyTypeCode_Adapter.h
@@ -27,6 +27,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class TypeCode;
@@ -113,6 +115,18 @@ ANYTYPECODE__EXCEPTION_LIST
 
   virtual void insert_into_any (CORBA::Any * any, CORBA::Short value) = 0;
 
+  virtual void insert_into_any (CORBA::Any * any, CORBA::UShort value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Float value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Double value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::LongLong value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::ULongLong value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::LongDouble value) = 0;
+
   virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value) = 0;
 
   virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value) = 0;
@@ -122,5 +136,7 @@ ANYTYPECODE__EXCEPTION_LIST
   virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ANYTYPECODE_ADAPTER */
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
index 48b71281704..df79cbbc1f9 100644
--- a/TAO/tao/Any_Insert_Policy_T.h
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,9 +26,12 @@
 #include "tao/AnyTypeCode_Adapter.h"
 
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 #include "tao/debug.h"
 #include "tao/IFR_Client_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template <typename S>
@@ -110,5 +113,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_ANY_INSERT_POLICY_H */
diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h
index e384db4a2ad..f71e79b2f27 100644
--- a/TAO/tao/Arg_Traits_T.h
+++ b/TAO/tao/Arg_Traits_T.h
@@ -19,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -32,6 +34,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ARG_TRAITS_T_H */
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index 98e0861d980..d1819d1cc51 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -3,6 +3,8 @@
 
 #include "tao/Argument.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Argument::~Argument (void)
 {
 }
@@ -52,4 +54,4 @@ TAO::RetArgument::mode (void) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index edad3568278..cbaee13f83d 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -26,6 +27,8 @@
 #include "tao/TAO_Export.h"
 #include "tao/ParameterModeC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -123,6 +126,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ARGUMENT_H */
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
index 63093981053..712ee76a20a 100644
--- a/TAO/tao/Array_VarOut_T.cpp
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_ARRAY_VAROUT_T_C
-#define TAO_ARRAY_VAROUT_T_C
+#ifndef TAO_ARRAY_VAROUT_T_CPP
+#define TAO_ARRAY_VAROUT_T_CPP
 
 #include "tao/Array_VarOut_T.h"
 
@@ -9,9 +9,8 @@
 #include "tao/Array_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Array_VarOut_T,
-           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T, typename T_slice, typename TAG>
 TAO_FixedArray_Var_T<T,T_slice,TAG> &
@@ -91,4 +90,6 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor (
   TAO::Array_Traits<T,T_slice,TAG>::free (tmp);
 }
 
-#endif /* TAO_ARRAY_VAROUT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_ARRAY_VAROUT_T_CPP */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index f2e07430c24..f2cfdb03934 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -20,23 +20,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
-   * struct Array_Traits
+   * @struct Array_Traits
    *
    * @brief Specialized for each array in generated code.
    *
    */
   template<typename T, typename T_slice, typename TAG>
-  struct Array_Traits
-  {
-    static T_slice * alloc (void);
-    static void free (T_slice * _tao_slice);
-    static T_slice * dup (const T_slice * _tao_slice);
-    static void copy (T_slice * _tao_to,
-                      const T_slice * _tao_from);
-  };
+  struct Array_Traits;
 }
 
 /**
@@ -71,7 +66,6 @@ public:
 
   // TAO extension.
   _retn_type    ptr (void) const;
-
 protected:
   T_slice * ptr_;
 };
@@ -98,7 +92,6 @@ public:
 
   typedef       T_slice *  _out_type;
   _out_type     out (void);
-
 };
 
 /**
@@ -170,7 +163,7 @@ class TAO_Array_Forany_T
 public:
   TAO_Array_Forany_T (void);
   TAO_Array_Forany_T (T_slice *,
-                      CORBA::Boolean nocopy = 0);
+                      CORBA::Boolean nocopy = false);
   TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
   ~TAO_Array_Forany_T (void);
 
@@ -198,9 +191,11 @@ public:
   static T_slice * tao_alloc (void);
 private:
   T_slice * ptr_;
-  const CORBA::Boolean nocopy_;
+  CORBA::Boolean nocopy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Array_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index f0837b64e71..b1b38964d53 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (void)
@@ -223,18 +225,18 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator T_slice *& ()
 
 template<typename T, typename T_var, typename T_slice, typename TAG>
 ACE_INLINE
-T_slice *&
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr (void)
+T_slice &
+TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator[] (CORBA::ULong index)
 {
-  return this->ptr_;
+  return this->ptr_[index];
 }
 
 template<typename T, typename T_var, typename T_slice, typename TAG>
 ACE_INLINE
-T_slice &
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator[] (CORBA::ULong index)
+T_slice *&
+TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr (void)
 {
-  return this->ptr_[index];
+  return this->ptr_;
 }
 
 // *************************************************************
@@ -243,7 +245,7 @@ template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void)
   : ptr_ (0),
-    nocopy_ (0)
+    nocopy_ (false)
 {}
 
 template<typename T, typename T_slice, typename TAG>
@@ -312,24 +314,8 @@ ACE_INLINE
 const T_slice &
 TAO_Array_Forany_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) const
 {
-#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST)
-# if defined (_MSC_VER) && _MSC_VER <= 1200
-  // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
-  //         multi-dimensional array case so reinterpret_cast<> cast
-  //         instead.  It's not clear if this is really the right
-  //         thing to do but the code won't compile with MSVC++ 6
-  //         without it.  We use a reinterpret_cast<> instead of a
-  //         C-style "sledgehammer" cast to make it obvious that this
-  //         code may have unresolved issues, and also to make it
-  //         easier for others to find this code.
-  return reinterpret_cast<const T_slice &> (this->ptr_[index]);
-# else
-  return const_cast<const T_slice &> (this->ptr_[index]);
-# endif  /* _MSC_VER <= 1200 */
-#else
   const T_slice & tmp = this->ptr_[index];
   return tmp;
-#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -345,21 +331,7 @@ ACE_INLINE
 const T_slice *
 TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const
 {
-  // @@@ (JP) This looks scary I know but it helps MSVC understand
-  // things better when the array is multi-dimensional.
-#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
-  // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
-  //         multi-dimensional array case so reinterpret_cast<> cast
-  //         instead.  It's not clear if this is really the right
-  //         thing to do but the code won't compile with MSVC++ 6
-  //         without it.  We use a reinterpret_cast<> instead of a
-  //         C-style "sledgehammer" cast to make it obvious that this
-  //         code may have unresolved issues, and also to make it
-  //         easier for others to find this code.
-  return reinterpret_cast<const T_slice *> (this->ptr_);
-#else
-  return const_cast<const T_slice *> (this->ptr_);
-#endif  /* _MSC_VER <= 1200 */
+  return this->ptr_;
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -388,18 +360,18 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_retn (void)
 
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
-T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::ptr (void) const
+CORBA::Boolean
+TAO_Array_Forany_T<T,T_slice,TAG>::nocopy (void) const
 {
-  return this->ptr_;
+  return this->nocopy_;
 }
 
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
-CORBA::Boolean
-TAO_Array_Forany_T<T,T_slice,TAG>::nocopy (void) const
+T_slice *
+TAO_Array_Forany_T<T,T_slice,TAG>::ptr (void) const
 {
-  return this->nocopy_;
+  return this->ptr_;
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -409,3 +381,5 @@ TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void)
 {
   return TAO::Array_Traits<T,T_slice,TAG>::alloc ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index 0f10cddbe1f..fd7187e4919 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -1,6 +1,6 @@
-#include "Asynch_Queued_Message.h"
-#include "debug.h"
-#include "ORB_Core.h"
+#include "tao/Asynch_Queued_Message.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
@@ -14,6 +14,7 @@ ACE_RCSID (tao,
            Asynch_Queued_Message,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
   const ACE_Message_Block *contents,
@@ -155,7 +156,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
 
   // Set the flag to indicate that <qm> is created on the heap.
   if (qm)
-    qm->is_heap_created_ = 1;
+    qm->is_heap_created_ = true;
 
   return qm;
 }
@@ -181,3 +182,5 @@ TAO_Asynch_Queued_Message::destroy (void)
     }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 9b40397caa0..62b7afb84cd 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Asynch_Queued_Message
  *
@@ -35,7 +37,7 @@ public:
   /**
    * @param contents The message block chain that must be sent.
    *
-   * @param alloc Allocator used for creating <this> object.
+   * @param alloc Allocator used for creating @c this object.
    *
    * @todo I'm almost sure this class will require a callback
    *       interface for AMIs sent with SYNC_NONE policy.  Those guys
@@ -97,5 +99,7 @@ private:
   char *buffer_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_ASYNCH_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index 3fdcb0239aa..edda3e1c449 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
            Asynch_Reply_Dispatcher_Base,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (
     TAO_ORB_Core *orb_core,
@@ -84,28 +86,26 @@ TAO_Asynch_Reply_Dispatcher_Base::reply_timed_out (void)
 {
 }
 
-long
+void
 TAO_Asynch_Reply_Dispatcher_Base::incr_refcount (void)
 {
-  ACE_GUARD_RETURN (ACE_Lock,
-                    mutex,
-                    *this->lock_,
-                    -1);
-  return ++this->refcount_;
+  ACE_GUARD (ACE_Lock,
+             mutex,
+             *this->lock_);
+  ++this->refcount_;
 }
 
-long
+void
 TAO_Asynch_Reply_Dispatcher_Base::decr_refcount (void)
 {
   {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      mutex,
-                      *this->lock_,
-                      -1);
+    ACE_GUARD (ACE_Lock,
+               mutex,
+               *this->lock_);
     --this->refcount_;
 
     if (this->refcount_ > 0)
-      return this->refcount_;
+      return;
   }
 
   if (this->allocator_)
@@ -119,16 +119,17 @@ TAO_Asynch_Reply_Dispatcher_Base::decr_refcount (void)
       delete this;
     }
 
-  return 0;
+  return;
 }
 
 bool
 TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void)
 {
   if (this->is_reply_dispatched_)
-    return false;
-
-  if (!this->is_reply_dispatched_)
+    {
+      return false;
+    }
+  else
     {
       ACE_GUARD_RETURN (ACE_Lock,
                         mutex,
@@ -144,3 +145,5 @@ TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void)
 
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index ea4c156ba22..d2d81cbb221 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file Asynch_Reply_Dispatcher_Base.h
@@ -24,13 +25,17 @@
 
 #include "tao/IOP_IORC.h"
 
-class TAO_Pluggable_Reply_Params;
-class TAO_ORB_Core ;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
-class TAO_Transport;
 class ACE_Lock;
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_Pluggable_Reply_Params;
+class TAO_ORB_Core;
+class TAO_Transport;
 /**
  * @class TAO_Asynch_Reply_Dispatcher_Base
  *
@@ -65,8 +70,8 @@ public:
 
   /// @name Mutators for refcount
   //@{
-  long incr_refcount (void);
-  long decr_refcount (void);
+  void incr_refcount (void);
+  void decr_refcount (void);
   //@}
 
   /// A helper method that can be used by the subclasses
@@ -120,7 +125,7 @@ private:
   ACE_Lock *lock_;
 
   /// Refcount paraphernalia for this class
-  long refcount_;
+  CORBA::ULong refcount_;
 
   /// Has the reply been dispatched?
   bool is_reply_dispatched_;
@@ -156,6 +161,8 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Asynch_Reply_Dispatcher_Base.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.i b/TAO/tao/Asynch_Reply_Dispatcher_Base.i
index af9c34d4242..c63371d74a4 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE void
@@ -10,3 +14,5 @@ namespace TAO
     (void) ardb->decr_refcount ();
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Auto_Functor.h b/TAO/tao/Auto_Functor.h
index 3fc7a857e5a..a764aea0e3d 100644
--- a/TAO/tao/Auto_Functor.h
+++ b/TAO/tao/Auto_Functor.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file Auto_Functor.h
@@ -20,6 +21,8 @@
 
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -30,5 +33,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AUTO_FUNCTOR_H*/
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index 2734394a30f..4e9e4d2201c 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_BD_STRING_ARGUMENT_T_C
-#define TAO_BD_STRING_ARGUMENT_T_C
+#ifndef TAO_BD_STRING_ARGUMENT_T_CPP
+#define TAO_BD_STRING_ARGUMENT_T_CPP
 
 #include "tao/BD_String_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/BD_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           BD_String_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename to_S,
@@ -153,4 +151,6 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::intercep
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_BD_STRING_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_BD_STRING_ARGUMENT_T_CPP */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 7a2fdc4eddd..7c73638e991 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -25,6 +25,8 @@
 #include "tao/Argument.h"
 #include "tao/Any_Insert_Policy_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -198,6 +200,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/BD_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
index a21a1e227b7..d222489a42c 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename to_S,
          typename from_S,
@@ -129,3 +133,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::arg (voi
   return this->x_.out ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 75b3d08349c..121aea34b89 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -11,11 +11,12 @@ ACE_RCSID (tao,
            Base_Transport_Property,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void)
 {
 }
 
-
 TAO_Transport_Descriptor_Interface *
 TAO_Base_Transport_Property::duplicate (void)
 {
@@ -53,3 +54,5 @@ TAO_Base_Transport_Property::hash (void) const
 {
   return this->endpoint_->hash ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
index b781ac40232..954c7e7bb83 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // ===================================================================
@@ -24,6 +25,8 @@
 
 #include "tao/Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Base_Transport_Property
  *
@@ -64,6 +67,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Base_Transport_Property.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl
index fa4bd7f6b19..3c097130fd4 100644
--- a/TAO/tao/Base_Transport_Property.inl
+++ b/TAO/tao/Base_Transport_Property.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Base_Transport_Property::TAO_Base_Transport_Property (void)
 {
@@ -24,3 +27,5 @@ TAO_Base_Transport_Property::TAO_Base_Transport_Property (
 {
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index f798eb09887..ae34d1062d0 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_BASIC_ARGUMENT_T_C
-#define TAO_BASIC_ARGUMENT_T_C
+#ifndef TAO_BASIC_ARGUMENT_T_CPP
+#define TAO_BASIC_ARGUMENT_T_CPP
 
 #include "tao/Basic_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Basic_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Basic_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -98,4 +96,6 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_BASIC_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_BASIC_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index cc7bcb388b3..8558ce45bf6 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -154,6 +156,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Basic_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
index d11f01533bd..c8df439d593 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S, typename Insert_Policy>
 ACE_INLINE
 TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x)
@@ -78,3 +82,4 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void)
   return this->x_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
index 155d66c651e..81c0000ac90 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -64,7 +66,7 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::UShort>
-    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
+    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::UShort> >
   {
   };
 
@@ -76,37 +78,39 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Float>
-    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
+    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Double>
-    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
+    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongLong>
-    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
+    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULongLong>
     : public Basic_Arg_Traits_T<CORBA::ULongLong,
-                                TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
+                                TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongDouble>
     : public Basic_Arg_Traits_T<CORBA::LongDouble,
-                                TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> >
+                                TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongDouble> >
   {
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_BASIC_ARGUMENTS_H */
diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h
index b2d8d652926..e9686f535e3 100644
--- a/TAO/tao/Basic_Types.h
+++ b/TAO/tao/Basic_Types.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+  template <typename charT> class String_var;
+  template <typename charT> class String_out;
+}
+
 namespace CORBA
 {
   /**
@@ -69,11 +79,10 @@ namespace CORBA
   typedef WChar &WChar_out;
   //@}
 
-  class String_var;
-  class String_out;
-
-  class WString_var;
-  class WString_out;
+  typedef TAO::String_var<CORBA::Char> String_var;
+  typedef TAO::String_out<CORBA::Char> String_out;
+  typedef TAO::String_var<CORBA::WChar> WString_var;
+  typedef TAO::String_out<CORBA::WChar> WString_out;
 
   class TypeCode;
   typedef TypeCode *TypeCode_ptr;
@@ -84,6 +93,8 @@ namespace CORBA
 class TAO_InputCDR;
 class TAO_OutputCDR;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_BASIC_TYPES_H */
diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp
index 90b60d1b393..b564942d5db 100644
--- a/TAO/tao/BiDir_Adapter.cpp
+++ b/TAO/tao/BiDir_Adapter.cpp
@@ -1,10 +1,13 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/BiDir_Adapter.h"
 
 ACE_RCSID(tao, BiDir_Adapter, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index ebf1e5675dc..a1a394d8b5b 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,14 +21,9 @@
 
 #include "tao/SystemException.h"
 
-class TAO_ORB_Core;
-class TAO_Policy_Validator;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-namespace CORBA
-{
-  class ORB;
-  typedef ORB *ORB_ptr;
-}
+class TAO_Policy_Validator;
 
 /**
  * @class TAO_BiDir_Adapter
@@ -50,5 +45,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_BIDIR_ADAPTER_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 033371ec5bb..a4943a47b04 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,6 +1,6 @@
-#include "BiDir_ORBInitializer.h"
-#include "BiDirGIOP.h"
-#include "BiDirPolicy_Validator.h"
+#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,6 +9,7 @@ ACE_RCSID (BiDir_GIOP,
            BiDirGIOP,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Set the flag to zero to start with
 int TAO_BiDirGIOP_Loader::is_activated_ = 0;
@@ -58,7 +59,7 @@ TAO_BiDirGIOP_Loader::init (int,
           if (TAO_debug_level > 0)
             {
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "(%P | %t) Caught exception:");
+                                   "Caught exception:");
             }
           return -1;
         }
@@ -87,12 +88,14 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
                         CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-  // We may be adding another TAO_BiDirPolicy_Validator instance for the
-  // same ORB (different POA). In cases where huge numbers of bi-directional POA instances
-  // are created, having a validator instance per POA may introduce additional delays in
-  // policy validation and hence, the overal policy creation time. Since this is out of the
-  // critical invocation processing path, I plan to keep the design simple and not try to
-  // avoid an ineficiency of such small proportions.
+  // We may be adding another TAO_BiDirPolicy_Validator instance for
+  // the same ORB (different POA). In cases where huge numbers of
+  // bi-directional POA instances are created, having a validator
+  // instance per POA may introduce additional delays in policy
+  // validation and hence, the overal policy creation time. Since this
+  // is out of the critical invocation processing path, I plan to keep
+  // the design simple and not try to avoid an ineficiency of such
+  // small proportions.
   val.add_validator (validator);
 }
 
@@ -102,6 +105,8 @@ TAO_BiDirGIOP_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader,
                        ACE_TEXT ("BiDirGIOP_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 643bca38dc6..c1cafd48fa3 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file BiDirGIOP.h
@@ -16,7 +17,7 @@
 #define TAO_BIDIR_GIOP_H
 #include /**/ "ace/pre.h"
 
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -25,6 +26,8 @@
 #include "tao/BiDir_Adapter.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_BiDirPolicy_Validator;
 
 /**
@@ -61,14 +64,17 @@ private:
   static int is_activated_;
 };
 
+static int
+TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader)
 ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
 
-static int
-TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
 
 #define TAO_BIDIRGIOP_SAFE_INCLUDE
-#include "BiDirPolicyC.h"
+#include "tao/BiDir_GIOP/BiDirPolicyC.h"
 #undef TAO_BIDIRGIOP_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index 6659b56951d..876d32946fa 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -10,6 +10,8 @@
 //          -Wb,export_include="bidirgiop_export.h" \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
+//          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+//          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
 //          BiDirPolicy.pidl
 //
 //   This is from the GIOP 1.2 spec for Bi Dir IIOP.
@@ -19,7 +21,7 @@
 
 #pragma prefix "omg.org"
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 // Self contained module for Bi-directional GIOP policy
 module BiDirPolicy
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 93db9790b38..4ad5f842c83 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "BiDirGIOP.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +66,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
@@ -98,10 +100,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-  
+
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
+
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -115,28 +117,28 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-  
+
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
+
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
 BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 BiDirPolicy::BidirectionalPolicy::_tao_release (BidirectionalPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -182,3 +184,5 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 0baa3c73cee..c1661c9c707 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -43,7 +43,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -69,6 +69,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace BiDirPolicy
 {
   
@@ -244,6 +246,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index 8dcdeb2b341..0d6734ae2b0 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -1,12 +1,14 @@
-#include "BiDirPolicy_Validator.h"
-#include "BiDir_Policy_i.h"
+#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
+#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
 #include "tao/Policy_Set.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (TAO, 
-           BiDirPolicy_Validator, 
+ACE_RCSID (BiDir_GIOP,
+           BiDirPolicy_Validator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
   : TAO_Policy_Validator (orb_core)
 {
@@ -39,7 +41,7 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
 
   // Set the flag in the ORB_Core
   if (val == BiDirPolicy::BOTH)
-    orb_core_.bidir_giop_policy (1);
+    orb_core_.bidir_giop_policy (true);
 }
 
 void
@@ -54,3 +56,5 @@ TAO_BiDirPolicy_Validator::legal_policy_impl (CORBA::PolicyType type)
 {
   return (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index a91220671d8..106b1a834c8 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    BiDirPolicy_Validator.h
@@ -16,13 +18,14 @@
 #define TAO_BIDIR_POLICY_VALIDATOR_H_
 
 #include /**/ "ace/pre.h"
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include "tao/Policy_Validator.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Set;
 class TAO_ORB_Core;
@@ -33,7 +36,6 @@ class TAO_ORB_Core;
  * @brief Policy Validator for BiDir GIOP class
  *
  */
-
 class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator
 {
 public:
@@ -48,9 +50,9 @@ public:
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
 
-private:
-
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index ff26f0ca91f..2aff9aa8432 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -1,10 +1,8 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "BiDir_ORBInitializer.h"
-#include "BiDir_PolicyFactory.h"
-#include "BiDirGIOP.h"
+#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
+#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -12,6 +10,8 @@ ACE_RCSID (BiDir_GIOP,
            BiDir_ORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_BiDir_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -65,3 +65,5 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
   ACE_CHECK;
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index 736f2b637f4..b09a94da506 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,10 +30,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Messaging ORB initializer.
-class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_BiDir_ORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -54,6 +56,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 248691a541a..98ef7218f99 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,6 +1,6 @@
-#include "BiDir_PolicyFactory.h"
-#include "BiDirGIOP.h"
-#include "BiDir_Policy_i.h"
+#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -9,6 +9,8 @@ ACE_RCSID (BiDir_GIOP,
            BiDir_PolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO_BiDir_PolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -46,3 +48,5 @@ TAO_BiDir_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index cdce842dead..9a4175257b5 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,14 +27,16 @@
 // 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)
+# pragma warning(push)
+# pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all Messaging related policies.
-class TAO_BiDirGIOP_Export TAO_BiDir_PolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
+class TAO_BiDir_PolicyFactory
+  : public PortableInterceptor::PolicyFactory
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -43,11 +45,13 @@ public:
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
-#pragma warning(pop)
+# pragma warning(pop)
 #endif /* _MSC_VER */
 
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index c301a8a7b53..c040e779226 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "BiDir_Policy_i.h"
+#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
 
 #include "tao/Stub.h"
 #include "tao/debug.h"
@@ -10,28 +10,29 @@ ACE_RCSID (TAO,
            BiDir_Policy_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
     const BiDirPolicy::BidirectionalPolicyValue  val)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::BiDirPolicy::BidirectionalPolicy ()
+  , ::CORBA::LocalObject ()
   , TAO_Local_RefCounted_Object ()
   , value_ (val)
 {
 }
 
 TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::BiDirPolicy::BidirectionalPolicy ()
+  , ::CORBA::LocalObject ()
   , TAO_Local_RefCounted_Object ()
   , value_ (rhs.value_)
 {
 }
 
-
 CORBA::PolicyType
 TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -74,7 +75,6 @@ TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
-
 BiDirPolicy::BidirectionalPolicyValue
 TAO_BidirectionalPolicy::value (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -90,3 +90,5 @@ TAO_BidirectionalPolicy::_tao_cached_type (void) const
 {
   return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index 1555b96dc9d..93ef62f6c19 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -1,6 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
-//
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -15,20 +13,22 @@
 #ifndef TAO_BIDIR_POLICY_I_H
 #define TAO_BIDIR_POLICY_I_H
 #include /**/ "ace/pre.h"
-#include "bidirgiop_export.h"
+#include "tao/BiDir_GIOP/bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "BiDirGIOP.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
+# pragma warning(push)
+# pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_BidirectionalPolicy
  *
@@ -38,14 +38,11 @@
  * clients can be made bi-directional or not. Further, this policy
  * also needs to be set by the server to use the connections
  * established by the clients to send requests.
- *
  */
-
-class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy
-  : public virtual BiDirPolicy::BidirectionalPolicy,
-    public virtual TAO_Local_RefCounted_Object
+class TAO_BidirectionalPolicy
+  : public virtual BiDirPolicy::BidirectionalPolicy
+  , public virtual TAO_Local_RefCounted_Object
 {
-
 public:
 
   /// Constructor.
@@ -60,7 +57,6 @@ public:
   /// = The BiDir::BidirectionalPolicy methods
   virtual BiDirPolicy::BidirectionalPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
@@ -75,14 +71,18 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
 private:
 
   /// The attribute
   BiDirPolicy::BidirectionalPolicyValue value_;
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
-#pragma warning(pop)
+# pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
index 9466a58fe3e..624d5344f22 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -11,6 +11,8 @@ ACE_RCSID (tao,
            Bind_Dispatcher_Guard,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (
                                          CORBA::ULong request_id,
                                          TAO_Reply_Dispatcher* rd,
@@ -20,7 +22,7 @@ TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (
    rd_(rd),
    tms_(tms)
 {
-  int retval =
+  int const retval =
     this->tms_->bind_dispatcher (this->request_id_,
                                  this->rd_);
 
@@ -36,3 +38,5 @@ TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void)
   if (this->status_ == TAO_Bind_Dispatcher_Guard::UNBIND)
     (void) this->tms_->unbind_dispatcher (this->request_id_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h
index e4c992b8ab6..ae86b126b92 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.h
+++ b/TAO/tao/Bind_Dispatcher_Guard.h
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file     Bind_Dispatcher_Guard.h
@@ -18,6 +19,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/TAO_Export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Reply_Dispatcher;
 class TAO_Transport_Mux_Strategy;
 
@@ -55,6 +58,8 @@ private:
   TAO_Transport_Mux_Strategy* tms_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Bind_Dispatcher_Guard.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Bind_Dispatcher_Guard.i b/TAO/tao/Bind_Dispatcher_Guard.i
index 64bce7bf6f6..c4a3477f7ee 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.i
+++ b/TAO/tao/Bind_Dispatcher_Guard.i
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
 // $Id$
 
 // ===========================================================================
@@ -15,6 +16,7 @@
 #include "tao/Reply_Dispatcher.h"
 #include "tao/Transport_Mux_Strategy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_Bind_Dispatcher_Guard::status (int s)
@@ -31,7 +33,7 @@ TAO_Bind_Dispatcher_Guard::status (void) const
 ACE_INLINE int
 TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void)
 {
-  int retval =
+  int const retval =
     this->tms_->unbind_dispatcher (this->request_id_);
 
   // Already unbound and so do not try again during destruction.
@@ -40,3 +42,5 @@ TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void)
 
   return retval;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
index 96a6b3f12d1..8e0282ecfdd 100644
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -1,19 +1,19 @@
-// -*- C++ -*-
 // $Id$
 
-#include "Block_Flushing_Strategy.h"
-#include "Transport.h"
-#include "Queued_Message.h"
+#include "tao/Block_Flushing_Strategy.h"
+#include "tao/Transport.h"
+#include "tao/Queued_Message.h"
 
 ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *transport)
 {
   while (!transport->queue_is_empty_i ())
     {
-      int result = transport->drain_queue_i ();
-      if (result == -1)
+      if (transport->drain_queue_i () == -1)
         return -1;
     }
   return 0;
@@ -32,8 +32,7 @@ TAO_Block_Flushing_Strategy::flush_message (TAO_Transport *transport,
 {
   while (!msg->all_data_sent ())
     {
-      int result = transport->handle_output ();
-      if (result == -1)
+      if (transport->handle_output () == -1)
         return -1;
     }
   return 0;
@@ -44,9 +43,10 @@ TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport)
 {
   while (!transport->queue_is_empty ())
     {
-      int result = transport->handle_output ();
-      if (result == -1)
+      if (transport->handle_output () == -1)
         return -1;
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
index 4c917bc2671..835b97755e7 100644
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -14,12 +14,14 @@
 #define TAO_BLOCK_FLUSHING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Flushing_Strategy.h"
+#include "tao/Flushing_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Block_Flushing_Strategy
  *
@@ -36,5 +38,7 @@ public:
   virtual int flush_transport (TAO_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_BLOCK_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index a7d50c3d307..9317a128679 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -1,5 +1,5 @@
-#include "Blocked_Connect_Strategy.h"
-#include "Connection_Handler.h"
+#include "tao/Blocked_Connect_Strategy.h"
+#include "tao/Connection_Handler.h"
 
 #include "ace/Synch_Options.h"
 
@@ -7,6 +7,7 @@ ACE_RCSID(tao,
           Blocked_Connect_Strategy,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy (
     TAO_ORB_Core *orb_core)
@@ -53,3 +54,5 @@ TAO_Blocked_Connect_Strategy::wait (TAO_Transport *,
   // We cannot wait for connection completion
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h
index 87016f0470f..9c547ebfc23 100644
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ b/TAO/tao/Blocked_Connect_Strategy.h
@@ -14,12 +14,14 @@
 #define TAO_BLOCKED_CONNECT_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Connect_Strategy.h"
+#include "tao/Connect_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Blocked_Connect_Strategy
  *
@@ -27,11 +29,10 @@
  *  during connects
  *
  */
-
 class TAO_Export TAO_Blocked_Connect_Strategy : public TAO_Connect_Strategy
 {
 public:
-  /// Contructor
+  /// Constructor
   TAO_Blocked_Connect_Strategy (TAO_ORB_Core *orb);
 
   /// Destructor
@@ -51,6 +52,7 @@ public:
                      ACE_Time_Value *val);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_BLOCKED_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index 94f67041501..1e51a578c91 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "BooleanSeqC.h"
+#include "tao/BooleanSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_BOOLEANSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::BooleanSeq::BooleanSeq (void)
 CORBA::BooleanSeq::BooleanSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Boolean
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::BooleanSeq::BooleanSeq (
     ::CORBA::Boolean * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Boolean
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::BooleanSeq::BooleanSeq (
 CORBA::BooleanSeq::BooleanSeq (
     const BooleanSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Boolean
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::BooleanSeq::_tao_any_destructor (
     const CORBA::BooleanSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::BooleanSeq::_tao_any_destructor (
     CORBA::BooleanSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 61901510719..58c8a97c5ad 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -52,38 +52,37 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_BOOLEANSEQ_CH_)
 #define _CORBA_BOOLEANSEQ_CH_
-  
+
   class BooleanSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        BooleanSeq,
-        CORBA::Boolean
+        BooleanSeq
       >
     BooleanSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        BooleanSeq,
-        BooleanSeq_var,
-        CORBA::Boolean
+        BooleanSeq
       >
     BooleanSeq_out;
-  
+
   class TAO_Export BooleanSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Boolean
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     BooleanSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::Boolean* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::Boolean* buffer,
+        ::CORBA::Boolean release = false
       );
     BooleanSeq (const BooleanSeq &);
     ~BooleanSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef BooleanSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h
index c0cbbdb5a01..7213b9547f6 100644
--- a/TAO/tao/Bounded_Sequence_CDR_T.h
+++ b/TAO/tao/Bounded_Sequence_CDR_T.h
@@ -12,7 +12,6 @@
  */
 
 #include "tao/orbconf.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -329,9 +328,7 @@ namespace TAO {
 namespace TAO {
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Short, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
-    ::CORBA::ULong const length = source.length ();
+    const ::CORBA::ULong length = source.length ();
     if (!(strm << length)) {
       return false;
     }
@@ -340,9 +337,7 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Long, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
-    ::CORBA::ULong const length = source.length ();
+    const ::CORBA::ULong length = source.length ();
     if (!(strm << length)) {
       return false;
     }
@@ -351,8 +346,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULong, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -362,8 +355,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::UShort, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -373,8 +364,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Octet, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -384,8 +373,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Char, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -396,8 +383,6 @@ namespace TAO {
 # if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::WChar, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -408,8 +393,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Float, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -419,8 +402,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Double, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -430,8 +411,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULongLong, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -441,8 +420,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::LongDouble, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -452,8 +429,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Boolean, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -463,8 +438,6 @@ namespace TAO {
 
   template <typename stream, typename value_t, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <value_t, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -479,8 +452,6 @@ namespace TAO {
 
   template <typename stream, typename charT, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -496,8 +467,6 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX> & source) {
     typedef typename TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX>::object_type object_type;
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
index 34a0aa19550..52ae87f3c33 100644
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ b/TAO/tao/Buffer_Allocator_T.cpp
@@ -6,6 +6,9 @@
 #include "tao/Buffer_Allocator_T.h"
 #include "ace/Global_Macros.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template <typename handler_type, typename alloc_type>
@@ -37,4 +40,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_BUFFER_ALLOCATOR_T_CPP */
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
index 59684723965..3d29c153ac9 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -21,6 +21,8 @@
 
 #include "tao/Allocator.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -46,6 +48,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Buffer_Allocator_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index f3e97bfc0d3..a3d9ddd3cd0 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -4,22 +4,23 @@
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-#include "TAOC.h"
-#include "SystemException.h"
+#include "tao/TAOC.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            Buffering_Constraint_Policy,
            "$Id$")
 
-
 #if ! defined (__ACE_INLINE__)
 #include "tao/Buffering_Constraint_Policy.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , TAO::BufferingConstraintPolicy ()
   , TAO_Local_RefCounted_Object ()
   , buffering_constraint_ (buffering_constraint)
@@ -28,9 +29,9 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::Buf
 
 TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs)
 
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , TAO::BufferingConstraintPolicy ()
   , TAO_Local_RefCounted_Object ()
   , buffering_constraint_ (rhs.buffering_constraint_)
@@ -86,4 +87,6 @@ TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const
   return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index d94271eeca4..4c7c107a01a 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Buffering_Constraint_Policy.h
@@ -30,6 +31,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Buffering_Constraint_Policy
  *
@@ -55,6 +58,7 @@ public:
 
   virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
+
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
   virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -74,6 +78,8 @@ private:
   TAO::BufferingConstraint buffering_constraint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i
index aa5203cb743..2176d0efc36 100644
--- a/TAO/tao/Buffering_Constraint_Policy.i
+++ b/TAO/tao/Buffering_Constraint_Policy.i
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_Buffering_Constraint_Policy::get_buffering_constraint (TAO::BufferingConstraint &bc) const
 {
   bc = this->buffering_constraint_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index ccc993ff3b0..31efb9b0ea6 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -5,6 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
+#include "tao/GIOP_Fragmentation_Strategy.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/CDR.i"
@@ -25,7 +26,9 @@ static const char *TAO_CDR_Timeprobe_Description[] =
   "OutputCDR::ctor[2] - enter",
   "OutputCDR::ctor[2] - leave",
   "OutputCDR::ctor[3] - enter",
-  "OutputCDR::ctor[3] - leave"
+  "OutputCDR::ctor[3] - leave",
+  "OutputCDR::ctor[4] - enter",
+  "OutputCDR::ctor[4] - leave"
 };
 
 enum
@@ -35,7 +38,9 @@ enum
   TAO_OUTPUT_CDR_CTOR2_ENTER,
   TAO_OUTPUT_CDR_CTOR2_LEAVE,
   TAO_OUTPUT_CDR_CTOR3_ENTER,
-  TAO_OUTPUT_CDR_CTOR3_LEAVE
+  TAO_OUTPUT_CDR_CTOR3_LEAVE,
+  TAO_OUTPUT_CDR_CTOR4_ENTER,
+  TAO_OUTPUT_CDR_CTOR4_LEAVE
 };
 
 // Setup Timeprobes
@@ -44,6 +49,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_OutputCDR::TAO_OutputCDR (size_t size,
                               int byte_order,
                               ACE_Allocator *buffer_allocator,
@@ -52,14 +59,20 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
                               size_t memcpy_tradeoff,
                               ACE_CDR::Octet major_version,
                               ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    message_block_allocator,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
+  : ACE_OutputCDR (size,
+                   byte_order,
+                   buffer_allocator,
+                   data_block_allocator,
+                   message_block_allocator,
+                   memcpy_tradeoff,
+                   major_version,
+                   minor_version)
+  , fragmentation_strategy_ (0)
+  , more_fragments_ (false)
+  , request_id_ (0)
+  , stub_ (0)
+  , message_semantics_ (-1)
+  , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
 }
@@ -73,33 +86,73 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
                               size_t memcpy_tradeoff,
                               ACE_CDR::Octet major_version,
                               ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (data,
-                    size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    message_block_allocator,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
+  : ACE_OutputCDR (data,
+                   size,
+                   byte_order,
+                   buffer_allocator,
+                   data_block_allocator,
+                   message_block_allocator,
+                   memcpy_tradeoff,
+                   major_version,
+                   minor_version)
+  , fragmentation_strategy_ (0)
+  , more_fragments_ (false)
+  , request_id_ (0)
+  , stub_ (0)
+  , message_semantics_ (-1)
+  , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
 }
 
-TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
+TAO_OutputCDR::TAO_OutputCDR (char *data,
+                              size_t size,
                               int byte_order,
+                              ACE_Allocator* buffer_allocator,
+                              ACE_Allocator* data_block_allocator,
+                              ACE_Allocator* message_block_allocator,
                               size_t memcpy_tradeoff,
+                              TAO_GIOP_Fragmentation_Strategy * fs,
                               ACE_CDR::Octet major_version,
                               ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (data,
-                    byte_order,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
+  : ACE_OutputCDR (data,
+                   size,
+                   byte_order,
+                   buffer_allocator,
+                   data_block_allocator,
+                   message_block_allocator,
+                   memcpy_tradeoff,
+                   major_version,
+                   minor_version)
+  , fragmentation_strategy_ (fs)
+  , more_fragments_ (false)
+  , request_id_ (0)
+  , stub_ (0)
+  , message_semantics_ (-1)
+  , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
 }
 
+TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
+                              int byte_order,
+                              size_t memcpy_tradeoff,
+                              ACE_CDR::Octet major_version,
+                              ACE_CDR::Octet minor_version)
+  : ACE_OutputCDR (data,
+                   byte_order,
+                   memcpy_tradeoff,
+                   major_version,
+                   minor_version)
+  , fragmentation_strategy_ (0)
+  , more_fragments_ (false)
+  , request_id_ (0)
+  , stub_ (0)
+  , message_semantics_ (-1)
+  , timeout_ (0)
+{
+  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR4_ENTER);
+}
 
 void
 TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
@@ -110,15 +163,16 @@ TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
       break;
     case EINVAL : // wchar from a GIOP 1.0
       ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
+      ACE_NOTREACHED (break);
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
+      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
+                                         CORBA::COMPLETED_NO));
+      ACE_NOTREACHED (break);
 #endif
     case EACCES : // wchar but no codeset
-      ACE_THROW(CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
+      ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
+      ACE_NOTREACHED (break);
     default :
       ACE_THROW (CORBA::MARSHAL ());
     }
@@ -134,18 +188,18 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
 
     case EINVAL : // wchar from a GIOP 1.0
       ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
+      ACE_NOTREACHED (break);
 
     case EACCES : // wchar but no codeset
       ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 23,
                                    CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
+      ACE_NOTREACHED (break);
 
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
       ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
                                          CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
+      ACE_NOTREACHED (break);
 #endif
 
     default :
@@ -154,6 +208,19 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
     }
 }
 
+bool
+TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment,
+                                ACE_CDR::ULong pending_length)
+{
+  if (this->fragmentation_strategy_)
+    {
+      return (this->fragmentation_strategy_->fragment (*this,
+                                                       pending_alignment,
+                                                       pending_length) == 0);
+    }
+
+  return true;  // Success.
+}
 
 
 // ****************************************************************
@@ -229,3 +296,11 @@ TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
 
     }
 }
+
+ACE_Message_Block::Message_Flags
+TAO_InputCDR::clr_mb_flags( ACE_Message_Block::Message_Flags less_flags )
+{
+  return start_.clr_self_flags( less_flags );
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 91ebea856a1..3bfb47b2f14 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    CDR.h
@@ -42,19 +43,25 @@
 #define TAO_CDR_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/CDR_Stream.h"
-
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
+
+#include "ace/CORBA_macros.h"
+#include "ace/CDR_Stream.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
+class TAO_GIOP_Fragmentation_Strategy;
+class TAO_Stub;
 
 namespace CORBA
 {
@@ -117,6 +124,20 @@ public:
                  ACE_CDR::Octet minor_version =
                    TAO_DEF_GIOP_MINOR);
 
+  /// Build a CDR stream with an initial buffer, it will *not* remove
+  /// @a data since it did not allocated it, and enable fragmentation
+  /// support.
+  TAO_OutputCDR (char *data,
+                 size_t size,
+                 int byte_order,
+                 ACE_Allocator* buffer_allocator,
+                 ACE_Allocator* data_block_allocator,
+                 ACE_Allocator* message_block_allocator,
+                 size_t memcpy_tradeoff,
+                 TAO_GIOP_Fragmentation_Strategy * fs,
+                 ACE_CDR::Octet major_version,
+                 ACE_CDR::Octet minor_version);
+
   /// Build a CDR stream with an initial Message_Block chain, it will *not*
   /// remove <data>, since it did not allocate it.
   TAO_OutputCDR (ACE_Message_Block *data,
@@ -137,10 +158,84 @@ public:
   static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
   static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL);
 
+  /**
+   * @name Outgoing GIOP Fragment Related Methods
+   *
+   * These methods are only used when fragmenting outgoing GIOP
+   * requests and replies.
+   */
+  //@{
+  /// Fragment this output CDR stream if necessary.
+  /**
+   * Fragmentation will done through GIOP fragments when the length of
+   * the CDR stream length will exceed the configured threshold.
+   */
+  bool fragment_stream (ACE_CDR::ULong pending_alignment,
+                        ACE_CDR::ULong pending_length);
+
+  /// Are there more data fragments to come?
+  bool more_fragments (void) const;
+
+  /// Specify whether there are more data fragments to come.
+  void more_fragments (bool more);
+
+  /// Set fragmented message attributes.
+  void message_attributes (CORBA::ULong request_id,
+                           TAO_Stub * stub,
+                           int message_semantics,
+                           ACE_Time_Value * timeout);
+
+  /// Fragmented message request ID.
+  CORBA::ULong request_id (void) const;
+
+  /// Stub object associated with the request.
+  TAO_Stub * stub (void) const;
+
+  /// Message semantics (twoway, oneway, reply)
+  int message_semantics (void) const;
+
+  /// Maximum time to wait for outgoing message to be sent.
+  ACE_Time_Value * timeout (void) const;
+  //@}
+
 private:
-  /// disallow copying...
+
+  // disallow copying...
   TAO_OutputCDR (const TAO_OutputCDR& rhs);
   TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
+
+private:
+
+  /**
+   * @name Outgoing GIOP Fragment Related Attributes
+   *
+   * These attributes are only used when fragmenting outgoing GIOP
+   * requests and replies.
+   */
+  //@{
+  /// Strategy that sends data currently marshaled into this
+  /// TAO_OutputCDR stream if necessary.
+  TAO_GIOP_Fragmentation_Strategy * const fragmentation_strategy_;
+
+  /// Are there more data fragments to come?
+  bool more_fragments_;
+
+  /// Request ID for the request currently being marshaled.
+  CORBA::ULong request_id_;
+
+  /// Stub object associated with the request.
+  TAO_Stub * stub_;
+
+  /// Twoway, oneway, reply?
+  /**
+   * @see TAO_Transport
+   */
+  int message_semantics_;
+
+  /// Request/reply send timeout.
+  ACE_Time_Value * timeout_;
+  //@}
+
 };
 
 /**
@@ -201,7 +296,7 @@ public:
 
   /// Create an input stream from an ACE_Message_Block with an optional lock
   /// used to protect the data.
-  TAO_InputCDR (const ACE_Message_Block *data, 
+  TAO_InputCDR (const ACE_Message_Block *data,
                 ACE_Lock* lock,
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
@@ -274,6 +369,8 @@ public:
   /// Accessor
   TAO_ORB_Core *orb_core (void) const;
 
+  ACE_Message_Block::Message_Flags
+    clr_mb_flags( ACE_Message_Block::Message_Flags less_flags );
 
   // = TAO specific methods.
   static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
@@ -284,10 +381,14 @@ private:
   TAO_ORB_Core* orb_core_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 # include "tao/CDR.i"
 #else
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // CDR output operators for CORBA types
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
@@ -337,6 +438,9 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                       CORBA::Char* &x);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                       CORBA::WChar* &x);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* __ACE_INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
index a4081309dc6..57162a0e0c4 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -2,11 +2,63 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_OutputCDR::~TAO_OutputCDR (void)
 {
 }
 
+ACE_INLINE bool
+TAO_OutputCDR::more_fragments (void) const
+{
+  return this->more_fragments_;
+}
+
+ACE_INLINE void
+TAO_OutputCDR::more_fragments (bool more)
+{
+  this->more_fragments_ = more;
+}
+
+ACE_INLINE void
+TAO_OutputCDR::message_attributes (CORBA::ULong request_id,
+                                   TAO_Stub * stub,
+                                   int message_semantics,
+                                   ACE_Time_Value * timeout)
+{
+  this->request_id_        = request_id;
+  this->stub_              = stub;
+  this->message_semantics_ = message_semantics;
+  this->timeout_           = timeout;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_OutputCDR::request_id (void) const
+{
+  return this->request_id_;
+}
+
+ACE_INLINE TAO_Stub *
+TAO_OutputCDR::stub (void) const
+{
+  return this->stub_;
+}
+
+ACE_INLINE int
+TAO_OutputCDR::message_semantics (void) const
+{
+  return this->message_semantics_;
+}
+
+ACE_INLINE ACE_Time_Value *
+TAO_OutputCDR::timeout (void) const
+{
+  return this->timeout_;
+}
+
+// -------------------------------------------------------------------
+
 ACE_INLINE
 TAO_InputCDR::TAO_InputCDR (const char *buf,
                             size_t bufsiz,
@@ -156,67 +208,102 @@ TAO_InputCDR::orb_core (void) const
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::Short x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::SHORT_ALIGN,
+                        sizeof (CORBA::Short))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::UShort x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::SHORT_ALIGN,
+                        sizeof (CORBA::UShort))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::Long x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONG_ALIGN,
+                        sizeof (CORBA::Long))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::ULong x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONG_ALIGN,
+                        sizeof (CORBA::ULong))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::LongLong x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONGLONG_ALIGN,
+                        sizeof (CORBA::LongLong))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::ULongLong x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONGLONG_ALIGN,
+                        sizeof (CORBA::ULongLong))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR& os,
                                       CORBA::LongDouble x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONGDOUBLE_ALIGN,
+                        sizeof (CORBA::LongDouble))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::Float x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONG_ALIGN,
+                        sizeof (CORBA::Float))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       CORBA::Double x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::LONGLONG_ALIGN,
+                        sizeof (CORBA::Double))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::Char* x)
+                                      const char * x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream (ACE_CDR::OCTET_ALIGN,
+                        sizeof (char))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::WChar* x)
+                                      const CORBA::WChar * x)
 {
-  return static_cast<ACE_OutputCDR &> (os) << x;
+  return
+    os.fragment_stream ((sizeof (CORBA::WChar) == 2
+                         ? ACE_CDR::SHORT_ALIGN
+                         : ACE_CDR::LONG_ALIGN),
+                        sizeof (CORBA::WChar))
+    && static_cast<ACE_OutputCDR &> (os) << x;
 }
 
 // ****************************************************************
@@ -286,3 +373,5 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
 {
   return static_cast<ACE_InputCDR &> (is) >> x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 3f4684f6fb2..671887bff88 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file CONV_FRAME.pidl
  *
@@ -12,6 +14,8 @@
  *        -Wb,export_include="tao/TAO_Export.h"
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
+ *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *        CONV_FRAME.pidl
  *
  * The files are ready to use.
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 11d54fd3b16..ba3c2fe9440 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:288
 
 
-#include "CONV_FRAMEC.h"
+#include "tao/CONV_FRAMEC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CONV_FRAME_CODESETIDSEQ_CS_)
@@ -53,7 +55,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (void)
 CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CodeSetId
       >
     (max)
@@ -65,7 +67,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CodeSetId
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
 CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     const CodeSetIdSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CodeSetId
       >
     (seq)
@@ -94,10 +96,10 @@ void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CONV_FRAME::CodeSetComponent::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -107,10 +109,10 @@ CONV_FRAME::CodeSetComponent::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -120,10 +122,10 @@ CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CONV_FRAME::CodeSetContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -144,15 +146,7 @@ CORBA::Boolean operator<< (
     const CONV_FRAME::CodeSetIdSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -160,33 +154,7 @@ CORBA::Boolean operator>> (
     CONV_FRAME::CodeSetIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_ */
@@ -259,3 +227,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.char_data) &&
     (strm >> _tao_aggregate.wchar_data);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 798e0fa4261..5a5df45164f 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -61,41 +61,40 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CONV_FRAME
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CONV_FRAME_CODESETIDSEQ_CH_)
 #define _CONV_FRAME_CODESETIDSEQ_CH_
-  
+
   class CodeSetIdSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        CodeSetIdSeq,
-        CodeSetId
+        CodeSetIdSeq
       >
     CodeSetIdSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        CodeSetIdSeq,
-        CodeSetIdSeq_var,
-        CodeSetId
+        CodeSetIdSeq
       >
     CodeSetIdSeq_out;
-  
+
   class TAO_Export CodeSetIdSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CodeSetId
           >
   {
@@ -105,101 +104,101 @@ namespace CONV_FRAME
     CodeSetIdSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::ULong* buffer,
+        CORBA::Boolean release = false
       );
     CodeSetIdSeq (const CodeSetIdSeq &);
     ~CodeSetIdSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef CodeSetIdSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct CodeSetComponent;
-  
+
   typedef
     TAO_Var_Var_T<
         CodeSetComponent
       >
     CodeSetComponent_var;
-  
+
   typedef
     TAO_Out_T<
         CodeSetComponent,
         CodeSetComponent_var
       >
     CodeSetComponent_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export CodeSetComponent
   {
     typedef CodeSetComponent_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetId native_code_set;
     CONV_FRAME::CodeSetIdSeq conversion_code_sets;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct CodeSetComponentInfo;
-  
+
   typedef
     TAO_Var_Var_T<
         CodeSetComponentInfo
       >
     CodeSetComponentInfo_var;
-  
+
   typedef
     TAO_Out_T<
         CodeSetComponentInfo,
         CodeSetComponentInfo_var
       >
     CodeSetComponentInfo_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export CodeSetComponentInfo
   {
     typedef CodeSetComponentInfo_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetComponent ForCharData;
     CONV_FRAME::CodeSetComponent ForWcharData;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct CodeSetContext;
-  
+
   typedef
     TAO_Fixed_Var_T<
         CodeSetContext
       >
     CodeSetContext_var;
-  
+
   typedef
     CodeSetContext &
     CodeSetContext_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export CodeSetContext
   {
     typedef CodeSetContext_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetId char_data;
     CONV_FRAME::CodeSetId wchar_data;
@@ -256,6 +255,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index ae210f857b9..2dda9784489 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,10 +1,10 @@
-#include "CORBALOC_Parser.h"
-#include "ORB_Core.h"
-#include "Stub.h"
-#include "MProfile.h"
-#include "Connector_Registry.h"
-#include "Transport_Connector.h"
-#include "Protocol_Factory.h"
+#include "tao/CORBALOC_Parser.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/MProfile.h"
+#include "tao/Connector_Registry.h"
+#include "tao/Transport_Connector.h"
+#include "tao/Protocol_Factory.h"
 #include "tao/debug.h"
 #include "ace/Vector_T.h"
 #include "ace/INET_Addr.h"
@@ -13,17 +13,13 @@
 #include "ace/os_include/os_netdb.h"
 
 #if !defined(__ACE_INLINE__)
-#include "CORBALOC_Parser.i"
+#include "tao/CORBALOC_Parser.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            CORBALOC_Parser,
            "$Id$")
 
-TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
-{
-}
-
 static const char prefix[] = "corbaloc:";
 static const size_t prefix_len = sizeof prefix - 1;
 static const char rir_token[] = "rir:";
@@ -31,6 +27,12 @@ static const size_t rir_token_len = sizeof rir_token - 1;
 static const char iiop_token[] = "iiop:";
 static const char iiop_token_len = sizeof iiop_token - 1;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
+{
+}
+
 int
 TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const
 {
@@ -374,6 +376,8 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
   canonical_endpoint += raw_port;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser,
                        ACE_TEXT ("CORBALOC_Parser"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index df1d73c4715..b9ecab51756 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -27,8 +27,9 @@
 #include "tao/Profile.h"
 #include "ace/SString.h"
 
-class TAO_MProfile;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_MProfile;
 
 /**
  * @class TAO_CORBALOC_Parser
@@ -40,7 +41,7 @@ class TAO_MProfile;
  * string to separate the individual <obj_addr> from the list of object
  * addresses <obj_addr_list>.
  */
-class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser
+class TAO_CORBALOC_Parser : public TAO_IOR_Parser
 {
 public:
   /// Constructor
@@ -92,8 +93,10 @@ private:
   };
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "CORBALOC_Parser.i"
+# include "tao/CORBALOC_Parser.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser)
diff --git a/TAO/tao/CORBALOC_Parser.i b/TAO/tao/CORBALOC_Parser.i
index fddafd15c3f..53f39cf5a05 100644
--- a/TAO/tao/CORBALOC_Parser.i
+++ b/TAO/tao/CORBALOC_Parser.i
@@ -1,13 +1,16 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_CORBALOC_Parser::TAO_CORBALOC_Parser (void)
 {
 }
 
 ACE_INLINE
-TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint(void)
+TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint (void)
  : profile_ (0)
 {
 }
@@ -18,3 +21,5 @@ TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void)
   if (this->profile_ != 0)
     this->profile_->_decr_refcnt();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 649edfb1408..bfc2eca66a7 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -1,16 +1,12 @@
 // $Id$
 
-#include "CORBANAME_Parser.h"
-#include "ORB.h"
-#include "Object.h"
-#include "SystemException.h"
-#include "UB_String_Arguments.h"
-#include "Invocation_Adapter.h"
-#include "debug.h"
-
-#if !defined(__ACE_INLINE__)
-#include "CORBANAME_Parser.i"
-#endif /* __ACE_INLINE__ */
+#include "tao/CORBANAME_Parser.h"
+#include "tao/ORB.h"
+#include "tao/Object.h"
+#include "tao/SystemException.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Invocation_Adapter.h"
+#include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
@@ -21,13 +17,14 @@ ACE_RCSID (tao,
            CORBANAME_Parser,
            "$Id$")
 
+static const char corbaname_prefix[] = "corbaname:";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void)
 {
 }
 
-static const char corbaname_prefix[] = "corbaname:";
-
 int
 TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const
 {
@@ -158,6 +155,8 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser,
                        ACE_TEXT ("CORBANAME_Parser"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 5f1f66cf8db..9580d770885 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +24,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_CORBANAME_Parser
  *
@@ -33,11 +36,9 @@
  * to a naming service at the given address and port and then resolve an
  * object in that context.
  */
-class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser
+class TAO_CORBANAME_Parser : public TAO_IOR_Parser
 {
 public:
-  /// Constructor
-  TAO_CORBANAME_Parser (void);
 
   /// The destructor
   virtual ~TAO_CORBANAME_Parser (void);
@@ -58,9 +59,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-# include "CORBANAME_Parser.i"
-#endif /* __ACE_INLINE__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser)
diff --git a/TAO/tao/CORBANAME_Parser.i b/TAO/tao/CORBANAME_Parser.i
deleted file mode 100644
index 1139a868437..00000000000
--- a/TAO/tao/CORBANAME_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_CORBANAME_Parser::TAO_CORBANAME_Parser (void)
-{
-}
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index 6c49706b60b..f1787d50852 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -1,5 +1,5 @@
-#include "CORBA_String.h"
-#include "Managed_Types.h"
+#include "tao/CORBA_String.h"
+#include "tao/String_Manager_T.h"
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_wchar.h"
@@ -16,197 +16,7 @@ ACE_RCSID (tao,
            CORBA_String,
            "$Id$")
 
-char *
-CORBA::string_dup (const char *str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-  return ACE::String_Conversion::Convert_Out< char >( str ).c_str();
-}
-
-char *
-CORBA::string_dup (const WChar *str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-  return ACE::String_Conversion::Convert_Out< char >( str ).c_str();
-}
-
-char *
-CORBA::string_alloc (CORBA::ULong len)
-{
-  return ACE::String_Conversion::Allocator_cpp< char >().alloc( len );
-}
-
-void
-CORBA::string_free (char *str)
-{
-  ACE::String_Conversion::Allocator_cpp< char >().free( str );
-}
-
-// ****************************************************************
-
-CORBA::WChar*
-CORBA::wstring_dup (const WChar * str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-  return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str();
-}
-
-CORBA::WChar*
-CORBA::wstring_dup (const char *str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-  return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str();
-}
-
-CORBA::WChar*
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return ACE::String_Conversion::Allocator_cpp< WChar >().alloc( len );
-}
-
-void
-CORBA::wstring_free (CORBA::WChar * str)
-{
-  ACE::String_Conversion::Allocator_cpp< WChar >().free( str );
-}
-
-// ****************************************************************
-
-CORBA::String_var::String_var (char *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA::String_var::String_var (const CORBA::String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
-
-CORBA::String_var::~String_var (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const char *p)
-{
-  CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const CORBA::String_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = CORBA::string_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// ****************************************************************
-
-CORBA::WString_var::WString_var (CORBA::WChar *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA::WString_var::WString_var (const CORBA::WString_var& r)
-{
-  this->ptr_ = CORBA::wstring_dup (r.ptr_);
-}
-
-CORBA::WString_var::~WString_var (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (CORBA::WChar *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (const CORBA::WChar *p)
-{
-  CORBA::wstring_free (this->ptr_);
-
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (const CORBA::WString_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = CORBA::wstring_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// These methods moved to the CPP file to avoid cyclic dependencies.
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-CORBA::String_out::String_out (TAO_String_Manager &s)
-  : ptr_ (s.out ())
-{
-}
-
-// ----------------------------------------------------
-//  WString_out type
-// ----------------------------------------------------
-CORBA::WString_out::WString_out (TAO_WString_Manager &s)
-  : ptr_ (s.out ())
-{
-}
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // *************************************************************
 // C++ iostream operators for (W)String_var and (W)String_out
@@ -255,7 +65,7 @@ operator>> (istream &is, CORBA::String_out &so)
 ostream &
 operator<< (ostream &os, const CORBA::WString_var &wsv)
 {
-  const CORBA::ULong len = 
+  CORBA::ULong const len =
     static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ()));
 
   for (CORBA::ULong i = 0; i < len; ++i)
@@ -271,7 +81,7 @@ operator>> (istream &is, CORBA::WString_var &wsv)
 {
   is.seekg (0, ios::end);
   // @@ is.tellg()/sizeof(CORBA::WChar) instead?
-  const CORBA::ULong len = is.tellg ();
+  CORBA::ULong const len = is.tellg ();
   wsv = CORBA::wstring_alloc (len);
   is.seekg (0, ios::beg);
 
@@ -331,3 +141,5 @@ operator>> (istream &is, CORBA::WString_out &wso)
 }
 
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index a066ad183b2..810a73e0424 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -23,106 +23,143 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/String_Traits_Base_T.h"
 // For the (W)String_var and (W)String_out iostream operators.
 #include "ace/iosfwd.h"
 
-class TAO_String_Manager;
-class TAO_WString_Manager;
+#include <algorithm>
 
-namespace CORBA
-{
-  /**
-   * @name CORBA String Memory Management
-   *
-   * CORBA string memory management functions.
-   */
-  //@{
-  TAO_Export char * string_alloc (ULong len);
-  TAO_Export char * string_dup (const char *);
-  TAO_Export char * string_dup (const WChar *);
-  TAO_Export void string_free (char *);
-  //@}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-  /**
-   * @name CORBA Wide String Memory Management
-   *
-   * CORBA wide string memory management functions.
-   */
-  //@{
-  TAO_Export WChar * wstring_alloc (ULong len);
-  TAO_Export WChar * wstring_dup (const WChar *);
-  TAO_Export WChar * wstring_dup (const char *);
-  TAO_Export void wstring_free (WChar *);
-  //@}
+namespace TAO
+{
+  template <typename charT> class String_Manager_T;  // Forward declaration.
+  typedef String_Manager_T<CORBA::Char> String_Manager;
+  typedef String_Manager_T<CORBA::WChar> WString_Manager;
+}
 
+namespace TAO
+{
   /**
    * @class String_var
    *
-   * @brief CORBA::String var class.
-   *
    * Provides automatic deallocation of storage for the string once it
    * goes out of scope.
    */
-  class TAO_Export String_var
+  template <typename charT>
+  class String_var
   {
   public:
+    typedef charT character_type;
+    typedef TAO::details::string_traits_base <character_type> s_traits;
+
     /// Default constructor.
-    String_var (void);
+    inline String_var (void) : ptr_ (0)
+    {
+    }
 
     /// Constructor, owns p.
-    String_var (char *p);
-
-    /// constructor. Makes a copy of p.
-    String_var (const char *p);
-
-    /// copy constructor.
-    String_var (const String_var &s);
-
-    /// destructor.
-    ~String_var (void);
+    inline String_var (character_type *p) : ptr_ (p)
+    {
+    }
 
-    /// assignment operator.
-    String_var &operator= (char *p);
+    /// Constructor. Makes a copy of p.
+    inline String_var (const character_type *p) : ptr_ (s_traits::duplicate (p))
+    {
+    }
 
-    /// assignment to a const char*.  Makes a copy.
-    String_var &operator= (const char *p);
-
-    /// assignment operator.
-    String_var &operator= (const String_var &s);
+    /// Copy constructor.
+    inline String_var (String_var<charT> const &s) : ptr_(s_traits::duplicate(s.ptr_))
+    {
+    }
+
+    /// Destructor.
+    inline ~String_var (void)
+    {
+      s_traits::release (this->ptr_);
+    }
+
+    /// Assignment operator.
+    inline String_var &operator= (character_type *p)
+    {
+      String_var <charT> tmp (p);
+      std::swap (this->ptr_, tmp.ptr_);
+      return *this;
+    }
+
+    /// Assignment to a const char*.  Makes a copy.
+    inline String_var &operator= (const character_type *p)
+    {
+      String_var <charT> tmp (p);
+      std::swap (this->ptr_, tmp.ptr_);
+      return *this;
+    }
+
+    /// Assignment operator.
+    inline String_var &operator= (String_var<character_type> const &s)
+    {
+      String_var <charT> tmp (s);
+      std::swap (this->ptr_, tmp.ptr_);
+      return *this;
+    }
 
     /// Spec-defined read/write version.
-    operator char *&();
-
-    /// only read privileges.
-    operator const char *() const;
-
-    /// allows access and modification using an slot.
-    char &operator[] (CORBA::ULong slot);
-
-    /// allows only accessing thru an slot.
-    char operator[] (CORBA::ULong slot) const;
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    /// for in parameter.
-    const char *in (void) const;
-
-    /// for inout parameter.
-    char *&inout (void);
-
-    /// for out parameter.
-    char *&out (void);
-
-    /// for string of return type.
-    char *_retn (void);
-
-    /// TAO extension.
-    char *ptr (void);
+    inline operator character_type *&()
+    {
+      return this->ptr_;
+    }
+
+    /// Only read privileges.
+    inline operator const character_type *() const
+    {
+      return this->ptr_;
+    }
+
+    /// Allows access and modification using an slot.
+    inline character_type &operator[] (CORBA::ULong slot)
+    {
+      // We need to verify bounds else raise some exception.
+      return this->ptr_[slot];
+    }
+
+    /// Allows only accessing thru an slot.
+    inline character_type operator[] (CORBA::ULong slot) const
+    {
+      // We need to verify bounds else raise some exception.
+      return this->ptr_[slot];
+    }
+
+    /// For in parameter.
+    inline const character_type *in (void) const
+    {
+      return this->ptr_;
+    }
+
+    /// For inout parameter.
+    inline character_type *&inout (void)
+    {
+      return this->ptr_;
+    }
+
+    /// For out parameter.
+    inline character_type *&out (void)
+    {
+      s_traits::release (this->ptr_);
+      this->ptr_ = 0;
+      return this->ptr_;
+    }
+
+    /// For string of return type.
+    inline character_type *_retn (void)
+    {
+      character_type *temp = this->ptr_;
+      this->ptr_ = 0;
+      return temp;
+    }
 
   private:
-    /// instance.
-    char *ptr_;
+    /// Instance.
+    character_type *ptr_;
   };
 
   /**
@@ -131,171 +168,78 @@ namespace CORBA
    * @brief String_out
    *
    * To support the memory management for "out" parameter passing
-   * mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA::String_out
-   * class
+   * mode.
    */
-  class TAO_Export String_out
+  template <typename charT>
+  class String_out
   {
   public:
+    typedef charT character_type;
+    typedef TAO::details::string_traits_base <character_type> s_traits;
+    typedef typename s_traits::string_mgr string_mgr;
 
     /// Construction from a reference to a string.
-    String_out (char *&p);
+    inline String_out (character_type *&p) : ptr_ (p)
+    {
+      this->ptr_ = 0;
+    }
 
     /// Construction from a var.
-    String_out (CORBA::String_var &p);
+    inline String_out (String_var <character_type> &p) : ptr_ (p.out ())
+    {
+    }
 
-    /// Construction from a TAO_String_Manager.
-    String_out (TAO_String_Manager &p);
+    /// Construction from a TAO::String_Manager.
+    inline String_out (string_mgr &p) : ptr_ (p.out ())
+    {
+    }
 
     /// Copy constructor.
-    String_out (const String_out &s);
+    inline String_out (const String_out<charT> &s) : ptr_ (s.ptr_)
+    {
+    }
 
     /// Assignment from a string_out.
-    String_out &operator= (const String_out &s);
+    inline String_out &operator= (String_out<charT> const &s)
+    {
+      this->ptr_ = s.ptr_;
+      return *this;
+    }
 
     /// Assignment from a string.
-    String_out &operator= (char *p);
+    inline String_out &operator= (character_type *p)
+    {
+      this->ptr_ = p;
+      return *this;
+    }
 
     /// Assignment from a constant char*.
-    String_out& operator= (const char* p);
-
-    /// Cast.
-    operator char *&();
-
-    /// Return underlying instance.
-    char *&ptr (void);
-
-  private:
-    /// Instance.
-    char *&ptr_;
-
-    // assignment from _var disallowed
-    void operator= (const CORBA::String_var &);
-  };
-
-  // ****************************************************************
-
-  /**
-   * @class WString_var
-   *
-   * @brief CORBA::WString var class.
-   *
-   * Provides automatic deallocation of storage for wide strings.
-   */
-  class TAO_Export WString_var
-  {
-  public:
-    /// default constructor.
-    WString_var (void);
-
-    /// constructor, owns p.
-    WString_var (CORBA::WChar *p);
-
-    /// constructor. Makes a copy of p.
-    WString_var (const CORBA::WChar *p);
-
-    /// copy constructor.
-    WString_var (const WString_var &s);
-
-    /// destructor.
-    ~WString_var (void);
-
-    /// assignment operator.
-    WString_var &operator= (CORBA::WChar *p);
-
-    /// assignment to a const char*.  Makes a copy.
-    WString_var &operator= (const CORBA::WChar *p);
-
-    /// assignment operator.
-    WString_var &operator= (const WString_var &s);
-
-    /// access and modify.
-    operator CORBA::WChar *&();
-
-    /// only read privileges.
-    operator const CORBA::WChar *() const;
-
-    /// allows access and modification using an slot.
-    CORBA::WChar &operator[] (CORBA::ULong slot);
-
-    /// allows only accessing thru an slot.
-    CORBA::WChar operator[] (CORBA::ULong slot) const;
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    /// for in parameter.
-    const CORBA::WChar *in (void) const;
-
-    /// for inout parameter.
-    CORBA::WChar *&inout (void);
-
-    /// for out parameter.
-    CORBA::WChar *&out (void);
-
-    /// for string of return type.
-    CORBA::WChar *_retn (void);
-
-    /// TAO extension.
-    CORBA::WChar *ptr (void);
-
-  private:
-    /// instance.
-    CORBA::WChar *ptr_;
-  };
-
-  /**
-   * @class WString_out
-   *
-   * @brief WString_out
-   *
-   * To support the memory management for "out" parameter passing
-   * mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA::WString_out
-   * class.
-   */
-  class TAO_Export WString_out
-  {
-  public:
-
-    /// Construction from a reference to a string.
-    WString_out (CORBA::WChar *&p);
-
-    /// Construction from a var.
-    WString_out (CORBA::WString_var &p);
-
-    /// Construction from a TAO_WString_Manager.
-    WString_out (TAO_WString_Manager &p);
-
-    /// Copy constructor.
-    WString_out (const WString_out &s);
-
-    /// Assignment from a string_out.
-    WString_out &operator= (const WString_out &s);
-
-    /// Assignment from a string.
-    WString_out &operator= (CORBA::WChar *p);
-
-    /// Assignment from a constant CORBA::WChar*.
-    WString_out& operator= (const CORBA::WChar *p);
+    inline String_out& operator= (const character_type* p)
+    {
+      this->ptr_ = s_traits::duplicate (p);
+      return *this;
+    }
 
     /// Cast.
-    operator CORBA::WChar *&();
+    inline operator character_type *&()
+    {
+      return this->ptr_;
+    }
 
     /// Return underlying instance.
-    CORBA::WChar *&ptr (void);
+    inline character_type *&ptr (void)
+    {
+      return this->ptr_;
+    }
 
   private:
     /// Instance.
-    CORBA::WChar *&ptr_;
+    character_type *&ptr_;
 
-    // assignment from _var disallowed
-    void operator= (const CORBA::WString_var &);
+    // Assignment from _var disallowed
+    void operator= (const typename s_traits::string_var &);
   };
 
-}  // End CORBA namespace.
-
-namespace TAO
-{
   /**
    * @struct TAO-specific @c {W}String_var Equality Functor
    *
@@ -312,6 +256,15 @@ namespace TAO
   };
 }
 
+namespace CORBA
+{
+  typedef TAO::String_var <char> String_var;
+  typedef TAO::String_out <char> String_out;
+  typedef TAO::String_var <CORBA::WChar> WString_var;
+  typedef TAO::String_out <CORBA::WChar> WString_out;
+}
+
+
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 TAO_Export ostream &
@@ -333,6 +286,8 @@ operator>> (istream &, CORBA::WString_out &);
 
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/CORBA_String.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl
index 992044b1bb4..daeecf0628c 100644
--- a/TAO/tao/CORBA_String.inl
+++ b/TAO/tao/CORBA_String.inl
@@ -2,279 +2,9 @@
 //
 // $Id$
 
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
 #include "ace/OS_NS_string.h"
-// #include "ace/OS_NS_wchar.h"
-
-
-ACE_INLINE
-CORBA::String_var::String_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (const char *p)
-  : ptr_ (CORBA::string_dup (p))
-{
-}
-
-ACE_INLINE CORBA::Char &
-CORBA::String_var::operator[] (CORBA::ULong slot)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::Char
-CORBA::String_var::operator[] (CORBA::ULong slot) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA::String_var::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::String_var::operator const char *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-CORBA::String_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-CORBA::String_var::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-/// TAO extension.
-ACE_INLINE char *
-CORBA::String_var::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::String_out::String_out (char *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (const CORBA::String_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const CORBA::String_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (char *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const char *p)
-{
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-ACE_INLINE
-CORBA::String_out::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
 
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA::WString_var::WString_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::WString_var::WString_var (const CORBA::WChar *p)
-  : ptr_ (CORBA::wstring_dup (p))
-{
-}
-
-ACE_INLINE CORBA::WChar &
-CORBA::WString_var::operator[] (CORBA::ULong slot)
-{
-  // @@ We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::WChar
-CORBA::WString_var::operator[] (CORBA::ULong slot) const
-{
-  // @@ We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA::WString_var::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WString_var::operator const CORBA::WChar *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-CORBA::WString_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_var::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-CORBA::WString_var::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-/// TAO extension.
-ACE_INLINE CORBA::WChar *
-CORBA::WString_var::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::WString_out::WString_out (CORBA::WChar *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::WString_out::WString_out (CORBA::WString_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::WString_out::WString_out (const CORBA::WString_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::WString_out &
-CORBA::WString_out::operator= (const CORBA::WString_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::WString_out &
-CORBA::WString_out::operator= (CORBA::WChar *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::WString_out &
-CORBA::WString_out::operator= (const CORBA::WChar *p)
-{
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-ACE_INLINE
-CORBA::WString_out::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------------------------
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE bool
 TAO::String_Var_Equal_To::operator() (CORBA::String_var const & lhs,
@@ -289,3 +19,5 @@ TAO::String_Var_Equal_To::operator() (CORBA::WString_var const & lhs,
 {
   return (ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h
index 038f912b6e2..62d95e56a1e 100644
--- a/TAO/tao/CORBA_methods.h
+++ b/TAO/tao/CORBA_methods.h
@@ -30,6 +30,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ORB;
@@ -77,6 +79,8 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_CORBA_METHODS_H */
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 72b8028cd94..7fa1a03f257 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -19,14 +19,14 @@ TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
 
 TAO_Root_POA *
 TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                                     PortableServer::POAManager_ptr poa_manager,
+                                                 TAO_POA_Manager &poa_manager,
                                                  const TAO_POA_Policy_Set &policies,
                                                  ACE_Lock &lock,
                                                  TAO_SYNCH_MUTEX &thread_lock,
                                                  TAO_ORB_Core &orb_core,
                                                  TAO_Object_Adapter *object_adapter
                                                  ACE_ENV_ARG_DECL)
-    {
+{
   TAO_CSD_POA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index 1d041331e99..ed78621d075 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -38,7 +38,7 @@ public:
 
   /// Factory method for creating new CSD Root POA.
   virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                         PortableServer::POAManager_ptr poa_manager,
+                                         TAO_POA_Manager &poa_manager,
                                          const TAO_POA_Policy_Set &policies,
                                          ACE_Lock &lock,
                                          TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index f3cc8e605f5..cd63c5d7375 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Implementation skeleton constructor
 TAO_CSD_POA::TAO_CSD_POA (const String &name,
-                          PortableServer::POAManager_ptr poa_manager,
+                   TAO_POA_Manager &poa_manager,
                    const TAO_POA_Policy_Set &policies,
                    TAO_Root_POA *parent,
                    ACE_Lock &lock,
@@ -66,7 +66,7 @@ void TAO_CSD_POA::set_csd_strategy (
 
 TAO_Root_POA *
 TAO_CSD_POA::new_POA (const String &name,
-                      PortableServer::POAManager_ptr poa_manager,
+                      TAO_POA_Manager &poa_manager,
                       const TAO_POA_Policy_Set &policies,
                       TAO_Root_POA *parent,
                       ACE_Lock &lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index bcbf2e0495f..7bf2c338e0d 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -40,7 +40,7 @@ class TAO_CSD_FW_Export TAO_CSD_POA
 public:
   //Constructor 
   TAO_CSD_POA (const String &name,
-               PortableServer::POAManager_ptr poa_manager,
+              TAO_POA_Manager &poa_manager,
               const TAO_POA_Policy_Set &policies,
               TAO_Root_POA *parent,
               ACE_Lock &lock,
@@ -80,7 +80,7 @@ public:
 
   ///Method for creating new CSD POA.
   TAO_Root_POA * new_POA (const String &name,
-                          PortableServer::POAManager_ptr poa_manager,
+                          TAO_POA_Manager &poa_manager,
                           const TAO_POA_Policy_Set &policies,
                           TAO_Root_POA *parent,
                           ACE_Lock &lock,
diff --git a/TAO/tao/Cache_Entries.cpp b/TAO/tao/Cache_Entries.cpp
index b4540ba96b3..99ecb2ad72b 100644
--- a/TAO/tao/Cache_Entries.cpp
+++ b/TAO/tao/Cache_Entries.cpp
@@ -13,6 +13,8 @@ ACE_RCSID(tao,
           "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Cache_IntId::Cache_IntId (TAO_Transport *transport)
@@ -46,3 +48,5 @@ namespace TAO
     return *this;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index eea2967b2fc..993cc36de11 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
 
@@ -197,6 +197,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Cache_Entries.inl"
diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl
index 711f635b20e..475f8865a0d 100644
--- a/TAO/tao/Cache_Entries.inl
+++ b/TAO/tao/Cache_Entries.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -188,3 +191,5 @@ namespace TAO
     return this->transport_property_;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index e782b819123..a9a89c2735b 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          CharSeq.pidl
  */
 
diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp
index 7ed29c4865a..3fe1def2892 100644
--- a/TAO/tao/CharSeqC.cpp
+++ b/TAO/tao/CharSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "CharSeqC.h"
+#include "tao/CharSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_CHARSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::CharSeq::CharSeq (void)
 CORBA::CharSeq::CharSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Char
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::CharSeq::CharSeq (
     ::CORBA::Char * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Char
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::CharSeq::CharSeq (
 CORBA::CharSeq::CharSeq (
     const CharSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Char
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::CharSeq::_tao_any_destructor (
     const CORBA::CharSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_char_array ((const char *)_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::CharSeq::_tao_any_destructor (
     CORBA::CharSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_char_array ((char *)_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
index 4e7d783a866..310fa885715 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -52,38 +52,37 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CHARSEQ_CH_)
 #define _CORBA_CHARSEQ_CH_
-  
+
   class CharSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        CharSeq,
-        CORBA::Char
+        CharSeq
       >
     CharSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        CharSeq,
-        CharSeq_var,
-        CORBA::Char
+        CharSeq
       >
     CharSeq_out;
-  
+
   class TAO_Export CharSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Char
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     CharSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::Char* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::Char* buffer,
+        ::CORBA::Boolean release = false
       );
     CharSeq (const CharSeq &);
     ~CharSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef CharSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index 0c574d13b87..9b89b0f32d8 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -1,7 +1,7 @@
-#include "Cleanup_Func_Registry.h"
+#include "tao/Cleanup_Func_Registry.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Cleanup_Func_Registry.inl"
+# include "tao/Cleanup_Func_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
@@ -10,21 +10,14 @@ ACE_RCSID (tao,
            Cleanup_Func_Registry,
            "$Id$")
 
-TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
-  : cleanup_funcs_ ()
-{
-}
-
-TAO_Cleanup_Func_Registry::~TAO_Cleanup_Func_Registry (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 TAO_Cleanup_Func_Registry::register_cleanup_function (
   ACE_CLEANUP_FUNC func,
   size_t &slot_id)
 {
-  size_t slot = this->cleanup_funcs_.size ();
+  size_t const slot = this->cleanup_funcs_.size ();
 
   if (this->cleanup_funcs_.size (slot + 1) != 0)
     return -1;
@@ -38,7 +31,7 @@ TAO_Cleanup_Func_Registry::register_cleanup_function (
 void
 TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects)
 {
-  size_t len = ts_objects.size ();
+  size_t const len = ts_objects.size ();
 
   // The allocated slot may never have been used.  It is therefore
   // possible that the TSS array size may be less than the cleanup
@@ -56,3 +49,4 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects)
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index 6d42d4342ec..cc2c6162c97 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -15,14 +15,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Array_Base.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Cleanup_Func_Registry
  *
@@ -32,18 +37,15 @@
  * invoking the corresponding cleanup function on each object.  Hence,
  * there is a tight coupling between this class and the TAO ORB Core.
  */
-class TAO_Export TAO_Cleanup_Func_Registry
+class TAO_Cleanup_Func_Registry
 {
   friend class TAO_ORB_Core;
 
 public:
 
-  /// Constructor
+  /// Constructor.
   TAO_Cleanup_Func_Registry (void);
 
-  /// Destructor
-  ~TAO_Cleanup_Func_Registry (void);
-
   /// Return the number of registered cleanup functions.
   size_t size (void) const;
 
@@ -65,9 +67,8 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &))
+  TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &);
+  void operator= (const TAO_Cleanup_Func_Registry &);
 
 private:
 
@@ -79,8 +80,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Cleanup_Func_Registry.inl"
+# include "tao/Cleanup_Func_Registry.inl"
 #endif  /* __ACE_INLINE__ */
 
 
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
index 1e2a8362075..2216dce7c34 100644
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ b/TAO/tao/Cleanup_Func_Registry.inl
@@ -2,8 +2,18 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
+  : cleanup_funcs_ ()
+{
+}
+
 ACE_INLINE size_t
 TAO_Cleanup_Func_Registry::size (void) const
 {
   return this->cleanup_funcs_.size ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index 1bf7fb37f7b..bf3d334201e 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -1,14 +1,13 @@
-#include "ClientRequestInterceptor_Adapter.h"
+#include "tao/ClientRequestInterceptor_Adapter.h"
 
 ACE_RCSID (tao,
            ClientInterceptorAdapter,
            "$Id$")
 
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void)
 {
-  ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void)
-  {
-  }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 7ccb34738c9..0a5c83b8b94 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +30,8 @@
 #include "tao/SystemException.h"
 #include "tao/Invocation_Utils.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ClientRequestInfo;
 
 namespace PortableInterceptor
@@ -40,6 +42,11 @@ namespace PortableInterceptor
   typedef CORBA::Short ReplyStatus;
 }
 
+namespace CORBA
+{
+  class PolicyList;
+}
+
 namespace TAO
 {
   class Invocation_Base;
@@ -93,6 +100,12 @@ namespace TAO
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL) = 0;
 
+    /// Register an interceptor with policies.
+    virtual void add_interceptor (
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL) = 0;
+
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
     /// Convert TAO Invocation status to a PI status
@@ -101,6 +114,9 @@ namespace TAO
   };
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
index 0aa32cabbc2..ee3178eea83 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -1,10 +1,13 @@
-#include "ClientRequestInterceptor_Adapter_Factory.h"
+#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 
 ACE_RCSID (tao,
            ClientRequestInterceptorAdapterFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
index f9878697bb9..805608c2af0 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,8 +22,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -44,6 +47,8 @@ public:
   virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CLIENTREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index ba7d37b5612..f459955e2bf 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -4,9 +4,7 @@
 
 ACE_RCSID(tao, Client_Strategy_Factory, "$Id$")
 
-TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
 {
@@ -65,3 +63,5 @@ TAO_Client_Strategy_Factory::use_cleanup_options (void) const
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index fa3ec2eb1b4..3c63290ad4a 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,17 +13,25 @@
 
 #ifndef TAO_CLIENT_STRATEGY_FACTORY_H
 #define TAO_CLIENT_STRATEGY_FACTORY_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Object.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport_Mux_Strategy;
 class TAO_Wait_Strategy;
 class TAO_Transport;
@@ -39,9 +47,6 @@ class TAO_Connect_Strategy;
 class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
 {
 public:
-  // = Intialization and termination methods.
-  /// Constructor.
-  TAO_Client_Strategy_Factory (void);
 
   /// Destructor
   virtual ~TAO_Client_Strategy_Factory (void);
@@ -80,5 +85,7 @@ public:
   virtual bool use_cleanup_options (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_CLIENT_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 28e8cc27453..215bac88618 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "CDR_Encaps_Codec.h"
+#include "tao/CodecFactory/CDR_Encaps_Codec.h"
 
 #include "tao/CDR.h"
 #include "tao/OctetSeqC.h"
@@ -14,22 +12,29 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
+#include "tao/Codeset_Translator_Base.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
 
-ACE_RCSID (tao,
+ACE_RCSID (CodecFactory,
            CDR_Encaps_Codec,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
-                                            CORBA::Octet minor,
-                                            TAO_ORB_Core * orb_core)
+TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (
+  CORBA::Octet major,
+  CORBA::Octet minor,
+  TAO_ORB_Core * orb_core,
+  TAO_Codeset_Translator_Base * char_trans,
+  TAO_Codeset_Translator_Base * wchar_trans)
   : major_ (major),
     minor_ (minor),
-    orb_core_ (orb_core)
+    orb_core_ (orb_core),
+    char_translator_ (char_trans),
+    wchar_translator_ (wchar_trans)
 {
 }
 
@@ -58,6 +63,15 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
                      this->major_,
                      this->minor_);
 
+  if (this->char_translator_)
+    {
+      this->char_translator_->assign (&cdr);
+    }
+  if (this->wchar_translator_)
+    {
+      this->wchar_translator_->assign (&cdr);
+    }
+
   if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
       && (cdr << data))
     {
@@ -123,6 +137,15 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
                     this->minor_,
                     this->orb_core_);
 
+  if (this->char_translator_)
+    {
+      this->char_translator_->assign (&cdr);
+    }
+  if (this->wchar_translator_)
+    {
+      this->wchar_translator_->assign (&cdr);
+    }
+
   CORBA::Boolean byte_order;
   if (cdr >> TAO_InputCDR::to_boolean (byte_order))
     {
@@ -168,6 +191,15 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
                      this->major_,
                      this->minor_);
 
+  if (this->char_translator_)
+    {
+      this->char_translator_->assign (&cdr);
+    }
+  if (this->wchar_translator_)
+    {
+      this->wchar_translator_->assign (&cdr);
+    }
+
   if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
     {
       TAO::Any_Impl *impl = data.impl ();
@@ -276,6 +308,15 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                     this->minor_,
                     this->orb_core_);
 
+  if (this->char_translator_)
+    {
+      this->char_translator_->assign (&cdr);
+    }
+  if (this->wchar_translator_)
+    {
+      this->wchar_translator_->assign (&cdr);
+    }
+
   CORBA::Boolean byte_order;
 
   if (cdr >> TAO_InputCDR::to_boolean (byte_order))
@@ -323,3 +364,5 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding (
       && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER))
     ACE_THROW (IOP::Codec::InvalidTypeForEncoding ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 3ee1e43137c..37672c1e4de 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IOP_Codec_includeC.h"
+#include "tao/CodecFactory/IOP_Codec_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,10 @@
 
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Codeset_Translator_Base;
+
 /**
  * @class TAO_CDR_Encaps_Codec
  *
@@ -48,7 +52,9 @@ public:
   /// Constructor.
   TAO_CDR_Encaps_Codec (CORBA::Octet major,
                         CORBA::Octet minor,
-                        TAO_ORB_Core * orb_core);
+                        TAO_ORB_Core * orb_core,
+                        TAO_Codeset_Translator_Base * char_trans,
+                        TAO_Codeset_Translator_Base * wchar_trans);
 
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
@@ -103,9 +109,8 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &))
+  TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &);
+  void operator= (const TAO_CDR_Encaps_Codec &);
 
 private:
 
@@ -119,8 +124,15 @@ private:
   /// encapsulation.
   TAO_ORB_Core * const orb_core_;
 
+  /// Char codeset translator
+  TAO_Codeset_Translator_Base * char_translator_;
+
+  /// WChar codeset translator
+  TAO_Codeset_Translator_Base * wchar_translator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_CDR_ENCAPS_CODEC_H */
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index 646a88b28a2..f532539a4fd 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 // =================================================================
 /**
  * @file CodecFactory.cpp
@@ -7,12 +5,11 @@
  * $Id$
  *
  * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
  */
 // =================================================================
 
-#include "CodecFactory.h"
-#include "CodecFactory_impl.h"
+#include "tao/CodecFactory/CodecFactory.h"
+#include "tao/CodecFactory/CodecFactory_impl.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -21,6 +18,8 @@ ACE_RCSID (CodecFactory,
            CodecFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Object_ptr
 TAO_CodecFactory_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -42,6 +41,8 @@ TAO_CodecFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader,
                        ACE_TEXT ("CodecFactory_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 82c6f95b05d..230914bbbac 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,19 +16,21 @@
 
 #include /**/ "ace/pre.h"
 
-#include "codecfactory_export.h"
+#include "tao/CodecFactory/codecfactory_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_CODECFACTORY_SAFE_INCLUDE
-#include "IOP_CodecC.h"
+#include "tao/CodecFactory/IOP_CodecC.h"
 #undef TAO_CODECFACTORY_SAFE_INCLUDE
 
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_CodecFactory_Export TAO_CodecFactory_Loader
   : public TAO_Object_Loader
 {
@@ -45,12 +46,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
-
 static int
 TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODECFACTORY_H */
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index 96d1448d55b..2b1462c9693 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -2,26 +2,102 @@
 //
 // $Id$
 
-#include "CodecFactory_impl.h"
-#include "CDR_Encaps_Codec.h"
+#include "tao/CodecFactory/CodecFactory_impl.h"
+#include "tao/CodecFactory/CDR_Encaps_Codec.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
+#include "tao/ORB_Core.h"
+#include "tao/Codeset_Manager.h"
+#include "ace/Codeset_Symbols.h"
 
 ACE_RCSID (CodecFactory_impl,
            CodecFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
   : orb_core_ (orb_core)
 {
 }
 
 IOP::Codec_ptr
+TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     IOP::CodecFactory::UnknownEncoding,
+                     IOP::CodecFactory::UnsupportedCodeset))
+{
+  TAO_Codeset_Translator_Base *char_trans = 0;
+  TAO_Codeset_Translator_Base *wchar_trans = 0;
+  CONV_FRAME::CodeSetId ncsc;
+  CONV_FRAME::CodeSetId ncsw;
+
+  TAO_Codeset_Manager *csm = this->orb_core_->codeset_manager ();
+
+  if (csm)
+    {
+      char_trans = csm->get_char_trans (enc.char_codeset);
+      wchar_trans = csm->get_wchar_trans (enc.wchar_codeset);
+      csm->get_ncs (ncsc,ncsw); // pass by reference
+    }
+  else
+    {
+      // No codeset manager, so also raise an unsupported codeset
+      ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset (
+                          enc.wchar_codeset),
+                        IOP::Codec::_nil ());
+    }
+
+  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 ());
+    }
+
+  if (char_trans == 0 &&
+      enc.char_codeset != ncsc)
+    {
+      ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset (
+                          enc.char_codeset),
+                        IOP::Codec::_nil ());
+    }
+
+  return this->create_codec_i (enc.major_version,
+                               enc.minor_version,
+                               enc.format,
+                               char_trans,
+                               wchar_trans
+                               ACE_ENV_ARG_PARAMETER);
+}
+
+IOP::Codec_ptr
 TAO_CodecFactory::create_codec (const IOP::Encoding & enc
                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::CodecFactory::UnknownEncoding))
 {
+  return this->create_codec_i (enc.major_version,
+                               enc.minor_version,
+                               enc.format,
+                               0,
+                               0
+                               ACE_ENV_ARG_PARAMETER);
+}
+
+IOP::Codec_ptr
+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_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   IOP::CodecFactory::UnknownEncoding))
+{
   // @todo: Ideally we should have some sort of CodecFactory
   //        registry to make it possible to add factories
   //        dynamically.  However, there currently isn't a need to
@@ -31,14 +107,14 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
 
   IOP::Codec_ptr codec = IOP::Codec::_nil ();
 
-  switch (enc.format)
+  switch (encoding_format)
     {
 
       // @@ MSVC 6 gets confused and thinks that
       //    IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual
       //    value (0) is used instead.
     case 0 /* IOP::ENCODING_CDR_ENCAPS */:
-      if (enc.major_version < 1)
+      if (major < 1)
         {
           // There is no such thing as a "0.x" CDR encapsulation.
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
@@ -50,9 +126,11 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
         }
 
       ACE_NEW_THROW_EX (codec,
-                        TAO_CDR_Encaps_Codec (enc.major_version,
-                                              enc.minor_version,
-                                              this->orb_core_),
+                        TAO_CDR_Encaps_Codec (major,
+                                              minor,
+                                              this->orb_core_,
+                                              char_trans,
+                                              wchar_trans),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             0,
@@ -69,3 +147,5 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
 
   return codec;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 6699719071a..ba0859f667b 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IOP_Codec_includeC.h"
+#include "tao/CodecFactory/IOP_Codec_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +30,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Codeset_Translator_Base;
+
 /**
  * @class TAO_CodecFactory
  *
@@ -53,14 +57,27 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding));
 
-private:
+  /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     IOP::CodecFactory::UnknownEncoding,
+                     IOP::CodecFactory::UnsupportedCodeset));
 
+private:
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CodecFactory (const TAO_CodecFactory &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &))
-
+  TAO_CodecFactory (const TAO_CodecFactory &);
+  void operator= (const TAO_CodecFactory &);
+
+  IOP::Codec_ptr 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_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   IOP::CodecFactory::UnknownEncoding));
 private:
 
   /// Pointer to the ORB Core.
@@ -72,6 +89,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl
index d322ae98bc1..be4caae91b3 100644
--- a/TAO/tao/CodecFactory/IOP_Codec.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -11,11 +11,13 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
+ *        -o orig -Gp -Gd -Ge 1 -Sc -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"
+ *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *        IOP_Codec.pidl
  *
  */
@@ -23,8 +25,9 @@
 #ifndef TAO_IOP_CODEC_PIDL
 #define TAO_IOP_CODEC_PIDL
 
-#include <Typecode_types.pidl>
-#include <OctetSeq.pidl>
+#include "tao/Typecode_types.pidl"
+#include "tao/OctetSeq.pidl"
+#include "tao/CONV_FRAME.pidl"
 
 #pragma prefix "omg.org"
 
@@ -51,13 +54,25 @@ module IOP
     octet minor_version;
   };
 
+  struct Encoding_1_2 {
+    EncodingFormat format;
+    octet major_version;
+    octet minor_version;
+    CONV_FRAME::CodeSetId char_codeset;
+    CONV_FRAME::CodeSetId wchar_codeset;
+  };
+
   local interface CodecFactory {
     exception UnknownEncoding {};
+    exception UnsupportedCodeset {
+      CONV_FRAME::CodeSetId codeset;
+    };
 
     Codec create_codec (in Encoding enc) raises (UnknownEncoding);
+    Codec create_codec_with_codesets (in Encoding_1_2 enc) raises (UnknownEncoding, UnsupportedCodeset);
   };
 };
 
 #pragma prefix ""
 
-#endif  /* TAO_IOP_PIDL */
+#endif  /* TAO_IOP_CODEC_PIDL */
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
deleted file mode 100644
index 2e54165d86c..00000000000
--- a/TAO/tao/CodecFactory/IOP_CodecA.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CodecFactory.h"
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_InvalidTypeForEncoding (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
-    "InvalidTypeForEncoding",
-    _tao_fields_IOP_Codec_InvalidTypeForEncoding,
-    0);
-
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
-  &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_FormatMismatch (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
-    "FormatMismatch",
-    _tao_fields_IOP_Codec_FormatMismatch,
-    0);
-
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
-  &_tao_tc_IOP_Codec_FormatMismatch;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_TypeMismatch (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
-    "TypeMismatch",
-    _tao_fields_IOP_Codec_TypeMismatch,
-    0);
-
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
-  &_tao_tc_IOP_Codec_TypeMismatch;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/IOP/Codec:1.0",
-    "Codec");
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Codec =
-    &_tao_tc_IOP_Codec;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_EncodingFormat (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/EncodingFormat:1.0",
-    "EncodingFormat",
-    &CORBA::_tc_short);
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
-    &_tao_tc_IOP_EncodingFormat;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] =
-  {
-    { "format", &IOP::_tc_EncodingFormat },
-    { "major_version", &CORBA::_tc_octet },
-    { "minor_version", &CORBA::_tc_octet }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Encoding (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/Encoding:1.0",
-    "Encoding",
-    _tao_fields_IOP_Encoding,
-    3);
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Encoding =
-    &_tao_tc_IOP_Encoding;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_CodecFactory_UnknownEncoding (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
-    "UnknownEncoding",
-    _tao_fields_IOP_CodecFactory_UnknownEncoding,
-    0);
-
-::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
-  &_tao_tc_IOP_CodecFactory_UnknownEncoding;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_CodecFactory (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/IOP/CodecFactory:1.0",
-    "CodecFactory");
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_CodecFactory =
-    &_tao_tc_IOP_CodecFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec_ptr _tao_elem
-  )
-{
-  IOP::Codec_ptr _tao_objptr =
-    IOP::Codec::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<IOP::Codec>::insert (
-      _tao_any,
-      IOP::Codec::_tao_any_destructor,
-      IOP::_tc_Codec,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<IOP::Codec>::extract (
-        _tao_any,
-        IOP::Codec::_tao_any_destructor,
-        IOP::_tc_Codec,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert_copy (
-      _tao_any,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::InvalidTypeForEncoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert (
-      _tao_any,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::InvalidTypeForEncoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::InvalidTypeForEncoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::extract (
-        _tao_any,
-        IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-        IOP::Codec::_tc_InvalidTypeForEncoding,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert_copy (
-      _tao_any,
-      IOP::Codec::FormatMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_FormatMismatch,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::FormatMismatch *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert (
-      _tao_any,
-      IOP::Codec::FormatMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_FormatMismatch,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::FormatMismatch *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::extract (
-        _tao_any,
-        IOP::Codec::FormatMismatch::_tao_any_destructor,
-        IOP::Codec::_tc_FormatMismatch,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert_copy (
-      _tao_any,
-      IOP::Codec::TypeMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_TypeMismatch,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::TypeMismatch *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert (
-      _tao_any,
-      IOP::Codec::TypeMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_TypeMismatch,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::TypeMismatch *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::TypeMismatch *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::extract (
-        _tao_any,
-        IOP::Codec::TypeMismatch::_tao_any_destructor,
-        IOP::Codec::_tc_TypeMismatch,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Encoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy (
-      _tao_any,
-      IOP::Encoding::_tao_any_destructor,
-      IOP::_tc_Encoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Encoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert (
-      _tao_any,
-      IOP::Encoding::_tao_any_destructor,
-      IOP::_tc_Encoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Encoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Encoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Encoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Encoding>::extract (
-        _tao_any,
-        IOP::Encoding::_tao_any_destructor,
-        IOP::_tc_Encoding,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr _tao_elem
-  )
-{
-  IOP::CodecFactory_ptr _tao_objptr =
-    IOP::CodecFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<IOP::CodecFactory>::insert (
-      _tao_any,
-      IOP::CodecFactory::_tao_any_destructor,
-      IOP::_tc_CodecFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<IOP::CodecFactory>::extract (
-        _tao_any,
-        IOP::CodecFactory::_tao_any_destructor,
-        IOP::_tc_CodecFactory,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert_copy (
-      _tao_any,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory::UnknownEncoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert (
-      _tao_any,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::CodecFactory::UnknownEncoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::extract (
-        _tao_any,
-        IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-        IOP::CodecFactory::_tc_UnknownEncoding,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.cpp b/TAO/tao/CodecFactory/IOP_CodecC.cpp
index 965d8fb585e..d68677a5975 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.cpp
+++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp
@@ -26,20 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "CodecFactory.h"
+#include "tao/CodecFactory/CodecFactory.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Arg traits specializations.
 namespace TAO
@@ -65,7 +72,7 @@ TAO::Objref_Traits<IOP::Codec>::release (
     IOP::Codec_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 IOP::Codec_ptr
@@ -74,20 +81,20 @@ TAO::Objref_Traits<IOP::Codec>::nil (void)
   return IOP::Codec::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<IOP::Codec>::marshal (
     IOP::Codec_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
         "InvalidTypeForEncoding"
       )
@@ -99,7 +106,7 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
 }
 
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -109,7 +116,7 @@ IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::
 IOP::Codec::InvalidTypeForEncoding&
 IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -121,28 +128,28 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_po
 }
 
 IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp)
+IOP::Codec::InvalidTypeForEncoding::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<InvalidTypeForEncoding *> (_tao_excp);
 }
 
 const IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception const *_tao_excp)
+IOP::Codec::InvalidTypeForEncoding::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const InvalidTypeForEncoding *> (_tao_excp);
 }
 
-CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
+::CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::IOP::Codec::InvalidTypeForEncoding (*this),
@@ -161,7 +168,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
@@ -169,20 +176,38 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const
+::CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const
 {
   return ::IOP::Codec::_tc_InvalidTypeForEncoding;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_InvalidTypeForEncoding (
+    ::CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+    "InvalidTypeForEncoding",
+    _tao_fields_IOP_Codec_InvalidTypeForEncoding,
+    0);
+
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::FormatMismatch::FormatMismatch (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
         "FormatMismatch"
       )
@@ -194,7 +219,7 @@ IOP::Codec::FormatMismatch::~FormatMismatch (void)
 }
 
 IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -204,7 +229,7 @@ IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &
 IOP::Codec::FormatMismatch&
 IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -216,28 +241,28 @@ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp)
+IOP::Codec::FormatMismatch::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<FormatMismatch *> (_tao_excp);
 }
 
 const IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception const *_tao_excp)
+IOP::Codec::FormatMismatch::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const FormatMismatch *> (_tao_excp);
 }
 
-CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
+::CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 IOP::Codec::FormatMismatch::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::IOP::Codec::FormatMismatch (*this),
@@ -256,7 +281,7 @@ void IOP::Codec::FormatMismatch::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void IOP::Codec::FormatMismatch::_tao_decode (
@@ -264,20 +289,38 @@ void IOP::Codec::FormatMismatch::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const
+::CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const
 {
   return ::IOP::Codec::_tc_FormatMismatch;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_FormatMismatch (
+    ::CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+    "FormatMismatch",
+    _tao_fields_IOP_Codec_FormatMismatch,
+    0);
+
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
+  &_tao_tc_IOP_Codec_FormatMismatch;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::TypeMismatch::TypeMismatch (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
         "TypeMismatch"
       )
@@ -289,7 +332,7 @@ IOP::Codec::TypeMismatch::~TypeMismatch (void)
 }
 
 IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -299,7 +342,7 @@ IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_e
 IOP::Codec::TypeMismatch&
 IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -311,28 +354,28 @@ void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
+IOP::Codec::TypeMismatch::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<TypeMismatch *> (_tao_excp);
 }
 
 const IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
+IOP::Codec::TypeMismatch::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const TypeMismatch *> (_tao_excp);
 }
 
-CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
+::CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 IOP::Codec::TypeMismatch::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::IOP::Codec::TypeMismatch (*this),
@@ -351,7 +394,7 @@ void IOP::Codec::TypeMismatch::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void IOP::Codec::TypeMismatch::_tao_decode (
@@ -359,67 +402,65 @@ void IOP::Codec::TypeMismatch::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const
+::CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const
 {
   return ::IOP::Codec::_tc_TypeMismatch;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec_TypeMismatch (
+    ::CORBA::tk_except,
+    "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+    "TypeMismatch",
+    _tao_fields_IOP_Codec_TypeMismatch,
+    0);
+
+::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
+  &_tao_tc_IOP_Codec_TypeMismatch;
+
 IOP::Codec::Codec (void)
 {}
 
 IOP::Codec::~Codec (void)
 {}
 
-void
-IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Codec *_tao_tmp_pointer =
-    static_cast<Codec *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 IOP::Codec_ptr
 IOP::Codec::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Codec::_nil ();
-    }
-
-  Codec_ptr proxy =
-    dynamic_cast<Codec_ptr> (_tao_objref);
-
-  return Codec::_duplicate (proxy);
+  return Codec::_duplicate (
+      dynamic_cast<Codec_ptr> (_tao_objref)
+    );
 }
 
 IOP::Codec_ptr
 IOP::Codec::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Codec::_nil ();
-    }
-
-  Codec_ptr proxy =
-    dynamic_cast<Codec_ptr> (_tao_objref);
-
-  return Codec::_duplicate (proxy);
+  return Codec::_duplicate (
+      dynamic_cast<Codec_ptr> (_tao_objref)
+    );
 }
 
 IOP::Codec_ptr
 IOP::Codec::_duplicate (Codec_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -430,10 +471,10 @@ IOP::Codec::_duplicate (Codec_ptr obj)
 void
 IOP::Codec::_tao_release (Codec_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 IOP::Codec::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -467,13 +508,80 @@ const char* IOP::Codec::_interface_repository_id (void) const
   return "IDL:omg.org/IOP/Codec:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 IOP::Codec::marshal (TAO_OutputCDR &)
 {
   return false;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Codec (
+    ::CORBA::tk_local_interface,
+    "IDL:omg.org/IOP/Codec:1.0",
+    "Codec");
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Codec =
+    &_tao_tc_IOP_Codec;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_EncodingFormat (
+    ::CORBA::tk_alias,
+    "IDL:omg.org/IOP/EncodingFormat:1.0",
+    "EncodingFormat",
+    &CORBA::_tc_short);
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
+    &_tao_tc_IOP_EncodingFormat;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] =
+  {
+    { "format", &IOP::_tc_EncodingFormat },
+    { "major_version", &CORBA::_tc_octet },
+    { "minor_version", &CORBA::_tc_octet }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Encoding (
+    ::CORBA::tk_struct,
+    "IDL:omg.org/IOP/Encoding:1.0",
+    "Encoding",
+    _tao_fields_IOP_Encoding,
+    3);
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Encoding =
+    &_tao_tc_IOP_Encoding;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 void
@@ -487,6 +595,50 @@ IOP::Encoding::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding_1_2[] =
+  {
+    { "format", &IOP::_tc_EncodingFormat },
+    { "major_version", &CORBA::_tc_octet },
+    { "minor_version", &CORBA::_tc_octet },
+    { "char_codeset", &CONV_FRAME::_tc_CodeSetId },
+    { "wchar_codeset", &CONV_FRAME::_tc_CodeSetId }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_Encoding_1_2 (
+    ::CORBA::tk_struct,
+    "IDL:omg.org/IOP/Encoding_1_2:1.0",
+    "Encoding_1_2",
+    _tao_fields_IOP_Encoding_1_2,
+    5);
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Encoding_1_2 =
+    &_tao_tc_IOP_Encoding_1_2;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void
+IOP::Encoding_1_2::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  Encoding_1_2 *_tao_tmp_pointer =
+    static_cast<Encoding_1_2 *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for IOP::CodecFactory.
@@ -504,7 +656,7 @@ TAO::Objref_Traits<IOP::CodecFactory>::release (
     IOP::CodecFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 IOP::CodecFactory_ptr
@@ -513,20 +665,20 @@ TAO::Objref_Traits<IOP::CodecFactory>::nil (void)
   return IOP::CodecFactory::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<IOP::CodecFactory>::marshal (
     IOP::CodecFactory_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
         "UnknownEncoding"
       )
@@ -538,7 +690,7 @@ IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
 }
 
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -548,7 +700,7 @@ IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::
 IOP::CodecFactory::UnknownEncoding&
 IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -560,28 +712,28 @@ void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_po
 }
 
 IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp)
+IOP::CodecFactory::UnknownEncoding::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<UnknownEncoding *> (_tao_excp);
 }
 
 const IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception const *_tao_excp)
+IOP::CodecFactory::UnknownEncoding::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const UnknownEncoding *> (_tao_excp);
 }
 
-CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
+::CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::IOP::CodecFactory::UnknownEncoding (*this),
@@ -600,7 +752,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void IOP::CodecFactory::UnknownEncoding::_tao_decode (
@@ -608,67 +760,200 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const
+::CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const
 {
   return ::IOP::CodecFactory::_tc_UnknownEncoding;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory_UnknownEncoding (
+    ::CORBA::tk_except,
+    "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+    "UnknownEncoding",
+    _tao_fields_IOP_CodecFactory_UnknownEncoding,
+    0);
+
+::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tao_tc_IOP_CodecFactory_UnknownEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_cs.cpp:63
+
+IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset (void)
+  : ::CORBA::UserException (
+        "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0",
+        "UnsupportedCodeset"
+      )
+{
+}
+
+IOP::CodecFactory::UnsupportedCodeset::~UnsupportedCodeset (void)
+{
+}
+
+IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset (const ::IOP::CodecFactory::UnsupportedCodeset &_tao_excp)
+  : ::CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+  this->codeset = _tao_excp.codeset;
+}
+
+IOP::CodecFactory::UnsupportedCodeset&
+IOP::CodecFactory::UnsupportedCodeset::operator= (const ::IOP::CodecFactory::UnsupportedCodeset &_tao_excp)
+{
+  this->::CORBA::UserException::operator= (_tao_excp);
+  this->codeset = _tao_excp.codeset;
+  return *this;
+}
+
+void IOP::CodecFactory::UnsupportedCodeset::_tao_any_destructor (void *_tao_void_pointer)
+{
+  UnsupportedCodeset *_tao_tmp_pointer =
+    static_cast<UnsupportedCodeset *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+IOP::CodecFactory::UnsupportedCodeset *
+IOP::CodecFactory::UnsupportedCodeset::_downcast ( ::CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<UnsupportedCodeset *> (_tao_excp);
+}
+
+const IOP::CodecFactory::UnsupportedCodeset *
+IOP::CodecFactory::UnsupportedCodeset::_downcast ( ::CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const UnsupportedCodeset *> (_tao_excp);
+}
+
+::CORBA::Exception *IOP::CodecFactory::UnsupportedCodeset::_alloc (void)
+{
+  ::CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnsupportedCodeset, 0);
+  return retval;
+}
+
+::CORBA::Exception *
+IOP::CodecFactory::UnsupportedCodeset::_tao_duplicate (void) const
+{
+  ::CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::IOP::CodecFactory::UnsupportedCodeset (*this),
+      0
+    );
+  return result;
+}
+
+void IOP::CodecFactory::UnsupportedCodeset::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void IOP::CodecFactory::UnsupportedCodeset::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW ( ::CORBA::MARSHAL ());
+}
+
+void IOP::CodecFactory::UnsupportedCodeset::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW ( ::CORBA::MARSHAL ());
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/exception_ctor.cpp:66
+
+IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset (
+    ::CONV_FRAME::CodeSetId _tao_codeset
+  )
+  : ::CORBA::UserException (
+        "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0",
+        "UnsupportedCodeset"
+      )
+{
+  this->codeset = _tao_codeset;
+}
+
+// TAO extension - the virtual _type method.
+::CORBA::TypeCode_ptr IOP::CodecFactory::UnsupportedCodeset::_tao_type (void) const
+{
+  return ::IOP::CodecFactory::_tc_UnsupportedCodeset;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_CodecFactory_UnsupportedCodeset[] =
+  {
+    { "codeset", &CONV_FRAME::_tc_CodeSetId }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory_UnsupportedCodeset (
+    ::CORBA::tk_except,
+    "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0",
+    "UnsupportedCodeset",
+    _tao_fields_IOP_CodecFactory_UnsupportedCodeset,
+    1);
+
+::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnsupportedCodeset =
+  &_tao_tc_IOP_CodecFactory_UnsupportedCodeset;
+
 IOP::CodecFactory::CodecFactory (void)
 {}
 
 IOP::CodecFactory::~CodecFactory (void)
 {}
 
-void
-IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  CodecFactory *_tao_tmp_pointer =
-    static_cast<CodecFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 IOP::CodecFactory_ptr
 IOP::CodecFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return CodecFactory::_nil ();
-    }
-
-  CodecFactory_ptr proxy =
-    dynamic_cast<CodecFactory_ptr> (_tao_objref);
-
-  return CodecFactory::_duplicate (proxy);
+  return CodecFactory::_duplicate (
+      dynamic_cast<CodecFactory_ptr> (_tao_objref)
+    );
 }
 
 IOP::CodecFactory_ptr
 IOP::CodecFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return CodecFactory::_nil ();
-    }
-
-  CodecFactory_ptr proxy =
-    dynamic_cast<CodecFactory_ptr> (_tao_objref);
-
-  return CodecFactory::_duplicate (proxy);
+  return CodecFactory::_duplicate (
+      dynamic_cast<CodecFactory_ptr> (_tao_objref)
+    );
 }
 
 IOP::CodecFactory_ptr
 IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -679,10 +964,10 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
 void
 IOP::CodecFactory::_tao_release (CodecFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 IOP::CodecFactory::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -716,33 +1001,204 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const
   return "IDL:omg.org/IOP/CodecFactory:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 IOP::CodecFactory::marshal (TAO_OutputCDR &)
 {
   return false;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_IOP_CodecFactory (
+    ::CORBA::tk_local_interface,
+    "IDL:omg.org/IOP/CodecFactory:1.0",
+    "CodecFactory");
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_CodecFactory =
+    &_tao_tc_IOP_CodecFactory;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const IOP::Encoding &_tao_elem
+  )
+{
+  if (0 == &_tao_elem) // Trying to de-reference NULL object
+    _tao_any <<= static_cast<IOP::Encoding *>( 0 ); // Use non-copying insertion of a NULL
+  else
+    TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy (
+        _tao_any,
+        IOP::Encoding::_tao_any_destructor,
+        IOP::_tc_Encoding,
+        _tao_elem
+      );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    IOP::Encoding *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert (
+      _tao_any,
+      IOP::Encoding::_tao_any_destructor,
+      IOP::_tc_Encoding,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    IOP::Encoding *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Encoding *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const IOP::Encoding *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Encoding>::extract (
+        _tao_any,
+        IOP::Encoding::_tao_any_destructor,
+        IOP::_tc_Encoding,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const IOP::Encoding_1_2 &_tao_elem
+  )
+{
+  if (0 == &_tao_elem) // Trying to de-reference NULL object
+    _tao_any <<= static_cast<IOP::Encoding_1_2 *>( 0 ); // Use non-copying insertion of a NULL
+  else
+    TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::insert_copy (
+        _tao_any,
+        IOP::Encoding_1_2::_tao_any_destructor,
+        IOP::_tc_Encoding_1_2,
+        _tao_elem
+      );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    IOP::Encoding_1_2 *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::insert (
+      _tao_any,
+      IOP::Encoding_1_2::_tao_any_destructor,
+      IOP::_tc_Encoding_1_2,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    IOP::Encoding_1_2 *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const IOP::Encoding_1_2 *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const IOP::Encoding_1_2 *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::extract (
+        _tao_any,
+        IOP::Encoding_1_2::_tao_any_destructor,
+        IOP::_tc_Encoding_1_2,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_cs.cpp:61
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::Encoding &_tao_aggregate
   )
 {
   return
     (strm << _tao_aggregate.format) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version));
+    (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) &&
+    (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.minor_version));
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     IOP::Encoding &_tao_aggregate
   )
 {
   return
     (strm >> _tao_aggregate.format) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version));
+    (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.major_version)) &&
+    (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.minor_version));
 }
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+::CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::Encoding_1_2 &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.format) &&
+    (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) &&
+    (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.minor_version)) &&
+    (strm << _tao_aggregate.char_codeset) &&
+    (strm << _tao_aggregate.wchar_codeset);
+}
+
+::CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::Encoding_1_2 &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.format) &&
+    (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.major_version)) &&
+    (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.minor_version)) &&
+    (strm >> _tao_aggregate.char_codeset) &&
+    (strm >> _tao_aggregate.wchar_codeset);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
index 2cab40f9767..d8d3679abf0 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.h
+++ b/TAO/tao/CodecFactory/IOP_CodecC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
 #define _TAO_IDL_ORIG_IOP_CODECC_H_
@@ -44,41 +44,39 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/CodecFactory/codecfactory_export.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.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"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Typecode_typesA.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+#include "tao/AnyTypeCode/CONV_FRAMEA.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
 
 #include "tao/Typecode_typesC.h"
 #include "tao/OctetSeqC.h"
+#include "tao/CONV_FRAMEC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_CodecFactory_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace IOP
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
@@ -107,7 +105,7 @@ namespace IOP
 #define _IOP_CODEC_CH_
 
   class TAO_CodecFactory_Export Codec
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef Codec_ptr _ptr_type;
@@ -119,12 +117,12 @@ namespace IOP
     static void _tao_release (Codec_ptr obj);
 
     static Codec_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static Codec_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
@@ -133,15 +131,15 @@ namespace IOP
       return static_cast<Codec_ptr> (0);
     }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
 
-    class TAO_CodecFactory_Export InvalidTypeForEncoding : public CORBA::UserException
+    class TAO_CodecFactory_Export InvalidTypeForEncoding : public ::CORBA::UserException
     {
     public:
 
@@ -153,12 +151,12 @@ namespace IOP
 
       static void _tao_any_destructor (void *);
 
-      static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
-      static const InvalidTypeForEncoding *_downcast (CORBA::Exception const *);
+      static InvalidTypeForEncoding *_downcast ( ::CORBA::Exception *);
+      static const InvalidTypeForEncoding *_downcast ( ::CORBA::Exception const *);
 
-      static CORBA::Exception *_alloc (void);
+      static ::CORBA::Exception *_alloc (void);
 
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -172,26 +170,23 @@ namespace IOP
           ACE_ENV_ARG_DECL
         );
 
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
 
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
 
     static ::CORBA::TypeCode_ptr const _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
 
-    class TAO_CodecFactory_Export FormatMismatch : public CORBA::UserException
+    class TAO_CodecFactory_Export FormatMismatch : public ::CORBA::UserException
     {
     public:
 
@@ -203,12 +198,12 @@ namespace IOP
 
       static void _tao_any_destructor (void *);
 
-      static FormatMismatch *_downcast (CORBA::Exception *);
-      static const FormatMismatch *_downcast (CORBA::Exception const *);
+      static FormatMismatch *_downcast ( ::CORBA::Exception *);
+      static const FormatMismatch *_downcast ( ::CORBA::Exception const *);
 
-      static CORBA::Exception *_alloc (void);
+      static ::CORBA::Exception *_alloc (void);
 
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -216,49 +211,46 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+      
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+    
     static ::CORBA::TypeCode_ptr const _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-
-    class TAO_CodecFactory_Export TypeMismatch : public CORBA::UserException
+    
+    class TAO_CodecFactory_Export TypeMismatch : public ::CORBA::UserException
     {
     public:
-
+      
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
+      
       static void _tao_any_destructor (void *);
-
-      static TypeMismatch *_downcast (CORBA::Exception *);
-      static const TypeMismatch *_downcast (CORBA::Exception const *);
-
-      static CORBA::Exception *_alloc (void);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+      
+      static TypeMismatch *_downcast ( ::CORBA::Exception *);
+      static const TypeMismatch *_downcast ( ::CORBA::Exception const *);
+      
+      static ::CORBA::Exception *_alloc (void);
+      
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -266,170 +258,202 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+      
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+    
     static ::CORBA::TypeCode_ptr const _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * decode (
+    
+    virtual ::CORBA::Any * decode (
         const ::CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::IOP::Codec::FormatMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode_value (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * decode_value (
+    
+    virtual ::CORBA::Any * decode_value (
         const ::CORBA::OctetSeq & data,
         ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::IOP::Codec::FormatMismatch,
         ::IOP::Codec::TypeMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     Codec (void);
-
+    
     virtual ~Codec (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-
+    
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Codec;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-
+  
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Encoding;
-
+  
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-
+  
   typedef
     Encoding &
     Encoding_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
   struct TAO_CodecFactory_Export Encoding
   {
     typedef Encoding_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
-    CORBA::Octet major_version;
-    CORBA::Octet minor_version;
+    ::CORBA::Octet major_version;
+    ::CORBA::Octet minor_version;
   };
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding;
-
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
+  struct Encoding_1_2;
+  
+  typedef
+    TAO_Fixed_Var_T<
+        Encoding_1_2
+      >
+    Encoding_1_2_var;
+  
+  typedef
+    Encoding_1_2 &
+    Encoding_1_2_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
+  struct TAO_CodecFactory_Export Encoding_1_2
+  {
+    typedef Encoding_1_2_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    IOP::EncodingFormat format;
+    ::CORBA::Octet major_version;
+    ::CORBA::Octet minor_version;
+    CONV_FRAME::CodeSetId char_codeset;
+    CONV_FRAME::CodeSetId wchar_codeset;
+  };
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding_1_2;
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-
+  
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -437,66 +461,114 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-
+  
   class TAO_CodecFactory_Export CodecFactory
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-
+    
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-
+    
     static void _tao_release (CodecFactory_ptr obj);
-
+    
     static CodecFactory_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _nil (void)
     {
       return static_cast<CodecFactory_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-
-    class TAO_CodecFactory_Export UnknownEncoding : public CORBA::UserException
+    
+    class TAO_CodecFactory_Export UnknownEncoding : public ::CORBA::UserException
     {
     public:
-
+      
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-
+      
       static void _tao_any_destructor (void *);
+      
+      static UnknownEncoding *_downcast ( ::CORBA::Exception *);
+      static const UnknownEncoding *_downcast ( ::CORBA::Exception const *);
+      
+      static ::CORBA::Exception *_alloc (void);
+      
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
 
-      static UnknownEncoding *_downcast (CORBA::Exception *);
-      static const UnknownEncoding *_downcast (CORBA::Exception const *);
+      virtual void _tao_encode (
+          TAO_OutputCDR &
+          ACE_ENV_ARG_DECL
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &
+          ACE_ENV_ARG_DECL
+        );
+      
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+    
+    static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
 
-      static CORBA::Exception *_alloc (void);
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_exception/exception_ch.cpp:53
 
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+#if !defined (_IOP_CODECFACTORY_UNSUPPORTEDCODESET_CH_)
+#define _IOP_CODECFACTORY_UNSUPPORTEDCODESET_CH_
+    
+    class TAO_CodecFactory_Export UnsupportedCodeset : public ::CORBA::UserException
+    {
+    public:
+      
+      CONV_FRAME::CodeSetId codeset;
+      UnsupportedCodeset (void);
+      UnsupportedCodeset (const UnsupportedCodeset &);
+      ~UnsupportedCodeset (void);
+
+      UnsupportedCodeset &operator= (const UnsupportedCodeset &);
+      
+      static void _tao_any_destructor (void *);
+      
+      static UnsupportedCodeset *_downcast ( ::CORBA::Exception *);
+      static const UnsupportedCodeset *_downcast ( ::CORBA::Exception const *);
+      
+      static ::CORBA::Exception *_alloc (void);
+      
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -504,70 +576,87 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+      // be\be_visitor_exception/exception_ctor.cpp:66
+      
+      UnsupportedCodeset (
+          CONV_FRAME::CodeSetId _tao_codeset
+        );
+      
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
-    static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+    
+    static ::CORBA::TypeCode_ptr const _tc_UnsupportedCodeset;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::Codec_ptr create_codec (
         const ::IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::IOP::CodecFactory::UnknownEncoding
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::IOP::Codec_ptr create_codec_with_codesets (
+        const ::IOP::Encoding_1_2 & enc
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::IOP::CodecFactory::UnknownEncoding,
+        ::IOP::CodecFactory::UnsupportedCodeset
+      )) = 0;
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     CodecFactory (void);
-
+    
     virtual ~CodecFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-
+    
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module IOP
 
@@ -578,9 +667,9 @@ namespace IOP
 namespace TAO
 {
 
-#if !defined (_IOP_CODEC__TRAITS_CH_)
-#define _IOP_CODEC__TRAITS_CH_
-
+#if !defined (_IOP_CODEC__TRAITS_)
+#define _IOP_CODEC__TRAITS_
+  
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
   {
@@ -591,7 +680,7 @@ namespace TAO
         ::IOP::Codec_ptr
       );
     static ::IOP::Codec_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::IOP::Codec_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -599,9 +688,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
-#define _IOP_CODECFACTORY__TRAITS_CH_
-
+#if !defined (_IOP_CODECFACTORY__TRAITS_)
+#define _IOP_CODECFACTORY__TRAITS_
+  
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
   {
@@ -612,7 +701,7 @@ namespace TAO
         ::IOP::CodecFactory_ptr
       );
     static ::IOP::CodecFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::IOP::CodecFactory_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -622,78 +711,38 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
+TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, const IOP::Encoding &); // copying version
+TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, IOP::Encoding*); // noncopying version
+TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, IOP::Encoding *&); // deprecated
+TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const IOP::Encoding *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
+TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, const IOP::Encoding_1_2 &); // copying version
+TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, IOP::Encoding_1_2*); // noncopying version
+TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, IOP::Encoding_1_2 *&); // deprecated
+TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const IOP::Encoding_1_2 *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
-TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated
-TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
+TAO_CodecFactory_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
+TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_CodecFactory_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
-TAO_CodecFactory_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
+TAO_CodecFactory_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding_1_2 &);
+TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding_1_2 &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
index 734a0a7dac7..7cb54a935a3 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file IOP_Codec_include.pidl
  *
@@ -20,6 +22,8 @@
  *          -Wb,export_include="tao/CodecFactory/codecfactory_export.h" \
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          IOP_Codec_include.pidl
  *
  *   2. Then change this line in IOP_Codec_includeC.h:
@@ -35,6 +39,6 @@
 #define _IOP_CODEC_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/CodecFactory/IOP_Codec.pidl>
+#include "tao/CodecFactory/IOP_Codec.pidl"
 
 #endif /* _IOP_CODEC_INCLUDE_IDL_ */
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
index 7c81e3cfcf6..dae38bfa7b4 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_includeC.h
+++ b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
 #define _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
@@ -42,7 +42,6 @@
 
 #include "tao/CodecFactory/codecfactory_export.h"
 #include "tao/CodecFactory/CodecFactory.h"
-
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
@@ -51,33 +50,20 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_CodecFactory_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
 }
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1040
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/CodecFactory/diff/IOP_Codec.diff b/TAO/tao/CodecFactory/diff/IOP_Codec.diff
index 46a67dc755f..28debd5e9b0 100644
--- a/TAO/tao/CodecFactory/diff/IOP_Codec.diff
+++ b/TAO/tao/CodecFactory/diff/IOP_Codec.diff
@@ -1,5 +1,5 @@
---- orig/IOP_COdecC.h	2005-06-07 13:09:58.255201600 +0200
-+++ IOP_COdecC.h	2005-06-07 13:45:14.618382400 +0200
+--- orig/IOP_COdecC.h	2005-10-24 10:11:07.404753600 +0200
++++ IOP_COdecC.h	2005-10-24 15:16:18.314548800 +0200
 @@ -33,6 +33,9 @@
  
  #include /**/ "ace/pre.h"
@@ -10,25 +10,14 @@
  
  #include "ace/config-all.h"
  
---- orig/IOP_COdecC.cpp	2005-06-07 13:09:58.255201600 +0200
-+++ IOP_COdecC.cpp	2005-06-07 13:43:36.437204800 +0200
+--- orig/IOP_COdecC.cpp	2005-10-24 10:11:07.404753600 +0200
++++ IOP_COdecC.cpp	2005-10-24 15:16:27.988459200 +0200
 @@ -29,7 +29,7 @@
- // be\be_codegen.cpp:291
+ // be\be_codegen.cpp:277
  
  
 -#include "IOP_CodecC.h"
 +#include "CodecFactory.h"
- #include "tao/CDR.h"
- #include "tao/ORB_Core.h"
- #include "ace/OS_NS_string.h"
---- orig/IOP_COdecA.cpp	2005-06-07 13:09:58.255201600 +0200
-+++ IOP_COdecA.cpp	2005-06-07 13:43:11.170873600 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "IOP_CodecC.h"
-+#include "CodecFactory.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode_Static.h"
+ #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+ #include "tao/AnyTypeCode/TypeCode_Constants.h"
+ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp
index aaf6c477eae..c946ad4c3b5 100644
--- a/TAO/tao/Codeset/Codeset.cpp
+++ b/TAO/tao/Codeset/Codeset.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // =================================================================
 /**
@@ -7,20 +7,20 @@
  * $Id$
  *
  * @author Phil Mesnier <mesnier_p@ociweb.com>
- *
  */
 // =================================================================
 
-#include "Codeset.h"
-#include "Codeset_Manager_Factory.h"
-#include "UTF8_Latin1_Factory.h"
-#include "UTF16_BOM_Factory.h"
+#include "tao/Codeset/Codeset.h"
+#include "tao/Codeset/Codeset_Manager_Factory.h"
+#include "tao/Codeset/UTF8_Latin1_Factory.h"
+#include "tao/Codeset/UTF16_BOM_Factory.h"
 
 #include "ace/Dynamic_Service.h"
 
 
 ACE_RCSID (Codeset, Codeset, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 TAO_Codeset_Initializer::init (void)
@@ -40,7 +40,9 @@ TAO_Codeset_Initializer::init (void)
       return result;
     }
 
-  result +=  ACE_Service_Config::process_directive
+  result += ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h
index 74f3b41881b..73dc459283d 100644
--- a/TAO/tao/Codeset/Codeset.h
+++ b/TAO/tao/Codeset/Codeset.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,12 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "codeset_export.h"
+#include "tao/Codeset/codeset_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Codeset_Export TAO_Codeset_Initializer
 {
@@ -34,6 +36,8 @@ public:
 static int
 TAO_Requires_Codeset_Initializer = TAO_Codeset_Initializer::init ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODESET_H */
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index 45a67353708..1ad750f966e 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -17,8 +17,8 @@
 //
 // ============================================================================
 
-#include "Codeset_Descriptor.h"
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset_Descriptor.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
 
 #include "ace/Codeset_Registry.h"
 #include "ace/Log_Msg.h"
@@ -28,6 +28,8 @@ ACE_RCSID (Codeset,
            Codeset_Manager_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Codeset_Descriptor::TAO_Codeset_Descriptor ()
   :ncs_ (0),
    max_bytes_ (1),
@@ -129,3 +131,5 @@ TAO_Codeset_Descriptor::translators (void)
 {
   return this->trans_base_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h
index 164db546916..a0a8b89363c 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.h
+++ b/TAO/tao/Codeset/Codeset_Descriptor.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "codeset_export.h"
+#include "tao/Codeset/codeset_export.h"
 #include "ace/CDR_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -24,6 +24,8 @@
 
 #include "tao/Codeset_Descriptor_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Codeset_Translator_Factory;
 
 class TAO_Codeset_Export TAO_Codeset_Descriptor
@@ -56,6 +58,8 @@ private:
   Translator_Node *trans_base_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODESET_DESCRIPTOR_H */
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
index 46a4b8d5b7f..7f89626dc47 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -11,20 +11,22 @@
  */
 // =================================================================
 
-#include "Codeset_Manager_Factory.h"
+#include "tao/Codeset/Codeset_Manager_Factory.h"
 #include "ace/Service_Config.h"
-#include "Codeset_Manager_i.h"
+#include "tao/Codeset/Codeset_Manager_i.h"
 
 ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
 {
 }
 
-int
+bool
 TAO_Codeset_Manager_Factory::is_default() const
 {
-  return 0;
+  return false;
 }
 
 
@@ -37,6 +39,8 @@ TAO_Codeset_Manager_Factory::create ()
   return csm;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_Codeset, TAO_Codeset_Manager_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory,
                        ACE_TEXT ("TAO_Codeset"),
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h
index 103ba9b52f8..44ed6f20d8c 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.h
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "codeset_export.h"
+#include "tao/Codeset/codeset_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +29,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Codeset_Manager_Factory
  *
@@ -41,10 +43,11 @@ class TAO_Codeset_Export TAO_Codeset_Manager_Factory :
 public:
   virtual ~TAO_Codeset_Manager_Factory ();
   virtual TAO_Codeset_Manager *create(void);
-  virtual int is_default(void) const;
+  virtual bool is_default(void) const;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO_Codeset, TAO_Codeset_Manager_Factory)
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 2beb2e13cc2..ecf3fc73955 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -9,10 +9,10 @@
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
-#include "Codeset_Descriptor.h"
-#include "Codeset_Manager_i.h"
-#include "Codeset_Translator_Factory.h"
-#include "Codeset.h"
+#include "tao/Codeset/Codeset_Descriptor.h"
+#include "tao/Codeset/Codeset_Manager_i.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
@@ -52,6 +52,8 @@ ACE_RCSID (Codeset,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1
 CONV_FRAME::CodeSetId
 TAO_Codeset_Manager_i::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID;
@@ -98,7 +100,7 @@ void
 TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile,
                                 TAO_Transport &trans)
 {
-  /// If tcs is already set on the transport then donot process,
+  /// If tcs is already set on the transport then do not process,
   /// use existing transport as CDR have translators set.
   TAO_Tagged_Components& theTaggedComp = theProfile.tagged_components ();
 
@@ -120,8 +122,8 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile,
                     ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ")
                     ACE_TEXT ("No codeset component in profile\n")));
 
-  // These are the "fallback" codeset ids for use if no context is
-  // available
+       // These are the "fallback" codeset ids for use if no context is
+       // available
        remote.ForCharData.native_code_set =
          TAO_CODESET_ID_XOPEN_UTF_8;
        remote.ForWcharData.native_code_set =
@@ -216,7 +218,7 @@ TAO_Codeset_Manager_i::process_service_context (TAO_ServerRequest &request)
 
 void
 TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd,
-                                               TAO_Transport &trans)
+                                                 TAO_Transport &trans)
 {
   TAO_Service_Context &service_cntx = opd.request_service_context ();
   CONV_FRAME::CodeSetContext codeset_cntx;
@@ -255,7 +257,7 @@ TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd,
 /// Checks whether the NCS is a part of CCS
 int
 TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id,
-                                  CONV_FRAME::CodeSetComponent &cs_comp)
+                                    CONV_FRAME::CodeSetComponent &cs_comp)
 {
   for (CORBA::ULong i = 0L;
        i < cs_comp.conversion_code_sets.length ();
@@ -271,7 +273,7 @@ TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id,
 /// Find the Intersection of Client and Server CCS's
 CONV_FRAME::CodeSetId
 TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1,
-                                     CONV_FRAME::CodeSetComponent &cs_comp2)
+                                       CONV_FRAME::CodeSetComponent &cs_comp2)
 {
   for(CORBA::ULong index = 0L;
        index < cs_comp1.conversion_code_sets.length();
@@ -288,7 +290,7 @@ TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1,
 
 int
 TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1,
-                                  CONV_FRAME::CodeSetId cs2 )
+                                    CONV_FRAME::CodeSetId cs2 )
 {
   // Call the is_compatible method of ACE_Codeset_Registry
   return ACE_Codeset_Registry::is_compatible(cs1,cs2);
@@ -297,7 +299,7 @@ TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1,
 /// returns the TCS for Char / Wchar
 CONV_FRAME::CodeSetId
 TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote,
-                                 CONV_FRAME::CodeSetComponent &local )
+                                   CONV_FRAME::CodeSetComponent &local )
 {
   if (remote.native_code_set == local.native_code_set)
     {
@@ -401,8 +403,7 @@ TAO_Codeset_Manager_i::open(void)
     }
 }
 
-
-/// Initialise the specific type codeset factories
+// Initialise the specific type codeset factories
 int
 TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd,
                                  CONV_FRAME::CodeSetComponent& cs_comp)
@@ -466,7 +467,6 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd,
   return 0;
 }
 
-
 TAO_Codeset_Translator_Base *
 TAO_Codeset_Manager_i::get_char_trans (CONV_FRAME::CodeSetId tcs)
 {
@@ -486,7 +486,7 @@ TAO_Codeset_Manager_i::get_wchar_trans (CONV_FRAME::CodeSetId tcs)
 
 TAO_Codeset_Translator_Base *
 TAO_Codeset_Manager_i::get_translator_i (TAO_Codeset_Descriptor& cd,
-                                       CONV_FRAME::CodeSetId tcs)
+                                         CONV_FRAME::CodeSetId tcs)
 {
   for (TAO_Codeset_Descriptor::Translator_Node *tlist = cd.translators();
        tlist; tlist = tlist->next_)
@@ -498,3 +498,12 @@ TAO_Codeset_Manager_i::get_translator_i (TAO_Codeset_Descriptor& cd,
   return 0;
 }
 
+void
+TAO_Codeset_Manager_i::get_ncs (CONV_FRAME::CodeSetId &ncsc,
+                                CONV_FRAME::CodeSetId &ncsw)
+{
+   ncsc = this->char_descriptor_.ncs();
+   ncsw = this->wchar_descriptor_.ncs();
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h
index fe6f6b7b09c..f5ca8491ca3 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.h
+++ b/TAO/tao/Codeset/Codeset_Manager_i.h
@@ -25,8 +25,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Unbounded_Set.h"
-#include "codeset_export.h"
-#include "Codeset_Descriptor.h"
+#include "tao/Codeset/codeset_export.h"
+#include "tao/Codeset/Codeset_Descriptor.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Profile;
 class TAO_Transport;
@@ -129,6 +132,8 @@ private:
   TAO_Codeset_Translator_Base * get_translator_i (TAO_Codeset_Descriptor&,
                                                   CONV_FRAME::CodeSetId);
 
+  void get_ncs (CONV_FRAME::CodeSetId &ncsc, CONV_FRAME::CodeSetId& ncsw);
+
   // The CodeSetComponentInfo struct contains all of the information
   // regarding the code sets this application recognizes. This is
   // where the native code set for both char and wchar are stored.
@@ -138,6 +143,7 @@ private:
   TAO_Codeset_Descriptor wchar_descriptor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
index affd4752199..bd3a915c51d 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -17,13 +17,15 @@
 //
 // ============================================================================
 
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (Codeset,
            Codeset_Translator_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory ()
 {
 
@@ -75,3 +77,5 @@ TAO_Codeset_Translator_Factory::assign_i (
 {
   cdr->wchar_translator(trans);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h
index 105afa3dc65..518a168de63 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h
@@ -8,7 +8,7 @@
  *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
-// =========================
+// ===================================================================
 
 #ifndef TAO_CODESET_TRANSLATOR_FACTORY_H
 #define TAO_CODESET_TRANSLATOR_FACTORY_H
@@ -22,14 +22,18 @@
 
 #include "tao/CONV_FRAMEC.h"
 #include "tao/Codeset_Translator_Base.h"
-#include "codeset_export.h"
+#include "tao/Codeset/codeset_export.h"
 
-class TAO_InputCDR;
-class TAO_OutputCDR;
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Char_Codeset_Translator;
 class ACE_WChar_Codeset_Translator;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_InputCDR;
+class TAO_OutputCDR;
 
 // ****************************************************************
 
@@ -79,6 +83,8 @@ protected:
   void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator* ) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // Get the template includes last
 #include "tao/Codeset/Codeset_Translator_Factory_T.h"
 
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
index 37d327ea80e..734417e9934 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -19,10 +18,12 @@
 #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 
-#include "Codeset_Translator_Factory_T.h"
+#include "tao/Codeset/Codeset_Translator_Factory_T.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class NCS_TO_TCS>
 TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () :
   translator_(0)
@@ -86,4 +87,6 @@ TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::assign (TAO_OutputCDR *cdr) const
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_CODESET_TRANSLATOR_FACTORY_T_CPP */
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
index 07408db8717..ce5a902c7fe 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
@@ -8,18 +8,22 @@
  *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
-// =========================
+// ===================================================================
+
 #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_H
 #define TAO_CODESET_TRANSLATOR_FACTORY_T_H
 
 #include /**/ "ace/pre.h"
 
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Codeset_Translator_Factory_T
  *
@@ -63,12 +67,14 @@ private:
   NCS_TO_TCS *translator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Codeset_Translator_Factory_T.cpp"
+#include "tao/Codeset/Codeset_Translator_Factory_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
index 337c95e2af2..1140d84a6bb 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
@@ -17,7 +17,8 @@
 //
 // ============================================================================
 
-#include "UTF16_BOM_Factory.h"
+#include "tao/debug.h"
+#include "tao/Codeset/UTF16_BOM_Factory.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
@@ -31,6 +32,9 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory,
                        0)
 ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory)
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory ()
   : translator_ (0)
   , forceBE_ (false)
@@ -134,3 +138,5 @@ TAO_UTF16_BOM_Factory::create_translator () const
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h
index 64bc891198b..a72652a7458 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h
@@ -22,10 +22,12 @@
 
 #include /**/ "ace/pre.h"
 #include "ace/Service_Config.h"
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
 
-#include "UTF16_BOM_Translator.h"
-#include "codeset_export.h"
+#include "tao/Codeset/UTF16_BOM_Translator.h"
+#include "tao/Codeset/codeset_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Codeset_Export TAO_UTF16_BOM_Factory
   : public  TAO_Codeset_Translator_Factory
@@ -60,6 +62,8 @@ private:
   bool forceBE_;    // force big endian wchar, warray, & wstring
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory)
 ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF16_BOM_Factory)
 
diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
index 4103c10c8b7..6f54540faf2 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -12,7 +12,7 @@
 //
 // ============================================================================
 
-#include "UTF16_BOM_Translator.h"
+#include "tao/Codeset/UTF16_BOM_Translator.h"
 #include "ace/OS_Memory.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
@@ -30,6 +30,8 @@ static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T);
 static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU;
 static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////
 // TAO_UTF16_BOM_Translator implementation
 
@@ -434,3 +436,5 @@ TAO_UTF16_BOM_Translator::write_swapped_wchar_array_i (ACE_OutputCDR & cdr,
     }
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h
index 6f8e5d6bc7c..6dbe046621d 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h
@@ -22,11 +22,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Codeset/codeset_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/CDR_Stream.h"
-#include "codeset_export.h"
+
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_UTF16_BOM_Translator
  *
@@ -91,5 +95,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* UTF16_BOM_TRANSLATOR_H */
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
index 6b9d2881330..2298e093c7d 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
@@ -1,7 +1,8 @@
-// -*- C++ -*-
 // $Id$
+#include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
-#include "UTF8_Latin1_Factory.h"
+#include "ace/Log_Msg.h"
+#include "tao/Codeset/UTF8_Latin1_Factory.h"
 
 ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory,
                        ACE_TEXT ("UTF8_Latin1_Factory"),
@@ -12,6 +13,8 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory,
                        0)
 ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory()
   : translator_ (0)
 {
@@ -84,3 +87,5 @@ TAO_UTF8_Latin1_Factory::create_translator () const
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
index 81bfdf71f08..292333ad7e0 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
@@ -5,14 +5,16 @@
 #define UTF8_LATIN1_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "codeset_export.h"
+#include "tao/Codeset/codeset_export.h"
 #include "ace/Service_Config.h"
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset/Codeset_Translator_Factory.h"
 
-#include "UTF8_Latin1_Translator.h"
+#include "tao/Codeset/UTF8_Latin1_Translator.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Codeset_Export TAO_UTF8_Latin1_Factory
-  : public  TAO_Codeset_Translator_Factory
+  : public TAO_Codeset_Translator_Factory
 {
 public:
   TAO_UTF8_Latin1_Factory ();
@@ -42,6 +44,8 @@ private:
   TAO_UTF8_Latin1_Translator *translator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
index e12bd90507a..204a1dc0bd6 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
@@ -17,12 +17,13 @@
 //    Phil Mesnier <mesnier_p@ociweb.com>
 //
 // ============================================================================
-#include "UTF8_Latin1_Translator.h"
+#include "tao/Codeset/UTF8_Latin1_Translator.h"
 #include "tao/debug.h"
 #include "ace/OS_Memory.h"
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////
 // UTF8_Latin1_Translator implementation
@@ -219,3 +220,5 @@ TAO_UTF8_Latin1_Translator::write_char_array (ACE_OutputCDR & cdr,
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h
index bcf40d115a9..791ea994d43 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h
@@ -22,11 +22,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Codeset/codeset_export.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/CDR_Stream.h"
-#include "codeset_export.h"
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class UTF8_Latin1_Translator
  *
@@ -78,9 +81,9 @@ private:
   ACE_CDR::Boolean write_char_i (ACE_OutputCDR &,
                                  ACE_CDR::Char);
 
-private:
-
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* UTF8_LATIN1_TRANSLATOR_H */
diff --git a/TAO/tao/Codeset_Descriptor_Base.h b/TAO/tao/Codeset_Descriptor_Base.h
index fa164219e6b..201de5e9bd3 100644
--- a/TAO/tao/Codeset_Descriptor_Base.h
+++ b/TAO/tao/Codeset_Descriptor_Base.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  * TAO_Codeset_Descriptor_Base describes the necessary interface for
  * Objects within libTAO to be able to supply information to the codeset
@@ -29,17 +33,17 @@
  * This class also serves as a default implementation when codeset support
  * is not linked in.
  */
-
-
 class TAO_Export TAO_Codeset_Descriptor_Base
 {
 public:
-  virtual  ~TAO_Codeset_Descriptor_Base ();
+  virtual ~TAO_Codeset_Descriptor_Base (void);
 
   virtual void ncs (const ACE_TCHAR *name) = 0;
   virtual void add_translator (const ACE_TCHAR *name) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODESET_DESCRIPTOR_BASE_H */
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 9744abc08b7..0402bfc6aea 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -1,20 +1,23 @@
 // $Id$
 
-#include "Codeset_Manager.h"
-#include "Codeset_Descriptor_Base.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/Codeset_Descriptor_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager::~TAO_Codeset_Manager ()
+TAO_Codeset_Manager::~TAO_Codeset_Manager (void)
 {
 }
 
-// Add the default destructor for the codeset_descriptor_base here, because
+// Add the destructor for the codeset_descriptor_base here, because
 // it is only ever used in conjunction with the codeset manager.
 
-TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base ()
+TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index e0cdc9710cb..163014327b1 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /*
@@ -8,7 +8,7 @@
  *
  *  Interface for the TAO CodeSet Manager.
  *
- *  @author  Mahesh Vedantam <mahesh#ociweb.com>
+ *  @author  Mahesh Vedantam <mahesh@ociweb.com>
  */
 //=============================================================================
 
@@ -17,15 +17,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CONV_FRAMEC.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/CONV_FRAMEC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_WChar_Codeset_Translator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Profile;
 class TAO_Transport;
@@ -55,17 +59,18 @@ class TAO_Codeset_Descriptor_Base;
  * context attached to the first request sent on the new connection.
  *
  */
-
 class TAO_Export TAO_Codeset_Manager
 {
 
 public:
-  virtual ~TAO_Codeset_Manager();
 
-  ///  Called by an object of TAO_Acceptor to set NCS and CCS values for
-  ///  Char/Wchar in to the Object Reference.
+  /// Destructor.
+  virtual ~TAO_Codeset_Manager (void);
+
+  /// Called by an object of TAO_Acceptor to set NCS and CCS values for
+  /// Char/Wchar in to the Object Reference.
   virtual void set_codeset (TAO_Tagged_Components& ) const = 0;
-  ///
+
   /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the
   /// Transport
   virtual void set_tcs (TAO_Profile &theProfile, TAO_Transport &) = 0;
@@ -87,8 +92,12 @@ public:
   virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void) = 0;
   virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void) = 0;
 
+  virtual void get_ncs (CONV_FRAME::CodeSetId &ncsc,
+                        CONV_FRAME::CodeSetId &ncsw) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CODESET_MANAGER_H */
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index a4ed7de44d8..644068d4070 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,25 +1,27 @@
 // $Id$
 
-#include "ORB_Core.h"
-#include "Codeset_Manager.h"
-#include "Codeset_Manager_Factory_Base.h"
+#include "tao/ORB_Core.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/Codeset_Manager_Factory_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Manager_Factory_Base,
            "$Id$")
 
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void)
 {
 }
 
-int
-TAO_Codeset_Manager_Factory_Base::is_default() const
+bool
+TAO_Codeset_Manager_Factory_Base::is_default (void) const
 {
-  return 1;
+  return true;
 }
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory_Base::create ()
+TAO_Codeset_Manager_Factory_Base::create (void)
 {
   return 0;
 
@@ -32,6 +34,8 @@ TAO_Codeset_Manager_Factory_Base::initialize (void)
     (ace_svc_desc_TAO_Codeset_Manager_Factory_Base);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 static int
 TAO_Requires_Codeset_Manager_Factory_Base =
 TAO_Codeset_Manager_Factory_Base::initialize ();
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h
index e69278db28c..8fcb63d51c3 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.h
+++ b/TAO/tao/Codeset_Manager_Factory_Base.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /*
@@ -8,7 +8,7 @@
  *
  *  Interface for the TAO CodeSet Manager.
  *
- *  @author  Mahesh Vedantam <mahesh#ociweb.com>
+ *  @author  Mahesh Vedantam <mahesh@ociweb.com>
  */
 //=============================================================================
 
@@ -17,14 +17,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/Service_Object.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Codeset_Manager;
 
 /**
@@ -34,7 +39,7 @@ class TAO_Codeset_Manager;
  *
  * @description The base also provides a default implementation which
  * instantiates nothing. This default impl is replaced by the actual
- * implementation is libTAO_Codeset is loaded.
+ * implementation if libTAO_Codeset is loaded.
  *
  */
 
@@ -52,12 +57,14 @@ public:
   /// to reload the factory with a dynamically linked libTAO_Codeset.
   /// Statically linked applications get derive implementation by
   /// including "tao/Codeset/Codeset.h" somewhere in their source code.
-  virtual int is_default (void) const;
+  virtual bool is_default (void) const;
 
   /// Static initializer ensures the factory is loaded
   static int initialize (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory_Base)
 ACE_FACTORY_DECLARE (TAO, TAO_Codeset_Manager_Factory_Base)
 
diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp
index c5d222373b2..e72a02359f3 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -17,13 +17,17 @@
 //
 // =====================================================================
 
-#include "Codeset_Translator_Base.h"
+#include "tao/Codeset_Translator_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Translator_Base,
            "$Id$")
 
-TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base ()
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void)
 {
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h
index cb87201e9ce..c2af91a7522 100644
--- a/TAO/tao/Codeset_Translator_Base.h
+++ b/TAO/tao/Codeset_Translator_Base.h
@@ -8,13 +8,14 @@
  *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
-// =========================
+// ===================================================================
 
 #ifndef TAO_CODESET_TRANSLATOR_BASE_H
 #define TAO_CODESET_TRANSLATOR_BASE_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,14 +23,17 @@
 
 #include "tao/CONV_FRAMEC.h"
 #include "tao/Codeset_Translator_Base.h"
-#include "TAO_Export.h"
-
-class TAO_InputCDR;
-class TAO_OutputCDR;
+#include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Char_Codeset_Translator;
 class ACE_WChar_Codeset_Translator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_InputCDR;
+class TAO_OutputCDR;
 
 // ****************************************************************
 
@@ -68,5 +72,8 @@ public:
   virtual void assign (TAO_OutputCDR *) const = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_Codeset_Translator_Base */
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 135a1fb1b91..80b2efca949 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -1,13 +1,13 @@
-#include "Collocated_Invocation.h"
-#include "Collocation_Proxy_Broker.h"
-#include "ORB_Core.h"
-#include "Request_Dispatcher.h"
-#include "TAO_Server_Request.h"
-#include "Stub.h"
-#include "operation_details.h"
+#include "tao/Collocated_Invocation.h"
+#include "tao/Collocation_Proxy_Broker.h"
+#include "tao/ORB_Core.h"
+#include "tao/Request_Dispatcher.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Stub.h"
+#include "tao/operation_details.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "PortableInterceptorC.h"
+# include "tao/PortableInterceptorC.h"
 #endif /*TAO_HAS_INTERCEPTORS */
 
 ACE_RCSID (tao,
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Collocated_Invocation::Collocated_Invocation (CORBA::Object_ptr t,
@@ -26,7 +28,8 @@ namespace TAO
                        et,
                        stub,
                        detail,
-                       response_expected)
+                       response_expected,
+                       false /* request_is_remote */ )
   {
   }
 
@@ -52,7 +55,8 @@ namespace TAO
         if (strat == TAO_CS_THRU_POA_STRATEGY)
           {
             // Perform invocations on the servant through the servant's ORB.
-            CORBA::ORB_var servant_orb = this->effective_target ()->_stubobj ()->servant_orb_ptr ();
+            CORBA::ORB_var servant_orb =
+              this->effective_target ()->_stubobj ()->servant_orb_ptr ();
             TAO_ORB_Core * const orb_core = servant_orb->orb_core ();
 
             TAO_ServerRequest request (orb_core,
@@ -122,7 +126,7 @@ namespace TAO
           return TAO_INVOKE_SUCCESS;
 
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus status =
+        PortableInterceptor::ReplyStatus const status =
           this->handle_any_exception (&ACE_ANY_EXCEPTION
                                       ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -141,7 +145,7 @@ namespace TAO
         if (this->response_expected () == false)
           return TAO_INVOKE_SUCCESS;
 #if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus st =
+        PortableInterceptor::ReplyStatus const st =
           this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
@@ -164,3 +168,5 @@ namespace TAO
   }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index 03068bcb8fb..a9d2b0950fc 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -10,6 +10,7 @@
  *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
  */
 //=============================================================================
+
 #ifndef TAO_COLLOCATED_INVOCATION_H
 #define TAO_COLLOCATED_INVOCATION_H
 
@@ -25,6 +26,8 @@
 #include "tao/Invocation_Base.h"
 #include "tao/Exception.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Stub;
 
@@ -85,10 +88,14 @@ namespace TAO
                               ACE_ENV_ARG_DECL);
 
   private:
-    ACE_UNIMPLEMENTED_FUNC (Collocated_Invocation (void))
+
+    // Disallow default construction.
+    Collocated_Invocation (void);
 
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_COLLOCATED_INVOCATION_H*/
diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp
index b1d780feccf..e2c0653139f 100644
--- a/TAO/tao/Collocation_Proxy_Broker.cpp
+++ b/TAO/tao/Collocation_Proxy_Broker.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Collocation_Proxy_Broker.h"
+#include "tao/Collocation_Proxy_Broker.h"
 
 
 ACE_RCSID (tao,
@@ -8,6 +8,10 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h
index 420ddec654f..3da552f68a7 100644
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ b/TAO/tao/Collocation_Proxy_Broker.h
@@ -22,10 +22,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Collocation_Strategy.h"
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/CORBA_macros.h"
 #include "ace/os_include/os_stddef.h"
-#include "tao/Collocation_Strategy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T> class TAO_Pseudo_Var_T;
 template <typename T, typename T_var> class TAO_Pseudo_Out_T;
@@ -65,6 +68,8 @@ namespace TAO
                            Collocation_Strategy strategy
                            ACE_ENV_ARG_DECL) = 0;
   };
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index 1f752fccc89..23d15bfc269 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
 #include "tao/Collocation_Resolver.h"
-#include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
            Collocation_Resolver,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index 46c6466ff47..b837f9acf15 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Collocation_Resolver.h
@@ -12,16 +14,19 @@
 #define TAO_COLLOCATION_RESOLVER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+
+#include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
 
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -52,6 +57,8 @@ public:
                                         ACE_ENV_ARG_DECL) const = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Collocation_Strategy.h b/TAO/tao/Collocation_Strategy.h
index 9a6e4927b52..236149a387b 100644
--- a/TAO/tao/Collocation_Strategy.h
+++ b/TAO/tao/Collocation_Strategy.h
@@ -14,6 +14,10 @@
 #define TAO_COLLOCATION_STRATEGY_H
 
 #include /**/ "ace/pre.h"
+#include "tao/orbconf.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Define symbolic names for the ORB collocation strategies.
 namespace TAO
@@ -37,6 +41,8 @@ namespace TAO
     };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_COLLOCATION_STRATEGY_H */
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 5fb831711cb..06e17912045 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -1,6 +1,8 @@
+// $Id$
+
 #ifndef TAO_CONDITION_CPP
 #define TAO_CONDITION_CPP
-#include "Condition.h"
+#include "tao/Condition.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
@@ -8,9 +10,7 @@
 #endif /* __ACE_INLINE__ */
 
 
-ACE_RCSID (TAO,
-           Condition,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class MUTEX>
 TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
@@ -57,4 +57,6 @@ TAO_Condition<MUTEX>::~TAO_Condition (void)
     delete this->mutex_;
 }
 
-#endif /* TAO_CONDITION_CPP*/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif  /* TAO_CONDITION_CPP */
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index c167bf85e0b..5a1d1bada70 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,11 @@
 #include "ace/Condition_T.h"
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Condition
@@ -106,12 +109,14 @@ private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &))
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Condition.inl"
+#include "tao/Condition.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Condition.cpp"
+#include "tao/Condition.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl
index 7e41b1cb2d0..0e69d8b1bf1 100644
--- a/TAO/tao/Condition.inl
+++ b/TAO/tao/Condition.inl
@@ -1,5 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class MUTEX> ACE_INLINE int
 TAO_Condition<MUTEX>::wait (void)
 {
@@ -47,3 +51,5 @@ TAO_Condition<MUTEX>::broadcast (void)
 {
   return this->cond_->broadcast ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index 98764d36066..2299f775d46 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -1,9 +1,11 @@
-#include "Connect_Strategy.h"
+#include "tao/Connect_Strategy.h"
 
 ACE_RCSID (tao,
            Connect_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
 {
@@ -13,3 +15,5 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core)
 TAO_Connect_Strategy::~TAO_Connect_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index be88ba7ff60..1189a6cd171 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -15,18 +15,25 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Synch_Options;
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Connector;
 class TAO_Connection_Handler;
 class TAO_Transport;
-class ACE_Synch_Options;
-class ACE_Time_Value;
 
 /**
  * @class TAO_Connect_Strategy
@@ -72,10 +79,13 @@ public:
                     ACE_Time_Value *val) = 0;
 
 protected:
+
   /// Cached copy of the ORB core pointer
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 838774ad068..6401fac6155 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -1,11 +1,11 @@
 //$Id$
 
-#include "Connection_Handler.h"
-#include "ORB_Core.h"
-#include "debug.h"
-#include "Resume_Handle.h"
-#include "Transport.h"
-#include "Wait_Strategy.h"
+#include "tao/Connection_Handler.h"
+#include "tao/ORB_Core.h"
+#include "tao/debug.h"
+#include "tao/Resume_Handle.h"
+#include "tao/Transport.h"
+#include "tao/Wait_Strategy.h"
 
 #include "ace/SOCK.h"
 #include "ace/Reactor.h"
@@ -21,6 +21,8 @@ ACE_RCSID (tao,
            Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
   , transport_ (0)
@@ -38,7 +40,7 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
 
 TAO_Connection_Handler::~TAO_Connection_Handler (void)
 {
-  int result =
+  int const result =
     this->release_os_resources ();
 
   if (result == -1 && TAO_debug_level)
@@ -201,6 +203,7 @@ TAO_Connection_Handler::handle_output_eh (
   return_value = this->transport ()->handle_output ();
 
   this->pos_io_hook (return_value);
+
   if (return_value != 0)
     {
       resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
@@ -225,7 +228,7 @@ TAO_Connection_Handler::handle_input_eh (
       return 0;
     }
 
-  int result = this->handle_input_internal (h, eh);
+  int const result = this->handle_input_internal (h, eh);
 
   if (result == -1)
     {
@@ -246,7 +249,7 @@ TAO_Connection_Handler::handle_input_internal (
   // Grab the transport id now and use the cached value for printing
   // since the  transport could dissappear by the time the thread
   // returns.
-  size_t t_id =
+  size_t const t_id =
     this->transport ()->id ();
 
   if (TAO_debug_level > 6)
@@ -271,6 +274,10 @@ TAO_Connection_Handler::handle_input_internal (
 
   this->pos_io_hook (return_value);
 
+  // Bug 1647; might need to change resume_handle's flag or
+  // change handle_input return value.
+  resume_handle.handle_input_return_value_hook(return_value);
+
   if (TAO_debug_level > 6)
     {
       ACE_HANDLE handle = eh->get_handle ();
@@ -280,6 +287,8 @@ TAO_Connection_Handler::handle_input_internal (
                   t_id, handle, h, return_value));
     }
 
+  if (return_value == -1)
+    resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
   return return_value;
 }
 
@@ -289,7 +298,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
   // Save the ID for debugging messages
   ACE_HANDLE handle = eh->get_handle ();
 
-  size_t id = this->transport ()->id ();
+  size_t const id = this->transport ()->id ();
   if (TAO_debug_level)
     {
       ACE_DEBUG  ((LM_DEBUG,
@@ -421,3 +430,5 @@ TAO_Connection_Handler::close_handler (void)
 }
 
 //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 26312ebd79f..e17ff6af08f 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -1,4 +1,3 @@
-
 // -*- C++ -*-
 
 //=============================================================================
@@ -16,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LF_CH_Event.h"
+#include "tao/LF_CH_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,11 +23,16 @@
 
 #include "tao/Basic_Types.h"
 
-class TAO_ORB_Core;
-class TAO_Transport;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK;
 class ACE_Lock;
 class ACE_Event_Handler;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ORB_Core;
+class TAO_Transport;
 
 /*
  * Hook to specialize the connection handler with the
@@ -174,7 +178,7 @@ protected:
 
 private:
   /// Pointer to the TAO_ORB_Core
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// Transport object reference
   TAO_Transport* transport_;
@@ -194,6 +198,8 @@ private:
 
 //@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 001bd2c811c..5841cf3aebc 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ORB_Core *
 TAO_Connection_Handler::orb_core (void)
 {
@@ -18,7 +20,7 @@ ACE_INLINE bool
 TAO_Connection_Handler::is_closed (void) const
 {
   return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED ||
-	  this->state_ == TAO_LF_Event::LFS_TIMEOUT);
+          this->state_ == TAO_LF_Event::LFS_TIMEOUT);
 }
 
 ACE_INLINE bool
@@ -34,3 +36,5 @@ TAO_Connection_Handler::is_connecting (void) const
 }
 
 //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
index f903b1107e8..8bcf332a835 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -6,10 +6,12 @@
 # include "tao/Connection_Purging_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           Connection_Purging_Strategy, 
+ACE_RCSID (tao,
+           Connection_Purging_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void)
 {
 }
@@ -20,4 +22,4 @@ TAO_Connection_Purging_Strategy::cache_maximum (void) const
   return cache_maximum_;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h
index eace4e9114c..c93038f7de3 100644
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ b/TAO/tao/Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   Connection_Purging_Strategy.h
@@ -13,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport;
 
 // ****************************************************************
@@ -52,6 +58,8 @@ private:
   int cache_maximum_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Connection_Purging_Strategy.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Connection_Purging_Strategy.inl b/TAO/tao/Connection_Purging_Strategy.inl
index b0bc5b7b8f0..a361f536198 100644
--- a/TAO/tao/Connection_Purging_Strategy.inl
+++ b/TAO/tao/Connection_Purging_Strategy.inl
@@ -1,9 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Connection_Purging_Strategy::TAO_Connection_Purging_Strategy (
-                                                      int cache_maximum)
- : cache_maximum_ (cache_maximum)
+  int cache_maximum)
+  : cache_maximum_ (cache_maximum)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp
index ad333727bce..3e7c5742320 100644
--- a/TAO/tao/Connector_Impl.cpp
+++ b/TAO/tao/Connector_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef TAO_CONNECTOR_IMPL_CPP
 #define TAO_CONNECTOR_IMPL_CPP
 
@@ -7,7 +9,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(tao, Connector_Impl, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SVC_HANDLER>
 TAO_Connect_Creation_Strategy<SVC_HANDLER>::
@@ -58,5 +60,6 @@ TAO_Connect_Concurrency_Strategy<SVC_HANDLER>::
                                                                       arg);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif /*TAO_CONNECTOR_IMPL_CPP*/
+#endif  /* TAO_CONNECTOR_IMPL_CPP */
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index 535d357c209..6affe0860e6 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   Connector_Impl.h
@@ -21,8 +22,13 @@
 
 #include "tao/Basic_Types.h"
 
-class TAO_ORB_Core;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Thread_Manager;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ORB_Core;
 
 /**
  * @class TAO_Connect_Creation_Strategy
@@ -54,10 +60,10 @@ public:
 private:
 
   /// Pointer to the ORB_Core on which we are activated
-  TAO_ORB_Core* orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// Are we using GIOP lite?
-  CORBA::Boolean lite_flag_;
+  CORBA::Boolean const lite_flag_;
 };
 
 
@@ -90,10 +96,13 @@ public:
 private:
 
   /// Pointer to the ORB Core.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Connector_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 603b9b40ae4..06ae5f23460 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -20,6 +20,7 @@ ACE_RCSID (tao,
            Connector_Registry,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connector_Registry::TAO_Connector_Registry (void)
   : connectors_ (0),
@@ -53,7 +54,7 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag)
 int
 TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
 {
-  TAO_ProtocolFactorySet *pfs =
+  TAO_ProtocolFactorySet * const pfs =
     orb_core->protocol_factories ();
 
   // The array containing the TAO_Connectors will never contain more
@@ -266,3 +267,5 @@ TAO_Connector_Registry::object_key_delimiter (const char *ior)
   // against the provided string.
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index 28bb89cd2a5..bb2a454f776 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -26,6 +26,8 @@
 #include "tao/Basic_Types.h"
 #include "ace/Global_Macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_ORB_Core;
 class TAO_Connector;
@@ -89,9 +91,9 @@ public:
   TAO_ConnectorSetIterator end (void);
 
 private:
-  // Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Connector_Registry (const TAO_Connector_Registry&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Connector_Registry&))
+  // Disallow copying and assignment.
+  TAO_Connector_Registry (const TAO_Connector_Registry&);
+  void operator= (const TAO_Connector_Registry&);
 
 private:
   /// List of connectors that are currently open.
@@ -101,6 +103,8 @@ private:
   size_t size_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "tao/Connector_Registry.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Connector_Registry.i b/TAO/tao/Connector_Registry.i
index c2976325560..e824efb5a6a 100644
--- a/TAO/tao/Connector_Registry.i
+++ b/TAO/tao/Connector_Registry.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ConnectorSetIterator
 TAO_Connector_Registry::begin (void)
 {
@@ -13,3 +15,5 @@ TAO_Connector_Registry::end (void)
 {
   return this->connectors_ + this->size_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index b1d3067dad6..f90dcaddebf 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file Current.pidl
  *
@@ -12,6 +14,8 @@
  *         -Wb,export_include="tao/TAO_Export.h"
  *         -Wb,pre_include="ace/pre.h"
  *         -Wb,post_include="ace/post.h"
+ *         -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *         -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *         Current.pidl
  *
  *
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 5b38d3dae99..1cca9879881 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:288
 
 
-#include "CurrentC.h"
+#include "tao/CurrentC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<CORBA::Current>::release (
     CORBA::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Current_ptr
@@ -71,7 +73,7 @@ TAO::Objref_Traits<CORBA::Current>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::Current>::marshal (
-    CORBA::Current_ptr p,
+    const CORBA::Current_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -109,18 +111,18 @@ CORBA::Current::_unchecked_narrow (
 CORBA::Current_ptr
 CORBA::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -162,3 +164,5 @@ CORBA::Current::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index e23843d6261..b5dedc32126 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -59,24 +59,26 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -84,63 +86,63 @@ namespace CORBA
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-  
+
   class TAO_Export Current
     : public virtual CORBA::Object
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static void _tao_release (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
     {
       return static_cast<Current_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
@@ -160,7 +162,7 @@ namespace TAO
 
 #if !defined (_CORBA_CURRENT__TRAITS_)
 #define _CORBA_CURRENT__TRAITS_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Current>
   {
@@ -172,7 +174,7 @@ namespace TAO
       );
     static ::CORBA::Current_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::Current_ptr p,
+        const ::CORBA::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -183,6 +185,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index b8c4608aefc..753ae4496d7 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -1,31 +1,29 @@
 // $Id$
 
-#include "DLL_Parser.h"
-#include "Object_Loader.h"
-#include "Object.h"
-#include "Environment.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
+#include "tao/DLL_Parser.h"
+#include "tao/Object_Loader.h"
+#include "tao/Object.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined(__ACE_INLINE__)
-#include "DLL_Parser.i"
-#endif /* __ACE_INLINE__ */
-
 
 ACE_RCSID (tao,
            DLL_Parser,
            "$Id$")
 
+static const char dll_prefix[] = "DLL:";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DLL_Parser::~TAO_DLL_Parser (void)
 {
 }
 
-static const char dll_prefix[] = "DLL:";
 
 int
 TAO_DLL_Parser::match_prefix (const char *ior_string) const
@@ -63,6 +61,8 @@ TAO_DLL_Parser::parse_string (const char *ior,
   return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser,
                        ACE_TEXT ("DLL_Parser"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 50c59241ec6..b63130c2e56 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +23,8 @@
 
 #include "tao/IOR_Parser.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DLL_Parser
  *
@@ -71,11 +74,9 @@
  * loaded without any modifications to the application code.
  *
  */
-class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser
+class TAO_DLL_Parser : public TAO_IOR_Parser
 {
 public:
-  /// Constructor
-  TAO_DLL_Parser (void);
 
   /// The destructor
   virtual ~TAO_DLL_Parser (void);
@@ -89,9 +90,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-# include "DLL_Parser.i"
-#endif /* __ACE_INLINE__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser)
diff --git a/TAO/tao/DLL_Parser.i b/TAO/tao/DLL_Parser.i
deleted file mode 100644
index 00a66f43394..00000000000
--- a/TAO/tao/DLL_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_DLL_Parser::TAO_DLL_Parser (void)
-{
-}
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index 2b5ea0a0673..78ccc5c4b5c 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (tao,
 #include "tao/Object.h"
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
                                                  ACE_ENV_ARG_DECL_NOT_USED) const
@@ -16,6 +18,8 @@ TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   return object->_is_collocated ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver,
                        ACE_TEXT ("Default_Collocation_Resolver"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index 3d42c2a7d64..c98aefae6d5 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Default_Collocation_Resolver.h
@@ -20,6 +22,8 @@
 
 #include "tao/Collocation_Resolver.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Environment;
@@ -43,6 +47,8 @@ public:
                                         ACE_ENV_ARG_DECL) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver)
 
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index 8b0814e80e8..64fb8f94608 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "tao/Default_Endpoint_Selector_Factory.h"
 #include "tao/Invocation_Endpoint_Selectors.h"
 
@@ -12,11 +11,12 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (void)
-{
-  ACE_NEW (this->default_endpoint_selector_,
-           TAO_Default_Endpoint_Selector);
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (
+  void)
+  : default_endpoint_selector_ (new TAO_Default_Endpoint_Selector)
+{
 }
 
 TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void)
@@ -32,6 +32,8 @@ TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT
   return this->default_endpoint_selector_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory,
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index 00558b91983..b521cab81dd 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 
 #include "tao/Endpoint_Selector_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward references
 class TAO_Default_Endpoint_Selector;
 
@@ -62,12 +64,22 @@ public:
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
                              ACE_ENV_SINGLE_ARG_DECL);
 
+private:
+
+  // Prevent copying/assignment.
+  TAO_Default_Endpoint_Selector_Factory (TAO_Default_Endpoint_Selector_Factory const &);
+  void operator= (TAO_Default_Endpoint_Selector_Factory const &);
+
 protected:
+
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
-  TAO_Default_Endpoint_Selector *default_endpoint_selector_;
+  TAO_Default_Endpoint_Selector * const default_endpoint_selector_;
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Endpoint_Selector_Factory)
 
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index cc426e44165..a06a1307aba 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "Default_Protocols_Hooks.h"
+#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)
 {
@@ -168,6 +169,7 @@ TAO_Default_Protocols_Hooks::get_dscp_codepoint (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index ad0d440d7df..540ed7b70fb 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -1,4 +1,3 @@
-
 // -*- C++ -*-
 
 // ===================================================================
@@ -23,6 +22,8 @@
 
 #include "tao/Protocols_Hooks.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_POA;
 
 class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
@@ -113,6 +114,8 @@ public:
                                   ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks)
 
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index d6603362980..180a81b60e4 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Default_Stub_Factory.h"
-#include "Stub.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
+#include "tao/Default_Stub_Factory.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
 
@@ -12,6 +12,7 @@ ACE_RCSID (tao,
            TAO_Default_Stub_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 {
@@ -34,6 +35,8 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id,
   return retval;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index f5b82a070ee..e0a4c60c5ec 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Default_Stub_Factory.h
@@ -25,6 +27,8 @@
 
 #include "tao/Stub_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Default_Stub_Factory
  *
@@ -39,7 +43,8 @@ class TAO_Export TAO_Default_Stub_Factory
   : public TAO_Stub_Factory
 {
 public:
-  // -- Ctor/Dtor --
+
+  /// Destructor.
   virtual ~TAO_Default_Stub_Factory (void);
 
   /// Creates a Stub Object.
@@ -47,8 +52,11 @@ public:
                                  const TAO_MProfile &profiles,
                                  TAO_ORB_Core *orb_core
                                  ACE_ENV_ARG_DECL);
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory)
 
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 05268b9920e..4c6f322ec02 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "Default_Thread_Lane_Resources_Manager.h"
-#include "Thread_Lane_Resources.h"
-#include "Exception.h"
-#include "Environment.h"
-#include "ORB_Core.h"
+#include "tao/Default_Thread_Lane_Resources_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Exception.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Core.h"
 #include "ace/Log_Msg.h"
 
 
@@ -12,13 +12,13 @@ ACE_RCSID (tao,
            Default_Thread_Lane_Resources_Manager,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : TAO_Thread_Lane_Resources_Manager (orb_core),
-    lane_resources_ (0)
+    lane_resources_ (new TAO_Thread_Lane_Resources (orb_core))
 {
-  // Create the default resources.
-  ACE_NEW (this->lane_resources_,
-           TAO_Thread_Lane_Resources (orb_core));
 }
 
 TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void)
@@ -30,7 +30,7 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma
 int
 TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_ORB_Parameters *params =
+  TAO_ORB_Parameters * const params =
     this->orb_core_->orb_params ();
 
   TAO_EndpointSet endpoint_set;
@@ -40,7 +40,7 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGL
 
   bool ignore_address = false;
 
-  int result =
+  int const result =
     this->lane_resources_->open_acceptor_registry (endpoint_set,
                                                    ignore_address
                                                    ACE_ENV_ARG_PARAMETER);
@@ -86,6 +86,13 @@ TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mp
   return this->lane_resources_->is_collocated (mprofile);
 }
 
+// -------------------------------------------------------
+
+TAO_Default_Thread_Lane_Resources_Manager_Factory::
+~TAO_Default_Thread_Lane_Resources_Manager_Factory (void)
+{
+}
+
 TAO_Thread_Lane_Resources_Manager *
 TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
 {
@@ -99,6 +106,11 @@ TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_
   return manager;
 }
 
+// -------------------------------------------------------
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory,
                        ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 359158ff0cb..89f94829417 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Default_Thread_Lane_Resources_Manager.h
@@ -20,16 +22,19 @@
 
 #include "tao/Thread_Lane_Resources_Manager.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Default_Thread_Lane_Resources_Manager
  *
  * @brief Simple manager for thread lane resources.
  *
+
  * \nosubgrouping
  *
  **/
-class TAO_Export TAO_Default_Thread_Lane_Resources_Manager :
-  public TAO_Thread_Lane_Resources_Manager
+class TAO_Export TAO_Default_Thread_Lane_Resources_Manager
+  : public TAO_Thread_Lane_Resources_Manager
 {
 public:
 
@@ -63,10 +68,16 @@ public:
 
   // @}
 
+private:
+
+  TAO_Default_Thread_Lane_Resources_Manager (TAO_Default_Thread_Lane_Resources_Manager const &);
+  void operator= (TAO_Default_Thread_Lane_Resources_Manager const &);
+
 protected:
 
   /// Default lane resources.
-  TAO_Thread_Lane_Resources *lane_resources_;
+  TAO_Thread_Lane_Resources * const lane_resources_;
+
 };
 
 /**
@@ -82,11 +93,16 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory
 {
 public:
 
+  /// Destructor.
+  virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void);
+
   /// Factory method.
   TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
 
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index cb19c83a9aa..b221159edee 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file Domain.pidl
  *
@@ -19,6 +21,8 @@
  *          -Wb,export_include=TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          Domain.pidl
  *
  *   2. Then patch the generated code.  This patch (a) eliminates
@@ -43,8 +47,8 @@
 #ifndef TAO_CORBA_DOMAIN_PIDL
 #define TAO_CORBA_DOMAIN_PIDL
 
-#include <Policy.pidl>
-#include <InterfaceDef.pidl>
+#include "tao/Policy.pidl"
+#include "tao/InterfaceDef.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 569c74c70d2..10531e046e6 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_DOMAINS_CPP_
 
 
-#include "DomainS.h"
+#include "tao/Domain/DomainS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
@@ -69,12 +69,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DomainS.inl"
+#include "tao/Domain/DomainS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -1175,7 +1177,7 @@ POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
 POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Policy) (rhs)
+    ::POA_CORBA::Policy (rhs)
 {
 }
 
@@ -1684,5 +1686,7 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ifndef */
 
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index b95ab45f54b..0983a05f4fd 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -54,7 +54,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-#include "domain_export.h"
+#include "tao/Domain/domain_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
   
@@ -481,10 +483,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:995
 
-#include "DomainS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "tao/Domain/DomainS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "DomainS.inl"
+#include "tao/Domain/DomainS.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index 7da816922ac..5e1b77f1084 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -154,3 +155,4 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
     );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp
index 951f03175c1..1cf3d0d6643 100644
--- a/TAO/tao/Domain/DomainS_T.cpp
+++ b/TAO/tao/Domain/DomainS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
 #define _TAO_IDL_ORIG_DOMAINS_T_CPP_
 
-#include "DomainS_T.h"
+#include "tao/Domain/DomainS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "DomainS_T.inl"
+#include "tao/Domain/DomainS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 9d854d72853..253698af938 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -38,6 +38,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
@@ -202,12 +203,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1096
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "DomainS_T.inl"
+#include "tao/Domain/DomainS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DomainS_T.cpp"
+#include "tao/Domain/DomainS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
index 83b1baa46c4..2287aa6ba7e 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
@@ -298,3 +300,5 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
   );
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index edc3ef28c7c..cd48cc1d9f4 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "DomainC.h"
+#include "tao/DomainC.h"
 #include "tao/CDR.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
@@ -48,12 +48,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DomainC.inl"
+#include "tao/DomainC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO specific stuff.
 namespace CORBA
 {
@@ -144,7 +146,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::release (
     CORBA::DomainManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::DomainManager_ptr
@@ -155,7 +157,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::DomainManager>::marshal (
-    CORBA::DomainManager_ptr p,
+    const CORBA::DomainManager_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -181,7 +183,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
@@ -237,7 +239,7 @@ CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
     static_cast<DomainManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::DomainManager_ptr
@@ -273,7 +275,7 @@ CORBA::DomainManager::_unchecked_narrow (
 CORBA::DomainManager_ptr
 CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -284,7 +286,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
 void
 CORBA::DomainManager::_tao_release (DomainManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -308,7 +310,7 @@ CORBA::DomainManager::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -344,7 +346,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::release (
     CORBA::ConstructionPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ConstructionPolicy_ptr
@@ -355,7 +357,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
-    CORBA::ConstructionPolicy_ptr p,
+    const CORBA::ConstructionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -382,7 +384,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0)
@@ -440,7 +442,7 @@ CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
     static_cast<ConstructionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ConstructionPolicy_ptr
@@ -476,7 +478,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
 CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -487,7 +489,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
 void
 CORBA::ConstructionPolicy::_tao_release (ConstructionPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -515,7 +517,7 @@ CORBA::ConstructionPolicy::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -545,9 +547,8 @@ CORBA::DomainManagerList::DomainManagerList (void)
 CORBA::DomainManagerList::DomainManagerList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::DomainManager, CORBA::DomainManager_var
       >
     (max)
 {}
@@ -558,9 +559,8 @@ CORBA::DomainManagerList::DomainManagerList (
     CORBA::DomainManager_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::DomainManager, CORBA::DomainManager_var
       >
     (max, length, buffer, release)
 {}
@@ -568,9 +568,8 @@ CORBA::DomainManagerList::DomainManagerList (
 CORBA::DomainManagerList::DomainManagerList (
     const DomainManagerList &seq
   )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::DomainManager, CORBA::DomainManager_var
       >
     (seq)
 {}
@@ -672,25 +671,7 @@ CORBA::Boolean operator<< (
     const CORBA::DomainManagerList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::DomainManager>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -698,40 +679,9 @@ CORBA::Boolean operator>> (
     CORBA::DomainManagerList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-
-      return _tao_marshal_flag;
-
-    }
-
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 5a4683f1b2a..6abc992cfd7 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -66,6 +66,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -328,31 +330,21 @@ namespace CORBA
   class DomainManagerList;
 
   typedef
-    TAO_MngSeq_Var_T<
-        DomainManagerList,
-        TAO_Object_Manager<
-            DomainManager,
-            DomainManager_var
-          >
+    TAO_VarSeq_Var_T<
+        DomainManagerList
       >
     DomainManagerList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        DomainManagerList,
-        DomainManagerList_var,
-        TAO_Object_Manager<
-            DomainManager,
-            DomainManager_var
-          >
+    TAO_Seq_Out_T<
+        DomainManagerList
       >
     DomainManagerList_out;
 
   class TAO_Export DomainManagerList
     : public
-        TAO_Unbounded_Object_Sequence<
-            DomainManager,
-            DomainManager_var
+        TAO::unbounded_object_reference_sequence<
+            DomainManager, DomainManager_var
           >
   {
   public:
@@ -362,7 +354,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         DomainManager_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
@@ -417,7 +409,7 @@ namespace TAO
       );
     static ::CORBA::DomainManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::DomainManager_ptr p,
+        const ::CORBA::DomainManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -438,7 +430,7 @@ namespace TAO
       );
     static ::CORBA::ConstructionPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ConstructionPolicy_ptr p,
+        const ::CORBA::ConstructionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -478,8 +470,10 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "DomainC.inl"
+#include "tao/DomainC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/DomainC.inl b/TAO/tao/DomainC.inl
index 59264e65404..68d8edb83aa 100644
--- a/TAO/tao/DomainC.inl
+++ b/TAO/tao/DomainC.inl
@@ -29,6 +29,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (_CORBA_DOMAINMANAGER___CI_)
 #define _CORBA_DOMAINMANAGER___CI_
 
@@ -39,12 +41,7 @@ CORBA::DomainManager::DomainManager (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
+  : ::CORBA::Object (objref, _tao_collocated, servant, oc),
     the_TAO_DomainManager_Proxy_Broker_ (0)
 {
   this->CORBA_DomainManager_setup_collocation ();
@@ -55,7 +52,7 @@ CORBA::DomainManager::DomainManager (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_DomainManager_Proxy_Broker_ (0)
 {
 }
@@ -75,12 +72,7 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
+  : ::CORBA::Object (objref, _tao_collocated, servant, oc),
     the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
 {
   this->CORBA_ConstructionPolicy_setup_collocation ();
@@ -91,9 +83,11 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index 75b7c1dad53..f214a297fad 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          DoubleSeq.pidl
  */
 
diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp
index e70ae2285d4..3028c71acf4 100644
--- a/TAO/tao/DoubleSeqC.cpp
+++ b/TAO/tao/DoubleSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "DoubleSeqC.h"
+#include "tao/DoubleSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOUBLESEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::DoubleSeq::DoubleSeq (void)
 CORBA::DoubleSeq::DoubleSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Double
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::DoubleSeq::DoubleSeq (
     ::CORBA::Double * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Double
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::DoubleSeq::DoubleSeq (
 CORBA::DoubleSeq::DoubleSeq (
     const DoubleSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Double
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::DoubleSeq::_tao_any_destructor (
     const CORBA::DoubleSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::DoubleSeq::_tao_any_destructor (
     CORBA::DoubleSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h
index 01164cc055d..7d075f15867 100644
--- a/TAO/tao/DoubleSeqC.h
+++ b/TAO/tao/DoubleSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOUBLESEQ_CH_)
 #define _CORBA_DOUBLESEQ_CH_
-  
+
   class DoubleSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        DoubleSeq,
-        CORBA::Double
+        DoubleSeq
       >
     DoubleSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        DoubleSeq,
-        DoubleSeq_var,
-        CORBA::Double
+        DoubleSeq
       >
     DoubleSeq_out;
-  
+
   class TAO_Export DoubleSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Double
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     DoubleSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::Double* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::Double* buffer,
+        ::CORBA::Boolean release = false
       );
     DoubleSeq (const DoubleSeq &);
     ~DoubleSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef DoubleSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 63e18a2bc87..8f6c231ac2a 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    DynAnyFactory.cpp
@@ -10,14 +9,14 @@
 //=============================================================================
 
 
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 
-#include "DynAny_i.h"
-#include "DynStruct_i.h"
-#include "DynSequence_i.h"
-#include "DynEnum_i.h"
-#include "DynArray_i.h"
-#include "DynUnion_i.h"
+#include "tao/DynamicAny/DynAny_i.h"
+#include "tao/DynamicAny/DynStruct_i.h"
+#include "tao/DynamicAny/DynSequence_i.h"
+#include "tao/DynamicAny/DynEnum_i.h"
+#include "tao/DynamicAny/DynArray_i.h"
+#include "tao/DynamicAny/DynUnion_i.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -25,6 +24,8 @@ ACE_RCSID (DynamicAny,
            DynAnyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor from typecode
 TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 {
@@ -377,3 +378,4 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
   return DynamicAny::DynAny::_nil ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index e4b5e99d949..f37cda716b8 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -16,7 +17,7 @@
 #define TAO_DYNANYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +30,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynAnyFactory
  *
@@ -87,6 +90,8 @@ private:
   TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index cdd2ba9162f..e414c793964 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynAny_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynAny_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
@@ -13,6 +12,7 @@ ACE_RCSID (DynamicAny,
            DynAny_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynAny_i::TAO_DynAny_i (void)
 {
@@ -556,3 +556,5 @@ TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                     DynamicAny::DynAny::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index db9b893ec58..89c96f90350 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNANY_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 
 #if defined (_MSC_VER)
@@ -30,6 +31,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynAny_i
  *
@@ -119,6 +122,8 @@ private:
   TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index e7dc61d55c5..d45269d130e 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynArray_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynArray_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny,
            DynArray_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynArray_i::TAO_DynArray_i (void)
 {
@@ -659,3 +659,5 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
             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 d8b6120e9cd..8e28d989cae 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNARRAY_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -31,6 +32,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynArray_i
  *
@@ -159,6 +162,8 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 15680111545..c2f82a05cca 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,14 +1,13 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynCommon.h"
-#include "DynAnyFactory.h"
-#include "DynAny_i.h"
-#include "DynArray_i.h"
-#include "DynEnum_i.h"
-#include "DynSequence_i.h"
-#include "DynStruct_i.h"
-#include "DynUnion_i.h"
+#include "tao/DynamicAny/DynCommon.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
+#include "tao/DynamicAny/DynAny_i.h"
+#include "tao/DynamicAny/DynArray_i.h"
+#include "tao/DynamicAny/DynEnum_i.h"
+#include "tao/DynamicAny/DynSequence_i.h"
+#include "tao/DynamicAny/DynStruct_i.h"
+#include "tao/DynamicAny/DynUnion_i.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
@@ -20,6 +19,8 @@ ACE_RCSID (DynamicAny,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DynCommon::TAO_DynCommon (void)
 {
 }
@@ -1849,3 +1850,5 @@ TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
   return TAO_DynAnyFactory::strip_alias (tc
                                          ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 60a15b01d91..dccc16e617a 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_DYNCOMMON_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynCommon
  *
@@ -546,6 +548,8 @@ private:
       ));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 7db76b721af..d575d5e911a 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "DynEnum_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynEnum_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
@@ -12,6 +12,7 @@ ACE_RCSID (DynamicAny,
            DynEnum_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynEnum_i::TAO_DynEnum_i (void)
 {
@@ -344,3 +345,5 @@ TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                     DynamicAny::DynAny::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 57c68a2f69f..6732653721e 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNENUM_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -31,6 +32,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynEnum_i
  *
@@ -150,6 +153,8 @@ private:
   CORBA::ULong value_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 2e9d1b7c352..1394204164e 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynSequence_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynSequence_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny,
            DynSequence_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynSequence_i::TAO_DynSequence_i (void)
 {
@@ -829,3 +829,5 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
             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 4c0b4f8880a..e9763e95e5f 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNSEQUENCE_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -31,6 +32,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynSequence_i
  *
@@ -172,6 +175,8 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 9da0b4d001f..5073f7796e6 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynStruct_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynStruct_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -12,6 +11,8 @@ ACE_RCSID (DynamicAny,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DynStruct_i::TAO_DynStruct_i (void)
 {
 }
@@ -819,3 +820,5 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
             this->da_members_[index].in ()
           );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 9301e632a5e..62e9ecf7e1f 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNSTRUCT_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -31,6 +32,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynStruct_i
  *
@@ -179,6 +182,8 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 26e98dc7d0b..60745e23849 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#include "DynUnion_i.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynUnion_i.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -11,6 +10,7 @@ ACE_RCSID (DynamicAny,
            DynUnion_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynUnion_i::TAO_DynUnion_i (void)
 {
@@ -1121,3 +1121,5 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
       return 0;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 3052ca6167e..c7aa9c1377e 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -16,13 +17,13 @@
 #define TAO_DYNUNION_I_H
 #include /**/ "ace/pre.h"
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DynCommon.h"
+#include "tao/DynamicAny/DynCommon.h"
 #include "tao/LocalObject.h"
 
 #if defined (_MSC_VER)
@@ -30,6 +31,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_DynUnion_i
  *
@@ -208,6 +211,8 @@ private:
   CORBA::ULong member_slot_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 6601550c40d..2bf234a3a27 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
  *  @file    DynamicAny.cpp
@@ -11,11 +9,13 @@
 //=============================================================================
 
 
-#include "DynamicAny.h"
-#include "DynAnyFactory.h"
+#include "tao/DynamicAny/DynamicAny.h"
+#include "tao/DynamicAny/DynAnyFactory.h"
 
 ACE_RCSID(DynamicAny, DynamicAny, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
 {
 }
@@ -40,6 +40,8 @@ TAO_DynamicAny_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader,
                        ACE_TEXT ("DynamicAny_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 198439dc114..652f52939f9 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,10 +15,10 @@
 #define TAO_DYNAMICANY_H
 #include /**/ "ace/pre.h"
 
-#include "dynamicany_export.h"
+#include "tao/DynamicAny/dynamicany_export.h"
 
 #define TAO_DYNAMICANY_SAFE_INCLUDE
-#include "DynamicAnyC.h"
+#include "tao/DynamicAny/DynamicAnyC.h"
 #undef TAO_DYNAMICANY_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -29,6 +28,8 @@
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader
 {
 public:
@@ -46,11 +47,13 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader)
-ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader)
-
 static int
 TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader)
+ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DYNAMICANY_H */
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 1a6db982993..1a8fe09cc21 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file DynamicAny.pidl
  *
@@ -25,6 +27,8 @@
  *          -Wb,export_include=dynamicany_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          DynamicAny.pidl
  *
  * after the file is generated a patch must be applied.  The patch
@@ -48,7 +52,7 @@
 
 #pragma prefix "omg.org"
 
-#include <Typecode_types.pidl>
+#include "tao/Typecode_types.pidl"
 
 module DynamicAny {
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index ba64e06d5b0..526509e6223 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "DynamicAny.h"
+#include "tao/DynamicAny/DynamicAny.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +66,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::release (
     DynamicAny::DynAny_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynAny_ptr
@@ -82,7 +84,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
@@ -108,7 +110,7 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
 DynamicAny::DynAny::InvalidValue&
 DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -166,7 +168,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
@@ -192,7 +194,7 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
 DynamicAny::DynAny::TypeMismatch&
 DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -266,10 +268,10 @@ DynamicAny::DynAny::_narrow (
     {
       return DynAny::_nil ();
     }
-  
+
   DynAny_ptr proxy =
     dynamic_cast<DynAny_ptr> (_tao_objref);
-  
+
   return DynAny::_duplicate (proxy);
 }
 
@@ -283,28 +285,28 @@ DynamicAny::DynAny::_unchecked_narrow (
     {
       return DynAny::_nil ();
     }
-  
+
   DynAny_ptr proxy =
     dynamic_cast<DynAny_ptr> (_tao_objref);
-  
+
   return DynAny::_duplicate (proxy);
 }
 
 DynamicAny::DynAny_ptr
 DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynAny::_tao_release (DynAny_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -365,7 +367,7 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::release (
     DynamicAny::DynFixed_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynFixed_ptr
@@ -399,10 +401,10 @@ DynamicAny::DynFixed::_narrow (
     {
       return DynFixed::_nil ();
     }
-  
+
   DynFixed_ptr proxy =
     dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
+
   return DynFixed::_duplicate (proxy);
 }
 
@@ -416,28 +418,28 @@ DynamicAny::DynFixed::_unchecked_narrow (
     {
       return DynFixed::_nil ();
     }
-  
+
   DynFixed_ptr proxy =
     dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
+
   return DynFixed::_duplicate (proxy);
 }
 
 DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynFixed::_tao_release (DynFixed_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -502,7 +504,7 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::release (
     DynamicAny::DynEnum_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynEnum_ptr
@@ -536,10 +538,10 @@ DynamicAny::DynEnum::_narrow (
     {
       return DynEnum::_nil ();
     }
-  
+
   DynEnum_ptr proxy =
     dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
+
   return DynEnum::_duplicate (proxy);
 }
 
@@ -553,28 +555,28 @@ DynamicAny::DynEnum::_unchecked_narrow (
     {
       return DynEnum::_nil ();
     }
-  
+
   DynEnum_ptr proxy =
     dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
+
   return DynEnum::_duplicate (proxy);
 }
 
 DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynEnum::_tao_release (DynEnum_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -621,12 +623,12 @@ DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
@@ -638,7 +640,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 DynamicAny::NameValuePairSeq::NameValuePairSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (max)
@@ -650,7 +652,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (
     DynamicAny::NameValuePair * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (max, length, buffer, release)
@@ -659,7 +661,7 @@ DynamicAny::NameValuePairSeq::NameValuePairSeq (
 DynamicAny::NameValuePairSeq::NameValuePairSeq (
     const NameValuePairSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameValuePair
       >
     (seq)
@@ -670,12 +672,12 @@ DynamicAny::NameValuePairSeq::~NameValuePairSeq (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
@@ -687,7 +689,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (max)
@@ -699,7 +701,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     DynamicAny::NameDynAnyPair * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (max, length, buffer, release)
@@ -708,7 +710,7 @@ DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     const NameDynAnyPairSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         DynamicAny::NameDynAnyPair
       >
     (seq)
@@ -737,7 +739,7 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::release (
     DynamicAny::DynStruct_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynStruct_ptr
@@ -771,10 +773,10 @@ DynamicAny::DynStruct::_narrow (
     {
       return DynStruct::_nil ();
     }
-  
+
   DynStruct_ptr proxy =
     dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
+
   return DynStruct::_duplicate (proxy);
 }
 
@@ -788,28 +790,28 @@ DynamicAny::DynStruct::_unchecked_narrow (
     {
       return DynStruct::_nil ();
     }
-  
+
   DynStruct_ptr proxy =
     dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
+
   return DynStruct::_duplicate (proxy);
 }
 
 DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynStruct::_tao_release (DynStruct_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -874,7 +876,7 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::release (
     DynamicAny::DynUnion_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynUnion_ptr
@@ -908,10 +910,10 @@ DynamicAny::DynUnion::_narrow (
     {
       return DynUnion::_nil ();
     }
-  
+
   DynUnion_ptr proxy =
     dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
+
   return DynUnion::_duplicate (proxy);
 }
 
@@ -925,28 +927,28 @@ DynamicAny::DynUnion::_unchecked_narrow (
     {
       return DynUnion::_nil ();
     }
-  
+
   DynUnion_ptr proxy =
     dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
+
   return DynUnion::_duplicate (proxy);
 }
 
 DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynUnion::_tao_release (DynUnion_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -993,7 +995,7 @@ DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_ANYSEQ_CS_)
@@ -1005,7 +1007,7 @@ DynamicAny::AnySeq::AnySeq (void)
 DynamicAny::AnySeq::AnySeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max)
@@ -1017,7 +1019,7 @@ DynamicAny::AnySeq::AnySeq (
     CORBA::Any * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (max, length, buffer, release)
@@ -1026,7 +1028,7 @@ DynamicAny::AnySeq::AnySeq (
 DynamicAny::AnySeq::AnySeq (
     const AnySeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Any
       >
     (seq)
@@ -1037,7 +1039,7 @@ DynamicAny::AnySeq::~AnySeq (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
@@ -1049,7 +1051,7 @@ DynamicAny::DynAnySeq::DynAnySeq (void)
 DynamicAny::DynAnySeq::DynAnySeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1062,7 +1064,7 @@ DynamicAny::DynAnySeq::DynAnySeq (
     DynamicAny::DynAny_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1072,7 +1074,7 @@ DynamicAny::DynAnySeq::DynAnySeq (
 DynamicAny::DynAnySeq::DynAnySeq (
     const DynAnySeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         DynamicAny::DynAny,
         DynamicAny::DynAny_var
       >
@@ -1102,7 +1104,7 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::release (
     DynamicAny::DynSequence_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynSequence_ptr
@@ -1136,10 +1138,10 @@ DynamicAny::DynSequence::_narrow (
     {
       return DynSequence::_nil ();
     }
-  
+
   DynSequence_ptr proxy =
     dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
+
   return DynSequence::_duplicate (proxy);
 }
 
@@ -1153,28 +1155,28 @@ DynamicAny::DynSequence::_unchecked_narrow (
     {
       return DynSequence::_nil ();
     }
-  
+
   DynSequence_ptr proxy =
     dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
+
   return DynSequence::_duplicate (proxy);
 }
 
 DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynSequence::_tao_release (DynSequence_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1239,7 +1241,7 @@ TAO::Objref_Traits<DynamicAny::DynArray>::release (
     DynamicAny::DynArray_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynArray_ptr
@@ -1273,10 +1275,10 @@ DynamicAny::DynArray::_narrow (
     {
       return DynArray::_nil ();
     }
-  
+
   DynArray_ptr proxy =
     dynamic_cast<DynArray_ptr> (_tao_objref);
-  
+
   return DynArray::_duplicate (proxy);
 }
 
@@ -1290,28 +1292,28 @@ DynamicAny::DynArray::_unchecked_narrow (
     {
       return DynArray::_nil ();
     }
-  
+
   DynArray_ptr proxy =
     dynamic_cast<DynArray_ptr> (_tao_objref);
-  
+
   return DynArray::_duplicate (proxy);
 }
 
 DynamicAny::DynArray_ptr
 DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynArray::_tao_release (DynArray_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1376,7 +1378,7 @@ TAO::Objref_Traits<DynamicAny::DynValue>::release (
     DynamicAny::DynValue_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynValue_ptr
@@ -1410,10 +1412,10 @@ DynamicAny::DynValue::_narrow (
     {
       return DynValue::_nil ();
     }
-  
+
   DynValue_ptr proxy =
     dynamic_cast<DynValue_ptr> (_tao_objref);
-  
+
   return DynValue::_duplicate (proxy);
 }
 
@@ -1427,28 +1429,28 @@ DynamicAny::DynValue::_unchecked_narrow (
     {
       return DynValue::_nil ();
     }
-  
+
   DynValue_ptr proxy =
     dynamic_cast<DynValue_ptr> (_tao_objref);
-  
+
   return DynValue::_duplicate (proxy);
 }
 
 DynamicAny::DynValue_ptr
 DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynValue::_tao_release (DynValue_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1513,7 +1515,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
     DynamicAny::DynAnyFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 DynamicAny::DynAnyFactory_ptr
@@ -1531,7 +1533,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
@@ -1557,7 +1559,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
 DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1631,10 +1633,10 @@ DynamicAny::DynAnyFactory::_narrow (
     {
       return DynAnyFactory::_nil ();
     }
-  
+
   DynAnyFactory_ptr proxy =
     dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
+
   return DynAnyFactory::_duplicate (proxy);
 }
 
@@ -1648,28 +1650,28 @@ DynamicAny::DynAnyFactory::_unchecked_narrow (
     {
       return DynAnyFactory::_nil ();
     }
-  
+
   DynAnyFactory_ptr proxy =
     dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
+
   return DynAnyFactory::_duplicate (proxy);
 }
 
 DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 DynamicAny::DynAnyFactory::_tao_release (DynAnyFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1746,22 +1748,7 @@ CORBA::Boolean operator<< (
     const DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -1769,40 +1756,7 @@ CORBA::Boolean operator>> (
     DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
@@ -1818,22 +1772,7 @@ CORBA::Boolean operator<< (
     const DynamicAny::AnySeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -1841,40 +1780,9 @@ CORBA::Boolean operator>> (
     DynamicAny::AnySeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index f78ad947472..b3830befdfe 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -44,7 +44,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "dynamicany_export.h"
+#include "tao/DynamicAny/dynamicany_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -77,6 +77,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace DynamicAny
 {
 
@@ -1142,7 +1144,7 @@ namespace DynamicAny
     typedef NameValuePair_var _var_type;
 
 
-    TAO_String_Manager id;
+    TAO::String_Manager id;
     CORBA::Any value;
   };
 
@@ -1156,22 +1158,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        NameValuePairSeq,
-        NameValuePair
+        NameValuePairSeq
       >
     NameValuePairSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        NameValuePairSeq,
-        NameValuePairSeq_var,
-        NameValuePair
+        NameValuePairSeq
       >
     NameValuePairSeq_out;
 
   class TAO_DynamicAny_Export NameValuePairSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             NameValuePair
           >
   {
@@ -1182,7 +1181,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         NameValuePair* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
@@ -1218,7 +1217,7 @@ namespace DynamicAny
     typedef NameDynAnyPair_var _var_type;
 
 
-    TAO_String_Manager id;
+    TAO::String_Manager id;
     DynamicAny::DynAny_var value;
   };
 
@@ -1232,22 +1231,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPair
+        NameDynAnyPairSeq
       >
     NameDynAnyPairSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPairSeq_var,
-        NameDynAnyPair
+        NameDynAnyPairSeq
       >
     NameDynAnyPairSeq_out;
 
   class TAO_DynamicAny_Export NameDynAnyPairSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             NameDynAnyPair
           >
   {
@@ -1258,7 +1254,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         NameDynAnyPair* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
@@ -1613,22 +1609,19 @@ namespace DynamicAny
 
   typedef
     TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
+        AnySeq
       >
     AnySeq_out;
 
   class TAO_DynamicAny_Export AnySeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Any
           >
   {
@@ -1639,7 +1632,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::Any* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
@@ -1658,29 +1651,20 @@ namespace DynamicAny
   class DynAnySeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        DynAnySeq,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
+    TAO_VarSeq_Var_T<
+        DynAnySeq
       >
     DynAnySeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        DynAnySeq,
-        DynAnySeq_var,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
+    TAO_Seq_Out_T<
+        DynAnySeq
       >
     DynAnySeq_out;
 
   class TAO_DynamicAny_Export DynAnySeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             DynAny,
             DynAny_var
           >
@@ -1692,7 +1676,7 @@ namespace DynamicAny
         CORBA::ULong max,
         CORBA::ULong length,
         DynAny_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
@@ -2532,6 +2516,8 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 2e47f392f5f..3edab19588b 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -1,4 +1,4 @@
-#include "Context.h"
+#include "tao/DynamicInterface/Context.h"
 
 ACE_RCSID (DynamicInterface,
            Context,
@@ -12,9 +12,10 @@ ACE_RCSID (DynamicInterface,
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Context.inl"
+# include "tao/DynamicInterface/Context.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Context::Context (void)
   : refcount_ (1)
@@ -199,4 +200,4 @@ CORBA::ContextList::_decr_refcnt (void)
     }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index de3f12de654..9f58f19cb4b 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 //=============================================================================
@@ -18,13 +19,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DII_CORBA_methods.h"
+#include "tao/DynamicInterface/DII_CORBA_methods.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
 #include "tao/Pseudo_VarOut_T.h"
@@ -43,6 +44,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef ULong Flags;
@@ -193,8 +196,10 @@ namespace CORBA
   };
 } // End CORBA namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Context.inl"
+# include "tao/DynamicInterface/Context.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index 1542333d043..87c338e31e0 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 CORBA::release (CORBA::Context_ptr x)
@@ -91,3 +93,5 @@ CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x)
 
   return x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 31205aa8b6a..d72c4f43420 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "DII_Arguments.h"
+#include "tao/DynamicInterface/DII_Arguments.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
@@ -14,9 +14,11 @@ ACE_RCSID (DynamicInterface,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "DII_Arguments.inl"
+# include "tao/DynamicInterface/DII_Arguments.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   CORBA::Boolean
@@ -140,3 +142,5 @@ namespace TAO
       }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index cf681244b44..6f362d7a099 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class NamedValue;
@@ -86,8 +88,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "DII_Arguments.inl"
+# include "tao/DynamicInterface/DII_Arguments.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl
index f2c11256c20..265bffbf7de 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ b/TAO/tao/DynamicInterface/DII_Arguments.inl
@@ -2,13 +2,16 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
   NamedValue_Argument::NamedValue_Argument (CORBA::NamedValue_ptr x)
     : x_ (x)
-      , byte_order_ (0)
-  {}
+    , byte_order_ (0)
+  {
+  }
 
   ACE_INLINE int
   NamedValue_Argument::byte_order (void) const
@@ -23,5 +26,8 @@ namespace TAO
                                     bool lazy_eval)
     : x_ (x)
       , lazy_evaluation_ (lazy_eval)
-  {}
+  {
+  }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_CORBA_methods.h b/TAO/tao/DynamicInterface/DII_CORBA_methods.h
index b45e4362296..aea9e098cbb 100644
--- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h
+++ b/TAO/tao/DynamicInterface/DII_CORBA_methods.h
@@ -31,6 +31,7 @@
 
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -60,6 +61,8 @@ namespace CORBA
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_DII_CORBA_METHODS_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index abb404acba0..6a75d25ad6a 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -3,12 +3,12 @@
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 
-#include "DII_Invocation.h"
-#include "Unknown_User_Exception.h"
-#include "DII_Arguments.h"
-#include "ExceptionList.h"
-#include "Request.h"
-#include "DII_Reply_Dispatcher.h"
+#include "tao/DynamicInterface/DII_Invocation.h"
+#include "tao/DynamicInterface/Unknown_User_Exception.h"
+#include "tao/DynamicInterface/DII_Arguments.h"
+#include "tao/DynamicInterface/ExceptionList.h"
+#include "tao/DynamicInterface/Request.h"
+#include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
 
 #include "tao/operation_details.h"
 #include "tao/Invocation_Utils.h"
@@ -27,6 +27,8 @@ ACE_RCSID (DynamicInterface,
            DII_Invocation,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   DII_Invocation::DII_Invocation (CORBA::Object_ptr otarget,
@@ -228,3 +230,5 @@ namespace TAO
         ACE_ENV_ARG_PARAMETER);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index f632beb75c0..ba3a5a6be66 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,9 +16,10 @@
 
 #ifndef TAO_DII_INVOCATION_H
 #define TAO_DII_INVOCATION_H
+
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -27,6 +28,8 @@
 #include "tao/Synch_Invocation.h"
 #include "tao/Messaging/Asynch_Invocation.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_DII_Deferred_Reply_Dispatcher;
 
 namespace Dynamic
@@ -80,8 +83,8 @@ namespace TAO
   /*
    *
    */
-  class TAO_DynamicInterface_Export DII_Deferred_Invocation :
-    public Asynch_Remote_Invocation
+  class TAO_DynamicInterface_Export DII_Deferred_Invocation
+    : public Asynch_Remote_Invocation
   {
   public:
     friend class DII_Deferred_Invocation_Adapter;
@@ -112,5 +115,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /* TAO_ASYNCH_INVOCATION_H */
+
+#endif /* TAO_DII_INVOCATION_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index cadf68653ce..1cf3a172f6a 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "DII_Invocation_Adapter.h"
-#include "DII_Invocation.h"
-#include "DII_Reply_Dispatcher.h"
+#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
+#include "tao/DynamicInterface/DII_Invocation.h"
+#include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
 
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
@@ -9,7 +9,7 @@
 #include "tao/Transport.h"
 #include "tao/Transport.h"
 #include "tao/Pluggable_Messaging.h"
-#include "Request.h"
+#include "tao/DynamicInterface/Request.h"
 
 #include "ace/os_include/os_errno.h"
 
@@ -18,6 +18,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target,
@@ -83,8 +85,15 @@ namespace TAO
         effective_target =
           synch.steal_forwarded_reference ();
 
+#if TAO_HAS_INTERCEPTORS == 1
+        const CORBA::Boolean permanent_forward =
+            (synch.reply_status() == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM);
+#else
+        const CORBA::Boolean permanent_forward = false;
+#endif
         this->object_forwarded (effective_target,
-                                r.stub ()
+                                r.stub (),
+                                permanent_forward
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -181,3 +190,5 @@ namespace TAO
     return status;
   }
 } // 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 749029a23e0..888601f9793 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -22,9 +22,14 @@
 
 #include "tao/Invocation_Adapter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Operation_Details;
 class TAO_Stub;
-class ACE_Time_Value;
 class TAO_ORB_Core;
 class TAO_DII_Deferred_Reply_Dispatcher;
 namespace  CORBA
@@ -109,10 +114,10 @@ namespace TAO
   private:
 
     /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void))
+    DII_Invocation_Adapter (void);
 
-    ACE_UNIMPLEMENTED_FUNC (
-        DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &))
+    DII_Invocation_Adapter (const DII_Invocation_Adapter &);
+    DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &);
   };
 
   /**
@@ -154,10 +159,11 @@ namespace TAO
     TAO_DII_Deferred_Reply_Dispatcher *rd_;
 
     /// Cache the orb_core
-    TAO_ORB_Core *orb_core_;
+    TAO_ORB_Core * const orb_core_;
   };
 } // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index f835b4eca4c..877570d611a 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "DII_Reply_Dispatcher.h"
-#include "Request.h"
+#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"
@@ -13,8 +13,7 @@ ACE_RCSID(DynamicInterface,
           "$Id$")
 
 
-
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
 TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
@@ -144,3 +143,5 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
 
   (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 8c1719fbec3..cb450106c5d 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 #include "tao/orbconf.h"
 #include "tao/Asynch_Reply_Dispatcher_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Request;
@@ -71,6 +73,8 @@ private:
   const CORBA::Request_ptr req_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index ce379c1a689..a23c6c4e06e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "Dynamic_Adapter_Impl.h"
+#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
 
 ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
 
-#include "Request.h"
-#include "Server_Request.h"
+#include "tao/DynamicInterface/Request.h"
+#include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/Exception.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void)
 {
 }
@@ -141,6 +143,8 @@ TAO_Dynamic_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_Dynamic_Adapter_Impl,
     ACE_TEXT ("Concrete_Dynamic_Adapter"),
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index d1b8ec6fc8e..9537488f66c 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -27,17 +28,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 #include "ace/Service_Config.h"
 
-  /**
-   * @class TAO_Dynamic_Adapter_Impl
-   *
-   * Concrete subclass of TAO_Dynamic_Adapter
-   * in the TAO library. This class helps implement various
-   * functions in the CORBA namespace relating to DII/DSI
-   * invocations.
-   */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class TAO_Dynamic_Adapter_Impl
+ *
+ * Concrete subclass of TAO_Dynamic_Adapter
+ * in the TAO library. This class helps implement various
+ * functions in the CORBA namespace relating to DII/DSI
+ * invocations.
+ */
 class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl
   : public TAO_Dynamic_Adapter
 {
@@ -85,12 +88,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
-
 static int
 TAO_Requires_Request_Factory_Initializer =
   TAO_Dynamic_Adapter_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index e8fa30d8e3f..6e09d9ff5fa 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,11 +1,11 @@
-#include "Dynamic_Implementation.h"
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
 
 ACE_RCSID (DynamicInterface,
            Dynamic_Implementation,
            "$Id$")
 
 
-#include "Server_Request.h"
+#include "tao/DynamicInterface/Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/IFR_Client_Adapter.h"
@@ -16,6 +16,8 @@ ACE_RCSID (DynamicInterface,
 #include "ace/OS_NS_string.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_DynamicImplementation::_is_a (const char *logical_type_id
                                   ACE_ENV_ARG_DECL)
@@ -185,7 +187,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
     }
   ACE_ENDTRY;
 
-  CORBA::release (dsi_request);
+  ::CORBA::release (dsi_request);
 }
 
 CORBA::RepositoryId
@@ -215,3 +217,5 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
                                    poa.in ()
                                    ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 7e7ed6c0c67..b9c17c21ea2 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
 // $Id$
 
 // ============================================================================
@@ -22,7 +23,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +31,8 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef char *RepositoryId;
@@ -103,6 +106,8 @@ private:
     );
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_DYNAMIC_IMPLEMENTATION_H */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index ca87c8eceaa..18de9aee9d0 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -1,4 +1,4 @@
-#include "ExceptionList.h"
+#include "tao/DynamicInterface/ExceptionList.h"
 
 ACE_RCSID (DynamicInterface,
            ExceptionList,
@@ -9,9 +9,10 @@ ACE_RCSID (DynamicInterface,
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ExceptionList.inl"
+# include "tao/DynamicInterface/ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ExceptionList::ExceptionList (CORBA::ULong len,
                                      CORBA::TypeCode_ptr *tc_list)
@@ -34,7 +35,7 @@ CORBA::ExceptionList::~ExceptionList (void)
           return;
         }
 
-      CORBA::release (*tc);
+      ::CORBA::release (*tc);
     }
 }
 
@@ -104,4 +105,4 @@ CORBA::ExceptionList::_decr_refcnt (void)
     }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 05a17aba67e..3fdca028ca5 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -24,13 +24,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "DII_CORBA_methods.h"
+#include "tao/DynamicInterface/DII_CORBA_methods.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/orbconf.h"
 #include "tao/Basic_Types.h"
@@ -47,6 +47,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var;
@@ -123,8 +125,10 @@ namespace CORBA
   };
 }  // End CORBA namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "ExceptionList.inl"
+# include "tao/DynamicInterface/ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
index fda8385bd58..d5fe85f4b65 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ b/TAO/tao/DynamicInterface/ExceptionList.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 CORBA::release (CORBA::ExceptionList_ptr x)
@@ -52,3 +54,5 @@ CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x)
 
   return x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index bc6317b1e53..9027cecb530 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "Request.h"
+#include "tao/DynamicInterface/Request.h"
 
 ACE_RCSID (DynamicInterface,
            Request,
            "$Id$")
 
-#include "DII_Invocation_Adapter.h"
-#include "DII_Arguments.h"
-#include "Context.h"
+#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
+#include "tao/DynamicInterface/DII_Arguments.h"
+#include "tao/DynamicInterface/Context.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/Object.h"
@@ -19,10 +19,12 @@ ACE_RCSID (DynamicInterface,
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Request.inl"
+# include "tao/DynamicInterface/Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Reference counting for DII Request object.
 
 CORBA::ULong
@@ -125,11 +127,11 @@ CORBA::Request::~Request (void)
 {
   ACE_ASSERT (refcount_ == 0);
 
-  CORBA::release (this->target_);
+  ::CORBA::release (this->target_);
   CORBA::string_free ((char*) this->opname_);
   this->opname_ = 0;
-  CORBA::release (this->args_);
-  CORBA::release (this->result_);
+  ::CORBA::release (this->args_);
+  ::CORBA::release (this->result_);
 }
 
 // The public DII interfaces:  normal and oneway calls.
@@ -346,6 +348,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
     case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
     case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
     case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
+    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM:
     default:
       // @@ (JP) Don't know what to do about any of these yet.
       ACE_ERROR ((LM_ERROR,
@@ -353,3 +356,4 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 32cf720983b..21b59006fad 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -27,24 +27,24 @@
 
 // To force execution of the static constructor
 // that registers the dynamic service object.
-#include "Dynamic_Adapter_Impl.h"
+#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
 
-#include "ExceptionList.h"
+#include "tao/DynamicInterface/ExceptionList.h"
 
 #include "tao/ORB.h"
 #include "tao/Environment.h"
-#include "tao/Sequence.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/NVList.h"
 
 #include "ace/SString.h"
 
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class NVList;
@@ -266,8 +266,10 @@ namespace CORBA
   };
 } // End CORBA namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Request.inl"
+# include "tao/DynamicInterface/Request.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 4b625ef61da..f540c8652d6 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 CORBA::release (CORBA::Request_ptr x)
@@ -196,3 +198,5 @@ CORBA::Request::response_received (void)
 
   return this->response_received_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 6628d52e01d..5582886beee 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -2,7 +2,7 @@
 
 // Implementation of the Dynamic Server Skeleton Interface.
 
-#include "Server_Request.h"
+#include "tao/DynamicInterface/Server_Request.h"
 
 ACE_RCSID (DynamicInterface,
            Server_Request,
@@ -16,9 +16,11 @@ ACE_RCSID (DynamicInterface,
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Server_Request.inl"
+# include "tao/DynamicInterface/Server_Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Reference counting for DSI ServerRequest object.
 
 CORBA::ULong
@@ -70,7 +72,7 @@ CORBA::ServerRequest::~ServerRequest (void)
 {
   if (this->params_ != 0)
     {
-      CORBA::release (this->params_);
+      ::CORBA::release (this->params_);
     }
 
   delete this->retval_;
@@ -238,3 +240,4 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
   this->orb_server_request_.tao_send_reply ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 2db2bed43c8..288c43761a3 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -24,7 +24,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Context.h"
+#include "tao/DynamicInterface/Context.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +32,7 @@
 
 // To force execution of the static constructor
 // that registers the dynamic service object.
-#include "Dynamic_Adapter_Impl.h"
+#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
@@ -42,6 +42,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ServerRequest;
@@ -172,8 +174,10 @@ namespace CORBA
   };
 } // End CORBA namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Server_Request.inl"
+# include "tao/DynamicInterface/Server_Request.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
index 4eca4ba2639..b8e4bf6099f 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 CORBA::release (CORBA::ServerRequest_ptr x)
@@ -80,3 +82,5 @@ CORBA::ServerRequest::_tao_server_request (void)
 {
   return this->orb_server_request_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index bcc01200d6a..81d9935832f 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Unknown_User_Exception.h"
+#include "tao/DynamicInterface/Unknown_User_Exception.h"
 
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/Environment.h"
@@ -18,6 +18,7 @@ ACE_RCSID (DynamicInterface,
            Unknown_User_Exception,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::UnknownUserException::UnknownUserException (void)
   : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
@@ -134,3 +135,5 @@ namespace CORBA
   CORBA::TypeCode_ptr const _tc_UnknownUserException =
     &TAO::TypeCode::tc_UnknownUserException;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 1976000db16..ab618060852 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "dynamicinterface_export.h"
+#include "tao/DynamicInterface/dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -40,6 +40,8 @@
 #  define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   /**
@@ -103,6 +105,7 @@ namespace CORBA
 
 } // End CORBA namespace.
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index b51e0008ca8..7e4a4ab96aa 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/Dynamic_Adapter.h"
 
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            Dynamic_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
index 970e28d5a54..af68465a486 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "tao/Basic_Types.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -108,6 +110,7 @@ public:
                                       ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_DYNAMIC_ADAPTER_H */
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index 319fc7d5d1a..75f61995341 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -6,13 +6,16 @@
 #include "tao/Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           Endpoint, 
+ACE_RCSID (tao,
+           Endpoint,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Endpoint::~TAO_Endpoint (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 //@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index b9ac5ef5a45..b762595ef58 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -27,6 +27,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  * Includes and forward decls for specializing TAO's
  * endpoint implementation.
@@ -123,7 +125,7 @@ protected:
 
   /// IOP tag, identifying the protocol for which this endpoint
   /// contains addressing info.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
 
   /**
    * CORBA priority of the acceptor this Endpoint is representing.
@@ -135,8 +137,8 @@ protected:
 private:
 
   /// Endpoints should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&))
+  TAO_Endpoint (const TAO_Endpoint&);
+  void operator= (const TAO_Endpoint&);
 
   /*
    * Addition of private members from derived class.
@@ -147,6 +149,8 @@ private:
 
 //@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Endpoint.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Endpoint.i b/TAO/tao/Endpoint.i
index 10d7d86325b..ab570490899 100644
--- a/TAO/tao/Endpoint.i
+++ b/TAO/tao/Endpoint.i
@@ -1,14 +1,17 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Endpoint::TAO_Endpoint (CORBA::ULong tag,
                             CORBA::Short priority)
   : addr_lookup_lock_ ()
-  // @@Would be a tragedy if the hash value of this endpoint is 0, in
-  // which  case this optimizaton wouldn't work. We can get around
-  // that using a bool. But we don't want to increase the runtime
-  // memory
+  // @@ Would be a tragedy if the hash value of this endpoint is 0, in
+  //    which case this optimizaton wouldn't work. We can get around
+  //    that using a bool. But we don't want to increase the runtime
+  //    memory.
   , hash_val_ (0)
   , tag_ (tag)
   , priority_ (priority)
@@ -33,3 +36,5 @@ TAO_Endpoint::priority (CORBA::Short p)
 {
   this->priority_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp
index 9e97eb8b282..6fc44b4efcc 100644
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Endpoint_Selector_Factory.cpp
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            Endpoint_Selector_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
index 39540be51c4..c3364874813 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,15 +18,18 @@
 #define TAO_ENDPOINT_SELECTOR_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
 
-#include "tao/TAO_Export.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -71,5 +74,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_ENDPOINT_SELECTOR_FACTORY_H */
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 6938ac7259e..a8c13eaa997 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -1,7 +1,7 @@
-#include "Environment.h"
-#include "ORB_Core.h"
-#include "SystemException.h"
-#include "default_environment.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
+#include "tao/default_environment.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Environment::Environment (void)
   : exception_ (0)
   , previous_ (0)
@@ -207,3 +209,4 @@ CORBA::Environment::print_exception (const char *info,
                 ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_TO_TCHAR_IN (info)));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index 5446f342097..cfcde246122 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -32,6 +32,8 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/default_environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 namespace CORBA
@@ -148,6 +150,8 @@ namespace CORBA
   };
 } // End CORBA namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
 # include "tao/Environment.i"
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index 3875aa4ac65..9a710cebffd 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -2,6 +2,9 @@
 //
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::Environment_ptr env)
@@ -42,3 +45,4 @@ CORBA::Environment::_nil (void)
   return static_cast <CORBA::Environment_ptr> (0);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 7e96e205456..e3e1deb2d4e 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Exception.h"
-#include "SystemException.h"
-#include "Environment.h"
-#include "ORB_Constants.h"
-#include "CORBA_String.h"
-#include "CDR.h"
-#include "debug.h"
+#include "tao/Exception.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Constants.h"
+#include "tao/CORBA_String.h"
+#include "tao/CDR.h"
+#include "tao/debug.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
@@ -25,7 +25,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-
 ACE_RCSID (tao,
            Exception,
            "$Id$")
@@ -33,6 +32,8 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Exception::Exception (const char * repository_id,
                              const char * local_name)
   : id_ (CORBA::string_dup (repository_id)),
@@ -137,3 +138,4 @@ namespace CORBA
 
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index a33da901c7b..430b6242339 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -39,14 +39,18 @@
 #include "ace/iosfwd.h"
 #include "ace/CORBA_macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
@@ -93,31 +97,24 @@ namespace CORBA
    * (in the @c TypeCode) that are generated by any OMG-IDL compiler
    * and available through the Interface Repository.  Think of it as a
    * "globally scoped" name distinguishing each exception.
-   *
-   * @todo According to the OMG CORBA C++ Mapping version 1.1, all
-   *       constructors, copy constructors and assignment operators
-   *       should be moved to "protected" section in class
-   *       declarations.  Since the current MS Visual C++ 6.0 compiler
-   *       will cause some problems to TAO's exception mechanism, we
-   *       defer doing this until we drop support for MSVC++ 6.
-   */
+    *
+    * @todo According to the OMG CORBA C++ Mapping version 1.1,
+    *       the copy constructors
+    *       should be moved to "protected" section in class
+    *       declarations.  Since the current MS Visual C++ 7.1 compiler
+    *       will cause some problems to TAO's exception mechanism, we
+    *       defer doing this until we drop support for MSVC++ 7.1. Maybe
+    *       there is another solution, have to test that later.
+    */
   class TAO_Export Exception
   {
   public:
+    /// Destructor.
+    virtual ~Exception (void);
 
     /// Copy constructor.
     Exception (const Exception &src);
 
-    /// Assignment operator.
-    Exception & operator = (const Exception & src);
-
-    /// Construct from a respository id.
-    Exception (const char *repository_id,
-               const char *local_name);
-
-    /// Destructor.
-    virtual ~Exception (void);
-
     // = To throw the exception (when using the standard mapping).
     virtual void _raise (void) const = 0;
 
@@ -191,6 +188,13 @@ namespace CORBA
     /// Default constructor.
     Exception (void);
 
+    /// Assignment operator.
+    Exception & operator = (const Exception & src);
+
+    /// Construct from a respository id.
+    Exception (const char *repository_id,
+               const char *local_name);
+
   private:
 
     /// Repository Id
@@ -213,19 +217,13 @@ namespace CORBA
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 } // End CORBA namespace
 
-/**
- * @class TAO_Exceptions
- *
- * @brief This class is a namespace for exception-related static data and
- * methods.
- */
-class TAO_Export TAO_Exceptions
+namespace TAO
 {
-public:
-
   /// Create a CORBA::SystemException given the interface repository ID.
-  static CORBA::SystemException *create_system_exception (const char *id);
-};
+  TAO_Export CORBA::SystemException *create_system_exception (const char *id);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Exception.i"
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index 4eadae1c5a2..2a77bfab959 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Exception *
 CORBA::Exception::_downcast (CORBA::Exception * x)
 {
@@ -13,3 +15,5 @@ CORBA::Exception::_downcast (CORBA::Exception const * x)
 {
   return x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h
index 49887b973ce..ff1794b49db 100644
--- a/TAO/tao/Exception_Data.h
+++ b/TAO/tao/Exception_Data.h
@@ -22,6 +22,8 @@
 
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class TypeCode;
@@ -60,5 +62,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_EXCEPTION_DATA_H*/
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index 46453d885d4..47145cfff9b 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -3,12 +3,14 @@
 #include "tao/Exclusive_TMS.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
-#include "Transport.h"
+#include "tao/Transport.h"
 
 ACE_RCSID (tao,
            Exclusive_TMS,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
   : TAO_Transport_Mux_Strategy (transport),
     request_id_generator_ (0),
@@ -28,7 +30,7 @@ TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
 CORBA::ULong
 TAO_Exclusive_TMS::request_id (void)
 {
-  this->request_id_generator_++;
+  ++this->request_id_generator_;
 
   // if TAO_Transport::bidirectional_flag_
   //  ==  1 --> originating side
@@ -45,7 +47,7 @@ TAO_Exclusive_TMS::request_id (void)
 
   if (TAO_debug_level > 4)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::request_id - <%d>\n"),
+                ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - <%d>\n"),
                 this->request_id_generator_));
 
   return this->request_id_generator_;
@@ -126,3 +128,4 @@ TAO_Exclusive_TMS::connection_closed (void)
     this->rd_->connection_closed ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h
index 6937340cb4c..84f659bcc68 100644
--- a/TAO/tao/Exclusive_TMS.h
+++ b/TAO/tao/Exclusive_TMS.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Pluggable_Reply_Params;
 
@@ -90,5 +91,7 @@ protected:
   // able to iterate on a use case - Bala.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* EXCLUSIVE_TMS_H */
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 8640cd7c09c..b297b933f86 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -1,16 +1,12 @@
 // $Id$
 
-#include "FILE_Parser.h"
+#include "tao/FILE_Parser.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 
 #include "ace/Read_Buffer.h"
 
-#if !defined(__ACE_INLINE__)
-#include "FILE_Parser.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Malloc_Base.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
@@ -22,11 +18,14 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+static const char file_prefix[] = "file:";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FILE_Parser::~TAO_FILE_Parser (void)
 {
 }
 
-static const char file_prefix[] = "file:";
 
 int
 TAO_FILE_Parser::match_prefix (const char *ior_string) const
@@ -79,6 +78,8 @@ TAO_FILE_Parser::parse_string (const char *ior,
   return object;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser,
                        ACE_TEXT ("FILE_Parser"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 480fb653d18..70ef8805d96 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +23,8 @@
 
 #include "tao/IOR_Parser.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_FILE_Parser
  *
@@ -32,11 +35,9 @@
  * read its contents and then interepret the file as an IOR (that
  * can be in any valid format).
  */
-class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser
+class TAO_FILE_Parser : public TAO_IOR_Parser
 {
 public:
-  /// Constructor
-  TAO_FILE_Parser (void);
 
   /// The destructor
   virtual ~TAO_FILE_Parser (void);
@@ -50,9 +51,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-# include "FILE_Parser.i"
-#endif /* __ACE_INLINE__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser)
diff --git a/TAO/tao/FILE_Parser.i b/TAO/tao/FILE_Parser.i
deleted file mode 100644
index c3ca97a6149..00000000000
--- a/TAO/tao/FILE_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_FILE_Parser::TAO_FILE_Parser (void)
-{
-}
diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp
index 847d5f00469..fedcae19465 100644
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ b/TAO/tao/Fault_Tolerance_Service.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            Fault_Tolerance_Service,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void)
 {
   delete this->ft_service_callback_;
@@ -60,3 +62,5 @@ TAO_Fault_Tolerance_Service::retention_id (void)
 
   return ++this->ft_object_retention_id_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index ff8fd90b6a1..39e2799754f 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -1,4 +1,5 @@
 //-*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Fault_Tolerance_Service.h
@@ -17,19 +18,24 @@
 #define TAO_FAULT_TOLERANCE_SERVICE_H
 
 #include /**/ "ace/pre.h"
-#include "ace/SString.h"
+
+#include "tao/TAO_Export.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 "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Callbacks;
 class TAO_ORB_Core;
-class ACE_Lock;
 
 /**
  * @class TAO_Fault_Tolerance_Service
@@ -93,6 +99,7 @@ private:
   // this.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Fault_Tolerance_Service.i"
diff --git a/TAO/tao/Fault_Tolerance_Service.i b/TAO/tao/Fault_Tolerance_Service.i
index f7f4fefd7d3..6fb2c4ca1a1 100644
--- a/TAO/tao/Fault_Tolerance_Service.i
+++ b/TAO/tao/Fault_Tolerance_Service.i
@@ -1,4 +1,9 @@
+// -*- C++ -*-
+//
 //$Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void)
   : ft_service_callback_ (0),
@@ -8,8 +13,6 @@ TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void)
 {
 }
 
-
-
 ACE_INLINE TAO_Service_Callbacks *
 TAO_Fault_Tolerance_Service::service_callback (void)
 {
@@ -28,3 +31,4 @@ TAO_Fault_Tolerance_Service::client_id (const char *id)
   this->ft_object_id_ = id;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 386cd9da395..762219e3b6f 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_C
-#define TAO_FIXED_ARRAY_ARGUMENT_T_C
+#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_CPP
+#define TAO_FIXED_ARRAY_ARGUMENT_T_CPP
 
 #include "tao/Fixed_Array_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Fixed_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Fixed_Array_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -148,4 +146,6 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index 2ff2f43976b..81c351a3db1 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -179,6 +181,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Fixed_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index de891a44bcd..66dd21e6f03 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -10,17 +12,17 @@ ACE_INLINE
 TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 In_Fixed_Array_Argument_T (const S_slice * x)
   : x_ (
-#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
-        // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
+#if (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
+        // @@ (OO) IMBCPP 6 can't handle the const_cast<> in the
         //         multi-dimensional array case so C-style
         //         "sledgehammer" cast instead (reinterpret_cast<>
         //         doesn't work either).  It's not clear if this is
         //         really the right thing to do but the code won't
-        //         compile with MSVC++ 6 without it.
+        //         compile without it.
         (S_slice *) x
 #else
         const_cast<S_slice *> (x)
-#endif  /* _MSC_VER <= 1200 */
+#endif  /* IBMCPP <= 600 */
         )
 {
 }
@@ -132,3 +134,5 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::r
 {
   return this->x_._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 60a2fe74a63..871c13f7341 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_FIXED_SIZE_ARGUMENT_T_C
-#define TAO_FIXED_SIZE_ARGUMENT_T_C
+#ifndef TAO_FIXED_SIZE_ARGUMENT_T_CPP
+#define TAO_FIXED_SIZE_ARGUMENT_T_CPP
 
 #include "tao/Fixed_Size_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Fixed_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Fixed_Size_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename Insert_Policy>
@@ -108,4 +106,6 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_FIXED_SIZE_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index e4bc7c3aa3b..a767b2e2f37 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -121,7 +123,7 @@ namespace TAO
   };
 
   /**
-   * @struct Basic_Tag
+   * @struct Fixed_Size_Tag
    *
    * @brief Struct for fixed size IDL type arguments id tag.
    *
@@ -152,6 +154,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Fixed_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
index bce99464476..bc747f119dc 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -93,3 +97,4 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void)
   return this->x_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp
index b0529d29a0e..ebdd37f545e 100644
--- a/TAO/tao/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource_Factory.cpp
@@ -1,18 +1,19 @@
 //$Id$
 
-#include "FlResource_Factory.h"
-#include "debug.h"
+#include "tao/FlResource_Factory.h"
+#include "tao/debug.h"
 #include "ace/FlReactor.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Factory,
            "$Id$");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-
-  FlResource_Factory::FlResource_Factory ():
-    reactor_impl_( 0 )
+  FlResource_Factory::FlResource_Factory (void)
+    : reactor_impl_( 0 )
   {
   }
 
@@ -34,3 +35,5 @@ namespace TAO
     return this->reactor_impl_;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h
index ab34c6ef503..c56d652005a 100644
--- a/TAO/tao/FlResource_Factory.h
+++ b/TAO/tao/FlResource_Factory.h
@@ -13,14 +13,18 @@
 #ifndef TAO_FLRESOURCE_FACTORY_H
 #define TAO_FLRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
-#include "ace/FlReactor.h"
+
 #include "tao/TAO_FlResource_Export.h"
-#include "tao/GUIResource_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/FlReactor.h"
+#include "tao/GUIResource_Factory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -51,5 +55,8 @@ namespace TAO
     ACE_FlReactor *reactor_impl_;
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_FLRESOURCE_FACTORY_H */
diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp
index 13f01c7bef4..c5dbe7131eb 100644
--- a/TAO/tao/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource_Loader.cpp
@@ -1,26 +1,29 @@
 //$Id$
-#include "FlResource_Loader.h"
-#include "ORB_Core.h"
-#include "FlResource_Factory.h"
+#include "tao/FlResource_Loader.h"
+#include "tao/ORB_Core.h"
+#include "tao/FlResource_Factory.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Loader,
            "$Id$");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-
-  FlResource_Loader::FlResource_Loader ()
+  FlResource_Loader::FlResource_Loader (void)
   {
     FlResource_Factory *tmp = 0;
 
     ACE_NEW (tmp,
              FlResource_Factory ());
 
-    TAO_ORB_Core::set_gui_resource_factory( tmp );
+    TAO_ORB_Core::set_gui_resource_factory (tmp);
   }
 
-  FlResource_Loader::~FlResource_Loader ()
+  FlResource_Loader::~FlResource_Loader (void)
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h
index c56c2c5a39f..feec4495f68 100644
--- a/TAO/tao/FlResource_Loader.h
+++ b/TAO/tao/FlResource_Loader.h
@@ -14,12 +14,17 @@
 #ifndef TAO_FLRESOURCE_LOADER_H
 #define TAO_FLRESOURCE_LOADER_H
 #include /**/ "ace/pre.h"
+
 #include "tao/TAO_FlResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -41,10 +46,14 @@ namespace TAO
   {
 
   public:
-    FlResource_Loader ( );
+    FlResource_Loader (void);
 
-    virtual ~FlResource_Loader ();
+    virtual ~FlResource_Loader (void);
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_FLRESOURCE_LOADER_H */
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
index 1a0ee031940..07ef18b5e7f 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          FloatSeq.pidl
  */
 
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index 311d83e4867..005a8f8663f 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "FloatSeqC.h"
+#include "tao/FloatSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_FLOATSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::FloatSeq::FloatSeq (void)
 CORBA::FloatSeq::FloatSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Float
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::FloatSeq::FloatSeq (
     ::CORBA::Float * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Float
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::FloatSeq::FloatSeq (
 CORBA::FloatSeq::FloatSeq (
     const FloatSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Float
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::FloatSeq::_tao_any_destructor (
     const CORBA::FloatSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_float_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::FloatSeq::_tao_any_destructor (
     CORBA::FloatSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_float_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index 09fa2f459a7..08a31f04fa0 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -52,38 +52,37 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_FLOATSEQ_CH_)
 #define _CORBA_FLOATSEQ_CH_
-  
+
   class FloatSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        FloatSeq,
-        CORBA::Float
+        FloatSeq
       >
     FloatSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        FloatSeq,
-        FloatSeq_var,
-        CORBA::Float
+        FloatSeq
       >
     FloatSeq_out;
-  
+
   class TAO_Export FloatSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Float
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     FloatSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::Float* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::Float* buffer,
+        ::CORBA::Boolean release = false
       );
     FloatSeq (const FloatSeq &);
     ~FloatSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef FloatSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
index 5d3e59a7e66..6d66ee99975 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -1,12 +1,16 @@
-// -*- C++ -*-
 // $Id$
 
-#include "Flushing_Strategy.h"
+#include "tao/Flushing_Strategy.h"
 
 ACE_RCSID (tao, 
            Flushing_Strategy, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 4c2cf07d43f..ead55aec8f2 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -21,7 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport;
 class TAO_Queued_Message;
 
@@ -67,6 +72,8 @@ public:
   virtual int flush_transport (TAO_Transport *transport) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 6dc8616bdb6..eb6e86ca8c4 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -19,6 +19,8 @@
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
+//          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
 //          GIOP.pidl
 //
 // ================================================================
@@ -26,7 +28,7 @@
 #ifndef TAO_GIOP_PIDL
 #define TAO_GIOP_PIDL
 
-#include "IOP_IOR.pidl"
+#include "tao/IOP_IOR.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index c969f09d9c0..daf21691185 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -29,18 +29,20 @@
 // be\be_codegen.cpp:288
 
 
-#include "GIOPC.h"
+#include "tao/GIOPC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "GIOPC.inl"
+#include "tao/GIOPC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -141,7 +143,7 @@ GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
 GIOP::TargetAddress::~TargetAddress (void)
 {
   // Finalize.
-  this->_reset (this->disc_, 1);
+  this->_reset ();
 }
 
 void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer)
@@ -159,7 +161,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
       return *this;
     }
 
-  this->_reset (u.disc_, 0);
+  this->_reset ();
   this->disc_ = u.disc_;
 
   switch (this->disc_)
@@ -220,7 +222,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
 }
 
 // Reset method to reset old values of a union.
-void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
+void GIOP::TargetAddress::_reset (void)
 {
   switch (this->disc_)
   {
@@ -385,3 +387,5 @@ CORBA::Boolean operator>> (
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index e85e137e6c0..f60c593fa81 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -57,6 +57,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -200,9 +202,9 @@ namespace GIOP
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:665
 
-    void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
-    const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
-    ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
+    void ior (const ::GIOP::IORAddressingInfo &);
+    const ::GIOP::IORAddressingInfo &ior (void) const;
+    ::GIOP::IORAddressingInfo &ior (void);
 
     // TAO_IDL - Generated from
     // be\be_visitor_union/union_ch.cpp:147
@@ -222,11 +224,11 @@ namespace GIOP
       IOP::TaggedProfile *profile_;
       // TAO_IDL - Generated from
       // be\be_visitor_union_branch/private_ch.cpp:526
-      ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
+      ::GIOP::IORAddressingInfo *ior_;
     } u_;
 
     // TAO extension - frees any allocated storage.
-    void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
+    void _reset (void);
   };
 
 #endif /* end #if !defined */
@@ -265,8 +267,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "GIOPC.inl"
+#include "tao/GIOPC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl
index a4780ad16c0..ae15806ea83 100644
--- a/TAO/tao/GIOPC.inl
+++ b/TAO/tao/GIOPC.inl
@@ -36,8 +36,10 @@
 // TAO_IDL - Generated from
 // be\be_visitor_union/discriminant_ci.cpp:164
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-void 
+void
 GIOP::TargetAddress::_default ()
 {
   this->disc_ = -32768;
@@ -68,7 +70,7 @@ void
 GIOP::TargetAddress::object_key (const CORBA::OctetSeq &val)
 {
   // Set the discriminant value.
-  this->_reset (0, 0);
+  this->_reset ();
   this->disc_ = 0;
   ACE_NEW (
       this->u_.object_key_,
@@ -101,7 +103,7 @@ void
 GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
 {
   // Set the discriminant value.
-  this->_reset (1, 0);
+  this->_reset ();
   this->disc_ = 1;
   ACE_NEW (
       this->u_.profile_,
@@ -134,7 +136,7 @@ void
 GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
 {
   // Set the discriminant value.
-  this->_reset (2, 0);
+  this->_reset ();
   this->disc_ = 2;
   ACE_NEW (
       this->u_.ior_,
@@ -157,3 +159,5 @@ GIOP::TargetAddress::ior (void)
 {
   return *this->u_.ior_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index aa0efbb8b97..8d266a30a21 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#include "GIOP_Message_Base.h"
-#include "operation_details.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "TAO_Server_Request.h"
-#include "GIOP_Message_Locate_Header.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "LF_Strategy.h"
-#include "Request_Dispatcher.h"
-#include "Codeset_Manager.h"
-#include "SystemException.h"
+#include "tao/GIOP_Message_Base.h"
+#include "tao/operation_details.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/GIOP_Message_Locate_Header.h"
+#include "tao/Transport.h"
+#include "tao/Transport_Mux_Strategy.h"
+#include "tao/LF_Strategy.h"
+#include "tao/Request_Dispatcher.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/SystemException.h"
 
 /*
  * Hook to add additional include files during specializations.
@@ -22,22 +22,27 @@ ACE_RCSID (tao,
            GIOP_Message_Base,
            "$Id$")
 
-TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
-                                              size_t /*input_cdr_size*/)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core * orb_core,
+                                              TAO_Transport * transport,
+                                              size_t /* input_cdr_size */)
   : orb_core_ (orb_core)
-    , message_state_ ()
-    , out_stream_ (this->buffer_,
-                   sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */
-                   TAO_ENCAP_BYTE_ORDER,
-                   orb_core->output_cdr_buffer_allocator (),
-                   orb_core->output_cdr_dblock_allocator (),
-                   orb_core->output_cdr_msgblock_allocator (),
-                   orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                   TAO_DEF_GIOP_MAJOR,
-                   TAO_DEF_GIOP_MINOR)
+  , message_state_ ()
+  , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport))
+  , out_stream_ (this->buffer_,
+                 sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */
+                 TAO_ENCAP_BYTE_ORDER,
+                 orb_core->output_cdr_buffer_allocator (),
+                 orb_core->output_cdr_dblock_allocator (),
+                 orb_core->output_cdr_msgblock_allocator (),
+                 orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+                 fragmentation_strategy_.get (),
+                 TAO_DEF_GIOP_MAJOR,
+                 TAO_DEF_GIOP_MINOR)
 {
 #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  ACE_OS::memset(buffer_, 0, sizeof (buffer_));
+  ACE_OS::memset (this->buffer_, 0, sizeof (buffer_));
 #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 }
 
@@ -196,7 +201,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
   ACE_TRY
     {
       // Now call the implementation for the rest of the header
-      int result =
+      int const result =
         generator_parser->write_reply_header (cdr,
                                               params
                                               ACE_ENV_ARG_PARAMETER);
@@ -216,7 +221,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
     {
       if (TAO_debug_level > 4)
         ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_GIOP_Message_Base::generate_reply_header");
+                             ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header"));
 
       return -1;
     }
@@ -225,12 +230,39 @@ TAO_GIOP_Message_Base::generate_reply_header (
   return 0;
 }
 
-
 int
-TAO_GIOP_Message_Base::read_message (TAO_Transport * /*transport*/,
-                                     int /*block */,
-                                     ACE_Time_Value * /*max_wait_time*/)
+TAO_GIOP_Message_Base::generate_fragment_header (TAO_OutputCDR & cdr,
+                                                 CORBA::ULong request_id)
 {
+  // Get a parser for us
+  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
+
+  CORBA::Octet major, minor;
+
+  cdr.get_version (major, minor);
+
+  // GIOP fragments are supported in GIOP 1.1 and better, but TAO only
+  // supports them in 1.2 or better since GIOP 1.1 fragments do not
+  // have a fragment message header.
+  if (major == 1 && minor < 2)
+    return -1;
+
+  // Get the state information that we need to use
+  this->set_state (major,
+                   minor,
+                   generator_parser);
+
+  // Write the GIOP header first
+  if (!this->write_protocol_header (TAO_GIOP_FRAGMENT, cdr)
+      || !generator_parser->write_fragment_header (cdr, request_id))
+    {
+      if (TAO_debug_level)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")));
+
+      return -1;
+    }
+
   return 0;
 }
 
@@ -238,11 +270,12 @@ int
 TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
 {
   // Ptr to first buffer.
-  char *buf = (char *) stream.buffer ();
+  char * buf = (char *) stream.buffer ();
+
+  this->set_giop_flags (stream);
 
   // Length of all buffers.
-  size_t total_len =
-    stream.total_length ();
+  size_t const total_len = stream.total_length ();
 
   // NOTE: Here would also be a fine place to calculate a digital
   // signature for the message and place it into a preallocated slot
@@ -251,7 +284,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
   // this particular environment and that isn't handled by the
   // networking infrastructure (e.g., IPSEC).
 
-  CORBA::ULong bodylen = static_cast <CORBA::ULong>
+  CORBA::ULong const bodylen = static_cast <CORBA::ULong>
                            (total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -307,6 +340,7 @@ TAO_GIOP_Message_Base::message_type (
 
     case TAO_GIOP_LOCATEREPLY:
       return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY;
+
     case TAO_GIOP_REPLY:
       return TAO_PLUGGABLE_MESSAGE_REPLY;
 
@@ -317,13 +351,19 @@ TAO_GIOP_Message_Base::message_type (
       return TAO_PLUGGABLE_MESSAGE_FRAGMENT;
 
     case TAO_GIOP_MESSAGERROR:
+      return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
+
     case TAO_GIOP_CANCELREQUEST:
-      // Does it happen?  why??
+      return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST;
+
     default:
+        if (TAO_debug_level > 0)
+          {
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("TAO (%P|%t) %N:%l        message_type : ")
                     ACE_TEXT ("wrong message.\n")));
     }
+    }
 
   return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
 }
@@ -331,31 +371,50 @@ TAO_GIOP_Message_Base::message_type (
 int
 TAO_GIOP_Message_Base::parse_incoming_messages (ACE_Message_Block &incoming)
 {
+  this->message_state_.reset ();
+
   return this->message_state_.parse_message_header (incoming);
 }
 
-ssize_t
-TAO_GIOP_Message_Base::missing_data (ACE_Message_Block &incoming)
+int
+TAO_GIOP_Message_Base::parse_next_message (ACE_Message_Block &incoming,
+                                           TAO_Queued_Data &qd,
+                                           size_t &mesg_length)
 {
-  // Actual message size including the header..
-  CORBA::ULong msg_size =
-    this->message_state_.message_size ();
-
-  size_t len = incoming.length ();
-
-  // If we have too many messages or if we have less than even a size
-  // of the GIOP header then ..
-  if (len > msg_size ||
-      len < TAO_GIOP_MESSAGE_HEADER_LEN)
+  if (incoming.length () < TAO_GIOP_MESSAGE_HEADER_LEN)
     {
-      return -1;
+      qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED;
+
+      return 0; /* incomplete header */
     }
-  else if (len == msg_size)
-     return 0;
+  else
+    {
+      TAO_GIOP_Message_State state;
 
-   return msg_size - len;
-}
+      if (state.parse_message_header (incoming) == -1)
+        {
+          return -1;
+        }
+
+      const size_t message_size = state.message_size (); /* Header + Payload */
+
+      if (message_size > incoming.length ())
+        {
+          qd.missing_data_ = message_size - incoming.length ();
+        }
+      else
+        {
+          qd.missing_data_ = 0;
+        }
+
+      /* init out-parameters */
+      this->init_queued_data (&qd, state);
+      mesg_length  = TAO_GIOP_MESSAGE_HEADER_LEN
+                   + state.payload_size ();
 
+      return 1; /* complete header */
+    }
+}
 
 int
 TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
@@ -365,15 +424,45 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
     {
       if (incoming.length () > 0)
         {
-          // Make a node which has a message block of the size of
-          // MESSAGE_HEADER_LEN.
-          qd =
-            this->make_queued_data (TAO_GIOP_MESSAGE_HEADER_LEN);
+          // Optimize memory usage, we dont know actual message size
+          // so far, but allocate enough space to hold small GIOP
+          // messages. This way we avoid expensive "grow" operation
+          // for small messages.
+          const size_t default_buf_size = ACE_CDR::DEFAULT_BUFSIZE;
+
+          // Make a node which has at least message block of the size
+          // of MESSAGE_HEADER_LEN.
+          const size_t buf_size = ace_max (TAO_GIOP_MESSAGE_HEADER_LEN,
+                                           default_buf_size);
+
+          // POST: buf_size >= TAO_GIOP_MESSAGE_HEADER_LEN
+
+          qd = this->make_queued_data (buf_size);
+
+          if (qd == 0)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR((LM_ERROR,
+                             ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ")
+                             ACE_TEXT ("out of memory\n")));
+                }
+              return -1;
+            }
 
           qd->msg_block_->copy (incoming.rd_ptr (),
                                 incoming.length ());
-          qd->missing_data_ = -1;
+
+          incoming.rd_ptr (incoming.length ()); // consume all available data
+
+          qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED;
+        }
+      else
+        {
+          // handle not initialized variables
+          qd = 0;  // reset
         }
+
       return 0;
     }
 
@@ -387,12 +476,26 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
 
   qd = this->make_queued_data (copying_len);
 
+  if (qd == 0)
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ")
+                      ACE_TEXT ("out of memory\n")));
+        }
+      return -1;
+    }
+
   if (copying_len > incoming.length ())
     {
       qd->missing_data_ = copying_len - incoming.length ();
-
       copying_len = incoming.length ();
     }
+  else
+    {
+      qd->missing_data_ = 0;
+    }
 
   qd->msg_block_->copy (incoming.rd_ptr (),
                         copying_len);
@@ -408,35 +511,71 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
                                          ACE_Message_Block &incoming)
 {
   // Look to see whether we had atleast parsed the GIOP header ...
-  if (qd->missing_data_ == -1)
+  if (qd->missing_data_ == TAO_MISSING_DATA_UNDEFINED)
     {
       // The data length that has been stuck in there during the last
       // read ....
-      size_t len =
+      size_t const len =
         qd->msg_block_->length ();
 
+      // paranoid check
+      if (len >= TAO_GIOP_MESSAGE_HEADER_LEN)
+        {
+          // inconsistency - this code should have parsed the header
+          // so far
+          return -1;
+        }
+
       // We know that we would have space for
       // TAO_GIOP_MESSAGE_HEADER_LEN here.  So copy that much of data
       // from the <incoming> into the message block in <qd>
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            TAO_GIOP_MESSAGE_HEADER_LEN - len);
+      const size_t available     = incoming.length ();
+      const size_t desired       = TAO_GIOP_MESSAGE_HEADER_LEN - len;
+      const size_t n_copy        = ace_min (available, desired);
+
+      // paranoid check, but would cause endless looping
+      if (n_copy == 0)
+        {
+          return -1;
+        }
+
+      if (qd->msg_block_->copy (incoming.rd_ptr (),
+                                n_copy) == -1)
+        {
+           return -1;
+        }
 
       // Move the rd_ptr () in the incoming message block..
-      incoming.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN - len);
+      incoming.rd_ptr (n_copy);
+
+      // verify sufficient data to parse GIOP header
+      if (qd->msg_block_->length () < TAO_GIOP_MESSAGE_HEADER_LEN)
+        {
+          return 0; /* continue */
+        }
 
       TAO_GIOP_Message_State state;
 
       // Parse the message header now...
       if (state.parse_message_header (*qd->msg_block_) == -1)
-        return -1;
-
-      // Now grow the message block so that we can copy the rest of
-      // the data...
-      if (qd->msg_block_->space () < state.message_size ())
         {
-          ACE_CDR::grow (qd->msg_block_,
-                         state.message_size ());
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::consolidate_node, ")
+                  ACE_TEXT ("error parsing header\n") ));
+            }
+          return -1;
         }
+      // Now grow the message block so that we can copy the rest of
+      // the data, the message_block must be able to hold complete message
+       if (ACE_CDR::grow (qd->msg_block_,
+                          state.message_size ()) == -1)  /* GIOP_Header + Payload */
+         {
+           // on mem-error get rid of context silently, try to avoid
+           // system calls that might allocate additional memory
+           return -1;
+         }
 
       // Copy the pay load..
       // Calculate the bytes that needs to be copied in the queue...
@@ -459,8 +598,11 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
       // ..now we are set to copy the right amount of data to the
       // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
+      if (qd->msg_block_->copy (incoming.rd_ptr (),
+                                copy_len) == -1)
+        {
+          return -1;
+        }
 
       // Set the <rd_ptr> of the <incoming>..
       incoming.rd_ptr (copy_len);
@@ -482,10 +624,19 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
           copy_len = incoming.length ();
         }
 
+      // paranoid check for  endless-event-looping
+      if (copy_len == 0)
+        {
+          return -1;
+        }
+
       // Copy the right amount of data in to the node...
       // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
+      if (qd->msg_block_->copy (incoming.rd_ptr (),
+                                copy_len) == -1)
+        {
+          return -1;
+        }
 
       // Set the <rd_ptr> of the <incoming>..
       qd->msg_block_->rd_ptr (copy_len);
@@ -495,16 +646,6 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
   return 0;
 }
 
-void
-TAO_GIOP_Message_Base::get_message_data (TAO_Queued_Data *qd)
-{
-  // Get the message information
-  this->init_queued_data (qd, this->message_state_);
-
-  // Reset the message_state
-  this->message_state_.reset ();
-}
-
 int
 TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
                                                 TAO_Queued_Data *qd)
@@ -544,12 +685,13 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
                         this->orb_core_->input_cdr_dblock_allocator (),
                         this->orb_core_->input_cdr_msgblock_allocator (),
                         this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
+                        this->fragmentation_strategy_.get (),
                         qd->major_version_,
                         qd->minor_version_);
 
   // Get the read and write positions before we steal data.
   size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
+  size_t const wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
   rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
 
   if (TAO_debug_level > 0)
@@ -642,7 +784,7 @@ TAO_GIOP_Message_Base::process_reply_message (
 
   // Get the read and write positions before we steal data.
   size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
+  size_t const wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
   rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
 
   if (TAO_debug_level > 0)
@@ -704,8 +846,8 @@ TAO_GIOP_Message_Base::process_reply_message (
       // every reply on this connection.
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, "
-                    "dispatch reply failed\n",
+                    ACE_TEXT ("TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, ")
+                    ACE_TEXT ("dispatch reply failed\n"),
                     params.transport_->id ()));
     }
 
@@ -738,7 +880,8 @@ TAO_GIOP_Message_Base::generate_exception_reply (
       // happened -> no hope, close connection.
 
       // Close the handle.
-      ACE_DEBUG ((LM_DEBUG,
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
                   ACE_TEXT ("generate_exception_reply ()\n")));
       return -1;
@@ -754,34 +897,36 @@ TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type type,
                                               TAO_OutputCDR &msg)
 {
   // Reset the message type
-  // Reset the message type
   msg.reset ();
 
   CORBA::Octet header[12] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50  // 'P'
-  };
+    {
+      // The following works on non-ASCII platforms, such as MVS (which
+      // uses EBCDIC).
+      0x47, // 'G'
+      0x49, // 'I'
+      0x4f, // 'O'
+      0x50  // 'P'
+    };
 
   CORBA::Octet major, minor = 0;
-  msg.get_version (major, minor);
+
+  (void) msg.get_version (major, minor);
 
   header[4] = major;
   header[5] = minor;
 
-  // We are putting the byte order. But at a later date if we support
-  // fragmentation and when we want to use the other 6 bits in this
-  // octet we can have a virtual function do this for us as the
-  // version info , Bala
-  header[6] = (TAO_ENCAP_BYTE_ORDER ^ msg.do_byte_swap ());
+  // "flags" octet, i.e. header[6] will be set up later when message
+  // is formatted by the transport.
+
+  header[7] = CORBA::Octet (type);  // Message type
 
-  header[7] = CORBA::Octet(type);
+  static ACE_CDR::ULong const header_size =
+    sizeof (header) / sizeof (header[0]);
 
-  static int header_size = sizeof (header) / sizeof (header[0]);
+  // Fragmentation should not occur at this point since there are only
+  // 12 bytes in the stream, and fragmentation may only occur when
+  // the stream length >= 16.
   msg.write_octet_array (header, header_size);
 
   return msg.good_bit ();
@@ -830,11 +975,11 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
       CORBA::Object_var forward_to;
 
 /*
- * Hook to specialize request processing within TAO 
+ * Hook to specialize request processing within TAO
  * This hook will be replaced by specialized request
  * processing implementation.
  */
-//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START 
+//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START
 
       // Do this before the reply is sent.
       this->orb_core_->request_dispatcher ()->dispatch (
@@ -848,15 +993,28 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
 
       if (!CORBA::is_nil (forward_to.in ()))
         {
+          const CORBA::Boolean permanent_forward_condition =
+              this->orb_core_->is_permanent_forward_condition
+              (forward_to.in (),
+               request.request_service_context ());
+
           // We should forward to another object...
           TAO_Pluggable_Reply_Params_Base reply_params;
           reply_params.request_id_ = request_id;
-          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
+          reply_params.reply_status_ =
+              permanent_forward_condition
+              ? TAO_GIOP_LOCATION_FORWARD_PERM
+              : TAO_GIOP_LOCATION_FORWARD;
           reply_params.svc_ctx_.length (0);
 
           // Send back the reply service context.
           reply_params.service_context_notowned (&request.reply_service_info ());
 
+          output.message_attributes (request_id,
+                                     0,
+                                     TAO_Transport::TAO_REPLY,
+                                     0);
+
           // Make the GIOP header and Reply header
           this->generate_reply_header (output,
                                        reply_params);
@@ -871,6 +1029,8 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
               return -1;
             }
 
+          output.more_fragments (false);
+
           int result = transport->send_message (output,
                                                 0,
                                                 TAO_Transport::TAO_REPLY);
@@ -1150,6 +1310,8 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport,
                                    request.request_id (),
                                    status_info);
 
+  output.more_fragments (false);
+
   // Send the message
   int result = transport->send_message (output,
                                         0,
@@ -1323,8 +1485,8 @@ TAO_GIOP_Message_Base::
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -"
-                    " connection already closed\n"));
+           ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -")
+           ACE_TEXT (" connection already closed\n")));
       return;
     }
 #endif
@@ -1345,14 +1507,14 @@ TAO_GIOP_Message_Base::
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) error closing connection %u, errno = %d\n",
-                    transport->id (), errno));
+           ACE_TEXT ("(%P|%t) error closing connection %u, errno = %d\n"),
+           transport->id (), errno));
     }
 
   transport->close_connection ();
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shut down transport, handle %d\n",
-              transport-> id ()));
+      ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"),
+      transport-> id ()));
 
 }
 
@@ -1389,6 +1551,8 @@ TAO_GIOP_Message_Base::send_reply_exception (
                                       *x) == -1)
     return -1;
 
+  output.more_fragments (false);
+
   return transport->send_message (output,
                                   0,
                                   TAO_Transport::TAO_REPLY);
@@ -1434,7 +1598,8 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
       char *tmp_id = 0;
 
       if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
-          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
+          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY ||
+          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_FRAGMENT)
         {
           if (major == 1 && minor < 2)
             {
@@ -1446,16 +1611,16 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
               tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN);
             }
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
-      if (byte_order == TAO_ENCAP_BYTE_ORDER)
-        {
-          id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
-        }
-      else
-        {
-          ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id));
-        }
+        if (byte_order == TAO_ENCAP_BYTE_ORDER)
+          {
+            id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
+          }
+        else
+          {
+            ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id));
+          }
 #else
-      id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
+        id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
 
         }
@@ -1520,6 +1685,17 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz)
     TAO_Queued_Data::make_queued_data (
       this->orb_core_->transport_message_buffer_allocator ());
 
+  if (qd == 0)
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+            ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ")
+            ACE_TEXT ("our of memory, failed to allocate queued data object\n")));
+        }
+      return 0; // NULL pointer
+    }
+
   // @@todo: We have a similar method in Transport.cpp. Need to see how
   // we can factor them out..
   // Make a datablock for the size requested + something. The
@@ -1531,20 +1707,58 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz)
     this->orb_core_->create_input_cdr_data_block (sz +
                                                   ACE_CDR::MAX_ALIGNMENT);
 
+  if (db == 0)
+    {
+      TAO_Queued_Data::release (qd);
+
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+            ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ")
+            ACE_TEXT ("out of memory, failed to allocate input data block of size %u\n"),
+            sz));
+        }
+      return 0; // NULL pointer
+    }
+
   ACE_Allocator *alloc =
     this->orb_core_->input_cdr_msgblock_allocator ();
 
+  if (alloc == 0)
+    {
+      if (TAO_debug_level >= 8)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+             ACE_TEXT ("(%P|%t) - TAO_GIOP_Message_Base::make_queued_data,")
+             ACE_TEXT (" no ACE_Allocator defined\n")));
+        }
+    }
+
+
   ACE_Message_Block mb (db,
                         0,
                         alloc);
 
   ACE_Message_Block *new_mb = mb.duplicate ();
 
+  if (new_mb == 0)
+    {
+      TAO_Queued_Data::release (qd);
+      db->release();
+
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+            ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ")
+            ACE_TEXT ("out of memory, failed to allocate message block\n")));
+        }
+      return 0;
+    }
+
   ACE_CDR::mb_align (new_mb);
 
   qd->msg_block_ = new_mb;
 
-
   return qd;
 }
 
@@ -1570,13 +1784,369 @@ TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major,
 
 void
 TAO_GIOP_Message_Base::init_queued_data (
-                               TAO_Queued_Data* qd,
-                               const TAO_GIOP_Message_State& state) const
+  TAO_Queued_Data* qd,
+  const TAO_GIOP_Message_State& state) const
 {
   qd->byte_order_     = state.byte_order_;
   qd->major_version_  = state.giop_version_.major;
   qd->minor_version_  = state.giop_version_.minor;
   qd->more_fragments_ = state.more_fragments_;
-  qd->request_id_     = state.request_id_;
   qd->msg_type_       = this->message_type (state);
 }
+
+int
+TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd, CORBA::ULong &request_id) const
+{
+  // Get a parser for us
+  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);
+
+  // Get the read and write positions before we steal data.
+  size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
+  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
+  rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
+
+  // Create a input CDR stream. We do the following
+  //  1 - If the incoming message block has a data block with a flag
+  //      DONT_DELETE  (for the data block) we create an input CDR
+  //      stream the same way.
+  //  2 - If the incoming message block had a datablock from heap just
+  //      use it by duplicating it and make the flag 0.
+  // NOTE: We use the same data block in which we read the message and
+  // we pass it on to the higher layers of the ORB. So we dont to any
+  // copies at all here. The same is also done in the higher layers.
+
+  ACE_Message_Block::Message_Flags flg = 0;
+  ACE_Data_Block *db = 0;
+
+  // Get the flag in the message block
+  flg = qd->msg_block_->self_flags ();
+
+  if (ACE_BIT_ENABLED (flg,
+                       ACE_Message_Block::DONT_DELETE))
+    {
+      // Use the same datablock
+      db = qd->msg_block_->data_block ();
+    }
+  else
+    {
+      // Use a duplicated datablock as the datablock has come off the
+      // heap.
+      db = qd->msg_block_->data_block ()->duplicate ();
+    }
+
+
+  TAO_InputCDR input_cdr (db,
+                          flg,
+                          rd_pos,
+                          wr_pos,
+                          qd->byte_order_,
+                          qd->major_version_,
+                          qd->minor_version_,
+                          this->orb_core_);
+
+  if (qd->major_version_ >= 1 &&
+      (qd->minor_version_ == 0 || qd->minor_version_ == 1))
+    {
+      if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REQUEST ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REPLY)
+        {
+          IOP::ServiceContextList service_context;
+
+          if ( ! (input_cdr >> service_context &&
+                  input_cdr >> request_id) )
+            {
+              return -1;
+            }
+
+          return 0;
+        }
+      else if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST ||
+               qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST ||
+               qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY)
+        {
+          if ( ! (input_cdr >> request_id) )
+            {
+              return -1;
+            }
+
+          return 0;
+        }
+      else
+        {
+          return -1;
+        }
+    }
+  else
+    {
+      if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REQUEST  ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REPLY    ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST ||
+          qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY)
+        {
+          // Dealing with GIOP-1.2, the request-id is located directly behind the GIOP-Header.
+          // This is true for all message types that might be sent in form of fragments or cancel-requests.
+          if ( ! (input_cdr >> request_id) )
+            {
+              return -1;
+            }
+
+          return 0;
+        }
+      else
+        {
+          return -1;
+        }
+    }
+
+  return -1;
+}
+
+/* @return -1 error, 0 ok, +1 outstanding fragments */
+int
+TAO_GIOP_Message_Base::consolidate_fragmented_message (TAO_Queued_Data *qd, TAO_Queued_Data *&msg)
+{
+  TAO::Incoming_Message_Stack reverse_stack;
+
+  TAO_Queued_Data *tail = 0;
+  TAO_Queued_Data *head = 0;
+
+  //
+  // CONSOLIDATE FRAGMENTED MESSAGE
+  //
+
+  // check for error-condition
+  if (qd == 0)
+    {
+      return -1;
+    }
+
+  if (qd->major_version_ == 1 && qd->minor_version_ == 0)
+    {
+      TAO_Queued_Data::release (qd);
+      return -1; // error: GIOP-1.0 does not support fragments
+    }
+
+  // If this is not the last fragment, push it onto stack for later processing
+  if (qd->more_fragments_)
+    {
+      this->fragment_stack_.push (qd);
+
+      msg = 0;   // no consolidated message available yet
+      return 1;  // status: more messages expected.
+    }
+
+  tail = qd;  // init
+
+  // Add the current message block to the end of the chain
+  // after adjusting the read pointer to skip the header(s)
+  const size_t header_adjustment =
+    this->header_length () +
+    this->fragment_header_length (tail->major_version_,
+                                  tail->minor_version_);
+
+  if (tail->msg_block_->length () < header_adjustment)
+    {
+      // buffer length not sufficient
+      TAO_Queued_Data::release (qd);
+      return -1;
+    }
+
+  // duplicate code to speed up both processes, for GIOP-1.1 and GIOP-1.2
+  if (tail->major_version_ == 1 && tail->minor_version_ == 1)
+    {
+      // GIOP-1.1
+
+      while (this->fragment_stack_.pop (head) != -1)
+        {
+          if (head->more_fragments_ &&
+              head->major_version_ == 1 &&
+              head->minor_version_ == 1 &&
+              head->msg_block_->length () >= header_adjustment)
+            {
+              // adjust the read-pointer, skip the fragment header
+              tail->msg_block_->rd_ptr(header_adjustment);
+
+              head->msg_block_->cont (tail->msg_block_);
+
+              tail->msg_block_ = 0;
+
+              TAO_Queued_Data::release (tail);
+
+              tail = head;
+            }
+          else
+            {
+              reverse_stack.push (head);
+            }
+        }
+    }
+  else
+    {
+      // > GIOP-1.2
+
+      CORBA::ULong tmp_request_id = 0;
+      if (this->parse_request_id (tail, tmp_request_id) == -1)
+        {
+          return -1;
+        }
+
+      const CORBA::ULong request_id = tmp_request_id;
+
+      while (this->fragment_stack_.pop (head) != -1)
+        {
+          CORBA::ULong head_request_id = 0;
+          int parse_status = 0;
+
+          if (head->more_fragments_ &&
+              head->major_version_ >= 1 &&
+              head->minor_version_ >= 2 &&
+              head->msg_block_->length () >= header_adjustment &&
+              (parse_status = this->parse_request_id (head, head_request_id)) != -1 &&
+              request_id == head_request_id)
+            {
+              // adjust the read-pointer, skip the fragment header
+              tail->msg_block_->rd_ptr(header_adjustment);
+
+              head->msg_block_->cont (tail->msg_block_);
+
+              tail->msg_block_ = 0;
+
+              TAO_Queued_Data::release (tail);
+
+              tail = head;
+            }
+          else
+            {
+              if (parse_status == -1)
+                {
+                  TAO_Queued_Data::release (head);
+                  return -1;
+                }
+
+              reverse_stack.push (head);
+            }
+        }
+    }
+
+  // restore stack
+  while (reverse_stack.pop (head) != -1)
+    {
+      this->fragment_stack_.push (head);
+    }
+
+  if (tail->consolidate () == -1)
+    {
+      // memory allocation failed
+      TAO_Queued_Data::release (tail);
+      return -1;
+    }
+
+  // set out value
+  msg = tail;
+
+  return 0;
+}
+
+
+int
+TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel_request)
+{
+  // We must extract the specific request-id from message-buffer
+  // and remove all fragments from stack that match this request-id.
+
+  TAO::Incoming_Message_Stack reverse_stack;
+
+  CORBA::ULong cancel_request_id;
+
+  if (this->parse_request_id (cancel_request, cancel_request_id) == -1)
+    {
+      return -1;
+    }
+
+  TAO_Queued_Data *head = 0;
+
+  // Revert stack
+  while (this->fragment_stack_.pop (head) != -1)
+    {
+      reverse_stack.push (head);
+    }
+
+  bool discard_all_GIOP11_messages = false;
+
+  // Now we are able to process message in order they have arrived.
+  // If the cancel_request_id matches to GIOP-1.1 message, all succeeding
+  // fragments belong to this message and must be discarded.
+  // Note: GIOP-1.1 fragment header dont have any request-id encoded. If the
+  // cancel_request_id matches GIOP-1.2 messages, all GIOP-1.2 fragments
+  // having encoded the request id will be discarded.
+  while (reverse_stack.pop (head) != -1)
+    {
+      CORBA::ULong head_request_id;
+
+      if (head->major_version_ == 1 &&
+          head->minor_version_ <= 1 &&
+          head->msg_type_ != TAO_PLUGGABLE_MESSAGE_FRAGMENT && // GIOP11 fragment does not provide request id
+          this->parse_request_id (head, head_request_id) >= 0 &&
+          cancel_request_id == head_request_id)
+        {
+          TAO_Queued_Data::release (head);
+          discard_all_GIOP11_messages = true;
+        }
+      else if (head->major_version_ == 1 &&
+               head->minor_version_ <= 1 &&
+               discard_all_GIOP11_messages)
+        {
+          TAO_Queued_Data::release (head);
+        }
+      else if (head->major_version_ >= 1 &&
+               head->minor_version_ >= 2 &&
+               this->parse_request_id (head, head_request_id) >= 0 &&
+               cancel_request_id == head_request_id)
+        {
+          TAO_Queued_Data::release (head);
+        }
+      else
+        {
+          this->fragment_stack_.push (head);
+        }
+    }
+
+  return 0;
+}
+
+TAO_GIOP_Fragmentation_Strategy *
+TAO_GIOP_Message_Base::fragmentation_strategy (void)
+{
+  return this->fragmentation_strategy_.get ();
+}
+
+void
+TAO_GIOP_Message_Base::set_giop_flags (TAO_OutputCDR & msg) const
+{
+  CORBA::Octet * const buf =
+    reinterpret_cast<CORBA::Octet *> (const_cast<char *> (msg.buffer ()));
+
+  CORBA::Octet const & major = buf[TAO_GIOP_VERSION_MAJOR_OFFSET];
+  CORBA::Octet const & minor = buf[TAO_GIOP_VERSION_MINOR_OFFSET];
+
+  // Flags for the GIOP protocol header "flags" field.
+  CORBA::Octet & flags = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET];
+
+  // Least significant bit:        Byte order
+  ACE_SET_BITS (flags, TAO_ENCAP_BYTE_ORDER ^ msg.do_byte_swap ());
+
+  // Second least significant bit: More fragments
+  //
+  // Only supported in GIOP 1.1 or better.
+  if (!(major <= 1 && minor == 0))
+    ACE_SET_BITS (flags, msg.more_fragments () << 1);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index 853f4db9125..9909c091983 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//
+
 // ===================================================================
 /**
  *  @file GIOP_Message_Base.h
@@ -26,7 +26,14 @@
 #include "tao/GIOP_Message_Generator_Parser_Impl.h"
 #include "tao/GIOP_Utils.h"
 #include "tao/GIOP_Message_State.h"
+#include "tao/GIOP_Fragmentation_Strategy.h"
 #include "tao/CDR.h"
+#include "tao/Incoming_Message_Stack.h"
+
+#include "ace/Auto_Ptr.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Pluggable_Reply_Params;
 class TAO_Queued_Data;
@@ -38,8 +45,7 @@ class TAO_Queued_Data;
  *
  * This class will hold the specific details common to all the GIOP
  * versions. Some of them which are here may be shifted if things
- * start changing between versions. This class uses the
- * TAO_GIOP_Message_Reactive_Handler to read and parse messages.
+ * start changing between versions.
  */
 
 class TAO_Export TAO_GIOP_Message_Base : public TAO_Pluggable_Messaging
@@ -47,6 +53,7 @@ class TAO_Export TAO_GIOP_Message_Base : public TAO_Pluggable_Messaging
 public:
   /// Constructor
   TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
+                         TAO_Transport * transport,
                          size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
 
   /// Dtor
@@ -79,36 +86,26 @@ public:
       TAO_Pluggable_Reply_Params_Base &params
     );
 
-  /// This method reads the message on the connection. Returns 0 when
-  /// there is short read on the connection. Returns 1 when the full
-  /// message is read and handled. Returns -1 on errors. If @a block is
-  /// 1, then reply is read in a blocking manner.
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0);
-
+  virtual int generate_fragment_header (TAO_OutputCDR & cdr,
+                                        CORBA::ULong request_id);
 
   /// Format the message. As we have not written the message length in
   /// the header, we make use of this oppurtunity to insert and format
   /// the message.
   virtual int format_message (TAO_OutputCDR &cdr);
 
-  /// Parse the incoming messages..
-  ///
-  /// \return -1 There was some error parsing the GIOP header
-  /// \return 0  The GIOP header was parsed correctly
-  /// \return 1  There was not enough data in the message block to
-  ///            parse the header
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block);
-
-  /// Calculate the amount of data that is missing in the <incoming>
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &message_block);
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-   */
+  /// Parse the details of the next message from the @a incoming
+  /// and initializes attributes of @a qd. Returns 0 if the message
+  /// header could not be parsed completely, returns a 1 if the message
+  /// header could be parsed completely and returns -1 on error.
+  virtual int parse_next_message (ACE_Message_Block &incoming,
+                                  TAO_Queued_Data &qd,       /* out */
+                                  size_t &mesg_length);      /* out */
+
+  /// Extract the details of the next message from the @a incoming
+  /// through @a qd. Returns 0 if the message header could not be
+  /// parsed completely, returns a 1 if the message header could be
+  /// parsed completely and returns -1 on error.
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd);
 
@@ -116,9 +113,6 @@ public:
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming);
 
-  /// Get the details of the message parsed through the @a qd.
-  virtual void get_message_data (TAO_Queued_Data *qd);
-
   /// Process the request message that we have received on the
   /// connection
   virtual int process_request_message (TAO_Transport *transport,
@@ -147,6 +141,28 @@ public:
 
   virtual TAO_OutputCDR &out_stream (void);
 
+  /// Consolidate fragmented message with associated fragments, being
+  /// stored withi this class.  If reliable transport is used (like
+  /// TCP) fragments are partialy ordered on stack, last fragment on
+  /// top. Otherwise If un-reliable transport is used (like UDP)
+  /// fragments may be dis-ordered, and must be ordered before
+  /// consolidation.  @return 0 on success and @a msg points to
+  /// consolidated message, 1 if there are still fragmens outstanding,
+  /// in case of error -1 is being returned. In any case @a qd must be
+  /// released by method implementation.
+  virtual int consolidate_fragmented_message (TAO_Queued_Data *qd,
+                                              TAO_Queued_Data *&msg);
+
+  /// Discard all fragments associated to request-id encoded in
+  /// cancel_request.  This operation will never be called
+  /// concurrently by multiplpe threads nor concurrently to
+  /// consolidate_fragmented_message @return -1 on failure, 0 on
+  /// success, 1 no fragment on stack relating to CancelRequest.
+  virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request);
+
+  /// Outgoing GIOP message fragmentation strategy.
+  virtual TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void);
+
 protected:
 
   /// Processes the GIOP_REQUEST messages
@@ -232,6 +248,25 @@ protected:
                          const TAO_GIOP_Message_State& state) const;
 
 private:
+  int parse_incoming_messages (ACE_Message_Block &incoming);
+
+  /// Parse GIOP request-id of TAO_Queued_Data @a qd
+  /// @return 0 on success, otherwise -1
+  int parse_request_id (const TAO_Queued_Data *qd, CORBA::ULong &request_id) const;
+
+  /// Parse GIOP request-id of TAO_InputCDR @a cdr.
+  /// @return 0 on success, otherwise -1
+  int parse_request_id (const TAO_InputCDR &cdr, CORBA::ULong &request_id) const;
+
+  /// Set GIOP message flags in message that has been marshaled into
+  /// the output CDR stream @a msg.
+  /**
+   * @note It is assumed that the GIOP message header is the first
+   *       thing marshaled into the output CDR stream @a msg.
+   */
+  void set_giop_flags (TAO_OutputCDR & msg) const;
+
+private:
   /// Cached ORB_Core pointer...
   TAO_ORB_Core *orb_core_;
 
@@ -242,17 +277,33 @@ private:
   /// All the implementations of GIOP message generator and parsers
   TAO_GIOP_Message_Generator_Parser_Impl tao_giop_impl_;
 
+  /// All Fragments being received are stored on stack in reverse
+  /// order, last top
+  TAO::Incoming_Message_Stack fragment_stack_;
+
 protected:
+
   /// Buffer used for both the output and input CDR streams, this is
   /// "safe" because we only one of the streams at a time.
   char buffer_[ACE_CDR::DEFAULT_BUFSIZE];
 
+  /**
+   * @name Outgoing GIOP Fragment Related Attributes
+   *
+   * These attributes are only used when fragmenting outgoing GIOP
+   * requests and replies.
+   */
+  //@{
+  /// Strategy that sends data currently marshaled into this
+  /// TAO_OutputCDR stream if necessary.
+  auto_ptr<TAO_GIOP_Fragmentation_Strategy> fragmentation_strategy_;
+
   /// Buffer where the request is placed.
   TAO_OutputCDR out_stream_;
 
   /*
-   * Hook in the GIOP_Message class to add data member. This hook used in
-   * speeding up the dispatch within TAO.
+   * Hook in the GIOP_Message class to add data member. This hook is
+   * used in speeding up the dispatch within TAO.
    */
 //@@ GIOP_MESSAGE_BASE_DATA_MEMBER_ADD_HOOK
 
@@ -264,5 +315,8 @@ protected:
  */
 //@@ MESSAGING_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_BASE_H*/
+
+#endif  /* TAO_GIOP_MESSAGE_BASE_H */
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index c38aadd4626..abd302b491e 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void)
 {
 }
@@ -35,9 +37,8 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
     }
 
   // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-
-  // Cannot handle LOCATION_FORWARD_PERM here
+  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
+  // LOCATION_FORWARD_PERM
   CORBA::ULong rep_stat = 0;
   if (!stream.read_ulong (rep_stat))
     {
@@ -74,13 +75,12 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
         TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward perm type
-      // @@For the time being the behaviour of the
-      // LOCATION_FORWARD_PERM would be similar to the
-      // LOCATION_FORWARD as there is a controversy surrounding the
-      // usage of this in the OMG.
+     // LOCATION_FORWARD_PERM is only allowed in context of
+     // FaultTolerant featured requests and requires PortableGroup
+     // features in forwarded object and service context
     case TAO_GIOP_LOCATION_FORWARD_PERM:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
+        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM;
       break;
       // Reply is a location forward type
     case TAO_GIOP_NEEDS_ADDRESSING_MODE:
@@ -115,8 +115,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
 
   // and the reply status type.  status can be NO_EXCEPTION,
   // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-
-  // Cannot handle LOCATION_FORWARD_PERM here
+  // LOCATION_FORWARD_PERM
 
   // Please note here that we are NOT converting to the Pluggable
   // messaging layer exception as this is GIOP specific. Not many
@@ -168,3 +167,5 @@ TAO_GIOP_Message_Generator_Parser::marshal_reply_status (
       break;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index a427384ea93..db0c6acb11e 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -1,5 +1,5 @@
-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser.h
@@ -22,6 +22,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
@@ -73,6 +75,11 @@ public:
       CORBA::ULong request_id,
       TAO_GIOP_Locate_Status_Msg &status) = 0;
 
+  /// Write the GIOP fragment message header to the output CDR stream
+  /// @a cdr.
+  virtual bool write_fragment_header (TAO_OutputCDR & cdr,
+                                      CORBA::ULong request_id) = 0;
+
   /// Parse the Request Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
   virtual int parse_request_header (TAO_ServerRequest &) = 0;
@@ -109,5 +116,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index a78149c847a..f6d10cd7c2d 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -14,9 +14,11 @@
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (tao,
-           GIOP_Message_Gen_Parser_10,
+           GIOP_Message_Generator_Parser_10,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_GIOP_Message_Generator_Parser_10::write_request_header (
     const TAO_Operation_Details &opdetails,
@@ -308,6 +310,16 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_reply_mesg (
   return 1;
 }
 
+bool
+TAO_GIOP_Message_Generator_Parser_10::write_fragment_header (
+  TAO_OutputCDR & /* cdr */,
+  CORBA::ULong /* request_id */)
+{
+  // GIOP fragments are not supported in GIOP 1.0.
+  return false;
+}
+
+
 int
 TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
     TAO_ServerRequest &request)
@@ -339,7 +351,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
 
   request.request_id (req_id);
 
-  CORBA::Octet response_flags;
+  CORBA::Octet response_flags = CORBA::Octet();
   hdr_status = hdr_status && input.read_octet (response_flags);
   request.response_expected ((response_flags != 0));
 
@@ -467,7 +479,7 @@ CORBA::Octet
 TAO_GIOP_Message_Generator_Parser_10::major_version (void)
 {
   // Any harm in hardcoding??
-  return (CORBA::Octet) 1;
+  return static_cast<CORBA::Octet> (1);
 }
 
 CORBA::Octet
@@ -482,3 +494,5 @@ TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index 848f83fffd2..a8829c281ea 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -1,5 +1,5 @@
-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_10.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_GIOP_Message_State;
 
 /**
@@ -64,6 +66,9 @@ public:
       TAO_GIOP_Locate_Status_Msg &status
     );
 
+  virtual bool write_fragment_header (TAO_OutputCDR & cdr,
+                                      CORBA::ULong request_id);
+
   /// Parse the Request Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
   virtual int parse_request_header (TAO_ServerRequest &);
@@ -90,5 +95,8 @@ public:
   virtual size_t fragment_header_length (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
index 0d9bd94c60a..88bdbe641af 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -1,11 +1,15 @@
 #include "tao/GIOP_Message_Generator_Parser_11.h"
 
-ACE_RCSID (tao, 
-           GIOP_Message_Gen_Parser_11, 
+ACE_RCSID (tao,
+           GIOP_Message_Generator_Parser_11,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Octet
 TAO_GIOP_Message_Generator_Parser_11::minor_version (void)
 {
-  return (CORBA::Octet) 1;
+  return static_cast<CORBA::Octet> (1);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h
index fd4232fe1b8..cc88a7082ec 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_GIOP_Message_Generator_Parser_11
  *
@@ -30,9 +32,8 @@
  *  the 1.0 class.
  *
  */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser_11:
-  public TAO_GIOP_Message_Generator_Parser_10
+class TAO_Export TAO_GIOP_Message_Generator_Parser_11
+  : public TAO_GIOP_Message_Generator_Parser_10
 {
 public:
 
@@ -41,5 +42,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H*/
+
+#endif  /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H */
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 5296e870b67..086081e78d6 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -21,6 +21,8 @@ ACE_RCSID (tao,
 // scope.
 static const size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_GIOP_Message_Generator_Parser_12::write_request_header (
     const TAO_Operation_Details &opdetails,
@@ -247,6 +249,17 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg (
   return 1;
 }
 
+bool
+TAO_GIOP_Message_Generator_Parser_12::write_fragment_header (
+  TAO_OutputCDR & cdr,
+  CORBA::ULong request_id)
+{
+  return (cdr << request_id);
+
+  // No need to align write pointer to an 8 byte boundary since it
+  // should already be aligned (12 for GIOP messager + 4 for fragment
+  // header = 16 -- a multiple of 8)
+}
 
 int
 TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
@@ -264,7 +277,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
 
   request.request_id (req_id);
 
-  CORBA::Octet response_flags;
+  CORBA::Octet response_flags = CORBA::Octet();
   hdr_status = hdr_status && input.read_octet (response_flags);
 
   request.response_expected ((response_flags > 0));
@@ -566,3 +579,5 @@ TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const
 {
   return TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index 5fa4d531ba9..6fd84af43a6 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -1,5 +1,5 @@
-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_12.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_GIOP_Message_State;
 class TAO_Service_Context;
 class TAO_Transport;
@@ -66,6 +68,9 @@ public:
       TAO_GIOP_Locate_Status_Msg &status
     );
 
+  virtual bool write_fragment_header (TAO_OutputCDR & cdr,
+                                      CORBA::ULong request_id);
+
   /// Parse the Request Header from the incoming stream. This will do a
   /// version specific parsing of the incoming Request header
   virtual int parse_request_header (TAO_ServerRequest &);
@@ -116,5 +121,8 @@ private:
                              TAO_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H*/
+
+#endif  /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H */
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
index 9dd3e2cbf7c..9dad728f19b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
@@ -1,5 +1,5 @@
-
 // -*- C++ -*-
+
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_Impl.h
@@ -24,6 +24,8 @@
 #include "tao/GIOP_Message_Generator_Parser_12.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_GIOP_Message_Generator_Parser_Impl
  *
@@ -54,6 +56,9 @@ public:
   TAO_GIOP_Message_Generator_Parser_12 tao_giop_12;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Generator_Parser_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
index 49f47beff45..5415e22f081 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
   CORBA::Octet incoming_major,
@@ -10,7 +12,7 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
   CORBA::UShort const version_as_whole_num =
     incoming_major << 8 | incoming_minor;
 
-  static CORBA::UShort const max_allowable_version =
+  CORBA::UShort const max_allowable_version =
     TAO_DEF_GIOP_MAJOR << 8 | TAO_DEF_GIOP_MINOR;
 
   // If it's greater than the max, we know it's not allowed.
@@ -29,3 +31,5 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index a0e7a4d8558..80336ad5680 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1,19 +1,17 @@
-// -*- C++ -*-
-//
 //$Id$
 
-#include "GIOP_Message_Lite.h"
-#include "debug.h"
-#include "TAOC.h"
-#include "ORB_Core.h"
-#include "operation_details.h"
-#include "TAO_Server_Request.h"
-#include "GIOP_Message_Locate_Header.h"
-#include "LF_Strategy.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "Codeset_Manager.h"
-#include "SystemException.h"
+#include "tao/GIOP_Message_Lite.h"
+#include "tao/debug.h"
+#include "tao/TAOC.h"
+#include "tao/ORB_Core.h"
+#include "tao/operation_details.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/GIOP_Message_Locate_Header.h"
+#include "tao/LF_Strategy.h"
+#include "tao/Transport.h"
+#include "tao/Transport_Mux_Strategy.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            GIOP_Message_Lite,
@@ -24,6 +22,8 @@ static const size_t TAO_GIOP_LITE_HEADER_LEN = 5;
 static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0;
 static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
                                               size_t /*input_cdr_size*/)
   : orb_core_ (orb_core),
@@ -165,21 +165,19 @@ TAO_GIOP_Message_Lite::generate_reply_header (
   return 0;
 }
 
-
 int
-TAO_GIOP_Message_Lite::read_message (TAO_Transport * /*transport*/,
-                                     int /*block */,
-                                     ACE_Time_Value * /*max_wait_time*/)
+TAO_GIOP_Message_Lite::generate_fragment_header (TAO_OutputCDR & /* cdr */,
+                                                 CORBA::ULong /* request_id */)
 {
-  return 1;
+  // GIOP fragmentation is not supported in GIOP lite.
+  return 0;
 }
 
-
 int
 TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
 {
   // Get the header length
-  const size_t header_len = TAO_GIOP_LITE_HEADER_LEN ;
+  const size_t header_len = TAO_GIOP_LITE_HEADER_LEN;
 
   // Get the message size offset
   const size_t offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET;
@@ -245,6 +243,8 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
 int
 TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 {
+  this->reset ();
+
   // Make sure we have enough bytes in the header to read all
   // of the information.
   if (block.length () < TAO_GIOP_LITE_HEADER_LEN)
@@ -306,6 +306,8 @@ TAO_GIOP_Message_Lite::message_type (void) const
       return TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION;
 
     case TAO_GIOP_CANCELREQUEST:
+      return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST;
+
     case TAO_GIOP_MESSAGERROR:
     case TAO_GIOP_FRAGMENT:
       // Never happens: why??
@@ -319,26 +321,43 @@ TAO_GIOP_Message_Lite::message_type (void) const
   return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
 }
 
-
-ssize_t
-TAO_GIOP_Message_Lite::missing_data (ACE_Message_Block &block)
+int
+TAO_GIOP_Message_Lite::parse_next_message (ACE_Message_Block &incoming,
+                                           TAO_Queued_Data &qd,
+                                           size_t &mesg_length)
 {
-    // Actual message size including the header..
-  CORBA::ULong msg_size =
-    this->message_size_ + TAO_GIOP_LITE_HEADER_LEN;
-
-  size_t len = block.length ();
+  if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN)
+    {
+      qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED;
 
-  if (len > msg_size)
+      return 0; /* incomplete header */
+    }
+  else
+    {
+      if (this->parse_incoming_messages (incoming) == -1)
     {
       return -1;
      }
-  else if (len == msg_size)
-     return 0;
 
-   return msg_size - len;
-}
+      const size_t total_len =
+        this->message_size_ + TAO_GIOP_LITE_HEADER_LEN;
 
+      if (total_len > incoming.length ())
+        {
+          qd.missing_data_ = total_len - incoming.length ();
+        }
+      else
+        {
+          qd.missing_data_ = 0;
+        }
+
+      this->init_queued_data (&qd);
+
+      mesg_length  = TAO_GIOP_LITE_HEADER_LEN + this->message_size_;
+
+      return 1; /* parsed header successfully */
+    }
+}
 
 int
 TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
@@ -353,9 +372,14 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
           qd =
             this->make_queued_data (TAO_GIOP_LITE_HEADER_LEN);
 
+          if (qd == 0)
+            {
+              return -1; /* out of memory */
+            }
+
             qd->msg_block_->copy (incoming.rd_ptr (),
                                   incoming.length ());
-          qd->missing_data_ = -1;
+          qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED;
         }
       return 0;
     }
@@ -370,12 +394,21 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
 
   qd = this->make_queued_data (copying_len);
 
+  if (qd == 0)
+    {
+      return -1; /* out of memory */
+    }
+
   if (copying_len > incoming.length ())
     {
       qd->missing_data_ = copying_len - incoming.length ();
 
       copying_len = incoming.length ();
     }
+  else
+    {
+      qd->missing_data_ = 0;
+    }
 
   qd->msg_block_->copy (incoming.rd_ptr (),
                         copying_len);
@@ -391,7 +424,7 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
                                          ACE_Message_Block &incoming)
 {
   // Look to see whether we had atleast parsed the GIOP header ...
-  if (qd->missing_data_ == -1)
+  if (qd->missing_data_ == TAO_MISSING_DATA_UNDEFINED)
     {
       // The data length that has been stuck in there during the last
       // read ....
@@ -401,11 +434,26 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
       // We know that we would have space for
       // TAO_GIOP_MESSAGE_HEADER_LEN here.  So copy that much of data
       // from the <incoming> into the message block in <qd>
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            TAO_GIOP_LITE_HEADER_LEN - len);
+      const size_t available     = incoming.length ();
+      const size_t desired       = TAO_GIOP_LITE_HEADER_LEN - len;
+      const size_t n_copy        = ace_min (available, desired);
+
+      // paranoid check, but would cause endless loop
+      if (n_copy == 0)
+        {
+          return -1;
+        }
+
+      qd->msg_block_->copy (incoming.rd_ptr (), n_copy);
 
       // Move the rd_ptr () in the incoming message block..
-      incoming.rd_ptr (TAO_GIOP_LITE_HEADER_LEN - len);
+      incoming.rd_ptr (n_copy);
+
+      // verify there is now enough data to parse the header
+      if (qd->msg_block_->length () < TAO_GIOP_LITE_HEADER_LEN)
+        {
+          return 0;
+        }
 
       // Parse the message header now...
       if (this->parse_incoming_messages (*qd->msg_block_) == -1)
@@ -413,8 +461,12 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
 
       // Now grow the message block so that we can copy the rest of
       // the data...
-      ACE_CDR::grow (qd->msg_block_,
-                     this->message_size_ + TAO_GIOP_LITE_HEADER_LEN);
+      if (ACE_CDR::grow (qd->msg_block_,
+                     this->message_size_ + TAO_GIOP_LITE_HEADER_LEN) == -1)
+        {
+          /* memory allocation failed */
+          return -1;
+        }
 
       // Copy the pay load..
 
@@ -436,6 +488,12 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
           qd->missing_data_ = 0;
         }
 
+      // paranoid check
+      if (copy_len == 0)
+        {
+          return -1;
+        }
+
       // ..now we are set to copy the right amount of data to the
       // node..
       qd->msg_block_->copy (incoming.rd_ptr (),
@@ -474,17 +532,6 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
   return 0;
 }
 
-
-void
-TAO_GIOP_Message_Lite::get_message_data (TAO_Queued_Data *qd)
-{
-  // Get the message information
-  this->init_queued_data (qd);
-
-  // Reset the message_state
-  this->reset ();
-}
-
 int
 TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
                                                 TAO_Queued_Data *qd)
@@ -1308,7 +1355,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request)
 
   request.request_id (req_id);
 
-   CORBA::Octet response_flags;
+  CORBA::Octet response_flags = CORBA::Octet();
   hdr_status = hdr_status && input.read_octet (response_flags);
   request.response_expected ((response_flags != 0));
 
@@ -1627,6 +1674,11 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
   TAO_Queued_Data *qd =
     TAO_Queued_Data::make_queued_data ();
 
+  if (qd == 0)
+    {
+      return 0;
+    }
+
   // Make a datablock for the size requested + something. The
   // "something" is required because we are going to align the data
   // block in the message block. During alignment we could loose some
@@ -1636,6 +1688,12 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
     this->orb_core_->create_input_cdr_data_block (sz +
                                                   ACE_CDR::MAX_ALIGNMENT);
 
+  if (db == 0)
+    {
+      TAO_Queued_Data::release (qd);
+      return 0;
+    }
+
   ACE_Allocator *alloc =
     this->orb_core_->input_cdr_msgblock_allocator ();
 
@@ -1645,6 +1703,14 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
 
   ACE_Message_Block *new_mb = mb.duplicate ();
 
+  if (new_mb == 0)
+    {
+      TAO_Queued_Data::release (qd);
+      db->release();
+
+      return 0;
+    }
+
   ACE_CDR::mb_align (new_mb);
 
   qd->msg_block_ = new_mb;
@@ -1689,3 +1755,37 @@ TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const
   qd->minor_version_ = TAO_DEF_GIOP_MINOR;
   qd->msg_type_      = this->message_type ();
 }
+
+/* @return -1 error, 0 ok */
+int
+TAO_GIOP_Message_Lite::consolidate_fragmented_message (TAO_Queued_Data* /* qd */,
+                                                       TAO_Queued_Data *& /* msg */)
+{
+  if (TAO_debug_level > 3)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P | %t):%s GIOP lite msg, ")
+                  ACE_TEXT ("Error, fragmented messages not supported\n")));
+    }
+  return -1; // not implemented, not supported
+}
+
+
+
+/// Remove all fragments from stack corelating to CancelRequest @a qd.
+/// @return -1 on failure, 0 on success, 1 no fragment on stack
+/// relating to CancelRequest.
+int
+TAO_GIOP_Message_Lite::discard_fragmented_message (const TAO_Queued_Data *)
+{
+  return 1; // no fragment on stack relating to cancel-request
+}
+
+TAO_GIOP_Fragmentation_Strategy *
+TAO_GIOP_Message_Lite::fragmentation_strategy (void)
+{
+  return 0; // Fragmentation is unsupported in GIOP lite.
+}
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 8ddaa6ef89b..7b8e35d512a 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -27,6 +27,8 @@
 #include "tao/SystemException.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Pluggable_Reply_Params;
 class TAO_GIOP_Locate_Request_Header;
@@ -42,7 +44,6 @@ class TAO_GIOP_Message_Version;
  * This protocol is a modified version of GIOP. This is more suited
  * for homogenous platforms.
  */
-
 class TAO_Export TAO_GIOP_Message_Lite : public TAO_Pluggable_Messaging
 {
 public:
@@ -78,24 +79,22 @@ public:
       TAO_Pluggable_Reply_Params_Base &params
     );
 
-  /// Dummy method to ..
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0);
-
+  virtual int generate_fragment_header (TAO_OutputCDR & cdr,
+                                        CORBA::ULong request_id);
 
   /// Format the message. As we have not written the message length in
   /// the header, we make use of this oppurtunity to insert and format
   /// the message.
   virtual int format_message (TAO_OutputCDR &cdr);
 
+private:
   /// Parse the incoming messages..
   ///
-  /// \return -1 There was some error parsing the GIOP header
-  /// \return 0  The GIOP header was parsed correctly
-  /// \return 1  There was not enough data in the message block to
+  /// \retval -1 There was some error parsing the GIOP header
+  /// \retval 0  The GIOP header was parsed correctly
+  /// \retval 1  There was not enough data in the message block to
   ///            parse the header
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block);
+  int parse_incoming_messages (ACE_Message_Block &message_block);
 
   /// Get the message type. The return value would be one of the
   /// following:
@@ -103,17 +102,23 @@ public:
   /// TAO_PLUGGABLE_MESSAGE_REPLY,
   /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
   /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.
+  /// TAO_PLUGGABLE_MESSAGE_MESSAGE_CANCELREQUEST.
   TAO_Pluggable_Message_Type message_type (void) const;
 
-
-  /// Calculate the amount of data that is missing in the <incoming>
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &message_block);
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-   */
+public:
+  /// Parse the details of the next message from the @a incoming
+  /// and initializes attributes of @a qd. Returns 0 if the message
+  /// header could not be parsed completely, returns a 1 if the message
+  /// header could be parsed completely and returns -1 on error.
+  virtual int parse_next_message (ACE_Message_Block &incoming,
+                                  TAO_Queued_Data &qd,        /* out */
+                                  size_t &mesg_length);      /* out */
+
+
+  /// Extract the details of the next message from the @a incoming
+  /// through @a qd. Returns 0 if the message header could not be
+  /// parsed completely, returns a 1 if the message header could be
+  /// parsed completely and returns -1 on error.
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd);
 
@@ -121,9 +126,6 @@ public:
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming);
 
-  /// Get the details of the message parsed through the <qd>.
-  virtual void get_message_data (TAO_Queued_Data *qd);
-
   /// Process the request message that we have received on the
   /// connection
   virtual int process_request_message (TAO_Transport *transport,
@@ -142,6 +144,28 @@ public:
       CORBA::Exception &x
     );
 
+  /// Consolidate fragmented message with associated fragments, being
+  /// stored withi this class.  If reliable transport is used (like
+  /// TCP) fragments are partialy ordered on stack, last fragment on
+  /// top. Otherwise If un-reliable transport is used (like UDP)
+  /// fragments may be dis-ordered, and must be ordered before
+  /// consolidation.  @return 0 on success and @a msg points to
+  /// consolidated message, 1 if there are still fragmens outstanding,
+  /// in case of error -1 is being returned. In any case @a qd must be
+  /// released by method implementation.
+  virtual int consolidate_fragmented_message (TAO_Queued_Data *qd,
+                                              TAO_Queued_Data *&msg);
+
+  /// Discard all fragments associated to request-id encoded in
+  /// cancel_request.  This operation will never be called
+  /// concurrently by multiplpe threads nor concurrently to
+  /// consolidate_fragmented_message @r 0 on success, 1 if no matching
+  /// fragment chain exists, -1 on error
+  virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request);
+
+  /// Outgoing GIOP message fragmentation strategy.
+  virtual TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void);
+
 private:
 
   /// Writes the GIOP header in to @a msg
@@ -268,12 +292,14 @@ private:
   /// The pay load size
   CORBA::ULong message_size_;
 
-  // The byte order..
-  // NOTE: GIOP lite cannot work between heterogenous platforms..
+  /// The byte order..
+  /// @note GIOP lite cannot work between heterogenous platforms..
   CORBA::Octet byte_order_;
 
   TAO_OutputCDR cdr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_LITE_H*/
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
index 089da5d7a71..b4889f39b7c 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -1,10 +1,11 @@
 //$Id$
+
 #include "tao/GIOP_Message_Locate_Header.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Locate_Header.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           GIOP_Message_Headers, 
+ACE_RCSID (tao,
+           GIOP_Message_Locate_Header,
            "$Id$")
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 89600c8ec1b..8604a1239a8 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -25,6 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_GIOP_Locate_Request_Header
  *
@@ -70,6 +72,8 @@ private:
   TAO_InputCDR *incoming_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Locate_Header.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i
index 8b8025c4603..d59598e5919 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.i
+++ b/TAO/tao/GIOP_Message_Locate_Header.i
@@ -1,9 +1,13 @@
 // -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg,
-                                                                TAO_ORB_Core *orb)
+TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (
+  TAO_InputCDR &msg,
+  TAO_ORB_Core *orb)
   : request_id_ (0),
     profile_ (orb),
     incoming_ (&msg)
@@ -46,3 +50,4 @@ TAO_GIOP_Locate_Request_Header::incoming_stream (void)
   return *this->incoming_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 6100e1fb4fe..6f30b76136b 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -14,13 +14,14 @@ ACE_RCSID (tao,
            GIOP_Message_State,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_GIOP_Message_State::TAO_GIOP_Message_State (void)
   : giop_version_ (TAO_DEF_GIOP_MAJOR,
                    TAO_DEF_GIOP_MINOR),
     byte_order_ (0),
     message_type_ (0),
     message_size_ (0),
-    request_id_ (0),
     more_fragments_ (0),
     missing_data_ (0)
 {
@@ -96,8 +97,7 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
         }
     }
 
-  // Get the request id
-  return this->parse_fragment_header (buf, incoming.length ());
+  return 0; // success
 }
 
 
@@ -169,7 +169,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf)
   if (TAO_debug_level > 8)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n"));
+                  ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n") ));
     }
 
     // Let us be specific that this is for 1.0
@@ -185,8 +185,8 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf)
           if (TAO_debug_level > 2)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, "
-                          "invalid byte order <%d> for version <1.0>\n",
+                          ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, ")
+                          ACE_TEXT ("invalid byte order <%d> for version <1.0>\n"),
                           this->byte_order_));
             }
           return -1;
@@ -229,36 +229,8 @@ TAO_GIOP_Message_State::get_payload_size (char *rd_ptr)
   this->message_size_ =  this->read_ulong (rd_ptr);
 }
 
-
-
-int
-TAO_GIOP_Message_State::parse_fragment_header (const char *buf,
-                                               size_t length)
-{
-  // By this point we are doubly sure that we have a more or less
-  // valid GIOP message with a valid major revision number.
-  if ((this->giop_version_.major > 1 || this->giop_version_.minor >= 2) &&
-      (this->more_fragments_ || this->message_type_ == TAO_GIOP_FRAGMENT))
-    {
-      static const size_t len =
-        TAO_GIOP_MESSAGE_HEADER_LEN + TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
-
-      // If there is not enough data in the header to get the request
-      // id, then we need to indicate that by returning 1.
-      if (length < len)
-        return 1;
-
-      // Fragmented message in GIOP 1.2 should have a fragment header
-      // following the GIOP header.
-      buf += TAO_GIOP_MESSAGE_HEADER_LEN;
-      this->request_id_ = this->read_ulong (buf);
-    }
-
-  return 0;
-}
-
 CORBA::ULong
-TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
+TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const 
 {
   CORBA::ULong x = 0;
 
@@ -266,11 +238,13 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
   // as SunCC) have a problem in deferencing from the
   // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be
   // on stack. So let us go ahead with this copying...
-  char buf [4];
-  buf[0] = *rd_ptr;
-  buf[1] = *(rd_ptr + 1);
-  buf[2] = *(rd_ptr + 2);
-  buf[3] = *(rd_ptr + 3);
+  char buf[] =
+    {
+      *rd_ptr,
+      *(rd_ptr + 1),
+      *(rd_ptr + 2),
+      *(rd_ptr + 3)
+    };
 
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
   if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER))
@@ -287,3 +261,5 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
 
   return x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index 16d9c11d14c..9de7eee5b7e 100644
--- a/TAO/tao/GIOP_Message_State.h
+++ b/TAO/tao/GIOP_Message_State.h
@@ -11,7 +11,7 @@
  *
  *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
  *  @author  Carlos O' Ryan <coryan@uci.edu>
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
  */
 //=============================================================================
 #ifndef TAO_GIOP_MESSAGE_STATE_H
@@ -25,9 +25,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_GIOP_Message_Base;
 
+
 /**
  * @class TAO_GIOP_Message_State
  *
@@ -87,14 +91,9 @@ private:
   /// Gets the size of the payload and set the size in the <state>
   void get_payload_size (char *buf);
 
-  /// Parses the GIOP FRAGMENT_HEADER  information from the incoming
-  /// stream.
-  int parse_fragment_header (const char *buf,
-                             size_t length);
-
   /// Read the unsigned long from the buffer. The <buf> should just
   /// point to the next 4 bytes data that represent the ULong
-  CORBA::ULong read_ulong (const char *buf);
+  CORBA::ULong read_ulong (const char *buf) const;
 
 private:
   // GIOP version information..
@@ -109,9 +108,6 @@ private:
   /// in byte_order!
   CORBA::ULong message_size_;
 
-  /// Request Id from the Fragment header
-  CORBA::ULong request_id_;
-
   /// (Requests and Replys)
   /// A value of zero indicates that this message does not have any
   /// fragments.  A value of non-zero indicates that it does have
@@ -122,14 +118,15 @@ private:
   CORBA::ULong missing_data_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12;
-const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8;
-const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
-const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
-const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
-const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
-const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
+static const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12;
+static const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8;
+static const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
+static const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
+static const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
+static const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
+static const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
 
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_State.inl"
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
index fe076bee689..2de1bbb2b03 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -2,13 +2,15 @@
 
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 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
@@ -29,7 +31,6 @@ TAO_GIOP_Message_State::reset (void)
   this->message_type_ = 0;
   this->message_size_ = 0;
   this->more_fragments_ = 0;
-  this->request_id_ = 0;
   this->missing_data_ = 0;
 }
 
@@ -52,3 +53,5 @@ TAO_GIOP_Message_State::header_received (void) const
 }
 
 #endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp
index 78a90520dcf..b7935f7ac71 100644
--- a/TAO/tao/GIOP_Message_Version.cpp
+++ b/TAO/tao/GIOP_Message_Version.cpp
@@ -1,5 +1,5 @@
 //$Id$
-# include "GIOP_Message_Version.h"
+# include "tao/GIOP_Message_Version.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Version.inl"
diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h
index 0c3f4dc9c55..f563af8004d 100644
--- a/TAO/tao/GIOP_Message_Version.h
+++ b/TAO/tao/GIOP_Message_Version.h
@@ -28,6 +28,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 /**
@@ -52,9 +54,6 @@ public:
   TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR,
                             CORBA::Octet min = TAO_DEF_GIOP_MINOR);
 
-  /// Destructor.
-  ~TAO_GIOP_Message_Version (void);
-
   /// Explicitly set the major and minor version.
   void set_version (CORBA::Octet maj, CORBA::Octet min);
 
@@ -66,6 +65,8 @@ public:
   bool operator!= (const TAO_GIOP_Message_Version &src);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Version.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
index 216e29f5424..6328534b3fc 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (
     const TAO_GIOP_Message_Version &src)
@@ -18,20 +20,16 @@ TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj,
 {
 }
 
-ACE_INLINE
-TAO_GIOP_Message_Version::~TAO_GIOP_Message_Version (void)
-{
-}
-
 ACE_INLINE TAO_GIOP_Message_Version &
 TAO_GIOP_Message_Version::operator= (
     const TAO_GIOP_Message_Version &src)
 {
-  if (this == &src)
-    return *this;
+  if (this != &src)
+    {
+      this->major = src.major;
+      this->minor = src.minor;
+    }
 
-  this->major = src.major;
-  this->minor = src.minor;
   return *this;
 }
 
@@ -57,3 +55,5 @@ TAO_GIOP_Message_Version::operator!= (
 {
   return !(*this == src);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp
index 464eaa8430e..595a6f85936 100644
--- a/TAO/tao/GIOP_Utils.cpp
+++ b/TAO/tao/GIOP_Utils.cpp
@@ -9,12 +9,13 @@ ACE_RCSID (tao,
            GIOP_Utils,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
-TAO_GIOP_Utils::
-  read_bytes_input (TAO_Transport *transport,
-                    TAO_InputCDR &input,
-                    CORBA::ULong read_size,
-                    ACE_Time_Value *value)
+TAO_GIOP_Utils::read_bytes_input (TAO_Transport *transport,
+                                  TAO_InputCDR &input,
+                                  CORBA::ULong read_size,
+                                  ACE_Time_Value *value)
 {
   // Grow the size of CDR stream
   if (input.grow (read_size) == -1)
@@ -28,7 +29,7 @@ TAO_GIOP_Utils::
   char *buf = input.rd_ptr ();
   ssize_t n = 0;
 
-  for (int t = read_size;
+  for (CORBA::ULong t = read_size;
        t != 0;
        t -= n)
     {
@@ -76,3 +77,5 @@ TAO_GIOP_Utils::read_buffer (TAO_Transport *transport,
 
   return bytes_read;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
index b3d3ff167b3..392e73aafe8 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -27,8 +27,13 @@
 
 #include "tao/IOP_IORC.h"
 
-class TAO_Transport;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Transport;
 
 /**
  * All GIOP messages include a header and message type.  Not
@@ -46,7 +51,7 @@ typedef enum GIOP_Messages
   TAO_GIOP_CLOSECONNECTION = 5,
   TAO_GIOP_MESSAGERROR = 6,           // by both.
   TAO_GIOP_FRAGMENT = 7                // by both.
-}TAO_GIOP_Message_Type;
+}  TAO_GIOP_Message_Type;
 
 
 typedef enum GIOP_LocateStatusType
@@ -144,5 +149,7 @@ public:
                               ACE_Time_Value *max_wait_time = 0);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_UTILS_H */
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index ae586a57a99..a94f2e97302 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -3,14 +3,16 @@
 #include "ace/Reactor.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-  GUIResource_Factory::GUIResource_Factory ():
-    dynamically_allocated_reactor_ (0)
+  GUIResource_Factory::GUIResource_Factory (void)
+    : dynamically_allocated_reactor_ (0)
   {
   }
 
-  GUIResource_Factory::~GUIResource_Factory ()
+  GUIResource_Factory::~GUIResource_Factory (void)
   {
   }
 
@@ -53,3 +55,5 @@ namespace TAO
       delete reactor;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index 0d85ab6b2d1..134f8bfa88a 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -13,18 +13,25 @@
 
 #ifndef TAO_GUI_RESOURCE_FACTORY_H
 #define TAO_GUI_RESOURCE_FACTORY_H
+
 #include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
+
 #include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//forwards
+#include "tao/orbconf.h"
+
+#include "ace/Thread_Mutex.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor_Impl;
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -86,5 +93,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /*TAO_GUI_RESOURCE_FACTORY_H*/
+
+#endif  /* TAO_GUI_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 18cba35abea..02ee7037d5f 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -19,6 +19,8 @@
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
  *        -Wb,post_include="ace/post.h" \
+ *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *        IFR_Base.pidl
  *
  * Only the stub files are used in the TAO_IFR_Client library. The
@@ -50,8 +52,8 @@
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#include <orb_types.pidl>
-#include <Typecode_types.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Typecode_types.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 339d9aea34e..cc95c71fa12 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:293
 
 
-#include "IFR_BaseC.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/AnyTypeCode/Typecode_typesA.h"
@@ -60,22 +60,24 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseC.inl"
+#include "tao/IFR_Client/IFR_BaseC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:786
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -87,13 +89,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -108,13 +110,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:828
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Contained::Description>
     : public
@@ -128,13 +130,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -149,13 +151,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -170,13 +172,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -190,13 +192,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
 #define _CORBA_MODULEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
     : public
@@ -211,13 +213,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
 #define _CORBA_CONSTANTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
     : public
@@ -232,13 +234,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -253,13 +255,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
 #define _CORBA_STRUCTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::StructDef>
     : public
@@ -274,13 +276,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
 #define _CORBA_UNIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::UnionDef>
     : public
@@ -295,13 +297,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
 #define _CORBA_ENUMDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::EnumDef>
     : public
@@ -316,13 +318,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
 #define _CORBA_ALIASDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AliasDef>
     : public
@@ -337,13 +339,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -358,13 +360,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -378,13 +380,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
     : public
@@ -399,13 +401,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
 #define _CORBA_NATIVEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::NativeDef>
     : public
@@ -420,13 +422,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -441,13 +443,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -461,13 +463,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
 #define _CORBA_VALUEBOXDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
     : public
@@ -482,13 +484,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
     : public
@@ -503,13 +505,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -523,13 +525,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
     : public
@@ -544,13 +546,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
     : public
@@ -565,13 +567,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContainedSeq>
     : public
@@ -585,13 +587,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -605,13 +607,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -625,13 +627,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -645,13 +647,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -665,13 +667,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -699,7 +701,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ScopedName:1.0",
     "ScopedName",
     &CORBA::_tc_string);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ScopedName =
@@ -749,7 +751,7 @@ static char const * const _tao_enumerators_CORBA_DefinitionKind[] =
     "dk_Provides",
     "dk_Uses",
     "dk_Event"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -760,7 +762,7 @@ static TAO::TypeCode::Enum<char const *,
     "DefinitionKind",
     _tao_enumerators_CORBA_DefinitionKind,
     36);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
@@ -787,7 +789,7 @@ TAO::Objref_Traits<CORBA::IRObject>::release (
     CORBA::IRObject_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::IRObject_ptr
@@ -806,7 +808,7 @@ TAO::Objref_Traits<CORBA::IRObject>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -823,21 +825,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_IRObject_Proxy_Broker_ == 0)
     {
       CORBA_IRObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::DefinitionKind>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -846,10 +848,10 @@ TAO::Collocation_Proxy_Broker *
       13,
       this->the_TAO_IRObject_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -865,21 +867,21 @@ void CORBA::IRObject::destroy (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_IRObject_Proxy_Broker_ == 0)
     {
       CORBA_IRObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -888,7 +890,7 @@ void CORBA::IRObject::destroy (
       7,
       this->the_TAO_IRObject_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -912,12 +914,12 @@ CORBA::IRObject::CORBA_IRObject_setup_collocation ()
 CORBA::IRObject::~IRObject (void)
 {}
 
-void 
+void
 CORBA::IRObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   IRObject *_tao_tmp_pointer =
     static_cast<IRObject *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::IRObject_ptr
@@ -953,18 +955,18 @@ CORBA::IRObject::_unchecked_narrow (
 CORBA::IRObject_ptr
 CORBA::IRObject::_duplicate (IRObject_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::IRObject::_tao_release (IRObject_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -988,7 +990,7 @@ CORBA::IRObject::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1015,7 +1017,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/IRObject:1.0",
     "IRObject");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_IRObject =
@@ -1035,7 +1037,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/VersionSpec:1.0",
     "VersionSpec",
     &CORBA::_tc_string);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_VersionSpec =
@@ -1062,7 +1064,7 @@ TAO::Objref_Traits<CORBA::Contained>::release (
     CORBA::Contained_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Contained_ptr
@@ -1081,7 +1083,7 @@ TAO::Objref_Traits<CORBA::Contained>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1098,21 +1100,21 @@ char * CORBA::Contained::id (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::RepositoryId>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1121,10 +1123,10 @@ char * CORBA::Contained::id (
       7,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1141,23 +1143,23 @@ void CORBA::Contained::id (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1166,7 +1168,7 @@ void CORBA::Contained::id (
       7,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1183,21 +1185,21 @@ char * CORBA::Contained::name (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Identifier>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1206,10 +1208,10 @@ char * CORBA::Contained::name (
       9,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1226,23 +1228,23 @@ void CORBA::Contained::name (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_name
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1251,7 +1253,7 @@ void CORBA::Contained::name (
       9,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1268,21 +1270,21 @@ char * CORBA::Contained::version (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::VersionSpec>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1291,10 +1293,10 @@ char * CORBA::Contained::version (
       12,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1311,23 +1313,23 @@ void CORBA::Contained::version (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_version
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1336,7 +1338,7 @@ void CORBA::Contained::version (
       12,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1353,21 +1355,21 @@ void CORBA::Contained::version (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Container>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1376,10 +1378,10 @@ void CORBA::Contained::version (
       15,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1395,21 +1397,21 @@ char * CORBA::Contained::absolute_name (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ScopedName>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1418,10 +1420,10 @@ char * CORBA::Contained::absolute_name (
       18,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1437,21 +1439,21 @@ char * CORBA::Contained::absolute_name (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Repository>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1460,10 +1462,10 @@ char * CORBA::Contained::absolute_name (
       26,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1474,7 +1476,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "kind", &CORBA::_tc_DefinitionKind },
     { "value", &CORBA::_tc_any }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -1486,14 +1488,14 @@ static TAO::TypeCode::Struct<char const *,
     "Description",
     _tao_fields_CORBA_Contained_Description,
     2);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
   &_tao_tc_CORBA_Contained_Description;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::Contained::Description::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1515,21 +1517,21 @@ CORBA::Contained::Description::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Contained::Description>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1538,10 +1540,10 @@ CORBA::Contained::Description::_tao_any_destructor (
       8,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1560,19 +1562,19 @@ void CORBA::Contained::move (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Contained_Proxy_Broker_ == 0)
     {
       CORBA_Contained_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container (new_container);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1580,7 +1582,7 @@ void CORBA::Contained::move (
       &_tao_new_name,
       &_tao_new_version
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1589,7 +1591,7 @@ void CORBA::Contained::move (
       4,
       this->the_TAO_Contained_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1608,19 +1610,19 @@ CORBA::Contained::CORBA_Contained_setup_collocation ()
       this->the_TAO_Contained_Proxy_Broker_ =
         ::CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IRObject_setup_collocation ();
 }
 
 CORBA::Contained::~Contained (void)
 {}
 
-void 
+void
 CORBA::Contained::_tao_any_destructor (void *_tao_void_pointer)
 {
   Contained *_tao_tmp_pointer =
     static_cast<Contained *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::Contained_ptr
@@ -1656,18 +1658,18 @@ CORBA::Contained::_unchecked_narrow (
 CORBA::Contained_ptr
 CORBA::Contained::_duplicate (Contained_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::Contained::_tao_release (Contained_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1695,7 +1697,7 @@ CORBA::Contained::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1722,7 +1724,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/Contained:1.0",
     "Contained");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Contained =
@@ -1731,7 +1733,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
@@ -1743,7 +1745,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (void)
 CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         InterfaceDef,
         InterfaceDef_var
       >
@@ -1756,7 +1758,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::InterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         InterfaceDef,
         InterfaceDef_var
       >
@@ -1766,7 +1768,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
 CORBA::InterfaceDefSeq::InterfaceDefSeq (
     const InterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         InterfaceDef,
         InterfaceDef_var
       >
@@ -1813,10 +1815,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_InterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
       &CORBA_InterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -1831,7 +1833,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
     "InterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
@@ -1840,7 +1842,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_VALUEDEFSEQ_CS_)
@@ -1852,7 +1854,7 @@ CORBA::ValueDefSeq::ValueDefSeq (void)
 CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ValueDef,
         ValueDef_var
       >
@@ -1865,7 +1867,7 @@ CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::ValueDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ValueDef,
         ValueDef_var
       >
@@ -1875,7 +1877,7 @@ CORBA::ValueDefSeq::ValueDefSeq (
 CORBA::ValueDefSeq::ValueDefSeq (
     const ValueDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ValueDef,
         ValueDef_var
       >
@@ -1922,10 +1924,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ValueDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
       &CORBA_ValueDefSeq_0;
-    
+
   }
 }
 
@@ -1940,7 +1942,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ValueDefSeq:1.0",
     "ValueDefSeq",
     &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
@@ -1949,7 +1951,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
@@ -1961,7 +1963,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void)
 CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         AbstractInterfaceDef,
         AbstractInterfaceDef_var
       >
@@ -1974,7 +1976,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::AbstractInterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         AbstractInterfaceDef,
         AbstractInterfaceDef_var
       >
@@ -1984,7 +1986,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
 CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     const AbstractInterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         AbstractInterfaceDef,
         AbstractInterfaceDef_var
       >
@@ -2031,10 +2033,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_AbstractInterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
       &CORBA_AbstractInterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -2049,7 +2051,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
     "AbstractInterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
@@ -2058,7 +2060,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
@@ -2070,7 +2072,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void)
 CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         LocalInterfaceDef,
         LocalInterfaceDef_var
       >
@@ -2083,7 +2085,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::LocalInterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         LocalInterfaceDef,
         LocalInterfaceDef_var
       >
@@ -2093,7 +2095,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
 CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     const LocalInterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         LocalInterfaceDef,
         LocalInterfaceDef_var
       >
@@ -2140,10 +2142,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_LocalInterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
       &CORBA_LocalInterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -2158,7 +2160,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
     "LocalInterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
@@ -2167,7 +2169,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CS_)
@@ -2179,7 +2181,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void)
 CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtInterfaceDef,
         ExtInterfaceDef_var
       >
@@ -2192,7 +2194,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::ExtInterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtInterfaceDef,
         ExtInterfaceDef_var
       >
@@ -2202,7 +2204,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
 CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     const ExtInterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtInterfaceDef,
         ExtInterfaceDef_var
       >
@@ -2249,10 +2251,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtInterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
       &CORBA_ExtInterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -2267,7 +2269,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
     "ExtInterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
@@ -2276,7 +2278,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTVALUEDEFSEQ_CS_)
@@ -2288,7 +2290,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (void)
 CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtValueDef,
         ExtValueDef_var
       >
@@ -2301,7 +2303,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::ExtValueDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtValueDef,
         ExtValueDef_var
       >
@@ -2311,7 +2313,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
 CORBA::ExtValueDefSeq::ExtValueDefSeq (
     const ExtValueDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtValueDef,
         ExtValueDef_var
       >
@@ -2358,10 +2360,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtValueDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
       &CORBA_ExtValueDefSeq_0;
-    
+
   }
 }
 
@@ -2376,7 +2378,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
     "ExtValueDefSeq",
     &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
@@ -2385,7 +2387,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
@@ -2397,7 +2399,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void)
 CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtAbstractInterfaceDef,
         ExtAbstractInterfaceDef_var
       >
@@ -2410,7 +2412,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::ExtAbstractInterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtAbstractInterfaceDef,
         ExtAbstractInterfaceDef_var
       >
@@ -2420,7 +2422,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
 CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     const ExtAbstractInterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtAbstractInterfaceDef,
         ExtAbstractInterfaceDef_var
       >
@@ -2467,10 +2469,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtAbstractInterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
       &CORBA_ExtAbstractInterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -2485,7 +2487,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
     "ExtAbstractInterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
@@ -2494,7 +2496,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
@@ -2506,7 +2508,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void)
 CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtLocalInterfaceDef,
         ExtLocalInterfaceDef_var
       >
@@ -2519,7 +2521,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::ExtLocalInterfaceDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtLocalInterfaceDef,
         ExtLocalInterfaceDef_var
       >
@@ -2529,7 +2531,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
 CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     const ExtLocalInterfaceDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExtLocalInterfaceDef,
         ExtLocalInterfaceDef_var
       >
@@ -2576,10 +2578,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtLocalInterfaceDef,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
       &CORBA_ExtLocalInterfaceDefSeq_0;
-    
+
   }
 }
 
@@ -2594,7 +2596,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
     "ExtLocalInterfaceDefSeq",
     &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
@@ -2603,7 +2605,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_CONTAINEDSEQ_CS_)
@@ -2615,7 +2617,7 @@ CORBA::ContainedSeq::ContainedSeq (void)
 CORBA::ContainedSeq::ContainedSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         Contained,
         Contained_var
       >
@@ -2628,7 +2630,7 @@ CORBA::ContainedSeq::ContainedSeq (
     CORBA::Contained_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         Contained,
         Contained_var
       >
@@ -2638,7 +2640,7 @@ CORBA::ContainedSeq::ContainedSeq (
 CORBA::ContainedSeq::ContainedSeq (
     const ContainedSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         Contained,
         Contained_var
       >
@@ -2680,10 +2682,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_Contained,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
       &CORBA_ContainedSeq_0;
-    
+
   }
 }
 
@@ -2698,7 +2700,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ContainedSeq:1.0",
     "ContainedSeq",
     &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
@@ -2715,7 +2717,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "name", &CORBA::_tc_Identifier },
     { "type", &CORBA::_tc_TypeCode },
     { "type_def", &CORBA::_tc_IDLType }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2727,7 +2729,7 @@ static TAO::TypeCode::Struct<char const *,
     "StructMember",
     _tao_fields_CORBA_StructMember,
     3);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StructMember =
@@ -2736,10 +2738,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::StructMember::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2749,7 +2751,7 @@ CORBA::StructMember::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CS_)
@@ -2761,7 +2763,7 @@ CORBA::StructMemberSeq::StructMemberSeq (void)
 CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         StructMember
       >
     (max)
@@ -2773,7 +2775,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::StructMember * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         StructMember
       >
     (max, length, buffer, release)
@@ -2782,7 +2784,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
 CORBA::StructMemberSeq::StructMemberSeq (
     const StructMemberSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         StructMember
       >
     (seq)
@@ -2823,10 +2825,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_StructMember,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
       &CORBA_StructMemberSeq_0;
-    
+
   }
 }
 
@@ -2841,7 +2843,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/StructMemberSeq:1.0",
     "StructMemberSeq",
     &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
@@ -2862,7 +2864,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "members", &CORBA::_tc_StructMemberSeq },
     { "name", &CORBA::_tc_Identifier }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2874,7 +2876,7 @@ static TAO::TypeCode::Struct<char const *,
     "Initializer",
     _tao_fields_CORBA_Initializer,
     2);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Initializer =
@@ -2883,10 +2885,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::Initializer::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2896,7 +2898,7 @@ CORBA::Initializer::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_INITIALIZERSEQ_CS_)
@@ -2908,7 +2910,7 @@ CORBA::InitializerSeq::InitializerSeq (void)
 CORBA::InitializerSeq::InitializerSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Initializer
       >
     (max)
@@ -2920,7 +2922,7 @@ CORBA::InitializerSeq::InitializerSeq (
     CORBA::Initializer * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Initializer
       >
     (max, length, buffer, release)
@@ -2929,7 +2931,7 @@ CORBA::InitializerSeq::InitializerSeq (
 CORBA::InitializerSeq::InitializerSeq (
     const InitializerSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Initializer
       >
     (seq)
@@ -2970,10 +2972,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_Initializer,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
       &CORBA_InitializerSeq_0;
-    
+
   }
 }
 
@@ -2988,7 +2990,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/InitializerSeq:1.0",
     "InitializerSeq",
     &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
@@ -3007,7 +3009,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "defined_in", &CORBA::_tc_RepositoryId },
     { "version", &CORBA::_tc_VersionSpec },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -3019,7 +3021,7 @@ static TAO::TypeCode::Struct<char const *,
     "ExceptionDescription",
     _tao_fields_CORBA_ExceptionDescription,
     5);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
@@ -3028,10 +3030,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ExceptionDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -3041,7 +3043,7 @@ CORBA::ExceptionDescription::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
@@ -3053,7 +3055,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
 CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExceptionDescription
       >
     (max)
@@ -3065,7 +3067,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::ExceptionDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExceptionDescription
       >
     (max, length, buffer, release)
@@ -3074,7 +3076,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
 CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     const ExcDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExceptionDescription
       >
     (seq)
@@ -3115,10 +3117,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExceptionDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
       &CORBA_ExcDescriptionSeq_0;
-    
+
   }
 }
 
@@ -3133,7 +3135,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
     "ExcDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
@@ -3160,7 +3162,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "members", &CORBA::_tc_StructMemberSeq },
     { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
     { "name", &CORBA::_tc_Identifier }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -3172,7 +3174,7 @@ static TAO::TypeCode::Struct<char const *,
     "ExtInitializer",
     _tao_fields_CORBA_ExtInitializer,
     3);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
@@ -3181,10 +3183,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ExtInitializer::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -3194,7 +3196,7 @@ CORBA::ExtInitializer::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ_CS_)
@@ -3206,7 +3208,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (void)
 CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtInitializer
       >
     (max)
@@ -3218,7 +3220,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::ExtInitializer * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtInitializer
       >
     (max, length, buffer, release)
@@ -3227,7 +3229,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
 CORBA::ExtInitializerSeq::ExtInitializerSeq (
     const ExtInitializerSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtInitializer
       >
     (seq)
@@ -3268,10 +3270,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtInitializer,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
       &CORBA_ExtInitializerSeq_0;
-    
+
   }
 }
 
@@ -3286,7 +3288,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
     "ExtInitializerSeq",
     &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
@@ -3304,7 +3306,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "label", &CORBA::_tc_any },
     { "type", &CORBA::_tc_TypeCode },
     { "type_def", &CORBA::_tc_IDLType }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -3316,7 +3318,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnionMember",
     _tao_fields_CORBA_UnionMember,
     4);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UnionMember =
@@ -3325,10 +3327,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::UnionMember::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -3338,7 +3340,7 @@ CORBA::UnionMember::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CS_)
@@ -3350,7 +3352,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (void)
 CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UnionMember
       >
     (max)
@@ -3362,7 +3364,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::UnionMember * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UnionMember
       >
     (max, length, buffer, release)
@@ -3371,7 +3373,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
 CORBA::UnionMemberSeq::UnionMemberSeq (
     const UnionMemberSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UnionMember
       >
     (seq)
@@ -3412,10 +3414,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_UnionMember,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
       &CORBA_UnionMemberSeq_0;
-    
+
   }
 }
 
@@ -3430,7 +3432,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
     "UnionMemberSeq",
     &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
@@ -3439,7 +3441,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
@@ -3451,7 +3453,7 @@ CORBA::EnumMemberSeq::EnumMemberSeq (void)
 CORBA::EnumMemberSeq::EnumMemberSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -3461,14 +3463,14 @@ CORBA::EnumMemberSeq::EnumMemberSeq (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::EnumMemberSeq::EnumMemberSeq (
     const EnumMemberSeq &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -3507,10 +3509,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_Identifier,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
       &CORBA_EnumMemberSeq_0;
-    
+
   }
 }
 
@@ -3525,7 +3527,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
     "EnumMemberSeq",
     &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
@@ -3552,7 +3554,7 @@ TAO::Objref_Traits<CORBA::Container>::release (
     CORBA::Container_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Container_ptr
@@ -3571,7 +3573,7 @@ TAO::Objref_Traits<CORBA::Container>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3589,23 +3591,23 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_search_name
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3614,10 +3616,10 @@ TAO::Collocation_Proxy_Broker *
       6,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3635,25 +3637,25 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3662,10 +3664,10 @@ TAO::Collocation_Proxy_Broker *
       8,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3685,20 +3687,20 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
   TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3707,7 +3709,7 @@ TAO::Collocation_Proxy_Broker *
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3716,10 +3718,10 @@ TAO::Collocation_Proxy_Broker *
       11,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3731,7 +3733,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "contained_object", &CORBA::_tc_Contained },
     { "kind", &CORBA::_tc_DefinitionKind },
     { "value", &CORBA::_tc_any }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -3743,14 +3745,14 @@ static TAO::TypeCode::Struct<char const *,
     "Description",
     _tao_fields_CORBA_Container_Description,
     3);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
   &_tao_tc_CORBA_Container_Description;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::Container::Description::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -3760,7 +3762,7 @@ CORBA::Container::Description::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
@@ -3772,7 +3774,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (void)
 CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Description
       >
     (max)
@@ -3784,7 +3786,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::Container::Description * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Description
       >
     (max, length, buffer, release)
@@ -3793,7 +3795,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
 CORBA::Container::DescriptionSeq::DescriptionSeq (
     const DescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Description
       >
     (seq)
@@ -3834,10 +3836,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::Container::_tc_Description,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
       &CORBA_Container_DescriptionSeq_0;
-    
+
   }
 }
 
@@ -3852,7 +3854,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
     "DescriptionSeq",
     &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
   &_tao_tc_CORBA_Container_DescriptionSeq;
 
@@ -3871,19 +3873,19 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3891,7 +3893,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_exclude_inherited,
       &_tao_max_returned_objs
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3900,10 +3902,10 @@ static TAO::TypeCode::Alias<char const *,
       17,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3922,19 +3924,19 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ModuleDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3942,7 +3944,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_name,
       &_tao_version
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3951,10 +3953,10 @@ static TAO::TypeCode::Alias<char const *,
       13,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3975,21 +3977,21 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ConstantDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3999,7 +4001,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_type,
       &_tao_value
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4008,10 +4010,10 @@ static TAO::TypeCode::Alias<char const *,
       15,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4031,20 +4033,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::StructDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4053,7 +4055,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4062,10 +4064,10 @@ static TAO::TypeCode::Alias<char const *,
       13,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4086,21 +4088,21 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::UnionDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
   TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4110,7 +4112,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_discriminator_type,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4119,10 +4121,10 @@ static TAO::TypeCode::Alias<char const *,
       12,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4142,20 +4144,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::EnumDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4164,7 +4166,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4173,10 +4175,10 @@ static TAO::TypeCode::Alias<char const *,
       11,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4196,20 +4198,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::AliasDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4218,7 +4220,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_original_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4227,10 +4229,10 @@ static TAO::TypeCode::Alias<char const *,
       12,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4250,20 +4252,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4272,7 +4274,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4281,10 +4283,10 @@ static TAO::TypeCode::Alias<char const *,
       16,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4310,14 +4312,14 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -4329,7 +4331,7 @@ static TAO::TypeCode::Alias<char const *,
   TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4344,7 +4346,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4353,10 +4355,10 @@ static TAO::TypeCode::Alias<char const *,
       12,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4376,20 +4378,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueBoxDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4398,7 +4400,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_original_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4407,10 +4409,10 @@ static TAO::TypeCode::Alias<char const *,
       16,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4430,20 +4432,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExceptionDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4452,7 +4454,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4461,10 +4463,10 @@ static TAO::TypeCode::Alias<char const *,
       16,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4483,19 +4485,19 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::NativeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4503,7 +4505,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_name,
       &_tao_version
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4512,10 +4514,10 @@ static TAO::TypeCode::Alias<char const *,
       13,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4535,20 +4537,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4557,7 +4559,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4566,10 +4568,10 @@ static TAO::TypeCode::Alias<char const *,
       25,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4589,20 +4591,20 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::LocalInterfaceDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4611,7 +4613,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4620,10 +4622,10 @@ static TAO::TypeCode::Alias<char const *,
       22,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4649,14 +4651,14 @@ static TAO::TypeCode::Alias<char const *,
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExtValueDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -4668,7 +4670,7 @@ static TAO::TypeCode::Alias<char const *,
   TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4683,7 +4685,7 @@ static TAO::TypeCode::Alias<char const *,
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4692,10 +4694,10 @@ static TAO::TypeCode::Alias<char const *,
       16,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4713,19 +4715,19 @@ CORBA::Container::CORBA_Container_setup_collocation ()
       this->the_TAO_Container_Proxy_Broker_ =
         ::CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IRObject_setup_collocation ();
 }
 
 CORBA::Container::~Container (void)
 {}
 
-void 
+void
 CORBA::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *_tao_tmp_pointer =
     static_cast<Container *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::Container_ptr
@@ -4761,18 +4763,18 @@ CORBA::Container::_unchecked_narrow (
 CORBA::Container_ptr
 CORBA::Container::_duplicate (Container_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::Container::_tao_release (Container_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4800,7 +4802,7 @@ CORBA::Container::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4827,7 +4829,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/Container:1.0",
     "Container");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Container =
@@ -4854,7 +4856,7 @@ TAO::Objref_Traits<CORBA::IDLType>::release (
     CORBA::IDLType_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::IDLType_ptr
@@ -4873,7 +4875,7 @@ TAO::Objref_Traits<CORBA::IDLType>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4890,21 +4892,21 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_IDLType_Proxy_Broker_ == 0)
     {
       CORBA_IDLType_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4913,10 +4915,10 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
       9,
       this->the_TAO_IDLType_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4934,19 +4936,19 @@ CORBA::IDLType::CORBA_IDLType_setup_collocation ()
       this->the_TAO_IDLType_Proxy_Broker_ =
         ::CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IRObject_setup_collocation ();
 }
 
 CORBA::IDLType::~IDLType (void)
 {}
 
-void 
+void
 CORBA::IDLType::_tao_any_destructor (void *_tao_void_pointer)
 {
   IDLType *_tao_tmp_pointer =
     static_cast<IDLType *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::IDLType_ptr
@@ -4982,18 +4984,18 @@ CORBA::IDLType::_unchecked_narrow (
 CORBA::IDLType_ptr
 CORBA::IDLType::_duplicate (IDLType_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::IDLType::_tao_release (IDLType_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -5021,7 +5023,7 @@ CORBA::IDLType::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -5048,7 +5050,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/IDLType:1.0",
     "IDLType");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_IDLType =
@@ -5075,7 +5077,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::release (
     CORBA::TypedefDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::TypedefDef_ptr
@@ -5094,7 +5096,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -5113,7 +5115,7 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation ()
       this->the_TAO_TypedefDef_Proxy_Broker_ =
         ::CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
   this->CORBA_IDLType_setup_collocation ();
 }
@@ -5121,12 +5123,12 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation ()
 CORBA::TypedefDef::~TypedefDef (void)
 {}
 
-void 
+void
 CORBA::TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypedefDef *_tao_tmp_pointer =
     static_cast<TypedefDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::TypedefDef_ptr
@@ -5162,18 +5164,18 @@ CORBA::TypedefDef::_unchecked_narrow (
 CORBA::TypedefDef_ptr
 CORBA::TypedefDef::_duplicate (TypedefDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::TypedefDef::_tao_release (TypedefDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -5209,7 +5211,7 @@ CORBA::TypedefDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -5236,7 +5238,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/TypedefDef:1.0",
     "TypedefDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TypedefDef =
@@ -5255,7 +5257,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "defined_in", &CORBA::_tc_RepositoryId },
     { "version", &CORBA::_tc_VersionSpec },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -5267,7 +5269,7 @@ static TAO::TypeCode::Struct<char const *,
     "TypeDescription",
     _tao_fields_CORBA_TypeDescription,
     5);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TypeDescription =
@@ -5276,10 +5278,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::TypeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5313,7 +5315,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
         _tao_any,
         CORBA::_tc_DefinitionKind,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -5433,7 +5435,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5491,7 +5493,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5550,7 +5552,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5609,7 +5611,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5668,7 +5670,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5727,7 +5729,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5786,7 +5788,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5845,7 +5847,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5904,7 +5906,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -5963,7 +5965,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6022,7 +6024,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6080,7 +6082,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6139,7 +6141,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6197,7 +6199,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6256,7 +6258,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6314,7 +6316,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6373,7 +6375,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6431,7 +6433,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6490,7 +6492,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6548,7 +6550,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6607,7 +6609,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6724,7 +6726,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6782,7 +6784,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6957,7 +6959,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7027,12 +7029,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::DefinitionKind & _tao_enu
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<CORBA::DefinitionKind> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -7054,21 +7056,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::IRObject RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -7113,21 +7115,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::Contained RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -7142,25 +7144,7 @@ CORBA::Boolean operator<< (
     const CORBA::InterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7168,40 +7152,7 @@ CORBA::Boolean operator>> (
     CORBA::InterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_ */
@@ -7217,25 +7168,7 @@ CORBA::Boolean operator<< (
     const CORBA::ValueDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ValueDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7243,40 +7176,7 @@ CORBA::Boolean operator>> (
     CORBA::ValueDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_ */
@@ -7292,25 +7192,7 @@ CORBA::Boolean operator<< (
     const CORBA::AbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7318,40 +7200,7 @@ CORBA::Boolean operator>> (
     CORBA::AbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_ */
@@ -7367,25 +7216,7 @@ CORBA::Boolean operator<< (
     const CORBA::LocalInterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7393,40 +7224,7 @@ CORBA::Boolean operator>> (
     CORBA::LocalInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_ */
@@ -7442,25 +7240,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtInterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7468,40 +7248,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_ */
@@ -7517,25 +7264,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtValueDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7543,40 +7272,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtValueDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_ */
@@ -7592,25 +7288,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7618,40 +7296,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_ */
@@ -7667,25 +7312,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7693,40 +7320,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_ */
@@ -7742,25 +7336,7 @@ CORBA::Boolean operator<< (
     const CORBA::ContainedSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::Contained>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7768,40 +7344,7 @@ CORBA::Boolean operator>> (
     CORBA::ContainedSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_CPP_ */
@@ -7845,22 +7388,7 @@ CORBA::Boolean operator<< (
     const CORBA::StructMemberSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7868,40 +7396,7 @@ CORBA::Boolean operator>> (
     CORBA::StructMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_ */
@@ -7940,22 +7435,7 @@ CORBA::Boolean operator<< (
     const CORBA::InitializerSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7963,40 +7443,7 @@ CORBA::Boolean operator>> (
     CORBA::InitializerSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_CPP_ */
@@ -8041,22 +7488,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExcDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -8064,40 +7496,7 @@ CORBA::Boolean operator>> (
     CORBA::ExcDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_ */
@@ -8138,22 +7537,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtInitializerSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -8161,40 +7545,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtInitializerSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_ */
@@ -8240,22 +7591,7 @@ CORBA::Boolean operator<< (
     const CORBA::UnionMemberSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -8263,40 +7599,7 @@ CORBA::Boolean operator>> (
     CORBA::UnionMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_ */
@@ -8312,22 +7615,7 @@ CORBA::Boolean operator<< (
     const CORBA::EnumMemberSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -8335,41 +7623,7 @@ CORBA::Boolean operator>> (
     CORBA::EnumMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_ */
@@ -8413,22 +7667,7 @@ CORBA::Boolean operator<< (
     const CORBA::Container::DescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -8436,40 +7675,7 @@ CORBA::Boolean operator>> (
     CORBA::Container::DescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_ */
@@ -8492,21 +7698,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::Container RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -8528,21 +7734,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::IDLType RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -8564,21 +7770,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::TypedefDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -8610,3 +7816,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 7d7e3171b2b..b8afb930ab7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ifr_client_export.h"
+#include "tao/IFR_Client/ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,6 +72,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -515,7 +517,7 @@ namespace CORBA
       typedef Description_var _var_type;
 
       static void _tao_any_destructor (void *);
-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
+      ::CORBA::DefinitionKind kind;
       CORBA::Any value;
     };
 
@@ -791,29 +793,20 @@ namespace CORBA
   class InterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        InterfaceDefSeq,
-        TAO_Object_Manager<
-            InterfaceDef,
-            InterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        InterfaceDefSeq
       >
     InterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        InterfaceDefSeq,
-        InterfaceDefSeq_var,
-        TAO_Object_Manager<
-            InterfaceDef,
-            InterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        InterfaceDefSeq
       >
     InterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export InterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             InterfaceDef,
             InterfaceDef_var
           >
@@ -825,7 +818,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         InterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
@@ -920,29 +913,20 @@ namespace CORBA
   class ValueDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ValueDefSeq,
-        TAO_Object_Manager<
-            ValueDef,
-            ValueDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ValueDefSeq
       >
     ValueDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ValueDefSeq,
-        ValueDefSeq_var,
-        TAO_Object_Manager<
-            ValueDef,
-            ValueDef_var
-          >
+    TAO_Seq_Out_T<
+        ValueDefSeq
       >
     ValueDefSeq_out;
 
   class TAO_IFR_Client_Export ValueDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ValueDef,
             ValueDef_var
           >
@@ -954,7 +938,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ValueDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
@@ -1026,29 +1010,20 @@ namespace CORBA
   class AbstractInterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        AbstractInterfaceDefSeq,
-        TAO_Object_Manager<
-            AbstractInterfaceDef,
-            AbstractInterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        AbstractInterfaceDefSeq
       >
     AbstractInterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        AbstractInterfaceDefSeq,
-        AbstractInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            AbstractInterfaceDef,
-            AbstractInterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        AbstractInterfaceDefSeq
       >
     AbstractInterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             AbstractInterfaceDef,
             AbstractInterfaceDef_var
           >
@@ -1060,7 +1035,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         AbstractInterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
@@ -1109,29 +1084,20 @@ namespace CORBA
   class LocalInterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        LocalInterfaceDefSeq,
-        TAO_Object_Manager<
-            LocalInterfaceDef,
-            LocalInterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        LocalInterfaceDefSeq
       >
     LocalInterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        LocalInterfaceDefSeq,
-        LocalInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            LocalInterfaceDef,
-            LocalInterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        LocalInterfaceDefSeq
       >
     LocalInterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export LocalInterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             LocalInterfaceDef,
             LocalInterfaceDef_var
           >
@@ -1143,7 +1109,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         LocalInterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
@@ -1192,29 +1158,20 @@ namespace CORBA
   class ExtInterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ExtInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtInterfaceDef,
-            ExtInterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ExtInterfaceDefSeq
       >
     ExtInterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ExtInterfaceDefSeq,
-        ExtInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtInterfaceDef,
-            ExtInterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        ExtInterfaceDefSeq
       >
     ExtInterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export ExtInterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ExtInterfaceDef,
             ExtInterfaceDef_var
           >
@@ -1226,7 +1183,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExtInterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
     ~ExtInterfaceDefSeq (void);
@@ -1275,29 +1232,20 @@ namespace CORBA
   class ExtValueDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ExtValueDefSeq,
-        TAO_Object_Manager<
-            ExtValueDef,
-            ExtValueDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ExtValueDefSeq
       >
     ExtValueDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ExtValueDefSeq,
-        ExtValueDefSeq_var,
-        TAO_Object_Manager<
-            ExtValueDef,
-            ExtValueDef_var
-          >
+    TAO_Seq_Out_T<
+        ExtValueDefSeq
       >
     ExtValueDefSeq_out;
 
   class TAO_IFR_Client_Export ExtValueDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ExtValueDef,
             ExtValueDef_var
           >
@@ -1309,7 +1257,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExtValueDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExtValueDefSeq (const ExtValueDefSeq &);
     ~ExtValueDefSeq (void);
@@ -1358,29 +1306,20 @@ namespace CORBA
   class ExtAbstractInterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ExtAbstractInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtAbstractInterfaceDef,
-            ExtAbstractInterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ExtAbstractInterfaceDefSeq
       >
     ExtAbstractInterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ExtAbstractInterfaceDefSeq,
-        ExtAbstractInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtAbstractInterfaceDef,
-            ExtAbstractInterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        ExtAbstractInterfaceDefSeq
       >
     ExtAbstractInterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ExtAbstractInterfaceDef,
             ExtAbstractInterfaceDef_var
           >
@@ -1392,7 +1331,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExtAbstractInterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
     ~ExtAbstractInterfaceDefSeq (void);
@@ -1441,29 +1380,20 @@ namespace CORBA
   class ExtLocalInterfaceDefSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ExtLocalInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtLocalInterfaceDef,
-            ExtLocalInterfaceDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ExtLocalInterfaceDefSeq
       >
     ExtLocalInterfaceDefSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ExtLocalInterfaceDefSeq,
-        ExtLocalInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtLocalInterfaceDef,
-            ExtLocalInterfaceDef_var
-          >
+    TAO_Seq_Out_T<
+        ExtLocalInterfaceDefSeq
       >
     ExtLocalInterfaceDefSeq_out;
 
   class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ExtLocalInterfaceDef,
             ExtLocalInterfaceDef_var
           >
@@ -1475,7 +1405,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExtLocalInterfaceDef_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
     ~ExtLocalInterfaceDefSeq (void);
@@ -1501,29 +1431,20 @@ namespace CORBA
   class ContainedSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ContainedSeq,
-        TAO_Object_Manager<
-            Contained,
-            Contained_var
-          >
+    TAO_VarSeq_Var_T<
+        ContainedSeq
       >
     ContainedSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ContainedSeq,
-        ContainedSeq_var,
-        TAO_Object_Manager<
-            Contained,
-            Contained_var
-          >
+    TAO_Seq_Out_T<
+        ContainedSeq
       >
     ContainedSeq_out;
 
   class TAO_IFR_Client_Export ContainedSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             Contained,
             Contained_var
           >
@@ -1535,7 +1456,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         Contained_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ContainedSeq (const ContainedSeq &);
     ~ContainedSeq (void);
@@ -1578,7 +1499,7 @@ namespace CORBA
     typedef StructMember_var _var_type;
 
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
+    TAO::String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
@@ -1598,22 +1519,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        StructMemberSeq,
-        StructMember
+        StructMemberSeq
       >
     StructMemberSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        StructMemberSeq,
-        StructMemberSeq_var,
-        StructMember
+        StructMemberSeq
       >
     StructMemberSeq_out;
 
   class TAO_IFR_Client_Export StructMemberSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             StructMember
           >
   {
@@ -1624,7 +1542,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         StructMember* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
@@ -1668,7 +1586,7 @@ namespace CORBA
 
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
-    TAO_String_Manager name;
+    TAO::String_Manager name;
   };
 
   // TAO_IDL - Generated from
@@ -1686,22 +1604,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        InitializerSeq,
-        Initializer
+        InitializerSeq
       >
     InitializerSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        InitializerSeq,
-        InitializerSeq_var,
-        Initializer
+        InitializerSeq
       >
     InitializerSeq_out;
 
   class TAO_IFR_Client_Export InitializerSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             Initializer
           >
   {
@@ -1712,7 +1627,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         Initializer* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
@@ -1755,10 +1670,10 @@ namespace CORBA
     typedef ExceptionDescription_var _var_type;
 
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
   };
 
@@ -1777,22 +1692,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        ExcDescriptionSeq,
-        ExceptionDescription
+        ExcDescriptionSeq
       >
     ExcDescriptionSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        ExcDescriptionSeq,
-        ExcDescriptionSeq_var,
-        ExceptionDescription
+        ExcDescriptionSeq
       >
     ExcDescriptionSeq_out;
 
   class TAO_IFR_Client_Export ExcDescriptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ExceptionDescription
           >
   {
@@ -1803,7 +1715,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExceptionDescription* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExcDescriptionSeq (const ExcDescriptionSeq &);
     ~ExcDescriptionSeq (void);
@@ -1848,7 +1760,7 @@ namespace CORBA
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     CORBA::ExcDescriptionSeq exceptions;
-    TAO_String_Manager name;
+    TAO::String_Manager name;
   };
 
   // TAO_IDL - Generated from
@@ -1866,22 +1778,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        ExtInitializerSeq,
-        ExtInitializer
+        ExtInitializerSeq
       >
     ExtInitializerSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        ExtInitializerSeq,
-        ExtInitializerSeq_var,
-        ExtInitializer
+        ExtInitializerSeq
       >
     ExtInitializerSeq_out;
 
   class TAO_IFR_Client_Export ExtInitializerSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ExtInitializer
           >
   {
@@ -1892,7 +1801,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ExtInitializer* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ExtInitializerSeq (const ExtInitializerSeq &);
     ~ExtInitializerSeq (void);
@@ -1935,7 +1844,7 @@ namespace CORBA
     typedef UnionMember_var _var_type;
 
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
+    TAO::String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
@@ -1956,22 +1865,19 @@ namespace CORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        UnionMemberSeq,
-        UnionMember
+        UnionMemberSeq
       >
     UnionMemberSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        UnionMemberSeq,
-        UnionMemberSeq_var,
-        UnionMember
+        UnionMemberSeq
       >
     UnionMemberSeq_out;
 
   class TAO_IFR_Client_Export UnionMemberSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             UnionMember
           >
   {
@@ -1982,7 +1888,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         UnionMember* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
@@ -2008,23 +1914,20 @@ namespace CORBA
   class EnumMemberSeq;
 
   typedef
-    TAO_MngSeq_Var_T<
-        EnumMemberSeq,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        EnumMemberSeq
       >
     EnumMemberSeq_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        EnumMemberSeq,
-        EnumMemberSeq_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        EnumMemberSeq
       >
     EnumMemberSeq_out;
 
   class TAO_IFR_Client_Export EnumMemberSeq
     : public
-        TAO_Unbounded_String_Sequence
+        TAO::unbounded_string_sequence
   {
   public:
     EnumMemberSeq (void);
@@ -2033,7 +1936,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         char ** buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
@@ -2149,8 +2052,8 @@ namespace CORBA
       typedef Description_var _var_type;
 
       static void _tao_any_destructor (void *);
-      ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
+      ::CORBA::Contained_var contained_object;
+      ::CORBA::DefinitionKind kind;
       CORBA::Any value;
     };
 
@@ -2169,22 +2072,19 @@ namespace CORBA
 
     typedef
       TAO_VarSeq_Var_T<
-          DescriptionSeq,
-          Description
+          DescriptionSeq
         >
       DescriptionSeq_var;
 
     typedef
       TAO_Seq_Out_T<
-          DescriptionSeq,
-          DescriptionSeq_var,
-          Description
+          DescriptionSeq
         >
       DescriptionSeq_out;
 
     class TAO_IFR_Client_Export DescriptionSeq
       : public
-          TAO_Unbounded_Sequence<
+          TAO::unbounded_value_sequence<
               Description
             >
     {
@@ -2195,7 +2095,7 @@ namespace CORBA
           CORBA::ULong max,
           CORBA::ULong length,
           Description* buffer,
-          CORBA::Boolean release = 0
+          CORBA::Boolean release = false
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
@@ -2718,10 +2618,10 @@ namespace CORBA
     typedef TypeDescription_var _var_type;
 
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
   };
 
@@ -4105,8 +4005,10 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseC.inl"
+#include "tao/IFR_Client/IFR_BaseC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl
index 8b69d04033d..ac770e58826 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.inl
+++ b/TAO/tao/IFR_Client/IFR_BaseC.inl
@@ -29,6 +29,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (_CORBA_IROBJECT___CI_)
 #define _CORBA_IROBJECT___CI_
 
@@ -39,7 +41,7 @@ CORBA::IRObject::IRObject (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,7 +57,7 @@ CORBA::IRObject::IRObject (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_IRObject_Proxy_Broker_ (0)
 {
 }
@@ -75,7 +77,7 @@ CORBA::Contained::Contained (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -91,7 +93,7 @@ CORBA::Contained::Contained (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Contained_Proxy_Broker_ (0)
 {
 }
@@ -111,7 +113,7 @@ CORBA::Container::Container (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -127,7 +129,7 @@ CORBA::Container::Container (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Container_Proxy_Broker_ (0)
 {
 }
@@ -147,7 +149,7 @@ CORBA::IDLType::IDLType (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -163,7 +165,7 @@ CORBA::IDLType::IDLType (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_IDLType_Proxy_Broker_ (0)
 {
 }
@@ -183,7 +185,7 @@ CORBA::TypedefDef::TypedefDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -199,9 +201,11 @@ CORBA::TypedefDef::TypedefDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_TypedefDef_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 1fea87667c7..0dd9ad297a6 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IFR_BaseC.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/orb_typesS.h"
 #include "tao/Typecode_typesS.h"
 
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
 
@@ -1248,6 +1250,8 @@ namespace POA_CORBA
 
 } // module CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index fa156e72b2d..c86b4e3a291 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -18,6 +18,8 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Basic.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
@@ -49,7 +51,7 @@
 #define _IFR_BASIC_IDL_
 
 #include "tao/IFR_Client/IFR_Base.pidl"
-#include "ParameterMode.pidl"
+#include "tao/ParameterMode.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index e9b3916a962..bcaf1168857 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:293
 
 
-#include "IFR_BasicC.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
@@ -62,12 +62,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicC.inl"
+#include "tao/IFR_Client/IFR_BasicC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -644,7 +646,7 @@ TAO::Objref_Traits<CORBA::Repository>::release (
     CORBA::Repository_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Repository_ptr
@@ -681,7 +683,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -726,7 +728,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -771,7 +773,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -816,7 +818,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -861,7 +863,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -907,7 +909,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -955,7 +957,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -1003,7 +1005,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
@@ -1063,7 +1065,7 @@ CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
     static_cast<Repository *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::Repository_ptr
@@ -1099,7 +1101,7 @@ CORBA::Repository::_unchecked_narrow (
 CORBA::Repository_ptr
 CORBA::Repository::_duplicate (Repository_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -1110,7 +1112,7 @@ CORBA::Repository::_duplicate (Repository_ptr obj)
 void
 CORBA::Repository::_tao_release (Repository_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1142,7 +1144,7 @@ CORBA::Repository::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1196,7 +1198,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::release (
     CORBA::ModuleDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ModuleDef_ptr
@@ -1247,7 +1249,7 @@ CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
     static_cast<ModuleDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ModuleDef_ptr
@@ -1283,7 +1285,7 @@ CORBA::ModuleDef::_unchecked_narrow (
 CORBA::ModuleDef_ptr
 CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -1294,7 +1296,7 @@ CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
 void
 CORBA::ModuleDef::_tao_release (ModuleDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1330,7 +1332,7 @@ CORBA::ModuleDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1427,7 +1429,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::release (
     CORBA::ConstantDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ConstantDef_ptr
@@ -1463,7 +1465,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
@@ -1505,7 +1507,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
@@ -1548,7 +1550,7 @@ void CORBA::ConstantDef::type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
@@ -1590,7 +1592,7 @@ CORBA::Any * CORBA::ConstantDef::value (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
@@ -1633,7 +1635,7 @@ void CORBA::ConstantDef::value (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
@@ -1689,7 +1691,7 @@ CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstantDef *_tao_tmp_pointer =
     static_cast<ConstantDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ConstantDef_ptr
@@ -1725,7 +1727,7 @@ CORBA::ConstantDef::_unchecked_narrow (
 CORBA::ConstantDef_ptr
 CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -1736,7 +1738,7 @@ CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
 void
 CORBA::ConstantDef::_tao_release (ConstantDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1768,7 +1770,7 @@ CORBA::ConstantDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1867,7 +1869,7 @@ TAO::Objref_Traits<CORBA::StructDef>::release (
     CORBA::StructDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::StructDef_ptr
@@ -1903,7 +1905,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
@@ -1946,7 +1948,7 @@ void CORBA::StructDef::members (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
@@ -2003,7 +2005,7 @@ CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StructDef *_tao_tmp_pointer =
     static_cast<StructDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::StructDef_ptr
@@ -2039,7 +2041,7 @@ CORBA::StructDef::_unchecked_narrow (
 CORBA::StructDef_ptr
 CORBA::StructDef::_duplicate (StructDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -2050,7 +2052,7 @@ CORBA::StructDef::_duplicate (StructDef_ptr obj)
 void
 CORBA::StructDef::_tao_release (StructDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2094,7 +2096,7 @@ CORBA::StructDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2148,7 +2150,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::release (
     CORBA::UnionDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::UnionDef_ptr
@@ -2184,7 +2186,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
@@ -2226,7 +2228,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
@@ -2269,7 +2271,7 @@ void CORBA::UnionDef::discriminator_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
@@ -2311,7 +2313,7 @@ void CORBA::UnionDef::discriminator_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
@@ -2354,7 +2356,7 @@ void CORBA::UnionDef::members (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
@@ -2411,7 +2413,7 @@ CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnionDef *_tao_tmp_pointer =
     static_cast<UnionDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::UnionDef_ptr
@@ -2447,7 +2449,7 @@ CORBA::UnionDef::_unchecked_narrow (
 CORBA::UnionDef_ptr
 CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -2458,7 +2460,7 @@ CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
 void
 CORBA::UnionDef::_tao_release (UnionDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2502,7 +2504,7 @@ CORBA::UnionDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2556,7 +2558,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::release (
     CORBA::EnumDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::EnumDef_ptr
@@ -2592,7 +2594,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
@@ -2635,7 +2637,7 @@ void CORBA::EnumDef::members (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
@@ -2691,7 +2693,7 @@ CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnumDef *_tao_tmp_pointer =
     static_cast<EnumDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::EnumDef_ptr
@@ -2727,7 +2729,7 @@ CORBA::EnumDef::_unchecked_narrow (
 CORBA::EnumDef_ptr
 CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -2738,7 +2740,7 @@ CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
 void
 CORBA::EnumDef::_tao_release (EnumDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2778,7 +2780,7 @@ CORBA::EnumDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2832,7 +2834,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::release (
     CORBA::AliasDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::AliasDef_ptr
@@ -2868,7 +2870,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
@@ -2911,7 +2913,7 @@ void CORBA::AliasDef::original_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
@@ -2967,7 +2969,7 @@ CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AliasDef *_tao_tmp_pointer =
     static_cast<AliasDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::AliasDef_ptr
@@ -3003,7 +3005,7 @@ CORBA::AliasDef::_unchecked_narrow (
 CORBA::AliasDef_ptr
 CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -3014,7 +3016,7 @@ CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
 void
 CORBA::AliasDef::_tao_release (AliasDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3054,7 +3056,7 @@ CORBA::AliasDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3108,7 +3110,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::release (
     CORBA::NativeDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::NativeDef_ptr
@@ -3158,7 +3160,7 @@ CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   NativeDef *_tao_tmp_pointer =
     static_cast<NativeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::NativeDef_ptr
@@ -3194,7 +3196,7 @@ CORBA::NativeDef::_unchecked_narrow (
 CORBA::NativeDef_ptr
 CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -3205,7 +3207,7 @@ CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
 void
 CORBA::NativeDef::_tao_release (NativeDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3245,7 +3247,7 @@ CORBA::NativeDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3299,7 +3301,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::release (
     CORBA::PrimitiveDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::PrimitiveDef_ptr
@@ -3335,7 +3337,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_PrimitiveDef_Proxy_Broker_ == 0)
@@ -3391,7 +3393,7 @@ CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrimitiveDef *_tao_tmp_pointer =
     static_cast<PrimitiveDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::PrimitiveDef_ptr
@@ -3427,7 +3429,7 @@ CORBA::PrimitiveDef::_unchecked_narrow (
 CORBA::PrimitiveDef_ptr
 CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -3438,7 +3440,7 @@ CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
 void
 CORBA::PrimitiveDef::_tao_release (PrimitiveDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3470,7 +3472,7 @@ CORBA::PrimitiveDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3524,7 +3526,7 @@ TAO::Objref_Traits<CORBA::StringDef>::release (
     CORBA::StringDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::StringDef_ptr
@@ -3560,7 +3562,7 @@ CORBA::ULong CORBA::StringDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
@@ -3603,7 +3605,7 @@ void CORBA::StringDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
@@ -3659,7 +3661,7 @@ CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StringDef *_tao_tmp_pointer =
     static_cast<StringDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::StringDef_ptr
@@ -3695,7 +3697,7 @@ CORBA::StringDef::_unchecked_narrow (
 CORBA::StringDef_ptr
 CORBA::StringDef::_duplicate (StringDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -3706,7 +3708,7 @@ CORBA::StringDef::_duplicate (StringDef_ptr obj)
 void
 CORBA::StringDef::_tao_release (StringDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3738,7 +3740,7 @@ CORBA::StringDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3792,7 +3794,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::release (
     CORBA::WstringDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::WstringDef_ptr
@@ -3828,7 +3830,7 @@ CORBA::ULong CORBA::WstringDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
@@ -3871,7 +3873,7 @@ void CORBA::WstringDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
@@ -3927,7 +3929,7 @@ CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   WstringDef *_tao_tmp_pointer =
     static_cast<WstringDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::WstringDef_ptr
@@ -3963,7 +3965,7 @@ CORBA::WstringDef::_unchecked_narrow (
 CORBA::WstringDef_ptr
 CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -3974,7 +3976,7 @@ CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
 void
 CORBA::WstringDef::_tao_release (WstringDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4006,7 +4008,7 @@ CORBA::WstringDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4060,7 +4062,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::release (
     CORBA::SequenceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::SequenceDef_ptr
@@ -4096,7 +4098,7 @@ CORBA::ULong CORBA::SequenceDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
@@ -4139,7 +4141,7 @@ void CORBA::SequenceDef::bound (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
@@ -4181,7 +4183,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
@@ -4223,7 +4225,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
@@ -4266,7 +4268,7 @@ void CORBA::SequenceDef::element_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
@@ -4322,7 +4324,7 @@ CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   SequenceDef *_tao_tmp_pointer =
     static_cast<SequenceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::SequenceDef_ptr
@@ -4358,7 +4360,7 @@ CORBA::SequenceDef::_unchecked_narrow (
 CORBA::SequenceDef_ptr
 CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -4369,7 +4371,7 @@ CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
 void
 CORBA::SequenceDef::_tao_release (SequenceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4401,7 +4403,7 @@ CORBA::SequenceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4455,7 +4457,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::release (
     CORBA::ArrayDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ArrayDef_ptr
@@ -4491,7 +4493,7 @@ CORBA::ULong CORBA::ArrayDef::length (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
@@ -4534,7 +4536,7 @@ void CORBA::ArrayDef::length (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
@@ -4576,7 +4578,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
@@ -4618,7 +4620,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
@@ -4661,7 +4663,7 @@ void CORBA::ArrayDef::element_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
@@ -4717,7 +4719,7 @@ CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ArrayDef *_tao_tmp_pointer =
     static_cast<ArrayDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ArrayDef_ptr
@@ -4753,7 +4755,7 @@ CORBA::ArrayDef::_unchecked_narrow (
 CORBA::ArrayDef_ptr
 CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -4764,7 +4766,7 @@ CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
 void
 CORBA::ArrayDef::_tao_release (ArrayDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4796,7 +4798,7 @@ CORBA::ArrayDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4850,7 +4852,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::release (
     CORBA::ExceptionDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExceptionDef_ptr
@@ -4886,7 +4888,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
@@ -4928,7 +4930,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
@@ -4971,7 +4973,7 @@ void CORBA::ExceptionDef::members (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
@@ -5028,7 +5030,7 @@ CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionDef *_tao_tmp_pointer =
     static_cast<ExceptionDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExceptionDef_ptr
@@ -5064,7 +5066,7 @@ CORBA::ExceptionDef::_unchecked_narrow (
 CORBA::ExceptionDef_ptr
 CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -5075,7 +5077,7 @@ CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
 void
 CORBA::ExceptionDef::_tao_release (ExceptionDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -5111,7 +5113,7 @@ CORBA::ExceptionDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -5159,7 +5161,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (void)
 CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExceptionDef,
         ExceptionDef_var
       >
@@ -5172,7 +5174,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::ExceptionDef_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExceptionDef,
         ExceptionDef_var
       >
@@ -5182,7 +5184,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
 CORBA::ExceptionDefSeq::ExceptionDefSeq (
     const ExceptionDefSeq &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         ExceptionDef,
         ExceptionDef_var
       >
@@ -5296,7 +5298,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::release (
     CORBA::AttributeDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::AttributeDef_ptr
@@ -5332,7 +5334,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
@@ -5374,7 +5376,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
@@ -5417,7 +5419,7 @@ void CORBA::AttributeDef::type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
@@ -5459,7 +5461,7 @@ void CORBA::AttributeDef::type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
@@ -5502,7 +5504,7 @@ void CORBA::AttributeDef::mode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
@@ -5558,7 +5560,7 @@ CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AttributeDef *_tao_tmp_pointer =
     static_cast<AttributeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::AttributeDef_ptr
@@ -5594,7 +5596,7 @@ CORBA::AttributeDef::_unchecked_narrow (
 CORBA::AttributeDef_ptr
 CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -5605,7 +5607,7 @@ CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
 void
 CORBA::AttributeDef::_tao_release (AttributeDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -5637,7 +5639,7 @@ CORBA::AttributeDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -5797,7 +5799,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::release (
     CORBA::ExtAttributeDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -5833,7 +5835,7 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
@@ -5876,7 +5878,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
@@ -5918,7 +5920,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
@@ -5961,7 +5963,7 @@ void CORBA::ExtAttributeDef::set_exceptions (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
@@ -6003,7 +6005,7 @@ void CORBA::ExtAttributeDef::set_exceptions (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
@@ -6059,7 +6061,7 @@ CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAttributeDef *_tao_tmp_pointer =
     static_cast<ExtAttributeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -6095,7 +6097,7 @@ CORBA::ExtAttributeDef::_unchecked_narrow (
 CORBA::ExtAttributeDef_ptr
 CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -6106,7 +6108,7 @@ CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
 void
 CORBA::ExtAttributeDef::_tao_release (ExtAttributeDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -6142,7 +6144,7 @@ CORBA::ExtAttributeDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -6248,7 +6250,7 @@ CORBA::ParameterDescription::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_)
@@ -6260,7 +6262,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (void)
 CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ParameterDescription
       >
     (max)
@@ -6272,7 +6274,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::ParameterDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ParameterDescription
       >
     (max, length, buffer, release)
@@ -6281,7 +6283,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
 CORBA::ParDescriptionSeq::ParDescriptionSeq (
     const ParDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ParameterDescription
       >
     (seq)
@@ -6322,10 +6324,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ParameterDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
       &CORBA_ParDescriptionSeq_0;
-    
+
   }
 }
 
@@ -6340,7 +6342,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
     "ParDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
@@ -6360,7 +6362,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ContextIdentifier:1.0",
     "ContextIdentifier",
     &CORBA::_tc_Identifier);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
@@ -6369,7 +6371,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_CONTEXTIDSEQ_CS_)
@@ -6381,7 +6383,7 @@ CORBA::ContextIdSeq::ContextIdSeq (void)
 CORBA::ContextIdSeq::ContextIdSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -6391,14 +6393,14 @@ CORBA::ContextIdSeq::ContextIdSeq (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::ContextIdSeq::ContextIdSeq (
     const ContextIdSeq &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -6437,10 +6439,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ContextIdentifier,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
       &CORBA_ContextIdSeq_0;
-    
+
   }
 }
 
@@ -6455,7 +6457,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ContextIdSeq:1.0",
     "ContextIdSeq",
     &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
@@ -6482,7 +6484,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::release (
     CORBA::OperationDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::OperationDef_ptr
@@ -6501,7 +6503,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -6518,21 +6520,21 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6541,10 +6543,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       11,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6560,21 +6562,21 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6583,10 +6585,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       15,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6603,23 +6605,23 @@ void CORBA::OperationDef::result_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_result_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6628,7 +6630,7 @@ void CORBA::OperationDef::result_def (
       15,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -6645,21 +6647,21 @@ void CORBA::OperationDef::result_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6668,10 +6670,10 @@ void CORBA::OperationDef::result_def (
       11,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6688,23 +6690,23 @@ void CORBA::OperationDef::params (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_params
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6713,7 +6715,7 @@ void CORBA::OperationDef::params (
       11,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -6730,21 +6732,21 @@ void CORBA::OperationDef::params (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::OperationMode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6753,10 +6755,10 @@ void CORBA::OperationDef::params (
       9,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6773,23 +6775,23 @@ void CORBA::OperationDef::mode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_mode
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6798,7 +6800,7 @@ void CORBA::OperationDef::mode (
       9,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -6815,21 +6817,21 @@ void CORBA::OperationDef::mode (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ContextIdSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6838,10 +6840,10 @@ void CORBA::OperationDef::mode (
       13,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6858,23 +6860,23 @@ void CORBA::OperationDef::contexts (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_contexts
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6883,7 +6885,7 @@ void CORBA::OperationDef::contexts (
       13,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -6900,21 +6902,21 @@ void CORBA::OperationDef::contexts (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6923,10 +6925,10 @@ void CORBA::OperationDef::contexts (
       15,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -6943,23 +6945,23 @@ void CORBA::OperationDef::exceptions (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_OperationDef_Proxy_Broker_ == 0)
     {
       CORBA_OperationDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -6968,7 +6970,7 @@ void CORBA::OperationDef::exceptions (
       15,
       this->the_TAO_OperationDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -6987,19 +6989,19 @@ CORBA::OperationDef::CORBA_OperationDef_setup_collocation ()
       this->the_TAO_OperationDef_Proxy_Broker_ =
         ::CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::OperationDef::~OperationDef (void)
 {}
 
-void 
+void
 CORBA::OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   OperationDef *_tao_tmp_pointer =
     static_cast<OperationDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::OperationDef_ptr
@@ -7035,18 +7037,18 @@ CORBA::OperationDef::_unchecked_narrow (
 CORBA::OperationDef_ptr
 CORBA::OperationDef::_duplicate (OperationDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::OperationDef::_tao_release (OperationDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -7078,7 +7080,7 @@ CORBA::OperationDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -7105,7 +7107,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/OperationDef:1.0",
     "OperationDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_OperationDef =
@@ -7143,7 +7145,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "contexts", &CORBA::_tc_ContextIdSeq },
     { "parameters", &CORBA::_tc_ParDescriptionSeq },
     { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -7155,7 +7157,7 @@ static TAO::TypeCode::Struct<char const *,
     "OperationDescription",
     _tao_fields_CORBA_OperationDescription,
     9);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_OperationDescription =
@@ -7164,10 +7166,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::OperationDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -7177,7 +7179,7 @@ CORBA::OperationDescription::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
@@ -7189,7 +7191,7 @@ CORBA::RepositoryIdSeq::RepositoryIdSeq (void)
 CORBA::RepositoryIdSeq::RepositoryIdSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -7199,14 +7201,14 @@ CORBA::RepositoryIdSeq::RepositoryIdSeq (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::RepositoryIdSeq::RepositoryIdSeq (
     const RepositoryIdSeq &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -7245,10 +7247,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_RepositoryId,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
       &CORBA_RepositoryIdSeq_0;
-    
+
   }
 }
 
@@ -7263,7 +7265,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
     "RepositoryIdSeq",
     &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
@@ -7272,7 +7274,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
@@ -7284,7 +7286,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (void)
 CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         OperationDescription
       >
     (max)
@@ -7296,7 +7298,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::OperationDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         OperationDescription
       >
     (max, length, buffer, release)
@@ -7305,7 +7307,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
 CORBA::OpDescriptionSeq::OpDescriptionSeq (
     const OpDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         OperationDescription
       >
     (seq)
@@ -7346,10 +7348,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_OperationDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
       &CORBA_OpDescriptionSeq_0;
-    
+
   }
 }
 
@@ -7364,7 +7366,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
     "OpDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
@@ -7373,7 +7375,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
@@ -7385,7 +7387,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (void)
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         AttributeDescription
       >
     (max)
@@ -7397,7 +7399,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::AttributeDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         AttributeDescription
       >
     (max, length, buffer, release)
@@ -7406,7 +7408,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     const AttrDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         AttributeDescription
       >
     (seq)
@@ -7447,10 +7449,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_AttributeDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
       &CORBA_AttrDescriptionSeq_0;
-    
+
   }
 }
 
@@ -7465,7 +7467,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
     "AttrDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
@@ -7474,7 +7476,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
@@ -7486,7 +7488,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (void)
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtAttributeDescription
       >
     (max)
@@ -7498,7 +7500,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::ExtAttributeDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtAttributeDescription
       >
     (max, length, buffer, release)
@@ -7507,7 +7509,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     const ExtAttrDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ExtAttributeDescription
       >
     (seq)
@@ -7548,10 +7550,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ExtAttributeDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
       &CORBA_ExtAttrDescriptionSeq_0;
-    
+
   }
 }
 
@@ -7566,7 +7568,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
     "ExtAttrDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
@@ -7593,7 +7595,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::release (
     CORBA::InterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::InterfaceDef_ptr
@@ -7612,7 +7614,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -7629,21 +7631,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7652,10 +7654,10 @@ TAO::Collocation_Proxy_Broker *
       20,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -7672,23 +7674,23 @@ void CORBA::InterfaceDef::base_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_base_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7697,7 +7699,7 @@ void CORBA::InterfaceDef::base_interfaces (
       20,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -7715,23 +7717,23 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_interface_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7740,10 +7742,10 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
       4,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -7775,7 +7777,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "attributes", &CORBA::_tc_AttrDescriptionSeq },
     { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -7787,14 +7789,14 @@ static TAO::TypeCode::Struct<char const *,
     "FullInterfaceDescription",
     _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
     8);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
   &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -7816,21 +7818,21 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7839,10 +7841,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       18,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -7863,21 +7865,21 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -7887,7 +7889,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       &_tao_type,
       &_tao_mode
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7896,10 +7898,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       16,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -7923,14 +7925,14 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -7940,7 +7942,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -7953,7 +7955,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -7962,10 +7964,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       16,
       this->the_TAO_InterfaceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -7983,7 +7985,7 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation ()
       this->the_TAO_InterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
   this->CORBA_Contained_setup_collocation ();
   this->CORBA_IDLType_setup_collocation ();
@@ -7992,12 +7994,12 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation ()
 CORBA::InterfaceDef::~InterfaceDef (void)
 {}
 
-void 
+void
 CORBA::InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceDef *_tao_tmp_pointer =
     static_cast<InterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::InterfaceDef_ptr
@@ -8033,18 +8035,18 @@ CORBA::InterfaceDef::_unchecked_narrow (
 CORBA::InterfaceDef_ptr
 CORBA::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::InterfaceDef::_tao_release (InterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -8084,7 +8086,7 @@ CORBA::InterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -8111,7 +8113,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/InterfaceDef:1.0",
     "InterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
@@ -8135,7 +8137,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "defined_in", &CORBA::_tc_RepositoryId },
     { "version", &CORBA::_tc_VersionSpec },
     { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -8147,7 +8149,7 @@ static TAO::TypeCode::Struct<char const *,
     "InterfaceDescription",
     _tao_fields_CORBA_InterfaceDescription,
     5);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
@@ -8156,10 +8158,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::InterfaceDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -8187,7 +8189,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release (
     CORBA::InterfaceAttrExtension_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::InterfaceAttrExtension_ptr
@@ -8206,7 +8208,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -8239,7 +8241,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
     { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -8251,14 +8253,14 @@ static TAO::TypeCode::Struct<char const *,
     "ExtFullInterfaceDescription",
     _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
     8);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
   &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -8280,21 +8282,21 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -8303,10 +8305,10 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       22,
       this->the_TAO_InterfaceAttrExtension_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -8329,14 +8331,14 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ == 0)
     {
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -8345,7 +8347,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
   TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -8357,7 +8359,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -8366,10 +8368,10 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       20,
       this->the_TAO_InterfaceAttrExtension_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -8392,12 +8394,12 @@ CORBA::InterfaceAttrExtension::CORBA_InterfaceAttrExtension_setup_collocation ()
 CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 {}
 
-void 
+void
 CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceAttrExtension *_tao_tmp_pointer =
     static_cast<InterfaceAttrExtension *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::InterfaceAttrExtension_ptr
@@ -8433,18 +8435,18 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow (
 CORBA::InterfaceAttrExtension_ptr
 CORBA::InterfaceAttrExtension::_duplicate (InterfaceAttrExtension_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::InterfaceAttrExtension::_tao_release (InterfaceAttrExtension_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -8468,7 +8470,7 @@ CORBA::InterfaceAttrExtension::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -8495,7 +8497,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
     "InterfaceAttrExtension");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
@@ -8522,7 +8524,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release (
     CORBA::ExtInterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExtInterfaceDef_ptr
@@ -8541,7 +8543,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -8560,7 +8562,7 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation ()
       this->the_TAO_ExtInterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_InterfaceDef_setup_collocation ();
   this->CORBA_InterfaceAttrExtension_setup_collocation ();
 }
@@ -8568,12 +8570,12 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation ()
 CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtInterfaceDef *_tao_tmp_pointer =
     static_cast<ExtInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExtInterfaceDef_ptr
@@ -8609,18 +8611,18 @@ CORBA::ExtInterfaceDef::_unchecked_narrow (
 CORBA::ExtInterfaceDef_ptr
 CORBA::ExtInterfaceDef::_duplicate (ExtInterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ExtInterfaceDef::_tao_release (ExtInterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -8668,7 +8670,7 @@ CORBA::ExtInterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -8695,7 +8697,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
     "ExtInterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
@@ -8722,7 +8724,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release (
     CORBA::AbstractInterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -8741,7 +8743,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -8760,19 +8762,19 @@ CORBA::AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation ()
       this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_InterfaceDef_setup_collocation ();
 }
 
 CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AbstractInterfaceDef *_tao_tmp_pointer =
     static_cast<AbstractInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -8808,18 +8810,18 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow (
 CORBA::AbstractInterfaceDef_ptr
 CORBA::AbstractInterfaceDef::_duplicate (AbstractInterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::AbstractInterfaceDef::_tao_release (AbstractInterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -8863,7 +8865,7 @@ CORBA::AbstractInterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -8890,7 +8892,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
     "AbstractInterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
@@ -8917,7 +8919,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release (
     CORBA::ExtAbstractInterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExtAbstractInterfaceDef_ptr
@@ -8936,7 +8938,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -8955,7 +8957,7 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation
       this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_AbstractInterfaceDef_setup_collocation ();
   this->CORBA_InterfaceAttrExtension_setup_collocation ();
 }
@@ -8963,12 +8965,12 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation
 CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAbstractInterfaceDef *_tao_tmp_pointer =
     static_cast<ExtAbstractInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExtAbstractInterfaceDef_ptr
@@ -9004,18 +9006,18 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
 CORBA::ExtAbstractInterfaceDef_ptr
 CORBA::ExtAbstractInterfaceDef::_duplicate (ExtAbstractInterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ExtAbstractInterfaceDef::_tao_release (ExtAbstractInterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -9067,7 +9069,7 @@ CORBA::ExtAbstractInterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -9094,7 +9096,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
     "ExtAbstractInterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
@@ -9121,7 +9123,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release (
     CORBA::LocalInterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -9140,7 +9142,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -9159,19 +9161,19 @@ CORBA::LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation ()
       this->the_TAO_LocalInterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_InterfaceDef_setup_collocation ();
 }
 
 CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   LocalInterfaceDef *_tao_tmp_pointer =
     static_cast<LocalInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -9207,18 +9209,18 @@ CORBA::LocalInterfaceDef::_unchecked_narrow (
 CORBA::LocalInterfaceDef_ptr
 CORBA::LocalInterfaceDef::_duplicate (LocalInterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::LocalInterfaceDef::_tao_release (LocalInterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -9262,7 +9264,7 @@ CORBA::LocalInterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -9289,7 +9291,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
     "LocalInterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
@@ -9316,7 +9318,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release (
     CORBA::ExtLocalInterfaceDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExtLocalInterfaceDef_ptr
@@ -9335,7 +9337,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -9354,7 +9356,7 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation ()
       this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_LocalInterfaceDef_setup_collocation ();
   this->CORBA_InterfaceAttrExtension_setup_collocation ();
 }
@@ -9362,12 +9364,12 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation ()
 CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtLocalInterfaceDef *_tao_tmp_pointer =
     static_cast<ExtLocalInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExtLocalInterfaceDef_ptr
@@ -9403,18 +9405,18 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
 CORBA::ExtLocalInterfaceDef_ptr
 CORBA::ExtLocalInterfaceDef::_duplicate (ExtLocalInterfaceDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ExtLocalInterfaceDef::_tao_release (ExtLocalInterfaceDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -9466,7 +9468,7 @@ CORBA::ExtLocalInterfaceDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -9493,7 +9495,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
     "ExtLocalInterfaceDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
@@ -9526,7 +9528,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
         _tao_any,
         CORBA::_tc_PrimitiveKind,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -9646,7 +9648,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -9762,7 +9764,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -10458,7 +10460,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -10541,7 +10543,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
         _tao_any,
         CORBA::_tc_AttributeMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -10603,7 +10605,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -10661,7 +10663,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -10801,11 +10803,11 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
         _tao_any,
         CORBA::_tc_OperationMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -10863,7 +10865,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -10922,7 +10924,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -11039,7 +11041,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -11097,7 +11099,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -11156,7 +11158,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -11215,7 +11217,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -11274,7 +11276,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -11391,7 +11393,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -11449,7 +11451,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -11565,7 +11567,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -11925,12 +11927,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::PrimitiveKind & _tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<CORBA::PrimitiveKind> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -11952,21 +11954,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::Repository RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -11988,21 +11990,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ModuleDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12051,21 +12053,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ConstantDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12118,21 +12120,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::StructDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12154,21 +12156,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::UnionDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12190,21 +12192,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::EnumDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12226,21 +12228,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::AliasDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12262,21 +12264,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::NativeDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12298,21 +12300,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::PrimitiveDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12334,21 +12336,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::StringDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12370,21 +12372,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::WstringDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12406,21 +12408,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::SequenceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12442,21 +12444,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ArrayDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12478,21 +12480,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExceptionDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12507,25 +12509,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExceptionDefSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -12533,40 +12517,7 @@ CORBA::Boolean operator>> (
     CORBA::ExceptionDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_ */
@@ -12583,12 +12534,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::AttributeMode & _tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<CORBA::AttributeMode> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -12610,21 +12561,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::AttributeDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12712,21 +12663,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExtAttributeDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -12742,12 +12693,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::OperationMode & _tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<CORBA::OperationMode> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -12792,22 +12743,7 @@ CORBA::Boolean operator<< (
     const CORBA::ParDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -12815,40 +12751,7 @@ CORBA::Boolean operator>> (
     CORBA::ParDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_ */
@@ -12864,22 +12767,7 @@ CORBA::Boolean operator<< (
     const CORBA::ContextIdSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -12887,41 +12775,7 @@ CORBA::Boolean operator>> (
     CORBA::ContextIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_ */
@@ -12944,21 +12798,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::OperationDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13010,22 +12864,7 @@ CORBA::Boolean operator<< (
     const CORBA::RepositoryIdSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -13033,41 +12872,7 @@ CORBA::Boolean operator>> (
     CORBA::RepositoryIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_ */
@@ -13083,22 +12888,7 @@ CORBA::Boolean operator<< (
     const CORBA::OpDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -13106,40 +12896,7 @@ CORBA::Boolean operator>> (
     CORBA::OpDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_ */
@@ -13155,22 +12912,7 @@ CORBA::Boolean operator<< (
     const CORBA::AttrDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -13178,40 +12920,7 @@ CORBA::Boolean operator>> (
     CORBA::AttrDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_ */
@@ -13227,22 +12936,7 @@ CORBA::Boolean operator<< (
     const CORBA::ExtAttrDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -13250,40 +12944,7 @@ CORBA::Boolean operator>> (
     CORBA::ExtAttrDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_ */
@@ -13341,21 +13002,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::InterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13441,21 +13102,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::InterfaceAttrExtension RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13477,21 +13138,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExtInterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13513,21 +13174,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::AbstractInterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13549,21 +13210,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExtAbstractInterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13585,21 +13246,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::LocalInterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -13621,20 +13282,22 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExtLocalInterfaceDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 06488fb9e77..f9ca9d2ec73 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ifr_client_export.h"
+#include "tao/IFR_Client/ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,7 +72,9 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -86,22 +88,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_PRIMITIVEDEF__VAR_OUT_CH_)
 #define _CORBA_PRIMITIVEDEF__VAR_OUT_CH_
-  
+
   class PrimitiveDef;
   typedef PrimitiveDef *PrimitiveDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PrimitiveDef
       >
     PrimitiveDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PrimitiveDef
@@ -109,22 +111,22 @@ namespace CORBA
     PrimitiveDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRINGDEF__VAR_OUT_CH_)
 #define _CORBA_STRINGDEF__VAR_OUT_CH_
-  
+
   class StringDef;
   typedef StringDef *StringDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         StringDef
       >
     StringDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         StringDef
@@ -132,22 +134,22 @@ namespace CORBA
     StringDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_SEQUENCEDEF__VAR_OUT_CH_)
 #define _CORBA_SEQUENCEDEF__VAR_OUT_CH_
-  
+
   class SequenceDef;
   typedef SequenceDef *SequenceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         SequenceDef
       >
     SequenceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         SequenceDef
@@ -155,22 +157,22 @@ namespace CORBA
     SequenceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ARRAYDEF__VAR_OUT_CH_)
 #define _CORBA_ARRAYDEF__VAR_OUT_CH_
-  
+
   class ArrayDef;
   typedef ArrayDef *ArrayDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ArrayDef
       >
     ArrayDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ArrayDef
@@ -178,22 +180,22 @@ namespace CORBA
     ArrayDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_WSTRINGDEF__VAR_OUT_CH_)
 #define _CORBA_WSTRINGDEF__VAR_OUT_CH_
-  
+
   class WstringDef;
   typedef WstringDef *WstringDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         WstringDef
       >
     WstringDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         WstringDef
@@ -201,22 +203,22 @@ namespace CORBA
     WstringDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
 #define _CORBA_FIXEDDEF__VAR_OUT_CH_
-  
+
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         FixedDef
       >
     FixedDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         FixedDef
@@ -224,10 +226,10 @@ namespace CORBA
     FixedDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum PrimitiveKind
   {
     pk_null,
@@ -253,29 +255,29 @@ namespace CORBA
     pk_wstring,
     pk_value_base
   };
-  
+
   typedef PrimitiveKind &PrimitiveKind_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveKind;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
-  
+
   class Repository;
   typedef Repository *Repository_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Repository
       >
     Repository_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Repository
@@ -283,13 +285,13 @@ namespace CORBA
     Repository_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_REPOSITORY_CH_)
 #define _CORBA_REPOSITORY_CH_
-  
+
   class TAO_IFR_Client_Export Repository
     : public virtual ::CORBA::Container
   {
@@ -297,32 +299,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Repository>;
     typedef Repository_ptr _ptr_type;
     typedef Repository_var _var_type;
-    
+
     // The static operations.
     static Repository_ptr _duplicate (Repository_ptr obj);
-    
+
     static void _tao_release (Repository_ptr obj);
-    
+
     static Repository_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Repository_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Repository_ptr _nil (void)
     {
       return static_cast<Repository_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -330,10 +332,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -341,10 +343,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -352,10 +354,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -363,10 +365,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -374,10 +376,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
@@ -386,10 +388,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
@@ -398,10 +400,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
@@ -410,34 +412,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Repository (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Repository_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Repository (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Repository (
         TAO_Stub *objref,
@@ -445,38 +447,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Repository (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Repository (const Repository &);
-    
+
     void operator= (const Repository &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
-  
+
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ModuleDef
       >
     ModuleDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ModuleDef
@@ -484,13 +486,13 @@ namespace CORBA
     ModuleDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_MODULEDEF_CH_)
 #define _CORBA_MODULEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ModuleDef
     : public virtual ::CORBA::Container,
       public virtual ::CORBA::Contained
@@ -499,56 +501,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ModuleDef>;
     typedef ModuleDef_ptr _ptr_type;
     typedef ModuleDef_var _var_type;
-    
+
     // The static operations.
     static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-    
+
     static void _tao_release (ModuleDef_ptr obj);
-    
+
     static ModuleDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ModuleDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ModuleDef_ptr _nil (void)
     {
       return static_cast<ModuleDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ModuleDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ModuleDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ModuleDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ModuleDef (
         TAO_Stub *objref,
@@ -556,75 +558,75 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ModuleDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ModuleDef (const ModuleDef &);
-    
+
     void operator= (const ModuleDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ModuleDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ModuleDescription
       >
     ModuleDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ModuleDescription,
         ModuleDescription_var
       >
     ModuleDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ModuleDescription
   {
     typedef ModuleDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-  
+
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ConstantDef
       >
     ConstantDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ConstantDef
@@ -632,13 +634,13 @@ namespace CORBA
     ConstantDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTANTDEF_CH_)
 #define _CORBA_CONSTANTDEF_CH_
-  
+
   class TAO_IFR_Client_Export ConstantDef
     : public virtual ::CORBA::Contained
   {
@@ -646,52 +648,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ConstantDef>;
     typedef ConstantDef_ptr _ptr_type;
     typedef ConstantDef_var _var_type;
-    
+
     // The static operations.
     static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
-    
+
     static void _tao_release (ConstantDef_ptr obj);
-    
+
     static ConstantDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstantDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstantDef_ptr _nil (void)
     {
       return static_cast<ConstantDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -699,20 +701,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void value (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -720,34 +722,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ConstantDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstantDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ConstantDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ConstantDef (
         TAO_Stub *objref,
@@ -755,77 +757,77 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ConstantDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ConstantDef (const ConstantDef &);
-    
+
     void operator= (const ConstantDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ConstantDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ConstantDescription
       >
     ConstantDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ConstantDescription,
         ConstantDescription_var
       >
     ConstantDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ConstantDescription
   {
     typedef ConstantDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
     CORBA::Any value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
-  
+
   class StructDef;
   typedef StructDef *StructDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         StructDef
       >
     StructDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         StructDef
@@ -833,13 +835,13 @@ namespace CORBA
     StructDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_STRUCTDEF_CH_)
 #define _CORBA_STRUCTDEF_CH_
-  
+
   class TAO_IFR_Client_Export StructDef
     : public virtual ::CORBA::TypedefDef,
       public virtual ::CORBA::Container
@@ -848,42 +850,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<StructDef>;
     typedef StructDef_ptr _ptr_type;
     typedef StructDef_var _var_type;
-    
+
     // The static operations.
     static StructDef_ptr _duplicate (StructDef_ptr obj);
-    
+
     static void _tao_release (StructDef_ptr obj);
-    
+
     static StructDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StructDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StructDef_ptr _nil (void)
     {
       return static_cast<StructDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -891,34 +893,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     StructDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StructDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     StructDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     StructDef (
         TAO_Stub *objref,
@@ -926,38 +928,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~StructDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     StructDef (const StructDef &);
-    
+
     void operator= (const StructDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
-  
+
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         UnionDef
       >
     UnionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         UnionDef
@@ -965,13 +967,13 @@ namespace CORBA
     UnionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_UNIONDEF_CH_)
 #define _CORBA_UNIONDEF_CH_
-  
+
   class TAO_IFR_Client_Export UnionDef
     : public virtual ::CORBA::TypedefDef,
       public virtual ::CORBA::Container
@@ -980,52 +982,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<UnionDef>;
     typedef UnionDef_ptr _ptr_type;
     typedef UnionDef_var _var_type;
-    
+
     // The static operations.
     static UnionDef_ptr _duplicate (UnionDef_ptr obj);
-    
+
     static void _tao_release (UnionDef_ptr obj);
-    
+
     static UnionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnionDef_ptr _nil (void)
     {
       return static_cast<UnionDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr discriminator_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1033,20 +1035,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::UnionMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1054,34 +1056,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     UnionDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_UnionDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     UnionDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     UnionDef (
         TAO_Stub *objref,
@@ -1089,38 +1091,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~UnionDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     UnionDef (const UnionDef &);
-    
+
     void operator= (const UnionDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
-  
+
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         EnumDef
       >
     EnumDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         EnumDef
@@ -1128,13 +1130,13 @@ namespace CORBA
     EnumDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ENUMDEF_CH_)
 #define _CORBA_ENUMDEF_CH_
-  
+
   class TAO_IFR_Client_Export EnumDef
     : public virtual ::CORBA::TypedefDef
   {
@@ -1142,42 +1144,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<EnumDef>;
     typedef EnumDef_ptr _ptr_type;
     typedef EnumDef_var _var_type;
-    
+
     // The static operations.
     static EnumDef_ptr _duplicate (EnumDef_ptr obj);
-    
+
     static void _tao_release (EnumDef_ptr obj);
-    
+
     static EnumDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static EnumDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static EnumDef_ptr _nil (void)
     {
       return static_cast<EnumDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::EnumMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1185,34 +1187,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     EnumDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_EnumDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     EnumDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     EnumDef (
         TAO_Stub *objref,
@@ -1220,38 +1222,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~EnumDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     EnumDef (const EnumDef &);
-    
+
     void operator= (const EnumDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
-  
+
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AliasDef
       >
     AliasDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AliasDef
@@ -1259,13 +1261,13 @@ namespace CORBA
     AliasDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ALIASDEF_CH_)
 #define _CORBA_ALIASDEF_CH_
-  
+
   class TAO_IFR_Client_Export AliasDef
     : public virtual ::CORBA::TypedefDef
   {
@@ -1273,42 +1275,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<AliasDef>;
     typedef AliasDef_ptr _ptr_type;
     typedef AliasDef_var _var_type;
-    
+
     // The static operations.
     static AliasDef_ptr _duplicate (AliasDef_ptr obj);
-    
+
     static void _tao_release (AliasDef_ptr obj);
-    
+
     static AliasDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AliasDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AliasDef_ptr _nil (void)
     {
       return static_cast<AliasDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1316,34 +1318,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     AliasDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AliasDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     AliasDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     AliasDef (
         TAO_Stub *objref,
@@ -1351,38 +1353,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~AliasDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     AliasDef (const AliasDef &);
-    
+
     void operator= (const AliasDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AliasDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
-  
+
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         NativeDef
       >
     NativeDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         NativeDef
@@ -1390,13 +1392,13 @@ namespace CORBA
     NativeDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_NATIVEDEF_CH_)
 #define _CORBA_NATIVEDEF_CH_
-  
+
   class TAO_IFR_Client_Export NativeDef
     : public virtual ::CORBA::TypedefDef
   {
@@ -1404,56 +1406,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<NativeDef>;
     typedef NativeDef_ptr _ptr_type;
     typedef NativeDef_var _var_type;
-    
+
     // The static operations.
     static NativeDef_ptr _duplicate (NativeDef_ptr obj);
-    
+
     static void _tao_release (NativeDef_ptr obj);
-    
+
     static NativeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static NativeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static NativeDef_ptr _nil (void)
     {
       return static_cast<NativeDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     NativeDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_NativeDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     NativeDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     NativeDef (
         TAO_Stub *objref,
@@ -1461,29 +1463,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~NativeDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     NativeDef (const NativeDef &);
-    
+
     void operator= (const NativeDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_NativeDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_PRIMITIVEDEF_CH_)
 #define _CORBA_PRIMITIVEDEF_CH_
-  
+
   class TAO_IFR_Client_Export PrimitiveDef
     : public virtual ::CORBA::IDLType
   {
@@ -1491,66 +1493,66 @@ namespace CORBA
     friend class TAO::Narrow_Utils<PrimitiveDef>;
     typedef PrimitiveDef_ptr _ptr_type;
     typedef PrimitiveDef_var _var_type;
-    
+
     // The static operations.
     static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
-    
+
     static void _tao_release (PrimitiveDef_ptr obj);
-    
+
     static PrimitiveDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrimitiveDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrimitiveDef_ptr _nil (void)
     {
       return static_cast<PrimitiveDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PrimitiveKind kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     PrimitiveDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_PrimitiveDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     PrimitiveDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     PrimitiveDef (
         TAO_Stub *objref,
@@ -1558,29 +1560,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~PrimitiveDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PrimitiveDef (const PrimitiveDef &);
-    
+
     void operator= (const PrimitiveDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_STRINGDEF_CH_)
 #define _CORBA_STRINGDEF_CH_
-  
+
   class TAO_IFR_Client_Export StringDef
     : public virtual ::CORBA::IDLType
   {
@@ -1588,42 +1590,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<StringDef>;
     typedef StringDef_ptr _ptr_type;
     typedef StringDef_var _var_type;
-    
+
     // The static operations.
     static StringDef_ptr _duplicate (StringDef_ptr obj);
-    
+
     static void _tao_release (StringDef_ptr obj);
-    
+
     static StringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StringDef_ptr _nil (void)
     {
       return static_cast<StringDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1631,34 +1633,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     StringDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StringDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     StringDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     StringDef (
         TAO_Stub *objref,
@@ -1666,29 +1668,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~StringDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     StringDef (const StringDef &);
-    
+
     void operator= (const StringDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StringDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_WSTRINGDEF_CH_)
 #define _CORBA_WSTRINGDEF_CH_
-  
+
   class TAO_IFR_Client_Export WstringDef
     : public virtual ::CORBA::IDLType
   {
@@ -1696,42 +1698,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<WstringDef>;
     typedef WstringDef_ptr _ptr_type;
     typedef WstringDef_var _var_type;
-    
+
     // The static operations.
     static WstringDef_ptr _duplicate (WstringDef_ptr obj);
-    
+
     static void _tao_release (WstringDef_ptr obj);
-    
+
     static WstringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static WstringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static WstringDef_ptr _nil (void)
     {
       return static_cast<WstringDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1739,34 +1741,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     WstringDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_WstringDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     WstringDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     WstringDef (
         TAO_Stub *objref,
@@ -1774,29 +1776,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~WstringDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     WstringDef (const WstringDef &);
-    
+
     void operator= (const WstringDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_WstringDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_SEQUENCEDEF_CH_)
 #define _CORBA_SEQUENCEDEF_CH_
-  
+
   class TAO_IFR_Client_Export SequenceDef
     : public virtual ::CORBA::IDLType
   {
@@ -1804,42 +1806,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<SequenceDef>;
     typedef SequenceDef_ptr _ptr_type;
     typedef SequenceDef_var _var_type;
-    
+
     // The static operations.
     static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
-    
+
     static void _tao_release (SequenceDef_ptr obj);
-    
+
     static SequenceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SequenceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SequenceDef_ptr _nil (void)
     {
       return static_cast<SequenceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1847,30 +1849,30 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1878,34 +1880,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     SequenceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_SequenceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     SequenceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     SequenceDef (
         TAO_Stub *objref,
@@ -1913,29 +1915,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~SequenceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     SequenceDef (const SequenceDef &);
-    
+
     void operator= (const SequenceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_SequenceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ARRAYDEF_CH_)
 #define _CORBA_ARRAYDEF_CH_
-  
+
   class TAO_IFR_Client_Export ArrayDef
     : public virtual ::CORBA::IDLType
   {
@@ -1943,42 +1945,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ArrayDef>;
     typedef ArrayDef_ptr _ptr_type;
     typedef ArrayDef_var _var_type;
-    
+
     // The static operations.
     static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
-    
+
     static void _tao_release (ArrayDef_ptr obj);
-    
+
     static ArrayDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ArrayDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ArrayDef_ptr _nil (void)
     {
       return static_cast<ArrayDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void length (
         ::CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1986,30 +1988,30 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2017,34 +2019,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ArrayDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ArrayDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ArrayDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ArrayDef (
         TAO_Stub *objref,
@@ -2052,38 +2054,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ArrayDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ArrayDef (const ArrayDef &);
-    
+
     void operator= (const ArrayDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ArrayDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-  
+
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExceptionDef
       >
     ExceptionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExceptionDef
@@ -2091,13 +2093,13 @@ namespace CORBA
     ExceptionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXCEPTIONDEF_CH_)
 #define _CORBA_EXCEPTIONDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExceptionDef
     : public virtual ::CORBA::Contained,
       public virtual ::CORBA::Container
@@ -2106,52 +2108,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExceptionDef>;
     typedef ExceptionDef_ptr _ptr_type;
     typedef ExceptionDef_var _var_type;
-    
+
     // The static operations.
     static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
-    
+
     static void _tao_release (ExceptionDef_ptr obj);
-    
+
     static ExceptionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExceptionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExceptionDef_ptr _nil (void)
     {
       return static_cast<ExceptionDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2159,34 +2161,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExceptionDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExceptionDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExceptionDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExceptionDef (
         TAO_Stub *objref,
@@ -2194,55 +2196,46 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExceptionDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExceptionDef (const ExceptionDef &);
-    
+
     void operator= (const ExceptionDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ_CH_
-  
+
   class ExceptionDefSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        ExceptionDefSeq,
-        TAO_Object_Manager<
-            ExceptionDef,
-            ExceptionDef_var
-          >
+    TAO_VarSeq_Var_T<
+        ExceptionDefSeq
       >
     ExceptionDefSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        ExceptionDefSeq,
-        ExceptionDefSeq_var,
-        TAO_Object_Manager<
-            ExceptionDef,
-            ExceptionDef_var
-          >
+    TAO_Seq_Out_T<
+        ExceptionDefSeq
       >
     ExceptionDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExceptionDefSeq
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             ExceptionDef,
             ExceptionDef_var
           >
@@ -2253,55 +2246,55 @@ namespace CORBA
     ExceptionDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExceptionDef_ptr* buffer, 
-        CORBA::Boolean release = 0
+        ExceptionDef_ptr* buffer,
+        CORBA::Boolean release = false
       );
     ExceptionDefSeq (const ExceptionDefSeq &);
     ~ExceptionDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExceptionDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum AttributeMode
   {
     ATTR_NORMAL,
     ATTR_READONLY
   };
-  
+
   typedef AttributeMode &AttributeMode_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeMode;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ATTRIBUTEDEF__VAR_OUT_CH_)
 #define _CORBA_ATTRIBUTEDEF__VAR_OUT_CH_
-  
+
   class AttributeDef;
   typedef AttributeDef *AttributeDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AttributeDef
       >
     AttributeDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AttributeDef
@@ -2309,13 +2302,13 @@ namespace CORBA
     AttributeDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ATTRIBUTEDEF_CH_)
 #define _CORBA_ATTRIBUTEDEF_CH_
-  
+
   class TAO_IFR_Client_Export AttributeDef
     : public virtual ::CORBA::Contained
   {
@@ -2323,52 +2316,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<AttributeDef>;
     typedef AttributeDef_ptr _ptr_type;
     typedef AttributeDef_var _var_type;
-    
+
     // The static operations.
     static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
-    
+
     static void _tao_release (AttributeDef_ptr obj);
-    
+
     static AttributeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AttributeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AttributeDef_ptr _nil (void)
     {
       return static_cast<AttributeDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2376,20 +2369,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mode (
         ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2397,34 +2390,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     AttributeDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AttributeDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     AttributeDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     AttributeDef (
         TAO_Stub *objref,
@@ -2432,118 +2425,118 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~AttributeDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     AttributeDef (const AttributeDef &);
-    
+
     void operator= (const AttributeDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct AttributeDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         AttributeDescription
       >
     AttributeDescription_var;
-  
+
   typedef
     TAO_Out_T<
         AttributeDescription,
         AttributeDescription_var
       >
     AttributeDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export AttributeDescription
   {
     typedef AttributeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
     CORBA::AttributeMode mode;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ExtAttributeDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ExtAttributeDescription
       >
     ExtAttributeDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ExtAttributeDescription,
         ExtAttributeDescription_var
       >
     ExtAttributeDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ExtAttributeDescription
   {
     typedef ExtAttributeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
     CORBA::AttributeMode mode;
     CORBA::ExcDescriptionSeq get_exceptions;
     CORBA::ExcDescriptionSeq put_exceptions;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_
-  
+
   class ExtAttributeDef;
   typedef ExtAttributeDef *ExtAttributeDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtAttributeDef
       >
     ExtAttributeDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtAttributeDef
@@ -2551,13 +2544,13 @@ namespace CORBA
     ExtAttributeDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF_CH_)
 #define _CORBA_EXTATTRIBUTEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExtAttributeDef
     : public virtual ::CORBA::AttributeDef
   {
@@ -2565,42 +2558,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExtAttributeDef>;
     typedef ExtAttributeDef_ptr _ptr_type;
     typedef ExtAttributeDef_var _var_type;
-    
+
     // The static operations.
     static ExtAttributeDef_ptr _duplicate (ExtAttributeDef_ptr obj);
-    
+
     static void _tao_release (ExtAttributeDef_ptr obj);
-    
+
     static ExtAttributeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAttributeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAttributeDef_ptr _nil (void)
     {
       return static_cast<ExtAttributeDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2608,20 +2601,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2629,44 +2622,44 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExtAttributeDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExtAttributeDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtAttributeDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExtAttributeDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExtAttributeDef (
         TAO_Stub *objref,
@@ -2674,102 +2667,99 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExtAttributeDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExtAttributeDef (const ExtAttributeDef &);
-    
+
     void operator= (const ExtAttributeDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum OperationMode
   {
     OP_NORMAL,
     OP_ONEWAY
   };
-  
+
   typedef OperationMode &OperationMode_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationMode;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ParameterDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ParameterDescription
       >
     ParameterDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ParameterDescription,
         ParameterDescription_var
       >
     ParameterDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ParameterDescription
   {
     typedef ParameterDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
+    TAO::String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
     CORBA::ParameterMode mode;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParameterDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ_CH_
-  
+
   class ParDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ParDescriptionSeq,
-        ParameterDescription
+        ParDescriptionSeq
       >
     ParDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ParDescriptionSeq,
-        ParDescriptionSeq_var,
-        ParameterDescription
+        ParDescriptionSeq
       >
     ParDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export ParDescriptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ParameterDescription
           >
   {
@@ -2779,62 +2769,59 @@ namespace CORBA
     ParDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ParameterDescription* buffer, 
-        CORBA::Boolean release = 0
+        ParameterDescription* buffer,
+        CORBA::Boolean release = false
       );
     ParDescriptionSeq (const ParDescriptionSeq &);
     ~ParDescriptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ParDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ContextIdentifier;
   typedef CORBA::String_var ContextIdentifier_var;
   typedef CORBA::String_out ContextIdentifier_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdentifier;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTEXTIDSEQ_CH_)
 #define _CORBA_CONTEXTIDSEQ_CH_
-  
+
   class ContextIdSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        ContextIdSeq,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        ContextIdSeq
       >
     ContextIdSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        ContextIdSeq,
-        ContextIdSeq_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        ContextIdSeq
       >
     ContextIdSeq_out;
-  
+
   class TAO_IFR_Client_Export ContextIdSeq
     : public
-        TAO_Unbounded_String_Sequence
+        TAO::unbounded_string_sequence
   {
   public:
     ContextIdSeq (void);
@@ -2842,39 +2829,39 @@ namespace CORBA
     ContextIdSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
+        char ** buffer,
+        CORBA::Boolean release = false
       );
     ContextIdSeq (const ContextIdSeq &);
     ~ContextIdSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ContextIdSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_OPERATIONDEF__VAR_OUT_CH_)
 #define _CORBA_OPERATIONDEF__VAR_OUT_CH_
-  
+
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         OperationDef
       >
     OperationDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         OperationDef
@@ -2882,13 +2869,13 @@ namespace CORBA
     OperationDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_OPERATIONDEF_CH_)
 #define _CORBA_OPERATIONDEF_CH_
-  
+
   class TAO_IFR_Client_Export OperationDef
     : public virtual ::CORBA::Contained
   {
@@ -2896,52 +2883,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<OperationDef>;
     typedef OperationDef_ptr _ptr_type;
     typedef OperationDef_var _var_type;
-    
+
     // The static operations.
     static OperationDef_ptr _duplicate (OperationDef_ptr obj);
-    
+
     static void _tao_release (OperationDef_ptr obj);
-    
+
     static OperationDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static OperationDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static OperationDef_ptr _nil (void)
     {
       return static_cast<OperationDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr result_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void result_def (
         ::CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2949,20 +2936,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ParDescriptionSeq * params (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void params (
         const ::CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2970,20 +2957,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OperationMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mode (
         ::CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2991,20 +2978,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContextIdSeq * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void contexts (
         const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3012,20 +2999,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3033,34 +3020,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     OperationDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_OperationDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     OperationDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     OperationDef (
         TAO_Stub *objref,
@@ -3068,91 +3055,88 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~OperationDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     OperationDef (const OperationDef &);
-    
+
     void operator= (const OperationDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct OperationDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         OperationDescription
       >
     OperationDescription_var;
-  
+
   typedef
     TAO_Out_T<
         OperationDescription,
         OperationDescription_var
       >
     OperationDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export OperationDescription
   {
     typedef OperationDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var result;
     CORBA::OperationMode mode;
     CORBA::ContextIdSeq contexts;
     CORBA::ParDescriptionSeq parameters;
     CORBA::ExcDescriptionSeq exceptions;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
 #define _CORBA_REPOSITORYIDSEQ_CH_
-  
+
   class RepositoryIdSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        RepositoryIdSeq,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        RepositoryIdSeq
       >
     RepositoryIdSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        RepositoryIdSeq,
-        RepositoryIdSeq_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        RepositoryIdSeq
       >
     RepositoryIdSeq_out;
-  
+
   class TAO_IFR_Client_Export RepositoryIdSeq
     : public
-        TAO_Unbounded_String_Sequence
+        TAO::unbounded_string_sequence
   {
   public:
     RepositoryIdSeq (void);
@@ -3160,50 +3144,47 @@ namespace CORBA
     RepositoryIdSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
+        char ** buffer,
+        CORBA::Boolean release = false
       );
     RepositoryIdSeq (const RepositoryIdSeq &);
     ~RepositoryIdSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef RepositoryIdSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ_CH_
-  
+
   class OpDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        OpDescriptionSeq,
-        OperationDescription
+        OpDescriptionSeq
       >
     OpDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        OpDescriptionSeq,
-        OpDescriptionSeq_var,
-        OperationDescription
+        OpDescriptionSeq
       >
     OpDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export OpDescriptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             OperationDescription
           >
   {
@@ -3213,50 +3194,47 @@ namespace CORBA
     OpDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        OperationDescription* buffer, 
-        CORBA::Boolean release = 0
+        OperationDescription* buffer,
+        CORBA::Boolean release = false
       );
     OpDescriptionSeq (const OpDescriptionSeq &);
     ~OpDescriptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef OpDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ_CH_
-  
+
   class AttrDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        AttrDescriptionSeq,
-        AttributeDescription
+        AttrDescriptionSeq
       >
     AttrDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        AttrDescriptionSeq,
-        AttrDescriptionSeq_var,
-        AttributeDescription
+        AttrDescriptionSeq
       >
     AttrDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export AttrDescriptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             AttributeDescription
           >
   {
@@ -3266,50 +3244,47 @@ namespace CORBA
     AttrDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        AttributeDescription* buffer, 
-        CORBA::Boolean release = 0
+        AttributeDescription* buffer,
+        CORBA::Boolean release = false
       );
     AttrDescriptionSeq (const AttrDescriptionSeq &);
     ~AttrDescriptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef AttrDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXTATTRDESCRIPTIONSEQ_CH_
-  
+
   class ExtAttrDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ExtAttrDescriptionSeq,
-        ExtAttributeDescription
+        ExtAttrDescriptionSeq
       >
     ExtAttrDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ExtAttrDescriptionSeq,
-        ExtAttrDescriptionSeq_var,
-        ExtAttributeDescription
+        ExtAttrDescriptionSeq
       >
     ExtAttrDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtAttrDescriptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ExtAttributeDescription
           >
   {
@@ -3319,39 +3294,39 @@ namespace CORBA
     ExtAttrDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtAttributeDescription* buffer, 
-        CORBA::Boolean release = 0
+        ExtAttributeDescription* buffer,
+        CORBA::Boolean release = false
       );
     ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &);
     ~ExtAttrDescriptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtAttrDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-  
+
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         InterfaceDef
       >
     InterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         InterfaceDef
@@ -3359,13 +3334,13 @@ namespace CORBA
     InterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_INTERFACEDEF_CH_)
 #define _CORBA_INTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export InterfaceDef
     : public virtual ::CORBA::Container,
       public virtual ::CORBA::Contained,
@@ -3375,42 +3350,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<InterfaceDef>;
     typedef InterfaceDef_ptr _ptr_type;
     typedef InterfaceDef_var _var_type;
-    
+
     // The static operations.
     static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
-    
+
     static void _tao_release (InterfaceDef_ptr obj);
-    
+
     static InterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceDef_ptr _nil (void)
     {
       return static_cast<InterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3418,10 +3393,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_a (
         const char * interface_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3429,61 +3404,61 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct FullInterfaceDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           FullInterfaceDescription
         >
       FullInterfaceDescription_var;
-    
+
     typedef
       TAO_Out_T<
           FullInterfaceDescription,
           FullInterfaceDescription_var
         >
       FullInterfaceDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export FullInterfaceDescription
     {
       typedef FullInterfaceDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      ::CORBA::OpDescriptionSeq operations;
+      ::CORBA::AttrDescriptionSeq attributes;
+      ::CORBA::RepositoryIdSeq base_interfaces;
+      ::CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     static ::CORBA::TypeCode_ptr const _tc_FullInterfaceDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
@@ -3495,10 +3470,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -3513,34 +3488,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     InterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_InterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     InterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     InterfaceDef (
         TAO_Stub *objref,
@@ -3548,76 +3523,76 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~InterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     InterfaceDef (const InterfaceDef &);
-    
+
     void operator= (const InterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct InterfaceDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         InterfaceDescription
       >
     InterfaceDescription_var;
-  
+
   typedef
     TAO_Out_T<
         InterfaceDescription,
         InterfaceDescription_var
       >
     InterfaceDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export InterfaceDescription
   {
     typedef InterfaceDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::RepositoryIdSeq base_interfaces;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_)
 #define _CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_
-  
+
   class InterfaceAttrExtension;
   typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         InterfaceAttrExtension
       >
     InterfaceAttrExtension_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         InterfaceAttrExtension
@@ -3625,13 +3600,13 @@ namespace CORBA
     InterfaceAttrExtension_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_CH_)
 #define _CORBA_INTERFACEATTREXTENSION_CH_
-  
+
   class TAO_IFR_Client_Export InterfaceAttrExtension
     : public virtual CORBA::Object
   {
@@ -3639,83 +3614,83 @@ namespace CORBA
     friend class TAO::Narrow_Utils<InterfaceAttrExtension>;
     typedef InterfaceAttrExtension_ptr _ptr_type;
     typedef InterfaceAttrExtension_var _var_type;
-    
+
     // The static operations.
     static InterfaceAttrExtension_ptr _duplicate (InterfaceAttrExtension_ptr obj);
-    
+
     static void _tao_release (InterfaceAttrExtension_ptr obj);
-    
+
     static InterfaceAttrExtension_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceAttrExtension_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceAttrExtension_ptr _nil (void)
     {
       return static_cast<InterfaceAttrExtension_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct ExtFullInterfaceDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           ExtFullInterfaceDescription
         >
       ExtFullInterfaceDescription_var;
-    
+
     typedef
       TAO_Out_T<
           ExtFullInterfaceDescription,
           ExtFullInterfaceDescription_var
         >
       ExtFullInterfaceDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export ExtFullInterfaceDescription
     {
       typedef ExtFullInterfaceDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      ::CORBA::OpDescriptionSeq operations;
+      ::CORBA::ExtAttrDescriptionSeq attributes;
+      ::CORBA::RepositoryIdSeq base_interfaces;
+      ::CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ExtFullInterfaceDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
@@ -3729,34 +3704,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_InterfaceAttrExtension_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     InterfaceAttrExtension (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_InterfaceAttrExtension_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     InterfaceAttrExtension (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     InterfaceAttrExtension (
         TAO_Stub *objref,
@@ -3764,38 +3739,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~InterfaceAttrExtension (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     InterfaceAttrExtension (const InterfaceAttrExtension &);
-    
+
     void operator= (const InterfaceAttrExtension &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtInterfaceDef
       >
     ExtInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtInterfaceDef
@@ -3803,13 +3778,13 @@ namespace CORBA
     ExtInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTINTERFACEDEF_CH_)
 #define _CORBA_EXTINTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExtInterfaceDef
     : public virtual ::CORBA::InterfaceDef,
       public virtual ::CORBA::InterfaceAttrExtension
@@ -3818,56 +3793,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExtInterfaceDef>;
     typedef ExtInterfaceDef_ptr _ptr_type;
     typedef ExtInterfaceDef_var _var_type;
-    
+
     // The static operations.
     static ExtInterfaceDef_ptr _duplicate (ExtInterfaceDef_ptr obj);
-    
+
     static void _tao_release (ExtInterfaceDef_ptr obj);
-    
+
     static ExtInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtInterfaceDef_ptr _nil (void)
     {
       return static_cast<ExtInterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExtInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExtInterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtInterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExtInterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExtInterfaceDef (
         TAO_Stub *objref,
@@ -3875,38 +3850,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExtInterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExtInterfaceDef (const ExtInterfaceDef &);
-    
+
     void operator= (const ExtInterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AbstractInterfaceDef
       >
     AbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AbstractInterfaceDef
@@ -3914,13 +3889,13 @@ namespace CORBA
     AbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export AbstractInterfaceDef
     : public virtual ::CORBA::InterfaceDef
   {
@@ -3928,56 +3903,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<AbstractInterfaceDef>;
     typedef AbstractInterfaceDef_ptr _ptr_type;
     typedef AbstractInterfaceDef_var _var_type;
-    
+
     // The static operations.
     static AbstractInterfaceDef_ptr _duplicate (AbstractInterfaceDef_ptr obj);
-    
+
     static void _tao_release (AbstractInterfaceDef_ptr obj);
-    
+
     static AbstractInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AbstractInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AbstractInterfaceDef_ptr _nil (void)
     {
       return static_cast<AbstractInterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     AbstractInterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AbstractInterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     AbstractInterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     AbstractInterfaceDef (
         TAO_Stub *objref,
@@ -3985,38 +3960,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~AbstractInterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     AbstractInterfaceDef (const AbstractInterfaceDef &);
-    
+
     void operator= (const AbstractInterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtAbstractInterfaceDef
       >
     ExtAbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtAbstractInterfaceDef
@@ -4024,13 +3999,13 @@ namespace CORBA
     ExtAbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExtAbstractInterfaceDef
     : public virtual ::CORBA::AbstractInterfaceDef,
       public virtual ::CORBA::InterfaceAttrExtension
@@ -4039,56 +4014,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExtAbstractInterfaceDef>;
     typedef ExtAbstractInterfaceDef_ptr _ptr_type;
     typedef ExtAbstractInterfaceDef_var _var_type;
-    
+
     // The static operations.
     static ExtAbstractInterfaceDef_ptr _duplicate (ExtAbstractInterfaceDef_ptr obj);
-    
+
     static void _tao_release (ExtAbstractInterfaceDef_ptr obj);
-    
+
     static ExtAbstractInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAbstractInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAbstractInterfaceDef_ptr _nil (void)
     {
       return static_cast<ExtAbstractInterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExtAbstractInterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtAbstractInterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExtAbstractInterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExtAbstractInterfaceDef (
         TAO_Stub *objref,
@@ -4096,38 +4071,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExtAbstractInterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef &);
-    
+
     void operator= (const ExtAbstractInterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         LocalInterfaceDef
       >
     LocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         LocalInterfaceDef
@@ -4135,13 +4110,13 @@ namespace CORBA
     LocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
 #define _CORBA_LOCALINTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export LocalInterfaceDef
     : public virtual ::CORBA::InterfaceDef
   {
@@ -4149,56 +4124,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<LocalInterfaceDef>;
     typedef LocalInterfaceDef_ptr _ptr_type;
     typedef LocalInterfaceDef_var _var_type;
-    
+
     // The static operations.
     static LocalInterfaceDef_ptr _duplicate (LocalInterfaceDef_ptr obj);
-    
+
     static void _tao_release (LocalInterfaceDef_ptr obj);
-    
+
     static LocalInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LocalInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LocalInterfaceDef_ptr _nil (void)
     {
       return static_cast<LocalInterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     LocalInterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_LocalInterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     LocalInterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     LocalInterfaceDef (
         TAO_Stub *objref,
@@ -4206,38 +4181,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~LocalInterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     LocalInterfaceDef (const LocalInterfaceDef &);
-    
+
     void operator= (const LocalInterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtLocalInterfaceDef
       >
     ExtLocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtLocalInterfaceDef
@@ -4245,13 +4220,13 @@ namespace CORBA
     ExtLocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExtLocalInterfaceDef
     : public virtual ::CORBA::LocalInterfaceDef,
       public virtual ::CORBA::InterfaceAttrExtension
@@ -4260,56 +4235,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExtLocalInterfaceDef>;
     typedef ExtLocalInterfaceDef_ptr _ptr_type;
     typedef ExtLocalInterfaceDef_var _var_type;
-    
+
     // The static operations.
     static ExtLocalInterfaceDef_ptr _duplicate (ExtLocalInterfaceDef_ptr obj);
-    
+
     static void _tao_release (ExtLocalInterfaceDef_ptr obj);
-    
+
     static ExtLocalInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtLocalInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtLocalInterfaceDef_ptr _nil (void)
     {
       return static_cast<ExtLocalInterfaceDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExtLocalInterfaceDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtLocalInterfaceDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExtLocalInterfaceDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExtLocalInterfaceDef (
         TAO_Stub *objref,
@@ -4317,21 +4292,21 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExtLocalInterfaceDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExtLocalInterfaceDef (const ExtLocalInterfaceDef &);
-    
+
     void operator= (const ExtLocalInterfaceDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
 
 // TAO_IDL - Generated from
@@ -4497,7 +4472,7 @@ namespace TAO
 
 #if !defined (_CORBA_FIXEDDEF__TRAITS_)
 #define _CORBA_FIXEDDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
   {
@@ -4518,7 +4493,7 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__TRAITS_)
 #define _CORBA_REPOSITORY__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
   {
@@ -4539,7 +4514,7 @@ namespace TAO
 
 #if !defined (_CORBA_MODULEDEF__TRAITS_)
 #define _CORBA_MODULEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
   {
@@ -4560,7 +4535,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONSTANTDEF__TRAITS_)
 #define _CORBA_CONSTANTDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
   {
@@ -4581,7 +4556,7 @@ namespace TAO
 
 #if !defined (_CORBA_STRUCTDEF__TRAITS_)
 #define _CORBA_STRUCTDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
   {
@@ -4602,7 +4577,7 @@ namespace TAO
 
 #if !defined (_CORBA_UNIONDEF__TRAITS_)
 #define _CORBA_UNIONDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
   {
@@ -4623,7 +4598,7 @@ namespace TAO
 
 #if !defined (_CORBA_ENUMDEF__TRAITS_)
 #define _CORBA_ENUMDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
   {
@@ -4644,7 +4619,7 @@ namespace TAO
 
 #if !defined (_CORBA_ALIASDEF__TRAITS_)
 #define _CORBA_ALIASDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
   {
@@ -4665,7 +4640,7 @@ namespace TAO
 
 #if !defined (_CORBA_NATIVEDEF__TRAITS_)
 #define _CORBA_NATIVEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
   {
@@ -4686,7 +4661,7 @@ namespace TAO
 
 #if !defined (_CORBA_PRIMITIVEDEF__TRAITS_)
 #define _CORBA_PRIMITIVEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
   {
@@ -4707,7 +4682,7 @@ namespace TAO
 
 #if !defined (_CORBA_STRINGDEF__TRAITS_)
 #define _CORBA_STRINGDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
   {
@@ -4728,7 +4703,7 @@ namespace TAO
 
 #if !defined (_CORBA_WSTRINGDEF__TRAITS_)
 #define _CORBA_WSTRINGDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
   {
@@ -4749,7 +4724,7 @@ namespace TAO
 
 #if !defined (_CORBA_SEQUENCEDEF__TRAITS_)
 #define _CORBA_SEQUENCEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
   {
@@ -4770,7 +4745,7 @@ namespace TAO
 
 #if !defined (_CORBA_ARRAYDEF__TRAITS_)
 #define _CORBA_ARRAYDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
   {
@@ -4791,7 +4766,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXCEPTIONDEF__TRAITS_)
 #define _CORBA_EXCEPTIONDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
   {
@@ -4812,7 +4787,7 @@ namespace TAO
 
 #if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
   {
@@ -4833,7 +4808,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
   {
@@ -4854,7 +4829,7 @@ namespace TAO
 
 #if !defined (_CORBA_OPERATIONDEF__TRAITS_)
 #define _CORBA_OPERATIONDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
   {
@@ -4875,7 +4850,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__TRAITS_)
 #define _CORBA_INTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
   {
@@ -4896,7 +4871,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_)
 #define _CORBA_INTERFACEATTREXTENSION__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
   {
@@ -4917,7 +4892,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_)
 #define _CORBA_EXTINTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
   {
@@ -4938,7 +4913,7 @@ namespace TAO
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
   {
@@ -4959,7 +4934,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
   {
@@ -4980,7 +4955,7 @@ namespace TAO
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
   {
@@ -5001,7 +4976,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_)
 #define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
   {
@@ -5687,8 +5662,10 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicC.inl"
+#include "tao/IFR_Client/IFR_BasicC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl
index 6edd2c8a1a9..2cdaff7f308 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.inl
+++ b/TAO/tao/IFR_Client/IFR_BasicC.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
@@ -39,7 +41,7 @@ CORBA::Repository::Repository (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,7 +57,7 @@ CORBA::Repository::Repository (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Repository_Proxy_Broker_ (0)
 {
 }
@@ -75,7 +77,7 @@ CORBA::ModuleDef::ModuleDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -91,7 +93,7 @@ CORBA::ModuleDef::ModuleDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ModuleDef_Proxy_Broker_ (0)
 {
 }
@@ -111,7 +113,7 @@ CORBA::ConstantDef::ConstantDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -127,7 +129,7 @@ CORBA::ConstantDef::ConstantDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ConstantDef_Proxy_Broker_ (0)
 {
 }
@@ -147,7 +149,7 @@ CORBA::StructDef::StructDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -163,7 +165,7 @@ CORBA::StructDef::StructDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_StructDef_Proxy_Broker_ (0)
 {
 }
@@ -183,7 +185,7 @@ CORBA::UnionDef::UnionDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -199,7 +201,7 @@ CORBA::UnionDef::UnionDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_UnionDef_Proxy_Broker_ (0)
 {
 }
@@ -219,7 +221,7 @@ CORBA::EnumDef::EnumDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -235,7 +237,7 @@ CORBA::EnumDef::EnumDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_EnumDef_Proxy_Broker_ (0)
 {
 }
@@ -255,7 +257,7 @@ CORBA::AliasDef::AliasDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -271,7 +273,7 @@ CORBA::AliasDef::AliasDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_AliasDef_Proxy_Broker_ (0)
 {
 }
@@ -291,7 +293,7 @@ CORBA::NativeDef::NativeDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -307,7 +309,7 @@ CORBA::NativeDef::NativeDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_NativeDef_Proxy_Broker_ (0)
 {
 }
@@ -327,7 +329,7 @@ CORBA::PrimitiveDef::PrimitiveDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -343,7 +345,7 @@ CORBA::PrimitiveDef::PrimitiveDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_PrimitiveDef_Proxy_Broker_ (0)
 {
 }
@@ -363,7 +365,7 @@ CORBA::StringDef::StringDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -379,7 +381,7 @@ CORBA::StringDef::StringDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_StringDef_Proxy_Broker_ (0)
 {
 }
@@ -399,7 +401,7 @@ CORBA::WstringDef::WstringDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -415,7 +417,7 @@ CORBA::WstringDef::WstringDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_WstringDef_Proxy_Broker_ (0)
 {
 }
@@ -435,7 +437,7 @@ CORBA::SequenceDef::SequenceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -451,7 +453,7 @@ CORBA::SequenceDef::SequenceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_SequenceDef_Proxy_Broker_ (0)
 {
 }
@@ -471,7 +473,7 @@ CORBA::ArrayDef::ArrayDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -487,7 +489,7 @@ CORBA::ArrayDef::ArrayDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ArrayDef_Proxy_Broker_ (0)
 {
 }
@@ -507,7 +509,7 @@ CORBA::ExceptionDef::ExceptionDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -523,7 +525,7 @@ CORBA::ExceptionDef::ExceptionDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExceptionDef_Proxy_Broker_ (0)
 {
 }
@@ -543,7 +545,7 @@ CORBA::AttributeDef::AttributeDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -559,7 +561,7 @@ CORBA::AttributeDef::AttributeDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_AttributeDef_Proxy_Broker_ (0)
 {
 }
@@ -579,7 +581,7 @@ CORBA::ExtAttributeDef::ExtAttributeDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -595,7 +597,7 @@ CORBA::ExtAttributeDef::ExtAttributeDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExtAttributeDef_Proxy_Broker_ (0)
 {
 }
@@ -615,7 +617,7 @@ CORBA::OperationDef::OperationDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -631,7 +633,7 @@ CORBA::OperationDef::OperationDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_OperationDef_Proxy_Broker_ (0)
 {
 }
@@ -651,7 +653,7 @@ CORBA::InterfaceDef::InterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -667,7 +669,7 @@ CORBA::InterfaceDef::InterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_InterfaceDef_Proxy_Broker_ (0)
 {
 }
@@ -687,7 +689,7 @@ CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -703,7 +705,7 @@ CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0)
 {
 }
@@ -723,7 +725,7 @@ CORBA::ExtInterfaceDef::ExtInterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -739,7 +741,7 @@ CORBA::ExtInterfaceDef::ExtInterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExtInterfaceDef_Proxy_Broker_ (0)
 {
 }
@@ -759,7 +761,7 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -775,7 +777,7 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0)
 {
 }
@@ -795,7 +797,7 @@ CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -811,7 +813,7 @@ CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
 {
 }
@@ -831,7 +833,7 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -847,7 +849,7 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_LocalInterfaceDef_Proxy_Broker_ (0)
 {
 }
@@ -867,7 +869,7 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -883,9 +885,11 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+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 add9f0af0c5..636c1adecd0 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "IFR_Client_Adapter_Impl.h"
-#include "IFR_ExtendedC.h"
+#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -15,6 +15,8 @@ ACE_RCSID (IFR_Client,
            IFR_Client_Adapter_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template<>
@@ -58,7 +60,7 @@ TAO_IFR_Client_Adapter_Impl::dispose (
     CORBA::InterfaceDef_ptr orphan
   )
 {
-  CORBA::release (orphan);
+  ::CORBA::release (orphan);
 }
 
 CORBA::InterfaceDef_ptr
@@ -214,6 +216,8 @@ TAO_IFR_Client_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_IFR_Client_Adapter_Impl,
     ACE_TEXT ("Concrete_IFR_Client_Adapter"),
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index bab2b9d2cb8..e3cfcd6b22d 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ifr_client_export.h"
+#include "tao/IFR_Client/ifr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_IFR_Client_Adapter_Impl
  *
@@ -79,13 +81,16 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
-
 static int
 TAO_Requires_IFR_Client_Initializer =
   TAO_IFR_Client_Adapter_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
+
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IFR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 6bae6d0ebb0..7aa0102cd97 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -18,6 +18,8 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Components.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index eab777756f6..6ff269545c4 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -30,7 +30,7 @@
 
 
 #include "tao/AnyTypeCode/orb_typesA.h"
-#include "IFR_ComponentsC.h"
+#include "tao/IFR_Client/IFR_ComponentsC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_ExtendedC.h"
 #include "tao/Invocation_Adapter.h"
@@ -58,12 +58,15 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.inl"
+#include "tao/IFR_Client/IFR_ComponentsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -209,13 +212,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
@@ -230,13 +233,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
     : public
@@ -251,13 +254,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
     : public
@@ -272,13 +275,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
@@ -293,13 +296,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
     : public
@@ -314,13 +317,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
@@ -335,13 +338,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
@@ -356,13 +359,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
@@ -377,13 +380,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
@@ -398,13 +401,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
     : public
@@ -440,7 +443,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release (
     CORBA::ComponentIR::EventDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -459,7 +462,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -478,19 +481,19 @@ CORBA::ComponentIR::EventDef::CORBA_ComponentIR_EventDef_setup_collocation ()
       this->the_TAO_EventDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ExtValueDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::EventDef::~EventDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventDef *_tao_tmp_pointer =
     static_cast<EventDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -526,18 +529,18 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow (
 CORBA::ComponentIR::EventDef_ptr
 CORBA::ComponentIR::EventDef::_duplicate (EventDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::EventDef::_tao_release (EventDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -585,7 +588,7 @@ CORBA::ComponentIR::EventDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -612,7 +615,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
     "EventDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -642,7 +645,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::release (
     CORBA::ComponentIR::Container_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::Container_ptr
@@ -661,7 +664,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -683,21 +686,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -707,7 +710,7 @@ TAO::Collocation_Proxy_Broker *
       &_tao_base_component,
       &_tao_supports_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -716,10 +719,10 @@ TAO::Collocation_Proxy_Broker *
       16,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -742,14 +745,14 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -758,7 +761,7 @@ TAO::Collocation_Proxy_Broker *
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
   TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -770,7 +773,7 @@ TAO::Collocation_Proxy_Broker *
       &_tao_supports_interfaces,
       &_tao_primary_key
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -779,10 +782,10 @@ TAO::Collocation_Proxy_Broker *
       11,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -808,14 +811,14 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Container_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_Container_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -827,7 +830,7 @@ TAO::Collocation_Proxy_Broker *
   TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -842,7 +845,7 @@ TAO::Collocation_Proxy_Broker *
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -851,10 +854,10 @@ TAO::Collocation_Proxy_Broker *
       12,
       this->the_TAO_Container_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -872,19 +875,19 @@ CORBA::ComponentIR::Container::CORBA_ComponentIR_Container_setup_collocation ()
       this->the_TAO_Container_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
 }
 
 CORBA::ComponentIR::Container::~Container (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *_tao_tmp_pointer =
     static_cast<Container *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::Container_ptr
@@ -920,18 +923,18 @@ CORBA::ComponentIR::Container::_unchecked_narrow (
 CORBA::ComponentIR::Container_ptr
 CORBA::ComponentIR::Container::_duplicate (Container_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::Container::_tao_release (Container_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -963,7 +966,7 @@ CORBA::ComponentIR::Container::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -990,7 +993,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
     "Container");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -1020,7 +1023,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release (
     CORBA::ComponentIR::ModuleDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::ModuleDef_ptr
@@ -1039,7 +1042,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1058,7 +1061,7 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation ()
       this->the_TAO_ModuleDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ModuleDef_setup_collocation ();
   this->CORBA_ComponentIR_Container_setup_collocation ();
 }
@@ -1066,12 +1069,12 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation ()
 CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
     static_cast<ModuleDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::ModuleDef_ptr
@@ -1107,18 +1110,18 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
 CORBA::ComponentIR::ModuleDef_ptr
 CORBA::ComponentIR::ModuleDef::_duplicate (ModuleDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::ModuleDef::_tao_release (ModuleDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1162,7 +1165,7 @@ CORBA::ComponentIR::ModuleDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1189,7 +1192,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
     "ModuleDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -1219,7 +1222,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release (
     CORBA::ComponentIR::Repository_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::Repository_ptr
@@ -1238,7 +1241,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1257,7 +1260,7 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation (
       this->the_TAO_Repository_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Repository_setup_collocation ();
   this->CORBA_ComponentIR_Container_setup_collocation ();
 }
@@ -1265,12 +1268,12 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation (
 CORBA::ComponentIR::Repository::~Repository (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
     static_cast<Repository *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::Repository_ptr
@@ -1306,18 +1309,18 @@ CORBA::ComponentIR::Repository::_unchecked_narrow (
 CORBA::ComponentIR::Repository_ptr
 CORBA::ComponentIR::Repository::_duplicate (Repository_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::Repository::_tao_release (Repository_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1357,7 +1360,7 @@ CORBA::ComponentIR::Repository::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1384,7 +1387,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
     "Repository");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -1414,7 +1417,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release (
     CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::ProvidesDef_ptr
@@ -1433,7 +1436,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1450,21 +1453,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ProvidesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1473,10 +1476,10 @@ TAO::Collocation_Proxy_Broker *
       19,
       this->the_TAO_ProvidesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1493,23 +1496,23 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ProvidesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_interface_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1518,7 +1521,7 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
       19,
       this->the_TAO_ProvidesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1537,19 +1540,19 @@ CORBA::ComponentIR::ProvidesDef::CORBA_ComponentIR_ProvidesDef_setup_collocation
       this->the_TAO_ProvidesDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProvidesDef *_tao_tmp_pointer =
     static_cast<ProvidesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::ProvidesDef_ptr
@@ -1585,18 +1588,18 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
 CORBA::ComponentIR::ProvidesDef_ptr
 CORBA::ComponentIR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::ProvidesDef::_tao_release (ProvidesDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1628,7 +1631,7 @@ CORBA::ComponentIR::ProvidesDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1655,7 +1658,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
     "ProvidesDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -1677,7 +1680,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "defined_in", &CORBA::_tc_RepositoryId },
     { "version", &CORBA::_tc_VersionSpec },
     { "interface_type", &CORBA::_tc_RepositoryId }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -1689,7 +1692,7 @@ static TAO::TypeCode::Struct<char const *,
     "ProvidesDescription",
     _tao_fields_CORBA_ComponentIR_ProvidesDescription,
     5);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -1701,10 +1704,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1732,7 +1735,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release (
     CORBA::ComponentIR::UsesDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -1751,7 +1754,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1768,21 +1771,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UsesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1791,10 +1794,10 @@ TAO::Collocation_Proxy_Broker *
       19,
       this->the_TAO_UsesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1811,23 +1814,23 @@ void CORBA::ComponentIR::UsesDef::interface_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UsesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_interface_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1836,7 +1839,7 @@ void CORBA::ComponentIR::UsesDef::interface_type (
       19,
       this->the_TAO_UsesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1853,21 +1856,21 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UsesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1876,10 +1879,10 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
       16,
       this->the_TAO_UsesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1896,23 +1899,23 @@ void CORBA::ComponentIR::UsesDef::is_multiple (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UsesDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_is_multiple
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1921,7 +1924,7 @@ void CORBA::ComponentIR::UsesDef::is_multiple (
       16,
       this->the_TAO_UsesDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1940,19 +1943,19 @@ CORBA::ComponentIR::UsesDef::CORBA_ComponentIR_UsesDef_setup_collocation ()
       this->the_TAO_UsesDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ComponentIR::UsesDef::~UsesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UsesDef *_tao_tmp_pointer =
     static_cast<UsesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -1988,18 +1991,18 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow (
 CORBA::ComponentIR::UsesDef_ptr
 CORBA::ComponentIR::UsesDef::_duplicate (UsesDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::UsesDef::_tao_release (UsesDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2031,7 +2034,7 @@ CORBA::ComponentIR::UsesDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2058,7 +2061,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
     "UsesDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2081,7 +2084,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "version", &CORBA::_tc_VersionSpec },
     { "interface_type", &CORBA::_tc_RepositoryId },
     { "is_multiple", &CORBA::_tc_boolean }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2093,7 +2096,7 @@ static TAO::TypeCode::Struct<char const *,
     "UsesDescription",
     _tao_fields_CORBA_ComponentIR_UsesDescription,
     6);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2105,10 +2108,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ComponentIR::UsesDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2136,7 +2139,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release (
     CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::EventPortDef_ptr
@@ -2155,7 +2158,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2172,21 +2175,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2195,10 +2198,10 @@ TAO::Collocation_Proxy_Broker *
       10,
       this->the_TAO_EventPortDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2215,23 +2218,23 @@ void CORBA::ComponentIR::EventPortDef::event (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_event
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2240,7 +2243,7 @@ void CORBA::ComponentIR::EventPortDef::event (
       10,
       this->the_TAO_EventPortDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2258,23 +2261,23 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_event_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2283,10 +2286,10 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
       4,
       this->the_TAO_EventPortDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2304,19 +2307,19 @@ CORBA::ComponentIR::EventPortDef::CORBA_ComponentIR_EventPortDef_setup_collocati
       this->the_TAO_EventPortDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventPortDef *_tao_tmp_pointer =
     static_cast<EventPortDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::EventPortDef_ptr
@@ -2352,18 +2355,18 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
 CORBA::ComponentIR::EventPortDef_ptr
 CORBA::ComponentIR::EventPortDef::_duplicate (EventPortDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::EventPortDef::_tao_release (EventPortDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2395,7 +2398,7 @@ CORBA::ComponentIR::EventPortDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2422,7 +2425,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
     "EventPortDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2444,7 +2447,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "defined_in", &CORBA::_tc_RepositoryId },
     { "version", &CORBA::_tc_VersionSpec },
     { "event", &CORBA::_tc_RepositoryId }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2456,7 +2459,7 @@ static TAO::TypeCode::Struct<char const *,
     "EventPortDescription",
     _tao_fields_CORBA_ComponentIR_EventPortDescription,
     5);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2468,10 +2471,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2499,7 +2502,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release (
     CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
@@ -2518,7 +2521,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2537,19 +2540,19 @@ CORBA::ComponentIR::EmitsDef::CORBA_ComponentIR_EmitsDef_setup_collocation ()
       this->the_TAO_EmitsDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmitsDef *_tao_tmp_pointer =
     static_cast<EmitsDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
@@ -2585,18 +2588,18 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
 CORBA::ComponentIR::EmitsDef_ptr
 CORBA::ComponentIR::EmitsDef::_duplicate (EmitsDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::EmitsDef::_tao_release (EmitsDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2632,7 +2635,7 @@ CORBA::ComponentIR::EmitsDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2659,7 +2662,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
     "EmitsDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2689,7 +2692,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release (
     CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
@@ -2708,7 +2711,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2727,19 +2730,19 @@ CORBA::ComponentIR::PublishesDef::CORBA_ComponentIR_PublishesDef_setup_collocati
       this->the_TAO_PublishesDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PublishesDef *_tao_tmp_pointer =
     static_cast<PublishesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
@@ -2775,18 +2778,18 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
 CORBA::ComponentIR::PublishesDef_ptr
 CORBA::ComponentIR::PublishesDef::_duplicate (PublishesDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::PublishesDef::_tao_release (PublishesDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2822,7 +2825,7 @@ CORBA::ComponentIR::PublishesDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2849,7 +2852,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
     "PublishesDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -2879,7 +2882,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release (
     CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
@@ -2898,7 +2901,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2917,19 +2920,19 @@ CORBA::ComponentIR::ConsumesDef::CORBA_ComponentIR_ConsumesDef_setup_collocation
       this->the_TAO_ConsumesDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConsumesDef *_tao_tmp_pointer =
     static_cast<ConsumesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
@@ -2965,18 +2968,18 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
 CORBA::ComponentIR::ConsumesDef_ptr
 CORBA::ComponentIR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::ConsumesDef::_tao_release (ConsumesDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3012,7 +3015,7 @@ CORBA::ComponentIR::ConsumesDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3039,7 +3042,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
     "ConsumesDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -3069,7 +3072,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release (
     CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
@@ -3088,7 +3091,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3105,21 +3108,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3128,10 +3131,10 @@ TAO::Collocation_Proxy_Broker *
       19,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3148,23 +3151,23 @@ void CORBA::ComponentIR::ComponentDef::base_component (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_base_component
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3173,7 +3176,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       19,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3190,21 +3193,21 @@ void CORBA::ComponentIR::ComponentDef::base_component (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3213,10 +3216,10 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       25,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3233,23 +3236,23 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_supported_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3258,7 +3261,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       25,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3279,20 +3282,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3301,7 +3304,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       &_tao_version,
       &_tao_interface_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3310,10 +3313,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       15,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3334,21 +3337,21 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3358,7 +3361,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       &_tao_interface_type,
       &_tao_is_multiple
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3367,10 +3370,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       11,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3390,20 +3393,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3412,7 +3415,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       &_tao_version,
       &_tao_event
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3421,10 +3424,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       12,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3444,20 +3447,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3466,7 +3469,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       &_tao_version,
       &_tao_event
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3475,10 +3478,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       16,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3498,20 +3501,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -3520,7 +3523,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       &_tao_version,
       &_tao_event
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3529,10 +3532,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       15,
       this->the_TAO_ComponentDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3550,19 +3553,19 @@ CORBA::ComponentIR::ComponentDef::CORBA_ComponentIR_ComponentDef_setup_collocati
       this->the_TAO_ComponentDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ExtInterfaceDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ComponentDef *_tao_tmp_pointer =
     static_cast<ComponentDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
@@ -3598,18 +3601,18 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
 CORBA::ComponentIR::ComponentDef_ptr
 CORBA::ComponentIR::ComponentDef::_duplicate (ComponentDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::ComponentDef::_tao_release (ComponentDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3661,7 +3664,7 @@ CORBA::ComponentIR::ComponentDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3688,7 +3691,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
     "ComponentDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -3700,7 +3703,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
@@ -3712,7 +3715,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (void)
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ProvidesDescription
       >
     (max)
@@ -3724,7 +3727,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::ComponentIR::ProvidesDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ProvidesDescription
       >
     (max, length, buffer, release)
@@ -3733,7 +3736,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     const ProvidesDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ProvidesDescription
       >
     (seq)
@@ -3774,10 +3777,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_ProvidesDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
       &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
-    
+
   }
 }
 
@@ -3792,7 +3795,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
     "ProvidesDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -3804,7 +3807,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
@@ -3816,7 +3819,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (void)
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UsesDescription
       >
     (max)
@@ -3828,7 +3831,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::ComponentIR::UsesDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UsesDescription
       >
     (max, length, buffer, release)
@@ -3837,7 +3840,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     const UsesDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         UsesDescription
       >
     (seq)
@@ -3878,10 +3881,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_UsesDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
       &CORBA_ComponentIR_UsesDescriptionSeq_0;
-    
+
   }
 }
 
@@ -3896,7 +3899,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
     "UsesDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -3908,7 +3911,7 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
@@ -3920,7 +3923,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (void)
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EventPortDescription
       >
     (max)
@@ -3932,7 +3935,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::ComponentIR::EventPortDescription * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EventPortDescription
       >
     (max, length, buffer, release)
@@ -3941,7 +3944,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     const EventPortDescriptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EventPortDescription
       >
     (seq)
@@ -3982,10 +3985,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_EventPortDescription,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
       &CORBA_ComponentIR_EventPortDescriptionSeq_0;
-    
+
   }
 }
 
@@ -4000,7 +4003,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
     "EventPortDescriptionSeq",
     &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -4065,7 +4068,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
     { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Recursive_Type<
   TAO::TypeCode::Struct<char const *,
@@ -4081,7 +4084,7 @@ static TAO::TypeCode::Recursive_Type<
     "ComponentDescription",
     _tao_fields_CORBA_ComponentIR_ComponentDescription,
     13);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -4093,10 +4096,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -4124,7 +4127,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release (
     CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::FactoryDef_ptr
@@ -4143,7 +4146,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4162,19 +4165,19 @@ CORBA::ComponentIR::FactoryDef::CORBA_ComponentIR_FactoryDef_setup_collocation (
       this->the_TAO_FactoryDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_OperationDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FactoryDef *_tao_tmp_pointer =
     static_cast<FactoryDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::FactoryDef_ptr
@@ -4210,18 +4213,18 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
 CORBA::ComponentIR::FactoryDef_ptr
 CORBA::ComponentIR::FactoryDef::_duplicate (FactoryDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::FactoryDef::_tao_release (FactoryDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4257,7 +4260,7 @@ CORBA::ComponentIR::FactoryDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4284,7 +4287,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
     "FactoryDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -4314,7 +4317,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release (
     CORBA::ComponentIR::FinderDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -4333,7 +4336,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4352,19 +4355,19 @@ CORBA::ComponentIR::FinderDef::CORBA_ComponentIR_FinderDef_setup_collocation ()
       this->the_TAO_FinderDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_OperationDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::FinderDef::~FinderDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FinderDef *_tao_tmp_pointer =
     static_cast<FinderDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -4400,18 +4403,18 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow (
 CORBA::ComponentIR::FinderDef_ptr
 CORBA::ComponentIR::FinderDef::_duplicate (FinderDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::FinderDef::_tao_release (FinderDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -4447,7 +4450,7 @@ CORBA::ComponentIR::FinderDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -4474,7 +4477,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
     "FinderDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -4504,7 +4507,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release (
     CORBA::ComponentIR::HomeDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -4523,7 +4526,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4540,21 +4543,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4563,10 +4566,10 @@ TAO::Collocation_Proxy_Broker *
       14,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4583,23 +4586,23 @@ void CORBA::ComponentIR::HomeDef::base_home (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_base_home
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4608,7 +4611,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
       14,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4625,21 +4628,21 @@ void CORBA::ComponentIR::HomeDef::base_home (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4648,10 +4651,10 @@ void CORBA::ComponentIR::HomeDef::base_home (
       25,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4668,23 +4671,23 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_supported_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4693,7 +4696,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       25,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4710,21 +4713,21 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4733,10 +4736,10 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       22,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4753,23 +4756,23 @@ void CORBA::ComponentIR::HomeDef::managed_component (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_managed_component
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4778,7 +4781,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       22,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4795,21 +4798,21 @@ void CORBA::ComponentIR::HomeDef::managed_component (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4818,10 +4821,10 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       16,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4838,23 +4841,23 @@ void CORBA::ComponentIR::HomeDef::primary_key (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_primary_key
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4863,7 +4866,7 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       16,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4885,21 +4888,21 @@ void CORBA::ComponentIR::HomeDef::primary_key (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4909,7 +4912,7 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4918,10 +4921,10 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       14,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4942,21 +4945,21 @@ void CORBA::ComponentIR::HomeDef::primary_key (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_HomeDef_Proxy_Broker_ == 0)
     {
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -4966,7 +4969,7 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4975,10 +4978,10 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       13,
       this->the_TAO_HomeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4996,19 +4999,19 @@ CORBA::ComponentIR::HomeDef::CORBA_ComponentIR_HomeDef_setup_collocation ()
       this->the_TAO_HomeDef_Proxy_Broker_ =
         ::CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ExtInterfaceDef_setup_collocation ();
 }
 
 CORBA::ComponentIR::HomeDef::~HomeDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   HomeDef *_tao_tmp_pointer =
     static_cast<HomeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -5044,18 +5047,18 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow (
 CORBA::ComponentIR::HomeDef_ptr
 CORBA::ComponentIR::HomeDef::_duplicate (HomeDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ComponentIR::HomeDef::_tao_release (HomeDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -5107,7 +5110,7 @@ CORBA::ComponentIR::HomeDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -5134,7 +5137,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
     "HomeDef");
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -5183,7 +5186,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "operations", &CORBA::_tc_OpDescriptionSeq },
     { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Recursive_Type<
   TAO::TypeCode::Struct<char const *,
@@ -5199,7 +5202,7 @@ static TAO::TypeCode::Recursive_Type<
     "HomeDescription",
     _tao_fields_CORBA_ComponentIR_HomeDescription,
     12);
-  
+
 namespace CORBA
 {
   namespace ComponentIR
@@ -5211,10 +5214,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ComponentIR::HomeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5514,7 +5517,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5630,7 +5633,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5746,7 +5749,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6036,7 +6039,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6095,7 +6098,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6154,7 +6157,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -6213,7 +6216,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6445,7 +6448,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6521,21 +6524,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::EventDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6557,21 +6560,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::Container RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6593,21 +6596,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::ModuleDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6629,21 +6632,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::Repository RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6665,21 +6668,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::ProvidesDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6730,21 +6733,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::UsesDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6797,21 +6800,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::EventPortDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6862,21 +6865,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::EmitsDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6898,21 +6901,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::PublishesDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6934,21 +6937,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::ConsumesDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6970,21 +6973,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::ComponentDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -6999,22 +7002,7 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7022,40 +7010,7 @@ CORBA::Boolean operator>> (
     CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_ */
@@ -7071,22 +7026,7 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7094,40 +7034,7 @@ CORBA::Boolean operator>> (
     CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_ */
@@ -7143,22 +7050,7 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -7166,40 +7058,7 @@ CORBA::Boolean operator>> (
     CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_ */
@@ -7267,21 +7126,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::FactoryDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -7303,21 +7162,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::FinderDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -7339,21 +7198,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ComponentIR::HomeDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -7399,3 +7258,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.attributes) &&
     (strm >> _tao_aggregate.type.out ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index f2efcd1c0c8..69b379a161f 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ifr_client_export.h"
+#include "tao/IFR_Client/ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -69,7 +69,9 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -83,28 +85,28 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_module/module_ch.cpp:48
-  
+
   namespace ComponentIR
   {
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_
-    
+
     class ComponentDef;
     typedef ComponentDef *ComponentDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           ComponentDef
         >
       ComponentDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           ComponentDef
@@ -112,22 +114,22 @@ namespace CORBA
       ComponentDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_
-    
+
     class HomeDef;
     typedef HomeDef *HomeDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           HomeDef
         >
       HomeDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           HomeDef
@@ -135,22 +137,22 @@ namespace CORBA
       HomeDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_
-    
+
     class EventDef;
     typedef EventDef *EventDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           EventDef
         >
       EventDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           EventDef
@@ -158,13 +160,13 @@ namespace CORBA
       EventDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF_CH_)
 #define _CORBA_COMPONENTIR_EVENTDEF_CH_
-    
+
     class TAO_IFR_Client_Export EventDef
       : public virtual ::CORBA::ExtValueDef
     {
@@ -172,56 +174,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<EventDef>;
       typedef EventDef_ptr _ptr_type;
       typedef EventDef_var _var_type;
-      
+
       // The static operations.
       static EventDef_ptr _duplicate (EventDef_ptr obj);
-      
+
       static void _tao_release (EventDef_ptr obj);
-      
+
       static EventDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EventDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EventDef_ptr _nil (void)
       {
         return static_cast<EventDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       EventDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_EventDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       EventDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       EventDef (
           TAO_Stub *objref,
@@ -229,38 +231,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~EventDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       EventDef (const EventDef &);
-      
+
       void operator= (const EventDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_
-    
+
     class Container;
     typedef Container *Container_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           Container
         >
       Container_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           Container
@@ -268,13 +270,13 @@ namespace CORBA
       Container_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_CONTAINER_CH_)
 #define _CORBA_COMPONENTIR_CONTAINER_CH_
-    
+
     class TAO_IFR_Client_Export Container
       : public virtual ::CORBA::Container
     {
@@ -282,32 +284,32 @@ namespace CORBA
       friend class TAO::Narrow_Utils<Container>;
       typedef Container_ptr _ptr_type;
       typedef Container_var _var_type;
-      
+
       // The static operations.
       static Container_ptr _duplicate (Container_ptr obj);
-      
+
       static void _tao_release (Container_ptr obj);
-      
+
       static Container_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static Container_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static Container_ptr _nil (void)
       {
         return static_cast<Container_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
           const char * id,
           const char * name,
@@ -319,10 +321,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
           const char * id,
           const char * name,
@@ -336,10 +338,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
           const char * id,
           const char * name,
@@ -356,34 +358,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       Container (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_Container_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       Container (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       Container (
           TAO_Stub *objref,
@@ -391,38 +393,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~Container (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       Container (const Container &);
-      
+
       void operator= (const Container &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_
-    
+
     class ModuleDef;
     typedef ModuleDef *ModuleDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           ModuleDef
         >
       ModuleDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           ModuleDef
@@ -430,13 +432,13 @@ namespace CORBA
       ModuleDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_MODULEDEF_CH_)
 #define _CORBA_COMPONENTIR_MODULEDEF_CH_
-    
+
     class TAO_IFR_Client_Export ModuleDef
       : public virtual ::CORBA::ModuleDef,
         public virtual ::CORBA::ComponentIR::Container
@@ -445,56 +447,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<ModuleDef>;
       typedef ModuleDef_ptr _ptr_type;
       typedef ModuleDef_var _var_type;
-      
+
       // The static operations.
       static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-      
+
       static void _tao_release (ModuleDef_ptr obj);
-      
+
       static ModuleDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ModuleDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ModuleDef_ptr _nil (void)
       {
         return static_cast<ModuleDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       ModuleDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_ModuleDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       ModuleDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       ModuleDef (
           TAO_Stub *objref,
@@ -502,38 +504,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~ModuleDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       ModuleDef (const ModuleDef &);
-      
+
       void operator= (const ModuleDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_
-    
+
     class Repository;
     typedef Repository *Repository_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           Repository
         >
       Repository_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           Repository
@@ -541,13 +543,13 @@ namespace CORBA
       Repository_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_REPOSITORY_CH_)
 #define _CORBA_COMPONENTIR_REPOSITORY_CH_
-    
+
     class TAO_IFR_Client_Export Repository
       : public virtual ::CORBA::Repository,
         public virtual ::CORBA::ComponentIR::Container
@@ -556,56 +558,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<Repository>;
       typedef Repository_ptr _ptr_type;
       typedef Repository_var _var_type;
-      
+
       // The static operations.
       static Repository_ptr _duplicate (Repository_ptr obj);
-      
+
       static void _tao_release (Repository_ptr obj);
-      
+
       static Repository_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static Repository_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static Repository_ptr _nil (void)
       {
         return static_cast<Repository_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       Repository (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_Repository_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       Repository (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       Repository (
           TAO_Stub *objref,
@@ -613,38 +615,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~Repository (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       Repository (const Repository &);
-      
+
       void operator= (const Repository &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_
-    
+
     class ProvidesDef;
     typedef ProvidesDef *ProvidesDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           ProvidesDef
         >
       ProvidesDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           ProvidesDef
@@ -652,13 +654,13 @@ namespace CORBA
       ProvidesDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF_CH_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF_CH_
-    
+
     class TAO_IFR_Client_Export ProvidesDef
       : public virtual ::CORBA::Contained
     {
@@ -666,42 +668,42 @@ namespace CORBA
       friend class TAO::Narrow_Utils<ProvidesDef>;
       typedef ProvidesDef_ptr _ptr_type;
       typedef ProvidesDef_var _var_type;
-      
+
       // The static operations.
       static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
-      
+
       static void _tao_release (ProvidesDef_ptr obj);
-      
+
       static ProvidesDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ProvidesDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ProvidesDef_ptr _nil (void)
       {
         return static_cast<ProvidesDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -709,34 +711,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       ProvidesDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_ProvidesDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       ProvidesDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       ProvidesDef (
           TAO_Stub *objref,
@@ -744,76 +746,76 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~ProvidesDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       ProvidesDef (const ProvidesDef &);
-      
+
       void operator= (const ProvidesDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct ProvidesDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           ProvidesDescription
         >
       ProvidesDescription_var;
-    
+
     typedef
       TAO_Out_T<
           ProvidesDescription,
           ProvidesDescription_var
         >
       ProvidesDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export ProvidesDescription
     {
       typedef ProvidesDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager interface_type;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      TAO::String_Manager interface_type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_
-    
+
     class UsesDef;
     typedef UsesDef *UsesDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           UsesDef
         >
       UsesDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           UsesDef
@@ -821,13 +823,13 @@ namespace CORBA
       UsesDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF_CH_)
 #define _CORBA_COMPONENTIR_USESDEF_CH_
-    
+
     class TAO_IFR_Client_Export UsesDef
       : public virtual ::CORBA::Contained
     {
@@ -835,42 +837,42 @@ namespace CORBA
       friend class TAO::Narrow_Utils<UsesDef>;
       typedef UsesDef_ptr _ptr_type;
       typedef UsesDef_var _var_type;
-      
+
       // The static operations.
       static UsesDef_ptr _duplicate (UsesDef_ptr obj);
-      
+
       static void _tao_release (UsesDef_ptr obj);
-      
+
       static UsesDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static UsesDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static UsesDef_ptr _nil (void)
       {
         return static_cast<UsesDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -878,20 +880,20 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual CORBA::Boolean is_multiple (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void is_multiple (
           ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -899,34 +901,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       UsesDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_UsesDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       UsesDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       UsesDef (
           TAO_Stub *objref,
@@ -934,77 +936,77 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~UsesDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       UsesDef (const UsesDef &);
-      
+
       void operator= (const UsesDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct UsesDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           UsesDescription
         >
       UsesDescription_var;
-    
+
     typedef
       TAO_Out_T<
           UsesDescription,
           UsesDescription_var
         >
       UsesDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export UsesDescription
     {
       typedef UsesDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager interface_type;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      TAO::String_Manager interface_type;
       CORBA::Boolean is_multiple;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_
-    
+
     class EventPortDef;
     typedef EventPortDef *EventPortDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           EventPortDef
         >
       EventPortDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           EventPortDef
@@ -1012,13 +1014,13 @@ namespace CORBA
       EventPortDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF_CH_)
 #define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_
-    
+
     class TAO_IFR_Client_Export EventPortDef
       : public virtual ::CORBA::Contained
     {
@@ -1026,42 +1028,42 @@ namespace CORBA
       friend class TAO::Narrow_Utils<EventPortDef>;
       typedef EventPortDef_ptr _ptr_type;
       typedef EventPortDef_var _var_type;
-      
+
       // The static operations.
       static EventPortDef_ptr _duplicate (EventPortDef_ptr obj);
-      
+
       static void _tao_release (EventPortDef_ptr obj);
-      
+
       static EventPortDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EventPortDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EventPortDef_ptr _nil (void)
       {
         return static_cast<EventPortDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void event (
           ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1069,10 +1071,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual CORBA::Boolean is_a (
           const char * event_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1080,34 +1082,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_EventPortDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       EventPortDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_EventPortDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       EventPortDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       EventPortDef (
           TAO_Stub *objref,
@@ -1115,76 +1117,76 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~EventPortDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       EventPortDef (const EventPortDef &);
-      
+
       void operator= (const EventPortDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct EventPortDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           EventPortDescription
         >
       EventPortDescription_var;
-    
+
     typedef
       TAO_Out_T<
           EventPortDescription,
           EventPortDescription_var
         >
       EventPortDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export EventPortDescription
     {
       typedef EventPortDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager event;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      TAO::String_Manager event;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_
-    
+
     class EmitsDef;
     typedef EmitsDef *EmitsDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           EmitsDef
         >
       EmitsDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           EmitsDef
@@ -1192,13 +1194,13 @@ namespace CORBA
       EmitsDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF_CH_)
 #define _CORBA_COMPONENTIR_EMITSDEF_CH_
-    
+
     class TAO_IFR_Client_Export EmitsDef
       : public virtual ::CORBA::ComponentIR::EventPortDef
     {
@@ -1206,56 +1208,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<EmitsDef>;
       typedef EmitsDef_ptr _ptr_type;
       typedef EmitsDef_var _var_type;
-      
+
       // The static operations.
       static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
-      
+
       static void _tao_release (EmitsDef_ptr obj);
-      
+
       static EmitsDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EmitsDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static EmitsDef_ptr _nil (void)
       {
         return static_cast<EmitsDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       EmitsDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_EmitsDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       EmitsDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       EmitsDef (
           TAO_Stub *objref,
@@ -1263,38 +1265,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~EmitsDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       EmitsDef (const EmitsDef &);
-      
+
       void operator= (const EmitsDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EmitsDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_
-    
+
     class PublishesDef;
     typedef PublishesDef *PublishesDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           PublishesDef
         >
       PublishesDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           PublishesDef
@@ -1302,13 +1304,13 @@ namespace CORBA
       PublishesDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF_CH_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_
-    
+
     class TAO_IFR_Client_Export PublishesDef
       : public virtual ::CORBA::ComponentIR::EventPortDef
     {
@@ -1316,56 +1318,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<PublishesDef>;
       typedef PublishesDef_ptr _ptr_type;
       typedef PublishesDef_var _var_type;
-      
+
       // The static operations.
       static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
-      
+
       static void _tao_release (PublishesDef_ptr obj);
-      
+
       static PublishesDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static PublishesDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static PublishesDef_ptr _nil (void)
       {
         return static_cast<PublishesDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       PublishesDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_PublishesDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       PublishesDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       PublishesDef (
           TAO_Stub *objref,
@@ -1373,38 +1375,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~PublishesDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       PublishesDef (const PublishesDef &);
-      
+
       void operator= (const PublishesDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PublishesDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_
-    
+
     class ConsumesDef;
     typedef ConsumesDef *ConsumesDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           ConsumesDef
         >
       ConsumesDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           ConsumesDef
@@ -1412,13 +1414,13 @@ namespace CORBA
       ConsumesDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF_CH_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF_CH_
-    
+
     class TAO_IFR_Client_Export ConsumesDef
       : public virtual ::CORBA::ComponentIR::EventPortDef
     {
@@ -1426,56 +1428,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<ConsumesDef>;
       typedef ConsumesDef_ptr _ptr_type;
       typedef ConsumesDef_var _var_type;
-      
+
       // The static operations.
       static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
-      
+
       static void _tao_release (ConsumesDef_ptr obj);
-      
+
       static ConsumesDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ConsumesDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ConsumesDef_ptr _nil (void)
       {
         return static_cast<ConsumesDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       ConsumesDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_ConsumesDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       ConsumesDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       ConsumesDef (
           TAO_Stub *objref,
@@ -1483,29 +1485,29 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~ConsumesDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       ConsumesDef (const ConsumesDef &);
-      
+
       void operator= (const ConsumesDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConsumesDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF_CH_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF_CH_
-    
+
     class TAO_IFR_Client_Export ComponentDef
       : public virtual ::CORBA::ExtInterfaceDef
     {
@@ -1513,42 +1515,42 @@ namespace CORBA
       friend class TAO::Narrow_Utils<ComponentDef>;
       typedef ComponentDef_ptr _ptr_type;
       typedef ComponentDef_var _var_type;
-      
+
       // The static operations.
       static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
-      
+
       static void _tao_release (ComponentDef_ptr obj);
-      
+
       static ComponentDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ComponentDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static ComponentDef_ptr _nil (void)
       {
         return static_cast<ComponentDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1556,20 +1558,20 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1577,10 +1579,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
           const char * id,
           const char * name,
@@ -1591,10 +1593,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
           const char * id,
           const char * name,
@@ -1606,10 +1608,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
           const char * id,
           const char * name,
@@ -1620,10 +1622,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
           const char * id,
           const char * name,
@@ -1634,10 +1636,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
           const char * id,
           const char * name,
@@ -1648,34 +1650,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       ComponentDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_ComponentDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       ComponentDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       ComponentDef (
           TAO_Stub *objref,
@@ -1683,49 +1685,46 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~ComponentDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       ComponentDef (const ComponentDef &);
-      
+
       void operator= (const ComponentDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
 #define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
-    
+
     class ProvidesDescriptionSeq;
-    
+
     typedef
       TAO_VarSeq_Var_T<
-          ProvidesDescriptionSeq,
-          ProvidesDescription
+          ProvidesDescriptionSeq
         >
       ProvidesDescriptionSeq_var;
-    
+
     typedef
       TAO_Seq_Out_T<
-          ProvidesDescriptionSeq,
-          ProvidesDescriptionSeq_var,
-          ProvidesDescription
+          ProvidesDescriptionSeq
         >
       ProvidesDescriptionSeq_out;
-    
+
     class TAO_IFR_Client_Export ProvidesDescriptionSeq
       : public
-          TAO_Unbounded_Sequence<
+          TAO::unbounded_value_sequence<
               ProvidesDescription
             >
     {
@@ -1735,50 +1734,47 @@ namespace CORBA
       ProvidesDescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          ProvidesDescription* buffer, 
-          CORBA::Boolean release = 0
+          ProvidesDescription* buffer,
+          CORBA::Boolean release = false
         );
       ProvidesDescriptionSeq (const ProvidesDescriptionSeq &);
       ~ProvidesDescriptionSeq (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef ProvidesDescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
 #define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
-    
+
     class UsesDescriptionSeq;
-    
+
     typedef
       TAO_VarSeq_Var_T<
-          UsesDescriptionSeq,
-          UsesDescription
+          UsesDescriptionSeq
         >
       UsesDescriptionSeq_var;
-    
+
     typedef
       TAO_Seq_Out_T<
-          UsesDescriptionSeq,
-          UsesDescriptionSeq_var,
-          UsesDescription
+          UsesDescriptionSeq
         >
       UsesDescriptionSeq_out;
-    
+
     class TAO_IFR_Client_Export UsesDescriptionSeq
       : public
-          TAO_Unbounded_Sequence<
+          TAO::unbounded_value_sequence<
               UsesDescription
             >
     {
@@ -1788,50 +1784,47 @@ namespace CORBA
       UsesDescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          UsesDescription* buffer, 
-          CORBA::Boolean release = 0
+          UsesDescription* buffer,
+          CORBA::Boolean release = false
         );
       UsesDescriptionSeq (const UsesDescriptionSeq &);
       ~UsesDescriptionSeq (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef UsesDescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
 #define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
-    
+
     class EventPortDescriptionSeq;
-    
+
     typedef
       TAO_VarSeq_Var_T<
-          EventPortDescriptionSeq,
-          EventPortDescription
+          EventPortDescriptionSeq
         >
       EventPortDescriptionSeq_var;
-    
+
     typedef
       TAO_Seq_Out_T<
-          EventPortDescriptionSeq,
-          EventPortDescriptionSeq_var,
-          EventPortDescription
+          EventPortDescriptionSeq
         >
       EventPortDescriptionSeq_out;
-    
+
     class TAO_IFR_Client_Export EventPortDescriptionSeq
       : public
-          TAO_Unbounded_Sequence<
+          TAO::unbounded_value_sequence<
               EventPortDescription
             >
     {
@@ -1841,55 +1834,55 @@ namespace CORBA
       EventPortDescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          EventPortDescription* buffer, 
-          CORBA::Boolean release = 0
+          EventPortDescription* buffer,
+          CORBA::Boolean release = false
         );
       EventPortDescriptionSeq (const EventPortDescriptionSeq &);
       ~EventPortDescriptionSeq (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef EventPortDescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct ComponentDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           ComponentDescription
         >
       ComponentDescription_var;
-    
+
     typedef
       TAO_Out_T<
           ComponentDescription,
           ComponentDescription_var
         >
       ComponentDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export ComponentDescription
     {
       typedef ComponentDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager base_component;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      TAO::String_Manager base_component;
       CORBA::RepositoryIdSeq supported_interfaces;
       CORBA::ComponentIR::ProvidesDescriptionSeq provided_interfaces;
       CORBA::ComponentIR::UsesDescriptionSeq used_interfaces;
@@ -1899,27 +1892,27 @@ namespace CORBA
       CORBA::ExtAttrDescriptionSeq attributes;
       CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_
-    
+
     class FactoryDef;
     typedef FactoryDef *FactoryDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           FactoryDef
         >
       FactoryDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           FactoryDef
@@ -1927,13 +1920,13 @@ namespace CORBA
       FactoryDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF_CH_)
 #define _CORBA_COMPONENTIR_FACTORYDEF_CH_
-    
+
     class TAO_IFR_Client_Export FactoryDef
       : public virtual ::CORBA::OperationDef
     {
@@ -1941,56 +1934,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<FactoryDef>;
       typedef FactoryDef_ptr _ptr_type;
       typedef FactoryDef_var _var_type;
-      
+
       // The static operations.
       static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
-      
+
       static void _tao_release (FactoryDef_ptr obj);
-      
+
       static FactoryDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static FactoryDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static FactoryDef_ptr _nil (void)
       {
         return static_cast<FactoryDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       FactoryDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_FactoryDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       FactoryDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       FactoryDef (
           TAO_Stub *objref,
@@ -1998,38 +1991,38 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~FactoryDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       FactoryDef (const FactoryDef &);
-      
+
       void operator= (const FactoryDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FactoryDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_
-    
+
     class FinderDef;
     typedef FinderDef *FinderDef_ptr;
-    
+
     typedef
       TAO_Objref_Var_T<
           FinderDef
         >
       FinderDef_var;
-    
+
     typedef
       TAO_Objref_Out_T<
           FinderDef
@@ -2037,13 +2030,13 @@ namespace CORBA
       FinderDef_out;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF_CH_)
 #define _CORBA_COMPONENTIR_FINDERDEF_CH_
-    
+
     class TAO_IFR_Client_Export FinderDef
       : public virtual ::CORBA::OperationDef
     {
@@ -2051,56 +2044,56 @@ namespace CORBA
       friend class TAO::Narrow_Utils<FinderDef>;
       typedef FinderDef_ptr _ptr_type;
       typedef FinderDef_var _var_type;
-      
+
       // The static operations.
       static FinderDef_ptr _duplicate (FinderDef_ptr obj);
-      
+
       static void _tao_release (FinderDef_ptr obj);
-      
+
       static FinderDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static FinderDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static FinderDef_ptr _nil (void)
       {
         return static_cast<FinderDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       FinderDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_FinderDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       FinderDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       FinderDef (
           TAO_Stub *objref,
@@ -2108,29 +2101,29 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~FinderDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       FinderDef (const FinderDef &);
-      
+
       void operator= (const FinderDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FinderDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF_CH_)
 #define _CORBA_COMPONENTIR_HOMEDEF_CH_
-    
+
     class TAO_IFR_Client_Export HomeDef
       : public virtual ::CORBA::ExtInterfaceDef
     {
@@ -2138,42 +2131,42 @@ namespace CORBA
       friend class TAO::Narrow_Utils<HomeDef>;
       typedef HomeDef_ptr _ptr_type;
       typedef HomeDef_var _var_type;
-      
+
       // The static operations.
       static HomeDef_ptr _duplicate (HomeDef_ptr obj);
-      
+
       static void _tao_release (HomeDef_ptr obj);
-      
+
       static HomeDef_ptr _narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static HomeDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static HomeDef_ptr _nil (void)
       {
         return static_cast<HomeDef_ptr> (0);
       }
-      
+
       static void _tao_any_destructor (void *);
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2181,20 +2174,20 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2202,20 +2195,20 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2223,20 +2216,20 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ValueDef_ptr primary_key (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual void primary_key (
           ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2244,10 +2237,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory (
           const char * id,
           const char * name,
@@ -2259,10 +2252,10 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_ch.cpp:46
-      
+
       virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder (
           const char * id,
           const char * name,
@@ -2274,34 +2267,34 @@ namespace CORBA
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_interface/interface_ch.cpp:210
-      
+
       virtual CORBA::Boolean _is_a (
           const char *type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
       virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     private:
       TAO::Collocation_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-    
+
     protected:
       // Concrete interface only.
       HomeDef (void);
-      
+
       // These methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode.
       virtual void CORBA_ComponentIR_HomeDef_setup_collocation (void);
-      
+
       // Concrete non-local interface only.
       HomeDef (
           IOP::IOR *ior,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       // Non-local interface only.
       HomeDef (
           TAO_Stub *objref,
@@ -2309,55 +2302,55 @@ namespace CORBA
           TAO_Abstract_ServantBase *servant = 0,
           TAO_ORB_Core *orb_core = 0
         );
-      
+
       virtual ~HomeDef (void);
-    
+
     private:
       // Private and unimplemented for concrete interfaces.
       HomeDef (const HomeDef &);
-      
+
       void operator= (const HomeDef &);
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDef;
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct HomeDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           HomeDescription
         >
       HomeDescription_var;
-    
+
     typedef
       TAO_Out_T<
           HomeDescription,
           HomeDescription_var
         >
       HomeDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export HomeDescription
     {
       typedef HomeDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager base_home;
-      TAO_String_Manager managed_component;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      TAO::String_Manager base_home;
+      TAO::String_Manager managed_component;
       CORBA::ValueDescription primary_key;
       CORBA::OpDescriptionSeq factories;
       CORBA::OpDescriptionSeq finders;
@@ -2365,15 +2358,15 @@ namespace CORBA
       CORBA::ExtAttrDescriptionSeq attributes;
       CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_module/module_ch.cpp:66
-  
+
   } // module CORBA::ComponentIR
 
 // TAO_IDL - Generated from
@@ -2479,7 +2472,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef>
   {
@@ -2500,7 +2493,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_)
 #define _CORBA_COMPONENTIR_CONTAINER__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container>
   {
@@ -2521,7 +2514,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef>
   {
@@ -2542,7 +2535,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_)
 #define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository>
   {
@@ -2563,7 +2556,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef>
   {
@@ -2584,7 +2577,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef>
   {
@@ -2605,7 +2598,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef>
   {
@@ -2626,7 +2619,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef>
   {
@@ -2647,7 +2640,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef>
   {
@@ -2668,7 +2661,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef>
   {
@@ -2689,7 +2682,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
   {
@@ -2710,7 +2703,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef>
   {
@@ -2731,7 +2724,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef>
   {
@@ -2752,7 +2745,7 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
   {
@@ -3102,8 +3095,10 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.inl"
+#include "tao/IFR_Client/IFR_ComponentsC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
index 63e656401e4..9c51ea0e607 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -39,7 +40,7 @@ CORBA::ComponentIR::EventDef::EventDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,7 +56,7 @@ CORBA::ComponentIR::EventDef::EventDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_EventDef_Proxy_Broker_ (0)
 {
 }
@@ -75,7 +76,7 @@ CORBA::ComponentIR::Container::Container (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -91,7 +92,7 @@ CORBA::ComponentIR::Container::Container (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Container_Proxy_Broker_ (0)
 {
 }
@@ -111,7 +112,7 @@ CORBA::ComponentIR::ModuleDef::ModuleDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -127,7 +128,7 @@ CORBA::ComponentIR::ModuleDef::ModuleDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ModuleDef_Proxy_Broker_ (0)
 {
 }
@@ -147,7 +148,7 @@ CORBA::ComponentIR::Repository::Repository (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -163,7 +164,7 @@ CORBA::ComponentIR::Repository::Repository (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Repository_Proxy_Broker_ (0)
 {
 }
@@ -183,7 +184,7 @@ CORBA::ComponentIR::ProvidesDef::ProvidesDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -199,7 +200,7 @@ CORBA::ComponentIR::ProvidesDef::ProvidesDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ProvidesDef_Proxy_Broker_ (0)
 {
 }
@@ -219,7 +220,7 @@ CORBA::ComponentIR::UsesDef::UsesDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -235,7 +236,7 @@ CORBA::ComponentIR::UsesDef::UsesDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_UsesDef_Proxy_Broker_ (0)
 {
 }
@@ -255,7 +256,7 @@ CORBA::ComponentIR::EventPortDef::EventPortDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -271,7 +272,7 @@ CORBA::ComponentIR::EventPortDef::EventPortDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_EventPortDef_Proxy_Broker_ (0)
 {
 }
@@ -291,7 +292,7 @@ CORBA::ComponentIR::EmitsDef::EmitsDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -307,7 +308,7 @@ CORBA::ComponentIR::EmitsDef::EmitsDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_EmitsDef_Proxy_Broker_ (0)
 {
 }
@@ -327,7 +328,7 @@ CORBA::ComponentIR::PublishesDef::PublishesDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -343,7 +344,7 @@ CORBA::ComponentIR::PublishesDef::PublishesDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_PublishesDef_Proxy_Broker_ (0)
 {
 }
@@ -363,7 +364,7 @@ CORBA::ComponentIR::ConsumesDef::ConsumesDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -379,7 +380,7 @@ CORBA::ComponentIR::ConsumesDef::ConsumesDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ConsumesDef_Proxy_Broker_ (0)
 {
 }
@@ -399,7 +400,7 @@ CORBA::ComponentIR::ComponentDef::ComponentDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -415,7 +416,7 @@ CORBA::ComponentIR::ComponentDef::ComponentDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ComponentDef_Proxy_Broker_ (0)
 {
 }
@@ -435,7 +436,7 @@ CORBA::ComponentIR::FactoryDef::FactoryDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -451,7 +452,7 @@ CORBA::ComponentIR::FactoryDef::FactoryDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_FactoryDef_Proxy_Broker_ (0)
 {
 }
@@ -471,7 +472,7 @@ CORBA::ComponentIR::FinderDef::FinderDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -487,7 +488,7 @@ CORBA::ComponentIR::FinderDef::FinderDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_FinderDef_Proxy_Broker_ (0)
 {
 }
@@ -507,7 +508,7 @@ CORBA::ComponentIR::HomeDef::HomeDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -523,9 +524,11 @@ CORBA::ComponentIR::HomeDef::HomeDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_HomeDef_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index e0c06ce2c57..54675c6ef72 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -18,6 +18,8 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Extended.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 6e6d014a7bd..5b316844590 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -32,7 +32,7 @@
 #include "tao/AnyTypeCode/VisibilityA.h"
 #include "tao/AnyTypeCode/ValueModifierA.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
-#include "IFR_ExtendedC.h"
+#include "tao/IFR_Client/IFR_ExtendedC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/Invocation_Adapter.h"
@@ -60,12 +60,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.inl"
+#include "tao/IFR_Client/IFR_ExtendedC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -211,13 +213,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -231,13 +233,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -251,13 +253,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:786
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
@@ -269,13 +271,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -290,13 +292,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -311,13 +313,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:786
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -329,13 +331,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -349,13 +351,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:543
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -369,13 +371,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -390,13 +392,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
     : public
@@ -432,7 +434,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::release (
     CORBA::FixedDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::FixedDef_ptr
@@ -451,7 +453,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -468,21 +470,21 @@ CORBA::UShort CORBA::FixedDef::digits (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_FixedDef_Proxy_Broker_ == 0)
     {
       CORBA_FixedDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::UShort>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -491,10 +493,10 @@ CORBA::UShort CORBA::FixedDef::digits (
       11,
       this->the_TAO_FixedDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -511,23 +513,23 @@ void CORBA::FixedDef::digits (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_FixedDef_Proxy_Broker_ == 0)
     {
       CORBA_FixedDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_digits
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -536,7 +538,7 @@ void CORBA::FixedDef::digits (
       11,
       this->the_TAO_FixedDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -553,21 +555,21 @@ CORBA::Short CORBA::FixedDef::scale (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_FixedDef_Proxy_Broker_ == 0)
     {
       CORBA_FixedDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Short>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -576,10 +578,10 @@ CORBA::Short CORBA::FixedDef::scale (
       10,
       this->the_TAO_FixedDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -596,23 +598,23 @@ void CORBA::FixedDef::scale (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_FixedDef_Proxy_Broker_ == 0)
     {
       CORBA_FixedDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_scale
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -621,7 +623,7 @@ void CORBA::FixedDef::scale (
       10,
       this->the_TAO_FixedDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -640,19 +642,19 @@ CORBA::FixedDef::CORBA_FixedDef_setup_collocation ()
       this->the_TAO_FixedDef_Proxy_Broker_ =
         ::CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::FixedDef::~FixedDef (void)
 {}
 
-void 
+void
 CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FixedDef *_tao_tmp_pointer =
     static_cast<FixedDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::FixedDef_ptr
@@ -688,18 +690,18 @@ CORBA::FixedDef::_unchecked_narrow (
 CORBA::FixedDef_ptr
 CORBA::FixedDef::_duplicate (FixedDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::FixedDef::_tao_release (FixedDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -731,7 +733,7 @@ CORBA::FixedDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -758,7 +760,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/FixedDef:1.0",
     "FixedDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_FixedDef =
@@ -779,7 +781,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "type", &CORBA::_tc_TypeCode },
     { "type_def", &CORBA::_tc_IDLType },
     { "access", &CORBA::_tc_Visibility }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -791,7 +793,7 @@ static TAO::TypeCode::Struct<char const *,
     "ValueMember",
     _tao_fields_CORBA_ValueMember,
     7);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueMember =
@@ -800,10 +802,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ValueMember::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -813,7 +815,7 @@ CORBA::ValueMember::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
@@ -825,7 +827,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (void)
 CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ValueMember
       >
     (max)
@@ -837,7 +839,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ValueMember * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ValueMember
       >
     (max, length, buffer, release)
@@ -846,7 +848,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
 CORBA::ValueMemberSeq::ValueMemberSeq (
     const ValueMemberSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ValueMember
       >
     (seq)
@@ -887,10 +889,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_ValueMember,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
       &CORBA_ValueMemberSeq_0;
-    
+
   }
 }
 
@@ -905,7 +907,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
     "ValueMemberSeq",
     &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
@@ -932,7 +934,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::release (
     CORBA::ValueMemberDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ValueMemberDef_ptr
@@ -951,7 +953,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -968,21 +970,21 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueMemberDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -991,10 +993,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       9,
       this->the_TAO_ValueMemberDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1010,21 +1012,21 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueMemberDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1033,10 +1035,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       13,
       this->the_TAO_ValueMemberDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1053,23 +1055,23 @@ void CORBA::ValueMemberDef::type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueMemberDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1078,7 +1080,7 @@ void CORBA::ValueMemberDef::type_def (
       13,
       this->the_TAO_ValueMemberDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1095,21 +1097,21 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueMemberDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Visibility>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1118,10 +1120,10 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
       11,
       this->the_TAO_ValueMemberDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1138,23 +1140,23 @@ void CORBA::ValueMemberDef::access (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueMemberDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_access
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1163,7 +1165,7 @@ void CORBA::ValueMemberDef::access (
       11,
       this->the_TAO_ValueMemberDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1182,19 +1184,19 @@ CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation ()
       this->the_TAO_ValueMemberDef_Proxy_Broker_ =
         ::CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ValueMemberDef::~ValueMemberDef (void)
 {}
 
-void 
+void
 CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueMemberDef *_tao_tmp_pointer =
     static_cast<ValueMemberDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ValueMemberDef_ptr
@@ -1230,18 +1232,18 @@ CORBA::ValueMemberDef::_unchecked_narrow (
 CORBA::ValueMemberDef_ptr
 CORBA::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ValueMemberDef::_tao_release (ValueMemberDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1273,7 +1275,7 @@ CORBA::ValueMemberDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1300,7 +1302,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ValueMemberDef:1.0",
     "ValueMemberDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
@@ -1327,7 +1329,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::release (
     CORBA::ValueDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ValueDef_ptr
@@ -1346,7 +1348,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1363,21 +1365,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1386,10 +1388,10 @@ TAO::Collocation_Proxy_Broker *
       25,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1406,23 +1408,23 @@ void CORBA::ValueDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_supported_interfaces
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1431,7 +1433,7 @@ void CORBA::ValueDef::supported_interfaces (
       25,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1448,21 +1450,21 @@ void CORBA::ValueDef::supported_interfaces (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::InitializerSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1471,10 +1473,10 @@ void CORBA::ValueDef::supported_interfaces (
       17,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1491,23 +1493,23 @@ void CORBA::ValueDef::initializers (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_initializers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1516,7 +1518,7 @@ void CORBA::ValueDef::initializers (
       17,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1533,21 +1535,21 @@ void CORBA::ValueDef::initializers (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1556,10 +1558,10 @@ void CORBA::ValueDef::initializers (
       15,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1576,23 +1578,23 @@ void CORBA::ValueDef::base_value (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_base_value
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1601,7 +1603,7 @@ void CORBA::ValueDef::base_value (
       15,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1618,21 +1620,21 @@ void CORBA::ValueDef::base_value (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueDefSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1641,10 +1643,10 @@ void CORBA::ValueDef::base_value (
       25,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1661,23 +1663,23 @@ void CORBA::ValueDef::abstract_base_values (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_abstract_base_values
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1686,7 +1688,7 @@ void CORBA::ValueDef::abstract_base_values (
       25,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1703,21 +1705,21 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1726,10 +1728,10 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
       16,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1746,23 +1748,23 @@ void CORBA::ValueDef::is_abstract (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_is_abstract
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1771,7 +1773,7 @@ void CORBA::ValueDef::is_abstract (
       16,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1788,21 +1790,21 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1811,10 +1813,10 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
       14,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1831,23 +1833,23 @@ void CORBA::ValueDef::is_custom (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_is_custom
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1856,7 +1858,7 @@ void CORBA::ValueDef::is_custom (
       14,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1873,21 +1875,21 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1896,10 +1898,10 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
       19,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1916,23 +1918,23 @@ void CORBA::ValueDef::is_truncatable (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_is_truncatable
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1941,7 +1943,7 @@ void CORBA::ValueDef::is_truncatable (
       19,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1959,23 +1961,23 @@ CORBA::Boolean CORBA::ValueDef::is_a (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1984,10 +1986,10 @@ CORBA::Boolean CORBA::ValueDef::is_a (
       4,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2041,7 +2043,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "is_truncatable", &CORBA::_tc_boolean },
     { "base_value", &CORBA::_tc_RepositoryId },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2053,14 +2055,14 @@ static TAO::TypeCode::Struct<char const *,
     "FullValueDescription",
     _tao_fields_CORBA_ValueDef_FullValueDescription,
     15);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
   &_tao_tc_CORBA_ValueDef_FullValueDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2082,21 +2084,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2105,10 +2107,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       14,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2129,21 +2131,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ValueMemberDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2153,7 +2155,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       &_tao_type,
       &_tao_access
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2162,10 +2164,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       19,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2186,21 +2188,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2210,7 +2212,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       &_tao_type,
       &_tao_mode
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2219,10 +2221,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       16,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2246,14 +2248,14 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -2263,7 +2265,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
   TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2276,7 +2278,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2285,10 +2287,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       16,
       this->the_TAO_ValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2306,7 +2308,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation ()
       this->the_TAO_ValueDef_Proxy_Broker_ =
         ::CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
   this->CORBA_Contained_setup_collocation ();
   this->CORBA_IDLType_setup_collocation ();
@@ -2315,12 +2317,12 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation ()
 CORBA::ValueDef::~ValueDef (void)
 {}
 
-void 
+void
 CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueDef *_tao_tmp_pointer =
     static_cast<ValueDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ValueDef_ptr
@@ -2356,18 +2358,18 @@ CORBA::ValueDef::_unchecked_narrow (
 CORBA::ValueDef_ptr
 CORBA::ValueDef::_duplicate (ValueDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ValueDef::_tao_release (ValueDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2407,7 +2409,7 @@ CORBA::ValueDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2434,7 +2436,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ValueDef:1.0",
     "ValueDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueDef =
@@ -2468,7 +2470,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
     { "is_truncatable", &CORBA::_tc_boolean },
     { "base_value", &CORBA::_tc_RepositoryId }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2480,7 +2482,7 @@ static TAO::TypeCode::Struct<char const *,
     "ValueDescription",
     _tao_fields_CORBA_ValueDescription,
     10);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueDescription =
@@ -2489,10 +2491,10 @@ namespace CORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ValueDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2520,7 +2522,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::release (
     CORBA::ExtValueDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ExtValueDef_ptr
@@ -2539,7 +2541,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2556,21 +2558,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2579,10 +2581,10 @@ TAO::Collocation_Proxy_Broker *
       21,
       this->the_TAO_ExtValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2599,23 +2601,23 @@ void CORBA::ExtValueDef::ext_initializers (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_ext_initializers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2624,7 +2626,7 @@ void CORBA::ExtValueDef::ext_initializers (
       21,
       this->the_TAO_ExtValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2679,7 +2681,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "is_truncatable", &CORBA::_tc_boolean },
     { "base_value", &CORBA::_tc_RepositoryId },
     { "type", &CORBA::_tc_TypeCode }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -2691,14 +2693,14 @@ static TAO::TypeCode::Struct<char const *,
     "ExtFullValueDescription",
     _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
     15);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
   &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -2720,21 +2722,21 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2743,10 +2745,10 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       18,
       this->the_TAO_ExtValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2769,14 +2771,14 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtValueDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
@@ -2785,7 +2787,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
   TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
   TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2797,7 +2799,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2806,10 +2808,10 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       20,
       this->the_TAO_ExtValueDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2827,19 +2829,19 @@ CORBA::ExtValueDef::CORBA_ExtValueDef_setup_collocation ()
       this->the_TAO_ExtValueDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_ValueDef_setup_collocation ();
 }
 
 CORBA::ExtValueDef::~ExtValueDef (void)
 {}
 
-void 
+void
 CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtValueDef *_tao_tmp_pointer =
     static_cast<ExtValueDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ExtValueDef_ptr
@@ -2875,18 +2877,18 @@ CORBA::ExtValueDef::_unchecked_narrow (
 CORBA::ExtValueDef_ptr
 CORBA::ExtValueDef::_duplicate (ExtValueDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ExtValueDef::_tao_release (ExtValueDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2930,7 +2932,7 @@ CORBA::ExtValueDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -2957,7 +2959,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ExtValueDef:1.0",
     "ExtValueDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
@@ -2984,7 +2986,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::release (
     CORBA::ValueBoxDef_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::ValueBoxDef_ptr
@@ -3003,7 +3005,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3020,21 +3022,21 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueBoxDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueBoxDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3043,10 +3045,10 @@ TAO::Collocation_Proxy_Broker *
       22,
       this->the_TAO_ValueBoxDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3063,23 +3065,23 @@ void CORBA::ValueBoxDef::original_type_def (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ValueBoxDef_Proxy_Broker_ == 0)
     {
       CORBA_ValueBoxDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_original_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3088,7 +3090,7 @@ void CORBA::ValueBoxDef::original_type_def (
       22,
       this->the_TAO_ValueBoxDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3107,19 +3109,19 @@ CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation ()
       this->the_TAO_ValueBoxDef_Proxy_Broker_ =
         ::CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::ValueBoxDef::~ValueBoxDef (void)
 {}
 
-void 
+void
 CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueBoxDef *_tao_tmp_pointer =
     static_cast<ValueBoxDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::ValueBoxDef_ptr
@@ -3155,18 +3157,18 @@ CORBA::ValueBoxDef::_unchecked_narrow (
 CORBA::ValueBoxDef_ptr
 CORBA::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::ValueBoxDef::_tao_release (ValueBoxDef_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -3206,7 +3208,7 @@ CORBA::ValueBoxDef::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -3233,7 +3235,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/CORBA/ValueBoxDef:1.0",
     "ValueBoxDef");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
@@ -3300,7 +3302,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3358,7 +3360,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -3533,7 +3535,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3591,7 +3593,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3707,7 +3709,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3841,21 +3843,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::FixedDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -3906,22 +3908,7 @@ CORBA::Boolean operator<< (
     const CORBA::ValueMemberSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -3929,40 +3916,7 @@ CORBA::Boolean operator>> (
     CORBA::ValueMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_ */
@@ -3985,21 +3939,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ValueMemberDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -4070,21 +4024,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ValueDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -4194,21 +4148,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ExtValueDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -4230,20 +4184,22 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ValueBoxDef RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index e432cce0663..c20ee8060aa 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ifr_client_export.h"
+#include "tao/IFR_Client/ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -71,7 +71,9 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -85,22 +87,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
 #define _CORBA_FIXEDDEF__VAR_OUT_CH_
-  
+
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         FixedDef
       >
     FixedDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         FixedDef
@@ -108,13 +110,13 @@ namespace CORBA
     FixedDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_FIXEDDEF_CH_)
 #define _CORBA_FIXEDDEF_CH_
-  
+
   class TAO_IFR_Client_Export FixedDef
     : public virtual ::CORBA::IDLType
   {
@@ -122,42 +124,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<FixedDef>;
     typedef FixedDef_ptr _ptr_type;
     typedef FixedDef_var _var_type;
-    
+
     // The static operations.
     static FixedDef_ptr _duplicate (FixedDef_ptr obj);
-    
+
     static void _tao_release (FixedDef_ptr obj);
-    
+
     static FixedDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static FixedDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static FixedDef_ptr _nil (void)
     {
       return static_cast<FixedDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void digits (
         ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -165,20 +167,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void scale (
         ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -186,34 +188,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     FixedDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_FixedDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     FixedDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     FixedDef (
         TAO_Stub *objref,
@@ -221,89 +223,86 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~FixedDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     FixedDef (const FixedDef &);
-    
+
     void operator= (const FixedDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FixedDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ValueMember;
-  
+
   typedef
     TAO_Var_Var_T<
         ValueMember
       >
     ValueMember_var;
-  
+
   typedef
     TAO_Out_T<
         ValueMember,
         ValueMember_var
       >
     ValueMember_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ValueMember
   {
     typedef ValueMember_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
     CORBA::Visibility access;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMember;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
 #define _CORBA_VALUEMEMBERSEQ_CH_
-  
+
   class ValueMemberSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ValueMemberSeq,
-        ValueMember
+        ValueMemberSeq
       >
     ValueMemberSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ValueMemberSeq,
-        ValueMemberSeq_var,
-        ValueMember
+        ValueMemberSeq
       >
     ValueMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export ValueMemberSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ValueMember
           >
   {
@@ -313,39 +312,39 @@ namespace CORBA
     ValueMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ValueMember* buffer, 
-        CORBA::Boolean release = 0
+        ValueMember* buffer,
+        CORBA::Boolean release = false
       );
     ValueMemberSeq (const ValueMemberSeq &);
     ~ValueMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ValueMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEMEMBERDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEMEMBERDEF__VAR_OUT_CH_
-  
+
   class ValueMemberDef;
   typedef ValueMemberDef *ValueMemberDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueMemberDef
       >
     ValueMemberDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueMemberDef
@@ -353,13 +352,13 @@ namespace CORBA
     ValueMemberDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEMEMBERDEF_CH_)
 #define _CORBA_VALUEMEMBERDEF_CH_
-  
+
   class TAO_IFR_Client_Export ValueMemberDef
     : public virtual ::CORBA::Contained
   {
@@ -367,52 +366,52 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ValueMemberDef>;
     typedef ValueMemberDef_ptr _ptr_type;
     typedef ValueMemberDef_var _var_type;
-    
+
     // The static operations.
     static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj);
-    
+
     static void _tao_release (ValueMemberDef_ptr obj);
-    
+
     static ValueMemberDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueMemberDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueMemberDef_ptr _nil (void)
     {
       return static_cast<ValueMemberDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -420,20 +419,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Visibility access (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void access (
         ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -441,34 +440,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ValueMemberDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueMemberDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ValueMemberDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ValueMemberDef (
         TAO_Stub *objref,
@@ -476,38 +475,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ValueMemberDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ValueMemberDef (const ValueMemberDef &);
-    
+
     void operator= (const ValueMemberDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
-  
+
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueDef
       >
     ValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueDef
@@ -515,13 +514,13 @@ namespace CORBA
     ValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEDEF_CH_)
 #define _CORBA_VALUEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ValueDef
     : public virtual ::CORBA::Container,
       public virtual ::CORBA::Contained,
@@ -531,42 +530,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ValueDef>;
     typedef ValueDef_ptr _ptr_type;
     typedef ValueDef_var _var_type;
-    
+
     // The static operations.
     static ValueDef_ptr _duplicate (ValueDef_ptr obj);
-    
+
     static void _tao_release (ValueDef_ptr obj);
-    
+
     static ValueDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueDef_ptr _nil (void)
     {
       return static_cast<ValueDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -574,20 +573,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InitializerSeq * initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void initializers (
         const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -595,20 +594,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDef_ptr base_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void base_value (
         ::CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -616,20 +615,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -637,20 +636,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_abstract (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void is_abstract (
         ::CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -658,20 +657,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_custom (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void is_custom (
         ::CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -679,20 +678,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_truncatable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void is_truncatable (
         ::CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -700,10 +699,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -711,68 +710,68 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct FullValueDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           FullValueDescription
         >
       FullValueDescription_var;
-    
+
     typedef
       TAO_Out_T<
           FullValueDescription,
           FullValueDescription_var
         >
       FullValueDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export FullValueDescription
     {
       typedef FullValueDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
       CORBA::Boolean is_abstract;
       CORBA::Boolean is_custom;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members;
-      ACE_NESTED_CLASS (CORBA, InitializerSeq) initializers;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      CORBA::OpDescriptionSeq operations;
+      CORBA::AttrDescriptionSeq attributes;
+      CORBA::ValueMemberSeq members;
+      CORBA::InitializerSeq initializers;
+      CORBA::RepositoryIdSeq supported_interfaces;
+      CORBA::RepositoryIdSeq abstract_base_values;
       CORBA::Boolean is_truncatable;
-      TAO_String_Manager base_value;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
+      TAO::String_Manager base_value;
+      CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     static ::CORBA::TypeCode_ptr const _tc_FullValueDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueMemberDef_ptr create_value_member (
         const char * id,
         const char * name,
@@ -784,10 +783,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
@@ -799,10 +798,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -817,34 +816,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ValueDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ValueDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ValueDef (
         TAO_Stub *objref,
@@ -852,81 +851,81 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ValueDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ValueDef (const ValueDef &);
-    
+
     void operator= (const ValueDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ValueDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ValueDescription
       >
     ValueDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ValueDescription,
         ValueDescription_var
       >
     ValueDescription_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IFR_Client_Export ValueDescription
   {
     typedef ValueDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
+    TAO::String_Manager name;
+    TAO::String_Manager id;
     CORBA::Boolean is_abstract;
     CORBA::Boolean is_custom;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
+    TAO::String_Manager defined_in;
+    TAO::String_Manager version;
     CORBA::RepositoryIdSeq supported_interfaces;
     CORBA::RepositoryIdSeq abstract_base_values;
     CORBA::Boolean is_truncatable;
-    TAO_String_Manager base_value;
+    TAO::String_Manager base_value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-  
+
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtValueDef
       >
     ExtValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtValueDef
@@ -934,13 +933,13 @@ namespace CORBA
     ExtValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTVALUEDEF_CH_)
 #define _CORBA_EXTVALUEDEF_CH_
-  
+
   class TAO_IFR_Client_Export ExtValueDef
     : public virtual ::CORBA::ValueDef
   {
@@ -948,42 +947,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ExtValueDef>;
     typedef ExtValueDef_ptr _ptr_type;
     typedef ExtValueDef_var _var_type;
-    
+
     // The static operations.
     static ExtValueDef_ptr _duplicate (ExtValueDef_ptr obj);
-    
+
     static void _tao_release (ExtValueDef_ptr obj);
-    
+
     static ExtValueDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtValueDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtValueDef_ptr _nil (void)
     {
       return static_cast<ExtValueDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtInitializerSeq * ext_initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -991,68 +990,68 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct ExtFullValueDescription;
-    
+
     typedef
       TAO_Var_Var_T<
           ExtFullValueDescription
         >
       ExtFullValueDescription_var;
-    
+
     typedef
       TAO_Out_T<
           ExtFullValueDescription,
           ExtFullValueDescription_var
         >
       ExtFullValueDescription_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:57
-    
+
     struct TAO_IFR_Client_Export ExtFullValueDescription
     {
       typedef ExtFullValueDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
+      TAO::String_Manager name;
+      TAO::String_Manager id;
       CORBA::Boolean is_abstract;
       CORBA::Boolean is_custom;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members;
-      ACE_NESTED_CLASS (CORBA, ExtInitializerSeq) initializers;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values;
+      TAO::String_Manager defined_in;
+      TAO::String_Manager version;
+      CORBA::OpDescriptionSeq operations;
+      CORBA::ExtAttrDescriptionSeq attributes;
+      CORBA::ValueMemberSeq members;
+      CORBA::ExtInitializerSeq initializers;
+      CORBA::RepositoryIdSeq supported_interfaces;
+      CORBA::RepositoryIdSeq abstract_base_values;
       CORBA::Boolean is_truncatable;
-      TAO_String_Manager base_value;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
+      TAO::String_Manager base_value;
+      CORBA::TypeCode_var type;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ExtFullValueDescription;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
@@ -1066,34 +1065,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ExtValueDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ExtValueDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtValueDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ExtValueDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ExtValueDef (
         TAO_Stub *objref,
@@ -1101,38 +1100,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ExtValueDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ExtValueDef (const ExtValueDef &);
-    
+
     void operator= (const ExtValueDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-  
+
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueBoxDef
       >
     ValueBoxDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueBoxDef
@@ -1140,13 +1139,13 @@ namespace CORBA
     ValueBoxDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEBOXDEF_CH_)
 #define _CORBA_VALUEBOXDEF_CH_
-  
+
   class TAO_IFR_Client_Export ValueBoxDef
     : public virtual ::CORBA::TypedefDef
   {
@@ -1154,42 +1153,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ValueBoxDef>;
     typedef ValueBoxDef_ptr _ptr_type;
     typedef ValueBoxDef_var _var_type;
-    
+
     // The static operations.
     static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj);
-    
+
     static void _tao_release (ValueBoxDef_ptr obj);
-    
+
     static ValueBoxDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueBoxDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ValueBoxDef_ptr _nil (void)
     {
       return static_cast<ValueBoxDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1197,34 +1196,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ValueBoxDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueBoxDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ValueBoxDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ValueBoxDef (
         TAO_Stub *objref,
@@ -1232,21 +1231,21 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ValueBoxDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ValueBoxDef (const ValueBoxDef &);
-    
+
     void operator= (const ValueBoxDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueBoxDef;
 
 // TAO_IDL - Generated from
@@ -1298,7 +1297,7 @@ namespace TAO
 
 #if !defined (_CORBA_FIXEDDEF__TRAITS_)
 #define _CORBA_FIXEDDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
   {
@@ -1319,7 +1318,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
   {
@@ -1340,7 +1339,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__TRAITS_)
 #define _CORBA_VALUEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
   {
@@ -1361,7 +1360,7 @@ namespace TAO
 
 #if !defined (_CORBA_EXTVALUEDEF__TRAITS_)
 #define _CORBA_EXTVALUEDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
   {
@@ -1382,7 +1381,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEBOXDEF__TRAITS_)
 #define _CORBA_VALUEBOXDEF__TRAITS_
-  
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
   {
@@ -1551,8 +1550,10 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.inl"
+#include "tao/IFR_Client/IFR_ExtendedC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
index 21c51c95edd..de6fecd779e 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -39,7 +40,7 @@ CORBA::FixedDef::FixedDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,7 +56,7 @@ CORBA::FixedDef::FixedDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_FixedDef_Proxy_Broker_ (0)
 {
 }
@@ -75,7 +76,7 @@ CORBA::ValueMemberDef::ValueMemberDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -91,7 +92,7 @@ CORBA::ValueMemberDef::ValueMemberDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ValueMemberDef_Proxy_Broker_ (0)
 {
 }
@@ -111,7 +112,7 @@ CORBA::ValueDef::ValueDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -127,7 +128,7 @@ CORBA::ValueDef::ValueDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ValueDef_Proxy_Broker_ (0)
 {
 }
@@ -147,7 +148,7 @@ CORBA::ExtValueDef::ExtValueDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -163,7 +164,7 @@ CORBA::ExtValueDef::ExtValueDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ExtValueDef_Proxy_Broker_ (0)
 {
 }
@@ -183,7 +184,7 @@ CORBA::ValueBoxDef::ValueBoxDef (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -199,9 +200,11 @@ CORBA::ValueBoxDef::ValueBoxDef (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ValueBoxDef_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 5155f7b0b56..77fcadefc4c 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/IFR_Client_Adapter.h"
 
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 1d3240b853e..6bd15379c82 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_OutputCDR;
 
 namespace CORBA
@@ -96,5 +98,7 @@ public:
 #endif /*TAO_HAS_MINIMUM_CORBA*/
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IFR_CLIENT_ADAPTER_H */
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index cd52af48f60..3508d00b6cf 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -14,6 +14,8 @@
  *          -Wb,export_include="tao/TAO_Export.h" \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IIOP.pidl
  *
  *   Remember to patch the generated files using diff/IIOP.diff
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 6bb33006503..92716841944 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -29,9 +29,11 @@
 // be\be_codegen.cpp:288
 
 
-#include "IIOPC.h"
+#include "tao/IIOPC.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -41,10 +43,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IIOP::ListenPoint::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -54,7 +56,7 @@ IIOP::ListenPoint::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
@@ -66,7 +68,7 @@ IIOP::ListenPointList::ListenPointList (void)
 IIOP::ListenPointList::ListenPointList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ListenPoint
       >
     (max)
@@ -78,7 +80,7 @@ IIOP::ListenPointList::ListenPointList (
     IIOP::ListenPoint * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ListenPoint
       >
     (max, length, buffer, release)
@@ -87,7 +89,7 @@ IIOP::ListenPointList::ListenPointList (
 IIOP::ListenPointList::ListenPointList (
     const ListenPointList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ListenPoint
       >
     (seq)
@@ -107,10 +109,10 @@ void IIOP::ListenPointList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IIOP::BiDirIIOPServiceContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -154,22 +156,7 @@ CORBA::Boolean operator<< (
     const IIOP::ListenPointList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -177,40 +164,7 @@ CORBA::Boolean operator>> (
     IIOP::ListenPointList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_CPP_ */
@@ -235,3 +189,5 @@ CORBA::Boolean operator>> (
   return
     (strm >> _tao_aggregate.listen_points);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index 18133b7e39a..c2bb85cdd04 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -44,6 +44,7 @@
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
+#include "tao/String_Manager_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
@@ -58,68 +59,67 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace IIOP
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ListenPoint;
-  
+
   typedef
     TAO_Var_Var_T<
         ListenPoint
       >
     ListenPoint_var;
-  
+
   typedef
     TAO_Out_T<
         ListenPoint,
         ListenPoint_var
       >
     ListenPoint_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export ListenPoint
   {
     typedef ListenPoint_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager host;
+    TAO::String_Manager host;
     CORBA::UShort port;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IIOP_LISTENPOINTLIST_CH_)
 #define _IIOP_LISTENPOINTLIST_CH_
-  
+
   class ListenPointList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ListenPointList,
-        ListenPoint
+        ListenPointList
       >
     ListenPointList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ListenPointList,
-        ListenPointList_var,
-        ListenPoint
+        ListenPointList
       >
     ListenPointList_out;
-  
+
   class TAO_Export ListenPointList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ListenPoint
           >
   {
@@ -129,44 +129,44 @@ namespace IIOP
     ListenPointList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ListenPoint* buffer, 
-        CORBA::Boolean release = 0
+        ListenPoint* buffer,
+        CORBA::Boolean release = false
       );
     ListenPointList (const ListenPointList &);
     ~ListenPointList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ListenPointList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct BiDirIIOPServiceContext;
-  
+
   typedef
     TAO_Var_Var_T<
         BiDirIIOPServiceContext
       >
     BiDirIIOPServiceContext_var;
-  
+
   typedef
     TAO_Out_T<
         BiDirIIOPServiceContext,
         BiDirIIOPServiceContext_var
       >
     BiDirIIOPServiceContext_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export BiDirIIOPServiceContext
   {
     typedef BiDirIIOPServiceContext_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IIOP::ListenPointList listen_points;
   };
@@ -216,6 +216,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 92cf3ae52d5..11c2d1ccafb 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -3,6 +3,9 @@
  */
 //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
 #include "tao/IIOP_Acceptor.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/IIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/debug.h"
@@ -24,6 +27,7 @@ ACE_RCSID (tao,
            IIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (IOP::TAG_INTERNET_IOP),
@@ -554,8 +558,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
                                      this->creation_strategy_,
                                      this->accept_strategy_,
                                      this->concurrency_strategy_,
-				     0, 0, 0, 1,
-				     this->reuse_addr_) == -1)
+                                     0, 0, 0, 1,
+                                     this->reuse_addr_) == -1)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -590,8 +594,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
                                          this->creation_strategy_,
                                          this->accept_strategy_,
                                          this->concurrency_strategy_,
-					 0, 0, 0, 1,
-					 this->reuse_addr_) != -1)
+                                         0, 0, 0, 1,
+                                         this->reuse_addr_) != -1)
             {
               found_a_port = true;
               break;
@@ -987,7 +991,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
   CORBA::Octet major;
-  CORBA::Octet minor;
+  CORBA::Octet minor = CORBA::Octet();
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -1065,8 +1069,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
   ACE_CString **argv = 0;
   ACE_NEW_RETURN (argv, ACE_CString*[argc],-1);
 
-  int begin = 0;
-  int end = -1;
+  ssize_t begin = 0;
+  ssize_t end = -1;
   int result = 0;
   for (int j = 0; j < argc; ++j)
     {
@@ -1075,7 +1079,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
       if (j < argc - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = static_cast<CORBA::ULong> (len);
+        end = static_cast<ssize_t> (len);
 
       if (end == begin)
         {
@@ -1119,9 +1123,9 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
   while (i < argc)
     {
       size_t len = argv[i]->length();
-      int slot = argv[i]->find ("=");
+      ssize_t slot = argv[i]->find ("=");
 
-      if (slot == static_cast <int> (len - 1)
+      if (slot == static_cast <ssize_t> (len - 1)
           || slot == ACE_CString::npos)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO (%P|%t) - IIOP option <%s> is ")
@@ -1164,9 +1168,9 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
           this->hostname_in_ior_ = value.rep ();
         }
       else if (name == "reuse_addr")
-	{
-	  this->reuse_addr_ = ACE_OS::atoi (value.c_str ());
-	}
+        {
+          this->reuse_addr_ = ACE_OS::atoi (value.c_str ());
+        }
       else
         {
           // the name is not known, skip to the next option
@@ -1177,7 +1181,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
       // put this one on the end. This technique has the effect of
       // putting them in reverse order, but that doesn't matter, since
       // these arguments are only whole strings.
-      argc--;
+      --argc;
       ACE_CString *temp = argv[i];
       for (int j = i; j <= argc-1; j++)
         argv[j] = argv[j+1];
@@ -1186,4 +1190,8 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 8a43ea3cc82..01aea0b40de 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,19 +19,25 @@
 #define TAO_IIOP_ACCEPTOR_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Acceptor.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SOCK_Acceptor.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/IIOP_Connection_Handler.h"
 #include "tao/Acceptor_Impl.h"
 #include "tao/GIOP_Message_Version.h"
 
+#include "ace/SOCK_Acceptor.h"
+#include "ace/Acceptor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_IIOP_Acceptor
  *
@@ -240,7 +246,7 @@ protected:
 
 private:
 
-  /// the concrete acceptor, as a pointer to it's base class.
+  /// The concrete acceptor, as a pointer to it's base class.
   BASE_ACCEPTOR base_acceptor_;
 
   /// Acceptor strategies.
@@ -251,9 +257,13 @@ private:
   //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "tao/IIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_IIOP_ACCEPTOR_H */
diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i
index 9aed23e08d2..949d67653be 100644
--- a/TAO/tao/IIOP_Acceptor.i
+++ b/TAO/tao/IIOP_Acceptor.i
@@ -1,6 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_IIOP_Acceptor::address (void) const
 {
@@ -33,3 +38,8 @@ TAO_IIOP_Acceptor::set_default_address (const ACE_INET_Addr& addr)
 {
   this->default_address_.set (addr);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 4ed86463f96..7073a6523fc 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -1,13 +1,16 @@
-#include "IIOP_Connection_Handler.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "IIOP_Transport.h"
-#include "IIOP_Endpoint.h"
-#include "IIOPC.h"
-#include "Thread_Lane_Resources.h"
-#include "Base_Transport_Property.h"
-#include "Protocols_Hooks.h"
-#include "Wait_Strategy.h"
+#include "tao/IIOP_Connection_Handler.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/IIOP_Transport.h"
+#include "tao/IIOP_Endpoint.h"
+#include "tao/IIOPC.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Base_Transport_Property.h"
+#include "tao/Protocols_Hooks.h"
+#include "tao/Wait_Strategy.h"
 
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
@@ -16,6 +19,8 @@ ACE_RCSID (tao,
            IIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -82,11 +87,13 @@ TAO_IIOP_Connection_Handler::open (void*)
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
+  protocol_properties.keep_alive_ =
+    this->orb_core ()->orb_params ()->sock_keepalive ();
 
   TAO_Protocols_Hooks *tph =
     this->orb_core ()->get_protocols_hooks ();
 
-  bool client =
+  bool const client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -128,6 +135,19 @@ TAO_IIOP_Connection_Handler::open (void*)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
+  if (protocol_properties.keep_alive_)
+    {
+      if (this->peer ().
+          set_option (SOL_SOCKET,
+                      SO_KEEPALIVE,
+                      (void *) &protocol_properties.keep_alive_,
+                      sizeof (protocol_properties.keep_alive_)) == -1
+          && errno != ENOTSUP)
+        {
+          return -1;
+        }
+    }
+
   if (this->transport ()->wait_strategy ()->non_blocking ()
       || this->transport ()->opened_as () == TAO::TAO_SERVER_ROLE)
     {
@@ -236,7 +256,7 @@ TAO_IIOP_Connection_Handler::close_connection (void)
     {
       struct linger lval;
       lval.l_onoff = 1;
-      lval.l_linger = linger;
+      lval.l_linger = (u_short)linger;
 
       if (this->peer ().set_option(SOL_SOCKET,
                                    SO_LINGER,
@@ -404,7 +424,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
       CORBA::Long codepoint =
         tph->get_dscp_codepoint ();
 
-      tos = (int)(codepoint) << 2;
+      tos = static_cast<int> (codepoint) << 2;
     }
 
   if (tos != this->dscp_codepoint_)
@@ -462,3 +482,8 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 /*
  * End copy hook
  */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 5654472ea3e..08e2b7478af 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Originally by Chris Cleeland as IIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -16,18 +16,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Svc_Handler.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SOCK_Stream.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
 #include "tao/Connection_Handler.h"
 #include "tao/Basic_Types.h"
 
-// Service Handler for this transport
+#include "ace/SOCK_Stream.h"
+#include "ace/Svc_Handler.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/// Service Handler for this transport
 typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_IIOP_SVC_HANDLER;
 
@@ -129,5 +134,9 @@ private:
   int dscp_codepoint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 05e60c4f400..91cd5db0599 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -1,23 +1,27 @@
-#include "IIOP_Connector.h"
-#include "IIOP_Profile.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "Environment.h"
-#include "Protocols_Hooks.h"
-#include "Connect_Strategy.h"
-#include "Thread_Lane_Resources.h"
-#include "Profile_Transport_Resolver.h"
-#include "Transport.h"
-#include "Wait_Strategy.h"
-#include "SystemException.h"
+#include "tao/IIOP_Connector.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/IIOP_Profile.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/Environment.h"
+#include "tao/Protocols_Hooks.h"
+#include "tao/Connect_Strategy.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/Transport.h"
+#include "tao/Wait_Strategy.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            IIOP_Connector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
 {
 }
@@ -396,3 +400,7 @@ TAO_IIOP_Connector::cancel_svc_handler (
   return -1;
 }
 //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index cb57818fa1b..f465814dbc6 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,20 +19,25 @@
 #define TAO_IIOP_CONNECTOR_H
 
 #include /**/ "ace/pre.h"
-#include "ace/SOCK_Connector.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Connector.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
 #include "tao/Transport_Connector.h"
 #include "tao/Connector_Impl.h"
 #include "tao/IIOP_Connection_Handler.h"
 
-class TAO_IIOP_Endpoint;
+#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_IIOP_Endpoint;
 
 // ****************************************************************
 
@@ -129,6 +134,9 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
 
 #include /**/ "ace/post.h"
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index bec2bb60242..2ca751b4ba2 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -4,10 +4,13 @@
  */
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
 
-#include "IIOP_Endpoint.h"
-#include "IOP_IORC.h"
-#include "debug.h"
-#include "ORB_Core.h"
+#include "tao/IIOP_Endpoint.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/IOP_IORC.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -32,6 +35,8 @@ ACE_RCSID (tao,
 
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
@@ -512,3 +517,7 @@ TAO_IIOP_Endpoint::preferred_network (void) const
 }
 
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 0ce97db063b..73fda040cd1 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -16,15 +16,22 @@
 #define TAO_IIOP_ENDPOINT_H
 
 #include /**/ "ace/pre.h"
-#include "ace/INET_Addr.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Endpoint.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/CORBA_String.h"
 #include "tao/IIOP_EndpointsC.h"
+#include "tao/Endpoint.h"
+
+#include "ace/INET_Addr.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IIOP_Connection_Handler;
 
@@ -188,10 +195,13 @@ private:
   //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/IIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 #endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i
index fa83957822d..c98e79c652c 100644
--- a/TAO/tao/IIOP_Endpoint.i
+++ b/TAO/tao/IIOP_Endpoint.i
@@ -2,7 +2,9 @@
 //
 // $Id$
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE const char *
 TAO_IIOP_Endpoint::host (void) const
@@ -29,3 +31,7 @@ TAO_IIOP_Endpoint::is_ipv6_decimal (void) const
   return this->is_ipv6_decimal_;
 }
 #endif /* ACE_HAS_IPV6 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index 819ea3f62b6..11a6eb75fa7 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "IIOP_EndpointsC.h"
+#include "tao/IIOP_EndpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,16 +39,18 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 TAO::IIOP_Endpoint_Info::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -58,7 +60,7 @@ TAO::IIOP_Endpoint_Info::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_)
@@ -70,7 +72,7 @@ TAO::IIOPEndpointSequence::IIOPEndpointSequence (void)
 TAO::IIOPEndpointSequence::IIOPEndpointSequence (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO::IIOP_Endpoint_Info
       >
     (max)
@@ -82,7 +84,7 @@ TAO::IIOPEndpointSequence::IIOPEndpointSequence (
     TAO::IIOP_Endpoint_Info * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO::IIOP_Endpoint_Info
       >
     (max, length, buffer, release)
@@ -91,7 +93,7 @@ TAO::IIOPEndpointSequence::IIOPEndpointSequence (
 TAO::IIOPEndpointSequence::IIOPEndpointSequence (
     const IIOPEndpointSequence &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO::IIOP_Endpoint_Info
       >
     (seq)
@@ -147,22 +149,7 @@ CORBA::Boolean operator<< (
     const TAO::IIOPEndpointSequence &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -170,40 +157,9 @@ CORBA::Boolean operator>> (
     TAO::IIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 2b780ea4150..f9d86079b2f 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -44,6 +44,7 @@
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
+#include "tao/String_Manager_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
@@ -65,6 +66,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -94,7 +97,7 @@ namespace TAO
     typedef IIOP_Endpoint_Info_var _var_type;
 
     static void _tao_any_destructor (void *);
-    TAO_String_Manager host;
+    TAO::String_Manager host;
     CORBA::Short port;
     CORBA::Short priority;
   };
@@ -109,22 +112,19 @@ namespace TAO
 
   typedef
     TAO_VarSeq_Var_T<
-        IIOPEndpointSequence,
-        IIOP_Endpoint_Info
+        IIOPEndpointSequence
       >
     IIOPEndpointSequence_var;
 
   typedef
     TAO_Seq_Out_T<
-        IIOPEndpointSequence,
-        IIOPEndpointSequence_var,
-        IIOP_Endpoint_Info
+        IIOPEndpointSequence
       >
     IIOPEndpointSequence_out;
 
   class TAO_Export IIOPEndpointSequence
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             IIOP_Endpoint_Info
           >
   {
@@ -135,7 +135,7 @@ namespace TAO
         CORBA::ULong max,
         CORBA::ULong length,
         IIOP_Endpoint_Info* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     IIOPEndpointSequence (const IIOPEndpointSequence &);
     ~IIOPEndpointSequence (void);
@@ -186,6 +186,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index 852fde2c935..3ba32da5e0a 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -1,17 +1,20 @@
-#include "IIOP_Factory.h"
-#include "IIOP_Acceptor.h"
-#include "IIOP_Connector.h"
-#include "IOP_IORC.h"
+#include "tao/IIOP_Factory.h"
 
-#include "ace/OS_NS_strings.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
+#include "tao/IIOP_Acceptor.h"
+#include "tao/IIOP_Connector.h"
+#include "tao/IOP_IORC.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (tao,
            IIOP_Factory,
            "$Id$")
 
 
-static const char prefix_[] = "iiop";
+static const char the_prefix[] = "iiop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
@@ -28,13 +31,13 @@ int
 TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO_IIOP_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -79,6 +82,8 @@ TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory,
                        ACE_TEXT ("IIOP_Factory"),
                        ACE_SVC_OBJ_T,
@@ -88,3 +93,5 @@ ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory,
                        0)
 
 ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory)
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index 66bd50adfab..01acb9ea572 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -15,13 +15,19 @@
 #define TAO_IIOP_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/Protocol_Factory.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -54,12 +60,16 @@ public:
 private:
   /// Changing the version number can be used to provide backwards
   /// compatibility with old clients.
-  int major_;
-  int minor_;
+  int const major_;
+  int const minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory)
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IIOP_FACTORY_H */
diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp
index 0790993aeeb..57ddb594910 100644
--- a/TAO/tao/IIOP_Lite_Factory.cpp
+++ b/TAO/tao/IIOP_Lite_Factory.cpp
@@ -1,17 +1,20 @@
-#include "IIOP_Lite_Factory.h"
-#include "IIOP_Acceptor.h"
-#include "IIOP_Connector.h"
-#include "IOP_IORC.h"
+#include "tao/IIOP_Lite_Factory.h"
 
-#include "ace/OS_NS_strings.h"
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
+#include "tao/IIOP_Acceptor.h"
+#include "tao/IIOP_Connector.h"
+#include "tao/IOP_IORC.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (tao,
            IIOP_Factory,
            "$Id$")
 
 
-static const char prefix_[] = "iiop";
+static const char the_prefix[] = "iiop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
@@ -29,13 +32,13 @@ int
 TAO_IIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO_IIOP_Lite_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -50,7 +53,7 @@ TAO_IIOP_Lite_Protocol_Factory::make_acceptor (void)
   TAO_Acceptor *acceptor = 0;
 
   // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
+  CORBA::Boolean lite_flag = true;
   ACE_NEW_RETURN (acceptor,
                   TAO_IIOP_Acceptor (lite_flag),
                   0);
@@ -71,7 +74,7 @@ TAO_IIOP_Lite_Protocol_Factory::make_connector (void)
   TAO_Connector *connector = 0;
 
   // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
+  CORBA::Boolean lite_flag = true;
 
   ACE_NEW_RETURN (connector,
                   TAO_IIOP_Connector (lite_flag),
@@ -85,6 +88,8 @@ TAO_IIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory,
                        ACE_TEXT ("IIOP_Lite_Factory"),
                        ACE_SVC_OBJ_T,
@@ -94,3 +99,5 @@ ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory,
                        0)
 
 ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Lite_Protocol_Factory)
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h
index fe4e1026abe..2b0141b4d55 100644
--- a/TAO/tao/IIOP_Lite_Factory.h
+++ b/TAO/tao/IIOP_Lite_Factory.h
@@ -15,13 +15,19 @@
 #define TAO_IIOP_LITE_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/Protocol_Factory.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -56,12 +62,16 @@ public:
 private:
   /// Changing the version number can be used to provide backwards
   /// compatibility with old clients.
-  int major_;
-  int minor_;
+  int const major_;
+  int const minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory)
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IIOP_Lite_factory_H */
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index d1474d2499b..93bc39cbd7d 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -1,4 +1,7 @@
 #include "tao/IIOP_Profile.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
 #include "tao/Environment.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
@@ -15,12 +18,16 @@ ACE_RCSID (tao,
 
 #include "ace/os_include/os_netdb.h"
 
+static const char the_prefix[] = "iiop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
 {
   // Clean up the list of endpoints since we own it.
   // Skip the head, since it is not dynamically allocated.
   TAO_Endpoint *tmp = 0;
-                                                                                              
+
   for (TAO_Endpoint *next = this->endpoint ()->next ();
        next != 0;
        next = tmp)
@@ -32,8 +39,6 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
 
 //@@ TAO_PROFILE_SPL_COPY_HOOK_START
 
-static const char prefix_[] = "iiop";
-
 const char TAO_IIOP_Profile::object_key_delimiter_ = '/';
 
 char
@@ -370,64 +375,85 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
 char *
 TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
+  // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key
+
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                              this->ref_object_key_->object_key ());
 
-  size_t buflen = (8 /* "corbaloc" */ +
-                   1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
-                   1 /* colon separator */ +
-                   1 /* major version */ +
-                   1 /* decimal point */ +
-                   1 /* minor version */ +
-                   1 /* `@' character */ +
-                   ACE_OS::strlen (this->endpoint_.host ()) +
-                   1 /* colon separator */ +
-                   5 /* port number */ +
-                   1 /* object key separator */ +
-                   ACE_OS::strlen (key.in ()));
+  size_t buflen = (
+       8 /* "corbaloc" */ +
+       1 /* colon separator */ +
+       1 /* object key separator */ +
+       ACE_OS::strlen (key.in ()));
+  size_t pfx_len = (
+       ACE_OS::strlen (::the_prefix) /* "iiop" */ +
+       1 /* colon separator */);
+
+ const TAO_IIOP_Endpoint *endp = 0;
+ for (endp = &this->endpoint_; endp != 0; endp = endp->next_)
+   {
+      buflen += (
+          pfx_len +
+          1 /* major version */ +
+          1 /* decimal point */ +
+          1 /* minor version */ +
+          1 /* `@' character */ +
+          ACE_OS::strlen (endp->host ()) +
+          1 /* colon separator */ +
+          5 /* port number */ +
+          1 /* comma */);
 #if defined (ACE_HAS_IPV6)
-  if (this->endpoint_.is_ipv6_decimal_)
-    buflen += 2; // room for '[' and ']'
+      if (endp->is_ipv6_decimal_)
+        buflen += 2; // room for '[' and ']'
 #endif /* ACE_HAS_IPV6 */
+   }
+
+  static const char digits [] = "0123456789";
 
   char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
 
-  static const char digits [] = "0123456789";
+  ACE_OS::strcpy(buf, "corbaloc:");
 
-#if defined (ACE_HAS_IPV6)
-  if (this->endpoint_.is_ipv6_decimal_)
+  for (endp = &this->endpoint_; endp != 0; endp = endp->next_)
     {
-      // Don't publish scopeid if included.
-      ACE_CString tmp(this->endpoint_.host ());
-      ssize_t pos = tmp.find('%');
-      if (pos != ACE_CString::npos)
+      if(&this->endpoint_ != endp)
+      ACE_OS::strcat(buf, ",");
+
+#if defined (ACE_HAS_IPV6)
+      if (endp->is_ipv6_decimal_)
         {
-          tmp = tmp.substr(0, pos + 1);
-          tmp[pos] = '\0';
+          // Don't publish scopeid if included.
+          ACE_CString tmp(endp->host ());
+          ssize_t pos = tmp.find('%');
+          if (pos != ACE_CString::npos)
+            {
+              tmp = tmp.substr(0, pos + 1);
+              tmp[pos] = '\0';
+            }
+          ACE_OS::sprintf (buf + ACE_OS::strlen(buf),
+                  "%s:%c.%c@[%s]:%d",
+                  ::the_prefix,
+                  digits [this->version_.major],
+                  digits [this->version_.minor],
+                  tmp.c_str (),
+                  endp->port () );
         }
-      ACE_OS::sprintf (buf,
-                       "corbaloc:%s:%c.%c@[%s]:%d%c%s",
-                       ::prefix_,
-                       digits [this->version_.major],
-                       digits [this->version_.minor],
-                       tmp.c_str (),
-                       this->endpoint_.port (),
-                       this->object_key_delimiter_,
-                       key.in ());
-    }
-  else
-#endif /* ACE_HAS_IPV6 */
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
+      else
+#endif
+      ACE_OS::sprintf (buf + ACE_OS::strlen(buf),
+              "%s:%c.%c@%s:%d",
+              ::the_prefix,
+              digits [this->version_.major],
+              digits [this->version_.minor],
+              endp->host (),
+              endp->port () );
+
+  }
+  ACE_OS::sprintf (buf + ACE_OS::strlen(buf),
+          "%c%s",
+          this->object_key_delimiter_,
+          key.in ());
 
   return buf;
 }
@@ -435,7 +461,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_IIOP_Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 void
@@ -527,7 +553,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void)
       else
 #endif /* ACE_HAS_IPV6 */
       if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
-	        || (out_cdr << endpoint->host () == 0)
+                || (out_cdr << endpoint->host () == 0)
           || (out_cdr << endpoint->port () == 0))
         return -1;
 
@@ -541,7 +567,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void)
         tagged_component.component_data.get_buffer ();
 
       for (const ACE_Message_Block *iterator = out_cdr.begin ();
-	         iterator != 0;
+                 iterator != 0;
            iterator = iterator->cont ())
         {
           size_t i_length = iterator->length ();
@@ -723,3 +749,7 @@ TAO_IIOP_Profile::decode_endpoints (void)
   return 0;
 }
 //@@ TAO_PROFILE_SPL_COPY_HOOK_END
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index b48f9e96063..4c338cbc664 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,8 +6,7 @@
  *
  *  $Id$
  *
- *   IIOP profile specific processing
- *
+ *  IIOP profile specific processing.
  *
  *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
@@ -20,14 +18,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Profile.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/Profile.h"
 #include "tao/IIOP_Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO IIOP_Profile concrete Profile definitions
 /**
  * @class TAO_IIOP_Profile
@@ -169,5 +172,10 @@ protected:
   //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
+
 #endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 7eb3da409a5..fddb13520b5 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -1,20 +1,25 @@
-#include "IIOP_Transport.h"
-#include "IIOP_Acceptor.h"
-#include "IIOPC.h"
-#include "Acceptor_Registry.h"
-#include "operation_details.h"
-#include "Wait_Strategy.h"
-#include "debug.h"
-#include "GIOP_Message_Base.h"
-#include "Protocols_Hooks.h"
-#include "ORB_Core.h"
-#include "Thread_Lane_Resources.h"
-#include "Transport_Mux_Strategy.h"
+#include "tao/IIOP_Transport.h"
+
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/IIOP_Acceptor.h"
+#include "tao/IIOPC.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/operation_details.h"
+#include "tao/Wait_Strategy.h"
+#include "tao/debug.h"
+#include "tao/GIOP_Message_Base.h"
+#include "tao/Protocols_Hooks.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport_Mux_Strategy.h"
 
 ACE_RCSID (tao,
            IIOP_Transport,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean )
@@ -25,7 +30,7 @@ TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
 {
   // Use the normal GIOP object
   ACE_NEW (this->messaging_object_,
-           TAO_GIOP_Message_Base (orb_core));
+           TAO_GIOP_Message_Base (orb_core, this));
 }
 
 TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
@@ -101,7 +106,7 @@ TAO_IIOP_Transport::recv (char *buf,
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, ")
+                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv, ")
                   ACE_TEXT ("read failure - %m\n"),
                   this->id ()));
     }
@@ -362,8 +367,8 @@ TAO_IIOP_Transport::get_listen_point (
 
   // Get the hostname for the local address
   if (iiop_acceptor->hostname (this->orb_core_,
-                                      local_addr,
-                                      local_interface.out ()) == -1)
+                               local_addr,
+                               local_interface.out ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
@@ -373,7 +378,7 @@ TAO_IIOP_Transport::get_listen_point (
 #if defined (ACE_HAS_IPV6)
   // If this is an IPv6 decimal linklocal address containing a scopeid than
   // remove the scopeid from the information being sent.
-  const char *cp_scope;
+  const char *cp_scope = 0;
   if (local_addr.get_type () == PF_INET6 &&
         (cp_scope = ACE_OS::strchr (local_interface.in (), '%')) != 0)
     {
@@ -406,7 +411,8 @@ TAO_IIOP_Transport::get_listen_point (
 
           if (TAO_debug_level >= 5)
           {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P:%t) Listen_Point_List[%d] = <%s:%d>"),
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT("TAO (%P|%t) - Listen_Point_List[%d] = <%s:%d>\n"),
                         len,
                         point.host.in (),
                         point.port));
@@ -421,3 +427,7 @@ TAO_IIOP_Transport::get_listen_point (
 /*
  * End of copy hook.
  */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 5bbebdd5ae9..e64641d1aa6 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -16,12 +16,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Transport.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
+
+#include "tao/Transport.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace IIOP
 {
   class ListenPointList;
@@ -145,6 +151,10 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index b91c64d66af..90ed9c8b7f4 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -28,6 +28,6 @@
 #ifndef TAO_IOP_PIDL
 #define TAO_IOP_PIDL
 
-#include "IOP_IOR.pidl"
+#include "tao/IOP_IOR.pidl"
 
 #endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index b5108933284..24da4f71609 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -29,14 +29,18 @@
 // be\be_codegen.cpp:288
 
 
-#include "IOPC.h"
+#include "tao/IOPC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index e0bbb0a432a..aa18c7b441b 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -56,6 +56,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
@@ -67,6 +69,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
index 0901cc8e2fe..ab73e10ff0c 100644
--- a/TAO/tao/IOP_IOR.pidl
+++ b/TAO/tao/IOP_IOR.pidl
@@ -26,7 +26,7 @@
 #ifndef TAO_IOP_IOR_PIDL
 #define TAO_IOP_IOR_PIDL
 
-#include <OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 0dcb0c1062d..60187c0e8fc 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -29,23 +29,25 @@
 // be\be_codegen.cpp:288
 
 
-#include "IOP_IORC.h"
+#include "tao/IOP_IORC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IOP::TaggedProfile::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -55,7 +57,7 @@ IOP::TaggedProfile::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_TAGGEDPROFILESEQ_CS_)
@@ -67,7 +69,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (void)
 IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedProfile
       >
     (max)
@@ -79,7 +81,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     IOP::TaggedProfile * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedProfile
       >
     (max, length, buffer, release)
@@ -88,7 +90,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
 IOP::TaggedProfileSeq::TaggedProfileSeq (
     const TaggedProfileSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedProfile
       >
     (seq)
@@ -108,10 +110,10 @@ void IOP::TaggedProfileSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IOP::IOR::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -121,10 +123,10 @@ IOP::IOR::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IOP::TaggedComponent::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -134,7 +136,7 @@ IOP::TaggedComponent::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
@@ -146,7 +148,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (void)
 IOP::MultipleComponentProfile::MultipleComponentProfile (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max)
@@ -158,7 +160,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     IOP::TaggedComponent * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max, length, buffer, release)
@@ -167,7 +169,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
 IOP::MultipleComponentProfile::MultipleComponentProfile (
     const MultipleComponentProfile &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (seq)
@@ -187,7 +189,7 @@ void IOP::MultipleComponentProfile::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
@@ -199,7 +201,7 @@ IOP::TaggedComponentList::TaggedComponentList (void)
 IOP::TaggedComponentList::TaggedComponentList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max)
@@ -211,7 +213,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     IOP::TaggedComponent * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max, length, buffer, release)
@@ -220,7 +222,7 @@ IOP::TaggedComponentList::TaggedComponentList (
 IOP::TaggedComponentList::TaggedComponentList (
     const TaggedComponentList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (seq)
@@ -240,7 +242,7 @@ void IOP::TaggedComponentList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
@@ -252,7 +254,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (void)
 IOP::TaggedComponentSeq::TaggedComponentSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max)
@@ -264,7 +266,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     IOP::TaggedComponent * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (max, length, buffer, release)
@@ -273,7 +275,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
 IOP::TaggedComponentSeq::TaggedComponentSeq (
     const TaggedComponentSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TaggedComponent
       >
     (seq)
@@ -293,10 +295,10 @@ void IOP::TaggedComponentSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 IOP::ServiceContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -306,7 +308,7 @@ IOP::ServiceContext::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CS_)
@@ -318,7 +320,7 @@ IOP::ServiceContextList::ServiceContextList (void)
 IOP::ServiceContextList::ServiceContextList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceContext
       >
     (max)
@@ -330,7 +332,7 @@ IOP::ServiceContextList::ServiceContextList (
     IOP::ServiceContext * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceContext
       >
     (max, length, buffer, release)
@@ -339,7 +341,7 @@ IOP::ServiceContextList::ServiceContextList (
 IOP::ServiceContextList::ServiceContextList (
     const ServiceContextList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceContext
       >
     (seq)
@@ -393,22 +395,7 @@ CORBA::Boolean operator<< (
     const IOP::TaggedProfileSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -416,40 +403,7 @@ CORBA::Boolean operator>> (
     IOP::TaggedProfileSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_ */
@@ -511,22 +465,7 @@ CORBA::Boolean operator<< (
     const IOP::MultipleComponentProfile &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -534,40 +473,7 @@ CORBA::Boolean operator>> (
     IOP::MultipleComponentProfile &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ */
@@ -583,22 +489,7 @@ CORBA::Boolean operator<< (
     const IOP::TaggedComponentList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -606,40 +497,7 @@ CORBA::Boolean operator>> (
     IOP::TaggedComponentList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ */
@@ -655,22 +513,7 @@ CORBA::Boolean operator<< (
     const IOP::TaggedComponentSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -678,40 +521,7 @@ CORBA::Boolean operator>> (
     IOP::TaggedComponentSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ */
@@ -750,22 +560,7 @@ CORBA::Boolean operator<< (
     const IOP::ServiceContextList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -773,40 +568,9 @@ CORBA::Boolean operator>> (
     IOP::ServiceContextList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index 4bf5d87e8d1..790ec9730a7 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -47,6 +47,7 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/String_Manager_T.h"
 
 #include "tao/OctetSeqC.h"
 
@@ -60,84 +61,83 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace IOP
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong ProfileId;
   typedef CORBA::ULong_out ProfileId_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ProfileId TAG_INTERNET_IOP = 0U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ProfileId TAG_MULTIPLE_COMPONENTS = 1U;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct TaggedProfile;
-  
+
   typedef
     TAO_Var_Var_T<
         TaggedProfile
       >
     TaggedProfile_var;
-  
+
   typedef
     TAO_Out_T<
         TaggedProfile,
         TaggedProfile_var
       >
     TaggedProfile_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export TaggedProfile
   {
     typedef TaggedProfile_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::ProfileId tag;
     CORBA::OctetSeq profile_data;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDPROFILESEQ_CH_)
 #define _IOP_TAGGEDPROFILESEQ_CH_
-  
+
   class TaggedProfileSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        TaggedProfileSeq,
-        TaggedProfile
+        TaggedProfileSeq
       >
     TaggedProfileSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        TaggedProfileSeq,
-        TaggedProfileSeq_var,
-        TaggedProfile
+        TaggedProfileSeq
       >
     TaggedProfileSeq_out;
-  
+
   class TAO_Export TaggedProfileSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             TaggedProfile
           >
   {
@@ -147,111 +147,108 @@ namespace IOP
     TaggedProfileSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedProfile* buffer, 
-        CORBA::Boolean release = 0
+        TaggedProfile* buffer,
+        CORBA::Boolean release = false
       );
     TaggedProfileSeq (const TaggedProfileSeq &);
     ~TaggedProfileSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef TaggedProfileSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IOR;
-  
+
   typedef
     TAO_Var_Var_T<
         IOR
       >
     IOR_var;
-  
+
   typedef
     TAO_Out_T<
         IOR,
         IOR_var
       >
     IOR_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export IOR
   {
     typedef IOR_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager type_id;
+    TAO::String_Manager type_id;
     IOP::TaggedProfileSeq profiles;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct TaggedComponent;
-  
+
   typedef
     TAO_Var_Var_T<
         TaggedComponent
       >
     TaggedComponent_var;
-  
+
   typedef
     TAO_Out_T<
         TaggedComponent,
         TaggedComponent_var
       >
     TaggedComponent_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export TaggedComponent
   {
     typedef TaggedComponent_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::ComponentId tag;
     CORBA::OctetSeq component_data;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CH_
-  
+
   class MultipleComponentProfile;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        MultipleComponentProfile,
-        TaggedComponent
+        MultipleComponentProfile
       >
     MultipleComponentProfile_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        MultipleComponentProfile,
-        MultipleComponentProfile_var,
-        TaggedComponent
+        MultipleComponentProfile
       >
     MultipleComponentProfile_out;
-  
+
   class TAO_Export MultipleComponentProfile
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             TaggedComponent
           >
   {
@@ -261,45 +258,42 @@ namespace IOP
     MultipleComponentProfile (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
+        TaggedComponent* buffer,
+        CORBA::Boolean release = false
       );
     MultipleComponentProfile (const MultipleComponentProfile &);
     ~MultipleComponentProfile (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef MultipleComponentProfile_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST_CH_
-  
+
   class TaggedComponentList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        TaggedComponentList,
-        TaggedComponent
+        TaggedComponentList
       >
     TaggedComponentList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        TaggedComponentList,
-        TaggedComponentList_var,
-        TaggedComponent
+        TaggedComponentList
       >
     TaggedComponentList_out;
-  
+
   class TAO_Export TaggedComponentList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             TaggedComponent
           >
   {
@@ -309,45 +303,42 @@ namespace IOP
     TaggedComponentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
+        TaggedComponent* buffer,
+        CORBA::Boolean release = false
       );
     TaggedComponentList (const TaggedComponentList &);
     ~TaggedComponentList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef TaggedComponentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CH_
-  
+
   class TaggedComponentSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        TaggedComponentSeq,
-        TaggedComponent
+        TaggedComponentSeq
       >
     TaggedComponentSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        TaggedComponentSeq,
-        TaggedComponentSeq_var,
-        TaggedComponent
+        TaggedComponentSeq
       >
     TaggedComponentSeq_out;
-  
+
   class TAO_Export TaggedComponentSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             TaggedComponent
           >
   {
@@ -357,131 +348,128 @@ namespace IOP
     TaggedComponentSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
+        TaggedComponent* buffer,
+        CORBA::Boolean release = false
       );
     TaggedComponentSeq (const TaggedComponentSeq &);
     ~TaggedComponentSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef TaggedComponentSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_ORB_TYPE = 0U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_CODE_SETS = 1U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_POLICIES = 2U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_COMPLETE_OBJECT_KEY = 5U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_ENDPOINT_ID_POSITION = 6U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_LOCATION_POLICY = 12U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_DCE_STRING_BINDING = 100U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_DCE_BINDING_NAME = 101U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_DCE_NO_PIPES = 102U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong ServiceId;
   typedef CORBA::ULong_out ServiceId_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ServiceContext;
-  
+
   typedef
     TAO_Var_Var_T<
         ServiceContext
       >
     ServiceContext_var;
-  
+
   typedef
     TAO_Out_T<
         ServiceContext,
         ServiceContext_var
       >
     ServiceContext_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export ServiceContext
   {
     typedef ServiceContext_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::ServiceId context_id;
     CORBA::OctetSeq context_data;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
 #define _IOP_SERVICECONTEXTLIST_CH_
-  
+
   class ServiceContextList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ServiceContextList,
-        ServiceContext
+        ServiceContextList
       >
     ServiceContextList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ServiceContextList,
-        ServiceContextList_var,
-        ServiceContext
+        ServiceContextList
       >
     ServiceContextList_out;
-  
+
   class TAO_Export ServiceContextList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ServiceContext
           >
   {
@@ -491,112 +479,112 @@ namespace IOP
     ServiceContextList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServiceContext* buffer, 
-        CORBA::Boolean release = 0
+        ServiceContext* buffer,
+        CORBA::Boolean release = false
       );
     ServiceContextList (const ServiceContextList &);
     ~ServiceContextList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ServiceContextList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId TransactionService = 0U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId CodeSets = 1U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId ChainBypassCheck = 2U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId ChainBypassInfo = 3U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId LogicalThreadId = 4U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId BI_DIR_IIOP = 5U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId SendingContextRunTime = 6U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId INVOCATION_POLICIES = 7U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId UnknownExceptionInfo = 9U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId RTCorbaPriority = 10U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId RTCorbaPriorityRange = 11U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_FT_GROUP = 27U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_FT_PRIMARY = 28U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_FT_HEARTBEAT_ENABLED = 29U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId FT_GROUP_VERSION = 12U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId FT_REQUEST = 13U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ProfileId TAG_UIPMC = 3U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_GROUP = 39U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_GROUP_IIOP = 40U;
 
 // TAO_IDL - Generated from
@@ -724,6 +712,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index ca0a10a1038..8c9f231166f 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -1,4 +1,4 @@
-#include "IORInfo.h"
+#include "tao/IORInterceptor/IORInfo.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/PolicyC.h"
@@ -11,13 +11,14 @@ ACE_RCSID (IORInterceptor,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "IORInfo.inl"
+# include "tao/IORInterceptor/IORInfo.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
   : poa_ (poa),
-    components_established_ (0)
+    components_established_ (false)
 {
 }
 
@@ -190,3 +191,5 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
                                           CORBA::COMPLETED_NO));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index c377ff1c994..d0314b30f7e 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORInfoC.h"
+#include "tao/IORInterceptor/IORInfoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,10 +31,11 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_Root_POA;
 
-
 /**
  * @class TAO_IORInfo
  *
@@ -112,7 +113,7 @@ public:
   /// IORInterceptor::components_established() interception point has
   /// been called.
   /**
-   * This method is used so to inform the IORInfo when the
+   * This method is used to inform the IORInfo object when the
    * add_ior_component() and add_ior_component_to_profile() methods
    * are invalid.  They are only valid in the
    * IORInterceptor::establish_components() interception point.
@@ -137,14 +138,13 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_IORInfo (const TAO_IORInfo &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &))
+  TAO_IORInfo (const TAO_IORInfo &);
+  void operator= (const TAO_IORInfo &);
 
 private:
 
   /// Pointer to POA
-  TAO_Root_POA *poa_;
+  TAO_Root_POA * poa_;
 
   /// True if the IORInterceptor::components_established()
   /// interception point was called.  False otherwise.
@@ -158,8 +158,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "IORInfo.inl"
+# include "tao/IORInterceptor/IORInfo.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
index 3a94b482656..dfb66194baf 100644
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ b/TAO/tao/IORInterceptor/IORInfo.inl
@@ -2,6 +2,9 @@
 //
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_IORInfo::invalidate (void)
 {
@@ -11,5 +14,7 @@ TAO_IORInfo::invalidate (void)
 ACE_INLINE void
 TAO_IORInfo::components_established (void)
 {
-  this->components_established_ = 1;
+  this->components_established_ = true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index 33bd2b8f705..4d192e058a7 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -Sci
+ *     -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sc -Sci
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
@@ -34,6 +34,8 @@
 #define _IORINFO_IDL_
 
 #include "tao/PortableInterceptor.pidl"
+#include "tao/Policy_Forward.pidl"
+#include "tao/IOP_IOR.pidl"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 module PortableInterceptor
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index e20c34af88b..42e816c1590 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -26,27 +26,25 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "IORInfoC.h"
+#include "tao/IORInterceptor/IORInfoC.h"
 #include "tao/CDR.h"
 #include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_
 
   template<>
   class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
@@ -56,7 +54,7 @@ namespace TAO
             PortableInterceptor::ObjectReferenceFactory_var,
             PortableInterceptor::ObjectReferenceFactory_out,
             TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>,
-            TAO::Any_Insert_Policy_Stream <PortableInterceptor::ObjectReferenceFactory *>
+            TAO::Any_Insert_Policy_Noop <PortableInterceptor::ObjectReferenceFactory*>
           >
   {
   };
@@ -83,7 +81,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::release (
     PortableInterceptor::IORInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::IORInfo_ptr
@@ -92,13 +90,13 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::nil (void)
   return PortableInterceptor::IORInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal (
     PortableInterceptor::IORInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::IORInfo::IORInfo (void)
@@ -109,7 +107,7 @@ PortableInterceptor::IORInfo::~IORInfo (void)
 
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -120,7 +118,7 @@ PortableInterceptor::IORInfo::_narrow (
 
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -132,7 +130,7 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -143,10 +141,10 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
 void
 PortableInterceptor::IORInfo::_tao_release (IORInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::IORInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -180,8 +178,10 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
   return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 64b2ba035cc..80b0ab75f1d 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IORINFOC_H_
-#define _TAO_IDL_ORIG_IORINFOC_H_
+#ifndef _TAO_IDL_IORINFOC_H_
+#define _TAO_IDL_IORINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "iorinterceptor_export.h"
+#include "tao/IORInterceptor/iorinterceptor_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -48,6 +48,8 @@
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/Policy_ForwardC.h"
+#include "tao/IOP_IORC.h"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -55,23 +57,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
@@ -100,7 +95,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
   
   class TAO_IORInterceptor_Export IORInfo
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef IORInfo_ptr _ptr_type;
@@ -112,12 +107,12 @@ namespace PortableInterceptor
     static void _tao_release (IORInfo_ptr obj);
     
     static IORInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     static IORInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -136,7 +131,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -147,7 +142,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -159,27 +154,27 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
-    virtual PortableInterceptor::AdapterManagerId manager_id (
+    virtual ::PortableInterceptor::AdapterManagerId manager_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
-    virtual PortableInterceptor::AdapterState state (
+    virtual ::PortableInterceptor::AdapterState state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -189,7 +184,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -199,7 +194,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -210,19 +205,19 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
   protected:
     // Abstract or local interface only.
@@ -240,7 +235,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -251,8 +246,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_
   
   template<>
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo>
@@ -264,7 +259,7 @@ namespace TAO
         ::PortableInterceptor::IORInfo_ptr
       );
     static ::PortableInterceptor::IORInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::IORInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -274,15 +269,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 6247886f787..968fd662506 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci
+ *     -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci -SS
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
@@ -47,7 +47,10 @@ module PortableInterceptor
   local interface IORInterceptor : Interceptor
   {
     void establish_components (in IORInfo info);
+  };
 
+  local interface IORInterceptor_3_0 : IORInterceptor
+  {
     void components_established (in IORInfo info);
 
     void adapter_manager_state_changed (
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 0a657bf65a8..853aaec6f59 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "IORInterceptor.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::IORInterceptor_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void)
   return PortableInterceptor::IORInterceptor::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
     PortableInterceptor::IORInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
@@ -90,7 +88,7 @@ PortableInterceptor::IORInterceptor::~IORInterceptor (void)
 
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -101,7 +99,7 @@ PortableInterceptor::IORInterceptor::_narrow (
 
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -113,21 +111,21 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::IORInterceptor::_tao_release (IORInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::IORInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -165,8 +163,139 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableInterceptor::IORInterceptor_3_0.
+
+PortableInterceptor::IORInterceptor_3_0_ptr
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::duplicate (
+    PortableInterceptor::IORInterceptor_3_0_ptr p
+  )
+{
+  return PortableInterceptor::IORInterceptor_3_0::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::release (
+    PortableInterceptor::IORInterceptor_3_0_ptr p
+  )
+{
+  ::CORBA::release (p);
+}
+
+PortableInterceptor::IORInterceptor_3_0_ptr
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::nil (void)
+{
+  return PortableInterceptor::IORInterceptor_3_0::_nil ();
+}
+
+::CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::marshal (
+    PortableInterceptor::IORInterceptor_3_0_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return ::CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::IORInterceptor_3_0::IORInterceptor_3_0 (void)
+{}
+
+PortableInterceptor::IORInterceptor_3_0::~IORInterceptor_3_0 (void)
+{}
+
+PortableInterceptor::IORInterceptor_3_0_ptr
+PortableInterceptor::IORInterceptor_3_0::_narrow (
+    ::CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return IORInterceptor_3_0::_duplicate (
+      dynamic_cast<IORInterceptor_3_0_ptr> (_tao_objref)
+    );
+}
+
+PortableInterceptor::IORInterceptor_3_0_ptr
+PortableInterceptor::IORInterceptor_3_0::_unchecked_narrow (
+    ::CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return IORInterceptor_3_0::_duplicate (
+      dynamic_cast<IORInterceptor_3_0_ptr> (_tao_objref)
+    );
+}
+
+PortableInterceptor::IORInterceptor_3_0_ptr
+PortableInterceptor::IORInterceptor_3_0::_duplicate (IORInterceptor_3_0_ptr obj)
+{
+  if (! ::CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+void
+PortableInterceptor::IORInterceptor_3_0::_tao_release (IORInterceptor_3_0_ptr obj)
+{
+  ::CORBA::release (obj);
+}
+
+::CORBA::Boolean
+PortableInterceptor::IORInterceptor_3_0::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/IORInterceptor_3_0:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* PortableInterceptor::IORInterceptor_3_0::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/IORInterceptor_3_0:1.0";
+}
+
+::CORBA::Boolean
+PortableInterceptor::IORInterceptor_3_0::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 62091a216d1..7f78cfe946f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
+#ifndef _TAO_IDL_IORINTERCEPTORC_H_
+#define _TAO_IDL_IORINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -43,7 +43,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "iorinterceptor_export.h"
+#include "tao/IORInterceptor/iorinterceptor_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -59,23 +59,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
@@ -116,12 +109,12 @@ namespace PortableInterceptor
     static void _tao_release (IORInterceptor_ptr obj);
     
     static IORInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     static IORInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -140,10 +133,94 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual ::CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    // Abstract or local interface only.
+    IORInterceptor (void);
+    
+    virtual ~IORInterceptor (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    IORInterceptor (const IORInterceptor &);
+    
+    void operator= (const IORInterceptor &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:646
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__VAR_OUT_CH_
+  
+  class IORInterceptor_3_0;
+  typedef IORInterceptor_3_0 *IORInterceptor_3_0_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IORInterceptor_3_0
+      >
+    IORInterceptor_3_0_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IORInterceptor_3_0
+      >
+    IORInterceptor_3_0_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0_CH_
+  
+  class TAO_IORInterceptor_Export IORInterceptor_3_0
+    : public virtual ::PortableInterceptor::IORInterceptor
+  {
+  public:
+    typedef IORInterceptor_3_0_ptr _ptr_type;
+    typedef IORInterceptor_3_0_var _var_type;
+    
+    // The static operations.
+    static IORInterceptor_3_0_ptr _duplicate (IORInterceptor_3_0_ptr obj);
+    
+    static void _tao_release (IORInterceptor_3_0_ptr obj);
+    
+    static IORInterceptor_3_0_ptr _narrow (
+        ::CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInterceptor_3_0_ptr _unchecked_narrow (
+        ::CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInterceptor_3_0_ptr _nil (void)
+    {
+      return static_cast<IORInterceptor_3_0_ptr> (0);
+    }
+    
+    
+    
+    // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void components_established (
@@ -151,7 +228,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -163,7 +240,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -175,37 +252,37 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
   protected:
     // Abstract or local interface only.
-    IORInterceptor (void);
+    IORInterceptor_3_0 (void);
     
-    virtual ~IORInterceptor (void);
+    virtual ~IORInterceptor_3_0 (void);
   
   private:
     // Private and unimplemented for concrete interfaces.
-    IORInterceptor (const IORInterceptor &);
+    IORInterceptor_3_0 (const IORInterceptor_3_0 &);
     
-    void operator= (const IORInterceptor &);
+    void operator= (const IORInterceptor_3_0 &);
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -216,8 +293,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_
   
   template<>
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
@@ -229,25 +306,40 @@ namespace TAO
         ::PortableInterceptor::IORInterceptor_ptr
       );
     static ::PortableInterceptor::IORInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::IORInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__TRAITS_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__TRAITS_
+  
+  template<>
+  struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor_3_0>
+  {
+    static ::PortableInterceptor::IORInterceptor_3_0_ptr duplicate (
+        ::PortableInterceptor::IORInterceptor_3_0_ptr
+      );
+    static void release (
+        ::PortableInterceptor::IORInterceptor_3_0_ptr
+      );
+    static ::PortableInterceptor::IORInterceptor_3_0_ptr nil (void);
+    static ::CORBA::Boolean marshal (
+        ::PortableInterceptor::IORInterceptor_3_0_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 8dfe90401cf..a917dc798d4 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "IORInterceptor_Adapter_Impl.h"
-#include "IORInterceptor_Adapter_Factory_Impl.h"
+#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
+#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h"
 
 #include "tao/ORB_Core.h"
 
@@ -9,6 +9,8 @@ ACE_RCSID (IORInterceptor,
            IORInterceptor_Adapter_Factory_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
 {
 }
@@ -21,6 +23,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (nia,
                     TAO_IORInterceptor_Adapter_Impl (),
                     CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (nia);
 
   return nia;
 }
@@ -43,6 +46,8 @@ TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_IORInterceptor_Adapter_Factory_Impl,
     ACE_TEXT ("Concrete_IORInterceptor_Adapter_Factory"),
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index f41d267a92f..a08507cd6a6 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "iorinterceptor_export.h"
+#include "tao/IORInterceptor/iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,7 @@
 #include "tao/IORInterceptor_Adapter_Factory.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IORInterceptor_Adapter;
 
@@ -51,13 +52,15 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
-ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
-
 static int
 TAO_Requires_IORInterceptor_Initializer =
   TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
+ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
+
 #define TAO_IORINTERCEPTOR_SAFE_INCLUDE
 #include "tao/IORInterceptor/IORInterceptorC.h"
 #undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 878419b151a..35cbb376d28 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "IORInterceptor_Adapter_Impl.h"
-#include "IORInfo.h"
+#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
+#include "tao/IORInterceptor/IORInfo.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PI/PI.h"
@@ -13,6 +13,8 @@ ACE_RCSID (IORInterceptor,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
 {
 }
@@ -29,6 +31,19 @@ TAO_IORInterceptor_Adapter_Impl::add_interceptor (
 }
 
 void
+TAO_IORInterceptor_Adapter_Impl::add_interceptor (
+    PortableInterceptor::IORInterceptor_ptr i,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL
+  )
+{
+  this->ior_interceptor_list_.add_interceptor (i,
+                                               policies
+                                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
 TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -135,10 +150,18 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
     {
       ACE_TRY
         {
-          this->ior_interceptor_list_.interceptor (j)->components_established (
-            info
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          PortableInterceptor::IORInterceptor_ptr ior_interceptor =
+            this->ior_interceptor_list_.interceptor (j);
+
+          PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor =
+            PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor);
+          if (!CORBA::is_nil (ior_3_interceptor.in ()))
+            {
+              ior_3_interceptor->components_established (
+                info
+                ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -179,11 +202,19 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
-      this->ior_interceptor_list_.interceptor (i)->adapter_state_changed (
-        seq_obj_ref_template,
-        state
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      PortableInterceptor::IORInterceptor_ptr ior_interceptor =
+        this->ior_interceptor_list_.interceptor (i);
+
+      PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor =
+        PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor);
+      if (!CORBA::is_nil (ior_3_interceptor.in ()))
+        {
+          ior_3_interceptor->adapter_state_changed (
+            seq_obj_ref_template,
+            state
+            ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
     }
 }
 
@@ -204,10 +235,20 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
-      this->ior_interceptor_list_.interceptor(i)->adapter_manager_state_changed (
-        id,
-        state
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      PortableInterceptor::IORInterceptor_ptr ior_interceptor =
+        this->ior_interceptor_list_.interceptor (i);
+
+      PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor =
+        PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor);
+      if (!CORBA::is_nil (ior_3_interceptor.in ()))
+        {
+          ior_3_interceptor->adapter_manager_state_changed (
+            id,
+            state
+            ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 50d4a0eaa11..6257c699b9a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "iorinterceptor_export.h"
+#include "tao/IORInterceptor/iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,10 +25,14 @@
 #include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/IORInterceptor_Adapter.h"
 #include "tao/PI/Interceptor_List_T.h"
+#include "tao/IORInterceptor/IORInterceptor_Details.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  typedef Interceptor_List< ::PortableInterceptor::IORInterceptor>
+  typedef Interceptor_List< ::PortableInterceptor::IORInterceptor,
+                            IORInterceptor_Details>
     IORInterceptor_List;
 }
 
@@ -43,7 +47,7 @@ class TAO_Root_POA;
  * interfaces IORInfo and IORInterceptor. This is the derived class
  * that contains the actual implementations.
  */
-class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
+class TAO_IORInterceptor_Adapter_Impl
   : public TAO_IORInterceptor_Adapter
 {
 public:
@@ -53,6 +57,11 @@ public:
       PortableInterceptor::IORInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL);
 
+  virtual void add_interceptor (
+      PortableInterceptor::IORInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL);
+
   virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
@@ -81,6 +90,8 @@ private:
   TAO::IORInterceptor_List ior_interceptor_list_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
index 87e2ca2971c..7759e6793f3 100644
--- a/TAO/tao/IORInterceptor_Adapter.cpp
+++ b/TAO/tao/IORInterceptor_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/IORInterceptor_Adapter.h"
 
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            IORInterceptor_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index c37d8a3a940..ea337f5c9f3 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Array_Base.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,12 @@
 #include "tao/SystemException.h"
 #include "tao/PI_ForwardC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+template <class T> class ACE_Array_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   class IORInterceptor;
@@ -61,6 +67,12 @@ public:
       ACE_ENV_ARG_DECL
     ) = 0;
 
+  virtual void add_interceptor (
+      PortableInterceptor::IORInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL
+    ) = 0;
+
   virtual void destroy_interceptors (
       ACE_ENV_SINGLE_ARG_DECL
       ) = 0;
@@ -95,5 +107,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IORINTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
index 4bf66592ee5..083299eeb96 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
@@ -5,6 +5,10 @@ ACE_RCSID (tao,
            IORInterceptor_Adapter_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index e56e7994296..ebb5561ee76 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IORInterceptor_Adapter;
 
 /**
@@ -46,6 +48,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 8f9b028afe9..4f66fb1a1c5 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -32,12 +32,14 @@
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "IORManip_Loader.h"
+#include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:74
 
@@ -900,3 +902,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 80b5d8c433b..b90f2877f73 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "IORManip_Loader.h"
+#include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,13 +40,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
@@ -72,7 +74,7 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &
 TAO_IOP::EmptyProfileList&
 TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -128,7 +130,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -141,7 +143,7 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -151,7 +153,7 @@ CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_tao_type (void) const
   return ::TAO_IOP::_tc_EmptyProfileList;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
@@ -177,7 +179,7 @@ TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
 TAO_IOP::NotFound&
 TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -233,7 +235,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -246,7 +248,7 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -256,7 +258,7 @@ CORBA::TypeCode_ptr TAO_IOP::NotFound::_tao_type (void) const
   return ::TAO_IOP::_tc_NotFound;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
@@ -282,7 +284,7 @@ TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
 TAO_IOP::Duplicate&
 TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -338,7 +340,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -351,7 +353,7 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -361,7 +363,7 @@ CORBA::TypeCode_ptr TAO_IOP::Duplicate::_tao_type (void) const
   return ::TAO_IOP::_tc_Duplicate;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
@@ -387,7 +389,7 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 TAO_IOP::Invalid_IOR&
 TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -443,7 +445,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -456,7 +458,7 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -466,7 +468,7 @@ CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_tao_type (void) const
   return ::TAO_IOP::_tc_Invalid_IOR;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
@@ -492,7 +494,7 @@ TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &
 TAO_IOP::MultiProfileList&
 TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -548,7 +550,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -561,7 +563,7 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -589,7 +591,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
@@ -613,12 +615,12 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-void 
+void
 TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Property *_tao_tmp_pointer =
     static_cast<TAO_IOR_Property *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
@@ -631,10 +633,10 @@ TAO_IOP::TAO_IOR_Property::_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-  
+
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-  
+
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
@@ -648,28 +650,28 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-  
+
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-  
+
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 TAO_IOP::TAO_IOR_Property::_tao_release (TAO_IOR_Property_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -730,7 +732,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -748,7 +750,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
@@ -760,8 +762,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Object,
+        CORBA::Object_var
       >
     (max)
 {}
@@ -772,8 +775,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
     CORBA::Object_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Object,
+        CORBA::Object_var
       >
     (max, length, buffer, release)
 {}
@@ -781,8 +785,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
     const IORList &seq
   )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Object,
+        CORBA::Object_var
       >
     (seq)
 {}
@@ -807,12 +812,12 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void 
+void
 TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Manipulation *_tao_tmp_pointer =
     static_cast<TAO_IOR_Manipulation *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -825,10 +830,10 @@ TAO_IOP::TAO_IOR_Manipulation::_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-  
+
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-  
+
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
@@ -842,28 +847,28 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-  
+
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-  
+
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 TAO_IOP::TAO_IOR_Manipulation::_tao_release (TAO_IOR_Manipulation_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1005,3 +1010,5 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 3c3fb06fc6c..52751b81503 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -44,7 +44,7 @@
  #error "You should not include IORC.h directly, use IORManip_Loader.h"
  #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
 
-#include "ior_manip_export.h"
+#include "tao/IORManipulation/ior_manip_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,32 +71,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_IOP
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
-  
+
   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
   {
   public:
-    
+
     EmptyProfileList (void);
     EmptyProfileList (const EmptyProfileList &);
     ~EmptyProfileList (void);
 
     EmptyProfileList &operator= (const EmptyProfileList &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static const EmptyProfileList *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -105,48 +107,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_EmptyProfileList;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
-  
+
   class TAO_IORManip_Export NotFound : public CORBA::UserException
   {
   public:
-    
+
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotFound *_downcast (CORBA::Exception *);
     static const NotFound *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -155,48 +157,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
-  
+
   class TAO_IORManip_Export Duplicate : public CORBA::UserException
   {
   public:
-    
+
     Duplicate (void);
     Duplicate (const Duplicate &);
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static Duplicate *_downcast (CORBA::Exception *);
     static const Duplicate *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -205,48 +207,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Duplicate;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-  
+
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-    
+
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static const Invalid_IOR *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -255,48 +257,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Invalid_IOR;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-  
+
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-    
+
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static MultiProfileList *_downcast (CORBA::Exception *);
     static const MultiProfileList *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -305,40 +307,40 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_MultiProfileList;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
-  
+
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Property
       >
     TAO_IOR_Property_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Property
@@ -346,45 +348,45 @@ namespace TAO_IOP
     TAO_IOR_Property_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-  
+
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-    
+
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-    
+
     static void _tao_release (TAO_IOR_Property_ptr obj);
-    
+
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Property_ptr _nil (void)
     {
       return static_cast<TAO_IOR_Property_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_property (
         ::CORBA::Object_ptr & ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -393,10 +395,10 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_primary (
         ::CORBA::Object_ptr & ior1,
         ::CORBA::Object_ptr ior2
@@ -407,10 +409,10 @@ namespace TAO_IOP
         ::TAO_IOP::Duplicate,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_primary (
         ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -419,10 +421,10 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_primary_set (
         ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -430,10 +432,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean remove_primary_tag (
         ::CORBA::Object_ptr & iogr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -442,53 +444,53 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     TAO_IOR_Property (void);
-    
+
     virtual ~TAO_IOR_Property (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Property (const TAO_IOR_Property &);
-    
+
     void operator= (const TAO_IOR_Property &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
-  
+
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Manipulation
       >
     TAO_IOR_Manipulation_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Manipulation
@@ -496,73 +498,67 @@ namespace TAO_IOP
     TAO_IOR_Manipulation_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-  
+
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-    
+
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-    
+
     static void _tao_release (TAO_IOR_Manipulation_ptr obj);
-    
+
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Manipulation_ptr _nil (void)
     {
       return static_cast<TAO_IOR_Manipulation_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-    
+
     class IORList;
-    
+
     typedef
-      TAO_MngSeq_Var_T<
-          IORList,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Object
-            >
+      TAO_VarSeq_Var_T<
+          IORList
         >
       IORList_var;
-    
+
     typedef
-      TAO_MngSeq_Out_T<
-          IORList,
-          IORList_var,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Object
-            >
+      TAO_Seq_Out_T<
+          IORList
         >
       IORList_out;
-    
+
     class TAO_IORManip_Export IORList
       : public
-          TAO_Unbounded_Pseudo_Sequence<
-              CORBA::Object
+          TAO::unbounded_object_reference_sequence<
+              CORBA::Object,
+              CORBA::Object_var
             >
     {
     public:
@@ -571,27 +567,27 @@ namespace TAO_IOP
       IORList (
           CORBA::ULong max,
           CORBA::ULong length,
-          CORBA::Object_ptr* buffer, 
-          CORBA::Boolean release = 0
+          CORBA::Object_ptr* buffer,
+          CORBA::Boolean release = false
         );
       IORList (const IORList &);
       ~IORList (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef IORList_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_IORList;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr merge_iors (
         const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -602,10 +598,10 @@ namespace TAO_IOP
         ::TAO_IOP::Duplicate,
         ::TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr add_profiles (
         ::CORBA::Object_ptr ior1,
         ::CORBA::Object_ptr ior2
@@ -617,10 +613,10 @@ namespace TAO_IOP
         ::TAO_IOP::Duplicate,
         ::TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr remove_profiles (
         ::CORBA::Object_ptr ior1,
         ::CORBA::Object_ptr ior2
@@ -632,10 +628,10 @@ namespace TAO_IOP
         ::TAO_IOP::EmptyProfileList,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_property (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
         ::CORBA::Object_ptr ior
@@ -646,10 +642,10 @@ namespace TAO_IOP
         ::TAO_IOP::Invalid_IOR,
         ::TAO_IOP::Duplicate
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_primary (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
         ::CORBA::Object_ptr ior1,
@@ -663,10 +659,10 @@ namespace TAO_IOP
         ::TAO_IOP::MultiProfileList,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean remove_primary_tag (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
         ::CORBA::Object_ptr ior
@@ -675,10 +671,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_primary (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
         ::CORBA::Object_ptr ior
@@ -688,10 +684,10 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_primary_set (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
         ::CORBA::Object_ptr ior
@@ -700,10 +696,10 @@ namespace TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong is_in_ior (
         ::CORBA::Object_ptr ior1,
         ::CORBA::Object_ptr ior2
@@ -713,10 +709,10 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_profile_count (
         ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -725,36 +721,36 @@ namespace TAO_IOP
         CORBA::SystemException,
         ::TAO_IOP::EmptyProfileList
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     TAO_IOR_Manipulation (void);
-    
+
     virtual ~TAO_IOR_Manipulation (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-    
+
     void operator= (const TAO_IOR_Manipulation &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation;
 
 // TAO_IDL - Generated from
@@ -771,7 +767,7 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_
-  
+
   template<>
   struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Property>
   {
@@ -792,7 +788,7 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_
-  
+
   template<>
   struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Manipulation>
   {
@@ -907,6 +903,8 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 5d06739f52c..eceb6b0b06b 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -1,5 +1,5 @@
-#include "IORManip_Loader.h"
-#include "IORManipulation.h"
+#include "tao/IORManipulation/IORManip_Loader.h"
+#include "tao/IORManipulation/IORManipulation.h"
 
 #include "ace/Log_Msg.h"
 
@@ -9,6 +9,8 @@ ACE_RCSID (IORManipulation,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IORManip_Loader::TAO_IORManip_Loader (void)
 {
 }
@@ -33,6 +35,8 @@ TAO_IORManip_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader,
                        ACE_TEXT ("IORManip_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index f01484f7690..fc45a394fae 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // $Id$
 
@@ -19,7 +19,7 @@
 #define TAO_IORMANIP_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "ior_manip_export.h"
+#include "tao/IORManipulation/ior_manip_export.h"
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader
 {
 public:
@@ -44,14 +46,16 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader)
-ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader)
-
 static int
 TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader)
+ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader)
+
 #define TAO_IORMANIP_SAFE_INCLUDE
-#include "IORC.h"
+#include "tao/IORManipulation/IORC.h"
 #undef TAO_IORMANIP_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 3bba59dba08..dcc9217a1fb 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -1,4 +1,4 @@
-#include "IORManipulation.h"
+#include "tao/IORManipulation/IORManipulation.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -13,6 +13,7 @@ ACE_RCSID (IORManipulation,
            IORManipulation,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
 {
@@ -183,17 +184,15 @@ TAO_IOR_Manipulation_impl::remove_profiles (
     ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
                       CORBA::Object::_nil ());
 
-  ACE_AUTO_PTR_RESET (tmp_pfiles,
-                      ior2->_stubobj ()->make_profiles (),
-                      TAO_MProfile);
-
-  if (Diff_Profiles.remove_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      CORBA::Object::_nil ());
-
-  // MS C++ knows nothing about reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
+  // We are done with add_profiles.
+  // At this point, we don't do remove_profiles()
+  // immediately like before,
+  // because it could result in an
+  // Object Reference with 0 profile. And it would not pass
+  // the ::CORBA::is_nil() evaluation.
+  // Instead, we create the Object Reference right here, which is
+  // earlier than before.(Actually, I just moved some code
+  // from below up to here).
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
@@ -224,6 +223,20 @@ TAO_IOR_Manipulation_impl::remove_profiles (
                         CORBA::Object::_nil ());
     }
 
+  // Now we can remove the profiles which we want to elimitate from
+  // the Object.
+  ACE_AUTO_PTR_RESET (tmp_pfiles,
+                      ior2->_stubobj ()->make_profiles (),
+                      TAO_MProfile);
+
+  TAO_MProfile& mp = stub -> base_profiles();
+  if (mp.remove_profiles (tmp_pfiles.get ()) < 0)
+    ACE_THROW_RETURN (TAO_IOP::NotFound (),
+                      CORBA::Object::_nil ());
+
+  // MS C++ knows nothing about reset!
+  // tmp_pfiles.reset (0); // get rid of last MProfile
+
   return new_obj._retn ();
 }
 
@@ -366,3 +379,4 @@ TAO_IOR_Manipulation_impl::get_profile_count (
   return count;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 0666e0ef6b7..9ad320bc8d0 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -19,23 +19,26 @@
 
 #ifndef TAO_IOR_MANIPULATION_H
 #define TAO_IOR_MANIPULATION_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/LocalObject.h"
-#include "IORManip_Loader.h"
+#include "tao/IORManipulation/IORManip_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IORC.h"
+#include "tao/IORManipulation/IORC.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_IORManip_Export TAO_IOR_Manipulation_impl
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_IOR_Manipulation_impl
   : public TAO_IOP::TAO_IOR_Manipulation,
     public TAO_Local_RefCounted_Object
 {
@@ -50,9 +53,6 @@ public:
   TAO_IOR_Manipulation_impl (void);
   // constructor
 
-  ~TAO_IOR_Manipulation_impl (void);
-  // destructor
-
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -153,13 +153,20 @@ public:
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
       ));
-private:
+
+protected:
+
+  ~TAO_IOR_Manipulation_impl (void);
+  // destructor
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_IOR_MANIPULATION_H */
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
index 6b5d631f90f..e43ccf18b34 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -11,13 +11,18 @@
  */
 // =================================================================
 
-#include "IORTable.h"
-#include "Table_Adapter.h"
+#include "tao/IORTable/IORTable.h"
+#include "tao/IORTable/Table_Adapter.h"
 
 ACE_RCSID (IORTable, IORTable, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_IORTable_Initializer::init (void)
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
index 4044e6de93c..7bae99afdb1 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 
 //=============================================================================
@@ -17,12 +17,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "iortable_export.h"
+#include "tao/IORTable/iortable_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IORTable_Export TAO_IORTable_Initializer
 {
 public:
@@ -33,8 +37,10 @@ public:
 static int
 TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_IORTABLE_SAFE_INCLUDE
-#include "IORTableC.h"
+#include "tao/IORTable/IORTableC.h"
 #undef TAO_IORTABLE_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index afbeabe311b..677c159c773 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "IORTable.h"
+#include "tao/IORTable/IORTable.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,13 +40,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IORTable::AlreadyBound::AlreadyBound (void)
@@ -72,7 +74,7 @@ IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
 IORTable::AlreadyBound&
 IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -121,7 +123,7 @@ void IORTable::AlreadyBound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -134,13 +136,13 @@ void IORTable::AlreadyBound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IORTable::NotFound::NotFound (void)
@@ -166,7 +168,7 @@ IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
 IORTable::NotFound&
 IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -215,7 +217,7 @@ void IORTable::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -228,7 +230,7 @@ void IORTable::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -252,7 +254,7 @@ TAO::Objref_Traits<IORTable::Table>::release (
     IORTable::Table_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 IORTable::Table_ptr
@@ -286,10 +288,10 @@ IORTable::Table::_narrow (
     {
       return Table::_nil ();
     }
-  
+
   Table_ptr proxy =
     dynamic_cast<Table_ptr> (_tao_objref);
-  
+
   return Table::_duplicate (proxy);
 }
 
@@ -303,28 +305,28 @@ IORTable::Table::_unchecked_narrow (
     {
       return Table::_nil ();
     }
-  
+
   Table_ptr proxy =
     dynamic_cast<Table_ptr> (_tao_objref);
-  
+
   return Table::_duplicate (proxy);
 }
 
 IORTable::Table_ptr
 IORTable::Table::_duplicate (Table_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 IORTable::Table::_tao_release (Table_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -385,7 +387,7 @@ TAO::Objref_Traits<IORTable::Locator>::release (
     IORTable::Locator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 IORTable::Locator_ptr
@@ -419,10 +421,10 @@ IORTable::Locator::_narrow (
     {
       return Locator::_nil ();
     }
-  
+
   Locator_ptr proxy =
     dynamic_cast<Locator_ptr> (_tao_objref);
-  
+
   return Locator::_duplicate (proxy);
 }
 
@@ -436,28 +438,28 @@ IORTable::Locator::_unchecked_narrow (
     {
       return Locator::_nil ();
     }
-  
+
   Locator_ptr proxy =
     dynamic_cast<Locator_ptr> (_tao_objref);
-  
+
   return Locator::_duplicate (proxy);
 }
 
 IORTable::Locator_ptr
 IORTable::Locator::_duplicate (Locator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 IORTable::Locator::_tao_release (Locator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -539,3 +541,5 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 4f2d10cf9f0..fcd0a17bdfc 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "iortable_export.h"
+#include "tao/IORTable/iortable_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -68,6 +68,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace IORTable
 {
   
@@ -451,6 +453,8 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 7b0d6bb538a..bb3b678e397 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "IOR_Table_Impl.h"
+#include "tao/IORTable/IOR_Table_Impl.h"
 #include "ace/Guard_T.h"
 
 ACE_RCSID (IORTable,
@@ -15,6 +15,8 @@ ACE_RCSID (IORTable,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 {
 }
@@ -102,3 +104,5 @@ TAO_IOR_Table_Impl::set_locator (
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->locator_ = IORTable::Locator::_duplicate (locator);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index acdcebdfa11..15ca6d6cc3f 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORTable.h"
+#include "tao/IORTable/IORTable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +32,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_IORTable_Export TAO_IOR_Table_Impl
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_IOR_Table_Impl
   : public virtual IORTable::Table,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -106,6 +108,8 @@ private:
   TAO_SYNCH_MUTEX lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index 4fedc0b3f29..18e9873d933 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -7,16 +7,20 @@
  *
  */
 
-#include "Table_Adapter.h"
-#include "IOR_Table_Impl.h"
+#include "tao/IORTable/Table_Adapter.h"
+#include "tao/IORTable/IOR_Table_Impl.h"
 #include "tao/ORB_Core.h"
 #include "tao/Object.h"
+#include "tao/Stub.h"
 #include "tao/ORB.h"
+#include "tao/Profile.h"
 
 ACE_RCSID (IORTable,
            Table_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core)
   :  orb_core_ (orb_core)
   ,  root_ (0)
@@ -25,7 +29,7 @@ TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core)
 
 TAO_Table_Adapter::~TAO_Table_Adapter (void)
 {
-  CORBA::release (this->root_);
+  ::CORBA::release (this->root_);
 }
 
 void
@@ -40,7 +44,7 @@ TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Table_Adapter::close (int  ACE_ENV_ARG_DECL_NOT_USED)
 {
-  CORBA::release (this->root_);
+  ::CORBA::release (this->root_);
   this->root_ = 0;
 }
 
@@ -62,26 +66,8 @@ TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var object_key;
-  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
-                                            key);
-  ACE_TRY
-    {
-      CORBA::String_var ior =
-        this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      forward_to =
-        this->orb_core_->orb ()->string_to_object (ior.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (IORTable::NotFound, nf_ex)
-    {
-      return TAO_Adapter::DS_MISMATCHED_KEY;
-    }
-  ACE_ENDTRY;
-  return TAO_Adapter::DS_FORWARD;
+  return this->find_object (key, forward_to) ? TAO_Adapter::DS_FORWARD
+                                             : TAO_Adapter::DS_MISMATCHED_KEY;
 }
 
 const char *
@@ -100,15 +86,88 @@ CORBA::Object_ptr
 TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
                                              const TAO_MProfile &)
 {
-  return new CORBA::Object (stub);
+  CORBA::Object_ptr result = CORBA::Object::_nil ();
+
+  if (! this->initialize_collocated_object (stub)) // 0 == success
+    {
+      // A reference was found in the table. The stub has been forwarded
+      // to this. The collocation indicators are now correct on the stub
+      // (although they may well now indicate that the stub is not in fact
+      // collocated at all).
+      ACE_NEW_RETURN (result,
+                      CORBA::Object (stub,
+                                     stub->is_collocated (),
+                                     stub->collocated_servant ()),
+                      CORBA::Object::_nil ());
+
+    }
+
+  return result;
 }
 
 CORBA::Long
-TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *,
-                                                 CORBA::Object_ptr )
+TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub)
 {
-  return 0;
+  // Get the effective profile set.
+  const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ())
+                                                     : stub->base_profiles ();
+  TAO_PHandle j = 0;
+  // We only look at the key from the 0th profile but we only really care about
+  // corbaloc's here where all profiles share a single object key
+  TAO::ObjectKey_var key = mp.get_profile (j)->_key ();
+
+  CORBA::Object_var forward_to = CORBA::Object::_nil ();
+  CORBA::Boolean found = false;
+
+  ACE_TRY_NEW_ENV
+    {
+      found = this->find_object (key, forward_to.out ());
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+
+  if (found)
+    {
+      // This call will set the appropriate collocation values
+      // to correspond to the reference we found in the table.
+      stub->add_forward_profiles (forward_to->_stubobj ()->base_profiles ());
+      stub->next_profile ();
+    }
+
+  // 0 for success
+  return ! found;
+}
+
+CORBA::Long
+TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
+                                CORBA::Object_out forward_to
+                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CORBA::String_var object_key;
+  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
+                                            key);
+  ACE_TRY
+    {
+      CORBA::String_var ior =
+        this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      forward_to =
+        this->orb_core_->orb ()->string_to_object (ior.in ()
+                                                   ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (IORTable::NotFound, nf_ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  return 1;
 }
+
 // ****************************************************************
 
 TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
@@ -121,6 +180,8 @@ TAO_Table_Adapter_Factory::create (TAO_ORB_Core *oc)
   return new TAO_Table_Adapter (oc);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_IORTable, TAO_Table_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Table_Adapter_Factory,
                        ACE_TEXT ("TAO_IORTable"),
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 3e1a8b2fcd8..9f6ad395279 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_TABLE_ADAPTER_H
 #include /**/ "ace/pre.h"
 
-#include "iortable_export.h"
+#include "tao/IORTable/iortable_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 #include "tao/Adapter_Factory.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_IOR_Table_Impl;
 
 class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter
@@ -54,11 +56,17 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
 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_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   /// The ORB Core we belong to
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// The table implementation
   TAO_IOR_Table_Impl *root_;
@@ -77,6 +85,8 @@ public:
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_Table_Adapter_Factory)
 ACE_FACTORY_DECLARE (TAO_IORTable, TAO_Table_Adapter_Factory)
 
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
index 8852c907d52..abc812d7f58 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -4,7 +4,11 @@
 
 ACE_RCSID(tao, IOR_Parser, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IOR_Parser::~TAO_IOR_Parser (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index dc82f1c9cca..0058a743a0e 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +23,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -62,5 +65,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IOR_PARSER_H */
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index e3112d44cf8..42be4db0bec 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ImR_Client.h"
+#include "tao/ImR_Client/ImR_Client.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -15,6 +15,8 @@ ACE_RCSID (ImR_Client,
            ImR_Client,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace ImR_Client
@@ -247,16 +249,20 @@ namespace TAO
 
       return ACE_Service_Config::process_directive (ace_svc_desc_ImR_Client_Adapter_Impl);
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ImR_Client_Adapter_Impl,
-        ACE_TEXT ("Concrete_ImR_Client_Adapter"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImR_Client_Adapter_Impl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ImR_Client_Adapter_Impl,
+  ACE_TEXT ("Concrete_ImR_Client_Adapter"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ImR_Client_Adapter_Impl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_IMR_Client,
+  ImR_Client_Adapter_Impl,
+  TAO::ImR_Client::ImR_Client_Adapter_Impl)
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index 7df7a8296c9..cf1e19b7f92 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "imr_client_export.h"
+#include "tao/ImR_Client/imr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ServerObject_i;
 
 namespace TAO
@@ -62,15 +64,17 @@ namespace TAO
       ServerObject_i *server_object_;
     };
 
-    ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
-    ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
-
     static int
     TAO_Requires_ImR_Client_Initializer =
       TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer ();
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index 6643a51b990..f1792a65da1 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -38,7 +38,7 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -55,22 +55,24 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "tao/ImR_Client/ImplRepoC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -85,13 +87,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -105,13 +107,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:888
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -125,13 +127,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:590
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -145,13 +147,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:118
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -169,7 +171,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
@@ -195,7 +197,7 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::Implemen
 ImplementationRepository::AlreadyRegistered&
 ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -251,7 +253,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -264,7 +266,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -288,7 +290,7 @@ static TAO::TypeCode::Struct<char const *,
     "AlreadyRegistered",
     _tao_fields_ImplementationRepository_AlreadyRegistered,
     0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
@@ -297,7 +299,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
@@ -324,7 +326,7 @@ ImplementationRepository::CannotActivate::CannotActivate (const ::Implementation
 ImplementationRepository::CannotActivate&
 ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->reason = ::CORBA::string_dup (_tao_excp.reason.in ());
   return *this;
 }
@@ -381,7 +383,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -394,7 +396,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -426,7 +428,7 @@ ImplementationRepository::CannotActivate::CannotActivate (
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
   {
     { "reason", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -438,7 +440,7 @@ static TAO::TypeCode::Struct<char const *,
     "CannotActivate",
     _tao_fields_ImplementationRepository_CannotActivate,
     1);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_CannotActivate =
@@ -447,7 +449,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
@@ -473,7 +475,7 @@ ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::
 ImplementationRepository::NotFound&
 ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -529,7 +531,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -542,7 +544,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
@@ -566,7 +568,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_ImplementationRepository_NotFound,
     0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -582,7 +584,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
   {
     { "name", &CORBA::_tc_string },
     { "value", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -594,7 +596,7 @@ static TAO::TypeCode::Struct<char const *,
     "EnvironmentVariable",
     _tao_fields_ImplementationRepository_EnvironmentVariable,
     2);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
@@ -603,10 +605,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -616,7 +618,7 @@ ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
@@ -628,7 +630,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (void)
 ImplementationRepository::EnvironmentList::EnvironmentList (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (max)
@@ -640,7 +642,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
     ImplementationRepository::EnvironmentVariable * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (max, length, buffer, release)
@@ -649,7 +651,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
 ImplementationRepository::EnvironmentList::EnvironmentList (
     const EnvironmentList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         EnvironmentVariable
       >
     (seq)
@@ -690,10 +692,10 @@ namespace TAO
         ::CORBA::tk_sequence,
         &ImplementationRepository::_tc_EnvironmentVariable,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
       &ImplementationRepository_EnvironmentList_0;
-    
+
   }
 }
 
@@ -708,7 +710,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/EnvironmentList:1.0",
     "EnvironmentList",
     &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
@@ -726,7 +728,7 @@ static char const * const _tao_enumerators_ImplementationRepository_ActivationMo
     "MANUAL",
     "PER_CLIENT",
     "AUTO_START"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -737,7 +739,7 @@ static TAO::TypeCode::Enum<char const *,
     "ActivationMode",
     _tao_enumerators_ImplementationRepository_ActivationMode,
     4);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ActivationMode =
@@ -762,7 +764,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
     { "activation", &ImplementationRepository::_tc_ActivationMode },
     { "activator", &CORBA::_tc_string },
     { "start_limit", &CORBA::_tc_long }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -774,7 +776,7 @@ static TAO::TypeCode::Struct<char const *,
     "StartupOptions",
     _tao_fields_ImplementationRepository_StartupOptions,
     6);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_StartupOptions =
@@ -783,10 +785,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -804,7 +806,7 @@ static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *>
     { "server", &CORBA::_tc_string },
     { "startup", &ImplementationRepository::_tc_StartupOptions },
     { "partial_ior", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       ::CORBA::TypeCode_ptr const *,
@@ -816,7 +818,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServerInformation",
     _tao_fields_ImplementationRepository_ServerInformation,
     3);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformation =
@@ -825,10 +827,10 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -838,7 +840,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
@@ -850,7 +852,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (void)
 ImplementationRepository::ServerInformationList::ServerInformationList (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (max)
@@ -862,7 +864,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
     ImplementationRepository::ServerInformation * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (max, length, buffer, release)
@@ -871,7 +873,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
 ImplementationRepository::ServerInformationList::ServerInformationList (
     const ServerInformationList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServerInformation
       >
     (seq)
@@ -912,10 +914,10 @@ namespace TAO
         ::CORBA::tk_sequence,
         &ImplementationRepository::_tc_ServerInformation,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
       &ImplementationRepository_ServerInformationList_0;
-    
+
   }
 }
 
@@ -930,7 +932,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/ServerInformationList:1.0",
     "ServerInformationList",
     &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
@@ -957,7 +959,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -976,7 +978,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -995,25 +997,25 @@ TAO::Collocation_Proxy_Broker *
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers (servers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_how_many,
       &_tao_servers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1022,10 +1024,10 @@ TAO::Collocation_Proxy_Broker *
       6,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1041,21 +1043,21 @@ void ImplementationRepository::ServerInformationIterator::destroy (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1064,7 +1066,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1088,12 +1090,12 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
     static_cast<ServerInformationIterator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -1129,18 +1131,18 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::ServerInformationIterator::_tao_release (ServerInformationIterator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1164,7 +1166,7 @@ ImplementationRepository::ServerInformationIterator::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1191,7 +1193,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerInformationIterator:1.0",
     "ServerInformationIterator");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
@@ -1218,7 +1220,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::release (
     ImplementationRepository::Administration_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::Administration_ptr
@@ -1237,7 +1239,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -1257,25 +1259,25 @@ void ImplementationRepository::Administration::activate_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1284,7 +1286,7 @@ void ImplementationRepository::Administration::activate_server (
         , ImplementationRepository::_tc_NotFound
 #endif /* TAO_HAS_INTERCEPTORS */
       },
-      
+
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc
@@ -1293,7 +1295,7 @@ void ImplementationRepository::Administration::activate_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1302,7 +1304,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -1326,27 +1328,27 @@ void ImplementationRepository::Administration::add_or_update_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1356,7 +1358,7 @@ void ImplementationRepository::Administration::add_or_update_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1365,7 +1367,7 @@ void ImplementationRepository::Administration::add_or_update_server (
       20,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata,
       1
@@ -1388,25 +1390,25 @@ void ImplementationRepository::Administration::remove_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1416,7 +1418,7 @@ void ImplementationRepository::Administration::remove_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1425,7 +1427,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -1448,25 +1450,25 @@ void ImplementationRepository::Administration::shutdown_server (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1476,7 +1478,7 @@ void ImplementationRepository::Administration::shutdown_server (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1485,7 +1487,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -1510,19 +1512,19 @@ void ImplementationRepository::Administration::server_is_running (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior (partial_ior);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1530,9 +1532,9 @@ void ImplementationRepository::Administration::server_is_running (
       &_tao_partial_ior,
       &_tao_server_object
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1542,7 +1544,7 @@ void ImplementationRepository::Administration::server_is_running (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1551,7 +1553,7 @@ void ImplementationRepository::Administration::server_is_running (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
       1
@@ -1574,25 +1576,25 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-  
+
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -1602,7 +1604,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 #endif /* TAO_HAS_INTERCEPTORS */
       }
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1611,7 +1613,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
       23,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
       1
@@ -1634,25 +1636,25 @@ void ImplementationRepository::Administration::find (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_info
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1661,7 +1663,7 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1681,19 +1683,19 @@ void ImplementationRepository::Administration::list (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1701,7 +1703,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1710,7 +1712,7 @@ void ImplementationRepository::Administration::list (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1729,25 +1731,25 @@ void ImplementationRepository::Administration::shutdown (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators (activators);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers (servers);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_activators,
       &_tao_servers
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1757,7 +1759,7 @@ void ImplementationRepository::Administration::shutdown (
       this->the_TAO_Administration_Proxy_Broker_,
       TAO::TAO_ONEWAY_INVOCATION
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1781,12 +1783,12 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void 
+void
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
     static_cast<Administration *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::Administration_ptr
@@ -1822,18 +1824,18 @@ ImplementationRepository::Administration::_unchecked_narrow (
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::Administration::_tao_release (Administration_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1857,7 +1859,7 @@ ImplementationRepository::Administration::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1884,7 +1886,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/Administration:1.0",
     "Administration");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_Administration =
@@ -1893,7 +1895,7 @@ namespace ImplementationRepository
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1905,12 +1907,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -1921,7 +1923,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -1981,7 +1983,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1993,12 +1995,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -2009,7 +2011,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -2069,7 +2071,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2081,12 +2083,12 @@ namespace TAO
     )
   {
     ::CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -2097,7 +2099,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -2157,7 +2159,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2215,7 +2217,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2298,11 +2300,11 @@ void operator<<= (
     TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
         _tao_any,
         ImplementationRepository::_tc_ActivationMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2360,7 +2362,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2418,7 +2420,7 @@ void operator<<= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2497,8 +2499,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -2510,7 +2512,7 @@ namespace ImplementationRepository
       ServerInformationIterator::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -2525,7 +2527,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -2609,8 +2611,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -2622,7 +2624,7 @@ namespace ImplementationRepository
       Administration::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -2637,7 +2639,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -2808,22 +2810,7 @@ operator>>= (
     const ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -2831,40 +2818,7 @@ operator>>= (
     ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
@@ -2881,12 +2835,12 @@ operator>>= (
 {
   ::CORBA::ULong _tao_temp = 0;
   ::CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -2957,22 +2911,7 @@ operator>>= (
     const ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -2980,40 +2919,7 @@ operator>>= (
     ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
@@ -3036,21 +2942,21 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -3072,20 +2978,22 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index 137f4f1e20e..2c2b4bd4478 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "imr_client_export.h"
+#include "tao/ImR_Client/imr_client_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -60,7 +60,9 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
-// TAO_IDL - Generated from 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -74,30 +76,30 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-  
+
   class TAO_IMR_Client_Export AlreadyRegistered : public ::CORBA::UserException
   {
   public:
-    
+
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static AlreadyRegistered *_downcast ( ::CORBA::Exception *);
     static const AlreadyRegistered *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -106,46 +108,46 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-  
+
   class TAO_IMR_Client_Export CannotActivate : public ::CORBA::UserException
   {
   public:
-    
-    TAO_String_Manager reason;
+
+    TAO::String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static CannotActivate *_downcast ( ::CORBA::Exception *);
     static const CannotActivate *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -154,52 +156,52 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     CannotActivate (
         const char * _tao_reason
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-  
+
   class TAO_IMR_Client_Export NotFound : public ::CORBA::UserException
   {
   public:
-    
+
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotFound *_downcast ( ::CORBA::Exception *);
     static const NotFound *_downcast ( ::CORBA::Exception const *);
-    
+
     static ::CORBA::Exception *_alloc (void);
-    
+
     virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -208,83 +210,80 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct EnvironmentVariable;
-  
+
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
-  
+
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager value;
+    TAO::String_Manager name;
+    TAO::String_Manager value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
+
   class EnvironmentList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        EnvironmentList,
-        EnvironmentVariable
+        EnvironmentList
       >
     EnvironmentList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        EnvironmentList,
-        EnvironmentList_var,
-        EnvironmentVariable
+        EnvironmentList
       >
     EnvironmentList_out;
-  
+
   class TAO_IMR_Client_Export EnvironmentList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             EnvironmentVariable
           >
   {
@@ -294,27 +293,27 @@ namespace ImplementationRepository
     EnvironmentList (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        EnvironmentVariable* buffer, 
-        ::CORBA::Boolean release = 0
+        EnvironmentVariable* buffer,
+        ::CORBA::Boolean release = false
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ActivationMode
   {
     NORMAL,
@@ -322,115 +321,112 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-  
+
   typedef ActivationMode &ActivationMode_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct StartupOptions;
-  
+
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
-  
+
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager command_line;
+    TAO::String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
-    TAO_String_Manager working_directory;
+    TAO::String_Manager working_directory;
     ImplementationRepository::ActivationMode activation;
-    TAO_String_Manager activator;
+    TAO::String_Manager activator;
     ::CORBA::Long start_limit;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ServerInformation;
-  
+
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
-  
+
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_IMR_Client_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
-    TAO_String_Manager server;
+    TAO::String_Manager server;
     ImplementationRepository::StartupOptions startup;
-    TAO_String_Manager partial_ior;
+    TAO::String_Manager partial_ior;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
+
   class ServerInformationList;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ServerInformationList,
-        ServerInformation
+        ServerInformationList
       >
     ServerInformationList_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ServerInformationList,
-        ServerInformationList_var,
-        ServerInformation
+        ServerInformationList
       >
     ServerInformationList_out;
-  
+
   class TAO_IMR_Client_Export ServerInformationList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ServerInformation
           >
   {
@@ -440,39 +436,39 @@ namespace ImplementationRepository
     ServerInformationList (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ServerInformation* buffer, 
-        ::CORBA::Boolean release = 0
+        ServerInformation* buffer,
+        ::CORBA::Boolean release = false
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
-  
+
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -480,13 +476,13 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-  
+
   class TAO_IMR_Client_Export ServerInformationIterator
     : public virtual ::CORBA::Object
   {
@@ -494,32 +490,32 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-    
+
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-    
+
     static void _tao_release (ServerInformationIterator_ptr obj);
-    
+
     static ServerInformationIterator_ptr _narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _nil (void)
     {
       return static_cast<ServerInformationIterator_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
@@ -528,44 +524,44 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ServerInformationIterator (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ServerInformationIterator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ServerInformationIterator (
         TAO_Stub *objref,
@@ -573,38 +569,38 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ServerInformationIterator (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerInformationIterator (const ServerInformationIterator &);
-    
+
     void operator= (const ServerInformationIterator &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
-  
+
   class Administration;
   typedef Administration *Administration_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -612,13 +608,13 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-  
+
   class TAO_IMR_Client_Export Administration
     : public virtual ::CORBA::Object
   {
@@ -626,32 +622,32 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-    
+
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-    
+
     static void _tao_release (Administration_ptr obj);
-    
+
     static Administration_ptr _narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _nil (void)
     {
       return static_cast<Administration_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -661,10 +657,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_or_update_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -674,10 +670,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -686,10 +682,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -698,10 +694,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -712,10 +708,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -724,10 +720,10 @@ namespace ImplementationRepository
         ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -736,10 +732,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -749,10 +745,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown (
         ::CORBA::Boolean activators,
         ::CORBA::Boolean servers
@@ -761,34 +757,34 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Administration (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Administration (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Administration (
         TAO_Stub *objref,
@@ -796,21 +792,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Administration (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Administration (const Administration &);
-    
+
     void operator= (const Administration &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
 
 // TAO_IDL - Generated from
@@ -844,7 +840,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_
-  
+
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
   {
@@ -865,7 +861,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_
-  
+
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
   {
@@ -1090,8 +1086,10 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "tao/ImR_Client/ImplRepoC.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
index 3ed7c4ecff0..622ec12097e 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
@@ -39,7 +41,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,7 +57,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
 }
@@ -75,7 +77,7 @@ ImplementationRepository::Administration::Administration (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -91,9 +93,11 @@ ImplementationRepository::Administration::Administration (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Administration_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 7f2910a0dbf..effee70d815 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_IMPLREPOS_CPP_
 
 
-#include "ImplRepoS.h"
+#include "tao/ImR_Client/ImplRepoS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
@@ -70,6 +70,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -3104,5 +3106,7 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ifndef */
 
diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h
index 826a4ce7455..6978c642426 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 #include "tao/ImR_Client/ServerObjectS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -47,6 +47,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_ImplementationRepository
 {
   
@@ -718,7 +720,7 @@ namespace POA_ImplementationRepository
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp
index 8aa0505c7e2..dd319af924a 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectC.cpp
@@ -33,7 +33,7 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ServerObjectC.h"
+#include "tao/ImR_Client/ServerObjectC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -44,12 +44,14 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ServerObjectC.inl"
+#include "tao/ImR_Client/ServerObjectC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -74,7 +76,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
     ImplementationRepository::ServerObject_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 ImplementationRepository::ServerObject_ptr
@@ -93,7 +95,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -110,21 +112,21 @@ void ImplementationRepository::ServerObject::ping (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -133,7 +135,7 @@ void ImplementationRepository::ServerObject::ping (
       4,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -150,21 +152,21 @@ void ImplementationRepository::ServerObject::shutdown (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -174,7 +176,7 @@ void ImplementationRepository::ServerObject::shutdown (
       this->the_TAO_ServerObject_Proxy_Broker_,
       TAO::TAO_ONEWAY_INVOCATION
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -198,12 +200,12 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *_tao_tmp_pointer =
     static_cast<ServerObject *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerObject_ptr
@@ -239,18 +241,18 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 ImplementationRepository::ServerObject::_tao_release (ServerObject_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -274,7 +276,7 @@ ImplementationRepository::ServerObject::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -301,7 +303,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerObject:1.0",
     "ServerObject");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerObject =
@@ -330,8 +332,8 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -343,7 +345,7 @@ namespace ImplementationRepository
       ServerObject::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -358,7 +360,7 @@ namespace ImplementationRepository
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -440,20 +442,22 @@ operator>>= (
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
index 7cdd3ddebc6..5458d8ed88c 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.h
+++ b/TAO/tao/ImR_Client/ServerObjectC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "imr_client_export.h"
+#include "tao/ImR_Client/imr_client_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -53,6 +53,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -274,8 +276,10 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ServerObjectC.inl"
+#include "tao/ImR_Client/ServerObjectC.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl
index 8cc38b5b2e0..28ca1902482 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.inl
+++ b/TAO/tao/ImR_Client/ServerObjectC.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -39,7 +40,7 @@ ImplementationRepository::ServerObject::ServerObject (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,9 +56,11 @@ ImplementationRepository::ServerObject::ServerObject (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ServerObject_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index e85dff9426d..e8e9f8bc894 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_SERVEROBJECTS_CPP_
 
 
-#include "ServerObjectS.h"
+#include "tao/ImR_Client/ServerObjectS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
@@ -65,6 +65,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -996,5 +998,7 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ifndef */
 
diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h
index f9f7c790be4..06fabb5401b 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.h
+++ b/TAO/tao/ImR_Client/ServerObjectS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ServerObjectC.h"
+#include "tao/ImR_Client/ServerObjectC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,6 +46,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_ImplementationRepository
 {
   
@@ -263,7 +265,7 @@ namespace POA_ImplementationRepository
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index 1899c8afe02..8e777df8a31 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#include "tao/orbconf.h"
-
 #include "tao/ImR_Client/ServerObject_i.h"
 #include "tao/PortableServer/Root_POA.h"
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
                                 PortableServer::POA_ptr poa)
@@ -36,3 +37,5 @@ ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index 9ec22271d12..a397952aab6 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -1,15 +1,18 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    ServerObject_i.h
  *
  *  $Id$
  *
- *  @author  Darrell Brunsch and Irfan Pyarali
+ *  @author  Darrell Brunsch
+ *  @author  Irfan Pyarali
  */
 // ===================================================================
 
-#ifndef TAO_IMPLREPO_I_H
-#define TAO_IMPLREPO_I_H
+#ifndef TAO_SERVEROBJECT_I_H
+#define TAO_SERVEROBJECT_I_H
 
 #include /**/ "ace/pre.h"
 
@@ -22,6 +25,8 @@
 #include "tao/ImR_Client/ServerObjectS.h"
 #include "tao/ImR_Client/imr_client_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ServerObject_i
  *
@@ -59,6 +64,8 @@ protected:
   PortableServer::POA_var poa_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
-#endif /* TAO_IMPLREPO_I_H */
+#endif /* TAO_SERVEROBJECT_I_H */
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 61999fb1a11..979aa167918 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -1,12 +1,12 @@
-#include "Incoming_Message_Queue.h"
-#include "debug.h"
+#include "tao/Incoming_Message_Queue.h"
+#include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Malloc_Base.h"
 
 
 #if !defined (__ACE_INLINE__)
-# include "Incoming_Message_Queue.inl"
+# include "tao/Incoming_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
            Incoming_Message_Queue,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
   : last_added_ (0),
     size_ (0),
@@ -23,10 +25,10 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
 
 TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
 {
-  const int sz = this->size_;
+  const CORBA::ULong sz = this->size_;
 
   // Delete all the nodes left behind
-  for (int i = 0;
+  for (CORBA::ULong i = 0;
        i < sz;
        ++i)
     {
@@ -35,35 +37,6 @@ TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
     }
 }
 
-size_t
-TAO_Incoming_Message_Queue::copy_tail (ACE_Message_Block &block)
-{
-  // The size of message that is copied
-  size_t n = 0;
-
-  if (this->size_ > 0)
-    {
-      // Check to see if the length of the incoming block is less than
-      // that of the <missing_data_> of the tail.
-      if ((CORBA::Long)block.length () < this->last_added_->missing_data_)
-        {
-          n = block.length ();
-        }
-      else
-        {
-          n = this->last_added_->missing_data_;
-        }
-
-      // Do the copy
-      this->last_added_->msg_block_->copy (block.rd_ptr (),
-                                            n);
-
-      // Decerement the missing data
-      this->last_added_->missing_data_ -= n;
-    }
-
-  return n;
-}
 
 TAO_Queued_Data *
 TAO_Incoming_Message_Queue::dequeue_head (void)
@@ -72,7 +45,7 @@ TAO_Incoming_Message_Queue::dequeue_head (void)
     return 0;
 
   // Get the node on the head of the queue...
-  TAO_Queued_Data *head = this->last_added_->next_;
+  TAO_Queued_Data * const head = this->last_added_->next_;
 
   // Reset the head node..
   this->last_added_->next_ = head->next_;
@@ -133,90 +106,43 @@ TAO_Incoming_Message_Queue::enqueue_tail (TAO_Queued_Data *nd)
   return 0;
 }
 
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::Octet major,
-                                                 CORBA::Octet minor) const
-{
-  TAO_Queued_Data *found = 0;
-  if (this->last_added_ != 0)
-    {
-      TAO_Queued_Data *qd = this->last_added_->next_;
-
-      do {
-        if (qd->more_fragments_ &&
-            qd->major_version_ == major && qd->minor_version_ == minor)
-          {
-            found = qd;
-          }
-        else
-          {
-            qd = qd->next_;
-          }
-      } while (found == 0 && qd != this->last_added_->next_);
-    }
-
-  return found;
-}
-
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::ULong request_id) const
-{
-  TAO_Queued_Data *found = 0;
-  if (this->last_added_ != 0)
-    {
-      TAO_Queued_Data *qd = this->last_added_->next_;
-
-      do {
-        if (qd->more_fragments_ && qd->request_id_ == request_id)
-          {
-            found = qd;
-          }
-        else
-          {
-            qd = qd->next_;
-          }
-      } while (found == 0 && qd != this->last_added_->next_);
-    }
-
-  return found;
-}
-
 
 /************************************************************************/
 // Methods  for TAO_Queued_Data
 /************************************************************************/
 
 /*!
-  \brief Allocate and return a new empty message block of size \a new_size mimicking parameters of \a mb.
-
-  This function allocates a new aligned message block using the same
-  allocators and flags as found in \a mb.  The size of the new message
-  block is at least \a new_size; the size may be adjusted up in order
-  to accomodate alignment requirements and still fit \a new_size bytes
-  into the aligned buffer.
-
-  \param mb message block whose parameters should be mimicked
-  \param new_size size of the new message block (will be adjusted for proper alignment)
-  \return an aligned message block with rd_ptr sitting at correct alignment spot, 0 on failure
-
-  \author Thanks to Rich Seibel for helping implement the public API for ACE_Message_Block!
+ * @brief Allocate and return a new empty message block of size \a span_size
+ * mimicking parameters of \a mb.
+ *
+ * This function allocates a new aligned message block using the same
+ * allocators and flags as found in \a mb.  The size of the new message
+ * block is at least \a span_size; the size may be adjusted up in order
+ * to accomodate alignment requirements and still fit \a span_size bytes
+ * into the aligned buffer.
+ *
+ * @param mb message block whose parameters should be mimicked
+ * @param span_size size of the new message block (will be adjusted for proper
+ * alignment)
+ * @return an aligned message block with rd_ptr sitting at correct
+ * alignment spot, 0 on failure
  */
 static ACE_Message_Block*
 clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
 {
   // Calculate the required size of the cloned block with alignment
-  size_t aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
+  size_t const aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
 
   // Get the allocators
-  ACE_Allocator *data_allocator;
-  ACE_Allocator *data_block_allocator;
-  ACE_Allocator *message_block_allocator;
+  ACE_Allocator *data_allocator = 0;
+  ACE_Allocator *data_block_allocator = 0;
+  ACE_Allocator *message_block_allocator = 0;
   mb->access_allocators (data_allocator,
                          data_block_allocator,
                          message_block_allocator);
 
   // Create a new Message Block
-  ACE_Message_Block *nb;
+  ACE_Message_Block *nb = 0;
   ACE_NEW_MALLOC_RETURN (nb,
                          static_cast<ACE_Message_Block*> (
                                          message_block_allocator->malloc (
@@ -247,11 +173,10 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
 TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc)
   : msg_block_ (0),
     missing_data_ (0),
-    byte_order_ (0),
     major_version_ (0),
     minor_version_ (0),
+    byte_order_ (0),
     more_fragments_ (0),
-    request_id_ (0),
     msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
     next_ (0),
     allocator_ (alloc)
@@ -262,11 +187,10 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb,
                                   ACE_Allocator *alloc)
   : msg_block_ (mb),
     missing_data_ (0),
-    byte_order_ (0),
     major_version_ (0),
     minor_version_ (0),
+    byte_order_ (0),
     more_fragments_ (0),
-    request_id_ (0),
     msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
     next_ (0),
     allocator_ (alloc)
@@ -276,11 +200,10 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb,
 TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd)
   : msg_block_ (qd.msg_block_->duplicate ()),
     missing_data_ (qd.missing_data_),
-    byte_order_ (qd.byte_order_),
     major_version_ (qd.major_version_),
     minor_version_ (qd.minor_version_),
+    byte_order_ (qd.byte_order_),
     more_fragments_ (qd.more_fragments_),
-    request_id_ (qd.request_id_),
     msg_type_ (qd.msg_type_),
     next_ (0),
     allocator_ (qd.allocator_)
@@ -397,7 +320,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
   return qd;
 }
 
-void
+int
 TAO_Queued_Data::consolidate (void)
 {
   // Is this a chain of fragments?
@@ -408,6 +331,15 @@ TAO_Queued_Data::consolidate (void)
                                       this->msg_block_,
                                       this->msg_block_->total_length ());
 
+      if (0 == dest)
+        {
+          // out of memory
+          return -1;
+        }
+      // Memory allocation succeeded, the new message block can hold the consolidated
+      // message. The following code just copies all the data into this new message block.
+      // No further memory allocation will take place.
+
       // Reset the cont() parameter.  We have cloned the message
       // block but not the chain as we will no longer have chain.
       dest->cont (0);
@@ -422,5 +354,8 @@ TAO_Queued_Data::consolidate (void)
       this->msg_block_ = dest;
       this->more_fragments_ = 0;
     }
+
+  return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index c5ca740eb13..18d324dd349 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -22,8 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/// Forward declarations
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Queued_Data;
 class TAO_Transport;
@@ -66,63 +70,9 @@ public:
   TAO_Queued_Data *dequeue_tail (void);
   int enqueue_tail (TAO_Queued_Data *nd);
 
-  /// Copy message from @a block to the tail of the queue. The size
-  /// of message that is copied to the tail node is returned. The
-  /// number of bytes copied depends on the amount of bytes needed to
-  /// make the tail node consistent.
-  size_t copy_tail (ACE_Message_Block &block);
-
   /// Return the length of the queue..
   CORBA::ULong queue_length (void);
 
-  /*!
-    @name Node Inspection Predicates
-
-    \brief These methods allow inspection of head and tail nodes for "completeness".
-
-    These methods check to see whether the node on the head or tail is
-    "complete" and ready for further processing.  See each method's
-    documentation for its definition of "complete".
-  */
-  //@{
-  /*!
-    "complete" == the GIOP message at the tail is not missing any data (it may be a complete GIOP Fragment, though)
-
-    \retval -1 queue is empty
-    \retval 0  tail is not "complete"
-    \retval 1  tail is "complete"
-  */
-  int is_tail_complete (void);
-
-  /*!
-
-    "complete" == the GIOP message at the head is not missing any data
-    AND, if it's the first message in a series of GIOP fragments, all
-    the fragments have been received, parsed, and placed into the
-    queue
-
-    \retval -1 if queue is empty
-    \retval 0  if head is not "complete"
-    \retval 1  if head is "complete"
-   */
-  int is_head_complete (void);
-  //@}
-
-  /*!
-    \brief Check to see if the message at the tail (complete or incomplete) is a GIOP Fragment.
-   */
-  int is_tail_fragmented (void);
-
-  /// Return the size of data that is missing in tail of the queue.
-  size_t missing_data_tail (void) const;
-
-  /// Find the first fragment that matches the GIOP version
-  TAO_Queued_Data *find_fragment_chain (CORBA::Octet major,
-                                        CORBA::Octet minor) const;
-
-  /// Find the first fragment that matches the request id
-  TAO_Queued_Data *find_fragment_chain (CORBA::ULong request_id) const;
-
 private:
 
   friend class TAO_Transport;
@@ -144,6 +94,10 @@ private:
   TAO_ORB_Core *orb_core_;
 };
 
+/// Constant value indicating that the correct value is unknown yet, 
+/// probably parsing the header failed due to insufficient data in buffer.
+const size_t TAO_MISSING_DATA_UNDEFINED = ~((size_t) 0); // MAX_SIZE_T
+
 /************************************************************************/
 
 /**
@@ -185,9 +139,11 @@ public:
   static TAO_Queued_Data* duplicate (TAO_Queued_Data &qd);
 
   /// Consolidate this fragments chained message blocks into one.
-  void consolidate (void);
+  /// @return -1 if consolidation failed, eg out or memory, otherwise 0
+  int consolidate (void);
 
 public:
+  
   /// The message block that contains the message.
   ACE_Message_Block *msg_block_;
 
@@ -198,28 +154,27 @@ public:
     data missing from \a msg_block_.
    */
   //@{
-  /*! Data missing in the above message that hasn't been read or processed yet. */
-  CORBA::Long missing_data_;
+  /*! Data missing in the above message that hasn't been read or processed yet, 
+      the value TAO_MISSING_DATA_UNDEFINED indicates it hasn't been processed yet, 
+      otherwise greater or equal zero. */
+  size_t missing_data_;
   //@}
 
-  /// The byte order of the message that is stored in the node.
-  CORBA::Octet byte_order_;
-
   /// Many protocols like GIOP have a major and minor version
   /// information that would be needed to read and decipher the
   /// message.
   CORBA::Octet major_version_;
   CORBA::Octet minor_version_;
 
+  /// The byte order of the message that is stored in the node.
+  CORBA::Octet byte_order_;
+
   /// Some messages can be fragmented by the protocol (this is an ORB
   /// level fragmentation on top of the TCP/IP fragmentation. This
   /// member indicates whether the message that we have recd. and
   /// queue already has more fragments that is missing..
   CORBA::Octet more_fragments_;
 
-  /// The fragment request id
-  CORBA::ULong request_id_;
-
   /// The message type of the message
   TAO_Pluggable_Message_Type msg_type_;
 
@@ -237,9 +192,10 @@ private:
   ACE_Allocator *allocator_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "Incoming_Message_Queue.inl"
+# include "tao/Incoming_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
index 99bcb4978d3..108a4ddbab9 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 //$Id$
-// -*- C++ -*-
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /************************************************************************/
 // Methods for TAO_Incoming_Message_Queue
 /************************************************************************/
@@ -10,57 +13,6 @@ TAO_Incoming_Message_Queue::queue_length (void)
   return this->size_;
 }
 
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_tail_complete (void)
-{
-  // If the size is 0 return -1
-  if (this->size_ == 0)
-    return -1;
-
-  if (this->size_ &&
-      this->last_added_->missing_data_ == 0)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_head_complete (void)
-{
-  if (this->size_ == 0)
-    return -1;
-
-  if (this->size_  &&
-      this->last_added_->next_->missing_data_ == 0 &&
-      !this->last_added_->next_->more_fragments_)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_tail_fragmented (void)
-{
-  if (this->size_ == 0)
-    return 0;
-
-  if (this->size_  &&
-      this->last_added_->more_fragments_)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE size_t
-TAO_Incoming_Message_Queue::missing_data_tail (void) const
-{
-  if (this->size_ != 0)
-    return this->last_added_->missing_data_;
-
-  return 0;
-}
-
-
 /************************************************************************/
 // Methods  for TAO_Queued_Data
 /************************************************************************/
@@ -69,7 +21,7 @@ TAO_Incoming_Message_Queue::missing_data_tail (void) const
 ACE_INLINE void
 TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb)
 {
-  size_t newsize =
+  size_t const newsize =
     ACE_CDR::total_length (&mb, 0) + ACE_CDR::MAX_ALIGNMENT;
 
   ACE_Data_Block *db =
@@ -90,3 +42,5 @@ TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb)
   // Remove the DONT_DELETE flags from mb
   mb.clr_self_flags (ACE_Message_Block::DONT_DELETE);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 98ec2a02f51..612b6bbbb18 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -1,17 +1,17 @@
 //$Id$
 
-#include "Invocation_Adapter.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "Stub.h"
-#include "ORB_Core.h"
-#include "Synch_Invocation.h"
-#include "debug.h"
-#include "Collocated_Invocation.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "Collocation_Proxy_Broker.h"
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/operation_details.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Core.h"
+#include "tao/Synch_Invocation.h"
+#include "tao/debug.h"
+#include "tao/Collocated_Invocation.h"
+#include "tao/Transport.h"
+#include "tao/Transport_Mux_Strategy.h"
+#include "tao/Collocation_Proxy_Broker.h"
+#include "tao/GIOP_Utils.h"
 #if !defined (__ACE_INLINE__)
 # include "tao/Invocation_Adapter.inl"
 #endif /* __ACE_INLINE__ */
@@ -21,6 +21,8 @@ ACE_RCSID (tao,
            Invocation_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Invocation_Adapter::~Invocation_Adapter (void)
@@ -189,8 +191,16 @@ namespace TAO
         effective_target =
             coll_inv.steal_forwarded_reference ();
 
+#if TAO_HAS_INTERCEPTORS == 1
+        const bool is_permanent_forward =
+            (coll_inv.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM);
+#else
+        const bool is_permanent_forward = false;
+#endif
+
         (void) this->object_forwarded (effective_target,
-                                       stub
+                                       stub,
+                                       is_permanent_forward
                                        ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -266,8 +276,6 @@ namespace TAO
     // Update the request id now that we have a transport
     details.request_id (resolver.transport ()->tms ()->request_id ());
 
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
     if (this->type_ == TAO_ONEWAY_INVOCATION)
       {
         return this->invoke_oneway (details,
@@ -285,7 +293,7 @@ namespace TAO
                                     ACE_ENV_ARG_PARAMETER);
       }
 
-    return s;
+    return TAO_INVOKE_FAILURE;
   }
 
   Invocation_Status
@@ -322,8 +330,16 @@ namespace TAO
         effective_target =
           synch.steal_forwarded_reference ();
 
+#if TAO_HAS_INTERCEPTORS == 1
+        const bool is_permanent_forward =
+            (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM);
+#else
+        const bool is_permanent_forward = false;
+#endif
+
         this->object_forwarded (effective_target,
-                                r.stub ()
+                                r.stub (),
+                                is_permanent_forward
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -353,8 +369,15 @@ namespace TAO
         effective_target =
           synch.steal_forwarded_reference ();
 
+#if TAO_HAS_INTERCEPTORS == 1
+        const bool is_permanent_forward =
+            (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM);
+#else
+        const bool is_permanent_forward = false;
+#endif
         this->object_forwarded (effective_target,
-                                r.stub ()
+                                r.stub (),
+                                is_permanent_forward
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -364,7 +387,8 @@ namespace TAO
 
   void
   Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
-                                        TAO_Stub *stub
+                                        TAO_Stub *stub,
+                                        CORBA::Boolean permanent_forward
                                         ACE_ENV_ARG_DECL)
   {
     // The object pointer has to be changed to a TAO_Stub pointer
@@ -381,7 +405,7 @@ namespace TAO
 
 
     // Reset the profile in the stubs
-    stub->add_forward_profiles (stubobj->base_profiles ());
+    stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
     if (stub->next_profile () == 0)
       ACE_THROW (CORBA::TRANSIENT (
@@ -393,3 +417,5 @@ namespace TAO
     return;
   }
 } // End namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 66e3f223499..122c7da64a1 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -29,10 +29,14 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
-class TAO_Operation_Details;
-class TAO_Stub;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_Operation_Details;
+class TAO_Stub;
 
 namespace  CORBA
 {
@@ -231,7 +235,8 @@ namespace TAO
     /// Helper method that takes care of setting the profiles within
     /// the stub object if the target gets forwarded
     void object_forwarded (CORBA::Object_var &effective_target,
-                           TAO_Stub *stub
+                           TAO_Stub *stub,
+                           CORBA::Boolean permanent_forward
                            ACE_ENV_ARG_DECL);
 
     /// Helper method to set the response flags within @a details
@@ -278,6 +283,7 @@ namespace TAO
   };
 } // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Invocation_Adapter.inl"
diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl
index b27c3070466..3ee1410310c 100644
--- a/TAO/tao/Invocation_Adapter.inl
+++ b/TAO/tao/Invocation_Adapter.inl
@@ -1,5 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -12,7 +16,6 @@ namespace TAO
       Collocation_Proxy_Broker *p,
       Invocation_Type type,
       Invocation_Mode mode)
-
     : target_ (target)
     , args_ (args)
     , number_args_  (arg_number)
@@ -24,3 +27,5 @@ namespace TAO
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 61f210e8d08..dd2ab25d2cf 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -1,19 +1,19 @@
-#include "Invocation_Base.h"
-#include "Stub.h"
-#include "operation_details.h"
-#include "ORB_Core.h"
-#include "SystemException.h"
-#include "PortableInterceptor.h"  /* Must always be visible. */
+#include "tao/Invocation_Base.h"
+#include "tao/Stub.h"
+#include "tao/operation_details.h"
+#include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
+#include "tao/PortableInterceptor.h"  /* Must always be visible. */
 
 #include "ace/Dynamic_Service.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "PortableInterceptorC.h"
-# include "ClientRequestInterceptor_Adapter_Factory.h"
+# include "tao/PortableInterceptorC.h"
+# include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 #endif /* TAO_HAS_INTERCEPTORS == 1*/
 
 #if !defined (__ACE_INLINE__)
-# include "Invocation_Base.inl"
+# include "tao/Invocation_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -22,13 +22,16 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Invocation_Base::Invocation_Base (CORBA::Object_ptr ot,
                                     CORBA::Object_ptr t,
                                     TAO_Stub *stub,
                                     TAO_Operation_Details &details,
-                                    bool response_expected)
+                                    bool response_expected,
+                                    bool request_is_remote)
     : details_ (details)
     , forwarded_to_ (0)
     , response_expected_ (response_expected)
@@ -41,8 +44,12 @@ namespace TAO
     , stack_size_ (0)
     , invoke_status_ (TAO_INVOKE_START)
     , caught_exception_ (0)
+    , is_remote_request_ (request_is_remote)
 #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)
@@ -269,3 +276,5 @@ namespace TAO
   }
 #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 fafe93b6d1e..328127e9dc0 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -29,6 +29,8 @@
 #include "tao/ClientRequestInterceptor_Adapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Service_Context;
 class TAO_Operation_Details;
 class TAO_Stub;
@@ -125,7 +127,8 @@ namespace TAO
                      CORBA::Object_ptr target,
                      TAO_Stub *stub,
                      TAO_Operation_Details &op,
-                     bool response_expected);
+                     bool response_expected,
+                     bool request_is_remote);
 
   protected:
     /// The operation details on which we are operating on.
@@ -187,6 +190,11 @@ namespace TAO
 
     PortableInterceptor::ReplyStatus reply_status (void) const;
 
+    /// Accessor used to determine if the current invocation is part
+    /// of a remote request, and if not, it will be considered to be
+    /// part of a collocated request.
+    bool is_remote_request() const;
+
   protected:
     /// Helper method to invoke send_request interception call to all
     /// the registered interceptors.
@@ -223,13 +231,19 @@ namespace TAO
   private:
     /// Pointer to the caught exception.
     CORBA::Exception *caught_exception_;
+
+    /// Flag used to distinguish a remote invocation versus a collocated
+    /// (thru-poa) invocation.
+    bool is_remote_request_;
 #endif /*TAO_HAS_INTERCEPTORS*/
     //@}
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Invocation_Base.inl"
+# include "tao/Invocation_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
index fcdf1d95f41..c6a27ca28ab 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -1,5 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE TAO_ORB_Core *
@@ -80,7 +84,13 @@ namespace TAO
   {
     return this->invoke_status_;
   }
-#endif /*TAO_HAS_INTERCEPTORS*/
-
 
+  ACE_INLINE bool
+  Invocation_Base::is_remote_request (void) const
+  {
+    return this->is_remote_request_;
+  }
+#endif /* TAO_HAS_INTERCEPTORS */
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index f77b369c63a..bdb493bd648 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,22 +1,20 @@
-// -*- C++ -*-
 //$Id$
 #include "tao/Invocation_Endpoint_Selectors.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
 #include "tao/ORB_Core.h"
 #include "tao/IIOP_Endpoint.h"
-#include "Base_Transport_Property.h"
-#include "Profile_Transport_Resolver.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
+#include "tao/Base_Transport_Property.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            Invocation_Endpoint_Selectors,
            "$Id$")
 
-TAO_Invocation_Endpoint_Selector::TAO_Invocation_Endpoint_Selector (void)
-{
-}
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
 {
@@ -24,10 +22,6 @@ TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
 
 // ****************************************************************
 
-TAO_Default_Endpoint_Selector::TAO_Default_Endpoint_Selector (void)
-{
-}
-
 TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 {
 }
@@ -135,16 +129,16 @@ TAO_Default_Endpoint_Selector::select_endpoint (
       if (r->blocked_connect () ||
          (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
         {
-          const size_t endpoint_count =
+          size_t const endpoint_count =
             r->profile ()->endpoint_count ();
 
-          TAO_Endpoint *ep =
+          TAO_Endpoint * ep =
             r->profile ()->endpoint ();
 
           for (size_t i = 0; i < endpoint_count; ++i)
             {
               TAO_Base_Transport_Property desc (ep);
-              const bool retval =
+              bool const retval =
                 r->try_connect (&desc,
                                 max_wait_time
                                 ACE_ENV_ARG_PARAMETER);
@@ -166,3 +160,5 @@ TAO_Default_Endpoint_Selector::select_endpoint (
   ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
                                CORBA::COMPLETED_NO));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 776d6bc8411..29b5580d88a 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -17,16 +17,24 @@
 #define TAO_INVOCATION_ENDPOINT_SELECTOR_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
 
-class TAO_MProfile;
+#include "ace/CORBA_macros.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_MProfile;
 
 namespace TAO
 {
@@ -55,8 +63,6 @@ namespace CORBA
 class TAO_Export TAO_Invocation_Endpoint_Selector
 {
 public:
-  /// Constructor.
-  TAO_Invocation_Endpoint_Selector (void);
 
   /// Destructor.
   virtual ~TAO_Invocation_Endpoint_Selector (void);
@@ -82,12 +88,10 @@ public:
  * profile in the IOR.  If that doesn't work, try the next
  * profile, and so on.
  */
-class TAO_Export TAO_Default_Endpoint_Selector :
-  public TAO_Invocation_Endpoint_Selector
+class TAO_Export TAO_Default_Endpoint_Selector
+  : public TAO_Invocation_Endpoint_Selector
 {
 public:
-  /// Constructor.
-  TAO_Default_Endpoint_Selector (void);
 
   /// Destructor.
   virtual ~TAO_Default_Endpoint_Selector (void);
@@ -97,5 +101,8 @@ public:
                                 ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif  /* TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h
index 083f69cc0b1..9b8804ea690 100644
--- a/TAO/tao/Invocation_Utils.h
+++ b/TAO/tao/Invocation_Utils.h
@@ -21,6 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   enum Invocation_Status
@@ -67,5 +71,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_INVOCATION_UTILS_H */
diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp
index 492ed96e02a..4e73d328828 100644
--- a/TAO/tao/LF_CH_Event.cpp
+++ b/TAO/tao/LF_CH_Event.cpp
@@ -1,9 +1,11 @@
-#include "LF_CH_Event.h"
+#include "tao/LF_CH_Event.h"
 
 ACE_RCSID(tao,
           LF_Invocation_Event,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_CH_Event::TAO_LF_CH_Event (void)
   : TAO_LF_Event (),
     prev_state_ (TAO_LF_Event::LFS_IDLE)
@@ -94,9 +96,10 @@ TAO_LF_CH_Event::set_state (int new_state)
     }
 }
 
-
 int
 TAO_LF_CH_Event::is_state_final (void)
 {
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index af303857916..2a92f9007ab 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LF_Event.h"
+#include "tao/LF_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LF_CH_Event
  *
@@ -105,6 +107,8 @@ private:
   int prev_state_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_CH_EVENT_H */
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index 68873f5fe66..d1d71b550e3 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -1,15 +1,18 @@
-#include "LF_Connect_Strategy.h"
-#include "Connection_Handler.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "Transport.h"
-#include "ORB_Core.h"
+#include "tao/LF_Connect_Strategy.h"
+#include "tao/Connection_Handler.h"
+#include "tao/LF_Follower.h"
+#include "tao/Leader_Follower.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
 #include "ace/Synch_Options.h"
 
 ACE_RCSID(tao,
           LF_Connect_Strategy,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy (
     TAO_ORB_Core *orb_core)
   : TAO_Connect_Strategy (orb_core)
@@ -74,3 +77,5 @@ TAO_LF_Connect_Strategy::wait (TAO_Transport *transport,
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 5ca99679939..4cff8ed7976 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -15,15 +15,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Connect_Strategy.h"
+#include "tao/Connect_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Connector;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
 class ACE_Synch_Options;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Connector;
 
 /**
  * @class TAO_LF_Connect_Strategy
@@ -57,6 +62,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_LF_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index d3c5673b368..cc69d6fcea3 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -1,8 +1,8 @@
-// -*- C++ -*-
 // $Id$
-#include "LF_Event.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
+
+#include "tao/LF_Event.h"
+#include "tao/LF_Follower.h"
+#include "tao/Leader_Follower.h"
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            LF_Event,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Event::TAO_LF_Event (void)
   : state_ (TAO_LF_Event::LFS_IDLE)
   , follower_ (0)
@@ -39,9 +41,10 @@ TAO_LF_Event::state_changed (int new_state,
     }
 }
 
-
 void
 TAO_LF_Event::set_state (int new_state)
 {
   this->state_ = new_state;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 0a721b4cad4..678be63cb3c 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LF_Follower;
 class TAO_Leader_Follower;
 
@@ -139,8 +143,10 @@ protected:
   TAO_LF_Follower *follower_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "LF_Event.inl"
+# include "tao/LF_Event.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl
index d6509c68430..236c8ea69ac 100644
--- a/TAO/tao/LF_Event.inl
+++ b/TAO/tao/LF_Event.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_LF_Event::bind (TAO_LF_Follower *follower)
 {
@@ -30,3 +33,5 @@ TAO_LF_Event::keep_waiting (void)
 {
   return (this->successful () == 0) && (this->error_detected () == 0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp
index a9fdf03c2ad..27fc93c2c5e 100644
--- a/TAO/tao/LF_Event_Binder.cpp
+++ b/TAO/tao/LF_Event_Binder.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event_Binder.h"
@@ -7,11 +6,15 @@
 # include "tao/LF_Event_Binder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           LF_Event_Binder, 
+ACE_RCSID (tao,
+           LF_Event_Binder,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void)
 {
   this->event_->unbind ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index 7dea4a58f61..f6dcac517ef 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LF_Follower;
 
 /**
@@ -41,9 +43,11 @@ public:
 
 private:
   /// Keep a reference to the leader follower
-  TAO_LF_Event *event_;
+  TAO_LF_Event * const event_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Event_Binder.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Event_Binder.inl b/TAO/tao/LF_Event_Binder.inl
index 12389b6c8cb..14027194f35 100644
--- a/TAO/tao/LF_Event_Binder.inl
+++ b/TAO/tao/LF_Event_Binder.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event,
                                           TAO_LF_Follower *follower)
@@ -8,4 +12,4 @@ TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event,
   this->event_->bind (follower);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
index 42e295f27ed..7fa8bc352b6 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event_Loop_Thread_Helper.h"
@@ -7,6 +6,6 @@
 # include "tao/LF_Event_Loop_Thread_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           LF_Event_Loop_Thread_Helper, 
+ACE_RCSID (tao,
+           LF_Event_Loop_Thread_Helper,
            "$Id$")
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h
index c51bf5495a8..3d5dfd95581 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @brief Helper class to enter and exit the Leader/Followers event
  * loop.
@@ -54,6 +56,8 @@ private:
   int event_loop_return_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Event_Loop_Thread_Helper.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
index 62b5eada2d5..2fd8c6d98e7 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
@@ -2,13 +2,15 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-TAO_LF_Event_Loop_Thread_Helper::
-    TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Follower &leader_follower,
-                                     TAO_LF_Strategy &lf_strategy,
-                                     ACE_Time_Value *max_wait_time)
-      : leader_follower_ (leader_follower)
-      , lf_strategy_ (lf_strategy)
+TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper (
+  TAO_Leader_Follower &leader_follower,
+  TAO_LF_Strategy &lf_strategy,
+  ACE_Time_Value *max_wait_time)
+  : leader_follower_ (leader_follower)
+  , lf_strategy_ (lf_strategy)
 {
   this->event_loop_return_ =
     this->lf_strategy_.set_event_loop_thread (max_wait_time, leader_follower_);
@@ -27,3 +29,5 @@ TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const
 {
   return this->event_loop_return_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp
index ccf7ca522f1..9e9cba91522 100644
--- a/TAO/tao/LF_Follower.cpp
+++ b/TAO/tao/LF_Follower.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower.h"
@@ -12,6 +11,8 @@ ACE_RCSID (tao,
            LF_Follower,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower)
   : leader_follower_ (leader_follower)
   , condition_ (leader_follower.lock ())
@@ -37,3 +38,4 @@ TAO_LF_Follower::signal (void)
   return this->condition_.signal ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h
index efd4a0ccbf0..b6dc6583cba 100644
--- a/TAO/tao/LF_Follower.h
+++ b/TAO/tao/LF_Follower.h
@@ -14,16 +14,21 @@
 #define TAO_LF_FOLLOWER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Intrusive_List_Node.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Synch_Traits.h"
+#include "ace/Intrusive_List_Node.h"
 
-#include "tao/TAO_Export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Leader_Follower;
 
@@ -37,7 +42,7 @@ class TAO_Leader_Follower;
  * loop should be implemented by this class.
  *
  */
-class TAO_Export TAO_LF_Follower 
+class TAO_Export TAO_LF_Follower
   : public ACE_Intrusive_List_Node<TAO_LF_Follower>
 {
 public:
@@ -64,6 +69,8 @@ private:
   ACE_SYNCH_CONDITION condition_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Follower.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl
index b7e612b94ee..8e88e259759 100644
--- a/TAO/tao/LF_Follower.inl
+++ b/TAO/tao/LF_Follower.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Leader_Follower &
 TAO_LF_Follower::leader_follower (void)
 {
@@ -11,3 +15,5 @@ TAO_LF_Follower::wait (ACE_Time_Value *tv)
 {
   return this->condition_.wait (tv);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp
index 99659ea63b9..4798d5c34c7 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ b/TAO/tao/LF_Follower_Auto_Adder.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower_Auto_Adder.h"
@@ -7,11 +6,15 @@
 # include "tao/LF_Follower_Auto_Adder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           LF_Follower_Auto_Adder, 
+ACE_RCSID (tao,
+           LF_Follower_Auto_Adder,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void)
 {
   this->leader_follower_.remove_follower (this->follower_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
index 468bec0c1d0..f1161f6b14f 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -23,6 +23,8 @@
 
 #include "tao/Leader_Follower.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @brief Implement an auto_adder-like class for the TAO_LF_Followers
  * allocated via a TAO_Leader_Follower set.
@@ -47,6 +49,8 @@ private:
   TAO_LF_Follower *follower_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Follower_Auto_Adder.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl
index 62817754d77..0fa419366d0 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.inl
+++ b/TAO/tao/LF_Follower_Auto_Adder.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_LF_Follower_Auto_Adder::
     TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &lf,
@@ -9,3 +13,5 @@ TAO_LF_Follower_Auto_Adder::
 {
   (void) this->leader_follower_.add_follower (this->follower_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp
index df1c8f51980..7152175eb48 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.cpp
+++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower_Auto_Ptr.h"
@@ -7,11 +6,15 @@
 # include "tao/LF_Follower_Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           LF_Follower_Auto_Ptr, 
+ACE_RCSID (tao,
+           LF_Follower_Auto_Ptr,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void)
 {
   this->leader_follower_.release_follower (this->follower_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h
index b1b13f5499b..52c2aae3411 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.h
+++ b/TAO/tao/LF_Follower_Auto_Ptr.h
@@ -23,6 +23,8 @@
 
 #include "tao/Leader_Follower.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @brief Implement an auto_ptr-like class for the TAO_LF_Followers
  * allocated via a TAO_Leader_Follower set.
@@ -51,6 +53,8 @@ private:
   TAO_LF_Follower *follower_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Follower_Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl
index 43deadfca37..8d933799401 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.inl
+++ b/TAO/tao/LF_Follower_Auto_Ptr.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf)
   : leader_follower_ (lf)
@@ -24,3 +28,5 @@ TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void)
 {
   return this->follower_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
index 5dcd5a60402..fc42ec084fc 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -1,10 +1,12 @@
 // -*- C++ -*-
-#include "LF_Invocation_Event.h"
+#include "tao/LF_Invocation_Event.h"
 
 ACE_RCSID(tao,
           LF_Invocation_Event,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void)
   : TAO_LF_Event ()
 {
@@ -86,3 +88,5 @@ TAO_LF_Invocation_Event::is_state_final (void)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
index 98a836f5506..a3db772d40d 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "LF_Event.h"
+#include "tao/LF_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LF_Invocation_Event
  *
@@ -77,6 +79,8 @@ private:
   int is_state_final (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_INVOCATION_EVENT_H */
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
index 2deb35e08eb..8c30e4b4e96 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Strategy.h"
@@ -7,6 +6,10 @@ ACE_RCSID (tao,
            LF_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Strategy::~TAO_LF_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
index 6b665bff5f1..782821a2542 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -21,7 +21,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Leader_Follower;
 
 /**
@@ -68,6 +75,8 @@ public:
                                         TAO_Leader_Follower &) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_STRATEGY_H */
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
index 8ae4cc0b00f..92b29445e18 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Strategy_Complete.h"
@@ -7,14 +6,12 @@
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Strategy_Complete.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            LF_Strategy_Complete,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void)
 {
 }
@@ -43,10 +40,12 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset,
   if (call_reset)
     lf.reset_event_loop_thread ();
 
-  int result = lf.elect_new_leader ();
+  int const result = lf.elect_new_leader ();
 
   if (result == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("TAO (%P|%t) Failed to wake up ")
                 ACE_TEXT ("a follower thread\n")));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index a0c1f4cf21d..a3dfb19996e 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -21,6 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
+
 /**
  * @brief A concrete TAO_LF_Strategy for ORB configurations that use
  * the Leader/Followers event loop.
@@ -28,9 +34,6 @@
 class TAO_Export TAO_LF_Strategy_Complete : public TAO_LF_Strategy
 {
 public:
-  /// Constructor
-  TAO_LF_Strategy_Complete (void);
-
   //@{
   /** @name Virtual Methods
    *
@@ -45,9 +48,7 @@ public:
                                         TAO_Leader_Follower &);
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Strategy_Complete.inl"
-#endif /* __ACE_INLINE__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl
index 240b3ba5dd0..2a52ea3456a 100644
--- a/TAO/tao/LF_Strategy_Complete.inl
+++ b/TAO/tao/LF_Strategy_Complete.inl
@@ -1,6 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_LF_Strategy_Complete::TAO_LF_Strategy_Complete (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
index 4f814cbd1fa..2b2b1f9472a 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "LRU_Connection_Purging_Strategy.h"
-#include "Transport.h"
+#include "tao/LRU_Connection_Purging_Strategy.h"
+#include "tao/Transport.h"
 
-ACE_RCSID (tao, 
-           LRU_Connection_Purging_Strategy, 
+ACE_RCSID (tao,
+           LRU_Connection_Purging_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy (
                                                            int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum),
@@ -23,6 +25,7 @@ TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void)
 void
 TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
-  transport->purging_order (this->order_++);
+  transport->purging_order (++this->order_);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h
index 07f1fdfd307..8ea7319d723 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.h
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   LRU_Connection_Purging_Strategy.h
@@ -21,6 +23,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LRU_Connection_Purging_Strategy
  *
@@ -32,7 +36,7 @@
  * first.
  */
 
-class TAO_Export TAO_LRU_Connection_Purging_Strategy 
+class TAO_Export TAO_LRU_Connection_Purging_Strategy
   : public TAO_Connection_Purging_Strategy
 {
 public:
@@ -50,6 +54,8 @@ private:
   unsigned long order_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_LRU_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index cd387e73f15..7f0eee155e3 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -21,6 +21,9 @@ ACE_RCSID (tao,
            Leader_Follower,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Leader_Follower::~TAO_Leader_Follower (void)
 {
   while (!this->follower_free_list_.empty ())
@@ -57,7 +60,7 @@ TAO_Leader_Follower::release_follower (TAO_LF_Follower *follower)
 int
 TAO_Leader_Follower::elect_new_leader_i (void)
 {
-  TAO_LF_Follower* follower =
+  TAO_LF_Follower* const follower =
     this->follower_set_.head ();
 
 #if defined (TAO_DEBUG_LEADER_FOLLOWER)
@@ -157,7 +160,7 @@ TAO_Leader_Follower::set_client_thread (void)
       // re-enable it if we want to receive any replys...
       this->orb_core_->reactor ()->reset_reactor_event_loop ();
     }
-  this->clients_++;
+  ++this->clients_;
 }
 
 void
@@ -172,7 +175,7 @@ TAO_Leader_Follower::reset_client_thread (void)
       ++this->leaders_;
     }
 
-  this->clients_--;
+  --this->clients_;
   if (this->clients_ == 0 &&
       this->orb_core_->has_shutdown ())
     {
@@ -485,3 +488,4 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
   return result;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index 810735673e0..46fa3c312a7 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -28,10 +28,15 @@
 #include "ace/Intrusive_List_Node.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_LF_Event;
 class TAO_Transport;
 class TAO_ORB_Core;
-class ACE_Reactor;
 class TAO_ORB_Core_TSS_Resources;
 
 /**
@@ -283,6 +288,8 @@ private:
   TAO_Leader_Follower &leader_follower_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Leader_Follower.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i
index 1c145aaab93..60293532455 100644
--- a/TAO/tao/Leader_Follower.i
+++ b/TAO/tao/Leader_Follower.i
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 // ****************************************************************
@@ -6,6 +7,8 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/ORB_Core.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core,
                                           TAO_New_Leader_Generator *new_leader_generator)
@@ -220,3 +223,5 @@ TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void)
 {
   this->leader_follower_.reset_client_leader_thread ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index b96152bc26d..694bf8190b9 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "tao/Leader_Follower_Flushing_Strategy.h"
@@ -12,6 +11,9 @@ ACE_RCSID (tao,
            Leader_Follower_Flushing_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Leader_Follower_Flushing_Strategy::schedule_output (TAO_Transport *transport)
 {
@@ -67,3 +69,5 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h
index 630b0302a8a..421ec7a591f 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.h
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Flushing_Strategy.h"
+#include "tao/Flushing_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Leader_Follower_Flushing_Strategy
  *
@@ -39,6 +41,8 @@ public:
   virtual int flush_transport (TAO_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 39d370f23be..9a7368f9ec4 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -1,16 +1,14 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "LocalObject.h"
+#include "tao/LocalObject.h"
 
 #if !defined (__ACE_INLINE__)
-# include "LocalObject.i"
+# include "tao/LocalObject.i"
 #endif /* ! __ACE_INLINE__ */
 
-#include "SystemException.h"
-#include "debug.h"
-#include "ORB_Constants.h"
+#include "tao/SystemException.h"
+#include "tao/debug.h"
+#include "tao/ORB_Constants.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -19,6 +17,8 @@ ACE_RCSID (tao,
            LocalObject,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::LocalObject::~LocalObject (void)
 {
 }
@@ -42,12 +42,12 @@ CORBA::ULong
 CORBA::LocalObject::_hash (CORBA::ULong maximum
                            ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // Note that we reinterpret_cast to an "unsigned long" instead of
+  // Note that we reinterpret_cast to an "ptrdiff_t" instead of
   // CORBA::ULong since we need to first cast to an integer large
   // enough to hold an address to avoid compile-time warnings on some
   // 64-bit platforms.
 
-  const CORBA::ULong hash =
+  CORBA::ULong const hash =
     static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this));
 
   return hash % maximum;
@@ -64,7 +64,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj
                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (())
 {
-  return (other_obj == this) ? 1 : 0;
+  return (other_obj == this) ? true : false;
 }
 
 // TAO's extensions
@@ -90,7 +90,7 @@ CORBA::Boolean
 CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Always return false.
-  return 0;
+  return false;
 }
 
 void
@@ -205,7 +205,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
-                    0);
+                    false);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -220,6 +220,10 @@ CORBA::LocalObject::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
 
 // ****************************************************************
 
+TAO_Local_RefCounted_Object::~TAO_Local_RefCounted_Object (void)
+{
+}
+
 void
 TAO_Local_RefCounted_Object::_add_ref (void)
 {
@@ -235,3 +239,4 @@ TAO_Local_RefCounted_Object::_remove_ref (void)
     delete this;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index e7c3c8dce70..ebaabba991a 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -29,7 +29,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Object.h"
+#include "tao/Object.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -40,9 +42,6 @@ namespace CORBA
 
   /**
    * @class LocalObject
-   *
-   * @note NW: It is not clear whether minimum CORBA should support
-   * LocalObject or not.  I think it should.
    */
   class TAO_Export LocalObject : public virtual CORBA::Object
   {
@@ -223,6 +222,9 @@ class TAO_Export TAO_Local_RefCounted_Object
 {
 public:
 
+  /// Destructor.
+  virtual ~TAO_Local_RefCounted_Object (void);
+
   /// Increment reference count.
   virtual void _add_ref (void);
 
@@ -254,9 +256,10 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "LocalObject.i"
+# include "tao/LocalObject.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index 84891887973..3b84db89160 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::LocalObject_ptr
 CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj)
@@ -49,3 +51,5 @@ TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void)
   : refcount_ (1)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 11a9f280111..203bcd5f605 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -1,13 +1,13 @@
-#include "LocateRequest_Invocation.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "Stub.h"
-#include "Bind_Dispatcher_Guard.h"
-#include "Transport.h"
-#include "Synch_Reply_Dispatcher.h"
-#include "GIOP_Utils.h"
-#include "Profile.h"
-#include "ORB_Constants.h"
+#include "tao/LocateRequest_Invocation.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/operation_details.h"
+#include "tao/Stub.h"
+#include "tao/Bind_Dispatcher_Guard.h"
+#include "tao/Transport.h"
+#include "tao/Synch_Reply_Dispatcher.h"
+#include "tao/GIOP_Utils.h"
+#include "tao/Profile.h"
+#include "tao/ORB_Constants.h"
 
 #include "ace/Countdown_Time.h"
 
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
            LocateRequest_Invocation,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   LocateRequest_Invocation::LocateRequest_Invocation (
@@ -63,11 +65,8 @@ namespace TAO
       this->resolver_.transport ();
 
     TAO_OutputCDR &cdr = transport->out_stream ();
-#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1
-    OutputCDR_Auto_Reset cdr_reset(cdr);
-#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */
 
-    int retval =
+    int const retval =
       transport->generate_locate_request (tspec,
                                           this->details_,
                                           cdr);
@@ -189,3 +188,5 @@ namespace TAO
     return TAO_INVOKE_SUCCESS;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h
index 9006ada4f05..40b213eef37 100644
--- a/TAO/tao/LocateRequest_Invocation.h
+++ b/TAO/tao/LocateRequest_Invocation.h
@@ -23,6 +23,8 @@
 
 #include "tao/Synch_Invocation.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Synch_Reply_Dispatcher;
 
 namespace CORBA
@@ -75,6 +77,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_LOCATEREQUEST_INVOCATION_H*/
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index 527999bff53..a0082aa4a3e 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -1,30 +1,32 @@
-#include "LocateRequest_Invocation_Adapter.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "LocateRequest_Invocation.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "ORB_Core.h"
+#include "tao/LocateRequest_Invocation_Adapter.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/operation_details.h"
+#include "tao/LocateRequest_Invocation.h"
+#include "tao/Transport.h"
+#include "tao/Transport_Mux_Strategy.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID (tao,
            LocateRequest_Invocation_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter (
-      CORBA::Object *target)
+    CORBA::Object *target)
     : target_ (target)
-      , list_ (0)
+    , list_ (0)
   {
   }
 
   void
   LocateRequest_Invocation_Adapter::invoke (ACE_ENV_SINGLE_ARG_DECL)
   {
-    CORBA::Object *effective_target = this->target_;
+    CORBA::Object * const effective_target = this->target_;
 
-    TAO_Stub *stub =
+    TAO_Stub * const stub =
       this->target_->_stubobj ();
 
     if (stub == 0)
@@ -37,7 +39,7 @@ namespace TAO
     ACE_Time_Value tmp_wait_time;
     ACE_Time_Value *max_wait_time = 0;
 
-    bool is_timeout  =
+    bool const is_timeout  =
       this->get_timeout (tmp_wait_time);
 
     if (is_timeout)
@@ -111,3 +113,5 @@ namespace TAO
     return has_timeout;
   }
 } // End namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index 64d7a59bbea..cfed80c24fc 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -20,14 +20,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
   typedef Object *Object_ptr;
 }
 
-class ACE_Time_Value;
-
 namespace TAO
 {
   /**
@@ -68,6 +72,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp
index 0e1dd30f277..44d7546418e 100644
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ b/TAO/tao/LongDoubleSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "LongDoubleSeqC.h"
+#include "tao/LongDoubleSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGDOUBLESEQ_CS_)
@@ -57,7 +59,7 @@ CORBA::LongDoubleSeq::LongDoubleSeq (void)
 CORBA::LongDoubleSeq::LongDoubleSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongDouble
       >
     (max)
@@ -69,7 +71,7 @@ CORBA::LongDoubleSeq::LongDoubleSeq (
     CORBA::LongDouble * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongDouble
       >
     (max, length, buffer, release)
@@ -78,7 +80,7 @@ CORBA::LongDoubleSeq::LongDoubleSeq (
 CORBA::LongDoubleSeq::LongDoubleSeq (
     const LongDoubleSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongDouble
       >
     (seq)
@@ -109,15 +111,7 @@ CORBA::Boolean operator<< (
     const CORBA::LongDoubleSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -125,33 +119,9 @@ CORBA::Boolean operator>> (
     CORBA::LongDoubleSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h
index 87a2dcaab12..0fe3c18f75c 100644
--- a/TAO/tao/LongDoubleSeqC.h
+++ b/TAO/tao/LongDoubleSeqC.h
@@ -61,6 +61,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
@@ -77,22 +79,19 @@ namespace CORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        LongDoubleSeq,
-        CORBA::LongDouble
+        LongDoubleSeq
       >
     LongDoubleSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        LongDoubleSeq,
-        LongDoubleSeq_var,
-        CORBA::LongDouble
+        LongDoubleSeq
       >
     LongDoubleSeq_out;
 
   class TAO_Export LongDoubleSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::LongDouble
           >
   {
@@ -103,7 +102,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::LongDouble* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     LongDoubleSeq (const LongDoubleSeq &);
     ~LongDoubleSeq (void);
@@ -148,6 +147,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp
index d0142375188..c36301886b4 100644
--- a/TAO/tao/LongLongSeqC.cpp
+++ b/TAO/tao/LongLongSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "LongLongSeqC.h"
+#include "tao/LongLongSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGLONGSEQ_CS_)
@@ -57,7 +59,7 @@ CORBA::LongLongSeq::LongLongSeq (void)
 CORBA::LongLongSeq::LongLongSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongLong
       >
     (max)
@@ -69,7 +71,7 @@ CORBA::LongLongSeq::LongLongSeq (
     CORBA::LongLong * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongLong
       >
     (max, length, buffer, release)
@@ -78,7 +80,7 @@ CORBA::LongLongSeq::LongLongSeq (
 CORBA::LongLongSeq::LongLongSeq (
     const LongLongSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::LongLong
       >
     (seq)
@@ -109,15 +111,7 @@ CORBA::Boolean operator<< (
     const CORBA::LongLongSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -125,33 +119,9 @@ CORBA::Boolean operator>> (
     CORBA::LongLongSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h
index 78c8d8223b9..ec3510171b1 100644
--- a/TAO/tao/LongLongSeqC.h
+++ b/TAO/tao/LongLongSeqC.h
@@ -61,6 +61,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
@@ -77,22 +79,19 @@ namespace CORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        LongLongSeq,
-        CORBA::LongLong
+        LongLongSeq
       >
     LongLongSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        LongLongSeq,
-        LongLongSeq_var,
-        CORBA::LongLong
+        LongLongSeq
       >
     LongLongSeq_out;
 
   class TAO_Export LongLongSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::LongLong
           >
   {
@@ -103,7 +102,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::LongLong* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     LongLongSeq (const LongLongSeq &);
     ~LongLongSeq (void);
@@ -148,6 +147,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp
index fcb07e3e606..3427b670d5a 100644
--- a/TAO/tao/LongSeqC.cpp
+++ b/TAO/tao/LongSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "LongSeqC.h"
+#include "tao/LongSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGSEQ_CS_)
@@ -57,7 +59,7 @@ CORBA::LongSeq::LongSeq (void)
 CORBA::LongSeq::LongSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Long
       >
     (max)
@@ -69,7 +71,7 @@ CORBA::LongSeq::LongSeq (
     CORBA::Long * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Long
       >
     (max, length, buffer, release)
@@ -78,7 +80,7 @@ CORBA::LongSeq::LongSeq (
 CORBA::LongSeq::LongSeq (
     const LongSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Long
       >
     (seq)
@@ -109,15 +111,7 @@ CORBA::Boolean operator<< (
     const CORBA::LongSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -125,33 +119,9 @@ CORBA::Boolean operator>> (
     CORBA::LongSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
index 4fd2f60e996..71702418b4c 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -77,22 +79,19 @@ namespace CORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        LongSeq,
-        CORBA::Long
+        LongSeq
       >
     LongSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        LongSeq,
-        LongSeq_var,
-        CORBA::Long
+        LongSeq
       >
     LongSeq_out;
 
   class TAO_Export LongSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Long
           >
   {
@@ -103,7 +102,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::Long* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     LongSeq (const LongSeq &);
     ~LongSeq (void);
@@ -148,6 +147,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 154aa0f1d7a..67daf563367 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -1,9 +1,9 @@
-#include "MCAST_Parser.h"
-#include "default_ports.h"
-#include "ORB_Core.h"
-#include "ORB.h"
-#include "Environment.h"
-#include "debug.h"
+#include "tao/MCAST_Parser.h"
+#include "tao/default_ports.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/debug.h"
 
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Dgram.h"
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined(__ACE_INLINE__)
-#include "MCAST_Parser.i"
+#include "tao/MCAST_Parser.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -22,11 +22,13 @@ ACE_RCSID (tao,
 
 static const char mcast_prefix[] = "mcast:";
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_MCAST_Parser::~TAO_MCAST_Parser (void)
 {
 }
 
-
 int
 TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 {
@@ -52,7 +54,7 @@ TAO_MCAST_Parser::parse_string (const char *ior,
    */
   CORBA::Object_ptr object = CORBA::Object::_nil ();
 
-  CORBA::UShort port =
+  CORBA::UShort const port =
     (CORBA::UShort) ACE_OS::atoi (this->mcast_port_.in ());
 
   ACE_Time_Value *timeout = orb->get_timeout ();
@@ -89,14 +91,14 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
     CORBA::Object::_nil ();
 
   // Use UDP multicast to locate the  service.
-  int result = this->multicast_query (ior,
-                                      service_name,
-                                      port,
-                                      mcast_address,
-                                      mcast_ttl,
-                                      mcast_nic,
-                                      timeout,
-                                      orb);
+  int const result = this->multicast_query (ior,
+                                            service_name,
+                                            port,
+                                            mcast_address,
+                                            mcast_ttl,
+                                            mcast_nic,
+                                            timeout,
+                                            orb);
 
   // If the IOR didn't fit into <buf>, memory for it was dynamically
   // allocated - make sure it gets deallocated.
@@ -508,6 +510,8 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
                                   -1).c_str ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser,
                        ACE_TEXT ("MCAST_Parser"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index 4dc327b33b5..5b1c0cd58ee 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -24,12 +24,14 @@
 #include "tao/CORBA_String.h"
 #include "tao/IOR_Parser.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_MCAST_Parser
  *
- * @brief Implements the <mcast:> IOR format
+ * @brief Implements the @c mcast: IOR format
  *
- * This class implements the <mcast:> IOR format.
+ * This class implements the @c mcast: IOR format.
  * It is dynamically loaded by the ORB and used to parse the
  * string to separate the individual <obj_addr> from the list of object
  * addresses <obj_addr_list>.
@@ -85,8 +87,10 @@ private:
   CORBA::String_var service_name_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "MCAST_Parser.i"
+# include "tao/MCAST_Parser.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser)
diff --git a/TAO/tao/MCAST_Parser.i b/TAO/tao/MCAST_Parser.i
index c2a5c736f82..fc19f658c44 100644
--- a/TAO/tao/MCAST_Parser.i
+++ b/TAO/tao/MCAST_Parser.i
@@ -1,6 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_MCAST_Parser::TAO_MCAST_Parser (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index cc6fb34f23d..59e25c0bfb7 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -19,6 +19,7 @@ ACE_RCSID (tao,
 # include "tao/MProfile.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_MProfile::~TAO_MProfile (void)
 {
@@ -30,7 +31,8 @@ TAO_MProfile::~TAO_MProfile (void)
         {
           ACE_TRY
             {
-              (*this->policy_list_)[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+              CORBA::Policy_ptr policy = (*this->policy_list_)[i];
+              policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -154,7 +156,8 @@ TAO_MProfile::grow (CORBA::ULong sz)
     return 0;
 
   // get the additional space
-  TAO_Profile **new_pfiles, **old_pfiles;
+  TAO_Profile **new_pfiles = 0;
+  TAO_Profile **old_pfiles = 0;
   ACE_NEW_RETURN (new_pfiles,
                   TAO_Profile *[sz],
                   -1);
@@ -360,3 +363,5 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
 
   return ret_val;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 194027593d5..ba45b3a4a5d 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -29,6 +29,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class TAO_Profile;
 namespace CORBA
@@ -240,6 +242,8 @@ private:
   TAO_PHandle last_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/MProfile.i"
 #endif /*__ACE_INLINE__ */
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 48805e3c14d..b3ebb70abf5 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
   :  policy_list_ (0),
@@ -74,7 +76,7 @@ TAO_MProfile::get_cprev (void)
   else if (last_ == 1)
     current_=1;
   else if (current_ > 1)
-    current_--;
+    --current_;
   else // current_ == 0 or 1, 0 => list never read before and == 1
     current_ = last_;
 
@@ -88,7 +90,7 @@ TAO_MProfile::get_prev (void)
     // No List of BeginningOfList
     return 0;
   if (current_ > 1)
-    current_--;
+    --current_;
 
   return pfiles_[current_ - 1];
 }
@@ -196,3 +198,5 @@ TAO_MProfile::policy_list (CORBA::PolicyList *policy_list)
 {
   this->policy_list_ = policy_list;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 30c9cf929f6..8829c8e503c 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 includedir = @includedir@/tao
 pkgconfigdir = @libdir@/pkgconfig
@@ -87,6 +87,7 @@ libTAO_la_SOURCES = \
   FloatSeqC.cpp \
   Flushing_Strategy.cpp \
   GIOPC.cpp \
+  GIOP_Fragmentation_Strategy.cpp \
   GIOP_Message_Base.cpp \
   GIOP_Message_Generator_Parser.cpp \
   GIOP_Message_Generator_Parser_10.cpp \
@@ -116,6 +117,7 @@ libTAO_la_SOURCES = \
   IORInterceptor_Adapter_Factory.cpp \
   IOR_Parser.cpp \
   Incoming_Message_Queue.cpp \
+  Incoming_Message_Stack.cpp \
   Invocation_Adapter.cpp \
   Invocation_Base.cpp \
   Invocation_Endpoint_Selectors.cpp \
@@ -141,12 +143,12 @@ libTAO_la_SOURCES = \
   LongSeqC.cpp \
   MCAST_Parser.cpp \
   MProfile.cpp \
-  Managed_Types.cpp \
   Messaging_PolicyValueC.cpp \
   Messaging_SyncScopeC.cpp \
   Muxed_TMS.cpp \
   NVList_Adapter.cpp \
   New_Leader_Generator.cpp \
+  Null_Fragmentation_Strategy.cpp \
   ORB.cpp \
   ORBInitializer_Registry.cpp \
   ORBInitializer_Registry_Adapter.cpp \
@@ -162,6 +164,7 @@ libTAO_la_SOURCES = \
   Object_Proxy_Broker.cpp \
   Object_Ref_Table.cpp \
   OctetSeqC.cpp \
+  On_Demand_Fragmentation_Strategy.cpp \
   PI_ForwardC.cpp \
   ParameterModeC.cpp \
   Parser_Registry.cpp \
@@ -192,7 +195,6 @@ libTAO_la_SOURCES = \
   Request_Dispatcher.cpp \
   Resource_Factory.cpp \
   Resume_Handle.cpp \
-  Sequence.cpp \
   ServerRequestInterceptor_Adapter.cpp \
   ServerRequestInterceptor_Adapter_Factory.cpp \
   Server_Strategy_Factory.cpp \
@@ -202,6 +204,7 @@ libTAO_la_SOURCES = \
   Services_Activate.cpp \
   ShortSeqC.cpp \
   StringSeqC.cpp \
+  String_Alloc.cpp \
   Stub.cpp \
   Stub_Factory.cpp \
   Synch_Invocation.cpp \
@@ -234,6 +237,7 @@ libTAO_la_SOURCES = \
   UShortSeqC.cpp \
   UserException.cpp \
   Valuetype_Adapter.cpp \
+  Valuetype_Adapter_Factory.cpp \
   WCharSeqC.cpp \
   WStringSeqC.cpp \
   Wait_On_LF_No_Upcall.cpp \
@@ -309,7 +313,6 @@ nobase_include_HEADERS = \
   CORBALOC_Parser.h \
   CORBALOC_Parser.i \
   CORBANAME_Parser.h \
-  CORBANAME_Parser.i \
   CORBA_String.h \
   CORBA_String.inl \
   CORBA_methods.h \
@@ -347,7 +350,6 @@ nobase_include_HEADERS = \
   CurrentC.h \
   CurrentS.h \
   DLL_Parser.h \
-  DLL_Parser.i \
   Default_Collocation_Resolver.h \
   Default_Endpoint_Selector_Factory.h \
   Default_Protocols_Hooks.h \
@@ -370,7 +372,6 @@ nobase_include_HEADERS = \
   Exception_Data.h \
   Exclusive_TMS.h \
   FILE_Parser.h \
-  FILE_Parser.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Fixed_Array_Argument_T.cpp \
@@ -387,6 +388,7 @@ nobase_include_HEADERS = \
   GIOPC.h \
   GIOPC.inl \
   GIOPS.h \
+  GIOP_Fragmentation_Strategy.h \
   GIOP_Message_Base.h \
   GIOP_Message_Generator_Parser.h \
   GIOP_Message_Generator_Parser_10.h \
@@ -428,7 +430,15 @@ nobase_include_HEADERS = \
   IOR_Parser.h \
   Incoming_Message_Queue.h \
   Incoming_Message_Queue.inl \
+  Incoming_Message_Stack.h \
+  Incoming_Message_Stack.inl \
   InterfaceDef.pidl \
+  Intrusive_Ref_Count_Base_T.cpp \
+  Intrusive_Ref_Count_Base_T.h \
+  Intrusive_Ref_Count_Base_T.inl \
+  Intrusive_Ref_Count_Handle_T.cpp \
+  Intrusive_Ref_Count_Handle_T.h \
+  Intrusive_Ref_Count_Handle_T.inl \
   InvalidName.pidl \
   Invocation_Adapter.h \
   Invocation_Adapter.inl \
@@ -453,7 +463,6 @@ nobase_include_HEADERS = \
   LF_Invocation_Event.h \
   LF_Strategy.h \
   LF_Strategy_Complete.h \
-  LF_Strategy_Complete.inl \
   LRU_Connection_Purging_Strategy.h \
   Leader_Follower.h \
   Leader_Follower.i \
@@ -475,8 +484,6 @@ nobase_include_HEADERS = \
   MCAST_Parser.i \
   MProfile.h \
   MProfile.i \
-  Managed_Types.h \
-  Managed_Types.i \
   Messaging_PolicyValue.pidl \
   Messaging_PolicyValueC.h \
   Messaging_SyncScope.pidl \
@@ -484,6 +491,7 @@ nobase_include_HEADERS = \
   Muxed_TMS.h \
   NVList_Adapter.h \
   New_Leader_Generator.h \
+  Null_Fragmentation_Strategy.h \
   ORB.h \
   ORB.i \
   ORBInitializer_Registry.h \
@@ -517,6 +525,7 @@ nobase_include_HEADERS = \
   OctetSeq.pidl \
   OctetSeqC.h \
   OctetSeqS.h \
+  On_Demand_Fragmentation_Strategy.h \
   PI_Forward.pidl \
   PI_ForwardC.h \
   ParameterMode.pidl \
@@ -579,11 +588,6 @@ nobase_include_HEADERS = \
   Seq_Var_T.cpp \
   Seq_Var_T.h \
   Seq_Var_T.inl \
-  Sequence.h \
-  Sequence.i \
-  Sequence_T.cpp \
-  Sequence_T.h \
-  Sequence_T.i \
   ServerRequestInterceptor_Adapter.h \
   ServerRequestInterceptor_Adapter_Factory.h \
   Server_Strategy_Factory.h \
@@ -604,6 +608,7 @@ nobase_include_HEADERS = \
   StringSeq.pidl \
   StringSeqC.h \
   StringSeqS.h \
+  String_Alloc.h \
   Stub.h \
   Stub.i \
   Stub_Factory.h \
@@ -670,6 +675,7 @@ nobase_include_HEADERS = \
   UserException.h \
   UserException.inl \
   Valuetype_Adapter.h \
+  Valuetype_Adapter_Factory.h \
   VarOut_T.cpp \
   VarOut_T.h \
   VarOut_T.inl \
@@ -680,6 +686,7 @@ nobase_include_HEADERS = \
   Var_Size_Argument_T.h \
   Var_Size_Argument_T.inl \
   Version.h \
+  Versioned_Namespace.h \
   WCharSeq.pidl \
   WCharSeqC.h \
   WCharSeqS.h \
@@ -1052,7 +1059,6 @@ libTAO_CodecFactory_la_SOURCES = \
   CodecFactory/CDR_Encaps_Codec.cpp \
   CodecFactory/CodecFactory.cpp \
   CodecFactory/CodecFactory_impl.cpp \
-  CodecFactory/IOP_CodecA.cpp \
   CodecFactory/IOP_CodecC.cpp
 
 libTAO_CodecFactory_la_LDFLAGS = \
@@ -1071,6 +1077,7 @@ nobase_include_HEADERS += \
   CodecFactory/IOP_CodecC.h \
   CodecFactory/IOP_CodecS.h \
   CodecFactory/IOP_Codec_include.pidl \
+  CodecFactory/IOP_Codec_includeA.h \
   CodecFactory/IOP_Codec_includeC.h \
   CodecFactory/IOP_Codec_includeS.h \
   CodecFactory/codecfactory_export.h
@@ -1101,6 +1108,7 @@ libTAO_PI_la_CPPFLAGS = \
   -DTAO_PI_BUILD_DLL
 
 libTAO_PI_la_SOURCES = \
+  PI/ClientRequestDetails.cpp \
   PI/ClientRequestInfo.cpp \
   PI/ClientRequestInfoA.cpp \
   PI/ClientRequestInfoC.cpp \
@@ -1113,7 +1121,6 @@ libTAO_PI_la_SOURCES = \
   PI/InvalidSlotA.cpp \
   PI/InvalidSlotC.cpp \
   PI/ORBInitInfo.cpp \
-  PI/ORBInitInfoA.cpp \
   PI/ORBInitInfoC.cpp \
   PI/ORBInitializerA.cpp \
   PI/ORBInitializerC.cpp \
@@ -1127,10 +1134,14 @@ libTAO_PI_la_SOURCES = \
   PI/PICurrent_Loader.cpp \
   PI/PIForwardRequestA.cpp \
   PI/PIForwardRequestC.cpp \
+  PI/PI_ORBInitializer.cpp \
+  PI/PI_PolicyFactory.cpp \
   PI/PolicyFactoryA.cpp \
   PI/PolicyFactoryC.cpp \
   PI/PolicyFactory_Loader.cpp \
   PI/PolicyFactory_Registry.cpp \
+  PI/ProcessingModePolicy.cpp \
+  PI/ProcessingModePolicyC.cpp \
   PI/RequestInfoA.cpp \
   PI/RequestInfoC.cpp \
   PI/RequestInfo_Util.cpp
@@ -1145,17 +1156,22 @@ libTAO_PI_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  PI/ClientRequestDetails.h \
+  PI/ClientRequestDetails.inl \
   PI/ClientRequestInfo.h \
   PI/ClientRequestInfo.pidl \
+  PI/ClientRequestInfoA.h \
   PI/ClientRequestInfoC.h \
   PI/ClientRequestInfoS.h \
   PI/ClientRequestInterceptor.pidl \
+  PI/ClientRequestInterceptorA.h \
   PI/ClientRequestInterceptorC.h \
   PI/ClientRequestInterceptorS.h \
   PI/ClientRequestInterceptor_Adapter_Impl.h \
   PI/ClientRequestInterceptor_Adapter_Impl.inl \
   PI/ClientRequestInterceptor_Factory_Impl.h \
   PI/Interceptor.pidl \
+  PI/InterceptorA.h \
   PI/InterceptorC.h \
   PI/InterceptorS.h \
   PI/Interceptor_List_T.cpp \
@@ -1170,6 +1186,7 @@ nobase_include_HEADERS += \
   PI/ORBInitInfoC.h \
   PI/ORBInitInfoS.h \
   PI/ORBInitializer.pidl \
+  PI/ORBInitializerA.h \
   PI/ORBInitializerC.h \
   PI/ORBInitializerS.h \
   PI/ORBInitializer_Registry_Impl.h \
@@ -1185,14 +1202,23 @@ nobase_include_HEADERS += \
   PI/PICurrent_Impl.inl \
   PI/PICurrent_Loader.h \
   PI/PIForwardRequest.pidl \
+  PI/PIForwardRequestA.h \
   PI/PIForwardRequestC.h \
   PI/PIForwardRequestS.h \
+  PI/PI_ORBInitializer.h \
+  PI/PI_PolicyFactory.h \
   PI/PolicyFactory.pidl \
+  PI/PolicyFactoryA.h \
   PI/PolicyFactoryC.h \
   PI/PolicyFactoryS.h \
   PI/PolicyFactory_Loader.h \
   PI/PolicyFactory_Registry.h \
+  PI/ProcessingModePolicy.h \
+  PI/ProcessingModePolicy.pidl \
+  PI/ProcessingModePolicyC.h \
+  PI/ProcessingModePolicyS.h \
   PI/RequestInfo.pidl \
+  PI/RequestInfoA.h \
   PI/RequestInfoC.h \
   PI/RequestInfoS.h \
   PI/RequestInfo_Util.h \
@@ -1324,7 +1350,6 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/LifespanStrategyTransientFactoryImpl.cpp \
   PortableServer/Local_Servant_Base.cpp \
   PortableServer/Non_Servant_Upcall.cpp \
-  PortableServer/ORT_Adapter.cpp \
   PortableServer/ORT_Adapter_Factory.cpp \
   PortableServer/Object_Adapter.cpp \
   PortableServer/Object_Adapter_Factory.cpp \
@@ -1341,7 +1366,6 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/POA_Current_Impl.cpp \
   PortableServer/POA_Guard.cpp \
   PortableServer/POA_Policy_Set.cpp \
-  PortableServer/PS_CurrentA.cpp \
   PortableServer/PS_CurrentC.cpp \
   PortableServer/PS_ForwardA.cpp \
   PortableServer/PS_ForwardC.cpp \
@@ -1504,7 +1528,6 @@ nobase_include_HEADERS += \
   PortableServer/POA_Cached_Policies.h \
   PortableServer/POA_Cached_Policies.i \
   PortableServer/POA_Current.h \
-  PortableServer/POA_Current.inl \
   PortableServer/POA_Current_Factory.h \
   PortableServer/POA_Current_Impl.h \
   PortableServer/POA_Current_Impl.inl \
@@ -1624,6 +1647,179 @@ EXTRA_DIST += \
   PortableServer/TAO_PortableServer.rc
 
 
+## Makefile.CSD_Framework.am
+
+lib_LTLIBRARIES += libTAO_CSD_Framework.la
+
+libTAO_CSD_Framework_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/tao \
+  -DTAO_CSD_FW_BUILD_DLL
+
+libTAO_CSD_Framework_la_SOURCES = \
+  CSD_Framework/CSD_Default_Servant_Dispatcher.cpp \
+  CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp \
+  CSD_Framework/CSD_FrameworkA.cpp \
+  CSD_Framework/CSD_FrameworkC.cpp \
+  CSD_Framework/CSD_Framework_Loader.cpp \
+  CSD_Framework/CSD_ORBInitializer.cpp \
+  CSD_Framework/CSD_Object_Adapter.cpp \
+  CSD_Framework/CSD_Object_Adapter_Factory.cpp \
+  CSD_Framework/CSD_POA.cpp \
+  CSD_Framework/CSD_Strategy_Base.cpp \
+  CSD_Framework/CSD_Strategy_Proxy.cpp \
+  CSD_Framework/CSD_Strategy_Repository.cpp
+
+libTAO_CSD_Framework_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CSD_Framework_la_LIBADD = \
+  libTAO_PI.la \
+  libTAO_CodecFactory.la \
+  libTAO_PortableServer.la \
+  libTAO_AnyTypeCode.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  CSD_Framework/CSD_Default_Servant_Dispatcher.h \
+  CSD_Framework/CSD_FW_Export.h \
+  CSD_Framework/CSD_FW_Server_Request_Wrapper.h \
+  CSD_Framework/CSD_FW_Server_Request_Wrapper.inl \
+  CSD_Framework/CSD_Framework.pidl \
+  CSD_Framework/CSD_FrameworkA.h \
+  CSD_Framework/CSD_FrameworkC.h \
+  CSD_Framework/CSD_Framework_Loader.h \
+  CSD_Framework/CSD_ORBInitializer.h \
+  CSD_Framework/CSD_Object_Adapter.h \
+  CSD_Framework/CSD_Object_Adapter_Factory.h \
+  CSD_Framework/CSD_POA.h \
+  CSD_Framework/CSD_POA.inl \
+  CSD_Framework/CSD_Strategy_Base.h \
+  CSD_Framework/CSD_Strategy_Base.inl \
+  CSD_Framework/CSD_Strategy_Proxy.h \
+  CSD_Framework/CSD_Strategy_Proxy.inl \
+  CSD_Framework/CSD_Strategy_Repository.h
+
+pkgconfig_DATA += \
+  TAO_CSD_Framework.pc
+
+CLEANFILES += \
+  TAO_CSD_Framework.pc
+
+TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in
+
+EXTRA_DIST += \
+  CSD_Framework/TAO_CSD_Framework.pc.in
+
+
+## Makefile.CSD_ThreadPool.am
+
+lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la
+
+libTAO_CSD_ThreadPool_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/tao \
+  -DTAO_CSD_TP_BUILD_DLL
+
+libTAO_CSD_ThreadPool_la_SOURCES = \
+  CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp \
+  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Corba_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Custom_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp \
+  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp \
+  CSD_ThreadPool/CSD_TP_Queue.cpp \
+  CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp \
+  CSD_ThreadPool/CSD_TP_Remote_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Request.cpp \
+  CSD_ThreadPool/CSD_TP_Servant_State.cpp \
+  CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp \
+  CSD_ThreadPool/CSD_TP_Strategy.cpp \
+  CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp \
+  CSD_ThreadPool/CSD_TP_Synch_Helper.cpp \
+  CSD_ThreadPool/CSD_TP_Task.cpp \
+  CSD_ThreadPool/CSD_ThreadPool.cpp
+
+libTAO_CSD_ThreadPool_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_CSD_ThreadPool_la_LIBADD = \
+  libTAO_CSD_Framework.la \
+  libTAO_PI.la \
+  libTAO_CodecFactory.la \
+  libTAO_PortableServer.la \
+  libTAO_AnyTypeCode.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  CSD_ThreadPool/CSD_TP_Cancel_Visitor.h \
+  CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl \
+  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h \
+  CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h \
+  CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl \
+  CSD_ThreadPool/CSD_TP_Corba_Request.h \
+  CSD_ThreadPool/CSD_TP_Corba_Request.inl \
+  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h \
+  CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl \
+  CSD_ThreadPool/CSD_TP_Custom_Request.h \
+  CSD_ThreadPool/CSD_TP_Custom_Request.inl \
+  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h \
+  CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl \
+  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h \
+  CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl \
+  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h \
+  CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl \
+  CSD_ThreadPool/CSD_TP_Export.h \
+  CSD_ThreadPool/CSD_TP_Queue.h \
+  CSD_ThreadPool/CSD_TP_Queue.inl \
+  CSD_ThreadPool/CSD_TP_Queue_Visitor.h \
+  CSD_ThreadPool/CSD_TP_Queue_Visitor.inl \
+  CSD_ThreadPool/CSD_TP_Remote_Request.h \
+  CSD_ThreadPool/CSD_TP_Remote_Request.inl \
+  CSD_ThreadPool/CSD_TP_Request.h \
+  CSD_ThreadPool/CSD_TP_Request.inl \
+  CSD_ThreadPool/CSD_TP_Servant_State.h \
+  CSD_ThreadPool/CSD_TP_Servant_State.inl \
+  CSD_ThreadPool/CSD_TP_Servant_State_Map.h \
+  CSD_ThreadPool/CSD_TP_Servant_State_Map.inl \
+  CSD_ThreadPool/CSD_TP_Strategy.h \
+  CSD_ThreadPool/CSD_TP_Strategy.inl \
+  CSD_ThreadPool/CSD_TP_Strategy_Factory.h \
+  CSD_ThreadPool/CSD_TP_Synch_Helper.h \
+  CSD_ThreadPool/CSD_TP_Synch_Helper.inl \
+  CSD_ThreadPool/CSD_TP_Task.h \
+  CSD_ThreadPool/CSD_TP_Task.inl \
+  CSD_ThreadPool/CSD_ThreadPool.h
+
+pkgconfig_DATA += \
+  TAO_CSD_ThreadPool.pc
+
+CLEANFILES += \
+  TAO_CSD_ThreadPool.pc
+
+TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
+
+EXTRA_DIST += \
+  CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
+
+
 ## Makefile.IFR_Client.am
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
@@ -1808,6 +2004,7 @@ libTAO_Valuetype_la_SOURCES = \
   Valuetype/ValueBase.cpp \
   Valuetype/ValueFactory.cpp \
   Valuetype/ValueFactory_Map.cpp \
+  Valuetype/Valuetype_Adapter_Factory_Impl.cpp \
   Valuetype/Valuetype_Adapter_Impl.cpp
 
 libTAO_Valuetype_la_LDFLAGS = \
@@ -1824,11 +2021,13 @@ nobase_include_HEADERS += \
   Valuetype/AbstractBase_Invocation_Adapter.h \
   Valuetype/AbstractBase_T.cpp \
   Valuetype/AbstractBase_T.h \
-  Valuetype/Sequence_T.cpp \
+  Valuetype/Bounded_Valuetype_Allocation_Traits_T.h \
+  Valuetype/Bounded_Valuetype_Sequence_T.h \
   Valuetype/Sequence_T.h \
-  Valuetype/Sequence_T.inl \
   Valuetype/StringValueC.h \
   Valuetype/StringValueC.inl \
+  Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h \
+  Valuetype/Unbounded_Valuetype_Sequence_T.h \
   Valuetype/ValueBase.h \
   Valuetype/ValueBase.inl \
   Valuetype/ValueFactory.h \
@@ -1836,7 +2035,11 @@ nobase_include_HEADERS += \
   Valuetype/Value_CORBA_methods.h \
   Valuetype/Value_VarOut_T.cpp \
   Valuetype/Value_VarOut_T.h \
+  Valuetype/Valuetype_Adapter_Factory_Impl.h \
   Valuetype/Valuetype_Adapter_Impl.h \
+  Valuetype/Valuetype_Sequence_Element_T.h \
+  Valuetype/Valuetype_Traits_Base_T.h \
+  Valuetype/Valuetype_Traits_T.h \
   Valuetype/valuetype_export.h
 
 pkgconfig_DATA += \
@@ -1873,6 +2076,7 @@ libTAO_Messaging_la_SOURCES = \
   Messaging/Connection_Timeout_Policy_i.cpp \
   Messaging/ExceptionHolderA.cpp \
   Messaging/ExceptionHolderC.cpp \
+  Messaging/ExceptionHolder_i.cpp \
   Messaging/Messaging.cpp \
   Messaging/MessagingA.cpp \
   Messaging/MessagingC.cpp \
@@ -1887,8 +2091,6 @@ libTAO_Messaging_la_SOURCES = \
   Messaging/Messaging_RT_PolicyC.cpp \
   Messaging/Messaging_SyncScope_PolicyA.cpp \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/OldExceptionHolderA.cpp \
-  Messaging/OldExceptionHolderC.cpp \
   Messaging/PollableC.cpp \
   Messaging/TAO_ExtA.cpp \
   Messaging/TAO_ExtC.cpp
@@ -1917,6 +2119,7 @@ nobase_include_HEADERS += \
   Messaging/ExceptionHolderC.h \
   Messaging/ExceptionHolderC.inl \
   Messaging/ExceptionHolderS.h \
+  Messaging/ExceptionHolder_i.h \
   Messaging/Messaging.h \
   Messaging/Messaging.pidl \
   Messaging/MessagingA.h \
@@ -1940,11 +2143,6 @@ nobase_include_HEADERS += \
   Messaging/Messaging_SyncScope_Policy.pidl \
   Messaging/Messaging_SyncScope_PolicyA.h \
   Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/OldExceptionHolder.pidl \
-  Messaging/OldExceptionHolderA.h \
-  Messaging/OldExceptionHolderC.h \
-  Messaging/OldExceptionHolderC.inl \
-  Messaging/OldExceptionHolderS.h \
   Messaging/Pollable.pidl \
   Messaging/PollableC.h \
   Messaging/PollableS.h \
@@ -2121,7 +2319,8 @@ libTAO_IORInterceptor_la_SOURCES = \
   IORInterceptor/IORInfoC.cpp \
   IORInterceptor/IORInterceptorC.cpp \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+  IORInterceptor/IORInterceptor_Adapter_Impl.cpp \
+  IORInterceptor/IORInterceptor_Details.cpp
 
 libTAO_IORInterceptor_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -2146,6 +2345,7 @@ nobase_include_HEADERS += \
   IORInterceptor/IORInterceptorC.h \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
   IORInterceptor/IORInterceptor_Adapter_Impl.h \
+  IORInterceptor/IORInterceptor_Details.h \
   IORInterceptor/iorinterceptor_export.h
 
 pkgconfig_DATA += \
@@ -2329,6 +2529,7 @@ libTAO_PI_Server_la_SOURCES = \
   PI_Server/PortableServer_ORBInitializer.cpp \
   PI_Server/PortableServer_PolicyFactory.cpp \
   PI_Server/ServerInterceptorAdapter.cpp \
+  PI_Server/ServerRequestDetails.cpp \
   PI_Server/ServerRequestInfo.cpp \
   PI_Server/ServerRequestInfoA.cpp \
   PI_Server/ServerRequestInfoC.cpp \
@@ -2359,12 +2560,16 @@ nobase_include_HEADERS += \
   PI_Server/PortableServer_ORBInitializer.h \
   PI_Server/PortableServer_PolicyFactory.h \
   PI_Server/ServerInterceptorAdapter.h \
+  PI_Server/ServerRequestDetails.h \
+  PI_Server/ServerRequestDetails.inl \
   PI_Server/ServerRequestInfo.h \
   PI_Server/ServerRequestInfo.inl \
   PI_Server/ServerRequestInfo.pidl \
+  PI_Server/ServerRequestInfoA.h \
   PI_Server/ServerRequestInfoC.h \
   PI_Server/ServerRequestInfoS.h \
   PI_Server/ServerRequestInterceptor.pidl \
+  PI_Server/ServerRequestInterceptorA.h \
   PI_Server/ServerRequestInterceptorC.h \
   PI_Server/ServerRequestInterceptorS.h \
   PI_Server/ServerRequestInterceptor_Factory_Impl.h \
@@ -2615,6 +2820,7 @@ nobase_include_HEADERS += \
   RTScheduling/RTScheduler_include.pidl \
   RTScheduling/RTScheduler_includeA.h \
   RTScheduling/RTScheduler_includeC.h \
+  RTScheduling/RTScheduler_includeS.h \
   RTScheduling/Request_Interceptor.h \
   RTScheduling/ThreadAction.h \
   RTScheduling/rtscheduler_export.h
@@ -2678,6 +2884,8 @@ EXTRA_DIST += \
 
 ## Makefile.Strategies.am
 
+if !BUILD_ACE_FOR_TAO
+
 lib_LTLIBRARIES += libTAO_Strategies.la
 
 libTAO_Strategies_la_CPPFLAGS = \
@@ -2699,6 +2907,9 @@ libTAO_Strategies_la_SOURCES = \
   Strategies/LFU_Connection_Purging_Strategy.cpp \
   Strategies/LF_Strategy_Null.cpp \
   Strategies/NULL_Connection_Purging_Strategy.cpp \
+  Strategies/OC_Endpoint_Selector_Factory.cpp \
+  Strategies/OC_Endpoint_Selector_Loader.cpp \
+  Strategies/Optimized_Connection_Endpoint_Selector.cpp \
   Strategies/SCIOP_Acceptor.cpp \
   Strategies/SCIOP_Connection_Handler.cpp \
   Strategies/SCIOP_Connector.cpp \
@@ -2749,6 +2960,9 @@ nobase_include_HEADERS += \
   Strategies/LF_Strategy_Null.h \
   Strategies/LF_Strategy_Null.inl \
   Strategies/NULL_Connection_Purging_Strategy.h \
+  Strategies/OC_Endpoint_Selector_Factory.h \
+  Strategies/OC_Endpoint_Selector_Loader.h \
+  Strategies/Optimized_Connection_Endpoint_Selector.h \
   Strategies/SCIOP_Acceptor.h \
   Strategies/SCIOP_Acceptor.i \
   Strategies/SCIOP_Connection_Handler.h \
@@ -2792,6 +3006,8 @@ CLEANFILES += \
 TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
 
+endif !BUILD_ACE_FOR_TAO
+
 EXTRA_DIST += \
   Strategies/TAO_Strategies.pc.in \
   Strategies/TAO_Strategies.rc
@@ -2811,6 +3027,7 @@ libTAO_FlResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  $(ACE_FLTK_CPPFLAGS) \
   -DTAO_FLRESOURCE_BUILD_DLL
 
 libTAO_FlResource_la_SOURCES = \
@@ -2818,12 +3035,13 @@ libTAO_FlResource_la_SOURCES = \
   FlResource_Loader.cpp
 
 libTAO_FlResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS)
 
 libTAO_FlResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_FLTK_LIBS)
 
 nobase_include_HEADERS += \
   FlResource_Factory.h \
@@ -2847,8 +3065,7 @@ libTAO_QtResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(QTDIR)/include \
-  -DQT_THREAD_SUPPORT \
+  $(ACE_QT_CPPFLAGS) \
   -DTAO_QTRESOURCE_BUILD_DLL
 
 libTAO_QtResource_la_SOURCES = \
@@ -2856,13 +3073,13 @@ libTAO_QtResource_la_SOURCES = \
   QtResource_Loader.cpp
 
 libTAO_QtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS)
 
 libTAO_QtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
   libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la \
-  -lqt-mt
+  $(ACE_QT_LIBS)
 
 nobase_include_HEADERS += \
   QtResource_Factory.h \
@@ -2884,6 +3101,8 @@ libTAO_TkResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  $(ACE_TK_CPPFLAGS) \
+  $(ACE_TCL_CPPFLAGS) \
   -DTAO_TKRESOURCE_BUILD_DLL
 
 libTAO_TkResource_la_SOURCES = \
@@ -2891,12 +3110,14 @@ libTAO_TkResource_la_SOURCES = \
   TkResource_Loader.cpp
 
 libTAO_TkResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
 
 libTAO_TkResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_TK_LIBS) \
+  $(ACE_TCL_LIBS)
 
 nobase_include_HEADERS += \
   TAO_TkResource_Export.h \
@@ -2919,6 +3140,8 @@ libTAO_XtResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  $(ACE_X11_CPPFLAGS) \
+  $(ACE_XT_CPPFLAGS) \
   -DTAO_XTRESOURCE_BUILD_DLL
 
 libTAO_XtResource_la_SOURCES = \
@@ -2926,12 +3149,14 @@ libTAO_XtResource_la_SOURCES = \
   XtResource_Loader.cpp
 
 libTAO_XtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
 
 libTAO_XtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_XT_LIBS) \
+  $(ACE_X11_LIBS)
 
 nobase_include_HEADERS += \
   TAO_XtResource_Export.h \
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
index 5c2b8ed152f..1334d4ac165 100644
--- a/TAO/tao/Managed_Types.cpp
+++ b/TAO/tao/Managed_Types.cpp
@@ -10,12 +10,20 @@ ACE_RCSID (tao,
            Managed_Types,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // assignment from CORBA::String_var makes a copy
 TAO_String_Manager&
 TAO_String_Manager::operator= (const CORBA::String_var &var)
 {
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (var.in ());
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_String_Manager tmp (var.in ());
+
+  char * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_  = old_ptr;
+
   return *this;
 }
 
@@ -38,8 +46,14 @@ TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
 TAO_WString_Manager&
 TAO_WString_Manager::operator= (const CORBA::WString_var &var)
 {
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (var.in ());
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_WString_Manager tmp (var.in ());
+
+  CORBA::WChar * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_  = old_ptr;
+
   return *this;
 }
 
@@ -55,3 +69,5 @@ TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var)
   *this->ptr_ = CORBA::wstring_dup (var.in ());
   return *this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
index 3d41e8880b4..7d2dde4137d 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -30,6 +30,8 @@
 
 /****************************************************************/
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_String_Manager
  *
@@ -51,6 +53,9 @@ public:
   /// copy constructor
   TAO_String_Manager (const TAO_String_Manager &);
 
+  /// constructor from const char* makes a copy.
+  TAO_String_Manager (const char *);
+
   /// destructor
   ~TAO_String_Manager (void);
 
@@ -201,6 +206,9 @@ public:
   /// copy constructor
   TAO_WString_Manager (const TAO_WString_Manager &);
 
+  /// constructor from const whar* makes a copy.
+  TAO_WString_Manager (const CORBA::WChar *);
+
   /// destructor
   ~TAO_WString_Manager (void);
 
@@ -365,6 +373,8 @@ namespace ACE_OS
 }
 #endif /* ACE_LACKS_DEPRECATED_MACROS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Managed_Types.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
index 73f66c7cdf6..aa03deb7c56 100644
--- a/TAO/tao/Managed_Types.i
+++ b/TAO/tao/Managed_Types.i
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // ============================================================================
@@ -16,6 +17,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // default CTOR initializes to empty string
 ACE_INLINE
 TAO_String_Manager::TAO_String_Manager (void)
@@ -30,6 +33,12 @@ TAO_String_Manager::TAO_String_Manager (const TAO_String_Manager &rhs)
 {
 }
 
+ACE_INLINE
+TAO_String_Manager::TAO_String_Manager (const char *s)
+  : ptr_ (CORBA::string_dup (s))
+{
+}
+
 // destructor
 ACE_INLINE
 TAO_String_Manager::~TAO_String_Manager (void)
@@ -41,11 +50,14 @@ TAO_String_Manager::~TAO_String_Manager (void)
 ACE_INLINE TAO_String_Manager&
 TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
 {
-  if (this == &rhs)
-    return *this;
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_String_Manager tmp (rhs);
+
+  char * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_  = old_ptr;
 
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (rhs.ptr_);
   return *this;
 }
 
@@ -53,8 +65,14 @@ TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
 ACE_INLINE TAO_String_Manager &
 TAO_String_Manager::operator= (const char * p)
 {
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (p);
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_String_Manager tmp (p);
+
+  char * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
+
   return *this;
 }
 
@@ -208,6 +226,12 @@ TAO_WString_Manager::TAO_WString_Manager (const TAO_WString_Manager &rhs)
 {
 }
 
+ACE_INLINE
+TAO_WString_Manager::TAO_WString_Manager (const CORBA::WChar *ws)
+  : ptr_ (CORBA::wstring_dup (ws))
+{
+}
+
 // destructor
 ACE_INLINE
 TAO_WString_Manager::~TAO_WString_Manager (void)
@@ -219,11 +243,14 @@ TAO_WString_Manager::~TAO_WString_Manager (void)
 ACE_INLINE TAO_WString_Manager&
 TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
 {
-  if (this == &rhs)
-    return *this;
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_WString_Manager tmp (rhs);
+
+  CORBA::WChar * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_  = old_ptr;
 
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (rhs.ptr_);
   return *this;
 }
 
@@ -231,8 +258,14 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
 ACE_INLINE TAO_WString_Manager &
 TAO_WString_Manager::operator= (const CORBA::WChar * p)
 {
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (p);
+  // Strongly exception safe by means of copy and non-throwing swap
+  // technique.
+  TAO_WString_Manager tmp (p);
+
+  CORBA::WChar * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
+
   return *this;
 }
 
@@ -370,3 +403,5 @@ TAO_SeqElem_WString_Manager::_retn (void)
   *this->ptr_ = 0;
   return temp;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 7d8710b6fac..44d96d99ad5 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -15,6 +15,8 @@
 
 #include "ace/Copy_Disabled.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
   : mesg_base_ (0)
   , request_id_ (0)
@@ -48,25 +50,25 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
       {
         return;
       }
-
-    // If sending the exception to the client fails, then we just give
-    // up, release the transport and return.
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-      {
-        CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
-                               (TAO_AMH_REPLY_LOCATION_CODE,
-                                EFAULT),
-                               CORBA::COMPLETED_NO);
-        this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHALL
-      {
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
+
+  // If sending the exception to the client fails, then we just give
+  // up, release the transport and return.
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
+                             (TAO_AMH_REPLY_LOCATION_CODE,
+                              EFAULT),
+                             CORBA::COMPLETED_NO);
+      this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHALL
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
 }
 
 void
@@ -186,10 +188,10 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
     if (this->reply_status_ != TAO_RS_UNINITIALIZED)
       {
         ACE_THROW (CORBA::BAD_INV_ORDER (
-                                         CORBA::SystemException::_tao_minor_code (
-                                                                                  TAO_AMH_REPLY_LOCATION_CODE,
-                                                                                  ENOTSUP),
-                                         CORBA::COMPLETED_YES));
+          CORBA::SystemException::_tao_minor_code (
+            TAO_AMH_REPLY_LOCATION_CODE,
+            ENOTSUP),
+          CORBA::COMPLETED_YES));
       }
     this->reply_status_ = TAO_RS_SENDING;
   }
@@ -239,9 +241,9 @@ TAO_AMH_Response_Handler::_remove_ref (void)
 
   if (this->allocator_)
     {
-      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_);
+      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_);
 
-      allocator.release(this);
+      allocator.release (this);
     }
   else
     {
@@ -260,3 +262,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 678aa406821..585ed1defea 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -7,14 +7,13 @@
  *  $Id$
  *
  *  @author Mayur Deshpande <mayur@ics.uci.edu>
- *
  */
 // =========================================================================
 
 #ifndef TAO_AMH_RESPONSE_HANDLER_H
 #define TAO_AMH_RESPONSE_HANDLER_H
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 
 #include "tao/Allocator.h"
 #include "tao/Service_Context.h"
@@ -29,12 +28,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport;
 class TAO_Pluggable_Messaging;
 class TAO_Output_CDR;
 class TAO_ORB_Core;
 class TAO_ServerRequest;
-class ACE_Allocator;
 
 typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
 
@@ -65,7 +69,7 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler
 //    isn't consistent with the specified semantics detailed in the
 //    CCM spec.  Please remove this and place it where appropriate in
 //    your AMH tests and examples.
-  : virtual public TAO_Local_RefCounted_Object
+  : public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -82,8 +86,8 @@ public:
   /**
    * Stores necessary information from a TAO_Server_Request onto the heap
    */
-  virtual void init(TAO_ServerRequest &server_request,
-                    TAO_AMH_BUFFER_ALLOCATOR* allocator);
+  virtual void init (TAO_ServerRequest &server_request,
+		     TAO_AMH_BUFFER_ALLOCATOR* allocator);
 
   /// @name Mutators for refcount
   //@{
@@ -118,8 +122,8 @@ protected:
 private:
 
   // Private and undefined, standard C++ idiom to prohibit copying.
-  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
+  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
@@ -136,7 +140,7 @@ private:
 
   /// A pointer to the ORB Core for the context where the request was
   /// created.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * orb_core_;
 
   /// The reply service context
   TAO_Service_Context reply_service_context_;
@@ -213,4 +217,6 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_AMH_RESPONSE_HANDLER_H */
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 6d84968d1f6..619de3ed97b 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "Asynch_Invocation.h"
-#include "Asynch_Reply_Dispatcher.h"
+#include "tao/Messaging/Asynch_Invocation.h"
+#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/Invocation_Utils.h"
@@ -20,6 +20,8 @@ ACE_RCSID (Messaging,
            Asynch_Invocation,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Asynch_Remote_Invocation::Asynch_Remote_Invocation (
@@ -64,6 +66,13 @@ namespace TAO
     // try block is to take care of the cases when things go wrong.
     ACE_TRY
       {
+        // Oneway semantics.  See comments for below send_message()
+        // call.
+        cdr.message_attributes (this->details_.request_id (),
+                                this->resolver_.stub (),
+                                TAO_Transport::TAO_ONEWAY_REQUEST,
+                                max_wait_time);
+
         this->write_header (tspec,
                             cdr
                             ACE_ENV_ARG_PARAMETER);
@@ -184,3 +193,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
index b058c4c43a0..930d223bd3c 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ b/TAO/tao/Messaging/Asynch_Invocation.h
@@ -25,9 +25,15 @@
 #include "ace/Global_Macros.h"
 #include "ace/Auto_Functor.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_InputCDR;
-class ACE_Time_Value;
 class TAO_Asynch_Reply_Dispatcher_Base;
 
 namespace CORBA
@@ -62,6 +68,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_MESSAGING_ASYNCH_INVOCATION_H*/
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index ddbd6c62b5a..b88ff2855ae 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "Asynch_Invocation_Adapter.h"
-#include "Asynch_Reply_Dispatcher.h"
-#include "Asynch_Invocation.h"
+#include "tao/Messaging/Asynch_Invocation_Adapter.h"
+#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
+#include "tao/Messaging/Asynch_Invocation.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/operation_details.h"
@@ -12,6 +12,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
+#include "tao/GIOP_Utils.h"
 
 
 ACE_RCSID (Messaging,
@@ -19,6 +20,8 @@ ACE_RCSID (Messaging,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (
@@ -172,8 +175,16 @@ namespace TAO
       {
         effective_target = asynch.steal_forwarded_reference ();
 
+#if TAO_HAS_INTERCEPTORS == 1
+        const CORBA::Boolean permanent_forward =
+            (asynch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM);
+#else
+        const CORBA::Boolean permanent_forward = false;
+#endif
+
         this->object_forwarded (effective_target,
-                                r.stub ()
+                                r.stub (),
+                                permanent_forward
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -182,3 +193,5 @@ namespace TAO
   }
 
 } // End namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index f48671c9360..97cc214a71d 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -29,9 +29,14 @@
 #include "ace/Global_Macros.h"
 #include "ace/Auto_Functor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Stub;
-class ACE_Time_Value;
 class TAO_Asynch_Reply_Dispatcher;
 class TAO_Asynch_Reply_Dispatcher_Base;
 
@@ -90,15 +95,17 @@ namespace TAO
                             ARDB_Refcount_Functor> safe_rd_;
 
   private:
-    /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter (void))
+    /// Don't allow default initializations
+    Asynch_Invocation_Adapter (void);
 
-    ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &))
+    Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &);
+    Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &);
 
   };
 } // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
-#endif /*TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H*/
+#endif /* TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H */
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index e3fab16ec13..7866e1277e7 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Asynch_Reply_Dispatcher.h"
+#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/ORB_Core.h"
@@ -12,6 +12,8 @@
 
 ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
     const TAO_Reply_Handler_Skeleton &reply_handler_skel,
@@ -108,6 +110,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
       break;
     default:
     case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
+    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM:
       // @@ Michael: Not even the spec mentions this case.
       //             We have to think about this case.
       // Handle the forwarding and return so the stub restarts the
@@ -276,3 +279,5 @@ TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id,
       request_id,
       max_wait_time);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 03a35ced0a3..5b315547813 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -16,19 +16,23 @@
 #define TAO_ASYNCH_REPLY_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "Messaging.h"
+#include "tao/Messaging/Messaging.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Asynch_Timeout_Handler.h"
+#include "tao/Messaging/Asynch_Timeout_Handler.h"
 #include "tao/Asynch_Reply_Dispatcher_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Reply dispatcher for Asynchoronous Method Invocation (AMI)s.
-class TAO_Messaging_Export TAO_Asynch_Reply_Dispatcher
+class TAO_Asynch_Reply_Dispatcher
   : public TAO_Asynch_Reply_Dispatcher_Base
 {
 public:
@@ -69,5 +73,7 @@ private:
   TAO_Asynch_Timeout_Handler *timeout_handler_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ASYNCH_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index b3fecff6a83..f72a1d46d85 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 
-#include "Asynch_Timeout_Handler.h"
+#include "tao/Messaging/Asynch_Timeout_Handler.h"
 
-#include "Asynch_Reply_Dispatcher.h"
+#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
 #include "tao/Transport_Mux_Strategy.h"
 #include "ace/Reactor.h"
 
@@ -11,6 +11,7 @@ ACE_RCSID (Messaging,
            Asynch_Timeout_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
   TAO_Asynch_Reply_Dispatcher_Base *rd,
@@ -73,3 +74,5 @@ TAO_Asynch_Timeout_Handler::cancel ()
       this->reactor_->cancel_timer (this);
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
index be230bb6374..9b8a55eb8c2 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -30,6 +30,8 @@
 
 #include "ace/Event_Handler.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Asynch_Reply_Dispatcher_Base;
 class TAO_Transport_Mux_Strategy;
 
@@ -38,7 +40,7 @@ class TAO_Transport_Mux_Strategy;
  *
  * @brief Handler registered with the reactor in case of AMI timeouts.
  */
-class TAO_Messaging_Export TAO_Asynch_Timeout_Handler
+class TAO_Asynch_Timeout_Handler
   : public ACE_Event_Handler
 {
 public:
@@ -73,6 +75,8 @@ public:
   ACE_Reactor *reactor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index df49288c887..d17338aae9c 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -1,5 +1,5 @@
 //$Id$
-#include "Connection_Timeout_Policy_i.h"
+#include "tao/Messaging/Connection_Timeout_Policy_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
@@ -12,11 +12,13 @@ ACE_RCSID (Messaging,
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
   const TimeBase::TimeT& relative_expiry)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , TAO::ConnectionTimeoutPolicy ()
   , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (relative_expiry)
@@ -25,9 +27,9 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
 
 TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
   const TAO_ConnectionTimeoutPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , TAO::ConnectionTimeoutPolicy ()
   , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (rhs.relative_expiry_)
@@ -186,11 +188,13 @@ TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
 
   if (TAO_debug_level > 0)
     {
-      CORBA::ULong msecs = time_value.msec ();
+      CORBA::ULong const msecs = time_value.msec ();
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
                   msecs));
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 73f041dca16..9e334a307a7 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Connection_Timeout_Policy_i.h
@@ -11,6 +12,7 @@
 
 #ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H
 #define TAO_CONNECTION_TIMEOUT_POLICY_I_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
@@ -19,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_ExtC.h"
+#include "tao/Messaging/TAO_ExtC.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
@@ -30,6 +32,8 @@
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  * @class TAO_ConnectionTimeoutPolicy
  *
@@ -38,7 +42,7 @@
  *  This policy controls the connection timeout time while
  *  establishing connections. This policy is proprietary to TAO.
  */
-class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy
+class TAO_ConnectionTimeoutPolicy
   : public TAO::ConnectionTimeoutPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -89,6 +93,8 @@ private:
   TimeBase::TimeT relative_expiry_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if defined(_MSC_VER)
@@ -96,4 +102,5 @@ private:
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
-#endif /*TAO_CONNECTION_TIMEOUT_POLICY_I_H*/
+
+#endif  /* TAO_CONNECTION_TIMEOUT_POLICY_I_H */
diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp
index 4acda37b712..cdfa65d9f3f 100644
--- a/TAO/tao/Messaging/ExceptionHolderA.cpp
+++ b/TAO/tao/Messaging/ExceptionHolderA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ExceptionHolderA.h"
+#include "tao/Messaging/ExceptionHolderA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -41,8 +41,7 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/value_typecode.cpp:63
@@ -189,8 +188,7 @@ operator>>= (
       );
 }
 
-
-
 #endif
 
-#endif
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h
index b3c03859799..b72bb462fb2 100644
--- a/TAO/tao/Messaging/ExceptionHolderA.h
+++ b/TAO/tao/Messaging/ExceptionHolderA.h
@@ -33,17 +33,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/ExceptionHolderC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 #include "tao/AnyTypeCode/DynamicA.h"
 
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -79,7 +79,7 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi
 
 #endif
 
-#endif
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp
index 285d835210b..8de5efc6d7b 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/ExceptionHolderC.cpp
@@ -29,21 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "ExceptionHolderC.h"
+#include "tao/Messaging/ExceptionHolderC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
 #if !defined (__ACE_INLINE__)
-#include "ExceptionHolderC.inl"
+#include "tao/Messaging/ExceptionHolderC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -159,6 +159,17 @@ Messaging::ExceptionHolder::~ExceptionHolder (void)
 OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
 {}
 
+OBV_Messaging::ExceptionHolder::ExceptionHolder (
+    ::CORBA::Boolean _tao_init_is_system_exception,
+    ::CORBA::Boolean _tao_init_byte_order,
+    const ::CORBA::OctetSeq & _tao_init_marshaled_exception
+  )
+{
+  is_system_exception (_tao_init_is_system_exception);
+  byte_order (_tao_init_byte_order);
+  marshaled_exception (_tao_init_marshaled_exception);
+}
+
 OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
 {}
 
@@ -304,4 +315,5 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
   );
 }
 
-#endif
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h
index ffedf44d5f4..841d6712b25 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.h
+++ b/TAO/tao/Messaging/ExceptionHolderC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
@@ -56,11 +56,11 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Messaging_Export
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -221,6 +221,11 @@ namespace OBV_Messaging
 
   protected:
     ExceptionHolder (void);
+    ExceptionHolder (
+      ::CORBA::Boolean _tao_init_is_system_exception,
+      ::CORBA::Boolean _tao_init_byte_order,
+      const ::CORBA::OctetSeq & _tao_init_marshaled_exception
+    );
     virtual ~ExceptionHolder (void);
 
   protected:
@@ -281,12 +286,12 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ExceptionHolderC.inl"
+#include "tao/Messaging/ExceptionHolderC.inl"
 #endif /* defined INLINE */
 
-#endif
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl
index 6348b2eb0c7..11cb115f908 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.inl
+++ b/TAO/tao/Messaging/ExceptionHolderC.inl
@@ -29,7 +29,7 @@
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_ci.cpp:56
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
@@ -41,4 +41,5 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
 }
 
-#endif
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 8b245a2ac34..9f0c1f164cf 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Messaging.h"
-#include "Messaging_Loader.h"
+#include "tao/Messaging/Messaging.h"
+#include "tao/Messaging/Messaging_Loader.h"
 
 #include "tao/Exception_Data.h"
 #include "tao/debug.h"
@@ -17,6 +17,9 @@ ACE_RCSID (Messaging,
            Messaging,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Messaging_Initializer::init (void)
 {
@@ -56,7 +59,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
                                    CORBA::COMPLETED_MAYBE));
 
       CORBA::SystemException* exception =
-        TAO_Exceptions::create_system_exception (type_id.in ());
+        TAO::create_system_exception (type_id.in ());
 
       if (exception == 0)
         {
@@ -85,7 +88,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0)
         continue;
 
-      CORBA::Exception *exception = exception_data[i].alloc ();
+      CORBA::Exception * const exception = exception_data[i].alloc ();
 
       if (exception == 0)
         ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
@@ -95,7 +98,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
 
       // Raise the exception.
 #if defined (TAO_HAS_EXCEPTIONS)
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(exception);
+      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception);
 #endif
       ACE_ENV_RAISE (exception);
 
@@ -111,3 +114,5 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
   ACE_THROW (CORBA::UNKNOWN (TAO::VMCID,
                              CORBA::COMPLETED_YES));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index ba4077c94cb..4c4647e5432 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -14,10 +14,20 @@
 
 #ifndef TAO_MESSAGING_H
 #define TAO_MESSAGING_H
+
 #include /**/ "ace/pre.h"
 
+#include "tao/Messaging/messaging_export.h"
+
+#define TAO_MESSAGING_SAFE_INCLUDE
+#include "tao/Messaging/MessagingC.h"
+#undef TAO_MESSAGING_SAFE_INCLUDE
+
+#include "tao/Messaging/MessagingA.h"
+#include "tao/Messaging/TAO_ExtC.h"
+#include "tao/TAOC.h"
 
-#include "messaging_export.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Messaging_Export TAO_Messaging_Initializer
 {
@@ -29,15 +39,6 @@ public:
 static int
 TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
 
-#define TAO_MESSAGING_SAFE_INCLUDE
-#include "MessagingC.h"
-#undef TAO_MESSAGING_SAFE_INCLUDE
-
-#include "MessagingA.h"
-#include "TAO_ExtC.h"
-#include "tao/TAOC.h"
-
-
 // Typedef for the Reply Handler Skeleton.
 // This is handcrafted not generated by the IDL compiler.
 
@@ -91,6 +92,7 @@ namespace TAO_Messaging_Helper
            ACE_ENV_ARG_DECL);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_MESSAGING_H */
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index ae94cc8598a..d54d9ed1a34 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging.h"
+#include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -164,3 +166,5 @@ operator>>= (
 }
 
 #endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h
index f07ee68a2ab..9d9ddfbdaea 100644
--- a/TAO/tao/Messaging/MessagingA.h
+++ b/TAO/tao/Messaging/MessagingA.h
@@ -33,20 +33,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/MessagingC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyA.h"
 #include "tao/Messaging/Messaging_RT_PolicyA.h"
 #include "tao/Messaging/Messaging_No_ImplA.h"
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-#include "tao/Messaging/OldExceptionHolderA.h"
-#else
 #include "tao/Messaging/ExceptionHolderA.h"
-#endif
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -82,6 +80,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi
 
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 0fb388a8db1..a6db499d6e0 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -29,18 +29,20 @@
 // be\be_codegen.cpp:277
 
 
-#include "Messaging.h"
+#include "tao/Messaging/Messaging.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingC.inl"
+#include "tao/Messaging/MessagingC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,7 +67,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::release (
     Messaging::ReplyHandler_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::ReplyHandler_ptr
@@ -84,7 +86,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     ::CORBA::Object_ptr obj
   ) = 0;
@@ -108,12 +110,12 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void 
+void
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
     static_cast<ReplyHandler *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 Messaging::ReplyHandler_ptr
@@ -149,18 +151,18 @@ Messaging::ReplyHandler::_unchecked_narrow (
 Messaging::ReplyHandler_ptr
 Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::ReplyHandler::_tao_release (ReplyHandler_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -184,7 +186,7 @@ Messaging::ReplyHandler::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -220,20 +222,22 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
   )
 {
   ::CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index a7ea6b985d0..d9ca0057868 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -44,7 +44,7 @@
 #error "You should not include MessagingC.h directly, use Messaging.h"
 #endif /* !TAO_MESSAGING_SAFE_INCLUDE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -55,17 +55,15 @@
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/Messaging/PollableC.h"
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-#include "tao/Messaging/OldExceptionHolderC.h"
-#else
 #include "tao/Messaging/ExceptionHolderC.h"
-#endif
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Messaging_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -211,7 +209,7 @@ namespace TAO
 
 #if !defined (_MESSAGING_REPLYHANDLER__TRAITS_)
 #define _MESSAGING_REPLYHANDLER__TRAITS_
-  
+
   template<>
   struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyHandler>
   {
@@ -240,8 +238,10 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rep
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "MessagingC.inl"
+#include "tao/Messaging/MessagingC.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl
index 465190bb2db..8ecf720126a 100644
--- a/TAO/tao/Messaging/MessagingC.inl
+++ b/TAO/tao/Messaging/MessagingC.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -39,7 +40,7 @@ Messaging::ReplyHandler::ReplyHandler (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
+  : ::CORBA::Object (
         objref,
         _tao_collocated,
         servant,
@@ -55,9 +56,11 @@ Messaging::ReplyHandler::ReplyHandler (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_ReplyHandler_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 65746739df0..913acc12d64 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_MESSAGINGS_CPP_
 
 
-#include "MessagingS.h"
+#include "tao/Messaging/MessagingS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
@@ -63,6 +63,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -795,5 +797,7 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ifndef */
 
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index c633f3027ba..7c5f68e5eee 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Messaging.h"
+#include "tao/Messaging/Messaging.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,6 +46,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_Messaging
 {
 
@@ -201,7 +203,9 @@ namespace POA_Messaging
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-#include "MessagingS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "tao/Messaging/MessagingS_T.h"
 
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index 1f53170dde1..c7390c0ad31 100644
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ b/TAO/tao/Messaging/MessagingS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_MESSAGINGS_T_CPP_
 #define _TAO_IDL_MESSAGINGS_T_CPP_
 
-#include "MessagingS_T.h"
+#include "tao/Messaging/MessagingS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingS_T.inl"
+#include "tao/Messaging/MessagingS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index 426a76f0529..6c0a6279ac8 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -33,15 +33,17 @@
 
 #include /**/ "ace/pre.h"
 
-// TAO_IDL - Generated from 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_sth.cpp:116
 
 namespace POA_Messaging
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/tie_sh.cpp:87
-  
+
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ReplyHandler_tie : public ReplyHandler
@@ -56,49 +58,51 @@ namespace POA_Messaging
     ReplyHandler_tie (
         T *tp,
         PortableServer::POA_ptr poa,
-        ::CORBA::Boolean release = 1
+        ::CORBA::Boolean release = true
       );
     // ctor with T*, ownership flag and a POA
     ~ReplyHandler_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, ::CORBA::Boolean release = 1);
+    void _tied_object (T *obj, ::CORBA::Boolean release = true);
     // set the underlying object and the ownership flag
     ::CORBA::Boolean _is_owner (void);
     // do we own it
     void _is_owner ( ::CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-  
+
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     ::CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
   };
 } // module Messaging
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:1165
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "MessagingS_T.inl"
+#include "tao/Messaging/MessagingS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "MessagingS_T.cpp"
+#include "tao/Messaging/MessagingS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Messaging/MessagingS_T.inl b/TAO/tao/Messaging/MessagingS_T.inl
index 0a3b3cfd130..45319a7c078 100644
--- a/TAO/tao/Messaging/MessagingS_T.inl
+++ b/TAO/tao/Messaging/MessagingS_T.inl
@@ -25,6 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
@@ -119,3 +120,4 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
   return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index f823aabd690..81555edbf4a 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -1,23 +1,24 @@
 
 // $Id$
 
-#include "Messaging_Loader.h"
-#include "Messaging_ORBInitializer.h"
+#include "tao/Messaging/Messaging_Loader.h"
+#include "tao/Messaging/Messaging_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (TAO, Messaging_Loader, "$Id$")
+ACE_RCSID (Messaging, Messaging_Loader, "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Messaging_Loader::TAO_Messaging_Loader (void)
 {
 }
 
 TAO_Messaging_Loader::~TAO_Messaging_Loader (void)
 {
-
 }
 
 int
@@ -61,7 +62,7 @@ TAO_Messaging_Loader::init (int,
       if (TAO_debug_level > 0)
         {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "(%P | %t) Caught exception:");
+                               "Caught exception:");
         }
       return -1;
     }
@@ -70,6 +71,8 @@ TAO_Messaging_Loader::init (int,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////////////////////////////////////////////
 
 ACE_FACTORY_DEFINE (TAO_Messaging, TAO_Messaging_Loader)
diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h
index 08a4a7fd154..d15ee63f1c7 100644
--- a/TAO/tao/Messaging/Messaging_Loader.h
+++ b/TAO/tao/Messaging/Messaging_Loader.h
@@ -1,23 +1,19 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
  *  @file    Messaging_Loader.h
  *
  *  $Id$
- *
- *   Header file for Loading RTScheduler.
- *
- *
- *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
  */
 //=============================================================================
 
-#ifndef TAO_RTSCHEDULER_LOADER_H
-#define TAO_RTSCHEDULER_LOADER_H
+#ifndef TAO_MESSAGING_LOADER_H
+#define TAO_MESSAGING_LOADER_H
+
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
@@ -26,6 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object
 {
 public:
@@ -40,8 +40,10 @@ public:
                     ACE_TCHAR* []);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Messaging, TAO_Messaging_Loader)
 ACE_FACTORY_DECLARE (TAO_Messaging, TAO_Messaging_Loader)
 
 #include /**/ "ace/post.h"
-#endif /* TAO_RTSCHEDULER_LOADER_H */
+#endif /* TAO_MESSAGING_LOADER_H */
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index cb4d2d6d29a..bd636c617ee 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_No_ImplA.h"
+#include "tao/Messaging/Messaging_No_ImplA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,6 +38,8 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -493,3 +495,5 @@ void operator<<= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.h b/TAO/tao/Messaging/Messaging_No_ImplA.h
index a2d24bed959..e11e3273d6c 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
 #include "tao/AnyTypeCode/PolicyA.h"
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -151,6 +153,8 @@ TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::RoutingTypeRan
 TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated
 TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const Messaging::RoutingTypeRange *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index cd27dfdd4bc..456e69837f8 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "Messaging_No_ImplC.h"
+#include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::release (
     Messaging::RebindPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RebindPolicy_ptr
@@ -109,18 +111,18 @@ Messaging::RebindPolicy::_unchecked_narrow (
 Messaging::RebindPolicy_ptr
 Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RebindPolicy::_tao_release (RebindPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -167,10 +169,10 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 Messaging::PriorityRange::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -198,7 +200,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release (
     Messaging::RequestPriorityPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RequestPriorityPolicy_ptr
@@ -247,18 +249,18 @@ Messaging::RequestPriorityPolicy::_unchecked_narrow (
 Messaging::RequestPriorityPolicy_ptr
 Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RequestPriorityPolicy::_tao_release (RequestPriorityPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -323,7 +325,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release (
     Messaging::ReplyPriorityPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::ReplyPriorityPolicy_ptr
@@ -372,18 +374,18 @@ Messaging::ReplyPriorityPolicy::_unchecked_narrow (
 Messaging::ReplyPriorityPolicy_ptr
 Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::ReplyPriorityPolicy::_tao_release (ReplyPriorityPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -448,7 +450,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release (
     Messaging::RequestStartTimePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RequestStartTimePolicy_ptr
@@ -497,18 +499,18 @@ Messaging::RequestStartTimePolicy::_unchecked_narrow (
 Messaging::RequestStartTimePolicy_ptr
 Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RequestStartTimePolicy::_tao_release (RequestStartTimePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -573,7 +575,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release (
     Messaging::RequestEndTimePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RequestEndTimePolicy_ptr
@@ -622,18 +624,18 @@ Messaging::RequestEndTimePolicy::_unchecked_narrow (
 Messaging::RequestEndTimePolicy_ptr
 Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RequestEndTimePolicy::_tao_release (RequestEndTimePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -698,7 +700,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release (
     Messaging::ReplyStartTimePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::ReplyStartTimePolicy_ptr
@@ -747,18 +749,18 @@ Messaging::ReplyStartTimePolicy::_unchecked_narrow (
 Messaging::ReplyStartTimePolicy_ptr
 Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::ReplyStartTimePolicy::_tao_release (ReplyStartTimePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -823,7 +825,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release (
     Messaging::ReplyEndTimePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::ReplyEndTimePolicy_ptr
@@ -872,18 +874,18 @@ Messaging::ReplyEndTimePolicy::_unchecked_narrow (
 Messaging::ReplyEndTimePolicy_ptr
 Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::ReplyEndTimePolicy::_tao_release (ReplyEndTimePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -948,7 +950,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release (
     Messaging::RelativeRequestTimeoutPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RelativeRequestTimeoutPolicy_ptr
@@ -997,18 +999,18 @@ Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
 Messaging::RelativeRequestTimeoutPolicy_ptr
 Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RelativeRequestTimeoutPolicy::_tao_release (RelativeRequestTimeoutPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1055,10 +1057,10 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 Messaging::RoutingTypeRange::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1086,7 +1088,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::release (
     Messaging::RoutingPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RoutingPolicy_ptr
@@ -1135,18 +1137,18 @@ Messaging::RoutingPolicy::_unchecked_narrow (
 Messaging::RoutingPolicy_ptr
 Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RoutingPolicy::_tao_release (RoutingPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1211,7 +1213,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release (
     Messaging::MaxHopsPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::MaxHopsPolicy_ptr
@@ -1260,18 +1262,18 @@ Messaging::MaxHopsPolicy::_unchecked_narrow (
 Messaging::MaxHopsPolicy_ptr
 Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::MaxHopsPolicy::_tao_release (MaxHopsPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1336,7 +1338,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release (
     Messaging::QueueOrderPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::QueueOrderPolicy_ptr
@@ -1385,18 +1387,18 @@ Messaging::QueueOrderPolicy::_unchecked_narrow (
 Messaging::QueueOrderPolicy_ptr
 Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::QueueOrderPolicy::_tao_release (QueueOrderPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -1488,3 +1490,5 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
     (strm >> _tao_aggregate.min) &&
     (strm >> _tao_aggregate.max);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index 8efa3edd9dd..ba97ba1885e 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
   
@@ -1763,6 +1765,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rou
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index d373535fff1..82a57e50c9e 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -1,16 +1,21 @@
 // -*- C++ -*-
 
-#include "Messaging_ORBInitializer.h"
+#include "tao/Messaging/Messaging_ORBInitializer.h"
 
-#include "Messaging_Policy_i.h"
-#include "Connection_Timeout_Policy_i.h"
-#include "Messaging_PolicyFactory.h"
+#include "tao/Messaging/Messaging_Policy_i.h"
+#include "tao/Messaging/Connection_Timeout_Policy_i.h"
+#include "tao/Messaging/Messaging_PolicyFactory.h"
+#include "tao/Messaging/ExceptionHolder_i.h"
 #include "tao/ORB_Core.h"
+#include "tao/PI/ORBInitInfo.h"
+#include "tao/Valuetype/ValueFactory.h"
 
 ACE_RCSID (Messaging,
            Messaging_ORBInitializer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Messaging_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -42,9 +47,48 @@ TAO_Messaging_ORBInitializer::post_init (
   this->register_policy_factories (info
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+  this->register_value_factory (info
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
+TAO_Messaging_ORBInitializer::register_value_factory (
+  PortableInterceptor::ORBInitInfo_ptr info
+  ACE_ENV_ARG_DECL)
+{
+  // Narrow to a TAO_ORBInitInfo object to get access to the
+  // orb_core() TAO extension.
+  TAO_ORBInitInfo_var tao_info =
+    TAO_ORBInitInfo::_narrow (info
+                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (CORBA::is_nil (tao_info.in ()))
+    {
+      if (TAO_debug_level > 0)
+        ACE_ERROR ((LM_ERROR,
+                    "(%P|%t) TAO_Messaging_ORBInitializer::register_value_factory:\n"
+                    "(%P|%t)    Unable to narrow "
+                    "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
+                    "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
+
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  TAO::ExceptionHolderFactory *base_factory = 0;
+  ACE_NEW (base_factory,
+           TAO::ExceptionHolderFactory);
+  CORBA::ValueFactory_var factory = base_factory;
+
+  tao_info->orb_core()->orb ()->register_value_factory (
+        Messaging::ExceptionHolder::_tao_obv_static_repository_id (),
+        base_factory
+        ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
+}
+void
 TAO_Messaging_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
   ACE_ENV_ARG_DECL)
@@ -144,3 +188,5 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index f9d7398a5f1..e5d57c2a72d 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,9 +32,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Messaging ORB initializer.
-class TAO_Messaging_Export TAO_Messaging_ORBInitializer
+class TAO_Messaging_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -64,14 +65,19 @@ private:
   void register_policy_factories (
     PortableInterceptor::ORBInitInfo_ptr info
     ACE_ENV_ARG_DECL);
+
+  /// Register ExceptionHolder value factory
+  void register_value_factory (
+    PortableInterceptor::ORBInitInfo_ptr info
+    ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_MESSAGING_ORB_INITIALIZER_H */
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 00b089ed21c..7fcda386a8b 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,17 +1,19 @@
-#include "Messaging_PolicyFactory.h"
+#include "tao/Messaging/Messaging_PolicyFactory.h"
 
 ACE_RCSID (Messaging,
            Messaging_PolicyFactory,
            "$Id$")
 
-#include "Messaging_Policy_i.h"
-#include "Connection_Timeout_Policy_i.h"
+#include "tao/Messaging/Messaging_Policy_i.h"
+#include "tao/Messaging/Connection_Timeout_Policy_i.h"
 
 #include "tao/PolicyC.h"
 #include "tao/Buffering_Constraint_Policy.h"
 #include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Any.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
 CORBA::Policy_ptr
@@ -105,3 +107,5 @@ TAO_Messaging_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 823a3d46908..c2b36ed1a43 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +33,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all Messaging related policies.
-class TAO_Messaging_Export TAO_Messaging_PolicyFactory
+class TAO_Messaging_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -53,6 +55,7 @@ private:
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index f4e244a8696..dc98c862747 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 #include "tao/Messaging/Messaging_Policy_i.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
@@ -6,20 +7,22 @@
 #include "tao/AnyTypeCode/Any.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "Messaging_Policy_i.i"
+#include "tao/Messaging/Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Messaging,
            Messaging_Policy_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
   const TimeBase::TimeT& relative_expiry)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , Messaging::RelativeRoundtripTimeoutPolicy ()
   , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (relative_expiry)
@@ -28,9 +31,9 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
 
 TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
   const TAO_RelativeRoundtripTimeoutPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , Messaging::RelativeRoundtripTimeoutPolicy ()
   , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (rhs.relative_expiry_)
@@ -127,7 +130,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
     ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
                       CORBA::Policy::_nil ());
 
-  TAO_RelativeRoundtripTimeoutPolicy *tmp;
+  TAO_RelativeRoundtripTimeoutPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_RelativeRoundtripTimeoutPolicy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -200,9 +203,9 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
 TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , Messaging::SyncScopePolicy ()
   , TAO_Local_RefCounted_Object ()
   , synchronization_ (synchronization)
@@ -210,9 +213,9 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronizati
 }
 
 TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , Messaging::SyncScopePolicy ()
   , TAO_Local_RefCounted_Object ()
   , synchronization_ (rhs.synchronization_)
@@ -339,3 +342,5 @@ TAO_Sync_Scope_Policy::_tao_cached_type (void) const
 }
 
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 25ee477009e..588ea35d89b 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 /*
@@ -33,7 +35,7 @@
  *  This policy controls the total (round-trip) timeout time for a
  *  request.
  */
-class TAO_Messaging_Export TAO_RelativeRoundtripTimeoutPolicy
+class TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -151,8 +153,10 @@ private:
 
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Messaging_Policy_i.i"
+#include "tao/Messaging/Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.i b/TAO/tao/Messaging/Messaging_Policy_i.i
index 2915eaae01e..f33ea289267 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.i
+++ b/TAO/tao/Messaging/Messaging_Policy_i.i
@@ -1,11 +1,17 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const
 {
   s = this->synchronization_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
index 480dc301af5..21854a2d37a 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_RT_PolicyA.h"
+#include "tao/Messaging/Messaging_RT_PolicyA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -71,4 +73,4 @@ namespace Messaging
     &_tao_tc_Messaging_RelativeRoundtripTimeoutPolicy;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.h b/TAO/tao/Messaging/Messaging_RT_PolicyA.h
index 02ca2ce7790..97eb8c77a6a 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
 #include "tao/AnyTypeCode/PolicyA.h"
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -60,6 +62,8 @@ namespace Messaging
 
 } // module Messaging
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 8b89e1d6b0d..bc5c33ca558 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "Messaging_RT_PolicyC.h"
+#include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
@@ -109,18 +111,18 @@ Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
 Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::RelativeRoundtripTimeoutPolicy::_tao_release (RelativeRoundtripTimeoutPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -166,3 +168,5 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 94187df87b4..7c084869fb8 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,6 +58,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
   
@@ -223,6 +225,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
index 587d65ab1a9..a431f947a2c 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_SyncScope_PolicyA.h"
+#include "tao/Messaging/Messaging_SyncScope_PolicyA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -51,4 +53,4 @@ namespace Messaging
     &_tao_tc_Messaging_SyncScopePolicy;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h
index daa19a0c347..f330605f5b5 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
@@ -42,6 +42,9 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -55,6 +58,8 @@ namespace Messaging
 
 } // module Messaging
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index ff6a8d19564..8eee8c74403 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "Messaging_SyncScope_PolicyC.h"
+#include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::release (
     Messaging::SyncScopePolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 Messaging::SyncScopePolicy_ptr
@@ -109,18 +111,18 @@ Messaging::SyncScopePolicy::_unchecked_narrow (
 Messaging::SyncScopePolicy_ptr
 Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 Messaging::SyncScopePolicy::_tao_release (SyncScopePolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -166,3 +168,5 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index 8354217f535..c22a5b02446 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,6 +58,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
   
@@ -217,6 +219,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolder.pidl b/TAO/tao/Messaging/OldExceptionHolder.pidl
deleted file mode 100644
index 3e3cab1ef2d..00000000000
--- a/TAO/tao/Messaging/OldExceptionHolder.pidl
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   OldExceptionHolder.pidl
- *
- *  $Id$
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -GA -SS
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        OldExceptionHolder.pidl
- *
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL
-#define TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL
-
-#include "tao/OctetSeq.pidl"
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  /// Exception Delivery in the Callback Model
-  valuetype ExceptionHolder {
-    public boolean         is_system_exception;
-    public boolean         byte_order;
-    public CORBA::OctetSeq marshaled_exception;
-  };
-};
-
-#endif /* TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp
index 8de6c9b59be..133a1701ad9 100644
--- a/TAO/tao/Messaging/OldExceptionHolderA.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "OldExceptionHolderA.h"
+#include "tao/Messaging/OldExceptionHolderA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -43,6 +43,8 @@
 
 #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:937
 
@@ -187,4 +189,6 @@ operator>>= (
 
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h
index 428e264c75d..11613cef0bd 100644
--- a/TAO/tao/Messaging/OldExceptionHolderA.h
+++ b/TAO/tao/Messaging/OldExceptionHolderA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/OldExceptionHolderC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -77,6 +79,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi
 
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp
index a51fe765e3c..e26cccea3c6 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp
@@ -29,16 +29,18 @@
 // be\be_codegen.cpp:277
 
 
-#include "OldExceptionHolderC.h"
+#include "tao/Messaging/OldExceptionHolderC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-#include "OldExceptionHolderC.inl"
+#include "tao/Messaging/OldExceptionHolderC.inl"
 #endif /* !defined INLINE */
 
 #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -337,4 +339,6 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h
index 6c4049eb423..a3bcc4ed8bb 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.h
+++ b/TAO/tao/Messaging/OldExceptionHolderC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/Valuetype/ValueFactory.h"
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
 
@@ -288,8 +290,10 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "OldExceptionHolderC.inl"
+#include "tao/Messaging/OldExceptionHolderC.inl"
 #endif /* defined INLINE */
 
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl
index 0e9229fa8d4..c2586897783 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.inl
+++ b/TAO/tao/Messaging/OldExceptionHolderC.inl
@@ -31,6 +31,8 @@
 
 #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
 {}
@@ -41,4 +43,6 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderS.h b/TAO/tao/Messaging/OldExceptionHolderS.h
deleted file mode 100644
index de1c8620033..00000000000
--- a/TAO/tao/Messaging/OldExceptionHolderS.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:373
-
diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp
index b2a14c34a8a..37bf32a28f1 100644
--- a/TAO/tao/Messaging/PollableC.cpp
+++ b/TAO/tao/Messaging/PollableC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "PollableC.h"
+#include "tao/Messaging/PollableC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -45,6 +45,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -69,7 +71,7 @@ TAO::Objref_Traits<CORBA::Pollable>::release (
     CORBA::Pollable_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Pollable_ptr
@@ -118,18 +120,18 @@ CORBA::Pollable::_unchecked_narrow (
 CORBA::Pollable_ptr
 CORBA::Pollable::_duplicate (Pollable_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::Pollable::_tao_release (Pollable_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -181,7 +183,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/Pollable:1.0",
     "Pollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Pollable =
@@ -208,7 +210,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::release (
     CORBA::DIIPollable_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::DIIPollable_ptr
@@ -257,18 +259,18 @@ CORBA::DIIPollable::_unchecked_narrow (
 CORBA::DIIPollable_ptr
 CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::DIIPollable::_tao_release (DIIPollable_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -324,7 +326,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/DIIPollable:1.0",
     "DIIPollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DIIPollable =
@@ -351,7 +353,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::release (
     CORBA::PollableSet_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::PollableSet_ptr
@@ -369,7 +371,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
@@ -395,7 +397,7 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla
 CORBA::PollableSet::NoPossiblePollable&
 CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -478,11 +480,11 @@ static TAO::TypeCode::Struct<char const *,
     "NoPossiblePollable",
     _tao_fields_CORBA_PollableSet_NoPossiblePollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_NoPossiblePollable =
   &_tao_tc_CORBA_PollableSet_NoPossiblePollable;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
@@ -508,7 +510,7 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet
 CORBA::PollableSet::UnknownPollable&
 CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -591,7 +593,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownPollable",
     _tao_fields_CORBA_PollableSet_UnknownPollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_UnknownPollable =
   &_tao_tc_CORBA_PollableSet_UnknownPollable;
 
@@ -626,18 +628,18 @@ CORBA::PollableSet::_unchecked_narrow (
 CORBA::PollableSet_ptr
 CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::PollableSet::_tao_release (PollableSet_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -689,7 +691,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/PollableSet:1.0",
     "PollableSet");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PollableSet =
@@ -697,3 +699,4 @@ namespace CORBA
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/PollableC.h b/TAO/tao/Messaging/PollableC.h
index 9a76deac2d3..a8a9e8e9011 100644
--- a/TAO/tao/Messaging/PollableC.h
+++ b/TAO/tao/Messaging/PollableC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -56,6 +56,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -575,6 +577,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
index 82aadf99bb3..66682024c37 100644
--- a/TAO/tao/Messaging/TAO_ExtA.cpp
+++ b/TAO/tao/Messaging/TAO_ExtA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TAO_ExtA.h"
+#include "tao/Messaging/TAO_ExtA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,6 +35,8 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -51,4 +53,4 @@ namespace TAO
     &_tao_tc_TAO_ConnectionTimeoutPolicy;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/TAO_ExtA.h b/TAO/tao/Messaging/TAO_ExtA.h
index c83d58ed9e0..a0d32a204b9 100644
--- a/TAO/tao/Messaging/TAO_ExtA.h
+++ b/TAO/tao/Messaging/TAO_ExtA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/Messaging/TAO_ExtC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -55,6 +57,8 @@ namespace TAO
 
 } // module TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 597218703ad..f52f8dc6c07 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "TAO_ExtC.h"
+#include "tao/Messaging/TAO_ExtC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release (
     TAO::ConnectionTimeoutPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO::ConnectionTimeoutPolicy_ptr
@@ -109,18 +111,18 @@ TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
 TAO::ConnectionTimeoutPolicy_ptr
 TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 TAO::ConnectionTimeoutPolicy::_tao_release (ConnectionTimeoutPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 ::CORBA::Boolean
@@ -166,3 +168,5 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index edc68f14de5..630976761af 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "messaging_export.h"
+#include "tao/Messaging/messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,6 +58,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   
@@ -217,6 +219,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 7467a10720a..7775f89e4d1 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -23,8 +23,8 @@
 #ifndef TAO_MESSAGING_POLICYVALUE_PIDL
 #define TAO_MESSAGING_POLICYVALUE_PIDL
 
-#include <IOP_IOR.pidl>
-#include <Policy_Forward.pidl>
+#include "tao/IOP_IOR.pidl"
+#include "tao/Policy_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 3bb08c79911..3fa19255de1 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Messaging_PolicyValueC.h"
+#include "tao/Messaging_PolicyValueC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -40,16 +40,18 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 Messaging::PolicyValue::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -59,7 +61,7 @@ Messaging::PolicyValue::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
@@ -71,7 +73,7 @@ Messaging::PolicyValueSeq::PolicyValueSeq (void)
 Messaging::PolicyValueSeq::PolicyValueSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Messaging::PolicyValue
       >
     (max)
@@ -83,7 +85,7 @@ Messaging::PolicyValueSeq::PolicyValueSeq (
     Messaging::PolicyValue * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Messaging::PolicyValue
       >
     (max, length, buffer, release)
@@ -92,7 +94,7 @@ Messaging::PolicyValueSeq::PolicyValueSeq (
 Messaging::PolicyValueSeq::PolicyValueSeq (
     const PolicyValueSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         Messaging::PolicyValue
       >
     (seq)
@@ -146,22 +148,7 @@ CORBA::Boolean operator<< (
     const Messaging::PolicyValueSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -169,40 +156,9 @@ CORBA::Boolean operator>> (
     Messaging::PolicyValueSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index abe0c4f2eb5..7a95d8fecb0 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -64,65 +64,64 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct PolicyValue;
-  
+
   typedef
     TAO_Var_Var_T<
         PolicyValue
       >
     PolicyValue_var;
-  
+
   typedef
     TAO_Out_T<
         PolicyValue,
         PolicyValue_var
       >
     PolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export PolicyValue
   {
     typedef PolicyValue_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     CORBA::OctetSeq pvalue;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
 #define _MESSAGING_POLICYVALUESEQ_CH_
-  
+
   class PolicyValueSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        PolicyValueSeq,
-        PolicyValue
+        PolicyValueSeq
       >
     PolicyValueSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        PolicyValueSeq,
-        PolicyValueSeq_var,
-        PolicyValue
+        PolicyValueSeq
       >
     PolicyValueSeq_out;
-  
+
   class TAO_Export PolicyValueSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             PolicyValue
           >
   {
@@ -132,27 +131,27 @@ namespace Messaging
     PolicyValueSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        PolicyValue* buffer, 
-        CORBA::Boolean release = 0
+        PolicyValue* buffer,
+        CORBA::Boolean release = false
       );
     PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef PolicyValueSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ComponentId TAG_POLICIES = 2U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::ServiceId INVOCATION_POLICIES = 7U;
 
 // TAO_IDL - Generated from
@@ -194,6 +193,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index b515509a832..3b1402d9033 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Messaging_SyncScopeC.h"
+#include "tao/Messaging_SyncScopeC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,12 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index 61b17540188..4658f3d4e02 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace Messaging
 {
   
@@ -106,6 +108,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 5e8e70d012a..68df7c44eb5 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -3,14 +3,16 @@
 #include "tao/Muxed_TMS.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "Client_Strategy_Factory.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
+#include "tao/Client_Strategy_Factory.h"
 
 ACE_RCSID (tao,
            Muxed_TMS,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
   : TAO_Transport_Mux_Strategy (transport)
     , request_id_generator_ (0)
@@ -201,7 +203,7 @@ TAO_Muxed_TMS::clear_cache (void)
   if (this->dispatcher_table_.current_size () == 0)
     return -1;
 
-  REQUEST_DISPATCHER_TABLE::ITERATOR end =
+  REQUEST_DISPATCHER_TABLE::ITERATOR const end =
     this->dispatcher_table_.end ();
 
   ACE_Unbounded_Stack <TAO_Reply_Dispatcher *> ubs;
@@ -213,7 +215,7 @@ TAO_Muxed_TMS::clear_cache (void)
       ubs.push ((*i).int_id_);
 
   this->dispatcher_table_.unbind_all ();
-  size_t sz =  ubs.size ();
+  size_t const sz = ubs.size ();
 
   for (size_t k = 0 ; k != sz ; ++k)
     {
@@ -227,3 +229,4 @@ TAO_Muxed_TMS::clear_cache (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
index 30b055963b3..974fa62ae99 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -15,15 +15,18 @@
 #define TAO_MUXED_TMS_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Hash_Map_Manager_T.h"
+
+#include "tao/Transport_Mux_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
-#include "tao/Transport_Mux_Strategy.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 class TAO_Pluggable_Reply_Params;
@@ -72,7 +75,7 @@ protected:
 
   /// Keep track of the orb core pointer. We need to this to create the
   /// Reply Dispatchers.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   typedef ACE_Hash_Map_Manager_Ex <CORBA::ULong,
                                    TAO_Reply_Dispatcher *,
@@ -88,6 +91,8 @@ protected:
   int clear_cache (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* MUXED_TMS_H */
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
index a79fd8fde97..063f473ac6d 100644
--- a/TAO/tao/NVList_Adapter.cpp
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/NVList_Adapter.h"
 
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            NVList_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NVList_Adapter::~TAO_NVList_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
index 207d5c2e014..e9bc13af0ec 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,10 +21,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
 #include "tao/Basic_Types.h"
+
+#include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class NVList;
@@ -55,5 +58,7 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NVLIST_ADAPTER_H */
diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp
index 3139d42ad27..5edd8e55e60 100644
--- a/TAO/tao/New_Leader_Generator.cpp
+++ b/TAO/tao/New_Leader_Generator.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "New_Leader_Generator.h"
+#include "tao/New_Leader_Generator.h"
 
 
 ACE_RCSID (tao,
@@ -8,6 +8,10 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
index 17d4dd6cae1..fdb96209dea 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_New_Leader_Generator
  *
@@ -42,6 +44,8 @@ public:
   virtual void no_leaders_available (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_NEW_LEADER_GENERATOR_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index ada0052ef94..3bcc3e37d36 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,37 +1,38 @@
 // "$Id$"
 
-#include "ORB.h"
+#include "tao/ORB.h"
 
 ACE_RCSID (tao,
            ORB,
            "$Id$")
 
-#include "ORB_Table.h"
-#include "Connector_Registry.h"
-#include "IOR_Parser.h"
-#include "Stub.h"
-#include "ORB_Core.h"
-#include "ORB_Core_TSS_Resources.h"
-#include "TAO_Internal.h"
-#include "Dynamic_Adapter.h"
-#include "Profile.h"
-#include "default_ports.h"
-#include "ORBInitializer_Registry_Adapter.h"
-#include "PolicyFactory_Registry_Adapter.h"
-#include "NVList_Adapter.h"
-#include "TAO_Singleton_Manager.h"
-#include "Policy_Current.h"
-#include "Policy_Manager.h"
-#include "Valuetype_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "TypeCodeFactory_Adapter.h"
-#include "debug.h"
-#include "CDR.h"
-#include "SystemException.h"
-#include "default_environment.h"
+#include "tao/ORB_Table.h"
+#include "tao/Connector_Registry.h"
+#include "tao/IOR_Parser.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB_Core_TSS_Resources.h"
+#include "tao/TAO_Internal.h"
+#include "tao/Dynamic_Adapter.h"
+#include "tao/Profile.h"
+#include "tao/default_ports.h"
+#include "tao/ORBInitializer_Registry_Adapter.h"
+#include "tao/PolicyFactory_Registry_Adapter.h"
+#include "tao/NVList_Adapter.h"
+#include "tao/TAO_Singleton_Manager.h"
+#include "tao/Policy_Current.h"
+#include "tao/Policy_Manager.h"
+#include "tao/Valuetype_Adapter.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/TypeCodeFactory_Adapter.h"
+#include "tao/debug.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.h"
+#include "tao/default_environment.h"
+#include "tao/ObjectIdListC.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ORB.i"
+# include "tao/ORB.i"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/Dynamic_Service.h"
@@ -51,7 +52,6 @@ void TAO_unexpected_exception_handler (void)
 }
 #endif  /* ACE_HAS_EXCEPTIONS */
 
-
 static const char ior_prefix[] = "IOR:";
 
 // = Static initialization.
@@ -64,6 +64,8 @@ namespace
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::ORB::InvalidName::InvalidName (void)
   : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
                           "InvalidName")
@@ -250,7 +252,7 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const int result = this->orb_core_->reactor ()->work_pending (tv);
+  int const result = this->orb_core_->reactor ()->work_pending (tv);
   if (result == 0 || (result == -1 && errno == ETIME))
     return 0;
 
@@ -411,7 +413,7 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr &
 }
 
 void
-CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
+CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &
                                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
@@ -422,7 +424,7 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
 }
 
 void
-CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &
+CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &
                                             ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
@@ -1893,7 +1895,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str
     this->orb_core_->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  int retv =
+  int const retv =
     conn_reg->make_mprofile (str,
                              mprofile
                              ACE_ENV_ARG_PARAMETER);
@@ -1952,40 +1954,26 @@ CORBA::ORB::register_value_factory (const char *repository_id,
                                     CORBA::ValueFactory factory
                                     ACE_ENV_ARG_DECL)
 {
-  // %! guard, and ACE_Null_Mutex in the map
-  // do _add_ref here not in map->rebind
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
-  if (this->orb_core ()->valuetype_adapter () == 0)
+  if (vta)
     {
+      int const result = vta->vf_map_rebind (repository_id,
+                                             factory);
 
-     this->orb_core ()->valuetype_adapter () =
-       ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-         );
+      if (result == 0)              // No previous factory found
+        {
+          return 0;
+        }
 
-      if (this->orb_core ()->valuetype_adapter () == 0)
+      if (result == -1)
         {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
+          // Error on bind.
+          ACE_THROW_RETURN (CORBA::MARSHAL (),
                             0);
         }
     }
 
-  int result =
-    this->orb_core ()->valuetype_adapter ()->vf_map_rebind (repository_id,
-                                                            factory);
-
-  if (result == 0)              // No previous factory found
-    {
-      return 0;
-    }
-
-  if (result == -1)
-    {
-      // Error on bind.
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-    }
-
   return factory;    // previous factory was found
 }
 
@@ -1993,10 +1981,12 @@ void
 CORBA::ORB::unregister_value_factory (const char *repository_id
                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (this->orb_core ()->valuetype_adapter ())
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
+
+  if (vta)
     {
       // Dont care whther it was successful or not!
-      (void) this->orb_core ()->valuetype_adapter ()->vf_map_unbind (repository_id);
+      (void) vta->vf_map_unbind (repository_id);
     }
 }
 
@@ -2004,20 +1994,14 @@ CORBA::ValueFactory
 CORBA::ORB::lookup_value_factory (const char *repository_id
                                   ACE_ENV_ARG_DECL)
 {
-  if (this->orb_core ()->valuetype_adapter () == 0)
-    {
-      this->orb_core ()->valuetype_adapter () =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
-      if (this->orb_core ()->valuetype_adapter () == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
+  if (vta)
+    {
+      return vta->vf_map_find (repository_id);
     }
 
-  return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id);
+  return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index cecd70319ed..e05ef0d9878 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -19,24 +19,26 @@
 
 #include /**/ "ace/pre.h"
 
-#include "UserException.h"
+#include "tao/UserException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orb_typesC.h"
-#include "objectid.h"
-#include "CORBA_methods.h"
-#include "VarOut_T.h"
-#include "Seq_Var_T.h"
-#include "Seq_Out_T.h"
-#include "Sequence_T.h"
-#include "Policy_ForwardC.h"
+#include "tao/orb_typesC.h"
+#include "tao/objectid.h"
+#include "tao/CORBA_methods.h"
+#include "tao/VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/Sequence_T.h"
+#include "tao/Policy_ForwardC.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef enum
 {
   TAO_SERVICEID_NAMESERVICE,
@@ -55,7 +57,6 @@ class TAO_OutputCDR;
 class TAO_Stub;
 class TAO_Valuetype_Adapter;
 class TAO_Acceptor_Filter;
-class TAO_SeqElem_String_Manager;
 
 // ****************************************************************
 
@@ -90,17 +91,14 @@ namespace CORBA
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
 
   typedef
-    TAO_MngSeq_Var_T<
-        ORB_ObjectIdList,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        ORB_ObjectIdList
       >
     ORB_ObjectIdList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ORB_ObjectIdList,
-        ORB_ObjectIdList_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        ORB_ObjectIdList
       >
     ORB_ObjectIdList_out;
 
@@ -136,6 +134,30 @@ namespace CORBA
 
   typedef CORBA::Short ValueModifier;
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+    // Typedefs for CORBA::RequestSeq, which is an argument of
+    // send_multiple_requests_*().
+
+    typedef
+      TAO::unbounded_object_reference_sequence<
+          CORBA::Request, CORBA::Request_var
+        >
+      RequestSeq;
+
+    typedef
+      TAO_VarSeq_Var_T<
+          RequestSeq
+        >
+      RequestSeq_var;
+
+    typedef
+      TAO_Seq_Out_T<
+          RequestSeq
+        >
+      RequestSeq_out;
+#endif
+
   /**
    * @class ORB
    *
@@ -231,34 +253,6 @@ namespace CORBA
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-    // Typedefs for CORBA::ORB::RequestSeq, which is an argument of
-    // send_multiple_requests_*().
-
-    typedef
-      TAO_Unbounded_Pseudo_Sequence<
-          CORBA::Request
-        >
-      RequestSeq;
-
-    typedef
-      TAO_VarSeq_Var_T<
-          RequestSeq,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Request
-            >
-        >
-      RequestSeq_var;
-
-    typedef
-      TAO_Seq_Out_T<
-          RequestSeq,
-          RequestSeq_var,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Request
-            >
-        >
-      RequestSeq_out;
-
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -290,10 +284,10 @@ namespace CORBA
       CORBA::ServiceInformation_out service_information
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &req
+    void send_multiple_requests_oneway (const CORBA::RequestSeq &req
                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &req
+    void send_multiple_requests_deferred (const CORBA::RequestSeq &req
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     void get_next_response (CORBA::Request_ptr &req
@@ -481,9 +475,9 @@ namespace CORBA
      * appropriate @c ACE_Time_Value as described in run().
      **/
     void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void perform_work (ACE_Time_Value &
+    void perform_work (ACE_Time_Value &tv
                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void perform_work (ACE_Time_Value *
+    void perform_work (ACE_Time_Value *tv
                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /**
@@ -494,7 +488,7 @@ namespace CORBA
      * deactivation or other operations associated with object adapters)
      * has completed.
      */
-    void shutdown (CORBA::Boolean wait_for_completion = 0
+    void shutdown (CORBA::Boolean wait_for_completion = false
                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /**
@@ -645,7 +639,7 @@ namespace CORBA
     CORBA::ULong refcount_;
 
     /// The ORB_Core that created us....
-    TAO_ORB_Core *orb_core_;
+    TAO_ORB_Core * orb_core_;
 
     /// Decides whether to use the URL notation or to use IOR notation.
     CORBA::Boolean use_omg_ior_format_;
@@ -670,6 +664,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/ORB.i"
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index 16a9d6be7e6..89ddfb694a1 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ---------------------------------------------------------------------------
 //  ORB specific
@@ -10,9 +11,9 @@
 ACE_INLINE CORBA::ULong
 CORBA::ORB::_incr_refcnt (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
-                    guard, 
-                    lock_, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    lock_,
                     0);
   return ++this->refcount_;
 }
@@ -22,7 +23,7 @@ CORBA::ORB::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
-    this->refcount_--;
+    --this->refcount_;
 
     if (this->refcount_ != 0)
       {
@@ -88,3 +89,4 @@ CORBA::release (CORBA::ORB_ptr obj)
     obj->_decr_refcnt ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index b025c20488c..0d88b73a39c 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -1,10 +1,10 @@
-#include "ORBInitializer_Registry.h"
-#include "ORBInitializer_Registry_Adapter.h"
-#include "PortableInterceptorC.h"
-#include "ORB.h"
-#include "ORB_Constants.h"
-#include "TAO_Singleton_Manager.h"
-#include "SystemException.h"
+#include "tao/ORBInitializer_Registry.h"
+#include "tao/ORBInitializer_Registry_Adapter.h"
+#include "tao/PortableInterceptorC.h"
+#include "tao/ORB.h"
+#include "tao/ORB_Constants.h"
+#include "tao/TAO_Singleton_Manager.h"
+#include "tao/SystemException.h"
 
 #include "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
@@ -19,6 +19,8 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   void
@@ -84,3 +86,4 @@ namespace PortableInterceptor
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 0169e5df76b..677e4c50436 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -15,15 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Environment.h"
+#include "tao/default_environment.h"
+
 #include "ace/CORBA_macros.h"
-#include "Environment.h"
-#include "default_environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
@@ -38,6 +41,8 @@ namespace PortableInterceptor
     );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORB_INITIALIZER_REGISTRY_H */
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
index 75cd36c8285..1798764e211 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
@@ -1,14 +1,18 @@
-//$Id$
+// $Id$
 
-#include "ORBInitializer_Registry_Adapter.h"
+#include "tao/ORBInitializer_Registry_Adapter.h"
 
 ACE_RCSID (tao,
            ORBInitializer_Registry_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter (void)
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index ffd9b863d58..4515f10ec11 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -15,16 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 #include "tao/Basic_Types.h"
 #include "tao/SystemException.h"
+#include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
@@ -95,6 +97,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORB_INITIALIZER_REGISTRY_ADAPTER_H */
diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h
index 6e324f0f908..b7e090dcedf 100644
--- a/TAO/tao/ORB_Constants.h
+++ b/TAO/tao/ORB_Constants.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // A hash define for the regular two way operation.
 #define TAO_TWOWAY_RESPONSE_FLAG 255
 
@@ -234,6 +236,8 @@ const CORBA::ULong TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE  = (0x15U << 7);
 //@}
 //@}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_ORB_CONSTANTS_H */
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4bc1b51a0c9..3487f46ca0a 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,45 +1,49 @@
 // $Id$
 
-#include "ORB_Core.h"
-#include "ORB_Core_TSS_Resources.h"
-#include "ORB_Table.h"
-#include "TAO_Internal.h"
-#include "default_server.h"
-#include "Profile.h"
-#include "Stub.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "LF_Event_Loop_Thread_Helper.h"
-#include "Connector_Registry.h"
-#include "Transport_Queueing_Strategies.h"
-#include "Object_Loader.h"
-#include "ObjectIdListC.h"
-#include "BiDir_Adapter.h"
-#include "Collocation_Resolver.h"
-#include "Flushing_Strategy.h"
-#include "Request_Dispatcher.h"
-#include "Stub_Factory.h"
-#include "Thread_Lane_Resources.h"
-#include "Thread_Lane_Resources_Manager.h"
-#include "TSS_Resources.h"
-#include "Protocols_Hooks.h"
-#include "IORInterceptor_Adapter.h"
-#include "IORInterceptor_Adapter_Factory.h"
-#include "debug.h"
-#include "TAOC.h"
-#include "Endpoint_Selector_Factory.h"
-#include "Client_Strategy_Factory.h"
-#include "Adapter_Factory.h"
-#include "Adapter.h"
-#include "GUIResource_Factory.h"
-#include "PolicyFactory_Registry_Adapter.h"
-#include "PolicyFactory_Registry_Factory.h"
-#include "ORBInitializer_Registry_Adapter.h"
-#include "Codeset_Manager.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB_Core_TSS_Resources.h"
+#include "tao/ORB_Table.h"
+#include "tao/TAO_Internal.h"
+#include "tao/default_server.h"
+#include "tao/Profile.h"
+#include "tao/Stub.h"
+#include "tao/LF_Follower.h"
+#include "tao/Leader_Follower.h"
+#include "tao/LF_Event_Loop_Thread_Helper.h"
+#include "tao/Connector_Registry.h"
+#include "tao/Transport_Queueing_Strategies.h"
+#include "tao/Object_Loader.h"
+#include "tao/ObjectIdListC.h"
+#include "tao/BiDir_Adapter.h"
+#include "tao/Collocation_Resolver.h"
+#include "tao/Flushing_Strategy.h"
+#include "tao/Request_Dispatcher.h"
+#include "tao/Stub_Factory.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/TSS_Resources.h"
+#include "tao/Protocols_Hooks.h"
+#include "tao/IORInterceptor_Adapter.h"
+#include "tao/IORInterceptor_Adapter_Factory.h"
+#include "tao/debug.h"
+#include "tao/TAOC.h"
+#include "tao/Endpoint_Selector_Factory.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/Adapter_Factory.h"
+#include "tao/Adapter.h"
+#include "tao/GUIResource_Factory.h"
+#include "tao/PolicyFactory_Registry_Adapter.h"
+#include "tao/PolicyFactory_Registry_Factory.h"
+#include "tao/ORBInitializer_Registry_Adapter.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/GIOP_Fragmentation_Strategy.h"
+
+#include "tao/Valuetype_Adapter.h"
+#include "tao/Valuetype_Adapter_Factory.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
-#include "Policy_Manager.h"
-#include "Policy_Current.h"
+#include "tao/Policy_Manager.h"
+#include "tao/Policy_Current.h"
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 #include "ace/Reactor.h"
@@ -68,13 +72,15 @@
 
 
 #if !defined (__ACE_INLINE__)
-# include "ORB_Core.i"
+# include "tao/ORB_Core.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            ORB_Core,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 CORBA::Environment&
@@ -128,7 +134,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     ifr_client_adapter_name_ ("IFR_Client_Adapter"),
     typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
     iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
-    valuetype_adapter_name_ ("Valuetype_Adapter"),
+    valuetype_adapter_factory_name_ ("valuetype_Adapter_Factory"),
     poa_factory_name_ ("TAO_Object_Adapter_Factory"),
     poa_factory_directive_ (ACE_TEXT_TO_CHAR_IN (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", "")))
 {
@@ -138,6 +144,11 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   : protocols_hooks_ (0),
+#if TAO_USE_LOCAL_MEMORY_POOL == 1
+    use_local_memory_pool_ (true),
+#else
+    use_local_memory_pool_ (false),
+#endif
     lock_ (),
     thread_lane_resources_manager_ (0),
     collocation_resolver_ (0),
@@ -261,9 +272,9 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-  CORBA::release (this->policy_manager_);
+  ::CORBA::release (this->policy_manager_);
   delete this->default_policies_;
-  CORBA::release (this->policy_current_);
+  ::CORBA::release (this->policy_current_);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -276,7 +287,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   // Don't delete, is a process wide singleton shared by all orbs
   orbinitializer_registry_ = 0;
 
-  CORBA::release (this->orb_);
+  ::CORBA::release (this->orb_);
 }
 
 int
@@ -324,6 +335,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   // Use TCP_NODELAY.
   int nodelay = 1;
 
+  // Use SO_KEEPALIVE (default 0).
+  int so_keepalive = 0;
+
   // Use dotted decimal addresses
   // @@ This option will be treated as a suggestion to each loaded
   //    protocol to use a character representation for the numeric
@@ -380,7 +394,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       ////////////////////////////////////////////////////////////////
       // begin with the 'parameterless' flags                       //
       ////////////////////////////////////////////////////////////////
-      if ((current_arg = arg_shifter.get_the_parameter
+      if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDottedDecimalAddresses"))))
         {
           // Use dotted decimal addresses
@@ -390,7 +404,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoServerSideNameLookups"))))
         {
           // Don't look up the host name for incoming connections
@@ -399,7 +413,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNameServicePort"))))
         {
           // Specify the port number for the NameService.
@@ -409,7 +423,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBMulticastDiscoveryEndpoint"))))
         {
           // Specify mcast address:port@network_interface for the
@@ -422,7 +436,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNodelay"))))
         {
           // Use TCP_NODELAY or not.
@@ -431,7 +445,16 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                (ACE_LIB_TEXT("-ORBKeepalive"))))
+        {
+          // Use SO_KEEPALIVE or not.
+          so_keepalive =
+            ACE_OS::atoi (current_arg);
+
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBTradingServicePort"))))
         {
           // Specify the port number for the TradingService.
@@ -440,7 +463,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBImplRepoServicePort"))))
         {
           // Specify the multicast port number for the Implementation
@@ -449,7 +472,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBRcvSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -462,7 +485,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSndSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -474,7 +497,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBObjRefStyle"))))
         {
           // Specifies the style of printed objrefs: URL or IOR
@@ -504,7 +527,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocationStrategy"))))
         {
           // Specify which collocation policy we want to use.
@@ -516,7 +539,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocation"))))
         {
           // Specify whether we want to optimize against collocation
@@ -548,7 +571,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferredInterfaces"))))
         {
           if (this->orb_params ()->preferred_interfaces (
@@ -562,15 +585,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEnforcePreferredInterfaces"))))
         {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("YES")) == 0)
-            this->orb_params ()->enforce_pref_interfaces (true);
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("NO")) == 0)
+          int enforce_pref_interfaces = ACE_OS::atoi (current_arg);
+          if (enforce_pref_interfaces)
             this->orb_params ()->enforce_pref_interfaces (false);
+          else
+            this->orb_params ()->enforce_pref_interfaces (true);
 
           arg_shifter.consume_arg ();
         }
@@ -578,11 +600,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferIPV6Interfaces"))))
         {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("YES")) == 0)
+          int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
+          if (prefer_ipv6_interfaces)
             this->orb_params ()->prefer_ipv6_interfaces (true);
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("NO")) == 0)
+          else
             this->orb_params ()->prefer_ipv6_interfaces (false);
 
           arg_shifter.consume_arg ();
@@ -590,17 +611,16 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBConnectIPV6Only"))))
         {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("YES")) == 0)
+          int connect_ipv6_only = ACE_OS::atoi (current_arg);
+          if (connect_ipv6_only)
             this->orb_params ()->connect_ipv6_only (true);
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("NO")) == 0)
+          else
             this->orb_params ()->connect_ipv6_only (false);
 
           arg_shifter.consume_arg ();
         }
 #endif /* ACE_HAS_IPV6 */
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCDRTradeoff"))))
         {
           cdr_tradeoff = ACE_OS::atoi (current_arg);
@@ -611,7 +631,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       // A new <ObjectID>:<IOR> mapping has been specified. This will be
       // used by the resolve_initial_references ().
 
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBInitRef"))))
         {
           const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '=');
@@ -648,7 +668,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
             }
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDefaultInitRef"))))
         {
           // Set the list of prefixes from -ORBDefaultInitRef.
@@ -656,14 +676,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBStdProfileComponents"))))
         {
           std_profile_components =
             ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBResources"))))
         {
           ACE_DEBUG ((LM_WARNING,
@@ -672,7 +692,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBLogFile"))))
         {
           // redirect all ACE_DEBUG and ACE_ERROR output to a file
@@ -724,7 +744,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBVerboseLogging"))))
         {
           unsigned long verbose_logging = ACE_OS::atoi (current_arg);
@@ -749,7 +769,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           (ACE_LOG_MSG->*flagop)(value);
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBUseIMR"))))
         {
           // Use IR or not.
@@ -757,14 +777,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBIMREndpointsInIOR"))))
         {
           this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBid"))))
         {
           // The ORBid is actually set in ORB_init(), and then passed
@@ -783,7 +803,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBServerId"))))
         {
           // The this->server_id_ is to uniquely identify a server to
@@ -793,14 +813,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                (ACE_TEXT("-ORBLingerTimeout"))))
         {
           linger = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEndpoint"))))
         {
           // Each "endpoint" is of the form:
@@ -829,7 +849,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBListenEndpoints"))))
         {
           // This option is similar to the -ORBEndPoint option. May be
@@ -844,10 +864,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneEndpoint"))) ||
-               (current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneListenEndpoints"))))
+      else if ((0 != (current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneEndpoint")))) ||
+               (0 != (current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneListenEndpoints")))))
         {
           // This option is similar to the -ORBEndPoint option but
           // specifies endpoints for each lane.
@@ -869,7 +889,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoProprietaryActivation"))))
         {
           // This option can be used to set to not use any proprietary
@@ -882,7 +902,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1);
         }
-       else if ((current_arg = arg_shifter.get_the_parameter
+       else if (0 != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBUseSharedProfile"))))
          {
            this->orb_params ()->shared_profile
@@ -890,14 +910,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
            arg_shifter.consume_arg ();
          }
-       else if ((current_arg = arg_shifter.get_the_parameter
+       else if (0 != (current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBNegotiateCodesets"))))
          {
            negotiate_codesets =
              (ACE_OS::atoi (current_arg));
            arg_shifter.consume_arg ();
          }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSingleReadOptimization"))))
         {
           this->orb_params ()->single_read_optimization
@@ -905,27 +925,32 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDisableRTCollocation"))))
         {
-          const ACE_TCHAR *popt = current_arg;
-          if (ACE_OS::strcasecmp (popt, ACE_TEXT("NO")) == 0)
-            {
-              this->orb_params ()->disable_rt_collocation_resolver (false);
-            }
-          else if (ACE_OS::strcasecmp (popt, ACE_TEXT("YES")) == 0)
-            {
-              this->orb_params ()->disable_rt_collocation_resolver (true);
-            }
+          int disable_rt_collocation = ACE_OS::atoi (current_arg);
+          if (disable_rt_collocation)
+            this->orb_params ()->disable_rt_collocation_resolver (true);
           else
-            {
-              // Should we print an error mesg?? Probably we
-              // should. We will look into this after 1.4 and make all
-              // the options consistent.
-            }
+            this->orb_params ()->disable_rt_collocation_resolver (false);
+
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                (ACE_LIB_TEXT("-ORBUseLocalMemoryPool"))))
+        {
+          this->use_local_memory_pool_ = (0 != ACE_OS::atoi (current_arg));
 
           arg_shifter.consume_arg ();
         }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                (ACE_LIB_TEXT("-ORBMaxMessageSize"))))
+        {
+          this->orb_params_.max_message_size (ACE_OS::atoi (current_arg));
+
+          arg_shifter.consume_arg ();
+        }
+
       ////////////////////////////////////////////////////////////////
       // catch any unknown -ORB args                                //
       ////////////////////////////////////////////////////////////////
@@ -1021,6 +1046,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                         -1);
     }
 
+  // Set whether or not to use the local memory pool for the cdr allocators.
+
+  trf->use_local_memory_pool (this->use_local_memory_pool_);
+
   // @@ ????
   // Make sure the reactor is initialized...
   ACE_Reactor *reactor = this->reactor ();
@@ -1128,6 +1157,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                                              || dotted_decimal_addresses);
   this->orb_params ()->linger (linger);
   this->orb_params ()->nodelay (nodelay);
+  this->orb_params ()->sock_keepalive (so_keepalive);
   if (rcv_sock_size >= 0)
     this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
   if (snd_sock_size >= 0)
@@ -1144,7 +1174,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   else
     if  (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("(%P|%t) ORB_Core: ")
+                    ACE_TEXT("TAO (%P|%t) ORB_Core: ")
                     ACE_TEXT("Codeset Manager not available\n")));
 
   // Set up the pluggable protocol infrastructure.  First get a
@@ -1220,17 +1250,17 @@ TAO_ORB_Core::fini (void)
   // Wait for any server threads, ignoring any failures.
   (void) this->thr_mgr ()->wait ();
 
-  CORBA::release (this->implrepo_service_);
+  ::CORBA::release (this->implrepo_service_);
 
-  CORBA::release (this->typecode_factory_);
+  ::CORBA::release (this->typecode_factory_);
 
-  CORBA::release (this->codec_factory_);
+  ::CORBA::release (this->codec_factory_);
 
-  CORBA::release (this->dynany_factory_);
+  ::CORBA::release (this->dynany_factory_);
 
-  CORBA::release (this->ior_manip_factory_);
+  ::CORBA::release (this->ior_manip_factory_);
 
-  CORBA::release (this->ior_table_);
+  ::CORBA::release (this->ior_table_);
 
   if (TAO_debug_level > 2)
     {
@@ -1354,15 +1384,15 @@ TAO_ORB_Core::iorinterceptor_adapter_factory_name (void)
 }
 
 void
-TAO_ORB_Core::valuetype_adapter_name (const char *name)
+TAO_ORB_Core::valuetype_adapter_factory_name (const char *name)
 {
-  TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_ = name;
+  TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_factory_name_ = name;
 }
 
 const char *
-TAO_ORB_Core::valuetype_adapter_name (void)
+TAO_ORB_Core::valuetype_adapter_factory_name (void)
 {
-  return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_.c_str();
+  return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_factory_name_.c_str();
 }
 
 TAO_Resource_Factory *
@@ -1432,7 +1462,7 @@ TAO_ORB_Core::policy_factory_registry_i (void)
   if (loader == 0)
     {
       ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_PolicyFactory_Registry_Factory",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
                                       "TAO_PI",
                                       "_make_PolicyFactory_Loader",
                                       ""));
@@ -1786,54 +1816,91 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
 
   // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions,
   // but we are stuck in platforms without exceptions!
-  CORBA::Object_ptr x;
+  TAO_ORB_Core_Auto_Ptr collocated_orb_core;
+  CORBA::Object_ptr x = 0;
+
   {
+    // Lock the ORB_Table against concurrent modification while we
+    // iterate through the ORBs.
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                       guard,
-                      this->lock_,
+                      TAO::ORB_Table::instance()->lock_,
                       CORBA::Object::_nil ());
 
     TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
     TAO::ORB_Table::iterator const end = table->end ();
     for (TAO::ORB_Table::iterator i = table->begin (); i != end; ++i)
       {
-        TAO_ORB_Core * const other_core = (*i).second.core ();
+        ::TAO_ORB_Core * const other_core = (*i).second.core ();
 
         if (this->is_collocation_enabled (other_core,
                                           mprofile))
           {
-            TAO_Adapter_Registry *ar =
-              other_core->adapter_registry ();
-
-            return ar->create_collocated_object (stub,
-                                                 mprofile);
+            other_core->_incr_refcnt();
+             TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core);
+             collocated_orb_core = tmp_auto_ptr;
+            break;
           }
       }
   }
 
-  // The constructor sets the proxy broker as the
-  // Remote one.
-  ACE_NEW_RETURN (x,
-                  CORBA::Object (stub, 0),
-                  0);
+  if (collocated_orb_core.get ())
+    {
+      TAO_Adapter_Registry *ar =
+        collocated_orb_core.get ()->adapter_registry ();
+
+      x = ar->create_collocated_object (stub,
+                                        mprofile);
+    }
+
+
+  if (!x)
+    {
+      // The constructor sets the proxy broker as the
+      // Remote one.
+      ACE_NEW_RETURN (x,
+                      CORBA::Object (stub, 0),
+                      0);
+    }
+
   return x;
 }
 
 CORBA::Long
 TAO_ORB_Core::initialize_object (TAO_Stub *stub,
-                                 CORBA::Object_ptr obj)
+                                 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);
+}
+
+CORBA::Long
+TAO_ORB_Core::reinitialize_object (TAO_Stub *stub)
+{
+  return initialize_object_i (stub, stub->forward_profiles ()
+                                    ? *(stub->forward_profiles ())
+                                    : stub->base_profiles ());
+}
+
+CORBA::Long
+TAO_ORB_Core::initialize_object_i (TAO_Stub *stub,
+                                   const TAO_MProfile &mprofile)
+
+{
+  CORBA::Long retval = 0;
+  TAO_ORB_Core_Auto_Ptr collocated_orb_core;
+
   {
-    // @@ Ossama: maybe we need another lock for the table, to
-    //    reduce contention on the Static_Object_Lock below, if so
-    //    then we need to use that lock in the ORB_init() function.
+    // Lock the ORB_Table against concurrent modification while we
+    // iterate through the ORBs.
     ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                               guard,
-                              this->lock_,
+                              TAO::ORB_Table::instance()->lock_,
                               0));
 
     TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
@@ -1845,16 +1912,23 @@ TAO_ORB_Core::initialize_object (TAO_Stub *stub,
         if (this->is_collocation_enabled (other_core,
                                           mprofile))
           {
-            TAO_Adapter_Registry * const ar =
-              other_core->adapter_registry ();
-
-            return ar->initialize_collocated_object (stub,
-                                                     obj);
+            other_core->_incr_refcnt ();
+            TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core);
+            collocated_orb_core = tmp_auto_ptr;
+            break;
           }
       }
   }
 
-  return 0;
+  if (collocated_orb_core.get ())
+    {
+      TAO_Adapter_Registry *ar =
+        collocated_orb_core.get ()->adapter_registry ();
+
+      retval = ar->initialize_collocated_object (stub);
+    }
+
+  return retval;
 }
 
 CORBA::Boolean
@@ -2021,71 +2095,62 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 void
 TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
 {
-  ACE_TRY
-    {
-      {
-        ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
-        if (this->has_shutdown () != 0)
-          return;
+    if (this->has_shutdown () != 0)
+      return;
 
-        // 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
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+    // 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
+                                         ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
-        // Set the 'has_shutdown' flag, so any further attempt to shutdown
-        // becomes a noop.
-        this->has_shutdown_ = 1;
+    // Set the 'has_shutdown' flag, so any further attempt to shutdown
+    // becomes a noop.
+    this->has_shutdown_ = 1;
 
-        // need to release the mutex, because some of the shutdown
-        // operations invoke application code, that could (and in practice
-        // does!) callback into ORB Core code.
-      }
+    // need to release the mutex, because some of the shutdown
+    // operations invoke application code, that could (and in practice
+    // does!) callback into ORB Core code.
+  }
 
-      this->adapter_registry_.close (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  this->adapter_registry_.close (wait_for_completion
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Shutdown reactor.
+  this->thread_lane_resources_manager ().shutdown_reactor ();
 
-      // Shutdown reactor.
-      this->thread_lane_resources_manager ().shutdown_reactor ();
+  // Cleanup transports that use the RW strategies
+  this->thread_lane_resources_manager ().cleanup_rw_transports ();
 
-      // Cleanup transports that use the RW strategies
-      this->thread_lane_resources_manager ().cleanup_rw_transports ();
+  // Grab the thread manager
+  ACE_Thread_Manager *tm = this->thr_mgr ();
 
-      // Grab the thread manager
-      ACE_Thread_Manager *tm = this->thr_mgr ();
+  // Try to cancel all the threads in the ORB.
+  tm->cancel_all ();
 
-      // Try to cancel all the threads in the ORB.
-      tm->cancel_all ();
+  // If <wait_for_completion> is set, wait for all threads to exit.
+  if (wait_for_completion != 0)
+    tm->wait ();
 
-      // If <wait_for_completion> is set, wait for all threads to exit.
-      if (wait_for_completion != 0)
-        tm->wait ();
+  // Explicitly destroy the valuetype adapter
+  delete this->valuetype_adapter_;
+  this->valuetype_adapter_ = 0;
 
-      // Explicitly destroy the object reference table since it
-      // contains references to objects, which themselves may contain
-      // reference to this ORB.
-      this->object_ref_table_.destroy ();
+  // Explicitly destroy the object reference table since it
+  // contains references to objects, which themselves may contain
+  // reference to this ORB.
+  this->object_ref_table_.destroy ();
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::release (this->pi_current_);
+  CORBA::release (this->pi_current_);
+  this->pi_current_ = CORBA::Object::_nil ();
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    }
-  ACE_CATCHALL
-    {
-      // Do not allow exceptions to escape.. So catch all the
-      // exceptions.
-      // @@ Not sure what to print here for the users..
-
-    }
-  ACE_ENDTRY;
-
-  return;
 }
 
 void
@@ -2139,6 +2204,8 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
+      ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
+
 #if TAO_HAS_INTERCEPTORS == 1
       if (this->client_request_interceptor_adapter_ != 0)
         {
@@ -2201,7 +2268,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader == 0)
     {
       ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory_Loader",
                                       "TAO_TypeCodeFactory",
                                       "_make_TAO_TypeCodeFactory_Loader",
                                       ""));
@@ -2222,7 +2289,7 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader == 0)
     {
       ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory_Loader",
                                       "TAO_CodecFactory",
                                       "_make_TAO_CodecFactory_Loader",
                                       ""));
@@ -2616,6 +2683,15 @@ TAO_ORB_Core::connector_registry (ACE_ENV_SINGLE_ARG_DECL)
   return conn;
 }
 
+auto_ptr<TAO_GIOP_Fragmentation_Strategy>
+TAO_ORB_Core::fragmentation_strategy (TAO_Transport * transport)
+{
+  return
+    this->resource_factory ()->create_fragmentation_strategy (
+      transport,
+      this->orb_params_.max_message_size ());
+}
+
 ACE_Reactor *
 TAO_ORB_Core::reactor (void)
 {
@@ -2705,6 +2781,14 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook)
   TAO_ORB_Core_Static_Resources::instance ()-> sync_scope_hook_ = hook;
 }
 
+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);
+}
+
 void
 TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub,
                                  bool &has_timeout,
@@ -2921,7 +3005,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
           ACE_CATCHANY
             {
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "(%P|%t) Cannot initialize the "
+                                   "Cannot initialize the "
                                    "ior_interceptor_adapter \n");
             }
           ACE_ENDTRY;
@@ -2984,7 +3068,6 @@ TAO_ORB_Core::clientrequestinterceptor_adapter_i (void)
   return this->client_request_interceptor_adapter_;
 }
 
-
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
@@ -3007,6 +3090,58 @@ TAO_ORB_Core::add_interceptor (
     }
 }
 
+void
+TAO_ORB_Core::add_interceptor (
+   PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+   const CORBA::PolicyList& policies
+   ACE_ENV_ARG_DECL)
+{
+  if (this->clientrequestinterceptor_adapter_i ())
+    {
+      this->client_request_interceptor_adapter_->add_interceptor (
+        interceptor,
+        policies
+        ACE_ENV_ARG_PARAMETER);
+
+      ACE_CHECK;
+    }
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ERROR: ORB Core unable to find the ")
+                  ACE_TEXT ("Client Request Interceptor Adapter Factory instance")));
+
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+}
+
+void
+TAO_ORB_Core::add_interceptor (
+   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+   const CORBA::PolicyList& policies
+   ACE_ENV_ARG_DECL)
+{
+  if (this->serverrequestinterceptor_adapter_i ())
+    {
+      this->server_request_interceptor_adapter_->add_interceptor (
+        interceptor,
+        policies
+        ACE_ENV_ARG_PARAMETER);
+
+      ACE_CHECK;
+    }
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ERROR: ORB Core unable to find the ")
+                  ACE_TEXT ("Server Request Interceptor Adapter Factory instance")));
+
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+}
+
 TAO::ServerRequestInterceptor_Adapter *
 TAO_ORB_Core::serverrequestinterceptor_adapter_i (void)
 {
@@ -3037,6 +3172,53 @@ TAO_ORB_Core::serverrequestinterceptor_adapter_i (void)
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1  */
 
+TAO_Valuetype_Adapter *
+TAO_ORB_Core::valuetype_adapter (void)
+{
+  if (this->valuetype_adapter_ == 0)
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                        ace_mon,
+                        this->lock_,
+                        0);
+
+      if (this->valuetype_adapter_ == 0)
+        {
+          ACE_DECLARE_NEW_CORBA_ENV;
+          ACE_TRY
+            {
+              TAO_Valuetype_Adapter_Factory * vt_ap_factory =
+                ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance (
+                    TAO_ORB_Core::valuetype_adapter_factory_name ()
+                  );
+
+              if (vt_ap_factory)
+                {
+                  this->valuetype_adapter_ =
+                    vt_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                }
+            }
+          ACE_CATCHANY
+            {
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                                   "Cannot initialize the "
+                                   "valuetype_adapter \n");
+            }
+          ACE_ENDTRY;
+          ACE_CHECK_RETURN(0);
+        }
+
+      if (this->valuetype_adapter_ == 0)
+        {
+           ACE_THROW_RETURN (CORBA::INTERNAL (),
+                             0);
+        }
+    }
+
+  return this->valuetype_adapter_;
+}
+
 // ****************************************************************
 
 TAO_Export TAO_ORB_Core *
@@ -3121,3 +3303,4 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
   return TAO::TAO_CS_REMOTE_STRATEGY;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 5a10589e734..d0144373b4b 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -38,6 +38,16 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "ace/Array_Map.h"
 
+#include "ace/Thread_Manager.h"
+#include "ace/Lock_Adapter_T.h"
+#include "ace/TSS_T.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Data_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if TAO_HAS_INTERCEPTORS == 1
 
 namespace TAO
@@ -48,13 +58,6 @@ namespace TAO
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1  */
 
-#include "ace/Thread_Manager.h"
-#include "ace/Lock_Adapter_T.h"
-#include "ace/TSS_T.h"
-
-// Forward declarations
-class ACE_Data_Block;
-
 class TAO_Adapter;
 class TAO_Acceptor;
 class TAO_Connector;
@@ -357,11 +360,11 @@ public:
   /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_.
   static const char *iorinterceptor_adapter_factory_name (void);
 
-  /// Sets the value of TAO_ORB_Core::valuetype_adapter_name.
-  static void valuetype_adapter_name (const char *name);
+  /// Sets the value of TAO_ORB_Core::valuetype_adapter_factory_name.
+  static void valuetype_adapter_factory_name (const char *name);
 
-  /// Gets the value of TAO_ORB_Core::valuetype_adapter_name.
-  static const char *valuetype_adapter_name (void);
+  /// Gets the value of TAO_ORB_Core::valuetype_adapter_factory_name.
+  static const char *valuetype_adapter_factory_name (void);
 
 
   /// See if we have a collocated address, if yes, return the POA
@@ -564,8 +567,7 @@ public:
 
   /// End the event loop
   void shutdown (CORBA::Boolean wait_for_completion
-                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
+                 ACE_ENV_ARG_DECL);
 
   /// Get the shutdown flag value
   int has_shutdown (void);
@@ -611,6 +613,11 @@ public:
   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
+  /// or if a location forward supplied new target subsequently fails.
+  CORBA::Long reinitialize_object (TAO_Stub *stub);
+
   /// Return ORBid string.
   const char *orbid (void) const;
 
@@ -788,6 +795,18 @@ public:
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor
     ACE_ENV_ARG_DECL);
 
+  /// Register a client request interceptor with policies.
+  void add_interceptor (
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL);
+
+  /// Register a server request interceptor with policies.
+  void add_interceptor (
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL);
+
   /// Get the Client Request Interceptor adapter.
   /// Will not create a new one if not available yet.
   TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void);
@@ -805,7 +824,7 @@ public:
   //@}
 
   /// Return the valuetype adapter
-  TAO_Valuetype_Adapter *& valuetype_adapter (void);
+  TAO_Valuetype_Adapter *valuetype_adapter (void);
 
   /// Get the IOR Interceptor adapter. If not created, this method will try
   /// to create one.
@@ -868,6 +887,16 @@ public:
   /// flush
   TAO::Transport_Queueing_Strategy &default_transport_queueing_strategy (void);
 
+  /// Verify condition for  permanent forward is given,
+  /// both parameters must provide group attributes.
+  CORBA::Boolean is_permanent_forward_condition
+  (const CORBA::Object_ptr obj,
+   const TAO_Service_Context &service_context);
+
+  /// Get outgoing fragmentation strategy.
+  auto_ptr<TAO_GIOP_Fragmentation_Strategy>
+  fragmentation_strategy (TAO_Transport * transport);
+
 protected:
 
   /// Destructor is protected since the ORB Core is a reference
@@ -941,6 +970,10 @@ protected:
   /// this ORB core.
   TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void);
 
+  /// Common code from ::initialize_object and ::reinitialize_object
+  CORBA::Long initialize_object_i (TAO_Stub *the_stub,
+                                   const TAO_MProfile& mprofile);
+
 private:
 
   /// The ORB Core should not be copied.
@@ -968,6 +1001,8 @@ private:
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
+  bool use_local_memory_pool_;
+
 protected:
 
   /// Synchronize internal state...
@@ -1321,14 +1356,14 @@ public:
   ACE_CString iorinterceptor_adapter_factory_name_;
 
   /**
-   * Name of the service object used to adapt function calls on
+   * Name of the factory object used to adapt function calls on
    * the valuetype-related interfaces.
-   * The default value is "Valuetype_Adapter". If the
+   * The default value is "Valuetype_Adapter_Factory". If the
    * Valuetype library is linked, the corresponding accessor
-   * function valuetype_adapter_name() will be called to set
-   * the value to "Concrete_Valuetype_Adapter".
+   * function valuetype_adapter_factory_name() will be called to set
+   * the value to "Concrete_Valuetype_Adapter_Factory".
    */
-  ACE_CString valuetype_adapter_name_;
+  ACE_CString valuetype_adapter_factory_name_;
 
   /**
    * Name of the service object used to create the RootPOA.  The
@@ -1368,8 +1403,10 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void);
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "ORB_Core.i"
+# include "tao/ORB_Core.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 9a0eb2e3a5b..b78066a39eb 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -5,6 +5,7 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/ORB_Table.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::ULong
 TAO_ORB_Core::_incr_refcnt (void)
@@ -213,13 +214,6 @@ TAO_ORB_Core::not_default (const char * orb_id)
   table->not_default (orb_id);
 }
 
-/// Return the valuetype adapter
-ACE_INLINE TAO_Valuetype_Adapter *&
-TAO_ORB_Core::valuetype_adapter (void)
-{
-  return this->valuetype_adapter_;
-}
-
 ACE_INLINE void
 TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt)
 {
@@ -361,14 +355,6 @@ TAO_ORB_Core::set_tss_resource (size_t slot_id, void *ts_object)
   return 0;
 }
 
-ACE_INLINE 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);
-}
-
 ACE_INLINE TAO_Cleanup_Func_Registry *
 TAO_ORB_Core::tss_cleanup_funcs (void)
 {
@@ -638,3 +624,23 @@ TAO_ORB_Core::serverrequestinterceptor_adapter (void)
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
+
+/// Verify condition for  permanent forward is given,
+/// both parameters must provide group attributes.
+ACE_INLINE  CORBA::Boolean
+TAO_ORB_Core::is_permanent_forward_condition
+(const CORBA::Object_ptr obj,
+ const TAO_Service_Context &service_context)
+{
+  const TAO_Service_Callbacks *service_callback =
+      this->fault_tolerance_service ().service_callback ();
+
+  const CORBA::Boolean permanent_forward_condition =
+      service_callback &&
+      service_callback->is_permanent_forward_condition (obj,
+                                                        service_context);
+
+  return permanent_forward_condition;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp
index a0b908a54dd..068897c2c38 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp
@@ -1,14 +1,16 @@
-#include "ORB_Core_Auto_Ptr.h"
-#include "ORB_Core.h"
+#include "tao/ORB_Core_Auto_Ptr.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ORB_Core_Auto_Ptr.inl"
+# include "tao/ORB_Core_Auto_Ptr.inl"
 #endif  /* !__ACE_INLINE */
 
 ACE_RCSID (tao,
            ORB_Core_Auto_Ptr,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void)
 {
   if (this->get () != 0)
@@ -27,3 +29,5 @@ TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p)
 
   this->p_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index f99c4f79a9d..19de5c918f1 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -18,6 +18,14 @@
 
 #include "tao/TAO_Export.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 /**
@@ -60,8 +68,10 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "ORB_Core_Auto_Ptr.inl"
+# include "tao/ORB_Core_Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl
index 50cc45b0bb5..d9bd041e77c 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.inl
+++ b/TAO/tao/ORB_Core_Auto_Ptr.inl
@@ -2,6 +2,9 @@
 //
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p)
   : p_ (p)
@@ -52,3 +55,5 @@ TAO_ORB_Core_Auto_Ptr::operator *() const
   // @@ Potential problem if this->p_ is zero!
   return *this->get ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp
index a9d364e90f2..64d57768dba 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -2,6 +2,8 @@
 
 #include "tao/ORB_Core_TSS_Resources.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
   : event_loop_thread_ (0)
   , client_leader_thread_ (0)
@@ -27,4 +29,4 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
   //   this->orb_core_->tss_cleanup_funcs ()->cleanup (this->ts_objects_);
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h
index 9488216500e..8f5e0c3abb8 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -22,8 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Array_Base.h"
 #include "tao/orbconf.h"
+#include "ace/Array_Base.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
@@ -83,7 +85,7 @@ public:
   TAO_ORB_Core *orb_core_;
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_ORB_CORE_H */
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index e313b23ad18..8624370348c 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -1,9 +1,9 @@
-#include "ORB_Table.h"
-#include "ORB_Core.h"
-#include "TAO_Singleton.h"
+#include "tao/ORB_Table.h"
+#include "tao/ORB_Core.h"
+#include "tao/TAO_Singleton.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ORB_Table.inl"
+# include "tao/ORB_Table.inl"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/SString.h"
@@ -17,6 +17,8 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ORB_Table::ORB_Table (void)
   : lock_ (),
     first_orb_not_default_ (false),
@@ -180,3 +182,5 @@ TAO::ORB_Table::instance (void)
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 1b35ae545b0..4838b0754da 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -30,6 +30,8 @@
 #include "ace/Thread_Mutex.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -60,6 +62,7 @@ namespace TAO
    */
   class TAO_Export ORB_Table
   {
+  friend class ::TAO_ORB_Core;
   public:
 
     /// Constructor
@@ -84,7 +87,7 @@ namespace TAO
     //@{
     iterator begin (void);
     iterator end (void);
-    int bind (const char *orb_id, TAO_ORB_Core *orb_core);
+    int bind (const char *orb_id, ::TAO_ORB_Core *orb_core);
 
     /// Return @c TAO_ORB_Core corresponding to ORB with given @a
     /// orb_id.
@@ -92,16 +95,16 @@ namespace TAO
      * @note The caller must decrease the reference count on the
      *       returned ORB_Core, i.e. the callers "owns" it.
      */
-    TAO_ORB_Core* find (const char *orb_id);
+    ::TAO_ORB_Core* find (const char *orb_id);
 
     int unbind (const char *orb_id);
     //@}
 
-    TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
+    ::TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
 
     /// Obtain the first ORB for the @c ORB_Core_instance()
     /// implementation.
-    TAO_ORB_Core * first_orb (void);
+    ::TAO_ORB_Core * first_orb (void);
 
     /// Return a unique instance
     static ORB_Table * instance (void);
@@ -125,18 +128,12 @@ namespace TAO
 
     /// Return @c TAO_ORB_Core corresponding to ORB with given @a
     /// orb_id.  (underlying unlocked implementation).
-    TAO_ORB_Core * find_i (char const * orb_id);
-
-    /// Update our list of orbs
-    /**
-     * @todo Where the implementation for ORB_Table::update_orbs?
-     */
-    void update_orbs (void);
+    ::TAO_ORB_Core * find_i (char const * orb_id);
 
   private:
 
     /// Lock used to synchronize access to the internal state.
-    TAO_SYNCH_MUTEX lock_;
+    ::TAO_SYNCH_MUTEX lock_;
 
     /// Variable to check if the first ORB decides not to be the
     /// default.
@@ -146,13 +143,13 @@ namespace TAO
     Table table_;
 
     /// The first ORB created by the user
-    TAO_ORB_Core * first_orb_;
+    ::TAO_ORB_Core * first_orb_;
 
     /// List of orbs for get_orbs call
     /**
      * @todo ORB_Table::orbs_ appears to be unused.  Remove it?
      */
-    TAO_ORB_Core ** orbs_;
+    ::TAO_ORB_Core ** orbs_;
 
     /// Number of ORBs in the table.
     size_t num_orbs_;
@@ -176,7 +173,7 @@ namespace TAO
     ORB_Core_Ref_Counter (void);
 
     /// Constructor.
-    ORB_Core_Ref_Counter (TAO_ORB_Core * core);
+    ORB_Core_Ref_Counter (::TAO_ORB_Core * core);
 
     /// Destructor.
     ~ORB_Core_Ref_Counter (void);
@@ -188,16 +185,18 @@ namespace TAO
     void operator= (ORB_Core_Ref_Counter const & rhs);
 
     /// ORB_Core pointer accessor.
-    TAO_ORB_Core * core (void) const { return this->core_; }
+    ::TAO_ORB_Core * core (void) const { return this->core_; }
 
   private:
 
-    TAO_ORB_Core * core_;
+    ::TAO_ORB_Core * core_;
 
   };
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/ORB_Table.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index cef161c5c7f..b3145b1f2e0 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -4,8 +4,11 @@
 
 #include "tao/ORB_Core.h"
 
+#include <algorithm>
 
-ACE_INLINE TAO_ORB_Core *
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE ::TAO_ORB_Core *
 TAO::ORB_Table::first_orb (void)
 {
   return this->first_orb_;
@@ -23,7 +26,7 @@ TAO::ORB_Table::end (void)
   return this->table_.end ();
 }
 
-ACE_INLINE TAO_ORB_Core* const *
+ACE_INLINE ::TAO_ORB_Core* const *
 TAO::ORB_Table::get_orbs (size_t& num_orbs)
 {
   num_orbs = this->num_orbs_;
@@ -46,7 +49,7 @@ TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (void)
 }
 
 ACE_INLINE
-TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (TAO_ORB_Core * core)
+TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (::TAO_ORB_Core * core)
   : core_ (core)
 {
 //   ACE_ASSERT (core != 0);
@@ -83,3 +86,5 @@ TAO::ORB_Core_Ref_Counter::operator= (TAO::ORB_Core_Ref_Counter const & rhs)
   TAO::ORB_Core_Ref_Counter tmp (rhs);
   std::swap (this->core_, tmp.core_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index ccf1e5bb0fc..76d44538b45 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -31,11 +31,13 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
-#include "Default_ORTC.h"
+#include "tao/ObjRefTemplate/Default_ORTC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
 
@@ -121,4 +123,4 @@ operator>>= (
       );
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index f44925afb77..b3a94f7c90a 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Default_ORTC.h"
+#include "tao/ObjRefTemplate/Default_ORTC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
 
@@ -38,12 +38,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Default_ORTC.inl"
+#include "tao/ObjRefTemplate/Default_ORTC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -239,3 +241,5 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
     true
   );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index f7f225bf63b..bf461b7efcd 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ort_export.h"
+#include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
@@ -67,6 +67,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Default_ORT
 {
   
@@ -238,8 +240,10 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Default_ORTC.inl"
+#include "tao/ObjRefTemplate/Default_ORTC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index 5ca97d9d64b..d670c3ab051 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "ORT_Adapter_Factory_Impl.h"
-#include "ORT_Adapter_Impl.h"
+#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h"
+#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
 #include "tao/PortableServer/Root_POA.h"
 
 ACE_RCSID (ORT,
            ORT_Adapter_Factory_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ORT_Adapter *
@@ -38,14 +40,19 @@ namespace TAO
           ace_svc_desc_ORT_Adapter_Factory_Impl
         );
   }
+}
 
-  ACE_STATIC_SVC_DEFINE (
-    ORT_Adapter_Factory_Impl,
-    ACE_TEXT ("Concrete_ORT_Adapter_Factory"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (ORT_Adapter_Factory_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0)
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-  ACE_FACTORY_DEFINE (TAO_ORT, ORT_Adapter_Factory_Impl)
-}
+ACE_STATIC_SVC_DEFINE (
+  ORT_Adapter_Factory_Impl,
+  ACE_TEXT ("Concrete_ORT_Adapter_Factory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ORT_Adapter_Factory_Impl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  TAO_ORT,
+  ORT_Adapter_Factory_Impl,
+  TAO::ORT_Adapter_Factory_Impl)
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index a41c3ab9f84..397addb069c 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -21,8 +21,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ort_export.h"
+#include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/PortableServer/ORT_Adapter_Factory.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -48,14 +51,17 @@ namespace TAO
     // Used to force the initialization of the code.
     static int Initializer (void);
   };
-
-  ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl)
-  ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl)
 }
 
 static int TAO_Requires_ORTFactory_Initializer =
   TAO::ORT_Adapter_Factory_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl)
+ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl)
+
+
 #define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index 050be03e0dc..1e697edc9cc 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ORT_Adapter_Impl.h"
+#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
@@ -11,6 +11,8 @@ ACE_RCSID (ObjRefTemplate,
            ORT_Adapter_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 char *
 TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -111,3 +113,5 @@ TAO::ORT_Adapter_Impl::activate (
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index ad2f8ecdf17..ff30c49bbdf 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ort_export.h"
+#include "tao/ObjRefTemplate/ort_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +31,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -38,7 +40,7 @@ namespace TAO
    *
    * @brief Implementation of the TAO::ORT_Adapter
    */
-  class TAO_ORT_Export ORT_Adapter_Impl
+  class ORT_Adapter_Impl
     : public ORT_Adapter
   {
   public:
@@ -107,6 +109,8 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 335fd5ad8d9..f26d45984bc 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -33,18 +33,15 @@
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
-#include <PI_Forward.pidl>
+#include "tao/PI_Forward.pidl"
 
 module PortableInterceptor
 {
   typeprefix PortableInterceptor "omg.org";
 
   abstract valuetype ObjectReferenceFactory {
-    // boolean equals (in ObjectReferenceFactory other);
     Object make_object (in string repository_id,
 			in ObjectId id);
-    // IOP::TaggedProfileSeq make_profiles (in string repository_id,
-    //                                      in ObjectId id);
   };
 
   abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory {
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index a5fcc1c409e..2eda0aa733e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -32,12 +32,14 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
-#include "ObjectReferenceTemplate.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
 
@@ -317,3 +319,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 9ffbc54f337..1a419ab1be5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "ObjectReferenceTemplate.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -44,12 +44,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -233,36 +235,36 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
@@ -274,7 +276,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (voi
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Valuetype_Sequence<
+  : TAO::unbounded_valuetype_sequence<
         PortableInterceptor::ObjectReferenceTemplate,
         PortableInterceptor::ObjectReferenceTemplate_var
       >
@@ -287,7 +289,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     PortableInterceptor::ObjectReferenceTemplate * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Valuetype_Sequence<
+  : TAO::unbounded_valuetype_sequence<
         PortableInterceptor::ObjectReferenceTemplate,
         PortableInterceptor::ObjectReferenceTemplate_var
       >
@@ -297,7 +299,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     const ObjectReferenceTemplateSeq &seq
   )
-  : TAO_Unbounded_Valuetype_Sequence<
+  : TAO::unbounded_valuetype_sequence<
         PortableInterceptor::ObjectReferenceTemplate,
         PortableInterceptor::ObjectReferenceTemplate_var
       >
@@ -427,22 +429,7 @@ CORBA::Boolean operator<< (
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -450,40 +437,9 @@ CORBA::Boolean operator>> (
     PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index 70c007519ce..eab7a48e6b6 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -43,15 +43,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ort_export.h"
+#include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/Valuetype/Sequence_T.h"
 #include "tao/Sequence_T.h"
+#include "tao/Valuetype/Sequence_T.h"
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -75,24 +75,26 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_valuetype.cpp:524
-  
-  
+
+
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-  
+
   class ObjectReferenceFactory;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceFactory
       >
     ObjectReferenceFactory_var;
-  
+
   typedef
     TAO_Value_Out_T<
         ObjectReferenceFactory
@@ -100,78 +102,78 @@ namespace PortableInterceptor
     ObjectReferenceFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-  
+
   class TAO_ORT_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
   public:
     typedef ObjectReferenceFactory_var _var_type;
-    
+
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-    
+
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-    
+
     virtual const char* _tao_obv_repository_id (void) const;
-    
+
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
+
   public:
     virtual CORBA::Object_ptr make_object (
         const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
+
   protected:
     ObjectReferenceFactory (void);
-    
+
     virtual ~ObjectReferenceFactory (void);
-    
-    
+
+
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory;
-  
+
   // TAO_IDL - Generated from
   // be\be_valuetype.cpp:524
-  
-  
+
+
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-  
+
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-  
+
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -179,111 +181,102 @@ namespace PortableInterceptor
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-  
+
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-    
+
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-    
+
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-    
+
     virtual const char* _tao_obv_repository_id (void) const;
-    
+
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
+
   public:
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
+
   public:
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
+
   public:
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
+
   protected:
     ObjectReferenceTemplate (void);
-    
+
     virtual ~ObjectReferenceTemplate (void);
-    
-    
+
+
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
+
   class ObjectReferenceTemplateSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        ObjectReferenceTemplateSeq,
-        TAO_Valuetype_Manager<
-            ObjectReferenceTemplate,
-            ObjectReferenceTemplate_var
-          >
+    TAO_VarSeq_Var_T<
+        ObjectReferenceTemplateSeq
       >
     ObjectReferenceTemplateSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        ObjectReferenceTemplateSeq,
-        ObjectReferenceTemplateSeq_var,
-        TAO_Valuetype_Manager<
-            ObjectReferenceTemplate,
-            ObjectReferenceTemplate_var
-          >
+    TAO_Seq_Out_T<
+        ObjectReferenceTemplateSeq
       >
     ObjectReferenceTemplateSeq_out;
-  
+
   class TAO_ORT_Export ObjectReferenceTemplateSeq
     : public
-        TAO_Unbounded_Valuetype_Sequence<
+        TAO::unbounded_valuetype_sequence<
             ObjectReferenceTemplate,
             ObjectReferenceTemplate_var
           >
@@ -294,22 +287,22 @@ namespace PortableInterceptor
     ObjectReferenceTemplateSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer, 
-        CORBA::Boolean release = 0
+        ObjectReferenceTemplate ** buffer,
+        CORBA::Boolean release = false
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq;
 
 // TAO_IDL - Generated from
@@ -333,7 +326,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
   {
@@ -346,7 +339,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-  
+
   template<>
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
   {
@@ -430,8 +423,10 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 9965d1edb67..5aade26a354 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,4 +1,4 @@
-#include "ObjectReferenceTemplate_i.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/CORBA_String.h"
@@ -8,6 +8,8 @@ ACE_RCSID (ORT,
            ObjectReferenceTemplate_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ObjectReferenceTemplate::ObjectReferenceTemplate (
@@ -74,3 +76,5 @@ namespace TAO
     return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index aca0b876cdf..cb19700492a 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Default_ORTC.h"
+#include "tao/ObjRefTemplate/Default_ORTC.h"
 #include "tao/SystemException.h"
 
 #if defined(_MSC_VER)
@@ -32,6 +32,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   class POA;
@@ -43,13 +45,13 @@ namespace PortableServer
 namespace TAO
 {
   /**
-   * @class TAO_ObjectReferenceTemplate
+   * @class ObjectReferenceTemplate
    *
    * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate
    *        interface. This is a default implementation created to be returned
    *        by the IORInfo when the user requests the ORT or ORF.
    */
-  class TAO_ORT_Export ObjectReferenceTemplate
+  class ObjectReferenceTemplate
     : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate,
       public virtual CORBA::DefaultValueRefCountBase
   {
@@ -111,6 +113,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
index 1b15e680078..bef52c5826e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ort_export.h"
+#include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,6 +71,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
@@ -79,6 +81,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:963
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
index 0d6946f8b84..65f2ae33b8a 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateS.h"
-#include "ObjectReferenceTemplate_includeC.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 14ed6f02fa3..0df3b311b58 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -6,19 +6,19 @@
 //
 // ORB:         CORBA::Object operations
 
-#include "Object.h"
-#include "Stub.h"
-#include "Profile.h"
-#include "ORB_Core.h"
-#include "Connector_Registry.h"
-#include "LocateRequest_Invocation_Adapter.h"
-#include "debug.h"
-#include "Dynamic_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "Remote_Object_Proxy_Broker.h"
-#include "CDR.h"
-#include "SystemException.h"
-#include "PolicyC.h"
+#include "tao/Object.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/ORB_Core.h"
+#include "tao/Connector_Registry.h"
+#include "tao/LocateRequest_Invocation_Adapter.h"
+#include "tao/debug.h"
+#include "tao/Dynamic_Adapter.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/Remote_Object_Proxy_Broker.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.h"
+#include "tao/PolicyC.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -32,6 +32,7 @@ ACE_RCSID (tao,
            Object,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object::~Object (void)
 {
@@ -45,10 +46,8 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
                        CORBA::Boolean collocated,
                        TAO_Abstract_ServantBase * servant,
                        TAO_ORB_Core *orb_core)
-  : servant_ (servant)
-    , is_collocated_ (collocated)
-    , is_local_ (0)
-    , is_evaluated_ (1)
+  : is_local_ (false)
+    , is_evaluated_ (true)
     , ior_ (0)
     , orb_core_ (orb_core)
     , protocol_proxy_ (protocol_proxy)
@@ -66,24 +65,18 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
   this->refcount_lock_ =
     this->orb_core_->resource_factory ()->create_corba_object_lock ();
 
-  // If the object is collocated then set the broker using the
-  // factory otherwise use the remote proxy broker.
-  if (this->is_collocated_ &&
-      _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
-    this->proxy_broker_ =
-      _TAO_Object_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->proxy_broker_ =
-      the_tao_remote_object_proxy_broker ();
+  // Set the collocation marker on the stub. This may not be news to it.
+  // This may also change the stub's object proxy broker.
+  this->protocol_proxy_->is_collocated (collocated);
+
+  // Set the collocated servant pointer (null if not collocated) on the stub.
+  this->protocol_proxy_->collocated_servant (servant);
 }
 
 CORBA::Object::Object (IOP::IOR *ior,
                        TAO_ORB_Core *orb_core)
-  : servant_ (0)
-    , proxy_broker_ (0)
-    , is_collocated_ (0)
-    , is_local_ (0)
-    , is_evaluated_ (0)
+  : is_local_ (false)
+    , is_evaluated_ (false)
     , ior_ (ior)
     , orb_core_ (orb_core)
     , protocol_proxy_ (0)
@@ -154,7 +147,7 @@ void
 CORBA::Object::_tao_any_destructor (void *x)
 {
   CORBA::Object_ptr tmp = static_cast<CORBA::Object_ptr> (x);
-  CORBA::release (tmp);
+  ::CORBA::release (tmp);
 }
 
 // virtual -- do not inline
@@ -184,7 +177,13 @@ CORBA::Object::marshal (CORBA::Object_ptr x,
 TAO_Abstract_ServantBase*
 CORBA::Object::_servant (void) const
 {
-  return this->servant_;
+  if (this->protocol_proxy_ == 0)
+    {
+      // No stub set. Should not happen.
+      return 0;
+    }
+
+  return this->protocol_proxy_->collocated_servant ();
 }
 
 // IS_A ... ask the object if it's an instance of the type whose
@@ -213,14 +212,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 (), 0);
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
 
   if (this->_stubobj ()->type_id.in () != 0
       && ACE_OS::strcmp (type_id,
                          this->_stubobj ()->type_id.in ()) == 0)
-    return 1;
+    return true;
 
-  return this->proxy_broker_->_is_a (this,
+  return this->proxy_broker ()->_is_a (this,
                                      type_id
                                      ACE_ENV_ARG_PARAMETER);
 }
@@ -234,7 +233,19 @@ CORBA::Object::_interface_repository_id (void) const
 CORBA::Boolean
 CORBA::Object::_is_collocated (void) const
 {
-  return this->is_collocated_;
+  if (this->protocol_proxy_)
+    {
+      return this->protocol_proxy_->is_collocated ();
+    }
+
+  return false;
+}
+
+void
+CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b)
+{
+  this->protocol_proxy_->collocated_servant (b);
+  this->protocol_proxy_->is_collocated (true);
 }
 
 CORBA::Boolean
@@ -286,7 +297,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
 {
   if (other_obj == this)
     {
-      return 1;
+      return true;
     }
 
   TAO_OBJECT_IOR_EVALUATE_RETURN;
@@ -294,7 +305,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
   if (this->protocol_proxy_ != 0)
     return this->protocol_proxy_->is_equivalent (other_obj);
 
-  return 0;
+  return false;
 }
 
 // TAO's extensions
@@ -325,7 +336,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
 {
-  this->proxy_broker_ = proxy_broker;
+  this->protocol_proxy_->object_proxy_broker (proxy_broker);
 }
 
 CORBA::Boolean
@@ -467,7 +478,7 @@ CORBA::Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      retval = this->proxy_broker_->_non_existent (this
+      retval = this->proxy_broker ()->_non_existent (this
                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -490,7 +501,7 @@ CORBA::InterfaceDef_ptr
 CORBA::Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker_->_get_interface (this
+  return this->proxy_broker ()->_get_interface (this
                                               ACE_ENV_ARG_PARAMETER);
 }
 
@@ -504,7 +515,7 @@ CORBA::Object_ptr
 CORBA::Object::_get_component (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker_->_get_component (this
+  return this->proxy_broker ()->_get_component (this
                                               ACE_ENV_ARG_PARAMETER);
 }
 
@@ -512,7 +523,7 @@ char*
 CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker_->_repository_id (this
+  return this->proxy_broker ()->_repository_id (this
                                               ACE_ENV_ARG_PARAMETER);
 }
 
@@ -577,7 +588,7 @@ CORBA::Object::_set_policy_overrides (
 
   ACE_NEW_THROW_EX (obj,
                     CORBA::Object (stub,
-                                  this->is_collocated_),
+                                  this->_is_collocated ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         0,
@@ -622,7 +633,7 @@ CORBA::Object::_validate_connection (
 
   // If the object is collocated then use non_existent to see whether
   // it's there.
-  if (this->is_collocated_)
+  if (this->_is_collocated ())
       return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER));
 
   TAO::LocateRequest_Invocation_Adapter tao_call (this);
@@ -670,6 +681,22 @@ CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
     }
 }
 
+TAO::Object_Proxy_Broker *
+CORBA::Object::proxy_broker (void) const
+{
+  // Paranoid check. We *should* never access the proxy_broker
+  // when the object has not been initialised so there *should*
+  // alway be a stub, but just in case...
+
+  if (this->protocol_proxy_)
+    {
+      return this->protocol_proxy_->object_proxy_broker ();
+    }
+
+  // We have no stub. We cannot be collocated.
+  return the_tao_remote_object_proxy_broker ();
+}
+
 /*****************************************************************
  * Global Functions
  ****************************************************************/
@@ -697,27 +724,9 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x)
    TAO_Stub *stubobj = x->_stubobj ();
 
    if (stubobj == 0)
-     return 0;
-
-  // STRING, a type ID hint
-  if ((cdr << stubobj->type_id.in ()) == 0)
-    return 0;
+     return false;
 
-  const TAO_MProfile& mprofile = stubobj->base_profiles ();
-
-  CORBA::ULong profile_count = mprofile.profile_count ();
-  if ((cdr << profile_count) == 0)
-    return 0;
-
-  // @@ The MProfile should be locked during this iteration, is there
-  // anyway to achieve that?
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      const TAO_Profile* p = mprofile.get_profile (i);
-      if (p->encode (cdr) == 0)
-        return 0;
-    }
-  return (CORBA::Boolean) cdr.good_bit ();
+  return (stubobj->marshal (cdr));
 }
 
 /*static*/ void
@@ -805,9 +814,9 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
     {
       if (TAO_debug_level > 0)
         ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
+                             ACE_TEXT ("TAO - ERROR creating stub ")
                              ACE_TEXT ("object when demarshaling object ")
-                             ACE_TEXT ("reference.\n"));
+                             ACE_TEXT ("reference."));
 
       return;
     }
@@ -816,22 +825,14 @@ 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)
     return;
 
   obj->protocol_proxy_ = objdata;
 
-  // If the object is collocated then set the broker using the
-  // factory otherwise use the remote proxy broker.
-  if (obj->is_collocated_ &&
-    _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
-    obj->proxy_broker_ =
-      _TAO_Object_Proxy_Broker_Factory_function_pointer (obj);
-    else
-      obj->proxy_broker_ = the_tao_remote_object_proxy_broker ();
-
-  obj->is_evaluated_ = 1;
+  obj->is_evaluated_ = true;
 
   // Release the contents of the ior to keep memory consumption down.
   obj->ior_ = 0;
@@ -844,7 +845,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 CORBA::Boolean
 operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 {
-  int lazy_strategy = 0;
+  bool lazy_strategy = false;
   TAO_ORB_Core *orb_core = cdr.orb_core ();
 
   if (orb_core == 0)
@@ -861,7 +862,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
     {
       if (orb_core->resource_factory ()->resource_usage_strategy () ==
           TAO_Resource_Factory::TAO_LAZY)
-        lazy_strategy = 1;
+        lazy_strategy = true;
     }
 
   if (!lazy_strategy)
@@ -941,7 +942,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
         {
           if (TAO_debug_level > 0)
             ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
+                                 ACE_TEXT ("TAO - ERROR creating stub ")
                                  ACE_TEXT ("object when demarshaling object ")
                                  ACE_TEXT ("reference.\n"));
 
@@ -992,7 +993,7 @@ namespace TAO
   void
   Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p)
   {
-    CORBA::release (p);
+    ::CORBA::release (p);
   }
 
   CORBA::Object_ptr
@@ -1002,7 +1003,7 @@ namespace TAO
   }
 
   CORBA::Boolean
-  Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p,
+  Objref_Traits<CORBA::Object>::marshal (const CORBA::Object_ptr p,
                                          TAO_OutputCDR & cdr)
   {
     return p->marshal (cdr);
@@ -1010,7 +1011,7 @@ namespace TAO
 } // close TAO namespace
 
 
-TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-    ) = 0;
+TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0;
+
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 548cf871edd..c6bd922d66a 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -39,12 +39,16 @@
 # undef IOR
 #endif /* HPUX && IOR */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 class TAO_ORB_Core;
 
-class ACE_Lock;
-
 namespace TAO
 {
   class ObjectKey;
@@ -272,12 +276,16 @@ namespace CORBA
 
     /// Marshalling operator used by the stub code. A long story why
     /// the stub code uses this, let us keep it short here.
-    static CORBA::Boolean marshal (Object_ptr obj,
+    static CORBA::Boolean marshal (const Object_ptr obj,
                                    TAO_OutputCDR &strm);
 
+    /// Accessor for the cached servant reference held on the stub
+    /// if this object is collocated
     virtual TAO_Abstract_ServantBase *_servant (void) const;
 
     /// Is this object collocated with the servant?
+    /// Note this does not return this->is_collocated_ but will instead
+    /// query the underlying stub for its collocation status
     virtual CORBA::Boolean _is_collocated (void) const;
 
     /// Is this a local object?
@@ -349,31 +357,18 @@ namespace CORBA
     /// Initializing a local object.
     Object (int dummy = 0);
 
+    /// Convenience accessor for the object proxy broker of the
+    /// underlying stub.
+    TAO::Object_Proxy_Broker *proxy_broker () const;
+
   private:
 
     // = Unimplemented methods
     Object (const Object &);
     Object &operator = (const Object &);
 
-  protected:
-
-    /// Servant pointer.  It is 0 except for collocated objects.
-    TAO_Abstract_ServantBase *servant_;
-
   private:
 
-    /// Pointer to the Proxy Broker
-    /**
-     * This cached pointer instance takes care of routing the call for
-     * standard calls in CORBA::Object like _is_a (), _get_component
-     * () etc.
-     */
-    TAO::Object_Proxy_Broker *proxy_broker_;
-
-    /// Flag to indicate collocation.  It is 0 except for collocated
-    /// objects.
-    CORBA::Boolean is_collocated_;
-
     /// Specify whether this is a local object or not.
     CORBA::Boolean is_local_;
 
@@ -397,7 +392,7 @@ namespace CORBA
      * needs to be accessed from the stub and passed back as part of
      * _get_orb().
      */
-    TAO_ORB_Core *orb_core_;
+    TAO_ORB_Core * orb_core_;
 
     /**
      * Pointer to the protocol-specific "object" containing important
@@ -439,7 +434,7 @@ namespace TAO
     static CORBA::Object_ptr duplicate (CORBA::Object_ptr);
     static void release (CORBA::Object_ptr);
     static CORBA::Object_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::Object_ptr p,
+    static CORBA::Boolean marshal (const CORBA::Object_ptr p,
                                    TAO_OutputCDR & cdr);
   };
 }
@@ -448,9 +443,7 @@ namespace TAO
 /// library is present.
 extern
   TAO_Export TAO::Object_Proxy_Broker *
-  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-      CORBA::Object_ptr obj
-    );
+  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void);
 
 TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::Object*);
@@ -458,6 +451,7 @@ operator<< (TAO_OutputCDR&, const CORBA::Object*);
 TAO_Export CORBA::Boolean
 operator>> (TAO_InputCDR&, CORBA::Object *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Object.i"
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index e86207df933..0db6581b912 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -4,12 +4,11 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::Object::Object (int)
-  : servant_ (0),
-    proxy_broker_ (0),
-    is_collocated_ (false),
-    is_local_ (true),
+  : is_local_ (true),
     is_evaluated_ (true),
     ior_ (),
     orb_core_ (0),
@@ -80,13 +79,6 @@ CORBA::Object::is_evaluated (void) const
   return this->is_evaluated_;
 }
 
-ACE_INLINE void
-CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b)
-{
-  this->servant_ = b;
-  this->is_collocated_ = 1;
-}
-
 ACE_INLINE TAO_ORB_Core *
 CORBA::Object::orb_core (void) const
 {
@@ -104,3 +96,5 @@ CORBA::Object::ior (void) const
 {
   return this->ior_.in ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index a46f7400069..42e11786fa5 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "ObjectIdListC.h"
+#include "tao/ObjectIdListC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
@@ -57,7 +59,7 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void)
 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -67,14 +69,14 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
     const ORB_ObjectIdList &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -94,22 +96,7 @@ CORBA::Boolean operator<< (
     const CORBA::ORB_ObjectIdList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -117,41 +104,9 @@ CORBA::Boolean operator>> (
     CORBA::ORB_ObjectIdList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index 41ec5807c6d..fbe6d1304e8 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -83,23 +85,20 @@ namespace CORBA
   class ORB_ObjectIdList;
 
   typedef
-    TAO_MngSeq_Var_T<
-        ORB_ObjectIdList,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        ORB_ObjectIdList
       >
     ORB_ObjectIdList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        ORB_ObjectIdList,
-        ORB_ObjectIdList_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        ORB_ObjectIdList
       >
     ORB_ObjectIdList_out;
 
   class TAO_Export ORB_ObjectIdList
     : public
-        TAO_Unbounded_String_Sequence
+        TAO::unbounded_string_sequence
   {
   public:
     ORB_ObjectIdList (void);
@@ -108,7 +107,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         char ** buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ORB_ObjectIdList (const ORB_ObjectIdList &);
     ~ORB_ObjectIdList (void);
@@ -151,6 +150,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index ab186bbfaef..e3e52089e4a 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-#include "ObjectKey_Table.h"
-#include "ORB_Core.h"
-#include "Refcounted_ObjectKey.h"
+#include "tao/ObjectKey_Table.h"
+#include "tao/ORB_Core.h"
+#include "tao/Refcounted_ObjectKey.h"
 
 ACE_RCSID(tao,
           ObjectKey_Table,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
                                        const TAO::ObjectKey &rhs) const
@@ -28,9 +31,9 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
           return 1;
         }
       else if (lhs[i] > rhs[i])
-	{
-	  return 0;
-	}
+        {
+          return 0;
+        }
     }
 
   return 0;
@@ -89,7 +92,7 @@ TAO::ObjectKey_Table::bind (const TAO::ObjectKey &key,
                              key_new);
       }
 
-    (void) key_new->incr_refcount ();
+    key_new->incr_refcount ();
   }
 
   return retval;
@@ -180,3 +183,4 @@ TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index db3027c7d05..ef55ed9facd 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -23,6 +23,9 @@
 #include "ace/Null_Mutex.h"
 
 #include "tao/Object_KeyC.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations
 class TAO_ORB_Core;
@@ -136,6 +139,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_OBJECT_KEY_TABLE_H*/
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index 9d949775999..7ddc254c6d8 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_OBJECT_ARGUMENT_T_C
-#define TAO_OBJECT_ARGUMENT_T_C
+#ifndef TAO_OBJECT_ARGUMENT_T_CPP
+#define TAO_OBJECT_ARGUMENT_T_CPP
 
 #include "tao/Object_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Object_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Object_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S_ptr, typename Insert_Policy>
 CORBA::Boolean
@@ -102,4 +100,6 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_OBJECT_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_OBJECT_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index b5157e3616f..a5c0f8b7a71 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -151,6 +153,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Object_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
index b4a778c9299..f8105b5a561 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S_ptr, typename Insert_Policy>
 ACE_INLINE
 TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x)
@@ -81,3 +83,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void)
   return this->x_._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 3f46183a1f5..abd6d5ded9a 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Object_KeyC.h"
+#include "tao/Object_KeyC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -44,13 +44,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_OBJECTKEY_CS_)
@@ -62,7 +64,7 @@ TAO::ObjectKey::ObjectKey (void)
 TAO::ObjectKey::ObjectKey (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max)
@@ -74,7 +76,7 @@ TAO::ObjectKey::ObjectKey (
     CORBA::Octet * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max, length, buffer, release)
@@ -83,7 +85,7 @@ TAO::ObjectKey::ObjectKey (
 TAO::ObjectKey::ObjectKey (
     const ObjectKey &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (seq)
@@ -96,7 +98,7 @@ TAO::ObjectKey::~ObjectKey (void)
 
 void
 TAO::ObjectKey::encode_sequence_to_string (char * &str,
-                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
+                                           const TAO::unbounded_value_sequence<CORBA::Octet> &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
@@ -148,7 +150,7 @@ int TAO::ObjectKey::is_legal (u_char & c)
 }
 
 void
-TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq,
                                            const char *str)
 {
   if (str == 0)
@@ -219,10 +221,8 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        key.replace (_tao_seq_len, strm.start ());
+        key.mb ()->wr_ptr (key.mb()->rd_ptr () + _tao_seq_len);
         strm.skip_bytes (_tao_seq_len);
         return 1;
       }
@@ -249,29 +249,7 @@ CORBA::Boolean operator<< (
     const TAO::ObjectKey &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<TAO::ObjectKey *> (&_tao_sequence));
-        if (_tao_octet_seq->mb ())
-          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-      
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -279,55 +257,9 @@ CORBA::Boolean operator>> (
     TAO::ObjectKey &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-            static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 2198a47af4f..8377b60bef7 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -64,35 +64,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_OBJECTKEY_CH_)
 #define _TAO_OBJECTKEY_CH_
-  
+
   class ObjectKey;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        ObjectKey,
-        CORBA::Octet
+        ObjectKey
       >
     ObjectKey_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ObjectKey,
-        ObjectKey_var,
-        CORBA::Octet
+        ObjectKey
       >
     ObjectKey_out;
-  
+
   class TAO_Export ObjectKey
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Octet
           >
   {
@@ -102,12 +101,12 @@ namespace TAO
     ObjectKey (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Octet* buffer,
+        CORBA::Boolean release = false
       );
     ObjectKey (const ObjectKey &);
     ~ObjectKey (void);
-    
+
     typedef ObjectKey_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -115,17 +114,17 @@ namespace TAO
         CORBA::ULong length,
         const ACE_Message_Block* mb
       )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+      : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
     // Hand crafted.
 
     static void encode_sequence_to_string (
         char * &str,
-        const TAO_Unbounded_Sequence<CORBA::Octet> &seq
+        const TAO::unbounded_value_sequence<CORBA::Octet> &seq
       );
     static void decode_string_to_sequence (
-        TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+        TAO::unbounded_value_sequence<CORBA::Octet> &seq,
         const char *str
       );
     static int is_legal (u_char & c);
@@ -173,6 +172,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index b510b74bcc4..5379fa97148 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-#include "Object_Loader.h"
-#include "ace/Dynamic_Service.h"
+#include "tao/Object_Loader.h"
 
 ACE_RCSID (tao,
            Object_Loader,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Object_Loader::~TAO_Object_Loader (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index fd9279e1fd0..69b1a7559bc 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   Object_Loader.h
@@ -20,6 +22,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -60,5 +64,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_OBJECT_LOADER_H */
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
index b718a9886ea..8a8a1d6ee09 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -1,13 +1,15 @@
+// $Id$
+
 #include "tao/Object_Proxy_Broker.h"
 
 ACE_RCSID (tao,
-           TAO_Object_Proxy_Broker,
+           Object_Proxy_Broker,
            "$Id$")
 
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void)
 {
-  Object_Proxy_Broker::~Object_Proxy_Broker (void)
-  {
-    // No-Op.
-  }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index 1d1e35f0c1a..0c1b7dc2102 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -30,6 +30,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class InterfaceDef;
@@ -79,6 +81,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_OBJECT_PROXY_BROKER_H_ */
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index f3814f23b2a..22de5e5fa4f 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Object_Ref_Table.h"
-#include "ORB.h"
-#include "Environment.h"
-#include "debug.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
+#include "tao/Object_Ref_Table.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/debug.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
@@ -14,7 +14,6 @@ ACE_RCSID (tao,
            Object_Ref_Table,
            "$Id$")
 
-
 #ifndef __ACE_INLINE__
 # include "tao/Object_Ref_Table.inl"
 #endif  /* __ACE_INLINE__ */
@@ -22,6 +21,8 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Object_Ref_Table::bind (const char *id,
                             CORBA::Object_ptr obj)
@@ -30,7 +31,7 @@ TAO_Object_Ref_Table::bind (const char *id,
   // i.e. not nil.
   if (id == 0
       || ACE_OS::strlen (id) == 0
-      || CORBA::is_nil (obj))
+      || ::CORBA::is_nil (obj))
     {
       errno = EINVAL;
       return -1;
@@ -81,3 +82,5 @@ TAO_Object_Ref_Table::find (const char *id)
 
   return CORBA::Object::_duplicate ((*found).second.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 014463862e1..ac4d6adcda8 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -28,6 +28,8 @@
 
 #include "ace/Array_Map.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Environment;
@@ -68,10 +70,11 @@ public:
    * Register an object reference with the table, and map the given
    * ID to it.
    * @retval 0 Success
-   * @retval -1 Duplicate id
+   * @retval -1 Duplicate id if @c rebind is false
    */
   int register_initial_reference (const char * id,
-                                  CORBA::Object_ptr obj);
+                                  CORBA::Object_ptr obj,
+                                  bool rebind = false);
 
   /// Return the object reference associated with the given ID.
   /// A duplicate is returned.
@@ -104,9 +107,9 @@ private:
 
 private:
 
-  /// Prevent copying
-  ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &))
+  // Disallow copying and assignment.
+  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &);
+  void operator= (const TAO_Object_Ref_Table &);
 
 private:
 
@@ -118,6 +121,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/Object_Ref_Table.inl"
diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl
index e2cc5ccccab..e9abc371750 100644
--- a/TAO/tao/Object_Ref_Table.inl
+++ b/TAO/tao/Object_Ref_Table.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
   : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
@@ -12,9 +14,18 @@ TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
 ACE_INLINE int
 TAO_Object_Ref_Table::register_initial_reference (
   const char *id,
-  CORBA::Object_ptr obj)
+  CORBA::Object_ptr obj,
+  bool rebind)
 {
-  return this->bind (id, obj);
+  if (rebind)
+    {
+      if (this->unbind (id) == -1)
+        return -1;
+      else
+        return this->bind (id, obj);
+    }
+  else
+    return this->bind (id, obj);
 }
 
 ACE_INLINE CORBA::Object_ptr
@@ -60,3 +71,5 @@ TAO_Object_Ref_Table::unbind (const char *id)
   return
     (this->table_.erase (CORBA::String_var (id)) == 0 ? -1 : 0);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 69ad710c664..9ff642cda69 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -1,14 +1,13 @@
 // $Id$
-#ifndef TAO_OBJECT_T_C
-#define TAO_OBJECT_T_C
+
+#ifndef TAO_OBJECT_T_CPP
+#define TAO_OBJECT_T_CPP
 
 #include "tao/Object_T.h"
 #include "tao/Stub.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (tao,
-           Object_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -88,7 +87,7 @@ namespace TAO
       {
         return proxy;
       }
-      
+
     TAO_Stub* stub = obj->_stubobj ();
 
     if (stub == 0)
@@ -100,7 +99,7 @@ namespace TAO
     stub->_incr_refcnt ();
 
     bool collocated =
-      !CORBA::is_nil (stub->servant_orb_var ().ptr ())
+      !CORBA::is_nil (stub->servant_orb_var ().in ())
       && stub->optimize_collocation_objects ()
       && obj->_is_collocated ()
       && pbf != 0;
@@ -132,4 +131,6 @@ namespace TAO
   }
 }
 
-#endif /* TAO_OBJECT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_OBJECT_T_CPP */
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index 57c11c5950a..c4cfd88230c 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -17,8 +17,17 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Versioned_Namespace.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -58,6 +67,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Object_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
index 0a93b48c86a..c8b86b6e406 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -1,13 +1,11 @@
 // $Id$
-#ifndef TAO_OBJREF_VAROUT_T_C
-#define TAO_OBJREF_VAROUT_T_C
+#ifndef TAO_OBJREF_VAROUT_T_CPP
+#define TAO_OBJREF_VAROUT_T_CPP
 
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (tao,
-           Objref_VarOut_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void)
@@ -166,16 +164,6 @@ TAO_Objref_Out_T<T>::operator= (
 
 template <typename T>
 TAO_Objref_Out_T<T> &
-TAO_Objref_Out_T<T>::operator= (
-    const TAO_Objref_Var_T<T> & p
-  )
-{
-  this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ());
-  return *this;
-}
-
-template <typename T>
-TAO_Objref_Out_T<T> &
 TAO_Objref_Out_T<T>::operator= (T * p)
 {
   this->ptr_ = p;
@@ -183,14 +171,14 @@ TAO_Objref_Out_T<T>::operator= (T * p)
 }
 
 template <typename T>
-TAO_Objref_Out_T<T>::operator T *& ()
+T *&
+TAO_Objref_Out_T<T>::ptr (void)
 {
   return this->ptr_;
 }
 
 template <typename T>
-T *&
-TAO_Objref_Out_T<T>::ptr (void)
+TAO_Objref_Out_T<T>::operator T *& ()
 {
   return this->ptr_;
 }
@@ -202,4 +190,6 @@ TAO_Objref_Out_T<T>::operator-> (void)
   return this->ptr_;
 }
 
-#endif /* TAO_OBJREF_VAROUT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_OBJREF_VAROUT_T_CPP */
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index f3fc6ac260f..2ecfcd75efc 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -24,6 +24,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/varbase.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_OutputCDR;
 
 namespace TAO
@@ -31,18 +33,11 @@ namespace TAO
   /**
    * struct Objref_Traits
    *
-   * @brief Specialized for each interface in generated code.
-   *
+   * @brief Specialized for each interface in generated code. Just forward
+   * declare, a specialization must always be there, if not, we get a
+   * compile error.
    */
-  template<typename T>
-  struct Objref_Traits
-  {
-    static T * duplicate (T *);
-    static void release (T *);
-    static T * nil (void);
-    static CORBA::Boolean marshal (T *,
-                                   TAO_OutputCDR &);
-  };
+  template<typename T> struct Objref_Traits;
 }
 
 /**
@@ -111,7 +106,6 @@ public:
   TAO_Objref_Out_T (const TAO_Objref_Out_T<T> &);
 
   TAO_Objref_Out_T &operator= (const TAO_Objref_Out_T<T> &);
-  TAO_Objref_Out_T &operator= (const TAO_Objref_Var_T<T> &);
   TAO_Objref_Out_T &operator= (T *);
 
   // Cast operator.
@@ -121,10 +115,14 @@ public:
   T * operator-> (void);
 
 private:
-  typedef TAO_Objref_Out_T<T> THIS_OUT_TYPE;
   T *& ptr_;
+
+  /// Assignment from _var not allowed.
+  TAO_Objref_Out_T &operator= (const TAO_Objref_Var_T<T> &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Objref_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index c59ead52d2b..93c712762cb 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -29,20 +29,22 @@
 // be\be_codegen.cpp:288
 
 
-#include "OctetSeqC.h"
+#include "tao/OctetSeqC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_OCTETSEQ_CS_)
@@ -54,7 +56,7 @@ CORBA::OctetSeq::OctetSeq (void)
 CORBA::OctetSeq::OctetSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max)
@@ -66,7 +68,7 @@ CORBA::OctetSeq::OctetSeq (
     CORBA::Octet * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max, length, buffer, release)
@@ -75,7 +77,7 @@ CORBA::OctetSeq::OctetSeq (
 CORBA::OctetSeq::OctetSeq (
     const OctetSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (seq)
@@ -106,29 +108,7 @@ CORBA::Boolean operator<< (
     const CORBA::OctetSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<CORBA::OctetSeq *> (&_tao_sequence));
-        if (_tao_octet_seq->mb ())
-          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-      
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -136,55 +116,9 @@ CORBA::Boolean operator>> (
     CORBA::OctetSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-            static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 5fa4471699b..ebc55bd289d 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -57,6 +57,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -73,22 +75,19 @@ namespace CORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        OctetSeq,
-        CORBA::Octet
+        OctetSeq
       >
     OctetSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        OctetSeq,
-        OctetSeq_var,
-        CORBA::Octet
+        OctetSeq
       >
     OctetSeq_out;
 
   class TAO_Export OctetSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Octet
           >
   {
@@ -99,7 +98,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::Octet* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     OctetSeq (const OctetSeq &);
     ~OctetSeq (void);
@@ -113,7 +112,7 @@ namespace CORBA
         CORBA::ULong length,
         const ACE_Message_Block* mb
       )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+      : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
   };
 
@@ -141,7 +140,7 @@ namespace TAO
 // but we put the instantiation here because the application will
 // need to see it in *C.h to avoid the error.
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-  template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
+  template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 
@@ -165,6 +164,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 544a2694509..d11d48b1d2e 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -1,18 +1,19 @@
 // $Id$
 
-#include "ClientRequestInfo.h"
+#include "tao/PI/ClientRequestInfo.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (tao,
+ACE_RCSID (PI,
            ClientRequestInfo,
            "$Id$")
 
-#include "PICurrent.h"
-#include "RequestInfo_Util.h"
-
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/ExceptionA.h"
+
+#include "tao/PI/PICurrent.h"
+#include "tao/PI/RequestInfo_Util.h"
+
 #include "tao/PolicyC.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/Invocation_Base.h"
@@ -24,6 +25,8 @@ ACE_RCSID (tao,
 #include "tao/Service_Context.h"
 #include "tao/Exception_Data.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
   : invocation_ (inv),
     rs_pi_current_ (),
@@ -544,8 +547,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
             this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
           if (!CORBA::is_nil (tcp))
             {
-              TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-              exception_list[i] = tcp_object;
+              exception_list[i] = tcp;
             }
         }
     }
@@ -601,8 +603,10 @@ TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 bool
 TAO_ClientRequestInfo::result (CORBA::Any *any)
 {
-  for (CORBA::ULong i = 0; i != this->invocation_->operation_details ().args_num (); ++i)
-    (*this->invocation_->operation_details ().args ()[i]).interceptor_value (any);
+  // Result is always first element in TAO::Argument array.
+  TAO::Argument * const r = this->invocation_->operation_details ().args ()[0];
+
+  r->interceptor_value (any);
 
   return true;
 }
@@ -722,4 +726,30 @@ TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
                                      CORBA::COMPLETED_NO));
 }
 
+void
+TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time)
+{
+  this->invocation_->operation_details ().ft_expiration_time (time);
+}
+
+TimeBase::TimeT
+TAO_ClientRequestInfo::tao_ft_expiration_time (void) const
+{
+  return this->invocation_->operation_details ().ft_expiration_time ();
+}
+
+void
+TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id)
+{
+  this->invocation_->operation_details ().ft_retention_id (request_id) ;
+}
+
+CORBA::Long
+TAO_ClientRequestInfo::tao_ft_retention_id (void) const
+{
+  return this->invocation_->operation_details ().ft_retention_id ();
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 4a47e23de92..40c83ff4c70 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -31,15 +31,18 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/PI/ClientRequestInfoC.h"
+#include "tao/PI/PIForwardRequestC.h"
+#include "tao/PI/PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Copy_Callback.h"
 #include "tao/CORBA_methods.h"
-#include "ClientRequestInfoC.h"
-#include "PIForwardRequestC.h"
-#include "PICurrent_Impl.h"
-#include "PICurrent_Copy_Callback.h"
 #include "tao/ORB_Constants.h"
 #include "tao/LocalObject.h"
 #include "tao/Invocation_Utils.h"
+#include "tao/TimeBaseC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Service_Context;
 
@@ -67,7 +70,7 @@ namespace Messaging
  * @brief Implementation of the PortableInterceptor::ClientRequestInfo
  *        interface.
  */
-class TAO_ClientRequestInfo
+class TAO_PI_Export TAO_ClientRequestInfo
   : public virtual PortableInterceptor::ClientRequestInfo,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -220,6 +223,27 @@ public:
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /*
+  * Proprietary accessor methods for the FT retention ID and
+  * request expiration time.
+  */
+
+  /// Set the absolute FT expiration time for this request.
+  void tao_ft_expiration_time (TimeBase::TimeT time);
+
+  /// Get the absolute FT expiration time for this request
+  TimeBase::TimeT tao_ft_expiration_time (void) const;
+
+  /// Set the FT request retention ID for this request.
+  void tao_ft_retention_id (CORBA::Long request_id);
+
+  /// Get the FT request retention ID for this request.
+  CORBA::Long tao_ft_retention_id (void) const;
+
+  /*
+  * End proprietary FT methods.
+  */
+
 private:
 
   bool parameter_list (Dynamic::ParameterList &param_list);
@@ -268,6 +292,8 @@ private:
   TAO::PICurrent_Copy_Callback copy_callback_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl
index 3ee07e65af4..1a5baca1d14 100644
--- a/TAO/tao/PI/ClientRequestInfo.pidl
+++ b/TAO/tao/PI/ClientRequestInfo.pidl
@@ -23,8 +23,8 @@
 #define _CLIENT_REQUESTINFO_PIDL_
 
 #include "tao/PI/RequestInfo.pidl"
-#include <orb_types.pidl>
-#include <Policy_Forward.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Policy_Forward.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp
index f6840ced1f9..aa30e9882c7 100644
--- a/TAO/tao/PI/ClientRequestInfoA.cpp
+++ b/TAO/tao/PI/ClientRequestInfoA.cpp
@@ -25,26 +25,29 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ClientRequestInfoC.h"
+#include "tao/PI/ClientRequestInfoA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ClientRequestInfo (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
     "ClientRequestInfo");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
@@ -52,78 +55,4 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ClientRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ClientRequestInfo,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp
index b818e7383c8..8c9be367b0f 100644
--- a/TAO/tao/PI/ClientRequestInfoC.cpp
+++ b/TAO/tao/PI/ClientRequestInfoC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "ClientRequestInfoC.h"
+#include "tao/PI/ClientRequestInfoC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void)
   return PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
     PortableInterceptor::ClientRequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
@@ -88,17 +86,9 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-void 
-PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientRequestInfo *_tao_tmp_pointer =
-    static_cast<ClientRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -109,7 +99,7 @@ PortableInterceptor::ClientRequestInfo::_narrow (
 
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -121,21 +111,21 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ClientRequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -173,8 +163,10 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
   return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h
index 59f9dab7f1e..2a13b7eb472 100644
--- a/TAO/tao/PI/ClientRequestInfoC.h
+++ b/TAO/tao/PI/ClientRequestInfoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
-#define _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
+#ifndef _TAO_IDL_CLIENTREQUESTINFOC_H_
+#define _TAO_IDL_CLIENTREQUESTINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,13 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/pi_export.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/TypeCode.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"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -59,36 +59,29 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -96,170 +89,165 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-
+  
   class TAO_PI_Export ClientRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-
+    
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-
+    
     static void _tao_release (ClientRequestInfo_ptr obj);
-
+    
     static ClientRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _nil (void)
     {
       return static_cast<ClientRequestInfo_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr target (
+    
+    virtual ::CORBA::Object_ptr target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr effective_target (
+    
+    virtual ::CORBA::Object_ptr effective_target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedProfile * effective_profile (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * received_exception (
+    
+    virtual ::CORBA::Any * received_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * received_exception_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     ClientRequestInfo (void);
-
+    
     virtual ~ClientRequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInfo (const ClientRequestInfo &);
-
+    
     void operator= (const ClientRequestInfo &);
   };
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -270,9 +258,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
   {
@@ -283,7 +271,7 @@ namespace TAO
         ::PortableInterceptor::ClientRequestInfo_ptr
       );
     static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ClientRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -293,22 +281,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp
index 7a1f1aca023..b3c99cc3579 100644
--- a/TAO/tao/PI/ClientRequestInterceptorA.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp
@@ -25,16 +25,18 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#include "tao/PI/ClientRequestInterceptorA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
-#include "ClientRequestInterceptorC.h"
-#include "tao/CDR.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -42,10 +44,10 @@
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ClientRequestInterceptor (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
     "ClientRequestInterceptor");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor =
@@ -53,78 +55,4 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ClientRequestInterceptor_ptr _tao_objptr =
-    PortableInterceptor::ClientRequestInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_ClientRequestInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_ClientRequestInterceptor,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp
index 8e2bf9e81f6..18721ae0d0f 100644
--- a/TAO/tao/PI/ClientRequestInterceptorC.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "ClientRequestInterceptorC.h"
+#include "tao/PI/ClientRequestInterceptorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void)
   return PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal (
     PortableInterceptor::ClientRequestInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
@@ -88,17 +86,9 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-void 
-PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientRequestInterceptor *_tao_tmp_pointer =
-    static_cast<ClientRequestInterceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -109,7 +99,7 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
 
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -121,21 +111,21 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ClientRequestInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -173,8 +163,10 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository
   return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInterceptorC.h b/TAO/tao/PI/ClientRequestInterceptorC.h
index 4c9bd3efb85..840948b8b5a 100644
--- a/TAO/tao/PI/ClientRequestInterceptorC.h
+++ b/TAO/tao/PI/ClientRequestInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
+#ifndef _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_
+#define _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -55,36 +55,29 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -92,22 +85,22 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-
+  
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInterceptor
       >
     ClientRequestInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInterceptor
@@ -115,88 +108,88 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_PI_Export ClientRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-
+    
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
+    
     static void _tao_release (ClientRequestInterceptor_ptr obj);
-
+    
     static ClientRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _nil (void)
     {
       return static_cast<ClientRequestInterceptor_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
@@ -205,20 +198,20 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
   protected:
     // Abstract or local interface only.
@@ -234,14 +227,9 @@ namespace PortableInterceptor
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -252,8 +240,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
@@ -265,7 +253,7 @@ namespace TAO
         ::PortableInterceptor::ClientRequestInfo_ptr
       );
     static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ClientRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -273,8 +261,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
@@ -286,7 +274,7 @@ namespace TAO
         ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ClientRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -296,22 +284,10 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1040
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 574fc987085..741d185e2b9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -1,12 +1,12 @@
-#include "ClientRequestInterceptor_Adapter_Impl.h"
+#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 #if !defined (__ACE_INLINE__)
-#include "ClientRequestInterceptor_Adapter_Impl.inl"
+#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl"
 #endif /* defined INLINE */
 
-#include "ClientRequestInfo.h"
+#include "tao/PI/ClientRequestInfo.h"
 
 #include "tao/Invocation_Base.h"
 #include "tao/ORB_Core.h"
@@ -17,6 +17,8 @@ ACE_RCSID (PI,
            ClientRequestInterceptorAdapter_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   void
@@ -26,16 +28,25 @@ namespace TAO
   {
     // This method implements one of the "starting" client side
     // interception point.
+
+    bool is_remote_request = invocation.is_remote_request();
+
     ACE_TRY
       {
         TAO_ClientRequestInfo ri (&invocation);
 
         for (size_t i = 0 ; i < this->interceptor_list_.size (); ++i)
           {
-            this->interceptor_list_.interceptor (i)->
-              send_request (&ri
-                            ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            ClientRequestInterceptor_List::RegisteredInterceptor& registered =
+              this->interceptor_list_.registered_interceptor (i);
+
+            if (registered.details_.should_be_processed (is_remote_request))
+              {
+                registered.interceptor_->
+                  send_request (&ri
+                                ACE_ENV_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
 
             // The starting interception point completed successfully.
             // Push  the interceptor on to the flow stack.
@@ -61,6 +72,8 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
+    bool is_remote_request = invocation.is_remote_request();
+
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
     // interception point.
@@ -77,11 +90,18 @@ namespace TAO
         // invoked in another "ending" interception point.
         --invocation.stack_size ();
 
-        this->interceptor_list_.interceptor (invocation.stack_size ())->
-          receive_reply (
-            &ri
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ClientRequestInterceptor_List::RegisteredInterceptor& registered =
+          this->interceptor_list_.registered_interceptor (
+            invocation.stack_size ());
+
+        if (registered.details_.should_be_processed (is_remote_request))
+          {
+            registered.interceptor_->
+              receive_reply (
+                &ri
+                ACE_ENV_ARG_PARAMETER);
+            ACE_CHECK;
+          }
       }
 
     // The receive_reply() interception point does not raise a
@@ -97,6 +117,8 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
+    bool is_remote_request = invocation.is_remote_request();
+
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
     // interception point.
@@ -114,11 +136,18 @@ namespace TAO
             // being invoked in another "ending" interception point.
             --invocation.stack_size ();
 
-            this->interceptor_list_.interceptor (invocation.stack_size ())->
-              receive_exception (
-                &ri
-                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ClientRequestInterceptor_List::RegisteredInterceptor& registered =
+              this->interceptor_list_.registered_interceptor (
+                invocation.stack_size ());
+
+            if (registered.details_.should_be_processed (is_remote_request))
+              {
+                registered.interceptor_->
+                  receive_exception (
+                    &ri
+                    ACE_ENV_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
           }
       }
     ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -167,6 +196,8 @@ namespace TAO
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
 
+    bool is_remote_request = invocation.is_remote_request();
+
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
     // interception point.
@@ -185,11 +216,18 @@ namespace TAO
           // being invoked in another "ending" interception point.
           --invocation.stack_size ();
 
-          this->interceptor_list_.interceptor (invocation.stack_size ())->
-            receive_other (
-              &ri
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ClientRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (
+              invocation.stack_size ());
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                receive_other (
+                  &ri
+                  ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
       }
     ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -227,6 +265,18 @@ namespace TAO
   }
 
   void
+  ClientRequestInterceptor_Adapter_Impl::add_interceptor (
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL)
+  {
+    this->interceptor_list_.add_interceptor (interceptor,
+                                             policies
+                                             ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+
+  void
   ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (
     ACE_ENV_SINGLE_ARG_DECL)
   {
@@ -266,4 +316,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 2ec52a987aa..4b1a7ebc70c 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -30,14 +30,17 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "Interceptor_List_T.h"
-#include "ClientRequestInterceptorC.h"
+#include "tao/PI/Interceptor_List_T.h"
+#include "tao/PI/ClientRequestInterceptorC.h"
+#include "tao/PI/ClientRequestDetails.h"
 #include "tao/ClientRequestInterceptor_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor>
+  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor,
+                            ClientRequestDetails>
     ClientRequestInterceptor_List;
 }
 
@@ -99,6 +102,12 @@ namespace TAO
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL);
 
+    /// Register an interceptor with policies.
+    virtual void add_interceptor (
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL);
+
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
     virtual PortableInterceptor::ReplyStatus reply_status (
@@ -120,8 +129,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ClientRequestInterceptor_Adapter_Impl.inl"
+#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl"
 #endif  /* __ACE_INLINE__ */
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
index e234f5d02ac..c1c7835148d 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -9,3 +11,5 @@ namespace TAO
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 890ce995534..e4ff27b2c9b 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 // =================================================================
 /**
@@ -11,11 +11,11 @@
  */
 // =================================================================
 
-#include "ClientRequestInterceptor_Factory_Impl.h"
+#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ClientRequestInterceptor_Adapter_Impl.h"
+#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -24,6 +24,8 @@ ACE_RCSID (PI,
            ClientRequestInterceptor_Factory_Impl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ClientRequestInterceptor_Adapter*
 TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
 {
@@ -34,6 +36,8 @@ TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl,
                        ACE_TEXT ("ClientRequestInterceptor_Adapter_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
index c3b959f156f..f63b6ca3407 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +26,10 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Service_Config.h"
 #include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -42,6 +43,8 @@ public:
   virtual TAO::ClientRequestInterceptor_Adapter *create (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_PI, TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
 
diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp
index 39a0f627a03..20c37dc8d94 100644
--- a/TAO/tao/PI/InterceptorA.cpp
+++ b/TAO/tao/PI/InterceptorA.cpp
@@ -25,16 +25,18 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#include "tao/PI/InterceptorA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "InterceptorC.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -42,89 +44,14 @@
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_Interceptor (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/Interceptor:1.0",
     "Interceptor");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Interceptor =
     &_tao_tc_PortableInterceptor_Interceptor;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::Interceptor_ptr _tao_objptr =
-    PortableInterceptor::Interceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::Interceptor>::insert (
-      _tao_any,
-      PortableInterceptor::Interceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_Interceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::Interceptor>::extract (
-        _tao_any,
-        PortableInterceptor::Interceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_Interceptor,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp
index cc1c0e0b458..bcb672a9d2b 100644
--- a/TAO/tao/PI/InterceptorC.cpp
+++ b/TAO/tao/PI/InterceptorC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "InterceptorC.h"
+#include "tao/PI/InterceptorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::release (
     PortableInterceptor::Interceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::Interceptor_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void)
   return PortableInterceptor::Interceptor::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal (
     PortableInterceptor::Interceptor_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::Interceptor::Interceptor (void)
@@ -88,17 +86,9 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-void 
-PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Interceptor *_tao_tmp_pointer =
-    static_cast<Interceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -109,7 +99,7 @@ PortableInterceptor::Interceptor::_narrow (
 
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -121,21 +111,21 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::Interceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -169,8 +159,10 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/Interceptor:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/InterceptorC.h b/TAO/tao/PI/InterceptorC.h
index 750a1698595..55841315bfe 100644
--- a/TAO/tao/PI/InterceptorC.h
+++ b/TAO/tao/PI/InterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_INTERCEPTORC_H_
-#define _TAO_IDL_ORIG_INTERCEPTORC_H_
+#ifndef _TAO_IDL_INTERCEPTORC_H_
+#define _TAO_IDL_INTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,23 +52,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
@@ -97,7 +90,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
   
   class TAO_PI_Export Interceptor
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef Interceptor_ptr _ptr_type;
@@ -109,12 +102,12 @@ namespace PortableInterceptor
     static void _tao_release (Interceptor_ptr obj);
     
     static Interceptor_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     static Interceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -123,7 +116,7 @@ namespace PortableInterceptor
       return static_cast<Interceptor_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -132,7 +125,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -142,19 +135,19 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
   protected:
     // Abstract or local interface only.
@@ -170,14 +163,9 @@ namespace PortableInterceptor
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Interceptor;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -188,8 +176,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::Interceptor>
@@ -201,7 +189,7 @@ namespace TAO
         ::PortableInterceptor::Interceptor_ptr
       );
     static ::PortableInterceptor::Interceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::Interceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -211,22 +199,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 5f3b6e74581..657f69213ad 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ORBInitInfoC.h"
-#include "InterceptorC.h"
+#include "tao/PI/ORBInitInfoC.h"
+#include "tao/PI/InterceptorC.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
@@ -10,30 +10,40 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-  template <typename InterceptorType>
-  Interceptor_List<InterceptorType>::Interceptor_List (void)
+  template <typename InterceptorType, typename DetailsType>
+  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List (void)
   {
   }
 
-  template <typename InterceptorType>
-  typename Interceptor_List<InterceptorType>::InterceptorType_ptr_type
-  Interceptor_List<InterceptorType>::interceptor (size_t index)
+  template <typename InterceptorType, typename DetailsType>
+  typename Interceptor_List<InterceptorType,DetailsType>::RegisteredInterceptor&
+  Interceptor_List<InterceptorType,DetailsType>::registered_interceptor (
+    size_t index)
   {
-    return this->interceptors_[index].in ();
+    return this->interceptors_[index];
   }
 
-  template <typename InterceptorType>
+  template <typename InterceptorType, typename DetailsType>
+  typename Interceptor_List<InterceptorType,DetailsType>::InterceptorType_ptr_type
+  Interceptor_List<InterceptorType,DetailsType>::interceptor (size_t index)
+  {
+    return this->interceptors_[index].interceptor_.in ();
+  }
+
+  template <typename InterceptorType, typename DetailsType>
   size_t
-  Interceptor_List<InterceptorType>::size (void)
+  Interceptor_List<InterceptorType,DetailsType>::size (void)
   {
     return this->interceptors_.size ();
   }
 
-  template <typename InterceptorType>
+  template <typename InterceptorType, typename DetailsType>
   void
-  Interceptor_List<InterceptorType>::add_interceptor (
+  Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
     InterceptorType_ptr_type interceptor
     ACE_ENV_ARG_DECL)
   {
@@ -88,7 +98,91 @@ namespace TAO
         this->interceptors_.size (new_len);
 
         // Add the interceptor
-        this->interceptors_[old_len] = InterceptorType::_duplicate (interceptor);
+        this->interceptors_[old_len].interceptor_ =
+          InterceptorType::_duplicate (interceptor);
+      }
+    else
+      {
+        ACE_THROW (
+            CORBA::INV_OBJREF (
+                CORBA::SystemException::_tao_minor_code (
+                    0,
+                    EINVAL
+                  ),
+                CORBA::COMPLETED_NO
+              )
+            );
+      }
+  }
+
+  template <typename InterceptorType, typename DetailsType>
+  void
+  Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
+    InterceptorType_ptr_type interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL)
+  {
+    if (!CORBA::is_nil (interceptor))
+      {
+        const size_t old_len = this->interceptors_.size ();
+
+        // Don't bother checking the name for duplicates if no
+        // interceptors have been registered.  This saves an
+        // allocation.
+        if (old_len > 0)
+          {
+            /// If the Interceptor is not anonymous, make sure an
+            /// Interceptor with the same isn't already registered.
+            CORBA::String_var name =
+              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ACE_CHECK;
+
+            if (ACE_OS::strlen (name.in ()) != 0)
+              {
+                // @@ This simple search algorithm isn't the greatest
+                //    thing in the world, but since we only register
+                //    interceptors when bootstrapping an ORB, there will
+                //    be no runtime penalty.
+                //
+                //    Another source of inefficiency is that
+                //    Interceptors duplicate their name each time the
+                //    name() accessor is called!  This can slow down
+                //    bootstrap time noticeably when registering a huge
+                //    number of interceptors.  We could cache the names
+                //    somewhere, but since this is only a bootstrapping
+                //    issue there's no rush to implement such a scheme.
+
+                // Prevent interceptors with the same name from being
+                // registered.  Anonymous interceptors are okay.
+                for (size_t i = 0; i < old_len; ++i)
+                  {
+                    CORBA::String_var existing_name =
+                      this->interceptor (i)->name ();
+
+                    if (ACE_OS::strcmp (existing_name.in (),
+                                        name.in ()) == 0)
+                      {
+                        ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ());
+                      }
+                  }
+              }
+          }
+
+        // Create a DetailsType object, and attempt to apply the policies.
+        DetailsType details;
+        details.apply_policies(policies ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        /// Increase the length of the Interceptor sequence by one.
+        const size_t new_len = old_len + 1;
+        this->interceptors_.size (new_len);
+
+        // Add the interceptor
+        this->interceptors_[old_len].interceptor_ =
+          InterceptorType::_duplicate (interceptor);
+
+        // Set the details
+        this->interceptors_[old_len].details_ = details;
       }
     else
       {
@@ -104,9 +198,9 @@ namespace TAO
       }
   }
 
-  template <typename InterceptorType>
+  template <typename InterceptorType, typename DetailsType>
   void
-  Interceptor_List<InterceptorType>::destroy_interceptors (
+  Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors (
     ACE_ENV_SINGLE_ARG_DECL)
   {
     const size_t len = this->interceptors_.size ();
@@ -147,3 +241,5 @@ namespace TAO
     ACE_CHECK;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index bb3a29db0a8..5160ec03377 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -24,12 +24,19 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
 }
 
+namespace CORBA
+{
+  class PolicyList;
+}
+
 namespace TAO
 {
   /**
@@ -40,14 +47,19 @@ namespace TAO
    * Template for the various portable interceptor lists used
    * internally by TAO.
    */
-  template <typename InterceptorType>
+  template <typename InterceptorType, typename DetailsType>
   class Interceptor_List
   {
   public:
     /// Define the traits for the underlying portable interceptor array.
     typedef typename InterceptorType::_var_type InterceptorType_var_type;
     typedef typename InterceptorType::_ptr_type InterceptorType_ptr_type;
-    typedef ACE_Array_Base<InterceptorType_var_type> TYPE;
+
+    struct RegisteredInterceptor
+    {
+      InterceptorType_var_type interceptor_;
+      DetailsType              details_;
+    };
 
     /// Constructor.
     Interceptor_List (void);
@@ -56,22 +68,35 @@ namespace TAO
       InterceptorType_ptr_type i
       ACE_ENV_ARG_DECL);
 
+    /// Register an interceptor with policies.
+    void add_interceptor (InterceptorType_ptr_type i,
+                          const CORBA::PolicyList& policies
+                          ACE_ENV_ARG_DECL);
+
     void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
+    /// Return the registered interceptor in sequence element @a index.
+    RegisteredInterceptor& registered_interceptor (
+      size_t index);
+
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
 
     size_t size (void);
 
   private:
-    /// Dynamic array of registered interceptors.
-    TYPE interceptors_;
 
+    typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray;
+
+    /// Dynamic array of registered interceptors.
+    RegisteredArray interceptors_;
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Interceptor_List_T.cpp"
+#include "tao/PI/Interceptor_List_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/PI/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp
index 638e24ea2f2..1c099df47c0 100644
--- a/TAO/tao/PI/InvalidSlotA.cpp
+++ b/TAO/tao/PI/InvalidSlotA.cpp
@@ -33,10 +33,12 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
-#include "InvalidSlotA.h"
+#include "tao/PI/InvalidSlotA.h"
 #include "tao/CDR.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -147,3 +149,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/InvalidSlotA.h b/TAO/tao/PI/InvalidSlotA.h
index bd02e893965..323675bc790 100644
--- a/TAO/tao/PI/InvalidSlotA.h
+++ b/TAO/tao/PI/InvalidSlotA.h
@@ -60,6 +60,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   // TAO_IDL - Generated from
@@ -91,6 +93,8 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInte
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp
index 441c13306f4..8d01da855f3 100644
--- a/TAO/tao/PI/InvalidSlotC.cpp
+++ b/TAO/tao/PI/InvalidSlotC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "InvalidSlotA.h"
+#include "tao/PI/InvalidSlotA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -73,7 +75,7 @@ PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::Inva
 PortableInterceptor::InvalidSlot&
 PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -171,3 +173,5 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/InvalidSlotC.h b/TAO/tao/PI/InvalidSlotC.h
index 47acd600e79..cefb3fb9adb 100644
--- a/TAO/tao/PI/InvalidSlotC.h
+++ b/TAO/tao/PI/InvalidSlotC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
 
@@ -131,6 +133,8 @@ TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::In
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 658f11d6238..23ec50a3dae 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ORBInitInfo.h"
+#include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -11,7 +11,7 @@
 #include "ace/Service_Config.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent.h"
+#include "tao/PI/PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_RCSID (TAO,
@@ -19,11 +19,13 @@ ACE_RCSID (TAO,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "ORBInitInfo.inl"
+#include "tao/PI/ORBInitInfo.inl"
 #endif /* defined INLINE */
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
@@ -39,7 +41,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (
     TAO_ORBInitInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO_ORBInitInfo_ptr
@@ -138,11 +140,11 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
 
       if (loader != 0)
         {
-          CORBA::Object_ptr cf =
+          CORBA::Object_var cf =
             loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
 
-          this->codec_factory_ = IOP::CodecFactory::_narrow (cf);
+          this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ());
         }
     }
 
@@ -258,6 +260,86 @@ TAO_ORBInitInfo::add_ior_interceptor (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+void
+TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ORBInitInfo::DuplicateName,
+                   CORBA::PolicyError))
+{
+# if TAO_HAS_INTERCEPTORS == 1
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->orb_core_->add_interceptor (interceptor,
+                                    policies
+                                    ACE_ENV_ARG_PARAMETER);
+#else
+  ACE_UNUSED_ARG (interceptor);
+  ACE_UNUSED_ARG (policies);
+  ACE_THROW (CORBA::NO_IMPLEMENT (
+               CORBA::SystemException::_tao_minor_code (
+                 0,
+                 ENOTSUP),
+               CORBA::COMPLETED_NO));
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+}
+
+void
+TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ORBInitInfo::DuplicateName,
+                   CORBA::PolicyError))
+{
+# if TAO_HAS_INTERCEPTORS == 1
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->orb_core_->add_interceptor (interceptor,
+                                    policies
+                                    ACE_ENV_ARG_PARAMETER);
+
+#else
+  ACE_UNUSED_ARG (interceptor);
+  ACE_UNUSED_ARG (policies);
+  ACE_THROW (CORBA::NO_IMPLEMENT (
+               CORBA::SystemException::_tao_minor_code (
+                 0,
+                 ENOTSUP),
+               CORBA::COMPLETED_NO));
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+}
+
+void
+TAO_ORBInitInfo::add_ior_interceptor_with_policy (
+    PortableInterceptor::IORInterceptor_ptr interceptor,
+    const CORBA::PolicyList& policies
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ORBInitInfo::DuplicateName,
+                   CORBA::PolicyError))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Since there are currently no PI Policies that pertain to
+  // IOR Interceptors, we will always raise the NO_IMPLEMENT
+  // CORBA System Exception here to indicate that this method
+  // is currently not implemented/supported.
+  ACE_UNUSED_ARG (interceptor);
+  ACE_UNUSED_ARG (policies);
+  ACE_THROW (CORBA::NO_IMPLEMENT (
+               CORBA::SystemException::_tao_minor_code (
+                 0,
+                 ENOTSUP),
+               CORBA::COMPLETED_NO));
+}
+
 PortableInterceptor::SlotId
 TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -383,3 +465,4 @@ const char* TAO_ORBInitInfo::_interface_repository_id (void) const
   return "IDL:TAO_ORBInitInfo:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index f83238f0305..63c78095104 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ORBInitInfoC.h"
+#include "tao/PI/ORBInitInfoC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -35,6 +35,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_ORBInitInfo;
 typedef TAO_ORBInitInfo *TAO_ORBInitInfo_ptr;
@@ -48,14 +50,14 @@ typedef TAO_Objref_Out_T<TAO_ORBInitInfo>
 /**
  * @class TAO_ORBInitInfo
  *
- * @brief An implementation of the PortableInterceptor::ORBInitInfo
+ * @brief An implementation of the PortableInterceptor::ORBInitInfo_3_1
  *        interface.
  *
  * This class encapsulates the data passed to ORBInitializers during
  * ORB initialization.
  */
 class TAO_PI_Export TAO_ORBInitInfo
-  : public virtual PortableInterceptor::ORBInitInfo,
+  : public virtual PortableInterceptor::ORBInitInfo_3_1,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
@@ -140,6 +142,36 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
+  /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableInterceptor::ORBInitInfo::DuplicateName,
+                     CORBA::PolicyError));
+
+  /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableInterceptor::ORBInitInfo::DuplicateName,
+                     CORBA::PolicyError));
+
+  /// 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_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableInterceptor::ORBInitInfo::DuplicateName,
+                     CORBA::PolicyError));
+
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
   virtual PortableInterceptor::SlotId allocate_slot_id (
@@ -293,8 +325,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "ORBInitInfo.inl"
+#include "tao/PI/ORBInitInfo.inl"
 #endif  /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl
index bb8d32ed135..f151fd2711d 100644
--- a/TAO/tao/PI/ORBInitInfo.inl
+++ b/TAO/tao/PI/ORBInitInfo.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ORB_Core *
 TAO_ORBInitInfo::orb_core (void) const
 {
@@ -20,3 +22,5 @@ TAO_ORBInitInfo::slot_count (void) const
 {
   return this->slot_count_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl
index cade887bc03..052b05c0372 100644
--- a/TAO/tao/PI/ORBInitInfo.pidl
+++ b/TAO/tao/PI/ORBInitInfo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
@@ -22,10 +22,10 @@
 #ifndef _ORBINITINFO_PIDL_
 #define _ORBINITINFO_PIDL_
 
-#include <StringSeq.pidl>
+#include "tao/StringSeq.pidl"
 #include "tao/CodecFactory/IOP_Codec_include.pidl"
-#include <PI_Forward.pidl>
-#include <Policy.pidl>
+#include "tao/PI_Forward.pidl"
+#include "tao/Policy.pidl"
 
 module PortableInterceptor {
 
@@ -68,6 +68,23 @@ module PortableInterceptor {
       in CORBA::PolicyType type,
       in PolicyFactory policy_factory);
   };
+
+  local interface ORBInitInfo_3_1 : ORBInitInfo
+  {
+    void add_client_request_interceptor_with_policy(
+       in ClientRequestInterceptor interceptor,
+       in CORBA::PolicyList policies)
+       raises (DuplicateName, CORBA::PolicyError);
+    void add_server_request_interceptor_with_policy(
+       in ServerRequestInterceptor interceptor,
+       in CORBA::PolicyList policies)
+       raises (DuplicateName, CORBA::PolicyError);
+    void add_ior_interceptor_with_policy(
+       in IORInterceptor interceptor,
+       in CORBA::PolicyList policies)
+       raises (DuplicateName, CORBA::PolicyError);
+  };
+
 };
 
 #endif  /* _ORBINITINFO_PIDL_ */
diff --git a/TAO/tao/PI/ORBInitInfoA.cpp b/TAO/tao/PI/ORBInitInfoA.cpp
deleted file mode 100644
index 86c49b8a9e6..00000000000
--- a/TAO/tao/PI/ORBInitInfoA.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ORBInitInfoC.h"
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_string);
-
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
-  {
-    { "name", &CORBA::_tc_string }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-    "DuplicateName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
-    1);
-
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
-    "InvalidName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
-    0);
-
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
-    "ORBInitInfo");
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
-    &_tao_tc_PortableInterceptor_ORBInitInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
-    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::DuplicateName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::InvalidName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PI/ORBInitInfoC.cpp b/TAO/tao/PI/ORBInitInfoC.cpp
index 33580f1f439..6de6e4ccb75 100644
--- a/TAO/tao/PI/ORBInitInfoC.cpp
+++ b/TAO/tao/PI/ORBInitInfoC.cpp
@@ -26,19 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be/be_codegen.cpp:292
 
 
-#include "ORBInitInfoC.h"
+#include "tao/PI/ORBInitInfoC.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+// be/be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -47,7 +57,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ORBInitInfo.
 
@@ -64,7 +74,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ORBInitInfo_ptr
@@ -73,20 +83,35 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
   return PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
-    PortableInterceptor::ORBInitInfo_ptr p,
+    const PortableInterceptor::ORBInitInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    ::CORBA::tk_alias,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
+    "ObjectId",
+    &CORBA::_tc_string);
+
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
@@ -98,19 +123,19 @@ PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
 }
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
 {
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
+  this->name = ::CORBA::string_dup (_tao_excp.name.in ());
 }
 
 PortableInterceptor::ORBInitInfo::DuplicateName&
 PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
+  this->::CORBA::UserException::operator= (_tao_excp);
+  this->name = ::CORBA::string_dup (_tao_excp.name.in ());
   return *this;
 }
 
@@ -122,28 +147,28 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void
 }
 
 PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<DuplicateName *> (_tao_excp);
 }
 
 const PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp)
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const DuplicateName *> (_tao_excp);
 }
 
-CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
+::CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
@@ -162,7 +187,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
@@ -170,36 +195,58 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
+// be/be_visitor_exception/exception_ctor.cpp:66
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
     const char * _tao_name
   )
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
 {
-  this->name = CORBA::string_dup (_tao_name);
+  this->name = ::CORBA::string_dup (_tao_name);
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const
 {
   return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+  {
+    { "name", &CORBA::_tc_string }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    ::CORBA::tk_except,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+    "DuplicateName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
+    1);
+
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
         "InvalidName"
       )
@@ -211,7 +258,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
 }
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -221,7 +268,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte
 PortableInterceptor::ORBInitInfo::InvalidName&
 PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -233,28 +280,28 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_
 }
 
 PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<InvalidName *> (_tao_excp);
 }
 
 const PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp)
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const InvalidName *> (_tao_excp);
 }
 
-CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
+::CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
@@ -273,7 +320,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
@@ -281,32 +328,42 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const
 {
   return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
 }
 
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    ::CORBA::tk_except,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+    "InvalidName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
+    0);
+
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
 
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-void 
-PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitInfo *_tao_tmp_pointer =
-    static_cast<ORBInitInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -317,7 +374,7 @@ PortableInterceptor::ORBInitInfo::_narrow (
 
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -329,21 +386,21 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ORBInitInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -377,8 +434,174 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo (
+    ::CORBA::tk_local_interface,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
+    "ORBInitInfo");
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
+    &_tao_tc_PortableInterceptor_ORBInitInfo;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableInterceptor::ORBInitInfo_3_1.
+
+PortableInterceptor::ORBInitInfo_3_1_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::duplicate (
+    PortableInterceptor::ORBInitInfo_3_1_ptr p
+  )
+{
+  return PortableInterceptor::ORBInitInfo_3_1::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::release (
+    PortableInterceptor::ORBInitInfo_3_1_ptr p
+  )
+{
+  ::CORBA::release (p);
+}
+
+PortableInterceptor::ORBInitInfo_3_1_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::nil (void)
+{
+  return PortableInterceptor::ORBInitInfo_3_1::_nil ();
+}
+
+::CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::marshal (
+    const PortableInterceptor::ORBInitInfo_3_1_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return ::CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::ORBInitInfo_3_1::ORBInitInfo_3_1 (void)
+{}
+
+PortableInterceptor::ORBInitInfo_3_1::~ORBInitInfo_3_1 (void)
+{}
+
+PortableInterceptor::ORBInitInfo_3_1_ptr
+PortableInterceptor::ORBInitInfo_3_1::_narrow (
+    ::CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return ORBInitInfo_3_1::_duplicate (
+      dynamic_cast<ORBInitInfo_3_1_ptr> (_tao_objref)
+    );
+}
+
+PortableInterceptor::ORBInitInfo_3_1_ptr
+PortableInterceptor::ORBInitInfo_3_1::_unchecked_narrow (
+    ::CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return ORBInitInfo_3_1::_duplicate (
+      dynamic_cast<ORBInitInfo_3_1_ptr> (_tao_objref)
+    );
+}
+
+PortableInterceptor::ORBInitInfo_3_1_ptr
+PortableInterceptor::ORBInitInfo_3_1::_duplicate (ORBInitInfo_3_1_ptr obj)
+{
+  if (! ::CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+void
+PortableInterceptor::ORBInitInfo_3_1::_tao_release (ORBInitInfo_3_1_ptr obj)
+{
+  ::CORBA::release (obj);
+}
+
+::CORBA::Boolean
+PortableInterceptor::ORBInitInfo_3_1::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* PortableInterceptor::ORBInitInfo_3_1::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0";
+}
+
+::CORBA::Boolean
+PortableInterceptor::ORBInitInfo_3_1::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_3_1 (
+    ::CORBA::tk_local_interface,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0",
+    "ORBInitInfo_3_1");
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo_3_1 =
+    &_tao_tc_PortableInterceptor_ORBInitInfo_3_1;
+}
+
+
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
diff --git a/TAO/tao/PI/ORBInitInfoC.h b/TAO/tao/PI/ORBInitInfoC.h
index 9b75a535ae2..647e2eeda08 100644
--- a/TAO/tao/PI/ORBInitInfoC.h
+++ b/TAO/tao/PI/ORBInitInfoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be/be_codegen.cpp:164
 
 #ifndef _TAO_IDL_ORIG_ORBINITINFOC_H_
 #define _TAO_IDL_ORIG_ORBINITINFOC_H_
@@ -41,14 +41,20 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/pi_export.h"
-#include "tao/CodecFactory/IOP_Codec_includeC.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/AnyTypeCode/StringSeqA.h"
+#include "tao/CodecFactory/IOP_Codec_includeA.h"
+#include "tao/AnyTypeCode/PI_ForwardA.h"
+#include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/Objref_VarOut_T.h"
+#include "tao/Versioned_Namespace.h"
 
 #include "tao/StringSeqC.h"
+#include "tao/CodecFactory/IOP_Codec_includeC.h"
 #include "tao/PI_ForwardC.h"
 #include "tao/PolicyC.h"
 
@@ -57,36 +63,31 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
+
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientRequestInterceptor
       >
     ClientRequestInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientRequestInterceptor
@@ -94,22 +95,22 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
+
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerRequestInterceptor
       >
     ServerRequestInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerRequestInterceptor
@@ -117,22 +118,22 @@ namespace PortableInterceptor
     ServerRequestInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-  
+
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IORInterceptor
       >
     IORInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IORInterceptor
@@ -140,22 +141,22 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-  
+
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyFactory
       >
     PolicyFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyFactory
@@ -163,22 +164,22 @@ namespace PortableInterceptor
     PolicyFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
-  
+
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ORBInitInfo
       >
     ORBInitInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ORBInitInfo
@@ -186,79 +187,79 @@ namespace PortableInterceptor
     ORBInitInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-  
+
   class TAO_PI_Export ORBInitInfo
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef ORBInitInfo_ptr _ptr_type;
     typedef ORBInitInfo_var _var_type;
-    
+
     // The static operations.
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-    
+
     static void _tao_release (ORBInitInfo_ptr obj);
-    
+
     static ORBInitInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitInfo_ptr _nil (void)
     {
       return static_cast<ORBInitInfo_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typedef/typedef_ch.cpp:413
-    
+    // be/be_visitor_typedef/typedef_ch.cpp:413
+
     typedef char * ObjectId;
-    typedef CORBA::String_var ObjectId_var;
-    typedef CORBA::String_out ObjectId_out;
-    
+    typedef ::CORBA::String_var ObjectId_var;
+    typedef ::CORBA::String_out ObjectId_out;
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_ObjectId;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:53
+    // be/be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-    
-    class TAO_PI_Export DuplicateName : public CORBA::UserException
+
+    class TAO_PI_Export DuplicateName : public ::CORBA::UserException
     {
     public:
-      
-      TAO_String_Manager name;
+
+      TAO::String_Manager name;
       DuplicateName (void);
       DuplicateName (const DuplicateName &);
       ~DuplicateName (void);
 
       DuplicateName &operator= (const DuplicateName &);
-      
+
       static void _tao_any_destructor (void *);
-      
-      static DuplicateName *_downcast (CORBA::Exception *);
-      static const DuplicateName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      static DuplicateName *_downcast ( ::CORBA::Exception *);
+      static const DuplicateName *_downcast ( ::CORBA::Exception const *);
+
+      static ::CORBA::Exception *_alloc (void);
+
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -266,56 +267,53 @@ namespace PortableInterceptor
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ctor.cpp:66
-      
+      // be/be_visitor_exception/exception_ctor.cpp:66
+
       DuplicateName (
           const char * _tao_name
         );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:129
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_DuplicateName;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:53
+    // be/be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-    
-    class TAO_PI_Export InvalidName : public CORBA::UserException
+
+    class TAO_PI_Export InvalidName : public ::CORBA::UserException
     {
     public:
-      
+
       InvalidName (void);
       InvalidName (const InvalidName &);
       ~InvalidName (void);
 
       InvalidName &operator= (const InvalidName &);
-      
+
       static void _tao_any_destructor (void *);
-      
-      static InvalidName *_downcast (CORBA::Exception *);
-      static const InvalidName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      static InvalidName *_downcast ( ::CORBA::Exception *);
+      static const InvalidName *_downcast ( ::CORBA::Exception const *);
+
+      static ::CORBA::Exception *_alloc (void);
+
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -323,184 +321,312 @@ namespace PortableInterceptor
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:129
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be/be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_InvalidName;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual ::CORBA::StringSeq * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual ::IOP::CodecFactory_ptr codec_factory (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual void register_initial_reference (
         const char * id,
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr resolve_initial_references (
+    // be/be_visitor_operation/operation_ch.cpp:46
+
+    virtual ::CORBA::Object_ptr resolve_initial_references (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual void add_client_request_interceptor (
         ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual void add_server_request_interceptor (
         ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual void add_ior_interceptor (
         ::PortableInterceptor::IORInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::SlotId allocate_slot_id (
+    // be/be_visitor_operation/operation_ch.cpp:46
+
+    virtual ::PortableInterceptor::SlotId allocate_slot_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // be/be_visitor_operation/operation_ch.cpp:46
+
     virtual void register_policy_factory (
         ::CORBA::PolicyType type,
         ::PortableInterceptor::PolicyFactory_ptr policy_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
+    // be/be_visitor_interface/interface_ch.cpp:210
+
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
   protected:
     // Abstract or local interface only.
     ORBInitInfo (void);
-    
+
     virtual ~ORBInitInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ORBInitInfo (const ORBInitInfo &);
-    
+
     void operator= (const ORBInitInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be/be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo;
 
+  // TAO_IDL - Generated from
+  // be/be_interface.cpp:646
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1__VAR_OUT_CH_
+
+  class ORBInitInfo_3_1;
+  typedef ORBInitInfo_3_1 *ORBInitInfo_3_1_ptr;
+
+  typedef
+    TAO_Objref_Var_T<
+        ORBInitInfo_3_1
+      >
+    ORBInitInfo_3_1_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ORBInitInfo_3_1
+      >
+    ORBInitInfo_3_1_out;
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1_CH_
+
+  class TAO_PI_Export ORBInitInfo_3_1
+    : public virtual ::PortableInterceptor::ORBInitInfo
+  {
+  public:
+    typedef ORBInitInfo_3_1_ptr _ptr_type;
+    typedef ORBInitInfo_3_1_var _var_type;
+
+    // The static operations.
+    static ORBInitInfo_3_1_ptr _duplicate (ORBInitInfo_3_1_ptr obj);
+
+    static void _tao_release (ORBInitInfo_3_1_ptr obj);
+
+    static ORBInitInfo_3_1_ptr _narrow (
+        ::CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static ORBInitInfo_3_1_ptr _unchecked_narrow (
+        ::CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static ORBInitInfo_3_1_ptr _nil (void)
+    {
+      return static_cast<ORBInitInfo_3_1_ptr> (0);
+    }
+
+
+
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+
+    virtual void add_client_request_interceptor_with_policy (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
+        const ::CORBA::PolicyList & policies
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName,
+        ::CORBA::PolicyError
+      )) = 0;
+
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+
+    virtual void add_server_request_interceptor_with_policy (
+        ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+        const ::CORBA::PolicyList & policies
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName,
+        ::CORBA::PolicyError
+      )) = 0;
+
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+
+    virtual void add_ior_interceptor_with_policy (
+        ::PortableInterceptor::IORInterceptor_ptr interceptor,
+        const ::CORBA::PolicyList & policies
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName,
+        ::CORBA::PolicyError
+      )) = 0;
+
+    // TAO_IDL - Generated from
+    // be/be_visitor_interface/interface_ch.cpp:210
+
+    virtual ::CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    virtual const char* _interface_repository_id (void) const;
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
+  protected:
+    // Abstract or local interface only.
+    ORBInitInfo_3_1 (void);
+
+    virtual ~ORBInitInfo_3_1 (void);
+
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ORBInitInfo_3_1 (const ORBInitInfo_3_1 &);
+
+    void operator= (const ORBInitInfo_3_1 &);
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo_3_1;
+
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
+// be/be_visitor_traits.cpp:62
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
   {
@@ -511,17 +637,17 @@ namespace TAO
         ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::ClientRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
@@ -532,17 +658,17 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
   {
@@ -553,17 +679,17 @@ namespace TAO
         ::PortableInterceptor::IORInterceptor_ptr
       );
     static ::PortableInterceptor::IORInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::IORInterceptor_ptr p,
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::IORInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
   {
@@ -574,17 +700,17 @@ namespace TAO
         ::PortableInterceptor::PolicyFactory_ptr
       );
     static ::PortableInterceptor::PolicyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::PolicyFactory_ptr p,
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
   {
@@ -595,48 +721,40 @@ namespace TAO
         ::PortableInterceptor::ORBInitInfo_ptr
       );
     static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ORBInitInfo_ptr p,
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
 
-TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+  template<>
+  struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo_3_1>
+  {
+    static ::PortableInterceptor::ORBInitInfo_3_1_ptr duplicate (
+        ::PortableInterceptor::ORBInitInfo_3_1_ptr
+      );
+    static void release (
+        ::PortableInterceptor::ORBInitInfo_3_1_ptr
+      );
+    static ::PortableInterceptor::ORBInitInfo_3_1_ptr nil (void);
+    static ::CORBA::Boolean marshal (
+        const ::PortableInterceptor::ORBInitInfo_3_1_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 
-TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
+#endif /* end #if !defined */
+}
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be/be_codegen.cpp:1101
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp
index 8c9660f49c3..14a39962574 100644
--- a/TAO/tao/PI/ORBInitializerA.cpp
+++ b/TAO/tao/PI/ORBInitializerA.cpp
@@ -25,15 +25,17 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#include "tao/PI/ORBInitializerA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
-#include "ORBInitializerC.h"
-#include "tao/CDR.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -41,89 +43,14 @@
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ORBInitializer (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
     "ORBInitializer");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
     &_tao_tc_PortableInterceptor_ORBInitializer;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
-    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitializer::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitializer,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitializer::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitializer,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp
index 5703c44af1b..bd719da92ee 100644
--- a/TAO/tao/PI/ORBInitializerC.cpp
+++ b/TAO/tao/PI/ORBInitializerC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "ORBInitializerC.h"
+#include "tao/PI/ORBInitializerC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ORBInitializer_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void)
   return PortableInterceptor::ORBInitializer::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
     PortableInterceptor::ORBInitializer_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
@@ -88,17 +86,9 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-void 
-PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitializer *_tao_tmp_pointer =
-    static_cast<ORBInitializer *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -109,7 +99,7 @@ PortableInterceptor::ORBInitializer::_narrow (
 
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -121,21 +111,21 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ORBInitializer::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -169,8 +159,10 @@ const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ORBInitializerC.h b/TAO/tao/PI/ORBInitializerC.h
index dcea0ec082f..95080c13aca 100644
--- a/TAO/tao/PI/ORBInitializerC.h
+++ b/TAO/tao/PI/ORBInitializerC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ORBINITIALIZERC_H_
-#define _TAO_IDL_ORIG_ORBINITIALIZERC_H_
+#ifndef _TAO_IDL_ORBINITIALIZERC_H_
+#define _TAO_IDL_ORBINITIALIZERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,23 +52,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
@@ -91,7 +84,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
@@ -120,7 +113,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
   
   class TAO_PI_Export ORBInitializer
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef ORBInitializer_ptr _ptr_type;
@@ -132,12 +125,12 @@ namespace PortableInterceptor
     static void _tao_release (ORBInitializer_ptr obj);
     
     static ORBInitializer_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     static ORBInitializer_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -146,7 +139,7 @@ namespace PortableInterceptor
       return static_cast<ORBInitializer_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -156,7 +149,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -167,19 +160,19 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
   protected:
     // Abstract or local interface only.
@@ -195,14 +188,9 @@ namespace PortableInterceptor
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -213,8 +201,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
@@ -226,7 +214,7 @@ namespace TAO
         ::PortableInterceptor::ORBInitInfo_ptr
       );
     static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -234,8 +222,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
@@ -247,7 +235,7 @@ namespace TAO
         ::PortableInterceptor::ORBInitializer_ptr
       );
     static ::PortableInterceptor::ORBInitializer_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ORBInitializer_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -257,22 +245,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 55efc3a28a9..919abb2706e 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,6 +1,6 @@
-#include "ORBInitializer_Registry_Impl.h"
-#include "ORBInitInfo.h"
-#include "PICurrent.h"
+#include "tao/PI/ORBInitializer_Registry_Impl.h"
+#include "tao/PI/ORBInitInfo.h"
+#include "tao/PI/PICurrent.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
@@ -14,6 +14,9 @@ ACE_RCSID (PI,
            ORBInitializer_Registry,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
   : lock_ (),
     initializers_ ()
@@ -158,6 +161,15 @@ TAO::ORBInitializer_Registry::post_init (
 
 #if TAO_HAS_INTERCEPTORS == 1
       CORBA::Object_ptr picurrent_ptr = orb_core->pi_current ();
+      PortableInterceptor::SlotId slot_count = orb_init_info_->slot_count ();
+
+      if (CORBA::is_nil (picurrent_ptr) && slot_count != 0)
+        {
+          // Force instantiation of the PICurrent object. If we do not do it
+          // now, the slot count will be lost.
+          CORBA::Object_var tmp = orb_core->resolve_picurrent ();
+          picurrent_ptr = orb_core->pi_current ();
+        }
 
       if (!CORBA::is_nil (picurrent_ptr))
         {
@@ -165,7 +177,7 @@ TAO::ORBInitializer_Registry::post_init (
 
           if (pi)
             {
-              pi->initialize (orb_init_info_->slot_count () ACE_ENV_ARG_PARAMETER);
+              pi->initialize (slot_count ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -178,6 +190,8 @@ TAO::ORBInitializer_Registry::post_init (
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry,
                        ACE_TEXT ("ORBInitializer_Registry"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 66464bf77d8..edb5a2bfc26 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PI.h"
+#include "tao/PI/PI.h"
 
 #include "tao/CORBA_methods.h"
 #include "tao/Objref_VarOut_T.h"
@@ -31,6 +31,8 @@
 #include "ace/Service_Config.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -39,7 +41,7 @@ namespace TAO
    * @brief Global list that contains all portable interceptor ORB
    *        initializers.
    */
-  class TAO_PI_Export ORBInitializer_Registry
+  class ORBInitializer_Registry
     : public ORBInitializer_Registry_Adapter
   {
     public:
@@ -87,6 +89,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (ORBInitializer_Registry)
 ACE_FACTORY_DECLARE (TAO_PI, ORBInitializer_Registry)
 
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 3088ad074b6..3e18928cf8c 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -1,13 +1,18 @@
-#include "PI.h"
-#include "ORBInitializer_Registry_Impl.h"
-#include "PolicyFactory_Loader.h"
-#include "ClientRequestInterceptor_Factory_Impl.h"
-#include "PICurrent_Loader.h"
+#include "tao/PI/PI.h"
+#include "tao/PI/ORBInitializer_Registry_Impl.h"
+#include "tao/PI/PolicyFactory_Loader.h"
+#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h"
+#include "tao/PI/PICurrent_Loader.h"
+#include "tao/PI/PI_ORBInitializer.h"
+#include "tao/ORBInitializer_Registry.h"
+#include "tao/ORB_Constants.h"
 
 ACE_RCSID (PI,
            PI,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_PI_Init::Initializer (void)
 {
@@ -17,6 +22,46 @@ TAO_PI_Init::Initializer (void)
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_PICurrent_Loader);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-  return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry);
+  int status = ACE_Service_Config::process_directive (
+                            ace_svc_desc_ORBInitializer_Registry);
+#if TAO_HAS_INTERCEPTORS == 1
+  PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
+    PortableInterceptor::ORBInitializer::_nil ();
+
+  PortableInterceptor::ORBInitializer_var orb_initializer;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      /// Register the PI ORBInitializer.
+
+      ACE_NEW_THROW_EX (temp_orb_initializer,
+                        TAO_PI_ORBInitializer,
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO::VMCID,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
+      ACE_TRY_CHECK;
+
+      orb_initializer = temp_orb_initializer;
+
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "(%P | %t) Caught exception:");
+        }
+      return -1;
+    }
+  ACE_ENDTRY;
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  return status;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index d1849e3c781..da45315f182 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PI_Init
  *
@@ -37,16 +41,18 @@ static int
 TAO_Requires_PI_Initializer =
   TAO_PI_Init::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #define TAO_PI_SAFE_INCLUDE
-#include "ORBInitInfoC.h"
-#include "PolicyFactoryC.h"
-#include "ORBInitializerC.h"
-#include "InterceptorC.h"
-#include "ClientRequestInfoC.h"
-#include "ClientRequestInterceptorC.h"
-#include "PICurrentC.h"
+#include "tao/PI/ORBInitInfoC.h"
+#include "tao/PI/PolicyFactoryC.h"
+#include "tao/PI/ORBInitializerC.h"
+#include "tao/PI/InterceptorC.h"
+#include "tao/PI/ClientRequestInfoC.h"
+#include "tao/PI/ClientRequestInterceptorC.h"
+#include "tao/PI/PICurrentC.h"
 #undef TAO_PI_SAFE_INCLUDE
 
 #endif  /* TAO_PI_H */
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index dc3bf53884a..1212598ae47 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -1,4 +1,4 @@
-#include "PICurrent.h"
+#include "tao/PI/PICurrent.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,16 +8,17 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "PICurrent.inl"
+# include "tao/PI/PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Impl.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
@@ -120,5 +121,6 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 3c52b628bae..1425f5eec74 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "PICurrentC.h"
+#include "tao/PI/PICurrentC.h"
 
 #include "tao/LocalObject.h"
 #include "ace/Array_Base.h"
@@ -35,6 +35,8 @@
 # pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -134,8 +136,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "PICurrent.inl"
+# include "tao/PI/PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index 7fd7fc77b1b..aca42f2786c 100644
--- a/TAO/tao/PI/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableInterceptor::SlotId
 TAO::PICurrent::slot_count (void) const
@@ -9,3 +10,4 @@ TAO::PICurrent::slot_count (void) const
   return this->slot_count_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl
index f60324effc1..0ce4b8a7014 100644
--- a/TAO/tao/PI/PICurrent.pidl
+++ b/TAO/tao/PI/PICurrent.pidl
@@ -20,9 +20,9 @@
 #ifndef _PI_CURRENT_IDL_
 #define _PI_CURRENT_IDL_
 
-#include <InvalidSlot.pidl>
-#include <PI_Forward.pidl>
-#include <Current.pidl>
+#include "tao/PI/InvalidSlot.pidl"
+#include "tao/PI_Forward.pidl"
+#include "tao/Current.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp
index 27411a28fcb..bd234b398fd 100644
--- a/TAO/tao/PI/PICurrentA.cpp
+++ b/TAO/tao/PI/PICurrentA.cpp
@@ -32,9 +32,11 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "PICurrentA.h"
+#include "tao/PI/PICurrentA.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -127,3 +129,5 @@ operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrentA.h b/TAO/tao/PI/PICurrentA.h
index 092901e4ad4..f9096ff2667 100644
--- a/TAO/tao/PI/PICurrentA.h
+++ b/TAO/tao/PI/PICurrentA.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 #include "tao/PI/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -60,6 +60,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   // TAO_IDL - Generated from
@@ -82,6 +84,8 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercepto
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp
index 197b87f3c07..b96a906c176 100644
--- a/TAO/tao/PI/PICurrentC.cpp
+++ b/TAO/tao/PI/PICurrentC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "PICurrentC.h"
+#include "tao/PI/PICurrentC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +66,7 @@ TAO::Objref_Traits<PortableInterceptor::Current>::release (
     PortableInterceptor::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::Current_ptr
@@ -88,12 +90,12 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-void 
+void
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
     static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 PortableInterceptor::Current_ptr
@@ -121,18 +123,18 @@ PortableInterceptor::Current::_unchecked_narrow (
 PortableInterceptor::Current_ptr
 PortableInterceptor::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -178,3 +180,5 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrentC.h b/TAO/tao/PI/PICurrentC.h
index 242cd2d0ca5..92e2360bbbb 100644
--- a/TAO/tao/PI/PICurrentC.h
+++ b/TAO/tao/PI/PICurrentC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -68,6 +68,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
 
@@ -217,6 +219,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
index 7ad09ada95b..9332b9c986a 100644
--- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
@@ -1,14 +1,16 @@
-#include "PICurrent_Copy_Callback.h"
+#include "tao/PI/PICurrent_Copy_Callback.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Impl.h"
 
 ACE_RCSID (tao,
            PICurrent_Copy_Callback,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PICurrent_Copy_Callback::PICurrent_Copy_Callback (void)
   : src_ (0),
     dst_ (0)
@@ -24,28 +26,32 @@ TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void)
     this->src_->copy_callback (0);
 }
 
-int
+void
 TAO::PICurrent_Copy_Callback::execute (void)
 {
   if (this->src_ != 0 && this->dst_ != 0
       && this->src_ != this->dst_)
     {
-      const PICurrent_Impl::Table & s = this->src_->current_slot_table ();
+      // Only do a copy when the destination still refers to the table
+      // of the src
+      if (this->dst_->lc_slot_table () != 0)
+        {
+          const PICurrent_Impl::Table & s = this->src_->current_slot_table ();
 
-      // Disable use of the logically copied slot table before
-      // performing the deep copy.
-      this->dst_->lc_slot_table (0);
+          // Disable use of the logically copied slot table before
+          // performing the deep copy.
+          this->dst_->lc_slot_table (0);
 
-      PICurrent_Impl::Table & d = this->dst_->slot_table ();
+          PICurrent_Impl::Table & d = this->dst_->slot_table ();
 
-      d = s;
+          d = s;
+        }
 
       // Prevent subsequent deep copies, effectively disabling this
       // callback.
       this->src_->copy_callback (0);
+      this->src_->destruction_callback (0);
     }
-
-  return 0;
 }
 
 void
@@ -56,4 +62,6 @@ TAO::PICurrent_Copy_Callback::src_and_dst (PICurrent_Impl * src,
   this->dst_ = dst;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h
index 5b5f17d4505..76f550e652f 100644
--- a/TAO/tao/PI/PICurrent_Copy_Callback.h
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,9 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class PICurrent_Impl;
@@ -49,12 +52,15 @@ namespace TAO
     ~PICurrent_Copy_Callback (void);
 
     /// Perform the copy.
-    int execute (void);
+    void execute (void);
 
     /// Set the source and destination PICurrent_Impl objects.
     void src_and_dst (PICurrent_Impl * src, PICurrent_Impl * dst);
 
   private:
+    /// Disallow copying and assignment.
+    PICurrent_Copy_Callback (const PICurrent_Copy_Callback &);
+    PICurrent_Copy_Callback &operator= (const PICurrent_Copy_Callback &);
 
     /// Source PICurrent from which copies will be made.
     PICurrent_Impl * src_;
@@ -65,6 +71,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index ecbccc90274..4aa071e258c 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -1,4 +1,4 @@
-#include "PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,14 +8,17 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "PICurrent_Impl.inl"
+# include "tao/PI/PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "PICurrent_Copy_Callback.h"
+#include "tao/PI/PICurrent_Copy_Callback.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
+#include "tao/debug.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PICurrent_Impl::PICurrent_Impl (void)
   : slot_table_ (),
@@ -44,9 +47,16 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
   // No need to check validity of SlotId.  It is validated before this
   // method is invoked.
 
+  // Get the slot table that is currently active
   PICurrent_Impl::Table & table = this->current_slot_table ();
 
-  ACE_ASSERT (this->lc_slot_table_ != &this->slot_table_);
+  // The active slot table should never be a lazy copy of itself!
+  if (this->lc_slot_table_ == &this->slot_table_)
+  {
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l")));
+    ACE_THROW (CORBA::INTERNAL ());
+  }
 
   CORBA::Any * any = 0;
 
@@ -90,10 +100,20 @@ TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
   // method is invoked.
 
   // Perform deep copy of the logically copied slot table, if
-  // necessary, before modifying our own slot table.
-  if (this->copy_callback_ != 0
-      && this->copy_callback_->execute () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
+  // necessary, before modifying our own slot table. This is a setup
+  // where another PICurrent refers to our slot table, so we force the
+  // the other PICurrent does copy our table before making changes to
+  // our table.
+  if (this->copy_callback_ != 0)
+    this->copy_callback_->execute ();
+
+  // If we have a logical copied slot table we refer to, just make a
+  // copy of that table first before making changes to our table.
+  if (this->lc_slot_table_ != 0)
+    {
+      this->slot_table_ = *this->lc_slot_table_;
+      this->lc_slot_table_ = 0;
+    }
 
   // If the slot table array isn't large enough, then increase its
   // size.  We're guaranteed not to exceed the number of allocated
@@ -109,7 +129,15 @@ void
 TAO::PICurrent_Impl::execute_destruction_callback (
   TAO::PICurrent_Impl::Table * old_lc_slot_table)
 {
+  // we are being asked to lc another table, if this
+  // is null, make sure we take a physical copy of the
+  // existing table we had lc before it disappears.
+  if ((0 == old_lc_slot_table) && (0 != this->lc_slot_table_))
+    this->slot_table_ = *this->lc_slot_table_;
+
   this->lc_slot_table_ = old_lc_slot_table;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index d374f174e4b..b7d624a4c9b 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,11 +25,13 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "PICurrentC.h"
+#include "tao/PI/PICurrentC.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Array_Base.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -83,6 +85,7 @@ namespace TAO
     /// notified of this object's destruction.
     void destruction_callback (PICurrent_Impl *p);
 
+    /// Execute the destruction callback object
     void execute_destruction_callback (Table *old_lc_slot_table);
 
     /// Return a reference to the underlying slot table.
@@ -97,7 +100,8 @@ namespace TAO
     Table & current_slot_table (void);
 
     /// Logically (shallow) copy the given slot table.
-    void lc_slot_table (PICurrent_Impl *p);
+    // returns true if copied, false if it would be self-referencing.
+    bool lc_slot_table (PICurrent_Impl *p);
 
     /// Return pointer to the logically copied slot table.
     /**
@@ -109,7 +113,7 @@ namespace TAO
   private:
 
     /// Prevent copying through the copy constructor and the assignment
-    //operator.
+    /// operator.
     //@{
     PICurrent_Impl (const PICurrent_Impl &);
     void operator= (const PICurrent_Impl &);
@@ -125,18 +129,25 @@ namespace TAO
     Table *lc_slot_table_;
 
     /// Callback object responsible for performing deep copies of a
-    /// PICurrent's slot table.
+    /// PICurrent's slot table. This is the PICurrent that has our slot_table_
+    /// referred as lc_slot_table_. This copy is there to make sure that when
+    /// we want to modify our table, that we can first copy our table to
+    /// the PICurrent that refers to our table so that it has an unique copy
+    /// of the data.
     PICurrent_Copy_Callback *copy_callback_;
 
     /// PICurrent_Impl object that will be notified of this object's
-    /// destruction.
+    /// destruction. This is the PICurrent that has our slot_table_ as
+    /// lc_slot_table_.
     PICurrent_Impl *destruction_callback_;
 
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "PICurrent_Impl.inl"
+# include "tao/PI/PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl
index 8b708ec7f5a..78c5e33cac6 100644
--- a/TAO/tao/PI/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb)
 {
@@ -27,25 +29,36 @@ TAO::PICurrent_Impl::current_slot_table (void)
     this->lc_slot_table_ == 0 ? this->slot_table_ : *this->lc_slot_table_;
 }
 
-ACE_INLINE void
+ACE_INLINE bool
 TAO::PICurrent_Impl::lc_slot_table (TAO::PICurrent_Impl *p)
 {
+  // Being told to lazy copy some other table?
   if (p != 0)
     {
+      // Which actual table are we supposed to lazy copy?
       Table * t = &p->current_slot_table ();
 
+      // Only if we have not already lazy copied this table
       if (t != this->lc_slot_table_)
         {
-          this->lc_slot_table_ = t;
+          // Whould this be a lazy copy of ourselves?
+          if (t == &this->slot_table_)
+            this->lc_slot_table_ = 0; // Already ourself!
+          else
+            {
+              this->lc_slot_table_ = t;
 
-          if (this != p)
-            p->destruction_callback (this);
+              // Ensure remote table will tell us if it is
+              // going to change or destroy itself.
+              if (this != p)
+                p->destruction_callback (this);
+            }
         }
-      else
-        this->lc_slot_table_ = 0;
     }
   else
     this->lc_slot_table_ = 0;
+
+  return (0 != this->lc_slot_table_);
 }
 
 ACE_INLINE TAO::PICurrent_Impl::Table *
@@ -53,3 +66,5 @@ TAO::PICurrent_Impl::lc_slot_table (void) const
 {
   return this->lc_slot_table_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 1423cd7c663..639ad627d58 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -11,11 +11,11 @@
  */
 // =================================================================
 
-#include "PICurrent_Loader.h"
+#include "tao/PI/PICurrent_Loader.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "PICurrent.h"
+#include "tao/PI/PICurrent.h"
 
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
@@ -25,6 +25,8 @@ ACE_RCSID (PI,
            PICurrent_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Object_ptr
 TAO_PICurrent_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -40,6 +42,8 @@ TAO_PICurrent_Loader::create_object (
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader,
                        ACE_TEXT ("PICurrent_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index 931d2216082..a1b4e48cfa9 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +31,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PI_Export TAO_PICurrent_Loader
   : public TAO_Object_Loader
 {
@@ -43,6 +45,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader)
 ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader)
 
diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp
index b2eab47619a..4553d880091 100644
--- a/TAO/tao/PI/PIForwardRequestA.cpp
+++ b/TAO/tao/PI/PIForwardRequestA.cpp
@@ -25,37 +25,43 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#include "tao/PI/PIForwardRequestA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
-#include "PIForwardRequestC.h"
-#include "tao/CDR.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+// TAO extension - the virtual _type method.
+::CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const
+{
+  return ::PortableInterceptor::_tc_ForwardRequest;
+}
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
   {
     { "forward", &CORBA::_tc_Object }
-
+    
   };
 static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ForwardRequest (
-    CORBA::tk_except,
+    ::CORBA::tk_except,
     "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
     "ForwardRequest",
     _tao_fields_PortableInterceptor_ForwardRequest,
     1);
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
@@ -64,24 +70,24 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
   template<>
-  CORBA::Boolean
+  ::CORBA::Boolean
   Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
       TAO_InputCDR & cdr
     )
   {
-    CORBA::String_var id;
-
+    ::CORBA::String_var id;
+    
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-
+    
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -92,14 +98,14 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-
+    
     return true;
   }
 }
 
 // Copying insertion.
 void operator<<= (
-    CORBA::Any &_tao_any,
+    ::CORBA::Any &_tao_any,
     const PortableInterceptor::ForwardRequest &_tao_elem
   )
 {
@@ -113,7 +119,7 @@ void operator<<= (
 
 // Non-copying insertion.
 void operator<<= (
-    CORBA::Any &_tao_any,
+    ::CORBA::Any &_tao_any,
     PortableInterceptor::ForwardRequest *_tao_elem
   )
 {
@@ -126,8 +132,8 @@ void operator<<= (
 }
 
 // Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
     PortableInterceptor::ForwardRequest *&_tao_elem
   )
 {
@@ -138,8 +144,8 @@ CORBA::Boolean operator>>= (
 }
 
 // Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
     const PortableInterceptor::ForwardRequest *&_tao_elem
   )
 {
@@ -151,3 +157,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp
index 7ecc261b227..5431e9d88b3 100644
--- a/TAO/tao/PI/PIForwardRequestC.cpp
+++ b/TAO/tao/PI/PIForwardRequestC.cpp
@@ -26,32 +26,30 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "PIForwardRequestC.h"
+#include "tao/PI/PIForwardRequestC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
@@ -63,7 +61,7 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 }
 
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -74,7 +72,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
 PortableInterceptor::ForwardRequest&
 PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
   return *this;
 }
@@ -87,28 +85,28 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p
 }
 
 PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
+PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<ForwardRequest *> (_tao_excp);
 }
 
 const PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
+PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const ForwardRequest *> (_tao_excp);
 }
 
-CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
+::CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 PortableInterceptor::ForwardRequest::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::PortableInterceptor::ForwardRequest (*this),
@@ -131,8 +129,8 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
-  ACE_THROW (CORBA::MARSHAL ());
+
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ForwardRequest::_tao_decode (
@@ -144,8 +142,8 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
-  ACE_THROW (CORBA::MARSHAL ());
+
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 
@@ -154,9 +152,9 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
 // be\be_visitor_exception/exception_ctor.cpp:66
 
 PortableInterceptor::ForwardRequest::ForwardRequest (
-    const CORBA::Object_ptr  _tao_forward
+    const ::CORBA::Object_ptr  _tao_forward
   )
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
@@ -164,16 +162,12 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
   this->forward = CORBA::Object::_duplicate (_tao_forward);
 }
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const
-{
-  return ::PortableInterceptor::_tc_ForwardRequest;
-}
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableInterceptor::ForwardRequest &_tao_aggregate
   )
@@ -192,7 +186,7 @@ CORBA::Boolean operator<< (
     }
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     PortableInterceptor::ForwardRequest &_tao_aggregate
   )
@@ -202,3 +196,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.forward.out ())
   );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PIForwardRequestC.h b/TAO/tao/PI/PIForwardRequestC.h
index f26359f8365..73de9b859a6 100644
--- a/TAO/tao/PI/PIForwardRequestC.h
+++ b/TAO/tao/PI/PIForwardRequestC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
+#ifndef _TAO_IDL_PIFORWARDREQUESTC_H_
+#define _TAO_IDL_PIFORWARDREQUESTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -50,17 +50,10 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
@@ -71,11 +64,11 @@ namespace PortableInterceptor
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
   
-  class TAO_PI_Export ForwardRequest : public CORBA::UserException
+  class TAO_PI_Export ForwardRequest : public ::CORBA::UserException
   {
   public:
     
-    CORBA::Object_var forward;
+    ::CORBA::Object_var forward;
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
@@ -84,12 +77,12 @@ namespace PortableInterceptor
     
     static void _tao_any_destructor (void *);
     
-    static ForwardRequest *_downcast (CORBA::Exception *);
-    static const ForwardRequest *_downcast (CORBA::Exception const *);
+    static ForwardRequest *_downcast ( ::CORBA::Exception *);
+    static const ForwardRequest *_downcast ( ::CORBA::Exception const *);
     
-    static CORBA::Exception *_alloc (void);
+    static ::CORBA::Exception *_alloc (void);
     
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
 
@@ -107,24 +100,16 @@ namespace PortableInterceptor
     // be\be_visitor_exception/exception_ctor.cpp:66
     
     ForwardRequest (
-        const CORBA::Object_ptr  _tao_forward
+        const ::CORBA::Object_ptr  _tao_forward
       );
     
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -137,29 +122,15 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
-TAO_PI_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
-TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
+TAO_PI_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
+TAO_PI_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl
index 57a5366b279..f2ee6020c5a 100644
--- a/TAO/tao/PI/PolicyFactory.pidl
+++ b/TAO/tao/PI/PolicyFactory.pidl
@@ -20,7 +20,7 @@
 #ifndef _POLICYFACTORY_PIDL_
 #define _POLICYFACTORY_PIDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp
index eba4bd3ab6a..ba611cec358 100644
--- a/TAO/tao/PI/PolicyFactoryA.cpp
+++ b/TAO/tao/PI/PolicyFactoryA.cpp
@@ -25,104 +25,32 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PolicyFactoryC.h"
+#include "tao/PI/PolicyFactoryA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_PolicyFactory (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
     "PolicyFactory");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
     &_tao_tc_PortableInterceptor_PolicyFactory;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr _tao_elem
-  )
-{
-  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
-    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
-      _tao_any,
-      PortableInterceptor::PolicyFactory::_tao_any_destructor,
-      PortableInterceptor::_tc_PolicyFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
-        _tao_any,
-        PortableInterceptor::PolicyFactory::_tao_any_destructor,
-        PortableInterceptor::_tc_PolicyFactory,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 9e58888ac22..9c4ed43e4af 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -26,19 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "PolicyFactoryC.h"
+#include "tao/PI/PolicyFactoryC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Arg traits specializations.
 namespace TAO
@@ -47,7 +45,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::PolicyFactory.
 
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::PolicyFactory_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
   return PortableInterceptor::PolicyFactory::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
     PortableInterceptor::PolicyFactory_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
@@ -88,66 +86,46 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-void 
-PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyFactory *_tao_tmp_pointer =
-    static_cast<PolicyFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-  
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-  
-  return PolicyFactory::_duplicate (proxy);
+  return PolicyFactory::_duplicate (
+      dynamic_cast<PolicyFactory_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-  
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-  
-  return PolicyFactory::_duplicate (proxy);
+  return PolicyFactory::_duplicate (
+      dynamic_cast<PolicyFactory_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::PolicyFactory::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -181,7 +159,7 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 {
   return false;
@@ -198,3 +176,5 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                     CORBA::Policy::_nil ());
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index aeccc94cc27..9737af6be89 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_
-#define _TAO_IDL_ORIG_POLICYFACTORYC_H_
+#ifndef _TAO_IDL_POLICYFACTORYC_H_
+#define _TAO_IDL_POLICYFACTORYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,13 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/pi_export.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/TypeCode.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"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PolicyC.h"
@@ -57,23 +57,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
@@ -96,13 +89,13 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
 
   class TAO_PI_Export PolicyFactory
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef PolicyFactory_ptr _ptr_type;
@@ -114,12 +107,12 @@ namespace PortableInterceptor
     static void _tao_release (PolicyFactory_ptr obj);
 
     static PolicyFactory_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static PolicyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
@@ -128,10 +121,10 @@ namespace PortableInterceptor
       return static_cast<PolicyFactory_ptr> (0);
     }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
@@ -139,7 +132,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::CORBA::PolicyError
       )) = 0;
 
@@ -154,15 +147,15 @@ namespace PortableInterceptor
       ));
 
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    // be\be_visitor_interface/interface_ch.cpp:210
 
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
   protected:
     // Abstract or local interface only.
@@ -179,13 +172,8 @@ namespace PortableInterceptor
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -196,8 +184,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_
 
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
@@ -209,7 +197,7 @@ namespace TAO
         ::PortableInterceptor::PolicyFactory_ptr
       );
     static ::PortableInterceptor::PolicyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -219,22 +207,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index bea75ef3a0f..3b8e49f062c 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -11,8 +11,8 @@
  */
 // =================================================================
 
-#include "PolicyFactory_Loader.h"
-#include "PolicyFactory_Registry.h"
+#include "tao/PI/PolicyFactory_Loader.h"
+#include "tao/PI/PolicyFactory_Registry.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -21,6 +21,8 @@ ACE_RCSID (PI,
            PolicyFactory_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PolicyFactory_Registry_Adapter*
 TAO_PolicyFactory_Loader::create (void)
 {
@@ -37,6 +39,8 @@ TAO_PolicyFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_PolicyFactory_Loader,
                        ACE_TEXT ("PolicyFactory_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h
index 10b0280f4d9..a25c378676e 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.h
+++ b/TAO/tao/PI/PolicyFactory_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 
 //=============================================================================
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 #include "tao/PolicyFactory_Registry_Factory.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PI_Export TAO_PolicyFactory_Loader
   : public TAO_PolicyFactory_Registry_Factory
 {
@@ -37,12 +39,14 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader)
-
 static int
 TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader)
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_POLICYFACTORY_LOADER_H */
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 7999bbecc3c..f91af3df5da 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -1,5 +1,5 @@
-#include "PolicyFactory_Registry.h"
-#include "PolicyFactoryC.h"
+#include "tao/PI/PolicyFactory_Registry.h"
+#include "tao/PI/PolicyFactoryC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 #include "tao/PolicyC.h"
@@ -11,6 +11,8 @@ ACE_RCSID (PI,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
   : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
@@ -22,7 +24,7 @@ TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
 
   for (TABLE::iterator i = this->factories_.begin (); i != end; ++i)
     {
-      CORBA::release ((*i).int_id_);
+      ::CORBA::release ((*i).int_id_);
     }
 
   this->factories_.close ();
@@ -52,7 +54,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
   if (result != 0)
     {
       // Release the duplicated factory to prevent a memory leak
-      CORBA::release (factory);
+      ::CORBA::release (factory);
 
       if (result == 1)
         {
@@ -117,3 +119,5 @@ TAO_PolicyFactory_Registry::factory_exists (CORBA::PolicyType & type) const
   return (this->factories_.find (type) == 0);
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 05a5747d112..882f386c70c 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -16,17 +16,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.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/PolicyFactory_Registry_Adapter.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "ace/CORBA_macros.h"
-#include "tao/Basic_Types.h"
-#include "tao/PolicyFactory_Registry_Adapter.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PolicyFactory_Registry
@@ -36,7 +38,7 @@
  * ORB-specific registry that contains all portable interceptor
  * policy factories.
  */
-class TAO_PI_Export TAO_PolicyFactory_Registry
+class TAO_PolicyFactory_Registry
   : public TAO::PolicyFactory_Registry_Adapter
 {
 public:
@@ -93,6 +95,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_POLICY_FACTORY_REGISTRY_H */
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index e832e45d2ca..42830e28672 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -22,11 +22,11 @@
 #ifndef _REQUESTINFO_PIDL_
 #define _REQUESTINFO_PIDL_
 
-#include <PI_Forward.pidl>
+#include "tao/PI_Forward.pidl"
 #include "tao/AnyTypeCode/Dynamic.pidl"
-#include <Messaging_SyncScope.pidl>
+#include "tao/Messaging_SyncScope.pidl"
 #include "tao/PI/InvalidSlot.pidl"
-#include <IOP_IOR.pidl>
+#include "tao/IOP_IOR.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp
index 79d1beb30cc..4d0a1ec8626 100644
--- a/TAO/tao/PI/RequestInfoA.cpp
+++ b/TAO/tao/PI/RequestInfoA.cpp
@@ -25,105 +25,33 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RequestInfoC.h"
+#include "tao/PI/RequestInfoA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_RequestInfo (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
     "RequestInfo");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_RequestInfo =
     &_tao_tc_PortableInterceptor_RequestInfo;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::RequestInfo_ptr _tao_objptr =
-    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::RequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_RequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::RequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_RequestInfo,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp
index c6d7e2d7cbd..a3bcb9a2376 100644
--- a/TAO/tao/PI/RequestInfoC.cpp
+++ b/TAO/tao/PI/RequestInfoC.cpp
@@ -26,20 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "RequestInfoC.h"
+#include "tao/PI/RequestInfoC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +62,7 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::RequestInfo_ptr
@@ -73,13 +71,13 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void)
   return PortableInterceptor::RequestInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
     PortableInterceptor::RequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::RequestInfo::RequestInfo (void)
@@ -88,17 +86,9 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-void 
-PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestInfo *_tao_tmp_pointer =
-    static_cast<RequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -109,7 +99,7 @@ PortableInterceptor::RequestInfo::_narrow (
 
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -121,21 +111,21 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::RequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -169,8 +159,10 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h
index 361b95d1be3..7c9b60ae17f 100644
--- a/TAO/tao/PI/RequestInfoC.h
+++ b/TAO/tao/PI/RequestInfoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_REQUESTINFOC_H_
-#define _TAO_IDL_ORIG_REQUESTINFOC_H_
+#ifndef _TAO_IDL_REQUESTINFOC_H_
+#define _TAO_IDL_REQUESTINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,13 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/pi_export.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/TypeCode.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"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI_ForwardC.h"
@@ -61,36 +61,29 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-
+  
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         RequestInfo
       >
     RequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         RequestInfo
@@ -98,219 +91,214 @@ namespace PortableInterceptor
     RequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-
+  
   class TAO_PI_Export RequestInfo
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-
+    
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-
+    
     static void _tao_release (RequestInfo_ptr obj);
-
+    
     static RequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _nil (void)
     {
       return static_cast<RequestInfo_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULong request_id (
+    
+    virtual ::CORBA::ULong request_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * operation (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ParameterList * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ExceptionList * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ContextList * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::RequestContext * operation_context (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * result (
+    
+    virtual ::CORBA::Any * result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean response_expected (
+    
+    virtual ::CORBA::Boolean response_expected (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual Messaging::SyncScope sync_scope (
+    
+    virtual ::Messaging::SyncScope sync_scope (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual PortableInterceptor::ReplyStatus reply_status (
+    
+    virtual ::PortableInterceptor::ReplyStatus reply_status (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr forward_reference (
+    
+    virtual ::CORBA::Object_ptr forward_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * get_slot (
+    
+    virtual ::CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::ServiceContext * get_request_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::ServiceContext * get_reply_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     RequestInfo (void);
-
+    
     virtual ~RequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     RequestInfo (const RequestInfo &);
-
+    
     void operator= (const RequestInfo &);
   };
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -321,9 +309,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-
+#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
   {
@@ -334,7 +322,7 @@ namespace TAO
         ::PortableInterceptor::RequestInfo_ptr
       );
     static ::PortableInterceptor::RequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::RequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -344,22 +332,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
-TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
-TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 191a30e51c4..65d42175dd2 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#include "RequestInfo_Util.h"
+#include "tao/PI/RequestInfo_Util.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -16,6 +16,7 @@ ACE_RCSID (tao,
            RequestInfo_Util,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
 TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
@@ -97,15 +98,16 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (any);
 
   if (tk_void_any)
     {
       any->_tao_set_typecode (CORBA::_tc_void);
     }
 
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
   return any;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index f32b1d8dc2f..4d18f4d2309 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -26,7 +26,9 @@
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "ace/CORBA_macros.h"
-#include "pi_export.h"
+#include "tao/PI/pi_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -80,6 +82,8 @@ public:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index e7428115760..f704658e38c 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -32,8 +32,8 @@
 #ifndef _PI_FORWARD_IDL_
 #define _PI_FORWARD_IDL_
 
-#include <OctetSeq.pidl>
-#include <StringSeq.pidl>
+#include "tao/OctetSeq.pidl"
+#include "tao/StringSeq.pidl"
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index a077461b82b..a182b17775d 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "PI_ForwardC.h"
+#include "tao/PI_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -40,8 +40,12 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 9738014449c..d8672822375 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
 
@@ -135,6 +137,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index 9aff070ca96..23ed31147d2 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -1,4 +1,4 @@
-#include "PICurrent_Guard.h"
+#include "tao/PI_Server/PICurrent_Guard.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -14,6 +14,8 @@ ACE_RCSID (PortableServer,
 #include "tao/PI/PICurrent.h"
 #include "tao/PI/PICurrent_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
                                        bool tsc_to_rsc)
   : src_ (0),
@@ -62,11 +64,9 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
 TAO::PICurrent_Guard::~PICurrent_Guard (void)
 {
   if (this->src_ != 0 && this->dest_ != 0
-      && this->src_ != this->dest_)
+      && this->src_ != this->dest_
+      && this->dest_->lc_slot_table (this->src_))
     {
-      // This copy better be exception-safe!
-      this->dest_->lc_slot_table (this->src_);
-
       // PICurrent will potentially have to call back on the request
       // scope current so that it can deep copy the contents of the
       // thread scope current if the contents of the thread scope
@@ -76,10 +76,12 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void)
       // necessary, if the thread scope current is modified after its
       // contents have been *logically* copied to the request scope
       // current.  The same goes for the reverse, i.e. RSC to TSC.
+
       this->copy_callback_->src_and_dst (this->src_, this->dest_);
       this->src_->copy_callback (this->copy_callback_);
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h
index 6bbda8f3ec4..364ec199d29 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.h
+++ b/TAO/tao/PI_Server/PICurrent_Guard.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI_Server/pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations.
 class TAO_ServerRequest;
 
@@ -46,7 +48,7 @@ namespace TAO
    *
    * @note This Guard class is only used on the server side.
    */
-  class TAO_PI_Server_Export PICurrent_Guard
+  class PICurrent_Guard
   {
   public:
 
@@ -99,6 +101,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp
index 9217b032970..1511cfb1472 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -1,11 +1,14 @@
-#include "PI_Server.h"
-#include "PI_Server_Loader.h"
-#include "ServerRequestInterceptor_Factory_Impl.h"
+#include "tao/PI_Server/PI_Server.h"
+#include "tao/PI_Server/PI_Server_Loader.h"
+#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
 
 ACE_RCSID (PI_Server,
            PI_Server,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_PI_Server_Init::Initializer (void)
 {
@@ -16,3 +19,4 @@ TAO_PI_Server_Init::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PI_Server_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h
index e130e064684..eed7d6cc8eb 100644
--- a/TAO/tao/PI_Server/PI_Server.h
+++ b/TAO/tao/PI_Server/PI_Server.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI_Server/pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PI_Server_Init
  *
@@ -37,9 +41,11 @@ static int
 TAO_Requires_PI_Server_Initializer =
   TAO_PI_Server_Init::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_PI_SERVER_SAFE_INCLUDE
-#include "ServerRequestInterceptorC.h"
-#include "ServerRequestInfoC.h"
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
+#include "tao/PI_Server/ServerRequestInfoC.h"
 #undef TAO_PI_SERVER_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index e3dacc74cfb..abc2da4613c 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -1,8 +1,8 @@
 
 // $Id$
 
-#include "PI_Server_Loader.h"
-#include "PortableServer_ORBInitializer.h"
+#include "tao/PI_Server/PI_Server_Loader.h"
+#include "tao/PI_Server/PortableServer_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -12,6 +12,8 @@ ACE_RCSID (PI_Server,
            PI_Server_Loader,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PI_Server_Loader::TAO_PI_Server_Loader (void)
 {
 }
@@ -27,13 +29,13 @@ TAO_PI_Server_Loader::init (int,
 {
   ACE_TRACE ("TAO_PI_Server_Loader::init");
 
-  static int initialized = 0;
+  static bool initialized = false;
 
   // Only allow initialization once.
   if (initialized)
     return 0;
 
-  initialized = 1;
+  initialized = true;
 
   // Register the ORB initializer.
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -62,14 +64,17 @@ TAO_PI_Server_Loader::init (int,
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P | %t) Caught exception:");
+                           "Caught exception:");
       return -1;
     }
   ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////////////////////////////////////////////
 
 ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_PI_Server_Loader)
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h
index 02228437152..b80753436b9 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.h
+++ b/TAO/tao/PI_Server/PI_Server_Loader.h
@@ -1,15 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
  *  @file    PI_Server_Loader.h
  *
  *  $Id$
- *
- *   Header file for Loading RTScheduler.
- *
- *
- *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
  */
 //=============================================================================
 
@@ -17,15 +12,18 @@
 #define TAO_PI_SERVER_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI_Server/pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object
 {
 public:
@@ -40,6 +38,8 @@ public:
                     ACE_TCHAR* []);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader)
 ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader)
 
diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl
index 0b86cdf7238..ad7b82138bf 100644
--- a/TAO/tao/PI_Server/PI_Server_include.pidl
+++ b/TAO/tao/PI_Server/PI_Server_include.pidl
@@ -10,6 +10,6 @@
 #define _PORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PI_Server/ServerRequestInterceptor.pidl>
+#include "tao/PI_Server/ServerRequestInterceptor.pidl"
 
 #endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h
index 2f941a52b2e..cca4fe783bd 100644
--- a/TAO/tao/PI_Server/PI_Server_includeC.h
+++ b/TAO/tao/PI_Server/PI_Server_includeC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "pi_server_export.h"
+#include "tao/PI_Server/pi_server_export.h"
 
 #include "tao/PI_Server/ServerRequestInterceptorC.h"
 
diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h
index 42a5f422d4f..6b4784fb607 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,11 +21,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    template <class POLICYTYPE, class POLICYVALUE>
+    template <class POLICYTYPE, typename POLICYVALUE>
     void create_policy (
         POLICYTYPE *& policy,
         POLICYVALUE &value,
@@ -44,6 +46,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 8f891627c1b..67a496a2d58 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
-#include "PortableServer_ORBInitializer.h"
-#include "PortableServer_PolicyFactory.h"
+#include "tao/PI_Server/PortableServer_ORBInitializer.h"
+#include "tao/PI_Server/PortableServer_PolicyFactory.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -12,16 +12,21 @@ ACE_RCSID (PI_Server,
            PortableServer_ORBInitializer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
-TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PortableServer_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                              ACE_ENV_ARG_DECL)
+TAO_PortableServer_ORBInitializer::post_init (
+    PortableInterceptor::ORBInitInfo_ptr info
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
@@ -30,8 +35,9 @@ TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_p
 }
 
 void
-TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                                              ACE_ENV_ARG_DECL)
+TAO_PortableServer_ORBInitializer::register_policy_factories (
+  PortableInterceptor::ORBInitInfo_ptr info
+  ACE_ENV_ARG_DECL)
 {
   // Register the PortableServer policy factories.
   PortableInterceptor::PolicyFactory_ptr tmp;
@@ -49,7 +55,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto
   // Bind the same policy factory to all PortableServer related policy
   // types since a single policy factory is used to create each of the
   // different types of PortableServer policies.
-  CORBA::PolicyType type[] = {
+  static CORBA::PolicyType const type[] = {
 #if (TAO_HAS_MINIMUM_POA == 0)
     PortableServer::THREAD_POLICY_ID,
     PortableServer::IMPLICIT_ACTIVATION_POLICY_ID,
@@ -61,10 +67,10 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto
     PortableServer::ID_ASSIGNMENT_POLICY_ID
   };
 
-  const CORBA::PolicyType *end =
+  CORBA::PolicyType const * end =
     type + sizeof (type) / sizeof (type[0]);
 
-  for (CORBA::PolicyType *i = type;
+  for (CORBA::PolicyType const *i = type;
        i != end;
        ++i)
     {
@@ -97,3 +103,5 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto
       ACE_CHECK;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index 903e5adc5f9..8aba0600ea2 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -15,17 +15,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI/PI.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// PortableServer ORB initializer.
-class TAO_PI_Server_Export TAO_PortableServer_ORBInitializer
+class TAO_PortableServer_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -56,6 +58,8 @@ private:
                                   ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLESERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index 9171b7c7e33..484403b2b32 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -1,5 +1,5 @@
 
-#include "PortableServer_PolicyFactory.h"
+#include "tao/PI_Server/PortableServer_PolicyFactory.h"
 
 #include "tao/PortableServer/ThreadPolicy.h"
 #include "tao/PortableServer/LifespanPolicy.h"
@@ -9,12 +9,14 @@
 #include "tao/PortableServer/RequestProcessingPolicy.h"
 #include "tao/PortableServer/ServantRetentionPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "Policy_Creator_T.h"
+#include "tao/PI_Server/Policy_Creator_T.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_PolicyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO_PortableServer_PolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -111,3 +113,5 @@ TAO_PortableServer_PolicyFactory::create_policy (
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index d24a1e001aa..1a0c06ff21a 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -15,17 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI/PI.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all PortableServer related policies.
-class TAO_PI_Server_Export TAO_PortableServer_PolicyFactory
+class TAO_PortableServer_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -37,6 +38,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLESERVER_POLICY_FACTORY_H */
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 114ee17f0cf..4b004d89f7b 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ServerInterceptorAdapter.h"
+#include "tao/PI_Server/ServerInterceptorAdapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,8 +8,8 @@ ACE_RCSID (PortableServer,
            ServerInterceptorAdapter,
            "$Id$")
 
-#include "ServerRequestInfo.h"
-#include "PICurrent_Guard.h"
+#include "tao/PI_Server/ServerRequestInfo.h"
+#include "tao/PI_Server/PICurrent_Guard.h"
 
 #include "tao/ServerRequestInterceptor_Adapter.h"
 #include "tao/TAO_Server_Request.h"
@@ -19,6 +19,8 @@ ACE_RCSID (PortableServer,
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableInterceptor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void)
 {
 }
@@ -40,26 +42,38 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
 
   ACE_TRY
     {
-      // Copy the request scope current (RSC) to the thread scope
-      // current (TSC) upon leaving this scope, i.e. just after the
-      // receive_request_service_contexts() completes.  A "guard" is
-      // used to make the copy also occur if an exception is thrown.
-      TAO::PICurrent_Guard const pi_guard (ri->server_request (),
-                                           false /* Copy RSC to TSC */);
-
       oc = 0;
 
+      bool is_remote_request = !server_request.collocated ();
+      TAO::ServerRequestInfo request_info (server_request,
+                                          args,
+                                          nargs,
+                                          servant_upcall,
+                                          exceptions,
+                                          nexceptions);
+
       for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i)
         {
-          this->interceptors_[i]->tao_ft_interception_point (
-            ri,
-            oc
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (i);
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                tao_ft_interception_point (&request_info,
+                                           oc
+                                           ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
 
           if (oc != 0)
             {
-              (void) this->send_other (ri
+              (void) this->send_other (server_request,
+                                       args,
+                                       nargs,
+                                       servant_upcall,
+                                       exceptions,
+                                       nexceptions
                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
@@ -73,12 +87,16 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
+      server_request.forward_location (exc.forward.in ());
+      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      (void) this->send_other (server_request,
+                               args,
+                               nargs,
+                               servant_upcall,
+                               exceptions,
+                               nexceptions
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -96,7 +114,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
 {
   // This method implements one of the "intermediate" server side
   // interception point.
-  if (this->interceptor_list_.size() != this->server_request.interceptor_count ())
+
+  if (this->interceptor_list_.size() != server_request.interceptor_count ())
     {
       // This method (i.e. the receive_request() interception point)
       // should only be invoked if all of the interceptors registered
@@ -115,25 +134,43 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
       // current (TSC) upon leaving this scope, i.e. just after the
       // receive_request_service_contexts() completes.  A "guard" is
       // used to make the copy also occur if an exception is thrown.
-      TAO::PICurrent_Guard const pi_guard (ri->server_request (),
+      TAO::PICurrent_Guard const pi_guard (server_request,
                                            false /* Copy RSC to TSC */);
 
+      bool is_remote_request = !server_request.collocated ();
+      TAO::ServerRequestInfo request_info (server_request,
+                                           args,
+                                           nargs,
+                                           servant_upcall,
+                                           exceptions,
+                                           nexceptions);
+
       for (size_t i = 0 ; i < server_request.interceptor_count (); ++i)
         {
-          this->interceptors_[i]->receive_request_service_contexts (
-            ri
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (i);
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                receive_request_service_contexts (&request_info
+                                                  ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
+      server_request.forward_location (exc.forward.in ());
+      server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
+      (void) this->send_other (server_request,
+                               args,
+                               nargs,
+                               servant_upcall,
+                               exceptions,
+                               nexceptions
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -154,20 +191,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   CORBA::ULong nexceptions
   ACE_ENV_ARG_DECL)
 {
-
   // This method implements one of the "starting" server side
   // interception point if extended interceptors are not in place.
 
-  TAO::ServerRequestInfo request_info (server_request,
-                                       args,
-                                       nargs,
-                                       servant_upcall,
-                                       exceptions,
-                                       nexceptions);
-
   ACE_TRY
     {
-
       // Copy the request scope current (RSC) to the thread scope
       // current (TSC) upon leaving this scope, i.e. just after the
       // receive_request_service_contexts() completes.  A "guard" is
@@ -175,13 +203,27 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
       TAO::PICurrent_Guard const pi_guard (server_request,
                                            false /* Copy RSC to TSC */);
 
+      bool is_remote_request = !server_request.collocated ();
+
+      TAO::ServerRequestInfo request_info (server_request,
+                                           args,
+                                           nargs,
+                                           servant_upcall,
+                                           exceptions,
+                                           nexceptions);
+
       for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i)
         {
-          this->interceptor_list_.interceptor(i)->
-            receive_request_service_contexts (
-              &request_info
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (i);
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                receive_request_service_contexts (&request_info
+                                                  ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
 
           // The starting interception point completed successfully.
           // Push the interceptor on to the flow stack.
@@ -192,13 +234,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
-      this->send_other (server_request,
-                        args,
-                        nargs,
-                        servant_upcall,
-                        exceptions,
-                        nexceptions
-                        ACE_ENV_ARG_PARAMETER);
+      (void) this->send_other (server_request,
+                               args,
+                               nargs,
+                               servant_upcall,
+                               exceptions,
+                               nexceptions
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -241,17 +283,22 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                                        exceptions,
                                        nexceptions);
 
-  TAO::PICurrent_Guard pi_guard (server_request,
-                                 true  /* Copy TSC to RSC */);
-
   ACE_TRY
     {
+      bool is_remote_request = !server_request.collocated ();
+
       for (size_t i = 0; i < server_request.interceptor_count (); ++i)
         {
-          this->interceptor_list_.interceptor(i)->receive_request (
-            &request_info
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (i);
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                receive_request (&request_info
+                                 ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
 
           // Note that no interceptors are pushed on to or popped off
           // of the flow stack in this interception point since it is
@@ -289,6 +336,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
 
+  bool is_remote_request = !server_request.collocated ();
+
   // Notice that the interceptors are processed in the opposite order
   // they were pushed onto the stack since this is an "ending"
   // interception point.
@@ -310,11 +359,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
       // invoked in another "ending" interception point.
       --server_request.interceptor_count ();
 
-      this->interceptor_list_.interceptor (
-        server_request.interceptor_count ())->send_reply (
-          &request_info
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+        this->interceptor_list_.registered_interceptor (
+          server_request.interceptor_count ());
+
+      if (registered.details_.should_be_processed (is_remote_request))
+        {
+          registered.interceptor_->
+            send_reply (&request_info
+                        ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
     }
 
   // The send_reply() interception point does not raise a
@@ -335,6 +390,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
 
+  bool is_remote_request = !server_request.collocated ();
+
   // Notice that the interceptors are processed in the opposite order
   // they were pushed onto the stack since this is an "ending" server
   // side interception point.
@@ -358,11 +415,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
           // being invoked in another "ending" interception point.
           --server_request.interceptor_count ();
 
-          this->interceptor_list_.interceptor (
-            server_request.interceptor_count ())->send_exception (
-              &request_info
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (
+              server_request.interceptor_count ());
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                send_exception (&request_info
+                                ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -428,6 +491,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
 
+  bool is_remote_request = !server_request.collocated ();
+
   TAO::ServerRequestInfo request_info (server_request,
                                        args,
                                        nargs,
@@ -451,11 +516,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
           // being invoked in another "ending" interception point.
           --server_request.interceptor_count ();
 
-          this->interceptor_list_.interceptor(
-            server_request.interceptor_count ())->send_other (
-              &request_info
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ServerRequestInterceptor_List::RegisteredInterceptor& registered =
+            this->interceptor_list_.registered_interceptor (
+              server_request.interceptor_count ());
+
+          if (registered.details_.should_be_processed (is_remote_request))
+            {
+              registered.interceptor_->
+                send_other (&request_info
+                            ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -475,7 +546,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   ACE_CHECK;
 }
 
-
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
@@ -485,6 +555,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
 }
 
 void
+TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
+  PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+  const CORBA::PolicyList& policies
+  ACE_ENV_ARG_DECL)
+{
+  this->interceptor_list_.add_interceptor (interceptor,
+                                           policies
+                                           ACE_ENV_ARG_PARAMETER);
+}
+
+void
 TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
   ACE_ENV_SINGLE_ARG_DECL)
 {
@@ -497,17 +578,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void)
   TAO::PICurrent_Impl *pi = 0;
   ACE_NEW_RETURN (pi,
                   TAO::PICurrent_Impl,
-                  0);
+                  pi);
   return pi;
 }
 
 TAO::PICurrent_Copy_Callback *
 TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void)
 {
-  TAO::PICurrent_Copy_Callback *pi = 0;
+  TAO::PICurrent_Copy_Callback * pi = 0;
   ACE_NEW_RETURN (pi,
                   TAO::PICurrent_Copy_Callback,
-                  0);
+                  pi);
   return pi;
 }
 
@@ -520,24 +601,25 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback (
-  TAO::PICurrent_Copy_Callback *callback)
+  TAO::PICurrent_Copy_Callback * callback)
 {
   delete callback;
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
-  TAO_ServerRequest &server_request,
-  TAO::Upcall_Command &command
+  TAO_ServerRequest & server_request,
+  TAO::Upcall_Command & command
   ACE_ENV_ARG_DECL)
 {
-  TAO::PICurrent_Guard pi_guard (server_request,
-                                 true  /* Copy TSC to RSC */);
+  TAO::PICurrent_Guard const pi_guard (server_request,
+                                       true  /* Copy TSC to RSC */);
 
   // The actual upcall.
   command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 6fa2e115b6c..b9217c4ac50 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -20,28 +20,37 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ServerRequestInterceptorC.h"
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
 
 #include "tao/PI/Interceptor_List_T.h"
 #include "tao/ServerRequestInterceptor_Adapter.h"
 #include "tao/Basic_Types.h"
+#include "tao/PI_Server/ServerRequestDetails.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor>
+  typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor,
+                            ServerRequestDetails>
     ServerRequestInterceptor_List;
 }
 
+namespace CORBA
+{
+  class PolicyList;
+}
+
 class TAO_ServerRequest;
 
 namespace TAO
@@ -56,8 +65,8 @@ namespace TAO
    * A convenient helper class to invoke registered server request
    * interceptor(s).
    */
-  class TAO_PI_Server_Export ServerRequestInterceptor_Adapter_Impl :
-    public ServerRequestInterceptor_Adapter
+  class ServerRequestInterceptor_Adapter_Impl
+    : public ServerRequestInterceptor_Adapter
   {
   public:
 
@@ -152,6 +161,11 @@ namespace TAO
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL);
 
+    virtual void add_interceptor (
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL);
+
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void);
@@ -178,6 +192,8 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 2b613ec3738..65695dc5317 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ServerRequestInfo.h"
+#include "tao/PI_Server/ServerRequestInfo.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-ACE_RCSID (PortableServer,
+ACE_RCSID (PI_Server,
            ServerRequestInfo,
            "$Id$")
 
@@ -26,9 +26,10 @@ ACE_RCSID (PortableServer,
 #include "ace/OS_NS_string.h"
 
 # if !defined (__ACE_INLINE__)
-#   include "ServerRequestInfo.inl"
+#   include "tao/PI_Server/ServerRequestInfo.inl"
 # endif /* !__ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
 TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -145,8 +146,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong e = 0;
   for (CORBA::TypeCode_ptr const * i = begin; i != end; ++i, ++e)
     {
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (
-        const_cast<CORBA::TypeCode_ptr *> (i), 1);
+      CORBA::TypeCode_ptr tcp_object = *i;
       (*exception_list)[e] = tcp_object;
     }
 
@@ -586,4 +586,6 @@ TAO::ServerRequestInfo::add_reply_service_context (
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 7b79d9eed83..1ba2e9c0026 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -27,19 +27,21 @@
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-#include "pi_server_export.h"
-#include "ServerRequestInfoC.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "tao/PI/PIForwardRequestC.h"
 #include "tao/LocalObject.h"
 #include "tao/OctetSeqC.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/PortableInterceptorC.h"
-#include "tao/PI/PIForwardRequestC.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ServerRequest;
 class TAO_Service_Context;
 
@@ -65,9 +67,9 @@ namespace TAO
    * @note This class is currently not meant to be reference counted
    *       since it is instantiated on the stack.
    */
-  class TAO_PI_Server_Export ServerRequestInfo
-    : public virtual PortableInterceptor::ServerRequestInfo,
-      public virtual CORBA::LocalObject
+  class ServerRequestInfo
+    : public virtual PortableInterceptor::ServerRequestInfo
+    , public virtual CORBA::LocalObject
   {
   public:
 
@@ -298,9 +300,10 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (__ACE_INLINE__)
-#  include "ServerRequestInfo.inl"
+#  include "tao/PI_Server/ServerRequestInfo.inl"
 # endif  /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 3ba06ed412b..09985532ba8 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -5,6 +5,8 @@
 #include "tao/PortableServer/Servant_Upcall.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::ServerRequestInfo::ServerRequestInfo (
   TAO_ServerRequest & server_request,
@@ -54,3 +56,5 @@ TAO::ServerRequestInfo::server_request (void)
   return this->server_request_;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl
index 9670dd42b02..d8a4c52639d 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl
@@ -23,8 +23,8 @@
 #define _SERVER_REQUESTINFO_PIDL_
 
 #include "tao/PI/RequestInfo.pidl"
-#include <orb_types.pidl>
-#include <Policy_Forward.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/Policy_Forward.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
index 1dc8ac2a761..94ad278401d 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
@@ -25,26 +25,29 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServerRequestInfoC.h"
+#include "tao/PI_Server/ServerRequestInfoA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ServerRequestInfo (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
     "ServerRequestInfo");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
@@ -52,78 +55,4 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInfo,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
index eab818b9b7f..3332d35c2a1 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
@@ -26,21 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "ServerRequestInfoC.h"
+#include "tao/PI_Server/ServerRequestInfoC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -74,13 +72,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
   return PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
     PortableInterceptor::ServerRequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
@@ -89,17 +87,9 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-void 
-PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInfo *_tao_tmp_pointer =
-    static_cast<ServerRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -110,7 +100,7 @@ PortableInterceptor::ServerRequestInfo::_narrow (
 
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -122,21 +112,21 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -174,8 +164,10 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
   return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h
index 6cbeedeb0dc..bcefdc89906 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.h
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
+#ifndef _TAO_IDL_SERVERREQUESTINFOC_H_
+#define _TAO_IDL_SERVERREQUESTINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,14 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI_Server/pi_server_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.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"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -60,36 +59,29 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInfo
       >
     ServerRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInfo
@@ -97,192 +89,187 @@ namespace PortableInterceptor
     ServerRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-
+  
   class TAO_PI_Server_Export ServerRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ServerRequestInfo_ptr _ptr_type;
     typedef ServerRequestInfo_var _var_type;
-
+    
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-
+    
     static void _tao_release (ServerRequestInfo_ptr obj);
-
+    
     static ServerRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _nil (void)
     {
       return static_cast<ServerRequestInfo_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * sending_exception (
+    
+    virtual ::CORBA::Any * sending_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * server_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * adapter_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * target_most_derived_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean target_is_a (
+    
+    virtual ::CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     ServerRequestInfo (void);
-
+    
     virtual ~ServerRequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInfo (const ServerRequestInfo &);
-
+    
     void operator= (const ServerRequestInfo &);
   };
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -293,9 +280,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
+  
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -306,7 +293,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInfo_ptr
       );
     static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -316,22 +303,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
-TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index 1235962e161..571b35e9c73 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -28,7 +28,7 @@
 
 #include "tao/PI/Interceptor.pidl"
 #include "tao/PI/PIForwardRequest.pidl"
-#include <OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index 58a08ac8132..8f5dfb63340 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -25,26 +25,29 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServerRequestInterceptorC.h"
+#include "tao/PI_Server/ServerRequestInterceptorA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ServerRequestInterceptor (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
     "ServerRequestInterceptor");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
@@ -52,78 +55,4 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInterceptor,
-        _tao_elem
-      );
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 82e30f3c415..6b2190b9629 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -26,21 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "ServerRequestInterceptorC.h"
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -74,13 +72,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void)
   return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
     PortableInterceptor::ServerRequestInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
@@ -89,17 +87,9 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void 
-PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInterceptor *_tao_tmp_pointer =
-    static_cast<ServerRequestInterceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -110,7 +100,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
 
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -122,21 +112,21 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestInterceptor_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterceptor_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -174,8 +164,10 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
   return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 826741ec9e6..ec784b9d706 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
+#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
+#define _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,7 +41,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI_Server/pi_server_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,23 +56,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -96,7 +88,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -137,12 +129,12 @@ namespace PortableInterceptor
     static void _tao_release (ServerRequestInterceptor_ptr obj);
 
     static ServerRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServerRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
@@ -151,7 +143,7 @@ namespace PortableInterceptor
       return static_cast<ServerRequestInterceptor_ptr> (0);
     }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -164,7 +156,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) {}
 
@@ -178,7 +170,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -190,7 +182,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -202,66 +194,61 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
+
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
   protected:
     // Abstract or local interface only.
     ServerRequestInterceptor (void);
-    
+
     virtual ~ServerRequestInterceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInterceptor (const ServerRequestInterceptor &);
-    
+
     void operator= (const ServerRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -272,9 +259,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -285,7 +272,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInfo_ptr
       );
     static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -293,9 +280,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
@@ -306,7 +293,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -316,22 +303,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
-TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
index f3d26ea86be..37b51488606 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
@@ -11,11 +11,11 @@
  */
 // =================================================================
 
-#include "ServerRequestInterceptor_Factory_Impl.h"
+#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ServerInterceptorAdapter.h"
+#include "tao/PI_Server/ServerInterceptorAdapter.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -24,6 +24,9 @@ ACE_RCSID (PI_Server,
            PolicyFactory_Loader,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::ServerRequestInterceptor_Adapter*
 TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void)
 {
@@ -34,6 +37,8 @@ TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void)
   return obj;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl,
                        ACE_TEXT ("ServerRequestInterceptor_Adapter_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
index 45e80d4c25e..9cd5e06128f 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_server_export.h"
+#include "tao/PI_Server/pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +29,8 @@
 #include "ace/Service_Config.h"
 #include "tao/ServerRequestInterceptor_Adapter_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class ServerRequestInterceptor_Adapter;
@@ -42,6 +43,8 @@ public:
   virtual TAO::ServerRequestInterceptor_Adapter *create (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_ServerRequestInterceptor_Adapter_Factory_Impl)
 
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
index 3040509bd76..4ded86134fd 100644
--- a/TAO/tao/ParameterModeC.cpp
+++ b/TAO/tao/ParameterModeC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "ParameterModeC.h"
+#include "tao/ParameterModeC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,6 +39,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,3 +67,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enum
   
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
index e2751ebf4e4..c4a0c7d670a 100644
--- a/TAO/tao/ParameterModeC.h
+++ b/TAO/tao/ParameterModeC.h
@@ -59,6 +59,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_InputCDR;
 class TAO_OutputCDR;
 
@@ -99,6 +101,9 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index b1d2432c89a..1d873b9ae12 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "tao/Parser_Registry.h"
@@ -15,6 +14,8 @@ ACE_RCSID (tao,
            Parser_Registry,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Parser_Registry::TAO_Parser_Registry (void)
   : parsers_ (0),
     size_ (0)
@@ -73,3 +74,4 @@ TAO_Parser_Registry::match_parser (const char *ior_string)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
index 13571c9bd2b..ce997817d8c 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -19,12 +19,17 @@
 
 #include "tao/TAO_Export.h"
 
-#include "ace/os_include/os_stddef.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+#include "ace/os_include/os_stddef.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_ORB_Core;
 class TAO_IOR_Parser;
@@ -77,6 +82,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "tao/Parser_Registry.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Parser_Registry.i b/TAO/tao/Parser_Registry.i
index 29aabd26ddc..5545cece0df 100644
--- a/TAO/tao/Parser_Registry.i
+++ b/TAO/tao/Parser_Registry.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Parser_Registry::Parser_Iterator
 TAO_Parser_Registry::begin (void) const
 {
@@ -11,3 +15,5 @@ TAO_Parser_Registry::end (void) const
 {
   return this->parsers_ + this->size_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
index c63880b3fa4..5839334ca9f 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -1,12 +1,16 @@
 // $Id$
 
-#include "Pluggable_Messaging.h"
+#include "tao/Pluggable_Messaging.h"
 
 ACE_RCSID (tao,
            Pluggable_Messaging,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void)
 {
-
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index 86989c0865b..c6e2e4d734f 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -26,6 +26,12 @@
 
 #include "tao/Basic_Types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Exception;
@@ -39,8 +45,7 @@ class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
 class TAO_Queued_Data;
-
-class ACE_Time_Value;
+class TAO_GIOP_Fragmentation_Strategy;
 
 // @@ The more I think I about this class, I feel that this class need
 // not be a ABC as it is now. Instead we have these options
@@ -58,7 +63,7 @@ class ACE_Time_Value;
 /**
  * @class TAO_Pluggable_Messaging
  *
- * @brief Generic definitions  Messaging class.
+ * @brief Generic definitions Messaging class.
  *
  * This interface tries to define generic methods that could be
  * different messaging protocols
@@ -102,15 +107,8 @@ public:
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params) = 0;
 
-  /**
-   * This method reads the message on the connection. Returns 0 when
-   * there is short read on the connection. Returns 1 when the full
-   * message is read and handled. Returns -1 on errors. If @a block is
-   * 1, then reply is read in a blocking manner.
-   */
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0) = 0;
+  virtual int generate_fragment_header (TAO_OutputCDR & cdr,
+                                        CORBA::ULong request_id) = 0;
 
   /// Format the message in the @a cdr. May not be needed in
   /// general.
@@ -120,24 +118,25 @@ public:
   virtual void init (CORBA::Octet major,
                      CORBA::Octet minor) = 0;
 
-  /// Parse the incoming messages..
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block) = 0;
-
-  /// Calculate the amount of data that is missing in the @a incoming
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &incoming) = 0;
-
-  /// Get the details of the message parsed through the @a qd.
-  virtual void get_message_data (TAO_Queued_Data *qd) = 0;
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-  */
+  /// Parse the details of the next message from the @a incoming
+  /// and initializes attributes of @a qd. Returns 0 if the message
+  /// header could not be parsed completely, returns a 1 if the message
+  /// header could be parsed completely and returns -1 on error. As the
+  /// parsed data is stored directly in @a qd, no state must be stored
+  /// in instance of implementation.
+  virtual int parse_next_message (ACE_Message_Block &incoming,
+                                  TAO_Queued_Data &qd,        /* out */
+                                  size_t &mesg_length) = 0;   /* out */
+
+  /// Extract the details of the next message from the @a incoming
+  /// through @a qd. Returns 0 if the message header could not be
+  /// parsed completely, returns a 1 if the message header could be
+  /// parsed completely and returns -1 on error.
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd) = 0;
 
-  /// Check whether the node @a qd needs consolidation from @a incoming
+  /// Check whether the node @a qd needs consolidation from @a incoming,
+  /// @r 0 on success, -1 on error
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming) = 0;
 
@@ -176,8 +175,36 @@ public:
 
   /// Accessor for the output CDR stream
   virtual TAO_OutputCDR &out_stream (void) = 0;
+
+  /// Consolidate newly received fragment with previously arrived
+  /// associated fragments to achieve consolidated message.  All
+  /// fragments having been received previously are being managed
+  /// within implementation.  If reliable transport is used (like TCP)
+  /// this operation will be invoked with fragments being received
+  /// partially ordered, last fragment being received last. Otherwise
+  /// If un-reliable transport is used (like UDP) fragments may be
+  /// received dis-ordered, and must be ordered before consolidation
+  /// within implementation.  @return 0 on success and @a con_msg
+  /// points to consolidated message, 1 if there are still fragmens
+  /// outstanding, in case of error -1 is being returned. The
+  /// implementation is responsible to release @a qd.
+  virtual int consolidate_fragmented_message (TAO_Queued_Data *qd,
+                                              TAO_Queued_Data *&con_msg) = 0;
+
+  /// Discard all fragments associated to request-id encoded in
+  /// cancel_request.  Transport implementaion guarantees that this
+  /// operation will never be invoked // concurrently by multiplpe
+  /// threads nor concurrently to consolidate_fragmented_message
+  /// @return -1 on failure, 0 on success, 1 no fragment on stack
+  /// relating to CancelRequest.
+  virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request) = 0;
+
+  /// Outgoing GIOP message fragmentation strategy.
+  virtual TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_PLUGGABLE_MESSAGING_H*/
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index d7f79cecec5..9e7956bd5a8 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "Pluggable_Messaging_Utils.h"
-#include "ORB_Core.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Pluggable_Messaging_Utils.i"
@@ -12,10 +12,12 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (
-    TAO_Transport *t
-  )
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t)
   : input_cdr_ (0)
-  ,  transport_ (t)
+  , transport_ (t)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index 9a7b421ecbf..ea31e8cd8ca 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
 
@@ -181,10 +182,12 @@ enum TAO_Pluggable_Message_Exception_Type
   TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Pluggable_Messaging_Utils.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 
-#endif /*TAO_PLUGGABLE_MESSAGING_UTILS_H*/
+#endif /* TAO_PLUGGABLE_MESSAGING_UTILS_H */
diff --git a/TAO/tao/Pluggable_Messaging_Utils.i b/TAO/tao/Pluggable_Messaging_Utils.i
index 0aa88955e5d..7a10993036e 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.i
+++ b/TAO/tao/Pluggable_Messaging_Utils.i
@@ -2,6 +2,8 @@
 
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
   : svc_ctx_ (),
@@ -27,3 +29,5 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned (void)
 {
   return *this->service_context_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 479d31708c3..62dfc3e50bc 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -44,9 +44,9 @@
 #ifndef TAO_CORBA_POLICY_PIDL
 #define TAO_CORBA_POLICY_PIDL
 
-#include <UShortSeq.pidl>
-#include <Current.pidl>
-#include <Policy_Forward.pidl>
+#include "tao/UShortSeq.pidl"
+#include "tao/Current.pidl"
+#include "tao/Policy_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 606c217d2bf..f5a8d53ed0c 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "PolicyC.h"
+#include "tao/PolicyC.h"
 #include "tao/CDR.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
@@ -44,12 +44,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyC.inl"
+#include "tao/PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO specific stuff.
 namespace CORBA
 {
@@ -119,7 +121,7 @@ CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
 CORBA::PolicyError&
 CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->reason = _tao_excp.reason;
   return *this;
 }
@@ -255,7 +257,7 @@ CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_ex
 CORBA::InvalidPolicies&
 CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->indices = _tao_excp.indices;
   return *this;
 }
@@ -382,7 +384,7 @@ TAO::Objref_Traits<CORBA::Policy>::release (
     CORBA::Policy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::Policy_ptr
@@ -393,7 +395,7 @@ TAO::Objref_Traits<CORBA::Policy>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::Policy>::marshal (
-    CORBA::Policy_ptr p,
+    const CORBA::Policy_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -418,7 +420,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
@@ -460,7 +462,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
@@ -502,7 +504,7 @@ void CORBA::Policy::destroy (
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ::CORBA::Object::tao_object_initialize (this);
     }
 
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
@@ -554,7 +556,7 @@ CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
   Policy *_tao_tmp_pointer =
     static_cast<Policy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::Policy_ptr
@@ -590,7 +592,7 @@ CORBA::Policy::_unchecked_narrow (
 CORBA::Policy_ptr
 CORBA::Policy::_duplicate (Policy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -601,7 +603,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj)
 void
 CORBA::Policy::_tao_release (Policy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -625,7 +627,7 @@ CORBA::Policy::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->::CORBA::Object::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -661,7 +663,7 @@ TAO::Objref_Traits<CORBA::PolicyManager>::release (
     CORBA::PolicyManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::PolicyManager_ptr
@@ -672,7 +674,7 @@ TAO::Objref_Traits<CORBA::PolicyManager>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::PolicyManager>::marshal (
-    CORBA::PolicyManager_ptr p,
+    const CORBA::PolicyManager_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -690,7 +692,7 @@ CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyManager *_tao_tmp_pointer =
     static_cast<PolicyManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::PolicyManager_ptr
@@ -718,7 +720,7 @@ CORBA::PolicyManager::_unchecked_narrow (
 CORBA::PolicyManager_ptr
 CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -729,7 +731,7 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
 void
 CORBA::PolicyManager::_tao_release (PolicyManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -790,7 +792,7 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::release (
     CORBA::PolicyCurrent_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::PolicyCurrent_ptr
@@ -801,7 +803,7 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal (
-    CORBA::PolicyCurrent_ptr p,
+    const CORBA::PolicyCurrent_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -819,7 +821,7 @@ CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyCurrent *_tao_tmp_pointer =
     static_cast<PolicyCurrent *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::PolicyCurrent_ptr
@@ -847,7 +849,7 @@ CORBA::PolicyCurrent::_unchecked_narrow (
 CORBA::PolicyCurrent_ptr
 CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -858,7 +860,7 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
 void
 CORBA::PolicyCurrent::_tao_release (PolicyCurrent_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1038,3 +1040,5 @@ CORBA::Boolean operator>> (
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 3346c12a828..60e773570cc 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -65,6 +65,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -153,7 +155,7 @@ namespace CORBA
     // be\be_visitor_exception/exception_ctor.cpp:66
 
     PolicyError (
-        ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
+        ::CORBA::PolicyErrorCode _tao_reason
       );
 
     // TAO_IDL - Generated from
@@ -206,7 +208,7 @@ namespace CORBA
     // be\be_visitor_exception/exception_ctor.cpp:66
 
     InvalidPolicies (
-        const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
+        const ::CORBA::UShortSeq & _tao_indices
       );
 
     // TAO_IDL - Generated from
@@ -591,7 +593,7 @@ namespace TAO
       );
     static ::CORBA::Policy_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::Policy_ptr p,
+        const ::CORBA::Policy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -612,7 +614,7 @@ namespace TAO
       );
     static ::CORBA::PolicyManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyManager_ptr p,
+        const ::CORBA::PolicyManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -633,7 +635,7 @@ namespace TAO
       );
     static ::CORBA::PolicyCurrent_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
+        const ::CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -662,8 +664,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "PolicyC.inl"
+#include "tao/PolicyC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl
index 2bc9b36e2dc..f9aac3d9fae 100644
--- a/TAO/tao/PolicyC.inl
+++ b/TAO/tao/PolicyC.inl
@@ -29,6 +29,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (_CORBA_POLICY___CI_)
 #define _CORBA_POLICY___CI_
 
@@ -39,12 +41,7 @@ CORBA::Policy::Policy (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
+  : ::CORBA::Object (objref, _tao_collocated, servant, oc),
     the_TAO_Policy_Proxy_Broker_ (0)
 {
   this->CORBA_Policy_setup_collocation ();
@@ -55,9 +52,11 @@ CORBA::Policy::Policy (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ::CORBA::Object (ior, oc),
     the_TAO_Policy_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
index beec71d1266..c33f3a2710e 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,6 +1,6 @@
-//$Id$
+// $Id$
 
-#include "PolicyFactory_Registry_Adapter.h"
+#include "tao/PolicyFactory_Registry_Adapter.h"
 
 
 ACE_RCSID (tao,
@@ -8,9 +8,10 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
 {
-  PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
-  {
-  }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 4cf50d7d7a9..586555523c0 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -21,8 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+
 #include "ace/CORBA_macros.h"
-#include "Basic_Types.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //-- Forward Declarations--
 namespace CORBA
@@ -83,6 +87,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_POLICY_FACTORY_REGISTRY_ADAPTER_H */
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp
index 9f817b31876..76a51641ae7 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -1,11 +1,15 @@
 //$Id$
 
-#include "PolicyFactory_Registry_Factory.h"
+#include "tao/PolicyFactory_Registry_Factory.h"
 
 ACE_RCSID (tao,
            PolicyFactory_Registry_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h
index 5d7ac654eaa..6da8fdda14a 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.h
+++ b/TAO/tao/PolicyFactory_Registry_Factory.h
@@ -19,8 +19,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class PolicyFactory_Registry_Adapter;
@@ -38,5 +41,7 @@ public:
   virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
-#endif /* TAO_OBJECT_LOADER_H */
+#endif /* TAO_POLICYFACTORY_REGISTRY_FACTORY_H */
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index fc8cbb69227..14cb7c89456 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Policy_Current.h"
+#include "tao/Policy_Current.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -10,16 +10,17 @@
 # include "tao/Policy_Current.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            Policy_Current,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 {
-  TAO_TSS_Resources *tss =
+  TAO_TSS_Resources * const tss =
     TAO_TSS_Resources::instance ();
 
   TAO_Policy_Current_Impl *old = tss->policy_current_;
@@ -77,4 +78,6 @@ TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
                                  ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index ad0d5da00e3..889c1971d24 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -19,14 +19,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 #include "tao/PolicyC.h"
@@ -37,11 +35,13 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Policy_Current_Impl;
 
-class TAO_Export TAO_Policy_Current :
-  public CORBA::PolicyCurrent,
-  public TAO_Local_RefCounted_Object
+class TAO_Policy_Current
+  : public CORBA::PolicyCurrent
+  , public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor
@@ -77,6 +77,8 @@ public:
   TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl
index e9bdbec8bb8..3605ebd5b7e 100644
--- a/TAO/tao/Policy_Current.inl
+++ b/TAO/tao/Policy_Current.inl
@@ -1,7 +1,12 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Policy_Current::TAO_Policy_Current (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp
index 6ebb543218d..9600341a74f 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Policy_Current_Impl.h"
+#include "tao/Policy_Current_Impl.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Policy_Current_Impl::set_policy_overrides (
     const CORBA::PolicyList & policies,
@@ -35,4 +37,6 @@ TAO_Policy_Current_Impl::get_policy_overrides (
                                                    ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index 300473723ac..270342fe234 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Export TAO_Policy_Current_Impl
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Policy_Current_Impl
 {
 public:
 
@@ -67,6 +69,8 @@ private:
   TAO_Policy_Set manager_impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index 92838269eec..c7cc06d9743 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
   : manager_impl_ (TAO_POLICY_THREAD_SCOPE)
@@ -22,3 +26,4 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
                                                 ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index b056d46a8e3..0f127073c73 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "Policy_ForwardC.h"
+#include "tao/Policy_ForwardC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYLIST_CS_)
@@ -53,9 +55,8 @@ CORBA::PolicyList::PolicyList (void)
 CORBA::PolicyList::PolicyList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
-        Policy,
-        Policy_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Policy, CORBA::Policy_var
       >
     (max)
 {}
@@ -66,9 +67,8 @@ CORBA::PolicyList::PolicyList (
     CORBA::Policy_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
-        Policy,
-        Policy_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Policy, CORBA::Policy_var
       >
     (max, length, buffer, release)
 {}
@@ -76,9 +76,8 @@ CORBA::PolicyList::PolicyList (
 CORBA::PolicyList::PolicyList (
     const PolicyList &seq
   )
-  : TAO_Unbounded_Object_Sequence<
-        Policy,
-        Policy_var
+  : TAO::unbounded_object_reference_sequence<
+        CORBA::Policy, CORBA::Policy_var
       >
     (seq)
 {}
@@ -97,7 +96,7 @@ void CORBA::PolicyList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
@@ -109,7 +108,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
 CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         PolicyType
       >
     (max)
@@ -121,7 +120,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::ULong * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         PolicyType
       >
     (max, length, buffer, release)
@@ -130,7 +129,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
 CORBA::PolicyTypeSeq::PolicyTypeSeq (
     const PolicyTypeSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         PolicyType
       >
     (seq)
@@ -161,25 +160,7 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::Policy>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -187,40 +168,7 @@ CORBA::Boolean operator>> (
     CORBA::PolicyList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */
@@ -236,15 +184,7 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -252,33 +192,7 @@ CORBA::Boolean operator>> (
     CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */
@@ -295,11 +209,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_en
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<CORBA::SetOverrideType> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 9d15b8a3cf2..8aa498a11fd 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -56,30 +56,32 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-  
+
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -87,39 +89,30 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
-  
+
   class PolicyList;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        PolicyList,
-        TAO_Object_Manager<
-            Policy,
-            Policy_var
-          >
+    TAO_VarSeq_Var_T<
+        PolicyList
       >
     PolicyList_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        PolicyList,
-        PolicyList_var,
-        TAO_Object_Manager<
-            Policy,
-            Policy_var
-          >
+    TAO_Seq_Out_T<
+        PolicyList
       >
     PolicyList_out;
-  
+
   class TAO_Export PolicyList
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             Policy,
             Policy_var
           >
@@ -130,45 +123,42 @@ namespace CORBA
     PolicyList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Policy_ptr* buffer, 
-        CORBA::Boolean release = 0
+        Policy_ptr* buffer,
+        CORBA::Boolean release = false
       );
     PolicyList (const PolicyList &);
     ~PolicyList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef PolicyList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
-  
+
   class PolicyTypeSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        PolicyTypeSeq,
-        PolicyType
+        PolicyTypeSeq
       >
     PolicyTypeSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        PolicyTypeSeq,
-        PolicyTypeSeq_var,
-        PolicyType
+        PolicyTypeSeq
       >
     PolicyTypeSeq_out;
-  
+
   class TAO_Export PolicyTypeSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             PolicyType
           >
   {
@@ -178,34 +168,35 @@ namespace CORBA
     PolicyTypeSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::ULong* buffer,
+        CORBA::Boolean release = false
       );
     PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef PolicyTypeSeq_var _var_type;
+    typedef PolicyTypeSeq_out _out_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-  
+
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyCurrent
       >
     PolicyCurrent_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyCurrent
@@ -213,16 +204,16 @@ namespace CORBA
     PolicyCurrent_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-  
+
   typedef SetOverrideType &SetOverrideType_out;
 
 // TAO_IDL - Generated from
@@ -239,7 +230,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__TRAITS_)
 #define _CORBA_POLICY__TRAITS_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
   {
@@ -251,7 +242,7 @@ namespace TAO
       );
     static ::CORBA::Policy_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::Policy_ptr p,
+        const ::CORBA::Policy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -260,7 +251,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYCURRENT__TRAITS_)
 #define _CORBA_POLICYCURRENT__TRAITS_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
@@ -272,7 +263,7 @@ namespace TAO
       );
     static ::CORBA::PolicyCurrent_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
+        const ::CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -330,6 +321,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 383c7a44db9..5e7383c4cc8 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Policy_Manager.h"
+#include "tao/Policy_Manager.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -13,6 +13,7 @@ ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
@@ -34,4 +35,6 @@ TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
   this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index c61e90afdb9..14c00ee8721 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -36,10 +36,11 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_Export TAO_Policy_Manager :
-  public CORBA::PolicyManager,
-  public TAO_Local_RefCounted_Object
+class TAO_Policy_Manager
+  : public CORBA::PolicyManager
+  , public TAO_Local_RefCounted_Object
 {
 public:
   /// constructor
@@ -75,6 +76,8 @@ private:
   TAO_Policy_Set impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 32eb06bdff8..b982fad4f14 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Policy_Manager::TAO_Policy_Manager (void)
   : impl_ (TAO_POLICY_ORB_SCOPE)
@@ -32,3 +34,5 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
   return this->impl_.get_cached_policy (type
                                         ACE_ENV_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 9739eabc2bc..b5f791c5be8 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Policy_Set.h"
-#include "Environment.h"
-#include "SystemException.h"
-#include "debug.h"
+#include "tao/Policy_Set.h"
+#include "tao/Environment.h"
+#include "tao/SystemException.h"
+#include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Policy_Set.i"
+# include "tao/Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
 
@@ -15,6 +15,15 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
+  : scope_ (scope)
+{
+  for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i)
+    this->cached_policies_[i] = 0;
+}
+
 TAO_Policy_Set::~TAO_Policy_Set (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -111,7 +120,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
         policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::ULong length = this->policy_list_.length ();
+      CORBA::ULong const length = this->policy_list_.length ();
       this->policy_list_.length (length + 1);
 
       // Add the "cacheable" policies into the cache.
@@ -171,16 +180,9 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
 
   for (CORBA::ULong i = 0; i < plen; ++i)
     {
-#if defined (__INTEL_COMPILER) && defined (_MSC_VER) && (_MSC_VER <= 1200)
-      // The XICL6 compiler (Intel C++ 7.1 in Visual C++ compatible
-      // mode) has a bug and can't handle the normal construct
-      CORBA::Policy_ptr temp = policies[i];
-      CORBA::Policy_var policy = CORBA::Policy::_duplicate (temp);
-#else
-      CORBA::Policy_var policy = policies[i];
-#endif
-
-      if (CORBA::is_nil (policy.in ()))
+      CORBA::Policy_ptr policy = policies[i];
+
+      if (CORBA::is_nil (policy))
         {
           continue;
         }
@@ -205,14 +207,14 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
           server_protocol_set = true;
         }
 
-      this->set_policy (policy.in () ACE_ENV_ARG_PARAMETER);
+      this->set_policy (policy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
-                                     ACE_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   if (! this->compatible_scope (policy->_tao_scope()))
     {
@@ -310,7 +312,7 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
             }
 
           policy_list[n++] =
-            CORBA::Policy::_duplicate (this->policy_list_[i].in ());
+            CORBA::Policy::_duplicate (this->policy_list_[i]);
           break;
         }
     }
@@ -337,7 +339,7 @@ TAO_Policy_Set::get_policy (CORBA::PolicyType type
           continue;
         }
 
-      return CORBA::Policy::_duplicate (this->policy_list_[i].in ());
+      return CORBA::Policy::_duplicate (this->policy_list_[i]);
     }
 
   return CORBA::Policy::_nil ();
@@ -367,3 +369,5 @@ TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
 
   return CORBA::Policy::_nil ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 0e3b8e6bc24..d5176c720b7 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -26,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Policy_Set
  *
@@ -44,6 +46,7 @@ public:
    */
   TAO_Policy_Set (TAO_Policy_Scope scope);
 
+  /// Copy constructor.
   TAO_Policy_Set (const TAO_Policy_Set &rhs);
 
   /// Destructor
@@ -97,11 +100,11 @@ public:
   /// Returns the policy at the specified index.
   /// @c CORBA::Policy::_nil () is returned if the policy doesn't
   /// exist.
-  CORBA::Policy *get_policy_by_index (CORBA::ULong index);
+  CORBA::Policy *get_policy_by_index (CORBA::ULong index) const;
   CORBA::ULong num_policies (void) const;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
+  TAO_Policy_Set & operator= (const TAO_Policy_Set&);
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
@@ -122,6 +125,7 @@ private:
   TAO_Policy_Scope scope_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Policy_Set.i"
diff --git a/TAO/tao/Policy_Set.i b/TAO/tao/Policy_Set.i
index 11c35bfdaa8..2263ccd4fad 100644
--- a/TAO/tao/Policy_Set.i
+++ b/TAO/tao/Policy_Set.i
@@ -1,21 +1,19 @@
+// -*- C++ -*-
+//
 // $Id$
 
-ACE_INLINE
-TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
-  : scope_ (scope)
-{
-  for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; i++)
-    this->cached_policies_[i] = 0;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
 TAO_Policy_Set::compatible_scope (TAO_Policy_Scope policy_scope) const
 {
-  return (((unsigned int) policy_scope & (unsigned int) this->scope_) > 0);
+  return
+    ((static_cast<unsigned int> (policy_scope)
+      & static_cast<unsigned int> (this->scope_)) > 0);
 }
 
 ACE_INLINE CORBA::Policy *
-TAO_Policy_Set::get_policy_by_index (CORBA::ULong index)
+TAO_Policy_Set::get_policy_by_index (CORBA::ULong index) const
 {
   return CORBA::Policy::_duplicate (this->policy_list_[index]);
 }
@@ -25,3 +23,5 @@ TAO_Policy_Set::num_policies (void) const
 {
   return this->policy_list_.length();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index cd51a8a1426..b9753bd0fc2 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "Policy_Validator.h"
-#include "Environment.h"
-#include "debug.h"
+#include "tao/Policy_Validator.h"
+#include "tao/Environment.h"
+#include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 
@@ -10,19 +10,18 @@ ACE_RCSID (tao,
            Policy_Validator,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
     next_ (0)
 {
-  // No-Op.
 }
 
 TAO_Policy_Validator::~TAO_Policy_Validator (void)
 {
-  if (this->next_)
-    {
-      delete this->next_;
-    }
+  delete this->next_;
 }
 
 TAO_ORB_Core & 
@@ -87,7 +86,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
   this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (this->next_ != 0)
+  if (this->next_)
     {
       this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -101,3 +100,5 @@ TAO_Policy_Validator::legal_policy (CORBA::PolicyType type)
           || ((this->next_ != 0)
               && this->next_->legal_policy_impl (type)));
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 10defec9d00..69d680d9e61 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Policy_Validator.h
@@ -25,6 +27,8 @@
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class TAO_Policy_Set;
 class TAO_ORB_Core;
@@ -109,6 +113,8 @@ private:
   TAO_Policy_Validator *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
-#endif /* TAO_POLICY_VALIDATOR_H_ */
+#endif /* TAO_POLICY_VALIDATOR_H */
diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h
index 63623152d5f..380ae32530e 100644
--- a/TAO/tao/PortableInterceptor.h
+++ b/TAO/tao/PortableInterceptor.h
@@ -22,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 00e1a22675c..fdf42e809ae 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -34,8 +34,8 @@
 #ifndef _PORTABLE_INTERCEPTOR_IDL_
 #define _PORTABLE_INTERCEPTOR_IDL_
 
-#include <PI_Forward.pidl>
-#include <Messaging_SyncScope.pidl>
+#include "tao/PI_Forward.pidl"
+#include "tao/Messaging_SyncScope.pidl"
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 25d2f8334ff..fd12ae4eb40 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -29,14 +29,18 @@
 // be\be_codegen.cpp:277
 
 
-#include "PortableInterceptorC.h"
+#include "tao/PortableInterceptorC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index bf1b51c4d81..f9edc88992e 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -52,6 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -129,6 +131,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 17361e7c94f..5699755a01b 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Active_Object_Map.h"
-#include "Active_Object_Map_Entry.h"
+#include "tao/PortableServer/Active_Object_Map.h"
+#include "tao/PortableServer/Active_Object_Map_Entry.h"
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Active_Object_Map.i"
+# include "tao/PortableServer/Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
@@ -14,6 +14,8 @@ ACE_RCSID(PortableServer,
           Active_Object_Map,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /* static */
 size_t TAO_Active_Object_Map::system_id_size_ = 0;
 
@@ -933,3 +935,4 @@ TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 9cc254b555a..65c614de389 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,15 +16,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Key_Adapters.h"
+#include "tao/PortableServer/Key_Adapters.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Map_T.h"
+#include "tao/PortableServer/Servant_Base.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "Servant_Base.h"
+#include "ace/Map_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations.
 class TAO_Id_Uniqueness_Strategy;
@@ -613,8 +615,10 @@ public:
                          TAO_Active_Object_Map_Entry &entry);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Active_Object_Map.i"
+# include "tao/PortableServer/Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i
index 59824cf5063..31b3326b811 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.i
+++ b/TAO/tao/PortableServer/Active_Object_Map.i
@@ -1,6 +1,10 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "Active_Object_Map_Entry.h"
+#include "tao/PortableServer/Active_Object_Map_Entry.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
@@ -256,3 +260,5 @@ TAO_Active_Object_Map::system_id_size (void)
 {
   return TAO_Active_Object_Map::system_id_size_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index d7a1fa3fe64..fc29e9faec0 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "Active_Object_Map_Entry.h"
+#include "tao/PortableServer/Active_Object_Map_Entry.h"
 
 ACE_RCSID(PortableServer,
           Active_Object_Map_Entry,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
   : user_id_ (),
     system_id_ (),
@@ -16,3 +18,4 @@ TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
index 1c072df4201..75d2a3d2c40 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,13 +16,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PS_ForwardC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @struct TAO_Active_Object_Map_Entry
@@ -57,6 +58,8 @@ struct TAO_Active_Object_Map_Entry
   CORBA::Short priority_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ACTIVE_OBJECT_MAP_ENTRY_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index 4183da3f356..33c267042ba 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,61 +1,64 @@
-// @(#) $Id$
-
-#include "Active_Policy_Strategies.h"
-#include "POA_Cached_Policies.h"
-
-#include "ThreadStrategy.h"
-#include "ThreadStrategyFactory.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyFactory.h"
-#include "IdAssignmentStrategy.h"
-#include "IdAssignmentStrategyFactory.h"
-#include "LifespanStrategy.h"
-#include "LifespanStrategyFactory.h"
-#include "IdUniquenessStrategy.h"
-#include "IdUniquenessStrategyFactory.h"
-#include "ImplicitActivationStrategy.h"
-#include "ImplicitActivationStrategyFactory.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyFactory.h"
-
-#include "IdAssignmentPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "RequestProcessingPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "ThreadPolicyC.h"
-#include "ServantRetentionPolicyC.h"
+// $Id$
+
+#include "tao/PortableServer/Active_Policy_Strategies.h"
+#include "tao/PortableServer/POA_Cached_Policies.h"
+
+#include "tao/PortableServer/ThreadStrategy.h"
+#include "tao/PortableServer/ThreadStrategyFactory.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategyFactory.h"
+#include "tao/PortableServer/LifespanStrategy.h"
+#include "tao/PortableServer/LifespanStrategyFactory.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategyFactory.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategyFactory.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
+
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
 
 #include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Active_Policy_Strategies.inl"
+# include "tao/PortableServer/Active_Policy_Strategies.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(PortableServer,
           Active_Policy_Strategies,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    Active_Policy_Strategies::Active_Policy_Strategies() :
-      thread_strategy_ (0),
-      request_processing_strategy_ (0),
-      id_assignment_strategy_ (0),
-      lifespan_strategy_ (0),
-      id_uniqueness_strategy_ (0),
-      implicit_activation_strategy_ (0),
-      servant_retention_strategy_ (0),
-      thread_strategy_factory_ (0),
-      servant_retention_strategy_factory_ (0),
-      request_processing_strategy_factory_ (0),
-      lifespan_strategy_factory_ (0),
-      implicit_activation_strategy_factory_ (0),
-      id_uniqueness_strategy_factory_ (0),
-      id_assignment_strategy_factory_ (0)
+    Active_Policy_Strategies::Active_Policy_Strategies (void)
+      : thread_strategy_ (0),
+	request_processing_strategy_ (0),
+	id_assignment_strategy_ (0),
+	lifespan_strategy_ (0),
+	id_uniqueness_strategy_ (0),
+	implicit_activation_strategy_ (0),
+	servant_retention_strategy_ (0),
+	thread_strategy_factory_ (0),
+	servant_retention_strategy_factory_ (0),
+	request_processing_strategy_factory_ (0),
+	lifespan_strategy_factory_ (0),
+	implicit_activation_strategy_factory_ (0),
+	id_uniqueness_strategy_factory_ (0),
+	id_assignment_strategy_factory_ (0)
     {
     }
 
@@ -64,104 +67,110 @@ namespace TAO
                                       ::TAO_Root_POA *poa
                                       ACE_ENV_ARG_DECL)
     {
-      thread_strategy_factory_ =
+      this->thread_strategy_factory_ =
         ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory");
 
-      if (thread_strategy_factory_ != 0)
-        thread_strategy_ = thread_strategy_factory_->create (policies.thread());
+      if (this->thread_strategy_factory_ != 0)
+        this->thread_strategy_ =
+          this->thread_strategy_factory_->create (policies.thread());
 
       /**/
 
-      id_assignment_strategy_factory_ =
+      this->id_assignment_strategy_factory_ =
         ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory");
 
-      if (id_assignment_strategy_factory_ != 0)
-        id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment());
+      if (this->id_assignment_strategy_factory_ != 0)
+        this->id_assignment_strategy_ =
+          this->id_assignment_strategy_factory_->create (policies.id_assignment());
 
       /**/
 
-      id_uniqueness_strategy_factory_ =
+      this->id_uniqueness_strategy_factory_ =
         ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory");
 
-      if (id_uniqueness_strategy_factory_ != 0)
-        id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
+      if (this->id_uniqueness_strategy_factory_ != 0)
+        this->id_uniqueness_strategy_ =
+          this->id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
 
       /**/
 
-      servant_retention_strategy_factory_ =
+      this->servant_retention_strategy_factory_ =
         ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory");
 
-      if (servant_retention_strategy_factory_ != 0)
-        servant_retention_strategy_ =
-          servant_retention_strategy_factory_->create (policies.servant_retention());
+      if (this->servant_retention_strategy_factory_ != 0)
+        this->servant_retention_strategy_ =
+          this->servant_retention_strategy_factory_->create (policies.servant_retention());
 
       /**/
 
-      request_processing_strategy_factory_ =
+      this->request_processing_strategy_factory_ =
         ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory");
 
-      if (request_processing_strategy_factory_ != 0)
-        request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
+      if (this->request_processing_strategy_factory_ != 0)
+        this->request_processing_strategy_ =
+          this->request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
 
       /**/
 
-      lifespan_strategy_factory_ =
+      this->lifespan_strategy_factory_ =
         ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory");
 
-      if (lifespan_strategy_factory_ != 0)
-        lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan());
+      if (this->lifespan_strategy_factory_ != 0)
+        this->lifespan_strategy_ =
+          this->lifespan_strategy_factory_->create (policies.lifespan());
 
       /**/
 
-      implicit_activation_strategy_factory_ =
+      this->implicit_activation_strategy_factory_ =
         ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory");
 
-      if (implicit_activation_strategy_factory_ != 0)
-        implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation());
+      if (this->implicit_activation_strategy_factory_ != 0)
+        this->implicit_activation_strategy_ =
+          this->implicit_activation_strategy_factory_->create (policies.implicit_activation());
 
       /**/
 
 // @todo, check if all pointers are != 0
 
-      if (lifespan_strategy_ != 0)
+      if (this->lifespan_strategy_ != 0)
         {
-          lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (request_processing_strategy_ != 0)
+      if (this->request_processing_strategy_ != 0)
         {
-          request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
+          this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (id_uniqueness_strategy_ != 0)
+      if (this->id_uniqueness_strategy_ != 0)
         {
-          id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (implicit_activation_strategy_ != 0)
+      if (this->implicit_activation_strategy_ != 0)
         {
-          implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (thread_strategy_ != 0)
+      if (this->thread_strategy_ != 0)
         {
-          thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (servant_retention_strategy_ != 0)
+      if (this->servant_retention_strategy_ != 0)
         {
-          servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (id_assignment_strategy_ != 0)
+      if (this->id_assignment_strategy_ != 0)
         {
-          id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -170,61 +179,63 @@ namespace TAO
     Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL)
     {
 
-      if (lifespan_strategy_ != 0)
+      if (this->lifespan_strategy_ != 0)
         {
-          lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          lifespan_strategy_ = 0;
+          this->lifespan_strategy_ = 0;
         }
 
-      if (request_processing_strategy_ != 0)
+      if (this->request_processing_strategy_ != 0)
         {
-          request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          request_processing_strategy_ = 0;
+          this->request_processing_strategy_ = 0;
         }
 
-      if (id_uniqueness_strategy_ != 0)
+      if (this->id_uniqueness_strategy_ != 0)
         {
-          id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          id_uniqueness_strategy_ = 0;
+          this->id_uniqueness_strategy_ = 0;
         }
 
-      if (implicit_activation_strategy_ != 0)
+      if (this->implicit_activation_strategy_ != 0)
         {
-          implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          implicit_activation_strategy_ = 0;
+          this->implicit_activation_strategy_ = 0;
         }
 
-      if (thread_strategy_ != 0)
+      if (this->thread_strategy_ != 0)
         {
-          thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          thread_strategy_ = 0;
+          this->thread_strategy_ = 0;
         }
 
-      if (servant_retention_strategy_ != 0)
+      if (this->servant_retention_strategy_ != 0)
         {
-          servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          servant_retention_strategy_ = 0;
+          this->servant_retention_strategy_ = 0;
         }
 
-      if (id_assignment_strategy_ != 0)
+      if (this->id_assignment_strategy_ != 0)
         {
-          id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
+          this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          id_assignment_strategy_ = 0;
+          this->id_assignment_strategy_ = 0;
         }
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index aedab179e3f..685c6978c2b 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -12,16 +12,18 @@
 
 #ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
 #define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
+
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
 
@@ -49,10 +51,10 @@ namespace TAO
     /**
      * This class stores the active policy strategies used for a certain POA.
      */
-    class TAO_PortableServer_Export Active_Policy_Strategies
+    class Active_Policy_Strategies
     {
     public:
-      Active_Policy_Strategies();
+      Active_Policy_Strategies (void);
 
       void update (Cached_Policies &policies,
                    TAO_Root_POA* poa
@@ -94,9 +96,12 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Active_Policy_Strategies.inl"
+# include "tao/PortableServer/Active_Policy_Strategies.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index ff04b364157..ab606b04b1a 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -1,4 +1,8 @@
-// @(#) $Id$
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -8,49 +12,51 @@ namespace TAO
     ThreadStrategy*
     Active_Policy_Strategies::thread_strategy (void) const
     {
-      return thread_strategy_;
+      return this->thread_strategy_;
     }
 
     ACE_INLINE
     RequestProcessingStrategy*
     Active_Policy_Strategies::request_processing_strategy (void) const
     {
-      return request_processing_strategy_;
+      return this->request_processing_strategy_;
     }
 
     ACE_INLINE
     IdAssignmentStrategy *
     Active_Policy_Strategies::id_assignment_strategy (void) const
     {
-      return id_assignment_strategy_;
+      return this->id_assignment_strategy_;
     }
 
     ACE_INLINE
     IdUniquenessStrategy *
     Active_Policy_Strategies::id_uniqueness_strategy (void) const
     {
-      return id_uniqueness_strategy_;
+      return this->id_uniqueness_strategy_;
     }
 
     ACE_INLINE
     LifespanStrategy*
     Active_Policy_Strategies::lifespan_strategy (void) const
     {
-      return lifespan_strategy_;
+      return this->lifespan_strategy_;
     }
 
     ACE_INLINE
     ImplicitActivationStrategy*
     Active_Policy_Strategies::implicit_activation_strategy (void) const
     {
-      return implicit_activation_strategy_;
+      return this->implicit_activation_strategy_;
     }
 
     ACE_INLINE
     ServantRetentionStrategy*
     Active_Policy_Strategies::servant_retention_strategy (void) const
     {
-      return servant_retention_strategy_;
+      return this->servant_retention_strategy_;
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl
index 0fa4dce9ee9..81adf4c3039 100644
--- a/TAO/tao/PortableServer/AdapterActivator.pidl
+++ b/TAO/tao/PortableServer/AdapterActivator.pidl
@@ -21,7 +21,7 @@
 #define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
index 0e381b61957..ebf6cd1285e 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -30,13 +30,15 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "AdapterActivatorA.h"
+#include "tao/PortableServer/AdapterActivatorA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -53,4 +55,6 @@ namespace PortableServer
     &_tao_tc_PortableServer_AdapterActivator;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h
index b67fd60fcae..fa84df9f34e 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.h
+++ b/TAO/tao/PortableServer/AdapterActivatorA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "AdapterActivatorC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 #include "tao/PortableServer/PS_ForwardA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -54,6 +56,8 @@ namespace PortableServer
 
 } // module PortableServer
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index 14a2fbb7712..e1f1bc8edac 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "AdapterActivatorC.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
     PortableServer::AdapterActivator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::AdapterActivator_ptr
@@ -111,18 +113,18 @@ PortableServer::AdapterActivator::_unchecked_narrow (
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::AdapterActivator::_tao_release (AdapterActivator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -165,4 +167,6 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
   return false;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
index de4186e65c1..ce0251e59d5 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -59,6 +59,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   // TAO_IDL - Generated from
@@ -191,6 +193,8 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
index 4a8a0386ef1..a10948a20f0 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Adapter_Activator.h"
+#include "tao/PortableServer/Adapter_Activator.h"
 
 ACE_RCSID (PortableServer,
            Adapter_Activator,
@@ -8,9 +8,11 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "AdapterActivatorC.h"
-#include "POAManagerC.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
+#include "tao/PortableServer/POAManagerC.h"
+#include "tao/PortableServer/PortableServer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -61,4 +63,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index a3cd80dc34c..65ecd7d9417 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -1,11 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
  *  @file    Adapter_Activator.h
  *
  *  $Id$
- *
  */
 //=============================================================================
 
@@ -13,16 +12,18 @@
 #define TAO_ADAPTER_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "AdapterActivatorC.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   class POAManager;
@@ -55,6 +56,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
index abb88199417..21cdd6547cf 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
 #include "tao/PortableServer/portableserver_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Any;
@@ -46,6 +48,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index 1b9ae8f7adf..f145439f8e7 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/BD_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_var,
@@ -156,4 +157,6 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_BD_STRING_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index e4cd49d1ab6..fd24af1a112 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -25,6 +25,8 @@
 #include "tao/Argument.h"
 #include "tao/Any_Insert_Policy_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -193,6 +195,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/BD_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
index c8727fb3d32..57bfd4f3299 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -1,5 +1,9 @@
+// -*- C+ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename S_var,
          typename to_S,
@@ -108,3 +112,4 @@ arg (void)
   return this->x_.out ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index a6fe3ead5f4..1bd5ab450eb 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -95,4 +96,6 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_BASIC_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index 33297cb7adf..074367b1102 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -142,6 +144,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
index 195d7bca229..9c7f0f0de3c 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S, typename Insert_Policy>
 ACE_INLINE
 TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void)
@@ -60,3 +62,4 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void)
   return this->x_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index 933476cb806..433002d391f 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -25,6 +25,7 @@
 #include "tao/PortableServer/Basic_SArgument_T.h"
 #include "tao/PortableServer/SArg_Traits_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -106,6 +107,8 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_BASIC_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index dd27ae99b0f..9ac5275b9ef 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -1,9 +1,9 @@
 //$Id$
 // -- PortableServer Include --
-#include "Collocated_Object_Proxy_Broker.h"
-#include "Object_Adapter.h"
-#include "Servant_Upcall.h"
-#include "Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Base.h"
 
 
 // -- TAO Include --
@@ -16,6 +16,7 @@ ACE_RCSID (PortableServer,
            Collocated_Object_Proxy_Broker,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -306,11 +307,8 @@ the_tao_collocated_object_proxy_broker (void)
   return &the_broker;
 }
 
-TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (
-                               CORBA::Object_ptr obj
-                               )
+TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void)
 {
-  ACE_UNUSED_ARG (obj);
   return the_tao_collocated_object_proxy_broker ();
 }
 
@@ -329,3 +327,5 @@ _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (
     reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer
       )
   );
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index 070e24ba648..cd28b880933 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -18,7 +18,7 @@
 #define TAO_COLLOCATED_OBJECT_PROXY_BROKER_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +26,8 @@
 
 #include "tao/Object_Proxy_Broker.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -73,6 +75,8 @@ namespace TAO
 /// proxy broker. All the CORBA::Object share the proxy broker.
 TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_COLLOCATED_OBJECT_PROXY_BROKER_H*/
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
index 2b938b862ce..0156db0dec3 100644
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -1,10 +1,10 @@
-#include "Creation_Time.h"
+#include "tao/PortableServer/Creation_Time.h"
 
 ACE_RCSID (PortableServer,
            Creation_Time,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "Creation_Time.inl"
+# include "tao/PortableServer/Creation_Time.inl"
 #endif /* ! __ACE_INLINE__ */
 
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
index 5804c01a892..525ce68acee 100644
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -91,8 +93,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Creation_Time.inl"
+# include "tao/PortableServer/Creation_Time.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl
index 18df03c4bed..f629b10e91b 100644
--- a/TAO/tao/PortableServer/Creation_Time.inl
+++ b/TAO/tao/PortableServer/Creation_Time.inl
@@ -5,6 +5,8 @@
 #include "tao/orbconf.h"        /* For POA_NO_TIMESTAMP definition. */
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -121,3 +123,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 6a054ee480f..40177f90b27 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,6 +1,6 @@
 // @(#) $Id$
 
-#include "Default_Acceptor_Filter.h"
+#include "tao/PortableServer/Default_Acceptor_Filter.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -9,6 +9,9 @@ ACE_RCSID(PortableServer,
           Default_Acceptor_Filter,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 {
 }
@@ -51,3 +54,5 @@ TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index d6a859d0e3d..b9288216837 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *   Default strategy for populating mprofile
- *
+ *  Default strategy for populating mprofile
  *
  *  @author  Marina Spivak <marina@cs.wustl.edu>
  *  @author  Carlos O'Ryan <coryan@uci.edu>
@@ -17,9 +16,10 @@
 
 #ifndef TAO_DEFAULT_ACCEPTOR_FILTER_H
 #define TAO_DEFAULT_ACCEPTOR_FILTER_H
+
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,8 @@
 
 #include "tao/Acceptor_Filter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 
 /**
@@ -55,5 +57,8 @@ public:
   int encode_endpoints (TAO_MProfile &mprofile);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_DEFAULT_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index e3b7c8a597b..a8ad08a7394 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -1,16 +1,18 @@
-// @(#) $Id$
+// $Id$
 
-#include "Default_Policy_Validator.h"
+#include "tao/PortableServer/Default_Policy_Validator.h"
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "tao/PolicyFactory_Registry_Adapter.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            Default_Policy_Validator,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator (
   TAO_ORB_Core &orb_core)
   : TAO_Policy_Validator (orb_core)
@@ -122,7 +124,6 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
 
-
 CORBA::Boolean
 TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 {
@@ -147,3 +148,5 @@ TAO_POA_Default_Policy_Validator::merge_policies_impl (
   ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index 0b9f8a33a29..ce099b9d402 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Default_Policy_Validator.h
@@ -16,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +26,8 @@
 
 #include "tao/Policy_Validator.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
   : public TAO_Policy_Validator
 {
@@ -58,5 +62,7 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DEFAULT_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index dbd38fd621c..ae93dee3d61 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,12 +1,14 @@
-// @(#) $Id$
+// $Id$
 
-#include "Default_Servant_Dispatcher.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/Default_Servant_Dispatcher.h"
+#include "tao/PortableServer/Root_POA.h"
 
 ACE_RCSID(PortableServer,
           Default_Servant_Dispatcher,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 {
 }
@@ -63,3 +65,5 @@ TAO_Default_Servant_Dispatcher::post_invoke (
   TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index b0af90027e3..412e8eea9c6 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,13 +14,15 @@
 #define TAO_DEFAULT_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Dispatcher.h"
+#include "tao/PortableServer/Servant_Dispatcher.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Default_Servant_Dispatcher
@@ -69,5 +71,7 @@ public:
         ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DEFAULT_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 026f9f44ff5..9b2d483f011 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Direct_Collocation_Upcall_Wrapper.h"
+#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "ForwardRequestC.h"
+# include "tao/PortableServer/ForwardRequestC.h"
 #endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #include "tao/Abstract_Servant_Base.h"
@@ -16,6 +16,8 @@ ACE_RCSID (PortableServer,
            Direct_Collocation_Upcall_Wrapper,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO::Direct_Collocation_Upcall_Wrapper::upcall (
   CORBA::Object_ptr obj,
@@ -68,3 +70,4 @@ ACE_THROW_SPEC ((CORBA::Exception))
   ACE_CHECK;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index 2d7dc5ff483..3bdf12a5022 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
@@ -25,9 +25,11 @@
 #include "tao/orbconf.h"
 #include "tao/Collocation_Strategy.h"
 #include "tao/Exception.h"
-#include "ace/CORBA_macros.h"
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
+#include "ace/CORBA_macros.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -69,6 +71,7 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 1d90e7de4bc..9ddd1ea1d36 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -9,6 +9,8 @@
 #include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -157,4 +159,6 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index 4fb052bbfc7..e03fb2c19f4 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -174,6 +177,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 24a54390d96..0708aa7ebf1 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -117,3 +119,5 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,
 {
   return this->x_._retn_arg ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index a145529ec0c..2fc65cd99cf 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename Insert_Policy>
@@ -109,4 +110,6 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_FIXED_SIZE_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index b7d77ee05d3..fb9f6ea732a 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_FIXED_SIZE_SARGUMENT_T_H
 #define TAO_FIXED_SIZE_SARGUMENT_T_H
 
@@ -24,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -215,6 +216,7 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
index 05e29ce35a6..3a265297105 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -65,3 +67,5 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
index e7f7a7415bf..24d7567729c 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -30,13 +30,15 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "ForwardRequestA.h"
+#include "tao/PortableServer/ForwardRequestA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
 {
@@ -156,4 +158,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h
index 7334c86752b..578ec0ccb21 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.h
+++ b/TAO/tao/PortableServer/ForwardRequestA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ForwardRequestC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -62,6 +64,8 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Forwar
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index c062858725e..42656510bba 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ForwardRequestC.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::ForwardRequest::ForwardRequest (void)
@@ -72,7 +74,7 @@ PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardR
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
   return *this;
 }
@@ -129,7 +131,7 @@ void PortableServer::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -142,7 +144,7 @@ void PortableServer::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -197,4 +199,6 @@ CORBA::Boolean operator>> (
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
index 68cd5c23e74..299323cee16 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
@@ -55,6 +55,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -130,6 +132,8 @@ namespace TAO
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 89efde0e574..f3744823ab9 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,10 +1,12 @@
-#include "IdAssignmentPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/IdAssignmentPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            IdAssignmentPolicy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,3 +64,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index d467272019e..c8c6d9f9cf3 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdAssignmentPolicyC.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,6 +30,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -65,6 +67,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
index 1159445ce0b..7f06e39e614 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index ad3a8c200b3..83970768fa3 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -30,12 +30,14 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "IdAssignmentPolicyA.h"
+#include "tao/PortableServer/IdAssignmentPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -108,3 +110,5 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
index 5e640efa07f..49df4b62e0e 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "IdAssignmentPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -65,6 +67,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
index dae4a91d05b..309a2c0fcb4 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "IdAssignmentPolicyC.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -109,18 +111,18 @@ PortableServer::IdAssignmentPolicy::_unchecked_narrow (
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::IdAssignmentPolicy::_tao_release (IdAssignmentPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -179,11 +181,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::IdAssignmentPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
index f7c43ec160d..3a01f212361 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index 87cb019e4b5..969a6bfa112 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -1,17 +1,21 @@
 // $Id$
 
-#include "IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 
 ACE_RCSID (PortableServer,
            IdAssignmentStrategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
     void
-    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
+    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/
+					 ACE_ENV_ARG_DECL_NOT_USED)
     {
     }
 
@@ -39,3 +43,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
index e3085c33be2..d53a67c62b3 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h
@@ -14,7 +14,7 @@
 #define TAO_ID_ASSIGNMENT_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,12 +22,14 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    class IdAssignmentStrategy :
-       public Policy_Strategy
+    class IdAssignmentStrategy
+      : public Policy_Strategy
     {
     public:
       virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
@@ -51,5 +53,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ID_ASSIGNMENT_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
index 73a5e0c050a..2d0dd83a80c 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "StrategyFactory.h"
-#include "IdAssignmentPolicyC.h"
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -44,5 +46,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index b83c49ecf00..475632c8363 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "IdAssignmentStrategyFactoryImpl.h"
-#include "IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdAssignmentStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -52,15 +54,20 @@ namespace TAO
       // Noop because both types are singletons
     }
 
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategyFactoryImpl,
-        ACE_TEXT ("IdAssignmentStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyFactoryImpl)
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  IdAssignmentStrategyFactoryImpl,
+  ACE_TEXT ("IdAssignmentStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdAssignmentStrategyFactoryImpl,
+  TAO::Portable_Server::IdAssignmentStrategyFactoryImpl)
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
index 2ae4e43b745..1e7cadb3267 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/IdAssignmentStrategyFactory.h"
 #include "ace/Service_Config.h"
-#include "IdAssignmentStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -39,11 +41,14 @@ namespace TAO
         IdAssignmentStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index fbdbaed75c4..d7775832e2c 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "IdAssignmentStrategySystem.h"
+#include "tao/PortableServer/IdAssignmentStrategySystem.h"
 
 ACE_RCSID (PortableServer,
            Id_Assignment_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -21,17 +24,21 @@ namespace TAO
     {
       return true;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategySystem,
-        ACE_TEXT ("IdAssignmentStrategySystem"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategySystem),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdAssignmentStrategySystem,
+  TAO::Portable_Server::IdAssignmentStrategySystem)
+
+ACE_STATIC_SVC_DEFINE (
+  IdAssignmentStrategySystem,
+  ACE_TEXT ("IdAssignmentStrategySystem"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdAssignmentStrategySystem),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
index 6471e5bce3f..e77cbc95b8f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -14,15 +14,17 @@
 #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -35,11 +37,13 @@ namespace TAO
 
       virtual bool has_system_id (void) const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index 9895db85f2e..3cfa5cef85a 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -1,11 +1,13 @@
 // $Id$
 
-#include "IdAssignmentStrategyUser.h"
+#include "tao/PortableServer/IdAssignmentStrategyUser.h"
 
 ACE_RCSID (PortableServer,
            Id_Assignment_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -21,17 +23,20 @@ namespace TAO
     {
       return false;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyUser)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategyUser,
-        ACE_TEXT ("IdAssignmentStrategyUser"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategyUser),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdAssignmentStrategyUser,
+  TAO::Portable_Server::IdAssignmentStrategyUser)
+
+ACE_STATIC_SVC_DEFINE (
+  IdAssignmentStrategyUser,
+  ACE_TEXT ("IdAssignmentStrategyUser"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdAssignmentStrategyUser),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
index f202c12c6ad..f3560cef1d5 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
@@ -14,15 +14,17 @@
 #define TAO_IDASSIGNMENTSTRATEGYUSER_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -35,11 +37,13 @@ namespace TAO
 
       virtual bool has_system_id (void) const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IDASSIGNMENTSTRATEGYUSER_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index 7dc969af49c..03a206a6301 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,10 +1,12 @@
-#include "IdUniquenessPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/IdUniquenessPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessPolicy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,3 +64,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index 3064d77924a..20e641bc3bf 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdUniquenessPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,6 +30,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -65,6 +67,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
index 110ee6471f0..5175cb16d30 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
index 49e84fb2d7e..a11afa6fd24 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -34,9 +34,10 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
-#include "IdUniquenessPolicyA.h"
+#include "tao/PortableServer/IdUniquenessPolicyA.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -110,3 +111,5 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
index 22d04465329..547e53a5073 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "IdUniquenessPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -65,6 +67,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
index 340160fd2fc..a8064c3f8c2 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "IdUniquenessPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -109,18 +111,18 @@ PortableServer::IdUniquenessPolicy::_unchecked_narrow (
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::IdUniquenessPolicy::_tao_release (IdUniquenessPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -179,11 +181,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::IdUniquenessPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
index dbdeb5d2ed6..c706c285feb 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
index bdb2f08e182..de0fb20c737 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -14,15 +14,17 @@
 #define TAO_ID_UNIQUENESS_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Policy_Strategy.h"
-#include "IdUniquenessPolicyC.h"
-#include "PS_ForwardC.h"
+#include "tao/PortableServer/Policy_Strategy.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "tao/PortableServer/PS_ForwardC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -48,5 +50,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ID_UNIQUENESS_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
index c4c28dd26e4..b3f973ef19f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "StrategyFactory.h"
-#include "IdUniquenessPolicyC.h"
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -45,5 +47,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index 7a9aae6ed11..47530f5a9a9 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "IdUniquenessStrategyFactoryImpl.h"
-#include "IdUniquenessStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -79,15 +81,20 @@ namespace TAO
       }
     }
 
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyFactoryImpl,
-        ACE_TEXT ("IdUniquenessStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyFactoryImpl)
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  IdUniquenessStrategyFactoryImpl,
+  ACE_TEXT ("IdUniquenessStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdUniquenessStrategyFactoryImpl,
+  TAO::Portable_Server::IdUniquenessStrategyFactoryImpl)
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
index 88d453a4a59..8846237437d 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "IdUniquenessStrategyFactory.h"
+#include "tao/PortableServer/IdUniquenessStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -39,11 +41,13 @@ namespace TAO
         IdUniquenessStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 19b94296166..d1071f1470c 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "IdUniquenessStrategyMultiple.h"
+#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
 
 ACE_RCSID (PortableServer,
            Id_Uniqueness_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -45,15 +48,20 @@ namespace TAO
       return ::PortableServer::MULTIPLE_ID;
     }
 
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyMultiple)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyMultiple,
-        ACE_TEXT ("IdUniquenessStrategyMultiple"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdUniquenessStrategyMultiple,
+  TAO::Portable_Server::IdUniquenessStrategyMultiple)
+
+ACE_STATIC_SVC_DEFINE (
+  IdUniquenessStrategyMultiple,
+  ACE_TEXT ("IdUniquenessStrategyMultiple"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index e706f0e7b87..f3c2e405447 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -14,15 +14,17 @@
 #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdUniquenessStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -44,10 +46,14 @@ namespace TAO
       virtual ::PortableServer::IdUniquenessPolicyValue type() const;
     };
 
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index b612a8ffb4d..3c5516d4956 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
-#include "IdUniquenessStrategyUnique.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
+#include "tao/PortableServer/Root_POA.h"
 
 ACE_RCSID (PortableServer,
            Id_Uniqueness_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -57,15 +60,20 @@ namespace TAO
       return ::PortableServer::UNIQUE_ID;
     }
 
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUnique)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyUnique,
-        ACE_TEXT ("IdUniquenessStrategyUnique"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyUnique),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdUniquenessStrategyUnique,
+  TAO::Portable_Server::IdUniquenessStrategyUnique)
+
+ACE_STATIC_SVC_DEFINE (
+  IdUniquenessStrategyUnique,
+  ACE_TEXT ("IdUniquenessStrategyUnique"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdUniquenessStrategyUnique),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index 7af8890f475..58bbf096de5 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -14,15 +14,17 @@
 #define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IdUniquenessStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -50,10 +52,14 @@ namespace TAO
       TAO_Root_POA* poa_;
     };
 
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index 77b597e30c9..b29178c143f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "IdUniquenessStrategyUniqueFactoryImpl.h"
-#include "IdUniquenessStrategyUnique.h"
+#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
+#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessStrategyUniqueFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -46,16 +48,21 @@ namespace TAO
       delete strategy;
     }
 
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyUniqueFactoryImpl,
-        ACE_TEXT ("IdUniquenessStrategyUniqueFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUniqueFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  IdUniquenessStrategyUniqueFactoryImpl,
+  ACE_TEXT ("IdUniquenessStrategyUniqueFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdUniquenessStrategyUniqueFactoryImpl,
+  TAO::Portable_Server::IdUniquenessStrategyUniqueFactoryImpl)
+
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
index 927dda0a86b..721ae2a6eb9 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "IdUniquenessStrategyFactory.h"
+#include "tao/PortableServer/IdUniquenessStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -40,10 +42,14 @@ namespace TAO
         ACE_ENV_ARG_DECL);
     };
 
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
index 379a7696117..c5a9d148f85 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -1,19 +1,21 @@
-// @(#) $Id$
+// $Id$
 
-#include "ImR_Client_Adapter.h"
+#include "tao/PortableServer/ImR_Client_Adapter.h"
 
 ACE_RCSID (tao,
            ImR_Client_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-
     ImR_Client_Adapter::~ImR_Client_Adapter (void)
     {
     }
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
index 019cc333669..e5b55bd6077 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,8 @@
 #include "tao/orbconf.h"
 #include "tao/Environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Root_POA;
 
 namespace TAO
@@ -57,5 +59,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IMR_CLIENT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 940a0f05b18..3c968d993da 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,5 +1,5 @@
-#include "ImplicitActivationPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/ImplicitActivationPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationPolicy,
@@ -7,6 +7,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -64,4 +66,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index 6e9f11bea63..ee7f98bbbe5 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,6 +32,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -67,6 +69,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
index 9a5351cac56..976c399bc02 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
index dbf3b01f052..e9cf1e13d1c 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
@@ -30,7 +30,7 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ImplicitActivationPolicyA.h"
+#include "tao/PortableServer/ImplicitActivationPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -111,4 +113,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
index 70e35ef75ac..1445a5a68a6 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -65,6 +67,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
index 825dd9af720..e775416377f 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -111,18 +113,18 @@ PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ImplicitActivationPolicy::_tao_release (ImplicitActivationPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,13 +183,15 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ImplicitActivationPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
index 82f509d1bd9..baad7fbbbbc 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -235,6 +237,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index 0e1e4d3002e..f2761572e36 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,11 +1,13 @@
 // -*- C++ -*-
 
-#include "ImplicitActivationStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -26,3 +28,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
index fbdaf2cab52..22ca61b5cbf 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -14,12 +14,14 @@
 #define TAO_ACTIVATION_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -37,5 +39,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ACTIVATION_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 55f3a61fcef..09ca4fb613e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,11 +1,13 @@
 // -*- C++ -*-
 
-#include "ImplicitActivationStrategyExplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyExplicit,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -15,17 +17,22 @@ namespace TAO
     {
       return false;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit)
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyExplicit,
-        ACE_TEXT ("ImplicitActivationStrategyExplicit"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ImplicitActivationStrategyExplicit,
+  TAO::Portable_Server::ImplicitActivationStrategyExplicit)
+
+ACE_STATIC_SVC_DEFINE (
+  ImplicitActivationStrategyExplicit,
+  ACE_TEXT ("ImplicitActivationStrategyExplicit"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
index 0e03d29c584..af9e70e931e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
@@ -14,15 +14,17 @@
 #define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ImplicitActivationStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -33,11 +35,14 @@ namespace TAO
     public:
       virtual bool allow_implicit_activation (void) const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
index 48ed323d19d..f5d1a8aa5f4 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "StrategyFactory.h"
-#include "ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -44,5 +46,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index ef3916e288a..0fa7771687c 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "ImplicitActivationStrategyFactoryImpl.h"
+#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "ImplicitActivationStrategyImplicit.h"
-#include "ImplicitActivationStrategyExplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -52,17 +54,22 @@ namespace TAO
     {
       // Noop because both types are singletons
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyFactoryImpl)
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyFactoryImpl,
-        ACE_TEXT ("ImplicitActivationStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ImplicitActivationStrategyFactoryImpl,
+  TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl)
+
+
+ACE_STATIC_SVC_DEFINE (
+  ImplicitActivationStrategyFactoryImpl,
+  ACE_TEXT ("ImplicitActivationStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
index 90ff9ea0a63..6b9e87ef7f3 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
@@ -14,14 +14,17 @@
 #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "ImplicitActivationStrategyFactory.h"
+#include "tao/PortableServer/ImplicitActivationStrategyFactory.h"
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -39,11 +42,13 @@ namespace TAO
         ImplicitActivationStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index dbc91745bf1..551d6f45bdf 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,11 +1,14 @@
 // -*- C++ -*-
 
-#include "ImplicitActivationStrategyImplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyImplicit,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -15,17 +18,22 @@ namespace TAO
     {
       return true;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyImplicit)
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyImplicit,
-        ACE_TEXT ("ImplicitActivationStrategyImplicit"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyImplicit),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ImplicitActivationStrategyImplicit,
+  TAO::Portable_Server::ImplicitActivationStrategyImplicit)
+
+ACE_STATIC_SVC_DEFINE (
+  ImplicitActivationStrategyImplicit,
+  ACE_TEXT ("ImplicitActivationStrategyImplicit"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ImplicitActivationStrategyImplicit),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
index 766d0aff4cb..92f9feab992 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -14,15 +14,17 @@
 #define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ImplicitActivationStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -33,11 +35,14 @@ namespace TAO
     public:
       virtual bool allow_implicit_activation (void) const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index 0765402e755..9263e4470fc 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Key_Adapters.h"
+#include "tao/PortableServer/Key_Adapters.h"
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -10,7 +10,9 @@ ACE_RCSID (PortableServer,
            Key_Adapters,
            "$Id$")
 
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
   : counter_ (0)
@@ -146,4 +148,5 @@ TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modif
   return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index a7f8e544b5c..ac5881a10fa 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -15,17 +15,21 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PS_ForwardC.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Active_Map_Manager_Key;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-////////////////////////////////////////////////////////////////////////////////
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+///////////////////////////////////////////////////////////////////////////////
 
 /**
  * @class TAO_Incremental_Key_Generator
@@ -116,7 +120,9 @@ public:
               PortableServer::ObjectId &original_key);
 };
 
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index 377b34fedd6..f3eb4894a21 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -1,10 +1,12 @@
-#include "LifespanPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/LifespanPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            LifespanPolicy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,3 +64,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 8d6f3aafc10..eb0de5aae3c 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_POA_LIFESPANPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "LifespanPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,6 +30,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -65,6 +67,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl
index 428503d0157..6ab38f36c71 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.pidl
+++ b/TAO/tao/PortableServer/LifespanPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_
 #define _PORTABLESERVER_LIFESPANPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
index bfee89df475..ee1706bf526 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -30,12 +30,14 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "LifespanPolicyA.h"
+#include "tao/PortableServer/LifespanPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -108,3 +110,5 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h
index cd12e1ef5b5..645805dbec9 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.h
+++ b/TAO/tao/PortableServer/LifespanPolicyA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "LifespanPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -65,6 +67,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
index 832e35bf202..050481e60d5 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "LifespanPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -60,7 +62,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
     PortableServer::LifespanPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::LifespanPolicy_ptr
@@ -109,18 +111,18 @@ PortableServer::LifespanPolicy::_unchecked_narrow (
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::LifespanPolicy::_tao_release (LifespanPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -179,11 +181,13 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::LifespanPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
index 3213dce6668..30753638f7f 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.h
+++ b/TAO/tao/PortableServer/LifespanPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
index 42bec436226..aea66e7161c 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -9,12 +9,14 @@
  */
 //=============================================================================
 
-#include "LifespanStrategy.h"
+#include "tao/PortableServer/LifespanStrategy.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -47,3 +49,4 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
index 047427364ca..895c20335d8 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -14,15 +14,17 @@
 #define TAO_PORTABLESERVER_LIFESPANPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "LifespanPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
 #include "tao/Object_KeyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -81,5 +83,7 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_LIFESPANPOLICY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h
index ca53f9f58e0..085e2c75228 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactory.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "StrategyFactory.h"
-#include "LifespanPolicyC.h"
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -45,5 +47,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 8f2fe097b6e..07e24aebc59 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "LifespanStrategyFactoryImpl.h"
-#include "LifespanStrategy.h"
+#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -80,17 +82,20 @@ namespace TAO
         }
       }
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyFactoryImpl,
-        ACE_TEXT ("LifespanStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  LifespanStrategyFactoryImpl,
+  ACE_TEXT ("LifespanStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  LifespanStrategyFactoryImpl,
+  TAO::Portable_Server::LifespanStrategyFactoryImpl)
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
index 273a11a9d0f..e0ece8266bb 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
+#include "tao/PortableServer/LifespanStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -40,11 +42,14 @@ namespace TAO
         LifespanStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 5e40ac9785a..6b2e3420c14 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,19 +1,21 @@
 // -*- C++ -*-
 
-#include "LifespanStrategyPersistent.h"
+#include "tao/PortableServer/LifespanStrategyPersistent.h"
 
 ACE_RCSID (PortableServer,
            Lifespan_Strategy,
            "$Id$")
 
-#include "Root_POA.h"
-#include "POAManager.h"
-#include "ImR_Client_Adapter.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POAManager.h"
+#include "tao/PortableServer/ImR_Client_Adapter.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -153,3 +155,5 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
index 00ea12a2e5c..01634563c72 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
@@ -14,7 +14,7 @@
 #define TAO_LIFESPANSTRATEGYPERSISTENT_H
 #include /**/ "ace/pre.h"
 
-#include "LifespanStrategy.h"
+#include "tao/PortableServer/LifespanStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +22,8 @@
 
 #include "tao/Object_KeyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ServerObject_i;
 
 namespace TAO
@@ -65,5 +67,7 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LIFESPANSTRATEGYPERSISTENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 1396342b549..ab24406bf5f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "LifespanStrategyPersistentFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "LifespanStrategyPersistent.h"
+#include "tao/PortableServer/LifespanStrategyPersistent.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -45,17 +47,21 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyPersistentFactoryImpl,
-        ACE_TEXT ("LifespanStrategyPersistentFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyPersistentFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  LifespanStrategyPersistentFactoryImpl,
+  ACE_TEXT ("LifespanStrategyPersistentFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  LifespanStrategyPersistentFactoryImpl,
+  TAO::Portable_Server::LifespanStrategyPersistentFactoryImpl)
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
index a51984d8a51..b32a3c63440 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
@@ -14,14 +14,16 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
+#include "tao/PortableServer/LifespanStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -40,11 +42,14 @@ namespace TAO
         LifespanStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index 267707e0f75..d1859883dac 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "LifespanStrategyTransient.h"
+#include "tao/PortableServer/LifespanStrategyTransient.h"
 
 ACE_RCSID (PortableServer,
            Lifespan_Strategy,
@@ -8,10 +8,12 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_string.h"
-#include "POAManager.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/POAManager.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Constants.h"
-#include "Creation_Time.h"
+#include "tao/PortableServer/Creation_Time.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -113,3 +115,4 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
index 2b89e8b6c91..6638973712f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -14,15 +14,17 @@
 #define TAO_LIFESPANSTRATEGYTRANSIENT_H
 #include /**/ "ace/pre.h"
 
-#include "LifespanStrategy.h"
+#include "tao/PortableServer/LifespanStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Creation_Time.h"
+#include "tao/PortableServer/Creation_Time.h"
 #include "tao/Object_KeyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,5 +64,7 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LIFESPANSTRATEGYTRANSIENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index c9a01858ca7..896745f0846 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "LifespanStrategyTransientFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "LifespanStrategyTransient.h"
+#include "tao/PortableServer/LifespanStrategyTransient.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -45,17 +47,22 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyTransientFactoryImpl,
-        ACE_TEXT ("LifespanStrategyTransientFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyTransientFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  LifespanStrategyTransientFactoryImpl,
+  ACE_TEXT ("LifespanStrategyTransientFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  LifespanStrategyTransientFactoryImpl,
+  TAO::Portable_Server::LifespanStrategyTransientFactoryImpl)
+
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
index 5cd7ad9483b..e3a8c076934 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
@@ -12,16 +12,19 @@
 
 #ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
+
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
+#include "tao/PortableServer/LifespanStrategyFactory.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -40,11 +43,15 @@ namespace TAO
         LifespanStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
+
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
index 319d5d22acf..007b1ca5e05 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp
@@ -8,9 +8,11 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "Local_Servant_Base.inl"
+# include "tao/PortableServer/Local_Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
                                   void *
@@ -18,3 +20,5 @@ TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
 {
   ACE_THROW (CORBA::BAD_OPERATION ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
index 6c624d77d01..dd3d9447932 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ b/TAO/tao/PortableServer/Local_Servant_Base.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Local_ServantBase
  *
@@ -39,7 +41,7 @@ class TAO_PortableServer_Export TAO_Local_ServantBase
   : public virtual TAO_ServantBase
 {
 protected:
-  /// This is an auxiliar method for _this().  Make sure *not* to
+  /// This is an auxiliary method for _this().  Make sure *not* to
   /// register with the default POA.
   TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
@@ -49,8 +51,10 @@ protected:
                   ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Local_Servant_Base.inl"
+# include "tao/PortableServer/Local_Servant_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl
index 4a426bdaa07..f811de25b9f 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ b/TAO/tao/PortableServer/Local_Servant_Base.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Stub *
 TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index c4ac484a1c5..2660f700538 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "Non_Servant_Upcall.h"
-#include "Object_Adapter.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Root_POA.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Non_Servant_Upcall.inl"
+# include "tao/PortableServer/Non_Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            Non_Servant_Upcall,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -90,3 +92,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
index 98f3eec8ec3..92b05194d9d 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 class TAO_Root_POA;
 class TAO_Object_Adapter;
@@ -58,14 +62,16 @@ namespace TAO
     protected:
 
       TAO_Object_Adapter &object_adapter_;
-      ::TAO_Root_POA &poa_;
+      TAO_Root_POA &poa_;
       Non_Servant_Upcall *previous_;
     };
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Non_Servant_Upcall.inl"
+# include "tao/PortableServer/Non_Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
index 75e0ae843af..0a9b6f2e8de 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -14,3 +16,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp
deleted file mode 100644
index 5c918bb1a4b..00000000000
--- a/TAO/tao/PortableServer/ORT_Adapter.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-#include "ORT_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(PortableServer,
-          ORT_Adapter,
-          "$Id$")
-
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 8483a3ee8b3..34d89eb42db 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,17 +14,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # 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"
-#include "tao/PI_ForwardC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -110,5 +111,7 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ORT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index b64dec61851..7d4a85297b8 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
-#include "ORT_Adapter_Factory.h"
-#include "ace/Dynamic_Service.h"
+#include "tao/PortableServer/ORT_Adapter_Factory.h"
 
 ACE_RCSID (PortableServer,
            ORT_Adapter_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ORT_Adapter_Factory::~ORT_Adapter_Factory (void)
@@ -14,3 +15,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
index 9295cdbed41..d5c7570f93f 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,14 +16,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
 #include "ace/Service_Object.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class ORT_Adapter;
@@ -64,6 +67,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORT_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 6ad3cc7ad62..224b531864f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
 // -- PortableServer Include --
-#include "Object_Adapter.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "Root_POA.h"
-#include "Regular_POA.h"
-#include "Creation_Time.h"
-#include "POA_Guard.h"
-#include "Default_Servant_Dispatcher.h"
-#include "Collocated_Object_Proxy_Broker.h"
-#include "POAManager.h"
-#include "Servant_Base.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Regular_POA.h"
+#include "tao/PortableServer/Creation_Time.h"
+#include "tao/PortableServer/POA_Guard.h"
+#include "tao/PortableServer/Default_Servant_Dispatcher.h"
+#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
+#include "tao/PortableServer/POAManager.h"
+#include "tao/PortableServer/Servant_Base.h"
 
 // -- ACE Include --
 #include "ace/Auto_Ptr.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
 
 // -- TAO Include --
 #include "tao/PortableInterceptorC.h"
@@ -34,18 +36,16 @@
 #include "tao/ServerRequestInterceptor_Adapter.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Object_Adapter.i"
+# include "tao/PortableServer/Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/OS_NS_string.h"
-
-#include "ThreadPolicy.h"
-#include "LifespanPolicy.h"
-#include "IdAssignmentPolicy.h"
-#include "IdUniquenessPolicy.h"
-#include "ImplicitActivationPolicy.h"
-#include "RequestProcessingPolicy.h"
-#include "ServantRetentionPolicy.h"
+#include "tao/PortableServer/ThreadPolicy.h"
+#include "tao/PortableServer/LifespanPolicy.h"
+#include "tao/PortableServer/IdAssignmentPolicy.h"
+#include "tao/PortableServer/IdUniquenessPolicy.h"
+#include "tao/PortableServer/ImplicitActivationPolicy.h"
+#include "tao/PortableServer/RequestProcessingPolicy.h"
+#include "tao/PortableServer/ServantRetentionPolicy.h"
 
 ACE_RCSID (PortableServer,
            Object_Adapter,
@@ -99,6 +99,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /* static */
 CORBA::ULong TAO_Object_Adapter::transient_poa_name_size_ = 0;
 
@@ -164,7 +166,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
   new_hint_strategy->object_adapter (this);
 
-  persistent_poa_name_map *ppnm;
+  persistent_poa_name_map *ppnm = 0;
   switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
     {
     case TAO_LINEAR:
@@ -294,7 +296,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 #if defined (ACE_HAS_THREADS)
   if (enable_locking)
     {
-      ACE_Lock *the_lock;
+      ACE_Lock *the_lock = 0;
       ACE_NEW_RETURN (the_lock,
                       ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
                       0);
@@ -305,7 +307,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
   ACE_UNUSED_ARG (thread_lock);
 #endif /* ACE_HAS_THREADS */
 
-  ACE_Lock *the_lock;
+  ACE_Lock *the_lock = 0;
   ACE_NEW_RETURN (the_lock,
                   ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                   0);
@@ -355,9 +357,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   {
     ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
 
-    servant_upcall.servant ()->_dispatch (req,
-                                          &servant_upcall
-                                          ACE_ENV_ARG_PARAMETER);
+    do_dispatch (req, servant_upcall ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (result);
   }
 
@@ -371,9 +371,9 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 ACE_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
+  CORBA::Boolean is_root = false;
+  CORBA::Boolean is_persistent = false;
+  CORBA::Boolean is_system_id = false;
   TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
 
   int result = 0;
@@ -382,12 +382,12 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
     ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
 
     result = TAO_Root_POA::parse_key (key,
-                                 poa_system_name,
-                                 system_id,
-                                 is_root,
-                                 is_persistent,
-                                 is_system_id,
-                                 poa_creation_time);
+                                      poa_system_name,
+                                      system_id,
+                                      is_root,
+                                      is_persistent,
+                                      is_system_id,
+                                      poa_creation_time);
   }
 
   if (result != 0)
@@ -406,7 +406,8 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
   }
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2,
+                                        CORBA::COMPLETED_NO));
 }
 
 int
@@ -697,7 +698,7 @@ TAO_Object_Adapter::close (int wait_for_completion
                  wait_for_completion
                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::release (root);
+  ::CORBA::release (root);
 }
 
 void
@@ -741,7 +742,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
         {
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
           CORBA::OctetSeq_var ocs;
-          sri_adapter.tao_ft_interception_point (request,
+          sri_adapter->tao_ft_interception_point (request,
                                                  0,  // args
                                                  0,  // nargs
                                                  0,  // servant_upcall
@@ -883,7 +884,8 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
   stub->servant_orb (this->orb_core_.orb ());
 
   // It is ok to create a collocated object even when <sb> is
-  // zero.
+  // zero. This constructor will set the stub collocated indicator and
+  // the strategized proxy broker if required.
   CORBA::Object_ptr x;
   ACE_NEW_RETURN (x,
                   CORBA::Object (stub,
@@ -891,20 +893,16 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
                                  sb),
                   CORBA::Object::_nil ());
 
-  // Here we set the strategized Proxy Broker.
-  x->_proxy_broker (the_tao_collocated_object_proxy_broker ());
-
   // Success.
   return x;
 }
 
 CORBA::Long
-TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub,
-                                                  CORBA::Object_ptr obj)
+TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub)
 {
-  // @@ What about forwarding.  With this approach we are never
-  //    forwarded  when we use collocation!
-  const TAO_MProfile &mp = stub->base_profiles ();
+  // If we have been forwarded: use the forwarded profiles
+  const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ())
+                                                     : stub->base_profiles ();
 
   TAO_ServantBase *sb = this->get_collocated_servant (mp);
 
@@ -914,13 +912,14 @@ TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub,
 
   // It is ok to set the object as a collocated object even when
   // <sb> is zero.
-  obj->set_collocated_servant (sb);
+  stub->collocated_servant (sb);
 
-  // Here we set the strategized Proxy Broker.
-  obj->_proxy_broker (the_tao_collocated_object_proxy_broker ());
+  // Mark the stub as collocated. This will set the strategized object
+  // proxy broker if required.
+  stub->is_collocated (true);
 
-  // Success.
-  return 0;
+  // Return 0 (success) iff we found a servant.
+  return ! sb;
 }
 
 TAO_ServantBase *
@@ -1242,3 +1241,15 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
   this->servant_dispatcher_ = dispatcher;
 }
 
+void
+TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req,
+                                 TAO::Portable_Server::Servant_Upcall& upcall
+                                 ACE_ENV_ARG_DECL)
+{
+  upcall.servant ()->_dispatch(req,
+                               &upcall
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index a3605dc2f11..edcdda83bc7 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -15,17 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Key_Adapters.h"
-#include "poa_macros.h"
-#include "Servant_Location.h"
-#include "Default_Policy_Validator.h"
-#include "POA_Policy_Set.h"
+#include "tao/PortableServer/Key_Adapters.h"
+#include "tao/PortableServer/poa_macros.h"
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/Default_Policy_Validator.h"
+#include "tao/PortableServer/POA_Policy_Set.h"
 
 #include "tao/Adapter.h"
 #include "tao/Adapter_Factory.h"
@@ -36,13 +36,15 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Map_T.h"
 
-#include "Servant_Location.h"
+#include "tao/PortableServer/Servant_Location.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Root_POA;
 class TAO_POA_Manager;
 class TAO_TSS_Resources;
@@ -170,8 +172,7 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
 
 protected:
 
@@ -217,6 +218,10 @@ protected:
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
 
+  virtual void do_dispatch (TAO_ServerRequest& req,
+                            TAO::Portable_Server::Servant_Upcall& upcall
+                            ACE_ENV_ARG_DECL);
+
 public:
 
   /**
@@ -407,7 +412,7 @@ public:
    *
    * @brief Iterator for a folded poa name.
    */
-  class TAO_PortableServer_Export poa_name_iterator
+  class poa_name_iterator
   {
   public:
 
@@ -439,7 +444,7 @@ public:
    *
    * @brief This class allows iteration over a folded poa name.
    */
-  class TAO_PortableServer_Export iteratable_poa_name
+  class iteratable_poa_name
   {
   public:
 
@@ -497,12 +502,14 @@ private:
   TAO_POA_Policy_Set default_poa_policies_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "Object_Adapter.i"
+# include "tao/PortableServer/Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index ae4008bcc17..2fe048e9a5e 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -4,6 +4,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_Policy_Validator &
 TAO_Object_Adapter::validator (void)
 {
@@ -165,3 +167,4 @@ TAO_Object_Adapter::non_servant_upcall_in_progress (void) const
   return this->non_servant_upcall_in_progress_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
index 81bc1d4b47b..0e2859d333c 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "Object_Adapter_Factory.h"
-#include "Object_Adapter.h"
+#include "tao/PortableServer/Object_Adapter_Factory.h"
+#include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
 
-TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter*
 TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
@@ -20,6 +18,8 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   return adapter;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory,
                        ACE_TEXT ("TAO_Object_Adapter_Factory"),
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h
index 460fb242519..77266900e27 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,18 +24,20 @@
 #include "tao/Adapter_Factory.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableServer_Export TAO_Object_Adapter_Factory
   : public TAO_Adapter_Factory
 {
 public:
-  /// Constructor
-  TAO_Object_Adapter_Factory (void);
 
   // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
   // details.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
 
diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h
index 1e60217f11d..9f88d1f0970 100644
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Object_SArg_Traits.h
@@ -26,6 +26,8 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -51,6 +53,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_OBJECT_SARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index 2146062474a..598619694c6 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/Object_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S_ptr,
          typename S_var,
@@ -119,4 +120,6 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_OBJECT_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index 733beda2955..fd9a6cae8bc 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This set of classes is also used by valuetype arguments. If the
 // specialization is done using S * for the parameter, the semantics
 // are the same as for interfaces, so there's no need for another
@@ -158,6 +160,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Object_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
index a202807a59d..6fcb78ff824 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S_ptr,
          typename S_var,
          typename Insert_Policy>
@@ -77,3 +79,5 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 4d8d3308e46..bf8be18d80d 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "Operation_Table.h"
+#include "tao/PortableServer/Operation_Table.h"
 #include "tao/ORB.h"
 
 ACE_RCSID(PortableServer,
           Operation_Table,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // destructor
 TAO_Operation_Table::~TAO_Operation_Table (void)
 {
@@ -15,8 +17,9 @@ TAO_Operation_Table::~TAO_Operation_Table (void)
 /**************************************************************/
 TAO::Operation_Skeletons::Operation_Skeletons (void)
   : skel_ptr (0)
-    , thruPOA_skel_ptr (0)
-    , direct_skel_ptr (0)
+  , thruPOA_skel_ptr (0)
+  , direct_skel_ptr (0)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index 2301d7929f6..d573d2c9f8e 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +24,8 @@
 #include "tao/Object.h"
 #include "tao/Collocation_Strategy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ServerRequest;
 class TAO_Abstract_ServantBase;
 
@@ -69,6 +71,7 @@ struct TAO_operation_db_entry
   TAO_Collocated_Skeleton direct_skel_ptr;
 };
 
+// --------------------------
 
 namespace TAO
 {
@@ -130,5 +133,7 @@ public:
   virtual ~TAO_Operation_Table (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_OPTABLE_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index 12ff4cf608e..0df9e27630a 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Operation_Table_Binary_Search.h"
+#include "tao/PortableServer/Operation_Table_Binary_Search.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,10 +29,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-
-TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
 {
@@ -57,7 +54,6 @@ TAO_Binary_Search_OpTable::find (const char *opname,
   return 0;
 }
 
-
 int
 TAO_Binary_Search_OpTable::find (const char *opname,
                                  TAO_Collocated_Skeleton &skelfunc,
@@ -87,8 +83,9 @@ TAO_Binary_Search_OpTable::find (const char *opname,
 
 int
 TAO_Binary_Search_OpTable::bind (const char *,
-                                 const TAO::Operation_Skeletons )
+                                 const TAO::Operation_Skeletons)
 {
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
index 107be238432..1d8d0a11c02 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Operation_Table.h"
+#include "tao/PortableServer/Operation_Table.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Binary_Search_OpTable
@@ -38,8 +40,6 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable
   : public TAO_Operation_Table
 {
 public:
-  /// Do nothing constructor.
-  TAO_Binary_Search_OpTable (void);
 
   /// Do nothing destrctor.
   virtual ~TAO_Binary_Search_OpTable (void);
@@ -63,5 +63,7 @@ private:
   virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_OPERATION_TABLE_BINARY_SEARCH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index feea6d0d7e9..21a206d9fba 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Operation_Table_Dynamic_Hash.h"
+#include "tao/PortableServer/Operation_Table_Dynamic_Hash.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,6 +29,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // constructor
 TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (
   TAO_operation_db_entry const * db,
@@ -128,3 +130,4 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname,
   return retval;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
index a16c3a3acb3..40973757eba 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,17 +15,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Operation_Table.h"
+#include "tao/PortableServer/Operation_Table.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Dynamic_Hash_OpTable
  *
@@ -76,5 +78,7 @@ private:
   OP_MAP_MANAGER hash_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_OPERATION_TABLE_DYNAMIC_HASH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 277f0f35269..0ad27a2c2c8 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Operation_Table_Linear_Search.h"
+#include "tao/PortableServer/Operation_Table_Linear_Search.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -31,9 +31,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 /***************************************************************/
 
-TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void)
 {
@@ -92,4 +90,4 @@ TAO_Linear_Search_OpTable::find (const char *opname,
   return 0;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
index f2055d753d3..1f26bc71a2f 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Operation_Table.h"
+#include "tao/PortableServer/Operation_Table.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Linear_Search_OpTable
@@ -34,8 +36,6 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable
 {
 public:
   // = Initialization and termination methods.
-  /// Default constructor.
-  TAO_Linear_Search_OpTable (void);
 
   /// Destructor.
   ~TAO_Linear_Search_OpTable (void);
@@ -59,5 +59,7 @@ private:
   virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_OPERATION_TABLE_LINEAR_SEARCH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 5a6b950399f..d4a44d9cb18 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Operation_Table_Perfect_Hash.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,10 +29,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-// Do nothing constructor.
-TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Do nothing destrctor.
 TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
@@ -103,3 +100,4 @@ TAO_Perfect_Hash_OpTable::bind (const char *,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
index 5c60c7ad69f..00338dcc2c7 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Operation_Table.h"
+#include "tao/PortableServer/Operation_Table.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Perfect_Hash_OpTable
@@ -39,8 +41,6 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
   : public TAO_Operation_Table
 {
 public:
-  /// Do nothing constructor.
-  TAO_Perfect_Hash_OpTable (void);
 
   /// Do nothing destrctor.
   virtual ~TAO_Perfect_Hash_OpTable (void);
@@ -68,6 +68,7 @@ private:
                                                 unsigned int len) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_OPERATION_TABLE_PERFECT_HASH_H */
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 539f5d0cd9d..8a8055d8c23 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "POAManager.h"
-#include "Root_POA.h"
-#include "poa_macros.h"
+#include "tao/PortableServer/POAManager.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/poa_macros.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/IORInterceptor_Adapter.h"
 
 #if !defined (__ACE_INLINE__)
-# include "POAManager.i"
+# include "tao/PortableServer/POAManager.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            POAManager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
   : state_ (PortableServer::POAManager::HOLDING),
     lock_ (object_adapter.lock ()),
@@ -51,6 +53,15 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
   else
     {
       this->state_ = PortableServer::POAManager::ACTIVE;
+      // Find the poas that applied the custom servant dispatching
+      // strategy to launch the dispatching threads.
+
+      for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
+       iterator != this->poa_collection_.end ();
+       ++iterator)
+        {
+          (*iterator)->poa_activated_hook ();
+        }
     }
 
   this->adapter_manager_state_changed (this->state_
@@ -117,6 +128,10 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
        ++iterator)
     {
       TAO_Root_POA *poa = *iterator;
+      // Notify the poas that applied the custom servant dispatching
+      // strategy to stop the dispatching threads.
+      poa->poa_deactivated_hook ();
+
       poa->deactivate_all_objects_i (etherealize_objects,
                                      wait_for_completion
                                      ACE_ENV_ARG_PARAMETER);
@@ -139,7 +154,8 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
                                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableInterceptor::AdapterState adapter_state = state;
+  PortableInterceptor::AdapterState adapter_state =
+    static_cast<PortableInterceptor::AdapterState> (state);
 
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->object_adapter_.orb_core ().ior_interceptor_adapter ();
@@ -287,7 +303,7 @@ TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
     {
       if (this->poa_collection_.is_empty ())
         {
-          CORBA::release (this);
+          ::CORBA::release (this);
         }
     }
 
@@ -376,3 +392,4 @@ TAO_POA_Manager::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 59dd117fcdf..056efb7578c 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -16,24 +16,20 @@
 #define TAO_POAMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "poa_macros.h"
-#include "POAManagerC.h"
+#include "tao/PortableServer/poa_macros.h"
+#include "tao/PortableServer/POAManagerC.h"
 
 // Local Object
 #include "tao/LocalObject.h"
 #include "tao/PI_ForwardC.h"
 #include "ace/Unbounded_Set.h"
 
-// Forward decl.
-class TAO_Root_POA;
-class TAO_Object_Adapter;
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -41,6 +37,13 @@ class TAO_Object_Adapter;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Forward decl.
+class TAO_Root_POA;
+class TAO_Object_Adapter;
+
+
 class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
   public TAO_Local_RefCounted_Object
@@ -154,12 +157,14 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "POAManager.i"
+# include "tao/PortableServer/POAManager.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index c38b1bd02ef..19adb23dd8f 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -5,6 +5,7 @@
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Lock &
 TAO_POA_Manager::lock (void)
@@ -127,3 +128,5 @@ TAO_POA_Manager::generate_manager_id (void) const
 
   return id;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index b29a3593b40..dde8fc49b7b 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -40,13 +40,15 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
-#include "POAManagerC.h"
+#include "tao/PortableServer/POAManagerC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -71,7 +73,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::release (
     PortableServer::POAManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::POAManager_ptr
@@ -89,7 +91,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -115,7 +117,7 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableSe
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -198,7 +200,7 @@ static TAO::TypeCode::Struct<char const *,
     "AdapterInactive",
     _tao_fields_PortableServer_POAManager_AdapterInactive,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
   &_tao_tc_PortableServer_POAManager_AdapterInactive;
 
@@ -211,7 +213,7 @@ static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
     "ACTIVE",
     "DISCARDING",
     "INACTIVE"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -222,7 +224,7 @@ static TAO::TypeCode::Enum<char const *,
     "State",
     _tao_enumerators_PortableServer_POAManager_State,
     4);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
   &_tao_tc_PortableServer_POAManager_State;
 
@@ -257,18 +259,18 @@ PortableServer::POAManager::_unchecked_narrow (
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_duplicate (POAManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::POAManager::_tao_release (POAManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -320,7 +322,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/POAManager:2.3",
     "POAManager");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAManager =
@@ -328,3 +330,4 @@ namespace PortableServer
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 83cbbebcc56..9d767071182 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -55,6 +55,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -314,6 +316,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 0cb18e988c3..76afbefadbc 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -1,23 +1,25 @@
-// @(#) $Id$
-
-#include "POA_Cached_Policies.h"
-#include "POA_Policy_Set.h"
-#include "IdAssignmentPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "RequestProcessingPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "ThreadPolicyC.h"
+// $Id$
+
+#include "tao/PortableServer/POA_Cached_Policies.h"
+#include "tao/PortableServer/POA_Policy_Set.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 
 #if !defined (__ACE_INLINE__)
-# include "POA_Cached_Policies.i"
+# include "tao/PortableServer/POA_Cached_Policies.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(PortableServer,
           POA_Cached_Policies,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -56,7 +58,7 @@ namespace TAO
 
     void
     Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                            ACE_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     {
 
     #if (TAO_HAS_MINIMUM_POA == 0)
@@ -160,3 +162,5 @@ namespace TAO
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 1c5efabd5d8..a756f101782 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -16,19 +16,21 @@
 #define TAO_POA_CACHED_POLICIES_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "IdAssignmentPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "RequestProcessingPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references.
 class TAO_POA_Policy_Set;
@@ -102,8 +104,10 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "POA_Cached_Policies.i"
+# include "tao/PortableServer/POA_Cached_Policies.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.i b/TAO/tao/PortableServer/POA_Cached_Policies.i
index ab12991fe6e..b3699fe3e7d 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.i
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -77,3 +81,5 @@ namespace TAO
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 09a8f02134c..a1e30c3faed 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -1,20 +1,18 @@
 // $Id$
 
 // -- PortableServer Include --
-#include "POA_Current.h"
-#include "POA_Current_Impl.h"
+#include "tao/PortableServer/POA_Current.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 // -- TAO Include --
 #include "tao/TSS_Resources.h"
 
-#if !defined (__ACE_INLINE__)
-# include "POA_Current.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (PortableServer,
            POA_Current,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -58,6 +56,18 @@ namespace TAO
       return impl->get_servant ();
     }
 
+    CORBA::Object_ptr
+    POA_Current::get_reference (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      POA_Current_Impl *impl = this->implementation ();
+
+      if (impl == 0)
+        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                          0);
+      return impl->get_reference ();
+    }
 
     POA_Current_Impl *
     POA_Current::implementation (void)
@@ -81,3 +91,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index a8e5583a101..4af15a2b241 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -15,20 +15,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/LocalObject.h"
 #include "tao/PortableServer/PS_CurrentC.h"
+#include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -36,12 +38,10 @@ namespace TAO
     class POA_Current_Impl;
 
     class TAO_PortableServer_Export POA_Current
-      : public PortableServer::Current,
-        public TAO_Local_RefCounted_Object
+      : public PortableServer::Current
+      , public TAO_Local_RefCounted_Object
     {
     public:
-      /// Constructor
-      POA_Current (void);
 
       /**
        * Returns the POA on which the current request is being invoked.
@@ -62,6 +62,19 @@ namespace TAO
                          PortableServer::Current::NoContext));
 
       /**
+       * This operation returns a locally manufactured reference to the object
+       * in the context of which it is called. If called outside the context
+       * of a POA dispatched operation, a NoContext exception is raised.
+       * @note This reference is not guaranteed to be identical to the original
+       * reference the client used to make the invocation, and calling the
+       * Object::is_equivalent operation to compare the two references may not
+       * necessarily return true.
+       */
+      CORBA::Object_ptr get_reference (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /**
        * 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
@@ -80,14 +93,12 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-# include "POA_Current.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_POA_CURRENT_H */
diff --git a/TAO/tao/PortableServer/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl
deleted file mode 100644
index 4b713846977..00000000000
--- a/TAO/tao/PortableServer/POA_Current.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE
-    POA_Current::POA_Current (void)
-    {
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index b32ba5f91b0..081147aad3c 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "POA_Current_Factory.h"
-#include "POA_Current.h"
+#include "tao/PortableServer/POA_Current_Factory.h"
+#include "tao/PortableServer/POA_Current.h"
 #include "tao/ORB_Core.h"
 
-TAO_POA_Current_Factory::TAO_POA_Current_Factory (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Object_ptr
 TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
@@ -22,6 +20,8 @@ TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
   return adapter;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_POA_Current_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_POA_Current_Factory,
                        ACE_TEXT ("TAO_POA_Current_Factory"),
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h
index c7cbb6d2e2a..6ef224d32fd 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.h
+++ b/TAO/tao/PortableServer/POA_Current_Factory.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,12 +24,12 @@
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableServer_Export TAO_POA_Current_Factory
   : public TAO_Object_Loader
 {
 public:
-  /// Constructor
-  TAO_POA_Current_Factory (void);
 
   /// Creates a PICurrent and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -39,6 +39,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_POA_Current_Factory)
 ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_POA_Current_Factory)
 
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index 3d51448e37f..1c1e81b55c2 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
 // -- PortableServer Include --
-#include "Object_Adapter.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Root_POA.h"
 
 #include "tao/TSS_Resources.h"
 
 #if !defined (__ACE_INLINE__)
-# include "POA_Current_Impl.inl"
+# include "tao/PortableServer/POA_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            POA_Current_IMpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -84,6 +86,12 @@ namespace TAO
       return objid;
     }
 
+    CORBA::Object_ptr
+    POA_Current_Impl::get_reference (void)
+    {
+      return this->poa_->id_to_reference (this->object_id_);
+    }
+
     PortableServer::Servant
     POA_Current_Impl::get_servant (void)
     {
@@ -99,3 +107,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
index 15bf03cb843..47f2a03994c 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PS_ForwardC.h"
+#include "tao/PortableServer/PS_ForwardC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -69,18 +71,22 @@ namespace TAO
       /**
        * Return pointer to the object id through which this was invoked.
        * This may be necessary in cases where a <Servant> is serving under
-       * the guise of multiple object ids.  This has _out semantics Raises
-       * the <CORBA::NoContext> exception.
+       * the guise of multiple object ids.
        */
       PortableServer::ObjectId *get_object_id (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
+       * context it is called.
        */
       PortableServer::Servant get_servant (void);
 
+      /**
+       * This operation returns a locally manufactured reference to the object
+       * in the context of which it is called.
+       */
+      CORBA::Object_ptr get_reference (void);
+
       /// Set the POA implementation.
       void poa (::TAO_Root_POA *);
 
@@ -130,6 +136,12 @@ namespace TAO
       void setup (::TAO_Root_POA *impl,
                   const TAO::ObjectKey &key);
 
+    private:
+
+      // = Hidden because we don't allow these
+      POA_Current_Impl (const POA_Current_Impl &);
+      void operator= (const POA_Current_Impl &);
+
     protected:
       /// The POA implementation invoking an upcall
       ::TAO_Root_POA *poa_;
@@ -159,15 +171,14 @@ namespace TAO
       /// Pointer to tss resources.
       TAO_TSS_Resources *tss_resources_;
 
-      // = Hidden because we don't allow these
-      POA_Current_Impl (const POA_Current_Impl &);
-      void operator= (const POA_Current_Impl &);
     };
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "POA_Current_Impl.inl"
+# include "tao/PortableServer/POA_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl
index 350d1cf820b..db220558ae6 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.inl
+++ b/TAO/tao/PortableServer/POA_Current_Impl.inl
@@ -4,6 +4,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -81,3 +83,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index cbf2eb0bba7..a2943714015 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-#include "POA_Guard.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/POA_Guard.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Constants.h"
 
 ACE_RCSID(PortableServer,
           POA_Guard,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -43,3 +46,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index a7347130783..da0f74dedae 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -1,27 +1,29 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
  *  @file    POA_Guard.h
  *
  *  $Id$
- *
  */
 //=============================================================================
 
 #ifndef TAO_POA_GUARD_H
 #define TAO_POA_GUARD_H
+
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Environment.h"
 #include "ace/Guard_T.h"
 #include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
 
@@ -49,5 +51,8 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_POA_GUARD_H */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index e0ee81f34e2..043020de869 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,23 +1,24 @@
 // @(#) $Id$
 
-#include "POA_Policy_Set.h"
-#include "POA_Cached_Policies.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/POA_Policy_Set.h"
+#include "tao/PortableServer/POA_Cached_Policies.h"
+#include "tao/PortableServer/PortableServer.h"
 
 #include "tao/Policy_Validator.h"
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-# include "POA_Policy_Set.i"
+# include "tao/PortableServer/POA_Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            POA_Policy_Set,
            "$Id$")
 
-TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
-  :
-    impl_ (TAO_POLICY_POA_SCOPE)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_POA_Policy_Set::TAO_POA_Policy_Set (void)
+  : impl_ (TAO_POLICY_POA_SCOPE)
 {
 }
 
@@ -89,3 +90,5 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 46fc0f4b5b7..182ad836a8f 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *   POA
- *
+ *  POA
  *
  *  @author  Irfan Pyarali
  */
@@ -17,7 +16,7 @@
 #define TAO_POA_POLICY_SET_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,13 +24,15 @@
 
 #include "tao/Policy_Set.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Policy_Validator;
 
 class TAO_PortableServer_Export TAO_POA_Policy_Set
 {
 public:
 
-  TAO_POA_Policy_Set ();
+  TAO_POA_Policy_Set (void);
 
   TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs);
 
@@ -72,8 +73,10 @@ protected:
   TAO_Policy_Set impl_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "POA_Policy_Set.i"
+# include "tao/PortableServer/POA_Policy_Set.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index fee42969600..4181baecf48 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_POA_Policy_Set::num_policies (void) const
 {
@@ -51,3 +55,5 @@ TAO_POA_Policy_Set::policies (void)
 {
   return this->impl_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl
index a1b7ab68b61..91bd07204c6 100644
--- a/TAO/tao/PortableServer/PS_Current.pidl
+++ b/TAO/tao/PortableServer/PS_Current.pidl
@@ -9,7 +9,7 @@
  * PS_CurrentC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -Sc -SS -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
@@ -21,8 +21,8 @@
 #define _PORTABLESERVER_CURRENT_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <Current.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/Current.pidl"
 
 #pragma prefix "omg.org"
 
@@ -43,6 +43,9 @@ module PortableServer
     ObjectId get_object_id ()
       raises (NoContext);
 
+    Object get_reference ()
+      raises (NoContext);
+
     Servant get_servant ()
       raises (NoContext);
   };
diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp
deleted file mode 100644
index 7142aaed13a..00000000000
--- a/TAO/tao/PortableServer/PS_CurrentA.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "PS_CurrentC.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_Current_NoContext = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_Current_NoContext (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/Current/NoContext:2.3",
-    "NoContext",
-    _tao_fields_PortableServer_Current_NoContext,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
-  &_tao_tc_PortableServer_Current_NoContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/Current:2.3",
-    "Current");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_PortableServer_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr _tao_elem
-  )
-{
-  PortableServer::Current_ptr _tao_objptr =
-    PortableServer::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::Current>::insert (
-      _tao_any,
-      PortableServer::Current::_tao_any_destructor,
-      PortableServer::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::Current>::extract (
-        _tao_any,
-        PortableServer::Current::_tao_any_destructor,
-        PortableServer::_tc_Current,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert_copy (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::Current::NoContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::extract (
-        _tao_any,
-        PortableServer::Current::NoContext::_tao_any_destructor,
-        PortableServer::Current::_tc_NoContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
index 92de45c9df6..e32c4f50884 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -26,20 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
-#include "PS_CurrentC.h"
+#include "tao/PortableServer/PS_CurrentC.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +71,7 @@ TAO::Objref_Traits<PortableServer::Current>::release (
     PortableServer::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::Current_ptr
@@ -73,20 +80,20 @@ TAO::Objref_Traits<PortableServer::Current>::nil (void)
   return PortableServer::Current::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableServer::Current>::marshal (
     PortableServer::Current_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::Current::NoContext::NoContext (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:omg.org/PortableServer/Current/NoContext:2.3",
         "NoContext"
       )
@@ -98,7 +105,7 @@ PortableServer::Current::NoContext::~NoContext (void)
 }
 
 PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -108,7 +115,7 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -120,28 +127,28 @@ void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_po
 }
 
 PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
+PortableServer::Current::NoContext::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<NoContext *> (_tao_excp);
 }
 
 const PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception const *_tao_excp)
+PortableServer::Current::NoContext::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const NoContext *> (_tao_excp);
 }
 
-CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
+::CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 PortableServer::Current::NoContext::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::PortableServer::Current::NoContext (*this),
@@ -160,7 +167,7 @@ void PortableServer::Current::NoContext::_tao_encode (
     ACE_ENV_ARG_DECL
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void PortableServer::Current::NoContext::_tao_decode (
@@ -168,32 +175,42 @@ void PortableServer::Current::NoContext::_tao_decode (
     ACE_ENV_ARG_DECL
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const
+::CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const
 {
   return ::PortableServer::Current::_tc_NoContext;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:89
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_Current_NoContext = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_Current_NoContext (
+    ::CORBA::tk_except,
+    "IDL:omg.org/PortableServer/Current/NoContext:2.3",
+    "NoContext",
+    _tao_fields_PortableServer_Current_NoContext,
+    0);
+
+::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
+  &_tao_tc_PortableServer_Current_NoContext;
+
 PortableServer::Current::Current (void)
 {}
 
 PortableServer::Current::~Current (void)
 {}
 
-void 
-PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::Current_ptr
 PortableServer::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -204,7 +221,7 @@ PortableServer::Current::_narrow (
 
 PortableServer::Current_ptr
 PortableServer::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -216,21 +233,21 @@ PortableServer::Current::_unchecked_narrow (
 PortableServer::Current_ptr
 PortableServer::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableServer::Current::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -268,8 +285,27 @@ const char* PortableServer::Current::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/Current:2.3";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableServer::Current::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_Current (
+    ::CORBA::tk_local_interface,
+    "IDL:omg.org/PortableServer/Current:2.3",
+    "Current");
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr const _tc_Current =
+    &_tao_tc_PortableServer_Current;
+}
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h
index 69ac3faaf4d..f897b62f9ce 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.h
+++ b/TAO/tao/PortableServer/PS_CurrentC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PS_CURRENTC_H_
-#define _TAO_IDL_ORIG_PS_CURRENTC_H_
+#ifndef _TAO_IDL_PS_CURRENTC_H_
+#define _TAO_IDL_PS_CURRENTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,10 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/portableserver_export.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/AnyTypeCode/CurrentA.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PortableServer/PS_ForwardC.h"
@@ -55,23 +58,16 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableServer
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_)
 #define _PORTABLESERVER_CURRENT__VAR_OUT_CH_
@@ -112,12 +108,12 @@ namespace PortableServer
     static void _tao_release (Current_ptr obj);
 
     static Current_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
@@ -126,7 +122,7 @@ namespace PortableServer
       return static_cast<Current_ptr> (0);
     }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
@@ -134,7 +130,7 @@ namespace PortableServer
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
 
-    class TAO_PortableServer_Export NoContext : public CORBA::UserException
+    class TAO_PortableServer_Export NoContext : public ::CORBA::UserException
     {
     public:
 
@@ -146,12 +142,12 @@ namespace PortableServer
 
       static void _tao_any_destructor (void *);
 
-      static NoContext *_downcast (CORBA::Exception *);
-      static const NoContext *_downcast (CORBA::Exception const *);
+      static NoContext *_downcast ( ::CORBA::Exception *);
+      static const NoContext *_downcast ( ::CORBA::Exception const *);
 
-      static CORBA::Exception *_alloc (void);
+      static ::CORBA::Exception *_alloc (void);
 
-      virtual CORBA::Exception *_tao_duplicate (void) const;
+      virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -165,14 +161,11 @@ namespace PortableServer
           ACE_ENV_ARG_DECL
         );
 
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:129
-
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
     };
 
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
 
     static ::CORBA::TypeCode_ptr const _tc_NoContext;
 
@@ -185,7 +178,7 @@ namespace PortableServer
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableServer::Current::NoContext
       )) = 0;
 
@@ -196,7 +189,18 @@ namespace PortableServer
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
+        ::PortableServer::Current::NoContext
+      )) = 0;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+
+    virtual ::CORBA::Object_ptr get_reference (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        ::CORBA::SystemException,
         ::PortableServer::Current::NoContext
       )) = 0;
 
@@ -207,20 +211,20 @@ namespace PortableServer
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableServer::Current::NoContext
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
 
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
   protected:
     // Abstract or local interface only.
@@ -238,12 +242,12 @@ namespace PortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
 
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -254,8 +258,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
-#define _PORTABLESERVER_CURRENT__TRAITS_CH_
+#if !defined (_PORTABLESERVER_CURRENT__TRAITS_)
+#define _PORTABLESERVER_CURRENT__TRAITS_
 
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current>
@@ -267,7 +271,7 @@ namespace TAO
         ::PortableServer::Current_ptr
       );
     static ::PortableServer::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableServer::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -277,30 +281,9 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+// be\be_codegen.cpp:1040
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
index 86f8af6f927..f475927eab9 100644
--- a/TAO/tao/PortableServer/PS_Forward.pidl
+++ b/TAO/tao/PortableServer/PS_Forward.pidl
@@ -24,7 +24,7 @@
 #ifndef _PORTABLESERVER_PS_FORWARD_IDL_
 #define _PORTABLESERVER_PS_FORWARD_IDL_
 
-#include <OctetSeq.pidl>
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 777efdd75a0..efaca76332e 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -28,10 +28,12 @@
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "PS_ForwardA.h"
+#include "tao/PortableServer/PS_ForwardA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -51,3 +53,4 @@ namespace PortableServer
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h
index 7818c218778..047e66c649b 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.h
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "PS_ForwardC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -54,6 +56,8 @@ namespace PortableServer
 
 } // module PortableServer
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index c39046225ac..d23e1ebf431 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -29,15 +29,18 @@
 // be\be_codegen.cpp:277
 
 
-#include "PS_ForwardC.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 24cb55a00f1..e05abec2d4c 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Objref_VarOut_T.h"
@@ -52,6 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ServantBase;
 class TAO_ServantBase_var;
 class TAO_Local_ServantBase;
@@ -117,6 +119,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 02b37e7afe3..ef2bd9c048b 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -35,7 +35,7 @@
 
 #include "tao/AnyTypeCode/TypeCode.h"	 
 #include "tao/AnyTypeCode/Any.h"
-#include "PolicyS.h"
+#include "tao/PortableServer/PolicyS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 #include "tao/PortableServer/Upcall_Command.h"
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -1082,3 +1084,5 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* ifndef */
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 8a337b60d65..91d1c44b232 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -55,7 +55,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,6 +65,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_CORBA
 {
 
@@ -306,7 +308,9 @@ namespace POA_CORBA
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:995
 
-#include "PolicyS_T.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "tao/PortableServer/PolicyS_T.h"
 
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index a53bc9459b6..dfe7cbabbdd 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -31,10 +31,10 @@
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
 #define _TAO_IDL_ORIG_POLICYS_T_CPP_
 
-#include "PolicyS_T.h"
+#include "tao/PortableServer/PolicyS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "tao/PortableServer/PolicyS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 2e8d80a5198..f4ef428808e 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -39,6 +39,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -129,12 +131,14 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1096
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "tao/PortableServer/PolicyS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PolicyS_T.cpp"
+#include "tao/PortableServer/PolicyS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index 42c4ad90eac..4bccdaee36d 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -26,6 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
@@ -167,3 +169,4 @@ void POA_CORBA::Policy_tie<T>::destroy  (
   );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index 9498924469a..d0854a95849 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -14,14 +14,16 @@
 #define TAO_POLICY_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Object.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
 
@@ -42,5 +44,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_POLICY_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index 2517081b640..67d92f9fdbb 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -1,163 +1,166 @@
 // $Id$
-#include "PortableServer.h"
-#include "Object_Adapter.h"
-#include "Object_Adapter_Factory.h"
-#include "POA_Current_Factory.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Object_Adapter_Factory.h"
+#include "tao/PortableServer/POA_Current_Factory.h"
 
-#include "ThreadStrategyFactoryImpl.h"
-#include "LifespanStrategyFactoryImpl.h"
-#include "IdAssignmentStrategyFactoryImpl.h"
-#include "IdUniquenessStrategyFactoryImpl.h"
-#include "ImplicitActivationStrategyFactoryImpl.h"
-#include "RequestProcessingStrategyFactoryImpl.h"
-#include "ServantRetentionStrategyFactoryImpl.h"
+#include "tao/PortableServer/ThreadStrategyFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
+#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h"
+#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h"
+#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
 
-#include "ThreadStrategyORBControl.h"
-#include "ThreadStrategySingle.h"
-#include "ThreadStrategySingleFactoryImpl.h"
+#include "tao/PortableServer/ThreadStrategyORBControl.h"
+#include "tao/PortableServer/ThreadStrategySingle.h"
+#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
 
-#include "IdAssignmentStrategySystem.h"
-#include "IdAssignmentStrategyUser.h"
+#include "tao/PortableServer/IdAssignmentStrategySystem.h"
+#include "tao/PortableServer/IdAssignmentStrategyUser.h"
 
-#include "IdUniquenessStrategyMultiple.h"
-#include "IdUniquenessStrategyUnique.h"
+#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
+#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
 
-#include "ImplicitActivationStrategyExplicit.h"
-#include "ImplicitActivationStrategyImplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
+#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
 
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "RequestProcessingStrategyServantManager.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
 
-#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "ServantRetentionStrategyRetainFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
 
-#include "RequestProcessingStrategyDefaultServantFI.h"
-#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "RequestProcessingStrategyServantActivatorFI.h"
-#include "RequestProcessingStrategyServantLocatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
 
-#include "IdUniquenessStrategyUniqueFactoryImpl.h"
+#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
 
-#include "LifespanStrategyPersistentFactoryImpl.h"
-#include "LifespanStrategyTransientFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
+#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
 
 ACE_RCSID (PortableServer,
            PortableServer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_POA_Initializer::init (void)
 {
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategySystem
+      ace_svc_desc_IdAssignmentStrategySystem
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyUser
+      ace_svc_desc_IdAssignmentStrategyUser
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyMultiple
+      ace_svc_desc_IdUniquenessStrategyMultiple
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUnique
+      ace_svc_desc_IdUniquenessStrategyUnique
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
+      ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyExplicit
+      ace_svc_desc_ImplicitActivationStrategyExplicit
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyImplicit
+      ace_svc_desc_ImplicitActivationStrategyImplicit
     );
 
   // Strategy factories
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategyFactoryImpl
+      ace_svc_desc_ThreadStrategyFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingleFactoryImpl
+      ace_svc_desc_ThreadStrategySingleFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyFactoryImpl
+      ace_svc_desc_LifespanStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyPersistentFactoryImpl
+      ace_svc_desc_LifespanStrategyPersistentFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyTransientFactoryImpl
+      ace_svc_desc_LifespanStrategyTransientFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyFactoryImpl
+      ace_svc_desc_IdAssignmentStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyFactoryImpl
+      ace_svc_desc_IdUniquenessStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyFactoryImpl
+      ace_svc_desc_ImplicitActivationStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyFactoryImpl
+      ace_svc_desc_RequestProcessingStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
+      ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
+      ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
+      ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
+      ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyFactoryImpl
+      ace_svc_desc_ServantRetentionStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
+      ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
+      ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Strategy implementations
 
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategyORBControl
+      ace_svc_desc_ThreadStrategyORBControl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingle
+      ace_svc_desc_ThreadStrategySingle
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
@@ -170,3 +173,5 @@ TAO_POA_Initializer::init (void)
         ace_svc_desc_TAO_Object_Adapter_Factory
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index b5d9c773bdf..4c27f187332 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_PortableServer_Export TAO_POA_Initializer
 {
 public:
@@ -31,21 +35,23 @@ public:
 static int
 TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_PORTABLESERVER_SAFE_INCLUDE
-#include "PortableServerC.h"
+#include "tao/PortableServer/PortableServerC.h"
 #undef TAO_PORTABLESERVER_SAFE_INCLUDE
-#include "POAManagerC.h"
-#include "PS_CurrentC.h"
-#include "PortableServer_Functions.h"
-#include "PortableServer_WFunctions.h"
-#include "PS_ForwardA.h"
-#include "IdUniquenessPolicyA.h"
-#include "ImplicitActivationPolicyA.h"
-#include "RequestProcessingPolicyA.h"
-#include "ServantRetentionPolicyA.h"
-#include "ThreadPolicyA.h"
-#include "IdAssignmentPolicyA.h"
-#include "LifespanPolicyA.h"
+#include "tao/PortableServer/POAManagerC.h"
+#include "tao/PortableServer/PS_CurrentC.h"
+#include "tao/PortableServer/PortableServer_Functions.h"
+#include "tao/PortableServer/PortableServer_WFunctions.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/PortableServer/IdUniquenessPolicyA.h"
+#include "tao/PortableServer/ImplicitActivationPolicyA.h"
+#include "tao/PortableServer/RequestProcessingPolicyA.h"
+#include "tao/PortableServer/ServantRetentionPolicyA.h"
+#include "tao/PortableServer/ThreadPolicyA.h"
+#include "tao/PortableServer/IdAssignmentPolicyA.h"
+#include "tao/PortableServer/LifespanPolicyA.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index fd221867830..938c7edeaec 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -45,17 +45,17 @@
 #define _PORTABLE_SERVER_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <Policy_Forward.pidl>
-#include <OctetSeq.pidl>
-#include <orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/IdAssignmentPolicy.pidl>
-#include <tao/PortableServer/IdUniquenessPolicy.pidl>
-#include <tao/PortableServer/ImplicitActivationPolicy.pidl>
-#include <tao/PortableServer/LifespanPolicy.pidl>
-#include <tao/PortableServer/RequestProcessingPolicy.pidl>
-#include <tao/PortableServer/ServantRetentionPolicy.pidl>
-#include <tao/PortableServer/ThreadPolicy.pidl>
+#include "tao/Policy_Forward.pidl"
+#include "tao/OctetSeq.pidl"
+#include "tao/orb_types.pidl"
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/IdAssignmentPolicy.pidl"
+#include "tao/PortableServer/IdUniquenessPolicy.pidl"
+#include "tao/PortableServer/ImplicitActivationPolicy.pidl"
+#include "tao/PortableServer/LifespanPolicy.pidl"
+#include "tao/PortableServer/RequestProcessingPolicy.pidl"
+#include "tao/PortableServer/ServantRetentionPolicy.pidl"
+#include "tao/PortableServer/ThreadPolicy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index fefd713bd53..548d4f7ce54 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -33,12 +33,14 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -1201,3 +1203,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 4c59d1769ad..65b625bf850 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "PortableServer.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/Object_Argument_T.h"
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -76,7 +78,7 @@ PortableServer::POAList::POAList (void)
 PortableServer::POAList::POAList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -89,7 +91,7 @@ PortableServer::POAList::POAList (
     PortableServer::POA_ptr * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -99,7 +101,7 @@ PortableServer::POAList::POAList (
 PortableServer::POAList::POAList (
     const POAList &seq
   )
-  : TAO_Unbounded_Object_Sequence<
+  : TAO::unbounded_object_reference_sequence<
         PortableServer::POA,
         PortableServer::POA_var
       >
@@ -138,7 +140,7 @@ TAO::Objref_Traits<PortableServer::POA>::release (
     PortableServer::POA_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::POA_ptr
@@ -182,7 +184,7 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::Portabl
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -277,7 +279,7 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableSer
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -373,7 +375,7 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   this->index = _tao_excp.index;
   return *this;
 }
@@ -487,7 +489,7 @@ PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServan
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -584,7 +586,7 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableS
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -679,7 +681,7 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::P
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -774,7 +776,7 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::Portabl
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -869,7 +871,7 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer:
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -964,7 +966,7 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::Wr
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1059,7 +1061,7 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::Wron
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1139,7 +1141,7 @@ PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
     static_cast<POA *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::POA_ptr
@@ -1167,7 +1169,7 @@ PortableServer::POA::_unchecked_narrow (
 PortableServer::POA_ptr
 PortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -1178,7 +1180,7 @@ PortableServer::POA::_duplicate (POA_ptr obj)
 void
 PortableServer::POA::_tao_release (POA_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1220,3 +1222,5 @@ PortableServer::POA::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 7d21fd57717..f84d9eeaa47 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -44,7 +44,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -83,6 +83,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -95,29 +97,20 @@ namespace PortableServer
   class POAList;
 
   typedef
-    TAO_MngSeq_Var_T<
-        POAList,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
+    TAO_VarSeq_Var_T<
+        POAList
       >
     POAList_var;
 
   typedef
-    TAO_MngSeq_Out_T<
-        POAList,
-        POAList_var,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
+    TAO_Seq_Out_T<
+        POAList
       >
     POAList_out;
 
   class TAO_PortableServer_Export POAList
     : public
-        TAO_Unbounded_Object_Sequence<
+        TAO::unbounded_object_reference_sequence<
             POA,
             POA_var
           >
@@ -129,7 +122,7 @@ namespace PortableServer
         CORBA::ULong max,
         CORBA::ULong length,
         POA_ptr* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     POAList (const POAList &);
     ~POAList (void);
@@ -1446,6 +1439,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h
index 5b1c718ab1c..acf326b7e64 100644
--- a/TAO/tao/PortableServer/PortableServerS.h
+++ b/TAO/tao/PortableServer/PortableServerS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "PortableServerC.h"
+#include "tao/PortableServer/PortableServerC.h"
 #include "tao/Policy_ForwardS.h"
 #include "tao/OctetSeqS.h"
 #include "tao/orb_typesS.h"
@@ -54,6 +54,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_PortableServer
 {
   
@@ -66,6 +68,8 @@ namespace POA_PortableServer
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1060
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerS.inl"
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
index 23fb82cb0fd..ac70be706c3 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,4 +1,4 @@
-#include "PortableServer_Functions.h"
+#include "tao/PortableServer/PortableServer_Functions.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_Functions,
@@ -6,6 +6,8 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   PortableServer::ObjectId *
@@ -54,3 +56,5 @@ namespace PortableServer
   }
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h
index e5de24e99f7..e14222ac6b9 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.h
+++ b/TAO/tao/PortableServer/PortableServer_Functions.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,6 +40,8 @@
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "ace/OS_NS_wchar.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   /// Utility functions for the other
@@ -50,6 +52,8 @@ namespace PortableServer
     const char *id);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLESERVER_FUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
index 63b6716fffb..db6f88df047 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,4 +1,4 @@
-#include "PortableServer_WFunctions.h"
+#include "tao/PortableServer/PortableServer_WFunctions.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_WFunctions,
@@ -6,6 +6,8 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   PortableServer::ObjectId *
@@ -66,3 +68,4 @@ namespace PortableServer
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h
index b020106a939..2d6cdcbabb4 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.h
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,6 +40,8 @@
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "ace/OS_NS_wchar.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring (
@@ -49,6 +51,8 @@ namespace PortableServer
     const CORBA::WChar *id);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLESERVER_WFUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl
index dd300389aa6..54132cd083d 100644
--- a/TAO/tao/PortableServer/PortableServer_include.pidl
+++ b/TAO/tao/PortableServer/PortableServer_include.pidl
@@ -35,6 +35,6 @@
 #define _PORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PortableServer.pidl>
+#include "tao/PortableServer/PortableServer.pidl"
 
 #endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
index 152ccaf4f6a..8f2a1503f6c 100644
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ b/TAO/tao/PortableServer/PortableServer_includeC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -55,11 +55,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index 1b8045b030d..7383d7bd9cf 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -1,4 +1,4 @@
-#include "Regular_POA.h"
+#include "tao/PortableServer/Regular_POA.h"
 
 ACE_RCSID (PortableServer,
            POA,
@@ -6,9 +6,11 @@ ACE_RCSID (PortableServer,
 
 //
 #if !defined (__ACE_INLINE__)
-# include "Regular_POA.inl"
+# include "tao/PortableServer/Regular_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
                   TAO_POA_Manager &poa_manager,
                   const TAO_POA_Policy_Set &policies,
@@ -67,3 +69,5 @@ TAO_Regular_POA::root_key_type (void)
       return TAO_Root_POA::root_key_type ();
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index 516fa3b6f68..7a6d3c2289c 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #include "tao/PortableServer/Root_POA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Regular_POA
  *
@@ -64,11 +66,12 @@ protected:
   TAO_Root_POA *parent_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
 #if defined (__ACE_INLINE__)
-# include "Regular_POA.inl"
+# include "tao/PortableServer/Regular_POA.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index fa533b4991e..04b4b4b091b 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -2,13 +2,13 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE PortableServer::POA_ptr
 TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->parent_ != 0)
-    return PortableServer::POA::_duplicate (this->parent_);
-  else
-    return PortableServer::POA::_nil ();
+  return PortableServer::POA::_duplicate (this->parent_);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index ca76ad11887..c3f4f480b8e 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,5 +1,5 @@
-#include "RequestProcessingPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/RequestProcessingPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingPolicy,
@@ -7,6 +7,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -66,4 +68,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index 6e9b9703085..0d8d4f7485a 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RequestProcessingPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,6 +32,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -67,6 +69,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
index 7c8d7ac787b..256defab1b9 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index 69e96b2261c..5db99f4446e 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -30,7 +30,7 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "RequestProcessingPolicyA.h"
+#include "tao/PortableServer/RequestProcessingPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -112,4 +114,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
index a00d7522145..71cd9e73205 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
@@ -33,14 +33,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "RequestProcessingPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -65,6 +67,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index c33d79df47f..fc0a43d63bd 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "RequestProcessingPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -111,18 +113,18 @@ PortableServer::RequestProcessingPolicy::_unchecked_narrow (
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::RequestProcessingPolicy::_tao_release (RequestProcessingPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,13 +183,15 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
index ec1286f49ae..cdac90a297d 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -235,6 +237,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index e0874c451eb..535faabda48 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -5,21 +5,23 @@
  *  @file    RequestProcessingStrategy.cpp
  *
  *  $Id$
- *
  */
 //=============================================================================
 
-#include "RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategy::RequestProcessingStrategy()
+    RequestProcessingStrategy::RequestProcessingStrategy (void)
       : poa_ (0)
     {
     }
@@ -56,3 +58,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index c6029211f5f..8c767103d0b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -14,14 +14,16 @@
 #define TAO_REQUEST_PROCESSING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PortableServer.h"
-#include "Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Location.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace PortableServer
 {
@@ -137,5 +139,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_REQUEST_PROCESSING_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index b77993ba572..877f8033219 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,16 +1,18 @@
 // -*- C++ -*-
 
 #include "tao/ORB_Constants.h"
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "ServantManagerC.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Base.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Root_POA.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -180,3 +182,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index f98b135f3ac..b8b1b493ad4 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -14,19 +14,26 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
 #include /**/ "ace/pre.h"
 
-#include "RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
   namespace Portable_Server
   {
+    /**
+     * @class RequestProcessingStrategyAOMOnly
+     *
+     * Request Processing Strategy which only uses the Active Object Map (AOM)
+     */
     class RequestProcessingStrategyAOMOnly
       : public RequestProcessingStrategy
     {
@@ -108,5 +115,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 53a356fbf32..820605a1d42 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
-#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyAOMOnly.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyAOMOnlyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -47,17 +50,20 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyAOMOnlyFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyAOMOnlyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  RequestProcessingStrategyAOMOnlyFactoryImpl,
+  ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  RequestProcessingStrategyAOMOnlyFactoryImpl,
+  TAO::Portable_Server::RequestProcessingStrategyAOMOnlyFactoryImpl)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
index 81e10c20474..44a9df665af 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/RequestProcessingStrategyFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -40,11 +42,14 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 1d5954cd800..3b86eb66ce7 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -2,12 +2,12 @@
 
 #include "tao/ORB_Constants.h"
 #include "tao/TSS_Resources.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "Non_Servant_Upcall.h"
-#include "Root_POA.h"
-#include "ServantManagerC.h"
-#include "Servant_Base.h"
-#include "POA_Current_Impl.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -15,6 +15,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -280,5 +282,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index dcb5232e54e..26fe17df989 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -14,19 +14,21 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
 #include /**/ "ace/pre.h"
 
-#include "RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Base.h"
+#include "tao/PortableServer/Servant_Base.h"
 
-#include "Servant_Location.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Root_POA;
 
 namespace TAO
@@ -113,6 +115,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index ea8c1b03a3d..c1f739832f5 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -1,16 +1,19 @@
 // $Id$
 
-#include "RequestProcessingStrategyDefaultServantFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyDefaultServant.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
-           RequestProcessingStrategyDefaultServantFactoryImpl,
+           RequestProcessingStrategyDefaultServantFI,
            "$Id$")
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -49,19 +52,24 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyDefaultServantFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyDefaultServantFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  RequestProcessingStrategyDefaultServantFactoryImpl,
+  ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  RequestProcessingStrategyDefaultServantFactoryImpl,
+  TAO::Portable_Server::RequestProcessingStrategyDefaultServantFactoryImpl)
+
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
index b02aba40dc3..7328d0bd30a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -42,12 +44,14 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
index 157321b4152..9ee872f1a90 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +24,8 @@
 #include "tao/PortableServer/RequestProcessingPolicyC.h"
 #include "tao/PortableServer/ServantRetentionPolicyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -46,5 +48,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 8582dd19f01..138fee4eb92 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -1,16 +1,19 @@
 // $Id$
 
-#include "RequestProcessingStrategyFactoryImpl.h"
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "RequestProcessingStrategyServantLocator.h"
-#include "RequestProcessingStrategyServantActivator.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h"
+#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
+#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -128,17 +131,20 @@ namespace TAO
           ACE_CHECK;
         }
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  RequestProcessingStrategyFactoryImpl,
+  ACE_TEXT ("RequestProcessingStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  RequestProcessingStrategyFactoryImpl,
+  TAO::Portable_Server::RequestProcessingStrategyFactoryImpl)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
index 007659174cd..fa07f1c30a3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/RequestProcessingStrategyFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -39,11 +41,14 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index c1ffab9927d..666eb25551b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,12 +1,12 @@
 // $Id$
 #include "tao/ORB_Constants.h"
-#include "ServantActivatorC.h"
-#include "RequestProcessingStrategyServantActivator.h"
-#include "Servant_Base.h"
-#include "Non_Servant_Upcall.h"
-#include "Root_POA.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
+#include "tao/PortableServer/ServantActivatorC.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Servant_Upcall.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -14,6 +14,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -348,4 +350,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 8130b9eb8c0..66c6fb00397 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -14,24 +14,19 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include "RequestProcessingStrategyServantManager.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-namespace PortableServer
-{
-  class ServantActivator;
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
-  typedef ServantActivator *ServantActivator_ptr;
-  typedef TAO_Objref_Var_T<ServantActivator> ServantActivator_var;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -95,6 +90,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 766fb256043..a2b3d222282 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "RequestProcessingStrategyServantActivatorFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyServantActivator.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,18 +64,23 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyServantActivatorFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantActivatorFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  RequestProcessingStrategyServantActivatorFactoryImpl,
+  ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  RequestProcessingStrategyServantActivatorFactoryImpl,
+  TAO::Portable_Server::RequestProcessingStrategyServantActivatorFactoryImpl)
+
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
index cdc19cff125..ea487fa69d3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -42,12 +44,15 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
+
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index 47beac46acc..e8ba2678612 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,13 +1,11 @@
-// -*- C++ -*-
-
 #include "tao/ORB_Constants.h"
-#include "ServantLocatorC.h"
-#include "RequestProcessingStrategyServantLocator.h"
-#include "Root_POA.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Base.h"
+#include "tao/PortableServer/ServantLocatorC.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Base.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -15,6 +13,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -253,5 +253,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index 103ccba19fc..0c0bbbd72a5 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -14,24 +14,19 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
 #include /**/ "ace/pre.h"
 
-#include "RequestProcessingStrategyServantManager.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-namespace PortableServer
-{
-  class ServantLocator;
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
-  typedef ServantLocator *ServantLocator_ptr;
-  typedef TAO_Objref_Var_T<ServantLocator> ServantLocator_var;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -86,6 +81,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index bf962eaf46c..631d95d573d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "RequestProcessingStrategyServantLocatorFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyServantLocator.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -62,19 +64,24 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyServantLocatorFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantLocatorFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  RequestProcessingStrategyServantLocatorFactoryImpl,
+  ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  RequestProcessingStrategyServantLocatorFactoryImpl,
+  TAO::Portable_Server::RequestProcessingStrategyServantLocatorFactoryImpl)
+
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
index 795a7b9d5b6..89e5d4db19b 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -42,12 +44,14 @@ namespace TAO
         RequestProcessingStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index af78da4ca83..9cfd35ba5ac 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-#include "RequestProcessingStrategyServantManager.h"
-#include "ServantManagerC.h"
-#include "Root_POA.h"
+#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableServer,
@@ -11,6 +11,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -94,5 +96,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index f68cc5d887d..77932c74be9 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -14,17 +14,19 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "RequestProcessingStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -70,6 +72,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index ffad80905db..2ec60bb2e41 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1,35 +1,35 @@
 // $Id$
 
-#include "Root_POA.h"
-#include "Regular_POA.h"
-
-#include "ThreadPolicy.h"
-#include "LifespanPolicy.h"
-#include "IdAssignmentPolicy.h"
-#include "IdUniquenessPolicy.h"
-#include "ImplicitActivationPolicy.h"
-#include "RequestProcessingPolicy.h"
-#include "ServantRetentionPolicy.h"
-#include "Active_Object_Map.h"
-#include "Default_Acceptor_Filter.h"
-#include "ORT_Adapter.h"
-#include "ORT_Adapter_Factory.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
-#include "AdapterActivatorC.h"
-#include "Non_Servant_Upcall.h"
-#include "POAManager.h"
-#include "ServantManagerC.h"
-#include "poa_macros.h"
-#include "POA_Guard.h"
-#include "Creation_Time.h"
-#include "RequestProcessingStrategy.h"
-#include "LifespanStrategy.h"
-#include "IdUniquenessStrategy.h"
-#include "IdAssignmentStrategy.h"
-#include "ServantRetentionStrategy.h"
-#include "ImplicitActivationStrategy.h"
-#include "ThreadStrategy.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Regular_POA.h"
+
+#include "tao/PortableServer/ThreadPolicy.h"
+#include "tao/PortableServer/LifespanPolicy.h"
+#include "tao/PortableServer/IdAssignmentPolicy.h"
+#include "tao/PortableServer/IdUniquenessPolicy.h"
+#include "tao/PortableServer/ImplicitActivationPolicy.h"
+#include "tao/PortableServer/RequestProcessingPolicy.h"
+#include "tao/PortableServer/ServantRetentionPolicy.h"
+#include "tao/PortableServer/Active_Object_Map.h"
+#include "tao/PortableServer/Default_Acceptor_Filter.h"
+#include "tao/PortableServer/ORT_Adapter.h"
+#include "tao/PortableServer/ORT_Adapter_Factory.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/POAManager.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/poa_macros.h"
+#include "tao/PortableServer/POA_Guard.h"
+#include "tao/PortableServer/Creation_Time.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/LifespanStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "tao/PortableServer/ThreadStrategy.h"
 
 #include "tao/StringSeqC.h"
 #include "tao/PortableInterceptorC.h"
@@ -53,14 +53,17 @@
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Root_POA.inl"
+# include "tao/PortableServer/Root_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
-           POA,
-             "$Id$")
+           Root_POA,
+           "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
 // It's an array of octets representing ^t^a^o/0 in octal.
@@ -355,7 +358,7 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   }
 
-  CORBA::release (this);
+  ::CORBA::release (this);
 }
 
 PortableServer::POA_ptr
@@ -822,6 +825,10 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
   this->cleanup_in_progress_ = 1;
 
+  // Inform the custom servant dispatching strategy to stop the working
+  // threads when the poa is destroyed.
+  this->poa_deactivated_hook ();
+
   // This operation destroys the POA and all descendant POAs. The POA
   // so destroyed (that is, the POA with its name) may be re-created
   // later in the same process. (This differs from the
@@ -1110,9 +1117,9 @@ TAO_Root_POA::add_ior_component_to_profile (
 {
   // Add the given tagged component to all profiles matching the given
   // ProfileId.
-  int found_profile = 0;
+  bool found_profile = false;
 
-  const CORBA::ULong profile_count = mprofile.profile_count ();
+  CORBA::ULong const profile_count = mprofile.profile_count ();
 
   for (CORBA::ULong i = 0; i < profile_count; ++i)
     {
@@ -1124,14 +1131,14 @@ TAO_Root_POA::add_ior_component_to_profile (
                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          found_profile = 1;
+          found_profile = true;
         }
     }
 
   // According to the Portable Interceptor specification, we're
   // supposed to throw a CORBA::BAD_PARAM exception if no profile
   // matched the given ProfileId.
-  if (found_profile == 0)
+  if (found_profile == false)
     ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
                                  CORBA::COMPLETED_NO));
 }
@@ -1495,7 +1502,8 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
     }
 
   PortableServer::ObjectId system_id;
-  bool is_generated = this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
+  bool const is_generated =
+    this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!is_generated)
@@ -1540,18 +1548,18 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
   ACE_CHECK_RETURN (false);
 
   TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
+  CORBA::Boolean is_root = false;
+  CORBA::Boolean is_persistent = false;
+  CORBA::Boolean is_system_id = false;
   TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
 
-  int result = this->parse_key (key.in (),
-                                poa_system_name,
-                                system_id,
-                                is_root,
-                                is_persistent,
-                                is_system_id,
-                                poa_creation_time);
+  int const result = this->parse_key (key.in (),
+                                      poa_system_name,
+                                      system_id,
+                                      is_root,
+                                      is_persistent,
+                                      is_system_id,
+                                      poa_creation_time);
   if (result != 0 ||
       !this->root () &&
       poa_system_name != this->system_name () ||
@@ -1590,9 +1598,9 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
   PortableServer::ObjectId system_id;
-  bool is_generated = this->is_poa_generated (reference,
-                                              system_id
-                                              ACE_ENV_ARG_PARAMETER);
+  bool const is_generated = this->is_poa_generated (reference,
+                                                    system_id
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!is_generated)
@@ -1742,11 +1750,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
   char root_key_type = key_data[starting_at];
   if (root_key_type == TAO_Root_POA::root_key_char ())
     {
-      is_root = 1;
+      is_root = true;
     }
   else if (root_key_type == TAO_Root_POA::non_root_key_char ())
     {
-      is_root = 0;
+      is_root = false;
     }
   else
     {
@@ -1761,11 +1769,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
   char system_id_key_type = key_data[starting_at];
   if (system_id_key_type == TAO_Root_POA::system_id_key_char ())
     {
-      is_system_id = 1;
+      is_system_id = true;
     }
   else if (system_id_key_type == TAO_Root_POA::user_id_key_char ())
     {
-      is_system_id = 0;
+      is_system_id = false;
     }
   else
     {
@@ -1780,11 +1788,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
   char persistent_key_type = key_data[starting_at];
   if (persistent_key_type == TAO_Root_POA::persistent_key_char ())
     {
-      is_persistent = 1;
+      is_persistent = true;
     }
   else if (persistent_key_type == TAO_Root_POA::transient_key_char ())
     {
-      is_persistent = 0;
+      is_persistent = false;
     }
   else
     {
@@ -1834,7 +1842,7 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
       starting_at += sizeof (poa_name_size);
     }
 
-  // Grep the name if there is aname
+  // Grep the name if there is a name
   if (!is_root)
     {
       poa_system_name.replace (poa_name_size,
@@ -1883,9 +1891,9 @@ TAO_Root_POA::create_object_key (const PortableServer::ObjectId &id)
   TAO::ObjectKey *key = 0;
   ACE_NEW_RETURN (key,
                   TAO::ObjectKey (buffer_size,
-                                 buffer_size,
-                                 buffer,
-                                 1),
+                                  buffer_size,
+                                  buffer,
+                                  1),
                   0);
 
   return key;
@@ -1902,7 +1910,7 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent)
   // used, then we need to add the POA name length field to the object
   // key. Otherwise, the POA name length can be calculated by looking
   // at the remainder after extracting other parts of the key.
-  int add_poa_name_length =
+  bool const add_poa_name_length =
     this->is_persistent () &&
     !this->system_id ();
 
@@ -1924,14 +1932,14 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent)
 
   // Get the space needed for the lifespan length
   // byte.
-  CORBA::ULong lifespan_key_length =
+  CORBA::ULong const lifespan_key_length =
     this->active_policy_strategies_.lifespan_strategy()->key_length ();
 
-  CORBA::ULong id_assignment_key_length =
+  CORBA::ULong const id_assignment_key_length =
     this->active_policy_strategies_.id_assignment_strategy()->key_type_length ();
 
   // Calculate the space required for the POA id.
-  CORBA::ULong buffer_size =
+  CORBA::ULong const buffer_size =
     prefix_size +
     this->root_key_type_length () +
     id_assignment_key_length +
@@ -1992,7 +2000,6 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent)
 int
 TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
 {
-
 #if defined (POA_NAME_IN_POA_GENERATED_ID)
 
   // Grab the buffer
@@ -2004,7 +2011,6 @@ TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
     ACE_OS::strncmp (id_buffer,
                      this->name_.c_str (),
                      this->name_.length ()) == 0;
-
 #else /* POA_NAME_IN_POA_GENERATED_ID */
 
   ACE_UNUSED_ARG (id);
@@ -2050,9 +2056,9 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
                                    PortableServer::ObjectId &user_id)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
+  CORBA::Boolean is_root = false;
+  CORBA::Boolean is_persistent = false;
+  CORBA::Boolean is_system_id = false;
   TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
 
   return TAO_Root_POA::parse_key (object_key,
@@ -2309,9 +2315,9 @@ save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
   // this->tagged_component_id_ is increased, we need to increase the
   // size of this->profile_id_array_ also.
 
-  const CORBA::ULong old_len = this->tagged_component_id_.length ();
+  CORBA::ULong const old_len = this->tagged_component_id_.length ();
 
-  const CORBA::ULong new_len = old_len + 1;
+  CORBA::ULong const new_len = old_len + 1;
 
   this->tagged_component_id_.length (new_len);
   this->tagged_component_id_[old_len] = component;
@@ -2331,7 +2337,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
   int error = 0;
 
   // Count the number of endpoints.
-  size_t profile_count =
+  size_t const profile_count =
     acceptor_registry.endpoint_count ();
 
   // Create a profile container and have acceptor registries populate
@@ -2465,6 +2471,18 @@ TAO_Root_POA::find_servant (
                         ACE_ENV_ARG_PARAMETER);
 }
 
+int
+TAO_Root_POA::find_servant_priority (
+         const PortableServer::ObjectId &system_id,
+         CORBA::Short &priority
+        ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+          find_servant_priority (system_id,
+                                 priority
+                                 ACE_ENV_ARG_PARAMETER);
+}
+
 TAO::ORT_Adapter_Factory *
 TAO_Root_POA::ORT_adapter_factory (void)
 {
@@ -2514,8 +2532,8 @@ TAO_Root_POA::ORT_adapter_i (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
+                           "Cannot initialize the "
+                           "object_reference_template_adapter");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
@@ -2892,3 +2910,28 @@ TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
 {
 }
 
+void
+TAO_Root_POA::poa_activated_hook ()
+{
+}
+
+void
+TAO_Root_POA::poa_deactivated_hook ()
+{
+}
+
+void
+TAO_Root_POA::servant_activated_hook (PortableServer::Servant,
+                                      const PortableServer::ObjectId&
+                                      ACE_ENV_ARG_DECL)
+{
+}
+
+void
+TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant,
+                                        const PortableServer::ObjectId&
+                                        ACE_ENV_ARG_DECL)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 7fcd071f9f7..59d8e490c0c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -17,33 +17,25 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Array_Base.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
 // Object Adapter
-#include "Object_Adapter.h"
+#include "tao/PortableServer/Object_Adapter.h"
 
 // POA Policy Set
-#include "POA_Policy_Set.h"
+#include "tao/PortableServer/POA_Policy_Set.h"
 
 // Cached POA Policies
-#include "POA_Cached_Policies.h"
-#include "Active_Policy_Strategies.h"
+#include "tao/PortableServer/POA_Cached_Policies.h"
+#include "tao/PortableServer/Active_Policy_Strategies.h"
 
-#include "ORT_Adapter.h"
+#include "tao/PortableServer/ORT_Adapter.h"
 
-#include "PortableServer.h"
+#include "tao/PortableServer/PortableServer.h"
 
 // Object_Key
 #include "tao/Object_KeyC.h"
@@ -57,6 +49,14 @@
 // OctetSeq
 #include "tao/OctetSeqC.h"
 
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
+#include "ace/Array_Base.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
+
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -64,6 +64,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Declaration
 class TAO_Acceptor_Filter;
 class TAO_Acceptor_Registry;
@@ -504,6 +506,19 @@ public:
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
         ACE_ENV_ARG_DECL);
 
+  /**
+   * Find the the servant with ObjectId <system_id>, and retrieve
+   * its priority.Usually used in RT CORBA with SERVER_DECLARED
+   * priority model.
+   *
+   * @return -1 if servant does not exist, else 0 indicating the
+   * servant exists and priority successfully retrieved.
+   */
+  int find_servant_priority (
+        const PortableServer::ObjectId &system_id,
+        CORBA::Short &priority
+        ACE_ENV_ARG_DECL);
+
   int unbind_using_user_id (const PortableServer::ObjectId &user_id);
 
   void cleanup_servant (
@@ -561,6 +576,25 @@ public:
       ACE_ENV_SINGLE_ARG_DECL
     );
 
+  /// These hooks are needed by the CSD strategy to override
+  /// and no-ops by default.
+
+  /// Hook - The POA has been (or is being) activated.
+  virtual void poa_activated_hook ();
+
+  /// Hook - The POA has been deactivated.
+  virtual void poa_deactivated_hook ();
+
+  /// Hook - A servant has been activated.
+  virtual void servant_activated_hook (PortableServer::Servant servant,
+                               const PortableServer::ObjectId& oid
+                               ACE_ENV_ARG_DECL);
+
+  /// Hook - A servant has been deactivated.
+  virtual void servant_deactivated_hook (PortableServer::Servant servant,
+                                 const PortableServer::ObjectId& oid
+                                 ACE_ENV_ARG_DECL);
+
 protected:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -989,6 +1023,8 @@ private:
   static TAO_POA_Static_Resources* initialization_reference_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 #if defined(_MSC_VER)
@@ -996,7 +1032,7 @@ private:
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "Root_POA.inl"
+# include "tao/PortableServer/Root_POA.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index fa9ba6014e4..116d1d99c4f 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -5,6 +5,8 @@
 // Exception macros
 #include "tao/Environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_Root_POA::cleanup_in_progress (void)
 {
@@ -240,3 +242,5 @@ TAO_Root_POA::servant_deactivation_condition (void)
 {
   return servant_deactivation_condition_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h
index 4287b2d2765..09f01b6bef4 100644
--- a/TAO/tao/PortableServer/SArg_Traits_T.h
+++ b/TAO/tao/PortableServer/SArg_Traits_T.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,11 +6,11 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
-
 #ifndef TAO_SARG_TRAITS_T_H
 #define TAO_SARG_TRAITS_T_H
 
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -33,6 +35,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SARG_TRAITS_T_H */
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
index b51f5be5e2e..f84cffaa3b1 100644
--- a/TAO/tao/PortableServer/ServantActivator.pidl
+++ b/TAO/tao/PortableServer/ServantActivator.pidl
@@ -21,9 +21,9 @@
 #define _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/ServantManager.pidl"
+#include "tao/PortableServer/ForwardRequest.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index fb2ece136ab..2ce0254c337 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -29,13 +29,15 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ServantActivatorA.h"
+#include "tao/PortableServer/ServantActivatorA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -52,4 +54,6 @@ namespace PortableServer
     &_tao_tc_PortableServer_ServantActivator;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h
index da5bc2387bf..31a9823c2c1 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.h
+++ b/TAO/tao/PortableServer/ServantActivatorA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ServantActivatorC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/PortableServer/PS_ForwardA.h"
 #include "tao/PortableServer/ServantManagerA.h"
 #include "tao/PortableServer/ForwardRequestA.h"
@@ -43,6 +43,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -56,6 +58,8 @@ namespace PortableServer
 
 } // module PortableServer
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
index 2a2333d0567..8485ca95627 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ServantActivatorC.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -39,6 +39,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -63,7 +65,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release (
     PortableServer::ServantActivator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantActivator_ptr
@@ -112,18 +114,18 @@ PortableServer::ServantActivator::_unchecked_narrow (
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantActivator::_tao_release (ServantActivator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -170,4 +172,6 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
   return false;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
index 53e28b18c8a..f86eeef4a4b 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.h
+++ b/TAO/tao/PortableServer/ServantActivatorC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -61,6 +61,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -215,6 +217,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
index 333fea55271..69b5961bafe 100644
--- a/TAO/tao/PortableServer/ServantLocator.pidl
+++ b/TAO/tao/PortableServer/ServantLocator.pidl
@@ -25,10 +25,10 @@
 #define _PORTABLESERVER_SERVANTLOCATOR_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
+#include "tao/orb_types.pidl"
+#include "tao/PortableServer/PS_Forward.pidl"
+#include "tao/PortableServer/ServantManager.pidl"
+#include "tao/PortableServer/ForwardRequest.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
index c08d031be92..f6afe468d3e 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -30,13 +30,15 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "ServantLocatorA.h"
+#include "tao/PortableServer/ServantLocatorA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -53,4 +55,6 @@ namespace PortableServer
     &_tao_tc_PortableServer_ServantLocator;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h
index 223062154e4..4e114ea1a86 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.h
+++ b/TAO/tao/PortableServer/ServantLocatorA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ServantLocatorC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/PortableServer/PS_ForwardA.h"
 #include "tao/PortableServer/ServantManagerA.h"
@@ -44,6 +44,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -57,6 +59,8 @@ namespace PortableServer
 
 } // module PortableServer
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
index e20acbb995d..d03dcd7c693 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ServantLocatorC.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -39,6 +39,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -63,7 +65,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release (
     PortableServer::ServantLocator_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantLocator_ptr
@@ -112,18 +114,18 @@ PortableServer::ServantLocator::_unchecked_narrow (
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantLocator::_tao_release (ServantLocator_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -170,4 +172,6 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
   return false;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
index d0333809f29..378b2df5c80 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.h
+++ b/TAO/tao/PortableServer/ServantLocatorC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -62,6 +62,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -220,6 +222,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp
index 16d863620a4..f260c424cdf 100644
--- a/TAO/tao/PortableServer/ServantManagerA.cpp
+++ b/TAO/tao/PortableServer/ServantManagerA.cpp
@@ -29,13 +29,15 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ServantManagerA.h"
+#include "tao/PortableServer/ServantManagerA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -52,4 +54,6 @@ namespace PortableServer
     &_tao_tc_PortableServer_ServantManager;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h
index a3b630bc035..25cb0d6abb9 100644
--- a/TAO/tao/PortableServer/ServantManagerA.h
+++ b/TAO/tao/PortableServer/ServantManagerA.h
@@ -33,13 +33,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ServantManagerC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ServantManagerC.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -53,6 +55,8 @@ namespace PortableServer
 
 } // module PortableServer
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
index a870d15bb09..d95b2bf7ef9 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -29,13 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "ServantManagerC.h"
+#include "tao/PortableServer/ServantManagerC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -61,7 +63,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release (
     PortableServer::ServantManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantManager_ptr
@@ -110,18 +112,18 @@ PortableServer::ServantManager::_unchecked_narrow (
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantManager::_tao_release (ServantManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -164,4 +166,6 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &)
   return false;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
index bc6f82dc2ce..42b1644d5b8 100644
--- a/TAO/tao/PortableServer/ServantManagerC.h
+++ b/TAO/tao/PortableServer/ServantManagerC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
@@ -56,6 +56,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
   
@@ -182,6 +184,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index 9ae6180bbb2..4bbcdddeb11 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,5 +1,5 @@
-#include "ServantRetentionPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/ServantRetentionPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ServantRetentionPolicy,
@@ -7,6 +7,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -40,7 +42,7 @@ namespace TAO
     ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      return value_;
+      return this->value_;
     }
 
     CORBA::PolicyType
@@ -64,4 +66,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index 9495d660701..067b3160089 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ServantRetentionPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,6 +32,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -67,6 +69,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
index fefc5b0efb5..6301a5be4ca 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
index 7fdc593fbac..e2474a81437 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
@@ -30,7 +30,7 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ServantRetentionPolicyA.h"
+#include "tao/PortableServer/ServantRetentionPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -111,4 +113,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
index 15576579a76..ec53d8ff9b0 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ServantRetentionPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
@@ -43,6 +43,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -67,6 +69,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
index a1593b6f7a5..72bbd0a469b 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ServantRetentionPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -111,18 +113,18 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow (
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ServantRetentionPolicy::_tao_release (ServantRetentionPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,13 +183,15 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
index 5aac210495d..eac58902cca 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -230,6 +232,8 @@ namespace TAO
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 83529bc8cb8..7dba84696c7 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -14,16 +14,18 @@
 #define TAO_SERVANTRETENTIONSTRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
-#include "Servant_Upcall.h"
-#include "ServantRetentionPolicyC.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/Servant_Location.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "tao/PortableServer/PortableServer.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
 class TAO_Active_Object_Map;
@@ -53,6 +55,11 @@ namespace TAO
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
         ACE_ENV_ARG_DECL) = 0;
 
+      virtual int find_servant_priority (
+        const PortableServer::ObjectId &system_id,
+        CORBA::Short &priority
+        ACE_ENV_ARG_DECL) = 0;
+
       virtual PortableServer::ObjectId *activate_object (
         PortableServer::Servant servant,
         CORBA::Short priority,
@@ -151,5 +158,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SERVANTRETENTIONSTRATEGY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
index d2331dbd421..84d581d0c18 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "tao/PortableServer/StrategyFactory.h"
 #include "tao/PortableServer/ServantRetentionPolicyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -44,5 +46,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index 1e4d947f999..c1a5c11f000 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ServantRetentionStrategyFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -9,6 +9,8 @@ ACE_RCSID (PortableServer,
            ServantRetentionStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -75,17 +77,20 @@ namespace TAO
           ACE_CHECK;
         }
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ServantRetentionStrategyFactoryImpl,
+  ACE_TEXT ("ServantRetentionStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ServantRetentionStrategyFactoryImpl,
+  TAO::Portable_Server::ServantRetentionStrategyFactoryImpl)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
index 637569c1c87..b6864c9984e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ServantRetentionStrategyFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -39,11 +41,13 @@ namespace TAO
         ServantRetentionStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index fb1cce33769..2084a6bebea 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -9,18 +9,20 @@
  */
 //=============================================================================
 
-#include "ServantRetentionStrategyNonRetain.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
-#include "Servant_Base.h"
+#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
 ACE_RCSID (PortableServer,
            Servant_Retention_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -135,6 +137,15 @@ namespace TAO
       return 0;
     }
 
+    int 
+    ServantRetentionStrategyNonRetain::find_servant_priority (
+        const PortableServer::ObjectId &/*system_id*/,
+        CORBA::Short &/*priority*/
+        ACE_ENV_ARG_DECL)
+    {
+      return -1;
+    }
+
     int
     ServantRetentionStrategyNonRetain::is_servant_in_map (
       PortableServer::Servant /*servant*/,
@@ -331,3 +342,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 0cc33443c9a..cb5fa9a53c7 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -14,13 +14,15 @@
 #define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
 #include /**/ "ace/pre.h"
 
-#include "ServantRetentionStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Location.h"
+#include "tao/PortableServer/Servant_Location.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
 
@@ -106,6 +108,11 @@ namespace TAO
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
         ACE_ENV_ARG_DECL);
 
+      virtual int find_servant_priority (
+        const PortableServer::ObjectId &system_id,
+        CORBA::Short &priority
+        ACE_ENV_ARG_DECL);
+
       virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
@@ -158,5 +165,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index 8703ddb53f6..bc3a3510554 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyNonRetain.h"
+#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -49,18 +51,22 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyNonRetainFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ServantRetentionStrategyNonRetainFactoryImpl,
+  ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ServantRetentionStrategyNonRetainFactoryImpl,
+  TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
index 04594be87f6..688e49cbeec 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -41,12 +43,14 @@ namespace TAO
         ServantRetentionStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 87cf5b4defe..ecccbc7eaf5 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -11,19 +11,21 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
-#include "ServantRetentionStrategyRetain.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
-#include "Active_Object_Map.h"
-#include "Active_Object_Map_Entry.h"
+#include "tao/PortableServer/ServantRetentionStrategyRetain.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Active_Object_Map.h"
+#include "tao/PortableServer/Active_Object_Map_Entry.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (PortableServer,
            Servant_Retention_Strategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -105,6 +107,18 @@ namespace TAO
       // Decrement the reference count.
       CORBA::UShort new_count = --active_object_map_entry->reference_count_;
 
+      // Inform the custom servant dispatching (CSD) strategy that the
+      // servant is deactivated. This would be called just once when the
+      // servant is deactivated the first time.
+      if (active_object_map_entry->deactivated_ == 0)
+        {
+          this->poa_->servant_deactivated_hook (
+            active_object_map_entry->servant_,
+            active_object_map_entry->user_id_
+            ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
       if (new_count == 0)
         {
           this->poa_->cleanup_servant (active_object_map_entry->servant_,
@@ -344,6 +358,44 @@ namespace TAO
       return servant;
     }
 
+    int 
+    ServantRetentionStrategyRetain::find_servant_priority (
+        const PortableServer::ObjectId &system_id,
+        CORBA::Short &priority
+        ACE_ENV_ARG_DECL)
+    {
+      PortableServer::ObjectId user_id;
+      // If we have the RETAIN policy, convert/transform from system id to
+      // user id.
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id,
+                                        user_id) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            -1);
+        }
+
+      // If the POA has the RETAIN policy, the POA looks in the Active
+      // Object Map to find if there is a servant associated with the
+      // Object Id value from the request. If such a servant exists, the
+      // POA invokes the appropriate method on the servant.
+      PortableServer::Servant servant = 0;
+      TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
+      int result = this->active_object_map_->
+        find_servant_using_system_id_and_user_id (system_id,
+                                                  user_id,
+                                                  servant,
+                                                  active_object_map_entry);
+
+      if (result == 0)
+        {
+          priority = active_object_map_entry->priority_;
+          return 0;
+        }
+
+      return -1;
+    }
+
     int
     ServantRetentionStrategyRetain::is_servant_in_map (
       PortableServer::Servant servant,
@@ -557,6 +609,13 @@ namespace TAO
           // Everything is finally ok
           //
 
+          // Inform the custom servant dispatching (CSD) strategy that the
+          // sevant is activated.
+          this->poa_->servant_activated_hook (servant,
+                                              user_id.in ()
+                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
@@ -635,6 +694,13 @@ namespace TAO
           // Everything is finally ok
           //
 
+          // Inform the custom servant dispatching (CSD) strategy that the
+          // sevant is activated.
+          this->poa_->servant_activated_hook (servant,
+                                              system_id.in ()
+                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
@@ -758,6 +824,13 @@ namespace TAO
       // Everything is finally ok
       //
 
+      // Inform the custom servant dispatching (CSD) strategy that the
+      // sevant is activated.
+      this->poa_->servant_activated_hook (servant,
+                                          user_id.in ()
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
       ACE_UNUSED_ARG (non_servant_upcall);
@@ -780,9 +853,9 @@ namespace TAO
       int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
+                         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,
@@ -865,6 +938,13 @@ namespace TAO
       // Everything is finally ok
       //
 
+      // Inform the custom servant dispatching (CSD) strategy that the
+      // sevant is activated.
+      this->poa_->servant_activated_hook (servant,
+                                          id
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
       ACE_UNUSED_ARG (non_servant_upcall);
@@ -1001,6 +1081,7 @@ namespace TAO
       return this->active_object_map_->remaining_activations (servant);
     }
 
+
     ::PortableServer::ServantRetentionPolicyValue
     ServantRetentionStrategyRetain::type() const
     {
@@ -1010,3 +1091,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 789604bbb9b..011d4513fa6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -14,12 +14,14 @@
 #define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
 #include /**/ "ace/pre.h"
 
-#include "ServantRetentionStrategyNonRetain.h"
+#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Root_POA;
 
 namespace TAO
@@ -103,6 +105,11 @@ namespace TAO
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
         ACE_ENV_ARG_DECL);
 
+      virtual int find_servant_priority (
+        const PortableServer::ObjectId &system_id,
+        CORBA::Short &priority
+        ACE_ENV_ARG_DECL);
+
       virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
@@ -181,5 +188,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index 476ea401ebf..f801a3b5e25 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ServantRetentionStrategyRetainFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyRetain.h"
+#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategyRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (PortableServer,
            ServantRetentionStrategyRetainFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -47,17 +49,20 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyRetainFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyRetainFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyRetainFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ServantRetentionStrategyRetainFactoryImpl,
+  ACE_TEXT ("ServantRetentionStrategyRetainFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ServantRetentionStrategyRetainFactoryImpl,
+  TAO::Portable_Server::ServantRetentionStrategyRetainFactoryImpl)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
index 9fd7a80ee08..1dbddfbb378 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ServantRetentionStrategyFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -39,11 +41,14 @@ namespace TAO
         ServantRetentionStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 170196e7695..a91077fe966 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Servant_Base.h"
-#include "Root_POA.h"
-#include "Operation_Table.h"
-#include "POA_Current_Impl.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
@@ -23,7 +23,7 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "Servant_Base.i"
+# include "tao/PortableServer/Servant_Base.i"
 #endif /* ! __ACE_INLINE__ */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -46,6 +46,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ServantBase::TAO_ServantBase (void)
   : TAO_Abstract_ServantBase ()
   , ref_count_ (1)
@@ -477,3 +479,4 @@ TAO_ServantBase_var::_retn (void)
   return retval;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 1edd4812af9..486369efbed 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PS_ForwardC.h"
-#include "ace/Atomic_Op.h"
+#include "tao/PortableServer/PS_ForwardC.h"
 #include "tao/Abstract_Servant_Base.h"
+#include "ace/Atomic_Op.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Operation_Table;
 
@@ -217,8 +219,10 @@ private:
   TAO_ServantBase *ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Servant_Base.i"
+# include "tao/PortableServer/Servant_Base.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index a0f38b795a9..a975c809e62 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_ServantBase_var::TAO_ServantBase_var (void)
@@ -41,3 +42,4 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
   return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (servant));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index f90cb97c96a..05f34b15345 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,11 +1,16 @@
-// @(#) $Id$
+// $Id$
 
-#include "Servant_Dispatcher.h"
+#include "tao/PortableServer/Servant_Dispatcher.h"
 
 ACE_RCSID(PortableServer,
           Servant_Dispatcher,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index a71b949d84e..d2741f46546 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,20 +14,25 @@
 #define TAO_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/Servant_Upcall.h"
 #include "ace/SStringfwd.h"
-#include "Servant_Upcall.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references.
 class TAO_POA_Manager;
 class TAO_POA_Policy_Set;
 class TAO_Root_POA;
-class ACE_Lock;
 class TAO_ORB_Core;
 class TAO_ServerRequest;
 
@@ -74,5 +79,7 @@ public:
       ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h
index 2e533e63a6b..7ab08442408 100644
--- a/TAO/tao/PortableServer/Servant_Location.h
+++ b/TAO/tao/PortableServer/Servant_Location.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 enum TAO_SERVANT_LOCATION
 {
   TAO_SERVANT_FOUND,
@@ -29,6 +31,8 @@ enum TAO_SERVANT_LOCATION
   TAO_SERVANT_NOT_FOUND
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SERVANT_LOCATION_H */
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index 5529135be6c..5df9cff3d57 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Object_Adapter.h"
-#include "Servant_Upcall.h"
-#include "Root_POA.h"
-#include "Default_Servant_Dispatcher.h"
-#include "Collocated_Object_Proxy_Broker.h"
-#include "Active_Object_Map_Entry.h"
-#include "ForwardRequestC.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Default_Servant_Dispatcher.h"
+#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
+#include "tao/PortableServer/Active_Object_Map_Entry.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 
 // -- TAO Include --
 #include "tao/ORB.h"
@@ -14,7 +14,7 @@
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Servant_Upcall.inl"
+# include "tao/PortableServer/Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_string.h"
@@ -23,6 +23,8 @@ ACE_RCSID (PortableServer,
            Servant_Upcall,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -41,9 +43,8 @@ namespace TAO
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
         active_object_map_entry_ (0)
     {
-      TAO_Adapter *adapter = oc->poa_adapter ();
       TAO_Object_Adapter *object_adapter =
-        dynamic_cast<TAO_Object_Adapter *>(adapter);
+        dynamic_cast<TAO_Object_Adapter *>(oc->poa_adapter ());
       this->object_adapter_ = object_adapter;
     }
 
@@ -99,7 +100,7 @@ namespace TAO
         ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                           TAO_Adapter::DS_FAILED);
 
-      // We have acquired the object adapater lock.  Record this for later
+      // We have acquired the object adapter lock.  Record this for later
       // use.
       this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
 
@@ -244,7 +245,7 @@ namespace TAO
         ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                           0);
 
-      // We have acquired the object adapater lock.  Record this for later
+      // We have acquired the object adapter lock.  Record this for later
       // use.
       this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
 
@@ -468,3 +469,5 @@ namespace TAO
     }
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index b9564e8d7a8..dff98e83559 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,6 +28,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 class TAO_Root_POA;
 class TAO_ServerRequest;
@@ -52,7 +54,8 @@ namespace TAO
      *
      * @brief This class finds out the POA and the servant to perform an
      * upcall.  It can only be instantiated without the object
-     * adapter's lock held.
+     * adapter's lock held. For each upcall a new instance of this
+     * class is created.
      */
     class TAO_PortableServer_Export Servant_Upcall
     {
@@ -89,7 +92,7 @@ namespace TAO
       };
 
       /// Constructor.
-      Servant_Upcall (TAO_ORB_Core *orb_core);
+      explicit Servant_Upcall (TAO_ORB_Core *orb_core);
 
       /// Destructor.
       ~Servant_Upcall (void);
@@ -232,12 +235,14 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "Servant_Upcall.inl"
+# include "tao/PortableServer/Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl
index 36c4739f457..5f016db3fe6 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Servant_Upcall.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -103,3 +105,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 991f39a5bab..f15942d5e54 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -12,6 +12,8 @@
 
 // ============================================================
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename to_S,
          typename from_S,
@@ -138,4 +140,6 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index e7d34f8494b..bb240a0a03f 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -155,6 +158,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Special_Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
index 38d18635683..6c3d9685b54 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename to_S,
          typename from_S,
@@ -91,3 +93,4 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
   return this->x_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h
index 29708781603..f306336fe83 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -27,6 +28,7 @@
 
 #include "ace/CDR_Stream.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -74,6 +76,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SPECIAL_BASIC_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index 98331b770b4..58a4bc04c11 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "StrategyFactory.h"
+#include "tao/PortableServer/StrategyFactory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            StrategyFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -16,3 +18,5 @@ namespace TAO
     }
   } /* namespace Portable_Server */
 } /* namespace TAO */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h
index 54546f1f946..b441256d214 100644
--- a/TAO/tao/PortableServer/StrategyFactory.h
+++ b/TAO/tao/PortableServer/StrategyFactory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file StrategyFactory.h
@@ -11,6 +12,7 @@
 
 #ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H
 #define TAO_PORTABLESERVER_STRATEGYFACTORY_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Service_Object.h"
@@ -19,12 +21,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    class StrategyFactory :
-      public ACE_Service_Object
+    class StrategyFactory
+      : public ACE_Service_Object
     {
     public:
       virtual ~StrategyFactory (void);
@@ -32,5 +38,8 @@ namespace TAO
   } /* namespace Portable_Server */
 } /* namespace TAO */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLESERVER_STRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index a314bcb436d..2268a11ae61 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,5 +1,5 @@
-#include "ThreadPolicy.h"
-#include "PortableServer.h"
+#include "tao/PortableServer/ThreadPolicy.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ThreadPolicy,
@@ -7,6 +7,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -63,4 +65,6 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index dc9673f59a7..a85fc863cb1 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -14,13 +14,13 @@
 #define TAO_PORTABLESERVER_THREADPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,6 +32,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -67,6 +69,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl
index a86084a88b5..9f37950dfb4 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.pidl
+++ b/TAO/tao/PortableServer/ThreadPolicy.pidl
@@ -17,7 +17,7 @@
 #ifndef _PORTABLESERVER_THREAD_POLICY_IDL_
 #define _PORTABLESERVER_THREAD_POLICY_IDL_
 
-#include <Policy.pidl>
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
index 87d85d78165..db3bb5be86d 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -35,12 +35,14 @@
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 
-#include "ThreadPolicyA.h"
+#include "tao/PortableServer/ThreadPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -114,5 +116,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h
index b74bf2f030e..d0b05bc3667 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.h
+++ b/TAO/tao/PortableServer/ThreadPolicyA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
-#include "ThreadPolicyC.h"
+#include "tao/PortableServer/portableserver_export.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -66,6 +68,8 @@ namespace PortableServer
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
index ac2f91049f7..20e68c44774 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "ThreadPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,6 +38,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -62,7 +64,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
     PortableServer::ThreadPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 PortableServer::ThreadPolicy_ptr
@@ -111,18 +113,18 @@ PortableServer::ThreadPolicy::_unchecked_narrow (
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 PortableServer::ThreadPolicy::_tao_release (ThreadPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -181,13 +183,15 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<PortableServer::ThreadPolicyValue> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
index 4af9f727a2b..e0f835a33b7 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.h
+++ b/TAO/tao/PortableServer/ThreadPolicyC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableServer
 {
 
@@ -230,6 +232,8 @@ namespace TAO
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 6f1d80b5c36..c3d6a446a4a 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -1,17 +1,20 @@
 // $Id$
 
-#include "ThreadStrategy.h"
+#include "tao/PortableServer/ThreadStrategy.h"
 
 ACE_RCSID (PortableServer,
            ThreadStrategy,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
     void
-    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
+    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/
+				   ACE_ENV_ARG_DECL_NOT_USED)
     {
     }
 
@@ -22,3 +25,4 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index fe992cb580e..622ad7d3748 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -14,21 +14,23 @@
 #define TAO_THREAD_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "Policy_Strategy.h"
+#include "tao/PortableServer/Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 #include "tao/orbconf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
   {
-    class ThreadStrategy :
-       public Policy_Strategy
+    class ThreadStrategy
+      : public Policy_Strategy
     {
     public:
       virtual int enter () = 0;
@@ -44,5 +46,7 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_THREAD_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h
index 5dea79f8b41..a22078ed773 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactory.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h
@@ -12,15 +12,18 @@
 
 #ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
 #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
+
 #include /**/ "ace/pre.h"
 
-#include "StrategyFactory.h"
+#include "tao/PortableServer/StrategyFactory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -44,5 +47,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index b12fb95bb29..b21116e42b1 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ThreadStrategyFactoryImpl.h"
-#include "ThreadStrategy.h"
+#include "tao/PortableServer/ThreadStrategyFactoryImpl.h"
+#include "tao/PortableServer/ThreadStrategy.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -9,6 +9,8 @@ ACE_RCSID (PortableServer,
            ThreadStrategyFactoryImpl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -80,17 +82,21 @@ namespace TAO
         }
       }
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategyFactoryImpl,
-        ACE_TEXT ("ThreadStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ThreadStrategyFactoryImpl,
+  ACE_TEXT ("ThreadStrategyFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ThreadStrategyFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ThreadStrategyFactoryImpl,
+  TAO::Portable_Server::ThreadStrategyFactoryImpl)
+
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index 9ffb364e529..cfe8b44147c 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ThreadStrategyFactory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -39,11 +41,13 @@ namespace TAO
         ThreadStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl)
+
 #include /**/ "ace/post.h"
 #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index abec20789c5..44edaa4b6a9 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "ThreadStrategyORBControl.h"
+#include "tao/PortableServer/ThreadStrategyORBControl.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            ThreadStrategyORBControl,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -28,17 +30,21 @@ namespace TAO
     {
       return ::PortableServer::ORB_CTRL_MODEL;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyORBControl)
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategyORBControl,
-        ACE_TEXT ("ThreadStrategyORBControl"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategyORBControl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ThreadStrategyORBControl,
+  TAO::Portable_Server::ThreadStrategyORBControl)
+
+ACE_STATIC_SVC_DEFINE (
+  ThreadStrategyORBControl,
+  ACE_TEXT ("ThreadStrategyORBControl"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ThreadStrategyORBControl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
index c0f4ff5cd8f..d88997c2214 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -12,17 +12,20 @@
 
 #ifndef TAO_THREADSTRATEGYORBCONTROL_H
 #define TAO_THREADSTRATEGYORBCONTROL_H
+
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadStrategy.h"
-#include "ace/Service_Config.h"
+#include "tao/PortableServer/ThreadStrategy.h"
 #include "tao/orbconf.h"
+#include "ace/Service_Config.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -38,11 +41,14 @@ namespace TAO
 
       virtual ::PortableServer::ThreadPolicyValue type() const;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl)
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_THREADSTRATEGYORBCONTROL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 0212e5a092e..2a903d2876b 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ThreadStrategySingle.h"
+#include "tao/PortableServer/ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -10,6 +10,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -31,18 +33,22 @@ namespace TAO
     {
       return ::PortableServer::SINGLE_THREAD_MODEL;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle)
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategySingle,
-        ACE_TEXT ("ThreadStrategySingle"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategySingle),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ThreadStrategySingle,
+  TAO::Portable_Server::ThreadStrategySingle)
+
+ACE_STATIC_SVC_DEFINE (
+  ThreadStrategySingle,
+  ACE_TEXT ("ThreadStrategySingle"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ThreadStrategySingle),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
index b10a56f0bb4..0836472a09e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -14,13 +14,16 @@
 #define TAO_THREADSTRATEGYSINGLE_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ThreadStrategy.h"
+#include "tao/PortableServer/ThreadStrategy.h"
+
+#include "tao/orbconf.h"
+
 #include "ace/Service_Config.h"
 
 // Locking
@@ -29,10 +32,11 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
 
-#include "tao/orbconf.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -49,12 +53,14 @@ namespace TAO
     private:
       TAO_SYNCH_RECURSIVE_MUTEX lock_;
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index e5df89cc177..b718ea02ef2 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "ThreadStrategySingleFactoryImpl.h"
-#include "ThreadStrategy.h"
-#include "ThreadStrategySingle.h"
+#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
+#include "tao/PortableServer/ThreadStrategy.h"
+#include "tao/PortableServer/ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -49,18 +51,22 @@ namespace TAO
 
       delete strategy;
     }
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategySingleFactoryImpl,
-        ACE_TEXT ("ThreadStrategySingleFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingleFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DEFINE (
+  ThreadStrategySingleFactoryImpl,
+  ACE_TEXT ("ThreadStrategySingleFactory"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  ThreadStrategySingleFactoryImpl,
+  TAO::Portable_Server::ThreadStrategySingleFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index 260ea7cf4bc..e04f0995a42 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -14,7 +14,7 @@
 #define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -41,12 +43,14 @@ namespace TAO
         ThreadStrategy *strategy
         ACE_ENV_ARG_DECL);
     };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
+ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
index 0314b900e76..2e0f067d2fd 100644
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
@@ -24,6 +24,7 @@
 #include "tao/PortableServer/Object_SArgument_T.h"
 #include "tao/Pseudo_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -55,6 +56,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TYPECODE_SARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index c5d7730469f..7f8db0408f5 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename S_var>
 CORBA::Boolean
@@ -99,4 +100,6 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_UB_STRING_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index 3d681d3e0d9..ac1202a2d4f 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -141,6 +143,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
index daf8637012c..b60809e056d 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S, typename S_var>
 ACE_INLINE
 TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void)
@@ -58,3 +62,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void)
   return this->x_.out ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h
index fd3440e5804..e86e7c0ae24 100644
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ b/TAO/tao/PortableServer/UB_String_SArguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -24,6 +25,8 @@
 #include "tao/PortableServer/UB_String_SArgument_T.h"
 #include "tao/PortableServer/SArg_Traits_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -49,6 +52,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_UB_STRING_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index ebfa73dac9b..dd6b7d8e85f 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Upcall_Command.h"
+#include "tao/PortableServer/Upcall_Command.h"
 
 
 ACE_RCSID (PortableServer,
@@ -8,6 +8,10 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Upcall_Command::~Upcall_Command (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 700ad64090c..40c216457f7 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -16,12 +16,15 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/PortableServer/portableserver_export.h"
-#include "ace/CORBA_macros.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+#include "ace/CORBA_macros.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -57,6 +60,7 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index dde1cedfad6..2e9b1f1564d 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Upcall_Wrapper.h"
-#include "Upcall_Command.h"
+#include "tao/PortableServer/Upcall_Wrapper.h"
+#include "tao/PortableServer/Upcall_Command.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ServerRequestInterceptor_Adapter.h"
@@ -14,12 +14,14 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
 #include "tao/Argument.h"
+#include "tao/operation_details.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            Upcall_Wrapper,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
@@ -47,6 +49,32 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
+  // Make sure that, for the collocated case, we use the client-side
+  // arguments.  For the non-collocated case, we will use the server-side
+  // arguments since they got set up in our pre_upcall() method.  Note that
+  // our pre_upcall() method doesn't get invoked in the collocated case,
+  // and is the reason why we need to provide the client-side args instead
+  // of the (never set or initialized) server-side args.
+  //
+  // Before the following logic was added, the
+  // $TAO_ROOT/tests/Portable_Interceptors/Collocated/run_test.pl
+  // showed that the server-side request interceptor was getting bogus
+  // values when it took a look at the request arguments.  Some
+  // additional testing revealed that this only occurred in the
+  // collocated request case.
+
+  // By default, we assume that we will use the server-side args.
+  TAO::Argument * const * the_args = args;
+  size_t the_nargs = nargs;
+
+  if (server_request.collocated())
+    {
+      // It is a collocated request so we need to use the client-side
+      // args instead.
+      the_args = server_request.operation_details()->args();
+      the_nargs = server_request.operation_details()->args_num();
+    }
+
   TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
     server_request.orb_core ()->serverrequestinterceptor_adapter ();
 
@@ -57,8 +85,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
           {
             // Invoke intermediate server side interception points.
             interceptor_adapter->receive_request (server_request,
-                                                  args,
-                                                  nargs,
+                                                  the_args,
+                                                  the_nargs,
                                                   servant_upcall,
                                                   exceptions,
                                                   nexceptions
@@ -112,8 +140,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
               // No location forward by interceptors and successful upcall.
               server_request.reply_status (PortableInterceptor::SUCCESSFUL);
               interceptor_adapter->send_reply (server_request,
-                                               args,
-                                               nargs,
+                                               the_args,
+                                               the_nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -136,8 +164,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       if (interceptor_adapter != 0)
         {
           interceptor_adapter->send_exception (server_request,
-                                               args,
-                                               nargs,
+                                               the_args,
+                                               the_nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -172,8 +200,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       if (interceptor_adapter != 0)
         {
           interceptor_adapter->send_exception (server_request,
-                                               args,
-                                               nargs,
+                                               the_args,
+                                               the_nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -265,4 +293,10 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
           ACE_CHECK;
         }
     }
+
+ // Reply body marshaling completed.  No other fragments to send.
+  cdr.more_fragments (false);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index c6d62419310..f0ba3f1c7e0 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
@@ -28,6 +28,8 @@
 #include "ace/CORBA_macros.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ServantBase;
 class TAO_ServerRequest;
 class TAO_InputCDR;
@@ -122,6 +124,7 @@ namespace TAO
 
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index b7009ed3baa..06a9e5014a4 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -9,6 +9,7 @@
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -160,4 +161,6 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_VAR_ARRAY_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index ab4418314e6..db7835de063 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -171,6 +173,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
index 30674cca189..bbc5dd80950 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -115,3 +116,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,
   return this->x_.out ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index 64b6229bd10..33c151f6bb9 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -10,6 +10,8 @@
 #endif /* __ACE_INLINE__ */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename Insert_Policy>
 CORBA::Boolean
@@ -110,4 +112,6 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_VAR_SIZE_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index 14585cc096a..99046ca2655 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -149,6 +151,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
index 7c516b117ec..11d13f2e9e2 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename Insert_Policy>
 S const &
@@ -66,3 +68,4 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void)
   return this->x_.out ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h
index bf7a2fc892f..38c21f200c9 100644
--- a/TAO/tao/PortableServer/get_arg.h
+++ b/TAO/tao/PortableServer/get_arg.h
@@ -31,6 +31,7 @@
 
 #include "tao/operation_details.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -79,7 +80,7 @@ namespace TAO
                 size_t i)
     {
       return
-        details
+        (details != 0 && details->args () != 0)
         ? static_cast<typename TAO::Arg_Traits<T>::in_arg_val *> (
             details->args ()[i])->arg ()
         : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
@@ -135,6 +136,8 @@ namespace TAO
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_GET_ARG_H*/
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index ca9e01b11d8..4ef9552bfd4 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -1,10 +1,14 @@
+// -*- C++ -*-
+
 // $Id$
 
 #ifndef TAO_POA_MACROS_H
 #define TAO_POA_MACROS_H
+
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
 #include "tao/orbconf.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,4 +39,5 @@
   ACE_CHECK_RETURN (RETURN)
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index 048c289c0e5..f7fed0a138c 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -4,8 +4,8 @@
 // All Rights Reserved
 // ORB:		Principal identifier pseudo-objref
 
-#include "Principal.h"
-#include "CDR.h"
+#include "tao/Principal.h"
+#include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Principal.i"
@@ -15,6 +15,9 @@ ACE_RCSID (tao,
            Principal,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Principal::Principal (void)
   : refcount_ (1)
 {
@@ -61,3 +64,4 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x)
   return (CORBA::Boolean) cdr.good_bit ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 4010df0a507..d080b3f1bb7 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,16 +18,20 @@
 #define TAO_PRINCIPAL_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
+
+#include "tao/CORBA_methods.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/OctetSeqC.h"
+#include "tao/Pseudo_VarOut_T.h"
+
+#include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
-#include "OctetSeqC.h"
-#include "Pseudo_VarOut_T.h"
-#include "CORBA_methods.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -100,6 +104,8 @@ operator<< (TAO_OutputCDR &, CORBA::Principal *);
 TAO_Export CORBA::Boolean
 operator>> (TAO_InputCDR &, CORBA::Principal *&);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Principal.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
index 559ddb82db0..5c7ef0d666a 100644
--- a/TAO/tao/Principal.i
+++ b/TAO/tao/Principal.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::Principal_ptr principal)
@@ -59,3 +61,4 @@ CORBA::Principal::_nil (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index c6730ac24cb..9879ff26ef4 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -16,7 +16,7 @@
 #include "ace/os_include/os_ctype.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Profile.i"
+#include "tao/Profile.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -26,6 +26,9 @@ ACE_RCSID (tao,
 
 
 // ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Profile::TAO_Profile (CORBA::ULong tag,
                           TAO_ORB_Core *orb_core,
                           const TAO::ObjectKey &obj_key,
@@ -85,7 +88,7 @@ CORBA::ULong
 TAO_Profile::_incr_refcnt (void)
 {
   ACE_GUARD_RETURN (ACE_Lock, guard, *this->refcount_lock_, 0);
-  return this->refcount_++;
+  return ++this->refcount_;
 }
 
 CORBA::ULong
@@ -93,7 +96,7 @@ TAO_Profile::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, mon, *this->refcount_lock_, 0);
-    this->refcount_--;
+    --this->refcount_;
 
     if (this->refcount_ != 0)
       {
@@ -948,3 +951,5 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
 
   return (CORBA::Boolean) cdr.good_bit ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index a19068df002..d31e55b6257 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -25,7 +25,12 @@
 #include "tao/Refcounted_ObjectKey.h"
 #include "tao/Service_Callbacks.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_MProfile;
 class TAO_Stub;
 class TAO_Endpoint;
@@ -244,7 +249,7 @@ protected:
   virtual void create_profile_body (TAO_OutputCDR &cdr) const = 0;
 
   /**
-   * Helper for <decode>.  Decodes endpoints from a tagged component.
+   * Helper for decode().  Decodes endpoints from a tagged component.
    * Decode only if RTCORBA is enabled.  Furthermore, we may not find
    * TAO_TAG_ENDPOINTS component, e.g., if we are talking to nonRT
    * version of TAO or some other ORB.  This is not an error, and we
@@ -298,9 +303,9 @@ private:
   /// i.e. is not a GIOP 1.0 profile.
   void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL);
 
-  // Profiles should not be copied!
-  ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Profile&))
+  // Profiles should not be copied or assigned!
+  TAO_Profile (const TAO_Profile&);
+  void operator= (const TAO_Profile&);
 
   //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK
 
@@ -329,10 +334,10 @@ protected:
 
 private:
   /// IOP protocol tag.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
 
   /// Pointer to the ORB core
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// The TAO_MProfile which contains the profiles for the forwarded
   /// object.
@@ -352,7 +357,7 @@ private:
 // A helper class to handle the various kinds of octet sequences used
 // inside the ORB.
 
-typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
+typedef TAO::unbounded_value_sequence<CORBA::Octet> TAO_opaque;
 
 TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const TAO_opaque&);
@@ -415,8 +420,10 @@ private:
 
 //@@ TAO_PROFILE_SPL_EXTERN_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Profile.i"
+# include "tao/Profile.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i
index dde1611c1da..4cbbee30eb3 100644
--- a/TAO/tao/Profile.i
+++ b/TAO/tao/Profile.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_Profile::tag (void) const
 {
@@ -60,3 +63,5 @@ TAO_Profile::object_key (void) const
 {
   return this->ref_object_key_->object_key ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 8c88d2a7db0..123dc6c1425 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -1,28 +1,33 @@
 // $Id$
 
-#include "Profile_Transport_Resolver.h"
-#include "Profile.h"
-#include "Transport.h"
-#include "Stub.h"
-#include "Invocation_Endpoint_Selectors.h"
-#include "ORB_Core.h"
-#include "Endpoint_Selector_Factory.h"
-#include "Codeset_Manager.h"
-#include "Connector_Registry.h"
-#include "Transport_Connector.h"
-#include "Endpoint.h"
-#include "SystemException.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/Profile.h"
+#include "tao/Stub.h"
+#include "tao/Transport.h"
+#include "tao/Invocation_Endpoint_Selectors.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Endpoint_Selector_Factory.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/Connector_Registry.h"
+#include "tao/Transport_Connector.h"
+#include "tao/Endpoint.h"
+#include "tao/SystemException.h"
 
 #include "ace/Countdown_Time.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Profile_Transport_Resolver.inl"
+# include "tao/Profile_Transport_Resolver.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            Profile_Transport_Resolver,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -107,7 +112,7 @@ namespace TAO
 
     if (!this->transport_->is_tcs_set ())
       {
-        TAO_Codeset_Manager *tcm =
+        TAO_Codeset_Manager * const tcm =
           this->stub_->orb_core ()->codeset_manager ();
         if (tcm)
           tcm->set_tcs (*this->profile_, *this->transport_);
@@ -139,7 +144,7 @@ namespace TAO
 
     ACE_Time_Value connection_timeout;
 
-    const bool is_conn_timeout =
+    bool const is_conn_timeout =
       this->get_connection_timeout (connection_timeout);
 
 
@@ -215,4 +220,21 @@ namespace TAO
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   }
+
+
+  int
+  Profile_Transport_Resolver::find_transport (TAO_Transport_Descriptor_Interface *desc)
+  {
+    TAO::Transport_Cache_Manager & cache =
+      this->profile_->orb_core()->lane_resources ().transport_cache();
+
+    // the cache increments the reference count on the transport if the
+    // find is successful. Find_transport uses negative logic in its return,
+    // 0 for success
+    return (cache.find_transport(desc,this->transport_) == 0);
+  }
+
+
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 0dd849a04a5..5ec4889a76b 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -25,11 +25,16 @@
 
 #include "tao/SystemException.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Stub;
 class TAO_Profile;
 class TAO_Transport;
 class TAO_Endpoint;
-class ACE_Time_Value;
 class TAO_Transport_Descriptor_Interface;
 
 namespace CORBA
@@ -109,6 +114,13 @@ namespace TAO
     /// Accessor for the transport reserved for this invocation.
     TAO_Transport *transport (void) const;
 
+    /// See if the transport cache has an available transport and
+    /// use that one rather than trying to connect via the connector.
+    /// Separating this functionality enables the look up of many
+    /// endpoints before trying the more time-consuming trip through
+    /// the actual connector.
+    int find_transport (TAO_Transport_Descriptor_Interface *);
+
     /// Accessor to indicate whether we should block while
     /// establishing a connection.
     bool blocked_connect (void) const;
@@ -181,8 +193,10 @@ namespace TAO
   };
 } // TAO namespace end
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Profile_Transport_Resolver.inl"
+# include "tao/Profile_Transport_Resolver.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 2f35fa34c5b..3617d71e3da 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -1,5 +1,10 @@
 // -*- C++ -*-
+//
 // $Id$
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -8,12 +13,12 @@ namespace TAO
     TAO_Stub *stub,
     bool block)
     : obj_ (p)
-      , stub_ (stub)
-      , transport_ (0)
-      , profile_ (0)
-      , inconsistent_policies_ (0)
-      , is_released_ (false)
-      , blocked_ (block)
+    , stub_ (stub)
+    , transport_ (0)
+    , profile_ (0)
+    , inconsistent_policies_ (0)
+    , is_released_ (false)
+    , blocked_ (block)
   {
   }
 
@@ -67,3 +72,5 @@ namespace TAO
     return tmp;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index 5271761663e..7d67c460789 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
-#include "Protocol_Factory.h"
-#include "ace/Dynamic_Service.h"
+#include "tao/Protocol_Factory.h"
 
 ACE_RCSID (tao,
            Protocol_Factory,
            "$Id$")
 
-static const char prefix_[] = "\0";
+static const char the_prefix[] = "";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag)
   : tag_ (tag)
@@ -52,7 +53,7 @@ TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */)
 const char *
 TAO_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -61,3 +62,4 @@ TAO_Protocol_Factory::options_delimiter (void) const
   return '\0';
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
index 568be711664..7e0bcb71b0c 100644
--- a/TAO/tao/Protocol_Factory.h
+++ b/TAO/tao/Protocol_Factory.h
@@ -14,16 +14,19 @@
 #define TAO_PROTOCOL_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+
+#include "ace/Service_Object.h"
 #include "ace/SStringfwd.h"
 
-#include "TAO_Export.h"
-#include "Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -68,10 +71,14 @@ public:
   virtual int requires_explicit_endpoint (void) const = 0;
 
 private:
+
   /// IOP protocol tag.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PROTOCOL_FACTORY_H */
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index 604e01bf55e..444d92846a6 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "Protocols_Hooks.h"
+#include "tao/Protocols_Hooks.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
            Protocols_Hooks,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
   : send_buffer_size_ (0),
     recv_buffer_size_ (0),
@@ -50,8 +52,8 @@ TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
 {
 }
 
-/// destructor
 TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index c176aa2bc44..ddec97f4919 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -22,11 +22,14 @@
 
 #include "ace/Service_Object.h"
 
-#include "TAO_Export.h"
-#include "Basic_Types.h"
-#include "IOP_IORC.h"
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
+#include "tao/IOP_IORC.h"
 #include "ace/SString.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Policy;
@@ -200,6 +203,8 @@ public:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp
index 5d0a9ebc3cd..b63c21b6db9 100644
--- a/TAO/tao/Pseudo_VarOut_T.cpp
+++ b/TAO/tao/Pseudo_VarOut_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_PSEUDO_VAROUT_T_C
-#define TAO_PSEUDO_VAROUT_T_C
+#ifndef TAO_PSEUDO_VAROUT_T_CPP
+#define TAO_PSEUDO_VAROUT_T_CPP
 
 #include "tao/Pseudo_VarOut_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Pseudo_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Pseudo_VarOut_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 TAO_Pseudo_Var_T<T> &
@@ -19,10 +17,13 @@ TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p)
 {
   if (this != &p)
     {
-      CORBA::release (this->ptr_);
+      ::CORBA::release (this->ptr_);
       this->ptr_ = T::_duplicate (p.ptr ());
     }
 
   return *this;
 }
-#endif /* TAO_PSEUDO_VAROUT_T_C */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_PSEUDO_VAROUT_T_CPP */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 4d73bba0c55..1e55c7bc78f 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -42,6 +42,8 @@
 
 #include "tao/varbase.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Pseudo_Var_T
  *
@@ -81,7 +83,6 @@ public:
 
   // TAO extension.
   _retn_type    ptr (void) const;
-
 private:
 
   // Unimplemented - prevents widening assignment.
@@ -113,9 +114,7 @@ public:
   TAO_Pseudo_Out_T<T,T_var> & operator= (T *);
 
   operator T *& ();
-
   T *& ptr (void);
-
   T * operator-> (void);
 
 private:
@@ -125,6 +124,8 @@ private:
   TAO_Pseudo_Out_T<T,T_var> & operator= (const T_var &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Pseudo_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
index 7baddc74b88..cf2df832afc 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename T>
 ACE_INLINE
 TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
@@ -25,7 +27,7 @@ template <typename T>
 ACE_INLINE
 TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void)
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
 }
 
 template <typename T>
@@ -33,7 +35,7 @@ ACE_INLINE
 TAO_Pseudo_Var_T<T> &
 TAO_Pseudo_Var_T<T>::operator= (T * p)
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -81,7 +83,7 @@ ACE_INLINE
 T *&
 TAO_Pseudo_Var_T<T>::out (void)
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
   this->ptr_ = T::_nil ();
   return this->ptr_;
 }
@@ -119,7 +121,7 @@ ACE_INLINE
 TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (T_var & p)
   : ptr_ (p.out ())
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
   this->ptr_ = T::_nil ();
 }
 
@@ -151,15 +153,15 @@ TAO_Pseudo_Out_T<T,T_var>::operator= (T * p)
 
 template <typename T, typename T_var>
 ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var>::operator T *& ()
+T *&
+TAO_Pseudo_Out_T<T,T_var>::ptr (void)
 {
   return this->ptr_;
 }
 
 template <typename T, typename T_var>
 ACE_INLINE
-T *&
-TAO_Pseudo_Out_T<T,T_var>::ptr (void)
+TAO_Pseudo_Out_T<T,T_var>::operator T *& ()
 {
   return this->ptr_;
 }
@@ -171,3 +173,5 @@ TAO_Pseudo_Out_T<T,T_var>::operator-> (void)
 {
   return this->ptr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp
index 561fffca095..2c25a88cf7b 100644
--- a/TAO/tao/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource_Factory.cpp
@@ -1,16 +1,17 @@
 //$Id$
 
-#include "QtResource_Factory.h"
-#include "debug.h"
+#include "tao/QtResource_Factory.h"
+#include "tao/debug.h"
 #include "ace/QtReactor.h"
 
-ACE_RCSID( TAO_QtResource,
+ACE_RCSID (TAO_QtResource,
            QtResource_Factory,
            "$Id$");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-
   QtResource_Factory::QtResource_Factory (QApplication *qapp)
     : reactor_impl_ (0)
     , qapp_ (qapp)
@@ -30,7 +31,6 @@ namespace TAO
 
     if (!this->reactor_impl_)
       {
-
         ACE_NEW_RETURN (this->reactor_impl_,
                         ACE_QtReactor (qapp_),
                         0);
@@ -43,3 +43,5 @@ namespace TAO
     return this->reactor_impl_;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource_Factory.h
index 83e37e7a3af..ba922a44480 100644
--- a/TAO/tao/QtResource_Factory.h
+++ b/TAO/tao/QtResource_Factory.h
@@ -24,9 +24,10 @@
 #include "ace/QtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-
   /**
    * @class QtResource_Factory
    *
@@ -61,5 +62,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_QTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp
index 70fdae3053c..a735eaa6d87 100644
--- a/TAO/tao/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource_Loader.cpp
@@ -1,12 +1,14 @@
 //$Id$
-#include "QtResource_Loader.h"
-#include "ORB_Core.h"
-#include "QtResource_Factory.h"
+#include "tao/QtResource_Loader.h"
+#include "tao/ORB_Core.h"
+#include "tao/QtResource_Factory.h"
 
 ACE_RCSID( TAO_QtResource,
            QtResource_Loader,
            "$Id$");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   QtResource_Loader::QtResource_Loader (QApplication *qapp)
@@ -23,3 +25,5 @@ namespace TAO
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
index 14a2e6d84b6..212f2b51795 100644
--- a/TAO/tao/QtResource_Loader.h
+++ b/TAO/tao/QtResource_Loader.h
@@ -21,8 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include <qapplication.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -43,10 +47,12 @@ namespace TAO
   class TAO_QtResource_Export QtResource_Loader
   {
   public:
-    QtResource_Loader  (QApplication *qapp);
-
+    QtResource_Loader (QApplication *qapp);
     virtual ~QtResource_Loader (void);
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_QTRESOURCE_LOADER_H */
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index 0839bda6455..8b4b73072c9 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -1,15 +1,17 @@
-// -*- C++ -*-
 // $Id$
 
-#include "Queued_Message.h"
+#include "tao/Queued_Message.h"
 
 ACE_RCSID (tao,
            Queued_Message,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc,
                                         ACE_Allocator *alloc,
-                                        int is_heap_allocated)
+                                        bool is_heap_allocated)
   : allocator_ (alloc)
   , is_heap_created_ (is_heap_allocated)
   , orb_core_ (oc)
@@ -70,13 +72,14 @@ TAO_Queued_Message::push_back (TAO_Queued_Message *&head,
       head = this;
       this->next_ = 0;
       this->prev_ = 0;
-      return;
     }
-
-  tail->next_ = this;
-  this->prev_ = tail;
-  this->next_ = 0;
-  tail = this;
+  else
+    {
+      tail->next_ = this;
+      this->prev_ = tail;
+      this->next_ = 0;
+      tail = this;
+    }
 }
 
 void
@@ -89,11 +92,14 @@ TAO_Queued_Message::push_front (TAO_Queued_Message *&head,
       head = this;
       this->next_ = 0;
       this->prev_ = 0;
-      return;
     }
-
-  head->prev_ = this;
-  this->next_ = head;
-  this->prev_ = 0;
-  head = this;
+  else
+    {
+      head->prev_ = this;
+      this->next_ = head;
+      this->prev_ = 0;
+      head = this;
+    }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index c078f01d6b5..70defaa15cd 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -23,8 +23,14 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 struct iovec;
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 /**
@@ -71,7 +77,7 @@ public:
   /// Constructor
   TAO_Queued_Message (TAO_ORB_Core *oc,
                       ACE_Allocator *alloc = 0,
-                      int is_heap_allocated = 0);
+                      bool is_heap_allocated = false);
 
   /// Destructor
   virtual ~TAO_Queued_Message (void);
@@ -198,11 +204,10 @@ protected:
   ACE_Allocator *allocator_;
 
   /*
-   * A flag that acts as a boolean to indicate whether @a this is on
-   * stack or heap. A non-zero value indicates that @a this was created
-   * on  heap.
+   * A flag to indicate whether @a this is on stack or heap. A true value
+   * indicates that @a this was created on  heap.
    */
-  int is_heap_created_;
+  bool is_heap_created_;
 
   /// Cached copy of ORB_Core pointer
   TAO_ORB_Core *orb_core_;
@@ -213,6 +218,8 @@ private:
   TAO_Queued_Message *prev_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 9c548fafaf6..de53baf576f 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Continuous_Priority_Mapping.h"
+#include "tao/RTCORBA/Continuous_Priority_Mapping.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -8,6 +8,8 @@
 
 ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
   :  policy_ (policy)
 {
@@ -45,7 +47,7 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
       current_native_priority = next_native_priority;
     }
 
-  native_priority = current_native_priority;
+  native_priority = static_cast<RTCORBA::NativePriority> (current_native_priority);
   return 1;
 
 #else
@@ -128,4 +130,6 @@ TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priori
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
index a227587ae57..a2a4b976e7a 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Continuous_Priority_Mapping.h
@@ -21,8 +23,10 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtcorba_export.h"
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/rtcorba_export.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Continuous_Priority_Mapping
@@ -42,7 +46,6 @@
  * This class was previously called Direct_Priority_Mapping.
  *
  * \nosubgrouping
- *
  **/
 class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping
   : public TAO_Priority_Mapping
@@ -69,6 +72,8 @@ private:
   int max_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index e415bde990a..124b0bfefa9 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -4,13 +4,15 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Direct_Priority_Mapping.h"
+#include "tao/RTCORBA/Direct_Priority_Mapping.h"
 #include "ace/Sched_Params.h"
 
 ACE_RCSID(RTCORBA,
           Direct_Priority_Mapping,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
 }
@@ -35,4 +37,6 @@ TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index 1195b6e4f4d..ceee55ac971 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -1,4 +1,6 @@
-//=============================================================================
+// -*- C++ -*-
+
+// =======================================================================
 /**
  *  @file    Direct_Priority_Mapping.h
  *
@@ -9,6 +11,7 @@
  *
  *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
  */
+// =======================================================================
 
 #ifndef TAO_DIRECT_PRIORITY_MAPPING_H
 #define TAO_DIRECT_PRIORITY_MAPPING_H
@@ -16,7 +19,7 @@
 
 #include "tao/orbconf.h"
 
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +27,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Direct_Priority_Mapping
  *
@@ -34,7 +39,7 @@
 class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
 {
 public:
-  /// Default constructor
+
   TAO_Direct_Priority_Mapping (long);
 
   /// The destructor
@@ -46,10 +51,10 @@ public:
   virtual CORBA::Boolean
       to_CORBA (RTCORBA::NativePriority native_priority,
                 RTCORBA::Priority &corba_priority);
-
-private:
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 084c47418b2..68d4353dbd8 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -5,7 +5,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Linear_Network_Priority_Mapping.h"
+#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h"
 #include "tao/debug.h"
 
 #include "ace/Sched_Params.h"
@@ -39,7 +39,7 @@ ACE_RCSID (RTCORBA,
 #define IPDSFIELD_CE_MASK       0x01
 #define IPDSFIELD_DSCP_EF       0x2E
 
-static int dscp [] =
+static int const dscp[] =
 {
   IPDSFIELD_DSCP_DEFAULT ,
   IPDSFIELD_DSCP_CS1     ,
@@ -65,7 +65,7 @@ static int dscp [] =
 };
 
 /*
-static const char *dscp_char[]=
+static const char * const dscp_char[]=
 {
   "Normal",
   "CS1",
@@ -91,6 +91,8 @@ static const char *dscp_char[]=
 };
 */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long)
 {
 }
@@ -135,4 +137,6 @@ TAO_Linear_Network_Priority_Mapping::to_CORBA (RTCORBA::NetworkPriority network_
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
index 34783c3b1c5..5c8410bf943 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -22,8 +24,8 @@
 
 #include "tao/orbconf.h"
 
-#include "rtcorba_export.h"
-#include "Network_Priority_Mapping.h"
+#include "tao/RTCORBA/rtcorba_export.h"
+#include "tao/RTCORBA/Network_Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +33,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Linear_Network_Priority_Mapping
  *
@@ -42,8 +46,8 @@
 class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
 public:
-  /// Default constructor
-  TAO_Linear_Network_Priority_Mapping (long policy);
+
+  TAO_Linear_Network_Priority_Mapping (long);
 
   CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
                              RTCORBA::NetworkPriority &network_priority);
@@ -52,6 +56,8 @@ public:
                            RTCORBA::Priority &corba_priority);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index c793c7cfa0d..f6889d5a7c5 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -4,7 +4,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Linear_Priority_Mapping.h"
+#include "tao/RTCORBA/Linear_Priority_Mapping.h"
 #include "tao/debug.h"
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
@@ -13,11 +13,14 @@ ACE_RCSID (RTCORBA,
            Linear_Priority_Mapping,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
   : policy_ (policy)
+  , min_ (ACE_Sched_Params::priority_min (this->policy_))
+  , max_ (ACE_Sched_Params::priority_max (this->policy_))
 {
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
 }
 
 TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
@@ -25,8 +28,9 @@ TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
 }
 
 CORBA::Boolean
-TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                        RTCORBA::NativePriority &native_priority)
+TAO_Linear_Priority_Mapping::to_native (
+  RTCORBA::Priority corba_priority,
+  RTCORBA::NativePriority &native_priority)
 {
   if (corba_priority < RTCORBA::minPriority
            // The line below will always be false unless the value of
@@ -56,11 +60,11 @@ TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
        / (RTCORBA::maxPriority - RTCORBA::minPriority));
 
   // Now, find the value corresponding to this index.
-  native_priority = this->min_;
+  native_priority = static_cast<RTCORBA::NativePriority> (this->min_);
   for (int i = 2; i <= native_priority_index; ++i)
     {
-      native_priority = ACE_Sched_Params::next_priority (this->policy_,
-                                                         native_priority);
+      native_priority = static_cast<RTCORBA::NativePriority> 
+	(ACE_Sched_Params::next_priority (this->policy_, native_priority));
     }
   return 1;
 
@@ -110,10 +114,9 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
   int delta = total - 1;
   if (delta != 0)
     {
-      corba_priority =
-        RTCORBA::minPriority
-        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-           * (native_priority_index - 1) / delta);
+      corba_priority = static_cast<RTCORBA::Priority> (RTCORBA::minPriority
+          + ((RTCORBA::maxPriority - RTCORBA::minPriority)
+          * (native_priority_index - 1) / delta));
     }
   else
     {
@@ -160,4 +163,6 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
 #endif /* ACE_WIN32 */
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index bee37377c26..164e7f024b7 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
@@ -23,8 +25,8 @@
 
 #include "tao/orbconf.h"
 
-#include "rtcorba_export.h"
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/rtcorba_export.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +34,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Linear_Priority_Mapping
  *
@@ -51,22 +55,22 @@ public:
   /// The destructor
   virtual ~TAO_Linear_Priority_Mapping (void);
 
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
+  virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
+				    RTCORBA::NativePriority &native_priority);
+  virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority,
+				   RTCORBA::Priority &corba_priority);
 
 private:
   /// The scheduling policy
   long policy_;
 
   // The range
-  int min_;
-  int max_;
+  int const min_;
+  int const max_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 2704acc9628..b53c0995b31 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -1,5 +1,4 @@
 // $Id$
-// Multi_Priority_Mapping.cpp,v 1.0
 
 #include "tao/orbconf.h"
 
@@ -14,20 +13,22 @@ ACE_RCSID (RTCORBA,
            Multi_Priority_Mapping,
            "$Id$")
 
-TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (int base_native_priority,
-                                                        int base_corba_priority,
-                                                        int priority_spacing,
-                                                        int priorities_contiguous,
-                                                        int policy)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (
+  int base_native_priority,
+  int base_corba_priority,
+  int priority_spacing,
+  int priorities_contiguous,
+  int policy)
   :  base_native_priority_ (base_native_priority)
   ,  base_corba_priority_ (base_corba_priority)
   ,  priority_spacing_ (priority_spacing)
   ,  priorities_contiguous_(priorities_contiguous)
   ,  policy_ (policy)
+  ,  min_ (ACE_Sched_Params::priority_min (this->policy_))
+  ,  max_ (ACE_Sched_Params::priority_max (this->policy_))
 {
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-
   if ( this->min_ < this->max_ )
   {
      if (base_native_priority_ < this->min_)
@@ -91,7 +92,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
   if (corba_priority == base_corba_priority_)
   {
      // If this is the highest priority endpoint, then just give it the highest priority corba base priority
-     native_priority = base_native_priority_;
+     native_priority = static_cast<RTCORBA::NativePriority> (base_native_priority_);
   }
   else
   {
@@ -99,11 +100,13 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           native_priority = ( (corba_priority - base_corba_priority_) / priority_spacing_ ) + base_native_priority_;
+           native_priority = static_cast<RTCORBA::NativePriority> 
+	     (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_);
         }
         else
         {
-           native_priority = ( (base_corba_priority_ - corba_priority) / priority_spacing_ ) + base_native_priority_;
+           native_priority = static_cast<RTCORBA::NativePriority> 
+	     (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_);
         }
      }
      else
@@ -128,9 +131,10 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
         last_priority = this->base_native_priority_;
         for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++)
         {
-           native_priority = ACE_Sched_Params::previous_priority (this->policy_,
-                                                                  last_priority,
-                                                                  ACE_SCOPE_THREAD);
+           native_priority = static_cast<RTCORBA::NativePriority> 
+	     (ACE_Sched_Params::previous_priority (this->policy_,
+	                                           last_priority,
+                                                   ACE_SCOPE_THREAD));
         }
      }
   }
@@ -159,7 +163,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
   if (native_priority == base_native_priority_)
   {
      // If this is the highest priority endpoint, then just give it the highest priority corba base priority
-     corba_priority = base_corba_priority_;
+     corba_priority = static_cast<RTCORBA::Priority> (base_corba_priority_);
   }
   else
   {
@@ -167,11 +171,13 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           corba_priority = ( (native_priority - base_native_priority_) * priority_spacing_ ) + base_corba_priority_;
+           corba_priority = static_cast<RTCORBA::Priority> 
+	     (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_);
         }
         else
         {
-           corba_priority = ( (base_native_priority_ - native_priority) * priority_spacing_ ) + base_corba_priority_;
+           corba_priority = static_cast<RTCORBA::Priority> 
+	     (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_);
         }
      }
      else
@@ -224,11 +230,14 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
            priority_ndx++;
         }
 
-        corba_priority = base_corba_priority_ - priority_ndx;
+        corba_priority = static_cast<RTCORBA::Priority> 
+	  (base_corba_priority_ - priority_ndx);
      }
   }
 
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index 6d5b3623dc7..a3b3b58ec75 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -1,5 +1,6 @@
+// -*- C++ -*-
+
 // $Id$
-// Multi_Priority_Mapping.h,v 1.0
 
 // ============================================================================
 //
@@ -30,6 +31,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Multi_Priority_Mapping
  *
@@ -41,7 +44,8 @@
  * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
  * priorities (0...32767)
  */
-class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping : public TAO_Priority_Mapping
+class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping
+: public TAO_Priority_Mapping
 {
 public:
   /// Default constructor
@@ -82,11 +86,13 @@ private:
   /// The scheduling policy
   int policy_;
 
-  int min_;
-  int max_;
+  int const min_;
+  int const max_;
   // The range
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #endif /* TAO_MULTI_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index cc7eb22da38..b896b6c61d2 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/orbconf.h"
 
-#include "Network_Priority_Mapping.h"
+#include "tao/RTCORBA/Network_Priority_Mapping.h"
 
 ACE_RCSID(RTCORBA,
           Network_Priority_Mapping,
@@ -10,8 +10,12 @@ ACE_RCSID(RTCORBA,
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
index 5c847b1f984..4fa09f454f4 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,11 +26,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Network_Priority_Mapping
  *
@@ -51,6 +54,8 @@ public:
 	      RTCORBA::Priority &corba_priority) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
index 80380c5d6ad..387adcf5677 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -1,22 +1,24 @@
 // $Id$
 
-#include "Network_Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #if ! defined (__ACE_INLINE__)
-#include "Network_Priority_Mapping_Manager.i"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (RTCORBA, 
            Network_Priority_Mapping_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager (
     void
   )
 {
-  delete mapping_;
+  delete this->mapping_;
 }
 
 TAO_Network_Priority_Mapping_Manager_ptr
@@ -52,5 +54,8 @@ TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const
 {
   return "IDL:Network_Priority_Mapping_Manager:1.0";
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index bd9a33202cd..7237c16ad55 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -16,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,9 +24,11 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Network_Priority_Mapping.h"
+#include "tao/RTCORBA/Network_Priority_Mapping.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Network_Priority_Mapping_Manager;
 class TAO_Network_Priority_Mapping_Manager_var;
 typedef TAO_Network_Priority_Mapping_Manager *TAO_Network_Priority_Mapping_Manager_ptr;
@@ -145,8 +147,10 @@ private:
   TAO_Network_Priority_Mapping_Manager_ptr &ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Network_Priority_Mapping_Manager.i"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
index 6a483ec6cd9..919fecdfcab 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Inline operations for class TAO_Network_Priority_Mapping_Manager_var
 // *************************************************************
@@ -207,14 +211,15 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO
 ACE_INLINE RTCORBA::NetworkPriorityMapping *
 TAO_Network_Priority_Mapping_Manager::mapping (void)
 {
-  return mapping_;
+  return this->mapping_;
 }
 
 ACE_INLINE void
 TAO_Network_Priority_Mapping_Manager::mapping (RTCORBA::NetworkPriorityMapping *mapping)
 {
-  delete mapping_;
-  mapping_ = mapping;
+  delete this->mapping_;
+  this->mapping_ = mapping;
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index 99ad2c6bbfd..ae4f6ebcf3f 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -4,13 +4,18 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
 
 ACE_RCSID(RTCORBA,
           Priority_Mapping,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h
index 0e1bcbce46e..10425814b01 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping.h
@@ -27,9 +27,11 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Priority_Mapping
  *
@@ -51,6 +53,8 @@ public:
                 RTCORBA::Priority &corba_priority) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 11a7d1c9ed3..47f3804489a 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
-#include "Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #if ! defined (__ACE_INLINE__)
-#include "Priority_Mapping_Manager.i"
+#include "tao/RTCORBA/Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (RTCORBA, 
            Priority_Mapping_Manager, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
 {
-  delete mapping_;
+  delete this->mapping_;
 }
 
 TAO_Priority_Mapping_Manager_ptr
@@ -46,5 +48,7 @@ TAO_Priority_Mapping_Manager::_interface_repository_id (void) const
   return "IDL:Priority_Mapping_Manager:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 3b5d06c7808..e5b63369e51 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Priority_Mapping_Manager.h
@@ -15,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,9 +24,11 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Priority_Mapping_Manager;
 class TAO_Priority_Mapping_Manager_var;
 typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr;
@@ -139,8 +142,10 @@ private:
   TAO_Priority_Mapping_Manager_ptr &ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Priority_Mapping_Manager.i"
+#include "tao/RTCORBA/Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
index 77eb6dec547..4d8fa4007ab 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Inline operations for class TAO_Priority_Mapping_Manager_var
 // *************************************************************
@@ -207,14 +211,14 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap
 ACE_INLINE RTCORBA::PriorityMapping *
 TAO_Priority_Mapping_Manager::mapping (void)
 {
-  return mapping_;
+  return this->mapping_;
 }
 
 ACE_INLINE void
 TAO_Priority_Mapping_Manager::mapping (RTCORBA::PriorityMapping *mapping)
 {
-  delete mapping_;
-  mapping_ = mapping;
+  delete this->mapping_;
+  this->mapping_ = mapping;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index f1bf07f576d..3f29493da22 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -1,16 +1,20 @@
 // $Id$
 
-#include "RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 #if TAO_HAS_CORBA_MESSAGING == 1
 
-#include "RT_ORB_Loader.h"
+#include "tao/RTCORBA/RT_ORB_Loader.h"
 
 ACE_RCSID (RTCORBA, RTCORBA, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index f996f03c640..ead9d8ce329 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 //=============================================================================
@@ -19,7 +21,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +31,8 @@
 
 #if TAO_HAS_CORBA_MESSAGING == 1
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
 {
 public:
@@ -38,8 +42,10 @@ public:
 
 static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #endif /* TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index 327f4441339..703ae6c7732 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -52,9 +52,9 @@
 #ifndef _RT_CORBA_IDL_
 #define _RT_CORBA_IDL_
 
-#include <IOP.pidl>
-#include <TimeBase.pidl>
-#include <Policy.pidl>
+#include "tao/IOP.pidl"
+#include "tao/TimeBase.pidl"
+#include "tao/Policy.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 586a636e497..5f9260f6d8e 100644
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -35,7 +35,7 @@
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
-#include "RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -43,6 +43,8 @@
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/AnyTypeCode/IOP_IORA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -2465,3 +2467,5 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index bcf7695da87..fa163250e7a 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -43,6 +43,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,10 +67,10 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::ThreadpoolLane::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -78,7 +80,7 @@ RTCORBA::ThreadpoolLane::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
@@ -90,7 +92,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void)
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::ThreadpoolLane
       >
     (max)
@@ -102,7 +104,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
     RTCORBA::ThreadpoolLane * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::ThreadpoolLane
       >
     (max, length, buffer, release)
@@ -111,7 +113,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
     const ThreadpoolLanes &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::ThreadpoolLane
       >
     (seq)
@@ -149,7 +151,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release (
     RTCORBA::PriorityModelPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -173,12 +175,12 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityModelPolicy *_tao_tmp_pointer =
     static_cast<PriorityModelPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -206,18 +208,18 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow (
 RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -282,7 +284,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release (
     RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
@@ -306,12 +308,12 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolPolicy *_tao_tmp_pointer =
     static_cast<ThreadpoolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
@@ -339,18 +341,18 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
 RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -415,7 +417,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
     RTCORBA::ProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::ProtocolProperties_ptr
@@ -439,12 +441,12 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *_tao_tmp_pointer =
     static_cast<ProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ProtocolProperties_ptr
@@ -472,18 +474,18 @@ RTCORBA::ProtocolProperties::_unchecked_narrow (
 RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -526,10 +528,10 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::Protocol::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -539,7 +541,7 @@ RTCORBA::Protocol::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
@@ -551,7 +553,7 @@ RTCORBA::ProtocolList::ProtocolList (void)
 RTCORBA::ProtocolList::ProtocolList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::Protocol
       >
     (max)
@@ -563,7 +565,7 @@ RTCORBA::ProtocolList::ProtocolList (
     RTCORBA::Protocol * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::Protocol
       >
     (max, length, buffer, release)
@@ -572,7 +574,7 @@ RTCORBA::ProtocolList::ProtocolList (
 RTCORBA::ProtocolList::ProtocolList (
     const ProtocolList &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::Protocol
       >
     (seq)
@@ -610,7 +612,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release (
     RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
@@ -634,12 +636,12 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerProtocolPolicy *_tao_tmp_pointer =
     static_cast<ServerProtocolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
@@ -667,18 +669,18 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
 RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -743,7 +745,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release (
     RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
@@ -767,12 +769,12 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientProtocolPolicy *_tao_tmp_pointer =
     static_cast<ClientProtocolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
@@ -800,18 +802,18 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
 RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -876,7 +878,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release (
     RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
@@ -900,12 +902,12 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrivateConnectionPolicy *_tao_tmp_pointer =
     static_cast<PrivateConnectionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
@@ -933,18 +935,18 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
 RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1009,7 +1011,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release (
     RTCORBA::TCPProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::TCPProtocolProperties_ptr
@@ -1033,12 +1035,12 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   TCPProtocolProperties *_tao_tmp_pointer =
     static_cast<TCPProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::TCPProtocolProperties_ptr
@@ -1066,18 +1068,18 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow (
 RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1142,7 +1144,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release (
     RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
@@ -1166,12 +1168,12 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   GIOPProtocolProperties *_tao_tmp_pointer =
     static_cast<GIOPProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
@@ -1199,18 +1201,18 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
 RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1275,7 +1277,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release (
     RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
@@ -1299,12 +1301,12 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnixDomainProtocolProperties *_tao_tmp_pointer =
     static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
@@ -1332,18 +1334,18 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
 RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1408,7 +1410,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release (
     RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -1432,12 +1434,12 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   SharedMemoryProtocolProperties *_tao_tmp_pointer =
     static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -1465,18 +1467,18 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
 RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1541,7 +1543,7 @@ TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release (
     RTCORBA::UserDatagramProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::UserDatagramProtocolProperties_ptr
@@ -1565,12 +1567,12 @@ RTCORBA::UserDatagramProtocolProperties::UserDatagramProtocolProperties (void)
 RTCORBA::UserDatagramProtocolProperties::~UserDatagramProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   UserDatagramProtocolProperties *_tao_tmp_pointer =
     static_cast<UserDatagramProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::UserDatagramProtocolProperties_ptr
@@ -1598,18 +1600,18 @@ RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow (
 RTCORBA::UserDatagramProtocolProperties_ptr
 RTCORBA::UserDatagramProtocolProperties::_duplicate (UserDatagramProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1674,7 +1676,7 @@ TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release (
     RTCORBA::StreamControlProtocolProperties_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::StreamControlProtocolProperties_ptr
@@ -1698,12 +1700,12 @@ RTCORBA::StreamControlProtocolProperties::StreamControlProtocolProperties (void)
 RTCORBA::StreamControlProtocolProperties::~StreamControlProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   StreamControlProtocolProperties *_tao_tmp_pointer =
     static_cast<StreamControlProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::StreamControlProtocolProperties_ptr
@@ -1731,18 +1733,18 @@ RTCORBA::StreamControlProtocolProperties::_unchecked_narrow (
 RTCORBA::StreamControlProtocolProperties_ptr
 RTCORBA::StreamControlProtocolProperties::_duplicate (StreamControlProtocolProperties_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolProperties_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -1789,10 +1791,10 @@ RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 RTCORBA::PriorityBand::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1802,7 +1804,7 @@ RTCORBA::PriorityBand::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
@@ -1814,7 +1816,7 @@ RTCORBA::PriorityBands::PriorityBands (void)
 RTCORBA::PriorityBands::PriorityBands (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::PriorityBand
       >
     (max)
@@ -1826,7 +1828,7 @@ RTCORBA::PriorityBands::PriorityBands (
     RTCORBA::PriorityBand * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::PriorityBand
       >
     (max, length, buffer, release)
@@ -1835,7 +1837,7 @@ RTCORBA::PriorityBands::PriorityBands (
 RTCORBA::PriorityBands::PriorityBands (
     const PriorityBands &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         RTCORBA::PriorityBand
       >
     (seq)
@@ -1873,7 +1875,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
@@ -1897,12 +1899,12 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBandedConnectionPolicy *_tao_tmp_pointer =
     static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
@@ -1930,18 +1932,18 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2006,7 +2008,7 @@ TAO::Objref_Traits<RTCORBA::Current>::release (
     RTCORBA::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::Current_ptr
@@ -2030,12 +2032,12 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-void 
+void
 RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
     static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::Current_ptr
@@ -2063,18 +2065,18 @@ RTCORBA::Current::_unchecked_narrow (
 RTCORBA::Current_ptr
 RTCORBA::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2139,7 +2141,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::release (
     RTCORBA::Mutex_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::Mutex_ptr
@@ -2163,12 +2165,12 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-void 
+void
 RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 {
   Mutex *_tao_tmp_pointer =
     static_cast<Mutex *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::Mutex_ptr
@@ -2196,18 +2198,18 @@ RTCORBA::Mutex::_unchecked_narrow (
 RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::Mutex::_tao_release (Mutex_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2268,7 +2270,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::release (
     RTCORBA::RTORB_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTCORBA::RTORB_ptr
@@ -2286,7 +2288,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
@@ -2312,7 +2314,7 @@ RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFo
 RTCORBA::RTORB::MutexNotFound&
 RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2381,7 +2383,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_tao_type (void) const
   return ::RTCORBA::RTORB::_tc_MutexNotFound;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
@@ -2407,7 +2409,7 @@ RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::In
 RTCORBA::RTORB::InvalidThreadpool&
 RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2482,12 +2484,12 @@ RTCORBA::RTORB::RTORB (void)
 RTCORBA::RTORB::~RTORB (void)
 {}
 
-void 
+void
 RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
 {
   RTORB *_tao_tmp_pointer =
     static_cast<RTORB *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTCORBA::RTORB_ptr
@@ -2515,18 +2517,18 @@ RTCORBA::RTORB::_unchecked_narrow (
 RTCORBA::RTORB_ptr
 RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTCORBA::RTORB::_tao_release (RTORB_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -2605,22 +2607,7 @@ CORBA::Boolean operator<< (
     const RTCORBA::ThreadpoolLanes &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -2628,40 +2615,7 @@ CORBA::Boolean operator>> (
     RTCORBA::ThreadpoolLanes &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */
@@ -2678,12 +2632,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, RTCORBA::PriorityModel & _tao_en
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
+
   if (_tao_success)
     {
       _tao_enumerator = static_cast<RTCORBA::PriorityModel> (_tao_temp);
     }
-  
+
   return _tao_success;
 }
 
@@ -2722,20 +2676,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -2745,7 +2699,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -2755,29 +2709,31 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return false;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 4b2fd379263..bcc506cc1f1 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -44,8 +44,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtcorba_export.h"
-#include "rtcorba_typedefs.h"
+#include "tao/RTCORBA/rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_typedefs.h"
 #include "tao/ORB.h"
 #include "tao/TimeBaseC.h"
 #include "tao/SystemException.h"
@@ -78,6 +78,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace RTCORBA
 {
 
@@ -178,22 +180,19 @@ namespace RTCORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        ThreadpoolLanes,
-        ThreadpoolLane
+        ThreadpoolLanes
       >
     ThreadpoolLanes_var;
 
   typedef
     TAO_Seq_Out_T<
-        ThreadpoolLanes,
-        ThreadpoolLanes_var,
-        ThreadpoolLane
+        ThreadpoolLanes
       >
     ThreadpoolLanes_out;
 
   class TAO_RTCORBA_Export ThreadpoolLanes
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ThreadpoolLane
           >
   {
@@ -204,7 +203,7 @@ namespace RTCORBA
         CORBA::ULong max,
         CORBA::ULong length,
         ThreadpoolLane* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
@@ -633,22 +632,19 @@ namespace RTCORBA
 
   typedef
     TAO_VarSeq_Var_T<
-        ProtocolList,
-        Protocol
+        ProtocolList
       >
     ProtocolList_var;
 
   typedef
     TAO_Seq_Out_T<
-        ProtocolList,
-        ProtocolList_var,
-        Protocol
+        ProtocolList
       >
     ProtocolList_out;
 
   class TAO_RTCORBA_Export ProtocolList
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             Protocol
           >
   {
@@ -659,7 +655,7 @@ namespace RTCORBA
         CORBA::ULong max,
         CORBA::ULong length,
         Protocol* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
@@ -2097,22 +2093,19 @@ namespace RTCORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        PriorityBands,
-        PriorityBand
+        PriorityBands
       >
     PriorityBands_var;
 
   typedef
     TAO_Seq_Out_T<
-        PriorityBands,
-        PriorityBands_var,
-        PriorityBand
+        PriorityBands
       >
     PriorityBands_out;
 
   class TAO_RTCORBA_Export PriorityBands
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             PriorityBand
           >
   {
@@ -2123,7 +2116,7 @@ namespace RTCORBA
         CORBA::ULong max,
         CORBA::ULong length,
         PriorityBand* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     PriorityBands (const PriorityBands &);
     ~PriorityBands (void);
@@ -3498,6 +3491,8 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h
index a37e92f1656..1b7cc8c0f9a 100644
--- a/TAO/tao/RTCORBA/RTCORBA_includeC.h
+++ b/TAO/tao/RTCORBA/RTCORBA_includeC.h
@@ -40,7 +40,7 @@
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 
-#include "RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // .\be\be_visitor_traits.cpp:50
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
@@ -74,6 +76,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:48
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 9bc7068f28c..5c9170dd78e 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -2,11 +2,11 @@
 // $Id$
 //
 
-#include "RT_Current.h"
+#include "tao/RTCORBA/RT_Current.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Priority_Mapping.h"
+#include "tao/RTCORBA/Priority_Mapping.h"
 
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
@@ -18,6 +18,8 @@ ACE_RCSID (RTCORBA,
            RT_Current,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
 {
@@ -65,4 +67,6 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
     ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index eed5b7e39f9..58b994d0bee 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -20,7 +20,7 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -34,6 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Current
  *
@@ -42,8 +44,8 @@
  * Allows setting/getting the priority of the current thread.
  */
 class TAO_RTCORBA_Export TAO_RT_Current
-  : public RTCORBA::Current,
-    public TAO_Local_RefCounted_Object
+  : public RTCORBA::Current
+  , public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -66,10 +68,12 @@ protected:
 private:
 
   /// ORB Core that owns us.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index 874795e7a10..a74d7ea7277 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -1,10 +1,10 @@
-#include "RT_Endpoint_Selector_Factory.h"
+#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Invocation_Endpoint_Selectors.h"
-#include "RT_Endpoint_Utils.h"
-#include "RT_Stub.h"
+#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
+#include "tao/RTCORBA/RT_Endpoint_Utils.h"
+#include "tao/RTCORBA/RT_Stub.h"
 
 #include "tao/Protocols_Hooks.h"
 
@@ -18,6 +18,8 @@ ACE_RCSID (RTCORBA,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
 {
   ACE_NEW (this->rt_invocation_endpoint_selector_,
@@ -35,6 +37,8 @@ RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return this->rt_invocation_endpoint_selector_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory,
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index b6b5eca2d76..f361563ad22 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,7 +18,7 @@
 #define RT_ENDPOINT_SELECTOR_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +31,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RT_Invocation_Endpoint_Selector;
 
 // ****************************************************************
@@ -65,6 +67,8 @@ private:
   TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
 
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 51be9a65283..841c73bc6dc 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -1,12 +1,12 @@
-#include "RT_Endpoint_Utils.h"
+#include "tao/RTCORBA/RT_Endpoint_Utils.h"
 #include "tao/Profile_Transport_Resolver.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Endpoint_Selector_Factory.h"
-#include "RT_Invocation_Endpoint_Selectors.h"
+#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
+#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
 
-#include "RT_Stub.h"
+#include "tao/RTCORBA/RT_Stub.h"
 
 ACE_RCSID (RTCORBA,
            RT_Endpoint_Utils,
@@ -14,6 +14,8 @@ ACE_RCSID (RTCORBA,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy *
 TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
                                TAO::Profile_Transport_Resolver &r
@@ -49,4 +51,6 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
   return policy;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index 26dd559c5c7..649c3ca2896 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,8 @@
 
 #include "tao/Policy_ForwardC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -51,6 +53,8 @@ private:
   TAO_RT_Endpoint_Utils ();
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* RT_ENDPOINT_UTILS_H */
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index eff4b4a1520..6e712fe4fc9 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,13 +1,13 @@
-#include "RT_Invocation_Endpoint_Selectors.h"
+#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Policy_i.h"
-#include "RT_Stub.h"
-#include "RT_Transport_Descriptor.h"
-#include "RT_Transport_Descriptor_Property.h"
-#include "RT_Endpoint_Utils.h"
-#include "RT_Protocols_Hooks.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/RT_Stub.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
+#include "tao/RTCORBA/RT_Endpoint_Utils.h"
+#include "tao/RTCORBA/RT_Protocols_Hooks.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -22,6 +22,8 @@ ACE_RCSID (RTCORBA,
            RT_Invocation_Endpoint_Selectors,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
     TAO::Profile_Transport_Resolver *r,
@@ -373,4 +375,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index 539cc86f44b..4c6d75e022e 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,10 +30,12 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 #include "tao/Invocation_Endpoint_Selectors.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Invocation_Endpoint_Selector
  *
@@ -43,8 +45,8 @@
  * private connection policy.
  *
  **/
-class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector :
-  public TAO_Invocation_Endpoint_Selector
+class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector
+  : public TAO_Invocation_Endpoint_Selector
 {
 public:
 
@@ -66,6 +68,8 @@ protected:
                              ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 43dd460981a..701505481ee 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -1,18 +1,16 @@
 // $Id$
-#include "RT_Mutex.h"
+#include "tao/RTCORBA/RT_Mutex.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_ORB.h"
+#include "tao/RTCORBA/RT_ORB.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID(RTCORBA,
           RT_Mutex,
           "$Id$")
 
-TAO_RT_Mutex::TAO_RT_Mutex (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Mutex::~TAO_RT_Mutex (void)
 {
@@ -78,7 +76,7 @@ TAO_RT_Mutex::name (void) const
   return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name)
   : name_ (name)
@@ -92,6 +90,8 @@ TAO_Named_RT_Mutex::name (void) const
 }
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index c12409e8cd0..2381712964f 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   RT_Mutex.h
@@ -23,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -37,6 +38,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Mutex
  *
@@ -53,11 +56,6 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
     public TAO_Local_RefCounted_Object
 {
 public:
-  /// Constructor.
-  TAO_RT_Mutex (void);
-
-  /// Destructor.
-  virtual ~TAO_RT_Mutex (void);
 
   /// Acquire the lock.
   virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -81,6 +79,11 @@ public:
   virtual const char *name (void) const;
 
 protected:
+
+  /// Destructor.
+  virtual ~TAO_RT_Mutex (void);
+
+protected:
   /// Synchronization lock.
   TAO_SYNCH_MUTEX mu_;
 };
@@ -108,6 +111,8 @@ protected:
 };
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 6d996e8e171..7f6e2cc028b 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "RT_ORB.h"
+#include "tao/RTCORBA/RT_ORB.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Policy_i.h"
-#include "RT_Mutex.h"
-#include "Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/RT_Mutex.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/RTCORBA/Thread_Pool.h"
@@ -17,16 +17,20 @@ ACE_RCSID(RTCORBA,
           RT_ORB,
           "$Id$")
 
-TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
+                        ACE_Time_Value const &dynamic_thread_idle_timeout)
   : orb_core_ (orb_core),
     mutex_mgr_ (),
-    tp_manager_ (0)
+    tp_manager_ (0),
+    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
 {
   TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager =
     &this->orb_core_->thread_lane_resources_manager ();
 
   TAO_RT_Thread_Lane_Resources_Manager *rt_thread_lane_resources_manager =
-    (TAO_RT_Thread_Lane_Resources_Manager *) thread_lane_resources_manager;
+    dynamic_cast <TAO_RT_Thread_Lane_Resources_Manager *> (thread_lane_resources_manager);
 
   this->tp_manager_ =
     &rt_thread_lane_resources_manager->tp_manager ();
@@ -366,7 +370,8 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                                default_priority,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size
+                                               max_request_buffer_size,
+                                               this->dynamic_thread_idle_timeout_
                                                ACE_ENV_ARG_PARAMETER);
 }
 
@@ -385,7 +390,8 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                           allow_borrowing,
                                                           allow_request_buffering,
                                                           max_buffered_requests,
-                                                          max_request_buffer_size
+                                                          max_request_buffer_size,
+                                                          this->dynamic_thread_idle_timeout_
                                                           ACE_ENV_ARG_PARAMETER);
 }
 
@@ -546,6 +552,8 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
 
 }
 
-////////////////////////////////////////////////////////////////////////////////
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+///////////////////////////////////////////////////////////////////////////////
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 9b5daea2202..612108d048d 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -37,6 +37,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward reference for TAO_Named_RT_Mutex_Manager
 class TAO_RT_Mutex;
 class TAO_Thread_Pool_Manager;
@@ -105,8 +107,9 @@ class TAO_RTCORBA_Export TAO_RT_ORB
     public TAO_Local_RefCounted_Object
 {
 public:
+
   /// Constructor.
-  TAO_RT_ORB (TAO_ORB_Core *orb_core);
+  TAO_RT_ORB (TAO_ORB_Core *orb_core, ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /**
    * Create a new mutex.  Mutexes returned by this method
@@ -302,20 +305,28 @@ public:
   static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb);
 
 protected:
+
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
   virtual ~TAO_RT_ORB (void);
 
+protected:
+
   /// Reference to our creating ORB Core.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// mutex_mgr_ manages the names associated with named mutexes.
   TAO_Named_RT_Mutex_Manager mutex_mgr_;
 
   /// Thread Pool Manager
   TAO_Thread_Pool_Manager *tp_manager_;
+
+  /// Dynamic thread idle timeout
+  ACE_Time_Value const dynamic_thread_idle_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 58c599a21ad..8e49acb273c 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -1,4 +1,4 @@
-#include "RT_ORBInitializer.h"
+#include "tao/RTCORBA/RT_ORBInitializer.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -11,21 +11,21 @@ ACE_RCSID (RTCORBA,
 #include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
-#include "RT_Policy_i.h"
-#include "RT_PolicyFactory.h"
-#include "RT_Protocols_Hooks.h"
-#include "Priority_Mapping_Manager.h"
-#include "Network_Priority_Mapping_Manager.h"
-#include "RT_ORB_Loader.h"
-#include "RT_Stub_Factory.h"
-#include "RT_Endpoint_Selector_Factory.h"
-#include "Continuous_Priority_Mapping.h"
-#include "Linear_Priority_Mapping.h"
-#include "Direct_Priority_Mapping.h"
-#include "Linear_Network_Priority_Mapping.h"
-#include "RT_ORB.h"
-#include "RT_Current.h"
-#include "RT_Thread_Lane_Resources_Manager.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/RT_PolicyFactory.h"
+#include "tao/RTCORBA/RT_Protocols_Hooks.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/RT_ORB_Loader.h"
+#include "tao/RTCORBA/RT_Stub_Factory.h"
+#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
+#include "tao/RTCORBA/Continuous_Priority_Mapping.h"
+#include "tao/RTCORBA/Linear_Priority_Mapping.h"
+#include "tao/RTCORBA/Direct_Priority_Mapping.h"
+#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h"
+#include "tao/RTCORBA/RT_ORB.h"
+#include "tao/RTCORBA/RT_Current.h"
+#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
@@ -36,24 +36,28 @@ ACE_RCSID (RTCORBA,
 #include "ace/Svc_Conf.h"
 #include "ace/Sched_Params.h"
 
-static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory";
-static const ACE_TCHAR *rt_poa_factory_directive =
+static const char rt_poa_factory_name[] = "TAO_RT_Object_Adapter_Factory";
+static const ACE_TCHAR rt_poa_factory_directive[] =
   ACE_DYNAMIC_SERVICE_DIRECTIVE(
     "TAO_RT_Object_Adapter_Factory",
     "TAO_RTPortableServer",
     "_make_TAO_RT_Object_Adapter_Factory",
     "");
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
                                               int network_priority_mapping_type,
                                               int ace_sched_policy,
                                               long sched_policy,
-                                              long scope_policy)
+                                              long scope_policy,
+                                              ACE_Time_Value const &dynamic_thread_idle_timeout)
   : priority_mapping_type_ (priority_mapping_type),
     network_priority_mapping_type_ (network_priority_mapping_type),
     ace_sched_policy_ (ace_sched_policy),
     sched_policy_ (sched_policy),
-    scope_policy_ (scope_policy)
+    scope_policy_ (scope_policy),
+    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
 {
 }
 
@@ -118,7 +122,6 @@ TAO_RT_ORBInitializer::pre_init (
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
   info->register_initial_reference ("PriorityMappingManager",
@@ -184,7 +187,8 @@ TAO_RT_ORBInitializer::pre_init (
   // Create the RT_ORB.
   CORBA::Object_ptr rt_orb = CORBA::Object::_nil ();
   ACE_NEW_THROW_EX (rt_orb,
-                    TAO_RT_ORB (tao_info->orb_core ()),
+                    TAO_RT_ORB (tao_info->orb_core (),
+                    dynamic_thread_idle_timeout_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO::VMCID,
@@ -257,7 +261,7 @@ TAO_RT_ORBInitializer::register_policy_factories (
   // Bind the same policy factory to all RTCORBA related policy
   // types since a single policy factory is used to create each of
   // the different types of RTCORBA policies.
-  CORBA::PolicyType type[] = {
+  static CORBA::PolicyType const type[] = {
     RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
     RTCORBA::THREADPOOL_POLICY_TYPE,
     RTCORBA::SERVER_PROTOCOL_POLICY_TYPE,
@@ -269,7 +273,7 @@ TAO_RT_ORBInitializer::register_policy_factories (
   const CORBA::PolicyType *end =
     type + sizeof (type) / sizeof (type[0]);
 
-  for (CORBA::PolicyType *i = type;
+  for (CORBA::PolicyType const * i = type;
        i != end;
        ++i)
     {
@@ -303,4 +307,6 @@ TAO_RT_ORBInitializer::register_policy_factories (
     }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index be73cbd49d0..c2f04c46c04 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -20,7 +20,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,10 +37,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// RTCORBA ORB initializer.
-class TAO_RTCORBA_Export TAO_RT_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_RT_ORBInitializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
   /// Priority mapping types
@@ -60,7 +62,8 @@ public:
                          int network_priority_mapping_type,
                          int ace_sched_policy,
                          long sched_policy,
-                         long scope_policy);
+                         long scope_policy,
+                         ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -86,10 +89,10 @@ private:
   PortableInterceptor::PolicyFactory_var policy_factory_;
 
   /// Priority mapping type.
-  int priority_mapping_type_;
+  int const priority_mapping_type_;
 
   /// Network Priority mapping type.
-  int network_priority_mapping_type_;
+  int const network_priority_mapping_type_;
 
   /// Scheduling policy.
   /**
@@ -99,7 +102,7 @@ private:
    * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
    * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
    */
-  int ace_sched_policy_;
+  int const ace_sched_policy_;
 
   /// Scheduling policy flag.
   /**
@@ -108,7 +111,7 @@ private:
    * thread creation functions. Legal values are THR_SCHED_RR,
    * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
    */
-  long sched_policy_;
+  long const sched_policy_;
 
   /// Scheduling scope flag.
   /**
@@ -117,10 +120,20 @@ private:
    * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
    * THR_SCOPE_PROCESS.
    */
-  long scope_policy_;
+  long const scope_policy_;
 
+  /// Dynamic thread idle timeout
+  /**
+   * When using thread pool a certain number of dynamic threads can be created.
+   * By default these threads are created when needed but never end, when this
+   * timeout is specified the threads end themselves at the moment they
+   * have not been serving any requests for the specified amount of time
+   */
+  ACE_Time_Value const dynamic_thread_idle_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index b395043b553..381da1bd572 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,23 +1,21 @@
-#include "RT_ORB_Loader.h"
+#include "tao/RTCORBA/RT_ORB_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_ORBInitializer.h"
+#include "tao/RTCORBA/RT_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Arg_Shifter.h"
 
 ACE_RCSID (RTCORBA,
            RT_ORB_Loader,
            "$Id$")
 
-
-TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
 {
@@ -29,13 +27,13 @@ TAO_RT_ORB_Loader::init (int argc,
 {
   ACE_TRACE ("TAO_RT_ORB_Loader::init");
 
-  static int initialized = 0;
+  static bool initialized = false;
 
   // Only allow initialization once.
   if (initialized)
     return 0;
 
-  initialized = 1;
+  initialized = true;
 
   // Set defaults.
   int priority_mapping_type =
@@ -46,114 +44,113 @@ TAO_RT_ORB_Loader::init (int argc,
   long sched_policy = THR_SCHED_DEFAULT;
   long scope_policy = THR_SCOPE_PROCESS;
   int curarg = 0;
+  ACE_Time_Value dynamic_thread_idle_timeout;
 
-  // Parse any service configurator parameters.
-  for (curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_TEXT("-ORBPriorityMapping")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("continuous")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("direct")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBPriorityMapping\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBSchedPolicy")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("SCHED_OTHER")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_OTHER;
-                sched_policy = THR_SCHED_DEFAULT;
-              }
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("SCHED_FIFO")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_FIFO;
-                sched_policy = THR_SCHED_FIFO;
-              }
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("SCHED_RR")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_RR;
-                sched_policy = THR_SCHED_RR;
-              }
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBSchedPolicy\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBScopePolicy")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("SYSTEM")) == 0)
-              scope_policy = THR_SCOPE_SYSTEM;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("PROCESS")) == 0)
-              scope_policy = THR_SCOPE_PROCESS;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBScopePolicy\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBNetworkPriorityMapping")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
+  ACE_Arg_Shifter arg_shifter (argc, argv);
 
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("linear")) == 0)
+  // Parse any service configurator parameters.
+  while (arg_shifter.is_anything_left ())
+    {
+      const ACE_TCHAR *current_arg = 0;
+      if (0 != (current_arg = arg_shifter.get_the_parameter
+                  (ACE_TEXT("-ORBPriorityMapping"))))
+        {
+          const ACE_TCHAR *name = current_arg;
+          if (ACE_OS::strcasecmp (name,
+                                  ACE_TEXT("continuous")) == 0)
+            priority_mapping_type =
+              TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
+          else if (ACE_OS::strcasecmp (name,
+                                       ACE_TEXT("linear")) == 0)
+            priority_mapping_type =
+              TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
+          else if (ACE_OS::strcasecmp (name,
+                                       ACE_TEXT("direct")) == 0)
+            priority_mapping_type =
+              TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
+          else
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT("RT_ORB_Loader - unknown argument")
+                        ACE_TEXT(" <%s> for -ORBPriorityMapping\n"),
+                        name));
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                                 (ACE_TEXT("-ORBSchedPolicy"))))
+        {
+          const ACE_TCHAR *name = current_arg;
+          if (ACE_OS::strcasecmp (name,
+                                  ACE_TEXT("SCHED_OTHER")) == 0)
+            {
+              ace_sched_policy = ACE_SCHED_OTHER;
+              sched_policy = THR_SCHED_DEFAULT;
+            }
+          else if (ACE_OS::strcasecmp (name,
+                                       ACE_TEXT("SCHED_FIFO")) == 0)
+            {
+              ace_sched_policy = ACE_SCHED_FIFO;
+              sched_policy = THR_SCHED_FIFO;
+            }
+          else if (ACE_OS::strcasecmp (name,
+                                       ACE_TEXT("SCHED_RR")) == 0)
+            {
+              ace_sched_policy = ACE_SCHED_RR;
+              sched_policy = THR_SCHED_RR;
+            }
+          else
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT("RT_ORB_Loader - unknown argument")
+                        ACE_TEXT(" <%s> for -ORBSchedPolicy\n"),
+                        name));
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                                 (ACE_TEXT("-ORBScopePolicy"))))
+        {
+          const ACE_TCHAR *name = current_arg;
+          if (ACE_OS::strcasecmp (name,
+                                  ACE_TEXT("SYSTEM")) == 0)
+            scope_policy = THR_SCOPE_SYSTEM;
+          else if (ACE_OS::strcasecmp (name,
+                                       ACE_TEXT("PROCESS")) == 0)
+            scope_policy = THR_SCOPE_PROCESS;
+          else
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT("RT_ORB_Loader - unknown argument")
+                        ACE_TEXT(" <%s> for -ORBScopePolicy\n"),
+                        name));
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                                 (ACE_TEXT("-RTORBNetworkPriorityMapping"))))
+        {
+          const ACE_TCHAR *name = current_arg;
+          if (ACE_OS::strcasecmp (name,
+                                  ACE_TEXT("linear")) == 0)
               network_priority_mapping_type =
                 TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
-          }
-      }
+          arg_shifter.consume_arg ();
+        }
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
+                                   (ACE_TEXT("-RTORBDynamicThreadIdleTimeout"))))
+        {
+          const ACE_TCHAR *name = current_arg;
+          int timeout = ACE_OS::atoi (name);
+          dynamic_thread_idle_timeout = ACE_Time_Value (0, timeout);
+          arg_shifter.consume_arg ();
+        }
     else
       {
+        arg_shifter.ignore_arg ();
         if (TAO_debug_level > 0)
-          {
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT("RT_ORB_Loader: Unknown option ")
-                        ACE_TEXT("<%s>.\n"),
-                        argv[curarg]));
-          }
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT("RT_ORB_Loader: Unknown option ")
+                      ACE_TEXT("<%s>.\n"),
+                      argv[curarg]));
+        }
       }
+    }
 
   // Register the ORB initializer.
   ACE_TRY_NEW_ENV
@@ -167,7 +164,8 @@ TAO_RT_ORB_Loader::init (int argc,
                                                network_priority_mapping_type,
                                                ace_sched_policy,
                                                sched_policy,
-                                               scope_policy),
+                                               scope_policy,
+                                               dynamic_thread_idle_timeout),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO::VMCID,
@@ -194,6 +192,8 @@ TAO_RT_ORB_Loader::init (int argc,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////////////////////////////////////////////
 
 ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_ORB_Loader)
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index 402c314f403..a3e2d4cd375 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,7 +17,7 @@
 #define TAO_RT_ORB_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #include "tao/orbconf.h"
 
@@ -30,13 +30,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object
 {
 public:
-  /// Constructor.
-  TAO_RT_ORB_Loader (void);
 
   /// Destructor.
   virtual ~TAO_RT_ORB_Loader (void);
@@ -46,6 +46,8 @@ public:
                     ACE_TCHAR* []);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_ORB_Loader)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_ORB_Loader)
 
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 7e5bd32fd68..cd80662c192 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -1,4 +1,4 @@
-#include "RT_PolicyFactory.h"
+#include "tao/RTCORBA/RT_PolicyFactory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -6,11 +6,13 @@ ACE_RCSID (RTCORBA,
            RT_PolicyFactory,
            "$Id$")
 
-#include "RT_Policy_i.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
 
 #include "tao/PolicyC.h"
 #include "tao/ORB_Constants.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Policy_ptr
 TAO_RT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -102,4 +104,6 @@ TAO_RT_PolicyFactory::_create_policy (
                     CORBA::Policy::_nil ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index 3fa55b3afe8..6229e74af12 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -21,7 +21,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,8 +37,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Policy factory for all RTCORBA related policies.
-class TAO_RTCORBA_Export TAO_RT_PolicyFactory
+class TAO_RT_PolicyFactory
   : public PortableInterceptor::PolicyFactory,
     public CORBA::LocalObject
 {
@@ -56,6 +58,8 @@ public:
                      CORBA::PolicyError));
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 3cd3f89a885..5cb4737b17a 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "RT_Policy_i.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -18,11 +18,14 @@ ACE_RCSID (RTCORBA,
 
 // ****************************************************************
 
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model,
-                                                  RTCORBA::Priority server_priority)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (
+  RTCORBA::PriorityModel priority_model,
+  RTCORBA::Priority server_priority)
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PriorityModelPolicy ()
   , TAO_Local_RefCounted_Object ()
   , priority_model_ (priority_model)
@@ -31,9 +34,9 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priorit
 }
 
 TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PriorityModelPolicy ()
   , TAO_Local_RefCounted_Object ()
   , priority_model_ (rhs.priority_model_)
@@ -95,7 +98,7 @@ CORBA::Policy_ptr
 TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_PriorityModelPolicy* tmp;
+  TAO_PriorityModelPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityModelPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -148,9 +151,9 @@ TAO_PriorityModelPolicy::_tao_scope (void) const
 // ****************************************************************
 
 TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ThreadpoolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , id_ (id)
@@ -158,9 +161,9 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id)
 }
 
 TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ThreadpoolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , id_ (rhs.id_)
@@ -208,7 +211,7 @@ CORBA::Policy_ptr
 TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ThreadpoolPolicy* tmp;
+  TAO_ThreadpoolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ThreadpoolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -240,18 +243,18 @@ TAO_ThreadpoolPolicy::_tao_scope (void) const
 // ****************************************************************
 
 TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PrivateConnectionPolicy ()
   , TAO_Local_RefCounted_Object ()
 {
 }
 
 TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PrivateConnectionPolicy ()
   , TAO_Local_RefCounted_Object ()
 {
@@ -286,7 +289,7 @@ CORBA::Policy_ptr
 TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_PrivateConnectionPolicy* tmp;
+  TAO_PrivateConnectionPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PrivateConnectionPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -319,9 +322,9 @@ TAO_PrivateConnectionPolicy::_tao_scope (void) const
 // ****************************************************************
 
 TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RTCORBA::PriorityBands &bands)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PriorityBandedConnectionPolicy ()
   , TAO_Local_RefCounted_Object ()
   , priority_bands_ (bands)
@@ -329,9 +332,9 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RT
 }
 
 TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TAO_PriorityBandedConnectionPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::PriorityBandedConnectionPolicy ()
   , TAO_Local_RefCounted_Object ()
   , priority_bands_ (rhs.priority_bands_)
@@ -390,7 +393,7 @@ CORBA::Policy_ptr
 TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_PriorityBandedConnectionPolicy *tmp;
+  TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityBandedConnectionPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -440,9 +443,9 @@ TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void)
 // ****************************************************************
 
 TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList &protocols)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ServerProtocolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , protocols_ (protocols)
@@ -450,9 +453,9 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList
 }
 
 TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ServerProtocolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , protocols_ (rhs.protocols_)
@@ -486,7 +489,7 @@ RTCORBA::ProtocolList *
 TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  RTCORBA::ProtocolList *tmp;
+  RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     RTCORBA::ProtocolList (this->protocols_),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -507,7 +510,7 @@ CORBA::Policy_ptr
 TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ServerProtocolPolicy* tmp;
+  TAO_ServerProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ServerProtocolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -550,9 +553,9 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void)
 
 
 TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList &protocols)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ClientProtocolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , protocols_ (protocols)
@@ -560,9 +563,9 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList
 }
 
 TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
+  : ::CORBA::Object ()
+  , ::CORBA::Policy ()
+  , ::CORBA::LocalObject ()
   , RTCORBA::ClientProtocolPolicy ()
   , TAO_Local_RefCounted_Object ()
   , protocols_ (rhs.protocols_)
@@ -596,7 +599,7 @@ RTCORBA::ProtocolList *
 TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  RTCORBA::ProtocolList *tmp;
+  RTCORBA::ProtocolList *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     RTCORBA::ProtocolList (this->protocols_),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -617,7 +620,7 @@ CORBA::Policy_ptr
 TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ClientProtocolPolicy* tmp;
+  TAO_ClientProtocolPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ClientProtocolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
@@ -1300,9 +1303,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil
       int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
       int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
       int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Boolean enable_network_priority = 0;
+      CORBA::Boolean keep_alive = true;
+      CORBA::Boolean dont_route = false;
+      CORBA::Boolean enable_network_priority = false;
 
       ACE_NEW_RETURN (property,
                       TAO_TCP_Protocol_Properties (send_buffer_size,
@@ -1319,9 +1322,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil
       int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
       int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
       int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Long preallocate_buffer_size = 0;
+      CORBA::Boolean keep_alive = true;
+      CORBA::Boolean dont_route = false;
+      CORBA::Long preallocate_buffer_size = false;
       const char *mmap_filename = "";
       const char *mmap_lockname = "";
 
@@ -1362,9 +1365,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil
       int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
       int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
       int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Boolean enable_network_priority = 0;
+      CORBA::Boolean keep_alive = true;
+      CORBA::Boolean dont_route = false;
+      CORBA::Boolean enable_network_priority = false;
 
       ACE_NEW_RETURN (property,
                       TAO_StreamControl_Protocol_Properties (send_buffer_size,
@@ -1402,4 +1405,6 @@ TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id
   return property;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 689ee8e961e..ed8e1cfe6a4 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -38,6 +38,8 @@
 #endif /* _MSC_VER */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_PriorityModelPolicy
  *
@@ -892,10 +894,13 @@ public:
    */
   static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
 
-protected:
+private:
+
   TAO_Protocol_Properties_Factory (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 2f79523a96f..9dba0b882b0 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -1,10 +1,10 @@
-#include "RT_Protocols_Hooks.h"
+#include "tao/RTCORBA/RT_Protocols_Hooks.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Policy_i.h"
-#include "Priority_Mapping_Manager.h"
-#include "RT_Stub.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/RT_Stub.h"
 
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
@@ -26,11 +26,15 @@ ACE_RCSID (RTCORBA,
            RT_Protocols_Hooks,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
+  : orb_core_ (0)
+  , current_ ()
 {
 }
 
+
 TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
 {
 }
@@ -811,6 +815,8 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks,
                        ACE_TEXT ("RT_Protocols_Hooks"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index f5bc260e298..a1542f2e2a8 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -1,4 +1,3 @@
-
 // -*- C++ -*-
 
 // ===================================================================
@@ -8,7 +7,6 @@
  *  $Id$
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- *
  */
 // ===================================================================
 
@@ -21,8 +19,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "Priority_Mapping_Manager.h"
-#include "Network_Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
 
 #include "tao/Protocols_Hooks.h"
 
@@ -32,9 +30,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
+
   /// Constructor
   TAO_RT_Protocols_Hooks (void);
 
@@ -174,6 +175,8 @@ protected:
                                        RTCORBA::ProtocolProperties_ptr protocol_properties
                                        ACE_ENV_ARG_DECL);
 
+protected:
+
   TAO_ORB_Core *orb_core_;
 
   // Save a reference to the priority mapping manager.
@@ -183,6 +186,8 @@ protected:
   RTCORBA::Current_var current_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 6804f192d18..a82714e4802 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "RT_Stub.h"
+#include "tao/RTCORBA/RT_Stub.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Policy_i.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "tao/Policy_Manager.h"
@@ -15,6 +15,8 @@ ACE_RCSID (RTCORBA,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
                           const TAO_MProfile &profiles,
                           TAO_ORB_Core *orb_core)
@@ -54,15 +56,15 @@ TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (policy_list[i]->policy_type () ==
            RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-        this->exposed_priority_model (policy_list[i].in ());
+        this->exposed_priority_model (policy_list[i]);
 
       else if (policy_list[i]->policy_type () ==
                 RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-        this->exposed_priority_banded_connection (policy_list[i].in ());
+        this->exposed_priority_banded_connection (policy_list[i]);
 
       else if (policy_list[i]->policy_type () ==
                 RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-        this->exposed_client_protocol (policy_list[i].in ());
+        this->exposed_client_protocol (policy_list[i]);
     }
 
   this->are_policies_parsed_ = 1;
@@ -297,4 +299,6 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
                     0);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING  && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index a2c18299ba6..fcaf8a32562 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Stub.h
@@ -21,7 +23,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #include "tao/Stub.h"
 
@@ -29,14 +31,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward references.
 class TAO_PriorityModelPolicy;
 class TAO_PriorityBandedConnectionPolicy;
 class TAO_ClientProtocolPolicy;
 class TAO_PrivateConnectionPolicy;
 
-
-
 /**
  * @class TAO_RT_Stub
  *
@@ -123,17 +125,14 @@ private:
   CORBA::Boolean are_policies_parsed_;
 
 private:
-  // = Disallow copy constructor and assignment operator.
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &))
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
+  // = Disallow copying and assignment.
+  TAO_RT_Stub (const TAO_RT_Stub &);
+  TAO_RT_Stub &operator = (const TAO_RT_Stub &);
+
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index b28965a7891..84f376955cd 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
-#include "RT_Stub_Factory.h"
+#include "tao/RTCORBA/RT_Stub_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Stub.h"
+#include "tao/RTCORBA/RT_Stub.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
@@ -16,6 +16,8 @@ ACE_RCSID (RTCORBA,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
 {
 }
@@ -40,6 +42,8 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id,
   return retval;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_RT_Stub_Factory,
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index 213f88bab1f..27a8f8cf712 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Stub_Factory.h
@@ -8,7 +10,6 @@
  *   This class creates the default stub, that is used in
  *   plain CORBA.
  *
- *
  *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
  *  @author  Frank Hunleth <fhunleth@cs.wustl.edu>
  */
@@ -23,7 +24,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +34,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Stub_Factory
  *
@@ -54,6 +57,8 @@ public:
                                  ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Stub_Factory)
 
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index fbde6dd0101..1b7aa28ff78 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (RTCORBA,
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : TAO_Thread_Lane_Resources_Manager (orb_core),
     default_lane_resources_ (0),
@@ -145,6 +147,8 @@ TAO_RT_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manag
   return manager;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory,
                        ACE_TEXT ("RT_Thread_Lane_Resources_Manager_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index ef95981c8be..a1cfe5cdbf8 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Thread_Lane_Resources_Manager.h
@@ -24,6 +26,9 @@
 #include "tao/Thread_Lane_Resources_Manager.h"
 #include "ace/Service_Config.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Thread_Pool_Manager;
 
 /**
@@ -100,6 +105,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index 8eb6ded878a..0058ea2023c 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "RT_Transport_Descriptor.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor.h"
 #include "ace/OS_Memory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor.inl"
+#include "tao/RTCORBA/RT_Transport_Descriptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$")
 
-#include "RT_Transport_Descriptor_Property.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
 #include "tao/Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor ()
 {
   if (this->delete_properties_ == 1)
@@ -112,3 +114,5 @@ TAO_RT_Transport_Descriptor::hash (void) const
 {
   return this->endpoint_->hash ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
index b485d8484a5..bbf8f97ee28 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Transport_Descriptor.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_H
@@ -14,16 +13,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RT_Transport_Descriptor_Property.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
 
 #include "tao/Transport_Descriptor_Interface.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Transport_Descriptor
  *
@@ -68,8 +69,10 @@ private:
   int delete_properties_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor.inl"
+#include "tao/RTCORBA/RT_Transport_Descriptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
index 0c158812e9f..3afd7b186e8 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
                                                           CORBA::Boolean flag)
@@ -16,3 +20,5 @@ TAO_RT_Transport_Descriptor::insert (TAO_RT_Transport_Descriptor_Property *descr
 
   this->property_list_ = descriptor_property;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index bc59aab60d0..020fe70267a 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#include "RT_Transport_Descriptor_Property.h"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
 
 #include "ace/OS_Memory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor_Property.inl"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (RTCORBA,
            TAO_RT_Transport_Descriptor_Property,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
 {
 }
@@ -74,3 +76,5 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::is_equivalent (const TAO
           this->low_priority_ == rhs->low_priority_ &&
           this->high_priority_ == rhs->high_priority_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
index b0645d68e9f..cf38816b4d6 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file RT_Transport_Descriptor_Property.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtcorba_export.h"
+#include "tao/RTCORBA/rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +23,8 @@
 
 #include "ace/Global_Macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Transport_Descriptor_Property
  *
@@ -50,9 +51,9 @@ protected:
   TAO_RT_Transport_Descriptor_Property* next_;
 
 private:
-  // = Disallow copy constructor and assignment operator.
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property &operator = (const TAO_RT_Transport_Descriptor_Property &))
+  // = Disallow copying and assignment.
+  TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &);
+  TAO_RT_Transport_Descriptor_Property & operator= (const TAO_RT_Transport_Descriptor_Property &);
 };
 
 /**
@@ -93,7 +94,7 @@ private:
 
 };
 
-/*************************************************************************************************/
+/*****************************************************************************/
 
 /**
  * @class TAO_RT_Transport_Descriptor_Banded_Connection_Property
@@ -130,10 +131,12 @@ protected:
   CORBA::Short high_priority_;
 };
 
-/*************************************************************************************************/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+/*****************************************************************************/
 
 #if defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor_Property.inl"
+#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
index c6646a943fb..89c98fe4485 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
   : next_ (0)
@@ -49,3 +53,5 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::init (CORBA::Short low_p
   this->low_priority_ = low_priority;
   this->high_priority_ = high_priority;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index f274fb38a18..f63d8809bb5 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -1,4 +1,4 @@
-#include "Thread_Pool.h"
+#include "tao/RTCORBA/Thread_Pool.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -7,7 +7,7 @@ ACE_RCSID (RTCORBA,
            "$Id$")
 
 #if ! defined (__ACE_INLINE__)
-#include "Thread_Pool.inl"
+#include "tao/RTCORBA/Thread_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Exception.h"
@@ -22,6 +22,8 @@ ACE_RCSID (RTCORBA,
 #include "tao/Leader_Follower.h"
 #include "ace/Auto_Ptr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
   TAO_Thread_Lane &lane)
   : lane_ (lane)
@@ -54,14 +56,10 @@ TAO_Thread_Pool_Threads::svc (void)
   TAO_Thread_Pool_Threads::set_tss_resources (orb_core,
                                               this->lane_);
 
-  CORBA::ORB_ptr orb =
-    orb_core.orb ();
-
   ACE_TRY_NEW_ENV
     {
-      // Run the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // Do the work
+      this->run (orb_core);
     }
   ACE_CATCHANY
     {
@@ -77,6 +75,18 @@ TAO_Thread_Pool_Threads::svc (void)
   return 0;
 }
 
+int
+TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER)
+{
+  CORBA::ORB_ptr orb = orb_core.orb ();
+
+  // Run the ORB.
+  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
+}
+
 void
 TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core,
                                             TAO_Thread_Lane &thread_lane)
@@ -89,23 +99,67 @@ TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core,
   tss.lane_ = &thread_lane;
 }
 
+TAO_Dynamic_Thread_Pool_Threads::TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lane &lane)
+  : TAO_Thread_Pool_Threads (lane)
+{
+}
+
+int
+TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER)
+{
+  CORBA::ORB_ptr orb = orb_core.orb ();
+
+  if (this->lane_.dynamic_thread_idle_timeout () == ACE_Time_Value::zero)
+    {
+      // No timeout specified, run the ORB until it shutdowns
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  else
+    {
+      // A timeout is specified, run the ORB in an idle loop, if we
+      // don't handle any operations for the given timeout we just
+      // exit the loop and this thread ends itself.
+      ACE_Time_Value tv (this->lane_.dynamic_thread_idle_timeout ());
+      while (!orb_core.has_shutdown () && orb->work_pending (tv))
+        {
+          orb->perform_work ();
+          tv = this->lane_.dynamic_thread_idle_timeout ();
+        }
+
+      if (TAO_debug_level > 7)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n")
+                    ACE_TEXT ("Current number of dynamic threads left = %d; ")
+                    ACE_TEXT ("RTCorba worker thread is ending!\n"),
+                    this->lane_.pool ().id (),
+                    this->lane_.id (),
+                    this->thr_count () - 1));
+    }
+
+  return 0;
+}
+
 TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
                                   CORBA::ULong id,
                                   CORBA::Short lane_priority,
                                   CORBA::ULong static_threads,
-                                  CORBA::ULong dynamic_threads
+                                  CORBA::ULong dynamic_threads,
+                                  ACE_Time_Value const &dynamic_thread_idle_timeout
                                   ACE_ENV_ARG_DECL_NOT_USED)
   : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
-    static_threads_ (static_threads),
-    dynamic_threads_ (dynamic_threads),
-    current_threads_ (0),
-    threads_ (*this),
+    shutdown_ (false),
+    static_threads_number_ (static_threads),
+    dynamic_threads_number_ (dynamic_threads),
+    static_threads_ (*this),
+    dynamic_threads_ (*this),
     new_thread_generator_ (*this),
     resources_ (pool.manager ().orb_core (),
                 &new_thread_generator_),
-    native_priority_ (TAO_INVALID_PRIORITY)
+    native_priority_ (TAO_INVALID_PRIORITY),
+    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
 {
 }
 
@@ -113,14 +167,8 @@ bool
 TAO_Thread_Lane::new_dynamic_thread (void)
 {
   // Note that we are checking this condition below without the lock
-  // held.  The value of <static_threads> and <dynamic_threads> does
-  // not change, but <current_threads> increases when new dynamic
-  // threads are created.  Even if we catch <current_threads> in an
-  // inconsistent state, we will double check later with the lock
-  // held.  Therefore, this check should not cause any big problems.
-  if (this->current_threads_ >=
-      this->static_threads_ +
-      this->dynamic_threads_)
+  // held.
+  if (this->dynamic_threads_.thr_count () >= this->dynamic_threads_number_)
     return false;
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
@@ -131,25 +179,25 @@ TAO_Thread_Lane::new_dynamic_thread (void)
   TAO_Thread_Pool_Manager &manager =
     this->pool_.manager ();
 
-  if (this->current_threads_ <
-      (this->static_threads_ +
-       this->dynamic_threads_) &&
-      !manager.orb_core ().has_shutdown ())
+  if (!manager.orb_core ().has_shutdown () && !this->shutdown_&&
+      this->dynamic_threads_.thr_count () < this->dynamic_threads_number_)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n")
-                    ACE_TEXT ("Current number of threads = %d; ")
-                    ACE_TEXT ("static threads = %d; dynamic threads = %d\n")
+                    ACE_TEXT ("Current number of dynamic threads = %d; ")
+                    ACE_TEXT ("static threads = %d; max dynamic threads = %d\n")
                     ACE_TEXT ("No leaders available; creating new leader!\n"),
                     this->pool_.id (),
                     this->id_,
-                    this->current_threads_,
-                    this->static_threads_,
-                    this->dynamic_threads_));
+                    this->dynamic_threads_.thr_count (),
+                    this->static_threads_number_,
+                    this->dynamic_threads_number_));
 
       int result =
-        this->create_dynamic_threads_i (1);
+        this->create_threads_i (this->dynamic_threads_,
+                                1,
+                                THR_BOUND | THR_DETACHED);
 
       if (result != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -170,16 +218,16 @@ TAO_Thread_Lane::shutting_down (void)
              mon,
              this->lock_);
 
-  // Just set the number of dynamic threads to 0, this means we just can't
-  // create any new one
-  this->dynamic_threads_ = 0;
+  // We are shutting down, this way we are not creating any more new dynamic
+  // threads
+  this->shutdown_ = true;
 }
 
 void
 TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
 {
-  // Make sure that <static_threads_> is not zero.
-  if (this->static_threads_ == 0)
+  // Make sure that static_threads_number_ is not zero.
+  if (this->static_threads_number_ == 0)
     ACE_THROW (CORBA::BAD_PARAM ());
 
   // Check that the priority is in bounds.
@@ -305,7 +353,8 @@ TAO_Thread_Lane::shutdown_reactor (void)
 void
 TAO_Thread_Lane::wait (void)
 {
-  this->threads_.wait ();
+  this->static_threads_.wait ();
+  this->dynamic_threads_.wait ();
 }
 
 int
@@ -314,11 +363,31 @@ TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile)
   return this->resources_.is_collocated (mprofile);
 }
 
+CORBA::ULong
+TAO_Thread_Lane::current_threads (void) const
+{
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+                    mon,
+                    this->lock_,
+                    0);
+
+  return (this->static_threads_.thr_count () +
+         this->dynamic_threads_.thr_count ());
+}
+
+
 int
 TAO_Thread_Lane::create_static_threads (void)
 {
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+                    mon,
+                    this->lock_,
+                    0);
+
   // Create static threads.
-  return this->create_dynamic_threads (this->static_threads_);
+  return this->create_threads_i (this->static_threads_,
+                                 this->static_threads_number_,
+                                 THR_NEW_LWP | THR_JOINABLE);
 }
 
 int
@@ -329,17 +398,20 @@ TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads)
                     this->lock_,
                     0);
 
-  return this->create_dynamic_threads_i (number_of_threads);
+  return this->create_threads_i (this->dynamic_threads_,
+                                 number_of_threads,
+                                 THR_BOUND | THR_DETACHED);
 }
 
 int
-TAO_Thread_Lane::create_dynamic_threads_i (CORBA::ULong number_of_threads)
+TAO_Thread_Lane::create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
+                                   CORBA::ULong number_of_threads,
+                                   long thread_flags)
 {
   // Overwritten parameters.
   int force_active = 1;
 
   // Default parameters.
-  long default_flags = THR_NEW_LWP | THR_JOINABLE;
   int default_grp_id = -1;
   ACE_Task_Base *default_task = 0;
   ACE_hthread_t *default_thread_handles = 0;
@@ -365,27 +437,24 @@ TAO_Thread_Lane::create_dynamic_threads_i (CORBA::ULong number_of_threads)
     this->pool ().manager ().orb_core ();
 
   long flags =
-    default_flags |
+    thread_flags |
     orb_core.orb_params ()->thread_creation_flags ();
 
   // Activate the threads.
   int result =
-    this->threads_.activate (flags,
-                             number_of_threads,
-                             force_active,
-                             this->native_priority_,
-                             default_grp_id,
-                             default_task,
-                             default_thread_handles,
-                             default_stack,
-                             stack_size_array);
+    thread_pool.activate (flags,
+                          number_of_threads,
+                          force_active,
+                          this->native_priority_,
+                          default_grp_id,
+                          default_task,
+                          default_thread_handles,
+                          default_stack,
+                          stack_size_array);
 
   if (result != 0)
     return result;
 
-  this->current_threads_ +=
-    number_of_threads;
-
   return result;
 }
 
@@ -397,7 +466,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Short default_priority,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
+                                  CORBA::ULong max_request_buffer_size,
+                                  ACE_Time_Value const &dynamic_thread_idle_timeout
                                   ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
@@ -406,6 +476,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
     allow_request_buffering_ (allow_request_buffering),
     max_buffered_requests_ (max_buffered_requests),
     max_request_buffer_size_ (max_request_buffer_size),
+    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout),
     lanes_ (0),
     number_of_lanes_ (1),
     with_lanes_ (false)
@@ -421,7 +492,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                          0,
                          default_priority,
                          static_threads,
-                         dynamic_threads
+                         dynamic_threads,
+                         dynamic_thread_idle_timeout
                          ACE_ENV_ARG_PARAMETER);
 }
 
@@ -432,7 +504,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
+                                  CORBA::ULong max_request_buffer_size,
+                                  ACE_Time_Value const &dynamic_thread_idle_timeout
                                   ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
@@ -441,6 +514,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
     allow_request_buffering_ (allow_request_buffering),
     max_buffered_requests_ (max_buffered_requests),
     max_request_buffer_size_ (max_request_buffer_size),
+    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout),
     lanes_ (0),
     number_of_lanes_ (lanes.length ()),
     with_lanes_ (true)
@@ -460,7 +534,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                            i,
                            lanes[i].lane_priority,
                            lanes[i].static_threads,
-                           lanes[i].dynamic_threads
+                           lanes[i].dynamic_threads,
+                           dynamic_thread_idle_timeout
                            ACE_ENV_ARG_PARAMETER);
 }
 
@@ -649,7 +724,8 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             RTCORBA::Priority default_priority,
                                             CORBA::Boolean allow_request_buffering,
                                             CORBA::ULong max_buffered_requests,
-                                            CORBA::ULong max_request_buffer_size
+                                            CORBA::ULong max_request_buffer_size,
+                                            ACE_Time_Value const &dynamic_thread_idle_timeout
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -662,7 +738,8 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                     default_priority,
                                     allow_request_buffering,
                                     max_buffered_requests,
-                                    max_request_buffer_size
+                                    max_request_buffer_size,
+                                    dynamic_thread_idle_timeout
                                     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -672,7 +749,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                        CORBA::Boolean allow_borrowing,
                                                        CORBA::Boolean allow_request_buffering,
                                                        CORBA::ULong max_buffered_requests,
-                                                       CORBA::ULong max_request_buffer_size
+                                                       CORBA::ULong max_request_buffer_size,
+                                                       ACE_Time_Value const &dynamic_thread_idle_timeout
                                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -684,7 +762,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                allow_borrowing,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size
+                                               max_request_buffer_size,
+                                               dynamic_thread_idle_timeout
                                                ACE_ENV_ARG_PARAMETER);
 }
 
@@ -738,7 +817,8 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                               RTCORBA::Priority default_priority,
                                               CORBA::Boolean allow_request_buffering,
                                               CORBA::ULong max_buffered_requests,
-                                              CORBA::ULong max_request_buffer_size
+                                              CORBA::ULong max_request_buffer_size,
+                                              ACE_Time_Value const &dynamic_thread_idle_timeout
                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -754,7 +834,8 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      default_priority,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size
+                                     max_request_buffer_size,
+                                     dynamic_thread_idle_timeout
                                      ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -769,7 +850,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                                          CORBA::Boolean allow_borrowing,
                                                          CORBA::Boolean allow_request_buffering,
                                                          CORBA::ULong max_buffered_requests,
-                                                         CORBA::ULong max_request_buffer_size
+                                                         CORBA::ULong max_request_buffer_size,
+                                                         ACE_Time_Value const &dynamic_thread_idle_timeout
                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -784,7 +866,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                      allow_borrowing,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size
+                                     max_request_buffer_size,
+                                     dynamic_thread_idle_timeout
                                      ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -867,4 +950,6 @@ TAO_Thread_Pool_Manager::orb_core (void) const
   return this->orb_core_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index d1c5d45a624..cd0047741e9 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
+#include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "ace/Hash_Map_Manager.h"
@@ -33,6 +33,8 @@
 #include "ace/Task.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Thread_Lane;
 
 /**
@@ -64,12 +66,12 @@ private:
 /**
  * @class TAO_Thread_Pool_Threads
  *
- * @brief Class representing a thread running in a thread lane.
+ * @brief Class representing a static thread running in a thread lane.
  *
  * \nosubgrouping
  *
  **/
-class TAO_RTCORBA_Export TAO_Thread_Pool_Threads : public ACE_Task_Base
+class TAO_Thread_Pool_Threads : public ACE_Task_Base
 {
 public:
 
@@ -86,12 +88,33 @@ public:
   static void set_tss_resources (TAO_ORB_Core &orb_core,
                                  TAO_Thread_Lane &thread_lane);
 
-private:
+protected:
+  /// Do the real work
+  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
 
   /// Lane to which this thread belongs to.
   TAO_Thread_Lane &lane_;
 };
 
+/**
+ * @class TAO_Dynamic_Thread_Pool_Threads
+ *
+ * @brief Class representing a dynamic thread running in a thread lane.
+ *
+ * \nosubgrouping
+ *
+ **/
+class TAO_Dynamic_Thread_Pool_Threads : public TAO_Thread_Pool_Threads
+{
+public:
+  /// Constructor.
+  TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lane &lane);
+
+protected:
+  /// Do the real work
+  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+};
+
 class TAO_Thread_Pool;
 
 /**
@@ -111,7 +134,8 @@ public:
                    CORBA::ULong id,
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads
+                   CORBA::ULong dynamic_threads,
+                   ACE_Time_Value const &dynamic_thread_idle_timeout
                    ACE_ENV_ARG_DECL);
 
   /// Destructor.
@@ -163,14 +187,12 @@ public:
   CORBA::ULong dynamic_threads (void) const;
 
   CORBA::ULong current_threads (void) const;
-  void current_threads (CORBA::ULong);
 
   CORBA::Short native_priority (void) const;
 
-  TAO_Thread_Pool_Threads &threads (void);
-
   TAO_Thread_Lane_Resources &resources (void);
 
+  ACE_Time_Value const &dynamic_thread_idle_timeout (void) const;
   // @}
 
 private:
@@ -178,7 +200,9 @@ private:
   /// Validate lane's priority and map it to a native value.
   void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
 
-  int create_dynamic_threads_i (CORBA::ULong number_of_threads);
+  int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
+                        CORBA::ULong number_of_threads,
+                        long thread_flags);
 
   /// Create @a number_of_threads of dynamic threads.  Can be called
   /// multiple times.
@@ -188,21 +212,25 @@ private:
   TAO_Thread_Pool &pool_;
 
   /// The id of this lane
-  CORBA::ULong id_;
+  CORBA::ULong const id_;
 
   CORBA::Short lane_priority_;
 
+  /// This boolean is set when we are shutting down, then we will not create
+  /// any new dynamic threads
+  bool shutdown_;
+
   /// Number of static threads
-  CORBA::ULong static_threads_;
+  CORBA::ULong const static_threads_number_;
 
   /// Maximum number of threads we are allowed to create
-  CORBA::ULong dynamic_threads_;
+  CORBA::ULong const dynamic_threads_number_;
 
-  /// Current number of threads
-  CORBA::ULong current_threads_;
+  /// Array with all static threads
+  TAO_Thread_Pool_Threads static_threads_;
 
-  /// Array with all threads
-  TAO_Thread_Pool_Threads threads_;
+  /// Array with all dynamic threads
+  TAO_Dynamic_Thread_Pool_Threads dynamic_threads_;
 
   TAO_RT_New_Leader_Generator new_thread_generator_;
 
@@ -210,8 +238,10 @@ private:
 
   CORBA::Short native_priority_;
 
+  ACE_Time_Value const dynamic_thread_idle_timeout_;
+
   /// Lock to guard all members of the lane
-  ACE_SYNCH_MUTEX lock_;
+  mutable ACE_SYNCH_MUTEX lock_;
 };
 
 class TAO_Thread_Pool_Manager;
@@ -238,7 +268,8 @@ public:
                    CORBA::Short default_priority,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size
+                   CORBA::ULong max_request_buffer_size,
+                   ACE_Time_Value const &dynamic_thread_idle_timeout
                    ACE_ENV_ARG_DECL);
 
   /// Constructor (for pools with lanes).
@@ -249,7 +280,8 @@ public:
                    CORBA::Boolean allow_borrowing,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size
+                   CORBA::ULong max_request_buffer_size,
+                   ACE_Time_Value const &dynamic_thread_idle_timeout
                    ACE_ENV_ARG_DECL);
 
   /// Destructor.
@@ -306,6 +338,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_;
 
   TAO_Thread_Lane **lanes_;
   CORBA::ULong number_of_lanes_;
@@ -352,7 +385,8 @@ public:
                      RTCORBA::Priority default_priority,
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size
+                     CORBA::ULong max_request_buffer_size,
+                     ACE_Time_Value const &dynamic_thread_idle_timeout
                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -363,7 +397,8 @@ public:
                                 CORBA::Boolean allow_borrowing,
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size
+                                CORBA::ULong max_request_buffer_size,
+                                ACE_Time_Value const &dynamic_thread_idle_timeout
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -397,7 +432,8 @@ private:
                        RTCORBA::Priority default_priority,
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
-                       CORBA::ULong max_request_buffer_size
+                       CORBA::ULong max_request_buffer_size,
+                       ACE_Time_Value const &dynamic_thread_idle_timeout
                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -407,7 +443,8 @@ private:
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
+                                  CORBA::ULong max_request_buffer_size,
+                                  ACE_Time_Value const &dynamic_thread_idle_timeout
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -418,6 +455,8 @@ private:
 
   // @}
 
+private:
+
   TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
@@ -425,8 +464,10 @@ private:
   ACE_SYNCH_MUTEX lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Thread_Pool.inl"
+#include "tao/RTCORBA/Thread_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl
index e76815436e7..4dd08236764 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.inl
+++ b/TAO/tao/RTCORBA/Thread_Pool.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Thread_Lane &
 TAO_Thread_Pool_Threads::lane (void) const
@@ -39,42 +43,28 @@ ACE_INLINE
 CORBA::ULong
 TAO_Thread_Lane::static_threads (void) const
 {
-  return this->static_threads_;
+  return this->static_threads_number_;
 }
 
 ACE_INLINE
 CORBA::ULong
 TAO_Thread_Lane::dynamic_threads (void) const
 {
-  return this->dynamic_threads_;
-}
-
-ACE_INLINE
-CORBA::ULong
-TAO_Thread_Lane::current_threads (void) const
-{
-  return this->current_threads_;
-}
-
-ACE_INLINE
-void
-TAO_Thread_Lane::current_threads (CORBA::ULong current_threads)
-{
-  this->current_threads_ = current_threads;
+  return this->dynamic_threads_number_;
 }
 
 ACE_INLINE
-TAO_Thread_Pool_Threads &
-TAO_Thread_Lane::threads (void)
+TAO_Thread_Lane_Resources &
+TAO_Thread_Lane::resources (void)
 {
-  return this->threads_;
+  return this->resources_;
 }
 
 ACE_INLINE
-TAO_Thread_Lane_Resources &
-TAO_Thread_Lane::resources (void)
+ACE_Time_Value const &
+TAO_Thread_Lane::dynamic_thread_idle_timeout (void) const
 {
-  return this->resources_;
+  return this->dynamic_thread_idle_timeout_;
 }
 
 ACE_INLINE
@@ -147,5 +137,4 @@ TAO_Thread_Pool::number_of_lanes (void) const
   return this->number_of_lanes_;
 }
 
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/rtcorba_typedefs.h b/TAO/tao/RTCORBA/rtcorba_typedefs.h
index d39f5b27a2d..513e1a4169d 100644
--- a/TAO/tao/RTCORBA/rtcorba_typedefs.h
+++ b/TAO/tao/RTCORBA/rtcorba_typedefs.h
@@ -24,6 +24,7 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references.
 class TAO_Priority_Mapping_Manager;
@@ -55,6 +56,7 @@ namespace RTCORBA
   // End TAO-specific typedef
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /*TAO_RTCORBA_TYPEDEFS_H*/
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
index a1e3ab95a43..bb1ea26cbdb 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 // $Id$
 // =================================================================
 //
@@ -14,8 +12,8 @@
 //
 // =================================================================
 
-#include "RTPortableServer.h"
-#include "RT_Object_Adapter_Factory.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -23,9 +21,12 @@ ACE_RCSID (RTPortableServer,
            RTPortableServer, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
index 8202b682ad6..82e605cccba 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RTPortableServer.h
@@ -14,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -25,6 +26,8 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
@@ -34,8 +37,10 @@ public:
 
 static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "RTPortableServerC.h"
+#include "tao/RTPortableServer/RTPortableServerC.h"
 #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index d5d526ece27..e0e8678f7be 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -30,11 +30,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "RTPortableServer.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/objref_typecode.cpp:76
 
@@ -127,3 +129,5 @@ operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index cc437d5e9ba..faca5cb2fcd 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "RTPortableServer.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -41,6 +41,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,7 +67,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::release (
     RTPortableServer::POA_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTPortableServer::POA_ptr
@@ -89,12 +91,12 @@ RTPortableServer::POA::POA (void)
 RTPortableServer::POA::~POA (void)
 {}
 
-void 
+void
 RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
     static_cast<POA *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 RTPortableServer::POA_ptr
@@ -107,10 +109,10 @@ RTPortableServer::POA::_narrow (
     {
       return POA::_nil ();
     }
-  
+
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-  
+
   return POA::_duplicate (proxy);
 }
 
@@ -124,28 +126,28 @@ RTPortableServer::POA::_unchecked_narrow (
     {
       return POA::_nil ();
     }
-  
+
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-  
+
   return POA::_duplicate (proxy);
 }
 
 RTPortableServer::POA_ptr
 RTPortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTPortableServer::POA::_tao_release (POA_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -191,3 +193,5 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index c6740079e07..cb6e8d013f8 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -44,7 +44,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,6 +71,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace RTPortableServer
 {
 
@@ -264,6 +266,8 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerS.h b/TAO/tao/RTPortableServer/RTPortableServerS.h
index 253d03db8a3..6b5943d104f 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerS.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "RTPortableServerC.h"
+#include "tao/RTPortableServer/RTPortableServerC.h"
 #include "tao/PortableServer/PortableServer_includeS.h"
 #include "tao/RTCORBA/RTCORBA_includeS.h"
 
@@ -54,6 +54,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace POA_RTPortableServer
 {
   
@@ -66,6 +68,7 @@ namespace POA_RTPortableServer
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:995
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerS.inl"
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
index d67a85927c7..1d5a8883c79 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
@@ -35,6 +35,6 @@
 #define _RTPORTABLESERVER_INCLUDE_IDL_
 
 ///FUZZ: disable check_for_include/
-#include <tao/RTPortableServer/RTPortableServer.pidl>
+#include "tao/RTPortableServer/RTPortableServer.pidl"
 
 #endif /* _RTPORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
index 5b6dbc0d6ca..2b42eb48285 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
@@ -72,6 +74,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index 0ebc6f73ac2..53444f8e1b4 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -1,6 +1,6 @@
-// @(#) $Id$
+// $Id$
 
-#include "RT_Acceptor_Filters.h"
+#include "tao/RTPortableServer/RT_Acceptor_Filters.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -12,18 +12,22 @@ ACE_RCSID (RTPortableServer,
            RT_Acceptor_Filter,
            "$Id$")
 
-TAO_Server_Protocol_Acceptor_Filter::
-TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter (
+  RTCORBA::ProtocolList &protocols)
   : protocols_ (protocols)
 {
 }
 
 int
-TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
-                                                   TAO_MProfile &mprofile,
-                                                   TAO_Acceptor **acceptors_begin,
-                                                   TAO_Acceptor **acceptors_end,
-                                                   CORBA::Short priority)
+TAO_Server_Protocol_Acceptor_Filter::fill_profile (
+  const TAO::ObjectKey &object_key,
+  TAO_MProfile &mprofile,
+  TAO_Acceptor **acceptors_begin,
+  TAO_Acceptor **acceptors_end,
+  CORBA::Short priority)
 {
   // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines
   // which protocols get included into IOR and in what order.
@@ -60,4 +64,6 @@ TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
index 2a8cfe9fea0..6eb39e04677 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Acceptor_Filters.h
@@ -24,13 +25,15 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/Acceptor_Filter.h"
 
 #define TAO_RTCORBA_SAFE_INCLUDE
 #include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 
 /**
@@ -63,6 +66,8 @@ private:
   RTCORBA::ProtocolList &protocols_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 8dc4a8cfd0b..0eecb7136a9 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -17,6 +17,8 @@ ACE_RCSID(RTPortableServer,
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/Profile.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
                                             ACE_ENV_ARG_DECL) const
@@ -24,7 +26,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   // Make sure that the servant is in the same ORB that created this
   // object.
   if (!object->_is_collocated ())
-    return 0;
+    return false;
 
   // Get the orb core.
   TAO_ORB_Core *orb_core =
@@ -45,7 +47,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   // If the target POA does not have a dedicated thread pool, then all
   // calls to it are collocated.
   if (target_thread_pool == 0)
-    return 1;
+    return true;
 
   /// Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources &tss =
@@ -66,17 +68,17 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   // different pool than POA.  Therefore, this object is not
   // collocated.
   if (current_thread_pool != target_thread_pool)
-    return 0;
+    return false;
 
   // If the current thread and the POA are in the default thread pool,
   // then the object is collocated.
   if (current_thread_pool == 0)
-    return 1;
+    return true;
 
   // If the current thread and the POA are in a thread pool without
   // lanes, then the object is collocated.
   if (!current_thread_pool->with_lanes ())
-    return 1;
+    return true;
 
   // Grab the priority model used by the POA.  Note that this cannot
   // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
@@ -88,37 +90,29 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   // because the current thread is of the correct priority :-) and
   // we'll simple use the current thread to run the upcall.
   if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
-    return 1;
+    return true;
 
-  // Locate the target servant.  We are really not interested in the
+  // Find the target servant priority. We are really not interested in the
   // servant itself but in the priority that this servant will run at.
-  // Note that the operation name is bogus: it is not used because the
-  // IMPLICIT_ACTIVATION policy is not allowed with SERVER_DECLARED
-  // policy.  Similarly, since there is no implicit activation, there
-  // is no chance of waiting on a condition variable and hence the
-  // <wait_occurred_restart_call_ignored> can be ignored.
-  int wait_occurred_restart_call_ignored = 0;
-
-  poa->locate_servant_i ("operation not used",
-                         servant_upcall.system_id_,
-                         servant_upcall,
-                         servant_upcall.current_context_,
-                         wait_occurred_restart_call_ignored
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Short target_priority;
 
-  // Get the priority that the servant will run at.
-  CORBA::Short target_priority =
-    servant_upcall.priority ();
+  if (-1 == poa->find_servant_priority (servant_upcall.system_id_,
+                                        target_priority
+                                        ACE_ENV_ARG_PARAMETER))
+  {
+    return false;
+  };
 
   // If it matches the current thread's priority, then we are
   // collocated.  Otherwise we are not.
   if (target_priority == current_thread_lane->lane_priority ())
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver,
                        ACE_TEXT ("RT_Collocation_Resolver"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
index 99d89bff36d..64f3016a4bd 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Collocation_Resolver.h
@@ -25,6 +27,8 @@
 #include "tao/Collocation_Resolver.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Collocation_Resolver
  *
@@ -44,6 +48,8 @@ public:
                                         ACE_ENV_ARG_DECL) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
 ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
 
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index 5246d3c2a0e..4dc295d06aa 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -1,22 +1,21 @@
 // $Id$
 
-#include "RT_Object_Adapter_Factory.h"
+#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
-#include "RT_Servant_Dispatcher.h"
-#include "RT_Policy_Validator.h"
-#include "RT_Collocation_Resolver.h"
+#include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
+#include "tao/RTPortableServer/RT_Policy_Validator.h"
+#include "tao/RTPortableServer/RT_Collocation_Resolver.h"
 
 ACE_RCSID (RTPortableServer,
            RT_Object_Adapter_Factory,
            "$Id$")
 
-TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
-{
-}
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Adapter*
 TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
@@ -54,6 +53,8 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
   return object_adapter;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory,
                        ACE_TEXT ("TAO_RT_Object_Adapter_Factory"),
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
index 21bd46db733..5749011b0e6 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Object_Adapter_Factory.h
@@ -13,7 +14,7 @@
 #define TAO_RT_OBJECT_ADAPTER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 
 #include "tao/Adapter_Factory.h"
 #include "tao/orbconf.h"
@@ -26,17 +27,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory
   : public TAO_Adapter_Factory
 {
 public:
-  /// Constructor
-  TAO_RT_Object_Adapter_Factory (void);
 
   /// Create adapter.
   virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_RT_Object_Adapter_Factory)
 ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
 
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 43dd02f08cb..6d4baacc932 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -1,10 +1,10 @@
-// @(#) $Id$
+// $Id$
 
-#include "RT_POA.h"
+#include "tao/RTPortableServer/RT_POA.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_Acceptor_Filters.h"
+#include "tao/RTPortableServer/RT_Acceptor_Filters.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -28,13 +28,15 @@
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
-# include "RT_POA.i"
+# include "tao/RTPortableServer/RT_POA.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (RTPortableServer,
            RT_POA,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
                         TAO_POA_Manager &poa_manager,
                         const TAO_POA_Policy_Set &policies,
@@ -78,7 +80,7 @@ TAO_RT_POA::new_POA (const String &name,
                      TAO_Object_Adapter *object_adapter
                      ACE_ENV_ARG_DECL)
 {
-  TAO_RT_POA *poa;
+  TAO_RT_POA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
                     TAO_RT_POA (name,
@@ -951,4 +953,6 @@ TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
   return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index d3bbb2816d9..5ae1c845166 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_POA.h
@@ -16,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 
 #include "tao/PortableServer/Regular_POA.h"
 #include "tao/orbconf.h"
@@ -24,7 +25,7 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "RTPortableServerC.h"
+#include "tao/RTPortableServer/RTPortableServerC.h"
 #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -38,13 +39,15 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Thread_Pool;
 class TAO_Thread_Lane;
 class TAO_PriorityBandedConnectionPolicy;
 
-class TAO_RTPortableServer_Export TAO_RT_POA :
-  public virtual RTPortableServer::POA,
-  public virtual TAO_Regular_POA
+class TAO_RTPortableServer_Export TAO_RT_POA
+  : public virtual RTPortableServer::POA
+  , public virtual TAO_Regular_POA
 {
 public:
 
@@ -310,12 +313,14 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "RT_POA.i"
+# include "tao/RTPortableServer/RT_POA.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index a0c51ad2e6d..9197a39d399 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 // Exception macros
@@ -5,6 +7,8 @@
 #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
@@ -136,3 +140,5 @@ TAO_RT_POA::thread_pool (void) const
 {
   return this->thread_pool_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index cd8d742f2be..4e11afb2d2e 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -1,4 +1,4 @@
-#include "RT_Policy_Validator.h"
+#include "tao/RTPortableServer/RT_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -18,6 +18,9 @@ ACE_RCSID (RTPortableServer,
            RT_Policy_Validator,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
   : TAO_Policy_Validator (orb_core),
     thread_pool_ (0)
@@ -594,4 +597,6 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
   return thread_pool;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 2c282de4271..2f96666c544 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    RT_Policy_Validator.h
@@ -24,10 +26,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/Policy_Validator.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Acceptor_Registry;
 class TAO_Thread_Pool;
@@ -89,6 +93,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index e3a557c5768..9273b3d716c 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -1,28 +1,32 @@
-#include "RT_Servant_Dispatcher.h"
+
+#include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "RT_POA.h"
-#include "tao/RTCORBA/Thread_Pool.h"
+#include "tao/RTPortableServer/RT_POA.h"
+
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/Transport.h"
-#include "tao/IIOP_Transport.h"
-#include "tao/IIOP_Connection_Handler.h"
+#include "tao/Connection_Handler.h"
 #include "tao/Service_Context.h"
 #include "tao/Protocols_Hooks.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
 
+#include "tao/RTCORBA/Thread_Pool.h"
+
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (RTPortableServer,
            RT_Servant_Dispatcher,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
 {
 }
@@ -79,7 +83,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Protocols_Hooks *tph =
     poa.orb_core ().get_protocols_hooks ();
 
-  const char *priority_model;
+  const char *priority_model = 0;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
 
   // NOT_SPECIFIED PriorityModel processing.
@@ -358,7 +362,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
         {
           // Eat up the exception.
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught: TAO (%P|%t) - "
+                               "Exception caught: TAO - "
                                "Priority_Model_Processing::"
                                "~Priority_Model_Processing");
         }
@@ -394,4 +398,6 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
   return poa;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 64c083f008b..138523ff62a 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_RT_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "rtportableserver_export.h"
+#include "tao/RTPortableServer/rtportableserver_export.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -30,12 +30,13 @@
 
 #include "tao/PortableServer/Servant_Dispatcher.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_RT_Servant_Dispatcher
  *
  * @brief Concrete instantiation of the Servant_Dispatcher strategy.
  *
- *
  */
 class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher
   : public TAO_Servant_Dispatcher
@@ -71,6 +72,8 @@ public:
                                  ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index b9f61a67120..08a4c9584f8 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -1,5 +1,5 @@
-#include "Current.h"
-#include "Distributable_Thread.h"
+#include "tao/RTScheduling/Current.h"
+#include "tao/RTScheduling/Distributable_Thread.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/RTCORBA/RT_Current.h"
 #include "tao/ORB_Core.h"
@@ -13,6 +13,7 @@ ACE_RCSID (RTScheduling,
            Current,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
 
@@ -25,9 +26,11 @@ TAO_DTId_Hash::operator () (const IdType &id) const
 
 TAO_RTScheduler_Current::TAO_RTScheduler_Current (void)
 {
-
 }
 
+TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void)
+{
+}
 
 void
 TAO_RTScheduler_Current::init (TAO_ORB_Core* orb
@@ -325,15 +328,19 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
     previous_current_ (prev_current),
     dt_hash_ (dt_hash)
 {
-  CORBA::Object_ptr scheduler_obj =
+  CORBA::Object_var scheduler_obj =
     orb->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
+TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
+{
+}
+
 void
 TAO_RTScheduler_Current_i::begin_scheduling_segment(
   const char * name,
@@ -636,6 +643,11 @@ DTTask::DTTask (//ACE_Thread_Manager *manager,
 {
 }
 
+DTTask::~DTTask (void)
+{
+  delete this->current_;
+}
+
 int
 DTTask::svc (void)
 {
@@ -673,7 +685,6 @@ DTTask::svc (void)
   return 0;
 }
 
-
 RTScheduling::Current::IdType *
 TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -725,9 +736,9 @@ TAO_RTScheduler_Current_i::name (void)
   return CORBA::string_dup (this->name_.in ());
 }
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 void
 TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
@@ -801,7 +812,7 @@ TAO_RTScheduler_Current_i::id (RTScheduling::Current::IdType guid)
 }
 
 void
-TAO_RTScheduler_Current_i::name (char * name)
+TAO_RTScheduler_Current_i::name (const char * name)
 {
   this->name_ = CORBA::string_dup (name);
 }
@@ -854,13 +865,13 @@ TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (const ::TAO_RTSchedule
 
 TAO_RTScheduler_Current_var::~TAO_RTScheduler_Current_var (void) // destructor
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
 }
 
 TAO_RTScheduler_Current_var &
 TAO_RTScheduler_Current_var::operator= (TAO_RTScheduler_Current_ptr p)
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -870,7 +881,7 @@ TAO_RTScheduler_Current_var::operator= (const ::TAO_RTScheduler_Current_var &p)
 {
   if (this != &p)
   {
-    CORBA::release (this->ptr_);
+    ::CORBA::release (this->ptr_);
     this->ptr_ = ::TAO_RTScheduler_Current::_duplicate (p.ptr ());
   }
   return *this;
@@ -907,7 +918,7 @@ TAO_RTScheduler_Current_var::inout (void)
 TAO_RTScheduler_Current_ptr &
 TAO_RTScheduler_Current_var::out (void)
 {
-  CORBA::release (this->ptr_);
+  ::CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_RTScheduler_Current::_nil ();
   return this->ptr_;
 }
@@ -930,7 +941,7 @@ TAO_RTScheduler_Current_var::duplicate (TAO_RTScheduler_Current_ptr p)
 void
 TAO_RTScheduler_Current_var::release (TAO_RTScheduler_Current_ptr p)
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO_RTScheduler_Current_ptr
@@ -980,3 +991,4 @@ const char* TAO_RTScheduler_Current::_interface_repository_id (void) const
   return "IDL:TAO_RTScheduler_Current:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 3486c4bef7c..0189511e16f 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -16,23 +16,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "rtscheduler_export.h"
+#include "tao/RTScheduling/rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RTScheduler.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "tao/LocalObject.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Task.h"
 #include "ace/Atomic_Op.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Current_i;
 class TAO_TSS_Resources;
 
-
 /**
  * @class TAO_DTId_Hash
  *
@@ -41,7 +41,7 @@ class TAO_TSS_Resources;
  * Define the hash() method for Object Ids.
  */
 
-typedef TAO_Unbounded_Sequence<CORBA::Octet> IdType;
+typedef TAO::unbounded_value_sequence<CORBA::Octet> IdType;
 
 class TAO_RTScheduler_Export TAO_DTId_Hash
 {
@@ -83,6 +83,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
   static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
 
   TAO_RTScheduler_Current (void);
+  virtual ~TAO_RTScheduler_Current (void);
 
   void init (TAO_ORB_Core* orb
              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -257,9 +258,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
                              TAO_RTScheduler_Current_i* prev_current
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual ~TAO_RTScheduler_Current_i (void)
-    {
-    };
+  virtual ~TAO_RTScheduler_Current_i (void);
 
   virtual RTScheduling::DistributableThread_ptr
     spawn (RTScheduling::ThreadAction_ptr start,
@@ -327,7 +326,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
   void delete_all_currents (void);
 
   const char* name (void);
-  void name (char *);
+  void name (const char *);
 
   TAO_ORB_Core* orb (void);
 
@@ -364,6 +363,8 @@ public:
           CORBA::Policy_ptr sched_param,
           CORBA::Policy_ptr implicit_sched_param);
 
+  virtual ~DTTask (void);
+
   int activate_task (RTCORBA::Priority base_priority,
                      CORBA::ULong stack_size
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -383,6 +384,8 @@ public:
   CORBA::Policy_var implicit_sched_param_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_RTSCHEDULER_CURRENT_H*/
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index 998aafe3a5d..87c9e02a245 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -1,8 +1,10 @@
 //$Id$
 
-#include "Distributable_Thread.h"
+#include "tao/RTScheduling/Distributable_Thread.h"
 #include "tao/ORB_Constants.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DistributableThread::TAO_DistributableThread (void)
   :state_ (RTScheduling::DistributableThread::ACTIVE)
 {
@@ -47,3 +49,5 @@ TAO_DistributableThread_Factory::create_DT (void)
 
   return DT;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index e73799bc15b..281eb6984cf 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -1,12 +1,18 @@
+// -*- C++ -*-
+
 //$Id$
 
 #ifndef DISTRIBUTABLE_THREAD_H
 #define DISTRIBUTABLE_THREAD_H
 
 #include "tao/RTScheduling/RTScheduler.h"
+#include "tao/LocalObject.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_RTScheduler_Export TAO_DistributableThread
-: public RTScheduling::DistributableThread
+class TAO_RTScheduler_Export TAO_DistributableThread:
+  public RTScheduling::DistributableThread,
+  public TAO_Local_RefCounted_Object
 {
  public:
   
@@ -32,4 +38,6 @@ public:
   static RTScheduling::DistributableThread_ptr create_DT (void);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*DISTRIBUTABLE_THREAD_H*/
diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp
index 82eb86ac5b2..15eebbb61fe 100644
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler.cpp
@@ -1,11 +1,15 @@
 // $Id$
 
-#include "RTScheduler.h"
-#include "RTScheduler_Loader.h"
+#include "tao/RTScheduling/RTScheduler.h"
+#include "tao/RTScheduling/RTScheduler_Loader.h"
 
 ACE_RCSID (RTScheduler, RTScheduler, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void)
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RTScheduler_Loader);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h
index 92c60b13038..3dbcb0553b9 100644
--- a/TAO/tao/RTScheduling/RTScheduler.h
+++ b/TAO/tao/RTScheduling/RTScheduler.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 
 //=============================================================================
@@ -17,13 +19,16 @@
 #define TAO_RTSCHEDULER_H_
 #include /**/ "ace/pre.h"
 
-#include "rtscheduler_export.h"
-
+#include "tao/RTScheduling/rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTScheduler_Export TAO_RTScheduler_Initializer
 {
 public:
@@ -33,8 +38,10 @@ public:
 
 static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #define TAO_RTSCHEDULER_SAFE_INCLUDE
-#include "RTSchedulerC.h"
+#include "tao/RTScheduling/RTSchedulerC.h"
 #undef TAO_RTSCHEDULER_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
index a3cfd02e3c4..38df96e2be8 100644
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RTScheduler.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,6 +36,8 @@
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -268,3 +270,4 @@ namespace RTScheduling
     &_tao_tc_RTScheduling_Scheduler;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index 464069748a1..67c7ff533a2 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "RTScheduler.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/Var_Size_Argument_T.h"
@@ -42,6 +42,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -86,7 +88,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::release (
     RTScheduling::ThreadAction_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTScheduling::ThreadAction_ptr
@@ -135,7 +137,7 @@ RTScheduling::ThreadAction::_unchecked_narrow (
 RTScheduling::ThreadAction_ptr
 RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
@@ -146,7 +148,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
 void
 RTScheduling::ThreadAction::_tao_release (ThreadAction_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -207,7 +209,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::release (
     RTScheduling::DistributableThread_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTScheduling::DistributableThread_ptr
@@ -256,18 +258,18 @@ RTScheduling::DistributableThread::_unchecked_narrow (
 RTScheduling::DistributableThread_ptr
 RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTScheduling::DistributableThread::_tao_release (DistributableThread_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -328,7 +330,7 @@ TAO::Objref_Traits<RTScheduling::Current>::release (
     RTScheduling::Current_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTScheduling::Current_ptr
@@ -346,7 +348,7 @@ TAO::Objref_Traits<RTScheduling::Current>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (void)
@@ -372,7 +374,7 @@ RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE&
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::operator= (const ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -434,7 +436,7 @@ CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_t
   return ::RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_)
@@ -446,7 +448,7 @@ RTScheduling::Current::IdType::IdType (void)
 RTScheduling::Current::IdType::IdType (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max)
@@ -458,7 +460,7 @@ RTScheduling::Current::IdType::IdType (
     CORBA::Octet * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (max, length, buffer, release)
@@ -467,7 +469,7 @@ RTScheduling::Current::IdType::IdType (
 RTScheduling::Current::IdType::IdType (
     const IdType &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Octet
       >
     (seq)
@@ -478,7 +480,7 @@ RTScheduling::Current::IdType::~IdType (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_)
@@ -490,7 +492,7 @@ RTScheduling::Current::NameList::NameList (void)
 RTScheduling::Current::NameList::NameList (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -500,14 +502,14 @@ RTScheduling::Current::NameList::NameList (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 RTScheduling::Current::NameList::NameList (
     const NameList &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -547,18 +549,18 @@ RTScheduling::Current::_unchecked_narrow (
 RTScheduling::Current_ptr
 RTScheduling::Current::_duplicate (Current_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTScheduling::Current::_tao_release (Current_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -627,7 +629,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::release (
     RTScheduling::ResourceManager_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTScheduling::ResourceManager_ptr
@@ -676,18 +678,18 @@ RTScheduling::ResourceManager::_unchecked_narrow (
 RTScheduling::ResourceManager_ptr
 RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTScheduling::ResourceManager::_tao_release (ResourceManager_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -752,7 +754,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::release (
     RTScheduling::Scheduler_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 RTScheduling::Scheduler_ptr
@@ -770,7 +772,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (void)
@@ -796,7 +798,7 @@ RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHED
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES&
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::operator= (const ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -889,18 +891,18 @@ RTScheduling::Scheduler::_unchecked_narrow (
 RTScheduling::Scheduler_ptr
 RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 RTScheduling::Scheduler::_tao_release (Scheduler_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -942,3 +944,5 @@ RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index 4955b9caf07..322b2f7da10 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "rtscheduler_export.h"
+#include "tao/RTScheduling/rtscheduler_export.h"
 
 #include "tao/PI_Server/ServerRequestInfoC.h"
 #include "tao/PI/ClientRequestInfoC.h"
@@ -81,6 +81,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -203,16 +205,16 @@ namespace RTScheduling
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_
-  
+
   class DistributableThread;
   typedef DistributableThread *DistributableThread_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DistributableThread
       >
     DistributableThread_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DistributableThread
@@ -220,124 +222,124 @@ namespace RTScheduling
     DistributableThread_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD_CH_
-  
+
   class TAO_RTScheduler_Export DistributableThread
     : public virtual CORBA::Object
   {
   public:
     typedef DistributableThread_ptr _ptr_type;
     typedef DistributableThread_var _var_type;
-    
+
     // The static operations.
     static DistributableThread_ptr _duplicate (DistributableThread_ptr obj);
-    
+
     static void _tao_release (DistributableThread_ptr obj);
-    
+
     static DistributableThread_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DistributableThread_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DistributableThread_ptr _nil (void)
     {
       return static_cast<DistributableThread_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_enum/enum_ch.cpp:57
-    
+
     enum DT_State
     {
       ACTIVE,
       CANCELLED
     };
-    
+
     typedef DT_State &DT_State_out;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_DT_State;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void cancel (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::DistributableThread::DT_State state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DistributableThread (void);
-    
+
     virtual ~DistributableThread (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DistributableThread (const DistributableThread &);
-    
+
     void operator= (const DistributableThread &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_DistributableThread;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_)
 #define _RTSCHEDULING_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -345,45 +347,45 @@ namespace RTScheduling
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTSCHEDULING_CURRENT_CH_)
 #define _RTSCHEDULING_CURRENT_CH_
-  
+
   class TAO_RTScheduler_Export Current
     : public virtual ::RTCORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static void _tao_release (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
     {
       return static_cast<Current_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::DistributableThread_ptr spawn (
         ::RTScheduling::ThreadAction_ptr start,
         ::CORBA::VoidData data,
@@ -397,28 +399,28 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_)
 #define _RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_
-    
+
     class TAO_RTScheduler_Export UNSUPPORTED_SCHEDULING_DISCIPLINE : public CORBA::UserException
     {
     public:
-      
+
       UNSUPPORTED_SCHEDULING_DISCIPLINE (void);
       UNSUPPORTED_SCHEDULING_DISCIPLINE (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
       ~UNSUPPORTED_SCHEDULING_DISCIPLINE (void);
 
       UNSUPPORTED_SCHEDULING_DISCIPLINE &operator= (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
-      
+
       static UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception *);
       static const UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -427,28 +429,28 @@ namespace RTScheduling
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void begin_scheduling_segment (
         const char * name,
         ::CORBA::Policy_ptr sched_param,
@@ -459,10 +461,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void update_scheduling_segment (
         const char * name,
         ::CORBA::Policy_ptr sched_param,
@@ -473,10 +475,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void end_scheduling_segment (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -484,33 +486,30 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CH_)
 #define _RTSCHEDULING_CURRENT_IDTYPE_CH_
-    
+
     class IdType;
-    
+
     typedef
       TAO_FixedSeq_Var_T<
-          IdType,
-          CORBA::Octet
+          IdType
         >
       IdType_var;
-    
+
     typedef
       TAO_Seq_Out_T<
-          IdType,
-          IdType_var,
-          CORBA::Octet
+          IdType
         >
       IdType_out;
-    
+
     class TAO_RTScheduler_Export IdType
       : public
-          TAO_Unbounded_Sequence<
+          TAO::unbounded_value_sequence<
               CORBA::Octet
             >
     {
@@ -520,12 +519,12 @@ namespace RTScheduling
       IdType (
           CORBA::ULong max,
           CORBA::ULong length,
-          CORBA::Octet* buffer, 
-          CORBA::Boolean release = 0
+          CORBA::Octet* buffer,
+          CORBA::Boolean release = false
         );
       IdType (const IdType &);
       ~IdType (void);
-      
+
       typedef IdType_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -533,30 +532,30 @@ namespace RTScheduling
           CORBA::ULong length,
           const ACE_Message_Block* mb
         )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+        : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_IdType;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::Current::IdType * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::DistributableThread_ptr lookup (
         const ::RTScheduling::Current::IdType & id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -564,53 +563,50 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr scheduling_parameter (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CH_)
 #define _RTSCHEDULING_CURRENT_NAMELIST_CH_
-    
+
     class NameList;
-    
+
     typedef
-      TAO_MngSeq_Var_T<
-          NameList,
-          TAO_SeqElem_String_Manager
+      TAO_VarSeq_Var_T<
+          NameList
         >
       NameList_var;
-    
+
     typedef
-      TAO_MngSeq_Out_T<
-          NameList,
-          NameList_var,
-          TAO_SeqElem_String_Manager
+      TAO_Seq_Out_T<
+          NameList
         >
       NameList_out;
-    
+
     class TAO_RTScheduler_Export NameList
       : public
-          TAO_Unbounded_String_Sequence
+          TAO::unbounded_string_sequence
     {
     public:
       NameList (void);
@@ -618,78 +614,78 @@ namespace RTScheduling
       NameList (
           CORBA::ULong max,
           CORBA::ULong length,
-          char ** buffer, 
-          CORBA::Boolean release = 0
+          char ** buffer,
+          CORBA::Boolean release = false
         );
       NameList (const NameList &);
       ~NameList (void);
-      
+
       typedef NameList_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_NameList;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::Current::NameList * current_scheduling_segment_names (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Current;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_
-  
+
   class ResourceManager;
   typedef ResourceManager *ResourceManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ResourceManager
       >
     ResourceManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ResourceManager
@@ -697,88 +693,88 @@ namespace RTScheduling
     ResourceManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER_CH_
-  
+
   class TAO_RTScheduler_Export ResourceManager
     : public virtual ::RTCORBA::Mutex
   {
   public:
     typedef ResourceManager_ptr _ptr_type;
     typedef ResourceManager_var _var_type;
-    
+
     // The static operations.
     static ResourceManager_ptr _duplicate (ResourceManager_ptr obj);
-    
+
     static void _tao_release (ResourceManager_ptr obj);
-    
+
     static ResourceManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ResourceManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ResourceManager_ptr _nil (void)
     {
       return static_cast<ResourceManager_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ResourceManager (void);
-    
+
     virtual ~ResourceManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ResourceManager (const ResourceManager &);
-    
+
     void operator= (const ResourceManager &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ResourceManager;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_)
 #define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_
-  
+
   class Scheduler;
   typedef Scheduler *Scheduler_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Scheduler
       >
     Scheduler_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Scheduler
@@ -786,63 +782,63 @@ namespace RTScheduling
     Scheduler_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTSCHEDULING_SCHEDULER_CH_)
 #define _RTSCHEDULING_SCHEDULER_CH_
-  
+
   class TAO_RTScheduler_Export Scheduler
     : public virtual CORBA::Object
   {
   public:
     typedef Scheduler_ptr _ptr_type;
     typedef Scheduler_var _var_type;
-    
+
     // The static operations.
     static Scheduler_ptr _duplicate (Scheduler_ptr obj);
-    
+
     static void _tao_release (Scheduler_ptr obj);
-    
+
     static Scheduler_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Scheduler_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Scheduler_ptr _nil (void)
     {
       return static_cast<Scheduler_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_)
 #define _RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_
-    
+
     class TAO_RTScheduler_Export INCOMPATIBLE_SCHEDULING_DISCIPLINES : public CORBA::UserException
     {
     public:
-      
+
       INCOMPATIBLE_SCHEDULING_DISCIPLINES (void);
       INCOMPATIBLE_SCHEDULING_DISCIPLINES (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
       ~INCOMPATIBLE_SCHEDULING_DISCIPLINES (void);
 
       INCOMPATIBLE_SCHEDULING_DISCIPLINES &operator= (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
-      
+
       static INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception *);
       static const INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -851,38 +847,38 @@ namespace RTScheduling
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PolicyList * scheduling_policies (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void scheduling_policies (
         const ::CORBA::PolicyList & scheduling_policies
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -890,30 +886,30 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PolicyList * poa_policies (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * scheduling_discipline_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::RTScheduling::ResourceManager_ptr create_resource_manager (
         const char * name,
         ::CORBA::Policy_ptr scheduling_parameter
@@ -922,10 +918,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_scheduling_parameter (
         ::PortableServer::Servant & resource,
         const char * name,
@@ -935,10 +931,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void begin_new_scheduling_segment (
         const ::RTScheduling::Current::IdType & guid,
         const char * name,
@@ -950,10 +946,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void begin_nested_scheduling_segment (
         const ::RTScheduling::Current::IdType & guid,
         const char * name,
@@ -965,10 +961,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void update_scheduling_segment (
         const ::RTScheduling::Current::IdType & guid,
         const char * name,
@@ -980,10 +976,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void end_scheduling_segment (
         const ::RTScheduling::Current::IdType & guid,
         const char * name
@@ -992,10 +988,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void end_nested_scheduling_segment (
         const ::RTScheduling::Current::IdType & guid,
         const char * name,
@@ -1005,10 +1001,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1017,10 +1013,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri,
         ::RTScheduling::Current::IdType_out guid,
@@ -1033,10 +1029,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1044,10 +1040,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1056,10 +1052,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1068,10 +1064,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1080,10 +1076,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1091,10 +1087,10 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1103,10 +1099,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_other (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1115,10 +1111,10 @@ namespace RTScheduling
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void cancel (
         const ::RTScheduling::Current::IdType & guid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1126,36 +1122,36 @@ namespace RTScheduling
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Scheduler (void);
-    
+
     virtual ~Scheduler (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Scheduler (const Scheduler &);
-    
+
     void operator= (const Scheduler &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Scheduler;
 
 // TAO_IDL - Generated from
@@ -1172,7 +1168,7 @@ namespace TAO
 
 #if !defined (_RTSCHEDULING_THREADACTION__TRAITS_CH_)
 #define _RTSCHEDULING_THREADACTION__TRAITS_CH_
-  
+
   template<>
   struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ThreadAction>
   {
@@ -1193,7 +1189,7 @@ namespace TAO
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_
-  
+
   template<>
   struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::DistributableThread>
   {
@@ -1214,7 +1210,7 @@ namespace TAO
 
 #if !defined (_RTSCHEDULING_CURRENT__TRAITS_CH_)
 #define _RTSCHEDULING_CURRENT__TRAITS_CH_
-  
+
   template<>
   struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Current>
   {
@@ -1235,7 +1231,7 @@ namespace TAO
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_
-  
+
   template<>
   struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ResourceManager>
   {
@@ -1256,7 +1252,7 @@ namespace TAO
 
 #if !defined (_RTSCHEDULING_SCHEDULER__TRAITS_CH_)
 #define _RTSCHEDULING_SCHEDULER__TRAITS_CH_
-  
+
   template<>
   struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Scheduler>
   {
@@ -1279,6 +1275,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index f6525b3d5fc..574b964f843 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "RTScheduler_Initializer.h"
-#include "Request_Interceptor.h"
+#include "tao/RTScheduling/RTScheduler_Initializer.h"
+#include "tao/RTScheduling/Request_Interceptor.h"
 
 ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
 
@@ -18,6 +18,10 @@ ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
 #include "ace/Service_Repository.h"
 #include "ace/Svc_Conf.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+static TAO_RTScheduler_Current_var current_cleanup;
+
 void
  TAO_RTScheduler_ORB_Initializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
@@ -63,18 +67,18 @@ void
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
+  current_cleanup = this->current_;
+
   this->current_->init (tao_info->orb_core ()
                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_ptr current_obj = RTScheduling::Current::_narrow (this->current_
+  CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_
                                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var safe_current = current_obj;
-
   info->register_initial_reference ("RTScheduler_Current",
-                                    current_obj
+                                    current_obj.in ()
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -131,8 +135,6 @@ void
                                     manager
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
-
 }
 
 void
@@ -153,12 +155,12 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
     ACE_DEBUG ((LM_DEBUG,
                 "In post_init\n"));
 
-  CORBA::Object_ptr rt_current_obj = info->resolve_initial_references ("RTCurrent"
+  CORBA::Object_var rt_current_obj = info->resolve_initial_references ("RTCurrent"
                                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 
-  RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj
+  RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj.in ()
                                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -172,3 +174,5 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
 
   this->current_->rt_current (rt_current.in ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index 075af17a661..8b242f9af9e 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Basic_Types.h"
-#include "rtscheduler_export.h"
+#include "tao/RTScheduling/rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,17 +33,16 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTScheduler_Current;
 
 /// RTCORBA ORB initializer.
-class TAO_RTScheduler_Export TAO_RTScheduler_ORB_Initializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+class TAO_RTScheduler_ORB_Initializer
+  : public virtual PortableInterceptor::ORBInitializer
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
-
-
-
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -52,14 +51,17 @@ public:
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
-        TAO_RTScheduler_Current* current_;
+
+  TAO_RTScheduler_Current* current_;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 
-#endif /* TAO_RTSCHEDULER__INITIALIZER_H */
+#endif /* TAO_RTSCHEDULER_INITIALIZER_H */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 2c0507a1f5b..bc4f99432bb 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -1,8 +1,8 @@
 
 // $Id$
 
-#include "RTScheduler_Loader.h"
-#include "RTScheduler_Initializer.h"
+#include "tao/RTScheduling/RTScheduler_Loader.h"
+#include "tao/RTScheduling/RTScheduler_Initializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -11,13 +11,10 @@
 ACE_RCSID (TAO, RTScheduler_Loader, "$Id$")
 
 
-TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
-{
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
 {
-
 }
 
 int
@@ -72,6 +69,8 @@ TAO_RTScheduler_Loader::init (int,
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////////////////////////////////////////////
 
 ACE_FACTORY_DEFINE (TAO_RTScheduler, TAO_RTScheduler_Loader)
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h
index 2dc82785123..92715d11279 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,20 +17,22 @@
 #define TAO_RTSCHEDULER_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "rtscheduler_export.h"
+#include "tao/RTScheduling/rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object
 {
 public:
-  /// Constructor.
-  TAO_RTScheduler_Loader (void);
 
   /// Destructor.
   virtual ~TAO_RTScheduler_Loader (void);
@@ -40,6 +42,8 @@ public:
                     ACE_TCHAR* []);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTScheduler, TAO_RTScheduler_Loader)
 ACE_FACTORY_DECLARE (TAO_RTScheduler, TAO_RTScheduler_Loader)
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
index 506ebde419e..14c269cab6c 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "RTScheduler_Manager.h"
+#include "tao/RTScheduling/RTScheduler_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "RTScheduler_Manager.i"
+#include "tao/RTScheduling/RTScheduler_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(TAO, RT_ORB, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
 {
  
@@ -41,3 +43,4 @@ TAO_RTScheduler_Manager::_interface_repository_id (void) const
   return "IDL:RTScheduler_Manager:1.0";
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index ecb45489a13..908922f6bda 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   RTScheduler_Manager.h
@@ -13,9 +14,10 @@
 #ifndef TAO_PRIORITY_MAPPING_MANAGER_H
 #define TAO_PRIORITY_MAPPING_MANAGER_H
 
-#include "RTScheduler.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "tao/LocalObject.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Manager;
 class TAO_RTScheduler_Manager_var;
@@ -132,8 +134,10 @@ private:
   TAO_RTScheduler_Manager_ptr &ptr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "RTScheduler_Manager.i"
+#include "tao/RTScheduling/RTScheduler_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_PRIORITY_MAPPING_MANAGER_H */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.i b/TAO/tao/RTScheduling/RTScheduler_Manager.i
index 30ec521e2f9..da473a28e64 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.i
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.i
@@ -5,6 +5,8 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Inline operations for class TAO_RTScheduler_Manager_var
 // *************************************************************
@@ -228,3 +230,5 @@ TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
     ACE_ENV_ARG_PARAMETER);
  ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl
index c4bd0ba0195..0c743c6794e 100644
--- a/TAO/tao/RTScheduling/RTScheduler_include.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler_include.pidl
@@ -32,7 +32,7 @@
 #ifndef _RT_SCHEDULER_INCLUDE_IDL_
 #define _RT_SCHEDULER_INCLUDE_IDL_
 
-#include "../RTScheduling/RTScheduler.pidl"
+#include "tao/RTScheduling/RTScheduler.pidl"
 
 #endif /* _RT_SCHEDULER_INCLUDE_IDL_ */
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h
index d5d3403e8ef..c0d1fb47a98 100644
--- a/TAO/tao/RTScheduling/RTScheduler_includeA.h
+++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
@@ -74,6 +76,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h
index c1624376b4d..41af68734d6 100644
--- a/TAO/tao/RTScheduling/RTScheduler_includeC.h
+++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Traits specializations.
 namespace TAO
 {
@@ -74,6 +76,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 7e9a52427c5..7157b3d84c4 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -1,12 +1,14 @@
 //$Id$
 
-#include "Request_Interceptor.h"
-#include "Current.h"
-#include "Distributable_Thread.h"
-#include "tao/TSS_Resources.h"
-#include "tao/debug.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+
+#include "tao/RTScheduling/Request_Interceptor.h"
+#include "tao/RTScheduling/Current.h"
+#include "tao/RTScheduling/Distributable_Thread.h"
+
+#include "tao/TSS_Resources.h"
+#include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
@@ -14,14 +16,11 @@ ACE_RCSID (RTScheduling,
            Request_Interceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const IOP::ServiceId
 Client_Interceptor::SchedulingInfo = 30;
 
-Client_Interceptor::Client_Interceptor (void)
-{
-}
-
 void
 Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                                   ACE_ENV_ARG_DECL)
@@ -104,7 +103,8 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       // Scheduler populates the service context with
       // scheduling parameters.
-      current->scheduler ()->send_request (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_request (ri);
 
       // If this is a one way request
       if (!ri->response_expected ())
@@ -133,8 +133,10 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
-      current->scheduler ()->send_poll (ri);
-
+      {
+        RTScheduling::Scheduler_var scheduler = current->scheduler ();
+        scheduler->send_poll (ri);
+      }
 }
 
 void
@@ -152,7 +154,10 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    current->scheduler ()->receive_reply (ri);
+    {
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->receive_reply (ri);
+    }
 }
 
 void
@@ -215,7 +220,8 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         {
           // Inform scheduler that exception was
           // received.
-          current->scheduler ()->receive_exception (ri);
+          RTScheduling::Scheduler_var scheduler = current->scheduler ();
+          scheduler->receive_exception (ri);
         }
     }
 }
@@ -236,8 +242,10 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    current->scheduler ()->receive_other (ri);
-
+    {
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->receive_other (ri);
+    }
 }
 
 char*
@@ -311,7 +319,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   CORBA::Policy_ptr sched_param = 0;
   CORBA::Policy_ptr implicit_sched_param = 0;
 
-  TAO_RTScheduler_Current_i* new_current;
+  TAO_RTScheduler_Current_i* new_current = 0;
   ACE_NEW_THROW_EX (new_current,
                     TAO_RTScheduler_Current_i (this->current_->orb (),
                                                this->current_->dt_hash ()),
@@ -325,13 +333,14 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Scheduler retrieves scheduling parameters
   // from request and populates the out
   // parameters.
-  new_current->scheduler()->receive_request (ri,
-                                             guid_var.out (),
-                                             name,
-                                             sched_param,
-                                             implicit_sched_param);
-
-  if (guid_var.in () == 0)
+  RTScheduling::Scheduler_var scheduler = new_current->scheduler();
+  scheduler->receive_request (ri,
+                              guid_var.out (),
+                              name,
+                              sched_param,
+                              implicit_sched_param);
+
+  if (guid_var->length () == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "The scheduler MUST retreive and return the "
@@ -411,8 +420,8 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
 
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_reply (ri
-                                         ACE_ENV_ARG_PARAMETER);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       current->cleanup_DT ();
@@ -450,7 +459,8 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_exception (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_exception (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -475,7 +485,8 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_other (ri);
+      RTScheduling::Scheduler_var scheduler = current->scheduler ();
+      scheduler->send_other (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -495,3 +506,5 @@ Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 189b5220d47..1a8c74a389a 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -5,23 +5,25 @@
 #ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 #define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 
-#include "rtscheduler_export.h"
-#include "RTScheduler.h"
+#include "tao/RTScheduling/rtscheduler_export.h"
+#include "tao/RTScheduling/RTScheduler.h"
 #include "ace/Atomic_Op.h"
-#include "Current.h"
+#include "tao/RTScheduling/Current.h"
+#include "tao/LocalObject.h"
 
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
-class TAO_RTScheduler_Export Client_Interceptor :
-  public PortableInterceptor::ClientRequestInterceptor
+class TAO_RTScheduler_Export Client_Interceptor:
+  public PortableInterceptor::ClientRequestInterceptor,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
-  Client_Interceptor (void);
-
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -57,7 +59,8 @@ public:
 };
 
 class TAO_RTScheduler_Export Server_Interceptor :
-  public PortableInterceptor::ServerRequestInterceptor
+  public PortableInterceptor::ServerRequestInterceptor,
+  public TAO_Local_RefCounted_Object
 {
 
 public:
@@ -100,4 +103,6 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index a6cc2f54ea3..e7b7fc530cd 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //$Id$
 #ifndef TAO_ThreadAction_H
 #define TAO_ThreadAction_H
@@ -6,7 +8,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "RTSchedulerC.h"
+#include "tao/RTScheduling/RTSchedulerC.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Export TAO_ThreadAction: 
 public RTScheduling::ThreadAction,
@@ -19,4 +23,6 @@ public RTScheduling::ThreadAction,
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*TAO_ThreadAction_H*/
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 74bddc34ee6..0883b3ee91c 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -1,8 +1,8 @@
-#include "Reactive_Connect_Strategy.h"
-#include "Connection_Handler.h"
-#include "ORB_Core.h"
-#include "debug.h"
-#include "Transport.h"
+#include "tao/Reactive_Connect_Strategy.h"
+#include "tao/Connection_Handler.h"
+#include "tao/ORB_Core.h"
+#include "tao/debug.h"
+#include "tao/Transport.h"
 
 #include "ace/Synch_Options.h"
 
@@ -10,6 +10,9 @@ ACE_RCSID(tao,
           Reactive_Connect_Strategy,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy (
     TAO_ORB_Core *orb_core)
   : TAO_Connect_Strategy (orb_core)
@@ -89,7 +92,6 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
   return result;
 }
 
-
 int
 TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
                                      ACE_Time_Value *val)
@@ -100,3 +102,5 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
   return this->wait (t->connection_handler (),
                      val);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index 5550e00380d..305b5e9576e 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -15,15 +15,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Connect_Strategy.h"
+#include "tao/Connect_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Connector;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
 class ACE_Synch_Options;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Connector;
 
 /**
  * @class TAO_Reactive_Connect_Strategy
@@ -57,6 +62,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
-#endif /*TAO_REACTIVE_CONNECT_STRATEGY_H*/
+#endif  /* TAO_REACTIVE_CONNECT_STRATEGY_H */
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 15761dbcb14..085779f99ed 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -1,15 +1,18 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Reactive_Flushing_Strategy.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "Queued_Message.h"
+#include "tao/Reactive_Flushing_Strategy.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
+#include "tao/Queued_Message.h"
 
-ACE_RCSID (tao, 
-           Reactive_Flushing_Strategy, 
+ACE_RCSID (tao,
+           Reactive_Flushing_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport)
 {
@@ -33,7 +36,7 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      TAO_ORB_Core *orb_core = transport->orb_core ();
+      TAO_ORB_Core * const orb_core = transport->orb_core ();
 
       while (!msg->all_data_sent () && result >= 0)
         {
@@ -57,11 +60,11 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      TAO_ORB_Core *orb_core = transport->orb_core ();
+      TAO_ORB_Core * const orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
+          int const result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result == -1)
@@ -76,3 +79,5 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
index 27041a0be5a..56896b01f95 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Flushing_Strategy.h"
+#include "tao/Flushing_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Reactive_Flushing_Strategy
  *
@@ -37,6 +39,8 @@ public:
   virtual int flush_transport (TAO_Transport *transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_REACTIVE_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
index 7bafb1bc50b..074a9e3d6ed 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -1,15 +1,18 @@
 //$Id$
-#include "Refcounted_ObjectKey.h"
+#include "tao/Refcounted_ObjectKey.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Refcounted_ObjectKey.inl"
+#include "tao/Refcounted_ObjectKey.inl"
 #endif /* defined INLINE */
 
 ACE_RCSID(tao,
           Refcounted_ObjectKey,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key)
   : object_key_ (key)
   , ref_count_ (1)
@@ -20,7 +23,7 @@ TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey (void)
 {
 }
 
-long
+CORBA::ULong
 TAO::Refcounted_ObjectKey::decr_refcount (void)
 {
   if (--this->ref_count_ > 0)
@@ -34,3 +37,5 @@ TAO::Refcounted_ObjectKey::decr_refcount (void)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
index 297ec6fd654..5c0ae02629d 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -23,6 +23,8 @@
 
 #include "tao/Object_KeyC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -50,21 +52,26 @@ namespace TAO
     /// Protected destructor
     ~Refcounted_ObjectKey (void);
 
-    /// Methods for incrementing and decrementing refcounts.
-    long incr_refcount (void);
-    long decr_refcount (void);
+    /// Methods for incrementing refcount.
+    void incr_refcount (void);
+
+    /// Methods for decrementing refcount. Return the refcount, used by the
+    /// ObjectKey table.
+    CORBA::ULong decr_refcount (void);
 
   private:
     /// The object key
     ObjectKey object_key_;
 
     /// The refcount on the object key..
-    long ref_count_;
+    CORBA::ULong ref_count_;
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Refcounted_ObjectKey.inl"
+#include "tao/Refcounted_ObjectKey.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl
index c829e6b45b0..117f9db4ee9 100644
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ b/TAO/tao/Refcounted_ObjectKey.inl
@@ -1,15 +1,20 @@
 // -*- C++ -*-
+//
 // $Id$
-ACE_INLINE long
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE void
 TAO::Refcounted_ObjectKey::incr_refcount (void)
 {
-  return ++this->ref_count_;
+  ++this->ref_count_;
 }
 
-
-
 ACE_INLINE const TAO::ObjectKey &
 TAO::Refcounted_ObjectKey::object_key (void) const
 {
   return this->object_key_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index c19332acb84..417722db92b 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -1,19 +1,22 @@
 //$Id$
-#include "Remote_Invocation.h"
-#include "Profile.h"
-#include "Profile_Transport_Resolver.h"
-#include "Stub.h"
-#include "Transport.h"
-#include "Connection_Handler.h"
-#include "operation_details.h"
-#include "ORB_Core.h"
-#include "Protocols_Hooks.h"
-#include "debug.h"
+
+#include "tao/Remote_Invocation.h"
+#include "tao/Profile.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/Stub.h"
+#include "tao/Transport.h"
+#include "tao/Connection_Handler.h"
+#include "tao/operation_details.h"
+#include "tao/ORB_Core.h"
+#include "tao/Protocols_Hooks.h"
+#include "tao/debug.h"
 
 ACE_RCSID (tao,
            Remote_Invocation,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Remote_Invocation::Remote_Invocation (
@@ -25,7 +28,8 @@ namespace TAO
                        resolver.object (),
                        resolver.stub (),
                        detail,
-                       response_expected)
+                       response_expected,
+                       true /* request_is_remote */ )
     , resolver_ (resolver)
   {
   }
@@ -75,7 +79,7 @@ namespace TAO
       // index that we need.
       CORBA::ULong index = 0;
       IOP::IOR *ior_info = 0;
-      const int retval =
+      int const retval =
         this->resolver_.stub ()->create_ior_info (ior_info,
                                                   index
                                                   ACE_ENV_ARG_PARAMETER);
@@ -110,6 +114,7 @@ namespace TAO
   {
     this->resolver_.transport ()->clear_translators (0,
                                                      &out_stream);
+
     // Send the request for the header
     if (this->resolver_.transport ()->generate_request_header (this->details_,
                                                                spec,
@@ -155,7 +160,7 @@ namespace TAO
 
     connection_handler->set_dscp_codepoint (set_client_network_priority);
 
-    const int retval =
+    int const retval =
       this->resolver_.transport ()->send_request (
         this->resolver_.stub (),
         this->resolver_.stub ()->orb_core (),
@@ -200,3 +205,5 @@ namespace TAO
     return TAO_INVOKE_SUCCESS;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
index 555d198afa7..9bb187a3ea8 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -23,6 +23,8 @@
 
 #include "tao/Invocation_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
@@ -93,6 +95,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_REMOTE_INVOCATION_H*/
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 3ec43f69ed7..fd4bc75cde0 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,11 +1,11 @@
-#include "Remote_Object_Proxy_Broker.h"
-#include "CORBA_String.h"
-#include "UB_String_Arguments.h"
-#include "Special_Basic_Arguments.h"
-#include "Invocation_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "ORB_Core.h"
-#include "SystemException.h"
+#include "tao/Remote_Object_Proxy_Broker.h"
+#include "tao/CORBA_String.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/Invocation_Adapter.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/ORB_Core.h"
+#include "tao/SystemException.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -13,6 +13,9 @@ ACE_RCSID (tao,
            Remote_Object_Proxy_Broker,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   CORBA::Boolean
@@ -145,3 +148,5 @@ the_tao_remote_object_proxy_broker (void)
   static TAO::Remote_Object_Proxy_Broker the_broker;
   return &the_broker;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index 9541b56abdb..eab7f29e5b7 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -26,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -71,6 +73,8 @@ namespace TAO
 
 TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REMOTE_OBJECT_PROXY_BROKER_H */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 9f8146c7bd7..278f4463203 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Reply_Dispatcher.h"
+#include "tao/Reply_Dispatcher.h"
 
 ACE_RCSID (tao, 
            Reply_Dispatcher, 
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
 #include "tao/Reply_Dispatcher.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
   // Just an invalid reply status.
@@ -21,3 +23,5 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
 TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 63cd7683422..4f4c16e879b 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Declarations.
 class TAO_GIOP_Message_State;
 class TAO_GIOP_Message_Version;
@@ -87,6 +89,8 @@ protected:
   CORBA::ULong reply_status_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
index 549263801ff..e390ec5911c 100644
--- a/TAO/tao/Reply_Dispatcher.i
+++ b/TAO/tao/Reply_Dispatcher.i
@@ -1,7 +1,14 @@
+// -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_Reply_Dispatcher::reply_status (void) const
 {
   return this->reply_status_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index 4e1d483a6c3..3663d1ee49e 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#include "Request_Dispatcher.h"
-#include "TAO_Server_Request.h"
-#include "ORB_Core.h"
+#include "tao/Request_Dispatcher.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID (tao, 
            Request_Dispatcher, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
 {
 }
@@ -25,3 +27,5 @@ TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index 0c6ebba06f3..a06f4462c6b 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -28,6 +28,8 @@
 #include "tao/Pseudo_VarOut_T.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_ServerRequest;
 
@@ -59,6 +61,8 @@ public:
                          ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REQUEST_DISPATCHER_H */
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index 7ab5c57e770..2f629c3331b 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "Resource_Factory.h"
-#include "Protocol_Factory.h"
-#include "orbconf.h"
+#include "tao/Resource_Factory.h"
+#include "tao/Protocol_Factory.h"
+#include "tao/orbconf.h"
 
 #include "ace/ACE.h"
 
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
   : name_ (name),
     factory_ (0),
@@ -88,6 +90,11 @@ TAO_Resource_Factory::get_acceptor_registry (void)
   return 0;
 }
 
+void
+TAO_Resource_Factory::use_local_memory_pool (bool)
+{
+}
+
 ACE_Allocator *
 TAO_Resource_Factory::input_cdr_dblock_allocator (void)
 {
@@ -216,3 +223,4 @@ TAO_Resource_Factory::load_default_protocols (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 65ec7222957..1fae24ea22b 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -15,17 +15,27 @@
 #define TAO_RESOURCE_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+#include "tao/Basic_Types.h"
+
+#include "ace/Service_Object.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/SString.h"
 #include "ace/CDR_Base.h"
 
-#include "tao/TAO_Export.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Protocol_Factory;
 class TAO_Acceptor_Registry;
@@ -35,8 +45,8 @@ class TAO_Flushing_Strategy;
 class TAO_Connection_Purging_Strategy;
 class TAO_LF_Strategy;
 class TAO_Codeset_Manager;
-
-class ACE_Lock;
+class TAO_GIOP_Fragmentation_Strategy;
+class TAO_Transport;
 
 // ****************************************************************
 
@@ -62,9 +72,10 @@ public:
   void factory (TAO_Protocol_Factory *factory, int owner = 0);
 
 private:
-  // Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Protocol_Item (const TAO_Protocol_Item&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Protocol_Item&))
+
+  // Disallow copying and assignment.
+  TAO_Protocol_Item (const TAO_Protocol_Item&);
+  void operator= (const TAO_Protocol_Item&);
 
 private:
   /// Protocol factory name.
@@ -145,6 +156,9 @@ public:
   /// Return a connector to be utilized.
   virtual TAO_Connector_Registry *get_connector_registry (void);
 
+  /// Return the Allocator's memory pool type
+  virtual void use_local_memory_pool (bool);
+
   /// @name Access the input CDR allocators.
   //@{
   virtual ACE_Allocator* input_cdr_dblock_allocator (void);
@@ -228,6 +242,11 @@ public:
   /// caller.
   virtual TAO_LF_Strategy *create_lf_strategy (void) = 0;
 
+  /// Outgoing fragment creation strategy.
+  virtual auto_ptr<TAO_GIOP_Fragmentation_Strategy>
+    create_fragmentation_strategy (TAO_Transport * transport,
+                                   CORBA::ULong max_message_size) const = 0;
+
   /// Disables the factory.  When a new factory is installed and used,
   /// this function should be called on the previously used (default)
   /// factory.  This should result in proper error reporting if the
@@ -253,6 +272,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 836e592e6a1..34f0cd5ab2e 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,16 +1,19 @@
-#include "Resume_Handle.h"
-#include "ORB_Core.h"
+#include "tao/Resume_Handle.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Resume_Handle.inl"
+# include "tao/Resume_Handle.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           Resume_Handle, 
+ACE_RCSID (tao,
+           Resume_Handle,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Resume_Handle::resume_handle (void)
 {
@@ -27,3 +30,51 @@ TAO_Resume_Handle::resume_handle (void)
   // Set the flag, so that we dont resume again..
   this->flag_ = TAO_HANDLE_ALREADY_RESUMED;
 }
+
+void
+TAO_Resume_Handle::handle_input_return_value_hook (int& return_value)
+{
+  // RT8248: The return value is only changed from 1 to 0 if:
+  //   1) the handle_input return value wants an immediate callback
+  //      on the handle (i.e. will return "1")
+  //   2) this->resume_handle was already called
+  //   3) reactor->resume_handler was called by this->resume_handle
+  // The value is changed because you can't ask for an immediate callback
+  // on a handle that you have already given up ownership of. (RT8248)
+  if ( return_value == 1 &&
+       this->flag_ == TAO_HANDLE_ALREADY_RESUMED &&
+       this->orb_core_ &&
+       this->orb_core_->reactor ()->resumable_handler () &&
+       this->handle_ != ACE_INVALID_HANDLE)
+    {
+      // a return value of "1" means "call me back immediately;
+      // but we can't "call me back immediately" on an
+      // already-resumed handle
+      return_value = 0;
+
+      if (TAO_debug_level > 6)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, "
+                      "overriding return value of 1 with retval = %d\n",
+                      return_value));
+        }
+    }
+  else if ( return_value == -1 )
+    {
+      // this covers the "connection close" case, where you want
+      // to leave the handle suspended if you're return -1 to
+      // remove the handle from the Reactor. (See ChangeLog entry
+      // Fri Dec 16 14:40:54 2005)
+      this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED;
+
+      if (TAO_debug_level > 6)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, "
+                      "handle_input returning -1, so handle is not resumed.\n"));
+        }
+    }
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
index 44aed27e266..9fd1f4949e9 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.h
@@ -15,12 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 
 /**
@@ -62,13 +66,19 @@ public:
   /// Allow the users of this class to change the underlying flag.
   void set_flag (TAO_Handle_Resume_Flag fl);
 
-  /// Equal to operator..
+  /// Assignment operator
   TAO_Resume_Handle &operator= (const TAO_Resume_Handle &rhs);
 
   /// Resume the handle in the reactor only if the ORB uses a TP
-  /// reactor. Else we dont resume the handle.
+  /// reactor. Else we don't resume the handle.
   void resume_handle (void);
 
+  // Hook method called at the end of a connection handler's
+  // handle_input function.  Might override the handle_input
+  // return value or change the resume_handler's flag_ value.
+  void handle_input_return_value_hook (int& return_value);
+
+
 private:
 
   /// Our ORB Core.
@@ -82,8 +92,10 @@ private:
   TAO_Handle_Resume_Flag flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Resume_Handle.inl"
+# include "tao/Resume_Handle.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index 38aae6740f1..e89466fd4e2 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core,
                                       ACE_HANDLE h)
@@ -15,9 +18,6 @@ TAO_Resume_Handle::~TAO_Resume_Handle (void)
 {
   if (this->flag_ == TAO_HANDLE_RESUMABLE)
     this->resume_handle ();
-
-  this->orb_core_ = 0;
-  this->handle_ = ACE_INVALID_HANDLE;
 }
 
 
@@ -36,3 +36,5 @@ TAO_Resume_Handle::operator= (const TAO_Resume_Handle &rhs)
 
   return *this;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp
index 89b13ea1890..02bc2c7f89f 100644
--- a/TAO/tao/Seq_Out_T.cpp
+++ b/TAO/tao/Seq_Out_T.cpp
@@ -1,14 +1,12 @@
-#ifndef TAO_SEQ_OUT_T_C
-#define TAO_SEQ_OUT_T_C
+// $Id$
 
-#include "Seq_Out_T.h"
+#ifndef TAO_SEQ_OUT_T_CPP
+#define TAO_SEQ_OUT_T_CPP
+
+#include "tao/Seq_Out_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Seq_Out_T.inl"
+#include "tao/Seq_Out_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Sequence_Out_T,
-           "$Id$")
-
-#endif /*TAO_SEQUENCE_OUT_T_C*/
+#endif  /* TAO_SEQUENCE_OUT_T_CPP */
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index 895c4f9b62b..baaf937394a 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -18,6 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Seq_Out_T
@@ -25,66 +26,36 @@
  * @brief Parametrized implementation of _out class for sequences.
  *
  */
-template <typename T, typename T_var, typename T_elem>
+template <typename T>
 class TAO_Seq_Out_T
 {
 public:
+  typedef typename T::subscript_type T_elem;
+  typedef typename T::_var_type T_var;
+
   TAO_Seq_Out_T (T *&);
   TAO_Seq_Out_T (T_var &);
-  TAO_Seq_Out_T (const TAO_Seq_Out_T<T,T_var,T_elem> &);
+  TAO_Seq_Out_T (const TAO_Seq_Out_T<T> &);
 
-  TAO_Seq_Out_T &operator= (const TAO_Seq_Out_T<T,T_var,T_elem> &);
+  TAO_Seq_Out_T &operator= (const TAO_Seq_Out_T<T> &);
   TAO_Seq_Out_T &operator= (T *);
 
   operator T *& ();
-  T *& ptr (void);
   T * operator-> (void);
 
-  T_elem & operator[] (CORBA::ULong index);
-
-private:
-  typedef TAO_Seq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
-  T *& ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const T_var &);
-};
-
-
-/**
- * @class TAO_MngSeq_Out_T
- *
- * @brief Parametrized implementation of _out class for sequences
- * having managed types.
- *
- */
-template <typename T, typename T_var, typename T_elem>
-class TAO_MngSeq_Out_T
-{
-public:
-  TAO_MngSeq_Out_T (T *&);
-  TAO_MngSeq_Out_T (T_var &);
-  TAO_MngSeq_Out_T (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
-
-  TAO_MngSeq_Out_T &operator= (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
-  TAO_MngSeq_Out_T &operator= (T *);
-
-  operator T *& ();
+  T_elem  operator[] (CORBA::ULong index);
   T *& ptr (void);
-  T * operator-> (void);
-
-  T_elem operator[] (CORBA::ULong index);
 
 private:
-  typedef TAO_MngSeq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
   T *& ptr_;
   // Assignment from T_var not allowed.
   void operator= (const T_var &);
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "Seq_Out_T.inl"
+#include "tao/Seq_Out_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
index c26815ff9cb..80e460f6cf2 100644
--- a/TAO/tao/Seq_Out_T.inl
+++ b/TAO/tao/Seq_Out_T.inl
@@ -1,154 +1,83 @@
 // -*- C++ -*-
+//
 //$Id$
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (
-    const TAO_Seq_Out_T<T,T_var,T_elem> & p
-  )
-  : ptr_ (p.ptr_)
-{}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem> &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator= (
-    const TAO_Seq_Out_T<T,T_var,T_elem> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem> &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *&
-TAO_Seq_Out_T<T,T_var,T_elem>::ptr (void)
-{
-  return this->ptr_;
-}
 
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *
-TAO_Seq_Out_T<T,T_var,T_elem>::operator-> (void)
-{
-  return this->ptr_;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-T_elem &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// ****************************************************************
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T *& p)
+TAO_Seq_Out_T<T>::TAO_Seq_Out_T (T *& p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T_var & p)
+TAO_Seq_Out_T<T>::TAO_Seq_Out_T (T_var & p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
   this->ptr_ = 0;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (
-    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
+TAO_Seq_Out_T<T>::TAO_Seq_Out_T (
+    const TAO_Seq_Out_T<T> & p
   )
   : ptr_ (p.ptr_)
 {}
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem> &
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (
-    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
+TAO_Seq_Out_T<T> &
+TAO_Seq_Out_T<T>::operator= (
+    const TAO_Seq_Out_T<T> & p
   )
 {
   this->ptr_ = p.ptr_;
   return *this;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem> &
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (T * p)
+TAO_Seq_Out_T<T> &
+TAO_Seq_Out_T<T>::operator= (T * p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator T *& ()
+TAO_Seq_Out_T<T>::operator T *& ()
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *&
-TAO_MngSeq_Out_T<T,T_var,T_elem>::ptr (void)
+TAO_Seq_Out_T<T>::ptr (void)
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator-> (void)
+TAO_Seq_Out_T<T>::operator-> (void)
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_var, typename T_elem>
+template<typename T>
 ACE_INLINE
-T_elem
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
+typename TAO_Seq_Out_T<T>::T_elem
+TAO_Seq_Out_T<T>::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp
index 04d36e7dafa..a9929293475 100644
--- a/TAO/tao/Seq_Var_T.cpp
+++ b/TAO/tao/Seq_Var_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_SEQ_VAR_T_C
-#define TAO_SEQ_VAR_T_C
+#ifndef TAO_SEQ_VAR_T_CPP
+#define TAO_SEQ_VAR_T_CPP
 
 #include "tao/Seq_Var_T.h"
 
@@ -9,153 +9,68 @@
 #include "tao/Seq_Var_T.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_Memory.h"
 
-ACE_RCSID (tao,
-           Seq_VarOut_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
-template<typename T, typename T_elem>
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
-    const TAO_Seq_Var_Base_T<T,T_elem> & p
-  )
+template<typename T>
+TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (
+    const TAO_Seq_Var_Base_T<T> & p)
+  : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0)
 {
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_,
-               T (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
 }
 
 // ****************************************************************************
 
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (
-    const TAO_FixedSeq_Var_T<T,T_elem> & p
-  )
+template<typename T>
+TAO_FixedSeq_Var_T<T> &
+TAO_FixedSeq_Var_T<T>::operator= (
+    const TAO_FixedSeq_Var_T<T> & p)
 {
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_FixedSeq_Var_T<T> tmp (p);
+
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
 
 // Fixed-size types only.
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
+template<typename T>
+TAO_FixedSeq_Var_T<T> &
+TAO_FixedSeq_Var_T<T>::operator= (const T & p)
 {
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_,
-                      T (p),
-                      *this);
-    }
-
-  return *this;
-}
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_FixedSeq_Var_T<T> tmp (p);
 
-// ****************************************************************************
-
-template<typename T, typename T_elem>
-TAO_VarSeq_Var_T<T,T_elem> &
-TAO_VarSeq_Var_T<T,T_elem>::operator= (
-    const TAO_VarSeq_Var_T<T,T_elem> & p
-  )
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
 
 // ****************************************************************************
 
-template<typename T, typename T_elem>
-TAO_MngSeq_Var_T<T,T_elem> &
-TAO_MngSeq_Var_T<T,T_elem>::operator= (
-    const TAO_MngSeq_Var_T<T,T_elem> & p
-  )
+template<typename T>
+TAO_VarSeq_Var_T<T> &
+TAO_VarSeq_Var_T<T>::operator= (const TAO_VarSeq_Var_T<T> & p)
 {
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_VarSeq_Var_T<T> tmp (p);
+
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
 
-#endif /* TAO_SEQ_VAR_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_SEQ_VAR_T_CPP */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
index c5c401f8f5b..527c63e664f 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -19,7 +19,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_Memory.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Seq_Var_Base_T
@@ -27,13 +29,15 @@
  * @brief Parametrized implementation of _var base class for sequences
  *
  */
-template <typename T, typename T_elem>
+template <typename T>
 class TAO_Seq_Var_Base_T
 {
 public:
+  typedef typename T::subscript_type T_elem;
+
   TAO_Seq_Var_Base_T (void);
   TAO_Seq_Var_Base_T (T *);
-  TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T,T_elem> &);
+  TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> &);
 
   ~TAO_Seq_Var_Base_T (void);
 
@@ -55,9 +59,8 @@ public:
   _out_type     out (void);
   _retn_type    _retn (void);
 
-  // TAO extension.
-  _retn_type    ptr (void) const;
-
+   /// TAO extension.
+   _retn_type    ptr (void) const;
 protected:
   T * ptr_;
 };
@@ -67,25 +70,28 @@ protected:
  *
  * @brief Parametrized implementation of _var class for sequences
  * whose element is of fixed size..
- *
  */
-template <typename T, typename T_elem>
-class TAO_FixedSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
+template <typename T>
+class TAO_FixedSeq_Var_T : public TAO_Seq_Var_Base_T<T>
 {
 public:
+  typedef typename T::subscript_type T_elem;
+  typedef typename T::const_subscript_type T_const_elem;
+
   TAO_FixedSeq_Var_T (void);
   TAO_FixedSeq_Var_T (T *);
-  TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T,T_elem> &);
+  TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> &);
 
   // Fixed-size base types only.
   TAO_FixedSeq_Var_T (const T &);
 
   TAO_FixedSeq_Var_T & operator= (T *);
-  TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &);
+  TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T> &);
 
-  T_elem & operator[] (CORBA::ULong index);
+  T_elem operator[] (CORBA::ULong index);
+  T_const_elem operator[] (CORBA::ULong index) const;
 
-  // Fixed-size base types only.
+  /// Fixed-size base types only.
   TAO_FixedSeq_Var_T & operator= (const T &);
 };
 
@@ -96,53 +102,31 @@ public:
  * whose element is of variable size..
  *
  */
-template <typename T, typename T_elem>
-class TAO_VarSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
+template <typename T>
+class TAO_VarSeq_Var_T : public TAO_Seq_Var_Base_T<T>
 {
 public:
+  typedef typename T::subscript_type T_elem;
+  typedef typename T::const_subscript_type T_const_elem;
+
   TAO_VarSeq_Var_T (void);
   TAO_VarSeq_Var_T (T *);
-  TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T,T_elem> &);
+  TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> &);
 
   TAO_VarSeq_Var_T & operator= (T *);
-  TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &);
-
-  T_elem & operator[] (CORBA::ULong index);
-
-  // Variable-size base types only.
-  operator T *& ();
-};
+  TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T> &);
 
-/**
- * @class TAO_MngSeq_Var_T
- *
- * @brief Parametrized implementation of _var class for sequences
- * whose element is of a managed type - string, wstring, valuetype,
- * interface, abstract interface and pseudo object.
- *
- */
-template <typename T, typename T_elem>
-class TAO_MngSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
-{
-public:
-  TAO_MngSeq_Var_T (void);
-  TAO_MngSeq_Var_T (T *);
-  TAO_MngSeq_Var_T (const TAO_MngSeq_Var_T<T,T_elem> &);
-
-  TAO_MngSeq_Var_T & operator= (T *);
-  TAO_MngSeq_Var_T & operator= (const TAO_MngSeq_Var_T<T,T_elem> &);
+  T_elem operator[] (CORBA::ULong index);
+  T_const_elem operator[] (CORBA::ULong index) const;
 
-  // Variable-size base types only.
+  /// Variable-size base types only.
   operator T *& ();
-
-  // Managed base types only.
-  T_elem operator[] (CORBA::ULong index);
 };
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "Seq_Var_T.inl"
+#include "tao/Seq_Var_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl
index b625dac9a6e..ac3515783d4 100644
--- a/TAO/tao/Seq_Var_T.inl
+++ b/TAO/tao/Seq_Var_T.inl
@@ -1,223 +1,191 @@
-//$Id$
+// -*- C++ -*-
+//
+// $Id$
 
-template<typename T, typename T_elem>
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (void)
+TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (void)
   : ptr_ (0)
 {}
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (T * p)
+TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (T * p)
   : ptr_ (p)
 {}
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::~TAO_Seq_Var_Base_T (void)
+TAO_Seq_Var_Base_T<T>::~TAO_Seq_Var_Base_T (void)
 {
   delete this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 const T *
-TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void) const
+TAO_Seq_Var_Base_T<T>::operator-> (void) const
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *
-TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void)
+TAO_Seq_Var_Base_T<T>::operator-> (void)
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator const T & () const
+TAO_Seq_Var_Base_T<T>::operator const T & () const
 {
   return *this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator T & ()
+TAO_Seq_Var_Base_T<T>::operator T & ()
 {
   return *this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator T & () const
+TAO_Seq_Var_Base_T<T>::operator T & () const
 {
   return *this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 const T &
-TAO_Seq_Var_Base_T<T,T_elem>::in (void) const
+TAO_Seq_Var_Base_T<T>::in (void) const
 {
   return *this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 T &
-TAO_Seq_Var_Base_T<T,T_elem>::inout (void)
+TAO_Seq_Var_Base_T<T>::inout (void)
 {
   return *this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *&
-TAO_Seq_Var_Base_T<T,T_elem>::out (void)
+TAO_Seq_Var_Base_T<T>::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *
-TAO_Seq_Var_Base_T<T,T_elem>::_retn (void)
+TAO_Seq_Var_Base_T<T>::_retn (void)
 {
   T * tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
 T *
-TAO_Seq_Var_Base_T<T,T_elem>::ptr (void) const
+TAO_Seq_Var_Base_T<T>::ptr (void) const
 {
   return this->ptr_;
 }
 
 // ***************************************************************
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (void)
+TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (void)
 {}
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (T * p)
+  : TAO_Seq_Var_Base_T<T> (p)
 {}
 
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (
-    const TAO_FixedSeq_Var_T<T,T_elem> & p
+template<typename T>
+TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (
+    const TAO_FixedSeq_Var_T<T> & p
   )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+  : TAO_Seq_Var_Base_T<T> (p)
 {
 }
 
 // Fixed-size base types only.
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (const T & p)
+TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (const T & p)
 {
   ACE_NEW (this->ptr_,
            T (p));
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (T * p)
+TAO_FixedSeq_Var_T<T> &
+TAO_FixedSeq_Var_T<T>::operator= (T * p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-T_elem &
-TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+typename TAO_FixedSeq_Var_T<T>::T_elem
+TAO_FixedSeq_Var_T<T>::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-// ***************************************************************
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (void)
-{}
-
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+typename TAO_FixedSeq_Var_T<T>::T_const_elem
+TAO_FixedSeq_Var_T<T>::operator[] (CORBA::ULong index) const
+{
+  return this->ptr_->operator[] (index);
+}
 
-template<typename T, typename T_elem>
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (
-    const TAO_VarSeq_Var_T<T,T_elem> & p
-  )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
+// ***************************************************************
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem> &
-TAO_VarSeq_Var_T<T,T_elem>::operator= (T * p)
+TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (void)
 {
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
 }
 
-// Variable-size types only.
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::operator T *& ()
+TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (T * p)
+  : TAO_Seq_Var_Base_T<T> (p)
 {
-  return this->ptr_;
 }
 
-template<typename T, typename T_elem>
-ACE_INLINE
-T_elem &
-TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+template<typename T>
+TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (
+    const TAO_VarSeq_Var_T<T> & p)
+  : TAO_Seq_Var_Base_T<T> (p)
 {
-  return this->ptr_->operator[] (index);
 }
 
-// ***************************************************************
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (void)
-{}
-
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (
-    const TAO_MngSeq_Var_T<T,T_elem> & p
-  )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem> &
-TAO_MngSeq_Var_T<T,T_elem>::operator= (T * p)
+TAO_VarSeq_Var_T<T> &
+TAO_VarSeq_Var_T<T>::operator= (T * p)
 {
   delete this->ptr_;
   this->ptr_ = p;
@@ -225,17 +193,28 @@ TAO_MngSeq_Var_T<T,T_elem>::operator= (T * p)
 }
 
 // Variable-size types only.
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::operator T *& ()
+TAO_VarSeq_Var_T<T>::operator T *& ()
 {
   return this->ptr_;
 }
 
-template<typename T, typename T_elem>
+template<typename T>
 ACE_INLINE
-T_elem
-TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+typename TAO_VarSeq_Var_T<T>::T_elem
+TAO_VarSeq_Var_T<T>::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
+
+template<typename T>
+ACE_INLINE
+typename TAO_VarSeq_Var_T<T>::T_const_elem
+TAO_VarSeq_Var_T<T>::operator[] (CORBA::ULong index) const
+{
+  return this->ptr_->operator[] (index);
+}
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 0529d2d48dd..f39bd28f6ba 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "Sequence.h"
+#include "tao/Sequence.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Sequence.i"
 #endif /* __ACE_INLINE__ */
 
-#include "SystemException.h"
+#include "tao/SystemException.h"
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 # include "ace/Message_Block.h"
@@ -23,6 +23,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Operations for class TAO_Base_Sequence
 // *************************************************************
@@ -1110,3 +1112,5 @@ operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
 {
   return !(lhs == rhs);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index a0e39e1838b..641a2c86f9d 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -25,13 +25,17 @@
 #include "tao/orbconf.h"
 #include "tao/default_environment.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
 }
 
-class ACE_Message_Block;
-
 /**
  * @class TAO_Base_Sequence
  *
@@ -657,6 +661,8 @@ TAO_Export bool operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
 
 // ****************************************************************
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 /**
  * @brief Safe assertions without including Log_Msg.h
  */
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
index 655bf0f4741..1293e10fe7b 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -1,8 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // Operations on the unbounded sequence class.
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Base_Sequence::TAO_Base_Sequence (void)
   : maximum_ (0),
@@ -295,3 +299,5 @@ TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
   return this->mb_;
 }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 2c5d5bea180..2d57569e8fd 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#ifndef TAO_SEQUENCE_T_C
-#define TAO_SEQUENCE_T_C
+#ifndef TAO_SEQUENCE_T_CPP
+#define TAO_SEQUENCE_T_CPP
 
-#include "Sequence_T.h"
-#include "Array_VarOut_T.h"
+#include "tao/Sequence_T.h"
+#include "tao/Array_VarOut_T.h"
 
 #include "ace/OS_Memory.h"
 
@@ -14,9 +14,7 @@
 #endif /* __ACE_INLINE__ */
 
 
-ACE_RCSID (tao,
-           Sequence_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
@@ -137,6 +135,18 @@ TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
   this->release_ = 0;
 }
 
+template<typename T>
+void
+TAO_Unbounded_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
+                                           CORBA::ULong ol)
+{
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i) {
+    tmp[i] = T();
+  }
+}
+
 template <typename T>
 T *
 TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
@@ -321,6 +331,18 @@ TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
   this->release_ = 0;
 }
 
+template<typename T, size_t MAX>
+void
+TAO_Bounded_Sequence<T, MAX>::_shrink_buffer (CORBA::ULong nl,
+                                              CORBA::ULong ol)
+{
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i) {
+    tmp[i] = T();
+  }
+}
+
 template <typename T, size_t MAX>
 T *
 TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
@@ -2134,4 +2156,6 @@ TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
   this->release_ = release;
 }
 
-#endif /* TAO_SEQUENCE_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* tao/TAO_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index c3fe5f797e2..2ee1b14407d 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -1,1222 +1,15 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_T.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan and Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_T_H
-#define TAO_SEQUENCE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Objref_VarOut_T.h"
-
-/**
- * @class TAO_Unbounded_Sequence
- *
- * @brief Parametrized implementation of IDL unbounded sequences.
- *
- * This class completes the implementation for TAO_Base_Sequence
- * for the unbounded case.
- */
-template <typename T>
-class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_Unbounded_Sequence (void);
-
-  /// Constructor using a maximum length value.
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-
-  /**
-   * Constructor using the data and memory management flag.  Memory
-   * *must* be allocated using the ::allocbuf static method, since in
-   * the future this classes may use a global ACE_Allocator.
-   */
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-                          CORBA::ULong length,
-                          T * data,
-                          CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &);
-
-  /// Assignment operator.
-  TAO_Unbounded_Sequence<T> & operator= (const TAO_Unbounded_Sequence<T> &);
-
-  /// Dtor.
-  ~TAO_Unbounded_Sequence (void);
-
-  // = Accessors.
-
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  // = Static operations.
-
-  /// Allocate storage for the sequence.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Free the sequence.
-  static void freebuf (T *);
-
-
-  /// Implement the TAO_Base_Sequence methods (see Sequence.h)
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.  For
-   * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide straings,
-   * and object references, respective) before being directly assigned
-   * to.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Sequence
- *
- * @brief Parametric bounded sequence.
- *
- * This class completes the implementation for TAO_Base_Sequence
- * for the bounded case.
- */
-template <typename T, size_t MAX>
-class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-  /// Default constructor.
-  TAO_Bounded_Sequence (void);
-
-  /// Constructor using the data and memory management flag.
-  TAO_Bounded_Sequence (CORBA::ULong length,
-                        T *data,
-                        CORBA::Boolean release=0);
-
-  /// Copy constructor.
-  TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
-
-  /// Assignment operator.
-  TAO_Bounded_Sequence<T,MAX> & operator= (
-      const TAO_Bounded_Sequence<T,MAX> &
-    );
-
-  /// Dtor.
-  ~TAO_Bounded_Sequence (void);
-
-  // = Accessors.
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  // = Static operations.
-
-  /// Allocate storage for the sequence.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Free the sequence.
-  static void freebuf (T *);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for
-  /// the right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The size of the returned buffer
-   * is equal to the sequence bound, which can be determined with the
-   * <maximum> accessor.  The number of elements in the buffer can be
-   * determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.  For
-   * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide straings,
-   * and object references, respective) before being directly assigned
-   * to.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-template<typename T, typename T_var>
-  class TAO_Unbounded_Object_Sequence;
-template<class T> class TAO_Unbounded_Pseudo_Sequence;
-template<typename T, typename T_var, size_t MAX>
-  class TAO_Bounded_Object_Sequence;
-template<size_t MAX> class TAO_Bounded_String_Sequence;
-
-  /**
-   * @class TAO_Object_Manager
-   *
-   * @brief Manager for Objects.
-   *
-   * The mapping for sequences of objects (and other pseudo objects)
-   * requires an auxiliar class or <Manager> to handle the reference
-   * count on the object, (a kind of smart pointer).
-   * The main difference with respect to T_var classes is that
-   * automatic release is not controlled on a per-item basis, but
-   * for the sequence as a whole.
-   * Further the class must implement "transparent" assignment into
-   * the sequence, for instance, operator[] returns a managed
-   * object, but:
-   * object_sequence[i] = foo;
-   * must change the state of the sequence.
-   * This class implements the generic object manager and is used to
-   * instantiate the proper sequence types.
-   * = NOTES
-   * It has been proposed that the class should be parametric on
-   * both T and T_ptr, IMHO this is no necesary: though the IDL spec
-   * says that T_ptr *could* map to a type different to T* in the
-   * particular case of TAO it does map to <T*>.
-   */
-template<typename T, typename T_var>
-class TAO_Object_Manager
-{
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Object_Manager (const TAO_Object_Manager<T,T_var> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Object_Manager (T **, CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Object_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Object_Manager<T,T_var> & operator= (
-      const TAO_Object_Manager<T,T_var> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Object_Manager<T,T_var> & operator= (T *);
-
-  /// Assignment from T_life.
-  TAO_Object_Manager<T,T_var> & operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var () const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T *& out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-  /**
-   * @class TAO_Pseudo_Object_Manager
-   *
-   * @brief Manager for Pseudo Objects.
-   *
-   */
-template<typename T>
-class TAO_Pseudo_Object_Manager
-{
-  friend class TAO_Unbounded_Pseudo_Sequence<T>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Pseudo_Object_Manager (T **, CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Pseudo_Object_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Pseudo_Object_Manager<T> & operator= (
-      const TAO_Pseudo_Object_Manager<T> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Pseudo_Object_Manager<T> & operator= (T *);
-
-  /// Workaround for MSVC 6.
-  typedef typename T::_var_type T_var_type;
-
-  /// Assignment from T_var.
-  TAO_Pseudo_Object_Manager<T> & operator= (const T_var_type &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T *& out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Object_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Some IDL types require that sequences on them have a "manager"
- * class, in charge of handling the object lifetime, examples are
- * pseudo objects, object references, valuetypes, and strings.
- */
-template<typename T, typename T_var>
-class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
-{
-
-  // = SPEC
-  //   16.8 Mapping for Structured Types
-  //   The mapping for struct, union, and sequence (but not array) is a
-  //   C++ struct or class with a default constructor, a copy
-  //   constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Initialization and termination methods.
-
-  /**
-   * {orbos/97-05-15:16.8}
-   * The default constructor initializes object reference members to
-   * appropriately typed nil object references and string members to
-   * NULL; all other members are initialized via their default
-   * constructors.
-   *
-   * {orbos/97-05-15:16.11}
-   * For both bounded and unbounded sequences, the default constructor
-   * (as shown in the example above) sets the sequence length equal to
-   * 0.
-   */
-  TAO_Unbounded_Object_Sequence (void);
-
-  /**
-   * Unbounded sequences provide a constructor that allows only the
-   * initial value of the maximum length to be set (the ``maximum
-   * constructor'' shown in the example above). This allows
-   * applications to control how much buffer space is initially
-   * allocated by the sequence. This constructor also sets the length
-   * to 0 and the release flag to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence (CORBA::ULong max);
-
-  /**
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T ** data,
-                                 CORBA::Boolean release = 0);
-
-  /**
-   * The copy constructor performs a deep copy from the existing
-   * structure to create a new structure, including calling _duplicate
-   * on all object  reference members and performing the necessary
-   * heap allocations for all string members.
-   *
-   * The copy constructor creates a new sequence with the same maximum
-   * and length as the given sequence, copies each of its current
-   * elements (items zero through length-1), and sets the release
-   * flag to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence (
-      const TAO_Unbounded_Object_Sequence<T,T_var> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Object_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   *
-   * The assignment operator deepcopies its parameter, releasing old
-   * storage if necessary. It behaves as if the original sequence is
-   * destroyed via its destructor and then the source sequence copied
-   * using the copy constructor. If release=TRUE, the destructor
-   * destroys each of the current elements (items zero through
-   * length--1).  For an unbounded sequence, if a reallocation is
-   * necessary due to a change in the length and the sequence was
-   * created using the release=TRUE parameter in its constructor, the
-   * sequence will deallocate the old storage. If release is FALSE
-   * under these circumstances, old storage will not be freed before
-   * the reallocation is performed. After reallocation, the release
-   * flag is always set to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence<T,T_var> &operator= (
-      const TAO_Unbounded_Object_Sequence <T,T_var> &
-    );
-
-  /// read-write accessor
-  TAO_Object_Manager<T,T_var> operator[] (
-      CORBA::ULong slot
-    ) const;
-
-  /**
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static T ** allocbuf (CORBA::ULong);
-
-  /**
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using string_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Object_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, size_t MAX>
-class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /**
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_Object_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                               T ** value,
-                               CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Object_Sequence (
-      const TAO_Bounded_Object_Sequence<T,T_var,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Object_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Object_Sequence<T,T_var,MAX> &operator= (
-      const TAO_Bounded_Object_Sequence<T,T_var,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Object_Manager<T,T_var> operator[] (
-      CORBA::ULong slot
-    ) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Pseudo_Sequence
- *
- * @brief Parametric sequence for pseudo objects.
- *
- * Some IDL types (including pseudo objects) require that
- * sequences on them have a "manager" class, in charge of handling
- * the object lifetime.
- * This parametric class implements those sequences. In general
- * the sequence is similar to Object_Sequente, except for some
- * TAO internal details. The complete documentation of each method
- * is provided in TAO_Unbounded_Object_Sequece
- */
-template<typename T>
-class TAO_Unbounded_Pseudo_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor
-  TAO_Unbounded_Pseudo_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T ** data,
-                                 CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Pseudo_Sequence (
-      const TAO_Unbounded_Pseudo_Sequence<T> &
-    );
-
-  /// dtor releases all the contained elements.
-  ~TAO_Unbounded_Pseudo_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Pseudo_Sequence<T> & operator= (
-      const TAO_Unbounded_Pseudo_Sequence <T> &
-    );
-
-  /// read-write accessor
-  TAO_Pseudo_Object_Manager<T> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Pseudo_Sequence
- *
- * @brief Bounded version of TAO_Unbounded_Pseudo_Sequence.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, size_t MAX>
-class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor.
-  TAO_Bounded_Pseudo_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                               T ** value,
-                               CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Pseudo_Sequence (
-      const TAO_Bounded_Pseudo_Sequence<T,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Pseudo_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Pseudo_Sequence & operator= (
-      const TAO_Bounded_Pseudo_Sequence<T,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Pseudo_Object_Manager<T> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Array_Sequence
- *
- * @brief Parametric sequence for arrays.
- *
- * The IDL mapping for arrays includes some unique allocation,
- * deallocation, and copying functions, and precludes
- * direct assignment of one array to another. Also, the
- * Any and CDR operators use a special class derived from
- * the array. For these reasons, we use a special class for
- * sequences of arrays.
- */
-template <typename T, typename T_slice, typename TAG>
-class TAO_Unbounded_Array_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor
-  TAO_Unbounded_Array_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Array_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
-                                CORBA::ULong length,
-                                T * data,
-                                CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Array_Sequence (
-      const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> &
-    );
-
-  /// dtor releases all the contained elements.
-  ~TAO_Unbounded_Array_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & operator= (
-      const TAO_Unbounded_Array_Sequence <T,T_slice,TAG> &
-    );
-
-  // = Accessors.
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T *);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for the
-  /// right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Array_Sequence
- *
- * @brief Bounded version of TAO_Unbounded_Array_Sequence.
- *
- * Please see the documentation for the unbounded case.
- */
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-class TAO_Bounded_Array_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor.
-  TAO_Bounded_Array_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Array_Sequence (CORBA::ULong length,
-                              T *value,
-                              CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Array_Sequence (
-      const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Array_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Array_Sequence &operator= (
-      const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
-    );
-
-  // = Accessors.
-  /// operator []
-  T &operator[] (CORBA::ULong);
-
-  /// operator []
-  const T &operator[] (CORBA::ULong) const;
-
-  /// Allocate storage for a sequence..
-  static T * allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T * buffer);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for the
-  /// right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_String_Sequence
- *
- * @brief Bounded sequence of strings.
- *
- * As its unbounded counterpart it duplicates and releases strings
- * (via CORBA::string_dup and CORBA::string_free) under the
- * control of a per sequence flag, but the capacity of the
- * sequence is bound on the type.
- */
-template<size_t MAX>
-class TAO_Bounded_String_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  /**
-   * {SPEC}
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded  sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_String_Sequence (void);
-
-  /**
-   * {SPEC}
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   *
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence  allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Bounded_String_Sequence (CORBA::ULong length,
-                               char ** value,
-                               CORBA::Boolean release = 0);
-
-  /**
-   * {SPEC}
-   * Management Functions'' on page 16. The copy constructor creates a
-   * new sequence with the same maximum and length as the given
-   * sequence, copies each of its current elements (items zero through
-   * length--1), and sets the release flag to TRUE.
-   */
-  TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &);
-
-  /**
-   * {SPEC}
-   * The assignment operator deep copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor.
-   */
-  TAO_Bounded_String_Sequence & operator= (
-      const TAO_Bounded_String_Sequence<MAX> &
-    );
-
-  /**
-   * {SPEC}
-   * If release=TRUE, the destructor destroys each of the current
-   * elements (items zero through length-1).
-   */
-  ~TAO_Bounded_String_Sequence (void);
-
-  /// read-write accessor
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * {SPEC}
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static char ** allocbuf (CORBA::ULong length);
-
-  /**
-   * {SPEC}
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using string_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (char ** buffer);
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong length,
-                char ** value,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_WString_Sequence
- *
- * @brief Bounded sequence of wstrings.
- *
- * As its unbounded counterpart it duplicates and releases strings
- * (via CORBA::wstring_dup and CORBA::wstring_free) under the
- * control of a per sequence flag, but the capacity of the
- * sequence is bound on the type.
- */
-template<size_t MAX>
-class TAO_Bounded_WString_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  /**
-   * {SPEC}
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded  sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_WString_Sequence (void);
-
-  /**
-   * {SPEC}
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   *
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence  allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Bounded_WString_Sequence (CORBA::ULong length,
-                                CORBA::WChar ** value,
-                                CORBA::Boolean release = 0);
-
-  /**
-   * {SPEC}
-   * Management Functions'' on page 16. The copy constructor creates a
-   * new sequence with the same maximum and length as the given
-   * sequence, copies each of its current elements (items zero through
-   * length--1), and sets the release flag to TRUE.
-   */
-  TAO_Bounded_WString_Sequence (const TAO_Bounded_WString_Sequence<MAX> &);
-
-  /**
-   * {SPEC}
-   * The assignment operator deep copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor.
-   */
-  TAO_Bounded_WString_Sequence &operator= (
-      const TAO_Bounded_WString_Sequence<MAX> &
-    );
-
-  /**
-   * {SPEC}
-   * If release=TRUE, the destructor destroys each of the current
-   * elements (items zero through length-1).
-   */
-  ~TAO_Bounded_WString_Sequence (void);
-
-  /// read-write accessor
-  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * {SPEC}
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for (w)strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static CORBA::WChar ** allocbuf (CORBA::ULong length);
-
-  /**
-   * {SPEC}
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using wstring_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (CORBA::WChar ** buffer);
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong length,
-                CORBA::WChar ** value,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_T_H */
+// $Id$
+
+#include "tao/Unbounded_Octet_Sequence_T.h"
+#include "tao/Unbounded_Value_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
+#include "tao/Unbounded_String_Sequence_T.h"
+#include "tao/Unbounded_Object_Reference_Sequence_T.h"
+#include "tao/Unbounded_Sequence_CDR_T.h"
+#include "tao/Unbounded_Array_Sequence_T.h"
+#include "tao/Bounded_Value_Sequence_T.h"
+#include "tao/Bounded_Wstring_Sequence_T.h"
+#include "tao/Bounded_String_Sequence_T.h"
+#include "tao/Bounded_Object_Reference_Sequence_T.h"
+#include "tao/Bounded_Sequence_CDR_T.h"
+#include "tao/Bounded_Array_Sequence_T.h"
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index c1ecd508680..960c9ae687a 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -1,6 +1,9 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ***************************************************
 // Operations on the generic unbounded sequence class.
 // ***************************************************
@@ -600,3 +603,5 @@ TAO_Bounded_WString_Sequence (CORBA::ULong length,
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
index d92d818b480..7afe711cb85 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -1,14 +1,15 @@
-#include "ServerRequestInterceptor_Adapter.h"
+#include "tao/ServerRequestInterceptor_Adapter.h"
 
 ACE_RCSID (tao,
            ServerRequestInterceptorAdapter,
            "$Id$")
 
-namespace TAO
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
 {
-  ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
-  {
-  }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 791ec6ca2f5..37907fa1465 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,12 @@
 #include "ace/CORBA_macros.h"
 #include "tao/SystemException.h"
 
+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
+# include "tao/OctetSeqC.h"
+#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace PortableInterceptor
 {
   class ServerRequestInterceptor;
@@ -35,6 +41,11 @@ namespace PortableInterceptor
   typedef CORBA::Short ReplyStatus;
 }
 
+namespace CORBA
+{
+  class PolicyList;
+}
+
 class TAO_ServerRequest;
 
 namespace TAO
@@ -141,6 +152,12 @@ namespace TAO
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
       ACE_ENV_ARG_DECL) = 0;
 
+    /// Register an interceptor with policies.
+    virtual void add_interceptor (
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
+      const CORBA::PolicyList& policies
+      ACE_ENV_ARG_DECL) = 0;
+
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
@@ -158,9 +175,11 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Upcall_Command &command
         ACE_ENV_ARG_DECL) = 0;
-};
-
+  };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SERVER_REQUEST_INTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index 3064718ded8..3408f8b97aa 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -1,10 +1,14 @@
-#include "ServerRequestInterceptor_Adapter_Factory.h"
+#include "tao/ServerRequestInterceptor_Adapter_Factory.h"
 
 ACE_RCSID (tao,
            ServerRequestInterceptorAdapterFactory,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
index 592844d1405..e97987173d6 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,9 @@
 
 #include "tao/SystemException.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class ServerRequestInterceptor_Adapter;
@@ -42,6 +45,8 @@ public:
   virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SERVERREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 504b67b6224..7b8c1f300c4 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -7,6 +7,9 @@ ACE_RCSID (tao,
            Server_Strategy_Factory, 
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
   : active_object_map_creation_parameters_ ()
 {
@@ -71,3 +74,5 @@ TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Objec
     use_active_hint_in_poa_names_ (1)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 644dcf1f6d6..2e5fdc2800a 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "Basic_Types.h"
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
@@ -128,6 +130,8 @@ protected:
   Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index f4b6f228d3a..0e9b89c9ff1 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,13 +1,16 @@
-#include "Service_Callbacks.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-#include "Environment.h"
-#include "Invocation_Utils.h"
+#include "tao/Service_Callbacks.h"
+#include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Invocation_Utils.h"
 
 ACE_RCSID (tao,
            Service_Callbacks,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
 {
 }
@@ -16,14 +19,14 @@ CORBA::Boolean
 TAO_Service_Callbacks::select_profile (TAO_MProfile * /*mprofile*/,
                                        TAO_Profile *& /*pfile*/)
 {
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
 TAO_Service_Callbacks::reselect_profile (TAO_Stub * /*stub*/,
                                          TAO_Profile *& /*pfile*/)
 {
-  return 0;
+  return false;
 }
 
 
@@ -32,7 +35,7 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
 {
   // We shouldn't be here at all. But in case if we are here,
   // something is wrong. So, we send a true for a is_nil () call
-  return 1;
+  return true;
 }
 
 void
@@ -56,6 +59,13 @@ TAO_Service_Callbacks::hash_ft (TAO_Profile *,
   return 0;
 }
 
+CORBA::Boolean
+TAO_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr,
+                                                       const TAO_Service_Context &) const
+{
+  return false;
+}
+
 TAO::Invocation_Status
 TAO_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &,
@@ -83,3 +93,5 @@ TAO_Service_Callbacks::raise_transient_failure (
       CORBA::COMPLETED_MAYBE),
       TAO::TAO_INVOKE_FAILURE);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 8e68c9e15c1..bf317492e76 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Service_Callbacks.h
@@ -8,7 +10,6 @@
  * of the default functionalities that the ORB provides by the
  * services if they have been loaded in to the ORB_Core
  *
- *
  *  @author Bala Natarajan <bala@cs.wustl.edu>
  */
 //=============================================================================
@@ -26,6 +27,10 @@
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 #include "tao/Invocation_Utils.h"
+#include "tao/Object.h"
+#include "tao/Service_Context.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Profile;
 class TAO_MProfile;
@@ -58,14 +63,14 @@ class TAO_Export TAO_Service_Callbacks
 {
 
 public:
-  
+
   enum Profile_Equivalence
   {
     EQUIVALENT,
     NOT_EQUIVALENT,
     DONT_KNOW
   };
-    
+
 
   /// Dtor
   virtual ~TAO_Service_Callbacks (void);
@@ -95,6 +100,12 @@ public:
   virtual CORBA::ULong hash_ft (TAO_Profile *p,
                                 CORBA::ULong m);
 
+  // Verify if condition is given for LOCATION_FORWARD_PERM reply
+  virtual CORBA::Boolean is_permanent_forward_condition (const CORBA::Object_ptr obj,
+                                                           const TAO_Service_Context &service_context) const;
+
+
+
   /// Allow the service layer to decide whether the COMM_FAILURE
   /// exception should be thrown or a reinvocation is needed
   virtual TAO::Invocation_Status raise_comm_failure (
@@ -110,6 +121,8 @@ public:
       ACE_ENV_ARG_DECL);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_SERVICE_CALLBACK_H*/
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index b2708c3f4ce..78cc30595b6 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "tao/Service_Context.h"
 #include "tao/CDR.h"
@@ -15,6 +13,9 @@ ACE_RCSID (tao,
            Service_Context,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Service_Context::set_context_i (IOP::ServiceId id,
                                     TAO_OutputCDR &cdr)
@@ -23,7 +24,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id,
   context.context_id = id;
 
   // Make a *copy* of the CDR stream...
-  size_t length = cdr.total_length ();
+  size_t const length = cdr.total_length ();
   context.context_data.length (static_cast<CORBA::ULong> (length));
   CORBA::Octet *buf = context.context_data.get_buffer ();
 
@@ -43,7 +44,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context,
                                     TAO_OutputCDR &cdr)
 {
   // Make a *copy* of the CDR stream...
-  size_t length = cdr.total_length ();
+  size_t const length = cdr.total_length ();
   context.context_data.length (static_cast<CORBA::ULong> (length));
   CORBA::Octet *buf = context.context_data.get_buffer ();
 
@@ -116,9 +117,9 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext& context)
     {
       if (context.context_id == this->service_context_[i].context_id)
         {
-          CORBA::ULong max = context.context_data.maximum ();
-          CORBA::ULong len = context.context_data.length ();
-          CORBA::Octet* buf = context.context_data.get_buffer (1);
+          CORBA::ULong const max = context.context_data.maximum ();
+          CORBA::ULong const len = context.context_data.length ();
+          CORBA::Octet * const buf = context.context_data.get_buffer (1);
           this->service_context_[i].context_data.replace (max, len, buf, 1);
           return;
         }
@@ -132,12 +133,12 @@ TAO_Service_Context::add_context_i (IOP::ServiceContext& context)
 {
   // @@ TODO Some contexts can show up multiple times, others
   //    can't find out and take appropiate action.
-  CORBA::ULong l = this->service_context_.length ();
+  CORBA::ULong const l = this->service_context_.length ();
   this->service_context_.length (l + 1);
   this->service_context_[l].context_id = context.context_id;
-  CORBA::ULong max = context.context_data.maximum ();
-  CORBA::ULong len = context.context_data.length ();
-  CORBA::Octet* buf = context.context_data.get_buffer (1);
+  CORBA::ULong const max = context.context_data.maximum ();
+  CORBA::ULong const len = context.context_data.length ();
+  CORBA::Octet* const buf = context.context_data.get_buffer (1);
   this->service_context_[l].context_data.replace (max, len, buf, 1);
 }
 
@@ -146,7 +147,7 @@ TAO_Service_Context::add_context_i (const IOP::ServiceContext& context)
 {
   // @@ TODO Some contexts can show up multiple times, others
   //    can't find out and take appropiate action.
-  CORBA::ULong l = this->service_context_.length ();
+  CORBA::ULong const l = this->service_context_.length ();
   this->service_context_.length (l + 1);
   this->service_context_[l] = context;
 }
@@ -186,7 +187,7 @@ int
 TAO_Service_Context::get_context (IOP::ServiceId id,
                                   IOP::ServiceContext_out context)
 {
-  CORBA::ULong len = this->service_context_.length ();
+  CORBA::ULong const len = this->service_context_.length ();
 
   for (CORBA::ULong i = 0; i < len; ++i)
     {
@@ -219,3 +220,5 @@ TAO_Service_Context::decode (TAO_InputCDR& cdr)
 
   return 1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index 348bec7c061..dcf9cebbc4c 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -1,4 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
 
 // ===================================================================
@@ -8,7 +7,6 @@
  *  $Id$
  *
  *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *
  */
 // ===================================================================
 
@@ -23,6 +21,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+  namespace CSD
+  {
+    class FW_Server_Request_Wrapper;
+  }
+}
+
 /**
  * @class TAO_Service_Context
  *
@@ -52,6 +60,11 @@
 class TAO_Export TAO_Service_Context
 {
 public:
+  /// Declare FW_Server_Request_Wrapper a friend
+  /// This friendship makes the FW_Server_Request_Wrapper be able to 
+  /// clone the TAO_Service_Context data member in TAO_ServerRequest.
+  friend class TAO::CSD::FW_Server_Request_Wrapper;
+
   /// Constructor
   TAO_Service_Context (void);
 
@@ -137,6 +150,8 @@ private:
   IOP::ServiceContextList service_context_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Service_Context.inl"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index d7540db80b7..1facf7680a7 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Service_Context::TAO_Service_Context (void)
   : service_context_ ()
@@ -37,7 +39,6 @@ TAO_Service_Context::set_context (IOP::ServiceContext &context,
                        cdr);
 }
 
-
 ACE_INLINE int
 TAO_Service_Context::is_service_id (IOP::ServiceId id)
 {
@@ -52,3 +53,5 @@ TAO_Service_Context::is_service_id (IOP::ServiceId id)
     }
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 765d9c8e576..4fad6bd654b 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -29,20 +29,22 @@
 // be\be_codegen.cpp:288
 
 
-#include "ServicesC.h"
+#include "tao/ServicesC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_SERVICEOPTIONSEQ_CS_)
@@ -54,7 +56,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (void)
 CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceOption
       >
     (max)
@@ -66,7 +68,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceOption
       >
     (max, length, buffer, release)
@@ -75,7 +77,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
 CORBA::ServiceOptionSeq::ServiceOptionSeq (
     const ServiceOptionSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceOption
       >
     (seq)
@@ -95,10 +97,10 @@ void CORBA::ServiceOptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ServiceDetail::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -108,7 +110,7 @@ CORBA::ServiceDetail::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_SERVICEDETAILSEQ_CS_)
@@ -120,7 +122,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (void)
 CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceDetail
       >
     (max)
@@ -132,7 +134,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ServiceDetail * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceDetail
       >
     (max, length, buffer, release)
@@ -141,7 +143,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
 CORBA::ServiceDetailSeq::ServiceDetailSeq (
     const ServiceDetailSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         ServiceDetail
       >
     (seq)
@@ -161,10 +163,10 @@ void CORBA::ServiceDetailSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ServiceInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -185,15 +187,7 @@ CORBA::Boolean operator<< (
     const CORBA::ServiceOptionSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -201,33 +195,7 @@ CORBA::Boolean operator>> (
     CORBA::ServiceOptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ */
@@ -266,22 +234,7 @@ CORBA::Boolean operator<< (
     const CORBA::ServiceDetailSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -289,40 +242,7 @@ CORBA::Boolean operator>> (
     CORBA::ServiceDetailSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_ */
@@ -349,3 +269,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.service_options) &&
     (strm >> _tao_aggregate.service_details);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 5e24beb739a..d137d8282ab 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -63,60 +63,59 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::UShort ServiceType;
   typedef CORBA::UShort_out ServiceType_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef OctetSeq ServiceDetailData;
   typedef OctetSeq_var ServiceDetailData_var;
   typedef OctetSeq_out ServiceDetailData_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEOPTIONSEQ_CH_)
 #define _CORBA_SERVICEOPTIONSEQ_CH_
-  
+
   class ServiceOptionSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        ServiceOptionSeq,
-        ServiceOption
+        ServiceOptionSeq
       >
     ServiceOptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ServiceOptionSeq,
-        ServiceOptionSeq_var,
-        ServiceOption
+        ServiceOptionSeq
       >
     ServiceOptionSeq_out;
-  
+
   class TAO_Export ServiceOptionSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ServiceOption
           >
   {
@@ -126,80 +125,77 @@ namespace CORBA
     ServiceOptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::ULong* buffer,
+        CORBA::Boolean release = false
       );
     ServiceOptionSeq (const ServiceOptionSeq &);
     ~ServiceOptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ServiceOptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::ServiceType Security = 1U;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ServiceDetail;
-  
+
   typedef
     TAO_Var_Var_T<
         ServiceDetail
       >
     ServiceDetail_var;
-  
+
   typedef
     TAO_Out_T<
         ServiceDetail,
         ServiceDetail_var
       >
     ServiceDetail_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export ServiceDetail
   {
     typedef ServiceDetail_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::ServiceDetailType service_detail_type;
     CORBA::ServiceDetailData service_detail;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEDETAILSEQ_CH_)
 #define _CORBA_SERVICEDETAILSEQ_CH_
-  
+
   class ServiceDetailSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
-        ServiceDetailSeq,
-        ServiceDetail
+        ServiceDetailSeq
       >
     ServiceDetailSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ServiceDetailSeq,
-        ServiceDetailSeq_var,
-        ServiceDetail
+        ServiceDetailSeq
       >
     ServiceDetailSeq_out;
-  
+
   class TAO_Export ServiceDetailSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             ServiceDetail
           >
   {
@@ -209,44 +205,44 @@ namespace CORBA
     ServiceDetailSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServiceDetail* buffer, 
-        CORBA::Boolean release = 0
+        ServiceDetail* buffer,
+        CORBA::Boolean release = false
       );
     ServiceDetailSeq (const ServiceDetailSeq &);
     ~ServiceDetailSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ServiceDetailSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ServiceInformation;
-  
+
   typedef
     TAO_Var_Var_T<
         ServiceInformation
       >
     ServiceInformation_var;
-  
+
   typedef
     TAO_Out_T<
         ServiceInformation,
         ServiceInformation_var
       >
     ServiceInformation_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export ServiceInformation
   {
     typedef ServiceInformation_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::ServiceOptionSeq service_options;
     CORBA::ServiceDetailSeq service_details;
@@ -314,6 +310,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp
index bd5689dc202..22944bd9430 100644
--- a/TAO/tao/Services_Activate.cpp
+++ b/TAO/tao/Services_Activate.cpp
@@ -1,12 +1,13 @@
 #include "tao/Services_Activate.h"
-#include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
            Services_Activate,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Services_Activate::~TAO_Services_Activate (void)
 {
-  //no-op
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index 582d6d3b94a..d1e1905d8f6 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Services_Activate.h
@@ -7,7 +9,6 @@
  * This is a generic interface that would be used to activate
  * the services that are loaded through the svc.conf file
  *
- *
  *  @author Bala Natarajan <bala@cs.wustl.edu>
  */
 //=============================================================================
@@ -24,6 +25,8 @@
 
 #include "tao/SystemException.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Service_Callbacks;
 
@@ -54,6 +57,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_SERVICES_ACTIVATE_H*/
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index 5b4df566b26..61dd1f3fb77 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "ShortSeqC.h"
+#include "tao/ShortSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_SHORTSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::ShortSeq::ShortSeq (void)
 CORBA::ShortSeq::ShortSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Short
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::ShortSeq::ShortSeq (
     CORBA::Short * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Short
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::ShortSeq::ShortSeq (
 CORBA::ShortSeq::ShortSeq (
     const ShortSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::Short
       >
     (seq)
@@ -105,15 +107,7 @@ CORBA::Boolean operator<< (
     const CORBA::ShortSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_short_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ CORBA::Boolean operator>> (
     CORBA::ShortSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_short_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index 79b6809bd5a..1df136c852c 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SHORTSEQ_CH_)
 #define _CORBA_SHORTSEQ_CH_
-  
+
   class ShortSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        ShortSeq,
-        CORBA::Short
+        ShortSeq
       >
     ShortSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ShortSeq,
-        ShortSeq_var,
-        CORBA::Short
+        ShortSeq
       >
     ShortSeq_out;
-  
+
   class TAO_Export ShortSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::Short
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     ShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Short* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Short* buffer,
+        CORBA::Boolean release = false
       );
     ShortSeq (const ShortSeq &);
     ~ShortSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ShortSeq_var _var_type;
   };
 
@@ -136,6 +135,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index 91e62e5cafc..10707265d59 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Smart_Proxies.h"
+#include "tao/SmartProxies/Smart_Proxies.h"
 
 ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "Smart_Proxies.inl"
+#include "tao/SmartProxies/Smart_Proxies.inl"
 #endif /* defined INLINE */
 
 // Add this line to please the AIX linker, otherwise it complains
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index f8810fc8d40..204702f7ec9 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -1,5 +1,4 @@
-// $Id$
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,7 +17,7 @@
 #define TAO_SMARTPROXIES_H
 #include /**/ "ace/pre.h"
 
-#include "smartproxies_export.h"
+#include "tao/SmartProxies/smartproxies_export.h"
 #include "tao/Object.h"
 #include "tao/TAO_Singleton.h"
 #include "tao/LocalObject.h"
@@ -27,6 +26,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Smart_Proxy_Base
  *
@@ -34,10 +35,9 @@
  *
  * Contains the _var pointer to the real proxy.
  */
-class TAO_SmartProxies_Export TAO_Smart_Proxy_Base :
-  public TAO_Local_RefCounted_Object
+class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
+  : public TAO_Local_RefCounted_Object
 {
-
 public:
   /// Destructor
   virtual ~TAO_Smart_Proxy_Base (void);
@@ -53,8 +53,10 @@ protected:
   CORBA::Object_var base_proxy_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "Smart_Proxies.inl"
+#include "tao/SmartProxies/Smart_Proxies.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
index b75c0a5d096..232cacd0f34 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void)
 {
@@ -16,3 +19,5 @@ ACE_INLINE
 TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index ee973ea75ec..771abdf72d6 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
-#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_C
-#define TAO_SPECIAL_BASIC_ARGUMENT_T_C
+#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
+#define TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
 
 #include "tao/Special_Basic_Argument_T.h"
+#include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Special_Basic_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Special_Basic_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
@@ -109,5 +108,7 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_valu
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_CPP */
 
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index e113596d8a3..b3f1df89e3a 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -23,6 +23,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -148,6 +150,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Special_Basic_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 850c2209cbb..cf8b7b4e57e 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T (
@@ -85,3 +87,4 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void)
   return this->x_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h
index 49e8e16e9e6..ff938db4b58 100644
--- a/TAO/tao/Special_Basic_Arguments.h
+++ b/TAO/tao/Special_Basic_Arguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -23,7 +24,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Special_Basic_Argument_T.h"
-#include "Arg_Traits_T.h"
+#include "tao/Arg_Traits_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -70,6 +73,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/"ace/post.h"
 
 #endif /* TAO_SPECIAL_BASIC_ARGUMENTS_H */
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 2f0f709b8f9..256a3ba9f49 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,6 +1,7 @@
 //$Id$
 
-project : taolib, core, acereactorlib_for_tao, acesocketslib_for_tao, acememorylib_for_tao, core_anytypecode {
+project : taolib, core, core_anytypecode {
+  avoids      += ace_for_tao    // Requires Unix domain sockets and MEM stuff
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 771ed508113..5eddfd095cc 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -1,11 +1,11 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "DIOP_Acceptor.h"
+#include "tao/Strategies/DIOP_Acceptor.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "DIOP_Profile.h"
+#include "tao/Strategies/DIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
@@ -17,7 +17,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
+#include "tao/Strategies/DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_netdb.h"
@@ -26,6 +26,8 @@ ACE_RCSID (Strategies,
            DIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
     addrs_ (0),
@@ -613,7 +615,8 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major, minor;
+  CORBA::Octet major;
+  CORBA::Octet minor = CORBA::Octet();
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -747,4 +750,6 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index 4ff200dc543..3c26ee92350 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,18 +20,20 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
 #include "tao/Transport_Acceptor.h"
-#include "DIOP_Connection_Handler.h"
+#include "tao/Strategies/DIOP_Connection_Handler.h"
 #include "tao/Acceptor_Impl.h"
 
 #include "tao/GIOP_Message_Version.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO DIOP_Acceptor concrete call defination
 
 /**
@@ -176,8 +178,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
+#include "tao/Strategies/DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.i b/TAO/tao/Strategies/DIOP_Acceptor.i
index 9aaf71a3d41..2603d4e7156 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.i
+++ b/TAO/tao/Strategies/DIOP_Acceptor.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_DIOP_Acceptor::address (void) const
 {
@@ -21,3 +24,5 @@ TAO_DIOP_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 73c80795b50..0048e52484c 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "DIOP_Connection_Handler.h"
+#include "tao/Strategies/DIOP_Connection_Handler.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -16,14 +16,17 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Resume_Handle.h"
 
-#include "DIOP_Transport.h"
-#include "DIOP_Endpoint.h"
+#include "tao/Strategies/DIOP_Transport.h"
+#include "tao/Strategies/DIOP_Endpoint.h"
 
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(tao, DIOP_Connect, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -165,7 +168,7 @@ TAO_DIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -298,4 +301,6 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 933a1f4254d..f2b4218bad5 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -17,21 +17,21 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "ace/Reactor.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Acceptor.h"
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
-#include "DIOP_Transport.h"
+#include "tao/Strategies/DIOP_Transport.h"
 #include "ace/SOCK_Dgram.h"
-#include "strategies_export.h"
+#include "ace/Reactor.h"
+#include "ace/Acceptor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -46,11 +46,9 @@ class TAO_Pluggable_Messaging;
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
-class TAO_Strategies_Export TAO_DIOP_Connection_Handler :
-  public TAO_DIOP_SVC_HANDLER,
-  public TAO_Connection_Handler
+class TAO_Strategies_Export TAO_DIOP_Connection_Handler
+  : public TAO_DIOP_SVC_HANDLER
+  , public TAO_Connection_Handler
 {
 
 public:
@@ -160,6 +158,8 @@ private:
   int dscp_codepoint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 671bac804cb..a2aecebc2b4 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -1,7 +1,7 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "DIOP_Connector.h"
+#include "tao/Strategies/DIOP_Connector.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -15,13 +15,16 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-#include "DIOP_Profile.h"
+#include "tao/Strategies/DIOP_Profile.h"
 
 
 ACE_RCSID (Strategies,
            DIOP_Connector,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_DIOP_PROFILE),
     lite_flag_ (flag)
@@ -232,11 +235,11 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 
 int
 TAO_DIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
+  TAO_Connection_Handler * /* svc_handler */)
 {
-  ACE_UNUSED_ARG(svc_handler);
-
-  // Noop
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 5cec9dbd0c8..e8719677bf6 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,14 +19,16 @@
 
 #include "tao/orbconf.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
+#include "tao/Strategies/DIOP_Connection_Handler.h"
 #include "tao/Transport_Connector.h"
-#include "DIOP_Connection_Handler.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Endpoint;
 class TAO_DIOP_Endpoint;
@@ -113,6 +115,8 @@ private:
                                      ACE_Null_Mutex > SvcHandlerIterator;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index f10fb9c0f7e..43657b6d783 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -2,11 +2,11 @@
 // $Id$
 
 
-#include "DIOP_Endpoint.h"
+#include "tao/Strategies/DIOP_Endpoint.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "DIOP_Connection_Handler.h"
+#include "tao/Strategies/DIOP_Connection_Handler.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
@@ -20,11 +20,13 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
+# include "tao/Strategies/DIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_netdb.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
 
@@ -243,4 +245,7 @@ TAO_DIOP_Endpoint::object_addr (void) const
     }
   return this->object_addr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index 01a932546b7..a541a954488 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,20 +16,21 @@
 #ifndef TAO_DIOP_ENDPOINT_H
 #define TAO_DIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
-#include "tao/Endpoint.h"
-
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
 
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Endpoint.h"
 #include "tao/CORBA_String.h"
 #include "ace/INET_Addr.h"
-#include "strategies_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_DIOP_Connection_Handler;
 
@@ -138,8 +138,10 @@ private:
   TAO_DIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
+# include "tao/Strategies/DIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i
index 3bd443220b5..03c7835ffbe 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.i
+++ b/TAO/tao/Strategies/DIOP_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_DIOP_Endpoint::host (void) const
 {
@@ -18,3 +21,5 @@ TAO_DIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index ef5755dde44..8c23791d31f 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "DIOP_Factory.h"
+#include "tao/Strategies/DIOP_Factory.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "DIOP_Acceptor.h"
-#include "DIOP_Connector.h"
+#include "tao/Strategies/DIOP_Acceptor.h"
+#include "tao/Strategies/DIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -15,7 +15,9 @@ ACE_RCSID (Strategies,
            DIOP_Factory,
            "$Id$")
 
-static const char prefix_[] = "diop";
+static const char the_prefix[] = "diop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
@@ -32,13 +34,13 @@ int
 TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0);
 }
 
 const char *
 TAO_DIOP_Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 char
@@ -92,6 +94,8 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory,
                        ACE_TEXT ("DIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index 5b0313bef84..011900bb655 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -18,21 +18,23 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Protocol_Factory.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Protocol_Factory.h"
 #include "ace/Service_Config.h"
-#include "strategies_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_DIOP_Protocol_Factory
+  : public TAO_Protocol_Factory
 {
 public:
   /// Constructor.
@@ -73,6 +75,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index af1c9aabad4..19c9432b3a0 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -1,7 +1,6 @@
-// This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
-#include "DIOP_Profile.h"
+
+#include "tao/Strategies/DIOP_Profile.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -20,7 +19,9 @@ ACE_RCSID (Strategies,
            DIOP_Profile,
            "$Id$")
 
-static const char prefix_[] = "diop";
+static const char the_prefix[] = "diop";
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
 
@@ -296,7 +297,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   size_t buflen = (8 /* "corbaloc" */ +
                    1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
+                   ACE_OS::strlen (::the_prefix) +
                    1 /* colon separator */ +
                    1 /* major version */ +
                    1 /* decimal point */ +
@@ -314,7 +315,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
+                   ::the_prefix,
                    digits [this->version_.major],
                    digits [this->version_.minor],
                    this->endpoint_.host (),
@@ -328,7 +329,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_DIOP_Profile::prefix (void)
 {
-  return ::prefix_;
+  return ::the_prefix;
 }
 
 void
@@ -472,4 +473,6 @@ TAO_DIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index e51bb10e95f..f2c670042dd 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,14 +21,16 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Profile.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "DIOP_Endpoint.h"
 
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/DIOP_Endpoint.h"
+#include "tao/Profile.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO DIOP_Profile concrete Profile definitions
 /**
@@ -122,6 +123,8 @@ protected:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index a3a11e887bc..58c02996213 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -1,13 +1,12 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "DIOP_Transport.h"
+#include "tao/Strategies/DIOP_Transport.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "DIOP_Connection_Handler.h"
-#include "DIOP_Acceptor.h"
-#include "DIOP_Profile.h"
+#include "tao/Strategies/DIOP_Connection_Handler.h"
+#include "tao/Strategies/DIOP_Acceptor.h"
+#include "tao/Strategies/DIOP_Profile.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/operation_details.h"
 #include "tao/Timeprobe.h"
@@ -23,6 +22,8 @@
 
 ACE_RCSID (tao, DIOP_Transport, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
@@ -51,6 +52,7 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
       // Use the normal GIOP object
       ACE_NEW (this->messaging_object_,
                TAO_GIOP_Message_Base (orb_core,
+                                      this,
                                       ACE_MAX_DGRAM_SIZE));
     }
 
@@ -166,7 +168,7 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 
   // The buffer on the stack which will be used to hold the input
   // messages
-  char buf [ACE_MAX_DGRAM_SIZE];
+  char buf [ACE_MAX_DGRAM_SIZE + ACE_CDR::MAX_ALIGNMENT];
 
 #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
   (void) ACE_OS::memset (buf,
@@ -211,21 +213,33 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
   // Set the write pointer in the stack buffer
   message_block.wr_ptr (n);
 
+  // Make a node of the message block..
+  TAO_Queued_Data qd (&message_block);
+  size_t mesg_length;
+
   // Parse the incoming message for validity. The check needs to be
   // performed by the messaging objects.
-  if (this->parse_incoming_messages (message_block) == -1)
+  if (this->messaging_object ()->parse_next_message (message_block, 
+                                                     qd,
+                                                     mesg_length) == -1) 
     return -1;
 
+  if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED)
+    {
+      // parse/marshal error
+      return -1;
+    }
+  
+  if (message_block.length () > mesg_length)
+    {
+      // we read too much data
+      return -1;
+    }
+
   // NOTE: We are not performing any queueing nor any checking for
   // missing data. We are assuming that ALL the data would be got in a
   // single read.
 
-  // Make a node of the message block..
-  TAO_Queued_Data qd (&message_block);
-
-  // Extract the data for the node..
-  this->messaging_object ()->get_message_data (&qd);
-
   // Process the message
   return this->process_parsed_messages (&qd, rh);
 }
@@ -332,9 +346,10 @@ int
 TAO_DIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 63c79700296..e120804d184 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -1,6 +1,6 @@
-// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
-// ===================================================================
+
+//=============================================================================
 /**
  *  @file   DIOP_Transport.h
  *
@@ -8,7 +8,7 @@
  *
  *  @author  Michael Kircher
  */
-// ===================================================================
+//=============================================================================
 
 #ifndef TAO_DIOP_TRANSPORT_H
 #define TAO_DIOP_TRANSPORT_H
@@ -17,17 +17,22 @@
 
 #include "tao/orbconf.h"
 
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Transport.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Transport.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
-#include "strategies_export.h"
+
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decls.
 class TAO_DIOP_Connection_Handler;
@@ -40,10 +45,6 @@ class TAO_Acceptor;
 typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_DIOP_SVC_HANDLER;
 
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 /**
  * @class TAO_DIOP_Transport
  *
@@ -135,6 +136,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index d1e9d6940b3..4a9822dc7b5 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "FIFO_Connection_Purging_Strategy.h"
+#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
 ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
                                                             int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum),
@@ -14,12 +17,10 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
 {
 }
 
-
 TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
@@ -31,4 +32,4 @@ TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
     }
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
index b69bcff5739..30ef3794a5c 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   FIFO_Connection_Purging_Strategy.h
@@ -12,7 +14,7 @@
 #define TAO_FIFO_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Connection_Purging_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -21,6 +23,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_FIFO_Connection_Purging_Strategy
  *
@@ -50,5 +54,7 @@ private:
   unsigned long order_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_FIFO_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index 961ba767c8e..eab9bc1f9e0 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "LFU_Connection_Purging_Strategy.h"
+#include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
 ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
                                                            int cache_maximum)
 : TAO_Connection_Purging_Strategy (cache_maximum)
@@ -16,10 +19,10 @@ TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
   transport->purging_order (transport->purging_order () + 1);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
index b2b390c429f..98ea59231f9 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   LFU_Connection_Purging_Strategy.h
@@ -12,7 +14,7 @@
 #define TAO_LFU_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Connection_Purging_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -21,6 +23,8 @@
 
 // ****************************************************************
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LFU_Connection_Purging_Strategy
  *
@@ -45,5 +49,7 @@ public:
   virtual void update_item (TAO_Transport* transport);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_LFU_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index d3c740cb9de..67c5f5e0871 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,14 +1,16 @@
-// -*- C++ -*-
 // $Id$
 
-#include "LF_Strategy_Null.h"
+#include "tao/Strategies/LF_Strategy_Null.h"
 
 #if !defined (__ACE_INLINE__)
-# include "LF_Strategy_Null.inl"
+# include "tao/Strategies/LF_Strategy_Null.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(tao, LF_Strategy_Null, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
 {
 }
@@ -30,3 +32,5 @@ TAO_LF_Strategy_Null::reset_event_loop_thread (int,
                                                TAO_Leader_Follower &)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h
index 746204fd3d0..18ba5632ad0 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ b/TAO/tao/Strategies/LF_Strategy_Null.h
@@ -14,13 +14,15 @@
 #define TAO_LF_STRATEGY_NULL_H
 #include /**/ "ace/pre.h"
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/LF_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_LF_Strategy_Null
  *
@@ -48,8 +50,10 @@ public:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "LF_Strategy_Null.inl"
+# include "tao/Strategies/LF_Strategy_Null.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 930c9c89053..181be613d77 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -1,31 +1,32 @@
 // $Id$
 
-#include "NULL_Connection_Purging_Strategy.h"
+#include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
 #include "tao/Transport.h"
 
 ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
                                                            int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum)
 {
 }
 
-
 TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void)
 {
 }
 
-
 void
 TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
   ACE_UNUSED_ARG (transport);
 }
 
-
 int
 TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const
 {
   return -1;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
index 39804305347..37b5c15d268 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // ================================================================
 /**
  *  @file   NULL_Connection_Purging_Strategy.h
@@ -12,7 +14,7 @@
 #define TAO_NULL_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,6 +23,8 @@
 #include "tao/Connection_Purging_Strategy.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_NULL_Connection_Purging_Strategy
  *
@@ -45,5 +49,7 @@ public:
   virtual int cache_maximum (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_NULL_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index 314ec97354b..c250cd76240 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -1,13 +1,3 @@
-// =================================================================
-/**
- * @file OC_Endpoint_Selector_Loader.cpp
- *
- * $Id$
- *
- * @author Phil Mesnier <mesnier_p@ociweb.com>
- *
- */
-// =================================================================
 // $Id$
 
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
@@ -19,10 +9,11 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-int
-TAO_OC_Endpoint_Selector_Loader::init (void)
+TAO_OC_Endpoint_Selector_Loader::TAO_OC_Endpoint_Selector_Loader (void)
 {
-  return  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
+#if defined (TAO_AS_STATIC_LIBS)
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
+#endif /* TAO_AS_STATIC_LIBS */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
index a19f9cf5b1e..5edc517027d 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
@@ -49,12 +49,11 @@ class TAO_Optimized_Connection_Endpoint_Selector;
 class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader
 {
 public:
-  static int init(void);
+  TAO_OC_Endpoint_Selector_Loader (void);
 };
 
-static int
-TAO_Requires_OC_Endpoint_Selector_Loader =
-  TAO_OC_Endpoint_Selector_Loader::init ();
+
+static TAO_OC_Endpoint_Selector_Loader _TAO_oc_endpoint_selector_loader;
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index ad864ad1b9f..dae584e8152 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -27,7 +27,7 @@ TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Se
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector: ")
+                  ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector:")
                   ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"),
               tv.sec(), tv.usec()));
     }
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index cd8b50e2502..bedde8420cb 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1,5 +1,5 @@
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Profile.h"
+#include "tao/Strategies/SCIOP_Acceptor.h"
+#include "tao/Strategies/SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -11,13 +11,16 @@
 #include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
-#include "SCIOP_Acceptor.i"
+#include "tao/Strategies/SCIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(tao,
           SCIOP_Acceptor,
           "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE),
     addrs_ (0),
@@ -84,7 +87,7 @@ TAO_SCIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                         CORBA::Short priority)
 {
   // Adding this->endpoint_count_ to the TAO_MProfile.
-  int count = mprofile.profile_count ();
+  int const count = mprofile.profile_count ();
   if ((mprofile.size () - count) < this->endpoint_count_
       && mprofile.grow (count + this->endpoint_count_) == -1)
     return -1;
@@ -730,7 +733,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
   size_t lo_cnt = 0;  // Loopback interface count
   for (size_t j = 0; j < if_cnt; ++j)
     if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
-      lo_cnt++;
+      ++lo_cnt;
 
   // The instantiation for this template is in
   // tao/SCIOP_Connector.cpp.
@@ -794,7 +797,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
       if (this->addrs_[host_cnt].set (if_addrs[i]) != 0)
         return -1;
 
-      host_cnt++;
+      ++host_cnt;
     }
 
   return 0;
@@ -806,7 +809,7 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
 {
 
   // Make a copy of hostnames string
-  int hostnames_string_length = ACE_OS::strlen(hostnames) + 1;
+  int const hostnames_string_length = ACE_OS::strlen(hostnames) + 1;
   char* hostnames_copy = 0;
   ACE_NEW_RETURN (hostnames_copy,
                   char[hostnames_string_length],
@@ -1028,4 +1031,6 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index a62f9e9d395..ce00d346db4 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /*
@@ -7,9 +9,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Acceptor, Originally by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
  */
 // ===================================================================
 
@@ -17,7 +16,6 @@
 #ifndef TAO_SCIOP_ACCEPTOR_H
 #define TAO_SCIOP_ACCEPTOR_H
 #include /**/ "ace/pre.h"
-#include "ace/Acceptor.h"
 
 #include "tao/orbconf.h"
 
@@ -27,13 +25,16 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "ace/SOCK_SEQPACK_Acceptor.h"
-
 #include "tao/Transport_Acceptor.h"
-#include "SCIOP_Connection_Handler.h"
+#include "tao/Strategies/SCIOP_Connection_Handler.h"
 #include "tao/Acceptor_Impl.h"
 #include "tao/GIOP_Message_Version.h"
 
+#include "ace/SOCK_SEQPACK_Acceptor.h"
+#include "ace/Acceptor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO SCIOP_Acceptor concrete call defination
 
 /**
@@ -218,8 +219,10 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
-#include "SCIOP_Acceptor.i"
+#include "tao/Strategies/SCIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.i b/TAO/tao/Strategies/SCIOP_Acceptor.i
index b6e6b200890..a5f51de6042 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.i
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_SCIOP_Acceptor::address (void) const
 {
@@ -21,3 +24,5 @@ TAO_SCIOP_Acceptor::endpoints (void)
 
   return this->addrs_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 6bb68061112..981c049ea49 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -1,4 +1,4 @@
-#include "SCIOP_Connection_Handler.h"
+#include "tao/Strategies/SCIOP_Connection_Handler.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -19,8 +19,8 @@
 #include "tao/ORB.h"
 #include "tao/CDR.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "SCIOP_Transport.h"
-#include "SCIOP_Endpoint.h"
+#include "tao/Strategies/SCIOP_Transport.h"
+#include "tao/Strategies/SCIOP_Endpoint.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
@@ -32,6 +32,8 @@ ACE_RCSID (tao,
            SCIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SCIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
@@ -203,7 +205,7 @@ TAO_SCIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -229,7 +231,7 @@ TAO_SCIOP_Connection_Handler::handle_input (ACE_HANDLE h)
 int
 TAO_SCIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
 {
-  int result =
+  int const result =
     this->handle_output_eh (handle, this);
 
   if (result == -1)
@@ -302,7 +304,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
     IIOP::ListenPointList &listen_list)
 {
   // Get the size of the list
-  CORBA::ULong len = listen_list.length ();
+  CORBA::ULong const len = listen_list.length ();
 
   for (CORBA::ULong i = 0; i < len; ++ i)
     {
@@ -330,7 +332,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
 
       // The property for this handler has changed. Recache the
       // handler with this property
-      int retval = this->transport ()->recache_transport (&prop);
+      int const retval = this->transport ()->recache_transport (&prop);
       if (retval == -1)
         return retval;
 
@@ -359,10 +361,10 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri
 
   if (tos != this->dscp_codepoint_)
     {
-      int result = this->peer ().set_option (IPPROTO_IP,
-                                             IP_TOS,
-                                             (int *) &tos ,
-                                             (int) sizeof (tos));
+      int const result = this->peer ().set_option (IPPROTO_IP,
+                                                   IP_TOS,
+                                                   (int *) &tos ,
+                                                   (int) sizeof (tos));
 
       if (TAO_debug_level)
         {
@@ -383,4 +385,6 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri
   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 741bb4762e4..2a43c03057c 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /**
@@ -5,9 +7,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Connection_Handler.h
- *  @author  Originally by Chris Cleeland
- *  @author  modified by Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -17,9 +16,6 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "tao/TimeBaseC.h"
-
-#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -27,22 +23,24 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Connection_Handler.h"
 #include "tao/IIOPC.h"
+#include "tao/TimeBaseC.h"
 
+#include "ace/Reactor.h"
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
-        TAO_SCIOP_SVC_HANDLER;
-
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Service Handler for this transport
+typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
+        TAO_SCIOP_SVC_HANDLER;
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -137,6 +135,8 @@ private:
   int dscp_codepoint_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 60ec25b6100..bb196a5d761 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -1,5 +1,5 @@
-#include "SCIOP_Connector.h"
-#include "SCIOP_Profile.h"
+#include "tao/Strategies/SCIOP_Connector.h"
+#include "tao/Strategies/SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -24,6 +24,9 @@ ACE_RCSID (TAO,
            SCIOP_Connector,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
     lite_flag_ (flag),
@@ -422,5 +425,6 @@ TAO_SCIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index dd6aa57d8c2..283afe00b19 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //=============================================================================
 /**
@@ -7,20 +9,14 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Connector by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef TAO_SCIOP_CONNECTOR_H
 #define TAO_SCIOP_CONNECTOR_H
 
 #include /**/ "ace/pre.h"
 #include "tao/orbconf.h"
-#include "ace/SOCK_SEQPACK_Connector.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,12 +24,15 @@
 
 #if TAO_HAS_SCIOP == 1
 
-class TAO_SCIOP_Endpoint;
-
-#include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
 #include "tao/Connector_Impl.h"
-#include "SCIOP_Connection_Handler.h"
+#include "tao/Strategies/SCIOP_Connection_Handler.h"
+#include "ace/SOCK_SEQPACK_Connector.h"
+#include "ace/Connector.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_SCIOP_Endpoint;
 
 // ****************************************************************
 
@@ -125,6 +124,8 @@ private:
   TAO_SCIOP_BASE_CONNECTOR base_connector_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 89ac5c3bd2c..136d8927ff2 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -1,4 +1,4 @@
-#include "SCIOP_Endpoint.h"
+#include "tao/Strategies/SCIOP_Endpoint.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -19,9 +19,10 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SCIOP_Endpoint.i"
+# include "tao/Strategies/SCIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
@@ -364,4 +365,6 @@ TAO_SCIOP_Endpoint::preferred_network (void) const
   return this->preferred_path_.host.in ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index 0095ccfe186..7772b4f4a0c 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -10,8 +10,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Endpoint by
- *  @author  Marina Spivak <marina@cs.wustl.edu>
  */
 //==========================================================================
 
@@ -29,11 +27,13 @@
 
 #if TAO_HAS_SCIOP == 1
 #include "tao/Endpoint.h"
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/CORBA_String.h"
 #include "ace/INET_Addr.h"
 #include "tao/IIOP_EndpointsC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SCIOP_Connection_Handler;
 
 /**
@@ -160,9 +160,10 @@ private:
   TAO_SCIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "SCIOP_Endpoint.i"
+# include "tao/Strategies/SCIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.i b/TAO/tao/Strategies/SCIOP_Endpoint.i
index fd182741c6b..2174f62be7b 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.i
@@ -1,6 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_SCIOP_Endpoint::host (void) const
 {
@@ -18,3 +20,5 @@ TAO_SCIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 0383f053e2a..c6c0d3a271d 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -1,6 +1,6 @@
-#include "SCIOP_Factory.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Connector.h"
+#include "tao/Strategies/SCIOP_Factory.h"
+#include "tao/Strategies/SCIOP_Acceptor.h"
+#include "tao/Strategies/SCIOP_Connector.h"
 #include "ace/OS_NS_strings.h"
 
 #if TAO_HAS_SCIOP == 1
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
 
 static const char prefix_[] = "sciop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
      major_ (TAO_DEF_SCIOP_MAJOR),
@@ -79,6 +81,8 @@ TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory,
                        ACE_TEXT ("SCIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index 7b4a30aab29..d0b1fc489fa 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //=============================================================================
 /**
@@ -5,8 +7,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Factory by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
 //=============================================================================
 
@@ -23,14 +23,17 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "ace/Service_Config.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory
+: public TAO_Protocol_Factory
 {
 public:
   TAO_SCIOP_Protocol_Factory (void);
@@ -62,6 +65,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
index 849981f5e07..e71cb4dd6ce 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
@@ -1,6 +1,6 @@
-#include "SCIOP_Lite_Factory.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Connector.h"
+#include "tao/Strategies/SCIOP_Lite_Factory.h"
+#include "tao/Strategies/SCIOP_Acceptor.h"
+#include "tao/Strategies/SCIOP_Connector.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
@@ -11,6 +11,8 @@ ACE_RCSID(tao, SCIOP_Factory, "$Id$")
 
 static const char prefix_[] = "sciop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
      major_ (TAO_DEF_SCIOP_MAJOR),
@@ -83,6 +85,8 @@ TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory,
                        ACE_TEXT ("SCIOP_Lite_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
index cdade7a16e9..7c9dbd4d181 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 //==========================================================================
 /**
@@ -5,8 +7,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Lite_Factory by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
 //==========================================================================
 
@@ -23,10 +23,11 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "ace/Service_Config.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -65,6 +66,8 @@ private:
   int minor_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 7c48f8e3f8e..fa381145d61 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -1,7 +1,7 @@
 // This may look like C, but it's really -*- C++ -*-
 // SCIOP_Profile.cpp
 
-#include "SCIOP_Profile.h"
+#include "tao/Strategies/SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -11,7 +11,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/StringSeqC.h"
-#include "sciop_endpointsC.h"
+#include "tao/Strategies/sciop_endpointsC.h"
 
 ACE_RCSID(Strategies,
           SCIOP_Profile,
@@ -21,14 +21,14 @@ static const char prefix_[] = "sciop";
 
 const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 char
 TAO_SCIOP_Profile::object_key_delimiter (void) const
 {
   return TAO_SCIOP_Profile::object_key_delimiter_;
 }
 
-
-
 TAO_SCIOP_Profile::TAO_SCIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
@@ -106,7 +106,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
     {
       TAO_SCIOP_Endpoint *endpoint = 0;
       ACE_NEW_RETURN (endpoint,
-                      TAO_SCIOP_Endpoint (endpointSeq[i].in(),
+                      TAO_SCIOP_Endpoint (endpointSeq[i],
                                           this->endpoint_.port_,
                                           this->endpoint_.priority()),
                       -1);
@@ -513,4 +513,6 @@ TAO_SCIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 5310af754b0..4bfc18ebb6a 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -8,8 +8,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Profile by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
 //=============================================================================
 
@@ -19,15 +17,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Profile.h"
+#include "tao/orbconf.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if TAO_HAS_SCIOP == 1
 
-#include "SCIOP_Endpoint.h"
+#include "tao/Strategies/SCIOP_Endpoint.h"
+#include "tao/Profile.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SCIOP_Profile concrete Profile definitions
 /**
@@ -133,6 +134,8 @@ protected:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index a5acf0d6395..f306345bca0 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "SCIOP_Transport.h"
+#include "tao/Strategies/SCIOP_Transport.h"
 
 #if TAO_HAS_SCIOP == 1
 
-#include "SCIOP_Connection_Handler.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Profile.h"
+#include "tao/Strategies/SCIOP_Connection_Handler.h"
+#include "tao/Strategies/SCIOP_Acceptor.h"
+#include "tao/Strategies/SCIOP_Profile.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/operation_details.h"
@@ -25,6 +25,8 @@ ACE_RCSID (tao,
            SCIOP_Transport,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean )
@@ -46,7 +48,7 @@ TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
     {
       // Use the normal GIOP object
       ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
+               TAO_GIOP_Message_Base (orb_core, this));
     }
 }
 
@@ -380,4 +382,6 @@ TAO_SCIOP_Transport::get_listen_point (
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index e51f42b5778..c99b24aa10d 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 // $Id$
 // ===================================================================
 /**
@@ -5,9 +7,6 @@
  *
  *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
  *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Transport
- *  @author  Originally by Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Modified by Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -15,7 +14,7 @@
 #define TAO_SCIOP_TRANSPORT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Transport.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,10 +22,13 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Transport.h"
 #include "tao/IIOPC.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class TAO_SCIOP_Connection_Handler;
 class TAO_ORB_Core;
@@ -137,6 +139,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 595f3bb55db..1d3e6134afb 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -1,11 +1,10 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "SHMIOP_Acceptor.h"
+#include "tao/Strategies/SHMIOP_Acceptor.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "SHMIOP_Profile.h"
+#include "tao/Strategies/SHMIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -20,6 +19,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
@@ -506,4 +507,6 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index ef369ad0f9c..61e8d25f90c 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -1,21 +1,16 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    SHMIOP_Acceptor.h
-//
-// = DESCRIPTION
-//    SHMIOP specific acceptor processing
-//
-// = AUTHOR
-//    Nanbor Wang
-//
-// ============================================================================
+// $Id$
+// ===================================================================
+/**
+ *  @file   SHMIOP_Acceptor.h
+ *
+ *  @brief  SHMIOP specific acceptor processing
+ *
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+// ===================================================================
 
 #ifndef TAO_SHMIOP_ACCEPTOR_H
 #define TAO_SHMIOP_ACCEPTOR_H
@@ -31,13 +26,15 @@
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "tao/Transport_Acceptor.h"
-#include "SHMIOP_Connection_Handler.h"
+#include "tao/Strategies/SHMIOP_Connection_Handler.h"
 #include "tao/Acceptor_Impl.h"
 #include "ace/Acceptor.h"
 #include "ace/MEM_Acceptor.h"
 #include "tao/GIOP_Message_Version.h"
 // TAO SHMIOP_Acceptor concrete call definitions
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_SHMIOP_Acceptor
  *
@@ -148,6 +145,8 @@ private:
   CORBA::Boolean lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 9d384859ff7..788407dfd7d 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "SHMIOP_Connection_Handler.h"
+#include "tao/Strategies/SHMIOP_Connection_Handler.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
@@ -13,7 +13,7 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "SHMIOP_Endpoint.h"
+#include "tao/Strategies/SHMIOP_Endpoint.h"
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
@@ -24,6 +24,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0)
@@ -157,7 +159,7 @@ TAO_SHMIOP_Connection_Handler::open (void*)
 
   // Not needed, anyway
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -250,4 +252,6 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index fbfa34bc1fc..8b432e5750f 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Originally by Nanbor Wang <nanbor@cs.wustl.edu> as UIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -28,9 +27,12 @@
 #include "ace/Acceptor.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
-#include "SHMIOP_Transport.h"
+#include "tao/Strategies/SHMIOP_Transport.h"
 
 // ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_SHMIOP_Connection_Handler
  *
@@ -39,8 +41,6 @@
  * The Connection handler which is common for the Acceptor and
  * the Connector
  */
-
-
 class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler :
   public TAO_SHMIOP_SVC_HANDLER,
   public TAO_Connection_Handler
@@ -103,6 +103,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index d1490b46eb0..362fe65f8e2 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
 
-#include "SHMIOP_Connector.h"
+#include "tao/Strategies/SHMIOP_Connector.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "SHMIOP_Profile.h"
-#include "SHMIOP_Endpoint.h"
+#include "tao/Strategies/SHMIOP_Profile.h"
+#include "tao/Strategies/SHMIOP_Endpoint.h"
 #include "tao/debug.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/ORB_Core.h"
@@ -21,6 +21,8 @@ ACE_RCSID (Strategies,
            SHMIOP_Connector,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
@@ -33,7 +35,6 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void)
 {
 }
 
-
 int
 TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -348,5 +349,6 @@ TAO_SHMIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index d4b41468c55..96776801b1e 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -8,7 +8,6 @@
  *
  *  SHMIOP specific connector processing
  *
- *
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
 //=============================================================================
@@ -30,10 +29,12 @@
 #include "ace/MEM_Connector.h"
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
-#include "SHMIOP_Connection_Handler.h"
+#include "tao/Strategies/SHMIOP_Connection_Handler.h"
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SHMIOP_Endpoint;
 
 // ****************************************************************
@@ -127,6 +128,8 @@ private:
   CORBA::Boolean lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index 8d2ca160b58..cf24fcd5fba 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -1,12 +1,10 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
-#include "SHMIOP_Endpoint.h"
+#include "tao/Strategies/SHMIOP_Endpoint.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "SHMIOP_Connection_Handler.h"
+#include "tao/Strategies/SHMIOP_Connection_Handler.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
@@ -19,11 +17,13 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "SHMIOP_Endpoint.i"
+# include "tao/Strategies/SHMIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_netdb.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr,
                                           int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
@@ -260,4 +260,7 @@ TAO_SHMIOP_Endpoint::object_addr (void) const
 
   return this->object_addr_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index c44a9f6705f..e48e208443f 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -8,7 +8,6 @@
  *
  * SHMIOP implementation of PP Framework Endpoint interface.
  *
- *
  * @author Marina Spivak <marina@cs.wustl.edu>
  */
 //==========================================================================
@@ -17,20 +16,22 @@
 #define TAO_SHMIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Endpoint.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
+
 #include "tao/CORBA_String.h"
-#include "strategies_export.h"
+#include "tao/Endpoint.h"
+#include "tao/Strategies/strategies_export.h"
 
 #include "ace/INET_Addr.h"
 #include "ace/MEM_Addr.h"
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_SHMIOP_Endpoint
@@ -135,8 +136,10 @@ private:
   TAO_SHMIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "SHMIOP_Endpoint.i"
+# include "tao/Strategies/SHMIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i
index e5a11fae5ab..e507b39c440 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const char *
 TAO_SHMIOP_Endpoint::host (void) const
 {
@@ -18,3 +21,5 @@ TAO_SHMIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index 6d49937a410..27cca45b226 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -1,9 +1,9 @@
-#include "SHMIOP_Factory.h"
+#include "tao/Strategies/SHMIOP_Factory.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "SHMIOP_Acceptor.h"
-#include "SHMIOP_Connector.h"
+#include "tao/Strategies/SHMIOP_Acceptor.h"
+#include "tao/Strategies/SHMIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -19,6 +19,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "shmiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
   : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
     major_ (TAO_DEF_GIOP_MAJOR),
@@ -80,12 +82,12 @@ TAO_SHMIOP_Protocol_Factory::init (int argc,
     {
       const ACE_TCHAR *current_arg = 0;
 
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize"))))
+      if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize"))))
         {
           this->min_bytes_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix"))))
         {
           this->mmap_prefix_ = ACE::strnew (current_arg);
           arg_shifter.consume_arg ();
@@ -116,6 +118,8 @@ TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory,
                        ACE_TEXT ("SHMIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index 4093b9069e6..0b623455790 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -1,17 +1,14 @@
 // -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   SHMIOP_Factory.h
-//
-// = AUTHOR
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ * @file SHMIOP_Factory.h
+ *
+ * $Id$
+ *
+ * @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_SHMIOP_FACTORY_H
 #define TAO_SHMIOP_FACTORY_H
@@ -27,14 +24,17 @@
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "tao/Protocol_Factory.h"
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory
+  : public TAO_Protocol_Factory
 {
 public:
   /// Constructor.
@@ -87,6 +87,8 @@ private:
   off_t min_bytes_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index db66c5aa82d..71a73c4dc7c 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -1,4 +1,4 @@
-#include "SHMIOP_Profile.h"
+#include "tao/Strategies/SHMIOP_Profile.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "shmiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/';
 
 char
@@ -509,4 +511,6 @@ TAO_SHMIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index b7f367aea82..d75215ed4a9 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -8,7 +8,6 @@
  *
  *   SHMIOP profile specific processing
  *
- *
  *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
  */
 //=============================================================================
@@ -27,10 +26,11 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Profile.h"
-#include "SHMIOP_Endpoint.h"
+#include "tao/Strategies/SHMIOP_Endpoint.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SHMIOP_Profile concrete Profile definitions
 /**
@@ -122,6 +122,8 @@ private:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 47fe0a6c898..bb99b50d002 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -1,12 +1,11 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "SHMIOP_Transport.h"
+#include "tao/Strategies/SHMIOP_Transport.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "SHMIOP_Connection_Handler.h"
-#include "SHMIOP_Profile.h"
+#include "tao/Strategies/SHMIOP_Connection_Handler.h"
+#include "tao/Strategies/SHMIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -20,6 +19,9 @@
 
 ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
                                             TAO_ORB_Core *orb_core,
                                             CORBA::Boolean flag)
@@ -43,7 +45,7 @@ TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handl
     {
       // Use the normal GIOP object
       ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
+               TAO_GIOP_Message_Base (orb_core, this));
     }
 //@@ MESSAGING_SPL_COMMENT_HOOK_END
 }
@@ -135,31 +137,135 @@ TAO_SHMIOP_Transport::recv (char *buf,
   return n;
 }
 
-
 int
-TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
-                                           ssize_t missing_data,
-                                           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)
 {
-  // Calculate the actual length of the load that we are supposed to
-  // read which is equal to the <missing_data> + length of the buffer
-  // that we have..
-  size_t payload = missing_data + incoming.length ();
+  if (TAO_debug_level > 3)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input\n",
+                  this->id ()));
+    }
+
+   // The buffer on the stack which will be used to hold the input
+  // messages, compensate shrink due to alignment
+  char buf [TAO_MAXBUFSIZE + ACE_CDR::MAX_ALIGNMENT];
+
 
-  // Grow the buffer to the size of the message
-  ACE_CDR::grow (&incoming,
-                 payload);
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
+  (void) ACE_OS::memset (buf,
+                         '\0',
+                         sizeof buf);
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
+
+  // Create a data block
+  ACE_Data_Block db (sizeof (buf),
+                     ACE_Message_Block::MB_DATA,
+                     buf,
+                     this->orb_core_->input_cdr_buffer_allocator (),
+                     this->orb_core_->locking_strategy (),
+                     ACE_Message_Block::DONT_DELETE,
+                     this->orb_core_->input_cdr_dblock_allocator ());
+
+  // Create a message block
+  ACE_Message_Block message_block (&db,
+                                   ACE_Message_Block::DONT_DELETE,
+                                   this->orb_core_->input_cdr_msgblock_allocator ());
+
+
+  // Align the message block
+  ACE_CDR::mb_align (&message_block);
+
+  const size_t missing_header_data = this->messaging_object ()->header_length ();
+
+  if (missing_header_data == 0) 
+    {
+      return -1;
+    }
 
   // .. do a read on the socket again.
   ssize_t bytes = 0;
 
   // As this used for transports where things are available in one
   // shot this looping should not create any problems.
-  for (size_t n = missing_data;
+  for (size_t m = missing_header_data;
+       m != 0;
+       m -= bytes)
+    {
+      bytes = 0; // reset
+
+      // We would have liked to use something like a recv_n ()
+      // here. But at the time when the code was written, the MEM_Stream
+      // classes had poor support  for recv_n (). Till a day when we
+      // get proper recv_n (), let us stick with this. The other
+      // argument that can be said against this is that, this is the
+      // bad layer in which this is being done ie. recv_n is
+      // simulated. But...
+      bytes = this->recv (message_block.wr_ptr (),
+                          m,
+                          max_wait_time);
+
+      if (bytes == 0 ||
+          bytes == -1)
+        {
+          return -1;
+        }
+
+      message_block.wr_ptr (bytes);
+    }
+
+    TAO_Queued_Data qd (&message_block);
+    size_t mesg_length; // not used
+
+    // Parse the incoming message for validity. The check needs to be
+    // performed by the messaging objects.
+    if (this->messaging_object ()->parse_next_message (message_block,
+                                                       qd,
+                                                       mesg_length) == -1)
+      return -1;
+
+    if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) 
+      {
+        // parse/marshal error happened
+        return -1;
+      }
+
+    if (message_block.length () > mesg_length)
+      {
+        // we read too much data
+        return -1;
+      }
+    
+    if (message_block.space () < qd.missing_data_)
+      {
+        const size_t message_size = message_block.length ()
+                                  + qd.missing_data_;
+
+        // reallocate buffer with correct size on heap
+	if (ACE_CDR::grow (&message_block, message_size) == -1)
+          {
+            if (TAO_debug_level > 0)
+              {
+                ACE_ERROR ((LM_ERROR,
+                 "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input, "
+                 "error growing message buffer\n",
+                 this->id () ));
+              }
+            return -1;
+          }
+
+      }
+
+    // As this used for transports where things are available in one
+    // shot this looping should not create any problems.
+    for (size_t n = qd.missing_data_;
        n != 0;
        n -= bytes)
     {
+        bytes = 0; // reset
+
       // We would have liked to use something like a recv_n ()
       // here. But at the time when the code was written, the MEM_Stream
       // classes had poor support  for recv_n (). Till a day when we
@@ -167,7 +273,7 @@ TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
       // argument that can be said against this is that, this is the
       // bad layer in which this is being done ie. recv_n is
       // simulated. But...
-      bytes = this->recv (incoming.wr_ptr (),
+        bytes = this->recv (message_block.wr_ptr (),
                           n,
                           max_wait_time);
 
@@ -177,21 +283,24 @@ TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
           return -1;
         }
 
-      incoming.wr_ptr (bytes);
-    }
-
-  TAO_Queued_Data pqd (&incoming);
+        message_block.wr_ptr (bytes);
 
-  // With SHMIOP we would not have any missing data...
-  pqd.missing_data_ = 0;
+    }
 
-  this->messaging_object ()->get_message_data (&pqd);
+  qd.missing_data_ = 0;
 
   // Now we have a full message in our buffer. Just go ahead and
   // process that
-  return this->process_parsed_messages (&pqd, rh);
+  if (this->process_parsed_messages (&qd, rh) == -1)
+    {
+      return -1;
+    }
+  
+  return 0;
 }
 
+
+
 int
 TAO_SHMIOP_Transport::send_request (TAO_Stub *stub,
                                   TAO_ORB_Core *orb_core,
@@ -258,4 +367,6 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index a8655d8c1db..e44b79d4173 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -6,8 +6,8 @@
  *
  *  $Id$
  *
- *  @author Originally by Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -24,11 +24,17 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "ace/Svc_Handler.h"
 #include "ace/MEM_Stream.h"
 #include "tao/Transport.h"
 
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_SHMIOP_Connection_Handler;
 class TAO_Pluggable_Messaging;
 class TAO_Target_Specification;
@@ -37,10 +43,6 @@ class Tao_Operation_Details;
 typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
          TAO_SHMIOP_SVC_HANDLER;
 
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
 /**
  * @class TAO_SHMIOP_Transport
  *
@@ -82,11 +84,9 @@ protected:
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
-  virtual int consolidate_message (ACE_Message_Block &incoming,
-                                   ssize_t missing_data,
-                                   TAO_Resume_Handle &rh,
-                                   ACE_Time_Value *max_wait_time);
-
+  virtual int handle_input (TAO_Resume_Handle &rh,
+                            ACE_Time_Value *max_wait_time,
+                            int block = 0);
   //@}
 
 public:
@@ -116,6 +116,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 4ec98202ca3..87917221593 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,8 +1,8 @@
-#include "UIOP_Acceptor.h"
+#include "tao/Strategies/UIOP_Acceptor.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Profile.h"
+#include "tao/Strategies/UIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -19,6 +19,8 @@ ACE_RCSID (Strategies,
            UIOP_Acceptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_UIOP_PROFILE),
     base_acceptor_ (),
@@ -477,4 +479,6 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 7610ce7f277..20de4591230 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 # if TAO_HAS_UIOP == 1
-#include "UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/Acceptor_Impl.h"
@@ -34,6 +34,8 @@
 #include "ace/Acceptor.h"
 #include "ace/LSOCK_Acceptor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_UIOP_Acceptor
  *
@@ -135,6 +137,8 @@ private:
   const bool lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 7db6103a5d2..ada81ab9075 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Transport.h"
-#include "UIOP_Endpoint.h"
+#include "tao/Strategies/UIOP_Transport.h"
+#include "tao/Strategies/UIOP_Endpoint.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -23,6 +23,7 @@ ACE_RCSID (Strategies,
            UIOP_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIOP_SVC_HANDLER (t, 0 , 0),
@@ -137,7 +138,7 @@ TAO_UIOP_Connection_Handler::open (void*)
     return -1;
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
-		       this->orb_core ()->leader_follower ());
+                       this->orb_core ()->leader_follower ());
 
   return 0;
 }
@@ -228,4 +229,6 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*TAO_HAS_UIOP == 1*/
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index ca14c8aeb4a..107706a82b6 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -24,15 +24,13 @@
 
 #if TAO_HAS_UIOP == 1
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-#include "ace/Reactor.h"
+#include "tao/Strategies/UIOP_Transport.h"
 #include "tao/Connection_Handler.h"
 #include "tao/Wait_Strategy.h"
-#include "UIOP_Transport.h"
+#include "ace/Acceptor.h"
+#include "ace/Reactor.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -86,7 +84,6 @@ public:
                               const void *act = 0);
   //@}
 
-
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
@@ -100,6 +97,8 @@ protected:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 6ce63d9709a..efce00f17d2 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -1,8 +1,8 @@
-#include "UIOP_Connector.h"
+#include "tao/Strategies/UIOP_Connector.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Profile.h"
+#include "tao/Strategies/UIOP_Profile.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Environment.h"
@@ -21,6 +21,8 @@ ACE_RCSID(Strategies,
           UIOP_Connector,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
@@ -395,7 +397,7 @@ TAO_UIOP_Connector::cancel_svc_handler (
   TAO_Connection_Handler * svc_handler)
 {
   TAO_UIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler);
+    dynamic_cast<TAO_UIOP_Connection_Handler*> (svc_handler);
 
   if (handler)
     // Cancel from the connector
@@ -404,4 +406,6 @@ TAO_UIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index e53b09b3295..1898316e91a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -31,10 +31,12 @@
 #include "ace/LSOCK_Connector.h"
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
-#include "UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_UIOP_Endpoint;
 class TAO_Endpoint;
 
@@ -73,7 +75,7 @@ public:
 
   virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
                                       ACE_ENV_ARG_DECL);
-  
+
   virtual char object_key_delimiter (void) const;
 
   /// Cancel the passed cvs handler from the connector
@@ -131,6 +133,8 @@ private:
   const bool lite_flag_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index d843a8b2d14..f0ff4199582 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -1,5 +1,5 @@
-#include "UIOP_Endpoint.h"
-#include "UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Endpoint.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -15,9 +15,10 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "UIOP_Endpoint.i"
+# include "tao/Strategies/UIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
                                       CORBA::Short priority)
@@ -102,4 +103,7 @@ TAO_UIOP_Endpoint::hash (void)
 
   return this->hash_val_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
index f788dc014d6..00af4e66e50 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -16,7 +16,7 @@
 #define TAO_UIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Endpoint.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,9 +24,11 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Endpoint.h"
 #include "ace/UNIX_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Endpoint
@@ -91,8 +93,10 @@ private:
   TAO_UIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "UIOP_Endpoint.i"
+# include "tao/Strategies/UIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 # endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i
index 337bbae6a76..a7a01b59c3d 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ b/TAO/tao/Strategies/UIOP_Endpoint.i
@@ -1,19 +1,23 @@
 // -*- C++ -*-
+//
 // $Id$
 
 # if TAO_HAS_UIOP == 1
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_UNIX_Addr &
 TAO_UIOP_Endpoint::object_addr (void) const
 {
   return this->object_addr_;
 }
 
-
 ACE_INLINE const char *
 TAO_UIOP_Endpoint::rendezvous_point (void) const
 {
   return this->object_addr_.get_path_name ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 080f76eccc8..b74a464f82c 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 // $Id$
 
-#include "UIOP_Factory.h"
+#include "tao/Strategies/UIOP_Factory.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Acceptor.h"
-#include "UIOP_Connector.h"
+#include "tao/Strategies/UIOP_Acceptor.h"
+#include "tao/Strategies/UIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
      major_ (TAO_DEF_GIOP_MAJOR),
@@ -87,6 +89,8 @@ TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
                        ACE_TEXT ("UIOP_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index 6214e67f0a1..d3ec7616987 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -28,9 +29,11 @@
 # if TAO_HAS_UIOP == 1
 
 #include "tao/Protocol_Factory.h"
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -75,6 +78,8 @@ private:
   // compatibility with old clients.
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
index b86f8fe3856..8aa707a3472 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -1,9 +1,9 @@
-#include "UIOP_Lite_Factory.h"
+#include "tao/Strategies/UIOP_Lite_Factory.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Acceptor.h"
-#include "UIOP_Connector.h"
+#include "tao/Strategies/UIOP_Acceptor.h"
+#include "tao/Strategies/UIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -18,6 +18,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
      major_ (TAO_DEF_GIOP_MAJOR),
@@ -89,6 +91,8 @@ TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory,
                        ACE_TEXT ("UIOP_Lite_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h
index 332506d4dbd..98e127d58f7 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 // $Id$
 // ============================================================================
 //
@@ -21,20 +22,21 @@
 
 #include "tao/orbconf.h"
 
-# if TAO_HAS_UIOP == 1
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+# if TAO_HAS_UIOP == 1
+
 #include "ace/Service_Config.h"
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Protocol_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Acceptor;
 class TAO_Connector;
 
-
 class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory :
   public TAO_Protocol_Factory
 {
@@ -78,6 +80,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory)
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 76ba5ede816..853bfc83d9e 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -1,8 +1,8 @@
-#include "UIOP_Profile.h"
+#include "tao/Strategies/UIOP_Profile.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "uiop_endpointsC.h"
+#include "tao/Strategies/uiop_endpointsC.h"
 
 #include "tao/CDR.h"
 #include "tao/Environment.h"
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
 
 char
@@ -447,4 +449,6 @@ TAO_UIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 069c5105965..fe515c4d388 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -27,13 +27,14 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/Profile.h"
-#include "UIOP_Connection_Handler.h"
-#include "UIOP_Endpoint.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Endpoint.h"
 
 #include "ace/UNIX_Addr.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Profile
@@ -120,6 +121,8 @@ private:
   CORBA::ULong count_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index df5a0032644..c3cde036f2e 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "UIOP_Transport.h"
+#include "tao/Strategies/UIOP_Transport.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "UIOP_Connection_Handler.h"
-#include "UIOP_Profile.h"
+#include "tao/Strategies/UIOP_Connection_Handler.h"
+#include "tao/Strategies/UIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -20,6 +20,9 @@ ACE_RCSID (Strategies,
            UIOP_Transport,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
@@ -44,7 +47,7 @@ TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
     {
       // Use the normal GIOP object
       ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
+               TAO_GIOP_Message_Base (orb_core, this));
     }
 //@@ MESSAGING_SPL_COMMENT_HOOK_END
 }
@@ -183,7 +186,6 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
-
 int
 TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -193,4 +195,6 @@ TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_HAS_UIOP */
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index aefcb26ecbc..1a7599f45fb 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 // ===================================================================
 /**
@@ -25,11 +25,13 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "ace/LSOCK_Acceptor.h"
 #include "ace/Svc_Handler.h"
 #include "tao/Transport.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 
 class TAO_ORB_Core;
@@ -110,6 +112,8 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 62c42275c06..427eda74eaa 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -1,17 +1,17 @@
 // $Id$
 #include "ace/Service_Config.h"
-#include "advanced_resource.h"
+#include "tao/Strategies/advanced_resource.h"
 
-#include "UIOP_Factory.h"
-#include "SHMIOP_Factory.h"
-#include "DIOP_Factory.h"
-#include "SCIOP_Factory.h"
+#include "tao/Strategies/UIOP_Factory.h"
+#include "tao/Strategies/SHMIOP_Factory.h"
+#include "tao/Strategies/DIOP_Factory.h"
+#include "tao/Strategies/SCIOP_Factory.h"
 
-#include "LFU_Connection_Purging_Strategy.h"
-#include "FIFO_Connection_Purging_Strategy.h"
-#include "NULL_Connection_Purging_Strategy.h"
+#include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
+#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
+#include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
 
-#include "LF_Strategy_Null.h"
+#include "tao/Strategies/LF_Strategy_Null.h"
 
 #include "tao/debug.h"
 #include "tao/LRU_Connection_Purging_Strategy.h"
@@ -37,6 +37,8 @@
 
 ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 {
 
@@ -128,7 +130,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
                             -1);
 
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorLock"))))
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -142,7 +144,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorType"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -184,7 +186,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBInputCDRAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -206,7 +208,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMHResponseHandlerAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -226,7 +228,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMIResponseHandlerAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -246,7 +248,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorThreadQueue"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -689,9 +691,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
 typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC;
 typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR;
 
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC;
-typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
-
 ACE_Allocator *
 TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
 {
@@ -722,12 +721,9 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
                       NULL_LOCK_ALLOCATOR,
                       0);
       break;
-    case TAO_ALLOCATOR_THREAD_LOCK:
     default:
-      ACE_NEW_RETURN (allocator,
-                      LOCKED_ALLOCATOR,
-                      0);
-      break;
+      return
+        this->TAO_Default_Resource_Factory::input_cdr_buffer_allocator();
     }
   return allocator;
 }
@@ -878,6 +874,8 @@ TAO_Advanced_Resource_Factory::report_unsupported_error (
              option_name));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory,
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 17c1279003c..98dde1143d3 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -4,7 +4,7 @@
 #define TAO_ADVANCED_RESOURCE_H
 #include /**/ "ace/pre.h"
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/default_resource.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -13,6 +13,8 @@
 
 #include "tao/ORB_Core.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Connection_Purging_Strategy;
 
 class TAO_Strategies_Export TAO_Resource_Factory_Changer
@@ -132,10 +134,12 @@ protected:
 
 };
 
+static TAO_Resource_Factory_Changer TAO_changer;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory)
 
-static TAO_Resource_Factory_Changer TAO_changer;
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ADVANCED_RESOURCE_H */
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
index 21e65ac0c8a..657e1e910c9 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ b/TAO/tao/Strategies/sciop_endpointsC.cpp
@@ -36,7 +36,7 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "sciop_endpointsC.h"
+#include "tao/Strategies/sciop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,6 +46,8 @@
 // TAO_IDL - Generated from
 // be/be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -94,7 +96,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (void)
 TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_SCIOP_Endpoint_Info
       >
     (max)
@@ -106,7 +108,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
     TAO_SCIOP_Endpoint_Info * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_SCIOP_Endpoint_Info
       >
     (max, length, buffer, release)
@@ -115,7 +117,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
 TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
     const TAO_SCIOPEndpointSequence &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_SCIOP_Endpoint_Info
       >
     (seq)
@@ -204,22 +206,7 @@ CORBA::Boolean operator<< (
     const TAO_SCIOPEndpointSequence &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -227,40 +214,9 @@ CORBA::Boolean operator>> (
     TAO_SCIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-
-    }
-
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h
index 4e89a5b4e47..634b4d3ff28 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.h
+++ b/TAO/tao/Strategies/sciop_endpointsC.h
@@ -40,13 +40,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/String_Manager_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,6 +63,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_type.cpp:258
 
@@ -86,9 +89,9 @@ typedef
 struct TAO_Strategies_Export TAO_SCIOP_Endpoint_Info
 {
   typedef TAO_SCIOP_Endpoint_Info_var _var_type;
-  
-  
-  TAO_String_Manager host;
+
+
+  TAO::String_Manager host;
   CORBA::Short port;
   CORBA::Short priority;
 };
@@ -108,22 +111,19 @@ class TAO_SCIOPEndpointSequence;
 
 typedef
   TAO_VarSeq_Var_T<
-      TAO_SCIOPEndpointSequence,
-      TAO_SCIOP_Endpoint_Info
+      TAO_SCIOPEndpointSequence
     >
   TAO_SCIOPEndpointSequence_var;
 
 typedef
   TAO_Seq_Out_T<
-      TAO_SCIOPEndpointSequence,
-      TAO_SCIOPEndpointSequence_var,
-      TAO_SCIOP_Endpoint_Info
+      TAO_SCIOPEndpointSequence
     >
   TAO_SCIOPEndpointSequence_out;
 
 class TAO_Strategies_Export TAO_SCIOPEndpointSequence
   : public
-      TAO_Unbounded_Sequence<
+      TAO::unbounded_value_sequence<
           TAO_SCIOP_Endpoint_Info
         >
 {
@@ -133,12 +133,12 @@ public:
   TAO_SCIOPEndpointSequence (
       CORBA::ULong max,
       CORBA::ULong length,
-      TAO_SCIOP_Endpoint_Info* buffer, 
-      CORBA::Boolean release = 0
+      TAO_SCIOP_Endpoint_Info* buffer,
+      CORBA::Boolean release = false
     );
   TAO_SCIOPEndpointSequence (const TAO_SCIOPEndpointSequence &);
   ~TAO_SCIOPEndpointSequence (void);
-  
+
   typedef TAO_SCIOPEndpointSequence_var _var_type;
 };
 
@@ -183,6 +183,8 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
index c3728f7bf79..edb2ac0c6e8 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ b/TAO/tao/Strategies/uiop_endpointsC.cpp
@@ -36,7 +36,7 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "uiop_endpointsC.h"
+#include "tao/Strategies/uiop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,6 +46,8 @@
 // TAO_IDL - Generated from
 // be/be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -93,7 +95,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (void)
 TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_UIOP_Endpoint_Info
       >
     (max)
@@ -105,7 +107,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
     TAO_UIOP_Endpoint_Info * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_UIOP_Endpoint_Info
       >
     (max, length, buffer, release)
@@ -114,7 +116,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
 TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
     const TAO_UIOPEndpointSequence &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         TAO_UIOP_Endpoint_Info
       >
     (seq)
@@ -201,22 +203,7 @@ CORBA::Boolean operator<< (
     const TAO_UIOPEndpointSequence &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-    }
-
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -224,40 +211,9 @@ CORBA::Boolean operator>> (
     TAO_UIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
-
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-
-      return _tao_marshal_flag;
-
-    }
-
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h
index f85b1a69906..67b93a85845 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.h
+++ b/TAO/tao/Strategies/uiop_endpointsC.h
@@ -40,13 +40,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "strategies_export.h"
+#include "tao/Strategies/strategies_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/String_Manager_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,6 +63,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_type.cpp:258
 
@@ -86,9 +89,9 @@ typedef
 struct TAO_Strategies_Export TAO_UIOP_Endpoint_Info
 {
   typedef TAO_UIOP_Endpoint_Info_var _var_type;
-  
-  
-  TAO_String_Manager rendezvous_point;
+
+
+  TAO::String_Manager rendezvous_point;
   CORBA::Short priority;
 };
 
@@ -107,22 +110,19 @@ class TAO_UIOPEndpointSequence;
 
 typedef
   TAO_VarSeq_Var_T<
-      TAO_UIOPEndpointSequence,
-      TAO_UIOP_Endpoint_Info
+      TAO_UIOPEndpointSequence
     >
   TAO_UIOPEndpointSequence_var;
 
 typedef
   TAO_Seq_Out_T<
-      TAO_UIOPEndpointSequence,
-      TAO_UIOPEndpointSequence_var,
-      TAO_UIOP_Endpoint_Info
+      TAO_UIOPEndpointSequence
     >
   TAO_UIOPEndpointSequence_out;
 
 class TAO_Strategies_Export TAO_UIOPEndpointSequence
   : public
-      TAO_Unbounded_Sequence<
+      TAO::unbounded_value_sequence<
           TAO_UIOP_Endpoint_Info
         >
 {
@@ -132,12 +132,12 @@ public:
   TAO_UIOPEndpointSequence (
       CORBA::ULong max,
       CORBA::ULong length,
-      TAO_UIOP_Endpoint_Info* buffer, 
-      CORBA::Boolean release = 0
+      TAO_UIOP_Endpoint_Info* buffer,
+      CORBA::Boolean release = false
     );
   TAO_UIOPEndpointSequence (const TAO_UIOPEndpointSequence &);
   ~TAO_UIOPEndpointSequence (void);
-  
+
   typedef TAO_UIOPEndpointSequence_var _var_type;
 };
 
@@ -182,6 +182,8 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 5e3db1770bc..a031820d1a8 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "StringSeqC.h"
+#include "tao/StringSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_STRINGSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::StringSeq::StringSeq (void)
 CORBA::StringSeq::StringSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max)
 {}
 
@@ -63,14 +65,14 @@ CORBA::StringSeq::StringSeq (
     char * * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::StringSeq::StringSeq (
     const StringSeq &seq
   )
-  : TAO_Unbounded_String_Sequence
+  : TAO::unbounded_string_sequence
     (seq)
 {}
 
@@ -99,22 +101,7 @@ CORBA::Boolean operator<< (
     const CORBA::StringSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -122,41 +109,9 @@ CORBA::Boolean operator>> (
     CORBA::StringSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 9cfebe0ca70..0142991161a 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRINGSEQ_CH_)
 #define _CORBA_STRINGSEQ_CH_
-  
+
   class StringSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        StringSeq,
-        TAO_SeqElem_String_Manager
+    TAO_VarSeq_Var_T<
+        StringSeq
       >
     StringSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        StringSeq,
-        StringSeq_var,
-        TAO_SeqElem_String_Manager
+    TAO_Seq_Out_T<
+        StringSeq
       >
     StringSeq_out;
-  
+
   class TAO_Export StringSeq
     : public
-        TAO_Unbounded_String_Sequence
+        TAO::unbounded_string_sequence
   {
   public:
     StringSeq (void);
@@ -91,14 +90,14 @@ namespace CORBA
     StringSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
+        char ** buffer,
+        CORBA::Boolean release = false
       );
     StringSeq (const StringSeq &);
     ~StringSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef StringSeq_var _var_type;
   };
 
@@ -137,6 +136,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 5aa6f7ab6db..cdfed84c382 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -8,17 +8,18 @@
 // based implementation, and can neither be used by other kinds of
 // objref nor have a default implementation.
 
-#include "Stub.h"
-#include "Profile.h"
-#include "ORB_Core.h"
-#include "Client_Strategy_Factory.h"
-#include "Transport_Queueing_Strategies.h"
-#include "debug.h"
-#include "Policy_Manager.h"
-#include "SystemException.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/ORB_Core.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/Remote_Object_Proxy_Broker.h"
+#include "tao/Transport_Queueing_Strategies.h"
+#include "tao/debug.h"
+#include "tao/Policy_Manager.h"
+#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Stub.i"
+# include "tao/Stub.i"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
@@ -28,6 +29,7 @@ ACE_RCSID (tao,
            TAO_Stub,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Stub::TAO_Stub (const char *repository_id,
                     const TAO_MProfile &profiles,
@@ -35,9 +37,13 @@ TAO_Stub::TAO_Stub (const char *repository_id,
   : type_id (repository_id)
   , orb_core_ (orb_core)
   , orb_ ()
+  , is_collocated_ (false)
   , servant_orb_ ()
+  , collocated_servant_ (0)
+  , object_proxy_broker_ (the_tao_remote_object_proxy_broker ())
   , base_profiles_ ((CORBA::ULong) 0)
   , forward_profiles_ (0)
+  , forward_profiles_perm_ (0)
   , profile_in_use_ (0)
   , profile_lock_ptr_ (0)
   , profile_success_ (false)
@@ -105,7 +111,8 @@ TAO_Stub::~TAO_Stub (void)
 }
 
 void
-TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
+TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
+                                const CORBA::Boolean permanent_forward)
 {
   // we assume that the profile_in_use_ is being
   // forwarded!  Grab the lock so things don't change.
@@ -113,6 +120,14 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
                      guard,
                      *this->profile_lock_ptr_));
 
+  if (permanent_forward)
+    {
+      // paranoid, reset the bookmark, then clear the forward-stack
+      this->forward_profiles_perm_ = 0;
+
+      this->reset_forward ();
+    }
+
   TAO_MProfile *now_pfiles = this->forward_profiles_;
   if (now_pfiles == 0)
     now_pfiles = &this->base_profiles_;
@@ -120,6 +135,10 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
   ACE_NEW (this->forward_profiles_,
            TAO_MProfile (mprofiles));
 
+  if (permanent_forward)
+    // bookmark the new element at bottom of stack
+    this->forward_profiles_perm_ = this->forward_profiles_;
+
   // forwarded profile points to the new IOR (profiles)
   this->profile_in_use_->forward_to (this->forward_profiles_);
 
@@ -266,7 +285,25 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
   return 0;
 }
 
-
+void
+TAO_Stub::is_collocated (CORBA::Boolean collocated)
+{
+  if (this->is_collocated_ != collocated)
+    {
+      if (collocated &&
+          _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
+        {
+          this->object_proxy_broker_ =
+            _TAO_Object_Proxy_Broker_Factory_function_pointer ();
+        }
+      else
+        {
+          this->object_proxy_broker_ =
+            the_tao_remote_object_proxy_broker ();
+        }
+      this->is_collocated_ = collocated;
+    }
+}
 
 // Quick'n'dirty hash of objref data, for partitioning objrefs into
 // sets.
@@ -292,14 +329,14 @@ TAO_Stub::hash (CORBA::ULong max
 CORBA::Boolean
 TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
 {
-  if (CORBA::is_nil (other_obj) == 1)
-    return 0;
+  if (CORBA::is_nil (other_obj))
+    return false;
 
-  TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_;
-  TAO_Profile *this_profile = this->profile_in_use_;
+  TAO_Profile * const other_profile = other_obj->_stubobj ()->profile_in_use_;
+  TAO_Profile * const this_profile = this->profile_in_use_;
 
   if (other_profile == 0 || this_profile == 0)
-    return 0;
+    return false;
 
   // Compare the profiles
   return this_profile->is_equivalent (other_profile);
@@ -325,7 +362,7 @@ TAO_Stub::_decr_refcnt (void)
 TAO_Profile *
 TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
 {
-  TAO_Profile *old = this->profile_in_use_;
+  TAO_Profile *const old = this->profile_in_use_;
 
   // Since we are actively using this profile we dont want
   // it to disappear, so increase the reference count by one!!
@@ -363,7 +400,6 @@ TAO_Stub::forward_back_one (void)
       from->get_current_profile ()->forward_to (0);
       this->forward_profiles_ = from;
     }
-
 }
 
 
@@ -581,3 +617,65 @@ TAO_Stub::transport_queueing_strategy (void)
   return this->orb_core_->default_transport_queueing_strategy ();
 }
 
+CORBA::Boolean
+TAO_Stub::marshal (TAO_OutputCDR &cdr)
+{
+  // do as many outside of locked else-branch as posssible
+
+  // STRING, a type ID hint
+  if ((cdr << this->type_id.in()) == 0)
+    return 0;
+
+  if ( ! this->forward_profiles_perm_)
+    {
+      const TAO_MProfile& mprofile = this->base_profiles_;
+
+      CORBA::ULong profile_count = mprofile.profile_count ();
+      if ((cdr << profile_count) == 0)
+        return 0;
+
+    // @@ The MProfile should be locked during this iteration, is there
+    // anyway to achieve that?
+    for (CORBA::ULong i = 0; i < profile_count; ++i)
+      {
+        const TAO_Profile* p = mprofile.get_profile (i);
+        if (p->encode (cdr) == 0)
+          return 0;
+      }
+    }
+  else
+    {
+        ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+                                guard,
+                                *this->profile_lock_ptr_,
+                                0));
+
+      ACE_ASSERT(this->forward_profiles_ !=0);
+
+      // paranoid - in case of FT the basic_profiles_ would do, too,
+      // but might be dated
+      const TAO_MProfile& mprofile =
+          this->forward_profiles_perm_
+        ? *(this->forward_profiles_perm_)
+        : this->base_profiles_;
+
+      CORBA::ULong profile_count = mprofile.profile_count ();
+      if ((cdr << profile_count) == 0)
+           return 0;
+
+      // @@ The MProfile should be locked during this iteration, is there
+      // anyway to achieve that?
+      for (CORBA::ULong i = 0; i < profile_count; ++i)
+        {
+          const TAO_Profile* p = mprofile.get_profile (i);
+          if (p->encode (cdr) == 0)
+            return 0;
+        }
+
+      // release ACE_Lock
+    }
+
+  return (CORBA::Boolean) cdr.good_bit ();
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index ee0a989a50a..63b302b5ebc 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -33,13 +33,17 @@
 # undef IOR
 #endif /* HPUX && IOR */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
+class TAO_Abstract_ServantBase;
 class TAO_Policy_Set;
 class TAO_Profile;
 
 namespace TAO
 {
   class ObjectKey;
+  class Object_Proxy_Broker;
   class Transport_Queueing_Strategy;
 }
 
@@ -147,6 +151,8 @@ public:
   /// Obtain a pointer to the forwarded profile set
   const TAO_MProfile *forward_profiles (void) const;
 
+  /// True if permanent location forward occured, in this case the lock must be set and the
+
   // Manage forward and base profiles.
   /**
    * THREAD SAFE.  If forward_profiles is null then this will
@@ -184,9 +190,15 @@ public:
   /**
    * THREAD SAFE.
    * Set the forward_profiles.  This object will assume ownership of
-   * this TAO_MProfile object!!
+   * this TAO_MProfile object!!  if permanent_forward is true,
+   * currently used profiles will be replaced permanently, otherwise
+   * stub may fallback to current profiles later.  The flag
+   * permanent_forward=true is only valid if currently used profile
+   * set represents a GroupObject (IOGR), otherwise this flag will be
+   * ignored.
    */
-  void add_forward_profiles (const TAO_MProfile &mprofiles);
+  void add_forward_profiles (const TAO_MProfile &mprofiles,
+                             const CORBA::Boolean permanent_forward=false);
 
   /**
    * THREAD SAFE
@@ -198,6 +210,12 @@ public:
   /// Accessor.
   TAO_ORB_Core* orb_core (void) const;
 
+  /// Is this stub collocated with the servant?
+  CORBA::Boolean is_collocated (void) const;
+
+  /// Mutator to mark this stub as being collocated with the servant.
+  void is_collocated (CORBA::Boolean);
+
   /// This returns a duplicated ORB pointer.
   CORBA::ORB_ptr servant_orb_ptr (void);
 
@@ -212,6 +230,22 @@ public:
    */
   void servant_orb (CORBA::ORB_ptr orb);
 
+  /// Mutator for setting the servant in collocated cases.
+  void collocated_servant (TAO_Abstract_ServantBase* servant);
+
+  /// Accessor for the servant reference in collocated cases.
+  TAO_Abstract_ServantBase* collocated_servant (void) const;
+
+  /// Mutator for setting the object proxy broker pointer.
+  /// CORBA::Objects using this stub will use this for standard calls
+  /// like is_a; get_interface; etc...
+  void object_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker);
+
+  /// Accessor for getting the object proxy broker pointer.
+  /// CORBA::Objects using this stub use this for standard calls
+  /// like is_a; get_interface; etc...
+  TAO::Object_Proxy_Broker *object_proxy_broker (void) const;
+
   /**
    * Create the IOP::IOR info. We will create the info at most once.
    * Get the index of the profile we are using to make the invocation.
@@ -233,6 +267,10 @@ public:
    * collocation opportunities that are available to the ORB.
    */
   CORBA::Boolean optimize_collocation_objects (void) const;
+
+  // needed to avoid copying forward_profiles for thread safety
+  CORBA::Boolean marshal (TAO_OutputCDR&);
+
 protected:
 
   /// Destructor is to be called only through _decr_refcnt() to
@@ -273,8 +311,8 @@ private:
 private:
 
   // = Disallow copy construction and assignment.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
+  TAO_Stub (const TAO_Stub &);
+  TAO_Stub &operator = (const TAO_Stub &);
 
 protected:
   /// Automatically manage the ORB_Core reference count
@@ -300,6 +338,10 @@ protected:
    */
   CORBA::ORB_var orb_;
 
+  /// Flag that indicates that this stub is collocated (and that it
+  /// belongs to an ORB for which collocation optimisation is active).
+  CORBA::Boolean is_collocated_;
+
   /**
    * If this stub refers to a collocated object then we need to hold on to
    * the servant's ORB (which may be different from the client ORB) so that,
@@ -309,6 +351,18 @@ protected:
    */
   CORBA::ORB_var servant_orb_;
 
+  /// Servant pointer.  It is 0 except for collocated objects.
+  TAO_Abstract_ServantBase *collocated_servant_;
+
+  /// Pointer to the Proxy Broker
+  /**
+    * This cached pointer instance takes care of routing the call for
+    * standard calls in CORBA::Object like _is_a (), _get_component
+    * () etc.
+    */
+  TAO::Object_Proxy_Broker *object_proxy_broker_;
+
+
   /// Ordered list of profiles for this object.
   TAO_MProfile base_profiles_;
 
@@ -316,6 +370,10 @@ protected:
   /// linked list of TAO_MProfile objects.
   TAO_MProfile *forward_profiles_;
 
+  // The bookmark indicating permanent forward occured,
+  // the pointer is used to indentify bottom of stack forward_profiles_
+  TAO_MProfile *forward_profiles_perm_;
+
   /// This is the profile that we are currently sending/receiving with.
   TAO_Profile *profile_in_use_;
 
@@ -383,6 +441,8 @@ protected:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Stub.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 4f11130af6b..51bc7a28e27 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -2,6 +2,10 @@
 //
 // $Id$
 
+#include "tao/ORB_Core.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 TAO_Stub::reset_base (void)
 {
@@ -65,7 +69,8 @@ TAO_Stub::next_forward_profile (void)
   TAO_Profile *pfile_next = 0;
 
   while (this->forward_profiles_
-         && (pfile_next = this->forward_profiles_->get_next ()) == 0)
+         && (pfile_next = this->forward_profiles_->get_next ()) == 0
+         && this->forward_profiles_ != this->forward_profiles_perm_)  // do not remove permanent forward from bottom of stack
     // that was the last profile.  Now we clean up our forward profiles.
     // since we own the forward MProfiles, we must delete them when done.
     this->forward_back_one ();
@@ -76,23 +81,62 @@ TAO_Stub::next_forward_profile (void)
 ACE_INLINE TAO_Profile *
 TAO_Stub::next_profile_i (void)
 {
-
   TAO_Profile *pfile_next = 0;
-  if (this->forward_profiles_)
-    {
-      pfile_next = this->next_forward_profile ();
+
+  // First handle the case that a permanent forward occured
+  if (this->forward_profiles_perm_) // the permanent forward defined
+                                    // at bottom of stack
+                                    // forward_profiles_
+	{
+      // In case of permanent forward the base_profiles are ingored.
+
+	  pfile_next = this->next_forward_profile ();
+
       if (pfile_next == 0)
+        {
+          // COND: this->forward_profiles_ == this->forward_profiles_perm_
+
+          // reached end of list of permanent forward profiles
+          // now, reset forward_profiles_perm_
+
+          this->forward_profiles_->rewind ();
+          this->profile_success_ = false;
+          this->set_profile_in_use_i (this->forward_profiles_->get_next());
+	    }
+	  else
+		  this->set_profile_in_use_i (pfile_next);
+
+      // We may have been forwarded to / from a collocated situation
+      // Check for this and apply / remove optimisation if required.
+      this->orb_core_->reinitialize_object (this);
+                
+	  return pfile_next;
+	}
+  else 
+    {
+      if (this->forward_profiles_) // Now do the common operation
+        {
+          pfile_next = this->next_forward_profile ();
+          if (pfile_next == 0)
+            {
+              // Fall back to base profiles
+              pfile_next = this->base_profiles_.get_next ();
+            }
+
+          // We may have been forwarded to / from a collocated situation
+          // Check for this and apply / remove optimisation if required.
+          this->orb_core_->reinitialize_object (this);
+        }
+      else
         pfile_next = this->base_profiles_.get_next ();
-    }
-  else
-    pfile_next = this->base_profiles_.get_next ();
 
-  if (pfile_next == 0)
-    this->reset_base ();
-  else
-    this->set_profile_in_use_i (pfile_next);
+      if (pfile_next == 0)
+        this->reset_base ();
+      else
+        this->set_profile_in_use_i (pfile_next);
 
-  return pfile_next;
+      return pfile_next;
+   }
 }
 
 ACE_INLINE TAO_Profile *
@@ -133,6 +177,10 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles)
                             0));
 
   // first reset things so we start from scratch!
+
+  // @note This reset forward could effect the collocation status
+  // but as this method is only used from the Stub ctr, when the status
+  // is already correctly set, we don't reinitialise here. sm.
   this->reset_forward ();
   this->base_profiles_.set (mprofiles);
   this->reset_base ();
@@ -150,15 +198,20 @@ TAO_Stub::next_profile_retry (void)
 
   if (this->profile_success_ && this->forward_profiles_)
     {
+      // We have a forwarded reference that we have managed to *send* a message to
+      // previously in the remote path only (but not counting object proxy broker ops).
+      // @todo I can see little sense to this. It is at best highly inconsistent. sm.
+
+      // In this case we are falling back from the forwarded IOR stright to the base IOR
       this->reset_profiles_i ();
-      return 1;
+      return true;
     }
   else if (this->next_profile_i ())
     {
-      return 1;
+      return true;
     }
 
-  return 0;
+  return false;
 #if 0
   else
     {
@@ -171,10 +224,10 @@ TAO_Stub::next_profile_retry (void)
       // If the service is loaded and has a profile then try it.
       if (prof)
         {
-          return 1;
+          return true;
         }
       this->reset_profiles_i ();
-      return 0;
+      return false;
     }
 #endif /*If 0 */
 }
@@ -197,6 +250,12 @@ TAO_Stub::forward_profiles (void) const
   return this->forward_profiles_;
 }
 
+ACE_INLINE CORBA::Boolean
+TAO_Stub::is_collocated (void) const
+{
+  return this->is_collocated_;
+}
+
 ACE_INLINE TAO_ORB_Core*
 TAO_Stub::orb_core (void) const
 {
@@ -223,6 +282,30 @@ TAO_Stub::servant_orb (CORBA::ORB_ptr orb)
   this->servant_orb_ = CORBA::ORB::_duplicate (orb);
 }
 
+ACE_INLINE TAO_Abstract_ServantBase *
+TAO_Stub::collocated_servant (void) const
+{
+  return collocated_servant_;
+}
+
+ACE_INLINE void
+TAO_Stub::collocated_servant (TAO_Abstract_ServantBase * servant)
+{
+  this->collocated_servant_ = servant;
+}
+
+ACE_INLINE TAO::Object_Proxy_Broker *
+TAO_Stub::object_proxy_broker (void) const
+{
+  return this->object_proxy_broker_;
+}
+
+ACE_INLINE void
+TAO_Stub::object_proxy_broker (TAO::Object_Proxy_Broker * object_proxy_broker)
+{
+  this->object_proxy_broker_ = object_proxy_broker;
+}
+
 ACE_INLINE void
 TAO_Stub::destroy (void)
 {
@@ -313,3 +396,5 @@ TAO_Stub_Auto_Ptr::operator *() const
   // @@ Potential problem if this->p_ is zero!
   return *this->get ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp
index 8540e33e402..4c76edc15c9 100644
--- a/TAO/tao/Stub_Factory.cpp
+++ b/TAO/tao/Stub_Factory.cpp
@@ -1,13 +1,15 @@
 // $Id$
-#include "Stub_Factory.h"
-#include "ace/Dynamic_Service.h"
+
+#include "tao/Stub_Factory.h"
 
 ACE_RCSID (tao,
            TAO_Stub_Factory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Stub_Factory::~TAO_Stub_Factory (void)
 {
-  // No-Op.
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index 4effc5450ac..ef42462eac1 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -19,15 +19,19 @@
 #define TAO_STUB_FACTORY_H_
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
 
-#include "tao/TAO_Export.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references
 class TAO_MProfile;
@@ -52,7 +56,7 @@ namespace CORBA
 class TAO_Export TAO_Stub_Factory : public ACE_Service_Object
 {
 public:
-  // -- Ctor/Dtor --
+  /// Destructor.
   virtual ~TAO_Stub_Factory (void);
 
   /// Creates a Stub Object.
@@ -62,5 +66,7 @@ public:
                                  ACE_ENV_ARG_DECL) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_STUB_FACTORY_H_ */
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index f3fe9829901..b4a1fa1bfec 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -1,22 +1,22 @@
 // $Id$
 
-#include "Synch_Invocation.h"
-#include "Profile_Transport_Resolver.h"
-#include "Profile.h"
-#include "Synch_Reply_Dispatcher.h"
-#include "Transport.h"
-#include "Stub.h"
-#include "Bind_Dispatcher_Guard.h"
-#include "operation_details.h"
-#include "Wait_Strategy.h"
-#include "debug.h"
-#include "ORB_Constants.h"
-#include "Messaging_SyncScopeC.h"
-#include "ORB_Core.h"
-#include "Service_Context.h"
+#include "tao/Synch_Invocation.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/Profile.h"
+#include "tao/Synch_Reply_Dispatcher.h"
+#include "tao/Transport.h"
+#include "tao/Stub.h"
+#include "tao/Bind_Dispatcher_Guard.h"
+#include "tao/operation_details.h"
+#include "tao/Wait_Strategy.h"
+#include "tao/debug.h"
+#include "tao/ORB_Constants.h"
+#include "tao/Messaging_SyncScopeC.h"
+#include "tao/ORB_Core.h"
+#include "tao/Service_Context.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "PortableInterceptorC.h"
+# include "tao/PortableInterceptorC.h"
 #endif /*TAO_HAS_INTERCEPTORS */
 
 #include "ace/Auto_Ptr.h"
@@ -24,7 +24,7 @@
 #include "ace/Countdown_Time.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Synch_Invocation.inl"
+# include "tao/Synch_Invocation.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -33,6 +33,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Synch_Twoway_Invocation::Synch_Twoway_Invocation (
@@ -79,9 +81,11 @@ namespace TAO
     ACE_TRY
       {
         TAO_OutputCDR &cdr = this->resolver_.transport ()->out_stream ();
-#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1
-        OutputCDR_Auto_Reset cdr_reset(cdr);
-#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */
+
+        cdr.message_attributes (this->details_.request_id (),
+                                this->resolver_.stub (),
+                                TAO_Transport::TAO_TWOWAY_REQUEST,
+                                max_wait_time);
 
         this->write_header (tspec,
                             cdr
@@ -92,7 +96,6 @@ namespace TAO
                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
         TAO_Bind_Dispatcher_Guard dispatch_guard (
@@ -338,7 +341,7 @@ namespace TAO
           {
             (void) bd.unbind_dispatcher ();
             this->resolver_.transport ()->close_connection ();
-            
+
             ACE_TRY
               {
                 return
@@ -403,6 +406,36 @@ namespace TAO
       case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
         return this->location_forward (cdr
                                        ACE_ENV_ARG_PARAMETER);
+      case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM:
+        {
+          // Unmarshal the location forward object and set the
+          // variable this->forward_to_.
+          const Invocation_Status s
+            = this->location_forward (cdr
+                                      ACE_ENV_ARG_PARAMETER);
+          if (s != TAO_INVOKE_FAILURE)
+            {
+              // de-marshalling of permanent object reference was successfull
+              const CORBA::Boolean permanent_forward_condition =
+                this->orb_core ()->is_permanent_forward_condition
+                  (this->forwarded_to_.in (),
+                   this->request_service_context ());
+
+              if (!permanent_forward_condition)
+                {
+                   // permanent condition not given
+                    if (TAO_debug_level > 3)
+                        ACE_DEBUG ((LM_DEBUG,
+                               "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);
+                }
+            }
+
+          return s;
+        }
       case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
         return this->handle_user_exception (cdr
                                             ACE_ENV_ARG_PARAMETER);
@@ -621,7 +654,7 @@ namespace TAO
       }
 
     CORBA::SystemException *ex =
-      TAO_Exceptions::create_system_exception (type_id.in ());
+      TAO::create_system_exception (type_id.in ());
 
     if (ex == 0)
       {
@@ -704,12 +737,14 @@ namespace TAO
       this->resolver_.transport ();
 
     TAO_OutputCDR &cdr = transport->out_stream ();
-#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1
-    OutputCDR_Auto_Reset cdr_reset(cdr);
-#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */
 
     ACE_TRY
       {
+        cdr.message_attributes (this->details_.request_id (),
+                                this->resolver_.stub (),
+                                TAO_Transport::TAO_ONEWAY_REQUEST,
+                                max_wait_time);
+
         this->write_header (tspec,
                             cdr
                             ACE_ENV_ARG_PARAMETER);
@@ -787,3 +822,5 @@ namespace TAO
     return s;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index b4ff18b1a1a..e3441f6b7be 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -22,10 +22,15 @@
 
 #include "tao/SystemException.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Operation_Details;
 class TAO_Synch_Reply_Dispatcher;
 class TAO_InputCDR;
-class ACE_Time_Value;
 class TAO_Bind_Dispatcher_Guard;
 
 namespace TAO
@@ -200,6 +205,7 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/Synch_Invocation.inl"
diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl
index ccf61f981f2..649d3245412 100644
--- a/TAO/tao/Synch_Invocation.inl
+++ b/TAO/tao/Synch_Invocation.inl
@@ -1,5 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE
@@ -22,3 +26,5 @@ namespace TAO
     this->status_ = s;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 58cbf2afb3e..f72ae27e1b4 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,8 +1,8 @@
 // "$Id$"
 
-#include "Synch_Queued_Message.h"
-#include "debug.h"
-#include "ORB_Core.h"
+#include "tao/Synch_Queued_Message.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/Malloc_T.h"
 #include "ace/Message_Block.h"
@@ -11,11 +11,13 @@ ACE_RCSID (tao,
            Synch_Queued_Message,
            "$Id$")
 
-TAO_Synch_Queued_Message::
-    TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
-                              TAO_ORB_Core *oc,
-                              ACE_Allocator *alloc,
-                              int is_heap_allocated)
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
+  const ACE_Message_Block *contents,
+  TAO_ORB_Core *oc,
+  ACE_Allocator *alloc,
+  int is_heap_allocated)
   : TAO_Queued_Message (oc, alloc, is_heap_allocated)
   , contents_ (const_cast<ACE_Message_Block*> (contents))
   , current_block_ (contents_)
@@ -61,7 +63,7 @@ TAO_Synch_Queued_Message::fill_iov (int iovcnt_max,
        message_block != 0 && iovcnt < iovcnt_max;
        message_block = message_block->cont ())
     {
-      size_t message_block_length = message_block->length ();
+      size_t const message_block_length = message_block->length ();
 
       // Check if this block has any data to be sent.
       if (message_block_length > 0)
@@ -149,7 +151,7 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
   // Set the flag to indicate that <qm> is created on the heap.
   if (qm)
     {
-      qm->is_heap_created_ = 1;
+      qm->is_heap_created_ = true;
     }
 
   return qm;
@@ -178,3 +180,5 @@ TAO_Synch_Queued_Message::destroy (void)
         }
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index f587c87e816..09b96f3b6ba 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Queued_Message.h"
+#include "tao/Queued_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Synch_Queued_Message
  *
@@ -90,6 +92,8 @@ private:
   ACE_Message_Block *current_block_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index d901b7b93e3..9dbdcb0eabd 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -1,15 +1,17 @@
 // $Id$
 
-#include "Synch_Reply_Dispatcher.h"
-#include "ORB_Core.h"
-#include "Pluggable_Messaging_Utils.h"
-#include "debug.h"
+#include "tao/Synch_Reply_Dispatcher.h"
+#include "tao/ORB_Core.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/debug.h"
 
 
 ACE_RCSID (tao,
            Synch_Reply_Dispatcher,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (
     TAO_ORB_Core *orb_core,
@@ -57,8 +59,8 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
 
   // 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 ();
+  CORBA::ULong const max = params.svc_ctx_.maximum ();
+  CORBA::ULong const 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);
 
@@ -67,30 +69,40 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
   //this->message_state_.reset (0);
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
-
-  if (db == 0)
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply "
-                      "clone_from failed \n"));
-        }
-      return -1;
-    }
-
-  // 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 (),
+  if (ACE_BIT_DISABLED ((*params.input_cdr_).start()->data_block()->flags(),
                         ACE_Message_Block::DONT_DELETE))
-    {
-      db->release ();
-    }
+  {
+    // Data block is on the heap, so just duplicate it.
+    this->reply_cdr_ = *params.input_cdr_;
+    this->reply_cdr_.clr_mb_flags( ACE_Message_Block::DONT_DELETE );
+  }
+  else
+  {
+    ACE_Data_Block *db =
+      this->reply_cdr_.clone_from (*params.input_cdr_);
+
+    if (db == 0)
+      {
+        if (TAO_debug_level > 2)
+          {
+            ACE_ERROR ((LM_ERROR,
+                        "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply "
+                        "clone_from failed \n"));
+          }
+        return -1;
+      }
+
+    // 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 ();
+      }
+  }
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
                        this->orb_core_->leader_follower ());
@@ -104,3 +116,5 @@ TAO_Synch_Reply_Dispatcher::connection_closed (void)
   this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
                        this->orb_core_->leader_follower ());
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index 6774d5c2d87..c22e515cd47 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *   Dispatch the reply appropriately.
- *
+ *  Dispatch the reply appropriately.
  *
  *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
  */
@@ -27,6 +26,8 @@
 #include "tao/LF_Invocation_Event.h"
 #include "tao/CDR.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Pluggable_Reply_Params;
 
 namespace IOP
@@ -87,6 +88,8 @@ private:
   TAO_InputCDR reply_cdr_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 02f3925f834..c8954819592 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "SystemException.h"
-#include "Environment.h"
-#include "ORB_Constants.h"
-#include "CORBA_String.h"
-#include "CDR.h"
-#include "debug.h"
-#include "AnyTypeCode_Adapter.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Constants.h"
+#include "tao/CORBA_String.h"
+#include "tao/CDR.h"
+#include "tao/debug.h"
+#include "tao/AnyTypeCode_Adapter.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
@@ -30,6 +30,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @name @c errno Encoding
  *
@@ -814,9 +816,11 @@ CORBA::SystemException::_tao_get_omg_exception_description (
   return "*unknown description*";
 }
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 // List of standard/system exceptions ... used to create static
 // storage for their typecodes, then later to initialize that storage
@@ -877,6 +881,7 @@ static const char *repo_id_array[] = {
 static const CORBA::ULong array_sz =
   (sizeof (repo_id_array) / sizeof (char const *)) - 1;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::excp_factory excp_array [] = {
 #define TAO_SYSTEM_EXCEPTION(name) \
@@ -931,7 +936,7 @@ STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
 CORBA::SystemException *
-TAO_Exceptions::create_system_exception (const char *id)
+TAO::create_system_exception (const char *id)
 {
   for (CORBA::ULong i = 0; i < array_sz; ++i)
     {
@@ -975,3 +980,5 @@ CORBA::name ::_tao_create (void) \
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 54a7b4dcf49..2a343346d3a 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -29,12 +29,14 @@
 #include "tao/Exception.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
@@ -236,6 +238,7 @@ namespace CORBA
 
 } // End CORBA namespace
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/SystemException.inl"
diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl
index 9366410df75..25409d98218 100644
--- a/TAO/tao/SystemException.inl
+++ b/TAO/tao/SystemException.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 CORBA::SystemException::minor (void) const
 {
@@ -110,3 +112,5 @@ CORBA::name ::_tao_any_destructor (void * x) \
 
 TAO_STANDARD_SYSTEM_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index 74fd3f7979c..db7dd9b348a 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -28,9 +28,9 @@
 #ifndef TAO_TAO_IDL
 #define TAO_TAO_IDL
 
-#include "Policy.pidl"
-#include "TimeBase.pidl"
-#include "Messaging_SyncScope.pidl"
+#include "tao/Policy.pidl"
+#include "tao/TimeBase.pidl"
+#include "tao/Messaging_SyncScope.pidl"
 
 #pragma prefix "tao"
 
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 9ec2b85fff5..4e6e3e361c9 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -29,23 +29,25 @@
 // be\be_codegen.cpp:277
 
 
-#include "TAOC.h"
+#include "tao/TAOC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 TAO::BufferingConstraint::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -73,7 +75,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release (
     TAO::BufferingConstraintPolicy_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 TAO::BufferingConstraintPolicy_ptr
@@ -84,7 +86,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void)
 
 CORBA::Boolean
 TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal (
-    TAO::BufferingConstraintPolicy_ptr p,
+    const TAO::BufferingConstraintPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
 {
@@ -122,18 +124,18 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
 TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 TAO::BufferingConstraintPolicy::_tao_release (BufferingConstraintPolicy_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -206,3 +208,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.message_count) &&
     (strm >> _tao_aggregate.message_bytes);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 72e9467c9ef..09119762180 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -60,84 +60,86 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct BufferingConstraint;
-  
+
   typedef
     TAO_Fixed_Var_T<
         BufferingConstraint
       >
     BufferingConstraint_var;
-  
+
   typedef
     BufferingConstraint &
     BufferingConstraint_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:57
-  
+
   struct TAO_Export BufferingConstraint
   {
     typedef BufferingConstraint_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO::BufferingConstraintMode mode;
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
-  
+
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         BufferingConstraintPolicy
       >
     BufferingConstraintPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         BufferingConstraintPolicy
@@ -145,106 +147,106 @@ namespace TAO
     BufferingConstraintPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-  
+
   class TAO_Export BufferingConstraintPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef BufferingConstraintPolicy_ptr _ptr_type;
     typedef BufferingConstraintPolicy_var _var_type;
-    
+
     // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-    
+
     static void _tao_release (BufferingConstraintPolicy_ptr obj);
-    
+
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static BufferingConstraintPolicy_ptr _nil (void)
     {
       return static_cast<BufferingConstraintPolicy_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::TAO::BufferingConstraint buffering_constraint (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     BufferingConstraintPolicy (void);
-    
+
     virtual ~BufferingConstraintPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
-    
+
     void operator= (const BufferingConstraintPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
@@ -261,7 +263,7 @@ namespace TAO
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
   {
@@ -273,7 +275,7 @@ namespace TAO
       );
     static ::TAO::BufferingConstraintPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::TAO::BufferingConstraintPolicy_ptr p,
+        const ::TAO::BufferingConstraintPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -290,6 +292,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1028
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 0a463afe0e3..d288fbf7e6c 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -1,24 +1,24 @@
 // $Id$
 
-#include "TAO_Internal.h"
-#include "default_server.h"
-#include "default_client.h"
-#include "default_resource.h"
-#include "IIOP_Factory.h"
-#include "MCAST_Parser.h"
-#include "CORBANAME_Parser.h"
-#include "CORBALOC_Parser.h"
-#include "FILE_Parser.h"
-#include "DLL_Parser.h"
-#include "ORB_Core.h"
-#include "Adapter_Factory.h"
-#include "Default_Stub_Factory.h"
-#include "Default_Endpoint_Selector_Factory.h"
-#include "Default_Protocols_Hooks.h"
-#include "Default_Thread_Lane_Resources_Manager.h"
-#include "Default_Collocation_Resolver.h"
-#include "debug.h"
-#include "StringSeqC.h"
+#include "tao/TAO_Internal.h"
+#include "tao/default_server.h"
+#include "tao/default_client.h"
+#include "tao/default_resource.h"
+#include "tao/IIOP_Factory.h"
+#include "tao/MCAST_Parser.h"
+#include "tao/CORBANAME_Parser.h"
+#include "tao/CORBALOC_Parser.h"
+#include "tao/FILE_Parser.h"
+#include "tao/DLL_Parser.h"
+#include "tao/ORB_Core.h"
+#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/debug.h"
+#include "tao/StringSeqC.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
@@ -87,6 +87,8 @@ namespace
     TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 {
@@ -161,7 +163,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           ACE::debug (1);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter
+      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT ("-ORBDebugLevel"))))
         {
           TAO_debug_level =
@@ -181,7 +183,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           arg_shifter.consume_arg ();
         }
       // Continue with flags that accept parameters.
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"))))
         {
           len = svc_config_argv.length ();
           svc_config_argv.length (len + 2);  // 2 arguments to add
@@ -195,7 +197,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
         {
           // Specify the name of the svc.conf file to be used.
 
@@ -229,7 +231,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 
           arg_shifter.consume_arg();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
         {
           len = svc_config_argv.length ();
           svc_config_argv.length (len + 2);  // 2 arguments to add
@@ -278,6 +280,8 @@ TAO::ORB::default_svc_conf_entries (char const * rf_args,
   client_strategy_factory_args = csf_args;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // -----------------------------------------------------
 namespace
 {
@@ -317,8 +321,10 @@ namespace
     //
     // where PN is the name of your protocol and LIB is the base
     // name of the shared library that implements the protocol.
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
     ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_IIOP_Protocol_Factory);
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
 
     // add descriptor to list of static objects.
     ACE_Service_Config::process_directive (
@@ -436,3 +442,4 @@ namespace
   }
 }
 
+// TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- ended prior to anonymous namespace.
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index f814c3a8c2d..e528980821c 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -17,12 +17,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-all.h"
+#include "tao/orbconf.h"
+#include "tao/Versioned_Namespace.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -63,6 +65,7 @@ namespace TAO
 
   }
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index c7075d34bf7..726825d5dcc 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -1,24 +1,24 @@
 // $Id$
 
-#include "TAO_Server_Request.h"
-#include "ORB_Core.h"
-#include "Timeprobe.h"
-#include "debug.h"
-#include "Pluggable_Messaging.h"
-#include "GIOP_Utils.h"
-#include "Stub.h"
-#include "operation_details.h"
-#include "Transport.h"
-#include "CDR.h"
-#include "SystemException.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Timeprobe.h"
+#include "tao/debug.h"
+#include "tao/Pluggable_Messaging.h"
+#include "tao/GIOP_Utils.h"
+#include "tao/Stub.h"
+#include "tao/operation_details.h"
+#include "tao/Transport.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "PortableInterceptorC.h"
-#include "ServerRequestInterceptor_Adapter.h"
+#include "tao/PortableInterceptorC.h"
+#include "tao/ServerRequestInterceptor_Adapter.h"
 #endif
 
 #if !defined (__ACE_INLINE__)
-# include "TAO_Server_Request.i"
+# include "tao/TAO_Server_Request.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
@@ -46,6 +46,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
                                       TAO_InputCDR &input,
                                       TAO_OutputCDR &output,
@@ -160,7 +162,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 {
   // Have to use a const_cast<>.  *sigh*
-  this->profile_.object_key (const_cast<TAO::ObjectKey &> (target->_stubobj ()->object_key ()));
+  this->profile_.object_key (
+    const_cast<TAO::ObjectKey &> (target->_stubobj ()->object_key ()));
 
   // Shallow copy the request service context list. This way the operation
   // details and server request share the request context.
@@ -224,7 +227,8 @@ TAO_ServerRequest::reply_service_context (void)
   }
   else
   {
-    return const_cast <TAO_Operation_Details*> (this->operation_details_)->reply_service_context ();
+    return const_cast <TAO_Operation_Details*> (
+      this->operation_details_)->reply_service_context ();
   }
 }
 
@@ -259,7 +263,14 @@ TAO_ServerRequest::init_reply (void)
   // Forward exception only.
   if (!CORBA::is_nil (this->forward_location_.in ()))
     {
-      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
+      CORBA::Boolean const permanent_forward_condition =
+        this->orb_core_->is_permanent_forward_condition (this->forward_location_.in (),
+                                                         this->request_service_context ());
+
+      reply_params.reply_status_
+        = permanent_forward_condition
+        ? TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM
+        : TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
     }
   // Any exception at all.
   else if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
@@ -271,12 +282,19 @@ TAO_ServerRequest::init_reply (void)
       reply_params.reply_status_ = this->exception_type_;
     }
 
+
+  this->outgoing_->message_attributes (this->request_id_,
+                                       0,
+                                       TAO_Transport::TAO_REPLY,
+                                       0);
+
   // Construct a REPLY header.
   this->mesg_base_->generate_reply_header (*this->outgoing_,
                                            reply_params);
 
   // Finish the GIOP Reply header, then marshal the exception.
-  if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD)
+  if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD ||
+      reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM)
     {
       // Marshal the forward location pointer.
       CORBA::Object_ptr object_ptr = this->forward_location_.in ();
@@ -313,10 +331,17 @@ TAO_ServerRequest::send_no_exception_reply (void)
   // No data anyway.
   reply_params.argument_flag_ = 0;
 
+  this->outgoing_->message_attributes (this->request_id_,
+                                       0,
+                                       TAO_Transport::TAO_REPLY,
+                                       0);
+
   // Construct a REPLY header.
   this->mesg_base_->generate_reply_header (*this->outgoing_,
                                            reply_params);
 
+  this->outgoing_->more_fragments (false);
+
   // Send the message.
   int result = this->transport_->send_message (*this->outgoing_,
                                                0,
@@ -343,6 +368,8 @@ TAO_ServerRequest::tao_send_reply (void)
   if (this->collocated ())
     return;  // No transport in the collocated case.
 
+  this->outgoing_->more_fragments (false);
+
   int result = this->transport_->send_message (*this->outgoing_,
                                                0,
                                                TAO_Transport::TAO_REPLY);
@@ -362,7 +389,6 @@ TAO_ServerRequest::tao_send_reply (void)
 void
 TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
 {
-  //  int result = 0;
   if (this->response_expected_ && !this->collocated ())
     {
       // A copy of the reply parameters
@@ -403,6 +429,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
                             this->orb_core_->output_cdr_dblock_allocator (),
                             this->orb_core_->output_cdr_msgblock_allocator (),
                             this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
+                            this->mesg_base_->fragmentation_strategy (),
                             TAO_DEF_GIOP_MAJOR,
                             TAO_DEF_GIOP_MINOR);
 
@@ -418,6 +445,8 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
 
         }
 
+      this->outgoing_->more_fragments (false);
+
       // Send the message
       if (this->transport_->send_message (*this->outgoing_,
                                           0,
@@ -464,10 +493,11 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
                         this->orb_core_->output_cdr_dblock_allocator (),
                         this->orb_core_->output_cdr_msgblock_allocator (),
                         this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
+                        this->mesg_base_->fragmentation_strategy (),
                         TAO_DEF_GIOP_MAJOR,
                         TAO_DEF_GIOP_MINOR);
 
-  this->transport_->assign_translators(0,&output);
+  this->transport_->assign_translators (0, &output);
 
   // A copy of the reply parameters
   TAO_Pluggable_Reply_Params_Base reply_params;
@@ -485,6 +515,11 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
   // Make a default reply status
   reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION;
 
+  this->outgoing_->message_attributes (this->request_id_,
+                                       0,
+                                       TAO_Transport::TAO_REPLY,
+                                       0);
+
   // Make the reply message
   if (this->mesg_base_->generate_reply_header (*this->outgoing_,
                                                reply_params) == -1)
@@ -505,6 +540,8 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
                 ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
                 ACE_TEXT ("could not marshal reply\n")));
 
+  this->outgoing_->more_fragments (false);
+
   // Send the message
   if (this->transport_->send_message (*this->outgoing_,
                                       0,
@@ -562,4 +599,6 @@ TAO_ServerRequest::pi_current_copy_callback (void)
   return this->pi_current_copy_callback_;
 }
 
-#endif /*TAO_HAS_INTERCEPTORS*/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 288fd4a2723..c6724852e1b 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -26,20 +26,28 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Tagged_Profile.h"
-#include "Service_Context.h"
-#include "Object.h"
+#include "tao/Tagged_Profile.h"
+#include "tao/Service_Context.h"
+#include "tao/Object.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   class PICurrent;
   class PICurrent_Impl;
   class PICurrent_Copy_Callback;
 }
-#include "PortableInterceptorC.h"
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "tao/PortableInterceptorC.h"
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Pluggable_Messaging;
 class TAO_Transport;
 class TAO_AMH_Response_Handler;
@@ -52,6 +60,14 @@ namespace CORBA
   class Exception;
 }
 
+namespace TAO
+{
+  namespace CSD
+  {
+    class FW_Server_Request_Wrapper;
+  }
+}
+
 class TAO_Operation_Details;
 
 /**
@@ -65,6 +81,12 @@ class TAO_Operation_Details;
 class TAO_Export TAO_ServerRequest
 {
 public:
+  
+  /// Declare FW_Server_Request_Wrapper a friend
+  /// This friendship makes the FW_Server_Request_Wrapper be able to
+  /// clone the TAO_ServerRequest.
+  friend class TAO::CSD::FW_Server_Request_Wrapper;
+
   /// Declare TAO_AMH_Response_Handler a friend
   /**
    * The TAO_AMH_Response_Handler class needs to copy part of the
@@ -319,7 +341,7 @@ private:
   /// Used to pad CDR stream if we have used DSI.
   ptrdiff_t dsi_nvlist_align_;
 
-  TAO_Operation_Details const * const operation_details_;
+  TAO_Operation_Details const * operation_details_;
 
   /**
    * An argument flag to indicate whether there is any data that is
@@ -353,8 +375,10 @@ private:
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "TAO_Server_Request.i"
+# include "tao/TAO_Server_Request.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index a75efcab263..5fc7f50ab9b 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ORB_Core *
 TAO_ServerRequest::orb_core (void) const
 {
@@ -234,3 +236,5 @@ TAO_ServerRequest::reply_status (void)
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index 13ea18bf273..dc8493856a9 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -21,9 +21,7 @@
 #include "tao/TAO_Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           TAO_Singleton,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE, class ACE_LOCK> void
 TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
@@ -206,4 +204,6 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
   TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* TAO_SINGLETON_CPP */
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
index b4c2194f86c..41d27015cb8 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -25,9 +25,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
 #include "ace/Cleanup.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Singleton
  *
@@ -118,6 +122,8 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/TAO_Singleton.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl
index d1d32b6998c..bacacea205e 100644
--- a/TAO/tao/TAO_Singleton.inl
+++ b/TAO/tao/TAO_Singleton.inl
@@ -1,6 +1,10 @@
 // -*- C++ -*-
+//
 // $Id$
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructors.
 //
 // Note: don't explicitly initialize "instance_", because TYPE may not
@@ -15,3 +19,5 @@ template <class TYPE, class ACE_LOCK> ACE_INLINE
 TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index fcacaa78283..8858df813b1 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -28,19 +28,34 @@ ACE_RCSID (tao,
            TAO_Singleton_Manager,
            "$Id$")
 
+
+namespace
+{
+  // Singleton instance pointer.
+  TAO_Singleton_Manager * the_instance = 0;
+}
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer)
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+// Adapter for cleanup, used to register cleanup function with the
+// ACE_Object_Manager.
 extern "C" void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *)
+TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *)
 {
-  if (TAO_Singleton_Manager::instance_)
+#if defined (TAO_HAS_VERSIONED_NAMESPACE) \
+    && TAO_HAS_VERSIONED_NAMESPACE == 1
+  using namespace TAO_VERSIONED_NAMESPACE_NAME;
+#endif  /* TAO_HAS_VERSIONED_NAMESPACE */
+
+  if (the_instance)
     {
       (void) TAO_Singleton_Manager::instance ()->fini ();
     }
 }
 
-TAO_Singleton_Manager *TAO_Singleton_Manager::instance_ = 0;
-
-void *TAO_Singleton_Manager::preallocated_object[
-  TAO_Singleton_Manager::TAO_PREALLOCATED_OBJECTS] = { 0 };
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Singleton_Manager::TAO_Singleton_Manager (void)
   // default_mask_ isn't initialized, because it's defined by <init>.
@@ -55,9 +70,9 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 #endif  /* ACE_HAS_EXCEPTIONS */
 {
   // Be sure that no further instances are created via instance ().
-  if (instance_ == 0)
+  if (the_instance == 0)
     {
-      instance_ = this;
+      the_instance = this;
     }
 
   // @@ This is a hack.  Allow the TAO_Singleton_Manager to be registered
@@ -102,14 +117,14 @@ TAO_Singleton_Manager::instance (void)
   // instances, or before any other threads have been created in the
   // process.  So, it's not thread safe.
 
-  if (instance_ == 0)
+  if (the_instance == 0)
     {
       TAO_Singleton_Manager *instance_pointer;
 
       ACE_NEW_RETURN (instance_pointer,
                       TAO_Singleton_Manager,
                       0);
-      ACE_ASSERT (instance_pointer == instance_);
+      ACE_ASSERT (instance_pointer == the_instance);
 
       instance_pointer->dynamically_allocated_ = 1;
 
@@ -117,7 +132,7 @@ TAO_Singleton_Manager::instance (void)
     }
   else
     {
-      return instance_;
+      return the_instance;
     }
 }
 
@@ -145,7 +160,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
       // initialized.
       this->object_manager_state_ = OBJ_MAN_INITIALIZING;
 
-      if (this == instance_)
+      if (this == the_instance)
         {
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // @@ No MT-specific pre-allocated objects.
@@ -185,7 +200,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
       if (register_with_object_manager == 1
           && ACE_Object_Manager::at_exit (
                this,
-               (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer,
+               (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME,
                0) != 0)
         return -1;
 
@@ -205,7 +220,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
 int
 TAO_Singleton_Manager::fini (void)
 {
-  if (instance_ == 0  ||  this->shutting_down_i ())
+  if (the_instance == 0  ||  this->shutting_down_i ())
     // Too late.  Or, maybe too early.  Either fini () has already
     // been called, or init () was never called.
     return this->object_manager_state_ == OBJ_MAN_SHUT_DOWN  ?  1  :  -1;
@@ -229,18 +244,18 @@ TAO_Singleton_Manager::fini (void)
   // registration.
   this->exit_info_.call_hooks ();
 
-  // Only clean up preallocated objects when the singleton Instance is being
-  // destroyed.
-  if (this == instance_)
-    {
-#if ! defined (ACE_HAS_STATIC_PREALLOCATION)
-      // Cleanup the dynamically preallocated objects.
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      // @@ No MT-specific preallocated objects yet.
-# endif  /* ACE_MT_SAFE */
-      // @@ No preallocated objects yet.
-#endif  /* ! ACE_HAS_STATIC_PREALLOCATION */
-    }
+//   // Only clean up preallocated objects when the singleton Instance is being
+//   // destroyed.
+//   if (this == the_instance)
+//     {
+// #if ! defined (ACE_HAS_STATIC_PREALLOCATION)
+//       // Cleanup the dynamically preallocated objects.
+// # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+//       // @@ No MT-specific preallocated objects yet.
+// # endif  /* ACE_MT_SAFE */
+//       // @@ No preallocated objects yet.
+// #endif  /* ! ACE_HAS_STATIC_PREALLOCATION */
+//     }
 
   delete this-> default_mask_;
   this->default_mask_ = 0;
@@ -266,8 +281,8 @@ TAO_Singleton_Manager::fini (void)
   // Indicate that this TAO_Singleton_Manager instance has been shut down.
   this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
 
-  if (this == instance_)
-    instance_ = 0;
+  if (this == the_instance)
+    the_instance = 0;
 
   if (this->dynamically_allocated_)
     {
@@ -280,16 +295,18 @@ TAO_Singleton_Manager::fini (void)
 int
 TAO_Singleton_Manager::starting_up (void)
 {
-  return TAO_Singleton_Manager::instance_
-    ? instance_->starting_up_i ()
+  return
+    the_instance
+    ? the_instance->starting_up_i ()
     : 1;
 }
 
 int
 TAO_Singleton_Manager::shutting_down (void)
 {
-  return TAO_Singleton_Manager::instance_
-    ? instance_->shutting_down_i ()
+  return
+    the_instance
+    ? the_instance->shutting_down_i ()
     : 1;
 }
 
@@ -320,7 +337,7 @@ TAO_Singleton_Manager::at_exit_i (void *object,
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                             ace_mon,
-                            *instance_->internal_lock_,
+                            *the_instance->internal_lock_,
                             -1));
 
   if (this->shutting_down_i ())
@@ -338,3 +355,5 @@ TAO_Singleton_Manager::at_exit_i (void *object,
 
   return this->exit_info_.at_exit_i (object, cleanup_hook, param);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 891a31ebf0e..8d0313f6cb6 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -28,18 +28,12 @@
 #include "tao/orbconf.h"
 #include "ace/Object_Manager_Base.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_EXCEPTIONS)
 typedef void (*TAO_unexpected_handler)(void);
 #endif  /* ACE_HAS_EXCEPTIONS */
 
-
-/// Adapter for cleanup, used to register cleanup function with the
-/// ACE_Object_Manager.
-extern "C"
-void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
-
-
 /**
  * @class TAO_Singleton_Manager
  *
@@ -59,9 +53,6 @@ TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
  */
 class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base
 {
-
-  friend void TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
-
 public:
   /// Explicitly initialize.
   virtual int init (void);
@@ -86,24 +77,6 @@ public:
   /// See ACE_Object_Manager::shutting_down for more information.
   static int shutting_down (void);
 
-  /// Unique identifiers for preallocated Objects.
-  enum Preallocated_Object
-    {
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      /// @@ No MT-specific preallocated objects (yet).  Remove the
-      ///    below dummy enum once a preallocated object is added.
-      TAO_EMPTY_PREALLOCATED_OBJECT,
-# else
-      /// Without ACE_MT_SAFE, There are no preallocated objects.
-      /// Make sure that the preallocated_array size is at least one
-      /// by declaring this dummy ...
-      TAO_EMPTY_PREALLOCATED_OBJECT,
-# endif /* ACE_MT_SAFE */
-
-      /// This enum value must be last!
-      TAO_PREALLOCATED_OBJECTS
-    };
-
   /// Accesses a default signal set used, for example, in
   /// ACE_Sig_Guard methods.
   static sigset_t *default_mask (void);
@@ -160,13 +133,16 @@ public:
   void _set_unexpected (TAO_unexpected_handler u);
 #endif /* ACE_HAS_EXCEPTIONS */
 
-private:
+protected:
+
   /// Force allocation on the heap.
   //@{
   TAO_Singleton_Manager (void);
   ~TAO_Singleton_Manager (void);
   //@}
 
+private:
+
   /// Disallow copying by not implementing the following ...
   //@{
   TAO_Singleton_Manager (const TAO_Singleton_Manager &);
@@ -178,11 +154,6 @@ private:
   int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param);
 
 private:
-  /// Singleton instance pointer.
-  static TAO_Singleton_Manager *instance_;
-
-  /// Table of preallocated objects.
-  static void *preallocated_object[TAO_PREALLOCATED_OBJECTS];
 
   /// Default signal set used, for example, in ACE_Sig_Guard.
   sigset_t *default_mask_;
@@ -215,6 +186,8 @@ private:
 #endif  /* ACE_HAS_EXCEPTIONS */
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/TAO_Singleton_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl
index f9f0dd141ce..a9c35b8fa13 100644
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ b/TAO/tao/TAO_Singleton_Manager.inl
@@ -2,25 +2,29 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 int
 TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
-                             void *param)
+				void *param)
 {
   return TAO_Singleton_Manager::instance ()->at_exit_i (
     object,
-    (ACE_CLEANUP_FUNC) ace_cleanup_destroyer,
+    (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME,
     param);
 }
 
 ACE_INLINE
 int
 TAO_Singleton_Manager::at_exit (void *object,
-                             ACE_CLEANUP_FUNC cleanup_hook,
-                             void *param)
+				ACE_CLEANUP_FUNC cleanup_hook,
+				void *param)
 {
   return TAO_Singleton_Manager::instance ()->at_exit_i (
     object,
     cleanup_hook,
     param);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index e80f9cab0cc..73ec7175070 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
-#include "TSS_Resources.h"
-#include "GUIResource_Factory.h"
-#include "TAO_Singleton.h"
+#include "tao/TSS_Resources.h"
+#include "tao/GUIResource_Factory.h"
+#include "tao/TAO_Singleton.h"
 
 ACE_RCSID (tao,
            TSS_Resources,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_TSS_Resources::TAO_TSS_Resources (void)
   : poa_current_impl_ (0)
   , rtscheduler_current_impl_ (0)
@@ -45,3 +47,5 @@ template
   TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> *
   TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index a33983a0dc6..251c7a26837 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -27,6 +27,8 @@
 
 #include "tao/Policy_Current_Impl.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 namespace TAO
 {
@@ -58,8 +60,8 @@ private:
 
   /// Do not copy TSS resources
   //@{
-  ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Resources(const TAO_TSS_Resources&))
-  ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_TSS_Resources&))
+  TAO_TSS_Resources (const TAO_TSS_Resources&);
+  void operator= (const TAO_TSS_Resources&);
   //@}
 
 public:
@@ -105,6 +107,8 @@ public:
   TAO::GUIResource_Factory * gui_resource_factory_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TSS_RESOURCES_H */
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 8b2c8490649..172dde55018 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -13,6 +13,9 @@ ACE_RCSID (tao,
            Tagged_Components,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
 {
@@ -338,3 +341,4 @@ TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
   return 1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index 75f756a2093..93f2a927bf3 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -23,6 +23,9 @@
 
 #include "tao/CONV_FRAMEC.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Profile;
 
 /// Tag for storing multiple endpoints within a single profile.
@@ -31,7 +34,7 @@ class TAO_Profile;
  * The standard TAG_ALTERNATE_IIOP_ADDRESSES tagged component is the
  * portable alternative.
  */
-const CORBA::ULong TAO_TAG_ENDPOINTS =  0x54414f02U;
+static const CORBA::ULong TAO_TAG_ENDPOINTS =  0x54414f02U;
 
 /**
  * @class TAO_Tagged_Components
@@ -155,6 +158,8 @@ private:
   CORBA::Octet code_sets_set_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Tagged_Components.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i
index 62ab4a40f05..cb61b5235b4 100644
--- a/TAO/tao/Tagged_Components.i
+++ b/TAO/tao/Tagged_Components.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Tagged_Components::TAO_Tagged_Components (void)
   :  orb_type_ (0),
@@ -76,3 +78,5 @@ TAO_Tagged_Components::components (void)
 {
   return this->components_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index cfe643f6066..e5bed686c15 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (tao,
            Tagged_Profile,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Boolean
 TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
 {
@@ -192,3 +194,5 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i (
 
   return hdr_status;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index 5e9e10f8348..541cb4362a4 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -22,8 +22,19 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Object_KeyC.h"
+#include "tao/Versioned_Namespace.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+  namespace CSD
+  {
+    class FW_Server_Request_Wrapper;
+  }
+}
+
 /**
  * @class TAO_Tagged_Profile
  *
@@ -34,6 +45,12 @@
 class TAO_Export TAO_Tagged_Profile
 {
 public:
+
+  /// Declare FW_Server_Request_Wrapper a friend
+  /// This friendship makes the FW_Server_Request_Wrapper be able to
+  /// clone the TAO_Tagged_Profile data member in TAO_ServerRequest.
+  friend class TAO::CSD::FW_Server_Request_Wrapper;
+
   /// Ctor
   TAO_Tagged_Profile (TAO_ORB_Core *orb_core);
 
@@ -110,7 +127,7 @@ private:
    *        string type_id;
    *        sequence<TaggedProfile>   profiles;
    *      };
-   * The mapping for the type_id of type string is TAO_String_Manager
+   * The mapping for the type_id of type string is TAO::String_Manager
    * which does lot of bad things like allocation on construction and
    * a deallocation on destruction. This is bad along the critical
    * path. So we will store this nested structure ripped open with the
@@ -127,6 +144,8 @@ private:
   ACE_CString type_id_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Tagged_Profile.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
index 52e7b34fae1..60249f0ef37 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
@@ -13,7 +16,6 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
 
 }
 
-
 ACE_INLINE TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void)
 {
@@ -61,3 +63,5 @@ TAO_Tagged_Profile::discriminator (void) const
 {
   return this->discriminator_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 1168a525d4f..9f639f4b6c4 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -17,6 +17,9 @@ ACE_RCSID (tao,
 
 #include "ace/Reactor.h"
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (
     TAO_ORB_Core &orb_core,
     TAO_New_Leader_Generator *new_leader_generator
@@ -551,3 +554,5 @@ TAO_Thread_Lane_Resources::cleanup_rw_transports (void)
       (*handler)->transport ()->remove_reference ();
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index f0c1a61a07f..07ec9a50edc 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -24,9 +24,14 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/orbconf.h"
-#include "params.h"
+#include "tao/params.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Acceptor_Registry;
 class TAO_Leader_Follower;
@@ -207,6 +212,8 @@ private:
   //@}
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_THREAD_LANE_RESOURCES_H */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index d004966c26b..8a3465d2648 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (tao,
            Thread_Lane_Resources_Manager,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : orb_core_ (&orb_core),
     lf_strategy_ (0)
@@ -33,3 +35,4 @@ TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Fa
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index cbd6be69009..e0637fbd23f 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -23,6 +23,9 @@
 #include "ace/Service_Object.h"
 
 #include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 class TAO_Thread_Lane_Resources;
@@ -81,7 +84,7 @@ public:
 
 protected:
   /// The ORB Core.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
   /// The leader follower strategy
   TAO_LF_Strategy *lf_strategy_;
@@ -104,12 +107,14 @@ public:
   virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
 
   /// Factory method.
-  virtual
-  TAO_Thread_Lane_Resources_Manager *
+  virtual TAO_Thread_Lane_Resources_Manager *
   create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0;
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 6cd522c8298..9cf61f3bfc2 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -1,15 +1,17 @@
 //$Id$
-#include "Thread_Per_Connection_Handler.h"
-#include "Connection_Handler.h"
-#include "debug.h"
-#include "Transport.h"
-#include "ORB_Core.h"
+#include "tao/Thread_Per_Connection_Handler.h"
+#include "tao/Connection_Handler.h"
+#include "tao/debug.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
 #include "ace/Flag_Manip.h"
 
 ACE_RCSID (tao,
            Thread_Per_Connection_Handler,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler (
     TAO_Connection_Handler *ch,
     TAO_ORB_Core *oc)
@@ -81,3 +83,5 @@ TAO_Thread_Per_Connection_Handler::close (u_long)
 
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 08ed211ae58..cf51317e646 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+//x -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Connection_Handler;
 class TAO_ORB_Core;
@@ -77,6 +80,8 @@ private:
   TAO_Connection_Handler *ch_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /*TAO_THREAD_PER_CONNECTION_HANDLER_H*/
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index aa5a1ecaaa7..650026e6abb 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "TimeBaseC.h"
+#include "tao/TimeBaseC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,6 +39,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -120,3 +122,5 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.lower_bound) &&
     (strm >> _tao_aggregate.upper_bound);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index a5846a67720..4ff35b6fd42 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -62,6 +62,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TimeBase
 {
 
@@ -167,6 +169,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource_Factory.cpp
index 765e7a40e02..d9d6d3dffeb 100644
--- a/TAO/tao/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource_Factory.cpp
@@ -9,11 +9,13 @@ ACE_RCSID( TAO_TkResource,
            "$Id$");
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
-  TkResource_Factory::TkResource_Factory ():
-    reactor_impl_( 0 )
+  TkResource_Factory::TkResource_Factory (void)
+    : reactor_impl_ (0)
   {
   }
 
@@ -35,3 +37,5 @@ namespace TAO
     return this->reactor_impl_;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource_Factory.h
index e08b436d274..7fe5bb140ac 100644
--- a/TAO/tao/TkResource_Factory.h
+++ b/TAO/tao/TkResource_Factory.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -55,5 +57,8 @@ namespace TAO
     TAO_SYNCH_MUTEX lock_;
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TKRESOURCE_FACTORY_H */
diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp
index 782fbc92bf0..e8885850e0d 100644
--- a/TAO/tao/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource_Loader.cpp
@@ -1,16 +1,19 @@
 //$Id$
-#include "TkResource_Loader.h"
-#include "ORB_Core.h"
-#include "TkResource_Factory.h"
+#include "tao/TkResource_Loader.h"
+#include "tao/ORB_Core.h"
+#include "tao/TkResource_Factory.h"
 
 ACE_RCSID( TAO_TkResource,
            TkResource_Loader,
            "$Id$");
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
-  TkResource_Loader::TkResource_Loader ()
+  TkResource_Loader::TkResource_Loader (void)
   {
     TkResource_Factory *tmp = 0;
 
@@ -20,7 +23,9 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  TkResource_Loader::~TkResource_Loader ()
+  TkResource_Loader::~TkResource_Loader (void)
   {
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
index 9b20a5eac02..86122b169d1 100644
--- a/TAO/tao/TkResource_Loader.h
+++ b/TAO/tao/TkResource_Loader.h
@@ -13,13 +13,19 @@
 
 #ifndef TAO_TKRESOURCE_LOADER_H
 #define TAO_TKRESOURCE_LOADER_H
+
 #include /**/ "ace/pre.h"
+
 #include "tao/TAO_TkResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -38,12 +44,17 @@ namespace TAO
    */
   class TAO_TkResource_Export TkResource_Loader
   {
-
   public:
-    TkResource_Loader ( );
 
-    virtual ~TkResource_Loader ();
+    TkResource_Loader (void);
+
+    virtual ~TkResource_Loader (void);
+
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_TKRESOURCE_LOADER_H */
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 989fa5624ab..1d067684b6c 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1,26 +1,26 @@
 // $Id$
 
-#include "Transport.h"
-
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "Client_Strategy_Factory.h"
-#include "Wait_Strategy.h"
-#include "Transport_Mux_Strategy.h"
-#include "Stub.h"
-#include "Transport_Queueing_Strategies.h"
-#include "Connection_Handler.h"
-#include "Pluggable_Messaging.h"
-#include "Synch_Queued_Message.h"
-#include "Asynch_Queued_Message.h"
-#include "Flushing_Strategy.h"
-#include "Thread_Lane_Resources.h"
-#include "Resume_Handle.h"
-#include "Codeset_Manager.h"
-#include "Codeset_Translator_Base.h"
-#include "debug.h"
-#include "CDR.h"
-#include "ORB_Core.h"
+#include "tao/Transport.h"
+
+#include "tao/LF_Follower.h"
+#include "tao/Leader_Follower.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/Wait_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
+#include "tao/Stub.h"
+#include "tao/Transport_Queueing_Strategies.h"
+#include "tao/Connection_Handler.h"
+#include "tao/Pluggable_Messaging.h"
+#include "tao/Synch_Queued_Message.h"
+#include "tao/Asynch_Queued_Message.h"
+#include "tao/Flushing_Strategy.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Resume_Handle.h"
+#include "tao/Codeset_Manager.h"
+#include "tao/Codeset_Translator_Base.h"
+#include "tao/debug.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -34,7 +34,7 @@
 //@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
 
 #if !defined (__ACE_INLINE__)
-# include "Transport.inl"
+# include "tao/Transport.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -112,6 +112,8 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
   ACE_Log_Msg::instance ()->release ();
 }
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               TAO_ORB_Core *orb_core)
   : tag_ (tag)
@@ -179,6 +181,9 @@ TAO_Transport::~TAO_Transport (void)
 
   // By the time the destructor is reached here all the connection stuff
   // *must* have been cleaned up.
+
+  // The following assert is needed for the test "Bug_2494_Regression".
+  // See the bugzilla bug #2494 for details.
   ACE_ASSERT (this->head_ == 0);
   ACE_ASSERT (this->cache_map_entry_ == 0);
 
@@ -285,11 +290,11 @@ TAO_Transport::register_handler (void)
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::register_handler\n",
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler\n"),
                   this->id ()));
     }
 
-  ACE_Reactor *r = this->orb_core_->reactor ();
+  ACE_Reactor * const r = this->orb_core_->reactor ();
 
   // @@note: This should be okay since the register handler call will
   // not make a nested call into the transport.
@@ -327,8 +332,8 @@ TAO_Transport::generate_locate_request (
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::generate_locate_request, "
-                      "error while marshalling the LocateRequest header\n",
+                      ACE_TEXT ("TAO (%P|%t) - Transport[%d]::generate_locate_request, ")
+                      ACE_TEXT ("error while marshalling the LocateRequest header\n"),
                       this->id ()));
         }
 
@@ -348,7 +353,7 @@ TAO_Transport::generate_request_header (
   // on a particular connection.
   if (this->first_request_)
     {
-      TAO_Codeset_Manager *csm = this->orb_core ()->codeset_manager ();
+      TAO_Codeset_Manager * const csm = this->orb_core ()->codeset_manager ();
       if (csm)
         csm->generate_service_context (opdetails,*this);
     }
@@ -360,8 +365,8 @@ TAO_Transport::generate_request_header (
       if (TAO_debug_level > 0)
         {
         ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) - Transport[%d]::generate_request_header, "
-                      "error while marshalling the Request header\n",
+                   ACE_TEXT ("(%P|%t) - Transport[%d]::generate_request_header, ")
+                   ACE_TEXT ("error while marshalling the Request header\n"),
                       this->id()));
         }
 
@@ -396,7 +401,7 @@ TAO_Transport::make_idle (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::make_idle\n",
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"),
                   this->id ()));
     }
 
@@ -420,7 +425,7 @@ TAO_Transport::handle_output (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_output\n",
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output\n"),
                   this->id ()));
     }
 
@@ -432,8 +437,8 @@ TAO_Transport::handle_output (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_output, "
-                  "drain_queue returns %d/%d\n",
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output, ")
+                  ACE_TEXT ("drain_queue returns %d/%d\n"),
                   this->id (),
                   retval, errno));
     }
@@ -477,26 +482,19 @@ TAO_Transport::send_message_block_chain_i (const ACE_Message_Block *mb,
 
   synch_message.push_back (this->head_, this->tail_);
 
-  int n = this->drain_queue_i ();
+  int const n = this->drain_queue_i ();
 
   if (n == -1)
     {
       synch_message.remove_from_list (this->head_, this->tail_);
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
       return -1; // Error while sending...
     }
   else if (n == 1)
     {
-      ACE_ASSERT (synch_message.all_data_sent ());
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
       bytes_transferred = total_length;
       return 1;  // Empty queue, message was sent..
     }
 
-  ACE_ASSERT (n == 0); // Some data sent, but data remains.
-
   // Remove the temporary message from the queue...
   synch_message.remove_from_list (this->head_, this->tail_);
 
@@ -516,7 +514,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
 
   synch_message.push_back (this->head_, this->tail_);
 
-  int n =
+  int const n =
     this->send_synch_message_helper_i (synch_message,
                                        max_wait_time);
 
@@ -525,8 +523,6 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
       return n;
     }
 
-  ACE_ASSERT (n == 0);
-
   // @todo: Check for timeouts!
   // if (max_wait_time != 0 && errno == ETIME) return -1;
   TAO_Flushing_Strategy *flushing_strategy =
@@ -587,21 +583,14 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, "
-                      "error while flushing message - %m\n",
-                      this->id ()));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, ")
+             ACE_TEXT ("error while flushing message - %m\n"),
+             this->id ()));
         }
 
       return -1;
     }
 
-  else
-    {
-      ACE_ASSERT (synch_message.all_data_sent () != 0);
-    }
-
-  ACE_ASSERT (synch_message.next () == 0);
-  ACE_ASSERT (synch_message.prev () == 0);
   return 1;
 }
 
@@ -616,7 +605,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
   synch_message.push_back (this->head_,
                            this->tail_);
 
-  int n =
+  int const n =
     this->send_synch_message_helper_i (synch_message,
                                        max_wait_time);
 
@@ -625,14 +614,12 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
       return n;
     }
 
-  ACE_ASSERT (n == 0);
-
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::send_reply_message_i, "
-                  "preparing to add to queue before leaving \n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_reply_message_i, ")
+         ACE_TEXT ("preparing to add to queue before leaving \n"),
+         this->id ()));
     }
 
   // Till this point we shouldn't have any copying and that is the
@@ -651,7 +638,19 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
   TAO_Flushing_Strategy *flushing_strategy =
     this->orb_core ()->flushing_strategy ();
 
-  (void) flushing_strategy->schedule_output (this);
+  int result = flushing_strategy->schedule_output (this);
+
+  if (result == -1)
+    {
+      if (TAO_debug_level > 5)
+        {
+          ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_reply_"
+                      "message_i dequeuing msg due to schedule_output "
+                      "failure\n", this->id ()));
+        }
+      msg->remove_from_list (this->head_, this->tail_);
+      msg->destroy ();
+    }
 
   return 1;
 }
@@ -666,24 +665,15 @@ TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_mess
   if (n == -1)
     {
       synch_message.remove_from_list (this->head_, this->tail_);
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
       return -1; // Error while sending...
     }
   else if (n == 1)
     {
-      ACE_ASSERT (synch_message.all_data_sent ());
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
       return 1;  // Empty queue, message was sent..
     }
 
-  ACE_ASSERT (n == 0); // Some data sent, but data remains.
-
   if (synch_message.all_data_sent ())
     {
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
       return 1;
     }
 
@@ -703,11 +693,32 @@ TAO_Transport::schedule_output_i (void)
   ACE_Event_Handler *eh = this->event_handler_i ();
   ACE_Reactor *reactor = eh->reactor ();
 
+  // Check to see if our event handler is still registered with the
+  // reactor.  It's possible for another thread to have run close_connection()
+  // since we last used the event handler.
+  ACE_Event_Handler * const found = reactor->find_handler (eh->get_handle ());
+  if (found != eh)
+    {
+      if(TAO_debug_level > 3)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::schedule_output_i "
+                      "event handler not found in reactor, returning -1\n",
+                      this->id ()));
+        }
+      if (found)
+        {
+          found->remove_reference ();
+        }
+      return -1;
+    }
+  found->remove_reference ();
+
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::schedule_output_i\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::schedule_output_i\n"),
+         this->id ()));
     }
 
   return reactor->schedule_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
@@ -716,14 +727,14 @@ TAO_Transport::schedule_output_i (void)
 int
 TAO_Transport::cancel_output_i (void)
 {
-  ACE_Event_Handler *eh = this->event_handler_i ();
-  ACE_Reactor *reactor = eh->reactor ();
+  ACE_Event_Handler * const eh = this->event_handler_i ();
+  ACE_Reactor *const reactor = eh->reactor ();
 
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::cancel_output_i\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cancel_output_i\n"),
+         this->id ()));
     }
 
   return reactor->cancel_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
@@ -736,9 +747,9 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, "
-                  "timer expired\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, ")
+         ACE_TEXT ("timer expired\n"),
+         this->id ()));
     }
 
   /// This is the only legal ACT in the current configuration....
@@ -765,7 +776,7 @@ int
 TAO_Transport::drain_queue (void)
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-  int retval = this->drain_queue_i ();
+  int const retval = this->drain_queue_i ();
 
   if (retval == 1)
     {
@@ -788,7 +799,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
   size_t byte_count = 0;
 
   // ... send the message ...
-  ssize_t retval =
+  ssize_t const retval =
     this->send (iov, iovcnt, byte_count);
 
   if (TAO_debug_level == 5)
@@ -808,9 +819,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                      "send() returns 0\n",
-                      this->id ()));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ")
+             ACE_TEXT ("send() returns 0\n"),
+             this->id ()));
         }
       return -1;
     }
@@ -819,9 +830,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                      "error during %p\n",
-                      this->id (), ACE_TEXT ("send()")));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ")
+             ACE_TEXT ("error during %p\n"),
+             this->id (), ACE_TEXT ("send()")));
         }
 
       if (errno == EWOULDBLOCK || errno == EAGAIN)
@@ -834,7 +845,6 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
 
   // ... start over, how do we guarantee progress?  Because if
   // no bytes are sent send() can only return 0 or -1
-  ACE_ASSERT (byte_count != 0);
 
   // Total no. of bytes sent for a send call
   this->sent_byte_count_ += byte_count;
@@ -842,9 +852,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                  "byte_count = %d, head_is_empty = %d\n",
-                  this->id(), byte_count, (this->head_ == 0)));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ")
+         ACE_TEXT ("byte_count = %d, head_is_empty = %d\n"),
+         this->id(), byte_count, (this->head_ == 0)));
     }
 
   return 1;
@@ -886,9 +896,9 @@ TAO_Transport::drain_queue_i (void)
           if (TAO_debug_level > 4)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
-                          "helper retval = %d\n",
-                          this->id (), retval));
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ")
+                 ACE_TEXT ("helper retval = %d\n"),
+                 this->id (), retval));
             }
 
           if (retval != 1)
@@ -911,9 +921,9 @@ TAO_Transport::drain_queue_i (void)
           if (TAO_debug_level > 4)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
-                          "helper retval = %d\n",
-                          this->id (), retval));
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ")
+                 ACE_TEXT ("helper retval = %d\n"),
+                 this->id (), retval));
             }
 
       if (retval != 1)
@@ -944,9 +954,9 @@ TAO_Transport::cleanup_queue_i ()
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, "
-                  "cleaning up complete queue\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ")
+         ACE_TEXT ("cleaning up complete queue\n"),
+         this->id ()));
     }
 
   // Cleanup all messages
@@ -957,7 +967,7 @@ TAO_Transport::cleanup_queue_i ()
        // @@ This is a good point to insert a flag to indicate that a
        //    CloseConnection message was successfully received.
       i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
-		        this->orb_core_->leader_follower ());
+                        this->orb_core_->leader_follower ());
 
       i->remove_from_list (this->head_, this->tail_);
 
@@ -975,9 +985,9 @@ TAO_Transport::cleanup_queue (size_t byte_count)
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::cleanup_queue, "
-                      "byte_count = %d\n",
-                      this->id (), byte_count));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ")
+             ACE_TEXT ("byte_count = %d\n"),
+             this->id (), byte_count));
         }
 
       // Update the state of the first message
@@ -986,10 +996,10 @@ TAO_Transport::cleanup_queue (size_t byte_count)
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::cleanup_queue, "
-                      "after transfer, bc = %d, all_sent = %d, ml = %d\n",
-                      this->id (), byte_count, i->all_data_sent (),
-                      i->message_length ()));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ")
+             ACE_TEXT ("after transfer, bc = %d, all_sent = %d, ml = %d\n"),
+             this->id (), byte_count, i->all_data_sent (),
+             i->message_length ()));
         }
 
       // ... if all the data was sent the message must be removed from
@@ -1114,7 +1124,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
 {
   // Let's figure out if the message should be queued without trying
   // to send first:
-  bool try_sending_first = 1;
+  bool try_sending_first = true;
 
   const bool queue_empty = (this->head_ == 0);
 
@@ -1138,9 +1148,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
       if (TAO_debug_level > 6)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
-                      "trying to send the message (ml = %d)\n",
-                      this->id (), total_length));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
+             ACE_TEXT ("trying to send the message (ml = %d)\n"),
+             this->id (), total_length));
         }
 
       // @@ I don't think we want to hold the mutex here, however if
@@ -1162,10 +1172,10 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
               if (TAO_debug_level > 0)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
-                              "fatal error in "
-                              "send_message_block_chain_i - %m\n",
-                              this->id ()));
+                     ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
+                     ACE_TEXT ("fatal error in ")
+                     ACE_TEXT ("send_message_block_chain_i - %m\n"),
+                     this->id ()));
                 }
               return -1;
             }
@@ -1185,9 +1195,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
       if (TAO_debug_level > 6)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
-                      "partial send %d / %d bytes\n",
-                      this->id (), byte_count, total_length));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
+             ACE_TEXT ("partial send %d / %d bytes\n"),
+             this->id (), byte_count, total_length));
         }
 
       // ... part of the data was sent, need to figure out what piece
@@ -1199,7 +1209,6 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
 
       // ... at least some portion of the message block chain should
       // remain ...
-      ACE_ASSERT (message_block != 0);
     }
 
   // ... either the message must be queued or we need to queue it
@@ -1208,18 +1217,18 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
-                  "message is queued\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
+         ACE_TEXT ("message is queued\n"),
+         this->id ()));
     }
 
   if (this->queue_message_i(message_block) == -1)
   {
     ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
-                "cannot queue message for "
-                " - %m\n",
-                this->id ()));
+       ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
+       ACE_TEXT ("cannot queue message for ")
+       ACE_TEXT (" - %m\n"),
+       this->id ()));
     return -1;
   }
 
@@ -1278,13 +1287,13 @@ TAO_Transport::queue_message_i(const ACE_Message_Block *message_block)
 int
 TAO_Transport::handle_input (TAO_Resume_Handle &rh,
                              ACE_Time_Value * max_wait_time,
-                             int /*block*/)
+                             int /* block */ /* deprecated parameter */ )
 {
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_input\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input\n"),
+         this->id ()));
     }
 
   // First try to process messages of the head of the incoming queue.
@@ -1297,853 +1306,768 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
           if (TAO_debug_level > 2)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::handle_input, "
-                          "error while parsing the head of the queue\n",
-                          this->id()));
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ")
+                 ACE_TEXT ("error while parsing the head of the queue\n"),
+                 this->id()));
+
             }
+          return -1;
         }
+      else
+        {
+          // retval == 0
 
-      return retval;
+          // Processed a message in queue successfully. This
+          // thread must return to thread-pool now.
+          return 0;
+        }
     }
 
-  // If there are no messages then we can go ahead to read from the
-  // handle for further reading..
-
-  // The buffer on the stack which will be used to hold the input
-  // messages
-  char buf [TAO_MAXBUFSIZE];
-
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  (void) ACE_OS::memset (buf,
-                         '\0',
-                         sizeof buf);
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-  // Create a data block
-  ACE_Data_Block db (sizeof (buf),
-                     ACE_Message_Block::MB_DATA,
-                     buf,
-                     this->orb_core_->input_cdr_buffer_allocator (),
-                     this->orb_core_->locking_strategy (),
-                     ACE_Message_Block::DONT_DELETE,
-                     this->orb_core_->input_cdr_dblock_allocator ());
-
-  // Create a message block
-  ACE_Message_Block message_block (&db,
-                                   ACE_Message_Block::DONT_DELETE,
-                                   this->orb_core_->input_cdr_msgblock_allocator ());
-
+  TAO_Queued_Data *q_data = 0;
 
-  // Align the message block
-  ACE_CDR::mb_align (&message_block);
-
-  size_t recv_size = 0;
-
-  if (this->orb_core_->orb_params ()->single_read_optimization ())
+  if (this->incoming_message_stack_.top (q_data) != -1
+      && q_data->missing_data_ != TAO_MISSING_DATA_UNDEFINED)
     {
-      recv_size =
-        message_block.space ();
+      /* PRE: q_data->missing_data_ > 0 as all QD on stack must be incomplete  */
+      if (this->handle_input_missing_data (rh, max_wait_time, q_data) == -1)
+        {
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ")
+                 ACE_TEXT ("error consolidating incoming message\n"),
+                 this->id ()));
+            }
+          return -1;
+        }
     }
   else
     {
-      recv_size =
-        this->messaging_object ()->header_length ();
+      if (this->handle_input_parse_data (rh, max_wait_time) == -1)
+        {
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ")
+                 ACE_TEXT ("error parsing incoming message\n"),
+                 this->id ()));
+            }
+          return -1;
+        }
     }
 
-  // If we have a partial message, copy it into our message block
-  // and clear out the partial message.
-  if (this->partial_message_ != 0 && this->partial_message_->length () != 0)
+  return 0;
+}
+
+int
+TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data,
+                                            TAO_Resume_Handle &rh)
+{
+  // paranoid check
+  if (q_data->missing_data_ != 0)
     {
-      if (message_block.copy (this->partial_message_->rd_ptr (),
-                              this->partial_message_->length ()) == 0)
-        {
-          recv_size -= this->partial_message_->length ();
-          this->partial_message_->reset ();
-        }
-      else
+      if (TAO_debug_level > 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) - Transport[%d]::handle_input, "
-                             "unable to copy the partial message\n",
-                             this->id ()),
-                             -1);
+           ACE_ERROR ((LM_ERROR,
+              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ")
+              ACE_TEXT ("missing data\n"),
+              this->id ()));
         }
+       return -1;
     }
 
-  // Saving the size of the received buffer in case any one needs to
-  // get the size of the message thats received in the
-  // context. Obviously the value will be changed for each recv call
-  // and the user is supposed to invoke the accessor only in the
-  // invocation context to get meaningful information.
-  this->recv_buffer_size_ = recv_size;
+  if (q_data->more_fragments_ ||
+      q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
+    {
+      // consolidate message on top of stack, only for fragmented messages
+      TAO_Queued_Data *new_q_data = 0;
 
-  // Read the message into the  message block that we have created on
-  // the stack.
-  ssize_t n = this->recv (message_block.wr_ptr (),
-                          recv_size,
-                          max_wait_time);
+      switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
+        {
+        case -1: // error
+          return -1;
 
-  // If there is an error return to the reactor..
-  if (n <= 0)
-    {
-      return n;
-    }
+        case 0:  // returning consolidated message in q_data
+          if (!new_q_data)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                     ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ")
+                     ACE_TEXT ("error, consolidated message is NULL\n"),
+                     this->id ()));
+                }
+              return -1;
+            }
 
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_input, "
-                  "read %d bytes\n",
-                  this->id (), n));
-    }
 
-  // Set the write pointer in the stack buffer
-  message_block.wr_ptr (n);
+          if (this->process_parsed_messages (new_q_data, rh) == -1)
+            {
+              TAO_Queued_Data::release (new_q_data);
 
-  // Parse the message and try consolidating the message if
-  // needed.
-  retval = this->parse_consolidate_messages (message_block,
-                                             rh,
-                                             max_wait_time);
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                     ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ")
+                     ACE_TEXT ("error processing consolidated message\n"),
+                     this->id ()));
+                }
+              return -1;
+            }
 
-  if (retval <= 0)
-    {
-      if (retval == -1 && TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::handle_input, "
-                      "error while parsing and consolidating\n",
-                      this->id ()));
+          TAO_Queued_Data::release (new_q_data);
+
+          break;
+
+        case 1:  // fragment has been stored in messaging_oject()
+          break;
         }
-      return retval;
     }
-
-  if (message_block.length () > 0)
+  else
     {
-      // Make a node of the message block..
-      TAO_Queued_Data qd (&message_block,
-                          this->orb_core_->transport_message_buffer_allocator ());
-
-      // Extract the data for the node..
-      this->messaging_object ()->get_message_data (&qd);
-
-      // Check whether the message was fragmented..
-      if (qd.more_fragments_ ||
-          (qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
+      if (this->process_parsed_messages (q_data, rh) == -1)
         {
-          // Duplicate the node that we have as the node is on stack..
-          TAO_Queued_Data *nqd =
-            TAO_Queued_Data::duplicate (qd);
+          TAO_Queued_Data::release (q_data);
 
-          return this->consolidate_fragments (nqd, rh);
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ")
+                 ACE_TEXT ("error processing message\n"),
+                 this->id ()));
+            }
+          return -1;
         }
 
-      // Process the message
-      return this->process_parsed_messages (&qd,
-                                            rh);
+      TAO_Queued_Data::release (q_data);
+
     }
 
   return 0;
 }
 
 int
-TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
-                                           TAO_Resume_Handle &rh,
-                                           ACE_Time_Value *max_wait_time)
+TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data)
 {
-  // Parse the incoming message for validity. The check needs to be
-  // performed by the messaging objects.
-  switch (this->parse_incoming_messages (block))
+  // consolidate message on top of stack, only for fragmented messages
+
+  // paranoid check
+  if (q_data->missing_data_ != 0)
     {
-    // An error has occurred during message parsing
-    case -1:
-      return -1;
+       return -1;
+    }
 
-    // This message block does not contain enough data to
-    // parse the header.  We do not need to grow the partial
-    // message block since we are guaranteed that it can hold
-    // at least a GIOP header plus a GIOP fragment header.
-    case 1:
-      if (this->partial_message_ == 0)
-        {
-          this->allocate_partial_message_block ();
-        }
+  if (q_data->more_fragments_ ||
+      q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
+    {
+      TAO_Queued_Data *new_q_data = 0;
 
-      if (this->partial_message_ != 0 &&
-          this->partial_message_->copy (block.rd_ptr (),
-                                        block.length ()) == 0)
+      switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
         {
-          block.rd_ptr (block.length ());
-          return 0;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
-                             "unable to save the partial message\n",
-                             this->id ()),
-                             -1);
-        }
-
-    case 0: // The normal case
-      break;
+        case -1: // error
+          return -1;
 
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
-                         "impossible return value from parse_incoming_messages\n",
-                         this->id ()),
-                         -1);
-    }
+        case 0:  // returning consolidated message in new_q_data
+          if (!new_q_data)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                     ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_enqueue_message, ")
+                     ACE_TEXT ("error, consolidated message is NULL\n"),
+                     this->id ()));
+                }
+              return -1;
+            }
 
-  // Check whether we have a complete message for processing
-  const ssize_t missing_data = this->missing_data (block);
+          if (this->incoming_message_queue_.enqueue_tail (new_q_data) != 0)
+            {
+              TAO_Queued_Data::release (new_q_data);
+              return -1;
+            }
+          break;
 
-  if (missing_data < 0)
-    {
-      // If we have more than one message
-      return this->consolidate_extra_messages (block,
-                                               rh);
+        case 1:  // fragment has been stored in messaging_oject()
+          break;
+        }
     }
-  else if (missing_data > 0)
+  else
     {
-      // If we have missing data then try doing a read or try queueing
-      // them.
-      return this->consolidate_message (block,
-                                        missing_data,
-                                        rh,
-                                        max_wait_time);
+      if (this->incoming_message_queue_.enqueue_tail (q_data) != 0)
+        {
+          TAO_Queued_Data::release (q_data);
+          return -1;
+        }
     }
 
-  return 1;
+  return 0; // success
 }
 
 int
-TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
+TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh,
+                                          ACE_Time_Value * max_wait_time,
+                                          TAO_Queued_Data *q_data)
 {
-  // If we have a queue and if the last message is not complete a
-  // complete one, then this read will get us the remaining data. So
-  // do not try to parse the header if we have an incomplete message
-  // in the queue.
-  if (this->incoming_message_queue_.is_tail_complete () != 0)
-    {
-      //  As it looks like a new message has been read, process the
-      //  message. Call the messaging object to do the parsing..
-      int retval =
-        this->messaging_object ()->parse_incoming_messages (block);
-
-      if (retval == -1 && TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::parse_incoming_messages, "
-                      "error in incoming message\n",
-                      this->id ()));
-        }
+  // paranoid check
+  if (q_data == 0)
+    {
+      return -1;
+    }
 
-      return retval;
+  if (TAO_debug_level > 3)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ")
+         ACE_TEXT ("enter (missing data == %d)\n"),
+         this->id (), q_data->missing_data_));
     }
 
-  return 0;
-}
+  const size_t recv_size = q_data->missing_data_;
 
+  // make sure the message_block has enough space
+  const size_t message_size =  recv_size
+                               + q_data->msg_block_->length();
 
-ssize_t
-TAO_Transport::missing_data (ACE_Message_Block &incoming)
-{
-  // If we have a incomplete message in the queue then find out how
-  // much of data is required to get a complete message.
-  if (this->incoming_message_queue_.is_tail_complete () == 0)
+  if (q_data->msg_block_->space() < recv_size)
     {
-      return this->incoming_message_queue_.missing_data_tail ();
+      if (ACE_CDR::grow (q_data->msg_block_, message_size) == -1)
+        {
+          return -1;
+        }
     }
 
-  return this->messaging_object ()->missing_data (incoming);
-}
+  // Saving the size of the received buffer in case any one needs to
+  // get the size of the message thats received in the
+  // context. Obviously the value will be changed for each recv call
+  // and the user is supposed to invoke the accessor only in the
+  // invocation context to get meaningful information.
+  this->recv_buffer_size_ = recv_size;
 
+  // Read the message into the existing message block on heap
+  const ssize_t n = this->recv (q_data->msg_block_->wr_ptr(),
+                                recv_size,
+                                max_wait_time);
 
-int
-TAO_Transport::consolidate_message (ACE_Message_Block &incoming,
-                                    ssize_t missing_data,
-                                    TAO_Resume_Handle &rh,
-                                    ACE_Time_Value *max_wait_time)
-{
-  // Check whether the last message in the queue is complete..
-  if (this->incoming_message_queue_.is_tail_complete () == 0)
+
+  if (n <= 0)
     {
-      return this->consolidate_message_queue (incoming,
-                                              missing_data,
-                                              rh,
-                                              max_wait_time);
+      return n;
     }
 
-  if (TAO_debug_level > 4)
+  if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ")
+         ACE_TEXT ("read bytes %d\n"),
+         this->id (), n));
     }
 
-  // Calculate the actual length of the load that we are supposed to
-  // read which is equal to the <missing_data> + length of the buffer
-  // that we have..
-  const size_t payload = missing_data + incoming.size ();
+  q_data->msg_block_->wr_ptr(n);
+  q_data->missing_data_ -= n;
 
-  // Grow the buffer to the size of the message
-  ACE_CDR::grow (&incoming,
-                 payload);
-
-  ssize_t n = 0;
-
-  // As this used for transports where things are available in one
-  // shot this looping should not create any problems.
-  for (ssize_t bytes = missing_data; bytes != 0; bytes -= n)
+  if (q_data->missing_data_ == 0)
     {
-      // .. do a read on the socket again.
-      n = this->recv (incoming.wr_ptr (),
-                      bytes,
-                      max_wait_time);
-
-      if (TAO_debug_level > 6)
+      // paranoid check
+      if (this->incoming_message_stack_.pop (q_data) == -1)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                      "read %d bytes on attempt\n",
-                      this->id(), n));
+          return -1;
         }
 
-      if (n == 0 || n == -1)
+      if (this->consolidate_process_message (q_data, rh) == -1)
         {
-          break;
+          return -1;
         }
-
-      incoming.wr_ptr (n);
-      missing_data -= n;
     }
 
-  // If we got an error..
-  if (n == -1)
+  return 0;
+}
+
+
+int
+TAO_Transport::handle_input_parse_extra_messages (ACE_Message_Block &message_block)
+{
+
+  // store buffer status of last extraction: -1 parse error, 0
+  // incomplete message header in buffer, 1 complete messages header
+  // parsed
+  int buf_status = 0;
+
+  TAO_Queued_Data *q_data = 0;     // init
+
+  // parse buffer until all messages have been extracted, consolidate
+  // and enqueue complete messages, if the last message being parsed
+  // has missin data, it is stays on top of incoming_message_stack.
+  while (message_block.length () > 0 &&
+         (buf_status = this->messaging_object ()->extract_next_message
+          (message_block, q_data)) != -1 &&
+         q_data != 0) // paranoid check
     {
-      if (TAO_debug_level > 4)
+      if (q_data->missing_data_ == 0)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                      "error while trying to consolidate\n",
-                      this->id ()));
+          if (this->consolidate_enqueue_message (q_data) == -1)
+            {
+              return -1;
+            }
+        }
+      else  // incomplete message read, probably the last message in buffer
+        {
+          // can not fail
+          this->incoming_message_stack_.push (q_data);
         }
 
+      q_data = 0; // reset
+    } // while
+
+  if (buf_status == -1)
+    {
       return -1;
     }
 
-  // If we had gotten a EWOULDBLOCK n would be equal to zero. But we
-  // have to put the message in the queue anyway. So let us proceed
-  // to do that and return...
+  return 0;
+}
 
-  // Check to see if we have messages in queue or if we have missing
-  // data . AT this point we cannot have have semi-complete messages
-  // in the queue as they would have been taken care before. Put
-  // ourselves in the queue and  then try processing one of the
-  // messages..
-  if (missing_data >= 0 ||
-      this->incoming_message_queue_.queue_length () != 0)
-    {
-      if (missing_data == 0 ||
-          !this->incoming_message_queue_.is_tail_fragmented ())
-        {
-          if (TAO_debug_level > 4)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                          "queueing up the message\n",
-                          this->id ()));
-            }
+int
+TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
+                                         ACE_Time_Value * max_wait_time)
+{
 
-          // Get a queued data
-          TAO_Queued_Data *qd =
-            this->make_queued_data (incoming);
+  if (TAO_debug_level > 3)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
+         ACE_TEXT ("enter\n"),
+         this->id ()));
+    }
 
-          // Add the missing data to the queue
-          qd->missing_data_ = missing_data;
 
-          // Get the rest of the messaging data
-          this->messaging_object ()->get_message_data (qd);
+  // The buffer on the stack which will be used to hold the input
+  // messages, ACE_CDR::MAX_ALIGNMENT compensates the
+  // memory-alignment. This improves performance with SUN-Java-ORB-1.4
+  // and higher that sends fragmented requests of size 1024 bytes.
+  char buf [TAO_MAXBUFSIZE + ACE_CDR::MAX_ALIGNMENT];
 
-          // If this is a full GIOP fragment, then we need only
-          // to consolidate the fragments
-          if (missing_data == 0 &&
-              (qd->more_fragments_ ||
-               qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-            {
-              this->consolidate_fragments (qd, rh);
-            }
-          else
-            {
-              // Add it to the tail of the queue..
-              this->incoming_message_queue_.enqueue_tail (qd);
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
+  (void) ACE_OS::memset (buf,
+                         '\0',
+                         sizeof buf);
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 
-              if (this->incoming_message_queue_.is_head_complete ())
-                {
-                  return this->process_queue_head (rh);
-                }
-            }
-        }
-      else
-        {
-          // This block of code will only come into play when GIOP
-          // message fragmentation is employed.  If we have a fragment
-          // in the message queue, we can only chain message blocks
-          // onto the TAO_Queued_Data for that fragment.  Unless we have
-          // a full GIOP fragment, and since we know we're missing data,
-          // we need to save what we have until we can read in some more of
-          // the fragment until we get it all.  This bit of data could be
-          // larger than what the partial message block can hold, so we may
-          // need to grow the partial message block.
-          if (this->partial_message_ == 0)
-            {
-              this->allocate_partial_message_block ();
-            }
+  // Create a data block
+  ACE_Data_Block db (sizeof (buf),
+                     ACE_Message_Block::MB_DATA,
+                     buf,
+                     this->orb_core_->input_cdr_buffer_allocator (),
+                     this->orb_core_->locking_strategy (),
+                     ACE_Message_Block::DONT_DELETE,
+                     this->orb_core_->input_cdr_dblock_allocator ());
 
-          if (this->partial_message_ != 0)
-            {
-              const size_t incoming_length = incoming.length ();
-              ACE_CDR::grow (this->partial_message_,
-                             incoming_length);
-              if (this->partial_message_->copy (incoming.rd_ptr (),
-                                                incoming_length) == 0)
-                {
-                  incoming.rd_ptr (incoming_length);
-                }
-              else
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                                     "unable to save the partial message\n",
-                                     this->id ()),
-                                     -1);
-                }
-            }
-          else
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                                 "unable to allocate the partial message\n",
-                                 this->id ()),
-                                 -1);
-            }
-        }
+  // Create a message block
+  ACE_Message_Block message_block (&db,
+                                   ACE_Message_Block::DONT_DELETE,
+                                   this->orb_core_->input_cdr_msgblock_allocator ());
 
-      return 0;
-    }
 
-  // We don't have any missing data. Just make a queued_data node with
-  // the existing message block and send it to the higher layers of
-  // the ORB.
-  TAO_Queued_Data pqd (&incoming,
-                       this->orb_core_->transport_message_buffer_allocator ());
-  pqd.missing_data_ = missing_data;
-  this->messaging_object ()->get_message_data (&pqd);
+  // Align the message block
+  ACE_CDR::mb_align (&message_block);
 
-  // Check whether the message was fragmented and try to consolidate
-  // the fragments..
-  if (pqd.more_fragments_ ||
-      (pqd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-    {
-        // Duplicate the queued data as it is on stack..
-        TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd);
+  size_t recv_size = 0; // Note: unsigned integer
 
-        return this->consolidate_fragments (nqd, rh);
-    }
+  // Pointer to newly parsed message
+  TAO_Queued_Data *q_data = 0;
 
-  // Now we have a full message in our buffer. Just go ahead and
-  // process that
-  return this->process_parsed_messages (&pqd,
-                                        rh);
-}
+  // optimizing access of constants
+  const size_t header_length =
+            this->messaging_object ()->header_length ();
 
-int
-TAO_Transport::consolidate_fragments (TAO_Queued_Data *queueable_message,
-                                      TAO_Resume_Handle &rh)
-{
-  // Get the version numbers
-  CORBA::Octet major  = queueable_message->major_version_;
-  CORBA::Octet minor  = queueable_message->minor_version_;
-  CORBA::UShort whole = major << 8 | minor;
+  // paranoid check
+  if (header_length > message_block.space ())
+    {
+      return -1;
+    }
 
-  switch(whole)
+  if (this->orb_core_->orb_params ()->single_read_optimization ())
+    {
+      recv_size =
+        message_block.space ();
+    }
+  else
     {
-    case 0x0100:
-      if (!queueable_message->more_fragments_)
+      // Single read optimization has been de-activated. That means
+      // that we need to read from transport the GIOP header first
+      // before the payload. This codes first checks the incoming
+      // stack for partial messages which needs to be
+      // consolidated. Otherwise we are in new cycle, reading complete
+      // GIOP header of new incoming message.
+      if (this->incoming_message_stack_.top (q_data) != -1
+           && q_data->missing_data_ == TAO_MISSING_DATA_UNDEFINED)
         {
-          this->incoming_message_queue_.enqueue_tail (queueable_message);
+          // There is a partial message on incoming_message_stack_
+          // whose length is unknown so far. We need to consolidate
+          // the GIOP header to get to know the payload size,
+          recv_size = header_length - q_data->msg_block_->length ();
         }
       else
         {
-          // Fragments aren't supported in 1.0.  This is an error and
-          // we should reject it somehow.  What do we do here?  Do we throw
-          // an exception to the receiving side?  Do we throw an exception
-          // to the sending side?
-          //
-          // At the very least, we need to log the fact that we received
-          // nonsense.
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT("TAO (%P|%t) - ")
-                             ACE_TEXT("TAO_Transport::enqueue_incoming_message ")
-                             ACE_TEXT("detected a fragmented GIOP 1.0 message\n")),
-                            -1);
+          // Read amount of data forming GIOP header of new incoming
+          // message.
+          recv_size = header_length;
         }
-      break;
-    case 0x0101:
-      {
-        // One note is that TAO_Queued_Data contains version numbers,
-        // but doesn't indicate the actual protocol to which those
-        // version numbers refer.  That's not a problem, though, because
-        // instances of TAO_Queued_Data live in a queue, and that queue
-        // lives in a particular instance of a Transport, and the
-        // transport instance has an association with a particular
-        // messaging_object.  The concrete messaging object embodies a
-        // messaging protocol, and must cover all versions of that
-        // protocol.  Therefore, we just need to cover the bases of all
-        // versions of that one protocol.
-
-        // In 1.1, fragments kinda suck because they don't have they're
-        // own message-specific header.  Therefore, we have to find the
-        // fragment based on the major and minor version.
-        TAO_Queued_Data* fragment_message_chain =
-            this->incoming_message_queue_.find_fragment_chain (major, minor);
-
-        // Deal with the fragment and the queueable message
-        this->process_fragment (fragment_message_chain,
-                                queueable_message,
-                                major, minor, rh);
-        break;
-      }
-    case 0x0102:
-      {
-        // In 1.2, we get a little more context.  There's a
-        // FRAGMENT message-specific header, and inside that is the
-        // request id with which the fragment is associated.
-        TAO_Queued_Data* fragment_message_chain =
-            this->incoming_message_queue_.find_fragment_chain (
-                                  queueable_message->request_id_);
-
-        // Deal with the fragment and the queueable message
-        this->process_fragment (fragment_message_chain,
-                                queueable_message,
-                                major, minor, rh);
-        break;
-      }
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - ")
-                  ACE_TEXT("TAO_Transport::consolidate_fragments ")
-                  ACE_TEXT("can not handle a GIOP %d.%d ")
-                  ACE_TEXT("message\n"), major, minor));
-      ACE_HEX_DUMP ((LM_DEBUG,
-                     queueable_message->msg_block_->rd_ptr (),
-                     queueable_message->msg_block_->length ()));
-      return -1;
+      // POST: 0 <= recv_size <= header_length
     }
+  // POST: 0 <= recv_size <= message_block->space ()
 
-  return 0;
-}
-
-void
-TAO_Transport::process_fragment (TAO_Queued_Data* fragment_message_chain,
-                                 TAO_Queued_Data* queueable_message,
-                                 CORBA::Octet major,
-                                 CORBA::Octet minor,
-                                 TAO_Resume_Handle &rh)
-{
-  // No fragment was found
-  if (fragment_message_chain == 0)
-    {
-      this->incoming_message_queue_.enqueue_tail (queueable_message);
-    }
-  else
+  // If we have a partial message, copy it into our message block and
+  // clear out the partial message.
+  if (this->partial_message_ != 0 && this->partial_message_->length () > 0)
     {
-      if (fragment_message_chain->major_version_ != major ||
-          fragment_message_chain->minor_version_ != minor)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("TAO (%P|%t) - ")
-                    ACE_TEXT("TAO_Transport::process_fragment ")
-                    ACE_TEXT("GIOP versions do not match ")
-                    ACE_TEXT("(%d.%d != %d.%d\n"),
-                    fragment_message_chain->major_version_,
-                    fragment_message_chain->minor_version_,
-                    major, minor));
-
-      // Find the last message block in the continuation
-      ACE_Message_Block* mb = fragment_message_chain->msg_block_;
-      while (mb->cont () != 0)
-        mb = mb->cont ();
-
-      // Add the current message block to the end of the chain
-      // after adjusting the read pointer to skip the header(s)
-      const size_t header_adjustment =
-         this->messaging_object ()->header_length () +
-         this->messaging_object ()->fragment_header_length (major, minor);
-      queueable_message->msg_block_->rd_ptr(header_adjustment);
-      mb->cont (queueable_message->msg_block_);
-
-      // Remove our reference to the message block.  At this point
-      // the message block of the fragment head owns it as part of a
-      // chain
-      queueable_message->msg_block_ = 0;
-
-      if (!queueable_message->more_fragments_)
+      // (*) Copy back the partial message into current read-buffer,
+      // verify that the read-strategy of "recv_size" bytes is not
+      // exceeded. The latter check guarantees that recv_size does not
+      // roll-over and keeps in range
+      // 0<=recv_size<=message_block->space()
+      if (this->partial_message_->length () <= recv_size &&
+          message_block.copy (this->partial_message_->rd_ptr (),
+                              this->partial_message_->length ()) == 0)
         {
-          // This is the end of the fragments for this request
-          fragment_message_chain->consolidate ();
 
-          // Process the queue head to make sure that the newly
-          // consolidated fragments get handled
-          this->process_queue_head (rh);
+          recv_size -= this->partial_message_->length ();
+          this->partial_message_->reset ();
+        }
+      else
+        {
+          return -1;
         }
-
-      // Get rid of the queuable message
-      TAO_Queued_Data::release (queueable_message);
     }
-}
+  // POST: 0 <= recv_size <= buffer_space
 
-int
-TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
-                                          ssize_t missing_data,
-                                          TAO_Resume_Handle &rh,
-                                          ACE_Time_Value *max_wait_time)
-{
-  if (TAO_debug_level > 4)
+  if (0 >= recv_size) // paranoid: the check above (*) guarantees recv_size>=0
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue\n",
-                  this->id ()));
+      // This event would cause endless looping, trying frequently to
+      // read zero bytes from stream.  This might happen, if TAOs
+      // protocol implementation is not correct and tries to read data
+      // beyond header without "single_read_optimazation" being
+      // activated.
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
+             ACE_TEXT ("Error - endless loop detection, closing connection"),
+             this->id ()));
+        }
+      return -1;
     }
 
-  // If the queue did not have a complete message put this piece of
-  // message in the queue. We know it did not have a complete
-  // message. That is why we are here.
-  const size_t n =
-    this->incoming_message_queue_.copy_tail (incoming);
+  // Saving the size of the received buffer in case any one needs to
+  // get the size of the message thats received in the
+  // context. Obviously the value will be changed for each recv call
+  // and the user is supposed to invoke the accessor only in the
+  // invocation context to get meaningful information.
+  this->recv_buffer_size_ = recv_size;
 
-  if (TAO_debug_level > 6)
+  // Read the message into the  message block that we have created on
+  // the stack.
+  const ssize_t n = this->recv (message_block.wr_ptr (),
+                                recv_size,
+                                max_wait_time);
+
+  // If there is an error return to the reactor..
+  if (n <= 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                  "copied [%d] bytes to the tail\n",
-                  this->id (),
-                  n));
+      return n;
     }
 
-  // Update the missing data...
-  missing_data =
-    this->incoming_message_queue_.missing_data_tail ();
-
-  if (TAO_debug_level > 6)
+  if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                  "missing [%d] bytes in the tail message\n",
-                  this->id (),
-                  missing_data));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
+         ACE_TEXT ("read %d bytes\n"),
+         this->id (), n));
     }
 
-  // Move the read pointer of the <incoming> message block to the end
-  // of the copied message and process the remaining portion...
-  incoming.rd_ptr (n);
+  // Set the write pointer in the stack buffer
+  message_block.wr_ptr (n);
+
+  //
+  // STACK PROCESSING OR MESSAGE CONSOLIDATION
+  //
 
-  // If we have some more information left in the message block..
-  if (incoming.length ())
+  // PRE: data in buffer is aligned && message_block.length() > 0
+
+  if (this->incoming_message_stack_.top (q_data) != -1
+      && q_data->missing_data_ == TAO_MISSING_DATA_UNDEFINED)
     {
-      // We may have to parse & consolidate. This part of the message
-      // doesn't seem to be part of the last message in the queue (as
-      // the copy () hasn't taken away this message).
-      const int retval = this->parse_consolidate_messages (incoming,
-                                                           rh,
-                                                           max_wait_time);
+      //
+      // MESSAGE CONSOLIDATION
+      //
 
-      // If there is an error return
-      if (retval == -1)
+      // Partial message on incoming_message_stack_ needs to be
+      // consolidated.  The message header could not be parsed so far
+      // and therefor the message size is unknown yet. Consolidating
+      // the message destroys the memory alignment of succeeding
+      // messages sharing the buffer, for that reason consolidation
+      // and stack based processing are mutial exclusive.
+      if (this->messaging_object ()->consolidate_node (q_data,
+                                                       message_block) == -1)
         {
-          if (TAO_debug_level)
+           if (TAO_debug_level > 0)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                          "error while consolidating, part of the read message\n",
-                          this->id ()));
-            }
-          return retval;
+                ACE_ERROR ((LM_ERROR,
+                   ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
+                   ACE_TEXT ("error consolidating message from input buffer\n"),
+                   this->id () ));
+             }
+           return -1;
         }
-      else if (retval == 1)
-        {
-          // If the message in the <incoming> message block has only
-          // one message left we need to process that seperately.
 
-          // Get a queued data
-          TAO_Queued_Data *qd = this->make_queued_data (incoming);
-
-          // Get the rest of the message data
-          this->messaging_object ()->get_message_data (qd);
-
-          // Add the missing data to the queue
-          qd->missing_data_ = 0;
-
-          // Check whether the message was fragmented and try to consolidate
-          // the fragments..
-          if (qd->more_fragments_
-              || (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
+      // Complete message are to be enqueued and later processed
+      if (q_data->missing_data_ == 0)
+        {
+          if (this->incoming_message_stack_.pop (q_data) == -1)
             {
-              return this->consolidate_fragments (qd, rh);
+              return -1;
             }
 
-          // Add it to the tail of the queue..
-          this->incoming_message_queue_.enqueue_tail (qd);
+          if (this->consolidate_enqueue_message (q_data) == -1)
+            {
+              return -1;
+            }
+        }
 
-          // We should surely have a message in queue now. So just
-          // process that.
-          return this->process_queue_head (rh);
+      if (message_block.length () > 0
+          && this->handle_input_parse_extra_messages (message_block) == -1)
+        {
+          return -1;
         }
 
-      // parse_consolidate_messages () would have processed one of the
-      // messages, so we better return as we dont want to starve other
-      // threads.
-      return 0;
+      // In any case try to process the enqueued messages
+      if (this->process_queue_head (rh) == -1)
+        {
+          return -1;
+        }
     }
-
-  // If we still have some missing data..
-  if (missing_data > 0)
+  else
     {
-      // Get the last message from the Queue
-      TAO_Queued_Data *qd =
-        this->incoming_message_queue_.dequeue_tail ();
+      //
+      // STACK PROCESSING (critical path)
+      //
 
-      if (TAO_debug_level > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                      "trying recv, again\n",
-                      this->id ()));
-        }
+      // Process the first message in buffer on stack
 
-      // Try to do a read again. If we have some luck it would be
-      // great..
-      const ssize_t n = this->recv (qd->msg_block_->wr_ptr (),
-                                    missing_data,
-                                    max_wait_time);
+      // (PRE: first message resides in aligned memory) Make a node of
+      // the message-block..
 
-      if (TAO_debug_level > 5)
+      TAO_Queued_Data qd (&message_block,
+                          this->orb_core_->transport_message_buffer_allocator ());
+
+      size_t mesg_length  = 0;
+
+      if (this->messaging_object ()->parse_next_message (message_block,
+                                                         qd,
+                                                         mesg_length) == -1
+          || (qd.missing_data_ == 0
+              && mesg_length > message_block.length ()) )
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                      "recv retval [%d]\n",
-                      this->id (),
-                      n));
+          // extracting message failed
+          return -1;
         }
+      // POST: qd.missing_data_ == 0 --> mesg_length <= message_block.length()
+      // This prevents seeking rd_ptr behind the wr_ptr
 
-      // Error...
-      if (n < 0)
+      if (qd.missing_data_ != 0 ||
+          qd.more_fragments_   ||
+          qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
         {
-          return n;
-        }
+          if (qd.missing_data_ == 0)
+            {
+              // Dealing with a fragment
+              TAO_Queued_Data *nqd =
+                TAO_Queued_Data::duplicate (qd);
 
-      // If we get a EWOULDBLOCK ie. n==0, we should anyway put the
-      // message in queue before returning..
-      // Move the write pointer
-      qd->msg_block_->wr_ptr (n);
+              if (nqd == 0)
+                {
+                  return -1;
+                }
 
-      // Decrement the missing data
-      qd->missing_data_ -= n;
+              // mark the end of message in new buffer
+              char* end_mark = nqd->msg_block_->rd_ptr ()
+                             + mesg_length;
+              nqd->msg_block_->wr_ptr (end_mark);
 
-      // Now put the TAO_Queued_Data back in the queue
-      this->incoming_message_queue_.enqueue_tail (qd);
+              // move the read pointer forward in old buffer
+              message_block.rd_ptr (mesg_length);
 
-      // Any way as we have come this far and are about to return,
-      // just try to process a message if it is there in the queue.
-      if (this->incoming_message_queue_.is_head_complete ())
-        {
-          return this->process_queue_head (rh);
-        }
+              // enqueue the message
+              if (this->consolidate_enqueue_message (nqd) == -1)
+                {
+                  return -1;
+                }
 
-      return 0;
-    }
+              if (message_block.length () > 0
+                  && this->handle_input_parse_extra_messages (message_block) == -1)
+                {
+                  return -1;
+                }
 
-  // Process a message in the head of the queue if we have one..
-  return this->process_queue_head (rh);
-}
+              // In any case try to process the enqueued messages
+              if (this->process_queue_head (rh) == -1)
+                {
+                  return -1;
+                }
+            }
+          else if (qd.missing_data_ != TAO_MISSING_DATA_UNDEFINED)
+            {
+              // Incomplete message, must be the last one in buffer
 
+              if (qd.missing_data_ != TAO_MISSING_DATA_UNDEFINED &&
+                  qd.missing_data_ > message_block.space ())
+                {
+                  // Re-Allocate correct size on heap
+                  if (ACE_CDR::grow (qd.msg_block_,
+                                     message_block.length ()
+                                     + qd.missing_data_) == -1)
+                    {
+                      return -1;
+                    }
+                }
 
-int
-TAO_Transport::consolidate_extra_messages (ACE_Message_Block
-                                           &incoming,
-                                           TAO_Resume_Handle &rh)
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages\n",
-                  this->id ()));
-    }
+              TAO_Queued_Data *nqd =
+                TAO_Queued_Data::duplicate (qd);
 
-  // Pick the tail of the queue
-  TAO_Queued_Data *tail =
-    this->incoming_message_queue_.dequeue_tail ();
+              if (nqd == 0)
+                {
+                  return -1;
+                }
 
-  if (tail)
-    {
-      // If we have a node in the tail, checek to see whether it needs
-      // consolidation. If so, just consolidate it.
-      if (this->messaging_object ()->consolidate_node (tail, incoming) == -1)
-        {
-          return -1;
+              // move read-pointer to end of buffer
+              message_block.rd_ptr (message_block.length());
+
+              this->incoming_message_stack_.push (nqd);
+            }
         }
+      else
+        {
+          //
+          // critical path
+          //
 
-      // .. put the tail back in queue..
-      this->incoming_message_queue_.enqueue_tail (tail);
-    }
+          // We cant process the message on stack right now. First we
+          // have got to parse extra messages from message_block,
+          // putting them into queue.  When this is done we can return
+          // to process this message, and notifying other threads to
+          // process the messages in queue.
 
-  int retval = 1;
+          char * end_marker = message_block.rd_ptr ()
+                            + mesg_length;
 
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages, "
-                  "extracting extra messages\n",
-                  this->id ()));
-    }
+          if (message_block.length () > mesg_length)
+            {
+              // There are more message in data stream to be parsed.
+              // Safe the rd_ptr to restore later.
+              char *rd_ptr_stack_mesg = message_block.rd_ptr ();
 
-  // Extract messages..
-  while (retval == 1)
-    {
-      TAO_Queued_Data *q_data = 0;
+              // Skip parsed message, jump to next message in buffer
+              // PRE: mesg_length <= message_block.length ()
+              message_block.rd_ptr (mesg_length);
 
-      retval =
-        this->messaging_object ()->extract_next_message (incoming,
-                                                         q_data);
-      if (q_data)
-        {
-          // If we have read a framented message then...
-          if (q_data->more_fragments_ ||
-              q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
+              // Extract remaining messages and enqueue them for later
+              // heap processing
+              if (this->handle_input_parse_extra_messages (message_block) == -1)
+                {
+                  return -1;
+                }
+
+              // correct the end_marker
+              end_marker = message_block.rd_ptr ();
+
+              // Restore rd_ptr
+              message_block.rd_ptr (rd_ptr_stack_mesg);
+            }
+
+          // The following if-else has been copied from
+          // process_queue_head().  While process_queue_head()
+          // processes message on heap, here we will process a message
+          // on stack.
+
+          // Now that we have one message on stack to be processed,
+          // check whether we have one more message in the queue...
+          if (this->incoming_message_queue_.queue_length () > 0)
             {
-              this->consolidate_fragments (q_data, rh);
+              if (TAO_debug_level > 0)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                     ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
+                     ACE_TEXT ("notify reactor\n"),
+                     this->id ()));
+
+                }
+
+              const int retval = this->notify_reactor ();
+
+              if (retval == 1)
+                {
+                  // Let the class know that it doesn't need to resume  the
+                  // handle..
+                  rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
+                }
+              else if (retval < 0)
+                return -1;
             }
           else
             {
-              this->incoming_message_queue_.enqueue_tail (q_data);
+              // As there are no further messages in queue just resume
+              // the handle. Set the flag incase someone had reset the flag..
+              rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_RESUMABLE);
             }
-        }
-    }
 
-  // In case of error return..
-  if (retval == -1)
-    {
-      return retval;
+          // PRE: incoming_message_queue is empty
+          if (this->process_parsed_messages (&qd,
+                                             rh) == -1)
+            {
+              return -1;
+            }
+
+          // move the rd_ptr tp position of end_marker
+          message_block.rd_ptr (end_marker);
+        }
     }
 
-  return this->process_queue_head (rh);
+  // Now that all cases have been processed, there might be kept some data
+  // in buffer that needs to be safed for next "handle_input" invocations.
+   if (message_block.length () > 0)
+     {
+       if (this->partial_message_ == 0)
+         {
+           this->allocate_partial_message_block ();
+         }
+
+       if (this->partial_message_ != 0 &&
+           this->partial_message_->copy (message_block.rd_ptr (),
+                                         message_block.length ()) == 0)
+         {
+           message_block.rd_ptr (message_block.length ());
+         }
+       else
+         {
+           return -1;
+         }
+     }
+
+   return 0;
 }
 
+
 int
 TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
                                         TAO_Resume_Handle &rh)
 {
+  if (TAO_debug_level > 7)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
+         ACE_TEXT ("entering (missing data == %d)\n"),
+         this->id(), qd->missing_data_));
+    }
+
   // Get the <message_type> that we have received
   const TAO_Pluggable_Message_Type t = qd->msg_type_;
 
@@ -2153,9 +2077,9 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                    "received CloseConnection message - %m\n",
-                    this->id()));
+           ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
+           ACE_TEXT ("received CloseConnection message - %m\n"),
+           this->id()));
 
       // Return a "-1" so that the next stage can take care of
       // closing connection and the necessary memory management.
@@ -2189,22 +2113,46 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                        "error in process_reply_message - %m\n",
-                        this->id ()));
+               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
+               ACE_TEXT ("error in process_reply_message - %m\n"),
+               this->id ()));
 
           return -1;
         }
 
     }
+  else if (t == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST)
+    {
+      // The associated request might be incomplpete residing
+      // fragmented in messaging object. We must make sure the
+      // resources allocated by fragments are released.
+
+      if (this->messaging_object ()->discard_fragmented_message (qd) == -1)
+        {
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
+                 ACE_TEXT ("error processing CancelRequest\n"),
+                 this->id ()));
+            }
+        }
+
+      // We are not able to cancel requests being processed already;
+      // this is declared as optional feature by CORBA, and TAO does
+      // not support this currently.
+
+      // Just continue processing, CancelRequest does not mean to cut
+      // off the connection.
+    }
   else if (t == TAO_PLUGGABLE_MESSAGE_MESSAGERROR)
     {
-      if (TAO_debug_level)
+      if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                     "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                     "received MessageError, closing connection\n",
-                     this->id ()));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
+             ACE_TEXT ("received MessageError, closing connection\n"),
+             this->id ()));
         }
       return -1;
     }
@@ -2213,68 +2161,18 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
   return 0;
 }
 
-TAO_Queued_Data *
-TAO_Transport::make_queued_data (ACE_Message_Block &incoming)
-{
-  // Get an instance of TAO_Queued_Data
-  TAO_Queued_Data *qd =
-    TAO_Queued_Data::make_queued_data (
-      this->orb_core_->transport_message_buffer_allocator ());
-
-  // Get the flag for the details of the data block...
-  ACE_Message_Block::Message_Flags flg =
-    incoming.self_flags ();
-
-  if (ACE_BIT_DISABLED (flg,
-                        ACE_Message_Block::DONT_DELETE))
-    {
-      // Duplicate the data block before putting it in the queue.
-      qd->msg_block_ = ACE_Message_Block::duplicate (&incoming);
-    }
-  else
-    {
-      // As we are in CORBA mode, all the data blocks would be aligned
-      // on an 8 byte boundary. Hence create a data block for more
-      // than the actual length
-      ACE_Data_Block *db =
-        this->orb_core_->create_input_cdr_data_block (incoming.length ()+
-                                                      ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the allocator..
-      ACE_Allocator *alloc =
-        this->orb_core_->input_cdr_msgblock_allocator ();
-
-      // Make message block..
-      ACE_Message_Block mb (db,
-                            0,
-                            alloc);
-
-      // Duplicate the block..
-      qd->msg_block_ = mb.duplicate ();
-
-      // Align the message block
-      ACE_CDR::mb_align (qd->msg_block_);
-
-      // Copy the data..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            incoming.length ());
-    }
-
-  return qd;
-}
-
 int
 TAO_Transport::process_queue_head (TAO_Resume_Handle &rh)
 {
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::process_queue_head\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, %d enqueued\n"),
+         this->id (), this->incoming_message_queue_.queue_length () ));
     }
 
-  // See if the message in the head of the queue is complete...
-  if (this->incoming_message_queue_.is_head_complete () > 0)
+  // See if  message in queue ...
+  if (this->incoming_message_queue_.queue_length () > 0)
     {
       // Get the message on the head of the queue..
       TAO_Queued_Data *qd =
@@ -2283,21 +2181,21 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh)
       if (TAO_debug_level > 3)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::process_queue_head, "
-                      "the size of the queue is [%d]\n",
-                      this->id (),
-                      this->incoming_message_queue_.queue_length()));
+             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ")
+             ACE_TEXT ("the size of the queue is [%d]\n"),
+             this->id (),
+             this->incoming_message_queue_.queue_length()));
         }
       // Now that we have pulled out out one message out of the queue,
       // check whether we have one more message in the queue...
-      if (this->incoming_message_queue_.is_head_complete () > 0)
+      if (this->incoming_message_queue_.queue_length () > 0)
         {
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::process_queue_head, "
-                          "notify reactor\n",
-                          this->id ()));
+                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ")
+                 ACE_TEXT ("notify reactor\n"),
+                 this->id ()));
 
             }
 
@@ -2350,9 +2248,9 @@ TAO_Transport::notify_reactor (void)
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
-                  "notify to Reactor\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ")
+         ACE_TEXT ("notify to Reactor\n"),
+         this->id ()));
     }
 
 
@@ -2365,9 +2263,9 @@ TAO_Transport::notify_reactor (void)
       // @@todo: need to think about what is the action that
       // we can take when we get here.
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
-                  "notify to the reactor failed..\n",
-                  this->id ()));
+         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ")
+         ACE_TEXT ("notify to the reactor failed..\n"),
+         this->id ()));
     }
 
   return 1;
@@ -2468,10 +2366,10 @@ TAO_Transport::post_open (size_t id)
 
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport[%d]::post_connect , "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    this->id ()));
+           ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_connect , ")
+           ACE_TEXT ("could not register the transport ")
+           ACE_TEXT ("in the reactor.\n"),
+           this->id ()));
 
       return false;
     }
@@ -2486,7 +2384,11 @@ TAO_Transport::allocate_partial_message_block (void)
     {
       // This value must be at least large enough to hold a GIOP message
       // header plus a GIOP fragment header
-      const size_t partial_message_size = 16;
+      const size_t partial_message_size =
+        this->messaging_object ()->header_length ();
+       // + this->messaging_object ()->fragment_header_length ();
+       // deprecated, conflicts with not-single_read_opt.
+
       ACE_NEW (this->partial_message_,
                ACE_Message_Block (partial_message_size));
     }
@@ -2498,3 +2400,5 @@ TAO_Transport::allocate_partial_message_block (void)
  */
 
 //@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ca542ee7eb0..075d6565296 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Transport_Cache_Manager.h"
+#include "tao/Transport_Cache_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,13 @@
 
 #include "tao/Transport_Timer.h"
 #include "tao/Incoming_Message_Queue.h"
+#include "tao/Incoming_Message_Stack.h"
 #include "ace/Time_Value.h"
 
+struct iovec;
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Target_Specification;
 class TAO_Operation_Details;
@@ -41,7 +46,6 @@ class TAO_Queued_Message;
 class TAO_Synch_Queued_Message;
 class TAO_Resume_Handle;
 class TAO_Stub;
-struct iovec;
 
 namespace TAO
 {
@@ -179,18 +183,20 @@ namespace TAO
  *
  * We solve the problems as follows
  *
- *  (a) First do a read with the buffer on stack. Query the underlying
- *      messaging object whether the message has any incomplete
- *      portion. If so, we just grow the buffer for the missing size
- *      and read the rest of the message. We free the handle and then
- *      send the message to the higher layers of the ORB for
- *      processing.
+ *   (a) First do a read with the buffer on stack. Query the underlying
+ *       messaging object whether the message has any incomplete
+ *       portion. If so, data will be copied into new buffer being able
+ *       to hold full message and is queued; succeeding events will read
+ *       data from socket and write directly into this buffer.
+ *       Otherwise, if if the message in local buffer is complete, we free
+ *       the handle and then send the message to the higher layers of the
+ *       ORB for processing.
  *
- *   (b) If we block (ie. if we receive a EWOULDBLOCK) while trying to
- *       do the above (ie. trying to read after growing the buffer
- *       size) we put the message in a queue and return back to the
- *       reactor. The reactor would call us back when the handle
- *       becomes read ready.
+ *   (b) If buffer with incomplete message has been enqueued, while trying
+ *       to do the above, the reactor will call us back when the handle
+ *       becomes read ready. The read-operation will copy data directly
+ *       into the enqueued buffer.  If the message has bee read completely
+ *       the message is sent to the higher layers of the ORB for processing.
  *
  *   (c) If we get multiple messages (possible if the client connected
  *       to the server sends oneways or AMI requests), we parse and
@@ -364,9 +370,7 @@ public:
    * transformations of the data, such as SSLIOP or protocols that
    * compress the stream.
    *
-   * @param mblk contains the data that must be sent.  For each
-   * message block in the cont() chain all the data between rd_ptr()
-   * and wr_ptr() should be delivered to the remote peer.
+   * @param iov contains the data that must be sent.
    *
    * @param timeout is the maximum time that the application is
    * willing to wait for the data to be sent, useful in platforms that
@@ -389,7 +393,8 @@ public:
    * down).  In that case, it returns -1 and sets errno to
    * <code>ENOENT</code>.
    */
-  virtual ssize_t send (iovec *iov, int iovcnt,
+  virtual ssize_t send (iovec *iov,
+                        int iovcnt,
                         size_t &bytes_transferred,
                         const ACE_Time_Value *timeout = 0) = 0;
 
@@ -458,8 +463,7 @@ public:
    * valid certificates. There are no pre_connect_hooks () since the
    * transport doesn't exist before a connection establishment. :-)
    *
-   *
-   * @@NOTE: The methods are not made const with a reason.
+   * @note The methods are not made const with a reason.
    */
   virtual bool post_connect_hook (void);
 
@@ -643,60 +647,11 @@ public:
 
 protected:
 
-  /// Called by the handle_input_i(). This method is used to parse
-  /// message read by the handle_input_i() call. It also decides
-  /// whether the message  needs consolidation before processing.
-  int parse_consolidate_messages (ACE_Message_Block &bl,
-                                  TAO_Resume_Handle &rh,
-                                  ACE_Time_Value *time = 0);
-
-
-  /// Method does parsing of the message if we have a fresh message in
-  /// the @a message_block or just returns if we have read part of the
-  /// previously stored message.
-  int parse_incoming_messages (ACE_Message_Block &message_block);
-
-  /// Return if we have any missing data in the queue of messages
-  /// or determine if we have more information left out in the
-  /// presently read message to make it complete.
-  ssize_t missing_data (ACE_Message_Block &message_block);
-
-  /// Consolidate the currently read message or consolidate the last
-  /// message in the queue. The consolidation of the last message in
-  /// the queue is done by calling consolidate_message_queue ().
-  virtual int consolidate_message (ACE_Message_Block &incoming,
-                                   ssize_t missing_data,
-                                   TAO_Resume_Handle &rh,
-                                   ACE_Time_Value *max_wait_time);
-
-  /// @@Bala: Docu???
-  int consolidate_fragments (TAO_Queued_Data *qd,
-                             TAO_Resume_Handle &rh);
-
-  /// First consolidate the message queue.  If the message is still not
-  /// complete, try to read from the handle again to make it
-  /// complete. If these dont help put the message back in the queue
-  /// and try to check the queue if we have message to process. (the
-  /// thread  needs to do some work anyway :-))
-  int consolidate_message_queue (ACE_Message_Block &incoming,
-                                 ssize_t missing_data,
-                                 TAO_Resume_Handle &rh,
-                                 ACE_Time_Value *max_wait_time);
-
-  /// Called by parse_consolidate_message () if we have more messages
-  /// in one read. Queue up the messages and try to process one of
-  /// them, atleast at the head of them.
-  int consolidate_extra_messages (ACE_Message_Block &incoming,
-                                  TAO_Resume_Handle &rh);
-
   /// Process the message by sending it to the higher layers of the
   /// ORB.
   int process_parsed_messages (TAO_Queued_Data *qd,
                                TAO_Resume_Handle &rh);
 
-  /// Make a queued data from the @a incoming message block
-  TAO_Queued_Data *make_queued_data (ACE_Message_Block &incoming);
-
   /// Implement send_message_shared() assuming the handler_lock_ is
   /// held.
   int send_message_shared_i (TAO_Stub *stub,
@@ -884,10 +839,37 @@ private:
   /// Print out error messages if the event handler is not valid
   void report_invalid_event_handler (const char *caller);
 
+  /// Is invoked by handle_input operation. It consolidate message on
+  /// top of incoming_message_stack.  The amount of missing data is
+  /// known and recv operation copies data directly into message buffer,
+  /// as much as a single recv-invocation provides.
+  int handle_input_missing_data (TAO_Resume_Handle &rh,
+                                 ACE_Time_Value *max_wait_time,
+                                 TAO_Queued_Data *q_data);
+
+  /// Is invoked by handle_input operation. It parses new messages from input stream
+  /// or consolidates messages whose header has been partially read, the message
+  /// size being unknown so far. It parses as much data as a single recv-invocation provides.
+  int handle_input_parse_data (TAO_Resume_Handle &rh,
+                               ACE_Time_Value *max_wait_time);
+
+  /// Is invoked by handle_input_parse_data. Parses all messages remaining
+  /// in @a message_block.
+  int handle_input_parse_extra_messages (ACE_Message_Block &message_block);
+
+  /// @return -1 error, otherwise 0
+  int consolidate_enqueue_message (TAO_Queued_Data *qd);
+
+  /// @return -1 error, otherwise 0
+  int consolidate_process_message (TAO_Queued_Data *qd, TAO_Resume_Handle &rh);
+
   /*
    * Process the message that is in the head of the incoming queue.
    * If there are more messages in the queue, this method calls
    * this->notify_reactor () to wake up a thread
+   * @retval -1 on error
+   * @retval 0 if successfully processing enqueued messages
+   * @retval 1 if no message present in queue
    */
   int process_queue_head (TAO_Resume_Handle &rh);
 
@@ -900,21 +882,13 @@ private:
   /// Assume the lock is held
   void send_connection_closed_notifications_i (void);
 
-  /// Process a non-version specific fragment by either consolidating
-  /// the fragments or enqueuing the queueable message
-  void process_fragment (TAO_Queued_Data* fragment_message,
-                         TAO_Queued_Data* queueable_message,
-                         CORBA::Octet major,
-                         CORBA::Octet minor,
-                         TAO_Resume_Handle &rh);
-
   /// Allocate a partial message block and store it in our
   /// partial_message_ data member.
   void allocate_partial_message_block (void);
 
-  /// Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&))
+  // Disallow copying and assignment.
+  TAO_Transport (const TAO_Transport&);
+  void operator= (const TAO_Transport&);
 
   /*
    * Specialization hook to add concrete private methods from
@@ -926,12 +900,12 @@ private:
 protected:
 
   /// IOP protocol tag.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
 
   /// Global orbcore resource.
-  TAO_ORB_Core *orb_core_;
+  TAO_ORB_Core * const orb_core_;
 
-  /// Our entry in the cache. We dont own this. It is here for our
+  /// Our entry in the cache. We don't own this. It is here for our
   /// convenience. We cannot just change things around.
   TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry_;
 
@@ -969,10 +943,14 @@ protected:
   TAO_Queued_Message *head_;
   TAO_Queued_Message *tail_;
 
-  /// Queue of the incoming messages..
+  /// Queue of the consolidated, incoming messages..
   TAO_Incoming_Message_Queue incoming_message_queue_;
 
-  /// The queue will start draining no later than <queing_deadline_>
+  /// Stack of incoming fragments, consolidated messages
+  /// are going to be enqueued in "incoming_message_queue_"
+  TAO::Incoming_Message_Stack incoming_message_stack_;
+
+  /// The queue will start draining no later than <queeing_deadline_>
   /// *if* the deadline is
   ACE_Time_Value current_deadline_;
 
@@ -1064,8 +1042,10 @@ private:
 
 //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Transport.inl"
+# include "tao/Transport.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index 6c0d7d0093a..ef9faafb1ac 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_Transport::tag (void) const
 {
@@ -186,4 +189,4 @@ TAO_Transport::sent_byte_count (void) const
   return this->sent_byte_count_;
 }
 
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
index a4825e9286c..5fd09d0c402 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -1,17 +1,18 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "Transport_Acceptor.h"
+#include "tao/Transport_Acceptor.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Transport_Acceptor.inl"
+# include "tao/Transport_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            Acceptor,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
   : tag_ (tag)
 {
@@ -24,3 +25,5 @@ TAO_Acceptor::~TAO_Acceptor (void)
 }
 
 //@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index ea5df9baf97..f49ac1b4190 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -27,8 +27,13 @@
 #include "tao/Basic_Types.h"
 
 // Forward declarations.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Addr;
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_MProfile;
 class TAO_Endpoint;
@@ -139,7 +144,7 @@ public:
 
 private:
   /// IOP protocol tag.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
 
   /*
    * Hook to add data members from concrete acceptor implementations onto
@@ -150,8 +155,10 @@ private:
 
 //@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Transport_Acceptor.inl"
+# include "tao/Transport_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl
index 7d91a8330a3..7767ec6b43e 100644
--- a/TAO/tao/Transport_Acceptor.inl
+++ b/TAO/tao/Transport_Acceptor.inl
@@ -1,7 +1,13 @@
 // -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::ULong
 TAO_Acceptor::tag (void) const
 {
   return this->tag_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 9a44900fe59..67f196cbc05 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -1,12 +1,12 @@
 //$Id$
-#include "Transport_Cache_Manager.h"
-#include "Transport.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "Connection_Purging_Strategy.h"
-#include "Client_Strategy_Factory.h"
-#include "Condition.h"
-#include "Wait_Strategy.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Transport.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/Connection_Purging_Strategy.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/Condition.h"
+#include "tao/Wait_Strategy.h"
 #include "ace/ACE.h"
 #include "ace/Reactor.h"
 
@@ -15,11 +15,13 @@
 #endif /* __ACE_INLINE__ */
 
 
-
 ACE_RCSID (tao,
            Transport_Cache_Manager,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Transport_Cache_Manager::Transport_Cache_Manager (TAO_ORB_Core &orb_core)
@@ -717,3 +719,5 @@ namespace TAO
   }
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
index 749cbe9492d..37a3643fe3e 100644
--- a/TAO/tao/Transport_Cache_Manager.h
+++ b/TAO/tao/Transport_Cache_Manager.h
@@ -25,15 +25,20 @@
 #include "tao/Cache_Entries.h"
 #include "tao/orbconf.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Handle_Set;
+template <class T> class ACE_Unbounded_Set;
+template <class T> class ACE_Unbounded_Set_Iterator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Connection_Handler;
 class TAO_ORB_Core;
 class TAO_Resource_Factory;
 class TAO_Connection_Purging_Strategy;
 
 template <class ACE_COND_MUTEX> class TAO_Condition;
-template <class T> class ACE_Unbounded_Set;
-template <class T> class ACE_Unbounded_Set_Iterator;
 
 namespace TAO
 {
@@ -259,6 +264,9 @@ namespace TAO
   };
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Transport_Cache_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Cache_Manager.inl b/TAO/tao/Transport_Cache_Manager.inl
index 08c81369837..ed53a1a4f90 100644
--- a/TAO/tao/Transport_Cache_Manager.inl
+++ b/TAO/tao/Transport_Cache_Manager.inl
@@ -1,5 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //$Id$
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   ACE_INLINE int
@@ -148,3 +153,5 @@ namespace TAO
     return this->cache_map_;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index f81e882b419..0d6c1ee6692 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -1,34 +1,37 @@
-#include "Transport_Connector.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "MProfile.h"
-#include "Profile.h"
-#include "Environment.h"
-#include "Thread_Lane_Resources.h"
-#include "debug.h"
-#include "Connect_Strategy.h"
-#include "Client_Strategy_Factory.h"
-#include "Connection_Handler.h"
-#include "Profile_Transport_Resolver.h"
-#include "Wait_Strategy.h"
-#include "SystemException.h"
+#include "tao/Transport_Connector.h"
+#include "tao/Transport.h"
+#include "tao/ORB_Core.h"
+#include "tao/MProfile.h"
+#include "tao/Profile.h"
+#include "tao/Environment.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/debug.h"
+#include "tao/Connect_Strategy.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/Connection_Handler.h"
+#include "tao/Profile_Transport_Resolver.h"
+#include "tao/Wait_Strategy.h"
+#include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
 //@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK
 
 #if !defined (__ACE_INLINE__)
-# include "Transport_Connector.inl"
+# include "tao/Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            Connector,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Connector
 TAO_Connector::TAO_Connector (CORBA::ULong tag)
   : active_connect_strategy_ (0),
-    tag_(tag),
+    tag_ (tag),
     orb_core_ (0)
 {
 }
@@ -173,8 +176,8 @@ TAO_Connector::make_mprofile (const char *string,
   //    `shu/arf'
   //    `1.1@chicken/arf'
 
-  int begin = 0;
-  int end = ior_index - 1;
+  ssize_t begin = 0;
+  ssize_t end = ior_index - 1;
   // Initialize the end of the endpoint index
 
   for (CORBA::ULong j = 0; j < profile_count; ++j)
@@ -190,7 +193,7 @@ TAO_Connector::make_mprofile (const char *string,
           end = objkey_index;  // Handle last endpoint differently
         }
 
-      if (end < static_cast<int> (ior.length ()) && end != ior.npos)
+      if (end < static_cast<ssize_t> (ior.length ()) && end != ior.npos)
         {
           ACE_CString endpoint = ior.substring (begin, end - begin);
 
@@ -527,3 +530,5 @@ TAO_Connector::check_connection_closure (
 }
 
 //@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 720aaab0e76..e29d0b251b3 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -23,10 +23,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "Basic_Types.h"
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport_Descriptor_Interface;
 class TAO_InputCDR;
 class TAO_Endpoint;
@@ -187,7 +192,7 @@ protected:
 private:
 
   /// IOP protocol tag.
-  CORBA::ULong tag_;
+  CORBA::ULong const tag_;
 
   /// Pointer to our ORB core
   TAO_ORB_Core *orb_core_;
@@ -197,8 +202,10 @@ private:
 
 //@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Transport_Connector.inl"
+# include "tao/Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
index c25d96057fb..64683bc6a14 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -1,5 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE TAO_ORB_Core *
 TAO_Connector::orb_core (void)
 {
@@ -17,3 +21,5 @@ TAO_Connector::tag (void) const
 {
   return this->tag_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index 6882cc3b8a6..a58af5ac064 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -10,11 +10,15 @@ ACE_RCSID (tao,
            Transport_Descriptor_Interface,
            "$Id$")
 
-TAO_Transport_Descriptor_Interface::
-    ~TAO_Transport_Descriptor_Interface (void)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
 {
   if (this->endpoint_from_heap_)
     {
       delete this->endpoint_;
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index 7eba381787f..0934238d072 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -23,6 +23,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Endpoint;
 
 /**
@@ -84,6 +86,8 @@ protected:
   CORBA::Boolean endpoint_from_heap_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/Transport_Descriptor_Interface.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 97bcf5291f4..6d1bbcb6d56 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -1,21 +1,24 @@
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-TAO_Transport_Descriptor_Interface::
-    TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
-                                        CORBA::Boolean flag)
-      : endpoint_ (endpoint),
-        bidir_flag_ (0),
-        endpoint_from_heap_ (flag)
+TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (
+  TAO_Endpoint *endpoint,
+  CORBA::Boolean flag)
+  : endpoint_ (endpoint),
+    bidir_flag_ (false),
+    endpoint_from_heap_ (flag)
 {
 }
 
 ACE_INLINE
-TAO_Transport_Descriptor_Interface::
-    TAO_Transport_Descriptor_Interface (void)
-      : endpoint_ (0),
-        bidir_flag_ (0),
-        endpoint_from_heap_ (0)
+TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
+  : endpoint_ (0),
+    bidir_flag_ (false),
+    endpoint_from_heap_ (false)
 {
 }
 
@@ -32,3 +35,5 @@ TAO_Transport_Descriptor_Interface::set_bidir_flag (CORBA::Boolean flag)
 {
   this->bidir_flag_ = flag;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index e11ed482657..beb04aba840 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -6,6 +6,9 @@ ACE_RCSID (tao,
            Transport_Mux_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
   TAO_Transport *transport)
   : transport_ (transport)
@@ -16,3 +19,5 @@ TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
 TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 9e019e5311c..1dcc0f2ba11 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -23,10 +23,15 @@
 
 #include "tao/Basic_Types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Reply_Dispatcher;
 class TAO_Transport;
 class TAO_Pluggable_Reply_Params;
-class ACE_Lock;
 
 /**
  * @class TAO_Transport_Mux_Strategy
@@ -93,6 +98,8 @@ protected:
   ACE_Lock *lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index 17235308f7a..4de33f760dd 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Transport_Queueing_Strategies.h"
-#include "Buffering_Constraint_Policy.h"
-#include "Stub.h"
-#include "debug.h"
+#include "tao/Transport_Queueing_Strategies.h"
+#include "tao/Buffering_Constraint_Policy.h"
+#include "tao/Stub.h"
+#include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
@@ -12,6 +12,9 @@ ACE_RCSID (tao,
            Transport_Queueing_Strategies,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void)
@@ -224,3 +227,5 @@ namespace TAO
   #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h
index ad572969725..56ba66149ee 100644
--- a/TAO/tao/Transport_Queueing_Strategies.h
+++ b/TAO/tao/Transport_Queueing_Strategies.h
@@ -27,8 +27,13 @@
 #include "tao/orbconf.h"
 #include "tao/Basic_Types.h"
 
-class TAO_Stub;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Stub;
 
 namespace TAO
 {
@@ -173,6 +178,8 @@ namespace TAO
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TRANSPORT_QUEUEING_STRATEGY_H */
diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp
index 0d592fb8459..6a704fbd72f 100644
--- a/TAO/tao/Transport_Timer.cpp
+++ b/TAO/tao/Transport_Timer.cpp
@@ -1,13 +1,14 @@
-// -*- C++ -*-
 // $Id$
 
-#include "Transport_Timer.h"
-#include "Transport.h"
+#include "tao/Transport_Timer.h"
+#include "tao/Transport.h"
 
 ACE_RCSID (tao, 
            Transport_Timer, 
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport)
   : transport_ (transport)
 {
@@ -19,3 +20,5 @@ TAO_Transport_Timer::handle_timeout (const ACE_Time_Value &current_time,
 {
   return this->transport_->handle_timeout (current_time, act);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h
index b951456e0cb..ddd3e8d8b4d 100644
--- a/TAO/tao/Transport_Timer.h
+++ b/TAO/tao/Transport_Timer.h
@@ -20,7 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
 
@@ -33,7 +36,7 @@ class TAO_Transport;
  *        is a TAO_Transport and the client is the Reactor.
  *
  */
-class TAO_Export TAO_Transport_Timer : public ACE_Event_Handler
+class TAO_Transport_Timer : public ACE_Event_Handler
 {
 public:
   /// Constructor
@@ -51,6 +54,8 @@ private:
   TAO_Transport *transport_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_TRANSPORT_TIMER_H */
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index e74548609e5..3a8f77cdb6d 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Recursive_TypeCode.h"
+#include "tao/TypeCodeFactory/Recursive_TypeCode.h"
 
 #ifndef __ACE_INLINE__
-# include "Recursive_TypeCode.inl"
+# include "tao/TypeCodeFactory/Recursive_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
 #include "tao/SystemException.h"
@@ -14,6 +14,7 @@ ACE_RCSID (TypeCodeFactory,
            Recursive_TypeCode,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
@@ -276,3 +277,5 @@ TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
   return
     this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index 1636cb666ad..0f92a9bdc8b 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -20,6 +20,8 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace TypeCodeFactory
@@ -118,6 +120,7 @@ namespace TAO
   }  // End namespace TypeCodeFactory
 }  // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #ifdef __ACE_INLINE__
 # include "tao/TypeCodeFactory/Recursive_TypeCode.inl"
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
index a053fbddf5d..2a425197aa7 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
@@ -2,11 +2,12 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id)
-  : CORBA::TypeCode (CORBA::TAO_TC_KIND_COUNT)
-  , ACE_NESTED_CLASS (TAO, True_RefCount_Policy) ()
+  : ::CORBA::TypeCode (CORBA::TAO_TC_KIND_COUNT)
+  , ::TAO::True_RefCount_Policy ()
   , id_ (id)
   , the_typecode_ ()
 {
@@ -26,3 +27,5 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc)
   mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
index 555d87f9b75..5bcf47ab3d8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -30,11 +30,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "TypeCodeFactoryC.h"
+#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -127,3 +129,5 @@ operator>>= (
         _tao_elem
       );
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index abf38c85ea0..75c2d968c94 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "TypeCodeFactoryC.h"
+#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,6 +40,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -64,7 +66,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::release (
     CORBA::TypeCodeFactory_ptr p
   )
 {
-  CORBA::release (p);
+  ::CORBA::release (p);
 }
 
 CORBA::TypeCodeFactory_ptr
@@ -88,12 +90,12 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void)
 CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 {}
 
-void 
+void
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeCodeFactory *_tao_tmp_pointer =
     static_cast<TypeCodeFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
+  ::CORBA::release (_tao_tmp_pointer);
 }
 
 CORBA::TypeCodeFactory_ptr
@@ -106,10 +108,10 @@ CORBA::TypeCodeFactory::_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-  
+
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-  
+
   return TypeCodeFactory::_duplicate (proxy);
 }
 
@@ -123,28 +125,28 @@ CORBA::TypeCodeFactory::_unchecked_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-  
+
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-  
+
   return TypeCodeFactory::_duplicate (proxy);
 }
 
 CORBA::TypeCodeFactory_ptr
 CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
 {
-  if (! CORBA::is_nil (obj))
+  if (! ::CORBA::is_nil (obj))
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void
 CORBA::TypeCodeFactory::_tao_release (TypeCodeFactory_ptr obj)
 {
-  CORBA::release (obj);
+  ::CORBA::release (obj);
 }
 
 CORBA::Boolean
@@ -186,3 +188,5 @@ CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index a620aa9caec..8548e8e4cee 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "typecodefactory_export.h"
+#include "tao/TypeCodeFactory/typecodefactory_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -68,6 +68,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -454,6 +456,8 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 3c041038f87..29fb9ac421f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "TypeCodeFactory_Adapter_Impl.h"
-#include "TypeCodeFactory_i.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
 
 #include "tao/ORB_Core.h"
 
@@ -12,6 +12,8 @@ ACE_RCSID (TypeCodeFactory,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
 {
 }
@@ -407,6 +409,8 @@ TAO_TypeCodeFactory_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Adapter_Impl);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (
     TAO_TypeCodeFactory_Adapter_Impl,
     ACE_TEXT ("Concrete_TypeCodeFactory_Adapter"),
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index b0d09a41fb4..5f20f2af5b8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_TYPECODEFACTORY_ADAPTER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "typecodefactory_export.h"
+#include "tao/TypeCodeFactory/typecodefactory_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 #include "ace/Service_Config.h"
 #include "tao/default_environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_TypeCodeFactory_Adapter_Impl
  *
@@ -248,12 +250,15 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
-
 static int
 TAO_Requires_TypeCodeFactory_Initializer =
   TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
+
+
 #include /**/ "ace/post.h"
 #endif /* TAO_TYPECODEFACTORY_ADAPTER_IMPL_H */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index b6fcd5eb57e..36d20aeda87 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // =================================================================
@@ -14,10 +15,15 @@
 //
 // =================================================================
 
-#include "TypeCodeFactory_Loader.h"
-#include "TypeCodeFactory_i.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
+#include "ace/Log_Msg.h"
+
+ACE_RCSID(TypeCodeFactory,
+          TypeCodeFactory_Loader,
+          "$Id$")
 
-ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 {
@@ -43,6 +49,9 @@ TAO_TypeCodeFactory_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 ACE_STATIC_SVC_DEFINE (
     TAO_TypeCodeFactory_Loader,
     ACE_TEXT ("TypeCodeFactory_Loader"),
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 7cef34fafe8..55a524c32b8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,7 +14,7 @@
 #define TAO_TYPECODEFACTORY_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "typecodefactory_export.h"
+#include "tao/TypeCodeFactory/typecodefactory_export.h"
 #include "tao/Object_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,6 +23,8 @@
 
 #include "ace/Service_Config.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_TypeCodeFactory_Loader
  *
@@ -47,14 +49,16 @@ public:
   static int Initializer (void);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
-
 static int
 TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer ();
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
+ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
+
 #define TAO_TYPECODEFACTORY_SAFE_INCLUDE
-#include "TypeCodeFactoryC.h"
+#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
 #undef TAO_TYPECODEFACTORY_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 70f43e88f16..66169ee26f6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Recursive_TypeCode.h"
-#include "TypeCodeFactory_i.h"
+#include "tao/TypeCodeFactory/Recursive_TypeCode.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
 
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -44,6 +44,7 @@ ACE_RCSID (TypeCodeFactory,
            TypeCodeFactory_i,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TCF
 {
@@ -687,16 +688,9 @@ TAO_TypeCodeFactory_i::create_enum_tc (
                             tc);
         }
 
-      enumerators[index] = members[index].in ();
-
-//       cdr << members[index].in ();
+      enumerators[index] = members[index];
     }
 
-//   return this->assemble_tc (cdr,
-//                             CORBA::tk_enum,
-//                             0
-//                             ACE_ENV_ARG_PARAMETER);
-
   typedef TAO::TypeCode::Enum<
     CORBA::String_var,
     ACE_Array_Base<CORBA::String_var>,
@@ -2097,3 +2091,5 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
   return tc;
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 82a138ef191..e463d0a4169 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -14,7 +14,7 @@
 #define TAO_TYPECODEFACTORY_I_H
 
 #include /**/ "ace/pre.h"
-#include "TypeCodeFactory_Loader.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -312,6 +313,8 @@ private:
   TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 1e6e09eb1ff..03bdcd4f455 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -24,7 +24,11 @@
 #include "tao/Environment.h"
 #include "tao/Typecode_typesC.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template<class T> class ACE_Array_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -271,6 +275,8 @@ public:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TYPECODEFACTORY_ADAPTER_H */
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
index bff34272a23..bf8cc72d22a 100644
--- a/TAO/tao/Typecode_typesC.cpp
+++ b/TAO/tao/Typecode_typesC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "Typecode_typesC.h"
+#include "tao/Typecode_typesC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,6 +39,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -65,3 +67,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::TCKind & _tao_enumerator)
   
   return _tao_success;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
index 3d411afc9e6..5c6dfd896d8 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -58,6 +58,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -133,6 +135,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &);
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a84a261ed85..ede48dd16e4 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_UB_STRING_ARGUMENT_T_C
-#define TAO_UB_STRING_ARGUMENT_T_C
+#ifndef TAO_UB_STRING_ARGUMENT_T_CPP
+#define TAO_UB_STRING_ARGUMENT_T_CPP
 
 #include "tao/UB_String_Argument_T.h"
 #include "tao/CDR.h"
@@ -10,9 +10,7 @@
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           UB_String_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -102,4 +100,6 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_UB_STRING_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_UB_STRING_ARGUMENT_T_CPP */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 2b4b3d25214..5b269e0a570 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @authors Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -21,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -146,6 +149,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index b6f6a97db6e..370d3931dd9 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,8 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (const S * x)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (
+  const S * x)
   : x_ (x)
 {}
 
@@ -77,3 +82,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::retn (void)
   return this->x_._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
index a5268d9a6d2..7e78f4749fa 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -51,5 +53,7 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UB_STRING_ARGUMENTS_H */
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index 9b7bed6d5f2..108d4780a22 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "ULongLongSeqC.h"
+#include "tao/ULongLongSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ULONGLONGSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::ULongLongSeq::ULongLongSeq (void)
 CORBA::ULongLongSeq::ULongLongSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULongLong
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::ULongLongSeq::ULongLongSeq (
     ::CORBA::ULongLong * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULongLong
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::ULongLongSeq::ULongLongSeq (
 CORBA::ULongLongSeq::ULongLongSeq (
     const ULongLongSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULongLong
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::ULongLongSeq::_tao_any_destructor (
     const CORBA::ULongLongSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::ULongLongSeq::_tao_any_destructor (
     CORBA::ULongLongSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h
index 9210eeb57fe..94af13b4328 100644
--- a/TAO/tao/ULongLongSeqC.h
+++ b/TAO/tao/ULongLongSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ULONGLONGSEQ_CH_)
 #define _CORBA_ULONGLONGSEQ_CH_
-  
+
   class ULongLongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        ULongLongSeq,
-        CORBA::ULongLong
+        ULongLongSeq
       >
     ULongLongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ULongLongSeq,
-        ULongLongSeq_var,
-        CORBA::ULongLong
+        ULongLongSeq
       >
     ULongLongSeq_out;
-  
+
   class TAO_Export ULongLongSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::ULongLong
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     ULongLongSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::ULongLong* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::ULongLong* buffer,
+        ::CORBA::Boolean release = false
       );
     ULongLongSeq (const ULongLongSeq &);
     ~ULongLongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ULongLongSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 8fc6a35358a..33def028c72 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:288
 
 
-#include "ULongSeqC.h"
+#include "tao/ULongSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ULONGSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::ULongSeq::ULongSeq (void)
 CORBA::ULongSeq::ULongSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULong
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::ULongSeq::ULongSeq (
     CORBA::ULong * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULong
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::ULongSeq::ULongSeq (
 CORBA::ULongSeq::ULongSeq (
     const ULongSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::ULong
       >
     (seq)
@@ -105,15 +107,7 @@ CORBA::Boolean operator<< (
     const CORBA::ULongSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ CORBA::Boolean operator>> (
     CORBA::ULongSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
index 07d71927c92..877065e7585 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -60,35 +60,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ULONGSEQ_CH_)
 #define _CORBA_ULONGSEQ_CH_
-  
+
   class ULongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        ULongSeq,
-        CORBA::ULong
+        ULongSeq
       >
     ULongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        ULongSeq,
-        ULongSeq_var,
-        CORBA::ULong
+        ULongSeq
       >
     ULongSeq_out;
-  
+
   class TAO_Export ULongSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::ULong
           >
   {
@@ -98,14 +97,14 @@ namespace CORBA
     ULongSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
+        CORBA::ULong* buffer,
+        CORBA::Boolean release = false
       );
     ULongSeq (const ULongSeq &);
     ~ULongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ULongSeq_var _var_type;
   };
 
@@ -144,6 +143,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index 178d8264a70..53db618d251 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "UShortSeqC.h"
+#include "tao/UShortSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,13 +39,15 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_USHORTSEQ_CS_)
@@ -57,7 +59,7 @@ CORBA::UShortSeq::UShortSeq (void)
 CORBA::UShortSeq::UShortSeq (
     CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::UShort
       >
     (max)
@@ -69,7 +71,7 @@ CORBA::UShortSeq::UShortSeq (
     CORBA::UShort * buffer,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::UShort
       >
     (max, length, buffer, release)
@@ -78,7 +80,7 @@ CORBA::UShortSeq::UShortSeq (
 CORBA::UShortSeq::UShortSeq (
     const UShortSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::UShort
       >
     (seq)
@@ -109,15 +111,7 @@ CORBA::Boolean operator<< (
     const CORBA::UShortSeq &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 CORBA::Boolean operator>> (
@@ -125,33 +119,9 @@ CORBA::Boolean operator>> (
     CORBA::UShortSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index 33567017495..5e917a4ab31 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -64,6 +64,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -77,22 +79,19 @@ namespace CORBA
 
   typedef
     TAO_FixedSeq_Var_T<
-        UShortSeq,
-        CORBA::UShort
+        UShortSeq
       >
     UShortSeq_var;
 
   typedef
     TAO_Seq_Out_T<
-        UShortSeq,
-        UShortSeq_var,
-        CORBA::UShort
+        UShortSeq
       >
     UShortSeq_out;
 
   class TAO_Export UShortSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::UShort
           >
   {
@@ -103,7 +102,7 @@ namespace CORBA
         CORBA::ULong max,
         CORBA::ULong length,
         CORBA::UShort* buffer,
-        CORBA::Boolean release = 0
+        CORBA::Boolean release = false
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
@@ -137,7 +136,7 @@ namespace TAO
 // but we put the instantiation here because the application will
 // need to see it in *C.h to avoid the error.
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-  template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>;
+  template class TAO_Export TAO::unbounded_value_sequence<CORBA::UShortSeq>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 // TAO_IDL - Generated from
@@ -160,6 +159,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h
index d942e07e9f3..5c5d2cc982e 100644
--- a/TAO/tao/Unbounded_Sequence_CDR_T.h
+++ b/TAO/tao/Unbounded_Sequence_CDR_T.h
@@ -12,7 +12,6 @@
  */
 
 #include "tao/orbconf.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -364,8 +363,6 @@ namespace TAO {
 namespace TAO {
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Short> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -375,8 +372,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Long> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -386,8 +381,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULong> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -397,8 +390,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::UShort> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -409,8 +400,6 @@ namespace TAO {
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -423,8 +412,6 @@ namespace TAO {
 #else
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -435,8 +422,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Char> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -447,8 +432,6 @@ namespace TAO {
 # if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::WChar> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -459,8 +442,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Float> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -470,8 +451,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Double> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -481,8 +460,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULongLong> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -492,8 +469,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::LongDouble> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -503,8 +478,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Boolean> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -514,8 +487,6 @@ namespace TAO {
 
   template <typename stream, typename value_t>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <value_t> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -530,8 +501,6 @@ namespace TAO {
 
   template <typename stream, typename charT>
   bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -547,8 +516,6 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var>
   bool marshal_sequence(stream & strm, const TAO::unbounded_object_reference_sequence<object_t, object_t_var> & source) {
     typedef typename TAO::unbounded_object_reference_sequence<object_t, object_t_var>::object_type objec_t;
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 0e382b85985..638f895b362 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "UserException.h"
+#include "tao/UserException.h"
 
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
@@ -14,6 +14,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Virtual.  Do not inline.
 CORBA::UserException::~UserException (void)
 {
@@ -44,3 +46,5 @@ CORBA::UserException::_info (void) const
   user_exception_info += "'";
   return user_exception_info;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 79aa80e8766..9fef2c2ea16 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -26,6 +26,8 @@
 
 #include "tao/Exception.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   /**
@@ -70,14 +72,15 @@ namespace CORBA
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
-    //protected: // when msvc6 is dropped we can make this protected
+  protected:
     /// Default constructor.
     UserException (void);
-
   };
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/UserException.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index ba01c46e9fd..0e1d3295264 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::UserException::UserException (void)
 {
@@ -32,3 +34,5 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception)
 {
   return dynamic_cast<const CORBA::UserException *> (exception);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp
index 7e6aa6c57aa..c9c484f549c 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -1,7 +1,11 @@
 // $Id$
 
-#include "Encodable.h"
+#include "tao/Utils/Encodable.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Encodable::~TAO_Encodable (void)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h
index 8edb09c43ef..15afe05370f 100644
--- a/TAO/tao/Utils/Encodable.h
+++ b/TAO/tao/Utils/Encodable.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,7 +24,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
@@ -52,6 +55,8 @@ public:
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ENCODABLE_H_ */
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index e5d3c35d594..9e0fb6444f9 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -1,9 +1,12 @@
-#include "Implicit_Deactivator.h"
+#include "tao/Utils/Implicit_Deactivator.h"
 #include "tao/PortableServer/Servant_Base.h"
 
 ACE_RCSID (Utils,
            Implicit_Deactivator,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
    PortableServer::ServantBase * servant)
@@ -31,3 +34,5 @@ TAO::Utils::Implicit_Deactivation_Functor::operator () (
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index bb172759571..68077296726 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file Implicit_Deactivator.h
@@ -11,7 +12,7 @@
 #ifndef TAO_UTILS_IMPLICIT_DEACTIVATOR_H
 #define TAO_UTILS_IMPLICIT_DEACTIVATOR_H
 #include /**/ "ace/pre.h"
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -21,6 +22,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -55,5 +57,7 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_UTILS_IMPLICIT_DEACTIVATOR_H*/
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index c3e198c9828..8b8a74220ff 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -1,9 +1,12 @@
-#include "ORB_Destroyer.h"
+#include "tao/Utils/ORB_Destroyer.h"
 
 
 ACE_RCSID (Utils,
            ORB_Destroyer,
            "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
   ACE_THROW_SPEC (())
@@ -20,3 +23,5 @@ TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index 6e414d99ead..920ba64d3e5 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file ORB_Destroyer.h
@@ -11,7 +12,7 @@
 #ifndef TAO_UTILS_ORB_DESTROYER_H
 #define TAO_UTILS_ORB_DESTROYER_H
 #include /**/ "ace/pre.h"
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -20,6 +21,8 @@
 #include "tao/ORB.h"
 #include "ace/Auto_Functor.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -53,5 +56,7 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_UTILS_ORB_DESTROYER_H*/
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 08618700659..7485985f09b 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "tao/PortableServer/POAManagerC.h"
 #include "tao/PortableServer/IdAssignmentPolicyC.h"
@@ -25,6 +25,9 @@ ACE_RCSID (PortableServer,
            ORB_Manager,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // constructor
 TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
                                   PortableServer::POA_ptr poa,
@@ -364,3 +367,5 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void)
     }
   ACE_ENDTRY;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index a181e1c5d12..520ca1af26e 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,7 +14,7 @@
 #define TAO_ORB_MANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,6 +23,8 @@
 
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_ORB_Manager
  *
@@ -249,6 +251,7 @@ protected:
   PortableServer::POAManager_var poa_manager_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_ORB_MANAGER_H */
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index e2aaab09b5e..426d841991c 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,14 +1,16 @@
-#include "PolicyList_Destroyer.h"
+#include "tao/Utils/PolicyList_Destroyer.h"
 #include "tao/Environment.h"
 
 #if !defined (__ACE_INLINE__)
-# include "PolicyList_Destroyer.inl"
+# include "tao/Utils/PolicyList_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Utils,
            PolicyList_Deactivator,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
   ACE_THROW_SPEC (())
 {
@@ -35,3 +37,5 @@ TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
       (*this)[i] = CORBA::Policy::_nil();
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index 7fdb607652d..ef2ef408805 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -11,7 +11,7 @@
 #ifndef TAO_UTILS_POLICYLIST_DESTROYER_H
 #define TAO_UTILS_POLICYLIST_DESTROYER_H
 #include /**/ "ace/pre.h"
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
 
 #include "tao/PolicyC.h"
 
@@ -19,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -42,8 +44,10 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "PolicyList_Destroyer.inl"
+# include "tao/Utils/PolicyList_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.inl b/TAO/tao/Utils/PolicyList_Destroyer.inl
index 1bc3d224276..a93e6334c87 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.inl
+++ b/TAO/tao/Utils/PolicyList_Destroyer.inl
@@ -1,7 +1,13 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO::Utils::PolicyList_Destroyer::PolicyList_Destroyer (CORBA::ULong length_hint)
   : CORBA::PolicyList(length_hint)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 18299880b5a..fad7ef86477 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -1,15 +1,15 @@
+// $Id$
+
 #ifndef TAO_UTILS_RIR_NARROW_CPP
 #define TAO_UTILS_RIR_NARROW_CPP
 
-#include "RIR_Narrow.h"
+#include "tao/Utils/RIR_Narrow.h"
 #include "tao/SystemException.h"
 #if defined (ACE_HAS_EXCEPTIONS)
   #include <stdexcept>
 #endif
 
-ACE_RCSID (Utils,
-           RIR_Narror,
-           "$Id$")
+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,
@@ -55,4 +55,6 @@ TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
   return narrowed_object._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*TAO_UTILS_RIR_NARROW_CPP*/
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index 24a7ad5c089..fdeba60f91e 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  * @file RIR_Narrow.h
@@ -23,6 +24,8 @@
 #include "tao/PI/PI.h"
 #include "tao/ORB.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -60,8 +63,11 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "RIR_Narrow.cpp"
+# include "tao/Utils/RIR_Narrow.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Utils/Servant_Var.cpp b/TAO/tao/Utils/Servant_Var.cpp
index a6f63b15d51..1506ae356bc 100644
--- a/TAO/tao/Utils/Servant_Var.cpp
+++ b/TAO/tao/Utils/Servant_Var.cpp
@@ -1,10 +1,10 @@
 #ifndef TAO_UTILS_SERVANT_VAR_CPP
 #define TAO_UTILS_SERVANT_VAR_CPP
 
-#include "Servant_Var.h"
+#include "tao/Utils/Servant_Var.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Servant_Var.inl"
+# include "tao/Utils/Servant_Var.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Utils,
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index 8655ddb9a07..9fc8f6cb920 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -21,6 +21,8 @@
 #include "ace/CORBA_macros.h"
 #include "tao/Environment.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -138,6 +140,7 @@ namespace TAO
       T * ptr_;
     };
 
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
     /// Compare two Servant_Vars for equivalence.
     template <class X, class Y>
     bool operator==(Servant_Var<X> const & x,
@@ -147,16 +150,19 @@ namespace TAO
     template <class X, class Y>
     bool operator!=(Servant_Var<X> const & x,
                     Servant_Var<Y> const & y);
+#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */
 
   } // namespace Utils
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "Servant_Var.inl"
+# include "tao/Utils/Servant_Var.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Servant_Var.cpp"
+#include "tao/Utils/Servant_Var.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index 8716ed46cdf..be906d9982f 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -5,6 +5,8 @@
 #include "tao/Exception.h"
 #include "ace/Swap.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_INLINE T *
 TAO::Utils::Servant_Var<T>::_duplicate (T * p)
@@ -62,8 +64,16 @@ template <class T>
 ACE_INLINE typename TAO::Utils::Servant_Var<T> &
 TAO::Utils::Servant_Var<T>::operator= (T * p)
 {
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
+  if (this->ptr_ != p)
+    {
+      // This constructor doesn't increase the reference count so we
+      // we must check for self-assignment.  Otherwise the reference
+      // count would be prematurely decremented upon exiting this
+      // scope.
+      TAO::Utils::Servant_Var<T> tmp (p);
+      this->swap (tmp);
+    }
+
   return *this;
 }
 
@@ -117,8 +127,16 @@ template <class T> template <class Y>
 ACE_INLINE typename TAO::Utils::Servant_Var<T> &
 TAO::Utils::Servant_Var<T>::operator= (Y * p)
 {
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
+  if (this->ptr_ != p)
+    {
+      // This constructor doesn't increase the reference count so we
+      // we must check for self-assignment.  Otherwise the reference
+      // count would be prematurely decremented upon exiting this
+      // scope.
+      TAO::Utils::Servant_Var<T> tmp (p);
+      this->swap (tmp);
+    }
+
   return *this;
 }
 #endif /* ACE_LACKS_MEMBER_TEMPLATES */
@@ -187,6 +205,7 @@ TAO::Utils::Servant_Var<T>::_retn (void)
   return rval;
 }
 
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
 template <class X, class Y>
 ACE_INLINE bool
 operator== (typename TAO::Utils::Servant_Var<X> const & x,
@@ -202,3 +221,6 @@ operator!= (typename TAO::Utils::Servant_Var<X> const & x,
 {
   return x.in () != y.in ();
 }
+#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index b1e44418fae..a4dce4bb8eb 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -15,13 +15,7 @@
 #ifndef TAO_UTILS_SERVER_MAIN_T_CPP
 #define TAO_UTILS_SERVER_MAIN_T_CPP
 
-#include "Server_Main.h"
-
-
-ACE_RCSID (Utils,
-           Server_Main,
-           "$Id$")
-
+#include "tao/Utils/Server_Main.h"
 
 #include "tao/ORB.h"
 
@@ -30,6 +24,8 @@ ACE_RCSID (Utils,
 #include "ace/Time_Value.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <typename SERVANT>
 TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name)
   : name_(name)
@@ -59,7 +55,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (! CORBA::is_nil(orb.in ()))
+    if (! ::CORBA::is_nil(orb.in ()))
     {
       // create an instance of the servant object and give it a
       // chance at the arguments.
@@ -134,4 +130,6 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
   return result;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif //TAO_UTILS_SERVER_MAIN_T_CPP
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index 99016b8052c..c5d3ea2d825 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Server_Main.h
@@ -49,12 +50,18 @@
 #ifndef TAO_UTILS_SERVANTMAIN_H
 #define TAO_UTILS_SERVANTMAIN_H
 
-#include <ace/ACE.h>
+#include /**/ "ace/pre.h"
+
+#include "ace/ACE.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ <ace/pre.h>
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Utils
@@ -78,14 +85,16 @@ namespace TAO
   } // namespace UTILS
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "Server_Main.cpp"
+# include "tao/Utils/Server_Main.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 # pragma implementation "Server_Main.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#include /**/ <ace/post.h>
+#include /**/ "ace/post.h"
 
 #endif //TAO_UTILS_SERVANTMAIN_H
diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp
index 2b79deb80e0..4b132799b70 100644
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ b/TAO/tao/Utils/Synch_Refcountable.cpp
@@ -1,7 +1,7 @@
-#include "Synch_Refcountable.h"
+#include "tao/Utils/Synch_Refcountable.h"
 
 #if !defined (__ACE_INLINE__)
-# include "Synch_Refcountable.inl"
+# include "tao/Utils/Synch_Refcountable.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
@@ -10,6 +10,9 @@ ACE_RCSID (Utils,
            Synch_Refcountable,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock,
                                                 int refcount)
   : ACE_Refcountable (refcount)
@@ -22,3 +25,5 @@ TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void)
   ACE_ASSERT (this->refcount_ == 0);
   delete this->refcount_lock_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h
index 0e18e9402eb..3e77a70c4c3 100644
--- a/TAO/tao/Utils/Synch_Refcountable.h
+++ b/TAO/tao/Utils/Synch_Refcountable.h
@@ -1,4 +1,3 @@
-// This may look like C, but it's really
 // -*- C++ -*-
 
 //=============================================================================
@@ -23,9 +22,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "utils_export.h"
+#include "tao/Utils/utils_export.h"
+#include "tao/Versioned_Namespace.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Synch_Refcountable
@@ -48,9 +52,10 @@ protected:
   ACE_Lock *refcount_lock_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "Synch_Refcountable.inl"
+# include "tao/Utils/Synch_Refcountable.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Utils/Synch_Refcountable.inl b/TAO/tao/Utils/Synch_Refcountable.inl
index 2f4cc32778d..2139918ab50 100644
--- a/TAO/tao/Utils/Synch_Refcountable.inl
+++ b/TAO/tao/Utils/Synch_Refcountable.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 //$Id$
 
 #include "ace/Guard_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_Synch_Refcountable::increment (void)
 {
@@ -22,3 +25,5 @@ TAO_Synch_Refcountable::refcount (void) const
 {
   return ACE_Refcountable::refcount ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index e8f0d633759..a28c7ae4ef7 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -1,8 +1,8 @@
 // "$Id$"
 
-#include "AbstractBase.h"
-#include "ValueBase.h"
-#include "ValueFactory.h"
+#include "tao/Valuetype/AbstractBase.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/ValueFactory.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -10,13 +10,15 @@
 #include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
-# include "AbstractBase.inl"
+# include "tao/Valuetype/AbstractBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (Valuetype,
            AbstractBase,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ************************************************************
 // These are in CORBA namespace
 
@@ -130,7 +132,7 @@ void
 CORBA::AbstractBase::_tao_any_destructor (void *x)
 {
   CORBA::AbstractBase_ptr tmp = static_cast<CORBA::AbstractBase_ptr> (x);
-  CORBA::release (tmp);
+  ::CORBA::release (tmp);
 }
 
 CORBA::Object_ptr
@@ -160,12 +162,11 @@ CORBA::AbstractBase::_to_value (void)
 
   CORBA::ValueBase *retval = this->_tao_to_value ();
 
-  if (retval == 0)
+  if (retval != 0)
     {
-      return retval;
+      retval->_add_ref ();
     }
 
-  retval->_add_ref ();
   return retval;
 }
 
@@ -226,7 +227,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 
           const TAO_MProfile& mprofile = stubobj->base_profiles ();
 
-          CORBA::ULong profile_count = mprofile.profile_count ();
+          CORBA::ULong const profile_count = mprofile.profile_count ();
 
           if ((strm << profile_count) == 0)
             {
@@ -296,13 +297,13 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
 
           if (!strm.read_ulong (value_tag))
             {
-              return 0;
+              return false;
             }
 
           if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
             {
               // Ok, null reference unmarshaled.
-              return 1;
+              return true;
             }
 
           if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
@@ -310,7 +311,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("operator>> CORBA::AbstractBase ")
                           ACE_TEXT ("not value_tag\n")));
-              return 0;
+              return false;
             }
 
           CORBA::String_var repo_id_stream;
@@ -318,7 +319,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
           // It would be more efficient not to copy the string)
           if (strm.read_string (repo_id_stream.inout ()) == 0)
             {
-              return 0;
+              return false;
             }
 
           orb_core = strm.orb_core ();
@@ -344,7 +345,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%N:%l): The following unknown type was received: `%s'."),
                           repo_id_stream.in ()));
-              return 0;
+              return false;
             }
 
           abs = factory->create_for_unmarshal_abstract ();
@@ -359,8 +360,8 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
             {
               TAO_Stub *concrete_stubobj = generic_objref->_stubobj ();
 
-              CORBA::Boolean stores_orb =
-                ! CORBA::is_nil (concrete_stubobj->servant_orb_var ().ptr ());
+              CORBA::Boolean const stores_orb =
+                ! CORBA::is_nil (concrete_stubobj->servant_orb_var ().in ());
 
               if (stores_orb)
                 {
@@ -368,7 +369,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
                     concrete_stubobj->servant_orb_var ()->orb_core ();
                 }
 
-              CORBA::Boolean collocated =
+              CORBA::Boolean const collocated =
                 orb_core != 0
                 && orb_core->optimize_collocation_objects ()
                 && generic_objref->_is_collocated ();
@@ -378,25 +379,25 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
                                 concrete_stubobj,
                                 collocated,
                                 generic_objref->_servant ()),
-                              0);
-              return 1;
+                              false);
+              return true;
             }
         }
     }
 
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
 CORBA::AbstractBase::_tao_marshal_v (TAO_OutputCDR &) const
 {
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
 CORBA::AbstractBase::_tao_unmarshal_v (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 CORBA::ValueBase *
@@ -425,3 +426,5 @@ CORBA::AbstractBase::equivalent_objref (void)
   return this->equivalent_obj_.in ();
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index a57c18bf05d..cc00f37a969 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "valuetype_export.h"
+#include "tao/Valuetype/valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +29,8 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "ace/CORBA_macros.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 
@@ -165,8 +167,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "AbstractBase.inl"
+# include "tao/Valuetype/AbstractBase.inl"
 #endif /* __ACE_INLINE__) */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index 8bc52ccfce3..f3d4dfb60e6 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -4,11 +4,13 @@
 
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
 {
-  return (CORBA::AbstractBase_ptr)0;
+  return static_cast <CORBA::AbstractBase_ptr> (0);
 }
 
 ACE_INLINE CORBA::AbstractBase_ptr
@@ -52,3 +54,5 @@ CORBA::AbstractBase::_is_local (void) const
 {
   return this->is_local_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index fc1ea235c85..a0212ddde94 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -1,11 +1,13 @@
 //$Id$
-#include "AbstractBase_Invocation_Adapter.h"
-#include "AbstractBase.h"
+#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h"
+#include "tao/Valuetype/AbstractBase.h"
 
 ACE_RCSID (Valuetype,
            AbstractBase_Invocation_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   AbstractBase_Invocation_Adapter::AbstractBase_Invocation_Adapter (
@@ -28,3 +30,5 @@ namespace TAO
   {
   }
 } // End namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index cb510f0ded5..afac495a54f 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -13,7 +13,7 @@
 #define TAO_ABSTRACTBASE_INVOCATION_ADAPTER_H
 
 #include /**/ "ace/pre.h"
-#include "valuetype_export.h"
+#include "tao/Valuetype/valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,6 +21,8 @@
 
 #include "tao/Invocation_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class AbstractBase;
@@ -54,14 +56,19 @@ namespace TAO
         TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
 
   private:
-    /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter (void))
+    // Don't allow default initializations
+    AbstractBase_Invocation_Adapter (void);
+
+    // Disallow copying and assignment.
+    AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &);
+    AbstractBase_Invocation_Adapter & operator= (
+        const AbstractBase_Invocation_Adapter &);
 
-    ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter & operator= (
-        const AbstractBase_Invocation_Adapter &))
   };
 } // End namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
-#endif /*TAO_INVOCATION_ADAPTER_H*/
+
+#endif  /* TAO_INVOCATION_ADAPTER_H */
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index 03308da8ae6..8a9f0cdc70f 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -1,14 +1,14 @@
 // $Id$
-#ifndef TAO_ABSTRACT_BASE_T_C
-#define TAO_ABSTRACT_BASE_T_C
 
-#include "AbstractBase_T.h"
-#include "AbstractBase.h"
+#ifndef TAO_ABSTRACT_BASE_T_CPP
+#define TAO_ABSTRACT_BASE_T_CPP
+
+#include "tao/Valuetype/AbstractBase_T.h"
+#include "tao/Valuetype/AbstractBase.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (Valuetype,
-           Abstractbase_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   template<typename T> T *
@@ -92,7 +92,7 @@ namespace TAO
         TAO_Stub* stub = obj->_stubobj ();
 
         bool collocated =
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ())
+          !CORBA::is_nil (stub->servant_orb_var ().in ())
           && stub->optimize_collocation_objects ()
           && obj->_is_collocated ()
           && pbf != 0;
@@ -102,6 +102,7 @@ namespace TAO
                              collocated ? 1 : 0,
                              obj->_servant ()),
                           CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (proxy);
       }
     else
       {
@@ -113,4 +114,6 @@ namespace TAO
   }
 }
 
-#endif /*TAO_ABSTRACT_BASE_T_C*/
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif  /* TAO_ABSTRACT_BASE_T_CPP */
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index e7ec925f828..dced03cf334 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class AbstractBase;
@@ -49,8 +51,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "AbstractBase_T.cpp"
+#include "tao/Valuetype/AbstractBase_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
index a7c0b243a3b..d69116d7704 100644
--- a/TAO/tao/Valuetype/Sequence_T.cpp
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -1,18 +1,21 @@
 // $Id$
 
-#ifndef TAO_VALUETYPE_SEQUENCE_T_C
-#define TAO_VALUETYPE_SEQUENCE_T_C
+#ifndef TAO_VALUETYPE_SEQUENCE_T_CPP
+#define TAO_VALUETYPE_SEQUENCE_T_CPP
 
-#include "Sequence_T.h"
+#include "tao/Valuetype/Sequence_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "Sequence_T.inl"
+#include "tao/Valuetype/Sequence_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Valuetype,
            Sequence_T,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // class TAO_Valuetype_Manager
 // *************************************************************
@@ -496,4 +499,6 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
     }
 }
 
-#endif /* TAO_VALUETYPE_SEQUENCE_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VALUETYPE_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index 47e9a8274ef..db9c2c48aa2 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -1,255 +1,6 @@
-// -*- C++ -*-
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    Sequence_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+#include "tao/Valuetype/Bounded_Valuetype_Sequence_T.h"
+#include "tao/Valuetype/Unbounded_Valuetype_Sequence_T.h"
 
-#ifndef TAO_VALUETYPE_SEQUENCE_T_H
-#define TAO_VALUETYPE_SEQUENCE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<typename T, typename T_var>
-class TAO_Unbounded_Valuetype_Sequence;
-
-  /**
-   * @class TAO_Valuetype_Manager
-   *
-   * @brief Manager for valuetypes.
-   *
-   * According to the spec., valuetypes are handled similarly to object
-   * references, so a manager class is needed.
-   *
-   * @see TAO_Object_Manager
-   */
-template<typename T, typename T_var>
-class TAO_Valuetype_Manager
-{
-  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Valuetype_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Valuetype_Manager (T **,
-                         CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Valuetype_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Valuetype_Manager<T,T_var> &operator= (
-      const TAO_Valuetype_Manager<T,T_var> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Valuetype_Manager<T,T_var> &operator= (T *);
-
-  /// Assignment from T_var.
-  TAO_Valuetype_Manager<T,T_var> &operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var() const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T * &out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for valuetypes
- *
- * @see TAO_Unbounded_Object_Sequence
- */
-template<typename T, typename T_var>
-class TAO_Unbounded_Valuetype_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Unbounded_Valuetype_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong maximum,
-                                    CORBA::ULong length,
-                                    T ** data,
-                                    CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Valuetype_Sequence (
-      const TAO_Unbounded_Valuetype_Sequence<T,T_var> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Valuetype_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Valuetype_Sequence<T,T_var> & operator= (
-      const TAO_Unbounded_Valuetype_Sequence <T,T_var> &
-    );
-
-  /// read-write accessor
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, size_t MAX>
-class TAO_Bounded_Valuetype_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Valuetype_Sequence (CORBA::ULong length,
-                                  T ** value,
-                                  CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Valuetype_Sequence (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &operator= (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-#if defined (__ACE_INLINE__)
-#include "Sequence_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUETYPE_SEQUENCE_T_H */
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
index 4eb80326837..503beaa3ad9 100644
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -6,6 +6,8 @@
 #include "ace/Log_Msg.h" // for ACE_ASSERT
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // *************************************************************
 // Inline operations for class TAO_Valuetype_Manager
 // *************************************************************
@@ -165,3 +167,5 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
   T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
   return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp
index bb93ab70c34..836192bc71a 100644
--- a/TAO/tao/Valuetype/StringValueC.cpp
+++ b/TAO/tao/Valuetype/StringValueC.cpp
@@ -39,7 +39,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
-#include "StringValueC.h"
+#include "tao/Valuetype/StringValueC.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/CDR.h"
 
@@ -48,12 +48,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "StringValueC.inl"
+#include "tao/Valuetype/StringValueC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // .\be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -78,18 +80,16 @@ namespace CORBA
     &_tao_tc_CORBA_StringValue;
 }
 
-
-
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
+
+CORBA::StringValue::~StringValue (void)
+{
+}
+
 CORBA::StringValue *
 CORBA::StringValue::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::CORBA::StringValue * > (v);
 }
 
@@ -166,14 +166,13 @@ namespace CORBA
 
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
+CORBA::WStringValue::~WStringValue (void)
+{
+}
+
 CORBA::WStringValue *
 CORBA::WStringValue::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::CORBA::WStringValue * > (v);
 }
 
@@ -402,3 +401,4 @@ operator>> (
   return CORBA::WStringValue::_tao_unmarshal (strm, _tao_valuebox);
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/StringValueC.h b/TAO/tao/Valuetype/StringValueC.h
index 19a0ffd5d62..a0b9b69b3a8 100644
--- a/TAO/tao/Valuetype/StringValueC.h
+++ b/TAO/tao/Valuetype/StringValueC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "valuetype_export.h"
+#include "tao/Valuetype/valuetype_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -66,6 +66,8 @@
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -305,8 +307,10 @@ TAO_Valuetype_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WStringVa
 // TAO_IDL - Generated from
 // .\be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "StringValueC.inl"
+#include "tao/Valuetype/StringValueC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/Valuetype/StringValueC.inl b/TAO/tao/Valuetype/StringValueC.inl
index 493e7c34af6..04fc7a36098 100644
--- a/TAO/tao/Valuetype/StringValueC.inl
+++ b/TAO/tao/Valuetype/StringValueC.inl
@@ -29,24 +29,22 @@
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:332
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 CORBA::StringValue::StringValue (void)
 {}
 
-ACE_INLINE 
-CORBA::StringValue::~StringValue (void)
-{}
-
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringValue::StringValue (CORBA::Char * val)
 {
   this->_pd_value = val;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringValue::StringValue (const CORBA::StringValue& val)
-  : ACE_NESTED_CLASS (CORBA, ValueBase) (val),
-    ACE_NESTED_CLASS (CORBA, DefaultValueRefCountBase) (val)
+  : ::CORBA::ValueBase (val),
+    ::CORBA::DefaultValueRefCountBase (val)
 {
   this->_pd_value = val._pd_value;
 }
@@ -58,7 +56,7 @@ CORBA::StringValue::operator= (CORBA::Char * val)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringValue::StringValue (const CORBA::Char * val)
 {
   this->_pd_value = val;
@@ -138,7 +136,7 @@ CORBA::StringValue::operator[] (CORBA::ULong slot) const
   return this->_pd_value[slot];
 }
 
-ACE_INLINE CORBA::Boolean 
+ACE_INLINE CORBA::Boolean
 CORBA::StringValue::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return (strm << this->_pd_value);
@@ -148,13 +146,13 @@ CORBA::StringValue::_tao_marshal_v (TAO_OutputCDR & strm) const
 
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:60
-ACE_INLINE const char* 
+ACE_INLINE const char*
 CORBA::StringValue::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/CORBA/StringValue:1.0";
 }
 
-ACE_INLINE CORBA::Boolean 
+ACE_INLINE CORBA::Boolean
 CORBA::StringValue::_tao_unmarshal_v (TAO_InputCDR & )
 {
   return 1;
@@ -169,20 +167,16 @@ ACE_INLINE
 CORBA::WStringValue::WStringValue (void)
 {}
 
-ACE_INLINE 
-CORBA::WStringValue::~WStringValue (void)
-{}
-
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringValue::WStringValue (CORBA::WChar * val)
 {
   this->_pd_value = val;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringValue::WStringValue (const CORBA::WStringValue& val)
-  : ACE_NESTED_CLASS (CORBA, ValueBase) (val),
-    ACE_NESTED_CLASS (CORBA, DefaultValueRefCountBase) (val)
+  : ::CORBA::ValueBase (val),
+    ::CORBA::DefaultValueRefCountBase (val)
 {
   this->_pd_value = val._pd_value;
 }
@@ -194,7 +188,7 @@ CORBA::WStringValue::operator= (CORBA::WChar * val)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringValue::WStringValue (const CORBA::WChar * val)
 {
   this->_pd_value = val;
@@ -274,7 +268,7 @@ CORBA::WStringValue::operator[] (CORBA::ULong slot) const
   return this->_pd_value[slot];
 }
 
-ACE_INLINE CORBA::Boolean 
+ACE_INLINE CORBA::Boolean
 CORBA::WStringValue::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return (strm << this->_pd_value);
@@ -284,16 +278,17 @@ CORBA::WStringValue::_tao_marshal_v (TAO_OutputCDR & strm) const
 
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:60
-ACE_INLINE const char* 
+ACE_INLINE const char*
 CORBA::WStringValue::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/CORBA/WStringValue:1.0";
 }
 
-ACE_INLINE CORBA::Boolean 
+ACE_INLINE CORBA::Boolean
 CORBA::WStringValue::_tao_unmarshal_v (TAO_InputCDR & )
 {
   return 1;
 }
 
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index b7496f3e6cb..d7c325203d8 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -5,8 +5,8 @@
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 
-#include "ValueBase.h"
-#include "ValueFactory.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/ValueFactory.h"
 
 #include "tao/CDR.h"
 #include "tao/ORB.h"
@@ -15,7 +15,7 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ValueBase.inl"
+# include "tao/Valuetype/ValueBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
@@ -24,6 +24,8 @@ ACE_RCSID (Valuetype,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Static operations in namespace CORBA.
 
 void
@@ -173,7 +175,6 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
   //  new_object->_tao_unmarshal_v ()
   //  new_object->_tao_unmarshal_post ()
 
-//  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (strm,
@@ -192,14 +193,14 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
 
       if (new_object == 0)
         {
-          return 0;  // %! except.?
+          return false;  // %! except.?
         }
 
       retval = new_object->_tao_unmarshal_v (strm);
 
       if (retval == 0)
         {
-          return 0;
+          return false;
         }
     }
 
@@ -239,7 +240,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
     {
       valuetype = 0;
-      return 1;
+      return true;
       // ok, null reference unmarshaled
     }
   // 2. Now at this point it must be a <value-tag> (error else).
@@ -284,11 +285,11 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
     {
       CORBA::String_var repo_id_stream;
 
-      CORBA::ULong length;
+      CORBA::ULong length = 0;
 
       if (!strm.read_ulong (length))
         {
-          return 0;
+          return false;
         }
 
       // 'length' may not be the repo id length - it could be the
@@ -300,7 +301,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
           // Read the negative byte offset
           if (!strm.read_long (offset) || offset >= 0)
             {
-              return 0;
+              return false;
             }
 
           // Cribbed from tc_demarshal_indirection in Typecode_CDR_Extraction.cpp
@@ -310,7 +311,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
 
           if (!indir_stream.good_bit ())
             {
-              return 0;
+              return false;
             }
 
           indir_stream.read_string(repo_id_stream.inout ());
@@ -324,7 +325,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
                               0);
               if (!strm.read_char_array (repo_id_stream.inout (), length))
                 {
-                  return 0;
+                  return false;
                 }
             }
           else if (length == 0)
@@ -336,7 +337,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
             }
           else
             {
-              return 0;
+              return false;
             }
         }
 
@@ -344,11 +345,17 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
         orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
     }
 
-  if (factory == 0) // %! except.!
+  if (factory == 0)
     {
-      ACE_DEBUG ((LM_ERROR,
-                  ACE_TEXT ("(%N:%l) OBV factory is null !!!\n")));
-      return false;
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%N:%l) ERROR: OBV factory is null for <%s>!\n"),
+                      repo_id));
+        }
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 1,
+                                        CORBA::COMPLETED_MAYBE),
+                                        false);
     }
 
   return retval;
@@ -609,3 +616,5 @@ namespace TAO
     CORBA::remove_ref (p);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 745bfad5d53..55360627f05 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -41,6 +41,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ValueFactoryBase;
@@ -231,7 +233,6 @@ namespace TAO
   {
   };
 
-
   template<>
   struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase>
   {
@@ -244,8 +245,10 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "ValueBase.inl"
+# include "tao/Valuetype/ValueBase.inl"
 #endif /* __ACE_INLINE__*/
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index 3b7d66658b5..2d15b4a0d19 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -4,6 +4,8 @@
 
 // Detection of flags in the CDR Stream
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
 {
@@ -69,3 +71,5 @@ TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
 {
   return (0x80000000L < tag);
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index 37a8bf6cb79..473780b8790 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -1,10 +1,12 @@
-#include "ValueFactory.h"
+#include "tao/Valuetype/ValueFactory.h"
 #include "ace/Guard_T.h"
 
 ACE_RCSID (Valuetype,
            ValueFactory,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Static operations in namespace CORBA.
 
 void
@@ -81,3 +83,5 @@ namespace TAO
     CORBA::remove_ref (p);
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 678a86be8ac..0935bba77a4 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,14 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "valuetype_export.h"
+#include "tao/Valuetype/valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Value_VarOut_T.h"
+#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"
@@ -30,7 +31,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Atomic_Op.h"
-#include "tao/Environment.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -49,7 +51,6 @@ namespace CORBA
 
   typedef ValueFactoryBase_var ValueFactory_var;
 
-
   class TAO_Valuetype_Export ValueFactoryBase
   {
   public:
@@ -93,7 +94,10 @@ namespace TAO
     static void release (CORBA::ValueFactoryBase *);
   };
 }
-// Use this macro for writing code that is independend from
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+// Use this macro for writing code that is independent from
 // the compiler support of covariant return types of pointers to
 // virtual inherited classes.
 // (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 520c35c9288..f33af298e5e 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -1,5 +1,5 @@
-#include "ValueFactory_Map.h"
-#include "ValueFactory.h"
+#include "tao/Valuetype/ValueFactory_Map.h"
+#include "tao/Valuetype/ValueFactory.h"
 #include "tao/CORBA_String.h"
 #include "tao/TAO_Singleton.h"
 
@@ -8,6 +8,7 @@ ACE_RCSID (Valuetype,
            ValueFactory_Map,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
   : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
@@ -34,21 +35,18 @@ TAO_ValueFactory_Map::~TAO_ValueFactory_Map (void)
     }
 }
 
-// %! Thread issues
-
 int
 TAO_ValueFactory_Map::rebind (const char *repo_id,
                               CORBA::ValueFactory &factory)
 {
-//  ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard, map_->mutex(),-1);
-//   --- but must be recursive
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
+
   const char *prev_repo_id = 0;
   CORBA::ValueFactory prev_factory = 0;
-  int ret = 0;
-  ret = this->map_.rebind (CORBA::string_dup (repo_id),
-                           factory,
-                           prev_repo_id,
-                           prev_factory);
+  int const ret = this->map_.rebind (CORBA::string_dup (repo_id),
+                                     factory,
+                                     prev_repo_id,
+                                     prev_factory);
 
   if (ret > -1)   // ok, no error
     {
@@ -68,10 +66,11 @@ int
 TAO_ValueFactory_Map::unbind (const char *repo_id,
                               CORBA::ValueFactory &factory)
 {
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
+
   FACTORY_MAP_MANAGER::ENTRY *prev_entry = 0;
-  int ret = 0;
-  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,
@@ -93,10 +92,10 @@ int
 TAO_ValueFactory_Map::find (const char *repo_id,
                             CORBA::ValueFactory &factory)
 {
-  int ret = 0;
-  ret = this->map_.find (repo_id,
-                         factory);
-  // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
+
+  int const ret = this->map_.find (repo_id,
+                                   factory);
   if (ret > -1)
     {
       factory->_add_ref ();    // The caller gets one reference as gift.
@@ -105,16 +104,5 @@ TAO_ValueFactory_Map::find (const char *repo_id,
   return ret;
 }
 
-TAO_ValueFactory_Map *
-TAO_ValueFactory_Map::instance (void)
-{
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
-
-  return
-    TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::instance ();
-}
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index 715f41cb3b6..af10d7c27ae 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,11 +22,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "valuetype_export.h"
-
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/RW_Thread_Mutex.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -34,7 +34,7 @@ namespace CORBA
   typedef ValueFactoryBase *ValueFactory;
 }
 
-class TAO_Valuetype_Export TAO_ValueFactory_Map
+class TAO_ValueFactory_Map
 {
 public:
 
@@ -77,18 +77,15 @@ private:
                                   CORBA::ValueFactory,
                                   ACE_Hash<const char *>,
                                   ACE_Equal_To<const char *>,
-                                  TAO_SYNCH_RW_MUTEX>
+                                  ACE_SYNCH_NULL_MUTEX>
           FACTORY_MAP_MANAGER;
   FACTORY_MAP_MANAGER map_;
-}; /* TAO_ValueFactory_Map */
 
+  /// synchronization of the map
+  TAO_SYNCH_MUTEX mutex_;
+}; /* TAO_ValueFactory_Map */
 
-// Currently the ValueFactory_Map is a singleton and not per ORB
-// as in the OMG spec.
-/**
- * @todo Remove this legacy ValueFactory_Map typedef.
- */
-typedef TAO_ValueFactory_Map TAO_VALUEFACTORY_MAP;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h
index e54e1262de7..352c981ac76 100644
--- a/TAO/tao/Valuetype/Value_CORBA_methods.h
+++ b/TAO/tao/Valuetype/Value_CORBA_methods.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "valuetype_export.h"
+#include "tao/Valuetype/valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +30,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class ValueBase;
@@ -46,6 +48,8 @@ namespace CORBA
 
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_VALUETYPE_CORBA_METHODS_H */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index 884ec566468..feb061920c7 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -6,29 +6,9 @@
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Valuetype/Value_CORBA_methods.h"
 
+#include <algorithm>  /* For std::swap<>() */
 
-template<typename T>
-void
-TAO::Value_Traits<T>::add_ref (T * p)
-{
-  CORBA::add_ref (p);
-}
-
-template<typename T>
-void
-TAO::Value_Traits<T>::remove_ref (T * p)
-{
-  CORBA::remove_ref (p);
-}
-
-template<typename T>
-void
-TAO::Value_Traits<T>::release (T * p)
-{
-  CORBA::remove_ref (p);
-}
-
-// ===============================================================
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T>
 TAO_Value_Var_T<T>::TAO_Value_Var_T (void)
@@ -46,13 +26,6 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (const T * p)
 {}
 
 template <typename T>
-T *
-TAO_Value_Var_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
 TAO_Value_Var_T<T>::TAO_Value_Var_T (const TAO_Value_Var_T<T> & p)
   : TAO_Base_var ()
 {
@@ -70,23 +43,25 @@ template <typename T>
 TAO_Value_Var_T<T> &
 TAO_Value_Var_T<T>::operator= (T * p)
 {
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  TAO::Value_Traits<T>::add_ref (p);
+  if (this->ptr_ != p)
+    {
+      // This constructor doesn't increase the reference count so we
+      // we must check for self-assignment.  Otherwise the reference
+      // count would be prematurely decremented upon exiting this
+      // scope.
+      TAO_Value_Var_T<T> tmp (p);
+      std::swap (this->ptr_, tmp.ptr_);
+    }
+
   return *this;
 }
 
 template <typename T>
 TAO_Value_Var_T<T> &
-TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p)
+TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T<T> & p)
 {
-  if (this != &p)
-  {
-    TAO::Value_Traits<T>::remove_ref (this->ptr_);
-    T * tmp = p.ptr ();
-    TAO::Value_Traits<T>::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
+  TAO_Value_Var_T<T> tmp (p);
+  std::swap (this->ptr_, tmp.ptr_);
 
   return *this;
 }
@@ -142,6 +117,13 @@ TAO_Value_Var_T<T>::_retn (void)
   return tmp;
 }
 
+template <typename T>
+T *
+TAO_Value_Var_T<T>::ptr (void) const
+{
+  return this->ptr_;
+}
+
 // *************************************************************
 
 template <typename T>
@@ -161,24 +143,14 @@ TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p)
 
 template <typename T>
 TAO_Value_Out_T<T>::TAO_Value_Out_T (const TAO_Value_Out_T<T> & p)
-  : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_)
+  : ptr_ (const_cast<TAO_Value_Out_T<T> &> (p).ptr_)
 {}
 
 template <typename T>
 TAO_Value_Out_T<T> &
 TAO_Value_Out_T<T>::operator= (const TAO_Value_Out_T<T> & p)
 {
-  this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_;
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Out_T<T> &
-TAO_Value_Out_T<T>::operator= (const TAO_Value_Var_T<T> & p)
-{
-  T * tmp = p.ptr ();
-  TAO::Value_Traits<T>::add_ref (tmp);
-  this->ptr_ = tmp;
+  this->ptr_ = const_cast<TAO_Value_Out_T<T> &> (p).ptr_;
   return *this;
 }
 
@@ -210,4 +182,6 @@ TAO_Value_Out_T<T>::operator-> (void)
   return this->ptr_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* TAO_VALUE_VAROUT_T_CPP */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 9813e89452c..64ea98bd97e 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -23,24 +23,16 @@
 
 #include "tao/varbase.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
    * struct Value_Traits
    *
    * @brief Specialized for each valuetype in generated code.
-   *
    */
-  template<typename T>
-  struct Value_Traits
-  {
-    static void add_ref (T *);
-    static void remove_ref (T *);
-
-    // For INOUT value type arguments, so they can use the same set
-    // of arg classes as interfaces.
-    static void release (T *);
-  };
+  template<typename T> struct Value_Traits;
 }
 
 /**
@@ -70,11 +62,16 @@ public:
   operator const T * () const;
   operator T *& ();
 
+  typedef T *  _in_type;
+  typedef T *& _inout_type;
+  typedef T *& _out_type;
+  typedef T *  _retn_type;
+
   // in, inout, out, _retn
-  T * in (void) const;
-  T *& inout (void);
-  T *& out (void);
-  T * _retn (void);
+  _in_type in (void) const;
+  _inout_type inout (void);
+  _out_type out (void);
+  _retn_type _retn (void);
 
   // (TAO extension)
   T * ptr (void) const;
@@ -86,9 +83,7 @@ private:
   void operator= (const TAO_Base_var &);
 
 private:
-
   T * ptr_;
-
 };
 
 /**
@@ -106,7 +101,6 @@ public:
   TAO_Value_Out_T (const TAO_Value_Out_T<T> &);
 
   TAO_Value_Out_T &operator= (const TAO_Value_Out_T<T> &);
-  TAO_Value_Out_T &operator= (const TAO_Value_Var_T<T> &);
   TAO_Value_Out_T &operator= (T *);
 
   operator T *& ();
@@ -115,12 +109,15 @@ public:
   T * operator-> (void);
 
 private:
-  typedef TAO_Value_Out_T<T> THIS_OUT_TYPE;
   T *& ptr_;
+  /// Assignment from _var not allowed.
+  TAO_Value_Out_T &operator= (const TAO_Value_Var_T<T> &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Value_VarOut_T.cpp"
+#include "tao/Valuetype/Value_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 279d75c5fc3..074fcdf7de2 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "Valuetype_Adapter_Impl.h"
-#include "AbstractBase.h"
-#include "ValueBase.h"
-#include "ValueFactory_Map.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "tao/Valuetype/AbstractBase.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/ValueFactory_Map.h"
 
 #include "tao/ORB_Core.h"
 
@@ -12,11 +12,7 @@ ACE_RCSID (Valuetype,
            Valuetype_Adapter_Impl,
            "$Id$")
 
-
-TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void)
-{
-
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
 {
@@ -56,8 +52,7 @@ int
 TAO_Valuetype_Adapter_Impl::vf_map_rebind (const char *repo_id,
                                            CORBA::ValueFactory &factory)
 {
-  return TAO_VALUEFACTORY_MAP::instance ()->rebind (repo_id,
-                                                    factory);
+  return map_.rebind (repo_id, factory);
 }
 
 int
@@ -65,44 +60,16 @@ TAO_Valuetype_Adapter_Impl::vf_map_unbind (const char *repo_id)
 
 {
   CORBA::ValueFactory fac;
-  return TAO_VALUEFACTORY_MAP::instance ()->unbind (repo_id,
-                                                    fac);
+  return map_.unbind (repo_id, fac);
 }
 
 CORBA::ValueFactory
 TAO_Valuetype_Adapter_Impl::vf_map_find (const char *repo_id)
 {
   CORBA::ValueFactory factory = 0;
-  (void) TAO_VALUEFACTORY_MAP::instance ()->find (repo_id,
-                                                  factory);
-
+  (void) map_.find (repo_id, factory);
   return factory;
 }
 
-// *********************************************************************
-
-// Initialization and registration of dynamic service object.
-
-int
-TAO_Valuetype_Adapter_Impl::Initializer (void)
-{
-  TAO_ORB_Core::valuetype_adapter_name (
-      "Concrete_Valuetype_Adapter"
-    );
-
-  return
-    ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Valuetype_Adapter_Impl
-      );
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_Valuetype_Adapter_Impl,
-    ACE_TEXT ("Concrete_Valuetype_Adapter"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_Valuetype_Adapter_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
+TAO_END_VERSIONED_NAMESPACE_DECL
 
-ACE_FACTORY_DEFINE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index a72771e6972..eb8a6550838 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "valuetype_export.h"
-
+#include "tao/Valuetype/valuetype_export.h"
+#include "tao/Valuetype/ValueFactory_Map.h"
 #include "tao/Valuetype_Adapter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Valuetype_Adapter_Impl
  *
@@ -39,7 +41,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl
   : public TAO_Valuetype_Adapter
 {
 public:
-  TAO_Valuetype_Adapter_Impl (void);
+
   virtual ~TAO_Valuetype_Adapter_Impl (void);
 
   virtual CORBA::Object_ptr abstractbase_to_object (
@@ -63,16 +65,11 @@ public:
 
   virtual CORBA::ValueFactory vf_map_find (const char *);
 
-  // Used to force the initialization of the ORB code.
-  static int Initializer (void);
+private:
+  TAO_ValueFactory_Map map_;
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
-
-static int
-TAO_Requires_Valuetype_Initializer =
-  TAO_Valuetype_Adapter_Impl::Initializer ();
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 62594d81764..42cf8207876 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "tao/Valuetype_Adapter.h"
 
@@ -6,7 +6,10 @@ ACE_RCSID (tao,
            Valuetype_Adapter,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
index a0386ccf7e6..3dff9f15929 100644
--- a/TAO/tao/Valuetype_Adapter.h
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Object;
@@ -76,5 +78,7 @@ public:
   virtual CORBA::ValueFactory vf_map_find (const char *) = 0;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_VALUETYPE_ADAPTER_H */
diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp
index 618198edfad..85a31f687e4 100644
--- a/TAO/tao/VarOut_T.cpp
+++ b/TAO/tao/VarOut_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_VAROUT_T_C
-#define TAO_VAROUT_T_C
+#ifndef TAO_VAROUT_T_CPP
+#define TAO_VAROUT_T_CPP
 
 #include "tao/VarOut_T.h"
 
@@ -9,22 +9,12 @@
 #include "tao/VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           VarOut_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p)
+  : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0)
 {
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_,
-               T (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
 }
 
 // *************************************************************
@@ -33,29 +23,13 @@ template<typename T>
 TAO_Fixed_Var_T<T> &
 TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p)
 {
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (deep_copy,
-                          T (*p.ptr_),
-                          *this);
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_Fixed_Var_T<T> tmp (p);
+
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
@@ -65,13 +39,13 @@ template<typename T>
 TAO_Fixed_Var_T<T> &
 TAO_Fixed_Var_T<T>::operator= (const T & p)
 {
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    T (p),
-                    *this);
-  }
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_Fixed_Var_T<T> tmp (p);
+
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
@@ -82,31 +56,17 @@ template<typename T>
 TAO_Var_Var_T<T> &
 TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p)
 {
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T *deep_copy = 0;
-          ACE_NEW_RETURN (deep_copy,
-                          T (*p.ptr_),
-                          *this);
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
+  // Strongly exception safe assignment using copy and non-throwing
+  // swap technique.
+  TAO_Var_Var_T<T> tmp (p);
+
+  T * old_ptr = this->ptr_;
+  this->ptr_ = tmp.ptr_;
+  tmp.ptr_ = old_ptr;
 
   return *this;
 }
 
-#endif /* TAO_VAROUT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VAROUT_T_CPP */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index 709f8ba5ddb..904938e35b7 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -21,6 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Var_Base_T
@@ -141,17 +142,17 @@ public:
 
   operator T *& ();
   T *& ptr (void);
-
   T * operator-> (void);
 
 private:
-  typedef TAO_Out_T<T,T_var> THIS_OUT_TYPE;
   T *& ptr_;
 
   // Assignment from T_var not allowed.
   void operator= (const T_var &);
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl
index c1e7af81406..8eab1e1277d 100644
--- a/TAO/tao/VarOut_T.inl
+++ b/TAO/tao/VarOut_T.inl
@@ -1,4 +1,8 @@
-//$Id$
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 ACE_INLINE
@@ -20,7 +24,7 @@ TAO_Var_Base_T<T>::~TAO_Var_Base_T (void)
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 const T *
 TAO_Var_Base_T<T>::operator-> (void) const
 {
@@ -28,7 +32,7 @@ TAO_Var_Base_T<T>::operator-> (void) const
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 T *
 TAO_Var_Base_T<T>::operator-> (void)
 {
@@ -44,7 +48,7 @@ TAO_Var_Base_T<T>::operator const T & () const
 
 template<typename T>
 ACE_INLINE
-TAO_Var_Base_T<T>::operator T & () 
+TAO_Var_Base_T<T>::operator T & ()
 {
   return *this->ptr_;
 }
@@ -57,7 +61,7 @@ TAO_Var_Base_T<T>::operator T & () const
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 const T &
 TAO_Var_Base_T<T>::in (void) const
 {
@@ -65,7 +69,7 @@ TAO_Var_Base_T<T>::in (void) const
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 T &
 TAO_Var_Base_T<T>::inout (void)
 {
@@ -73,13 +77,12 @@ TAO_Var_Base_T<T>::inout (void)
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 T *
 TAO_Var_Base_T<T>::ptr (void) const
 {
   return this->ptr_;
 }
-
 // *************************************************************
 
 template<typename T>
@@ -104,7 +107,7 @@ template<typename T>
 ACE_INLINE
 TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (const T & p)
 {
-  ACE_NEW (this->ptr_, 
+  ACE_NEW (this->ptr_,
            T (p));
 }
 
@@ -120,7 +123,7 @@ TAO_Fixed_Var_T<T>::operator= (T * p)
 
 // Mapping for fixed size.
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 T &
 TAO_Fixed_Var_T<T>::out (void)
 {
@@ -128,7 +131,7 @@ TAO_Fixed_Var_T<T>::out (void)
 }
 
 template<typename T>
-ACE_INLINE 
+ACE_INLINE
 T
 TAO_Fixed_Var_T<T>::_retn (void)
 {
@@ -259,3 +262,4 @@ TAO_Out_T<T,T_var>::operator-> (void)
   return this->ptr_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index 97d0b014e02..e1ad6bdd0ae 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_VAR_ARRAY_ARGUMENT_T_C
-#define TAO_VAR_ARRAY_ARGUMENT_T_C
+#ifndef TAO_VAR_ARRAY_ARGUMENT_T_CPP
+#define TAO_VAR_ARRAY_ARGUMENT_T_CPP
 
 #include "tao/Var_Array_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Var_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Var_Array_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -162,4 +160,6 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VAR_ARRAY_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 75cb050ecc2..8b7ecbbf3c2 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -186,6 +188,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Var_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index 072b68039fc..ce041fd3fb0 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -129,3 +131,5 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::ret
 {
   return this->x_._retn ();
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 290c17b4909..addbd7f9a2d 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_VAR_SIZE_ARGUMENT_T_C
-#define TAO_VAR_SIZE_ARGUMENT_T_C
+#ifndef TAO_VAR_SIZE_ARGUMENT_T_CPP
+#define TAO_VAR_SIZE_ARGUMENT_T_CPP
 
 #include "tao/Var_Size_Argument_T.h"
 
@@ -9,9 +9,7 @@
 #include "tao/Var_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao,
-           Var_Size_Argument_T,
-           "$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename Insert_Policy>
@@ -117,4 +115,6 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::A
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VAR_SIZE_ARGUMENT_T_CPP */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index fa1afc31536..72760ec5ac8 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -116,7 +118,7 @@ namespace TAO
   };
 
   /**
-   * @struct Basic_Tag
+   * @struct Var_Size_Tag
    *
    * @brief Struct for fixed size IDL type arguments id tag.
    *
@@ -147,6 +149,8 @@ namespace TAO
   };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "tao/Var_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index b5c240dfa8a..e20150b11c7 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -96,3 +100,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::retn (void)
   return this->x_._retn ();
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 6f49378a923..a4ffbae9061 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -1,7 +1,9 @@
+// -*- C++ -*-
 // $Id$
-// This is an automatically generated file.
+
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.
 
 #define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 7
-#define TAO_VERSION "1.4.7"
+#define TAO_MINOR_VERSION 5
+#define TAO_BETA_VERSION 1
+#define TAO_VERSION "1.5.1"
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 7ea50940e52..7d9e6cff8ce 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "WCharSeqC.h"
+#include "tao/WCharSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_WCHARSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::WCharSeq::WCharSeq (void)
 CORBA::WCharSeq::WCharSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::WCharSeq::WCharSeq (
     ::CORBA::WChar * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::WCharSeq::WCharSeq (
 CORBA::WCharSeq::WCharSeq (
     const WCharSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::WCharSeq::_tao_any_destructor (
     const CORBA::WCharSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::WCharSeq::_tao_any_destructor (
     CORBA::WCharSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h
index 53b046ae900..3a3676e8b57 100644
--- a/TAO/tao/WCharSeqC.h
+++ b/TAO/tao/WCharSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_WCHARSEQ_CH_)
 #define _CORBA_WCHARSEQ_CH_
-  
+
   class WCharSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
-        WCharSeq,
-        CORBA::WChar
+        WCharSeq
       >
     WCharSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
-        WCharSeq,
-        WCharSeq_var,
-        CORBA::WChar
+        WCharSeq
       >
     WCharSeq_out;
-  
+
   class TAO_Export WCharSeq
     : public
-        TAO_Unbounded_Sequence<
+        TAO::unbounded_value_sequence<
             CORBA::WChar
           >
   {
@@ -93,14 +92,14 @@ namespace CORBA
     WCharSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::WChar* buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::WChar* buffer,
+        ::CORBA::Boolean release = false
       );
     WCharSeq (const WCharSeq &);
     ~WCharSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef WCharSeq_var _var_type;
   };
 
@@ -139,6 +138,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index 1021460a5e3..8a6b8ad0bdd 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "WStringSeqC.h"
+#include "tao/WStringSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_WSTRINGSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::WStringSeq::WStringSeq (void)
 CORBA::WStringSeq::WStringSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (max)
 {}
 
@@ -63,14 +65,14 @@ CORBA::WStringSeq::WStringSeq (
     ::CORBA::WChar * * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::WStringSeq::WStringSeq (
     const WStringSeq &seq
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (seq)
 {}
 
@@ -99,22 +101,7 @@ void CORBA::WStringSeq::_tao_any_destructor (
     const CORBA::WStringSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -122,41 +109,9 @@ void CORBA::WStringSeq::_tao_any_destructor (
     CORBA::WStringSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h
index 7a434302f87..99af9022e39 100644
--- a/TAO/tao/WStringSeqC.h
+++ b/TAO/tao/WStringSeqC.h
@@ -55,35 +55,34 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
-  
+
   class WStringSeq;
-  
+
   typedef
-    TAO_MngSeq_Var_T<
-        WStringSeq,
-        TAO_SeqElem_WString_Manager
+    TAO_VarSeq_Var_T<
+        WStringSeq
       >
     WStringSeq_var;
-  
+
   typedef
-    TAO_MngSeq_Out_T<
-        WStringSeq,
-        WStringSeq_var,
-        TAO_SeqElem_WString_Manager
+    TAO_Seq_Out_T<
+        WStringSeq
       >
     WStringSeq_out;
-  
+
   class TAO_Export WStringSeq
     : public
-        TAO_Unbounded_WString_Sequence
+        TAO::unbounded_wstring_sequence
   {
   public:
     WStringSeq (void);
@@ -91,14 +90,14 @@ namespace CORBA
     WStringSeq (
         ::CORBA::ULong max,
         ::CORBA::ULong length,
-        ::CORBA::WChar ** buffer, 
-        ::CORBA::Boolean release = 0
+        ::CORBA::WChar ** buffer,
+        ::CORBA::Boolean release = false
       );
     WStringSeq (const WStringSeq &);
     ~WStringSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef WStringSeq_var _var_type;
   };
 
@@ -137,6 +136,8 @@ TAO_Export ::CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1040
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 00075a77b84..1a039a0b089 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -5,12 +5,14 @@
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
-#include "debug.h"
+#include "tao/debug.h"
 
 ACE_RCSID(tao,
           Wait_On_LF_No_Upcall,
           "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Transport;
 namespace TAO
 {
@@ -56,10 +58,13 @@ namespace TAO
 
   private:
 
-    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (void))
+    Nested_Upcall_Guard (void) {}
+
+    /// Disallow copying and assignment.
+    Nested_Upcall_Guard (const Nested_Upcall_Guard&);
+    Nested_Upcall_Guard & operator= (const Nested_Upcall_Guard&);
 
-    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (
-                              const Nested_Upcall_Guard&))
+  private:
 
     /// Pointer to the transport that we plan to use.
     TAO_Transport* t_;
@@ -100,3 +105,5 @@ namespace TAO
     return true;
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index d2ea3b899f8..8c839eba3bc 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,6 +13,7 @@
 
 #ifndef TAO_WAIT_ON_LF_NO_UPCALL_H
 #define TAO_WAIT_ON_LF_NO_UPCALL_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/Wait_On_Leader_Follower.h"
@@ -21,9 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-
   /**
    * @class TAO_Wait_On_LF_No_Upcall
    *
@@ -54,5 +56,9 @@ namespace TAO
     virtual bool can_process_upcalls (void) const;
   };
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* TAO_WAIT_ON_LF_NO_UPCALL_H */
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 82ac698e591..b8935c80af6 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -11,6 +11,8 @@ ACE_RCSID (tao,
            Wait_On_Leader_Follower,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
@@ -68,3 +70,5 @@ TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index 5db60e5808b..f775c66d9c0 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Wait_On_Leader_Follower
  *
@@ -55,6 +57,8 @@ public:
   virtual bool can_process_upcalls (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_WAIT_ON_LEADER_FOLLOWER_H */
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 9168df03344..de3cc031952 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (tao,
            Wait_On_Reactor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
@@ -30,7 +32,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
   ACE_Countdown_Time countdown (max_wait_time);
 
   // Reactor does not change inside the loop.
-  ACE_Reactor* reactor =
+  ACE_Reactor* const reactor =
     this->transport_->orb_core ()->reactor ();
 
   // Do the event loop, till we fully receive a reply.
@@ -115,3 +117,5 @@ TAO_Wait_On_Reactor::can_process_upcalls (void) const
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 566a419efd1..212590b4d56 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Wait_On_Reactor
  *
@@ -47,6 +49,8 @@ public:
   virtual bool can_process_upcalls (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_WAIT_ON_REACTOR_H */
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 3d17ac729a3..e510aee3f81 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "Wait_On_Read.h"
-#include "Transport.h"
-#include "Resume_Handle.h"
-#include "Synch_Reply_Dispatcher.h"
-#include "Client_Strategy_Factory.h"
-#include "ORB_Core.h"
+#include "tao/Wait_On_Read.h"
+#include "tao/Transport.h"
+#include "tao/Resume_Handle.h"
+#include "tao/Synch_Reply_Dispatcher.h"
+#include "tao/Client_Strategy_Factory.h"
+#include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 
@@ -13,6 +13,8 @@ ACE_RCSID (tao,
            Wait_On_Read,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
@@ -86,10 +88,10 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
                      ACE_TEXT ("registering handle for cleanup \n"),
                      this->transport_->id ()));
 
-       ACE_Event_Handler *eh =
+       ACE_Event_Handler * const eh =
          this->transport_->event_handler_i ();
 
-       ACE_Reactor *r =
+       ACE_Reactor * const r =
          this->transport_->orb_core ()->reactor ();
 
        if (r->register_handler (eh,
@@ -123,7 +125,7 @@ TAO_Wait_On_Read::register_handler (void)
 bool
 TAO_Wait_On_Read::non_blocking (void) const
 {
-  return 0;
+  return false;
 }
 
 bool
@@ -136,3 +138,5 @@ TAO_Wait_On_Read::can_process_upcalls (void) const
 /*
  * End copy hook.
  */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index e946f07d4a3..c691a668200 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Wait_On_Read
  *
@@ -46,6 +48,8 @@ public:
   virtual bool can_process_upcalls (void) const;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_WAIT_ON_READ_H */
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 15a48b36b79..efbcc303399 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -7,9 +7,12 @@ ACE_RCSID (tao,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "Wait_Strategy.inl"
+# include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Constructor.
 TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
   : transport_ (transport),
@@ -34,3 +37,5 @@ TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
  * Hook to specialize the Wait Strategy
  */
 //@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 88e80011167..d2818275714 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,7 +23,12 @@
 
 #include "tao/TAO_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_ORB_Core;
 class TAO_Transport;
 class TAO_Synch_Reply_Dispatcher;
@@ -91,9 +96,11 @@ protected:
   int is_registered_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
-# include "Wait_Strategy.inl"
+# include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 3ca279cf001..8c7368c54cf 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -29,12 +29,13 @@
 // be\be_codegen.cpp:291
 
 
-#include "WrongTransactionC.h"
+#include "tao/WrongTransactionC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 #include "tao/AnyTypeCode_Adapter.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -43,6 +44,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -75,7 +78,7 @@ CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao
 CORBA::WrongTransaction&
 CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->::CORBA::UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -186,3 +189,5 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index a872bfdfaf2..e64c9dedb4d 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -61,6 +61,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
 
@@ -131,6 +133,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &)
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource_Factory.cpp
index 5ca19fba0f0..c6afc35a325 100644
--- a/TAO/tao/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource_Factory.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "XtResource_Factory.h"
-#include "debug.h"
+#include "tao/XtResource_Factory.h"
+#include "tao/debug.h"
 #include "ace/XtReactor.h"
 
 ACE_RCSID( TAO_XtResource,
diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource_Loader.cpp
index d2350ddcc00..5fdc64af074 100644
--- a/TAO/tao/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "XtResource_Loader.h"
-#include "ORB_Core.h"
-#include "XtResource_Factory.h"
+#include "tao/XtResource_Loader.h"
+#include "tao/ORB_Core.h"
+#include "tao/XtResource_Factory.h"
 
 ACE_RCSID( TAO_XtResource,
            XtResource_Loader,
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index a21cdf54427..1fbb3357d66 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -68,9 +68,8 @@
 // TAO specific files, avoid them as much as possible.
 
 #include "tao/CDR.h"
-
-#include "tao/Managed_Types.h"
 #include "tao/Object_KeyC.h"
+#include "tao/String_Manager_T.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/PortableInterceptorC.h"
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
deleted file mode 100644
index bb988ed34ba..00000000000
--- a/TAO/tao/corbafwd.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-#include "corbafwd.h"
-
-ACE_RCSID (tao,
-           corbafwd,
-           "$Id$")
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index d1cfdd93b16..3b2fdad7cb4 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -11,4 +11,8 @@ ACE_RCSID (tao,
            debug,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Export unsigned int TAO_debug_level = 0;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index 1ca35af44d1..6bd37a2341c 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -22,6 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // These are global to simplify is use by other code, very much in
 // particular by getopt and related argument-parsing code
 //
@@ -34,5 +38,7 @@ extern TAO_Export unsigned int TAO_debug_level;
 // debug messages on (1) or off (0)
 extern TAO_Export unsigned int TAO_orbdebug;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index e2d4b28f9d1..bc6d38cf6ab 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "default_client.h"
-#include "Wait_On_Read.h"
-#include "Wait_On_Reactor.h"
-#include "Wait_On_Leader_Follower.h"
-#include "Wait_On_LF_No_Upcall.h"
-#include "Exclusive_TMS.h"
-#include "Muxed_TMS.h"
-#include "Blocked_Connect_Strategy.h"
-#include "Reactive_Connect_Strategy.h"
-#include "LF_Connect_Strategy.h"
-#include "orbconf.h"
+#include "tao/default_client.h"
+#include "tao/Wait_On_Read.h"
+#include "tao/Wait_On_Reactor.h"
+#include "tao/Wait_On_Leader_Follower.h"
+#include "tao/Wait_On_LF_No_Upcall.h"
+#include "tao/Exclusive_TMS.h"
+#include "tao/Muxed_TMS.h"
+#include "tao/Blocked_Connect_Strategy.h"
+#include "tao/Reactive_Connect_Strategy.h"
+#include "tao/LF_Connect_Strategy.h"
+#include "tao/orbconf.h"
 
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -23,6 +23,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   : profile_lock_type_ (TAO_THREAD_LOCK)
   , transport_mux_strategy_ (TAO_MUXED_TMS)
@@ -104,6 +106,8 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (name,
                                            ACE_TEXT("null")) == 0)
                 this->profile_lock_type_ = TAO_NULL_LOCK;
+	      else
+		this->report_option_value_error (ACE_TEXT("-ORBIIOPProfileLock"), name);
             }
         }
 
@@ -208,9 +212,14 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               if (ACE_OS::strcasecmp (name,
-                                       ACE_TEXT("false")) == 0)
+               if (ACE_OS::strcmp (name, ACE_TEXT("0")) == 0 ||
+                   ACE_OS::strcasecmp (name, ACE_TEXT("false")) == 0)
                  this->use_cleanup_options_ = false;
+               else if (ACE_OS::strcmp (name, ACE_TEXT("1")) == 0 ||
+                        ACE_OS::strcasecmp (name, ACE_TEXT("true")) == 0)
+                 this->use_cleanup_options_ = true;
+               else 
+                 this->report_option_value_error (ACE_TEXT("-ORBConnectionHandlerCleanup"), name);
              }
          }
       else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0)
@@ -383,6 +392,8 @@ TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const
   return this->use_cleanup_options_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 0da7020d23a..db6544d166d 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "tao/Client_Strategy_Factory.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Default_Client_Strategy_Factory
  *
@@ -115,6 +117,8 @@ private:
   bool use_cleanup_options_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h
index 45ded1f6f06..a535b1fa05a 100644
--- a/TAO/tao/default_environment.h
+++ b/TAO/tao/default_environment.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   class Environment;
@@ -34,6 +36,8 @@ namespace CORBA
  */
 TAO_Export CORBA::Environment& TAO_default_environment (void);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_DEFAULT_ENVIRONMENT_H */
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index bae6bf7ab3d..59447bdb234 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -4,6 +4,7 @@
 
 #include "tao/debug.h"
 #include "tao/IIOP_Factory.h"
+#include "tao/Protocol_Factory.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Connector_Registry.h"
 #include "tao/Reactive_Flushing_Strategy.h"
@@ -14,6 +15,8 @@
 #include "tao/Codeset_Descriptor_Base.h"
 #include "tao/Codeset_Manager_Factory_Base.h"
 #include "tao/Codeset_Manager.h"
+#include "tao/Null_Fragmentation_Strategy.h"
+#include "tao/On_Demand_Fragmentation_Strategy.h"
 
 #include "ace/TP_Reactor.h"
 #include "ace/Dynamic_Service.h"
@@ -25,12 +28,13 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
-
 ACE_RCSID (tao,
            default_resource,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   : use_locked_data_blocks_ (1)
   , parser_names_count_ (0)
@@ -44,6 +48,11 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   , dynamically_allocated_reactor_ (0)
   , options_processed_ (0)
   , factory_disabled_ (0)
+#if TAO_USE_LOCAL_MEMORY_POOL == 1
+  , use_local_memory_pool_ (true)
+#else
+  , use_local_memory_pool_ (false)
+#endif
   , cached_connection_lock_type_ (TAO_THREAD_LOCK)
   , object_key_table_lock_type_ (TAO_THREAD_LOCK)
   , corba_object_lock_type_ (TAO_THREAD_LOCK)
@@ -539,6 +548,7 @@ TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg)
 int
 TAO_Default_Resource_Factory::load_default_protocols (void)
 {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // If the user did not list any protocols in her svc.conf file
       // then default to TAO's basic protocols.
       // You do *NOT* need modify this code to add your own protocol,
@@ -574,7 +584,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
       // If a protocol factory is obtained from the Service
       // Configurator then do not transfer ownership to the
       // TAO_Protocol_Item.
-      int transfer_ownership = 0;
+      bool transfer_ownership = false;
 
       protocol_factory =
         ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory");
@@ -597,11 +607,12 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
                               protocol_factory,
                               TAO_Protocol_Factory);
 
-          transfer_ownership = 1;
+          transfer_ownership = true;
+
         }
       else
         {
-          transfer_ownership = 0;
+          transfer_ownership = false;
         }
 
       ACE_NEW_RETURN (item,
@@ -641,6 +652,8 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
                       ACE_TEXT ("protocol <IIOP_Factory>\n")));
         }
 
+#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
+
   return 0;
 }
 
@@ -764,20 +777,32 @@ TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor)
 }
 
 
-#if TAO_USE_LOCAL_MEMORY_POOL == 1
 typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC;
-typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
-#else
-typedef ACE_New_Allocator LOCKED_ALLOCATOR;
-#endif
+typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR_POOL;
+typedef ACE_New_Allocator LOCKED_ALLOCATOR_NO_POOL;
+
+void
+TAO_Default_Resource_Factory::use_local_memory_pool (bool flag)
+{
+  use_local_memory_pool_ = flag;
+}
 
 ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
 
   return allocator;
 }
@@ -786,9 +811,18 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
 
   return allocator;
 }
@@ -797,9 +831,18 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
 
   return allocator;
 }
@@ -814,9 +857,19 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
+
   return allocator;
 }
 
@@ -824,9 +877,19 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
+
   return allocator;
 }
 
@@ -834,9 +897,19 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
+
   return allocator;
 }
 
@@ -844,9 +917,19 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::amh_response_handler_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
+
   return allocator;
 }
 
@@ -854,9 +937,19 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::ami_response_handler_allocator (void)
 {
   ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
+  if (use_local_memory_pool_)
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_POOL,
+                    0);
+  }
+  else
+  {
+    ACE_NEW_RETURN (allocator,
+                    LOCKED_ALLOCATOR_NO_POOL,
+                    0);
+  }
+
   return allocator;
 }
 
@@ -994,6 +1087,56 @@ TAO_Default_Resource_Factory::create_lf_strategy (void)
   return strategy;
 }
 
+auto_ptr<TAO_GIOP_Fragmentation_Strategy>
+TAO_Default_Resource_Factory::create_fragmentation_strategy (
+  TAO_Transport * transport,
+  CORBA::ULong max_message_size) const
+{
+  auto_ptr<TAO_GIOP_Fragmentation_Strategy> strategy (0);
+
+  TAO_GIOP_Fragmentation_Strategy * tmp = 0;
+
+  // Minimum GIOP message size is 24 (a multiple of 8):
+  //   12   GIOP Message Header
+  //    4   GIOP Fragment Header (request ID)
+  // +  8   Smallest payload, including padding.
+  //  ---
+  //   24
+  static CORBA::ULong const min_message_size = 24;
+
+  // GIOP fragments are supported in GIOP 1.1 and better, but TAO only
+  // supports them in 1.2 or better since GIOP 1.1 fragments do not
+  // have a fragment message header.
+
+
+  if (transport) // No transport.  Cannot fragment.
+    {
+      if (max_message_size < min_message_size
+          || (TAO_DEF_GIOP_MAJOR == 1 && TAO_DEF_GIOP_MINOR < 2))
+        {
+          // No maximum was set by the user.
+          ACE_NEW_RETURN (tmp,
+                          TAO_Null_Fragmentation_Strategy,
+                          strategy);
+
+        }
+      else
+        {
+          ACE_NEW_RETURN (tmp,
+                          TAO_On_Demand_Fragmentation_Strategy (
+                            transport,
+                            max_message_size),
+                          strategy);
+        }
+    }
+
+  ACE_AUTO_PTR_RESET (strategy,
+                      tmp,
+                      TAO_GIOP_Fragmentation_Strategy);
+
+  return strategy;
+}
+
 void
 TAO_Default_Resource_Factory::report_option_value_error (
                                  const ACE_TCHAR* option_name,
@@ -1083,6 +1226,8 @@ TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const
   return this->drop_replies_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory,
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 8cbc1344a40..aef5e545fd7 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -24,11 +24,16 @@
 
 #include "tao/Resource_Factory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Reactor_Impl;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_Object_Adapter;
 class TAO_IOR_Parser;
 class TAO_LF_Strategy;
 class TAO_Codeset_Descriptor_Base;
-class ACE_Reactor_Impl;
 
 /**
  * @class TAO_Default_Resource_Factory
@@ -103,6 +108,7 @@ public:
   virtual void reclaim_reactor (ACE_Reactor *);
   virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
   virtual TAO_Connector_Registry *get_connector_registry (void);
+  virtual void use_local_memory_pool (bool);
   virtual ACE_Allocator* input_cdr_dblock_allocator (void);
   virtual ACE_Allocator* input_cdr_buffer_allocator (void);
   virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
@@ -129,7 +135,9 @@ public:
   virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
   TAO_Resource_Factory::Resource_Usage resource_usage_strategy (void) const;
   virtual TAO_LF_Strategy *create_lf_strategy (void);
-
+  virtual auto_ptr<TAO_GIOP_Fragmentation_Strategy>
+    create_fragmentation_strategy (TAO_Transport * transport,
+                                   CORBA::ULong max_message_size) const;
   virtual void disable_factory (void);
   virtual bool drop_replies_during_shutdown (void) const;
   //@}
@@ -207,6 +215,10 @@ protected:
   /// were processed before (or later).
   int factory_disabled_;
 
+  /// This flag is used to determine whether the cdr allocators
+  /// should use the local memory pool or not.
+  bool use_local_memory_pool_;
+
 private:
   void init_codeset_descriptors (void);
 
@@ -247,6 +259,8 @@ private:
   bool drop_replies_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
 
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index c74c5065ef7..3ebc4dadc7f 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (tao,
            default_server,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
@@ -380,6 +382,8 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error (
              option_value, option_name));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory,
                        ACE_TEXT ("Server_Strategy_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index f8304d430da..e346b7eaca2 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -25,6 +25,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Time_Value.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Default_Server_Strategy_Factory
@@ -85,6 +86,8 @@ protected:
   ACE_Time_Value thread_per_connection_timeout_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
index 8d6a1c4ef59..bb632ec4c49 100644
--- a/TAO/tao/diffs/Object_Key.diff
+++ b/TAO/tao/diffs/Object_Key.diff
@@ -3,23 +3,23 @@
 @@ -37,6 +37,10 @@
  #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
  #endif /* __BORLANDC__ */
- 
+
 +#include "ace/ACE.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 @@
  TAO::ObjectKey::~ObjectKey (void)
  {}
- 
+
 +// Hand crafted.
 +
 +void
 +TAO::ObjectKey::encode_sequence_to_string (char * &str,
-+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
++                                           const TAO::unbounded_value_sequence<CORBA::Octet> &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
@@ -71,7 +71,7 @@
 +}
 +
 +void
-+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
++TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq,
 +                                           const char *str)
 +{
 +  if (str == 0)
@@ -142,10 +142,8 @@
 +      if (ACE_BIT_DISABLED (strm.start ()->flags (),
 +      ACE_Message_Block::DONT_DELETE))
 +      {
-+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-+          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
-+        oseq->replace (_tao_seq_len, strm.start ());
-+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
++        key.replace (_tao_seq_len, strm.start ());
++        key.mb ()->wr_ptr (key.mb()->rd_ptr () + _tao_seq_len);
 +        strm.skip_bytes (_tao_seq_len);
 +        return 1;
 +      }
@@ -160,7 +158,7 @@
 +}
 +
  #endif /* end #if !defined */
- 
+
  // 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
@@ -173,10 +171,10 @@
 +
 +    static void encode_sequence_to_string (
 +        char * &str,
-+        const TAO_Unbounded_Sequence<CORBA::Octet> &seq
++        const TAO::unbounded_value_sequence<CORBA::Octet> &seq
 +      );
 +    static void decode_string_to_sequence (
-+        TAO_Unbounded_Sequence<CORBA::Octet> &seq,
++        TAO::unbounded_value_sequence<CORBA::Octet> &seq,
 +        const char *str
 +      );
 +    static int is_legal (u_char & c);
@@ -188,5 +186,5 @@
 +    static CORBA::Boolean demarshal_key (ObjectKey &key,
 +                                         TAO_InputCDR &cdr);
    };
- 
+
  #endif /* end #if !defined */
diff --git a/TAO/tao/diffs/ServerRequestInterceptor.diff b/TAO/tao/diffs/ServerRequestInterceptor.diff
deleted file mode 100644
index f3fc423c81a..00000000000
--- a/TAO/tao/diffs/ServerRequestInterceptor.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- orig/ServerRequestInterceptorC.h	2005-05-17 13:50:41.646918400 +0200
-+++ ServerRequestInterceptorC.h	2005-05-17 14:00:40.237649600 +0200
-@@ -155,15 +155,19 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-+
-     virtual void tao_ft_interception_point (
-         ::PortableInterceptor::ServerRequestInfo_ptr ri,
-         ::CORBA::OctetSeq_out os
--        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+        ACE_ENV_ARG_DECL_NOT_USED
-       )
-       ACE_THROW_SPEC ((
-         CORBA::SystemException,
-         ::PortableInterceptor::ForwardRequest
--      )) = 0;
-+      )) {}
-+
-+#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
index 8d7542b0509..8f9fcf5b15c 100644
--- a/TAO/tao/extra_core.mpb
+++ b/TAO/tao/extra_core.mpb
@@ -3,9 +3,6 @@
 
 feature(!minimum_corba) {
   Source_Files(TAO_COMPONENTS) {
-    ClientRequestInterceptor_Adapter.cpp
-    ServerRequestInterceptor_Adapter.cpp
-    ServicesC.cpp
     Dynamic_Adapter.cpp
   }
 }
diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h
index f1be2f0615e..40d8f6cad7d 100644
--- a/TAO/tao/objectid.h
+++ b/TAO/tao/objectid.h
@@ -23,6 +23,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  *
  * This file is a break away from orbconf.h. Basically orbconf.h is
@@ -103,5 +107,7 @@ namespace TAO
 /// No. of services locatable through multicast.
 #define TAO_NO_OF_MCAST_SERVICES 4
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /*TAO_OBJECTID_H*/
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index c75ced2a83f..7e505f26c58 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,11 +1,12 @@
 //$Id$
 
-#include "operation_details.h"
-#include "Stub.h"
-#include "ORB_Constants.h"
-#include "Exception_Data.h"
-#include "SystemException.h"
-#include "Argument.h"
+#include "tao/operation_details.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Constants.h"
+#include "tao/Exception_Data.h"
+#include "tao/SystemException.h"
+#include "tao/Argument.h"
+#include "tao/CDR.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -17,6 +18,8 @@ ACE_RCSID (tao,
            operation_details,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 CORBA::Exception *
 TAO_Operation_Details::corba_exception (const char *id
                                         ACE_ENV_ARG_DECL)
@@ -60,6 +63,11 @@ TAO_Operation_Details::marshal_args (TAO_OutputCDR &cdr)
         return false;
     }
 
+  // Nothing else to fragment.  We're also guaranteed to have
+  // data in the CDR stream since the operation was a marshaling
+  // operation, not a fragmentation operation.
+  cdr.more_fragments (false);
+
   return true;
 }
 
@@ -75,3 +83,4 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr)
   return true;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 8748d0f6147..bc44c92e5f9 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 //=============================================================================
 /**
  *  @file    operation_details.h
@@ -14,16 +14,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "SystemException.h"
+#include "tao/SystemException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Service_Context.h"
-#include "target_specification.h"
+#include "tao/Service_Context.h"
+#include "tao/TimeBaseC.h"
+#include "tao/target_specification.h"
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations
 namespace Dynamic
 {
@@ -37,6 +40,14 @@ namespace TAO
   struct Exception_Data;
 }
 
+namespace TAO
+{
+  namespace CSD
+  {
+    class FW_Server_Request_Wrapper;
+  }
+}
+
 /**
  * @class TAO_Operation_Details
  *
@@ -53,6 +64,11 @@ class TAO_Export TAO_Operation_Details
 {
 public:
 
+  /// Declare FW_Server_Request_Wrapper a friend
+  /// This friendship makes the FW_Server_Request_Wrapper be able to
+  /// clone the TAO_Operation_Details data member in TAO_ServerRequest.
+  friend class TAO::CSD::FW_Server_Request_Wrapper;
+
   /// Constructor
   TAO_Operation_Details (const char *name,
                          CORBA::ULong len,
@@ -140,6 +156,12 @@ public:
 
   TAO::Exception_Data const * ex_data (void) const;
 
+  void ft_expiration_time (TimeBase::TimeT time);
+  TimeBase::TimeT ft_expiration_time (void) const;
+
+  void ft_retention_id (CORBA::Long request_id);
+  CORBA::Long ft_retention_id (void) const;
+
 private:
 
   /// Name of the operation being invoked.
@@ -181,10 +203,19 @@ private:
 
   /// Count of the exceptions that operations can throw.
   CORBA::ULong ex_count_;
+#if TAO_HAS_INTERCEPTORS == 1
+  /// FT request expiration time (absolute gregorian)
+  TimeBase::TimeT ft_expiration_time_;
+
+  /// FT request retention id
+  CORBA::Long ft_retention_id_;
+#endif /*TAO_HAS_INTERCEPTORS == 1*/
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "operation_details.i"
+# include "tao/operation_details.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
index 599d37c767b..a65462899cd 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -2,6 +2,8 @@
 //
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 TAO_Operation_Details::TAO_Operation_Details (const char *name,
                                               CORBA::ULong len,
@@ -20,6 +22,10 @@ TAO_Operation_Details::TAO_Operation_Details (const char *name,
     , num_args_ (num)
     , ex_data_ (data)
     , ex_count_ (count)
+#if TAO_HAS_INTERCEPTORS == 1
+    , ft_expiration_time_ (0)
+    , ft_retention_id_ (0)
+#endif /*TAO_HAS_INTERCEPTORS == 1*/
 {
 }
 
@@ -92,12 +98,12 @@ TAO_Operation_Details::reply_service_info (void) const
 ACE_INLINE void
 TAO_Operation_Details::reset_request_service_info (void)
 {
-  this->request_service_context ().service_info ()._deallocate_buffer ();
+  this->request_service_context ().service_info ().length (0);
 }
 ACE_INLINE void
 TAO_Operation_Details::reset_reply_service_info (void)
 {
-  this->reply_service_context ().service_info ()._deallocate_buffer ();
+  this->reply_service_context ().service_info ().length (0);
 }
 
 ACE_INLINE void
@@ -164,3 +170,31 @@ TAO_Operation_Details::args_num (void) const
 {
   return this->num_args_;
 }
+
+#if TAO_HAS_INTERCEPTORS == 1
+ACE_INLINE void
+TAO_Operation_Details::ft_expiration_time (TimeBase::TimeT time)
+{
+  this->ft_expiration_time_ = time;
+}
+
+ACE_INLINE TimeBase::TimeT
+TAO_Operation_Details::ft_expiration_time (void) const
+{
+  return this->ft_expiration_time_;
+}
+
+ACE_INLINE void
+TAO_Operation_Details::ft_retention_id (CORBA::Long request_id)
+{
+  this->ft_retention_id_ = request_id;
+}
+
+ACE_INLINE CORBA::Long
+TAO_Operation_Details::ft_retention_id (void) const
+{
+  return this->ft_retention_id_;
+}
+#endif /*TAO_HAS_INTERCEPTORS == 1*/
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index 168eeabc2fb..b4bd2cb6e1c 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -29,14 +29,18 @@
 // be\be_codegen.cpp:288
 
 
-#include "orb_typesC.h"
+#include "tao/orb_typesC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
index 17a295fddf6..14555b5a451 100644
--- a/TAO/tao/orb_typesC.h
+++ b/TAO/tao/orb_typesC.h
@@ -57,6 +57,8 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace CORBA
 {
   
@@ -103,6 +105,8 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1062
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index a4bcbd98704..61cf7bfb65b 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -19,18 +19,20 @@
 
 #include /**/ "ace/pre.h"
 
-// "ace/OS.h" is overkill.  "ace/Basic_Types.h" is enough.  In
-// particular, it is needed for the definition of ACE_LITTLE_ENDIAN.
 #include "ace/Basic_Types.h"
 #include "ace/Global_Macros.h"
 #include "ace/Synch_Traits.h"
 
-#define TAO_INVALID_PRIORITY -1
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#define TAO_INVALID_PRIORITY -1
+
 #if !defined (TAO_REACTOR)
 #define TAO_REACTOR ACE_Select_Reactor
 #endif /* TAO_REACTOR */
@@ -159,36 +161,10 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #define TAO_MAXBUFSIZE 1024
 #endif /* TAO_MAXBUFSIZE */
 
-/*!
-
-  The number of times the transport will try to re-read before
-  returning control to the reactor when it has an uncompleted
-  message (see TAO_Transport::handle_input()).
-
-  The idea behind re-reading is that more data may have arrived
-  while the transport was busy deciding what to do with the bytes
-  it got, so we should probably try to re-read.
-
-  This value shouldn't be too large, lest the transport starve
-  out other transports while trying to complete its message.
-
-  When choosing a value, think of the type of this as 'unsigned int'.
- */
-#if !defined(TAO_MAX_TRANSPORT_REREAD_ATTEMPTS)
-#define TAO_MAX_TRANSPORT_REREAD_ATTEMPTS 2
-#endif
-
-// This controls the alignment for TAO structs.  It supports built-in
-// types up to and including 16 bytes (128 bits) in size.
-#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE)
-# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
-#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
-
 #if !defined (TAO_CONNECTION_PURGING_STRATEGY)
 # define TAO_CONNECTION_PURGING_STRATEGY TAO_Resource_Factory::LRU
 #endif /* TAO_CONNECTION_PURGING_STRATEGY */
 
-
 #if !defined (TAO_PURGE_PERCENT)
 # define TAO_PURGE_PERCENT 20
 #endif /* TAO_PURGE_PERCENT */
@@ -210,10 +186,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
 # endif
 
-// Instead of replacing this with the ACE macro
-// in 20+ files, define it conditionally.
-// The TAO_OutputCDR class uses the ACE macro, which
-// is defined by default.
 #if !defined(TAO_NO_COPY_OCTET_SEQUENCES)
 # define TAO_NO_COPY_OCTET_SEQUENCES 1
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
@@ -243,7 +215,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 // byte first.
 
 // @todo It seems to be that this definition of TAO_ENCAP_BYTE_ORDER
-// should be  removed. We have an equivalent ACE definition in
+// should be removed. We have an equivalent ACE definition in
 // ACE_CDR_BYTE_ORDER. Today both of them are consistent. It would be
 // a havoc if oneday this consistency is gone..
 #if defined (ACE_LITTLE_ENDIAN)
@@ -288,36 +260,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #  pragma warning (disable:4355) /* disable C4355 warning */
 #endif /* defined (_MSC_VER) */
 
-// The IDL compiler can generate the classes corresponding to IDL
-// sequences in two ways:
-// + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<>
-// + Explicitly generate code for the sequence.
-//
-// The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>)
-// can be shared across multiple IDL files.
-// Unfortunately it is hard to manage the template instantiations on
-// platforms that do not automatically generate them, mainly because
-// it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most
-// applications.
-//
-// On platforms that support automatic template instantiation we use
-// the first approach.
-// On platforms that require explicit template instantiations we use
-// explicitly generated code for sequences if the platform does not.
-// If the application requires it (such as embedded systems) the
-// default can be changed, but then the application developer is
-// responsible for instantiating the templates.
-//
-#if defined (AIX) || \
-    (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-     (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-      (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS))))
-#define TAO_USE_SEQUENCE_TEMPLATES
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // The Root POA default name.
 #if !defined (TAO_DEFAULT_ROOTPOA_NAME)
 #define TAO_DEFAULT_ROOTPOA_NAME   "RootPOA"
@@ -337,16 +279,20 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # define TAO_HAS_MINIMUM_CORBA 0
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-// Default DIOP settings
+/// Default IIOP settings
+#if !defined (TAO_HAS_IIOP)
+#  define TAO_HAS_IIOP 1
+#endif  /* !TAO_HAS_IIOP */
+
+/// Default DIOP settings
 #if !defined (TAO_HAS_DIOP)
-#    define TAO_HAS_DIOP 1
+#  define TAO_HAS_DIOP 1
 #endif  /* !TAO_HAS_DIOP */
 
-// SCIOP is disabled by default (i.e. TAO_HAS_SCIOP is undef)
-// to enable SCIOP, make with sctp=openss7 option on command line.
-// See $ACE_ROOT/performance-tests/SCTP/README for more info.
-
-// Default SCIOP Settings
+/// Default SCIOP Settings
+/// SCIOP is disabled by default (i.e. TAO_HAS_SCIOP is undef)
+/// to enable SCIOP, make with sctp=openss7 option on command line.
+/// See $ACE_ROOT/performance-tests/SCTP/README for more info.
 #if !defined (TAO_HAS_SCIOP)
 #  if defined (ACE_HAS_SCTP)
 #    define TAO_HAS_SCIOP 1
@@ -872,14 +818,7 @@ enum TAO_Policy_Scope
 #  define TAO_USE_LOCAL_MEMORY_POOL 1
 #endif /* TAO_USE_LOCAL_MEMORY_POOL */
 
-#if !defined (TAO_RESET_OUTPUT_CDR_AFTER_SEND)
-#define TAO_RESET_OUTPUT_CDR_AFTER_SEND 0
-#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */
-
-/// By default at this moment we use the deprecated exception holder
-/// when the new version is ready we will remove this define.
-#define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 7da35340277..a06608bedb2 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -15,6 +15,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   : endpoints_map_ (10)
   , mcast_discovery_endpoint_ ()
@@ -22,7 +24,9 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   , sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
   , sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
   , nodelay_ (1)
+  , sock_keepalive_ (0)
   , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF)
+  , max_message_size_ (0) // Disable outgoing GIOP fragments by default
   , use_lite_protocol_ (0)
   , use_dotted_decimal_addresses_ (0)
   , cache_incoming_by_dotted_decimal_address_ (0)
@@ -77,7 +81,7 @@ TAO_ORB_Parameters::add_endpoints (const ACE_CString &lane,
   TAO_EndpointSet endpoint_set;
 
   // Parse the additional endpoints.
-  int result =
+  int const result =
     this->parse_and_add_endpoints (additional_endpoints,
                                    endpoint_set);
 
@@ -302,3 +306,5 @@ TAO_ORB_Parameters::connect_ipv6_only (void) const
   return this->connect_ipv6_only_;
 }
 #endif /* ACE_HAS_IPV6 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index ef7593e3ab3..c65f9177e91 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -24,8 +24,10 @@
 
 #include "ace/SString.h"
 
-#include "objectid.h"
-#include "CORBA_String.h"
+#include "tao/objectid.h"
+#include "tao/CORBA_String.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decls.
 
@@ -38,7 +40,6 @@
 typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet;
 typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
 
-
 // -------------------------------------------------------------------
 
 /**
@@ -84,6 +85,10 @@ public:
   int nodelay (void) const;
   void nodelay (int);
 
+  /// Set/Get whether we should set SO_KEEPALIVE on the socket or not.
+  int sock_keepalive (void);
+  void sock_keepalive (int);
+
   /**
    * Octet sequences are marshalled without doing any copies, we
    * simply append a block to the CDR message block chain. When the
@@ -93,6 +98,15 @@ public:
   int cdr_memcpy_tradeoff (void) const;
   void cdr_memcpy_tradeoff (int);
 
+  /**
+   * Maximum size of a GIOP message before outgoing fragmentation
+   * kicks in.
+   */
+  //@{
+  ACE_CDR::ULong max_message_size (void) const;
+  void max_message_size (ACE_CDR::ULong size);
+  //@}
+
   /// The ORB will use the dotted decimal notation for addresses. By
   /// default we use the full ascii names.
   int use_dotted_decimal_addresses (void) const;
@@ -226,10 +240,20 @@ private:
   /// 1 if we're using TCP_NODELAY and 0 otherwise.
   int nodelay_;
 
+  /// 1 if we're using SO_KEEPALIV and 0 otherwise (default 0).
+  int sock_keepalive_;
+
   /// Control the strategy for copying vs. appeding octet sequences in
   /// CDR streams.
   int cdr_memcpy_tradeoff_;
 
+  /// Maximum GIOP message size to be sent over a given transport.
+  /**
+   * Setting a maximum message size will cause outgoing GIOP
+   * fragmentation to be enabled.
+   */
+  ACE_CDR::ULong max_message_size_;
+
   /// For selecting a liteweight version of the GIOP protocol.
   int use_lite_protocol_;
 
@@ -313,6 +337,8 @@ private:
   bool negotiate_codesets_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "tao/params.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 92a8a9e936a..d900d18a967 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 TAO_ORB_Parameters::sock_rcvbuf_size (void) const
 {
@@ -38,6 +40,18 @@ TAO_ORB_Parameters::cdr_memcpy_tradeoff (int x)
   this->cdr_memcpy_tradeoff_ = x;
 }
 
+ACE_INLINE ACE_CDR::ULong
+TAO_ORB_Parameters::max_message_size (void) const
+{
+  return this->max_message_size_;
+}
+
+ACE_INLINE void
+TAO_ORB_Parameters::max_message_size (ACE_CDR::ULong size)
+{
+  this->max_message_size_ = size;
+}
+
 ACE_INLINE int
 TAO_ORB_Parameters::use_dotted_decimal_addresses (void) const
 {
@@ -137,6 +151,18 @@ TAO_ORB_Parameters::nodelay (int x)
 }
 
 ACE_INLINE int
+TAO_ORB_Parameters::sock_keepalive (void)
+{
+  return this->sock_keepalive_;
+}
+
+ACE_INLINE void
+TAO_ORB_Parameters::sock_keepalive (int x)
+{
+  this->sock_keepalive_ = x;
+}
+
+ACE_INLINE int
 TAO_ORB_Parameters::ace_sched_policy (void) const
 {
   return this->ace_sched_policy_;
@@ -228,3 +254,5 @@ TAO_ORB_Parameters::negotiate_codesets (bool x)
 {
   this->negotiate_codesets_ = x;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index b54ca557854..8d9939c6a09 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -1,4 +1,5 @@
 //$Id$
+
 project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
   sharedname   = TAO
   dynamicflags = TAO_BUILD_DLL
@@ -29,6 +30,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Cleanup_Func_Registry.cpp
     Client_Strategy_Factory.cpp
     ClientRequestInterceptor_Adapter_Factory.cpp
+    ClientRequestInterceptor_Adapter.cpp
     Codeset_Manager.cpp
     Codeset_Manager_Factory_Base.cpp
     Codeset_Translator_Base.cpp
@@ -66,6 +68,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     FILE_Parser.cpp
     FloatSeqC.cpp
     Flushing_Strategy.cpp
+    GIOP_Fragmentation_Strategy.cpp
     GIOP_Message_Base.cpp
     GIOP_Message_Generator_Parser.cpp
     GIOP_Message_Generator_Parser_10.cpp
@@ -90,6 +93,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Transport.cpp
     IIOPC.cpp
     Incoming_Message_Queue.cpp
+    Incoming_Message_Stack.cpp
     Invocation_Adapter.cpp
     Invocation_Base.cpp
     Invocation_Endpoint_Selectors.cpp
@@ -118,7 +122,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     LongLongSeqC.cpp
     LongSeqC.cpp
     LRU_Connection_Purging_Strategy.cpp
-    Managed_Types.cpp
     MCAST_Parser.cpp
     Messaging_PolicyValueC.cpp
     Messaging_SyncScopeC.cpp
@@ -126,6 +129,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Muxed_TMS.cpp
     New_Leader_Generator.cpp
     NVList_Adapter.cpp
+    Null_Fragmentation_Strategy.cpp
     Object.cpp
     Object_KeyC.cpp
     Object_Loader.cpp
@@ -134,6 +138,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ObjectIdListC.cpp
     ObjectKey_Table.cpp
     OctetSeqC.cpp
+    On_Demand_Fragmentation_Strategy.cpp
     operation_details.cpp
     ORB.cpp
     ORBInitializer_Registry.cpp
@@ -174,13 +179,15 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Request_Dispatcher.cpp
     Resource_Factory.cpp
     Resume_Handle.cpp
-    Sequence.cpp
     Server_Strategy_Factory.cpp
+    ServerRequestInterceptor_Adapter.cpp
     ServerRequestInterceptor_Adapter_Factory.cpp
     Service_Callbacks.cpp
     Service_Context.cpp
     Services_Activate.cpp
+    ServicesC.cpp
     ShortSeqC.cpp
+    String_Alloc.cpp
     StringSeqC.cpp
     Stub.cpp
     Stub_Factory.cpp
@@ -215,6 +222,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     UserException.cpp
     UShortSeqC.cpp
     Valuetype_Adapter.cpp
+    Valuetype_Adapter_Factory.cpp
     Wait_On_Leader_Follower.cpp
     Wait_On_LF_No_Upcall.cpp
     Wait_On_Reactor.cpp
@@ -344,6 +352,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Profile.h
     IIOP_Transport.h
     Incoming_Message_Queue.h
+    Incoming_Message_Stack.h
     Invocation_Adapter.h
     Invocation_Base.h
     Invocation_Endpoint_Selectors.h
@@ -377,7 +386,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     LongSeqC.h
     LongSeqS.h
     LRU_Connection_Purging_Strategy.h
-    Managed_Types.h
     MCAST_Parser.h
     Messaging_PolicyValueC.h
     Messaging_SyncScopeC.h
@@ -446,8 +454,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Resource_Factory.h
     Resume_Handle.h
     Seq_Out_T.h
-    Sequence.h
-    Sequence_T.h
     Seq_Var_T.h
     Server_Strategy_Factory.h
     Service_Callbacks.h
@@ -461,6 +467,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Special_Basic_Argument_T.h
     StringSeqC.h
     StringSeqS.h
+    String_Alloc.h
     Stub_Factory.h
     Stub.h
     Synch_Invocation.h
@@ -505,11 +512,13 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     UShortSeqC.h
     UShortSeqS.h
     Valuetype_Adapter.h
+    Valuetype_Adapter_Factory.h
     Var_Array_Argument_T.h
     varbase.h
     VarOut_T.h
     Var_Size_Argument_T.h
     Version.h
+    Versioned_Namespace.h
     Wait_On_Leader_Follower.h
     Wait_On_LF_No_Upcall.h
     Wait_On_Reactor.h
diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp
index d72faa3c200..ca77495c883 100644
--- a/TAO/tao/target_specification.cpp
+++ b/TAO/tao/target_specification.cpp
@@ -4,7 +4,7 @@
 #include "tao/target_specification.h"
 
 #if !defined (__ACE_INLINE__)
-#include "target_specification.i"
+#include "tao/target_specification.i"
 #endif /* !defined INLINE */
 
 ACE_RCSID (tao, 
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 4a352a6b333..60c997f0e3c 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -35,6 +35,7 @@
 # undef IOR
 #endif /* HPUX && IOR */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace IOP
 {
@@ -127,8 +128,10 @@ private:
   CORBA::ULong profile_index_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-#include "target_specification.i"
+#include "tao/target_specification.i"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i
index e427b1dd9be..dd1265bf0df 100644
--- a/TAO/tao/target_specification.i
+++ b/TAO/tao/target_specification.i
@@ -1,6 +1,8 @@
-//-*- C++ -*-
+// -*- C++ -*-
+//
 //$Id$
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_Target_Specification::TAO_Target_Specification (void)
@@ -81,3 +83,5 @@ TAO_Target_Specification::specifier (void)
 {
   return this->specifier_;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
index f2ba8aea77f..58b1a595c87 100644
--- a/TAO/tao/varbase.h
+++ b/TAO/tao/varbase.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,6 +17,10 @@
 #define TAO_VARBASE_H
 #include /**/ "ace/pre.h"
 
+#include "tao/Versioned_Namespace.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class TAO_Base_var
  *
@@ -39,5 +43,7 @@ private:
 
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_VARBASE_H */
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index 31273239815..5188e4a669b 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver, amh, strategies {
 }
 
 project(*Client): taoexe, amh, portableserver, strategies {
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index deff794042a..4c78cd27121 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -11,7 +11,7 @@ use lib "../../../bin";
 use PerlACE::Run_Test;
 
 # Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = 6;
+$sleeptime = $PerlACE::wait_interval_for_process_creation;
 
 # File used to pass AMH server ior to its clients.
 # This file name is hard-coded in the server.cpp and client.cpp files
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index b42dca05552..a0a1fbb883e 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -8,6 +8,7 @@ project(*client) : taoexe, portableserver, amh {
 }
 
 project(*server) : taoserver, amh, strategies {
+  after += *client
   source_files {
     server.cpp
   }
diff --git a/TAO/tests/AMH_Oneway/run_test.pl b/TAO/tests/AMH_Oneway/run_test.pl
index aacfe3d9128..e092024d923 100755
--- a/TAO/tests/AMH_Oneway/run_test.pl
+++ b/TAO/tests/AMH_Oneway/run_test.pl
@@ -11,7 +11,7 @@ use lib "../../../bin";
 use PerlACE::Run_Test;
 
 # Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = 6;
+$sleeptime = $PerlACE::wait_interval_for_process_creation;
 
 # File used to pass AMH server ior to its clients.
 # This file name is hard-coded in the server.cpp and client.cpp files
@@ -19,11 +19,21 @@ $iorfile = PerlACE::LocalFile("test.ior");
 
 unlink $iorfile;
 
-$AMH = new PerlACE::Process ("server", "");
+if (PerlACE::is_vxworks_test()) {
+  $AMH = new PerlACE::ProcessVX ("server", "");
+}
+else {
+  $AMH = new PerlACE::Process ("server", "");
+}
 $CL = new PerlACE::Process ("client", "");
 
 # Run the AMH server.
-$AMH->Spawn ();
+$sv = $AMH->Spawn ();
+
+if ($sv != 0) {
+   print STDERR "ERROR: AMH server returned $sv\n";
+   exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
@@ -32,7 +42,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     exit 1;
 }
 
-# Run the cleint client.
+# Run the client.
 $client = $CL->Spawn ();
 
 
@@ -40,7 +50,7 @@ $client = $CL->Spawn ();
 
 $client = $CL->WaitKill (30);
 if ($client != 0) {
-    print STDERR "ERROR: Client returned $amhserver\n";
+    print STDERR "ERROR: Client returned $client\n";
     $status = 1;
 }
 
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index dcade4b27d7..894442827ba 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -9,12 +9,14 @@ project(*Server): taoserver, messaging, ami {
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
+  after += *Server
   Source_Files {
     client.cpp
   }
 }
 
 project(*Simple Client): messaging, taoexe, portableserver, ami {
+  after += *Server
   Source_Files {
     simple_client.cpp
   }
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 83b14a82a2c..4440087c003 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -112,10 +112,10 @@ public:
                       out_l));
         }
 
-      number_of_replies--;
+      --number_of_replies;
     };
 
-   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+   void foo_excep (::Messaging::ExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -124,7 +124,7 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -145,7 +145,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void get_yadda_excep (::Messaging::ExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -160,7 +160,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void set_yadda_excep (::Messaging::ExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -179,7 +179,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (A::AMI_AMI_TestExceptionHolder *
+  void inout_arg_test_excep (::Messaging::ExceptionHolder *
                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index f3e7493a8fd..8b43bbe69a4 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -48,14 +48,23 @@ $CL = new PerlACE::Process ("simple_client",
                             "-ORBsvcconf $client_conf "
                             . "-ORBdebuglevel $debug_level"
                             . " -k file://$iorfile "
-                            . " -i $iterations -x -d");
+                            . " -i $iterations -d");
 
 $client = $CL->SpawnWaitKill (60);
+
+$CL2 = new PerlACE::Process ("simple_client",
+                             "-ORBsvcconf $client_conf"
+                             . " -ORBCollocation no"
+                             . " -ORBdebuglevel $debug_level"
+                             . " -k file://$iorfile "
+                             . " -i $iterations -x -d");
+$client2 = $CL2->SpawnWaitKill (60);
+
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0) {
+if ($server != 0 || $client != 0 || $client2 != 0) {
     exit 1;
 }
  
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 40b67edad4e..8ef9d036c8e 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -89,27 +89,28 @@ public:
         }
     };
 
-  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
-                                  "Testing proper exception handling ...\n"));
+                  "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
-                    }
+        }
       ACE_CATCHANY
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR");
+          ACE_ERROR ((LM_ERROR,
                       "... caught the wrong exception -> ERROR\n"));
         }
       ACE_ENDTRY;
@@ -126,7 +127,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void get_yadda_excep (::Messaging::ExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -141,7 +142,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+  void set_yadda_excep (::Messaging::ExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -159,7 +160,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (A::AMI_AMI_TestExceptionHolder *
+  void inout_arg_test_excep (::Messaging::ExceptionHolder *
                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -228,7 +229,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-
       // Trigger the DidTheRightThing exception on the server side
       // by sending 0 to it.
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 8e9d0e4abb2..a4156b9a83f 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, ami {
 }
 
 project(*Client): taoserver, ami {
+  after += *Server
   exename = client
   Source_Files {
     Client_Task.cpp
@@ -18,6 +19,7 @@ project(*Client): taoserver, ami {
 }
 
 project(*Admin): taoserver, ami {
+  after += *Client
   exename = admin
   Source_Files {
     AMI_Buffering_Admin.cpp
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index 7666e09cd4d..7c8a210d9d3 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -16,13 +16,13 @@ Reply_Handler::receive_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_receive_data (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -40,13 +40,13 @@ Reply_Handler::sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -64,13 +64,13 @@ Reply_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index f36e5734f41..9d73cbcc70d 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -19,19 +19,19 @@ public:
   // = The skeleton methods
   virtual void receive_data (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+  virtual void receive_data_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+  virtual void sync_excep (::Messaging::ExceptionHolder *holder
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index f7812908404..ff9fab96bd8 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -82,7 +82,7 @@ TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder
+TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder
                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -90,7 +90,7 @@ TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_hol
 
   ACE_TRY
     {
-      excep_holder->raise_sendTimeToWait (ACE_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TIMEOUT, timeout)
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index 8054d1ac6ff..d4082ac05d2 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -55,7 +55,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void sendTimeToWait_excep (
-      AMI_TimeoutObjExceptionHolder * excep_holder
+      ::Messaging::ExceptionHolder * excep_holder
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 4eeadb14767..cc0059d58c7 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -19,6 +19,7 @@ project(*client) : taoclient, valuetype {
 }
 
 project(*server) : taoserver, valuetype {
+  after += *client
   idlflags += -Sc
 
   IDL_Files {
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index ac6c799d32b..a3e9072788b 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -78,7 +78,7 @@ passer_i::pass_state (base_out outarg
     ))
 {
   TreeController_var tc;
-  ACE_NEW (tc,
+  ACE_NEW (tc.inout (),
            OBV_TreeController);
 
   // Create the root node.
diff --git a/TAO/tests/AlternateIIOP/run_test.pl b/TAO/tests/AlternateIIOP/run_test.pl
index c8734d538a4..8471efda5a1 100755
--- a/TAO/tests/AlternateIIOP/run_test.pl
+++ b/TAO/tests/AlternateIIOP/run_test.pl
@@ -14,8 +14,8 @@ $status = 0;
 @bogus_eps = ("-orbendpoint iiop://localhost:10200/hostname_in_ior=bogus.com",
               "-orbendpoint iiop://localhost:10202/hostname_in_ior=bogus.com");
 $valid_ep = "-orbendpoint iiop://localhost:10201";
-print "Running ../Hello/server with -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]\n";
-$SV_ALT_IIOP = new PerlACE::Process ("../Hello/server", "-ORBUseSharedProfile 1 -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]");
+
+$SV_ALT_IIOP = new PerlACE::Process ("../Hello/server", "-o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]");
 $CL_ALT_IIOP = new PerlACE::Process ("../Hello/client", " -k file://$iorfile");
 $SV_ALT_IIOP->Spawn ();
 
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 8e6644828da..739a66df566 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -10,7 +10,8 @@ project(*Server): taoserver, valuetype {
 }
 
 project(*Client): taoclient, valuetype, typecodefactory, ifr_client {
-
+  after += *Server
+  
   Source_Files {
     TestC.cpp
     NonRecursiveC.cpp
diff --git a/TAO/tests/Any/Recursive/Test.idl b/TAO/tests/Any/Recursive/Test.idl
index a097416f9e5..d1d5e447c36 100644
--- a/TAO/tests/Any/Recursive/Test.idl
+++ b/TAO/tests/Any/Recursive/Test.idl
@@ -15,6 +15,7 @@ module Test
   {
     RecursiveStructSeq recursive_structs;
     long i;
+    RecursiveStructSeq recursive_structs_second;
   };
 
   // --------------------------
@@ -26,10 +27,58 @@ module Test
   {
   case 0:
     RecursiveUnionSeq recursive_unions;
+  case 1:
+    short a;
+  case 2:
+    RecursiveUnionSeq recursive_unions_second;
   default:
     long i;
   };
 
+  union RecursiveUnionNoDefault;
+  typedef sequence<RecursiveUnionNoDefault> RecursiveUnionSeqNoDefault;
+
+  union RecursiveUnionNoDefault switch (short)
+  {
+  case 0:
+    RecursiveUnionSeqNoDefault recursive_unions;
+  case 1:
+    short a;
+  case 2:
+    RecursiveUnionSeqNoDefault recursive_unions_second;
+  };
+
+  // --------------------------
+
+  // --------------------------
+
+  enum VSort {
+    UNKNOWN_TYPE,
+    RECURSIVE_TYPE,
+    LONG_STYPE,
+    BOOL_STYPE
+  };
+
+  union VSortRecursiveUnion;
+  typedef sequence<VSortRecursiveUnion> VSortRecursiveUnionSeq;
+  union VSortRecursiveUnion switch (VSort)
+  {
+  case RECURSIVE_TYPE:
+    VSortRecursiveUnionSeq recursive_unions;
+  case LONG_STYPE:
+    long i;
+  };
+
+  // --------------------------
+
+  union EnumUnion switch (VSort)
+  {
+  case BOOL_STYPE:
+    boolean a;
+  case LONG_STYPE:
+    long i;
+  };
+
   // --------------------------
 
   valuetype IndirectlyRecursiveValuetype;
@@ -46,6 +95,7 @@ module Test
   valuetype DirectlyRecursiveValuetype
   {
     public DirectlyRecursiveValuetype recursive_valuetype;
+    public DirectlyRecursiveValuetype recursive_valuetype_second;
   };
 
   // --------------------------
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 963ca14035c..8cdcb55c56b 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -170,13 +170,22 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
               "Executing recursive union test\n"));
 
   Test::RecursiveUnion foo;
-
-  // Non-recursive member case.
+  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
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Non-recursive member case.
   foo.i (test_long);
 
-  CORBA::Any the_any;
   the_any <<= foo;
 
   ::perform_invocation<Test::RecursiveUnion> (hello,
@@ -198,6 +207,38 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
                                               the_any
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+  // Recursive member case with no default member
+  Test::RecursiveUnionSeqNoDefault seqnodefault;
+  seqnodefault.length (2);
+  seqnodefault[0].a (37);
+  seqnodefault[1].recursive_unions (Test::RecursiveUnionSeqNoDefault ());
+
+  Test::RecursiveUnionNoDefault foonodefault;
+  foonodefault.recursive_unions (seqnodefault);
+
+  the_any <<= foonodefault;
+
+  ::perform_invocation<Test::RecursiveUnionNoDefault> (hello,
+                                                       the_any
+                                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Recursive member case with enum .
+  Test::VSortRecursiveUnionSeq vsortseq;
+  vsortseq.length (2);
+  vsortseq[0].i (37);
+  vsortseq[1].recursive_unions (Test::VSortRecursiveUnionSeq ());
+
+  Test::VSortRecursiveUnion vsort_foo;
+  vsort_foo.recursive_unions (vsortseq);
+
+  the_any <<= vsort_foo;
+
+  ::perform_invocation<Test::VSortRecursiveUnion> (hello,
+                                                   the_any
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 
@@ -256,12 +297,14 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq members (2);
-  members.length (2);
+  CORBA::StructMemberSeq members (3);
+  members.length (3);
   members[0].name = "recursive_structs";
   members[0].type = seq_tc;
   members[1].name = "i";
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
+  members[2].name = "recursive_structs_second";
+  members[2].type = seq_tc;
 
   CORBA::TypeCode_var struct_tc =
     orb->create_struct_tc ("IDL:Test/RecursiveStruct:1.0",
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 8f1239bb195..55e22534e4a 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop {
 
 project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop {
   exename = client
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/BiDirectional/run_test_ipv6.pl b/TAO/tests/BiDirectional/run_test_ipv6.pl
index b3a3676d4fd..c422afa3a00 100755
--- a/TAO/tests/BiDirectional/run_test_ipv6.pl
+++ b/TAO/tests/BiDirectional/run_test_ipv6.pl
@@ -14,12 +14,12 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o test.ior -i 100 -ORBConnectIPV6Only YES");
+    $SV = new PerlACE::ProcessVX ("server", "-o test.ior -i 100 -ORBConnectIPV6Only 1");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -i 100 -ORBConnectIPV6Only YES");
+    $SV = new PerlACE::Process ("server", "-o $iorfile -i 100 -ORBConnectIPV6Only 1");
 }
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBConnectIPV6Only YES");
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBConnectIPV6Only 1");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 8203a116ce5..88c345394db 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -64,6 +64,9 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
           this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
+          // If the cache size has gotten larger this indicates that
+          // the connection isn't being shared properly, i.e., a new
+          // connection was created, so we'll abort.
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
             {
               ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index 41e4576ab9a..abcf650df1b 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, minimum_corba, bidir_giop {
 }
 
 project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 409f9c564f2..a0ca3000ed9 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -151,7 +151,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       r));
         }
 
-      // Shtdown the server
+      // Shutdown the server
       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
index d448613167e..8137e525c9f 100755
--- a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
+++ b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
@@ -13,12 +13,17 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::Process ("server", "-o test.ior -i 100");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
+}
 $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 (); 
     exit 1;
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index d98c87ca241..2493ddfb825 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging, ami {
 
 project(*Client): taoserver, messaging, ami {
   exename = client
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 8b80c084e27..1c27642a634 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -99,7 +99,7 @@ public:
         }
     };
 
-  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -110,7 +110,7 @@ public:
                                   "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index 85935126945..5cf458a0b1e 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
+  after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
diff --git a/TAO/tests/Big_Oneways/run_test.pl b/TAO/tests/Big_Oneways/run_test.pl
index bfafef483b6..45175d43e98 100755
--- a/TAO/tests/Big_Oneways/run_test.pl
+++ b/TAO/tests/Big_Oneways/run_test.pl
@@ -38,8 +38,12 @@ $CL1 = new PerlACE::Process ("client", " -k file://$iorfile");
 $CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
 $CL3 = new PerlACE::Process ("client", " -k file://$iorfile");
 
+$server = $SV->Spawn ();
 
-$SV->Spawn ();
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index 59034cf50db..648403b35a4 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -3,6 +3,7 @@
 
 project(*Server): taoserver {
   idlflags += -Sa -St
+  after += *Client
   Source_Files {
     Big_Reply_i.cpp
     server.cpp
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 0931f18f506..5d5b10de0c1 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 33928847556..8a9c4f89ea9 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -112,13 +112,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           break;
       }
 
-      ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages...\n"));
+      int count = payload_receiver_impl->count();
 
-      ACE_Time_Value tv(3);
-      orb->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      if (count != expected)
+        {
+          ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages, "
+                               "have now %d messages already...\n", count));
 
-      int count = payload_receiver_impl->count();
+          ACE_Time_Value tv(5);
+          orb->run(tv ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          count = payload_receiver_impl->count();
+        }
 
       int result = 0;
 
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index 85935126945..5cf458a0b1e 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
+  after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 1c10394d0c4..f2870ef39d9 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
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 4c5733dfbee..792a118237c 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
+++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     Echo.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index 28f67b75ec0..e38622c756d 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index 132b1f49116..146c41a5026 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
@@ -17,6 +18,7 @@ project(*Client): taoclient, messaging {
 }
 
 project(*Shutdown): taoexe, messaging {
+  after += *Client
   Source_Files {
     shutdown.cpp
   }
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index 60296491dbb..93a6bb0d168 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug 1330 Server): taoserver, iortable {
+project(*Server): taoserver, iortable {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(Bug 1330 Client): taoclient, anytypecode {
+project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index 6b2b0dc5cc1..f0247d4c080 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     Echo.cpp
     ORB_Task.cpp
@@ -19,6 +20,7 @@ project(*Client): taoclient, messaging {
 }
 
 project(*Shutdown): taoexe, messaging {
+  after += *Client
   Source_Files {
     shutdown.cpp
   }
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index 3c891b3c652..a149ce848c3 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging  {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 1d3676af938..93189526614 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -16,14 +16,14 @@ Reply_Handler::next_prime (CORBA::ULong
 
 void
 Reply_Handler::next_prime_excep (
-    Test::AMI_HelloExceptionHolder *ex
+    ::Messaging::ExceptionHolder *ex
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   ACE_TRY
     {
-      ex->raise_next_prime (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::COMM_FAILURE, t)
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index 3656bb8e69a..03700034b3e 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -18,7 +18,7 @@ public:
                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void next_prime_excep (Test::AMI_HelloExceptionHolder * excep_holder
+  void next_prime_excep (::Messaging::ExceptionHolder * excep_holder
                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/Bug_1482_Regression/test.mpc b/TAO/tests/Bug_1482_Regression/test.mpc
deleted file mode 100644
index db29b4062dd..00000000000
--- a/TAO/tests/Bug_1482_Regression/test.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(Bug_1482_Server): taoserver, amh, ami, iortable, portableserver {
-  Source_Files {
-    Hello.cpp
-    Server_Task.cpp
-    server.cpp
-  }
-}
-
-project(Bug_1482_Client): taoserver, amh, ami {
-  exename = client
-  Source_Files {
-    Client_Task.cpp
-    Reply_Handler.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
index 17b9c050382..7e7cfd67199 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoserver, pi, interceptors {
   exename = client
+  after += *Server
   Source_Files {
     test_i.cpp
     testC.cpp
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index 4732996c119..51150d118a7 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -44,32 +44,36 @@ Client_Task::svc (void)
           return 1;
         }
 
-      // call the thread_id function on the test object
-      CORBA::Long remote_thread_id;
-
-      server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // Try multiple calls to see if we keep being forwarded
+      for (int i = 0; i < 5; i++)
+        {
+          // call the thread_id function on the test object
+          CORBA::Long remote_thread_id;
 
-      ACE_DEBUG ((LM_INFO,
-                  "Remote thread ID was %i\n",
-                  remote_thread_id));
+          server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-      CORBA::Long mythread_id = (CORBA::Long)ACE_Thread::self();
-      if (mythread_id != remote_thread_id)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "ERROR:  Failed Bug_1495_Regression test. "
-                      "Expected thread id was %i, received %i.\n",
-                      mythread_id,
-                      remote_thread_id));
-        }
-      else
-        {
           ACE_DEBUG ((LM_INFO,
-                      "Passed Bug_1495_Regression test.\n"
-                      "Local thread id was %i, received %i.\n",
-                      mythread_id,
+                      "Remote thread ID was %i\n",
                       remote_thread_id));
+
+          CORBA::Long mythread_id = (CORBA::Long)ACE_Thread::self();
+          if (mythread_id != remote_thread_id)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "ERROR:  Failed Bug_1495_Regression test. "
+                          "Expected thread id was %i, received %i.\n",
+                          mythread_id,
+                          remote_thread_id));
+            }
+          else
+            {
+              ACE_DEBUG ((LM_INFO,
+                          "Passed Bug_1495_Regression test.\n"
+                          "Local thread id was %i, received %i.\n",
+                          mythread_id,
+                          remote_thread_id));
+            }
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.h b/TAO/tests/Bug_1495_Regression/Server_Task.h
index d6f71524d62..b00725ba805 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.h
@@ -16,7 +16,9 @@
 
 #include "tao/ORB.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Implements the Task to run the process colocated thread.
 class Server_Task : public ACE_Task_Base
diff --git a/TAO/tests/Bug_1495_Regression/run_test.pl b/TAO/tests/Bug_1495_Regression/run_test.pl
index 981d1300a59..417ff9437e6 100755
--- a/TAO/tests/Bug_1495_Regression/run_test.pl
+++ b/TAO/tests/Bug_1495_Regression/run_test.pl
@@ -25,7 +25,7 @@ $SV = new PerlACE::Process ("server", "-o $inputfile -i file://$thrserverfile");
 
 $client = $CL->Spawn ();
 
-if (PerlACE::waitforfile_timed ($thrserverfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($thrserverfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$thrserverfile>\n";
     exit 1;
 }
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index d9b4db4ff88..3596677754b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -31,7 +31,7 @@ Reply_Handler::short_sleep (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 Reply_Handler::short_sleep_excep (
-    Test::AMI_HelloExceptionHolder *ex
+    ::Messaging::ExceptionHolder *ex
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -40,7 +40,7 @@ Reply_Handler::short_sleep_excep (
 
   ACE_TRY
     {
-      ex->raise_short_sleep (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -65,7 +65,7 @@ Reply_Handler::short_sleep_excep (
 void Reply_Handler::
 check_counter(ACE_ENV_SINGLE_ARG_DECL)
 {
-  long count = counter_--;
+  long count = --counter_;
   if(count == 0)
   {
     // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n"));
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index aaadd0582f0..26ca559dd07 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -20,7 +20,7 @@ public:
   void short_sleep (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void short_sleep_excep (Test::AMI_HelloExceptionHolder * excep_holder
+  void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/Bug_1551_Regression/test.mpc b/TAO/tests/Bug_1551_Regression/test.mpc
deleted file mode 100644
index 3898d39df22..00000000000
--- a/TAO/tests/Bug_1551_Regression/test.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(Bug_1551_Server): taoserver, ami, iortable {
-  Source_Files {
-    Hello.cpp
-    Server_Task.cpp
-    server.cpp
-  }
-}
-
-project(Bug_1551_Client): taoserver, ami {
-  exename = client
-  Source_Files {
-    Client_Task.cpp
-    Reply_Handler.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index 828fa8ce052..d6430831e00 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver, amh {
 }
 
 project(*Client): taoserver, amh {
+  after += *Server
   exename = client
   Source_Files {
     client.cpp
diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc
deleted file mode 100644
index 66bcbf45c86..00000000000
--- a/TAO/tests/Bug_1627_Regression/test.mpc
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(Bug_1627_Server): taoserver, iortable {
-  Source_Files {
-    Test_i.cpp
-    server.cpp
-  }
-}
-
-project(Bug_1627_Client): taoclient, anytypecode {
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index 828fa8ce052..5e8364ab993 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, amh {
 
 project(*Client): taoserver, amh {
   exename = client
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 9687e3ec488..2e2ec401a29 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -33,8 +33,6 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-void get_stringList2(Test::Hello_var hello);
-
 int
 main (int argc, char *argv[])
 {
@@ -65,7 +63,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList\n"));
 
-      Test::StringList_var seq =
+	  Test::StringList_var seq =
         hello->get_stringList (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -73,7 +71,7 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]);
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-      }
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 with initialization\n"));
 
@@ -85,11 +83,18 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = seq2.in()[i];
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-      }
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 without initialization\n"));
 
-      get_stringList2(hello);
+      hello->get_stringList2(false, seq2.out());
+      ACE_TRY_CHECK;
+
+      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
+        CORBA::String_var the_string = seq2.in()[i];
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+                  the_string.in ()));
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - mod_stringList\n"));
 
@@ -118,34 +123,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-void get_stringList2(Test::Hello_var hello)
-{
-    Test::StringList_var seq2;
-
-  ACE_TRY_NEW_ENV
-    {
-      // Shutdown the ORB and block until the shutdown is complete.
-      hello->get_stringList2(false, seq2.out());
-      ACE_TRY_CHECK;
-
-      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
-        CORBA::String_var the_string = seq2.in()[i];
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
-                  the_string.in ()));
-	  }
-    }
-  ACE_CATCH(CORBA::BAD_PARAM, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_stringList2");
-    }
-  ACE_ENDTRY;
-
-
-    return;
-}
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index 1d3d307ea3e..c01584c3559 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index bdc879d8a18..02366a5ebb4 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -13,11 +13,22 @@ unlink $iorfile;
 
 # Test A: object exists (_non_existent() returns false)
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$SV->Spawn ();
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+$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 ();
     exit 1;
@@ -34,10 +45,15 @@ if ($client != 2) {
 
 # Test B: object does not exist (_non_existent() returns true)
 
-$SV = new PerlACE::Process ("server", "-o $iorfile -r");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -r");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $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 ();
     exit 1;
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index 62cffce1ede..ff28e59983f 100755
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, strategies {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl
index a7f866baf63..483b71e5ebc 100755
--- a/TAO/tests/Bug_2183_Regression/run_test.pl
+++ b/TAO/tests/Bug_2183_Regression/run_test.pl
@@ -12,7 +12,12 @@ use PerlACE::Run_Test;
 $server_ior_file = PerlACE::LocalFile ("server.ior");
 
 # The client and server processes
-$SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
+if (PerlACE::is_vxworks_test()) {
+  $SERVER     = new PerlACE::ProcessVX(PerlACE::LocalFile("server"));
+}
+else {
+  $SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
+}
 $perl_executable = $^X;
 $perl_executable =~ s/\.exe//g;
 $DUMMY_CLIENT = new PerlACE::Process($perl_executable);
@@ -21,10 +26,20 @@ $CLIENT     = new PerlACE::Process(PerlACE::LocalFile("client"));
 $DUMMY_CLIENT->Arguments("hang_client.pl");
 $DUMMY_CLIENT->IgnoreExeSubDir(1);
 
-$SERVER->Arguments("-o $server_ior_file -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
+if (PerlACE::is_vxworks_test()) {
+  $SERVER->Arguments("-o server.ior -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
+}
+else {
+  $SERVER->Arguments("-o $server_ior_file -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
+}
 
 # Fire up the server
-$SERVER->Spawn();
+$sv = $SERVER->Spawn();
+
+if ($sv != 0) {
+   print STDERR "ERROR: server returned $sv\n";
+   exit 1;
+}
 
 # We can wait on the IOR file 
 if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1) 
diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
index 6ae49e52085..26c4972e1db 100644
--- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
@@ -14,6 +14,7 @@ project (*client) : taoclient,anytypecode {
 }
 
 project (*server) : taoserver,pi_server {
+  after += *client
    IDL_Files {
       Test.idl
    }
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index 99812f42d3a..6540444e194 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -267,22 +267,22 @@ ACE_TMAIN(
        cB,
        rB;
     ACE_DEBUG( (LM_INFO, "a is ") );
-    if (aB= (aA>>= aL))
+    if ((aB= (aA>>= aL)))
        ACE_DEBUG( (LM_INFO, "%d", aL) );
     else
        ACE_DEBUG( (LM_INFO, "?") );
     ACE_DEBUG( (LM_INFO, ", b is ") );
-    if (bB= (bA>>= bL))
+    if ((bB= (bA>>= bL)))
        ACE_DEBUG( (LM_INFO, "%d", bL) );
     else
        ACE_DEBUG( (LM_INFO, "?") );
     ACE_DEBUG( (LM_INFO, ", c is ") );
-    if (cB= (cA>>= cL))
+    if ((cB= (cA>>= cL)))
        ACE_DEBUG( (LM_INFO, "%d", cL) );
     else
        ACE_DEBUG( (LM_INFO, "?") );
     ACE_DEBUG( (LM_INFO, ", r is ") );
-    if (rB= (rA>>= rL))
+    if ((rB= (rA>>= rL)))
        ACE_DEBUG( (LM_INFO, "%d", rL) );
     else
        ACE_DEBUG( (LM_INFO, "?") );
diff --git a/TAO/tests/Bug_2234_Regression/run_test.pl b/TAO/tests/Bug_2234_Regression/run_test.pl
index 41e141ec41d..dcdfcbce7e8 100755
--- a/TAO/tests/Bug_2234_Regression/run_test.pl
+++ b/TAO/tests/Bug_2234_Regression/run_test.pl
@@ -14,13 +14,22 @@ $server_ior_file= PerlACE::LocalFile( "server.ior" );
 unlink $server_ior_file;
 
 # The client and server processes
-$SERVER= new PerlACE::Process( PerlACE::LocalFile( "server" ) );
+if (PerlACE::is_vxworks_test()) {
+    $SERVER= new PerlACE::ProcessVX( PerlACE::LocalFile( "server" ) );
+}
+else {
+    $SERVER= new PerlACE::Process( PerlACE::LocalFile( "server" ) );
+}
 $CLIENT= new PerlACE::Process( PerlACE::LocalFile( "client" ) );
 
 
 # Fire up the server
-$SERVER->Spawn();
+$sv = $SERVER->Spawn();
 
+if ($sv != 0) {
+   print STDERR "ERROR: server returned $sv\n";
+   exit 1;
+}
 # We can wait on the IOR file
 if (PerlACE::waitforfile_timed( $server_ior_file, 10 ) == -1)
 {
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index e52531d641a..bf7965fff35 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/debug.h"
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 8e25b42d362..e64ad8d08a8 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 006030800af..9bf640dd2b3 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, portableserver, messaging {
+  after += *Server
   Source_Files {
     Callback.cpp
     client.cpp
diff --git a/TAO/tests/CallbackTest/run_test_ipv6.pl b/TAO/tests/CallbackTest/run_test_ipv6.pl
index 582838d1a6e..d015ffcec7c 100755
--- a/TAO/tests/CallbackTest/run_test_ipv6.pl
+++ b/TAO/tests/CallbackTest/run_test_ipv6.pl
@@ -13,12 +13,12 @@ unlink $iorfile;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBConnectIPV6Only YES");
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBConnectIPV6Only 1");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -ORBConnectIPV6Only YES");
+    $SV = new PerlACE::Process ("server", "-o $iorfile -ORBConnectIPV6Only 1");
 }
-$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBConnectIPV6Only YES");
+$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBConnectIPV6Only 1");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index 41961bc999f..a83a41950f3 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
@@ -20,6 +21,7 @@ project(*Client): taoclient, anytypecode {
 
 project(*Child): taoserver {
   exename = child
+  after += *Client
   Source_Files {
     Process.cpp
     child.cpp
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index ce9259b4c2c..a0a9ca666ce 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client) : taoclient, anytypecode {
+  after += *server
   IDL_Files {
     simple.idl
   }
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 445b884b223..5042f8ce86f 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -34,11 +34,11 @@ make_wstring (const char *str)
   if (str == 0)
     return 0;
 
-  int len = strlen (str) + 1;
+  size_t len = strlen (str) + 1;
   wchar_t *wstr = new wchar_t[len];
   ACE_DEBUG ((LM_DEBUG,
               "make_wstring: str = %s\n",str));
-  for (int i = 0; i < len; i++)
+  for (size_t i = 0; i < len; i++)
     {
       char *t = const_cast<char *> (str);
       wstr[i] = static_cast<wchar_t> (*(t + i));
@@ -92,7 +92,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       const char *any_string = "Any World";
       CORBA::Any inarg;
-      inarg <<= CORBA::string_dup (any_string);
+      inarg <<= any_string;
       CORBA::Any_var outarg;
 
       // Invoke the call.
@@ -122,10 +122,15 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ++error_count;
         }
 
+#if defined (ACE_HAS_WCHAR)
       wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_TO_WCHAR_IN ("Wide String"));
       wchar_t *wide_reply = server->op2 (wide_string);
       ACE_DEBUG ((LM_DEBUG,
                   "sent %W, got %W\n", wide_string, wide_reply));
+
+      ACE_OS::free (wide_string);
+      CORBA::wstring_free (wide_reply);
+#endif /* ACE_HAS_WCHAR */
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 9789decdc5a..c2a5b4409f1 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -51,7 +51,7 @@ public:
     ACE_NEW_RETURN (out_ptr,
                     CORBA::Any,
                     0);
-    (*out_ptr) <<= CORBA::string_dup (any_str);
+    (*out_ptr) <<= any_str;
     outany = out_ptr;
 
     return CORBA::string_dup (name);
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index 8c4e0b18f2f..aea55d91e36 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client): taoclient, codecfactory {
+project(*Client): taoclient, codecfactory, codeset {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index ad6178f880e..cd11d6f6d01 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "tao/CodecFactory/CodecFactory.h"
+#include "tao/Codeset/Codeset.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Argv_Type_Converter.h"
@@ -72,10 +73,123 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted)
 }
 
 int
+test_codec (IOP::Codec_ptr codec)
+{
+  // ----------------------------------------------------------
+
+  // Test values to be placed in the test structure.
+  const CORBA::Long A = 1010;
+  const CORBA::Long B = -3427;
+  const CORBA::ULongLong C = ACE_UINT64_LITERAL (2001);
+  const CORBA::Char D[] = "I'm Batman.";
+  const CORBA::WChar* E = gen_wstring (25);
+
+  // Create the structure to be encoded.
+  Foo::Bar value;
+  value.A = A;
+  value.B = B;
+  value.C = C;
+  value.D = CORBA::string_dup (D);
+  value.E = CORBA::wstring_dup (E);
+
+  CORBA::Any data;
+  data <<= value;
+
+  // ----------------------------------------------------------
+
+  CORBA::OctetSeq_var encoded_data;
+  CORBA::Any_var decoded_data;
+  Foo::Bar *extracted_value = 0;
+
+  // Encode the structure into an octet sequence using the CDR
+  // enscapsulation Codec.
+
+  ACE_DEBUG ((LM_DEBUG,
+              "Testing CDR encapsulation Codec encode()/decode()\n"
+              "=================================================\n"));
+
+  // Start out with the encode() method, i.e. the one that
+  // includes the TypeCode in the CDR encapsulation.
+  encoded_data = codec->encode (data
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
+
+  if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
+          % ACE_CDR::MAX_ALIGNMENT) == 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "\nData for decoding are already aligned "
+                    "on MAX_ALIGNMENT.\n\n"));
+  // Extract the data from the octet sequence.
+  decoded_data = codec->decode (encoded_data.in ()
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
+
+  if (!(decoded_data.in() >>= extracted_value))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                        "ERROR: Unable to extract decoded data "
+                        "from Any\n"),
+                      -1);
+
+  // Verify that the extracted data matches the data that was
+  // originally encoded into the octet sequence.
+  if (::verify_data (&value, extracted_value) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                        "ERROR: Data extracted using "
+                        "IOP::Codec::decode() does not match "
+                        "original data.\n"),
+                      -1);
+
+      ACE_DEBUG ((LM_DEBUG,
+              "Testing CDR encapsulation Codec "
+              "encode_value()/decode_value()\n"
+              "================================"
+              "=============================\n"));
+
+  // Now use the encode_value() method, i.e. the one that does
+  // *not* include the TypeCode in the CDR encapsulation.
+  encoded_data = codec->encode_value (data
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
+
+  if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
+          % ACE_CDR::MAX_ALIGNMENT) == 0)
+        ACE_DEBUG ((LM_WARNING,
+                    "\n"
+                    "WARNING: Data to be decoded is already aligned "
+                    "on MAX_ALIGNMENT.\n\n"));
+
+  // Extract the data from the octet sequence.
+  decoded_data = codec->decode_value (encoded_data.in (),
+                                      Foo::_tc_Bar
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_CHECK;
+
+  if (!(decoded_data.in() >>= extracted_value))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                        "ERROR: Unable to extract decoded data "
+                        "from Any\n"),
+                      -1);
+
+  // Verify that the extracted data matches the data that was
+  // originally encoded into the octet sequence.
+  if (::verify_data (&value, extracted_value) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                        "ERROR: Data extracted using "
+                        "IOP::Codec::decode_value() does not match "
+                        "original data.\n"),
+                      -1);
+
+  return 0;
+}
+
+int
+//main (int argc, char *argv[])
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
 
+  int retval = 0;
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -97,6 +211,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      // Set up a structure that contains information necessary to
+      // create a GIOP 1.1 CDR encapsulation Codec.
+      IOP::Encoding_1_2 encoding_1_2;
+      encoding_1_2.format = IOP::ENCODING_CDR_ENCAPS;
+      encoding_1_2.major_version = 1;
+      encoding_1_2.minor_version = 2;
+      encoding_1_2.char_codeset = 0x00010001U;
+      encoding_1_2.wchar_codeset = 0x00010109U;
+
+      // Obtain the CDR encapsulation Codec.
+      IOP::Codec_var codec_1_2 =
+        codec_factory->create_codec_with_codesets (encoding_1_2
+                                                   ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      retval = test_codec (codec_1_2.in ());
+
       // ----------------------------------------------------------
 
       // Set up a structure that contains information necessary to
@@ -112,110 +243,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // ----------------------------------------------------------
-
-      // Test values to be placed in the test structure.
-      const CORBA::Long A = 1010;
-      const CORBA::Long B = -3427;
-      const CORBA::ULongLong C = ACE_UINT64_LITERAL (2001);
-      const CORBA::Char D[] = "I'm Batman.";
-      const CORBA::WChar* E = gen_wstring (25);
-
-      // Create the structure to be encoded.
-      Foo::Bar value;
-      value.A = A;
-      value.B = B;
-      value.C = C;
-      value.D = CORBA::string_dup (D);
-      value.E = CORBA::wstring_dup (E);
-
-      CORBA::Any data;
-      data <<= value;
-
-      // ----------------------------------------------------------
-
-      CORBA::OctetSeq_var encoded_data;
-      CORBA::Any_var decoded_data;
-      Foo::Bar *extracted_value;
-
-      // Encode the structure into an octet sequence using the CDR
-      // enscapsulation Codec.
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing CDR encapsulation Codec encode()/decode()\n"
-                  "=================================================\n"));
-
-      // Start out with the encode() method, i.e. the one that
-      // includes the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode (data
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
-             % ACE_CDR::MAX_ALIGNMENT) == 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nData for decoding are already aligned "
-                        "on MAX_ALIGNMENT.\n\n"));
-      // Extract the data from the octet sequence.
-      decoded_data = codec->decode (encoded_data.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!(decoded_data.in() >>= extracted_value))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Unable to extract decoded data "
-                           "from Any\n"),
-                          -1);
-
-      // Verify that the extracted data matches the data that was
-      // originally encoded into the octet sequence.
-      if (::verify_data (&value, extracted_value) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Data extracted using "
-                           "IOP::Codec::decode() does not match "
-                           "original data.\n"),
-                          -1);
-
-          ACE_DEBUG ((LM_DEBUG,
-                  "Testing CDR encapsulation Codec "
-                  "encode_value()/decode_value()\n"
-                  "================================"
-                  "=============================\n"));
-
-      // Now use the encode_value() method, i.e. the one that does
-      // *not* include the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode_value (data
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
-             % ACE_CDR::MAX_ALIGNMENT) == 0)
-            ACE_DEBUG ((LM_WARNING,
-                        "\n"
-                        "WARNING: Data to be decoded is already aligned "
-                        "on MAX_ALIGNMENT.\n\n"));
-
-      // Extract the data from the octet sequence.
-      decoded_data = codec->decode_value (encoded_data.in (),
-                                          Foo::_tc_Bar
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!(decoded_data.in() >>= extracted_value))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Unable to extract decoded data "
-                           "from Any\n"),
-                          -1);
-
-      // Verify that the extracted data matches the data that was
-      // originally encoded into the octet sequence.
-      if (::verify_data (&value, extracted_value) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Data extracted using "
-                           "IOP::Codec::decode_value() does not match "
-                           "original data.\n"),
-                          -1);
-        }
+      retval = test_codec (codec.in ());
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -226,5 +255,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "Codec test passed.\n"));
 
-  return 0;
+  return retval;
 }
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index 5a0b503aac4..2bb76c43a80 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -3,7 +3,11 @@
 
 project(*Test Stub): taolib_with_idl {
   sharedname   = Collocation_Test_Stub
-  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa
+  idlflags    += -Wb,skel_export_macro=Diamond_Export \
+                 -Wb,stub_export_macro=MY_Stub_Export \
+                 -Wb,skel_export_include=diamond_export.h \
+                 -Wb,stub_export_include=stub_export.h \
+                 -Gd -St -Sa
   dynamicflags = MY_STUB_BUILD_DLL
 
   Source_Files {
@@ -15,7 +19,11 @@ project(*Diamond) : taolib_with_idl, portableserver {
   after       += Collocation_Test_Stub
   sharedname   = Collocation_Diamond
   libs        += Collocation_Test_Stub
-  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa
+  idlflags    += -Wb,skel_export_macro=Diamond_Export \
+                 -Wb,stub_export_macro=MY_Stub_Export \
+                 -Wb,skel_export_include=diamond_export.h \
+                 -Wb,stub_export_include=stub_export.h \
+                 -Gd -St -Sa
   dynamicflags = DIAMOND_BUILD_DLL
 
   Source_Files {
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index 4f2307adc30..60006aae0ba 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -15,7 +15,9 @@
 
 #include "tao/ORB.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
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index 4f2307adc30..60006aae0ba 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -15,7 +15,9 @@
 
 #include "tao/ORB.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
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index 4f2307adc30..60006aae0ba 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -15,7 +15,9 @@
 
 #include "tao/ORB.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
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 8e25b42d362..e64ad8d08a8 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index ad230187aa7..321e97dff47 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -9,6 +9,7 @@ project(*Server): strategies, taoserver {
 }
 
 project(*Client): strategies, taoclient {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
index c1e095ba54b..7ae4e1c4bf3 100644
--- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
+++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client): taoclient, messaging, portableserver {
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 5dc777cfcad..2398d1eac4c 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 43faafae42b..1f5668c42ff 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -94,7 +94,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       // Create a separate thread to crash the server.
-      Crash_Task crash_task (ACE_Thread_Manager::instance (), 20);
+      Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(20));
 
       if (crash_task.activate () == -1)
         {
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index b7c2b164029..34711dbef67 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, portableserver, messaging {
+  after += *Server
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index f7eb4ab9597..34ed08c9359 100644
--- a/TAO/tests/DLL_ORB/DLL_ORB.mpc
+++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Client Module): taolib_with_idl, anytypecode {
+project(*Test_Client_Module): taolib_with_idl, anytypecode {
   sharedname    = Test_Client_Module
   dynamicflags  = TEST_CLIENT_MODULE_BUILD_DLL
 
@@ -11,9 +11,10 @@ project(*Test Client Module): taolib_with_idl, anytypecode {
   }
 }
 
-project(*Test Server Module) : taolib_with_idl, portableserver {
+project(*Test_Server_Module) : taolib_with_idl, portableserver {
   sharedname   = Test_Server_Module
   dynamicflags = TEST_SERVER_MODULE_BUILD_DLL
+  after += *Test_CLient_Module
 
   Source_Files {
     Test_Server_Module.cpp
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index 6a8245f178e..c5deacad25b 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging, minimum_corba, dynamicinterface {
 }
 
 project(*Client): taoclient, messaging, minimum_corba, dynamicinterface {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -16,6 +17,7 @@ project(*Client): taoclient, messaging, minimum_corba, dynamicinterface {
 }
 
 project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface {
+  after += *Client
   Source_Files {
     test_dsi.cpp
     gateway.cpp
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index af90ae98ed8..4cd12f257e3 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -12,7 +12,7 @@
 //=============================================================================
 
 
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
 
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 48390372deb..afd281c6225 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -190,7 +190,7 @@ Test_DynSequence::run_test (void)
           ACE_TRY_CHECK;
 
           CORBA::Boolean equal =
-            out_elems[i]->equal (elements[i].in ()
+            out_elems[i]->equal (elements[i]
                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -248,7 +248,7 @@ Test_DynSequence::run_test (void)
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
 
-      if (!ACE_OS::strcmp ((*ts_out)[0U].in(), data.m_string1))
+      if (!ACE_OS::strcmp (static_cast<const char *>((*ts_out)[0U]), data.m_string1))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 62136abbcaf..6da42a65f4b 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     timeC.cpp
     client.cpp
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 6eca87854c2..6e9c5283fe0 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -12,6 +12,7 @@ project(*Server): strategies, rt_server {
 
 project(*Client): strategies, rt_server {
   exename = client
+  after += *Server
 
   Source_Files {
     CounterC.cpp
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index 89af20e2099..9f8856707ff 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -8,6 +8,7 @@ project(*client) : taoclient, portableserver, tao_flresource {
 }
 
 project(*server) : taoserver, tao_flresource {
+  after += *client
   source_files {
     server.cpp
     test_i.cpp
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index e52be673239..0bc0ae29bce 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -15,6 +15,7 @@ project(*Server): taoserver, minimum_corba {
 }
 
 project(*Middle): taoexe, portableserver, minimum_corba {
+  after += *Server
   IDL_Files {
     test.idl
   }
@@ -28,6 +29,7 @@ project(*Middle): taoexe, portableserver, minimum_corba {
 }
 
 project(*Client): taoexe, portableserver, minimum_corba {
+  after += *Middle
   IDL_Files {
     test.idl
   }
@@ -54,6 +56,7 @@ project(*Ping): taoexe, portableserver, minimum_corba {
 }
 
 project(*Pong): taoexe, portableserver, minimum_corba {
+  after += *Ping
   IDL_Files {
     ping.idl
   }
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 7d29aa811f5..0f597f3533e 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, minimum_corba {
 }
 
 project(*Client): taoclient, anytypecode, minimum_corba {
+  after += *Server
   Source_Files {
     FileC.cpp
     client.cpp
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index fd9c97a8d60..2e74de2a9f9 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -194,7 +194,7 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes
   ACE_CHECK_RETURN (0);
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
-  int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
+  ssize_t length = ACE_OS::read (file_descriptor, buffer, num_bytes);
 
   if (length > 0)
     return new File::Descriptor::DataBuffer (length,
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index d3e679e33b7..c0830f61571 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, iortable {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index 511bc4d5827..9d58d8df81e 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -10,6 +10,8 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  avoids += ace_for_tao
+  after  += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Hang_Shutdown/Test.idl b/TAO/tests/Hang_Shutdown/Test.idl
index bef07d739ae..0ea5055f05a 100644
--- a/TAO/tests/Hang_Shutdown/Test.idl
+++ b/TAO/tests/Hang_Shutdown/Test.idl
@@ -1,13 +1,11 @@
 // $Id$
 
-module TAO
+module Test
 {
-  module Test
-    {
-      interface Hang
-        {
-          void send_stuff (in string foo,
-                           in boolean flag);
-        };
-    };
+  interface Hang
+  {
+    void send_stuff (in string foo,
+                     in boolean flag);
+  };
 };
+
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index d33581c0f18..fa225b32d6a 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -9,13 +9,9 @@
 
 ACE_RCSID(Hello, client, "$Id$")
 
-
-
-namespace TAO
+namespace Test
 {
-  namespace Test
-  {
-    const char *ior = "file://server.ior";
+  const char *ior = "file://server.ior";
 
     ACE_Profile_Timer profile_timer;
     bool blocked = false;
@@ -40,229 +36,228 @@ namespace TAO
                 blocked = false;
             }
             break;
-          case 'k':
-            {
-              ior = get_opts.opt_arg ();
-            }
-            break;
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "usage:  %s "
-                               "-k <ior> "
-                               "\n",
-                               argv [0]),
-                              false);
-          }
-
-      // Indicates sucessful parsing of the command line
-      return true;
-    }
-
-    class Client_Task : public ACE_Task_Base
-    {
-    public:
-      Client_Task (Hang_ptr h)
-        : h_ (Hang::_duplicate (h))
-      {}
-
-      virtual int svc (void)
-      {
-        ACE_DECLARE_NEW_CORBA_ENV;
-
-        ACE_TRY
-          {
-            this->h_->send_stuff ("Testing",
-                                  false
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            this->h_->send_stuff ("Testing",
-                                  false
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            this->h_->send_stuff ("Testing",
-                                  true
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        ACE_CATCH (CORBA::COMM_FAILURE, f)
-          {
-            ACE_UNUSED_ARG (f);
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Caught COMM_FAILURE Exception \n"));
-
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) This is expected \n"));
-
-            return 0;
-          }
-        ACE_CATCH (CORBA::Exception, ex)
+        case 'k':
           {
-            ex._tao_print_exception ("Caught CORBA Exception \n");
-
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Error in test \n"));
-
-            return -1;
+            ior = get_opts.opt_arg ();
           }
-        ACE_CATCHALL
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Caught a C++ exception \n"));
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Error in test \n"));
-
-            return -1;
-          }
-        ACE_ENDTRY;
+          break;
+        case '?':
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "usage:  %s "
+                             "-k <ior> "
+                             "\n",
+                             argv [0]),
+                            false);
+        }
 
-        return 0;
-      }
+    // Indicates sucessful parsing of the command line
+    return true;
+  }
 
-    private:
-      Hang_var h_;
-    };
+  class Client_Task : public ACE_Task_Base
+  {
+  public:
+    Client_Task (Hang_ptr h)
+      : h_ (Hang::_duplicate (h))
+    {}
 
-    class Shutdown_Task : public ACE_Task_Base
+    virtual int svc (void)
     {
-    public:
-      Shutdown_Task (CORBA::ORB_ptr o)
-        : o_ (CORBA::ORB::_duplicate (o))
-      {}
+      ACE_DECLARE_NEW_CORBA_ENV;
 
-      virtual int svc (void)
-      {
-        ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          this->h_->send_stuff ("Testing",
+                                false
+                                ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-        ACE_TRY
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Calling shutdown \n"));
+          this->h_->send_stuff ("Testing",
+                                false
+                                ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-            // Just wait for the main thread to start sening out
-            // messages
-            ACE_OS::sleep (4);
+          this->h_->send_stuff ("Testing",
+                                true
+                                ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCH (CORBA::COMM_FAILURE, f)
+        {
+          ACE_UNUSED_ARG (f);
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) Caught COMM_FAILURE Exception \n"));
 
-            // Start the timer
-            profile_timer.start ();
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) This is expected \n"));
 
-            this->o_->shutdown (blocked
-                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+          return 0;
+        }
+      ACE_CATCH (CORBA::Exception, ex)
+        {
+          ex._tao_print_exception ("Caught CORBA Exception \n");
 
-            // Stop the timer
-            profile_timer.stop ();
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) Error in test \n"));
 
-            // Get the elampsed time
-            ACE_Profile_Timer::ACE_Elapsed_Time el;
-            profile_timer.elapsed_time (el);
+          return -1;
+        }
+      ACE_CATCHALL
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) Caught a C++ exception \n"));
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) Error in test \n"));
 
-            // The elapsed time is in secs
-            if (el.real_time > 1)
-              {
-                ACE_ERROR ((LM_ERROR,
-                            "(%P|%t) ERROR: Too long to shutdown \n"));
+          return -1;
+        }
+      ACE_ENDTRY;
 
-                return 0;
-              }
-          }
-        ACE_CATCHALL
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Caught exception during shutdown \n"));
+      return 0;
+    }
 
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Error in test \n"));
-            return -1;
-          }
-        ACE_ENDTRY;
+  private:
+    Hang_var h_;
+  };
 
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Returning from shutdown \n"));
-        return 0;
-      }
-    private:
-      CORBA::ORB_var o_;
-    };
+  class Shutdown_Task : public ACE_Task_Base
+  {
+  public:
+    Shutdown_Task (CORBA::ORB_ptr o)
+      : o_ (CORBA::ORB::_duplicate (o))
+    {}
 
-    static int
-    try_main (int argc, char *argv[])
+    virtual int svc (void)
     {
       ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
-          CORBA::ORB_var orb =
-            CORBA::ORB_init (argc,
-                             argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) Calling shutdown \n"));
 
-          if (parse_args (argc, argv) == false)
-            return -1;
+          // Just wait for the main thread to start sening out
+          // messages
+          ACE_OS::sleep (4);
 
-          CORBA::Object_var tmp =
-            orb->string_to_object (ior
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          // Start the timer
+          profile_timer.start ();
 
-          Hang_var test =
-            Hang::_narrow (tmp.in ()
-                           ACE_ENV_ARG_PARAMETER);
+          this->o_->shutdown (blocked
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          if (CORBA::is_nil (test.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_DEBUG,
-                                 "Nil test reference <%s>\n",
-                                 ior),
-                                1);
-            }
-
-          Client_Task ct (test.in ());
-
-          if (ct.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot activate client threads\n"),
-                              1);
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Activating shutdown thread \n"));
-
-          Shutdown_Task st (orb.in ());
+          // Stop the timer
+          profile_timer.stop ();
 
-          if (st.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot activate shutdown threads\n"),
-                              1);
-
-          ACE_Thread_Manager::instance ()->wait ();
+          // Get the elampsed time
+          ACE_Profile_Timer::ACE_Elapsed_Time el;
+          profile_timer.elapsed_time (el);
 
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          // The elapsed time is in secs
+          if (el.real_time > 1)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "(%P|%t) ERROR: Too long to shutdown \n"));
 
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "CORBA Exception caught \n");
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Eror in test \n"));
-          return -1;
+              return 0;
+            }
         }
       ACE_CATCHALL
         {
           ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) Caught exception during shutdown \n"));
+
+          ACE_ERROR ((LM_ERROR,
                       "(%P|%t) Error in test \n"));
           return -1;
         }
       ACE_ENDTRY;
 
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) Returning from shutdown \n"));
       return 0;
     }
+  private:
+    CORBA::ORB_var o_;
+  };
+
+  static int
+  try_main (int argc, char *argv[])
+  {
+    ACE_DECLARE_NEW_CORBA_ENV;
+
+    ACE_TRY
+      {
+        CORBA::ORB_var orb =
+          CORBA::ORB_init (argc,
+                           argv,
+                           ""
+                           ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        if (parse_args (argc, argv) == false)
+          return -1;
+
+        CORBA::Object_var tmp =
+          orb->string_to_object (ior
+                                 ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        Hang_var test =
+          Hang::_narrow (tmp.in ()
+                         ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        if (CORBA::is_nil (test.in ()))
+          {
+            ACE_ERROR_RETURN ((LM_DEBUG,
+                               "Nil test reference <%s>\n",
+                               ior),
+                              1);
+          }
+
+        Client_Task ct (test.in ());
+
+        if (ct.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Cannot activate client threads\n"),
+                            1);
+
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Activating shutdown thread \n"));
+
+        Shutdown_Task st (orb.in ());
+
+        if (st.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Cannot activate shutdown threads\n"),
+                            1);
+
+        ACE_Thread_Manager::instance ()->wait ();
+
+        orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "CORBA Exception caught \n");
+        ACE_ERROR ((LM_ERROR,
+                    "(%P|%t) Eror in test \n"));
+        return -1;
+      }
+    ACE_CATCHALL
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Error in test \n"));
+        return -1;
+      }
+    ACE_ENDTRY;
+
+    return 0;
   }
 }
 
@@ -271,5 +266,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
 
-  return TAO::Test::try_main (convert.get_argc(), convert.get_ASCII_argv());
+  return Test::try_main (convert.get_argc(), convert.get_ASCII_argv());
 }
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index c745517bb13..3861c135ba1 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -5,97 +5,94 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Argv_Type_Converter.h"
 
-namespace TAO
+namespace Test
 {
-  namespace Test
+  const char *ior_output_file = "server.ior";
+
+  static int
+  try_main (int argc,
+            char *argv[])
   {
-    const char *ior_output_file = "server.ior";
-
-    static int
-    try_main (int argc,
-              char *argv[])
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      ACE_TRY
-        {
-          CORBA::ORB_var orb =
-            CORBA::ORB_init (argc,
-                             argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::Object_var poa_object =
-            orb->resolve_initial_references("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          PortableServer::POA_var root_poa =
-            PortableServer::POA::_narrow (poa_object.in ()
+    ACE_DECLARE_NEW_CORBA_ENV;
+
+    ACE_TRY
+      {
+        CORBA::ORB_var orb =
+          CORBA::ORB_init (argc,
+                           argv,
+                           ""
+                           ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        CORBA::Object_var poa_object =
+          orb->resolve_initial_references("RootPOA"
                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (root_poa.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               " (%P|%t) Panic: nil RootPOA\n"),
-                              1);
-
-          PortableServer::POAManager_var poa_manager =
-            root_poa->the_POAManager ();
-
-          test_i *test_impl;
-          ACE_NEW_RETURN (test_impl,
-                          test_i (),
-                          1);
-          PortableServer::ServantBase_var owner_transfer (test_impl);
-
-          Hang_var test =
-            test_impl->_this ();
-
-          CORBA::String_var ior =
-            orb->object_to_string (test.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // If the ior_output_file exists, output the ior to it
-          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-
-          poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_Time_Value tv (10);
-
-          orb->run (&tv);
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) server - event loop finished\n"));
-
-          root_poa->destroy (1,
-                             1
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught CORBA exception \n");
-          return -1;
-        }
-      ACE_ENDTRY;
-
-      return 0;
-    }
+        ACE_TRY_CHECK;
+
+        PortableServer::POA_var root_poa =
+          PortableServer::POA::_narrow (poa_object.in ()
+                                        ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        if (CORBA::is_nil (root_poa.in ()))
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) Panic: nil RootPOA\n"),
+                            1);
+
+        PortableServer::POAManager_var poa_manager =
+          root_poa->the_POAManager ();
+
+        test_i *test_impl;
+        ACE_NEW_RETURN (test_impl,
+                        test_i (),
+                        1);
+        PortableServer::ServantBase_var owner_transfer (test_impl);
+
+        Hang_var test =
+          test_impl->_this ();
+
+        CORBA::String_var ior =
+          orb->object_to_string (test.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        // If the ior_output_file exists, output the ior to it
+        FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
+        if (output_file == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Cannot open output file for writing IOR: %s",
+                             ior_output_file),
+                            1);
+        ACE_OS::fprintf (output_file, "%s", ior.in ());
+        ACE_OS::fclose (output_file);
+
+        poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        ACE_Time_Value tv (10);
+
+        orb->run (&tv);
+
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) server - event loop finished\n"));
+
+        root_poa->destroy (1,
+                           1
+                           ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "Caught CORBA exception \n");
+        return -1;
+      }
+    ACE_ENDTRY;
+
+    return 0;
   }
 }
 
@@ -104,5 +101,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter convert (argc, argv);
 
-  return TAO::Test::try_main (convert.get_argc(), convert.get_ASCII_argv());
+  return Test::try_main (convert.get_argc(), convert.get_ASCII_argv());
 }
diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h
index 1368f3c36c8..28f6ef82e23 100644
--- a/TAO/tests/Hang_Shutdown/test_i.h
+++ b/TAO/tests/Hang_Shutdown/test_i.h
@@ -9,36 +9,33 @@
 
 #include "ace/OS_NS_unistd.h"
 
-namespace TAO
+namespace Test
 {
-  namespace Test
+  class test_i
+    : public virtual POA_Test::Hang
   {
-    class test_i
-      : public virtual POA_TAO::Test::Hang
+  public:
+    // = The skeleton methods
+    virtual void send_stuff (const char* str,
+                             CORBA::Boolean flag
+                             ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
     {
-    public:
-      // = The skeleton methods
-      virtual void send_stuff (const char* str,
-                               CORBA::Boolean flag
-                               ACE_ENV_ARG_DECL_NOT_USED)
-        ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) - [%C]\n", str));
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) - [%C]\n", str));
 
-        if (flag)
-          {
-            ACE_OS::sleep (10);
+      if (flag)
+        {
+          ACE_OS::sleep (10);
 
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Returning from send_stuff\n", str));
-          }
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Returning from send_stuff\n", str));
+        }
 
-        return;
-      }
-    private:
-    };
-  }
+      return;
+    }
+  private:
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index 9ea6c4b127b..9a1892855d9 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Hello/run_test.pl b/TAO/tests/Hello/run_test.pl
index 5d02e3606f1..cb77b93fe3e 100755
--- a/TAO/tests/Hello/run_test.pl
+++ b/TAO/tests/Hello/run_test.pl
@@ -21,7 +21,12 @@ else {
 }
 $CL = new PerlACE::Process ("client", " -k file://$iorfile");
     
-$SV->Spawn ();
+$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) {
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index 654e32854cd..a41e64733b8 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -10,6 +10,7 @@ project(ICMG_Any_Bug_Hello_Server): taoserver {
 }
 
 project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, minimum_corba {
+  after += ICMG_Any_Bug_Hello_Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
index a9b40470990..2ec2f9c01a4 100644
--- a/TAO/tests/IDL_Test/array.idl
+++ b/TAO/tests/IDL_Test/array.idl
@@ -9,7 +9,7 @@
 //    array.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.
@@ -40,16 +40,16 @@ typedef wrap outside_array[10];
 // Once a problem with expressions in the brackets,
 // as well as the typedef'd/anonymous thing.
 
-interface tdef 
+interface tdef
 {
   const short byteslen = 12;
   typedef octet Bytes[byteslen + 1];
 
-  struct bytes_or_longs 
+  struct bytes_or_longs
     {
       Bytes the_bytes;	          // typedef'd
       long Longs[byteslen];       // anonymous
-    }; 
+    };
 };
 
 // To test that all the octet arrays build and link as
@@ -61,7 +61,7 @@ module ABCModule
     octet rmtNodeId[22];
     octet rmtDetails[22];
   };
-  
+
   struct bbbBubBubBubBaby
   {
     octet rmtNodeId[22];
@@ -91,20 +91,22 @@ module string_array
 
 // Checks code generation for arrays and typedefs of arrays
 // when they are not declared globally or inside a module.
-interface testdata 
+interface testdata
 {
   typedef char Arraychar[2];
   typedef Arraychar ArrayDeChar;
 
-  struct struct2 
+  struct struct2
   {
     Arraychar field_1;
     ArrayDeChar field_2;
   };
 
   typedef sequence<Arraychar> ArraycharList;
+  typedef sequence<Arraychar,10> BdArraycharList;
 
   typedef sequence<ArrayDeChar> ArrayDeCharList;
+  typedef sequence<ArrayDeChar,10> BdArrayDeCharList;
 };
 
 // Tests for explicit conversion of slice pointer to the
@@ -146,6 +148,19 @@ module bug_2126
     case TRUE: MyStruct second_union_struct_member;
     case FALSE: long wibble;
   };
+
+  typedef FirstUnion BdFirstUnionArray[2];
+
+  struct BdMyStruct
+  {
+    BdFirstUnionArray my_struct_foo;
+  };
+
+  union BdSecondUnion switch (boolean)
+  {
+    case TRUE: BdMyStruct second_union_struct_member;
+    case FALSE: long wibble;
+  };
 };
 
 
diff --git a/TAO/tests/IDL_Test/constants.idl b/TAO/tests/IDL_Test/constants.idl
index 1d48889517c..4d95752d59e 100644
--- a/TAO/tests/IDL_Test/constants.idl
+++ b/TAO/tests/IDL_Test/constants.idl
@@ -9,7 +9,7 @@
 //    constants.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.
@@ -48,6 +48,8 @@ const char fivebits = '\x32';
 const char maybe_minus = '\xAf';
 const char max_char_hex = '\xff';
 
+// const wstring wstr = L"wstr";
+
 // unsigned longs greater than LONG_MAX
 
 const unsigned long in_range = 3222111000;
@@ -72,22 +74,22 @@ const unsigned long drink = 1000000000 << 2;
 
 // An enum of one type cannot be assigned to an constant of another
 // enum type, but it's ok if one is a typedef of the other.
-module m_a 
+module m_a
 {
    enum enum_a { value_1, value_2, value_3, value_4, value_5 };
 };
 
-module m_b 
+module m_b
 {
    typedef m_a::enum_a enum_b;
 };
 
-module problems 
+module problems
 {
    const m_b::enum_b bconst = m_a::value_2;
 };
 
-// In a class, string constants cannot be declared inline, but 
+// In a class, string constants cannot be declared inline, but
 // arithmetic types can be.
 module ClassConstants
 {
@@ -95,12 +97,14 @@ module ClassConstants
   {
     const long iface_long = 55;
     const string iface_str = "iface_str";
+//    const wstring iface_wstr = L"iface_wstr";
   };
-  
+
   valuetype Vt
   {
     const double vt_long = 66.66;
     const string vt_str = "vt_str";
+//    const wstring vt_wstr = L"vt_wstr";
   };
 };
 
diff --git a/TAO/tests/IDL_Test/included.idl b/TAO/tests/IDL_Test/included.idl
index 6dd51822749..a8da94acedc 100644
--- a/TAO/tests/IDL_Test/included.idl
+++ b/TAO/tests/IDL_Test/included.idl
@@ -9,7 +9,7 @@
 //    included.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,7 +23,7 @@
 #define IDL_TEST_INCLUDED_IDL
 
 // Included in IDL file 'including.idl'.
-module Aok 
+module Aok
 {
   typedef sequence<double> Seq1Type;
   typedef long Me;
@@ -31,9 +31,16 @@ module Aok
 
 enum Agog
 {
-  Agog1, 
-  Agog2, 
+  Agog1,
+  Agog2,
   Agog3
 };
 
+// This valuetype is used in a sequence in the including file,
+// and tests that Value_VarOut_T.h is included early enough.
+module VT_Def
+{
+  valuetype VT {};
+};
+
 #endif /* IDL_TEST_INCLUDED_IDL */
diff --git a/TAO/tests/IDL_Test/including.idl b/TAO/tests/IDL_Test/including.idl
index f4bc66f3953..431f8903c9c 100644
--- a/TAO/tests/IDL_Test/including.idl
+++ b/TAO/tests/IDL_Test/including.idl
@@ -9,7 +9,7 @@
 //    including.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.
@@ -24,12 +24,12 @@
 
 #include "included.idl"
 
-enum choice 
+enum choice
 {
   dog
 };
 
-union myUnion switch (choice) 
+union myUnion switch (choice)
 {
   // Typedef is in included file
   case dog: Aok::Seq1Type cat;
@@ -50,19 +50,23 @@ union Bog switch (Agog)
 // scope doesn't apply here, because Me is not
 // defined in the struct, only referenced.
 interface iface
-{   
+{
   enum postal
   {
     ME,
-    TAO_FE	// FE is #defined on HP-UX 10.20, so I prefix it with TAO
+    TAO_FE  // FE is #defined on HP-UX 10.20, so I prefix it with TAO
   };
-    
+
   struct using_incl
   {
     Aok::Me field1;
-  };    
+  };
 };
 
+module VT_Test
+{
+  typedef sequence<VT_Def::VT> VTSeq;
+};
 
 #endif /* IDL_TEST_INCLUDING_IDL */
 
diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl
index 28e428251be..966a1fd80b9 100644
--- a/TAO/tests/IDL_Test/interface.idl
+++ b/TAO/tests/IDL_Test/interface.idl
@@ -9,7 +9,7 @@
 //    interface.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.
@@ -21,7 +21,7 @@
 
 
 
-// Used to be a problem in the get() and set() 
+// Used to be a problem in the get() and set()
 // generated code.
 
 interface Base
@@ -38,7 +38,7 @@ interface Derived : Base
 // foo's scope.
 module foo_mod
 {
-  struct date 
+  struct date
     {
 	    short month;
     };
@@ -71,6 +71,10 @@ interface child : mother, father
 {
 };
 
+interface try
+{
+};
+
 // Definition below in file.
 interface later;
 
@@ -78,11 +82,11 @@ typedef boolean Bool;
 
 interface later_user
 {
-  later op (in later inarg, 
+  later op (in later inarg,
             inout later inoutarg,
             out later outarg);
 
-            
+
   // Not a clash with the C++ keyword because they are case sensitive,
   // but the Arg_Traits<> specialization parameter (ACE_InputCDR::to_boolean)
   // needs the unaliased type name to work.
@@ -102,7 +106,7 @@ interface later {};
 // somewhere other than the scope where the
 // lookup starts.
 
-interface Begin 
+interface Begin
 {
   typedef long Value;
 };
@@ -111,11 +115,11 @@ interface Middle : Begin
 {
 };
 
-interface End : Middle 
+interface End : Middle
 {
 };
 
-interface Client 
+interface Client
 {
   attribute End::Value v;
 };
@@ -137,31 +141,53 @@ module ParamMod
     {
       ParameterTester objref;
     };
-  
+
     typedef sequence<ParameterTester> object_seq_type;
-    
+
     typedef ParameterTester object_array_type[5];
 
-    struct object_struct_type 
+    struct object_struct_type
     {
       octet o1;
       ParameterTester p1;
-      long l1;        
+      long l1;
     };
-    
+
     union object_union_type switch (long)
     {
       case 0: string str;
       case 1: ParameterTester pt;
     };
-    
+
     object_seq_type parameter_tester_op (
         in object_struct_type inarg,
         inout object_array_type inoutarg,
         out object_union_type outarg
       )
-      raises (object_excep_type); 
+      raises (object_excep_type);
+  };
+};
+
+local interface testlocal
+{
+};
+
+interface A {
+  union U switch(boolean)
+  {
+    case TRUE: A aa;
   };
 };
 
- 
+module M
+{
+    interface A;
+};
+
+module M
+{
+    interface A;
+
+    interface A {};
+};
+
diff --git a/TAO/tests/IDL_Test/sequence.idl b/TAO/tests/IDL_Test/sequence.idl
index 9cbd802c9b4..9c3b32da80e 100644
--- a/TAO/tests/IDL_Test/sequence.idl
+++ b/TAO/tests/IDL_Test/sequence.idl
@@ -9,7 +9,7 @@
 //    sequence.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.
@@ -28,13 +28,19 @@ typedef sequence<CORBA::OctetSeq> OctetSeqSeq;
 // Bounded string elements of a sequence,
 // require the use of CORBA_Any::to_char.
 
-interface seqTest 
+interface seqTest
 {
   typedef sequence< string<12> > dozens;
 
   void send_dozen (inout dozens bouquets);
 };
 
+local interface seqLocal
+{
+};
+
+typedef sequence<seqLocal> seqLocalSeq;
+
 // Anonymous sequence members must be unique types even if the
 // sequence itself is not, so the member name has been
 // incorported into the sequence class name. #if !defined guards
@@ -54,7 +60,7 @@ struct nestedSeqStruct
 };
 
 // Tests deeply nested recursive type.
-module Deployment 
+module Deployment
 {
   struct ComponentPackageDescription;
 
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 9ea6c4b127b..9a1892855d9 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/IPV6/run_test.pl b/TAO/tests/IPV6/run_test.pl
index fc6aea9ecbd..82d3ef36246 100755
--- a/TAO/tests/IPV6/run_test.pl
+++ b/TAO/tests/IPV6/run_test.pl
@@ -24,25 +24,25 @@ $clt_arg = "-k file://$iorfile ";
 @configurations =
     (
      {
-         description => "Testing server with '-ORBConnectIPV6Only YES'.\n",
-         server => "$srv_arg -ORBConnectIPV6Only YES",
+         description => "Testing server with '-ORBConnectIPV6Only 1'.\n",
+         server => "$srv_arg -ORBConnectIPV6Only 1",
          client => "$clt_arg",
          error => 0,
          url => 0,
          url_address => "",
      },
      {
-         description => "Testing client with '-ORBPreferIPV6Interfaces YES'.\n",
+         description => "Testing client with '-ORBPreferIPV6Interfaces 1'.\n",
          server => "$srv_arg ",
-         client => "$clt_arg -ORBPreferIPV6Interfaces YES",
+         client => "$clt_arg -ORBPreferIPV6Interfaces 1",
          error => 0,
          url => 0,
          url_address => "",
      },
      {
-         description => "Testing IPV4 server with client with '-ORBConnectIPV6Only YES'.\n",
+         description => "Testing IPV4 server with client with '-ORBConnectIPV6Only 1'.\n",
          server => "$srv_arg -ORBListenEndpoints iiop://127.0.0.1",
-         client => "$clt_arg -x -ORBConnectIPV6Only YES",
+         client => "$clt_arg -x -ORBConnectIPV6Only 1",
          error => 1,
          url => 0,
          url_address => "",
@@ -73,7 +73,7 @@ $clt_arg = "-k file://$iorfile ";
      },
      {
          description => "Testing IPV6Only server with client and IPV4-forced URL",
-         server => "$srv_arg -ORBConnectIPV6Only YES -ORBObjRefStyle url",
+         server => "$srv_arg -ORBConnectIPV6Only 1 -ORBObjRefStyle url",
          client => "-x",
          error => 1,
          url => 1,
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index d234d5e80b7..d22fb76e4a1 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -56,7 +56,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       ACE_DEBUG ((LM_DEBUG,
                                   "  Reference %u: %s\n",
                                   n,
-                                  list[n].in ()));
+                                  static_cast<char const*>(list[n])));
                     }
                 }
               else
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 5604fafaf7b..163fd3de1c3 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver, utils, iortable {
 
 project(*Client): taoclient, anytypecode {
   exename = INS_test_client
+  after += *Server
   Source_Files {
     INSC.cpp
     INS_test_client.cpp
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index c82979d0e98..a3b794ac88f 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, strategies {
 }
 
 project(*Client): taoclient, strategies {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index e244be88a2e..01b2d58bb9e 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -162,13 +162,13 @@ Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Controller_Handler::worker_started_excep
-    (Test::AMI_ControllerExceptionHolder* h
+    (::Messaging::ExceptionHolder* h
      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -190,13 +190,13 @@ Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Controller_Handler::worker_finished_excep
-    (Test::AMI_ControllerExceptionHolder *h
+    (::Messaging::ExceptionHolder *h
      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 9e1d360e5e8..5d7d6a82eec 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -63,12 +63,12 @@ public:
 
   virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
+  virtual void worker_started_excep (::Messaging::ExceptionHolder*
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
+  virtual void worker_finished_excep (::Messaging::ExceptionHolder*
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 5bd663d16e0..13a0c026057 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -10,21 +10,24 @@ project(*Server): taoserver, messaging, ami {
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
+  after += *Server
   Source_Files {
     Controller.cpp
     blocking_client.cpp
   }
 }
 
-project(*AMI Server): taoserver, messaging, ami {
+project(*AMI_Server): taoserver, messaging, ami {
   exename = ami_server
+  after += *Client
   Source_Files {
     AMI_Manager.cpp
     ami_server.cpp
   }
 }
 
-project(*AMI Client): messaging, taoexe, portableserver, ami {
+project(*AMI_Client): messaging, taoexe, portableserver, ami {
+  after += *AMI_Server
   Source_Files {
     Controller.cpp
     Manager_Handler.cpp
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index 4223798dc86..c1532a2eb86 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -34,13 +34,13 @@ Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
+Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder
                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_start_workers (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 742f4c76ca3..8ee1d472c2e 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -19,7 +19,7 @@ public:
   // = The skeleton methods
   virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
+  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder
                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 40f7a4677d8..e48d767fd5c 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, iormanip {
 }
 
 project(*Client): taoclient, iormanip {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index cb84adb7841..e4abfd734d6 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging, iormanip {
 }
 
 project(*Client): taoclient, messaging, iormanip {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index e38b68ca361..d6f4df5acc4 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, minimum_corba {
 
 project(*Client): taoclient, anytypecode, minimum_corba {
   exename = client
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -18,6 +19,7 @@ project(*Client): taoclient, anytypecode, minimum_corba {
 
 project(*Manager): taoserver, minimum_corba, iormanip {
   exename = manager
+  after += *Client
   Source_Files {
     testC.cpp
     Servant_Locator.cpp
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index db3f6d32dbf..ab023c419a3 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -13,6 +13,7 @@ project(*Server): taoexe, portableserver, minimum_corba, bidir_giop {
 }
 
 project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *Server
   Source_Files {
     ReceiverC.cpp
     ReceiverS.cpp
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index cda5d4bf54e..91b4b729db0 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -1,6 +1,6 @@
+// -*- C++ -*-
 //
 // $Id$
-//
 
 #ifndef MT_BIDIR_RECEIVER_H
 #define MT_BIDIR_RECEIVER_H
@@ -8,7 +8,9 @@
 
 #include "SenderS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * Simply print count how many bytes were received.
diff --git a/TAO/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h
index 20d4142c2dd..42686741b21 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/Server_Task.h
@@ -16,7 +16,10 @@
 #include "tao/ORB.h"
 
 class Sender_i;
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Implement a Task to run the experiments using multiple threads.
 class Server_Task : public ACE_Task_Base
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 2d52b489a66..1974ade69bd 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index 4c15c26f959..bfb96e8b536 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index 71d75c1743c..634030e4814 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -10,6 +10,7 @@ project(*Server): messaging, taoserver {
 }
 
 project(*Client): messaging, taoexe, portableserver {
+  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 9a48ddc7a06..a584d9dc134 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -94,7 +94,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       Server_Task server_task (ACE_Thread_Manager::instance (),
                                orb.in (),
-                               240);
+                               ACE_Time_Value(240));
 
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 8, 1) == -1)
         {
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 2584e88308f..47b388a8e0f 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -13,6 +13,7 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   idlflags += -Gd
+  after += *Server
 
   Source_Files {
     Multiple_Impl.cpp
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index db84416b4cc..f818ca1c940 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver, utils {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     Multiple_InheritanceC.cpp
     client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index 4c15c26f959..bfb96e8b536 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index 2824b800b03..1d115e8dc19 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 397406b1347..1b292027ede 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*Server): taoserver, anytypecode, exceptions {
-  idlflags  = -Ge 0 -Sc -Sa -St
   Source_Files {
     test_i.cpp
     server.cpp
@@ -10,7 +9,7 @@ project(*Server): taoserver, anytypecode, exceptions {
 }
 
 project(*Client): taoclient, anytypecode, exceptions {
-  idlflags  = -Ge 0 -Sc -Sa -St
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index c8a1b7d2075..35e6a89edfd 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested Upcall Server): taoserver, utils {
+project(*Nested_Upcall_Server): taoserver, utils {
   Source_Files {
     MT_Object_i.cpp
     server.cpp
   }
 }
 
-project(*Nested Upcall Client): taoexe, utils, portableserver {
+project(*Nested_Upcall_Client): taoexe, utils, portableserver {
+  after += *Nested_Upcall_Server
   Source_Files {
     MT_Object_i.cpp
     local_server.cpp
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index bdd85598880..588d3ba157f 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -32,7 +32,9 @@
 #include "ace/Log_Msg.h"
 #include "ace/Argv_Type_Converter.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Manager;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class MT_Server
 {
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index c809e1301ee..766f62db832 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested Upcall Server): taoexe, portableserver {
+project(*Nested_Upcall_Server): taoexe, portableserver {
   Source_Files {
     server_i.cpp
     server.cpp
   }
 }
 
-project(*Nested Upcall Client): taoexe, portableserver {
+project(*Nested_Upcall_Client): taoexe, portableserver {
+  after += *Nested_Upcall_Server
   Source_Files {
     client_i.cpp
     client.cpp
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index 7480edb1f1c..e8b0864ecd5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,21 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested Upcall Server_A): taoexe, utils, portableserver {
+project(*Nested_Upcall_Server_A): taoexe, utils, portableserver {
   Source_Files {
     Object_A_i.cpp
     server_A.cpp
   }
 }
 
-project(*Nested Upcall Server_B): taoexe, utils, portableserver {
+project(*Nested_Upcall_Server_B): taoexe, utils, portableserver {
+  after += *Nested_Upcal_Server_A
   Source_Files {
     Object_B_i.cpp
     server_B.cpp
   }
 }
 
-project(*Nested Upcall Initiator): taoexe, utils, portableserver {
+project(*Nested_Upcall_Initiator): taoexe, utils, portableserver {
+  after += *Nested_Upcall_Server_B
   Source_Files {
     Initiator_i.cpp
     initiator.cpp
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 47fc97557a4..50ef58ea252 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -9,6 +9,7 @@ project(*Server): strategies, taoexe, portableserver {
 }
 
 project(*Client): strategies, taoexe, portableserver {
+  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
index 7f1b10dea24..2d1c7cbbb59 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
@@ -10,11 +10,11 @@
 
 ACE_RCSID(Nested_Upcall_Crash, Clock_Ticks, "$Id$")
 
-int
+long
 Clock_Ticks::get_hz (void)
 {
 #if defined(_SC_CLK_TCK)
-  int r = ACE_OS::sysconf(_SC_CLK_TCK);
+  long r = ACE_OS::sysconf(_SC_CLK_TCK);
   if(r != -1)
     return r;
 #endif /* _SC_CLK_TCK */
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
index 98e700da93b..162dec87a9f 100644
--- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
+++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h
@@ -14,7 +14,7 @@
 namespace Clock_Ticks
 {
   /// Return the number of clock ticks per second
-  int get_hz (void);
+  long get_hz (void);
 
   /// Return the number of microseconds per tick
   int get_usecs_per_tick (void);
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index ade0f5e574f..68469dc0fff 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -15,6 +15,7 @@ project(*Server): taoserver, messaging {
 
 project(*Scavenger): taoserver, messaging {
   exename = scavenger
+  after += *Server
   Source_Files {
     scavenger.cpp
   }
@@ -22,6 +23,7 @@ project(*Scavenger): taoserver, messaging {
 
 project(*Client): taoserver, messaging {
   exename = client
+  after += *Scavenger
   Source_Files {
     Clock_Ticks.cpp
     Client_Peer.cpp
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 4c15c26f959..bfb96e8b536 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index fa0778e6315..aae537cf474 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -16,15 +16,16 @@ Test_impl::get_something (
     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Any_var ret_val;
-  ACE_NEW_RETURN (ret_val, CORBA::Any, 0);
+  CORBA::Any_ptr ret_val_ptr = 0;
+  ACE_NEW_RETURN (ret_val_ptr, CORBA::Any, 0);
+  CORBA::Any_var ret_val = ret_val_ptr;
 
   const CORBA::ULong magic = 3145;
 
   if (need_vb)
     {
       OBV_AnyTest::VB_var vb;
-      ACE_NEW_RETURN (vb, OBV_OBV_AnyTest::VB, 0);
+      ACE_NEW_RETURN (vb.inout (), OBV_OBV_AnyTest::VB, 0);
 
       vb->id (magic);
 
@@ -33,7 +34,7 @@ Test_impl::get_something (
   else
     {
       OBV_AnyTest::VA_var va;
-      ACE_NEW_RETURN (va, OBV_OBV_AnyTest::VA, 0);
+      ACE_NEW_RETURN (va.inout (), OBV_OBV_AnyTest::VA, 0);
 
       va->id (magic);
 
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index 568259acf4e..d49a9b37b23 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -9,6 +9,7 @@ project(*Server): taoexe, portableserver, valuetype {
 }
 
 project(*Client): taoexe, valuetype {
+  after += *Server
   Source_Files {
     AnyC.cpp
     client.cpp
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index db5be17d3ea..35e8b528ad6 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -97,8 +97,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Do local test
 
       OBV_AnyTest::VA_var va1, va2;
-      ACE_NEW_RETURN (va1, OBV_OBV_AnyTest::VA, 1);
-      ACE_NEW_RETURN (va2, OBV_OBV_AnyTest::VA, 1);
+      ACE_NEW_RETURN (va1.inout (), OBV_OBV_AnyTest::VA, 1);
+      ACE_NEW_RETURN (va2.inout (), OBV_OBV_AnyTest::VA, 1);
 
       const CORBA::ULong magic = 3145;
 
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index e85e098ae6e..3c8697e8415 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -79,14 +79,14 @@ Client_Task::svc (void)
       // Now build simple graph (tree in our case).
 
       TreeController_var tc;
-      ACE_NEW_RETURN (tc,
+      ACE_NEW_RETURN (tc.inout (),
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn,
+        ACE_NEW_RETURN (sn.inout (),
                         OBV_StringNode,
                         1);
         sn->name ((const char*)("RootNode"));
@@ -95,7 +95,7 @@ Client_Task::svc (void)
         // Create the left leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("LeftNode"));
@@ -105,7 +105,7 @@ Client_Task::svc (void)
         // Create the right leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("RightNode"));
@@ -118,14 +118,14 @@ Client_Task::svc (void)
       // Make copy
 
       TreeController_var tc_copy;
-      ACE_NEW_RETURN (tc_copy,
+      ACE_NEW_RETURN (tc_copy.inout (),
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn,
+        ACE_NEW_RETURN (sn.inout (),
                         OBV_StringNode,
                         1);
         sn->name ((const char*)("RootNode"));
@@ -134,7 +134,7 @@ Client_Task::svc (void)
         // Create the left leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("LeftNode"));
@@ -144,7 +144,7 @@ Client_Task::svc (void)
         // Create the right leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("RightNode"));
@@ -164,7 +164,7 @@ Client_Task::svc (void)
       TreeController_var tc_result =
         test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // The following two ifs will fail until bug 1390 is fixed.
       if (is_equal_tree (tc.in (), tc_result.in ()))
         {
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index 4f2307adc30..60006aae0ba 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -15,7 +15,9 @@
 
 #include "tao/ORB.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
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index cc812c1eebe..e257b945987 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   Source_Files {
     FactoryC_impl.cpp
     FactoryS_impl.cpp
@@ -9,7 +9,8 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
+  after += *Server
   Source_Files {
     FactoryC.cpp
     FactoryC_impl.cpp
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 187913bb64f..6e512583d7d 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -35,6 +35,39 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
+bool
+no_factory (OBV_FactoryTest::Test_ptr test)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      // Calling this without a factory registred should give a marshal
+      // exception with minor code 1
+      OBV_FactoryTest::BaseValue_var base_value =
+        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::MARSHAL, ex)
+    {
+      if ((ex.minor() & 0xFFFU) == 1)
+        {
+          succeed = true;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, no_factory failed\n"));
+  }
+
+  return succeed;
+}
+
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
@@ -49,8 +82,29 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
-      // Create factories.
+      // Obtain reference to the object
+      CORBA::Object_var tmp =
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
+      OBV_FactoryTest::Test_var test =
+        OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (test.in ()))
+      {
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "Nil OBV_FactoryTest::Test reference <%s>\n",
+                           ior),
+                          1);
+      }
+
+      // Check if we get the correct exception with minor code because no
+      // factory has been set.
+      if (!no_factory (test.in ()))
+        return 1;
+
+      // Create factories.
       OBV_FactoryTest::BaseValue_init *base_factory = 0;
       ACE_NEW_RETURN (base_factory,
                       OBV_FactoryTest::BaseValue_init,
@@ -62,8 +116,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
-
-
       OBV_FactoryTest::Value1_init *value1_factory = 0;
       ACE_NEW_RETURN (value1_factory,
                       OBV_FactoryTest::Value1_init,
@@ -75,8 +127,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
-
-
       OBV_FactoryTest::Value2_init *value2_factory = 0;
       ACE_NEW_RETURN (value2_factory,
                       Value2_init_impl,
@@ -88,24 +138,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
       value2_factory->_remove_ref ();
 
-
-      // Obtain reference to the object
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      OBV_FactoryTest::Test_var test =
-        OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (test.in ()))
-      {
-        ACE_ERROR_RETURN ((LM_DEBUG,
-                           "Nil OBV_FactoryTest::Test reference <%s>\n",
-                           ior),
-                          1);
-      }
-
       // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
       OBV_FactoryTest::BaseValue_var base_value =
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index a2e1bc181e0..ee6e2623910 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   IDL_Files {
     TreeBase.idl
     TreeController.idl
@@ -13,7 +13,8 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
+  after += *Server
   Source_Files {
     TreeBaseC.cpp
     TreeControllerC.cpp
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index 0ef9d60f494..6bc42eb9311 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -154,14 +154,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Now build simple graph (tree in our case).
 
       TreeController_var tc;
-      ACE_NEW_RETURN (tc,
+      ACE_NEW_RETURN (tc.inout (),
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn,
+        ACE_NEW_RETURN (sn.inout (),
                         OBV_StringNode,
                         1);
         sn->name ((const char*)("RootNode"));
@@ -170,7 +170,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Create the left leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("LeftNode"));
@@ -180,7 +180,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         // Create the right leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy,
+          ACE_NEW_RETURN (dummy.inout (),
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("RightNode"));
diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc
index 3de931f13dd..7d9df51c0b7 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.mpc
+++ b/TAO/tests/OBV/Supports/Supports_Test.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
 project(*Server): taoserver, valuetype, strategies {
-  exename = server
   // This is just a dummy_label to prevent the test from being compiled
   // in MPC builds
   requires += dummy_label
@@ -20,6 +19,7 @@ project(*Server): taoserver, valuetype, strategies {
 
 project(*Client): taoclient, taoserver, valuetype {
   exename = client
+  after += *Server
   // This is just a dummy_label to prevent the test from being compiled
   // in MPC builds
   requires += dummy_label
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index ac045461c97..f9e3d32dc18 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   Source_Files {
     testS.cpp
     testC.cpp
@@ -10,7 +10,8 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index daa27007ebd..b495f0bd3c1 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -2,8 +2,8 @@
 
 #include "test_i.h"
 
-ACE_RCSID (TC_Alignment, 
-           test_i, 
+ACE_RCSID (TC_Alignment,
+           test_i,
            "$Id$")
 
 test_i::test_i (CORBA::ORB_ptr orb)
@@ -16,10 +16,11 @@ test_i::get_value (CORBA::Long offset
                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Any_var retval;
-  ACE_NEW_THROW_EX (retval,
+  CORBA::Any_ptr retval_ptr = 0;
+  ACE_NEW_THROW_EX (retval_ptr,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
+  CORBA::Any_var retval = retval_ptr;
 
   switch (offset)
   {
@@ -74,5 +75,5 @@ void
 test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->destroy ();
+  this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index de55b910cc5..2c74111f3f3 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -268,7 +268,7 @@ Test_impl::array_op1 (::VBlongarray * p1,
                       ACE_ENV_ARG_DECL_NOT_USED)
                   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  long array_len = sizeof(LongArray) / sizeof(long);
+  long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
 
   for (long i=0; i<array_len; i++)
     {
@@ -294,7 +294,7 @@ Test_impl::array_op2 (const ::LongArray p1,
                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  long array_len = sizeof(LongArray) / sizeof(long);
+  long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
 
   long i;
   for (i=0; i<array_len; i++)
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index d7f198751d3..647da046fa1 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -546,7 +546,7 @@ int test_boxed_sequence (void)
                   VBseqlong (),
                   1);
 
-  VBseqlong     *temp;
+  VBseqlong     *temp = 0;
   ACE_NEW_RETURN (temp,
                   VBseqlong (),
                   1);
@@ -563,7 +563,7 @@ int test_boxed_sequence (void)
   longarray[2] = 303;
 
   // Create a sequence
-  TDseqlong *temp2;
+  TDseqlong *temp2 = 0;
   ACE_NEW_RETURN (temp2,
                   TDseqlong(10, 3, longarray, 1),
                   1);
@@ -611,7 +611,6 @@ int test_boxed_sequence (void)
 
   // release
   vbseqlong1->_remove_ref ();
-  vbseqlong3->_remove_ref ();
   vbseqlong4->_remove_ref ();
 
   return fail;
@@ -731,10 +730,11 @@ int test_boxed_struct (void)
                     1);
 
     // Test boxed copy ctor.
-    VBfixed_struct1_var valuebox2;
-    ACE_NEW_RETURN (valuebox2,
+    VBfixed_struct1* valuebox2_ptr = 0;
+    ACE_NEW_RETURN (valuebox2_ptr,
                     VBfixed_struct1 (*valuebox1),
                     1);
+    VBfixed_struct1_var valuebox2 = valuebox2_ptr;
 
     VERIFY (valuebox1->l () == valuebox2->l ());
     VERIFY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
@@ -793,9 +793,8 @@ int test_boxed_struct (void)
       }
 
     //
-    // valuebox1, valuebox2, and valuebox3 must be explicitly removed.
+    // valuebox1 and valuebox3 must be explicitly removed.
     CORBA::remove_ref (valuebox1);
-    CORBA::remove_ref (valuebox2);
     CORBA::remove_ref (valuebox3);
 
     //
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index 9d07560ab99..64145b1880f 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   IDL_Files {
     vb_basic.idl
     vb_struct.idl
@@ -22,7 +22,8 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
+  after += *Server
   Source_Files {
     vb_basicC.cpp
     vb_structC.cpp
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index cdea1c0d380..65ef1bf0f4e 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -31,7 +31,7 @@
 #endif /* _MSC_VER */
 
 class ORT_test_IORInterceptor
-  : public virtual PortableInterceptor::IORInterceptor,
+  : public virtual PortableInterceptor::IORInterceptor_3_0,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 4a75bc70ec4..41d68f18ff0 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -106,7 +106,7 @@ ServerRequestInterceptor::receive_request (
 
       ACE_DEBUG ((LM_INFO,
                   "%s\n",
-                  name[i].in ()));
+                  static_cast<char const*>(name[i])));
     }
 
   ACE_DEBUG ((LM_INFO,
@@ -115,7 +115,7 @@ ServerRequestInterceptor::receive_request (
 
   // Make sure the name of the RootPOA is the first in the AdapterName
   // sequence.
-  ACE_ASSERT (ACE_OS::strcmp ("RootPOA", name[(CORBA::ULong) 0].in()) == 0);
+  ACE_ASSERT (ACE_OS::strcmp ("RootPOA", static_cast<const char*>(name[(CORBA::ULong) 0])) == 0);
 
   CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index 93ce5b41681..a008ebf89a3 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -12,6 +12,7 @@ project(*Test): taolib_with_idl, portableserver {
 }
 
 project(*Driver): taoexe, portableserver {
+  after += *Test
   Source_Files {
     TestC.cpp
     driver.cpp
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index fcf4ac7709c..650b6c70356 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index f022a840487..4a526ffae60 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver {
+  avoids += ace_for_tao
   Source_Files {
     test_i.cpp
     server.cpp
@@ -9,6 +10,8 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  avoids += ace_for_tao
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -17,6 +20,7 @@ project(*Client): taoclient, anytypecode {
 
 project(*OctetSeq): taoclient, anytypecode {
   exename = OctetSeq
+  after += *Client
   Source_Files {
     testC.cpp
     OctetSeq.cpp
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index 0ac9fd7eafc..ee95112f143 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -18,6 +18,7 @@ project(*Server): messaging, taoexe, portableserver {
 // succeeds.
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
+  after += *Server
 
   Source_Files {
     TestC.cpp
@@ -26,6 +27,7 @@ project(*Client): messaging, taoexe, portableserver {
 }
 
 project(*Admin): messaging, taoexe, portableserver {
+  after += *Client
   Source_Files {
     Oneway_Buffering_Admin.cpp
     admin.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 7aef588b5f2..bd6dfbc4ff5 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
+  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index 735ef5e6ed2..de531ab3649 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -9,6 +9,7 @@ project(POA_server*): taoserver {
 
 project(POA_client*): taoserver {
   exename = client
+  after += POA_server*
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index a39d1917712..dffcbf892da 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -131,6 +131,15 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL)
                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (test::_nil ());
 
+  // Destroy the policies
+  for (CORBA::ULong i = 0;
+       i < policies.length ();
+       ++i)
+    {
+      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
   test_i *servant =
     new test_i (this->orb_.in (),
                 this->child_poa_.in ());
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 6124582c733..4ad4fa1ba44 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -9,8 +9,9 @@ project(*Server): taoserver, minimum_corba {
 }
 
 project(*Client): taoserver, minimum_corba, dynamicinterface {
-  exename  = client
-  after += Param_Test_Server
+  avoids += ace_for_tao
+  exename = client
+  after  += *Server
 
   Source_Files {
     any.cpp
@@ -59,7 +60,7 @@ project(*Client): taoserver, minimum_corba, dynamicinterface {
 
 project(*Anyop): taoserver, minimum_corba {
   exename = anyop
-  after += Param_Test_Client
+  after += *Client
 
   Source_Files {
     param_testC.cpp
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 3c85b5c2747..bdca2f02cdc 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_str_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_str_seq, 
+ACE_RCSID (Param_Test,
+           bd_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -150,9 +150,9 @@ Test_Bounded_String_Sequence::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_->length () && flag; i++)
         {
-          if (ACE_OS::strcmp(this->in_[i].in(), this->inout_[i].in()) ||
-              ACE_OS::strcmp(this->in_[i].in(), this->out_[i].in()) ||
-              ACE_OS::strcmp(this->in_[i].in(), this->ret_[i].in()))
+          if (ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->inout_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->out_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->ret_[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 1694db4d1a4..ee1737e545f 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "big_union.h"
 
-ACE_RCSID (Param_Test, 
-           big_union, 
+ACE_RCSID (Param_Test,
+           big_union,
            "$Id$")
 
 // ************************************************************************
@@ -490,12 +490,12 @@ Test_Big_Union::check_validity (void)
         CORBA::ULong len = in.seq.length ();
         for (CORBA::ULong i = 0; i != len; ++i)
           {
-            if (ACE_OS::strcmp (in.seq[i].in (),
-                                inout.seq[i].in ())
-                || ACE_OS::strcmp (in.seq[i].in (),
-                                   out.seq[i].in ())
-                || ACE_OS::strcmp (in.seq[i].in (),
-                                   ret.seq[i].in ()))
+            if (ACE_OS::strcmp (in.seq[i],
+                                inout.seq[i])
+                || ACE_OS::strcmp (in.seq[i],
+                                   out.seq[i])
+                || ACE_OS::strcmp (in.seq[i],
+                                   ret.seq[i]))
               return 0;
           }
       }
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 0b208edd2e3..bcf91d9bf5a 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -20,7 +20,7 @@
 #include "nested_struct.h"
 
 ACE_RCSID (Param_Test,
-           nested_struct, 
+           nested_struct,
            "$Id$")
 
 // ************************************************************************
@@ -168,9 +168,9 @@ Test_Nested_Struct::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_.vs.seq.length () && flag; i++)
         {
-          if (ACE_OS::strcmp (this->in_.vs.seq[i].in(), this->inout_->vs.seq[i].in()) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i].in(), this->out_->vs.seq[i].in()) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i].in(), this->ret_->vs.seq[i].in()))
+          if (ACE_OS::strcmp (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->inout_->vs.seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->out_->vs.seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->ret_->vs.seq[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index e75bf267210..7c7857acd6c 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -28,10 +28,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Environment;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class Results
 {
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index e70233ece97..9b3b96bc124 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -76,29 +76,36 @@ foreach $type (@types) {
 
     print STDERR "==== Testing $type === wait....\n";
 
-    $SV->Spawn ();
-    
-    if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $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);
+    $server = $SV->Spawn ();
     
     if ($server != 0) {
         print STDERR "ERROR: server returned $server\n";
         $status = 1;
     }
+    else
+    {
+        if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+            print STDERR "ERROR: cannot find file <$iorfile>\n";
+            $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;
 
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index ba7ed77ef62..80a73eba261 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_str_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_str_seq, 
+           ub_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -152,9 +152,9 @@ Test_String_Sequence::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_->length () && flag; i++)
         {
-          if (ACE_OS::strcmp(this->in_[i].in(), this->inout_[i].in()) ||
-              ACE_OS::strcmp(this->in_[i].in(), this->out_[i].in()) ||
-              ACE_OS::strcmp(this->in_[i].in(), this->ret_[i].in()))
+          if (ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->inout_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->out_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->ret_[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 35874446813..1b32ef97c56 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -20,7 +20,7 @@
 #include "var_struct.h"
 
 ACE_RCSID (Param_Test,
-           var_struct, 
+           var_struct,
            "$Id$")
 
 // ************************************************************************
@@ -186,9 +186,9 @@ Test_Var_Struct::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_.seq.length () && flag; i++)
         {
-          if (ACE_OS::strcmp (this->in_.seq[i].in(), this->inout_->seq[i].in()) ||
-              ACE_OS::strcmp (this->in_.seq[i].in(), this->out_->seq[i].in()) ||
-              ACE_OS::strcmp (this->in_.seq[i].in(), this->ret_->seq[i].in()))
+          if (ACE_OS::strcmp (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->inout_->seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->out_->seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->ret_->seq[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index d1778da8bb6..3dc6be77b96 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -27,7 +27,7 @@ Echo_Handler::echo_operation (char const *
 }
 
 void
-Echo_Handler::echo_operation_excep (Test::AMI_EchoExceptionHolder *
+Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *
                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
@@ -40,7 +40,7 @@ Echo_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Echo_Handler::shutdown_excep (Test::AMI_EchoExceptionHolder *
+Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *
                               ACE_ENV_ARG_DECL_NOT_USED)
   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 8ecb15d64f1..76517aa76f2 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -20,12 +20,12 @@ public:
   virtual void echo_operation(char const * retval
                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void echo_operation_excep(Test::AMI_EchoExceptionHolder * h
+  virtual void echo_operation_excep(::Messaging::ExceptionHolder * h
                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
   virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown_excep(Test::AMI_EchoExceptionHolder * h
+  virtual void shutdown_excep(::Messaging::ExceptionHolder * h
                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
index e53f00164a1..f55237bc40f 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -13,6 +13,7 @@ project(*Client) : taoserver, ami, pi, interceptors {
 
 project(*server) : taoserver, ami, pi_server, interceptors {
   exename = server
+  after += *Client
   source_files {
     server.cpp
     Server_Interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index 6c5f5825295..d1453ff16a4 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 729804b2872..e2e9aa6acf8 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -8,6 +8,7 @@
 
 #include "tao/LocalObject.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 1a1256f6ad7..bebf68e6c26 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 44a76c957f7..59737568104 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -13,6 +13,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     client_interceptors.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index 1a864c9e26f..2e992878fcb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 894d6616e48..e2bb8dc1d6a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -109,6 +109,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
+      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       CORBA::ULong number_called =
         Echo_Server_Request_Interceptor::server_interceptor_check_;
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index 939313f9865..b8ad135337f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -96,9 +96,6 @@ Server_Task::svc (void)
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
    }
  ACE_CATCHANY
    {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index 7bac19ca641..2101f9a9a15 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -15,7 +15,9 @@
 
 #include "ace/Task.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
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 3f4b1a38bb3..949bea21eb6 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "test_i.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Dynamic, test_i, "$Id$")
 
@@ -51,5 +52,9 @@ Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // Give the client thread time to return from the collocated
+  // call to this method before shutting down the ORB.  We sleep
+  // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
+  ACE_OS::sleep (1);
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index 2d0c8fbdb2b..e048b0f737d 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -13,7 +13,9 @@
 
 #include "tao/ORB.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
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 ade05ba7202..c51e4c75a58 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
@@ -51,6 +51,6 @@ Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 88fa97fd7ba..a55faf91bbf 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 9bf6e9024a2..3e1cf79ca24 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "server_interceptor.h"
-#include "testC.h"
-
-#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+
+#include "server_interceptor.h"
+#include "testC.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 830c28fa9ad..6db30b8116c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -39,7 +39,7 @@ Client_ORBInitializer::post_init (
   // Extract the last forward reference from the argument list.
   CORBA::ULong args_len = args->length ();
   for (CORBA::ULong i = 0; i < args_len; ++i)
-    if (ACE_OS::strcmp ("-k", args[i].in ()) == 0
+    if (ACE_OS::strcmp ("-k", static_cast<const char*>(args[i])) == 0
         && i < (args_len - 1))
       forward_str = args[i + 1];
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 37b911f8198..57393219165 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
-  idlflags += -DCORBA3
 
   Source_Files {
     test_i.cpp
@@ -13,8 +12,8 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
 }
 
 project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
-  idlflags += -DCORBA3
-
+  after += *Server
+  
   Source_Files {
     testC.cpp
     Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 6cfa38f8bde..2bf02d1ef30 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -3,7 +3,7 @@
 
 #include "ace/Log_Msg.h"
 
-#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 ACE_RCSID (IORInterceptor,
            FOO_ClientRequestInterceptor,
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 3470e22c973..699083a8fde 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -42,7 +42,7 @@
  * properly.
  */
 class FOO_IORInterceptor
-  : public virtual PortableInterceptor::IORInterceptor,
+  : public virtual PortableInterceptor::IORInterceptor_3_0,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 26777d6f625..fddc7298207 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver, iorinterceptor, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     FOO_Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 2830c220741..92c607cbf00 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -133,6 +133,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
+
+      // The interceptors will be destroyed when we call this
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index 90a4632fc2b..600ba5c118b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index fcb0a6c8382..39a60cd5c75 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     ClientORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index d3c5ed1d9b8..a76d1d5b774 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -80,11 +80,60 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
+  ACE_TRY
+    {
+      CORBA::Any new_data;
+      CORBA::Long number = 19;
+      new_data <<= number;
+
+      // Set a value in RSC, this should not effect TSC anymore
+      ri->set_slot (this->slot_id_,
+                    new_data
+                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Now retrieve the data from the TSC again.  It should not have
+      // changed to the new value
+      CORBA::Any_var data2 =
+        this->pi_current_->get_slot (this->slot_id_
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Long number2 = 0;
+      if ((data2.in () >>= number2)
+          && number == number2)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) ERROR: TSC was modified because "
+                      "RSC was modified.\n"));
+
+          ACE_TRY_THROW (CORBA::INTERNAL ());
+        }
+    }
+  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+    {
+      ACE_PRINT_EXCEPTION (ex,
+                           "Exception thrown in "
+                           "send_reply()\n");
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Invalid slot: %u\n",
+                  this->slot_id_));
+
+      ACE_TRY_THROW (CORBA::INTERNAL ());
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_INFO,
+              "(%P|%t) Server side RSC/TSC semantics appear "
+              "to be correct.\n"));
+
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 3fac7025e6a..8c0943196de 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -147,6 +147,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index c2231d58046..5c9cae1b492 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -76,29 +76,3 @@ IORInterceptor::establish_components (
   ACE_CHECK;
 }
 
-void
-IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
-
-void
-IORInterceptor::adapter_manager_state_changed (
-    PortableInterceptor::AdapterManagerId,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-IORInterceptor:: adapter_state_changed (
-    const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 503c7390a10..c2ab7cf6602 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -70,23 +70,6 @@ public:
       PortableInterceptor::IORInfo_ptr info
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_state_changed (
-      const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
index 77a14c57980..58fa821c094 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 (5);
+$server = $SV->WaitKill (30);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
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 f40037e01d2..30bc0d981cf 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 (5);
+$server = $SV->SpawnWaitKill (30);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
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 15ecab48119..ee81ede8553 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl
index b536954c01f..036fe0dd66e 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl
@@ -12,7 +12,7 @@
  */
 //=============================================================================
 
-#include <ULongSeq.pidl>
+#include "tao/ULongSeq.pidl"
 
 interface Test
 {
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 1a864c9e26f..2e992878fcb 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     Client_ORBInitializer.cpp
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index ff027308cb8..95dad19f581 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -14,7 +14,8 @@ project(*server): taoserver, tao_qtresource  {
   }
 }
 
-project(*client): taoclient, tao_qtresource {
+project(*client): taoclient, anytypecode, tao_qtresource {
+  after += *server
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index 7f1b44056fc..2fdd31ec451 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -34,7 +34,8 @@ create_new_message (void)
   ACE_Message_Block mb (block_size);
   mb.wr_ptr (block_size);
 
-  return new TAO_Asynch_Queued_Message (&mb, TAO_ORB_Core_instance ());
+  return new TAO_Asynch_Queued_Message (&mb, TAO_ORB_Core_instance (),
+                                        0, 1);
 }
 
 /// Add a new message at the tail of the queue.
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index 78e08a31786..b62ff14a3d9 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index ab526f9b9d9..20bd0533f96 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -50,7 +50,7 @@ else {
 $CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2");
 
 $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) 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 23d288d93b3..9f0ce92c6ea 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client, interceptors {
+  after += *Server
   Source_Files {
     testC.cpp
     interceptors.cpp
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 596601d6e07..e51a077e7fe 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -8,6 +8,7 @@ project(*Server): strategies, rt_server {
 }
 
 project(*Client): strategies, rt_client {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index 353569681aa..9b548f0ff8b 100755
--- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
@@ -48,7 +48,7 @@ $CL = new PerlACE::Process ("client", $client_args);
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -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/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index 7138aa20720..85cadf3219a 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -9,6 +9,7 @@ project(*client) : taoexe, portableserver, rtcorba, minimum_corba {
 }
 
 project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba {
+  after += *client
   source_files {
     server.cpp
     Custom_Network_Priority_Mapping.cpp
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 10ba9a8a48f..a77351b5090 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -8,6 +8,7 @@ project(*Server): strategies, rt_server, minimum_corba {
 }
 
 project(*Client): strategies, rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
index 9317cc84307..288bd3ddc2e 100755
--- a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
+++ b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
@@ -21,7 +21,7 @@ $CL = new PerlACE::Process ("client", "-o file://$iorfile -ORBdebuglevel 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 ();
     exit 1;
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 0f82a323a72..87178218057 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba {
 }
 
 project(*Client): rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 10ba9a8a48f..a77351b5090 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -8,6 +8,7 @@ project(*Server): strategies, rt_server, minimum_corba {
 }
 
 project(*Client): strategies, rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 0f82a323a72..87178218057 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba {
 }
 
 project(*Client): rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 49d690018fd..c7a5f0c3229 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba {
 }
 
 project(*Client): rt_client {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
index 1f0077fcdd8..0c424ce42f1 100755
--- a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
+++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
@@ -60,7 +60,7 @@ $SV->Spawn ();
 for $file (@iorfiles)
 {
     $file = PerlACE::LocalFile($file);
-    if (PerlACE::waitforfile_timed ($file, 10) == -1)
+    if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         $server = $SV->TimedWait (1);
         if ($server == 2) 
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index 4cb4bcb6c23..ebf79370785 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -9,6 +9,7 @@ project(*Server): strategies, rt_server, minimum_corba {
 }
 
 project(*Client): strategies, rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
index 158192e3461..1afb4f6f967 100755
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
@@ -63,7 +63,7 @@ sub run_test
 
     for $test (@configurations)
       {
-        if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}), 10) == -1)
+        if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}),$PerlACE::wait_interval_for_process_creation ) == -1)
           {
             $server = $SV->TimedWait (1);
             if ($server == 2)
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 0f82a323a72..87178218057 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba {
 }
 
 project(*Client): rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index 81a533380b3..4d9a96b12f0 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -6,6 +6,7 @@ project(*Server): rt_server, strategies, portableserver, minimum_corba {
 }
 
 project(*Client): rt_client, strategies, portableserver, minimum_corba {
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
index bfc0b0ebaef..a58c5f6427c 100755
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
@@ -98,7 +98,7 @@ sub run_server
     $SV = new PerlACE::Process ("server", "$server_args");
     $SV->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1)
+    if (PerlACE::waitforfile_timed ($iorfile,$PerlACE::wait_interval_for_process_creation ) == -1)
     {
         check_supported_priorities ($SV);
 	print STDERR "ERROR: cannot find ior file: $iorfile\n";
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index 78e08a31786..b62ff14a3d9 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -8,6 +8,7 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 10ba9a8a48f..a77351b5090 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -8,6 +8,7 @@ project(*Server): strategies, rt_server, minimum_corba {
 }
 
 project(*Client): strategies, rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 6e1cafa833b..8921a85c6ec 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -79,7 +79,7 @@ foreach $o (@server_opts) {
 
     $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 IOR file <$iorfile>\n";
         $SV->Kill (); $SV->TimedWait (1);
         exit 1;
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index 4cb4bcb6c23..ebf79370785 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -9,6 +9,7 @@ project(*Server): strategies, rt_server, minimum_corba {
 }
 
 project(*Client): strategies, rt_client, minimum_corba {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
index df32e821eef..2dcbc7246bf 100755
--- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
+++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
@@ -72,7 +72,7 @@ $SV->Spawn ();
 
 for $test (@configurations)
 {
-    if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1)
+    if (PerlACE::waitforfile_timed ($test->{file}, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         $server = $SV->TimedWait (1);
         if ($server == 2) 
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index ecbe671a9b8..4d0d0122fc3 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -4,9 +4,13 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
+Thread_Task::Thread_Task (CORBA::ORB_ptr orb)
+ : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
 int
-Thread_Task::activate_task (CORBA::ORB_ptr orb,
-                            int thr_count)
+Thread_Task::activate_task (int thr_count)
 {
 
   ACE_TRY_NEW_ENV
@@ -21,13 +25,11 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb,
 
       active_thread_count_ = thr_count;
 
-      this->orb_ = CORBA::ORB::_duplicate (orb);
-
-      CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj
+      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -136,7 +138,7 @@ Thread_Task::svc (void)
       ACE_TRY_CHECK;
 
 
-      RTScheduling::Current::NameList* segment_name_list =
+      RTScheduling::Current::NameList_var segment_name_list =
         this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -150,7 +152,7 @@ Thread_Task::svc (void)
           {
             ACE_DEBUG ((LM_DEBUG,
                         "%s\n",
-                        (*segment_name_list)[i].in ()));
+                        static_cast<char const*>((*segment_name_list)[i])));
           }
       }
 
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h
index 56d29e51ca0..a6ae16092a1 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.h
@@ -10,9 +10,9 @@
 class Thread_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
+  Thread_Task (CORBA::ORB_ptr orb);
 
-  int activate_task (CORBA::ORB_ptr orb,
-		     int thr_count);
+  int activate_task (int thr_count);
 
   ~Thread_Task (void);
   
diff --git a/TAO/tests/RTScheduling/Current/run_test.pl b/TAO/tests/RTScheduling/Current/run_test.pl
index b8673381da4..0b4a6b57f9d 100755
--- a/TAO/tests/RTScheduling/Current/run_test.pl
+++ b/TAO/tests/RTScheduling/Current/run_test.pl
@@ -19,7 +19,7 @@ else {
 
 print STDERR "Starting Current Test\n";
 
-$test = $CL->SpawnWaitKill (10);
+$test = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index cbc7a8592ac..481fe5eaebd 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -19,11 +19,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
                                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -31,10 +31,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 
       manager->rtscheduler (&scheduler);
 
-      Thread_Task task;
+      Thread_Task task (orb.in ());
 
-      task.activate_task (orb.in (),
-                          4);
+      task.activate_task (4);
 
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 137bcc7126a..873abdd819a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -5,11 +5,14 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/SString.h"
+
+#include "tao/RTScheduling/RTSchedulerC.h"
 
 class Data
 {
  public:
-  char* data;
+  ACE_CString data;
   RTScheduling::Current_var current;
 };
 
@@ -40,29 +43,29 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
   Data* tmp = (Data*) data;
   ACE_DEBUG ((LM_DEBUG,
 	      "Test_Thread_Action::do %s\n",
-	      tmp->data));
+	      tmp->data.c_str ()));
 
   size_t count = 0;
   ACE_OS::memcpy (&count,
 		  tmp->current->id ()->get_buffer (),
 		  tmp->current->id ()->length ());
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "The spawned DT Guid is %d\n",
 	      count));
-  
-  RTScheduling::Current::NameList* segment_name_list = 
+
+  RTScheduling::Current::NameList_var segment_name_list =
     tmp->current->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "Segment Names for DT %d:\n",
 	      count));
-  
+
   for (unsigned int i = 0; i < segment_name_list->length (); i ++)
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "%s\n",
-		  CORBA::string_dup ((*segment_name_list) [i])));
+      static_cast<char const*>((*segment_name_list) [i])));
     }
 }
diff --git a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
index 6d0b579fe3b..bd859750add 100755
--- a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
+++ b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
@@ -19,7 +19,7 @@ else {
 
 print STDERR "Starting Current Test\n";
 
-$test = $CL->SpawnWaitKill (10);
+$test = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index 2f73288cd1a..bfbb4a96681 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -29,11 +29,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 			     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -41,14 +41,15 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
       ACE_NEW_RETURN (scheduler,
 		      TAO_Scheduler (orb.in ()),
 		      -1);
-  
+      RTScheduling::Scheduler_var safe_scheduler = scheduler;
+
       manager->rtscheduler (scheduler);
 
-      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      current = RTScheduling::Current::_narrow (current_obj
+      current = RTScheduling::Current::_narrow (current_obj.in ()
 						ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
@@ -101,11 +102,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
       
       //Initialize data to be passed to the Thread_Action::do method
       Data spawn_data;
-      spawn_data.data = CORBA::string_dup ("Harry Potter");
+      spawn_data.data = "Harry Potter";
       spawn_data.current = RTScheduling::Current::_duplicate (current.in ());
       
       ACE_DEBUG ((LM_DEBUG,
 		  "Spawning a new DT...\n"));
+      RTScheduling::DistributableThread_var dt =
       current->spawn (&thread_action,
 		      &spawn_data,
 		      "Chamber of Secrets",
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 31e4d368509..5e9ac4bf9e0 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -6,14 +6,16 @@
 #include "ace/Argv_Type_Converter.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
+#include "tao/IOP_IORC.h"
+
 TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_ptr current_obj =
+  CORBA::Object_var current_obj =
     orb->resolve_initial_references ("RTScheduler_Current"
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  current_ = RTScheduling::Current::_narrow (current_obj
+  current_ = RTScheduling::Current::_narrow (current_obj.in ()
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -146,23 +148,14 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  IOP::ServiceContext* serv_cxt = 0;
+  IOP::ServiceContext_var serv_cxt;
 
   ACE_TRY
     {
       serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid Service Context\n"));
-    }
-  ACE_ENDTRY;
 
-  if (serv_cxt != 0)
-    {
       size_t gu_id;
       ACE_OS::memcpy (&gu_id,
                       serv_cxt->context_data.get_buffer (),
@@ -183,6 +176,12 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 
       guid_out.ptr () = guid;
     }
+  ACE_CATCHANY
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Invalid Service Context\n"));
+    }
+  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 08e00e4c333..a9fce2cd532 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -9,6 +9,7 @@ project(*Server): rtscheduling_server {
 }
 
 project(*Client) : rtscheduling_client {
+  after += *Server
   Source_Files {
     ../Scheduler.cpp
     testC.cpp
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
index 2f3e20805c6..2e3bec9cb61 100755
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
@@ -28,7 +28,7 @@ print STDERR "Starting Server\n";
 
 $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/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 81c167219a1..a1d655029af 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -32,9 +32,9 @@ parse_args (int argc,
   return 0;
 }
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv [])
@@ -43,6 +43,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 
   CORBA::ORB_var orb;
   test_var server;
+  RTScheduling::Scheduler_var safe_scheduler;
+
   ACE_TRY_NEW_ENV
     {
 
@@ -55,17 +57,21 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
       if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return (-1);
 
-      CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
                                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_Scheduler scheduler (orb.in ());
+      TAO_Scheduler* scheduler;
+      ACE_NEW_RETURN (scheduler,
+		      TAO_Scheduler (orb.in ()),
+		      -1);
+      safe_scheduler = scheduler;
 
-      manager->rtscheduler (&scheduler);
+      manager->rtscheduler (scheduler);
 
 
       CORBA::Object_var object =
@@ -85,11 +91,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
                             1);
         }
 
-      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
                                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 34a8a5f485e..3cb3f08da75 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -116,11 +116,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
 									  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -159,11 +159,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 		  "IOR = %s\n",
 		  ior.in ()));
 
-      CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index 97b36cd3e73..f48ad2c07f4 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -29,11 +29,11 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
 
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
-      CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj
+      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -58,9 +58,9 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
   return 0;
 }
 
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
+#if defined (THREAD_CANCELLED)
 #undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
+#endif /* THREAD_CANCELLED */
 
 int
 Thread_Task::svc (void)
@@ -102,7 +102,7 @@ Thread_Task::svc (void)
 
       {
         ACE_GUARD_RETURN (ACE_Lock, ace_mon, *shutdown_lock_,-1);
-        RTScheduling::Current::NameList* name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
+        RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG,
@@ -113,7 +113,7 @@ Thread_Task::svc (void)
           {
             ACE_DEBUG ((LM_DEBUG,
                         "Scheduling Segment Name - %s\n",
-                        (*name_list) [i].in ()));
+                        static_cast<char const*>((*name_list) [i])));
           }
       }
 
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 1accc821d78..51e136dffd5 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -21,11 +21,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 			 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
 									      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -47,11 +47,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
       ACE_DEBUG ((LM_DEBUG,
 		  "Cancelling Threads.....\n"));
 
-      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
 									  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h
index eebc6831b49..ae4181971a9 100644
--- a/TAO/tests/RTScheduling/VoidData/test.h
+++ b/TAO/tests/RTScheduling/VoidData/test.h
@@ -11,7 +11,7 @@ class test_impl :public test
   {
     ACE_DEBUG ((LM_DEBUG,
 		"Void Data Passed to method %d\n",
-		(int*)something));
+		*(int*)something));
   }
 };
 
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index a23809b233b..fdfb092a483 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -18,14 +18,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_ptr foo_i;
-
-      ACE_NEW_RETURN (foo_i,
-                      test_impl,
-                      -1);
-
+      test_impl foo_i;
       int something = 28;
-      foo_i->bar ((CORBA::VoidData) &something);
+      foo_i.bar ((CORBA::VoidData) &something);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index c7d61fe00e7..2141f3040f5 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): messaging, taoexe, portableserver {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 3cc70a8306f..f8d3b4e0193 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -8,7 +8,7 @@
  *
  * @author Carlos O'Ryan
  */
-#include "bounded_value_sequence.hpp"
+#include "tao/Bounded_Value_Sequence_T.h"
 
 struct Foo
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
index 97288ba1bfb..0c250a584fe 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
@@ -8,7 +8,8 @@
  *
  * @author Carlos O'Ryan
  */
-#include "bounded_string_sequence.hpp"
+#include "tao/Bounded_String_Sequence_T.h"
+#include "tao/CORBA_String.h"
 
 CORBA::ULong const MAXIMUM = 42;
 typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence;
diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
index 293d9655ecd..b747a2264b8 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -1,13 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Unbounded_Simple_Types) : taoexe {
+project(*UB_Simple_Types) : taoexe {
   Source_Files {
     Unbounded_Simple_Types.cpp
   }
 }
 
-project(*Bounded_Simple_Types) : taoexe {
+project(*Unbounded_Octet) : taoexe {
+  Source_Files {
+    Unbounded_Octet.cpp
+  }
+}
+
+project(*B_Simple_Types) : taoexe {
   Source_Files {
     Bounded_Simple_Types.cpp
   }
@@ -25,7 +31,7 @@ project(*Bounded_String) : taoexe {
   }
 }
 
-project(*Object_Reference_Sequence_Element): taoexe, boost_unit_test_framework {
+project(*Obj_Ref_Seq_Elem): taoexe, boost_unit_test_framework {
   exename = object_reference_sequence_element_ut
   Source_Files {
     mock_reference.cpp
@@ -33,7 +39,7 @@ project(*Object_Reference_Sequence_Element): taoexe, boost_unit_test_framework {
   }
 }
 
-project(*Unbounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework {
+project(*UB_Obj_Ref_Seq): taoexe, boost_unit_test_framework {
   exename = unbounded_object_reference_sequence_ut
   Source_Files {
     mock_reference.cpp
@@ -41,7 +47,47 @@ project(*Unbounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework
   }
 }
 
-project(*Bounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework {
+project(*UB_Sequence_CDR): taoexe, boost_unit_test_framework {
+  exename = unbounded_sequence_cdr_ut
+  Source_Files {
+    mock_reference.cpp
+    unbounded_sequence_cdr_ut.cpp
+  }
+}
+
+project(*B_Sequence_CDR): taoexe, boost_unit_test_framework {
+  exename = bounded_sequence_cdr_ut
+  Source_Files {
+    mock_reference.cpp
+    bounded_sequence_cdr_ut.cpp
+  }
+}
+
+project(*UB_Fwd_Ob_Ref_Seq): taoexe, boost_unit_test_framework {
+  exename = unbounded_fwd_object_reference_sequence_ut
+  Source_Files {
+    fwd_mock_reference.cpp
+    unbounded_fwd_object_reference_sequence_ut.cpp
+  }
+}
+
+project(*UB_Octet_Sequence): taoexe, boost_unit_test_framework {
+  exename = unbounded_octet_sequence_ut
+  Source_Files {
+    mock_reference.cpp
+    unbounded_octet_sequence_ut.cpp
+  }
+}
+
+project(*UB_Oct_Seq_No_Cpy): taoexe, boost_unit_test_framework {
+  exename = unbounded_octet_sequence_no_copy_ut
+  Source_Files {
+    mock_reference.cpp
+    unbounded_octet_sequence_nocopy_ut.cpp
+  }
+}
+
+project(*B_Obj_Ref_Seq): taoexe, boost_unit_test_framework {
   exename = bounded_object_reference_sequence_ut
   Source_Files {
     mock_reference.cpp
@@ -49,42 +95,42 @@ project(*Bounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework {
   }
 }
 
-project(*String_Sequence_Element): taoexe, boost_unit_test_framework {
+project(*String_Seq_Elem): taoexe, boost_unit_test_framework {
   exename = string_sequence_element_ut
   Source_Files {
     string_sequence_element_ut.cpp
   }
 }
 
-project(*Unbounded_String_Sequence): taoexe, boost_unit_test_framework {
+project(*UB_String_Seq): taoexe, boost_unit_test_framework {
   exename = unbounded_string_sequence_ut
   Source_Files {
     unbounded_string_sequence_ut.cpp
   }
 }
 
-project(*Bounded_String_Sequence): taoexe, boost_unit_test_framework {
+project(*B_String_Seq): taoexe, boost_unit_test_framework {
   exename = bounded_string_sequence_ut
   Source_Files {
     bounded_string_sequence_ut.cpp
   }
 }
 
-project(*Testing_Allocation_Traits): taoexe, boost_unit_test_framework {
+project(*Test_Alloc_Traits): taoexe, boost_unit_test_framework {
   exename = testing_allocation_traits_ut
   Source_Files {
     testing_allocation_traits_ut.cpp
   }
 }
 
-project(*Unbounded_Value_Sequence): taoexe, boost_unit_test_framework {
+project(*UB_Value_Sequence): taoexe, boost_unit_test_framework {
   exename = unbounded_value_sequence_ut
   Source_Files {
     unbounded_value_sequence_ut.cpp
   }
 }
 
-project(*Bounded_Value_Sequence): taoexe, boost_unit_test_framework {
+project(*B_Value_Sequence): taoexe, boost_unit_test_framework {
   exename = bounded_value_sequence_ut
   Source_Files {
     bounded_value_sequence_ut.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
index 691227f5716..19741a165f2 100644
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
@@ -8,7 +8,7 @@
  *
  * @author Carlos O'Ryan
  */
-#include "unbounded_value_sequence.hpp"
+#include "tao/Unbounded_Value_Sequence_T.h"
 
 struct Foo
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
index 7e31a74c33b..246c46f7e85 100644
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp
@@ -8,7 +8,8 @@
  *
  * @author Carlos O'Ryan
  */
-#include "unbounded_string_sequence.hpp"
+#include "tao/Unbounded_String_Sequence_T.h"
+#include "tao/CORBA_String.h"
 
 typedef TAO::unbounded_string_sequence s_sequence;
 
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
index 08ddd2e618f..8225e59f89a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -99,4 +101,5 @@ private:
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_basic_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
index 4e5c4518fe8..184b8f7df6a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
@@ -14,18 +14,21 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
-template<typename object_t, CORBA::ULong MAX>
+template<typename object_t, typename object_t_var, CORBA::ULong MAX>
 class bounded_object_reference_sequence
 {
 public:
   typedef object_t object_type;
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
+  typedef object_t_var object_type_var;
 
-  typedef details::object_reference_traits<object_type,true> element_traits;
+  typedef details::object_reference_traits<object_type,object_type_var,true> element_traits;
   typedef details::bounded_reference_allocation_traits<value_type,element_traits,MAX,true> allocation_traits;
 
   typedef details::object_reference_sequence_element<element_traits> element_type;
@@ -95,4 +98,5 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
index 348334a9fd8..21a8fb14451 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
@@ -8,26 +8,26 @@
  * @author Carlos O'Ryan
  */
 #include "testing_object_reference_traits.hpp"
-#include "object_reference_traits.hpp"
+#include "tao/Object_Reference_Traits_T.h"
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
 #include "mock_reference.hpp"
 
-#include "bounded_object_reference_sequence.hpp"
+#include "tao/Bounded_Object_Reference_Sequence_T.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const TMAX = 64;
 
 struct Tester
 {
-  typedef bounded_object_reference_sequence<mock_reference,TMAX> tested_sequence;
+  typedef bounded_object_reference_sequence<mock_reference,mock_reference_var,TMAX> tested_sequence;
   typedef tested_sequence::value_type value_type;
   typedef tested_sequence::const_value_type const_value_type;
 
@@ -396,15 +396,15 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
 
   boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts.get());
+  tester->add_all(ts);
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
index 5805e84a27b..193a6657f7a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -58,4 +60,5 @@ struct bounded_reference_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
index afc33e73fb2..c42738744bc 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
@@ -12,6 +12,8 @@
 
 #include "bounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,4 +37,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
index b3c14646fd1..e493adadce1 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
@@ -8,14 +8,15 @@
  * @author Carlos O'Ryan
  */
 #define TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE \
-        "testing_range_checking.hpp"
+        "tests/Sequence_Unit_Tests/testing_range_checking.hpp"
 
 #include "testing_string_traits.hpp"
-#include "string_traits.hpp"
+#include "tao/String_Traits_T.h"
 #include "testing_allocation_traits.hpp"
 
-#include "bounded_string_sequence.hpp"
-#include "bounded_wstring_sequence.hpp"
+#include "tao/Bounded_String_Sequence_T.h"
+#include "tao/Bounded_Wstring_Sequence_T.h"
+#include "tao/CORBA_String.h"
 
 #include "string_sequence_tester.hpp"
 
@@ -28,7 +29,7 @@
 #include <sstream>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -89,6 +90,30 @@ struct Tester
     BOOST_CHECK(helper::compare(16, a[3]));
   }
 
+  void test_regression_2201()
+  {
+    value_type * buffer = alloc_and_init_buffer();
+    expected_calls a(tested_allocation_traits::allocbuf_calls);
+    expected_calls f(tested_allocation_traits::freebuf_calls);
+    expected_calls r(tested_element_traits::release_calls);
+    {
+      tested_sequence a(4, buffer);
+      BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK_EQUAL(buffer, a.get_buffer());
+      BOOST_CHECK_EQUAL(false, a.release());
+      a.length (3);
+      BOOST_CHECK_EQUAL(CORBA::ULong(3), a.length());
+      a.length (4);
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK(helper::compare_empty(a[3]));
+    }
+    BOOST_CHECK_MESSAGE(a.expect(0), a);
+    BOOST_CHECK_MESSAGE(f.expect(0), f);
+    tested_sequence::freebuf(buffer);
+    BOOST_CHECK_MESSAGE(r.expect(MAXIMUM), r);
+  }
+
   void test_buffer_constructor_default()
   {
     value_type * buffer = alloc_and_init_buffer();
@@ -244,7 +269,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(4, buffer, false);
-    BOOST_CHECK_EQUAL(static_cast<value_type*>(0), a.get_buffer(true));
+    BOOST_CHECK(0 == a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -262,6 +287,7 @@ struct Tester
       BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), b.maximum());
       BOOST_CHECK_EQUAL(CORBA::ULong(0), b.length());
       BOOST_CHECK(0 != b.get_buffer());
+      BOOST_CHECK_EQUAL(true, b.release());
 
       BOOST_CHECK_MESSAGE(c.expect(0), c);
 
@@ -292,6 +318,10 @@ struct Tester
                 shared_this));
 
     ts->add(BOOST_CLASS_TEST_CASE(
+                &Tester::test_regression_2201,
+                shared_this));
+
+    ts->add(BOOST_CLASS_TEST_CASE(
                 &Tester::test_buffer_constructor_default,
                 shared_this));
     ts->add(BOOST_CLASS_TEST_CASE(
@@ -338,25 +368,25 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("bounded string sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("bounded string sequence unit test");
 
   {
     typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence;
     typedef Tester<s_sequence> nTester;
     boost::shared_ptr<nTester> tester(nTester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     typedef TAO::bounded_wstring_sequence<MAXIMUM> w_sequence;
     typedef Tester<w_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
-  return ts.release();
+  return ts;
 }
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
index 00beac8a06b..e7727f449de 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -53,4 +55,5 @@ struct bounded_value_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_value_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
index 8f02e5df604..994122e22ce 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
@@ -1,5 +1,5 @@
-#ifndef guard_unbounded_value_sequence_hpp
-#define guard_unbounded_value_sequence_hpp
+#ifndef guard_bounded_value_sequence_hpp
+#define guard_bounded_value_sequence_hpp
 /**
  * @file
  *
@@ -15,6 +15,8 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -22,9 +24,8 @@ template<class T, CORBA::ULong MAX>
 class bounded_value_sequence
 {
 public:
-  // static CORBA::ULong const MAXIMUM = MAX;
-
   typedef T value_type;
+  typedef T element_type;
   typedef T const const_value_type;
 
   typedef details::bounded_value_allocation_traits<value_type,MAX,true> allocation_traits;
@@ -92,4 +93,6 @@ private:
 
 } // namespace TAO
 
-#endif // guard_unbounded_string_sequence_hpp
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
index 4cfa00aa292..c2aea535717 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
@@ -11,7 +11,7 @@
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#include "bounded_value_sequence.hpp"
+#include "tao/Bounded_Value_Sequence_T.h"
 
 #include "value_sequence_tester.hpp"
 
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -64,6 +64,35 @@ struct Tester
     return buf;
   }
 
+  void test_regression_2201 ()
+  {
+    value_type * buffer = alloc_and_init_buffer();
+
+    expected_calls a(tested_allocation_traits::allocbuf_calls);
+    expected_calls f(tested_allocation_traits::freebuf_calls);
+    {
+      tested_sequence a(32, buffer);
+      BOOST_CHECK_EQUAL(CORBA::ULong(32), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(32), a.length());
+      BOOST_CHECK_EQUAL(buffer, a.get_buffer());
+      BOOST_CHECK_EQUAL(int( 1), a[0]);
+      BOOST_CHECK_EQUAL(int( 4), a[1]);
+      BOOST_CHECK_EQUAL(int( 9), a[2]);
+      BOOST_CHECK_EQUAL(int(16), a[3]);
+      BOOST_CHECK_EQUAL(false, a.release());
+      a.length (3);
+      BOOST_CHECK_EQUAL(CORBA::ULong(32), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(3), a.length());
+      a.length (4);
+      BOOST_CHECK_EQUAL(CORBA::ULong(32), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK_EQUAL(int( 0), a[3]);
+    }
+    BOOST_CHECK_MESSAGE(a.expect(0), a);
+    BOOST_CHECK_MESSAGE(f.expect(0), f);
+    tested_sequence::freebuf(buffer);
+  }
+
   void test_buffer_constructor_default()
   {
     value_type * buffer = alloc_and_init_buffer();
@@ -222,7 +251,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(4, buffer, false);
-    BOOST_CHECK_EQUAL(static_cast<int*>(0), a.get_buffer(true));
+    BOOST_CHECK(0 == a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -239,6 +268,7 @@ struct Tester
       BOOST_CHECK_EQUAL(MAXIMUM, b.maximum());
       BOOST_CHECK_EQUAL(0UL, b.length());
       BOOST_CHECK(0 != b.get_buffer());
+      BOOST_CHECK_EQUAL(true, b.release());
 
       BOOST_CHECK_MESSAGE(c.expect(1), c);
 
@@ -261,6 +291,10 @@ struct Tester
                 shared_this));
 
     ts->add(BOOST_CLASS_TEST_CASE(
+                &Tester::test_regression_2201,
+                shared_this));
+
+    ts->add(BOOST_CLASS_TEST_CASE(
                 &Tester::test_buffer_constructor_default,
                 shared_this));
     ts->add(BOOST_CLASS_TEST_CASE(
@@ -304,23 +338,23 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("unbounded value sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("unbounded value sequence unit test");
 
   {
     boost::shared_ptr<Tester> tester(Tester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     typedef value_sequence_tester<tested_sequence,tested_allocation_traits> common;
     boost::shared_ptr<common> tester(common::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
index f83938ce0d3..8fff36ae5ea 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
@@ -10,8 +10,11 @@
  * @author Carlos O'Ryan
  */
 
+
 #include "bounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
index ecf6a102d06..a5b933f9855 100644
--- a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
@@ -22,7 +22,7 @@
  *
  * Oh, and let us not forget the type that the sequences encapsulates.
  *
- * The intent is not for sequences to simply derive or intantiate this
+ * The intent is not for sequences to simply derive or instantiate this
  * type.  Instead, different each sequence type is written using
  * composition.  They instantiate a generic sequence with the correct
  * traits, and implement the adapt the generic sequence interface to
@@ -60,6 +60,8 @@
 
 #include <algorithm>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -257,4 +259,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_generic_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
index 4c72a54f449..5d697c71205 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
@@ -7,8 +7,13 @@
  */
 #include "mock_reference.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 call_counter mock_reference::duplicate_calls;
 call_counter mock_reference::release_calls;
+call_counter mock_reference::serialize_calls;
+call_counter mock_reference::deserialize_calls;
+call_counter mock_reference::marshal_calls;
 
 mock_reference::
 ~mock_reference()
@@ -49,3 +54,48 @@ void CORBA::release(mock_reference * r)
 {
   mock_reference::_tao_release(r);
 }
+
+mock_reference *
+TAO::Objref_Traits<mock_reference>::duplicate (
+    mock_reference_ptr p
+  )
+{
+  return mock_reference::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<mock_reference>::release (
+    mock_reference_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+mock_reference_ptr
+TAO::Objref_Traits<mock_reference>::nil (void)
+{
+  return mock_reference::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<mock_reference>::marshal (
+    const mock_reference_ptr,
+    TAO_OutputCDR &
+  )
+{
+  mock_reference::marshal_calls ();
+  return true;
+}
+
+CORBA::Boolean operator<< (TAO_OutputCDR &, const mock_reference *)
+{
+  mock_reference::serialize_calls ();
+  return true;
+}
+CORBA::Boolean operator>> (TAO_InputCDR &, mock_reference *&)
+{
+  mock_reference::deserialize_calls ();
+  return true;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
index d0583ca6843..0c2a4c21ecf 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
@@ -14,6 +14,9 @@
 
 #include "testing_counters.hpp"
 
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Forward declare the class a CORBA::release function for it.  That
 // avoids having to introduce CORBA::Object into the tests.
 // Ideally the T_var and T_out types should accept mock objects
@@ -24,11 +27,20 @@ namespace CORBA
 void release(mock_reference*);
 }
 
-#include "tao/Pseudo_VarOut_T.h"
+class mock_stream;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include "tao/Objref_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+typedef mock_reference *mock_reference_ptr;
+typedef TAO_Objref_Var_T<mock_reference> mock_reference_var;
+typedef TAO_Objref_Out_T<mock_reference> mock_reference_out;
 
 /**
- * @class
+ * @class mock_reference
  *
  * @brief Implement a concrete class with the right interface for an
  *        object reference.
@@ -38,8 +50,8 @@ class mock_reference
 public:
   virtual ~mock_reference();
 
-  typedef TAO_Pseudo_Var_T<mock_reference> _var_type;
-  typedef TAO_Pseudo_Out_T<mock_reference,_var_type> _out_type;
+  typedef mock_reference_var _var_type;
+  typedef mock_reference_out _out_type;
 
   static mock_reference * allocate(int id);
   static mock_reference * _nil();
@@ -48,6 +60,9 @@ public:
   static mock_reference * _duplicate(mock_reference * rhs);
   static call_counter release_calls;
   static void _tao_release(mock_reference * rhs);
+  static call_counter serialize_calls;
+  static call_counter deserialize_calls;
+  static call_counter marshal_calls;
 
   inline bool operator==(mock_reference const & rhs) const
   {
@@ -65,6 +80,8 @@ public:
   }
 
 private:
+  mock_reference ();
+
   inline mock_reference(int id)
     : id_(id)
   {}
@@ -73,8 +90,20 @@ private:
   int id_;
 };
 
-typedef mock_reference * mock_reference_ptr;
-typedef mock_reference::_var_type mock_reference_var;
-typedef mock_reference::_out_type mock_reference_out;
+CORBA::Boolean operator<< (TAO_OutputCDR &, const mock_reference *);
+CORBA::Boolean operator>> (TAO_InputCDR &, mock_reference *&);
+
+namespace TAO
+{
+  template<>
+  struct Objref_Traits< mock_reference>
+  {
+    static mock_reference_ptr duplicate (mock_reference_ptr);
+    static void release (mock_reference_ptr);
+    static mock_reference_ptr nil (void);
+    static CORBA::Boolean marshal (const mock_reference_ptr p, TAO_OutputCDR & cdr);
+  };
+}
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_mock_reference_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
new file mode 100644
index 00000000000..e5437a1a51e
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
@@ -0,0 +1,35 @@
+/**
+ * @file
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@atdesk.com>
+ */
+#include "mock_stream.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+call_counter mock_stream::serialize_calls;
+call_counter mock_stream::deserialize_calls;
+
+mock_stream::
+~mock_stream()
+{
+}
+
+CORBA::ULong
+mock_stream::length () const
+{
+  return 100;
+}
+
+CORBA::Boolean operator<< (mock_stream &, const CORBA::ULong)
+{
+  return true;
+}
+CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &)
+{
+  return true;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
new file mode 100644
index 00000000000..8bd2ef1a5d1
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
@@ -0,0 +1,40 @@
+#ifndef guard_mock_stream_hpp
+#define guard_mock_stream_hpp
+/**
+ * @file
+ *
+ * @brief Mock an stream
+ *
+ * $Id$
+ *
+ * @author Johnny Willemsen
+ */
+#include "ace/config-all.h"
+
+#include "testing_counters.hpp"
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class mock_stream
+ *
+ * @brief Implement a concrete class with the right interface for a stream.
+ */
+class mock_stream
+{
+public:
+  ~mock_stream();
+
+  CORBA::ULong length () const;
+
+  static call_counter serialize_calls;
+  static call_counter deserialize_calls;
+};
+
+CORBA::Boolean operator<< (mock_stream &, const CORBA::ULong);
+CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_mock_stream_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
index f99bf34c37d..ec6a58ad65e 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
@@ -12,6 +12,8 @@
  */
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -120,4 +122,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_object_reference_sequence_element_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
index c509972baed..20cfafac6ea 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
@@ -10,7 +10,7 @@
  */
 #include "testing_object_reference_traits.hpp"
 #include "mock_reference.hpp"
-#include "object_reference_sequence_element.hpp"
+#include "tao/Object_Reference_Sequence_Element_T.h"
 
 #include <sstream>
 #include <stdexcept>
@@ -20,13 +20,13 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
 struct Tester
 {
-  typedef object_reference_traits<mock_reference,true> tested_element_traits;
+  typedef object_reference_traits<mock_reference,mock_reference_var,true> tested_element_traits;
   typedef object_reference_sequence_element<tested_element_traits> tested_element;
   typedef mock_reference * reference_type;
   typedef tested_element_traits::object_type_var reference_var;
@@ -58,7 +58,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(1), r);
       BOOST_CHECK_MESSAGE(mr.expect(1), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -94,7 +94,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(2), r);
       BOOST_CHECK_MESSAGE(mr.expect(2), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -131,7 +131,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(1), r);
       BOOST_CHECK_MESSAGE(mr.expect(1), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -168,7 +168,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(2), r);
       BOOST_CHECK_MESSAGE(mr.expect(2), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -207,7 +207,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(3), r);
       BOOST_CHECK_MESSAGE(mr.expect(3), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -242,7 +242,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(1), r);
       BOOST_CHECK_MESSAGE(mr.expect(1), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -279,7 +279,7 @@ struct Tester
       BOOST_CHECK_MESSAGE(r.expect(2), r);
       BOOST_CHECK_MESSAGE(mr.expect(2), mr);
     }
-    
+
     BOOST_CHECK_MESSAGE(d.expect(0), d);
     BOOST_CHECK_MESSAGE(r.expect(0), r);
     BOOST_CHECK_MESSAGE(md.expect(0), md);
@@ -327,16 +327,16 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("object reference sequence element unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("object reference sequence element unit test");
 
   boost::shared_ptr<Tester > mock_reference_tester(
       Tester::allocate());
-  mock_reference_tester->add_all(ts.get());
+  mock_reference_tester->add_all(ts);
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
index 0075f4a1ff3..780a530ea00 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
@@ -4,7 +4,7 @@
  * @file
  *
  * @brief Implement the element manipulation traits for object
- *        reference types. 
+ *        reference types.
  *
  * $Id$
  *
@@ -15,19 +15,20 @@
 #include <algorithm>
 #include <functional>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
 {
 
-template<class object_t, class derived>
+template<class object_t, class object_t_var, class derived>
 struct object_reference_traits_decorator
 {
   typedef object_t object_type;
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
-
-  typedef typename object_type::_var_type object_type_var;
+  typedef object_t_var object_type_var;
 
   inline static void zero_range(
       object_type ** begin, object_type ** end)
@@ -63,14 +64,21 @@ struct object_reference_traits_decorator
   }
 };
 
-template<typename object_t, bool dummy>
+template<typename object_t, typename object_t_var, bool dummy>
 struct object_reference_traits
-  : public object_reference_traits_base<object_t>
-  , public object_reference_traits_decorator<object_t, object_reference_traits<object_t,dummy> >
+  : public object_reference_traits_base<object_t, object_t_var>
+  , public object_reference_traits_decorator<object_t, object_t_var, object_reference_traits<object_t,object_t_var,dummy> >
 {
+#if defined __BORLANDC__ && __BORLANDC__ < 0x580
+  typedef object_t object_type;
+  typedef object_type * value_type;
+  typedef object_type const * const_value_type;
+  typedef object_t_var object_type_var;
+#endif
 };
 
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_object_reference_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
index a05b224f327..b048719abc5 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
@@ -1,5 +1,5 @@
-#ifndef guard_string_traits_base_hpp
-#define guard_string_traits_base_hpp
+#ifndef object_reference_traits_base_hpp
+#define object_reference_traits_base_hpp
 /**
  * @file
  *
@@ -10,33 +10,36 @@
  * @author Carlos O'Ryan
  */
 
+#include "tao/Objref_VarOut_T.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
 {
 
-template<typename object_t>
+template<typename object_t, typename object_t_var>
 struct object_reference_traits_base
 {
   typedef object_t object_type;
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
-
-  typedef typename object_type::_var_type object_type_var;
+  typedef object_t_var object_type_var;
 
   inline static void release(object_type * object)
   {
-    object_type::_tao_release(object);
+    TAO::Objref_Traits<object_type>::release(object);
   }
 
   inline static object_type * duplicate(object_type * object)
   {
-    return object_type::_duplicate(object);
+    return TAO::Objref_Traits<object_type>::duplicate(object);
   }
 
   inline static object_type * nil()
   {
-    return object_type::_nil();
+    return TAO::Objref_Traits<object_type>::nil();
   }
 
   inline static object_type * default_initializer()
@@ -48,4 +51,5 @@ struct object_reference_traits_base
 } // namespace details
 } // namespace TAO
 
-#endif // guard_string_traits_base_hpp
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // object_reference_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
index 1d73739ea70..85a71af0abc 100644
--- a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
@@ -13,13 +13,15 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
 {
 
 /**
- * @struct
+ * @struct range_checking
  *
  * @brief Configurable traits to tradeoff safety vs. performance in
  *        the implementation of TAO sequences.
@@ -89,7 +91,7 @@ namespace details
  * };
  * </PRE>
  *
- * 
+ *
  *
  * @todo There is no control on a per-sequence type basis, only on a
  *       per-underlying type basis, for example, the following two IDL
@@ -139,6 +141,7 @@ struct range_checking
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #if defined(TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE)
 #  include TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE
 #endif // TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE
diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl
index 5e408d66ef2..d83f2c3e4af 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -12,14 +12,21 @@ use strict;
 my $final_result = 0;
 
 my @tests = qw(unbounded_value_sequence_ut
+               unbounded_array_sequence_ut
                bounded_value_sequence_ut
                string_sequence_element_ut
                unbounded_string_sequence_ut
                bounded_string_sequence_ut
                testing_allocation_traits_ut
+               unbounded_octet_sequence_ut
+               unbounded_octet_sequence_no_copy_ut
                object_reference_sequence_element_ut
                unbounded_object_reference_sequence_ut
+               unbounded_fwd_object_reference_sequence_ut
                bounded_object_reference_sequence_ut
+               bounded_sequence_cdr_ut
+               unbounded_sequence_cdr_ut
+               Unbounded_Octet
                Unbounded_Simple_Types
                Bounded_Simple_Types
                Unbounded_String
@@ -57,7 +64,7 @@ foreach my $process (@tests) {
     $final_result = 1;
     next;
   }
-  $result = $P->WaitKill(30);
+  $result = $P->WaitKill(10);
   if ($result != 0) {
     print "FAILED\n";
     $final_result = 1;
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
index 5ccac25610c..9ce72bb0ece 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -117,4 +119,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_sequence_element_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
index 229cdf36d1f..3bf93b550e4 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
@@ -9,7 +9,9 @@
  * @author Carlos O'Ryan
  */
 #include "testing_string_traits.hpp"
-#include "string_sequence_element.hpp"
+#include "tao/String_Sequence_Element_T.h"
+#include "tao/String_Manager_T.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -21,7 +23,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -381,20 +383,20 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("string sequence element unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("string sequence element unit test");
 
   boost::shared_ptr<Tester<char> > char_tester(
       Tester<char>::allocate());
-  char_tester->add_all(ts.get());
+  char_tester->add_all(ts);
 
   boost::shared_ptr<Tester<CORBA::WChar> > wchar_tester(
       Tester<CORBA::WChar>::allocate());
-  wchar_tester->add_all(ts.get());
+  wchar_tester->add_all(ts);
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
index 8bc22239642..1e6227eb22f 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp
@@ -9,7 +9,7 @@
  *
  * @author Carlos O'Ryan
  */
-#include "string_traits.hpp"
+#include "tao/String_Traits_T.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
index 143b4948d15..71d4f2fb7b6 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <functional>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -70,4 +72,5 @@ struct string_traits
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
index b6a1e0be936..7f1c8936207 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
@@ -14,64 +14,67 @@
 #include "tao/CORBA_String.h"
 #include "tao/Managed_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
-namespace details
-{
+  namespace details
+  {
 
-template<typename charT>
-struct string_traits_base
-{
-};
+    template<typename charT>
+    struct string_traits_base
+    {
+    };
 
-template<>
-struct string_traits_base<char>
-{
-  typedef char char_type;
-  typedef CORBA::String_var string_var;
-  typedef TAO_String_Manager string_mgr;
+    template<>
+    struct string_traits_base<char>
+    {
+      typedef char char_type;
+      typedef CORBA::String_var string_var;
+      typedef TAO_String_Manager string_mgr;
 
-  inline static char_type * default_initializer()
-  {
-    return CORBA::string_dup("");
-  }
+      inline static char_type * default_initializer()
+      {
+        return CORBA::string_dup("");
+      }
 
-  inline static char_type * duplicate(char_type const * s)
-  {
-    return CORBA::string_dup(s);
-  }
+      inline static char_type * duplicate(char_type const * s)
+      {
+        return CORBA::string_dup(s);
+      }
 
-  inline static void release(char_type * s)
-  {
-    CORBA::string_free(s);
-  }
-};
+      inline static void release(char_type * s)
+      {
+        CORBA::string_free(s);
+      }
+    };
 
-template<>
-struct string_traits_base<CORBA::WChar>
-{
-  typedef CORBA::WChar char_type;
-  typedef CORBA::WString_var string_var;
-  typedef TAO_WString_Manager string_mgr;
+    template<>
+    struct string_traits_base<CORBA::WChar>
+    {
+      typedef CORBA::WChar char_type;
+      typedef CORBA::WString_var string_var;
+      typedef TAO_WString_Manager string_mgr;
 
-  inline static char_type * default_initializer()
-  {
-    static CORBA::WChar empty[] = { 0 };
-    return CORBA::wstring_dup(empty);
-  }
+      inline static char_type * default_initializer()
+      {
+        static CORBA::WChar empty[] = { 0 };
+        return CORBA::wstring_dup(empty);
+      }
 
-  inline static char_type * duplicate(char_type const * s)
-  {
-    return CORBA::wstring_dup(s);
-  }
+      inline static char_type * duplicate(char_type const * s)
+      {
+        return CORBA::wstring_dup(s);
+      }
 
-  inline static void release(char_type * s)
-  {
-    CORBA::wstring_free(s);
-  }
-};
+      inline static void release(char_type * s)
+      {
+        CORBA::wstring_free(s);
+      }
+    };
 
-} // namespace details
+  } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
index 2c771853502..57d3cb859f7 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
@@ -11,10 +11,10 @@
  * @author Carlos O'Ryan
  */
 
-#include "unbounded_value_allocation_traits.hpp"
-#include "bounded_value_allocation_traits.hpp"
-#include "unbounded_reference_allocation_traits.hpp"
-#include "bounded_reference_allocation_traits.hpp"
+#include "tao/Unbounded_Value_Allocation_Traits_T.h"
+#include "tao/Bounded_Value_Allocation_Traits_T.h"
+#include "tao/Unbounded_Reference_Allocation_Traits_T.h"
+#include "tao/Bounded_Reference_Allocation_Traits_T.h"
 #include "testing_exception.hpp"
 #include "testing_counters.hpp"
 
@@ -54,6 +54,7 @@ testing_allocation_traits<T,base>::freebuf_calls;
 template<typename T, class base> call_counter
 testing_allocation_traits<T,base>::default_buffer_allocation_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -85,5 +86,6 @@ struct bounded_reference_allocation_traits<T,reference_traits,MAX,true>
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
index f74c9b81809..de4426c4f16 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
@@ -17,7 +17,7 @@
 try { statement; } catch(...) { \
   BOOST_ERROR("unexpected exception raised"); }
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -172,30 +172,30 @@ private:
 
 struct Foo { int y; };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("testing allocation traits unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("testing allocation traits unit test");
 
   {
     boost::shared_ptr<Tester<int> > tester(
         Tester<int>::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     boost::shared_ptr<Tester<Foo> > tester(
         Tester<Foo>::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     boost::shared_ptr<Tester<char*> > tester(
         Tester<char*>::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
index 6abe33f9dc0..043c85ad06a 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
@@ -4,7 +4,7 @@
  * @file
  *
  * @brief Specialize the object reference traits so they can be used
- *        in testing. 
+ *        in testing.
  *
  * $Id$
  *
@@ -13,20 +13,20 @@
 
 #include "testing_exception.hpp"
 #include "testing_counters.hpp"
-#include "object_reference_traits.hpp"
+#include "tao/Object_Reference_Traits_T.h"
 
-template<typename object_t>
+template<typename object_t, typename object_t_var>
 struct testing_object_reference_traits
-  : public TAO::details::object_reference_traits_base<object_t>
-  , public TAO::details::object_reference_traits_decorator<object_t, testing_object_reference_traits<object_t> >
+  : public TAO::details::object_reference_traits_base<object_t, object_t_var>
+  , public TAO::details::object_reference_traits_decorator<object_t, object_t_var, testing_object_reference_traits<object_t, object_t_var> >
 {
   static call_counter default_initializer_calls;
   static call_counter duplicate_calls;
   static call_counter release_calls;
 
   typedef object_t object_type;
-  typedef typename object_type::_var_type object_type_var;
-  typedef TAO::details::object_reference_traits<object_t,false> real_traits;
+  typedef object_t_var object_type_var;
+  typedef TAO::details::object_reference_traits<object_t,object_t_var,false> real_traits;
 
   static object_type * default_initializer()
   {
@@ -47,27 +47,29 @@ struct testing_object_reference_traits
   }
 };
 
-template<typename object_t> call_counter
-testing_object_reference_traits<object_t>::default_initializer_calls;
+template<typename object_t,typename object_t_var> call_counter
+testing_object_reference_traits<object_t,object_t_var>::default_initializer_calls;
 
-template<typename object_t> call_counter
-testing_object_reference_traits<object_t>::duplicate_calls;
+template<typename object_t,typename object_t_var> call_counter
+testing_object_reference_traits<object_t,object_t_var>::duplicate_calls;
 
-template<typename object_t> call_counter
-testing_object_reference_traits<object_t>::release_calls;
+template<typename object_t,typename object_t_var> call_counter
+testing_object_reference_traits<object_t,object_t_var>::release_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
 {
 
-template<typename object_t>
-struct object_reference_traits<object_t,true>
-  : public testing_object_reference_traits<object_t>
+template<typename object_t, typename object_t_var>
+struct object_reference_traits<object_t,object_t_var,true>
+  : public testing_object_reference_traits<object_t,object_t_var>
 {
 };
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_object_reference_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
index 3588260dafe..4017b294901 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
@@ -11,7 +11,7 @@
  * @author Carlos O'Ryan
  */
 
-#include "range_checking.hpp"
+#include "tao/Range_Checking_T.h"
 
 #include <sstream>
 #include <stdexcept>
@@ -53,6 +53,7 @@ struct testing_range_checking
   }
 };
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -67,4 +68,5 @@ struct range_checking<T,true>
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_testing_range_checking_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
index ec9a1222218..0c316da6dc3 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
@@ -11,7 +11,7 @@
  */
 
 #include "testing_exception.hpp"
-#include "string_traits.hpp"
+#include "tao/String_Traits_T.h"
 #include "testing_counters.hpp"
 
 template<typename charT>
@@ -76,6 +76,7 @@ testing_string_traits<charT>::not_released_from_const_calls;
 template<typename charT> call_counter
 testing_string_traits<charT>::not_released_from_managed_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -95,5 +96,6 @@ struct string_traits<CORBA::WChar,true>
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_string_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
index 4caf7ce4f39..b8e2191d860 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -102,4 +104,5 @@ private:
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_basic_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
index 23ebd2c28b1..4d095a7b9e8 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
@@ -14,10 +14,12 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
-template<typename object_t>
+template<typename object_t, typename object_t_var>
 class unbounded_object_reference_sequence
 {
 public:
@@ -25,7 +27,7 @@ public:
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
 
-  typedef details::object_reference_traits<object_type,true> element_traits;
+  typedef details::object_reference_traits<object_type,object_t_var,true> element_traits;
   typedef details::unbounded_reference_allocation_traits<value_type,element_traits,true> allocation_traits;
 
   typedef details::object_reference_sequence_element<element_traits> element_type;
@@ -99,4 +101,5 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
index 9ed96956648..7d02abdde69 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
@@ -8,24 +8,24 @@
  * @author Carlos O'Ryan
  */
 #include "testing_object_reference_traits.hpp"
-#include "object_reference_traits.hpp"
+#include "tao/Object_Reference_Traits_T.h"
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
 #include "mock_reference.hpp"
 
-#include "unbounded_object_reference_sequence.hpp"
+#include "tao/Unbounded_Object_Reference_Sequence_T.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 struct Tester
 {
-  typedef unbounded_object_reference_sequence<mock_reference> tested_sequence;
+  typedef unbounded_object_reference_sequence<mock_reference, mock_reference_var> tested_sequence;
   typedef tested_sequence::value_type value_type;
   typedef tested_sequence::const_value_type const_value_type;
 
@@ -505,15 +505,15 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
 
   boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts.get());
+  tester->add_all(ts);
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
new file mode 100644
index 00000000000..043f24add9a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
@@ -0,0 +1,284 @@
+#ifndef guard_unbounded_octet_sequence_hpp
+#define guard_unbounded_octet_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement octet sequences
+ *
+ * $Id$
+ *
+ * @author Johnny Willemsen
+ */
+#include "tao/orbconf.h"
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+
+#include "unbounded_value_allocation_traits.hpp"
+#include "value_traits.hpp"
+#include "unbounded_value_sequence.hpp"
+#include "range_checking.hpp"
+
+#include "tao/Basic_Types.h"
+#include "ace/Message_Block.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+template<>
+class unbounded_value_sequence<CORBA::Octet>
+{
+public:
+  typedef CORBA::Octet value_type;
+  typedef CORBA::Octet element_type;
+  typedef CORBA::Octet const const_value_type;
+
+  typedef details::unbounded_value_allocation_traits<value_type,true> allocation_traits;
+  typedef details::value_traits<value_type,true> element_traits;
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+  typedef details::range_checking<value_type,true> range;
+
+  inline unbounded_value_sequence<CORBA::Octet>()
+    : maximum_ (allocation_traits::default_maximum())
+    , length_ (0)
+    , buffer_ (allocation_traits::default_buffer_allocation())
+    , release_ (true)
+    , mb_ (0)
+  {}
+  inline explicit unbounded_value_sequence<CORBA::Octet>(CORBA::ULong maximum)
+    : maximum_(maximum)
+    , length_(0)
+    , buffer_(allocbuf(maximum_))
+    , release_(true)
+    , mb_ (0)
+  {}
+  inline unbounded_value_sequence<CORBA::Octet>(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : maximum_ (maximum),
+      length_ (length),
+      buffer_ (data),
+      release_ (release),
+      mb_ (0)
+  {}
+  inline ~unbounded_value_sequence<CORBA::Octet>() {
+    if (mb_)
+      ACE_Message_Block::release (mb_);
+    if (release_)
+      freebuf(buffer_);
+  }
+  /// Create a sequence of octets from a single message block (i.e. it
+  /// ignores any chaining in the meesage block).
+  inline unbounded_value_sequence<CORBA::Octet> (CORBA::ULong length,
+                                                 const ACE_Message_Block* mb)
+    : maximum_ (length)
+    , length_ (length)
+    , buffer_ (reinterpret_cast <CORBA::Octet *>(mb->rd_ptr ()))
+    , release_ (false)
+    ,  mb_(0) {
+    // Get the message block flags.
+    ACE_Message_Block::Message_Flags flg = mb->self_flags ();
+
+    // If the DONT_DELETE flag is disabled just a duplicate would
+    // help. If the DONT_DELETE flag is enabled a deep copy is needed as
+    // the contents would be on stack. Just incrementing the ref count
+    // on the stack based data block would only crash the program when
+    // the stack unwinds
+    if (ACE_BIT_DISABLED (flg,
+                          ACE_Message_Block::DONT_DELETE))
+      {
+        this->mb_ = ACE_Message_Block::duplicate (mb);
+      }
+    else
+      {
+        // As we are in CORBA mode, all the data blocks would be aligned
+        // on an 8 byte boundary
+        ACE_Message_Block msgb (*mb,
+                                ACE_CDR::MAX_ALIGNMENT);
+
+        // Get the base pointer of the incoming message block
+        char *start = ACE_ptr_align_binary (mb->base (),
+                                            ACE_CDR::MAX_ALIGNMENT);
+
+        // Get the read and write displacements in the incoming stream
+        size_t rd_pos = mb->rd_ptr () - start;
+        size_t wr_pos = mb->wr_ptr () - start;
+
+        this->mb_ = ACE_Message_Block::duplicate (&msgb);
+
+        this->mb_->rd_ptr (rd_pos);
+        this->mb_->wr_ptr (wr_pos);
+      }
+  }
+  inline CORBA::ULong maximum() const {
+    return maximum_;
+  }
+  inline CORBA::Boolean release() const {
+    return release_;
+  }
+  inline CORBA::ULong length() const {
+    return length_;
+  }
+  inline void length(CORBA::ULong length) {
+    if (length <= maximum_ || length <= length_)
+    {
+      if (length_ < length)
+      {
+        // TODO This code does not provide the strong-exception
+        //      guarantee, but it does provide the weak-exception
+        //      guarantee.  The problem would appear when
+        //      initialize_range() raises an exception after several
+        //      elements have been modified.  One could argue that
+        //      this problem is irrelevant, as the elements already
+        //      modified are unreachable to conforming applications.
+        element_traits::initialize_range(
+            buffer_ + length_, buffer_ + length);
+      }
+      length_ = length;
+      return;
+    }
+
+    unbounded_value_sequence<CORBA::Octet> tmp(length);
+    tmp.length_ = length;
+    element_traits::copy_range(
+        buffer_, buffer_ + length_, tmp.buffer_);
+    element_traits::initialize_range(
+        tmp.buffer_ + length_, tmp.buffer_ + length);
+    swap(tmp);
+  }
+  inline value_type const & operator[](CORBA::ULong i) const {
+    range::check(i, length_, maximum_, "operator[]() const");
+    return buffer_[i];
+  }
+  inline value_type & operator[](CORBA::ULong i) {
+    range::check(i, length_, maximum_, "operator[]() non-const");
+    return buffer_[i];
+  }
+  inline void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    unbounded_value_sequence<CORBA::Octet> tmp(maximum, length, data, release);
+    swap(tmp);
+  }
+  inline value_type const * get_buffer() const {
+    if (buffer_ == 0)
+      {
+        buffer_ = allocbuf(maximum_);
+      }
+    return buffer_;
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    if (orphan && !release_)
+    {
+      return 0;
+    }
+    if (buffer_ == 0)
+    {
+      buffer_ = allocbuf(maximum_);
+    }
+    if (!orphan)
+    {
+      return buffer_;
+    }
+
+    unbounded_value_sequence<CORBA::Octet> tmp;
+    swap(tmp);
+    tmp.release_ = false;
+
+    return tmp.buffer_;
+  }
+  inline void swap(unbounded_value_sequence & rhs) throw() {
+    std::swap (mb_, rhs.mb_);
+    std::swap (maximum_, rhs.maximum_);
+    std::swap (length_, rhs.length_);
+    std::swap (buffer_, rhs.buffer_);
+    std::swap (release_, rhs.release_);
+  }
+  static value_type * allocbuf(CORBA::ULong maximum) {
+    return allocation_traits::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer) {
+    allocation_traits::freebuf(buffer);
+  }
+
+  /// Returns the underlying message block, the caller must *not*
+  /// release the copy.
+  inline ACE_Message_Block* mb (void) const {
+    return mb_;
+  }
+
+  /// Replaces the current buffer with <mb>, using only <length> bytes.
+  /// It takes a duplicate of <mb> so the user still owns it.
+  inline void replace (CORBA::ULong length, const ACE_Message_Block* mb) {
+    unbounded_value_sequence<CORBA::Octet> s (length, mb);
+    swap (s);
+  }
+
+  unbounded_value_sequence<CORBA::Octet> (
+    const unbounded_value_sequence<CORBA::Octet> &rhs)
+    : maximum_ (0)
+    , length_ (0)
+    , buffer_(0)
+    , release_(false)
+    , mb_ (0)
+  {
+    unbounded_value_sequence<CORBA::Octet> tmp(rhs.maximum_);
+    tmp.length_ = rhs.length_;
+    if (rhs.mb_ == 0)
+      {
+        ACE_OS::memcpy (tmp.buffer_,
+                        rhs.buffer_,
+                        rhs.length_);
+      }
+    else
+      {
+        size_t offset = 0;
+        for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
+          {
+            ACE_OS::memcpy (tmp.buffer_ + offset,
+                            i->rd_ptr (),
+                            i->length ());
+
+            offset += i->length ();
+          }
+      }
+    swap(tmp);
+  }
+
+  unbounded_value_sequence<CORBA::Octet> &
+    operator= (const unbounded_value_sequence<CORBA::Octet> & rhs)
+  {
+    unbounded_value_sequence<CORBA::Octet> tmp(rhs);
+    swap(tmp);
+    return * this;
+  }
+
+private:
+  /// The maximum number of elements the buffer can contain.
+  CORBA::ULong maximum_;
+
+  /// The current number of elements in the buffer.
+  CORBA::ULong length_;
+
+  /// The buffer with all the elements, casting must be done in derived
+  /// classes.
+  mutable value_type * buffer_;
+
+  /// If true then the sequence should release the buffer when it is
+  /// destroyed.
+  CORBA::Boolean release_;
+  ACE_Message_Block* mb_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif
+
+#endif // guard_unbounded_octet_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
index 0d3406acc11..2c5a2da2da2 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -62,4 +64,5 @@ struct unbounded_reference_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
index 5da4cb24829..c54a430b494 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
@@ -11,6 +11,8 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -36,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
index d6c1df23649..0cbb69be858 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
@@ -8,12 +8,14 @@
  * @author Carlos O'Ryan
  */
 #include "testing_string_traits.hpp"
-#include "string_traits.hpp"
+#include "tao/String_Traits_T.h"
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#include "unbounded_string_sequence.hpp"
-#include "unbounded_wstring_sequence.hpp"
+#include "tao/Unbounded_String_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
+#include "tao/Unbounded_Wstring_Sequence_T.h"
+#include "tao/CORBA_String.h"
 
 #include "string_sequence_tester.hpp"
 
@@ -22,7 +24,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 template<class tested_sequence>
 struct Tester
@@ -382,7 +384,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK_EQUAL(static_cast<value_type*>(0), a.get_buffer(true));
+    BOOST_CHECK(0 == a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -400,6 +402,7 @@ struct Tester
       BOOST_CHECK_EQUAL(0UL, b.maximum());
       BOOST_CHECK_EQUAL(0UL, b.length());
       BOOST_CHECK(0 != b.get_buffer());
+      BOOST_CHECK_EQUAL(true, b.release());
 
       BOOST_CHECK_MESSAGE(c.expect(1), c);
 
@@ -411,6 +414,32 @@ struct Tester
     BOOST_CHECK_MESSAGE(r.expect(8), r);
   }
 
+  void test_regression_2201()
+  {
+    value_type * buffer = alloc_and_init_buffer();
+    expected_calls a(tested_allocation_traits::allocbuf_calls);
+    expected_calls f(tested_allocation_traits::freebuf_calls);
+    expected_calls r(tested_element_traits::release_calls);
+    {
+      tested_sequence a(8, 4, buffer);
+      BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK_EQUAL(buffer, a.get_buffer());
+      BOOST_CHECK_EQUAL(false, a.release());
+      check_values(a);
+      a.length (3);
+      BOOST_CHECK_EQUAL(CORBA::ULong(3), a.length());
+      a.length (4);
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK(helper::compare_empty(a[3]));
+    }
+    BOOST_CHECK_MESSAGE(a.expect(0), a);
+    BOOST_CHECK_MESSAGE(f.expect(0), f);
+    tested_sequence::freebuf(buffer);
+    BOOST_CHECK_MESSAGE(r.expect(8), r);
+  }
+
+
   void add_all(test_suite * ts)
   {
     typedef string_sequence_tester<tested_sequence> common;
@@ -473,6 +502,9 @@ struct Tester
     ts->add(BOOST_CLASS_TEST_CASE(
                 &Tester::test_get_buffer_true_with_release_true,
                 shared_this));
+    ts->add(BOOST_CLASS_TEST_CASE(
+                &Tester::test_regression_2201,
+                shared_this));
   }
 
   static boost::shared_ptr<Tester> allocate()
@@ -489,24 +521,24 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("unbounded string sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("unbounded string sequence unit test");
 
   {
     typedef Tester<unbounded_string_sequence> nTester;
     boost::shared_ptr<nTester> tester(nTester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     typedef Tester<unbounded_wstring_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
index f61e9271d1a..7b6b3598bf7 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -47,4 +49,5 @@ struct unbounded_value_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_value_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
index 409db4dd883..4702561423a 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
@@ -15,6 +15,8 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -23,6 +25,7 @@ class unbounded_value_sequence
 {
 public:
   typedef T value_type;
+  typedef T element_type;
   typedef T const const_value_type;
 
   typedef details::unbounded_value_allocation_traits<value_type,true> allocation_traits;
@@ -32,7 +35,7 @@ public:
   inline unbounded_value_sequence()
     : impl_()
   {}
-  inline /* explicit */ unbounded_value_sequence(CORBA::ULong maximum)
+  inline explicit unbounded_value_sequence(CORBA::ULong maximum)
     : impl_(maximum)
   {}
   inline unbounded_value_sequence(
@@ -90,5 +93,6 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_string_sequence_hpp
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
index 6607e0f16c0..d3a110910bc 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
@@ -11,7 +11,7 @@
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#include "unbounded_value_sequence.hpp"
+#include "tao/Unbounded_Value_Sequence_T.h"
 
 #include "value_sequence_tester.hpp"
 
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 typedef unbounded_value_sequence<int> tested_sequence;
 typedef tested_sequence::element_traits tested_element_traits;
@@ -162,6 +162,33 @@ struct Tester
     return buf;
   }
 
+  void test_regression_2201 ()
+  {
+    value_type * buffer = alloc_and_init_buffer();
+
+    expected_calls a(tested_allocation_traits::allocbuf_calls);
+    expected_calls f(tested_allocation_traits::freebuf_calls);
+    {
+      tested_sequence a(8, 4, buffer);
+      BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum());
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK_EQUAL(buffer, a.get_buffer());
+      BOOST_CHECK_EQUAL(int( 1), a[0]);
+      BOOST_CHECK_EQUAL(int( 4), a[1]);
+      BOOST_CHECK_EQUAL(int( 9), a[2]);
+      BOOST_CHECK_EQUAL(int(16), a[3]);
+      BOOST_CHECK_EQUAL(false, a.release());
+      a.length (3);
+      BOOST_CHECK_EQUAL(CORBA::ULong(3), a.length());
+      a.length (4);
+      BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length());
+      BOOST_CHECK_EQUAL(int(0), a[3]);
+    }
+    BOOST_CHECK_MESSAGE(a.expect(0), a);
+    BOOST_CHECK_MESSAGE(f.expect(0), f);
+    tested_sequence::freebuf(buffer);
+  }
+
   void test_buffer_constructor_default()
   {
     value_type * buffer = alloc_and_init_buffer();
@@ -320,7 +347,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK_EQUAL(static_cast<int*>(0), a.get_buffer(true));
+    BOOST_CHECK(0 == a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -337,6 +364,7 @@ struct Tester
       BOOST_CHECK_EQUAL(0UL, b.maximum());
       BOOST_CHECK_EQUAL(0UL, b.length());
       BOOST_CHECK(0 != b.get_buffer());
+      BOOST_CHECK_EQUAL(true, b.release());
 
       BOOST_CHECK_MESSAGE(c.expect(1), c);
 
@@ -380,6 +408,10 @@ struct Tester
                 shared_this));
 
     ts->add(BOOST_CLASS_TEST_CASE(
+                &Tester::test_regression_2201 ,
+                shared_this));
+
+    ts->add(BOOST_CLASS_TEST_CASE(
                 &Tester::test_buffer_constructor_default,
                 shared_this));
     ts->add(BOOST_CLASS_TEST_CASE(
@@ -423,23 +455,23 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
-  std::auto_ptr<test_suite> ts(
-      BOOST_TEST_SUITE("unbounded value sequence unit test"));
+  test_suite * ts =
+      BOOST_TEST_SUITE("unbounded value sequence unit test");
 
   {
     boost::shared_ptr<Tester> tester(Tester::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
   {
     typedef value_sequence_tester<tested_sequence,tested_allocation_traits> common;
     boost::shared_ptr<common> tester(common::allocate());
-    tester->add_all(ts.get());
+    tester->add_all(ts);
   }
 
-  return ts.release();
+  return ts;
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
index 27b8e611167..50a503e62b3 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
@@ -11,6 +11,8 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -36,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
index 2d936090ff6..02e88aad88e 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
@@ -9,16 +9,20 @@
  *
  * @author Carlos O'Ryan
  */
+#include "tao/Basic_Types.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class tested_sequence,
     class tested_allocation_traits>
 struct value_sequence_tester
 {
   typedef typename tested_sequence::value_type value_type;
+  typedef typename tested_sequence::const_value_type const_value_type;
 
   void test_default_constructor()
   {
@@ -66,7 +70,7 @@ struct value_sequence_tester
     x.length(8);
 
     tested_sequence const & y = x;
-    int const & z = y[4];
+    const_value_type & z = y[4];
     BOOST_CHECK_EQUAL(z, y[4]);
   }
 
@@ -76,7 +80,7 @@ struct value_sequence_tester
     x.length(8);
 
     tested_sequence const & y = x;
-    int const & z = y[4];
+    const_value_type & z = y[4];
     x[4] = 4;
     BOOST_CHECK_EQUAL(4, x[4]);
     BOOST_CHECK_EQUAL(4, y[4]);
@@ -261,4 +265,5 @@ private:
   boost::weak_ptr<value_sequence_tester> self_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_value_sequence_tester_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
index b491b8bdabd..91bb20e8696 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
@@ -10,9 +10,12 @@
  *
  * @author Carlos O'Ryan
  */
+#include "tao/Basic_Types.h"
 
 #include <algorithm>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -25,12 +28,16 @@ struct value_traits
   typedef T const const_value_type;
 
   inline static void zero_range(
-      value_type * /* begin */, value_type * /* end */)
-  {}
+      value_type * begin , value_type * end)
+  {
+    std::fill(begin, end, value_type ());
+  }
 
   inline static void initialize_range(
-      value_type * /* begin */, value_type * /* end */)
-  {}
+      value_type * begin, value_type * end)
+  {
+    std::fill(begin, end, value_type ());
+  }
 
   inline static void copy_range(
       value_type * begin, value_type * end, value_type *dst)
@@ -42,4 +49,6 @@ struct value_traits
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // guard_value_traits_hpp
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index 99546099606..a50eda03b14 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 6e565915472..4517bde0f91 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 4c15c26f959..bfb96e8b536 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index 1532085179d..8de0a3ed17d 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -42,7 +42,7 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL)
     {
       ans =
         ACE_OS::strdup (
-		ACE_NESTED_CLASS (Diamond,TAO_Diamond_Top_Smart_Proxy_Base)::shape (
+                Diamond::TAO_Diamond_Top_Smart_Proxy_Base::shape (
                 ACE_ENV_SINGLE_ARG_PARAMETER
               )
           );
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index d9d43ad9a29..473bc9b4087 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -8,6 +8,7 @@ project(*Server): taoserver, smart_proxies {
 }
 
 project(*Client): taoclient, portableserver, smart_proxies {
+  after += *Server
   Source_Files {
     testC.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/dtor/run_test.pl b/TAO/tests/Smart_Proxies/dtor/run_test.pl
index 1c38e185287..c6e2ba1ddbf 100755
--- a/TAO/tests/Smart_Proxies/dtor/run_test.pl
+++ b/TAO/tests/Smart_Proxies/dtor/run_test.pl
@@ -13,12 +13,22 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-i file://$iorfile");
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$SV->Spawn ();
+$svr = $SV->Spawn ();
+
+if ($svr != 0) {
+   print STDERR "ERROR: server returned $svr\n";
+   exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index 253a61435dc..ce10971c433 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 94da5a64615..32f5969e832 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -9,6 +9,7 @@ project(*Server): strategies, messaging, taoexe, portableserver {
 }
 
 project(*Client): strategies, messaging, taoexe, portableserver {
+  after += *Server
   Source_Files {
     simple_testC.cpp
     client.cpp
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index cabea05ca6b..1bd7978c70a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -9,6 +9,7 @@ project(*Server): messaging, taoexe, portableserver {
 }
 
 project(*Client): messaging, taoexe, portableserver {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 926002380e8..5826c607d6e 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index 6e0c6e2c465..b275e55e0be 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -7,8 +7,9 @@
 #include "tao/debug.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Synch.h"
+#include "ace/Auto_Event.h"
 
-ACE_RCSID(Test, Test, "$Id$")
+ACE_RCSID(Test, First_i, "$Id$")
 
 First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 9273bf283cb..6fa70f53749 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -1,13 +1,16 @@
+// -*- C++ -*-
 //
 // $Id$
-//
 
 
 #ifndef TAO_TWO_OBJECTS_FIRST_I_H
 #define TAO_TWO_OBJECTS_FIRST_I_H
 
 #include "Two_ObjectsS.h"
-#include "ace/Auto_Event.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Auto_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Implement the Two_Objects_Test::First interface
 class First_i
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 2eab1c9966f..fbfd2ef094c 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -1,6 +1,6 @@
+// -*- C++ -*-
 //
 // $Id$
-//
 
 #ifndef OBJECT_FACTORY_I_H
 #define OBJECT_FACTORY_I_H
@@ -9,7 +9,8 @@
 #include "First_i.h"
 #include "Second_i.h"
 
-class ACE_Event;
+#include "ace/Auto_Event.h"
+
 
 /// Implement the MTServer::Test interface
 class Object_Factory_i
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 30a6f0d2e09..aa0375c9b2f 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -1,13 +1,15 @@
+// -*- C++ -*-
 //
 // $Id$
-//
 
 #ifndef TAO_TWO_OBJECTS_SECOND_I_H
 #define TAO_TWO_OBEJCTS_SECOND_I_H
 
 #include "Two_ObjectsS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Auto_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Implement the POA_Two_Objects_Test::Second interface
 class Second_i
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index de36db49c6a..1dbe304222f 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -12,6 +12,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index 3124c65910a..a28ade36239 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -9,6 +9,7 @@ project(*server): taoserver {
 }
 
 project(*client): taoclient, anytypecode {
+  after += *server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index 91fc9d79183..0fe69a4a621 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -2,14 +2,13 @@
 // $Id$
 
 project(*Server): taoserver, exceptions {
-  idlflags  = -Ge 0
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): taoclient, anytypecode, exceptions {
-  idlflags  = -Ge 0
+  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index d98e1e04898..cbfa1580e94 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -11,6 +11,7 @@ project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
 }
 
 project(*Client): taoexe, tao_xtresource, ace_motif {
+  after += *Server
   Source_Files {
     testC.cpp
     Control.cpp
diff --git a/TAO/utils/Makefile.am b/TAO/utils/Makefile.am
index 401776d9b02..e1cbd83faa5 100644
--- a/TAO/utils/Makefile.am
+++ b/TAO/utils/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         catior \
diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am
index 628ec431bcd..bffde7b7ddc 100644
--- a/TAO/utils/catior/Makefile.am
+++ b/TAO/utils/catior/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -24,7 +24,9 @@ catior_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
 
 catior_SOURCES = \
   catior.cpp
@@ -33,6 +35,7 @@ catior_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index ca13c9d0cf1..7003d10b704 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -18,25 +18,27 @@
 //
 // ============================================================================
 
-#include "ace/Codeset_Registry.h"
-#include "ace/Get_Opt.h"
-#include "ace/streams.h"
-#include "ace/OS_NS_ctype.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Argv_Type_Converter.h"
-#include "tao/corba.h"
-#include "tao/IIOP_Profile.h"
 #include "tao/Messaging_PolicyValueC.h"
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/AnyTypeCode/Marshal.h"
+#include "tao/IIOP_Profile.h"
+#include "tao/ORB_Constants.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/IIOP_EndpointsC.h"
+#include "tao/CDR.h"
+#include "ace/Codeset_Registry.h"
+#include "ace/Get_Opt.h"
+#include "ace/streams.h"
+#include "ace/OS_NS_ctype.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
+#include "ace/Log_Msg.h"
+#include "orbsvcs/CosNamingC.h"
 
-
-static CORBA::Boolean
+CORBA::Boolean
 catiiop (char* string
          ACE_ENV_ARG_DECL)
 {
@@ -81,7 +83,6 @@ catiiop (char* string
   // Pull off the "hostname:port/" part of the objref Get host and
   // port.
   CORBA::UShort port_number;
-  char* hostname;
   char *cp = ACE_OS::strchr (string, ':');
 
   if (cp == 0)
@@ -89,9 +90,9 @@ catiiop (char* string
       ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
     }
 
-  hostname = CORBA::string_alloc (1 + cp - string);
+  CORBA::String_var hostname = CORBA::string_alloc (1 + cp - string);
 
-  for (cp = hostname;
+  for (cp = hostname.inout ();
        *string != ':';
        *cp++ = *string++)
     continue;
@@ -103,7 +104,6 @@ catiiop (char* string
 
   if (cp == 0)
     {
-      CORBA::string_free (hostname);
       ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
     }
 
@@ -112,11 +112,10 @@ catiiop (char* string
 
   ACE_DEBUG ((LM_DEBUG,
               "Host Name:\t%s\n",
-              hostname));
+              hostname.in ()));
   ACE_DEBUG ((LM_DEBUG,
               "Port Number:\t%d\n",
               port_number));
-  CORBA::string_free (hostname);
 
   // Parse the object key.
   // dump the object key to stdout
@@ -128,32 +127,32 @@ catiiop (char* string
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_iiop_profile (TAO_InputCDR& cdr);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& cdr);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& cdr);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_shmiop_profile (TAO_InputCDR& cdr);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_nskpw_profile (TAO_InputCDR& cdr);
 
 static CORBA::Boolean
 cat_nskfs_profile (TAO_InputCDR& cdr);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_octet_seq (const char *object_name,
                TAO_InputCDR& stream);
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_profile_helper(TAO_InputCDR& stream, const char *protocol);
 
-static CORBA::Boolean
+CORBA::Boolean
 catior (char* str
         ACE_ENV_ARG_DECL_NOT_USED)
 {
@@ -205,9 +204,9 @@ catior (char* str
 
   // First, read the type hint. This will be the type_id encoded in an
   // object reference.
-  char* type_hint;
+  CORBA::String_var type_hint;
 
-  if (!(stream >> type_hint))
+  if (!(stream >> type_hint.inout ()))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "cannot read type id\n"));
@@ -216,10 +215,7 @@ catior (char* str
 
   ACE_DEBUG ((LM_DEBUG,
               "The Type Id:\t\"%s\"\n",
-              type_hint));
-
-  // Release any memory associated with the type_hint.
-  CORBA::string_free (type_hint);
+              type_hint.in ()));
 
   // Read the profiles, discarding all until an IIOP profile comes by.
   // Once we see an IIOP profile, ignore any further ones.
@@ -336,7 +332,7 @@ catior (char* str
 // : IR_server
 // : interface_marker
 
-static CORBA::Boolean
+CORBA::Boolean
 catpoop (char* string
         ACE_ENV_ARG_DECL)
 {
@@ -461,6 +457,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                              argcon.get_ASCII_argv (),
                                              "TAO" ACE_ENV_ARG_PARAMETER);
   CORBA::Boolean b = 0;
+  CORBA::Boolean have_argument = 0;
   int opt;
 
   ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (),
@@ -468,19 +465,185 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
   while ((opt = get_opt ()) != EOF)
     {
+      // some arguments have been supplied
+      have_argument = 1;
       switch (opt)
         {
         case 'n':
-          //  Read the CosName from the NamingService convert the
-          //  object_ptr to a CORBA::String_var via the call to
-          //  object_to_string.
-          ACE_DEBUG ((LM_DEBUG,
-                      "opening a connection to the NamingService\n"
-                      "resolving the CosName %s\n",
-                      get_opt.opt_arg ()));
-          break;
+          {
+            //  Read the CosName from the NamingService convert the
+            //  object_ptr to a CORBA::String_var via the call to
+            //  object_to_string.
+            ACE_DEBUG ((LM_DEBUG,
+                        "opening a connection to the NamingService\n"
+                        "resolving the CosName %s\n",
+                        get_opt.opt_arg ()));
+
+            CORBA::Object_var server_object;
+
+            ACE_TRY
+              {
+                // Find the Naming Service.
+                CORBA::Object_var naming_context_object =
+                  orb_var->resolve_initial_references ("NameService"
+                                                       ACE_ENV_ARG_PARAMETER);
+                CosNaming::NamingContextExt_var naming_context =
+                  CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
+                                                        ACE_ENV_ARG_PARAMETER);
+
+                if (CORBA::is_nil (naming_context.in ()))
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                    "NameService cannot be resolved\n"),
+                                   -1);
+                }
+
+                CosNaming::Name *name =
+                  naming_context->to_name (get_opt.opt_arg ()
+                                           ACE_ENV_ARG_PARAMETER);
+
+                ACE_TRY_EX (RESOLUTION)
+                  {
+                    server_object = naming_context->resolve (*name
+                                                         ACE_ENV_ARG_PARAMETER);
+                      if (CORBA::is_nil (server_object.in ()))
+                      {
+                        ACE_ERROR_RETURN ((LM_ERROR,
+                              "name %s is not resolved to a valid object\n"),
+                                          -1);
+                      }
+                  }
+                ACE_CATCH (const CosNaming::NamingContext::NotFound, nf)
+                  {
+                    const char     *reason;
+
+                    switch (nf.why)
+                      {
+                        case CosNaming::NamingContext::missing_node:
+                          reason = "missing node";
+                          break;
+                        case CosNaming::NamingContext::not_context:
+                          reason = "not context";
+                          break;
+                        case CosNaming::NamingContext::not_object:
+                          reason = "not object";
+                          break;
+                        default:
+                          reason = "not known";
+                          break;
+                      }
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                              "%s cannot be resolved, exception reason = %s\n",
+                                      get_opt.opt_arg (),
+                                      reason),
+                                     -1);
+                  }
+                ACE_CATCH (const CosNaming::NamingContext::InvalidName, in)
+                  {
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s cannot be resolved, exception reason = "
+                                      "Invalid Name"
+                                      "\n",
+                                      get_opt.opt_arg ()),
+                                     -1);
+                  }
+                ACE_CATCH (const CosNaming::NamingContext::CannotProceed, cp)
+                  {
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s cannot be resolved, exception reason = "
+                                      "Cannot Proceed"
+                                      "\n",
+                                      get_opt.opt_arg ()),
+                                     -1);
+                  }
+                ACE_CATCHANY
+                  {
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s cannot be resolved, exception reason = "
+                                       "Unexpected Exception"
+                                       "\n",
+                                       argvw[0]),
+                                      -1);
+                  }
+                ACE_ENDTRY;
+
+                ACE_CString aString;
+
+                aString = orb_var->object_to_string (server_object.in ()
+                                                   ACE_ENV_ARG_PARAMETER);
+
+                ACE_DEBUG ((LM_DEBUG,
+                            "\nhere is the IOR\n%s\n\n",
+                            aString.rep ()));
+
+                char* str;
+                if (aString.find ("IOR:") == 0)
+                  {
+                    ACE_DEBUG ((LM_DEBUG,
+                                "decoding an IOR:\n"));
+
+                    // Strip the IOR: off the string.
+                    ACE_CString prefix = "IOR:";
+                    size_t prefixLength = prefix.length ();
+
+                    ACE_CString subString =
+                      aString.substring (prefixLength,
+                                         aString.length () - prefixLength);
+                    subString[subString.length ()] = '\0';
+                    str = subString.rep ();
+                    b = catior (str ACE_ENV_ARG_PARAMETER);
+                  }
+                else if (aString.find ("iiop:") == 0)
+                  {
+                    ACE_DEBUG ((LM_DEBUG,
+                                "decoding an IIOP URL IOR\n"));
+
+                    ACE_CString prefix = "IIOP:";
+                    size_t prefixLength = prefix.length ();
+
+                    ACE_CString subString =
+                      aString.substring (prefixLength,
+                                         aString.length () - prefixLength);
+                    //subString[subString.length () - 1] = '\0';
+                    str = subString.rep ();
+                    b = catiiop (str ACE_ENV_ARG_PARAMETER);
+                  }
+                else if (aString.find (":IR:") > 0)
+                  {
+                    ACE_DEBUG ((LM_DEBUG,
+                                "decoding an POOP IOR\n"));
+
+                    str = aString.rep ();
+                    b = catpoop (str ACE_ENV_ARG_PARAMETER);
+                  }
+                else
+                  ACE_ERROR ((LM_ERROR,
+                             "Don't know how to decode this IOR\n"));
+              }
+            ACE_CATCHANY
+              {
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s cannot be resolved, exception reason = "
+                                   "Unexpected Exception"
+                                   "\n",
+                                   argvw[0]),
+                                  -1);
+              }
+            ACE_ENDTRY;
+
+            if (b == 1)
+              ACE_DEBUG ((LM_DEBUG,
+                          "catior returned true\n"));
+            else
+              ACE_DEBUG ((LM_DEBUG,
+                          "catior returned false\n"));
+            break;
+          }
         case 'f':
           {
+            int have_some_input = 0;
+            int decode_pass_count = 0;
+
             //  Read the file into a CORBA::String_var.
             ACE_DEBUG ((LM_DEBUG,
                         "reading the file %s\n",
@@ -492,50 +655,92 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
             if (!ifstr.good ())
               {
                 ifstr.close ();
-                return -1;
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s "
+                                   "-f %s "
+                                   "\n"
+                                   "Invalid IOR file nominated"
+                                   "\n",
+                                   argvw[0],
+                                   get_opt.opt_arg ()),
+                                  -1);
               }
 
-            int have_some_input = 0;
             while (!ifstr.eof())
               {
                 char ch;
                 ACE_CString aString;
 
+                have_some_input = 0;
+
                 while (!ifstr.eof ())
                   {
                     ifstr.get (ch);
-                    if (ch == '\n' || ifstr.eof ())
+                    if (ifstr.eof () || ch == '\n' || ch == '\r')
                       break;
                     aString += ch;
-                    have_some_input = 1;
+                    have_some_input++;
                   }
 #else
             FILE* ifstr = ACE_OS::fopen (get_opt.opt_arg (), ACE_TEXT ("r"));
 
-            if (ifstr && !ferror (ifstr))
+            if (!ifstr || ferror (ifstr))
               {
                 if (ifstr)
+                  {
                   ACE_OS::fclose (ifstr);
-                return -1;
+                  }
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     "%s "
+                                     "-f %s "
+                                     "\n"
+                                     "Invalid IOR file nominated"
+                                     "\n",
+                                     argvw[0],
+                                     get_opt.opt_arg ()),
+                                    -1);
               }
 
-            int have_some_input = 0;
             while (!feof (ifstr))
               {
                 char ch;
                 ACE_CString aString;
 
+                have_some_input = 0;
+
                 while (!feof (ifstr))
                   {
                     ch = ACE_OS::fgetc (ifstr);
-                    if (ch == '\n' || ch == EOF)
+                    if (ch == EOF || ch == '\n' || ch == '\r')
                       break;
                     aString += ch;
-                    have_some_input = 1;
+                    have_some_input++;
                   }
 #endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
                 if (have_some_input == 0 || !aString.length())
-                  break;
+                  {
+                    if (!decode_pass_count)
+                      {
+                          ACE_ERROR_RETURN ((LM_ERROR,
+                                             "%s "
+                                             "-f %s "
+                                             "\n"
+                                             "Empty IOR file nominated"
+                                             "\n",
+                                             argvw[0],
+                                             get_opt.opt_arg ()),
+                                            -1);
+                      }
+                    else
+                      {
+                        ACE_DEBUG ((LM_DEBUG,
+                                    "catior returned true\n"));
+                        return 0;               // All done now
+                      }
+                  }
+
+                decode_pass_count++;
+
                 ACE_DEBUG ((LM_DEBUG,
                             "\nhere is the IOR\n%s\n\n",
                             aString.rep ()));
@@ -599,58 +804,98 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           break;
         case 'x':
           {
-            //  Read the file into a CORBA::String_var.
+            int have_some_input = 0;
+            int decode_pass_count = 0;
+
+            //  Read the input into a CORBA::String_var.
             ACE_DEBUG ((LM_DEBUG,
                         "reading from stdin\n"));
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
             if (!cin.good ())
               {
-                return -1;
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s "
+                                   "-x"
+                                   "\n"
+                                   "Invalid input stream"
+                                   "\n",
+                                   argvw[0]),
+                                  -1);
               }
 
-            int have_some_input = 0;
             while (!cin.eof())
               {
                 char ch;
                 ACE_CString aString;
 
+                have_some_input = 0;
+
                 while (!cin.eof ())
                   {
                     cin.get (ch);
-                    if (ch == '\n' || cin.eof ())
+                    if (cin.eof () || ch == '\n' || ch == '\r')
                       break;
                     aString += ch;
-                    have_some_input = 1;
+                    have_some_input++;
                   }
 #else
             FILE* ifstr = stdin;
 
-            if (ifstr && !ferror (ifstr))
+            if (!ifstr || ferror (ifstr))
               {
                 if (ifstr)
+                  {
                   ACE_OS::fclose (ifstr);
-                return -1;
+                  }
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "%s "
+                                   "-x"
+                                   "\n"
+                                   "Invalid input stream"
+                                   "\n",
+                                   argvw[0]),
+                                  -1);
               }
 
-            int have_some_input = 0;
             while (!feof (ifstr))
               {
                 char ch;
                 ACE_CString aString;
 
+                have_some_input = 0;
+
                 while (!feof (ifstr))
                   {
                     ch = ACE_OS::fgetc (ifstr);
-                    if (ch == '\n' || ch == EOF)
+                    if (ch == EOF || ch == '\n' || ch == '\r')
                       break;
                     aString += ch;
-                    have_some_input = 1;
+                    have_some_input++;
                   }
 #endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
 
                 if (have_some_input == 0)
-                  break;
+                  {
+                    if (!decode_pass_count)
+                      {
+                        ACE_ERROR_RETURN ((LM_ERROR,
+                                           "%s "
+                                           "-x"
+                                           "\n"
+                                           "Empty input stream"
+                                           "\n",
+                                           argvw[0]),
+                                          -1);
+                      }
+                    else
+                      {
+                        return 0;               // All done now
+                      }
+                  }
+
+                decode_pass_count++;
+
                 ACE_DEBUG ((LM_DEBUG,
                             "\nhere is the IOR\n%s\n\n",
                             aString.rep ()));
@@ -723,11 +968,23 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
         }
     }
 
+    // check that some relevant arguments have been supplied
+    if (have_argument == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Usage: %s "
+                             "-f filename "
+                             "-n CosName "
+                             "\n"
+                             "Reads an IOR "
+                             "and dumps the contents to stdout "
+                             "\n",
+                             argvw[0]),
+                            1);
   return 0;
 }
 
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_tag_orb_type (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -738,23 +995,29 @@ cat_tag_orb_type (TAO_InputCDR& stream) {
 
   CORBA::ULong orbtype;
 
-  stream2 >> orbtype;
-  if (orbtype == TAO_ORB_TYPE) {
-    ACE_DEBUG ((LM_DEBUG,
-                "%I ORB Type: %d (TAO)\n",
-                orbtype));
-  } else {
-    ACE_DEBUG ((LM_DEBUG,
-                "%I ORB Type: %d\n",
-                orbtype));
-  }
+  if (!(stream2 >> orbtype))
+    return false;
 
-  return 1;
+  if (orbtype == TAO_ORB_TYPE)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%I ORB Type: 0x%x (TAO)\n",
+                  orbtype));
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%I ORB Type: 0x%x\n",
+                  orbtype));
+    }
+
+  return true;
 }
 
 
-static CORBA::Boolean
-cat_tao_tag_endpoints (TAO_InputCDR& stream) {
+CORBA::Boolean
+cat_tao_tag_endpoints (TAO_InputCDR& stream)
+{
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
     return 1;
@@ -781,7 +1044,7 @@ cat_tao_tag_endpoints (TAO_InputCDR& stream) {
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_tag_alternate_endpoints (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -800,7 +1063,7 @@ cat_tag_alternate_endpoints (TAO_InputCDR& stream) {
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_tag_policies (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -941,7 +1204,7 @@ cat_tag_policies (TAO_InputCDR& stream) {
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_octet_seq (const char *object_name,
                TAO_InputCDR& stream)
 {
@@ -989,7 +1252,7 @@ cat_octet_seq (const char *object_name,
     {
       char c = objKey[i];
       int tmp = (unsigned char) c; // isprint doesn't work with negative vals.(except EOF)
-      if (ACE_OS::ace_isprint (tmp))
+      if (ACE_OS::ace_isprint (static_cast<ACE_TCHAR> (tmp)))
         ACE_DEBUG ((LM_DEBUG, "%c", c));
       else
         ACE_DEBUG ((LM_DEBUG, "."));
@@ -1001,7 +1264,7 @@ cat_octet_seq (const char *object_name,
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_object_key (TAO_InputCDR& stream)
 {
   // ... and object key.
@@ -1012,110 +1275,126 @@ cat_object_key (TAO_InputCDR& stream)
 ACE_CString
  _find_info (CORBA::ULong id)
 {
-    ACE_CString locale="";
-    ACE_Codeset_Registry::registry_to_locale(id, locale, NULL, NULL);
-    return locale;
+  ACE_CString locale = "";
+  ACE_Codeset_Registry::registry_to_locale (id, locale, 0, 0);
+  return locale;
 }
 
-void displayHex( TAO_InputCDR &str )
+void displayHex (TAO_InputCDR & str)
 {
-  if (str.good_bit () == 0 )
+  if (str.good_bit () == 0)
     return;
 
-  TAO_InputCDR clone_str( str );
+  TAO_InputCDR clone_str (str);
   CORBA::ULong theSetId ;
-  str.read_ulong(theSetId);
+  if (!str.read_ulong (theSetId))
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Unable to read codeset ID.\n"));
+      return;
+    }
   ACE_DEBUG ((LM_DEBUG," Hex - %x", theSetId));
-  ACE_DEBUG ((LM_DEBUG," Description - "));
-  ACE_CString theDescr = _find_info ( theSetId );
-
-  if( theDescr.length() == 0 )
-  {
-     ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n "));
-     return;
-  }
+  ACE_DEBUG ((LM_DEBUG,"\tDescription - "));
+  ACE_CString theDescr = _find_info (theSetId);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %s \n"), theDescr.c_str()));
+  if (theDescr.length () == 0)
+    ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n "));
+  else
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %s \n"), theDescr.c_str ()));
 }
 
-static CORBA::Boolean
-cat_codeset_info(TAO_InputCDR& stream)
+CORBA::Boolean
+cat_codeset_info (TAO_InputCDR& cdr)
 {
-     // Component Length
-     CORBA::ULong compLen=0L;
-     stream >> compLen;
-     ACE_DEBUG ((LM_DEBUG, "\tComponent Length %u \n", compLen));
+  CORBA::ULong length = 0;
+  if (cdr.read_ulong (length) == 0)
+    return false;
 
-     // Byte Order
-     CORBA::ULong byteOrder;
-     stream >> byteOrder;
+  TAO_InputCDR stream (cdr, length);
+  cdr.skip_bytes(length);
 
-     if (byteOrder)
-     {
-        ACE_DEBUG ((LM_DEBUG,
-            "\tThe Component Byte Order:\tLittle Endian\n"));
-     }
-     else
-        ACE_DEBUG ((LM_DEBUG,
-                "\tThe Component Byte Order:\tBig Endian\n"));
-
-     // CodesetId for char
-     // CORBA::ULong c_ncsId;
-     ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for char: "));
-     displayHex (stream);
-
-     // number of Conversion Codesets for char
-     CORBA::ULong c_ccslen=0;
-     stream >> c_ccslen;
-     ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for char %u \n", c_ccslen));
-
-     if (c_ccslen)
-        ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for char are: \n"));
-
-     //  Loop through and display them
-     CORBA::ULong index = 0;
-     for ( ; index < c_ccslen; ++index)
-     {
-        // CodesetId for char
-        ACE_DEBUG ((LM_DEBUG, "\t%u) ", index + 1L));
-        displayHex (stream);
-     }
-
-     // CodesetId for wchar
-     ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for wchar: "));
-     displayHex (stream);
-
-     // number of Conversion Codesets for char
-     CORBA::ULong w_ccslen=0;
-     stream >> w_ccslen;
-     ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u \n", w_ccslen));
-
-     if (w_ccslen)
-       ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for wchar are: \n"));
-
-     //  Loop through and display them
-     for (index = 0; index < w_ccslen; ++index)
-     {
-       ACE_DEBUG ((LM_DEBUG, "\t %u) ", index + 1L));
-       displayHex (stream);
-     }
-     return 1;
+  ACE_DEBUG ((LM_DEBUG, "\tComponent length: %u \n", length));
+
+  ACE_DEBUG ((LM_DEBUG,
+               "\tComponent byte order:\t%s Endian\n",
+              (stream.byte_order () ? "Little" : "Big")));
+
+  // CodesetId for char
+  // CORBA::ULong c_ncsId;
+  ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for char: "));
+  displayHex (stream);
+
+  // number of Conversion Codesets for char
+  CORBA::ULong c_ccslen = 0;
+
+  if (!(stream >> c_ccslen))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to read number of conversion codesets "
+                       "for char.\n"),
+                      false);
+
+  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for char %u \n", c_ccslen));
+
+  if (c_ccslen)
+    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for char are: \n"));
+
+  //  Loop through and display them
+  CORBA::ULong index = 0;
+  for ( ; index < c_ccslen; ++index)
+    {
+      // CodesetId for char
+      ACE_DEBUG ((LM_DEBUG, "\t%u) ", index + 1L));
+      displayHex (stream);
+    }
+
+  // CodesetId for wchar
+  ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for wchar: "));
+  displayHex (stream);
+
+  // number of Conversion Codesets for wchar
+  CORBA::ULong w_ccslen=0;
+
+  if (!(stream >> w_ccslen))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to read number of conversion codesets "
+                       "for wchar.\n"),
+                      false);
+
+  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u \n", w_ccslen));
+
+  if (w_ccslen)
+    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for wchar are: \n"));
+
+  //  Loop through and display them
+  for (index = 0; index < w_ccslen; ++index)
+    {
+      ACE_DEBUG ((LM_DEBUG, "\t %u) ", index + 1L));
+      displayHex (stream);
+    }
+  return true;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_tagged_components (TAO_InputCDR& stream)
 {
   // ... and object key.
 
   CORBA::ULong len;
-  stream >> len;
+  if (!(stream >> len))
+    return false;
 
   for (CORBA::ULong i = 0;
        i != len;
        ++i)
     {
       CORBA::ULong tag;
-      stream >> tag;
+      if (!(stream >> tag))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to read component tag.\n"),
+                            false);
+        }
+
       ACE_DEBUG ((LM_DEBUG,
                   "%I The component <%d> ID is ", i+1, tag));
 
@@ -1157,7 +1436,7 @@ cat_tagged_components (TAO_InputCDR& stream)
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_profile_helper (TAO_InputCDR& stream,
                     const char *protocol)
 {
@@ -1186,7 +1465,8 @@ cat_profile_helper (TAO_InputCDR& stream,
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major, iiop_version_minor;
+  CORBA::Octet iiop_version_major;
+  CORBA::Octet iiop_version_minor = CORBA::Octet();
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1208,23 +1488,23 @@ cat_profile_helper (TAO_InputCDR& stream,
 
   // Get host and port.
   CORBA::UShort port_number;
-  char* hostname;
-  if ((str >> hostname) == 0)
+  CORBA::String_var hostname;
+  if (!(str >> hostname.inout ()))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "%I problem decoding hostname\n"));
       return 1;
     }
 
-  str >> port_number;
+  if (!(str >> port_number))
+    return false;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Host Name:\t%s\n",
-              hostname));
+              hostname.in ()));
   ACE_DEBUG ((LM_DEBUG,
               "%I Port Number:\t%d\n",
               port_number));
-  CORBA::string_free (hostname);
 
   if (cat_object_key (str) == 0)
     return 0;
@@ -1241,19 +1521,19 @@ cat_profile_helper (TAO_InputCDR& stream,
     return 0;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_iiop_profile (TAO_InputCDR& stream)
 {
   return cat_profile_helper (stream, "IIOP");
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_shmiop_profile (TAO_InputCDR& stream)
 {
   return cat_profile_helper (stream, "SHMIOP");
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& stream)
 {
   // OK, we've got a UIOP profile.  It's going to be encapsulated
@@ -1277,7 +1557,8 @@ cat_uiop_profile (TAO_InputCDR& stream)
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet uiop_version_major, uiop_version_minor;
+  CORBA::Octet uiop_version_major;
+  CORBA::Octet uiop_version_minor = CORBA::Octet();
   // It appears that as of April 2002 UIOP version is 1.2
   if (! (str.read_octet (uiop_version_major)
          && uiop_version_major == 1
@@ -1314,7 +1595,7 @@ cat_uiop_profile (TAO_InputCDR& stream)
   return 1;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& stream)
 {
   // OK, we've got an SCIOP profile.
@@ -1339,7 +1620,8 @@ cat_sciop_profile (TAO_InputCDR& stream)
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major, iiop_version_minor;
+  CORBA::Octet iiop_version_major;
+  CORBA::Octet iiop_version_minor = CORBA::Octet();
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1360,53 +1642,57 @@ cat_sciop_profile (TAO_InputCDR& stream)
   // Get host and port.
   CORBA::UShort port_number;
   CORBA::UShort max_streams;
-  char* hostname;
   CORBA::ULong addresses;
 
-  str >> addresses;
+  if (!(str >> addresses))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to decode number of addresses\n."),
+                      false);
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Addresses:\t%d\n",
               addresses));
 
-  for (unsigned int i=0; i< addresses; i++) {
-    if ((str >> hostname) == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "%I problem decoding hostname\n"));
-        return 1;
-      }
-    ACE_DEBUG ((LM_DEBUG,
-                "%I Host Name:\t%s\n",
-                hostname));
-    CORBA::string_free (hostname);
-  }
+  for (CORBA::ULong i = 0; i < addresses; ++i)
+    {
+      CORBA::String_var hostname;
+      if (!(str >> hostname.inout ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "%I problem decoding hostname\n"),
+                            false);
+        }
+      
+      ACE_DEBUG ((LM_DEBUG,
+                  "%I Host Name:\t%s\n",
+                  hostname.in ()));
+    }
 
 
-  str >> port_number;
+  if (!(str >> port_number))
+    return false;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Port Number:\t%d\n",
               port_number));
 
-  str >> max_streams;
+  if (!(str >> max_streams))
+    return false;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Max Streams:\t%d\n",
               max_streams));
 
-  if (cat_object_key (str) == 0)
-    return 0;
+  if (cat_object_key (str) == 0
+      || // Unlike IIOP (1.0), SCIOP always has tagged_components.
+      cat_tagged_components (str) == 0)
+    return false;
 
-  // Unlike IIOP (1.0), SCIOP always has tagged_components.
-  if (cat_tagged_components (str) == 0)
-    return 0;
-
-  return 1;
+  return true;
 }
 
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_nsk_profile_helper (TAO_InputCDR& stream,
                         const char *protocol)
 {
@@ -1435,7 +1721,8 @@ cat_nsk_profile_helper (TAO_InputCDR& stream,
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major, iiop_version_minor;
+  CORBA::Octet iiop_version_major;
+  CORBA::Octet iiop_version_minor = CORBA::Octet();
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1485,13 +1772,13 @@ cat_nsk_profile_helper (TAO_InputCDR& stream,
     return 0;
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_nskpw_profile (TAO_InputCDR& stream)
 {
   return cat_nsk_profile_helper (stream, "NSKPW");
 }
 
-static CORBA::Boolean
+CORBA::Boolean
 cat_nskfs_profile (TAO_InputCDR& stream)
 {
   return cat_nsk_profile_helper (stream, "NSKFS");
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index d46f13a598a..749849fa3af 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,5 +1,7 @@
 // $Id$
-project : taoexe, rtcorba, core {
-  install = $(ACE_ROOT)/bin
-  exename = catior
+project : namingexe, rtcorba, core {
+  libpaths += $(ACE_ROOT)/lib
+  libpaths += $(ACE_ROOT)/ace
+  exename   = catior
+  install   = $(ACE_ROOT)/bin
 }
diff --git a/TAO/utils/nslist/Makefile.am b/TAO/utils/nslist/Makefile.am
index 388ae55d5bd..571aa4c400b 100644
--- a/TAO/utils/nslist/Makefile.am
+++ b/TAO/utils/nslist/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
index a580e5b6be5..a2a61b35140 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
@@ -6,6 +6,7 @@
 //
 // $Id$
 
+#include "ace/Init_ACE.h"
 #include "pch.h"
 #include "wx/resource.h"
 #include "wxNamingViewerFrame.h"
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index f8e11f06a4e..0d88b76a8e9 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -8,7 +8,7 @@
 #include "wxNamingViewerFrame.h"
 
 #include "wx/clipbrd.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "wxNamingViewer.h"
 #include "wxSelectNSDialog.h"
 #include "ace/SString.h"
diff --git a/VERSION b/VERSION
index 74919456395..e86179ab1ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.7, released Fri Aug 05 07:37:20 2005.
+This is ACE version 5.5.1, released Tue Apr 18 20:49:16 2006.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
@@ -9,3 +9,4 @@ please do one of the following:
        contents "subscribe ace-users" to majordomo@cs.wustl.edu.
 
     2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index d94fabfaf69..af89390c667 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -23,9 +23,9 @@
 #include "ace/OS_NS_ctype.h"
 #include "ace/OS_TLI.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 extern "C" int maxFiles;
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 #if !defined (__ACE_INLINE__)
 #include "ace/ACE.inl"
@@ -41,6 +41,9 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   // private:
@@ -211,7 +214,7 @@ ACE::select (int width,
 #if !defined (ACE_WIN32)
   if (result > 0)
     readfds.sync ((ACE_HANDLE) width);
-#endif /* ACE_WIN64 */
+#endif /* ACE_WIN32 */
   return result;
 }
 
@@ -617,7 +620,7 @@ ACE::recv_n_i (ACE_HANDLE handle,
     {
       // Try to transfer as much of the remaining data as possible.
       n = ACE_OS::recv (handle,
-                        (char *) buf + bytes_transferred,
+                        static_cast <char *> (buf) + bytes_transferred,
                         len - bytes_transferred,
                         flags);
       // Check EOF.
@@ -676,7 +679,7 @@ ACE::recv_n_i (ACE_HANDLE handle,
       // Since the socket is in non-blocking mode, this call will not
       // block.
       n = ACE_OS::recv (handle,
-                        (char *) buf + bytes_transferred,
+                        static_cast <char *> (buf) + bytes_transferred,
                         len - bytes_transferred,
                         flags);
 
@@ -856,7 +859,7 @@ ACE::recv_n_i (ACE_HANDLE handle,
     {
       // Try to transfer as much of the remaining data as possible.
       n = ACE::recv_i (handle,
-                       (char *) buf + bytes_transferred,
+                       static_cast <char *> (buf) + bytes_transferred,
                        len - bytes_transferred);
       // Check EOF.
       if (n == 0)
@@ -914,7 +917,7 @@ ACE::recv_n_i (ACE_HANDLE handle,
       // Since the socket is in non-blocking mode, this call will not
       // block.
       n = ACE::recv_i (handle,
-                       (char *) buf + bytes_transferred,
+                       static_cast <char *> (buf) + bytes_transferred,
                        len - bytes_transferred);
 
       // Check for errors.
@@ -1200,7 +1203,7 @@ ACE::recv_n (ACE_HANDLE handle,
               this_rd_ptr += this_chunk_length;
 
               // Increment iovec counter.
-              iovcnt++;
+              ++iovcnt;
 
               // The buffer is full make a OS call.  @@ TODO find a way to
               // find ACE_IOV_MAX for platforms that do not define it rather
@@ -2009,7 +2012,7 @@ ACE::write_n (ACE_HANDLE handle,
               this_block_ptr += this_chunk_length;
 
               // Increment iovec counter.
-              iovcnt++;
+              ++iovcnt;
 
               // The buffer is full make a OS call.  @@ TODO find a way to
               // find ACE_IOV_MAX for platforms that do not define it rather
@@ -2107,7 +2110,7 @@ ACE::send_n (ACE_HANDLE handle,
               this_block_ptr += this_chunk_length;
 
               // Increment iovec counter.
-              iovcnt++;
+              ++iovcnt;
 
               // The buffer is full make a OS call.  @@ TODO find a way to
               // find ACE_IOV_MAX for platforms that do not define it rather
@@ -2401,7 +2404,7 @@ ACE::format_hexdump (const char *buffer,
             {
               ACE_OS::sprintf (obuf,
                                ACE_LIB_TEXT (" "));
-              obuf++;
+              ++obuf;
             }
           textver[j] = ACE_OS::ace_isprint (c) ? c : '.';
         }
@@ -2429,7 +2432,7 @@ ACE::format_hexdump (const char *buffer,
             {
               ACE_OS::sprintf (obuf,
                                ACE_LIB_TEXT (" "));
-              obuf++;
+              ++obuf;
             }
           textver[i] = ACE_OS::ace_isprint (c) ? c : '.';
         }
@@ -2654,7 +2657,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
       need_to_check = 1;
       known_failure = 1;
     }
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (is_tli);
 
   // Force the check on VxWorks.  The read handle for "h" is not set,
@@ -2805,7 +2808,6 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
           /* NOTREACHED */
         }
     }
-  ACE_NOTREACHED (return 0);
 }
 
 // Make the current process a UNIX daemon.  This is based on Stevens
@@ -2936,7 +2938,7 @@ ACE::max_handles (void)
 
 #if defined (_SC_OPEN_MAX)
   return ACE_OS::sysconf (_SC_OPEN_MAX);
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
   return maxFiles;
 #elif defined (FD_SETSIZE)
   return FD_SETSIZE;
@@ -3438,18 +3440,6 @@ ACE::strnew (const wchar_t *s)
     return ACE_OS::strcpy (t, s);
 }
 
-void
-ACE::strdelete (char *s)
-{
-  delete [] s;
-}
-
-void
-ACE::strdelete (wchar_t *s)
-{
-  delete [] s;
-}
-
 inline static bool equal_char(char a, char b, bool case_sensitive)
 {
   if (case_sensitive)
@@ -3503,3 +3493,6 @@ ACE::wild_match(const char* str, const char* pat, bool case_sensitive)
 
   return *p == '\0';
 }
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ACE.h b/ace/ACE.h
index 12b4934bcf5..581d239c41e 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -35,11 +35,6 @@
 #include "ace/Sock_Connect.h"
 #include "ace/Default_Constants.h"
 
-// Forward declarations.
-class ACE_Time_Value;
-class ACE_Message_Block;
-class ACE_Handle_Set;
-
 #if defined (CYGWIN32)
 // Include math.h. math.h defines a macro log2 that conflicts with ACE::log2()
 // which seems to only cause a problem on cygwin.  Insuring that math.h is
@@ -59,6 +54,13 @@ class ACE_Handle_Set;
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Forward declarations.
+class ACE_Time_Value;
+class ACE_Message_Block;
+class ACE_Handle_Set;
 
 /**
  * @namespace ACE
@@ -98,7 +100,7 @@ namespace ACE
   /// Check if error indicates the process being out of handles (file
   /// descriptors).
   extern ACE_Export int out_of_handles (int error);
- 
+
   /// Simple wildcard matching function supporting '*' and '?'
   /// return true if string s matches pattern.
   extern ACE_Export bool wild_match(const char* s, const char* pattern, bool case_sensitive = true);
@@ -415,7 +417,7 @@ namespace ACE
   extern ACE_Export char *strnew (const char *s);
 
   /// Delete the memory allocated by @c strnew.
-  extern ACE_Export void strdelete (char *s);
+  ACE_NAMESPACE_INLINE_FUNCTION void strdelete (char *s);
 
   /// Create a fresh new copy of @a str, up to @a n chars long.  Uses
   /// @c ACE_OS::malloc to allocate the new string.
@@ -429,7 +431,7 @@ namespace ACE
 
   extern ACE_Export wchar_t *strnew (const wchar_t *s);
 
-  extern ACE_Export void strdelete (wchar_t *s);
+  ACE_NAMESPACE_INLINE_FUNCTION void strdelete (wchar_t *s);
 
   extern ACE_Export wchar_t *strndup (const wchar_t *str, size_t n);
 
@@ -492,7 +494,10 @@ namespace ACE
    * if @a avoid_zombies == 0 call @c ACE_OS::fork directly, else
    * create an orphan process that's inherited by the init process;
    * init cleans up when the orphan process terminates so we don't
-   * create zombies.
+   * create zombies.  Returns -1 on failure and either the child PID
+   * on success if @a avoid_zombies == 0 or 1 on success if @a
+   * avoid_zombies != 0 (this latter behavior is a known bug that
+   * needs to be fixed).
    */
   extern ACE_Export pid_t fork (
     const ACE_TCHAR *program_name = ACE_LIB_TEXT ("<unknown>"),
@@ -816,6 +821,9 @@ namespace ACE
 
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/ACE.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ACE.inl b/ace/ACE.inl
index 1462d083e53..a755557fe5c 100644
--- a/ace/ACE.inl
+++ b/ace/ACE.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
@@ -6,6 +7,10 @@
 #include "ace/os_include/os_ctype.h"
 #include "ace/OS_NS_sys_socket.h"
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
 // Wrappers for methods that have been moved to ACE_OS.
 
 ACE_INLINE ssize_t
@@ -266,6 +271,20 @@ ACE::handle_exception_ready (ACE_HANDLE handle,
 }
 
 ACE_INLINE void
+ACE::strdelete (char *s)
+{
+  delete [] s;
+}
+
+#if defined (ACE_HAS_WCHAR)
+ACE_INLINE void
+ACE::strdelete (wchar_t *s)
+{
+  delete [] s;
+}
+#endif /* ACE_HAS_WCHAR */
+
+ACE_INLINE void
 ACE::unique_name (const void *object,
                   ACE_TCHAR *name,
                   size_t length)
@@ -312,3 +331,6 @@ ACE::hex2byte (ACE_TCHAR c)
   else
     return (u_char) (10 + c - ACE_LIB_TEXT ('A'));
 }
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ACE.pc.in b/ace/ACE.pc.in
index b5c4d91f3f1..90b2a9eebd7 100644
--- a/ace/ACE.pc.in
+++ b/ace/ACE.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: ACE
 Description: ADAPTIVE Communication Environment 
 Version: @VERSION@
-Libs: -L${libdir} -lACE
+Libs: -L${libdir} -lACE @LIBS@
 Cflags: -I${includedir}
diff --git a/ace/ACE_Memory_export.h b/ace/ACE_Memory_export.h
deleted file mode 100644
index 20edd951d96..00000000000
--- a/ace/ACE_Memory_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 -s ACE_Memory
-// ------------------------------
-#ifndef ACE_MEMORY_EXPORT_H
-#define ACE_MEMORY_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_MEMORY_HAS_DLL)
-#  define ACE_MEMORY_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_MEMORY_HAS_DLL */
-
-#if !defined (ACE_MEMORY_HAS_DLL)
-#  define ACE_MEMORY_HAS_DLL 1
-#endif /* ! ACE_MEMORY_HAS_DLL */
-
-#if defined (ACE_MEMORY_HAS_DLL) && (ACE_MEMORY_HAS_DLL == 1)
-#  if defined (ACE_MEMORY_BUILD_DLL)
-#    define ACE_Memory_Export ACE_Proper_Export_Flag
-#    define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_MEMORY_BUILD_DLL */
-#    define ACE_Memory_Export ACE_Proper_Import_Flag
-#    define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_MEMORY_BUILD_DLL */
-#else /* ACE_MEMORY_HAS_DLL == 1 */
-#  define ACE_Memory_Export
-#  define ACE_MEMORY_SINGLETON_DECLARATION(T)
-#  define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_MEMORY_HAS_DLL == 1 */
-
-// Set ACE_MEMORY_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_MEMORY_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_MEMORY_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_MEMORY_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_MEMORY_NTRACE */
-
-#if (ACE_MEMORY_NTRACE == 1)
-#  define ACE_MEMORY_TRACE(X)
-#else /* (ACE_MEMORY_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_MEMORY_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_MEMORY_NTRACE == 1) */
-
-#endif /* ACE_MEMORY_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/ACE_Reactor_export.h b/ace/ACE_Reactor_export.h
deleted file mode 100644
index 8ec100011e8..00000000000
--- a/ace/ACE_Reactor_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 -s ACE_Reactor
-// ------------------------------
-#ifndef ACE_REACTOR_EXPORT_H
-#define ACE_REACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_REACTOR_HAS_DLL)
-#  define ACE_REACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_REACTOR_HAS_DLL */
-
-#if !defined (ACE_REACTOR_HAS_DLL)
-#  define ACE_REACTOR_HAS_DLL 1
-#endif /* ! ACE_REACTOR_HAS_DLL */
-
-#if defined (ACE_REACTOR_HAS_DLL) && (ACE_REACTOR_HAS_DLL == 1)
-#  if defined (ACE_REACTOR_BUILD_DLL)
-#    define ACE_Reactor_Export ACE_Proper_Export_Flag
-#    define ACE_REACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_REACTOR_BUILD_DLL */
-#    define ACE_Reactor_Export ACE_Proper_Import_Flag
-#    define ACE_REACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_REACTOR_BUILD_DLL */
-#else /* ACE_REACTOR_HAS_DLL == 1 */
-#  define ACE_Reactor_Export
-#  define ACE_REACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_REACTOR_HAS_DLL == 1 */
-
-// Set ACE_REACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_REACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_REACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_REACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_REACTOR_NTRACE */
-
-#if (ACE_REACTOR_NTRACE == 1)
-#  define ACE_REACTOR_TRACE(X)
-#else /* (ACE_REACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_REACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_REACTOR_NTRACE == 1) */
-
-#endif /* ACE_REACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/ACE_Sockets_export.h b/ace/ACE_Sockets_export.h
deleted file mode 100644
index 1c57c959dc9..00000000000
--- a/ace/ACE_Sockets_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 -s ACE_Sockets
-// ------------------------------
-#ifndef ACE_SOCKETS_EXPORT_H
-#define ACE_SOCKETS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SOCKETS_HAS_DLL)
-#  define ACE_SOCKETS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_SOCKETS_HAS_DLL */
-
-#if !defined (ACE_SOCKETS_HAS_DLL)
-#  define ACE_SOCKETS_HAS_DLL 1
-#endif /* ! ACE_SOCKETS_HAS_DLL */
-
-#if defined (ACE_SOCKETS_HAS_DLL) && (ACE_SOCKETS_HAS_DLL == 1)
-#  if defined (ACE_SOCKETS_BUILD_DLL)
-#    define ACE_Sockets_Export ACE_Proper_Export_Flag
-#    define ACE_SOCKETS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_SOCKETS_BUILD_DLL */
-#    define ACE_Sockets_Export ACE_Proper_Import_Flag
-#    define ACE_SOCKETS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_SOCKETS_BUILD_DLL */
-#else /* ACE_SOCKETS_HAS_DLL == 1 */
-#  define ACE_Sockets_Export
-#  define ACE_SOCKETS_SINGLETON_DECLARATION(T)
-#  define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_SOCKETS_HAS_DLL == 1 */
-
-// Set ACE_SOCKETS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_SOCKETS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_SOCKETS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_SOCKETS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_SOCKETS_NTRACE */
-
-#if (ACE_SOCKETS_NTRACE == 1)
-#  define ACE_SOCKETS_TRACE(X)
-#else /* (ACE_SOCKETS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_SOCKETS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_SOCKETS_NTRACE == 1) */
-
-#endif /* ACE_SOCKETS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/ACE_Threads_export.h b/ace/ACE_Threads_export.h
deleted file mode 100644
index d19193d9127..00000000000
--- a/ace/ACE_Threads_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 -s ACE_Threads
-// ------------------------------
-#ifndef ACE_THREADS_EXPORT_H
-#define ACE_THREADS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_THREADS_HAS_DLL)
-#  define ACE_THREADS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_THREADS_HAS_DLL */
-
-#if !defined (ACE_THREADS_HAS_DLL)
-#  define ACE_THREADS_HAS_DLL 1
-#endif /* ! ACE_THREADS_HAS_DLL */
-
-#if defined (ACE_THREADS_HAS_DLL) && (ACE_THREADS_HAS_DLL == 1)
-#  if defined (ACE_THREADS_BUILD_DLL)
-#    define ACE_Threads_Export ACE_Proper_Export_Flag
-#    define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_THREADS_BUILD_DLL */
-#    define ACE_Threads_Export ACE_Proper_Import_Flag
-#    define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_THREADS_BUILD_DLL */
-#else /* ACE_THREADS_HAS_DLL == 1 */
-#  define ACE_Threads_Export
-#  define ACE_THREADS_SINGLETON_DECLARATION(T)
-#  define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_THREADS_HAS_DLL == 1 */
-
-// Set ACE_THREADS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_THREADS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_THREADS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_THREADS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_THREADS_NTRACE */
-
-#if (ACE_THREADS_NTRACE == 1)
-#  define ACE_THREADS_TRACE(X)
-#else /* (ACE_THREADS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_THREADS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_THREADS_NTRACE == 1) */
-
-#endif /* ACE_THREADS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/ACE_crc32.cpp b/ace/ACE_crc32.cpp
index 1320ed59085..f9e91c652ce 100644
--- a/ace/ACE_crc32.cpp
+++ b/ace/ACE_crc32.cpp
@@ -104,6 +104,9 @@ namespace
 
 #define COMPUTE(var, ch) (var) = (crc_table[(var ^ ch) & 0xFF] ^ (var >> 8))
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_UINT32
 ACE::crc32 (const char *string)
 {
@@ -143,7 +146,7 @@ ACE::crc32 (const iovec *iov, int len, ACE_UINT32 crc)
   for (int i = 0; i < len; ++i)
     {
       for (const char *p = (const char *) iov[i].iov_base,
-	              *e = (const char *) iov[i].iov_base + iov[i].iov_len;
+                      *e = (const char *) iov[i].iov_base + iov[i].iov_len;
            p != e;
            ++p)
         COMPUTE (crc, *p);
@@ -152,4 +155,7 @@ ACE::crc32 (const iovec *iov, int len, ACE_UINT32 crc)
   return ~crc;
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef COMPUTE
diff --git a/ace/ACE_crc_ccitt.cpp b/ace/ACE_crc_ccitt.cpp
index e81f3419831..f591b53aa10 100644
--- a/ace/ACE_crc_ccitt.cpp
+++ b/ace/ACE_crc_ccitt.cpp
@@ -71,6 +71,9 @@ namespace
 
 #define COMPUTE(var, ch) (var) = (crc_table[(var ^ ch) & 0xFF] ^ (var >> 8))
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_UINT16
 ACE::crc_ccitt (const char *string)
 {
@@ -110,7 +113,7 @@ ACE::crc_ccitt (const iovec *iov, int len, ACE_UINT16 crc)
   for (int i = 0; i < len; ++i)
     {
       for (const char *p = (const char *) iov[i].iov_base,
-	              *e = (const char *) iov[i].iov_base + iov[i].iov_len;
+                      *e = (const char *) iov[i].iov_base + iov[i].iov_len;
            p != e;
            ++p)
         COMPUTE (crc, *p);
@@ -119,4 +122,7 @@ ACE::crc_ccitt (const iovec *iov, int len, ACE_UINT16 crc)
   return ~crc;
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef COMPUTE
diff --git a/ace/ACE_export.h b/ace/ACE_export.h
index ac0722f3d90..e14f71bad90 100644
--- a/ace/ACE_export.h
+++ b/ace/ACE_export.h
@@ -52,13 +52,21 @@
 
 #if defined (__ACE_INLINE__)
 #  if defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32) || \
-      (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x560)
+      (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x560) || \
+      (defined (__HP_aCC) && (__HP_aCC >= 60500))
 #    define ACE_NAMESPACE_INLINE_FUNCTION inline
 #  else
 #    define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS inline
 #  endif
+#  define ACE_INLINE_TEMPLATE_FUNCTION inline
 #else
 #  define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS
+// Microsoft Visual C++ will accept 'extern'; others refuse.
+#  if defined (_MSC_VER) || defined (__BORLANDC__)
+#    define ACE_INLINE_TEMPLATE_FUNCTION ACE_Export
+#  else
+#    define ACE_INLINE_TEMPLATE_FUNCTION
+#  endif
 #endif
 
 #endif     /* ACE_EXPORT_H */
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index 8109c3c215c..97a3cd7ae1a 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -1,4 +1,3 @@
-// ARGV.cpp
 // $Id$
 
 // Transforms a string BUF into an ARGV-style vector of strings.
@@ -9,289 +8,15 @@
 #include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_Memory.h"
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_RCSID(ace, ARGV, "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE (ACE_ARGV)
-
-void
-ACE_ARGV::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_ARGV::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("argc_ = %d"), this->argc_));
-
-  ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this);
-
-  for (int i = 0; i < this->argc_; i++)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("\nargv_[%i] = %s"),
-                i,
-                this_obj->argv ()[i]));
-
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-// Creates this->argv_ out of this->buf_.  New memory is allocated for
-// each element of the array.  This is used by the array-to-string
-// style constructor and for creating this->argv_ when in iterative
-// mode.
-
-int
-ACE_ARGV::string_to_argv (void)
-{
-  ACE_TRACE ("ACE_ARGV::string_to_argv");
-
-  return ACE_OS::string_to_argv (this->buf_,
-                                 this->argc_,
-                                 this->argv_,
-                                 this->substitute_env_args_);
-}
-
-int
-ACE_ARGV::argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf)
-{
-  return ACE_OS::argv_to_string (argv, buf);
-}
-
-ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[],
-		    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_PTR_ARRAY),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR[] to ACE_TCHAR *[]");
-
-  if (buf == 0 || buf[0] == 0)
-    return;
-
-  // Make an internal copy of the string.
-  ACE_NEW (this->buf_,
-           ACE_TCHAR[ACE_OS::strlen (buf) + 1]);
-  ACE_OS::strcpy (this->buf_, buf);
-
-  // Create this->argv_.
-  if (this->string_to_argv () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("string_to_argv")));
-}
-
-ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[],
-		    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_STRING),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] to ACE_TCHAR[]");
-
-  if (argv == 0 || argv[0] == 0)
-    return;
-
-  this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args);
-}
-
-ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[],
-                    ACE_TCHAR *second_argv[],
-                    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_STRING),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] + ACE_TCHAR *[] to ACE_TCHAR[]");
-
-  int first_argc;
-  int second_argc;
-
-  ACE_TCHAR *first_buf;
-  ACE_TCHAR *second_buf;
-
-  // convert the first argv to a string
-  first_argc = this->argv_to_string (first_argv, first_buf);
-
-  // convert the second argv to a string
-  second_argc = this->argv_to_string (second_argv, second_buf);
-
-  // Add the number of arguments in both the argvs.
-  this->argc_ = first_argc + second_argc;
-
-  size_t buf_len =
-    ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1;
-
-  // Allocate memory to the lenght of the combined argv string.
-  ACE_NEW (this->buf_,
-           ACE_TCHAR[buf_len + 1]);
-
-  // copy the first argv string to the buffer
-  ACE_OS::strcpy (this->buf_, first_buf);
-
-  // concatenate the second argv string to the buffer
-  ACE_OS::strcat (this->buf_, second_buf);
-
-  //   Delete the first and second buffers
-
-  delete [] first_buf;
-
-  delete [] second_buf;
-}
-
-
-ACE_ARGV::ACE_ARGV (int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (ITERATIVE),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative");
-
-  // Nothing to do yet -- the user puts in arguments via add ()
-}
-
-int
-ACE_ARGV::add (const ACE_TCHAR *next_arg)
-{
-  // Only allow this to work in the "iterative" verion -- the
-  // ACE_ARGVs created with the one argument constructor.
-  if (this->state_ != ITERATIVE)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  // Put the new argument at the end of the queue.
-  if (this->queue_.enqueue_tail (const_cast <ACE_TCHAR *> (next_arg)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("Can't add more to ARGV queue")),
-                      -1);
-
-  this->length_ += ACE_OS::strlen (next_arg);
-
-  this->argc_++;
-
-  // Wipe argv_ and buf_ away so that they will be recreated if the
-  // user calls argv () or buf ().
-  if (this->argv_ != 0)
-    {
-      for (int i = 0; this->argv_[i] != 0; i++)
-	ACE_OS::free ((void *) this->argv_[i]);
-
-      delete [] this->argv_;
-      this->argv_ = 0;
-    }
-
-  delete [] this->buf_;
-  this->buf_ = 0;
-
-  return 0;
-}
-
-int
-ACE_ARGV::add (ACE_TCHAR *argv[])
-{
-  for (int i = 0; argv[i] != 0; i++)
-    if (this->add (argv[i]) == -1)
-      return -1;
-
-  return 0;
-}
-
-// Free up argv_ and buf_
-
-ACE_ARGV::~ACE_ARGV (void)
-{
-  ACE_TRACE ("ACE_ARGV::~ACE_ARGV");
-
-  if (this->argv_ != 0)
-    for (int i = 0; this->argv_[i] != 0; i++)
-      ACE_OS::free ((void *) this->argv_[i]);
-
-  delete [] this->argv_;
-  delete [] this->buf_;
-}
-
-// Create buf_ out of the queue_.  This is only used in the
-// "iterative" mode.
-
-int
-ACE_ARGV::create_buf_from_queue (void)
-{
-  ACE_TRACE ("ACE_ARGV::create_buf_from_queue");
-
-  // If the are no arguments, don't do anything
-  if (this->argc_ <= 0)
-    return -1;
-
-  delete [] this->buf_;
-
-  ACE_NEW_RETURN (this->buf_,
-                  ACE_TCHAR[this->length_ + this->argc_],
-                  -1);
-
-  // Get an iterator over the queue
-  ACE_Unbounded_Queue_Iterator<ACE_TCHAR *> iter (this->queue_);
-
-  ACE_TCHAR **arg;
-  ACE_TCHAR *ptr = this->buf_;
-  size_t len;
-  int more = 0;
-
-  while (!iter.done ())
-    {
-      // Get next argument from the queue.
-      iter.next (arg);
-
-      more = iter.advance ();
-
-      len = ACE_OS::strlen (*arg);
-
-      // Copy the argument into buf_
-      ACE_OS::memcpy ((void *) ptr,
-                      (const void *) (*arg),
-                      len * sizeof (ACE_TCHAR));
-      // Move the pointer down.
-      ptr += len;
-
-      // Put in an argument separating space.
-      if (more != 0)
-	*ptr++ = ' ';
-    }
-
-  // Put in the NUL terminator
-  *ptr = '\0';
+#if !defined (__ACE_INLINE__)
+template class ACE_TARGV<ACE_TCHAR>;
+#endif /* __ACE_INLINE__ */
 
-  return 0;
-}
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Queue<ACE_TCHAR *>;
-template class ACE_Unbounded_Queue_Iterator<ACE_TCHAR *>;
-template class ACE_Node<ACE_TCHAR *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Queue<ACE_TCHAR *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_TCHAR *>
-#pragma instantiate ACE_Node<ACE_TCHAR *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 9cb3ff73474..09c83fcca06 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -23,6 +23,9 @@
 
 #include "ace/Unbounded_Queue.h"
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TARGV
  *
@@ -31,7 +34,7 @@
  * variable values for tokens that are environment variable references.
  */
 template < typename CHAR_TYPE = char >
-class ACE_TARGV
+class ACE_Export ACE_TARGV
 {
 public:
   // = Initialization and termination.
@@ -178,7 +181,13 @@ private:
 
 typedef ACE_TARGV<ACE_TCHAR> ACE_ARGV;
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
 #include "ace/ARGV.inl"
+#endif /* __ACE_INLINE__ */
+
 
 #include /**/ "ace/post.h"
 #endif /* ACE_ARGUMENT_VECTOR_H */
diff --git a/ace/ARGV.inl b/ace/ARGV.inl
index 168dd3da866..f3342e403e9 100644
--- a/ace/ARGV.inl
+++ b/ace/ARGV.inl
@@ -7,6 +7,9 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template < typename CHAR_TYPE > void
 ACE_TARGV<CHAR_TYPE>::dump (void) const
 {
@@ -340,3 +343,6 @@ ACE_TARGV<CHAR_TYPE>::operator[] (size_t i)
 
   return (const CHAR_TYPE *) this->argv ()[i];
 }
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp
index 41273857113..1210917a0c5 100644
--- a/ace/ATM_Acceptor.cpp
+++ b/ace/ATM_Acceptor.cpp
@@ -14,6 +14,10 @@ ACE_RCSID(ace, ATM_Acceptor, "$Id$")
 #include "ace/ATM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
+
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Put the actual definitions of the ACE_ATM_Request and
 // ACE_ATM_Request_Queue classes here to hide them from clients...
 
@@ -298,4 +302,8 @@ ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap,
 #endif /* ACE_HAS_FORE_ATM_XTI */
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index 6305013601f..2f48f07638f 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -33,14 +33,21 @@
 
 #if defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM)
 #include "ace/SOCK_Acceptor.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_SOCK_Acceptor ATM_Acceptor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #elif defined (ACE_HAS_FORE_ATM_XTI)
 #include "ace/TLI_Acceptor.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_TLI_Acceptor ATM_Acceptor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif // ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
-class ACE_Time_Value
+class ACE_Time_Value;
 
 /**
  * @class ACE_ATM_Acceptor
@@ -75,8 +82,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. @a restart == 1
   /// means "restart if interrupted."
   int accept (ACE_ATM_Stream &new_sap,
               ACE_Addr *remote_addr = 0,
@@ -103,6 +110,10 @@ private:
   ATM_Acceptor acceptor_;
 };
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_Acceptor.inl b/ace/ATM_Acceptor.inl
index ba0630dd6d6..b63b68a9621 100644
--- a/ace/ATM_Acceptor.inl
+++ b/ace/ATM_Acceptor.inl
@@ -1,7 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ATM_Acceptor.i
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_ATM_Acceptor::dump (void) const
@@ -35,3 +37,6 @@ ACE_ATM_Acceptor::close (void)
   return 0;
 #endif // ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM
 }
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index 17cb7ef87c6..1c30b7f7a9a 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -17,6 +17,8 @@
 
 ACE_RCSID(ace, ATM_Addr, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Addr)
 
 #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2)
@@ -321,7 +323,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[])
         == SOCKET_ERROR) {
      ACE_OS::printf ("Error: WSALookupServiceBeginW failed! %d\n",
                      ::WSAGetLastError ());
-	   return -1;
+           return -1;
    }
 
    dwValue = sizeof (WSAQUERYSETW);
@@ -331,7 +333,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[])
      if (WSAGetLastError () != WSA_E_NO_MORE) {
        ACE_OS::printf ("Error: WSALookupServiceNextW failed! %d\n",
                        ::WSAGetLastError ());
-	     return -1;
+             return -1;
      }
    }
 
@@ -398,11 +400,11 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[],
   int i;
 
   if (addrlen < ATM_ADDR_SIZE + 1)
-	  return -1;
+          return -1;
 
   for (i = 0; i < ATM_ADDR_SIZE; i++) {
     buffer[ i * 3 ] = '\0';
-	  ACE_OS::sprintf (buffer, ACE_LIB_TEXT ("%s%02x."),
+          ACE_OS::sprintf (buffer, ACE_LIB_TEXT ("%s%02x."),
                      buffer,
                      atm_addr_.satm_number.Addr[ i ]);
   }
@@ -515,4 +517,6 @@ ACE_ATM_Addr::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index f498d12baf4..c3f112e8c1c 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -26,14 +26,21 @@
 #include "ace/Addr.h"
 
 #if defined (ACE_HAS_FORE_ATM_XTI)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ATMSAPAddress ATM_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #elif defined (ACE_HAS_FORE_ATM_WS2)
 #define FORE_NAME_SPACE NS_ALL
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct sockaddr_atm ATM_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #elif defined (ACE_HAS_LINUX_ATM)
 
 #include /**/ "atm.h"
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //pbrandao:as Linux has this 2 structs separeted we "link it" here
 typedef struct _linux_atm_addr
 {
@@ -177,6 +184,10 @@ private:
   ATM_Addr atm_addr_;
 };
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_Addr.inl b/ace/ATM_Addr.inl
index e2cf062a706..8120c6d11d5 100644
--- a/ace/ATM_Addr.inl
+++ b/ace/ATM_Addr.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE u_char
 ACE_ATM_Addr::get_selector (void) const
@@ -32,3 +33,5 @@ ACE_ATM_Addr::set_selector (u_char selector)
   ACE_UNUSED_ARG (selector);
 #endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp
index 07811ffc264..bff8ddad5bd 100644
--- a/ace/ATM_Connector.cpp
+++ b/ace/ATM_Connector.cpp
@@ -12,6 +12,9 @@ ACE_RCSID(ace, ATM_Connector, "$Id$")
 #include "ace/ATM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector)
 
 ACE_ATM_Connector::ACE_ATM_Connector (void)
@@ -129,4 +132,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
 #endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index 151f3e9978b..8ac6b970439 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -28,12 +28,20 @@
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_LINUX_ATM)
 #include "ace/SOCK_Connector.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_SOCK_Connector ATM_Connector;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #else
 #include "ace/XTI_ATM_Mcast.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_XTI_ATM_Mcast ATM_Connector;
+// Open versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_ATM_Connector
  *
@@ -149,6 +157,9 @@ private:
   ATM_Connector connector_;
 };
 
+// Open versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_Connector.inl b/ace/ATM_Connector.inl
index 50bde9ce55f..f301aa781f5 100644
--- a/ace/ATM_Connector.inl
+++ b/ace/ATM_Connector.inl
@@ -1,7 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ATM_Connector.i
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_ATM_Connector::dump (void) const
@@ -12,13 +14,13 @@ ACE_ATM_Connector::dump (void) const
 }
 
 ACE_INLINE
-ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, 
-                                      const ACE_ATM_Addr &remote_sap, 
+ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream,
+                                      const ACE_ATM_Addr &remote_sap,
                                       ACE_ATM_Params params,
                                       ACE_ATM_QoS options,
                                       ACE_Time_Value *timeout,
-                                      const ACE_ATM_Addr &local_sap, 
-                                      int reuse_addr, 
+                                      const ACE_ATM_Addr &local_sap,
+                                      int reuse_addr,
                                       int flags,
                                       int perms)
 {
@@ -29,11 +31,11 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream,
                                  options,
                                  timeout,
                                  local_sap,
-                                 reuse_addr, 
+                                 reuse_addr,
                                  flags,
                                  perms) == ACE_INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  
+    ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream")));
 }
 
@@ -41,9 +43,9 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream,
 
 ACE_INLINE
 int
-ACE_ATM_Connector::complete (ACE_ATM_Stream &new_stream, 
-			     ACE_ATM_Addr *remote_sap,
-			     ACE_Time_Value *tv)
+ACE_ATM_Connector::complete (ACE_ATM_Stream &new_stream,
+                             ACE_ATM_Addr *remote_sap,
+                             ACE_Time_Value *tv)
 {
   ACE_TRACE ("ACE_ATM_Connector::complete");
 #if defined (ACE_HAS_ATM)
@@ -80,18 +82,18 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream &current_stream,
                             &cqos,
                             0,
                             (JL_SENDER_ONLY));
- 
+
   ACE_OS::printf( "ATM_Connector::add_leaf: connecting...\n" );
 
   ACE_HANDLE result = ACE_OS::join_leaf(current_stream.get_handle(),
-                                        (struct sockaddr *)saddr, 
+                                        (struct sockaddr *)saddr,
                                         addr_len,
                                         qos_params);
-  
-  if ( result == ACE_INVALID_HANDLE ) 
-    ACE_OS::printf( "ATM_Connector(add_leaf): connection failed, %d\n", 
+
+  if ( result == ACE_INVALID_HANDLE )
+    ACE_OS::printf( "ATM_Connector(add_leaf): connection failed, %d\n",
                     ::WSAGetLastError());
-  
+
   return (result != ACE_INVALID_HANDLE);
 #elif defined (ACE_HAS_LINUX_ATM)
   ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux \n");
@@ -116,13 +118,15 @@ int
 ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  // Reset the event association 
+  // Reset the event association
   return ::WSAEventSelect ((SOCKET) handle,
                            0,
-                           0);    
+                           0);
 #else /* !defined ACE_HAS_WINSOCK2 */
   ACE_UNUSED_ARG (handle);
   return 0;
 #endif /* ACE_WIN32 */
 }
 
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_Params.cpp b/ace/ATM_Params.cpp
index 1777616858d..cc6ec674ece 100644
--- a/ace/ATM_Params.cpp
+++ b/ace/ATM_Params.cpp
@@ -2,15 +2,19 @@
 
 #include "ace/ATM_Params.h"
 
-ACE_RCSID(ace, ATM_Params, "$Id$")
-
 #if defined (ACE_HAS_ATM)
 
+ACE_RCSID(ace, ATM_Params, "$Id$")
+
 #if !defined (__ACE_INLINE__)
 #include "ace/ATM_Params.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Params)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_ATM */
 
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index 1056c1bb728..2ae36a6a4a4 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -49,6 +49,8 @@ typedef int Param_Info;
 typedef int Param_Udata;
 #endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_ATM_Params
  *
@@ -201,6 +203,8 @@ private:
   int oflag_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_Params.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_Params.inl b/ace/ATM_Params.inl
index 4006d4d00b5..5d60f6ba920 100644
--- a/ace/ATM_Params.inl
+++ b/ace/ATM_Params.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ATM_Params.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_ATM_Params::dump (void) const
@@ -96,7 +97,7 @@ ACE_ATM_Params::set_type (int type)
 }
 
 ACE_INLINE
-ACE_Protocol_Info* 
+ACE_Protocol_Info*
 ACE_ATM_Params::get_protocol_info( void )
 {
   ACE_TRACE ("ACE_ATM_Params::get_protocol_info");
@@ -104,7 +105,7 @@ ACE_ATM_Params::get_protocol_info( void )
 }
 
 ACE_INLINE
-void 
+void
 ACE_ATM_Params::set_protocol_info( ACE_Protocol_Info *protocol_info )
 {
   ACE_TRACE ("ACE_ATM_Params::set_protocol_info");
@@ -112,7 +113,7 @@ ACE_ATM_Params::set_protocol_info( ACE_Protocol_Info *protocol_info )
 }
 
 ACE_INLINE
-ACE_SOCK_GROUP 
+ACE_SOCK_GROUP
 ACE_ATM_Params::get_sock_group( void )
 {
   ACE_TRACE ("ACE_ATM_Params::get_sock_group");
@@ -120,7 +121,7 @@ ACE_ATM_Params::get_sock_group( void )
 }
 
 ACE_INLINE
-void 
+void
 ACE_ATM_Params::set_sock_group( ACE_SOCK_GROUP g )
 {
   ACE_TRACE ("ACE_ATM_Params::set_sock_group");
@@ -128,7 +129,7 @@ ACE_ATM_Params::set_sock_group( ACE_SOCK_GROUP g )
 }
 
 ACE_INLINE
-u_long 
+u_long
 ACE_ATM_Params::get_flags( void )
 {
   ACE_TRACE ("ACE_ATM_Params::get_flags");
@@ -136,7 +137,7 @@ ACE_ATM_Params::get_flags( void )
 }
 
 ACE_INLINE
-void 
+void
 ACE_ATM_Params::set_flags( u_long flags)
 {
   ACE_TRACE ("ACE_ATM_Params::set_flags");
@@ -231,3 +232,4 @@ ACE_ATM_Params::set_oflag (int oflag)
   oflag_ = oflag;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp
index 6d713cf8579..814834571cf 100644
--- a/ace/ATM_QoS.cpp
+++ b/ace/ATM_QoS.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(ace, ATM_QoS, "$Id$")
 #include "ace/ATM_QoS.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2)
 #define BHLI_MAGIC "FORE_ATM"
 // This is line rate in cells/s for an OC-3 MM interface.
@@ -153,25 +155,25 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
     + sizeof( ATM_QOS_CLASS_IE );
   ACE_OS::memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE));
 
-  //	qos_.SendingFlowspec.TokenRate = 0xffffffff;
-  //	qos_.SendingFlowspec.TokenBucketSize = 0xffffffff;
-  //	qos_.SendingFlowspec.PeakBandwidth = 0xffffffff;
-  //	qos_.SendingFlowspec.Latency = 0xffffffff;
-  //	qos_.SendingFlowspec.DelayVariation = 0xffffffff;
-  //	qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
+  //    qos_.SendingFlowspec.TokenRate = 0xffffffff;
+  //    qos_.SendingFlowspec.TokenBucketSize = 0xffffffff;
+  //    qos_.SendingFlowspec.PeakBandwidth = 0xffffffff;
+  //    qos_.SendingFlowspec.Latency = 0xffffffff;
+  //    qos_.SendingFlowspec.DelayVariation = 0xffffffff;
+  //    qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
-  //	qos_.SendingFlowspec.MaxSduSize = 0xffffffff;
-  //	qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff;
-
-  //	qos_.ReceivingFlowspec.TokenRate = 0xffffffff;
-  //	qos_.ReceivingFlowspec.TokenBucketSize = 0xffffffff;
-  //	qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff;
-  //	qos_.ReceivingFlowspec.Latency = 0xffffffff;
-  //	qos_.ReceivingFlowspec.DelayVariation = 0xffffffff;
-  //	qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
+  //    qos_.SendingFlowspec.MaxSduSize = 0xffffffff;
+  //    qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff;
+
+  //    qos_.ReceivingFlowspec.TokenRate = 0xffffffff;
+  //    qos_.ReceivingFlowspec.TokenBucketSize = 0xffffffff;
+  //    qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff;
+  //    qos_.ReceivingFlowspec.Latency = 0xffffffff;
+  //    qos_.ReceivingFlowspec.DelayVariation = 0xffffffff;
+  //    qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT;
   // This will most probably be ignored by the service provider.
-  //	qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff;
-  //	qos_.ReceivingFlowspec.MinimumPolicedSize = 0;
+  //    qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff;
+  //    qos_.ReceivingFlowspec.MinimumPolicedSize = 0;
 
   ACE_Flow_Spec send_fspec( 0xffffffff,
                             0xffffffff,
@@ -346,7 +348,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
   // Peak bandwidth is in bytes/sec. The rate is specified in cells/sec so
   //  we need to convert from cells/sec to bytes/sec (i.e., multiply by 53).
   qos_.SendingFlowspec.PeakBandwidth = rate * BYTES_PER_ATM_CELL;
-  qos_.SendingFlowspec.Latency = -1;	// we don't care too much
+  qos_.SendingFlowspec.Latency = -1;    // we don't care too much
   qos_.SendingFlowspec.DelayVariation = -1; // we don't care too much
   // no provider-specific data allowed on ATM
   qos_.ProviderSpecific.buf=0;
@@ -478,7 +480,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       // signal the UNI 3.1 Calling Party ID Information Element.
       t_atm_addr *source_addr;
 
-      popt->len	= sizeof (struct t_opthdr) + sizeof (t_atm_addr);
+      popt->len = sizeof (struct t_opthdr) + sizeof (t_atm_addr);
       popt->level = T_ATM_SIGNALING;
       popt->name = T_ATM_ORIG_ADDR;
       popt->status = 0;
@@ -530,7 +532,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       struct t_atm_traffic *traffic;
 
       // T_ATM_BEARER_CAP: Broadband bearer capability
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_bearer);
+      popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_bearer);
       popt->level = T_ATM_SIGNALING;
       popt->name = T_ATM_BEARER_CAP;
       popt->status = 0;
@@ -546,7 +548,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
         }
       else
         {
-          bearer->traffic_type	 = 0; // UBR
+          bearer->traffic_type   = 0; // UBR
           bearer->timing_requirements = 0;
         }
       bearer->clipping_susceptibility = T_ATM_NULL;
@@ -559,7 +561,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       popt = T_OPT_NEXTHDR (buf, info.options, popt);
 
       // T_ATM_TRAFFIC: traffic descriptor
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_traffic);
+      popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_traffic);
       popt->level = T_ATM_SIGNALING;
       popt->name = T_ATM_TRAFFIC;
       popt->status = 0;
@@ -576,13 +578,13 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       traffic->forward.tagging = T_NO;
 
       traffic->backward.PCR_high_priority = T_ATM_ABSENT;
-      traffic->backward.PCR_all_traffic	=
+      traffic->backward.PCR_all_traffic =
         (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP))
         ? 0 : qos_cells ? qos_cells : LINE_RATE;
       traffic->backward.SCR_high_priority = T_ATM_ABSENT;
-      traffic->backward.SCR_all_traffic	= T_ATM_ABSENT;
+      traffic->backward.SCR_all_traffic = T_ATM_ABSENT;
       traffic->backward.MBS_high_priority = T_ATM_ABSENT;
-      traffic->backward.MBS_all_traffic	= T_ATM_ABSENT;
+      traffic->backward.MBS_all_traffic = T_ATM_ABSENT;
       traffic->backward.tagging = T_NO;
 
       traffic->best_effort = qos_cells ? T_NO : T_YES;
@@ -597,7 +599,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
       struct t_atm_qos *qos;
 
       // T_ATM_QOS: Quality of Service
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_qos);
+      popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_qos);
       popt->level = T_ATM_SIGNALING;
       popt->name = T_ATM_QOS;
       popt->status = 0;
@@ -623,5 +625,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
 #endif /* ACE_HAS_FORE_ATM_WS2 */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_ATM */
 
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index c29962d80fc..41a4dafab6e 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -24,18 +24,28 @@
 #if defined (ACE_HAS_ATM)
 
 #if defined (ACE_HAS_FORE_ATM_WS2)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // just map to WS2 GQOS struct
 typedef ACE_QoS ATM_QoS;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #elif defined (ACE_HAS_FORE_ATM_XTI)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct netbuf ATM_QoS;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #elif defined (ACE_HAS_LINUX_ATM)
 #include /**/ "atm.h"
 #include "ace/ATM_Params.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct atm_qos ATM_QoS;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #else
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef int ATM_QoS;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_FORE_ATM_XTI || ACE_HAS_LINUX_ATM */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_ATM_QoS
  *
@@ -94,6 +104,8 @@ private:
   ATM_QoS qos_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_QoS.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_QoS.inl b/ace/ATM_QoS.inl
index ac5b7de890f..283baa3f560 100644
--- a/ace/ATM_QoS.inl
+++ b/ace/ATM_QoS.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ATM_QoS.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_ATM_QoS::dump (void) const
@@ -24,3 +25,5 @@ ACE_ATM_QoS::get_qos (void)
   ACE_TRACE ("ACE_ATM_QoS::get_qos");
   return qos_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp
index 898a627c694..c6de5d4b533 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (ace, ATM_Stream, "$Id$")
 #include "ace/ATM_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_ATM_Stream)
 
 char*
@@ -283,4 +285,6 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi,
 #endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index 7741eeab366..e1bb9257c9e 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -28,12 +28,18 @@
 
 #if defined (ACE_WIN32)
 #include "ace/SOCK_Stream.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_SOCK_Stream ATM_Stream;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #else
 #include "ace/TLI_Stream.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_TLI_Stream ATM_Stream;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_ATM_Stream
  *
@@ -90,6 +96,8 @@ private:
   ATM_Stream stream_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/ATM_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/ATM_Stream.inl b/ace/ATM_Stream.inl
index 9c11fd93b7c..b796af474e7 100644
--- a/ace/ATM_Stream.inl
+++ b/ace/ATM_Stream.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ATM_Stream.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_ATM_Stream::dump (void) const
@@ -129,3 +130,4 @@ ACE_ATM_Stream::send_n (const void *buf,
 #endif /* ACE_HAS_FORE_ATM_XTI */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index bd6435f1a77..8dfb0662c49 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (ace,
            Acceptor,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor)
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
@@ -1221,4 +1223,6 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPT
   return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_ACCEPTOR_CPP */
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index 138c6766de3..a1ebcd9c055 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -24,6 +24,7 @@
 #include "ace/Strategies_T.h"
 #include "ace/Synch_Options.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Acceptor
@@ -64,16 +65,37 @@ public:
                 int use_select = 1);
 
   /**
-   * Initialize and register {this} with the Reactor and listen for
-   * connection requests at the designated {local_addr}.  {flags}
-   * indicates how {SVC_HANDLER}'s should be initialized prior to
-   * being activated.  Right now, the only flag that is processed is
-   * {ACE_NONBLOCK}, which enabled non-blocking I/O on the
-   * {SVC_HANDLER} when it is opened.  If {use_select} is non-zero
-   * then {select} is used to determine when to break out of the
-   * {accept} loop.  {reuse_addr} is passed down to the
-   * {PEER_ACCEPTOR}.  If it is non-zero this will allow the OS to
-   * reuse this listen port.
+   * Open the contained @c PEER_ACCEPTOR object to begin listening, and
+   * register with the specified reactor for accept events.  An
+   * acceptor can only listen to one port at a time, so make sure to
+   * @c close() the acceptor before calling @c open() again.
+   *
+   * The @c PEER_ACCEPTOR handle is put into non-blocking mode as a
+   * safeguard against the race condition that can otherwise occur
+   * between the time when the passive-mode socket handle is "ready"
+   * and when the actual @c accept() call is made.  During this
+   * interval, the client can shutdown the connection, in which case,
+   * the @c accept() call can hang.
+   *
+   * @param local_addr The address to listen at.
+   * @param reactor    Pointer to the ACE_Reactor instance to register
+   *                   this object with. The default is the singleton.
+   * @param flags      Flags to control what mode an accepted socket
+   *                   will be put into after it is accepted. The only
+   *                   legal value for this argument is @c ACE_NONBLOCK,
+   *                   which enables non-blocking mode on the accepted
+   *                   peer stream object in @c SVC_HANDLER.  The default
+   *                   is 0.
+   * @param use_select Affects behavior when called back by the reactor
+   *                   when a connection can be accepted.  If non-zero,
+   *                   this object will accept all pending connections,
+   *                   intead of just the one that triggered the reactor
+   *                   callback.  Uses ACE_OS::select() internally to
+   *                   detect any remaining acceptable connections.
+   *                   The default is 1.
+   * @param reuse_addr Passed to the @c PEER_ACCEPTOR::open() method with
+   *                   @p local_addr.  Generally used to request that the
+   *                   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 (),
@@ -83,7 +105,9 @@ public:
 
   /**
    * Open the contained @c PEER_ACCEPTOR object to begin listening, and
-   * register with the specified reactor for accept events.
+   * register with the specified reactor for accept events.  An
+   * acceptor can only listen to one port at a time, so make sure to
+   * @c close() the acceptor before calling @c open() again.
    *
    * The @c PEER_ACCEPTOR handle is put into non-blocking mode as a
    * safeguard against the race condition that can otherwise occur
@@ -644,6 +668,8 @@ private:
   int delete_concurrency_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp
index 74aba6c7734..28b91b82bd9 100644
--- a/ace/Activation_Queue.cpp
+++ b/ace/Activation_Queue.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            Activation_Queue,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Activation_Queue::dump (void) const
 {
@@ -59,7 +61,7 @@ ACE_Activation_Queue::~ACE_Activation_Queue (void)
 ACE_Method_Request *
 ACE_Activation_Queue::dequeue (ACE_Time_Value *tv)
 {
-  ACE_Message_Block *mb;
+  ACE_Message_Block *mb = 0;
 
   // Dequeue the message.
   if (this->queue_->dequeue_head (mb, tv) != -1)
@@ -79,7 +81,7 @@ int
 ACE_Activation_Queue::enqueue (ACE_Method_Request *mr,
                                ACE_Time_Value *tv)
 {
-  ACE_Message_Block *mb;
+  ACE_Message_Block *mb = 0;
 
   // We pass sizeof (*mr) here so that flow control will work
   // correctly.  Since we also pass <mr> note that no unnecessary
@@ -100,7 +102,7 @@ ACE_Activation_Queue::enqueue (ACE_Method_Request *mr,
                          -1);
 
   // Enqueue in priority order.
-  int result = this->queue_->enqueue_prio (mb, tv);
+  int const result = this->queue_->enqueue_prio (mb, tv);
 
   // Free ACE_Message_Block if enqueue_prio failed.
   if (result == -1)
@@ -108,3 +110,5 @@ ACE_Activation_Queue::enqueue (ACE_Method_Request *mr,
 
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index 9a370d2cdf6..26d51c9dcf1 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -16,13 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
-
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +28,9 @@
 /// Define to be compatible with the terminology in the POSA2 book!
 #define ACE_Activation_List ACE_Activation_Queue
 
-class ACE_Method_Request;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class ACE_Method_Request;
 
 /**
  * @class ACE_Activation_Queue
@@ -52,7 +47,7 @@ class ACE_Method_Request;
  *
  * @sa ACE_Method_Request
  */
-class ACE_Threads_Export ACE_Activation_Queue
+class ACE_Export ACE_Activation_Queue
 {
 public:
   // = Initialization and termination methods.
@@ -116,7 +111,8 @@ public:
    *            earlier, however, if queue is closed, deactivated, or when
    *            a signal occurs.
    *
-   * @retval    0 on success.
+   * @retval    >0 The number of method requests on the queue after adding
+   *            the specified request.
    * @retval    -1 if an error occurs; errno contains further information. If
    *            the specified timeout elapses, errno will be @c EWOULDBLOCK.
    */
@@ -144,7 +140,14 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
+private:
+
+  // = Prevent copying and assignment.
+  ACE_Activation_Queue (const ACE_Activation_Queue &);
+  void operator= (const ACE_Activation_Queue &);
+
 protected:
+
   /// Stores the Method_Requests.
   ACE_Message_Queue<ACE_SYNCH> *queue_;
 
@@ -152,21 +155,20 @@ protected:
   int delete_queue_;
 
 private:
+
   /// Allocation strategy of the queue.
   ACE_Allocator *allocator_;
 
   /// Allocation strategy of the message blocks.
   ACE_Allocator *data_block_allocator_;
 
-  // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Activation_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_ACTIVATION_QUEUE_H */
-
diff --git a/ace/Activation_Queue.inl b/ace/Activation_Queue.inl
index b4b9283bced..466635d859c 100644
--- a/ace/Activation_Queue.inl
+++ b/ace/Activation_Queue.inl
@@ -1,22 +1,23 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Activation_Queue.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE size_t
-ACE_Activation_Queue::method_count (void) const 
+ACE_Activation_Queue::method_count (void) const
 {
   return queue_->message_count ();
 }
 
-ACE_INLINE int 
-ACE_Activation_Queue::is_full (void) const 
+ACE_INLINE int
+ACE_Activation_Queue::is_full (void) const
 {
   return queue_->is_full ();
-} 
+}
 
-ACE_INLINE int 
-ACE_Activation_Queue::is_empty (void) const 
+ACE_INLINE int
+ACE_Activation_Queue::is_empty (void) const
 {
   return queue_->is_empty ();
 }
@@ -27,8 +28,10 @@ ACE_Activation_Queue::queue (void) const
   return queue_;
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Activation_Queue::queue (ACE_Message_Queue<ACE_SYNCH> *q)
 {
   queue_ = q;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Active_Map_Manager.cpp b/ace/Active_Map_Manager.cpp
index 47e734d044d..6f4b66191c7 100644
--- a/ace/Active_Map_Manager.cpp
+++ b/ace/Active_Map_Manager.cpp
@@ -7,4 +7,3 @@ ACE_RCSID(ace, Active_Map_Manager, "$Id$")
 #if !defined (__ACE_INLINE__)
 #include "ace/Active_Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
-
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 7764ba11aa1..7e3bb348058 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -23,6 +23,8 @@
 
 #include "ace/Basic_Types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Active_Map_Manager_Key
  *
@@ -101,6 +103,8 @@ private:
   key_data key_data_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Active_Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Active_Map_Manager.inl b/ace/Active_Map_Manager.inl
index 491b25430b7..652cf7c1f71 100644
--- a/ace/Active_Map_Manager.inl
+++ b/ace/Active_Map_Manager.inl
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void)
 {
@@ -89,3 +91,5 @@ ACE_Active_Map_Manager_Key::encode (void *data) const
                   &this->key_data_,
                   sizeof this->key_data_);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Active_Map_Manager_T.cpp b/ace/Active_Map_Manager_T.cpp
index b4fbf30cfa5..b8cd14446ac 100644
--- a/ace/Active_Map_Manager_T.cpp
+++ b/ace/Active_Map_Manager_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_ACTIVE_MAP_MANAGER_T_C
-#define ACE_ACTIVE_MAP_MANAGER_T_C
+#ifndef ACE_ACTIVE_MAP_MANAGER_T_CPP
+#define ACE_ACTIVE_MAP_MANAGER_T_CPP
 
 #include "ace/Active_Map_Manager_T.h"
 
@@ -13,8 +13,10 @@
 #include "ace/Active_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Active_Map_Manager_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Active_Map_Manager)
 
-#endif /* ACE_ACTIVE_MAP_MANAGER_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_ACTIVE_MAP_MANAGER_T_CPP */
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index f3e90b3f744..2194f8194de 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -24,6 +24,8 @@
 
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Active_Map_Manager
  *
@@ -191,6 +193,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager (const ACE_Active_Map_Manager<T> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Active_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Active_Map_Manager_T.inl b/ace/Active_Map_Manager_T.inl
index fd9ff0df6c6..124f76c48c4 100644
--- a/ace/Active_Map_Manager_T.inl
+++ b/ace/Active_Map_Manager_T.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE int
 ACE_Active_Map_Manager<T>::bind (ACE_Active_Map_Manager_Key &key,
                                  T *&internal_value)
@@ -304,3 +307,5 @@ ACE_Active_Map_Manager<T>::rend (void)
 {
   return ACE_AMM_BASE::rend ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Addr.cpp b/ace/Addr.cpp
index a627d8262c0..6b4e3770f33 100644
--- a/ace/Addr.cpp
+++ b/ace/Addr.cpp
@@ -15,6 +15,8 @@ ACE_RCSID (ace,
 #include "ace/Log_Msg.h"
 #include "ace/os_include/sys/os_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Note: this object requires static construction and destruction.
 /* static */
 const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1);
@@ -66,3 +68,5 @@ ACE_Addr::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Addr.h b/ace/Addr.h
index 654b1fc4355..53fba544456 100644
--- a/ace/Addr.h
+++ b/ace/Addr.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Addr
  *
@@ -91,6 +93,8 @@ protected:
   int addr_size_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Addr.inl b/ace/Addr.inl
index 34457d86612..3780e04b6aa 100644
--- a/ace/Addr.inl
+++ b/ace/Addr.inl
@@ -4,19 +4,20 @@
 
 // Return the address of the address.
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE bool
 ACE_Addr::operator == (const ACE_Addr &sap) const
 {
   return (sap.addr_type_ == this->addr_type_ &&
-	  sap.addr_size_ == this->addr_size_   );
+          sap.addr_size_ == this->addr_size_   );
 }
 
 ACE_INLINE bool
 ACE_Addr::operator != (const ACE_Addr &sap) const
 {
   return (sap.addr_type_ != this->addr_type_ ||
-	  sap.addr_size_ != this->addr_size_   );
+          sap.addr_size_ != this->addr_size_   );
 }
 
 // Return the size of the address.
@@ -56,3 +57,5 @@ ACE_Addr::hash (void) const
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp
index e24baecc6eb..f29f2522ca7 100644
--- a/ace/Arg_Shifter.cpp
+++ b/ace/Arg_Shifter.cpp
@@ -1,9 +1,14 @@
 #include "ace/Arg_Shifter.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_Errno.h"
-#include "ace/OS_Memory.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Arg_Shifter.inl"
+#endif /* __ACE_INLINE__ */
+
 
 ACE_RCSID (ace,
            Arg_Shifter,
            "$Id$")
+
+#if !defined (__ACE_INLINE__)
+template class ACE_TArg_Shifter< ACE_TCHAR >;
+#endif /* __ACE_INLINE__ */
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index dbae5593674..b63a9d8d82d 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Arg_Shifter
  *
@@ -202,7 +204,12 @@ private:
 
 typedef ACE_TArg_Shifter< ACE_TCHAR > ACE_Arg_Shifter;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
 #include "ace/Arg_Shifter.inl"
+#endif /* __ACE_INLINE__ */
+
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Arg_Shifter.inl b/ace/Arg_Shifter.inl
index 42e882556c8..eb11e4c42b4 100644
--- a/ace/Arg_Shifter.inl
+++ b/ace/Arg_Shifter.inl
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
@@ -8,6 +9,8 @@ ACE_RCSID (ace,
            Arg_Shifter,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template < typename CHAR_TYPE >
 ACE_TArg_Shifter<CHAR_TYPE>::ACE_TArg_Shifter (int& argc,
                                   const CHAR_TYPE** argv,
@@ -219,3 +222,5 @@ ACE_TArg_Shifter<CHAR_TYPE>::num_ignored_args (void) const
 {
   return this->front_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp
index 044f734d7d9..78d2788c331 100644
--- a/ace/Argv_Type_Converter.cpp
+++ b/ace/Argv_Type_Converter.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv)
 : saved_argc_ (argc)
 , char_argv_ (0)
@@ -193,3 +195,5 @@ ACE_Argv_Type_Converter::cleanup (void)
   this->wchar_passed_ = false;
   this->char_passed_ = false;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h
index 7cc09f4974b..381448af6ab 100644
--- a/ace/Argv_Type_Converter.h
+++ b/ace/Argv_Type_Converter.h
@@ -22,6 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Argv_Type_Converter
@@ -103,6 +104,8 @@ private:
   bool char_passed_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Argv_Type_Converter.inl"
 #endif  /* __ACE_INLINE__ */
diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl
index fcb0c1d6263..54b9ed2dfc1 100644
--- a/ace/Argv_Type_Converter.inl
+++ b/ace/Argv_Type_Converter.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_TCHAR**
 ACE_Argv_Type_Converter::get_TCHAR_argv (void)
@@ -43,3 +44,5 @@ ACE_Argv_Type_Converter::get_argc (void)
 {
   return this->saved_argc_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Array.h b/ace/Array.h
index be28d342eef..c3159cd7a89 100644
--- a/ace/Array.h
+++ b/ace/Array.h
@@ -6,7 +6,9 @@
  *
  *  $Id$
  *
- *  NOTE: this file has been deprecated and will soon go away.  You
+ *  @deprecated
+ *
+ *  @note This file has been deprecated and will soon go away.  You
  *  should directly include "Containers_T.h" instead.
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp
index a054d900045..ece933009d6 100644
--- a/ace/Array_Base.cpp
+++ b/ace/Array_Base.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_ARRAY_BASE_C
-#define ACE_ARRAY_BASE_C
+#ifndef ACE_ARRAY_BASE_CPP
+#define ACE_ARRAY_BASE_CPP
 
 #include "ace/Array_Base.h"
 
@@ -14,20 +14,11 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Malloc_Base.h"
-
-#if defined (_MSC_VER) && _MSC_VER == 1200 && !defined (ACE_HAS_WINCE)
-#  include <new>  /* For placement new() operator. */
-#endif  /* _MSC_VER == 1200 */
-
 #include "ace/os_include/os_errno.h"
 
-ACE_RCSID (ace,
-	   Array_Base,
-	   "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Dynamically initialize an array.
-
 template <class T>
 ACE_Array_Base<T>::ACE_Array_Base (size_t size,
                                    ACE_Allocator *alloc)
@@ -210,4 +201,6 @@ ACE_Array_Iterator<T>::next (T *&item)
     }
 }
 
-#endif /* ACE_ARRAY_BASE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_ARRAY_BASE_CPP */
diff --git a/ace/Array_Base.h b/ace/Array_Base.h
index 7b785e404b7..dd02278dc90 100644
--- a/ace/Array_Base.h
+++ b/ace/Array_Base.h
@@ -22,6 +22,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/Malloc_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 template <class T> class ACE_Array_Iterator;
 
@@ -117,7 +119,7 @@ public:
    */
   int max_size (size_t new_size);
 
-private:
+protected:
   /// Returns 1 if <slot> is within range, i.e., 0 >= <slot> <
   /// <cur_size_>, else returns 0.
   int in_range (size_t slot) const;
@@ -190,6 +192,8 @@ private:
   ACE_Array_Base<T> &array_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Array_Base.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Array_Base.inl b/ace/Array_Base.inl
index f5698deb9eb..3afc27e69b8 100644
--- a/ace/Array_Base.inl
+++ b/ace/Array_Base.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // Clean up the array (e.g., delete dynamically allocated memory).
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE
 ACE_Array_Base<T>::~ACE_Array_Base (void)
 {
@@ -84,3 +87,5 @@ ACE_Array_Iterator<T>::done (void) const
 
   return this->current_ >= array_.size ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Array_Map.cpp b/ace/Array_Map.cpp
index 01fbf4cdcae..3db24968a63 100644
--- a/ace/Array_Map.cpp
+++ b/ace/Array_Map.cpp
@@ -11,6 +11,7 @@
 
 #include <algorithm>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #ifndef ACE_LACKS_MEMBER_TEMPLATES
 template<typename Key, typename Value, class EqualTo>
@@ -80,12 +81,7 @@ ACE_Array_Map<Key, Value, EqualTo>::swap (
 }
 
 template<typename Key, typename Value, class EqualTo>
-#if defined (_MSC_VER) && (_MSC_VER <= 1200)
-// MSVC++ 6 doesn't like the typename qualification.
-std::pair<ACE_Array_Map<Key, Value, EqualTo>::iterator, bool>
-#else
 std::pair<typename ACE_Array_Map<Key, Value, EqualTo>::iterator, bool>
-#endif  /* _MSC_VER <= 1200 */
 ACE_Array_Map<Key, Value, EqualTo>::insert (
   typename ACE_Array_Map<Key, Value, EqualTo>::value_type const & x)
 {
@@ -281,4 +277,6 @@ operator< (ACE_Array_Map<Key, Value, EqualTo> const & lhs,
                                        rhs.begin (), rhs.end ());
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_ARRAY_MAP_CPP */
diff --git a/ace/Array_Map.h b/ace/Array_Map.h
index 5952397aa2e..3425e917d4c 100644
--- a/ace/Array_Map.h
+++ b/ace/Array_Map.h
@@ -32,6 +32,7 @@
 #include <iterator>
 #include <functional>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Array_Map
@@ -101,17 +102,15 @@ public:
   typedef ptrdiff_t                      difference_type;
   typedef size_t                         size_type;
 
-#if ((defined (_MSC_VER) && (_MSC_VER <= 1200)) || \
-     (defined (_MSC_VER) && !defined (_CPPLIB_VER)))
-  // MSVC++ 6 doesn't define a standard's compliant reverse_iterator,
-  // also the latest Platform SDK's don't do this.
-  //
+#if ((defined (_MSC_VER) && !defined (_CPPLIB_VER)))
+  // the latest Platform SDK's doesn't define a standard's compliant
+  // reverse_iterator,
   // It seems when there is no _CPPLIB_VER defined, then we can assume
   // also that the SDK is old.
   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 <= 0x570 \
+#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \
       && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
   typedef std::reverse_iterator<iterator,
                                 std::input_iterator_tag,
@@ -128,7 +127,7 @@ public:
 #else
   typedef std::reverse_iterator<iterator>       reverse_iterator;
   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#endif  /* _MSC_VER <= 1200 */
+#endif  /* _MSC_VER */
 
   /// Default Constructor.
   /**
@@ -300,6 +299,8 @@ bool operator<  (ACE_Array_Map<Key, Value, EqualTo> const & lhs,
 
 // --------------------------------------------------------------
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #ifdef __ACE_INLINE__
 # include "ace/Array_Map.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Array_Map.inl b/ace/Array_Map.inl
index 3c423390241..85cb1554c2f 100644
--- a/ace/Array_Map.inl
+++ b/ace/Array_Map.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename Key, typename Value, class EqualTo>
 ACE_INLINE
 ACE_Array_Map<Key, Value, EqualTo>::ACE_Array_Map (
@@ -118,3 +120,5 @@ ACE_Array_Map<Key, Value, EqualTo>::operator[] (
   iterator i = (this->insert (value_type (k, data_type ()))).first;
   return (*i).second;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 6bf4ab5c313..374658afefe 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -24,6 +24,8 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$")
 #include "ace/SOCK_Stream.h"
 #include "ace/Sock_Connect.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class HANDLER>
 ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void)
   : listen_handle_ (ACE_INVALID_HANDLE),
@@ -172,7 +174,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
   return 0;
 }
 
-template <class HANDLER> void
+template <class HANDLER> int
 ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle)
 {
   ACE_TRACE ("ACE_Asynch_Acceptor<>::set_handle");
@@ -185,9 +187,11 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle)
                                  this->listen_handle_,
                                  0,
                                  this->proactor ()) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("ACE_Asynch_Accept::open")));
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("%p\n"),
+                       ACE_LIB_TEXT ("ACE_Asynch_Accept::open")),
+                      -1);
+  return 0;
 }
 
 template <class HANDLER> ACE_HANDLE
@@ -367,14 +371,13 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void)
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
 #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
-    && (    defined (_MSC_VER) \
-        || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)))
+    && (    defined (_MSC_VER) || (defined (__BORLANDC__)))
   return (int) ::CancelIo (this->listen_handle_);
 #else
   // Supported now
   return this->asynch_accept_.cancel();
 
-#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER)) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER)) || (defined (__BORLANDC__))) */
 }
 
 template <class HANDLER> void
@@ -518,5 +521,7 @@ ACE_Asynch_Acceptor<HANDLER>::should_reissue_accept (void)
   return this->reissue_accept_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 #endif /* ACE_ASYNCH_ACCEPTOR_C */
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index 27efe871c0f..e8cb490794d 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -26,6 +26,8 @@
 #include "ace/Default_Constants.h"
 #include "ace/Asynch_IO.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_Message_Block;
 class ACE_INET_Addr;
@@ -70,7 +72,7 @@ public:
    *                associated @c ACE_Service_Handler::addresses() method
    *                after any call to @c validate_new_connection() and prior
    *                to the @c open() hook method call.
-   * @param backlog Optional, defaulting to @c ACE_DEFAULT_BACKLOG (which
+   * @param backlog Optional, defaulting to @c ACE_DEFAULT_ASYNCH_BACKLOG (which
    *                can be adjusted in your platform's @c config.h file).
    *                Specifies the listening backlog for the listening socket.
    * @param reuse_addr Optional, indicates whether the @c SO_REUSEADDR
@@ -107,7 +109,7 @@ public:
   virtual int open (const ACE_INET_Addr &address,
                     size_t bytes_to_read = 0,
                     int pass_addresses = 0,
-                    int backlog = ACE_DEFAULT_BACKLOG,
+                    int backlog = ACE_DEFAULT_ASYNCH_BACKLOG,
                     int reuse_addr = 1,
                     ACE_Proactor *proactor = 0,
                     int validate_new_connection = 0,
@@ -123,7 +125,7 @@ public:
    * closed and the all outstanding asynchronous operations have
    * either completed or have been canceled on the old listen handle.
    */
-  virtual void set_handle (ACE_HANDLE handle);
+  virtual int set_handle (ACE_HANDLE handle);
 
   /// This initiates a new asynchronous accept operation.
   /**
@@ -279,6 +281,8 @@ private:
   int addr_family_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Asynch_Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Asynch_Connector.cpp b/ace/Asynch_Connector.cpp
index 1fbbcc512e7..65b23f9a60c 100644
--- a/ace/Asynch_Connector.cpp
+++ b/ace/Asynch_Connector.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#ifndef ACE_ASYNCH_CONNECTOR_C
-#define ACE_ASYNCH_CONNECTOR_C
+#ifndef ACE_ASYNCH_CONNECTOR_CPP
+#define ACE_ASYNCH_CONNECTOR_CPP
 
 #include "ace/Asynch_Connector.h"
 
@@ -10,8 +9,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Asynch_Connector, "$Id$")
-
 #if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE)
 // This only works on platforms that support async I/O.
 
@@ -22,6 +19,8 @@ ACE_RCSID(ace, Asynch_Connector, "$Id$")
 #include "ace/Message_Block.h"
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class HANDLER>
 ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
   : pass_addresses_ (0),
@@ -291,5 +290,7 @@ ACE_Asynch_Connector<HANDLER>::validate_new_connection (int new_value)
   this->validate_new_connection_ = new_value;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
-#endif /* ACE_ASYNCH_CONNECTOR_C */
+#endif /* ACE_ASYNCH_CONNECTOR_CPP */
diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h
index d7bf516cecf..06e9bb41382 100644
--- a/ace/Asynch_Connector.h
+++ b/ace/Asynch_Connector.h
@@ -26,6 +26,8 @@
 #include "ace/Asynch_IO.h"
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_Message_Block;
 
@@ -155,6 +157,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Asynch_Connector.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 58ddd94bd54..cfcaf28aa2c 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -12,6 +12,8 @@ ACE_RCSID(ace, Asynch_IO, "$Id$")
 #include "ace/INET_Addr.h"
 #include "ace/Asynch_IO_Impl.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 size_t
 ACE_Asynch_Result::bytes_transferred (void) const
 {
@@ -1330,8 +1332,4 @@ ACE_Asynch_Write_Dgram::Result::~Result (void)
 
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index b1822e82c3c..e4733562440 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -47,6 +47,8 @@
 #include "ace/os_include/sys/os_socket.h"
 #include "ace/os_include/sys/os_types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \
                          && ! defined (ACE_HAS_PHARLAP)
 typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS;
@@ -299,9 +301,17 @@ public:
 
   /**
    * Initializes the factory with information which will be used with
-   * each asynchronous call. If ({handle} == ACE_INVALID_HANDLE),
-   * {ACE_Handler::handle} will be called on the {handler} to get the
-   * correct handle.
+   * each asynchronous call.
+   *
+   * @arg handler The ACE_Handler that will be called to handle completions
+   *              for operations initiated using this factory.
+   * @arg handle  The handle that future read operations will use.
+   *              If handle == @c ACE_INVALID_HANDLE,
+   *              ACE_Handler::handle() will be called on @ handler
+   *              to get the correct handle.
+   *
+   * @retval 0    for success.
+   * @retval -1   for failure; consult @c errno for further information.
    */
   int open (ACE_Handler &handler,
             ACE_HANDLE handle = ACE_INVALID_HANDLE,
@@ -452,7 +462,7 @@ public:
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
@@ -462,10 +472,10 @@ public:
               const void *act = 0,
               int priority = 0,
               int signal_number = ACE_SIGRTMIN);
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
   /// Return the underlying implementation class.
-  //  (this should be protected...)
+  /// @todo (this should be protected...)
   virtual ACE_Asynch_Operation_Impl *implementation (void) const;
 
 protected:
@@ -583,7 +593,7 @@ public:
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system
+  * @note In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   int readv (ACE_Message_Block &message_block,
@@ -717,7 +727,7 @@ public:
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system
+  * @note In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   int writev (ACE_Message_Block &message_block,
@@ -1661,6 +1671,8 @@ public:
   virtual void act (const void *);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
 #include /**/ "ace/post.h"
 #endif /* ACE_ASYNCH_IO_H */
diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp
index 8b52d7eab9a..8dba289d6ec 100644
--- a/ace/Asynch_IO_Impl.cpp
+++ b/ace/Asynch_IO_Impl.cpp
@@ -10,6 +10,8 @@
 #include "ace/Asynch_IO_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl (void)
 {
 }
@@ -110,7 +112,6 @@ ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void)
 {
 }
 
-
-
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index a6feb00fbf7..7dc5f283126 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -36,6 +36,8 @@
 
 #include "ace/Asynch_IO.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 class ACE_Proactor_Impl;
 
@@ -305,7 +307,7 @@ public:
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system
+  * @note In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   virtual int readv (ACE_Message_Block &message_block,
@@ -317,10 +319,6 @@ public:
                      int signal_number) = 0;
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Read_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
   /// This starts off an asynchronous read. Upto <bytes_to_read> will
   /// be read and stored in the <message_block>.
   virtual int read (ACE_Message_Block &message_block,
@@ -394,7 +392,7 @@ public:
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: In win32 Each data block payload must be at least the size of a system
+  * @note In win32 Each data block payload must be at least the size of a system
   * memory page and must be aligned on a system memory page size boundary
   */
   virtual int writev (ACE_Message_Block &message_block,
@@ -406,13 +404,8 @@ public:
                       int signal_number) = 0;
 #endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
 
-
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Write_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
-  /// This starts off an asynchronous write.  Upto <bytes_to_write>
-  /// will be written from the <message_block>.
+  /// This starts off an asynchronous write.  Upto @a bytes_to_write
+  /// will be written from the @a message_block.
   virtual int write (ACE_Message_Block &message_block,
                      size_t bytes_to_write,
                      const void *act,
@@ -470,12 +463,12 @@ public:
   /**
    * This starts off an asynchronous accept.  The asynchronous accept
    * call also allows any initial data to be returned to the
-   * <handler>.  Upto <bytes_to_read> will be read and stored in the
-   * <message_block>.  The <accept_handle> will be used for the
-   * <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
+   * <handler>.  Upto @a bytes_to_read will be read and stored in the
+   * <message_block>.  The @a accept_handle will be used for the
+   * <accept> call.  If (@a accept_handle == INVALID_HANDLE), a new
    * handle will be created.
    *
-   * <message_block> must be specified. This is because the address of
+   * @a message_block must be specified. This is because the address of
    * the new connection is placed at the end of this buffer.
    */
   virtual int accept (ACE_Message_Block &message_block,
@@ -812,6 +805,8 @@ protected:
   ACE_Asynch_Write_Dgram_Result_Impl (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Asynch_IO_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Asynch_IO_Impl.inl b/ace/Asynch_IO_Impl.inl
index 3d61fae7942..495a768a972 100644
--- a/ace/Asynch_IO_Impl.inl
+++ b/ace/Asynch_IO_Impl.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Asynch_Result_Impl::ACE_Asynch_Result_Impl (void)
 {
@@ -98,3 +102,5 @@ ACE_Asynch_Transmit_File_Result_Impl::ACE_Asynch_Transmit_File_Result_Impl (void
   : ACE_Asynch_Result_Impl ()
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Asynch_Pseudo_Task.cpp b/ace/Asynch_Pseudo_Task.cpp
index ce936471e52..b3e25ef0298 100644
--- a/ace/Asynch_Pseudo_Task.cpp
+++ b/ace/Asynch_Pseudo_Task.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task()
   : select_reactor_ (),               // should be initialized before reactor_
     reactor_ (&select_reactor_, 0)    // don't delete implementation
@@ -18,7 +20,7 @@ ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task()
   this->stop();
 }
 
-int 
+int
 ACE_Asynch_Pseudo_Task::start (void)
 {
   if (this->reactor_.initialized () == 0)
@@ -30,10 +32,10 @@ ACE_Asynch_Pseudo_Task::start (void)
   return this->activate () == -1 ? -1 : 0;   // If started, return 0
 }
 
-int 
+int
 ACE_Asynch_Pseudo_Task::stop (void)
 {
-  if (this->thr_count () == 0)  // already stopped 
+  if (this->thr_count () == 0)  // already stopped
     return 0;
 
   if (this->reactor_.end_reactor_event_loop () == -1)
@@ -47,7 +49,7 @@ ACE_Asynch_Pseudo_Task::stop (void)
 int
 ACE_Asynch_Pseudo_Task::svc (void)
 {
-#if !defined (ACE_WIN32) 
+#if !defined (ACE_WIN32)
 
   sigset_t RT_signals;
 
@@ -92,7 +94,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
           ACE_LIB_TEXT ("register_io_handler (suspended)")));
       this->reactor_.remove_handler (handle,
                                      ACE_Event_Handler::ALL_EVENTS_MASK
-                                     | ACE_Event_Handler::DONT_CALL); 
+                                     | ACE_Event_Handler::DONT_CALL);
       return -1;
     }
 
@@ -126,3 +128,5 @@ ACE_Asynch_Pseudo_Task::resume_io_handler (ACE_HANDLE handle)
 {
   return this->reactor_.resume_handler (handle);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Asynch_Pseudo_Task.h b/ace/Asynch_Pseudo_Task.h
index a20570737b5..7fc68e16b70 100644
--- a/ace/Asynch_Pseudo_Task.h
+++ b/ace/Asynch_Pseudo_Task.h
@@ -25,6 +25,8 @@
 #include "ace/Select_Reactor.h"
 #include "ace/Task.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  * Specialization hook to replace the Reactor with the
  * concrete Reactor implementation, e.g., select_st,
@@ -63,6 +65,8 @@ protected:
   ACE_Reactor reactor_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_ASYNCH_PSEUDO_TASK_H */
diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp
index eee9f742d2c..8737981a794 100644
--- a/ace/Atomic_Op.cpp
+++ b/ace/Atomic_Op.cpp
@@ -179,7 +179,8 @@ multi_cpu_exchange_add (volatile long *value, long rhs)
 
 } // end namespace
 
-  
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::increment_fn_) (volatile long *) = 0;
 long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::decrement_fn_) (volatile long *) = 0;
 long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange_fn_) (volatile long *, long) = 0;
@@ -246,4 +247,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */
diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h
index 968ed3d49b5..991625cd32f 100644
--- a/ace/Atomic_Op.h
+++ b/ace/Atomic_Op.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -44,6 +44,9 @@
 #endif /* ACE_HAS_THREADS */
 
 #if defined (ACE_HAS_BUILTIN_ATOMIC_OP)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Atomic_Op<ACE_Thread_Mutex, long>
  *
@@ -61,7 +64,7 @@ public:
   ACE_Atomic_Op (void);
 
   /// Initialize <value_> to c.
-  ACE_Atomic_Op (long c);
+  ACE_Atomic_Op (const long &c);
 
   /// Manage copying...
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c);
@@ -125,10 +128,13 @@ public:
   static void init_functions (void);
 
 private:
+
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex &mutex (void))
+  ACE_Thread_Mutex &mutex (void);
+
+private:
 
   /// Current object decorated by the atomic op.
   volatile long value_;
@@ -157,7 +163,7 @@ public:
   ACE_Atomic_Op (void);
 
   /// Initialize <value_> to c.
-  ACE_Atomic_Op (unsigned long c);
+  ACE_Atomic_Op (const unsigned long &c);
 
   /// Manage copying...
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c);
@@ -221,10 +227,13 @@ public:
   static void init_functions (void);
 
 private:
+
   // This function cannot be supported by this template specialization.
   // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
   // template instead.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex &mutex (void))
+  ACE_Thread_Mutex &mutex (void);
+
+private:
 
   /// Current object decorated by the atomic op.
   volatile unsigned long value_;
@@ -236,6 +245,8 @@ private:
   static long (*exchange_add_fn_) (volatile long *, long);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Atomic_Op.inl b/ace/Atomic_Op.inl
index 7c481b206ad..007f653bbfa 100644
--- a/ace/Atomic_Op.inl
+++ b/ace/Atomic_Op.inl
@@ -5,6 +5,8 @@
 
 #if defined (ACE_HAS_BUILTIN_ATOMIC_OP)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (void)
   : value_ (0)
@@ -12,7 +14,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (void)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (long c)
+ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (const long &c)
   : value_ (c)
 {
 }
@@ -157,7 +159,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (void)
 }
 
 ACE_INLINE
-ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (unsigned long c)
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (const unsigned long &c)
   : value_ (c)
 {
 }
@@ -294,4 +296,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value_i (void)
   return this->value_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */
diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp
index cfa7b1b316e..d31e49e081a 100644
--- a/ace/Atomic_Op_T.cpp
+++ b/ace/Atomic_Op_T.cpp
@@ -1,5 +1,5 @@
-#ifndef ACE_ATOMIC_OP_T_C
-#define ACE_ATOMIC_OP_T_C
+#ifndef ACE_ATOMIC_OP_T_CPP
+#define ACE_ATOMIC_OP_T_CPP
 
 #include "ace/Atomic_Op_T.h"
 #include "ace/Log_Msg.h"
@@ -12,6 +12,7 @@
 #include "ace/Atomic_Op_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op_Ex)
 ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op)
@@ -71,4 +72,6 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (const TYPE &c)
   // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
 }
 
-#endif /* ACE_ATOMIC_OP_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_ATOMIC_OP_T_CPP */
diff --git a/ace/Atomic_Op_T.h b/ace/Atomic_Op_T.h
index b87c1db1d4c..89703186356 100644
--- a/ace/Atomic_Op_T.h
+++ b/ace/Atomic_Op_T.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Atomic_Op_Ex
  *
@@ -110,7 +112,7 @@ public:
    * Returns a reference to the underlying <ACE_LOCK>.  This makes it
    * possible to acquire the lock explicitly, which can be useful in
    * some cases if you instantiate the <ACE_Atomic_Op_Ex> with an
-   * <ACE_Recursive_Mutex> or <ACE_Process_Mutex>.  NOTE: the right
+   * <ACE_Recursive_Mutex> or <ACE_Process_Mutex>.  @note the right
    * name would be lock_, but HP/C++ will choke on that!
    */
   ACE_LOCK &mutex (void);
@@ -234,6 +236,7 @@ private:
   ACE_Atomic_Op_Ex <ACE_LOCK, TYPE> impl_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Atomic_Op_T.inl"
diff --git a/ace/Atomic_Op_T.inl b/ace/Atomic_Op_T.inl
index 4a236220741..41b7ccd2af0 100644
--- a/ace/Atomic_Op_T.inl
+++ b/ace/Atomic_Op_T.inl
@@ -4,6 +4,8 @@
 
 #include "ace/Guard_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //
 // ACE_Atomic_Op_Ex inline functions
 //
@@ -277,3 +279,5 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i (void)
 {
   return this->impl_.value_i ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Auto_Event.cpp b/ace/Auto_Event.cpp
index 67444d3c886..456ac2a4890 100644
--- a/ace/Auto_Event.cpp
+++ b/ace/Auto_Event.cpp
@@ -6,8 +6,11 @@
 #include "ace/Auto_Event.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID (ace,
+           Auto_Event,
+           "$Id$")
 
-ACE_RCSID(ace, Auto_Event, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Auto_Event::ACE_Auto_Event (int initial_state,
                                 int type,
@@ -40,3 +43,5 @@ ACE_Auto_Event::dump (void) const
   ACE_Event::dump ();
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Auto_Event.h b/ace/Auto_Event.h
index 50e6aedf88c..db1a834e9c0 100644
--- a/ace/Auto_Event.h
+++ b/ace/Auto_Event.h
@@ -24,6 +24,8 @@
 
 #include "ace/Event.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Auto_Event
  *
@@ -37,13 +39,13 @@
 class ACE_Export ACE_Auto_Event : public ACE_Event
 {
 public:
-  /// constructor which will create auto event
+  /// Constructor which will create auto event
   ACE_Auto_Event (int initial_state = 0,
                   int type = USYNC_THREAD,
                   const char *name = 0,
                   void *arg = 0);
 
-  /// constructor which will create auto event (wchar_t version)
+  /// Constructor which will create auto event (wchar_t version)
   ACE_Auto_Event (int initial_state,
                   int type,
                   const wchar_t *name,
@@ -59,6 +61,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Auto_Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Auto_Event.inl b/ace/Auto_Event.inl
index e8858bfa4a6..80048c29b99 100644
--- a/ace/Auto_Event.inl
+++ b/ace/Auto_Event.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Auto_Event::~ACE_Auto_Event (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Auto_Functor.cpp b/ace/Auto_Functor.cpp
index af1ff0142ce..91dbad1952b 100644
--- a/ace/Auto_Functor.cpp
+++ b/ace/Auto_Functor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef ACE_AUTO_FUNCTOR_CPP
 #define ACE_AUTO_FUNCTOR_CPP
 
@@ -7,7 +9,7 @@
 # include "ace/Auto_Functor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Auto_Functor, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename X, typename Functor>
 ACE_Utils::Auto_Functor<X,Functor>::~Auto_Functor()
@@ -35,4 +37,6 @@ ACE_Utils::Auto_Functor<X,Functor>::reset(X * p, Functor f)
   f_ = f;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*ACE_AUTO_FUNCTOR_CPP*/
diff --git a/ace/Auto_Functor.h b/ace/Auto_Functor.h
index 8a5f9f2ed71..b9bcf8342b1 100644
--- a/ace/Auto_Functor.h
+++ b/ace/Auto_Functor.h
@@ -20,6 +20,8 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_Utils
 {
 /**
@@ -127,7 +129,9 @@ private:
   Functor f_;
 };
 
-} // namespace TAO
+} // namespace ACE_Utils
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(__ACE_INLINE__)
 # include "ace/Auto_Functor.inl"
diff --git a/ace/Auto_Functor.inl b/ace/Auto_Functor.inl
index 6364894bc86..31c2dc25f97 100644
--- a/ace/Auto_Functor.inl
+++ b/ace/Auto_Functor.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<typename X, typename Functor> ACE_INLINE
 ACE_Utils::Auto_Functor_Ref<X,Functor>::
 Auto_Functor_Ref(X * p, Functor f)
@@ -141,3 +145,5 @@ ACE_Utils::Auto_Functor<X,Functor>::operator ACE_Utils::Auto_Functor_Ref<X,Funct
 }
 
 #endif /* ACE_LACKS_MEMBER_TEMPLATES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Auto_IncDec_T.cpp b/ace/Auto_IncDec_T.cpp
index c4e689e3ab2..cf33efd7d6e 100644
--- a/ace/Auto_IncDec_T.cpp
+++ b/ace/Auto_IncDec_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_AUTO_INCDEC_T_C
-#define ACE_AUTO_INCDEC_T_C
+#ifndef ACE_AUTO_INCDEC_T_CPP
+#define ACE_AUTO_INCDEC_T_CPP
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -10,12 +10,12 @@
 #include "ace/Auto_IncDec_T.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, Auto_IncDec_T, "Auto_IncDec_T.cpp, by Edan Ayal")
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Auto_IncDec_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_IncDec)
 
 template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> void
@@ -29,4 +29,6 @@ ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_AUTO_INCDEC_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_AUTO_INCDEC_T_CPP */
diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h
index a9092c7c122..2aeefe27247 100644
--- a/ace/Auto_IncDec_T.h
+++ b/ace/Auto_IncDec_T.h
@@ -24,6 +24,8 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Auto_IncDec
  *
@@ -62,9 +64,10 @@ private:
                                              ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Auto_IncDec_T.inl"
-// On non-Win32 platforms, this code will be inlined
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Auto_IncDec_T.inl b/ace/Auto_IncDec_T.inl
index 96658ed76c5..51daac0e84d 100644
--- a/ace/Auto_IncDec_T.inl
+++ b/ace/Auto_IncDec_T.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implicitly and automatically increment the counter.
 
 template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> ACE_INLINE
@@ -19,3 +22,4 @@ ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::~ACE_Auto_IncDec (void)
   --this->counter_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Auto_Ptr.cpp b/ace/Auto_Ptr.cpp
index 9c2827504c9..081744ce316 100644
--- a/ace/Auto_Ptr.cpp
+++ b/ace/Auto_Ptr.cpp
@@ -1,8 +1,7 @@
-// Auto_Ptr.cpp
 // $Id$
 
-#if !defined (ACE_AUTO_PTR_C)
-#define ACE_AUTO_PTR_C
+#ifndef ACE_AUTO_PTR_CPP
+#define ACE_AUTO_PTR_CPP
 
 #include "ace/Auto_Ptr.h"
 
@@ -12,19 +11,11 @@
 
 ACE_RCSID(ace, Auto_Ptr, "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Ptr)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Ptr)
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Array_Ptr)
 
-#if defined (__MINGW32__)
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
-             (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template alloc;
-#  elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate alloc
-#  endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY != 0 */
-#endif /* __MINGW32__ */
-
-#endif /* ACE_AUTO_PTR_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_AUTO_PTR_CPP */
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 1f0d93062dc..5fe2908937f 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -32,6 +32,9 @@
 #  pragma warning(disable: 4284)
 #endif /* _MSC_VER */
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Auto_Basic_Ptr
  *
@@ -65,6 +68,8 @@ protected:
   X *p_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if !defined (ACE_LACKS_AUTO_PTR) && \
      defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
             (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
@@ -93,6 +98,7 @@ public:
 
 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @brief Implements the draft C++ standard auto_ptr abstraction.
@@ -163,17 +169,24 @@ public:
   X *operator-> () const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Some platforms have an older version of auto_ptr
 // support, which lacks reset, and cannot be disabled
 // easily.  Portability to these platforms requires
 // use of the following ACE_AUTO_PTR_RESET macro.
+//
+// Note that this macro correctly handles the case where NEWPTR may be
+// a call to operator new(), e.g. "new foo", by making sure it is only
+// evaluated once.
 # if defined (ACE_AUTO_PTR_LACKS_RESET)
 #   define ACE_AUTO_PTR_RESET(AUTOPTR,NEWPTR,TYPE) \
       do { \
-        if (NEWPTR != AUTOPTR.get ()) \
+        TYPE * tmp_ptr = NEWPTR; \
+        if (tmp_ptr != AUTOPTR.get ()) \
           { \
-            AUTOPTR.release (); \
-            AUTOPTR = auto_ptr<TYPE> (NEWPTR); \
+            delete AUTOPTR.release (); \
+            AUTOPTR = auto_ptr<TYPE> (tmp_ptr); \
           } \
       } while (0)
 # else /* ! ACE_AUTO_PTR_LACKS_RESET */
diff --git a/ace/Auto_Ptr.inl b/ace/Auto_Ptr.inl
index ce4d53a490c..57adb236261 100644
--- a/ace/Auto_Ptr.inl
+++ b/ace/Auto_Ptr.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Auto_Ptr.i
-
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class X> ACE_INLINE void
 ACE_Auto_Basic_Ptr<X>::dump (void) const
 {
@@ -167,3 +168,4 @@ ACE_Auto_Array_Ptr<X>::operator->() const
   return this->get ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Barrier.cpp b/ace/Barrier.cpp
index 6637f1ec638..739e249cd76 100644
--- a/ace/Barrier.cpp
+++ b/ace/Barrier.cpp
@@ -9,12 +9,17 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Guard_T.h"
+#include "ace/OS_NS_errno.h"
 
 #if defined (ACE_HAS_DUMP)
 #  include "ace/Log_Msg.h"
 #endif /* ACE_HAS_DUMP */
 
-ACE_RCSID(ace, Barrier, "$Id$")
+ACE_RCSID (ace,
+           Barrier,
+           "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier)
 
@@ -69,7 +74,7 @@ ACE_Barrier::ACE_Barrier (unsigned int count,
     sub_barrier_1_ (count, lock_, name, arg),
     sub_barrier_2_ (count, lock_, name, arg)
 {
-// ACE_TRACE ("ACE_Barrier::ACE_Barrier");
+  ACE_TRACE ("ACE_Barrier::ACE_Barrier");
   this->sub_barrier_[0] = &this->sub_barrier_1_;
   this->sub_barrier_[1] = &this->sub_barrier_2_;
 }
@@ -77,7 +82,7 @@ ACE_Barrier::ACE_Barrier (unsigned int count,
 int
 ACE_Barrier::wait (void)
 {
-// ACE_TRACE ("ACE_Barrier::wait");
+  ACE_TRACE ("ACE_Barrier::wait");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
 
   ACE_Sub_Barrier *sbp =
@@ -85,14 +90,18 @@ ACE_Barrier::wait (void)
 
   // Check for shutdown...
   if (sbp == 0)
-    return -1;
+    {
+      errno = ESHUTDOWN;
+      return -1;
+    }
+
+  int retval = 0;
 
   if (sbp->running_threads_ == 1)
     {
       // We're the last running thread, so swap generations and tell
       // all the threads waiting on the barrier to continue on their
       // way.
-
       sbp->running_threads_ = this->count_;
       // Swap generations.
       this->current_generation_ = 1 - this->current_generation_;
@@ -105,8 +114,43 @@ ACE_Barrier::wait (void)
       // Block until all the other threads wait().
       while (sbp->running_threads_ != this->count_)
         sbp->barrier_finished_.wait ();
+
+      // We're awake and the count has completed. See if it completed
+      // because all threads hit the barrier, or because the barrier
+      // was shut down.
+      if (this->sub_barrier_[this->current_generation_] == 0)
+        {
+          errno = ESHUTDOWN;
+          retval = -1;
+        }
+    }
+
+  return retval;
+}
+
+int
+ACE_Barrier::shutdown (void)
+{
+  ACE_TRACE ("ACE_Barrier::shutdown");
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+
+  ACE_Sub_Barrier *sbp =
+    this->sub_barrier_[this->current_generation_];
+
+  // Check for shutdown...
+  if (sbp == 0)
+    {
+      errno = ESHUTDOWN;
+      return -1;
     }
 
+  // Flag the shutdown
+  this->sub_barrier_[0] = 0;
+  this->sub_barrier_[1] = 0;
+  // Tell all the threads waiting on the barrier to continue on their way.
+  sbp->running_threads_ = this->count_;
+  sbp->barrier_finished_.broadcast ();
+
   return 0;
 }
 
@@ -148,4 +192,6 @@ ACE_Process_Barrier::dump (void) const
 }
 #endif /* 0 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Barrier.h b/ace/Barrier.h
index 1bc2514c1de..7939aed1d24 100644
--- a/ace/Barrier.h
+++ b/ace/Barrier.h
@@ -16,31 +16,27 @@
 #define ACE_BARRIER_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_errno.h"
+#include "ace/config-all.h"
 
 // ACE platform supports some form of threading.
 #if !defined (ACE_HAS_THREADS)
 
-#include "ace/config-all.h"
+#include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Barrier
  *
  * @brief This is a no-op to make ACE "syntactically consistent."
  */
-class ACE_Threads_Export ACE_Barrier
+class ACE_Export ACE_Barrier
 {
 public:
   ACE_Barrier (unsigned int, const ACE_TCHAR * = 0, void * = 0) {}
@@ -49,11 +45,15 @@ public:
   void dump (void) const {}
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #else /* ACE_HAS_THREADS */
 
 #include "ace/Condition_Thread_Mutex.h"
 
-struct ACE_Threads_Export ACE_Sub_Barrier
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+struct ACE_Export ACE_Sub_Barrier
 {
   // = Initialization.
   ACE_Sub_Barrier (unsigned int count,
@@ -93,7 +93,7 @@ struct ACE_Threads_Export ACE_Sub_Barrier
  * SunOpsis Vol. 4, No. 1 by Richard Marejka
  * (Richard.Marejka@canada.sun.com).
  */
-class ACE_Threads_Export ACE_Barrier
+class ACE_Export ACE_Barrier
 {
 public:
   /// Initialize the barrier to synchronize @a count threads.
@@ -106,8 +106,20 @@ public:
 
   /// Block the caller until all @c count threads have called @c wait and
   /// then allow all the caller threads to continue in parallel.
+  ///
+  /// @retval 0 after successfully waiting for all threads to wait. -1 if
+  /// an error occurs or the barrier is shut down (@sa shutdown ()).
   int wait (void);
 
+  /// Shut the barrier down, aborting the wait of all waiting threads.
+  /// Any threads waiting on the barrier when it is shut down will return with
+  /// value -1, errno ESHUTDOWN.
+  ///
+  /// @retval 0 for success, -1 if already shut down.
+  ///
+  /// @since ACE beta 5.4.9.
+  int shutdown (void);
+
   /// Dump the state of an object.
   void dump (void) const;
 
@@ -152,7 +164,7 @@ private:
  * This class is just a simple wrapper for ACE_Barrier that
  * selects the USYNC_PROCESS variant for the locks.
  */
-class ACE_Threads_Export ACE_Process_Barrier : public ACE_Barrier
+class ACE_Export ACE_Process_Barrier : public ACE_Barrier
 {
 public:
   /// Create a Process_Barrier, passing in the optional <name>.
@@ -174,7 +186,7 @@ public:
  * This class is just a simple wrapper for ACE_Barrier that
  * selects the USYNC_THREAD variant for the locks.
  */
-class ACE_Threads_Export ACE_Thread_Barrier : public ACE_Barrier
+class ACE_Export ACE_Thread_Barrier : public ACE_Barrier
 {
 public:
   /// Create a Thread_Barrier, passing in the optional @a name.
@@ -190,6 +202,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Barrier.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Barrier.inl b/ace/Barrier.inl
index bb7a483b3e3..9ab5c9fb111 100644
--- a/ace/Barrier.inl
+++ b/ace/Barrier.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Sub_Barrier::~ACE_Sub_Barrier (void)
 {
@@ -15,3 +18,5 @@ ACE_INLINE
 ACE_Thread_Barrier::~ACE_Thread_Barrier (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp
index 5aa59b6a113..23e3556fd9a 100644
--- a/ace/Base_Thread_Adapter.cpp
+++ b/ace/Base_Thread_Adapter.cpp
@@ -2,7 +2,9 @@
 
 #include "ace/Base_Thread_Adapter.h"
 
-ACE_RCSID(ace, Base_Thread_Adapter, "$Id$")
+ACE_RCSID (ace,
+           Base_Thread_Adapter,
+           "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/Base_Thread_Adapter.inl"
@@ -12,6 +14,8 @@ ACE_RCSID(ace, Base_Thread_Adapter, "$Id$")
 #  include "ace/OS_NS_Thread.h"
 #endif /* ACE_HAS_TSS_EMULATION */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INIT_LOG_MSG_HOOK     ACE_Base_Thread_Adapter::init_log_msg_hook_ = 0;
 ACE_INHERIT_LOG_MSG_HOOK  ACE_Base_Thread_Adapter::inherit_log_msg_hook_ = 0;
 ACE_CLOSE_LOG_MSG_HOOK    ACE_Base_Thread_Adapter::close_log_msg_hook_ = 0;
@@ -83,14 +87,16 @@ ACE_Base_Thread_Adapter::thr_desc_log_msg (void)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Run the thread entry point for the <ACE_Thread_Adapter>.  This must
 // be an extern "C" to make certain compilers happy...
 
 #if defined (ACE_PSOS)
 extern "C" void
-ace_thread_adapter (unsigned long args)
+ACE_THREAD_ADAPTER_NAME (unsigned long args)
 {
-  ACE_OS_TRACE ("ace_thread_adapter");
+  ACE_OS_TRACE ("ACE_THREAD_ADAPTER_NAME");
 
 #if defined (ACE_HAS_TSS_EMULATION)
   // As early as we can in the execution of the new thread, allocate
@@ -100,7 +106,7 @@ ace_thread_adapter (unsigned long args)
   ACE_TSS_Emulation::tss_open (ts_storage);
 #endif /* ACE_HAS_TSS_EMULATION */
 
-  ACE_Base_Thread_Adapter *thread_args =
+  ACE_Base_Thread_Adapter * const thread_args =
     static_cast<ACE_Base_Thread_Adapter *> (args);
 
   // Invoke the user-supplied function with the args.
@@ -108,9 +114,9 @@ ace_thread_adapter (unsigned long args)
 }
 #else /* ! defined (ACE_PSOS) */
 extern "C" ACE_THR_FUNC_RETURN
-ace_thread_adapter (void *args)
+ACE_THREAD_ADAPTER_NAME (void *args)
 {
-  ACE_OS_TRACE ("ace_thread_adapter");
+  ACE_OS_TRACE ("ACE_THREAD_ADAPTER_NAME");
 
 #if defined (ACE_HAS_TSS_EMULATION)
   // As early as we can in the execution of the new thread, allocate
@@ -120,7 +126,7 @@ ace_thread_adapter (void *args)
   ACE_TSS_Emulation::tss_open (ts_storage);
 #endif /* ACE_HAS_TSS_EMULATION */
 
-  ACE_Base_Thread_Adapter *thread_args =
+  ACE_Base_Thread_Adapter * const thread_args =
     static_cast<ACE_Base_Thread_Adapter *> (args);
 
 #ifdef ACE_USES_GPROF
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index cd82e2b45ac..b4425f32896 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Base_Thread_Adapter.h
@@ -25,14 +27,21 @@
 #include "os_include/sys/os_time.h"
 #endif // ACE_USES_GPROF
 
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# define ACE_THREAD_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_thread_adapter)
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
 // Run the thread entry point for the ACE_Thread_Adapter.  This must
 // be an extern "C" to make certain compilers happy...
+
 #if defined (ACE_PSOS)
-extern "C" void ace_thread_adapter (unsigned long args);
+extern "C" void ACE_THREAD_ADAPTER_NAME (unsigned long args);
 #else /* ! defined (ACE_PSOS) */
-extern "C" ACE_Export ACE_THR_FUNC_RETURN ace_thread_adapter (void *args);
+extern "C" ACE_Export ACE_THR_FUNC_RETURN ACE_THREAD_ADAPTER_NAME (void *args);
 #endif /* ACE_PSOS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_OS_Thread_Descriptor
  *
@@ -108,7 +117,7 @@ protected:
   /// Constructor.
   ACE_Base_Thread_Adapter (ACE_THR_FUNC user_func,
                            void *arg,
-                           ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter,
+                           ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME,
                            ACE_OS_Thread_Descriptor *td = 0
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
                            , ACE_SEH_EXCEPT_HANDLER selector = 0
@@ -163,11 +172,10 @@ protected:
   struct itimerval itimer_;
 #endif // ACE_USES_GPROF
 
-  /// Friend declaration to avoid compiler warning:  only defines a private
-  /// destructor and has no friends.
-  friend class ACE_Thread_Adapter_Has_Private_Destructor;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/Base_Thread_Adapter.inl b/ace/Base_Thread_Adapter.inl
index 814c50e610d..7fa3959034b 100644
--- a/ace/Base_Thread_Adapter.inl
+++ b/ace/Base_Thread_Adapter.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE long
 ACE_OS_Thread_Descriptor::flags (void) const
 {
@@ -32,6 +36,7 @@ ACE_Base_Thread_Adapter::entry_point (void)
 {
   return this->entry_point_;
 }
+
 #ifdef ACE_USES_GPROF
 ACE_INLINE itimerval*
 ACE_Base_Thread_Adapter::timerval (void)
@@ -39,3 +44,5 @@ ACE_Base_Thread_Adapter::timerval (void)
   return &(this->itimer_);
 }
 #endif // ACE_USES_GPROF
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp
index 2973da69ee8..74ea8994c6d 100644
--- a/ace/Based_Pointer_Repository.cpp
+++ b/ace/Based_Pointer_Repository.cpp
@@ -7,6 +7,8 @@
 #include "ace/Synch_Traits.h"
 #include "ace/RW_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Based_Pointer_Repository_Rep
  *
@@ -111,21 +113,9 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<void *, size_t>;
-template class ACE_Map_Manager<void *, size_t, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<void *, size_t, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<void *, size_t>
-#pragma instantiate ACE_Map_Manager<void *, size_t, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> *
   ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
index 586bfcf79be..5d0b1b8fe41 100644
--- a/ace/Based_Pointer_Repository.h
+++ b/ace/Based_Pointer_Repository.h
@@ -16,21 +16,19 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-# define ACE_MEMORY_SINGLETON_DECLARE ACE_SINGLETON_DECLARE
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 #include "ace/os_include/os_stddef.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl., using the "Cheshire Cat" technique.
 class ACE_Based_Pointer_Repository_Rep;
 
@@ -40,10 +38,10 @@ class ACE_Based_Pointer_Repository_Rep;
  * @brief Maps pointers to the base address of the region to which each
  * pointer belongs.
  */
-class ACE_Memory_Export ACE_Based_Pointer_Repository
+class ACE_Export ACE_Based_Pointer_Repository
 {
 public:
-  // = Use <ACE_Null_Mutex> to allow locking while iterating.
+  // = Use ACE_Null_Mutex to allow locking while iterating.
 
   // = Initialization and termination methods.
   ACE_Based_Pointer_Repository (void);
@@ -51,9 +49,9 @@ public:
 
   // = Search structure methods.
   /**
-   * Return the appropriate <base_addr> region that contains <addr>.
-   * Returns 1 on success and 0 if the <addr> isn't contained in any
-   * <base_addr> region.
+   * Return the appropriate @a base_addr region that contains @a addr.
+   * Returns 1 on success and 0 if the @a addr isn't contained in any
+   * @a base_addr region.
    */
   int find (void *addr,
             void *&base_addr);
@@ -77,17 +75,16 @@ private:
 
 // ----------------------------------
 
-#include "ace/Singleton.h"
-
 /// Declare a process wide singleton
-ACE_MEMORY_SINGLETON_DECLARE (ACE_Singleton,
-                              ACE_Based_Pointer_Repository,
-                              ACE_SYNCH_RW_MUTEX)
+ACE_SINGLETON_DECLARE (ACE_Singleton,
+                       ACE_Based_Pointer_Repository,
+                       ACE_SYNCH_RW_MUTEX)
 
 /// Provide a Singleton access point to the based pointer repository.
 typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
         ACE_BASED_POINTER_REPOSITORY;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
index c648d28834f..2155bc3a734 100644
--- a/ace/Based_Pointer_T.cpp
+++ b/ace/Based_Pointer_T.cpp
@@ -13,6 +13,8 @@
 #include "ace/Based_Pointer_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class CONCRETE>
 ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
 {
@@ -114,4 +116,6 @@ ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE
   ACE_ASSERT (0); // not implemented.
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_BASED_POINTER_T_CPP */
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
index 91ebfc778cd..1d778639211 100644
--- a/ace/Based_Pointer_T.h
+++ b/ace/Based_Pointer_T.h
@@ -27,6 +27,8 @@
 #pragma warning(disable: 4284)
 #endif /* _MSC_VER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Based_Pointer_Basic
  *
@@ -158,15 +160,15 @@ class ACE_Based_Pointer : public ACE_Based_Pointer_Basic<CONCRETE>
 {
 public:
   // = Initialization method.
-  /// Constructor.  See constructor for <ACE_Based_Pointer_Basic> for
+  /// Constructor.  See constructor for ACE_Based_Pointer_Basic for
   /// details.
   ACE_Based_Pointer (void);
 
   /// Initialize this object using the <initial> pointer.  See
-  /// constructor for <ACE_Based_Pointer_Basic> for details.
+  /// constructor for ACE_Based_Pointer_Basic for details.
   ACE_Based_Pointer (CONCRETE *initial);
 
-  /// Initialize this object with known <base_addr>.  <dummy> is
+  /// Initialize this object with known @a base_addr.  @a dummy is
   /// a dummy value used to resolve overload ambiguity and it
   /// otherwise ignored.
   ACE_Based_Pointer (const void *base_addr, int dummy);
@@ -184,6 +186,8 @@ public:
   CONCRETE *operator-> (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Based_Pointer_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Based_Pointer_T.inl b/ace/Based_Pointer_T.inl
index b45e14073e3..4d6b86e0c41 100644
--- a/ace/Based_Pointer_T.inl
+++ b/ace/Based_Pointer_T.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (P)->target_)
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class CONCRETE> ACE_INLINE CONCRETE *
 ACE_Based_Pointer<CONCRETE>::operator->(void)
 {
@@ -132,3 +135,5 @@ ACE_Based_Pointer<CONCRETE>::operator= (const ACE_Based_Pointer<CONCRETE> &rhs)
   ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::operator=");
   *this = rhs.addr ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp
index ed0be542095..e727d1c8224 100644
--- a/ace/Basic_Stats.cpp
+++ b/ace/Basic_Stats.cpp
@@ -7,7 +7,11 @@
 #include "ace/Basic_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Basic_Stats, "$Id$")
+ACE_RCSID(ace,
+          Basic_Stats,
+          "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
@@ -28,7 +32,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
       if (this->min_ > rhs.min_)
         {
           this->min_ = rhs.min_;
-          this->min_at_ = rhs.min_at_;          
+          this->min_at_ = rhs.min_at_;
         }
       if (this->max_ < rhs.max_)
         {
@@ -96,3 +100,5 @@ ACE_Basic_Stats::dump_results (const wchar_t *msg,
 
 #endif /* ACE_NLOGGING */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h
index ffbd7ce1df6..f0c8a0f3b38 100644
--- a/ace/Basic_Stats.h
+++ b/ace/Basic_Stats.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Collect basic stats about a series of samples
 /**
  * Compute the average and standard deviation (aka jitter) for an
@@ -78,6 +80,8 @@ public:
   ACE_UINT64 sum_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Basic_Stats.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Basic_Stats.inl b/ace/Basic_Stats.inl
index b2fd80d121a..bbdce099907 100644
--- a/ace/Basic_Stats.inl
+++ b/ace/Basic_Stats.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Basic_Stats::ACE_Basic_Stats (void)
   : samples_count_ (0)
@@ -45,3 +49,5 @@ ACE_Basic_Stats::sample (ACE_UINT64 value)
 
   this->sum_ += value;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp
index b31658212a0..53544d079eb 100644
--- a/ace/Basic_Types.cpp
+++ b/ace/Basic_Types.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (ace,
 #  include "ace/streams.h"
 # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_U_LongLong::output (FILE *file) const
 {
@@ -131,8 +133,7 @@ operator<< (ostream& os, const ACE_U_LongLong& ll)
 }
 # endif
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_LACKS_LONGLONG_T */
 
-// Explicit template instantiation file
-#include "ace/Template_Instantiations.cpp"
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index cf08f81b4a0..c3ee616356e 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -32,7 +32,7 @@
  *    - ACE_INT32
  *    - ACE_UINT32
  *    - ACE_UINT64
- *  (Note: ACE_INT64 is partly defined, there is no ACE_LongLong for
+ *  (@note ACE_INT64 is partly defined, there is no ACE_LongLong for
  *   platforms that don't have a native 8-byte integer type.)
  *
  *  Byte-order (endian-ness) determination:
@@ -151,97 +151,99 @@
 # endif /* !defined (ACE_SIZEOF_LONG_LONG) */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // The sizes of the commonly implemented types are now known.  Set up
 // typedefs for whatever we can.  Some of these are needed for certain
 // cases of ACE_UINT64, so do them before the 64-bit stuff.
 
 #if defined (ACE_INT8_TYPE)
-  typedef ACE_INT8_TYPE		ACE_INT8;
+  typedef ACE_INT8_TYPE         ACE_INT8;
 #elif defined (ACE_HAS_INT8_T)
-  typedef int8_t		ACE_INT8;
+  typedef int8_t                ACE_INT8;
 #elif !defined (ACE_LACKS_SIGNED_CHAR)
-  typedef signed char		ACE_INT8;
+  typedef signed char           ACE_INT8;
 #else
-  typedef char			ACE_INT8;
+  typedef char                  ACE_INT8;
 #endif /* defined (ACE_INT8_TYPE) */
 
 #if defined (ACE_UINT8_TYPE)
-  typedef ACE_UINT8_TYPE	ACE_UINT8;
+  typedef ACE_UINT8_TYPE        ACE_UINT8;
 #elif defined (ACE_HAS_UINT8_T)
-  typedef uint8_t		ACE_UINT8;
+  typedef uint8_t               ACE_UINT8;
 #else
-  typedef unsigned char		ACE_UINT8;
+  typedef unsigned char         ACE_UINT8;
 #endif /* defined (ACE_UINT8_TYPE) */
 
 #if defined (ACE_INT16_TYPE)
-  typedef ACE_INT16_TYPE	ACE_INT16;
+  typedef ACE_INT16_TYPE        ACE_INT16;
 #elif defined (ACE_HAS_INT16_T)
-  typedef int16_t		ACE_INT16;
+  typedef int16_t               ACE_INT16;
 #elif ACE_SIZEOF_SHORT == 2
-  typedef short			ACE_INT16;
+  typedef short                 ACE_INT16;
 #elif ACE_SIZEOF_INT == 2
-  typedef int			ACE_INT16;
+  typedef int                   ACE_INT16;
 #else
 # error Have to add to the ACE_INT16 type setting
 #endif  /* defined (ACE_INT16_TYPE) */
 
 #if defined (ACE_UINT16_TYPE)
-  typedef ACE_UINT16_TYPE	ACE_UINT16;
+  typedef ACE_UINT16_TYPE       ACE_UINT16;
 #elif defined (ACE_HAS_UINT16_T)
-  typedef uint16_t		ACE_UINT16;
+  typedef uint16_t              ACE_UINT16;
 #elif ACE_SIZEOF_SHORT == 2
-  typedef unsigned short	ACE_UINT16;
+  typedef unsigned short        ACE_UINT16;
 #elif ACE_SIZEOF_INT == 2
-  typedef unsigned int		ACE_UINT16;
+  typedef unsigned int          ACE_UINT16;
 #else
 # error Have to add to the ACE_UINT16 type setting
 #endif /* defined (ACE_UINT16_TYPE) */
 
 #if defined (ACE_INT32_TYPE)
-  typedef ACE_INT32_TYPE	ACE_INT32;
+  typedef ACE_INT32_TYPE        ACE_INT32;
 #elif defined (ACE_HAS_INT32_T)
-  typedef int32_t		ACE_INT32;
+  typedef int32_t               ACE_INT32;
 #elif ACE_SIZEOF_INT == 4
-  typedef int			ACE_INT32;
+  typedef int                   ACE_INT32;
 #elif ACE_SIZEOF_LONG == 4
-  typedef long			ACE_INT32;
+  typedef long                  ACE_INT32;
 #else
 # error Have to add to the ACE_INT32 type setting
 #endif /* defined (ACE_INT32_TYPE) */
 
 #if defined (ACE_UINT32_TYPE)
-  typedef ACE_UINT32_TYPE	ACE_UINT32;
+  typedef ACE_UINT32_TYPE       ACE_UINT32;
 #elif defined (ACE_HAS_UINT32_T)
-  typedef uint32_t		ACE_UINT32;
+  typedef uint32_t              ACE_UINT32;
 #elif ACE_SIZEOF_INT == 4
-  typedef unsigned int		ACE_UINT32;
+  typedef unsigned int          ACE_UINT32;
 #elif ACE_SIZEOF_LONG == 4
-  typedef unsigned long		ACE_UINT32;
+  typedef unsigned long         ACE_UINT32;
 #else
 # error Have to add to the ACE_UINT32 type setting
 #endif /* defined (ACE_UINT32_TYPE) */
 
 #if defined (ACE_INT64_TYPE)
-  typedef ACE_INT64_TYPE	ACE_INT64;
+  typedef ACE_INT64_TYPE        ACE_INT64;
 #elif defined (ACE_HAS_INT64_T)
-  typedef int64_t		ACE_INT64;
+  typedef int64_t               ACE_INT64;
 #elif ACE_SIZEOF_LONG == 8
-  typedef long			ACE_INT64;
+  typedef long                  ACE_INT64;
 #elif !defined (ACE_LACKS_LONGLONG_T) && ACE_SIZEOF_LONG_LONG == 8
-  typedef long long		ACE_INT64;
+  typedef long long             ACE_INT64;
 #endif /* defined (ACE_INT64_TYPE) */
 
 #if !(defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T))
 /* See matching #if around ACE_U_LongLong class declaration below */
 
 #  if defined (ACE_UINT64_TYPE)
-  typedef ACE_UINT64_TYPE	ACE_UINT64;
+  typedef ACE_UINT64_TYPE       ACE_UINT64;
 #  elif defined (ACE_HAS_UINT64_T)
-  typedef uint64_t		ACE_UINT64;
+  typedef uint64_t              ACE_UINT64;
 #  elif ACE_SIZEOF_LONG == 8
-  typedef unsigned long		ACE_UINT64;
+  typedef unsigned long         ACE_UINT64;
 #  elif ACE_SIZEOF_LONG_LONG == 8
-  typedef unsigned long	long	ACE_UINT64;
+  typedef unsigned long long    ACE_UINT64;
 #  endif /* defined (ACE_UINT64_TYPE) */
 #endif /* !(ACE_LACKS_LONGLONG_T || ACE_LACKS_UNSIGNEDLONGLONG_T) */
 
@@ -259,14 +261,11 @@ typedef unsigned char ACE_Byte;
 // Type for doing arithmetic on pointers ... as elsewhere, we assume
 // that unsigned versions of a type are the same size as the signed
 // version of the same type.
-// NOTE! ptr_arith_t is an ACE-defined type and should not be used.
-// It has been superseded by the standard type ptrdiff_t. This definition
-// is simply a placeholder til all ptr_arith_t usage can be expunged from
-// ACE and TAO.
 # if defined (ACE_HAS_WINCE) && (_WIN32_WCE < 400)
-typedef unsigned long  ptrdiff_t;    // evc3, PocketPC don't defined ptrdiff_t
+typedef unsigned long ptrdiff_t;    // evc3, PocketPC don't defined ptrdiff_t
 # endif
-typedef ptrdiff_t ptr_arith_t;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 // Byte-order (endian-ness) determination.
 # if defined (BYTE_ORDER)
@@ -358,6 +357,8 @@ typedef ptrdiff_t ptr_arith_t;
 // Forward declaration for streams
 #   include "ace/iosfwd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_U_LongLong
  *
@@ -507,7 +508,7 @@ typedef ptrdiff_t ptr_arith_t;
       double for_alignment_;
     };
 
-    // NOTE:  the following four accessors are inlined here in
+    // @note  the following 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.
 
@@ -523,7 +524,7 @@ typedef ptrdiff_t ptr_arith_t;
     /// Internal utility function to hide access through struct.
     ACE_UINT32 &l_ () { return data_.lo_; }
 
-    // NOTE:  the above four accessors are inlined here in
+    // @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.
 
@@ -549,6 +550,8 @@ typedef ptrdiff_t ptr_arith_t;
   ostream &operator<< (ostream &, const ACE_U_LongLong &);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # endif /* ACE_LACKS_LONGLONG_T */
 
 // Conversions from ACE_UINT64 to ACE_UINT32.  ACE_CU64_TO_CU32 should
diff --git a/ace/Basic_Types.inl b/ace/Basic_Types.inl
index 20d01562575..15f9a9a1ab6 100644
--- a/ace/Basic_Types.inl
+++ b/ace/Basic_Types.inl
@@ -4,6 +4,8 @@
 
 # if !defined (ACE_LACKS_LONGLONG_T) && defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation for ACE_U_LongLong when we have signed long long
 // but no unsigned long long.
 
@@ -134,7 +136,7 @@ ACE_U_LongLong::operator>= (const ACE_U_LongLong &n) const
 {
   if (data_ == n.data_) return true;
 
-  return data_ > n.data_;  
+  return data_ > n.data_;
 }
 
 ACE_INLINE bool
@@ -419,8 +421,12 @@ ACE_U_LongLong::operator/ (const int n) const
 }
 #endif
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #elif defined (ACE_LACKS_LONGLONG_T)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_U_LongLong::ACE_U_LongLong (const ACE_UINT32 lo, const ACE_UINT32 hi)
 {
@@ -943,4 +949,6 @@ ACE_U_LongLong::operator/ (const int n) const
 }
 #endif /* ACE_SIZEOF_INT != 4 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_LONGLONG_T  || ACE_LACKS_UNSIGNEDLONGLONG_T */
diff --git a/ace/Bound_Ptr.h b/ace/Bound_Ptr.h
index 833ab3fe84e..c80fe91dc65 100644
--- a/ace/Bound_Ptr.h
+++ b/ace/Bound_Ptr.h
@@ -23,6 +23,8 @@
 
 #include "ace/Auto_Ptr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Bound_Ptr_Counter
  *
@@ -333,6 +335,8 @@ private:
   X *ptr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include "ace/Bound_Ptr.inl"
 
 #include /**/ "ace/post.h"
diff --git a/ace/Bound_Ptr.inl b/ace/Bound_Ptr.inl
index f95b7c94f59..7f6797156f9 100644
--- a/ace/Bound_Ptr.inl
+++ b/ace/Bound_Ptr.inl
@@ -8,6 +8,8 @@
 #  include "ace/Log_Msg.h"
 #endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCK> inline ACE_Bound_Ptr_Counter<ACE_LOCK> *
 ACE_Bound_Ptr_Counter<ACE_LOCK>::internal_create (int init_obj_ref_count)
 {
@@ -482,3 +484,5 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::remove_ref ()
     }
   return new_obj_ref_count;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp
index 7f3c7d5c05f..e4382bff196 100644
--- a/ace/CDR_Base.cpp
+++ b/ace/CDR_Base.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (ace,
            CDR_Base,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //
 // See comments in CDR_Base.inl about optimization cases for swap_XX_array.
 //
@@ -21,7 +23,7 @@ ACE_CDR::swap_2_array (const char* orig, char* target, size_t n)
 {
   // ACE_ASSERT(n > 0); The caller checks that n > 0
 
-  // We pretend that AMD64/GNU G++ systems have a Pentium CPU to 
+  // We pretend that AMD64/GNU G++ systems have a Pentium CPU to
   // take advantage of the inline assembly implementation.
 
   // Later, we try to read in 32 or 64 bit chunks,
@@ -287,7 +289,7 @@ ACE_CDR::swap_4_array (const char* orig, char* target, size_t n)
           register unsigned long b =
             * reinterpret_cast<const long*> (orig + 8);
 
-#if defined(__amd64__) && defined(__GNUC__) 
+#if defined(__amd64__) && defined(__GNUC__)
           asm ("bswapq %1" : "=r" (a) : "0" (a));
           asm ("bswapq %1" : "=r" (b) : "0" (b));
           asm ("rol $32, %1" : "=r" (a) : "0" (a));
@@ -482,8 +484,12 @@ ACE_CDR::swap_16_array (const char* orig, char* target, size_t n)
 void
 ACE_CDR::mb_align (ACE_Message_Block *mb)
 {
+#if !defined (ACE_CDR_IGNORE_ALIGNMENT)
   char *start = ACE_ptr_align_binary (mb->base (),
                                       ACE_CDR::MAX_ALIGNMENT);
+#else
+  char *start = mb->base ();
+#endif /* ACE_CDR_IGNORE_ALIGNMENT */
   mb->rd_ptr (start);
   mb->wr_ptr (start);
 }
@@ -542,17 +548,19 @@ ACE_CDR::consolidate (ACE_Message_Block *dst,
                          + ACE_CDR::MAX_ALIGNMENT);
   dst->size (newsize);
 
+#if !defined (ACE_CDR_IGNORE_ALIGNMENT)
   // We must copy the contents of <src> into the new buffer, but
   // respecting the alignment.
   ptrdiff_t srcalign =
     ptrdiff_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
   ptrdiff_t dstalign =
     ptrdiff_t(dst->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
-  int offset = srcalign - dstalign;
+  ptrdiff_t offset = srcalign - dstalign;
   if (offset < 0)
     offset += ACE_CDR::MAX_ALIGNMENT;
-  dst->rd_ptr (offset);
+  dst->rd_ptr (static_cast<size_t> (offset));
   dst->wr_ptr (dst->rd_ptr ());
+#endif /* ACE_CDR_IGNORE_ALIGNMENT */
 
   for (const ACE_Message_Block* i = src;
        i != 0;
@@ -614,3 +622,5 @@ ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const
   return false;
 }
 #endif /* _UNICOS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 6b163161f6f..1caa81333ad 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -38,13 +38,9 @@
 
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
+#include "ace/If_Then_Else.h"
 
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
-# include "ace/If_Then_Else.h"
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Message_Block;
 
@@ -172,20 +168,14 @@ public:
    * avoid complaints from all compilers is to define them all.
    */
   //@{
-# if (defined (_MSC_VER) && (_MSC_VER < 1310))
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an unsigned char typedef.
-  typedef unsigned char Boolean;
-# else
   typedef ACE::If_Then_Else<(sizeof (bool) == 1),
                             bool,
                             unsigned char>::result_type Boolean;
-# endif  /* _MSC_VER <= 1310 */
 
 # if !defined (ACE_CDR_WCHAR_OVERRIDE) || defined(ACE_USES_WCHAR)
 #  undef ACE_CDR_WCHAR_OVERRIDE
 #  define ACE_CDR_WCHAR_OVERRIDE wchar_t
-# endif 
+# endif
 
   typedef unsigned char Octet;
   typedef char Char;
@@ -309,6 +299,8 @@ public:
 #endif /* ACE_CDR_GIOP_MINOR_VERSION */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/CDR_Base.inl"
 #endif  /* __ACE_INLINE__ */
diff --git a/ace/CDR_Base.inl b/ace/CDR_Base.inl
index 6d6222ff40d..84e14344cc5 100644
--- a/ace/CDR_Base.inl
+++ b/ace/CDR_Base.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //
 // The ACE_CDR::swap_X and ACE_CDR::swap_X_array routines are broken
 // in 4 cases for optimization:
@@ -97,7 +99,7 @@ ACE_CDR::swap_4 (const char* orig, char* target)
 ACE_INLINE void
 ACE_CDR::swap_8 (const char* orig, char* target)
 {
-#if defined(__amd64__) && defined(__GNUG__) 
+#if defined(__amd64__) && defined(__GNUG__)
   register unsigned long x =
     * reinterpret_cast<const unsigned long*> (orig);
   asm ("bswapq %1" : "=r" (x) : "0" (x));
@@ -196,4 +198,6 @@ ACE_CDR::next_size (size_t minsize)
   return newsize;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // ****************************************************************
diff --git a/ace/CDR_Size.cpp b/ace/CDR_Size.cpp
index e63d22c53be..3f2829cc909 100644
--- a/ace/CDR_Size.cpp
+++ b/ace/CDR_Size.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (ace,
            CDR_Size,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_CDR::Boolean
 ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
 {
@@ -241,3 +243,5 @@ operator<< (ACE_SizeCDR &ss, const ACE_CString &x)
   ss.write_string (x);
   return ss.good_bit ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CDR_Size.h b/ace/CDR_Size.h
index b52b04486c7..f2bf59ce98c 100644
--- a/ace/CDR_Size.h
+++ b/ace/CDR_Size.h
@@ -36,6 +36,8 @@
 
 #include "ace/SStringfwd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SizeCDR
  *
@@ -87,7 +89,7 @@ public:
                                   const ACE_CDR::WChar *x);
   //@}
 
-  /// Note: the portion written starts at <x> and ends
+  /// @note the portion written starts at <x> and ends
   ///    at <x + length>.
   /// The length is *NOT* stored into the CDR stream.
   //@{ @name Array write operations
@@ -172,16 +174,19 @@ protected:
   ACE_CDR::Octet minor_version_;
 };
 
-
 // @@ This operator should not be inlined since they force SString.h
 //    to be included in this header.
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const ACE_CString &x);
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/CDR_Size.inl"
 #else /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Not used by CORBA or TAO
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                ACE_CDR::Char x);
@@ -226,8 +231,11 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const ACE_CDR::WChar* x);
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* __ACE_INLINE__ */
 
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CDR_SIZE_H */
diff --git a/ace/CDR_Size.inl b/ace/CDR_Size.inl
index 7697b9abdf7..4c835067ce8 100644
--- a/ace/CDR_Size.inl
+++ b/ace/CDR_Size.inl
@@ -4,6 +4,7 @@
 
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SizeCDR::ACE_SizeCDR (ACE_CDR::Octet major_version,
@@ -415,3 +416,5 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wstring x)
     (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_));
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 12a57ee11e3..2ca41fe93ed 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -9,9 +9,10 @@ ACE_RCSID (ace,
            CDR_Stream,
            "$Id$")
 
-
 // ****************************************************************
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int ACE_OutputCDR::wchar_maxbytes_ = sizeof (ACE_CDR::WChar);
 
 ACE_OutputCDR::ACE_OutputCDR (size_t size,
@@ -33,7 +34,9 @@ ACE_OutputCDR::ACE_OutputCDR (size_t size,
              ACE_Time_Value::max_time,
              data_block_allocator,
              message_block_allocator),
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
      current_alignment_ (0),
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
      current_is_writable_ (true),
      do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER),
      good_bit_ (true),
@@ -67,7 +70,9 @@ ACE_OutputCDR::ACE_OutputCDR (char *data, size_t size,
              ACE_Time_Value::max_time,
              data_block_allocator,
              message_block_allocator),
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
      current_alignment_ (0),
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
      current_is_writable_ (true),
      do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER),
      good_bit_ (true),
@@ -88,7 +93,9 @@ ACE_OutputCDR::ACE_OutputCDR (ACE_Message_Block *data,
                               ACE_CDR::Octet major_version,
                               ACE_CDR::Octet minor_version)
   :  start_ (data->data_block ()->duplicate ()),
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
      current_alignment_ (0),
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
      current_is_writable_ (true),
      do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER),
      good_bit_ (true),
@@ -129,8 +136,12 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
       size_t cursize = this->current_->size ();
       if (this->current_->cont () != 0)
         cursize = this->current_->cont ()->size ();
+      size_t minsize = size;
+
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
+      minsize += ACE_CDR::MAX_ALIGNMENT;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
-      size_t minsize = size + ACE_CDR::MAX_ALIGNMENT;
       // Make sure that there is enough room for <minsize> bytes, but
       // also make it bigger than whatever our current size is.
       if (minsize < cursize)
@@ -139,7 +150,7 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
       const size_t newsize = ACE_CDR::next_size (minsize);
 
       this->good_bit_ = false;
-      ACE_Message_Block* tmp;
+      ACE_Message_Block* tmp = 0;
       ACE_NEW_RETURN (tmp,
                       ACE_Message_Block (newsize,
                                          ACE_Message_Block::MB_DATA,
@@ -154,17 +165,19 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
                       -1);
       this->good_bit_ = true;
 
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
       // The new block must start with the same alignment as the
       // previous block finished.
       ptrdiff_t tmpalign =
         ptrdiff_t(tmp->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
       ptrdiff_t curalign =
         ptrdiff_t(this->current_alignment_) % ACE_CDR::MAX_ALIGNMENT;
-      int offset = curalign - tmpalign;
+      ptrdiff_t offset = curalign - tmpalign;
       if (offset < 0)
         offset += ACE_CDR::MAX_ALIGNMENT;
-      tmp->rd_ptr (offset);
+      tmp->rd_ptr (static_cast<size_t> (offset));
       tmp->wr_ptr (tmp->rd_ptr ());
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
       // grow the chain and set the current block.
       tmp->cont (this->current_->cont ());
@@ -187,7 +200,7 @@ ACE_OutputCDR::write_wchar (ACE_CDR::WChar x)
       return (this->good_bit_ = false);
     }
   if (static_cast<ACE_CDR::Short> (major_version_) == 1
-          && static_cast<ACE_CDR::Short> (minor_version_) == 2)
+      && static_cast<ACE_CDR::Short> (minor_version_) == 2)
     {
       ACE_CDR::Octet len =
         static_cast<ACE_CDR::Octet> (ACE_OutputCDR::wchar_maxbytes_);
@@ -196,24 +209,24 @@ ACE_OutputCDR::write_wchar (ACE_CDR::WChar x)
           if (ACE_OutputCDR::wchar_maxbytes_ == sizeof(ACE_CDR::WChar))
             return
               this->write_octet_array (
-                reinterpret_cast<const ACE_CDR::Octet*> (&x),
-                static_cast<ACE_CDR::ULong> (len));
+                                       reinterpret_cast<const ACE_CDR::Octet*> (&x),
+                                       static_cast<ACE_CDR::ULong> (len));
           else
             if (ACE_OutputCDR::wchar_maxbytes_ == 2)
               {
                 ACE_CDR::Short sx = static_cast<ACE_CDR::Short> (x);
                 return
                   this->write_octet_array (
-                    reinterpret_cast<const ACE_CDR::Octet*> (&sx),
-                    static_cast<ACE_CDR::ULong> (len));
+                                           reinterpret_cast<const ACE_CDR::Octet*> (&sx),
+                                           static_cast<ACE_CDR::ULong> (len));
               }
             else
               {
                 ACE_CDR::Octet ox = static_cast<ACE_CDR::Octet> (x);
                 return
                   this->write_octet_array (
-                    reinterpret_cast<const ACE_CDR::Octet*> (&ox),
-                    static_cast<ACE_CDR::ULong> (len));
+                                           reinterpret_cast<const ACE_CDR::Octet*> (&ox),
+                                           static_cast<ACE_CDR::ULong> (len));
               }
         }
     }
@@ -310,7 +323,7 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len,
       }
     else if (this->write_ulong (1))
       return this->write_wchar (0);
-   return (this->good_bit_ = false);
+  return (this->good_bit_ = false);
 }
 
 ACE_CDR::Boolean
@@ -347,7 +360,7 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
           continue;
         }
 
-      ACE_Message_Block* cont;
+      ACE_Message_Block* cont = 0;
       this->good_bit_ = false;
       ACE_NEW_RETURN (cont,
                       ACE_Message_Block (i->data_block ()->duplicate ()),
@@ -364,8 +377,10 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
           this->current_->cont (cont);
           this->current_ = cont;
           this->current_is_writable_ = false;
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
           this->current_alignment_ =
             (this->current_alignment_ + cont->length ()) % ACE_CDR::MAX_ALIGNMENT;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
         }
       else
         {
@@ -379,7 +394,7 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (1, buf) == 0)
     {
       *reinterpret_cast<ACE_CDR::Octet*> (buf) = *x;
@@ -392,7 +407,7 @@ ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -418,7 +433,7 @@ ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -444,7 +459,7 @@ ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
 {
-  char *buf;
+  char *buf = 0;
 
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
@@ -484,7 +499,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
 ACE_CDR::Boolean
 ACE_OutputCDR::write_16 (const ACE_CDR::LongDouble *x)
 {
-  char* buf;
+  char* buf = 0;
   if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
                     ACE_CDR::LONGDOUBLE_ALIGN,
                     buf) == 0)
@@ -515,7 +530,7 @@ ACE_OutputCDR::write_wchar_array_i (const ACE_CDR::WChar *x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
   const size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ?
     ACE_CDR::SHORT_ALIGN :
     ACE_CDR::OCTET_ALIGN;
@@ -557,7 +572,7 @@ ACE_OutputCDR::write_array (const void *x,
 {
   if (length == 0)
     return true;
-  char *buf;
+  char *buf = 0;
   if (this->adjust (size * length, align, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -723,10 +738,14 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs,
     wchar_translator_ (rhs.wchar_translator_)
 
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   // Align the base pointer assuming that the incoming stream is also
   // aligned the way we are aligned
   char *incoming_start = ACE_ptr_align_binary (rhs.start_.base (),
                                                ACE_CDR::MAX_ALIGNMENT);
+#else
+  char *incoming_start = rhs.start_.base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   const size_t newpos =
     (rhs.start_.rd_ptr() - incoming_start)  + offset;
@@ -753,10 +772,14 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs,
     wchar_translator_ (rhs.wchar_translator_)
 
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   // Align the base pointer assuming that the incoming stream is also
   // aligned the way we are aligned
   char *incoming_start = ACE_ptr_align_binary (rhs.start_.base (),
                                                ACE_CDR::MAX_ALIGNMENT);
+#else
+  char *incoming_start = rhs.start_.base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   const size_t newpos =
     rhs.start_.rd_ptr() - incoming_start;
@@ -787,8 +810,12 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs)
     char_translator_ (rhs.char_translator_),
     wchar_translator_ (rhs.wchar_translator_)
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   char *buf = ACE_ptr_align_binary (rhs.start_.base (),
                                     ACE_CDR::MAX_ALIGNMENT);
+#else
+  char *buf = rhs.start_.base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   size_t rd_offset = rhs.start_.rd_ptr () - buf;
   size_t wr_offset = rhs.start_.wr_ptr () - buf;
@@ -1025,7 +1052,7 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_string (ACE_CString &x)
 {
-  ACE_CDR::Char *data;
+  ACE_CDR::Char *data = 0;
   if (this->read_string (data))
     {
       x = data;
@@ -1121,7 +1148,7 @@ ACE_InputCDR::read_array (void* x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
 
   if (this->adjust (size * length, align, buf) == 0)
     {
@@ -1165,7 +1192,7 @@ ACE_InputCDR::read_wchar_array_i (ACE_CDR::WChar* x,
 {
   if (length == 0)
     return true;
-  char* buf;
+  char* buf = 0;
   const size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ?
     ACE_CDR::SHORT_ALIGN :
     ACE_CDR::OCTET_ALIGN;
@@ -1260,7 +1287,7 @@ ACE_InputCDR::read_2 (ACE_CDR::UShort *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_4 (ACE_CDR::ULong *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
@@ -1280,7 +1307,7 @@ ACE_InputCDR::read_4 (ACE_CDR::ULong *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
 {
-  char *buf;
+  char *buf = 0;
 
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
@@ -1331,7 +1358,7 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
 ACE_CDR::Boolean
 ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
                     ACE_CDR::LONGDOUBLE_ALIGN,
                     buf) == 0)
@@ -1641,3 +1668,5 @@ operator>> (ACE_InputCDR &is, ACE_CString &x)
   is.read_string (x);
   return is.good_bit ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 4a7c93b43fe..3c245ab945b 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -19,6 +19,16 @@
  * Those assumptions are pretty good these days, with Crays beign
  * the only known exception.
  *
+ * Optimizations
+ * -------------
+ *  ACE_LACKS_CDR_ALIGNMENT
+ *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
+ *
+ *  CDR stream ignores alignment when marshaling data. Use this option
+ *  only when ACE_DISABLE_SWAP_ON_READ can be enabled. This option requires
+ *  ACE CDR engine to do both marshaling and demarshaling.
+ *
+ *
  *  @author TAO version by Aniruddha Gokhale <gokhale@cs.wustl.edu>
  *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
  *  @author ACE version by Jeff Parsons <parsons@cs.wustl.edu>
@@ -52,6 +62,8 @@
 #endif /* ! ACE_LITTLE_ENDIAN */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Char_Codeset_Translator;
 class ACE_WChar_Codeset_Translator;
 
@@ -217,7 +229,7 @@ public:
                                   const ACE_CDR::WChar *x);
   //@}
 
-  /// Note: the portion written starts at <x> and ends
+  /// @note the portion written starts at <x> and ends
   ///    at <x + length>.
   /// The length is *NOT* stored into the CDR stream.
   //@{ @name Array write operations
@@ -289,7 +301,7 @@ public:
 
   /**
    * Return the start of the message block chain for this CDR stream.
-   * NOTE: The complete CDR stream is represented by a chain of
+   * @note The complete CDR stream is represented by a chain of
    * message blocks.
    */
   const ACE_Message_Block *begin (void) const;
@@ -301,14 +313,14 @@ public:
   const ACE_Message_Block *current (void) const;
 
   /**
-   * Access the underlying buffer (read only).  NOTE: This
+   * Access the underlying buffer (read only).  @note This
    * method only returns a pointer to the first block in the
    * chain.
    */
   const char *buffer (void) const;
 
   /**
-   * Return the start and size of the internal buffer.NOTE: This
+   * Return the start and size of the internal buffer.@note This
    * method only returns information about the first block in the
    * chain.
    */
@@ -431,6 +443,7 @@ private:
   /// The current block in the chain were we are writing.
   ACE_Message_Block *current_;
 
+#if !defined (ACE_LACKS_CDR_IALIGNMENT)
   /**
    * The current alignment as measured from the start of the buffer.
    * Usually this coincides with the alignment of the buffer in
@@ -440,6 +453,7 @@ private:
    * the stolen message block.
    */
   size_t current_alignment_;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   /**
    * Is the current block writable.  When we steal a buffer from the
@@ -487,20 +501,6 @@ protected:
   static int wchar_maxbytes_;
 };
 
-/**
-* @class OutputCDR_Auto_Reset
-*
-* @brief This class will call the reset() method on an
-* output CDR when it goes out of scope.
-*/
-class OutputCDR_Auto_Reset {
-public:
-  OutputCDR_Auto_Reset (ACE_OutputCDR& cdr);
-  ~OutputCDR_Auto_Reset (void);
-private:
-  ACE_OutputCDR& cdr_;
-};
-
 
 // ****************************************************************
 
@@ -1174,10 +1174,14 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CString &x);
 
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/CDR_Stream.inl"
 #else /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Not used by CORBA or TAO
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                ACE_CDR::Char x);
@@ -1264,6 +1268,8 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
 extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CDR::WChar*& x);
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/CDR_Stream.inl b/ace/CDR_Stream.inl
index 6d68e938d15..cbcb6638bf1 100644
--- a/ace/CDR_Stream.inl
+++ b/ace/CDR_Stream.inl
@@ -7,6 +7,8 @@
 
 // ****************************************************************
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // implementing the special types
 ACE_INLINE
 ACE_OutputCDR::from_boolean::from_boolean (ACE_CDR::Boolean b)
@@ -153,7 +155,10 @@ ACE_OutputCDR::reset (void)
   this->current_ = &this->start_;
   this->current_is_writable_ = true;
   ACE_CDR::mb_align (&this->start_);
+
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   this->current_alignment_ = 0;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   // It is tempting not to remove the memory, but we need to do so to
   // release any potential user buffers chained in the continuation
@@ -165,7 +170,6 @@ ACE_OutputCDR::reset (void)
       ACE_Message_Block::release (cont);
       this->start_.cont (0);
     }
-
 }
 
 // Encode the CDR stream.
@@ -173,7 +177,8 @@ ACE_OutputCDR::reset (void)
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_octet (ACE_CDR::Octet x)
 {
-  return this->write_1 (reinterpret_cast<const ACE_CDR::Octet *> (&x));
+  const void *temp = &x;
+  return this->write_1 (reinterpret_cast<const ACE_CDR::Octet *> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
@@ -186,62 +191,74 @@ ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_char (ACE_CDR::Char x)
 {
   if (this->char_translator_ == 0)
-    return this->write_1 (reinterpret_cast<const ACE_CDR::Octet*> (&x));
+    {
+      const void *temp = &x;
+      return this->write_1 (reinterpret_cast<const ACE_CDR::Octet*> (temp));
+    }
   return this->char_translator_->write_char (*this, x);
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_short (ACE_CDR::Short x)
 {
-  return this->write_2 (reinterpret_cast<const ACE_CDR::UShort*> (&x));
+  const void *temp = &x;
+  return this->write_2 (reinterpret_cast<const ACE_CDR::UShort*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_ushort (ACE_CDR::UShort x)
 {
-  return this->write_2 (reinterpret_cast<const ACE_CDR::UShort*> (&x));
+  const void *temp = &x;
+  return this->write_2 (reinterpret_cast<const ACE_CDR::UShort*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_long (ACE_CDR::Long x)
 {
-  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (&x));
+  const void *temp = &x;
+  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_ulong (ACE_CDR::ULong x)
 {
-  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (&x));
+  const void *temp = &x;
+  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_longlong (const ACE_CDR::LongLong &x)
 {
-  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (&x));
+  const void *temp = &x;
+  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_ulonglong (const ACE_CDR::ULongLong &x)
 {
-  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (&x));
+  const void *temp = &x;
+  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_float (ACE_CDR::Float x)
 {
-  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (&x));
+  const void *temp = &x;
+  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_double (const ACE_CDR::Double &x)
 {
-  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (&x));
+  const void *temp = &x;
+  return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_longdouble (const ACE_CDR::LongDouble &x)
 {
-  return this->write_16 (reinterpret_cast<const ACE_CDR::LongDouble*> (&x));
+  const void *temp = &x;
+  return this->write_16 (reinterpret_cast<const ACE_CDR::LongDouble*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
@@ -416,17 +433,24 @@ ACE_OutputCDR::adjust (size_t size,
   if (!this->current_is_writable_)
     return this->grow_and_adjust (size, align, buf);
 
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   const size_t offset =
     ACE_align_binary (this->current_alignment_, align)
     - this->current_alignment_;
 
   buf = this->current_->wr_ptr () + offset;
+#else
+  buf = this->current_->wr_ptr ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
+
   char *end = buf + size;
 
   if (end <= this->current_->end () &&
       end >= buf)
     {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
       this->current_alignment_ += offset + size;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
       this->current_->wr_ptr (end);
       return 0;
     }
@@ -518,14 +542,26 @@ ACE_OutputCDR::reset_byte_order (int byte_order)
 ACE_INLINE size_t
 ACE_OutputCDR::current_alignment (void) const
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   return this->current_alignment_;
+#else
+  // Default value set to 0
+  return 0;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 }
 
 ACE_INLINE int
 ACE_OutputCDR::align_write_ptr (size_t alignment)
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   char *dummy;
   return this->adjust (0, alignment, dummy);
+#else
+  ACE_UNUSED_ARG (alignment);
+  // A return value of -1 from this function is used
+  // to indicate failure, returning 0
+  return 0;
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 }
 
 ACE_INLINE ACE_Char_Codeset_Translator *
@@ -578,7 +614,10 @@ ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_char (ACE_CDR::Char &x)
 {
   if (this->char_translator_ == 0)
-    return this->read_1 (reinterpret_cast<ACE_CDR::Octet*> (&x));
+    {
+      void *temp = &x;
+      return this->read_1 (reinterpret_cast<ACE_CDR::Octet*> (temp));
+    }
   return this->char_translator_->read_char (*this, x);
 }
 
@@ -586,58 +625,67 @@ ACE_InputCDR::read_char (ACE_CDR::Char &x)
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_short (ACE_CDR::Short &x)
 {
-  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (&x));
+  void *temp = &x;
+  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_ushort (ACE_CDR::UShort &x)
 {
-  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (&x));
+  void *temp = &x;
+  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (temp));
 }
 
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_long (ACE_CDR::Long &x)
 {
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
+  void *temp = &x;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_ulong (ACE_CDR::ULong &x)
 {
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
+  void *temp = &x;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_longlong (ACE_CDR::LongLong &x)
 {
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_ulonglong (ACE_CDR::ULongLong &x)
 {
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_float (ACE_CDR::Float &x)
 {
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
+  void *temp = &x;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_double (ACE_CDR::Double &x)
 {
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_longdouble (ACE_CDR::LongDouble &x)
 {
-  return this->read_16 (reinterpret_cast<ACE_CDR::LongDouble*> (&x));
+  void *temp = &x;
+  return this->read_16 (reinterpret_cast<ACE_CDR::LongDouble*> (temp));
 }
 
 ACE_INLINE size_t
@@ -874,7 +922,8 @@ ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_char (void)
 {
   ACE_CDR::Char x;
-  return this->read_1 (reinterpret_cast<ACE_CDR::Octet*> (&x));
+  void *temp = &x;
+  return this->read_1 (reinterpret_cast<ACE_CDR::Octet*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
@@ -896,42 +945,48 @@ ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_short (void)
 {
   ACE_CDR::Short x;
-  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (&x));
+  void *temp = &x;
+  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_ushort (void)
 {
   ACE_CDR::UShort x;
-  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (&x));
+  void *temp = &x;
+  return this->read_2 (reinterpret_cast<ACE_CDR::UShort*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_long (void)
 {
   ACE_CDR::Long x;
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
+  void *temp = &x;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_ulong (void)
 {
   ACE_CDR::ULong x;
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
+  void *temp = &x;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_longlong (void)
 {
   ACE_CDR::LongLong x;
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_ulonglong (void)
 {
   ACE_CDR::ULongLong x;
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
@@ -940,21 +995,24 @@ ACE_InputCDR::skip_float (void)
   // Changing this removes the warning for GHS and it
   // stops the compiler from getting an internal error.
   ACE_CDR::ULong value;
-  return this->read_4 (&value);
+  void *temp = &value;
+  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_double (void)
 {
   double x;
-  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
+  void *temp = &x;
+  return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (temp));
 }
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_longdouble (void)
 {
   ACE_CDR::LongDouble x;
-  return this->read_16 (reinterpret_cast<ACE_CDR::LongDouble*> (&x));
+  void *temp = &x;
+  return this->read_16 (reinterpret_cast<ACE_CDR::LongDouble*> (temp));
 }
 
 ACE_INLINE char*
@@ -986,7 +1044,12 @@ ACE_InputCDR::adjust (size_t size,
                       size_t align,
                       char*& buf)
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   buf = ACE_ptr_align_binary (this->rd_ptr (), align);
+#else
+  buf = this->rd_ptr ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
+
   char *end = buf + size;
   if (end <= this->wr_ptr ())
     {
@@ -996,6 +1059,9 @@ ACE_InputCDR::adjust (size_t size,
 
   this->good_bit_ = false;
   return -1;
+#if defined (ACE_LACKS_CDR_ALIGNMENT)
+  ACE_UNUSED_ARG (align);
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 }
 
 ACE_INLINE int
@@ -1436,8 +1502,12 @@ ACE_InputCDR::byte_order (void) const
 ACE_INLINE int
 ACE_InputCDR::align_read_ptr (size_t alignment)
 {
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   char *buf = ACE_ptr_align_binary (this->rd_ptr (),
                                     alignment);
+#else
+  char *buf = this->rd_ptr ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
   if (buf <= this->wr_ptr ())
     {
@@ -1670,14 +1740,4 @@ ACE_WChar_Codeset_Translator::minor_version (ACE_OutputCDR& output)
   return output.minor_version_;
 }
 
-ACE_INLINE 
-OutputCDR_Auto_Reset::OutputCDR_Auto_Reset (ACE_OutputCDR& cdr)
-  : cdr_ (cdr)
-{ 
-}
-
-ACE_INLINE 
-OutputCDR_Auto_Reset::~OutputCDR_Auto_Reset (void) 
-{
-  cdr_.reset ();
-}
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/CE_Screen_Output.cpp b/ace/CE_Screen_Output.cpp
index f4d69659532..8a477b97a85 100644
--- a/ace/CE_Screen_Output.cpp
+++ b/ace/CE_Screen_Output.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/CE_Screen_Output.h"
@@ -6,6 +5,8 @@
 
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit)
 : handler_(hEdit)
 , pFile_(0)
@@ -152,4 +153,6 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile)
     return *this;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  // ACE_HAS_WINCE
diff --git a/ace/CE_Screen_Output.h b/ace/CE_Screen_Output.h
index 5252b810fb1..48e9d54cb13 100644
--- a/ace/CE_Screen_Output.h
+++ b/ace/CE_Screen_Output.h
@@ -24,8 +24,13 @@
 #include "ace/Log_Msg_Callback.h"
 #include "ace/Log_Record.h"
 
-const ACE_TCHAR endl[] = ACE_LIB_TEXT("\r\n");
-const ACE_TCHAR tab[]  = ACE_LIB_TEXT("\t");
+namespace
+{
+  const ACE_TCHAR endl[] = ACE_LIB_TEXT("\r\n");
+  const ACE_TCHAR tab[]  = ACE_LIB_TEXT("\t");
+}
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_CE_Screen_Output
@@ -87,7 +92,7 @@ public:
 
 private:
 
-  ACE_CE_Screen_Output(ACE_CE_Screen_Output&);
+  ACE_CE_Screen_Output (ACE_CE_Screen_Output&);
 
 private:
 
@@ -98,5 +103,7 @@ private:
   FILE* pFile_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  // ACE_HAS_WINCE
 #endif  // ACE_CE_SCREEN_OUTPUT_H
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index f2e6c88a273..effa6f7d208 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_CACHE_MAP_MANAGER_T_C
-#define ACE_CACHE_MAP_MANAGER_T_C
+#ifndef ACE_CACHE_MAP_MANAGER_T_CPP
+#define ACE_CACHE_MAP_MANAGER_T_CPP
 
 #include "ace/Cache_Map_Manager_T.h"
 
@@ -16,7 +16,7 @@
 #include "ace/Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager)
 
@@ -24,8 +24,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator)
 
-#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
-#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
+#define ACE_T1 class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
+#define ACE_T2 KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
 template <ACE_T1>
 ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
@@ -415,4 +415,6 @@ ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
 {
 }
 
-#endif /* ACE_CACHE_MAP_MANAGER_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_CACHE_MAP_MANAGER_T_CPP */
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index cd981a8d702..ad014e696e2 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -25,6 +25,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/Pair_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 class ACE_Allocator;
 
@@ -55,7 +57,7 @@ class ACE_Cache_Map_Reverse_Iterator;
  * isn't efficient.  Locking has to be provided by the
  * application.
  */
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Manager
 {
 public:
@@ -63,7 +65,7 @@ public:
   // = Traits.
   typedef KEY key_type;
   typedef VALUE mapped_type;
-  typedef MAP map_type;
+  typedef CMAP_TYPE map_type;
   typedef CACHING_STRATEGY caching_strategy_type;
 
   typedef ITERATOR_IMPL ITERATOR_IMPLEMENTATION;
@@ -111,7 +113,7 @@ public:
   int close (void);
 
   /**
-   * Associate <key> with <value>.  If <key> is already in the MAP
+   * Associate <key> with <value>.  If <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.
@@ -121,7 +123,7 @@ public:
 
   /**
    * Lookup entry<key,value> in the cache. If it is not found, returns -1.
-   * If the <key> is located in the MAP object, the CACHING_STRATEGY is
+   * If the <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>.
@@ -131,7 +133,7 @@ public:
 
   /**
    * Lookup entry<key,value> in the cache. If it is not found, returns -1.
-   * If the <key> is located in the MAP object, the CACHING_STRATEGY is
+   * If the <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).
@@ -212,7 +214,7 @@ public:
   REVERSE_ITERATOR rend (void);
 
   /// The map managed by the Cache_Map_Manager.
-  MAP &map (void);
+  CMAP_TYPE &map (void);
 
   /// The caching strategy used on the cache.
   CACHING_STRATEGY &caching_strategy (void);
@@ -220,7 +222,7 @@ public:
 protected:
 
   /// The underlying map which needs to be cached.
-  MAP map_;
+  CMAP_TYPE map_;
 
   /// The strategy to be followed for caching entries in the map.
   CACHING_STRATEGY &caching_strategy_;
@@ -228,8 +230,8 @@ protected:
 private:
 
   // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
 
 };
 
@@ -384,6 +386,8 @@ protected:
   REVERSE_IMPLEMENTATION reverse_iterator_implementation_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Cache_Map_Manager_T.inl b/ace/Cache_Map_Manager_T.inl
index ca559696665..ba30c528dd6 100644
--- a/ace/Cache_Map_Manager_T.inl
+++ b/ace/Cache_Map_Manager_T.inl
@@ -2,56 +2,58 @@
 //
 //$Id$
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::purge (void)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::purge (void)
 {
   return this->caching_strategy ().caching_utility ().clear_cache (this->map_,
                                                                    this->caching_strategy ().purge_percent ());
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::current_size (void) const
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::current_size (void) const
 {
   return this->map_.current_size ();
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::total_size (void) const
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::total_size (void) const
 {
   return this->map_.total_size ();
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE MAP &
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::map (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE CMAP_TYPE &
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::map (void)
 {
   return this->map_;
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE CACHING_STRATEGY &
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::caching_strategy (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE CACHING_STRATEGY &
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::caching_strategy (void)
 {
   return this->caching_strategy_;
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::begin (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::begin (void)
 {
   return ITERATOR (this->map_.begin ());
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::end (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::end (void)
 {
   return ITERATOR (this->map_.end ());
 }
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::rbegin (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::rbegin (void)
 {
   return REVERSE_ITERATOR (this->map_.rbegin ());
 }
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::rend (void)
+template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::rend (void)
 {
   return REVERSE_ITERATOR (this->map_.rend ());
 }
@@ -240,3 +242,4 @@ ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRAT
   return this->reverse_iterator_implementation_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index f44f3209987..706142c640d 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#ifndef CACHED_CONNECT_STRATEGY_T_C
-#define CACHED_CONNECT_STRATEGY_T_C
+#ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP
+#define ACE_CACHED_CONNECT_STRATEGY_T_CPP
 
 #include "ace/Cached_Connect_Strategy_T.h"
 
@@ -16,11 +16,11 @@
 #include "ace/WFMO_Reactor.h"
 #include "ace/Pair_T.h"
 
-ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$")
-
 #define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX
 #define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_T1>
 ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex
 (CACHING_STRATEGY &caching_s,
@@ -275,7 +275,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
       // for the <Connector> to notify the cache of the completion of
       // connect().
 
-      if (errno == EWOULDBLOCK)
+      if (errno == EWOULDBLOCK || errno == ETIMEDOUT)
         errno = ENOTSUP;
       else if (ACE::out_of_handles (errno) || errno == EADDRINUSE)
         {
@@ -296,7 +296,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
                                     flags,
                                     perms) == -1)
             {
-              if (errno == EWOULDBLOCK)
+              if (errno == EWOULDBLOCK || errno == ETIMEDOUT)
                 errno = ENOTSUP;
               return -1;
             }
@@ -726,7 +726,9 @@ ACE_Bounded_Cached_Connect_Strategy<ACE_T2>::find_or_create_svc_handler_i
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Cached_Connect_Strategy)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef ACE_T1
 #undef ACE_T2
 
-#endif /* CACHED_CONNECT_STRATEGY_T_C */
+#endif /* ACE_CACHED_CONNECT_STRATEGY_T_CPP */
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index 8c051a240d2..f04392846cb 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -30,6 +30,8 @@
 // For linkers which cant grok long names...
 #define ACE_Cached_Connect_Strategy_Ex ACCSE
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Cached_Connect_Strategy_Ex
  *
@@ -246,6 +248,7 @@ protected:
   size_t  max_size_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Cached_Connect_Strategy_T.cpp"
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index 7adf976162f..db2f9067ec9 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#ifndef CACHING_STRATEGIES_T_C
-#define CACHING_STRATEGIES_T_C
+#ifndef ACE_CACHING_STRATEGIES_T_CPP
+#define ACECACHING_STRATEGIES_T_CPP
 
 #include "ace/Caching_Strategies_T.h"
 #include "ace/Log_Msg.h"
@@ -14,7 +14,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Caching_Strategies_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class ATTRIBUTES, class CACHING_UTILITY>
 ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy (void)
@@ -54,4 +54,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LFU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_Null_Caching_Strategy)
 
-#endif /* CACHING_STRATEGIES_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_CACHING_STRATEGIES_T_CPP */
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index cbf1157a96e..74f7ff2b1fe 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -29,6 +29,8 @@
 // For linkers that cant grok long names.
 #define ACE_Caching_Strategy ACS
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Caching_Strategy
  *
@@ -531,6 +533,8 @@ private:
   CACHING_UTILITY caching_utility_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Caching_Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Caching_Strategies_T.inl b/ace/Caching_Strategies_T.inl
index 12e82be947b..cbe5f9c35ff 100644
--- a/ace/Caching_Strategies_T.inl
+++ b/ace/Caching_Strategies_T.inl
@@ -1,10 +1,13 @@
-/* -*-C++-*- */
+// -*-C++-*-
+//
 //$Id$
 
 //////////////////////////////////////////////////////////////////////////////////
 
 #include "ace/OS_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
 ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
                                                                                                          int delete_implementation)
@@ -457,4 +460,6 @@ ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp
index 767adb3c07d..c8b7a48e807 100644
--- a/ace/Caching_Utility_T.cpp
+++ b/ace/Caching_Utility_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef CACHING_UTILITY_T_C
-#define CACHING_UTILITY_T_C
+#ifndef ACE_CACHING_UTILITY_T_CPP
+#define ACE_CACHING_UTILITY_T_CPP
 
 #include "ace/Caching_Utility_T.h"
 
@@ -11,13 +11,12 @@
 
 #include "ace/Min_Max.h"
 #include "ace/OS_Memory.h"
-// #include "ace/Strategies.h"
 #include "ace/Recyclable.h"
 
-ACE_RCSID(ace, Caching_Utility_T, "$Id$")
-
 //////////////////////////////////////////////////////////////////////////////
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
 ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
                                                                                                  int delete_cleanup_strategy)
@@ -57,7 +56,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
 
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
-  size_t entries_to_remove
+  size_t const entries_to_remove
     = ACE_MAX (static_cast<size_t> (1),
                static_cast<size_t> (static_cast<double> (purge_percent)
                                     / 100 * current_map_size));
@@ -157,7 +156,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
 
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
-  size_t entries_to_remove
+  size_t const entries_to_remove
     = ACE_MAX (static_cast<size_t> (1),
                static_cast<size_t> (static_cast<double> (purge_percent)
                                     / 100 * current_map_size));
@@ -267,7 +266,8 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
     return 0;
 
   // Get the number of entries in the container which can be considered for purging.
-  size_t available_entries = container.current_size () - this->marked_as_closed_entries_;
+  size_t const available_entries =
+    container.current_size () - this->marked_as_closed_entries_;
 
   // Also whether the number of entries in the cache zero.
   // Oops! then there is no way out but exiting.
@@ -281,8 +281,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
                static_cast<size_t> (static_cast<double> (purge_percent)
                                     / 100 * available_entries));
 
-  if (entries_to_remove >= available_entries  ||
-      entries_to_remove == 0)
+  if (entries_to_remove >= available_entries  || entries_to_remove == 0)
     entries_to_remove = available_entries - 1;
 
   KEY *key_to_remove = 0;
@@ -495,4 +494,6 @@ ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
   ACE_UNUSED_ARG (value_to_remove);
 }
 
-#endif /* CACHING_UTILITY_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_CACHING_UTILITY_T_CPP */
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
index 03b95ce3cd1..0112e3f2b7d 100644
--- a/ace/Caching_Utility_T.h
+++ b/ace/Caching_Utility_T.h
@@ -27,6 +27,8 @@
 // For linkers that cant grok long names.
 #define ACE_Pair_Caching_Utility APUTIL
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Pair_Caching_Utility
  *
@@ -34,7 +36,7 @@
  *
  * This class defines the methods commonly used by the different
  * caching strategies. For instance: <clear_cache> method which
- * decides and purges the entry from the container.  Note: This
+ * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, ACE_Pair<VALUE, attributes>>
  * kind. The attributes helps in deciding the entries to be
@@ -90,7 +92,7 @@ protected:
  *
  * This class defines the methods commonly used by the different
  * caching strategies. For instance: <clear_cache> method which
- * decides and purges the entry from the container.  Note: This
+ * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, Svc_Handler> kind. The attributes
  * helps in deciding the entries to be purged. The
@@ -149,7 +151,7 @@ private:
  *
  * This class defines the methods commonly used by the different
  * caching strategies. For instance: clear_cache () method which
- * decides and purges the entry from the container.  Note: This
+ * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <Refcounted_KEY,
  * Recyclable_Connection_Handler> kind. The attributes helps in
@@ -215,7 +217,7 @@ private:
  *
  * This class defines the methods commonly used by the different
  * caching strategies. For instance: <clear_cache> method which
- * decides and purges the entry from the container.  Note: This
+ * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, HANDLER> kind where the HANDLER
  * contains the caching attributes which help in deciding the
@@ -278,7 +280,7 @@ private:
  *
  * This class defines the methods commonly used by the different
  * caching strategies. For instance: <clear_cache> method which
- * decides and purges the entry from the container.  Note: This
+ * decides and purges the entry from the container.  @note This
  * class is be used with the Null_Caching_Strategy. The
  * Cleanup_Strategy is the callback class to which the entries to
  * be cleaned up will be delegated.
@@ -301,7 +303,7 @@ public:
   /**
    * Purge entries from the <container>. The Cleanup_Strategy will do
    * the actual job of cleanup once the entries to be cleaned up are
-   * decided. Note: Here it is a no-op.
+   * decided. @note Here it is a no-op.
    */
   int clear_cache (CONTAINER &container,
                    double purge_percent);
@@ -312,7 +314,7 @@ protected:
    * Find the entry with minimum caching attributes.  This is handler
    * specific since this utility is to be used very specifically for
    * handler who have caching_attributes for server side acched
-   * connection management.Note: Here it is a no-op.
+   * connection management.@note Here it is a no-op.
    */
   void minimum (CONTAINER &container,
                 KEY *&key_to_remove,
@@ -330,6 +332,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Null_Caching_Utility (const ACE_Null_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Caching_Utility_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp
index 2af1ef65954..24a650ef1ff 100644
--- a/ace/Capabilities.cpp
+++ b/ace/Capabilities.cpp
@@ -16,6 +16,7 @@ ACE_RCSID (ace,
 
 #define ACE_ESC ((ACE_TCHAR)0x1b)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_CapEntry::~ACE_CapEntry (void)
 {
@@ -38,29 +39,29 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap)
     {
       if (*buf == ACE_LIB_TEXT ('\\'))
         {
-          buf++;
+          ++buf;
           if (*buf == ACE_LIB_TEXT ('E') || *buf == ACE_LIB_TEXT ('e'))
             {
               cap += ACE_ESC;
-              buf++;
+              ++buf;
               continue;
             }
           else if (*buf == ACE_LIB_TEXT ('r'))
             {
               cap += ACE_LIB_TEXT ('\r');
-              buf++;
+              ++buf;
               continue;
             }
           else if (*buf == ACE_LIB_TEXT ('n'))
             {
               cap += ACE_LIB_TEXT ('\n');
-              buf++;
+              ++buf;
               continue;
             }
           else if (*buf == ACE_LIB_TEXT ('t'))
             {
               cap += ACE_LIB_TEXT ('\t');
-              buf++;
+              ++buf;
               continue;
             }
           else if (*buf == ACE_LIB_TEXT ('\\'))
@@ -102,11 +103,11 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap)
 void
 ACE_Capabilities::resetcaps (void)
 {
-  for (MAP::ITERATOR iter (this->caps_);
+  for (CAPABILITIES_MAP::ITERATOR iter (this->caps_);
        !iter.done ();
        iter.advance ())
     {
-      MAP::ENTRY *entry = 0;
+      CAPABILITIES_MAP::ENTRY *entry = 0;
       iter.next (entry);
       delete entry->int_id_;
     }
@@ -202,7 +203,7 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line)
     {
       // Skip blanks or irrelevant characters
       while (*line && isspace(*line))
-        line++;
+        ++line;
 
       // End of line reached
       if (*line == ACE_LIB_TEXT ('\0'))
@@ -219,7 +220,7 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line)
 
       // Skip puntuaction char if neccesary.
       if (*line == ACE_LIB_TEXT ('|') || *line == ACE_LIB_TEXT (','))
-        line++;
+        ++line;
       else
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -292,7 +293,7 @@ static int
 is_empty (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
-    line++;
+    ++line;
 
   return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#');
 }
@@ -301,7 +302,7 @@ static int
 is_line (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
-    line++;
+    ++line;
 
   return *line != ACE_LIB_TEXT ('\0');
 }
@@ -321,7 +322,7 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
   int done;
   ACE_TString line;
 
-  while (!(done = (this->getline (fp, line) == -1))
+  while (0 == (done = (this->getline (fp, line) == -1))
          && is_empty (line.c_str ()))
     continue;
 
@@ -330,7 +331,7 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
       ACE_TString newline;
       ACE_TString description;
 
-      while (!(done = (this->getline (fp, newline) == -1)))
+      while (0 == (done = (this->getline (fp, newline) == -1)))
         if (is_line (newline.c_str ()))
           description += newline;
         else
@@ -351,16 +352,4 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
   return -1;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<ACE_TString,ACE_CapEntry*>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString,ACE_CapEntry*>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Capabilities.h b/ace/Capabilities.h
index 902dc31a540..a970722e803 100644
--- a/ace/Capabilities.h
+++ b/ace/Capabilities.h
@@ -27,6 +27,8 @@
 #include "ace/SString.h"
 #include "ace/Functor_String.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_CapEntry
  *
@@ -133,7 +135,7 @@ class ACE_Export ACE_Capabilities
 {
 public:
 
-  typedef  ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_CapEntry *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> MAP;
+  typedef  ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_CapEntry *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> CAPABILITIES_MAP;
 
   /// The Constructor
   ACE_Capabilities (void);
@@ -180,7 +182,7 @@ protected:
 private:
 
   /// This is the set of ACE_CapEntry.
-  MAP caps_;
+  CAPABILITIES_MAP caps_;
 
 };
 
@@ -189,7 +191,7 @@ int
 is_empty (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
-    line++;
+    ++line;
 
   return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#');
 }
@@ -198,12 +200,14 @@ int
 is_line (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
-    line++;
+    ++line;
 
   return *line != ACE_LIB_TEXT ('\0');
 }
 #endif /* ACE_IS_SPLITTING */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Capabilities.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Capabilities.inl b/ace/Capabilities.inl
index ca168c0491a..053e0ecf7b6 100644
--- a/ace/Capabilities.inl
+++ b/ace/Capabilities.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_CapEntry::ACE_CapEntry (int captype)
   : captype_ (captype)
@@ -46,3 +48,5 @@ ACE_BoolCapEntry::getval (void) const
 {
   return val_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Cleanup.cpp b/ace/Cleanup.cpp
index 9e51dd6cf70..a2b67825e72 100644
--- a/ace/Cleanup.cpp
+++ b/ace/Cleanup.cpp
@@ -1,9 +1,10 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/Cleanup.h"
 
-ACE_RCSID(ace, Cleanup, "$Id$")
+ACE_RCSID (ace,
+           Cleanup,
+           "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/Cleanup.inl"
@@ -11,6 +12,8 @@ ACE_RCSID(ace, Cleanup, "$Id$")
 
 #include "ace/OS_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Cleanup::cleanup (void *)
 {
@@ -25,7 +28,7 @@ ACE_Cleanup::~ACE_Cleanup (void)
 /*****************************************************************************/
 
 extern "C" void
-ace_cleanup_destroyer (ACE_Cleanup *object, void *param)
+ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *object, void *param)
 {
   object->cleanup (param);
 }
@@ -98,7 +101,7 @@ ACE_Cleanup_Info_Node::~ACE_Cleanup_Info_Node (void)
 ACE_Cleanup_Info_Node *
 ACE_Cleanup_Info_Node::insert (const ACE_Cleanup_Info &new_info)
 {
-  ACE_Cleanup_Info_Node *new_node;
+  ACE_Cleanup_Info_Node *new_node = 0;
 
   ACE_NEW_RETURN (new_node,
                   ACE_Cleanup_Info_Node (new_info, this),
@@ -133,7 +136,7 @@ ACE_OS_Exit_Info::at_exit_i (void *object,
   // Return -1 and sets errno if unable to allocate storage.  Enqueue
   // at the head and dequeue from the head to get LIFO ordering.
 
-  ACE_Cleanup_Info_Node *new_node;
+  ACE_Cleanup_Info_Node *new_node = 0;
 
   if ((new_node = registered_objects_->insert (new_info)) == 0)
     return -1;
@@ -163,7 +166,7 @@ ACE_OS_Exit_Info::find (void *object)
 }
 
 void
-ACE_OS_Exit_Info::call_hooks ()
+ACE_OS_Exit_Info::call_hooks (void)
 {
   // Call all registered cleanup hooks, in reverse order of
   // registration.
@@ -172,10 +175,12 @@ ACE_OS_Exit_Info::call_hooks ()
        iter = iter->next_)
     {
       ACE_Cleanup_Info &info = iter->cleanup_info_;
-      if (info.cleanup_hook_ == reinterpret_cast<ACE_CLEANUP_FUNC> (ace_cleanup_destroyer))
+      if (info.cleanup_hook_ == reinterpret_cast<ACE_CLEANUP_FUNC> (
+            ACE_CLEANUP_DESTROYER_NAME))
         // The object is an ACE_Cleanup.
-        ace_cleanup_destroyer (reinterpret_cast<ACE_Cleanup *> (info.object_),
-                               info.param_);
+        ACE_CLEANUP_DESTROYER_NAME (
+          reinterpret_cast<ACE_Cleanup *> (info.object_),
+          info.param_);
       else if (info.object_ == &ace_exit_hook_marker)
         // The hook is an ACE_EXIT_HOOK.
         (* reinterpret_cast<ACE_EXIT_HOOK> (info.cleanup_hook_)) ();
@@ -183,3 +188,5 @@ ACE_OS_Exit_Info::call_hooks ()
         (*info.cleanup_hook_) (info.object_, info.param_);
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Cleanup.h b/ace/Cleanup.h
index 4cf7629ac4a..37e46b7e7cb 100644
--- a/ace/Cleanup.h
+++ b/ace/Cleanup.h
@@ -26,6 +26,15 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/ACE_export.h"
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# include "ace/Global_Macros.h"
+# define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer)
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Cleanup
  *
@@ -46,7 +55,7 @@ public:
 
 // Adapter for cleanup, used by ACE_Object_Manager.
 extern "C" ACE_Export
-void ace_cleanup_destroyer (ACE_Cleanup *, void *param = 0);
+void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0);
 
 /**
  * @class ACE_Cleanup_Info
@@ -113,6 +122,8 @@ private:
   ACE_Cleanup_Info_Node *registered_objects_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/Cleanup.inl b/ace/Cleanup.inl
index 841c715bf1a..02d3c223f8d 100644
--- a/ace/Cleanup.inl
+++ b/ace/Cleanup.inl
@@ -1,7 +1,12 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Cleanup::ACE_Cleanup (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp
index 5b9425ee5da..10804ba21ca 100644
--- a/ace/Cleanup_Strategies_T.cpp
+++ b/ace/Cleanup_Strategies_T.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#ifndef CLEANUP_STRATEGIES_T_C
-#define CLEANUP_STRATEGIES_T_C
+#ifndef ACE_CLEANUP_STRATEGIES_T_CPP
+#define ACE_CLEANUP_STRATEGIES_T_CPP
 
 #include "ace/Cleanup_Strategies_T.h"
 
@@ -9,6 +9,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER>
@@ -19,19 +21,18 @@ ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
 template <class KEY, class VALUE, class CONTAINER> int
 ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
                                                       KEY *key,
-                                                      VALUE *value)
+                                                      VALUE *)
 {
-  ACE_UNUSED_ARG (value);
-
   return container.unbind (*key);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                                         KEY *key,
-                                                                         VALUE *)
+ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (
+  CONTAINER &container,
+  KEY *key,
+  VALUE *)
 {
   VALUE value;
 
@@ -48,9 +49,12 @@ ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAIN
 /////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &,
-                                                                                    KEY *,
-                                                                                    VALUE *value)
+ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy<KEY,
+                                                   VALUE,
+                                                   CONTAINER>::cleanup (
+  CONTAINER &,
+  KEY *,
+  VALUE *value)
 {
   return value->first ()->handle_close_i ();
 }
@@ -58,9 +62,10 @@ ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::clean
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                              KEY *key,
-                                                              VALUE *value)
+ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (
+  CONTAINER &container,
+  KEY *key,
+  VALUE *value)
 {
   // Remove the item from cache only if the handler isnt in use.
   if ((*value)->active () == 0)
@@ -78,15 +83,13 @@ ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &contain
 ////////////////////////////////////////////////////////////////////////////
 
 template <class KEY, class VALUE, class CONTAINER> int
-ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
-                                                           KEY *key,
-                                                           VALUE *value)
+ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &,
+                                                           KEY *,
+                                                           VALUE *)
 {
-  ACE_UNUSED_ARG (container);
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (value);
-
   return 0;
 }
 
-#endif /* CLEANUP_STRATEGIES_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_CLEANUP_STRATEGIES_T_CPP */
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 989b6a2c629..d31a812d70c 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -24,6 +24,8 @@
 // For linkers that cant grok long names.
 #define ACE_Cleanup_Strategy ACLE
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Cleanup_Strategy
  *
@@ -57,7 +59,7 @@ public:
  *
  * The entry to be cleaned up is removed from the container.
  * Here, since we are dealing with svc_handlers specifically, we
- * perform a couple of extra operations. Note: To be used when
+ * perform a couple of extra operations. @note To be used when
  * the handler is recyclable.
  */
 template <class KEY, class VALUE, class CONTAINER>
@@ -104,7 +106,7 @@ public:
  *
  * The entry to be cleaned up is removed from the container.
  * Here, since we are dealing with svc_handlers specifically, we
- * perform a couple of extra operations. Note: This cleanup strategy
+ * perform a couple of extra operations. @note This cleanup strategy
  * should be used in the case when the handler has the caching
  * attributes.
  */
@@ -139,6 +141,8 @@ public:
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Cleanup_Strategies_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp
index 8e717cb4533..d28cda908d1 100644
--- a/ace/Codecs.cpp
+++ b/ace/Codecs.cpp
@@ -7,14 +7,28 @@ ACE_RCSID (ace,
            Codecs,
            "$Id$")
 
-const ACE_Byte ACE_Base64::alphabet_[] =
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+namespace
+{
+  // Just in case ...
+#undef alphabet
+#undef pad
+#undef max_columns
+
+  // Symbols which form the Base64 alphabet (Defined as per RFC 2045)
+  ACE_Byte const alphabet[] =
+     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-const ACE_Byte ACE_Base64::pad_ = '=';
+  // The padding character used in the encoding
+  ACE_Byte const pad = '=';
 
-int ACE_Base64::init_ = 0;
+  // Number of columns per line of encoded output (Can have a maximum
+  // value of 76).
+  int const max_columns = 72;
+}
 
-int ACE_Base64::max_columns_ = 72;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+bool ACE_Base64::init_ = false;
 
 ACE_Byte ACE_Base64::decoder_[256];
 
@@ -34,7 +48,7 @@ ACE_Base64::encode (const ACE_Byte* input,
   ACE_Byte* result = 0;
 
   size_t length = ((input_len + 2) / 3) * 4;
-  size_t num_lines = length / ACE_Base64::max_columns_ + 1;
+  size_t num_lines = length / max_columns + 1;
   length += num_lines + 1;
   ACE_NEW_RETURN (result, ACE_Byte[length], 0);
 
@@ -50,12 +64,12 @@ ACE_Base64::encode (const ACE_Byte* input,
 
       if (char_count == 3)
         {
-          result[pos++] = ACE_Base64::alphabet_[bits >> 18];
-          result[pos++] = ACE_Base64::alphabet_[(bits >> 12) & 0x3f];
-          result[pos++] = ACE_Base64::alphabet_[(bits >> 6) & 0x3f];
-          result[pos++] = ACE_Base64::alphabet_[bits & 0x3f];
+          result[pos++] = alphabet[bits >> 18];
+          result[pos++] = alphabet[(bits >> 12) & 0x3f];
+          result[pos++] = alphabet[(bits >> 6) & 0x3f];
+          result[pos++] = alphabet[bits & 0x3f];
           cols += 4;
-          if (cols == ACE_Base64::max_columns_) {
+          if (cols == max_columns) {
             result[pos++] = '\n';
             cols = 0;
           }
@@ -71,17 +85,17 @@ ACE_Base64::encode (const ACE_Byte* input,
   if (char_count != 0)
     {
       bits <<= (16 - (8 * char_count));
-      result[pos++] = ACE_Base64::alphabet_[bits >> 18];
-      result[pos++] = ACE_Base64::alphabet_[(bits >> 12) & 0x3f];
+      result[pos++] = alphabet[bits >> 18];
+      result[pos++] = alphabet[(bits >> 12) & 0x3f];
       if (char_count == 1)
         {
-          result[pos++] = pad_;
-          result[pos++] = pad_;
+          result[pos++] = pad;
+          result[pos++] = pad;
         }
       else
         {
-          result[pos++] = ACE_Base64::alphabet_[(bits >> 6) & 0x3f];
-          result[pos++] = pad_;
+          result[pos++] = alphabet[(bits >> 6) & 0x3f];
+          result[pos++] = pad;
         }
       if (cols > 0)
         result[pos++] = '\n';
@@ -99,7 +113,7 @@ ACE_Base64::length (const ACE_Byte* input)
 
   ACE_Byte* ptr = const_cast<ACE_Byte*> (input);
   while (*ptr != 0 &&
-         (member_[*(ptr)] == 1 || *ptr == pad_
+         (member_[*(ptr)] == 1 || *ptr == pad
           || ACE_OS::ace_isspace (*ptr)))
     ptr++;
   size_t len = ptr - input;
@@ -122,7 +136,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
 
   ACE_Byte* ptr = const_cast<ACE_Byte*> (input);
   while (*ptr != 0 &&
-         (member_[*(ptr)] == 1 || *ptr == pad_
+         (member_[*(ptr)] == 1 || *ptr == pad
           || ACE_OS::ace_isspace (*ptr)))
     ptr++;
   size_t input_len = ptr - input;
@@ -134,7 +148,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
   size_t i = 0;
   for (; i < input_len; ++i)
     {
-      if (input[i] == pad_)
+      if (input[i] == pad)
         break;
       if (!ACE_Base64::member_[input[i]])
         continue;
@@ -143,9 +157,9 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
 
       if (char_count == 4)
         {
-          result[pos++] = bits >> 16;
-          result[pos++] = (bits >> 8) & 0xff;
-          result[pos++] = bits & 0xff;
+          result[pos++] = static_cast<ACE_Byte> (bits >> 16);
+          result[pos++] = static_cast<ACE_Byte> ((bits >> 8) & 0xff);
+          result[pos++] = static_cast<ACE_Byte> (bits & 0xff);
           bits = 0;
           char_count = 0;
         }
@@ -176,11 +190,11 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
           errors++;
           break;
         case 2:
-          result[pos++] = bits >> 10;
+          result[pos++] = static_cast<ACE_Byte> (bits >> 10);
           break;
         case 3:
-          result[pos++] = bits >> 16;
-          result[pos++] = (bits >> 8) & 0xff;
+          result[pos++] = static_cast<ACE_Byte> (bits >> 16);
+          result[pos++] = static_cast<ACE_Byte> ((bits >> 8) & 0xff);
           break;
         }
     }
@@ -200,12 +214,14 @@ ACE_Base64::init ()
 {
   if (!ACE_Base64::init_)
     {
-      for (ACE_Byte i = 0; i < sizeof (ACE_Base64::alphabet_); ++i)
+      for (ACE_Byte i = 0; i < sizeof (alphabet); ++i)
         {
-          ACE_Base64::decoder_[ACE_Base64::alphabet_[i]] = i;
-          ACE_Base64::member_[ACE_Base64::alphabet_[i]] = 1;
+          ACE_Base64::decoder_[alphabet[i]] = i;
+          ACE_Base64::member_ [alphabet[i]] = 1;
         }
-      ACE_Base64::init_ = 1;
+      ACE_Base64::init_ = true;
     }
   return;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Codecs.h b/ace/Codecs.h
index 899092b29aa..3159a312c95 100644
--- a/ace/Codecs.h
+++ b/ace/Codecs.h
@@ -1,5 +1,6 @@
 // -*- C++ -*-
 
+//=============================================================================
 /**
  *  @file   Codecs.h
  *
@@ -13,18 +14,25 @@
  *  One: Format of Internet Message Bodies.
  *
  */
+//=============================================================================
 
 #ifndef ACE_CODECS_H
 #define ACE_CODECS_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/Basic_Types.h"
-#include "ace/Global_Macros.h"
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Basic_Types.h"
+#include "ace/Global_Macros.h"
+
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Base64
  *
@@ -37,7 +45,6 @@
  */
 class ACE_Export ACE_Base64
 {
-  friend class ace_dewarn_gplusplus;
 public:
 
   //@{
@@ -77,17 +84,21 @@ public:
 
   //@}
 
+protected:
+
+  // Prevent default construction.
+  ACE_Base64 (void) {}
+
 private:
 
-  /// Initialize the tables for encoding/decoding.
-  static void init();
+  // Preventing copying and assignment.
+  ACE_Base64 (ACE_Base64 const &);
+  ACE_Base64 & operator= (ACE_Base64 const &);
 
-  // Prevent construction in any form
-  ACE_UNIMPLEMENTED_FUNC (ACE_Base64 ())
-  ACE_UNIMPLEMENTED_FUNC (ACE_Base64 (const ACE_Base64&))
+  /// Initialize the tables for encoding/decoding.
+  static void init (void);
 
-  /// Symbols which form the Base64 alphabet (Defined as per RFC 2045)
-  static const ACE_Byte alphabet_[];
+private:
 
   /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i
   static ACE_Byte decoder_[];
@@ -96,16 +107,13 @@ private:
   /// member_[alphabet_[0..63]] = 1
   static ACE_Byte member_[];
 
-  /// The padding character used in the encoding
-  static const ACE_Byte pad_;
-
   /// Boolean to denote whether initialization is complete
-  static int init_;
-
-  /// Number of columns per line of encoded output (Can have a max value of 76)
-  static int max_columns_;
+  static bool init_;
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_CODECS_H */
diff --git a/ace/Codeset_IBM1047.cpp b/ace/Codeset_IBM1047.cpp
index aeda9a3c43e..469c15089c4 100644
--- a/ace/Codeset_IBM1047.cpp
+++ b/ace/Codeset_IBM1047.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -22,10 +21,57 @@
 
 #if defined(ACE_MVS)
 
-ACE_RCSID(ace, Codeset_IBM1047, "$Id$")
+ACE_RCSID (ace,
+           Codeset_IBM1047,
+           "$Id$")
 
 // ****************************************************************
 
+namespace
+{
+  char const to_IBM1047[] =
+    {
+  "\x00\x01\x02\x03\x37\x2D\x2E\x2F\x16\x05\x25\x0B\x0C\x0D\x0E\x0F" // 00-0F
+  "\x10\x11\x12\x13\x3C\x3D\x32\x26\x18\x19\x3F\x27\x22\x1D\x35\x1F" // 10-1F
+  "\x40\x5A\x7F\x7B\x5B\x6C\x50\x7D\x4D\x5D\x5C\x4E\x6B\x60\x4B\x61" // 20-2F
+  "\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\x7A\x5E\x4C\x7E\x6E\x6F" // 30-3F
+  "\x7C\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xD1\xD2\xD3\xD4\xD5\xD6" // 40-4F
+  "\xD7\xD8\xD9\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xAD\xE0\xBD\x5F\x6D" // 50-5F
+  "\x79\x81\x82\x83\x84\x85\x86\x87\x88\x89\x91\x92\x93\x94\x95\x96" // 60-6F
+  "\x97\x98\x99\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xC0\x4F\xD0\xA1\x07" // 70-7F
+  "\x43\x20\x21\x1C\x23\xEB\x24\x9B\x71\x28\x38\x49\x90\xBA\xEC\xDF" // 80-8F
+  "\x45\x29\x2A\x9D\x72\x2B\x8A\x9A\x67\x56\x64\x4A\x53\x68\x59\x46" // 90-9F
+  "\xEA\xDA\x2C\xDE\x8B\x55\x41\xFE\x58\x51\x52\x48\x69\xDB\x8E\x8D" // A0-AF
+  "\x73\x74\x75\xFA\x15\xB0\xB1\xB3\xB4\xB5\x6A\xB7\xB8\xB9\xCC\xBC" // B0-BF
+  "\xAB\x3E\x3B\x0A\xBF\x8F\x3A\x14\xA0\x17\xCB\xCA\x1A\x1B\x9C\x04" // C0-CF
+  "\x34\xEF\x1E\x06\x08\x09\x77\x70\xBE\xBB\xAC\x54\x63\x65\x66\x62" // D0-DF
+  "\x30\x42\x47\x57\xEE\x33\xB6\xE1\xCD\xED\x36\x44\xCE\xCF\x31\xAA" // E0-EF
+  "\xFC\x9E\xAE\x8C\xDD\xDC\x39\xFB\x80\xAF\xFD\x78\x76\xB2\x9F\xFF" // F0-FF
+};
+
+  char const from_IBM1047[] =
+    {
+  "\x00\x01\x02\x03\xCF\x09\xD3\x7F\xD4\xD5\xC3\x0B\x0C\x0D\x0E\x0F" // 00-0F
+  "\x10\x11\x12\x13\xC7\xB4\x08\xC9\x18\x19\xCC\xCD\x83\x1D\xD2\x1F" // 10-1F
+  "\x81\x82\x1C\x84\x86\x0A\x17\x1B\x89\x91\x92\x95\xA2\x05\x06\x07" // 20-2F
+  "\x20\xEE\x16\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\xC1\x1A" // 30-3F
+  "\x20\xA6\xE1\x80\xEB\x90\x9F\xE2\xAB\x8B\x9B\x2E\x3C\x28\x2B\x7C" // 40-4F
+  "\x26\xA9\xAA\x9C\xDB\xA5\x99\xE3\xA8\x9E\x21\x24\x2A\x29\x3B\x5E" // 50-5F
+  "\x2D\x2F\xDF\xDC\x9A\xDD\xDE\x98\x9D\xAC\xBA\x2C\x25\x5F\x3E\x3F" // 60-6F
+  "\xD7\x88\x94\xB0\xB1\xB2\xFC\xD6\xFB\x60\x3A\x23\x40\x27\x3D\x22" // 70-7F
+  "\xF8\x61\x62\x63\x64\x65\x66\x67\x68\x69\x96\xA4\xF3\xAF\xAE\xC5" // 80-8F
+  "\x8C\x6A\x6B\x6C\x6D\x6E\x6F\x70\x71\x72\x97\x87\xCE\x93\xF1\xFE" // 90-9F
+  "\xC8\x7E\x73\x74\x75\x76\x77\x78\x79\x7A\xEF\xC0\xDA\x5B\xF2\xF9" // A0-AF
+  "\xB5\xB6\xFD\xB7\xB8\xB9\xE6\xBB\xBC\xBD\x8D\xD9\xBF\x5D\xD8\xC4" // B0-BF
+  "\x7B\x41\x42\x43\x44\x45\x46\x47\x48\x49\xCB\xCA\xBE\xE8\xEC\xED" // C0-CF
+  "\x7D\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\xA1\xAD\xF5\xF4\xA3\x8F" // D0-DF
+  "\x5C\xE7\x53\x54\x55\x56\x57\x58\x59\x5A\xA0\x85\x8E\xE9\xE4\xD1" // E0-EF
+  "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\xB3\xF7\xF0\xFA\xA7\xFF" // F0-FF
+    };
+}
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 (void)
 {
 }
@@ -52,7 +98,7 @@ ACE_IBM1047_ISO8859::read_char (ACE_InputCDR &in,
 {
   if (this->read_1 (in, reinterpret_cast<ACE_CDR::Octet*> (&x)))
     {
-      x = ACE_to_IBM1047[x];
+      x = to_IBM1047[x];
       return 1;
     }
   return 0;
@@ -94,7 +140,7 @@ ACE_IBM1047_ISO8859::read_char_array (ACE_InputCDR& in,
                         len))
     {
       for (ACE_CDR::ULong i = 0; i != len; ++i)
-        x[i] = ACE_to_IBM1047[x[i]];
+        x[i] = to_IBM1047[x[i]];
 
       return 1;
     }
@@ -108,7 +154,7 @@ ACE_IBM1047_ISO8859::write_char (ACE_OutputCDR& out,
 {
   return
     this->write_1 (out,
-                   reinterpret_cast<const ACE_CDR::Octet*> (&ACE_from_IBM1047[x]));
+                   reinterpret_cast<const ACE_CDR::Octet*> (&from_IBM1047[x]));
 }
 
 ACE_CDR::Boolean
@@ -132,7 +178,7 @@ ACE_IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out,
       ACE_OS::memcpy (buf, x, len);
 
       for (ACE_CDR::ULong i = 0; i != len; ++i)
-        buf[i] = ACE_from_IBM1047[buf[i]];
+        buf[i] = from_IBM1047[buf[i]];
 
       return 1;
     }
@@ -170,7 +216,7 @@ ACE_ISO8859_IBM1047::read_char (ACE_InputCDR& in,
 {
   if (this->read_1 (in, reinterpret_cast<ACE_CDR::Octet*> (&x)))
     {
-      x = ACE_from_IBM1047[x];
+      x = from_IBM1047[x];
       return 1;
     }
   return 0;
@@ -212,7 +258,7 @@ ACE_ISO8859_IBM1047::read_char_array (ACE_InputCDR &in,
                         len))
     {
       for (ACE_CDR::ULong i = 0; i != len; ++i)
-        x[i] = ACE_from_IBM1047[x[i]];
+        x[i] = from_IBM1047[x[i]];
 
       return 1;
     }
@@ -226,7 +272,7 @@ ACE_ISO8859_IBM1047::write_char (ACE_OutputCDR &out,
 {
   return
     this->write_1 (out,
-                   reinterpret_cast<const ACE_CDR::Octet *> (&ACE_to_IBM1047[x]));
+                   reinterpret_cast<const ACE_CDR::Octet *> (&to_IBM1047[x]));
 }
 
 ACE_CDR::Boolean
@@ -252,7 +298,7 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
       ACE_OS::memcpy (buf, x, len);
 
       for (ACE_CDR::ULong i = 0; i != len; ++i)
-        buf[i] = ACE_to_IBM1047[buf[i]];
+        buf[i] = to_IBM1047[buf[i]];
 
       return 1;
     }
@@ -261,49 +307,11 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
   return 0;
 }
 
-// ****************************************************************
-
-char ACE_to_IBM1047[257] =
-{
-  "\x00\x01\x02\x03\x37\x2D\x2E\x2F\x16\x05\x25\x0B\x0C\x0D\x0E\x0F" // 00-0F
-  "\x10\x11\x12\x13\x3C\x3D\x32\x26\x18\x19\x3F\x27\x22\x1D\x35\x1F" // 10-1F
-  "\x40\x5A\x7F\x7B\x5B\x6C\x50\x7D\x4D\x5D\x5C\x4E\x6B\x60\x4B\x61" // 20-2F
-  "\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\x7A\x5E\x4C\x7E\x6E\x6F" // 30-3F
-  "\x7C\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xD1\xD2\xD3\xD4\xD5\xD6" // 40-4F
-  "\xD7\xD8\xD9\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xAD\xE0\xBD\x5F\x6D" // 50-5F
-  "\x79\x81\x82\x83\x84\x85\x86\x87\x88\x89\x91\x92\x93\x94\x95\x96" // 60-6F
-  "\x97\x98\x99\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xC0\x4F\xD0\xA1\x07" // 70-7F
-  "\x43\x20\x21\x1C\x23\xEB\x24\x9B\x71\x28\x38\x49\x90\xBA\xEC\xDF" // 80-8F
-  "\x45\x29\x2A\x9D\x72\x2B\x8A\x9A\x67\x56\x64\x4A\x53\x68\x59\x46" // 90-9F
-  "\xEA\xDA\x2C\xDE\x8B\x55\x41\xFE\x58\x51\x52\x48\x69\xDB\x8E\x8D" // A0-AF
-  "\x73\x74\x75\xFA\x15\xB0\xB1\xB3\xB4\xB5\x6A\xB7\xB8\xB9\xCC\xBC" // B0-BF
-  "\xAB\x3E\x3B\x0A\xBF\x8F\x3A\x14\xA0\x17\xCB\xCA\x1A\x1B\x9C\x04" // C0-CF
-  "\x34\xEF\x1E\x06\x08\x09\x77\x70\xBE\xBB\xAC\x54\x63\x65\x66\x62" // D0-DF
-  "\x30\x42\x47\x57\xEE\x33\xB6\xE1\xCD\xED\x36\x44\xCE\xCF\x31\xAA" // E0-EF
-  "\xFC\x9E\xAE\x8C\xDD\xDC\x39\xFB\x80\xAF\xFD\x78\x76\xB2\x9F\xFF" // F0-FF
-};
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-char ACE_from_IBM1047[257] =
-{
-  "\x00\x01\x02\x03\xCF\x09\xD3\x7F\xD4\xD5\xC3\x0B\x0C\x0D\x0E\x0F" // 00-0F
-  "\x10\x11\x12\x13\xC7\xB4\x08\xC9\x18\x19\xCC\xCD\x83\x1D\xD2\x1F" // 10-1F
-  "\x81\x82\x1C\x84\x86\x0A\x17\x1B\x89\x91\x92\x95\xA2\x05\x06\x07" // 20-2F
-  "\x20\xEE\x16\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\xC1\x1A" // 30-3F
-  "\x20\xA6\xE1\x80\xEB\x90\x9F\xE2\xAB\x8B\x9B\x2E\x3C\x28\x2B\x7C" // 40-4F
-  "\x26\xA9\xAA\x9C\xDB\xA5\x99\xE3\xA8\x9E\x21\x24\x2A\x29\x3B\x5E" // 50-5F
-  "\x2D\x2F\xDF\xDC\x9A\xDD\xDE\x98\x9D\xAC\xBA\x2C\x25\x5F\x3E\x3F" // 60-6F
-  "\xD7\x88\x94\xB0\xB1\xB2\xFC\xD6\xFB\x60\x3A\x23\x40\x27\x3D\x22" // 70-7F
-  "\xF8\x61\x62\x63\x64\x65\x66\x67\x68\x69\x96\xA4\xF3\xAF\xAE\xC5" // 80-8F
-  "\x8C\x6A\x6B\x6C\x6D\x6E\x6F\x70\x71\x72\x97\x87\xCE\x93\xF1\xFE" // 90-9F
-  "\xC8\x7E\x73\x74\x75\x76\x77\x78\x79\x7A\xEF\xC0\xDA\x5B\xF2\xF9" // A0-AF
-  "\xB5\xB6\xFD\xB7\xB8\xB9\xE6\xBB\xBC\xBD\x8D\xD9\xBF\x5D\xD8\xC4" // B0-BF
-  "\x7B\x41\x42\x43\x44\x45\x46\x47\x48\x49\xCB\xCA\xBE\xE8\xEC\xED" // C0-CF
-  "\x7D\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\xA1\xAD\xF5\xF4\xA3\x8F" // D0-DF
-  "\x5C\xE7\x53\x54\x55\x56\x57\x58\x59\x5A\xA0\x85\x8E\xE9\xE4\xD1" // E0-EF
-  "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\xB3\xF7\xF0\xFA\xA7\xFF" // F0-FF
-};
+// ****************************************************************
 
 #elif defined (__HP_aCC)
 // Make aC++ stop complaining about an empty translation unit
-static int shut_up_aCC = 0;
+static int const shut_up_aCC = 0;
 #endif /* ACE_MVS */
diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h
index ca788435be6..9f9231a41a9 100644
--- a/ace/Codeset_IBM1047.h
+++ b/ace/Codeset_IBM1047.h
@@ -29,8 +29,7 @@
 
 #include "ace/CDR_Stream.h"
 
-extern ACE_Export char ACE_to_IBM1047[257];
-extern ACE_Export char ACE_from_IBM1047[257];
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
@@ -120,7 +119,10 @@ public:
   virtual ACE_CDR::ULong tcs ();
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_MVS */
 
 #include /**/ "ace/post.h"
+
 #endif /* ACE_CODESET_IMB1047_H */
diff --git a/ace/Codeset_Registry.cpp b/ace/Codeset_Registry.cpp
index 6cdb913bce4..5d3c6abb59b 100644
--- a/ace/Codeset_Registry.cpp
+++ b/ace/Codeset_Registry.cpp
@@ -21,8 +21,11 @@
 #include "ace/Codeset_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Codeset_Registry, "$Id$")
+ACE_RCSID (ace,
+           Codeset_Registry,
+           "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
@@ -30,7 +33,7 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry* 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)
       element = &registry_db_[i];
@@ -42,8 +45,8 @@ 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 (element->char_sets_,
-                      *char_sets,
+      ACE_OS::memcpy (*char_sets,
+                      element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -55,7 +58,7 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry* 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];
@@ -67,8 +70,8 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (element->char_sets_,
-                      *char_sets,
+      ACE_OS::memcpy (*char_sets,
+                      element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -78,8 +81,8 @@ int
 ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id,
                                        ACE_CDR::ULong other)
 {
-  registry_entry* lhs = 0;
-  registry_entry* 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_)
@@ -106,3 +109,5 @@ ACE_Codeset_Registry::get_max_bytes_i (ACE_CDR::ULong codeset_id)
       return registry_db_[i].max_bytes_;
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Codeset_Registry.h b/ace/Codeset_Registry.h
index 5ed68e35d0b..eb8d013d4af 100644
--- a/ace/Codeset_Registry.h
+++ b/ace/Codeset_Registry.h
@@ -37,31 +37,33 @@
 #include /**/ <dce/rpc.h>
 #endif /* ACE_HAS_DCE_CODESET_REGISTRY */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Codeset_Registry
 {
 public:
 
-  // based on a locale string, find the registry value and optional codeset
-  // collection. This wraps the dce_cs_loc_to_rgy function, or emulates it.
+  /// Based on a locale string, find the registry value and optional codeset
+  /// collection. This wraps the dce_cs_loc_to_rgy function, or emulates it.
   static int locale_to_registry (const ACE_CString &locale,
                                  ACE_CDR::ULong &codeset_id,
                                  ACE_CDR::UShort * = 0,
                                  ACE_CDR::UShort ** = 0);
 
-  // based on a registry value, find the locale string and optional codeset
-  // collection.  This wraps the dce_cs_rgy_to_loc function, or emulates it.
+  /// Based on a registry value, find the locale string and optional codeset
+  /// collection.  This wraps the dce_cs_rgy_to_loc function, or emulates it.
   static int registry_to_locale (ACE_CDR::ULong codeset_id,
                                  ACE_CString &locale,
                                  ACE_CDR::UShort * = 0,
                                  ACE_CDR::UShort ** = 0);
 
-  // tell if two codesets are compatible. This wraps the
-  //rpc_cs_char_set_compat_check function.
+  /// Tell if two codesets are compatible. This wraps the
+  /// rpc_cs_char_set_compat_check function.
   static int is_compatible (ACE_CDR::ULong codeset_id,
                             ACE_CDR::ULong other);
 
-  // return the max number of bytes required to represent a single character.
-  // This wraps the rpc_rgy_get_max_bytes function.
+  /// Return the max number of bytes required to represent a single character.
+  /// This wraps the rpc_rgy_get_max_bytes function.
   static ACE_CDR::Short get_max_bytes (ACE_CDR::ULong codeset_id);
 
   enum {max_charsets_ = 5};
@@ -76,8 +78,8 @@ protected:
   } registry_entry;
 
 private:
-  static size_t num_registry_entries_;
-  static registry_entry registry_db_[];
+  static size_t const num_registry_entries_;
+  static registry_entry const registry_db_[];
 
   static int locale_to_registry_i (const ACE_CString &locale,
                                    ACE_CDR::ULong &codeset_id,
@@ -92,6 +94,8 @@ private:
   static ACE_CDR::Short get_max_bytes_i (ACE_CDR::ULong codeset_id);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Codeset_Registry.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Codeset_Registry.inl b/ace/Codeset_Registry.inl
index 47aaf7280ca..d24e07cc83b 100644
--- a/ace/Codeset_Registry.inl
+++ b/ace/Codeset_Registry.inl
@@ -14,6 +14,8 @@
  */
 //=============================================================================
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 int
 ACE_Codeset_Registry::locale_to_registry(const ACE_CString &locale,
@@ -65,8 +67,8 @@ ACE_Codeset_Registry::registry_to_locale(ACE_CDR::ULong codeset_id,
 #endif /* ACE_HAS_DCE_CODESET_REGISTRY */
 }
 
-// tell if two codesets are compatible. This wraps the
-//rpc_cs_char_set_compat_check function.
+// Tell if two codesets are compatible. This wraps the
+// rpc_cs_char_set_compat_check function.
 ACE_INLINE
 int
 ACE_Codeset_Registry::is_compatible (ACE_CDR::ULong codeset_id,
@@ -81,7 +83,7 @@ ACE_Codeset_Registry::is_compatible (ACE_CDR::ULong codeset_id,
 #endif /* ACE_HAS_DCE_CODESET_REGISTRY */
 }
 
-// return the max number of bytes required to represent a single character.
+// Return the max number of bytes required to represent a single character.
 // This wraps the rpc_rgy_get_max_bytes function.
 ACE_INLINE
 ACE_CDR::Short
@@ -96,3 +98,5 @@ ACE_Codeset_Registry::get_max_bytes (ACE_CDR::ULong codeset_id)
   return ACE_Codeset_Registry::get_max_bytes_i (codeset_id);
 #endif /* ACE_HAS_DCE_CODESET_REGISTRY */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Codeset_Registry_db.cpp b/ace/Codeset_Registry_db.cpp
index 7386ba39e5e..cd6e29760af 100644
--- a/ace/Codeset_Registry_db.cpp
+++ b/ace/Codeset_Registry_db.cpp
@@ -12,7 +12,9 @@
 
 #include "ace/Codeset_Registry.h"
 
-ACE_Codeset_Registry::registry_entry
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Codeset_Registry::registry_entry const
 ACE_Codeset_Registry::registry_db_[] =
 {
   {"ISO 8859-1:1987; Latin Alphabet No. 1","ASCII",0x00010001,1,{0x0011},1},
@@ -21,4 +23,6 @@ ACE_Codeset_Registry::registry_db_[] =
   {"ISO/IEC 10646-1:1993; UTF-16, UCS Transformation Format 16-bit form","Unicode",0x00010109,1,{0x1000},2}
 };
 
-size_t ACE_Codeset_Registry::num_registry_entries_ = 4;
+size_t const ACE_Codeset_Registry::num_registry_entries_ = 4;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Condition_Recursive_Thread_Mutex.cpp b/ace/Condition_Recursive_Thread_Mutex.cpp
index fa364a6a03e..06301818247 100644
--- a/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  * @file Condition_Recursive_Thread_Mutex.cpp
  *
@@ -17,6 +18,8 @@
 #  include "ace/Log_Msg.h"
 #endif /* ACE_HAS_DUMP */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
 {
@@ -121,4 +124,6 @@ ACE_Condition_Recursive_Thread_Mutex::ACE_Condition_Recursive_Thread_Mutex (
 {
 }
 
-#endif /* ACD_HAS_THREADS */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_HAS_THREADS */
diff --git a/ace/Condition_Recursive_Thread_Mutex.h b/ace/Condition_Recursive_Thread_Mutex.h
index 21a24557fc5..0c4607a5c2e 100644
--- a/ace/Condition_Recursive_Thread_Mutex.h
+++ b/ace/Condition_Recursive_Thread_Mutex.h
@@ -27,8 +27,9 @@
 #else /* ACE_HAS_THREADS */
 #include "ace/Recursive_Thread_Mutex.h"
 
-template <class ACE_LOCK>
-class ACE_Condition;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template <class ACE_LOCK> class ACE_Condition;
 
 /**
  * @class ACE_Condition<ACE_Recursive_Thread_Mutex>
@@ -86,15 +87,19 @@ public:
   void dump (void) const;
 
 private:
+
+  // = Prevent assignment and copying.
+  void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &);
+  ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &);
+
+private:
+
   /// A normal (i.e., non-recursive) condition variable.
   ACE_cond_t cond_;
 
   /// Reference to the recursive mutex.
   ACE_Recursive_Thread_Mutex &mutex_;
 
-  // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &))
 };
 
 class ACE_Export ACE_Condition_Recursive_Thread_Mutex
@@ -105,6 +110,8 @@ public:
   ACE_Condition_Recursive_Thread_Mutex (ACE_Recursive_Thread_Mutex &m);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_HAS_THREADS */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Condition_T.cpp b/ace/Condition_T.cpp
index 456482d91ef..c2d4375486e 100644
--- a/ace/Condition_T.cpp
+++ b/ace/Condition_T.cpp
@@ -1,23 +1,24 @@
 // $Id$
 
-#ifndef ACE_CONDITION_T_C
-#define ACE_CONDITION_T_C
+#ifndef ACE_CONDITION_T_CPP
+#define ACE_CONDITION_T_CPP
 
 #include "ace/Condition_T.h"
-#include "ace/Log_Msg.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Condition_T, "$Id$")
-
 #if defined (ACE_HAS_THREADS)
 
+#include "ace/Log_Msg.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Condition_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Condition)
 
 template <class MUTEX> void
@@ -190,6 +191,9 @@ ACE_Condition<MUTEX>::wait (const ACE_Time_Value *abstime)
 // ACE_TRACE ("ACE_Condition<MUTEX>::wait");
   return this->wait (this->mutex_, abstime);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
 
-#endif /* ACE_CONDITION_T_C */
+#endif /* ACE_CONDITION_T_CPP */
diff --git a/ace/Condition_T.h b/ace/Condition_T.h
index 6d85c4b3519..e5ec5fcaab7 100644
--- a/ace/Condition_T.h
+++ b/ace/Condition_T.h
@@ -14,6 +14,7 @@
 
 #ifndef ACE_CONDITION_T_H
 #define ACE_CONDITION_T_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/OS_NS_Thread.h"
@@ -25,6 +26,8 @@
 
 #if defined (ACE_HAS_THREADS) /* ACE platform supports some form of threading. */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -156,6 +159,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Condition_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Condition_T.inl b/ace/Condition_T.inl
index cb927320208..b787569a764 100644
--- a/ace/Condition_T.inl
+++ b/ace/Condition_T.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class MUTEX> ACE_INLINE int
 ACE_Condition<MUTEX>::remove (void)
 {
@@ -79,3 +82,5 @@ ACE_Condition<MUTEX>::broadcast (void)
 #endif /* CHORUS */
   return ACE_OS::cond_broadcast (&this->cond_);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Condition_Thread_Mutex.cpp b/ace/Condition_Thread_Mutex.cpp
index a04e2b30847..7907b717f73 100644
--- a/ace/Condition_Thread_Mutex.cpp
+++ b/ace/Condition_Thread_Mutex.cpp
@@ -21,6 +21,8 @@
 
 ACE_RCSID(ace, Condition_Thread_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex)
 
 void
@@ -133,4 +135,6 @@ ACE_Condition_Thread_Mutex::broadcast (void)
   return ACE_OS::cond_broadcast (&this->cond_);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Condition_Thread_Mutex.h b/ace/Condition_Thread_Mutex.h
index 7b30fba8079..01a465e8f33 100644
--- a/ace/Condition_Thread_Mutex.h
+++ b/ace/Condition_Thread_Mutex.h
@@ -29,6 +29,8 @@
 
 #include "ace/Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 class ACE_Export ACE_Condition_Attributes
@@ -176,6 +178,8 @@ public:
 };
 #endif /* 0 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Condition_Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Condition_Thread_Mutex.inl b/ace/Condition_Thread_Mutex.inl
index ff15f94ad04..3e12c9c911a 100644
--- a/ace/Condition_Thread_Mutex.inl
+++ b/ace/Condition_Thread_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Condition_Attributes::ACE_Condition_Attributes (int type)
 {
@@ -67,3 +70,5 @@ ACE_Process_Condition<MUTEX>::ACE_Process_Condition (MUTEX &m,
 // ACE_TRACE ("ACE_Process_Condition<MUTEX>::ACE_Process_Condition");
 }
 #endif /* 0 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index 468f1b9e9dc..6cfec441cf6 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -12,76 +12,7 @@
 #  include "ace/OS_NS_unistd.h"
 #endif /* ACE_LACKS_ACCESS */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if defined (ACE_HAS_THREADS)
-// ACE_SYNCH_MUTEX should not be used in the template instantiations
-// because the resulting template instantiation for the
-// single-threaded case already exists in ACE.
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> >;
-template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex>;
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>;
-#endif /* ACE_HAS_THREADS */
-template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>;
-template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>;
-template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, int, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-
-
-// Added to fix problems in SunOS CC5.0
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,int,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Section_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Equal_To<ACE_Configuration_ExtId>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Section_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,int,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
-template class ACE_Hash<ACE_Configuration_ExtId>;
-
-template class ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, int, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>;
-template class ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>;
-template class ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if defined (ACE_HAS_THREADS)
-// ACE_SYNCH_MUTEX should not be used in the template instantiations
-// because the resulting template instantiation for the
-// single-threaded case already exists in ACE.
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> >
-#pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex>
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>
-#endif /* ACE_HAS_THREADS */
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, int, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,int,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Section_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Equal_To<ACE_Configuration_ExtId>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Section_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,int,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash<ACE_Configuration_ExtId>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId, int, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>
-#pragma instantiate ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>
-#pragma instantiate ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Section_Key_Internal::ACE_Section_Key_Internal (void)
   : ref_count_ (0)
@@ -1781,7 +1712,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key
   VALUE_HASH::ITERATOR value_iter = value_hash_map->begin ();
   while (!value_iter.done ())
     {
-      VALUE_HASH::ENTRY* value_entry;
+      VALUE_HASH::ENTRY* value_entry = 0;
       if (!value_iter.next (value_entry))
         return 1;
 
@@ -1841,7 +1772,7 @@ ACE_Configuration_Heap::enumerate_values (const ACE_Configuration_Section_Key& k
     }
 
   // Get the next entry
-  ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>* entry;
+  ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>* entry = 0;
 
   if (!pKey->value_iter_->next (entry))
     return 1;
@@ -1884,7 +1815,7 @@ ACE_Configuration_Heap::enumerate_sections (const ACE_Configuration_Section_Key&
     }
 
   // Get the next entry
-  ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>* entry;
+  ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>* entry = 0;
   if (!pKey->section_iter_->next (entry))
     return 1;
 
@@ -2257,3 +2188,5 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key,
 
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Configuration.h b/ace/Configuration.h
index 96ba0153409..b1ca0f6a9d9 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -53,6 +53,8 @@
 #define ACE_DEFAULT_CONFIG_SECTION_SIZE 16
 #endif /* ACE_DEFAULT_CONFIG_SECTION_SIZE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Section_Key_Internal
  *
@@ -698,8 +700,8 @@ public:
   ACE_Configuration_Section_IntId (void);
 
   /// Named ctor
-  explicit ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
-                                                SUBSECTION_MAP* section_hash_map);
+  ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
+                                   SUBSECTION_MAP* section_hash_map);
 
   /// Copy ctor
   ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs);
@@ -775,7 +777,7 @@ protected:
  * representation of a configuraiton database. A persistent heap
  * may be used to store configurations persistently
  *
- * Note: Before using this class you must call one of the open methods.
+ * @note Before using this class you must call one of the open methods.
  *
  * @todo
  *  - Need to investigate what happens if memory mapped file gets mapped to
@@ -884,5 +886,7 @@ private:
   size_t default_map_size_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIGURATION_H */
diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp
index da1ea7d660e..76ad0f051d9 100644
--- a/ace/Configuration_Import_Export.cpp
+++ b/ace/Configuration_Import_Export.cpp
@@ -5,6 +5,8 @@
 #include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config)
   : config_ (config)
 {
@@ -121,7 +123,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename)
             {
               // number type
               ACE_TCHAR* endptr = 0;
-              u_int value = ACE_OS::strtoul (end + 6, &endptr, 16);
+              unsigned long value = ACE_OS::strtoul (end + 6, &endptr, 16);
               if (config_.set_integer_value (section, name, value))
                 {
                   ACE_OS::fclose (in);
@@ -644,3 +646,5 @@ ACE_Ini_ImpExp::squish (ACE_TCHAR *src)
 
   return cp;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Configuration_Import_Export.h b/ace/Configuration_Import_Export.h
index d2ac9eeb566..41dc401e0c7 100644
--- a/ace/Configuration_Import_Export.h
+++ b/ace/Configuration_Import_Export.h
@@ -32,6 +32,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Config_ImpExp_Base
  *
@@ -207,5 +209,7 @@ private:
   ACE_Ini_ImpExp& operator= (const ACE_Ini_ImpExp&);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIGURATION_IMPORT_EXPORT_H */
diff --git a/ace/Connection_Recycling_Strategy.cpp b/ace/Connection_Recycling_Strategy.cpp
index 351dde2ea52..c5bc6910d21 100644
--- a/ace/Connection_Recycling_Strategy.cpp
+++ b/ace/Connection_Recycling_Strategy.cpp
@@ -4,10 +4,10 @@
 ACE_RCSID(ace, Connection_Recycling_Strategy, "$Id$")
 
 
-ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void)
-{
-}
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Connection_Recycling_Strategy.h b/ace/Connection_Recycling_Strategy.h
index bbe4f7b48ce..786835ef6b7 100644
--- a/ace/Connection_Recycling_Strategy.h
+++ b/ace/Connection_Recycling_Strategy.h
@@ -19,15 +19,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Connection_Recycling_Strategy
  *
  * @brief Defines the interface for a connection recycler.
  */
-
 class ACE_Export ACE_Connection_Recycling_Strategy
 {
 public:
@@ -56,12 +54,10 @@ public:
   virtual int cleanup_hint (const void *recycling_act,
                             void **act_holder = 0) = 0;
 
-protected:
-  /// Default ctor.
-  ACE_Connection_Recycling_Strategy (void);
 };
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
+
 #endif /*ACE_CONNECTION_RECYCLING_STRATEGY*/
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index c4a40988e59..f588b605462 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -1,10 +1,10 @@
-// Connector.cpp
 // $Id$
 
-#ifndef ACE_CONNECTOR_C
-#define ACE_CONNECTOR_C
+#ifndef ACE_CONNECTOR_CPP
+#define ACE_CONNECTOR_CPP
 
 #include "ace/Connector.h"
+#include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_fcntl.h"     /* Has ACE_NONBLOCK */
@@ -13,7 +13,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Connector, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Connector)
 
@@ -66,46 +66,6 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER> SVC_HANDLER *
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (void)
-{
-  // @@ TODO: This method should be removed after a couple of betas.
-  SVC_HANDLER *svc_handler = 0;
-
-  // Make sure that we haven't already initialized the Svc_Handler.
-  if (this->svc_handler_)
-    {
-      // Exclusive access to the Reactor.
-      ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->reactor ()->lock (), 0);
-
-      // Double check.
-      if (this->svc_handler_)
-        {
-          // Remember the Svc_Handler.
-          svc_handler = this->svc_handler_;
-
-          // Remove from Reactor.
-          this->reactor ()->remove_handler
-            (this->svc_handler_->get_handle (),
-             ACE_Event_Handler::ALL_EVENTS_MASK);
-
-          // Cancel timer.
-          this->reactor ()->cancel_timer
-            (this->timer_id (), 0, 0);
-
-          // Remove this handle from the set of non-blocking handles
-          // in the Connector.
-          this->connector_.non_blocking_handles ().clr_bit
-            (this->svc_handler_->get_handle ());
-
-          // We are done. Don't initialize the Svc_Handler again.
-          this->svc_handler_ = 0;
-        }
-    }
-
-  return svc_handler;
-}
-
 template <class SVC_HANDLER> bool
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh)
 {
@@ -126,14 +86,12 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh)
 
     // Remember the Svc_Handler.
     sh = this->svc_handler_;
-
+    ACE_HANDLE h = sh->get_handle ();
     this->svc_handler_ = 0;
 
-    // Remove from Reactor.
-    if (this->reactor ()->remove_handler (
-          sh->get_handle (),
-          ACE_Event_Handler::ALL_EVENTS_MASK) == -1)
-      return false;
+    // Remove this handle from the set of non-blocking handles
+    // in the Connector.
+    this->connector_.non_blocking_handles ().remove (h);
 
     // Cancel timer.
     if (this->reactor ()->cancel_timer (this->timer_id (),
@@ -141,10 +99,11 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh)
                                         0) == -1)
       return false;
 
-    // Remove this handle from the set of non-blocking handles
-    // in the Connector.
-    this->connector_.non_blocking_handles ().clr_bit
-      (sh->get_handle ());
+    // Remove from Reactor.
+    if (this->reactor ()->remove_handler (
+          h,
+          ACE_Event_Handler::ALL_EVENTS_MASK) == -1)
+      return false;
   }
 
   return true;
@@ -159,21 +118,18 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout
   // This method is called if a connection times out before completing.
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout");
 
-  SVC_HANDLER *svc_handler =
-    this->close ();
-
-  if (svc_handler == 0)
-    return 0;
+  SVC_HANDLER *svc_handler = 0;
+  int retval = this->close (svc_handler) ? 0 : -1;
 
   // Forward to the SVC_HANDLER the <arg> that was passed in as a
   // magic cookie during ACE_Connector::connect().  This gives the
   // SVC_HANDLER an opportunity to take corrective action (e.g., wait
   // a few milliseconds and try to reconnect again.
-  if (svc_handler->handle_timeout (tv, arg) == -1)
+  if (svc_handler != 0 && svc_handler->handle_timeout (tv, arg) == -1)
     svc_handler->handle_close (svc_handler->get_handle (),
                                ACE_Event_Handler::TIMER_MASK);
 
-  return 0;
+  return retval;
 }
 
 
@@ -184,16 +140,14 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE)
   // establishment.
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input");
 
-  SVC_HANDLER *svc_handler =
-    this->close ();
-
-  if (svc_handler == 0)
-    return 0;
+  SVC_HANDLER *svc_handler = 0;
+  int retval = this->close (svc_handler) ? 0 : -1;
 
   // Close Svc_Handler.
-  svc_handler->close (0);
+  if (svc_handler != 0)
+    svc_handler->close (0);
 
-  return 0;
+  return retval;
 }
 
 template <class SVC_HANDLER> int
@@ -202,16 +156,15 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle)
   // Called when a connection is establishment asynchronous.
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output");
 
-  SVC_HANDLER *svc_handler =
-    this->close ();
-
-  if (svc_handler == 0)
-    return 0;
+  // Grab the connector ref before smashing ourselves in close().
+  ACE_Connector_Base<SVC_HANDLER> &connector = this->connector_;
+  SVC_HANDLER *svc_handler = 0;
+  int retval = this->close (svc_handler) ? 0 : -1;
 
-  this->connector_.initialize_svc_handler (handle,
-                                           svc_handler);
+  if (svc_handler != 0)
+    connector.initialize_svc_handler (handle, svc_handler);
 
-  return 0;
+  return retval;
 }
 
 template <class SVC_HANDLER> int
@@ -220,7 +173,6 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h)
   // On Win32, the except mask must also be set for asynchronous
   // connects.
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception");
-
   return this->handle_output (h);
 }
 
@@ -417,7 +369,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
   if (this->make_svc_handler (sh) == -1)
     return -1;
 
-  ACE_Time_Value *timeout;
+  ACE_Time_Value *timeout = 0;
   int use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR];
 
   if (use_reactor)
@@ -529,6 +481,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh)
   if (handler == 0)
     return -1;
 
+  // find_handler() increments handler's refcount; ensure we decrement it.
   ACE_Event_Handler_var safe_handler (handler);
 
   NBCH *nbch =
@@ -583,25 +536,24 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect
     goto reactor_registration_failure;
 
   // Add handle to non-blocking handle set.
-  this->non_blocking_handles ().set_bit (handle);
+  this->non_blocking_handles ().insert (handle);
 
   // If we're starting connection under timer control then we need to
   // schedule a timeout with the ACE_Reactor.
   tv = const_cast<ACE_Time_Value *> (synch_options.time_value ());
-  if (tv == 0)
-    return 0;
-
-  timer_id =
-    this->reactor ()->schedule_timer (nbch,
-                                      synch_options.arg (),
-                                      *tv);
-  if (timer_id == -1)
-    goto timer_registration_failure;
-
-  // Remember timer id.
-  nbch->timer_id (timer_id);
+  if (tv != 0)
+    {
+      timer_id =
+        this->reactor ()->schedule_timer (nbch,
+                                          synch_options.arg (),
+                                          *tv);
+      if (timer_id == -1)
+        goto timer_registration_failure;
+
+      // Remember timer id.
+      nbch->timer_id (timer_id);
+    }
 
-  // Everything was successful.
   return 0;
 
   // Undo previous actions using the ol' "goto label and fallthru"
@@ -612,7 +564,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect
   this->reactor ()->remove_handler (handle, mask);
 
   // Remove handle from the set of non-blocking handles.
-  this->non_blocking_handles ().clr_bit (handle);
+  this->non_blocking_handles ().remove (handle);
 
   /* FALLTHRU */
 
@@ -681,7 +633,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::reactor (void) const
   return this->reactor_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Handle_Set &
+template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Unbounded_Set<ACE_HANDLE> &
 ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::non_blocking_handles (void)
 {
   return this->non_blocking_handles_;
@@ -691,7 +643,7 @@ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
 ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
 {
   // If there are no non-blocking handle pending, return immediately.
-  if (this->non_blocking_handles ().num_set () == 0)
+  if (this->non_blocking_handles ().size () == 0)
     return 0;
 
   // Exclusive access to the Reactor.
@@ -700,28 +652,41 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
   // Go through all the non-blocking handles.  It is necessary to
   // create a new iterator each time because we remove from the handle
   // set when we cancel the Svc_Handler.
+  ACE_HANDLE *handle = 0;
   while (1)
     {
-      ACE_Handle_Set_Iterator iterator (this->non_blocking_handles ());
-      ACE_HANDLE handle = iterator ();
-
-      if (handle == ACE_INVALID_HANDLE)
+      ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+	iterator (this->non_blocking_handles ());
+      if (!iterator.next (handle))
         break;
 
       ACE_Event_Handler *handler =
-        this->reactor ()->find_handler (handle);
-
-      ACE_ASSERT (handler != 0);
+        this->reactor ()->find_handler (*handle);
+      if (handler == 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_LIB_TEXT ("%t: Connector::close h %d, no handler\n"),
+                      *handle));
+          // Remove handle from the set of non-blocking handles.
+          this->non_blocking_handles ().remove (*handle);
+          continue;
+        }
 
+      // find_handler() incremented handler's refcount; ensure it's decremented
       ACE_Event_Handler_var safe_handler (handler);
-
-      NBCH *nbch =
-        dynamic_cast<NBCH *> (handler);
-
-      ACE_ASSERT (nbch != 0);
-
-      SVC_HANDLER *svc_handler =
-        nbch->svc_handler ();
+      NBCH *nbch = dynamic_cast<NBCH *> (handler);
+      if (nbch == 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_LIB_TEXT ("%t: Connector::close h %d handler %@ ")
+                      ACE_LIB_TEXT ("not a legit handler\n"),
+                      *handle,
+                      handler));
+          // Remove handle from the set of non-blocking handles.
+          this->non_blocking_handles ().remove (*handle);
+          continue;
+        }
+      SVC_HANDLER *svc_handler = nbch->svc_handler ();
 
       // Cancel the non-blocking connection.
       this->cancel (svc_handler);
@@ -994,4 +959,6 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::concurrency_strategy
   return this->concurrency_strategy_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_CONNECTOR_C */
diff --git a/ace/Connector.h b/ace/Connector.h
index c82593dcb69..516fc8a775d 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -23,7 +23,9 @@
 
 #include "ace/Strategies_T.h"
 #include "ace/Synch_Options.h"
-#include "ace/Handle_Set.h"
+#include "ace/Unbounded_Set.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Connector_Base
@@ -47,7 +49,7 @@ public:
 
   /// Return the handle set representing the non-blocking connects in
   /// progress.
-  virtual ACE_Handle_Set &non_blocking_handles (void) = 0;
+  virtual ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void) = 0;
 };
 
 /**
@@ -65,17 +67,13 @@ public:
                                    SVC_HANDLER *,
                                    long timer_id);
 
-  /// Close up and return underlying SVC_HANDLER *.
-  /** @deprecated: This should be deprecated sooner or later. The next
-   *   method  should be used.
-   */
-  SVC_HANDLER *close (void);
-
   /// Close up and return underlying SVC_HANDLER through @c sh.
   /**
    * If the return value is true the close was performed succesfully,
-   * and if the return value is false, the close was not
-   * successfull. The @c sh does not have any connection to the return
+   * implying that this object was removed from the reactor and thereby
+   * (by means of reference counting decremented to 0) deleted.
+   * If the return value is false, the close was not successful.
+   * The @c sh does not have any connection to the return
    * value. The argument will return a valid svc_handler object if a
    * valid one exists within the object. Returning a valid svc_handler
    * pointer also invalidates the svc_handler contained in this
@@ -174,7 +172,7 @@ public:
   /**
    * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
-   * only flag that is processed is <ACE_NONBLOCK>, which enabled
+   * only flag that is processed is ACE_NONBLOCK, which enabled
    * non-blocking I/O on the <SVC_HANDLER> when it is opened.
    */
   ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
@@ -183,7 +181,7 @@ public:
   /**
    * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
-   * only flag that is processed is <ACE_NONBLOCK>, which enabled
+   * only flag that is processed is ACE_NONBLOCK, which enabled
    * non-blocking I/O on the <SVC_HANDLER> when it is opened.
    */
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
@@ -199,7 +197,7 @@ public:
    * using <synch_options>.  If the caller wants to designate the
    * selected <local_addr> they can (and can also insist that the
    * <local_addr> be reused by passing a value <reuse_addr> ==
-   * 1). <flags> and <perms> can be used to pass any flags that are
+   * 1). @a flags and <perms> can be used to pass any flags that are
    * needed to perform specific operations such as opening a file
    * within connect with certain permissions.  If the connection fails
    * the <close> hook on the <svc_handler> will be called
@@ -347,7 +345,7 @@ protected:
 
   /// Return the handle set representing the non-blocking connects in
   /// progress.
-  ACE_Handle_Set &non_blocking_handles (void);
+  ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void);
 
   // = Dynamic linking hooks.
   /// Default version does no work and returns -1.  Must be overloaded
@@ -376,7 +374,7 @@ private:
   /**
    * Flags that indicate how <SVC_HANDLER>'s should be initialized
    * prior to being activated.  Right now, the only flag that is
-   * processed is <ACE_NONBLOCK>, which enabled non-blocking I/O on
+   * processed is ACE_NONBLOCK, which enabled non-blocking I/O on
    * the <SVC_HANDLER> when it is opened.
    */
   int flags_;
@@ -385,7 +383,7 @@ private:
   ACE_Reactor *reactor_;
 
   /// Handle set representing the non-blocking connects in progress.
-  ACE_Handle_Set non_blocking_handles_;
+  ACE_Unbounded_Set<ACE_HANDLE> non_blocking_handles_;
 
 };
 
@@ -430,9 +428,9 @@ public:
   SUPER;
 
   /**
-   * Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
-   * only flag that is processed is <ACE_NONBLOCK>, which enabled
+   * only flag that is processed is ACE_NONBLOCK, which enabled
    * non-blocking I/O on the <SVC_HANDLER> when it is opened.
    */
   ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
@@ -442,9 +440,9 @@ public:
                           int flags = 0);
 
   /**
-   * Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
-   * only flag that is processed is <ACE_NONBLOCK>, which enabled
+   * only flag that is processed is ACE_NONBLOCK, which enabled
    * non-blocking I/O on the <SVC_HANDLER> when it is opened.
    * Default strategies would be created and used.
    */
@@ -452,9 +450,9 @@ public:
                     int flags);
 
   /**
-   * Initialize a connector.  <flags> indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
-   * only flag that is processed is <ACE_NONBLOCK>, which enabled
+   * only flag that is processed is ACE_NONBLOCK, which enabled
    * non-blocking I/O on the <SVC_HANDLER> when it is opened.
    */
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
@@ -560,6 +558,8 @@ protected:
   int delete_concurrency_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Connector.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Container_Instantiations.cpp b/ace/Container_Instantiations.cpp
index 9b45dacf6e4..031a262808d 100644
--- a/ace/Container_Instantiations.cpp
+++ b/ace/Container_Instantiations.cpp
@@ -1,6 +1,9 @@
 // $Id$
 #include "ace/CDR_Base.h"
 #include "ace/Unbounded_Queue.h"
+#include "ace/Unbounded_Set.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Instantiations of templates with basic data types that can be used
 // across  ACE+TAO.
@@ -9,11 +12,17 @@
 template class ACE_Node<ACE_INT32>;
 template class ACE_Unbounded_Queue<ACE_INT32>;
 template class ACE_Unbounded_Queue_Iterator<ACE_INT32>;
+template class ACE_Unbounded_Set<ACE_HANDLE>;
+template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Node<ACE_INT32>;
-#pragma instantiate ACE_Unbounded_Queue<ACE_INT32>;
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_INT32>;
+#pragma instantiate ACE_Node<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Queue<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Containers.cpp b/ace/Containers.cpp
index 63faaef39bd..2904225a3c9 100644
--- a/ace/Containers.cpp
+++ b/ace/Containers.cpp
@@ -10,15 +10,3 @@ ACE_RCSID (ace,
 #include "ace/Containers.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Double_Linked_List<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Iterator<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Reverse_Iterator<ACE_DLList_Node>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Double_Linked_List<ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Iterator<ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Reverse_Iterator<ACE_DLList_Node>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/ace/Containers.h b/ace/Containers.h
index b5356ecdf3e..f8e4cda2d02 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -21,15 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-template <class T>
-class ACE_Double_Linked_List;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class T>
-class ACE_Double_Linked_List_Iterator_Base;
-template <class T>
-class ACE_Double_Linked_List_Iterator;
-template <class T>
-class ACE_Double_Linked_List_Reverse_Iterator;
+template <class T> class ACE_Double_Linked_List;
+template <class T> class ACE_Double_Linked_List_Iterator_Base;
+template <class T> class ACE_Double_Linked_List_Iterator;
+template <class T> class ACE_Double_Linked_List_Reverse_Iterator;
 
 /**
  * @class ACE_DLList_Node
@@ -48,7 +45,6 @@ public:
   ACE_DLList_Node (void *&i,
                    ACE_DLList_Node *n = 0,
                    ACE_DLList_Node *p = 0);
-  ~ACE_DLList_Node (void);
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -62,6 +58,8 @@ protected:
   ACE_DLList_Node (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Containers.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Containers.inl b/ace/Containers.inl
index 1312f2a47a6..ebc0b96bf7e 100644
--- a/ace/Containers.inl
+++ b/ace/Containers.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_DLList_Node::ACE_DLList_Node (void)
   : item_ (0),
@@ -19,7 +22,4 @@ ACE_DLList_Node::ACE_DLList_Node (void *&i,
 {
 }
 
-ACE_INLINE
-ACE_DLList_Node::~ACE_DLList_Node (void)
-{
-}
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 1b7ecfca264..80d9ca7f206 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_CONTAINERS_T_C
-#define ACE_CONTAINERS_T_C
+#ifndef ACE_CONTAINERS_T_CPP
+#define ACE_CONTAINERS_T_CPP
 
 #include "ace/Log_Msg.h"
 #include "ace/Malloc_Base.h"
@@ -17,9 +17,7 @@
 #include "ace/Containers_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (ace,
-           Containers_T,
-           "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Stack)
 
@@ -1934,5 +1932,6 @@ ACE_Array<T>::operator== (const ACE_Array<T> &s) const
 
 // ****************************************************************
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_CONTAINERS_T_C */
+#endif /* ACE_CONTAINERS_T_CPP */
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index fdbf7d6bec1..e34a0bf781e 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -36,6 +36,8 @@
 // Backwards compatibility, please include "ace/Unbounded_Queue.h" directly.
 #include "ace/Unbounded_Queue.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Allocator;
 
 
@@ -602,8 +604,9 @@ protected:
   // = Iteration methods.
   /**
    * Move to the first element of the list. Returns 0 if the list is
-   * empty, else 1. Note: the head of the ACE_DLList is actually a
-   * null entry, so the first element is actually the 2n'd entry
+   * empty, else 1.
+   * @note the head of the ACE_DLList is actually a null entry, so the
+   * first element is actually the 2n'd entry
    */
   int go_head (void);
 
@@ -1061,7 +1064,6 @@ public:
   /// Delegates to ACE_Double_Linked_List.
   int remove (ACE_DLList_Node *n);
 
-
   // = Initialization and termination methods.
 
   /// Delegates to ACE_Double_Linked_List.
@@ -1230,23 +1232,23 @@ public:
 protected:
   // = Initialization method.
   ACE_Fixed_Set_Iterator_Base (ACE_Fixed_Set<T, ACE_SIZE> &s);
-  
+
   /// Set we are iterating over.
   ACE_Fixed_Set<T, ACE_SIZE> &s_;
 
   /// How far we've advanced over the set.
   ssize_t next_;
-  
+
   /// The number of non free items that the iterator had pointed at.
   size_t iterated_items_;
-  
+
   /// Dump the state of an object.
   void dump_i (void) const;
-  
+
   /// Pass back the {next_item} that hasn't been seen in the Set.
   /// Returns 0 when all items have been seen, else 1.
   int next_i (T *&next_item);
-}; 
+};
 
 /**
  * @class ACE_Fixed_Set_Iterator
@@ -1271,12 +1273,12 @@ public:
 
   /// Dump the state of an object.
   void dump (void) const;
-  
+
   /// Remove the item where the itearetor is located at.
   /// Returns 1 if it removes a item, else 0.
   /// Pass back the removed {item}.
   int remove (T *&item);
-  
+
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
   T & operator* (void);
@@ -1307,7 +1309,7 @@ public:
 
   /// Dump the state of an object.
   void dump (void) const;
-  
+
   /// STL-like iterator dereference operator: returns a reference
   /// to the node underneath the iterator.
   const T & operator* (void) const ;
@@ -2005,6 +2007,8 @@ public:
   bool operator!= (const ACE_Array<T> &s) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Containers_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Containers_T.inl b/ace/Containers_T.inl
index 885345ba9a8..425d6e167e8 100644
--- a/ace/Containers_T.inl
+++ b/ace/Containers_T.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE int
 ACE_Bounded_Stack<T>::is_empty (void) const
 {
@@ -347,7 +350,7 @@ ACE_DLList<T>::remove (ACE_DLList_Node *n)
 }
 
 template <class T> ACE_INLINE
-ACE_DLList<T>::ACE_DLList (ACE_Allocator *alloc )
+ACE_DLList<T>::ACE_DLList (ACE_Allocator *alloc)
   : ACE_DLList_Base (alloc)
 {
 }
@@ -472,3 +475,5 @@ ACE_DLList_Reverse_Iterator<T>::dump (void) const
   ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump ();
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Copy_Disabled.cpp b/ace/Copy_Disabled.cpp
index 4d2ffb94db7..d2fb124a182 100644
--- a/ace/Copy_Disabled.cpp
+++ b/ace/Copy_Disabled.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file Copy_Disabled.cpp
  *
@@ -15,7 +14,10 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Copy_Disabled::ACE_Copy_Disabled (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Copy_Disabled.h b/ace/Copy_Disabled.h
index 583bc683062..512b96c9dcf 100644
--- a/ace/Copy_Disabled.h
+++ b/ace/Copy_Disabled.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Copy_Disabled
  *
@@ -47,6 +49,7 @@
 class ACE_Export ACE_Copy_Disabled
 {
 public:
+
   /// Default constructor
   ACE_Copy_Disabled (void);
 
@@ -55,6 +58,8 @@ private:
   ACE_Copy_Disabled &operator= (const ACE_Copy_Disabled &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_COPY_DISABLED_H */
diff --git a/ace/Countdown_Time.cpp b/ace/Countdown_Time.cpp
index b8556633cb1..fb03f0465e0 100644
--- a/ace/Countdown_Time.cpp
+++ b/ace/Countdown_Time.cpp
@@ -5,6 +5,8 @@ ACE_RCSID (ace,
            Countdown_Time,
            "$Id$")
 
+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)
@@ -60,3 +62,5 @@ ACE_Countdown_Time::update (void)
 {
   return this->stop () == 0 && this->start ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Countdown_Time.h b/ace/Countdown_Time.h
index 374f8d00140..248e2d19951 100644
--- a/ace/Countdown_Time.h
+++ b/ace/Countdown_Time.h
@@ -23,6 +23,8 @@
 
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Countdown_Time
  *
@@ -71,6 +73,8 @@ private:
   ACE_Countdown_Time &operator= (const ACE_Countdown_Time &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_COUNTDOWN_TIME_H */
diff --git a/ace/DEV.cpp b/ace/DEV.cpp
index 932d7644ad5..1ae27fc558e 100644
--- a/ace/DEV.cpp
+++ b/ace/DEV.cpp
@@ -1,7 +1,5 @@
-// DEV.cpp
 // $Id$
 
-
 #include "ace/DEV.h"
 
 #include "ace/OS_NS_unistd.h"
@@ -12,6 +10,8 @@
 
 ACE_RCSID(ace, DEV, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV)
 
 void
@@ -39,3 +39,5 @@ ACE_DEV::close (void)
   this->set_handle (ACE_INVALID_HANDLE);
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV.h b/ace/DEV.h
index 69a92aaad1b..8b0c585ddf7 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -36,6 +36,8 @@
 #define ACE_DEV_STREAM ACE_DEV_IO, ACE_DEV_Addr
 #endif /* ACE_TEMPLATE_TYPEDEFS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_DEV
  *
@@ -66,6 +68,8 @@ protected:
   ACE_DEV (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/DEV.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/DEV.inl b/ace/DEV.inl
index 91246710423..e00f4fc705e 100644
--- a/ace/DEV.inl
+++ b/ace/DEV.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_DEV::disable (int signum) const
 {
@@ -11,3 +14,5 @@ ACE_DEV::disable (int signum) const
   return ACE_IO_SAP::disable (signum) ;
 #endif /* ACE_WIN32 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp
index 16b7536e0b0..f7e5503b1eb 100644
--- a/ace/DEV_Addr.cpp
+++ b/ace/DEV_Addr.cpp
@@ -1,4 +1,3 @@
-// DEV_Addr.cpp
 // $Id$
 
 #include "ace/DEV_Addr.h"
@@ -13,6 +12,8 @@ ACE_RCSID (ace,
            DEV_Addr,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr)
 
 // Transform the current address into string format.
@@ -56,7 +57,7 @@ ACE_DEV_Addr::ACE_DEV_Addr (void)
   ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
 
   (void) ACE_OS::memset ((void *) &this->devname_,
-			 0, sizeof this->devname_);
+                         0, sizeof this->devname_);
 }
 
 int
@@ -104,3 +105,4 @@ ACE_DEV_Addr::operator= (const ACE_DEV_Addr &sa)
   return *this;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h
index eba31734c2b..0646260c8f9 100644
--- a/ace/DEV_Addr.h
+++ b/ace/DEV_Addr.h
@@ -23,6 +23,8 @@
 
 #include "ace/os_include/os_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_DEV_Addr
  *
@@ -77,6 +79,8 @@ private:
   ACE_TCHAR devname_[DEVNAME_LENGTH];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/DEV_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/DEV_Addr.inl b/ace/DEV_Addr.inl
index 059c81111a8..820b961d1d0 100644
--- a/ace/DEV_Addr.inl
+++ b/ace/DEV_Addr.inl
@@ -6,6 +6,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/sys/os_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 ACE_DEV_Addr::set (const ACE_TCHAR *devname)
 {
@@ -33,7 +35,7 @@ ACE_DEV_Addr::operator != (const ACE_DEV_Addr &sap) const
 {
   ACE_TRACE ("ACE_DEV_Addr::operator !=");
 
-  return !((*this) == sap);	// This is lazy, of course... ;-).
+  return !((*this) == sap);     // This is lazy, of course... ;-).
 }
 
 // Return the path name used for the rendezvous point.
@@ -45,3 +47,5 @@ ACE_DEV_Addr::get_path_name (void) const
 
   return this->devname_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 5c577754481..a1fef807057 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -1,4 +1,3 @@
-// DEV_Connector.cpp
 // $Id$
 
 #include "ace/DEV_Connector.h"
@@ -15,6 +14,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
 
 void
@@ -48,3 +49,5 @@ ACE_DEV_Connector::connect (ACE_DEV_IO &new_io,
   new_io.addr_ = remote_sap; // class copy.
   return handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index 858cd5d0369..2d57f836b24 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_DEV_Connector
  *
@@ -97,6 +100,8 @@ public:
   typedef ACE_DEV_IO   PEER_STREAM;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/DEV_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/DEV_Connector.inl b/ace/DEV_Connector.inl
index 798639197b4..13ceeba1d75 100644
--- a/ace/DEV_Connector.inl
+++ b/ace/DEV_Connector.inl
@@ -1,23 +1,26 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Creates a Local ACE_DEV.
 
 ACE_INLINE
 ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
-				      const ACE_DEV_Addr &remote_sap,
-				      ACE_Time_Value *timeout,
-				      const ACE_Addr &local_sap,
-				      int reuse_addr,
-				      int flags,
-				      int perms)
+                                      const ACE_DEV_Addr &remote_sap,
+                                      ACE_Time_Value *timeout,
+                                      const ACE_Addr &local_sap,
+                                      int reuse_addr,
+                                      int flags,
+                                      int perms)
 {
   ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector");
   if (this->connect (new_io, remote_sap, timeout, local_sap,
-		     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
+                     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"),
-	            remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO")));
+                    remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO")));
 }
 
 ACE_INLINE int
@@ -28,3 +31,4 @@ ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp
index fb025287df0..f5367d1d5cd 100644
--- a/ace/DEV_IO.cpp
+++ b/ace/DEV_IO.cpp
@@ -1,4 +1,3 @@
-// DEV_IO.cpp
 // $Id$
 
 #include "ace/DEV_IO.h"
@@ -10,6 +9,9 @@
 
 ACE_RCSID(ace, DEV_IO, "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO)
 
 // Return the local endpoint address.
@@ -125,3 +127,5 @@ ACE_DEV_IO::recv (size_t n, ...) const
   va_end (argp);
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 69e584a401b..fd2a0e2c5b8 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -28,6 +28,8 @@
 #include "ace/os_include/os_stdio.h"
 #include "ace/os_include/sys/os_uio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -173,6 +175,8 @@ private:
   ACE_DEV_Addr addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/DEV_IO.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/DEV_IO.inl b/ace/DEV_IO.inl
index 3724c7cc492..cb9392e2bf3 100644
--- a/ace/DEV_IO.inl
+++ b/ace/DEV_IO.inl
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// DEV_IO.i
-
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_Memory.h"
@@ -12,6 +11,8 @@
 // Send exactly N bytes from BUF to this device.  Keeping trying until
 // this many bytes are sent.
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_DEV_IO::send_n (const void *buf, size_t n) const
 {
@@ -23,7 +24,7 @@ ACE_DEV_IO::send_n (const void *buf, size_t n) const
 // this many bytes are received.
 
 ACE_INLINE ssize_t
-ACE_DEV_IO::recv_n (void *buf, 
+ACE_DEV_IO::recv_n (void *buf,
                     size_t n,
                     const ACE_Time_Value *timeout,
                     size_t *bytes_transferred) const
@@ -121,3 +122,5 @@ ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) c
   return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 #endif /* ACE_HAS_STREAM_PIPES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index 7a8df6573a7..00363d51bbf 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(ace, DLL, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor. Also, by default, the object will be closed
 // before it is destroyed.
 
@@ -134,7 +136,7 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
 
   if (!this->dll_name_)
     this->dll_name_ = ACE::strnew (dll_filename);
-  
+
   this->open_mode_ = open_mode;
   this->close_handle_on_destruction_ = close_handle_on_destruction;
 
@@ -238,3 +240,5 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle,
 
   return this->open_i (temp, 1, close_handle_on_destruction, handle);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DLL.h b/ace/DLL.h
index 3554b558542..022521ae6a7 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_dlfcn.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_DLL_Handle;
 
 /**
@@ -32,7 +34,7 @@ class ACE_DLL_Handle;
  * @brief Provides an abstract interface for handling various DLL
  * operations.
  *
- * This class is an wrapper over the various methods for utilizing
+ * This class is a wrapper over the various methods for utilizing
  * a dynamically linked library (DLL), which is called a shared
  * library on some platforms.  Operations open(), close(), and
  * symbol() have been implemented to help opening/closing and
@@ -43,18 +45,36 @@ class ACE_Export ACE_DLL
 public:
   // = Initialization and termination methods.
 
-  /// Default constructor.  By default, the close() operation on the
-  /// object will be invoked before it is destroyed.
+  /**
+   * Default constructor.  By default, the close() operation on the
+   * object will be invoked before it is destroyed.
+   * @param close_handle_on_destruction  Indicates whether or not the
+   *        close() method will be called to close an open DLL when this
+   *        object is destroyed. By default, close() will be called.
+   *        Set this parameter to 0 for situations where the DLL's lifetime
+   *        is controlled in a scope other than that of this ACE_DLL object.
+   *        For example, termination by ACE_DLL_Manager via ACE::fini().
+   */
   explicit ACE_DLL (int close_handle_on_destruction = 1);
 
   /**
-   * This constructor opens and dynamically links @a dll_name.  The
-   * default mode is <RTLD_LAZY>, which loads identifier symbols but
-   * not the symbols for functions, which are loaded dynamically
-   * on-demand.  Other supported modes include: <RTLD_NOW>, which
-   * performs all necessary relocations when @a dll_name is first
-   * loaded and <RTLD_GLOBAL>, which makes symbols available for
-   * relocation processing of any other DLLs.
+   * This constructor performs the actions of open() during construction.
+   * @param dll_name  The name or path of the DLL to load.
+   * @param open_mode  Flags to alter the actions taken when loading the DLL.
+   *        The possible values are:
+   *        @li @c RTLD_LAZY (this the default): loads identifier symbols but
+   *            not the symbols for functions, which are loaded dynamically
+   *            on-demand.
+   *        @li @c RTLD_NOW: performs all necessary relocations when
+   *            @a dll_name is first loaded
+   *        @li RTLD_GLOBAL: makes symbols available for relocation
+   *            processing of any other DLLs.
+   * @param close_handle_on_destruction  Indicates whether or not the
+   *        close() method will be called to close an open DLL when this
+   *        object is destroyed. By default, close() will be called.
+   *        Set this parameter to 0 for situations where the DLL's lifetime
+   *        is controlled in a scope other than that of this ACE_DLL object.
+   *        For example, termination by ACE_DLL_Manager via ACE::fini().
    */
   explicit ACE_DLL (const ACE_TCHAR *dll_name,
                     int open_mode = ACE_DEFAULT_SHLIB_MODE,
@@ -64,16 +84,23 @@ public:
   ACE_DLL (const ACE_DLL &);
 
   /**
-   * This method opens and dynamically links @a dll_name.  The default
-   * mode is <RTLD_LAZY>, which loads identifier symbols but not the
-   * symbols for functions, which are loaded dynamically on-demand.
-   * Other supported modes include: <RTLD_NOW>, which performs all
-   * necessary relocations when @a dll_name>is first loaded and
-   * <RTLD_GLOBAL>, which makes symbols available for relocation
-   * processing of any other DLLs.
-   * @param dll_name The name of the dll.
-   * @param open_mode How the dll is opened.
-   * @param close_handle_on_destruction Close the handle when object is destroyed.
+   * This method opens and dynamically links a specified DLL.
+   * @param dll_name  The name or path of the DLL to load.
+   * @param open_mode  Flags to alter the actions taken when loading the DLL.
+   *        The possible values are:
+   *        @li @c RTLD_LAZY (this the default): loads identifier symbols but
+   *            not the symbols for functions, which are loaded dynamically
+   *            on-demand.
+   *        @li @c RTLD_NOW: performs all necessary relocations when
+   *            @a dll_name is first loaded
+   *        @li RTLD_GLOBAL: makes symbols available for relocation
+   *            processing of any other DLLs.
+   * @param close_handle_on_destruction  Indicates whether or not the
+   *        close() method will be called to close an open DLL when this
+   *        object is destroyed. By default, close() will be called.
+   *        Set this parameter to 0 for situations where the DLL's lifetime
+   *        is controlled in a scope other than that of this ACE_DLL object.
+   *        For example, termination by ACE_DLL_Manager via ACE::fini().
    * @retval -1 On failure
    * @retval 0 On success.
    */
@@ -86,16 +113,21 @@ public:
 
   /**
    * Called when the DLL object is destroyed -- invokes close() if the
-   * <close_handle_on_destruction> flag is set in the constructor or open()
-   * method.
+   * @a close_handle_on_destruction flag was set to non-zero in the
+   * constructor or open() method.
    */
   ~ACE_DLL (void);
 
-  /// If @a symbol_name is in the symbol table of the DLL a pointer to
-  /// the @a symbol_name is returned.  Otherwise, returns 0.  Setting
-  /// ignore_errors = 1 allows you to probe a dll without generating
-  /// error messages in the log.  Handy for determining the capabilities
-  /// of a library.
+  /**
+   * Look up a named symbol in the DLL. DLL must be successfully opened
+   * before calling symbol().
+   * @param symbol_name The symbol name to look up.
+   * @param ignore_errors If set to 1, allows you to probe a dll without
+   *        generating error messages in the log.  Handy for determining
+   *        the capabilities of a library.
+   * @return Returns the value of @a symbol_name if it is a valid symbol
+   *        in the DLL. Otherwise, returns 0.
+   */
   void *symbol (const ACE_TCHAR *symbol_name, int ignore_errors = 0);
 
   /// Returns a pointer to a string explaining that an error occured.  You
@@ -113,7 +145,7 @@ public:
 
   /// Set the handle for the DLL object. By default, the close()
   //operation on / the object will be invoked before it is destroyed.
-  int set_handle (ACE_SHLIB_HANDLE handle, 
+  int set_handle (ACE_SHLIB_HANDLE handle,
                   int close_handle_on_destruction = 1);
 
 private:
@@ -124,6 +156,11 @@ private:
               ACE_SHLIB_HANDLE handle = 0);
 
 
+  // Disallow assignment since we don't handle it.
+  void operator= (const ACE_DLL &);
+
+private:
+
   /// Open mode.
   int open_mode_;
 
@@ -141,9 +178,9 @@ private:
   /// Flag to record if the last operation had an error.
   int error_;
 
-  // = Disallow copying and assignment since we don't handle these.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_DLL_H */
diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp
index cbbb10545fe..783b524c5a2 100644
--- a/ace/DLL_Manager.cpp
+++ b/ace/DLL_Manager.cpp
@@ -14,11 +14,14 @@
 #include "ace/OS_NS_dlfcn.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ace, DLL_Manager,
-    "DLL_Manager.cpp,v 4.23 2003/11/05 23:30:46 shuston Exp")
+ACE_RCSID (ace,
+           DLL_Manager,
+           "DLL_Manager.cpp,v 4.23 2003/11/05 23:30:46 shuston Exp")
 
 /******************************************************************/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 sig_atomic_t ACE_DLL_Handle::open_called_ = 0;
 
 ACE_DLL_Handle::ACE_DLL_Handle (void)
@@ -684,22 +687,4 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<ACE_TString>;
-template class ACE_Array_Iterator<ACE_TString>;
-template class auto_ptr<ACE_TString>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACE_TString>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Array_Base<ACE_TString>
-# pragma instantiate ACE_Array_Iterator<ACE_TString>
-# pragma instantiate auto_ptr<ACE_TString>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<ACE_TString>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/DLL_Manager.h b/ace/DLL_Manager.h
index 856fbe4e861..2bde7161251 100644
--- a/ace/DLL_Manager.h
+++ b/ace/DLL_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -32,6 +32,9 @@
 
 #define ACE_DEFAULT_DLL_MANAGER_SIZE 1024
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_DLL_Handle
  *
@@ -48,12 +51,12 @@
  * extracting symbol information from a DLL, respectively.
  *
  * Most of this class came from the original ACE_DLL class.
- * ACE_DLL is now just an interface that passed all it's calls 
- * either directly or via ACE_DLL_Manager to this class for 
- * execution.  
+ * ACE_DLL is now just an interface that passed all it's calls
+ * either directly or via ACE_DLL_Manager to this class for
+ * execution.
  *
  */
-class ACE_Export ACE_DLL_Handle
+class ACE_DLL_Handle
 {
 public:
 
@@ -67,41 +70,42 @@ public:
   const ACE_TCHAR *dll_name () const;
 
   /**
-   * This method opens and dynamically links <dll_name>.  The default
+   * This method opens and dynamically links @a dll_name.  The default
    * mode is <RTLD_LAZY>, which loads identifier symbols but not the
    * symbols for functions, which are loaded dynamically on-demand.
    * Other supported modes include: <RTLD_NOW>, which performs all
-   * necessary relocations when <dll_name> is first loaded and
+   * necessary relocations when @a dll_name is first loaded and
    * <RTLD_GLOBAL>, which makes symbols available for relocation
    * processing of any other DLLs.  Returns -1 on failure and 0 on
    * success.
    */
-  int open (const ACE_TCHAR *dll_name, 
+  int open (const ACE_TCHAR *dll_name,
             int open_mode,
             ACE_SHLIB_HANDLE handle);
 
   /// Call to close the DLL object.  If unload = 0, it only decrements
-  /// the refcount, but if unload = 1, then it will actually unload 
+  /// the refcount, but if unload = 1, then it will actually unload
   /// the library when the refcount == 0;
   int close (int unload = 0);
 
   /// Return the current refcount.
   sig_atomic_t refcount (void) const;
 
-  /// If <symbol_name> is in the symbol table of the DLL a pointer to
-  /// the <symbol_name> is returned.  Otherwise, returns 0.  Set the
+  /// If @a symbol_name is in the symbol table of the DLL a pointer to
+  /// the @a symbol_name is returned.  Otherwise, returns 0.  Set the
   /// ignore_errors flag to supress logging errors if symbol_name isn't
   /// found.  This is nice if you just want to probe a dll to see what's
   /// available, since missing functions in that case aren't really errors.
   void *symbol (const ACE_TCHAR *symbol_name, int ignore_errors = 0);
 
   /**
-   * Return the handle to the caller.  If <become_owner> is non-0 then
+   * Return the handle to the caller.  If @a become_owner is non-0 then
    * caller assumes ownership of the handle so we decrement the retcount.
    */
   ACE_SHLIB_HANDLE get_handle (int become_owner = 0);
- 
+
 private:
+
   /// Returns a pointer to a string explaining why <symbol> or <open>
   /// failed.  This is used internal to print out the error to the log,
   /// but since this object is shared, we can't store or return the error
@@ -114,6 +118,12 @@ private:
   void get_dll_names (const ACE_TCHAR *dll_name,
                       ACE_Array<ACE_TString> &try_names);
 
+  // Disallow copying and assignment since we don't handle them.
+  ACE_DLL_Handle (const ACE_DLL_Handle &);
+  void operator= (const ACE_DLL_Handle &);
+
+private:
+
   // Keep track of how many ACE_DLL objects have a reference to this
   // dll.
   sig_atomic_t refcount_;
@@ -134,11 +144,6 @@ private:
   /// Synchronization variable for the MT_SAFE Repository
   ACE_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
-
-  // = Disallow copying and assignment since we don't handle these.
-  ACE_UNIMPLEMENTED_FUNC (ACE_DLL_Handle (const ACE_DLL_Handle &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL_Handle &))
-
 };
 
 class ACE_Framework_Repository;
@@ -146,10 +151,10 @@ class ACE_Framework_Repository;
 /**
  * @class ACE_DLL_Manager
  *
- * @brief This class is a singleton and serves as a factory and 
- * repository for instances of ACE_DLL_Handle.  
+ * @brief This class is a singleton and serves as a factory and
+ * repository for instances of ACE_DLL_Handle.
  *
- * This class is a singleton whose lifetime is managed by the 
+ * This class is a singleton whose lifetime is managed by the
  * ACE_Framework_Repository.  Although it is normally meant to be
  * used directly only by ACE_DLL, applications can call the unload_policy()
  * methods in order get/set the the dll unload policy.  Unload policies include
@@ -157,30 +162,28 @@ class ACE_Framework_Repository;
  * by using the ACE_DLL_UNLOAD_POLICY macro found in config-all.h.  If a dll
  * choses to set an unload policy, it will be used when the per-dll policy
  * (the default) is in effect.  If the per-dll policy is in effect and a dll
- * has not chosen to set a policy, the current per-process policy will be 
- * used.  
+ * has not chosen to set a policy, the current per-process policy will be
+ * used.
  *
  * The following policy macros are provided in config-all.h:
  *
- *  ACE_DLL_UNLOAD_POLICY_PER_PROCESS - Per-process policy that unloads dlls 
+ *  ACE_DLL_UNLOAD_POLICY_PER_PROCESS - Per-process policy that unloads dlls
  *  eagerly.
- * 
- *  ACE_DLL_UNLOAD_POLICY_PER_DLL - Apply policy on a per-dll basis.  If the 
- *  dll doesn't use one of the macros below, the current per-process policy 
+ *
+ *  ACE_DLL_UNLOAD_POLICY_PER_DLL - Apply policy on a per-dll basis.  If the
+ *  dll doesn't use one of the macros below, the current per-process policy
  *  will be used.
  *
- *  ACE_DLL_UNLOAD_POLICY_LAZY - Don't unload dll when refcount reaches 
+ *  ACE_DLL_UNLOAD_POLICY_LAZY - Don't unload dll when refcount reaches
  *  zero, i.e., wait for either an explicit unload request or program exit.
  *
- *  ACE_DLL_UNLOAD_POLICY_DEFAULT - Default policy allows dlls to control 
+ *  ACE_DLL_UNLOAD_POLICY_DEFAULT - Default policy allows dlls to control
  *  their own destinies, but will unload those that don't make a choice eagerly.
  *
  */
 class ACE_Export ACE_DLL_Manager
 {
 public:
-  // This if to silence the compiler warnings, even though ACE_Framework_Repository 
-  // always uses the instance method.
   friend class ACE_Framework_Repository;
 
   enum
@@ -191,10 +194,10 @@ public:
   /// Return a unique instance
   static ACE_DLL_Manager *instance (int size = ACE_DLL_Manager::DEFAULT_SIZE);
 
-  /// Factory for ACE_DLL_Handle objects.  If one already exits, 
+  /// Factory for ACE_DLL_Handle objects.  If one already exits,
   /// its refcount is incremented.
-  ACE_DLL_Handle *open_dll (const ACE_TCHAR *dll_name, 
-                            int openmode, 
+  ACE_DLL_Handle *open_dll (const ACE_TCHAR *dll_name,
+                            int openmode,
                             ACE_SHLIB_HANDLE handle);
 
   /// Close the underlying dll.  Decrements the refcount.
@@ -203,12 +206,19 @@ public:
   /// Returns the current per-process UNLOAD_POLICY.
   u_long unload_policy (void) const;
 
-  /// Set the per-process UNLOAD_POLICY.  If the policy is changed from 
+  /// Set the per-process UNLOAD_POLICY.  If the policy is changed from
   /// LAZY to EAGER, then it will also unload any dlls with zero
   /// refcounts.
   void unload_policy (u_long unload_policy);
 
 protected:
+
+  /// Default constructor.
+  ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE);
+
+  /// Destructor.
+  ~ACE_DLL_Manager (void);
+
   // Allocate handle_vector_.
   int open (int size);
 
@@ -222,15 +232,16 @@ protected:
   int unload_dll (ACE_DLL_Handle *dll_handle, int force_unload = 0);
 
 private:
-  /// Default constructor.
-  ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE);
-
-  /// Destructor.
-  ~ACE_DLL_Manager (void);
 
   /// Close the singleton instance.
   static void close_singleton (void);
 
+  // Disallow copying and assignment since we don't handle these.
+  ACE_DLL_Manager (const ACE_DLL_Manager &);
+  void operator= (const ACE_DLL_Manager &);
+
+private:
+
   /// Vector containing all loaded handle objects.
   ACE_DLL_Handle **handle_vector_;
 
@@ -243,7 +254,7 @@ private:
   /// Unload strategy.
   u_long unload_policy_;
 
- /// Pointer to a process-wide <ACE_DLL_Manager>.
+  /// Pointer to a process-wide <ACE_DLL_Manager>.
   static ACE_DLL_Manager *instance_;
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -251,10 +262,9 @@ private:
   ACE_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
 
- // = Disallow copying and assignment since we don't handle these.
-  ACE_UNIMPLEMENTED_FUNC (ACE_DLL_Manager (const ACE_DLL_Manager &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL_Manager &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_DLL_MANAGER_H */
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index d11af119f9d..7efd047cafd 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -113,6 +115,8 @@ private:
   long wday_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Date_Time.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Date_Time.inl b/ace/Date_Time.inl
index 4dbc8ecc657..dfb0d239bc3 100644
--- a/ace/Date_Time.inl
+++ b/ace/Date_Time.inl
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Date_Time.i
-
 #include "ace/Global_Macros.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_time.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 ACE_Date_Time::update (const ACE_Time_Value& timevalue)
 {
@@ -214,3 +215,5 @@ ACE_Date_Time::weekday (long wday)
   ACE_TRACE ("ACE_Date_Time::weekday");
   wday_ = wday;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h
index 85820e5d603..05419382e97 100644
--- a/ace/Default_Constants.h
+++ b/ace/Default_Constants.h
@@ -75,6 +75,10 @@
 #   define ACE_DEFAULT_BACKLOG 5
 # endif /* ACE_DEFAULT_BACKLOG */
 
+# if !defined (ACE_DEFAULT_ASYNCH_BACKLOG)
+#   define ACE_DEFAULT_ASYNCH_BACKLOG 5
+# endif /* ACE_DEFAULT_ASYNCH_BACKLOG */
+
 # if !defined (ACE_DEFAULT_THREADS)
 #   define ACE_DEFAULT_THREADS 1
 # endif /* ACE_DEFAULT_THREADS */
@@ -452,7 +456,7 @@
 #  define ACE_MAX_DEFAULT_PORT 65535
 #endif /* ACE_MAX_DEFAULT_PORT */
 
-// Default number of <ACE_Event_Handler>s supported by
+// Default number of ACE_Event_Handlers supported by
 // <ACE_Timer_Heap>.
 # if !defined (ACE_DEFAULT_TIMERS)
 #   define ACE_DEFAULT_TIMERS _POSIX_TIMER_MAX
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index 803dd2f4e32..e5a783d938c 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -40,6 +40,8 @@ ACE_RCSID (ace,
 #include "ace/os_include/os_poll.h"
 #include "ace/OS_NS_sys_mman.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void)
   : dp_reactor_ (0)
   , notification_pipe_ ()
@@ -93,6 +95,9 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
         if (free_queue_.enqueue_head (temp + i) == -1)
           return -1;
 
+      if (ACE::set_flags (this->notification_pipe_.write_handle (),
+                          ACE_NONBLOCK) == -1)
+        return -1;
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
       // Set the read handle into non-blocking mode since we need to
@@ -428,7 +433,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
         default:
           // Should we bail out if we get an invalid mask?
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("invalid mask = %d\n"),
+                      ACE_LIB_TEXT ("dispatch_notify invalid mask = %d\n"),
                       buffer.mask_));
         }
       if (result == -1)
@@ -666,9 +671,11 @@ ACE_Dev_Poll_Reactor_Handler_Repository::find (ACE_HANDLE handle,
   if (this->handle_in_range (handle))
     {
       eh = this->handlers_[handle].event_handler;
-
-      if (eh != 0 && index_p != 0)
-        *index_p = handle;
+      if (eh != 0)
+        {
+          if (index_p != 0)
+            *index_p = handle;
+        }
       else
         errno = ENOENT;
     }
@@ -692,18 +699,22 @@ ACE_Dev_Poll_Reactor_Handler_Repository::bind (
 
   this->handlers_[handle].event_handler = event_handler;
   this->handlers_[handle].mask = mask;
+  event_handler->add_reference ();
 
   return 0;
 }
 
 int
-ACE_Dev_Poll_Reactor_Handler_Repository::unbind (ACE_HANDLE handle)
+ACE_Dev_Poll_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
+						 bool decr_refcnt)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind");
 
   if (this->find (handle) == 0)
     return -1;
 
+  if (decr_refcnt)
+    this->handlers_[handle].event_handler->remove_reference ();
   this->handlers_[handle].event_handler = 0;
   this->handlers_[handle].mask = ACE_Event_Handler::NULL_MASK;
   this->handlers_[handle].suspended = 0;
@@ -906,10 +917,11 @@ ACE_Dev_Poll_Reactor::open (size_t size,
   else if (this->notify_handler_->open (this,
                                         0,
                                         disable_notify_pipe) == -1
-           || this->register_handler_i (
-                       this->notify_handler_->notify_handle (),
-                       this->notify_handler_,
-                       ACE_Event_Handler::READ_MASK) == -1)
+           || (disable_notify_pipe == 0
+               && this->register_handler_i (
+                                            this->notify_handler_->notify_handle (),
+                                            this->notify_handler_,
+                                            ACE_Event_Handler::READ_MASK)) == -1)
     result = -1;
 
   this->size_ = size;
@@ -1095,14 +1107,11 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time)
                                   this->size_,
                                   static_cast<int> (timeout));
 
-   // all detected events are put in this->events_:
-   this->start_pevents_ = this->events_;
-
-   // If nfds == 0 then end_pevents_ == start_pevents_ meaning that there is
-   // no work pending.  If nfds > 0 then there is work pending.
-   // Otherwise an error occurred.
-  if (nfds > -1)
-     this->end_pevents_ = this->start_pevents_ + nfds;
+  if (nfds > 0)
+    {
+      this->start_pevents_ = this->events_;
+      this->end_pevents_ = this->start_pevents_ + nfds;
+    }
 
 #else
 
@@ -1174,6 +1183,8 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time,
   do
     {
       result = this->work_pending_i (max_wait_time);
+      if (result == -1)
+	ACE_ERROR((LM_ERROR, "%t: %p\n", "work_pending_i"));
     }
   while (result == -1 && this->restart_ != 0 && errno == EINTR);
 
@@ -1341,9 +1352,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
       short &revents          = pfds->revents;
 #endif /* ACE_HAS_EVENT_POLL */
 
-      if (revents == 0)
-        ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) disp h %d events 0x%x\n"),
-                    handle, (int)revents));
       // Figure out what to do first in order to make it easier to manage
       // the bit twiddling and possible pfds increment before releasing
       // the token for dispatch.
@@ -1394,51 +1402,52 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
       */
       ACE_Event_Handler *eh = this->handler_rep_.find (handle);
 
-      {
-        // Modify the reference count in an exception-safe way.
-        // Note that eh could be the notify handler. It's not strictly
-        // necessary to manage its refcount, but since we don't enable
-        // the counting policy, it won't do much. Management of the
-        // notified handlers themselves is done in the notify handler.
-        ACE_Dev_Poll_Handler_Guard eh_guard (eh);
-
-        // Release the reactor token before upcall.
-        guard.release_token ();
-
-        // Dispatch the detected event
-        if (disp_out)
-          {
-            const int status =
-              this->upcall (eh, &ACE_Event_Handler::handle_output, handle);
-
-            if (status < 0)
-              // Note that the token is reacquired in remove_handler().
-              this->remove_handler (handle, ACE_Event_Handler::WRITE_MASK);
-            return 1;
-          }
-
-        if (disp_exc)
-          {
-            const int status =
-              this->upcall (eh, &ACE_Event_Handler::handle_exception, handle);
-
-            if (status < 0)
-              // Note that the token is reacquired in remove_handler().
-              this->remove_handler (handle, ACE_Event_Handler::EXCEPT_MASK);
-            return 1;
-          }
-
-        if (disp_in)
-          {
-            const int status =
-              this->upcall (eh, &ACE_Event_Handler::handle_input, handle);
-
-            if (status < 0)
-              // Note that the token is reacquired in remove_handler().
-              this->remove_handler (handle, ACE_Event_Handler::READ_MASK);
-            return 1;
-          }
-      } // The reactor token is reacquired upon leaving this scope.
+      if (eh)
+        {
+          // Modify the reference count in an exception-safe way.
+          // Note that eh could be the notify handler. It's not strictly
+          // necessary to manage its refcount, but since we don't enable
+          // the counting policy, it won't do much. Management of the
+          // notified handlers themselves is done in the notify handler.
+          ACE_Dev_Poll_Handler_Guard eh_guard (eh);
+
+          // Release the reactor token before upcall.
+          guard.release_token ();
+
+          // Dispatch the detected event
+          if (disp_out)
+            {
+              const int status =
+                this->upcall (eh, &ACE_Event_Handler::handle_output, handle);
+
+              if (status < 0)
+                // Note that the token is reacquired in remove_handler().
+                this->remove_handler (handle, ACE_Event_Handler::WRITE_MASK);
+              return 1;
+            }
+
+          if (disp_exc)
+            {
+              const int status =
+                this->upcall (eh, &ACE_Event_Handler::handle_exception, handle);
+
+              if (status < 0)
+                // Note that the token is reacquired in remove_handler().
+                this->remove_handler (handle, ACE_Event_Handler::EXCEPT_MASK);
+              return 1;
+            }
+
+          if (disp_in)
+            {
+              const int status =
+                this->upcall (eh, &ACE_Event_Handler::handle_input, handle);
+
+              if (status < 0)
+                // Note that the token is reacquired in remove_handler().
+                this->remove_handler (handle, ACE_Event_Handler::READ_MASK);
+              return 1;
+            }
+        } // The reactor token is reacquired upon leaving this scope.
     }
 
   return 0;
@@ -1524,7 +1533,6 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
 
  if (this->handler_rep_.find (handle) == 0)
    {
-     ACE_DEBUG ((LM_DEBUG, "Need to add handle %d\n", handle));
      // Handler not present in the repository.  Bind it.
      if (this->handler_rep_.bind (handle, event_handler, mask) != 0)
        return -1;
@@ -1532,7 +1540,7 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
 #if defined (ACE_HAS_EVENT_POLL)
 
      struct epoll_event epev;
-
+     ACE_OS::memset (&epev, 0, sizeof (epev));
      static const int op = EPOLL_CTL_ADD;
 
      epev.events  = this->reactor_mask_to_poll_event (mask);
@@ -1552,13 +1560,8 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
      // Handler is already present in the repository, so register it
      // again, possibly for different event.  Add new mask to the
      // current one.
-     ACE_DEBUG ((LM_DEBUG, "Adding mask 0x%x for handle %d\n", mask, handle));
      if (this->mask_ops_i (handle, mask, ACE_Reactor::ADD_MASK) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, "%p\n", "mask_ops_i"));
-         (void) this->handler_rep_.unbind (handle);
-         return -1;
-       }
+       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mask_ops_i"), -1);
    }
 
 #ifndef  ACE_HAS_EVENT_POLL
@@ -1573,7 +1576,6 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
   if (ACE_OS::write (this->poll_fd_, &pfd, sizeof (pfd)) != sizeof (pfd))
     {
       (void) this->handler_rep_.unbind (handle);
-
       return -1;
     }
 #endif /*ACE_HAS_EVENT_POLL*/
@@ -1696,27 +1698,22 @@ ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle,
 
   ACE_Event_Handler *eh = this->handler_rep_.find (handle);
 
-  if (eh == 0
-      || this->mask_ops_i (handle, mask, ACE_Reactor::CLR_MASK) == -1)
+  if (eh == 0 ||
+      this->mask_ops_i (handle, mask, ACE_Reactor::CLR_MASK) == -1)
     return -1;
 
-  // If there are no longer any outstanding events on the given handle
-  // then remove it from the handler repository.
-  if (this->handler_rep_.mask (handle) == ACE_Event_Handler::NULL_MASK
-      && this->handler_rep_.unbind (handle) != 0)
-    return -1;
+  // Check for ref counting now - handle_close() may delete eh.
+  int requires_reference_counting =
+    eh->reference_counting_policy ().value () ==
+    ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
 
   if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL))
-    {
-      // Release the lock during the "close" upcall.
-      ACE_Reverse_Lock<ACE_Dev_Poll_Reactor_Token> reverse_lock (this->token_);
-      ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_Dev_Poll_Reactor_Token>,
-                        reverse_guard,
-                        reverse_lock,
-                        -1);
+    (void) eh->handle_close (handle, mask);
 
-      (void) eh->handle_close (handle, mask);
-    }
+  // If there are no longer any outstanding events on the given handle
+  // then remove it from the handler repository.
+  if (this->handler_rep_.mask (handle) == ACE_Event_Handler::NULL_MASK)
+    this->handler_rep_.unbind (handle, requires_reference_counting);
 
   // Note the fact that we've changed the state of the wait_set,
   // i.e. the "interest set," which is used by the dispatching loop to
@@ -1870,7 +1867,7 @@ ACE_Dev_Poll_Reactor::suspend_handler_i (ACE_HANDLE handle)
 #if defined (ACE_HAS_EVENT_POLL)
 
   struct epoll_event epev;
-
+  ACE_OS::memset (&epev, 0, sizeof (epev));
   static const int op = EPOLL_CTL_DEL;
 
   epev.events  = 0;
@@ -1980,7 +1977,7 @@ ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle)
 #if defined (ACE_HAS_EVENT_POLL)
 
   struct epoll_event epev;
-
+  ACE_OS::memset (&epev, 0, sizeof (epev));
   static const int op = EPOLL_CTL_ADD;
 
   epev.events  = this->reactor_mask_to_poll_event (mask);
@@ -2178,7 +2175,10 @@ ACE_Dev_Poll_Reactor::find_handler (ACE_HANDLE handle)
 {
   ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, 0));
 
-  return this->handler_rep_.find (handle);
+  ACE_Event_Handler *event_handler = this->handler_rep_.find (handle);
+  if (event_handler)
+    event_handler->add_reference ();
+  return event_handler;
 }
 
 int
@@ -2422,7 +2422,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle,
 #elif defined (ACE_HAS_EVENT_POLL)
 
       struct epoll_event epev;
-
+      ACE_OS::memset (&epev, 0, sizeof (epev));
       int op;
 
       // ACE_Event_Handler::NULL_MASK ???
@@ -2597,7 +2597,10 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait)
       if (errno == ETIME)
         return 0;
       else
-        return -1;
+        {
+          ACE_ERROR ((LM_ERROR, "%t: %p\n", "token acquire_read"));
+          return -1;
+        }
     }
 
   // We got the token and so let us mark ourselves as owner
@@ -2641,18 +2644,6 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire (ACE_Time_Value *max_wait)
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dev_Poll_Reactor_Token;
-template class ACE_Lock_Adapter<ACE_Dev_Poll_Reactor_Token>;
-template class ACE_Reverse_Lock<ACE_Dev_Poll_Reactor_Token>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dev_Poll_Reactor_Token
-#pragma instantiate ACE_Lock_Adapter<ACE_Dev_Poll_Reactor_Token>
-#pragma instantiate ACE_Reverse_Lock<ACE_Dev_Poll_Reactor_Token>
-
-#endif  /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h
index 38ca44218f3..78b0949b7d3 100644
--- a/ace/Dev_Poll_Reactor.h
+++ b/ace/Dev_Poll_Reactor.h
@@ -19,12 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_REACTOR_BUILD_DLL
-# include "ace/ACE_Reactor_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Reactor_Export ACE_Export
-#endif  /* ACE_REACTOR_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,14 +57,17 @@
 # include "ace/Unbounded_Queue.h"
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
-// Forward declarations
-class ACE_Sig_Handler;
-class ACE_Dev_Poll_Reactor;
-
 #if defined (ACE_HAS_DEV_POLL)
 struct pollfd;
+#elif defined (ACE_HAS_EVENT_POLL)
+struct epoll_event;
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Forward declarations
+class ACE_Sig_Handler;
+class ACE_Dev_Poll_Reactor;
 
 /**
  * @class ACE_Dev_Poll_Event_Tuple
@@ -381,8 +379,9 @@ public:
             ACE_Event_Handler *handler,
             ACE_Reactor_Mask mask);
 
-  /// Remove the binding of @c ACE_HANDLE in accordance with the <mask>.
-  int unbind (ACE_HANDLE handle);
+  /// Remove the binding for @c ACE_HANDLE; optionally decrement the associated
+  /// handler's reference count.
+  int unbind (ACE_HANDLE handle, bool decr_refcnt = true);
 
   /// Remove all the (@c ACE_HANDLE, @c ACE_Event_Handler) tuples.
   int unbind_all (void);
@@ -472,7 +471,7 @@ typedef ACE_Noop_Token ACE_DEV_POLL_TOKEN;
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 typedef ACE_Reactor_Token_T<ACE_DEV_POLL_TOKEN> ACE_Dev_Poll_Reactor_Token;
 
-class ACE_Reactor_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
+class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
 {
 public:
 
@@ -843,7 +842,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. Returns the number of notifications
+   * ACE_Event_Handler object. Returns the number of notifications
    * purged. Returns -1 on error.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler * = 0,
@@ -1179,14 +1178,14 @@ protected:
     /// Constructor that will grab the token for us
     Token_Guard (ACE_Dev_Poll_Reactor_Token &token);
 
-    /// Destructor. This will release the token if it hasnt been
+    /// Destructor. This will release the token if it hasn't been
     /// released till this point
     ~Token_Guard (void);
 
     /// Release the token ..
     void release_token (void);
 
-    /// Returns whether the thread that created this object ownes the
+    /// Returns whether the thread that created this object owns the
     /// token or not.
     int is_owner (void);
 
@@ -1203,18 +1202,20 @@ protected:
     int acquire (ACE_Time_Value *max_wait = 0);
 
   private:
+
+    Token_Guard (void);
+
+  private:
+
     /// The Reactor token.
     ACE_Dev_Poll_Reactor_Token &token_;
 
     /// Flag that indicate whether the thread that created this object
     /// owns the token or not. A value of 0 indicates that this class
-    /// hasnt got the token (and hence the thread) and a value of 1
+    /// hasn't got the token (and hence the thread) and a value of 1
     /// vice-versa.
     int owner_;
 
-  private:
-
-    ACE_UNIMPLEMENTED_FUNC (Token_Guard (void))
   };
 
 };
@@ -1267,6 +1268,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "ace/Dev_Poll_Reactor.inl"
diff --git a/ace/Dev_Poll_Reactor.inl b/ace/Dev_Poll_Reactor.inl
index 0d99c764c01..b7034e07333 100644
--- a/ace/Dev_Poll_Reactor.inl
+++ b/ace/Dev_Poll_Reactor.inl
@@ -4,6 +4,8 @@
 
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Dev_Poll_Event_Tuple::ACE_Dev_Poll_Event_Tuple (void)
   : event_handler (0),
@@ -222,3 +224,5 @@ ACE_Dev_Poll_Reactor::Token_Guard::is_owner (void)
 {
   return this->owner_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dirent.h b/ace/Dirent.h
index 5cda1c442fb..c31f8cc20cb 100644
--- a/ace/Dirent.h
+++ b/ace/Dirent.h
@@ -25,6 +25,8 @@
 
 #include "ace/OS_NS_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dirent
  *
@@ -68,15 +70,15 @@ public:
    * update the st_atime field of the directory each time the
    * directory is actually read.
    */
-  dirent *read (void);
+  ACE_DIRENT *read (void);
 
   /**
    * Has the equivalent functionality as <readdir> except that an
    * <entry> and <result> buffer must be supplied by the caller to
    * store the result.
    */
-  int read (struct dirent *entry,
-            struct dirent **result);
+  int read (struct ACE_DIRENT *entry,
+            struct ACE_DIRENT **result);
 
   // = Manipulators.
   /// Returns the current location associated with the directory
@@ -110,6 +112,8 @@ private:
   ACE_DIR *dirp_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Dirent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Dirent.inl b/ace/Dirent.inl
index c75c79fd320..0a8f0b9e6e4 100644
--- a/ace/Dirent.inl
+++ b/ace/Dirent.inl
@@ -1,15 +1,18 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
-ACE_Dirent::open (const ACE_TCHAR *dirname) 
+ACE_Dirent::open (const ACE_TCHAR *dirname)
 {
   // If the directory stream is already open, close it to prevent
   // possible resource leaks.
 
-  if (this->dirp_ != 0) 
+  if (this->dirp_ != 0)
     {
       ACE_OS::closedir (this->dirp_);
       this->dirp_ = 0;
@@ -23,38 +26,38 @@ ACE_Dirent::open (const ACE_TCHAR *dirname)
     return 0;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ACE_Dirent::ACE_Dirent (void)
   : dirp_ (0)
 {
 }
 
-ACE_INLINE 
-ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) 
+ACE_INLINE
+ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname)
   : dirp_ (0)
 {
   if (this->open (dirname) == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"), 
+                ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_Dirent::ACE_Dirent")));
 }
 
-ACE_INLINE 
+ACE_INLINE
 ACE_Dirent::~ACE_Dirent (void)
 {
   if (this->dirp_ != 0)
     ACE_OS::closedir (this->dirp_);
 }
 
-ACE_INLINE dirent *
+ACE_INLINE ACE_DIRENT *
 ACE_Dirent::read (void)
 {
   return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0;
 }
 
 ACE_INLINE int
-ACE_Dirent::read (struct dirent *entry,
-                  struct dirent **result)
+ACE_Dirent::read (struct ACE_DIRENT *entry,
+                  struct ACE_DIRENT **result)
 {
   return this->dirp_
          ? ACE_OS::readdir_r (this->dirp_, entry, result)
@@ -64,7 +67,7 @@ ACE_Dirent::read (struct dirent *entry,
 ACE_INLINE void
 ACE_Dirent::close (void)
 {
-  if (this->dirp_ != 0) 
+  if (this->dirp_ != 0)
     {
       ACE_OS::closedir (this->dirp_);
 
@@ -93,3 +96,4 @@ ACE_Dirent::tell (void)
   return this->dirp_ ? ACE_OS::telldir (this->dirp_) : 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dirent_Selector.cpp b/ace/Dirent_Selector.cpp
index c4690ee88e4..0788c8d891b 100644
--- a/ace/Dirent_Selector.cpp
+++ b/ace/Dirent_Selector.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            Dirent_Selector,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Construction/Destruction
 
 ACE_Dirent_Selector::ACE_Dirent_Selector (void)
@@ -29,9 +31,9 @@ ACE_Dirent_Selector::~ACE_Dirent_Selector (void)
 
 int
 ACE_Dirent_Selector::open (const ACE_TCHAR *dir,
-                           int (*sel)(const dirent *d),
-                           int (*cmp) (const dirent **d1,
-                                       const dirent **d2))
+                           int (*sel)(const ACE_DIRENT *d),
+                           int (*cmp) (const ACE_DIRENT **d1,
+                                       const ACE_DIRENT **d2))
 {
   n_ = ACE_OS::scandir (dir, &this->namelist_, sel, cmp);
   return n_;
@@ -54,3 +56,5 @@ ACE_Dirent_Selector::close (void)
   this->namelist_ = 0;
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dirent_Selector.h b/ace/Dirent_Selector.h
index 8985e4a930a..89b2eead630 100644
--- a/ace/Dirent_Selector.h
+++ b/ace/Dirent_Selector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #include "ace/os_include/os_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dirent_Selector
  *
@@ -43,7 +45,7 @@ public:
   int length (void) const;
 
   /// Return the entry at @a index.
-  dirent *operator[] (const int index) const;
+  ACE_DIRENT *operator[] (const int index) const;
 
   /// Free up resources.
   int close (void);
@@ -51,17 +53,19 @@ public:
   /// Open the directory @a dir and populate the <namelist_> array with
   /// directory entries that match the @a selector and @a comparator.
   int open (const ACE_TCHAR *dir,
-            int (*selector)(const dirent *d) = 0,
-            int (*comparator)(const dirent **d1, const dirent **d2) = 0);
+            int (*selector)(const ACE_DIRENT *d) = 0,
+            int (*comparator)(const ACE_DIRENT **d1, const ACE_DIRENT **d2) = 0);
 
 protected:
   /// Ptr to the namelist array.
-  dirent **namelist_;
+  ACE_DIRENT **namelist_;
 
-  /// # of entries in the array.
+  /// Number of entries in the array.
   int n_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Dirent_Selector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Dirent_Selector.inl b/ace/Dirent_Selector.inl
index 894971076ed..7c42f46b9be 100644
--- a/ace/Dirent_Selector.inl
+++ b/ace/Dirent_Selector.inl
@@ -1,14 +1,19 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Dirent_Selector::length (void) const
 {
   return n_;
 }
 
-ACE_INLINE dirent *
+ACE_INLINE ACE_DIRENT *
 ACE_Dirent_Selector::operator[] (const int n) const
 {
   return this->namelist_[n];
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index 380be07f857..b601496f3b6 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(ace, Dump, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementations (very simple for now...)
 
 ACE_Dumpable::~ACE_Dumpable (void)
@@ -135,3 +137,5 @@ ACE_ODB::remove_object (const void *this_ptr)
 }
 
 ACE_ODB *ACE_ODB::instance_ = 0;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dump.h b/ace/Dump.h
index aff3faab9a9..7c792f0db66 100644
--- a/ace/Dump.h
+++ b/ace/Dump.h
@@ -58,6 +58,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dumpable
  *
@@ -161,6 +163,8 @@ private:
   int current_size_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Include the templates classes at this point.
 #include "ace/Dump_T.h"
 
diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp
index fe83085ee1a..3c789497eee 100644
--- a/ace/Dump_T.cpp
+++ b/ace/Dump_T.cpp
@@ -1,8 +1,9 @@
 // Dump_T.cpp
+//
 // $Id$
 
-#ifndef ACE_DUMP_T_C
-#define ACE_DUMP_T_C
+#ifndef ACE_DUMP_T_CPP
+#define ACE_DUMP_T_CPP
 
 #include "ace/Dump_T.h"
 #include "ace/Global_Macros.h"
@@ -12,7 +13,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Dump_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class Concrete>
 ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter (void)
@@ -42,4 +43,6 @@ ACE_Dumpable_Adapter<Concrete>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_DUMP_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_DUMP_T_CPP */
diff --git a/ace/Dump_T.h b/ace/Dump_T.h
index 7595526a562..561569765a4 100644
--- a/ace/Dump_T.h
+++ b/ace/Dump_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dumpable_Adapter
  *
@@ -53,6 +55,8 @@ private:
   const Concrete *this_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Some useful macros for conditionally compiling this feature...
 #if defined (ACE_NDEBUG)
 #define ACE_REGISTER_OBJECT(CLASS)
diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp
index fbab1172542..adeae242579 100644
--- a/ace/Dynamic.cpp
+++ b/ace/Dynamic.cpp
@@ -1,4 +1,3 @@
-// Dynamic.cpp
 // $Id$
 
 #include "ace/Dynamic.h"
@@ -13,8 +12,10 @@
 
 ACE_RCSID(ace, Dynamic, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Dynamic::ACE_Dynamic (void)
-  : is_dynamic_ (0)
+  : is_dynamic_ (false)
 {
   ACE_TRACE ("ACE_Dynamic::ACE_Dynamic");
 }
@@ -25,21 +26,9 @@ ACE_Dynamic::instance (void)
   return ACE_TSS_Singleton<ACE_Dynamic, ACE_SYNCH_NULL_MUTEX>::instance ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>;
-# if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
-    template class ACE_TSS<ACE_Dynamic>;
-# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #pragma instantiate ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>
-
-# if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
-    #pragma instantiate ACE_TSS<ACE_Dynamic>
-# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> *
   ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>::singleton_;
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index d6c3ab9466b..3c9f9aced43 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Dynamic
  *
@@ -46,8 +48,8 @@ public:
    */
   void set (void);
 
-  /// 1 if we were allocated dynamically, else 0.
-  int is_dynamic (void);
+  /// @c true if we were allocated dynamically, else @c false.
+  bool is_dynamic (void);
 
   /// Resets state flag.
   void reset (void);
@@ -60,9 +62,11 @@ private:
    * method is usually called in operator new and then checked and
    * reset in the constructor.
    */
-  int is_dynamic_;
+  bool is_dynamic_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Dynamic.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Dynamic.inl b/ace/Dynamic.inl
index 9d1595441d6..3f506bc51f4 100644
--- a/ace/Dynamic.inl
+++ b/ace/Dynamic.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Dynamic.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_Dynamic::~ACE_Dynamic (void)
@@ -13,11 +14,11 @@ ACE_INLINE void
 ACE_Dynamic::set (void)
 {
   // ACE_TRACE ("ACE_Dynamic::set");
-  this->is_dynamic_ = 1;
+  this->is_dynamic_ = true;
 }
 
-ACE_INLINE int
-ACE_Dynamic::is_dynamic ()
+ACE_INLINE bool
+ACE_Dynamic::is_dynamic (void)
 {
   // ACE_TRACE ("ACE_Dynamic::is_dynamic");
   return this->is_dynamic_;
@@ -27,5 +28,7 @@ ACE_INLINE void
 ACE_Dynamic::reset (void)
 {
   // ACE_TRACE ("ACE_Dynamic::reset");
-  this->is_dynamic_ = 0;
+  this->is_dynamic_ = false;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp
index 9178889675c..dd0d8d0c679 100644
--- a/ace/Dynamic_Service.cpp
+++ b/ace/Dynamic_Service.cpp
@@ -1,8 +1,7 @@
-// Dynamic_Service.cpp
 // $Id$
 
-#ifndef ACE_DYNAMIC_SERVICE_C
-#define ACE_DYNAMIC_SERVICE_C
+#ifndef ACE_DYNAMIC_SERVICE_CPP
+#define ACE_DYNAMIC_SERVICE_CPP
 
 #include "ace/Dynamic_Service.h"
 
@@ -16,14 +15,16 @@
 #include "ace/Dynamic_Service.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> TYPE *
 ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name)
 {
-  ACE_Service_Object *svc_obj =
+  ACE_Service_Object * svc_obj =
     static_cast<ACE_Service_Object *> (ACE_Dynamic_Service_Base::instance (name));
   return dynamic_cast<TYPE *> (svc_obj);
 }
 
-ACE_RCSID(ace, Dynamic_Service, "$Id$")
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_DYNAMIC_SERVICE_C */
+#endif /* ACE_DYNAMIC_SERVICE_CPP */
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index 2b678fb70f1..88ac4115c12 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -24,6 +24,8 @@
 
 #include "ace/Dynamic_Service_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Service_Object;
 
 /**
@@ -46,6 +48,8 @@ public:
   static TYPE* instance (const wchar_t *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Dynamic_Service.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Dynamic_Service.inl b/ace/Dynamic_Service.inl
index 3387ca51abb..108ddd32a09 100644
--- a/ace/Dynamic_Service.inl
+++ b/ace/Dynamic_Service.inl
@@ -1,8 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> ACE_INLINE TYPE *
 ACE_Dynamic_Service<TYPE>::instance (const ACE_ANTI_TCHAR *name)
 {
   return instance (ACE_TEXT_TO_TCHAR_IN (name));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dynamic_Service_Base.cpp b/ace/Dynamic_Service_Base.cpp
index 4f62b6de092..bec17fb079f 100644
--- a/ace/Dynamic_Service_Base.cpp
+++ b/ace/Dynamic_Service_Base.cpp
@@ -9,6 +9,7 @@ ACE_RCSID (ace,
            Dynamic_Service_Base,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 ACE_Dynamic_Service_Base::dump (void) const
@@ -39,6 +40,8 @@ ACE_Dynamic_Service_Base::instance (const ACE_TCHAR *name)
   if (type == 0)
     return 0;
 
-  void *obj = type->object ();
+  void * const obj = type->object ();
   return obj;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dynamic_Service_Base.h b/ace/Dynamic_Service_Base.h
index 2b80085f0e7..17b7c5dda2f 100644
--- a/ace/Dynamic_Service_Base.h
+++ b/ace/Dynamic_Service_Base.h
@@ -22,6 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Dynamic_Service_Base
@@ -42,5 +43,7 @@ protected:
   static void* instance (const ACE_TCHAR *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_DYNAMIC_SERVICE_BASE_H */
diff --git a/ace/Env_Value_T.cpp b/ace/Env_Value_T.cpp
index dcab4e0522c..788bf125fc5 100644
--- a/ace/Env_Value_T.cpp
+++ b/ace/Env_Value_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#if !defined (ACE_ENV_VALUE_T_C)
-#define ACE_ENV_VALUE_T_C
+#ifndef ACE_ENV_VALUE_T_CPP
+#define ACE_ENV_VALUE_T_CPP
 
 #include "ace/Env_Value_T.h"
 
@@ -9,6 +9,4 @@
 #include "ace/Env_Value_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Env_Value_T, "$Id$")
-
-#endif /* ACE_ENV_VALUE_T_C */
+#endif /* ACE_ENV_VALUE_T_CPP */
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index a88cca9d7e6..0a01705dfbb 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Env_Value
  *
@@ -77,6 +79,8 @@ private:
 /// Function to convert a string @a s into type @c T.
 template <class T> void ACE_Convert (const ACE_TCHAR *s, T &t);
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Env_Value_T.inl"
 #endif /* __ACE_INLINE__ */
@@ -85,73 +89,75 @@ template <class T> void ACE_Convert (const ACE_TCHAR *s, T &t);
 #include "ace/Env_Value_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Default calls a CTOR on type T of the form 'T::T(const char*)', but
-// users can feel free to create their own specialized conversion
-// functions if necessary, as shown below.  Note that for 'char*' the
-// default is used because a simple cast will be performed and no
-// conversion will be necessary.
-
-template <class T> inline void
-ACE_Convert (const ACE_TCHAR *s, T &t)
-{
-  t = T (s);
-}
-
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, ACE_TCHAR *&v)
 {
   v = (ACE_TCHAR *) s;
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, const ACE_TCHAR *&v)
 {
   v = (const ACE_TCHAR *) s;
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, short &si)
 {
   si = static_cast<short> (ACE_OS::strtol (s, 0, 10));
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, u_short &us)
 {
   us = static_cast <u_short> (ACE_OS::strtol (s, 0, 10));
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, u_int &i)
 {
   i = static_cast<u_int> (ACE_OS::strtol (s, 0, 10));
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, long &l)
 {
   l = ACE_OS::strtol (s, 0, 10);
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, int &i)
 {
   i = static_cast<int> (ACE_OS::strtol (s, 0, 10));
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, u_long &ul)
 {
   ul = ACE_OS::strtoul (s, 0, 10);
 }
 
-inline void
+template <> inline void
 ACE_Convert (const ACE_TCHAR *s, double &d)
 {
   d = ACE_OS::strtod (s, 0);
 }
 
+// Default calls a CTOR on type T of the form 'T::T(const char*)', but
+// users can feel free to create their own specialized conversion
+// functions if necessary, as shown above.  Note that for 'char*' the
+// default is used because a simple cast will be performed and no
+// conversion will be necessary.
+template <class T> inline void
+ACE_Convert (const ACE_TCHAR *s, T &t)
+{
+  t = T (s);
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("Env_Value_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
diff --git a/ace/Env_Value_T.inl b/ace/Env_Value_T.inl
index 6df7d7a8ce4..1af0296cf91 100644
--- a/ace/Env_Value_T.inl
+++ b/ace/Env_Value_T.inl
@@ -1,5 +1,8 @@
+// -*- C++ -*-
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE
 ACE_Env_Value<T>::operator T (void)
 {
@@ -25,8 +28,8 @@ template <class T> ACE_INLINE void
 ACE_Env_Value<T>::open (const ACE_TCHAR *varname,
                         const T &defval)
 {
-  varname_ = varname;
-  value_ = defval;
+  this->varname_ = varname;
+  this->value_ = defval;
   this->fetch_value ();
 }
 
@@ -41,10 +44,12 @@ ACE_Env_Value<T>::fetch_value (void)
 template <class T> ACE_INLINE const ACE_TCHAR*
 ACE_Env_Value<T>::varname (void) const
 {
-  return varname_;
+  return this->varname_;
 }
 
 template <class T> ACE_INLINE
 ACE_Env_Value<T>::~ACE_Env_Value (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Event.cpp b/ace/Event.cpp
index fde6f78840c..bc21465d27a 100644
--- a/ace/Event.cpp
+++ b/ace/Event.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(ace, Event, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Event::ACE_Event (int manual_reset,
                       int initial_state,
                       int type,
@@ -85,3 +87,5 @@ ACE_Event::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Event.h b/ace/Event.h
index 1a0070c2970..c4457a7dd9c 100644
--- a/ace/Event.h
+++ b/ace/Event.h
@@ -24,6 +24,8 @@
 
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Event
  *
@@ -130,6 +132,8 @@ private:
   const ACE_Event &operator= (const ACE_Event &rhs);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Event.inl b/ace/Event.inl
index fdb9b491650..188d7c202cf 100644
--- a/ace/Event.inl
+++ b/ace/Event.inl
@@ -1,6 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_event_t
 ACE_Event::handle (void) const
 {
@@ -13,3 +15,4 @@ ACE_Event::handle (ACE_event_t new_handle)
   this->handle_ = new_handle;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 5ea84a6c9a3..c0daee5bdba 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -6,6 +6,8 @@
 #include "ace/OS_Errno.h"
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
+/* Need to see if ACE_HAS_BUILTIN_ATOMIC_OP defined */
+#include "ace/Atomic_Op.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Event_Handler.inl"
@@ -13,15 +15,17 @@
 
 ACE_RCSID(ace, Event_Handler, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implement conceptually abstract virtual functions in the base class
 // so derived classes don't have to implement unused ones.
 
 ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r,
                                       int p)
-  : reference_count_ (1)
-  , priority_ (p)
-  , reactor_ (r)
-  , reference_counting_policy_ (Reference_Counting_Policy::DISABLED)
+  : reference_count_ (1),
+    priority_ (p),
+    reactor_ (r),
+    reference_counting_policy_ (Reference_Counting_Policy::DISABLED)
 {
   // ACE_TRACE ("ACE_Event_Handler::ACE_Event_Handler");
 }
@@ -244,23 +248,21 @@ ACE_Event_Handler::reference_counting_policy (void)
   return this->reference_counting_policy_;
 }
 
-#if !defined (ACE_HAS_WINCE)
+//#if !defined (ACE_HAS_WINCE)
 
 ACE_THR_FUNC_RETURN
 ACE_Event_Handler::read_adapter (void *args)
 {
   ACE_Event_Handler *this_ptr = static_cast<ACE_Event_Handler *> (args);
+  ACE_Reactor *r = this_ptr->reactor ();
 
-  ACE_HANDLE handle = this_ptr->get_handle ();
-  if (handle == ACE_INVALID_HANDLE)
-    handle = ACE_STDIN;
-
-  while (this_ptr->handle_input (handle) != -1)
+  while (this_ptr->handle_input (ACE_STDIN) != -1)
     continue;
 
-  this_ptr->handle_close (handle,
-                          ACE_Event_Handler::READ_MASK);
-  this_ptr->reactor ()->notify ();
+  this_ptr->handle_close (ACE_STDIN, ACE_Event_Handler::READ_MASK);
+  // It's possible for handle_close() to "delete this" so we need to
+  // cache the reactor pointer and use it here.
+  r->notify ();
 
   return 0;
 }
@@ -304,7 +306,7 @@ ACE_Event_Handler::remove_stdin_handler (ACE_Reactor *reactor,
 #endif /* ACE_WIN32 */
 }
 
-#endif /* ACE_HAS_WINCE */
+//#endif /* ACE_HAS_WINCE */
 
 ACE_Event_Handler_var::ACE_Event_Handler_var (void)
   : ptr_ (0)
@@ -404,3 +406,5 @@ ACE_Notification_Buffer::ACE_Notification_Buffer (ACE_Event_Handler *eh,
 {
   ACE_TRACE ("ACE_Notification_Buffer::ACE_Notification_Buffer");
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index c0aea234a72..b6b066cb379 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -24,6 +24,8 @@
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 class ACE_Message_Block;
 class ACE_Reactor;
@@ -123,7 +125,7 @@ public:
   virtual int handle_exit (ACE_Process *);
 
   /// Called when a <handle_*()> method returns -1 or when the
-  /// <remove_handler> method is called on an <ACE_Reactor>.  The
+  /// <remove_handler> method is called on an ACE_Reactor.  The
   /// <close_mask> indicates which event has triggered the
   /// <handle_close> method callback on a particular <handle>.
   virtual int handle_close (ACE_HANDLE handle,
@@ -143,16 +145,18 @@ public:
       /// The application takes responsibility of resuming the handler
       ACE_APPLICATION_RESUMES_HANDLER
     };
-  /* Called to figure out whether the handler needs to resumed by the
+  /**
+   * Called to figure out whether the handler needs to resumed by the
    * reactor or the application can take care of it. The default
    * value of 0 would be returned which would allow the reactor to
    * take care of resumption of the handler. The application can
    * return a value more than zero and decide to resume the handler
    * themseleves.
+   *
+   * @note This method is only useful for the ACE_TP_Reactor. Sad
+   * that we have to have this method in a class that is supposed to
+   * be used across different components in ACE.
    */
-  // @@ NOTE: This method is only useful for the ACE_TP_Reactor. Sad
-  // that we have to have this method in a class that is supposed to
-  // be used across different componets in ACE.
   virtual int resume_handler (void);
 
   virtual int handle_qos (ACE_HANDLE = ACE_INVALID_HANDLE);
@@ -168,14 +172,14 @@ public:
   /// Get only the reactor's timer related interface.
   virtual ACE_Reactor_Timer_Interface *reactor_timer_interface (void) const;
 
-#if !defined (ACE_HAS_WINCE)
+  //#if !defined (ACE_HAS_WINCE)
   /**
    * Used to read from non-socket ACE_HANDLEs in our own thread to
    * work around Win32 limitations that don't allow us to <select> on
    * non-sockets (such as ACE_STDIN).  This is commonly used in
    * situations where the Reactor is used to demultiplex read events
    * on ACE_STDIN on UNIX.  Note that <event_handler> must be a
-   * subclass of <ACE_Event_Handler>.  If the <get_handle> method of
+   * subclass of ACE_Event_Handler.  If the <get_handle> method of
    * this event handler returns <ACE_INVALID_HANDLE> we default to
    * reading from ACE_STDIN.
    */
@@ -194,7 +198,7 @@ public:
   /// Performs the inverse of the <register_stdin_handler> method.
   static int remove_stdin_handler (ACE_Reactor *reactor,
                                    ACE_Thread_Manager *thr_mgr);
-#endif /* ACE_HAS_WINCE */
+  //#endif /* ACE_HAS_WINCE */
 
   /// Reference count type.
   typedef long Reference_Count;
@@ -376,6 +380,8 @@ public:
   ACE_Reactor_Mask mask_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Event_Handler.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Event_Handler.inl b/ace/Event_Handler.inl
index d07de45a072..75f2cd12aa5 100644
--- a/ace/Event_Handler.inl
+++ b/ace/Event_Handler.inl
@@ -1,8 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Notification_Buffer::~ACE_Notification_Buffer (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Event_Handler_T.cpp b/ace/Event_Handler_T.cpp
index cbe9676a58e..51a03f62310 100644
--- a/ace/Event_Handler_T.cpp
+++ b/ace/Event_Handler_T.cpp
@@ -17,6 +17,7 @@
 #include "ace/Event_Handler_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T)
 
@@ -117,6 +118,8 @@ ACE_Event_Handler_T<T>::handle_signal (int signum, siginfo_t *s, ucontext_t *u)
   return this->sig_handler_ == 0 ? 0 : (this->op_handler_->*sig_handler_) (signum, s, u);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 
 #endif /* ACE_EVENT_HANDLER_T_CPP */
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 1352a65d486..71c97bcf4a8 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -22,6 +22,8 @@
 
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Event_Handler_T
  *
@@ -170,6 +172,8 @@ protected:
   GET_HANDLE get_handle_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Event_Handler_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Event_Handler_T.inl b/ace/Event_Handler_T.inl
index f5d85f862b5..5d2e31ab81e 100644
--- a/ace/Event_Handler_T.inl
+++ b/ace/Event_Handler_T.inl
@@ -2,9 +2,9 @@
 //
 // $Id$
 
-
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> ACE_INLINE void
 ACE_Event_Handler_T<T>::op_handler (T *op)
@@ -131,3 +131,5 @@ ACE_Event_Handler_T<T>::sig_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HA
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
   this->sig_handler_ = h;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp
index 89c6019e449..3f2a4c5115b 100644
--- a/ace/FIFO.cpp
+++ b/ace/FIFO.cpp
@@ -1,4 +1,3 @@
-// FIFO.cpp
 // $Id$
 
 #include "ace/FIFO.h"
@@ -15,6 +14,8 @@
 
 ACE_RCSID(ace, FIFO, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO)
 
 void
@@ -30,7 +31,7 @@ ACE_FIFO::dump (void) const
 }
 
 int
-ACE_FIFO::open (const ACE_TCHAR *r, int flags, int perms,
+ACE_FIFO::open (const ACE_TCHAR *r, int flags, mode_t perms,
                 LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO::open");
@@ -52,8 +53,8 @@ ACE_FIFO::open (const ACE_TCHAR *r, int flags, int perms,
 }
 
 ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name,
-		    int flags,
-		    int perms,
+                    int flags,
+                    mode_t perms,
                     LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO::ACE_FIFO");
@@ -79,3 +80,5 @@ ACE_FIFO::close (void)
     }
  return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO.h b/ace/FIFO.h
index 1b88db74a1d..066e3e98035 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //==========================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/IPC_SAP.h"
 #include "ace/os_include/os_limits.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FIFO
  *
@@ -39,7 +41,7 @@ class ACE_Export ACE_FIFO : public ACE_IPC_SAP
 public:
   /// Open up the named pipe on the <rendezvous> in accordance with the
   /// flags.
-  int open (const ACE_TCHAR *rendezvous, int flags, int perms,
+  int open (const ACE_TCHAR *rendezvous, int flags, mode_t perms,
             LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Close down the ACE_FIFO without removing the rendezvous point.
@@ -65,7 +67,7 @@ protected:
 
   /// Open up the named pipe on the <rendezvous> in accordance with the
   /// flags.
-  ACE_FIFO (const ACE_TCHAR *rendezvous, int flags, int perms,
+  ACE_FIFO (const ACE_TCHAR *rendezvous, int flags, mode_t perms,
             LPSECURITY_ATTRIBUTES sa = 0);
 
 private:
@@ -73,6 +75,8 @@ private:
   ACE_TCHAR rendezvous_[MAXPATHLEN + 1];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FIFO.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FIFO.inl b/ace/FIFO.inl
index 0c91ceaca3f..149ed11318b 100644
--- a/ace/FIFO.inl
+++ b/ace/FIFO.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// FIFO.i
-
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_FIFO::get_local_addr (const ACE_TCHAR *&r) const
 {
@@ -17,6 +18,8 @@ ACE_INLINE int
 ACE_FIFO::remove (void)
 {
   ACE_TRACE ("ACE_FIFO::remove");
-  int result = this->close ();
+  int const result = this->close ();
   return ACE_OS::unlink (this->rendezvous_) == -1 || result == -1 ? -1 : 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp
index 4aa92e29acd..50a39067bb0 100644
--- a/ace/FIFO_Recv.cpp
+++ b/ace/FIFO_Recv.cpp
@@ -1,4 +1,3 @@
-// FIFO_Recv.cpp
 // $Id$
 
 #include "ace/FIFO_Recv.h"
@@ -11,6 +10,8 @@
 
 ACE_RCSID(ace, FIFO_Recv, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
 
 void
@@ -43,9 +44,9 @@ ACE_FIFO_Recv::close (void)
 
 int
 ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name,
-		     int flags,
-		     int perms,
-		     int persistent,
+                     int flags,
+                     mode_t perms,
+                     int persistent,
                      LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Recv::open");
@@ -55,7 +56,7 @@ ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name,
   else if (this->disable (ACE_NONBLOCK) == -1)
     return -1;
   else if (persistent
-	   && (this->aux_handle_ = ACE_OS::open (fifo_name, O_WRONLY, 0, sa)) == ACE_INVALID_HANDLE)
+           && (this->aux_handle_ = ACE_OS::open (fifo_name, O_WRONLY, 0, sa)) == ACE_INVALID_HANDLE)
     return -1;
   else
     return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
@@ -68,18 +69,20 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (void)
 }
 
 ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name,
-			      int flags,
-			      int perms,
-			      int persistent,
+                              int flags,
+                              mode_t perms,
+                              int persistent,
                               LPSECURITY_ATTRIBUTES sa)
   : aux_handle_ (ACE_INVALID_HANDLE)
 {
   ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv");
 
   if (this->ACE_FIFO_Recv::open (fifo_name,
-				 flags,
-				 perms,
-				 persistent,
+                                 flags,
+                                 perms,
+                                 persistent,
                                  sa) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_FIFO_Recv")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index ea1b391edb9..fc4ec2222f3 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -25,6 +25,8 @@
 #include "ace/os_include/os_fcntl.h"
 #include "ace/Default_Constants.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FIFO_Recv
  *
@@ -41,14 +43,14 @@ public:
   /// Open up a bytestream named pipe for reading.
   ACE_FIFO_Recv (const ACE_TCHAR *rendezvous,
                  int flags = O_CREAT | O_RDONLY,
-                 int perms = ACE_DEFAULT_FILE_PERMS,
+                 mode_t perms = ACE_DEFAULT_FILE_PERMS,
                  int persistent = 1,
                  LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Open up a bytestream named pipe for reading.
   int open (const ACE_TCHAR *rendezvous,
             int flags = O_CREAT | O_RDONLY,
-            int perms = ACE_DEFAULT_FILE_PERMS,
+            mode_t perms = ACE_DEFAULT_FILE_PERMS,
             int persistent = 1,
             LPSECURITY_ATTRIBUTES sa = 0);
 
@@ -72,6 +74,8 @@ private:
   ACE_HANDLE aux_handle_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FIFO_Recv.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FIFO_Recv.inl b/ace/FIFO_Recv.inl
index 5817a486624..b5cf96cb56d 100644
--- a/ace/FIFO_Recv.inl
+++ b/ace/FIFO_Recv.inl
@@ -1,11 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// FIFO_Recv.i
-
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_FIFO_Recv::recv (void *buf, size_t len)
 {
@@ -19,3 +20,5 @@ ACE_FIFO_Recv::recv_n (void *buf, size_t n)
   ACE_TRACE ("ACE_FIFO_Recv::recv_n");
   return ACE::recv_n (this->get_handle (), buf, n);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp
index de6055f5707..7aa5b1d6721 100644
--- a/ace/FIFO_Recv_Msg.cpp
+++ b/ace/FIFO_Recv_Msg.cpp
@@ -1,4 +1,3 @@
-// FIFO_Recv_Msg.cpp
 // $Id$
 
 #include "ace/FIFO_Recv_Msg.h"
@@ -11,6 +10,8 @@
 
 ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg)
 
 void
@@ -28,17 +29,17 @@ ACE_FIFO_Recv_Msg::dump (void) const
 
 int
 ACE_FIFO_Recv_Msg::open (const ACE_TCHAR *fifo_name,
-			 int flags,
-			 int perms,
-			 int persistent,
+                         int flags,
+                         mode_t perms,
+                         int persistent,
                          LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::open");
 
   return ACE_FIFO_Recv::open (fifo_name,
-			      flags,
-			      perms,
-			      persistent,
+                              flags,
+                              perms,
+                              persistent,
                               sa);
 }
 
@@ -48,17 +49,19 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (void)
 }
 
 ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name,
-				      int flags,
-				      int perms,
-				      int persistent,
+                                      int flags,
+                                      mode_t perms,
+                                      int persistent,
                                       LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg");
 
   if (this->ACE_FIFO_Recv_Msg::open (fifo_name,
-				     flags,
-				     perms,
-				     persistent,
+                                     flags,
+                                     perms,
+                                     persistent,
                                      sa) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_FIFO_Recv_Msg")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index cc35bc22423..b1c7afe3eb3 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls
 class ACE_Str_Buf;
 
@@ -50,14 +52,14 @@ public:
   /// Open up a record-oriented named pipe for reading.
   ACE_FIFO_Recv_Msg (const ACE_TCHAR *rendezvous,
                      int flags = O_CREAT | O_RDONLY,
-                     int perms = ACE_DEFAULT_FILE_PERMS,
+                     mode_t perms = ACE_DEFAULT_FILE_PERMS,
                      int persistent = 1,
                      LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Open up a record-oriented named pipe for reading.
   int open (const ACE_TCHAR *rendezvous,
             int flags = O_CREAT | O_RDONLY,
-            int perms = ACE_DEFAULT_FILE_PERMS,
+            mode_t perms = ACE_DEFAULT_FILE_PERMS,
             int persistent = 1,
             LPSECURITY_ATTRIBUTES sa = 0);
 
@@ -126,6 +128,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FIFO_Recv_Msg.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FIFO_Recv_Msg.inl b/ace/FIFO_Recv_Msg.inl
index c5a81e02a62..bab21a7e20e 100644
--- a/ace/FIFO_Recv_Msg.inl
+++ b/ace/FIFO_Recv_Msg.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-// FIFO_Recv_Msg.i
-
 #include "ace/Min_Max.h"
 #include "ace/OS_NS_stropts.h"
 
@@ -11,6 +9,8 @@
 #include "ace/OS_NS_unistd.h"
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
 {
@@ -26,8 +26,8 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
     return recv_msg.len;
 #else /* Do the ol' 2-read trick... */
   if (ACE_OS::read (this->get_handle (),
-		    (char *) &recv_msg.len,
-		    sizeof recv_msg.len) != sizeof recv_msg.len)
+                    (char *) &recv_msg.len,
+                    sizeof recv_msg.len) != sizeof recv_msg.len)
     return -1;
   else
     {
@@ -77,8 +77,8 @@ ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len)
 #if defined (ACE_HAS_STREAM_PIPES)
 ACE_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data,
-			 ACE_Str_Buf *cntl,
-			 int *flags)
+                         ACE_Str_Buf *cntl,
+                         int *flags)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::recv");
   if (ACE_OS::getmsg (this->get_handle (),
@@ -92,9 +92,9 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data,
 
 ACE_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (int *band,
-			 ACE_Str_Buf *data,
-			 ACE_Str_Buf *cntl,
-			 int *flags)
+                         ACE_Str_Buf *data,
+                         ACE_Str_Buf *cntl,
+                         int *flags)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::recv");
   if (ACE_OS::getpmsg (this->get_handle (),
@@ -107,3 +107,5 @@ ACE_FIFO_Recv_Msg::recv (int *band,
     return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len);
 }
 #endif /* ACE_HAS_STREAM_PIPES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp
index 9e347ef67ee..c29871430ed 100644
--- a/ace/FIFO_Send.cpp
+++ b/ace/FIFO_Send.cpp
@@ -1,4 +1,3 @@
-// FIFO_Send.cpp
 // $Id$
 
 #include "ace/FIFO_Send.h"
@@ -10,6 +9,8 @@
 
 ACE_RCSID(ace, FIFO_Send, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send)
 
 void
@@ -29,7 +30,7 @@ ACE_FIFO_Send::ACE_FIFO_Send (void)
 int
 ACE_FIFO_Send::open (const ACE_TCHAR *rendezvous_name,
                      int flags,
-                     int perms,
+                     mode_t perms,
                      LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send::open");
@@ -41,7 +42,7 @@ ACE_FIFO_Send::open (const ACE_TCHAR *rendezvous_name,
 
 ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name,
                               int flags,
-                              int perms,
+                              mode_t perms,
                               LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send");
@@ -53,3 +54,5 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 125f1a42e15..45e02c87c38 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -25,6 +25,8 @@
 #include "ace/os_include/os_fcntl.h"
 #include "ace/Default_Constants.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FIFO_Send
  *
@@ -40,13 +42,13 @@ public:
   /// Open up a bytestream named pipe for writing.
   ACE_FIFO_Send (const ACE_TCHAR *rendezvous,
                  int flags = O_WRONLY,
-                 int perms = ACE_DEFAULT_FILE_PERMS,
+                 mode_t perms = ACE_DEFAULT_FILE_PERMS,
                  LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Open up a bytestream named pipe for writing.
   int open (const ACE_TCHAR *rendezvous,
             int flags = O_WRONLY,
-            int perms = ACE_DEFAULT_FILE_PERMS,
+            mode_t perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Send <buf> of up to <len> bytes.
@@ -62,6 +64,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FIFO_Send.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FIFO_Send.inl b/ace/FIFO_Send.inl
index eb503d9b831..12491058e2c 100644
--- a/ace/FIFO_Send.inl
+++ b/ace/FIFO_Send.inl
@@ -1,11 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// FIFO_Send.i
-
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_FIFO_Send::send (const void *buf, size_t len)
 {
@@ -19,3 +20,5 @@ ACE_FIFO_Send::send_n (const void *buf, size_t n)
   ACE_TRACE ("ACE_FIFO_Send::send_n");
   return ACE::send_n (this->get_handle (), buf, n);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp
index 1575f7ae98c..f39c5d865e9 100644
--- a/ace/FIFO_Send_Msg.cpp
+++ b/ace/FIFO_Send_Msg.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(ace, FIFO_Send_Msg, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg)
 
 void
@@ -57,8 +59,8 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (void)
 
 int
 ACE_FIFO_Send_Msg::open (const ACE_TCHAR *fifo_name,
-			 int flags,
-			 int perms,
+                         int flags,
+                         mode_t perms,
                          LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::open");
@@ -66,11 +68,13 @@ ACE_FIFO_Send_Msg::open (const ACE_TCHAR *fifo_name,
 }
 
 ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name,
-				      int flags,
-				      int perms,
+                                      int flags,
+                                      mode_t perms,
                                       LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg");
   if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_FIFO_Send_Msg")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index b7f0e104177..8272ec6c819 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -25,6 +25,8 @@
 #  include "ace/OS_NS_stropts.h"
 #endif /* ACE_HAS_STREAM_PIPES */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Decls
 class ACE_Str_Buf;
 
@@ -44,13 +46,13 @@ public:
   /// Open up a record-oriented named pipe for writing.
   ACE_FIFO_Send_Msg (const ACE_TCHAR *rendezvous,
                      int flags = O_WRONLY,
-                     int perms = ACE_DEFAULT_FILE_PERMS,
+                     mode_t perms = ACE_DEFAULT_FILE_PERMS,
                      LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Open up a record-oriented named pipe for writing.
   int open (const ACE_TCHAR *rendezvous,
             int flags = O_WRONLY,
-            int perms = ACE_DEFAULT_FILE_PERMS,
+            mode_t perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Send <buf> of up to <len> bytes.
@@ -79,6 +81,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FIFO_Send_Msg.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FIFO_Send_Msg.inl b/ace/FIFO_Send_Msg.inl
index 34bb88aabc3..74392656597 100644
--- a/ace/FIFO_Send_Msg.inl
+++ b/ace/FIFO_Send_Msg.inl
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (const void *buf, size_t len)
 {
@@ -16,8 +18,8 @@ ACE_FIFO_Send_Msg::send (const void *buf, size_t len)
 #if defined (ACE_HAS_STREAM_PIPES)
 ACE_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data,
-			 const ACE_Str_Buf *cntl,
-			 int flags)
+                         const ACE_Str_Buf *cntl,
+                         int flags)
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::send");
   if (ACE_OS::putmsg (this->get_handle (),
@@ -31,9 +33,9 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data,
 
 ACE_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (int band,
-			 const ACE_Str_Buf *data,
-			 const ACE_Str_Buf *cntl,
-			 int flags)
+                         const ACE_Str_Buf *data,
+                         const ACE_Str_Buf *cntl,
+                         int flags)
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::send");
 
@@ -47,3 +49,5 @@ ACE_FIFO_Send_Msg::send (int band,
     return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len);
 }
 #endif /* ACE_HAS_STREAM_PIPES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index de7c294cc6e..d2578b42a04 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -15,6 +15,8 @@
 
 ACE_RCSID(ace, FILE, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE)
 
 void
@@ -145,3 +147,5 @@ ACE_FILE::unlink (void)
 
   return ACE_OS::unlink (this->addr_.get_path_name ());
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE.h b/ace/FILE.h
index 9291e24dd61..ba791f46428 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -35,6 +35,8 @@
 #define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr
 #endif /* ACE_TEMPLATE_TYPEDEFS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FILE_Info
  *
@@ -127,6 +129,8 @@ protected:
   ACE_FILE_Addr addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FILE.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FILE.inl b/ace/FILE.inl
index 934f5d7aa98..fdd65029d3a 100644
--- a/ace/FILE.inl
+++ b/ace/FILE.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_FILE::disable (int signum) const
 {
@@ -12,3 +15,4 @@ ACE_FILE::disable (int signum) const
 #endif /* ACE_WIN32 */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 6378b9aefa5..09d87c0d9b1 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -13,6 +13,8 @@
 
 ACE_RCSID(ace, FILE_Addr, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Addr)
 
 ACE_FILE_Addr::ACE_FILE_Addr (void)
@@ -123,3 +125,4 @@ ACE_FILE_Addr::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h
index c1955e7994a..815319a834b 100644
--- a/ace/FILE_Addr.h
+++ b/ace/FILE_Addr.h
@@ -24,6 +24,8 @@
 #include "ace/Flag_Manip.h"
 #include "ace/os_include/os_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FILE_Addr
  *
@@ -78,6 +80,8 @@ private:
   ACE_TCHAR filename_[MAXPATHLEN + 1];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FILE_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FILE_Addr.inl b/ace/FILE_Addr.inl
index cf6432bcefa..e03cd2ab156 100644
--- a/ace/FILE_Addr.inl
+++ b/ace/FILE_Addr.inl
@@ -5,6 +5,8 @@
 
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Compare two addresses for equality.
 
 ACE_INLINE bool
@@ -18,7 +20,7 @@ ACE_FILE_Addr::operator == (const ACE_FILE_Addr &sap) const
 ACE_INLINE bool
 ACE_FILE_Addr::operator != (const ACE_FILE_Addr &sap) const
 {
-  return !((*this) == sap);	// This is lazy, of course... ;-)
+  return !((*this) == sap);     // This is lazy, of course... ;-)
 }
 
 // Return the path name used for the rendezvous point.
@@ -28,3 +30,5 @@ ACE_FILE_Addr::get_path_name (void) const
 {
   return this->filename_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index b1854e54b17..cc471d5ce24 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(ace, FILE_Connector, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector)
 
 void
@@ -84,3 +86,5 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
   new_io.set_handle (handle);
   return handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index f59f13f4413..038f97ee5a1 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FILE_Connector
  *
@@ -103,6 +105,8 @@ public:
   typedef ACE_FILE_IO PEER_STREAM;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FILE_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FILE_Connector.inl b/ace/FILE_Connector.inl
index 5a3e909072d..7fbc9db5b33 100644
--- a/ace/FILE_Connector.inl
+++ b/ace/FILE_Connector.inl
@@ -1,22 +1,23 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// FILE_Connector.i
-
 // Creates a Local ACE_FILE.
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
-					const ACE_FILE_Addr &remote_sap,
-					ACE_Time_Value *timeout,
-					const ACE_Addr &local_sap,
-					int reuse_addr,
-					int flags,
-					int perms)
+                                        const ACE_FILE_Addr &remote_sap,
+                                        ACE_Time_Value *timeout,
+                                        const ACE_Addr &local_sap,
+                                        int reuse_addr,
+                                        int flags,
+                                        int perms)
 {
   ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector");
   if (this->connect (new_io, remote_sap, timeout, local_sap,
-		     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
+                     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("address %s, %p\n"),
@@ -31,3 +32,5 @@ ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle)
   // Nothing to do here since the handle is not a socket
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 7528447b7fd..29d818f4f10 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -1,4 +1,3 @@
-// FILE_IO.cpp
 // $Id$
 
 #include "ace/FILE_IO.h"
@@ -6,6 +5,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_Memory.h"
+#include "ace/Truncate.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/FILE_IO.inl"
@@ -13,6 +13,8 @@
 
 ACE_RCSID(ace, FILE_IO, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO)
 
 void
@@ -44,7 +46,7 @@ ACE_FILE_IO::send (size_t n, ...) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   va_list argp;
-  size_t total_tuples = n / 2;
+  int total_tuples = ACE_Utils::Truncate (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -56,7 +58,7 @@ ACE_FILE_IO::send (size_t n, ...) const
 
   va_start (argp, n);
 
-  for (size_t i = 0; i < total_tuples; i++)
+  for (int i = 0; i < total_tuples; i++)
     {
       iovp[i].iov_base = va_arg (argp, char *);
       iovp[i].iov_len  = va_arg (argp, int);
@@ -83,7 +85,7 @@ ACE_FILE_IO::recv (size_t n, ...) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
   va_list argp;
-  size_t total_tuples = n / 2;
+  int total_tuples = ACE_Utils::Truncate (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -95,7 +97,7 @@ ACE_FILE_IO::recv (size_t n, ...) const
 
   va_start (argp, n);
 
-  for (size_t i = 0; i < total_tuples; i++)
+  for (int i = 0; i < total_tuples; i++)
     {
       iovp[i].iov_base = va_arg (argp, char *);
       iovp[i].iov_len  = va_arg (argp, int);
@@ -136,3 +138,5 @@ ACE_FILE_IO::recvv (iovec *io_vec)
   else
     return length;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 0bc7c98e187..ada2266c618 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -30,6 +30,8 @@
 #  include "ace/OS_NS_stropts.h"
 #endif /* ACE_HAS_STREAM_PIPES */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Message_Block;
 class ACE_Time_Value;
@@ -158,6 +160,8 @@ public:
   typedef ACE_FILE_Addr PEER_ADDR;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/FILE_IO.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/FILE_IO.inl b/ace/FILE_IO.inl
index a55024798b0..7db33a0c717 100644
--- a/ace/FILE_IO.inl
+++ b/ace/FILE_IO.inl
@@ -1,12 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// FILE_IO.i
-
 #include "ace/ACE.h"
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_FILE_IO::sendv_n (const iovec iov[], int n) const
 {
@@ -147,3 +148,5 @@ ACE_FILE_IO::recv (void *buf, size_t n,
 }
 
 #endif /* ACE_HAS_STREAM_PIPES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/File_Lock.cpp b/ace/File_Lock.cpp
index 5f227e5c4e8..038e0224820 100644
--- a/ace/File_Lock.cpp
+++ b/ace/File_Lock.cpp
@@ -9,6 +9,8 @@
 
 ACE_RCSID(ace, File_Lock, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 
 void
@@ -67,14 +69,4 @@ ACE_File_Lock::~ACE_File_Lock (void)
   this->remove (this->unlink_in_destructor_);
 }
 
-// These are instantiated both with and without ACE_HAS_THREADS.
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// template class ACE_Guard<ACE_File_Lock>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// #pragma instantiate ACE_Guard<ACE_File_Lock>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/File_Lock.h b/ace/File_Lock.h
index 4fc5ee2889e..686fee3e0df 100644
--- a/ace/File_Lock.h
+++ b/ace/File_Lock.h
@@ -14,12 +14,7 @@
 #define ACE_FILE_LOCK_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +22,8 @@
 
 #include "ace/OS_NS_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_File_Lock
  *
@@ -35,7 +32,7 @@
  * Allows us to "adapt" the UNIX file locking mechanisms to work
  * with all of our Guard stuff...
  */
-class ACE_Threads_Export ACE_File_Lock
+class ACE_Export ACE_File_Lock
 {
 public:
   /**
@@ -58,7 +55,7 @@ public:
                  int unlink_in_destructor = 1);
 
   /// Open the <filename> with <flags> and <mode> and set the result to
-  /// <handle_>.  
+  /// <handle_>.
   int open (const ACE_TCHAR *filename,
             int flags,
             mode_t mode = 0);
@@ -123,11 +120,11 @@ public:
    */
   int tryacquire_read (short whence = 0, off_t start = 0, off_t len = 1);
 
-  /// Get underlying <ACE_HANDLE> for the file.
+  /// Get underlying ACE_HANDLE for the file.
   ACE_HANDLE get_handle (void) const;
 
   /**
-   * Set underlying <ACE_HANDLE>.  Note that this method assumes
+   * Set underlying ACE_HANDLE.  Note that this method assumes
    * ownership of the <handle> and will close it down in <remove>.  If
    * you want the <handle> to stay open when <remove> is called make
    * sure to call <dup> on the <handle> before closing it. You are
@@ -163,6 +160,8 @@ private:
   ACE_File_Lock (const ACE_File_Lock &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/File_Lock.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/File_Lock.inl b/ace/File_Lock.inl
index a0dc79dcc7b..be9c149b8d8 100644
--- a/ace/File_Lock.inl
+++ b/ace/File_Lock.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_File_Lock::acquire_read (short whence, off_t start, off_t len)
 {
@@ -87,3 +90,5 @@ ACE_File_Lock::set_handle (ACE_HANDLE h)
   this->lock_.handle_ = h;
   this->removed_ = 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index ace8bc594a4..74c97688f8a 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -42,6 +42,8 @@ ACE_RCSID (ace,
 // static const int WCOPY_FLAGS = O_RDWR | O_CREAT | O_TRUNC;
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // static data members
 ACE_Filecache *ACE_Filecache::cvf_ = 0;
 
@@ -746,16 +748,4 @@ ACE_Filecache_Object::update (void) const
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>;
-template class ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Filecache.h b/ace/Filecache.h
index c6986bd465d..f6c1bef7b3b 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -28,6 +28,8 @@
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_sys_stat.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 enum ACE_Filecache_Flag
 {
   ACE_NOMAP = 0,
@@ -344,6 +346,7 @@ private:
   ACE_SYNCH_RW_MUTEX &lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
index 1eed0acf20d..f45ce67a994 100644
--- a/ace/FlReactor.cpp
+++ b/ace/FlReactor.cpp
@@ -6,12 +6,14 @@ ACE_RCSID(ace, FlReactor, "$Id$")
 
 #include /**/ <FL/Fl.h>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
 
 // Must be called with lock held
 ACE_FlReactor::ACE_FlReactor (size_t size,
-			      int restart,
-			      ACE_Sig_Handler *h)
+                              int restart,
+                              ACE_Sig_Handler *h)
   : ACE_Select_Reactor (size, restart, h)
 {
   // When the ACE_Select_Reactor is constructed it creates the notify
@@ -40,7 +42,7 @@ ACE_FlReactor::~ACE_FlReactor (void)
 
 int
 ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-					 ACE_Time_Value *max_wait_time)
+                                         ACE_Time_Value *max_wait_time)
 {
   ACE_TRACE ("ACE_FlReactor::wait_for_multiple_events");
   int nfound;
@@ -124,9 +126,9 @@ ACE_FlReactor::fl_io_proc (int fd, void* reactor)
     wait_set.ex_mask_.set_bit (handle);
 
   int result = ACE_OS::select (fd + 1,
-			       wait_set.rd_mask_,
-			       wait_set.wr_mask_,
-			       wait_set.ex_mask_, &zero);
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
 
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
@@ -134,11 +136,11 @@ ACE_FlReactor::fl_io_proc (int fd, void* reactor)
   if (result > 0)
     {
       if (wait_set.rd_mask_.is_set (handle))
-	dispatch_set.rd_mask_.set_bit (handle);
+        dispatch_set.rd_mask_.set_bit (handle);
       if (wait_set.wr_mask_.is_set (handle))
-	dispatch_set.wr_mask_.set_bit (handle);
+        dispatch_set.wr_mask_.set_bit (handle);
       if (wait_set.ex_mask_.is_set (handle))
-	dispatch_set.ex_mask_.set_bit (handle);
+        dispatch_set.ex_mask_.set_bit (handle);
 
       self->dispatch (1, dispatch_set);
     }
@@ -158,8 +160,8 @@ ACE_FlReactor::fl_timeout_proc (void* reactor)
 
 int
 ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_FlReactor::register_handler_i");
 
@@ -195,8 +197,8 @@ ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
 
 int
 ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::register_handler_i (handles,
                                                  handler,
@@ -205,7 +207,7 @@ ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
 
 int
 ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_FlReactor::remove_handler_i");
 
@@ -223,10 +225,10 @@ ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
 
 int
 ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::remove_handler_i (handles,
-					       mask);
+                                               mask);
 }
 
 // The following function ensures there's an Fl timeout for the first
@@ -271,9 +273,9 @@ ACE_FlReactor::reset_timer_interval
 
 long
 ACE_FlReactor::schedule_timer (ACE_Event_Handler *event_handler,
-			       const void *arg,
+                               const void *arg,
                 const ACE_Time_Value &delay,
-			       const ACE_Time_Value &interval)
+                               const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_FlReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
@@ -293,12 +295,12 @@ ACE_FlReactor::schedule_timer (ACE_Event_Handler *event_handler,
 
 int
 ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
-			     int dont_call_handle_close)
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_FlReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (handler,
-					dont_call_handle_close) == -1)
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -309,14 +311,14 @@ ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
 
 int
 ACE_FlReactor::cancel_timer (long timer_id,
-			     const void **arg,
-			     int dont_call_handle_close)
+                             const void **arg,
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_FlReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (timer_id,
-					arg,
-					dont_call_handle_close) == -1)
+                                        arg,
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -324,3 +326,5 @@ ACE_FlReactor::cancel_timer (long timer_id,
       return 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index b1813fdd9bd..75d88b0ab5c 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -28,6 +28,8 @@
 #include "ace/ACE_FlReactor_export.h"
 #include "ace/Select_Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_FlReactor
  *
@@ -102,5 +104,7 @@ private:
   ACE_FlReactor &operator = (const ACE_FlReactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_FLREACTOR_H */
diff --git a/ace/Flag_Manip.cpp b/ace/Flag_Manip.cpp
index e1b1c25b7a6..ee074a2d10d 100644
--- a/ace/Flag_Manip.cpp
+++ b/ace/Flag_Manip.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (ace,
            Flag_Manip,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Flags are file status flags to turn on.
 
 int
@@ -32,7 +34,7 @@ ACE::set_flags (ACE_HANDLE handle, int flags)
       // nonblocking argument (1)
       // blocking:            (0)
       {
-        u_long nonblock = 1;
+        int nonblock = 1;
         return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
       }
     default:
@@ -68,7 +70,7 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
       // nonblocking argument (1)
       // blocking:            (0)
       {
-        u_long nonblock = 0;
+        int nonblock = 0;
         return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
       }
     default:
@@ -89,3 +91,5 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
     return 0;
 #endif /* ACE_LACKS_FCNTL */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h
index 28646f98350..e1f3fc1d997 100644
--- a/ace/Flag_Manip.h
+++ b/ace/Flag_Manip.h
@@ -31,6 +31,7 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -47,6 +48,8 @@ namespace ACE
   ACE_NAMESPACE_INLINE_FUNCTION int get_flags (ACE_HANDLE handle);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Flag_Manip.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Flag_Manip.inl b/ace/Flag_Manip.inl
index 0009be56695..da24f2a1282 100644
--- a/ace/Flag_Manip.inl
+++ b/ace/Flag_Manip.inl
@@ -1,17 +1,19 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Return flags currently associated with handle.
-
 #include "ace/OS_NS_fcntl.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Return flags currently associated with handle.
 ACE_INLINE int
 ACE::get_flags (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE::get_flags");
 
 #if defined (ACE_LACKS_FCNTL)
-  // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
+  // ACE_OS::fcntl is not supported.  It
   // would be better to store ACE's notion of the flags
   // associated with the handle, but this works for now.
   ACE_UNUSED_ARG (handle);
@@ -20,3 +22,5 @@ ACE::get_flags (ACE_HANDLE handle)
   return ACE_OS::fcntl (handle, F_GETFL, 0);
 #endif /* ACE_LACKS_FCNTL */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Framework_Component.cpp b/ace/Framework_Component.cpp
index 6b035cc922e..17c112f06c9 100644
--- a/ace/Framework_Component.cpp
+++ b/ace/Framework_Component.cpp
@@ -15,6 +15,8 @@
 
 ACE_RCSID(ace, Framework_Component, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Framework_Component::~ACE_Framework_Component (void)
 {
   ACE_TRACE ("ACE_Framework_Component::~ACE_Framework_Component");
@@ -274,3 +276,5 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size)
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_Framework_Repository")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Framework_Component.h b/ace/Framework_Component.h
index 318867773ba..d0d2e6f89e2 100644
--- a/ace/Framework_Component.h
+++ b/ace/Framework_Component.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Framework_Component.h
@@ -8,7 +9,7 @@
  * A prototype mechanism that allows framework components, singletons
  * such as ACE_Reactor, ACE_Proactor, etc, to be registered with a
  * central repository managed by the <ACE_Object_Manager> or
- * <ACE_Service_Config> that will handle destruction.
+ * ACE_Service_Config that will handle destruction.
  *
  * This technique obviates changing ACE_Object_Manager and
  * ACE_Service_Config everytime a new framework is added.  Which also
@@ -47,6 +48,8 @@
 
 #define ACE_DEFAULT_FRAMEWORK_REPOSITORY_SIZE 1024
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Framework_Component
  *
@@ -71,6 +74,11 @@ protected:
   virtual ~ACE_Framework_Component (void);
 
 private:
+  // No copy possible
+  ACE_Framework_Component (const ACE_Framework_Component &);
+  void operator= (const ACE_Framework_Component &);
+
+private:
   /// Pointer to the actual component.
   const void *this_;
 
@@ -144,12 +152,13 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
-private:
-  // = Initialization and termination methods.
+protected:
 
   /// Initialize the repository.
   ACE_Framework_Repository (int size = ACE_Framework_Repository::DEFAULT_SIZE);
 
+private:
+
   /// Actually removes the dll components, must be called with locks held.
   int remove_dll_components_i (const ACE_TCHAR *dll_name);
 
@@ -157,6 +166,12 @@ private:
   /// order.
   void compact (void);
 
+  /// Disallow copying and assignment.
+  ACE_Framework_Repository (const ACE_Framework_Repository &);
+  ACE_Framework_Repository &operator= (const ACE_Framework_Repository &);
+
+private:
+
   /// Contains all the framework components.
   ACE_Framework_Component **component_vector_;
 
@@ -180,11 +195,10 @@ private:
   ACE_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
 
-  /// Don't allow these to be called.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository (const ACE_Framework_Repository &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository &operator= (const ACE_Framework_Repository &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Framework_Component.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Framework_Component.inl b/ace/Framework_Component.inl
index 2d3662642bd..6e6146114f7 100644
--- a/ace/Framework_Component.inl
+++ b/ace/Framework_Component.inl
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Framework_Component.inl
-
 #include "ace/ACE.h"
 #include "ace/Guard_T.h"
 
-ACE_INLINE 
-ACE_Framework_Component::ACE_Framework_Component (void *_this, 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+ACE_Framework_Component::ACE_Framework_Component (void *_this,
                                                   const ACE_TCHAR *dll_name,
                                                   const ACE_TCHAR *name)
   :  this_ (_this),
@@ -34,3 +35,5 @@ ACE_Framework_Repository::total_size (void) const
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
   return this->total_size_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Framework_Component_T.cpp b/ace/Framework_Component_T.cpp
index cbaf65463d8..509d6609daf 100644
--- a/ace/Framework_Component_T.cpp
+++ b/ace/Framework_Component_T.cpp
@@ -1,11 +1,11 @@
-// Framework_Component_T.cpp
 // $Id$
+
 #ifndef ACE_FRAMEWORK_COMPONENT_T_CPP
 #define ACE_FRAMEWORK_COMPONENT_T_CPP
 
 #include "ace/Framework_Component_T.h"
 
-ACE_RCSID(ace, Framework_Component_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class Concrete>
 ACE_Framework_Component_T<Concrete>::ACE_Framework_Component_T (Concrete *concrete)
@@ -28,4 +28,6 @@ ACE_Framework_Component_T<Concrete>::close_singleton (void)
   Concrete::close_singleton ();
 }
 
-#endif /*ACE_FRAWORK_COMPONENT_T_CPP*/
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_FRAMEWORK_COMPONENT_T_CPP */
diff --git a/ace/Framework_Component_T.h b/ace/Framework_Component_T.h
index 226fabbd432..13440ea88ae 100644
--- a/ace/Framework_Component_T.h
+++ b/ace/Framework_Component_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Framework_Component_T.h
@@ -18,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Framework_Component_T
  *
@@ -47,6 +50,8 @@ public:
   void close_singleton (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // This macro should be called in the instance() method
 // of the Concrete class that will be managed.  Along
 // with the appropriate template instantiation.
diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index d0d24e2ba05..60dfabafb1c 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -10,13 +10,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-// Empty constructor
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 ACE_Free_List<T>::~ACE_Free_List (void)
 {
-  // Nothing
 }
 
 // Default constructor that takes in a preallocation number
@@ -57,13 +55,13 @@ ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List (void)
 // elements withing and it pasts the high water mark, delete the
 // element)
 
-template <class T, class ACE_LOCK> void 
+template <class T, class ACE_LOCK> void
 ACE_Locked_Free_List<T, ACE_LOCK>::add (T *element)
 {
   ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   // Check to see that we not at the high water mark.
-  if (this->mode_ == ACE_PURE_FREE_LIST 
+  if (this->mode_ == ACE_PURE_FREE_LIST
       || this->size_ < this->hwm_)
     {
       element->set_next (this->free_list_);
@@ -102,7 +100,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::remove (void)
 
 // Returns the current size of the free list
 
-template <class T, class ACE_LOCK> size_t 
+template <class T, class ACE_LOCK> size_t
 ACE_Locked_Free_List<T, ACE_LOCK>::size (void)
 {
   return this->size_;
@@ -110,7 +108,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::size (void)
 
 // Resizes the free list to <newsize>
 
-template <class T, class ACE_LOCK> void 
+template <class T, class ACE_LOCK> void
 ACE_Locked_Free_List<T, ACE_LOCK>::resize (size_t newsize)
 {
   ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
@@ -120,7 +118,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::resize (size_t newsize)
     // Check to see if we grow or shrink
     if (newsize < this->size_)
       this->dealloc (this->size_ - newsize);
-    else 
+    else
       this->alloc (newsize - this->size_);
 }
 
@@ -154,4 +152,6 @@ ACE_Locked_Free_List<T, ACE_LOCK>::dealloc (size_t n)
     }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_FREE_LIST_CPP */
diff --git a/ace/Free_List.h b/ace/Free_List.h
index b229406c991..d16b5e92945 100644
--- a/ace/Free_List.h
+++ b/ace/Free_List.h
@@ -24,6 +24,8 @@
 #include "ace/Default_Constants.h"
 #include "ace/os_include/os_stddef.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Free_List
  *
@@ -96,14 +98,14 @@ public:
   /// Returns the current size of the free list.
   virtual size_t size (void);
 
-  /// Resizes the free list to <newsize>.
+  /// Resizes the free list to @a newsize.
   virtual void resize (size_t newsize);
 
 protected:
-  /// Allocates <n> extra nodes for the freelist.
+  /// Allocates @a n extra nodes for the freelist.
   virtual void alloc (size_t n);
 
-  /// Removes and frees <n> nodes from the freelist.
+  /// Removes and frees @a n nodes from the freelist.
   virtual void dealloc (size_t n);
 
   /// Free list operation mode, either ACE_FREE_LIST_WITH_POOL or
@@ -125,7 +127,7 @@ protected:
   /// Keeps track of the size of the list.
   size_t size_;
 
-  /// Synchronization variable for <ACE_Timer_Queue>.
+  /// Synchronization variable for ACE_Timer_Queue.
   ACE_LOCK mutex_;
 
 private:
@@ -134,6 +136,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Locked_Free_List<T, ACE_LOCK> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Free_List.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Functor.cpp b/ace/Functor.cpp
index b42375de277..3e943fe3d54 100644
--- a/ace/Functor.cpp
+++ b/ace/Functor.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -29,9 +28,6 @@
 //
 // ============================================================================
 
-#if !defined (ACE_FUNCTOR_C)
-#define ACE_FUNCTOR_C
-
 #include "ace/Functor_T.h"
 #include "ace/Functor.h"
 
@@ -41,12 +37,10 @@
 
 ACE_RCSID(ace, Functor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Command_Base::~ACE_Command_Base (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_FUNCTOR_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Functor.h b/ace/Functor.h
index 22f160adef5..9cf8f200336 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -41,6 +41,8 @@
 #include "ace/ACE_export.h"
 #include "ace/Basic_Types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////////////////////////
 // GOF Command Pattern Classes and Template Specializations //
 //////////////////////////////////////////////////////////////
@@ -125,6 +127,7 @@ public:
   unsigned long operator () (unsigned char t) const;
 };
 
+#if 0
 // @@ ADD HASHES FOR ACE TYPES
 
 /**
@@ -193,6 +196,117 @@ public:
 };
 
 // @@ DONE ADDING HASHES FOR ACE TYPES
+#endif
+
+/**
+ * @class ACE_Hash<short>
+ *
+ * @brief Function object for hashing a short number
+ */
+template<>
+class ACE_Export ACE_Hash<short>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (short t) const;
+};
+
+/**
+ * @class ACE_Hash<unsigned short>
+ *
+ * @brief Function object for hashing an unsigned short number
+ */
+template<>
+class ACE_Export ACE_Hash<unsigned short>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (unsigned short t) const;
+};
+
+/**
+ * @class ACE_Hash<int>
+ *
+ * @brief Function object for hashing an int number
+ */
+template<>
+class ACE_Export ACE_Hash<int>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (int t) const;
+};
+
+/**
+ * @class ACE_Hash<unsigned int>
+ *
+ * @brief Function object for hashing an unsigned int number
+ */
+template<>
+class ACE_Export ACE_Hash<unsigned int>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (unsigned int t) const;
+};
+
+/**
+ * @class ACE_Hash<long>
+ *
+ * @brief Function object for hashing a long number
+ */
+template<>
+class ACE_Export ACE_Hash<long>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (long t) const;
+};
+
+/**
+ * @class ACE_Hash<unsigned long>
+ *
+ * @brief Function object for hashing an unsigned long number
+ */
+template<>
+class ACE_Export ACE_Hash<unsigned long>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (unsigned long t) const;
+};
+
+#if !defined (ACE_LACKS_LONGLONG_T) && (ACE_SIZEOF_LONG < 8)
+/**
+ * @class ACE_Hash<ACE_INT64>
+ *
+ * @brief Function object for hashing a signed 64-bit number
+ */
+template<>
+class ACE_Export ACE_Hash<ACE_INT64>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (ACE_INT64 t) const;
+};
+#endif /* !ACE_LACKS_LONGLONG_T && ACE_SIZEOF_LONG < 8 */
+
+// We can do this even if ACE_LACKS_UNSIGNEDLONGLONG_T because there's an
+// emulation for it in ACE_U_LongLong.
+#if (ACE_SIZEOF_LONG < 8)
+/**
+ * @class ACE_Hash<ACE_UINT64>
+ *
+ * @brief Function object for hashing an unsigned 64-bit number
+ */
+template<>
+class ACE_Export ACE_Hash<ACE_UINT64>
+{
+public:
+  /// Simply returns t
+  unsigned long operator () (const ACE_UINT64 &t) const;
+};
+#endif /* ACE_SIZEOF_LONG < 8 */
 
 /**
  * @class ACE_Hash<const char *>
@@ -465,6 +579,9 @@ public:
                    const wchar_t *rhs) const;
 };
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Functor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Functor.inl b/ace/Functor.inl
index 99bc0af7216..c505ed328b3 100644
--- a/ace/Functor.inl
+++ b/ace/Functor.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // ============================================================================
@@ -7,7 +8,7 @@
 //    ace
 //
 // = FILENAME
-//    Functor.i
+//    Functor.inl
 //
 // = DESCRIPTION
 //    Inlinable method definitions for non-templatized classes
@@ -32,6 +33,8 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////////////////////////
 // GOF Command Pattern Classes and Template Specializations //
 //////////////////////////////////////////////////////////////
@@ -73,6 +76,7 @@ ACE_Hash<unsigned char>::operator () (unsigned char t) const
   return t;
 }
 
+#if 0
 ACE_INLINE unsigned long
 ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const
 {
@@ -106,7 +110,64 @@ ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const
   return static_cast<unsigned long> (t);
 #endif /* ACE_SIZEOF_LONG */
 }
+#endif
+
+ACE_INLINE unsigned long
+ACE_Hash<short>::operator () (short t) const
+{
+  return static_cast<unsigned long> (t);
+}
+
+ACE_INLINE unsigned long
+ACE_Hash<unsigned short>::operator () (unsigned short t) const
+{
+  return static_cast<unsigned long> (t);
+}
+
+ACE_INLINE unsigned long
+ACE_Hash<int>::operator () (int t) const
+{
+  return static_cast<unsigned long> (t);
+}
+
+ACE_INLINE unsigned long
+ACE_Hash<unsigned int>::operator () (unsigned int t) const
+{
+  return static_cast<unsigned long> (t);
+}
+
+ACE_INLINE unsigned long
+ACE_Hash<long>::operator () (long t) const
+{
+  return static_cast<unsigned long> (t);
+}
 
+ACE_INLINE unsigned long
+ACE_Hash<unsigned long>::operator () (unsigned long t) const
+{
+  return t;
+}
+
+// This #if needs to match the one in Functor.h
+#if !defined (ACE_LACKS_LONGLONG_T) && (ACE_SIZEOF_LONG < 8)
+ACE_INLINE unsigned long
+ACE_Hash<ACE_INT64>::operator () (ACE_INT64 t) const
+{
+  return static_cast<unsigned long> (t);
+}
+#endif /* !ACE_LACKS_LONGLONG_T && ACE_SIZEOF_LONG < 8 */
+
+#if (ACE_SIZEOF_LONG < 8)
+ACE_INLINE unsigned long
+ACE_Hash<ACE_UINT64>::operator () (const ACE_UINT64 &t) const
+{
+#if (ACE_SIZEOF_LONG == 4)
+  return ACE_U64_TO_U32 (t);
+#else
+  return static_cast<unsigned long> (t);
+#endif /* ACE_SIZEOF_LONG */
+}
+#endif /* !ACE_LACKS_UNSIGNEDLONGLONG_T */
 
 ACE_INLINE unsigned long
 ACE_Hash<const char *>::operator () (const char *t) const
@@ -220,3 +281,5 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Functor_String.h b/ace/Functor_String.h
index 2e84295ef76..4becd6c4cf0 100644
--- a/ace/Functor_String.h
+++ b/ace/Functor_String.h
@@ -11,7 +11,6 @@
  *   could be placed in Functor.h. But we don't want to couple string
  *   types to the rest of ACE+TAO. Hence they are placed in a seperate
  *   file.
- *
  */
 //==========================================================================
 #ifndef ACE_FUNCTOR_STRING_H
@@ -27,6 +26,8 @@
 #include "ace/ACE_export.h"
 #include "ace/SStringfwd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ////////////////////////////////////////////////////////////
 // STL-style Functor Classes and Template Specializations //
 ////////////////////////////////////////////////////////////
@@ -125,6 +126,9 @@ public:
                    const ACE_WString &rhs) const;
 };
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Functor_String.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Functor_String.inl b/ace/Functor_String.inl
index e2fcf99a036..a9d5f0597d6 100644
--- a/ace/Functor_String.inl
+++ b/ace/Functor_String.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/ACE.h"
 #include "ace/String_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE unsigned long
 ACE_Hash<ACE_CString>::operator () (const ACE_CString &t) const
 {
@@ -47,3 +50,5 @@ ACE_Less_Than<ACE_WString>::operator () (const ACE_WString &lhs,
   return (lhs < rhs);
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Functor_T.cpp b/ace/Functor_T.cpp
index c29f9029f75..53e8f170fc1 100644
--- a/ace/Functor_T.cpp
+++ b/ace/Functor_T.cpp
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
-#ifndef ACE_FUNCTOR_T_C
-#define ACE_FUNCTOR_T_C
+#ifndef ACE_FUNCTOR_T_CPP
+#define ACE_FUNCTOR_T_CPP
 
 #include "ace/Functor_T.h"
 
@@ -14,7 +13,7 @@
 #include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Functor_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Command_Callback)
 
@@ -45,5 +44,6 @@ ACE_Command_Callback<RECEIVER, ACTION>::execute (void *arg)
   return (receiver_.*action_) (arg);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_FUNCTOR_T_C */
+#endif /* ACE_FUNCTOR_T_CPP */
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index e960cad0d26..554820e3c0b 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -37,6 +37,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Functor_String.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////////////
 // GOF Command Pattern Templates //
 ///////////////////////////////////
@@ -136,6 +139,8 @@ public:
                     const TYPE &rhs) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Functor_T.inl b/ace/Functor_T.inl
index 51caa11825d..6441c091b76 100644
--- a/ace/Functor_T.inl
+++ b/ace/Functor_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> ACE_INLINE unsigned long
 ACE_Hash<TYPE>::operator () (const TYPE &t) const
 {
@@ -36,3 +38,5 @@ ACE_Less_Than<TYPE>::operator () (const TYPE &lhs,
 {
   return lhs < rhs;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Future.cpp b/ace/Future.cpp
index 2dc0fa5ddb8..3ca6f8225ba 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (ace, Future, "$Id$")
 #  include "ace/Guard_T.h"
 #  include "ace/Recursive_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_Future_Holder<T>::ACE_Future_Holder (void)
 {
@@ -425,5 +427,8 @@ ACE_Future<T>::get_rep ()
   return this->future_rep_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
+
 #endif /* ACE_FUTURE_CPP */
diff --git a/ace/Future.h b/ace/Future.h
index 9d1e0f7800b..607ac6e8d75 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -30,6 +30,8 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Condition_Recursive_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 template <class T> class ACE_Future_Holder;
 template <class T> class ACE_Future_Observer;
@@ -122,7 +124,7 @@ private:
   /**
    * Attaches the specified observer to a subject (i.e., the <ACE_Future_Rep>).
    * The update method of the specified subject will be invoked with a copy of
-   * the written-to <ACE_Future> as input when the result gets set.
+   * the written-to ACE_Future as input when the result gets set.
    *
    * Returns 0 if the observer is successfully attached, 1 if the
    * observer is already attached, and -1 if failures occur.
@@ -206,7 +208,7 @@ private:
   int ref_count_;
 
   typedef ACE_Future_Observer<T>
-	    OBSERVER;
+            OBSERVER;
 
   typedef ACE_Unbounded_Set<OBSERVER *>
         OBSERVER_COLLECTION;
@@ -371,6 +373,8 @@ private:
   FUTURE_REP *future_rep_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Future.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
index feac0b0d54f..d9b9e2a1ac9 100644
--- a/ace/Future_Set.cpp
+++ b/ace/Future_Set.cpp
@@ -1,4 +1,3 @@
-// Future.cpp
 // $Id$
 
 #ifndef ACE_FUTURE_SET_CPP
@@ -10,10 +9,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID (ace, Future_Set, "$Id$")
-
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue)
   : delete_queue_ (0)
@@ -119,8 +118,8 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future,
 
   // Remove the hash map entry with the specified future rep from our map.
   FUTURE_HOLDER *future_holder;
-  if ( this->future_map_.find (future_rep,
-                               future_holder) != -1 )
+  if (this->future_map_.find (future_rep,
+                              future_holder) != -1)
     {
       future = future_holder->item_;
       this->future_map_.unbind (future_rep);
@@ -131,5 +130,7 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_FUTURE_SET_CPP */
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index fcd17324d46..b51d1958c8b 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Future_Set
  *
@@ -74,17 +76,17 @@ public:
   /**
    * Wait up to <tv> time to get the <value>.  Note that <tv> must be
    * specified in absolute time rather than relative time.); get the
-   * next <ACE_Future> that is readable.  If <tv> = 0, the will block
+   * next ACE_Future that is readable.  If <tv> = 0, the will block
    * forever.
    *
    * If a readable future becomes available, then the input
-   * <ACE_Future> object param will be assigned with it and 1 will
-   * be returned.  If the <ACE_Future_Set> is empty (i.e. see definition
-   * of <ACE_Future_Set::is_empty>), then 0 is returned.
+   * ACE_Future object param will be assigned with it and 1 will
+   * be returned.  If the ACE_Future_Set is empty (i.e. see definition
+   * of ACE_Future_Set::is_empty()), then 0 is returned.
    *
-   * When a readable <ACE_Future> object is retrieved via the
-   * <ACE_Future_Set::next_readable> method, the <ACE_Future_Set> will
-   * remove that <ACE_Future> object from its list of subjects.
+   * When a readable ACE_Future object is retrieved via the
+   * ACE_Future_Set::next_readable() method, the ACE_Future_Set will
+   * remove that ACE_Future object from its list of subjects.
    */
   int next_readable (ACE_Future<T> &result,
                      ACE_Time_Value *tv = 0);
@@ -115,7 +117,7 @@ private:
                                   FUTURE_HOLDER *,
                                   FUTURE_REP_HASH,
                                   FUTURE_REP_COMPARE,
-			          ACE_Null_Mutex> FUTURE_HASH_MAP;
+                                  ACE_Null_Mutex> FUTURE_HASH_MAP;
 
   /// Map of <ACE_Futures>, subjects, which have not been written to by
   /// client's writer thread.
@@ -129,6 +131,8 @@ private:
   int delete_queue_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Future_Set.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index 52c9ad67b26..50e6d4fa07b 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -2,6 +2,10 @@
 
 #include "ace/Get_Opt.h"
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Get_Opt.inl"
+#endif /* __ACE_INLINE__ */
+
 ACE_RCSID (ace,
            Get_Opt,
            "$Id$")
@@ -75,3 +79,17 @@ ACE_RCSID (ace,
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * Templates cannot be exported. Only explicit instances can.
+ * This is also a way to restrict what instances will be
+ *  publicly available.
+ */
+#if !defined (__ACE_INLINE__)
+  template class ACE_Get_Arg_Opt< ACE_TCHAR >;
+#endif /* __ACE_INLINE__ */
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index c47951a3271..2237dd412f9 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -26,6 +26,8 @@
 #undef optarg
 #undef opterr
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  *  These definitions are for backward compatibility with previous versions.
  *  of ACE_Get_Arg_Opt.
@@ -40,7 +42,7 @@
  */
 
 template < typename CHAR_TYPE = char >
-class ACE_Get_Arg_Opt
+class ACE_Export ACE_Get_Arg_Opt
 {
 public:
   typedef CHAR_TYPE Char;
@@ -373,7 +375,7 @@ private:
                              int has_arg,
                              int val = 0);
 
-    /// Default dtor.
+    /// Dtor.
     ~ACE_Get_Opt_Long_Option (void);
 
     bool operator < (const ACE_Get_Opt_Long_Option &rhs);
@@ -413,6 +415,8 @@ private:
   /// Set last_option.
   void last_option (const String &s);
 
+private:
+
   /// Holds the option string.
   String *optstring_;
 
@@ -460,13 +464,19 @@ private:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
+  // Disallow copying and assignment.
   ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt (const ACE_Get_Arg_Opt<CHAR_TYPE> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt &operator= (const ACE_Get_Arg_Opt<CHAR_TYPE> &))
+    ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt &operator= (const ACE_Get_Arg_Opt<CHAR_TYPE> &))
 };
 
 typedef ACE_Get_Arg_Opt< ACE_TCHAR > ACE_Get_Opt;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
 #include "ace/Get_Opt.inl"
+#endif /* __ACE_INLINE__ */
+
 
 #include /**/ "ace/post.h"
 #endif /* ACE_GET_OPT_H */
diff --git a/ace/Get_Opt.inl b/ace/Get_Opt.inl
index 1db0c562aee..6683215bdf6 100644
--- a/ace/Get_Opt.inl
+++ b/ace/Get_Opt.inl
@@ -10,6 +10,8 @@
 #include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_stdlib.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Get_Arg_Opt)
 
 template < typename CHAR_TYPE >
@@ -739,3 +741,5 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::opt_ind (void)
 {
   return this->optind;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index 83ea5603395..8487880e797 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -28,6 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/config-lite.h"
+#include "ace/Assert.h"			// For ACE_ASSERT
 
 // Start Global Macros
 # define ACE_BEGIN_DUMP ACE_LIB_TEXT ("\n====\n(%P|%t|%x)\n")
@@ -48,6 +49,9 @@
 #   if defined (_DEBUG) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
 # include /**/ <crtdbg.h>
 
+// Open versioned namespace, if enabled by the user.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_No_Heap_Check
 {
 public:
@@ -58,6 +62,10 @@ public:
 private:
   int old_state;
 };
+
+// Close versioned namespace, if enabled by the user.
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #     define ACE_NO_HEAP_CHECK ACE_No_Heap_Check ____no_heap;
 #   else /* !_DEBUG */
 #     define ACE_NO_HEAP_CHECK
@@ -120,14 +128,12 @@ private:
 
 // ----------------------------------------------------------------
 
-// Deal with MSVC++ 6 (or less) insanity for CORBA...
-# if !defined (ACE_NESTED_CLASS)
-#   if defined (ACE_HAS_BROKEN_NAMESPACES)
-#     define ACE_NESTED_CLASS(TYPE, NAME) NAME
-#   else  /* ! ACE_HAS_BROKEN_NAMESPACES */
-#     define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
-#   endif /* ! ACE_HAS_BROKEN_NAMESPACES */
-# endif  /* !ACE_NESTED_CLASS */
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  /**
+   * This macro is deprecated
+   */
+  #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 #if !defined (ACE_LACKS_DEPRECATED_MACROS)
   /**
@@ -141,9 +147,9 @@ private:
    *             release.
    */
   //@{
-  # define ACE_CORBA_1(NAME) CORBA::NAME
-  # define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
-  # define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
+  #define ACE_CORBA_1(NAME) CORBA::NAME
+  #define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
+  #define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
   //@}
 #endif /* ACE_LACKS_DEPRECATED_MACROS */
 
@@ -586,6 +592,27 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
 
 #endif /* !ACE_LACKS_STATIC_CONSTRUCTORS */
 
+// Preprocessor symbols will not be expanded if they are
+// concatenated.  Force the preprocessor to expand them during the
+// argument prescan by calling a macro that itself calls another that
+// performs the actual concatenation.
+#define ACE_PREPROC_CONCATENATE_IMPL(A,B) A ## B
+#define ACE_PREPROC_CONCATENATE(A,B) ACE_PREPROC_CONCATENATE_IMPL(A,B)
+
+#if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1
+// Preprocessor symbols will not be expanded if they are
+// concatenated.  Force the preprocessor to expand them during the
+// argument prescan by calling a macro that itself calls another that
+// performs the actual concatenation.
+# define ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(PREFIX,VERSIONED_NAMESPACE,SERVICE_CLASS) PREFIX ## _ ## VERSIONED_NAMESPACE ## _ ## SERVICE_CLASS
+#else
+# define ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(PREFIX,VERSIONED_NAMESPACE,SERVICE_CLASS) PREFIX ## _ ## SERVICE_CLASS
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+#define ACE_MAKE_SVC_CONFIG_FACTORY_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_make,VERSIONED_NAMESPACE,SERVICE_CLASS)
+#define ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_gobble,VERSIONED_NAMESPACE,SERVICE_CLASS)
+
+
 /// Declare the factory method used to create dynamically loadable
 /// services.
 /**
@@ -602,9 +629,9 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
  *        implements the service.
  *
  */
-#define ACE_FACTORY_DECLARE(CLS,SERVICE_CLASS) \
-extern "C" CLS##_Export ACE_Service_Object *\
-_make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *);
+# define ACE_FACTORY_DECLARE(CLS,SERVICE_CLASS) \
+extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * \
+ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *);
 
 /// Define the factory method (and destructor) for a dynamically
 /// loadable service.
@@ -623,16 +650,17 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *);
 # define ACE_Local_Service_Export
 
 # define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
-void _gobble_##SERVICE_CLASS (void *p) { \
-  ACE_Service_Object *_p = static_cast<ACE_Service_Object *> (p); \
+void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
+  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
+    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
   ACE_ASSERT (_p != 0); \
   delete _p; } \
-extern "C" CLS##_Export ACE_Service_Object *\
-_make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
+extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
+ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
 { \
   ACE_TRACE (#SERVICE_CLASS); \
   if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) _gobble_##SERVICE_CLASS; \
+    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new SERVICE_CLASS; \
 }
 
@@ -663,25 +691,26 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
  * style functions.
  */
 # define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
-void _gobble_##SERVICE_CLASS (void *p) { \
-  ACE_Service_Object *_p = static_cast<ACE_Service_Object *> (p); \
+void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
+  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
+    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
   ACE_ASSERT (_p != 0); \
   delete _p; } \
-extern "C" CLS##_Export ACE_Service_Object *\
-_make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
+extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
+ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
 { \
   ACE_TRACE (#SERVICE_CLASS); \
   if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) _gobble_##SERVICE_CLASS; \
+    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new NAMESPACE_CLASS; \
 }
 
 /// The canonical name for a service factory method
-#define ACE_SVC_NAME(SERVICE_CLASS) _make_##SERVICE_CLASS
+# define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)
 
 /// The canonical way to invoke (i.e. construct) a service factory
 /// method.
-#define ACE_SVC_INVOKE(SERVICE_CLASS) _make_##SERVICE_CLASS (0)
+#define ACE_SVC_INVOKE(SERVICE_CLASS) ACE_SVC_NAME(SERVICE_CLASS) (0)
 
 //@}
 
@@ -847,15 +876,9 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
 #     define ACE_SEH_EXCEPT(X) while (0)
 #     define ACE_SEH_FINALLY if (1)
 #   elif defined(__BORLANDC__)
-#     if (__BORLANDC__ >= 0x0530) /* Borland C++ Builder 3.0 */
-#       define ACE_SEH_TRY try
-#       define ACE_SEH_EXCEPT(X) __except(X)
-#       define ACE_SEH_FINALLY __finally
-#     else
-#       define ACE_SEH_TRY if (1)
-#       define ACE_SEH_EXCEPT(X) while (0)
-#       define ACE_SEH_FINALLY if (1)
-#     endif
+#     define ACE_SEH_TRY try
+#     define ACE_SEH_EXCEPT(X) __except(X)
+#     define ACE_SEH_FINALLY __finally
 #   elif defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 #     define ACE_SEH_TRY if (1)
 #     define ACE_SEH_EXCEPT(X) while (0)
diff --git a/ace/Guard_T.cpp b/ace/Guard_T.cpp
index 00cbfb4ebf1..bd60ebd2356 100644
--- a/ace/Guard_T.cpp
+++ b/ace/Guard_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_GUARD_T_C
-#define ACE_GUARD_T_C
+#ifndef ACE_GUARD_T_CPP
+#define ACE_GUARD_T_CPP
 
 #include "ace/Guard_T.h"
 
@@ -9,8 +9,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Guard_T, "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Guard_T.inl"
 #endif /* __ACE_INLINE__ */
@@ -20,6 +18,9 @@ ACE_RCSID(ace, Guard_T, "$Id$")
 #endif /* ACE_HAS_DUMP */
 
 // ****************************************************************
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
 
 template <class ACE_LOCK> void
@@ -55,4 +56,6 @@ ACE_Read_Guard<ACE_LOCK>::dump (void) const
   ACE_Guard<ACE_LOCK>::dump ();
 }
 
-#endif /* ACE_GUARD_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_GUARD_T_CPP */
diff --git a/ace/Guard_T.h b/ace/Guard_T.h
index 552385b298e..d7eedef2715 100644
--- a/ace/Guard_T.h
+++ b/ace/Guard_T.h
@@ -25,6 +25,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Guard
  *
@@ -45,7 +47,7 @@ public:
   ACE_Guard (ACE_LOCK &l);
 
   /// Implicitly and automatically acquire (or try to acquire) the
-  /// lock.  If <block> is non-0 then <acquire> the <ACE_LOCK>, else
+  /// lock.  If @a block is non-0 then <acquire> the <ACE_LOCK>, else
   /// <tryacquire> it.
   ACE_Guard (ACE_LOCK &l, int block);
 
@@ -108,7 +110,7 @@ private:
 /**
  * @class ACE_Write_Guard
  *
- * @brief This class is similar to class <ACE_Guard>, though it
+ * @brief This class is similar to class ACE_Guard, though it
  * acquires/releases a write lock automatically (naturally, the
  * <ACE_LOCK> it is instantiated with must support the appropriate
  * API).
@@ -152,7 +154,7 @@ public:
 /**
  * @class ACE_Read_Guard
  *
- * @brief This class is similar to class <ACE_Guard>, though it
+ * @brief This class is similar to class ACE_Guard, though it
  * acquires/releases a read lock automatically (naturally, the
  * <ACE_LOCK> it is instantiated with must support the appropriate
  * API).
@@ -342,8 +344,11 @@ public:
   // ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 };
+
 #endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Guard_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Guard_T.inl b/ace/Guard_T.inl
index 0ce34431d2c..8c2e281f447 100644
--- a/ace/Guard_T.inl
+++ b/ace/Guard_T.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/RW_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCK> ACE_INLINE int
 ACE_Guard<ACE_LOCK>::acquire (void)
 {
@@ -164,3 +167,5 @@ ACE_Read_Guard<ACE_LOCK>::ACE_Read_Guard (ACE_LOCK &m,
   else
     this->tryacquire_read ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h
index 8b3e472e7b8..36c16b56ed7 100644
--- a/ace/Handle_Gobbler.h
+++ b/ace/Handle_Gobbler.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Handle_Gobbler
  *
@@ -44,7 +47,7 @@ public:
    */
   inline int consume_handles (size_t n_handles_to_keep_available);
 
-  /// Free up <n_handles>.
+  /// Free up @a n_handles.
   inline int free_handles (size_t n_handles);
 
   /// All remaining handles are closed.
@@ -58,6 +61,8 @@ private:
   HANDLE_SET handle_set_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include "ace/Handle_Gobbler.inl"
 
 #include /**/ "ace/post.h"
diff --git a/ace/Handle_Gobbler.inl b/ace/Handle_Gobbler.inl
index 12887593086..6b51908e45e 100644
--- a/ace/Handle_Gobbler.inl
+++ b/ace/Handle_Gobbler.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 // Since this is only included in Handle_Gobbler.h, these should be
@@ -7,6 +9,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 inline void
 ACE_Handle_Gobbler::close_remaining_handles (void)
 {
@@ -89,3 +93,5 @@ ACE_Handle_Gobbler::consume_handles (size_t n_handles_to_keep_available)
 
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Handle_Ops.cpp b/ace/Handle_Ops.cpp
index eb373af8020..eae24314864 100644
--- a/ace/Handle_Ops.cpp
+++ b/ace/Handle_Ops.cpp
@@ -10,6 +10,9 @@ ACE_RCSID (ace,
            Handle_Ops,
            "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_HANDLE
 ACE::handle_timed_open (ACE_Time_Value *timeout,
                         const ACE_TCHAR *name,
@@ -43,3 +46,5 @@ ACE::handle_timed_open (ACE_Time_Value *timeout,
   else
     return ACE_OS::open (name, flags, perms, sa);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Handle_Ops.h b/ace/Handle_Ops.h
index 7f50eba8270..de6918753a9 100644
--- a/ace/Handle_Ops.h
+++ b/ace/Handle_Ops.h
@@ -6,9 +6,7 @@
  *
  *  $Id$
  *
- *  This class consolidates the operations on the Handles.
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ *  Handle operations.
  */
 //=============================================================================
 
@@ -25,6 +23,8 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 // = Operations on HANDLEs.
@@ -43,6 +43,8 @@ namespace ACE
     LPSECURITY_ATTRIBUTES sa = 0);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_HANDLE_OPS_H */
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index a24605a5367..3b76da06460 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(ace, Handle_Set, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set)
 
   // ACE_MSB_MASK is only used here.
@@ -235,13 +237,13 @@ ACE_Handle_Set::set_max (ACE_HANDLE current_max)
       for (fd_mask val = maskp[i];
            (val & ACE_MSB_MASK) != 0;
            val = (val << 1))
-        this->max_handle_++;
+        ++this->max_handle_;
 #elif 1 /* !defined(ACE_HAS_BIG_FD_SET) */
       this->max_handle_ = ACE_MULT_BY_WORDSIZE (i);
       for (fd_mask val = maskp[i];
            (val & ~1) != 0; // This obscure code is needed since "bit 0" is in location 1...
            val = (val >> 1) & ACE_MSB_MASK)
-        this->max_handle_++;
+        ++this->max_handle_;
 #else
       register u_long val = this->mask_.fds_bits[i];
       this->max_handle_ = ACE_MULT_BY_WORDSIZE (i)
@@ -572,3 +574,5 @@ ACE_Handle_Set_Iterator::reset_state (void)
       }
 #endif /* !ACE_WIN32 && !ACE_HAS_BIG_FD_SET */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index d732dfe4ef5..2e944bc5b97 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -40,6 +40,8 @@
 #  define ACE_DEFAULT_SELECT_REACTOR_SIZE ACE_FD_SETSIZE
 #endif /* ACE_DEFAULT_SELECT_REACTOR_SIZE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Handle_Set
  *
@@ -171,7 +173,7 @@ private:
 /**
  * @class ACE_Handle_Set_Iterator
  *
- * @brief Iterator for the <ACE_Handle_Set> abstraction.
+ * @brief Iterator for the ACE_Handle_Set abstraction.
  */
 class ACE_Export ACE_Handle_Set_Iterator
 {
@@ -187,7 +189,7 @@ public:
   void reset_state (void);
 
   /**
-   * "Next" operator.  Returns the next unseen <ACE_HANDLE> in the
+   * "Next" operator.  Returns the next unseen ACE_HANDLE in the
    * <Handle_Set> up to <handle_set_.max_handle_>).  When all the
    * handles have been seen returns <ACE_INVALID_HANDLE>.  Advances
    * the iterator automatically, so you need not call <operator++>
@@ -197,6 +199,7 @@ public:
 
   /// This is a no-op and no longer does anything.  It's only here for
   /// backwards compatibility.
+  /// @deprecated
   void operator++ (void);
 
   /// Dump the state of an object.
@@ -236,6 +239,8 @@ private:
 #endif /* !ACE_WIN32 && !ACE_HAS_BIG_FD_SET */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Handle_Set.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Handle_Set.inl b/ace/Handle_Set.inl
index d00fb384863..b6f77cfac93 100644
--- a/ace/Handle_Set.inl
+++ b/ace/Handle_Set.inl
@@ -1,7 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Handle_Set.i
 #include "ace/Log_Msg.h"
 
 // todo: This should be cleaned up a bit.
@@ -21,6 +21,8 @@
 #  include "ace/os_include/os_strings.h"
 #endif /* ACE_HAS_STRINGS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initialize the bitmask to all 0s and reset the associated fields.
 
 ACE_INLINE void
@@ -100,7 +102,7 @@ ACE_Handle_Set::set_bit (ACE_HANDLE handle)
 #if defined (ACE_WIN32)
       FD_SET ((SOCKET) handle,
               &this->mask_);
-      this->size_++;
+      ++this->size_;
 #else /* ACE_WIN32 */
 #if defined (ACE_HAS_BIG_FD_SET)
       if (this->size_ == 0)
@@ -112,7 +114,7 @@ ACE_Handle_Set::set_bit (ACE_HANDLE handle)
 
       FD_SET (handle,
               &this->mask_);
-      this->size_++;
+      ++this->size_;
 
       if (handle > this->max_handle_)
         this->max_handle_ = handle;
@@ -132,7 +134,7 @@ ACE_Handle_Set::clr_bit (ACE_HANDLE handle)
     {
       FD_CLR ((ACE_SOCKET) handle,
               &this->mask_);
-      this->size_--;
+      --this->size_;
 
 #if !defined (ACE_WIN32)
       if (handle == this->max_handle_)
@@ -184,3 +186,5 @@ ACE_INLINE
 ACE_Handle_Set_Iterator::~ACE_Handle_Set_Iterator (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index 72b84d88715..5baac0ae1a0 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_HASH_CACHE_MAP_MANAGER_T_C
-#define ACE_HASH_CACHE_MAP_MANAGER_T_C
+#ifndef ACE_HASH_CACHE_MAP_MANAGER_T_CPP
+#define ACE_HASH_CACHE_MAP_MANAGER_T_CPP
 
 #include "ace/Hash_Cache_Map_Manager_T.h"
 
@@ -13,7 +13,7 @@
 #include "ace/Hash_Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Hash_Cache_Map_Manager_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Cache_Map_Manager)
 
@@ -224,7 +224,9 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::unbind (CACHE_ENTRY *entry)
   return unbind_result;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef ACE_T1
 #undef ACE_T2
 
-#endif /* ACE_HASH_CACHE_MAP_MANAGER_T_C */
+#endif /* ACE_HASH_CACHE_MAP_MANAGER_T_CPP */
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index 26ccbf78432..023e9d17568 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,6 +13,7 @@
 
 #ifndef HASH_CACHE_MAP_MANAGER_T_H
 #define HASH_CACHE_MAP_MANAGER_T_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_Manager_T.h"
@@ -24,6 +25,8 @@
 
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 class ACE_Allocator;
 
@@ -191,6 +194,8 @@ protected:
   typedef ACE_CACHE_MAP_MANAGER ACE_HCMM_BASE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
 #include "ace/Hash_Cache_Map_Manager_T.inl"
@@ -205,4 +210,5 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
+
 #endif /* HASH_CACHE_MAP_MANAGER_T_H */
diff --git a/ace/Hash_Cache_Map_Manager_T.inl b/ace/Hash_Cache_Map_Manager_T.inl
index 84d40bffbb6..0388abd6c6e 100644
--- a/ace/Hash_Cache_Map_Manager_T.inl
+++ b/ace/Hash_Cache_Map_Manager_T.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #define ACE_T1 class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES
 #define ACE_T2 KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_T1> ACE_INLINE int
 ACE_Hash_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
                                        const VALUE &value)
@@ -64,5 +67,7 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
                                 value);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef ACE_T1
 #undef ACE_T2
diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
deleted file mode 100644
index 4378551c7f8..00000000000
--- a/ace/Hash_Map_Manager.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Hash_Map_Manager.cpp
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Hash_Map_Manager.h"
-
-ACE_RCSID(ace, Hash_Map_Manager, "$Id$")
-
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 4468cda5af0..ad9cc390295 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,6 +6,8 @@
  *
  *  $Id$
  *
+ *  Backward compatibility header.
+ *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index 4d442a61234..bb08c21db0b 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -24,21 +24,11 @@
 
 #if !defined (__ACE_INLINE__)
 # include "ace/Hash_Map_Manager_T.inl"
-#elif defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420)
-// If ACE_INLINE is on and we are on SunCC, undefine ACE_INLINE,
-// include ace/Hash_Map_Manager_T.i, and then redefine ACE_INLINE.
-// This nonsense is necessary since SunCC (version 4.2) cannot inline
-// the code in ace/Hash_Map_Manager_T.i (with the fast option).
-# undef ACE_INLINE
-# define ACE_INLINE
-# include "ace/Hash_Map_Manager_T.inl"
-# undef ACE_INLINE
-# define ACE_INLINE inline
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Malloc_Base.h"
 
-ACE_RCSID(ace, Hash_Map_Manager_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class EXT_ID, class INT_ID>
 ACE_Hash_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
@@ -518,4 +508,6 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
   return this->index_ >= 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HASH_MAP_MANAGER_T_CPP */
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index eefd5862f89..23ce8d690ec 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -24,6 +24,8 @@
 #include "ace/Functor_T.h"
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Hash_Map_Entry
  *
@@ -101,9 +103,9 @@ class ACE_Allocator;
  * This implementation of a map uses a hash table.  Key hashing
  * is achieved through the HASH_KEY object and key comparison is
  * achieved through the COMPARE_KEYS object.
- * This class uses an <ACE_Allocator> to allocate memory.  The
+ * This class uses an ACE_Allocator to allocate memory.  The
  * user can make this a persistent class by providing an
- * <ACE_Allocator> with a persistable memory pool.
+ * ACE_Allocator with a persistable memory pool.
  */
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
 class ACE_Hash_Map_Manager_Ex
@@ -308,8 +310,8 @@ public:
    * possible to acquire the lock explicitly, which can be useful in
    * some cases if you instantiate the <ACE_Atomic_Op> with an
    * <ACE_Recursive_Mutex> or <ACE_Process_Mutex>, or if you need to
-   * guard the state of an iterator.  NOTE: the right name would be
-   * <lock>, but HP/C++ will choke on that!
+   * guard the state of an iterator.
+   * @note The right name would be <lock>, but HP/C++ will choke on that!
    */
   ACE_LOCK &mutex (void);
 
@@ -415,8 +417,8 @@ protected:
   int unbind_i (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry);
 
   /**
-   * Resize the map.  Must be called with locks held.  Note, that this
-   * method should never be called more than once or else all the
+   * Resize the map.  Must be called with locks held.
+   * @note This method should never be called more than once or else all the
    * hashing will get screwed up as the size will change.
    */
   int create_buckets (size_t size);
@@ -464,8 +466,9 @@ private:
   /// Total size of the hash table.
   size_t total_size_;
 
-  /// Current number of entries in the table (note that this can be
-  /// larger than <total_size_> due to the bucket chaining).
+  /// Current number of entries in the table
+  /// @note That this can be larger than <total_size_> due to the
+  /// bucket chaining).
   size_t cur_size_;
 
   // = Disallow these operations.
@@ -610,7 +613,7 @@ protected:
  * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@@ -656,7 +659,7 @@ public:
  * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@@ -704,7 +707,7 @@ public:
  * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s
  * internal lock, which is accessible via its <mutex> method.
  *
  * Note that a creation method for this new iterator cannot be added
@@ -775,7 +778,7 @@ protected:
  * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@@ -934,13 +937,10 @@ public:
   operator= (const ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-// Include ace/Hash_Map_Manager_T.i on all platforms excluding SunCC.
-// This nonsense is necessary since SunCC (version 4.2) cannot inline
-// the code in ace/Hash_Map_Manager_T.i (with the fast option).
-# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x420))
 #  include "ace/Hash_Map_Manager_T.inl"
-# endif /* ! __SUNPRO_CC */
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Hash_Map_Manager_T.inl b/ace/Hash_Map_Manager_T.inl
index 05383a07e69..6dd3626dea3 100644
--- a/ace/Hash_Map_Manager_T.inl
+++ b/ace/Hash_Map_Manager_T.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Guard_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Manager_Ex (size_t size,
                                                                                                     ACE_Allocator *alloc)
@@ -980,3 +983,5 @@ ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator= (const ACE_Ha
 
   return *this;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Hash_Map_With_Allocator_T.cpp b/ace/Hash_Map_With_Allocator_T.cpp
index 20587b9d7ba..9927147e865 100644
--- a/ace/Hash_Map_With_Allocator_T.cpp
+++ b/ace/Hash_Map_With_Allocator_T.cpp
@@ -1,4 +1,3 @@
-// Hash_Map_With_Allocator_T.cpp
 // $Id$
 
 #ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP
@@ -14,6 +13,8 @@
 #include "ace/Hash_Map_With_Allocator_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class EXT_ID, class INT_ID>
 ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (ACE_Allocator *alloc)
   : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_Null_Mutex> (alloc)
@@ -29,4 +30,6 @@ ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (size_t
   ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator");
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP */
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
index 6ae11547c0c..088956b48a1 100644
--- a/ace/Hash_Map_With_Allocator_T.h
+++ b/ace/Hash_Map_With_Allocator_T.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Hash_Map_With_Allocator_T.h
@@ -21,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Hash_Map_With_Allocator
  *
@@ -53,9 +56,9 @@ public:
                                ACE_Allocator *alloc);
 
   // = The following methods are Proxies to the corresponding methods
-  // in <ACE_Hash_Map_Manager>.  Each method sets the allocator to
+  // in ACE_Hash_Map_Manager.  Each method sets the allocator to
   // the one specified by the invoking entity, and then calls the
-  // corresponding method in <ACE_Hash_Map_Manager> to do the
+  // corresponding method in ACE_Hash_Map_Manager to do the
   // actual work.
 
   int bind (const EXT_ID &,
@@ -79,13 +82,15 @@ public:
             INT_ID &,
             ACE_Allocator *alloc);
 
-  /// Returns 0 if the <ext_id> is in the mapping, otherwise -1.
-  int find (const EXT_ID &,
+  /// Returns 0 if the @a ext_id is in the mapping, otherwise -1.
+  int find (const EXT_ID &ext_id,
             ACE_Allocator *alloc);
 
   int close (ACE_Allocator *alloc);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Hash_Map_With_Allocator_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Hash_Map_With_Allocator_T.inl b/ace/Hash_Map_With_Allocator_T.inl
index 5b8c42dde3d..67f2f8247f8 100644
--- a/ace/Hash_Map_With_Allocator_T.inl
+++ b/ace/Hash_Map_With_Allocator_T.inl
@@ -1,8 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Hash_Map_With_Allocator_T.i
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class EXT_ID, class INT_ID> ACE_INLINE int
 ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::close (ACE_Allocator *alloc)
@@ -71,3 +71,5 @@ ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::find (const EXT_ID &ext_id,
   this->allocator_ = alloc;
   return this->find_i (ext_id);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Hashable.cpp b/ace/Hashable.cpp
index fca05cf96c5..cab51f7aa26 100644
--- a/ace/Hashable.cpp
+++ b/ace/Hashable.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Hashable::~ACE_Hashable (void)
 {
 }
@@ -26,7 +28,9 @@ ACE_Hashable::hash (void) const
   // relative to the simple comparison.
 
   if (this->hash_value_ == 0)
-    (const_cast <ACE_Hashable *> (this))->hash_value_ = this->hash_i ();
+    this->hash_value_ = this->hash_i ();
 
   return this->hash_value_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Hashable.h b/ace/Hashable.h
index 3544feb5290..1a4a7011c28 100644
--- a/ace/Hashable.h
+++ b/ace/Hashable.h
@@ -21,6 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Hashable
@@ -49,10 +50,11 @@ protected:
 protected:
 
   /// Pre-computed hash-value.
-  unsigned long hash_value_;
+  mutable unsigned long hash_value_;
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Hashable.inl"
diff --git a/ace/Hashable.inl b/ace/Hashable.inl
index 55f28b31da4..7ec54ea1337 100644
--- a/ace/Hashable.inl
+++ b/ace/Hashable.inl
@@ -3,8 +3,12 @@
 // $Id$
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Hashable::ACE_Hashable (void)
   : hash_value_ (0)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index e0f7813329a..e83c6573c9c 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -23,8 +23,12 @@
 
 ACE_RCSID(ace, High_Res_Timer, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // For Intel platforms, a scale factor is required for
 // ACE_OS::gethrtime.  We'll still set this to one to prevent division
 // by zero errors.
@@ -36,23 +40,34 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
 # include "ace/Recursive_Thread_Mutex.h"
 # include "ace/Object_Manager.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
   // Initialize the global_scale_factor_ to 1.  The first
   // ACE_High_Res_Timer instance construction will override this
   // value.
   /* static */
   ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1u;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #else  /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
              ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER)  ||
           ACE_HAS_HI_RES_TIMER */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
   // A scale_factor of 1000 converts nanosecond ticks to microseconds.
   // That is, on these platforms, 1 tick == 1 nanosecond.
   /* static */
   ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1000u;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
              ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER)  ||
           ACE_HAS_HI_RES_TIMER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This is used to tell if the global_scale_factor_ has been
 // set, and if high resolution timers are supported.
 /* static */
@@ -371,15 +386,9 @@ ACE_High_Res_Timer::elapsed_time (struct timespec &elapsed_time) const
   // Get just the microseconds (dropping any left over nanoseconds).
   ACE_UINT32 useconds = (ACE_UINT32) (elapsed / global_scale_factor ());
 
-#if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
   elapsed_time.tv_sec = (time_t) (useconds / ACE_ONE_SECOND_IN_USECS);
   // Transforms one second in microseconds into nanoseconds.
   elapsed_time.tv_nsec = (time_t) ((useconds % ACE_ONE_SECOND_IN_USECS) * 1000u + nseconds);
-#else
-  elapsed_time.ts_sec = (time_t) (useconds / ACE_ONE_SECOND_IN_USECS);
-  // Transforms one second in microseconds into nanoseconds.
-  elapsed_time.ts_nsec = (time_t) ((useconds % ACE_ONE_SECOND_IN_USECS) * 1000u + nseconds);
-#endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */
 }
 #endif /* ACE_HAS_POSIX_TIME */
 
@@ -533,3 +542,5 @@ ACE_High_Res_Timer::get_env_global_scale_factor (const char *env)
 #endif /* !ACE_HAS_WINCE */
   return -1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 705165547f7..5359ddc70d3 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -24,6 +24,8 @@
 #include "ace/OS_NS_time.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_High_Res_Timer
  *
@@ -68,9 +70,9 @@
  * different implementation depending on the used windows HAL
  * (Hardware Abstraction Layer).  On some it uses the PC "timer chip"
  * while it uses RDTSC on others.
- * NOTE:  the elapsed time calculations in the print methods use
+ * @note The elapsed time calculations in the print methods use
  * ACE_hrtime_t values.  Those methods do _not_ check for overflow!
- * NOTE: Gabe <begeddov@proaxis.com> raises this issue regarding
+ * @note Gabe <begeddov@proaxis.com> raises this issue regarding
  * <ACE_OS::gethrtime>: on multi-processors, the processor that
  * you query for your <timer.stop> value might not be the one
  * you queried for <timer.start>.  Its not clear how much
@@ -131,8 +133,8 @@ public:
 
   /**
    * Sets the global_scale_factor to the value in the <env>
-   * environment variable.  Returns 0 on success, -1 on failure.  Note
-   * if @a env points to string "0" (value zero), this call will fail.
+   * environment variable.  Returns 0 on success, -1 on failure.
+   * @note If @a env points to string "0" (value zero), this call will fail.
    * This is basically a no-op on CE because there is no concept of
    * environment variable on CE.
    */
@@ -212,8 +214,8 @@ public:
   // @@ WINCE These two functions are currently not supported on Windows CE.
   //    However, we should probably use the handle and ACE_Log_Msg to
   //    print out the result.
-  /// Print total time.  NOTE: only use <print_total> if incremental
-  /// timings had been used!
+  /// Print total time.
+  /// @note only use <print_total> if incremental timings had been used!
   void print_total (const ACE_TCHAR *message,
                     const int iterations = 1,
                     ACE_HANDLE handle = ACE_STDOUT) const;
@@ -309,6 +311,8 @@ private:
   static int global_scale_factor_status_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/High_Res_Timer.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/High_Res_Timer.inl b/ace/High_Res_Timer.inl
index 49fff1aabe4..1b37f522439 100644
--- a/ace/High_Res_Timer.inl
+++ b/ace/High_Res_Timer.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*- */
+//
 // $Id$
 
 #include "ace/Global_Macros.h"
@@ -7,9 +8,11 @@
 #  include "ace/OS_NS_sys_time.h"
 #endif /* ACE_WIN32 */
 
-// Be very carefull before changing the calculations inside
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Be very careful before changing the calculations inside
 // ACE_High_Res_Timer.  The precision matters and we are using integer
-// calculations not floating point.  Also look good at the emulated 64
+// calculations not floating point.  Also look closely at the emulated 64
 // bit int class (inside Basic_Types{h,i,cpp} before changing
 // anything.  It's operator/ only returns 32 bits not 64 bits, among
 // other things.
@@ -170,3 +173,5 @@ ACE_High_Res_Timer::global_scale_factor (ACE_UINT32 gsf)
 {
   global_scale_factor_ = gsf;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ICMP_Socket.cpp b/ace/ICMP_Socket.cpp
index 52ae288631b..2904524d25c 100644
--- a/ace/ICMP_Socket.cpp
+++ b/ace/ICMP_Socket.cpp
@@ -9,15 +9,14 @@
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_sys_socket.h"
 
-#if !defined (__ACE_INLINE__)
-# include "ace/ICMP_Socket.inl"
-#endif  /* !__ACE_INLINE__ */
-
 
 ACE_RCSID (ace,
            ICMP_Socket,
            "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_ICMP_Socket)
 
 
@@ -182,4 +181,6 @@ ACE_ICMP_Socket::calculate_checksum (unsigned short * paddress,
   return (answer);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_HAS_ICMP_SUPPORT == 1 */
diff --git a/ace/ICMP_Socket.h b/ace/ICMP_Socket.h
index 795817f65db..77e2a018984 100644
--- a/ace/ICMP_Socket.h
+++ b/ace/ICMP_Socket.h
@@ -28,8 +28,10 @@
 #include "ace/Time_Value.h"
 #include "ace/os_include/netinet/os_in.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
- * @class ICMP_Socket
+ * @class ACE_ICMP_Socket
  *
  * @brief An abstract class that forms the basis for usage of the ICMP
  * protocol (that is, support for things such as ping).
@@ -39,8 +41,6 @@ class ACE_Export ACE_ICMP_Socket : public ACE_SOCK
 public:
   // = Initialization methods.
 
-  ~ACE_ICMP_Socket (void);
-
   /**
    * @name Data transfer routines.
    *
@@ -101,9 +101,7 @@ protected:
                                      int len);
 };
 
-#if defined (__ACE_INLINE__)
-# include "ace/ICMP_Socket.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* ACE_HAS_ICMP_SUPPORT == 1 */
 
diff --git a/ace/ICMP_Socket.inl b/ace/ICMP_Socket.inl
deleted file mode 100644
index bda45ff8c61..00000000000
--- a/ace/ICMP_Socket.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-ACE_ICMP_Socket::~ACE_ICMP_Socket (void)
-{
-  ACE_TRACE ("ACE_ICMP_Socket::~ACE_ICMP_Socket");
-}
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 420172707af..bde2a17ae8e 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -22,6 +22,8 @@ ACE_RCSID (ace,
            INET_Addr,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_INET_Addr)
 
 // Transform the current address into string format.
@@ -35,9 +37,10 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
 
   // XXX Can we (should we) include the scope id for IPv6 addresses?
 
-  size_t total_len = (ipaddr_format == 0 ?
-                      ACE_OS::strlen (this->get_host_name ()) :
-                      ACE_OS::strlen (this->get_host_addr ()))
+  size_t const total_len =
+    (ipaddr_format == 0
+     ? ACE_OS::strlen (this->get_host_name ())
+     : ACE_OS::strlen (this->get_host_addr ()))
     + ACE_OS::strlen ("65536") // Assume the max port number.
     + sizeof (':')
     + sizeof ('\0'); // For trailing '\0'.
@@ -111,7 +114,7 @@ ACE_INET_Addr::hash (void) const
 }
 
 ACE_INET_Addr::ACE_INET_Addr (void)
-  : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
+  : ACE_Addr (this->determine_type (), sizeof (inet_addr_))
 {
   // ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
@@ -181,7 +184,7 @@ ACE_INET_Addr::string_to_addr (const char s[])
       char *endp = 0;
       u_short port =
         static_cast<u_short> (ACE_OS::strtol (ip_addr, &endp, 10));
-      if (port > 0 && *endp == '\0')
+      if (*endp == '\0')    // strtol scanned the entire string - all digits
         result = this->set (port, ACE_UINT32 (INADDR_ANY));
       else // port name
         result = this->set (ip_addr, ACE_UINT32 (INADDR_ANY));
@@ -192,7 +195,7 @@ ACE_INET_Addr::string_to_addr (const char s[])
 
       char *endp = 0;
       u_short port = static_cast<u_short> (ACE_OS::strtol (port_p, &endp, 10));
-      if (port > 0 && *endp == '\0')
+      if (*endp == '\0')    // strtol scanned the entire string - all digits
         result = this->set (port, ip_addr);
       else
         result = this->set (port_p, ip_addr);
@@ -307,7 +310,7 @@ ACE_INET_Addr::set (u_short port_number,
   // IPv6 not supported... insure the family is set to IPv4
   address_family = AF_INET;
   this->set_type (address_family);
-  this->inet_addr_.in4_.sin_family = address_family;
+  this->inet_addr_.in4_.sin_family = static_cast<short> (address_family);
   struct in_addr addrv4;
   if (ACE_OS::inet_aton (host_name,
                          &addrv4) == 1)
@@ -316,7 +319,7 @@ ACE_INET_Addr::set (u_short port_number,
                       encode);
   else
     {
-#  if defined (VXWORKS) || defined (CHORUS)
+#  if (defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)) || defined (CHORUS)
       hostent *hp = ACE_OS::gethostbyname (host_name);
 #  else
       hostent hentry;
@@ -325,7 +328,7 @@ ACE_INET_Addr::set (u_short port_number,
 
       hostent *hp = ACE_OS::gethostbyname_r (host_name, &hentry,
                                              buf, &h_error);
-#  endif /* VXWORKS */
+#  endif /* ACE_VXWORKS */
 
       if (hp == 0)
         {
@@ -767,7 +770,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
     }
   else
     {
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
       ACE_UNUSED_ARG (len);
       int error =
         ::hostGetByAddr ((int) this->inet_addr_.in4_.sin_addr.s_addr,
@@ -816,7 +819,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
 
       ACE_OS::strcpy (hostname, hp->h_name);
       return 0;
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
     }
 }
 
@@ -844,6 +847,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
 
       if (this->get_type () == AF_INET && map == 0) {
         this->base_set (AF_INET, sizeof (this->inet_addr_.in4_));
+#ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN
+	this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
+#endif
         this->inet_addr_.in4_.sin_family = AF_INET;
         this->set_size (sizeof (this->inet_addr_.in4_));
         ACE_OS::memcpy (&this->inet_addr_.in4_.sin_addr,
@@ -855,6 +861,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
         {
           // this->set_type (AF_INET);
           this->base_set (AF_INET, sizeof (this->inet_addr_.in4_));
+#ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN
+	  this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
+#endif
           this->inet_addr_.in4_.sin_family = AF_INET;
           this->set_size (sizeof (this->inet_addr_.in4_));
           ACE_OS::memcpy (&this->inet_addr_.in4_.sin_addr,
@@ -865,6 +874,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
       else
         {
           this->base_set (AF_INET6, sizeof (this->inet_addr_.in6_));
+#ifdef ACE_HAS_SOCKADDR_IN6_SIN6_LEN
+	  this->inet_addr_.in6_.sin6_len = sizeof (this->inet_addr_.in6_);
+#endif
           this->inet_addr_.in6_.sin6_family = AF_INET6;
           this->set_size (sizeof (this->inet_addr_.in6_));
           if (ip4 == INADDR_ANY)
@@ -1006,7 +1018,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const
     }
 #endif /* ACE_HAS_IPV6 */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (dst);
   ACE_UNUSED_ARG (size);
 
@@ -1019,7 +1031,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const
   inet_ntoa_b(this->inet_addr_.in4_.sin_addr, ncthis->buf_);
   ACE_OS::strsncpy (dst, &buf_[0], size);
   return &buf_[0];
-#else /* VXWORKS */
+#else /* ACE_VXWORKS */
   char *ch = ACE_OS::inet_ntoa (this->inet_addr_.in4_.sin_addr);
   ACE_OS::strsncpy (dst, ch, size);
   return ch;
@@ -1035,7 +1047,7 @@ ACE_INET_Addr::get_host_addr (void) const
   static char buf[INET6_ADDRSTRLEN];
   return this->get_host_addr (buf, INET6_ADDRSTRLEN);
 #else /* ACE_HAS_IPV6 */
-#  if defined (VXWORKS)
+#  if defined (ACE_VXWORKS)
   // It would be nice to be able to encapsulate this into
   // ACE_OS::inet_ntoa(), but that would lead to either inefficiencies
   // on vxworks or lack of thread safety.
@@ -1044,9 +1056,9 @@ ACE_INET_Addr::get_host_addr (void) const
   ACE_INET_Addr *ncthis = const_cast<ACE_INET_Addr *> (this);
   inet_ntoa_b (this->inet_addr_.in4_.sin_addr, ncthis->buf_);
   return &buf_[0];
-#  else /* VXWORKS */
+#  else /* ACE_VXWORKS */
   return ACE_OS::inet_ntoa (this->inet_addr_.in4_.sin_addr);
-#  endif /* !VXWORKS */
+#  endif /* !ACE_VXWORKS */
 #endif /* !ACE_HAS_IPV6 */
 }
 
@@ -1077,3 +1089,5 @@ ACE_INET_Addr::get_ip_address (void) const
 #endif /* ACE_HAS_IPV6 */
   return ntohl (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 6cdc1ae62cb..ab74a1bb276 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -27,6 +27,8 @@
 #  include /**/ "inetLib.h"
 #endif /* VXWORKS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_INET_Addr
  *
@@ -44,10 +46,10 @@ public:
   /// Copy constructor.
   ACE_INET_Addr (const ACE_INET_Addr &);
 
-  /// Creates an <ACE_INET_Addr> from a sockaddr_in structure.
+  /// Creates an ACE_INET_Addr from a sockaddr_in structure.
   ACE_INET_Addr (const sockaddr_in *, int len);
 
-  /// Creates an <ACE_INET_Addr> from a <port_number> and the remote
+  /// Creates an ACE_INET_Addr from a <port_number> and the remote
   /// <host_name>. The port number is assumed to be in host byte order.
   /// To set a port already in network byte order, please @see set().
   /// Use address_family to select IPv6 (PF_INET6) vs. IPv4 (PF_INET).
@@ -56,7 +58,7 @@ public:
                  int address_family = AF_UNSPEC);
 
   /**
-   * Initializes an <ACE_INET_Addr> from the <address>, which can be
+   * Initializes an ACE_INET_Addr from the <address>, which can be
    * "ip-number:port-number" (e.g., "tango.cs.wustl.edu:1234" or
    * "128.252.166.57:1234").  If there is no ':' in the <address> it
    * is assumed to be a port number, with the IP address being
@@ -65,22 +67,22 @@ public:
   explicit ACE_INET_Addr (const char address[]);
 
   /**
-   * Creates an <ACE_INET_Addr> from a <port_number> and an Internet
+   * Creates an ACE_INET_Addr from a <port_number> and an Internet
    * <ip_addr>.  This method assumes that <port_number> and <ip_addr>
    * are in host byte order. If you have addressing information in
    * network byte order, @see set().
    */
-  ACE_INET_Addr (u_short port_number,
-                 ACE_UINT32 ip_addr = INADDR_ANY);
+  explicit ACE_INET_Addr (u_short port_number,
+                          ACE_UINT32 ip_addr = INADDR_ANY);
 
-  /// Uses <getservbyname> to create an <ACE_INET_Addr> from a
+  /// Uses <getservbyname> to create an ACE_INET_Addr from a
   /// <port_name>, the remote <host_name>, and the <protocol>.
   ACE_INET_Addr (const char port_name[],
                  const char host_name[],
                  const char protocol[] = "tcp");
 
   /**
-   * Uses <getservbyname> to create an <ACE_INET_Addr> from a
+   * Uses <getservbyname> to create an ACE_INET_Addr from a
    * <port_name>, an Internet <ip_addr>, and the <protocol>.  This
    * method assumes that <ip_addr> is in host byte order.
    */
@@ -109,11 +111,11 @@ public:
 
   // These methods are useful after the object has been constructed.
 
-  /// Initializes from another <ACE_INET_Addr>.
+  /// Initializes from another ACE_INET_Addr.
   int set (const ACE_INET_Addr &);
 
   /**
-   * Initializes an <ACE_INET_Addr> from a <port_number> and the
+   * Initializes an ACE_INET_Addr from a <port_number> and the
    * remote <host_name>.  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 are passed straight through.
@@ -127,7 +129,7 @@ public:
            int address_family = AF_UNSPEC);
 
   /**
-   * Initializes an <ACE_INET_Addr> from a @a port_number and an Internet
+   * Initializes an ACE_INET_Addr from a @a port_number and an Internet
    * @a ip_addr.  If @a encode is non-zero then the port number and IP address
    * are converted into network byte order, otherwise they are assumed to be
    * in network byte order already and are passed straight through.
@@ -140,14 +142,14 @@ public:
            int encode = 1,
            int map = 0);
 
-  /// Uses <getservbyname> to initialize an <ACE_INET_Addr> from a
+  /// Uses <getservbyname> to initialize an ACE_INET_Addr from a
   /// <port_name>, the remote <host_name>, and the <protocol>.
   int set (const char port_name[],
            const char host_name[],
            const char protocol[] = "tcp");
 
   /**
-   * Uses <getservbyname> to initialize an <ACE_INET_Addr> from a
+   * Uses <getservbyname> to initialize an ACE_INET_Addr from a
    * <port_name>, an <ip_addr>, and the <protocol>.  This assumes that
    * <ip_addr> is already in network byte order.
    */
@@ -156,7 +158,7 @@ public:
            const char protocol[] = "tcp");
 
   /**
-   * Initializes an <ACE_INET_Addr> from the <addr>, which can be
+   * Initializes an ACE_INET_Addr from the <addr>, which can be
    * "ip-number:port-number" (e.g., "tango.cs.wustl.edu:1234" or
    * "128.252.166.57:1234").  If there is no ':' in the <address> it
    * is assumed to be a port number, with the IP address being
@@ -164,7 +166,7 @@ public:
    */
   int set (const char addr[]);
 
-  /// Creates an <ACE_INET_Addr> from a sockaddr_in structure.
+  /// Creates an ACE_INET_Addr from a sockaddr_in structure.
   int set (const sockaddr_in *,
            int len);
 
@@ -194,7 +196,7 @@ public:
   virtual void set_addr (void *, int len, int map);
 
   /**
-   * Transform the current <ACE_INET_Addr> address into string format.
+   * Transform the current ACE_INET_Addr address into string format.
    * 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.,
@@ -206,7 +208,7 @@ public:
                               int ipaddr_format = 1) const;
 
   /**
-   * Initializes an <ACE_INET_Addr> from the <address>, which can be
+   * Initializes an ACE_INET_Addr from the @a address, which can be
    * "ip-addr:port-number" (e.g., "tango.cs.wustl.edu:1234"),
    * "ip-addr:port-name" (e.g., "tango.cs.wustl.edu:telnet"),
    * "ip-number:port-number" (e.g., "128.252.166.57:1234"), or
@@ -344,11 +346,13 @@ private:
 #endif /* ACE_HAS_IPV6 */
   } inet_addr_;
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   char buf_[INET_ADDR_LEN];
 #endif
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/INET_Addr.inl b/ace/INET_Addr.inl
index 63c8f480c4b..3fa5c778e5a 100644
--- a/ace/INET_Addr.inl
+++ b/ace/INET_Addr.inl
@@ -7,16 +7,27 @@
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_arpa_inet.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_INET_Addr::reset (void)
 {
   ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
   if (this->get_type() == AF_INET)
-    this->inet_addr_.in4_.sin_family = AF_INET;
+    {
+#ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN
+      this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_);
+#endif
+      this->inet_addr_.in4_.sin_family = AF_INET;
+    }
 #if defined (ACE_HAS_IPV6)
   else if (this->get_type() == AF_INET6)
-    this->inet_addr_.in6_.sin6_family = AF_INET6;
+    {
+#ifdef ACE_HAS_SOCKADDR_IN6_SIN6_LEN
+      this->inet_addr_.in6_.sin6_len = sizeof (this->inet_addr_.in6_);
+#endif
+      this->inet_addr_.in6_.sin6_family = AF_INET6;
+    }
 #endif  /* ACE_HAS_IPV6 */
 }
 
@@ -29,8 +40,9 @@ ACE_INET_Addr::determine_type (void) const
 #  else
   return AF_INET6;
 #  endif /* ACE_USES_IPV4_IPV6_MIGRATION */
-#endif /* ACE_HAS_IPV6 */
+#else
   return AF_INET;
+#endif /* ACE_HAS_IPV6 */
 }
 
 ACE_INLINE void *
@@ -202,3 +214,4 @@ ACE_INET_Addr::is_ipv4_compat_ipv6 (void) const
 }
 #endif /* ACE_HAS_IPV6 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IOStream.cpp b/ace/IOStream.cpp
index 1ad5c0f3aca..23790425eeb 100644
--- a/ace/IOStream.cpp
+++ b/ace/IOStream.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#if !defined (ACE_IOSTREAM_C)
-#define ACE_IOSTREAM_C
+#ifndef ACE_IOSTREAM_CPP
+#define ACE_IOSTREAM_CPP
 
 #include "ace/IOStream.h"
 
@@ -86,6 +86,8 @@ ACE_RCSID(ace, IOStream, "$Id$")
   // function will be invoked by the first >>.  Since it returns
   // a myiostream&, the second >> will be invoked as desired.  */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_HANDLE
 ACE_Streambuf::get_handle (void)
 {
@@ -657,5 +659,7 @@ u_char ACE_Streambuf::timeout (void)
   return rval;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_ACE_IOSTREAM */
-#endif /* ACE_IOSTREAM_C */
+#endif /* ACE_IOSTREAM_CPP */
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 66aa738227a..49c0612da13 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -40,18 +40,26 @@
 
 #  if defined (ACE_HAS_STRING_CLASS)
 #    if defined (ACE_WIN32) && defined (_MSC_VER)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef CString ACE_IOStream_String;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #    else
 #      if !defined (ACE_HAS_STDCPP_STL_INCLUDES)
 #include /**/ <String.h>
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef String ACE_IOStream_String;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #      else
 #        include /**/ <string>
 
 #        if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef std::string ACE_IOStream_String;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #        else
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef string ACE_IOStream_String;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #        endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 #      endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */
 #    endif /* ACE_WIN32 && defined (_MSC_VER) */
@@ -64,6 +72,8 @@ typedef string ACE_IOStream_String;
 #      endif /* __DECCXX_VER < 50700000 */
 #    endif /* __DECCXX_VER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Quoted_String : public ACE_IOStream_String
 {
 public:
@@ -88,11 +98,15 @@ public:
 #    endif /* ACE_WIN32 && defined (_MSC_VER) */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  endif /* ACE_HAS_STRING_CLASS */
 
 #  include "ace/Time_Value.h"
 #  include "ace/os_include/sys/os_types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Streambuf
  *
@@ -202,8 +216,8 @@ public:
   /// Query the streambuf for the size of its buffers.
   u_int streambuf_size (void);
 
-  /// Did we take an error because of an IO operation timeout?  Note:
-  /// Invoking this resets the flag.
+  /// Did we take an error because of an IO operation timeout?
+  /// @note Invoking this resets the flag.
   u_char timeout (void);
 
 protected:
@@ -342,6 +356,8 @@ protected:
 #  endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////////////////////////////////////////////////////
 
 // These typedefs are provided by G++ (on some systems?) without the
diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp
index 237ce56b8bc..082274256fe 100644
--- a/ace/IOStream_T.cpp
+++ b/ace/IOStream_T.cpp
@@ -16,6 +16,8 @@
 #include "ace/IOStream_T.inl"
 #endif /* !__ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // We will be given a STREAM by the iostream object which creates us.
 // See the ACE_IOStream template for how that works.  Like other
 // streambuf objects, we can be input-only, output-only or both.
@@ -238,6 +240,8 @@ operator<< (STREAM &stream,
   return stream;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_STRING_CLASS */
 #endif /* ACE_LACKS_ACE_IOSTREAM */
 #endif /* ACE_IOSTREAM_T_CPP */
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index e6577e041d8..4460ef4be9e 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -9,8 +9,8 @@
  *  @author James CE Johnson <jcej@lads.com>
  *  @author Jim Crossley <jim@lads.com>
  *
- * This file should not be #included directly by application
- * code. Instead, it should #include "ace/IOStream.h".  That's because
+ * This file should not be included directly by application
+ * code. Instead, it should include "ace/IOStream.h".  That's because
  * we only put some conditional compilations in that file.
  */
 //=============================================================================
@@ -28,13 +28,14 @@
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
 #  include "ace/INET_Addr.h"
-#  include "ace/Handle_Set.h"
 #  include "ace/Global_Macros.h"
 
 #  if defined (ACE_LACKS_IOSTREAM_FX)
 #   include "ace/os_include/os_ctype.h"
 #  endif /**/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #  if defined (ACE_HAS_STRING_CLASS)
 template <class STREAM> STREAM & operator>> (STREAM &stream, ACE_Quoted_String &str);
 template <class STREAM> STREAM & operator<< (STREAM &stream, ACE_Quoted_String &str);
@@ -277,6 +278,8 @@ protected:
   ACE_INET_Addr peer_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  if defined (__ACE_INLINE__)
 #    include "ace/IOStream_T.inl"
 #  endif /* __ACE_INLINE__ */
diff --git a/ace/IOStream_T.inl b/ace/IOStream_T.inl
index 9d2fd414ca1..73e00fa7bbf 100644
--- a/ace/IOStream_T.inl
+++ b/ace/IOStream_T.inl
@@ -1,9 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+#include "ace/Handle_Set.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_sys_select.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class STREAM> ACE_INLINE int
 ACE_IOStream<STREAM>::eof (void) const
 {
@@ -113,3 +117,5 @@ ACE_SOCK_Dgram_SC<STREAM>::get_remote_addr (ACE_INET_Addr &addr) const
   addr = peer_;
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IO_Cntl_Msg.cpp b/ace/IO_Cntl_Msg.cpp
index 3fac7c4abe6..9d64f05dd66 100644
--- a/ace/IO_Cntl_Msg.cpp
+++ b/ace/IO_Cntl_Msg.cpp
@@ -1,4 +1,3 @@
-// IO_Cntl_Msg.cpp
 // $Id$
 
 #include "ace/IO_Cntl_Msg.h"
@@ -16,6 +15,8 @@ ACE_RCSID(ace, IO_Cntl_Msg, "$Id$")
 #include "ace/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl
 template <class SYNCH> class ACE_Module;
 
@@ -35,7 +36,7 @@ public:
   ACE_Module *lower (void) { return this->mod_lower_; }
   void   lower (ACE_Module *l) { this->mod_lower_ = l; }
 
-  int    count (void) { return this->count_; }
+  int    count (void) const { return this->count_; }
   void   count (int c) { this->count_ = c; }
 
 private:
@@ -43,5 +44,8 @@ private:
   ACE_Module *mod_lower_;
   int    count_;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif
 
diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h
index 95277235643..c3101c7fac4 100644
--- a/ace/IO_Cntl_Msg.h
+++ b/ace/IO_Cntl_Msg.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_IO_Cntl_Msg
  *
@@ -99,6 +101,8 @@ private:
   int rval_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/IO_Cntl_Msg.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/IO_Cntl_Msg.inl b/ace/IO_Cntl_Msg.inl
index 215ea8caf8c..0fbf4190f35 100644
--- a/ace/IO_Cntl_Msg.inl
+++ b/ace/IO_Cntl_Msg.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_IO_Cntl_Msg::ACE_IO_Cntl_Msg (ACE_IO_Cntl_Cmds c)
 {
@@ -55,3 +58,4 @@ ACE_IO_Cntl_Msg::rval (int r)
   this->rval_ = r;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index b5c45f1b128..d65bc34c091 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -1,4 +1,3 @@
-// IO_SAP.cpp
 // $Id$
 
 #include "ace/IO_SAP.h"
@@ -15,6 +14,8 @@
 
 ACE_RCSID(ace, IO_SAP, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP)
 
 // This is the do-nothing constructor.  It does not perform a
@@ -137,3 +138,5 @@ ACE_IO_SAP::disable (int value) const
     }
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 50d530de4ae..b4ed13e451c 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_IO_SAP
  *
@@ -83,6 +86,8 @@ private:
   static pid_t pid_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/IO_SAP.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/IO_SAP.inl b/ace/IO_SAP.inl
index d120cd91b17..9d7d244e4db 100644
--- a/ace/IO_SAP.inl
+++ b/ace/IO_SAP.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// IO_SAP.i
-
 #include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_IO_SAP::~ACE_IO_SAP (void)
 {
@@ -38,4 +39,4 @@ ACE_IO_SAP::control (int cmd, void *arg) const
   return ACE_OS::ioctl (this->handle_, cmd, arg);
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index a67e8a2bd95..5e6f5d3199b 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -14,6 +14,8 @@
 
 ACE_RCSID(ace, IPC_SAP, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 
 void
@@ -57,7 +59,7 @@ ACE_IPC_SAP::enable (int value) const
       {
         // nonblocking argument (1)
         // blocking:            (0)
-        u_long nonblock = 1;
+        int nonblock = 1;
         return ACE_OS::ioctl (this->handle_,
                               FIONBIO,
                               &nonblock);
@@ -129,7 +131,7 @@ ACE_IPC_SAP::disable (int value) const
       // nonblocking argument (1)
       // blocking:            (0)
       {
-        u_long nonblock = 0;
+        int nonblock = 0;
         return ACE_OS::ioctl (this->handle_,
                               FIONBIO,
                               &nonblock);
@@ -187,3 +189,5 @@ ACE_IPC_SAP::disable (int value) const
 #endif /* ! ACE_WIN32 && ! VXWORKS */
   /* NOTREACHED */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index 72828c8f74c..98aa2bbf450 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_IPC_SAP
  *
@@ -30,8 +32,6 @@
 class ACE_Export ACE_IPC_SAP
 {
 public:
-  /// Default dtor.
-  ~ACE_IPC_SAP (void);
 
   /// Interface for <ioctl>.
   int control (int cmd, void *) const;
@@ -65,10 +65,19 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
+
   // = Ensure that ACE_IPC_SAP is an abstract base class.
   /// Default constructor.
   ACE_IPC_SAP (void);
 
+  /// Protected destructor.
+  /**
+   * Not a virtual destructor.  Protected destructor to prevent
+   * operator delete() from being called through a base class
+   * ACE_IPC_SAP pointer/reference.
+   */
+  ~ACE_IPC_SAP (void);
+
 private:
   /// Underlying I/O handle.
   ACE_HANDLE handle_;
@@ -77,6 +86,8 @@ private:
   static pid_t pid_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/IPC_SAP.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/IPC_SAP.inl b/ace/IPC_SAP.inl
index 69a5befa3b1..0adcb6e9b09 100644
--- a/ace/IPC_SAP.inl
+++ b/ace/IPC_SAP.inl
@@ -1,11 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// IPC_SAP.i
-
 #include "ace/OS_NS_stropts.h"
 
-// Used to return the underlying handle_.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_IPC_SAP::~ACE_IPC_SAP (void)
@@ -37,3 +36,5 @@ ACE_IPC_SAP::control (int cmd, void *arg) const
   ACE_TRACE ("ACE_IPC_SAP::control");
   return ACE_OS::ioctl (this->handle_, cmd, arg);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/If_Then_Else.h b/ace/If_Then_Else.h
index e9ca33a0631..163219e206b 100644
--- a/ace/If_Then_Else.h
+++ b/ace/If_Then_Else.h
@@ -17,6 +17,10 @@
 #ifndef ACE_IF_THEN_ELSE_H
 #define ACE_IF_THEN_ELSE_H
 
+#include "ace/config-lite.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
 
@@ -80,4 +84,6 @@ namespace ACE
 
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_IF_THEN_ELSE_H */
diff --git a/ace/Init_ACE.cpp b/ace/Init_ACE.cpp
index d1f098438bc..f997c09d4f8 100644
--- a/ace/Init_ACE.cpp
+++ b/ace/Init_ACE.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 unsigned int ACE::init_fini_count_ = 0;
 
 int
@@ -39,3 +41,5 @@ ACE::fini (void)
     // application!
     return -1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Init_ACE.h b/ace/Init_ACE.h
index 4d9d14da998..df2cea0c62f 100644
--- a/ace/Init_ACE.h
+++ b/ace/Init_ACE.h
@@ -8,8 +8,6 @@
  *
  *  Initialize ACE library services.  Can be called only once per
  *  program invocation.
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
  */
 //=============================================================================
 
@@ -25,12 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/**
- * @class ACE_Init_ACE
- *
- * @brief
- *
- */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   /**
@@ -61,6 +55,8 @@ namespace ACE
   extern unsigned int init_fini_count_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* ACE_INIT_ACE_H */
diff --git a/ace/Intrusive_List.cpp b/ace/Intrusive_List.cpp
index 7a23921288b..4a374c9b045 100644
--- a/ace/Intrusive_List.cpp
+++ b/ace/Intrusive_List.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_INTRUSIVE_LIST_C
-#define ACE_INTRUSIVE_LIST_C
+#ifndef ACE_INTRUSIVE_LIST_CPP
+#define ACE_INTRUSIVE_LIST_CPP
 
 #include "ace/Intrusive_List.h"
 
@@ -13,7 +13,7 @@
 #include "ace/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Intrusive_List, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 ACE_Intrusive_List<T>::ACE_Intrusive_List (void)
@@ -148,4 +148,6 @@ ACE_Intrusive_List<T>::check_invariants (void)
 }
 #endif /* 0 */
 
-#endif /* ACE_INTRUSIVE_LIST_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_INTRUSIVE_LIST_CPP */
diff --git a/ace/Intrusive_List.h b/ace/Intrusive_List.h
index a19e641c17d..fee24290712 100644
--- a/ace/Intrusive_List.h
+++ b/ace/Intrusive_List.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Intrusive_List
  *
@@ -117,6 +119,8 @@ private:
   T *tail_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Intrusive_List.inl b/ace/Intrusive_List.inl
index 2c513b4584f..56371fdd030 100644
--- a/ace/Intrusive_List.inl
+++ b/ace/Intrusive_List.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T> ACE_INLINE int
 ACE_Intrusive_List<T>::empty (void) const
 {
@@ -17,3 +21,5 @@ ACE_Intrusive_List<T>::tail (void) const
 {
   return this->tail_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Intrusive_List_Node.cpp b/ace/Intrusive_List_Node.cpp
index 58002653d2e..cd39a0cc91e 100644
--- a/ace/Intrusive_List_Node.cpp
+++ b/ace/Intrusive_List_Node.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_INTRUSIVE_LIST_NODE_C
-#define ACE_INTRUSIVE_LIST_NODE_C
+#ifndef ACE_INTRUSIVE_LIST_NODE_CPP
+#define ACE_INTRUSIVE_LIST_NODE_CPP
 
 #include "ace/Intrusive_List_Node.h"
 
@@ -13,7 +13,7 @@
 #include "ace/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Intrusive_List_Node, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T>
 ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node (void)
@@ -22,4 +22,6 @@ ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node (void)
 {
 }
 
-#endif /* ACE_INTRUSIVE_LIST_NODE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_INTRUSIVE_LIST_NODE_CPP */
diff --git a/ace/Intrusive_List_Node.h b/ace/Intrusive_List_Node.h
index b37b1c0204b..161a359f226 100644
--- a/ace/Intrusive_List_Node.h
+++ b/ace/Intrusive_List_Node.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Intrusive_List_Node
  *
@@ -65,6 +67,8 @@ private:
   T *next_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Intrusive_List_Node.inl b/ace/Intrusive_List_Node.inl
index e7f2c5ee3eb..0672be2f345 100644
--- a/ace/Intrusive_List_Node.inl
+++ b/ace/Intrusive_List_Node.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class T> ACE_INLINE T*
 ACE_Intrusive_List_Node<T>::prev (void) const
 {
@@ -23,3 +27,5 @@ ACE_Intrusive_List_Node<T>::next (T *x)
 {
   this->next_ = x;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/LOCK_SOCK_Acceptor.cpp b/ace/LOCK_SOCK_Acceptor.cpp
index 7c3f1763f14..183338b7efa 100644
--- a/ace/LOCK_SOCK_Acceptor.cpp
+++ b/ace/LOCK_SOCK_Acceptor.cpp
@@ -6,7 +6,7 @@
 #include "ace/Guard_T.h"
 #include "ace/LOCK_SOCK_Acceptor.h"
 
-ACE_RCSID(ace, LOCK_SOCK_Acceptor, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK> int
 ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream,
@@ -30,4 +30,6 @@ ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock (void)
   return this->lock_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LOCK_SOCK_ACCEPTOR_CPP */
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index 36a0afe19c8..ae7775d3039 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LOCK_SOCK_Acceptor
  *
@@ -50,6 +53,8 @@ protected:
   ACE_LOCK lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/LOCK_SOCK_Acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index 694744f01be..a1b210424ea 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -13,6 +13,8 @@ ACE_RCSID(ace, LSOCK, "$Id$")
 #include "ace/LSOCK.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK)
 
 void
@@ -173,4 +175,7 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const
     return ACE_INVALID_HANDLE;
 }
 #endif /* ACE_HAS_MSG */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 18921ef6d2f..fc9183a604d 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,13 +26,15 @@
 
 #include "ace/SOCK.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LSOCK
  *
  * @brief Create a Local ACE_SOCK, which is used for passing file
  * descriptors.
  */
-class ACE_Sockets_Export ACE_LSOCK
+class ACE_Export ACE_LSOCK
 {
 public:
 #if defined (ACE_HAS_MSG)
@@ -76,6 +73,8 @@ private:
   ACE_HANDLE aux_handle_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/LSOCK.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/LSOCK.inl b/ace/LSOCK.inl
index fcd0e6887fc..5dbbb0626a1 100644
--- a/ace/LSOCK.inl
+++ b/ace/LSOCK.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Simple-minded constructor.
 
 ACE_INLINE
@@ -36,3 +39,5 @@ ACE_LSOCK::ACE_LSOCK (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_LSOCK::ACE_LSOCK");
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp
index e8674429e77..ee154e3e087 100644
--- a/ace/LSOCK_Acceptor.cpp
+++ b/ace/LSOCK_Acceptor.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(ace, LSOCK_Acceptor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Acceptor)
 
 // Return the local endpoint address.
@@ -47,50 +49,50 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (void)
 
 int
 ACE_LSOCK_Acceptor::open (const ACE_Addr &remote_sap,
-			  int reuse_addr,
-			  int protocol_family,
-			  int backlog,
-			  int protocol)
+                          int reuse_addr,
+                          int protocol_family,
+                          int backlog,
+                          int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::open");
   this->local_addr_ = *((ACE_UNIX_Addr *) &remote_sap); // This is a gross hack...
   return ACE_SOCK_Acceptor::open (remote_sap, reuse_addr,
-				  protocol_family, backlog, protocol);
+                                  protocol_family, backlog, protocol);
 }
 
 // General purpose routine for performing server ACE_SOCK creation.
 
 ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap,
-					int reuse_addr,
-					int protocol_family,
-					int backlog,
-					int protocol)
+                                        int reuse_addr,
+                                        int protocol_family,
+                                        int backlog,
+                                        int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor");
   if (this->open (remote_sap,
-		  reuse_addr,
-		  protocol_family,
-		  backlog,
-		  protocol) == -1)
+                  reuse_addr,
+                  protocol_family,
+                  backlog,
+                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
-		"ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"));
+                "ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"));
 }
 
 // General purpose routine for accepting new connections.
 
 int
 ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream,
-			    ACE_Addr *remote_addr,
-			    ACE_Time_Value *timeout,
-			    int restart,
+                            ACE_Addr *remote_addr,
+                            ACE_Time_Value *timeout,
+                            int restart,
                             int reset_new_handle) const
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::accept");
 
   int in_blocking_mode = 0;
   if (this->shared_accept_start (timeout,
-				 restart,
-				 in_blocking_mode) == -1)
+                                 restart,
+                                 in_blocking_mode) == -1)
     return -1;
   else
     {
@@ -98,30 +100,30 @@ ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream,
       int len = 0;
 
       if (remote_addr != 0)
-	{
-	  len = remote_addr->get_size ();
-	  addr = (sockaddr *) remote_addr->get_addr ();
-	}
+        {
+          len = remote_addr->get_size ();
+          addr = (sockaddr *) remote_addr->get_addr ();
+        }
 
       do
-	new_stream.set_handle (ACE_OS::accept (this->get_handle (),
-					       addr,
-					       &len));
+        new_stream.set_handle (ACE_OS::accept (this->get_handle (),
+                                               addr,
+                                               &len));
       while (new_stream.get_handle () == ACE_INVALID_HANDLE
-	     && restart != 0
-	     && errno == EINTR
-	     && timeout == 0);
+             && restart != 0
+             && errno == EINTR
+             && timeout == 0);
 
       // Reset the size of the addr, which is only necessary for UNIX
       // domain sockets.
       if (new_stream.get_handle () != ACE_INVALID_HANDLE
-	  && remote_addr != 0)
-	remote_addr->set_size (len);
+          && remote_addr != 0)
+        remote_addr->set_size (len);
     }
 
   return this->shared_accept_finish (new_stream,
-				     in_blocking_mode,
-				     reset_new_handle);
+                                     in_blocking_mode,
+                                     reset_new_handle);
 }
 
 // Close down the UNIX domain stream and remove the rendezvous point
@@ -136,4 +138,6 @@ ACE_LSOCK_Acceptor::remove (void)
     || result == -1 ? -1 : 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index cc7c1dca103..8fec44e0f22 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -27,6 +27,8 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Reactor;
 
@@ -36,7 +38,7 @@ class ACE_Reactor;
  * @brief Defines the format and interface for the acceptor side of the
  * local ACE_SOCK ACE_Stream.
  */
-class ACE_Sockets_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor
+class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor
 {
 public:
   // = Initialization methods.
@@ -86,6 +88,8 @@ private:
   ACE_UNIX_Addr local_addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCAL_SOCK_ACCEPTOR_H */
diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp
index 4e58022b36c..17f80b9836f 100644
--- a/ace/LSOCK_CODgram.cpp
+++ b/ace/LSOCK_CODgram.cpp
@@ -1,4 +1,3 @@
-// LSOCK_CODgram.cpp
 // $Id$
 
 #include "ace/LSOCK_CODgram.h"
@@ -12,6 +11,8 @@ ACE_RCSID(ace, LSOCK_CODgram, "$Id$")
 #include "ace/LSOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram)
 
 void
@@ -31,13 +32,13 @@ ACE_LSOCK_CODgram::dump (void) const
 
 int
 ACE_LSOCK_CODgram::open (const ACE_Addr &remote,
-			 const ACE_Addr &local,
-			 int protocol_family,
-			 int protocol)
+                         const ACE_Addr &local,
+                         int protocol_family,
+                         int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_CODgram::open");
   if (ACE_SOCK_CODgram::open (remote, local, protocol_family,
-			      protocol) == -1)
+                              protocol) == -1)
     return -1;
   ACE_LSOCK::set_handle (this->get_handle ());
   return 0;
@@ -46,13 +47,16 @@ ACE_LSOCK_CODgram::open (const ACE_Addr &remote,
 /* Create a local ACE_SOCK datagram. */
 
 ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote,
-				      const ACE_Addr &local,
-				      int protocol_family,
-				      int protocol)
+                                      const ACE_Addr &local,
+                                      int protocol_family,
+                                      int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram");
   if (this->open (remote, local, protocol_family,
-		  protocol) == -1)
+                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_LSOCK_CODgram")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index e0c8cfc6dfb..3f017e8816b 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,13 +27,15 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LSOCK_CODgram
  *
  * @brief Defines the member functions for the <ACE_LSOCK> connected
  * datagram abstraction.
  */
-class ACE_Sockets_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK
+class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK
 {
 public:
   // = Initialization methods.
@@ -65,6 +67,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/LSOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/LSOCK_CODgram.inl b/ace/LSOCK_CODgram.inl
index 48c7280459f..d27ee2fd881 100644
--- a/ace/LSOCK_CODgram.inl
+++ b/ace/LSOCK_CODgram.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Do nothing constructor.
 
 ACE_INLINE
@@ -23,3 +26,5 @@ ACE_LSOCK_CODgram::get_handle (void) const
   ACE_TRACE ("ACE_LSOCK_CODgram::get_handle");
   return this->ACE_SOCK_CODgram::get_handle ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index 4b29ff1e0cf..f495744b1b8 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(ace, LSOCK_Connector, "$Id$")
 #include "ace/LSOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
 
 void
@@ -32,16 +34,16 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (void)
 
 // Establish a connection.
 ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
-					  const ACE_UNIX_Addr &remote_sap,
-					  ACE_Time_Value *timeout,
-					  const ACE_Addr &local_sap,
-					  int reuse_addr,
-					  int flags,
-					  int perms)
+                                          const ACE_UNIX_Addr &remote_sap,
+                                          ACE_Time_Value *timeout,
+                                          const ACE_Addr &local_sap,
+                                          int reuse_addr,
+                                          int flags,
+                                          int perms)
   : ACE_SOCK_Connector (new_stream,
                         remote_sap,
                         timeout,
-			local_sap,
+                        local_sap,
                         reuse_addr,
                         flags,
                         perms)
@@ -52,4 +54,6 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
   new_stream.set_handle (new_stream.get_handle ());
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index 558fc4a8f81..a362a1587d4 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,13 +26,15 @@
 #include "ace/LSOCK_Stream.h"
 #include "ace/UNIX_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LSOCK_Connector
  *
  * @brief Defines the format and interface for the connector side of
  * the <ACE_LSOCK_Stream>.
  */
-class ACE_Sockets_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector
+class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector
 {
 public:
   // = Initialization methods.
@@ -78,6 +80,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/LSOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/LSOCK_Connector.inl b/ace/LSOCK_Connector.inl
index 3638a687297..f9cdffbf6dc 100644
--- a/ace/LSOCK_Connector.inl
+++ b/ace/LSOCK_Connector.inl
@@ -1,24 +1,27 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Establish a connection.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+// Establish a connection.
 ACE_INLINE int
 ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream,
-			      const ACE_UNIX_Addr &remote_sap,
-			      ACE_Time_Value *timeout,
-			      const ACE_Addr &local_sap,
-			      int reuse_addr,
-			      int flags,
-			      int perms)
+                              const ACE_UNIX_Addr &remote_sap,
+                              ACE_Time_Value *timeout,
+                              const ACE_Addr &local_sap,
+                              int reuse_addr,
+                              int flags,
+                              int perms)
 {
   ACE_TRACE ("ACE_LSOCK_Connector::connect");
   int result = ACE_SOCK_Connector::connect (new_stream, remote_sap,
-					    timeout, local_sap,
-					    reuse_addr, flags, perms);
+                                            timeout, local_sap,
+                                            reuse_addr, flags, perms);
   if (result != -1)
     // This is necessary due to the weird inheritance relationships of ACE_LSOCK_Stream.
     new_stream.set_handle (new_stream.get_handle ());
   return result;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp
index 9b4cebddc89..3c65d24b88c 100644
--- a/ace/LSOCK_Dgram.cpp
+++ b/ace/LSOCK_Dgram.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(ace, LSOCK_Dgram, "$Id$")
 #include "ace/LSOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram)
 
 void
@@ -37,13 +39,13 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (void)
 
 int
 ACE_LSOCK_Dgram::open (const ACE_Addr &local,
-		       int protocol_family,
-		       int protocol)
+                       int protocol_family,
+                       int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Dgram::open");
   if (ACE_SOCK_Dgram::open (local,
                             protocol_family,
-			    protocol) == -1)
+                            protocol) == -1)
     return -1;
   ACE_LSOCK::set_handle (this->ACE_SOCK_Dgram::get_handle ());
   return 0;
@@ -52,16 +54,18 @@ ACE_LSOCK_Dgram::open (const ACE_Addr &local,
 // Create a local ACE_SOCK datagram.
 
 ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local,
-				  int protocol_family,
-				  int protocol)
+                                  int protocol_family,
+                                  int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram");
   if (this->open (local,
                   protocol_family,
-		  protocol) == -1)
+                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_LSOCK_Dgram")));
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index 4d6939e1c73..4a1b43eaf8c 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,12 +26,14 @@
 #include "ace/SOCK_Dgram.h"
 #include "ace/LSOCK.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LSOCK_Dgram
  *
  * @brief Create a Local ACE_SOCK datagram.
  */
-class ACE_Sockets_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK
+class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK
 {
 public:
   // = Initialization methods.
@@ -62,6 +63,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/LSOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/LSOCK_Dgram.inl b/ace/LSOCK_Dgram.inl
index 14c415ceaa8..2c29136e06d 100644
--- a/ace/LSOCK_Dgram.inl
+++ b/ace/LSOCK_Dgram.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// LSOCK_Dgram.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h)
@@ -18,3 +19,4 @@ ACE_LSOCK_Dgram::get_handle (void) const
   return this->ACE_SOCK_Dgram::get_handle ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp
index 51cbaa74db0..6ac123661cf 100644
--- a/ace/LSOCK_Stream.cpp
+++ b/ace/LSOCK_Stream.cpp
@@ -1,4 +1,3 @@
-// LSOCK_Stream.cpp
 // $Id$
 
 #include "ace/LSOCK_Stream.h"
@@ -13,6 +12,8 @@ ACE_RCSID(ace, LSOCK_Stream, "$Id$")
 #include "ace/LSOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Stream)
 
 int
@@ -91,7 +92,7 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
   return ACE_OS::sendmsg (this->ACE_SOCK_Stream::get_handle (),
-			  &send_msg, 0);
+                          &send_msg, 0);
 }
 
 // Read a readv-style vector of buffers, along with an open I/O
@@ -99,8 +100,8 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
 
 ssize_t
 ACE_LSOCK_Stream::recv_msg (iovec iov[],
-			    size_t n,
-			    ACE_HANDLE &handle)
+                            size_t n,
+                            ACE_HANDLE &handle)
 {
   ACE_TRACE ("ACE_LSOCK_Stream::recv_msg");
   msghdr recv_msg;
@@ -118,7 +119,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[],
   recv_msg.msg_control = cmsgbuf;
   recv_msg.msg_controllen = sizeof cmsgbuf;
   ssize_t result = ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (),
-				    &recv_msg, 0);
+                                    &recv_msg, 0);
   handle = *(ACE_HANDLE*) CMSG_DATA (cmsgptr) ;
   return result;
 #else
@@ -126,8 +127,11 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[],
   recv_msg.msg_accrightslen = sizeof handle;
 
   return ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (),
-			  &recv_msg, 0);
+                          &recv_msg, 0);
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 }
 #endif /* ACE_HAS_MSG */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index 639047db334..68c43a4c221 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -27,12 +27,14 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_LSOCK_Stream
  *
  * @brief Create a Local ACE_SOCK stream.
  */
-class ACE_Sockets_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK
+class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK
 {
 public:
   // = Send/recv methods.
@@ -69,6 +71,8 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/LSOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/LSOCK_Stream.inl b/ace/LSOCK_Stream.inl
index 7b94768e3c7..bf7e45b376d 100644
--- a/ace/LSOCK_Stream.inl
+++ b/ace/LSOCK_Stream.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Sets both the file descriptors... Overrides handle from the base
 // classes.
 
@@ -19,5 +22,4 @@ ACE_LSOCK_Stream::get_handle (void) const
   return this->ACE_SOCK_Stream::get_handle ();
 }
 
-
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index 9c6ae0faff6..c95c29aab17 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -25,6 +25,8 @@ extern "C" int LIB$FIND_IMAGE_SYMBOL(...);
 
 ACE_RCSID(ace, Lib_Find, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if ! defined (ACE_PSOS_DIAB_MIPS)
 int
 ACE::ldfind (const ACE_TCHAR* filename,
@@ -700,3 +702,6 @@ ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
 
   return replaced;
 }
+
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h
index 17d28284f14..8ca34d44367 100644
--- a/ace/Lib_Find.h
+++ b/ace/Lib_Find.h
@@ -8,8 +8,6 @@
  *  libraries.
  *
  *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
  */
 //=============================================================================
 
@@ -21,6 +19,7 @@
 #include "ace/ACE_export.h"
 #include "ace/os_include/os_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -100,5 +99,8 @@ namespace ACE
                                          wchar_t *&next_start);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* ACE_LIB_FIND_H */
+
diff --git a/ace/Local_Memory_Pool.cpp b/ace/Local_Memory_Pool.cpp
index c7029c0c951..96a647ed6fd 100644
--- a/ace/Local_Memory_Pool.cpp
+++ b/ace/Local_Memory_Pool.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(ace, Local_Memory_Pool, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool)
 
 void
@@ -139,12 +141,4 @@ ACE_Local_Memory_Pool::round_up (size_t nbytes)
   return ACE::round_to_pagesize (static_cast<off_t> (nbytes));
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<char>;
-template class ACE_Unbounded_Set<char *>;
-template class ACE_Unbounded_Set_Iterator<char *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<char>
-#pragma instantiate ACE_Unbounded_Set<char *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<char *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Local_Memory_Pool.h b/ace/Local_Memory_Pool.h
index f5762b9bc14..caf22055273 100644
--- a/ace/Local_Memory_Pool.h
+++ b/ace/Local_Memory_Pool.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #include "ace/Unbounded_Set.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Local_Memory_Pool_Options
  *
@@ -125,5 +127,7 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCAL_MEMORY_POOL_H */
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 27ee8c84ddf..1c58e14ae19 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -1,4 +1,5 @@
 #include "ace/Local_Name_Space.h"
+#include "ace/ACE.h"
 #include "ace/RW_Process_Mutex.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
@@ -7,6 +8,8 @@ ACE_RCSID (ace,
            Local_Name_Space,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_NS_String::~ACE_NS_String (void)
 {
   if (this->delete_rep_)
@@ -129,6 +132,8 @@ ACE_NS_String::hash (void) const
 }
 
 ACE_NS_Internal::ACE_NS_Internal (void)
+  : value_ (),
+    type_ ()
 {
 }
 
@@ -160,55 +165,4 @@ ACE_NS_Internal::type (void)
   return this->type_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if (1)
-template class ACE_Hash_Map_Entry<ACE_NS_String, ACE_NS_Internal>;
-template class ACE_Hash<ACE_NS_String>;
-template class ACE_Equal_To<ACE_NS_String>;
-template class ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
-#else
-template class ACE_Map_Entry<ACE_NS_String, ACE_NS_Internal>;
-template class ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
-#endif
-template class ACE_Unbounded_Set<ACE_Name_Binding>;
-template class ACE_Unbounded_Set_Iterator<ACE_Name_Binding>;
-template class ACE_Unbounded_Set<ACE_NS_WString>;
-template class ACE_Unbounded_Set_Iterator<ACE_NS_WString>;
-template class ACE_Node<ACE_NS_WString>;
-template class ACE_Node<ACE_Name_Binding>;
-template class ACE_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if (1)
-#pragma instantiate ACE_Hash_Map_Entry<ACE_NS_String, ACE_NS_Internal>
-#pragma instantiate ACE_Hash<ACE_NS_String>
-#pragma instantiate ACE_Equal_To<ACE_NS_String>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>
-#else
-#pragma instantiate ACE_Map_Entry<ACE_NS_String, ACE_NS_Internal>
-#pragma instantiate ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>
-#endif
-#pragma instantiate ACE_Unbounded_Set<ACE_Name_Binding>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Name_Binding>
-#pragma instantiate ACE_Unbounded_Set<ACE_NS_WString>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_NS_WString>
-#pragma instantiate ACE_Node<ACE_NS_WString>
-#pragma instantiate ACE_Node<ACE_Name_Binding>
-#pragma instantiate ACE_Guard<ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_RW_Process_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index ae08bd37917..fbb837824c8 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_NS_WString;
 
 /**
@@ -120,6 +122,8 @@ private:
   const char *type_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Include the ACE_Local_Name_Space templates stuff at this point.
 #include "ace/Local_Name_Space_T.h"
 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 674c774e153..87f5e51362e 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef ACE_LOCAL_NAME_SPACE_T_CPP
 #define ACE_LOCAL_NAME_SPACE_T_CPP
 
@@ -14,10 +16,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (ace,
-           Local_Name_Space_T,
-           "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ALLOCATOR>
 ACE_Name_Space_Map<ALLOCATOR>::ACE_Name_Space_Map (ALLOCATOR *alloc)
@@ -331,7 +330,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (
   size_t len = ACE_OS::strlen (ns_internal.type ());
   // Makes a copy here. Caller needs to call delete to free up
   // memory.
-  char *new_type;
+  char *new_type = 0;
   ACE_NEW_RETURN (new_type,
                   char [len + 1],
                   -1);
@@ -965,4 +964,6 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LOCAL_NAME_SPACE_T_CPP */
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 97602b7019f..14ed9377b30 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -27,19 +27,29 @@
 #include "ace/Local_Name_Space.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// A short-hand name for our set of name/value/type tuples passed back
 /// to callers.
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Simplify later usage by defining typedefs.
 #if (1)
 # include "ace/Hash_Map_Manager_T.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex> MAP_MANAGER;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #else
 # include "ace/Map_Manager.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_MANAGER;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* 0 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// @deprecated Deprecated typedefs.  Use the map's traits instead.
 typedef MAP_MANAGER::ITERATOR MAP_ITERATOR;
 typedef MAP_MANAGER::ENTRY MAP_ENTRY;
@@ -256,6 +266,8 @@ private:
   ACE_LOCK *lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Local_Name_Space_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index c575ac63735..b2b5ab476a6 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (ace,
            Local_Tokens,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Tokens::dump (void) const
 {
@@ -1621,21 +1623,6 @@ ACE_Local_WLock::clone (void) const
   return temp;
 }
 
-// ************************************************************
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if !defined (ACE_NO_TSS_TOKENS)
-template class ACE_TSS <ACE_TPQ_Entry>;
-#endif /* ACE_NO_TSS_TOKENS */
-template class ACE_Unbounded_Stack <ACE_TPQ_Entry *>;
-template class ACE_Node <ACE_TPQ_Entry *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if !defined (ACE_NO_TSS_TOKENS)
-#pragma instantiate ACE_TSS <ACE_TPQ_Entry>
-#endif /* ACE_NO_TSS_TOKENS */
-#pragma instantiate ACE_Unbounded_Stack <ACE_TPQ_Entry *>
-#pragma instantiate ACE_Node <ACE_TPQ_Entry *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 6e68856d02e..1351f73f49f 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -67,6 +67,8 @@
 # define ACE_NO_TSS_TOKENS 1
 #endif /* !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // 1.
 /**
  * @class ACE_TOKEN_CONST
@@ -77,9 +79,8 @@
  * this class is necessary to fight the compiler with order of
  * declaration errors.
  */
-class ACE_Export ACE_TOKEN_CONST
+namespace ACE_TOKEN_CONST
 {
-public:
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   // ACE platform supports some form of threading.
   typedef ACE_Condition_Thread_Mutex COND_VAR;
@@ -90,7 +91,7 @@ public:
   typedef ACE_Null_Mutex MUTEX;
   typedef ACE_Guard<ACE_Null_Mutex> GUARD;
 #endif /* ACE_HAS_THREADS */
-};
+}
 
 // Forward decl.
 class ACE_Token_Proxy;
@@ -105,7 +106,7 @@ class ACE_Token_Proxy;
  */
 class ACE_Export ACE_TPQ_Entry
 {
-friend class ACE_Token_Manager;
+  friend class ACE_Token_Manager;
 public:
   typedef void (*PTVF) (void *);
 
@@ -357,15 +358,15 @@ protected:
  * Not a public interface.
  * Currently, I don't see a reason for providing an abstract
  * interface at this level of the library.  As of yet, no one
- * uses <ACE_Tokens> derivatives through this abstract interface
- * except for <ACE_Token_Manager>.  It only uses the statistical
+ * uses ACE_Tokens derivatives through this abstract interface
+ * except for ACE_Token_Manager.  It only uses the statistical
  * methods which are shared by all Tokens.  For that reason, it
  * still makes since to have a common base class.  However,
  * acquire, renew, and release do not need to have matching
  * interfaces throughout all Tokens.
  * To add a new type of token (e.g. semaphore), this class must
  * be subtyped to define the new semantics.  See
- * <ACE_Token_Manager> for details.
+ * ACE_Token_Manager for details.
  */
 class ACE_Export ACE_Tokens
 {
@@ -1109,6 +1110,8 @@ protected:
   ACE_Tokens *create_token (const ACE_TCHAR *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Local_Tokens.inl b/ace/Local_Tokens.inl
index 3008f25c69a..ddbbf0343cf 100644
--- a/ace/Local_Tokens.inl
+++ b/ace/Local_Tokens.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ************************************************************
 
 ACE_INLINE int
@@ -281,4 +284,6 @@ ACE_Token_Name::operator== (const ACE_Token_Name &rhs) const
   return (ACE_OS::strcmp (this->token_name_, rhs.name ()) == 0);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Lock.cpp b/ace/Lock.cpp
index e0ea8397846..dca934b8067 100644
--- a/ace/Lock.cpp
+++ b/ace/Lock.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(ace, Lock, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Lock::~ACE_Lock (void)
 {
 }
@@ -82,3 +84,5 @@ ACE_Adaptive_Lock::dump (void) const
   //  return this->lock_->dump ();
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Lock.h b/ace/Lock.h
index 68bacb35dd8..3a8eac292e4 100644
--- a/ace/Lock.h
+++ b/ace/Lock.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Lock
  *
@@ -149,6 +151,8 @@ protected:
   ACE_Lock *lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Lock.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Lock.inl b/ace/Lock.inl
index bd6d1585cc9..7e4842a0e33 100644
--- a/ace/Lock.inl
+++ b/ace/Lock.inl
@@ -1,8 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Lock::ACE_Lock (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Lock_Adapter_T.cpp b/ace/Lock_Adapter_T.cpp
index d71a1fbd2fc..ec0c013a220 100644
--- a/ace/Lock_Adapter_T.cpp
+++ b/ace/Lock_Adapter_T.cpp
@@ -14,6 +14,7 @@
 #include "ace/Lock_Adapter_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This constructor isn't inlined, because SunPRO C++ 4.2 + patch
 // 104631-07 has trouble compiling TAO with it inline.
@@ -111,4 +112,6 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void)
   return this->lock_->tryacquire_write_upgrade ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LOCK_ADAPTER_T_CPP */
diff --git a/ace/Lock_Adapter_T.h b/ace/Lock_Adapter_T.h
index 76445506e0a..93ee250de4b 100644
--- a/ace/Lock_Adapter_T.h
+++ b/ace/Lock_Adapter_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Lock_Adapter
  *
@@ -103,6 +105,8 @@ private:
   int delete_lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Lock_Adapter_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Lock_Adapter_T.inl b/ace/Lock_Adapter_T.inl
index 2ecd393d56d..f3b09bc0ab7 100644
--- a/ace/Lock_Adapter_T.inl
+++ b/ace/Lock_Adapter_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCKING_MECHANISM>
 ACE_INLINE
 ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (
@@ -10,3 +12,5 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (
     delete_lock_ (0)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index cbb5c22b008..31d32bb6ca4 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -43,6 +43,8 @@
 
 ACE_RCSID(ace, Log_Msg, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 
 // only used here...  dhinton
@@ -58,11 +60,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
     defined (ACE_HAS_TSS_EMULATION)
 
+static ACE_thread_key_t the_log_msg_tss_key = 0;
+
 ACE_thread_key_t *log_msg_tss_key (void)
 {
-  static ACE_thread_key_t key = 0;
-
-  return &key;
+  return &the_log_msg_tss_key;
 }
 
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
@@ -91,16 +93,6 @@ ACE_thread_key_t *log_msg_tss_key (void)
 /// deleted.
 int ACE_Log_Msg::instance_count_ = 0;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-# if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0)
-    template class ACE_Cleanup_Adapter<ACE_Log_Msg>;
-# endif /* ! ACE_MT_SAFE */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0)
-#   pragma instantiate ACE_Cleanup_Adapter<ACE_Log_Msg>
-# endif /* ! ACE_MT_SAFE */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 /**
  * @class ACE_Log_Msg_Manager
  *
@@ -240,7 +232,7 @@ ACE_Log_Msg_Manager::close (void)
 #  endif /* ACE_HAS_THR_C_DEST */
 LOCAL_EXTERN_PREFIX
 void
-ACE_TSS_cleanup (void *ptr)
+ACE_TSS_CLEANUP_NAME (void *ptr)
 {
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
   // Delegate to thr_desc if this not has terminated
@@ -307,7 +299,7 @@ ACE_Log_Msg::instance (void)
           {
             ACE_NO_HEAP_CHECK;
             if (ACE_Thread::keycreate (log_msg_tss_key (),
-                                       &ACE_TSS_cleanup) != 0)
+                                       &ACE_TSS_CLEANUP_NAME) != 0)
               {
                 if (1 == ACE_OS_Object_Manager::starting_up())
                   //This function is called before ACE_OS_Object_Manager is
@@ -491,6 +483,32 @@ ACE_Log_Msg::close (void)
              // already deleted by ACE_TSS_Cleanup::exit (), so we
              // don't want to access it again.
              key_created_ = 0;
+#ifdef ACE_HAS_BROKEN_THREAD_KEYFREE
+             // for some systems, e.g. LynxOS, we need to ensure that
+             // any registered thread destructor action for this thread
+             // is disabled. Otherwise in the event of a dynamic library
+             // unload of libACE, by a program not linked with libACE,
+             // ACE_TSS_cleanup will be invoked after libACE has been unloaded.
+
+             ACE_Log_Msg *tss_log_msg = 0;
+
+             // Get the tss_log_msg from thread-specific storage.
+             if ( ACE_Thread::getspecific (*(log_msg_tss_key ()),
+                           ACE_reinterpret_cast (void **, &tss_log_msg)) != -1
+                  && tss_log_msg)
+             {
+               // we haven't been cleaned up
+               ACE_TSS_cleanup(tss_log_msg);
+
+               if ( ACE_Thread::setspecific( (*log_msg_tss_key()),
+                                             (void *)NULL ) != 0 )
+               {
+                  ACE_DEBUG ((LM_DEBUG,
+                              ACE_LIB_TEXT ("(%P|%t) ACE_Log_Msg::close failed to ACE_Thread::setspecific to NULL\n")));
+               }
+
+             }
+#endif /* ACE_HAS_BROKEN_THREAD_KEYFREE */
            }
 
          ACE_OS::thread_mutex_unlock (lock);
@@ -627,6 +645,7 @@ ACE_Log_Msg::ACE_Log_Msg (void)
   : status_ (0),
     errnum_ (0),
     linenum_ (0),
+    msg_ (0),
     restart_ (1),  // Restart by default...
     ostream_ (0),
     msg_callback_ (0),
@@ -666,6 +685,8 @@ ACE_Log_Msg::ACE_Log_Msg (void)
           this->timestamp_ = 2;
         }
     }
+
+  ACE_NEW_NORETURN (this->msg_, ACE_TCHAR[ACE_MAXLOGMSGLEN+1]);
 }
 
 ACE_Log_Msg::~ACE_Log_Msg (void)
@@ -734,6 +755,8 @@ ACE_Log_Msg::~ACE_Log_Msg (void)
       ostream_ = 0;
     }
 #endif
+
+  delete[] this->msg_;
 }
 
 // Open the sender-side of the message queue.
@@ -1650,68 +1673,73 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
                     wchar_t *str = va_arg (argp, wchar_t *);
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
-                    if (can_check)
-                      this_len = ACE_OS::snprintf
-                        (bp, bspace, format, str ? str : ACE_LIB_TEXT ("(null)"));
-                    else
-                      this_len = ACE_OS::sprintf
-                        (bp, format, str ? str : ACE_LIB_TEXT ("(null)"));
 #else /* ACE_WIN32 && ACE_USES_WCHAR */
                     ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *);
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, str ? str : ACE_LIB_TEXT ("(null)"));
                     else
                       this_len = ACE_OS::sprintf
                         (bp, format, str ? str : ACE_LIB_TEXT ("(null)"));
-#endif /* ACE_WIN32 && ACE_USES_WCHAR */
                     ACE_UPDATE_COUNT (bspace, this_len);
                   }
                   break;
 
                 case 'C':         // Char string, Unicode for Win32/WCHAR
+                  {
+                    ACE_TCHAR *cstr = va_arg (argp, ACE_TCHAR *);
 #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 #else /* ACE_WIN32 && ACE_USES_WCHAR */
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
-                  if (can_check)
-                    this_len = ACE_OS::snprintf
-                      (bp, bspace, format, va_arg (argp, ACE_TCHAR *));
-                  else
-                    this_len = ACE_OS::sprintf
-                      (bp, format, va_arg (argp, ACE_TCHAR *));
-                  ACE_UPDATE_COUNT (bspace, this_len);
+                    if (can_check)
+                      this_len = ACE_OS::snprintf
+                        (bp, bspace, format, cstr ? cstr : ACE_LIB_TEXT ("(null)"));
+                    else
+                      this_len = ACE_OS::sprintf
+                        (bp, format, cstr ? cstr : ACE_LIB_TEXT ("(null)"));
+                    ACE_UPDATE_COUNT (bspace, this_len);
+                  }
                   break;
 
                 case 'W':
+                  {
 #if defined (ACE_WIN32)
+                    ACE_TCHAR *wstr = va_arg (argp, ACE_TCHAR *);
 # if defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s"));
 # else /* ACE_USES_WCHAR */
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # endif /* ACE_USES_WCHAR */
-                  if (can_check)
-                    this_len = ACE_OS::snprintf
-                      (bp, bspace, format, va_arg (argp, ACE_TCHAR *));
-                  else
-                    this_len = ACE_OS::sprintf
-                      (bp, format, va_arg (argp, ACE_TCHAR *));
+
+                    if (can_check)
+                      this_len = ACE_OS::snprintf
+                        (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
+                    else
+                      this_len = ACE_OS::sprintf
+                        (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
+
 #else
+                    wchar_t *wchar_str = va_arg (argp, wchar_t *);
+
 # if defined (HPUX)
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # else
-                  ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
+                    ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
 # endif /* HPUX */
-                  if (can_check)
-                    this_len = ACE_OS::snprintf
-                      (bp, bspace, format, va_arg (argp, wchar_t *));
-                  else
-                    this_len = ACE_OS::sprintf
-                      (bp, format, va_arg (argp, wchar_t *));
+
+                    if (can_check)
+                      this_len = ACE_OS::snprintf
+                        (bp, bspace, format, wchar_str);
+                    else
+                      this_len = ACE_OS::sprintf
+                        (bp, format, wchar_str);
 #endif /* ACE_WIN32 */
-                  ACE_UPDATE_COUNT (bspace, this_len);
+                    ACE_UPDATE_COUNT (bspace, this_len);
+                  }
                   break;
 
                 case 'w':              // Wide character
@@ -1968,7 +1996,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 
   // Check that memory was not corrupted, if it corrupted we can't log anything
   // anymore because all our members could be corrupted.
-  if (bp >= this->msg_ + sizeof this->msg_)
+  if (bp >= (this->msg_ + ACE_MAXLOGMSGLEN+1))
     {
       abort_prog = 1;
       ACE_OS::fprintf (stderr,
@@ -2154,11 +2182,12 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
   if (this->log_priority_enabled (log_priority) == 0)
     return 0;
 
-  ACE_TCHAR buf[ACE_Log_Record::MAXLOGMSGLEN -
-    ACE_Log_Record::VERBOSE_LEN - 58];
-  // 58 for the HEXDUMP header;
+  ACE_TCHAR* buf = 0;
+  const size_t buf_sz =
+    ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN - 58;
+  ACE_NEW_RETURN (buf, ACE_TCHAR[buf_sz], -1);
 
-  ACE_TCHAR *msg_buf;
+  ACE_TCHAR *msg_buf = 0;
   const size_t text_sz = text ? ACE_OS::strlen(text) : 0;
   ACE_NEW_RETURN (msg_buf,
                   ACE_TCHAR[text_sz + 58],
@@ -2167,7 +2196,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
   buf[0] = 0; // in case size = 0
 
   const size_t len = ACE::format_hexdump
-    (buffer, size, buf, sizeof (buf) / sizeof (ACE_TCHAR) - text_sz);
+    (buffer, size, buf, buf_sz / sizeof (ACE_TCHAR) - text_sz);
 
   int sz = 0;
 
@@ -2447,7 +2476,7 @@ void
 ACE_Log_Msg::msg (const ACE_TCHAR *m)
 {
   ACE_OS::strsncpy (this->msg_, m,
-                    (sizeof this->msg_ / sizeof (ACE_TCHAR)));
+                    ((ACE_MAXLOGMSGLEN+1) / sizeof (ACE_TCHAR)));
 }
 
 ACE_Log_Msg_Callback *
@@ -2647,3 +2676,5 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc,
 #  endif /* ACE_PSOS */
 #endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG  &&  ! ACE_HAS_MINIMAL_ACE_OS */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 9d4b878d375..bc890417445 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -25,20 +25,9 @@
 #include "ace/Log_Priority.h"
 #include "ace/os_include/os_limits.h"
 
-// The following ASSERT macro is courtesy of Alexandre Karev
-// <akg@na47sun05.cern.ch>.
-#if defined (ACE_NDEBUG)
-#define ACE_ASSERT(x)
-#elif !defined (ACE_ASSERT)
-#define ACE_ASSERT(X) \
-  do { if(!(X)) { \
-  int __ace_error = ACE_Log_Msg::last_error_adapter (); \
-  ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
-  ace___->set (__FILE__, __LINE__, -1, __ace_error, ace___->restart (), \
-               ace___->msg_ostream (), ace___->msg_callback ()); \
-  ace___->log (LM_ERROR, ACE_LIB_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), ACE_TEXT_TO_TCHAR_IN (#X), -1); \
-  } } while (0)
-#endif  /* ACE_NDEBUG */
+// The ACE_ASSERT macro used to be defined here, include ace/Assert.h
+// for backwards compatibility.
+#include "ace/Assert.h"
 
 #if defined (ACE_NLOGGING)
 #define ACE_HEX_DUMP(X) do {} while (0)
@@ -113,6 +102,8 @@
 # undef THREAD
 #endif /* THREAD */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Log_Msg_Callback;
 class ACE_Log_Msg_Backend;
 
@@ -347,7 +338,7 @@ public:
    * allow "chaining". Note that as opposed to ACE_Log_Msg_Callback,
    * ACE_Log_Msg_Backend is a per-process entity.
    *
-   * Note: Be aware that because of the current architecture there is
+   * @note Be aware that because of the current architecture there is
    * no guarantee that open (), reset () and close () will be called
    * on a backend object.
    *
@@ -388,19 +379,19 @@ public:
   // because the *semantics* have changed (the objects are no longer
   // TSS).
   /// Get TSS exception action.
-  /// NOTE: The action is no longer TSS, they are global!
+  /// @note The action is no longer TSS, they are global!
   ACE_SEH_EXCEPT_HANDLER seh_except_selector (void);
 
   /// Set TSS exception action.
-  /// NOTE: The action is no longer TSS, they are global!
+  /// @note The action is no longer TSS, they are global!
   ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER);
 
   /// Get TSS exception handler.
-  /// NOTE: The handler is no longer TSS, they are global!
+  /// @note The handler is no longer TSS, they are global!
   ACE_SEH_EXCEPT_HANDLER seh_except_handler (void);
 
   /// Set TSS exception handler.
-  /// NOTE: The handler is no longer TSS, they are global!
+  /// @note The handler is no longer TSS, they are global!
   ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER);
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ACE_LEGACY_MODE */
 
@@ -585,7 +576,7 @@ private:
   /// The log message, which resides in thread-specific storage.  Note
   /// that only the current log message is stored here -- it will be
   /// overwritten by the subsequent call to log().
-  ACE_TCHAR msg_[ACE_MAXLOGMSGLEN + 1]; // Add one for NUL-terminator.
+  ACE_TCHAR* msg_; // Add one for NUL-terminator.
 
   /// Indicates whether we should restart system calls that are
   /// interrupted.
@@ -697,6 +688,8 @@ private:
   ACE_Log_Msg (const ACE_Log_Msg &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
      defined (ACE_HAS_TSS_EMULATION)
@@ -706,9 +699,15 @@ private:
 #  else
 #   define LOCAL_EXTERN_PREFIX
 #  endif /* ACE_HAS_THR_C_DEST */
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# define ACE_TSS_CLEANUP_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _TSS_cleanup))
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
 LOCAL_EXTERN_PREFIX
 void
-ACE_TSS_cleanup (void *ptr);
+ACE_TSS_CLEANUP_NAME (void *ptr);
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
 #endif /* ACE_MT_SAFE */
 
diff --git a/ace/Log_Msg_Backend.cpp b/ace/Log_Msg_Backend.cpp
index 8e4ae6208f3..de9b9c22b7b 100644
--- a/ace/Log_Msg_Backend.cpp
+++ b/ace/Log_Msg_Backend.cpp
@@ -4,6 +4,11 @@
 
 ACE_RCSID(ace, Log_Msg_Backend, "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Msg_Backend.h b/ace/Log_Msg_Backend.h
index 50392cd92cf..6203287011d 100644
--- a/ace/Log_Msg_Backend.h
+++ b/ace/Log_Msg_Backend.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Log_Record;
 
 /**
@@ -60,5 +62,7 @@ public:
   virtual int log (ACE_Log_Record &log_record) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LOG_MSG_BACKEND_H */
diff --git a/ace/Log_Msg_Callback.cpp b/ace/Log_Msg_Callback.cpp
index c2ab8da127c..2fcf5206dd1 100644
--- a/ace/Log_Msg_Callback.cpp
+++ b/ace/Log_Msg_Callback.cpp
@@ -4,6 +4,10 @@
 
 ACE_RCSID(ace, Log_Msg_Callback, "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void)
 {
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Msg_Callback.h b/ace/Log_Msg_Callback.h
index 4de1b85bb8a..2d3af46a1b3 100644
--- a/ace/Log_Msg_Callback.h
+++ b/ace/Log_Msg_Callback.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Log_Record;
 
 /**
@@ -47,7 +49,7 @@ class ACE_Log_Record;
  *     is spawned because it might have been allocated off of the
  *     stack of the original thread, in which case all hell would
  *     break loose...  Therefore, you'll need to reset these in each
- *     new thread. 
+ *     new thread.
  */
 class ACE_Export ACE_Log_Msg_Callback
 {
@@ -61,5 +63,7 @@ public:
   virtual void log (ACE_Log_Record &log_record) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LOG_MSG_CALLBACK_H */
diff --git a/ace/Log_Msg_IPC.cpp b/ace/Log_Msg_IPC.cpp
index aa410e3150d..e6da947d80e 100644
--- a/ace/Log_Msg_IPC.cpp
+++ b/ace/Log_Msg_IPC.cpp
@@ -5,6 +5,8 @@
 
 ACE_RCSID(ace, Log_Msg_IPC, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Log_Msg_IPC::ACE_Log_Msg_IPC (void)
 {
 }
@@ -68,3 +70,5 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record)
                                   log_record.length ());
 #endif /* ACE_HAS_STREAM_PIPES */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Msg_IPC.h b/ace/Log_Msg_IPC.h
index fa7f90ba59f..2b05c02de02 100644
--- a/ace/Log_Msg_IPC.h
+++ b/ace/Log_Msg_IPC.h
@@ -25,16 +25,22 @@
 // problems it can't be...
 #if defined (ACE_HAS_STREAM_PIPES)
 # include "ace/SPIPE_Connector.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_SPIPE_Stream ACE_LOG_MSG_IPC_STREAM;
 typedef ACE_SPIPE_Connector ACE_LOG_MSG_IPC_CONNECTOR;
 typedef ACE_SPIPE_Addr ACE_LOG_MSG_IPC_ADDR;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #else
 # include "ace/SOCK_Connector.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_SOCK_Stream ACE_LOG_MSG_IPC_STREAM;
 typedef ACE_SOCK_Connector ACE_LOG_MSG_IPC_CONNECTOR;
 typedef ACE_INET_Addr ACE_LOG_MSG_IPC_ADDR;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ACE_HAS_STREAM_PIPES */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Defines the interfaces for ACE_Log_Msg backend.
 /**
  * Implement an ACE_Log_Msg_Backend that logs to a remote logging
@@ -59,5 +65,7 @@ private:
   ACE_LOG_MSG_IPC_STREAM message_queue_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LOG_MSG_H */
diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp
index 1d51bbad03b..8053624283c 100644
--- a/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ace/Log_Msg_NT_Event_Log.cpp
@@ -12,6 +12,8 @@
 
 ACE_RCSID(ace, Log_Msg_NT_Event_Log, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Log_Msg_NT_Event_Log::ACE_Log_Msg_NT_Event_Log (void)
   : evlog_handle_(0)
 {
@@ -153,4 +155,6 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
     return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_LOG_MSG_NT_EVENT_LOG */
diff --git a/ace/Log_Msg_NT_Event_Log.h b/ace/Log_Msg_NT_Event_Log.h
index f4c975011f8..3edc049aea3 100644
--- a/ace/Log_Msg_NT_Event_Log.h
+++ b/ace/Log_Msg_NT_Event_Log.h
@@ -24,6 +24,8 @@
 
 #include "ace/Log_Msg_Backend.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Log_Msg_NT_Event_Log
  *
@@ -62,6 +64,8 @@ private:
   HANDLE evlog_handle_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_LOG_MSG_NT_EVENT_LOG */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp
index 4a685231f32..55adf75791b 100644
--- a/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ace/Log_Msg_UNIX_Syslog.cpp
@@ -11,6 +11,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_syslog.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // NOTE:
 //   The ACE_Log_Msg_UNIX_Syslog class can use the openlog(),
 //   setlogmask(), syslog() and closelog() routines in a thread safe
@@ -195,4 +197,6 @@ ACE_Log_Msg_UNIX_Syslog::convert_log_mask (int lm_mask)
   return syslog_mask;
 }
 
-#endif /* !defined (ACE_LACKS_UNIX_SYSLOG) */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* !ACE_LACKS_UNIX_SYSLOG */
diff --git a/ace/Log_Msg_UNIX_Syslog.h b/ace/Log_Msg_UNIX_Syslog.h
index 78ed77bfcd4..0031e043431 100644
--- a/ace/Log_Msg_UNIX_Syslog.h
+++ b/ace/Log_Msg_UNIX_Syslog.h
@@ -24,6 +24,8 @@
 
 #include "ace/Log_Msg_Backend.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Log_Msg_UNIX_Syslog
  *
@@ -66,6 +68,8 @@ private:
   int convert_log_mask (int lm_mask);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_UNIX_SYSLOG */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index d648dff381b..c1084bbeee5 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -12,16 +12,23 @@
 
 #ifndef ACE_LOG_PRIORITY_H
 #define ACE_LOG_PRIORITY_H
+
 #include /**/ "ace/pre.h"
 
+#include "ace/config-lite.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
+ * @enum ACE_Log_Priority
+ *
  * @brief This data type indicates the relative priorities of the
- *    logging messages, from lowest to highest priority. 
+ *    logging messages, from lowest to highest priority.
  *
  * These values are defined using powers of two so that it's
  * possible to form a mask to turn them on or off dynamically.
  * We only use 12 bits, however, so users are free to use the
- * remaining 19 bits to define their own priority masks.  
+ * remaining 19 bits to define their own priority masks.
  */
 enum ACE_Log_Priority
 {
@@ -72,5 +79,7 @@ enum ACE_Log_Priority
   LM_ENSURE_32_BITS = 0x7FFFFFFF
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LOG_PRIORITY_H */
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 11b24b7b8d2..2fed56760da 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -16,50 +16,58 @@
 # include "ace/streams.h"
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+#include "ace/OS_Memory.h"
+
 ACE_RCSID(ace, Log_Record, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record)
 
-const ACE_TCHAR *ACE_Log_Record::priority_names_[] =
+namespace
 {
-  ACE_LIB_TEXT ("LM_SHUTDOWN"),
-  ACE_LIB_TEXT ("LM_TRACE"),
-  ACE_LIB_TEXT ("LM_DEBUG"),
-  ACE_LIB_TEXT ("LM_INFO"),
-  ACE_LIB_TEXT ("LM_NOTICE"),
-  ACE_LIB_TEXT ("LM_WARNING"),
-  ACE_LIB_TEXT ("LM_STARTUP"),
-  ACE_LIB_TEXT ("LM_ERROR"),
-  ACE_LIB_TEXT ("LM_CRITICAL"),
-  ACE_LIB_TEXT ("LM_ALERT"),
-  ACE_LIB_TEXT ("LM_EMERGENCY"),
-  ACE_LIB_TEXT ("LM_UNK(04000)"),
-  ACE_LIB_TEXT ("LM_UNK(010000)"),
-  ACE_LIB_TEXT ("LM_UNK(020000)"),
-  ACE_LIB_TEXT ("LM_UNK(040000)"),
-  ACE_LIB_TEXT ("LM_UNK(0100000)"),
-  ACE_LIB_TEXT ("LM_UNK(0200000)"),
-  ACE_LIB_TEXT ("LM_UNK(0400000)"),
-  ACE_LIB_TEXT ("LM_UNK(01000000)"),
-  ACE_LIB_TEXT ("LM_UNK(02000000)"),
-  ACE_LIB_TEXT ("LM_UNK(04000000)"),
-  ACE_LIB_TEXT ("LM_UNK(010000000)"),
-  ACE_LIB_TEXT ("LM_UNK(020000000)"),
-  ACE_LIB_TEXT ("LM_UNK(040000000)"),
-  ACE_LIB_TEXT ("LM_UNK(0100000000)"),
-  ACE_LIB_TEXT ("LM_UNK(0200000000)"),
-  ACE_LIB_TEXT ("LM_UNK(0400000000)"),
-  ACE_LIB_TEXT ("LM_UNK(01000000000)"),
-  ACE_LIB_TEXT ("LM_UNK(02000000000)"),
-  ACE_LIB_TEXT ("LM_UNK(04000000000)"),
-  ACE_LIB_TEXT ("LM_UNK(010000000000)"),
-  ACE_LIB_TEXT ("LM_UNK(020000000000)")
-};
+  // Symbolic names for the <ACE_Log_Priority> enumerators.
+  ACE_TCHAR const * ace_priority_names[] =
+    {
+      ACE_LIB_TEXT ("LM_SHUTDOWN"),
+      ACE_LIB_TEXT ("LM_TRACE"),
+      ACE_LIB_TEXT ("LM_DEBUG"),
+      ACE_LIB_TEXT ("LM_INFO"),
+      ACE_LIB_TEXT ("LM_NOTICE"),
+      ACE_LIB_TEXT ("LM_WARNING"),
+      ACE_LIB_TEXT ("LM_STARTUP"),
+      ACE_LIB_TEXT ("LM_ERROR"),
+      ACE_LIB_TEXT ("LM_CRITICAL"),
+      ACE_LIB_TEXT ("LM_ALERT"),
+      ACE_LIB_TEXT ("LM_EMERGENCY"),
+      ACE_LIB_TEXT ("LM_UNK(04000)"),
+      ACE_LIB_TEXT ("LM_UNK(010000)"),
+      ACE_LIB_TEXT ("LM_UNK(020000)"),
+      ACE_LIB_TEXT ("LM_UNK(040000)"),
+      ACE_LIB_TEXT ("LM_UNK(0100000)"),
+      ACE_LIB_TEXT ("LM_UNK(0200000)"),
+      ACE_LIB_TEXT ("LM_UNK(0400000)"),
+      ACE_LIB_TEXT ("LM_UNK(01000000)"),
+      ACE_LIB_TEXT ("LM_UNK(02000000)"),
+      ACE_LIB_TEXT ("LM_UNK(04000000)"),
+      ACE_LIB_TEXT ("LM_UNK(010000000)"),
+      ACE_LIB_TEXT ("LM_UNK(020000000)"),
+      ACE_LIB_TEXT ("LM_UNK(040000000)"),
+      ACE_LIB_TEXT ("LM_UNK(0100000000)"),
+      ACE_LIB_TEXT ("LM_UNK(0200000000)"),
+      ACE_LIB_TEXT ("LM_UNK(0400000000)"),
+      ACE_LIB_TEXT ("LM_UNK(01000000000)"),
+      ACE_LIB_TEXT ("LM_UNK(02000000000)"),
+      ACE_LIB_TEXT ("LM_UNK(04000000000)"),
+      ACE_LIB_TEXT ("LM_UNK(010000000000)"),
+      ACE_LIB_TEXT ("LM_UNK(020000000000)")
+    };
+}
 
 const ACE_TCHAR *
 ACE_Log_Record::priority_name (ACE_Log_Priority p)
 {
-  return ACE_Log_Record::priority_names_[ACE::log2 (p)];
+  return ace_priority_names[ACE::log2 (p)];
 }
 
 void
@@ -67,7 +75,7 @@ ACE_Log_Record::priority_name (ACE_Log_Priority p,
                                const ACE_TCHAR *name)
 {
   // Name must be a statically allocated string
-  ACE_Log_Record::priority_names_[ACE::log2 (p)] = name;
+  ace_priority_names[ACE::log2 (p)] = name;
 }
 
 u_long
@@ -112,7 +120,7 @@ ACE_Log_Record::msg_data (const ACE_TCHAR *data)
 {
   // ACE_TRACE ("ACE_Log_Record::msg_data");
   ACE_OS::strsncpy (this->msg_data_, data,
-                    (sizeof this->msg_data_ / sizeof (ACE_TCHAR)));
+                    (MAXLOGMSGLEN / sizeof (ACE_TCHAR)));
   this->round_up ();
 }
 
@@ -126,6 +134,7 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
     pid_ (ACE_UINT32 (p))
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
+  ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
 }
 
 ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
@@ -138,6 +147,7 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
     pid_ (ACE_UINT32 (p))
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
+  ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
 }
 
 void
@@ -145,7 +155,7 @@ ACE_Log_Record::round_up (void)
 {
   // ACE_TRACE ("ACE_Log_Record::round_up");
   // Determine the length of the payload.
-  size_t len = (sizeof (*this) - sizeof (this->msg_data_))
+  size_t len = (sizeof (*this) - MAXLOGMSGLEN)
     + (sizeof (ACE_TCHAR) * ((ACE_OS::strlen (this->msg_data_) + 1)));
 
   // Round up to the alignment.
@@ -162,6 +172,7 @@ ACE_Log_Record::ACE_Log_Record (void)
     pid_ (0)
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
+  ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
 }
 
 int
@@ -190,7 +201,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
       || ACE_BIT_ENABLED (verbose_flag,
                           ACE_Log_Msg::VERBOSE_LITE))
     {
-      time_t now = this->secs_;
+      time_t const now = this->secs_;
       ACE_TCHAR ctp[26]; // 26 is a magic number...
 
       if (ACE_OS::ctime_r (&now, ctp, sizeof ctp) == 0)
@@ -245,7 +256,9 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
                        u_long verbose_flag,
                        FILE *fp)
 {
-  ACE_TCHAR verbose_msg [MAXVERBOSELOGMSGLEN];
+  ACE_TCHAR* verbose_msg = 0;
+  ACE_NEW_RETURN (verbose_msg,ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1);
+
   int result = this->format_msg (host_name,
                                  verbose_flag,
                                  verbose_msg);
@@ -266,6 +279,8 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
         }
     }
 
+  delete[] verbose_msg;
+
   return result;
 }
 
@@ -276,8 +291,10 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
                        u_long verbose_flag,
                        ACE_OSTREAM_TYPE &s)
 {
-  ACE_TCHAR verbose_msg [MAXVERBOSELOGMSGLEN];
-  int result = this->format_msg (host_name, verbose_flag, verbose_msg);
+  ACE_TCHAR* verbose_msg = 0;
+  ACE_NEW_RETURN (verbose_msg,ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1);
+
+  int const result = this->format_msg (host_name, verbose_flag, verbose_msg);
 
   if (result == 0)
     {
@@ -286,7 +303,11 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
       s.flush ();
     }
 
+  delete[] verbose_msg;
+
   return result;
 }
 
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 8e7ff3980a0..ef6b8104711 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 #include "ace/Basic_Types.h"
 #include "ace/iosfwd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /// Defines the structure of an ACE logging record.
@@ -38,7 +40,7 @@ public:
   enum
   {
     /// Maximum size of a logging message.
-    MAXLOGMSGLEN = ACE_MAXLOGMSGLEN,
+    MAXLOGMSGLEN = ACE_MAXLOGMSGLEN+1,
 
     /// Most restrictive alignment.
     ALIGN_WORDB  = 8,
@@ -56,8 +58,6 @@ public:
   /**
    * Create a <Log_Record> and set its priority, time stamp, and
    * process id.
-   * Create a <Log_Record> and set its priority, time stamp, and
-   * process id.
    */
   ACE_Log_Record (void);
   ACE_Log_Record (ACE_Log_Priority lp,
@@ -140,7 +140,7 @@ public:
   ACE_Time_Value time_stamp (void) const;
 
   /// Set the time stamp of the <Log_Record>.
-  void time_stamp (const ACE_Time_Value &);
+  void time_stamp (const ACE_Time_Value &ts);
 
   /// Get the process id of the <Log_Record>.
   long pid (void) const;
@@ -187,12 +187,12 @@ private:
   ACE_UINT32 pid_;
 
   /// Logging record data
-  ACE_TCHAR msg_data_[MAXLOGMSGLEN + 1]; // Add one for NUL-terminator.
+  ACE_TCHAR* msg_data_; // Add one for NUL-terminator.
 
-  /// Symbolic names for the <ACE_Log_Priority> enums.
-  static const ACE_TCHAR *priority_names_[];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Log_Record.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Log_Record.inl b/ace/Log_Record.inl
index 0b81be7c7ec..b31af15384a 100644
--- a/ace/Log_Record.inl
+++ b/ace/Log_Record.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Global_Macros.h"
@@ -6,9 +7,13 @@
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Log_Record::~ACE_Log_Record (void)
 {
+  if (this->msg_data_)
+    delete[] this->msg_data_;
 }
 
 ACE_INLINE void
@@ -108,3 +113,5 @@ ACE_Log_Record::msg_data_len (void) const
   ACE_TRACE ("ACE_Log_Record::msg_data_len");
   return ACE_OS::strlen (this->msg_data_) + 1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 9814deb25de..36033e2d60e 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Parse the string containing (thread) priorities and set them
 // accordingly.
 
@@ -360,7 +362,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
 
           if (output_file->rdstate () != ios::goodbit)
             {
-	      if (delete_ostream) 
+              if (delete_ostream)
                 delete output_file;
               return -1;
             }
@@ -547,9 +549,10 @@ ACE_Logging_Strategy::log_msg (ACE_Log_Msg *log_msg)
   this->log_msg_  = log_msg;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // The following is a "Factory" used by the ACE_Service_Config and
 // svc.conf file to dynamically initialize the state of the
 // Logging_Strategy.
 
 ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy)
-
diff --git a/ace/Logging_Strategy.h b/ace/Logging_Strategy.h
index b4123221622..d8ee19bba76 100644
--- a/ace/Logging_Strategy.h
+++ b/ace/Logging_Strategy.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,8 @@
  *
  *  $Id$
  *
- *  @author Prashant Jain <pjain@cs.wustl.edu> and 
- *          Orlando Ribeiro <oribeiro@inescporto.pt>
+ *  @author Prashant Jain <pjain@cs.wustl.edu>
+ *  @author Orlando Ribeiro <oribeiro@inescporto.pt>
  */
 //=============================================================================
 
@@ -25,6 +25,8 @@
 #define ACE_DEFAULT_LOGFILE_POLL_INTERVAL 600 /* Seconds */
 #endif /* ACE_DEFAULT_LOGFILE_POLL_INTERVAL */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Logging_Strategy
  *
@@ -62,10 +64,10 @@
  * to set the reactor used by @c ACE_Logging_Strategy to something
  * other than the singleton reactor you'll need to get a pointer to
  * the @c ACE_Logging_Strategy instance and do this
- * 
+ *
  * ACE_Reactor my_reactor;
  * ACE_Logging_Strategy *logging_strategy = ...... // Get instance.
- * 
+ *
  * logging_strategy->reactor (&my_reactor);
  *
  * and then logging_strategy will use your reactor.  If you're
@@ -181,6 +183,8 @@ protected:
   ACE_Log_Msg *log_msg_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (ACE, ACE_Logging_Strategy)
 
 #endif /* ACE_LOGGING_STRATEGY_H */
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index 3f1b9828576..08ec50034f4 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -1,4 +1,3 @@
-// MEM_Acceptor.cpp
 // $Id$
 
 #include "ace/MEM_Acceptor.h"
@@ -16,6 +15,8 @@
 
 ACE_RCSID(ace, MEM_Acceptor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor)
 
 void
@@ -175,7 +176,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
   // Protocol negociation:
   //   Tell the client side what level of signaling strategy
   //   we support.
-  ACE_INT16 client_signaling =
+  ACE_MEM_IO::Signal_Strategy client_signaling =
 #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
     this->preferred_strategy_;
 #else
@@ -260,4 +261,6 @@ ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index a33cb5f5dce..7b085f825ca 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,12 +14,7 @@
 #define ACE_MEM_ACCEPTOR_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #include "ace/SOCK_Acceptor.h"
 
@@ -36,6 +31,8 @@
 #include "ace/OS_QoS.h"
 #endif  // ACE_HAS_WINCE
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Reactor;
 
@@ -54,7 +51,7 @@ class ACE_Reactor;
  * if so desired.  (Currently, using UNIX-domain sockets, i.e.,
  * ACE_LSOCK_*, with this class will not work.)
  */
-class ACE_Memory_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor
+class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor
 {
 public:
   // = Initialization methods.
@@ -183,6 +180,8 @@ private:
   ACE_MEM_IO::Signal_Strategy preferred_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/MEM_Acceptor.inl b/ace/MEM_Acceptor.inl
index d7e3f66f18f..388e1541cdf 100644
--- a/ace/MEM_Acceptor.inl
+++ b/ace/MEM_Acceptor.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_MEM_Acceptor::open (const ACE_Addr &local_sap,
                         ACE_Protocol_Info *protocolinfo,
@@ -96,3 +99,5 @@ ACE_MEM_Acceptor::malloc_options (void)
 
   return this->malloc_options_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index e4ad1f353f0..42fed32e400 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -16,8 +16,10 @@
 #include "ace/os_include/os_netdb.h"
 
 ACE_RCSID (ace,
-	   MEM_Addr,
-	   "$Id$")
+           MEM_Addr,
+           "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Addr)
 
@@ -163,4 +165,6 @@ ACE_MEM_Addr::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index 497443de8d6..3d50e5d06b3 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -15,12 +15,7 @@
 #define ACE_MEM_ADDR_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,13 +25,15 @@
 
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_MEM_Addr
  *
  * @brief Defines a C++ wrapper facade for the shared memory transport
  * address family format.
  */
-class ACE_Memory_Export ACE_MEM_Addr : public ACE_Addr
+class ACE_Export ACE_MEM_Addr : public ACE_Addr
 {
 public:
   // = Initialization methods.
@@ -60,7 +57,7 @@ public:
   /// Default initialization routine.
   int initialize_local (u_short port);
 
-  /// Check if @a sap designate an enpoint withing the same host.
+  /// Check if @a sap designates an endpoint on the same host.
   int same_host (const ACE_INET_Addr& sap);
 
   // These methods are useful after the object has been constructed.
@@ -147,6 +144,8 @@ private:
   ACE_INET_Addr internal_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/MEM_Addr.inl b/ace/MEM_Addr.inl
index dd52742637d..ca2c0de2089 100644
--- a/ace/MEM_Addr.inl
+++ b/ace/MEM_Addr.inl
@@ -5,6 +5,7 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Set the port number.
 
@@ -106,3 +107,5 @@ ACE_MEM_Addr::operator != (const ACE_INET_Addr &sap) const
   ACE_TRACE ("ACE_MEM_Addr::operator !=");
   return !((*this) == sap);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp
index b2ffb2b3fc1..f5155b9d961 100644
--- a/ace/MEM_Connector.cpp
+++ b/ace/MEM_Connector.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(ace, MEM_Connector, "$Id$")
 #include "ace/MEM_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector)
 
 void
@@ -142,4 +144,6 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h
index 868cec68656..78fae54d0c1 100644
--- a/ace/MEM_Connector.h
+++ b/ace/MEM_Connector.h
@@ -14,13 +14,7 @@
 #define ACE_MEM_CONNECTOR_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
-#include "ace/SOCK_Connector.h"
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,16 +22,19 @@
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
+#include "ace/SOCK_Connector.h"
 #include "ace/MEM_Stream.h"
 #include "ace/MEM_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_MEM_Connector
  *
  * @brief Defines the format and interface for connecting to a peer
  * on a @c ACE_MEM_Stream object.
  */
-class ACE_Memory_Export ACE_MEM_Connector : public ACE_SOCK_Connector
+class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector
 {
 public:
   // = Initialization methods.
@@ -170,6 +167,8 @@ private:
   ACE_MEM_IO::Signal_Strategy preferred_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/MEM_Connector.inl b/ace/MEM_Connector.inl
index 15bf7c9ee75..024ab5d8b5b 100644
--- a/ace/MEM_Connector.inl
+++ b/ace/MEM_Connector.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// MEM_Connector.i
-
 // Establish a connection.
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_MEM_IO::Signal_Strategy
 ACE_MEM_Connector::preferred_strategy (void) const
 {
@@ -25,3 +26,5 @@ ACE_MEM_Connector::malloc_options (void)
 
   return this->malloc_options_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index a3ebd3a839e..7a9616f5220 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -12,9 +12,11 @@
 
 ACE_RCSID(ace, MEM_IO, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_IO)
 
-ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO ()
+ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO (void)
 {
 }
 
@@ -271,8 +273,6 @@ ACE_MT_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf,
       return buf->size ();
     return -1;
   }
-
-  ACE_NOTREACHED (return 0;)
 }
 
 ssize_t
@@ -432,11 +432,11 @@ ACE_MEM_IO::recvv (iovec *io_vec,
       break;
     }
 
-  u_long inlen;
+  int inlen;
 
   if (ACE_OS::ioctl (this->get_handle (),
                      FIONREAD,
-                     (u_long *) &inlen) == -1)
+                     &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
@@ -536,4 +536,6 @@ ACE_MEM_IO::recv (size_t n, ...) const
 }
 #endif /* 0 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index ecf4588f2ba..595caf0ff6f 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -15,27 +15,24 @@
 #define ACE_MEM_IO_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #include "ace/SOCK.h"
 #include "ace/MEM_SAP.h"
-#include "ace/Memory_Pool.h"
 #include "ace/Message_Block.h"
 #include "ace/Process_Semaphore.h"
 #include "ace/Process_Mutex.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class ACE_Memory_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP
+class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP
 {
 public:
   ACE_Reactive_MEM_IO (void);
@@ -55,7 +52,7 @@ 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,
@@ -78,7 +75,7 @@ public:
 };
 
 #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
-class ACE_Memory_Export ACE_MT_MEM_IO : public ACE_MEM_SAP
+class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP
 {
 public:
   typedef struct
@@ -170,7 +167,7 @@ private:
  * the other end.  The receiving side then reverses the
  * procedures and copies the information into user buffer.
  */
-class ACE_Memory_Export ACE_MEM_IO : public ACE_SOCK
+class ACE_Export ACE_MEM_IO : public ACE_SOCK
 {
 public:
   // = Initialization and termination methods.
@@ -301,6 +298,8 @@ private:
   ssize_t cur_offset_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_IO.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/MEM_IO.inl b/ace/MEM_IO.inl
index 7d4685334cf..07f13764e94 100644
--- a/ace/MEM_IO.inl
+++ b/ace/MEM_IO.inl
@@ -1,10 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
-
-// MEM_IO.i
-
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO ()
 {
@@ -229,3 +229,5 @@ ACE_MEM_IO::send (const void *buf,
   ACE_TRACE ("ACE_MEM_IO::send");
   return this->send (buf, len, 0, timeout);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp
index f1e79c29851..453f86f5bfd 100644
--- a/ace/MEM_SAP.cpp
+++ b/ace/MEM_SAP.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(ace, MEM_SAP, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 
 void
@@ -90,18 +92,6 @@ ACE_MEM_SAP::close_shm_malloc (void)
   return retv;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Write_Guard<ACE_Process_Mutex>;
-template class ACE_Read_Guard<ACE_Process_Mutex>;
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block>;
-template class ACE_Based_Pointer<ACE_MEM_SAP_Node>;
-template class ACE_Based_Pointer_Basic<ACE_MEM_SAP_Node>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Write_Guard<ACE_Process_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_Process_Mutex>
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block>
-#pragma instantiate ACE_Based_Pointer<ACE_MEM_SAP_Node>
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_MEM_SAP_Node>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index dcbad75b584..e33c6b77104 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,19 +10,12 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_MEM_SAP_H
 #define ACE_MEM_SAP_H
-#include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include /**/ "ace/pre.h"
 
-#include "ace/PI_Malloc.h"
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,10 +24,13 @@
 // MEM_SAP requries position independent pointers to work
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
+#include "ace/PI_Malloc.h"
 #include "ace/Malloc_T.h"
 #include "ace/MMAP_Memory_Pool.h"
 #include "ace/Process_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_MEM_SAP;
 class ACE_Reactive_MEM_IO;
 class ACE_MT_MEM_IO;
@@ -43,7 +39,7 @@ class ACE_MEM_IO;
 // Internal data structure
 // MEM_SAP uses to queue up
 // data.
-class ACE_Memory_Export ACE_MEM_SAP_Node
+class ACE_MEM_SAP_Node
 {
 public:
 //    friend class ACE_MEM_SAP;
@@ -80,7 +76,7 @@ public:
  * @brief Defines the methods of shared memory management for
  * shared memory transport.
  */
-class ACE_Memory_Export ACE_MEM_SAP
+class ACE_Export ACE_MEM_SAP
 {
 public:
   // = Initialization and termination methods.
@@ -107,7 +103,7 @@ 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,
@@ -160,6 +156,8 @@ protected:
   ACE_MEM_SAP (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_SAP.inl"
 #endif /* __ACE_INLINE__ */
@@ -167,4 +165,5 @@ protected:
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 
 #include /**/ "ace/post.h"
+
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/MEM_SAP.inl b/ace/MEM_SAP.inl
index e687618b7f8..3c2a4eb9d9a 100644
--- a/ace/MEM_SAP.inl
+++ b/ace/MEM_SAP.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/RW_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_MEM_SAP_Node::ACE_MEM_SAP_Node (size_t cap)
   : capacity_ (cap),
@@ -57,3 +60,5 @@ ACE_MEM_SAP::release_buffer (ACE_MEM_SAP_Node *buf)
   this->shm_malloc_->free (buf);
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MEM_Stream.cpp b/ace/MEM_Stream.cpp
index dc32670142a..0e8edb9ced7 100644
--- a/ace/MEM_Stream.cpp
+++ b/ace/MEM_Stream.cpp
@@ -1,4 +1,3 @@
-// MEM_Stream.cpp
 // $Id$
 
 #include "ace/MEM_Stream.h"
@@ -11,6 +10,8 @@
 
 ACE_RCSID(ace, MEM_Stream, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream)
 
 void
@@ -41,4 +42,6 @@ ACE_MEM_Stream::close (void)
   return ACE_SOCK::close ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index e513be87387..6b4ff4cdd41 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,15 +29,17 @@
 # define ACE_MEM_STREAM_MIN_BUFFER 4096
 #endif /* ACE_MEM_STREAM_MIN_BUFFER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_MEM_Acceptor;
 class ACE_MEM_Connector;
 
 /**
  * @class ACE_MEM_Stream
  *
- * @brief Defines the methods in the <ACE_MEM_Stream> abstraction.
+ * @brief Defines the methods in the ACE_MEM_Stream abstraction.
  *
- * This adds additional wrapper methods atop the <ACE_MEM_IO>
+ * This adds additional wrapper methods atop the ACE_MEM_IO
  * class.  Notice that ACE_MEM_Stream can only send messages no bigger
  * than the underlying MMAP file size minus sizeof (ACE_MEM_SAP_Node).
  * The size of the MMAP file is default to ACE_MEM_STREAM_MIN_BUFFER.
@@ -48,7 +50,7 @@ class ACE_MEM_Connector;
  * @c ACE_MEM_Acceptor::init_buffer_size (size_t size);
  * before establishing a connection.
  */
-class ACE_Memory_Export ACE_MEM_Stream : public ACE_MEM_IO
+class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO
 {
 public:
 
@@ -59,7 +61,7 @@ public:
   /// Constructor.
   ACE_MEM_Stream (void);
 
-  /// Constructor (sets the underlying <ACE_HANDLE> with <h>).
+  /// Constructor (sets the underlying ACE_HANDLE with <h>).
   ACE_MEM_Stream (ACE_HANDLE h);
 
   /// Destructor.
@@ -144,6 +146,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/MEM_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/MEM_Stream.inl b/ace/MEM_Stream.inl
index df33caaf630..c29459ed35c 100644
--- a/ace/MEM_Stream.inl
+++ b/ace/MEM_Stream.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/MEM_Stream.h"
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_MEM_Stream::ACE_MEM_Stream (void)
 {
@@ -173,3 +176,5 @@ ACE_MEM_Stream::recv_urg (void *ptr,
                     timeout);
 }
 #endif /* 0 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MMAP_Memory_Pool.cpp b/ace/MMAP_Memory_Pool.cpp
index 3329c3f5292..4cce9fff7d3 100644
--- a/ace/MMAP_Memory_Pool.cpp
+++ b/ace/MMAP_Memory_Pool.cpp
@@ -13,7 +13,15 @@
 #include "ace/Based_Pointer_Repository.h"
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1  */
 
-ACE_RCSID(ace, MMAP_Memory_Pool, "$Id$")
+#if !defined (__ACE_INLINE__)
+#include "ace/MMAP_Memory_Pool.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(ace,
+          MMAP_Memory_Pool,
+          "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_MMAP_Memory_Pool)
 
@@ -220,7 +228,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
 #endif
 
   // Increment by one to put us at the beginning of the next chunk...
-  map_size++;
+  ++map_size;
 #endif /* CHORUS */
   return 0;
 }
@@ -471,7 +479,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
   if (guess_on_fault_)
     {
       // Check if the current mapping is up to date.
-      off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ());
+      off_t const current_map_size = ACE_OS::filesize (this->mmap_.handle ());
 
       if (static_cast<size_t> (current_map_size) == this->mmap_.size ())
         {
@@ -530,3 +538,5 @@ ACE_Lite_MMAP_Memory_Pool::sync (void *, size_t, int)
   ACE_TRACE ("ACE_Lite_MMAP_Memory_Pool::sync");
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/MMAP_Memory_Pool.h b/ace/MMAP_Memory_Pool.h
index 63da965b80d..91162b5863c 100644
--- a/ace/MMAP_Memory_Pool.h
+++ b/ace/MMAP_Memory_Pool.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +27,8 @@
 #include "ace/Signal.h"
 #include "ace/Mem_Map.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_MMAP_Memory_Pool_Options
  *
@@ -40,7 +37,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Memory_Export ACE_MMAP_Memory_Pool_Options
+class ACE_Export ACE_MMAP_Memory_Pool_Options
 {
 public:
   enum
@@ -128,7 +125,7 @@ private:
  * @brief Make a memory pool that is based on @c mmap(2).  This
  * implementation allows memory to be shared between processes.
  */
-class ACE_Memory_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
+class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
 {
 public:
   typedef ACE_MMAP_Memory_Pool_Options OPTIONS;
@@ -204,6 +201,12 @@ public:
   /// Dump the state of an object.
   virtual void dump (void) const;
 
+  /// Get reference to underlying ACE_Mem_Map object.
+  ACE_Mem_Map const & mmap (void) const;
+
+  /// Get reference to underlying ACE_Mem_Map object.
+  ACE_Mem_Map & mmap (void);
+
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -270,16 +273,16 @@ protected:
 /**
  * @class ACE_Lite_MMAP_Memory_Pool
  *
- * @brief Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>.
+ * @brief Make a ``lighter-weight'' memory pool based ACE_Mem_Map.
  *
  * This implementation allows memory to be shared between
- * processes.  However, unlike the <ACE_MMAP_Memory_Pool>
+ * processes.  However, unlike the ACE_MMAP_Memory_Pool
  * the <sync> methods are no-ops, which means that we don't pay
  * for the price of flushing the memory to the backing store on
  * every update.  Naturally, this trades off increased
  * performance for less reliability if the machine crashes.
  */
-class ACE_Memory_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
+class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
 {
 public:
   /// Initialize the pool.
@@ -296,5 +299,11 @@ public:
   virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "ace/MMAP_Memory_Pool.inl"
+#endif /* __ACE_INLINE__ */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_MMAP_MEMORY_POOL_H */
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 1a418763551..6aa2ec7e49a 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -2,6 +2,11 @@
 ##
 ## $Id$
 ##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 includedir = @includedir@/ace
 pkgconfigdir = @libdir@/pkgconfig
@@ -15,10 +20,16 @@ SUBDIRS = \
         QoS \
         SSL
 
+CLEANFILES =
+lib_LTLIBRARIES =
+nobase_include_HEADERS =
+pkgconfig_DATA =
 
 ## Makefile.ACE.am
 
-lib_LTLIBRARIES = libACE.la
+if !BUILD_ACE_FOR_TAO
+
+lib_LTLIBRARIES += libACE.la
 
 libACE_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -42,6 +53,7 @@ libACE_la_SOURCES = \
   Addr.cpp \
   Arg_Shifter.cpp \
   Argv_Type_Converter.cpp \
+  Assert.cpp \
   Asynch_IO.cpp \
   Asynch_IO_Impl.cpp \
   Asynch_Pseudo_Task.cpp \
@@ -53,8 +65,8 @@ libACE_la_SOURCES = \
   Basic_Stats.cpp \
   Basic_Types.cpp \
   CDR_Base.cpp \
-  CDR_Stream.cpp \
   CDR_Size.cpp \
+  CDR_Stream.cpp \
   Capabilities.cpp \
   Cleanup.cpp \
   Codecs.cpp \
@@ -66,7 +78,6 @@ libACE_la_SOURCES = \
   Configuration.cpp \
   Configuration_Import_Export.cpp \
   Connection_Recycling_Strategy.cpp \
-  Container_Instantiations.cpp \
   Containers.cpp \
   Copy_Disabled.cpp \
   Countdown_Time.cpp \
@@ -83,6 +94,8 @@ libACE_la_SOURCES = \
   Dump.cpp \
   Dynamic.cpp \
   Dynamic_Service_Base.cpp \
+  Encoding_Converter.cpp \
+  Encoding_Converter_Factory.cpp \
   Event.cpp \
   Event_Handler.cpp \
   FIFO.cpp \
@@ -103,7 +116,6 @@ libACE_la_SOURCES = \
   Get_Opt.cpp \
   Handle_Ops.cpp \
   Handle_Set.cpp \
-  Hash_Map_Manager.cpp \
   Hashable.cpp \
   High_Res_Timer.cpp \
   ICMP_Socket.cpp \
@@ -141,13 +153,11 @@ libACE_la_SOURCES = \
   MMAP_Memory_Pool.cpp \
   Malloc.cpp \
   Malloc_Allocator.cpp \
-  Malloc_Instantiations.cpp \
   Manual_Event.cpp \
   Mem_Map.cpp \
   Message_Block.cpp \
   Message_Queue.cpp \
   Method_Request.cpp \
-  Metrics_Cache.cpp \
   Msg_WFMO_Reactor.cpp \
   Multihomed_INET_Addr.cpp \
   Mutex.cpp \
@@ -198,7 +208,6 @@ libACE_la_SOURCES = \
   Obchunk.cpp \
   Object_Manager.cpp \
   Object_Manager_Base.cpp \
-  Obstack.cpp \
   PI_Malloc.cpp \
   POSIX_Asynch_IO.cpp \
   POSIX_CB_Proactor.cpp \
@@ -257,14 +266,12 @@ libACE_la_SOURCES = \
   Sample_History.cpp \
   Sbrk_Memory_Pool.cpp \
   Sched_Params.cpp \
-  Select_Reactor.cpp \
   Select_Reactor_Base.cpp \
   Semaphore.cpp \
   Service_Config.cpp \
   Service_Manager.cpp \
   Service_Object.cpp \
   Service_Repository.cpp \
-  Service_Templates.cpp \
   Service_Types.cpp \
   Shared_Memory.cpp \
   Shared_Memory_MM.cpp \
@@ -275,8 +282,7 @@ libACE_la_SOURCES = \
   Sock_Connect.cpp \
   Stats.cpp \
   String_Base_Const.cpp \
-  Svc_Conf_Lexer_Guard.cpp \
-  Svc_Conf_l.cpp \
+  Svc_Conf_Lexer.cpp \
   Svc_Conf_y.cpp \
   Synch_Options.cpp \
   System_Time.cpp \
@@ -314,6 +320,9 @@ libACE_la_SOURCES = \
   UPIPE_Acceptor.cpp \
   UPIPE_Connector.cpp \
   UPIPE_Stream.cpp \
+  UTF16_Encoding_Converter.cpp \
+  UTF32_Encoding_Converter.cpp \
+  UTF8_Encoding_Converter.cpp \
   UUID.cpp \
   WFMO_Reactor.cpp \
   WIN32_Asynch_IO.cpp \
@@ -325,7 +334,7 @@ libACE_la_SOURCES = \
 libACE_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
-nobase_include_HEADERS = \
+nobase_include_HEADERS += \
   ACE.h \
   ACE.inl \
   ACE_export.h \
@@ -364,6 +373,7 @@ nobase_include_HEADERS = \
   Array_Map.cpp \
   Array_Map.h \
   Array_Map.inl \
+  Assert.h \
   Asynch_Acceptor.cpp \
   Asynch_Acceptor.h \
   Asynch_Connector.cpp \
@@ -404,10 +414,10 @@ nobase_include_HEADERS = \
   Bound_Ptr.inl \
   CDR_Base.h \
   CDR_Base.inl \
-  CDR_Stream.h \
-  CDR_Stream.inl \
   CDR_Size.h \
   CDR_Size.inl \
+  CDR_Stream.h \
+  CDR_Stream.inl \
   CORBA_macros.h \
   Cache_Map_Manager_T.cpp \
   Cache_Map_Manager_T.h \
@@ -475,6 +485,8 @@ nobase_include_HEADERS = \
   Dynamic_Service.h \
   Dynamic_Service.inl \
   Dynamic_Service_Base.h \
+  Encoding_Converter.h \
+  Encoding_Converter_Factory.h \
   Env_Value_T.cpp \
   Env_Value_T.h \
   Env_Value_T.inl \
@@ -552,7 +564,6 @@ nobase_include_HEADERS = \
   High_Res_Timer.h \
   High_Res_Timer.inl \
   ICMP_Socket.h \
-  ICMP_Socket.inl \
   INET_Addr.h \
   INET_Addr.inl \
   IOStream.h \
@@ -688,7 +699,6 @@ nobase_include_HEADERS = \
   OS_Log_Msg_Attributes.h \
   OS_Log_Msg_Attributes.inl \
   OS_Memory.h \
-  OS_Memory.inl \
   OS_NS_Thread.h \
   OS_NS_Thread.inl \
   OS_NS_arpa_inet.h \
@@ -745,7 +755,6 @@ nobase_include_HEADERS = \
   OS_NS_sys_uio.h \
   OS_NS_sys_uio.inl \
   OS_NS_sys_utsname.h \
-  OS_NS_sys_utsname.inl \
   OS_NS_sys_wait.h \
   OS_NS_sys_wait.inl \
   OS_NS_time.h \
@@ -756,7 +765,6 @@ nobase_include_HEADERS = \
   OS_NS_wchar.inl \
   OS_QoS.h \
   OS_String.h \
-  OS_String.inl \
   OS_TLI.h \
   OS_TLI.inl \
   OS_Thread_Adapter.h \
@@ -826,9 +834,9 @@ nobase_include_HEADERS = \
   Recyclable.inl \
   Refcountable.h \
   Refcountable.inl \
+  Refcounted_Auto_Ptr.cpp \
   Refcounted_Auto_Ptr.h \
   Refcounted_Auto_Ptr.inl \
-  Refcounted_Auto_Ptr.cpp \
   Registry.h \
   Registry_Name_Space.h \
   Remote_Name_Space.h \
@@ -900,7 +908,6 @@ nobase_include_HEADERS = \
   Service_Config.h \
   Service_Config.inl \
   Service_Manager.h \
-  Service_Manager.inl \
   Service_Object.h \
   Service_Object.inl \
   Service_Repository.h \
@@ -939,7 +946,7 @@ nobase_include_HEADERS = \
   String_Base.inl \
   String_Base_Const.h \
   Svc_Conf.h \
-  Svc_Conf_Lexer_Guard.h \
+  Svc_Conf_Lexer.h \
   Svc_Conf_Tokens.h \
   Svc_Handler.cpp \
   Svc_Handler.h \
@@ -947,7 +954,6 @@ nobase_include_HEADERS = \
   Swap.inl \
   Synch.h \
   Synch_Options.h \
-  Synch_Options.inl \
   Synch_T.cpp \
   Synch_T.h \
   Synch_Traits.h \
@@ -962,7 +968,6 @@ nobase_include_HEADERS = \
   TP_Reactor.h \
   TP_Reactor.inl \
   TSS_Adapter.h \
-  TSS_Adapter.inl \
   TSS_T.cpp \
   TSS_T.h \
   TSS_T.inl \
@@ -975,7 +980,6 @@ nobase_include_HEADERS = \
   Task_T.cpp \
   Task_T.h \
   Task_T.inl \
-  Template_Instantiations.cpp \
   Test_and_Set.cpp \
   Test_and_Set.h \
   Thread.h \
@@ -1029,6 +1033,7 @@ nobase_include_HEADERS = \
   Token_Request_Reply.h \
   Token_Request_Reply.inl \
   Trace.h \
+  Truncate.h \
   Typed_SV_Message.cpp \
   Typed_SV_Message.h \
   Typed_SV_Message.inl \
@@ -1044,6 +1049,10 @@ nobase_include_HEADERS = \
   UPIPE_Connector.inl \
   UPIPE_Stream.h \
   UPIPE_Stream.inl \
+  UTF16_Encoding_Converter.h \
+  UTF16_Encoding_Converter.inl \
+  UTF32_Encoding_Converter.h \
+  UTF8_Encoding_Converter.h \
   UUID.h \
   UUID.inl \
   Unbounded_Queue.cpp \
@@ -1057,6 +1066,7 @@ nobase_include_HEADERS = \
   Vector_T.h \
   Vector_T.inl \
   Version.h \
+  Versioned_Namespace.h \
   WFMO_Reactor.h \
   WFMO_Reactor.inl \
   WIN32_Asynch_IO.h \
@@ -1070,11 +1080,11 @@ nobase_include_HEADERS = \
   config-all.h \
   config-borland-common.h \
   config-lite.h \
+  config-macros.h \
   config-minimal.h \
   config-win32-borland.h \
   config-win32-common.h \
   config-win32-ghs.h \
-  config-win32-msvc-6.h \
   config-win32-msvc-7.h \
   config-win32-msvc.h \
   config-win32-visualage.h \
@@ -1159,6 +1169,7 @@ nobase_include_HEADERS = \
   os_include/sys/os_socket.h \
   os_include/sys/os_stat.h \
   os_include/sys/os_statvfs.h \
+  os_include/sys/os_sysctl.h \
   os_include/sys/os_time.h \
   os_include/sys/os_timeb.h \
   os_include/sys/os_times.h \
@@ -1172,11 +1183,17 @@ nobase_include_HEADERS = \
   streams.h \
   svc_export.h
 
-pkgconfig_DATA = ACE.pc
+pkgconfig_DATA += \
+  ACE.pc
+
+CLEANFILES += \
+  ACE.pc
 
 ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
 
+endif !BUILD_ACE_FOR_TAO
+
 EXTRA_DIST = \
   ACE.pc.in \
   ace.rc
@@ -1193,22 +1210,28 @@ lib_LTLIBRARIES += libACE_FlReactor.la
 libACE_FlReactor_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
+  $(ACE_FLTK_CPPFLAGS) \
   -DACE_FLREACTOR_BUILD_DLL
 
 libACE_FlReactor_la_SOURCES = \
   FlReactor.cpp
 
 libACE_FlReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_FLTK_LDFLAGS)
 
 libACE_FlReactor_la_LIBADD = \
-  libACE.la
+  libACE.la \
+  $(ACE_FLTK_LIBS)
 
 nobase_include_HEADERS += \
   ACE_FlReactor_export.h \
   FlReactor.h
 
-pkgconfig_DATA += ACE_FlReactor.pc
+pkgconfig_DATA += \
+  ACE_FlReactor.pc
+
+CLEANFILES += \
+  ACE_FlReactor.pc
 
 ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_FlReactor.pc.in
@@ -1228,19 +1251,18 @@ if BUILD_QT
 BUILT_SOURCES = \
   QtReactor_moc.cpp
 
-CLEANFILES = \
+CLEANFILES += \
   QtReactor_moc.cpp
 
 QtReactor_moc.cpp: $(srcdir)/QtReactor.h
-	$(QTDIR)/bin/moc  $(srcdir)/QtReactor.h -o QtReactor_moc.cpp
+	$(QTDIR)/bin/moc  -o QtReactor_moc.cpp $(srcdir)/QtReactor.h
 
 lib_LTLIBRARIES += libACE_QtReactor.la
 
 libACE_QtReactor_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
-  -I$(QTDIR)/include \
-  -DQT_THREAD_SUPPORT \
+  $(ACE_QT_CPPFLAGS) \
   -DACE_QTREACTOR_BUILD_DLL
 
 libACE_QtReactor_la_SOURCES = \
@@ -1248,17 +1270,21 @@ libACE_QtReactor_la_SOURCES = \
   QtReactor_moc.cpp
 
 libACE_QtReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_QT_LDFLAGS)
 
 libACE_QtReactor_la_LIBADD = \
   libACE.la \
-  -lqt-mt
+  $(ACE_QT_LIBS)
 
 nobase_include_HEADERS += \
   ACE_QtReactor_export.h \
   QtReactor.h
 
-pkgconfig_DATA += ACE_QtReactor.pc
+pkgconfig_DATA += \
+  ACE_QtReactor.pc
+
+CLEANFILES += \
+  ACE_QtReactor.pc
 
 ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_QtReactor.pc.in
@@ -1278,22 +1304,30 @@ lib_LTLIBRARIES += libACE_TkReactor.la
 libACE_TkReactor_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
+  $(ACE_TK_CPPFLAGS) \
+  $(ACE_TCL_CPPFLAGS) \
   -DACE_TKREACTOR_BUILD_DLL
 
 libACE_TkReactor_la_SOURCES = \
   TkReactor.cpp
 
 libACE_TkReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
 
 libACE_TkReactor_la_LIBADD = \
-  libACE.la
+  libACE.la \
+  $(ACE_TK_LIBS) \
+  $(ACE_TCL_LIBS)
 
 nobase_include_HEADERS += \
   ACE_TkReactor_export.h \
   TkReactor.h
 
-pkgconfig_DATA += ACE_TkReactor.pc
+pkgconfig_DATA += \
+  ACE_TkReactor.pc
+
+CLEANFILES += \
+  ACE_TkReactor.pc
 
 ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_TkReactor.pc.in
@@ -1314,22 +1348,30 @@ lib_LTLIBRARIES += libACE_XtReactor.la
 libACE_XtReactor_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
+  $(ACE_X11_CPPFLAGS) \
+  $(ACE_XT_CPPFLAGS) \
   -DACE_XTREACTOR_BUILD_DLL
 
 libACE_XtReactor_la_SOURCES = \
   XtReactor.cpp
 
 libACE_XtReactor_la_LDFLAGS = \
- -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
 
 libACE_XtReactor_la_LIBADD = \
-  libACE.la
+  libACE.la \
+  $(ACE_XT_LIBS) \
+  $(ACE_X11_LIBS)
 
 nobase_include_HEADERS += \
   ACE_XtReactor_export.h \
   XtReactor.h
 
-pkgconfig_DATA += ACE_XtReactor.pc
+pkgconfig_DATA += \
+  ACE_XtReactor.pc
+
+CLEANFILES += \
+  ACE_XtReactor.pc
 
 ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in
 	${top_builddir}/config.status --file $@:${srcdir}/ACE_XtReactor.pc.in
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 6ef923634ba..7dbd8272dd8 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Process-wide ACE_Allocator.
 ACE_Allocator *ACE_Allocator::allocator_ = 0;
 
@@ -121,14 +123,6 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
     next->prev_ = this;
 }
 
-ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
-{
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
-#if !defined (ACE_PSOS)
-  ACE_ASSERT (!"not implemented!");
-#endif /* ! ACE_PSOS */
-}
-
 const char *
 ACE_Control_Block::ACE_Name_Node::name (void) const
 {
@@ -136,14 +130,6 @@ ACE_Control_Block::ACE_Name_Node::name (void) const
   return c;
 }
 
-void
-ACE_Control_Block::ACE_Name_Node::name (const char *)
-{
-#if !defined (ACE_PSOS)
-  ACE_ASSERT (!"not implemented!");
-#endif /* ! ACE_PSOS */
-}
-
 ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
   : next_block_ (0),
     size_ (0)
@@ -185,9 +171,9 @@ ACE_Malloc_Stats::dump (void) const
   ACE_TRACE ("ACE_Malloc_Stats::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  int nblocks = this->nblocks_.value ();
-  int ninuse  = this->ninuse_.value ();
-  int nchunks = this->nchunks_.value ();
+  int const nblocks = this->nblocks_.value ();
+  int const ninuse  = this->ninuse_.value ();
+  int const nchunks = this->nchunks_.value ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("nblocks = %d"), nblocks));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\nninuse = %d"), ninuse));
@@ -197,11 +183,6 @@ ACE_Malloc_Stats::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
-template class ACE_Atomic_Op_Ex<ACE_PROCESS_MUTEX, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_PROCESS_MUTEX, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /*ACE_HAS_MALLOC_STATS*/
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc.h b/ace/Malloc.h
index d19a5f12ebb..5362c0baaf6 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -33,6 +33,9 @@
 #    define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple
 #  endif /* ACE_HAS_THREADS */
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT;
 
 /******************************************************************
@@ -198,6 +201,9 @@ struct ACE_Export ACE_Malloc_Stats
   /// Number of blocks in use
   ACE_INT ninuse_;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  define ACE_MALLOC_STATS(X) X
 #else
 #  define ACE_MALLOC_STATS(X)
@@ -212,6 +218,8 @@ struct ACE_Export ACE_Malloc_Stats
 #  define ACE_MALLOC_PADDING 1
 #endif /* ACE_MALLOC_PADDING */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 union ACE_max_align_info
 {
   int (*i)();
@@ -301,9 +309,6 @@ public:
                    char *pointer,
                    ACE_Name_Node *head);
 
-    /// Copy constructor.
-    ACE_Name_Node (const ACE_Name_Node &);
-
     /// Constructor.
     ACE_Name_Node (void);
 
@@ -318,9 +323,6 @@ public:
     /// Return a pointer to the name of this node.
     const char *name (void) const;
 
-    /// Assign a name;
-    void name (const char *);
-
     /// Name of the Node.
     char *name_;
 
@@ -335,6 +337,9 @@ public:
 
     /// Dump the state of the object.
     void dump (void) const;
+  private:
+    /// Copy constructor.
+    ACE_Name_Node (const ACE_Name_Node &);
   };
 
   /// Print out a bunch of size info for debugging.
@@ -380,6 +385,8 @@ public:
   void dump (void) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Malloc.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Malloc.inl b/ace/Malloc.inl
index 76722f13fb7..fdfbd1a612d 100644
--- a/ace/Malloc.inl
+++ b/ace/Malloc.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
 {
@@ -19,3 +22,5 @@ ACE_Control_Block::ACE_Name_Node::init_ptr
 {
   *ptr = init;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index ec12aa32954..deeaffc54eb 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -1,16 +1,5 @@
 // $Id$
 
-// FILENAME
-//   Malloc_Allocator.cpp
-//
-// AUTHOR
-//   Priyanka Gontla <pgontla@uci.edu>
-//
-// ==========================================================================
-
-#if !defined (ACE_MALLOC_ALLOCATOR_CPP)
-#define ACE_MALLOC_ALLOCATOR_CPP
-
 #include "ace/Malloc_Allocator.h"
 #include "ace/Object_Manager.h"
 
@@ -25,6 +14,8 @@
 
 ACE_RCSID (ace, Malloc_Allocator, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Allocator *
 ACE_Allocator::instance (void)
 {
@@ -367,4 +358,4 @@ ACE_Static_Allocator_Base::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_MALLOC_ALLOCATOR_CPP */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h
index 4fecb2a3d6a..f70555a74da 100644
--- a/ace/Malloc_Allocator.h
+++ b/ace/Malloc_Allocator.h
@@ -34,6 +34,8 @@
 
 #endif /* ACE_HAS_MALLOC_STATS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_New_Allocator
  *
@@ -133,6 +135,8 @@ protected:
   size_t offset_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Malloc_Allocator.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Malloc_Allocator.inl b/ace/Malloc_Allocator.inl
index 7ec860c8591..87a96099c1a 100644
--- a/ace/Malloc_Allocator.inl
+++ b/ace/Malloc_Allocator.inl
@@ -1,11 +1,16 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer,
+ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char * buffer,
                                                       size_t size)
   : buffer_ (buffer),
     size_ (size),
     offset_ (0)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index 34605eb05bf..048123ad13f 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 #include "ace/os_include/sys/os_mman.h"
 #include "ace/os_include/sys/os_types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // The definition of this class is located in Malloc.cpp.
 
 /**
@@ -39,10 +41,10 @@ class ACE_Export ACE_Allocator
 public:
   // = Memory Management
 
-  /// Get pointer to a default <ACE_Allocator>.
+  /// Get pointer to a default ACE_Allocator.
   static ACE_Allocator *instance (void);
 
-  /// Set pointer to a process-wide <ACE_Allocator> and return existing
+  /// Set pointer to a process-wide ACE_Allocator and return existing
   /// pointer.
   static ACE_Allocator *instance (ACE_Allocator *);
 
@@ -117,14 +119,14 @@ public:
   // backing store).
 
   /**
-   * Sync <len> bytes of the memory region to the backing store
-   * starting at <this->base_addr_>.  If <len> == -1 then sync the
+   * Sync @a len bytes of the memory region to the backing store
+   * starting at @c this->base_addr_.  If @a len == -1 then sync the
    * whole region.
    */
   virtual int sync (ssize_t len = -1, int flags = MS_SYNC) = 0;
 
-  /// Sync <len> bytes of the memory region to the backing store
-  /// starting at <addr_>.
+  /// Sync @a len bytes of the memory region to the backing store
+  /// starting at @a addr.
   virtual int sync (void *addr, size_t len, int flags = MS_SYNC) = 0;
 
   /**
@@ -149,12 +151,14 @@ private:
   // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!!  See the
   // <ACE_Allocator::instance> implementation for explanation.
 
-  /// Pointer to a process-wide <ACE_Allocator> instance.
+  /// Pointer to a process-wide ACE_Allocator instance.
   static ACE_Allocator *allocator_;
 
   /// Must delete the <allocator_> if non-0.
   static int delete_allocator_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_MALLOC_BASE_H */
diff --git a/ace/Malloc_Instantiations.cpp b/ace/Malloc_Instantiations.cpp
index 90ffee4b1f1..5eea274f6bb 100644
--- a/ace/Malloc_Instantiations.cpp
+++ b/ace/Malloc_Instantiations.cpp
@@ -1,7 +1,12 @@
 // $Id$
 
-#include "ace/Malloc.h"
+#include "ace/Local_Memory_Pool.h"
+#include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -32,3 +37,5 @@ template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_
 # endif  /* ACE_HAS_THREADS */
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 599191272ed..86560f5cea8 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -17,6 +17,8 @@
 #include "ace/OS_NS_string.h"
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T, class ACE_LOCK>
 ACE_Cached_Allocator<T, ACE_LOCK>::ACE_Cached_Allocator (size_t n_chunks)
   : pool_ (0),
@@ -78,7 +80,8 @@ ACE_Cached_Allocator<T, ACE_LOCK>::calloc (size_t nbytes,
   // addr() call is really not absolutely necessary because of the way
   // ACE_Cached_Mem_Pool_Node's internal structure arranged.
   void *ptr = this->free_list_.remove ()->addr ();
-  ACE_OS::memset (ptr, initial_value, sizeof (T));
+  if (ptr != 0)
+    ACE_OS::memset (ptr, initial_value, sizeof (T));
   return ptr;
 }
 
@@ -150,7 +153,8 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::calloc (size_t nbytes,
   // addr() call is really not absolutely necessary because of the way
   // ACE_Cached_Mem_Pool_Node's internal structure arranged.
   void *ptr = this->free_list_.remove ()->addr ();
-  ACE_OS::memset (ptr, initial_value, chunk_size_);
+  if (ptr != 0)
+    ACE_OS::memset (ptr, initial_value, chunk_size_);
   return ptr;
 }
 
@@ -468,7 +472,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void)
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name)
-  : memory_pool_ (pool_name),
+  : cb_ptr_ (0),
+    memory_pool_ (pool_name),
     bad_flag_ (0)
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T");
@@ -490,7 +495,8 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name,
                                                               const ACE_TCHAR *lock_name,
                                                               const ACE_MEM_POOL_OPTIONS *options)
-  : memory_pool_ (pool_name, options),
+  : cb_ptr_ (0),
+    memory_pool_ (pool_name, options),
     bad_flag_ (0)
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T");
@@ -514,7 +520,8 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name,
                                                               const ACE_MEM_POOL_OPTIONS *options,
                                                               ACE_LOCK *lock)
-  : memory_pool_ (pool_name, options),
+  : cb_ptr_ (0),
+    memory_pool_ (pool_name, options),
     lock_ (lock),
     delete_lock_ (0),
     bad_flag_ (0)
@@ -540,7 +547,8 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name,
                                                           const ACE_TCHAR *lock_name,
                                                           const void *options)
-  : memory_pool_ (pool_name,
+  : cb_ptr_ (0),
+    memory_pool_ (pool_name,
                   (const ACE_MEM_POOL_OPTIONS *) options),
     bad_flag_ (0)
 {
@@ -578,7 +586,6 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void)
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove");
   // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) destroying ACE_Malloc_T\n")));
-  int result = 0;
 
 #if defined (ACE_HAS_MALLOC_STATS)
   this->print_stats ();
@@ -589,7 +596,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void)
     this->lock_->remove ();
 
   // Give the memory pool a chance to release its resources.
-  result = this->memory_pool_.release ();
+  int const result = this->memory_pool_.release ();
 
   // Reset this->cb_ptr_ as it is no longer valid.
   // There's also no need to keep the reference counter as the
@@ -615,7 +622,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes)
     return 0;
 
   // Round up request to a multiple of the MALLOC_HEADER size.
-  size_t nunits =
+  size_t const nunits =
     (nbytes + sizeof (MALLOC_HEADER) - 1) / sizeof (MALLOC_HEADER)
     + 1; // Add one for the <MALLOC_HEADER> itself.
 
@@ -772,7 +779,6 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap)
   if (ap == 0 || this->cb_ptr_ == 0)
     return;
 
-
   // Adjust AP to point to the block MALLOC_HEADER
   MALLOC_HEADER *blockp = ((MALLOC_HEADER *) ap) - 1;
   MALLOC_HEADER *currp = this->cb_ptr_->freep_;
@@ -1249,4 +1255,6 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start (void)
   return this->curr_ != 0;
 }
 
-#endif /* ACE_MALLOC_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_MALLOC_T_CPP */
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 241d1529f49..79c92dfe99e 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -16,6 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Malloc.h"               /* Need ACE_Control_Block */
+#include "ace/Malloc_Base.h"          /* Need ACE_Allocator */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +26,8 @@
 #include "ace/Free_List.h"
 #include "ace/Guard_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Cached_Mem_Pool_Node
  *
@@ -886,6 +889,8 @@ public:
   ACE_LOCK * operator () (const ACE_TCHAR *myname);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Malloc_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Malloc_T.inl b/ace/Malloc_T.inl
index ff9fc26f4be..dee20160cb2 100644
--- a/ace/Malloc_T.inl
+++ b/ace/Malloc_T.inl
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE T *
 ACE_Cached_Mem_Pool_Node<T>::addr (void)
 {
@@ -59,7 +61,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::release (int close)
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
   if (this->cb_ptr_ != 0)
     {
-      int retv = --this->cb_ptr_->ref_counter_;
+      int const retv = --this->cb_ptr_->ref_counter_;
 
 #if 0
       ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P) ACE_Malloc_T::release ->%d\n"),
@@ -167,7 +169,6 @@ ACE_Malloc_FIFO_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_FIFO_Iterator (AC
 }
 
 
-
 #if 0
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE void
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::init_malloc_header_ptr (void* ptr)
@@ -178,4 +179,6 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::init_malloc_header_ptr (void* pt
   ACE_UNUSED_ARG (ptr);
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 }
-#endif
+#endif  /* 0 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Managed_Object.cpp b/ace/Managed_Object.cpp
index cd798b2216d..53381f88a7e 100644
--- a/ace/Managed_Object.cpp
+++ b/ace/Managed_Object.cpp
@@ -13,11 +13,13 @@
 #include "ace/Managed_Object.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Managed_Object, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE>
 ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_MANAGED_OBJECT_CPP */
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 041e7c2d82a..b700a59cf13 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -24,6 +24,8 @@
 #include "ace/Object_Manager.h"
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Cleanup_Adapter
  *
@@ -115,7 +117,7 @@ public:
   // Get the preallocated object identified by "id".  Returns a
   // pointer to the object.  Beware: no error indication is provided,
   // because it can _only_ be used for accessing preallocated objects.
-  // Note: the function definition is inlined here so that it compiles
+  // @note The function definition is inlined here so that it compiles
   // on AIX 4.1 w/xlC v. 3.01.
 
   static TYPE *get_preallocated_array (ACE_Object_Manager::Preallocated_Array identifier)
@@ -133,18 +135,22 @@ public:
   // Get the preallocated array identified by "id".  Returns a
   // pointer to the array.  Beware: no error indication is provided,
   // because it can _only_ be used for accessing preallocated arrays.
-  // Note: the function definition is inlined here so that it compiles
+  // @note The function definition is inlined here so that it compiles
   // on AIX 4.1 w/xlC v. 3.01.
 
-private:
+protected:
+
   // Disallow instantiation of this class.
   ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (void))
+
+private:
+
   ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object<TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Managed_Object<TYPE> &))
-
-  friend class this_prevents_compiler_warning_about_only_private_constructors;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Managed_Object.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Managed_Object.inl b/ace/Managed_Object.inl
index d4dd6043418..0619691d8a6 100644
--- a/ace/Managed_Object.inl
+++ b/ace/Managed_Object.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE>
 ACE_INLINE
 ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter (void)
@@ -16,3 +19,5 @@ ACE_Cleanup_Adapter<TYPE>::object (void)
 {
   return this->object_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Manual_Event.cpp b/ace/Manual_Event.cpp
index 3864da3e06e..5acefac1109 100644
--- a/ace/Manual_Event.cpp
+++ b/ace/Manual_Event.cpp
@@ -9,6 +9,8 @@
 
 ACE_RCSID(ace, Manual_Event, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Manual_Event::ACE_Manual_Event (int initial_state,
                                     int type,
                                     const char *name,
@@ -41,3 +43,4 @@ ACE_Manual_Event::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Manual_Event.h b/ace/Manual_Event.h
index 888df828cc9..fd3b5743188 100644
--- a/ace/Manual_Event.h
+++ b/ace/Manual_Event.h
@@ -24,6 +24,8 @@
 
 #include "ace/Event.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Manual_Event
  *
@@ -59,6 +61,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Manual_Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Manual_Event.inl b/ace/Manual_Event.inl
index 1e4d560a855..42bf94f6404 100644
--- a/ace/Manual_Event.inl
+++ b/ace/Manual_Event.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Manual_Event::~ACE_Manual_Event (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Map.cpp b/ace/Map.cpp
deleted file mode 100644
index 1faa6c18f23..00000000000
--- a/ace/Map.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Map.cpp
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#include "ace/Map_T.h"
-
-ACE_RCSID(ace, Map, "$Id$")
-
diff --git a/ace/Map.h b/ace/Map.h
index 1da1db7a4a5..0e7c00b30b5 100644
--- a/ace/Map.h
+++ b/ace/Map.h
@@ -6,6 +6,8 @@
  *
  *  $Id$
  *
+ *  Backward compatibility header.
+ *
  *  @author Irfan Pyarali
  */
 //=============================================================================
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 5c6267f2b5f..f39124ce9d9 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_MAP_MANAGER_C
-#define ACE_MAP_MANAGER_C
+#ifndef ACE_MAP_MANAGER_CPP
+#define ACE_MAP_MANAGER_CPP
 
 #include "ace/Map_Manager.h"
 
@@ -15,20 +15,14 @@
 #include "ace/Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Map_Manager, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Entry)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Manager)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Const_Iterator_Base)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Iterator_Base)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Const_Iterator)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Iterator)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Reverse_Iterator)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -702,4 +696,6 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_MAP_MANAGER_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_MAP_MANAGER_CPP */
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 1cf39698914..847c7167e2c 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -21,8 +21,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Log_Msg.h"
 #include "ace/Basic_Types.h"
+#include "ace/Global_Macros.h"
+#include "ace/Default_Constants.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declaration.
 class ACE_Allocator;
@@ -113,9 +116,9 @@ class ACE_Map_Reverse_Iterator;
  * The <EXT_ID> must support <operator==>.  This constraint can
  * be alleviated via template specialization, as shown in the
  * $ACE_ROOT/tests/Conn_Test.cpp test.
- * This class uses an <ACE_Allocator> to allocate memory.  The
+ * This class uses an ACE_Allocator to allocate memory.  The
  * user can make this a persistant class by providing an
- * <ACE_Allocator> with a persistable memory pool.
+ * ACE_Allocator with a persistable memory pool.
  * This implementation of a map uses an array, which is searched
  * linearly.  For more efficient searching you should use the
  * <ACE_Hash_Map_Manager>.
@@ -261,8 +264,8 @@ public:
    * possible to acquire the lock explicitly, which can be useful in
    * some cases if you instantiate the <ACE_Atomic_Op> with an
    * <ACE_Recursive_Mutex> or <ACE_Process_Mutex>, or if you need to
-   * guard the state of an iterator.  NOTE: the right name would be
-   * <lock>, but HP/C++ will choke on that!
+   * guard the state of an iterator.
+   * @note The right name would be <lock>, but HP/C++ will choke on that!
    */
   ACE_LOCK &mutex (void);
 
@@ -564,7 +567,7 @@ protected:
  * <ACE_Map_Manager> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -611,7 +614,7 @@ public:
  * <ACE_Map_Manager> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -658,7 +661,7 @@ public:
  * <ACE_Map_Manager> it is iterating upon since locking is
  * inherently inefficient and/or error-prone within an STL-style
  * iterator.  If you require locking, you can explicitly use an
- * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s
+ * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s
  * internal lock, which is accessible via its <mutex> method.
  */
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -696,6 +699,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Map_Manager.inl b/ace/Map_Manager.inl
index 7ef6fdfbf3b..c40a72d79f1 100644
--- a/ace/Map_Manager.inl
+++ b/ace/Map_Manager.inl
@@ -3,6 +3,9 @@
 // $Id$
 
 #include "ace/Guard_T.h"
+#include "ace/Log_Msg.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class EXT_ID, class INT_ID> ACE_INLINE
@@ -714,3 +717,5 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (int)
   --*this;
   return retv;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Map_T.cpp b/ace/Map_T.cpp
index 8aab011ffef..2487481edc3 100644
--- a/ace/Map_T.cpp
+++ b/ace/Map_T.cpp
@@ -13,6 +13,8 @@
 #include "ace/Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class KEY, class VALUE>
 ACE_Map<KEY, VALUE>::~ACE_Map (void)
 {
@@ -1336,4 +1338,6 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl (void)
   return temp;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_MAP_T_CPP */
diff --git a/ace/Map_T.h b/ace/Map_T.h
index 9ff658d4a7d..942b8bf1156 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Noop_Key_Generator
  *
@@ -1591,6 +1593,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager_Adapter (const ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Map_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Map_T.inl b/ace/Map_T.inl
index 91a9f678ccc..8dea4a198b3 100644
--- a/ace/Map_T.inl
+++ b/ace/Map_T.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE int
 ACE_Noop_Key_Generator<T>::operator() (T &)
 {
@@ -408,3 +411,5 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator (void)
 {
   return this->key_generator_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp
index 086051a79d9..32fd2161d60 100644
--- a/ace/Mem_Map.cpp
+++ b/ace/Mem_Map.cpp
@@ -23,6 +23,8 @@
 
 ACE_RCSID(ace, Mem_Map, "Mem_Map.cpp,v 4.39 2003/11/01 11:15:13 dhinton Exp")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map)
 
 #if defined (ACE_USE_MAPPING_NAME)
@@ -123,7 +125,7 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
   if (result == -1)
     return -1;
 #else
-  long result = ACE_OS::filesize (this->handle_);
+  off_t result = ACE_OS::filesize (this->handle_);
 #endif /* CHORUS */
 
   // At this point we know <result> is not negative...
@@ -246,10 +248,6 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name,
 {
   ACE_TRACE ("ACE_Mem_Map::open");
 
-  ACE_OS::strsncpy (this->filename_,
-                    file_name,
-                    MAXPATHLEN);
-
 #if defined (CHORUS) || defined(INTEGRITY)  || defined (__QNXNTO__)
   this->handle_ = ACE_OS::shm_open (file_name, flags, mode, sa);
 #elif defined (ACE_OPENVMS)
@@ -262,6 +260,10 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name,
     return -1;
   else
     {
+      ACE_OS::strsncpy (this->filename_,
+                        file_name,
+                        MAXPATHLEN);
+
       this->close_handle_ = 1;
       return 0;
     }
@@ -392,3 +394,5 @@ ACE_Mem_Map::remove (void)
   else
     return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 8f270f633ac..c72093faf40 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -15,12 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +27,8 @@
 #include "ace/os_include/os_fcntl.h"
 #include "ace/Default_Constants.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Mem_Map
  *
@@ -40,7 +37,7 @@
  * This class works with both the mmap(2) UNIX system and the
  * Win32 family of memory mapping system calls.
  */
-class ACE_Memory_Export ACE_Mem_Map
+class ACE_Export ACE_Mem_Map
 {
 public:
   // = Initialization and termination methods.
@@ -48,7 +45,7 @@ public:
   /// Default constructor.
   ACE_Mem_Map (void);
 
-  /// Map a file from an open file descriptor <handle>.  This function
+  /// Map a file from an open file descriptor @a handle.  This function
   /// will lookup the length of the file if it is not given.
   ACE_Mem_Map (ACE_HANDLE handle,
                int length = -1,
@@ -58,7 +55,7 @@ public:
                off_t offset = 0,
                LPSECURITY_ATTRIBUTES sa = 0);
 
-  /// Map a file specified by <file_name>.
+  /// Map a file specified by @a file_name.
   ACE_Mem_Map (const ACE_TCHAR *filename,
                int len = -1,
                int flags = O_RDWR | O_CREAT,
@@ -69,7 +66,7 @@ public:
                off_t offset = 0,
                LPSECURITY_ATTRIBUTES sa = 0);
 
-  /// Map a file from an open file descriptor <handle>.  This function
+  /// Map a file from an open file descriptor @a handle.  This function
   /// will lookup the length of the file if it is not given.
   int map (ACE_HANDLE handle,
            int length = -1,
@@ -178,6 +175,23 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
+
+  /// This method does the dirty work of actually calling ::mmap to map
+  /// the file into memory.
+  int map_it (ACE_HANDLE handle,
+              int len = -1,
+              int prot = PROT_RDWR,
+              int share = MAP_SHARED,
+              void *addr = 0,
+              off_t offset = 0,
+              LPSECURITY_ATTRIBUTES sa = 0);
+
+  // = Disallow copying and assignment.
+  ACE_Mem_Map (const ACE_Mem_Map &);
+  void operator = (const ACE_Mem_Map &);
+
+private:
+
   /// Base address of the memory-mapped file.
   void *base_addr_;
 
@@ -202,21 +216,10 @@ private:
   /// if we opened the file.
   int close_handle_;
 
-  /// This method does the dirty work of actually calling ::mmap to map
-  /// the file into memory.
-  int map_it (ACE_HANDLE handle,
-              int len = -1,
-              int prot = PROT_RDWR,
-              int share = MAP_SHARED,
-              void *addr = 0,
-              off_t offset = 0,
-              LPSECURITY_ATTRIBUTES sa = 0);
-
-  // = Disallow copying and assignment.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Mem_Map (const ACE_Mem_Map &))
-  ACE_UNIMPLEMENTED_FUNC (void operator = (const ACE_Mem_Map &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Mem_Map.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Mem_Map.inl b/ace/Mem_Map.inl
index 3293b9a1365..0d67cfc5b02 100644
--- a/ace/Mem_Map.inl
+++ b/ace/Mem_Map.inl
@@ -1,9 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_mman.h"
 #include "ace/OS_NS_sys_stat.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_HANDLE
 ACE_Mem_Map::handle (void) const
 {
@@ -253,3 +257,5 @@ ACE_Mem_Map::close_handle (void)
 
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 6dfce19a0ec..79ef07f3c26 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (ace,
            Message_Block,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_Message_Block)
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -582,10 +584,14 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
                         mb.message_block_allocator_) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_LIB_TEXT ("ACE_Message_Block")));
-
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
       // Align ourselves
       char *start = ACE_ptr_align_binary (this->base (),
                                           align);
+#else
+      char *start = this->base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
+
       // Set our rd & wr pointers
       this->rd_ptr (start);
       this->wr_ptr (start);
@@ -609,21 +615,29 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
         ACE_ERROR ((LM_ERROR,
                     ACE_LIB_TEXT ("ACE_Message_Block")));
 
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
       // Align ourselves
       char *start = ACE_ptr_align_binary (this->base (),
                                           align);
+#else
+      char *start = this->base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
+
       // Set our rd & wr pointers
       this->rd_ptr (start);
       this->wr_ptr (start);
 
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
       // Get the alignment offset of the incoming ACE_Message_Block
       start = ACE_ptr_align_binary (mb.base (),
                                     align);
-
+#else
+      start = mb.base ();
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 
       // Actual offset for the incoming message block assuming that it
       // is also aligned to the same "align" byte
-      size_t wr_offset = mb.wr_ptr_ - (start - mb.base ());
+      size_t const wr_offset = mb.wr_ptr_ - (start - mb.base ());
 
       // Copy wr_offset amount of data in to <this->data_block>
       (void) ACE_OS::memcpy (this->wr_ptr (),
@@ -634,6 +648,9 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
       // to do what it wants
 
     }
+#if defined (ACE_LACKS_CDR_ALIGNMENT)
+  ACE_UNUSED_ARG (align);
+#endif /* ACE_LACKS_CDR_ALIGNMENT */
 }
 
 int
@@ -736,7 +753,7 @@ ACE_Data_Block::release_i (void)
   ACE_Data_Block *result = 0;
 
   // decrement reference count
-  this->reference_count_--;
+  --this->reference_count_;
 
   if (this->reference_count_ == 0)
     // this will cause deletion of this
@@ -948,10 +965,10 @@ ACE_Data_Block::duplicate (void)
     {
       // We need to acquire the lock before incrementing the count.
       ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->locking_strategy_, 0);
-      this->reference_count_++;
+      ++this->reference_count_;
     }
   else
-    this->reference_count_++;
+    ++this->reference_count_;
 
   return this;
 }
@@ -1203,6 +1220,7 @@ ACE_Data_Block::base (char *msg_data,
   if (ACE_BIT_DISABLED (this->flags_,
                         ACE_Message_Block::DONT_DELETE))
     this->allocator_strategy_->free (this->base_);
+
   this->max_size_ = msg_length;
   this->cur_size_ = msg_length;
   this->base_ = msg_data;
@@ -1350,18 +1368,4 @@ ACE_Laxity_Message_Strategy::dump (void) const
 }
   // Dump the state of the strategy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Guard <ACE_Lock>;
-// These specializations aren't needed for the ACE library because
-// Service_Config.cpp has them:
-//
-// template class ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>;
-// template class ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Guard <ACE_Lock>
-// These specializations aren't needed for the ACE library because
-// Service_Config.cpp has them:
-//
-// #pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>
-// #pragma instantiate ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index f5111c199db..20b20810587 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -26,6 +26,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 class ACE_Allocator;
 class ACE_Data_Block;
@@ -521,25 +523,25 @@ public:
   size_t space (void) const;
   //@}
 
-  // = <ACE_Data_Block> methods.
+  // = ACE_Data_Block methods.
 
   /**
-   * Get a pointer to the data block. Note that the <ACE_Message_Block>
+   * Get a pointer to the data block. Note that the ACE_Message_Block
    * still references the block; this call does not change the reference
    * count.
    */
   ACE_Data_Block *data_block (void) const;
 
   /**
-   * Set a new data block pointer. The original <ACE_Data_Block> is released
+   * Set a new data block pointer. The original ACE_Data_Block is released
    * as a result of this call. If you need to keep the original block, call
-   * <replace_data_block> instead. Upon return, this <ACE_Message_Block>
-   * holds a pointer to the new <ACE_Data_Block>, taking over the reference
+   * <replace_data_block> instead. Upon return, this ACE_Message_Block
+   * holds a pointer to the new ACE_Data_Block, taking over the reference
    * you held on it prior to the call.
    */
   void data_block (ACE_Data_Block *);
 
-  /// Set a new data block pointer. A pointer to the original <ACE_Data_Block>
+  /// Set a new data block pointer. A pointer to the original ACE_Data_Block
   /// is returned, and not released (as it is with <data_block>).
   ACE_Data_Block *replace_data_block (ACE_Data_Block*);
 
@@ -550,14 +552,14 @@ public:
   /// Set the continuation field.
   void cont (ACE_Message_Block *);
 
-  // = Pointer to the <Message_Block> directly ahead in the <ACE_Message_Queue>.
+  // = Pointer to the <Message_Block> directly ahead in the ACE_Message_Queue.
   /// Get link to next message.
   ACE_Message_Block *next (void) const;
 
   /// Set link to next message.
   void next (ACE_Message_Block *);
 
-  // = Pointer to the <Message_Block> directly behind in the <ACE_Message_Queue>.
+  // = Pointer to the <Message_Block> directly behind in the ACE_Message_Queue.
   /// Get link to prev message.
   ACE_Message_Block *prev (void) const;
 
@@ -664,7 +666,7 @@ private:
  * @class ACE_Data_Block
  *
  * @brief Stores the data payload that is accessed via one or more
- * <ACE_Message_Block>s.
+ * ACE_Message_Block's.
  *
  * This data structure is reference counted to maximize
  * sharing.  It also contains the <locking_strategy_> (which
@@ -822,25 +824,25 @@ protected:
 
   // = Strategies.
   /**
-   * Pointer to the allocator defined for this <ACE_Data_Block>.  Note
+   * Pointer to the allocator defined for this ACE_Data_Block.  Note
    * that this pointer is shared by all owners of this
-   * <ACE_Data_Block>.
+   * ACE_Data_Block.
    */
   ACE_Allocator *allocator_strategy_;
 
   /**
    * Pointer to the locking strategy defined for this
-   * <ACE_Data_Block>.  This is used to protect regions of code that
-   * access shared <ACE_Data_Block> state.  Note that this lock is
-   * shared by all owners of the <ACE_Data_Block>'s data.
+   * ACE_Data_Block.  This is used to protect regions of code that
+   * access shared ACE_Data_Block state.  Note that this lock is
+   * shared by all owners of the ACE_Data_Block's data.
    */
   ACE_Lock *locking_strategy_;
 
   /**
-   * Reference count for this <ACE_Data_Block>, which is used to avoid
+   * Reference count for this ACE_Data_Block, which is used to avoid
    * deep copies (i.e., <clone>).  Note that this pointer value is
    * shared by all owners of the <Data_Block>'s data, i.e., all the
-   * <ACE_Message_Block>s.
+   * ACE_Message_Blocks.
    */
   int reference_count_;
 
@@ -857,9 +859,9 @@ private:
  * @class ACE_Dynamic_Message_Strategy
  *
  * @brief An abstract base class which provides dynamic priority
- * evaluation methods for use by the <ACE_Dynamic_Message_Queue>
+ * 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_Block's dynamically.
  *
  * Methods for deadline and laxity based priority evaluation are
  * provided.  These methods assume a specific partitioning of
@@ -1033,6 +1035,8 @@ public:
   virtual void dump (void) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Message_Block.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Message_Block.inl b/ace/Message_Block.inl
index b1d5152fbe7..2f67cc25078 100644
--- a/ace/Message_Block.inl
+++ b/ace/Message_Block.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Message_Block.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Data_Block *
 ACE_Message_Block::data_block (void) const
@@ -621,3 +622,5 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
   return status;
 }
   // returns the priority status of the message
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp
index 70621872a19..d2cf9464ab0 100644
--- a/ace/Message_Block_T.cpp
+++ b/ace/Message_Block_T.cpp
@@ -1,9 +1,7 @@
 // $Id$
 
-#if !defined (ACE_MESSAGE_BLOCK_T_C)
-#define ACE_MESSAGE_BLOCK_T_C
-
-ACE_RCSID(ace, Message_Block_T, "$Id$")
+#ifndef ACE_MESSAGE_BLOCK_T_CPP
+#define ACE_MESSAGE_BLOCK_T_CPP
 
 #include "ace/Malloc_Base.h"     /* Need ACE_Allocator */
 
@@ -13,6 +11,8 @@ ACE_RCSID(ace, Message_Block_T, "$Id$")
 
 #include "ace/os_include/os_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class L>
 ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void)
 {
@@ -28,7 +28,7 @@ ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags
   const ACE_Message_Block::Message_Flags always_clear =
     ACE_Message_Block::DONT_DELETE;
 
-  ACE_Locked_Data_Block<ACE_LOCK> *nb;
+  ACE_Locked_Data_Block<ACE_LOCK> *nb = 0;
 
   ACE_NEW_MALLOC_RETURN (nb,
                          static_cast<ACE_Locked_Data_Block<ACE_LOCK>*> (
@@ -46,4 +46,6 @@ ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags
   return nb;
 }
 
-#endif /* ACE_MESSAGE_BLOCK_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_MESSAGE_BLOCK_T_CPP */
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index f2f1732c56a..c1b4818a880 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Locked_Data_Block
  *
@@ -67,6 +69,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block (const ACE_Locked_Data_Block<ACE_LOCK> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Message_Block_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Message_Block_T.inl b/ace/Message_Block_T.inl
index 279dcaa704d..6829bd6c360 100644
--- a/ace/Message_Block_T.inl
+++ b/ace/Message_Block_T.inl
@@ -1,8 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Message_Block_T.i
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class ACE_LOCK> ACE_INLINE
 ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block (void)
@@ -27,3 +27,5 @@ ACE_Locked_Data_Block (size_t size,
                     data_block_allocator)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 019835e1cef..599f5e6b05e 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Message_Queue_Base::~ACE_Message_Queue_Base (void)
 {
 }
@@ -251,7 +253,7 @@ ACE_Message_Queue_Vx::enqueue_tail_i (ACE_Message_Block *new_item)
   // Don't try to send a composite message!!!!  Only the first
   // block will be sent.
 
-  this->cur_count_++;
+  ++this->cur_count_;
 
   // Always use this method to actually send a message on the queue.
   if (::msgQSend (msgq (),
@@ -369,9 +371,8 @@ ACE_Message_Queue_Vx::wait_not_empty_cond (ACE_Guard<ACE_Null_Mutex> &mon,
 #if ! defined (ACE_NEEDS_FUNC_DEFINITIONS)
 int
 ACE_Message_Queue_Vx::peek_dequeue_head (ACE_Message_Block *&,
-                                         ACE_Time_Value *tv)
+                                         ACE_Time_Value *)
 {
-  ACE_UNUSED_ARG (tv);
   ACE_NOTSUP_RETURN (-1);
 }
 #endif /* ! ACE_NEEDS_FUNC_DEFINITIONS */
@@ -427,15 +428,11 @@ ACE_Message_Queue_NT::enqueue (ACE_Message_Block *new_item,
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
   if (this->state_ != ACE_Message_Queue_Base::DEACTIVATED)
     {
-      size_t msize = new_item->total_size ();
-      size_t mlength = new_item->total_length ();
+      size_t const msize = new_item->total_size ();
+      size_t const mlength = new_item->total_length ();
       // Note - we send ACTIVATED in the 3rd arg to tell the completion
       // routine it's _NOT_ being woken up because of deactivate().
-#if defined (ACE_WIN64)
       ULONG_PTR state_to_post;
-#else
-      DWORD state_to_post;
-#endif /* ACE_WIN64 */
       state_to_post = ACE_Message_Queue_Base::ACTIVATED;
       if (::PostQueuedCompletionStatus (this->completion_port_,
                                         static_cast<DWORD> (msize),
@@ -445,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 ++this->cur_count_;
+          return ACE_Utils::Truncate (++this->cur_count_);
         }
     }
   else
@@ -474,11 +471,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item,
       ++this->cur_thrs_;        // Increase the waiting thread count.
   }
 
-#if defined (ACE_WIN64)
   ULONG_PTR queue_state;
-#else
-  DWORD queue_state;
-#endif /* ACE_WIN64 */
   DWORD msize;
   // Get a message from the completion port.
   int retv = ::GetQueuedCompletionStatus (this->completion_port_,
@@ -496,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 this->cur_count_;
+            return ACE_Utils::Truncate (this->cur_count_);
           }
         else                    // Woken up by deactivate () or pulse ().
             errno = ESHUTDOWN;
@@ -511,7 +504,7 @@ ACE_Message_Queue_NT::deactivate (void)
   ACE_TRACE ("ACE_Message_Queue_NT::deactivate");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
 
-  int previous_state = this->state_;
+  int const previous_state = this->state_;
   if (previous_state != ACE_Message_Queue_Base::DEACTIVATED)
     {
       this->state_ = ACE_Message_Queue_Base::DEACTIVATED;
@@ -534,7 +527,7 @@ ACE_Message_Queue_NT::activate (void)
 {
   ACE_TRACE ("ACE_Message_Queue_NT::activate");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
-  int previous_status = this->state_;
+  int const previous_status = this->state_;
   this->state_ = ACE_Message_Queue_Base::ACTIVATED;
   return previous_status;
 }
@@ -545,7 +538,7 @@ ACE_Message_Queue_NT::pulse (void)
   ACE_TRACE ("ACE_Message_Queue_NT::pulse");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
 
-  int previous_state = this->state_;
+  int const previous_state = this->state_;
   if (previous_state != ACE_Message_Queue_Base::DEACTIVATED)
     {
       this->state_ = ACE_Message_Queue_Base::PULSED;
@@ -605,3 +598,5 @@ ACE_Message_Queue_NT::dump (void) const
 }
 
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index 0abb4156312..e33563bc4a8 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -22,6 +22,8 @@
 
 #include "ace/IO_Cntl_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class ACE_Notification_Strategy;
 template <ACE_SYNCH_DECL> class ACE_Message_Queue_Iterator;
@@ -30,7 +32,7 @@ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Reverse_Iterator;
 /**
  * @class ACE_Message_Queue_Base
  *
- * @brief Base class for <ACE_Message_Queue>, which is the central
+ * @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
@@ -88,7 +90,7 @@ public:
   // = Enqueue and dequeue methods.
 
   /**
-   * Retrieve the first <ACE_Message_Block> without removing it.  Note
+   * 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
    * returned and <errno> is set to <EWOULDBLOCK>.  If the queue is
@@ -206,17 +208,20 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
+private:
+  // = Disallow copying and assignment.
+  ACE_Message_Queue_Base (const ACE_Message_Queue_Base &);
+  void operator= (const ACE_Message_Queue_Base &);
+
 protected:
   /// Indicates the state of the queue, which can be
   /// <ACTIVATED>, <DEACTIVATED>, or <PULSED>.
   int state_;
 
-private:
-  // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Message_Queue_Base &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue_Base (const ACE_Message_Queue_Base &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Include the templates here.
 #include "ace/Message_Queue_T.h"
 
@@ -225,6 +230,8 @@ private:
 # include "ace/Null_Mutex.h"
 # include "ace/Null_Condition.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Message_Queue_Vx
  *
@@ -235,7 +242,7 @@ private:
  * on the native MsgQ implementation to take care of that.  The
  * only system calls that it uses are VxWorks msgQLib calls, so
  * it is suitable for use in interrupt service routines.
- * NOTE: *Many* ACE_Message_Queue features are not supported with
+ * @note *Many* ACE_Message_Queue features are not supported with
  * this specialization, including:
  * * The two size arguments to the constructor and <open> are
  * interpreted differently.  The first is interpreted as the
@@ -252,7 +259,7 @@ private:
  * * <peek_dequeue_head>.
  * * <ACE_Message_Queue_Iterators>.
  * * The ability to change low and high water marks after creation.
- * * <Message_Block> chains.  The continuation field of <ACE_Message_Block>
+ * * <Message_Block> chains.  The continuation field of ACE_Message_Block
  * *   is ignored; only the first block of a fragment chain is
  * *   recognized.
  */
@@ -388,6 +395,16 @@ protected:
   MSG_Q_ID msgq (void);
 
 private:
+
+  // Disallow copying and assignment.
+  ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &);
+  void operator= (const ACE_Message_Queue_Vx &);
+
+  ACE_UNIMPLEMENTED_FUNC (virtual int peek_dequeue_head
+                            (ACE_Message_Block *&first_item,
+                             ACE_Time_Value *tv = 0))
+
+private:
   /// Maximum number of messages that can be queued.
   int max_messages_;
 
@@ -397,16 +414,14 @@ private:
   /// Native message queue options.
   int options_;
 
-  // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Message_Queue_Vx &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &))
-
-  ACE_UNIMPLEMENTED_FUNC (virtual int peek_dequeue_head
-                            (ACE_Message_Block *&first_item,
-                             ACE_Time_Value *tv = 0))
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* VXWORKS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)
 /**
  * @class ACE_Message_Queue_NT
@@ -415,11 +430,11 @@ private:
  *
  * Implementation of a strip-downed ACE_Message_Queue using NT's
  * IO completion port mechanism.
- * NOTE: *Many* ACE_Message_Queue features are not supported with
+ * @note *Many* ACE_Message_Queue features are not supported with
  * this implementation, including:
  * * <open> method have different signatures.
- * * <dequeue_head> *requires* that the <ACE_Message_Block>
- * pointer argument point to an <ACE_Message_Block> that was
+ * * <dequeue_head> *requires* that the ACE_Message_Block
+ * pointer argument point to an ACE_Message_Block that was
  * allocated by the caller.
  * * <peek_dequeue_head>.
  * * <ACE_Message_Queue_Iterators>.
@@ -565,6 +580,12 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
+
+  // Disallow copying and assignment.
+  ACE_Message_Queue_NT (const ACE_Message_Queue_NT &);
+  void operator= (const ACE_Message_Queue_NT &);
+
+private:
   // = Internal states.
 
   /// Maximum threads that can be released (and run) concurrently.
@@ -592,12 +613,10 @@ private:
   /// Underlying NT IoCompletionPort.
   ACE_HANDLE completion_port_;
 
-  // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Message_Queue_NT &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Message_Queue_NT (const ACE_Message_Queue_NT &))
 };
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Message_Queue.inl"
diff --git a/ace/Message_Queue.inl b/ace/Message_Queue.inl
index 4280f5b1c5b..4ae6c43f3eb 100644
--- a/ace/Message_Queue.inl
+++ b/ace/Message_Queue.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Message_Queue_Base::ACE_Message_Queue_Base (void)
 {
@@ -136,3 +139,5 @@ ACE_Message_Queue_NT::notification_strategy (ACE_Notification_Strategy *)
 }
 
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 9fc5ad5ec92..859e8b64e68 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -14,6 +14,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Notification_Strategy.h"
+#include "ace/Truncate.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue)
 ACE_ALLOC_HOOK_DEFINE(ACE_Dynamic_Message_Queue)
@@ -109,7 +112,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::peek_dequeue_head (ACE_ME
 
   ACE_Message_Block *mb = 0;
 
-  int cur_count = this->queue_.peek_dequeue_head (mb, timeout);
+  int const cur_count = this->queue_.peek_dequeue_head (mb, timeout);
 
   if (cur_count != -1)
     first_item  = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
@@ -131,7 +134,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_head (ACE_MESSAGE
                                      ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::DEFAULT_PRIORITY),
                   -1);
 
-  int result = this->queue_.enqueue_head (mb, timeout);
+  int const result = this->queue_.enqueue_head (mb, timeout);
   if (result == -1)
     // Zap the message.
     mb->release ();
@@ -165,7 +168,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_prio (ACE_MESSAGE
                                      ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::DEFAULT_PRIORITY),
                   -1);
 
-  int result = this->queue_.enqueue_prio (mb, timeout);
+  int const result = this->queue_.enqueue_prio (mb, timeout);
   if (result == -1)
     // Zap the message.
     mb->release ();
@@ -187,7 +190,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_deadline (ACE_MES
                                      ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::DEFAULT_PRIORITY ),
                   -1);
 
-  int result = this->queue_.enqueue_deadline (mb, timeout);
+  int const result = this->queue_.enqueue_deadline (mb, timeout);
   if (result == -1)
     // Zap the message.
     mb->release ();
@@ -212,7 +215,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_tail (ACE_MESSAGE
                                      ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::DEFAULT_PRIORITY),
                   -1);
 
-  int result = this->queue_.enqueue_tail (mb, timeout);
+  int const result = this->queue_.enqueue_tail (mb, timeout);
   if (result == -1)
     // Zap the message.
     mb->release ();
@@ -231,7 +234,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_head (ACE_MESSAGE
 
   ACE_Message_Block *mb = 0;
 
-  int cur_count = this->queue_.dequeue_head (mb, timeout);
+  int const cur_count = this->queue_.dequeue_head (mb, timeout);
 
   // Dequeue the message.
   if (cur_count != -1)
@@ -239,10 +242,9 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_head (ACE_MESSAGE
       first_item = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
-      return cur_count;
     }
-  else
-    return -1;
+
+  return cur_count;
 }
 
 // Remove the item with the lowest priority from the queue.  If timeout == 0
@@ -257,7 +259,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_prio (ACE_MESSAGE
 
   ACE_Message_Block *mb = 0;
 
-  int cur_count = this->queue_.dequeue_prio (mb, timeout);
+  int const cur_count = this->queue_.dequeue_prio (mb, timeout);
 
   // Dequeue the message.
   if (cur_count != -1)
@@ -265,10 +267,9 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_prio (ACE_MESSAGE
       dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
-      return cur_count;
     }
-  else
-    return -1;
+
+  return cur_count;
 }
 
 // Remove an item from the end of the queue.  If timeout == 0 block
@@ -283,7 +284,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_tail (ACE_MESSAGE
 
   ACE_Message_Block *mb = 0;
 
-  int cur_count = this->queue_.dequeue_tail (mb, timeout);
+  int const cur_count = this->queue_.dequeue_tail (mb, timeout);
 
   // Dequeue the message.
   if (cur_count != -1)
@@ -291,10 +292,9 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_tail (ACE_MESSAGE
       dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
-      return cur_count;
     }
-  else
-    return -1;
+
+  return cur_count;
 }
 
 // Remove an item with the lowest deadline time.  If timeout == 0 block
@@ -309,7 +309,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_deadline (ACE_MES
 
   ACE_Message_Block *mb = 0;
 
-  int cur_count = this->queue_.dequeue_deadline (mb, timeout);
+  int const cur_count = this->queue_.dequeue_deadline (mb, timeout);
 
   // Dequeue the message.
   if (cur_count != -1)
@@ -317,10 +317,9 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_deadline (ACE_MES
       dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
-      return cur_count;
     }
-  else
-    return -1;
+
+  return cur_count;
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> int
@@ -845,7 +844,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::flush_i (void)
   // and <release> their memory.
   for (this->tail_ = 0; this->head_ != 0; )
     {
-      number_flushed++;
+      ++number_flushed;
 
       size_t mb_bytes = 0;
       size_t mb_length = 0;
@@ -854,7 +853,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::flush_i (void)
       // Subtract off all of the bytes associated with this message.
       this->cur_bytes_ -= mb_bytes;
       this->cur_length_ -= mb_length;
-      this->cur_count_--;
+      --this->cur_count_;
 
       ACE_Message_Block *temp = this->head_;
       this->head_ = this->head_->next ();
@@ -896,7 +895,7 @@ template <ACE_SYNCH_DECL> int
 ACE_Message_Queue<ACE_SYNCH_USE>::deactivate_i (int pulse)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::deactivate_i");
-  int previous_state = this->state_;
+  int const previous_state = this->state_;
 
   if (previous_state != ACE_Message_Queue_Base::DEACTIVATED)
     {
@@ -916,7 +915,7 @@ template <ACE_SYNCH_DECL> int
 ACE_Message_Queue<ACE_SYNCH_USE>::activate_i (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::activate_i");
-  int previous_state = this->state_;
+  int const previous_state = this->state_;
   this->state_ = ACE_Message_Queue_Base::ACTIVATED;
   return previous_state;
 }
@@ -939,7 +938,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::close (void)
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::close");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
-  int result = this->deactivate_i ();
+  int const result = this->deactivate_i ();
 
   // Free up the remaining messages on the queue.
   this->flush_i ();
@@ -975,35 +974,48 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail_i (ACE_Message_Block *new_item)
   if (new_item == 0)
     return -1;
 
+  // Update the queued size and length, taking into account any chained
+  // blocks (total_size_and_length() counts all continuation blocks).
+  // Keep count of how many blocks we're adding and, if there is a chain of
+  // blocks, find the end in seq_tail and be sure they're properly
+  // back-connected along the way.
+  ACE_Message_Block *seq_tail = new_item;
+  ++this->cur_count_;
+  new_item->total_size_and_length (this->cur_bytes_,
+                                   this->cur_length_);
+  while (seq_tail->next () != 0)
+    {
+      seq_tail->next ()->prev (seq_tail);
+      seq_tail = seq_tail->next ();
+      ++this->cur_count_;
+      seq_tail->total_size_and_length (this->cur_bytes_,
+                                       this->cur_length_);
+    }
+
   // List was empty, so build a new one.
   if (this->tail_ == 0)
     {
       this->head_ = new_item;
-      this->tail_ = new_item;
-      new_item->next (0);
+      this->tail_ = seq_tail;
+      // seq_tail->next (0);   This is a condition of the while() loop above.
       new_item->prev (0);
     }
   // Link at the end.
   else
     {
-      new_item->next (0);
+      // seq_tail->next (0);   This is a condition of the while() loop above.
       this->tail_->next (new_item);
       new_item->prev (this->tail_);
-      this->tail_ = new_item;
+      this->tail_ = seq_tail;
     }
 
-  // Make sure to count all the bytes in a composite message!!!
-  new_item->total_size_and_length (this->cur_bytes_,
-                                   this->cur_length_);
-  this->cur_count_++;
-
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
-// Actually put the node at the head (no locking)
+// Actually put the node(s) at the head (no locking)
 
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head_i (ACE_Message_Block *new_item)
@@ -1013,25 +1025,38 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head_i (ACE_Message_Block *new_item)
   if (new_item == 0)
     return -1;
 
+  // Update the queued size and length, taking into account any chained
+  // blocks (total_size_and_length() counts all continuation blocks).
+  // Keep count of how many blocks we're adding and, if there is a chain of
+  // blocks, find the end in seq_tail and be sure they're properly
+  // back-connected along the way.
+  ACE_Message_Block *seq_tail = new_item;
+  ++this->cur_count_;
+  new_item->total_size_and_length (this->cur_bytes_,
+                                   this->cur_length_);
+  while (seq_tail->next () != 0)
+    {
+      seq_tail->next ()->prev (seq_tail);
+      seq_tail = seq_tail->next ();
+      ++this->cur_count_;
+      seq_tail->total_size_and_length (this->cur_bytes_,
+                                       this->cur_length_);
+    }
+
   new_item->prev (0);
-  new_item->next (this->head_);
+  seq_tail->next (this->head_);
 
   if (this->head_ != 0)
-    this->head_->prev (new_item);
+    this->head_->prev (seq_tail);
   else
-    this->tail_ = new_item;
+    this->tail_ = seq_tail;
 
   this->head_ = new_item;
 
-  // Make sure to count all the bytes in a composite message!!!
-  new_item->total_size_and_length (this->cur_bytes_,
-                                   this->cur_length_);
-  this->cur_count_++;
-
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
 // Actually put the node at its proper position relative to its
@@ -1045,6 +1070,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item)
   if (new_item == 0)
     return -1;
 
+  // Since this method uses enqueue_head_i() and enqueue_tail_i() for
+  // special situations, and this method doesn't support enqueueing
+  // chains of blocks off the 'next' pointer, make sure the new_item's
+  // next pointer is 0.
+  new_item->next (0);
+
   if (this->head_ == 0)
     // Check for simple case of an empty queue, where all we need to
     // do is insert <new_item> into the head.
@@ -1091,12 +1122,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item)
   // Make sure to count all the bytes in a composite message!!!
   new_item->total_size_and_length (this->cur_bytes_,
                                    this->cur_length_);
-  this->cur_count_++;
+  ++this->cur_count_;
 
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
 // Actually put the node at its proper position relative to its
@@ -1111,6 +1142,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline_i (ACE_Message_Block *new_ite
   if (new_item == 0)
     return -1;
 
+  // Since this method uses enqueue_head_i() and enqueue_tail_i() for
+  // special situations, and this method doesn't support enqueueing
+  // chains of blocks off the 'next' pointer, make sure the new_item's
+  // next pointer is 0.
+  new_item->next (0);
+
   if (this->head_ == 0)
     // Check for simple case of an empty queue, where all we need to
     // do is insert <new_item> into the head.
@@ -1152,7 +1189,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline_i (ACE_Message_Block *new_ite
   // Make sure to count all the bytes in a composite message!!!
   new_item->total_size_and_length (this->cur_bytes_,
                                    this->cur_length_);
-  this->cur_count_++;
+  ++this->cur_count_;
 
   if (this->signal_dequeue_waiters () == -1)
     return -1;
@@ -1191,7 +1228,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item
   // Subtract off all of the bytes associated with this message.
   this->cur_bytes_ -= mb_bytes;
   this->cur_length_ -= mb_length;
-  this->cur_count_--;
+  --this->cur_count_;
 
   if (this->cur_count_ == 0 && this->head_ == this->tail_)
     this->head_ = this->tail_ = 0;
@@ -1206,7 +1243,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
 // Get the earliest (i.e., FIFO) ACE_Message_Block with the lowest
@@ -1267,7 +1304,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_prio_i (ACE_Message_Block *&dequeued)
   // Subtract off all of the bytes associated with this message.
   this->cur_bytes_ -= mb_bytes;
   this->cur_length_ -= mb_length;
-  this->cur_count_--;
+  --this->cur_count_;
 
   if (this->cur_count_ == 0 && this->head_ == this->tail_)
     this->head_ = this->tail_ = 0;
@@ -1282,7 +1319,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_prio_i (ACE_Message_Block *&dequeued)
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
 // Actually get the last ACE_Message_Block (no locking, so must be
@@ -1316,7 +1353,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i (ACE_Message_Block *&dequeued)
   // Subtract off all of the bytes associated with this message.
   this->cur_bytes_ -= mb_bytes;
   this->cur_length_ -= mb_length;
-  this->cur_count_--;
+  --this->cur_count_;
 
   if (this->cur_count_ == 0 && this->head_ == this->tail_)
     this->head_ = this->tail_ = 0;
@@ -1331,7 +1368,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i (ACE_Message_Block *&dequeued)
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return this->cur_count_;
+    return ACE_Utils::Truncate (this->cur_count_);
 }
 
 // Actually get the ACE_Message_Block with the lowest deadline time
@@ -1385,7 +1422,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_deadline_i (ACE_Message_Block *&dequeu
   // Subtract off all of the bytes associated with this message.
   this->cur_bytes_ -= mb_bytes;
   this->cur_length_ -= mb_length;
-  this->cur_count_--;
+  --this->cur_count_;
 
   if (this->cur_count_ == 0 && this->head_ == this->tail_)
     this->head_ = this->tail_ = 0;
@@ -1427,7 +1464,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_i
     return -1;
 
   first_item = this->head_;
-  return this->cur_count_;
+  return ACE_Utils::Truncate (this->cur_count_);
 }
 
 template <ACE_SYNCH_DECL> int
@@ -1869,7 +1906,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
        temp1 != 0;
        temp1 = temp1->next ())
     {
-      this->cur_count_--;
+      --this->cur_count_;
 
       size_t mb_bytes = 0;
       size_t mb_length = 0;
@@ -2089,7 +2126,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item
                                    mb_length);
   this->cur_bytes_ += mb_bytes;
   this->cur_length_ += mb_length;
-  this->cur_count_++;
+  ++this->cur_count_;
 
   if (this->signal_dequeue_waiters () == -1)
     return -1;
@@ -2278,7 +2315,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&fi
   // Subtract off all of the bytes associated with this message.
   this->cur_bytes_ -= mb_bytes;
   this->cur_length_ -= mb_length;
-  this->cur_count_--;
+  --this->cur_count_;
 
   // Only signal enqueueing threads if we've fallen below the low
   // water mark.
@@ -2663,4 +2700,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_NT_message_queue (size_t max_th
 
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 #endif /* defined (VXWORKS) */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_MESSAGE_QUEUE_T_CPP */
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index 6bd8186fd84..46ef61c79c7 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (VXWORKS)
 class ACE_Message_Queue_Vx;
 #endif /* defined (VXWORKS) */
@@ -33,14 +35,19 @@ class ACE_Message_Queue_NT;
 /**
  * @class ACE_Message_Queue
  *
- * @brief A threaded message queueing facility, modeled after the
- * queueing facilities in System V STREAMs.
+ * @brief A message queueing facility with parameterized synchronization
+ * capability. ACE_Message_Queue is modeled after the queueing facilities
+ * in System V STREAMs.
+ *
+ * ACE_Message_Queue is the primary queueing facility for
+ * messages in the ACE framework.  It's one template argument parameterizes
+ * the queue's synchronization. The argument specifies a synchronization
+ * strategy. The two main strategies available for ACE_SYNCH_DECL are:
+ *   -# ACE_MT_SYNCH: all operations are thread-safe
+ *   -# ACE_NULL_SYNCH: no synchronization and no locking overhead
  *
- * An <ACE_Message_Queue> is the central queueing facility for
- * messages in the ACE framework.  If <ACE_SYNCH_DECL> is
- * <ACE_MT_SYNCH> then all operations are thread-safe.
- * Otherwise, if it's <ACE_NULL_SYNCH> then there's no locking
- * overhead.
+ * All data passing through ACE_Message_Queue is in the form of
+ * ACE_Message_Block objects. @sa ACE_Message_Block.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Message_Queue : public ACE_Message_Queue_Base
@@ -56,83 +63,91 @@ public:
           REVERSE_ITERATOR;
 
   // = Initialization and termination methods.
+  //@{
   /**
-   * Initialize an <ACE_Message_Queue>.  The <high_water_mark>
-   * determines how many bytes can be stored in a queue before it's
-   * considered "full."  Supplier threads must block until the queue
-   * is no longer full.  The <low_water_mark> determines how many
-   * bytes must be in the queue before supplier threads are allowed to
-   * enqueue additional <ACE_Message_Block>s.  By default, the
-   * <high_water_mark> equals the <low_water_mark>, which means that
-   * suppliers will be able to enqueue new messages as soon as a
-   * consumer removes any message from the queue.  Making the
-   * <low_water_mark> smaller than the <high_water_mark> forces
-   * consumers to drain more messages from the queue before suppliers
-   * can enqueue new messages, which can minimize the "silly window
-   * syndrome."
-   */
-  ACE_Message_Queue (size_t high_water_mark = ACE_Message_Queue_Base::DEFAULT_HWM,
-                     size_t low_water_mark = ACE_Message_Queue_Base::DEFAULT_LWM,
-                     ACE_Notification_Strategy * = 0);
-
-  /**
-   * Initialize an <ACE_Message_Queue>.  The <high_water_mark>
-   * determines how many bytes can be stored in a queue before it's
-   * considered "full."  Supplier threads must block until the queue
-   * is no longer full.  The <low_water_mark> determines how many
-   * bytes must be in the queue before supplier threads are allowed to
-   * enqueue additional <ACE_Message_Block>s.  By default, the
-   * <high_water_mark> equals the <low_water_mark>, which means that
-   * suppliers will be able to enqueue new messages as soon as a
-   * consumer removes any message from the queue.  Making the
-   * <low_water_mark> smaller than the <high_water_mark> forces
-   * consumers to drain more messages from the queue before suppliers
-   * can enqueue new messages, which can minimize the "silly window
-   * syndrome."
+   * Initialize an ACE_Message_Queue.
+   *
+   * @param hwm High water mark. Determines how many bytes can be stored in a
+   *        queue before it's considered full.  Supplier threads must block
+   *        until the queue is no longer full.
+   * @param lwm Low water mark. Determines how many bytes must be in the queue
+   *        before supplier threads are allowed to enqueue additional
+   *        data.  By default, the @a hwm equals @a lwm, which means
+   *        that suppliers will be able to enqueue new messages as soon as
+   *        a consumer removes any message from the queue.  Making the low
+   *        water mark smaller than the high water mark forces consumers to
+   *        drain more messages from the queue before suppliers can enqueue
+   *        new messages, which can minimize the "silly window syndrome."
+   * @param ns Notification strategy. Pointer to an object conforming to the
+   *        ACE_Notification_Strategy interface. If set, the object's
+   *        notify(void) method will be called each time data is added to
+   *        this ACE_Message_Queue. @see ACE_Reactor_Notification_Strategy.
    */
+  ACE_Message_Queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM,
+                     size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM,
+                     ACE_Notification_Strategy *ns = 0);
   virtual int open (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM,
                     size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM,
-                    ACE_Notification_Strategy * = 0);
+                    ACE_Notification_Strategy *ns = 0);
+  //@}
 
-  /// Release all resources from the message queue and mark it as deactivated.
-  /// Returns the number of messages released from the queue.
+  /// Releases all resources from the message queue and marks it deactivated.
+  /// @sa flush().
+  ///
+  /// @retval The number of messages released from the queue; -1 on error.
   virtual int close (void);
 
-  /// Release all resources from the message queue and mark it as deactivated.
+  /// Releases all resources from the message queue and marks it deactivated.
   virtual ~ACE_Message_Queue (void);
 
-  /// Release all resources from the message queue but do not mark it
-  /// as deactivated.
+  /// Releases all resources from the message queue but does not mark it
+  /// deactivated.
+  /// @sa close().
   /**
    * This method holds the queue lock during this operation.
    *
-   * @return The number of messages flushed.
+   * @return The number of messages flushed; -1 on error.
    */
   virtual int flush (void);
 
   /// Release all resources from the message queue but do not mark it
   /// as deactivated.
   /**
-   * The caller must be holding the queue lock before calling this
+   * @pre The caller must be holding the queue lock before calling this
    * method.
    *
    * @return The number of messages flushed.
    */
   virtual int flush_i (void);
 
-  // = Enqueue and dequeue methods.
-
-  // For the following enqueue and dequeue methods if <timeout> == 0,
-  // the caller will block until action is possible, else will wait
-  // until the absolute time specified in *<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).
-
+  /** @name Enqueue and dequeue methods
+   *
+   * The enqueue and dequeue methods accept a timeout value passed as
+   * an ACE_Time_Value *. In all cases, if the timeout pointer is 0,
+   * the caller will block until action is possible. If the timeout pointer
+   * is non-zero, the call will wait (if needed, subject to water mark
+   * settings) until the absolute time specified in the referenced
+   * ACE_Time_Value object is reached. If the time is reached before the
+   * desired action is possible, the method will return -1 with errno set
+   * to @c EWOULDBLOCK. Regardless of the timeout setting, however,
+   * these methods will also fail and return -1 when the queue is closed,
+   * deactivated, pulsed, or when a signal occurs.
+   *
+   * See C++NPv2 Section 6.2 and APG Section 12.3 for a fuller treatment of
+   * ACE_Message_Queue, enqueueing, dequeueing, and how these operations are
+   * affected by queue state transitions.
+   */
+  //@{
   /**
    * Retrieve a pointer to the first ACE_Message_Block in the queue
    * without removing it.
    *
+   * @note Because the block whose pointer is returned is still on the queue,
+   *       another thread may dequeue the referenced block at any time,
+   *       including before the calling thread examines the peeked-at block.
+   *       Be very careful with this method in multithreaded queueing
+   *       situations.
+   *
    * @param first_item  Reference to an ACE_Message_Block * that will
    *                    point to the first block on the queue.  The block
    *                    remains on the queue until this or another thread
@@ -141,9 +156,9 @@ public:
    *                    for a block to be queued.
    *
    * @retval >0 The number of ACE_Message_Blocks on the queue.
-   * @retval -1 On failure.  errno holds the reason. If EWOULDBLOCK,
-   *            the timeout elapsed.  If ESHUTDOWN, the queue was
-   *            deactivated or pulsed.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int peek_dequeue_head (ACE_Message_Block *&first_item,
                                  ACE_Time_Value *timeout = 0);
@@ -162,112 +177,161 @@ public:
    *
    * @retval >0 The number of ACE_Message_Blocks on the queue after adding
    *             the specified block.
-   * @retval -1 On failure.  errno holds the reason. If EWOULDBLOCK,
-   *            the timeout elapsed.  If ESHUTDOWN, the queue was
-   *            deactivated or pulsed.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int enqueue_prio (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
 
   /**
-   * Enqueue an <ACE_Message_Block *> 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
-   * 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 on the queue.
+   * Enqueue an ACE_Message_Block into the queue in accordance with the
+   * block's deadline time. FIFO order is maintained when messages of
+   * the same deadline time are inserted consecutively.
+   *
+   * @param new_item Pointer to an ACE_Message_Block that will be
+   *                 added to the queue.  The block's @c msg_deadline_time()
+   *                 method will be called to obtain the relative queueing
+   *                 position.
+   * @param timeout  The absolute time the caller will wait until
+   *                 for the block to be queued.
+   *
+   * @retval >0 The number of ACE_Message_Blocks on the queue after adding
+   *             the specified block.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int enqueue_deadline (ACE_Message_Block *new_item,
                                 ACE_Time_Value *timeout = 0);
 
   /**
-   * This is an alias for <enqueue_prio>.  It's only here for
+   * @deprecated 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
-   * <{absolute}> time rather than <{relative}> time.
+   * Please use enqueue_prio() instead.
    */
   virtual int enqueue (ACE_Message_Block *new_item,
                        ACE_Time_Value *timeout = 0);
 
   /**
-   * Enqueue an <ACE_Message_Block *> 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
-   * 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
-   * on the queue.
+   * Enqueue one or more ACE_Message_Block objects at the tail of the queue.
+   * If the @a new_item @c next() pointer is non-zero, it is assumed to be the
+   * start of a series of ACE_Message_Block objects connected via their
+   * @c next() pointers. The series of blocks will be added to the queue in
+   * the same order they are passed in as.
+   *
+   * @param new_item Pointer to an ACE_Message_Block that will be
+   *                 added to the queue. If the block's @c next() pointer
+   *                 is non-zero, all blocks chained from the @c next()
+   *                 pointer are enqueued as well.
+   * @param timeout  The absolute time the caller will wait until
+   *                 for the block to be queued.
+   *
+   * @retval >0 The number of ACE_Message_Blocks on the queue after adding
+   *             the specified block(s).
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int enqueue_tail (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
 
   /**
-   * Enqueue an <ACE_Message_Block *> 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
-   * 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
-   * on the queue.
+   * Enqueue one or more ACE_Message_Block objects at the head of the queue.
+   * If the @a new_item @c next() pointer is non-zero, it is assumed to be the
+   * start of a series of ACE_Message_Block objects connected via their
+   * @c next() pointers. The series of blocks will be added to the queue in
+   * the same order they are passed in as.
+   *
+   * @param new_item Pointer to an ACE_Message_Block that will be
+   *                 added to the queue. If the block's @c next() pointer
+   *                 is non-zero, all blocks chained from the @c next()
+   *                 pointer are enqueued as well.
+   * @param timeout  The absolute time the caller will wait until
+   *                 for the block to be queued.
+   *
+   * @retval >0 The number of ACE_Message_Blocks on the queue after adding
+   *             the specified block(s).
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int enqueue_head (ACE_Message_Block *new_item,
                             ACE_Time_Value *timeout = 0);
 
-  /// This method is an alias for the following <dequeue_head> method.
+  /// This method is an alias for the dequeue_head() method.
   virtual int dequeue (ACE_Message_Block *&first_item,
                        ACE_Time_Value *timeout = 0);
 
   /**
-   * Dequeue and return the <ACE_Message_Block *> 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 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 on the queue.
+   * Dequeue the ACE_Message_Block at the head of the queue and return
+   * a pointer to the dequeued block.
+   *
+   * @param first_item  Reference to an ACE_Message_Block * that will
+   *                    be set to the address of the dequeued block.
+   * @param timeout     The absolute time the caller will wait until
+   *                    for a block to be dequeued.
+   *
+   * @retval >=0 The number of ACE_Message_Blocks remaining in the queue.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int dequeue_head (ACE_Message_Block *&first_item,
                             ACE_Time_Value *timeout = 0);
 
   /**
-   * Dequeue and return earliest the <ACE_Message_Block *> that has
-   * the lowest priority (i.e., preserves FIFO order for messages with
-   * the same priority).  Note that <timeout> uses <{absolute}> time
-   * rather than <{relative}> time.  If the <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 on the queue.
+   * Dequeue the ACE_Message_Block that has the lowest priority (preserves
+   * FIFO order for messages with the same priority) and return a pointer
+   * to the dequeued block.
+   *
+   * @param first_item  Reference to an ACE_Message_Block * that will
+   *                    be set to the address of the dequeued block.
+   * @param timeout     The absolute time the caller will wait until
+   *                    for a block to be dequeued.
+   *
+   * @retval >=0 The number of ACE_Message_Blocks remaining in the queue.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int dequeue_prio (ACE_Message_Block *&first_item,
                             ACE_Time_Value *timeout = 0);
 
   /**
-   * Dequeue and return the <ACE_Message_Block *> at the tail of the
-   * queue.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <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 on the queue.
+   * Dequeue the ACE_Message_Block at the tail of the queue and return
+   * a pointer to the dequeued block.
+   *
+   * @param dequeued  Reference to an ACE_Message_Block * that will
+   *                  be set to the address of the dequeued block.
+   * @param timeout   The absolute time the caller will wait until
+   *                  for a block to be dequeued.
+   *
+   * @retval >=0 The number of ACE_Message_Blocks remaining in the queue.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int dequeue_tail (ACE_Message_Block *&dequeued,
                             ACE_Time_Value *timeout = 0);
 
   /**
-   * Dequeue and return the <ACE_Message_Block *> with the lowest
-   * deadline time.  Note that <timeout> uses <{absolute}> time rather than
-   * <{relative}> time.  If the <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 on the queue.
+   * Dequeue the ACE_Message_Block with the earliest deadline time and return
+   * a pointer to the dequeued block.
+   *
+   * @param dequeued  Reference to an ACE_Message_Block * that will
+   *                  be set to the address of the dequeued block.
+   * @param timeout   The absolute time the caller will wait until
+   *                  for a block to be dequeued.
+   *
+   * @retval >=0 The number of ACE_Message_Blocks remaining in the queue.
+   * @retval -1 On failure.  errno holds the reason. Common errno values are:
+   *            - EWOULDBLOCK: the timeout elapsed
+   *            - ESHUTDOWN: the queue was deactivated or pulsed
    */
   virtual int dequeue_deadline (ACE_Message_Block *&dequeued,
                                 ACE_Time_Value *timeout = 0);
+  //@}
 
   // = Check if queue is full/empty.
   /// True if queue is full, else false.
@@ -275,7 +339,10 @@ public:
   /// True if queue is empty, else false.
   virtual int is_empty (void);
 
-  // = Queue statistic methods.
+  /** @name Queue statistics methods
+   */
+  //@{
+
   /**
    * Number of total bytes on the queue, i.e., sum of the message
    * block sizes.
@@ -306,7 +373,12 @@ public:
    */
   virtual void message_length (size_t new_length);
 
-  // = Flow control methods.
+  //@}
+
+
+  /** @name Water mark (flow control) methods
+   */
+  //@{
 
   /**
    * Get high watermark.
@@ -325,11 +397,17 @@ public:
   /**
    * Set the low watermark, which determines how many bytes must be in
    * the queue before supplier threads are allowed to enqueue
-   * additional <ACE_Message_Block>s.
+   * additional ACE_Message_Blocks.
    */
   virtual void low_water_mark (size_t lwm);
+  //@}
 
-  // = Activation control methods.
+  /** @name Activation and queue state methods
+   * See C++NPv2 Section 6.2 and APG Section 12.3 for a fuller treatment of
+   * queue states and transitions and how the transitions affect message
+   * enqueueing and dequeueing operations.
+   */
+  //@{
 
   /**
    * Deactivate the queue and wakeup all threads waiting on the queue
@@ -363,8 +441,11 @@ public:
   /// Returns true if the state of the queue is <DEACTIVATED>,
   /// but false if the queue's is <ACTIVATED> or <PULSED>.
   virtual int deactivated (void);
+  //@}
 
-  // = Notification hook.
+  /** @name Notification strategy methods
+   */
+  //@{
 
   /**
    * This hook is automatically invoked by <enqueue_head>,
@@ -383,8 +464,9 @@ public:
 
   /// Set the notification strategy for the <Message_Queue>
   virtual void notification_strategy (ACE_Notification_Strategy *s);
+  //@}
 
-  /// Returns a reference to the lock used by the <ACE_Message_Queue>.
+  /// Returns a reference to the lock used by the ACE_Message_Queue.
   virtual ACE_SYNCH_MUTEX_T &lock (void);
 
   /// Dump the state of an object.
@@ -398,7 +480,7 @@ protected:
 
   // These routines assume that locks are held by the corresponding
   // public methods.  Since they are virtual, you can change the
-  // queueing mechanism by subclassing from <ACE_Message_Queue>.
+  // queueing mechanism by subclassing from ACE_Message_Queue.
 
   /// Enqueue an <ACE_Message_Block *> in accordance with its priority.
   virtual int enqueue_i (ACE_Message_Block *new_item);
@@ -494,7 +576,7 @@ protected:
   size_t cur_length_;
 
   /// Current number of messages in the queue.
-  int cur_count_;
+  size_t cur_count_;
 
   /// The notification strategy used when a new message is enqueued.
   ACE_Notification_Strategy *notification_strategy_;
@@ -523,7 +605,7 @@ typedef ACE_Message_Queue<ACE_SYNCH> ACE_DEFAULT_MESSAGE_QUEUE_TYPE;
 /**
  * @class ACE_Message_Queue_Iterator
  *
- * @brief Iterator for the <ACE_Message_Queue>.
+ * @brief Iterator for the ACE_Message_Queue.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Message_Queue_Iterator
@@ -561,7 +643,7 @@ private:
 /**
  * @class ACE_Message_Queue_Reverse_Iterator
  *
- * @brief Reverse Iterator for the <ACE_Message_Queue>.
+ * @brief Reverse Iterator for the ACE_Message_Queue.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Message_Queue_Reverse_Iterator
@@ -599,7 +681,7 @@ private:
 /**
  * @class ACE_Dynamic_Message_Queue
  *
- * @brief A derived class which adapts the <ACE_Message_Queue>
+ * @brief A derived class which adapts the ACE_Message_Queue
  * class in order to maintain dynamic priorities for enqueued
  * <ACE_Message_Blocks> and manage the queue order according
  * to these dynamic priorities.
@@ -867,7 +949,7 @@ public:
  *        queueing facilities in System V STREAMs.
  *
  * An <ACE_Message_Queue_Ex> is a strongly-typed version of the
- * <ACE_Message_Queue>.  If
+ * ACE_Message_Queue.  If
  * <ACE_SYNCH_DECL> is <ACE_MT_SYNCH> then all operations are
  * thread-safe. Otherwise, if it's <ACE_NULL_SYNCH> then there's no
  * locking overhead.
@@ -899,12 +981,12 @@ public:
   // = Initialization and termination methods.
 
   /**
-   * Initialize an <ACE_Message_Queue>.  The <high_water_mark>
+   * Initialize an ACE_Message_Queue.  The <high_water_mark>
    * determines how many bytes can be stored in a queue before it's
    * considered "full."  Supplier threads must block until the queue
    * is no longer full.  The <low_water_mark> determines how many
    * bytes must be in the queue before supplier threads are allowed to
-   * enqueue additional <ACE_Message_Block>s.  By default, the
+   * enqueue additional ACE_Message_Blocks.  By default, the
    * <high_water_mark> equals the <low_water_mark>, which means that
    * suppliers will be able to enqueue new messages as soon as a
    * consumer removes any message from the queue.  Making the
@@ -918,12 +1000,12 @@ public:
                         ACE_Notification_Strategy * = 0);
 
   /**
-   * Initialize an <ACE_Message_Queue>.  The <high_water_mark>
+   * Initialize an ACE_Message_Queue.  The <high_water_mark>
    * determines how many bytes can be stored in a queue before it's
    * considered "full."  Supplier threads must block until the queue
    * is no longer full.  The <low_water_mark> determines how many
    * bytes must be in the queue before supplier threads are allowed to
-   * enqueue additional <ACE_Message_Block>s.  By default, the
+   * enqueue additional ACE_Message_Blocks.  By default, the
    * <high_water_mark> equals the <low_water_mark>, which means that
    * suppliers will be able to enqueue new messages as soon as a
    * consumer removes any message from the queue.  Making the
@@ -947,9 +1029,10 @@ public:
   /// messages flushed.
   virtual int flush (void);
 
-  /// Release all resources from the message queue but do not mark it as deactivated.
-  /// This method does not hold the queue lock during this operation, i.e., it assume
-  /// the lock is held externally.    Returns the number of messages flushed.
+  /// Release all resources from the message queue but do not mark it as
+  /// deactivated. This method does not hold the queue lock during this
+  /// operation, i.e., it assume the lock is held externally.
+  /// Returns the number of messages flushed.
   virtual int flush_i (void);
 
   // = Enqueue and dequeue methods.
@@ -1210,10 +1293,12 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-  /// Implement this via an <ACE_Message_Queue>.
+  /// Implement this via an ACE_Message_Queue.
   ACE_Message_Queue<ACE_SYNCH_USE> queue_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Message_Queue_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Method_Object.h b/ace/Method_Object.h
index eee59175ea5..ffabf82d454 100644
--- a/ace/Method_Object.h
+++ b/ace/Method_Object.h
@@ -26,9 +26,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Maintain backwards compatibility so that Steve Huston doesn't go
 // postal... ;-)
 typedef ACE_Method_Request ACE_Method_Object;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_METHOD_OBJECT_H */
diff --git a/ace/Method_Request.cpp b/ace/Method_Request.cpp
index 3215e1042d2..283a087905f 100644
--- a/ace/Method_Request.cpp
+++ b/ace/Method_Request.cpp
@@ -4,6 +4,8 @@ ACE_RCSID (ace,
            Method_Request,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Method_Request::ACE_Method_Request (unsigned long prio)
   : priority_ (prio)
 {
@@ -24,3 +26,5 @@ ACE_Method_Request::priority (unsigned long prio)
 {
   this->priority_ = prio;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index ca048863079..e6b4564f91b 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -17,12 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +25,8 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Method_Request
  *
@@ -45,7 +42,7 @@
  *
  * @sa ACE_Activation_Queue
  */
-class ACE_Threads_Export ACE_Method_Request
+class ACE_Export ACE_Method_Request
 {
 public:
   // = Initialization and termination methods.
@@ -84,15 +81,20 @@ public:
    */
   virtual int call (void) = 0;
 
+private:
+
+  /// Disallow copying and assignment.
+  ACE_Method_Request (const ACE_Method_Request &);
+  void operator= (const ACE_Method_Request &);
+
 protected:
   /// The priority of the request.
   unsigned long priority_;
 
-private:
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Method_Request &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Method_Request (const ACE_Method_Request &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 
 #include /**/ "ace/post.h"
 #endif /* ACE_METHOD_REQUEST_H */
diff --git a/ace/Metrics_Cache.cpp b/ace/Metrics_Cache.cpp
deleted file mode 100644
index f9a28c800f6..00000000000
--- a/ace/Metrics_Cache.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * $Id$
- */
-
-//#define ACE_BUILD_DLL
-
-#include "ace/Metrics_Cache.h"
-
-ACE_RCSID(ace, Metrics_Cache, "Metrics_Cache.cpp,v 4.18 1998/07/11 08:53:56 gonzo Exp")
-
-#if defined (ACE_COMPILE_TIMEPROBES)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_COMPILE_TIMEPROBES */
-
diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp
index de520773da7..a3850eb2237 100644
--- a/ace/Metrics_Cache_T.cpp
+++ b/ace/Metrics_Cache_T.cpp
@@ -1,14 +1,19 @@
 // $Id$
 
-#ifndef METRICS_CACHE_CPP
-#define METRICS_CACHE_CPP
+#ifndef ACE_METRICS_CACHE_CPP
+#define ACE_METRICS_CACHE_CPP
 
 //#define ACE_BUILD_DLL
 
+#include "ace/Metrics_Cache_T.h"
+
 #if defined (ACE_COMPILE_TIMEPROBES)
 
 #include "ace/Metrics_Cache.h"
-#include "ace/Metrics_Cache_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Metrics_Cache_T.inl"
+#endif /* __ACE_INLINE__ */
 
 // Const strings for timeprobe event type descriptions.
 
@@ -20,6 +25,7 @@ static const char * event_description_strings [] =
   "resume"
 };
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////////
 // class ACE_Metrics_Timeprobe //
@@ -39,7 +45,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::ACE_Metrics_Timeprobe (u_int id,
       name = "";
     }
 
-  char * name_tmp;
+  char * name_tmp = 0;
   ACE_NEW_MALLOC_ARRAY (name_tmp,
                         (char *) this->allocator ()->malloc (strlen(name)+1),
                         char,
@@ -58,8 +64,8 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc,
                        const char *name,
                        u_long size)
   :
-	ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size),
-		id_ (id),
+        ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size),
+                id_ (id),
     name_ (0)
 {
   if (name == 0)
@@ -67,9 +73,8 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc,
       name = "";
     }
 
-  char * name_tmp;
+  char * name_tmp = 0;
   ACE_NEW_MALLOC_ARRAY (name_tmp,
-//                        (char *) this->allocator ()->malloc (strlen(name)+1),
                         (char *) alloc->malloc(strlen(name)+1),
                         char,
                         strlen(name)+1);
@@ -95,11 +100,11 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::~ACE_Metrics_Timeprobe ()
 template <class ACE_LOCK, class ALLOCATOR>
 int
 ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::is_event (const ACE_Metrics_Timeprobe<ACE_LOCK,
-													                              ALLOCATOR>::
-													    ACE_METRICS_TIMEPROBE_DATA_TYPE &t,
+                                                      ALLOCATOR>::
+                                                      ACE_METRICS_TIMEPROBE_DATA_TYPE &t,
                                                       ACE_Metrics_Timeprobe<ACE_LOCK,
-													                        ALLOCATOR>::
-													    event_id id)
+                                                      ALLOCATOR>::
+                                                      event_id id)
 {
   return (t.event_.event_number_ ==  (u_long) id) ? 1 : 0;
 }
@@ -115,7 +120,7 @@ template <class ACE_LOCK, class ALLOCATOR>
 void
 ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (char * name)
 {
-  char * name_tmp;
+  char * name_tmp = 0;
   ACE_NEW_MALLOC_ARRAY (name_tmp,
                         (char *) this->allocator ()->malloc (strlen(name)+1),
                         char,
@@ -226,16 +231,8 @@ flush_ACE_Metrics_Cache ()
 {
 }
 
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Metrics_Cache_T.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* defined (ACE_COMPILE_TIMEPROBES) */
 
-#endif /* METRICS_CACHE_CPP */
-
-
-
-
-
+#endif /* ACE_METRICS_CACHE_CPP */
diff --git a/ace/Metrics_Cache_T.h b/ace/Metrics_Cache_T.h
index d101ae734b8..8d6c44acd13 100644
--- a/ace/Metrics_Cache_T.h
+++ b/ace/Metrics_Cache_T.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 //=============================================================================
 /**
  * @file Metrics_Cache_T.h
@@ -9,8 +11,8 @@
 //=============================================================================
 
 
-#ifndef METRICS_CACHE_T_H
-#define METRICS_CACHE_T_H
+#ifndef ACE_METRICS_CACHE_T_H
+#define ACE_METRICS_CACHE_T_H
 
 #include "ace/config-all.h"
 
@@ -30,6 +32,8 @@
 #define METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE METRICS_MIN_TIMEPROBE_TABLE_SIZE
 #define METRICS_DEFAULT_TIMEPROBE_COUNT 6
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Metrics_Timeprobe
  *
@@ -220,6 +224,8 @@ private:
   void operator = (const ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR> &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Metrics_Cache_T.inl"
 #endif /* __ACE_INLINE__ */
@@ -234,4 +240,4 @@ private:
 
 #endif /* defined (ACE_COMPILE_TIMEPROBES) */
 
-#endif /* METRICS_CACHE_T_H */
+#endif /* ACE_METRICS_CACHE_T_H */
diff --git a/ace/Metrics_Cache_T.inl b/ace/Metrics_Cache_T.inl
index 6d48c917059..e0f542ab366 100644
--- a/ace/Metrics_Cache_T.inl
+++ b/ace/Metrics_Cache_T.inl
@@ -1,7 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
-\
-#ifndef METRICS_CACHE_T_I
-#define METRICS_CACHE_T_I
+
+#ifndef ACE_METRICS_CACHE_T_INL
+#define ACE_METRICS_CACHE_T_INL
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////
 // Class ACE_Metrics_Cache //
@@ -14,8 +18,8 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_start (u_long i)
 {
   if (i < this->probe_set_size_)
     {
-      u_long & count = 
-	this->enqueue_count_ [this->supplier_index_] [i];
+      u_long & count =
+        this->enqueue_count_ [this->supplier_index_] [i];
       ++count;
 
       if (! this->interval_initialized_)
@@ -23,15 +27,15 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_start (u_long i)
           this->interval_initialized_ = 1;
           ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
           ACE_High_Res_Timer::hrtime_to_tv (this->interval_start_,
-		                                    hrtime_now);
+                                                    hrtime_now);
           this->interval_end_.set (this->interval_start_.sec(),
                                    this->interval_start_.usec());
         }
-      
+
       // Take the metrics timeprobe last, to avoid measuring the above
       // metrics processing.
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
-	this->enqueue_probes_ [this->supplier_index_][i];
+        this->enqueue_probes_ [this->supplier_index_][i];
       probe->
         timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_START);
     }
@@ -47,13 +51,13 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_stop (u_long i)
       // Take the metrics timeprobe first, to avoid measuring the below
       // metrics processing.
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
-	this->enqueue_probes_ [this->supplier_index_][i];
+        this->enqueue_probes_ [this->supplier_index_][i];
       probe->
         timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_STOP);
 
       ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
       ACE_High_Res_Timer::hrtime_to_tv (this->interval_end_,
-	                                    hrtime_now);
+                                            hrtime_now);
 
       u_long & count = enqueue_count_ [this->supplier_index_][i];
       ++count;
@@ -71,8 +75,8 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_suspend (u_long i)
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
         this->enqueue_probes_ [this->supplier_index_][i];
       probe->
-	timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_SUSPEND);
-      u_long & count = 
+        timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_SUSPEND);
+      u_long & count =
         this->enqueue_count_ [this->supplier_index_] [i];
       ++count;
     }
@@ -85,11 +89,11 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_resume (u_long i)
 {
   if (i < this->probe_set_size_)
     {
-      u_long & count = 
-	this->enqueue_count_ [this->supplier_index_] [i];
+      u_long & count =
+        this->enqueue_count_ [this->supplier_index_] [i];
       ++count;
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
-	this->enqueue_probes_ [this->supplier_index_][i];
+        this->enqueue_probes_ [this->supplier_index_][i];
       probe->
         timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_RESUME);
     }
@@ -103,7 +107,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_start (u_long i)
   if (i < this->probe_set_size_)
     {
       u_long & count =
-	this->dequeue_count_ [this->supplier_index_] [i];
+        this->dequeue_count_ [this->supplier_index_] [i];
       ++count;
 
       if (! this->interval_initialized_)
@@ -111,7 +115,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_start (u_long i)
           this->interval_initialized_ = 1;
           ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
           ACE_High_Res_Timer::hrtime_to_tv (this->interval_start_,
-		                                    hrtime_now);
+                                                    hrtime_now);
           this->interval_end_.set (this->interval_start_.sec(),
                                    this->interval_start_.usec());
         }
@@ -136,12 +140,12 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_stop (u_long i)
       // metrics processing below.
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
         this->dequeue_probes_ [this->supplier_index_][i];
-      
+
       probe->timeprobe (ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::WORK_STOP);
 
       ACE_hrtime_t hrtime_now = ACE_OS::gethrtime ();
       ACE_High_Res_Timer::hrtime_to_tv (this->interval_end_,
-		                                    hrtime_now);
+                                                    hrtime_now);
 
       u_long & count = dequeue_count_ [this->supplier_index_] [i];
       ++count;
@@ -156,7 +160,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_suspend (u_long i)
   if (i < this->probe_set_size_)
     {
       u_long & count =
-	this->dequeue_count_ [this->supplier_index_] [i];
+        this->dequeue_count_ [this->supplier_index_] [i];
       ++count;
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
         this->dequeue_probes_ [this->supplier_index_][i];
@@ -172,8 +176,8 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_resume (u_long i)
 {
   if (i < this->probe_set_size_)
     {
-      u_long & count = 
-	this->dequeue_count_ [this->supplier_index_] [i];
+      u_long & count =
+        this->dequeue_count_ [this->supplier_index_] [i];
       ++count;
       ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> * probe =
         this->dequeue_probes_ [this->supplier_index_][i];
@@ -184,7 +188,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_resume (u_long i)
 
 
 template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::reset_base_statistics ()
 {
   this->interval_initialized_ = 0;
@@ -200,7 +204,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::reset_base_statistics ()
         this->enqueue_probes_ [this->consumer_index_][i];
       probe->reset ();
       probe =
-	this->dequeue_probes_ [this->consumer_index_][i];
+        this->dequeue_probes_ [this->consumer_index_][i];
       probe->reset ();
     }
 }
@@ -218,17 +222,19 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::flip_supplier_and_consumer ()
 }
 
 template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::metrics_enabled(int enabled)
 {
    metrics_enabled_ = enabled;
 }
 
 template <class ACE_LOCK, class ALLOCATOR>
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::metrics_enabled(void) const
 {
    return metrics_enabled_;
 }
 
-#endif /* METRICS_CACHE_T_I */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_METRICS_CACHE_T_INL */
diff --git a/ace/Min_Max.h b/ace/Min_Max.h
index e961b510ee8..7bff181088e 100644
--- a/ace/Min_Max.h
+++ b/ace/Min_Max.h
@@ -24,6 +24,9 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 # if !defined (ACE_LACKS_MIN_MAX_TEMPLATES)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T>
 inline const T &
 ace_min (const T &t1, const T &t2)
@@ -58,6 +61,9 @@ ace_range (const T &min, const T &max, const T &val)
 {
   return ace_min (ace_max (min, val), max);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # else
 // These macros should only be used if a C++ compiler can't grok the
 // inline templates
diff --git a/ace/Module.cpp b/ace/Module.cpp
index ef101352e0b..20e5638e367 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -1,8 +1,7 @@
-// Module.cpp
 // $Id$
 
-#ifndef ACE_MODULE_C
-#define ACE_MODULE_C
+#ifndef ACE_MODULE_CPP
+#define ACE_MODULE_CPP
 
 #include "ace/Module.h"
 
@@ -16,7 +15,7 @@
 #include "ace/Module.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Module, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Module)
 
@@ -268,4 +267,7 @@ ACE_Module<ACE_SYNCH_USE>::close_i (int which,
 
   return result;
 }
-#endif /* ACE_MODULE_C */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_MODULE_CPP */
diff --git a/ace/Module.h b/ace/Module.h
index a3e6f4126b8..c7a99de92f1 100644
--- a/ace/Module.h
+++ b/ace/Module.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //==========================================================================
 /**
  *  @file    Module.h
@@ -23,6 +24,8 @@
 #include "ace/Task_T.h"
 #include "ace/os_include/os_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Module_Base
  *
@@ -72,14 +75,12 @@ template <ACE_SYNCH_DECL>
 class ACE_Module : public ACE_Module_Base
 {
 public:
-  friend class ACE_Shutup_GPlusPlus;  // Turn off g++ warning
-
   // = Initialization and termination methods.
   /// Create an empty Module.
   ACE_Module (void);
 
   /// Shutdown the Module.
-  ~ACE_Module (void);
+  virtual ~ACE_Module (void);
 
   /// Create an initialized module with @a module_name as its identity
   /// and @a reader and @a writer as its tasks.
@@ -116,7 +117,7 @@ public:
   ACE_Task<ACE_SYNCH_USE> *writer (void);
 
   /**
-   * Set the writer task. <flags> can be used to indicate that the
+   * Set the writer task. @a flags can be used to indicate that the
    * module should delete the writer during a call to close or to the
    * destructor. If a previous writer exists, it is closed.  It may
    * also be deleted, depending on the old flags_ value.  Should not
@@ -128,7 +129,7 @@ public:
   ACE_Task<ACE_SYNCH_USE> *reader (void);
 
   /**
-   * Set the reader task. <flags> can be used to indicate that the
+   * Set the reader task. @a flags can be used to indicate that the
    * module should delete the reader during a call to close or to the
    * destructor. If a previous reader exists, it is closed.  It may
    * also be deleted, depending on the old flags_ value.  Should not
@@ -192,6 +193,8 @@ private:
   int flags_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Module.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Module.inl b/ace/Module.inl
index ba93e8e5df7..483d436aa69 100644
--- a/ace/Module.inl
+++ b/ace/Module.inl
@@ -1,9 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
-// Module.i
 
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_SYNCH_DECL> ACE_INLINE void *
 ACE_Module<ACE_SYNCH_USE>::arg (void) const
 {
@@ -34,7 +36,7 @@ ACE_Module<ACE_SYNCH_USE>::name (const ACE_TCHAR *n)
 
 template <ACE_SYNCH_DECL> ACE_INLINE ACE_Task<ACE_SYNCH_USE> *
 ACE_Module<ACE_SYNCH_USE>::writer (void)
-{ 
+{
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::writer");
   return this->q_pair_[1];
 }
@@ -54,10 +56,10 @@ ACE_Module<ACE_SYNCH_USE>::next (void)
 }
 
 template <ACE_SYNCH_DECL> ACE_INLINE void
-ACE_Module<ACE_SYNCH_USE>::next (ACE_Module<ACE_SYNCH_USE> *m) 
+ACE_Module<ACE_SYNCH_USE>::next (ACE_Module<ACE_SYNCH_USE> *m)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::next");
   this->next_ = m;
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Msg_WFMO_Reactor.cpp b/ace/Msg_WFMO_Reactor.cpp
index dfe86740efc..aaedb391b51 100644
--- a/ace/Msg_WFMO_Reactor.cpp
+++ b/ace/Msg_WFMO_Reactor.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(ace, Msg_WFMO_Reactor, "$Id$")
 #include "ace/Msg_WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (ACE_Sig_Handler *sh,
                                             ACE_Timer_Queue *tq)
   : ACE_WFMO_Reactor (sh, tq)
@@ -71,7 +73,7 @@ ACE_Msg_WFMO_Reactor::dispatch_window_messages (void)
         }
 
       ::DispatchMessage (&msg);
-      number_of_messages++;
+      ++number_of_messages;
     }
 
   return number_of_messages;
@@ -87,4 +89,6 @@ ACE_Msg_WFMO_Reactor::poll_remaining_handles (DWORD slot)
                                       QS_ALLINPUT);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index af6c2bad214..d86258bb690 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,12 +16,7 @@
 #define ACE_MSG_WFMO_REACTOR_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_REACTOR_BUILD_DLL
-# include "ace/ACE_Reactor_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Reactor_Export ACE_Export
-#endif  /* ACE_REACTOR_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,6 +26,8 @@
 
 #include "ace/WFMO_Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Msg_WFMO_Reactor
  *
@@ -42,7 +39,7 @@
  * its ability to react on Windows messages.  It is needed when
  * the task should serve also as a COM/DCOM server.
  */
-class ACE_Reactor_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor
+class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor
 {
 public:
   // = Initialization and termination methods.
@@ -79,7 +76,7 @@ public:
    *
    * <MsgWaitForMultipleObjects> is used as the demultiplexing call
    *
-   * Returns the total number of <ACE_Event_Handler>s that were
+   * Returns the total number of ACE_Event_Handlers that were
    * dispatched, 0 if the <max_wait_time> elapsed without dispatching
    * any handlers, or -1 if an error occurs.
    *
@@ -111,11 +108,13 @@ protected:
   virtual int dispatch_window_messages (void);
 };
 
-#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Msg_WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_MSG_WFMO_REACTOR_H */
diff --git a/ace/Msg_WFMO_Reactor.inl b/ace/Msg_WFMO_Reactor.inl
index c8d7f25c8d7..be021dc58a5 100644
--- a/ace/Msg_WFMO_Reactor.inl
+++ b/ace/Msg_WFMO_Reactor.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Msg_WFMO_Reactor::handle_events (ACE_Time_Value &how_long)
 {
@@ -27,4 +30,6 @@ ACE_Msg_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long)
   return this->event_handling (how_long, MWMO_ALERTABLE);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp
index 15d985c3265..a24f98957e3 100644
--- a/ace/Multihomed_INET_Addr.cpp
+++ b/ace/Multihomed_INET_Addr.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            Multihomed_INET_Addr,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Multihomed_INET_Addr)
 
 // Default constructor
@@ -115,9 +117,9 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
 
     size_t next_empty_slot = 0;
     for (size_t i = 0; i < size; ++i) {
-      int ret = this->secondaries_[next_empty_slot].set(port_number,
-                                                       secondary_ip_addrs[i],
-                                                       encode);
+      int const ret = this->secondaries_[next_empty_slot].set(port_number,
+                                                              secondary_ip_addrs[i],
+                                                              encode);
 
       if (ret) {
         ACE_DEBUG ((LM_DEBUG,
@@ -146,10 +148,10 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
 
   for (size_t i = 0; i < size; ++i) {
 
-    int ret = this->secondaries_[i].set(port_number,
-                                       secondary_host_names[i],
-                                       encode,
-                                       address_family);
+    int const ret = this->secondaries_[i].set(port_number,
+                                              secondary_host_names[i],
+                                              encode,
+                                              address_family);
     if (ret) {
       return ret;
     }
@@ -291,12 +293,4 @@ ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr (void)
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<ACE_INET_Addr>;
-template class ACE_Array<ACE_INET_Addr>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<ACE_INET_Addr>
-#pragma instantiate ACE_Array<ACE_INET_Addr>
-
-#endif /*ACE_HAS_TEMPLATE_INSTANTIATION*/
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h
index 6ff13a74c00..75799cf0077 100644
--- a/ace/Multihomed_INET_Addr.h
+++ b/ace/Multihomed_INET_Addr.h
@@ -15,12 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,6 +24,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/Containers_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Multihomed_INET_Addr
@@ -36,7 +32,7 @@
  * @brief Extends ACE_INET_Addr with support for multi-homed
  * addresses.
  */
-class ACE_Sockets_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr
+class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr
 {
 public:
   // = Initialization methods.
@@ -188,6 +184,8 @@ private:
   ACE_Array<ACE_INET_Addr> secondaries_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #  include "ace/Multihomed_INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Multihomed_INET_Addr.inl b/ace/Multihomed_INET_Addr.inl
index 71ec578a177..50f67c01191 100644
--- a/ace/Multihomed_INET_Addr.inl
+++ b/ace/Multihomed_INET_Addr.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Accessor implementations
 ACE_INLINE
 size_t
@@ -8,3 +11,5 @@ ACE_Multihomed_INET_Addr::get_num_secondary_addresses() const
 {
   return this->secondaries_.size();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h
index 12336afaac9..6afb5a653c5 100644
--- a/ace/Multiplexor.h
+++ b/ace/Multiplexor.h
@@ -10,7 +10,6 @@
  *   Note that these classes have never been implemented due to lack
  *   of need.
  *
- *
  *  @author Doug Schmidt
  */
 //=============================================================================
@@ -20,17 +19,21 @@
 #define ACE_MULTIPLEXOR_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Module.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Map_Manager.h"
-
 #if defined (ACE_HAS_THREADS)
 
 #if 0
+
+#include "ace/Module.h"
+#include "ace/Map_Manager.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Driver
  *
@@ -70,6 +73,8 @@ public:
   virtual int unlink_from_below (ACE_Module *mod);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Multiplexor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Multiplexor.inl b/ace/Multiplexor.inl
index 18e022ac911..76e9d267006 100644
--- a/ace/Multiplexor.inl
+++ b/ace/Multiplexor.inl
@@ -1,9 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Multiplexor.i
 #if 0
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 Driver::link_from_below (ACE_Module *stream_head)
 {
@@ -88,4 +90,6 @@ ACE_Multiplexor::unlink_from_below (ACE_Module *)
   return -1;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /*  0 */
diff --git a/ace/Mutex.cpp b/ace/Mutex.cpp
index a427703eca5..83261c5d39d 100644
--- a/ace/Mutex.cpp
+++ b/ace/Mutex.cpp
@@ -15,6 +15,7 @@ ACE_RCSID (ace,
            Mutex,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Mutex)
 
@@ -120,3 +121,5 @@ ACE_Mutex::~ACE_Mutex (void)
 // ACE_TRACE ("ACE_Mutex::~ACE_Mutex");
   this->remove ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Mutex.h b/ace/Mutex.h
index bcd62c12b63..61d4db02491 100644
--- a/ace/Mutex.h
+++ b/ace/Mutex.h
@@ -32,6 +32,8 @@
 # define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A)
 # define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -174,6 +176,8 @@ private:
   ACE_Mutex (const ACE_Mutex &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Mutex.inl b/ace/Mutex.inl
index a038aa6d9be..26fb51a0c50 100644
--- a/ace/Mutex.inl
+++ b/ace/Mutex.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 
 #include "ace/OS_NS_sys_mman.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Mutex::acquire_read (void)
 {
@@ -168,3 +171,5 @@ ACE_Mutex::remove (void)
 #endif /* CHORUS || ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp
index 7a60f27fdaf..0a1e249cb4f 100644
--- a/ace/NT_Service.cpp
+++ b/ace/NT_Service.cpp
@@ -14,6 +14,8 @@
 #include "ace/Service_Object.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_NT_Service)
 
 // ACE_NT_Service destructor.
@@ -611,4 +613,6 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state,
   return;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index e7be7c68047..99fc0f1f2ec 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -38,6 +38,8 @@
 #define ACE_NT_SERVICE_START_TIMEOUT  5000
 #endif /* ACE_NT_SERVICE_TIMEOUT */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_NT_Service
  *
@@ -367,6 +369,8 @@ protected:
   ACE_OS_Log_Msg_Attributes  log_msg_attributes_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // These macros help to get things set up correctly at compile time
 // and to take most of the grudge work out of creating the proper
 // functions and doing the registrations.
diff --git a/ace/NT_Service.inl b/ace/NT_Service.inl
index a1a9e9469b8..bd9b7ea5b63 100644
--- a/ace/NT_Service.inl
+++ b/ace/NT_Service.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_NT_Service::ACE_NT_Service (DWORD start_timeout,
                                 DWORD service_type,
@@ -78,3 +81,5 @@ ACE_NT_Service::svc_handle(const SERVICE_STATUS_HANDLE new_svc_handle)
   this->svc_handle_ = new_svc_handle;
   return;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp
index 5a3e61cbb16..82d0bd27eca 100644
--- a/ace/Name_Proxy.cpp
+++ b/ace/Name_Proxy.cpp
@@ -1,4 +1,3 @@
-// Name_Proxy.cpp
 // $Id$
 
 #include "ace/Name_Proxy.h"
@@ -7,6 +6,8 @@
 
 ACE_RCSID(ace, Name_Proxy, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Name_Proxy::dump (void) const
 {
@@ -33,7 +34,7 @@ ACE_Name_Proxy::ACE_Name_Proxy (void)
 
 int
 ACE_Name_Proxy::open (const ACE_INET_Addr &remote_addr,
-		      ACE_Synch_Options& options)
+                      ACE_Synch_Options& options)
 {
   ACE_TRACE ("ACE_Name_Proxy::open");
   ACE_Time_Value *timeout = 0;
@@ -154,7 +155,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
     default:
       ACE_ERROR ((LM_ERROR,
                   ACE_LIB_TEXT ("%p got %d bytes, expected %d bytes\n"),
-		  ACE_LIB_TEXT ("recv failed"),
+                  ACE_LIB_TEXT ("recv failed"),
                   n,
                   sizeof (ACE_UINT32)));
       // FALLTHROUGH
@@ -171,14 +172,14 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
         // @@ beware of blocking read!!!.
         n = this->peer_.recv ((void *) (((char *) &reply)
                                         + sizeof (ACE_UINT32)),
-			      length - sizeof (ACE_UINT32));
+                              length - sizeof (ACE_UINT32));
 
         // Subtract off the size of the part we skipped over...
         if (n != ssize_t (length - sizeof (ACE_UINT32)))
           {
             ACE_ERROR ((LM_ERROR,
                         ACE_LIB_TEXT ("%p expected %d, got %d\n"),
-			ACE_LIB_TEXT ("invalid length"),
+                        ACE_LIB_TEXT ("invalid length"),
                         length,
                         n));
             return -1;
@@ -204,3 +205,5 @@ ACE_Name_Proxy::~ACE_Name_Proxy (void)
   ACE_TRACE ("ACE_Name_Proxy::~ACE_Name_Proxy");
   this->peer_.close ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index 594df3c3c2a..16411b17334 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -34,6 +34,8 @@
 #include "ace/Name_Request_Reply.h"
 #include "ace/Event_Handler.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Name_Proxy
  *
@@ -93,5 +95,7 @@ private:
   ACE_Name_Proxy &operator= (const ACE_Name_Proxy &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_NAME_PROXY_H */
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp
index a9f4ecd3e3c..7cee855d644 100644
--- a/ace/Name_Request_Reply.cpp
+++ b/ace/Name_Request_Reply.cpp
@@ -8,6 +8,7 @@ ACE_RCSID (ace,
            Name_Request_Reply,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Default "do nothing" constructor.
 
@@ -563,3 +564,5 @@ ACE_Name_Reply::dump (void) const
     }
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index f5704b7472b..cb9173cd7bc 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -256,6 +258,8 @@ private:
   Transfer transfer_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_NAME_REQUEST_REPLY_H */
diff --git a/ace/Name_Space.cpp b/ace/Name_Space.cpp
index b3939f4095e..2f15a9e71d3 100644
--- a/ace/Name_Space.cpp
+++ b/ace/Name_Space.cpp
@@ -7,8 +7,12 @@
 
 ACE_RCSID(ace, Name_Space, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Name_Binding::ACE_Name_Binding (void)
-  : type_ (ACE_OS::strdup (""))
+  : name_ (),
+    value_ (),
+    type_ (ACE_OS::strdup (""))
 {
   ACE_TRACE ("ACE_Name_Binding::ACE_Name_Binding");
 }
@@ -65,3 +69,5 @@ ACE_Name_Space::~ACE_Name_Space (void)
 {
   ACE_TRACE ("ACE_Name_Space::~ACE_Name_Space");
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index aedaf801276..18bda096326 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -25,6 +25,8 @@
 #include "ace/SString.h"
 #include "ace/Unbounded_Set.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
 /**
@@ -157,6 +159,8 @@ public:
   virtual void dump (void) const = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_NAME_SPACE_H */
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index a6c5df58573..b7ad702ac54 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -5,7 +5,7 @@
 #include "ace/Remote_Name_Space.h"
 #include "ace/Local_Name_Space_T.h"
 #include "ace/Registry_Name_Space.h"
-#include "ace/Memory_Pool.h"
+#include "ace/MMAP_Memory_Pool.h"
 #include "ace/RW_Process_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -16,25 +16,13 @@
 
 ACE_RCSID(ace, Naming_Context, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Make life easier later on...
 
 typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE;
 typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LITE_LOCAL_NAME_SPACE;
 
-// The following Factory is used by the ACE_Service_Config and
-// svc.conf file to dynamically initialize the state of the Name
-// Server client.
-
-ACE_FACTORY_DEFINE (ACE, ACE_Naming_Context)
-ACE_STATIC_SVC_DEFINE (ACE_Naming_Context,
-                       ACE_LIB_TEXT ("ACE_Naming_Context"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (ACE_Naming_Context),
-                       ACE_Service_Type::DELETE_THIS |
-                       ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context)
-
 // The ACE_Naming_Context static service object is now defined
 // by the ACE_Object_Manager, in Object_Manager.cpp.
 
@@ -680,26 +668,18 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
       }
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
-template class ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
-template class ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
-template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
-template class ACE_Malloc_T<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>;
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
-template class ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
-template class ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Malloc_T<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >
-#pragma instantiate ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >
-#pragma instantiate ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+// The following Factory is used by the ACE_Service_Config and
+// svc.conf file to dynamically initialize the state of the Name
+// Server client.
+
+ACE_FACTORY_DEFINE (ACE, ACE_Naming_Context)
+ACE_STATIC_SVC_DEFINE (ACE_Naming_Context,
+                       ACE_LIB_TEXT ("ACE_Naming_Context"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (ACE_Naming_Context),
+                       ACE_Service_Type::DELETE_THIS |
+                       ACE_Service_Type::DELETE_OBJ,
+                       0)
+ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context)
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index e66783f48ca..7bef675b23f 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -26,6 +26,8 @@
 #include "ace/Name_Space.h"
 #include "ace/os_include/os_netdb.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl
 class ACE_Name_Options;
 class ACE_Static_Svc_Descriptor;
@@ -372,6 +374,8 @@ private:
   ACE_Naming_Context::Context_Scope_Type context_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context)
 ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context)
 
diff --git a/ace/Node.cpp b/ace/Node.cpp
index 91e989d739b..8976a9c379e 100644
--- a/ace/Node.cpp
+++ b/ace/Node.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_NODE_C
-#define ACE_NODE_C
+#ifndef ACE_NODE_CPP
+#define ACE_NODE_CPP
 
 #include "ace/Node.h"
 
@@ -9,7 +9,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Node, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Node)
 
@@ -43,4 +43,6 @@ ACE_Node<T>::ACE_Node (const ACE_Node<T> &s)
   // ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
 
-#endif /* ACE_NODE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_NODE_CPP */
diff --git a/ace/Node.h b/ace/Node.h
index 607d0b6f137..6ec514d8141 100644
--- a/ace/Node.h
+++ b/ace/Node.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 template <class T> class ACE_Unbounded_Set;
 template <class T> class ACE_Unbounded_Set_Iterator;
@@ -59,7 +61,11 @@ private:
   ACE_Node (const T &i, ACE_Node<T> *n);
   ACE_Node (ACE_Node<T> *n = 0, int = 0);
   ACE_Node (const ACE_Node<T> &n);
+private:
+  /// Not possible
+  void operator= (const ACE_Node<T> &);
 
+private:
   /// Pointer to next element in the list of <ACE_Node>s.
   ACE_Node<T> *next_;
 
@@ -67,6 +73,8 @@ private:
   T item_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Node.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Notification_Strategy.cpp b/ace/Notification_Strategy.cpp
index 77d5dc235b0..f12bf3a569e 100644
--- a/ace/Notification_Strategy.cpp
+++ b/ace/Notification_Strategy.cpp
@@ -6,6 +6,8 @@
 
 ACE_RCSID(ace, Strategies, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Notification_Strategy::ACE_Notification_Strategy (ACE_Event_Handler *eh,
                                                       ACE_Reactor_Mask mask)
   : eh_ (eh),
@@ -16,3 +18,5 @@ ACE_Notification_Strategy::ACE_Notification_Strategy (ACE_Event_Handler *eh,
 ACE_Notification_Strategy::~ACE_Notification_Strategy (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Notification_Strategy.h b/ace/Notification_Strategy.h
index 07e1a179563..751868152b4 100644
--- a/ace/Notification_Strategy.h
+++ b/ace/Notification_Strategy.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Notification_Strategy.h
@@ -18,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 class ACE_Reactor;
 
@@ -64,6 +67,7 @@ protected:
   ACE_Reactor_Mask mask_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Notification_Strategy.inl"
diff --git a/ace/Notification_Strategy.inl b/ace/Notification_Strategy.inl
index fac4b0cd3b6..47479030ab6 100644
--- a/ace/Notification_Strategy.inl
+++ b/ace/Notification_Strategy.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //$Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_Event_Handler *
 ACE_Notification_Strategy::event_handler (void)
 {
@@ -24,3 +27,5 @@ ACE_Notification_Strategy::mask (ACE_Reactor_Mask m)
 {
   this->mask_ = m;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Null_Barrier.h b/ace/Null_Barrier.h
index 0c5f5609972..9b3bc16912a 100644
--- a/ace/Null_Barrier.h
+++ b/ace/Null_Barrier.h
@@ -16,6 +16,8 @@
 #define ACE_NULL_BARRIER_H
 #include /**/ "ace/pre.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // All methods in this class are inline, so there is no
 // need to import or export on Windows. -- CAE 12/18/2003
 
@@ -51,5 +53,7 @@ private:
   ACE_Null_Barrier (const ACE_Null_Barrier &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_NULL_BARRIER_H */
diff --git a/ace/Null_Condition.h b/ace/Null_Condition.h
index eb1fa10e436..a72df210a51 100644
--- a/ace/Null_Condition.h
+++ b/ace/Null_Condition.h
@@ -26,12 +26,14 @@
 
 #include "ace/os_include/os_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
  * @class ACE_Null_Condition
  *
- * @brief Implement a do nothing <ACE_Condition> variable wrapper,
+ * @brief Implement a do nothing ACE_Condition variable wrapper,
  * i.e., all methods are no ops.  This class is necessary since
  * some C++ compilers are *very* lame...
  */
@@ -77,5 +79,7 @@ private:
   ACE_Null_Condition (const ACE_Null_Condition &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_NULL_CONDITION_H */
diff --git a/ace/Null_Mutex.h b/ace/Null_Mutex.h
index a0c9bf8d374..022cc034df6 100644
--- a/ace/Null_Mutex.h
+++ b/ace/Null_Mutex.h
@@ -27,6 +27,9 @@
 #include "ace/Global_Macros.h"
 #include "ace/OS_Memory.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -119,8 +122,8 @@ class ACE_Guard;
 /**
  * @class ACE_Guard<ACE_Null_Mutex>
  *
- * @brief Template specialization of <ACE_Guard> for the
- * <ACE_Null_Mutex>.
+ * @brief Template specialization of ACE_Guard for the
+ * ACE_Null_Mutex.
  *
  * This specialization is useful since it helps to speedup
  * performance of the "Null_Mutex" considerably.
@@ -146,9 +149,11 @@ public:
   void dump (void) const {}
 
 private:
-  // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard<ACE_Null_Mutex> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &))
+
+  // Disallow copying and assignment.
+  ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &);
+  void operator= (const ACE_Guard<ACE_Null_Mutex> &);
+
 };
 
 template <class ACE_LOCK>
@@ -215,5 +220,7 @@ public:
   }
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_NULL_MUTEX_H */
diff --git a/ace/Null_Semaphore.h b/ace/Null_Semaphore.h
index 43349202541..9124f46cf73 100644
--- a/ace/Null_Semaphore.h
+++ b/ace/Null_Semaphore.h
@@ -24,12 +24,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
  * @class ACE_Null_Semaphore
  *
- * @brief Implement a do nothing <ACE_Semaphore>, i.e., all the methods are
+ * @brief Implement a do nothing ACE_Semaphore, i.e., all the methods are
  * no ops.
  *
  * Although the methods are no-ops, the return values are different for
@@ -96,5 +98,7 @@ public:
   //ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_NULL_SEMAPHORE_H */
diff --git a/ace/OS.h b/ace/OS.h
index 66f43169957..4f2fe57d8e4 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -76,8 +76,12 @@
 
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Timeout_Manager;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Here are all ACE-specific default constants, needed throughout ACE
 // and its applications.  The values can be over written by user
 // specific values in config.h files.
@@ -328,6 +332,9 @@ class ACE_Timeout_Manager;
 # include "ace/os_include/os_syslog.h"
 # endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @namespace ACE_OS
  *
@@ -336,7 +343,7 @@ class ACE_Timeout_Manager;
  *     efficient system programs on Win32, POSIX and other versions
  *     of UNIX, and various real-time operating systems.
  *
- * This class encapsulates the differences between various OS
+ * This namespace encapsulates the differences between various OS
  * platforms.  When porting ACE to a new platform, this class is
  * the place to focus on.  Once this file is ported to a new
  * platform, pretty much everything else comes for "free."  See
@@ -347,14 +354,11 @@ class ACE_Timeout_Manager;
  */
 namespace ACE_OS
 {
-
-
-
   // = A set of wrappers for miscellaneous operations.
-
-
 }  /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp
deleted file mode 100644
index a985c999068..00000000000
--- a/ace/OS_Dirent.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-#include "ace/OS_Dirent.h"
-
-ACE_RCSID(ace, OS_Dirent, "$Id$")
-
diff --git a/ace/OS_Errno.cpp b/ace/OS_Errno.cpp
index 7e1d6f93cc0..8170ef82466 100644
--- a/ace/OS_Errno.cpp
+++ b/ace/OS_Errno.cpp
@@ -20,6 +20,8 @@ ACE_RCSID(ace, OS_Errno, "$Id$")
 
 #include "ace/OS_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_CE_Errno *ACE_CE_Errno::instance_ = 0;
 DWORD ACE_CE_Errno::errno_key_ = 0xffffffff;
 
@@ -39,4 +41,6 @@ ACE_CE_Errno::fini ()
   ACE_CE_Errno::instance_ = 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
diff --git a/ace/OS_Errno.h b/ace/OS_Errno.h
index 82446047842..e92837af318 100644
--- a/ace/OS_Errno.h
+++ b/ace/OS_Errno.h
@@ -22,6 +22,8 @@
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Errno_Guard
  *
@@ -81,6 +83,8 @@ private:
   int error_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Inlining this class on debug builds with gcc on Solaris can cause
 // deadlocks during static initialization.
 #if defined (ACE_HAS_INLINED_OSCALLS) && \
diff --git a/ace/OS_Errno.inl b/ace/OS_Errno.inl
index 9330c37deb4..2fe5e6c54e2 100644
--- a/ace/OS_Errno.inl
+++ b/ace/OS_Errno.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref,
                                   int error)
@@ -60,3 +63,5 @@ ACE_Errno_Guard::operator!= (int error)
 {
   return this->error_ != error;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_Log_Msg_Attributes.h b/ace/OS_Log_Msg_Attributes.h
index f86011147ea..5da968d0ba7 100644
--- a/ace/OS_Log_Msg_Attributes.h
+++ b/ace/OS_Log_Msg_Attributes.h
@@ -24,13 +24,18 @@
 #include "ace/os_include/os_stdio.h"
 #include "ace/iosfwd.h"
 
-/// The attributes required by ACE_Log_Msg.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
+ * @class ACE_OS_Log_Msg_Attributes
+ *
+ * @brief The attributes required by ACE_Log_Msg.
+ *
  * When a new thread is created the TSS resources for the Log_Msg
  * class in the new thread may be inherited by the creator thread.
  * The base_attributes are encapsulated in this class to simplify their
  * manipulation and destruction.
- *
+ * @par
  * The contents of the class must be made available to the OS layer,
  * because they are part of the thread descriptor.
  */
@@ -71,6 +76,8 @@ private:
   ACE_OS_Log_Msg_Attributes &operator= (const ACE_OS_Log_Msg_Attributes &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_Log_Msg_Attributes.inl b/ace/OS_Log_Msg_Attributes.inl
index 3ece871ea06..29725ef4d7c 100644
--- a/ace/OS_Log_Msg_Attributes.inl
+++ b/ace/OS_Log_Msg_Attributes.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_Memory.cpp b/ace/OS_Memory.cpp
deleted file mode 100644
index 8a30926a8bd..00000000000
--- a/ace/OS_Memory.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "ace/OS_Memory.h"
-
-ACE_RCSID(ace, OS_Memory, "$Id$")
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS_Memory.inl"
-#endif /* !ACE_HAS_INLINED_OS_CALLS */
-
-#include "ace/os_include/os_stdlib.h"
-
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h
index f11aca10679..b972a6f44c8 100644
--- a/ace/OS_Memory.h
+++ b/ace/OS_Memory.h
@@ -38,8 +38,9 @@
 //
 // For completeness' sake, you should probably put
 //   #define ACE_HAS_STRDUP_EMULATION
-// too, so that you guarantee that strdup() calls your desired mallocator
-// and not the system mallocator.
+//   #define ACE_HAS_WCSDUP_EMULATION
+// too, so that you guarantee that strdup() and wcsdup() call your
+// desired mallocator and not the system mallocator.
 //
 #if !defined (ACE_MALLOC_FUNC)
 #  define ACE_MALLOC_FUNC ::malloc
@@ -54,12 +55,16 @@
 #  define ACE_REALLOC_FUNC ::realloc
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_OLD_MALLOC)
-typedef char *ACE_MALLOC_T;
+typedef char * ACE_MALLOC_T;
 #else
-typedef void *ACE_MALLOC_T;
+typedef void * ACE_MALLOC_T;
 #endif /* ACE_HAS_OLD_MALLOC */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // ============================================================================
 // ACE_NEW macros
 //
@@ -254,13 +259,5 @@ typedef void *ACE_MALLOC_T;
 
 #include "ace/OS_NS_stdlib.h"
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS_Memory.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_MEMORY_H */
diff --git a/ace/OS_Memory.inl b/ace/OS_Memory.inl
deleted file mode 100644
index 3c4912199de..00000000000
--- a/ace/OS_Memory.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#if !defined (ACE_LACKS_SBRK)
-#  include "ace/os_include/os_unistd.h"
-#endif /* !ACE_LACKS_SBRK */
-
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index 8240709353f..e3452744928 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -24,9 +24,9 @@ ACE_RCSID (ace,
 #include "ace/Guard_T.h"
 
 extern "C" void
-ace_mutex_lock_cleanup_adapter (void *args)
+ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args)
 {
-  ACE_OS::mutex_lock_cleanup (args);
+  ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::mutex_lock_cleanup (args);
 }
 
 
@@ -87,6 +87,8 @@ HANDLE WINAPI __IBMCPP__beginthreadex(void *stack,
 
 /*****************************************************************************/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Thread_ID::to_string (char *thr_string) const
 {
@@ -779,26 +781,40 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose)
   }
 }
 
-TSS_Cleanup_Instance::~TSS_Cleanup_Instance()
+TSS_Cleanup_Instance::~TSS_Cleanup_Instance (void)
 {
-  ACE_Guard<ACE_Thread_Mutex> guard(*mutex_);
-  if (ptr_ != 0)
+  // Variable to hold the mutex_ to delete outside the scope of the
+  // guard.
+  ACE_Thread_Mutex *del_mutex = 0;
+
+  // scope the guard
+  {
+    ACE_Guard<ACE_Thread_Mutex> guard (*mutex_);
+    if (ptr_ != 0)
+      {
+        if (ACE_BIT_ENABLED (flags_, FLAG_DELETING))
+          {
+            ACE_ASSERT(instance_ == 0);
+            ACE_ASSERT(reference_count_ == 0);
+            delete ptr_;
+            del_mutex = mutex_ ;
+            mutex_ = 0;
+          }
+        else
+          {
+            ACE_ASSERT (reference_count_ > 0);
+            --reference_count_;
+            if (reference_count_ == 0 && instance_ == NULL)
+              condition_->signal ();
+          }
+      }
+  }// end of guard scope
+
+  if (del_mutex != 0)
     {
-      if (ACE_BIT_ENABLED (flags_,FLAG_DELETING))
-        {
-          ACE_ASSERT(instance_ == 0);
-          ACE_ASSERT(reference_count_ == 0);
-          delete ptr_;
-        }
-      else
-        {
-          ACE_ASSERT (reference_count_ > 0);
-          --reference_count_;
-          if (reference_count_ == 0 && instance_ == NULL)
-            {
-              condition_->signal();
-            }
-        }
+      delete condition_;
+      condition_ = 0;
+      delete del_mutex;
     }
 }
 
@@ -909,7 +925,7 @@ ACE_TSS_Cleanup::thread_exit (void)
 extern "C" void
 ACE_TSS_Cleanup_keys_destroyer (void *tss_keys)
 {
-  delete reinterpret_cast <ACE_TSS_Keys *> (tss_keys);
+  delete static_cast <ACE_TSS_Keys *> (tss_keys);
 }
 
 ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
@@ -3692,7 +3708,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 #elif defined (ACE_HAS_PTHREADS) && \
       (!defined (ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS) || \
       defined (ACE_HAS_PTHREAD_SCHEDPARAM))
-  ACE_UNUSED_ARG (id);
   if (sched_params.quantum () != ACE_Time_Value::zero)
     {
       // quantums not supported
@@ -3713,7 +3728,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 # if defined(ACE_TANDEM_T1248_PTHREADS) || defined (ACE_HAS_PTHREAD_SCHEDPARAM)
       ACE_NOTSUP_RETURN (-1);
 # else  /* ! ACE_TANDEM_T1248_PTHREADS */
-      int result = ::sched_setscheduler (0, // this process
+      int result = ::sched_setscheduler (id == ACE_SELF ? 0 : id,
                                          sched_params.policy (),
                                          &param) == -1 ? -1 : 0;
 # if defined (DIGITAL_UNIX)
@@ -3769,40 +3784,73 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
     EtsSetTimeSlice (sched_params.quantum().msec());
 
 # else
-  ACE_UNUSED_ARG (id);
 
-  if (sched_params.scope () != ACE_SCOPE_PROCESS
-      || sched_params.quantum () != ACE_Time_Value::zero)
+  if (sched_params.quantum () != ACE_Time_Value::zero)
     {
-      // Win32 only allows setting priority class (therefore, policy)
-      // at the process level.  I don't know of a way to set the
-      // quantum.
+      // I don't know of a way to set the quantum on Win32.
       errno = EINVAL;
       return -1;
     }
 
-// 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
-  // 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 (),
-                           (sched_params.policy () == ACE_SCHED_FIFO ||
-                           sched_params.policy () == ACE_SCHED_RR)
-                           ? REALTIME_PRIORITY_CLASS
-                           : NORMAL_PRIORITY_CLASS))
+  if (sched_params.scope () == ACE_SCOPE_THREAD)
     {
-      ACE_OS::set_errno_to_last_error ();
-      return -1;
-    }
+
+      // 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
+      // 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 (),
+                               (sched_params.policy () == ACE_SCHED_FIFO ||
+                                sched_params.policy () == ACE_SCHED_RR)
+                               ? REALTIME_PRIORITY_CLASS
+                               : NORMAL_PRIORITY_CLASS))
+        {
+          ACE_OS::set_errno_to_last_error ();
+          return -1;
+        }
 #endif /* ACE_DISABLE_WIN32_INCREASE_PRIORITY */
 
 # endif /* ACE_HAS_PHARLAP_RT */
-
-  // Set the thread priority on the current thread.
-  return ACE_OS::thr_setprio (sched_params.priority ());
-
+      // Now that we have set the priority class of the process, set the
+      // priority of the current thread to the desired value.
+      return ACE_OS::thr_setprio (sched_params.priority ());
+    }
+  else if (sched_params.scope () == ACE_SCOPE_PROCESS)
+    {
+      HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION,
+                                       FALSE,
+                                       id);
+      if (!hProcess)
+        {
+          ACE_OS::set_errno_to_last_error();
+          return -1;
+        }
+      // There is no way for us to set the priority of the thread when we
+      // are setting the priority of a different process.  So just ignore
+      // the priority argument when ACE_SCOPE_PROCESS is specified.
+      // Setting the priority class will automatically increase the base
+      // priority of all the threads within a process while maintaining the
+      // relative priorities of the threads within it.
+      if (!::SetPriorityClass (hProcess,
+                               (sched_params.policy () == ACE_SCHED_FIFO ||
+                                sched_params.policy () == ACE_SCHED_RR)
+                               ? REALTIME_PRIORITY_CLASS
+                               : NORMAL_PRIORITY_CLASS))
+        {
+          ACE_OS::set_errno_to_last_error ();
+          ::CloseHandle (hProcess);
+          return -1;
+        }
+      ::CloseHandle (hProcess);
+      return 0;
+    }
+  else
+    {
+      errno = EINVAL;
+      return -1;
+    }
 #elif defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (id);
 
@@ -3981,19 +4029,19 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #endif /* ! defined (ACE_NO_THREAD_ADAPTER) */
 
 
-  ACE_Base_Thread_Adapter *thread_args;
+  ACE_Base_Thread_Adapter *thread_args = 0;
   if (thread_adapter == 0)
 #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
     ACE_NEW_RETURN (thread_args,
                     ACE_OS_Thread_Adapter (func, args,
-                                           (ACE_THR_C_FUNC) ace_thread_adapter,
+                                           (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME,
                                            ACE_OS_Object_Manager::seh_except_selector(),
                                            ACE_OS_Object_Manager::seh_except_handler()),
                     -1);
 #else
   ACE_NEW_RETURN (thread_args,
                   ACE_OS_Thread_Adapter (func, args,
-                                         (ACE_THR_C_FUNC) ace_thread_adapter),
+                                         (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME),
                   -1);
 
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
@@ -4377,6 +4425,22 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         }
 #   endif /* !ACE_LACKS_THREAD_PROCESS_SCOPING */
 
+#   ifdef ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP
+      if (ACE_BIT_ENABLED (flags, THR_SUSPENDED))
+        {
+           if (ACE_ADAPT_RETVAL(::pthread_attr_setcreatesuspend_np(&attr), result) != 0)
+	     {
+
+#     if defined (ACE_HAS_PTHREADS_DRAFT4)
+              ::pthread_attr_delete (&attr);
+#     else /* ACE_HAS_PTHREADS_DRAFT4 */
+              ::pthread_attr_destroy (&attr);
+#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
+	      return -1;
+	    }
+        }
+#   endif /* !ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP */
+
       if (ACE_BIT_ENABLED (flags, THR_NEW_LWP))
         {
           // Increment the number of LWPs by one to emulate the
@@ -4787,9 +4851,9 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     return -1;
   else
     {
-      if (! thr_id_provided  &&  thr_id)
+      if (! thr_id_provided && thr_id)
         {
-          if (*thr_id  &&  (*thr_id)[0] == ACE_THR_ID_ALLOCATED)
+          if (*thr_id && (*thr_id)[0] == ACE_THR_ID_ALLOCATED)
             // *thr_id was allocated by the Thread_Manager.  ::taskTcb
             // (int tid) returns the address of the WIND_TCB (task
             // control block).  According to the ::taskSpawn()
@@ -4797,12 +4861,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
             // pStackBase, but is that of the current task?  If so, it
             // might be a bit quicker than this extraction of the tcb
             // . . .
-            ACE_OS::strsncpy (*thr_id + 1, ::taskTcb (tid)->name, 10);
+            ACE_OS::strsncpy (*thr_id + 1, ::taskName (tid), 10);
           else
             // *thr_id was not allocated by the Thread_Manager.
             // Pass back the task name in the location pointed to
             // by thr_id.
-            *thr_id = ::taskTcb (tid)->name;
+            *thr_id = ::taskName (tid);
         }
       // else if the thr_id was provided, there's no need to overwrite
       // it with the same value (string).  If thr_id is 0, then we can't
@@ -4990,6 +5054,99 @@ ACE_OS::thr_key_detach (ACE_thread_key_t key, void *)
 }
 
 int
+ACE_OS::thr_get_affinity (ACE_hthread_t thr_id,
+                          size_t cpu_set_size,
+                          cpu_set_t * cpu_mask)
+{
+#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)
+    {
+      return -1;
+    }
+  return 0;
+#elif defined (ACE_HAS_2_PARAM_SCHED_GETAFFINITY)
+  // The process-id is expected as <thr_id>, which can be a thread-id of
+  // 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 ()
+  ACE_UNUSED_ARG (cpu_set_size);
+  if (::sched_getaffinity(thr_id,
+                          cpu_mask) == -1)
+    {
+      return -1;
+    }
+  return 0;
+#elif defined (ACE_HAS_SCHED_GETAFFINITY)
+  // The process-id is expected as <thr_id>, which can be a thread-id of
+  // 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)
+    {
+      return -1;
+    }
+  return 0;
+#else
+  ACE_UNUSED_ARG (thr_id);
+  ACE_UNUSED_ARG (cpu_set_size);
+  ACE_UNUSED_ARG (cpu_mask);
+  ACE_NOTSUP_RETURN (-1);
+#endif
+}
+
+int
+ACE_OS::thr_set_affinity (ACE_hthread_t thr_id,
+                          size_t cpu_set_size,
+                          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)
+    {
+      return -1;
+    }
+  return 0;
+#elif defined (ACE_HAS_2_PARAM_SCHED_SETAFFINITY)
+  // The process-id is expected as <thr_id>, which can be a thread-id of
+  // 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 (), but whole process will bind your CPUs
+  //
+  ACE_UNUSED_ARG (cpu_set_size);
+  if (::sched_setaffinity (thr_id,
+                           cpu_mask) == -1)
+    {
+      return -1;
+    }
+  return 0;
+#elif defined (ACE_HAS_SCHED_SETAFFINITY)
+  // The process-id is expected as <thr_id>, which can be a thread-id of
+  // 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 (), but whole process will bind your CPUs
+  //
+  if (::sched_setaffinity (thr_id,
+                           cpu_set_size,
+                           cpu_mask) == -1)
+    {
+      return -1;
+    }
+  return 0;
+#else
+  ACE_UNUSED_ARG (thr_id);
+  ACE_UNUSED_ARG (cpu_set_size);
+  ACE_UNUSED_ARG (cpu_mask);
+  ACE_NOTSUP_RETURN (-1);
+#endif
+}
+
+int
 ACE_OS::thr_key_used (ACE_thread_key_t key)
 {
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
@@ -5120,8 +5277,12 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key,
     else
       return -1;
       /* NOTREACHED */
-#   else /* ACE_HAS_TSS_EMULATION */
+#   elif defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
     return  ACE_OS::thr_keycreate_native (key, dest);
+#   else
+    ACE_UNUSED_ARG (key);
+    ACE_UNUSED_ARG (dest);
+    ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_TSS_EMULATION */
 # else /* ACE_HAS_THREADS */
   ACE_UNUSED_ARG (key);
@@ -5184,8 +5345,11 @@ ACE_OS::thr_keyfree (ACE_thread_key_t key)
         return cleanup->free_key (key);
       }
     return -1;
-#   else /* ACE_HAS_TSS_EMULATION */
+#   elif defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
     return ACE_OS::thr_keyfree_native (key);
+#   else
+    ACE_UNUSED_ARG (key);
+    ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_TSS_EMULATION */
 # else /* ACE_HAS_THREADS */
   ACE_UNUSED_ARG (key);
@@ -5254,7 +5418,7 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data)
     ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
 #       else
     int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setspecific (key, data),
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data),
                                          result),
                        int, -1);
 #       endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
@@ -5336,8 +5500,12 @@ ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
         return -1;
       }
     return -1;
+#   elif defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+      return ACE_OS::thr_setspecific_native (key, data);
 #   else /* ACE_HAS_TSS_EMULATION */
-  return ACE_OS::thr_setspecific_native (key, data);
+      ACE_UNUSED_ARG (key);
+      ACE_UNUSED_ARG (data);
+      ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_TSS_EMULATION */
 # else /* ACE_HAS_THREADS */
   ACE_UNUSED_ARG (key);
@@ -5386,8 +5554,11 @@ ACE_OS::unique_name (const void *object,
                     length);
 }
 
-#if defined (VXWORKS)
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 # include /**/ <usrLib.h>   /* for ::sp() */
+# include /**/ <sysLib.h>   /* for ::sysClkRateGet() */
 
 // This global function can be used from the VxWorks shell to pass
 // arguments to a C main () function.
@@ -5398,8 +5569,8 @@ ACE_OS::unique_name (const void *object,
 int
 spa (FUNCPTR entry, ...)
 {
-  static const unsigned int MAX_ARGS = 10;
-  static char *argv[MAX_ARGS];
+  static const unsigned int ACE_MAX_ARGS = 10;
+  static char *argv[ACE_MAX_ARGS];
   va_list pvar;
   unsigned int argc;
 
@@ -5415,7 +5586,7 @@ spa (FUNCPTR entry, ...)
   // number of arguments would have to be passed.
   va_start (pvar, entry);
 
-  for (argc = 1; argc <= MAX_ARGS; ++argc)
+  for (argc = 1; argc <= ACE_MAX_ARGS; ++argc)
     {
       argv[argc] = va_arg (pvar, char *);
 
@@ -5423,18 +5594,18 @@ spa (FUNCPTR entry, ...)
         break;
     }
 
-  if (argc > MAX_ARGS  &&  argv[argc-1] != 0)
+  if (argc > ACE_MAX_ARGS  &&  argv[argc-1] != 0)
     {
       // try to read another arg, and warn user if the limit was exceeded
       if (va_arg (pvar, char *) != 0)
         ACE_OS::fprintf (stderr, "spa(): number of arguments limited to %d\n",
-                         MAX_ARGS);
+                         ACE_MAX_ARGS);
     }
   else
     {
       // fill unused argv slots with 0 to get rid of leftovers
       // from previous invocations
-      for (unsigned int i = argc; i <= MAX_ARGS; ++i)
+      for (unsigned int i = argc; i <= ACE_MAX_ARGS; ++i)
         argv[i] = 0;
     }
 
@@ -5530,8 +5701,8 @@ int
 spae (FUNCPTR entry, ...)
 {
   static const int WINDSH_ARGS = 10;
-  static const int MAX_ARGS    = 128;
-  static char* argv[MAX_ARGS]  = { "ace_main", 0 };
+  static const int ACE_MAX_ARGS    = 128;
+  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
   va_list pvar;
   int argc = 1;
 
@@ -5545,12 +5716,12 @@ spae (FUNCPTR entry, ...)
   for (char* str = va_arg (pvar, char*);
        str != 0 && i < WINDSH_ARGS; str = va_arg (pvar, char*), ++i)
     {
-      add_to_argv(argc, argv, MAX_ARGS, str);
+      add_to_argv(argc, argv, ACE_MAX_ARGS, str);
     }
 
   // fill unused argv slots with 0 to get rid of leftovers
   // from previous invocations
-  for (i = argc; i < MAX_ARGS; ++i)
+  for (i = argc; i < ACE_MAX_ARGS; ++i)
     argv[i] = 0;
 
   // The hard-coded options are what ::sp () uses, except for the
@@ -5584,8 +5755,8 @@ int
 spaef (FUNCPTR entry, ...)
 {
   static const int WINDSH_ARGS = 10;
-  static const int MAX_ARGS    = 128;
-  static char* argv[MAX_ARGS]  = { "ace_main", 0 };
+  static const int ACE_MAX_ARGS    = 128;
+  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
   va_list pvar;
   int argc = 1;
 
@@ -5599,12 +5770,12 @@ spaef (FUNCPTR entry, ...)
   for (char* str = va_arg (pvar, char*);
        str != 0 && i < WINDSH_ARGS; str = va_arg (pvar, char*), ++i)
     {
-      add_to_argv(argc, argv, MAX_ARGS, str);
+      add_to_argv(argc, argv, ACE_MAX_ARGS, str);
     }
 
   // fill unused argv slots with 0 to get rid of leftovers
   // from previous invocations
-  for (i = argc; i < MAX_ARGS; ++i)
+  for (i = argc; i < ACE_MAX_ARGS; ++i)
     argv[i] = 0;
 
   int ret = entry (argc, argv);
@@ -5635,18 +5806,18 @@ _vx_call_entry(FUNCPTR entry, int argc, char* argv[])
 int
 vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...)
 {
-  static const int MAX_ARGS    = 128;
-  static char* argv[MAX_ARGS]  = { "ace_main", 0 };
+  static const int ACE_MAX_ARGS    = 128;
+  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
   int argc = 1;
 
   // Peel off arguments to run_main () and put into argv.
 
   if (arg)
-    add_to_argv(argc, argv, MAX_ARGS, arg);
+    add_to_argv(argc, argv, ACE_MAX_ARGS, arg);
 
   // fill unused argv slots with 0 to get rid of leftovers
   // from previous invocations
-  for (int i = argc; i < MAX_ARGS; ++i)
+  for (int i = argc; i < ACE_MAX_ARGS; ++i)
     argv[i] = 0;
 
   // The hard-coded options are what ::sp () uses, except for the
@@ -5668,7 +5839,7 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...)
   // successful
   return ret > 0 ? _vx_call_rc : 255;
 }
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && !__RTP__ */
 
 #if defined (__DGUX) && defined (ACE_HAS_THREADS) && defined (_POSIX4A_DRAFT10_SOURCE)
 extern "C" int __d6_sigwait (sigset_t *set);
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index 745f5c730d1..9274b5212a7 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -29,6 +29,7 @@
 # include "ace/Basic_Types.h"
 # include "ace/Default_Constants.h"
 # include "ace/os_include/os_pthread.h"
+# include "ace/os_include/os_sched.h"
 # include "ace/Base_Thread_Adapter.h"
 # include "ace/os_include/sys/os_sem.h"
 # include "ace/os_include/os_semaphore.h"
@@ -54,6 +55,8 @@
 #   include /**/ <sys/tspriocntl.h>
 # endif /* ACE_HAS_PRIOCNTL */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_PSOS)
 // Use pSOS semaphores, wrapped . . .
 typedef struct
@@ -115,6 +118,8 @@ typedef DWORD ACE_OS_thread_key_t;
 #   endif /* ! ACE_HAS_TSS_EMULATION */
 # endif /* ACE_WIN32 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if !defined (ACE_HAS_POSIX_SEM) && defined (ACE_USES_FIFO_SEM)
 
 extern "C" {
@@ -150,6 +155,9 @@ extern "C" {
 #   if defined (ACE_HAS_PTHREADS)
 // moved to pthread.h
 #   elif defined (ACE_HAS_STHREADS)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Solaris threads, without PTHREADS.
 // Typedefs to help compatibility with Windows NT and Pthreads.
 typedef thread_t ACE_thread_t;
@@ -181,6 +189,8 @@ struct ACE_Export ACE_mutexattr_t
 typedef ACE_thread_t ACE_hthread_t;
 typedef ACE_mutex_t ACE_thread_mutex_t;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #     define THR_CANCEL_DISABLE      0
 #     define THR_CANCEL_ENABLE       0
 #     define THR_CANCEL_DEFERRED     0
@@ -192,6 +202,8 @@ typedef ACE_mutex_t ACE_thread_mutex_t;
 
 #   elif defined (ACE_PSOS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Some versions of pSOS provide native mutex support.  For others,
 // implement ACE_thread_mutex_t and ACE_mutex_t using pSOS semaphores.
 // Either way, the types are all u_longs.
@@ -233,6 +245,8 @@ typedef u_int ACE_OS_thread_key_t;
       typedef ACE_OS_thread_key_t ACE_thread_key_t;
 #   endif /* ! ACE_HAS_TSS_EMULATION */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #     define THR_CANCEL_DISABLE      0  /* thread can never be cancelled */
 #     define THR_CANCEL_ENABLE       0      /* thread can be cancelled */
 #     define THR_CANCEL_DEFERRED     0      /* cancellation deferred to cancellation point */
@@ -268,10 +282,12 @@ typedef u_int ACE_OS_thread_key_t;
 /* #define T_NOFPU         0x00000000   Not using FPU */
 /* #define T_FPU           0x00000002   Using FPU bit */
 
-#   elif defined (VXWORKS)
+#   elif defined (ACE_VXWORKS)
 #     include /**/ <sysLib.h> // for sysClkRateGet()
-#     include /**/ <taskLib.h>
-#     include /**/ <taskHookLib.h>
+#     if !defined (__RTP__)
+#       include /**/ <taskLib.h>
+#       include /**/ <taskHookLib.h>
+#     endif
 
 // make sure these are included for VXWORKS.
 // @todo move these to a common place, perhaps the top of the file.
@@ -290,7 +306,9 @@ typedef u_int ACE_OS_thread_key_t;
 // task options:  the other options are either obsolete, internal, or for
 // Fortran or Ada support
 #     define VX_UNBREAKABLE        0x0002  /* breakpoints ignored */
-#     define VX_FP_TASK            0x0008  /* floating point coprocessor */
+#     if !defined (VX_FP_TASK)
+#       define VX_FP_TASK            0x0008  /* floating point coprocessor */
+#     endif
 #     define VX_PRIVATE_ENV        0x0080  /* private environment support */
 #     define VX_NO_STACK_FILL      0x0100  /* do not stack fill for
                                               checkstack () */
@@ -317,6 +335,8 @@ typedef u_int ACE_OS_thread_key_t;
 #     define USYNC_PROCESS           1 /* It's all global on VxWorks
                                           (without MMU option). */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef SEM_ID ACE_mutex_t;
 // Implement ACE_thread_mutex_t with ACE_mutex_t because there's just
 // one process . . .
@@ -346,12 +366,16 @@ typedef u_int ACE_OS_thread_key_t;
       typedef ACE_OS_thread_key_t ACE_thread_key_t;
 #   endif /* ! ACE_HAS_TSS_EMULATION */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
       // Marker for ACE_Thread_Manager to indicate that it allocated
       // an ACE_thread_t.  It is placed at the beginning of the ID.
 #     define ACE_THR_ID_ALLOCATED '\022'
 
 #   elif defined (ACE_HAS_WTHREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef CRITICAL_SECTION ACE_thread_mutex_t;
 
 typedef struct
@@ -396,6 +420,8 @@ public:
 #       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #     endif /* defined (ACE_WIN32) */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // These need to be different values, neither of which can be 0...
 #     define USYNC_THREAD 1
 #     define USYNC_PROCESS 2
@@ -423,6 +449,9 @@ public:
 // takes care of it) unless we're on Windows. Win32 mutexes, semaphores,
 // and condition variables are not yet supported in PACE.
 #   if defined (ACE_LACKS_COND_T)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_cond_t
  *
@@ -481,10 +510,15 @@ struct ACE_Export ACE_mutexattr_t
 {
   int type;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #   endif /* ACE_LACKS_COND_T */
 
 #   if defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_rwlock_t
  *
@@ -524,11 +558,18 @@ public:
   /// Condition for the upgrading reader
   ACE_cond_t waiting_important_writer_;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #   elif defined (ACE_HAS_PTHREADS_UNIX98_EXT)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef pthread_rwlock_t ACE_rwlock_t;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #   elif defined (ACE_HAS_STHREADS)
 #     include /**/ <synch.h>
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef rwlock_t ACE_rwlock_t;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #   endif /* ACE_LACKS_RWLOCK_T */
 
 // Define some default thread priorities on all threaded platforms, if
@@ -578,6 +619,9 @@ typedef rwlock_t ACE_rwlock_t;
 //    and recursive_mutex_cond_relock() methods to maintain the expected
 //    state when the wait finishes.
 #   if defined (ACE_HAS_RECURSIVE_MUTEXES)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_thread_mutex_t ACE_recursive_thread_mutex_t;
 #     if defined (ACE_WIN32)
 // Windows has recursive mutexes, but doesn't have condition variables,
@@ -593,7 +637,13 @@ struct ACE_recursive_mutex_state
 // No need for special handling; just need a type for method signatures.
 typedef int ACE_recursive_mutex_state;
 #     endif /* ACE_WIN32 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #   else
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_recursive_thread_mutex_t
  *
@@ -628,6 +678,9 @@ struct ACE_recursive_mutex_state
   int nesting_level_;
   ACE_thread_t owner_id_;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #   endif /* ACE_HAS_RECURSIVE_MUTEXES */
 
 # else /* !ACE_HAS_THREADS, i.e., the OS/platform doesn't support threading. */
@@ -694,6 +747,8 @@ struct ACE_recursive_mutex_state
 #     define THR_SCOPE_SYSTEM 0
 #   endif /* ! THR_SCOPE_SYSTEM */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // These are dummies needed for class OS.h
 typedef int ACE_cond_t;
 struct ACE_Export ACE_condattr_t
@@ -723,6 +778,8 @@ typedef unsigned int ACE_OS_thread_key_t;
       typedef ACE_OS_thread_key_t ACE_thread_key_t;
 #   endif /* ! ACE_HAS_TSS_EMULATION */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Ensure that ACE_THR_PRI_FIFO_DEF and ACE_THR_PRI_OTHER_DEF are
 // defined on non-threaded platforms, to support application source
 // code compatibility.  ACE_THR_PRI_FIFO_DEF should be used by
@@ -737,6 +794,8 @@ typedef unsigned int ACE_OS_thread_key_t;
 
 # endif /* ACE_HAS_THREADS ***********************************************/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Thread_ID
  *
@@ -793,14 +852,14 @@ private:
 typedef int ACE_Sched_Priority;
 
 # if !defined (ACE_DEFAULT_SYNCH_TYPE)
-#   if defined (VXWORKS)
+#   if defined (ACE_VXWORKS)
       // Types include these options: SEM_Q_PRIORITY, SEM_Q_FIFO,
       // SEM_DELETE_SAFE, and SEM_INVERSION_SAFE.  SEM_Q_FIFO is
       // used as the default because that is VxWorks' default.
 #     define ACE_DEFAULT_SYNCH_TYPE SEM_Q_FIFO
 #   else
 #     define ACE_DEFAULT_SYNCH_TYPE USYNC_THREAD
-#   endif /* VXWORKS */
+#   endif /* ACE_VXWORKS */
 #endif /* ! ACE_DEFAULT_SYNCH_TYPE */
 
 // forward declaration
@@ -896,7 +955,7 @@ public:
    * address on success.  Returns 0 if local TSS had already been
    * setup for this thread.  There is no corresponding tss_close ()
    * because it is not needed.
-   * NOTE: tss_open () is called by ACE for threads that it spawns.
+   * @note tss_open () is called by ACE for threads that it spawns.
    * If your application spawns threads without using ACE, and it uses
    * ACE's TSS emulation, each of those threads should call tss_open
    * ().  See the ace_thread_adapter () implementation for an example.
@@ -1103,24 +1162,33 @@ private:
 #   define ACE_KEY_INDEX(OBJ,KEY) u_int OBJ = KEY
 # endif /* ACE_HAS_NONSCALAR_THREAD_KEY_T */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# define ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_mutex_lock_cleanup_adapter)
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
 # if defined (ACE_HAS_THR_C_FUNC)
 // This is necessary to work around nasty problems with MVS C++.
-extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args);
-#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A);
+extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args);
+#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A);
 #   define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A)
 # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP)
 // Though we are defining a extern "C" function to match the prototype of
 // pthread_cleanup_push, it is undone by the Solaris header file
 // /usr/include/pthread.h. So this macro generates a warning under Solaris
 // with SunCC. This is a bug in the Solaris header file.
-extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args);
-#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A);
+extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args);
+#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A);
 #   define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A)
 # else
 #   define ACE_PTHREAD_CLEANUP_PUSH(A)
 #   define ACE_PTHREAD_CLEANUP_POP(A)
 # endif /* ACE_HAS_THR_C_FUNC */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if !defined (ACE_WIN32)
 // forward decl's
 class ACE_event_t;
@@ -1661,7 +1729,40 @@ namespace ACE_OS {
                 ACE_THR_FUNC_RETURN *status);
 
   /**
-   * @note the "inst" arge is deprecated.  It will be ignored.
+   * Get the thread affinity
+   *
+   * @param thr_id For NPTL-threads, when ACE_HAS_PTHREAD_SETAFFINITY_NP
+   * defined, this is the thread-id. For linux-threads, when
+   * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for
+   * linux-threads a thread is seen as a process, it does the job.
+   * @param cpu_set_size The size of the cpu_mask
+   * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the
+   * thread to the "CPU 0", etc
+   */
+  extern ACE_Export
+  int thr_get_affinity (ACE_hthread_t id,
+                        size_t cpu_set_size,
+                        cpu_set_t * cpu_mask);
+
+
+  /**
+   * Set the thread affinity
+   *
+   * @param thr_id For NPTL-threads, when ACE_HAS_PTHREAD_SETAFFINITY_NP
+   * defined, this is the thread-id. For linux-threads, when
+   * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for
+   * linux-threads a thread is seen as a process, it does the job.
+   * @param cpu_set_size The size of the cpu_mask
+   * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the
+   * thread to the "CPU 0", etc
+   */
+  extern ACE_Export
+  int thr_set_affinity (ACE_hthread_t thr_id,
+                        size_t cpu_set_size,
+                        const cpu_set_t * cpu_mask);
+
+  /**
+   * @note the "inst" arg is deprecated.  It will be ignored.
    */
   extern ACE_Export
   int thr_key_detach (ACE_thread_key_t key, void * inst);
@@ -1823,6 +1924,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if !defined (ACE_WIN32)
 
 extern "C"
@@ -1871,6 +1974,8 @@ extern "C"
   } ACE_eventdata_t;
 }
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_event_t
  *
@@ -1907,10 +2012,14 @@ protected:
 #endif
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_OS_Thread_Mutex_Guard
  *
@@ -2003,6 +2112,8 @@ protected:
     const ACE_OS_Recursive_Thread_Mutex_Guard &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // used in time and unistd
 # define ACE_OS_GUARD \
   ACE_OS_Thread_Mutex_Guard ace_os_guard__ (*(ACE_thread_mutex_t *) \
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index d81b0c88966..581e5166ee5 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -23,6 +23,8 @@
 #  include /**/ <sys/priocntl.h>
 #endif /* ACE_HAS_PRIOCNTL */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*****************************************************************************/
 
 #if defined (ACE_LACKS_COND_T) && defined (ACE_HAS_THREADS)
@@ -42,7 +44,7 @@ ACE_INLINE
 void **&
 ACE_TSS_Emulation::tss_base ()
 {
-#    if defined (VXWORKS)
+#    if defined (ACE_VXWORKS)
   return (void **&) taskIdCurrent->ACE_VXWORKS_SPARE;
 #    elif defined (ACE_PSOS)
   // not supported
@@ -51,7 +53,7 @@ ACE_TSS_Emulation::tss_base ()
 #    else
   // Uh oh.
   ACE_NOTSUP_RETURN (0);
-#    endif /* VXWORKS */
+#    endif /* ACE_VXWORKS */
 }
 #  endif /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
@@ -83,7 +85,7 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key)
   t_getreg (0, PSOS_TASK_REG_TSS, &tss_base);
   return ((void **) tss_base)[key_index];
 #  else
-#    if defined (VXWORKS)
+#    if defined (ACE_VXWORKS)
     /* If someone wants tss_base make sure they get one.  This
        gets used if someone spawns a VxWorks task directly, not
        through ACE.  The allocated array will never be deleted! */
@@ -116,10 +118,10 @@ ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2)
 {
 #if defined (ACE_HAS_PTHREADS)
 # if defined (pthread_equal)
-  // If it's a macro we can't say "::pthread_equal"...
+  // If it's a macro we can't say "pthread_equal"...
   return pthread_equal (t1, t2);
 # else
-  return ::pthread_equal (t1, t2);
+  return pthread_equal (t1, t2);
 # endif /* pthread_equal */
 #elif defined (VXWORKS)
   return ! ACE_OS::strcmp (t1, t2);
@@ -143,9 +145,9 @@ ACE_OS::condattr_destroy (ACE_condattr_t &attributes)
 #   if defined (ACE_HAS_PTHREADS)
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4)
-  ::pthread_condattr_delete (&attributes);
+  pthread_condattr_delete (&attributes);
 #     else
-  ::pthread_condattr_destroy (&attributes);
+  pthread_condattr_destroy (&attributes);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
 #   elif defined (ACE_HAS_STHREADS)
@@ -173,20 +175,20 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes,
 
   if (
 #     if defined  (ACE_HAS_PTHREADS_DRAFT4)
-      ::pthread_condattr_create (&attributes) == 0
+      pthread_condattr_create (&attributes) == 0
 #     elif defined (ACE_HAS_PTHREADS_STD) || defined (ACE_HAS_PTHREADS_DRAFT7)
-      ACE_ADAPT_RETVAL(::pthread_condattr_init (&attributes), result) == 0
+      ACE_ADAPT_RETVAL (pthread_condattr_init (&attributes), result) == 0
 #       if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)
-      && ACE_ADAPT_RETVAL(::pthread_condattr_setpshared (&attributes, type),
-                          result) == 0
+      && ACE_ADAPT_RETVAL (pthread_condattr_setpshared (&attributes, type),
+                           result) == 0
 #       endif /* _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_CONDATTR_PSHARED */
 #     else  /* this is draft 6 */
-      ::pthread_condattr_init (&attributes) == 0
+      pthread_condattr_init (&attributes) == 0
 #       if !defined (ACE_LACKS_CONDATTR_PSHARED)
-      && ::pthread_condattr_setpshared (&attributes, type) == 0
+      && pthread_condattr_setpshared (&attributes, type) == 0
 #       endif /* ACE_LACKS_CONDATTR_PSHARED */
 #       if defined (ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP)
-      && ::pthread_condattr_setkind_np (&attributes, type) == 0
+      && pthread_condattr_setkind_np (&attributes, type) == 0
 #       endif /* ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
       )
@@ -229,10 +231,10 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv)
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_cond_broadcast (cv), int, -1);
+  ACE_OSCALL_RETURN (pthread_cond_broadcast (cv), int, -1);
 #     else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_cond_broadcast (cv),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv),
                                        result),
                      int, -1);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
@@ -259,10 +261,10 @@ ACE_OS::cond_destroy (ACE_cond_t *cv)
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_cond_destroy (cv), int, -1);
+  ACE_OSCALL_RETURN (pthread_cond_destroy (cv), int, -1);
 #     else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_cond_destroy (cv), result), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int, -1);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
   int result;
@@ -293,11 +295,11 @@ ACE_OS::cond_init (ACE_cond_t *cv,
 
   if (
 #     if defined  (ACE_HAS_PTHREADS_DRAFT4)
-      ::pthread_cond_init (cv, attributes) == 0
+      pthread_cond_init (cv, attributes) == 0
 #     elif defined (ACE_HAS_PTHREADS_STD) || defined (ACE_HAS_PTHREADS_DRAFT7)
-      ACE_ADAPT_RETVAL(::pthread_cond_init (cv, &attributes), result) == 0
+      ACE_ADAPT_RETVAL (pthread_cond_init (cv, &attributes), result) == 0
 #     else  /* this is draft 6 */
-      ::pthread_cond_init (cv, &attributes) == 0
+      pthread_cond_init (cv, &attributes) == 0
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
       )
      result = 0;
@@ -351,10 +353,10 @@ ACE_OS::cond_signal (ACE_cond_t *cv)
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_cond_signal (cv), int, -1);
+  ACE_OSCALL_RETURN (pthread_cond_signal (cv), int, -1);
 #     else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_cond_signal (cv), result),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result),
                      int, -1);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
@@ -379,10 +381,10 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_cond_wait (cv, external_mutex), int, -1);
+  ACE_OSCALL_RETURN (pthread_cond_wait (cv, external_mutex), int, -1);
 #     else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_cond_wait (cv, external_mutex), result),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result),
                      int, -1);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
@@ -419,12 +421,12 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
   if (timeout == 0)
-    ACE_OSCALL (::pthread_cond_wait (cv, external_mutex),
+    ACE_OSCALL (pthread_cond_wait (cv, external_mutex),
                 int, -1, result);
   else
     {
 
-#     if defined (__Lynx__)
+#     if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR == 3) && (ACE_LYNXOS_MINOR == 0)
       // Note that we must convert between absolute time (which is
       // passed as a parameter) and relative time (which is what the
       // LynxOS pthread_cond_timedwait expects).  This differs from 1003.4a
@@ -432,20 +434,20 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
 
       timespec_t relative_time = *timeout - ACE_OS::gettimeofday ();
 
-      ACE_OSCALL (::pthread_cond_timedwait (cv, external_mutex,
+      ACE_OSCALL (pthread_cond_timedwait (cv, external_mutex,
                                             &relative_time),
                   int, -1, result);
 #     else
-      ACE_OSCALL (::pthread_cond_timedwait (cv, external_mutex,
+      ACE_OSCALL (pthread_cond_timedwait (cv, external_mutex,
                                             (ACE_TIMESPEC_PTR) &ts),
                   int, -1, result);
-#     endif /* __Lynx__ */
+#     endif /* ACE_LYNXOS_MAJOR ... */
     }
 
 #     else
   ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0
-                                ? ::pthread_cond_wait (cv, external_mutex)
-                                : ::pthread_cond_timedwait (cv, external_mutex,
+                                ? pthread_cond_wait (cv, external_mutex)
+                                : pthread_cond_timedwait (cv, external_mutex,
                                                             (ACE_TIMESPEC_PTR) &ts),
                                 result),
               int, -1, result);
@@ -589,9 +591,26 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m,
   // need to release the lock one fewer times than this thread has acquired
   // it. Remember how many times, and reacquire it that many more times when
   // the condition is signaled.
+  //
+  // For WinCE, the situation is a bit trickier. CE doesn't have
+  // RecursionCount, and LockCount is not an indicator of recursion on WinCE;
+  // instead, see when it's unlocked by watching the OwnerThread, which will
+  // change to something other than the current thread when it's been
+  // unlocked "enough" times. Note that checking for 0 (unlocked) is not
+  // sufficient. Another thread may acquire the lock between our unlock and
+  // checking the OwnerThread. So grab our thread ID value first, then
+  // compare to it in the loop condition.
+#      if defined (ACE_HAS_WINCE)
+  ACE_thread_t me = ACE_OS::thr_self ();
+#      endif /* ACE_HAS_WINCE */
+
   state.relock_count_ = 0;
   while (m->LockCount > 0
-#      if !defined (ACE_HAS_WINCE)    /* WinCE doesn't have RecursionCount */
+#      if defined (ACE_HAS_WINCE)
+         // Although this is a thread ID, OwnerThread's type is HANDLE.
+         // Not sure if this is a problem, but it appears to work.
+         && m->OwnerThread == (HANDLE)me
+#      else
          && m->RecursionCount > 1
 #      endif
          )
@@ -1292,7 +1311,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
   int status;
   pthread_rwlockattr_t attr;
   pthread_rwlockattr_init (&attr);
-#    if !defined(ACE_LACKS_RWLOCKATTR_PSHARED)
+#    if !defined (ACE_LACKS_RWLOCKATTR_PSHARED)
   pthread_rwlockattr_setpshared (&attr, (type == USYNC_THREAD ?
                                          PTHREAD_PROCESS_PRIVATE :
                                          PTHREAD_PROCESS_SHARED));
@@ -1319,6 +1338,10 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
   ACE_OS_TRACE ("ACE_OS::sema_destroy");
 # if defined (ACE_HAS_POSIX_SEM)
   int result;
+#   if !defined (ACE_HAS_POSIX_SEM_TIMEOUT)
+  ACE_OS::mutex_destroy (&s->lock_);
+  ACE_OS::cond_destroy (&s->count_nonzero_);
+#   endif /* !ACE_HAS_POSIX_SEM_TIMEOUT */
 #   if defined (ACE_LACKS_NAMED_POSIX_SEM)
   if (s->name_)
     {
@@ -1406,11 +1429,31 @@ ACE_OS::sema_init (ACE_sema_t *s,
 {
   ACE_OS_TRACE ("ACE_OS::sema_init");
 #if defined (ACE_HAS_POSIX_SEM)
-  ACE_UNUSED_ARG (arg);
   ACE_UNUSED_ARG (max);
   ACE_UNUSED_ARG (sa);
 
   s->name_ = 0;
+#  if defined (ACE_HAS_POSIX_SEM_TIMEOUT)
+  ACE_UNUSED_ARG (arg);
+#  else
+  int result = -1;
+
+  if (ACE_OS::mutex_init (&s->lock_, type, name,
+                          (ACE_mutexattr_t *) arg) == 0
+      && ACE_OS::cond_init (&s->count_nonzero_, (short)type, name, arg) == 0
+      && ACE_OS::mutex_lock (&s->lock_) == 0)
+    {
+      if (ACE_OS::mutex_unlock (&s->lock_) == 0)
+        result = 0;
+    }
+
+  if (result == -1)
+    {
+      ACE_OS::mutex_destroy (&s->lock_);
+      ACE_OS::cond_destroy (&s->count_nonzero_);
+      return result;
+    }
+#  endif /* ACE_HAS_POSIX_SEM_TIMEOUT */
 
 #  if defined (ACE_LACKS_NAMED_POSIX_SEM)
   s->new_sema_ = 0;
@@ -1540,7 +1583,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_stat fs;
       if (ACE_OS::stat (name, &fs))
         return -1;
-      if (!S_ISFIFO(fs.st_mode))
+      if (!S_ISFIFO (fs.st_mode))
         {
           // existing file is not a FIFO
           errno = EEXIST;
@@ -1565,23 +1608,23 @@ ACE_OS::sema_init (ACE_sema_t *s,
 
   if ((s->fd_[0] = ACE_OS::open (name, O_RDONLY | O_NONBLOCK)) == ACE_INVALID_HANDLE
       || (s->fd_[1] = ACE_OS::open (name, O_WRONLY | O_NONBLOCK)) == ACE_INVALID_HANDLE)
-    return(-1);
+    return (-1);
 
   /* turn off nonblocking for fd_[0] */
   if ((flags = ACE_OS::fcntl (s->fd_[0], F_GETFL, 0)) < 0)
-    return(-1);
+    return (-1);
 
   flags &= ~O_NONBLOCK;
   if (ACE_OS::fcntl (s->fd_[0], F_SETFL, flags) < 0)
-    return(-1);
+    return (-1);
 
   //if (s->name_ && count)
   if (creator && count)
     {
       char    c = 1;
-      for(u_int i=0; i<count ;++i)
-        if (ACE_OS::write (s->fd_[1], &c, sizeof(char)) != 1)
-          return(-1);
+      for (u_int i=0; i<count ;++i)
+        if (ACE_OS::write (s->fd_[1], &c, sizeof (char)) != 1)
+          return (-1);
     }
 
   // In the case of processscope semaphores we can already unlink the FIFO now that
@@ -1595,7 +1638,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_OS::unlink (name);
     }
 
-  return(0);
+  return (0);
 #elif defined (ACE_HAS_THREADS)
 #  if defined (ACE_HAS_STHREADS)
   ACE_UNUSED_ARG (name);
@@ -1783,12 +1826,25 @@ ACE_OS::sema_post (ACE_sema_t *s)
 {
   ACE_OS_TRACE ("ACE_OS::sema_post");
 # if defined (ACE_HAS_POSIX_SEM)
+#   if defined (ACE_HAS_POSIX_SEM_TIMEOUT)
   ACE_OSCALL_RETURN (::sem_post (s->sema_), int, -1);
+#   else
+  int result = -1;
+
+  if (ACE_OS::mutex_lock (&s->lock_) == 0)
+    {
+      if (::sem_post (s->sema_) == 0)
+        result = ACE_OS::cond_signal (&s->count_nonzero_);
+
+      ACE_OS::mutex_unlock (&s->lock_);
+    }
+  return result;
+#   endif /* ACE_HAS_POSIX_SEM_TIMEOUT */
 # elif defined (ACE_USES_FIFO_SEM)
   char    c = 1;
-  if (ACE_OS::write (s->fd_[1], &c, sizeof(char)) == sizeof(char))
-    return(0);
-  return(-1);
+  if (ACE_OS::write (s->fd_[1], &c, sizeof (char)) == sizeof (char))
+    return (0);
+  return (-1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   int result;
@@ -1881,13 +1937,13 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
 
   /* turn on nonblocking for s->fd_[0] */
   if ((flags = ACE_OS::fcntl (s->fd_[0], F_GETFL, 0)) < 0)
-    return(-1);
+    return (-1);
   flags |= O_NONBLOCK;
   if (ACE_OS::fcntl (s->fd_[0], F_SETFL, flags) < 0)
-    return(-1);
+    return (-1);
 
   // read sets errno to EAGAIN if no input
-  rc = ACE_OS::read (s->fd_[0], &c, sizeof(char));
+  rc = ACE_OS::read (s->fd_[0], &c, sizeof (char));
 
   /* turn off nonblocking for fd_[0] */
   if ((flags = ACE_OS::fcntl (s->fd_[0], F_GETFL, 0)) >= 0)
@@ -2011,9 +2067,9 @@ ACE_OS::sema_wait (ACE_sema_t *s)
   ACE_OSCALL_RETURN (::sem_wait (s->sema_), int, -1);
 # elif defined (ACE_USES_FIFO_SEM)
   char c;
-  if (ACE_OS::read (s->fd_[0], &c, sizeof(char)) == 1)
-    return(0);
-  return(-1);
+  if (ACE_OS::read (s->fd_[0], &c, sizeof (char)) == 1)
+    return (0);
+  return (-1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   int result;
@@ -2131,9 +2187,52 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
     errno = ETIME;  /* POSIX returns ETIMEDOUT but we need ETIME */
   return rc;
 #   else
-  ACE_UNUSED_ARG (s);
-  ACE_UNUSED_ARG (tv);
-  ACE_NOTSUP_RETURN (-1);
+  int result = 0;
+  bool expired = false;
+  ACE_Errno_Guard error (errno);
+
+  ACE_PTHREAD_CLEANUP_PUSH (&s->lock_);
+
+  if (ACE_OS::mutex_lock (&s->lock_) != 0)
+    result = -2;
+  else
+    {
+      bool finished = true;
+      do
+      {
+        result = ACE_OS::sema_trywait (s);
+        if (result == -1 && errno == EAGAIN)
+          expired = ACE_OS::gettimeofday () > tv;
+        else
+          expired = false;
+
+        finished = result != -1 || expired ||
+                   (result == -1 && errno != EAGAIN);
+        if (!finished)
+          {
+            if (ACE_OS::cond_timedwait (&s->count_nonzero_,
+                                        &s->lock_,
+                                        &tv) == -1)
+              {
+                error = errno;
+                result = -1;
+                break;
+              }
+          }
+      } while (!finished);
+
+      if (expired)
+        error = ETIME;
+
+#     if defined (ACE_LACKS_COND_TIMEDWAIT_RESET)
+      tv = ACE_OS::gettimeofday ();
+#     endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */
+    }
+
+  if (result != -2)
+    ACE_OS::mutex_unlock (&s->lock_);
+  ACE_PTHREAD_CLEANUP_POP (0);
+  return result < 0 ? -1 : result;
 #   endif /* !ACE_HAS_POSIX_SEM_TIMEOUT */
 # elif defined (ACE_USES_FIFO_SEM)
   int rc;
@@ -2158,7 +2257,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
         }
 
       // try to read the signal *but* do *not* block
-      if (rc == 1 && ACE_OS::sema_trywait(s) == 0)
+      if (rc == 1 && ACE_OS::sema_trywait (s) == 0)
         return (0);
 
       // we were woken for input but someone beat us to it
@@ -2169,7 +2268,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
   // make sure errno is set right
   errno = ETIME;
 
-  return(-1);
+  return (-1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   ACE_UNUSED_ARG (s);
@@ -2319,14 +2418,14 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
   // the system call expects).
   ACE_Time_Value relative_time (tv - ACE_OS::gettimeofday ());
 
-  u_long ticks = relative_time.sec() * KC_TICKS2SEC +
+  u_long ticks = relative_time.sec () * KC_TICKS2SEC +
                  relative_time.usec () * KC_TICKS2SEC /
                    ACE_ONE_SECOND_IN_USECS;
-  if(ticks == 0)
+  if (ticks == 0)
     ACE_OSCALL_RETURN (::sm_p (s->sema_, SM_NOWAIT, 0), int, -1); //no timeout
   else
     ACE_OSCALL_RETURN (::sm_p (s->sema_, SM_WAIT, ticks), int, -1);
-#   elif defined (VXWORKS)
+#   elif defined (ACE_VXWORKS)
   // Note that we must convert between absolute time (which is
   // passed as a parameter) and relative time (which is what
   // the system call expects).
@@ -2334,7 +2433,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 
   int ticks_per_sec = ::sysClkRateGet ();
 
-  int ticks = relative_time.sec() * ticks_per_sec +
+  int ticks = relative_time.sec () * ticks_per_sec +
               relative_time.usec () * ticks_per_sec / ACE_ONE_SECOND_IN_USECS;
   if (::semTake (s->sema_, ticks) == ERROR)
     {
@@ -2451,7 +2550,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
     ACE_UNUSED_ARG (sset);
     ACE_NOTSUP_RETURN (-1);
 # elif defined (ACE_HAS_STHREADS)
-   # if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+   # if (_POSIX_C_SOURCE - 0 >= 199506L) || defined (_POSIX_PTHREAD_SEMANTICS)
      errno = ::sigwait (sset, sig);
      return errno == 0  ?  *sig  :  -1;
    #else
@@ -2473,20 +2572,20 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
       errno = ::_Psigwait (sset, sig);
       return errno == 0  ?  *sig  :  -1;
 #   else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */
-#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || (defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined(ACE_HAS_FSU_PTHREADS)) || (defined (_UNICOS) && _UNICOS == 9)
+#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || (defined (ACE_HAS_PTHREADS_DRAFT6)) && !defined (ACE_HAS_FSU_PTHREADS)) || (defined (_UNICOS) && _UNICOS == 9)
 #       if defined (HPUX_10)
         *sig = cma_sigwait (sset);
 #       else
         *sig = ::sigwait (sset);
 #       endif  /* HPUX_10 */
         return *sig;
-#     elif defined(ACE_HAS_FSU_PTHREADS)
+#     elif defined (ACE_HAS_FSU_PTHREADS)
         return ::sigwait (sset, sig);
-#     elif defined(CYGWIN32)
+#     elif defined (CYGWIN32)
         // Cygwin has sigwait definition, but it is not implemented
         ACE_UNUSED_ARG (sset);
         ACE_NOTSUP_RETURN (-1);
-#     elif defined(ACE_TANDEM_T1248_PTHREADS)
+#     elif defined (ACE_TANDEM_T1248_PTHREADS)
         errno = ::spt_sigwait (sset, sig);
         return errno == 0  ?  *sig  :  -1;
 #     else   /* this is draft 7 or std */
@@ -2535,12 +2634,24 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id)
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_cancel (thr_id), int, -1);
+#     ifdef pthread_cancel
+        // If it's a macro we can't say "pthread_cancel"...
+        ACE_OSCALL_RETURN (pthread_cancel (thr_id), int, -1);
+#     else
+        ACE_OSCALL_RETURN (pthread_cancel (thr_id), int, -1);
+#     endif /* pthread_cancel */
 #   else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_cancel (thr_id),
-                                       result),
-                     int, -1);
+#     ifdef pthread_cancel
+        // If it's a macro we can't say "pthread_cancel"...
+        ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id),
+                                             result),
+                           int, -1);
+#     else
+        ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id),
+                                             result),
+                           int, -1);
+#     endif /* pthread_cancel */
 #   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (VXWORKS)
   ACE_hthread_t tid;
@@ -2565,10 +2676,10 @@ ACE_OS::thr_cmp (ACE_hthread_t t1, ACE_hthread_t t2)
 {
 #if defined (ACE_HAS_PTHREADS)
 # if defined (pthread_equal)
-  // If it's a macro we can't say "::pthread_equal"...
+  // If it's a macro we can't say "pthread_equal"...
   return pthread_equal (t1, t2);
 # else
-  return ::pthread_equal (t1, t2);
+  return pthread_equal (t1, t2);
 # endif /* pthread_equal */
 #else /* For STHREADS, WTHREADS, and VXWORKS ... */
   // Hum, Do we need to treat WTHREAD differently?
@@ -2631,7 +2742,7 @@ ACE_OS::thr_getconcurrency (void)
 # if defined (ACE_HAS_STHREADS)
   return ::thr_getconcurrency ();
 # elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_GETCONCURRENCY)
-  return ::pthread_getconcurrency ();
+  return pthread_getconcurrency ();
 # else
   ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_STHREADS */
@@ -2651,7 +2762,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
 
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
   int result;
-  result = ::pthread_getprio (ht_id);
+  result = pthread_getprio (ht_id);
   if (result != -1)
     {
       priority = result;
@@ -2664,7 +2775,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
   pthread_attr_t  attr;
   if (pthread_getschedattr (ht_id, &attr) == 0)
     {
-      priority = pthread_attr_getprio(&attr);
+      priority = pthread_attr_getprio (&attr);
       return 0;
     }
   return -1;
@@ -2673,7 +2784,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
   struct sched_param param;
   int result;
 
-  ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_getschedparam (ht_id, &policy, &param),
+  ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, &param),
                                 result), int,
               -1, result);
   priority = param.sched_priority;
@@ -2687,7 +2798,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
 
   priority = ::GetThreadPriority (ht_id);
 
-  DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess());
+  DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ());
   if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR)
     ACE_FAIL_RETURN (-1);
 
@@ -2790,8 +2901,12 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
         *data = ACE_TSS_Emulation::ts_object (key);
         return 0;
       }
-# else /* ACE_HAS_TSS_EMULATION */
+# elif defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
   return ACE_OS::thr_getspecific_native (key, data);
+#else
+  ACE_UNUSED_ARG (key);
+  ACE_UNUSED_ARG (data);
+  ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_TSS_EMULATION */
 #else
   ACE_UNUSED_ARG (key);
@@ -2816,11 +2931,11 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
   int ace_result;
 #     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
   void *temp;
-  ACE_OSCALL (::pthread_join (thr_handle,
+  ACE_OSCALL (pthread_join (thr_handle,
                               status == 0  ?  &temp  :  status),
               int, -1, ace_result);
 #     else
-  ACE_OSCALL (::pthread_join (thr_handle, status), int, -1, ace_result);
+  ACE_OSCALL (pthread_join (thr_handle, status), int, -1, ace_result);
 #     endif /* ACE_LACKS_NULL_PTHREAD_STATUS */
   // Joinable threads need to be detached after joining on Pthreads
   // draft 4 (at least) to reclaim thread storage.
@@ -2831,9 +2946,9 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
   // a junker to scribble on.
   ACE_thread_t  junker;
   cma_handle_assign (&thr_handle, &junker);
-  ::pthread_detach (&junker);
+  pthread_detach (&junker);
 #       else
-  ::pthread_detach (&thr_handle);
+  pthread_detach (&thr_handle);
 #       endif  /* HPUX_10 */
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
@@ -2841,7 +2956,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
 
 #   else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (thr_handle, status), result),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (thr_handle, status), result),
                      int, -1);
 #   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
 # elif defined (ACE_HAS_WTHREADS)
@@ -2891,14 +3006,14 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
 #     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
   void *temp;
-  ACE_OSCALL_RETURN (::pthread_join (waiter_id,
+  ACE_OSCALL_RETURN (pthread_join (waiter_id,
     status == 0  ?  &temp  :  status), int, -1);
 #     else
-  ACE_OSCALL_RETURN (::pthread_join (waiter_id, status), int, -1);
+  ACE_OSCALL_RETURN (pthread_join (waiter_id, status), int, -1);
 #     endif
 #   else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (waiter_id, status), result),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (waiter_id, status), result),
                      int, -1);
 #   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
 # elif defined (ACE_HAS_WTHREADS)
@@ -2930,13 +3045,13 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
   ACE_OS_TRACE ("ACE_OS::thr_kill");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined(ACE_LACKS_PTHREAD_KILL)
+#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_LACKS_PTHREAD_KILL)
   ACE_UNUSED_ARG (signum);
   ACE_UNUSED_ARG (thr_id);
   ACE_NOTSUP_RETURN (-1);
 #   else
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_kill (thr_id, signum),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_kill (thr_id, signum),
                                        result),
                      int, -1);
 #   endif /* ACE_HAS_PTHREADS_DRAFT4 */
@@ -3078,11 +3193,11 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state)
   *old_state = old;
   return 0;
 #   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_UNUSED_ARG(old_state);
+  ACE_UNUSED_ARG (old_state);
   ACE_OSCALL_RETURN (pthread_setintr (new_state), int, -1);
 #   else /* this is draft 7 or std */
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setcancelstate (new_state,
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setcancelstate (new_state,
                                                                  old_state),
                                        result),
                      int, -1);
@@ -3115,17 +3230,17 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
   int old;
-  old = pthread_setasynccancel(new_type);
+  old = pthread_setasynccancel (new_type);
   if (old == -1)
     return -1;
   *old_type = old;
   return 0;
 #   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_UNUSED_ARG(old_type);
+  ACE_UNUSED_ARG (old_type);
   ACE_OSCALL_RETURN (pthread_setintrtype (new_type), int, -1);
 #   else /* this is draft 7 or std */
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setcanceltype (new_type,
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setcanceltype (new_type,
                                                                 old_type),
                                        result),
                      int, -1);
@@ -3154,9 +3269,9 @@ ACE_OS::thr_setconcurrency (int hint)
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY)
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setconcurrency (hint),
-				       result),
-		     int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint),
+                                       result),
+                     int, -1);
 # else
   ACE_UNUSED_ARG (hint);
   ACE_NOTSUP_RETURN (-1);
@@ -3178,7 +3293,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
 
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
   int result;
-  result = ::pthread_setprio (ht_id, priority);
+  result = pthread_setprio (ht_id, priority);
   return (result == -1 ? -1 : 0);
 #   elif defined (ACE_HAS_PTHREADS_DRAFT6)
   pthread_attr_t  attr;
@@ -3197,7 +3312,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
   // pthread_getschedparam().
   if (policy == -1)
     {
-      ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_getschedparam (ht_id, &policy, &param),
+      ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, &param),
                                     result),
                   int, -1, result);
       if (result == -1)
@@ -3206,7 +3321,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
 
   param.sched_priority = priority;
 
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setschedparam (ht_id,
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setschedparam (ht_id,
                                                                 policy,
                                                                 &param),
                                        result),
@@ -3271,7 +3386,7 @@ ACE_OS::thr_sigsetmask (int how,
   // Draft 4 and 6 implementations will sometimes have a sigprocmask () that
   // modifies the calling thread's mask only.  If this is not so for your
   // platform, define ACE_LACKS_PTHREAD_THR_SIGSETMASK.
-#   elif defined(ACE_HAS_PTHREADS_DRAFT4) || \
+#   elif defined (ACE_HAS_PTHREADS_DRAFT4) || \
     defined (ACE_HAS_PTHREADS_DRAFT6) || (defined (_UNICOS) && _UNICOS == 9)
   ACE_OSCALL_RETURN (::sigprocmask (how, nsm, osm), int, -1);
 #   elif !defined (ACE_LACKS_PTHREAD_SIGMASK)
@@ -3284,7 +3399,7 @@ ACE_OS::thr_sigsetmask (int how,
   /* Don't know if anyt platform actually needs this... */
   // as far as I can tell, this is now pthread_sigaction() -- jwr
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigaction (how, nsm, osm),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_sigaction (how, nsm, osm),
                                        result), int, -1);
 #endif /* 0 */
 
@@ -3382,9 +3497,9 @@ ACE_OS::thr_testcancel (void)
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #if defined(ACE_HAS_PTHREADS_DRAFT6)
-  ::pthread_testintr ();
+  pthread_testintr ();
 #else /* ACE_HAS_PTHREADS_DRAFT6 */
-  ::pthread_testcancel ();
+  pthread_testcancel ();
 #endif /* !ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_STHREADS)
 # elif defined (ACE_HAS_WTHREADS)
@@ -3406,9 +3521,9 @@ ACE_OS::thr_yield (void)
   // Note - this is a POSIX.4 function - not a POSIX.1c function...
   ::sched_yield ();
 #   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ::pthread_yield (0);
+  pthread_yield (0);
 #   else    /* Draft 4 and 7 */
-  ::pthread_yield ();
+  pthread_yield ();
 #   endif  /* ACE_HAS_PTHREADS_STD */
 # elif defined (ACE_HAS_STHREADS)
   ::thr_yield ();
@@ -3760,3 +3875,5 @@ ACE_Thread_ID::operator!= (const ACE_Thread_ID &rhs) const
 {
   return !(*this == rhs);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_arpa_inet.cpp b/ace/OS_NS_arpa_inet.cpp
index 6d6ffaeb0ee..94c54edfe4f 100644
--- a/ace/OS_NS_arpa_inet.cpp
+++ b/ace/OS_NS_arpa_inet.cpp
@@ -9,6 +9,8 @@ ACE_RCSID(ace, OS_NS_arpa_inet, "$Id$")
 # include "ace/OS_NS_arpa_inet.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
 {
@@ -34,7 +36,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
       addr->s_addr = ip_addr;  // Network byte ordered
       return 1;
     }
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x620)
   // inet_aton() returns OK (0) on success and ERROR (-1) on failure.
   // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026
   ::errnoSet(0);
@@ -66,3 +68,5 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
   return addrstr;
 }
 #endif /* defined (ACE_PSOS) */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_arpa_inet.h b/ace/OS_NS_arpa_inet.h
index b6032d61338..9b7a7028975 100644
--- a/ace/OS_NS_arpa_inet.h
+++ b/ace/OS_NS_arpa_inet.h
@@ -33,6 +33,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -62,6 +64,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_arpa_inet.inl b/ace/OS_NS_arpa_inet.inl
index 31a6b9a3f34..b81b2c88059 100644
--- a/ace/OS_NS_arpa_inet.inl
+++ b/ace/OS_NS_arpa_inet.inl
@@ -5,6 +5,8 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE unsigned long
 ACE_OS::inet_addr (const char *name)
 {
@@ -119,3 +121,5 @@ ACE_OS::inet_pton (int family, const char *strptr, void *addrptr)
   ACE_NOTSUP_RETURN(-1);
 #endif  /* ACE_HAS_IPV6 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h
index e9c04c00311..cb1719ee9c6 100644
--- a/ace/OS_NS_ctype.h
+++ b/ace/OS_NS_ctype.h
@@ -32,8 +32,9 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS
-{
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS {
 
   // these are non-standard names...
 
@@ -111,6 +112,8 @@ namespace ACE_OS
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl
index e0235d5285d..dbda1f48c2b 100644
--- a/ace/OS_NS_ctype.inl
+++ b/ace/OS_NS_ctype.inl
@@ -1,9 +1,13 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/os_include/os_ctype.h"
 #include "ace/os_include/os_wctype.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
 ACE_INLINE int
 ACE_OS::ace_tolower (int c)
 {
@@ -38,3 +42,5 @@ ACE_OS::ace_towupper (wint_t c)
   #endif
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_dirent.cpp b/ace/OS_NS_dirent.cpp
index 57446ce5364..9b58d284683 100644
--- a/ace/OS_NS_dirent.cpp
+++ b/ace/OS_NS_dirent.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_dirent.h"
@@ -42,6 +41,8 @@ extern "C"
 #  endif /* INVALID_SET_FILE_POINTER */
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_OS::closedir_emulation (ACE_DIR *d)
 {
@@ -121,7 +122,7 @@ ACE_OS::opendir_emulation (const ACE_TCHAR *filename)
 #endif /* WIN32 && ACE_LACKS_OPENDIR */
 }
 
-dirent *
+struct ACE_DIRENT *
 ACE_OS::readdir_emulation (ACE_DIR *d)
 {
 #if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR)
@@ -152,8 +153,8 @@ ACE_OS::readdir_emulation (ACE_DIR *d)
 
   if (d->current_handle_ != INVALID_HANDLE_VALUE)
     {
-      d->dirent_ = (dirent *)
-        ACE_OS::malloc (sizeof (dirent));
+      d->dirent_ = (ACE_DIRENT *)
+        ACE_OS::malloc (sizeof (ACE_DIRENT));
 
       if (d->dirent_ != 0)
         {
@@ -161,7 +162,7 @@ ACE_OS::readdir_emulation (ACE_DIR *d)
             ACE_OS::malloc ((ACE_OS::strlen (d->fdata_.cFileName) + 1)
                             * sizeof (ACE_TCHAR));
           ACE_OS::strcpy (d->dirent_->d_name, d->fdata_.cFileName);
-          d->dirent_->d_reclen = sizeof (dirent);
+          d->dirent_->d_reclen = sizeof (ACE_DIRENT);
         }
 
       return d->dirent_;
@@ -176,10 +177,10 @@ ACE_OS::readdir_emulation (ACE_DIR *d)
 
 int
 ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
-                           dirent **namelist[],
-                           int (*selector) (const dirent *entry),
-                           int (*comparator) (const dirent **f1,
-                                              const dirent **f2))
+                           ACE_DIRENT **namelist[],
+                           int (*selector) (const ACE_DIRENT *entry),
+                           int (*comparator) (const ACE_DIRENT **f1,
+                                              const ACE_DIRENT **f2))
 {
   ACE_DIR *dirp = ACE_OS::opendir (dirname);
 
@@ -189,8 +190,8 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
   else if (namelist == 0)
     return -1;
 
-  dirent **vector = 0;
-  dirent *dp;
+  ACE_DIRENT **vector = 0;
+  ACE_DIRENT *dp = 0;
   int arena_size = 0;
 
   int nfiles = 0;
@@ -207,14 +208,14 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
       // If we get here, we have a dirent that the user likes.
       if (nfiles == arena_size)
         {
-          dirent **newv;
+          ACE_DIRENT **newv = 0;
           if (arena_size == 0)
             arena_size = 10;
           else
             arena_size *= 2;
 
-          newv = (dirent **) ACE_OS::realloc (vector,
-                                              arena_size * sizeof (dirent *));
+          newv = (ACE_DIRENT **) ACE_OS::realloc (vector,
+                                              arena_size * sizeof (ACE_DIRENT *));
           if (newv == 0)
             {
               fail = 1;
@@ -224,12 +225,12 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
         }
 
 #if defined (ACE_LACKS_STRUCT_DIR)
-      dirent *newdp = (dirent *) ACE_OS::malloc (sizeof (dirent));
+      ACE_DIRENT *newdp = (ACE_DIRENT *) ACE_OS::malloc (sizeof (ACE_DIRENT));
 #else
       size_t dsize =
-        sizeof (dirent) +
+        sizeof (ACE_DIRENT) +
         ((ACE_OS::strlen (dp->d_name) + 1) * sizeof (ACE_TCHAR));
-      dirent *newdp = (dirent *) ACE_OS::malloc (dsize);
+      ACE_DIRENT *newdp = (ACE_DIRENT *) ACE_OS::malloc (dsize);
 #endif /* ACE_LACKS_STRUCT_DIR */
 
       if (newdp == 0)
@@ -256,7 +257,7 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
       ACE_OS::strcpy (newdp->d_name, dp->d_name);
       vector[nfiles++] = newdp;
 #else
-      vector[nfiles++] = (dirent *) ACE_OS::memcpy (newdp, dp, dsize);
+      vector[nfiles++] = (ACE_DIRENT *) ACE_OS::memcpy (newdp, dp, dsize);
 #endif /* ACE_LACKS_STRUCT_DIR */
     }
 
@@ -281,8 +282,10 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
   if (comparator)
     ACE_OS::qsort (*namelist,
                    nfiles,
-                   sizeof (dirent *),
+                   sizeof (ACE_DIRENT *),
                    (ACE_SCANDIR_COMPARATOR) comparator);
 
   return nfiles;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_dirent.h b/ace/OS_NS_dirent.h
index c5bf0efd859..6def1696ac0 100644
--- a/ace/OS_NS_dirent.h
+++ b/ace/OS_NS_dirent.h
@@ -33,6 +33,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -42,22 +44,22 @@ namespace ACE_OS {
   ACE_DIR *opendir (const ACE_TCHAR *filename);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  dirent *readdir (ACE_DIR *);
+  struct ACE_DIRENT *readdir (ACE_DIR *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int readdir_r (ACE_DIR *dirp,
-                 struct dirent *entry,
-                 struct dirent **result);
+                 struct ACE_DIRENT *entry,
+                 struct ACE_DIRENT **result);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void rewinddir (ACE_DIR *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int scandir (const ACE_TCHAR *dirname,
-               struct dirent **namelist[],
-               int (*selector) (const struct dirent *filename),
-               int (*comparator) (const struct dirent **f1,
-                                  const struct dirent **f2));
+               struct ACE_DIRENT **namelist[],
+               int (*selector) (const struct ACE_DIRENT *filename),
+               int (*comparator) (const struct ACE_DIRENT **f1,
+                                  const struct ACE_DIRENT **f2));
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void seekdir (ACE_DIR *,
@@ -72,19 +74,21 @@ namespace ACE_OS {
 
   extern ACE_Export
   int scandir_emulation (const ACE_TCHAR *dirname,
-                         dirent **namelist[],
-                         int (*selector)(const dirent *entry),
-                         int (*comparator)(const dirent **f1,
-                                           const dirent**f2));
+                         ACE_DIRENT **namelist[],
+                         int (*selector)(const ACE_DIRENT *entry),
+                         int (*comparator)(const ACE_DIRENT **f1,
+                                           const ACE_DIRENT**f2));
 
   extern ACE_Export
   void closedir_emulation (ACE_DIR *);
 
   extern ACE_Export
-  dirent *readdir_emulation (ACE_DIR *);
+  struct ACE_DIRENT *readdir_emulation (ACE_DIR *);
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl
index 7d2b7bfb288..6864e7a949d 100644
--- a/ace/OS_NS_dirent.inl
+++ b/ace/OS_NS_dirent.inl
@@ -1,10 +1,16 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
+
 ACE_INLINE void
-ACE_OS::closedir (ACE_DIR *d)
+closedir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
 # if defined (ACE_PSOS)
@@ -20,6 +26,8 @@ ACE_OS::closedir (ACE_DIR *d)
   ACE_OS::closedir_emulation (d);
   delete [] d->directory_name_;
   delete d;
+#  elif defined (ACE_HAS_WCLOSEDIR) && defined (ACE_USES_WCHAR)
+  ::wclosedir (d);
 #   else /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
   ::closedir (d);
 #   endif /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
@@ -31,13 +39,13 @@ ACE_OS::closedir (ACE_DIR *d)
 }
 
 ACE_INLINE ACE_DIR *
-ACE_OS::opendir (const ACE_TCHAR *filename)
+opendir (const ACE_TCHAR *filename)
 {
 #if defined (ACE_HAS_DIRENT)
 #  if defined (ACE_PSOS)
   // The pointer to the <ACE_DIR> buffer *must* be passed to
   // <ACE_OS::closedir> to free it and avoid a memory leak.
-  ACE_DIR *dir;
+  ACE_DIR *dir = 0;
   u_long result;
   ACE_NEW_RETURN (dir, ACE_DIR, 0);
   result = ::open_dir (const_cast<ACE_TCHAR *> (filename), &dir->xdir);
@@ -51,6 +59,8 @@ ACE_OS::opendir (const ACE_TCHAR *filename)
 #  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR)
   return ::ACE_OS::opendir_emulation (filename);
+#  elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR)
+  return ::wopendir (filename);
 #    elif defined (ACE_HAS_NONCONST_OPENDIR)
   return ::opendir (const_cast<char *> (filename));
 #    else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */
@@ -63,8 +73,9 @@ ACE_OS::opendir (const ACE_TCHAR *filename)
 #endif /* ACE_HAS_DIRENT */
 }
 
-ACE_INLINE struct dirent *
-ACE_OS::readdir (ACE_DIR *d)
+ACE_INLINE
+struct ACE_DIRENT *
+readdir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
 #  if defined (ACE_PSOS)
@@ -81,6 +92,8 @@ ACE_OS::readdir (ACE_DIR *d)
 #  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR)
   return ACE_OS::readdir_emulation (d);
+#  elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR)
+  return ::wreaddir (d);
 #    else /* ACE_WIN32 && ACE_LACKS_READDIR */
   return ::readdir (d);
 #    endif /* ACE_WIN32 && ACE_LACKS_READDIR */
@@ -92,9 +105,9 @@ ACE_OS::readdir (ACE_DIR *d)
 }
 
 ACE_INLINE int
-ACE_OS::readdir_r (ACE_DIR *dirp,
-                   struct dirent *entry,
-                   struct dirent **result)
+readdir_r (ACE_DIR *dirp,
+                   struct ACE_DIRENT *entry,
+                   struct ACE_DIRENT **result)
 {
 #if !defined (ACE_HAS_REENTRANT_FUNCTIONS)
   ACE_UNUSED_ARG (entry);
@@ -123,7 +136,7 @@ ACE_OS::readdir_r (ACE_DIR *dirp,
     *result = entry;
     return ::readdir_r (dirp, entry);
 #elif defined(__GNUC__) && defined (_AIX)
-	return ::readdir_r (dirp, entry, result);
+        return ::readdir_r (dirp, entry, result);
 #    else
     // <result> had better not be 0!
     *result = ::readdir_r (dirp, entry);
@@ -140,12 +153,14 @@ ACE_OS::readdir_r (ACE_DIR *dirp,
 }
 
 ACE_INLINE void
-ACE_OS::rewinddir (ACE_DIR *d)
+rewinddir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
 # if defined (ACE_LACKS_SEEKDIR)
 #  if defined (ACE_LACKS_REWINDDIR)
   ACE_UNUSED_ARG (d);
+#  elif defined (ACE_HAS_WREWINDDIR) && defined (ACE_USES_WCHAR)
+   ::wrewinddir (d);
 #  else /* ! defined (ACE_LACKS_REWINDDIR) */
    ::rewinddir (d);
 #  endif /* ! defined (ACE_LACKS_REWINDDIR) */
@@ -160,11 +175,11 @@ ACE_OS::rewinddir (ACE_DIR *d)
 }
 
 ACE_INLINE int
-ACE_OS::scandir (const ACE_TCHAR *dirname,
-                 struct dirent **namelist[],
-                 int (*selector)(const struct dirent *),
-                 int (*comparator) (const struct dirent **f1,
-                                    const struct dirent **f2))
+scandir (const ACE_TCHAR *dirname,
+                 struct ACE_DIRENT **namelist[],
+                 int (*selector)(const struct ACE_DIRENT *),
+                 int (*comparator) (const struct ACE_DIRENT **f1,
+                                    const struct ACE_DIRENT **f2))
 {
 #if defined (ACE_HAS_SCANDIR)
   return ::scandir (ACE_TEXT_TO_CHAR_IN (dirname),
@@ -179,8 +194,9 @@ ACE_OS::scandir (const ACE_TCHAR *dirname,
   return ACE_OS::scandir_emulation (dirname, namelist, selector, comparator);
 #endif /* ACE_HAS_SCANDIR */
 }
+
 ACE_INLINE void
-ACE_OS::seekdir (ACE_DIR *d, long loc)
+seekdir (ACE_DIR *d, long loc)
 {
 #if defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_SEEKDIR)
   ::seekdir (d, loc);
@@ -191,7 +207,7 @@ ACE_OS::seekdir (ACE_DIR *d, long loc)
 }
 
 ACE_INLINE long
-ACE_OS::telldir (ACE_DIR *d)
+telldir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_TELLDIR)
   return ::telldir (d);
@@ -200,3 +216,7 @@ ACE_OS::telldir (ACE_DIR *d)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ! ACE_HAS_DIRENT  ||  ACE_LACKS_TELLDIR */
 }
+
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_dlfcn.cpp b/ace/OS_NS_dlfcn.cpp
index d0707dde1c2..67cae58a1fe 100644
--- a/ace/OS_NS_dlfcn.cpp
+++ b/ace/OS_NS_dlfcn.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_dlfcn.h"
diff --git a/ace/OS_NS_dlfcn.h b/ace/OS_NS_dlfcn.h
index 6bcaac31488..ac92efbbe46 100644
--- a/ace/OS_NS_dlfcn.h
+++ b/ace/OS_NS_dlfcn.h
@@ -33,6 +33,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   //@{ @name A set of wrappers for explicit dynamic linking.
@@ -53,6 +55,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index 542660d66d9..74a2159107c 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_macros.h"
@@ -19,6 +20,8 @@
 #  include "ace/OS_NS_string.h"
 #endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
 {
@@ -91,7 +94,7 @@ ACE_OS::dlerror (void)
 #   else
   return const_cast <char *> (err);
 #   endif /* ACE_USES_WCHAR */
-# elif defined (__hpux) || defined (VXWORKS)
+# elif defined (__hpux) || defined (ACE_VXWORKS)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
   static ACE_TCHAR buf[128];
@@ -112,32 +115,23 @@ ACE_OS::dlerror (void)
 # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 }
 
-# if defined (ACE_HAS_CHARPTR_DL)
-typedef ACE_TCHAR * ACE_DL_TYPE;
-# else
-typedef const ACE_TCHAR * ACE_DL_TYPE;
-# endif /* ACE_HAS_CHARPTR_DL */
-
 ACE_INLINE ACE_SHLIB_HANDLE
 ACE_OS::dlopen (const ACE_TCHAR *fname,
                 int mode)
 {
   ACE_OS_TRACE ("ACE_OS::dlopen");
 
-  // Get the correct OS type.
-  ACE_DL_TYPE filename = const_cast<ACE_DL_TYPE> (fname);
-
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
   ACE_OSCALL
-    (::sgidladd (ACE_TEXT_TO_CHAR_IN (filename), mode), void *, 0, handle);
+    (::sgidladd (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   elif defined (_M_UNIX)
   ACE_OSCALL
-    (::_dlopen (ACE_TEXT_TO_CHAR_IN (filename), mode), void *, 0, handle);
+    (::_dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   else
   ACE_OSCALL
-    (::dlopen (ACE_TEXT_TO_CHAR_IN (filename), mode), void *, 0, handle);
+    (::dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
 #   if !defined (ACE_HAS_AUTOMATIC_INIT_FINI)
   if (handle != 0)
@@ -160,18 +154,18 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
 # elif defined (ACE_WIN32)
   ACE_UNUSED_ARG (mode);
 
-  ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (filename), ACE_SHLIB_HANDLE, 0);
+  ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0);
 # elif defined (__hpux)
 
 #   if defined(__GNUC__) || __cplusplus >= 199707L
-  ACE_OSCALL_RETURN (::shl_load(filename, mode, 0L), ACE_SHLIB_HANDLE, 0);
+  ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
 #   else
-  ACE_OSCALL_RETURN (::cxxshl_load(filename, mode, 0L), ACE_SHLIB_HANDLE, 0);
+  ACE_OSCALL_RETURN (::cxxshl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
 #   endif  /* aC++ vs. Hp C++ */
-# elif defined (VXWORKS)
-  MODULE* handle;
+# elif defined (ACE_VXWORKS) && !defined (__RTP__)
+  MODULE* handle = 0;
   // Open readonly
-  ACE_HANDLE filehandle = ACE_OS::open (filename,
+  ACE_HANDLE filehandle = ACE_OS::open (fname,
                                         O_RDONLY,
                                         ACE_DEFAULT_FILE_PERMS);
 
@@ -185,8 +179,8 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
       if ( (loaderror != 0) && (handle != 0) )
         {
           // ouch something went wrong most likely unresolved externals
-		  if (handle)
-          	::unldByModuleId ( handle, 0 );
+          if (handle)
+            ::unldByModuleId ( handle, 0 );
           handle = 0;
         }
     }
@@ -197,7 +191,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
     }
   return handle;
 # else
-  ACE_UNUSED_ARG (filename);
+  ACE_UNUSED_ARG (fname);
   ACE_UNUSED_ARG (mode);
   ACE_NOTSUP_RETURN (0);
 # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
@@ -257,7 +251,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, -1, status);
   return status == 0 ? value : 0;
 
-# elif defined (VXWORKS)
+# elif defined (ACE_VXWORKS) && !defined (__RTP__)
 
   // For now we use the VxWorks global symbol table
   // which resolves the most recently loaded symbols .. which resolve mostly what we want..
@@ -277,3 +271,5 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 
 # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_errno.h b/ace/OS_NS_errno.h
index a3fcaabfb7c..740a176f706 100644
--- a/ace/OS_NS_errno.h
+++ b/ace/OS_NS_errno.h
@@ -33,6 +33,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -84,6 +86,8 @@ private:
 #  define ACE_ERRNO_TYPE int
 #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_errno.inl b/ace/OS_NS_errno.inl
index 63eaaba1c14..b8d82f3fd24 100644
--- a/ace/OS_NS_errno.inl
+++ b/ace/OS_NS_errno.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/config-all.h"    /* Need ACE_TRACE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::last_error (void)
 {
@@ -94,3 +97,5 @@ ACE_CE_Errno::operator= (int x)
 }
 
 #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_fcntl.cpp b/ace/OS_NS_fcntl.cpp
index 8c69f8b8b51..d0b9e018776 100644
--- a/ace/OS_NS_fcntl.cpp
+++ b/ace/OS_NS_fcntl.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_fcntl.h"
@@ -14,6 +13,8 @@ ACE_RCSID(ace, OS_NS_fcntl, "$Id$")
 #include "ace/OS_NS_macros.h"
 #include "ace/Object_Manager_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_HANDLE
 ACE_OS::open (const char *filename,
               int mode,
@@ -264,3 +265,5 @@ ACE_OS::open (const wchar_t *filename,
                        sa);
 #endif /* ACE_WIN32 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_fcntl.h b/ace/OS_NS_fcntl.h
index 08bb4230d73..ac48e0e13e1 100644
--- a/ace/OS_NS_fcntl.h
+++ b/ace/OS_NS_fcntl.h
@@ -34,6 +34,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -77,6 +79,8 @@ namespace ACE_OS {
                    LPSECURITY_ATTRIBUTES sa = 0);
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_fcntl.inl b/ace/OS_NS_fcntl.inl
index 0e541c90575..6714b0fe389 100644
--- a/ace/OS_NS_fcntl.inl
+++ b/ace/OS_NS_fcntl.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
 {
@@ -16,3 +19,5 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
   ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1);
 # endif /* ACE_LACKS_FCNTL */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_math.cpp b/ace/OS_NS_math.cpp
index dc009cad8ba..85e2e92c034 100644
--- a/ace/OS_NS_math.cpp
+++ b/ace/OS_NS_math.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_math.h"
diff --git a/ace/OS_NS_math.h b/ace/OS_NS_math.h
index 370a65026f2..55ff1edc2e5 100644
--- a/ace/OS_NS_math.h
+++ b/ace/OS_NS_math.h
@@ -32,7 +32,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   /// This method computes the largest integral value not greater than x.
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -42,9 +45,10 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   double ceil (double x);
 
-
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_math.inl b/ace/OS_NS_math.inl
index 6a55a57480a..0637272006b 100644
--- a/ace/OS_NS_math.inl
+++ b/ace/OS_NS_math.inl
@@ -1,24 +1,35 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   ACE_INLINE double
   floor (double x)
   {
     // This method computes the largest integral value not greater than x.
-    return double (static_cast<long> (x));
+    if(x > 0)
+      return static_cast<long> (x);
+    else if (static_cast<long> (x) == x)
+      return x;
+    else
+      return static_cast<long>(x) - 1;
   }
 
   ACE_INLINE double
   ceil (double x)
   {
     // This method computes the smallest integral value not less than x.
-    const double floor = ACE_OS::floor (x);
-    if (floor == x)
-      return floor;
+    if (x < 0)
+      return static_cast<long> (x);
+    else if (static_cast<long> (x) == x)
+      return x;
     else
-      return floor + 1;
+      return static_cast<long> (x) + 1;
   }
 
 } // ACE_OS namespace
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_netdb.cpp b/ace/OS_NS_netdb.cpp
index 163c33208b4..23add1d1497 100644
--- a/ace/OS_NS_netdb.cpp
+++ b/ace/OS_NS_netdb.cpp
@@ -17,7 +17,9 @@ ACE_RCSID(ace, OS_NS_netdb, "$Id$")
 #include "ace/OS_NS_stropts.h"
 #include "ace/OS_NS_sys_socket.h"
 
-#if defined (VXWORKS)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
 
 struct hostent *
 ACE_OS::gethostbyaddr (const char *addr, int length, int type)
@@ -56,6 +58,10 @@ ACE_OS::gethostbyaddr (const char *addr, int length, int type)
   return &ret;
 }
 
+#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYADDR */
+
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
+
 struct hostent *
 ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
                          hostent *result, ACE_HOSTENT_DATA buffer,
@@ -106,6 +112,10 @@ ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
   return result;
 }
 
+#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYADDR */
+
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
+
 struct hostent *
 ACE_OS::gethostbyname (const char *name)
 {
@@ -135,6 +145,10 @@ ACE_OS::gethostbyname (const char *name)
   return &ret;
 }
 
+#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYNAME */
+
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
+
 struct hostent *
 ACE_OS::gethostbyname_r (const char *name, hostent *result,
                          ACE_HOSTENT_DATA buffer,
@@ -183,7 +197,9 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
   return result;
 }
 
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYNAME*/
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 // Include if_arp so that getmacaddr can use the
 // arp structure.
@@ -191,6 +207,8 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
 # include /**/ <net/if_arp.h>
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_OS::getmacaddress (struct macaddr_node_t *node)
 {
@@ -307,14 +325,14 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
     (struct sockaddr_in *)&(ar.arp_pa);
 
   ACE_OS::memset (&ar,
-		  0,
-		  sizeof (struct arpreq));
+                  0,
+                  sizeof (struct arpreq));
 
   psa->sin_family = AF_INET;
 
   ACE_OS::memcpy (&(psa->sin_addr),
-		  *paddrs,
-		  sizeof (struct in_addr));
+                  *paddrs,
+                  sizeof (struct in_addr));
 
   if (ACE_OS::ioctl (handle,
                      SIOCGARP,
@@ -367,9 +385,14 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 #endif
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
 #   include "ace/OS_NS_Thread.h"
 #   include "ace/Object_Manager_Base.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_OS::netdb_acquire (void)
 {
@@ -385,4 +408,8 @@ ACE_OS::netdb_release (void)
     ACE_OS_Object_Manager::preallocated_object[
       ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # endif /* defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) */
+
diff --git a/ace/OS_NS_netdb.h b/ace/OS_NS_netdb.h
index f25d97c9426..ead7b769b3b 100644
--- a/ace/OS_NS_netdb.h
+++ b/ace/OS_NS_netdb.h
@@ -15,7 +15,7 @@
 //=============================================================================
 
 #ifndef ACE_OS_NS_NETDB_H
-# define ACE_OS_NS_NETDB_H
+#define ACE_OS_NS_NETDB_H
 
 # include /**/ "ace/pre.h"
 
@@ -33,22 +33,25 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (VXWORKS)
-  extern ACE_Export 
+namespace ACE_OS
+{
+
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
+  extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
   struct hostent *gethostbyaddr (const char *addr,
                                  int length,
                                  int type);
 
-#if defined (VXWORKS)
-  extern ACE_Export 
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
+  extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
   struct hostent *gethostbyaddr_r (const char *addr,
                                    int length,
                                    int type,
@@ -56,37 +59,29 @@ namespace ACE_OS {
                                    ACE_HOSTENT_DATA buffer,
                                    int *h_errnop);
 
-#if defined (VXWORKS)
-  extern ACE_Export 
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
+  extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
   struct hostent *gethostbyname (const char *name);
 
-#if defined (VXWORKS)
-  extern ACE_Export 
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
+  extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
   struct hostent *gethostbyname_r (const char *name,
                                    struct hostent *result,
                                    ACE_HOSTENT_DATA buffer,
                                    int *h_errnop);
 
 
-#if defined (VXWORKS)
-  extern ACE_Export 
-#else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
   struct hostent *getipnodebyaddr (const void *src, size_t len,
                                    int family);
 
-#if defined (VXWORKS)
-  extern ACE_Export 
-#else
   ACE_NAMESPACE_INLINE_FUNCTION
-#endif /* VXWORKS */
   struct hostent *getipnodebyname (const char *name, int family,
                                    int flags = 0);
 
@@ -98,7 +93,7 @@ namespace ACE_OS {
     unsigned char node[6];
   };
 
-  extern ACE_Export 
+  extern ACE_Export
   int getmacaddress (struct macaddr_node_t *node);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -128,15 +123,17 @@ namespace ACE_OS {
                                    ACE_SERVENT_DATA buf);
 
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
-  extern ACE_Export 
+  extern ACE_Export
   int netdb_acquire (void);
 
-  extern ACE_Export 
+  extern ACE_Export
   int netdb_release (void);
 # endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl
index fed8aa4ebbb..e1caa25eb6d 100644
--- a/ace/OS_NS_netdb.inl
+++ b/ace/OS_NS_netdb.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_macros.h"
@@ -39,13 +40,15 @@
 # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 #endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
 
-#if !defined (VXWORKS)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if !(defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR))
 
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyaddr (const char *addr, int length, int type)
 {
   ACE_OS_TRACE ("ACE_OS::gethostbyaddr");
-# if defined (ACE_PSOS)
+# if defined (ACE_LACKS_GETHOSTBYADDR)
   ACE_UNUSED_ARG (addr);
   ACE_UNUSED_ARG (length);
   ACE_UNUSED_ARG (type);
@@ -65,6 +68,10 @@ ACE_OS::gethostbyaddr (const char *addr, int length, int type)
 # endif /* ACE_HAS_NONCONST_GETBY */
 }
 
+#endif
+
+#if !(defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR))
+
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyaddr_r (const char *addr,
                          int length,
@@ -145,11 +152,15 @@ ACE_OS::gethostbyaddr_r (const char *addr,
 # endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
 }
 
+#endif
+
+#if !(defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME))
+
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyname (const char *name)
 {
   ACE_OS_TRACE ("ACE_OS::gethostbyname");
-# if defined (ACE_PSOS)
+# if defined (ACE_LACKS_GETHOSTBYNAME)
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (0);
 # elif defined (ACE_HAS_NONCONST_GETBY)
@@ -163,6 +174,10 @@ ACE_OS::gethostbyname (const char *name)
 # endif /* ACE_HAS_NONCONST_GETBY */
 }
 
+#endif
+
+#if !(defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME))
+
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyname_r (const char *name,
                          struct hostent *result,
@@ -170,7 +185,7 @@ ACE_OS::gethostbyname_r (const char *name,
                          int *h_errnop)
 {
   ACE_OS_TRACE ("ACE_OS::gethostbyname_r");
-#if defined (ACE_PSOS)
+#if defined (ACE_LACKS_GETHOSTBYNAME)
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -242,6 +257,8 @@ ACE_OS::gethostbyname_r (const char *name,
 # endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
 }
 
+#endif
+
 ACE_INLINE struct hostent *
 ACE_OS::getipnodebyaddr (const void *src, size_t len, int family)
 {
@@ -310,12 +327,10 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags)
 # endif /* ACE_PSOS */
 }
 
-#endif /* ! VXWORKS */
-
 ACE_INLINE struct protoent *
 ACE_OS::getprotobyname (const char *name)
 {
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE) || (defined (ghs) && defined (__Chorus)) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_GETPROTOBYNAME)
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_HAS_NONCONST_GETBY)
@@ -326,7 +341,7 @@ ACE_OS::getprotobyname (const char *name)
   ACE_SOCKCALL_RETURN (::getprotobyname (name),
                        struct protoent *,
                        0);
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_GETPROTOBYNAME */
 }
 
 ACE_INLINE struct protoent *
@@ -334,7 +349,7 @@ ACE_OS::getprotobyname_r (const char *name,
                           struct protoent *result,
                           ACE_PROTOENT_DATA buffer)
 {
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE) || (defined (ghs) && defined (__Chorus)) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_GETPROTOBYNAME)
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -387,13 +402,13 @@ ACE_OS::getprotobyname_r (const char *name,
 ACE_INLINE struct protoent *
 ACE_OS::getprotobynumber (int proto)
 {
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE) || (defined (ghs) && defined (__Chorus)) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_GETPROTOBYNUMBER)
   ACE_UNUSED_ARG (proto);
   ACE_NOTSUP_RETURN (0);
 #else
   ACE_SOCKCALL_RETURN (::getprotobynumber (proto),
                        struct protoent *, 0);
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_GETPROTOBYNUMBER */
 }
 
 ACE_INLINE struct protoent *
@@ -401,7 +416,7 @@ ACE_OS::getprotobynumber_r (int proto,
                             struct protoent *result,
                             ACE_PROTOENT_DATA buffer)
 {
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE) || (defined (ghs) && defined (__Chorus)) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_GETPROTOBYNUMBER)
   ACE_UNUSED_ARG (proto);
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -526,3 +541,5 @@ ACE_OS::getservbyname_r (const char *svc,
                        0);
 #endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_poll.cpp b/ace/OS_NS_poll.cpp
index c109c2f097e..5ffdc327eb7 100644
--- a/ace/OS_NS_poll.cpp
+++ b/ace/OS_NS_poll.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_poll.h"
diff --git a/ace/OS_NS_poll.h b/ace/OS_NS_poll.h
index 43fe0a2f2fb..6d8f5c38346 100644
--- a/ace/OS_NS_poll.h
+++ b/ace/OS_NS_poll.h
@@ -33,9 +33,12 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
-namespace ACE_OS {
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int poll (struct pollfd *pollfds,
@@ -49,6 +52,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_poll.inl b/ace/OS_NS_poll.inl
index 8d808fbd6f5..ab1b2d8b54e 100644
--- a/ace/OS_NS_poll.inl
+++ b/ace/OS_NS_poll.inl
@@ -1,9 +1,12 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::poll (struct pollfd *pollfds,
               unsigned long len,
@@ -38,3 +41,5 @@ ACE_OS::poll (struct pollfd *pollfds,
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_POLL */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_pwd.cpp b/ace/OS_NS_pwd.cpp
index 61da06a1e7c..7888142f39f 100644
--- a/ace/OS_NS_pwd.cpp
+++ b/ace/OS_NS_pwd.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_pwd.h"
diff --git a/ace/OS_NS_pwd.h b/ace/OS_NS_pwd.h
index 9c61269f00b..b8360dc3d1d 100644
--- a/ace/OS_NS_pwd.h
+++ b/ace/OS_NS_pwd.h
@@ -15,7 +15,7 @@
 //=============================================================================
 
 #ifndef ACE_OS_NS_PWD_H
-# define ACE_OS_NS_PWD_H
+#define ACE_OS_NS_PWD_H
 
 # include /**/ "ace/pre.h"
 
@@ -39,7 +39,10 @@
 
 struct passwd;
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
 
   //@{ @name A set of wrappers for password routines.
@@ -64,6 +67,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_pwd.inl b/ace/OS_NS_pwd.inl
index 62f5e1813f8..d25d3b2173c 100644
--- a/ace/OS_NS_pwd.inl
+++ b/ace/OS_NS_pwd.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Accessors to PWD file.
 
 ACE_INLINE void
@@ -114,3 +117,5 @@ ACE_OS::setpwent (void)
   ::setpwent ();
 #endif /* ! ACE_LACKS_PWD_FUNCTIONS */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_regex.cpp b/ace/OS_NS_regex.cpp
index 88fc9f3beb4..dfefedf5231 100644
--- a/ace/OS_NS_regex.cpp
+++ b/ace/OS_NS_regex.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_regex.h"
diff --git a/ace/OS_NS_regex.h b/ace/OS_NS_regex.h
index ac311494088..434224af16e 100644
--- a/ace/OS_NS_regex.h
+++ b/ace/OS_NS_regex.h
@@ -32,7 +32,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   // non=standard..
   //@{ @name A set of wrappers for regular expressions.
@@ -48,6 +51,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_regex.inl b/ace/OS_NS_regex.inl
index b1f445f0e67..884bd88c718 100644
--- a/ace/OS_NS_regex.inl
+++ b/ace/OS_NS_regex.inl
@@ -1,9 +1,12 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 #include "ace/os_include/os_regex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE char *
 ACE_OS::compile (const char *instring, char *expbuf, char *endbuf)
 {
@@ -33,3 +36,4 @@ ACE_OS::step (const char *str, char *expbuf)
 #endif /* ACE_HAS_REGEX */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_signal.cpp b/ace/OS_NS_signal.cpp
index 3dc5e1c56fe..ab65f204095 100644
--- a/ace/OS_NS_signal.cpp
+++ b/ace/OS_NS_signal.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_signal.h"
@@ -22,3 +21,6 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles)
 {
 }
 #endif /* ACE_HAS_SIGINFO_T */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_signal.h b/ace/OS_NS_signal.h
index 74351b3a192..116f86dd2a2 100644
--- a/ace/OS_NS_signal.h
+++ b/ace/OS_NS_signal.h
@@ -68,6 +68,25 @@ extern "C"
 }
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// This hack is needed to get around an odd and hard-to-reproduce problem
+// with HP aC++. If struct sigaction is defined extern "C" and the sigaction
+// function in namespace ACE_OS, the compiler sometimes gets confused.
+// If we help it with this typedef, it's fine. User code should not use
+// the ACE typedef - it will be removed without warning as soon as we can
+// either drop support for the broken compilers or figure out how to reproduce
+// it so it can be reported to HP and fixed.
+// There's a similar hack in OS_TLI.h for struct t_optmgmt.
+// Also see ChangeLog entries:
+// Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
+// Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
+#if defined (__HP_aCC) && (__HP_aCC <= 36500)
+typedef extern "C" struct sigaction  ACE_SIGACTION;
+#else
+typedef struct sigaction ACE_SIGACTION;
+#endif
+
 namespace ACE_OS {
 
   //@{ @name A set of wrappers for Signals.
@@ -83,8 +102,8 @@ namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int sigaction (int signum,
-                 const struct sigaction *nsa,
-                 struct sigaction *osa);
+                 const ACE_SIGACTION *nsa,
+                 ACE_SIGACTION *osa);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int sigaddset (sigset_t *s,
@@ -120,6 +139,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl
index a2159ad2604..a56956e4aa0 100644
--- a/ace/OS_NS_signal.inl
+++ b/ace/OS_NS_signal.inl
@@ -1,28 +1,32 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
 ACE_INLINE int
 kill (pid_t pid, int signum)
 {
   ACE_OS_TRACE ("ACE_OS::kill");
-#if defined (ACE_WIN32) || defined (CHORUS) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_KILL)
   ACE_UNUSED_ARG (pid);
   ACE_UNUSED_ARG (signum);
   ACE_NOTSUP_RETURN (-1);
 #else
   ACE_OSCALL_RETURN (::kill (pid, signum), int, -1);
-#endif /* ACE_WIN32 || CHORUS || ACE_PSOS */
+#endif /* ACE_LACKS_KILL */
 }
 
 ACE_INLINE int
 pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
 {
-#if defined (ACE_HAS_PTHREADS_STD)  &&  !defined (ACE_LACKS_PTHREAD_SIGMASK)
+#if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp),
                                        result),
@@ -37,7 +41,7 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
 }
 
 ACE_INLINE int
-sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa)
+sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa)
 {
   ACE_OS_TRACE ("ACE_OS::sigaction");
   if (signum == 0)
@@ -56,8 +60,7 @@ sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa)
   else
     osa->sa_handler = ::signal (signum, nsa->sa_handler);
   return osa->sa_handler == SIG_ERR ? -1 : 0;
-#elif defined (CHORUS) || defined (ACE_HAS_WINCE) || defined(ACE_PSOS)
-  ACE_UNUSED_ARG (signum);
+#elif defined (ACE_LACKS_SIGACTION)
   ACE_UNUSED_ARG (nsa);
   ACE_UNUSED_ARG (osa);
   ACE_NOTSUP_RETURN (-1);
@@ -271,3 +274,5 @@ sigsuspend (const sigset_t *sigset)
 }
 
 }  /* end namespace ACE_OS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp
index 6e3a45cd926..475abea4487 100644
--- a/ace/OS_NS_stdio.cpp
+++ b/ace/OS_NS_stdio.cpp
@@ -14,8 +14,10 @@ ACE_RCSID (ace,
 
 # if defined (ACE_WIN32)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 OSVERSIONINFO ACE_OS::win32_versioninfo_;
 HINSTANCE ACE_OS::win32_resource_module_;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #   if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE)
 // This function is called by the OS when the ACE DLL is loaded. We
@@ -38,6 +40,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
 #   endif /* ACE_HAS_DLL && ACE_HAS_DLL == 1 */
 # endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_OS::ace_flock_t::dump (void) const
 {
@@ -132,9 +136,9 @@ ACE_OS::fopen (const char *filename,
       if (fd != -1)
         {
 #   if defined (__BORLANDC__) && !defined (ACE_USES_WCHAR)
-          FILE *fp = ::_fdopen (fd, const_cast<char *> (mode));
+          FILE *fp = ::_fdopen (fd, const_cast<ACE_TCHAR *> (mode));
 #   elif defined (__BORLANDC__) && defined (ACE_USES_WCHAR)
-          FILE *fp = ::_wfdopen (fd, const_cast<wchar_t *> (mode));
+          FILE *fp = ::_wfdopen (fd, const_cast<ACE_TCHAR *> (mode));
 #   elif defined (ACE_USES_WCHAR)
           FILE *fp = ::_wfdopen (fd, mode);
 #   else
@@ -390,3 +394,5 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 # endif /* XPG5 || ACE_HAS_DINKUM_STL */
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h
index 45d4cc99c3c..450b7ce2ced 100644
--- a/ace/OS_NS_stdio.h
+++ b/ace/OS_NS_stdio.h
@@ -54,6 +54,8 @@ inline void __ace_clearerr(FILE *stream)
 #   endif /* defined (clearerr) */
 # endif /* !ACE_LACKS_CLEARERR */
 
+#if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \
+    && !defined(ACE_WIN32) && !defined (VXWORKS)
 /// Helper for the ACE_OS::cuserid() function
 /**
  * On some platforms cuserid is a macro.  Defining ACE_OS::cuserid()
@@ -68,8 +70,6 @@ inline void __ace_clearerr(FILE *stream)
  *       probably need to move some of it off into some sort of emulation
  *       function.
  */
-#if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \
-    && !defined(ACE_WIN32) && !defined (VXWORKS)
 inline char *ace_cuserid(char *user)
 {
   return cuserid(user);
@@ -94,6 +94,8 @@ struct flock
 #   endif /* ! VXWORKS */
 # endif /* ACE_LACKS_FILELOCKS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   /**
@@ -389,6 +391,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index 607d974d972..0f4a460723b 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -35,6 +35,8 @@ fileno (FILE *fp)
 
 /*****************************************************************************/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32)
 ACE_INLINE void
 ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock,
@@ -132,7 +134,8 @@ ACE_OS::flock_init (ACE_OS::ace_flock_t *lock,
                   ACE_HANDLE,
                   ACE_INVALID_HANDLE,
                   lock->handle_);
-      lock->lockname_ = ACE_OS::strdup (name);
+      if (lock->handle_ != ACE_INVALID_HANDLE)
+        lock->lockname_ = ACE_OS::strdup (name);
       return lock->handle_ == ACE_INVALID_HANDLE ? -1 : 0;
     }
   else
@@ -492,7 +495,7 @@ ACE_INLINE char *
 ACE_OS::cuserid (char *user, size_t maxlen)
 {
   ACE_OS_TRACE ("ACE_OS::cuserid");
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (maxlen);
   if (user == 0)
     {
@@ -643,8 +646,10 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
 
   if (crt_handle != -1)
     {
-#   if defined(__BORLANDC__) /* VSB */
-      file = ::_fdopen (crt_handle, (char *) mode);
+#   if defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)
+      file = ::_fdopen (crt_handle, const_cast<ACE_TCHAR *> (mode));
+#   elif defined (ACE_HAS_NONCONST_FDOPEN) && defined (ACE_USES_WCHAR)
+      file = ::_wfdopen (crt_handle, const_cast<ACE_TCHAR *> (mode));
 #   elif defined (ACE_USES_WCHAR)
       file = ::_wfdopen (crt_handle, mode);
 #   else
@@ -743,7 +748,7 @@ ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode)
 #else
   // Non-Windows doesn't use wchar_t file systems.
   ACE_OSCALL_RETURN
-    (::fopen (ACE_TEXT_TO_CHAR_IN (filename), 
+    (::fopen (ACE_TEXT_TO_CHAR_IN (filename),
               ACE_TEXT_TO_CHAR_IN (mode)), FILE*, 0);
 #endif /* ACE_HAS_WINCE */
 }
@@ -951,7 +956,7 @@ ACE_OS::rename (const wchar_t *old_name,
   ACE_UNUSED_ARG (flags);
   ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1);
 # else /* ACE_LACKS_RENAME */
-  return ACE_OS::rename (ACE_TEXT_TO_CHAR_IN (old_name), 
+  return ACE_OS::rename (ACE_TEXT_TO_CHAR_IN (old_name),
                          ACE_TEXT_TO_CHAR_IN (new_name), flags);
 # endif /* ACE_LACKS_RENAME */
 }
@@ -963,8 +968,9 @@ ACE_OS::rewind (FILE *fp)
   ACE_OS_TRACE ("ACE_OS::rewind");
   ::rewind (fp);
 #else
-  // In WinCE, "FILE *" is actually a HANDLE.
-  ::SetFilePointer (fp, 0L, 0L, FILE_BEGIN);
+  // This isn't perfect since it doesn't reset EOF, but it's probably
+  // the closest we can get on WINCE.
+  (void) fseek (fp, 0L, SEEK_SET);
 #endif /* ACE_HAS_WINCE */
 }
 
@@ -980,8 +986,8 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
   // pSOS only considers the directory prefix
   ACE_UNUSED_ARG (pfx);
   ACE_OSCALL_RETURN (::tmpnam (const_cast <char *> (dir)), char *, 0);
-#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)))
-  ACE_OSCALL_RETURN (::_tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *, 0);
+#elif defined (ACE_HAS_NONCONST_TEMPNAM)
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *, 0);
 #else /* ACE_LACKS_TEMPNAM */
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0);
 #endif /* ACE_LACKS_TEMPNAM */
@@ -996,14 +1002,14 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
   ACE_UNUSED_ARG (pfx);
   ACE_NOTSUP_RETURN (0);
 #elif defined(ACE_WIN32)
-#  if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)
+#  if defined (ACE_HAS_NONCONST_TEMPNAM)
   ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0);
 #  else
   ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0);
 #  endif // __BORLANDC__
 #else // ACE_LACKS_TEMPNAM
   // No native wide-char support; convert to narrow and call the char* variant.
-  char *name = ACE_OS::tempnam (ACE_TEXT_TO_CHAR_IN (dir), 
+  char *name = ACE_OS::tempnam (ACE_TEXT_TO_CHAR_IN (dir),
                                 ACE_TEXT_TO_CHAR_IN (pfx));
   // ACE_OS::tempnam returns a pointer to a malloc()-allocated space.
   // Convert that string to wide-char and free() the original.
@@ -1094,6 +1100,22 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
 
   return vswprintf (buffer, maxlen, format, ap);
 
+# elif defined (ACE_WIN32)
+
+  int result =
+    ACE_SPRINTF_ADAPTER (::_vsnwprintf (buffer, maxlen, format, ap));
+
+  // Win32 doesn't regard a full buffer with no 0-terminate as an
+  // overrun.
+  if (result == static_cast<int> (maxlen))
+    result = -1;
+
+  // Win32 doesn't 0-terminate the string if it overruns maxlen.
+  if (result == -1)
+    buffer[maxlen-1] = '\0';
+
+  return result;
+
 # else
 
   ACE_UNUSED_ARG (buffer);
@@ -1176,3 +1198,5 @@ ACE_OS::default_win32_security_attributes_r (LPSECURITY_ATTRIBUTES sa,
 
 #endif /* ACE_WIN32 */
 #endif
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp
index 2bb6e1b1070..0da4241875c 100644
--- a/ace/OS_NS_stdlib.cpp
+++ b/ace/OS_NS_stdlib.cpp
@@ -25,11 +25,13 @@ ACE_RCSID (ace,
 # include "ace/OS_NS_fcntl.h"
 # include "ace/OS_NS_ctype.h"
 # include "ace/OS_NS_sys_time.h"
-# if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS) && !defined (max)
+# if !defined (ACE_HAS_WINCE) && !(defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x551)) && !defined (max)
 #  include /**/ <limits>
 # endif
 #endif  /* ACE_LACKS_MKSTEMP */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0;
 
 void *
@@ -335,8 +337,10 @@ ACE_OS::realpath (const char *file_name,
       dest = rpath;
     }
 
+#if !defined (ACE_LACKS_SYMLINKS)
   char expand_buf[PATH_MAX]; // Extra buffer needed to expand symbolic links
   int nlinks = 0;
+#endif
 
   while (*file_name)
     {
@@ -622,7 +626,7 @@ 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).
-#  if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS) || defined (max)
+#  if defined (ACE_HAS_WINCE) || (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x551)) || defined (max)
   static float const MAX_VAL = static_cast<float> (127);
 #else
   static float const MAX_VAL =
@@ -685,3 +689,5 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
   return ACE_INVALID_HANDLE;
 }
 #endif /* ACE_LACKS_MKSTEMP */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h
index fd3a125790e..1209dce8cf4 100644
--- a/ace/OS_NS_stdlib.h
+++ b/ace/OS_NS_stdlib.h
@@ -50,6 +50,8 @@ extern "C" {
 }
 #endif /* ACE_WIN32 && _MSC_VER */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   /** @name Non-standard functions
@@ -248,9 +250,10 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   int system (const ACE_TCHAR *s);
 
-
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include "ace/OS_NS_stdlib_base.inl"
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl
index 92ac34984cc..6f6ca83c71f 100644
--- a/ace/OS_NS_stdlib.inl
+++ b/ace/OS_NS_stdlib.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/config-all.h"           /* Need ACE_TRACE */
@@ -16,6 +17,8 @@
 # define ACE_WCHAR_STD_NAMESPACE ACE_STD_NAMESPACE
 #endif /* ACE_WCHAR_IN_STD_NAMESPACE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Doesn't need a macro since it *never* returns!
 
 ACE_INLINE void
@@ -133,9 +136,6 @@ ACE_OS::getenv (const char *symbol)
 #if defined (ACE_LACKS_ENV)
   ACE_UNUSED_ARG (symbol);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_PSOS)
-  ACE_UNUSED_ARG (symbol);
-  ACE_NOTSUP_RETURN (0);
 #else /* ACE_PSOS */
   ACE_OSCALL_RETURN (::getenv (symbol), char *, 0);
 #endif /* ACE_LACKS_ENV */
@@ -260,7 +260,7 @@ ACE_OS::putenv (const char *string)
   // WinCE and pSOS don't have the concept of environment variables.
   ACE_UNUSED_ARG (string);
   ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_LACKS_ENV)
+#elif defined (ACE_LACKS_ENV) || defined (ACE_LACKS_PUTENV)
   ACE_UNUSED_ARG (string);
   ACE_NOTSUP_RETURN (0);
 #else /* ! ACE_HAS_WINCE && ! ACE_PSOS */
@@ -505,7 +505,7 @@ ACE_INLINE int
 ACE_OS::system (const ACE_TCHAR *s)
 {
   // ACE_OS_TRACE ("ACE_OS::system");
-#if defined (CHORUS) || defined (ACE_HAS_WINCE) || defined(ACE_PSOS)
+#if defined (ACE_LACKS_SYSTEM)
   ACE_UNUSED_ARG (s);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
@@ -514,5 +514,7 @@ ACE_OS::system (const ACE_TCHAR *s)
   ACE_OSCALL_RETURN (::spt_system (s), int, -1);
 #else
   ACE_OSCALL_RETURN (::system (ACE_TEXT_TO_CHAR_IN (s)), int, -1);
-#endif /* !CHORUS */
+#endif /* ACE_LACKS_SYSTEM */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_string.cpp b/ace/OS_NS_string.cpp
index 15fa83612f1..e3ef64988b3 100644
--- a/ace/OS_NS_string.cpp
+++ b/ace/OS_NS_string.cpp
@@ -18,6 +18,8 @@ ACE_RCSID (ace,
 #  include "ace/OS_NS_stdio.h"
 #endif /* ACE_LACKS_STRERROR */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (ACE_HAS_MEMCHR)
 const void *
 ACE_OS::memchr_emulation (const void *s, int c, size_t len)
@@ -118,7 +120,7 @@ ACE_OS::strerror (int errnum)
   ACE_Errno_Guard g (errno);
   errno = 0;
   char *errmsg = ::strerror (errnum);
-  if (errno == EINVAL || ACE_OS::strlen (errmsg) == 0)
+  if (errno == EINVAL || errmsg == 0 || errmsg[0] == 0)
     {
       ACE_OS::sprintf (ret_errortext, "Unknown error %d", errnum);
       errmsg = ret_errortext;
@@ -399,3 +401,6 @@ ACE_OS::strtok_r_emulation (wchar_t *s,
   return s ;
 }
 # endif  /* ACE_LACKS_WCSTOK */
+
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index f6a3945d271..8751b39b89a 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -15,7 +15,7 @@
 //=============================================================================
 
 #ifndef ACE_OS_NS_STRING_H
-# define ACE_OS_NS_STRING_H
+#define ACE_OS_NS_STRING_H
 
 # include /**/ "ace/pre.h"
 
@@ -31,6 +31,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   /** @name Functions from <cstring>
@@ -70,6 +72,7 @@ namespace ACE_OS {
  * On certain platforms this results in better performance.
  * This is determined and set via autoconf.
  */
+  extern ACE_Export
   void *fast_memcpy (void *t, const void *s, size_t len);
 #endif
 
@@ -97,7 +100,8 @@ namespace ACE_OS {
   /// Finds the first occurance of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  const wchar_t *strchr (const wchar_t *s, wint_t c);
+
+  const wchar_t *strchr (const wchar_t *s, wchar_t c);
 
   /// Finds the first occurance of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -105,7 +109,8 @@ namespace ACE_OS {
 
   /// Finds the first occurance of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *strchr (wchar_t *s, wint_t c);
+
+  wchar_t *strchr (wchar_t *s, wchar_t c);
 
   /// Copies a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -126,10 +131,19 @@ namespace ACE_OS {
   size_t strcspn (const wchar_t *s, const wchar_t *reject);
 
   /// Returns a malloced duplicated string (char version).
+  //ACE_NAMESPACE_INLINE_FUNCTION
   extern ACE_Export
   char *strdup (const char *s);
+  /*
+    #if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \
+    || defined (ACE_HAS_STRDUP_EMULATION)
+    extern ACE_Export
+    char *strdup_emulation (const char *s);
+    #endif
+  */
 
   /// Returns a malloced duplicated string (wchar_t version).
+  //ACE_NAMESPACE_INLINE_FUNCTION
   extern ACE_Export
   wchar_t *strdup (const wchar_t *s);
 
@@ -173,6 +187,7 @@ namespace ACE_OS {
   /// Finds the first occurance of a character in an array (const wchar_t
   /// version).
   extern ACE_Export
+
   const wchar_t *strnchr (const wchar_t *s, wint_t c, size_t len);
 
   /// Finds the first occurance of a character in an array (char version).
@@ -181,6 +196,7 @@ namespace ACE_OS {
 
   /// Finds the first occurance of a character in an array (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
+
   wchar_t *strnchr (wchar_t *s, wint_t c, size_t len);
 
   /// Compares two arrays (char version).
@@ -266,7 +282,8 @@ namespace ACE_OS {
   /// Finds the last occurance of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  const wchar_t *strrchr (const wchar_t *s, wint_t c);
+
+  const wchar_t *strrchr (const wchar_t *s, wchar_t c);
 
   /// Finds the last occurance of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -274,7 +291,8 @@ namespace ACE_OS {
 
   /// Finds the last occurance of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *strrchr (wchar_t *s, wint_t c);
+
+  wchar_t *strrchr (wchar_t *s, wchar_t c);
 
 #if defined (ACE_LACKS_STRRCHR)
   /// Emulated strrchr (char version) - Finds the last occurance of a
@@ -397,7 +415,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
-#include "ace/OS_NS_string_base.h"
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl
index 38d465820e4..557dd7e0d27 100644
--- a/ace/OS_NS_string.inl
+++ b/ace/OS_NS_string.inl
@@ -7,6 +7,8 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/os_include/os_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const void *
 ACE_OS::memchr (const void *s, int c, size_t len)
 {
@@ -80,7 +82,7 @@ ACE_OS::strchr (const char *s, int c)
 }
 
 ACE_INLINE const wchar_t *
-ACE_OS::strchr (const wchar_t *s, wint_t c)
+ACE_OS::strchr (const wchar_t *s, wchar_t c)
 {
 #  if defined (ACE_LACKS_WCSCHR)
   return ACE_OS::wcschr_emulation (s, c);
@@ -96,10 +98,10 @@ ACE_OS::strchr (char *s, int c)
 }
 
 ACE_INLINE wchar_t *
-ACE_OS::strchr (wchar_t *s, wint_t c)
+ACE_OS::strchr (wchar_t *s, wchar_t c)
 {
   return
-    const_cast<wchar_t *> (ACE_OS::strchr (static_cast<const wchar_t *> (s),
+    const_cast<wchar_t *> (ACE_OS::strchr (const_cast<const wchar_t *> (s),
                                            c));
 }
 
@@ -273,7 +275,7 @@ ACE_INLINE wchar_t *
 ACE_OS::strpbrk (wchar_t *s, const wchar_t *t)
 {
   return const_cast<wchar_t *> (ACE_OS::strpbrk (
-                                  static_cast<const wchar_t *> (s), t));
+                                  const_cast<const wchar_t *> (s), t));
 }
 
 ACE_INLINE const char *
@@ -287,12 +289,12 @@ ACE_OS::strrchr (const char *s, int c)
 }
 
 ACE_INLINE const wchar_t *
-ACE_OS::strrchr (const wchar_t *s, wint_t c)
+ACE_OS::strrchr (const wchar_t *s, wchar_t c)
 {
 #if defined (ACE_LACKS_WCSRCHR)
   return ACE_OS::wcsrchr_emulation (s, c);
 #else /* ! ACE_LACKS_WCSRCHR */
-  return (const wchar_t *) ::wcsrchr (s, c);
+  return const_cast <const wchar_t *> (::wcsrchr (s, c));
 #endif /* ! ACE_LACKS_WCSRCHR */
 }
 
@@ -307,10 +309,10 @@ ACE_OS::strrchr (char *s, int c)
 }
 
 ACE_INLINE wchar_t *
-ACE_OS::strrchr (wchar_t *s, wint_t c)
+ACE_OS::strrchr (wchar_t *s, wchar_t c)
 {
   return const_cast<wchar_t *> (ACE_OS::strrchr (
-                     static_cast<const wchar_t *> (s), c));
+                     const_cast<const wchar_t *> (s), c));
 }
 
 ACE_INLINE size_t
@@ -345,9 +347,9 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t)
 #  if defined (ACE_LACKS_WCSSTR)
   return ACE_OS::wcsstr_emulation (s, t);
 #  elif defined (HPUX)
-  return (const wchar_t *) ::wcswcs (s, t);
+  return const_cast <const wchar_t *> (::wcswcs (s, t));
 #  else /* ACE_LACKS_WCSSTR */
-  return (const wchar_t *) ::wcsstr (s, t);
+  return const_cast <const wchar_t *> (::wcsstr (s, t));
 #  endif /* ACE_LACKS_WCSSTR */
 }
 
@@ -414,3 +416,6 @@ ACE_OS::strtok_r (wchar_t *s, const wchar_t *tokens, wchar_t **lasts)
 #  endif /* ACE_HAS_3_PARAM_WCSTOK */
 #endif  /* ACE_LACKS_WCSTOK */
 }
+
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_strings.cpp b/ace/OS_NS_strings.cpp
index 67ca3a809b8..50c5630c9d2 100644
--- a/ace/OS_NS_strings.cpp
+++ b/ace/OS_NS_strings.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_strings.h"
@@ -13,6 +12,8 @@ ACE_RCSID(ace, OS_NS_strings, "$Id$")
 #  include "ace/OS_NS_ctype.h"
 #endif /* ACE_LACKS_STRCASECMP */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_LACKS_STRCASECMP)
 int
 ACE_OS::strcasecmp_emulation (const char *s, const char *t)
@@ -79,3 +80,5 @@ ACE_OS::strncasecmp_emulation (const char *s,
     return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_tolower (*scan2);
 }
 #endif /* ACE_LACKS_STRCASECMP */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_strings.h b/ace/OS_NS_strings.h
index f52eb603661..e834afac831 100644
--- a/ace/OS_NS_strings.h
+++ b/ace/OS_NS_strings.h
@@ -15,7 +15,7 @@
 //=============================================================================
 
 #ifndef ACE_OS_NS_STRINGS_H
-# define ACE_OS_NS_STRINGS_H
+#define ACE_OS_NS_STRINGS_H
 
 # include /**/ "ace/pre.h"
 
@@ -33,9 +33,12 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
-namespace ACE_OS {
+namespace ACE_OS
+{
 
   /// Compares two strings (case insensitive const char version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -65,6 +68,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_strings.inl b/ace/OS_NS_strings.inl
index 115489ea9f5..4e5d0f40dc0 100644
--- a/ace/OS_NS_strings.inl
+++ b/ace/OS_NS_strings.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #  include "ace/OS_NS_wchar.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::strcasecmp (const char *s, const char *t)
 {
@@ -47,3 +50,4 @@ ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 #endif /* ACE_LACKS_WCSNICMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stropts.cpp b/ace/OS_NS_stropts.cpp
index a8f4710a1f7..f19056ec381 100644
--- a/ace/OS_NS_stropts.cpp
+++ b/ace/OS_NS_stropts.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_stropts.h"
@@ -9,6 +8,8 @@ ACE_RCSID(ace, OS_NS_stropts, "$Id$")
 # include "ace/OS_NS_stropts.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_OS::ioctl (ACE_HANDLE socket,
                unsigned long io_control_code,
@@ -46,7 +47,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
 # endif /* ACE_HAS_WINSOCK2 */
 }
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
 int
 ACE_OS::ioctl (ACE_HANDLE socket,
                unsigned long io_control_code,
@@ -189,4 +190,6 @@ ACE_OS::ioctl (ACE_HANDLE socket,
   ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_WINSOCK2 */
 }
-#endif /* ACE_HAS_WINCE */
+#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stropts.h b/ace/OS_NS_stropts.h
index 9b1f6fc2f56..ce9a6ba23ba 100644
--- a/ace/OS_NS_stropts.h
+++ b/ace/OS_NS_stropts.h
@@ -15,7 +15,7 @@
 //=============================================================================
 
 #ifndef ACE_OS_NS_STROPTS_H
-# define ACE_OS_NS_STROPTS_H
+#define ACE_OS_NS_STROPTS_H
 
 # include /**/ "ace/pre.h"
 
@@ -38,6 +38,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
 typedef WSAPROTOCOL_INFO ACE_Protocol_Info;
 
@@ -113,7 +115,7 @@ namespace ACE_OS {
              void * = 0);
 
   /// QoS-enabled <ioctl>.
-  extern ACE_Export 
+  extern ACE_Export
   int ioctl (ACE_HANDLE socket,
              unsigned long io_control_code,
              void *in_buffer_p,
@@ -124,10 +126,10 @@ namespace ACE_OS {
              ACE_OVERLAPPED *overlapped,
              ACE_OVERLAPPED_COMPLETION_FUNC func);
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /// QoS-enabled <ioctl> when the I/O control code is either
   /// SIO_SET_QOS or SIO_GET_QOS.
-  extern ACE_Export 
+  extern ACE_Export
   int ioctl (ACE_HANDLE socket,
              unsigned long io_control_code,
              ACE_QoS &ace_qos,
@@ -136,7 +138,7 @@ namespace ACE_OS {
              unsigned long buffer = 0,
              ACE_OVERLAPPED *overlapped = 0,
              ACE_OVERLAPPED_COMPLETION_FUNC func = 0);
-#endif  /* ACE_HAS_WINCE */
+#endif  /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int isastream (ACE_HANDLE handle);
@@ -156,6 +158,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_stropts.inl b/ace/OS_NS_stropts.inl
index 38663c67cba..59f1035074e 100644
--- a/ace/OS_NS_stropts.inl
+++ b/ace/OS_NS_stropts.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/os_include/os_errno.h"
@@ -8,6 +9,8 @@
 #include "ace/OS_Memory.h"
 #include "ace/OS_QoS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_LACKS_CONST_STRBUF_PTR)
 typedef struct strbuf *ACE_STRBUF_TYPE;
 #else
@@ -111,7 +114,7 @@ ACE_OS::ioctl (ACE_HANDLE handle,
 #if defined (ACE_WIN32)
   ACE_SOCKET sock = (ACE_SOCKET) handle;
   ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1);
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x620)
   ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)),
                      int, -1);
 #elif defined (ACE_PSOS)
@@ -196,3 +199,5 @@ ACE_OS::putpmsg (ACE_HANDLE handle,
   return ACE_OS::putmsg (handle, ctl, data, flags);
 #endif /* ACE_HAS_STREAM_PIPES */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_mman.cpp b/ace/OS_NS_sys_mman.cpp
index 5a9c10ce148..5b1f5712186 100644
--- a/ace/OS_NS_sys_mman.cpp
+++ b/ace/OS_NS_sys_mman.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_mman.h"
diff --git a/ace/OS_NS_sys_mman.h b/ace/OS_NS_sys_mman.h
index 1ce8939525f..6315c32bbff 100644
--- a/ace/OS_NS_sys_mman.h
+++ b/ace/OS_NS_sys_mman.h
@@ -35,7 +35,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   //@{ @name A set of wrappers for memory mapped files.
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -80,6 +83,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl
index f199ee118c8..0379ca02468 100644
--- a/ace/OS_NS_sys_mman.inl
+++ b/ace/OS_NS_sys_mman.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_fcntl.h"
@@ -11,6 +12,8 @@
 #  include "ace/OS_NS_sys_stat.h"
 #endif /* __Lynx__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_VOIDPTR_MMAP)
 // Needed for some odd OS's (e.g., SGI).
 typedef void *ACE_MMAP_TYPE;
@@ -326,3 +329,4 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path)
 # endif /* ACE_HAS_SHM_OPEN */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_msg.cpp b/ace/OS_NS_sys_msg.cpp
index 917121a8680..328f3ec6975 100644
--- a/ace/OS_NS_sys_msg.cpp
+++ b/ace/OS_NS_sys_msg.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_msg.h"
diff --git a/ace/OS_NS_sys_msg.h b/ace/OS_NS_sys_msg.h
index 37b4743d43b..4dcd9be5461 100644
--- a/ace/OS_NS_sys_msg.h
+++ b/ace/OS_NS_sys_msg.h
@@ -33,6 +33,8 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
   //@{ @name A set of wrappers for System V message queues.
@@ -61,6 +63,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_msg.inl b/ace/OS_NS_sys_msg.inl
index 7f71a4a75cc..129b4c389c1 100644
--- a/ace/OS_NS_sys_msg.inl
+++ b/ace/OS_NS_sys_msg.inl
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val)
 {
@@ -71,3 +74,5 @@ ACE_OS::msgsnd (int int_id, const void *buf, size_t len, int flags)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_SYSV_IPC */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_resource.cpp b/ace/OS_NS_sys_resource.cpp
index 3499e4bfc5c..44a1e9584c0 100644
--- a/ace/OS_NS_sys_resource.cpp
+++ b/ace/OS_NS_sys_resource.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_resource.h"
diff --git a/ace/OS_NS_sys_resource.h b/ace/OS_NS_sys_resource.h
index 7486dd2a1c7..3c73ad0ab9d 100644
--- a/ace/OS_NS_sys_resource.h
+++ b/ace/OS_NS_sys_resource.h
@@ -33,7 +33,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int getrlimit (int resource,
@@ -50,6 +53,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_resource.inl b/ace/OS_NS_sys_resource.inl
index ea6fc92849d..50d696b2059 100644
--- a/ace/OS_NS_sys_resource.inl
+++ b/ace/OS_NS_sys_resource.inl
@@ -1,9 +1,12 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::getrlimit (int resource, struct rlimit *rl)
 {
@@ -52,8 +55,8 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 #   endif /* ACE_HAS_RUSAGE_WHO_ENUM */
 # endif /* ACE_WIN32 */
 #else
-  who = who;
-  ru = ru;
+  ACE_UNUSED_ARG (who);
+  ACE_UNUSED_ARG (ru);
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_SYSCALL_GETRUSAGE */
 }
@@ -76,9 +79,9 @@ ACE_OS::setrlimit (int resource, const struct rlimit *rl)
                                   ), int, -1);
 # else
   ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource,
-                                  resource,
+                                  rl
                                   ), int, -1);
-#  endif /* ACE_HAS_NONCONST_SETRLIMIT */				  
+#  endif /* ACE_HAS_NONCONST_SETRLIMIT */
 # else /* ACE_HAS_RLIMIT_RESOURCE_ENUM */
 #  if defined (ACE_HAS_NONCONST_SETRLIMIT)
   ACE_OSCALL_RETURN (::setrlimit (resource, const_cast<struct rlimit *>(rl)
@@ -86,7 +89,8 @@ ACE_OS::setrlimit (int resource, const struct rlimit *rl)
 #  else
   ACE_OSCALL_RETURN (::setrlimit (resource, rl), int, -1);
 #  endif /* ACE_HAS_NONCONST_SETRLIMIT */
-# endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */  
+# endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */
 #endif /* ACE_LACKS_RLIMIT */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_select.cpp b/ace/OS_NS_sys_select.cpp
index fb2bc11b1b2..eafd1f2caae 100644
--- a/ace/OS_NS_sys_select.cpp
+++ b/ace/OS_NS_sys_select.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_select.h"
diff --git a/ace/OS_NS_sys_select.h b/ace/OS_NS_sys_select.h
index 1a33c485e56..443d594ae09 100644
--- a/ace/OS_NS_sys_select.h
+++ b/ace/OS_NS_sys_select.h
@@ -40,10 +40,12 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-class ACE_Time_Value;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-namespace ACE_OS {
+class ACE_Time_Value;
 
+namespace ACE_OS
+{
   // Should be moved to cpp or inl.
   ACE_NAMESPACE_INLINE_FUNCTION
   int select (int width,
@@ -61,6 +63,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_select.inl b/ace/OS_NS_sys_select.inl
index a46dc4bc800..11d1fba8cae 100644
--- a/ace/OS_NS_sys_select.inl
+++ b/ace/OS_NS_sys_select.inl
@@ -1,10 +1,13 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_macros.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // It would be really cool to add another version of select that would
 // function like the one we're defending against below!
 ACE_INLINE int
@@ -16,7 +19,7 @@ ACE_OS::select (int width,
 #if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
   // We must defend against non-conformity!
   timeval copy;
-  timeval *timep;
+  timeval *timep = 0;
 
   if (timeout != 0)
     {
@@ -76,3 +79,4 @@ ACE_OS::select (int width,
 #undef ___ACE_TIMEOUT
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_shm.cpp b/ace/OS_NS_sys_shm.cpp
index 5feb509e5db..16b10605b82 100644
--- a/ace/OS_NS_sys_shm.cpp
+++ b/ace/OS_NS_sys_shm.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_shm.h"
diff --git a/ace/OS_NS_sys_shm.h b/ace/OS_NS_sys_shm.h
index de1214a9bb1..df39efdfd60 100644
--- a/ace/OS_NS_sys_shm.h
+++ b/ace/OS_NS_sys_shm.h
@@ -33,12 +33,15 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   //@{ @name A set of wrappers for System V shared memory.
   ACE_NAMESPACE_INLINE_FUNCTION
   void *shmat (int int_id,
-               void *shmaddr,
+               const void *shmaddr,
                int shmflg);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -47,7 +50,7 @@ namespace ACE_OS {
               struct shmid_ds *buf);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int shmdt (void *shmaddr);
+  int shmdt (const void *shmaddr);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int shmget (key_t key,
@@ -57,6 +60,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_shm.inl b/ace/OS_NS_sys_shm.inl
index 1df7d9c7764..ef7fef59847 100644
--- a/ace/OS_NS_sys_shm.inl
+++ b/ace/OS_NS_sys_shm.inl
@@ -1,14 +1,21 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void *
-ACE_OS::shmat (int int_id, void *shmaddr, int shmflg)
+ACE_OS::shmat (int int_id, const void *shmaddr, int shmflg)
 {
   ACE_OS_TRACE ("ACE_OS::shmat");
 #if defined (ACE_HAS_SYSV_IPC)
-  ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char *> (shmaddr), shmflg), void *, (void *) -1);
+#  if defined (ACE_HAS_CHARPTR_SHMAT)
+  ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char*> (const_cast <void *>(shmaddr)), shmflg), void *, (void *) -1);
+#  else
+  ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1);
+#  endif /* ACE_HAS_CHARPTR_SHMAT */
 #else
   ACE_UNUSED_ARG (int_id);
   ACE_UNUSED_ARG (shmaddr);
@@ -34,11 +41,16 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf)
 }
 
 ACE_INLINE int
-ACE_OS::shmdt (void *shmaddr)
+ACE_OS::shmdt (const void *shmaddr)
 {
   ACE_OS_TRACE ("ACE_OS::shmdt");
 #if defined (ACE_HAS_SYSV_IPC)
-  ACE_OSCALL_RETURN (::shmdt ((char *) shmaddr), int, -1);
+#  if defined (ACE_HAS_CHARPTR_SHMDT)
+     ACE_OSCALL_RETURN (::shmdt (
+      static_cast <char*> (const_cast <void *>(shmaddr))), int, -1);
+# else
+     ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1);
+#  endif /* ACE_HAS_CHARPTR_SHMDT */
 #else
   ACE_UNUSED_ARG (shmaddr);
 
@@ -60,3 +72,5 @@ ACE_OS::shmget (key_t key, size_t size, int flags)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_SYSV_IPC */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_socket.cpp b/ace/OS_NS_sys_socket.cpp
index 78ea8a5fcfd..f0ff6acc5d7 100644
--- a/ace/OS_NS_sys_socket.cpp
+++ b/ace/OS_NS_sys_socket.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_socket.h"
@@ -9,11 +8,13 @@ ACE_RCSID(ace, OS_NS_sys_socket, "$Id$")
 # include "ace/OS_NS_sys_socket.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32)
 int ACE_OS::socket_initialized_;
 #endif /* ACE_WIN32 */
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
 ACE_HANDLE
 ACE_OS::accept (ACE_HANDLE handle,
                 struct sockaddr *addr,
@@ -94,7 +95,7 @@ ACE_OS::join_leaf (ACE_HANDLE socket,
   ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
 # endif /* ACE_HAS_WINSOCK2 */
 }
-#endif  // ACE_HAS_WINCE
+#endif  /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
 
 int
 ACE_OS::socket_init (int version_high, int version_low)
@@ -157,3 +158,4 @@ ACE_OS::socket_fini (void)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_socket.h b/ace/OS_NS_sys_socket.h
index c984c30758a..6c1103e0052 100644
--- a/ace/OS_NS_sys_socket.h
+++ b/ace/OS_NS_sys_socket.h
@@ -60,10 +60,13 @@
 #define ACE_SHUTDOWN_BOTH 2
 #endif /* SD_BOTH */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Accept_QoS_Params;
 class ACE_QoS_Params;
 
-namespace ACE_OS {
+namespace ACE_OS
+{
 
 # if defined (ACE_WIN32)
   /// Keeps track of whether we've already initialized WinSock...
@@ -77,7 +80,7 @@ namespace ACE_OS {
                      struct sockaddr *addr,
                      int *addrlen);
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /**
    * QoS-enabled <accept>, which passes <qos_params> to <accept>.  If
    * the OS platform doesn't support QoS-enabled <accept> then the
@@ -88,7 +91,7 @@ namespace ACE_OS {
                      struct sockaddr *addr,
                      int *addrlen,
                      const ACE_Accept_QoS_Params &qos_params);
-#endif  // ACE_HAS_WINCE
+#endif  /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int bind (ACE_HANDLE s,
@@ -105,7 +108,7 @@ namespace ACE_OS {
                struct sockaddr *addr,
                int addrlen);
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /**
    * QoS-enabled <connect>, which passes <qos_params> to <connect>.
    * If the OS platform doesn't support QoS-enabled <connect> then the
@@ -116,7 +119,7 @@ namespace ACE_OS {
                const sockaddr *addr,
                int addrlen,
                const ACE_QoS_Params &qos_params);
-#endif  // ACE_HAS_WINCE
+#endif  /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
 
   /// Retrieve information about available transport protocols
   /// installed on the local machine. Windows specific...
@@ -141,14 +144,14 @@ namespace ACE_OS {
                   char *optval,
                   int *optlen);
 
-#if !defined (ACE_HAS_WINCE)
+#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /// Joins a leaf node into a QoS-enabled multi-point session.
   extern ACE_Export
   ACE_HANDLE join_leaf (ACE_HANDLE socket,
                         const sockaddr *name,
                         int namelen,
                         const ACE_QoS_Params &qos_params);
-#endif  // ACE_HAS_WINCE
+#endif  /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int listen (ACE_HANDLE handle,
@@ -285,6 +288,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index 801e6858d02..b7b3c8d3151 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -15,6 +15,8 @@
 #include "ace/OS_NS_string.h"
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_VOIDPTR_SOCKOPT)
 typedef void *ACE_SOCKOPT_TYPE1;
 #elif defined (ACE_HAS_CHARPTR_SOCKOPT)
@@ -76,7 +78,7 @@ ACE_OS::accept (ACE_HANDLE handle,
        addr = (sockaddr *) &fake_addr;
        *addrlen = sizeof fake_addr;
      }
-#    endif /* VXWORKS */
+#    endif /* ACE_HAS_BROKEN_ACCEPT_ADDR */
   ACE_HANDLE ace_result = ::accept ((ACE_SOCKET) handle,
                                     addr,
                                     (ACE_SOCKET_LEN *) addrlen);
@@ -635,7 +637,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                 int addrlen)
 {
   ACE_OS_TRACE ("ACE_OS::sendto");
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle,
                                  const_cast <char *> (buf),
                                  len,
@@ -671,7 +673,7 @@ ACE_OS::sendto (ACE_HANDLE handle,
                                  addrlen),
                        ssize_t, -1);
 #  endif /* ACE_WIN32 */
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 }
 
 ACE_INLINE ssize_t
@@ -847,13 +849,22 @@ ACE_OS::setsockopt (ACE_HANDLE handle,
   }
   #endif /*ACE_HAS_WINSOCK2*/
 
-  ACE_SOCKCALL_RETURN (::setsockopt ((ACE_SOCKET) handle,
-                                     level,
-                                     optname,
-                                     (ACE_SOCKOPT_TYPE1) optval,
-                                     optlen),
-                       int,
-                       -1);
+  int result;
+  ACE_SOCKCALL (::setsockopt ((ACE_SOCKET) handle,
+                              level,
+                              optname,
+                              (ACE_SOCKOPT_TYPE1) optval,
+                              optlen),
+                int,
+                -1,
+                result);
+#if defined (WSAEOPNOTSUPP)
+  if (result == -1 && errno == WSAEOPNOTSUPP)
+#else 
+  if (result == -1)
+#endif /* WSAEOPNOTSUPP */
+    errno = ENOTSUP;
+  return result;
 }
 
 ACE_INLINE int
@@ -954,3 +965,5 @@ ACE_OS::if_freenameindex (struct if_nameindex *ptr)
     ::if_freenameindex (ptr);
 }
 #endif /* __linux__ && ACE_HAS_IPV6 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_stat.cpp b/ace/OS_NS_sys_stat.cpp
index fa50a6b040d..a372f414075 100644
--- a/ace/OS_NS_sys_stat.cpp
+++ b/ace/OS_NS_sys_stat.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_stat.h"
diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h
index fbb7312cb78..dfae190203e 100644
--- a/ace/OS_NS_sys_stat.h
+++ b/ace/OS_NS_sys_stat.h
@@ -34,13 +34,16 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) && !defined(__IBMCPP__)
       typedef struct _stat ACE_stat;
 # else
       typedef struct stat ACE_stat;
 # endif /* ACE_WIN32 */
 
-namespace ACE_OS {
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_HANDLE creat (const ACE_TCHAR *filename,
@@ -50,11 +53,10 @@ namespace ACE_OS {
 
   // non-standard
   ACE_NAMESPACE_INLINE_FUNCTION
-  long filesize (ACE_HANDLE handle);
+  off_t filesize (ACE_HANDLE handle);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  long filesize (const ACE_TCHAR *handle);
-
+  off_t filesize (const ACE_TCHAR *handle);
 
   //@}
 
@@ -93,6 +95,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl
index 382863a2f59..6ae9a7a435d 100644
--- a/ace/OS_NS_sys_stat.inl
+++ b/ace/OS_NS_sys_stat.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
@@ -6,7 +7,10 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_macros.h"
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   ACE_INLINE ACE_HANDLE
   creat (const ACE_TCHAR *filename, mode_t mode)
@@ -18,11 +22,7 @@ namespace ACE_OS {
     ACE_OSCALL_RETURN(::create_f((char *)filename, 1024,
                                  S_IRUSR | S_IWUSR | S_IXUSR),
                       ACE_HANDLE, ACE_INVALID_HANDLE);
-#elif defined(ACE_PSOS_TM)
-    ACE_UNUSED_ARG (filename);
-    ACE_UNUSED_ARG (mode);
-    ACE_NOTSUP_RETURN (-1);
-#elif defined(ACE_PSOS)
+#elif defined(ACE_PSOS_TM) || defined (ACE_PSOS)
     ACE_UNUSED_ARG (filename);
     ACE_UNUSED_ARG (mode);
     ACE_NOTSUP_RETURN (-1);
@@ -111,19 +111,19 @@ namespace ACE_OS {
   // This function returns the number of bytes in the file referenced by
   // FD.
 
-  ACE_INLINE long
+  ACE_INLINE off_t
   filesize (ACE_HANDLE handle)
   {
     ACE_OS_TRACE ("ACE_OS::filesize");
 #if defined (ACE_WIN32)
-    ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), long, -1);
+    ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), off_t, -1);
 #else /* !ACE_WIN32 */
     ACE_stat sb;
-    return ACE_OS::fstat (handle, &sb) == -1 ? -1 : (long) sb.st_size;
+    return ACE_OS::fstat (handle, &sb) == -1 ? -1 : sb.st_size;
 #endif /* ACE_WIN32 */
   }
 
-  ACE_INLINE long
+  ACE_INLINE off_t
   filesize (const ACE_TCHAR *filename)
   {
     ACE_OS_TRACE ("ACE_OS::filesize");
@@ -131,7 +131,7 @@ namespace ACE_OS {
     ACE_HANDLE h = ACE_OS::open (filename, O_RDONLY);
     if (h != ACE_INVALID_HANDLE)
       {
-        long size = ACE_OS::filesize (h);
+        off_t size = ACE_OS::filesize (h);
         ACE_OS::close (h);
         return size;
       }
@@ -209,7 +209,7 @@ namespace ACE_OS {
 
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
     ACE_UNUSED_ARG (mode);
-    ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1);
+    ACE_OSCALL_RETURN (::_mkdir (const_cast <char *> (path)), int, -1);
 #elif defined (ACE_HAS_WINCE)
     ACE_UNUSED_ARG (mode);
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_TO_TCHAR_IN (path), 0),
@@ -347,7 +347,7 @@ namespace ACE_OS {
 # if defined (ACE_LACKS_UMASK)
     ACE_UNUSED_ARG (cmask);
     ACE_NOTSUP_RETURN ((mode_t)-1);
-# elif defined (ACE_WIN32)
+# elif defined (ACE_WIN32) && !defined (__BORLANDC__)
     ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1);
 # else
     return ::umask (cmask); // This call shouldn't fail...
@@ -355,3 +355,5 @@ namespace ACE_OS {
   }
 
 } // ACE_OS namespace
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_time.cpp b/ace/OS_NS_sys_time.cpp
index 2109fa005e0..be0a28d76b7 100644
--- a/ace/OS_NS_sys_time.cpp
+++ b/ace/OS_NS_sys_time.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_time.h"
diff --git a/ace/OS_NS_sys_time.h b/ace/OS_NS_sys_time.h
index 23be37b8d29..2bbcb30415f 100644
--- a/ace/OS_NS_sys_time.h
+++ b/ace/OS_NS_sys_time.h
@@ -33,7 +33,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 // Something is a bit brain-damaged here and I'm not sure what... this code
 // compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
@@ -43,13 +46,17 @@ namespace ACE_OS {
 //    - Steve Huston, 23-Aug-2004
 extern "C++" {
 #endif
+
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_Time_Value gettimeofday (void);
+
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 }
 #endif
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_time.inl b/ace/OS_NS_sys_time.inl
index 6aec9b145dc..59f513aebcb 100644
--- a/ace/OS_NS_sys_time.inl
+++ b/ace/OS_NS_sys_time.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/os_include/sys/os_time.h"
@@ -8,6 +9,8 @@
 #  include "ace/OS_NS_time.h"
 #endif /* VXWORKS || CHORUS || ACE_PSOS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 // Something is a bit brain-damaged here and I'm not sure what... this code
 // compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
@@ -80,7 +83,7 @@ ACE_OS::gettimeofday (void)
 #endif /* 0 */
 #if !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32)
   if (result == -1)
-    return -1;
+    return ACE_Time_Value (-1);
   else
     return ACE_Time_Value (tv);
 #endif // !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32)
@@ -89,3 +92,5 @@ ACE_OS::gettimeofday (void)
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 }
 #endif
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_uio.cpp b/ace/OS_NS_sys_uio.cpp
index 5b7563dc7fd..708ea5701a3 100644
--- a/ace/OS_NS_sys_uio.cpp
+++ b/ace/OS_NS_sys_uio.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_uio.h"
@@ -13,6 +12,8 @@ ACE_RCSID(ace, OS_NS_sys_uio, "$Id$")
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_LACKS_READV)
 
 // "Fake" readv for operating systems without it.  Note that this is
@@ -125,3 +126,5 @@ ACE_OS::writev_emulation (ACE_HANDLE handle, const iovec *iov, int n)
   return bytes_sent;
 }
 # endif /* ACE_LACKS_WRITEV */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_uio.h b/ace/OS_NS_sys_uio.h
index 2978b95501f..597a06919d9 100644
--- a/ace/OS_NS_sys_uio.h
+++ b/ace/OS_NS_sys_uio.h
@@ -33,7 +33,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ssize_t readv (ACE_HANDLE handle,
@@ -63,6 +66,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_uio.inl b/ace/OS_NS_sys_uio.inl
index c216e9d0a8f..b8d112bba84 100644
--- a/ace/OS_NS_sys_uio.inl
+++ b/ace/OS_NS_sys_uio.inl
@@ -4,6 +4,8 @@
 
 #include "ace/os_include/os_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ssize_t
 ACE_OS::readv (ACE_HANDLE handle,
                const iovec *iov,
@@ -16,11 +18,11 @@ ACE_OS::readv (ACE_HANDLE handle,
                      -1);
 #else /* ACE_LACKS_READV */
 #if defined (ACE_HAS_NONCONST_READV)
-  ACE_OSCALL_RETURN (::readv (handle, 
-                              const_cast<iovec *>(iov), 
+  ACE_OSCALL_RETURN (::readv (handle,
+                              const_cast<iovec *>(iov),
                               iovlen), ssize_t, -1);
 #else
-  ACE_OSCALL_RETURN (::readv (handle, 
+  ACE_OSCALL_RETURN (::readv (handle,
                               iov,
                               iovlen), ssize_t, -1);
 #endif /* ACE_HAS_NONCONST_READV */
@@ -49,3 +51,5 @@ ACE_OS::writev (ACE_HANDLE handle,
 #endif /* ACE_HAS_NONCONST_WRITEV */
 #endif /* ACE_LACKS_WRITEV */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_utsname.cpp b/ace/OS_NS_sys_utsname.cpp
index be9c24a089c..ea4e96c1348 100644
--- a/ace/OS_NS_sys_utsname.cpp
+++ b/ace/OS_NS_sys_utsname.cpp
@@ -1,32 +1,27 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_utsname.h"
 
 ACE_RCSID(ace, OS_NS_sys_utsname, "$Id$")
 
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS_NS_sys_utsname.inl"
-#endif /* ACE_HAS_INLINED_OS_CALLS */
-
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_UNAME)
 // for sysBspRev(), sysModel()
-#  include /**/ <sysLib.h> 
-#endif /* VXWORKS */
+#  include /**/ <sysLib.h>
+#endif /* ACE_VXWORKS && ACE_LACKS_UNAME */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS)
-// Don't inline on those platforms because this function contains
-// string literals, and some compilers, e.g., g++, don't handle those
-// efficiently in unused inline functions.
 int
 ACE_OS::uname (ACE_utsname *name)
 {
   ACE_OS_TRACE ("ACE_OS::uname");
-# if defined (ACE_WIN32)
+#if !defined (ACE_LACKS_UNAME)
+  ACE_OSCALL_RETURN (::uname (name), int, -1);
+#elif defined (ACE_WIN32)
   size_t maxnamelen = sizeof name->nodename;
   ACE_OS::strcpy (name->sysname,
                   ACE_LIB_TEXT ("Win32"));
@@ -138,6 +133,20 @@ ACE_OS::uname (ACE_utsname *name)
                            sinfo.wProcessorLevel);
           break;
 #     endif
+#     if defined PROCESSOR_ARCHITECTURE_AMD64
+        case PROCESSOR_ARCHITECTURE_AMD64:
+          ACE_OS::strcpy (processor, ACE_LIB_TEXT ("x64"));
+          ACE_OS::sprintf (subtype, ACE_LIB_TEXT ("%d"),
+                           sinfo.wProcessorLevel);
+          break;
+#     endif
+#     if defined PROCESSOR_ARCHITECTURE_IA32_ON_WIN64
+        case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
+          ACE_OS::strcpy (processor, ACE_LIB_TEXT ("WOW64"));
+          ACE_OS::sprintf (subtype, ACE_LIB_TEXT ("%d"),
+                           sinfo.wProcessorLevel);
+          break;
+#     endif
 #     if defined PROCESSOR_ARCHITECTURE_ARM
         case PROCESSOR_ARCHITECTURE_ARM:
           ACE_OS::strcpy (processor, ACE_LIB_TEXT ("ARM"));
@@ -205,7 +214,7 @@ ACE_OS::uname (ACE_utsname *name)
   return ACE_OS::hostname (name->nodename, maxnamelen);
 # endif /* ACE_LACKS_HOSTNAME */
 
-# elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS)
   size_t maxnamelen = sizeof name->nodename;
   ACE_OS::strcpy (name->sysname, "VxWorks");
   ACE_OS::strcpy (name->release, "???");
@@ -213,7 +222,7 @@ ACE_OS::uname (ACE_utsname *name)
   ACE_OS::strcpy (name->machine, sysModel ());
 
   return ACE_OS::hostname (name->nodename, maxnamelen);
-# elif defined (CHORUS)
+#elif defined (CHORUS)
   size_t maxnamelen = sizeof name->nodename;
   ACE_OS::strcpy (name->sysname, "CHORUS/ClassiX");
   ACE_OS::strcpy (name->release, "???");
@@ -230,7 +239,18 @@ ACE_OS::uname (ACE_utsname *name)
   ACE_OS::strcpy (name->release, "???");
   ACE_OS::strcpy (name->version, buf);
   ACE_OS::strcpy (name->machine, "PPC 405");  // a bit of a hack
-
+#elif defined (INTEGRITY)
+  if(!name) {
+    errno = EFAULT;
+    return -1;
+  }
+  strcpy(name->sysname,"INTEGRITY");
+  int status = gethostname(name->nodename,_SYS_NMLN);
+  strcpy(name->release,"4.0");
+  strcpy(name->version,"4.0.9");
+  strcpy(name->machine,"a standard name");
+  return status;
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_WIN32 || VXWORKS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_utsname.h b/ace/OS_NS_sys_utsname.h
index b65268a37f4..968c9ee28a8 100644
--- a/ace/OS_NS_sys_utsname.h
+++ b/ace/OS_NS_sys_utsname.h
@@ -39,6 +39,7 @@
 #   if !defined (_SYS_NMLN)
 #     define _SYS_NMLN SYS_NMLN
 #   endif /* _SYS_NMLN */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 struct ACE_utsname
 {
   ACE_TCHAR sysname[_SYS_NMLN];
@@ -47,29 +48,24 @@ struct ACE_utsname
   ACE_TCHAR version[_SYS_NMLN];
   ACE_TCHAR machine[_SYS_NMLN];
 };
+ACE_END_VERSIONED_NAMESPACE_DECL
 # else
 #   include "ace/os_include/sys/os_utsname.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct utsname ACE_utsname;
+ACE_END_VERSIONED_NAMESPACE_DECL
 # endif /* ACE_LACKS_UTSNAME_T */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
-#if !defined (ACE_WIN32) && !defined (VXWORKS) && !defined (CHORUS) && !defined (ACE_PSOS)
-  ACE_NAMESPACE_INLINE_FUNCTION
-#else
   extern ACE_Export
-#endif /* ! ACE_WIN32 && ! VXWORKS && ! CHORUS */
   int uname (ACE_utsname *name);
 
 } /* namespace ACE_OS */
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS_NS_sys_utsname.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 # include /**/ "ace/post.h"
 #endif /* ACE_OS_NS_SYS_UTSNAME_H */
diff --git a/ace/OS_NS_sys_utsname.inl b/ace/OS_NS_sys_utsname.inl
deleted file mode 100644
index eb660f2cad6..00000000000
--- a/ace/OS_NS_sys_utsname.inl
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ace/os_include/os_errno.h"
-
-namespace ACE_OS
-{
-#if !defined (ACE_WIN32) && !defined (VXWORKS) && !defined (CHORUS) && !defined (ACE_PSOS)
-// Don't inline on those platforms because this function contains
-// string literals, and some compilers, e.g., g++, don't handle those
-// efficiently in unused inline functions.
-  ACE_INLINE int
-  uname (ACE_utsname *name)
-  {
-#if defined (INTEGRITY)
-    if(!name) {
-      errno = EFAULT;
-      return -1;
-    }
-    strcpy(name->sysname,"INTEGRITY");
-    int status = gethostname(name->nodename,_SYS_NMLN);
-    strcpy(name->release,"4.0");
-    strcpy(name->version,"4.0.9");
-    strcpy(name->machine,"a standard name");
-    return status;
-#else
-    ACE_OS_TRACE ("ACE_OS::uname");
-    ACE_OSCALL_RETURN (::uname (name), int, -1);
-#endif
-  }
-#endif /* ! ACE_WIN32 && ! VXWORKS && ! CHORUS */
-} // namespace ACE_OS
diff --git a/ace/OS_NS_sys_wait.cpp b/ace/OS_NS_sys_wait.cpp
index 0a1b8ee4d50..0e0e6abcbe1 100644
--- a/ace/OS_NS_sys_wait.cpp
+++ b/ace/OS_NS_sys_wait.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_sys_wait.h"
diff --git a/ace/OS_NS_sys_wait.h b/ace/OS_NS_sys_wait.h
index 5fccad22916..58113c7d5b1 100644
--- a/ace/OS_NS_sys_wait.h
+++ b/ace/OS_NS_sys_wait.h
@@ -33,20 +33,23 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-  /// Calls OS <::wait> function, so it's only portable to UNIX/POSIX
+namespace ACE_OS
+{
+
+  /// Calls OS @c ::wait function, so it's only portable to UNIX/POSIX
   /// platforms.
   ACE_NAMESPACE_INLINE_FUNCTION
   pid_t wait (int * = 0);
 
   /**
-   * Calls <::WaitForSingleObject> on Win32 and <ACE::waitpid>
-   * otherwise.  Returns the passed in <pid_t> on success and -1 on
+   * Calls @c ::WaitForSingleObject on Win32 and ACE::waitpid ()
+   * otherwise.  Returns the passed in @a pid_t on success and -1 on
    * failure.
-   * On Win32, <pid> is ignored if the <handle> is not equal to 0.
-   * Passing the process <handle> is prefer on Win32 because using
-   * <pid> to wait on the project doesn't always work correctly
+   * On Win32, @a pid is ignored if the @a handle is not equal to 0.
+   * Passing the process @a handle is prefer on Win32 because using
+   * @a pid to wait on the project doesn't always work correctly
    * if the waited process has already terminated.
    */
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -56,11 +59,11 @@ namespace ACE_OS {
               ACE_HANDLE handle = 0);
 
   /**
-   * Calls <::waitpid> on UNIX/POSIX platforms and <::await> on
-   * Chorus.  Does not work on Vxworks, or pSoS.
-   * On Win32, <pid> is ignored if the <handle> is not equal to 0.
-   * Passing the process <handle> is prefer on Win32 because using
-   * <pid> to wait on the project doesn't always work correctly
+   * Calls @c ::waitpid on UNIX/POSIX platforms and @c ::await on
+   * Chorus. Does not work on Vxworks 5.5.x, or pSoS.
+   * On Win32, @a pid is ignored if the @a handle is not equal to 0.
+   * Passing the process @a handle is prefer on Win32 because using
+   * @a pid to wait on the project doesn't always work correctly
    * if the waited process has already terminated.
    */
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -71,6 +74,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_sys_wait.inl b/ace/OS_NS_sys_wait.inl
index 85afcb961ce..d8d3247cbcf 100644
--- a/ace/OS_NS_sys_wait.inl
+++ b/ace/OS_NS_sys_wait.inl
@@ -1,9 +1,12 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE pid_t
 ACE_OS::wait (int *status)
 {
@@ -109,4 +112,4 @@ ACE_OS::wait (pid_t pid,
                           handle);
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_time.cpp b/ace/OS_NS_time.cpp
index 1ff3be39f7f..70b783c7fac 100644
--- a/ace/OS_NS_time.cpp
+++ b/ace/OS_NS_time.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_time.h"
@@ -18,26 +17,42 @@ ACE_RCSID(ace, OS_NS_time, "$Id$")
 
 #if defined (ACE_HAS_WINCE)
 #  include "ace/OS_NS_stdio.h"     /* Need ACE_OS::sprintf() */
-const ACE_TCHAR *ACE_OS::day_of_week_name[7] =
-                                     {ACE_LIB_TEXT ("Sun"),
-                                      ACE_LIB_TEXT ("Mon"),
-                                      ACE_LIB_TEXT ("Tue"),
-                                      ACE_LIB_TEXT ("Wed"),
-                                      ACE_LIB_TEXT ("Thu"),
-                                      ACE_LIB_TEXT ("Fri"),
-                                      ACE_LIB_TEXT ("Sat")};
-
-const ACE_TCHAR *ACE_OS::month_name[12] =
-                                {ACE_LIB_TEXT ("Jan"), ACE_LIB_TEXT ("Feb"),
-                                 ACE_LIB_TEXT ("Mar"), ACE_LIB_TEXT ("Apr"),
-                                 ACE_LIB_TEXT ("May"), ACE_LIB_TEXT ("Jun"),
-                                 ACE_LIB_TEXT ("Jul"), ACE_LIB_TEXT ("Aug"),
-                                 ACE_LIB_TEXT ("Sep"), ACE_LIB_TEXT ("Oct"),
-                                 ACE_LIB_TEXT ("Nov"), ACE_LIB_TEXT ("Dec") };
-
-static const ACE_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_LIB_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n");
+
+namespace
+{
+  ACE_TCHAR const * const ACE_OS_day_of_week_name[] =
+    {
+      ACE_LIB_TEXT ("Sun"),
+      ACE_LIB_TEXT ("Mon"),
+      ACE_LIB_TEXT ("Tue"),
+      ACE_LIB_TEXT ("Wed"),
+      ACE_LIB_TEXT ("Thu"),
+      ACE_LIB_TEXT ("Fri"),
+      ACE_LIB_TEXT ("Sat")
+    };
+
+  ACE_TCHAR const * const ACE_OS_month_name[] =
+    {
+      ACE_LIB_TEXT ("Jan"),
+      ACE_LIB_TEXT ("Feb"),
+      ACE_LIB_TEXT ("Mar"),
+      ACE_LIB_TEXT ("Apr"),
+      ACE_LIB_TEXT ("May"),
+      ACE_LIB_TEXT ("Jun"),
+      ACE_LIB_TEXT ("Jul"),
+      ACE_LIB_TEXT ("Aug"),
+      ACE_LIB_TEXT ("Sep"),
+      ACE_LIB_TEXT ("Oct"),
+      ACE_LIB_TEXT ("Nov"),
+      ACE_LIB_TEXT ("Dec")
+    };
+
+  static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_LIB_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n");
+} /* end blank namespace */
 #endif /* ACE_HAS_WINCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_PSOS)
 
 // bit masks and shifts for prying info out of the pSOS time encoding
@@ -237,8 +252,8 @@ ACE_OS::ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen)
   FileTimeToLocalFileTime (&file_time, &localtime);
   FileTimeToSystemTime (&localtime, &systime);
   ACE_OS::sprintf (buf, ACE_OS_CTIME_R_FMTSTR,
-                   ACE_OS::day_of_week_name[systime.wDayOfWeek],
-                   ACE_OS::month_name[systime.wMonth - 1],
+                   ACE_OS_day_of_week_name[systime.wDayOfWeek],
+                   ACE_OS_month_name[systime.wMonth - 1],
                    systime.wDay,
                    systime.wHour,
                    systime.wMinute,
@@ -447,7 +462,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
 
    res->tm_mday = systime.wDay;
    res->tm_min = systime.wMinute;
-   res->tm_mon = systime.wMonth;
+   res->tm_mon = systime.wMonth - 1;
    res->tm_sec = systime.wSecond;
    res->tm_wday = systime.wDayOfWeek;
    res->tm_yday = __mon_yday[iLeap][systime.wMonth] + systime.wDay;
@@ -791,3 +806,5 @@ ACE_OS::strptime_getnum (char *buf,
 }
 # endif /* ACE_LACKS_NATIVE_STRPTIME */
 #endif /* ACE_HAS_STRPTIME */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_time.h b/ace/OS_NS_time.h
index a9a4186a928..a0be9688f7a 100644
--- a/ace/OS_NS_time.h
+++ b/ace/OS_NS_time.h
@@ -40,6 +40,8 @@
 #   undef asctime_r
 # endif /* ACE_HAS_BROKEN_R_ROUTINES */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Type-safe, and unsigned.
 static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U;
 static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U;
@@ -154,14 +156,14 @@ inline long ace_timezone()
 #elif defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY)
   // The XPG/POSIX specification does not require gettimeofday to
   // set the timezone struct (it leaves the behavior of passing a
-  // non-null struct undefined). 
+  // non-null struct undefined).
   long result = 0;
   struct timeval time;
   struct timezone zone;
   ACE_UNUSED_ARG (result);
   ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result);
   return zone.tz_minuteswest * 60;
-#else  
+#else
   ACE_NOTSUP_RETURN (0);
 #endif
 }
@@ -213,7 +215,6 @@ 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)
 #   define ACE_HRTIME_TO_U64(VAL) ACE_U_LongLong(VAL)
@@ -222,14 +223,8 @@ typedef long long ACE_hrtime_t;
 #   define ACE_HRTIME_TO_U64(VAL) (VAL)
 # endif
 
-
-namespace ACE_OS {
-
-# if defined (ACE_HAS_WINCE)
-  /// Supporting data for ctime and ctime_r functions on WinCE.
-  const ACE_TCHAR *day_of_week_name[];
-  const ACE_TCHAR *month_name[];
-# endif /* ACE_HAS_WINCE */
+namespace ACE_OS
+{
 
 # if defined (CHORUS) && !defined (CHORUS_4)
   // We must format this code as follows to avoid confusing OSE.
@@ -265,7 +260,7 @@ namespace ACE_OS {
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int clock_settime (clockid_t,
-		     const struct timespec *);
+                     const struct timespec *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_TCHAR *ctime (const time_t *t);
@@ -356,6 +351,19 @@ namespace ACE_OS {
   //@}
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1) \
+    && defined (ghs) \
+    && defined (ACE_HAS_PENTIUM) \
+    && !defined (ACE_WIN32)
+#define ACE_GETHRTIME_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _gethrtime))
+#else
+# define ACE_GETHRTIME_NAME ACE_gethrtime
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index b9243532d15..fbce238b080 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_string.h"
@@ -8,6 +9,8 @@
 #include "ace/OS_NS_sys_time.h"
 //#include "ace/TSS_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE char *
 ACE_OS::asctime (const struct tm *t)
 {
@@ -223,7 +226,7 @@ ACE_OS::difftime (time_t t1, time_t t0)
 #endif /* ! ACE_LACKS_DIFFTIME */
 
 #if defined (ghs) && defined (ACE_HAS_PENTIUM) && !defined (ACE_WIN32)
-  extern "C" ACE_hrtime_t ACE_gethrtime ();
+  extern "C" ACE_hrtime_t ACE_GETHRTIME_NAME ();
 #endif /* ghs && ACE_HAS_PENTIUM */
 
 ACE_INLINE ACE_hrtime_t
@@ -244,7 +247,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 #elif defined (ghs) && defined (ACE_HAS_PENTIUM) && !defined (ACE_WIN32)
   ACE_UNUSED_ARG (op);
   // Use .obj/gethrtime.o, which was compiled with g++.
-  return ACE_gethrtime ();
+  return ACE_GETHRTIME_NAME ();
 #elif (defined(__KCC) || defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined (ACE_WIN32) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)
   ACE_UNUSED_ARG (op);
 # if defined (ACE_LACKS_LONGLONG_T)
@@ -364,7 +367,12 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
   ACE_UNUSED_ARG (op);
   struct timespec ts;
 
-  ACE_OS::clock_gettime (CLOCK_REALTIME, &ts);
+  ACE_OS::clock_gettime (
+#if defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)
+         CLOCK_MONOTONIC,
+#endif /* !ACE_HAS_CLOCK_GETTIME_MONOTONIC */
+         CLOCK_REALTIME,
+         &ts);
 
   // Carefully create the return value to avoid arithmetic overflow
   // if ACE_hrtime_t is ACE_U_LongLong.
@@ -483,13 +491,8 @@ ACE_OS::nanosleep (const struct timespec *requested,
   ACE_UNUSED_ARG (remaining);
 
   // Convert into seconds and microseconds.
-# if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
-  ACE_Time_Value tv (static_cast<long>(requested->tv_sec),
+  ACE_Time_Value tv (requested->tv_sec,
                      requested->tv_nsec / 1000);
-# else
-  ACE_Time_Value tv (requested->ts_sec,
-                     requested->ts_nsec / 1000);
-# endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */
   return ACE_OS::sleep (tv);
 #endif /* ACE_HAS_CLOCK_GETTIME */
 }
@@ -562,3 +565,5 @@ ACE_OS::tzset (void)
 # endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS && !__rtems__ && !ACE_HAS_DINKUM_STL */
 }
 
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index 5bddc627589..a35c40065f7 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
@@ -17,11 +16,7 @@ ACE_RCSID(ace, OS_NS_unistd, "$Id$")
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
 #include "ace/os_include/sys/os_pstat.h"
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-// for sysctl(), used by ACE_OS::num_processors()
-#include <sys/sysctl.h>
-#endif
+#include "ace/os_include/sys/os_sysctl.h"
 
 #if defined (ACE_NEEDS_FTRUNCATE)
 extern "C" int
@@ -39,6 +34,8 @@ ftruncate (ACE_HANDLE handle, long len)
 
 /*****************************************************************************/
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_OS::argv_to_string (ACE_TCHAR **argv,
                         ACE_TCHAR *&buf,
@@ -301,17 +298,17 @@ ACE_OS::num_processors (void)
 
 #if defined (ACE_HAS_PHARLAP)
   return 1;
-#elif defined (ACE_WIN32) || defined (ACE_WIN64)
+#elif defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return sys_info.dwNumberOfProcessors;
-#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32)
+#elif defined (_SC_NPROCESSORS_CONF)
   return ::sysconf (_SC_NPROCESSORS_CONF);
-#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#elif defined (ACE_HAS_SYSCTL)
   int num_processors;
   int mib[2] = { CTL_HW, HW_NCPU };
   size_t len = sizeof (num_processors);
-  
+
   sysctl(mib, 2, &num_processors, &len, NULL, 0);
   return num_processors;
 #else
@@ -326,25 +323,25 @@ ACE_OS::num_processors_online (void)
 
 #if defined (ACE_HAS_PHARLAP)
   return 1;
-#elif defined (ACE_WIN32) || defined (ACE_WIN64)
+#elif defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return sys_info.dwNumberOfProcessors;
-#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32)
+#elif defined (_SC_NPROCESSORS_ONLN)
   return ::sysconf (_SC_NPROCESSORS_ONLN);
+#elif defined (ACE_HAS_SYSCTL)
+  int num_processors;
+  int mib[2] = { CTL_HW, HW_NCPU };
+  size_t len = sizeof (num_processors);
+
+  sysctl(mib, 2, &num_processors, &len, NULL, 0);
+  return num_processors;
 #elif defined (__hpux)
   struct pst_dynamic psd;
   if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1)
     return psd.psd_proc_cnt;
   else
     return -1;
-#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-  int num_processors;
-  int mib[2] = { CTL_HW, HW_NCPU };
-  size_t len = sizeof (num_processors);
-  
-  sysctl(mib, 2, &num_processors, &len, NULL, 0);
-  return num_processors;
 #else
   ACE_NOTSUP_RETURN (-1);
 #endif
@@ -647,3 +644,4 @@ ACE_OS::write_n (ACE_HANDLE handle,
   return bytes_transferred;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_unistd.h b/ace/OS_NS_unistd.h
index 1e4d5cb16eb..484b0760b28 100644
--- a/ace/OS_NS_unistd.h
+++ b/ace/OS_NS_unistd.h
@@ -41,7 +41,10 @@
 extern "C" ACE_Export int ftruncate (ACE_HANDLE handle, long len);
 #endif /* ACE_NEEDS_FTRUNCATE */
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int access (const char *path, int amode);
@@ -53,7 +56,7 @@ namespace ACE_OS {
   unsigned int alarm (u_int secs);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int allocation_granularity (void);
+  long allocation_granularity (void);
 
   // used by ARGV::argv_to_string() and ACE_OS::fork_exec()
   extern ACE_Export
@@ -142,6 +145,9 @@ namespace ACE_OS {
   gid_t getgid (void);
 
   ACE_NAMESPACE_INLINE_FUNCTION
+  gid_t getegid (void);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
   int getopt (int argc,
               char *const *argv,
               const char *optstring);
@@ -161,6 +167,9 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   uid_t getuid (void);
 
+  ACE_NAMESPACE_INLINE_FUNCTION
+  uid_t geteuid (void);
+
   // should call gethostname()
   ACE_NAMESPACE_INLINE_FUNCTION
   int hostname (char *name,
@@ -242,12 +251,15 @@ namespace ACE_OS {
                     size_t bufsiz);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  void *sbrk (int brk);
+  void *sbrk (ptrdiff_t brk);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int setgid (gid_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
+  int setegid (gid_t);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
   int setpgid (pid_t pid, pid_t pgid);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -263,6 +275,9 @@ namespace ACE_OS {
   int setuid (uid_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
+  int seteuid (uid_t);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
   int sleep (u_int seconds);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -291,12 +306,12 @@ namespace ACE_OS {
   int truncate (const ACE_TCHAR *filename, off_t length);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  u_int ualarm (u_int usecs,
-                u_int interval = 0);
+  u_long ualarm (u_long usecs,
+                 u_long interval = 0);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  u_int ualarm (const ACE_Time_Value &tv,
-                const ACE_Time_Value &tv_interval = ACE_Time_Value::zero);
+  u_long ualarm (const ACE_Time_Value &tv,
+                 const ACE_Time_Value &tv_interval = ACE_Time_Value::zero);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int unlink (const char *path);
@@ -330,6 +345,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index e26afd6076b..1e73cc50320 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -9,6 +9,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Default_Constants.h"
 #include "ace/OS_Memory.h"
+#include "ace/Truncate.h"
 
 #if defined (ACE_HAS_CLOCK_GETTIME)
 # include "ace/os_include/os_time.h"
@@ -18,16 +19,25 @@
 #  include "ace/OS_NS_stdio.h"
 #endif /* ACE_LACKS_ACCESS */
 
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE)
+#if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
 #  include "ace/os_include/os_unistd.h"
+#  if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620)
+#    if defined (__RTP__)
+#      include "ace/os_include/os_strings.h"
+#    else
+#      include "ace/os_include/os_string.h"
+#    endif
+#  endif
 #endif /* VXWORKS || ACE_HAS_WINCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_OS::access (const char *path, int amode)
 {
   ACE_OS_TRACE ("ACE_OS::access");
 #if defined (ACE_LACKS_ACCESS)
-#  if defined (ACE_HAS_WINCE) || defined (VXWORKS)
+#  if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS)
   // @@ WINCE: There should be a Win32 API that can do this.
   // Hard coded read access here.
   ACE_UNUSED_ARG (amode);
@@ -66,13 +76,12 @@ ACE_INLINE u_int
 ACE_OS::alarm (u_int secs)
 {
   ACE_OS_TRACE ("ACE_OS::alarm");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_ALARM)
   ACE_UNUSED_ARG (secs);
-
   ACE_NOTSUP_RETURN (0);
 #else
   return ::alarm (secs);
-#endif /* ACE_WIN32 || VXWORKS || CHORUS || ACE_PSOS */
+#endif /* ACE_LACKS_ALARM */
 }
 
 ACE_INLINE long
@@ -93,13 +102,13 @@ ACE_OS::getpagesize (void)
 #endif /* ACE_WIN32 */
 }
 
-ACE_INLINE int
+ACE_INLINE long
 ACE_OS::allocation_granularity (void)
 {
 #if defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
-  return (int) sys_info.dwAllocationGranularity;
+  return sys_info.dwAllocationGranularity;
 #else
   return ACE_OS::getpagesize ();
 #endif /* ACE_WIN32 */
@@ -249,7 +258,7 @@ ACE_OS::dup (ACE_HANDLE handle)
   else
     ACE_FAIL_RETURN (ACE_INVALID_HANDLE);
   /* NOTREACHED */
-#elif defined (VXWORKS) || defined (ACE_PSOS)
+#elif defined (ACE_LACKS_DUP)
   ACE_UNUSED_ARG (handle);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_WINCE)
@@ -296,7 +305,12 @@ ACE_OS::execv (const char *path,
 # elif defined (__MINGW32__)
   return ::_execv (path, (char *const *) argv);
 # else
-  return ::_execv (path, (const char *const *) argv);
+  // Why this odd-looking code? If execv() returns at all, it's an error.
+  // Windows defines this as returning an intptr_t rather than a simple int,
+  // and the conversion triggers compile warnings. So just return -1 if
+  // the call returns.
+  ::_execv (path, (const char *const *) argv);
+  return -1;
 # endif /* __BORLANDC__ */
 #else
   ACE_OSCALL_RETURN (::execv (path, argv), int, -1);
@@ -327,7 +341,12 @@ ACE_OS::execve (const char *path,
 # elif defined (__MINGW32__)
   return ::_execve (path, (char *const *) argv, (char *const *) envp);
 # else
-  return ::_execve (path, (const char *const *) argv, (const char *const *) envp);
+  // Why this odd-looking code? If execv() returns at all, it's an error.
+  // Windows defines this as returning an intptr_t rather than a simple int,
+  // and the conversion triggers compile warnings. So just return -1 if
+  // the call returns.
+  ::_execve (path, (const char *const *) argv, (const char *const *) envp);
+  return -1;
 # endif /* __BORLANDC__ */
 #else
   ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1);
@@ -356,7 +375,12 @@ ACE_OS::execvp (const char *file,
 # elif defined (__MINGW32__)
   return ::_execvp (file, (char *const *) argv);
 # else
-  return ::_execvp (file, (const char *const *) argv);
+  // Why this odd-looking code? If execv() returns at all, it's an error.
+  // Windows defines this as returning an intptr_t rather than a simple int,
+  // and the conversion triggers compile warnings. So just return -1 if
+  // the call returns.
+  ::_execvp (file, (const char *const *) argv);
+  return -1;
 # endif /* __BORLANDC__ */
 #else
   ACE_OSCALL_RETURN (::execvp (file, argv), int, -1);
@@ -529,28 +553,36 @@ ACE_INLINE gid_t
 ACE_OS::getgid (void)
 {
   ACE_OS_TRACE ("ACE_OS::getgid");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
-  // getgid() is not supported:  just one user anyways
-  return 0;
-# elif defined (ACE_WIN32) || defined (CHORUS)
+#if defined (ACE_LACKS_GETGID)
+  ACE_NOTSUP_RETURN (static_cast<gid_t> (-1));
+# else
+  ACE_OSCALL_RETURN (::getgid (), gid_t, static_cast<gid_t> (-1));
+# endif /* ACE_LACKS_GETGID */
+}
+
+ACE_INLINE gid_t
+ACE_OS::getegid (void)
+{
+  ACE_OS_TRACE ("ACE_OS::getegid");
+#if defined (ACE_LACKS_GETEGID)
   ACE_NOTSUP_RETURN (static_cast<gid_t> (-1));
 # else
-  ACE_OSCALL_RETURN (::getgid (), gid_t, (gid_t) -1);
-# endif /* VXWORKS || ACE_PSOS */
+  ACE_OSCALL_RETURN (::getegid (), gid_t, static_cast<gid_t> (-1));
+# endif /* ACE_LACKS_GETEGID */
 }
 
 ACE_INLINE int
 ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
 {
   ACE_OS_TRACE ("ACE_OS::getopt");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY) || defined (ACE_WIN32)
+#if defined (ACE_LACKS_GETOPT)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
   ACE_UNUSED_ARG (optstring);
   ACE_NOTSUP_RETURN (-1);
 # else
   ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1);
-# endif /* VXWORKS */
+# endif /* ACE_LACKS_GETOPT */
 }
 
 ACE_INLINE pid_t
@@ -560,10 +592,6 @@ ACE_OS::getpgid (pid_t pid)
 #if defined (ACE_LACKS_GETPGID)
   ACE_UNUSED_ARG (pid);
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // getpgid() is not supported, only one process anyway.
-  ACE_UNUSED_ARG (pid);
-  return 0;
 #elif defined (linux) && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0
   // getpgid() is from SVR4, which appears to be the reason why GLIBC
   // doesn't enable its prototype by default.
@@ -572,7 +600,7 @@ ACE_OS::getpgid (pid_t pid)
   ACE_OSCALL_RETURN (::__getpgid (pid), pid_t, -1);
 #else
   ACE_OSCALL_RETURN (::getpgid (pid), pid_t, -1);
-#endif /* ACE_WIN32 */
+#endif /* ACE_LACKS_GETPGID */
 }
 
 ACE_INLINE pid_t
@@ -581,9 +609,8 @@ ACE_OS::getpid (void)
   // ACE_OS_TRACE ("ACE_OS::getpid");
 #if defined (ACE_WIN32)
   return ::GetCurrentProcessId ();
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // getpid() is not supported:  just one process anyways
-  return 0;
+#elif defined (ACE_LACKS_GETPID)
+  ACE_NOTSUP_RETURN (-1);
 #elif defined (CHORUS)
   return (pid_t) (::agetId ());
 #else
@@ -597,9 +624,6 @@ ACE_OS::getppid (void)
   ACE_OS_TRACE ("ACE_OS::getppid");
 #if defined (ACE_LACKS_GETPPID)
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // getppid() is not supported, only one process anyway.
-  return 0;
 #else
   ACE_OSCALL_RETURN (::getppid (), pid_t, -1);
 #endif /* ACE_LACKS_GETPPID */
@@ -609,14 +633,22 @@ ACE_INLINE uid_t
 ACE_OS::getuid (void)
 {
   ACE_OS_TRACE ("ACE_OS::getuid");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
-  // getuid() is not supported:  just one user anyways
-  return 0;
-# elif defined (ACE_WIN32) || defined (CHORUS)
+#if defined (ACE_LACKS_GETUID)
   ACE_NOTSUP_RETURN (static_cast<uid_t> (-1));
 # else
-  ACE_OSCALL_RETURN (::getuid (), uid_t, (uid_t) -1);
-# endif /* VXWORKS || ACE_PSOS */
+  ACE_OSCALL_RETURN (::getuid (), uid_t, static_cast<uid_t> (-1));
+# endif /* ACE_LACKS_GETUID*/
+}
+
+ACE_INLINE uid_t
+ACE_OS::geteuid (void)
+{
+  ACE_OS_TRACE ("ACE_OS::geteuid");
+#if defined (ACE_LACKS_GETEUID)
+  ACE_NOTSUP_RETURN (static_cast<uid_t> (-1));
+# else
+  ACE_OSCALL_RETURN (::geteuid (), uid_t, (uid_t) -1);
+# endif /* ACE_LACKS_GETEUID */
 }
 
 ACE_INLINE int
@@ -635,10 +667,10 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
   ACE_UNUSED_ARG (maxnamelen);
   ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_PHARLAP_RT */
-#elif defined (VXWORKS) || defined (ACE_HAS_WINCE)
+#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1);
 #elif defined (ACE_WIN32)
-  if (::gethostname (name, maxnamelen) == 0)
+  if (::gethostname (name, ACE_Utils::Truncate (maxnamelen)) == 0)
   {
     return 0;
   }
@@ -702,7 +734,7 @@ ACE_OS::isatty (int handle)
 # else
   ACE_OS_TRACE ("ACE_OS::isatty");
   ACE_OSCALL_RETURN (::isatty (handle), int, -1);
-# endif /* defined (ACE_LACKS_ISATTY) */
+# endif /* ACE_LACKS_ISATTY */
 }
 
 #if defined (ACE_WIN32)
@@ -840,7 +872,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len)
   ssize_t result;
 
 # if defined (ACE_HAS_CHARPTR_SOCKOPT)
-  ACE_OSCALL (::read (handle, (char *) buf, len), ssize_t, -1, result);
+  ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -1, result);
 # else
   ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result);
 # endif /* ACE_HAS_CHARPTR_SOCKOPT */
@@ -902,39 +934,24 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz)
 # endif /* ACE_LACKS_READLINK */
 }
 
-#if !defined (ACE_WIN32)
-
 ACE_INLINE int
 ACE_OS::pipe (ACE_HANDLE fds[])
 {
   ACE_OS_TRACE ("ACE_OS::pipe");
-# if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
+# if defined (ACE_LACKS_PIPE)
   ACE_UNUSED_ARG (fds);
   ACE_NOTSUP_RETURN (-1);
-# else
-  ACE_OSCALL_RETURN (::pipe (fds), int, -1);
-# endif /* VXWORKS || ACE_PSOS */
-}
-
-#else /* ACE_WIN32 */
-
-ACE_INLINE int
-ACE_OS::pipe (ACE_HANDLE fds[])
-{
-# if !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__)
-  ACE_OS_TRACE ("ACE_OS::pipe");
+# elif defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL
                         (::CreatePipe (&fds[0], &fds[1], 0, 0),
                          ace_result_), int, -1);
 # else
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_WINCE && !__IBMCPP__ */
+  ACE_OSCALL_RETURN (::pipe (fds), int, -1);
+# endif /* ACE_LACKS_PIPE */
 }
 
-#endif /* !ACE_WIN32 */
-
 ACE_INLINE void *
-ACE_OS::sbrk (int brk)
+ACE_OS::sbrk (ptrdiff_t brk)
 {
 #if defined (ACE_LACKS_SBRK)
   ACE_UNUSED_ARG (brk);
@@ -948,16 +965,24 @@ ACE_INLINE int
 ACE_OS::setgid (gid_t gid)
 {
   ACE_OS_TRACE ("ACE_OS::setgid");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
-  // setgid() is not supported:  just one user anyways
-  ACE_UNUSED_ARG (gid);
-  return 0;
-# elif defined (ACE_WIN32) || defined (CHORUS)
+#if defined (ACE_LACKS_SETGID)
   ACE_UNUSED_ARG (gid);
   ACE_NOTSUP_RETURN (-1);
 # else
   ACE_OSCALL_RETURN (::setgid (gid), int,  -1);
-# endif /* VXWORKS || ACE_PSOS */
+# endif /* ACE_LACKS_SETGID */
+}
+
+ACE_INLINE int
+ACE_OS::setegid (gid_t gid)
+{
+  ACE_OS_TRACE ("ACE_OS::setegid");
+#if defined (ACE_LACKS_SETEGID)
+  ACE_UNUSED_ARG (gid);
+  ACE_NOTSUP_RETURN (-1);
+# else
+  ACE_OSCALL_RETURN (::setegid (gid), int,  -1);
+# endif /* ACE_LACKS_SETEGID */
 }
 
 ACE_INLINE int
@@ -968,11 +993,6 @@ ACE_OS::setpgid (pid_t pid, pid_t pgid)
   ACE_UNUSED_ARG (pid);
   ACE_UNUSED_ARG (pgid);
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // <setpgid> is not supported, only one process anyway.
-  ACE_UNUSED_ARG (pid);
-  ACE_UNUSED_ARG (pgid);
-  return 0;
 #else
   ACE_OSCALL_RETURN (::setpgid (pid, pgid), int, -1);
 #endif /* ACE_LACKS_SETPGID */
@@ -986,14 +1006,9 @@ ACE_OS::setregid (gid_t rgid, gid_t egid)
   ACE_UNUSED_ARG (rgid);
   ACE_UNUSED_ARG (egid);
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // <setregid> is not supported, only one process anyway.
-  ACE_UNUSED_ARG (rgid);
-  ACE_UNUSED_ARG (egid);
-  return 0;
 #else
   ACE_OSCALL_RETURN (::setregid (rgid, egid), int, -1);
-#endif /* ACE_WIN32 */
+#endif /* ACE_LACKS_SETREGID */
 }
 
 ACE_INLINE int
@@ -1004,11 +1019,6 @@ ACE_OS::setreuid (uid_t ruid, uid_t euid)
   ACE_UNUSED_ARG (ruid);
   ACE_UNUSED_ARG (euid);
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // <setpgid> is not supported, only one process anyway.
-  ACE_UNUSED_ARG (ruid);
-  ACE_UNUSED_ARG (euid);
-  return 0;
 #else
   ACE_OSCALL_RETURN (::setreuid (ruid, euid), int, -1);
 #endif /* ACE_LACKS_SETREUID */
@@ -1020,9 +1030,6 @@ ACE_OS::setsid (void)
   ACE_OS_TRACE ("ACE_OS::setsid");
 #if defined (ACE_LACKS_SETSID)
   ACE_NOTSUP_RETURN (-1);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  // <setsid> is not supported, only one process anyway.
-  return 0;
 #else
   ACE_OSCALL_RETURN (::setsid (), int, -1);
 # endif /* ACE_LACKS_SETSID */
@@ -1032,16 +1039,24 @@ ACE_INLINE int
 ACE_OS::setuid (uid_t uid)
 {
   ACE_OS_TRACE ("ACE_OS::setuid");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
-  // setuid() is not supported:  just one user anyways
-  ACE_UNUSED_ARG (uid);
-  return 0;
-# elif defined (ACE_WIN32) || defined(CHORUS)
+#if defined (ACE_LACKS_SETUID)
   ACE_UNUSED_ARG (uid);
   ACE_NOTSUP_RETURN (-1);
 # else
   ACE_OSCALL_RETURN (::setuid (uid), int,  -1);
-# endif /* VXWORKS || ACE_PSOS */
+# endif /* ACE_LACKS_SETUID */
+}
+
+ACE_INLINE int
+ACE_OS::seteuid (uid_t uid)
+{
+  ACE_OS_TRACE ("ACE_OS::seteuid");
+#if defined (ACE_LACKS_SETEUID)
+  ACE_UNUSED_ARG (uid);
+  ACE_NOTSUP_RETURN (-1);
+# else
+  ACE_OSCALL_RETURN (::seteuid (uid), int,  -1);
+# endif /* ACE_LACKS_SETEUID */
 }
 
 ACE_INLINE int
@@ -1131,12 +1146,12 @@ ACE_INLINE long
 ACE_OS::sysconf (int name)
 {
   ACE_OS_TRACE ("ACE_OS::sysconf");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
+#if defined (ACE_LACKS_SYSCONF)
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (-1);
 #else
   ACE_OSCALL_RETURN (::sysconf (name), long, -1);
-#endif /* ACE_WIN32 || VXWORKS || ACE_PSOS */
+#endif /* ACE_LACKS_SYSCONF */
 }
 
 ACE_INLINE long
@@ -1190,8 +1205,8 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
 #endif /* ACE_WIN32 */
 }
 
-ACE_INLINE u_int
-ACE_OS::ualarm (u_int usecs, u_int interval)
+ACE_INLINE u_long
+ACE_OS::ualarm (u_long usecs, u_long interval)
 {
   ACE_OS_TRACE ("ACE_OS::ualarm");
 
@@ -1207,15 +1222,15 @@ ACE_OS::ualarm (u_int usecs, u_int interval)
 #endif /* ACE_HAS_UALARM */
 }
 
-ACE_INLINE u_int
+ACE_INLINE u_long
 ACE_OS::ualarm (const ACE_Time_Value &tv,
                 const ACE_Time_Value &tv_interval)
 {
   ACE_OS_TRACE ("ACE_OS::ualarm");
 
 #if defined (ACE_HAS_UALARM)
-  u_int usecs = (tv.sec () * ACE_ONE_SECOND_IN_USECS) + tv.usec ();
-  u_int interval = (tv_interval.sec () * ACE_ONE_SECOND_IN_USECS) + tv_interval.usec ();
+  u_long usecs = (tv.sec () * ACE_ONE_SECOND_IN_USECS) + tv.usec ();
+  u_long interval = (tv_interval.sec () * ACE_ONE_SECOND_IN_USECS) + tv_interval.usec ();
   return ::ualarm (usecs, interval);
 #elif !defined (ACE_LACKS_UNIX_SIGNALS)
   ACE_UNUSED_ARG (tv_interval);
@@ -1295,9 +1310,9 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte)
 # endif /* defined (ACE_PSOS_LACKS_PHILE) */
 #else
 # if defined (ACE_PSOS)
-  ACE_OSCALL_RETURN (::write_f(handle, (void *) buf, nbyte), ssize_t, -1);
+  ACE_OSCALL_RETURN (::write_f(handle, const_cast <void *> (buf), nbyte), ssize_t, -1);
 # elif defined (ACE_HAS_CHARPTR_SOCKOPT)
-  ACE_OSCALL_RETURN (::write (handle, (char *) buf, nbyte), ssize_t, -1);
+  ACE_OSCALL_RETURN (::write (handle, static_cast <char *> (const_cast <void *> (buf)), nbyte), ssize_t, -1);
 # else
   ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1);
 # endif /* ACE_PSOS */
@@ -1324,3 +1339,5 @@ ACE_OS::write (ACE_HANDLE handle,
   return ACE_OS::write (handle, buf, nbyte);
 #endif /* ACE_WIN32 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_unistd_T.inl b/ace/OS_NS_unistd_T.inl
index b56eb16a3c4..2b386231e29 100644
--- a/ace/OS_NS_unistd_T.inl
+++ b/ace/OS_NS_unistd_T.inl
@@ -6,6 +6,7 @@
 #include "ace/Default_Constants.h"
 #include "ace/os_include/os_errno.h"
 #include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
 
 template <typename CHAR_TYPE> int
 ACE_OS::string_to_argv (CHAR_TYPE *buf,
diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp
index b92b8d1f562..b6701492a67 100644
--- a/ace/OS_NS_wchar.cpp
+++ b/ace/OS_NS_wchar.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 # include "ace/OS_NS_wchar.h"
@@ -49,7 +48,10 @@ ACE_RCSID(ace, OS_NS_wchar_t, "$Id$")
  * SUCH DAMAGE.
  */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_LACKS_WCSCAT)
+
 wchar_t *
 ACE_OS::wcscat_emulation (wchar_t *destination,
                           const wchar_t *source)
@@ -371,3 +373,4 @@ ACE_OS::wcsstr_emulation (const wchar_t *string,
 }
 #endif /* ACE_LACKS_WCSSTR */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_wchar.h b/ace/OS_NS_wchar.h
index d886dbcbdab..4568629183a 100644
--- a/ace/OS_NS_wchar.h
+++ b/ace/OS_NS_wchar.h
@@ -36,7 +36,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-namespace ACE_OS {
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace ACE_OS
+{
 
   ACE_NAMESPACE_INLINE_FUNCTION
   wint_t fgetwc (FILE* fp);
@@ -175,6 +178,8 @@ namespace ACE_OS {
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_wchar.inl b/ace/OS_NS_wchar.inl
index e7c44bd8b8f..19cddfcb413 100644
--- a/ace/OS_NS_wchar.inl
+++ b/ace/OS_NS_wchar.inl
@@ -1,6 +1,10 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
 ACE_INLINE wint_t
 ACE_OS::fgetwc (FILE* fp)
 {
@@ -77,3 +81,4 @@ ACE_OS::ungetwc (wint_t c, FILE* fp)
 #  endif /* ACE_LACKS_FGETWC */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_QoS.cpp b/ace/OS_QoS.cpp
index 8240231b9c5..0b2c23f11c6 100644
--- a/ace/OS_QoS.cpp
+++ b/ace/OS_QoS.cpp
@@ -13,6 +13,8 @@
 #include "ace/OS_QoS.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Flow_Spec::ACE_Flow_Spec (unsigned long token_rate,
                               unsigned long token_bucket_size,
                               unsigned long peak_bandwidth,
@@ -470,3 +472,5 @@ ACE_Accept_QoS_Params::callback_data (unsigned long cd)
 {
   this->callback_data_ = cd;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_QoS.h b/ace/OS_QoS.h
index 7a58dec9a6c..c8df7c58eec 100644
--- a/ace/OS_QoS.h
+++ b/ace/OS_QoS.h
@@ -5,9 +5,9 @@
  *  @file   OS_QoS.h
  *
  *  $Id$
- *  
+ *
  *  @brief  Contains OS specific data structures for QoS networking.
- *  
+ *
  *  @author Craig Rodrigues  <crodrigu@bbn.com>
  */
 //=============================================================================
@@ -25,6 +25,8 @@
 #include "ace/os_include/sys/os_uio.h"
 #include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
 #if defined (ACE_HAS_WINSOCK2_GQOS)
 typedef SERVICETYPE ACE_SERVICE_TYPE;
@@ -384,6 +386,7 @@ private:
   unsigned long callback_data_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif  /* ACE_OS_QOS_H */
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
deleted file mode 100644
index d8db2e3c296..00000000000
--- a/ace/OS_String.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//=============================================================================
-/**
- *  @file   OS_String.cpp
- *
- *  $Id$
- *
- *  @brief  Contains definitions for class ACE_OS_String.
- */
-//=============================================================================
-
-#include "ace/OS_String.h"
-#include "ace/OS_Memory.h"
-
-ACE_RCSID (ace, OS_String, "$Id$")
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS_String.inl"
-#endif /* ACE_HAS_INLINED_OS_CALLS */
-
-#if defined (ACE_LACKS_WCSDUP_PROTOTYPE)
-extern "C" wchar_t *wcsdup __P ((__const wchar_t *__s));
-#endif /* ACE_LACKS_WCSDUP_PROTOTYPE */
-
diff --git a/ace/OS_String.h b/ace/OS_String.h
index 891722ca45d..510d1a412a3 100644
--- a/ace/OS_String.h
+++ b/ace/OS_String.h
@@ -28,13 +28,5 @@
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_ctype.h"
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS_String.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_STRING_H */
diff --git a/ace/OS_String.inl b/ace/OS_String.inl
deleted file mode 100644
index 64b6ef0150d..00000000000
--- a/ace/OS_String.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file   OS_String.inl
- *
- *  $Id$
- *
- *  @brief  Contains inline definitions for class ACE_OS_String.
- */
-//=============================================================================
-
-#include "ace/os_include/os_stdlib.h"
-#include "ace/os_include/os_string.h"
-#include "ace/os_include/os_strings.h"
-#include "ace/os_include/os_ctype.h"
-
-
-
diff --git a/ace/OS_TLI.h b/ace/OS_TLI.h
index 130c276904e..e81b00d6074 100644
--- a/ace/OS_TLI.h
+++ b/ace/OS_TLI.h
@@ -147,6 +147,25 @@ extern "C" {
 
 # endif /* ACE_HAS_XTI || ACE_HAS_TLI */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// This hack is needed to get around an odd and hard-to-reproduce problem
+// with HP aC++. If struct sigaction is defined extern "C" and the sigaction
+// function in namespace ACE_OS, the compiler sometimes gets confused.
+// If we help it with this typedef, it's fine. User code should not use
+// the ACE typedef - it will be removed without warning as soon as we can
+// either drop support for the broken compilers or figure out how to reproduce
+// it so it can be reported to HP and fixed.
+// There's a similar hack in OS_TLI.h for struct t_optmgmt.
+// Also see ChangeLog entries:
+// Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
+// Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
+#if defined (__HP_aCC) && (__HP_aCC <= 36500)
+typedef extern "C" struct t_optmgmt  ACE_TOPTMGMT;
+#else
+typedef struct t_optmgmt ACE_TOPTMGMT;
+#endif
+
 /**
  * @namespace ACE_OS
  *
@@ -214,8 +233,8 @@ namespace ACE_OS
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int t_optmgmt (ACE_HANDLE handle,
-                 struct t_optmgmt *req,
-                 struct t_optmgmt *ret);
+                 ACE_TOPTMGMT *req,
+                 ACE_TOPTMGMT *ret);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int t_rcv (ACE_HANDLE fildes,
@@ -260,6 +279,8 @@ namespace ACE_OS
 
 } /* namespace ACE_OS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_TLI.inl b/ace/OS_TLI.inl
index 307a53f6fa0..563ba8311db 100644
--- a/ace/OS_TLI.inl
+++ b/ace/OS_TLI.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_OS {
 
 ACE_INLINE int
@@ -228,7 +231,7 @@ t_open (char *path, int oflag, struct t_info *info)
 }
 
 ACE_INLINE int
-t_optmgmt (ACE_HANDLE handle, struct t_optmgmt *req, struct t_optmgmt *ret)
+t_optmgmt (ACE_HANDLE handle, ACE_TOPTMGMT *req, ACE_TOPTMGMT *ret)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1);
@@ -383,3 +386,5 @@ t_unbind (ACE_HANDLE handle)
 }
 
 }  /* end namespace ACE_OS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_Thread_Adapter.cpp b/ace/OS_Thread_Adapter.cpp
index 1f7e94a2890..1bdeacc24ee 100644
--- a/ace/OS_Thread_Adapter.cpp
+++ b/ace/OS_Thread_Adapter.cpp
@@ -11,6 +11,8 @@ ACE_RCSID (ace,
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_OS_Thread_Adapter::ACE_OS_Thread_Adapter (
      ACE_THR_FUNC user_func
      , void *arg
@@ -171,3 +173,5 @@ ACE_OS_Thread_Adapter::invoke (void)
 
   return status;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_Thread_Adapter.h b/ace/OS_Thread_Adapter.h
index 73ad99989e6..3776339b2a7 100644
--- a/ace/OS_Thread_Adapter.h
+++ b/ace/OS_Thread_Adapter.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +22,8 @@
 
 #include "ace/ACE_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_OS_Thread_Adapter
  *
@@ -42,7 +45,7 @@ public:
   /// Constructor.
   ACE_OS_Thread_Adapter (ACE_THR_FUNC user_func,
                          void *arg,
-                         ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter
+                         ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
                          , ACE_SEH_EXCEPT_HANDLER selector = 0
                          , ACE_SEH_EXCEPT_HANDLER handler = 0
@@ -56,15 +59,14 @@ public:
    */
   virtual ACE_THR_FUNC_RETURN invoke (void);
 
-private:
-  /// Ensure that this object must be allocated on the heap.
+protected:
+
+  /// Ensure that this object is allocated on the heap.
   ~ACE_OS_Thread_Adapter (void);
 
-private:
-  /// Friend declaration to avoid compiler warning:  only defines a private
-  /// destructor and has no friends.
-  friend class ACE_Thread_Adapter_Has_Private_Destructor;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_THREAD_ADAPTER_H */
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp
index 5d8c43ac716..79e8413bea9 100644
--- a/ace/OS_main.cpp
+++ b/ace/OS_main.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_main.h"
@@ -26,7 +25,7 @@ ACE_RCSID(ace, OS_main, "$Id$")
 
 #  if !defined (ACE_WIN32)
 
-#    if !defined (ACE_VXWORKS)
+#    if !(defined (ACE_VXWORKS) && !defined (__RTP__))
 /* forward declaration */
 extern int ace_main_i (int, char *[]);
 #    endif
@@ -70,7 +69,9 @@ ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */
 
 #    endif /* ACE_PSOSIM */
 
-#    if defined (ACE_VXWORKS)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#    if defined (ACE_VXWORKS) && !defined (__RTP__)
 ace_main_proc_ptr vx_ace_main_i_ptr = 0;
 
 int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
@@ -78,7 +79,7 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
   ACE_MAIN_OBJECT_MANAGER
   return vx_ace_main_i_ptr ? (*vx_ace_main_i_ptr) (argc, argv) : (-1);   /* what the user calls "main" */
 }
-#    else /* !ACE_VXWORKS */
+#    else /* !ACE_VXWORKS && !__RTP__ */
 int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
 {
   ACE_MAIN_OBJECT_MANAGER
@@ -86,8 +87,12 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
 }
 #    endif
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  elif !defined (ACE_HAS_WINCE)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #    if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 int ACE_Main_Base::run (int argc, ACE_TCHAR *argv[])
 {
@@ -114,6 +119,8 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi
 }
 #    endif /* ACE_WIN32 && ACE_USES_WCHAR */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  else /* ACE_HAS_WINCE */
 
 // CE only gets a command line string;  no argv. So we need to convert it
@@ -122,6 +129,8 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi
 #    include "ace/ACE.h"
 #    include "ace/ARGV.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int ACE_Main_Base::run (HINSTANCE,
                         HINSTANCE,
                         LPWSTR lpCmdLine,
@@ -137,6 +146,8 @@ int ACE_Main_Base::run (HINSTANCE,
   ACE::fini ();
   return i;
 }
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #  endif   /* !ACE_HAS_WINCE */
+
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
diff --git a/ace/OS_main.h b/ace/OS_main.h
index a47e4b069e2..58e02261a03 100644
--- a/ace/OS_main.h
+++ b/ace/OS_main.h
@@ -67,7 +67,9 @@
          || (defined (ACE_PSOS) && defined (ACE_PSOS_LACKS_ARGC_ARGV))
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 { \
   ace_os_main_i (argc, argv); /* what the user calls "main" */ \
@@ -75,14 +77,16 @@ ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 int \
 ace_main_i
 
-#   elif defined (ACE_VXWORKS)
+#   elif defined (ACE_VXWORKS) && !defined (__RTP__)
 
 typedef int (*ace_main_proc_ptr)(int, char *[]);
 
 extern ace_main_proc_ptr vx_ace_main_i_ptr;
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int ace_main_i(int, char *[]); \
 int \
 ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
@@ -96,7 +100,9 @@ ace_main_i
 #   elif !defined (ACE_WIN32)
 
 #     define main \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ace_os_main_i (int, char *[]); \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int \
 ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 { \
@@ -108,6 +114,9 @@ ace_main_i
 #   elif !defined (ACE_HAS_WINCE)
 
 #     if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Main_Base
 {
 public:
@@ -115,6 +124,8 @@ public:
   virtual int run_i (int, ACE_TCHAR *[]) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #       define wmain \
 ace_wmain_i (int, ACE_TCHAR *[]); \
 ACE_Export int ace_os_wmain_i (ACE_Main_Base&, int, ACE_TCHAR *[]); \
@@ -134,6 +145,8 @@ ace_wmain_i
 
 #     else /* ! (ACE_WIN32 && ACE_USES_WCHAR) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Main_Base
 {
 public:
@@ -141,14 +154,18 @@ public:
   virtual int run_i (int, char *[]) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #       define main \
 ace_main_i (int, char *[]); \
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
 ACE_Export int ace_os_main_i (ACE_Main_Base&, int, char *[]); \
 class ACE_Main : public ACE_Main_Base {int run_i (int, char *[]);}; \
 inline int ACE_Main::run_i (int argc, char *argv[])  \
 { \
   return ace_main_i (argc, argv); \
 } \
+ACE_END_VERSIONED_NAMESPACE_DECL \
 int \
 ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., wmain */ \
 { \
@@ -162,6 +179,8 @@ ace_main_i
 
 #   else /* ACE_HAS_WINCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Main_Base
 {
 public:
@@ -169,6 +188,8 @@ public:
   virtual int run_i (int, ACE_TCHAR *[]) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #     if defined (ACE_TMAIN)  // Use WinMain on CE; others give warning/error.
 #       undef ACE_TMAIN
 #     endif  // ACE_TMAIN
diff --git a/ace/Obchunk.cpp b/ace/Obchunk.cpp
index 60a7f9b7a37..0d1de440fcb 100644
--- a/ace/Obchunk.cpp
+++ b/ace/Obchunk.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(ace, Obchunk, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk)
 
 void
@@ -30,3 +32,5 @@ ACE_Obchunk::ACE_Obchunk (size_t size)
     next_ (0)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Obchunk.h b/ace/Obchunk.h
index d901c030dd2..9690c39f9d1 100644
--- a/ace/Obchunk.h
+++ b/ace/Obchunk.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Obchunk.h
@@ -20,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Obchunk
  *
@@ -64,6 +67,8 @@ public:
   char contents_[4];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Obchunk.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Obchunk.inl b/ace/Obchunk.inl
index bffb7626155..4853b0e12aa 100644
--- a/ace/Obchunk.inl
+++ b/ace/Obchunk.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Obchunk::~ACE_Obchunk (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 73327e35002..21782c40821 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -49,6 +49,8 @@ ACE_RCSID(ace, Object_Manager, "$Id$")
 # define ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS
 #endif /* ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Singleton pointer.
 ACE_Object_Manager *ACE_Object_Manager::instance_ = 0;
 
@@ -86,7 +88,7 @@ void *ACE_Object_Manager::preallocated_array[
       preallocated_array[ID] = array_p;\
     }
 # define ACE_DELETE_PREALLOCATED_OBJECT(TYPE, ID)\
-    ace_cleanup_destroyer (\
+    ACE_CLEANUP_DESTROYER_NAME (\
       (ACE_Cleanup_Adapter<TYPE> *) preallocated_object[ID], 0);\
     preallocated_object[ID] = 0;
 # define ACE_DELETE_PREALLOCATED_ARRAY(TYPE, ID, COUNT)\
@@ -112,13 +114,6 @@ private:
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Service_Manager;
 };
 
-// We can't use the ACE_SVC_FACTORY_DECLARE macro here because this
-// needs to be in the ACE_Export context rather than the
-// ACE_Svc_Export context.
-//extern "C" ACE_Export
-//ACE_Service_Object *
-//_make_ACE_Service_Manager (ACE_Service_Object_Exterminator *);
-
 ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
 {
   ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer,
@@ -854,30 +849,4 @@ ACE_Static_Object_Lock::cleanup_lock (void)
 }
 #endif /* ACE_HAS_THREADS */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    template class ACE_Cleanup_Adapter<ACE_Null_Mutex>;
-    template class ACE_Cleanup_Adapter<ACE_Mutex>;
-    template class ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>;
-    template class ACE_Cleanup_Adapter<ACE_Thread_Mutex>;
-    template class ACE_Managed_Object<ACE_Null_Mutex>;
-    template class ACE_Managed_Object<ACE_Mutex>;
-    template class ACE_Managed_Object<ACE_Recursive_Thread_Mutex>;
-    template class ACE_Managed_Object<ACE_Thread_Mutex>;
-# endif /* ACE_MT_SAFE */
-  template class ACE_Cleanup_Adapter<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Managed_Object<ACE_SYNCH_RW_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#   pragma instantiate ACE_Cleanup_Adapter<ACE_Null_Mutex>
-#   pragma instantiate ACE_Cleanup_Adapter<ACE_Mutex>
-#   pragma instantiate ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>
-#   pragma instantiate ACE_Cleanup_Adapter<ACE_Thread_Mutex>
-#   pragma instantiate ACE_Managed_Object<ACE_Null_Mutex>
-#   pragma instantiate ACE_Managed_Object<ACE_Mutex>
-#   pragma instantiate ACE_Managed_Object<ACE_Recursive_Thread_Mutex>
-#   pragma instantiate ACE_Managed_Object<ACE_Thread_Mutex>
-# endif /* ACE_MT_SAFE */
-# pragma instantiate ACE_Cleanup_Adapter<ACE_SYNCH_RW_MUTEX>
-# pragma instantiate ACE_Managed_Object<ACE_SYNCH_RW_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 0144bb203ca..293864096b3 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -24,20 +24,32 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Object_Manager_Preallocations;
 class ACE_Sig_Adapter;
 class ACE_Sig_Set;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
   class ACE_Mutex;
   class ACE_Null_Mutex;
   class ACE_Thread_Mutex;
   class ACE_Recursive_Thread_Mutex;
   class ACE_RW_Thread_Mutex;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  include "ace/Recursive_Thread_Mutex.h"
 #endif /* ACE_MT_SAFE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // only used by ACE_OS_Object_Manager::ctor
 # if defined (ACE_WIN32)
 // Default WIN32 structured exception handler.
@@ -334,14 +346,14 @@ public:
   // use by ACE_Singleton _only_.
 
   /**
-   * Accesses an <ACE_Null_Mutex> to be used for construction of
+   * Accesses an ACE_Null_Mutex to be used for construction of
    * <ACE_Singletons>.  Returns 0, and the lock in the argument, on
    * success; returns -1 on failure.
    */
   static int get_singleton_lock (ACE_Null_Mutex *&);
 
   /**
-   * Accesses a non-recursive <ACE_Thread_Mutex> to be used for
+   * Accesses a non-recursive ACE_Thread_Mutex to be used for
    * construction of <ACE_Singletons>.  Returns 0, and the lock in the
    * argument, on success; returns -1 on failure.
    */
@@ -355,7 +367,7 @@ public:
   static int get_singleton_lock (ACE_Mutex *&);
 
   /**
-   * Accesses a recursive <ACE_Recursive_Thread_Mutex> to be used for
+   * Accesses a recursive ACE_Recursive_Thread_Mutex to be used for
    * construction of <ACE_Singletons>.  Returns 0, and the lock in the
    * argument, on success; returns -1 on failure.
    */
@@ -423,6 +435,7 @@ private:
   ACE_Object_Manager &operator= (const ACE_Object_Manager &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include "ace/Static_Object_Lock.h"
 
@@ -436,10 +449,10 @@ private:
 // We can't use the ACE_SVC_FACTORY_DECLARE macro here because this
 // needs to be in the ACE_Export context rather than the
 // ACE_Svc_Export context.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Service_Object;
-extern "C" ACE_Export
-ACE_Service_Object *
-_make_ACE_Service_Manager (ACE_Service_Object_Exterminator *);
+ACE_END_VERSIONED_NAMESPACE_DECL
+ACE_FACTORY_DECLARE (ACE, ACE_Service_Manager)
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
 
 
diff --git a/ace/Object_Manager.inl b/ace/Object_Manager.inl
index 19ba4079a9c..bb95a485fdc 100644
--- a/ace/Object_Manager.inl
+++ b/ace/Object_Manager.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 int
 ACE_Object_Manager::at_exit (ACE_Cleanup *object,
@@ -8,7 +11,7 @@ ACE_Object_Manager::at_exit (ACE_Cleanup *object,
 {
   return ACE_Object_Manager::instance ()->at_exit_i (
     object,
-    (ACE_CLEANUP_FUNC) ace_cleanup_destroyer,
+    (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME,
     param);
 }
 
@@ -33,3 +36,5 @@ ACE_Object_Manager::default_mask (void)
   return
     *reinterpret_cast<ACE_Sig_Set *> (ACE_OS_Object_Manager::default_mask ());
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp
index 720e362e922..185ab58d5be 100644
--- a/ace/Object_Manager_Base.cpp
+++ b/ace/Object_Manager_Base.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/Object_Manager_Base.h"
@@ -11,6 +10,8 @@ ACE_RCSID(ace, Object_Manager_Base, "$Id$")
 #include "ace/OS_NS_signal.h"
 #include "ace/OS_NS_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
 int ACE_SEH_Default_Exception_Selector (void *)
 {
@@ -501,3 +502,5 @@ ACE_OS_Object_Manager_Manager::~ACE_OS_Object_Manager_Manager (void)
 
 static ACE_OS_Object_Manager_Manager ACE_OS_Object_Manager_Manager_instance;
 #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h
index 4188e008835..83f5d91354c 100644
--- a/ace/Object_Manager_Base.h
+++ b/ace/Object_Manager_Base.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_signal.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Object_Manager;
 class ACE_OS_Object_Manager_Manager;
 class ACE_TSS_Cleanup;
@@ -248,5 +250,7 @@ public:
   friend void ACE_OS_Object_Manager_Internal_Exit_Hook ();
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_OBJECT_MANAGER_BASE_H */
diff --git a/ace/Obstack.cpp b/ace/Obstack.cpp
index d794f1263fe..792a398ba8a 100644
--- a/ace/Obstack.cpp
+++ b/ace/Obstack.cpp
@@ -4,8 +4,12 @@
 
 ACE_RCSID(ace, Obstack, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Obstack_T<char>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Obstack_T<char>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Obstack.h b/ace/Obstack.h
index 6312ecb7fc1..511f7715f69 100644
--- a/ace/Obstack.h
+++ b/ace/Obstack.h
@@ -19,9 +19,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_SINGLETON_DECLARATION (ACE_Obstack_T <char>;)
 
 typedef ACE_Obstack_T<char> ACE_Obstack;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_OBSTACK_H */
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index e6baeb61e41..f7b781eee21 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -15,6 +15,8 @@
 #include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Obstack_T)
 
 template <class CHAR> void
@@ -201,4 +203,6 @@ ACE_Obstack_T<CHAR>::release (void)
   this->curr_->block_ = this->curr_->cur_ = this->curr_->contents_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_OBSTACK_T_CPP */
diff --git a/ace/Obstack_T.h b/ace/Obstack_T.h
index d070b011bea..3e24ab31925 100644
--- a/ace/Obstack_T.h
+++ b/ace/Obstack_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,12 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// #include "ace/Basic_Types.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Allocator;
 
 /**
- * @class ACE_Obstack
+ * @class ACE_Obstack_T
  *
  * @brief Define a simple "mark and release" memory allocation utility.
  *
@@ -116,6 +116,8 @@ protected:
   class ACE_Obchunk *curr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Obstack_T.inl b/ace/Obstack_T.inl
index 57e049ef1ea..92c90cd44d9 100644
--- a/ace/Obstack_T.inl
+++ b/ace/Obstack_T.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class CHAR> ACE_INLINE size_t
 ACE_Obstack_T<CHAR>::length () const
 {
@@ -29,3 +33,5 @@ ACE_Obstack_T<CHAR>::freeze (void)
   this->curr_->block_ = this->curr_->cur_;
   return retv;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
index fbe0d925e6f..6486bdb22eb 100644
--- a/ace/PI_Malloc.cpp
+++ b/ace/PI_Malloc.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (ace,
 #include "ace/Process_Mutex.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 {
@@ -157,20 +159,7 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>;
-template class ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>;
-template class ACE_Based_Pointer_Basic<char>;
-template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>;
-template class ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer_Basic<ACE_PI_Control_Block::ACE_Name_Node>
-#pragma instantiate ACE_Based_Pointer_Basic<char>
-#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Malloc_Header>
-#pragma instantiate ACE_Based_Pointer<ACE_PI_Control_Block::ACE_Name_Node>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1*/
 
diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h
index 6306b76708c..07b830e3607 100644
--- a/ace/PI_Malloc.h
+++ b/ace/PI_Malloc.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,11 +27,13 @@
 #include "ace/Malloc.h"
 #include "ace/Based_Pointer_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // prepare for position independent malloc
 /**
  * @class ACE_PI_Control_Block
  *
- * @brief This information is stored in memory allocated by the <Memory_Pool>.
+ * @brief This information is stored in memory allocated by the Memory_Pool.
  *
  * This class implements the control block structure that can be
  * used in a "position indepent" fashion, i.e., you don't need to
@@ -44,7 +41,7 @@
  * processes sharing the memory.  The tradoff of this flexibility
  * is more expensive malloc/free operations.
  */
-class ACE_Memory_Export ACE_PI_Control_Block
+class ACE_Export ACE_PI_Control_Block
 {
 public:
   class ACE_Malloc_Header;
@@ -57,11 +54,11 @@ public:
   /**
    * @class ACE_Malloc_Header
    *
-   * @brief This is the control block header.  It's used by <ACE_Malloc>
+   * @brief This is the control block header.  It's used by ACE_Malloc
    * to keep track of each chunk of data when it's in the free
    * list or in use.
    */
-  class ACE_Memory_Export ACE_Malloc_Header
+  class ACE_Export ACE_Malloc_Header
   {
   public:
     ACE_Malloc_Header (void);
@@ -86,20 +83,24 @@ public:
     void dump (void) const;
 
   private:
-    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Malloc_Header &))
+
+    // Disallow copy construction and assignment.
+    ACE_Malloc_Header (ACE_Malloc_Header const &);
+    void operator= (ACE_Malloc_Header const &);
+
   };
 
   /**
    * @class ACE_Name_Node
    *
-   * @brief This class supports "named memory regions" within <ACE_Malloc>.
+   * @brief This class supports "named memory regions" within ACE_Malloc.
    *
    * Internally, the named memory regions are stored as a
-   * doubly-linked list within the <Memory_Pool>.  This makes
+   * doubly-linked list within the Memory_Pool.  This makes
    * it easy to iterate over the items in the list in both FIFO
    * and LIFO order.
    */
-  class ACE_Memory_Export ACE_Name_Node
+  class ACE_Export ACE_Name_Node
   {
   public:
     // = Initialization methods.
@@ -145,7 +146,9 @@ public:
     void dump (void) const;
 
   private:
-    ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Name_Node &))
+
+    // Disallow assignment.
+    void operator= (const ACE_Name_Node &);
   };
 
   /// Print out a bunch of size info for debugging.
@@ -192,9 +195,13 @@ public:
   void dump (void) const;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Control_Block &))
+
+  // Disallow assignment.
+  void operator= (const ACE_Control_Block &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/PI_Malloc.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/PI_Malloc.inl b/ace/PI_Malloc.inl
index b082b523618..1cb78d466e1 100644
--- a/ace/PI_Malloc.inl
+++ b/ace/PI_Malloc.inl
@@ -1,6 +1,11 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_PI_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
 {
@@ -21,5 +26,8 @@ ACE_PI_Control_Block::ACE_Name_Node::init_ptr
   new ((void *) ptr) NAME_NODE_PTR (base_addr, 0);
   *ptr = init;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 9013b577e33..48943aaa544 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 size_t
 ACE_POSIX_Asynch_Result::bytes_transferred (void) const
 {
@@ -118,9 +120,7 @@ ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result
    u_long offset_high,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    aiocb (),
-    handler_proxy_ (handler_proxy),
+  : handler_proxy_ (handler_proxy),
     act_ (act),
     bytes_transferred_ (0),
     success_ (0),
@@ -206,8 +206,7 @@ ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void)
 }
 
 ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    posix_proactor_ (posix_proactor),
+  : posix_proactor_ (posix_proactor),
     handle_  (ACE_INVALID_HANDLE)
 {
 }
@@ -241,9 +240,7 @@ ACE_POSIX_Asynch_Read_Stream_Result::ACE_POSIX_Asynch_Read_Stream_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
       (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block)
 {
@@ -285,9 +282,7 @@ ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void)
 // ************************************************************
 
 ACE_POSIX_Asynch_Read_Stream::ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_Proactor  *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor)
+  : ACE_POSIX_Asynch_Operation (posix_proactor)
 {
 }
 
@@ -322,7 +317,7 @@ ACE_POSIX_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
                                                        signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ);
   if (return_val == -1)
     delete result;
 
@@ -362,9 +357,7 @@ ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
       (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block)
 {
@@ -407,9 +400,7 @@ ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (voi
 // *********************************************************************
 
 ACE_POSIX_Asynch_Write_Stream::ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor)
+  : ACE_POSIX_Asynch_Operation (posix_proactor)
 {
 }
 
@@ -444,7 +435,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
                                                         signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE);
   if (return_val == -1)
     delete result;
 
@@ -468,10 +459,7 @@ ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_Asynch_Read_File_Result_Impl (),
-    ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy,
+  : ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy,
                                          handle,
                                          message_block,
                                          bytes_to_read,
@@ -521,10 +509,7 @@ ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Read_File::ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_Asynch_Read_File_Impl (),
-    ACE_POSIX_Asynch_Read_Stream (posix_proactor)
+  : ACE_POSIX_Asynch_Read_Stream (posix_proactor)
 {
 }
 
@@ -563,7 +548,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
                                                      signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ);
   if (return_val == -1)
     delete result;
 
@@ -601,10 +586,7 @@ ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_Asynch_Write_File_Result_Impl (),
-    ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy,
+  : ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy,
                                           handle,
                                           message_block,
                                           bytes_to_write,
@@ -654,10 +636,7 @@ ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result  (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Write_File::ACE_POSIX_Asynch_Write_File (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_Asynch_Write_File_Impl (),
-    ACE_POSIX_Asynch_Write_Stream (posix_proactor)
+  : ACE_POSIX_Asynch_Write_Stream (posix_proactor)
 {
 }
 
@@ -696,7 +675,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
                                                       signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE);
   if (return_val == -1)
     delete result;
 
@@ -759,9 +738,7 @@ ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result
    int priority,
    int signal_number)
 
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Accept_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
       (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block),
     listen_handle_ (listen_handle)
@@ -801,9 +778,7 @@ ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Accept::ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Accept_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor),
+  : ACE_POSIX_Asynch_Operation (posix_proactor),
     flg_open_ (false)
 {
 }
@@ -1180,10 +1155,7 @@ ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Connect_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
       (handler_proxy, act, event, 0, 0, priority, signal_number)
 {
   this->aio_fildes = connect_handle;
@@ -1218,9 +1190,7 @@ ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Connect::ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Connect_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor),
+  : ACE_POSIX_Asynch_Operation (posix_proactor),
     flg_open_ (false)
 {
 }
@@ -1697,10 +1667,7 @@ ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Transmit_File_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
      (handler_proxy, act, event, offset, offset_high, priority, signal_number),
     socket_ (socket),
     header_and_trailer_ (header_and_trailer),
@@ -2087,9 +2054,7 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Transmit_File::ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Transmit_File_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor)
+  : ACE_POSIX_Asynch_Operation (posix_proactor)
 {
 }
 
@@ -2152,8 +2117,8 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
   ACE_POSIX_Asynch_Transmit_Handler *transmit_handler = 0;
 
   ACE_NEW_RETURN (transmit_handler,
-                  ::ACE_POSIX_Asynch_Transmit_Handler (this->posix_proactor (),
-                                                             result),
+                  ACE_POSIX_Asynch_Transmit_Handler (this->posix_proactor (),
+                                                     result),
                   -1);
 
   ssize_t return_val = transmit_handler->transmit ();
@@ -2228,10 +2193,7 @@ ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Dgram_Result_Impl(),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
       (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_read_ (bytes_to_read),
     message_block_ (message_block),
@@ -2313,10 +2275,7 @@ ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result
    ACE_HANDLE event,
    int priority,
    int signal_number)
-
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Dgram_Result_Impl(),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
      (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_write_ (bytes_to_write),
     message_block_ (message_block),
@@ -2390,7 +2349,7 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
                                                       signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ);
   if (return_val == -1)
     delete result;
 
@@ -2398,9 +2357,7 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
 }
 
 ACE_POSIX_Asynch_Read_Dgram::ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Dgram_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor)
+  : ACE_POSIX_Asynch_Operation (posix_proactor)
 {
 }
 
@@ -2441,7 +2398,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
                                                        signal_number),
                   -1);
 
-  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE);
+  int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE);
   if (return_val == -1)
     delete result;
 
@@ -2450,50 +2407,10 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 
 ACE_POSIX_Asynch_Write_Dgram::ACE_POSIX_Asynch_Write_Dgram
   (ACE_POSIX_Proactor *posix_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Dgram_Impl (),
-    ACE_POSIX_Asynch_Operation (posix_proactor)
+  : ACE_POSIX_Asynch_Operation (posix_proactor)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result *>;
-template class ACE_Node<ACE_POSIX_Asynch_Accept_Result *>;
-template class ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Accept_Result *>;
-
-template class ACE_Unbounded_Queue<ACE_POSIX_Asynch_Result *>;
-template class ACE_Node<ACE_POSIX_Asynch_Result *>;
-template class ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Result *>;
-
-template class ACE_Map_Entry<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *>;
-template class ACE_Map_Manager<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Const_Iterator_Base<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Const_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-
-#elif  defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result *>
-#pragma instantiate ACE_Node<ACE_POSIX_Asynch_Accept_Result *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Accept_Result *>
-
-#pragma instantiate ACE_Unbounded_Queue<ACE_POSIX_Asynch_Result *>
-#pragma instantiate ACE_Node<ACE_POSIX_Asynch_Result *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Result *>
-
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Const_Iterator_Base<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Const_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index e25219070c4..57eb53e169c 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -40,6 +40,8 @@
 
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_POSIX_Proactor;
 class ACE_Proactor_Impl;
@@ -1296,5 +1298,7 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_AIO_CALLS */
 #endif /* ACE_POSIX_ASYNCH_IO_H */
diff --git a/ace/POSIX_CB_Proactor.cpp b/ace/POSIX_CB_Proactor.cpp
index 0c4df22b45e..708fdcf8b5d 100644
--- a/ace/POSIX_CB_Proactor.cpp
+++ b/ace/POSIX_CB_Proactor.cpp
@@ -7,12 +7,13 @@
 #include "ace/Task_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager.h"
-
+#include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID (ace,
            POSIX_CB_Proactor,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_POSIX_CB_Proactor::ACE_POSIX_CB_Proactor (size_t max_aio_operations)
   : ACE_POSIX_AIOCB_Proactor (max_aio_operations,
@@ -178,4 +179,6 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds)
   return ret_aio + ret_que > 0 ? 1 : 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__ */
diff --git a/ace/POSIX_CB_Proactor.h b/ace/POSIX_CB_Proactor.h
index 6021b32a04f..5328d5b1cac 100644
--- a/ace/POSIX_CB_Proactor.h
+++ b/ace/POSIX_CB_Proactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,10 +27,12 @@
 
 #include "ace/POSIX_Proactor.h"
 
-#if defined(AIX) || defined(sun) || defined(__APPLE__)
+#if defined(AIX) || defined(sun) || defined(__APPLE__) || defined (ACE_VXWORKS)
 typedef union sigval sigval_t;
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_POSIX_CB_Proactor
  *
@@ -92,5 +94,7 @@ protected:
   ACE_SYNCH_SEMAPHORE sema_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_AIO_CALLS && !__Lynx__ && !__FreeBSD__  */
 #endif /* ACE_POSIX_CB_PROACTOR_H*/
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index f6bd0c26f86..1664200ecf6 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ace/POSIX_Proactor.h"
@@ -27,6 +26,9 @@
 #endif /* sun */
 
 // *********************************************************************
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_POSIX_Wakeup_Completion
  *
@@ -34,7 +36,7 @@
  * ACE_Proactor interface to wake up all the threads blocking
  * for completions.
  */
-class ACE_Export ACE_POSIX_Wakeup_Completion : public ACE_POSIX_Asynch_Result
+class ACE_POSIX_Wakeup_Completion : public ACE_POSIX_Asynch_Result
 {
 public:
   /// Constructor.
@@ -506,7 +508,7 @@ ACE_POSIX_Proactor::create_asynch_timer
    int priority,
    int signal_number)
 {
-  ACE_Asynch_Result_Impl *implementation;
+  ACE_POSIX_Asynch_Timer *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_POSIX_Asynch_Timer (handler_proxy,
                                           act,
@@ -624,7 +626,7 @@ ACE_POSIX_Proactor::get_impl_type (void)
  * message block to another <accept>, we update <wr_ptr> and put
  * it in its initial position.
  */
-class ACE_Export ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler
+class ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler
 {
 public:
   /// Constructor. You need the posix proactor because you need to call
@@ -1317,11 +1319,11 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result,
   // Save operation code in the aiocb
   switch (op)
     {
-    case ACE_POSIX_Proactor::READ:
+    case ACE_POSIX_Proactor::ACE_OPCODE_READ:
       result->aio_lio_opcode = LIO_READ;
       break;
 
-    case ACE_POSIX_Proactor::WRITE:
+    case ACE_POSIX_Proactor::ACE_OPCODE_WRITE:
       result->aio_lio_opcode = LIO_WRITE;
       break;
 
@@ -1698,7 +1700,7 @@ ACE_POSIX_Proactor::Proactor_Type
 ACE_POSIX_SIG_Proactor::get_impl_type (void)
 {
   return PROACTOR_SIG;
-} 
+}
 
 int
 ACE_POSIX_SIG_Proactor::handle_events (ACE_Time_Value &wait_time)
@@ -2003,8 +2005,7 @@ ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer
    ACE_HANDLE event,
    int priority,
    int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_POSIX_Asynch_Result
+  : ACE_POSIX_Asynch_Result
      (handler_proxy, act, event, 0, 0, priority, signal_number),
     time_ (tv)
 {
@@ -2057,5 +2058,6 @@ ACE_POSIX_Wakeup_Completion::complete (size_t       /* bytes_transferred */,
     handler->handle_wakeup ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 0bacb0ee2db..e56a2f28409 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -36,6 +36,8 @@
 #define ACE_AIO_MAX_SIZE     2048
 #define ACE_AIO_DEFAULT_SIZE 1024
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_POSIX_Proactor
  *
@@ -92,8 +94,8 @@ public:
   };
 
   enum Opcode {
-    READ = 1,
-    WRITE = 2
+    ACE_OPCODE_READ = 1,
+    ACE_OPCODE_WRITE = 2
   };
 
   virtual Proactor_Type  get_impl_type (void);
@@ -105,7 +107,7 @@ public:
   virtual int close (void);
 
   /**
-   * Dispatch a single set of events.  If <wait_time> elapses before
+   * Dispatch a single set of events.  If @a wait_time elapses before
    * any events occur, return 0.  Return 1 on success i.e., when a
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
@@ -114,8 +116,7 @@ public:
 
   /**
    * Block indefinitely until at least one event is dispatched.
-   * Dispatch a single set of events.  If <wait_time> elapses before
-   * any events occur, return 0.  Return 1 on success i.e., when a
+   * Dispatch a single set of events.Return 1 on success i.e., when a
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
    */
@@ -649,6 +650,8 @@ protected:
   ACE_Time_Value time_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/POSIX_Proactor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/POSIX_Proactor.inl b/ace/POSIX_Proactor.inl
index eb358c0b8ae..ae5f727c2a8 100644
--- a/ace/POSIX_Proactor.inl
+++ b/ace/POSIX_Proactor.inl
@@ -2,8 +2,12 @@
 //
 // $Id$
 
-ACE_INLINE 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
 ACE_Asynch_Pseudo_Task& ACE_POSIX_Proactor::get_asynch_pseudo_task (void)
 {
   return this->pseudo_task_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Pagefile_Memory_Pool.cpp b/ace/Pagefile_Memory_Pool.cpp
index 365140b6ed1..125dd041f9e 100644
--- a/ace/Pagefile_Memory_Pool.cpp
+++ b/ace/Pagefile_Memory_Pool.cpp
@@ -29,10 +29,13 @@ ACE_RCSID(ace, Pagefile_Memory_Pool, "$Id$")
 #else //if !defined (ACE_HAS_WINCE)
 #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
   MapViewOfFile (_hnd, _access, _offHigh, _offLow, _nBytes)
-#endif /* !defined (ACE_HAS_WINCE) */
+#endif /* !ACE_HAS_WINCE */
 
-ACE_Pagefile_Memory_Pool_Options::ACE_Pagefile_Memory_Pool_Options (void *base_addr,
-                                                                    size_t max_size)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Pagefile_Memory_Pool_Options::ACE_Pagefile_Memory_Pool_Options (
+  void *base_addr,
+  size_t max_size)
   : base_addr_ (base_addr),
     max_size_ (max_size)
 {
@@ -66,7 +69,7 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto
     {
       this->local_cb_.req_base_ = 0;
       this->local_cb_.mapped_base_ = 0;
-      this->local_cb_.sh_.max_size_ = 
+      this->local_cb_.sh_.max_size_ =
         this->round_to_chunk_size (page_size_) ;
       this->local_cb_.sh_.mapped_size_ = 0;
       this->local_cb_.sh_.free_offset_ =
@@ -376,5 +379,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
 
diff --git a/ace/Pagefile_Memory_Pool.h b/ace/Pagefile_Memory_Pool.h
index 472e1a8731d..eab04d23849 100644
--- a/ace/Pagefile_Memory_Pool.h
+++ b/ace/Pagefile_Memory_Pool.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +27,8 @@
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_mman.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Pagefile_Memory_Pool_Options
  *
@@ -40,12 +37,13 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Memory_Export ACE_Pagefile_Memory_Pool_Options
+class ACE_Export ACE_Pagefile_Memory_Pool_Options
 {
 public:
   /// Initialization method.
-  ACE_Pagefile_Memory_Pool_Options (void *base_addr = ACE_DEFAULT_PAGEFILE_POOL_BASE,
-                                    size_t max_size = ACE_DEFAULT_PAGEFILE_POOL_SIZE);
+  ACE_Pagefile_Memory_Pool_Options (
+    void *base_addr = ACE_DEFAULT_PAGEFILE_POOL_BASE,
+    size_t max_size = ACE_DEFAULT_PAGEFILE_POOL_SIZE);
 
   /// Base address of the memory-mapped backing store.
   void *base_addr_;
@@ -60,7 +58,7 @@ public:
  * @brief Make a memory pool that is based on "anonymous" memory
  * regions allocated from the Win32 page file.
  */
-class ACE_Memory_Export ACE_Pagefile_Memory_Pool
+class ACE_Export ACE_Pagefile_Memory_Pool
 {
 public:
   typedef ACE_Pagefile_Memory_Pool_Options OPTIONS;
@@ -191,6 +189,8 @@ private:
   ACE_TCHAR backing_store_name_[MAXPATHLEN];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Pagefile_Memory_Pool.inl b/ace/Pagefile_Memory_Pool.inl
index db8d7a00aa4..cf54da23f29 100644
--- a/ace/Pagefile_Memory_Pool.inl
+++ b/ace/Pagefile_Memory_Pool.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_WIN32)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE size_t
 ACE_Pagefile_Memory_Pool::round_to_chunk_size (size_t nbytes)
 {
@@ -45,4 +48,7 @@ ACE_Pagefile_Memory_Pool::base_addr (void) const
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
diff --git a/ace/Pair.cpp b/ace/Pair.cpp
deleted file mode 100644
index fce14f96302..00000000000
--- a/ace/Pair.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Pair.cpp
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#include "ace/Pair_T.h"
-
-ACE_RCSID(ace, Pair, "$Id$")
-
diff --git a/ace/Pair.h b/ace/Pair.h
index b4a865c35f4..be0a78a87d9 100644
--- a/ace/Pair.h
+++ b/ace/Pair.h
@@ -6,6 +6,8 @@
  *
  *  $Id$
  *
+ *  ACE_Pair<> convenience header.
+ *
  *  @author Irfan Pyarali
  */
 //=============================================================================
diff --git a/ace/Pair_T.cpp b/ace/Pair_T.cpp
index eb4e10b33ac..fd38f8236ef 100644
--- a/ace/Pair_T.cpp
+++ b/ace/Pair_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_PAIR_T_C
-#define ACE_PAIR_T_C
+#ifndef ACE_PAIR_T_CPP
+#define ACE_PAIR_T_CPP
 
 #include "ace/Pair_T.h"
 
@@ -13,6 +13,4 @@
 #include "ace/Pair_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Pair_T, "$Id$")
-
-#endif /* ACE_PAIR_T_C */
+#endif /* ACE_PAIR_T_CPP */
diff --git a/ace/Pair_T.h b/ace/Pair_T.h
index 37147794fd9..8c8c89f5c2e 100644
--- a/ace/Pair_T.h
+++ b/ace/Pair_T.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Pair
  *
@@ -109,6 +111,8 @@ protected:
   T2 &second_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Pair_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Pair_T.inl b/ace/Pair_T.inl
index dafbb222cca..4ce4a4acae4 100644
--- a/ace/Pair_T.inl
+++ b/ace/Pair_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T1, class T2> ACE_INLINE
 ACE_Pair<T1, T2>::ACE_Pair (const T1 &t1,
                             const T2 &t2)
@@ -84,3 +86,5 @@ ACE_Reference_Pair<T1, T2>::operator== (const ACE_Reference_Pair<T1, T2> &rhs) c
   return (this->first_ == rhs.first_ &&
           this->second_ == rhs.second_);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 7a599303ae0..e442c5e4b65 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -15,12 +15,13 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_Stream_Node)
 
 // Provide the class hierarchy that defines the parse tree of Service
 // Nodes.
 
-
 void
 ACE_Stream_Node::dump (void) const
 {
@@ -36,7 +37,7 @@ ACE_Stream_Node::apply (int & yyerrno)
 
   if (ACE_Service_Config::initialize (this->node_->record (),
                                       this->node_->parameters ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -182,7 +183,7 @@ ACE_Suspend_Node::apply (int & yyerrno)
   ACE_TRACE ("ACE_Suspend_Node::apply");
 
   if (ACE_Service_Config::suspend (this->name ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -196,7 +197,7 @@ ACE_Resume_Node::apply (int & yyerrno)
 {
   ACE_TRACE ("ACE_Resume_Node::apply");
   if (ACE_Service_Config::resume (this->name ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -230,7 +231,7 @@ ACE_Remove_Node::apply (int & yyerrno)
 {
   ACE_TRACE ("ACE_Remove_Node::apply");
   if (ACE_Service_Config::remove (this->name ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -261,7 +262,7 @@ ACE_Dynamic_Node::apply (int & yyerrno)
 
   if (ACE_Service_Config::initialize (this->record (),
                                       this->parameters ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -307,7 +308,7 @@ const ACE_Service_Type *
 ACE_Static_Node::record (void) const
 {
   ACE_TRACE ("ACE_Static_Node::record");
-  ACE_Service_Type *sr;
+  ACE_Service_Type *sr = 0;
 
   if (ACE_Service_Repository::instance()->find
       (this->name (),
@@ -330,7 +331,7 @@ ACE_Static_Node::apply (int & yyerrno)
   ACE_TRACE ("ACE_Static_Node::apply");
   if (ACE_Service_Config::initialize (this->name (),
                                       this->parameters ()) == -1)
-    yyerrno++;
+    ++yyerrno;
 
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -357,6 +358,7 @@ ACE_Location_Node::dump (void) const
 
 ACE_Location_Node::ACE_Location_Node (void)
   : pathname_ (0),
+    dll_ (),
     symbol_ (0)
 {
   ACE_TRACE ("ACE_Location_Node::ACE_Location_Node");
@@ -410,14 +412,6 @@ ACE_Location_Node::open_dll (int & yyerrno)
     {
       ++yyerrno;
 
-#ifndef ACE_NLOGGING
-      ACE_TCHAR *errmsg = this->dll_.error ();
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("ACE_DLL::open failed for %s: %s\n"),
-                  this->pathname (),
-                  errmsg ? errmsg : ACE_LIB_TEXT ("no error reported")));
-#endif /* ACE_NLOGGING */
-
       return -1;
     }
 
@@ -493,13 +487,73 @@ ACE_Function_Node::dump (void) const
 
 ACE_Function_Node::ACE_Function_Node (const ACE_TCHAR *path,
                                       const ACE_TCHAR *func_name)
-  : function_name_ (ACE::strnew (func_name))
+  : function_name_ (make_func_name (func_name))
 {
   ACE_TRACE ("ACE_Function_Node::ACE_Function_Node");
   this->pathname (ACE::strnew (path));
   this->must_delete_ = 1;
 }
 
+ACE_TCHAR *
+ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name)
+{
+  // Preprocessor symbols will not be expanded if they are
+  // stringified.  Force the preprocessor to expand them during the
+  // argument prescan by calling a macro that itself calls another
+  // that performs the actual stringification.
+#if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1
+# define ACE_MAKE_VERSIONED_NAMESPACE_NAME_STRING_IMPL(NAME) #NAME
+# define ACE_MAKE_VERSIONED_NAMESPACE_NAME_STRING(NAME) ACE_MAKE_VERSIONED_NAMESPACE_NAME_STRING_IMPL(NAME)
+# define ACE_VERSIONED_NAMESPACE_NAME_STRING ACE_MAKE_VERSIONED_NAMESPACE_NAME_STRING(ACE_VERSIONED_NAMESPACE_NAME)
+
+  // Check if function is using the ACE naming convention.  If so,
+  // it is likely that the ACE factory function macros
+  // (e.g. ACE_FACTORY_DECLARE) were used to declare and define it, so
+  // mangle the function name to include the ACE versioned namespace
+  // name as is done in the ACE macros.  Otherwise, leave the function
+  // name as is.
+
+  static ACE_TCHAR const make_prefix[] = ACE_LIB_TEXT ("_make_");
+  static size_t const make_prefix_len =
+    sizeof (make_prefix) / sizeof (make_prefix[0]) - 1;
+
+  if (ACE_OS::strncmp (make_prefix, func_name, make_prefix_len) == 0)
+    {
+      static ACE_TCHAR const versioned_namespace_name[] =
+        ACE_LIB_TEXT (ACE_VERSIONED_NAMESPACE_NAME_STRING) ACE_LIB_TEXT("_") ;
+
+      // Null terminator included in versioned_namespace_name_len since
+      // it is static constant.
+      static size_t const versioned_namespace_name_len =
+        sizeof (versioned_namespace_name)
+        / sizeof (versioned_namespace_name[0]); // - 1;
+
+      size_t const len =
+        ACE_OS::strlen (func_name)
+        + versioned_namespace_name_len;
+        // + 1;  // Null terminator.
+
+      ACE_TCHAR * mangled_func_name;
+      ACE_NEW_RETURN (mangled_func_name,
+                      ACE_TCHAR[len],
+                      0);
+
+      ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe (mangled_func_name);
+
+      ACE_OS::snprintf (mangled_func_name,
+                        len,
+                        ACE_LIB_TEXT ("%s%s%s"),
+                        make_prefix,
+                        versioned_namespace_name,
+                        func_name + make_prefix_len);
+
+      return safe.release ();
+    }
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+  return ACE::strnew (func_name);
+}
+
 void *
 ACE_Function_Node::symbol (int & yyerrno,
                            ACE_Service_Object_Exterminator *gobbler)
@@ -544,7 +598,7 @@ ACE_Function_Node::symbol (int & yyerrno,
 
       if (this->symbol_ == 0)
         {
-          yyerrno++;
+          ++yyerrno;
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_LIB_TEXT ("%p\n"),
                              this->function_name_),
@@ -654,7 +708,7 @@ ACE_Static_Function_Node::symbol (int & yyerrno,
 
       if (this->symbol_ == 0)
         {
-          yyerrno++;
+          ++yyerrno;
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_LIB_TEXT ("no static service registered for function %s\n"),
@@ -668,7 +722,7 @@ ACE_Static_Function_Node::symbol (int & yyerrno,
 
   if (this->symbol_ == 0)
     {
-      yyerrno++;
+      ++yyerrno;
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_LIB_TEXT ("%p\n"),
                          this->function_name_),
@@ -684,4 +738,6 @@ ACE_Static_Function_Node::~ACE_Static_Function_Node (void)
   delete[] const_cast<ACE_TCHAR *> (this->function_name_);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index 5e4116e1ccf..acb07deadc8 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -26,6 +26,7 @@
 
 #include "ace/DLL.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations.
 class ACE_Service_Config;
@@ -38,6 +39,8 @@ class ACE_Service_Type;
  * tree of Service Nodes.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Parse_Node
 {
@@ -70,6 +73,8 @@ private:
  * @brief Suspend a Service Node.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Suspend_Node : public ACE_Parse_Node
 {
@@ -92,6 +97,8 @@ public:
  * @brief Resume a Service Node.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Resume_Node : public ACE_Parse_Node
 {
@@ -114,6 +121,8 @@ public:
  * @brief Remove a Service Node.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Remove_Node : public ACE_Parse_Node
 {
@@ -136,6 +145,8 @@ public:
  * @brief Handle a statically linked node.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Static_Node : public ACE_Parse_Node
 {
@@ -164,6 +175,8 @@ private:
  * @brief Handle a dynamically linked node.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Dynamic_Node : public ACE_Static_Node
 {
@@ -191,6 +204,8 @@ private:
  * @brief Handle a Stream.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Stream_Node : public ACE_Parse_Node
 {
@@ -218,6 +233,8 @@ private:
  * @brief Keep track of where a shared library is located.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Location_Node
 {
@@ -265,6 +282,8 @@ protected:
  * @brief Keeps track of the symbol name for a shared object.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Object_Node : public ACE_Location_Node
 {
@@ -291,6 +310,8 @@ private:
  * @brief Keeps track of the symbol name of for a shared function.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Function_Node : public ACE_Location_Node
 {
@@ -307,6 +328,28 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
+
+  /// Return mangled function name that takes into account ACE
+  /// versioned namespace.
+  /**
+   * This function embeds the ACE versioned namespace name into the
+   * original function name if versioned namespace support has been
+   * enabled and the original function name conforms to the ACE
+   * Service Object factory function naming conventions.  For example
+   * "@c _make_Foo" becomes "@c make_ACE_5_4_7_Foo".
+   * @par
+   * If versioned namespace support is disabled or the factory
+   * function name does conform to ACE conventions, no mangling will
+   * occur and the verbatim function name is returned.
+   *
+   * @return Function name that takes into account versioned namespace
+   *         name.  Caller is responsible for calling operator
+   *         delete[] or ACE::strdelete() on the returned string.
+   */
+  ACE_TCHAR * make_func_name (ACE_TCHAR const * func_name);
+
+private:
+
   /// Name of the function that we're parsing.
   const ACE_TCHAR *function_name_;
 };
@@ -317,6 +360,8 @@ private:
  * @brief I forget why this is here... ;-)
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Dummy_Node : public ACE_Parse_Node
 {
@@ -345,6 +390,8 @@ private:
  * application.
  *
  * @note This class is only meant for INTERNAL use by ACE.
+ *
+ * @internal
  */
 class ACE_Static_Function_Node : public ACE_Location_Node
 {
@@ -369,6 +416,8 @@ private:
 /// program.
 extern ACE_Service_Config *ace_this_svc;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Ping_Socket.cpp b/ace/Ping_Socket.cpp
index 9d1254a1bc3..23bff4cb52a 100644
--- a/ace/Ping_Socket.cpp
+++ b/ace/Ping_Socket.cpp
@@ -19,8 +19,12 @@ ACE_RCSID (ace,
            Ping_Socket,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_Ping_Socket)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 //---------------------------------------------------------------------------
 // Better to arrange some os_include/netinet/ip.h and
 // os_include/netinet/icmp.h files ?
@@ -74,6 +78,8 @@ struct icmp
 #endif /* #if ! defined (ACE_WIN32) */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int const ICMP_MIN = 8;  // Minimal size of ICMP packet, header only
 int const ICMP_DATA_LENGTH = 56;  // For ICMP data with Echo request
 ACE_Time_Value const ACE_Ping_Socket::time_default_ (0, 500000);
@@ -362,4 +368,6 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr,
   return this->receive_echo_reply (timeout);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_HAS_ICMP_SUPPORT == 1 */
diff --git a/ace/Ping_Socket.h b/ace/Ping_Socket.h
index 943cd8d55a8..dc473495f67 100644
--- a/ace/Ping_Socket.h
+++ b/ace/Ping_Socket.h
@@ -26,6 +26,8 @@
 
 #include "ace/ICMP_Socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_INET_Addr;
 
 /**
@@ -104,6 +106,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/Ping_Socket.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Ping_Socket.inl b/ace/Ping_Socket.inl
index 27507dacdce..c331b21cea7 100644
--- a/ace/Ping_Socket.inl
+++ b/ace/Ping_Socket.inl
@@ -2,8 +2,12 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE char *
 ACE_Ping_Socket::icmp_recv_buff (void)
 {
   return this->icmp_recv_buff_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 9a94c458130..3d91ce9ecce 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -19,6 +19,8 @@
 
 ACE_RCSID(ace, Pipe, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Pipe::dump (void) const
 {
@@ -44,9 +46,14 @@ ACE_Pipe::open (int buffer_size)
   ACE_SOCK_Stream reader;
   ACE_SOCK_Stream writer;
   int result = 0;
+# if defined (ACE_WIN32)
+  ACE_INET_Addr local_any  (static_cast<u_short> (0), ACE_LOCALHOST);
+# else
+  ACE_Addr local_any = ACE_Addr::sap_any;
+# endif /* ACE_WIN32 */
 
   // Bind listener to any port and then find out what the port was.
-  if (acceptor.open (ACE_Addr::sap_any) == -1
+  if (acceptor.open (local_any) == -1
       || acceptor.get_local_addr (my_addr) == -1)
     result = -1;
   else
@@ -333,3 +340,5 @@ ACE_Pipe::recv (size_t n, ...) const
   va_end (argp);
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Pipe.h b/ace/Pipe.h
index f8f103dd9f0..7f208615da9 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -26,6 +26,8 @@
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Message_Block;
 class ACE_Time_Value;
@@ -37,7 +39,7 @@ class ACE_Time_Value;
  *
  * This class is designed to work with select()-based demuxers, such
  * as the ACE_Select_Reactor, which is why it uses sockets on Windows
- * rather than Win32 pipes (which aren't select()'able). 
+ * rather than Win32 pipes (which aren't select()'able).
  */
 class ACE_Export ACE_Pipe
 {
@@ -152,6 +154,8 @@ private:
   ACE_HANDLE handles_[2];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Pipe.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Pipe.inl b/ace/Pipe.inl
index c5e31cc7061..17b532ed632 100644
--- a/ace/Pipe.inl
+++ b/ace/Pipe.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Global_Macros.h"
 #include "ace/ACE.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Pipe::~ACE_Pipe (void)
 {
@@ -42,17 +45,17 @@ ACE_Pipe::sendv_n (const iovec iov[], int n) const
 
 ACE_INLINE ssize_t
 ACE_Pipe::send_n (const ACE_Message_Block *message_block,
-                     const ACE_Time_Value *timeout,
-                     size_t *bytes_transferred)
+                  const ACE_Time_Value *timeout,
+                  size_t *bytes_transferred)
 {
   ACE_TRACE ("ACE_Pipe::send_n");
-  ACE_UNUSED_ARG (timeout);
 #if defined (ACE_WIN32)
   return ACE::send_n (this->write_handle (),
                       message_block,
                       timeout,
                       bytes_transferred);
 #else
+  ACE_UNUSED_ARG (timeout);
   return ACE::write_n (this->write_handle (),
                       message_block,
                       bytes_transferred);
@@ -124,9 +127,9 @@ ACE_Pipe::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_Pipe::send");
 #if defined (ACE_WIN32)
-  return ACE_OS::send (this->write_handle (), (const char *) buf, n);
+  return ACE_OS::send (this->write_handle (), static_cast <const char *> (buf), n);
 #else
-  return ACE_OS::write (this->write_handle (), (const char *) buf, n);
+  return ACE_OS::write (this->write_handle (), static_cast <const char *> (buf), n);
 #endif /* ACE_WIN32 */
 }
 
@@ -135,9 +138,9 @@ ACE_Pipe::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_Pipe::recv");
 #if defined (ACE_WIN32)
-  return ACE_OS::recv (this->read_handle (), (char *) buf, n);
+  return ACE_OS::recv (this->read_handle (), static_cast <char *> (buf), n);
 #else
-  return ACE_OS::read (this->read_handle (), (char *) buf, n);
+  return ACE_OS::read (this->read_handle (), static_cast <char *> (buf), n);
 #endif /* ACE_WIN32 */
 }
 
@@ -165,19 +168,21 @@ ACE_Pipe::recv (iovec iov[], int n) const
 
 ACE_INLINE ssize_t
 ACE_Pipe::send (const void *buf, size_t n,
-                       ACE_OVERLAPPED *overlapped) const
+                ACE_OVERLAPPED *overlapped) const
 {
   ACE_TRACE ("ACE_Pipe::send");
   return ACE_OS::write (this->write_handle (),
-                        (const char *) buf, n,
+                        static_cast <const char *> (buf), n,
                         overlapped);
 }
 
 ACE_INLINE ssize_t
 ACE_Pipe::recv (void *buf, size_t n,
-                       ACE_OVERLAPPED *overlapped) const
+                ACE_OVERLAPPED *overlapped) const
 {
   ACE_TRACE ("ACE_Pipe::recv");
-  return ACE_OS::read (this->read_handle (), (char *) buf, n,
+  return ACE_OS::read (this->read_handle (), static_cast <char *> (buf), n,
                        overlapped);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp
index 8a996fdf79e..b618c72265f 100644
--- a/ace/Priority_Reactor.cpp
+++ b/ace/Priority_Reactor.cpp
@@ -5,6 +5,8 @@
 
 ACE_RCSID(ace, Priority_Reactor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple> QUEUE_ITERATOR;
 // Its iterator.
 
@@ -177,20 +179,4 @@ ACE_Priority_Reactor::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Queue<ACE_Event_Tuple>;
-template class ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>;
-template class ACE_Node<ACE_Event_Tuple>;
-template class ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> > >;
-template class ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Queue<ACE_Event_Tuple>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>
-#pragma instantiate ACE_Node<ACE_Event_Tuple>
-#pragma instantiate ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> > >
-#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h
index dde598daa9e..24a04166d88 100644
--- a/ace/Priority_Reactor.h
+++ b/ace/Priority_Reactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,12 +14,7 @@
 #define ACE_PRIORITY_REACTOR_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_REACTOR_BUILD_DLL
-# include "ace/ACE_Reactor_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Reactor_Export ACE_Export
-#endif  /* ACE_REACTOR_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,6 +23,8 @@
 #include "ace/Select_Reactor.h"
 #include "ace/Unbounded_Queue.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Priority_Reactor
  *
@@ -37,7 +34,7 @@
  * Select_Reactor by taking advantage of the priority method on
  * ACE_Event_Handler.
  */
-class ACE_Reactor_Export ACE_Priority_Reactor : public ACE_Select_Reactor
+class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor
 {
 public:
   // = Initialization and termination methods.
@@ -96,5 +93,7 @@ private:
   ACE_Priority_Reactor &operator = (const ACE_Priority_Reactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_PRIORITY_REACTOR_H */
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index c8012d7727b..17579d8a2f2 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -38,6 +38,8 @@ ACE_RCSID (ace,
 
 #include "ace/Auto_Event.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Process-wide ACE_Proactor.
 ACE_Proactor *ACE_Proactor::proactor_ = 0;
 
@@ -136,7 +138,7 @@ ACE_Proactor_Timer_Handler::svc (void)
           if (absolute_time > cur_time)
             relative_time = absolute_time - cur_time;
           else
-            relative_time = 0;
+            relative_time = ACE_Time_Value::zero;
 
           // Block for relative time.
           result = this->timer_event_.wait (&relative_time, 0);
@@ -235,7 +237,8 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &,
   auto_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer);
 
   // Post a completion.
-  if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1)
+  if (-1 == safe_asynch_timer->post_completion
+      (this->proactor_->implementation ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("Failure in dealing with timers: ")
                        ACE_LIB_TEXT ("PostQueuedCompletionStatus failed\n")),
@@ -1106,95 +1109,15 @@ ACE_Proactor::implementation (ACE_Proactor_Impl *implementation)
   this->implementation_ = implementation;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timer_Queue_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Queue_Iterator_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_List_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_List_Iterator_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Node_T<ACE_Handler *>;
-template class ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Handler *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Handler *> *>;
-template class ACE_Node <ACE_Timer_Node_T<ACE_Handler *> *>;
-template class ACE_Free_List<ACE_Timer_Node_T<ACE_Handler *> >;
-template class ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Handler *>, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Heap_Iterator_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Wheel_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Wheel_Iterator_T<ACE_Handler *,
-  ACE_Proactor_Handle_Timeout_Upcall,
-  ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timer_Queue_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_List_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_List_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Node_T<ACE_Handler *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Node <ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Free_List<ACE_Timer_Node_T<ACE_Handler *> >
-#pragma instantiate ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Handler *>,\
-   ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Wheel_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Wheel_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Framework_Component_T<ACE_Proactor>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-template class auto_ptr<ACE_Asynch_Result_Impl>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Framework_Component_T<ACE_Proactor>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#pragma instanstiate auto_ptr<ACE_Asynch_Result_Impl>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Proactor *
-ACE_Proactor::instance (size_t threads)
+ACE_Proactor::instance (size_t /* threads */)
 {
-  ACE_UNUSED_ARG (threads);
   return 0;
 }
 
@@ -1236,4 +1159,6 @@ ACE_Proactor::event_loop_done (void)
   return sig_atomic_t (1);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 8ed6aa83a02..2b5f6f750d1 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -37,6 +37,8 @@
 #  include "ace/Timer_Heap.h"
 #  include "ace/Timer_Wheel.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Proactor_Impl;
 class ACE_Proactor_Timer_Handler;
@@ -44,12 +46,12 @@ class ACE_Proactor_Timer_Handler;
 /**
  * @class ACE_Proactor_Handle_Timeout_Upcall
  *
- * @brief Functor for <ACE_Timer_Queue>.
+ * @brief Functor for ACE_Timer_Queue.
  *
  * This class implements the functor required by the Timer
  * Queue to call <handle_timeout> on ACE_Handlers.
  */
-class ACE_Export ACE_Proactor_Handle_Timeout_Upcall
+class ACE_Proactor_Handle_Timeout_Upcall
 {
 
   /// Type def for the timer queue.
@@ -185,8 +187,8 @@ public:
                 int delete_implementation = 0,
                 TIMER_QUEUE *tq = 0);
 
-  /// Virtual destruction.
-  virtual ~ACE_Proactor (void);
+  /// Destruction.
+  ~ACE_Proactor (void);
 
   /// Get pointer to a process-wide <ACE_Proactor>.  <threads> should
   /// be part of another method.
@@ -238,7 +240,7 @@ public:
   static int reset_event_loop (void);
 
   /**
-   * The singleton proactor is used by the <ACE_Service_Config>.
+   * The singleton proactor is used by the ACE_Service_Config.
    * Therefore, we must check for the reconfiguration request and
    * handle it after handling an event.
    */
@@ -252,7 +254,7 @@ public:
    * If @arg delete_implementation was specified to the @c open() method,
    * the implementation object is also deleted.
    */
-  virtual int close (void);
+  int close (void);
 
    /**
    * You can add a hook to various run_event methods and the hook will
@@ -269,7 +271,7 @@ public:
    * <ACE_Proactor::handle_events>
    * method returns -1 or the <end_proactor_event_loop> method is invoked.
    */
-  virtual int proactor_run_event_loop (PROACTOR_EVENT_HOOK = 0);
+  int proactor_run_event_loop (PROACTOR_EVENT_HOOK = 0);
 
   /**
    * Run the event loop until the <ACE_Proactor::handle_events>
@@ -278,28 +280,28 @@ public:
    * or the <ACE_Time_Value>
    * expires, in which case a 0 is returned.
    */
-  virtual int proactor_run_event_loop (ACE_Time_Value &tv,
-                                       PROACTOR_EVENT_HOOK = 0);
+  int proactor_run_event_loop (ACE_Time_Value &tv,
+                               PROACTOR_EVENT_HOOK = 0);
 
   /**
    * Instruct the ACE_Proactor to terminate its event loop
    * and notifies the ACE_Proactor so that it can wake up
    * and close down gracefully.
    */
-  virtual int proactor_end_event_loop (void);
+  int proactor_end_event_loop (void);
 
   /// Report if the ACE_Proactor event loop is finished.
-  virtual int proactor_event_loop_done (void);
+  int proactor_event_loop_done (void);
 
   /// Resets the <ACE_Proactor::end_event_loop_> static so that the
   /// <run_event_loop> method can be restarted.
-  virtual int proactor_reset_event_loop (void);
+  int proactor_reset_event_loop (void);
 
 
   /// This method adds the <handle> to the I/O completion port. This
   /// function is a no-op function for Unix systems and returns 0;
-  virtual int register_handle (ACE_HANDLE handle,
-                               const void *completion_key);
+  int register_handle (ACE_HANDLE handle,
+                       const void *completion_key);
 
   // = Timer management.
   /**
@@ -313,28 +315,28 @@ public:
    * with accidentally deleting the wrong timer.  Returns -1 on
    * failure (which is guaranteed never to be a valid <timer_id>).
    */
-  virtual long schedule_timer (ACE_Handler &handler,
-                               const void *act,
-                               const ACE_Time_Value &time);
+  long schedule_timer (ACE_Handler &handler,
+                       const void *act,
+                       const ACE_Time_Value &time);
 
-  virtual long schedule_repeating_timer (ACE_Handler &handler,
-                                         const void *act,
-                                         const ACE_Time_Value &interval);
+  long schedule_repeating_timer (ACE_Handler &handler,
+                                 const void *act,
+                                 const ACE_Time_Value &interval);
 
   // Same as above except <interval> it is used to reschedule the
   // <handler> automatically.
 
   /// This combines the above two methods into one. Mostly for backward
   /// compatibility.
-  virtual long schedule_timer (ACE_Handler &handler,
-                               const void *act,
-                               const ACE_Time_Value &time,
-                               const ACE_Time_Value &interval);
+  long schedule_timer (ACE_Handler &handler,
+                       const void *act,
+                       const ACE_Time_Value &time,
+                       const ACE_Time_Value &interval);
 
   /// Cancel all timers associated with this <handler>.  Returns number
   /// of timers cancelled.
-  virtual int cancel_timer (ACE_Handler &handler,
-                            int dont_call_handle_close = 1);
+  int cancel_timer (ACE_Handler &handler,
+                    int dont_call_handle_close = 1);
 
   /**
    * Cancel the single <ACE_Handler> that matches the <timer_id> value
@@ -345,9 +347,9 @@ public:
    * Returns 1 if cancellation succeeded and 0 if the <timer_id>
    * wasn't found.
    */
-  virtual int cancel_timer (long timer_id,
-                            const void **act = 0,
-                            int dont_call_handle_close = 1);
+  int cancel_timer (long timer_id,
+                    const void **act = 0,
+                    int dont_call_handle_close = 1);
 
   /**
    * Dispatch a single set of events, waiting up to a specified time limit
@@ -359,14 +361,14 @@ public:
    * Returns 1 when a completion is dispatched. On error, returns -1
    * and sets errno accordingly.
    */
-  virtual int handle_events (ACE_Time_Value &wait_time);
+  int handle_events (ACE_Time_Value &wait_time);
 
   /**
    * Block indefinitely until at least one event is dispatched.
    * @return Returns 1 when a completion is dispatched. On error, returns -1
    * and sets errno accordingly.
    */
-  virtual int handle_events (void);
+  int handle_events (void);
 
   /// Add wakeup dispatch threads (reinit).
   int wake_up_dispatch_threads (void);
@@ -391,10 +393,10 @@ public:
    * It is a no-op in POSIX platforms and it returns
    * ACE_INVALID_HANDLE.
    */
-  virtual ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle (void) const;
 
   /// Get the implementation class.
-  virtual ACE_Proactor_Impl *implementation (void) const;
+  ACE_Proactor_Impl *implementation (void) const;
 
   // = Factory methods for the operations
 
@@ -403,37 +405,37 @@ public:
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_Stream.
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
+  ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_Stream.
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
+  ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_File.
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
+  ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_File.
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
+  ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
 
   /// Create the correct implementation class for doing Asynch_Accept.
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
+  ACE_Asynch_Accept_Impl *create_asynch_accept (void);
 
   /// Create the correct implementation class for doing Asynch_Connect.
-  virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void);
+  ACE_Asynch_Connect_Impl *create_asynch_connect (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Transmit_File.
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
+  ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Read_Dgram.
-  virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
+  ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
 
   /// Create the correct implementation class for doing
   /// Asynch_Write_Dgram.
-  virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
+  ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
 
   // = Factory methods for the results
 
@@ -442,7 +444,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_Stream::Result class.
-  virtual ACE_Asynch_Read_Stream_Result_Impl *
+  ACE_Asynch_Read_Stream_Result_Impl *
     create_asynch_read_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block &message_block,
@@ -454,7 +456,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_Stream::Result.
-  virtual ACE_Asynch_Write_Stream_Result_Impl *
+  ACE_Asynch_Write_Stream_Result_Impl *
     create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block &message_block,
@@ -466,7 +468,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_File::Result.
-  virtual ACE_Asynch_Read_File_Result_Impl *
+  ACE_Asynch_Read_File_Result_Impl *
     create_asynch_read_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
                                     ACE_Message_Block &message_block,
@@ -480,7 +482,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_File::Result.
-  virtual ACE_Asynch_Write_File_Result_Impl *
+  ACE_Asynch_Write_File_Result_Impl *
     create_asynch_write_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block &message_block,
@@ -494,7 +496,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_Dgram::Result.
-  virtual ACE_Asynch_Read_Dgram_Result_Impl *
+  ACE_Asynch_Read_Dgram_Result_Impl *
     create_asynch_read_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block *message_block,
@@ -508,7 +510,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_Dgram::Result.
-  virtual ACE_Asynch_Write_Dgram_Result_Impl *
+  ACE_Asynch_Write_Dgram_Result_Impl *
     create_asynch_write_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block *message_block,
@@ -520,7 +522,7 @@ public:
                                       int signal_number = ACE_SIGRTMIN);
 
   /// Create the correct implementation class for ACE_Asynch_Accept::Result.
-  virtual ACE_Asynch_Accept_Result_Impl *
+  ACE_Asynch_Accept_Result_Impl *
     create_asynch_accept_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                  ACE_HANDLE listen_handle,
                                  ACE_HANDLE accept_handle,
@@ -532,7 +534,7 @@ public:
                                  int signal_number = ACE_SIGRTMIN);
 
   /// Create the correct implementation class for ACE_Asynch_Connect::Result
-  virtual ACE_Asynch_Connect_Result_Impl *
+  ACE_Asynch_Connect_Result_Impl *
     create_asynch_connect_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE  connect_handle,
                                   const void* act,
@@ -542,7 +544,7 @@ public:
 
   /// Create the correct implementation class for
   /// ACE_Asynch_Transmit_File::Result.
-  virtual ACE_Asynch_Transmit_File_Result_Impl *
+  ACE_Asynch_Transmit_File_Result_Impl *
     create_asynch_transmit_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE socket,
                                         ACE_HANDLE file,
@@ -564,7 +566,7 @@ public:
    * Timer object with a meaningful signal number, choosing the
    * largest signal number from the signal mask of the Proactor.
    */
-  virtual ACE_Asynch_Result_Impl *
+  ACE_Asynch_Result_Impl *
     create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                          const void *act,
                          const ACE_Time_Value &tv,
@@ -586,10 +588,10 @@ protected:
    * threads can wake up. This is used in conjunction with the
    * <proactor_run_event_loop>.
    */
-  virtual int proactor_post_wakeup_completions (int how_many);
+  int proactor_post_wakeup_completions (int how_many);
 
   /// Set the implementation class.
-  virtual void implementation (ACE_Proactor_Impl *implementation);
+  void implementation (ACE_Proactor_Impl *implementation);
 
   /// Delegation/implementation class that all methods will be
   /// forwarded to.
@@ -633,6 +635,8 @@ private:
   ACE_Proactor &operator= (const ACE_Proactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  if defined (__ACE_INLINE__)
 #    include "ace/Proactor.inl"
 #  endif /* __ACE_INLINE__ */
@@ -642,6 +646,8 @@ private:
 #  include "ace/os_include/os_stddef.h"
 #  include "ace/os_include/os_signal.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 class ACE_Export ACE_Proactor
@@ -650,8 +656,9 @@ public:
   class Timer_Queue {};
   ACE_Proactor (size_t /* number_of_threads */ = 0,
                 Timer_Queue * /* tq */ = 0) {}
-  virtual int handle_events (void) { return -1; }
-  virtual int handle_events (ACE_Time_Value &) { return -1; }
+  ~ACE_Proactor (void) {}
+  int handle_events (void) { return -1; }
+  int handle_events (ACE_Time_Value &) { return -1; }
 
   /// Placeholder to enable compilation on non-Win32 platforms
   static ACE_Proactor *instance (size_t threads = 0);
@@ -675,6 +682,8 @@ public:
   static sig_atomic_t event_loop_done (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
 
 #include /**/ "ace/post.h"
diff --git a/ace/Proactor.inl b/ace/Proactor.inl
index c4c29697efc..37b887c14d6 100644
--- a/ace/Proactor.inl
+++ b/ace/Proactor.inl
@@ -1,11 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Proactor::run_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -17,12 +20,12 @@ ACE_INLINE int
 ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop (tv)");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
 
-  return p->proactor_run_event_loop 
+  return p->proactor_run_event_loop
     (tv, ACE_Proactor::check_reconfiguration);
 }
 
@@ -30,7 +33,7 @@ ACE_INLINE int
 ACE_Proactor::reset_event_loop(void)
 {
   ACE_TRACE ("ACE_Proactor::reset_event_loop");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -42,7 +45,7 @@ ACE_INLINE int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -54,7 +57,7 @@ ACE_INLINE int
 ACE_Proactor::event_loop_done (void)
 {
   ACE_TRACE ("ACE_Proactor::event_loop_done");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -66,10 +69,12 @@ ACE_INLINE int
 ACE_Proactor::post_wakeup_completions (int how_many)
 {
   ACE_TRACE ("ACE_Proactor::post_wakeup_completions");
-  ACE_Proactor *p = ACE_Proactor::instance ();
+  ACE_Proactor * const p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
 
   return p->proactor_post_wakeup_completions (how_many);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Proactor_Impl.cpp b/ace/Proactor_Impl.cpp
index 9d8a3b08377..0ab848c5920 100644
--- a/ace/Proactor_Impl.cpp
+++ b/ace/Proactor_Impl.cpp
@@ -3,15 +3,19 @@
 #include "ace/Proactor_Impl.h"
 
 ACE_RCSID (ace,
-	   Proactor_Impl,
-	   "$Id$")
+           Proactor_Impl,
+           "$Id$")
 
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
 
-ACE_Proactor_Impl::~ACE_Proactor_Impl()
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Proactor_Impl::~ACE_Proactor_Impl (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index 262d3e66da3..847bc694a10 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Proactor_Impl
  *
@@ -47,13 +49,13 @@ public:
   /// Close the IO completion port.
   virtual int close (void) = 0;
 
-  /// This method adds the <handle> to the I/O completion port. This
+  /// This method adds the @a handle to the I/O completion port. This
   /// function is a no-op function for Unix systems.
   virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key) = 0;
+                               const void *completion_key) = 0;
 
   /**
-   * Dispatch a single set of events.  If <wait_time> elapses before
+   * Dispatch a single set of events.  If @a wait_time elapses before
    * any events occur, return 0.  Return 1 on success i.e., when a
    * completion is dispatched, non-zero (-1) on errors and errno is
    * set accordingly.
@@ -249,13 +251,15 @@ public:
                          int signal_number = 0) = 0;
 
   /**
-   * Post <how_many> completions to the completion port so that all
+   * Post @a how_many completions to the completion port so that all
    * threads can wake up. This is used in conjunction with the
    * <run_event_loop>.
    */
   virtual int post_wakeup_completions (int how_many) = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
 #include /**/ "ace/post.h"
 #endif /* ACE_PROACTOR_IMPL_H */
diff --git a/ace/Process.cpp b/ace/Process.cpp
index c505feaa874..dcf34f36c16 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -31,6 +31,7 @@ sigchld_nop (int, siginfo_t *, ucontext_t *)
 #endif /* ACE_WIN32 */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Process::ACE_Process (void)
   :
@@ -1111,10 +1112,6 @@ ACE_Process_Options::passed_handles (ACE_Handle_Set &set) const
   return 1;
 }
 
-ACE_Managed_Process::ACE_Managed_Process (void)
-{
-}
-
 ACE_Managed_Process::~ACE_Managed_Process (void)
 {
 }
@@ -1124,3 +1121,5 @@ ACE_Managed_Process::unmanage (void)
 {
   delete this;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process.h b/ace/Process.h
index d273d6d9cb7..6c057bd2ed7 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -15,12 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,6 +25,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/sys/os_types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 class ACE_Time_Value;
 
@@ -52,7 +49,7 @@ class ACE_Time_Value;
  * then, the <spawn> is using the <execvp> which searches for the
  * program file in the PATH variable.
  */
-class ACE_Threads_Export ACE_Process_Options
+class ACE_Export ACE_Process_Options
 {
 public:
   enum
@@ -438,7 +435,7 @@ protected:
  * then, the <spawn> is using the <execvp> which searches for the
  * program file in the PATH variable.
  */
-class ACE_Threads_Export ACE_Process
+class ACE_Export ACE_Process
 {
 public:
   friend class ACE_Process_Manager;
@@ -457,9 +454,11 @@ public:
   virtual int prepare (ACE_Process_Options &options);
 
   /**
-   * Launch a new process as described by @a options.  Returns the
-   * process id of the newly spawned child on success or -1 on
-   * failure.
+   * Launch a new process as described by @a options. On success,
+   * returns 1 if the option avoid_zombies is set, else returns the
+   * process id of the newly spawned child. Returns -1 on
+   * failure. This will be fixed in the future versions of ACE when
+   * the process id of the child will be returned regardless of the option.
    */
   virtual pid_t spawn (ACE_Process_Options &options);
 
@@ -496,7 +495,7 @@ public:
    * If <status> != 0, it points to an integer where the function
    * stores the child's exit status.
    *
-   * NOTE: on UNIX platforms this function uses <ualarm>, i.e., it
+   * @note On UNIX platforms this function uses <ualarm>, i.e., it
    * overwrites any existing alarm.  In addition, it steals all
    * <SIGCHLD>s during the timeout period, which will break another
    * <ACE_Process_Manager> in the same process that's expecting
@@ -548,6 +547,12 @@ public:
   PROCESS_INFORMATION process_info (void);
 #endif /* ACE_WIN32 */
 
+private:
+
+  // Disallow copying and assignment since we don't support this (yet).
+  ACE_Process (const ACE_Process &);
+  void operator= (const ACE_Process &);
+
 protected:
   /// Set this process' <exit_code_>.  ACE_Process_Manager uses this
   /// method to set the <exit_code_> after successfully waiting for
@@ -567,9 +572,6 @@ protected:
   /// Handle duplicates made for the child process.
   ACE_Handle_Set dup_handles_;
 
-  // = Disallow copying and assignment since we don't support this (yet).
-  ACE_UNIMPLEMENTED_FUNC (ACE_Process (const ACE_Process &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Process &))
 };
 
 
@@ -582,22 +584,22 @@ protected:
  * @arg unmanage() method that deletes the instance.
  * This class is only valid for use as a dynamically-allocated object!
  */
-class ACE_Threads_Export ACE_Managed_Process : public ACE_Process
+class ACE_Export ACE_Managed_Process : public ACE_Process
 {
 public:
-  ACE_Managed_Process ();
 
   /// Cleanup by deleting @c this.
   virtual void unmanage (void);
 
-private:
+protected:
+
   /// Make sure that we're allocated dynamically!
   virtual ~ACE_Managed_Process (void);
 
-  /// Keep G++ happy...
-  friend class ace_dewarn_gplusplus;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Process.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Process.inl b/ace/Process.inl
index b8a0d721a7b..5af3893100f 100644
--- a/ace/Process.inl
+++ b/ace/Process.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/ACE.h"
@@ -7,6 +8,8 @@
 #include "ace/OS_NS_pwd.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32)
 
 ACE_INLINE PROCESS_INFORMATION
@@ -375,35 +378,33 @@ ACE_Process_Options::process_name (void)
 // under CE.  They are not empty on most other platforms.
 
 ACE_INLINE int
-ACE_Process_Options::setenv (ACE_TCHAR *envp[])
+ACE_Process_Options::setenv (ACE_TCHAR * /* envp */[])
 {
-  ACE_UNUSED_ARG (envp);
   return -1;
 }
 
 ACE_INLINE int
-ACE_Process_Options::setenv (const ACE_TCHAR *format, ...)
+ACE_Process_Options::setenv (const ACE_TCHAR * /* format */, ...)
 {
   return -1;
 }
 
 ACE_INLINE int
-ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
-                             const ACE_TCHAR *format,
+ACE_Process_Options::setenv (const ACE_TCHAR * /* variable_name */,
+                             const ACE_TCHAR * /* format */,
                              ...)
 {
   return -1;
 }
 
 ACE_INLINE int
-ACE_Process_Options::set_handles (ACE_HANDLE std_in,
-                                  ACE_HANDLE std_out,
-                                  ACE_HANDLE std_err)
+ACE_Process_Options::set_handles (ACE_HANDLE /* std_in */,
+                                  ACE_HANDLE /* std_out */,
+                                  ACE_HANDLE /* std_err */)
 {
-  ACE_UNUSED_ARG (std_in);
-  ACE_UNUSED_ARG (std_out);
-  ACE_UNUSED_ARG (std_err);
   return -1;
 }
 
 #endif /* ACE_HAS_WINCE */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index bcadb08c49e..f476fc04a10 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -32,6 +32,8 @@ ACE_Process_Manager_cleanup (void *instance, void *arg)
 }
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Process_Manager::cleanup (void *, void *)
 {
@@ -417,14 +419,15 @@ ACE_Process_Manager::register_handler (ACE_Event_Handler *eh,
 // Create a new process.
 
 pid_t
-ACE_Process_Manager::spawn (ACE_Process_Options &options)
+ACE_Process_Manager::spawn (ACE_Process_Options &options,
+			    ACE_Event_Handler *event_handler)
 {
   ACE_Process *process;
   ACE_NEW_RETURN (process,
                   ACE_Managed_Process,
                   ACE_INVALID_PID);
 
-  pid_t pid = spawn (process, options);
+  pid_t pid = spawn (process, options, event_handler);
   if (pid == ACE_INVALID_PID || pid == 0)
     delete process;
 
@@ -435,7 +438,8 @@ ACE_Process_Manager::spawn (ACE_Process_Options &options)
 
 pid_t
 ACE_Process_Manager::spawn (ACE_Process *process,
-                            ACE_Process_Options &options)
+                            ACE_Process_Options &options,
+			    ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::spawn");
 
@@ -448,7 +452,7 @@ ACE_Process_Manager::spawn (ACE_Process *process,
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
                             ace_mon, this->lock_, -1));
 
-  if (this->append_proc (process) == -1)
+  if (this->append_proc (process, event_handler) == -1)
     // bad news: spawned, but not registered in table.
     return ACE_INVALID_PID;
 
@@ -460,7 +464,8 @@ ACE_Process_Manager::spawn (ACE_Process *process,
 int
 ACE_Process_Manager::spawn_n (size_t n,
                               ACE_Process_Options &options,
-                              pid_t *child_pids)
+                              pid_t *child_pids,
+			      ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::spawn_n");
 
@@ -474,7 +479,7 @@ ACE_Process_Manager::spawn_n (size_t n,
        i < n;
        i++)
     {
-      pid_t pid = this->spawn (options);
+      pid_t pid = this->spawn (options, event_handler);
       if (pid == ACE_INVALID_PID || pid == 0)
         // We're in the child or something's gone wrong.
         return pid;
@@ -489,7 +494,8 @@ ACE_Process_Manager::spawn_n (size_t n,
 // Must be called with locks held.
 
 int
-ACE_Process_Manager::append_proc (ACE_Process *proc)
+ACE_Process_Manager::append_proc (ACE_Process *proc,
+				  ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::append_proc");
 
@@ -508,7 +514,7 @@ ACE_Process_Manager::append_proc (ACE_Process *proc)
     this->process_table_[this->current_count_];
 
   proc_desc.process_ = proc;
-  proc_desc.exit_notify_ = 0;
+  proc_desc.exit_notify_ = event_handler;
 
 #if defined (ACE_WIN32)
   // If we have a Reactor, then we're supposed to reap Processes
@@ -528,7 +534,8 @@ ACE_Process_Manager::append_proc (ACE_Process *proc)
 // allow them to be inserted twice).
 
 int
-ACE_Process_Manager::insert_proc (ACE_Process *proc)
+ACE_Process_Manager::insert_proc (ACE_Process *proc,
+				  ACE_Event_Handler *event_handler)
 {
   ACE_TRACE ("ACE_Process_Manager::insert_proc");
 
@@ -537,7 +544,7 @@ ACE_Process_Manager::insert_proc (ACE_Process *proc)
   if (this->find_proc (proc->getpid ()) != -1)
     return -1;
 
-  return this->append_proc (proc);
+  return this->append_proc (proc, event_handler);
 }
 
 // Remove a process from the pool.
@@ -645,6 +652,46 @@ ACE_Process_Manager::terminate (pid_t pid,
   return ACE_OS::kill (pid, sig);
 }
 
+
+int
+ACE_Process_Manager::set_scheduler (const ACE_Sched_Params & params,
+                                         pid_t pid)
+{
+  ACE_TRACE ("ACE_Process_Manager::sched_setscheduler");
+
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
+                            ace_mon, this->lock_, -1));
+
+  // Check to see if the process identified by the given pid is managed by
+  // this instance of ACE_Process_Manager.
+  ssize_t i = this->find_proc (pid);
+
+  if (i == -1)
+    // set "no such process" error
+    return ACE_INVALID_PID;
+
+  return ACE_OS::sched_params (params, pid);
+}
+
+int
+ACE_Process_Manager::set_scheduler_all (const ACE_Sched_Params & params)
+{
+  ACE_TRACE ("ACE_Process_Manager::setscheduler_all");
+
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
+                            ace_mon, this->lock_, -1));
+  pid_t pid;
+  for (size_t i = 0; i < this->current_count_; ++i)
+    {
+      pid = this->process_table_[i].process_->getpid ();
+      if (ACE_OS::sched_params (params, pid) != 0)
+        return -1;
+    }
+  return 0;
+
+}
+
+
 // Locate the index in the table associated with <pid>.  Must be
 // called with the lock held.
 
@@ -767,7 +814,7 @@ ACE_Process_Manager::wait (pid_t pid,
     {
       // Wait for any Process spawned by this Process_Manager.
 #if defined (ACE_WIN32)
-      HANDLE *handles;
+      HANDLE *handles = 0;
 
       ACE_NEW_RETURN (handles,
                       HANDLE[this->current_count_],
@@ -977,3 +1024,5 @@ ACE_Process_Manager::notify_proc_handler (size_t i,
       return 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index 6a122b7b395..7bfcc545dcd 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -15,13 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
-
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,6 +29,8 @@
 #  include "ace/Recursive_Thread_Mutex.h"
 #endif /* ACE_HAS_THREADS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Reactor;
 
 /**
@@ -43,7 +39,7 @@ class ACE_Reactor;
  * @brief Information describing each process that's controlled by an
  * \<ACE_Process_Manager\>.
  */
-class ACE_Threads_Export ACE_Process_Descriptor
+class ACE_Export ACE_Process_Descriptor
 {
 private:
   friend class ACE_Process_Manager;
@@ -97,8 +93,8 @@ private:
  * <Process> exits, or when any <Process> without a specific
  * <Event_Handler> exits.  When a <Process> exits, the
  * appropriate <Event_Handler>'s <handle_input> is called; the
- * <ACE_HANDLE> passed is either the Process' HANDLE (on Win32),
- * or its pid cast to an <ACE_HANDLE> (on unix).
+ * ACE_HANDLE passed is either the Process' HANDLE (on Win32),
+ * or its pid cast to an ACE_HANDLE (on unix).
  * It is also possible to call the <Process_Manager::wait>
  * functions even though the <Process_Manager> is registered with
  * a <Reactor>.
@@ -125,7 +121,7 @@ private:
  * + The <handle_input> method collects all available exit
  *   statuses.
  */
-class ACE_Threads_Export ACE_Process_Manager : protected ACE_Event_Handler
+class ACE_Export ACE_Process_Manager : protected ACE_Event_Handler
 {
 public:
   friend class ACE_Process_Control;
@@ -142,7 +138,7 @@ public:
    * needed.  If a non-NULL <reactor> is provided, this
    * <ACE_Process_Manager> uses it to notify an application when a
    * process it controls exits.  By default, however, we don't use an
-   * <ACE_Reactor>.
+   * ACE_Reactor.
    */
   ACE_Process_Manager (size_t size = ACE_Process_Manager::DEFAULT_SIZE,
                        ACE_Reactor *reactor = 0);
@@ -153,7 +149,7 @@ public:
    * needed.  If a non-NULL <reactor> is provided, this
    * <ACE_Process_Manager> uses it to notify an application when a
    * process it controls exits.  By default, however, we don't use an
-   * <ACE_Reactor>.
+   * ACE_Reactor.
    */
   int open (size_t size = DEFAULT_SIZE,
             ACE_Reactor *r = 0);
@@ -183,30 +179,38 @@ public:
   // = Process creation methods.
 
   /**
-   * Create a new process by passing <options> to <proc.spawn>.  On
-   * success, returns the process id of the child that was created.
+   * Create a new process by passing <options> to <proc.spawn>.
+   * Register <event_handler> to be called back when the process exits.
+   *
+   * On success, returns the process id of the child that was created.
    * On failure, returns ACE_INVALID_PID.
    */
   pid_t spawn (ACE_Process *proc,
-               ACE_Process_Options &options);
+               ACE_Process_Options &options,
+	       ACE_Event_Handler *event_handler = 0);
 
   /**
-   * Create a new process by passing <options> to
-   * <ACE_Process::spawn>.  On success, returns the process id of the
-   * child that was created.  On failure, returns ACE_INVALID_PID.
+   * Create a new process by passing <options> to <ACE_Process::spawn>.
+   * Register <event_handler> to be called back when the process exits.
+   *
+   * On success, returns the process id of the child that was created.
+   * On failure, returns ACE_INVALID_PID.
    */
-  pid_t spawn (ACE_Process_Options &options);
+  pid_t spawn (ACE_Process_Options &options,
+	       ACE_Event_Handler *event_handler = 0);
 
   /**
    * Create <n> new processes by passing <options> to
    * <ACE_Process::spawn>, which is called <n> times.  If <child_pids>
    * is non-0 it is expected to be an array of <n> <pid_t>'s, which
    * are filled in with the process ids of each newly created process.
+   * Register <event_handler> to be called back when each process exits.
    * Returns 0 on success and -1 on failure.
    */
   int spawn_n (size_t n,
                ACE_Process_Options &options,
-               pid_t *child_pids = 0);
+               pid_t *child_pids = 0,
+	       ACE_Event_Handler *event_Handler = 0);
 
   // = Process synchronization operations.
 
@@ -248,6 +252,7 @@ public:
               ACE_exitcode *status = 0);
 
   /**
+   * @deprecated
    * Reap the result of a single process by calling <ACE_OS::waitpid>,
    * therefore, this method is not portable to Win32.  If the child is
    * successfully reaped, <remove> is called automatically.  This
@@ -263,6 +268,11 @@ public:
    * Register an Event_Handler to be called back when the specified
    * process exits.  If pid == ACE_INVALID_PID this handler is called
    * when any process with no specific handler exits.
+   *
+   * @note In multi-threaded applications, there is a race condition
+   * if a process exits between the time it is spawned and when its
+   * handler is registered.  To avoid this, register the handler at
+   * the time the process is spawned.
    */
   int register_handler (ACE_Event_Handler *event_handler,
                         pid_t pid = ACE_INVALID_PID);
@@ -292,6 +302,22 @@ public:
 
   /// Return the number of managed Processes.
   size_t managed (void) const;
+  /**
+   * Sets the scheduling parameters for the <Process> managed by
+   * <ACE_Process_Manager> identified by pid by passing <params>, <pid> to
+   * <ACE_OS::sched_params>. Returns 0 on success, -1 on failure, and
+   * ACE_INVALID_PID when given pid is not managed by
+   * <ACE_Process_Manager>.
+   */
+  int set_scheduler (const ACE_Sched_Params &params,
+                          pid_t pid);
+
+  /**
+   * Sets the scheduling parameters for all the <Process>es managed by
+   * <ACE_Process_Manager> by passing <params> to
+   * <ACE_OS::sched_params>. Returns 0 on success, -1 on failure.
+   */
+  int set_scheduler_all (const ACE_Sched_Params &);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -357,14 +383,18 @@ private:
 
   /// Insert a process in the table (checks for duplicates).  Omitting
   /// the process handle won't work on Win32...
-  int insert_proc (ACE_Process *process);
+  /// Register <event_handler> to be called back when the process exits.
+  int insert_proc (ACE_Process *process,
+		   ACE_Event_Handler *event_handler = 0);
 
   /**
    * Append information about a process, i.e., its <process_id> in the
    * <process_table_>.  Each entry is added at the end, growing the
    * table if necessary.
+   * Register <event_handler> to be called back when the process exits.
    */
-  int append_proc (ACE_Process *process);
+  int append_proc (ACE_Process *process,
+		   ACE_Event_Handler *event_handler = 0);
 
   /// Actually removes the process at index <n> from the table.  This method
   /// must be called with locks held.
@@ -402,6 +432,8 @@ private:
 #endif /* ACE_HAS_THREADS */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Process_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Process_Manager.inl b/ace/Process_Manager.inl
index c6ee1f25260..248acd4c8e0 100644
--- a/ace/Process_Manager.inl
+++ b/ace/Process_Manager.inl
@@ -1,8 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE size_t
 ACE_Process_Manager::managed (void) const
 {
   return current_count_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp
index 0810ec1af50..6078bfdbc68 100644
--- a/ace/Process_Mutex.cpp
+++ b/ace/Process_Mutex.cpp
@@ -13,6 +13,8 @@
 
 ACE_RCSID(ace, Process_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex)
 
 void
@@ -84,17 +86,4 @@ ACE_Process_Mutex::~ACE_Process_Mutex (void)
 {
 }
 
-//
-// These are instantiated both with and without ACE_HAS_THREADS.
-//
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Guard<ACE_Process_Mutex>;
-template class ACE_Malloc_Lock_Adapter_T<ACE_Process_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Guard<ACE_Process_Mutex>
-#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_Process_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Mutex.h b/ace/Process_Mutex.h
index 262525f7bed..604d7ee0c80 100644
--- a/ace/Process_Mutex.h
+++ b/ace/Process_Mutex.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Process_Mutex.h
@@ -36,6 +37,8 @@
 #  include "ace/Mutex.h"
 #endif /* ACE_HAS_SYSV_IPC && !ACE_USES_MUTEX_FOR_PROCESS_MUTEX */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_Time_Value;
 
@@ -199,6 +202,8 @@ private:
 #endif /* _ACE_USE_SV_SEM */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Process_Mutex.inl b/ace/Process_Mutex.inl
index bf2c8c29ef6..6c19e8d6757 100644
--- a/ace/Process_Mutex.inl
+++ b/ace/Process_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (_ACE_USE_SV_SEM)
 ACE_INLINE const ACE_mutex_t &
 ACE_Process_Mutex::lock (void) const
@@ -111,3 +114,5 @@ ACE_Process_Mutex::tryacquire_write_upgrade (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp
index 7e3bdb7f90c..1ac13b44065 100644
--- a/ace/Process_Semaphore.cpp
+++ b/ace/Process_Semaphore.cpp
@@ -12,6 +12,8 @@
 
 ACE_RCSID(ace, Process_Semaphore, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Process_Semaphore::dump (void) const
 {
@@ -40,10 +42,10 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
 // ACE_TRACE ("ACE_Process_Semaphore::ACE_Process_Semaphore");
 }
 
-ACE_Process_Semaphore::~ACE_Process_Semaphore (void)
-{
-  // ACE_TRACE ("ACE_Process_Semaphore::~ACE_Process_Semaphore");
-}
+// ACE_Process_Semaphore::~ACE_Process_Semaphore (void)
+// {
+//   // ACE_TRACE ("ACE_Process_Semaphore::~ACE_Process_Semaphore");
+// }
 
 // Explicitly destroy the semaphore.
 
@@ -111,3 +113,4 @@ ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>::operator () (const ACE_TCHAR *
   return p;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process_Semaphore.h b/ace/Process_Semaphore.h
index 295c79d5ce0..d9b813b4d4d 100644
--- a/ace/Process_Semaphore.h
+++ b/ace/Process_Semaphore.h
@@ -18,13 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
-
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,13 +30,15 @@
 # include "ace/Semaphore.h"
 #endif /* !(ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Process_Semaphore
  *
  * @brief Wrapper for Dijkstra style general semaphores that work
  * across processes.
  */
-class ACE_Threads_Export ACE_Process_Semaphore
+class ACE_Export ACE_Process_Semaphore
 {
 public:
   /// Initialize the semaphore, with an initial value of @a count and a
@@ -57,7 +53,7 @@ public:
    * If you want to remove the semaphore, you must call the <remove>
    * method explicitly.
    */
-  ~ACE_Process_Semaphore (void);
+  // ~ACE_Process_Semaphore (void);
 
   /**
    * Explicitly destroy the semaphore.  Note that only one thread
@@ -155,12 +151,15 @@ template <class T> class ACE_Malloc_Lock_Adapter_T;
  * the standard form used by other lock strategy classes.
  */
 template<>
-class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>
+class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>
 {
 public:
   ACE_Process_Semaphore * operator () (const ACE_TCHAR *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/Process_Semaphore.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Process_Semaphore.inl b/ace/Process_Semaphore.inl
index 8470291233c..98c29c9b9b6 100644
--- a/ace/Process_Semaphore.inl
+++ b/ace/Process_Semaphore.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
 ACE_INLINE const ACE_sema_t &
 ACE_Process_Semaphore::lock (void) const
@@ -59,3 +62,5 @@ ACE_Process_Semaphore::tryacquire_write_upgrade (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index c3fe6f5e0d6..1198d64de05 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -11,12 +11,15 @@
 
 ACE_RCSID(ace, Profile_Timer, "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
-
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
 #include "ace/OS_NS_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
+
+
 void
 ACE_Profile_Timer::dump (void) const
 {
@@ -261,8 +264,12 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #elif defined (ACE_WIN32) /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Profile_Timer::dump (void) const
 {
@@ -338,10 +345,16 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
   ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage");
 
 #  if defined (ACE_HAS_GETRUSAGE)
-  usage.ru_utime =
-    this->end_usage_.ru_utime - this->begin_usage_.ru_utime;
-  usage.ru_stime =
-    this->end_usage_.ru_stime - this->begin_usage_.ru_stime;
+  // Use ACE_Time_Value's as intermediate because the type of ru_utime can
+  // be multiple types and using the - operator is not safe when this are
+  // 64bit FILETIMEs on Windows
+  ACE_Time_Value end_ru_utime (this->end_usage_.ru_utime);
+  ACE_Time_Value begin_ru_utime (this->begin_usage_.ru_utime);
+  usage.ru_utime = end_ru_utime - begin_ru_utime;
+
+  ACE_Time_Value end_ru_stime (this->end_usage_.ru_stime);
+  ACE_Time_Value begin_ru_stime (this->begin_usage_.ru_stime);
+  usage.ru_stime = end_ru_stime - begin_ru_stime;
 #  else /* ACE_HAS_GETRUSAGE */
   usage = 0;
 #  endif /* ACE_HAS_GETRUSAGE */
@@ -367,8 +380,12 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0)
 }
 #  endif /* ACE_HAS_GETRUSAGE */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #else
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Profile_Timer::dump (void) const
 {
@@ -424,5 +441,7 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
   usage = 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* defined (ACE_HAS_PRUSAGE_T) ||
           defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index e7475a0c586..3740d99002c 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -23,6 +23,8 @@
 
 #include "ace/High_Res_Timer.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Profile_Timer
  *
@@ -130,6 +132,8 @@ private:
 #endif /* ACE_WIN32 || !ACE_HAS_PRUSAGE_T && !ACE_HAS_GETRUSAGE */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/Profile_Timer.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Profile_Timer.inl b/ace/Profile_Timer.inl
index 6256ad61868..6ef5aa45af3 100644
--- a/ace/Profile_Timer.inl
+++ b/ace/Profile_Timer.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_sys_time.h"
@@ -8,9 +9,10 @@
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
 #  if defined (ACE_HAS_PRUSAGE_T)
-
 #    include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
@@ -29,7 +31,13 @@ ACE_Profile_Timer::stop (void)
                     PIOCUSAGE,
                     &this->end_usage_);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  elif defined (ACE_HAS_GETRUSAGE)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
@@ -52,10 +60,14 @@ ACE_Profile_Timer::stop (void)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #  endif /* ACE_HAS_PRUSAGE_T */
 
 #elif defined (ACE_WIN32)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Profile_Timer::~ACE_Profile_Timer (void)
 {
@@ -85,8 +97,12 @@ ACE_Profile_Timer::stop (void)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #else
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
@@ -108,4 +124,6 @@ ACE_Profile_Timer::~ACE_Profile_Timer (void)
 {
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */
diff --git a/ace/QoS/QoS_Decorator.cpp b/ace/QoS/QoS_Decorator.cpp
index 5db08066010..90cc748e856 100644
--- a/ace/QoS/QoS_Decorator.cpp
+++ b/ace/QoS/QoS_Decorator.cpp
@@ -3,7 +3,9 @@
 
 #include "QoS_Decorator.h"
 
-ACE_RCSID(ace, QoS_Decorator, "$Id $")
+ACE_RCSID(ace, QoS_Decorator, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR)
 
@@ -159,3 +161,5 @@ ACE_QoS_Event_Handler::handle_input (ACE_HANDLE fd)
 {
   return this->decorator_base_->handle_qos (fd);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Decorator.h b/ace/QoS/QoS_Decorator.h
index cf062216ec4..512912e7c3b 100644
--- a/ace/QoS/QoS_Decorator.h
+++ b/ace/QoS/QoS_Decorator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,7 +26,7 @@
 #include "SOCK_Dgram_Mcast_QoS.h"
 #include "ACE_QoS_Export.h"
 
-ACE_RCSID(QOS_Decorator, QOS_Decorator, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_QoS_Decorator_Base
@@ -173,5 +173,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* QOS_DECORATOR_H */
diff --git a/ace/QoS/QoS_Manager.cpp b/ace/QoS/QoS_Manager.cpp
index 7e698b0cad2..27fa39ab560 100644
--- a/ace/QoS/QoS_Manager.cpp
+++ b/ace/QoS/QoS_Manager.cpp
@@ -4,7 +4,9 @@
 #include "QoS_Manager.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, QoS_Manager, "$Id $")
+ACE_RCSID(ace, QoS_Manager, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER)
 
@@ -36,12 +38,4 @@ ACE_QoS_Manager::qos_session_set (void)
   return this->qos_session_set_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<ACE_QoS_Session *>;
-template class ACE_Unbounded_Set<ACE_QoS_Session *>;
-template class ACE_Unbounded_Set_Iterator<ACE_QoS_Session *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<ACE_QoS_Session *>
-#pragma instantiate ACE_Unbounded_Set<ACE_QoS_Session *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_QoS_Session *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Manager.h b/ace/QoS/QoS_Manager.h
index 1c1bce7df53..8a0b52c9943 100644
--- a/ace/QoS/QoS_Manager.h
+++ b/ace/QoS/QoS_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,9 @@
 #include "ACE_QoS_Export.h"
 #include "QoS_Session.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_QoS_Manager
  *
@@ -65,5 +68,7 @@ private:
   ACE_QOS_SESSION_SET qos_session_set_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_MANAGER_H */
diff --git a/ace/QoS/QoS_Session.h b/ace/QoS/QoS_Session.h
index 780a80b5a80..3e08bbc69ce 100644
--- a/ace/QoS/QoS_Session.h
+++ b/ace/QoS/QoS_Session.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_SOCK;
 class ACE_QoS_Manager;
 
@@ -175,5 +177,7 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_SESSION_H */
diff --git a/ace/QoS/QoS_Session_Factory.cpp b/ace/QoS/QoS_Session_Factory.cpp
index bb72c0f492f..89a8fbcc913 100644
--- a/ace/QoS/QoS_Session_Factory.cpp
+++ b/ace/QoS/QoS_Session_Factory.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(ace, QoS_Session_Factory, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Factory)
 
 #if defined(ACE_HAS_RAPI)
@@ -99,3 +101,5 @@ ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session)
 
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Session_Factory.h b/ace/QoS/QoS_Session_Factory.h
index 2e80e338d3e..0559dce4220 100644
--- a/ace/QoS/QoS_Session_Factory.h
+++ b/ace/QoS/QoS_Session_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/Containers_T.h"
 #include "ACE_QoS_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declare this, so the factory uses only references to this.
 class ACE_QoS_Session;
 
@@ -88,5 +90,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_SESSION_FACTORY_H */
diff --git a/ace/QoS/QoS_Session_Impl.cpp b/ace/QoS/QoS_Session_Impl.cpp
index 6ed1ae63587..09014ae50c2 100644
--- a/ace/QoS/QoS_Session_Impl.cpp
+++ b/ace/QoS/QoS_Session_Impl.cpp
@@ -13,41 +13,39 @@
 
 ACE_RCSID(ace, QoS_Session_Impl, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Impl)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_RAPI)
 #include "rapi_err.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int ACE_RAPI_Session::rsvp_error = 0;
 
 // Call back function used by RAPI to report RSVP events. This
 // function translates the RAPI QoS parameters into the more generic
 // ACE_QoS parameters for the underlying RAPI session.
 int
-rsvp_callback (rapi_sid_t sid,
+rsvp_callback (rapi_sid_t /* sid */,
                rapi_eventinfo_t eventype,
-               int style_id,
+               int /* style_id */,
                int errcode,
                int errvalue,
                sockaddr * errnode,
-               u_char errflags,
-               int filter_spec_no,
-               rapi_filter_t *filter_spec_list,
+               u_char /* errflags */,
+               int /* filter_spec_no */,
+               rapi_filter_t * /* filter_spec_list */,
                int flow_spec_no,
                rapi_flowspec_t *flow_spec_list,
-               int ad_spec_no,
-               rapi_adspec_t *ad_spec_list,
+               int /* ad_spec_no */,
+               rapi_adspec_t * /* ad_spec_list */,
                void *args
                )
 {
-  ACE_UNUSED_ARG (sid);
-  ACE_UNUSED_ARG (style_id);
-  ACE_UNUSED_ARG (filter_spec_no);
-  ACE_UNUSED_ARG (filter_spec_list);
-  ACE_UNUSED_ARG (ad_spec_no);
-  ACE_UNUSED_ARG (ad_spec_list);
-  ACE_UNUSED_ARG (errflags);
-
   if (args == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Argument in the call back function is null\n\n"));
@@ -56,7 +54,7 @@ rsvp_callback (rapi_sid_t sid,
 
   qos_flowspecx_t *csxp = 0;
   
-  if(!flow_spec_list)
+  if (!flow_spec_list)
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "(%N|%l) Null flow_spec_list\n"));
@@ -313,12 +311,10 @@ ACE_RAPI_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
 }
 
 int
-ACE_RAPI_Session::qos (ACE_SOCK *socket,
-                       ACE_QoS_Manager *qos_manager,
+ACE_RAPI_Session::qos (ACE_SOCK * /* socket */,
+                       ACE_QoS_Manager * /* qos_manager */,
                        const ACE_QoS &ace_qos)
 {
-  ACE_UNUSED_ARG (socket);
-  ACE_UNUSED_ARG (qos_manager);
 
   // If sender : call sending_qos ()
   // If receiver : call receiving_qos ()
@@ -631,8 +627,12 @@ ACE_RAPI_Session::init_flowspec_simplified(const ACE_Flow_Spec &flow_spec)
   return flowsp;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This is a GQoS session ID generator.
 int ACE_GQoS_Session::GQoS_session_id = 0;
 
@@ -720,3 +720,5 @@ ACE_GQoS_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
 {
   this->rsvp_event_type_ = event_type;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Session_Impl.h b/ace/QoS/QoS_Session_Impl.h
index 5b2ac9e829d..193c537a74c 100644
--- a/ace/QoS/QoS_Session_Impl.h
+++ b/ace/QoS/QoS_Session_Impl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 
 #define DEFAULT_SOURCE_SENDER_PORT 10001
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_RAPI_Session
  *
@@ -146,8 +148,12 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_GQoS_Session
  *
@@ -249,6 +255,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "QoS_Session_Impl.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/QoS/QoS_Session_Impl.i b/ace/QoS/QoS_Session_Impl.i
index fe701b32aa2..b3971b46d52 100644
--- a/ace/QoS/QoS_Session_Impl.i
+++ b/ace/QoS/QoS_Session_Impl.i
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// QoS_Session_Impl.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_RAPI)
 
@@ -224,3 +225,5 @@ ACE_GQoS_Session::version (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index 1b6ef84a413..408d5f22a62 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -23,6 +23,7 @@ ACE_RCSID (QoS,
            SOCK_Dgram_Mcast_QoS,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS)
 
@@ -252,3 +253,5 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
       return 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index 5da29c71d4b..032bbe22f11 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK_Dgram_Mcast_QoS
  *
@@ -130,6 +132,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SOCK_Dgram_Mcast_QoS.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.i b/ace/QoS/SOCK_Dgram_Mcast_QoS.i
index 5bf7c57a5ac..9e2347669c5 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.i
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.i
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_Dgram_Mcast_QoS::~ACE_SOCK_Dgram_Mcast_QoS (void)
 {
@@ -50,3 +53,5 @@ ACE_SOCK_Dgram_Mcast_QoS::qos_manager (void)
 {
   return this->qos_manager_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 10f66e42021..a6983ab9463 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -1,5 +1,9 @@
 //$Id$
+
 #include "ace/QtReactor.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
 
 // Must be called with lock held
@@ -149,7 +153,7 @@ ACE_QtReactor::read_event (int p_handle)
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
   if ( -1 != mask )
-	set_enable_flag_by_mask ( 1, handle, mask);
+        set_enable_flag_by_mask ( 1, handle, mask);
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
 }
 
@@ -178,7 +182,7 @@ ACE_QtReactor::write_event (int p_handle)
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
   if ( -1 != mask )
-	set_enable_flag_by_mask ( 1, handle, mask);
+        set_enable_flag_by_mask ( 1, handle, mask);
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
 }
 
@@ -208,7 +212,7 @@ ACE_QtReactor::exception_event (int p_handle)
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
   if ( -1 != mask )
-	set_enable_flag_by_mask ( 1, handle, mask);
+        set_enable_flag_by_mask ( 1, handle, mask);
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
 }
 
@@ -588,8 +592,9 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width,
 
 // mbrudka: who needs wait_for_multiple_events? It seems it's cargo load now!
 int
-ACE_QtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
+ACE_QtReactor::wait_for_multiple_events (
+  ACE_Select_Reactor_Handle_Set &handle_set,
+  ACE_Time_Value *max_wait_time)
 {
   ACE_TRACE ("ACE_QtReactor::wait_for_multiple_events");
 
@@ -621,16 +626,4 @@ ACE_QtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
   // Timed out or input available
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<ACE_HANDLE, QSocketNotifier *>;
-template class ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, QSocketNotifier *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index f15e45bcbf6..c3ccb82f7f3 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,24 +13,26 @@
 
 #ifndef ACE_QTREACTOR_H
 #define ACE_QTREACTOR_H
-#include /**/ "ace/pre.h"
 
+#include /**/ "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
 #include "ace/ACE_QtReactor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Select_Reactor.h"
 #include "ace/Map_Manager.h"
 
-// Qttoolkit specific includes.
+// QT toolkit specific includes.
 #include /**/ <qapplication.h>
 #include /**/ <qobject.h>
 #include /**/ <qsocketnotifier.h>
 #include /**/ <qtimer.h>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_QtReactor
  *
@@ -79,7 +81,9 @@
  * it is not clear if the leak is introduced by  QtReactor, or rather incorrect
  * memory management in QtReactor_Test.
  */
-class ACE_QtReactor_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor
+class ACE_QtReactor_Export ACE_QtReactor
+  : public QObject,
+    public ACE_Select_Reactor
 {
 
     Q_OBJECT
@@ -212,5 +216,7 @@ private slots:
     void timeout_event (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QTREACTOR_H */
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 909d8f386e5..a93b6967145 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_RB_TREE_C
-#define ACE_RB_TREE_C
+#ifndef ACE_RB_TREE_CPP
+#define ACE_RB_TREE_CPP
 
 #include "ace/Global_Macros.h"
 #include "ace/RB_Tree.h"
@@ -17,9 +17,7 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (ace,
-           RB_Tree,
-           "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
 
@@ -544,12 +542,12 @@ void ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::delete_children_i
     {
       this->delete_children_i (parent->left ());
       this->delete_children_i (parent->right ());
-      ACE_DES_FREE_TEMPLATE2 
+      ACE_DES_FREE_TEMPLATE2
         (parent->left (),
          this->allocator_->free,
          ACE_RB_Tree_Node,
          EXT_ID, INT_ID);
-      ACE_DES_FREE_TEMPLATE2 
+      ACE_DES_FREE_TEMPLATE2
         (parent->right (),
          this->allocator_->free,
          ACE_RB_Tree_Node,
@@ -645,7 +643,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
               // The right subtree is empty: insert new node there.
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
 
-              ACE_NEW_MALLOC_RETURN 
+              ACE_NEW_MALLOC_RETURN
                 (tmp,
                  (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
                    (this->allocator_->malloc (sizeof (*tmp)))),
@@ -679,7 +677,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
             {
               // The left subtree is empty: insert new node there.
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_MALLOC_RETURN 
+              ACE_NEW_MALLOC_RETURN
                 (tmp,
                  (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
                    (this->allocator_->malloc (sizeof (*tmp)))),
@@ -703,7 +701,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
     {
       // The tree is empty: insert at the root and color the root
       // black.
-      ACE_NEW_MALLOC_RETURN 
+      ACE_NEW_MALLOC_RETURN
         (this->root_,
          (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
            (this->allocator_->malloc (sizeof (ACE_RB_Tree_Node<EXT_ID, INT_ID>)))),
@@ -712,8 +710,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
       this->root_->color (ACE_RB_Tree_Node_Base::BLACK);
       ++current_size_;
       return &this->root_->item ();
-    }
-  return 0;
+    }  
 }
 
 // Inserts a *copy* of the key and the item into the tree: both the
@@ -762,7 +759,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
             {
               // The right subtree is empty: insert new node there.
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_MALLOC_RETURN 
+              ACE_NEW_MALLOC_RETURN
                 (tmp,
                  (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
                    (this->allocator_->malloc (sizeof (*tmp)))),
@@ -796,7 +793,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
             {
               // The left subtree is empty: insert new node there.
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_MALLOC_RETURN 
+              ACE_NEW_MALLOC_RETURN
                 (tmp,
                  (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
                    (this->allocator_->malloc (sizeof (*tmp)))),
@@ -818,7 +815,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
   else
     {
       // The tree is empty: insert at the root and color the root black.
-      ACE_NEW_MALLOC_RETURN 
+      ACE_NEW_MALLOC_RETURN
         (this->root_,
          (reinterpret_cast<ACE_RB_Tree_Node<EXT_ID, INT_ID>*>
            (this->allocator_->malloc (sizeof (ACE_RB_Tree_Node<EXT_ID, INT_ID>)))),
@@ -1199,5 +1196,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tr
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Reverse_Iterator");
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* !defined (ACE_RB_TREE_C) */
+#endif /* !ACE_RB_TREE_CPP */
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index fa6b88726cb..5c63d0b51ee 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 class ACE_RB_Tree_Iterator_Base;
@@ -151,9 +153,9 @@ protected:
  * a future version of ACE.  Please migrate your code
  * to the appropriate public methods indicated in the
  * method deprecation comments.
- * This class uses an <ACE_Allocator> to allocate memory.  The
+ * This class uses an ACE_Allocator to allocate memory.  The
  * user can make this a persistent class by providing an
- * <ACE_Allocator> with a persistable memory pool.
+ * ACE_Allocator with a persistable memory pool.
  *
  * <b> Requirements and Performance Characteristics</b>
  *   - Internal Structure:
@@ -223,7 +225,7 @@ public:
   // = insertion, removal, and search methods.
 
   /**
-   * 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
    * tree then the <ACE_RB_Tree_Node> 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.
@@ -242,8 +244,8 @@ public:
 
 
   /**
-   * Associate <ext_id> with <int_id> if and only if <ext_id> is not
-   * in the tree.  If <ext_id> is already in the tree then the <int_id>
+   * Associate @a ext_id with @a int_id if and only if @a ext_id is not
+   * in the tree.  If @a ext_id is already in the tree then the @a int_id
    * parameter is assigned the existing value in the tree.  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.
@@ -261,7 +263,7 @@ public:
                ACE_RB_Tree_Node<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
    * tree 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.
@@ -279,9 +281,9 @@ public:
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
+   * Associate @a ext_id with @a int_id.  If @a ext_id is not in the tree
    * 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.
    */
@@ -300,9 +302,9 @@ public:
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
+   * Associate @a ext_id with @a int_id.  If @a ext_id is not in the tree
    * 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_RB_Tree_Nodes> and you also need
    * full control over memory allocation.  Returns 0 if a new entry is
@@ -325,24 +327,24 @@ public:
               INT_ID &old_int_id,
               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
 
-  /// Locate <ext_id> and pass out parameter via <int_id>.  If found,
+  /// Locate @a ext_id and pass out parameter via @a int_id.  If found,
   /// return 0, returns -1 if not found.
   int find (const EXT_ID &ext_id,
             INT_ID &int_id);
 
-  /// 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_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
 
   /**
-   * Unbind (remove) the <ext_id> from the tree.  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 tree.  Don't return the
+   * @a int_id to the caller (this is useful for collections where the
+   * @c 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.
   int unbind (const EXT_ID &ext_id,
               INT_ID &int_id);
@@ -370,8 +372,8 @@ public:
    * possible to acquire the lock explicitly, which can be useful in
    * some cases if you instantiate the <ACE_Atomic_Op> with an
    * <ACE_Recursive_Mutex> or <ACE_Process_Mutex>, or if you need to
-   * guard the state of an iterator.  NOTE: the right name would be
-   * <lock>, but HP/C++ will choke on that!
+   * guard the state of an iterator.
+   * @note The right name would be <lock>, but HP/C++ will choke on that!
    */
   ACE_LOCK &mutex (void);
 
@@ -408,7 +410,7 @@ public:
    *
    * @deprecated signature will change to become
    * int find (const EXT_ID &ext_id); which will return
-   * 0 if the <ext_id> is in the tree, otherwise -1.
+   * 0 if the @a ext_id is in the tree, otherwise -1.
    */
   INT_ID* find (const EXT_ID &k);
 
@@ -418,7 +420,7 @@ public:
    * for copy construction.  The default implementation also requires that
    * the key type support well defined < semantics.  This method returns a
    * pointer to the inserted item copy, or 0 if an error occurred.
-   * NOTE: if an identical key already exists in the tree, no new item
+   * @note If an identical key already exists in the tree, no new item
    * is created, and the returned pointer addresses the existing item
    * associated with the existing key.
    * @deprecated
@@ -522,7 +524,7 @@ protected:
    * for copy construction.  The default implementation also requires that
    * the key type support well defined < semantics.  This method returns a
    * pointer to the inserted item copy, or 0 if an error occurred.
-   * NOTE: if an identical key already exists in the tree, no new item
+   * @note If an identical key already exists in the tree, no new item
    * is created, and the returned pointer addresses the existing item
    * associated with the existing key.
    */
@@ -880,6 +882,8 @@ public:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/RB_Tree.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/RB_Tree.inl b/ace/RB_Tree.inl
index cad46c4cbc3..ba41725319c 100644
--- a/ace/RB_Tree.inl
+++ b/ace/RB_Tree.inl
@@ -6,6 +6,8 @@
 #include "ace/Malloc_Base.h"
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////////////////////////////////////
 // template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
 /////////////////////////////////////////////////////
@@ -653,7 +655,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &k)
                          this->lock_,
                          reinterpret_cast<INT_ID*> (0L));
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry = 0;
   int result = this->find_i (k, entry);
   return (result == 0) ? &(entry->item ()) : 0;
 }
@@ -1151,3 +1153,5 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_
 
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/README b/ace/README
index 64a40549f41..748e5164c84 100644
--- a/ace/README
+++ b/ace/README
@@ -153,6 +153,7 @@ ACE_THREAD_MANAGER_USES_SAFE_SPAWN      Disable the "check before lock" feature
                                         macro avoids a potential race condition
                                         on platforms with aggressive read/write
                                         reordering.
+ACE_HAS_CPU_SET_T                       Platform delivers cpu_set_t.
 ACE_HAS_PRIOCNTL                        OS has priocntl (2).
 ACE_HAS_RECURSIVE_MUTEXES               Mutexes are inherently recursive
                                         (e.g., Win32)
@@ -225,10 +226,6 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
                                         with a NULL addr to accept()
                                         (e.g, VxWorks).
-ACE_HAS_BROKEN_NAMESPACES               Compiler/platform doesn't
-                                        support namespaces (or the
-                                        support is not fully
-                                        implemented.)
 ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char *
                                         as rvalue in conditional operator.
 ACE_HAS_BROKEN_CONVERSIONS              Compiler can't handle calls
@@ -260,12 +257,6 @@ ACE_HAS_BROKEN_T_ERROR                  Compiler/platform has the wrong
                                         prototype for t_error(), i.e.,
                                         t_error(char *) rather than
                                         t_error(const char *).
-ACE_HAS_BROKEN_TIMESPEC_MEMBERS         platform define struct
-                                        timespec members as ts_sec and
-                                        ts_nsec instead of tv_sec and
-                                        tv_nsec.  This is highly
-                                        non-portable.  Currently only
-                                        FreeBSD 2.1.x uses it.
 ACE_HAS_BSTRING                         Platform has <bstring.h>
                                         (which contains bzero()
                                         prototype)
@@ -283,7 +274,9 @@ ACE_HAS_CHARPTR_SPRINTF                 sprintf() returns char *
                                         rather than int (e.g., SunOS
                                         4.x)
 ACE_HAS_CLOCK_GETTIME                   Platform supports POSIX.1b
-                                        clock_gettime ()
+                                        clock_gettime () at least for clock-id CLOCK_REALTIME
+ACE_HAS_CLOCK_GETTIME_MONOTONIC         Platform supports POSIX.1b
+                                        clock_gettime () with the clock-id CLOCK_MONOTONIC
 ACE_HAS_CLOCK_SETTIME                   Platform supports POSIX.1b
                                         clock_settime ()
 ACE_HAS_CONFLICTING_XTI_MACROS          OS's XTI header file defines some
@@ -484,11 +477,6 @@ ACE_HAS_POSIX_SEM_TIMEOUT               Platform supports timed wait operation
                                         on POSIX realtime semaphores.
 ACE_HAS_POSIX_TIME                      Platform supports the POSIX
                                         struct timespec type
-ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO
-                                        LynxOS defines THREAD_CANCELLED macro
-                                        in system headers. This macro must be
-                                        undefined to avoid compilation errors
-                                        in TAO code.
 ACE_HAS_PROC_FS                         Platform supports the /proc
                                         file system and defines tid_t
                                         in <sys/procfs.h>
@@ -513,6 +501,8 @@ ACE_HAS_PTHREADS_STD                    Platform supports POSIX.1c-1995 threads
                                         Pthreads).
 ACE_HAS_PTHREADS_UNIX98_EXT             Platform has the UNIX98 extensions to
                                         Pthreads (rwlocks)
+ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP  Platform has
+					pthread_attr_setcreatesuspend_np().
 ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP     Platform has pthread_condattr_setkind_np().
 ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
                                         pthread_mutexattr_setkind_np().
@@ -575,11 +565,13 @@ ACE_HAS_SIG_ATOMIC_T                    Compiler/platform defines the
                                         sig_atomic_t typedef
 ACE_HAS_SIG_C_FUNC                      Compiler requires extern "C"
                                         functions for signals.
-ACE_HAS_SIN_LEN                         Platform supports new BSD
-                                        inet_addr len field.
 ACE_HAS_SIZET_SOCKET_LEN                OS/compiler uses size_t *
                                         rather than int * for socket
                                         lengths
+ACE_HAS_SOCKADDR_IN_SIN_LEN		Platform has sin_len member in struct
+					sockaddr_in.
+ACE_HAS_SOCKADDR_IN6_SIN_LEN		Platform has sin6_len member in struct
+					sockaddr_in6.
 ACE_HAS_SOCKADDR_MSG_NAME               Platform requires (struct
                                         sockaddr *) for msg_name field
                                         of struct msghdr.
@@ -600,9 +592,14 @@ ACE_HAS_STANDARD_CPP_LIBRARY            Platform/compiler supports
                                         Standard C++ Library
 ACE_HAS_STRBUF_T                        Compiler/platform supports
                                         struct strbuf
-ACE_HAS_STRDUP_EMULATION                Platform/compiler lacks
-                                        strdup() (e.g., VxWorks,
-                                        Chorus, WinCE)
+ACE_HAS_STRDUP_EMULATION                Use ACE's strdup() emulation (even
+					if platform has a native strdup()).
+				        This is useful if you need control
+					over what memory allocator is used.
+ACE_HAS_WCSDUP_EMULATION                Use ACE's wcsdup() emulation (even
+					if platform has a native wcsdup()).
+				        This is useful if you need control
+					over what memory allocator is used.
 ACE_HAS_STRNLEN                         Platform supports strnlen(3).
 ACE_HAS_STREAMS                         Platform supports STREAMS
 ACE_HAS_STREAM_PIPES                    Platform supports STREAM pipes
@@ -716,15 +713,21 @@ ACE_HAS_UNION_WAIT                      The wait() system call takes a
 ACE_HAS_UNIXWARE_SVR4_SIGNAL_T          Has inconsistent SVR4 signal
                                         stuff, but not the same as the
                                         other platforms
-ACE_HAS_USING_KEYWORD                   Compiler supports the new
-                                        using keyword for C++
-                                        namespaces.
 ACE_HAS_VALGRIND                        Running with valgrind
 ACE_HAS_VERBOSE_NOTSUP                  Prints out console message in
                                         ACE_NOTSUP.  Useful for
                                         tracking down origin of
                                         ACE_NOTSUP.
-
+ACE_HAS_VERSIONED_NAMESPACE             Wrap all library code within a
+                                        "versioned namespace" to
+                                        prevent symbol conflicts with
+                                        other versions of ACE shared
+                                        libraries in third party
+                                        libraries.  Default namespace
+                                        name may be overridden by
+                                        defining preprocessor symbol
+                                        ACE_VERSIONED_NAMESPACE_NAME
+                                        to desired name.
 ACE_LACKS_INTMAX_T                      Platform lacks the intmax_t type
 ACE_LACKS_UINTMAX_T			Platform lacks the uintmax_t type.
 ACE_LACKS_INTPTR_T                      Platform lacks the intptr_t type
@@ -970,6 +973,7 @@ ACE_LACKS_NEW_H                         OS doesn't have, or we don't want to
                                         use, new.h.
 ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
                                         for ::pthread_join ().
+ACE_LACKS_NUMERIC_LIMITS		Platform lacks std::numeric_limits<>.
 ACE_LACKS_PERFECT_MULTICAST_FILTERING   Platform lacks IGMPv3 "perfect" filtering
                                         of multicast dgrams at the socket level.
                                         If == 1, ACE_SOCK_Dgram_Mcast will bind
@@ -990,7 +994,7 @@ ACE_LACKS_PUTENV_PROTOTYPE              Platform/compiler lacks the
                                         LynxOS)
 ACE_LACKS_PWD_REENTRANT_FUNCTIONS       Platform lacks getpwnam_r()
                                         methods (e.g., SGI 6.2).
-ACE_LACKS_SID                           Platform lacks setsid
+ACE_LACKS_SID                           Platform lacks setsid()
 ACE_LACKS_QSORT                         Compiler/platform lacks the
                                         standard C library qsort()
                                         function
@@ -1043,14 +1047,14 @@ ACE_LACKS_SIGSET                        Platform lacks signal sets
                                         (e.g., Chorus and Win32)
 ACE_LACKS_NATIVE_STRPTIME               Platform/compiler lacks the strptime()
                                         function.
-ACE_LACKS_STRRCHR                       Platform/compiler lacks
-                                        strrchr () function.
-ACE_LACKS_WCSRCHR                       Platform/compiler lacks wcsrchr ()
-                                        function
+ACE_LACKS_STRCHR			Platform/compiler lacks strchr()
+ACE_LACKS_WCSCHR			Platform/compiler lacks wcschr()
+ACE_LACKS_STRDUP			Platform/compiler lacks strdup()
+ACE_LACKS_WCSDUP			Platform/compiler lacks wcsdup()
+ACE_LACKS_STRRCHR                       Platform/compiler lacks strrchr()
+ACE_LACKS_WCSRCHR                       Platform/compiler lacks wcsrchr()
 ACE_LACKS_SWAB                          Platform/compiler lacks
                                         swab () function.
-ACE_LACKS_SYSTIME_H                     <time.h> doesn't automatically
-                                        #include /**/ <sys/time.h>
 ACE_LACKS_SYS_MSG_H                     Platform lacks sys/msg.h
                                         (e.g., Chorus and VxWorks)
 ACE_LACKS_SYS_PARAM_H                   Platform lacks <sys/param.h>
@@ -1130,6 +1134,7 @@ ACE_LACKS_UNSIGNEDLONGLONG_T            Compiler/platform does not
                                         long datatype.
 ACE_LACKS_UTSNAME_T                     Platform lacks struct utsname
                                         (e.g., Win32 and VxWorks)
+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.
diff --git a/ace/RW_Mutex.cpp b/ace/RW_Mutex.cpp
index cde11394329..54a9b17047d 100644
--- a/ace/RW_Mutex.cpp
+++ b/ace/RW_Mutex.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file RW_Mutex.cpp
  *
@@ -21,6 +20,8 @@
 
 ACE_RCSID(ace, RW_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_RW_Mutex::dump (void) const
 {
@@ -49,4 +50,6 @@ ACE_RW_Mutex::~ACE_RW_Mutex (void)
   this->remove ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/RW_Mutex.h b/ace/RW_Mutex.h
index fe20c589b25..1e920cf3a65 100644
--- a/ace/RW_Mutex.h
+++ b/ace/RW_Mutex.h
@@ -28,6 +28,8 @@
 
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_RW_Mutex
  *
@@ -126,6 +128,8 @@ private:
   ACE_RW_Mutex (const ACE_RW_Mutex &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/RW_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/RW_Mutex.inl b/ace/RW_Mutex.inl
index 4d5fb16be2c..47b95a3bb94 100644
--- a/ace/RW_Mutex.inl
+++ b/ace/RW_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_rwlock_t &
 ACE_RW_Mutex::lock (void) const
 {
@@ -76,3 +79,5 @@ ACE_RW_Mutex::release (void)
 // ACE_TRACE ("ACE_RW_Mutex::release");
   return ACE_OS::rw_unlock (&this->lock_);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp
index a0d0b15a2af..f16bf535182 100644
--- a/ace/RW_Process_Mutex.cpp
+++ b/ace/RW_Process_Mutex.cpp
@@ -16,6 +16,8 @@ ACE_RCSID(ace, RW_Process_Mutex, "$Id$")
 #include "ace/OS_NS_fcntl.h"
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex)
 
 const ACE_TCHAR *
@@ -27,7 +29,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 )
+                                                mode_t mode )
   : lock_ (name ? name : this->unique_name (), flags, mode)
 {
 // ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex");
@@ -49,17 +51,4 @@ ACE_RW_Process_Mutex::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-//
-// These are instantiated both with and without ACE_HAS_THREADS.
-//
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// template class ACE_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Malloc_Lock_Adapter_T<ACE_RW_Process_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// #pragma instantiate ACE_Guard<ACE_RW_Process_Mutex>
-#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_RW_Process_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/RW_Process_Mutex.h b/ace/RW_Process_Mutex.h
index cee7a1a6cb5..a34b6f9f404 100644
--- a/ace/RW_Process_Mutex.h
+++ b/ace/RW_Process_Mutex.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //=============================================================================
 /**
  *  @file    RW_Process_Mutex.h
@@ -23,6 +24,8 @@
 #include "ace/Default_Constants.h"
 #include "ace/OS_NS_fcntl.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_RW_Process_Mutex
  *
@@ -33,16 +36,16 @@
  * used between separate processes, rather than threads in the
  * same process.  This isn't a limitation of ACE, it's simply
  * the file lock semantics on UNIX and Win32.
- * \todo For systems with pthread_rwlockattr_setpshared one 
+ * \todo For systems with pthread_rwlockattr_setpshared one
  * may consider using them to make the mutex faster.
  */
-class ACE_Threads_Export ACE_RW_Process_Mutex
+class ACE_Export ACE_RW_Process_Mutex
 {
 public:
   /// Create a readers/writer <Process_Mutex>, passing in the optional
-  /// <name>, <flags> and <mode> \sa ACE_File_Lock.  
-  ///  If not specified, a name is generated and flags and mode are set 
-  ///  to default platform values. 
+  /// <name>, <flags> and <mode> \sa ACE_File_Lock.
+  ///  If not specified, a name is generated and flags and mode are set
+  ///  to default platform values.
 #if defined (ACE_WIN32)
   ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0,
                         int flags = O_CREAT|O_RDWR,
@@ -50,7 +53,7 @@ public:
 #else
   ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0,
                         int flags = O_CREAT|O_RDWR,
-	                    mode_t mode = S_IRUSR | S_IWUSR );
+                            mode_t mode = S_IRUSR | S_IWUSR );
 #endif /* ACE_WIN32 */
 
   ~ACE_RW_Process_Mutex (void);
@@ -120,6 +123,8 @@ private:
   ACE_File_Lock lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/RW_Process_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/RW_Process_Mutex.inl b/ace/RW_Process_Mutex.inl
index cc59bb9fc17..e3bced0449c 100644
--- a/ace/RW_Process_Mutex.inl
+++ b/ace/RW_Process_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Explicitly destroy the mutex.
 ACE_INLINE int
 ACE_RW_Process_Mutex::remove (void)
@@ -70,3 +73,5 @@ ACE_RW_Process_Mutex::lock (void) const
 // ACE_TRACE ("ACE_RW_Process_Mutex::lock");
   return this->lock_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/RW_Thread_Mutex.cpp b/ace/RW_Thread_Mutex.cpp
index 1f6ae3153eb..bc1c9ecb44f 100644
--- a/ace/RW_Thread_Mutex.cpp
+++ b/ace/RW_Thread_Mutex.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file RW_Thread_Mutex.cpp
  *
@@ -21,6 +20,8 @@
 
 ACE_RCSID(ace, RW_Thread_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Thread_Mutex)
 
 ACE_RW_Thread_Mutex::ACE_RW_Thread_Mutex (const ACE_TCHAR *name,
@@ -39,16 +40,6 @@ ACE_RW_Thread_Mutex::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// These are only instantiated with ACE_HAS_THREADS.
-template class ACE_Guard<ACE_RW_Thread_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Thread_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// These are only instantiated with ACE_HAS_THREADS.
-#pragma instantiate ACE_Guard<ACE_RW_Thread_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_RW_Thread_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_RW_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/RW_Thread_Mutex.h b/ace/RW_Thread_Mutex.h
index 171006ad11a..9f5f43f93c4 100644
--- a/ace/RW_Thread_Mutex.h
+++ b/ace/RW_Thread_Mutex.h
@@ -29,6 +29,8 @@
 
 #include "ace/RW_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_RW_Thread_Mutex
  *
@@ -60,6 +62,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/RW_Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/RW_Thread_Mutex.inl b/ace/RW_Thread_Mutex.inl
index 82b4beb7f15..9f4d315df4a 100644
--- a/ace/RW_Thread_Mutex.inl
+++ b/ace/RW_Thread_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_RW_Thread_Mutex::tryacquire_write_upgrade (void)
 {
@@ -12,3 +15,5 @@ ACE_INLINE
 ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index d7fd9abd919..4921135bd3a 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -2,7 +2,6 @@
 
 #include "ace/Reactor.h"
 
-
 //#if !defined (ACE_HAS_WINCE)
 #  if !defined (ACE_LACKS_ACE_SVCCONF)
 #    include "ace/Service_Config.h"
@@ -60,6 +59,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Reactor)
 
 ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
@@ -327,8 +328,6 @@ ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv,
       else if (result <= 0)
         return result;
     }
-
-  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -944,8 +943,4 @@ ACE_Reactor::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Framework_Component_T<ACE_Reactor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Framework_Component_T<ACE_Reactor>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor.h b/ace/Reactor.h
index a4055932def..1875482644e 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -30,6 +30,8 @@
 // Event_Handler.h contains the definition of ACE_Reactor_Mask
 #include "ace/Event_Handler.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Reactor_Impl;
 class ACE_Handle_Set;
 class ACE_Sig_Action;
@@ -38,7 +40,7 @@ class ACE_Sig_Set;
 
 /*
  * Hook to specialize the Reactor implementation with the concrete
- * Reactor type, for exmaple, select, thread pool reactor known 
+ * Reactor type, for exmaple, select, thread pool reactor known
  * at compile time.
  */
 //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
@@ -48,7 +50,7 @@ class ACE_Sig_Set;
  *
  * @brief The responsibility of this class is to forward all methods to
  * its delegation/implementation class, e.g.,
- * <ACE_Select_Reactor> or <ACE_WFMO_Reactor>.
+ * ACE_Select_Reactor or ACE_WFMO_Reactor.
  */
 class ACE_Export ACE_Reactor : public ACE_Reactor_Timer_Interface
 {
@@ -78,11 +80,11 @@ public:
    */
   typedef int (*REACTOR_EVENT_HOOK)(ACE_Reactor *);
 
-  /// Get pointer to a process-wide <ACE_Reactor>.
+  /// Get pointer to a process-wide ACE_Reactor.
   static ACE_Reactor *instance (void);
 
   /**
-   * Set pointer to a process-wide <ACE_Reactor> and return existing
+   * Set pointer to a process-wide ACE_Reactor and return existing
    * pointer.  If <delete_reactor> != 0 then we'll delete the Reactor
    * at destruction time.
    */
@@ -162,7 +164,7 @@ public:
   static void reset_event_loop (void);
 
   /**
-   * The singleton reactor is used by the <ACE_Service_Config>.
+   * The singleton reactor is used by the ACE_Service_Config.
    * Therefore, we must check for the reconfiguration request and
    * handle it after handling an event.
    */
@@ -211,9 +213,9 @@ public:
   virtual void reset_reactor_event_loop (void);
 
   /**
-   * Create the Reactor using <implementation>.  The flag
-   * <delete_implementation> tells the Reactor whether or not to
-   * delete the <implementation> on destruction.
+   * Create the Reactor using @a implementation.  The flag
+   * @a delete_implementation tells the Reactor whether or not to
+   * delete the @a implementation on destruction.
    */
   ACE_Reactor (ACE_Reactor_Impl *implementation = 0,
                int delete_implementation = 0);
@@ -226,8 +228,8 @@ public:
   virtual ~ACE_Reactor (void);
 
   /**
-   * Initialize the <ACE_Reactor> to manage <max_number_of_handles>.
-   * If <restart> is non-0 then the <ACE_Reactor>'s <handle_events>
+   * Initialize the ACE_Reactor to manage <max_number_of_handles>.
+   * If <restart> is non-0 then the ACE_Reactor's <handle_events>
    * method will be restarted automatically when <EINTR> occurs.  If
    * <signal_handler> or <timer_queue> are non-0 they are used as the
    * signal handler and timer queue, respectively.
@@ -271,7 +273,7 @@ public:
    * application wishes to handle events for some fixed amount of
    * time.
    *
-   * Returns the total number of timers and I/O <ACE_Event_Handler>s
+   * Returns the total number of timers and I/O ACE_Event_Handlers
    * that were dispatched, 0 if the <max_wait_time> elapsed without
    * dispatching any handlers, or -1 if an error occurs.
    *
@@ -382,12 +384,12 @@ public:
   /**
    * Register handler for signals.
    *
-   * Register <new_sh> to handle the signal <signum> using the
-   * <new_disp>.  Returns the <old_sh> that was previously registered
-   * (if any), along with the <old_disp> of the signal handler.
+   * Register @a new_sh to handle the signal @a signum using the
+   * @a new_disp.  Returns the @a old_sh that was previously registered
+   * (if any), along with the @a old_disp of the signal handler.
    *
-   * Reactor will call ACE_Event_Handler::add_reference() on <new_sh>
-   * and ACE_Event_Handler::remove_reference() on <old_sh>.
+   * Reactor will call ACE_Event_Handler::add_reference() on @a new_sh
+   * and ACE_Event_Handler::remove_reference() on @a old_sh.
    */
   virtual int register_handler (int signum,
                                 ACE_Event_Handler *new_sh,
@@ -546,16 +548,19 @@ public:
    * @see cancel_timer()
    * @see reset_timer_interval()
    *
-   * @param event_handler  event handler to schedule on reactor
-   * @param arg  argument passed to the handle_timeout() method of  event_handler
-   * @param delay  time interval after which the timer will expire
-   * @param interval  time interval after which the timer will be automatically rescheduled
+   * @param event_handler Event handler to schedule on reactor
+   * @param arg Argument passed to the handle_timeout() method of
+   * event_handler
+   * @param delay Time interval after which the timer will expire
+   * @param interval Time interval after which the timer will be automatically
+   * rescheduled
    * @return -1 on failure, a timer_id value on success
    */
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
                                const void *arg,
                                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval = ACE_Time_Value::zero);
+                               const ACE_Time_Value &interval =
+                                ACE_Time_Value::zero);
 
   /**
    * Reset recurring timer interval.
@@ -574,12 +579,12 @@ public:
   /**
    * Cancel timer.
    *
-   * Cancel timer associated with <timer_id> that was returned from
+   * Cancel timer associated with @a timer_id that was returned from
    * the schedule_timer() method.  If arg is non-NULL then it will be
    * set to point to the ``magic cookie'' argument passed in when the
    * handler was registered.  This makes it possible to free up the
    * memory and avoid memory leaks.  Returns 1 if cancellation
-   * succeeded and 0 if the <timer_id> wasn't found.
+   * succeeded and 0 if the @a timer_id wasn't found.
    *
    * On successful cancellation, ACE_Event_Handler::handle_close()
    * will be called with <ACE_Event_Handler::TIMER_MASK>.
@@ -619,8 +624,8 @@ public:
   virtual int schedule_wakeup (ACE_Event_Handler *event_handler,
                                ACE_Reactor_Mask masks_to_be_added);
 
-  /// Add <masks_to_be_added> to the <handle>'s entry.  <event_handler>
-  /// associated with <handle> must already have been registered.
+  /// Add @a masks_to_be_added to the @a handle's entry.  <event_handler>
+  /// associated with @a handle must already have been registered.
   /// Note that this call does not cause the Reactor to re-examine
   /// its set of handlers - the new masks will be noticed the next
   /// time the Reactor waits for activity. If there is no other
@@ -715,13 +720,14 @@ public:
    * be called.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler *eh,
-                                           ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+                                           ACE_Reactor_Mask =
+                                            ACE_Event_Handler::ALL_EVENTS_MASK);
 
   // = Assorted helper methods.
 
   /**
-   * Return the Event_Handler associated with <handle>.  Return 0 if
-   * <handle> is not registered.
+   * Return the Event_Handler associated with @a handle.  Return 0 if
+   * @a handle is not registered.
    *
    * Reactor will call ACE_Event_Handler::add_reference() on the
    * handler before returning it.
@@ -729,12 +735,12 @@ public:
   virtual ACE_Event_Handler *find_handler (ACE_HANDLE handle);
 
   /**
-   * Check to see if <handle> is associated with a valid Event_Handler
-   * bound to <mask>.  Return the <event_handler> associated with this
-   * <handler> if <event_handler> != 0.
+   * Check to see if @a handle is associated with a valid Event_Handler
+   * bound to @a mask.  Return the @c event_handler associated with this
+   * @a handler if @a event_handler != 0.
    *
    * Reactor will call ACE_Event_Handler::add_reference() on the
-   * handler before returning it if <event_handler> != 0.
+   * handler before returning it if @a event_handler != 0.
    */
   virtual int handler (ACE_HANDLE handle,
                        ACE_Reactor_Mask mask,
@@ -743,7 +749,7 @@ public:
   /**
    * 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.
+   * this <handler> if @a event_handler != 0.
    */
   virtual int handler (int signum,
                        ACE_Event_Handler **event_handler = 0);
@@ -784,13 +790,13 @@ public:
   // = Low-level wait_set mask manipulation methods.
 
   /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the
-  /// <event_handler> and <mask>.
+  /// @a event_handler and @a mask.
   virtual int mask_ops (ACE_Event_Handler *event_handler,
                         ACE_Reactor_Mask mask,
                         int ops);
 
-  /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the <handle>
-  /// and <mask>.
+  /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the @a handle
+  /// and @a mask.
   virtual int mask_ops (ACE_HANDLE handle,
                         ACE_Reactor_Mask mask,
                         int ops);
@@ -841,7 +847,7 @@ protected:
   /// the implementation instance
   int delete_implementation_;
 
-  /// Pointer to a process-wide <ACE_Reactor> singleton.
+  /// Pointer to a process-wide ACE_Reactor singleton.
   static ACE_Reactor *reactor_;
 
   /// Must delete the <reactor_> singleton if non-0.
@@ -852,6 +858,9 @@ protected:
   ACE_Reactor &operator = (const ACE_Reactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/Reactor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Reactor.inl b/ace/Reactor.inl
index 49132e29733..9b1344465ba 100644
--- a/ace/Reactor.inl
+++ b/ace/Reactor.inl
@@ -7,10 +7,12 @@
 
 /*
  * Hook to specialize the Reactor with the concrete implementation
- * known at compile time. 
+ * known at compile time.
  */
 //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Reactor::run_event_loop (void)
 {
@@ -95,3 +97,5 @@ ACE_Reactor::event_loop_done (void)
   ACE_TRACE ("ACE_Reactor::event_loop_done");
   return ACE_Reactor::instance ()->reactor_event_loop_done ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Impl.cpp b/ace/Reactor_Impl.cpp
index 556d25c4ee5..96411b8b0c6 100644
--- a/ace/Reactor_Impl.cpp
+++ b/ace/Reactor_Impl.cpp
@@ -3,9 +3,13 @@
 #include "ace/Reactor_Impl.h"
 
 ACE_RCSID (ace,
-	   Reactor_Impl,
-	   "$Id$")
+           Reactor_Impl,
+           "$Id$")
 
-ACE_Reactor_Impl::~ACE_Reactor_Impl()
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Reactor_Impl::~ACE_Reactor_Impl (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index cfe7e943828..51cca18517e 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 #include "ace/Event_Handler.h"
 #include "ace/Countdown_Time.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls
 class ACE_Handle_Set;
 class ACE_Reactor_Impl;
@@ -108,7 +110,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. Returns the number of notifications
+   * ACE_Event_Handler object. Returns the number of notifications
    * purged. Returns -1 on error.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler * = 0,
@@ -150,7 +152,7 @@ public:
   /// Set a user-specified timer queue.
   virtual int timer_queue (ACE_Timer_Queue *tq) = 0;
 
-  /// Return the current <ACE_Timer_Queue>.
+  /// Return the current ACE_Timer_Queue.
   virtual ACE_Timer_Queue *timer_queue (void) const = 0;
 
   /// Close down and release all resources.
@@ -177,7 +179,7 @@ public:
    * application wishes to handle events for some fixed amount of
    * time.
    *
-   * Returns the total number of <ACE_Event_Handler>s that were
+   * Returns the total number of ACE_Event_Handlers that were
    * dispatched, 0 if the <max_wait_time> elapsed without dispatching
    * any handlers, or -1 if an error occurs.
    *
@@ -467,7 +469,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. Returns the number of notifications
+   * ACE_Event_Handler object. Returns the number of notifications
    * purged. Returns -1 on error.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler * = 0,
@@ -561,5 +563,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_REACTOR_IMPL_H */
diff --git a/ace/Reactor_Notification_Strategy.cpp b/ace/Reactor_Notification_Strategy.cpp
index c902f30b929..a029e2c10c2 100644
--- a/ace/Reactor_Notification_Strategy.cpp
+++ b/ace/Reactor_Notification_Strategy.cpp
@@ -7,9 +7,12 @@
 
 ACE_RCSID(ace, Reactor_Notification_Strategy, "$Id$")
 
-ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor,
-                                                                      ACE_Event_Handler *eh,
-                                                                      ACE_Reactor_Mask mask)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy (
+  ACE_Reactor *reactor,
+  ACE_Event_Handler *eh,
+  ACE_Reactor_Mask mask)
   : ACE_Notification_Strategy (eh, mask),
     reactor_ (reactor)
 {
@@ -31,3 +34,5 @@ ACE_Reactor_Notification_Strategy::notify (ACE_Event_Handler *eh,
 {
   return this->reactor_->notify (eh, mask);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Notification_Strategy.h b/ace/Reactor_Notification_Strategy.h
index 4a38f37ec25..5d38f5609a6 100644
--- a/ace/Reactor_Notification_Strategy.h
+++ b/ace/Reactor_Notification_Strategy.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -11,6 +11,7 @@
 //=============================================================================
 #ifndef ACE_REACTOR_NOTIFICATION_STRATEGY_H
 #define ACE_REACTOR_NOTIFICATION_STRATEGY_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Notification_Strategy.h"
@@ -19,12 +20,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Reactor_Notification_Strategy
  *
  * @brief Used to notify an ACE_Reactor
  *
- * Integrates the <ACE_Message_Queue> notification into the
+ * Integrates the ACE_Message_Queue notification into the
  * <ACE_Reactor::notify> method.
  */
 class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Strategy
@@ -53,9 +56,12 @@ protected:
   ACE_Reactor *reactor_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Reactor_Notification_Strategy.inl"
 #endif /* __ACE_INLINE __ */
 
 #include /**/ "ace/post.h"
+
 #endif /*ACE_REACTOR_NOTIFICATION_STRATEGY_H */
diff --git a/ace/Reactor_Notification_Strategy.inl b/ace/Reactor_Notification_Strategy.inl
index 260ec1d960a..328c2687a77 100644
--- a/ace/Reactor_Notification_Strategy.inl
+++ b/ace/Reactor_Notification_Strategy.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_Reactor *
 ACE_Reactor_Notification_Strategy::reactor (void)
 {
@@ -12,3 +15,5 @@ ACE_Reactor_Notification_Strategy::reactor (ACE_Reactor *r)
 {
   this->reactor_ = r;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Timer_Interface.cpp b/ace/Reactor_Timer_Interface.cpp
index ea457c207a9..6c07f21ac86 100644
--- a/ace/Reactor_Timer_Interface.cpp
+++ b/ace/Reactor_Timer_Interface.cpp
@@ -6,6 +6,11 @@ ACE_RCSID (ace,
            Reactor_Timer_Interface,
            "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Reactor_Timer_Interface::~ACE_Reactor_Timer_Interface()
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Timer_Interface.h b/ace/Reactor_Timer_Interface.h
index 91638c9c2bd..d370a128df2 100644
--- a/ace/Reactor_Timer_Interface.h
+++ b/ace/Reactor_Timer_Interface.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Event_Handler;
 
 /**
@@ -51,6 +53,8 @@ public:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_REACTOR_TIMER_INTERFACE_H */
diff --git a/ace/Reactor_Token_T.cpp b/ace/Reactor_Token_T.cpp
index ede9bba4a1f..358b0b14f65 100644
--- a/ace/Reactor_Token_T.cpp
+++ b/ace/Reactor_Token_T.cpp
@@ -3,9 +3,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Reactor_Token_T.h"
 
-ACE_RCSID (ace,
-	   Reactor_Token_T,
-	   "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_TOKEN_TYPE> void
 ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump (void) const
@@ -68,3 +66,5 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void)
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("sleep_hook failed")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Reactor_Token_T.h b/ace/Reactor_Token_T.h
index 8d71bbb420f..9ed4c671d52 100644
--- a/ace/Reactor_Token_T.h
+++ b/ace/Reactor_Token_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,6 +18,7 @@
 #include "ace/Reactor_Impl.h"
 #include "ace/Token.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Reactor_Token_T
@@ -53,10 +54,12 @@ template <class ACE_TOKEN_TYPE>
 class ACE_Reactor_Token_T : public ACE_TOKEN_TYPE
 {
 public:
-  // *** After ACE 5.5.1, change ACE_Token::FIFO to ACE_TOKEN_TYPE::FIFO.
-  // **** This is only like this to work around MSVC 6 problems.
+  /**
+   * @todo After ACE 5.5.1, change ACE_Token::FIFO to ACE_TOKEN_TYPE::FIFO.
+   * This is only like this to work around MSVC 6 problems.
+   */
   ACE_Reactor_Token_T (ACE_Reactor_Impl &r,
-		       int s_queue = ACE_Token::FIFO);
+                       int s_queue = ACE_Token::FIFO);
   ACE_Reactor_Token_T (int s_queue = ACE_Token::FIFO);
   virtual ~ACE_Reactor_Token_T (void);
 
@@ -80,11 +83,7 @@ private:
   ACE_Reactor_Impl *reactor_;
 };
 
-// There's no Reactor_Token_T.inl, but if there was, here's where it would
-// get included.
-#if 0 // defined (__ACE_INLINE__)
-#include "ace/Reactor_Token_T.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Reactor_Token_T.cpp"
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index c6645957729..9401048f148 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -15,6 +15,9 @@
 
 ACE_RCSID(ace, Read_Buffer, "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Read_Buffer::dump (void) const
 {
@@ -169,3 +172,5 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
 
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index f1075c70901..11176ef34df 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -25,6 +25,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_stdio.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Allocator;
 
 /**
@@ -80,7 +82,7 @@ public:
   size_t replaced (void) const;
 
   /// Returns the size of the allocated buffer obtained during a
-  /// <read>, not including the null terminator.
+  /// @c read, not including the null terminator.
   size_t size (void) const;
 
   /// Returns a pointer to its allocator.
@@ -90,6 +92,12 @@ public:
   void dump (void) const;
 
 private:
+
+  // Disallow copying and assignment...
+  void operator= (const ACE_Read_Buffer &);
+  ACE_Read_Buffer (const ACE_Read_Buffer &);
+
+private:
   /// Recursive helper method that does the work...
   char *rec_read (int term, int search, int replace);
 
@@ -109,11 +117,10 @@ private:
   /// Pointer to the allocator.
   ACE_Allocator *allocator_;
 
-  // = Disallow copying and assignment...
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Read_Buffer &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Read_Buffer (const ACE_Read_Buffer &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/Read_Buffer.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Read_Buffer.inl b/ace/Read_Buffer.inl
index 3534c62db2e..1517e9c17e3 100644
--- a/ace/Read_Buffer.inl
+++ b/ace/Read_Buffer.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Accessor to the number of bytes in the buffer.
 
 ACE_INLINE size_t
@@ -26,3 +29,4 @@ ACE_Read_Buffer::alloc (void) const
   return this->allocator_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Recursive_Thread_Mutex.cpp b/ace/Recursive_Thread_Mutex.cpp
index 15a809ed898..ccb59b1064d 100644
--- a/ace/Recursive_Thread_Mutex.cpp
+++ b/ace/Recursive_Thread_Mutex.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file Recursive_Thread_Mutex.cpp
  *
@@ -21,6 +20,8 @@
 
 ACE_RCSID(ace, Recursive_Thread_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex)
 
 ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name,
@@ -91,8 +92,11 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 #elif defined (ACE_HAS_RECURSIVE_MUTEXES)
   // Nothing inside of a CRITICAL_SECTION object should ever be
   // accessed directly.  It is documented to change at any time.
-# if defined (ACE_WIN64)
-  // Things are different on Windows XP 64-bit
+# 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...
@@ -142,4 +146,6 @@ ACE_Recursive_Thread_Mutex::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Recursive_Thread_Mutex.h b/ace/Recursive_Thread_Mutex.h
index 3732ff42334..e5ad28df15c 100644
--- a/ace/Recursive_Thread_Mutex.h
+++ b/ace/Recursive_Thread_Mutex.h
@@ -29,6 +29,8 @@
 
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Recursive_Thread_Mutex
  *
@@ -101,7 +103,7 @@ public:
   int tryacquire_write (void);
 
   /**
-   * This is only here to make the <ACE_Recursive_Thread_Mutex>
+   * This is only here to make the ACE_Recursive_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Assumes the caller has already acquired the mutex using one of
    * the above calls, and returns 0 (success) always.
@@ -158,6 +160,8 @@ private:
   ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Recursive_Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Recursive_Thread_Mutex.inl b/ace/Recursive_Thread_Mutex.inl
index a1d84584315..5046cd01ec4 100644
--- a/ace/Recursive_Thread_Mutex.inl
+++ b/ace/Recursive_Thread_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_recursive_thread_mutex_t &
 ACE_Recursive_Thread_Mutex::mutex (void)
 {
@@ -57,3 +60,6 @@ ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/ace/Recyclable.cpp b/ace/Recyclable.cpp
index 483852486f1..5da42cc8d15 100644
--- a/ace/Recyclable.cpp
+++ b/ace/Recyclable.cpp
@@ -8,6 +8,7 @@
 
 ACE_RCSID(ace, Recyclable, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
   : recycle_state_ (initial_state)
@@ -17,3 +18,5 @@ ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
 ACE_Recyclable::~ACE_Recyclable (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Recyclable.h b/ace/Recyclable.h
index 709c9d45a3f..2c3d088cacd 100644
--- a/ace/Recyclable.h
+++ b/ace/Recyclable.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// States of a recyclable object.
 enum ACE_Recyclable_State
@@ -62,13 +63,17 @@ public:
   void recycle_state (ACE_Recyclable_State new_state);
 
 protected:
-  /// Protected constructor.
+
+  /// Constructor.
   ACE_Recyclable (ACE_Recyclable_State initial_state);
 
+protected:
+
   /// Our state.
   ACE_Recyclable_State recycle_state_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Recyclable.inl"
diff --git a/ace/Recyclable.inl b/ace/Recyclable.inl
index c9a4318b2dc..ef096ff62be 100644
--- a/ace/Recyclable.inl
+++ b/ace/Recyclable.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //$Id$
 
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Recyclable_State
 ACE_Recyclable::recycle_state (void) const
@@ -12,8 +13,8 @@ ACE_Recyclable::recycle_state (void) const
 ACE_INLINE void
 ACE_Recyclable::recycle_state (ACE_Recyclable_State new_state)
 {
-  if (this->recycle_state_ == ACE_RECYCLABLE_CLOSED)
-    return;
-
-  this->recycle_state_ = new_state;
+  if (this->recycle_state_ != ACE_RECYCLABLE_CLOSED)
+    this->recycle_state_ = new_state;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Refcountable.cpp b/ace/Refcountable.cpp
index 0c77633f4d1..902e4362f65 100644
--- a/ace/Refcountable.cpp
+++ b/ace/Refcountable.cpp
@@ -11,7 +11,10 @@ ACE_RCSID (ace,
            Refcountable,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Refcountable::~ACE_Refcountable (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Refcountable.h b/ace/Refcountable.h
index 8f1bc155705..192243bd256 100644
--- a/ace/Refcountable.h
+++ b/ace/Refcountable.h
@@ -20,6 +20,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Refcountable
  *
@@ -45,6 +47,8 @@ protected:
   int refcount_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
 #include "ace/Refcountable.inl"
diff --git a/ace/Refcountable.inl b/ace/Refcountable.inl
index 1d9a03fb66a..993af65d452 100644
--- a/ace/Refcountable.inl
+++ b/ace/Refcountable.inl
@@ -1,5 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 //$Id$
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Refcountable::ACE_Refcountable (int refcount)
   : refcount_ (refcount)
@@ -23,3 +27,5 @@ ACE_Refcountable::refcount (void) const
 {
   return this->refcount_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Refcounted_Auto_Ptr.cpp b/ace/Refcounted_Auto_Ptr.cpp
index 8abc1d7768d..7dd9d862b64 100644
--- a/ace/Refcounted_Auto_Ptr.cpp
+++ b/ace/Refcounted_Auto_Ptr.cpp
@@ -5,10 +5,14 @@
 
 #include "ace/Refcounted_Auto_Ptr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class X, class ACE_LOCK>
 ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr (void)
 {
   AUTO_REFCOUNTED_PTR_REP::detach (rep_);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* !ACE_REFCOUNTED_AUTO_PTR_CPP */
diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h
index adac3dd7cd3..d480c125c68 100644
--- a/ace/Refcounted_Auto_Ptr.h
+++ b/ace/Refcounted_Auto_Ptr.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 template <class X, class ACE_LOCK> class ACE_Refcounted_Auto_Ptr_Rep;
 template <class X, class ACE_LOCK> class ACE_Refcounted_Auto_Ptr;
@@ -188,6 +190,8 @@ private:
   ~ACE_Refcounted_Auto_Ptr_Rep (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include "ace/Refcounted_Auto_Ptr.inl"
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/Refcounted_Auto_Ptr.inl b/ace/Refcounted_Auto_Ptr.inl
index e0dfaa2e63c..3635393ecfa 100644
--- a/ace/Refcounted_Auto_Ptr.inl
+++ b/ace/Refcounted_Auto_Ptr.inl
@@ -5,6 +5,8 @@
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class X, class ACE_LOCK> inline int
 ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count (void) const
 {
@@ -212,3 +214,5 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator = (const ACE_Refcounted_Auto_Ptr<
   AUTO_REFCOUNTED_PTR_REP::assign (this->rep_,
                                    AUTO_REFCOUNTED_PTR_REP::attach (r.rep_));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Registry.cpp b/ace/Registry.cpp
index dcac2651071..94b7641c422 100644
--- a/ace/Registry.cpp
+++ b/ace/Registry.cpp
@@ -25,9 +25,9 @@ ACE_RCSID (ace,
     } while (0)
 
 
-// Separator for components in a name
-/* static */
-const ACE_TCHAR *ACE_Registry::STRING_SEPARATOR = ACE_LIB_TEXT ("\\");
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_TCHAR const ACE_Registry::STRING_SEPARATOR[] = ACE_LIB_TEXT ("\\");
 
 bool
 ACE_Registry::Name_Component::operator== (const Name_Component &rhs) const
@@ -623,7 +623,7 @@ ACE_Registry::make_string (const Name &const_name)
     {
       if (iterator != name.begin ())
         // If this is not the first component, we will add separators
-        string += ACE_Registry::STRING_SEPARATOR;
+        string += STRING_SEPARATOR;
       const Name_Component &component = *iterator;
       // Add to string
       string += component.id_;
@@ -646,7 +646,7 @@ ACE_Registry::make_name (const ACE_TString &string)
     {
       Name_Component component;
       // Find the separator
-      new_position = string.find (ACE_Registry::STRING_SEPARATOR, new_position);
+      new_position = string.find (STRING_SEPARATOR, new_position);
       if (new_position != ACE_TString::npos)
         // If we have not gone past the end
         {
@@ -655,7 +655,7 @@ ACE_Registry::make_name (const ACE_TString &string)
                                          new_position - last_position);
           // Skip past the seperator
           new_position +=
-            ACE_OS::strlen (ACE_Registry::STRING_SEPARATOR);
+            ACE_OS::strlen (STRING_SEPARATOR);
         }
       else
         {
@@ -1134,20 +1134,6 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name)
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<ACE_Registry::Binding>;
-template class ACE_Unbounded_Set<ACE_Registry::Binding>;
-template class ACE_Unbounded_Set_Iterator<ACE_Registry::Binding>;
-template class ACE_Node<ACE_Registry::Name_Component>;
-template class ACE_Unbounded_Set<ACE_Registry::Name_Component>;
-template class ACE_Unbounded_Set_Iterator<ACE_Registry::Name_Component>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<ACE_Registry::Binding>
-#pragma instantiate ACE_Unbounded_Set<ACE_Registry::Binding>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Registry::Binding>
-#pragma instantiate ACE_Node<ACE_Registry::Name_Component>
-#pragma instantiate ACE_Unbounded_Set<ACE_Registry::Name_Component>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Registry::Name_Component>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 */
diff --git a/ace/Registry.h b/ace/Registry.h
index f4c311b0a60..5b06517655b 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 #include "ace/Containers.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Registry
  *
@@ -60,7 +62,7 @@ public:
   typedef ACE_Unbounded_Set<Name_Component> Name;
 
   /// Separator for components in a name
-  static const ACE_TCHAR *STRING_SEPARATOR;
+  static const ACE_TCHAR STRING_SEPARATOR[];
 
   /// Convert a @a name to a @c string
   static ACE_TString make_string (const Name &name);
@@ -351,7 +353,7 @@ public:
     int flush (void);
 
     /// Close the handle of the context
-    /// Note: <close> does not call <flush>
+    /// @note <close> does not call <flush>
     int close (void);
 
     // Accessors
@@ -554,12 +556,7 @@ private:
   static int is_local_host (const ACE_TCHAR *machine_name);
 };
 
-// Fix me!  Shouldn't have to define this stuff
-
-#if defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
-  typedef ACE_Registry::Name_Component Name_Component;
-  typedef ACE_Registry::Binding Binding;
-#endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 */
 #include /**/ "ace/post.h"
diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp
index a2322c29a8a..465da31d34b 100644
--- a/ace/Registry_Name_Space.cpp
+++ b/ace/Registry_Name_Space.cpp
@@ -7,6 +7,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
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Registry_Name_Space::ACE_Registry_Name_Space (void)
 {
 }
@@ -286,5 +288,6 @@ ACE_Registry_Name_Space::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 && UNICODE */
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index 7635b0bafbe..cfd16ddec7e 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -1,4 +1,4 @@
-/*-*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -28,6 +28,8 @@
 #include "ace/Naming_Context.h"
 #include "ace/Name_Space.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Registry_Name_Space
  *
@@ -129,6 +131,10 @@ private:
   ACE_Registry::Naming_Context context_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && UNICODE */
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_REGISTRY_NAME_SPACE_H */
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index 12808ef2e62..2d3f7795e38 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (ace,
            Remote_Name_Space,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_Remote_Name_Space::open (const ACE_TCHAR *servername, u_short port)
 {
@@ -375,8 +377,4 @@ ACE_Remote_Name_Space::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<wchar_t>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<wchar_t>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index 95c0d9c4531..a58ca4e83af 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -25,6 +25,7 @@
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_NS_WString;
 
@@ -139,6 +140,8 @@ private:
   ACE_Name_Proxy ns_proxy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_REMOTE_NAME_SPACE_H */
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index f80fe9a3bf8..fee4bb54869 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -1,4 +1,3 @@
-// Remote_Tokens.cpp
 // $Id$
 
 #include "ace/Remote_Tokens.h"
@@ -23,6 +22,8 @@ ACE_RCSID (ace,
 #define ACE_TSS_CONNECTION_MUTEX ACE_Null_Mutex
 #endif /* ACE_MT_SAFE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Make a typedef to simplify access to the Singleton below.
 typedef ACE_Singleton<ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX> ACE_Token_Connections;
 
@@ -110,8 +111,8 @@ ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void)
 
 int
 ACE_Remote_Token_Proxy::open (const ACE_TCHAR *name,
-			      int ignore_deadlock,
-			      int debug)
+                              int ignore_deadlock,
+                              int debug)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::open");
   ignore_shadow_deadlock_ = ignore_deadlock;
@@ -144,7 +145,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void)
 
 int
 ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
-				       ACE_Synch_Options &)
+                                       ACE_Synch_Options &)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::request_reply");
   void *buffer;
@@ -169,68 +170,68 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
       // Receive reply via blocking read.
 
       if (peer->recv (&reply, sizeof reply) != sizeof reply)
-	ACE_ERROR_RETURN ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("recv failed")), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("recv failed")), -1);
 
       if (reply.decode () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("decode failed")), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("decode failed")), -1);
 
       errno = int (reply.errnum ());
       if (errno != 0)
-	ACE_RETURN (-1);
+        ACE_RETURN (-1);
       else
-	return 0;
+        return 0;
     }
 }
 
 int
 ACE_Remote_Token_Proxy::acquire (int notify,
-				 void (*sleep_hook)(void *),
-				 ACE_Synch_Options &options)
+                                 void (*sleep_hook)(void *),
+                                 ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::acquire");
 
   // First grab the local shadow mutex.
   if (ACE_Token_Proxy::acquire (notify,
-				sleep_hook,
-				ACE_Synch_Options::asynch) == -1)
+                                sleep_hook,
+                                ACE_Synch_Options::asynch) == -1)
     {
       // Acquire failed, deal with it...
       switch (errno)
-	{
-	case EWOULDBLOCK :
-	  // Whoah, we detected wouldblock via the shadow mutex!
-	  if (debug_)
-	    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
-			this->token_->owner_id ()));
-	  // No error, but would block,
-	  break;
-
-	case EDEADLK :
-	  if (debug_)
-	    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) shadow: deadlock detected\n")));
-
-	  if (ignore_shadow_deadlock_)
-	    break;
-	  else
-	    {
-	      errno = EDEADLK;
-	      ACE_RETURN (-1);
-	    }
-
-	default :
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     ACE_LIB_TEXT ("(%t) %p shadow acquire failed\n"),
-			     ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")),
-			    -1);
-	}
+        {
+        case EWOULDBLOCK :
+          // Whoah, we detected wouldblock via the shadow mutex!
+          if (debug_)
+            ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
+                        this->token_->owner_id ()));
+          // No error, but would block,
+          break;
+
+        case EDEADLK :
+          if (debug_)
+            ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) shadow: deadlock detected\n")));
+
+          if (ignore_shadow_deadlock_)
+            break;
+          else
+            {
+              errno = EDEADLK;
+              ACE_RETURN (-1);
+            }
+
+        default :
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_LIB_TEXT ("(%t) %p shadow acquire failed\n"),
+                             ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")),
+                            -1);
+        }
     }
 
   ACE_Token_Request request (token_->type (),
-			     this->type (),
-			     ACE_Token_Request::ACQUIRE,
-			     this->name (),
-			     this->client_id (),
-			     options);
+                             this->type (),
+                             ACE_Token_Request::ACQUIRE,
+                             this->name (),
+                             this->client_id (),
+                             options);
 
   request.notify (notify);
 
@@ -266,51 +267,51 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
   if (ACE_Token_Proxy::tryacquire (sleep_hook) == -1)
     {
       if (debug_)
-	{
+        {
           // Save/restore errno.
           ACE_Errno_Guard error (errno);
-	  ACE_DEBUG ((LM_DEBUG,
+          ACE_DEBUG ((LM_DEBUG,
                       ACE_LIB_TEXT ("shadow try acquire failed\n")));
-	}
+        }
 
       return -1;
     }
 
   ACE_Token_Request request (token_->type (),
-			     this->type (),
-			     ACE_Token_Request::TRY_ACQUIRE,
-			     this->name (),
-			     this->client_id (),
-			     ACE_Synch_Options::synch);
+                             this->type (),
+                             ACE_Token_Request::TRY_ACQUIRE,
+                             this->name (),
+                             this->client_id (),
+                             ACE_Synch_Options::synch);
 
   return this->request_reply (request,
-			      ACE_Synch_Options::synch);
+                              ACE_Synch_Options::synch);
 }
 
 int
 ACE_Remote_Token_Proxy::renew (int requeue_position,
-			       ACE_Synch_Options &options)
+                               ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::renew");
 
   if (ACE_Token_Proxy::renew (requeue_position,
-			      ACE_Synch_Options::asynch) == -1)
+                              ACE_Synch_Options::asynch) == -1)
     {
       // Check for error.
       if (errno != EWOULDBLOCK)
-	return -1;
+        return -1;
       else if (debug_)
-	ACE_DEBUG ((LM_DEBUG,
-		    ACE_LIB_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
-		    this->token_->owner_id ()));
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_LIB_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
+                    this->token_->owner_id ()));
     }
 
   ACE_Token_Request request (token_->type (),
-			     this->type (),
-			     ACE_Token_Request::RENEW,
-			     this->name (),
-			     this->client_id (),
-			     options);
+                             this->type (),
+                             ACE_Token_Request::RENEW,
+                             this->name (),
+                             this->client_id (),
+                             options);
 
   request.requeue_position (requeue_position);
 
@@ -330,7 +331,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
   else
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
       // Make sure that the local shadow reflects our new ownership.
       token_->make_owner (waiter_);
       return result;
@@ -343,11 +344,11 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options)
   ACE_TRACE ("ACE_Remote_Token_Proxy::release");
 
   ACE_Token_Request request (token_->type (),
-			     this->type (),
-			     ACE_Token_Request::RELEASE,
-			     this->name (),
-			     this->client_id (),
-			     options);
+                             this->type (),
+                             ACE_Token_Request::RELEASE,
+                             this->name (),
+                             this->client_id (),
+                             options);
 
   int result = this->request_reply (request, options);
   if (result == 0)
@@ -374,8 +375,8 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired");
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) %s shadow token %s acquired\n"),
-	      this->client_id (),
-	      this->name ()));
+              this->client_id (),
+              this->name ()));
   // ACE_Token_Proxy::token_acquired (vp);
 }
 
@@ -409,8 +410,8 @@ ACE_Remote_Mutex::clone (void) const
   ACE_Token_Proxy *temp;
   ACE_NEW_RETURN (temp,
                   ACE_Remote_Mutex (this->name (),
-			                              ignore_deadlock_,
-			                              debug_),
+                                                      ignore_deadlock_,
+                                                      debug_),
                   0);
   return temp;
 }
@@ -460,8 +461,8 @@ ACE_Remote_RLock::clone (void) const
   ACE_Token_Proxy *temp = 0;
   ACE_NEW_RETURN (temp,
                   ACE_Remote_RLock (this->name (),
-			            ignore_deadlock_,
-			            debug_),
+                                    ignore_deadlock_,
+                                    debug_),
                   0);
   return temp;
 }
@@ -521,12 +522,6 @@ ACE_Remote_WLock::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS <ACE_SOCK_Stream>;
-template class ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS <ACE_SOCK_Stream>
-#pragma instantiate ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index d9310592f7f..ec39d3d26eb 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,6 +13,7 @@
 
 #ifndef ACE_REMOTE_MUTEX_H
 #define ACE_REMOTE_MUTEX_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/INET_Addr.h"
@@ -29,6 +30,8 @@
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Remote_Token_Proxy
  *
@@ -306,6 +309,8 @@ private:
   void operator= (const ACE_TSS_Connection &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #if defined (__ACE_INLINE__)
@@ -313,4 +318,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* ACE_REMOTE_TOKEN_H */
diff --git a/ace/Remote_Tokens.inl b/ace/Remote_Tokens.inl
index 004fe75b7d4..50487075225 100644
--- a/ace/Remote_Tokens.inl
+++ b/ace/Remote_Tokens.inl
@@ -4,6 +4,8 @@
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Remote_Mutex::ACE_Remote_Mutex (void)
 {
@@ -12,8 +14,8 @@ ACE_Remote_Mutex::ACE_Remote_Mutex (void)
 
 ACE_INLINE
 ACE_Remote_Mutex::ACE_Remote_Mutex (const ACE_TCHAR *token_name,
-				    int ignore_deadlock,
-				    int debug)
+                                    int ignore_deadlock,
+                                    int debug)
 {
   ACE_TRACE ("ACE_Remote_Mutex::ACE_Remote_Mutex");
   this->open (token_name, ignore_deadlock, debug);
@@ -23,8 +25,8 @@ ACE_Remote_Mutex::ACE_Remote_Mutex (const ACE_TCHAR *token_name,
 
 ACE_INLINE
 ACE_Remote_RLock::ACE_Remote_RLock (const ACE_TCHAR *token_name,
-				    int ignore_deadlock,
-				    int debug)
+                                    int ignore_deadlock,
+                                    int debug)
 {
   ACE_TRACE ("ACE_Remote_RLock::ACE_Remote_RLock");
   this->open (token_name, ignore_deadlock, debug);
@@ -34,11 +36,13 @@ ACE_Remote_RLock::ACE_Remote_RLock (const ACE_TCHAR *token_name,
 
 ACE_INLINE
 ACE_Remote_WLock::ACE_Remote_WLock (const ACE_TCHAR *token_name,
-				    int ignore_deadlock,
-				    int debug)
+                                    int ignore_deadlock,
+                                    int debug)
 {
   ACE_TRACE ("ACE_Remote_WLock::ACE_Remote_WLock");
   this->open (token_name, ignore_deadlock, debug);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Reverse_Lock_T.cpp b/ace/Reverse_Lock_T.cpp
index 0dc093cf7a5..348c81da62a 100644
--- a/ace/Reverse_Lock_T.cpp
+++ b/ace/Reverse_Lock_T.cpp
@@ -13,6 +13,7 @@
 #include "ace/Reverse_Lock_T.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCKING_MECHANISM>
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
@@ -87,4 +88,6 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void)
   ACE_NOTSUP_RETURN (-1);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_REVERSE_LOCK_T_CPP */
diff --git a/ace/Reverse_Lock_T.h b/ace/Reverse_Lock_T.h
index 29f23b08c08..5bd1d3a6b8f 100644
--- a/ace/Reverse_Lock_T.h
+++ b/ace/Reverse_Lock_T.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
- * @class ACE_Acquire_Method
+ * @namespace ACE_Acquire_Method
  *
- * @brief An enum class.
+ * @brief An enum namespace.
  *
  * These enums should have been inside the reverse lock class, but
  * some lame compilers cannot handle enums inside template classes.
@@ -38,16 +40,19 @@
  * represented here because we have to make sure that the release()
  * method on the reverse lock acquires a lock on the real lock.
  **/
-class ACE_Acquire_Method
+namespace ACE_Acquire_Method
 {
-public:
   enum METHOD_TYPE
   {
     ACE_REGULAR,
     ACE_READ,
     ACE_WRITE
   };
-};
+}
+
+#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
+  using namespace ACE_Acquire_Method;
+#endif
 
 /**
  * @class ACE_Reverse_Lock
@@ -77,8 +82,14 @@ public:
   // = Initialization/Finalization methods.
 
   /// Constructor. All locking requests will be forwarded to <lock>.
+#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
+  // Make LynxOS 3.x buggy compiler happy
+  ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock,
+                    METHOD_TYPE acquire_method = ACE_REGULAR);
+#else
   ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock,
                     ACE_Acquire_Method::METHOD_TYPE acquire_method = ACE_Acquire_Method::ACE_REGULAR);
+#endif
 
   /// Destructor. If <lock_> was not passed in by the user, it will be
   /// deleted.
@@ -120,6 +131,8 @@ private:
   ACE_Acquire_Method::METHOD_TYPE acquire_method_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Reverse_Lock_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Reverse_Lock_T.inl b/ace/Reverse_Lock_T.inl
index 84533466663..0f8598ffd23 100644
--- a/ace/Reverse_Lock_T.inl
+++ b/ace/Reverse_Lock_T.inl
@@ -5,6 +5,8 @@
 #include "ace/config-all.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE
 ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (
   ACE_LOCKING_MECHANISM &lock,
@@ -13,3 +15,5 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (
     acquire_method_ (acquire_method)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 64bb4bc0210..f6618cdada4 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -1,4 +1,3 @@
-// SOCK.cpp
 // $Id$
 
 #include "ace/SOCK.h"
@@ -10,6 +9,8 @@
 
 ACE_RCSID(ace, SOCK, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK)
 
 void
@@ -180,3 +181,5 @@ ACE_SOCK::ACE_SOCK (int type,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK.h b/ace/SOCK.h
index d9bfd0c5eec..8348d0f35d8 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -24,6 +24,8 @@
 #include "ace/IPC_SAP.h"
 #include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK
  *
@@ -39,8 +41,6 @@
 class ACE_Export ACE_SOCK : public ACE_IPC_SAP
 {
 public:
-  /// Default ctor/dtor.
-  ~ACE_SOCK (void);
 
   /// Wrapper around the <setsockopt> system call.
   int set_option (int level,
@@ -96,6 +96,7 @@ public:
             int reuse_addr);
 
 protected:
+
   /// Constructor with arguments to call the BSD-style <socket> system
   /// call (no QoS).
   ACE_SOCK (int type,
@@ -117,8 +118,18 @@ protected:
   /// from being defined.
   ACE_SOCK (void);
 
+  /// Protected destructor.
+  /**
+   * Not a virtual destructor.  Protected destructor to prevent
+   * operator delete() from being called through a base class ACE_SOCK
+   * pointer/reference.
+   */
+  ~ACE_SOCK (void);
+
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK.inl b/ace/SOCK.inl
index f35fda782d1..c57fa36dfec 100644
--- a/ace/SOCK.inl
+++ b/ace/SOCK.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SOCK.i
-
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK::~ACE_SOCK (void)
 {
@@ -13,24 +14,26 @@ ACE_SOCK::~ACE_SOCK (void)
 
 ACE_INLINE int
 ACE_SOCK::set_option (int level,
-		      int option,
-		      void *optval,
-		      int optlen) const
+                      int option,
+                      void *optval,
+                      int optlen) const
 {
   ACE_TRACE ("ACE_SOCK::set_option");
   return ACE_OS::setsockopt (this->get_handle (), level,
-			     option, (char *) optval, optlen);
+                             option, (char *) optval, optlen);
 }
 
 // Provides access to the ACE_OS::getsockopt system call.
 
 ACE_INLINE int
 ACE_SOCK::get_option (int level,
-		      int option,
-		      void *optval,
-		      int *optlen) const
+                      int option,
+                      void *optval,
+                      int *optlen) const
 {
   ACE_TRACE ("ACE_SOCK::get_option");
   return ACE_OS::getsockopt (this->get_handle (), level,
-			     option, (char *) optval, optlen);
+                             option, (char *) optval, optlen);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index ffb187b5e17..9a103d3f662 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -1,9 +1,9 @@
-// SOCK_Acceptor.cpp
 // $Id$
 
 #include "ace/SOCK_Acceptor.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/OS_Errno.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_fcntl.h"
@@ -18,6 +18,8 @@
 
 ACE_RCSID(ace, SOCK_Acceptor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor)
 
 // Do nothing routine for constructor.
@@ -285,6 +287,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
       || ACE_OS::listen (this->get_handle (),
                          backlog) == -1)
     {
+      ACE_Errno_Guard g (errno);    // Preserve across close() below.
       error = 1;
       this->close ();
     }
@@ -401,3 +404,5 @@ ACE_SOCK_Acceptor::close (void)
 {
   return ACE_SOCK::close ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index bad9010bfcc..4341698c7c9 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 class ACE_Accept_QoS_Params;
 
@@ -166,6 +168,8 @@ private:
   int get_remote_addr (ACE_Addr &) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Acceptor.inl b/ace/SOCK_Acceptor.inl
index db6fa00f4ba..a4456ed3ab6 100644
--- a/ace/SOCK_Acceptor.inl
+++ b/ace/SOCK_Acceptor.inl
@@ -1,10 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor");
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp
index 766819b1eb1..8bacd9d1220 100644
--- a/ace/SOCK_CODgram.cpp
+++ b/ace/SOCK_CODgram.cpp
@@ -1,4 +1,3 @@
-// SOCK_CODgram.cpp
 // $Id$
 
 #include "ace/SOCK_CODgram.h"
@@ -11,6 +10,8 @@
 
 ACE_RCSID(ace, SOCK_CODgram, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram)
 
 void
@@ -24,12 +25,12 @@ ACE_SOCK_CODgram::dump (void) const
 // Here's the general-purpose constructor.
 
 ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, const ACE_Addr &local,
-				    int protocol_family, int protocol,
-				    int reuse_addr)
+                                    int protocol_family, int protocol,
+                                    int reuse_addr)
 {
   ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram");
   if (this->open (remote, local,
-		  protocol_family, protocol, reuse_addr) == -1)
+                  protocol_family, protocol, reuse_addr) == -1)
     ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SOCK_CODgram")));
 }
 
@@ -39,71 +40,73 @@ ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, const ACE_Addr &loca
 
    1. remote == ACE_Addr::sap_any && local == ACE_Addr::sap_any
          if protocol_family == PF_INET then
-	     bind the local address to a randomly generated port number...
+             bind the local address to a randomly generated port number...
 
    2. remote == ACE_Addr::sap_any && local != ACE_Addr::sap_any
          we are just binding the local address
-	 (used primarily by servers)
+         (used primarily by servers)
 
    3. remote != ACE_Addr::sap_any && local == ACE_Addr::sap_any
          we are connecting to the remote address
-	 (used primarily by clients)
+         (used primarily by clients)
 
    4. remote != ACE_Addr::sap_any && local != ACE_Addr::sap_any
          we are binding to the local address
-	 and connecting to the remote address
+         and connecting to the remote address
 */
 
 int
 ACE_SOCK_CODgram::open (const ACE_Addr &remote, const ACE_Addr &local,
-			int protocol_family, int protocol,
-			int reuse_addr)
+                        int protocol_family, int protocol,
+                        int reuse_addr)
 {
   ACE_TRACE ("ACE_SOCK_CODgram::open");
   if (ACE_SOCK::open (SOCK_DGRAM, protocol_family,
-		      protocol, reuse_addr) == -1)
+                      protocol, reuse_addr) == -1)
     return -1;
   else
     {
       int error = 0;
 
       if (local == ACE_Addr::sap_any && remote == ACE_Addr::sap_any)
-	{
-	  // Assign an arbitrary port number from the transient range!!
+        {
+          // Assign an arbitrary port number from the transient range!!
 
-	  if (protocol_family == PF_INET
-	      && ACE::bind_port (this->get_handle ()) == -1)
-	    error = 1;
-	}
+          if (protocol_family == PF_INET
+              && ACE::bind_port (this->get_handle ()) == -1)
+            error = 1;
+        }
       // We are binding just the local address.
       else if (local != ACE_Addr::sap_any && remote == ACE_Addr::sap_any)
-	{
-	  if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (),
-		      local.get_size ()) == -1)
-	    error = 1;
-	}
+        {
+          if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (),
+                      local.get_size ()) == -1)
+            error = 1;
+        }
       // We are connecting to the remote address.
       else if (local == ACE_Addr::sap_any && remote != ACE_Addr::sap_any)
-	{
-	  if (ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (),
-			 remote.get_size ()) == -1)
-	    error = 1;
-	}
+        {
+          if (ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (),
+                         remote.get_size ()) == -1)
+            error = 1;
+        }
       // We are binding to the local address and connecting to the
       // remote addresses.
       else
-	{
-	  if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (),
-		      local.get_size ()) == -1
-	      || ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (),
-			    remote.get_size ()) == -1)
-	    error = 1;
-	}
+        {
+          if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (),
+                      local.get_size ()) == -1
+              || ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (),
+                            remote.get_size ()) == -1)
+            error = 1;
+        }
       if (error)
-	{
-	  this->close ();
-	  this->set_handle (ACE_INVALID_HANDLE);
-	}
+        {
+          this->close ();
+          this->set_handle (ACE_INVALID_HANDLE);
+        }
       return error ? -1 : 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 7381b33f8f4..007f7352c97 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,13 +15,7 @@
 #define ACE_SOCK_CODGRAM_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
-
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,13 +25,15 @@
 #include "ace/Addr.h"
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK_CODgram
  *
  * @brief Defines the member functions for the ACE_SOCK connected
  * datagram abstraction.
  */
-class ACE_Sockets_Export ACE_SOCK_CODgram : public ACE_SOCK_IO
+class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO
 {
 public:
   // = Initialization methods.
@@ -72,6 +68,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_CODgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_CODgram.inl b/ace/SOCK_CODgram.inl
index a921bb5df5a..de7b0570973 100644
--- a/ace/SOCK_CODgram.inl
+++ b/ace/SOCK_CODgram.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SOCK_CODgram.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SOCK_CODgram::ACE_SOCK_CODgram (void)
@@ -15,4 +16,4 @@ ACE_SOCK_CODgram::~ACE_SOCK_CODgram (void)
   ACE_TRACE ("ACE_SOCK_CODgram::~ACE_SOCK_CODgram");
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 86c09b92f1d..dbbe3cb539c 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -1,4 +1,3 @@
-// SOCK_Connector.cpp
 // $Id$
 
 #include "ace/SOCK_Connector.h"
@@ -18,6 +17,8 @@
 
 ACE_RCSID(ace, SOCK_Connector, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector)
 
 void
@@ -325,3 +326,5 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                 ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
 #endif  // ACE_HAS_WINCE
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index c3395fd3c82..a829634f6fc 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_QoS_Params;
 class ACE_Time_Value;
 
@@ -317,6 +319,8 @@ protected:
                              int result);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Connector.inl b/ace/SOCK_Connector.inl
index 423ffcd942e..bdbf5cd19f6 100644
--- a/ace/SOCK_Connector.inl
+++ b/ace/SOCK_Connector.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SOCK_Connector.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This constructor is used by a client when it wants to connect to
 // the specified REMOTE_SAP address using a blocking open.
@@ -33,3 +34,5 @@ ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle)
   return 0;
 #endif /* ACE_WIN32 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 64c4bd35b27..89bbadc7201 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -28,6 +28,8 @@ ACE_RCSID (ace,
 #define IMR_MULTIADDR imr_multiaddr
 #endif /* ! defined (IMR_MULTIADDR) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram)
 
 void
@@ -84,10 +86,11 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
 
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int addr_len = addr.get_size ();
-  u_long inlen;
+  int inlen;
 
   if (ACE_OS::ioctl (this->get_handle (),
-                     FIONREAD, (u_long *) &inlen) == -1)
+                     FIONREAD, 
+		     &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
@@ -735,3 +738,5 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
   return 0;
 }
 #endif /* __linux__ && ACE_HAS_IPV6 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index f07b77c85bb..c78b731db40 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 
 #include "ace/Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -227,6 +229,8 @@ private:
   int  get_remote_addr (ACE_Addr &) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Dgram.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Dgram.inl b/ace/SOCK_Dgram.inl
index 8e7cd56aa69..55343b13668 100644
--- a/ace/SOCK_Dgram.inl
+++ b/ace/SOCK_Dgram.inl
@@ -1,10 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // SOCK_Dgram.i
 
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Here's the simple-minded constructor.
 
 ACE_INLINE
@@ -23,18 +26,18 @@ ACE_SOCK_Dgram::~ACE_SOCK_Dgram (void)
 
 ACE_INLINE ssize_t
 ACE_SOCK_Dgram::send (const void *buf,
-		      size_t n,
-		      const ACE_Addr &addr,
-		      int flags) const
+                      size_t n,
+                      const ACE_Addr &addr,
+                      int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram::send");
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int len = addr.get_size ();
   return ACE_OS::sendto (this->get_handle (),
-			 (const char *) buf,
+                         (const char *) buf,
                          n,
                          flags,
-			 (struct sockaddr *) saddr,
+                         (struct sockaddr *) saddr,
                          len);
 }
 
@@ -42,19 +45,19 @@ ACE_SOCK_Dgram::send (const void *buf,
 
 ACE_INLINE ssize_t
 ACE_SOCK_Dgram::recv (void *buf,
-		      size_t n,
-		      ACE_Addr &addr,
-		      int flags) const
+                      size_t n,
+                      ACE_Addr &addr,
+                      int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram::recv");
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int addr_len = addr.get_size ();
 
   ssize_t status = ACE_OS::recvfrom (this->get_handle (),
-				     (char *) buf,
+                                     (char *) buf,
                                      n,
                                      flags,
-				     (sockaddr *) saddr,
+                                     (sockaddr *) saddr,
                                      &addr_len);
   addr.set_size (addr_len);
   addr.set_type (reinterpret_cast<sockaddr_in *> (saddr)->sin_family);
@@ -78,7 +81,7 @@ ACE_SOCK_Dgram::send (const iovec buffers[],
                          buffer_count,
                          number_of_bytes_sent,
                          flags,
-			 (const sockaddr *) saddr,
+                         (const sockaddr *) saddr,
                          len,
                          overlapped,
                          func);
@@ -98,11 +101,11 @@ ACE_SOCK_Dgram::recv (iovec buffers[],
   int addr_len = addr.get_size ();
 
   ssize_t status = ACE_OS::recvfrom (this->get_handle (),
-				     buffers,
+                                     buffers,
                                      buffer_count,
                                      number_of_bytes_recvd,
                                      flags,
-				     (sockaddr *) saddr,
+                                     (sockaddr *) saddr,
                                      &addr_len,
                                      overlapped,
                                      func);
@@ -115,9 +118,9 @@ ACE_SOCK_Dgram::recv (iovec buffers[],
 
 ACE_INLINE ssize_t
 ACE_SOCK_Dgram::send (const void *buf,
-		      size_t n,
-		      const ACE_Addr &addr,
-		      int flags,
+                      size_t n,
+                      const ACE_Addr &addr,
+                      int flags,
                       ACE_OVERLAPPED *overlapped,
                       ACE_OVERLAPPED_COMPLETION_FUNC func) const
 {
@@ -140,9 +143,9 @@ ACE_SOCK_Dgram::send (const void *buf,
 
 ACE_INLINE ssize_t
 ACE_SOCK_Dgram::recv (void *buf,
-		      size_t n,
-		      ACE_Addr &addr,
-		      int flags,
+                      size_t n,
+                      ACE_Addr &addr,
+                      int flags,
                       ACE_OVERLAPPED *overlapped,
                       ACE_OVERLAPPED_COMPLETION_FUNC func) const
 {
@@ -160,3 +163,5 @@ ACE_SOCK_Dgram::recv (void *buf,
                      overlapped,
                      func);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 8dbac334cc5..ff8d9f1fd69 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -15,6 +15,8 @@
 
 ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast)
 
 ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
@@ -172,7 +174,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
      There are addresses longer than sizeof (struct sockaddr) eg. IPv6
      or QNX::links. In this case address does not fit into struct ifreq.
      The code below could be applied everywhere, but not every system
-	 provides sockaddr.sa_len field.
+         provides sockaddr.sa_len field.
    */
   for (int nbytes = ifc.ifc_len; nbytes >= (int) sizeof (struct ifreq) &&
         ((ifr->ifr_addr.sa_len > sizeof (struct sockaddr)) ?
@@ -225,8 +227,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                          (char *) &flags) == -1)
         {
           ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-						 "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)",
-						 flags.ifr_name));
+                                                 "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)",
+                                                 flags.ifr_name));
           continue;
         }
 
@@ -234,8 +236,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                            IFF_UP) == 0)
         {
           ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-						 "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up",
-						 flags.ifr_name));
+                                                 "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up",
+                                                 flags.ifr_name));
           continue;
         }
 
@@ -250,8 +252,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
             ACE_ERROR ((LM_ERROR, "%p [%s]\n",
-						   "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)",
-						   flags.ifr_name));
+                                                   "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)",
+                                                   flags.ifr_name));
           else
             {
               ACE_INET_Addr addr (reinterpret_cast <sockaddr_in *>
@@ -374,3 +376,5 @@ ACE_SOCK_Dgram_Bcast::send (const iovec iov[],
   return ACE_SOCK_Dgram::send (iov, n, addr, flags);
 }
 #endif /* ACE_HAS_MSG */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index c9a7662ffb7..de0c80cb9e9 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -15,12 +15,7 @@
 #define ACE_SOCK_DGRAM_BCAST_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,12 +24,14 @@
 #include "ace/SOCK_Dgram.h"
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Bcast_Node
  *
  * @brief Linked list of broadcast interfaces.
  */
-class ACE_Sockets_Export ACE_Bcast_Node
+class ACE_Export ACE_Bcast_Node
 {
 public:
   /// Default constructor.
@@ -57,7 +54,7 @@ public:
  * @brief Defines the member functions for the ACE_SOCK datagram
  * abstraction.
  */
-class ACE_Sockets_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram
+class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram
 {
 public:
   // = Initialization and termination methods.
@@ -133,6 +130,8 @@ private:
   int get_remote_addr (ACE_Addr &) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Dgram_Bcast.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Dgram_Bcast.inl b/ace/SOCK_Dgram_Bcast.inl
index 85c3312ef9d..00bb342be5e 100644
--- a/ace/SOCK_Dgram_Bcast.inl
+++ b/ace/SOCK_Dgram_Bcast.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Bcast_Node::~ACE_Bcast_Node (void)
 {
@@ -19,16 +22,16 @@ ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast (void)
 
 ACE_INLINE ssize_t
 ACE_SOCK_Dgram_Bcast::send (const void *buf,
-			    size_t n,
-			    const ACE_Addr &addr,
-			    int flags) const
+                            size_t n,
+                            const ACE_Addr &addr,
+                            int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send");
 
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int len = addr.get_size ();
   return ACE_OS::sendto (this->get_handle (), (const char *) buf, n, flags,
-			 (struct sockaddr *) saddr, len);
+                         (struct sockaddr *) saddr, len);
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index b11c5fd0ac7..2e5daad30a7 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -32,6 +32,8 @@ ACE_RCSID (ace,
 #define IMR_MULTIADDR imr_multiaddr
 #endif /* ! defined (IMR_MULTIADDR) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Helper (inline) functions.
 class ACE_SDM_helpers
 {
@@ -47,9 +49,8 @@ public:
         ACE_OS::strcpy (ret_string, ACE_LIB_TEXT ("<?>"));
       else
         {
-          ACE_TCHAR *pc;
-          if (clip_portnum
-              && (pc = ACE_OS::strrchr (ret_string, ACE_LIB_TEXT (':'))))
+          ACE_TCHAR *pc = ACE_OS::strrchr (ret_string, ACE_LIB_TEXT (':'));
+          if (clip_portnum && pc)
             *pc = ACE_LIB_TEXT ('\0'); // clip port# info.
         }
     }
@@ -984,3 +985,5 @@ ACE_SOCK_Dgram_Mcast::clear_subs_list (void)
 #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index bfd47c52f36..1c4437a9226 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -19,12 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -42,6 +37,8 @@
 # endif /* ACE_SDM_LOCK */
 #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK_Dgram_Mcast
  *
@@ -94,7 +91,7 @@
  *   alphanumeric form and <subscribe> will convert them into numbers via
  *   <ACE_OS::atoi>.
  */
-class ACE_Sockets_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram
+class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram
 {
 public:
 
@@ -103,7 +100,7 @@ public:
    *
    * These control per-instance optional functionality.  They are set via
    * optional constructor arguments.
-   * Note: Certain option values are not valid for all environments (see
+   * @note Certain option values are not valid for all environments (see
    * comments in source file for environment-specific restrictions).  Default
    * values are always valid values for the compilation environment.
    */
@@ -410,6 +407,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Dgram_Mcast.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Dgram_Mcast.inl b/ace/SOCK_Dgram_Mcast.inl
index 3244f21b078..bf3574cfd54 100644
--- a/ace/SOCK_Dgram_Mcast.inl
+++ b/ace/SOCK_Dgram_Mcast.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_SOCK_Dgram_Mcast::set_option (int option,
                                   char optval)
@@ -45,3 +48,5 @@ ACE_SOCK_Dgram_Mcast::send (const iovec iov[],
                                      this->send_addr_,
                                      flags);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index 844a70ef877..b3a1d5de90b 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -1,4 +1,3 @@
-// SOCK_IO.cpp
 // $Id$
 
 #include "ace/SOCK_IO.h"
@@ -7,6 +6,7 @@
 #include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_Memory.h"
+#include "ace/Truncate.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SOCK_IO.inl"
@@ -14,6 +14,8 @@
 
 ACE_RCSID(ace, SOCK_IO, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO)
 
 void
@@ -67,20 +69,26 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
       break;
     }
 
-  u_long inlen;
+  int inlen = 0;
 
   if (ACE_OS::ioctl (this->get_handle (),
                      FIONREAD,
-                     (u_long *) &inlen) == -1)
+                     &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
       ACE_NEW_RETURN (io_vec->iov_base,
                       char[inlen],
                       -1);
-      io_vec->iov_len = this->recv (io_vec->iov_base,
-                                    inlen);
-      return io_vec->iov_len;
+      // It's ok to blindly cast this value since 'inlen' is an int and, thus,
+      // we can't get more than that back. Besides, if the recv() fails, we
+      // don't want that value cast to unsigned and returned.
+      ssize_t recv_len = this->recv (io_vec->iov_base, inlen);
+      if (recv_len > 0)
+	// u_long is the Windows type; size_t is everyone else's. A u_long
+	// should go into a size_t anywhere without an issue.
+	io_vec->iov_len = static_cast<u_long> (recv_len);
+      return recv_len;
     }
   else
     return 0;
@@ -102,8 +110,8 @@ ACE_SOCK_IO::send (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::send");
 
   va_list argp;
-  int total_tuples = static_cast<int> (n) / 2;
-  iovec *iovp;
+  int total_tuples = ACE_Utils::Truncate<size_t> (n / 2);
+  iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
@@ -142,7 +150,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::recv");
 
   va_list argp;
-  int total_tuples = static_cast<int> (n / 2);
+  int total_tuples = ACE_Utils::Truncate<size_t> (n / 2);
   iovec *iovp;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -169,3 +177,5 @@ ACE_SOCK_IO::recv (size_t n, ...) const
   va_end (argp);
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 650095ebf39..746a414f6a2 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -23,6 +23,8 @@
 
 #include "ace/ACE.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK_IO
  *
@@ -68,6 +70,12 @@ public:
                 const ACE_Time_Value *timeout = 0) const;
 
   /// Recv an <iovec> of size <n> from the connected socket.
+  /**
+   * @note The value of @a n will be silently reduced to the maximum
+   * value an @c int can hold if needed. This is due to the underlying
+   * system calls on many OSes limiting the number of @c iovec structures
+   * that can be passed in one call.
+   */
   ssize_t recvv (iovec iov[],
                  size_t n,
                  const ACE_Time_Value *timeout = 0) const;
@@ -113,6 +121,12 @@ public:
                 const ACE_Time_Value *timeout = 0) const;
 
   /// Send an <iovec> of size <n> to the connected socket.
+  /**
+   * @note The value of @a n will be silently reduced to the maximum
+   * value an @c int can hold if needed. This is due to the underlying
+   * system calls on many OSes limiting the number of @c iovec structures
+   * that can be passed in one call.
+   */
   ssize_t sendv (const iovec iov[],
                  size_t n,
                  const ACE_Time_Value *timeout = 0) const;
@@ -138,6 +152,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_IO.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_IO.inl b/ace/SOCK_IO.inl
index 96950c2cd99..f1aec4af3b8 100644
--- a/ace/SOCK_IO.inl
+++ b/ace/SOCK_IO.inl
@@ -1,7 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_unistd.h"
+#include "ace/Truncate.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Send an n byte message to the connected socket.
 
@@ -51,7 +55,7 @@ ACE_SOCK_IO::recvv (iovec iov[],
   ACE_TRACE ("ACE_SOCK_IO::recvv");
   return ACE::recvv (this->get_handle (),
                      iov,
-                     n,
+                     ACE_Utils::Truncate<size_t> (n),
                      timeout);
 }
 
@@ -62,7 +66,7 @@ ACE_SOCK_IO::recv (iovec iov[],
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
   return this->recvv (iov,
-                      static_cast<int> (n),
+                      n,
                       timeout);
 }
 
@@ -121,7 +125,7 @@ ACE_SOCK_IO::sendv (const iovec iov[],
   ACE_TRACE ("ACE_SOCK_IO::sendv");
   return ACE::sendv (this->get_handle (),
                      iov,
-                     n,
+                     ACE_Utils::Truncate<size_t> (n),
                      timeout);
 }
 
@@ -143,7 +147,9 @@ ACE_SOCK_IO::send (const void *buf,
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
   return ACE_OS::write (this->get_handle (),
-                        (const char *) buf,
+                        buf,
                         n,
                         overlapped);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index 7ec5fadbbde..69d832c41d0 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -15,6 +15,8 @@
 
 ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor)
 
 // Do nothing routine for constructor.
@@ -591,3 +593,4 @@ ACE_SOCK_SEQPACK_Acceptor::close (void)
   return ACE_SOCK::close ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h
index ae04541b404..10d626e03d8 100644
--- a/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ace/SOCK_SEQPACK_Acceptor.h
@@ -18,20 +18,16 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
-
-#include "ace/SOCK_SEQPACK_Association.h"
-#include "ace/Multihomed_INET_Addr.h"
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SOCK_SEQPACK_Association.h"
+#include "ace/Multihomed_INET_Addr.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Time_Value;
 
@@ -46,7 +42,7 @@ class ACE_Time_Value;
  * Therefore, by inheriting from <ACE_SOCK>, <ACE_SOCK_SEQPACK_Acceptor>
  * gets its very own socket.
  */
-class ACE_Sockets_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK
+class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK
 {
 public:
   // = Initialization and termination methods.
@@ -183,6 +179,8 @@ private:
   int get_remote_addr (ACE_Addr &) const;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_SEQPACK_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_SEQPACK_Acceptor.inl b/ace/SOCK_SEQPACK_Acceptor.inl
index 39c1700b53c..0a0b591d75f 100644
--- a/ace/SOCK_SEQPACK_Acceptor.inl
+++ b/ace/SOCK_SEQPACK_Acceptor.inl
@@ -1,10 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor");
 }
 
-
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index 45eed58d1a4..9a17e0ddb33 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -13,6 +13,8 @@
 
 ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association)
 
 void
@@ -334,10 +336,4 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Array_Ptr<sockaddr_in>;
-template class ACE_Auto_Basic_Array_Ptr<sockaddr_in>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Array_Ptr<sockaddr_in>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<sockaddr_in>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h
index c2b25065827..600744bdb5b 100644
--- a/ace/SOCK_SEQPACK_Association.h
+++ b/ace/SOCK_SEQPACK_Association.h
@@ -20,21 +20,17 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
-
-#include "ace/SOCK_IO.h"
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SOCK_IO.h"
 #include "ace/Multihomed_INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Message_Block;
 
@@ -79,14 +75,14 @@ class ACE_Message_Block;
  * will result in <send> getting called on Win32 platforms, and
  * <write> getting called on non-Win32 platforms.
  */
-class ACE_Sockets_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO
+class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO
 {
 public:
   // Initialization and termination methods.
   /// Constructor.
   ACE_SOCK_SEQPACK_Association (void);
 
-  /// Constructor (sets the underlying <ACE_HANDLE> with <h>).
+  /// Constructor (sets the underlying ACE_HANDLE with <h>).
   ACE_SOCK_SEQPACK_Association (ACE_HANDLE h);
 
   /// Destructor.
@@ -195,6 +191,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_SEQPACK_Association.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_SEQPACK_Association.inl b/ace/SOCK_SEQPACK_Association.inl
index 3c33c96968e..a156a946257 100644
--- a/ace/SOCK_SEQPACK_Association.inl
+++ b/ace/SOCK_SEQPACK_Association.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (void)
 {
@@ -170,3 +173,5 @@ ACE_SOCK_SEQPACK_Association::recv_urg (void *ptr,
                     MSG_OOB,
                     timeout);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp
index b7cb5471755..128beb23f22 100644
--- a/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ace/SOCK_SEQPACK_Connector.cpp
@@ -20,6 +20,8 @@
 
 ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector)
 
 void
@@ -166,14 +168,14 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
         // get sockaddr_in for the local handle
         if (ACE_OS::getsockname(new_association.get_handle (),
                                 reinterpret_cast<sockaddr *> (&portst),
-		                                     &sn))
+                                                     &sn))
         {
           ACE_Errno_Guard error (errno);
-	  new_association.close ();
+          new_association.close ();
           return -1;
         }
 
-	// set the local port # assigned by the os to every secondary addr
+        // set the local port # assigned by the os to every secondary addr
         for (size_t i = 1; i < num_addresses; i++)
         {
           local_inet_addrs[i].sin_port = portst.sin_port;
@@ -198,7 +200,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
           return -1;
         }
 
-      	delete [] local_sockaddr;
+        delete [] local_sockaddr;
       }
 #else
 
@@ -437,3 +439,5 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h
index 3c913d3ff82..7a567c47ec0 100644
--- a/ace/SOCK_SEQPACK_Connector.h
+++ b/ace/SOCK_SEQPACK_Connector.h
@@ -9,7 +9,7 @@
  *  @author  Patrick J. Lardieri <plardier@atl.lmco.com>
  *  @author  Gaurav Naik, Lockheed Martin ATL
  *  @author  based on SOCK_STREAM_Connector
- *            by Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ *            by Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
  *
  */
 //=============================================================================
@@ -19,12 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/Multihomed_INET_Addr.h"
@@ -33,6 +28,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Time_Value;
 
@@ -51,7 +48,7 @@ class ACE_Time_Value;
  * this is that @c ACE_SOCK_SEQPACK_Connector objects do not store state so
  * they can be used reentrantly in multithreaded programs.
  */
-class ACE_Sockets_Export ACE_SOCK_SEQPACK_Connector
+class ACE_Export ACE_SOCK_SEQPACK_Connector
 {
 public:
   // = Initialization and termination methods.
@@ -323,6 +320,8 @@ protected:
                              int result);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_SEQPACK_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_SEQPACK_Connector.inl b/ace/SOCK_SEQPACK_Connector.inl
index 6450abb6ce9..a89c41f4069 100644
--- a/ace/SOCK_SEQPACK_Connector.inl
+++ b/ace/SOCK_SEQPACK_Connector.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This constructor is used by a client when it wants to connect to
 // the specified REMOTE_SAP address using a blocking open.
 
@@ -31,3 +34,5 @@ ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle)
   return 0;
 #endif /* ACE_WIN32 */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp
index ea794662356..2254f553413 100644
--- a/ace/SOCK_Stream.cpp
+++ b/ace/SOCK_Stream.cpp
@@ -1,4 +1,3 @@
-// SOCK_Stream.cpp
 // $Id$
 
 #include "ace/SOCK_Stream.h"
@@ -9,6 +8,8 @@
 
 ACE_RCSID(ace, SOCK_Stream, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Stream)
 
 void
@@ -26,3 +27,4 @@ ACE_SOCK_Stream::close (void)
   return ACE_SOCK::close ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 5cf0fadb8e8..92000947271 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 
 #include "ace/INET_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Message_Block;
 
@@ -159,6 +161,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SOCK_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SOCK_Stream.inl b/ace/SOCK_Stream.inl
index 5ba88bc55c5..ed5e8b231b8 100644
--- a/ace/SOCK_Stream.inl
+++ b/ace/SOCK_Stream.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/SOCK_Stream.h"
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_Stream::ACE_SOCK_Stream (void)
 {
@@ -170,3 +173,5 @@ ACE_SOCK_Stream::recv_urg (void *ptr,
                     MSG_OOB,
                     timeout);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp
index f69c8b63b33..b6b1300b26d 100644
--- a/ace/SPIPE.cpp
+++ b/ace/SPIPE.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(ace, SPIPE, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE)
 
 // This is the do-nothing constructor.
@@ -76,3 +78,5 @@ ACE_SPIPE::set_duplex_handle (ACE_HANDLE handle)
   this->duplex_pipe_handle_ = handle;
 }
 #endif /* ACE_HAS_STREAM_PIPES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index 61278aac517..99bc370b84d 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -23,6 +23,8 @@
 
 #include "ace/SPIPE_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SPIPE
  *
@@ -104,6 +106,8 @@ protected:
   ACE_SPIPE_Addr local_addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SPIPE.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SPIPE.inl b/ace/SPIPE.inl
index 2912e4d7493..45814117a51 100644
--- a/ace/SPIPE.inl
+++ b/ace/SPIPE.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_SPIPE::disable (int signum) const
 {
@@ -12,3 +15,4 @@ ACE_SPIPE::disable (int signum) const
 #endif /* ACE_WIN32 */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index 84e3d517b2c..a9303f0897d 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -1,4 +1,3 @@
-// SPIPE_Acceptor.cpp
 // $Id$
 
 #include "ace/SPIPE_Acceptor.h"
@@ -12,6 +11,8 @@
 
 ACE_RCSID(ace, SPIPE_Acceptor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void)
 #if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   : sa_ (0), pipe_handle_ (ACE_INVALID_HANDLE)
@@ -182,9 +183,16 @@ ACE_SPIPE_Acceptor::close (void)
   ACE_TRACE ("ACE_SPIPE_Acceptor::close");
 
 #if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
-  // Substitute the pipe handle back in so it's closed properly.
+
+  // Check to see if we have a valid pipe; if not, nothing to do.
+  if (this->pipe_handle_ == ACE_INVALID_HANDLE)
+    return -1;
+
+  // Substitute the pipe handle back in so it's closed properly in the
+  // ACE_OS wrapper. But leave the pipe_handle_ value so we can clean up the
+  // hanging overlapped operation afterwards.
   this->set_handle (this->pipe_handle_);
-  this->pipe_handle_ = ACE_INVALID_HANDLE;
+
 #endif /* ACE_WIN32 */
 
   // This behavior is shared by UNIX and Win32...
@@ -193,7 +201,29 @@ ACE_SPIPE_Acceptor::close (void)
 
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OS::fdetach (this->local_addr_.get_path_name ());
+#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
+
+  // open () started the Connect in asynchronous mode, and accept() restarts
+  // the ConnectNamedPipe in overlapped mode.  To avoid leaving a hanging
+  // overlapped operation that'll write into members of this object,
+  // wait for the event in the OVERLAPPED structure to be signalled.
+  if (this->already_connected_ == 0)
+    {
+      if (this->event_.wait () != -1)
+        {
+          // Should be here with the ConnectNamedPipe operation complete.
+          // Steal the already_connected_ flag to record the results.
+          DWORD unused;
+          ::GetOverlappedResult (this->pipe_handle_,
+                                 &this->overlapped_,
+                                 &unused,
+                                 FALSE);
+        }
+      this->pipe_handle_ = ACE_INVALID_HANDLE;
+      this->already_connected_ = 0;
+    }
 #endif /* ACE_HAS_STREAM_PIPES */
+
   return result;
 }
 
@@ -302,3 +332,5 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_STREAM_PIPES */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index 0b73d2be05d..6e0bb7ed8aa 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "ace/Manual_Event.h"
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SPIPE_Acceptor
  *
@@ -41,7 +43,7 @@
  *
  * @warning Works on non-Windows platforms only when @c ACE_HAS_STREAM_PIPES
  * is defined.
- * 
+ *
  */
 class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE
 {
@@ -160,5 +162,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_SPIPE_ACCEPTOR_H */
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index beb73d68b2d..b4ec63e4fc3 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -1,4 +1,3 @@
-// SPIPE_Addr.cpp
 // $Id$
 
 #include "ace/SPIPE_Addr.h"
@@ -12,6 +11,8 @@
 
 ACE_RCSID(ace, SPIPE_Addr, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr)
 
 void
@@ -29,8 +30,8 @@ ACE_SPIPE_Addr::set_addr (void *addr, int len)
 
   this->ACE_Addr::base_set (AF_SPIPE, len);
   ACE_OS::memcpy ((void *) &this->SPIPE_addr_,
-		  (void *) addr,
-		  len);
+                  (void *) addr,
+                  len);
 }
 
 // Return the address.
@@ -49,7 +50,7 @@ ACE_SPIPE_Addr::ACE_SPIPE_Addr (void)
 {
   (void) ACE_OS::memset ((void *) &this->SPIPE_addr_,
                          0,
-			 sizeof this->SPIPE_addr_);
+                         sizeof this->SPIPE_addr_);
 }
 
 int
@@ -95,8 +96,8 @@ ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa)
 
 int
 ACE_SPIPE_Addr::set (const ACE_TCHAR *addr,
-		     gid_t gid,
-		     uid_t uid)
+                     gid_t gid,
+                     uid_t uid)
 {
   int len = sizeof (this->SPIPE_addr_.uid_);
   len += sizeof (this->SPIPE_addr_.gid_);
@@ -156,9 +157,11 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr,
 // Create a ACE_Addr from a ACE_SPIPE pathname.
 
 ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_TCHAR *addr,
-				gid_t gid,
-				uid_t uid)
+                                gid_t gid,
+                                uid_t uid)
   : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_)
 {
   this->set (addr, gid, uid);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h
index ffc150b98cd..e6791a8c656 100644
--- a/ace/SPIPE_Addr.h
+++ b/ace/SPIPE_Addr.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //==========================================================================
 /**
  *  @file    SPIPE_Addr.h
@@ -25,6 +26,8 @@
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_dirent.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SPIPE_Addr
  *
@@ -109,6 +112,8 @@ private:
   // Contents of an SPIPE address.
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SPIPE_Addr.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SPIPE_Addr.inl b/ace/SPIPE_Addr.inl
index 1c2858bc399..ea4c71ef682 100644
--- a/ace/SPIPE_Addr.inl
+++ b/ace/SPIPE_Addr.inl
@@ -5,6 +5,7 @@
 
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Compare two addresses for equality.
 
@@ -20,7 +21,7 @@ ACE_SPIPE_Addr::operator == (const ACE_SPIPE_Addr &sap) const
 ACE_INLINE bool
 ACE_SPIPE_Addr::operator != (const ACE_SPIPE_Addr &sap) const
 {
-  return !((*this) == sap);	// This is lazy, of course... ;-)
+  return !((*this) == sap);     // This is lazy, of course... ;-)
 }
 
 // Return the path name used for the rendezvous point.
@@ -54,3 +55,5 @@ ACE_SPIPE_Addr::group_id (gid_t gid)
 {
   this->SPIPE_addr_.gid_ = gid;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index b715aa67690..c7c9a0c10dc 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -12,6 +12,8 @@
 
 ACE_RCSID(ace, SPIPE_Connector, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector)
 
 // Creates a Local ACE_SPIPE.
@@ -156,3 +158,5 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
 
   return handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 7648e63b4a4..f9fc2455ecc 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SPIPE_Connector
  *
@@ -106,6 +108,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SPIPE_Connector.inl b/ace/SPIPE_Connector.inl
index 4ca09d7887e..bbec9b8f468 100644
--- a/ace/SPIPE_Connector.inl
+++ b/ace/SPIPE_Connector.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
 {
@@ -9,3 +12,4 @@ ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp
index 40d96974ceb..fcc695d6271 100644
--- a/ace/SPIPE_Stream.cpp
+++ b/ace/SPIPE_Stream.cpp
@@ -1,4 +1,3 @@
-// SPIPE_Stream.cpp
 // $Id$
 
 #include "ace/SPIPE_Stream.h"
@@ -10,6 +9,8 @@
 
 ACE_RCSID(ace, SPIPE_Stream, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream)
 
 void
@@ -99,3 +100,5 @@ ACE_SPIPE_Stream::recv (size_t n, ...) const
   va_end (argp);
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index 5146217c529..9a94216ae40 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -24,6 +24,8 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_stropts.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SPIPE_Stream
  *
@@ -159,6 +161,8 @@ private:
   ACE_SPIPE_Addr remote_addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SPIPE_Stream.inl b/ace/SPIPE_Stream.inl
index 11b8fef5a9e..dbc3725782c 100644
--- a/ace/SPIPE_Stream.inl
+++ b/ace/SPIPE_Stream.inl
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SPIPE_Stream.i
-
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
@@ -10,6 +9,8 @@
 #include "ace/OS_NS_sys_socket.h"
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Create an ACE_SPIPE_Stream.
 
 ACE_INLINE int
@@ -272,3 +273,5 @@ ACE_SPIPE_Stream::sendv (const iovec iov[],
                          n);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/ace/SSL/ACE_SSL.pc.in b/ace/SSL/ACE_SSL.pc.in
index 944adafc5e6..51c04a18ff1 100644
--- a/ace/SSL/ACE_SSL.pc.in
+++ b/ace/SSL/ACE_SSL.pc.in
@@ -7,5 +7,5 @@ Name: ACE_SSL
 Description: ACE SSL Library
 Requires: ACE
 Version: @VERSION@
-Libs: -L${libdir} -lACE_SSL
-Cflags: -I${includedir}
+Libs: -L${libdir} @ACE_TLS_LDFLAGS@ -lACE_SSL @ACE_TLS_LIBS@
+Cflags: -I${includedir} @ACE_TLS_CPPFLAGS@
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
index 93dedffa878..9e27ab1348f 100644
--- a/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
@@ -1,14 +1,49 @@
 // -*- C++ -*-
 
-#include "ace/OS_NS_string.h"
 #include "SSL_Asynch_BIO.h"
+
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+
 #include "SSL_Asynch_Stream.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (ACE_SSL,
            SSL_Asynch_BIO,
            "$Id$")
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+# define ACE_ASYNCH_BIO_WRITE_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_write)
+# define ACE_ASYNCH_BIO_READ_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_read)
+# define ACE_ASYNCH_BIO_PUTS_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_puts)
+# define ACE_ASYNCH_BIO_CTRL_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_ctrl)
+# define ACE_ASYNCH_BIO_NEW_NAME   ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_new)
+# define ACE_ASYNCH_BIO_FREE_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_free)
+#else
+# define ACE_ASYNCH_BIO_WRITE_NAME ACE_Asynch_BIO_write
+# define ACE_ASYNCH_BIO_READ_NAME  ACE_Asynch_BIO_read
+# define ACE_ASYNCH_BIO_PUTS_NAME  ACE_Asynch_BIO_puts
+# define ACE_ASYNCH_BIO_CTRL_NAME  ACE_Asynch_BIO_ctrl
+# define ACE_ASYNCH_BIO_NEW_NAME   ACE_Asynch_BIO_new
+# define ACE_ASYNCH_BIO_FREE_NAME  ACE_Asynch_BIO_free
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+/**
+ * @name OpenSSL BIO Helper Methods for use with ACE's Asynchronous
+ *       SSL I/O support.
+ */
+//@{
+extern "C"
+{
+  int  ACE_ASYNCH_BIO_WRITE_NAME (BIO *pBIO, const char *buf, int len);
+  int  ACE_ASYNCH_BIO_READ_NAME  (BIO *pBIO, char *buf, int len);
+  int  ACE_ASYNCH_BIO_PUTS_NAME  (BIO *pBIO, const char *str);
+  long ACE_ASYNCH_BIO_CTRL_NAME  (BIO *pBIO, int cmd, long arg1, void *arg2);
+  int  ACE_ASYNCH_BIO_NEW_NAME   (BIO *pBIO);
+  int  ACE_ASYNCH_BIO_FREE_NAME  (BIO *pBIO);
+}
+//@}
 
 #define BIO_TYPE_ACE  ( 21 | BIO_TYPE_SOURCE_SINK )
 
@@ -16,26 +51,22 @@ static BIO_METHOD methods_ACE =
   {
     BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
     "ACE_Asynch_BIO",
-    ACE_Asynch_BIO_write,
-    ACE_Asynch_BIO_read,
-    ACE_Asynch_BIO_puts,
-    NULL, /* ACE_Asynch_BIO_gets, */
-    ACE_Asynch_BIO_ctrl,
-    ACE_Asynch_BIO_new,
-    ACE_Asynch_BIO_free,
+    ACE_ASYNCH_BIO_WRITE_NAME,
+    ACE_ASYNCH_BIO_READ_NAME,
+    ACE_ASYNCH_BIO_PUTS_NAME,
+    NULL, /* ACE_ASYNCH_BIO_GETS_NAME, */
+    ACE_ASYNCH_BIO_CTRL_NAME,
+    ACE_ASYNCH_BIO_NEW_NAME,
+    ACE_ASYNCH_BIO_FREE_NAME,
     NULL
   };
 
-BIO_METHOD *
-BIO_s_ACE_Asynch (void)
-{
-  return (&methods_ACE);
-}
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 BIO *
-BIO_new_ACE_Asynch (void *ssl_asynch_stream)
+ACE_SSL_make_BIO (void * ssl_asynch_stream)
 {
-  BIO * pBIO = BIO_new (BIO_s_ACE_Asynch ());
+  BIO * const pBIO = BIO_new (&methods_ACE);
 
   if (pBIO)
     BIO_ctrl (pBIO,
@@ -46,8 +77,41 @@ BIO_new_ACE_Asynch (void *ssl_asynch_stream)
   return pBIO;
 }
 
+/**
+ * @struct @c ACE_SSL_Asynch_Stream_Accessor
+ *
+ * @brief Privileged @c ACE_SSL_Asynch_Stream accessor.
+ *
+ * This structure is a @c friend to the @c ACE_SSL_Asynch_Stream
+ * class so that it can gain access to the protected
+ * ssl_bio_{read,write}() methods in that class.  It is full declared
+ * in this implementation file to hide its interface from users to
+ * prevent potential abuse of the friend relationship between it and
+ * the @c ACE_SSL_Asynch_Stream class.
+ */
+struct ACE_SSL_Asynch_Stream_Accessor
+{
+  static int read (ACE_SSL_Asynch_Stream * stream,
+               char * buf,
+               size_t len,
+               int & errval)
+  {
+    return stream->ssl_bio_read (buf, len, errval);
+  }
+
+  static int write (ACE_SSL_Asynch_Stream * stream,
+                    const char * buf,
+                    size_t len,
+                    int & errval)
+  {
+    return stream->ssl_bio_write (buf, len, errval);
+  }
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 int
-ACE_Asynch_BIO_new (BIO *pBIO)
+ACE_ASYNCH_BIO_NEW_NAME (BIO * pBIO)
 {
   pBIO->init  = 0;    // not initialized
   pBIO->num   = 0;    // still zero ( we can use it )
@@ -58,37 +122,30 @@ ACE_Asynch_BIO_new (BIO *pBIO)
 }
 
 int
-ACE_Asynch_BIO_free (BIO *pBIO)
+ACE_ASYNCH_BIO_FREE_NAME (BIO * pBIO)
 {
-  if (pBIO == 0)
-    return 0;
-
-  if (pBIO->shutdown)
+  if (pBIO && pBIO->shutdown)
     {
       pBIO->ptr   = 0;
       pBIO->init  = 0;
       pBIO->num   = 0;
       pBIO->flags = 0;
+
+      return 1;
     }
 
-  return 1;
+  return 0;
 }
 
 int
-ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len)
+ACE_ASYNCH_BIO_READ_NAME (BIO * pBIO, char * buf, int len)
 {
   BIO_clear_retry_flags (pBIO);
 
-  ACE_SSL_Asynch_Stream * p_stream =
+  ACE_SSL_Asynch_Stream * const p_stream =
     static_cast<ACE_SSL_Asynch_Stream *> (pBIO->ptr);
 
-  if (pBIO->init == 0 || p_stream == 0)
-    return -1;
-
-  if (buf == 0)
-    return -1;
-
-  if (len <= 0 )
+  if (pBIO->init == 0 || p_stream == 0 || buf == 0 || len <= 0)
     return -1;
 
   BIO_clear_retry_flags (pBIO);
@@ -96,9 +153,10 @@ ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len)
   int errval = 0;
 
   int retval =
-    p_stream->ssl_bio_read (buf,
-                            len,
-                            errval);
+    ACE_SSL_Asynch_Stream_Accessor::read (p_stream,
+                                          buf,
+                                          len,
+                                          errval);
 
   if (retval >= 0)
     return retval;
@@ -110,20 +168,14 @@ ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len)
 }
 
 int
-ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len)
+ACE_ASYNCH_BIO_WRITE_NAME (BIO * pBIO, const char * buf, int len)
 {
   BIO_clear_retry_flags (pBIO);
 
   ACE_SSL_Asynch_Stream * p_stream =
     static_cast<ACE_SSL_Asynch_Stream *> (pBIO->ptr);
 
-  if (pBIO->init == 0 || p_stream == 0)
-    return -1;
-
-  if (buf == 0)
-    return -1;
-
-  if (len <= 0)
+  if (pBIO->init == 0 || p_stream == 0 || buf == 0 || len <= 0)
     return -1;
 
   BIO_clear_retry_flags (pBIO);
@@ -131,9 +183,10 @@ ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len)
   int errval = 0;
 
   int retval =
-    p_stream->ssl_bio_write (buf,
-                             len,
-                             errval);
+    ACE_SSL_Asynch_Stream_Accessor::write (p_stream,
+                                           buf,
+                                           len,
+                                           errval);
 
   if (retval >= 0)
     return retval;
@@ -145,7 +198,7 @@ ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len)
 }
 
 long
-ACE_Asynch_BIO_ctrl (BIO * pBIO, int cmd, long num, void *ptr)
+ACE_ASYNCH_BIO_CTRL_NAME (BIO * pBIO, int cmd, long num, void *ptr)
 {
   long ret = 1;
 
@@ -187,13 +240,12 @@ ACE_Asynch_BIO_ctrl (BIO * pBIO, int cmd, long num, void *ptr)
   return ret;
 }
 
-
 int
-ACE_Asynch_BIO_puts (BIO *pBIO, const char *str)
+ACE_ASYNCH_BIO_PUTS_NAME (BIO *pBIO, const char *str)
 {
-  size_t n = ACE_OS::strlen (str);
+  size_t const n = ACE_OS::strlen (str);
 
-  return ACE_Asynch_BIO_write (pBIO, str, n);
+  return ACE_ASYNCH_BIO_WRITE_NAME (pBIO, str, n);
 }
 
 #endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
diff --git a/ace/SSL/SSL_Asynch_BIO.h b/ace/SSL/SSL_Asynch_BIO.h
index d6cf4e571e4..22c6202754b 100644
--- a/ace/SSL/SSL_Asynch_BIO.h
+++ b/ace/SSL/SSL_Asynch_BIO.h
@@ -23,25 +23,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+// This must be included before any <openssl> include on LynxOS
+#include "ace/os_include/os_stdio.h"
+
 #include <openssl/bio.h>
 
 #if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 
-/**
- * @name OpenSSL BIO Helper Methods for use with ACE's Asynchronous
- *       SSL I/O support.
- */
-//@{
-extern "C"
-{
-  int  ACE_Asynch_BIO_write (BIO *pBIO, const char *buf, int len);
-  int  ACE_Asynch_BIO_read  (BIO *pBIO, char *buf, int len);
-  int  ACE_Asynch_BIO_puts  (BIO *pBIO, const char *str);
-  long ACE_Asynch_BIO_ctrl  (BIO *pBIO, int cmd, long arg1, void *arg2);
-  int  ACE_Asynch_BIO_new   (BIO *pBIO);
-  int  ACE_Asynch_BIO_free  (BIO *pBIO);
-}
-//@}
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream);
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL (ACE_WIN32 ||
            ACE_HAS_AIO_CALLS) */
diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp
index 2903fe7ba39..2967c7fd8b3 100644
--- a/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ace/SSL/SSL_Asynch_Stream.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 #include "SSL_Asynch_Stream.h"
 
 ACE_RCSID (ACE_SSL,
@@ -36,12 +34,14 @@ ACE_RCSID (ACE_SSL,
 
 #include <openssl/err.h>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // ************************************************************
 //  SSL Asynchronous Write Result
 // ************************************************************
 
-class ACE_SSL_Export ACE_SSL_Asynch_Write_Stream_Result:
-  public AWS_RESULT
+class ACE_SSL_Asynch_Write_Stream_Result
+  : public AWS_RESULT
 {
   /// Factory class will have special permissions.
   friend class ACE_SSL_Asynch_Stream;
@@ -83,8 +83,8 @@ ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result
 // ************************************************************
 //  SSL Asynchronous Read Result
 // ************************************************************
-class ACE_SSL_Export ACE_SSL_Asynch_Read_Stream_Result:
-  public ARS_RESULT
+class ACE_SSL_Asynch_Read_Stream_Result
+  : public ARS_RESULT
 {
   /// Factory class will have special permissions.
   friend class ACE_SSL_Asynch_Stream;
@@ -223,7 +223,6 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
                   ACE_LIB_TEXT("if proactor still handles events\n")));
 
   ::SSL_free (this->ssl_);
-  this->ssl_ = 0;
 
   // Was honestly copied from ACE_SSL_SOCK_Stream :)
 
@@ -348,7 +347,7 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
                                this->proactor_) != 0)
     return -1;
 
-  this->bio_ = ::BIO_new_ACE_Asynch (this);
+  this->bio_ = ACE_SSL_make_BIO (this);
 
   if (this->bio_ == 0)
     ACE_ERROR_RETURN
@@ -783,15 +782,15 @@ ACE_SSL_Asynch_Stream::notify_read (int bytes_transferred,
   if (ext_read_result_ == 0) //nothing to notify
     return 1;
 
-  ext_read_result_->set_bytes_transferred (bytes_transferred);
-  ext_read_result_->set_error (error);
+  this->ext_read_result_->set_bytes_transferred (bytes_transferred);
+  this->ext_read_result_->set_error (error);
 
-  int retval =  ext_read_result_->post_completion
-                   (proactor_->implementation());
+  int retval =
+    this->ext_read_result_->post_completion (proactor_->implementation ());
 
   if (retval == 0)
     {
-      ext_read_result_ = 0;
+      this->ext_read_result_ = 0;
       return 0;  // success
     }
 
@@ -1120,5 +1119,7 @@ ACE_SSL_Asynch_Stream::pending_BIO_count (void)
   return ret;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
            ACE_HAS_AIO_CALLS) */
diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h
index e8d2b8f8c34..57007f5013d 100644
--- a/ace/SSL/SSL_Asynch_Stream.h
+++ b/ace/SSL/SSL_Asynch_Stream.h
@@ -29,20 +29,19 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
-extern "C"
-{
-  BIO_METHOD * BIO_s_ACE_Asynch (void);
-  BIO * BIO_new_ACE_Asynch (void *ssl_asynch_stream);
-}
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Forward declarations
-class ACE_SSL_Asynch_Stream;
 class ACE_SSL_Asynch_Result;
 class ACE_SSL_Asynch_Read_Stream_Result;
 class ACE_SSL_Asynch_Write_Stream_Result;
 
 
+// Only provide forward declarations to prevent possible abuse of the
+// friend declarations in ACE_SSL_Asynch_Stream.
+struct ACE_SSL_Asynch_Stream_Accessor;
+
 /**
  * @class ACE_SSL_Asynch_Stream
  *
@@ -60,11 +59,20 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream
   : public ACE_Asynch_Operation,
     public ACE_Service_Handler
 {
-  friend int ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len);
-  friend int ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len);
-
 public:
 
+  // Use a class/struct to work around scoping
+  // problems for extern "C" free functions with some compilers.  For
+  // example, some can't handle
+  //
+  //   friend ::some_extern_c_free_function (...)
+  //
+  // Note that we could use a straight C++ (i.e. not extern "C") free
+  // function, but using a class or struct allows us to hide the
+  // interface from the user, which prevents abuse of this friend
+  // relationship.
+  friend struct ACE_SSL_Asynch_Stream_Accessor;
+
   enum Stream_Type
     {
       ST_CLIENT = 0x0001,
@@ -168,6 +176,12 @@ protected:
   int ssl_bio_write (const char * buf, size_t len, int & errval);
   //@}
 
+private:
+
+  // Preventing copying through construction or assignment.
+  ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &);
+  ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &);
+
 protected:
 
   /// Stream Type ST_CLIENT/ST_SERVER
@@ -246,6 +260,7 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
            ACE_HAS_AIO_CALLS) */
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp
index 4fe5260aded..fd884dd9044 100644
--- a/ace/SSL/SSL_Context.cpp
+++ b/ace/SSL/SSL_Context.cpp
@@ -1,7 +1,3 @@
-// -*- C++ -*-
-
-#include "ace/OS_NS_string.h"
-#include "ace/ACE.h"
 #include "SSL_Context.h"
 
 #include "sslconf.h"
@@ -15,7 +11,14 @@
 #include "ace/Log_Msg.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
+#include "ace/ACE.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_string.h"
+
+#ifdef ACE_HAS_THREADS
+# include "ace/Thread_Mutex.h"
+# include "ace/OS_NS_Thread.h"
+#endif  /* ACE_HAS_THREADS */
 
 #include <openssl/x509.h>
 #include <openssl/err.h>
@@ -25,12 +28,83 @@ ACE_RCSID (ACE_SSL,
            SSL_Context,
            "$Id$")
 
+
+namespace
+{
+  /// Reference count of the number of times the ACE_SSL_Context was
+  /// initialized.
+  int ssl_library_init_count = 0;
+
+  // @@ This should also be done with a singleton, otherwise it is not
+  //    thread safe and/or portable to some weird platforms...
+
 #ifdef ACE_HAS_THREADS
-ACE_mutex_t * ACE_SSL_Context::lock_ = 0;
+  /// Array of mutexes used internally by OpenSSL when the SSL
+  /// application is multithreaded.
+  ACE_SSL_Context::lock_type * ssl_locks = 0;
+
+  // @@ This should also be managed by a singleton.
+#endif
+}
+
+#ifdef ACE_HAS_THREADS
+
+# if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
+#  define ACE_SSL_LOCKING_CALLBACK_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_SSL_locking_callback)
+#  define ACE_SSL_THREAD_ID_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_SSL_thread_id)
+# else
+#  define ACE_SSL_LOCKING_CALLBACK_NAME ACE_SSL_locking_callback
+#  define ACE_SSL_THREAD_ID_NAME ACE_SSL_thread_id
+# endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
+
+
+
+extern "C"
+{
+  void
+  ACE_SSL_LOCKING_CALLBACK_NAME (int mode,
+                                 int type,
+                                 const char * /* file */,
+                                 int /* line */)
+  {
+    // #ifdef undef
+    //   fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
+    //           CRYPTO_thread_id(),
+    //           (mode&CRYPTO_LOCK)?"l":"u",
+    //           (type&CRYPTO_READ)?"r":"w",file,line);
+    // #endif
+    //   /*
+    //     if (CRYPTO_LOCK_SSL_CERT == type)
+    //     fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
+    //     CRYPTO_thread_id(),
+    //     mode,file,line);
+    //   */
+    if (mode & CRYPTO_LOCK)
+      (void) ssl_locks[type].acquire ();
+    else
+      (void) ssl_locks[type].release ();
+  }
+
+  // -------------------------------
+
+  // Return the current thread ID.  OpenSSL uses this on platforms
+  // that need it.
+  unsigned long
+  ACE_SSL_THREAD_ID_NAME (void)
+  {
+    return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self ();
+  }
+}
 #endif  /* ACE_HAS_THREADS */
 
 
-int ACE_SSL_Context::library_init_count_ = 0;
+// ****************************************************************
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#ifdef ACE_HAS_THREADS
+ACE_SSL_Context::lock_type * ACE_SSL_Context::locks_ = 0;
+#endif  /* ACE_HAS_THREADS */
 
 ACE_SSL_Context::ACE_SSL_Context (void)
   : context_ (0),
@@ -65,34 +139,22 @@ ACE_SSL_Context::ssl_library_init (void)
                      ace_ssl_mon,
                      *ACE_Static_Object_Lock::instance ()));
 
-  if (ACE_SSL_Context::library_init_count_ == 0)
+  if (ssl_library_init_count == 0)
     {
       // Initialize the locking callbacks before initializing anything
       // else.
 #ifdef ACE_HAS_THREADS
-      int num_locks = ::CRYPTO_num_locks ();
+      int const num_locks = ::CRYPTO_num_locks ();
 
-      ACE_NEW (ACE_SSL_Context::lock_,
-               ACE_mutex_t[num_locks]);
-
-      for (int i = 0; i < num_locks; ++i)
-        {
-          // rwlock_init(&(ACE_SSL_Context::lock_[i]), USYNC_THREAD,
-          // 0);
-          if (ACE_OS::mutex_init (&(ACE_SSL_Context::lock_[i]),
-                                  USYNC_THREAD) != 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ")
-                        ACE_LIB_TEXT ("- %p\n"),
-                        ACE_LIB_TEXT ("mutex_init")));
-        }
+      this->locks_ = new lock_type[num_locks];
+      ssl_locks    = this->locks_;
 
 # if !defined (WIN32)
       // This call isn't necessary on some platforms.  See the CRYPTO
       // library's threads(3) man page for details.
-      ::CRYPTO_set_id_callback (ACE_SSL_thread_id);
-# endif  /* WIN32 */
-      ::CRYPTO_set_locking_callback (ACE_SSL_locking_callback);
+      ::CRYPTO_set_id_callback (ACE_SSL_THREAD_ID_NAME);
+# endif  /* !WIN32 */
+      ::CRYPTO_set_locking_callback (ACE_SSL_LOCKING_CALLBACK_NAME);
 #endif  /* ACE_HAS_THREADS */
 
       ::SSLeay_add_ssl_algorithms ();
@@ -128,7 +190,7 @@ ACE_SSL_Context::ssl_library_init (void)
 
     }
 
-  ++ACE_SSL_Context::library_init_count_;
+  ++ssl_library_init_count;
 }
 
 void
@@ -138,8 +200,8 @@ ACE_SSL_Context::ssl_library_fini (void)
                      ace_ssl_mon,
                      *ACE_Static_Object_Lock::instance ()));
 
-  --ACE_SSL_Context::library_init_count_;
-  if (ACE_SSL_Context::library_init_count_ == 0)
+  --ssl_library_init_count;
+  if (ssl_library_init_count == 0)
     {
       ::ERR_free_strings ();
       ::EVP_cleanup ();
@@ -147,13 +209,12 @@ ACE_SSL_Context::ssl_library_fini (void)
       // Clean up the locking callbacks after everything else has been
       // cleaned up.
 #ifdef ACE_HAS_THREADS
-      int num_locks = ::CRYPTO_num_locks ();
-
       ::CRYPTO_set_locking_callback (0);
-      for (int i = 0; i < num_locks; ++i)
-        ACE_OS::mutex_destroy (&(ACE_SSL_Context::lock_[i]));
+      ssl_locks = 0;
+
+      delete [] this->locks_;
+      this->locks_ = 0;
 
-      delete [] ACE_SSL_Context::lock_;
 #endif  /* ACE_HAS_THREADS */
     }
 }
@@ -277,7 +338,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, const char* ca_dir)
           || mode_ == SSLv2_server)
         {
           STACK_OF (X509_NAME) * cert_names;
-          cert_names = ::SSL_CTX_get_client_CA_list(this->context_);
+          cert_names = ::SSL_CTX_get_client_CA_list (this->context_);
 
           if (cert_names == 0)
             {
@@ -328,7 +389,10 @@ ACE_SSL_Context::private_key (const char *file_name,
   if (::SSL_CTX_use_PrivateKey_file (this->context_,
                                      this->private_key_.file_name (),
                                      this->private_key_.type ()) <= 0)
-    return -1;
+    {
+      this->private_key_ = ACE_SSL_Data_File ();
+      return -1;
+    }
   else
     return this->verify_private_key ();
 }
@@ -355,7 +419,10 @@ ACE_SSL_Context::certificate (const char *file_name,
   if (::SSL_CTX_use_certificate_file (this->context_,
                                       this->certificate_.file_name (),
                                       this->certificate_.type ()) <= 0)
-    return -1;
+    {
+      this->certificate_ = ACE_SSL_Data_File ();
+      return -1;
+    }
   else
     return 0;
 }
@@ -456,30 +523,39 @@ ACE_SSL_Context::dh_params (const char *file_name,
   if (this->dh_params_.type () != -1)
     return 0;
 
+  // For now we only support PEM encodings
+  if (type != SSL_FILETYPE_PEM)
+    return -1;
+
   this->dh_params_ = ACE_SSL_Data_File (file_name, type);
 
   this->check_context ();
 
   {
-    // For now we only support PEM encodings
-    if (this->dh_params_.type () != SSL_FILETYPE_PEM)
-      return -1;
-
     // Swiped from Rescorla's examples and the OpenSSL s_server.c app
-    DH *ret=0;
-    BIO *bio = 0;
+    DH * ret=0;
+    BIO * bio = 0;
 
     if ((bio = ::BIO_new_file (this->dh_params_.file_name (), "r")) == NULL)
-      return -1;
+      {
+        this->dh_params_ = ACE_SSL_Data_File ();
+        return -1;
+      }
 
     ret = PEM_read_bio_DHparams (bio, NULL, NULL, NULL);
     BIO_free (bio);
 
     if (ret == 0)
-      return -1;
-
-    if(::SSL_CTX_set_tmp_dh (this->context_, ret) < 0)
-      return -1;
+      {
+        this->dh_params_ = ACE_SSL_Data_File ();
+        return -1;
+      }
+
+    if (::SSL_CTX_set_tmp_dh (this->context_, ret) < 0)
+      {
+        this->dh_params_ = ACE_SSL_Data_File ();
+        return -1;
+      }
     DH_free (ret);
   }
 
@@ -488,56 +564,11 @@ ACE_SSL_Context::dh_params (const char *file_name,
 
 // ****************************************************************
 
-#ifdef ACE_HAS_THREADS
-
-void
-ACE_SSL_locking_callback (int mode,
-                          int type,
-                          const char * /* file */,
-                          int /* line */)
-{
-  // #ifdef undef
-  //   fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
-  //           CRYPTO_thread_id(),
-  //           (mode&CRYPTO_LOCK)?"l":"u",
-  //           (type&CRYPTO_READ)?"r":"w",file,line);
-  // #endif
-  //   /*
-  //     if (CRYPTO_LOCK_SSL_CERT == type)
-  //     fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
-  //     CRYPTO_thread_id(),
-  //     mode,file,line);
-  //   */
-  if (mode & CRYPTO_LOCK)
-    ACE_OS::mutex_lock (&(ACE_SSL_Context::lock_[type]));
-  else
-    ACE_OS::mutex_unlock (&(ACE_SSL_Context::lock_[type]));
-}
-
-
-
-unsigned long
-ACE_SSL_thread_id (void)
-{
-  return (unsigned long) ACE_OS::thr_self ();
-}
-#endif  /* ACE_HAS_THREADS */
-
-// ****************************************************************
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
 template ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> *
   ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_;
 
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_Context.h b/ace/SSL/SSL_Context.h
index 37a8de30496..748ca4cde72 100644
--- a/ace/SSL/SSL_Context.h
+++ b/ace/SSL/SSL_Context.h
@@ -7,6 +7,7 @@
  *  $Id$
  *
  *  @author Carlos O'Ryan <coryan@ece.uci.edu>
+ *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -25,28 +26,13 @@
 #include "ace/SString.h"
 
 #ifdef ACE_HAS_THREADS
-# include "ace/OS_NS_Thread.h"
+# include "ace/Synch_Traits.h"
 #endif  /* ACE_HAS_THREADS */
 
 #include <openssl/ssl.h>
 
-#ifdef ACE_HAS_THREADS
-extern "C"
-{
-
-  /// Mutex locking/unlocking callback for OpenSSL multithread
-  /// support.
-  void ACE_SSL_locking_callback (int mode,
-                                 int type,
-                                 const char * file,
-                                 int line);
-
-  /// Return the current thread ID.  OpenSSL uses this on platforms
-  /// that need it.
-  unsigned long ACE_SSL_thread_id (void);
-}
-#endif  /* ACE_HAS_THREADS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_SSL_Export ACE_SSL_Data_File
 {
@@ -88,10 +74,12 @@ private:
  */
 class ACE_SSL_Export ACE_SSL_Context
 {
-  friend void ACE_SSL_locking_callback (int, int, const char *, int);
-
 public:
 
+#ifdef ACE_HAS_THREADS
+  typedef ACE_SYNCH_MUTEX lock_type;
+#endif  /* ACE_HAS_THREADS */
+
   enum {
     INVALID_METHOD = -1,
     SSLv2_client = 1,
@@ -257,18 +245,18 @@ public:
   //@{
   /// Seed the underlying random number generator.  This value should
   /// have at least 128 bits of entropy.
-  int random_seed (const char * seed);
+  static int random_seed (const char * seed);
 
   /// Set the Entropy Gathering Daemon (EGD) UNIX domain socket file to
   /// read random seed values from.
-  int egd_file (const char * socket_file);
+  static int egd_file (const char * socket_file);
 
   /**
    * Set the file that contains the random seed value state, and the
    * amount of bytes to read.  "-1" bytes causes the entire file to be
    * read.
    */
-  int seed_file (const char * seed_file, long bytes = -1);
+  static int seed_file (const char * seed_file, long bytes = -1);
   //@}
 
   /// Print SSL error corresponding to the given error code.
@@ -307,18 +295,13 @@ private:
   void ssl_library_init ();
   void ssl_library_fini ();
 
-  // = Prevent assignment and initialization.
+  // = Prevent assignment and copy initialization.
   //@{
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_Context &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_SSL_Context (const ACE_SSL_Context &))
+  ACE_SSL_Context (const ACE_SSL_Context &);
+  ACE_SSL_Context & operator= (const ACE_SSL_Context &);
   //@}
 
 private:
-  // @@ Carlos, I protected this variable with an ACE_GUARD, just like
-  //    what we do for the orb_init_count_ variable in
-  //    tao/ORB.cpp.   The code isn't pretty but it should suffice
-  //    until the SSL context is stored in a Singleton.
-  //       -Ossama
 
   /// The SSL_CTX structure
   SSL_CTX *context_;
@@ -337,23 +320,16 @@ private:
   /// count of successful CA load attempts
   int have_ca_;
 
-  /// Reference count of the number of times the ACE_SSL_Context was
-  /// initialized.
-  static int library_init_count_;
-
-  // @@ This should also be done with a singleton, otherwise it is not
-  //    thread safe and/or portable to some weird platforms...
-
 #ifdef ACE_HAS_THREADS
   /// Array of mutexes used internally by OpenSSL when the SSL
   /// application is multithreaded.
-  static ACE_mutex_t * lock_;
-
-  // @@ This should also be managed by a singleton.
-#endif
+  static lock_type * locks_;
+#endif  /* ACE_HAS_THREADS */
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined(__ACE_INLINE__)
 #include "SSL_Context.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SSL/SSL_Context.inl b/ace/SSL/SSL_Context.inl
index 9008591e1c9..5fd50ec6d43 100644
--- a/ace/SSL/SSL_Context.inl
+++ b/ace/SSL/SSL_Context.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SSL_Data_File::ACE_SSL_Data_File (void)
@@ -104,3 +105,5 @@ ACE_SSL_Context::have_trusted_ca (void) const
 {
   return this->have_ca_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK.cpp b/ace/SSL/SSL_SOCK.cpp
index 0f38ddb4206..c6f1af15388 100644
--- a/ace/SSL/SSL_SOCK.cpp
+++ b/ace/SSL/SSL_SOCK.cpp
@@ -1,8 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-
 #include "SSL_SOCK.h"
 
 #if !defined (__ACE_INLINE__)
@@ -17,6 +14,8 @@ ACE_RCSID (ACE_SSL,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_SSL_SOCK::ACE_SSL_SOCK (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK");
@@ -69,3 +68,5 @@ ACE_SSL_SOCK::disable (int value) const
       return -1;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK.h b/ace/SSL/SSL_SOCK.h
index c5d65b35a72..0a86a1f5c9f 100644
--- a/ace/SSL/SSL_SOCK.h
+++ b/ace/SSL/SSL_SOCK.h
@@ -34,6 +34,8 @@
 # define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream, ACE_INET_Addr
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SSL_SOCK
  *
@@ -50,9 +52,6 @@ class ACE_SSL_Export ACE_SSL_SOCK : public ACE_SOCK
 {
 public:
 
-  /// Default destructor.
-  ~ACE_SSL_SOCK (void);
-
   /**
    * Override ACE_SOCK base class implementations with these SSL
    * specific ones.
@@ -79,8 +78,18 @@ protected:
   /// from being defined.
   ACE_SSL_SOCK (void);
 
+  /// Destructor
+  /**
+   * Not a virtual destructor.  Protected destructor to prevent
+   * operator delete() from being called through a base class
+   * ACE_SSL_SOCK pointer/reference.
+   */
+  ~ACE_SSL_SOCK (void);
+
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SSL_SOCK.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SSL/SSL_SOCK.i b/ace/SSL/SSL_SOCK.i
index bd2b967b97a..1a39d5214dc 100644
--- a/ace/SSL/SSL_SOCK.i
+++ b/ace/SSL/SSL_SOCK.i
@@ -1,8 +1,11 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 ACE_SSL_SOCK::set_handle (ACE_HANDLE fd)
 {
@@ -25,9 +28,9 @@ ACE_SSL_SOCK::control (int cmd, void *arg) const
 
 ACE_INLINE int
 ACE_SSL_SOCK::set_option (int level,
-		     int option,
-		     void *optval,
-		     int optlen) const
+                     int option,
+                     void *optval,
+                     int optlen) const
 {
 //   switch (option)
 //     {
@@ -37,9 +40,9 @@ ACE_SSL_SOCK::set_option (int level,
 //       return ::BIO_set_read_buffer_size (this->io_bio_, *((int *) optval));
 //     default:
       return ACE_OS::setsockopt (this->get_handle (),
-				 level,
-				 option, (char *) optval,
-				 optlen);
+                                 level,
+                                 option, (char *) optval,
+                                 optlen);
 //    }
 }
 
@@ -47,9 +50,9 @@ ACE_SSL_SOCK::set_option (int level,
 
 ACE_INLINE int
 ACE_SSL_SOCK::get_option (int level,
-		     int option,
-		     void *optval,
-		     int *optlen) const
+                     int option,
+                     void *optval,
+                     int *optlen) const
 {
 //  switch (option)
 //    {
@@ -59,8 +62,10 @@ ACE_SSL_SOCK::get_option (int level,
 //       return ::BIO_get_read_buffer_size (this->io_bio_, *((int *) optval));
 //    default:
       return ACE_OS::getsockopt (this->get_handle (),
-				 level,
-				 option, (char *) optval,
-				 optlen);
+                                 level,
+                                 option, (char *) optval,
+                                 optlen);
 //    }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp
index 6dedbf05bca..61c91e999e4 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/ace/SSL/SSL_SOCK_Acceptor.cpp
@@ -12,8 +12,6 @@
 #include "ace/Time_Value.h"
 #include "ace/Countdown_Time.h"
 
-ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor)
-
 #if !defined (__ACE_INLINE__)
 #include "SSL_SOCK_Acceptor.i"
 #endif /* __ACE_INLINE__ */
@@ -22,6 +20,10 @@ ACE_RCSID (ACE_SSL,
            SSL_SOCK_Acceptor,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor)
+
 ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor");
@@ -242,5 +244,6 @@ ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream,
     }
 
   return 0;
-
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Acceptor.h b/ace/SSL/SSL_SOCK_Acceptor.h
index 698ebcbefd9..0428365a753 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/ace/SSL/SSL_SOCK_Acceptor.h
@@ -29,6 +29,8 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/OS_QoS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SSL_SOCK_Acceptor
  *
@@ -68,10 +70,10 @@ public:
    *                   upon return.
    */
   ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-			 int reuse_addr = 0,
-			 int protocol_family = PF_UNSPEC,
-			 int backlog = ACE_DEFAULT_BACKLOG,
-			 int protocol = 0);
+                         int reuse_addr = 0,
+                         int protocol_family = PF_UNSPEC,
+                         int backlog = ACE_DEFAULT_BACKLOG,
+                         int protocol = 0);
 
   /**
    * Initiate a passive-mode QoS-enabled acceptor socket.
@@ -84,13 +86,13 @@ public:
    *                   upon return.
    */
   ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-			 ACE_Protocol_Info *protocolinfo,
-			 ACE_SOCK_GROUP g,
-			 u_long flags,
-			 int reuse_addr,
-			 int protocol_family = PF_UNSPEC,
-			 int backlog = ACE_DEFAULT_BACKLOG,
-			 int protocol = 0);
+                         ACE_Protocol_Info *protocolinfo,
+                         ACE_SOCK_GROUP g,
+                         u_long flags,
+                         int reuse_addr,
+                         int protocol_family = PF_UNSPEC,
+                         int backlog = ACE_DEFAULT_BACKLOG,
+                         int protocol = 0);
 
   /**
    * Initiate a passive mode SSL/BSD-style acceptor socket.
@@ -156,7 +158,7 @@ public:
    * @return 0 if success; -1 for failure (errno contains error code).
    */
   int accept (ACE_SSL_SOCK_Stream &new_stream,
-	      ACE_Accept_QoS_Params qos_params,
+              ACE_Accept_QoS_Params qos_params,
               ACE_Addr *remote_addr = 0,
               ACE_Time_Value *timeout = 0,
               int restart = 1,
@@ -185,6 +187,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SSL_SOCK_Acceptor.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SSL/SSL_SOCK_Acceptor.i b/ace/SSL/SSL_SOCK_Acceptor.i
index 01cc06fd8bb..7fd8cb04095 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.i
+++ b/ace/SSL/SSL_SOCK_Acceptor.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void)
@@ -80,3 +81,5 @@ ACE_SSL_SOCK_Acceptor::close (void)
 
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp
index 5b6f2e09e0c..41e00ff6f4a 100644
--- a/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ace/SSL/SSL_SOCK_Connector.cpp
@@ -20,8 +20,9 @@ ACE_RCSID (ACE_SSL,
            SSL_SOCK_Connector,
            "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector)
 
 ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void)
 {
@@ -406,3 +407,5 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (
                  reuse_addr,
                  perms);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Connector.h b/ace/SSL/SSL_SOCK_Connector.h
index 9ece41271a2..702dbbf82ec 100644
--- a/ace/SSL/SSL_SOCK_Connector.h
+++ b/ace/SSL/SSL_SOCK_Connector.h
@@ -30,6 +30,8 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/OS_QoS.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SSL_SOCK_Connector
  *
@@ -258,13 +260,13 @@ public:
   int connect (ACE_SSL_SOCK_Stream &new_stream,
                const ACE_Addr &remote_sap,
                ACE_QoS_Params qos_params,
-	       const ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+               const ACE_Time_Value *timeout = 0,
+               const ACE_Addr &local_sap = ACE_Addr::sap_any,
                ACE_Protocol_Info *protocolinfo = 0,
                ACE_SOCK_GROUP g = 0,
                u_long flags = 0,
-	       int reuse_addr = 0,
-	       int perms = 0);
+               int reuse_addr = 0,
+               int perms = 0);
 
   /**
    * Try to complete a non-blocking connection.
@@ -305,6 +307,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SSL_SOCK_Connector.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SSL/SSL_SOCK_Connector.i b/ace/SSL/SSL_SOCK_Connector.i
index f216828c622..67b5ef01540 100644
--- a/ace/SSL/SSL_SOCK_Connector.i
+++ b/ace/SSL/SSL_SOCK_Connector.i
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SSL_SOCK_Connector.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (void)
@@ -23,3 +24,5 @@ ACE_SSL_SOCK_Connector::dump (void) const
   ACE_TRACE ("ACE_SSL_SOCK_Connector::dump");
   this->connector_.dump ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index fa50a8a5a62..f5ba831ad17 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -5,6 +5,7 @@
 #include "ace/Countdown_Time.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_select.h"
+#include "ace/OS_Memory.h"
 
 #include <openssl/err.h>
 
@@ -18,6 +19,8 @@ ACE_RCSID (ACE_SSL,
            SSL_SOCK_Stream,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Stream)
 
 ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
@@ -155,12 +158,11 @@ ACE_SSL_SOCK_Stream::recvv (iovec *io_vec,
       break;
     }
 
-  u_long inlen;
-
+  int inlen;
 
   if (ACE_OS::ioctl (this->get_handle (),
                      FIONREAD,
-                     (u_long *) &inlen) == -1)
+                     &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
@@ -586,3 +588,5 @@ ACE_SSL_SOCK_Stream::get_remote_addr (ACE_Addr &addr) const
 
   return -1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h
index abace05d58f..a58d91e7c4b 100644
--- a/ace/SSL/SSL_SOCK_Stream.h
+++ b/ace/SSL/SSL_SOCK_Stream.h
@@ -34,6 +34,7 @@
 
 #include "ace/SOCK_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_SSL_SOCK_Stream
@@ -309,6 +310,8 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SSL_SOCK_Stream.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i
index b80cd3e2884..352aca04b3e 100644
--- a/ace/SSL/SSL_SOCK_Stream.i
+++ b/ace/SSL/SSL_SOCK_Stream.i
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void
 ACE_SSL_SOCK_Stream::set_handle (ACE_HANDLE fd)
 {
@@ -317,3 +319,5 @@ ACE_SSL_SOCK_Stream::ssl (void) const
 {
   return this->ssl_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 0d3ba9efef0..1c03657398f 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
+#include "ace/OS_Memory.h"
 #if !defined (ACE_HAS_WINCE)
 //# include "ace/Service_Config.h"
 #endif /* !ACE_HAS_WINCE */
@@ -24,6 +25,8 @@ ACE_RCSID (ace,
 
 // ************************************************************
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 ACE_OSTREAM_TYPE &
 operator<< (ACE_OSTREAM_TYPE &os, const ACE_CString &cs)
@@ -532,31 +535,9 @@ EXIT_LABEL:
 
 // *************************************************************
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_String_Base<char>;
-template ACE_String_Base<char> operator + (const ACE_String_Base<char> &,
-                                           const ACE_String_Base<char> &);
-template ACE_String_Base<char> operator + (const ACE_String_Base<char> &,
-                                           const char *);
-template ACE_String_Base<char> operator + (const char *,
-                                           const ACE_String_Base<char> &);
-template class ACE_String_Base<ACE_WSTRING_TYPE>;
-template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &,
-                                                       const ACE_String_Base<ACE_WSTRING_TYPE> &);
-template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &,
-                                                       const ACE_WSTRING_TYPE *);
-template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,
-                                                       const ACE_String_Base<ACE_WSTRING_TYPE> &);
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_String_Base<char>
-#pragma instantiate ACE_String_Base<char> operator + (const ACE_String_Base<char> &, const ACE_String_Base<char> &)
-#pragma instantiate ACE_String_Base<char> operator + (const ACE_String_Base<char> &, const char *)
-#pragma instantiate ACE_String_Base<char> operator + (const char *,const ACE_String_Base<char> &)
-#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE>
-#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_String_Base<ACE_WSTRING_TYPE> &)
-#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_WSTRING_TYPE *)
-#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,const ACE_String_Base<ACE_WSTRING_TYPE> &)
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template char ACE_String_Base<char>::NULL_String_;
 template ACE_WSTRING_TYPE ACE_String_Base<ACE_WSTRING_TYPE>::NULL_String_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SString.h b/ace/SString.h
index f2f79014cc4..1d3f389b70f 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -28,10 +28,14 @@
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 #include "ace/iosfwd.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Export ACE_OSTREAM_TYPE &operator << (ACE_OSTREAM_TYPE &, const ACE_CString &);
 ACE_Export ACE_OSTREAM_TYPE &operator << (ACE_OSTREAM_TYPE &, const ACE_WString &);
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class ACE_Export ACE_String_Base<char>;
 template class ACE_Export ACE_String_Base<ACE_WSTRING_TYPE>;
@@ -265,7 +269,7 @@ public:
    * \a buffer will be parsed.  Notice that ACE_Tokenizer will modify
    * \a buffer if you use <code> delimiter_replace </code> or <code>
    * preserve_designators </code> to do character substitution.
-   * NOTE: You should NOT pass a constant string or string literal
+   * @note You should NOT pass a constant string or string literal
    * to this constructor, since ACE_Tokenizer will try to modify
    * the string.
    * \sa preserve_designators
@@ -479,6 +483,8 @@ private:
   char* p_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SString.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SString.inl b/ace/SString.inl
index a985c5456af..395623910a0 100644
--- a/ace/SString.inl
+++ b/ace/SString.inl
@@ -9,6 +9,10 @@
 #  include "ace/ACE.h"
 #endif /* !ACE_ACE_H */
 
+#include "ace/OS_NS_stdlib.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_NS_WString::ACE_NS_WString (ACE_Allocator *alloc)
   : ACE_WString (alloc)
@@ -290,3 +294,5 @@ ACE_Auto_String_Free::release (void)
   this->p_ = 0;
   return p;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SStringfwd.h b/ace/SStringfwd.h
index 20e4b3011d2..8910233ed56 100644
--- a/ace/SStringfwd.h
+++ b/ace/SStringfwd.h
@@ -25,6 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class CHAR> class ACE_String_Base;  // Forward declaration.
 
@@ -41,6 +42,8 @@ typedef ACE_WString ACE_TString;
 typedef ACE_CString ACE_TString;
 #endif /* ACE_USES_WCHAR */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* ACE_SSTRINGFWD_H */
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index 2f6e69fcc3d..c522f18d64b 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations)
   : ACE_POSIX_AIOCB_Proactor (max_aio_operations,
                               ACE_POSIX_Proactor::PROACTOR_SUN),
@@ -315,6 +317,8 @@ ACE_POSIX_Proactor::Proactor_Type
 ACE_SUN_Proactor::get_impl_type (void)
 {
   return PROACTOR_SUN;
-} 
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_AIO_CALLS && sun */
diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h
index fce65b40541..9d104355578 100644
--- a/ace/SUN_Proactor.h
+++ b/ace/SUN_Proactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/POSIX_Proactor.h"
 #include /**/ <sys/asynch.h>    // Sun native aio calls
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SUN_Proactor
  *
@@ -47,16 +49,16 @@
  * it has the following structure:
  * typedef struct aiocb
  * {
- * int 		aio_fildes;     File descriptor
- * void		*aio_buf;       buffer location
+ * int          aio_fildes;     File descriptor
+ * void         *aio_buf;       buffer location
  * size_t       aio_nbytes;     length of transfer
  * off_t        aio_offset;     file offset
- * int	        aio_reqprio;    request priority offset
+ * int          aio_reqprio;    request priority offset
  * sigevent     aio_sigevent;   signal number and offset
- * int 		aio_lio_opcode; listio operation
- * aio_result_t	aio_resultp;    results
- * int 		aio_state;      state flag for List I/O
- * int		aio__pad[1];    extension padding
+ * int          aio_lio_opcode; listio operation
+ * aio_result_t aio_resultp;    results
+ * int          aio_state;      state flag for List I/O
+ * int          aio__pad[1];    extension padding
  * };
  */
 class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor
@@ -118,5 +120,7 @@ protected:
   ACE_SYNCH_CONDITION condition_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_AIO_CALLS && sun */
 #endif /* ACE_SUN_PROACTOR_H*/
diff --git a/ace/SV_Message.cpp b/ace/SV_Message.cpp
index f8ace600ab3..15368235910 100644
--- a/ace/SV_Message.cpp
+++ b/ace/SV_Message.cpp
@@ -9,6 +9,8 @@
 
 ACE_RCSID(ace, SV_Message, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message)
 
 void
@@ -19,3 +21,4 @@ ACE_SV_Message::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Message.h b/ace/SV_Message.h
index 2151329bd5c..04a9e20c12b 100644
--- a/ace/SV_Message.h
+++ b/ace/SV_Message.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SV_Message
  *
@@ -53,6 +55,9 @@ protected:
   long type_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+
 #if defined (__ACE_INLINE__)
 #include "ace/SV_Message.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SV_Message.inl b/ace/SV_Message.inl
index 51c035370b8..3f698bd5071 100644
--- a/ace/SV_Message.inl
+++ b/ace/SV_Message.inl
@@ -1,11 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SV_Message.i
-
 #include "ace/Global_Macros.h"
 #include "ace/config-all.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SV_Message::ACE_SV_Message (long t)
   : type_ (t)
@@ -32,3 +33,5 @@ ACE_SV_Message::type (long t)
   ACE_TRACE ("ACE_SV_Message::type");
   this->type_ = t;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp
index 3e57373e18d..1be06f0f8cc 100644
--- a/ace/SV_Message_Queue.cpp
+++ b/ace/SV_Message_Queue.cpp
@@ -9,6 +9,8 @@
 
 ACE_RCSID(ace, SV_Message_Queue, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue)
 
 void
@@ -30,11 +32,13 @@ ACE_SV_Message_Queue::~ACE_SV_Message_Queue (void)
 }
 
 ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id,
-					    int create,
-					    int perms)
+                                            int create,
+                                            int perms)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue");
   if (this->open (external_id, create, perms) == -1)
     ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"),
-		ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue")));
+                ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index ac36423a463..42fd8f08693 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -26,6 +26,8 @@
 #include "ace/os_include/sys/os_ipc.h"
 #include "ace/Default_Constants.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SV_Message_Queue
  *
@@ -92,6 +94,8 @@ protected:
   int internal_id_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SV_Message_Queue.inl b/ace/SV_Message_Queue.inl
index 63585329b87..b84f6379901 100644
--- a/ace/SV_Message_Queue.inl
+++ b/ace/SV_Message_Queue.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_sys_msg.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Open a message queue using the <external_id>.
 
 ACE_INLINE int
@@ -28,7 +31,7 @@ ACE_SV_Message_Queue::control (int option, void *arg)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::control");
   return ACE_OS::msgctl (this->internal_id_, option,
-			 (struct msqid_ds *) arg);
+                         (struct msqid_ds *) arg);
 }
 
 ACE_INLINE int
@@ -56,22 +59,23 @@ ACE_SV_Message_Queue::set_id (int id)
 
 ACE_INLINE ssize_t
 ACE_SV_Message_Queue::recv (ACE_SV_Message &mb,
-			    int length,
-			    long type,
-			    int mflags)
+                            int length,
+                            long type,
+                            int mflags)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::recv");
   return ACE_OS::msgrcv (this->internal_id_, (void *) &mb,
-			 length, type, mflags);
+                         length, type, mflags);
 }
 
 ACE_INLINE int
 ACE_SV_Message_Queue::send (const ACE_SV_Message &mb,
-			    int length,
-			    int mflags)
+                            int length,
+                            int mflags)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::send");
   return ACE_OS::msgsnd (this->internal_id_, (void *) &mb,
-			 length, mflags);
+                         length, mflags);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp
index cb81d8838f3..ce3c0b07858 100644
--- a/ace/SV_Semaphore_Complex.cpp
+++ b/ace/SV_Semaphore_Complex.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID(ace, SV_Semaphore_Complex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex)
 
 void
@@ -27,46 +29,46 @@ const int ACE_SV_Semaphore_Complex::BIGCOUNT_ = 10000;
 // Define the ACE_SV_Semaphore operation arrays for the semop() calls.
 sembuf ACE_SV_Semaphore_Complex::op_lock_[2] =
 {
-  {0, 0, 0},			// Wait for [0] (lock) to equal 0
-  {0, 1, SEM_UNDO},		// then increment [0] to 1 - this locks it.
+  {0, 0, 0},                    // Wait for [0] (lock) to equal 0
+  {0, 1, SEM_UNDO},             // then increment [0] to 1 - this locks it.
                                 // UNDO to release the lock if processes exit
-				// before explicitly unlocking.
+                                // before explicitly unlocking.
 };
 
 sembuf ACE_SV_Semaphore_Complex::op_endcreate_[2] =
 {
-  {1, -1, SEM_UNDO},		// Decrement [1] (proc counter) with undo on
+  {1, -1, SEM_UNDO},            // Decrement [1] (proc counter) with undo on
                                 // exit, UNDO to adjust proc counter if
-				// process exits before explicitly calling close()
-  {0, -1, SEM_UNDO},		// the decrement [0] (lock) back to 0
+                                // process exits before explicitly calling close()
+  {0, -1, SEM_UNDO},            // the decrement [0] (lock) back to 0
 };
 
 sembuf ACE_SV_Semaphore_Complex::op_open_[1] =
 {
-  {1, -1, SEM_UNDO},		// Decrement [1] (proc counter) with undo on
+  {1, -1, SEM_UNDO},            // Decrement [1] (proc counter) with undo on
                                 // exit.
 };
 
 sembuf ACE_SV_Semaphore_Complex::op_close_[3] =
 {
-  {0, 0, 0},			// Wait for [0] (lock) to equal 0
-  {0, 1, SEM_UNDO},		// then increment [0] to 1 - this lock it
-  {1, 1, SEM_UNDO},		// then increment [1] (proc counter)
+  {0, 0, 0},                    // Wait for [0] (lock) to equal 0
+  {0, 1, SEM_UNDO},             // then increment [0] to 1 - this lock it
+  {1, 1, SEM_UNDO},             // then increment [1] (proc counter)
 };
 
 sembuf ACE_SV_Semaphore_Complex::op_unlock_[1] =
 {
-  {0, -1, SEM_UNDO},		// Decrement [0] (lock) back to 0
+  {0, -1, SEM_UNDO},            // Decrement [0] (lock) back to 0
 };
 
 // Open or create an array of SV_Semaphores.  We return 0 if all is OK, else -1.
 
 int
 ACE_SV_Semaphore_Complex::open (key_t k,
-				int create,
-				int initial_value,
-				u_short nsems,
-				int perms)
+                                short create,
+                                int initial_value,
+                                u_short nsems,
+                                mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::open");
   if (k == IPC_PRIVATE)
@@ -83,35 +85,35 @@ ACE_SV_Semaphore_Complex::open (key_t k,
       int result;
 
       do
-	{
-	  this->internal_id_ = ACE_OS::semget
+        {
+          this->internal_id_ = ACE_OS::semget
             (this->key_,
              (u_short) 2 + nsems,
              perms | ACE_SV_Semaphore_Complex::ACE_CREATE);
 
-	  if (this->internal_id_ == -1)
-	    return -1; // permission problem or tables full
-
-	  // When the <ACE_SV_Semaphore_Complex> is created, we know
-	  // that the value of all 3 members is 0.  Get a lock on the
-	  // <ACE_SV_Semaphore_Complex> by waiting for [0] to equal 0,
-	  // then increment it.
-
-	  // There is a race condition here. There is the possibility
-	  // that between the <semget> above and the <semop> below,
-	  // another process can call out <close> function which can
-	  // remove the <ACE_SV_Semaphore> if that process is the last
-	  // one using it.  Therefor we handle the error condition of
-	  // an invalid <ACE_SV_Semaphore> ID specifically below, and
-	  // if it does happen, we just go back and create it again.
-	  result = ACE_OS::semop (this->internal_id_,
-				  &ACE_SV_Semaphore_Complex::op_lock_[0],
-				  2);
-	}
+          if (this->internal_id_ == -1)
+            return -1; // permission problem or tables full
+
+          // When the <ACE_SV_Semaphore_Complex> is created, we know
+          // that the value of all 3 members is 0.  Get a lock on the
+          // <ACE_SV_Semaphore_Complex> by waiting for [0] to equal 0,
+          // then increment it.
+
+          // There is a race condition here. There is the possibility
+          // that between the <semget> above and the <semop> below,
+          // another process can call out <close> function which can
+          // remove the <ACE_SV_Semaphore> if that process is the last
+          // one using it.  Therefor we handle the error condition of
+          // an invalid <ACE_SV_Semaphore> ID specifically below, and
+          // if it does happen, we just go back and create it again.
+          result = ACE_OS::semop (this->internal_id_,
+                                  &ACE_SV_Semaphore_Complex::op_lock_[0],
+                                  2);
+        }
       while (result == -1 && (errno == EINVAL || errno == EIDRM));
 
       if (result == -1)
-	return -1;
+        return -1;
 
       // Get the value of the process counter. If it equals 0, then no
       // one has initialized the ACE_SV_Semaphore yet.
@@ -119,53 +121,53 @@ ACE_SV_Semaphore_Complex::open (key_t k,
       int semval = ACE_SV_Semaphore_Simple::control (GETVAL, 0, 1);
 
       if (semval == -1)
-	return this->init ();
+        return this->init ();
       else if (semval == 0)
-	{
-	  // We should initialize by doing a SETALL, but that would
-	  // clear the adjust value that we set when we locked the
-	  // ACE_SV_Semaphore above. Instead we do system calls to
-	  // initialize [1], as well as all the nsems SV_Semaphores.
-
-	  if (ACE_SV_Semaphore_Simple::control (SETVAL,
-						ACE_SV_Semaphore_Complex::BIGCOUNT_,
-						1) == -1)
-	    return -1;
-	  else
-	    for (u_short i = 0; i < nsems; i++)
-	      if (this->control (SETVAL, initial_value, i) == -1)
-		return -1;
-	}
+        {
+          // We should initialize by doing a SETALL, but that would
+          // clear the adjust value that we set when we locked the
+          // ACE_SV_Semaphore above. Instead we do system calls to
+          // initialize [1], as well as all the nsems SV_Semaphores.
+
+          if (ACE_SV_Semaphore_Simple::control (SETVAL,
+                                                ACE_SV_Semaphore_Complex::BIGCOUNT_,
+                                                1) == -1)
+            return -1;
+          else
+            for (u_short i = 0; i < nsems; i++)
+              if (this->control (SETVAL, initial_value, i) == -1)
+                return -1;
+        }
 
       // Decrement the process counter and then release the lock.
       return ACE_OS::semop (this->internal_id_,
-			    &ACE_SV_Semaphore_Complex::op_endcreate_[0],
-			    2);
+                            &ACE_SV_Semaphore_Complex::op_endcreate_[0],
+                            2);
     }
   else
     {
       this->internal_id_ = ACE_OS::semget (this->key_, 2 + nsems, 0);
       if (this->internal_id_ == -1)
-	return -1;			// doesn't exist or tables full
+        return -1;                      // doesn't exist or tables full
 
       // Decrement the process counter. We don't need a lock to do this.
       if (ACE_OS::semop (this->internal_id_,
-			 &ACE_SV_Semaphore_Complex::op_open_[0], 1) < 0)
-	return this->init ();
+                         &ACE_SV_Semaphore_Complex::op_open_[0], 1) < 0)
+        return this->init ();
       return 0;
     }
 }
 
 int
 ACE_SV_Semaphore_Complex::open (const char *name,
-				int flags,
-				int initial_value,
-				u_short nsems,
-				int perms)
+                                short flags,
+                                int initial_value,
+                                u_short nsems,
+                                mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::open");
   return this->open (ACE_SV_Semaphore_Simple::name_2_key (name),
-		     flags, initial_value, nsems, perms);
+                     flags, initial_value, nsems, perms);
 }
 
 // Close a ACE_SV_Semaphore.  Unlike the remove above, this function
@@ -187,8 +189,8 @@ ACE_SV_Semaphore_Complex::close (void)
   // then increments [1] - the process number.
 
   if (ACE_OS::semop (this->internal_id_,
-		     &ACE_SV_Semaphore_Complex::op_close_[0],
-		     3) == -1)
+                     &ACE_SV_Semaphore_Complex::op_close_[0],
+                     3) == -1)
     return -1;
 
   // Now that we have a lock, read the value of the process counter to
@@ -205,17 +207,17 @@ ACE_SV_Semaphore_Complex::close (void)
   else
     {
       int result = ACE_OS::semop (this->internal_id_,
-				  &ACE_SV_Semaphore_Complex::op_unlock_[0], 1);
+                                  &ACE_SV_Semaphore_Complex::op_unlock_[0], 1);
       this->init ();
       return result;
     }
 }
 
 ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k,
-						    int flags,
-						    int initial_value,
-						    u_short nsems,
-						    int perms)
+                                                    short flags,
+                                                    int initial_value,
+                                                    u_short nsems,
+                                                    mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex");
   if (this->open (k, flags, initial_value, nsems, perms) == -1)
@@ -223,10 +225,10 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k,
 }
 
 ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name,
-						    int flags,
-						    int initial_value,
-						    u_short nsems,
-						    int perms)
+                                                    short flags,
+                                                    int initial_value,
+                                                    u_short nsems,
+                                                    mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex");
 
@@ -253,3 +255,5 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (void)
   ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex");
   this->init ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 6278fb694c9..de48fc09359 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SV_Semaphore_Complex
  *
@@ -61,32 +63,32 @@ public:
   // = Initialization and termination methods.
   ACE_SV_Semaphore_Complex (void);
   ACE_SV_Semaphore_Complex (key_t key,
-                            int create = ACE_SV_Semaphore_Complex::ACE_CREATE,
+                            short create = ACE_SV_Semaphore_Complex::ACE_CREATE,
                             int initial_value = 1,
                             u_short nsems = 1,
-                            int perms = ACE_DEFAULT_FILE_PERMS);
+                            mode_t perms = ACE_DEFAULT_FILE_PERMS);
   ACE_SV_Semaphore_Complex (const char *name,
-                            int create = ACE_SV_Semaphore_Complex::ACE_CREATE,
+                            short create = ACE_SV_Semaphore_Complex::ACE_CREATE,
                             int initial_value = 1,
                             u_short nsems = 1,
-                            int perms = ACE_DEFAULT_FILE_PERMS);
+                            mode_t perms = ACE_DEFAULT_FILE_PERMS);
   ~ACE_SV_Semaphore_Complex (void);
 
   /// Open or create an array of SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
   int open (const char *name,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
+            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   /// Open or create an array of SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
   int open (key_t key,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
+            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   /**
    * Close an ACE_SV_Semaphore. Unlike the <remove> method, this
@@ -100,28 +102,28 @@ public:
   // = Semaphore acquire and release methods.
 
   /// Acquire the semaphore.
-  int acquire (u_short n = 0, int flags = 0) const;
+  int acquire (u_short n = 0, short flags = 0) const;
 
   /// Acquire a semaphore for reading.
-  int acquire_read (u_short n = 0, int flags = 0) const;
+  int acquire_read (u_short n = 0, short flags = 0) const;
 
   /// Acquire a semaphore for writing
-  int acquire_write (u_short n = 0, int flags = 0) const;
+  int acquire_write (u_short n = 0, short flags = 0) const;
 
   /// Try to acquire the semaphore.
-  int tryacquire (u_short n = 0, int flags = 0) const;
+  int tryacquire (u_short n = 0, short flags = 0) const;
 
   /// Try to acquire the semaphore for reading.
-  int tryacquire_read (u_short n = 0, int flags = 0) const;
+  int tryacquire_read (u_short n = 0, short flags = 0) const;
 
   /// Try to acquire the semaphore for writing.
-  int tryacquire_write (u_short n = 0, int flags = 0) const;
+  int tryacquire_write (u_short n = 0, short flags = 0) const;
 
   /// Release the semaphore.
-  int release (u_short n = 0, int flags = 0) const;
+  int release (u_short n = 0, short flags = 0) const;
 
   // = Semaphore operation methods.
-  int op (int val, u_short n = 0, int flags = 0) const;
+  int op (short val, u_short n = 0, short flags = 0) const;
   int op (sembuf op_vec[], u_short n) const;
 
   // = Semaphore control methods.
@@ -129,8 +131,8 @@ public:
   int control (int cmd, int value = 0, u_short n = 0) const;
 
   // = Upgrade access control...
-  ACE_USING ACE_SV_Semaphore_Simple::get_id;
-  ACE_USING ACE_SV_Semaphore_Simple::remove;
+  using ACE_SV_Semaphore_Simple::get_id;
+  using ACE_SV_Semaphore_Simple::remove;
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -147,6 +149,8 @@ private:
   static sembuf op_unlock_[1];
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SV_Semaphore_Complex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SV_Semaphore_Complex.inl b/ace/SV_Semaphore_Complex.inl
index 00c3450c1bd..8b80748ebf5 100644
--- a/ace/SV_Semaphore_Complex.inl
+++ b/ace/SV_Semaphore_Complex.inl
@@ -1,57 +1,60 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::acquire (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire");
   return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::acquire_read (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read");
   return this->acquire (n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::acquire_write (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write");
   return this->acquire (n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::tryacquire (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire");
   return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read");
   return this->tryacquire (n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write");
   return this->tryacquire (n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::release (u_short n, int flags) const
+ACE_SV_Semaphore_Complex::release (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::release");
   return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const
+ACE_SV_Semaphore_Complex::op (short val, u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::op");
   return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags);
@@ -77,3 +80,5 @@ ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const
   ACE_TRACE ("ACE_SV_Semaphore_Complex::control");
   return ACE_SV_Semaphore_Simple::control (cmd, value, (u_short) n + 2);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 5fb1260144c..3156338c44b 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -11,8 +11,9 @@ ACE_RCSID (ace,
            SV_Semaphore_Simple,
            "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple)
 
 void
 ACE_SV_Semaphore_Simple::dump (void) const
@@ -55,7 +56,7 @@ ACE_SV_Semaphore_Simple::init (key_t k, int i)
 // specific amount (positive or negative; amount can`t be zero).
 
 int
-ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
+ACE_SV_Semaphore_Simple::op (short val, u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::op");
   sembuf op_op;
@@ -76,10 +77,10 @@ ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
 
 int
 ACE_SV_Semaphore_Simple::open (key_t k,
-                               int flags,
+                               short flags,
                                int initial_value,
                                u_short n,
-                               int perms)
+                               mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
   union semun ivalue;
@@ -105,10 +106,10 @@ ACE_SV_Semaphore_Simple::open (key_t k,
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
-                                                  int flags,
+                                                  short flags,
                                                   int initial_value,
                                                   u_short n,
-                                                  int perms)
+                                                  mode_t perms)
   : key_ (k)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
@@ -153,10 +154,10 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 
 int
 ACE_SV_Semaphore_Simple::open (const char *name,
-                               int flags,
+                               short flags,
                                int initial_value,
                                u_short n,
-                               int perms)
+                               mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
 
@@ -171,10 +172,10 @@ ACE_SV_Semaphore_Simple::open (const char *name,
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
-                                                  int flags,
+                                                  short flags,
                                                   int initial_value,
                                                   u_short n,
-                                                  int perms)
+                                                  mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   if (this->open (name,
@@ -188,10 +189,10 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
 }
 
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
-                                                  int flags,
+                                                  short flags,
                                                   int initial_value,
                                                   u_short nsems,
-                                                  int perms)
+                                                  mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple(wchar_t)");
   if (this->open (ACE_TEXT_TO_CHAR_IN (name),
@@ -230,3 +231,5 @@ ACE_SV_Semaphore_Simple::remove (void) const
   ((ACE_SV_Semaphore_Simple *) this)->init ();
   return result;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index 02d0da8ed12..d2c82b71181 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -38,6 +38,8 @@
 #  endif /* ACE_DEFAULT_SEM_KEY */
 #endif /* ACE_WIN32 */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SV_Semaphore_Simple
  *
@@ -58,43 +60,43 @@ public:
   // = Initialization and termination methods.
   ACE_SV_Semaphore_Simple (void);
   ACE_SV_Semaphore_Simple (key_t key,
-                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+                           short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
                            int initial_value = 1,
                            u_short nsems = 1,
-                           int perms = ACE_DEFAULT_FILE_PERMS);
+                           mode_t perms = ACE_DEFAULT_FILE_PERMS);
   ACE_SV_Semaphore_Simple (const char *name,
-                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+                           short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
                            int initial_value = 1,
                            u_short nsems = 1,
-                           int perms = ACE_DEFAULT_FILE_PERMS);
+                           mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   ACE_SV_Semaphore_Simple (const wchar_t *name,
-                           int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+                           short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
                            int initial_value = 1,
                            u_short nsems = 1,
-                           int perms = ACE_DEFAULT_FILE_PERMS);
+                           mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   ~ACE_SV_Semaphore_Simple (void);
 
   int open (const char *name,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
+            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   int open (const wchar_t *name,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
+            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   /// Open or create one or more SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
   int open (key_t key,
-            int flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
+            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
-            int perms = ACE_DEFAULT_FILE_PERMS);
+            mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   /// Close a ACE_SV_Semaphore, marking it as invalid for subsequent
   /// operations...
@@ -115,31 +117,31 @@ public:
    * decrement it by 1 and return. Dijkstra's P operation, Tannenbaums
    * DOWN operation.
    */
-  int acquire (u_short n = 0, int flags = 0) const;
+  int acquire (u_short n = 0, short flags = 0) const;
 
   /// Acquire a semaphore for reading.
-  int acquire_read (u_short n = 0, int flags = 0) const;
+  int acquire_read (u_short n = 0, short flags = 0) const;
 
   /// Acquire a semaphore for writing
-  int acquire_write (u_short n = 0, int flags = 0) const;
+  int acquire_write (u_short n = 0, short flags = 0) const;
 
   /// Non-blocking version of <acquire>.
-  int tryacquire (u_short n = 0, int flags = 0) const;
+  int tryacquire (u_short n = 0, short flags = 0) const;
 
   /// Try to acquire the semaphore for reading.
-  int tryacquire_read (u_short n = 0, int flags = 0) const;
+  int tryacquire_read (u_short n = 0, short flags = 0) const;
 
   /// Try to acquire the semaphore for writing.
-  int tryacquire_write (u_short n = 0, int flags = 0) const;
+  int tryacquire_write (u_short n = 0, short flags = 0) const;
 
   /// Increment ACE_SV_Semaphore by one. Dijkstra's V operation,
   /// Tannenbaums UP operation.
-  int release (u_short n = 0, int flags = 0) const;
+  int release (u_short n = 0, short flags = 0) const;
 
   // = Semaphore operation methods.
   /// General ACE_SV_Semaphore operation. Increment or decrement by a
   /// specific amount (positive or negative; amount can`t be zero).
-  int op (int val, u_short semnum = 0, int flags = SEM_UNDO) const;
+  int op (short val, u_short semnum = 0, short flags = SEM_UNDO) const;
 
   /// General ACE_SV_Semaphore operation on an array of SV_Semaphores.
   int op (sembuf op_vec[], u_short nsems) const;
@@ -181,6 +183,8 @@ protected:
   key_t name_2_key (const char *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SV_Semaphore_Simple.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SV_Semaphore_Simple.inl b/ace/SV_Semaphore_Simple.inl
index 46122d4e140..81a828b4401 100644
--- a/ace/SV_Semaphore_Simple.inl
+++ b/ace/SV_Semaphore_Simple.inl
@@ -1,19 +1,20 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SV_Semaphore_Simple.i
-
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Semaphores don't offer wide-char names, so convert the name and forward
 // to the narrow-char open().
 ACE_INLINE int
 ACE_SV_Semaphore_Simple::open (const wchar_t *name,
-                               int flags,
+                               short flags,
                                int initial_value,
                                u_short nsems,
-                               int perms)
+                               mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open (wchar_t)");
   return this->open (ACE_TEXT_TO_CHAR_IN (name),
@@ -25,8 +26,8 @@ ACE_SV_Semaphore_Simple::open (const wchar_t *name,
 
 ACE_INLINE int
 ACE_SV_Semaphore_Simple::control (int cmd,
-				  semun arg,
-				  u_short n) const
+                                  semun arg,
+                                  u_short n) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::control");
   return this->internal_id_ == -1 ?
@@ -58,21 +59,21 @@ ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const
 // DOWN operation.
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::acquire (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::acquire (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire");
   return this->op (-1, n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::acquire_read (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::acquire_read (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_read");
   return this->acquire (n, flags);
 }
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::acquire_write (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_write");
   return this->acquire (n, flags);
@@ -81,7 +82,7 @@ ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const
 // Non-blocking version of acquire().
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::tryacquire (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire");
   return this->op (-1, n, flags | IPC_NOWAIT);
@@ -90,7 +91,7 @@ ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const
 // Non-blocking version of acquire().
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_read");
   return this->tryacquire (n, flags);
@@ -99,7 +100,7 @@ ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const
 // Non-blocking version of acquire().
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_write");
   return this->tryacquire (n, flags);
@@ -109,7 +110,7 @@ ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const
 // Tannenbaums UP operation.
 
 ACE_INLINE int
-ACE_SV_Semaphore_Simple::release (u_short n, int flags) const
+ACE_SV_Semaphore_Simple::release (u_short n, short flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::release");
   return this->op (1, n, flags);
@@ -122,3 +123,4 @@ ACE_SV_Semaphore_Simple::get_id (void) const
   return this->internal_id_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp
index 5a9d33e934f..ab56249cbe6 100644
--- a/ace/SV_Shared_Memory.cpp
+++ b/ace/SV_Shared_Memory.cpp
@@ -1,4 +1,3 @@
-// SV_Shared_Memory.cpp
 // $Id$
 
 #include "ace/SV_Shared_Memory.h"
@@ -10,6 +9,8 @@
 
 ACE_RCSID(ace, SV_Shared_Memory, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory)
 
 void
@@ -25,11 +26,11 @@ ACE_SV_Shared_Memory::dump (void) const
 
 int
 ACE_SV_Shared_Memory::open_and_attach (key_t external_id,
-				       size_t sz,
-				       int create,
-				       int perms,
-				       void *virtual_addr,
-				       int flags)
+                                       size_t sz,
+                                       int create,
+                                       int perms,
+                                       void *virtual_addr,
+                                       int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::open_and_attach");
   if (this->open (external_id, sz, create, perms) == -1)
@@ -43,17 +44,17 @@ ACE_SV_Shared_Memory::open_and_attach (key_t external_id,
 // Constructor interface to this->open_and_attach () member function.
 
 ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id,
-					    size_t sz,
-					    int create,
-					    int perms,
-					    void *virtual_addr,
-					    int flags)
+                                            size_t sz,
+                                            int create,
+                                            int perms,
+                                            void *virtual_addr,
+                                            int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
   if (this->open_and_attach (external_id, sz, create,
-			     perms, virtual_addr, flags) == -1)
+                             perms, virtual_addr, flags) == -1)
     ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"),
-		ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
+                ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
 }
 
 // The "do nothing" constructor.
@@ -74,12 +75,14 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void)
 // (maw@fsg.com).
 
 ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id,
-					    int flags)
+                                            int flags)
   : internal_id_ (int_id),
     size_ (0)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
   if (this->attach (0, flags) == -1)
     ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"),
-		ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
+                ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h
index 0cbb8febe7e..4f4da514c45 100644
--- a/ace/SV_Shared_Memory.h
+++ b/ace/SV_Shared_Memory.h
@@ -15,12 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,12 +25,14 @@
 #include "ace/os_include/sys/os_ipc.h"
 #include "ace/Default_Constants.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SV_Shared_Memory
  *
  * @brief This is a wrapper for System V shared memory.
  */
-class ACE_Memory_Export ACE_SV_Shared_Memory
+class ACE_Export ACE_SV_Shared_Memory
 {
 public:
   enum
@@ -114,6 +111,8 @@ protected:
   size_t round_up (size_t len);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/SV_Shared_Memory.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SV_Shared_Memory.inl b/ace/SV_Shared_Memory.inl
index f01f5b2c969..3aaa41414e0 100644
--- a/ace/SV_Shared_Memory.inl
+++ b/ace/SV_Shared_Memory.inl
@@ -1,12 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// SV_Shared_Memory.i
-
 #include "ace/OS_NS_sys_shm.h"
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE size_t
 ACE_SV_Shared_Memory::round_up (size_t len)
 {
@@ -17,15 +18,15 @@ ACE_SV_Shared_Memory::round_up (size_t len)
 // Creates a shared memory segment of SIZE bytes. Does *not* attach
 // this memory segment...
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_SV_Shared_Memory::open (key_t external_id, size_t sz, int create, int perms)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::open");
 #if defined (ACE_WIN32)
-	ACE_UNUSED_ARG(perms);
-	ACE_UNUSED_ARG(create);
-	ACE_UNUSED_ARG(sz);
-	ACE_UNUSED_ARG(external_id);
+        ACE_UNUSED_ARG(perms);
+        ACE_UNUSED_ARG(create);
+        ACE_UNUSED_ARG(sz);
+        ACE_UNUSED_ARG(external_id);
   ACE_NOTSUP_RETURN (-1);
 #else
   this->segment_ptr_ = 0;
@@ -37,15 +38,15 @@ ACE_SV_Shared_Memory::open (key_t external_id, size_t sz, int create, int perms)
 #endif /* ACE_WIN32 */
 }
 
-// Attachs to the shared memory segment. 
+// Attachs to the shared memory segment.
 
 ACE_INLINE int
 ACE_SV_Shared_Memory::attach (void *virtual_addr, int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::attach");
 #if defined (ACE_WIN32)
-	ACE_UNUSED_ARG(flags);
-	ACE_UNUSED_ARG(virtual_addr);
+        ACE_UNUSED_ARG(flags);
+        ACE_UNUSED_ARG(virtual_addr);
   ACE_NOTSUP_RETURN (-1);
 #else
   this->segment_ptr_ = ACE_OS::shmat (this->internal_id_, virtual_addr, flags);
@@ -53,23 +54,23 @@ ACE_SV_Shared_Memory::attach (void *virtual_addr, int flags)
 #endif /* ACE_WIN32 */
 }
 
-// Interface to the underlying shared memory control function. 
+// Interface to the underlying shared memory control function.
 
 ACE_INLINE int
 ACE_SV_Shared_Memory::control (int cmd, void *buf)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::control");
 #if defined (ACE_WIN32)
-	ACE_UNUSED_ARG(cmd);
-	ACE_UNUSED_ARG(buf);
-	
-	ACE_NOTSUP_RETURN (-1);
+        ACE_UNUSED_ARG(cmd);
+        ACE_UNUSED_ARG(buf);
+
+        ACE_NOTSUP_RETURN (-1);
 #else
   return ACE_OS::shmctl (this->internal_id_, cmd, (struct shmid_ds *) buf);
 #endif /* ACE_WIN32 */
 }
 
-// The overall size of the segment. 
+// The overall size of the segment.
 
 ACE_INLINE size_t
 ACE_SV_Shared_Memory::get_segment_size (void) const
@@ -78,7 +79,7 @@ ACE_SV_Shared_Memory::get_segment_size (void) const
   return this->size_;
 }
 
-// Removes the shared memory segment. 
+// Removes the shared memory segment.
 
 ACE_INLINE int
 ACE_SV_Shared_Memory::remove (void)
@@ -114,3 +115,5 @@ ACE_SV_Shared_Memory::get_id (void) const
   ACE_TRACE ("ACE_SV_Shared_Memory::get_id");
   return this->internal_id_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sample_History.cpp b/ace/Sample_History.cpp
index fac82d844e1..ffa138571d0 100644
--- a/ace/Sample_History.cpp
+++ b/ace/Sample_History.cpp
@@ -12,6 +12,9 @@
 
 ACE_RCSID(ace, Sample_History, "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Sample_History::ACE_Sample_History (size_t max_samples)
   : max_samples_ (max_samples)
   , sample_count_ (0)
@@ -58,3 +61,5 @@ ACE_Sample_History::collect_basic_stats (ACE_Basic_Stats &stats) const
       stats.sample (this->samples_[i]);
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sample_History.h b/ace/Sample_History.h
index 83febc46f39..0ab521dac66 100644
--- a/ace/Sample_History.h
+++ b/ace/Sample_History.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Basic_Stats;
 
 /// Save multiple samples in an array
@@ -78,6 +81,8 @@ private:
   ACE_UINT64 *samples_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Sample_History.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Sample_History.inl b/ace/Sample_History.inl
index e3882a28bc3..42eca62e69b 100644
--- a/ace/Sample_History.inl
+++ b/ace/Sample_History.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Sample_History::sample (ACE_UINT64 value)
 {
@@ -18,3 +22,5 @@ ACE_Sample_History::get_sample (size_t i) const
 
   return this->samples_[i];
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sbrk_Memory_Pool.cpp b/ace/Sbrk_Memory_Pool.cpp
index ae9157a09c9..eda87a42c63 100644
--- a/ace/Sbrk_Memory_Pool.cpp
+++ b/ace/Sbrk_Memory_Pool.cpp
@@ -7,6 +7,9 @@
 ACE_RCSID(ace, Sbrk_Memory_Pool, "$Id$")
 
 #if !defined (ACE_LACKS_SBRK)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Sbrk_Memory_Pool)
 
 // Ask system for more local memory via sbrk(2).
@@ -107,7 +110,6 @@ ACE_Sbrk_Memory_Pool::base_addr (void) const
   return 0;
 }
 
-
 // Round up the request to a multiple of the page size.
 
 size_t
@@ -116,4 +118,7 @@ ACE_Sbrk_Memory_Pool::round_up (size_t nbytes)
   ACE_TRACE ("ACE_Sbrk_Memory_Pool::round_up");
   return ACE::round_to_pagesize (nbytes);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_SBRK */
diff --git a/ace/Sbrk_Memory_Pool.h b/ace/Sbrk_Memory_Pool.h
index 55856be303b..092099e9e34 100644
--- a/ace/Sbrk_Memory_Pool.h
+++ b/ace/Sbrk_Memory_Pool.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,6 +27,9 @@
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_mman.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Sbrk_Memory_Pool_Options
  *
@@ -40,7 +38,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Memory_Export ACE_Sbrk_Memory_Pool_Options
+class ACE_Export ACE_Sbrk_Memory_Pool_Options
 {
 };
 
@@ -49,7 +47,7 @@ class ACE_Memory_Export ACE_Sbrk_Memory_Pool_Options
  *
  * @brief Make a memory pool that is based on <sbrk(2)>.
  */
-class ACE_Memory_Export ACE_Sbrk_Memory_Pool
+class ACE_Export ACE_Sbrk_Memory_Pool
 {
 public:
   typedef ACE_Sbrk_Memory_Pool_Options OPTIONS;
@@ -111,6 +109,9 @@ protected:
   /// appropriate chunksize.
   virtual size_t round_up (size_t nbytes);
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_SBRK */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index a86c0b55d0f..e6395c148a3 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -29,6 +29,8 @@
 
 ACE_RCSID(ace, Sched_Params, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_Sched_Params::priority_min (const Policy policy,
                                 const int scope)
@@ -127,7 +129,7 @@ ACE_Sched_Params::priority_min (const Policy policy,
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return THREAD_PRIORITY_IDLE;
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return 255;
@@ -332,3 +334,5 @@ ACE_Sched_Params::previous_priority (const Policy policy,
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_THREADS */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h
index c68e701f9b4..76603c8a21a 100644
--- a/ace/Sched_Params.h
+++ b/ace/Sched_Params.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Sched_Params
  *
@@ -49,7 +51,7 @@
  * usual using <ACE_OS::thr_prio> or via the ACE_Thread
  * interface.  See the parameter descriptions in the private:
  * section below.
- * NOTE: this class does not do any checking of parameters.  It
+ * @note This class does not do any checking of parameters.  It
  * is just a container class.  If it is constructed with values
  * that are not supported on a platform, the call to
  * <ACE_OS::sched_params> will fail by returning -1 with EINVAL
@@ -220,6 +222,8 @@ private:
   int done_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Sched_Params.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Sched_Params.inl b/ace/Sched_Params.inl
index 041f9cb1648..2917acc691d 100644
--- a/ace/Sched_Params.inl
+++ b/ace/Sched_Params.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 // ============================================================================
@@ -17,6 +18,8 @@
 //
 // ============================================================================
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Sched_Params::ACE_Sched_Params (
       const Policy policy,
@@ -134,3 +137,5 @@ ACE_Sched_Priority_Iterator::next (void)
                                                this->scope ());
   this->done_ = old_priority == priority_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp
index 3c7f5850f03..7f1e9505855 100644
--- a/ace/Select_Reactor.cpp
+++ b/ace/Select_Reactor.cpp
@@ -4,6 +4,7 @@
 
 ACE_RCSID(ace, Select_Reactor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -28,3 +29,5 @@ template class ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Noop_Token> >;
 #   pragma instantiate ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Noop_Token> >
 # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index a52203869cb..8e7b1697ce3 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //@@ TAO_REACTOR_SPL_COMMENT_HOOK_START
 typedef ACE_Reactor_Token_T<ACE_SELECT_TOKEN> ACE_Select_Reactor_Token;
 
@@ -31,8 +33,8 @@ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor;
 /**
  * @class ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> >
  *
- * @brief Template specialization of <ACE_Guard> for the
- * <ACE_Null_Mutex>.
+ * @brief Template specialization of ACE_Guard for the
+ * ACE_Null_Mutex.
  *
  * This specialization is useful since it helps to speedup
  * performance of the "Null_Mutex" considerably.
@@ -54,11 +56,14 @@ public:
   void dump (void) const {}
 
 private:
-  // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &))
+  // Disallow copying and assignment.
+  ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
+  void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
+
 };
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_SELECT_REACTOR_H */
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index ab156aa1c20..75f3efb2d19 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32)
 #define ACE_SELECT_REACTOR_HANDLE(H) (this->event_handlers_[(H)].handle_)
 #define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)].event_handler_)
@@ -444,8 +446,7 @@ ACE_Select_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
 
   // Call remove_reference() if the removal is complete and reference
   // counting is needed.
-  if (complete_removal &&
-      requires_reference_counting)
+  if (complete_removal && requires_reference_counting)
     {
       event_handler->remove_reference ();
     }
@@ -523,7 +524,7 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) max_handlep1_ = %d, max_size_ = %d\n"),
+              ACE_LIB_TEXT ("max_handlep1_ = %d, max_size_ = %d\n"),
               this->max_handlep1_, this->max_size_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("[")));
 
@@ -532,10 +533,10 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
   for (ACE_Select_Reactor_Handler_Repository_Iterator iter (this);
        iter.next (event_handler) != 0;
        iter.advance ())
-    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (event_handler = %x, event_handler->handle_ = %d)"),
+    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (event_handler = %x, event_handler->handle_ = %d)\n"),
                 event_handler, event_handler->get_handle ()));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]")));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
@@ -586,7 +587,7 @@ ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
   if (this->notify_queue_.is_empty ())
     return 0;
 
-  ACE_Notification_Buffer *temp;
+  ACE_Notification_Buffer *temp = 0;
   ACE_Unbounded_Queue <ACE_Notification_Buffer *> local_queue;
 
   size_t queue_size = this->notify_queue_.size ();
@@ -706,7 +707,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
 #endif /* F_SETFD */
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-      ACE_Notification_Buffer *temp;
+      ACE_Notification_Buffer *temp = 0;
 
       ACE_NEW_RETURN (temp,
                       ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
@@ -749,7 +750,7 @@ ACE_Select_Reactor_Notify::close (void)
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
   // Free up the dynamically allocated resources.
-  ACE_Notification_Buffer **b;
+  ACE_Notification_Buffer **b = 0;
 
   for (ACE_Unbounded_Queue_Iterator<ACE_Notification_Buffer *> alloc_iter (this->alloc_queue_);
        alloc_iter.next (b) != 0;
@@ -802,7 +803,7 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler,
     if (free_queue_.dequeue_head (temp) == -1)
       {
         // Grow the queue of available buffers.
-        ACE_Notification_Buffer *temp1;
+        ACE_Notification_Buffer *temp1 = 0;
 
         ACE_NEW_RETURN (temp1,
                         ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE],
@@ -922,7 +923,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
     // holding the lock while delivering callbacks...
     ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1);
 
-    ACE_Notification_Buffer *temp;
+    ACE_Notification_Buffer *temp = 0;
 
     if (notify_queue_.is_empty ())
       return 0;
@@ -939,7 +940,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
                         -1);
 
     bool write_next_buffer = false;
-    ACE_Notification_Buffer ** next;
+    ACE_Notification_Buffer ** next = 0;
 
     if(!this->notify_queue_.is_empty())
       {
@@ -1255,16 +1256,4 @@ ACE_Select_Reactor_Impl::resumable_handler (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-template class ACE_Unbounded_Queue <ACE_Notification_Buffer *>;
-template class ACE_Unbounded_Queue_Iterator <ACE_Notification_Buffer *>;
-template class ACE_Node <ACE_Notification_Buffer *>;
-#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-#pragma instantiate ACE_Unbounded_Queue <ACE_Notification_Buffer *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator <ACE_Notification_Buffer *>
-#pragma instantiate ACE_Node <ACE_Notification_Buffer *>
-#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index fb340cb4beb..fdcd4eee991 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,19 +27,22 @@
 #include "ace/Reactor_Impl.h"
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
-#include "ace/Unbounded_Queue.h"
+# include "ace/Unbounded_Queue.h"
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Add useful typedefs to simplify the following code.
 typedef void (ACE_Handle_Set::*ACE_FDS_PTMF) (ACE_HANDLE);
 typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE);
 
 // Forward declaration.
 class ACE_Select_Reactor_Impl;
+class ACE_Sig_Handler;
 
 /*
  * Hook to specialize the Select_Reactor_Base implementation
- * with the concrete reactor, e.g., select or tp reactor 
+ * with the concrete reactor, e.g., select or tp reactor
  * specified at build/compilation time.
  */
 //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
@@ -68,8 +71,8 @@ public:
  *
  * @brief An ACE_Event_Handler and its associated ACE_HANDLE.
  *
- * One <ACE_Event_Handler> is registered for one or more
- * <ACE_HANDLE>.  At various points, this information must be
+ * One ACE_Event_Handler is registered for one or more
+ * ACE_HANDLE.  At various points, this information must be
  * stored explicitly.  This class provides a lightweight
  * mechanism to do so.
  */
@@ -95,7 +98,7 @@ public:
   /// Handle.
   ACE_HANDLE handle_;
 
-  /// <ACE_Event_Handler> associated with the <ACE_HANDLE>.
+  /// ACE_Event_Handler associated with the ACE_HANDLE.
   ACE_Event_Handler *event_handler_;
 };
 
@@ -161,8 +164,8 @@ public:
   /// because of a thread trying to unblock the <Reactor_Impl>
   virtual int dispatch_notify (ACE_Notification_Buffer &buffer);
 
-  /// Read one of the notify call on the <handle> into the
-  /// <buffer>. This could be because of a thread trying to unblock
+  /// Read one of the notify call on the @a handle into the
+  /// @a buffer. This could be because of a thread trying to unblock
   /// the <Reactor_Impl>
   virtual int read_notify_pipe (ACE_HANDLE handle,
                                 ACE_Notification_Buffer &buffer);
@@ -170,7 +173,7 @@ public:
   /// Verify whether the buffer has dispatchable info  or not.
   virtual int is_dispatchable (ACE_Notification_Buffer &buffer);
 
-  /// Called back by the <ACE_Select_Reactor> when a thread wants to
+  /// Called back by the ACE_Select_Reactor when a thread wants to
   /// unblock us.
   virtual int handle_input (ACE_HANDLE handle);
 
@@ -196,14 +199,14 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. If <eh> == 0, all notifications for all
+   * ACE_Event_Handler object. If @a eh == 0, all notifications for all
    * handlers are removed (but not any notifications posted just to wake up
    * the reactor itself). Returns the number of notifications purged.
    * Returns -1 on error.
    */
   virtual int purge_pending_notifications (
-      ACE_Event_Handler *,
-      ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
+      ACE_Event_Handler *sh,
+      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Dump the state of an object.
   virtual void dump (void) const;
@@ -213,16 +216,16 @@ public:
 
 protected:
   /**
-   * Keep a back pointer to the <ACE_Select_Reactor>.  If this value
-   * if NULL then the <ACE_Select_Reactor> has been initialized with
+   * Keep a back pointer to the ACE_Select_Reactor.  If this value
+   * if NULL then the ACE_Select_Reactor has been initialized with
    * <disable_notify_pipe>.
    */
   ACE_Select_Reactor_Impl *select_reactor_;
 
   /**
-   * Contains the <ACE_HANDLE> the <ACE_Select_Reactor> is listening
-   * on, as well as the <ACE_HANDLE> that threads wanting the
-   * attention of the <ACE_Select_Reactor> will write to.
+   * Contains the ACE_HANDLE the ACE_Select_Reactor is listening
+   * on, as well as the ACE_HANDLE that threads wanting the
+   * attention of the ACE_Select_Reactor will write to.
    */
   ACE_Pipe notification_pipe_;
 
@@ -260,13 +263,13 @@ protected:
 /**
  * @class ACE_Select_Reactor_Handler_Repository
  *
- * @brief Used to map <ACE_HANDLE>s onto the appropriate
- * <ACE_Event_Handler> *.
+ * @brief Used to map ACE_HANDLEs onto the appropriate
+ * ACE_Event_Handler *.
  *
  * This class is necessary to shield differences between UNIX
- * and Win32.  In UNIX, <ACE_HANDLE> is an int, whereas in Win32
+ * and Win32.  In UNIX, ACE_HANDLE is an int, whereas in Win32
  * it's a void *.  This class hides all these details from the
- * bulk of the <ACE_Select_Reactor> code.  All of these methods
+ * bulk of the ACE_Select_Reactor code.  All of these methods
  * are called with the main <Select_Reactor> token lock held.
  */
 class ACE_Export ACE_Select_Reactor_Handler_Repository
@@ -298,19 +301,19 @@ public:
   // = Search structure operations.
 
   /**
-   * Return the <ACE_Event_Handler *> associated with <ACE_HANDLE>.
+   * Return the <ACE_Event_Handler *> associated with ACE_HANDLE.
    * If <index_p> is non-0, then return the index location of the
    * <handle>, if found.
    */
   ACE_Event_Handler *find (ACE_HANDLE handle, size_t *index_p = 0);
 
-  /// Bind the <ACE_Event_Handler *> to the <ACE_HANDLE> with the
-  /// appropriate <ACE_Reactor_Mask> settings.
+  /// Bind the ACE_Event_Handler * to the ACE_HANDLE with the
+  /// appropriate ACE_Reactor_Mask settings.
   int bind (ACE_HANDLE,
             ACE_Event_Handler *,
             ACE_Reactor_Mask);
 
-  /// Remove the binding of <ACE_HANDLE> in accordance with the <mask>.
+  /// Remove the binding of ACE_HANDLE in accordance with the @a mask.
   int unbind (ACE_HANDLE,
               ACE_Reactor_Mask mask);
 
@@ -376,7 +379,7 @@ private:
 /**
  * @class ACE_Select_Reactor_Handler_Repository_Iterator
  *
- * @brief Iterate through the <ACE_Select_Reactor_Handler_Repository>.
+ * @brief Iterate through the ACE_Select_Reactor_Handler_Repository.
  */
 class ACE_Export ACE_Select_Reactor_Handler_Repository_Iterator
 {
@@ -438,7 +441,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. Returns the number of notifications
+   * ACE_Event_Handler object. Returns the number of notifications
    * purged. Returns -1 on error.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler * = 0,
@@ -451,7 +454,7 @@ public:
   virtual int resumable_handler (void);
 
   /*
-   * Hook to add concrete methods required to specialize the 
+   * Hook to add concrete methods required to specialize the
    * implementation with concrete methods required for the concrete
    * reactor implementation, for example, select, tp reactors.
    */
@@ -461,14 +464,14 @@ protected:
   /// Allow manipulation of the <wait_set_> mask and <ready_set_> mask.
   virtual int bit_ops (ACE_HANDLE handle,
                        ACE_Reactor_Mask mask,
-                       ACE_Select_Reactor_Handle_Set &wait_Set,
+                       ACE_Select_Reactor_Handle_Set &handle_set,
                        int ops);
 
   /// Enqueue ourselves into the list of waiting threads at the
   /// appropriate point specified by <requeue_position_>.
   virtual void renew (void) = 0;
 
-  /// Check to see if the <Event_Handler> associated with <handle> is
+  /// Check to see if the <Event_Handler> associated with @a handle is
   /// suspended. Returns 0 if not, 1 if so.
   virtual int is_suspended_i (ACE_HANDLE handle) = 0;
 
@@ -480,7 +483,6 @@ protected:
   /// Table that maps <ACE_HANDLEs> to <ACE_Event_Handler *>'s.
   ACE_Select_Reactor_Handler_Repository handler_rep_;
 
-
   /// Tracks handles that are ready for dispatch from <select>
   ACE_Select_Reactor_Handle_Set dispatch_set_;
 
@@ -497,24 +499,27 @@ protected:
   /// Defined as a pointer to allow overriding by derived classes...
   ACE_Timer_Queue *timer_queue_;
 
-  /// Keeps track of whether we should delete the timer queue (if we
-  /// didn't create it, then we don't delete it).
-  int delete_timer_queue_;
-
   /// Handle signals without requiring global/static variables.
   ACE_Sig_Handler *signal_handler_;
 
-  /// Keeps track of whether we should delete the signal handler (if we
-  /// didn't create it, then we don't delete it).
-  int delete_signal_handler_;
-
-  /// Callback object that unblocks the <ACE_Select_Reactor> if it's
+  /// Callback object that unblocks the ACE_Select_Reactor if it's
   /// sleeping.
   ACE_Reactor_Notify *notify_handler_;
 
+  /// Keeps track of whether we should delete the timer queue (if we
+  /// didn't create it, then we don't delete it).
+  bool delete_timer_queue_;
+
+  /// Keeps track of whether we should delete the signal handler (if we
+  /// didn't create it, then we don't delete it).
+  bool delete_signal_handler_;
+
   /// Keeps track of whether we need to delete the notify handler (if
   /// we didn't create it, then we don't delete it).
-  int delete_notify_handler_;
+  bool delete_notify_handler_;
+
+  /// True if we've been initialized yet...
+  bool initialized_;
 
   /// Restart the <handle_events> event-loop method automatically when
   /// <select> is interrupted via <EINTR>.
@@ -529,9 +534,6 @@ protected:
    */
   int requeue_position_;
 
-  /// True if we've been initialized yet...
-  int initialized_;
-
   /// The original thread that created this Select_Reactor.
   ACE_thread_t owner_;
 
@@ -558,6 +560,7 @@ protected:
 
 
 private:
+
   /// Determine whether we should renew Select_Reactor's token after handling
   /// the notification message.
   int supress_renew_;
@@ -567,6 +570,8 @@ private:
   ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Select_Reactor_Base.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Select_Reactor_Base.inl b/ace/Select_Reactor_Base.inl
index 90b2dc7e54c..83c561b8e8d 100644
--- a/ace/Select_Reactor_Base.inl
+++ b/ace/Select_Reactor_Base.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Event_Tuple::~ACE_Event_Tuple (void)
 {
@@ -55,11 +58,14 @@ ACE_INLINE
 ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
   : handler_rep_ (*this)
   , timer_queue_ (0)
-  , delete_timer_queue_ (0)
-  , delete_signal_handler_ (0)
-  , delete_notify_handler_ (0)
+  , signal_handler_ (0)
+  , notify_handler_ (0)
+  , delete_timer_queue_ (false)
+  , delete_signal_handler_ (false)
+  , delete_notify_handler_ (false)
+  , initialized_ (false)
+  , restart_ (0)
   , requeue_position_ (-1) // Requeue at end of waiters by default.
-  , initialized_ (0)
   , state_changed_ (0)
   , mask_signals_ (ms)
   , supress_renew_ (0)
@@ -77,3 +83,5 @@ ACE_Select_Reactor_Impl::supress_notify_renew (int sr)
 {
   this->supress_renew_ = sr;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index d864f6728bb..994477eb215 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_SELECT_REACTOR_T_C
-#define ACE_SELECT_REACTOR_T_C
+#ifndef ACE_SELECT_REACTOR_T_CPP
+#define ACE_SELECT_REACTOR_T_CPP
 
 #include "ace/Select_Reactor_T.h"
 
@@ -27,10 +27,7 @@
  */
 //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
 
-// @@ The latest version of SunCC can't grok the code if we put inline
-// function here.  Therefore, we temporarily disable the code here.
-// We shall turn this back on once we know the problem gets fixed.
-#if 1 // !defined (__ACE_INLINE__)
+#if !defined (__ACE_INLINE__)
 #include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
 
@@ -38,6 +35,8 @@ ACE_RCSID (ace,
            Select_Reactor_T,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_T)
 
 #if defined (ACE_WIN32)
@@ -382,7 +381,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
 
   // Can't initialize ourselves more than once.
-  if (this->initialized_ > 0)
+  if (this->initialized_)
     return -1;
 
   this->owner_ = ACE_Thread::self ();
@@ -1199,7 +1198,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_set
 
       // clear the bit from that dispatch mask,
       // so when we need to restart the iteration (rebuilding the iterator...)
-      // we will not dispatch the already dipatched handlers
+      // we will not dispatch the already dispatched handlers
       this->clear_dispatch_mask (handle, mask);
 
       if (this->state_changed_)
@@ -1352,6 +1351,15 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
                 io_handlers_dispatched) == -1)
         // State has changed, so exit loop.
         break;
+
+      // if state changed, we need to re-eval active_handle_count,
+      // so we will not end with an endless loop
+      if (this->state_changed_)
+      {
+          active_handle_count = this->dispatch_set_.rd_mask_.num_set ()
+              + this->dispatch_set_.wr_mask_.num_set ()
+              + this->dispatch_set_.ex_mask_.num_set ();
+      }
     }
   while (active_handle_count > 0);
 
@@ -1481,7 +1489,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
       select_width = 0;
 #  else
       select_width = int (h) + 1;
-#  endif /* ACE_WIN64 */
+#  endif /* ACE_WIN32 */
 
       if (ACE_OS::select (select_width,
                           rd_mask, 0, 0,
@@ -1552,10 +1560,25 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
        ++handle_iter_ex_ready)
     ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_ready = %d\n"), h));
 
+  for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.wr_mask_);
+       (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;
+       ++handle_iter_su_ready)
+    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle_suspend = %d\n"), h));
+
+  for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.rd_mask_);
+       (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;
+       ++handle_iter_su_ready)
+    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle_suspend = %d\n"), h));
+
+  for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.ex_mask_);
+       (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;
+       ++handle_iter_su_ready)
+    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_suspend = %d\n"), h));
+
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrequeue_position_ = %d\n"), this->requeue_position_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ninitialized_ = %d\n"), this->initialized_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ = %d\n"), this->owner_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("requeue_position_ = %d\n"), this->requeue_position_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("initialized_ = %d\n"), this->initialized_));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_));
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   this->notify_handler_->dump ();
@@ -1565,4 +1588,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
-#endif /* ACE_SELECT_REACTOR_T_C */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_SELECT_REACTOR_T_CPP */
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index ecaf22957ed..bb9cdceed61 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,9 +23,11 @@
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Token.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
- * Hook for specializing the reactor with the concrete 
- * type, for example, select, or thread pool. 
+ * Hook for specializing the reactor with the concrete
+ * type, for example, select, or thread pool.
  */
 //@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
 
@@ -128,7 +130,7 @@ public:
   /// Set a user-specified timer queue.
   virtual int timer_queue (ACE_Timer_Queue *tq);
 
-  /// Return the current <ACE_Timer_Queue>.
+  /// Return the current ACE_Timer_Queue.
   virtual ACE_Timer_Queue *timer_queue (void) const;
 
   /// Close down the select_reactor and release all of its resources.
@@ -147,20 +149,20 @@ public:
   virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero);
 
   /**
-   * This event loop driver that blocks for <max_wait_time> before
+   * This event loop driver that blocks for @a max_wait_time before
    * returning.  It will return earlier if timer events, I/O events,
-   * or signal events occur.  Note that <max_wait_time> can be 0, in
+   * or signal events occur.  Note that @a max_wait_time can be 0, in
    * which case this method blocks indefinitely until events occur.
    *
-   * <max_wait_time> is decremented to reflect how much time this call
+   * @a max_wait_time is decremented to reflect how much time this call
    * took.  For instance, if a time value of 3 seconds is passed to
    * handle_events and an event occurs after 2 seconds,
-   * <max_wait_time> will equal 1 second.  This can be used if an
+   * @a max_wait_time will equal 1 second.  This can be used if an
    * application wishes to handle events for some fixed amount of
    * time.
    *
-   * Returns the total number of I/O and Timer <ACE_Event_Handler>s
-   * that were dispatched, 0 if the <max_wait_time> elapsed without
+   * Returns the total number of I/O and Timer ACE_Event_Handler's
+   * that were dispatched, 0 if the @a max_wait_time elapsed without
    * dispatching any handlers, or -1 if something goes wrong.
    *
    * Current <alertable_handle_events> is identical to
@@ -171,7 +173,7 @@ public:
 
   /**
    * This method is just like the one above, except the
-   * <max_wait_time> value is a reference and can therefore never be
+   * @a max_wait_time value is a reference and can therefore never be
    * NULL.
    *
    * Current <alertable_handle_events> is identical to
@@ -196,7 +198,7 @@ public:
    */
   virtual void deactivate (int do_stop);
 
-  // = Register and remove <ACE_Event_Handler>s.
+  // = Register and remove ACE_Event_Handlers.
   /**
    * Register a <eh> with a particular <mask>.  Note that the
    * <Select_Reactor> will call <ACE_Event_Handler::get_handle> to
@@ -206,9 +208,9 @@ public:
                                 ACE_Reactor_Mask mask);
 
   /**
-   * Register a <eh> with a particular <mask>.  Note that since the
-   * <handle> is given the Select_Reactor will *not* call
-   * <ACE_Event_Handler::get_handle> to extract the underlying I/O
+   * Register a @a eh with a particular @a mask.  Note that since the
+   * @a handle is given the Select_Reactor will *not* call
+   * ACE_Event_Handler::get_handle() to extract the underlying I/O
    * handle.
    */
   virtual int register_handler (ACE_HANDLE handle,
@@ -236,7 +238,7 @@ public:
                                 ACE_Event_Handler *event_handler,
                                 ACE_Reactor_Mask mask);
 
-  /// Register <eh> with all the <handles> in the <Handle_Set>.
+  /// Register @a eh with all the @a handles in the <Handle_Set>.
   virtual int register_handler (const ACE_Handle_Set &handles,
                                 ACE_Event_Handler *eh,
                                 ACE_Reactor_Mask mask);
@@ -348,9 +350,10 @@ public:
    * @see reset_timer_interval()
    *
    * @param event_handler  Event handler to schedule on reactor
-   * @param arg   Argument passed to the handle_timeout() method of  event_handler
-   * @param delay  Time interval after which the timer will expire
-   * @param interval  Time interval after which the timer will be automatically rescheduled
+   * @param arg Argument passed to the handle_timeout() method of event_handler
+   * @param delay Time interval after which the timer will expire
+   * @param interval Time interval after which the timer will be automatically
+   * rescheduled
    * @return -1 on failure, a timer_id value on success
    */
   virtual long schedule_timer (ACE_Event_Handler * event_handler,
@@ -378,7 +381,7 @@ public:
                             int dont_call_handle_close = 1);
 
   /**
-   * Cancel the single <ACE_Event_Handler> that matches the <timer_id>
+   * Cancel the single ACE_Event_Handler that matches the <timer_id>
    * value (which was returned from the <schedule> method).  If arg is
    * non-NULL then it will be set to point to the ``magic cookie''
    * argument passed in when the <Event_Handler> was registered.  This
@@ -612,9 +615,9 @@ protected:
   // = Dispatching methods.
 
   /**
-   * Template Method that dispatches <ACE_Event_Handler>s for time
+   * Template Method that dispatches ACE_Event_Handlers for time
    * events, I/O events, and signal events.  Returns the total number
-   * of <ACE_Event_Handler>s that were dispatched or -1 if something
+   * of ACE_Event_Handlers that were dispatched or -1 if something
    * goes wrong.
    */
   virtual int dispatch (int nfound,
@@ -697,10 +700,9 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &operator=  (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &) )
 };
 
-// @@ The latest version of SunCC can't grok the code if we put inline
-// function here.  Therefore, we temporarily disable the code here.
-// We shall turn this back on once we know the problem gets fixed.
-#if 0 // defined (__ACE_INLINE__)
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
 #include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
 
diff --git a/ace/Select_Reactor_T.inl b/ace/Select_Reactor_T.inl
index 136d445810a..0ad9033f9a0 100644
--- a/ace/Select_Reactor_T.inl
+++ b/ace/Select_Reactor_T.inl
@@ -1,16 +1,22 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Reactor.h"
+#include "ace/Signal.h"
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handler (ACE_Event_Handler *h)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::resume_handler");
   return this->resume_handler (h->get_handle ());
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handler (const ACE_Handle_Set &handles)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::resume_handler");
@@ -26,14 +32,16 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handler (const ACE_Handle
   return 0;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handler (ACE_Event_Handler *h)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::suspend_handler");
   return this->suspend_handler (h->get_handle ());
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handler (const ACE_Handle_Set &handles)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::suspend_handler");
@@ -49,7 +57,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handler (const ACE_Handl
   return 0;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (int signum,
                                                                   ACE_Event_Handler *new_sh,
                                                                   ACE_Sig_Action *new_disp,
@@ -64,40 +73,38 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (int signum,
 
 #if defined (ACE_WIN32)
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_Event_Handler *event_handler,
-                                                                  ACE_HANDLE event_handle)
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_Event_Handler *,
+                                                                  ACE_HANDLE )
 {
   // Don't have an implementation for this yet...
-  ACE_UNUSED_ARG (event_handler);
-  ACE_UNUSED_ARG (event_handle);
   ACE_NOTSUP_RETURN (-1);
 }
 
 #endif /* ACE_WIN32 */
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_HANDLE event_handle,
-                                                                  ACE_HANDLE io_handle,
-                                                                  ACE_Event_Handler *event_handler,
-                                                                  ACE_Reactor_Mask mask)
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_HANDLE ,
+                                                                  ACE_HANDLE ,
+                                                                  ACE_Event_Handler *,
+                                                                  ACE_Reactor_Mask )
 {
   // Don't have an implementation for this yet...
-  ACE_UNUSED_ARG (event_handle);
-  ACE_UNUSED_ARG (io_handle);
-  ACE_UNUSED_ARG (event_handler);
-  ACE_UNUSED_ARG (mask);
   ACE_NOTSUP_RETURN (-1);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler (int signum, ACE_Event_Handler **handler)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::handler");
   return this->handler_i (signum, handler);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler (int signum,
                                                                 ACE_Sig_Action *new_disp,
                                                                 ACE_Sig_Action *old_disp,
@@ -107,7 +114,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler (int signum,
   return this->signal_handler_->remove_handler (signum, new_disp, old_disp, sigkey);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN>
+ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::uses_event_associations (void)
 {
   // Since the Select_Reactor does not do any event associations, this
@@ -120,7 +128,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::uses_event_associations (void)
 
 // Performs operations on the "ready" bits.
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ready_ops (ACE_Event_Handler *handler,
                                                            ACE_Reactor_Mask mask,
                                                            int ops)
@@ -131,7 +139,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ready_ops (ACE_Event_Handler *ha
 
 // Performs operations on the "dispatch" masks.
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::mask_ops (ACE_Event_Handler *handler,
                                                           ACE_Reactor_Mask mask,
                                                           int ops)
@@ -140,7 +148,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::mask_ops (ACE_Event_Handler *han
   return this->mask_ops (handler->get_handle (), mask, ops);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_wakeup (ACE_Event_Handler *eh,
                                                                  ACE_Reactor_Mask mask)
 {
@@ -148,7 +156,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_wakeup (ACE_Event_Handl
   return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::ADD_MASK);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_wakeup (ACE_Event_Handler *eh,
                                                                ACE_Reactor_Mask mask)
 {
@@ -156,7 +164,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_wakeup (ACE_Event_Handler
   return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::CLR_MASK);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_wakeup (ACE_HANDLE handle,
                                                                  ACE_Reactor_Mask mask)
 {
@@ -164,7 +172,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_wakeup (ACE_HANDLE hand
   return this->mask_ops (handle, mask, ACE_Reactor::ADD_MASK);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_wakeup (ACE_HANDLE handle,
                                                                ACE_Reactor_Mask mask)
 {
@@ -172,14 +180,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_wakeup (ACE_HANDLE handle
   return this->mask_ops (handle, mask, ACE_Reactor::CLR_MASK);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ ACE_Lock &
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE ACE_Lock &
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::lock (void)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::lock");
   return this->lock_adapter_;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ void
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE void
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::wakeup_all_threads (void)
 {
   // Send a notification, but don't block if there's no one to receive
@@ -187,25 +195,25 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::wakeup_all_threads (void)
   this->notify (0, ACE_Event_Handler::NULL_MASK, (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::alertable_handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->handle_events (max_wait_time);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::alertable_handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->handle_events (max_wait_time);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivated (void)
 {
   return this->deactivated_;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ void
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE void
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop)
 {
   {
@@ -218,8 +226,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop)
   this->wakeup_all_threads ();
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ size_t
+template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE size_t
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::size (void) const
 {
   return this->handler_rep_.size ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Semaphore.cpp b/ace/Semaphore.cpp
index 374e4cad282..3a48bd38168 100644
--- a/ace/Semaphore.cpp
+++ b/ace/Semaphore.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            Semaphore,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Semaphore)
 
 void
@@ -56,3 +58,5 @@ ACE_Semaphore::~ACE_Semaphore (void)
 
   this->remove ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Semaphore.h b/ace/Semaphore.h
index 01c116ef991..afee6043bbd 100644
--- a/ace/Semaphore.h
+++ b/ace/Semaphore.h
@@ -24,6 +24,8 @@
 
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -64,7 +66,7 @@ public:
    * value of <tv> is updated upon return to show the actual
    * (absolute) acquisition time.
    *
-   * NOTE: Solaris threads do not support timed semaphores.
+   * @note Solaris threads do not support timed semaphores.
    * Therefore, if you're running on Solaris you might want to
    * consider using the ACE POSIX pthreads implementation instead,
    * which can be enabled by compiling ACE with
@@ -81,7 +83,7 @@ public:
    * The value of <*tv> is updated upon return to show the actual
    * (absolute) acquisition time.
    *
-   * NOTE: Solaris threads do not support timed semaphores.
+   * @note Solaris threads do not support timed semaphores.
    * Therefore, if you're running on Solaris you might want to
    * consider using the ACE POSIX pthreads implementation instead,
    * which can be enabled by compiling ACE with
@@ -170,6 +172,8 @@ private:
   ACE_Semaphore (const ACE_Semaphore &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Semaphore.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Semaphore.inl b/ace/Semaphore.inl
index a519c4e7920..8bfe49ce39c 100644
--- a/ace/Semaphore.inl
+++ b/ace/Semaphore.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_sema_t &
 ACE_Semaphore::lock (void) const
 {
@@ -112,3 +115,5 @@ ACE_Semaphore::tryacquire_write_upgrade (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 4055edd6a78..e56b5b04489 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -34,6 +34,8 @@ ACE_RCSID (ace,
            Service_Config,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_Service_Config)
 
 void
@@ -44,13 +46,6 @@ ACE_Service_Config::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-// All the factory functions that allocate default statically linked
-// services should be placed below.
-
-// Allocate a Service Manager.
-
-ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager)
-
 // ----------------------------------------
 
 // Set the signal handler to point to the handle_signal() function.
@@ -350,6 +345,15 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr,
                 ACE_LIB_TEXT ("opening dynamic service %s\n"),
                 sr->name ()));
 
+  ACE_Service_Type *srp = 0;
+  if (ACE_Service_Repository::instance ()->find
+      (sr->name (),
+       (const ACE_Service_Type **) &srp) >= 0)
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       ACE_LIB_TEXT ("%s already installed, please remove first before reinstalling\n"),
+                       sr->name ()),
+                      0);
+
   if (sr->type ()->init (args.argc (),
                          args.argv ()) == -1)
     {
@@ -735,12 +739,14 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
       // There's no point in dealing with this on NT since it doesn't
       // really support signals very well...
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-      // @@ This really ought to be a Singleton.
-      if (ACE_Reactor::instance ()->register_handler
-          (ACE_Service_Config::signum_,
-           ACE_Service_Config::signal_handler_) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("can't register signal handler\n")));
+      // Only attempt to register a signal handler for positive
+      // signal numbers.
+      if (ACE_Service_Config::signum_ > 0)
+        if (ACE_Reactor::instance ()->register_handler
+            (ACE_Service_Config::signum_,
+             ACE_Service_Config::signal_handler_) == -1)
+          ACE_ERROR ((LM_ERROR,
+                      ACE_LIB_TEXT ("can't register signal handler\n")));
 #endif /* ACE_LACKS_UNIX_SIGNALS */
 
       // See if we need to load the static services.
@@ -914,3 +920,12 @@ ACE_Service_Config::start_daemon (void)
   ACE_TRACE ("ACE_Service_Config::start_daemon");
   return ACE::daemonize ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+// All the factory functions that allocate default statically linked
+// services should be placed below.
+
+// Allocate a Service Manager.
+
+ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager)
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 9397025be47..6fafb50408b 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -27,6 +27,8 @@
 #include "ace/SString.h"
 #include "ace/OS_NS_signal.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Service_Object;
 class ACE_Service_Type;
@@ -59,6 +61,8 @@ class ACE_DLL;
   "() \"" \
   parameters \
   "\""
+
+
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_LIB_TEXT ("remove ") \
   ACE_LIB_TEXT (ident)
@@ -74,7 +78,7 @@ class ACE_Svc_Conf_Param;
   ACE_LIB_TEXT (objectclass) \
   ACE_LIB_TEXT ("\"") \
   ACE_LIB_TEXT (" params=\"") \
-  ACE_LIB_TEXT (parameters)
+  ACE_LIB_TEXT (parameters) \
   ACE_LIB_TEXT ("\"/></dynamic></ACE_Svc_Conf>")
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_LIB_TEXT ("<ACE_Svc_Conf><remove id=\"") \
@@ -83,11 +87,15 @@ class ACE_Svc_Conf_Param;
 class ACE_XML_Svc_Conf;
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 extern "C"
 {
   typedef ACE_Service_Object *(*ACE_SERVICE_ALLOCATOR) (ACE_Service_Object_Exterminator *);
 }
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Static_Svc_Descriptor
  *
@@ -166,7 +174,11 @@ public:
 
   // = Initialization and termination methods.
 
-  /// Initialize the Service Repository.
+  /**
+   * Initialize the Service Repository. Note that initialising @a
+   * signum to a negative number will prevent a signal handler being
+   * registered when the repository is opened.
+   */
   ACE_Service_Config (int ignore_static_svcs = 1,
                       size_t size = ACE_Service_Config::MAX_SERVICES,
                       int signum = SIGHUP);
@@ -206,7 +218,7 @@ public:
    * number of errors encountered loading the services in the
    * specified svc.conf configuration file.  If @a ignore_debug_flag is
    * non-0 then the application is responsible for setting the
-   * <ACE_Log_Msg::priority_mask> appropriately.
+   * @c ACE_Log_Msg::priority_mask appropriately.
    */
   static int open (const ACE_TCHAR program_name[],
                    const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
@@ -327,7 +339,7 @@ public:
    * Suspend @a svc_name.  Note that this will not unlink the service
    * from the daemon if it was dynamically linked, it will mark it as
    * being suspended in the Service Repository and call the <suspend>
-   * member function on the appropriate <ACE_Service_Object>.  A
+   * member function on the appropriate ACE_Service_Object.  A
    * service can be resumed later on by calling the <RESUME> member
    * function...
    */
@@ -391,7 +403,7 @@ public:
 
   /**
    * Handle the command-line options intended for the
-   * <ACE_Service_Config>.  Note that <argv[0]> is assumed to be the
+   * ACE_Service_Config.  Note that @c argv[0] is assumed to be the
    * program name.
    * The arguments that are valid in a call to this method are
    * - '-b' Option to indicate that we should be a daemon
@@ -479,7 +491,7 @@ private:
   static ACE_Sig_Adapter *signal_handler_;
 
   /**
-   * Keep track of whether the <ACE_Service_Config> is already
+   * Keep track of whether the ACE_Service_Config is already
    * initialized.  If so, we can't allow <yyparse> to be called since
    * it's not reentrant.  This variable is incremented by the
    * <ACE_Service_Config::open> method and decremented by the
@@ -488,6 +500,8 @@ private:
   static int is_initialized_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Service_Config.inl b/ace/Service_Config.inl
index 23a6f81d12f..4dd09e802b0 100644
--- a/ace/Service_Config.inl
+++ b/ace/Service_Config.inl
@@ -4,6 +4,8 @@
 
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This is the primary entry point into the ACE_Service_Config (the
 // constructor just handles simple initializations).
 
@@ -100,3 +102,5 @@ ACE_Service_Config::remove (const char svc_name[])
   return ACE_Service_Config::remove (ACE_TEXT_TO_TCHAR_IN (svc_name));
 }
 #endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 2cee64c36c8..3dd1c8e151c 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -1,8 +1,6 @@
-#include "ace/Service_Manager.h"
+// $Id$
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Service_Manager.inl"
-#endif /* __ACE_INLINE__ */
+#include "ace/Service_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
@@ -18,6 +16,7 @@ ACE_RCSID (ace,
            Service_Manager,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Service_Manager)
 
@@ -40,6 +39,11 @@ ACE_Service_Manager::ACE_Service_Manager (void)
   ACE_TRACE ("ACE_Service_Manager::ACE_Service_Manager");
 }
 
+ACE_Service_Manager::~ACE_Service_Manager (void)
+{
+  ACE_TRACE ("ACE_Service_Manager::~ACE_Service_Manager");
+}
+
 int
 ACE_Service_Manager::suspend (void)
 {
@@ -229,8 +233,8 @@ ACE_Service_Manager::reconfigure_services (void)
   // the rug" out from underneath the existing services in a
   // problematic way.
   ACE_Service_Config::reconfig_occurred ((sig_atomic_t) 1);
-  return this->client_stream_.send_n ("done\n",
-                                      sizeof ("done\n"));
+  return static_cast<int> (this->client_stream_.send_n ("done\n",
+                                                        sizeof ("done\n")));
 }
 
 // isolate the request-processing code
@@ -376,3 +380,5 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
                 ACE_LIB_TEXT ("close")));
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index 6c7d745e65e..c49449bb820 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,11 +24,13 @@
 #include "ace/INET_Addr.h"
 #include "ace/Service_Object.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Service_Manager
  *
  * @brief Provide a standard ACE service for managing all the services
- * configured in an <ACE_Service_Repository>.
+ * configured in an ACE_Service_Repository.
  *
  * This implementation is simple and just handles each client
  * request one at a time.  There are currently 3 types of requests:
@@ -112,9 +114,7 @@ protected:
   static u_short DEFAULT_PORT_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/Service_Manager.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* _SERVICE_MANAGER_H */
diff --git a/ace/Service_Manager.inl b/ace/Service_Manager.inl
deleted file mode 100644
index f329d08adfb..00000000000
--- a/ace/Service_Manager.inl
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_Service_Manager::~ACE_Service_Manager (void)
-{
-  ACE_TRACE ("ACE_Service_Manager::~ACE_Service_Manager");
-}
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index 42786291f87..00de5f6e056 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -12,8 +12,10 @@
 #include "ace/config-all.h"
 
 ACE_RCSID (ace,
-	   Service_Object,
-	   "$Id$")
+           Service_Object,
+           "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Object)
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type)
@@ -124,3 +126,5 @@ ACE_Service_Type::name (const ACE_TCHAR *n)
   delete [] const_cast <ACE_TCHAR *> (this->name_);
   this->name_ = ACE::strnew (n);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index d96e5c59255..6101372c5f1 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -24,6 +24,8 @@
 #include "ace/Event_Handler.h"
 #include "ace/DLL.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #define ACE_Component ACE_Service_Object
 /**
  * @class ACE_Service_Object
@@ -32,9 +34,9 @@
  * implementations.
  *
  * Classes that inherit from <ACE_Service_Objects> are capable
- * of being registered with the <ACE_Reactor> (due to the
- * <ACE_Event_Handler>, as well as being dynamically linked by
- * the <ACE_Service_Config> (due to the <ACE_Shared_Object>).
+ * of being registered with the ACE_Reactor (due to the
+ * ACE_Event_Handler, as well as being dynamically linked by
+ * the ACE_Service_Config (due to the <ACE_Shared_Object>).
  */
 class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Shared_Object
 {
@@ -140,7 +142,7 @@ private:
  * @class ACE_Service_Object_Ptr
  *
  * @brief This is a smart pointer that holds onto the associated
- * <ACE_Service_Object> * until the current scope is left, at
+ * ACE_Service_Object * until the current scope is left, at
  * which point the object's <fini> hook is called and the
  * service_object_ gets deleted.
  *
@@ -167,6 +169,8 @@ private:
   ACE_Service_Object *service_object_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Service_Object.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Service_Object.inl b/ace/Service_Object.inl
index 5e1b7ae475e..23eb323085f 100644
--- a/ace/Service_Object.inl
+++ b/ace/Service_Object.inl
@@ -1,7 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 // $Id$
 
-// Service_Object.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Service_Object_Ptr::ACE_Service_Object_Ptr (ACE_Service_Object *so)
   : service_object_ (so)
@@ -62,3 +62,6 @@ ACE_Service_Type::fini_called (void) const
   ACE_TRACE ("ACE_Service_Type::fini_called");
   return this->fini_already_called_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index c872df591ff..81feb3b233e 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (ace,
            Service_Repository,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Repository)
 
 // Process-wide Service Repository.
@@ -442,3 +444,5 @@ ACE_Service_Repository_Iterator::advance (void)
 
   return this->next_ < this->svc_rep_.current_size_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 5479f59238e..1bda4000913 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -24,6 +24,7 @@
 #include "ace/Default_Constants.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Service_Type;
 
@@ -75,10 +76,10 @@ public:
   /// dynamically allocated services.
   int fini (void);
 
-  /// Get pointer to a process-wide <ACE_Service_Repository>.
+  /// Get pointer to a process-wide ACE_Service_Repository.
   static ACE_Service_Repository *instance (int size = ACE_Service_Repository::DEFAULT_SIZE);
 
-  /// Set pointer to a process-wide <ACE_Service_Repository> and return
+  /// Set pointer to a process-wide ACE_Service_Repository and return
   /// existing pointer.
   static ACE_Service_Repository *instance (ACE_Service_Repository *);
 
@@ -145,7 +146,7 @@ private:
   /// Maximum number of services.
   int total_size_;
 
-  /// Pointer to a process-wide <ACE_Service_Repository>.
+  /// Pointer to a process-wide ACE_Service_Repository.
   static ACE_Service_Repository *svc_rep_;
 
   /// Must delete the <svc_rep_> if non-0.
@@ -160,7 +161,7 @@ private:
 /**
  * @class ACE_Service_Repository_Iterator
  *
- * @brief Iterate through the <ACE_Service_Repository>.
+ * @brief Iterate through the ACE_Service_Repository.
  *
  * Make sure not to delete entries as the iteration is going on
  * since this class is not designed as a robust iterator.
@@ -206,6 +207,8 @@ private:
   int ignore_suspended_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Service_Repository.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Service_Repository.inl b/ace/Service_Repository.inl
index f6e13326eab..2ecf2de05fa 100644
--- a/ace/Service_Repository.inl
+++ b/ace/Service_Repository.inl
@@ -1,8 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Service_Repository.i
-
 // Returns a count of the number of currently valid entries (counting
 // both resumed and suspended entries).
 
@@ -11,6 +10,8 @@
 #include "ace/Thread_Mutex.h"
 #endif /* ACE_MT_SAFE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Service_Repository::current_size (void) const
 {
@@ -34,3 +35,5 @@ ACE_INLINE
 ACE_Service_Repository_Iterator::~ACE_Service_Repository_Iterator (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Templates.cpp b/ace/Service_Templates.cpp
index d5f3f1b328b..11569316299 100644
--- a/ace/Service_Templates.cpp
+++ b/ace/Service_Templates.cpp
@@ -1,9 +1,19 @@
 // $Id$
 
-#include "ace/Service_Templates.h"
-#include "ace/SString.h"
+#include "ace/config-lite.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#  include "ace/Service_Templates.h"
+#  include "ace/SString.h"
+
+#endif
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template class ACE_Node<ACE_Static_Svc_Descriptor *>;
 template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
 template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
@@ -42,7 +52,13 @@ template class ACE_Thru_Task<ACE_SYNCH>;
   template class ACE_Task<ACE_NULL_SYNCH>;
   template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_THREADS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #pragma instantiate ACE_Node<ACE_Static_Svc_Descriptor *>
 #pragma instantiate ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>
@@ -80,4 +96,8 @@ template class ACE_Thru_Task<ACE_SYNCH>;
   #pragma instantiate ACE_Task<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Thru_Task<ACE_NULL_SYNCH>
 #endif /* ACE_HAS_THREADS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index f62a9c0ce98..35140d29d4e 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -16,6 +16,7 @@ ACE_RCSID (ace,
            Service_Types,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 typedef ACE_Stream<ACE_SYNCH> MT_Stream;
 typedef ACE_Module<ACE_SYNCH> MT_Module;
@@ -455,54 +456,4 @@ ACE_Stream_Type::find (const ACE_TCHAR *mod_name) const
 }
 
 
-/*
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Message_Queue<ACE_SYNCH>;
-template class ACE_Message_Queue_Iterator<ACE_SYNCH>;
-template class ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>;
-template class ACE_Message_Queue_Factory<ACE_SYNCH>;
-template class ACE_Dynamic_Message_Queue<ACE_SYNCH>;
-template class ACE_Module<ACE_SYNCH>;
-template class ACE_Stream<ACE_SYNCH>;
-template class ACE_Stream_Head<ACE_SYNCH>;
-template class ACE_Stream_Tail<ACE_SYNCH>;
-template class ACE_Task<ACE_SYNCH>;
-template class ACE_Thru_Task<ACE_SYNCH>;
-
-// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-  template class ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
-  template class ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>;
-  template class ACE_Message_Queue_Factory<ACE_NULL_SYNCH>;
-  template class ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>;
-  template class ACE_Module<ACE_NULL_SYNCH>;
-  template class ACE_Task<ACE_NULL_SYNCH>;
-  template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-  #endif *//* ACE_HAS_THREADS */
-/*
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Message_Queue<ACE_SYNCH>
-#pragma instantiate ACE_Message_Queue_Iterator<ACE_SYNCH>
-#pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>
-#pragma instantiate ACE_Message_Queue_Factory<ACE_SYNCH>
-#pragma instantiate ACE_Dynamic_Message_Queue<ACE_SYNCH>
-#pragma instantiate ACE_Module<ACE_SYNCH>
-#pragma instantiate ACE_Stream<ACE_SYNCH>
-#pragma instantiate ACE_Stream_Head<ACE_SYNCH>
-#pragma instantiate ACE_Stream_Tail<ACE_SYNCH>
-#pragma instantiate ACE_Task<ACE_SYNCH>
-#pragma instantiate ACE_Thru_Task<ACE_SYNCH>
-// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
-#if defined (ACE_HAS_THREADS)
-  #pragma instantiate ACE_Message_Queue<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Message_Queue_Factory<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Module<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Task<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Thru_Task<ACE_NULL_SYNCH>
-  #endif *//* ACE_HAS_THREADS */
-//#else
-//#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index a87169c7dbb..e2f6500e8ae 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Service_Type_Impl
  *
@@ -189,6 +191,8 @@ private:
   ACE_Module_Type *head_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Service_Types.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Service_Types.inl b/ace/Service_Types.inl
index 7412140a4d2..9ebfd705ced 100644
--- a/ace/Service_Types.inl
+++ b/ace/Service_Types.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/ACE.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE void *
 ACE_Service_Type_Impl::object (void) const
 {
@@ -25,3 +28,5 @@ ACE_Service_Type_Impl::name (const ACE_TCHAR *n)
   ACE::strdelete (const_cast<ACE_TCHAR*> (this->name_));
   this->name_ = ACE::strnew (n);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Memory.cpp b/ace/Shared_Memory.cpp
index 5e4447075ee..90a9a7ed93e 100644
--- a/ace/Shared_Memory.cpp
+++ b/ace/Shared_Memory.cpp
@@ -4,6 +4,10 @@
 
 ACE_RCSID(ace, Shared_Memory, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Shared_Memory::~ACE_Shared_Memory (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index 7d07b598610..2ebc8b79d36 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #include "ace/os_include/os_stddef.h"
 
@@ -29,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Shared_Memory
  *
@@ -40,7 +37,7 @@
  * memory.  For a much more sophisticated version, please check
  * out the <ACE_Malloc> class.
  */
-class ACE_Memory_Export ACE_Shared_Memory
+class ACE_Export ACE_Shared_Memory
 {
 public:
   virtual ~ACE_Shared_Memory (void);
@@ -54,6 +51,8 @@ public:
   virtual ACE_HANDLE get_id (void) const = 0;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_SHARED_MEMORY_H */
diff --git a/ace/Shared_Memory_MM.cpp b/ace/Shared_Memory_MM.cpp
index 9ad0bb021f3..945cb345b20 100644
--- a/ace/Shared_Memory_MM.cpp
+++ b/ace/Shared_Memory_MM.cpp
@@ -11,6 +11,7 @@ ACE_RCSID (ace,
            Shared_Memory_MM,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_MM)
 
@@ -88,7 +89,7 @@ void *
 ACE_Shared_Memory_MM::malloc (size_t)
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::malloc");
-  void *addr;
+  void *addr = 0;
 
   return this->shared_memory_ (addr) == -1 ? 0 : addr;
 }
@@ -106,3 +107,5 @@ ACE_Shared_Memory_MM::free (void *p)
   ACE_TRACE ("ACE_Shared_Memory_MM::free");
   return p != 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index bbdf2ef43a7..5a8bd83eed1 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
@@ -23,16 +23,18 @@
 
 #include "ace/Mem_Map.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Shared_Memory_MM
  *
  * @brief Shared memory wrapper based on MMAP.
  *
- * This class provides a very simple-minded shared memory
- * manager.  For more a powerful memory allocator please see
- * <ACE_Malloc>.
+ * This class provides a very simple-minded shared memory manager.  We
+ * strongly recommend that you do NOT use this class.  Instead, please
+ * use @c ACE_Malloc, which has much more powerful capabilities.
  */
-class ACE_Memory_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
+class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
 {
 public:
   // = Initialization and termination methods.
@@ -108,6 +110,8 @@ private:
    ACE_Mem_Map shared_memory_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Shared_Memory_MM.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Shared_Memory_MM.inl b/ace/Shared_Memory_MM.inl
index ff52dacd44b..96d865b667b 100644
--- a/ace/Shared_Memory_MM.inl
+++ b/ace/Shared_Memory_MM.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Shared_Memory_MM.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Return the name of file that is mapped (if any).
 
@@ -37,3 +38,5 @@ ACE_Shared_Memory_MM::open (const ACE_TCHAR *file_name,
   return shared_memory_.map (file_name, len, flags, mode,
                              prot, share, addr, pos);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Memory_Pool.cpp b/ace/Shared_Memory_Pool.cpp
index 014616407da..93fb2e97fcf 100644
--- a/ace/Shared_Memory_Pool.cpp
+++ b/ace/Shared_Memory_Pool.cpp
@@ -8,6 +8,9 @@
 ACE_RCSID(ace, Shared_Memory_Pool, "$Id$")
 
 #if !defined (ACE_LACKS_SYSV_SHMEM)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_Pool)
 
 ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (const char *base_addr,
@@ -148,7 +151,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
   ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal");
   // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("signal %S occurred\n"), signum));
 
-  // While FreeBSD 5.X has a siginfo_t struct with a si_addr field, 
+  // While FreeBSD 5.X has a siginfo_t struct with a si_addr field,
   // it does not define SEGV_MAPERR.
 #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) && \
         (defined (SEGV_MAPERR) || defined (SEGV_MEMERR))
@@ -450,4 +453,7 @@ ACE_Shared_Memory_Pool::round_up (size_t nbytes)
 
   return ACE::round_to_pagesize (nbytes);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_SYSV_SHMEM */
diff --git a/ace/Shared_Memory_Pool.h b/ace/Shared_Memory_Pool.h
index 1fb46a5cc9c..996cde2b490 100644
--- a/ace/Shared_Memory_Pool.h
+++ b/ace/Shared_Memory_Pool.h
@@ -16,25 +16,21 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_MEMORY_BUILD_DLL
-# include "ace/ACE_Memory_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Memory_Export ACE_Export
-#endif  /* ACE_MEMORY_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_SYSV_SHMEM)
+
 #include "ace/ACE.h"
 #include "ace/Event_Handler.h"
 #include "ace/Signal.h"
-
-#if !defined (ACE_LACKS_SYSV_SHMEM)
-
 #include "ace/os_include/sys/os_mman.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Shared_Memory_Pool_Options
  *
@@ -43,7 +39,7 @@
  * This should be a nested class, but that breaks too many
  * compilers.
  */
-class ACE_Memory_Export ACE_Shared_Memory_Pool_Options
+class ACE_Export ACE_Shared_Memory_Pool_Options
 {
 public:
   /// Initialization method.
@@ -82,7 +78,7 @@ public:
  * provides more powerful features, such as persistent backing store
  * and greatly scalability.
  */
-class ACE_Memory_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
+class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
 {
 public:
   typedef ACE_Shared_Memory_Pool_Options OPTIONS;
@@ -203,6 +199,9 @@ protected:
   /// properly.
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* !ACE_LACKS_SYSV_SHMEM */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Shared_Memory_SV.cpp b/ace/Shared_Memory_SV.cpp
index 59d6ad2fedc..8378b75d7dc 100644
--- a/ace/Shared_Memory_SV.cpp
+++ b/ace/Shared_Memory_SV.cpp
@@ -12,6 +12,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_SV)
 
 void
@@ -23,11 +25,11 @@ ACE_Shared_Memory_SV::dump (void) const
 }
 
 ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
-					    int length,
-					    int create,
-					    int perms,
-					    void *addr,
-					    int flags)
+                                            int length,
+                                            int create,
+                                            int perms,
+                                            void *addr,
+                                            int flags)
   : shared_memory_ (id, length, create, perms, addr, flags)
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::ACE_Shared_Memory_SV");
@@ -82,3 +84,5 @@ ACE_Shared_Memory_SV::free (void *p)
   ACE_TRACE ("ACE_Shared_Memory_SV::free");
   return p != 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index c4c59d5d4e6..565d69c14cb 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
@@ -23,16 +23,18 @@
 
 #include "ace/SV_Shared_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Shared_Memory_SV
  *
  * @brief Shared memory wrapper based on System V shared memory.
  *
- * This class provides a very simple-minded shared memory
- * manager.  For more a powerful memory allocator please see
- * <ACE_Malloc>.
+ * This class provides a very simple-minded shared memory manager.  We
+ * strongly recommend that you do NOT use this class.  Instead, please
+ * use @c ACE_Malloc, which has much more powerful capabilities.
  */
-class ACE_Memory_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
+class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
 {
 public:
   enum
@@ -89,6 +91,8 @@ private:
    ACE_SV_Shared_Memory shared_memory_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Shared_Memory_SV.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Shared_Memory_SV.inl b/ace/Shared_Memory_SV.inl
index 1830df3f630..f40fc55c28d 100644
--- a/ace/Shared_Memory_SV.inl
+++ b/ace/Shared_Memory_SV.inl
@@ -1,21 +1,22 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Shared_Memory_SV.i
-
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Shared_Memory_SV::open (key_t id,
-			    int length,
-			    int create,
-			    int perms,
-			    void *addr,
-			    int flags)
+                            int length,
+                            int create,
+                            int perms,
+                            void *addr,
+                            int flags)
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::open");
   return shared_memory_.open_and_attach (id, length, create,
-					 perms, addr, flags);
+                                         perms, addr, flags);
 }
 
 // The "do-nothing" constructor.
@@ -25,3 +26,5 @@ ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (void)
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::ACE_Shared_Memory_SV");
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Object.cpp b/ace/Shared_Object.cpp
index 86164c16759..2be49edf997 100644
--- a/ace/Shared_Object.cpp
+++ b/ace/Shared_Object.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (ace,
            Shared_Object,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initializes object when dynamic linking occurs.
 
 int
@@ -49,3 +51,5 @@ ACE_Shared_Object::~ACE_Shared_Object (void)
 {
   ACE_TRACE ("ACE_Shared_Object::~ACE_Shared_Object");
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index 006dbb99eaf..ee987b23122 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -23,6 +23,8 @@
 
 #include "ace/os_include/sys/os_types.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Shared_Object
  *
@@ -46,6 +48,8 @@ public:
   virtual ~ACE_Shared_Object (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Shared_Object.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Shared_Object.inl b/ace/Shared_Object.inl
index 36a42157cb2..cd76cb6a267 100644
--- a/ace/Shared_Object.inl
+++ b/ace/Shared_Object.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Shared_Object::ACE_Shared_Object (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 624787c6ee4..b90607968f4 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -45,6 +45,8 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 #endif /* ACE_HAS_SIG_C_FUNC */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Array of Event_Handlers that will handle the signals.
 ACE_Event_Handler *ACE_Sig_Handler::signal_handlers_[ACE_NSIG];
 
@@ -861,20 +863,6 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh)
   return *eh;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-ACE_MT (template class ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>);
-ACE_MT (template class ACE_Guard<ACE_Recursive_Thread_Mutex>);
-template class ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
-template class ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
-template class ACE_Fixed_Set_Iterator_Base<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#pragma instantiate ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Guard<ACE_Recursive_Thread_Mutex>
-#endif /* ACE_MT_SAFE */
-#pragma instantiate ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
-#pragma instantiate ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
-#pragma instantiate ACE_Fixed_Set_Iterator_Base<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Signal.h b/ace/Signal.h
index 576f80f2a70..45bddf2c22f 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -32,6 +32,8 @@
 // Type of the extended signal handler.
 typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontext);
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Sig_Set
  *
@@ -264,11 +266,11 @@ private:
  * 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>
- * with the <ACE_Sig_Handler> in order to handle a designated
+ * 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.
+ * ACE_Event_Handler is invoked automatically.
  */
 class ACE_Export ACE_Sig_Handler
 {
@@ -279,8 +281,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
+   * <signum>.  Passes back the existing ACE_Event_Handler and its
    * sigaction if pointers are non-zero.  Returns -1 on failure and >=
    * 0 on success.
    */
@@ -291,7 +293,7 @@ public:
                                 ACE_Sig_Action *old_disp = 0);
 
   /**
-   * Remove the <ACE_Event_Handler> currently associated with
+   * Remove the ACE_Event_Handler currently associated with
    * <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
@@ -312,10 +314,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 <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 <signum>.
   /// Return the existing handler.
   virtual ACE_Event_Handler *handler (int signum,
                                       ACE_Event_Handler *);
@@ -338,7 +340,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 <signum>.
    * Return the existing handler.  Does not acquire any locks so that
    * it can be called from a signal handler, such as <dispatch>.
    */
@@ -349,8 +351,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 <signum>.
+   * Passes back the existing ACE_Event_Handler and its sigaction if
    * pointers are non-zero.  Returns -1 on failure and >= 0 on
    * success.
    */
@@ -376,7 +378,7 @@ private:
  * @class ACE_Sig_Adapter
  *
  * @brief Provide an adapter that transforms various types of signal
- * handlers into the scheme used by the <ACE_Reactor>.
+ * handlers into the scheme used by the ACE_Reactor.
  */
 class ACE_Export ACE_Sig_Adapter : public ACE_Event_Handler
 {
@@ -387,7 +389,7 @@ public:
   ~ACE_Sig_Adapter (void);
 
   /// Returns this signal key that's used to remove this from the
-  /// <ACE_Reactor>'s internal table.
+  /// ACE_Reactor's internal table.
   int sigkey (void);
 
   /// Called by the <Reactor> to dispatch the signal handler.
@@ -452,7 +454,7 @@ public:
                                 ACE_Sig_Action *old_disp = 0);
 
   /**
-   * Remove an <ACE_Event_Handler> currently associated with <signum>.
+   * Remove an ACE_Event_Handler currently associated with <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
@@ -467,12 +469,12 @@ public:
 
   // = Set/get the handler associated with a particular signal.
 
-  /// Return the head of the list of <ACE_Sig_Handler>s associated with
+  /// Return the head of the list of ACE_Sig_Handlers associated with
   /// SIGNUM.
   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.
    */
@@ -506,16 +508,7 @@ private:
 };
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
-#if defined (ACE_HAS_SIG_C_FUNC)
-extern "C" void
-ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context);
-
-#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
-extern "C" void
-ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context);
-#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
-
-#endif /* ACE_HAS_SIG_C_FUNC */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Signal.inl"
diff --git a/ace/Signal.inl b/ace/Signal.inl
index e7a12852d95..ef871441aca 100644
--- a/ace/Signal.inl
+++ b/ace/Signal.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/OS_NS_signal.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Sig_Set::ACE_Sig_Set (sigset_t *ss)
   // : sigset_ ()
@@ -301,3 +304,5 @@ ACE_Sig_Handler::in_range (int signum)
   ACE_TRACE ("ACE_Sig_Handler::in_range");
   return signum > 0 && signum < ACE_NSIG;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 45965f85814..ec7797ae156 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_SINGLETON_C
-#define ACE_SINGLETON_C
+#ifndef ACE_SINGLETON_CPP
+#define ACE_SINGLETON_CPP
 
 #include "ace/Singleton.h"
 
@@ -22,6 +22,9 @@ ACE_RCSID (ace,
            Singleton,
            "$Id$")
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE, class ACE_LOCK> void
 ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
@@ -526,4 +529,6 @@ ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void)
   return ACE_LIB_TEXT("ACE");
 }
 
-#endif /* ACE_SINGLETON_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_SINGLETON_CPP */
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 57b0a8a9d75..7c6baca3edb 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Singleton
  *
@@ -62,7 +64,7 @@
  * typedef ACE_Singleton<foo, ACE_Null_Mutex> FOO;
  * @endverbatim
  *
- * NOTE:  the best types to use for ACE_LOCK are
+ * @note The best types to use for ACE_LOCK are
  * ACE_Recursive_Thread_Mutex and ACE_Null_Mutex.
  * ACE_Recursive_Thread_Mutex should be used in multi-threaded
  * programs in which it is possible for more than one thread to
@@ -308,6 +310,8 @@ public:
   const ACE_TCHAR *dll_name (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Singleton.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Singleton.inl b/ace/Singleton.inl
index 12dfe1bdda3..4351a59a5f6 100644
--- a/ace/Singleton.inl
+++ b/ace/Singleton.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructors.
 //
 // Note: don't explicitly initialize "instance_", because TYPE may not
@@ -35,3 +38,5 @@ template <class TYPE, class ACE_LOCK>
 ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::~ACE_DLL_Singleton_T (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index ed8e2082d25..e0ff264da00 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -29,14 +29,14 @@
 #   include /**/ <ifaddrs.h>
 # endif /* ACE_HAS_GETIFADDRS */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
 #include /**/ <inetLib.h>
 #include /**/ <netinet/in_var.h>
 extern "C" {
   extern struct in_ifaddr* in_ifaddr;
 }
 #include "ace/OS_NS_stdio.h"
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 #if defined (ACE_HAS_WINCE)
 #include /**/ <Iphlpapi.h>
@@ -51,13 +51,13 @@ extern "C" {
 #    include "ace/Object_Manager.h"
 #  endif /* ACE_HAS_THREADS */
 
-namespace ACE
+namespace
 {
   // private:
   //  Used internally so not exported.
 
   /// Does this box have ipv6 turned on?
-  int ipv6_enabled_ = -1;
+  int ace_ipv6_enabled = -1;
 }
 #endif /* ACE_HAS_IPV6 */
 
@@ -67,10 +67,7 @@ namespace ACE
 // and not the one for <sys/socket.h> which is also needed.  Although we
 // don't need the template defined here, it makes the compiler pull in
 // <sys/socket.h> and the build runs clean.
-#if defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 500)
-#  if (__IBMCPP__ >= 700)
-#    error Recheck this hack to see if version 7 fixed it!
-#  endif
+#if defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 500) && (__IBMCPP__ < 700)
 static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h;
 #endif /* AIX && __IBMCPP__ >= 500 */
 
@@ -275,6 +272,8 @@ get_windows_version()
 
 #endif //(ACE_WIN32) && !(ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Bind socket to an unused port.
 
 int
@@ -626,10 +625,10 @@ ACE::get_ip_interfaces (size_t &count,
 
   // Now go through the list and transfer the good ones to the list of
   // because they're down or don't have an IP address.
-  for (count = 0, i = 0; i < n_interfaces; i++)
+  for (count = 0, i = 0; i < n_interfaces; ++i)
     {
       LPINTERFACE_INFO lpii;
-      struct sockaddr_in *addrp;
+      struct sockaddr_in *addrp = 0;
 
       lpii = &info[i];
       if (!(lpii->iiFlags & IFF_UP))
@@ -977,7 +976,7 @@ ACE::get_ip_interfaces (size_t &count,
 
   // Count the number of interfaces
   while (dev_names.next () != 0)
-    n_interfaces ++;
+    ++n_interfaces;
 
   // case 1. no interfaces present, empty string? OS version change?
   if (n_interfaces == 0)
@@ -1077,7 +1076,7 @@ ACE::get_ip_interfaces (size_t &count,
               addrs[count].set ((u_short) 0,
                                 addr->sin_addr.s_addr,
                                 0);
-              count++;
+              ++count;
             }
         }
 # if defined (ACE_HAS_IPV6)
@@ -1092,7 +1091,7 @@ ACE::get_ip_interfaces (size_t &count,
             {
               addrs[count].set(reinterpret_cast<struct sockaddr_in *> (addr),
                                sizeof(sockaddr_in6));
-              count++;
+              ++count;
             }
         }
 # endif /* ACE_HAS_IPV6 */
@@ -1102,7 +1101,7 @@ ACE::get_ip_interfaces (size_t &count,
 
   return 0;
 
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600))
   // COMMON (SVR4 and BSD) UNIX CODE
 
   size_t num_ifs, num_ifs_found;
@@ -1212,17 +1211,17 @@ ACE::get_ip_interfaces (size_t &count,
           if (inAddr.sin_addr.s_addr != 0)
             {
               addrs[count].set(&inAddr, sizeof(struct sockaddr_in));
-              count++;
+              ++count;
             }
 #endif /* ! _UNICOS */
         }
 
 #if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
-      pcur++;
+      ++pcur;
 #else
       if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
         {
-           pcur++;
+           ++pcur;
         }
       else
         {
@@ -1270,7 +1269,7 @@ ACE::get_ip_interfaces (size_t &count,
                 !IN6_IS_ADDR_UNSPECIFIED (&reinterpret_cast<sockaddr_in6 *> (res0->ai_addr)->sin6_addr))
             {
               addrs[count].set(reinterpret_cast<sockaddr_in *> (res0->ai_addr), res0->ai_addrlen);
-              count++;
+              ++count;
             }
           freeaddrinfo (res0);
 
@@ -1280,7 +1279,7 @@ ACE::get_ip_interfaces (size_t &count,
 # endif /* ACE_HAS_IPV6 */
 
   return 0;
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
   count = 0;
   // Loop through each address structure
   for (struct in_ifaddr* ia = in_ifaddr; ia != 0; ia = ia->ia_next)
@@ -1330,7 +1329,7 @@ ACE::get_ip_interfaces (size_t &count,
 #else
   ACE_UNUSED_ARG (count);
   ACE_UNUSED_ARG (addrs);
-  ACE_NOTSUP_RETURN (-1);;                      // no implementation
+  ACE_NOTSUP_RETURN (-1);                      // no implementation
 #endif /* ACE_WIN32 */
 }
 
@@ -1371,7 +1370,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 
   how_many = num_ifs;
   return 0;
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600))
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
   // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
   // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
@@ -1467,7 +1466,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 #else
   ACE_UNUSED_ARG (handle);
   ACE_UNUSED_ARG (how_many);
-  ACE_NOTSUP_RETURN (-1);; // no implmentation
+  ACE_NOTSUP_RETURN (-1); // no implementation
 #endif /* sparc && SIOCGIFNUM */
 }
 
@@ -1480,7 +1479,7 @@ ACE::get_handle (void)
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc) && ! defined (CHORUS)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600))
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
@@ -1494,42 +1493,33 @@ int
 ACE::ipv6_enabled (void)
 {
 #if defined (ACE_HAS_IPV6)
-  if (ACE::ipv6_enabled_ == -1)
+  if (ace_ipv6_enabled == -1)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
                                 *ACE_Static_Object_Lock::instance (), 0));
 
-      if (ACE::ipv6_enabled_ == -1)
+      if (ace_ipv6_enabled == -1)
         {
           // Determine if the kernel has IPv6 support by attempting to
           // create a PF_INET6 socket and see if it fails.
           ACE_HANDLE s = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0);
           if (s == ACE_INVALID_HANDLE)
             {
-              ACE::ipv6_enabled_ = 0;
+              ace_ipv6_enabled = 0;
             }
           else
             {
-              ACE::ipv6_enabled_ = 1;
+              ace_ipv6_enabled = 1;
               ACE_OS::closesocket (s);
             }
         }
     }
 
-  return ACE::ipv6_enabled_;
+  return ace_ipv6_enabled;
 #else /* ACE_HAS_IPV6 */
   return 0;
 #endif /* !ACE_HAS_IPV6 */
 }
 
-#if defined (__unix) || defined (__unix__) || defined (__Lynx__) || \
-    defined (_AIX)
-#  if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Array_Ptr<struct ifreq>;
-template class ACE_Auto_Basic_Array_Ptr<struct ifreq>;
-#  elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Array_Ptr<struct ifreq>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<struct ifreq>
-#  endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* (__unix || __Lynx_ || AIX ) */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sock_Connect.h b/ace/Sock_Connect.h
index 532892d64fa..90e9ecf1c07 100644
--- a/ace/Sock_Connect.h
+++ b/ace/Sock_Connect.h
@@ -25,6 +25,8 @@
 #include "ace/Basic_Types.h"
 #include "ace/os_include/netinet/os_in.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward Declarations
 class ACE_INET_Addr;
 
@@ -82,6 +84,8 @@ namespace ACE
   extern ACE_Export int ipv6_enabled (void);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* ACE_SOCK_CONNECT_H */
diff --git a/ace/Static_Object_Lock.h b/ace/Static_Object_Lock.h
index 93006c34001..5a765a24fbd 100644
--- a/ace/Static_Object_Lock.h
+++ b/ace/Static_Object_Lock.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Recursive_Thread_Mutex;
 
 /**
@@ -47,11 +49,15 @@ public:
   static void cleanup_lock (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
 
 // hack to get around errors while compiling using split-cpp
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_IS_SPLITTING)
 typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type;
 
@@ -64,6 +70,8 @@ static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
 
 # endif /* ACE_IS_SPLITTING */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index bd371c95169..fa75340c83e 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -12,6 +12,8 @@
 
 ACE_RCSID(ace, Stats, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_UINT32
 ACE_Stats_Value::fractional_field (void) const
 {
@@ -661,10 +663,4 @@ ACE_Throughput_Stats::dump_throughput (const wchar_t *msg,
 #endif /* ACE_NLOGGING */
 }
 
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Stats.h b/ace/Stats.h
index ab11b399303..e98305cb0b8 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -26,6 +26,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/Basic_Stats.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Stats_Value
  *
@@ -79,6 +81,10 @@ public:
   void dump (void) const;
 
 private:
+
+  ACE_Stats_Value (void) {}
+
+private:
   /// The integer portion of the value.
   ACE_UINT32 whole_;
 
@@ -92,7 +98,6 @@ private:
    */
   u_int precision_;
 
-  ACE_UNIMPLEMENTED_FUNC (ACE_Stats_Value (void))
 };
 
 /**
@@ -188,7 +193,7 @@ public:
   /// Print summary statistics to stdout.
   void dump (void) const;
 
-private:
+protected:
   /// Internal indication of whether there has been overflow.  Contains
   /// the errno corresponding to the cause of overflow.
   u_int overflow_;
@@ -271,6 +276,7 @@ private:
 #endif /* 0 */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "ace/Stats.inl"
diff --git a/ace/Stats.inl b/ace/Stats.inl
index bafa86161e8..5fecfde1de8 100644
--- a/ace/Stats.inl
+++ b/ace/Stats.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Stats_Value::ACE_Stats_Value (const u_int precision)
   : whole_ (0),
@@ -97,3 +100,5 @@ ACE_Stats::dump (void) const
   print_summary (3u);
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 2bf2eaeb93f..9704224fdf5 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef ACE_STRATEGIES_T_CPP
 #define ACE_STRATEGIES_T_CPP
 
@@ -20,11 +22,7 @@
 #include "ace/Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (ace,
-           Strategies_T,
-           "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class SVC_HANDLER>
 ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void)
@@ -1487,4 +1485,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Process_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_Accept_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Strategy)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_STRATEGIES_T_CPP */
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index 9dfcfc1f134..8171bf8b07f 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -32,6 +32,7 @@
 // Needed for broken linkers that can't grok long symbols.
 #define ACE_Refcounted_Hash_Recyclable ARHR
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Service_Repository;
 
@@ -1056,6 +1057,8 @@ protected:
   int delete_recycling_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
@@ -1070,5 +1073,4 @@ protected:
 
 #include /**/ "ace/post.h"
 
-
 #endif /* ACE_STRATEGIES_T_H */
diff --git a/ace/Strategies_T.inl b/ace/Strategies_T.inl
index 6f0c59304b1..a6a6d1dfd1a 100644
--- a/ace/Strategies_T.inl
+++ b/ace/Strategies_T.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class SVC_HANDLER> ACE_INLINE
 ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh,
                                                              ACE_Thread_Manager *tm)
@@ -224,3 +226,5 @@ ACE_Refcounted_Hash_Recyclable<T>::operator!= (const ACE_Refcounted_Hash_Recycla
 {
   return !this->operator== (rhs);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index e76db19c6ce..b44b04ddacc 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -1,8 +1,8 @@
 // Stream.cpp
 // $Id$
 
-#ifndef ACE_STREAM_C
-#define ACE_STREAM_C
+#ifndef ACE_STREAM_CPP
+#define ACE_STREAM_CPP
 
 //#include "ace/Module.h"
 #include "ace/Stream.h"
@@ -18,7 +18,7 @@
 #include "ace/Stream.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Stream, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Stream)
 
@@ -614,4 +614,6 @@ ACE_Stream_Iterator<ACE_SYNCH_USE>::ACE_Stream_Iterator (const ACE_Stream<ACE_SY
   ACE_TRACE ("ACE_Stream_Iterator<ACE_SYNCH_USE>::ACE_Stream_Iterator");
 }
 
-#endif /* ACE_STREAM_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_STREAM_CPP */
diff --git a/ace/Stream.h b/ace/Stream.h
index fed079368e4..1ab1cacf3ea 100644
--- a/ace/Stream.h
+++ b/ace/Stream.h
@@ -25,6 +25,8 @@
 #include "ace/Message_Block.h"
 #include "ace/Module.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls.
 template<ACE_SYNCH_DECL> class ACE_Stream_Iterator;
 class ACE_Time_Value;
@@ -220,6 +222,8 @@ private:
   ACE_Module<ACE_SYNCH_USE> *next_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Stream.inl b/ace/Stream.inl
index 42a4989eff0..24ff6840431 100644
--- a/ace/Stream.inl
+++ b/ace/Stream.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Stream.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <ACE_SYNCH_DECL> ACE_INLINE ACE_Module<ACE_SYNCH_USE> *
 ACE_Stream<ACE_SYNCH_USE>::head (void)
@@ -47,3 +48,4 @@ ACE_Stream_Iterator<ACE_SYNCH_USE>::advance (void)
   return this->next_ != 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp
index 3e4b4a6f1b7..69163951323 100644
--- a/ace/Stream_Modules.cpp
+++ b/ace/Stream_Modules.cpp
@@ -1,8 +1,7 @@
-// Stream_Modules.cpp
 // $Id$
 
-#ifndef ACE_STREAM_MODULES_C
-#define ACE_STREAM_MODULES_C
+#ifndef ACE_STREAM_MODULES_CPP
+#define ACE_STREAM_MODULES_CPP
 
 #include "ace/Stream_Modules.h"
 #include "ace/OS_NS_string.h"
@@ -11,7 +10,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Stream_Modules, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Head)
 
@@ -375,4 +375,6 @@ ACE_Thru_Task<ACE_SYNCH_USE>::fini (void)
   return 0;
 }
 
-#endif /* ACE_STREAM_MODULES_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_STREAM_MODULES_CPP */
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index c108ff55603..10d396c95f5 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 #define ACE_STREAM_MODULES
 #include /**/ "ace/pre.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Stream_Head
  *
@@ -150,6 +152,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Stream_Modules.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp
index d5f065938d7..5aefdddbc75 100644
--- a/ace/String_Base.cpp
+++ b/ace/String_Base.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #ifndef ACE_STRING_BASE_CPP
 #define ACE_STRING_BASE_CPP
 
@@ -11,11 +13,7 @@
 #include "ace/String_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (ace,
-           String_Base,
-           "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_String_Base)
 
@@ -294,6 +292,16 @@ ACE_String_Base<CHAR>::clear (int release)
 
 // Assignment operator (does copy memory).
 template <class CHAR> ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator= (const CHAR *s)
+{
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator=");
+  if (s != 0)
+    this->set (s, 1);
+  return *this;
+}
+
+// Assignment operator (does copy memory).
+template <class CHAR> ACE_String_Base<CHAR> &
 ACE_String_Base<CHAR>::operator= (const ACE_String_Base<CHAR> &s)
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::operator=");
@@ -353,10 +361,10 @@ template <class CHAR> int
 ACE_String_Base<CHAR>::compare (const ACE_String_Base<CHAR> &s) const
 {
   ACE_TRACE ("ACE_String_Base<CHAR>::compare");
- 
+
   if (this->rep_ == s.rep_)
     return 0;
- 
+
   // Pick smaller of the two lengths and perform the comparison.
   size_t smaller_length = ace_min (this->len_, s.len_);
 
@@ -477,7 +485,7 @@ ACE_String_Base<CHAR>::operator+= (const CHAR* s)
   size_t slen = 0;
   if (s != 0)
     slen = ACE_OS::strlen (s);
-  return this->append(s, slen);
+  return this->append (s, slen);
 }
 
 template <class CHAR> ACE_String_Base<CHAR> &
@@ -495,5 +503,6 @@ ACE_String_Base<CHAR>::operator+= (const CHAR c)
   return this->append(&c, slen);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif  /* ACE_STRING_BASE_CPP */
diff --git a/ace/String_Base.h b/ace/String_Base.h
index da9ab247d98..b8297c68a4a 100644
--- a/ace/String_Base.h
+++ b/ace/String_Base.h
@@ -24,6 +24,8 @@
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Allocator;
 
 /**
@@ -36,7 +38,7 @@ class ACE_Allocator;
  * ACE_Allocator with a persistable memory pool.  This class is
  * optimized for efficiency, so it doesn't provide any internal
  * locking.
- * NOTE: if an instance of this class is constructed from or
+ * @note If an instance of this class is constructed from or
  * assigned an empty string (with first element of '\0'), then it
  * is not allocated new space.  Instead, its internal
  * representation is set equal to a global empty string.
@@ -156,6 +158,14 @@ public:
   /**
    *  Assignment operator (does copy memory).
    *
+   *  @param s Input null-terminated CHAR string to assign to this object.
+   *  @return Return a copy of the this string.
+   */
+  ACE_String_Base < CHAR > &operator = (const CHAR * s);
+
+  /**
+   *  Assignment operator (does copy memory).
+   *
    *  @param s Input ACE_String_Base string to assign to this object.
    *  @return Return a copy of the this string.
    */
@@ -313,6 +323,9 @@ public:
    */
   size_t length (void) const;
 
+  /// Return @c true if the length of the string is zero.
+  bool empty (void) const;
+
   /**
    * Get a copy of the underlying representation.
    *
@@ -514,6 +527,8 @@ template < class CHAR >
   ACE_String_Base < CHAR > operator + (const CHAR c,
                                        const ACE_String_Base < CHAR > &t);
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/String_Base.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/String_Base.inl b/ace/String_Base.inl
index 2a27f4b158c..7234f916aab 100644
--- a/ace/String_Base.inl
+++ b/ace/String_Base.inl
@@ -8,6 +8,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class CHAR> ACE_INLINE void
 ACE_String_Base<CHAR>::dump (void) const
@@ -33,6 +34,12 @@ ACE_String_Base<CHAR>::length (void) const
   return this->len_;
 }
 
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::empty (void) const
+{
+  return this->len_ == 0;
+}
+
 template <class CHAR> ACE_INLINE ACE_String_Base<CHAR>
 ACE_String_Base<CHAR>::substr (size_t offset,
                                ssize_t length) const
@@ -113,3 +120,4 @@ ACE_String_Base<CHAR>::strstr (const ACE_String_Base<CHAR> &s) const
   return this->find (s.rep_);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/String_Base_Const.cpp b/ace/String_Base_Const.cpp
index bf66b2cf873..5f193d6c77e 100644
--- a/ace/String_Base_Const.cpp
+++ b/ace/String_Base_Const.cpp
@@ -2,4 +2,8 @@
 
 #include "ace/String_Base_Const.h"
 
-ssize_t ACE_String_Base_Const::npos = -1;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ssize_t const ACE_String_Base_Const::npos = -1;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/String_Base_Const.h b/ace/String_Base_Const.h
index 50a9c086c2b..5a3f935308e 100644
--- a/ace/String_Base_Const.h
+++ b/ace/String_Base_Const.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_String_Base_Const
  *
@@ -32,8 +34,10 @@
 class ACE_Export ACE_String_Base_Const
 {
 public:
-  static ssize_t npos;
+  static ssize_t const npos;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_STRING_BASE_CONST_H */
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 32385a37df7..4c14981caa3 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -30,6 +30,8 @@
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 struct ace_yy_buffer_state;
 
@@ -153,20 +155,6 @@ typedef union
 // Forward declaration
 struct ace_yy_buffer_state;
 
-/// Create and push a new lexer buffer on to the buffer stack for use
-/// when scanning the given file.
-void ace_yy_push_buffer (FILE *file,
-                         ace_yy_buffer_state *&buffer);
-
-/// Create and push a new lexer buffer on to the buffer stack for use
-/// when scanning the given directive.
-void ace_yy_push_buffer (const ACE_TCHAR *directive,
-                         ace_yy_buffer_state *&buffer);
-
-/// Pop the current lexer buffer off of the buffer stack and
-/// deallocate it.
-void ace_yy_pop_buffer (ace_yy_buffer_state *buf);
-
 /// Performs the parsing
 #ifdef ACE_YYPARSE_PARAM
 int ace_yyparse (void *);
@@ -200,6 +188,8 @@ ace_create_service_type (const ACE_TCHAR *,
                          ACE_Service_Object_Exterminator = 0);
 
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_SVC_CONF_H */
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
deleted file mode 100644
index 8943882cdf7..00000000000
--- a/ace/Svc_Conf.l
+++ /dev/null
@@ -1,134 +0,0 @@
-%{
-// $Id$
-// Sample lexical analysis for regular expression subset.  Must be
-// compiled with FLEX and an ANSI C++ compiler.
-
-// Lexical tokens values defined by YACC.
-#include "ace/Svc_Conf.h"
-#include "ace/Svc_Conf_Tokens.h"
-#include "ace/Svc_Conf_Lexer_Guard.h"
-
-ACE_RCSID (ace,
-	   Svc_Conf_l,
-	   "$Id$")
-
-#define token(x)  x
-%}
-
-%s PARAMETERS
-%s NORMAL
-
-letter	        [a-zA-Z_]
-letter_or_digit	[a-zA-Z_0-9]
-digit           [0-9]
-ident           {letter}{letter_or_digit}*
-pathname        ([A-Za-z\%]:)?[a-zA-Z_0-9/\%\.\\~-]+
-symbol		[ -~]
-string		(\"{symbol}*\"|\'{symbol}*\')
-white_space	[ \t]
-newline         \n
-carrage_retn    \r
-other		.
-
-%%
-
-^#{other}*$   	      ; /* EMPTY */
-dynamic	              { return token (ACE_DYNAMIC); }
-static	              { return token (ACE_STATIC); }
-suspend	              { return token (ACE_SUSPEND); }
-resume	              { return token (ACE_RESUME); }
-remove	              { return token (ACE_REMOVE); }
-stream	              { return token (ACE_USTREAM); }
-Module		      { return token (ACE_MODULE_T); }
-Service_Object	      { return token (ACE_SVC_OBJ_T); }
-STREAM		      { return token (ACE_STREAM_T); }
-active	              { return token (ACE_ACTIVE); }
-inactive	      { return token (ACE_INACTIVE); }
-":"		      { return token (':'); }
-"*"		      { return token ('*'); }
-"("                   { return token ('('); }
-")"                   { return token (')'); }
-"{"                   { return token ('{'); }
-"}"                   { return token ('}'); }
-{string}	      {
-                        /* Remove trailing double quote character */
-                        ACE_TCHAR *s = ACE_OS::strrchr (yytext, yytext[0]);
-
-                        ACE_ASSERT (s != 0);
-                        /* Eliminate the opening and closing double or
-                           single quotes. */
-                        *s = '\0';
-			yyleng -= 1;
-                        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext + 1, yyleng);
-			return token (ACE_STRING); }
-{ident}		      {
-		        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng);
-			return token (ACE_IDENT);
-		      }
-{pathname}	      {
-		        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng);
-			return token (ACE_PATHNAME);
-		      }
-{white_space}+	      ; /* EMPTY */
-{carrage_retn}        ; /* EMPTY */
-{newline}	      { ACE_SVC_CONF_PARAM->yylineno++; }
-{other}		      {
-                         ACE_ERROR ((LM_ERROR,
-                                     ACE_LIB_TEXT ("unknown character = (%d"), 
-                                                   *yytext));
-                        if (ACE_OS::ace_isprint (*yytext))
-                          ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *yytext));
-                        ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n")));
-                      }
-<<EOF>>               { yyterminate (); }
-%%
-int
-yywrap (void)
-{
-  ACE_OS::fflush (yyin);
-  yytext[0] = '#';
-  yyleng = 0;
-
-  return 1;
-}
-
-void
-yy_push_buffer (FILE *file, yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  if (buffer == 0)
-    buffer = yy_create_buffer (file, YY_BUF_SIZE);
-
-  yy_switch_to_buffer (buffer);
-}
-
-void
-yy_push_buffer (const ACE_TCHAR *directive, yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  // yyparse() may invoke yylex() multiple times when parsing
-  // a single directive.  Prevent a new buffer from created during
-  // each call to yylex().
-  if (YY_CURRENT_BUFFER != 0
-      && directive == YY_CURRENT_BUFFER->yy_ch_buf)
-    return;
-
-  if (buffer == 0)
-    {
-      // yy_scan_string() already switches the buffer so there is
-      // no need to explicitly make the switch.
-      buffer = yy_scan_string (directive);
-    }
-  else
-    yy_switch_to_buffer (buffer);
-}
-
-void
-yy_pop_buffer (yy_buffer_state *buffer)
-{
-  // External synchronization is required.
-
-  yy_switch_to_buffer (buffer);
-}
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 005f8ad972a..cb159d68b2f 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -16,6 +16,7 @@ ACE_RCSID (ace,
            Svc_Conf_y,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Prototypes.
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
@@ -428,4 +429,7 @@ main (int argc, char *argv[])
   return ::yyparse (&param);
 }
 #endif /* DEBUGGING */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp
deleted file mode 100644
index c5d79aa1f32..00000000000
--- a/ace/Svc_Conf_Lexer_Guard.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Svc_Conf_Lexer_Guard.h"
-
-#if (ACE_USES_CLASSIC_SVC_CONF == 1)
-
-#include "ace/Svc_Conf.h"
-
-ACE_RCSID (ace,
-           Svc_Conf_Lexer_Guard,
-           "$Id$")
-
-ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (ACE_Svc_Conf_Param *param)
-  : buffer_ (0)
-{
-  // External synchronization is required.
-
-  // Note that allocation/deallocation is done once during the
-  // processing of a service configurator directive.  Memory
-  // managements is done at a higher level, not in this class.  This
-  // is necessary to prevent an allocation/deallocation from occurring
-  // when parsing/scanning each token.
-
-  if (param->type == ACE_Svc_Conf_Param::SVC_CONF_FILE)
-    ::ace_yy_push_buffer (param->source.file, param->buffer);
-  else
-    ::ace_yy_push_buffer (param->source.directive,
-                          param->buffer);
-
-  this->buffer_ = param->buffer;
-}
-
-ACE_Svc_Conf_Lexer_Guard::~ACE_Svc_Conf_Lexer_Guard (void)
-{
-  // External synchronization is required.
-
-  ::ace_yy_pop_buffer (this->buffer_);
-}
-#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Svc_Conf_Lexer_Guard.h b/ace/Svc_Conf_Lexer_Guard.h
deleted file mode 100644
index 46f0c9a450d..00000000000
--- a/ace/Svc_Conf_Lexer_Guard.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Svc_Conf_Lexer_Guard.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef ACE_SVC_CONF_LEXER_GUARD_H
-#define ACE_SVC_CONF_LEXER_GUARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Forward declarations
-class ACE_Svc_Conf_Param;
-
-struct ace_yy_buffer_state;
-
-/**
- * @class ACE_Svc_Conf_Lexer_Guard
- *
- * @brief "Guard" that ensures lexer buffer switching is
- *        exception-safe.
- *
- * Buffers are switched, if necessary, each time a token is
- * parsed/scanned.  The buffer switching must be synchronized
- * externally.  This class performs no synchronization.
- *
- * @note Note that allocation/deallocation is done once during the
- *       processing of a service configurator directive.  Memory
- *       managements is done at a higher level, not in this class.
- *       This is necessary to prevent an allocation/deallocation from
- *       occurring when parsing/scanning each token.
- */
-class ACE_Svc_Conf_Lexer_Guard
-{
-public:
-
-  /// Constructor
-  /**
-   * Switches buffers, if necessary, when token scanning first
-   * begins.  Allocation of the buffer will also occur if one has not
-   * already been allocated.  This operation effectively pushes a
-   * buffer on to a stack.
-   */
-  ACE_Svc_Conf_Lexer_Guard (ACE_Svc_Conf_Param *param);
-
-  /// Destructor
-  /**
-   * Switches buffers, if necessary when token scanning completes.  No
-   * buffer deallocation occurs here.  Buffers are deallocated when
-   * parsing of the entire directive is done, not when scanning of a
-   * single token is done.  This operation effective pops a buffer off
-   * of a stack.
-   */
-  ~ACE_Svc_Conf_Lexer_Guard (void);
-
-private:
-
-  /// Lexer buffer that corresponds to the current Service
-  /// Configurator file/direct scan.
-  ace_yy_buffer_state *buffer_;
-
-};
-
-
-#include /**/ "ace/post.h"
-
-#endif  /* ACE_SVC_CONF_LEXER_GUARD_H */
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
deleted file mode 100644
index 7d820243d36..00000000000
--- a/ace/Svc_Conf_l.cpp
+++ /dev/null
@@ -1,1850 +0,0 @@
-#define ACE_YY_NO_UNPUT
-
-#include "ace/Object_Manager.h"
-#include "ace/Guard_T.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Synch_Traits.h"
-#include "ace/OS_NS_ctype.h"
-#include "ace/OS_NS_string.h"
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header$
- */
-
-#define FLEX_SCANNER
-#define ACE_YY_FLEX_MAJOR_VERSION 2
-#define ACE_YY_FLEX_MINOR_VERSION 5
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include "ace/OS_NS_stdlib.h"
-
-/* Use prototypes in function declarations. */
-#define ACE_YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define ACE_YY_USE_CONST
-
-#else        /* ! __cplusplus */
-
-#if __STDC__
-
-#define ACE_YY_USE_PROTOS
-#define ACE_YY_USE_CONST
-
-#endif        /* __STDC__ */
-#endif        /* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include /**/ <io.h>
-#include "ace/OS_NS_stdlib.h"
-#define ACE_YY_USE_CONST
-#define ACE_YY_USE_PROTOS
-#endif
-
-#ifdef ACE_YY_USE_CONST
-#define ace_yyconst const
-#else
-#define ace_yyconst
-#endif
-
-
-#ifdef ACE_YY_USE_PROTOS
-#define ACE_YY_PROTO(proto) proto
-#else
-#define ACE_YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define ACE_YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed ACE_TCHAR to an unsigned
- * integer for use as an array index.  If the signed ACE_TCHAR is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define ACE_YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN ace_yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The ACE_YYSTATE alias is for lex
- * compatibility.
- */
-#define ACE_YY_START ((ace_yy_start - 1) / 2)
-#define ACE_YYSTATE ACE_YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define ACE_YY_STATE_EOF(state) (ACE_YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define ACE_YY_NEW_FILE ace_yyrestart( ace_yyin )
-
-#define ACE_YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define ACE_YY_BUF_SIZE 16384
-
-typedef struct ace_yy_buffer_state *ACE_YY_BUFFER_STATE;
-
-extern int ace_yyleng;
-extern FILE *ace_yyin, *ace_yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- *         if ( condition_holds )
- *                ace_yyless( 5 );
- *        else
- *                do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the ace_yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                *ace_yy_cp = ace_yy_hold_char; \
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \
-                ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \
-                ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \
-                } \
-        while ( 0 )
-
-#if (ACE_USES_CLASSIC_SVC_CONF == 1)
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int ace_yy_size_t;
-
-
-struct ace_yy_buffer_state
-        {
-        FILE *ace_yy_input_file;
-
-        ACE_TCHAR *ace_yy_ch_buf;                /* input buffer */
-        ACE_TCHAR *ace_yy_buf_pos;                /* current position in input buffer */
-
-        /* Size of input buffer in bytes, not including room for EOB
-         * characters.
-         */
-        ace_yy_size_t ace_yy_buf_size;
-
-        /* Number of characters read into ace_yy_ch_buf, not including EOB
-         * characters.
-         */
-        int ace_yy_n_chars;
-
-        /* Whether we "own" the buffer - i.e., we know we created it,
-         * and can realloc() it to grow it, and should free() it to
-         * delete it.
-         */
-        int ace_yy_is_our_buffer;
-
-        /* Whether this is an "interactive" input source; if so, and
-         * if we're using stdio for input, then we want to use getc()
-         * instead of fread(), to make sure we stop fetching input after
-         * each newline.
-         */
-        int ace_yy_is_interactive;
-
-        /* Whether we're considered to be at the beginning of a line.
-         * If so, '^' rules will be active on the next match, otherwise
-         * not.
-         */
-        int ace_yy_at_bol;
-
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int ace_yy_fill_buffer;
-
-        int ace_yy_buffer_status;
-#define ACE_YY_BUFFER_NEW 0
-#define ACE_YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as ACE_YY_EOF_PENDING, to indicate that we
-         * shouldn't try reading from the input source any more.  We might
-         * still have a bunch of tokens to match, though, because of
-         * possible backing-up.
-         *
-         * When we actually see the EOF, we change the status to "new"
-         * (via ace_yyrestart()), so that the user can continue scanning by
-         * just pointing ace_yyin at a new input file.
-         */
-#define ACE_YY_BUFFER_EOF_PENDING 2
-        };
-
-static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define ACE_YY_CURRENT_BUFFER ace_yy_current_buffer
-
-
-/* ace_yy_hold_char holds the character lost when ace_yytext is formed. */
-static ACE_TCHAR ace_yy_hold_char;
-
-static int ace_yy_n_chars;                /* number of characters read into ace_yy_ch_buf */
-
-
-int ace_yyleng;
-
-/* Points to current character in buffer. */
-static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0;
-static int ace_yy_init = 1;                /* whether we need to initialize */
-static int ace_yy_start = 0;        /* start state number */
-
-/* Flag which is used to allow ace_yywrap()'s to do buffer switches
- * instead of setting up a fresh ace_yyin.  A bit of a hack ...
- */
-static int ace_yy_did_buffer_switch_on_eof;
-
-void ace_yyrestart ACE_YY_PROTO(( FILE *input_file ));
-
-void ace_yy_switch_to_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE new_buffer ));
-void ace_yy_load_buffer_state ACE_YY_PROTO(( void ));
-ACE_YY_BUFFER_STATE ace_yy_create_buffer ACE_YY_PROTO(( FILE *file, int size ));
-void ace_yy_delete_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
-void ace_yy_init_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b, FILE *file ));
-void ace_yy_flush_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
-#define ACE_YY_FLUSH_BUFFER ace_yy_flush_buffer( ace_yy_current_buffer )
-
-ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( ACE_TCHAR *base, ace_yy_size_t size ));
-ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *ace_yy_str ));
-ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *bytes, int len ));
-
-static void *ace_yy_flex_alloc ACE_YY_PROTO(( ace_yy_size_t ));
-static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, ace_yy_size_t ));
-static void ace_yy_flex_free ACE_YY_PROTO(( void * ));
-
-#define ace_yy_new_buffer ace_yy_create_buffer
-
-#define ace_yy_set_interactive(is_interactive) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \
-        }
-
-#define ace_yy_set_bol(at_bol) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_at_bol = at_bol; \
-        }
-
-#define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol)
-
-typedef ACE_TCHAR ACE_YY_CHAR;
-FILE *ace_yyin = (FILE *) 0, *ace_yyout = (FILE *) 0;
-typedef int ace_yy_state_type;
-extern ACE_TCHAR *ace_yytext;
-#define ace_yytext_ptr ace_yytext
-
-static ace_yy_state_type ace_yy_get_previous_state ACE_YY_PROTO(( void ));
-static ace_yy_state_type ace_yy_try_NUL_trans ACE_YY_PROTO(( ace_yy_state_type current_state ));
-static int ace_yy_get_next_buffer ACE_YY_PROTO(( void ));
-static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up ace_yytext.
- */
-#define ACE_YY_DO_BEFORE_ACTION \
-        ace_yytext_ptr = ace_yy_bp; \
-        ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \
-        ace_yy_hold_char = *ace_yy_cp; \
-        *ace_yy_cp = '\0'; \
-        ace_yy_c_buf_p = ace_yy_cp;
-
-#define ACE_YY_NUM_RULES 26
-#define ACE_YY_END_OF_BUFFER 27
-static ace_yyconst short int ace_yy_accept[108] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   27,   25,   22,   24,
-       23,   25,   21,   25,   15,   16,   14,   21,   13,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   17,   18,
-       25,   22,    0,   19,   21,    0,    0,   19,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,    0,    1,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   20,    8,   10,   20,   11,   20,   20,    6,
-        5,    3,    7,   20,   20,    2,   20,    4,   20,   12,
-
-       20,   20,   20,   20,   20,    9,    0
-    } ;
-
-static ace_yyconst int ace_yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    5,    6,    7,    8,    6,    9,    6,   10,   11,
-       12,   13,    6,    6,   14,   14,   14,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   16,    6,    6,
-        6,    6,    6,    6,   17,   18,   18,   18,   19,   18,
-       18,   18,   18,   18,   18,   18,   20,   18,   21,   18,
-       18,   22,   23,   24,   18,   18,   18,   18,   18,   18,
-        6,   14,    6,    6,   25,    6,   26,   27,   28,   29,
-
-       30,   18,   18,   18,   31,   32,   18,   33,   34,   35,
-       36,   37,   18,   38,   39,   40,   41,   42,   18,   18,
-       43,   18,   44,    6,   45,   14,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static ace_yyconst int ace_yy_meta[46] =
-    {   0,
-        1,    1,    1,    1,    2,    2,    2,    2,    3,    2,
-        2,    2,    2,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    2,    2
-    } ;
-
-static ace_yyconst short int ace_yy_base[113] =
-    {   0,
-        0,  127,    0,  118,    0,  117,  124,  438,   44,  438,
-      438,  115,  100,   93,  438,  438,  438,   86,  438,   38,
-       39,   42,   48,   51,   54,   60,   64,   68,  438,  438,
-       98,   81,   86,   82,   72,   71,   71,   61,   76,   82,
-       90,   91,  101,  104,  105,  114,  118,  124,   58,  438,
-      133,  136,  145,  148,  151,  157,  166,  167,  175,  179,
-      183,  189,  197,  203,  207,  216,  215,  219,  228,  227,
-      231,  237,  250,  254,  262,  263,  272,  273,  282,  283,
-      286,  292,  301,  302,  311,  314,  315,  323,  324,  332,
-      333,  336,  344,  345,  348,  354,  362,  363,  366,  372,
-
-      375,  381,  384,  387,  390,  396,  438,  429,   56,  431,
-       47,  434
-    } ;
-
-static ace_yyconst short int ace_yy_def[113] =
-    {   0,
-      107,    1,    1,    1,    1,    1,  107,  107,  107,  107,
-      107,  108,  109,  110,  107,  107,  107,  109,  107,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  107,  107,
-      112,  107,  108,  108,  109,  109,  110,  110,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  112,  107,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-
-      111,  111,  111,  111,  111,  111,    0,  107,  107,  107,
-      107,  107
-    } ;
-
-static ace_yyconst short int ace_yy_nxt[484] =
-    {   0,
-        8,    9,   10,   11,    9,    8,   12,    8,   13,   14,
-       15,   16,   17,   18,   18,   19,   20,   20,   20,   21,
-       20,   20,   22,   20,   23,   24,   20,   20,   25,   20,
-       26,   20,   20,   20,   20,   20,   20,   27,   28,   20,
-       20,   20,   20,   29,   30,   32,   35,   35,   32,   39,
-       35,   35,   35,   36,   36,   35,   35,   36,   35,   35,
-       50,   35,   35,  107,   35,   41,   36,   35,   35,   36,
-       38,   42,   35,   35,   40,   36,   35,   35,   43,   36,
-       38,   35,   32,   36,   35,   32,  107,  107,   34,   35,
-       35,  107,   34,   46,   45,   35,   44,  107,   35,   35,
-
-       50,  107,   38,   35,   35,  107,  107,   47,   48,   35,
-       51,   52,   35,   35,   35,   36,  107,   35,   35,  107,
-      107,   34,   35,  107,   31,   31,   35,   35,   53,  107,
-       56,   35,   35,  107,   31,  107,  107,   35,   55,  107,
-       54,   35,  107,   59,   35,  107,   35,   57,  107,   35,
-      107,  107,   58,   35,   63,   60,   35,  107,   35,   35,
-      107,   35,   61,  107,   35,   35,  107,  107,  107,  107,
-       35,  107,  107,   62,   35,   35,   66,  107,   65,   35,
-       35,  107,  107,   35,   67,  107,   64,   35,   35,  107,
-      107,   35,   35,  107,  107,  107,   35,   35,  107,  107,
-
-      107,   68,   35,  107,  107,   35,  107,   69,   71,  107,
-       35,   35,  107,   74,   70,   35,   35,  107,  107,   72,
-       35,   73,  107,   35,   35,  107,  107,   35,   35,   35,
-      107,  107,   35,   75,  107,   35,   35,  107,  107,   35,
-       35,   35,  107,  107,   35,   35,  107,  107,   76,   77,
-       35,  107,  107,  107,   78,  107,   82,   81,   35,  107,
-       79,   80,   35,   35,  107,  107,   83,   35,  107,  107,
-       35,   35,  107,   85,  107,   35,   35,  107,  107,   84,
-       35,   35,  107,  107,  107,   35,   35,  107,  107,   86,
-       35,   35,   87,  107,   35,   35,   35,  107,  107,   35,
-
-       35,  107,   88,   89,  107,   35,  107,  107,  107,   35,
-       35,   90,   91,   92,   35,   35,  107,  107,  107,   35,
-      107,  107,   35,   35,   35,   93,  107,   35,   35,  107,
-      107,   35,   35,  107,  107,   94,   35,   35,  107,  107,
-       35,   35,  107,   95,   35,   35,   35,  107,  107,   35,
-       96,  107,   35,   35,  107,  107,   35,   35,   35,  107,
-      107,   35,   35,  107,  107,   97,  107,   35,  107,  107,
-       35,   35,   99,   98,   35,   35,   35,  107,  107,   35,
-       35,  107,  107,   35,  107,   35,  101,  107,   35,   35,
-      107,  100,   35,  107,   35,   35,  107,   35,   35,  107,
-
-       35,  102,  107,   35,   35,  107,  107,  107,  107,   35,
-      107,  107,  103,  104,  105,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  106,
-       33,   33,   37,   37,   49,   49,   49,    7,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107
-    } ;
-
-static ace_yyconst short int ace_yy_chk[484] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    9,   20,   21,    9,  111,
-       22,   20,   21,   20,   21,   22,   23,   22,  109,   24,
-       49,   23,   25,   23,   24,   22,   24,   25,   26,   25,
-       38,   22,   27,   26,   21,   26,   28,   27,   24,   27,
-       37,   28,   32,   28,   39,   32,   36,   35,   34,   39,
-       40,   39,   33,   27,   26,   40,   25,   40,   41,   42,
-
-       31,   18,   14,   41,   42,   41,   42,   28,   28,   43,
-       40,   41,   44,   45,   43,   13,   43,   44,   45,   44,
-       45,   12,   46,    7,    6,    4,   47,   46,   42,   46,
-       45,   47,   48,   47,    2,    0,    0,   48,   44,   48,
-       43,   51,    0,   47,   52,    0,   51,   46,   51,   52,
-        0,   52,   46,   53,   52,   47,   54,    0,   53,   55,
-       53,   54,   48,   54,   55,   56,   55,    0,    0,    0,
-       56,    0,   56,   51,   57,   58,   55,    0,   54,   57,
-       58,   57,   58,   59,   56,    0,   53,   60,   59,    0,
-       59,   61,   60,    0,   60,    0,   61,   62,   61,    0,
-
-        0,   57,   62,    0,   62,   63,    0,   58,   60,    0,
-       63,   64,   63,   63,   59,   65,   64,    0,   64,   61,
-       65,   62,   65,   67,   66,    0,    0,   68,   67,   66,
-       67,   66,   68,   64,   68,   70,   69,    0,    0,   71,
-       70,   69,   70,   69,   71,   72,   71,    0,   65,   66,
-       72,    0,   72,    0,   67,    0,   71,   70,   73,    0,
-       68,   69,   74,   73,    0,   73,   72,   74,    0,   74,
-       75,   76,    0,   74,    0,   75,   76,   75,   76,   73,
-       77,   78,    0,    0,    0,   77,   78,   77,   78,   75,
-       79,   80,   76,    0,   81,   79,   80,   79,   80,   81,
-
-       82,   81,   77,   78,    0,   82,    0,   82,    0,   83,
-       84,   79,   80,   81,   83,   84,   83,   84,    0,   85,
-        0,    0,   86,   87,   85,   82,   85,   86,   87,   86,
-       87,   88,   89,    0,    0,   83,   88,   89,   88,   89,
-       90,   91,    0,   86,   92,   90,   91,   90,   91,   92,
-       88,   92,   93,   94,    0,    0,   95,   93,   94,   93,
-       94,   95,   96,   95,    0,   89,    0,   96,    0,   96,
-       97,   98,   95,   94,   99,   97,   98,   97,   98,   99,
-      100,   99,    0,  101,    0,  100,   99,  100,  101,  102,
-      101,   97,  103,    0,  102,  104,  102,  103,  105,  103,
-
-      104,  101,  104,  105,  106,  105,    0,    0,    0,  106,
-        0,  106,  102,  103,  104,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  105,
-      108,  108,  110,  110,  112,  112,  112,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107
-    } ;
-
-static ace_yy_state_type ace_yy_last_accepting_state;
-static ACE_TCHAR *ace_yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define ace_yymore() ace_yymore_used_but_not_detected
-#define ACE_YY_MORE_ADJ 0
-#define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
-ACE_TCHAR *ace_yytext;
-#define INITIAL 0
-// $Id$
-// Sample lexical analysis for regular expression subset.  Must be
-// compiled with FLEX and an ANSI C++ compiler.
-
-// Lexical tokens values defined by YACC.
-#include "ace/Svc_Conf.h"
-#include "ace/Svc_Conf_Tokens.h"
-#include "ace/Svc_Conf_Lexer_Guard.h"
-
-ACE_RCSID (ace,
-           Svc_Conf_l,
-           "$Id$")
-
-#define token(x)  x
-#define PARAMETERS 1
-
-#define NORMAL 2
-
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef ACE_YY_SKIP_ACE_YYWRAP
-#ifdef __cplusplus
-extern "C" int ace_yywrap ACE_YY_PROTO(( void ));
-#else
-extern int ace_yywrap ACE_YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef ACE_YY_NO_UNPUT
-static void ace_yyunput ACE_YY_PROTO(( int c, ACE_TCHAR *buf_ptr ));
-#endif
-
-#ifndef ace_yytext_ptr
-static void ace_yy_flex_strncpy ACE_YY_PROTO(( ACE_TCHAR *, ace_yyconst ACE_TCHAR *, int ));
-#endif
-
-#ifdef ACE_YY_NEED_STRLEN
-static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst ACE_TCHAR * ));
-#endif
-
-#ifndef ACE_YY_NO_INPUT
-#ifdef __cplusplus
-static int ace_yyinput ACE_YY_PROTO(( void ));
-#else
-static int input ACE_YY_PROTO(( void ));
-#endif
-#endif
-
-#if ACE_YY_STACK_USED
-static int ace_yy_start_stack_ptr = 0;
-static int ace_yy_start_stack_depth = 0;
-static int *ace_yy_start_stack = 0;
-#ifndef ACE_YY_NO_PUSH_STATE
-static void ace_yy_push_state ACE_YY_PROTO(( int new_state ));
-#endif
-#ifndef ACE_YY_NO_POP_STATE
-static void ace_yy_pop_state ACE_YY_PROTO(( void ));
-#endif
-#ifndef ACE_YY_NO_TOP_STATE
-static int ace_yy_top_state ACE_YY_PROTO(( void ));
-#endif
-
-#else
-#define ACE_YY_NO_PUSH_STATE 1
-#define ACE_YY_NO_POP_STATE 1
-#define ACE_YY_NO_TOP_STATE 1
-#endif
-
-#ifdef ACE_YY_MALLOC_DECL
-ACE_YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include "ace/OS_NS_stdlib.h"
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef ACE_YY_READ_BUF_SIZE
-#define ACE_YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ACE_SVC_CONF_ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ACE_SVC_CONF_ECHO (void) fwrite( ace_yytext, ace_yyleng, 1, ace_yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or ACE_YY_NULL,
- * is returned in "result".
- */
-#ifndef ACE_YY_INPUT
-#define ACE_YY_INPUT(buf,result,max_size) \
-        if ( ace_yy_current_buffer->ace_yy_is_interactive ) \
-                { \
-                int c = '*', n; \
-                for ( n = 0; n < max_size && \
-                             (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
-                        buf[n] = (ACE_TCHAR) c; \
-                if ( c == '\n' ) \
-                        buf[n++] = (ACE_TCHAR) c; \
-                if ( c == EOF && ferror( ace_yyin ) ) \
-                        ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                result = n; \
-                } \
-        else \
-                { \
-                errno = 0; \
-                while ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
-                  && ferror( ace_yyin ) ) \
-                        { \
-                        if (errno != EINTR) \
-                                { \
-                                ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                                break; \
-                                } \
-                        errno = 0; \
-                        clearerr(ace_yyin); \
-                        } \
-                }
-#endif
-
-/* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef ace_yyterminate
-#define ace_yyterminate() return ACE_YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef ACE_YY_START_STACK_INCR
-#define ACE_YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef ACE_YY_FATAL_ERROR
-#define ACE_YY_FATAL_ERROR(msg) ace_yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef ACE_YY_DECL
-#define ACE_YY_DECL int ace_yylex ACE_YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after ace_yytext and ace_yyleng
- * have been set up.
- */
-#ifndef ACE_YY_USER_ACTION
-#define ACE_YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef ACE_YY_BREAK
-#define ACE_YY_BREAK break;
-#endif
-
-#define ACE_YY_RULE_SETUP \
-        if ( ace_yyleng > 0 ) \
-                ace_yy_current_buffer->ace_yy_at_bol = \
-                                (ace_yytext[ace_yyleng - 1] == '\n'); \
-        ACE_YY_USER_ACTION
-
-ACE_YY_DECL
-        {
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
-        register int ace_yy_act;
-
-        ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
-                                  ace_mon,
-                                  *ACE_Static_Object_Lock::instance (),
-                                  -1));
-
-        ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
-
-        if ( ace_yy_init )
-                {
-                ace_yy_init = 0;
-
-#ifdef ACE_YY_USER_INIT
-                ACE_YY_USER_INIT;
-#endif
-
-                if ( ! ace_yy_start )
-                        ace_yy_start = 1;        /* first start state */
-
-                if ( ! ace_yyin )
-                        ace_yyin = stdin;
-
-                if ( ! ace_yyout )
-                        ace_yyout = stdout;
-
-                if ( ! ace_yy_current_buffer )
-                        ace_yy_current_buffer =
-                                ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
-
-                ace_yy_load_buffer_state();
-                }
-
-        while ( 1 )                /* loops until end-of-file is reached */
-                {
-                ace_yy_cp = ace_yy_c_buf_p;
-
-                /* Support of ace_yytext. */
-                *ace_yy_cp = ace_yy_hold_char;
-
-                /* ace_yy_bp points to the position in ace_yy_ch_buf of the start of
-                 * the current run.
-                 */
-                ace_yy_bp = ace_yy_cp;
-
-                ace_yy_current_state = ace_yy_start;
-                ace_yy_current_state += ACE_YY_AT_BOL();
-ace_yy_match:
-                do
-                        {
-                        register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)];
-                        if ( ace_yy_accept[ace_yy_current_state] )
-                                {
-                                ace_yy_last_accepting_state = ace_yy_current_state;
-                                ace_yy_last_accepting_cpos = ace_yy_cp;
-                                }
-                        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                                {
-                                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                                if ( ace_yy_current_state >= 108 )
-                                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                                }
-                        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                        ++ace_yy_cp;
-                        }
-                while ( ace_yy_base[ace_yy_current_state] != 438 );
-
-ace_yy_find_action:
-                ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                if ( ace_yy_act == 0 )
-                        { /* have to back up */
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                        }
-
-                ACE_YY_DO_BEFORE_ACTION;
-
-
-do_action:        /* This label is used only to access EOF actions. */
-
-
-                switch ( ace_yy_act )
-        { /* beginning of action switch */
-                        case 0: /* must back up */
-                        /* undo the effects of ACE_YY_DO_BEFORE_ACTION */
-                        *ace_yy_cp = ace_yy_hold_char;
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        goto ace_yy_find_action;
-
-case 1:
-*ace_yy_cp = ace_yy_hold_char; /* undo effects of setting up ace_yytext */
-ace_yy_c_buf_p = ace_yy_cp -= 1;
-ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
-ACE_YY_RULE_SETUP
-; /* EMPTY */
-        ACE_YY_BREAK
-case 2:
-ACE_YY_RULE_SETUP
-{ return token (ACE_DYNAMIC); }
-        //ACE_YY_BREAK
-case 3:
-ACE_YY_RULE_SETUP
-{ return token (ACE_STATIC); }
-        //ACE_YY_BREAK
-case 4:
-ACE_YY_RULE_SETUP
-{ return token (ACE_SUSPEND); }
-        //ACE_YY_BREAK
-case 5:
-ACE_YY_RULE_SETUP
-{ return token (ACE_RESUME); }
-        //ACE_YY_BREAK
-case 6:
-ACE_YY_RULE_SETUP
-{ return token (ACE_REMOVE); }
-        //ACE_YY_BREAK
-case 7:
-ACE_YY_RULE_SETUP
-{ return token (ACE_USTREAM); }
-        //ACE_YY_BREAK
-case 8:
-ACE_YY_RULE_SETUP
-{ return token (ACE_MODULE_T); }
-        //ACE_YY_BREAK
-case 9:
-ACE_YY_RULE_SETUP
-{ return token (ACE_SVC_OBJ_T); }
-        //ACE_YY_BREAK
-case 10:
-ACE_YY_RULE_SETUP
-{ return token (ACE_STREAM_T); }
-        //ACE_YY_BREAK
-case 11:
-ACE_YY_RULE_SETUP
-{ return token (ACE_ACTIVE); }
-        //ACE_YY_BREAK
-case 12:
-ACE_YY_RULE_SETUP
-{ return token (ACE_INACTIVE); }
-        //ACE_YY_BREAK
-case 13:
-ACE_YY_RULE_SETUP
-{ return token (':'); }
-        //ACE_YY_BREAK
-case 14:
-ACE_YY_RULE_SETUP
-{ return token ('*'); }
-        //ACE_YY_BREAK
-case 15:
-ACE_YY_RULE_SETUP
-{ return token ('('); }
-        //ACE_YY_BREAK
-case 16:
-ACE_YY_RULE_SETUP
-{ return token (')'); }
-        //ACE_YY_BREAK
-case 17:
-ACE_YY_RULE_SETUP
-{ return token ('{'); }
-        //ACE_YY_BREAK
-case 18:
-ACE_YY_RULE_SETUP
-{ return token ('}'); }
-        //ACE_YY_BREAK
-case 19:
-ACE_YY_RULE_SETUP
-{
-                        /* Remove trailing quote character (' or ") */
-                        ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, ace_yytext[0]);
-
-                        ACE_ASSERT (s != 0);
-                        /* Eliminate the opening and closing double or
-                           single quotes. */
-                        *s = '\0';
-                        ace_yyleng -= 1;
-                        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
-                        return token (ACE_STRING); }
-        //ACE_YY_BREAK
-case 20:
-ACE_YY_RULE_SETUP
-{
-                        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                        return token (ACE_IDENT);
-                      }
-        //ACE_YY_BREAK
-case 21:
-ACE_YY_RULE_SETUP
-{
-                        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                        return token (ACE_PATHNAME);
-                      }
-        //ACE_YY_BREAK
-case 22:
-ACE_YY_RULE_SETUP
-; /* EMPTY */
-        ACE_YY_BREAK
-case 23:
-ACE_YY_RULE_SETUP
-; /* EMPTY */
-        ACE_YY_BREAK
-case 24:
-ACE_YY_RULE_SETUP
-{ ACE_SVC_CONF_PARAM->yylineno++; }
-        ACE_YY_BREAK
-case 25:
-ACE_YY_RULE_SETUP
-{
-                         ACE_ERROR ((LM_ERROR,
-                                     ACE_LIB_TEXT ("unknown character = (%d"),
-                                                   *ace_yytext));
-                        if (ACE_OS::ace_isprint (*ace_yytext))
-                          ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext));
-                        ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n")));
-                      }
-        ACE_YY_BREAK
-case ACE_YY_STATE_EOF(INITIAL):
-case ACE_YY_STATE_EOF(PARAMETERS):
-case ACE_YY_STATE_EOF(NORMAL):
-{ ace_yyterminate (); }
-        ACE_YY_BREAK
-case 26:
-ACE_YY_RULE_SETUP
-ACE_SVC_CONF_ECHO;
-        ACE_YY_BREAK
-
-        case ACE_YY_END_OF_BUFFER:
-                {
-                /* Amount of text matched not including the EOB char. */
-                int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
-
-                /* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
-                *ace_yy_cp = ace_yy_hold_char;
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
-
-                if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed ace_yyin at a new source and called
-                         * ace_yylex().  If so, then we have to assure
-                         * consistency between ace_yy_current_buffer and our
-                         * globals.  Here is the right place to do so, because
-                         * this is the first action (other than possibly a
-                         * back-up) that will match for the new input source.
-                         */
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-                        ace_yy_current_buffer->ace_yy_input_file = ace_yyin;
-                        ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL;
-                        }
-
-                /* Note that here we test for ace_yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since ace_yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the
-                 * end-of-buffer state).  Contrast this with the test
-                 * in input().
-                 */
-                if ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        { /* This was really a NUL. */
-                        ace_yy_state_type ace_yy_next_state;
-
-                        ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                        ace_yy_current_state = ace_yy_get_previous_state();
-
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * ace_yy_get_previous_state() go ahead and do it
-                         * for us because it doesn't know how to deal
-                         * with the possibility of jamming (and we don't
-                         * want to build jamming into it because then it
-                         * will run more slowly).
-                         */
-
-                        ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state );
-
-                        ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                        if ( ace_yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                ace_yy_cp = ++ace_yy_c_buf_p;
-                                ace_yy_current_state = ace_yy_next_state;
-                                goto ace_yy_match;
-                                }
-
-                        else
-                                {
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                goto ace_yy_find_action;
-                                }
-                        }
-
-                else switch ( ace_yy_get_next_buffer() )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                ace_yy_did_buffer_switch_on_eof = 0;
-
-                                if ( ace_yywrap() )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * ace_yy_get_next_buffer() to have set up
-                                         * ace_yytext, we can now set up
-                                         * ace_yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * ACE_YY_NULL, it'll still work - another
-                                         * ACE_YY_NULL will get returned.
-                                         */
-                                        ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                                        ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START);
-                                        goto do_action;
-                                        }
-
-                                else
-                                        {
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-
-                        case EOB_ACT_CONTINUE_SCAN:
-                                ace_yy_c_buf_p =
-                                        ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_match;
-
-                        case EOB_ACT_LAST_MATCH:
-                                ace_yy_c_buf_p =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars];
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_find_action;
-                        }
-                break;
-                }
-
-        default:
-                ACE_YY_FATAL_ERROR(
-                        "fatal flex scanner internal error--no action found" );
-        } /* end of action switch */
-                } /* end of scanning one token */
-        } /* end of ace_yylex */
-
-
-/* ace_yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *        EOB_ACT_LAST_MATCH -
- *        EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *        EOB_ACT_END_OF_FILE - end of file
- */
-
-static int ace_yy_get_next_buffer()
-        {
-        register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf;
-        register ACE_TCHAR *source = ace_yytext_ptr;
-        register int number_to_move, i;
-        int ret_val;
-
-        if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] )
-                ACE_YY_FATAL_ERROR(
-                "fatal flex scanner internal error--end of buffer missed" );
-
-        if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
-                { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_YY_MORE_ADJ == 1 )
-                        {
-                        /* We matched a single character, the EOB, so
-                         * treat this as a final EOF.
-                         */
-                        return EOB_ACT_END_OF_FILE;
-                        }
-
-                else
-                        {
-                        /* We matched some text prior to the EOB, first
-                         * process it.
-                         */
-                        return EOB_ACT_LAST_MATCH;
-                        }
-                }
-
-        /* Try to read more data. */
-
-        /* First move last chars to start of buffer. */
-        number_to_move = (int) (ace_yy_c_buf_p - ace_yytext_ptr) - 1;
-
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-
-        if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0;
-
-        else
-                {
-                int num_to_read =
-                        ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1;
-
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
-#ifdef ACE_YY_USES_REJECT
-                        ACE_YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-                        /* just a shorter name for the current buffer */
-                        ACE_YY_BUFFER_STATE b = ace_yy_current_buffer;
-
-                        int ace_yy_c_buf_p_offset =
-                                (int) (ace_yy_c_buf_p - b->ace_yy_ch_buf);
-
-                        if ( b->ace_yy_is_our_buffer )
-                                {
-                                int new_size = b->ace_yy_buf_size * 2;
-
-                                if ( new_size <= 0 )
-                                        b->ace_yy_buf_size += b->ace_yy_buf_size / 8;
-                                else
-                                        b->ace_yy_buf_size *= 2;
-
-                                b->ace_yy_ch_buf = (ACE_TCHAR *)
-                                        /* Include room in for 2 EOB chars. */
-                                        ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf,
-                                                         (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) );
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->ace_yy_ch_buf = 0;
-
-                        if ( ! b->ace_yy_ch_buf )
-                                ACE_YY_FATAL_ERROR(
-                                "fatal error - scanner input buffer overflow" );
-
-                        ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
-
-                        num_to_read = ace_yy_current_buffer->ace_yy_buf_size -
-                                                number_to_move - 1;
-#endif
-                        }
-
-                if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
-                        num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR);
-
-                /* Read in more data. */
-                ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
-                        ace_yy_n_chars, num_to_read );
-
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
-
-        if ( ace_yy_n_chars == 0 )
-                {
-                if ( number_to_move == ACE_YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        ace_yyrestart( ace_yyin );
-                        }
-
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        ace_yy_current_buffer->ace_yy_buffer_status =
-                                ACE_YY_BUFFER_EOF_PENDING;
-                        }
-                }
-
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
-
-        ace_yy_n_chars += number_to_move;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR;
-
-        ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0];
-
-        return ret_val;
-        }
-
-
-/* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */
-
-static ace_yy_state_type ace_yy_get_previous_state()
-        {
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp;
-
-        ace_yy_current_state = ace_yy_start;
-        ace_yy_current_state += ACE_YY_AT_BOL();
-
-        for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp )
-                {
-                register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1);
-                if ( ace_yy_accept[ace_yy_current_state] )
-                        {
-                        ace_yy_last_accepting_state = ace_yy_current_state;
-                        ace_yy_last_accepting_cpos = ace_yy_cp;
-                        }
-                while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                        {
-                        ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                        if ( ace_yy_current_state >= 108 )
-                                ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                        }
-                ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                }
-
-        return ace_yy_current_state;
-        }
-
-
-/* ace_yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *        next_state = ace_yy_try_NUL_trans( current_state );
- */
-
-#ifdef ACE_YY_USE_PROTOS
-static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_state_type ace_yy_current_state )
-#else
-static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_current_state )
-ace_yy_state_type ace_yy_current_state;
-#endif
-        {
-        register int ace_yy_is_jam;
-        register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
-
-        register ACE_YY_CHAR ace_yy_c = 1;
-        if ( ace_yy_accept[ace_yy_current_state] )
-                {
-                ace_yy_last_accepting_state = ace_yy_current_state;
-                ace_yy_last_accepting_cpos = ace_yy_cp;
-                }
-        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                {
-                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                if ( ace_yy_current_state >= 108 )
-                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                }
-        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-        ace_yy_is_jam = (ace_yy_current_state == 107);
-
-        return ace_yy_is_jam ? 0 : ace_yy_current_state;
-        }
-
-
-#ifndef ACE_YY_NO_UNPUT
-#ifdef ACE_YY_USE_PROTOS
-static void ace_yyunput( int c, register ACE_TCHAR *ace_yy_bp )
-#else
-static void ace_yyunput( c, ace_yy_bp )
-int c;
-register ACE_TCHAR *ace_yy_bp;
-#endif
-        {
-        register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
-
-        /* undo effects of setting up ace_yytext */
-        *ace_yy_cp = ace_yy_hold_char;
-
-        if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
-                { /* need to shift things up to make room */
-                /* +2 for EOB chars. */
-                register int number_to_move = ace_yy_n_chars + 2;
-                register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
-                                        ace_yy_current_buffer->ace_yy_buf_size + 2];
-                register ACE_TCHAR *source =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
-
-                while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
-                        *--dest = *--source;
-
-                ace_yy_cp += (int) (dest - source);
-                ace_yy_bp += (int) (dest - source);
-                ace_yy_current_buffer->ace_yy_n_chars =
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
-
-                if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
-                        ACE_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-                }
-
-        *--ace_yy_cp = (ACE_TCHAR) c;
-
-
-        ace_yytext_ptr = ace_yy_bp;
-        ace_yy_hold_char = *ace_yy_cp;
-        ace_yy_c_buf_p = ace_yy_cp;
-        }
-#endif        /* ifndef ACE_YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int ace_yyinput()
-#else
-static int input()
-#endif
-        {
-        int c;
-
-        *ace_yy_c_buf_p = ace_yy_hold_char;
-
-        if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR )
-                {
-                /* ace_yy_c_buf_p now points to the character we want to return.
-                 * If this occurs *before* the EOB characters, then it's a
-                 * valid NUL; if not, then we've hit the end of the buffer.
-                 */
-                if ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        /* This was really a NUL. */
-                        *ace_yy_c_buf_p = '\0';
-
-                else
-                        { /* need more input */
-                        int offset = ace_yy_c_buf_p - ace_yytext_ptr;
-                        ++ace_yy_c_buf_p;
-
-                        switch ( ace_yy_get_next_buffer() )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because ace_yy_g_n_b()
-                                         * sees that we've accumulated a
-                                         * token and flags that we need to
-                                         * try matching the token before
-                                         * proceeding.  But for input(),
-                                         * there's no matching to consider.
-                                         * So convert the EOB_ACT_LAST_MATCH
-                                         * to EOB_ACT_END_OF_FILE.
-                                         */
-
-                                        /* Reset buffer status. */
-                                        ace_yyrestart( ace_yyin );
-
-                                        /* fall through */
-
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( ace_yywrap() )
-                                                return EOF;
-
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
-#ifdef __cplusplus
-                                        return ace_yyinput();
-#else
-                                        return input();
-#endif
-                                        }
-
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        ace_yy_c_buf_p = ace_yytext_ptr + offset;
-                                        break;
-                                }
-                        }
-                }
-
-        c = *(unsigned char *) ace_yy_c_buf_p;        /* cast for 8-bit char's */
-        *ace_yy_c_buf_p = '\0';        /* preserve ace_yytext */
-        ace_yy_hold_char = *++ace_yy_c_buf_p;
-
-        ace_yy_current_buffer->ace_yy_at_bol = (c == '\n');
-
-        return c;
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yyrestart( FILE *input_file )
-#else
-void ace_yyrestart( input_file )
-FILE *input_file;
-#endif
-        {
-        if ( ! ace_yy_current_buffer )
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
-
-        ace_yy_init_buffer( ace_yy_current_buffer, input_file );
-        ace_yy_load_buffer_state();
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yy_switch_to_buffer( ACE_YY_BUFFER_STATE new_buffer )
-#else
-void ace_yy_switch_to_buffer( new_buffer )
-ACE_YY_BUFFER_STATE new_buffer;
-#endif
-        {
-        if ( ace_yy_current_buffer == new_buffer )
-                return;
-
-        if ( ace_yy_current_buffer )
-                {
-                /* Flush out information for old buffer. */
-                *ace_yy_c_buf_p = ace_yy_hold_char;
-                ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p;
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
-
-        ace_yy_current_buffer = new_buffer;
-        ace_yy_load_buffer_state();
-
-        /* We don't actually know whether we did this switch during
-         * EOF (ace_yywrap()) processing, but the only time this flag
-         * is looked at is after ace_yywrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        ace_yy_did_buffer_switch_on_eof = 1;
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yy_load_buffer_state( void )
-#else
-void ace_yy_load_buffer_state()
-#endif
-        {
-        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-        ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos;
-        ace_yyin = ace_yy_current_buffer->ace_yy_input_file;
-        ace_yy_hold_char = *ace_yy_c_buf_p;
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_create_buffer( FILE *file, int size )
-#else
-ACE_YY_BUFFER_STATE ace_yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-        {
-        ACE_YY_BUFFER_STATE b;
-
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
-
-        b->ace_yy_buf_size = size;
-
-        /* ace_yy_ch_buf has to be 2 characters longer than the size given because
-         * we need to put in 2 end-of-buffer characters.
-         */
-        b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) );
-        if ( ! b->ace_yy_ch_buf )
-                ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" );
-
-        b->ace_yy_is_our_buffer = 1;
-
-        ace_yy_init_buffer( b, file );
-
-        return b;
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yy_delete_buffer( ACE_YY_BUFFER_STATE b )
-#else
-void ace_yy_delete_buffer( b )
-ACE_YY_BUFFER_STATE b;
-#endif
-        {
-        if ( ! b )
-                return;
-
-        if ( b == ace_yy_current_buffer )
-                ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0;
-
-        if ( b->ace_yy_is_our_buffer )
-                ace_yy_flex_free( (void *) b->ace_yy_ch_buf );
-
-        ace_yy_flex_free( (void *) b );
-        }
-
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yy_init_buffer( ACE_YY_BUFFER_STATE b, FILE *file )
-#else
-void ace_yy_init_buffer( b, file )
-ACE_YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-        {
-        ace_yy_flush_buffer( b );
-
-        b->ace_yy_input_file = file;
-        b->ace_yy_fill_buffer = 1;
-
-#if ACE_YY_ALWAYS_INTERACTIVE
-        b->ace_yy_is_interactive = 1;
-#else
-#if ACE_YY_NEVER_INTERACTIVE
-        b->ace_yy_is_interactive = 0;
-#else
-        b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0;
-#endif
-#endif
-        }
-
-
-#ifdef ACE_YY_USE_PROTOS
-void ace_yy_flush_buffer( ACE_YY_BUFFER_STATE b )
-#else
-void ace_yy_flush_buffer( b )
-ACE_YY_BUFFER_STATE b;
-#endif
-
-        {
-        if ( ! b )
-                return;
-
-        b->ace_yy_n_chars = 0;
-
-        /* We always need two end-of-buffer characters.  The first causes
-         * a transition to the end-of-buffer state.  The second causes
-         * a jam in that state.
-         */
-        b->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR;
-        b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR;
-
-        b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0];
-
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
-
-        if ( b == ace_yy_current_buffer )
-                ace_yy_load_buffer_state();
-        }
-
-
-#ifndef ACE_YY_NO_SCAN_BUFFER
-#ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_buffer( ACE_TCHAR *base, ace_yy_size_t size )
-#else
-ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size )
-ACE_TCHAR *base;
-ace_yy_size_t size;
-#endif
-        {
-        ACE_YY_BUFFER_STATE b;
-
-        if ( size < 2 ||
-             base[size-2] != ACE_YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != ACE_YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return 0;
-
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_buffer()" );
-
-        b->ace_yy_buf_size = size - 2;        /* "- 2" to take care of EOB's */
-        b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
-        b->ace_yy_is_our_buffer = 0;
-        b->ace_yy_input_file = 0;
-        b->ace_yy_n_chars = b->ace_yy_buf_size;
-        b->ace_yy_is_interactive = 0;
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_fill_buffer = 0;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
-
-        ace_yy_switch_to_buffer( b );
-
-        return b;
-        }
-#endif
-
-
-#ifndef ACE_YY_NO_SCAN_STRING
-#ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str )
-#else
-ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str )
-ace_yyconst ACE_TCHAR *ace_yy_str;
-#endif
-        {
-        int len;
-        for ( len = 0; ace_yy_str[len]; ++len )
-                ;
-
-        return ace_yy_scan_bytes( ace_yy_str, len );
-        }
-#endif
-
-
-#ifndef ACE_YY_NO_SCAN_BYTES
-#ifdef ACE_YY_USE_PROTOS
-ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst ACE_TCHAR *bytes, int len )
-#else
-ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len )
-ace_yyconst ACE_TCHAR *bytes;
-int len;
-#endif
-        {
-        ACE_YY_BUFFER_STATE b;
-        ACE_TCHAR *buf;
-        ace_yy_size_t n;
-        int i;
-
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = len + 2;
-        buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR));
-        if ( ! buf )
-                ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_bytes()" );
-
-        for ( i = 0; i < len; ++i )
-                buf[i] = bytes[i];
-
-        buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR;
-
-        b = ace_yy_scan_buffer( buf, n );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR( "bad buffer in ace_yy_scan_bytes()" );
-
-        /* It's okay to grow etc. this buffer, and we should throw it
-         * away when we're done.
-         */
-        b->ace_yy_is_our_buffer = 1;
-
-        return b;
-        }
-#endif
-
-
-#ifndef ACE_YY_NO_PUSH_STATE
-#ifdef ACE_YY_USE_PROTOS
-static void ace_yy_push_state( int new_state )
-#else
-static void ace_yy_push_state( new_state )
-int new_state;
-#endif
-        {
-        if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth )
-                {
-                ace_yy_size_t new_size;
-
-                ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR;
-                new_size = ace_yy_start_stack_depth * sizeof( int );
-
-                if ( ! ace_yy_start_stack )
-                        ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size );
-
-                else
-                        ace_yy_start_stack = (int *) ace_yy_flex_realloc(
-                                        (void *) ace_yy_start_stack, new_size );
-
-                if ( ! ace_yy_start_stack )
-                        ACE_YY_FATAL_ERROR(
-                        "out of memory expanding start-condition stack" );
-                }
-
-        ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
-
-        BEGIN(new_state);
-        }
-#endif
-
-
-#ifndef ACE_YY_NO_POP_STATE
-static void ace_yy_pop_state()
-        {
-        if ( --ace_yy_start_stack_ptr < 0 )
-                ACE_YY_FATAL_ERROR( "start-condition stack underflow" );
-
-        BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
-        }
-#endif
-
-
-#ifndef ACE_YY_NO_TOP_STATE
-static int ace_yy_top_state()
-        {
-        return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
-        }
-#endif
-
-#ifndef ACE_YY_EXIT_FAILURE
-#define ACE_YY_EXIT_FAILURE 2
-#endif
-
-#ifdef ACE_YY_USE_PROTOS
-static void ace_yy_fatal_error( ace_yyconst char msg[] )
-#else
-static void ace_yy_fatal_error( msg )
-char msg[];
-#endif
-        {
-        (void) ACE_OS::fprintf( stderr, "%s\n", msg );
-        ACE_OS::exit( ACE_YY_EXIT_FAILURE );
-        }
-
-
-
-/* Redefine ace_yyless() so it works in section 3 code. */
-
-#undef ace_yyless
-#define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                ace_yytext[ace_yyleng] = ace_yy_hold_char; \
-                ace_yy_c_buf_p = ace_yytext + n; \
-                ace_yy_hold_char = *ace_yy_c_buf_p; \
-                *ace_yy_c_buf_p = '\0'; \
-                ace_yyleng = n; \
-                } \
-        while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef ace_yytext_ptr
-#ifdef ACE_YY_USE_PROTOS
-static void ace_yy_flex_strncpy( ACE_TCHAR *s1, ace_yyconst ACE_TCHAR *s2, int n )
-#else
-static void ace_yy_flex_strncpy( s1, s2, n )
-ACE_TCHAR *s1;
-ace_yyconst ACE_TCHAR *s2;
-int n;
-#endif
-        {
-        register int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-        }
-#endif
-
-#ifdef ACE_YY_NEED_STRLEN
-#ifdef ACE_YY_USE_PROTOS
-static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s )
-#else
-static int ace_yy_flex_strlen( s )
-ace_yyconst ACE_TCHAR *s;
-#endif
-        {
-        register int n;
-        for ( n = 0; s[n]; ++n )
-                ;
-
-        return n;
-        }
-#endif
-
-
-#ifdef ACE_YY_USE_PROTOS
-static void *ace_yy_flex_alloc( ace_yy_size_t size )
-#else
-static void *ace_yy_flex_alloc( size )
-ace_yy_size_t size;
-#endif
-        {
-        return (void *) malloc( size );
-        }
-
-#ifdef ACE_YY_USE_PROTOS
-static void *ace_yy_flex_realloc( void *ptr, ace_yy_size_t size )
-#else
-static void *ace_yy_flex_realloc( ptr, size )
-void *ptr;
-ace_yy_size_t size;
-#endif
-        {
-        /* The cast to (ACE_TCHAR *) in the following accommodates both
-         * implementations that use char* generic pointers, and those
-         * that use void* generic pointers.  It works with the latter
-         * because both ANSI C and C++ allow castless assignment from
-         * any pointer type to void*, and deal with argument conversions
-         * as though doing an assignment.
-         */
-        return (void *) realloc( (char *) ptr, size );
-        }
-
-#ifdef ACE_YY_USE_PROTOS
-static void ace_yy_flex_free( void *ptr )
-#else
-static void ace_yy_flex_free( ptr )
-void *ptr;
-#endif
-        {
-        free( ACE_MALLOC_T (ptr) );
-        }
-
-#if ACE_YY_MAIN
-int main()
-        {
-        ace_yylex();
-        return 0;
-        }
-#endif
-
-int
-ace_yywrap (void)
-{
-  ACE_OS::fflush (ace_yyin);
-  ace_yytext[0] = '#';
-  ace_yyleng = 0;
-
-  return 1;
-}
-
-void
-ace_yy_push_buffer (FILE *file, ace_yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  if (buffer == 0)
-    buffer = ace_yy_create_buffer (file, ACE_YY_BUF_SIZE);
-
-  ace_yy_switch_to_buffer (buffer);
-}
-
-void
-ace_yy_push_buffer (const ACE_TCHAR *directive, ace_yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  // ace_yyparse() may invoke ace_yylex() multiple times when parsing
-  // a single directive.  Prevent a new buffer from created during
-  // each call to ace_yylex().
-  if (ACE_YY_CURRENT_BUFFER != 0
-      && directive == ACE_YY_CURRENT_BUFFER->ace_yy_ch_buf)
-    return;
-
-  if (buffer == 0)
-    {
-      // ace_yy_scan_string() already switches the buffer so there is
-      // no need to explicitly make the switch.
-      buffer = ace_yy_scan_string (directive);
-    }
-  else
-    ace_yy_switch_to_buffer (buffer);
-}
-
-void
-ace_yy_pop_buffer (ace_yy_buffer_state *buffer)
-{
-  // External synchronization is required.
-
-  ace_yy_switch_to_buffer (buffer);
-}
-#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 13e67fba952..f8cb4551e48 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -37,6 +37,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Prototypes.
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         ACE_Static_Node *svc_type,
@@ -298,7 +300,9 @@ static const short ace_yycheck[] =
 #  define ACE_YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # else
 #  if defined (__STDC__) || defined (__cplusplus)
+ACE_END_VERSIONED_NAMESPACE_DECL
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 #   define ACE_YYSIZE_T size_t
 #  endif
 #  define ACE_YYSTACK_ALLOC malloc
@@ -381,7 +385,9 @@ union ace_yyalloc
 #endif
 #if ! defined (ACE_YYSIZE_T)
 # if defined (__STDC__) || defined (__cplusplus)
+ACE_END_VERSIONED_NAMESPACE_DECL
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 #  define ACE_YYSIZE_T size_t
 # endif
 #endif
@@ -461,7 +467,9 @@ while (0)
 #if ACE_YYDEBUG
 
 # ifndef ACE_YYFPRINTF
+ACE_END_VERSIONED_NAMESPACE_DECL
 #  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 #  define ACE_YYFPRINTF ACE_OS::fprintf
 # endif
 
@@ -1523,4 +1531,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return ::ace_yyparse (&param);
 }
 #endif /* DEBUGGING */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index 2fb990a9064..a1cb000c58a 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_SVC_HANDLER_C
-#define ACE_SVC_HANDLER_C
+#ifndef ACE_SVC_HANDLER_CPP
+#define ACE_SVC_HANDLER_CPP
 
 #include "ace/Svc_Handler.h"
 
@@ -15,11 +15,11 @@
 
 #include "ace/Dynamic.h"
 
-ACE_RCSID(ace, Svc_Handler, "$Id$")
-
 #define PR_ST_1 ACE_PEER_STREAM_1
 #define PR_ST_2 ACE_PEER_STREAM_2
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <PR_ST_1, ACE_SYNCH_DECL> void *
 ACE_Svc_Handler<PR_ST_2,  ACE_SYNCH_USE>::operator new (size_t,
                                                         void *p)
@@ -91,6 +91,18 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n,
       return ::new(ACE_nothrow) char[n];
     }
 }
+
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+template <PR_ST_1, ACE_SYNCH_DECL> void
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *p,
+                                         const ACE_nothrow_t&) throw()
+{
+  ACE_TRACE
+    ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)");
+  ::delete [] static_cast <char *> (p);
+}
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
+
 #endif /* ACE_HAS_NEW_NOTHROW */
 
 template <PR_ST_1, ACE_SYNCH_DECL> void
@@ -115,8 +127,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj)
   // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know
   // the pointer was created using new char[] (see operator new code),
   // so we use a cast:
-  char *tmp = (char *) obj;
-  ::delete [] tmp;
+  ::delete [] static_cast <char *> (obj);
 }
 
 // Default constructor.
@@ -509,6 +520,8 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #undef PR_ST_1
 #undef PR_ST_2
-#endif /* ACE_SVC_HANDLER_C */
+#endif /* ACE_SVC_HANDLER_CPP */
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index 2fd4f15320e..76027b9e409 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -16,9 +16,6 @@
 
 #include /**/ "ace/pre.h"
 
-// Forward decls.
-class ACE_Connection_Recycling_Strategy;
-
 #include "ace/Synch_Options.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -29,6 +26,11 @@ class ACE_Connection_Recycling_Strategy;
 #include "ace/Recyclable.h"
 #include "ace/Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Forward decls.
+class ACE_Connection_Recycling_Strategy;
+
 /**
  * @class ACE_Svc_Handler
  *
@@ -155,6 +157,9 @@ public:
   /// itself up correctly whether or not it's allocated statically or
   /// dynamically.
   void *operator new (size_t n, const ACE_nothrow_t&) throw();
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
 
   /// This operator permits "placement new" on a per-object basis.
@@ -231,7 +236,7 @@ protected:
 
   /// Keeps track of whether we are in the process of closing (required
   /// to avoid circular calls to <handle_close>).
-  char closing_;
+  int closing_;
 
   /// Pointer to the connection recycler.
   ACE_Connection_Recycling_Strategy *recycler_;
@@ -248,7 +253,7 @@ protected:
  * its connected peer and supports buffering.
  *
  * The buffering feature makes it possible to queue up
- * <ACE_Message_Blocks> in an <ACE_Message_Queue> until (1) the
+ * <ACE_Message_Blocks> in an ACE_Message_Queue until (1) the
  * queue is "full" or (2) a period of time elapses, at which
  * point the queue is "flushed" via <sendv_n> to the peer.
  */
@@ -260,7 +265,7 @@ public:
   /**
    * Constructor initializes the <thr_mgr> and <mq> by passing them
    * down to the <ACE_Task> base class.  The <reactor> is passed to
-   * the <ACE_Event_Handler>.  The <max_buffer_size> and
+   * the ACE_Event_Handler.  The <max_buffer_size> and
    * <relative_timeout> are used to determine at what point to flush
    * the <mq>.  By default, there's no buffering at all.  The
    * <relative_timeout> value is interpreted to be in a unit that's
@@ -276,8 +281,8 @@ public:
   virtual ~ACE_Buffered_Svc_Handler (void);
 
   /**
-   * Insert the <ACE_Message_Block> chain rooted at <message_block>
-   * into the <ACE_Message_Queue> with the designated <timeout>.  The
+   * Insert the ACE_Message_Block chain rooted at <message_block>
+   * into the ACE_Message_Queue with the designated <timeout>.  The
    * <flush> method will be called if this <put> causes the number of
    * bytes to exceed the maximum buffer size or if the timeout period
    * has elapsed.
@@ -285,8 +290,8 @@ public:
   virtual int put (ACE_Message_Block *message_block,
                    ACE_Time_Value *timeout = 0);
 
-  /// Flush the <ACE_Message_Queue>, which writes all the queued
-  /// <ACE_Message_Block>s to the <PEER_STREAM>.
+  /// Flush the ACE_Message_Queue, which writes all the queued
+  /// ACE_Message_Blocks to the <PEER_STREAM>.
   virtual int flush (void);
 
   /// This method is not currently implemented -- this is where the
@@ -298,8 +303,8 @@ public:
   void dump (void) const;
 
 protected:
-  /// Implement the flush operation on the <ACE_Message_Queue>, which
-  /// writes all the queued <ACE_Message_Block>s to the <PEER_STREAM>.
+  /// Implement the flush operation on the ACE_Message_Queue, which
+  /// writes all the queued ACE_Message_Blocks to the <PEER_STREAM>.
   /// Assumes that the caller holds the lock.
   virtual int flush_i (void);
 
@@ -320,6 +325,8 @@ protected:
   ACE_Time_Value *timeoutp_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Svc_Handler.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Swap.cpp b/ace/Swap.cpp
index 4f62e72ade6..eb14789c3de 100644
--- a/ace/Swap.cpp
+++ b/ace/Swap.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file Swap.cpp
  *
@@ -7,8 +6,8 @@
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
 
-#ifndef ACE_SWAP_C
-#define ACE_SWAP_C
+#ifndef ACE_SWAP_CPP
+#define ACE_SWAP_CPP
 
 #include "ace/Swap.h"
 
@@ -20,6 +19,4 @@
 #include "ace/Swap.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Swap, "$Id$")
-
-#endif /* ACE_SWAP_C */
+#endif /* ACE_SWAP_CPP */
diff --git a/ace/Swap.h b/ace/Swap.h
index 0d2ebcf0c05..a5688095eae 100644
--- a/ace/Swap.h
+++ b/ace/Swap.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file Swap.h
  *
@@ -17,11 +18,16 @@
 # 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
 {
@@ -30,6 +36,8 @@ public:
   static void swap (T &lhs, T &rhs);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Swap.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Swap.inl b/ace/Swap.inl
index b1139ca3ffb..195f1559f69 100644
--- a/ace/Swap.inl
+++ b/ace/Swap.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 /**
  * @file Swap.inl
  *
@@ -6,6 +8,8 @@
  * @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)
 {
@@ -13,3 +17,5 @@ ACE_Swap<T>::swap (T &lhs, T& rhs)
   lhs = rhs;
   rhs = tmp;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 6a81cb386f7..d6972b74a5d 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -1,5 +1,5 @@
-#ifndef ACE_SYNCH_C
-#define ACE_SYNCH_C
+#ifndef ACE_SYNCH_CPP
+#define ACE_SYNCH_CPP
 
 #include "ace/Thread.h"
 #include "ace/ACE.h"
@@ -33,6 +33,8 @@ ACE_RCSID (ace,
 #include "ace/Thread_Mutex.cpp"
 #include "ace/Thread_Semaphore.cpp"
 
-  //ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
+// ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+// ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
+// ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_SYNCH_C */
+#endif /* ACE_SYNCH_CPP */
diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp
index d8f4e9bba9a..4f95720486c 100644
--- a/ace/Synch_Options.cpp
+++ b/ace/Synch_Options.cpp
@@ -1,9 +1,5 @@
 #include "ace/Synch_Options.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Synch_Options.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Global_Macros.h"
 #include "ace/config-all.h"
 
@@ -11,6 +7,7 @@ ACE_RCSID (ace,
            Synch_Options,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Synch_Options)
 
@@ -109,3 +106,5 @@ ACE_Synch_Options::arg (const void *a)
   ACE_TRACE ("ACE_Synch_Options::arg");
   this->arg_ = a;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h
index f9c97033759..288e4acb329 100644
--- a/ace/Synch_Options.h
+++ b/ace/Synch_Options.h
@@ -23,6 +23,7 @@
 
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Synch_Options
@@ -81,9 +82,6 @@ public:
                      const ACE_Time_Value &timeout = ACE_Time_Value::zero,
                      const void *arg = 0);
 
-  /// Default dtor.
-  ~ACE_Synch_Options (void);
-
   /// Initialize the Synch_Options based on parameters.
   void set (unsigned long options = 0,
             const ACE_Time_Value &timeout = ACE_Time_Value::zero,
@@ -149,9 +147,7 @@ private:
   const void *arg_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/Synch_Options.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Synch_Options.inl b/ace/Synch_Options.inl
deleted file mode 100644
index 3cba94e0fef..00000000000
--- a/ace/Synch_Options.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_Synch_Options::~ACE_Synch_Options (void)
-{
-}
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index b41640ba1d2..22ee08d4e0b 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_SYNCH_T_C
-#define ACE_SYNCH_T_C
+#ifndef ACE_SYNCH_T_CPP
+#define ACE_SYNCH_T_CPP
 
 #include "ace/Thread.h"
 
@@ -13,12 +13,10 @@
 #include "ace/Synch_T.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, Synch_T, "$Id$")
-
 #include "ace/Lock_Adapter_T.cpp"
 #include "ace/Reverse_Lock_T.cpp"
 #include "ace/Guard_T.cpp"
 #include "ace/TSS_T.cpp"
 #include "ace/Condition_T.cpp"
 
-#endif /* ACE_SYNCH_T_C */
+#endif /* ACE_SYNCH_T_CPP */
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 9b9eba49734..c853a3f3325 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
diff --git a/ace/Synch_Traits.h b/ace/Synch_Traits.h
index a9b9481433b..03e8b25362d 100644
--- a/ace/Synch_Traits.h
+++ b/ace/Synch_Traits.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl
 class ACE_Null_Mutex;
 class ACE_Null_Condition;
@@ -144,5 +146,7 @@ public:
 #define ACE_SYNCH ACE_NULL_SYNCH
 #endif /* ACE_HAS_THREADS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_SYNCH_TRAITS_H */
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp
index dcb1480aa51..9aa77c4ddf1 100644
--- a/ace/System_Time.cpp
+++ b/ace/System_Time.cpp
@@ -1,4 +1,3 @@
-// System_Time.cpp
 // $Id$
 
 #include "ace/System_Time.h"
@@ -8,6 +7,8 @@
 
 ACE_RCSID(ace, System_Time, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname)
   : delta_time_ (0)
 {
@@ -66,7 +67,7 @@ int
 ACE_System_Time::get_local_system_time (ACE_Time_Value &time_out)
 {
   ACE_TRACE ("ACE_System_Time::get_local_system_time");
-  time_out.sec (ACE_OS::time (0));
+  time_out.set (ACE_OS::time (0), 0);
   return 0;
 }
 
@@ -132,12 +133,4 @@ ACE_System_Time::sync_local_system_time (ACE_System_Time::Sync_Mode)
   ACE_NOTSUP_RETURN (-1);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/System_Time.h b/ace/System_Time.h
index 1688ae45755..6128f61ec3d 100644
--- a/ace/System_Time.h
+++ b/ace/System_Time.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,10 +21,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Memory_Pool.h"
+#include "ace/MMAP_Memory_Pool.h"
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_System_Time
  *
@@ -70,7 +71,7 @@ public:
   int sync_local_system_time (ACE_System_Time::Sync_Mode mode);
 
 private:
-  typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
+  typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
   typedef ACE_Allocator_Adapter<MALLOC> ALLOCATOR;
 
   /// Our allocator (used for obtaining system time from shared memory).
@@ -83,5 +84,7 @@ private:
   long *delta_time_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_SYSTEM_TIME_H */
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 3efa611ef74..c53ed5a7e4e 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -19,6 +19,8 @@ ACE_RCSID(ace, TLI, "$Id$")
 #include "ace/TLI.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI)
 
 void
@@ -266,4 +268,6 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen)
 #endif /* ACE_HAS_SVR4_TLI */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI.h b/ace/TLI.h
index 6960af430cf..20fcec2841a 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -44,6 +44,8 @@
 #define ACE_XTI_ATM_DEVICE "/dev/xtisvc0"
 #endif
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TLI
  *
@@ -103,6 +105,8 @@ private:
 #endif /* ACE_HAS_SVR4_TLI */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/TLI.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/TLI.inl b/ace/TLI.inl
index 8f32186deaf..2485cdc5557 100644
--- a/ace/TLI.inl
+++ b/ace/TLI.inl
@@ -1,12 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// TLI.i
-
 #include "ace/TLI.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
-int 
+int
 ACE_TLI::look (void) const
 {
   ACE_TRACE ("ACE_TLI::look");
@@ -14,7 +16,7 @@ ACE_TLI::look (void) const
 }
 
 ACE_INLINE
-int 
+int
 ACE_TLI::rcvdis (struct t_discon *discon) const
 {
   ACE_TRACE ("ACE_TLI::rcvdis");
@@ -22,7 +24,7 @@ ACE_TLI::rcvdis (struct t_discon *discon) const
 }
 
 ACE_INLINE
-int 
+int
 ACE_TLI::snddis (struct t_call *call) const
 {
   ACE_TRACE ("ACE_TLI::snddis");
@@ -30,7 +32,7 @@ ACE_TLI::snddis (struct t_call *call) const
 }
 
 ACE_INLINE
-int 
+int
 ACE_TLI::rcvrel (void) const
 {
   ACE_TRACE ("ACE_TLI::rcvrel");
@@ -38,9 +40,11 @@ ACE_TLI::rcvrel (void) const
 }
 
 ACE_INLINE
-int 
+int
 ACE_TLI::sndrel (void) const
 {
   ACE_TRACE ("ACE_TLI::sndrel");
   return ACE_OS::t_sndrel (this->get_handle ());
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index 180bcc95717..427cca27f69 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(ace, TLI_Acceptor, "$Id$")
 
 #if defined (ACE_HAS_TLI)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Put the actual definitions of the ACE_TLI_Request and
 // ACE_TLI_Request_Queue classes here to hide them from clients...
 
@@ -552,4 +554,6 @@ ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap,
   return new_tli_sap.get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 9d74cd69569..e7855b83c8f 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 
 #if defined (ACE_HAS_TLI)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward reference...
 class ACE_TLI_Request_Queue;
 class ACE_Time_Value;
@@ -114,6 +116,8 @@ private:
   struct t_discon *disp_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TLI */
 #include /**/ "ace/post.h"
 #endif /* ACE_TLI_ACCEPTOR_H */
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index d48d854f8e1..9a11d2c880b 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -1,4 +1,3 @@
-// TLI_Connector.cpp
 // $Id$
 
 #include "ace/TLI_Connector.h"
@@ -16,6 +15,8 @@ ACE_RCSID(ace, TLI_Connector, "$Id$")
 #include "ace/OS_NS_string.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector)
 
 void
@@ -250,4 +251,6 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream,
 #endif /* ACE_WIN32 */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index f625458f204..d8e8f381bfb 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 
 #if defined (ACE_HAS_TLI)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TLI_Connector
  *
@@ -117,6 +119,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/TLI_Connector.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/TLI_Connector.inl b/ace/TLI_Connector.inl
index 6539e19a6cd..f2a29f122c3 100644
--- a/ace/TLI_Connector.inl
+++ b/ace/TLI_Connector.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// TLI_Connector.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
@@ -45,3 +46,4 @@ ACE_TLI_Connector::reset_new_handle (ACE_HANDLE handle)
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp
index cf42719db85..7b7e41fa42d 100644
--- a/ace/TLI_Stream.cpp
+++ b/ace/TLI_Stream.cpp
@@ -15,6 +15,8 @@ ACE_RCSID(ace, TLI_Stream, "$Id$")
 #include "ace/TLI_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream)
 
 void
@@ -222,4 +224,6 @@ ACE_TLI_Stream::recv_n (void *buf,
                        bytes_transferred);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TLI */
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 468ab87f9ac..fe54f76f30b 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 
 #if defined (ACE_HAS_TLI)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Time_Value;
 
 /**
@@ -122,12 +124,14 @@ private:
   int rwflag_;
 
   /// Get rwflag
-  int get_rwflag (void);
+  int get_rwflag (void) const;
 
   /// Set rwflag
-  void set_rwflag (int);
+  void set_rwflag (int value);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/TLI_Stream.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/TLI_Stream.inl b/ace/TLI_Stream.inl
index 89583e7fb8b..8ef7265f8cd 100644
--- a/ace/TLI_Stream.inl
+++ b/ace/TLI_Stream.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// TLI_Stream.i
-
 #include "ace/TLI_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 ACE_TLI_Stream::set_rwflag (int value)
@@ -15,8 +16,10 @@ ACE_TLI_Stream::set_rwflag (int value)
 
 ACE_INLINE
 int
-ACE_TLI_Stream::get_rwflag (void)
+ACE_TLI_Stream::get_rwflag (void) const
 {
   ACE_TRACE ("ACE_TLI_Stream::get_rwflag");
   return this->rwflag_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index c4eb9c1726d..2b1a8463ce9 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -15,12 +15,14 @@ ACE_RCSID (ace,
            TP_Reactor,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_TP_Reactor)
 
 int
-ACE_TP_Token_Guard::grab_token (ACE_Time_Value *max_wait_time)
+ACE_TP_Token_Guard::acquire_read_token (ACE_Time_Value *max_wait_time)
 {
-  ACE_TRACE ("ACE_TP_Token_Guard::grab_token");
+  ACE_TRACE ("ACE_TP_Token_Guard::acquire_read_token");
 
   // The order of these events is very subtle, modify with care.
 
@@ -89,7 +91,7 @@ ACE_TP_Token_Guard::acquire_token (ACE_Time_Value *max_wait_time)
         return -1;
     }
 
-  // We got the token and so let us mark ourseleves as owner
+  // We got the token and so let us mark ourselves as owner
   this->owner_ = 1;
 
   return result;
@@ -106,13 +108,13 @@ ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh,
   this->supress_notify_renew (1);
 }
 
-ACE_TP_Reactor::ACE_TP_Reactor (size_t size,
-                                int rs,
+ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles,
+                                int restart,
                                 ACE_Sig_Handler *sh,
                                 ACE_Timer_Queue *tq,
                                 int mask_signals,
                                 int s_queue)
-  : ACE_Select_Reactor (size, rs, sh, tq, 0, 0, mask_signals, s_queue)
+  : ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, 0, 0, mask_signals, s_queue)
 {
   ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor");
   this->supress_notify_renew (1);
@@ -155,7 +157,7 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
   // this thread.
   ACE_TP_Token_Guard guard (this->token_);
 
-  int result = guard.grab_token (max_wait_time);
+  int const result = guard.acquire_read_token (max_wait_time);
 
   // If the guard is NOT the owner just return the retval
   if (!guard.is_owner ())
@@ -452,7 +454,7 @@ ACE_TP_Reactor::handle_notify_events (int & /*event_count*/,
         }
     }
 
-  // If we did ssome work, then we just return 1 which will allow us
+  // If we did some work, then we just return 1 which will allow us
   // to get out of here. If we return 0, then we will be asked to do
   // some work ie. dispacth socket events
   return result;
@@ -476,25 +478,17 @@ ACE_TP_Reactor::handle_socket_events (int &event_count,
     }
 
   // Suspend the handler so that other threads don't start dispatching
-  // it.
+  // it, if we can't suspend then return directly
   //
   // NOTE: This check was performed in older versions of the
   // TP_Reactor. Looks like it is a waste..
   if (dispatch_info.event_handler_ != this->notify_handler_)
-    this->suspend_i (dispatch_info.handle_);
-
-  int resume_flag =
-    dispatch_info.event_handler_->resume_handler ();
-
-  int reference_counting_required =
-    dispatch_info.event_handler_->reference_counting_policy ().value () ==
-    ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
+    if (this->suspend_i (dispatch_info.handle_) == -1)
+      return 0;
 
   // Call add_reference() if needed.
-  if (reference_counting_required)
-    {
-      dispatch_info.event_handler_->add_reference ();
-    }
+  if (dispatch_info.reference_counting_required_)
+    dispatch_info.event_handler_->add_reference ();
 
   // Release the lock.  Others threads can start waiting.
   guard.release_token ();
@@ -509,17 +503,6 @@ ACE_TP_Reactor::handle_socket_events (int &event_count,
   if (this->dispatch_socket_event (dispatch_info) == 0)
     ++result;
 
-  // Resume handler if required.
-  if (dispatch_info.event_handler_ != this->notify_handler_ &&
-      resume_flag == ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER)
-    this->resume_handler (dispatch_info.handle_);
-
-  // Call remove_reference() if needed.
-  if (reference_counting_required)
-    {
-      dispatch_info.event_handler_->remove_reference ();
-    }
-
   return result;
 }
 
@@ -543,18 +526,9 @@ ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time)
       // yet have a size_ > 0. This is an attempt to remedy the affect,
       // without knowing why it happens.
 
-      //# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500))
-      // SunCC seems to be having problems with this piece of code
-      // here. I am  not sure why though. This works fine with other
-      // compilers. As we dont seem to understand when this piece of
-      // code is needed and as it creates problems for SunCC we will
-      // not compile this. Most of the tests in TAO seem to be happy
-      // without this in SunCC.
       this->ready_set_.rd_mask_.sync (this->ready_set_.rd_mask_.max_set ());
       this->ready_set_.wr_mask_.sync (this->ready_set_.wr_mask_.max_set ());
       this->ready_set_.ex_mask_.sync (this->ready_set_.ex_mask_.max_set ());
-      //# endif /* ! __SUNPRO_CC */
-
     }
 
   return this->wait_for_multiple_events (this->ready_set_,
@@ -564,9 +538,6 @@ ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time)
 int
 ACE_TP_Reactor::get_socket_event_info (ACE_EH_Dispatch_Info &event)
 {
-  // Nothing to dispatch yet
-  event.reset ();
-
   // Check for dispatch in write, except, read. Only catch one, but if
   // one is caught, be sure to clear the handle from each mask in case
   // there is more than one mask set for it. This would cause problems
@@ -640,18 +611,14 @@ ACE_TP_Reactor::get_socket_event_info (ACE_EH_Dispatch_Info &event)
   return found_io;
 }
 
-
-
 // Dispatches a single event handler
 int
 ACE_TP_Reactor::dispatch_socket_event (ACE_EH_Dispatch_Info &dispatch_info)
 {
   ACE_TRACE ("ACE_TP_Reactor::dispatch_socket_event");
 
-  ACE_HANDLE handle = dispatch_info.handle_;
-  ACE_Event_Handler *event_handler = dispatch_info.event_handler_;
-  ACE_Reactor_Mask mask = dispatch_info.mask_;
-  ACE_EH_PTMF callback = dispatch_info.callback_;
+  ACE_Event_Handler * const event_handler = dispatch_info.event_handler_;
+  ACE_EH_PTMF const callback = dispatch_info.callback_;
 
   // Check for removed handlers.
   if (event_handler == 0)
@@ -664,19 +631,55 @@ ACE_TP_Reactor::dispatch_socket_event (ACE_EH_Dispatch_Info &dispatch_info)
   // handling other things.
   int status = 1;
   while (status > 0)
-    status = (event_handler->*callback) (handle);
+    status = (event_handler->*callback) (dispatch_info.handle_);
+
+  // Post process socket event
+  return this->post_process_socket_event (dispatch_info, status);
+}
+
+int
+ACE_TP_Reactor::post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info,
+                                           int status)
+{
+  int result = 0;
 
-  // If negative, remove from Reactor
-  if (status < 0)
+  // First check if we really have to post process something, if not, then
+  // we don't acquire the token which saves us a lot of time.
+  if (status < 0 ||
+     (dispatch_info.event_handler_ != this->notify_handler_ &&
+      dispatch_info.resume_flag_ ==
+        ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER))
     {
-      int retval =
-        this->remove_handler (handle, mask);
+      // Get the reactor token and with this token acquired remove first the
+      // handler and resume it at the same time. This must be atomic, see also
+      // bugzilla 2395. When this is not atomic it can be that we resume the
+      // handle after it is reused by the OS.
+      ACE_TP_Token_Guard guard (this->token_);
+
+      result = guard.acquire_token ();
+
+      // If the guard is NOT the owner just return the retval
+      if (!guard.is_owner ())
+        return result;
 
-      return retval;
+      if (status < 0)
+        {
+          result =
+            this->remove_handler_i (dispatch_info.handle_, dispatch_info.mask_);
+        }
+
+      // Resume handler if required.
+      if (dispatch_info.event_handler_ != this->notify_handler_ &&
+          dispatch_info.resume_flag_ ==
+            ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER)
+        this->resume_i (dispatch_info.handle_);
     }
 
-  // assert (status >= 0);
-  return 0;
+  // Call remove_reference() if needed.
+  if (dispatch_info.reference_counting_required_)
+    dispatch_info.event_handler_->remove_reference ();
+
+  return result;
 }
 
 int
@@ -711,7 +714,7 @@ ACE_TP_Reactor::get_notify_handle (void)
 {
   // Call the notify handler to get a handle on which we would have a
   // notify waiting
-  ACE_HANDLE read_handle =
+  ACE_HANDLE const read_handle =
     this->notify_handler_->notify_handle ();
 
   // Check whether the rd_mask has been set on that handle. If so
@@ -721,18 +724,9 @@ ACE_TP_Reactor::get_notify_handle (void)
     {
       return read_handle;
     }
-    /*if (read_handle != ACE_INVALID_HANDLE)
-    {
-      ACE_Handle_Set_Iterator handle_iter (this->ready_set_.rd_mask_);
-      ACE_HANDLE handle = ACE_INVALID_HANDLE;
-
-      while ((handle = handle_iter ()) == read_handle)
-        {
-          return read_handle;
-        }
-      ACE_UNUSED_ARG (handle);
-      }*/
 
   // None found..
   return ACE_INVALID_HANDLE;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index 75a05e93fab..5c39225c1e7 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -6,21 +6,20 @@
  *
  *  $Id$
  *
- *  The <ACE_TP_Reactor> (aka, Thread Pool Reactor) uses the
+ *  The ACE_TP_Reactor (aka, Thread Pool Reactor) uses the
  *  Leader/Followers pattern to demultiplex events among a pool of
  *  threads.  When using a thread pool reactor, an application
  *  pre-spawns a _fixed_ number of threads.  When these threads
- *  invoke the <ACE_TP_Reactor>'s <handle_events> method, one thread
+ *  invoke the ACE_TP_Reactor's <handle_events> method, one thread
  *  will become the leader and wait for an event.  The other
  *  follower threads will queue up waiting for their turn to become
  *  the leader.  When an event occurs, the leader will pick a
  *  follower to become the leader and go on to handle the event.
- *  The consequence of using <ACE_TP_Reactor> is the amortization of
+ *  The consequence of using ACE_TP_Reactor is the amortization of
  *  the costs used to creating threads.  The context switching cost
  *  will also reduce.  More over, the total resources used by
  *  threads are bounded because there are a fixed number of threads.
  *
- *
  *  @author Irfan Pyarali <irfan@cs.wustl.edu>
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
@@ -39,16 +38,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_EH_Dispatch_Info
  *
  * @brief This structure contains information of the activated event
  * handler.
  */
-class ACE_Export ACE_EH_Dispatch_Info
+class ACE_EH_Dispatch_Info
 {
 public:
-
   ACE_EH_Dispatch_Info (void);
 
   void set (ACE_HANDLE handle,
@@ -56,20 +56,21 @@ public:
             ACE_Reactor_Mask mask,
             ACE_EH_PTMF callback);
 
-  void reset (void);
-
-  int dispatch (void) const;
+  bool dispatch (void) const;
 
   ACE_HANDLE handle_;
   ACE_Event_Handler *event_handler_;
   ACE_Reactor_Mask mask_;
   ACE_EH_PTMF callback_;
-
-  int dispatch_;
+  int resume_flag_;
+  bool reference_counting_required_;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &))
+  bool dispatch_;
+
+  // Disallow copying and assignment.
+  ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &);
+  ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &);
 };
 
 
@@ -84,7 +85,7 @@ private:
  * and manages the ownership
  */
 
-class ACE_Export ACE_TP_Token_Guard
+class ACE_TP_Token_Guard
 {
 public:
 
@@ -104,19 +105,27 @@ public:
 
   /// A helper method that grabs the token for us, after which the
   /// thread that owns that can do some actual work.
-  /// @todo Should probably be called acquire_read_token ()
-  int grab_token (ACE_Time_Value *max_wait_time = 0);
+  int acquire_read_token (ACE_Time_Value *max_wait_time = 0);
 
   /**
    * A helper method that grabs the token for us, after which the
    * thread that owns that can do some actual work. This differs from
-   * grab_token () as it uses acquire () to get the token instead of
+   * acquire_read_token() as it uses acquire () to get the token instead of
    * acquire_read ()
    */
   int acquire_token (ACE_Time_Value *max_wait_time = 0);
 
 private:
 
+  // Disallow default construction.
+  ACE_TP_Token_Guard (void);
+
+  // Disallow copying and assignment.
+  ACE_TP_Token_Guard (const ACE_TP_Token_Guard &);
+  ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &);
+
+private:
+
   /// The Select Reactor token.
   ACE_Select_Reactor_Token &token_;
 
@@ -126,9 +135,6 @@ private:
   /// vice-versa.
   int owner_;
 
-private:
-
-  ACE_UNIMPLEMENTED_FUNC (ACE_TP_Token_Guard (void))
 };
 
 /**
@@ -150,7 +156,9 @@ private:
  * that just got activated, releasing the internal lock (so that some
  * other thread can start waiting in the event loop) and then
  * dispatching the event handler outside the context of the Reactor
- * lock.
+ * lock. After the event handler has been dispatched the event handler is
+ * resumed again. Don't call remove_handler() from the handle_x methods,
+ * instead return -1.
  *
  * This Reactor is best suited for situations when the callbacks to
  * event handlers can take arbitrarily long and/or a number of threads
@@ -168,24 +176,24 @@ public:
 
   // = Initialization and termination methods.
 
-  /// Initialize <ACE_TP_Reactor> with the default size.
+  /// Initialize ACE_TP_Reactor with the default size.
   ACE_TP_Reactor (ACE_Sig_Handler * = 0,
                   ACE_Timer_Queue * = 0,
                   int mask_signals = 1,
                   int s_queue = ACE_Select_Reactor_Token::FIFO);
 
   /**
-   * Initialize the <ACE_TP_Reactor> to manage
-   * <max_number_of_handles>.  If <restart> is non-0 then the
-   * <ACE_Reactor>'s <handle_events> method will be restarted
+   * Initialize the ACE_TP_Reactor to manage
+   * @a max_number_of_handles.  If @a restart is non-0 then the
+   * ACE_Reactor's <handle_events> method will be restarted
    * automatically when <EINTR> occurs.  If <signal_handler> or
    * <timer_queue> are non-0 they are used as the signal handler and
    * timer queue, respectively.
    */
   ACE_TP_Reactor (size_t max_number_of_handles,
                   int restart = 0,
-                  ACE_Sig_Handler * = 0,
-                  ACE_Timer_Queue * = 0,
+                  ACE_Sig_Handler *sh = 0,
+                  ACE_Timer_Queue *tq = 0,
                   int mask_signals = 1,
                   int s_queue = ACE_Select_Reactor_Token::FIFO);
 
@@ -204,7 +212,7 @@ public:
    * application wishes to handle events for some fixed amount of
    * time.
    *
-   * Returns the total number of <ACE_Event_Handler>s that were
+   * Returns the total number of ACE_Event_Handlers that were
    * dispatched, 0 if the <max_wait_time> elapsed without dispatching
    * any handlers, or -1 if something goes wrong.
    */
@@ -212,7 +220,8 @@ public:
 
   virtual int handle_events (ACE_Time_Value &max_wait_time);
 
-  /* @todo The following methods are not supported. Support for
+  /*
+   * @todo The following methods are not supported. Support for
    * signals is not available in the TP_Reactor. These methods will be
    * supported once signal handling is supported.
    */
@@ -268,7 +277,7 @@ public:
   /// Does the reactor allow the application to resume the handle on
   /// its own ie. can it pass on the control of handle resumption to
   /// the application.  The TP reactor has can allow applications to
-  /// resume handles.  So return a +ve value.
+  /// resume handles.  So return a positive value.
   virtual int resumable_handler (void);
 
   /// Called from handle events
@@ -281,7 +290,7 @@ public:
   virtual int owner (ACE_thread_t n_id, ACE_thread_t *o_id = 0);
 
   /// Return the current owner of the thread.
-  virtual int owner (ACE_thread_t *);
+  virtual int owner (ACE_thread_t *t_id);
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -297,14 +306,14 @@ protected:
   int dispatch_i (ACE_Time_Value *max_wait_time,
                   ACE_TP_Token_Guard &guard);
 
-  /// Get the event that needs dispatching.It could be either a
+  /// Get the event that needs dispatching. It could be either a
   /// signal, timer, notification handlers or return possibly 1 I/O
   /// handler for dispatching. In the most common use case, this would
   /// return 1 I/O handler for dispatching
   int get_event_for_dispatching (ACE_Time_Value *max_wait_time);
 
   /// Method to handle signals
-  /// NOTE: It is just busted at this point in time.
+  /// @note It is just busted at this point in time.
   int handle_signals (int &event_count,
                       ACE_TP_Token_Guard &g);
 
@@ -339,15 +348,19 @@ private:
   /// associated with <handle> that a particular event has occurred.
   int dispatch_socket_event (ACE_EH_Dispatch_Info &dispatch_info);
 
-  /// Clear the <handle> from the read_set
+  /// Clear the @a handle from the read_set
   void clear_handle_read_set (ACE_HANDLE handle);
 
+  int post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info,int status);
+
 private:
   /// Deny access since member-wise won't work...
   ACE_TP_Reactor (const ACE_TP_Reactor &);
   ACE_TP_Reactor &operator = (const ACE_TP_Reactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/TP_Reactor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/TP_Reactor.inl b/ace/TP_Reactor.inl
index 08c17a7e65e..b4fa3c258d1 100644
--- a/ace/TP_Reactor.inl
+++ b/ace/TP_Reactor.inl
@@ -1,26 +1,23 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /************************************************************************/
 // Methods for ACE_EH_Dispatch_Info
 /************************************************************************/
 
-ACE_INLINE void
-ACE_EH_Dispatch_Info::reset (void)
-{
-  this->dispatch_ = 0;
-
-  this->handle_ = ACE_INVALID_HANDLE;
-  this->event_handler_ = 0;
-  this->mask_ = ACE_Event_Handler::NULL_MASK;
-  this->callback_ = 0;
-}
-
-
 ACE_INLINE
-ACE_EH_Dispatch_Info::ACE_EH_Dispatch_Info (void)
+ACE_EH_Dispatch_Info::ACE_EH_Dispatch_Info (void) :
+  handle_ (ACE_INVALID_HANDLE),
+  event_handler_ (0),
+  mask_ (ACE_Event_Handler::NULL_MASK),
+  callback_ (0),
+  resume_flag_ (ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER),
+  reference_counting_required_ (false),
+  dispatch_ (false)
 {
-  this->reset ();
 }
 
 ACE_INLINE void
@@ -29,15 +26,19 @@ ACE_EH_Dispatch_Info::set (ACE_HANDLE handle,
                            ACE_Reactor_Mask mask,
                            ACE_EH_PTMF callback)
 {
-  this->dispatch_ = 1;
+  this->dispatch_ = true;
 
   this->handle_ = handle;
   this->event_handler_ = event_handler;
   this->mask_ = mask;
   this->callback_ = callback;
+  this->resume_flag_ = event_handler->resume_handler ();
+  this->reference_counting_required_ =
+    (event_handler_->reference_counting_policy ().value () ==
+      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 ACE_EH_Dispatch_Info::dispatch (void) const
 {
   return this->dispatch_;
@@ -109,3 +110,5 @@ ACE_TP_Reactor::clear_dispatch_mask (ACE_HANDLE ,
   this->ready_set_.wr_mask_.reset ();
   this->ready_set_.ex_mask_.reset ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TSS_Adapter.cpp b/ace/TSS_Adapter.cpp
index cbddcd752a6..ddca0236d4f 100644
--- a/ace/TSS_Adapter.cpp
+++ b/ace/TSS_Adapter.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file TSS_Adapter.cpp
  *
@@ -11,12 +10,10 @@
 
 #include "ace/TSS_Adapter.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/TSS_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ace, TSS_Adapter, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f)
   : ts_obj_ (object),
     func_ (f)
@@ -31,17 +28,18 @@ ACE_TSS_Adapter::cleanup (void)
   (*this->func_)(this->ts_obj_);  // call cleanup routine for ts_obj_
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 extern "C" void
 ACE_TSS_C_cleanup (void *object)
 {
   // ACE_TRACE ("ACE_TSS_C_cleanup");
   if (object != 0)
     {
-      ACE_TSS_Adapter *tss_adapter = (ACE_TSS_Adapter *) object;
+      ACE_TSS_Adapter * const tss_adapter = (ACE_TSS_Adapter *) object;
       // Perform cleanup on the real TS object.
       tss_adapter->cleanup ();
       // Delete the adapter object.
       delete tss_adapter;
     }
 }
-
diff --git a/ace/TSS_Adapter.h b/ace/TSS_Adapter.h
index 8fd09f2dd26..d4f20979b46 100644
--- a/ace/TSS_Adapter.h
+++ b/ace/TSS_Adapter.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TSS_Adapter
  *
@@ -41,24 +43,19 @@ public:
   /// Initialize the adapter.
   ACE_TSS_Adapter (void *object, ACE_THR_DEST f);
 
-  /// Default dtor.
-  ~ACE_TSS_Adapter (void);
-
   /// Perform the cleanup operation.
   void cleanup (void);
 
 //private:
 
   /// The real TS object.
-  void *ts_obj_;
+  void * const ts_obj_;
 
   /// The real cleanup routine for ts_obj;
   ACE_THR_DEST func_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ace/TSS_Adapter.inl"
-#endif /* __ACE_INLINE__ */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TSS_ADAPTER_H */
diff --git a/ace/TSS_Adapter.inl b/ace/TSS_Adapter.inl
deleted file mode 100644
index 59651ec36f8..00000000000
--- a/ace/TSS_Adapter.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_TSS_Adapter::~ACE_TSS_Adapter (void)
-{
-}
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index b2fe5a89ea2..d6dc2599e8d 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_TSS_T_C
-#define ACE_TSS_T_C
+#ifndef ACE_TSS_T_CPP
+#define ACE_TSS_T_CPP
 
 #include "ace/TSS_T.h"
 
@@ -9,8 +9,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, TSS_T, "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "ace/TSS_T.inl"
 #endif /* __ACE_INLINE__ */
@@ -24,6 +22,8 @@ ACE_RCSID(ace, TSS_T, "$Id$")
 #  include "ace/TSS_Adapter.h"
 #endif /* ACE_HAS_THR_C_DEST */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TSS)
 
 template <class TYPE>
@@ -81,7 +81,7 @@ ACE_TSS<TYPE>::dump (void) const
 
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
 #if defined (ACE_HAS_THR_C_DEST)
-extern "C" void ACE_TSS_C_cleanup(void *); // defined in Synch.cpp
+extern "C" void ACE_TSS_C_cleanup (void *); // defined in Synch.cpp
 #endif /* ACE_HAS_THR_C_DEST */
 
 template <class TYPE> void
@@ -94,7 +94,7 @@ ACE_TSS<TYPE>::cleanup (void *ptr)
 template <class TYPE> int
 ACE_TSS<TYPE>::ts_init (void) const
 {
-  // Insure that we are serialized!
+  // Ensure that we are serialized!
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->keylock_, 0);
 
   // Use the Double-Check pattern to make sure we only create the key
@@ -195,18 +195,20 @@ ACE_TSS<TYPE>::ts_get (void) const
   ACE_TSS_Adapter *tss_adapter = 0;
 
   // Get the adapter from thread-specific storage
-  if (ACE_Thread::getspecific (this->key_,
-                               (void **) &tss_adapter) == -1)
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
     return 0; // This should not happen!
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
 
   // Check to see if this is the first time in for this thread.
   if (tss_adapter == 0)
 #else
   // Get the ts_obj from thread-specific storage.  Note that no locks
   // are required here...
-  if (ACE_Thread::getspecific (this->key_,
-                               (void **) &ts_obj) == -1)
+  void *temp = ts_obj; // Need this temp to keep G++ from complaining.
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
     return 0; // This should not happen!
+  ts_obj = static_cast <TYPE *> (temp);
 
   // Check to see if this is the first time in for this thread.
   if (ts_obj == 0)
@@ -249,7 +251,7 @@ ACE_TSS<TYPE>::ts_get (void) const
 
 #if defined (ACE_HAS_THR_C_DEST)
   // Return the underlying ts object.
-  return (TYPE *) tss_adapter->ts_obj_;
+  return static_cast <TYPE *> (tss_adapter->ts_obj_);
 #else
   return ts_obj;
 #endif /* ACE_HAS_THR_C_DEST */
@@ -274,16 +276,25 @@ ACE_TSS<TYPE>::ts_object (void) const
   ACE_TSS_Adapter *tss_adapter = 0;
 
   // Get the tss adapter from thread-specific storage
-  if (ACE_Thread::getspecific (this->key_,
-                               (void **) &tss_adapter) == -1)
-    return 0; // This should not happen!
-  else if (tss_adapter != 0)
-    // Extract the real TS object.
-    ts_obj = (TYPE *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
+    {
+      return 0; // This should not happen!
+    }
+  else
+    {
+      tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+      {
+        if (tss_adapter != 0)
+            // Extract the real TS object.
+            ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_);
+      }
+    }
 #else
-  if (ACE_Thread::getspecific (this->key_,
-                               (void **) &ts_obj) == -1)
+  void *temp = ts_obj; // Need this temp to keep G++ from complaining.
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
     return 0; // This should not happen!
+  ts_obj = static_cast <TYPE *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return ts_obj;
@@ -310,13 +321,14 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
 
-  if (ACE_Thread::getspecific (this->key_,
-                               (void **) &tss_adapter) == -1)
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
     return 0; // This should not happen!
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
 
   if (tss_adapter != 0)
     {
-      ts_obj = (TYPE *) tss_adapter->ts_obj_;
+      ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_);
       delete tss_adapter;       // don't need this anymore
     }
 
@@ -332,9 +344,11 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
       return ts_obj; // This should not happen!
     }
 #else
+  void *temp = ts_obj; // Need this temp to keep G++ from complaining.
   if (ACE_Thread::getspecific (this->key_,
-                               (void **) &ts_obj) == -1)
+                               &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)
     return ts_obj; // This should not happen!
@@ -389,12 +403,14 @@ ACE_TSS_Guard<ACE_LOCK>::release (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *)tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->release ();
@@ -409,12 +425,14 @@ ACE_TSS_Guard<ACE_LOCK>::remove (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->remove ();
@@ -429,12 +447,14 @@ ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   // Make sure that this pointer is NULL when we shut down...
@@ -486,12 +506,14 @@ ACE_TSS_Guard<ACE_LOCK>::acquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->acquire ();
@@ -506,12 +528,14 @@ ACE_TSS_Guard<ACE_LOCK>::tryacquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->tryacquire ();
@@ -551,12 +575,14 @@ ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->acquire_write ();
@@ -571,12 +597,14 @@ ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, temp);
+  guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->tryacquire_write ();
@@ -639,12 +667,14 @@ ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->acquire_read ();
@@ -659,12 +689,14 @@ ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void)
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter = 0;
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &tss_adapter);
-  guard = (ACE_Guard<ACE_LOCK> *) tss_adapter->ts_obj_;
+  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
+  guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 #else
-  ACE_Thread::getspecific (this->key_,
-                           (void **) &guard);
+  void *temp = guard; // Need this temp to keep G++ from complaining.
+  ACE_Thread::getspecific (this->key_, &temp);
+  guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (temp);
 #endif /* ACE_HAS_THR_C_DEST */
 
   return guard->tryacquire_read ();
@@ -697,4 +729,6 @@ ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const
 
 #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */
 
-#endif /* ACE_TSS_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TSS_T_CPP */
diff --git a/ace/TSS_T.h b/ace/TSS_T.h
index 537a89cc15a..6c8c7b99847 100644
--- a/ace/TSS_T.h
+++ b/ace/TSS_T.h
@@ -37,6 +37,8 @@
 
 #include "ace/Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TSS
  *
@@ -49,7 +51,7 @@
  * shield applications from the details of accessing
  * thread-specific storage.
  *
- * NOTE: For maximal portability, <TYPE> cannot be a built-in type,
+ * @note For maximal portability, <TYPE> cannot be a built-in type,
  * but instead should be a user-defined class (some compilers will
  * allow a built-in type, others won't).  See template class
  * ACE_TSS_Type_Adapter, below, for adapting built-in types to work
@@ -171,6 +173,8 @@ private:
   TYPE value_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/TSS_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/TSS_T.inl b/ace/TSS_T.inl
index a0bdccba905..d4378089137 100644
--- a/ace/TSS_T.inl
+++ b/ace/TSS_T.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE> ACE_INLINE
 ACE_TSS<TYPE>::ACE_TSS (TYPE *type)
   : type_ (type)
@@ -34,4 +37,6 @@ ACE_TSS<TYPE>::ts_get (void) const
   return this->type_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ! (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index 128a07d6ac2..9119e0caca0 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -1,27 +1,34 @@
 // $Id$
 
-#include "ace/config-lite.h"
-#if defined (ACE_HAS_TERMIOS)
-# include "ace/os_include/os_termios.h"
-#elif  defined (ACE_HAS_TERMIO)
-# include <termio.h>
-#endif
 #include "ace/TTY_IO.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
-static const char* const ACE_TTY_IO_ODD   = "odd";
-static const char* const ACE_TTY_IO_EVEN  = "even";
-#if defined (ACE_WIN32)
-static const char* const ACE_TTY_IO_MARK  = "mark";
-static const char* const ACE_TTY_IO_SPACE = "space";
-#endif /* ACE_WIN32 */
+#if defined (ACE_HAS_TERMIOS)
+# include "ace/os_include/os_termios.h"
+#elif  defined (ACE_HAS_TERMIO)
+# include <termio.h>
+#endif
 
 ACE_RCSID (ace,
            TTY_IO,
            "$Id$")
 
+#if defined (ACE_HAS_TERMIOS) || defined (ACE_HAS_TERMIO) || defined (ACE_WIN32)
+namespace
+{
+  const char ACE_TTY_IO_ODD[]   = "odd";
+  const char ACE_TTY_IO_EVEN[]  = "even";
+#if defined (ACE_WIN32)
+  const char ACE_TTY_IO_MARK[]  = "mark";
+  const char ACE_TTY_IO_SPACE[] = "space";
+#endif /* ACE_WIN32 */
+}
+#endif
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_TTY_IO::Serial_Params::Serial_Params (void)
 {
   ACE_OS::memset (this, 0, sizeof *this);
@@ -320,7 +327,8 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
             devpar.c_cc[VMIN] = static_cast<unsigned char>(arg->readmincharacters);
         }
 
-#if defined (TIOCMGET)
+#if defined (TIOCMGET) && !defined (__Lynx__)
+      // This sets serial port under LynxOS to non-functional state
       int status;
       this->ACE_IO_SAP::control (TIOCMGET, &status);
 
@@ -455,9 +463,9 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
 
       // Always set limits unless set to negative to use default.
       if (arg->xonlim >= 0)
-        dcb.XonLim  = arg->xonlim;
+        dcb.XonLim  = static_cast<WORD>(arg->xonlim);
       if (arg->xofflim >= 0)
-        dcb.XoffLim = arg->xofflim;
+        dcb.XoffLim = static_cast<WORD>(arg->xofflim);
 
       dcb.fAbortOnError = FALSE;
       dcb.fErrorChar = FALSE;
@@ -526,3 +534,5 @@ ACE_TTY_IO::operator ACE_DEV_IO &()
   return static_cast<ACE_DEV_IO &>(*this);
 }
 #endif /* ACE_NEEDS_DEV_IO_CONVERSION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index 60f6dc6ba1e..708da7fe31c 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -19,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TTY_IO
  *
@@ -89,8 +91,8 @@ public:
     bool rcvenb;
     /** Controls whether DSR is disabled or enabled (Win32). */
     bool dsrenb;
-    /** Controls whether DTR is disabled or enabled (Win32). */
-    int dtrdisable;
+    /** Controls whether DTR is disabled or enabled. */
+    bool dtrdisable;
     /** Data bits. Valid values 5, 6, 7 and 8 data bits.
         Additionally Win32 supports 4 data bits. */
     unsigned char databits;
@@ -107,4 +109,6 @@ public:
 #endif /* ACE_NEEDS_DEV_IO_CONVERSION */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_TTY_IO_H */
diff --git a/ace/Task.cpp b/ace/Task.cpp
index 293bbb187f0..8617e6ec183 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
   : thr_count_ (0),
     thr_mgr_ (thr_man),
@@ -90,7 +92,7 @@ int
 ACE_Task_Base::suspend (void)
 {
   ACE_TRACE ("ACE_Task_Base::suspend");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->suspend_task (this);
 
@@ -102,7 +104,7 @@ int
 ACE_Task_Base::resume (void)
 {
   ACE_TRACE ("ACE_Task_Base::resume");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->resume_task (this);
 
@@ -124,7 +126,7 @@ ACE_Task_Base::activate (long flags,
   ACE_TRACE ("ACE_Task_Base::activate");
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1);
 
   // If the task passed in is zero, we will use <this>
   if (task == 0)
@@ -214,9 +216,13 @@ ACE_Task_Base::cleanup (void *object, void *)
 {
   ACE_Task_Base *t = (ACE_Task_Base *) object;
 
+  // The thread count decrement and close must be done atomically
+  // so that thr_count checks from within close are correct.
+  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, t->lock_));
+
   // The thread count must be decremented first in case the <close>
   // hook does something crazy like "delete this".
-  t->thr_count_dec ();
+  --(t->thr_count_);
 
   // @@ Is it possible to pass in the exit status somehow?
   t->close ();
@@ -272,3 +278,5 @@ ACE_Task_Base::svc_run (void *args)
 #endif
   return status;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Task.h b/ace/Task.h
index 9460673d06e..130feaeff40 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,8 +20,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Thread_Manager.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Task_Flags
  *
@@ -32,9 +35,8 @@
  *    code defined here, so we don't have to worry about multiple
  *    definitions.
  */
-class ACE_Export ACE_Task_Flags
+namespace ACE_Task_Flags
 {
-public:
   enum
   {
     /// Identifies a Task as being the "reader" in a Module.
@@ -50,7 +52,7 @@ public:
     /// Flush both queues
     ACE_FLUSHRW    = 030
   };
-};
+}
 
 /**
  * @class ACE_Task_Base
@@ -267,7 +269,7 @@ public:
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   /// Protect the state of a Task during concurrent operations, but
   /// only if we're configured as MT safe...
-  ACE_Thread_Mutex lock_;
+  ACE_Recursive_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
 
 private:
@@ -277,6 +279,8 @@ private:
   ACE_Task_Base (const ACE_Task_Base &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Task.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Task.inl b/ace/Task.inl
index c903afffbc2..9343ae057e4 100644
--- a/ace/Task.inl
+++ b/ace/Task.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Thread_Manager *
 ACE_Task_Base::thr_mgr (void) const
@@ -22,7 +23,11 @@ ACE_INLINE size_t
 ACE_Task_Base::thr_count (void) const
 {
   ACE_TRACE ("ACE_Task_Base::thr_count");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, 0));
+  ACE_MT
+    (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
+                       ace_mon,
+                       const_cast <ACE_Recursive_Thread_Mutex&>(this->lock_),
+                       0));
 
   return this->thr_count_;
 }
@@ -33,7 +38,7 @@ ACE_INLINE void
 ACE_Task_Base::thr_count_dec (void)
 {
   ACE_TRACE ("ACE_Task_Base::thr_count_dec");
-  ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_));
+  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_));
 
   this->thr_count_--;
 }
@@ -57,7 +62,11 @@ ACE_INLINE int
 ACE_Task_Base::grp_id (void) const
 {
   ACE_TRACE ("ACE_Task_Base::grp_id");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
+  ACE_MT
+    (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
+                       ace_mon,
+                       const_cast <ACE_Recursive_Thread_Mutex&>(this->lock_),
+                       -1));
   return this->grp_id_;
 }
 
@@ -67,7 +76,7 @@ ACE_INLINE void
 ACE_Task_Base::grp_id (int identifier)
 {
   ACE_TRACE ("ACE_Task_Base::grp_id");
-  ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_));
+  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_));
 
   // Cache the group id in the task and then set it in the
   // Thread_Manager, if there is one.
@@ -76,3 +85,4 @@ ACE_Task_Base::grp_id (int identifier)
     this->thr_mgr ()->set_grp (this, identifier);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Task_Ex_T.cpp b/ace/Task_Ex_T.cpp
index a265355c22e..0c5871657dd 100644
--- a/ace/Task_Ex_T.cpp
+++ b/ace/Task_Ex_T.cpp
@@ -1,8 +1,7 @@
-// Task_Ex_T.cpp
 // $Id$
 
-#ifndef ACE_TASK_EX_T_C
-#define ACE_TASK_EX_T_C
+#ifndef ACE_TASK_EX_T_CPP
+#define ACE_TASK_EX_T_CPP
 
 #include "ace/Task_Ex_T.h"
 
@@ -17,7 +16,8 @@
 #include "ace/Task_Ex_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Task_Ex_T, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> void
 ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::dump (void) const
@@ -109,4 +109,6 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::module (void) const
   return this->mod_;
 }
 
-#endif /* ACE_TASK_EX_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TASK_EX_T_CPP */
diff --git a/ace/Task_Ex_T.h b/ace/Task_Ex_T.h
index 9777a90ff03..d958bd2d5e6 100644
--- a/ace/Task_Ex_T.h
+++ b/ace/Task_Ex_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Task.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls...
 template <ACE_SYNCH_DECL> class ACE_Module;
 
@@ -150,7 +152,13 @@ public: // Should be protected:
    * Note that if this conflicts with the C++ iostream <flush>
    * function, just rewrite the iostream function as ::<flush>.
    */
+
+#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
+  // Make LynxOS 3.x buggy compiler happy
+  int flush (u_long flag = ACE_FLUSHALL);
+#else
   int flush (u_long flag = ACE_Task_Flags::ACE_FLUSHALL);
+#endif
 
   // = Special routines corresponding to certain message types.
 
@@ -182,6 +190,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Task_Ex (const ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Task_Ex_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Task_Ex_T.inl b/ace/Task_Ex_T.inl
index fb68b7f874e..b49f4bf53f1 100644
--- a/ace/Task_Ex_T.inl
+++ b/ace/Task_Ex_T.inl
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Task_Ex_T.i
-
 #include "ace/os_include/os_assert.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE void
-ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, 
-				    size_t wm_size)
+ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
+                                    size_t wm_size)
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::water_marks");
   if (cmd == ACE_IO_Cntl_Msg::SET_LWM)
@@ -16,14 +17,14 @@ ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::water_marks (ACE_IO_Cntl_Msg::ACE_I
     this->msg_queue_->high_water_mark (wm_size);
 }
 
-template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE int 
+template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE int
 ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::getq (ACE_MESSAGE_TYPE *&mb, ACE_Time_Value *tv)
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::getq");
   return this->msg_queue_->dequeue_head (mb, tv);
 }
 
-template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE int 
+template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE int
 ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::can_put (ACE_MESSAGE_TYPE *)
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::can_put");
@@ -100,10 +101,12 @@ ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::next (ACE_Task<ACE_SYNCH_USE> *q)
 // Transfer msg to the next ACE_Task_Ex.
 
 template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_INLINE int
-ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::put_next (ACE_MESSAGE_TYPE *msg, ACE_Time_Value *tv)
+ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::put_next (
+  ACE_MESSAGE_TYPE * /* msg */,
+  ACE_Time_Value * /* tv */)
 {
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::put_next");
-  ACE_UNUSED_ARG (msg);
-  ACE_UNUSED_ARG (tv);
   return  -1; // this->next_ == 0 ? -1 : this->next_->put (msg, tv);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp
index e35297792cb..f0c97e74193 100644
--- a/ace/Task_T.cpp
+++ b/ace/Task_T.cpp
@@ -1,8 +1,7 @@
-// Task.cpp
 // $Id$
 
-#ifndef ACE_TASK_T_C
-#define ACE_TASK_T_C
+#ifndef ACE_TASK_T_CPP
+#define ACE_TASK_T_CPP
 
 #include "ace/Task_T.h"
 
@@ -17,7 +16,7 @@
 #include "ace/Task_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Task_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <ACE_SYNCH_DECL> void
 ACE_Task<ACE_SYNCH_USE>::dump (void) const
@@ -104,4 +103,6 @@ ACE_Task<ACE_SYNCH_USE>::module (void) const
   return this->mod_;
 }
 
-#endif /* ACE_TASK_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TASK_T_CPP */
diff --git a/ace/Task_T.h b/ace/Task_T.h
index 52c0f6b2218..68e54562612 100644
--- a/ace/Task_T.h
+++ b/ace/Task_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,9 +23,15 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Task.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decls...
 template <ACE_SYNCH_DECL> class ACE_Module;
 
+#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
+  using namespace ACE_Task_Flags;
+#endif
+
 /**
  * @class ACE_Task
  *
@@ -130,7 +136,13 @@ public: // Should be protected:
    * Note that if this conflicts with the C++ iostream <flush>
    * function, just rewrite the iostream function as ::<flush>.
    */
+
+#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
+  // Make LynxOS 3.x buggy compiler happy
+  int flush (u_long flag = ACE_FLUSHALL);
+#else
   int flush (u_long flag = ACE_Task_Flags::ACE_FLUSHALL);
+#endif
 
   // = Special routines corresponding to certain message types.
 
@@ -167,6 +179,8 @@ template class ACE_Export ACE_Task<ACE_MT_SYNCH>;
 template class ACE_Export ACE_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Task_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Task_T.inl b/ace/Task_T.inl
index e4694062fc4..77d7c0d789e 100644
--- a/ace/Task_T.inl
+++ b/ace/Task_T.inl
@@ -1,13 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Task_T.i
-
 #include "ace/os_include/os_assert.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <ACE_SYNCH_DECL> ACE_INLINE void
-ACE_Task<ACE_SYNCH_USE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, 
-				    size_t wm_size)
+ACE_Task<ACE_SYNCH_USE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
+                                    size_t wm_size)
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::water_marks");
   if (cmd == ACE_IO_Cntl_Msg::SET_LWM)
@@ -16,14 +17,14 @@ ACE_Task<ACE_SYNCH_USE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
     this->msg_queue_->high_water_mark (wm_size);
 }
 
-template <ACE_SYNCH_DECL> ACE_INLINE int 
+template <ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Task<ACE_SYNCH_USE>::getq (ACE_Message_Block *&mb, ACE_Time_Value *tv)
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::getq");
   return this->msg_queue_->dequeue_head (mb, tv);
 }
 
-template <ACE_SYNCH_DECL> ACE_INLINE int 
+template <ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Task<ACE_SYNCH_USE>::can_put (ACE_Message_Block *)
 {
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::can_put");
@@ -103,3 +104,5 @@ ACE_Task<ACE_SYNCH_USE>::put_next (ACE_Message_Block *msg, ACE_Time_Value *tv)
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::put_next");
   return this->next_ == 0 ? -1 : this->next_->put (msg, tv);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
index 9542848b4f5..3df1a0062ec 100644
--- a/ace/Template_Instantiations.cpp
+++ b/ace/Template_Instantiations.cpp
@@ -35,6 +35,8 @@
 #error ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE may not be used with  ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION or ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //  D E P T H = 0
 // Templates with nesting depth 0 (no dependencies on
 // other templates), ordered by number of template arguments
@@ -350,6 +352,8 @@ template class ACE_Timer_Queue_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_E
 
 template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #elif defined (__HP_aCC)
 // Make aC++ stop complaining about an empty translation unit
 static int shut_up_aCC = 0;
diff --git a/ace/Test_and_Set.cpp b/ace/Test_and_Set.cpp
index 5a9cbdb0bfe..ea420bbe508 100644
--- a/ace/Test_and_Set.cpp
+++ b/ace/Test_and_Set.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_TEST_AND_SET_C
-#define ACE_TEST_AND_SET_C
+#ifndef ACE_TEST_AND_SET_CPP
+#define ACE_TEST_AND_SET_CPP
 
 #include "ace/Test_and_Set.h"
 #include "ace/Guard_T.h"
@@ -10,7 +10,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Test_and_Set, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK, class TYPE>
 ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value)
@@ -46,4 +46,6 @@ ACE_Test_and_Set<ACE_LOCK, TYPE>::handle_signal (int, siginfo_t *, ucontext_t *)
   return 0;
 }
 
-#endif /* ACE_TEST_AND_SET_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TEST_AND_SET_CPP */
diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h
index 37e810f1b4e..d72c3d474b0 100644
--- a/ace/Test_and_Set.h
+++ b/ace/Test_and_Set.h
@@ -1,11 +1,10 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
  *  @file   Test_and_Set.h
  *
  *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
  */
 //=============================================================================
 
@@ -20,6 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Test_and_Set
  *
@@ -28,7 +29,7 @@
  *
  *     This class keeps track of the status of <is_set_>, which can
  *     be set based on various events (such as receipt of a
- *     signal).  This class is derived from <ACE_Event_Handler> so
+ *     signal).  This class is derived from ACE_Event_Handler so
  *     that it can be "signaled" by a Reactor when a signal occurs.
  *     We assume that <TYPE> is a data type that can be assigned the
  *     value 0 or 1.
@@ -60,6 +61,8 @@ private:
   ACE_LOCK lock_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Test_and_Set.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Thread.cpp b/ace/Thread.cpp
index 80ce71f3d7e..a920e131be9 100644
--- a/ace/Thread.cpp
+++ b/ace/Thread.cpp
@@ -1,18 +1,19 @@
-// Thread.cpp
 // $Id$
 
 #include "ace/Thread.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Thread.inl"
-#endif /* !defined (__ACE_INLINE__) */
-
 ACE_RCSID(ace,
           Thread,
           "$Id$")
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Thread.inl"
+#endif /* !defined (__ACE_INLINE__) */
+
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 size_t
 ACE_Thread::spawn_n (size_t n,
                      ACE_THR_FUNC func,
@@ -89,4 +90,6 @@ ACE_Thread::spawn_n (ACE_thread_t thread_ids[],
   return i;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Thread.h b/ace/Thread.h
index 05a81548d97..ba1b9d64a57 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -24,6 +24,8 @@
 #include "ace/OS_NS_Thread.h"
 #include "ace/Thread_Adapter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 struct cancel_state
 {
   /// e.g., PTHREAD_CANCEL_ENABLE, PTHREAD_CANCEL_DISABLE,
@@ -265,6 +267,8 @@ private:
   ACE_Thread (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Thread.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Thread.inl b/ace/Thread.inl
index 0091d8eec3a..ba635c6b2f0 100644
--- a/ace/Thread.inl
+++ b/ace/Thread.inl
@@ -1,10 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Thread.inl
-
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Allocates a <keyp> that is used to identify data that is specific
 // to each thread in the process.  The key is global to all threads in
 // the process.
@@ -279,3 +280,5 @@ ACE_Thread::setprio (ACE_hthread_t ht_id, int priority, int policy)
   ACE_TRACE ("ACE_Thread::setprio");
   return ACE_OS::thr_setprio (ht_id, priority, policy);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp
index 8b1abafa302..d969e3e9d0d 100644
--- a/ace/Thread_Adapter.cpp
+++ b/ace/Thread_Adapter.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (ace,
 # include "ace/Thread_Adapter.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
                                         void *arg,
                                         ACE_THR_C_FUNC entry_point,
@@ -245,3 +247,5 @@ ACE_Thread_Adapter::invoke_i (void)
 
   return status;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Adapter.h b/ace/Thread_Adapter.h
index 78dfa4b96e4..046d21b238f 100644
--- a/ace/Thread_Adapter.h
+++ b/ace/Thread_Adapter.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +22,8 @@
 
 #include "ace/Base_Thread_Adapter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_Thread_Manager;
 class ACE_Thread_Descriptor;
@@ -46,7 +49,7 @@ public:
   /// Constructor.
   ACE_Thread_Adapter (ACE_THR_FUNC user_func,
                       void *arg,
-                      ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter,
+                      ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME,
                       ACE_Thread_Manager *thr_mgr = 0,
                       ACE_Thread_Descriptor *td = 0
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
@@ -65,23 +68,26 @@ public:
   /// Accessor for the optional <Thread_Manager>.
   ACE_Thread_Manager *thr_mgr (void);
 
-private:
+protected:
+
   /// Ensure that this object must be allocated on the heap.
   ~ACE_Thread_Adapter (void);
 
+private:
+
   /// Called by invoke, mainly here to separate the SEH stuff because
   /// SEH on Win32 doesn't compile with local vars with destructors.
   virtual ACE_THR_FUNC_RETURN invoke_i (void);
 
 private:
+
   /// Optional thread manager.
   ACE_Thread_Manager *thr_mgr_;
 
-  /// Friend declaration to avoid compiler warning:  only defines a private
-  /// destructor and has no friends.
-  friend class ACE_Thread_Adapter_Has_Private_Destructor;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/Thread_Adapter.inl b/ace/Thread_Adapter.inl
index 433023aad93..4f1fa0fce49 100644
--- a/ace/Thread_Adapter.inl
+++ b/ace/Thread_Adapter.inl
@@ -1,8 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_Thread_Manager *
 ACE_Thread_Adapter::thr_mgr (void)
 {
   return this->thr_mgr_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Control.cpp b/ace/Thread_Control.cpp
index 5415e74b687..5198fad391d 100644
--- a/ace/Thread_Control.cpp
+++ b/ace/Thread_Control.cpp
@@ -18,6 +18,8 @@ ACE_RCSID(ace, Thread_Control, "$Id$")
 # include "ace/Thread_Control.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Thread_Control::dump (void) const
 {
@@ -90,3 +92,5 @@ ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit)
       return 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h
index fa2bc559c8d..6989d77daad 100644
--- a/ace/Thread_Control.h
+++ b/ace/Thread_Control.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Thread_Manager;
 
 /**
@@ -85,6 +88,8 @@ private:
   ACE_THR_FUNC_RETURN status_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/Thread_Control.inl b/ace/Thread_Control.inl
index 0c2ab504112..7b96cb369f8 100644
--- a/ace/Thread_Control.inl
+++ b/ace/Thread_Control.inl
@@ -1,6 +1,9 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Set the exit status.
 
 ACE_INLINE ACE_THR_FUNC_RETURN
@@ -40,3 +43,4 @@ ACE_Thread_Control::thr_mgr (ACE_Thread_Manager *tm)
   return o_tm;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Exit.cpp b/ace/Thread_Exit.cpp
index 160c1e0429c..6ef493e7b97 100644
--- a/ace/Thread_Exit.cpp
+++ b/ace/Thread_Exit.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(ace, Thread_Exit, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 u_int ACE_Thread_Exit::is_constructed_ = 0;
 
 void
@@ -118,14 +120,4 @@ ACE_Thread_Exit_Maybe::instance (void) const
   return this->instance_;
 }
 
-#if (defined (ACE_HAS_THREADS) && \
-      (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
-       defined (ACE_HAS_TSS_EMULATION)))
-
-# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_TSS<ACE_Thread_Exit>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<ACE_Thread_Exit>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Exit.h b/ace/Thread_Exit.h
index e183512e5a5..fc828c5aa03 100644
--- a/ace/Thread_Exit.h
+++ b/ace/Thread_Exit.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +23,8 @@
 
 #include "ace/Thread_Control.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Thread_Exit
  *
@@ -102,5 +105,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_THREAD_EXIT_H */
diff --git a/ace/Thread_Hook.cpp b/ace/Thread_Hook.cpp
index e866a3626e5..e69eb0a482c 100644
--- a/ace/Thread_Hook.cpp
+++ b/ace/Thread_Hook.cpp
@@ -5,6 +5,8 @@
 
 ACE_RCSID(ace, Thread_Hook, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Thread_Hook::~ACE_Thread_Hook ()
 {
 }
@@ -27,3 +29,5 @@ ACE_Thread_Hook::thread_hook (void)
 {
   return ACE_OS_Object_Manager::thread_hook ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Hook.h b/ace/Thread_Hook.h
index c8aa941d669..a6748d25061 100644
--- a/ace/Thread_Hook.h
+++ b/ace/Thread_Hook.h
@@ -23,6 +23,8 @@
 
 #include "ace/ACE_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Thread_Hook
  *
@@ -57,5 +59,7 @@ public:
   static ACE_Thread_Hook *thread_hook (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_THREAD_HOOK_H */
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index ffd9950c38a..a733388cef5 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -18,6 +18,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
 
 ACE_At_Thread_Exit::~ACE_At_Thread_Exit (void)
@@ -586,7 +588,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   ACE_NEW_RETURN (thread_args,
                   ACE_Thread_Adapter (func,
                                       args,
-                                      (ACE_THR_C_FUNC) ace_thread_adapter,
+                                      (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME,
                                       this,
                                       new_thr_desc.get (),
                                       ACE_OS_Object_Manager::seh_except_selector(),
@@ -596,7 +598,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   ACE_NEW_RETURN (thread_args,
                   ACE_Thread_Adapter (func,
                                       args,
-                                      (ACE_THR_C_FUNC) ace_thread_adapter,
+                                      (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME,
                                       this,
                                       new_thr_desc.get ()),
                   -1);
@@ -636,15 +638,15 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   // removing this Thread Descriptor before it gets put into our
   // thread table.
 
-  int result = ACE_Thread::spawn (func,
-                                  args,
-                                  flags,
-                                  t_id,
-                                  &thr_handle,
-                                  priority,
-                                  stack,
-                                  stack_size,
-                                  thread_args);
+  int const result = ACE_Thread::spawn (func,
+                                        args,
+                                        flags,
+                                        t_id,
+                                        &thr_handle,
+                                        priority,
+                                        stack,
+                                        stack_size,
+                                        thread_args);
 
   if (result != 0)
     {
@@ -1029,7 +1031,7 @@ ACE_Thread_Manager::suspend_thr (ACE_Thread_Descriptor *td, int)
 {
   ACE_TRACE ("ACE_Thread_Manager::suspend_thr");
 
-  int result = ACE_Thread::suspend (td->thr_handle_);
+  int const result = ACE_Thread::suspend (td->thr_handle_);
   if (result == -1) {
     if (errno != ENOTSUP)
       this->thr_to_be_removed_.enqueue_tail (td);
@@ -1046,7 +1048,7 @@ ACE_Thread_Manager::resume_thr (ACE_Thread_Descriptor *td, int)
 {
   ACE_TRACE ("ACE_Thread_Manager::resume_thr");
 
-  int result = ACE_Thread::resume (td->thr_handle_);
+  int const result = ACE_Thread::resume (td->thr_handle_);
   if (result == -1) {
     if (errno != ENOTSUP)
       this->thr_to_be_removed_.enqueue_tail (td);
@@ -1085,7 +1087,7 @@ ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum)
   tid += tid[0] == ACE_THR_ID_ALLOCATED  ?  1  :  0;
 #endif /* VXWORKS */
 
-  int result = ACE_Thread::kill (tid, signum);
+  int const result = ACE_Thread::kill (tid, signum);
 
   if (result != 0)
     {
@@ -2329,47 +2331,4 @@ ACE_Thread_Manager::get_grp (ACE_Task_Base *task, int &grp_id)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-# if defined (ACE_THREAD_MANAGER_LACKS_STATICS)
-template class ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX>;
-# endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACE_Thread_Descriptor>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-template class auto_ptr<ACE_Thread_Descriptor>;
-template class ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>;
-template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor_Base>;
-template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
-template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
-template class ACE_Node<ACE_Thread_Descriptor*>;
-template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
-template class ACE_Unbounded_Queue_Iterator<ACE_Thread_Descriptor*>;
-template class ACE_Free_List<ACE_Thread_Descriptor>;
-template class ACE_Locked_Free_List<ACE_Thread_Descriptor, ACE_DEFAULT_THREAD_MANAGER_LOCK>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  if defined (ACE_THREAD_MANAGER_LACKS_STATICS)
-#    pragma instantiate ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX>
-#   endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<ACE_Thread_Descriptor>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#  pragma instantiate auto_ptr<ACE_Thread_Descriptor>
-#  pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>
-#  pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>
-#  pragma instantiate ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor_Base>
-#  pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor>
-#  pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>
-#  pragma instantiate ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>
-#  pragma instantiate ACE_Node<ACE_Thread_Descriptor*>
-#  pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor*>
-#  pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Thread_Descriptor*>
-#  pragma instantiate ACE_Free_List<ACE_Thread_Descriptor>
-#  pragma instantiate ACE_Locked_Free_List<ACE_Thread_Descriptor, ACE_DEFAULT_THREAD_MANAGER_LOCK>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 0b55ce84978..c42f7959f25 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -74,6 +74,8 @@
 # define ACE_DEFAULT_THREAD_MANAGER_LOCK ACE_SYNCH_MUTEX
 #endif /* ACE_DEFAULT_THREAD_MANAGER_LOCK */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_Task_Base;
 class ACE_Thread_Manager;
@@ -448,7 +450,7 @@ public:
                       size_t lwm = ACE_DEFAULT_THREAD_MANAGER_LWM,
                       size_t inc = ACE_DEFAULT_THREAD_MANAGER_INC,
                       size_t hwm = ACE_DEFAULT_THREAD_MANAGER_HWM);
-  virtual ~ACE_Thread_Manager (void);
+  ~ACE_Thread_Manager (void);
 
 #if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS)
   /// Get pointer to a process-wide <ACE_Thread_Manager>.
@@ -979,16 +981,17 @@ protected:
   ACE_Thread_Descriptor *hthread_descriptor (ACE_hthread_t);
 
   /// Create a new thread (must be called with locks held).
-  virtual int spawn_i (ACE_THR_FUNC func,
-                       void *arg,
-                       long flags,
-                       ACE_thread_t * = 0,
-                       ACE_hthread_t *t_handle = 0,
-                       long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                       int grp_id = -1,
-                       void *stack = 0,
-                       size_t stack_size = 0,
-                       ACE_Task_Base *task = 0);
+  int spawn_i (ACE_THR_FUNC func,
+               void *arg,
+               long flags,
+               ACE_thread_t * = 0,
+               ACE_hthread_t *t_handle = 0,
+               long priority = ACE_DEFAULT_THREAD_PRIORITY,
+               int grp_id = -1,
+               void *stack = 0,
+               size_t stack_size = 0,
+               ACE_Task_Base *task = 0);
+
   /// Run the registered hooks when the thread exits.
   void run_thread_exit_hooks (int i);
 
@@ -1135,6 +1138,8 @@ private:
 typedef ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX> ACE_THREAD_MANAGER_SINGLETON;
 #endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Thread_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Thread_Manager.inl b/ace/Thread_Manager.inl
index cac2d176761..471c98e1b62 100644
--- a/ace/Thread_Manager.inl
+++ b/ace/Thread_Manager.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
 ACE_INLINE
@@ -315,3 +316,5 @@ ACE_Thread_Manager::count_threads (void) const
 {
   return this->thr_list_.size ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Mutex.cpp b/ace/Thread_Mutex.cpp
index 8a0af97ce10..6a7480902e2 100644
--- a/ace/Thread_Mutex.cpp
+++ b/ace/Thread_Mutex.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file Thread_Mutex.cpp
  *
@@ -23,6 +22,8 @@
 
 ACE_RCSID(ace, Thread_Mutex, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex_Guard)
 
 #if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
@@ -72,18 +73,6 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg)
                 ACE_LIB_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex")));
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// These are only instantiated with ACE_HAS_THREADS.
-template class ACE_Guard<ACE_Thread_Mutex>;
-template class ACE_Read_Guard<ACE_Thread_Mutex>;
-template class ACE_Write_Guard<ACE_Thread_Mutex>;
-template class ACE_Malloc_Lock_Adapter_T<ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// These are only instantiated with ACE_HAS_THREADS.
-#pragma instantiate ACE_Guard<ACE_Thread_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_Thread_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Thread_Mutex>
-#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Thread_Mutex.h b/ace/Thread_Mutex.h
index 2c7f32bf7f5..4da040a3296 100644
--- a/ace/Thread_Mutex.h
+++ b/ace/Thread_Mutex.h
@@ -30,21 +30,23 @@
 #include "ace/ACE_export.h"
 #include "ace/OS_NS_Thread.h"
 
-  /**
-   * @class ACE_Thread_Mutex
-   *
-   * @brief ACE_Thread_Mutex wrapper (only valid for threads in the same
-   * process).
-   *
-   * This implementation is optimized for locking threads that are
-   * in the same process.  It maps to <CRITICAL_SECTION>s on NT
-   * and <ACE_mutex_t> with <type> set to <USYNC_THREAD> on UNIX.
-   * ACE_Thread_Mutex is recursive on some platforms (like
-   * Win32). However, on most platforms (like Solaris) it is not
-   * recursive.  To be totally safe and portable, developers
-   * should use <ACE_Recursive_Thread_Mutex> when they need a
-   * recursive mutex.
-   */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_Thread_Mutex
+ *
+ * @brief ACE_Thread_Mutex wrapper (only valid for threads in the same
+ * process).
+ *
+ * This implementation is optimized for locking threads that are
+ * in the same process.  It maps to <CRITICAL_SECTION>s on NT
+ * and <ACE_mutex_t> with <type> set to <USYNC_THREAD> on UNIX.
+ * ACE_Thread_Mutex is recursive on some platforms (like
+ * Win32). However, on most platforms (like Solaris) it is not
+ * recursive.  To be totally safe and portable, developers
+ * should use ACE_Recursive_Thread_Mutex when they need a
+ * recursive mutex.
+ */
 class ACE_Export ACE_Thread_Mutex
 {
   friend class ACE_Condition_Thread_Mutex;
@@ -67,16 +69,16 @@ public:
   int acquire (void);
 
   /**
-   * Block the thread until we acquire the mutex or until <tv> times
+   * 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
+   * that @a tv is assumed to be in "absolute" rather than "relative"
+   * time.  The value of @a tv is updated upon return to show the
    * actual (absolute) acquisition time.
    */
   int acquire (ACE_Time_Value &tv);
 
   /**
-   * If <tv> == 0 the call <acquire()> directly.  Otherwise, Block the
+   * If @a tv == 0 the call <acquire()> directly.  Otherwise, Block the
    * thread until we acquire the mutex or until <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.
@@ -97,21 +99,21 @@ public:
 
   /**
    * Acquire mutex ownership.  This calls <acquire> and is only here
-   * to make the <ACE_Thread_Mutex> interface consistent with the
+   * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
   int acquire_read (void);
 
   /**
    * Acquire mutex ownership.  This calls <acquire> and is only here
-   * to make the <ACE_Thread_Mutex> interface consistent with the
+   * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
   int acquire_write (void);
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
-   * <tryacquire> and is only here to make the <ACE_Thread_Mutex>
+   * <tryacquire> and is only here to make the ACE_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, <errno> is set to <EBUSY>.
@@ -120,7 +122,7 @@ public:
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
-   * <tryacquire> and is only here to make the <ACE_Thread_Mutex>
+   * <tryacquire> and is only here to make the ACE_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, <errno> is set to <EBUSY>.
@@ -128,7 +130,7 @@ public:
   int tryacquire_write (void);
 
   /**
-   * This is only here to make the <ACE_Thread_Mutex>
+   * This is only here to make the ACE_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Assumes the caller has already acquired the mutex using one of
    * the above calls, and returns 0 (success) always.
@@ -167,7 +169,7 @@ private:
  *
  * @brief This data structure is meant to be used within a method or
  * function...  It performs automatic aquisition and release of
- * an <ACE_Thread_Mutex>.
+ * an ACE_Thread_Mutex.
  *
  * This class is obsolete and should be replaced by
  * ACE_Guard<ACE_Thread_Mutex>.
@@ -225,6 +227,8 @@ private:
 };
 #endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Thread_Mutex.inl b/ace/Thread_Mutex.inl
index f1031aafa48..7658522b38f 100644
--- a/ace/Thread_Mutex.inl
+++ b/ace/Thread_Mutex.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_thread_mutex_t &
 ACE_Thread_Mutex::lock (void) const
 {
@@ -165,3 +168,5 @@ ACE_Thread_Mutex_Guard::remove (void)
   return this->release ();
 }
 #endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Thread_Semaphore.cpp b/ace/Thread_Semaphore.cpp
index 8c56a7e1c31..741c7c5ec99 100644
--- a/ace/Thread_Semaphore.cpp
+++ b/ace/Thread_Semaphore.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 /**
  * @file Thread_Semaphore.cpp
  *
@@ -22,6 +21,8 @@
 ACE_RCSID(ace, Thread_Semaphore, "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 void
 ACE_Thread_Semaphore::dump (void) const
 {
@@ -56,4 +57,6 @@ ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>::operator () (const ACE_TCHAR *n
   return p;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Thread_Semaphore.h b/ace/Thread_Semaphore.h
index c99a60d3575..096dce3e93c 100644
--- a/ace/Thread_Semaphore.h
+++ b/ace/Thread_Semaphore.h
@@ -16,12 +16,7 @@
 #define ACE_THREAD_SEMAPHORE_H
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_THREADS_BUILD_DLL
-# include "ace/ACE_Threads_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Threads_Export ACE_Export
-#endif  /* ACE_THREADS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,13 +29,15 @@
 
 #include "ace/Semaphore.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Thread_Semaphore
  *
  * @brief Wrapper for Dijkstra style general semaphores that work
  * only within one process.
  */
-class ACE_Threads_Export ACE_Thread_Semaphore : public ACE_Semaphore
+class ACE_Export ACE_Thread_Semaphore : public ACE_Semaphore
 {
 public:
   /// Initialize the semaphore, with an initial value of @a count,
@@ -74,12 +71,14 @@ template <class T> class ACE_Malloc_Lock_Adapter_T;
  * the standard form used by other lock strategy classes.
  */
 template<>
-class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>
+class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>
 {
 public:
   ACE_Thread_Semaphore * operator () (const ACE_TCHAR *name);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Thread_Semaphore.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Thread_Semaphore.inl b/ace/Thread_Semaphore.inl
index 8d2a9adf785..e9535ff088e 100644
--- a/ace/Thread_Semaphore.inl
+++ b/ace/Thread_Semaphore.inl
@@ -1,7 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_Thread_Semaphore::~ACE_Thread_Semaphore (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp
index bf1586d7260..e7524ce6ce7 100644
--- a/ace/Time_Request_Reply.cpp
+++ b/ace/Time_Request_Reply.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(ace, Time_Request_Reply, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default "do nothing" constructor.
 
 ACE_Time_Request::ACE_Time_Request (void)
@@ -190,3 +192,5 @@ ACE_Time_Request::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("+++++++\n")));
 #endif /* ACE_HAS_DUMP */
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 551da8dfb82..8c062cbd9a5 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Time_Request_Reply.h
@@ -23,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Time_Request
  *
@@ -130,6 +133,7 @@ private:
   ACE_UINT32 time_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIME_REQUEST_REPLY_H */
diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp
index 2f8a9e67bff..8ce096055c8 100644
--- a/ace/Time_Value.cpp
+++ b/ace/Time_Value.cpp
@@ -9,6 +9,19 @@ ACE_RCSID (ace,
 #include "ace/Time_Value.inl"
 #endif /* __ACE_INLINE__ */
 
+#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 */
+
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Static constant representing `zero-time'.
 // Note: this object requires static construction.
@@ -20,7 +33,14 @@ 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.
-const ACE_Time_Value ACE_Time_Value::max_time (LONG_MAX,
+// Note: on platforms without std::numeric_limits<>, we assume time_t is
+// a long, the historical type used for time.
+const ACE_Time_Value ACE_Time_Value::max_time (
+#if !defined(ACE_LACKS_NUMERIC_LIMITS) && !defined (ACE_WIN64)
+                                               std::numeric_limits<time_t>::max (),
+#else
+                                               LONG_MAX,
+#endif
                                                ACE_ONE_SECOND_IN_USECS - 1);
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Time_Value)
@@ -100,7 +120,7 @@ void ACE_Time_Value::set (const FILETIME &file_time)
   // Convert 100ns units to seconds;
   this->tv_.tv_sec = (long) (LL_100ns / ((double) (10000 * 1000)));
   // Convert remainder to microseconds;
-  this->tv_.tv_usec = (long)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10);
+  this->tv_.tv_usec = (suseconds_t)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10);
 #else
   // Don't use a struct initializer, gcc don't like it.
   ULARGE_INTEGER _100ns;
@@ -112,7 +132,7 @@ void ACE_Time_Value::set (const FILETIME &file_time)
   // Convert 100ns units to seconds;
   this->tv_.tv_sec = (long) (_100ns.QuadPart / (10000 * 1000));
   // Convert remainder to microseconds;
-  this->tv_.tv_usec = (long) ((_100ns.QuadPart % (10000 * 1000)) / 10);
+  this->tv_.tv_usec = (suseconds_t) ((_100ns.QuadPart % (10000 * 1000)) / 10);
 #endif // ACE_LACKS_LONGLONG_T
   this->normalize ();
 }
@@ -215,20 +235,25 @@ ACE_Time_Value::operator *= (double d)
      + static_cast<double> (this->usec ()) / ACE_ONE_SECOND_IN_USECS) * d;
 
   // shall we saturate the result?
-  static const double max_int = ACE_INT32_MAX + 0.999999;
-  static const double min_int = ACE_INT32_MIN - 0.999999;
+#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
 
   if (time_total > max_int)
     time_total = max_int;
   if (time_total < min_int)
     time_total = min_int;
 
-  const long time_sec = static_cast<long> (time_total);
+  const time_t time_sec = static_cast<time_t> (time_total);
 
   time_total -= time_sec;
   time_total *= ACE_ONE_SECOND_IN_USECS;
 
-  long time_usec = static_cast<long> (time_total);
+  suseconds_t time_usec = static_cast<suseconds_t> (time_total);
 
   // round up the result to save the last usec
   if (time_usec > 0 && (time_total - time_usec) >= 0.5)
@@ -237,7 +262,8 @@ ACE_Time_Value::operator *= (double d)
     --time_usec;
 
   this->set (time_sec, time_usec);
-  this->normalize (); // protect against future changes in normalization
 
   return *this;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 86ed911bfa0..5216a56c676 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -21,9 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS_DIAB_MIPS)
-# include "ace/os_include/sys/os_time.h"
-#endif /* ACE_HAS_WINCE ACE_PSOS_DIAB_MIPS */
+# include "ace/os_include/os_time.h"
 
 // Define some helpful constants.
 // Not type-safe, and signed.  For backward compatibility.
@@ -31,32 +29,16 @@
 #define ACE_ONE_SECOND_IN_USECS 1000000L
 #define ACE_ONE_SECOND_IN_NSECS 1000000000L
 
+// needed for ACE_UINT64
+#include "ace/Basic_Types.h"
+
 // This forward declaration is needed by the set() and FILETIME() functions
 #if defined (ACE_LACKS_LONGLONG_T)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_U_LongLong;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif  /* ACE_LACKS_LONGLONG_T */
 
-# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS)
-// Definition per POSIX.
-typedef struct timespec
-{
-  /// Seconds
-  time_t tv_sec;
-  /// Nanoseconds
-  long tv_nsec;
-} timespec_t;
-# elif defined (ACE_HAS_BROKEN_POSIX_TIME)
-// OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs
-#   include /**/ <sys/timers.h>
-# endif /* !ACE_HAS_POSIX_TIME */
-
-# if defined(ACE_LACKS_TIMESPEC_T)
-typedef struct timespec timespec_t;
-# endif /* ACE_LACKS_TIMESPEC_T */
-
-// needed for ACE_UINT64
-#include "ace/Basic_Types.h"
-
 // -------------------------------------------------------------------
 
 /**
@@ -78,6 +60,9 @@ typedef struct timespec timespec_t;
 //    - Steve Huston, 23-Aug-2004
 extern "C++" {
 #endif
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Time_Value
 {
 public:
@@ -101,23 +86,23 @@ public:
   ACE_Time_Value (void);
 
   /// Constructor.
-  ACE_Time_Value (long sec, long usec = 0);
+  explicit ACE_Time_Value (time_t sec, suseconds_t usec = 0);
 
   // = Methods for converting to/from various time formats.
 
   /// Construct the ACE_Time_Value from a timeval.
-  ACE_Time_Value (const struct timeval &t);
+  explicit ACE_Time_Value (const struct timeval &t);
 
   /// Construct the ACE_Time_Value object from a timespec_t.
-  ACE_Time_Value (const timespec_t &t);
+  explicit ACE_Time_Value (const timespec_t &t);
 
 # if defined (ACE_WIN32)
   /// Construct the ACE_Time_Value object from a Win32 FILETIME
-  ACE_Time_Value (const FILETIME &ft);
+  explicit ACE_Time_Value (const FILETIME &ft);
 # endif /* ACE_WIN32 */
 
-  /// Initializes the ACE_Time_Value from two longs.
-  void set (long sec, long usec);
+  /// Initializes the ACE_Time_Value from seconds and useconds.
+  void set (time_t sec, suseconds_t usec);
 
   /// Initializes the ACE_Time_Value from a double, which is assumed to be
   /// in second format, with any remainder treated as microseconds.
@@ -191,10 +176,10 @@ public:
    * @note The semantics of this method differs from the msec()
    *       method.
    */
-  long sec (void) const;
+  time_t sec (void) const;
 
   /// Set seconds.
-  void sec (long sec);
+  void sec (time_t sec);
 
   /// Get microseconds.
   /**
@@ -203,10 +188,10 @@ public:
    * @note The semantics of this method differs from the msec()
    *       method.
    */
-  long usec (void) const;
+  suseconds_t usec (void) const;
 
   /// Set microseconds.
-  void usec (long usec);
+  void usec (suseconds_t usec);
 
 #if !defined (ACE_LACKS_LONGLONG_T)
   /**
@@ -222,14 +207,23 @@ public:
   /// Add @a tv to this.
   ACE_Time_Value &operator += (const ACE_Time_Value &tv);
 
+  /// Add @a tv to this.
+  ACE_Time_Value &operator += (time_t tv);
+
   /// Assign @ tv to this
   ACE_Time_Value &operator = (const ACE_Time_Value &tv);
 
+  /// Assign @ tv to this
+  ACE_Time_Value &operator = (time_t tv);
+
   /// Subtract @a tv to this.
   ACE_Time_Value &operator -= (const ACE_Time_Value &tv);
 
-    /** \brief Multiply the time value by the @a d factor.
+  /// Substract @a tv to this.
+  ACE_Time_Value &operator -= (time_t tv);
 
+  /**
+    \brief Multiply the time value by the @a d factor.
     \note The result of the operator is valid for results from range
     < (ACE_INT32_MIN, -999999), (ACE_INT32_MAX, 999999) >. Result
     outside this range are saturated to a limit.
@@ -266,11 +260,11 @@ public:
 
   /// Adds two ACE_Time_Value objects together, returns the sum.
   friend ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1,
-					       const ACE_Time_Value &tv2);
+                                               const ACE_Time_Value &tv2);
 
   /// Subtracts two ACE_Time_Value objects, returns the difference.
   friend ACE_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1,
-					       const ACE_Time_Value &tv2);
+                                               const ACE_Time_Value &tv2);
 
   /// True if @a tv1 < @a tv2.
   friend ACE_Export bool operator < (const ACE_Time_Value &tv1,
@@ -299,10 +293,10 @@ public:
   //@{
   /// Multiplies the time value by @a d
   friend ACE_Export ACE_Time_Value operator * (double d,
-					       const ACE_Time_Value &tv);
+                                               const ACE_Time_Value &tv);
 
   friend ACE_Export ACE_Time_Value operator * (const ACE_Time_Value &tv,
-                                                  double d);
+                                               double d);
   //@}
 
   /// Dump is a no-op.
@@ -331,6 +325,8 @@ private:
   timeval tv_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Time_Value.inl"
 #endif /* __ACE_INLINE__ */
@@ -340,11 +336,13 @@ private:
 #endif
 
 #if defined (__MINGW32__)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // The MingW linker has problems with the exported statics
 // zero and max_time with these two statics the linker will be able to
 // resolve the static exported symbols.
 static const ACE_Time_Value& __zero_time = ACE_Time_Value::zero;
 static const ACE_Time_Value& __max_time = ACE_Time_Value::max_time;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* __MINGW32__ */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index 298485d319c..75c34a2e2cc 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 // Something is a bit brain-damaged here and I'm not sure what... this code
 // compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
@@ -47,11 +49,29 @@ ACE_Time_Value::operator const timeval * () const
 }
 
 ACE_INLINE void
-ACE_Time_Value::set (long sec, long usec)
+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) &&
+      __builtin_constant_p(usec) &&
+      (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS))
+    return;
+#endif
   this->normalize ();
 }
 
@@ -61,7 +81,7 @@ ACE_Time_Value::set (double d)
   // ACE_OS_TRACE ("ACE_Time_Value::set");
   long l = (long) d;
   this->tv_.tv_sec = l;
-  this->tv_.tv_usec = (long) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5);
+  this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5);
   this->normalize ();
 }
 
@@ -73,17 +93,9 @@ ACE_INLINE void
 ACE_Time_Value::set (const timespec_t &tv)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::set");
-#if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
-  this->tv_.tv_sec = static_cast<long> (tv.tv_sec);
-  // Convert nanoseconds into microseconds.
-  this->tv_.tv_usec = tv.tv_nsec / 1000;
-#else
-  this->tv_.tv_sec = tv.ts_sec;
-  // Convert nanoseconds into microseconds.
-  this->tv_.tv_usec = tv.ts_nsec / 1000;
-#endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */
 
-  this->normalize ();
+  this->set (tv.tv_sec,
+             tv.tv_nsec / 1000); // Convert nanoseconds into microseconds.
 }
 
 ACE_INLINE
@@ -95,7 +107,7 @@ ACE_Time_Value::ACE_Time_Value (void)
 }
 
 ACE_INLINE
-ACE_Time_Value::ACE_Time_Value (long sec, long usec)
+ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value");
   this->set (sec, usec);
@@ -103,7 +115,7 @@ ACE_Time_Value::ACE_Time_Value (long sec, long usec)
 
 // Returns number of seconds.
 
-ACE_INLINE long
+ACE_INLINE time_t
 ACE_Time_Value::sec (void) const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::sec");
@@ -113,10 +125,22 @@ ACE_Time_Value::sec (void) const
 // Sets the number of seconds.
 
 ACE_INLINE void
-ACE_Time_Value::sec (long sec)
+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.
@@ -153,7 +177,7 @@ ACE_Time_Value::msec (long milliseconds)
 
 // Returns number of micro-seconds.
 
-ACE_INLINE long
+ACE_INLINE suseconds_t
 ACE_Time_Value::usec (void) const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::usec");
@@ -163,7 +187,7 @@ ACE_Time_Value::usec (void) const
 // Sets the number of micro-seconds.
 
 ACE_INLINE void
-ACE_Time_Value::usec (long usec)
+ACE_Time_Value::usec (suseconds_t usec)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::usec");
   this->tv_.tv_usec = usec;
@@ -231,15 +255,9 @@ ACE_Time_Value::operator timespec_t () const
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator timespec_t");
   timespec_t tv;
-#if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
   tv.tv_sec = this->sec ();
   // Convert microseconds into nanoseconds.
   tv.tv_nsec = this->tv_.tv_usec * 1000;
-#else
-  tv.ts_sec = this->sec ();
-  // Convert microseconds into nanoseconds.
-  tv.ts_nsec = this->tv_.tv_usec * 1000;
-#endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */
   return tv;
 }
 
@@ -307,12 +325,28 @@ ACE_Time_Value::operator+= (const ACE_Time_Value &tv)
 }
 
 ACE_INLINE ACE_Time_Value &
+ACE_Time_Value::operator+= (time_t tv)
+{
+  // ACE_OS_TRACE ("ACE_Time_Value::operator+=");
+  this->sec (this->sec () + tv);
+  return *this;
+}
+
+ACE_INLINE ACE_Time_Value &
 ACE_Time_Value::operator= (const ACE_Time_Value &tv)
 {
   // ACE_OS_TRACE ("ACE_Time_Value::operator=");
   this->sec (tv.sec ());
   this->usec (tv.usec ());
-  // this->normalize ();
+  return *this;
+}
+
+ACE_INLINE ACE_Time_Value &
+ACE_Time_Value::operator= (time_t tv)
+{
+  // ACE_OS_TRACE ("ACE_Time_Value::operator=");
+  this->sec (tv);
+  this->usec (0);
   return *this;
 }
 
@@ -328,6 +362,14 @@ ACE_Time_Value::operator-= (const ACE_Time_Value &tv)
   return *this;
 }
 
+ACE_INLINE ACE_Time_Value &
+ACE_Time_Value::operator-= (time_t tv)
+{
+  // ACE_OS_TRACE ("ACE_Time_Value::operator-=");
+  this->sec (this->sec () - tv);
+  return *this;
+}
+
 // Adds two ACE_Time_Value objects together, returns the sum.
 
 ACE_INLINE ACE_Time_Value
@@ -357,3 +399,5 @@ operator - (const ACE_Time_Value &tv1,
 #if defined (ACE_WIN32) && defined (_WIN32_WCE)
 }
 #endif
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp
index 9fa83321885..4dd6962329d 100644
--- a/ace/Timeprobe.cpp
+++ b/ace/Timeprobe.cpp
@@ -6,43 +6,9 @@ ACE_RCSID(ace, Timeprobe, "$Id$")
 
 #if defined (ACE_COMPILE_TIMEPROBES)
 
-#include "ace/Timeprobe.h"
-#include "ace/Mutex.h"
-#include "ace/Null_Mutex.h"
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Timeprobe.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>;
-template class ACE_Function_Timeprobe<ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >;
-template class ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>;
-template class ACE_Unbounded_Set<ACE_Event_Descriptions>;
-template class ACE_Node<ACE_Event_Descriptions>;
-template class ACE_Timeprobe_Ex<ACE_Thread_Mutex, ACE_New_Allocator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>
-#pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>
-#pragma instantiate ACE_Unbounded_Set<ACE_Event_Descriptions>
-#pragma instantiate ACE_Node<ACE_Event_Descriptions>
-#pragma instantiate ACE_Timeprobe_Ex<ACE_Thread_Mutex, ACE_New_Allocator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#  if defined (ACE_TSS_TIMEPROBES)
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#  else /* ACE_TSS_TIMEPROBES */
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#  endif /* ACE_TSS_TIMEPROBES */
-
 #endif /* ACE_COMPILE_TIMEPROBES */
 
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h
index 6eca046a631..a78619f6e76 100644
--- a/ace/Timeprobe.h
+++ b/ace/Timeprobe.h
@@ -58,6 +58,8 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_Thread.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Event_Descriptions
  *
@@ -111,6 +113,8 @@ public:
   ACE_thread_t thread_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Timeprobe.inl"
 #endif /* __ACE_INLINE__ */
@@ -120,6 +124,8 @@ public:
 #include "ace/Singleton.h"
 #include "ace/Timeprobe_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // If ACE_MT_TIMEPROBES is defined, use a Thread_Mutex to lock the
 // internal state of ACE_Timerprobe.  This allows multiple threads to
 // use the same ACE_Timerprobe.
@@ -148,12 +154,14 @@ typedef ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX, ACE_TIMEPROBE_ALLOCATOR>
 #  endif /* ACE_TSS_TIMEPROBES */
 
 ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \
-                                           ACE_TIMEPROBE_WITH_LOCKING, \
-                                           ACE_TIMEPROBE_SINGLETON_LOCK_TYPE)
+                       ACE_TIMEPROBE_WITH_LOCKING,   \
+                       ACE_TIMEPROBE_SINGLETON_LOCK_TYPE)
 
 typedef ACE_TIMEPROBE_SINGLETON_TYPE<ACE_TIMEPROBE_WITH_LOCKING, ACE_TIMEPROBE_SINGLETON_LOCK_TYPE>
         ACE_TIMEPROBE_SINGLETON;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_COMPILE_TIMEPROBES */
 
 // If ACE_ENABLE_TIMEPROBES is defined, the macros below will
diff --git a/ace/Timeprobe.inl b/ace/Timeprobe.inl
index 2815dd56e0c..d25eb4b0cfa 100644
--- a/ace/Timeprobe.inl
+++ b/ace/Timeprobe.inl
@@ -1,9 +1,14 @@
 // -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE bool
 ACE_Event_Descriptions::operator== (const ACE_Event_Descriptions &rhs) const
 {
   return this->minimum_id_ == rhs.minimum_id_ &&
     this->descriptions_ == rhs.descriptions_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp
index bde2c1736dc..c148d3acdb9 100644
--- a/ace/Timeprobe_T.cpp
+++ b/ace/Timeprobe_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_TIMEPROBE_T_C
-#define ACE_TIMEPROBE_T_C
+#ifndef ACE_TIMEPROBE_T_CPP
+#define ACE_TIMEPROBE_T_CPP
 
 #include "ace/config-all.h"
 
@@ -9,14 +9,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Timeprobe_T, "$Id$")
-
 #if defined (ACE_COMPILE_TIMEPROBES)
 
 #include "ace/Timeprobe.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_string.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class ACE_LOCK, class ALLOCATOR>
 ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (u_long size)
   : timeprobes_ (0),
@@ -47,7 +47,7 @@ ACE_Timeprobe_Ex (ALLOCATOR *allocator,
     report_buffer_full_ (0),
     allocator_ (allocator)
 {
-  ACE_timeprobe_t *temp;
+  ACE_timeprobe_t *temp = 0;
   ACE_NEW_MALLOC_ARRAY (temp,
                         (ACE_timeprobe_t *) this->allocator ()->
                         malloc (this->max_size_*sizeof(ACE_timeprobe_t)),
@@ -99,7 +99,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobe (u_long event)
   this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime ();
   this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self ();
 
-  this->current_size_++;
+  ++this->current_size_;
 
 }
 
@@ -115,7 +115,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobe (const char *event)
   this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime ();
   this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self ();
 
-  this->current_size_++;
+  ++this->current_size_;
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
@@ -134,7 +134,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::increase_size (u_long size)
 
    if (size > this->max_size_)
    {
-      ACE_timeprobe_t *temp;
+      ACE_timeprobe_t *temp = 0;
       ACE_NEW_MALLOC_ARRAY (temp,
                            (ACE_timeprobe_t *) this->allocator ()->
                            malloc (this->max_size_
@@ -341,7 +341,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::find_description_i (u_long i)
            iterator++, j++)
         {
           EVENT_DESCRIPTIONS::iterator next_event_descriptions = iterator;
-          next_event_descriptions++;
+          ++next_event_descriptions;
 
           if (this->timeprobes_[i].event_.event_number_ < (*next_event_descriptions).minimum_id_)
             break;
@@ -394,5 +394,7 @@ ACE_Function_Timeprobe<Timeprobe>::~ACE_Function_Timeprobe (void)
   this->timeprobe_.timeprobe (this->event_ + 1);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_COMPILE_TIMEPROBES */
-#endif /* ACE_TIMEPROBE_T_C */
+#endif /* ACE_TIMEPROBE_T_CPP */
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index e4d0acc7c33..32b5bae1448 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 
 #include "ace/Unbounded_Set.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Timeprobe_Ex
  *
@@ -205,6 +207,8 @@ protected:
   u_long event_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timeprobe_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/ace/Timer_Hash.cpp b/ace/Timer_Hash.cpp
index cfd39ae18e7..532f0d83c64 100644
--- a/ace/Timer_Hash.cpp
+++ b/ace/Timer_Hash.cpp
@@ -1,10 +1,5 @@
 // $Id$
 
-// Timer_Hash.cpp
-
-#if !defined (ACE_TIMER_HASH_C)
-#define ACE_TIMER_HASH_C
-
 #include "ace/Timer_Hash.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -15,111 +10,3 @@
 
 ACE_RCSID(ace, Timer_Hash, "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *> >;
-template class ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *>,
-                                    ACE_Null_Mutex>;
-template class ACE_Timer_Hash_Upcall <ACE_Event_Handler *,
-                                      ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
-                                      ACE_SYNCH_RECURSIVE_MUTEX>;
-
-template class ACE_Timer_Queue_T <ACE_Event_Handler *,
-                                  ACE_Hash_Upcall,
-                                  ACE_Null_Mutex>;
-
-template class ACE_Timer_Queue_Iterator_T <ACE_Event_Handler *,
-                                           ACE_Hash_Upcall,
-                                           ACE_Null_Mutex>;
-
-template class ACE_Timer_List_T <ACE_Event_Handler *,
-                                 ACE_Hash_Upcall,
-                                 ACE_Null_Mutex>;
-
-template class ACE_Timer_List_Iterator_T <ACE_Event_Handler *,
-                                          ACE_Hash_Upcall,
-                                          ACE_Null_Mutex>;
-
-template class ACE_Timer_Heap_T <ACE_Event_Handler *,
-                                 ACE_Hash_Upcall,
-                                 ACE_Null_Mutex>;
-
-template class ACE_Timer_Heap_Iterator_T <ACE_Event_Handler *,
-                                          ACE_Hash_Upcall,
-                                          ACE_Null_Mutex>;
-
-template class ACE_Timer_Hash_T<ACE_Event_Handler *,
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
-                        ACE_SYNCH_RECURSIVE_MUTEX,
-                        ACE_Hash_Timer_List>;
-
-template class ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
-                                  ACE_SYNCH_RECURSIVE_MUTEX,
-                                  ACE_Hash_Timer_List>;
-
-template class ACE_Timer_Hash_T<ACE_Event_Handler *,
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
-                        ACE_SYNCH_RECURSIVE_MUTEX,
-                        ACE_Hash_Timer_Heap>;
-
-template class ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>,
-                                  ACE_SYNCH_RECURSIVE_MUTEX,
-                                  ACE_Hash_Timer_Heap>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *> >
-#pragma instantiate ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *>, \
-                                    ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Hash_Upcall <ACE_Event_Handler *, \
-                                      ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, \
-                                      ACE_SYNCH_RECURSIVE_MUTEX>
-
-#pragma instantiate ACE_Timer_Queue_T <ACE_Event_Handler *, \
-                                  ACE_Hash_Upcall, \
-                                  ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_Queue_Iterator_T <ACE_Event_Handler *, \
-                                           ACE_Hash_Upcall, \
-                                           ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_List_T <ACE_Event_Handler *, \
-                                 ACE_Hash_Upcall, \
-                                 ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_List_Iterator_T <ACE_Event_Handler *, \
-                                          ACE_Hash_Upcall, \
-                                          ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_Heap_T <ACE_Event_Handler *, \
-                                 ACE_Hash_Upcall, \
-                                 ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_Heap_Iterator_T <ACE_Event_Handler *, \
-                                          ACE_Hash_Upcall, \
-                                          ACE_Null_Mutex>
-
-#pragma instantiate ACE_Timer_Hash_T<ACE_Event_Handler *, \
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, \
-                        ACE_SYNCH_RECURSIVE_MUTEX, \
-                        ACE_Hash_Timer_List>
-
-#pragma instantiate ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, \
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, \
-                                  ACE_SYNCH_RECURSIVE_MUTEX, \
-                                  ACE_Hash_Timer_List>
-
-#pragma instantiate ACE_Timer_Hash_T<ACE_Event_Handler *, \
-                        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, \
-                        ACE_SYNCH_RECURSIVE_MUTEX, \
-                        ACE_Hash_Timer_Heap>
-
-#pragma instantiate ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, \
-                                  ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, \
-                                  ACE_SYNCH_RECURSIVE_MUTEX, \
-                                  ACE_Hash_Timer_Heap>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif /* ACE_TIMER_HASH_C */
diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h
index a457ba41207..2d959be39c5 100644
--- a/ace/Timer_Hash.h
+++ b/ace/Timer_Hash.h
@@ -24,6 +24,8 @@
 #include "ace/Timer_Heap_T.h"
 #include "ace/Timer_List_T.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // The following typedef are here for ease of use
 
 typedef ACE_Timer_Hash_Upcall <ACE_Event_Handler *,
@@ -67,5 +69,7 @@ typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
                                   ACE_Hash_Timer_Heap>
         ACE_Timer_Hash_Heap_Iterator;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_HASH_H */
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index 92dc421dd6a..9f5d51fb8d6 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -514,9 +514,9 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id,
     reinterpret_cast<Hash_Token<TYPE> *> (timer_id);
 #endif /* ACE_WIN64 */
 
-  int result = this->table_[h->pos_]->cancel (h->orig_id_,
-                                              0,
-                                              dont_call);
+  int const result = this->table_[h->pos_]->cancel (h->orig_id_,
+                                                    0,
+                                                    dont_call);
 
   if (result == 1)
     {
@@ -591,7 +591,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type,
 
   for (i = 0; i < pos; ++i)
     {
-      int result =
+      int const result =
         this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_,
                                                   0,
                                                   dont_call);
@@ -678,7 +678,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dispatch_info_i (const ACE_Time_Value &cur_time,
                                                                     ACE_Timer_Node_Dispatch_Info_T<TYPE> &info)
 {
-  int result =
+  int const result =
     ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::dispatch_info_i (cur_time,
                                                                info);
 
@@ -711,7 +711,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value
 
   int number_of_timers_expired = 0;
 
-  ACE_Timer_Node_T<TYPE> *expired;
+  ACE_Timer_Node_T<TYPE> *expired = 0;
 
   // Go through the table and expire anything that can be expired
 
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 2b6e7944438..c7eee094c63 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -22,6 +22,8 @@
 
 #include "ace/Free_List.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration.
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 class ACE_Timer_Hash_T;
@@ -243,7 +245,7 @@ public:
    */
   virtual int expire (const ACE_Time_Value &current_time);
 
-  /// Returns a pointer to this <ACE_Timer_Queue>'s iterator.
+  /// Returns a pointer to this ACE_Timer_Queue's iterator.
   virtual ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &iter (void);
 
   /// Removes the earliest node from the queue and returns it
@@ -312,6 +314,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Hash_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */
diff --git a/ace/Timer_Heap.cpp b/ace/Timer_Heap.cpp
index de160f575eb..300859dba8f 100644
--- a/ace/Timer_Heap.cpp
+++ b/ace/Timer_Heap.cpp
@@ -1,44 +1,16 @@
 // $Id$
 
-#if !defined (ACE_TIMER_HEAP_C)
-#define ACE_TIMER_HEAP_C
-
 #include "ace/Timer_Heap.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-ACE_RCSID(ace, Timer_Heap, "$Id$")
-
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Hash.h"
 #include "ace/Timer_Heap_T.cpp"
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class
-    ACE_Timer_Heap_T<
-    ACE_Event_Handler*,
-    ACE_Timer_Hash_Upcall<
-        ACE_Event_Handler*,
-        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-        ACE_Null_Mutex>,
-    ACE_Null_Mutex>;
 
-template class
-    ACE_Timer_Heap_Iterator_T<
-        ACE_Event_Handler*,
-        ACE_Timer_Hash_Upcall<
-            ACE_Event_Handler*,
-            ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-            ACE_Null_Mutex>,
-        ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
+ACE_RCSID(ace,
+          Timer_Heap,
+          "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
-#endif /* ACE_TIMER_HEAP_C */
diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index e40ca3f0f39..a0c9301ebc8 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -20,7 +20,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// The following typedef are here for ease of use and backward
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// The following typedefs are here for ease of use and backward
 // compatibility.
 
 typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
@@ -33,5 +35,7 @@ typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
                                   ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Heap_Iterator;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_HEAP_H */
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 8f777920706..644a13b90db 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -1,18 +1,37 @@
 // $Id$
 
-#ifndef ACE_TIMER_HEAP_T_C
-#define ACE_TIMER_HEAP_T_C
+#ifndef ACE_TIMER_HEAP_T_CPP
+#define ACE_TIMER_HEAP_T_CPP
 
 #include "ace/Timer_Heap_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
+#include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID(ace, Timer_Heap_T, "$Id$")
+/*
+** The ACE_Timer_Heap::max_size_ and array loops, checks, etc. are all size_t.
+** The timer IDs are long, and since they are indices into the heap, we need
+** to be sure that the timer heap size can fit in a long. Hence, when size
+** is (re)set, limit it to the maximum long value. We use the C++ standard
+** limits if available.
+*/
+#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 */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Define some simple macros to clarify the code.
 #define ACE_HEAP_PARENT(X) (X == 0 ? 0 : (((X) - 1) / 2))
@@ -89,6 +108,21 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size,
 {
   ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T");
 
+  // Possibly reduce size to fit in a long.
+#if !defined(ACE_LACKS_NUMERIC_LIMITS)
+  if (size > static_cast<size_t> (std::numeric_limits<long>::max ()))
+    {
+      size = static_cast<size_t> (std::numeric_limits<long>::max ());
+      this->max_size_ = size;
+    }
+#else
+  if (size > LONG_MAX)
+    {
+      size = LONG_MAX;
+      this->max_size_ = size;
+    }
+#endif /* ACE_LACKS_NUMERIC_LIMITS */
+
   // Create the heap array.
   ACE_NEW (this->heap_,
            ACE_Timer_Node_T<TYPE> *[size]);
@@ -146,6 +180,15 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun
 {
   ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T");
 
+  // Possibly reduce size to fit in a long.
+#if !defined(ACE_LACKS_NUMERIC_LIMITS)
+  if (this->max_size_ > static_cast<size_t> (std::numeric_limits<long>::max ()))
+    this->max_size_ = static_cast<size_t> (std::numeric_limits<long>::max ());
+#else
+  if (this->max_size_ > LONG_MAX)
+    this->max_size_ = LONG_MAX;
+#endif /* ACE_LACKS_NUMERIC_LIMITS */
+
   // Create the heap array.
 #if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS)
     ACE_NEW (this->heap_,
@@ -237,7 +280,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
       this->timer_ids_min_free_ = this->max_size_;
     }
 
-  return this->timer_ids_curr_;
+  return static_cast<long> (this->timer_ids_curr_);
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
@@ -474,9 +517,27 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::insert (ACE_Timer_Node_T<TYPE> *new_n
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 {
-  // All the containers will double in size from max_size_
+  // All the containers will double in size from max_size_.
   size_t new_size = this->max_size_ * 2;
 
+#if 0
+  // Yikes - there's no way to flag a failure of going out of range of
+  // a 'long' - this is a problem that should be addressed at some point.
+#if !defined(ACE_LACKS_NUMERIC_LIMITS)
+  if (new_size > std::numeric_limits<long>::max ())
+    new_size = std::numeric_limits<long>::max ();
+#else
+  if (new_size > LONG_MAX)
+    new_size = LONG_MAX;
+#endif /* ACE_LACKS_NUMERIC_LIMITS */
+
+  if (new_size <= this->max_size_)   // We are already at the limit
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+#endif /* 0 */
+
    // First grow the heap itself.
 
   ACE_Timer_Node_T<TYPE> **new_heap = 0;
@@ -554,6 +615,9 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
     }
 
   this->max_size_ = new_size;
+  // Force rescan of list from beginning for a free slot (I think...)
+  // This fixed Bugzilla #2447.
+  this->timer_ids_min_free_ = this->max_size_;
 }
 
 // Reschedule a periodic timer.  This function must be called with the
@@ -765,6 +829,11 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
           number_of_cancellations++;
 
           this->free_node (temp);
+
+          // We reset to zero so that we don't miss checking any nodes
+          // if a reheapify occurs when a node is removed.  There
+          // may be a better fix than this, however.
+          i = 0;
         }
       else
         i++;
@@ -814,4 +883,6 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void)
   return this->cur_size_ == 0 ? 0 : this->heap_[0];
 }
 
-#endif /* ACE_TIMER_HEAP_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TIMER_HEAP_T_CPP */
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index bf2147019cc..068aa0bfb67 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 #include "ace/Free_List.h"
 #include "ace/Unbounded_Set.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Heap_T;
@@ -160,7 +162,7 @@ public:
                       const void **act = 0,
                       int dont_call_handle_close = 1);
 
-  /// Returns a pointer to this <ACE_Timer_Queue>'s iterator.
+  /// Returns a pointer to this ACE_Timer_Queue's iterator.
   virtual ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &iter (void);
 
   /**
@@ -322,6 +324,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Heap_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */
diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp
index 777091e5af1..d94976115b5 100644
--- a/ace/Timer_List.cpp
+++ b/ace/Timer_List.cpp
@@ -1,8 +1,5 @@
 // $Id$
 
-#if !defined (ACE_TIMER_LIST_C)
-#define ACE_TIMER_LIST_C
-
 #include "ace/Timer_List.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -12,35 +9,5 @@ ACE_RCSID(ace, Timer_List, "$Id$")
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Hash.h"
 #include "ace/Timer_List_T.cpp"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class
-    ACE_Timer_List_T<
-        ACE_Event_Handler*,
-        ACE_Timer_Hash_Upcall<
-        ACE_Event_Handler*,
-        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-        ACE_Null_Mutex>,
-    ACE_Null_Mutex>;
-
-template class
-ACE_Timer_List_Iterator_T<
-    ACE_Event_Handler*,
-    ACE_Timer_Hash_Upcall<
-        ACE_Event_Handler*,
-        ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-        ACE_Null_Mutex>,
-    ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timer_List_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_List_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timer_List_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_List_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif /* ACE_TIMER_LIST_C */
diff --git a/ace/Timer_List.h b/ace/Timer_List.h
index 571364742a8..0bc689465ea 100644
--- a/ace/Timer_List.h
+++ b/ace/Timer_List.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,7 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// The following typedef are here for ease of use and backward
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// The following typedefs are here for ease of use and backward
 // compatibility.
 
 typedef ACE_Timer_List_T<ACE_Event_Handler *,
@@ -34,5 +36,7 @@ typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *,
                                   ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_List_Iterator;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_LIST_H */
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index 164e1aecb07..60a116bb835 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -162,7 +162,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
   ACE_Timer_Node_T<TYPE>* n = this->get_first_i();
   if (n != 0) {
     for (; n != this->head_; n = n->get_next()) {
-      count++;
+      ++count;
     }
   }
 
diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp
index eadbf31c883..f3cf230e6e8 100644
--- a/ace/Timer_Queue.cpp
+++ b/ace/Timer_Queue.cpp
@@ -1,8 +1,5 @@
 // $Id$
 
-#if !defined (ACE_TIMER_QUEUE_C)
-#define ACE_TIMER_QUEUE_C
-
 #include "ace/Containers.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Synch_Traits.h"
@@ -13,49 +10,5 @@ ACE_RCSID(ace, Timer_Queue, "$Id$")
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Hash.h"
 #include "ace/Timer_Queue_T.cpp"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class
-    ACE_Timer_Queue_T<
-        ACE_Event_Handler*,
-        ACE_Timer_Hash_Upcall<
-            ACE_Event_Handler*,
-            ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-            ACE_Null_Mutex>,
-        ACE_Null_Mutex>;
-
-template class
-    ACE_Timer_Queue_Iterator_T<
-        ACE_Event_Handler*,
-        ACE_Timer_Hash_Upcall<
-            ACE_Event_Handler*,
-            ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>,
-            ACE_Null_Mutex>,
-        ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
-template class ACE_Node<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
-template class ACE_Timer_Node_Dispatch_Info_T<ACE_Event_Handler *>;
-template class ACE_Timer_Node_T<ACE_Event_Handler *>;
-template class ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Event_Handler *> *>
-#pragma instantiate ACE_Node<ACE_Timer_Node_T<ACE_Event_Handler *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Event_Handler *> *>
-#pragma instantiate ACE_Timer_Node_Dispatch_Info_T<ACE_Event_Handler *>
-#pragma instantiate ACE_Timer_Node_T<ACE_Event_Handler *>
-#pragma instantiate ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_TIMER_QUEUE_C */
diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h
index e697ee9213a..36182f15f95 100644
--- a/ace/Timer_Queue.h
+++ b/ace/Timer_Queue.h
@@ -30,6 +30,8 @@
 #  include "ace/Null_Mutex.h"
 #endif /* ACE_HAS_THREADS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // The following typedef are here for ease of use and backward
 // compatibility.
 typedef ACE_Timer_Node_Dispatch_Info_T<ACE_Event_Handler *>
@@ -43,6 +45,8 @@ typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *,
                                    ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Queue_Iterator;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_TIMER_QUEUE_H */
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 13489a858a2..00f21d10ff3 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
+#ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP
+#define ACE_TIMER_QUEUE_ADAPTERS_CPP
+
 #include "ace/Timer_Queue_Adapters.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP
-#define ACE_TIMER_QUEUE_ADAPTERS_CPP
-
 # if !defined (__ACE_INLINE__)
 #  include "ace/Timer_Queue_Adapters.inl"
 # endif /* __ACE_INLINE__ */
@@ -16,6 +16,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TQ> TQ &
 ACE_Async_Timer_Queue_Adapter<TQ>::timer_queue (void)
 {
@@ -256,11 +258,19 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::svc (void)
         {
           // Compute the remaining time, being careful not to sleep
           // for "negative" amounts of time.
-          ACE_Time_Value tv = this->timer_queue_->earliest_time ();
-
-          // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("waiting until %u.%3.3u secs\n"),
-          // tv.sec(), tv.msec()));
-          this->condition_.wait (&tv);
+          const ACE_Time_Value tv_curr = this->timer_queue_->gettimeofday ();
+          const ACE_Time_Value tv_earl = this->timer_queue_->earliest_time ();
+ 
+          if (tv_earl > tv_curr)
+            {
+              // The earliest time on the Timer_Queue is in future, so
+              // use ACE_OS::gettimeofday() to convert the tv to the
+              // absolute time.
+              const ACE_Time_Value tv = ACE_OS::gettimeofday () + (tv_earl - tv_curr);  
+              // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("waiting until %u.%3.3u secs\n"),
+              // tv.sec(), tv.msec()));
+              this->condition_.wait (&tv);
+            }
         }
 
       // Expire timers anyway, at worst this is a no-op.
@@ -290,6 +300,9 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags,
   // Macros to avoid "warning: unused parameter" type warning.
   ACE_UNUSED_ARG (thread_handles);
 
+  // Make sure to set this flag in case we were deactivated earlier.
+  this->active_ = 1;
+
   // Make sure that we only allow a single thread to be spawned for
   // our adapter.  Otherwise, too many weird things can happen.
   return ACE_Task_Base::activate (flags, 1, 0, priority, grp_id, task, 0,
@@ -340,4 +353,6 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::dispatch_commands (void)
 
 # endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_TIMER_QUEUE_ADAPTERS_CPP */
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index ed8d0cd8ecc..d2ff5946c3a 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -26,9 +26,13 @@
 
 #if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
 #  include "ace/Unbounded_Queue.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Command_Base;
+ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Async_Timer_Queue_Adapter
  *
@@ -46,7 +50,7 @@ public:
   /// Constructor
   /**
    * Register the SIGALRM handler.  If @a mask == 0 then block all
-   * signals when <SIGALRM> is run.  Otherwise, just block the signals
+   * signals when @c SIGALRM is run.  Otherwise, just block the signals
    * indicated in @a mask.
    */
   ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask = 0);
@@ -67,7 +71,7 @@ public:
   /// passed in.
   int cancel (long timer_id, const void **act = 0);
 
-  /// Dispatch all timers whose values are <= <cur_time>.  Returns the
+  /// Dispatch all timers whose values are <= cur_time.  Returns the
   /// number of timers canceled.
   int expire (void);
 
@@ -230,6 +234,8 @@ private:
   ACE_thread_t thr_id_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 # include "ace/Timer_Queue_Adapters.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Timer_Queue_Adapters.inl b/ace/Timer_Queue_Adapters.inl
index 547c693dd13..e66168bbe98 100644
--- a/ace/Timer_Queue_Adapters.inl
+++ b/ace/Timer_Queue_Adapters.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class TQ> ACE_INLINE TQ *
 ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (void) const
 {
@@ -22,3 +25,5 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::thr_id (void) const
 {
   return this->thr_id_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index 4c125cfabcd..82030315aab 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_TIMER_QUEUE_T_C
-#define ACE_TIMER_QUEUE_T_C
+#ifndef ACE_TIMER_QUEUE_T_CPP
+#define ACE_TIMER_QUEUE_T_CPP
 
 #include "ace/config-all.h"
 
@@ -20,10 +20,7 @@
 #include "ace/Timer_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (ace,
-           Timer_Queue_T,
-           "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // This fudge factor can be overriden for timers that need it, such as on
 // Solaris, by defining the ACE_TIMER_SKEW symbol in the appropriate config
@@ -225,7 +222,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Schedule the timer.
-  long result =
+  long const result =
     this->schedule_i (type,
                       act,
                       future_time,
@@ -274,7 +271,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti
 
       this->postinvoke (info, cur_time, upcall_act);
 
-      number_of_timers_expired++;
+      ++number_of_timers_expired;
 
     }
 
@@ -475,4 +472,6 @@ ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>::deletion (TIMER_QUEUE &timer_
   return 0;
 }
 
-#endif /* ACE_TIMER_QUEUE_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TIMER_QUEUE_T_CPP */
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 50ed8ce99a8..604079a41da 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,6 +25,8 @@
 #include "ace/Event_Handler.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Timer_Node_Dispatch_Info_T
  *
@@ -162,7 +164,7 @@ private:
  * @class ACE_Timer_Queue_Iterator_T
  *
  * @brief Generic interface for iterating over a subclass of
- * <ACE_Timer_Queue>.
+ * ACE_Timer_Queue.
  *
  * This is a generic iterator that can be used to visit every
  * node of a timer queue.  Be aware that it isn't guaranteed
@@ -378,7 +380,7 @@ public:
   /// Accessor to the upcall functor
   FUNCTOR &upcall_functor (void);
 
-  /// Returns a pointer to this <ACE_Timer_Queue>'s iterator.
+  /// Returns a pointer to this ACE_Timer_Queue's iterator.
   virtual ITERATOR &iter (void) = 0;
 
   /// Removes the earliest node from the queue and returns it
@@ -429,8 +431,8 @@ protected:
   virtual int dispatch_info_i (const ACE_Time_Value &current_time,
                                ACE_Timer_Node_Dispatch_Info_T<TYPE> &info);
 
-  /// Synchronization variable for <ACE_Timer_Queue>.
-  /// NOTE: the right name would be lock_, but HP/C++ will choke on that!
+  /// Synchronization variable for ACE_Timer_Queue.
+  /// @note The right name would be lock_, but HP/C++ will choke on that!
   ACE_LOCK mutex_;
 
   /// Class that implements a free list
@@ -542,6 +544,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Timer_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Timer_Queue_T.inl b/ace/Timer_Queue_T.inl
index 294433e8285..7275119e2e1 100644
--- a/ace/Timer_Queue_T.inl
+++ b/ace/Timer_Queue_T.inl
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TYPE> ACE_INLINE void
 ACE_Timer_Node_T<TYPE>::set (const TYPE &type,
@@ -217,3 +218,5 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::upcall_functor (void)
 {
   return *this->upcall_functor_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Timer_Queuefwd.h b/ace/Timer_Queuefwd.h
index 0f8ad0330c2..6e03204bdde 100644
--- a/ace/Timer_Queuefwd.h
+++ b/ace/Timer_Queuefwd.h
@@ -19,6 +19,8 @@
 
 #include "ace/Synch_Traits.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Queue_T;
 template <class ACE_LOCK> class ACE_Event_Handler_Handle_Timeout_Upcall;
 
@@ -29,6 +31,8 @@ typedef ACE_Timer_Queue_T<ACE_Event_Handler *,
                           ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Queue;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* ACE_TIMER_QUEUE_FWD_H */
diff --git a/ace/Timer_Wheel.cpp b/ace/Timer_Wheel.cpp
index 0675711f329..4bd16b73df4 100644
--- a/ace/Timer_Wheel.cpp
+++ b/ace/Timer_Wheel.cpp
@@ -1,8 +1,5 @@
 // $Id$
 
-#if !defined (ACE_TIMER_WHEEL_C)
-#define ACE_TIMER_WHEEL_C
-
 #include "ace/Timer_Wheel.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -13,13 +10,3 @@
 
 ACE_RCSID(ace, Timer_Wheel, "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timer_Wheel_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timer_Wheel_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif /* ACE_TIMER_WHEEL_C */
diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h
index cdd967bd9bd..307e56b5542 100644
--- a/ace/Timer_Wheel.h
+++ b/ace/Timer_Wheel.h
@@ -1,5 +1,4 @@
-
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,7 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// The following typedef are here for ease of use and backward
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// The following typedefs are here for ease of use and backward
 // compatibility.
 
 typedef ACE_Timer_Wheel_T<ACE_Event_Handler *,
@@ -35,5 +36,7 @@ typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *,
                                    ACE_SYNCH_RECURSIVE_MUTEX>
         ACE_Timer_Wheel_Iterator;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_WHEEL_H */
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index f32b29b8853..149de55c520 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_TIMER_WHEEL_T_C
-#define ACE_TIMER_WHEEL_T_C
+#ifndef ACE_TIMER_WHEEL_T_CPP
+#define ACE_TIMER_WHEEL_T_CPP
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -12,8 +12,7 @@
 #include "ace/Timer_Wheel_T.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, Timer_Wheel_T, "$Id$")
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Design/implementation notes for ACE_Timer_Wheel_T.
 //
@@ -941,7 +940,6 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::goto_next (u_int start_spok
   this->current_node_ = 0;
 }
 
-
 /**
 * @return True when we there aren't any more items (when current_node_ == 0)
 */
@@ -951,7 +949,6 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::isdone (void) const
   return this->current_node_ == 0;
 }
 
-
 /**
 * @return The node at the current spokeition in the sequence or 0 if the wheel
 *         is empty
@@ -962,5 +959,6 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void)
   return this->current_node_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_TIMER_WHEEL_T_C */
+#endif /* ACE_TIMER_WHEEL_T_CPP */
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index 10bb65badd8..5c62a39dde0 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 class ACE_Timer_Wheel_T;
@@ -204,13 +206,14 @@ private:
   /// The total number of timers currently scheduled.
   u_int timer_count_;
 
-  // = Don't allow these operations for now.
-  ACE_UNIMPLEMENTED_FUNC (
-    ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &))
-  ACE_UNIMPLEMENTED_FUNC (
-    void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &))
+  // = Don't allow these operations for now, don't split into multiple lines
+  // breaks sun compilers
+  ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &))
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
 #include "ace/Timer_Wheel_T.cpp"
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index 5fb8b56db71..7f6ae69e320 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -5,12 +5,14 @@
 
 ACE_RCSID(ace, TkReactor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
 
 // Must be called with lock held
 ACE_TkReactor::ACE_TkReactor (size_t size,
-			      int restart,
-			      ACE_Sig_Handler *h)
+                              int restart,
+                              ACE_Sig_Handler *h)
   : ACE_Select_Reactor (size, restart, h),
     ids_ (0),
     timeout_ (0)
@@ -49,7 +51,7 @@ ACE_TkReactor::~ACE_TkReactor (void)
 
 int
 ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-					 ACE_Time_Value *max_wait_time)
+                                         ACE_Time_Value *max_wait_time)
 {
   ACE_TRACE ("ACE_TkReactor::wait_for_multiple_events");
   int nfound;
@@ -63,8 +65,8 @@ ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
       handle_set.wr_mask_ = this->wait_set_.wr_mask_;
       handle_set.ex_mask_ = this->wait_set_.ex_mask_;
       nfound = TkWaitForMultipleEvents (width,
-					handle_set,
-					max_wait_time);
+                                        handle_set,
+                                        max_wait_time);
 
     } while (nfound == -1 && this->handle_error () > 0);
 
@@ -101,7 +103,7 @@ ACE_TkReactor::TimerCallbackProc (ClientData cd)
  */
 void
 ACE_TkReactor::InputCallbackProc (ClientData cd,
-				  int /* mask */)
+                                  int /* mask */)
 {
   ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd;
   ACE_TkReactor *self = callback->reactor_;
@@ -123,9 +125,9 @@ ACE_TkReactor::InputCallbackProc (ClientData cd,
     wait_set.ex_mask_.set_bit (handle);
 
   int result = ACE_OS::select (handle + 1,
-			       wait_set.rd_mask_,
-			       wait_set.wr_mask_,
-			       wait_set.ex_mask_, &zero);
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
 
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
@@ -133,11 +135,11 @@ ACE_TkReactor::InputCallbackProc (ClientData cd,
   if (result > 0)
     {
       if (wait_set.rd_mask_.is_set (handle))
-	dispatch_set.rd_mask_.set_bit (handle);
+        dispatch_set.rd_mask_.set_bit (handle);
       if (wait_set.wr_mask_.is_set (handle))
-	dispatch_set.wr_mask_.set_bit (handle);
+        dispatch_set.wr_mask_.set_bit (handle);
       if (wait_set.ex_mask_.is_set (handle))
-	dispatch_set.ex_mask_.set_bit (handle);
+        dispatch_set.ex_mask_.set_bit (handle);
 
       self->dispatch (1, dispatch_set);
     }
@@ -145,17 +147,17 @@ ACE_TkReactor::InputCallbackProc (ClientData cd,
 
 int
 ACE_TkReactor::TkWaitForMultipleEvents (int width,
-					ACE_Select_Reactor_Handle_Set &wait_set,
-					ACE_Time_Value *)
+                                        ACE_Select_Reactor_Handle_Set &wait_set,
+                                        ACE_Time_Value *)
 {
   // Check to make sure our handle's are all usable.
   ACE_Select_Reactor_Handle_Set temp_set = wait_set;
 
   if (ACE_OS::select (width,
-		      temp_set.rd_mask_,
-		      temp_set.wr_mask_,
-		      temp_set.ex_mask_,
-		      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+                      temp_set.rd_mask_,
+                      temp_set.wr_mask_,
+                      temp_set.ex_mask_,
+                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
     return -1; // Bad file arguments...
 
   // Instead of waiting using <select>, just use the Tk mechanism to
@@ -170,16 +172,16 @@ ACE_TkReactor::TkWaitForMultipleEvents (int width,
   // Now actually read the result needed by the <Select_Reactor> using
   // <select>.
   return ACE_OS::select (width,
-			 wait_set.rd_mask_,
-			 wait_set.wr_mask_,
-			 wait_set.ex_mask_,
-			 (ACE_Time_Value *) &ACE_Time_Value::zero);
+                         wait_set.rd_mask_,
+                         wait_set.wr_mask_,
+                         wait_set.ex_mask_,
+                         (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
 int
 ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_TkReactor::register_handler_i");
 
@@ -267,8 +269,8 @@ ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
 
 int
 ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::register_handler_i (handles,
                                                  handler,
@@ -277,7 +279,7 @@ ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
 
 int
 ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_TkReactor::remove_handler_i");
 
@@ -332,10 +334,10 @@ ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
 
 int
 ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::remove_handler_i (handles,
-					       mask);
+                                               mask);
 }
 
 // The following functions ensure that there is an Tk timeout for the
@@ -380,9 +382,9 @@ ACE_TkReactor::reset_timer_interval
 
 long
 ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
-			       const void *arg,
+                               const void *arg,
                 const ACE_Time_Value &delay,
-			       const ACE_Time_Value &interval)
+                               const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_TkReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
@@ -402,12 +404,12 @@ ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
 
 int
 ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
-			     int dont_call_handle_close)
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_TkReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (handler,
-					dont_call_handle_close) == -1)
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -418,14 +420,14 @@ ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
 
 int
 ACE_TkReactor::cancel_timer (long timer_id,
-			     const void **arg,
-			     int dont_call_handle_close)
+                             const void **arg,
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_TkReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (timer_id,
-					arg,
-					dont_call_handle_close) == -1)
+                                        arg,
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -434,3 +436,4 @@ ACE_TkReactor::cancel_timer (long timer_id,
     }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 024d341b937..0ae370c0687 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    TkReactor.h
@@ -24,6 +25,8 @@
 #include "ace/Select_Reactor.h"
 #include /**/ <tk.h>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_TkReactorID
  *
@@ -127,5 +130,7 @@ private:
   ACE_TkReactor &operator = (const ACE_TkReactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TK_REACTOR_H */
diff --git a/ace/Token.cpp b/ace/Token.cpp
index d67e51e5bcb..1d4a3b3fe9d 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -1,7 +1,16 @@
 // $Id$
 
-#include "ace/Thread.h"
 #include "ace/Token.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Token.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(ace, Token, "$Id$")
+
+#if defined (ACE_HAS_THREADS)
+
+#include "ace/Thread.h"
 #include "ace/Log_Msg.h"
 
 #if defined (DEBUGGING)
@@ -9,17 +18,10 @@
 #include "ace/streams.h"
 #endif /* DEBUGGING */
 
-ACE_RCSID(ace, Token, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Token.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_HAS_THREADS)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Token)
 
-
 void
 ACE_Token::dump (void) const
 {
@@ -209,7 +211,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
   // Check if it is us.
   if (ACE_OS::thr_equal (thr_id, this->owner_))
     {
-      this->nesting_level_++;
+      ++this->nesting_level_;
       return 0;
     }
 
@@ -235,7 +237,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
                                              thr_id,
                                              this->attributes_);
   queue->insert_entry (my_entry, this->queueing_strategy_);
-  this->waiters_++;
+  ++this->waiters_;
 
   // Execute appropriate <sleep_hook> callback.  (@@ should these
   // methods return a success/failure status, and if so, what should
@@ -244,13 +246,13 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
   if (sleep_hook_func)
     {
       (*sleep_hook_func) (arg);
-      ret++;
+      ++ret;
     }
   else
     {
       // Execute virtual method.
       this->sleep_hook ();
-      ret++;
+      ++ret;
     }
 
   int timed_out = 0;
@@ -290,7 +292,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
   while (!ACE_OS::thr_equal (thr_id, this->owner_));
 
   // Do this always and irrespective of the result of wait().
-  this->waiters_--;
+  --this->waiters_;
   queue->remove_entry (&my_entry);
 
 #if defined (DEBUGGING)
@@ -390,10 +392,10 @@ ACE_Token::renew (int requeue_position,
                                     // otherwise use the queueing strategy, which might also
                                     // happen to be 0.
                                     requeue_position == 0 ? 0 : this->queueing_strategy_);
-  this->waiters_++;
+  ++this->waiters_;
 
   // Remember nesting level...
-  int save_nesting_level_ = this->nesting_level_;
+  int const save_nesting_level_ = this->nesting_level_;
 
   // Reset state for new owner.
   this->nesting_level_ = 0;
@@ -438,7 +440,7 @@ ACE_Token::renew (int requeue_position,
   while (!ACE_OS::thr_equal (my_entry.thread_id_, this->owner_));
 
   // Do this always and irrespective of the result of wait().
-  this->waiters_--;
+  --this->waiters_;
   this_threads_queue->remove_entry (&my_entry);
 
 #if defined (DEBUGGING)
@@ -523,7 +525,7 @@ ACE_Token::wakeup_next_waiter (void)
     }
 
   // Wakeup next waiter.
-  ACE_Token_Queue *queue;
+  ACE_Token_Queue *queue = 0;
 
   // Writer threads get priority to run first.
   if (this->writers_.head_ != 0)
@@ -544,8 +546,6 @@ ACE_Token::wakeup_next_waiter (void)
   this->owner_ = queue->head_->thread_id_;
 }
 
-#endif /* ACE_HAS_THREADS */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_THREADS */
diff --git a/ace/Token.h b/ace/Token.h
index 0295133e542..f351bcab979 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -34,14 +34,15 @@
 # define ACE_TOKEN_USES_SEMAPHORE
 #endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || VXWORKS || ACE_PSOS */
 
-class ACE_Time_Value;
-
 #if defined (ACE_TOKEN_USES_SEMAPHORE)
 #  include "ace/Semaphore.h"
 #endif /* ACE_TOKEN_USES_SEMAPHORE */
 
 #include "ace/Condition_Thread_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class ACE_Time_Value;
 
 /**
  * @class ACE_Token
@@ -316,7 +317,12 @@ private:
   int queueing_strategy_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #else
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Token
 {
 public:
@@ -327,8 +333,13 @@ public:
   int remove (void) { ACE_NOTSUP_RETURN (-1); }
   int release (void) { ACE_NOTSUP_RETURN (-1); }
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Export ACE_Noop_Token : public ACE_Null_Mutex
 {
 public:
@@ -354,6 +365,8 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Token.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Token.inl b/ace/Token.inl
index 5cea9866cea..d375789fbd1 100644
--- a/ace/Token.inl
+++ b/ace/Token.inl
@@ -1,14 +1,16 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-#include "ace/Guard_T.h"
-
-// Token.i
+#include "ace/config-macros.h"
 
 #if defined (ACE_HAS_THREADS)
 
+#include "ace/Guard_T.h"
 #include "ace/Time_Value.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_Token::queueing_strategy (void)
 {
@@ -29,25 +31,25 @@ ACE_Token::remove (void)
   ACE_NOTSUP_RETURN (-1);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Token::tryacquire (void)
 {
   ACE_TRACE ("ACE_Token::tryacquire");
-  return this->shared_acquire 
+  return this->shared_acquire
     (0, 0, (ACE_Time_Value *) &ACE_Time_Value::zero, ACE_Token::WRITE_TOKEN);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Token::waiters (void)
 {
   ACE_TRACE ("ACE_Token::waiters");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
 
-  int ret = this->waiters_;
+  int const ret = this->waiters_;
   return ret;
 }
 
-ACE_INLINE ACE_thread_t 
+ACE_INLINE ACE_thread_t
 ACE_Token::current_owner (void)
 {
   ACE_TRACE ("ACE_Token::current_owner");
@@ -118,9 +120,9 @@ ACE_Token::ACE_Token_Queue_Entry::wait (ACE_Time_Value *timeout, ACE_Thread_Mute
 {
 #if defined (ACE_TOKEN_USES_SEMAPHORE)
   lock.release ();
-  int retv = (timeout == 0 ?
-              this->cv_.acquire () :
-              this->cv_.acquire (*timeout));
+  int const retv = (timeout == 0 ?
+                    this->cv_.acquire () :
+                    this->cv_.acquire (*timeout));
   lock.acquire ();
   return retv;
 #else
@@ -132,7 +134,7 @@ ACE_Token::ACE_Token_Queue_Entry::wait (ACE_Time_Value *timeout, ACE_Thread_Mute
 ACE_INLINE int
 ACE_Token::ACE_Token_Queue_Entry::signal (void)
 {
-  return 
+  return
 #if defined (ACE_TOKEN_USES_SEMAPHORE)
     this->cv_.release ();
 #else
@@ -140,8 +142,13 @@ ACE_Token::ACE_Token_Queue_Entry::signal (void)
 #endif /* ACE_TOKEN_USES_SEMAPHORE */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
-/******************************************************************************/
+
+/*****************************************************************************/
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 ACE_Noop_Token::queueing_strategy (void)
@@ -164,3 +171,6 @@ ACE_INLINE void
 ACE_Noop_Token::dump (void) const
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index 5287cd6208a..7356844165e 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -1,19 +1,20 @@
 #include "ace/Token_Collection.h"
 
+#if defined (ACE_HAS_TOKENS_LIBRARY)
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Token_Collection.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 
 ACE_RCSID (ace,
            Token_Collection,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Token_Collection::ACE_Token_Collection (int debug,
-					    const ACE_TCHAR *name)
+                                            const ACE_TCHAR *name)
 : debug_ (debug)
 {
   ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection");
@@ -74,8 +75,8 @@ ACE_Token_Collection::is_member (const ACE_Token_Proxy &token)
 
 int
 ACE_Token_Collection::acquire (int notify,
-			       void (*sleep_hook)(void *),
-			       ACE_Synch_Options &options)
+                               void (*sleep_hook)(void *),
+                               ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::acquire");
 
@@ -86,18 +87,18 @@ ACE_Token_Collection::acquire (int notify,
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,
+        ACE_DEBUG ((LM_DEBUG,
                     ACE_LIB_TEXT ("collection acquiring %s\n"),
-		    temp->int_id_->name ()));
+                    temp->int_id_->name ()));
       if (temp->int_id_->acquire (notify,
                                   sleep_hook,
                                   options) == -1)
-	{
+        {
           // Save/restore errno.
           ACE_Errno_Guard error (errno);
-	  this->release ();
-	  ACE_RETURN (-1);
-	}
+          this->release ();
+          ACE_RETURN (-1);
+        }
     }
 
   return 0;
@@ -105,9 +106,9 @@ ACE_Token_Collection::acquire (int notify,
 
 int
 ACE_Token_Collection::acquire (const ACE_TCHAR *token_name,
-			       int notify,
-			       void (*sleep_hook)(void *),
-			       ACE_Synch_Options &options)
+                               int notify,
+                               void (*sleep_hook)(void *),
+                               ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::acquire");
   TOKEN_NAME name (token_name);
@@ -124,7 +125,7 @@ ACE_Token_Collection::acquire (const ACE_TCHAR *token_name,
 
 int
 ACE_Token_Collection::tryacquire (const ACE_TCHAR *token_name,
-				  void (*sleep_hook)(void *))
+                                  void (*sleep_hook)(void *))
 {
   ACE_TRACE ("ACE_Token_Collection::tryacquire");
   TOKEN_NAME name (token_name);
@@ -151,11 +152,11 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *))
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection acquiring %s\n"),
-		    temp->int_id_->name ()));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection acquiring %s\n"),
+                    temp->int_id_->name ()));
       // We will fail if _any_ token is not free.
       if (temp->int_id_->tryacquire (sleep_hook) == -1)
-	return -1;
+        return -1;
     }
 
   return 0;
@@ -163,7 +164,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *))
 
 int
 ACE_Token_Collection::renew (int requeue_position,
-			     ACE_Synch_Options &options)
+                             ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::renew");
 
@@ -174,10 +175,10 @@ ACE_Token_Collection::renew (int requeue_position,
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection renewing %s\n"),
-		    temp->int_id_->name ()));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection renewing %s\n"),
+                    temp->int_id_->name ()));
       if (temp->int_id_->renew (requeue_position, options) == -1)
-	return -1;
+        return -1;
     }
 
   return 0;
@@ -185,8 +186,8 @@ ACE_Token_Collection::renew (int requeue_position,
 
 int
 ACE_Token_Collection::renew (const ACE_TCHAR *token_name,
-			     int requeue_position,
-			     ACE_Synch_Options &options)
+                             int requeue_position,
+                             ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::renew");
   TOKEN_NAME name (token_name);
@@ -198,8 +199,8 @@ ACE_Token_Collection::renew (const ACE_TCHAR *token_name,
   // Did we find it?
   if (result == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, ACE_LIB_TEXT ("%p %s\n"),
-		       ACE_LIB_TEXT ("not in collection "),
-		       token_name), -1);
+                       ACE_LIB_TEXT ("not in collection "),
+                       token_name), -1);
   // perform the operation
   return temp->renew (requeue_position, options);
 }
@@ -216,8 +217,8 @@ ACE_Token_Collection::release (ACE_Synch_Options &)
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection releasing %s\n"),
-		    temp->int_id_->name ()));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection releasing %s\n"),
+                    temp->int_id_->name ()));
       temp->int_id_->release ();
     }
 
@@ -226,7 +227,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &)
 
 int
 ACE_Token_Collection::release (const ACE_TCHAR *token_name,
-			       ACE_Synch_Options &options)
+                               ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::release");
   TOKEN_NAME name (token_name);
@@ -288,18 +289,6 @@ ACE_Token_Collection::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Manager<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Manager<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 1f42c8406cf..0d57cc0ca58 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -35,6 +35,8 @@
 #include "ace/Local_Tokens.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Token_Collection
  *
@@ -229,11 +231,13 @@ protected:
   virtual ACE_Tokens *create_token (const ACE_TCHAR *name);
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Collection.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_HAS_TOKENS_LIBRARY */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TOKEN_COLLECTION_H */
diff --git a/ace/Token_Collection.inl b/ace/Token_Collection.inl
index fcab4df9b09..db86701a325 100644
--- a/ace/Token_Collection.inl
+++ b/ace/Token_Collection.inl
@@ -1,12 +1,17 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE const ACE_TCHAR *
 ACE_Token_Collection::name (void) const
 {
   return name_;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp
index e59d28bd6ba..1c7ca9677d3 100644
--- a/ace/Token_Invariants.cpp
+++ b/ace/Token_Invariants.cpp
@@ -1,13 +1,14 @@
 #include "ace/Token_Invariants.h"
-#include "ace/Object_Manager.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+#include "ace/Object_Manager.h"
 
 ACE_RCSID (ace,
            Token_Invariants,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0;
 
@@ -349,28 +350,6 @@ ACE_RWLock_Invariants::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Manager<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Token_Name, ACE_Mutex_Invariants *>;
-template class ACE_Map_Manager<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Token_Name, ACE_RWLock_Invariants *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Manager<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_Mutex_Invariants *>
-#pragma instantiate ACE_Map_Manager<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_RWLock_Invariants *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index c5b4fb42ffc..6816d209ab3 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -32,6 +32,7 @@
 #include "ace/Local_Tokens.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Mutex_Invariants
@@ -236,6 +237,8 @@ protected:
   static ACE_Token_Invariant_Manager *instance_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
 #include /**/ "ace/post.h"
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index 24d79871448..a68ac717ebf 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -1,16 +1,19 @@
 #include "ace/Token_Manager.h"
+
+#if defined (ACE_HAS_TOKENS_LIBRARY)
+
 #include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Token_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID (ace,
            Token_Manager,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // singleton token manager
 ACE_Token_Manager *ACE_Token_Manager::token_manager_ = 0;
 
@@ -265,18 +268,6 @@ ACE_Token_Manager::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Manager <ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
-template class ACE_Map_Entry <ACE_Token_Name, ACE_Tokens *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Manager <ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry <ACE_Token_Name, ACE_Tokens *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index c19b625116e..63c78712203 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Map_Manager.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Local_Mutex;
 class ACE_Mutex_Token;
 
@@ -136,11 +138,13 @@ private:
   COLLECTION collection_;
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_HAS_TOKENS_LIBRARY */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TOKEN_MANAGER_H */
diff --git a/ace/Token_Manager.inl b/ace/Token_Manager.inl
index 2ef2d7e1f53..b38c4b9e346 100644
--- a/ace/Token_Manager.inl
+++ b/ace/Token_Manager.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_TOKEN_CONST::MUTEX &
 ACE_Token_Manager::mutex (void)
 {
@@ -17,4 +20,6 @@ ACE_Token_Manager::debug (int d)
   debug_ = d;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index 01ee4fb305d..802cbc5f697 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -2,14 +2,16 @@
 
 #include "ace/Token_Request_Reply.h"
 
+#if defined (ACE_HAS_TOKENS_LIBRARY)
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Token_Request_Reply.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Token_Request_Reply, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default "do nothing" constructor.
 
 ACE_Token_Request::ACE_Token_Request (void)
@@ -21,11 +23,11 @@ ACE_Token_Request::ACE_Token_Request (void)
 // Create a ACE_Token_Request message.
 
 ACE_Token_Request::ACE_Token_Request (int token_type,
-				      int proxy_type,
-				      ACE_UINT32 operation_type,
-				      const ACE_TCHAR token_name[],
-				      const ACE_TCHAR client_id[],
-				      const ACE_Synch_Options &options)
+                                      int proxy_type,
+                                      ACE_UINT32 operation_type,
+                                      const ACE_TCHAR token_name[],
+                                      const ACE_TCHAR client_id[],
+                                      const ACE_Synch_Options &options)
 {
   this->token_type (token_type);
   this->proxy_type (proxy_type);
@@ -57,11 +59,11 @@ ACE_Token_Request::decode (void)
   this->token_name_ = this->transfer_.data_;
 
   options_.set (transfer_.use_timeout_ == 1 ? ACE_Synch_Options::USE_TIMEOUT : 0,
-		ACE_Time_Value (transfer_.sec_, transfer_.usec_),
-		(void *) transfer_.arg_);
+                ACE_Time_Value (transfer_.sec_, transfer_.usec_),
+                (void *) transfer_.arg_);
 
   // Decode the variable-sized portion.
-  int token_len = ACE_OS::strlen (this->token_name_);
+  size_t token_len = ACE_OS::strlen (this->token_name_);
 
   // Check to make sure this->tokenName_ isn't too long!
   if (token_len >= ACE_MAXTOKENNAMELEN)
@@ -79,8 +81,8 @@ ACE_Token_Request::decode (void)
   // client_id_ plus '\0'
   size_t data_size = ACE_TOKEN_REQUEST_HEADER_SIZE
                      + ACE_OS::strlen (this->token_name_) + 1
-		     + ACE_OS::strlen (this->client_id_) + 1
-		     + 1;
+                     + ACE_OS::strlen (this->client_id_) + 1
+                     + 1;
 
   // Make sure the message was correctly received and framed.
   return this->length () == data_size ? 0 : -1;
@@ -94,7 +96,7 @@ ACE_Token_Request::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"),
-	     this->length (), this->token_name (), this->client_id ()));
+             this->length (), this->token_name (), this->client_id ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("type = ")));
 
   if (this->token_type () == ACE_Tokens::MUTEX)
@@ -102,9 +104,9 @@ ACE_Token_Request::dump (void) const
   else // == ACE_Tokens::RWLOCK
     {
       if (this->proxy_type () == ACE_RW_Token::READER)
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("RLOCK\n")));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("RLOCK\n")));
       else // == WRITER
-	ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("WLOCK\n")));
+        ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("WLOCK\n")));
     }
 
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("operation = ")));
@@ -129,7 +131,7 @@ ACE_Token_Request::dump (void) const
   else
     {
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"),
-		 this->options ().timeout ().sec (), this->options ().timeout ().usec ()));
+                 this->options ().timeout ().sec (), this->options ().timeout ().usec ()));
     }
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
@@ -174,9 +176,11 @@ ACE_Token_Reply::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"),
-	     this->length (), this->errnum ()));
+             this->length (), this->errnum ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("arg = %d"), this->arg ()));
 #endif /* ACE_HAS_DUMP */
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 86f516a0203..15dea490bc7 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -28,6 +28,8 @@
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Specifies the size of the fixed length portion of
 /// the Transfer structure in ACE_Token_Request
 #define ACE_TOKEN_REQUEST_HEADER_SIZE 40
@@ -62,12 +64,12 @@ public:
   ACE_Token_Request (void);
 
   /**
-   * token_type - MUTEX, RWLOCK
-   * proxy_type - MUTEX, RLOCK, WLOCK (acquires mean different things)
-   * operation - method
-   * token_name
-   * client_id
-   * options - we check USE_TIMEOUT and use the arg.
+   * @param token_type MUTEX, RWLOCK
+   * @param proxy_type MUTEX, RLOCK, WLOCK (acquires mean different things)
+   * @param operation method
+   * @param token_name
+   * @param client_id
+   * @param options We check USE_TIMEOUT and use the arg.
    */
   ACE_Token_Request (int token_type,
                      int proxy_type,
@@ -256,11 +258,13 @@ private:
   } transfer_;
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Request_Reply.inl"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_HAS_TOKENS_LIBRARY */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_TOKEN_REQUEST_REPLY_H */
diff --git a/ace/Token_Request_Reply.inl b/ace/Token_Request_Reply.inl
index e1c8ace3ad5..34cfdd87f28 100644
--- a/ace/Token_Request_Reply.inl
+++ b/ace/Token_Request_Reply.inl
@@ -1,8 +1,13 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
+#include "ace/Truncate.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // = Set/get the length of the encoded/decoded message.
 
 ACE_INLINE ACE_UINT32
@@ -11,7 +16,7 @@ ACE_Token_Request::length (void) const
   return ntohl (this->transfer_.length_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::length (ACE_UINT32 l)
 {
   this->transfer_.length_ = htonl (l);
@@ -24,7 +29,7 @@ ACE_Token_Request::token_type (void) const
   return (int) ntohl (this->transfer_.token_type_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::token_type (int t)
 {
   this->transfer_.token_type_ = htonl ((ACE_UINT32) t);
@@ -50,33 +55,33 @@ ACE_Token_Request::operation_type (void) const
   return ntohl (this->transfer_.operation_type_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::operation_type (ACE_UINT32 t)
 {
   this->transfer_.operation_type_ = htonl (t);
 }
 
 // = Set/get the requeue position
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ACE_Token_Request::requeue_position (void) const
 {
   return ntohl (this->transfer_.requeue_position_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::requeue_position (ACE_UINT32 rq)
 {
   this->transfer_.requeue_position_ = htonl (rq);
 }
 
 // = Set/get the requeue position
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ACE_Token_Request::notify (void) const
 {
   return ntohl (this->transfer_.notify_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::notify (ACE_UINT32 rq)
 {
   this->transfer_.notify_ = htonl (rq);
@@ -89,7 +94,7 @@ ACE_Token_Request::options (void) const
   return (ACE_Synch_Options &) options_;
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Request::options (const ACE_Synch_Options &opt)
 {
   // fight the friggin const from hell
@@ -99,7 +104,10 @@ ACE_Token_Request::options (const ACE_Synch_Options &opt)
   if (transfer_.use_timeout_ == 1)
     {
       transfer_.usec_ = options->timeout ().usec ();
-      transfer_.sec_ = options->timeout ().sec ();
+      if (options->timeout ().sec () > ACE_UINT32_MAX)
+        transfer_.sec_ = ACE_UINT32_MAX;
+      else
+        transfer_.sec_ = static_cast<ACE_UINT32> (options->timeout ().sec ());
     }
   else
     {
@@ -115,8 +123,8 @@ ACE_Token_Request::token_name (void) const
   return token_name_;
 }
 
-ACE_INLINE void 
-ACE_Token_Request::token_name (const ACE_TCHAR *token_name, 
+ACE_INLINE void
+ACE_Token_Request::token_name (const ACE_TCHAR *token_name,
                                const ACE_TCHAR *client_id)
 {
   size_t token_name_length = ACE_OS::strlen (token_name) + 1; // Add 1 for '\0'.
@@ -127,20 +135,20 @@ ACE_Token_Request::token_name (const ACE_TCHAR *token_name,
   client_id_  = &this->token_name_[token_name_length + 1]; // Add 1 for ':';
   client_id_[-1] = ACE_LIB_TEXT (':'); // Insert the ':' before this->clientId_.
 
-  (void) ACE_OS::memcpy (this->token_name_, 
-                         token_name, 
+  (void) ACE_OS::memcpy (this->token_name_,
+                         token_name,
                          token_name_length * sizeof (ACE_TCHAR));
-  (void) ACE_OS::memcpy (this->client_id_, 
-                         client_id, 
+  (void) ACE_OS::memcpy (this->client_id_,
+                         client_id,
                          client_id_length * sizeof (ACE_TCHAR));
 
   // Fixed length header size
   size_t len = ACE_TOKEN_REQUEST_HEADER_SIZE;
 
-  // ... then add in the amount of the variable-sized portion. 
+  // ... then add in the amount of the variable-sized portion.
   len += token_name_length + client_id_length + 1;
 
-  this->length (len);
+  this->length (ACE_Utils::Truncate (len));
 }
 
 // = Set/get the id of the client.
@@ -155,42 +163,44 @@ ACE_Token_Request::client_id (void) const
 // ************************************************************
 
 // = Set/get the length of the encoded/decoded message.
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ACE_Token_Reply::length (void) const
 {
   return ntohl (this->transfer_.length_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Reply::length (ACE_UINT32 l)
 {
   this->transfer_.length_ = htonl (l);
 }
 
 // = Set/get the errno of a failed reply.
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ACE_Token_Reply::errnum (void) const
 {
   return ntohl (this->transfer_.errno_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Reply::errnum (ACE_UINT32 e)
 {
   this->transfer_.errno_ = htonl (e);
 }
 
 // = Set/get the length of the encoded/decoded message.
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ACE_Token_Reply::arg (void) const
 {
   return ntohl (this->transfer_.arg_);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_Token_Reply::arg (ACE_UINT32 arg)
 {
   this->transfer_.arg_ = htonl (arg);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Trace.cpp b/ace/Trace.cpp
index 5869f8bef45..63faa316d4e 100644
--- a/ace/Trace.cpp
+++ b/ace/Trace.cpp
@@ -16,6 +16,8 @@ ACE_RCSID (ace,
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager_Base.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // = Static initialization.
 
 // Keeps track of how far to indent per trace call.
@@ -131,3 +133,5 @@ ACE_Trace::~ACE_Trace (void)
         }
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Trace.h b/ace/Trace.h
index 67979f0287f..c473ee14014 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Trace
  *
@@ -87,6 +89,8 @@ private:
   };
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_TRACE_H */
diff --git a/ace/Typed_SV_Message.cpp b/ace/Typed_SV_Message.cpp
index 3062952d2b4..79f931b77df 100644
--- a/ace/Typed_SV_Message.cpp
+++ b/ace/Typed_SV_Message.cpp
@@ -1,8 +1,8 @@
-// Typed_SV_Message.cpp
 // $Id$
 
-#ifndef ACE_TYPED_SV_MESSAGE_C
-#define ACE_TYPED_SV_MESSAGE_C
+#ifndef ACE_TYPED_SV_MESSAGE_CPP
+#define ACE_TYPED_SV_MESSAGE_CPP
+
 #include "ace/Typed_SV_Message.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -13,7 +13,7 @@
 #include "ace/Typed_SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Typed_SV_Message, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message)
 
@@ -25,4 +25,6 @@ ACE_Typed_SV_Message<T>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#endif /* ACE_TYPED_SV_MESSAGE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TYPED_SV_MESSAGE_CPP */
diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h
index 178cdfb8340..e88ddd6bf00 100644
--- a/ace/Typed_SV_Message.h
+++ b/ace/Typed_SV_Message.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Typed_SV_Message
  *
@@ -86,6 +88,8 @@ private:
   T data_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Typed_SV_Message.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Typed_SV_Message.inl b/ace/Typed_SV_Message.inl
index a2dde0af39e..00ff07109ac 100644
--- a/ace/Typed_SV_Message.inl
+++ b/ace/Typed_SV_Message.inl
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/config-all.h"
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE
-ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message (long t, 
-					       int l, 
-					       int m)
+ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message (long t,
+                                               int l,
+                                               int m)
   : type_ (t)
 {
   ACE_TRACE ("ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message");
@@ -16,10 +19,10 @@ ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message (long t,
 }
 
 template <class T> ACE_INLINE
-ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message (const T &d, 
-					       long t, 
-					       int l, 
-					       int m)
+ACE_Typed_SV_Message<T>::ACE_Typed_SV_Message (const T &d,
+                                               long t,
+                                               int l,
+                                               int m)
   : type_ (t),
     data_ (d)
 {
@@ -90,3 +93,4 @@ ACE_Typed_SV_Message<T>::data (const T &d)
   this->data_ = d;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Typed_SV_Message_Queue.cpp b/ace/Typed_SV_Message_Queue.cpp
index c1d6bb6de39..7fc2b0fd38d 100644
--- a/ace/Typed_SV_Message_Queue.cpp
+++ b/ace/Typed_SV_Message_Queue.cpp
@@ -1,8 +1,7 @@
-// Typed_SV_Message_Queue.cpp
 // $Id$
 
-#ifndef ACE_TYPED_SV_MESSAGE_QUEUE_C
-#define ACE_TYPED_SV_MESSAGE_QUEUE_C
+#ifndef ACE_TYPED_SV_MESSAGE_QUEUE_CPP
+#define ACE_TYPED_SV_MESSAGE_QUEUE_CPP
 
 #include "ace/Typed_SV_Message.h"
 
@@ -17,7 +16,7 @@
 #include "ace/Typed_SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Typed_SV_Message_Queue, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message_Queue)
 
@@ -52,4 +51,6 @@ ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue (void)
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue");
 }
 
-#endif /* ACE_TYPED_SV_MESSAGE_QUEUE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_TYPED_SV_MESSAGE_QUEUE_CPP */
diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h
index 6c486197450..f7c2c066654 100644
--- a/ace/Typed_SV_Message_Queue.h
+++ b/ace/Typed_SV_Message_Queue.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 
 #include "ace/Typed_SV_Message.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_Typed_SV_Message_Queue
  *
@@ -72,6 +74,8 @@ private:
   ACE_SV_Message_Queue message_queue_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Typed_SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Typed_SV_Message_Queue.inl b/ace/Typed_SV_Message_Queue.inl
index aad60fd2055..21ae9536501 100644
--- a/ace/Typed_SV_Message_Queue.inl
+++ b/ace/Typed_SV_Message_Queue.inl
@@ -1,14 +1,15 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// Typed_SV_Message_Queue.i
-
 #include "ace/SV_Message_Queue.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE int
 ACE_Typed_SV_Message_Queue<T>::open (key_t external_id,
-				     int create,
-				     int perms)
+                                     int create,
+                                     int perms)
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::open");
   return this->message_queue_.open (external_id, create, perms);
@@ -25,7 +26,7 @@ ACE_Typed_SV_Message_Queue<T>::close (void)
 
 template <class T> ACE_INLINE int
 ACE_Typed_SV_Message_Queue<T>::recv (ACE_Typed_SV_Message<T> &mb,
-				     int mflags)
+                                     int mflags)
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::recv");
 
@@ -42,7 +43,7 @@ ACE_Typed_SV_Message_Queue<T>::recv (ACE_Typed_SV_Message<T> &mb,
 
 template <class T> ACE_INLINE int
 ACE_Typed_SV_Message_Queue<T>::send (const ACE_Typed_SV_Message<T> &mb,
-				     int mflags)
+                                     int mflags)
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::send");
   return
@@ -63,7 +64,7 @@ ACE_Typed_SV_Message_Queue<T>::remove (void)
 
 template <class T> ACE_INLINE int
 ACE_Typed_SV_Message_Queue<T>::control (int option,
-					void *arg)
+                                        void *arg)
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::control");
 
@@ -75,3 +76,5 @@ ACE_Typed_SV_Message_Queue<T>::get_id (void) const
 {
   return this->message_queue_.get_id ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 043c8872217..cb23ba91ef5 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(ace, UNIX_Addr, "$Id$")
 #include "ace/UNIX_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr)
 
 // Set a pointer to the address.
@@ -20,8 +22,8 @@ ACE_UNIX_Addr::set_addr (void *addr, int len)
 
   this->ACE_Addr::base_set (AF_UNIX, len);
   ACE_OS::memcpy ((void *) &this->unix_addr_,
-		  (void *) addr,
-		  len);
+                  (void *) addr,
+                  len);
 }
 
 // Return a pointer to the underlying address.
@@ -107,7 +109,7 @@ int
 ACE_UNIX_Addr::set (const sockaddr_un *un, int len)
 {
   (void) ACE_OS::memset ((void *) &this->unix_addr_, 0,
-		   sizeof this->unix_addr_);
+                   sizeof this->unix_addr_);
   this->unix_addr_.sun_family = AF_UNIX;
   ACE_OS::strcpy (this->unix_addr_.sun_path, un->sun_path);
   this->base_set (AF_UNIX, len);
@@ -123,17 +125,17 @@ int
 ACE_UNIX_Addr::set (const char rendezvous_point[])
 {
   (void) ACE_OS::memset ((void *) &this->unix_addr_,
-			 0,
-			 sizeof this->unix_addr_);
+                         0,
+                         sizeof this->unix_addr_);
   this->unix_addr_.sun_family = AF_UNIX;
-  (void) ACE_OS::strsncpy (this->unix_addr_.sun_path, 
+  (void) ACE_OS::strsncpy (this->unix_addr_.sun_path,
                            rendezvous_point,
                            sizeof this->unix_addr_.sun_path);
 
   this->ACE_Addr::base_set (AF_UNIX,
-			    sizeof this->unix_addr_ -
-			    sizeof (this->unix_addr_.sun_path) +
-			    ACE_OS::strlen (this->unix_addr_.sun_path));
+                            sizeof this->unix_addr_ -
+                            sizeof (this->unix_addr_.sun_path) +
+                            ACE_OS::strlen (this->unix_addr_.sun_path));
   return 0;
 }
 
@@ -144,4 +146,6 @@ ACE_UNIX_Addr::ACE_UNIX_Addr (const char rendezvous_point[])
   this->set (rendezvous_point);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index c1218888d13..eacabcf0d90 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -16,12 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#ifdef ACE_SOCKETS_BUILD_DLL
-# include "ace/ACE_Sockets_export.h"
-#else
-# include "ace/ACE_export.h"
-# define ACE_Sockets_Export ACE_Export
-#endif  /* ACE_SOCKETS_BUILD_DLL */
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,12 +29,14 @@
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_un.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_UNIX_Addr
  *
  * @brief Defines the ``UNIX domain address family'' address format.
  */
-class ACE_Sockets_Export ACE_UNIX_Addr : public ACE_Addr
+class ACE_Export ACE_UNIX_Addr : public ACE_Addr
 {
 public:
   // = Initialization methods.
@@ -105,10 +102,14 @@ private:
   sockaddr_un unix_addr_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UNIX_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_UNIX_ADDR_H */
diff --git a/ace/UNIX_Addr.inl b/ace/UNIX_Addr.inl
index 4a5da40940c..4e9e369d8f0 100644
--- a/ace/UNIX_Addr.inl
+++ b/ace/UNIX_Addr.inl
@@ -8,7 +8,8 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-/// Creates an ACE_UNIX_Addr from a string.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[])
 {
@@ -28,8 +29,8 @@ ACE_INLINE bool
 ACE_UNIX_Addr::operator == (const ACE_UNIX_Addr &sap) const
 {
   return ACE_OS::strncmp (this->unix_addr_.sun_path,
-			  sap.unix_addr_.sun_path,
-			  sizeof this->unix_addr_.sun_path) == 0;
+                          sap.unix_addr_.sun_path,
+                          sizeof this->unix_addr_.sun_path) == 0;
 }
 
 // Compare two addresses for inequality.
@@ -37,7 +38,7 @@ ACE_UNIX_Addr::operator == (const ACE_UNIX_Addr &sap) const
 ACE_INLINE bool
 ACE_UNIX_Addr::operator != (const ACE_UNIX_Addr &sap) const
 {
-  return !((*this) == sap);	// This is lazy, of course... ;-)
+  return !((*this) == sap);     // This is lazy, of course... ;-)
 }
 
 // Return the path name used for the rendezvous point.
@@ -48,4 +49,6 @@ ACE_UNIX_Addr::get_path_name (void) const
   return this->unix_addr_.sun_path;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp
index c7fa930f284..4b106b4a4be 100644
--- a/ace/UPIPE_Acceptor.cpp
+++ b/ace/UPIPE_Acceptor.cpp
@@ -1,4 +1,3 @@
-// UPIPE_Acceptor.cpp
 // $Id$
 
 #include "ace/UPIPE_Acceptor.h"
@@ -13,6 +12,8 @@ ACE_RCSID(ace, UPIPE_Acceptor, "$Id$")
 #include "ace/UPIPE_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor)
 
 void
@@ -40,7 +41,7 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void)
 
 int
 ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr,
-			  int reuse_addr)
+                          int reuse_addr)
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::open");
   return this->ACE_SPIPE_Acceptor::open (local_addr, reuse_addr);
@@ -56,7 +57,7 @@ ACE_UPIPE_Acceptor::close (void)
 // General purpose routine for accepting new connections.
 
 ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr,
-					int reuse_addr)
+                                        int reuse_addr)
   : mb_ (sizeof (ACE_UPIPE_Stream *))
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor");
@@ -69,9 +70,9 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr,
 
 int
 ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
-			    ACE_UPIPE_Addr *remote_addr,
-			    ACE_Time_Value *timeout,
-			    int restart,
+                            ACE_UPIPE_Addr *remote_addr,
+                            ACE_Time_Value *timeout,
+                            int restart,
                             int reset_new_handle)
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::accept");
@@ -80,7 +81,7 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
   ACE_SPIPE_Stream new_io;
 
   if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr,
-					timeout, restart) == -1)
+                                        timeout, restart) == -1)
     return -1;
   else
     {
@@ -100,20 +101,20 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
       // ACE_UPIPE_Stream to our ACE_UPIPE_Stream.
 
       if (ACE_OS::read (new_stream.get_handle (),
-			(char *) &remote_stream,
-			sizeof remote_stream) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ACE_LIB_TEXT ("read stream address failed")));
+                        (char *) &remote_stream,
+                        sizeof remote_stream) == -1)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
+                    ACE_LIB_TEXT ("read stream address failed")));
       else if (new_stream.stream_.link (remote_stream->stream_) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ACE_LIB_TEXT ("link streams failed")));
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
+                    ACE_LIB_TEXT ("link streams failed")));
       // Send a message over the new streampipe to confirm acceptance.
       else if (new_stream.send (&mb_, 0) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ACE_LIB_TEXT ("linked stream.put failed")));
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
+                    ACE_LIB_TEXT ("linked stream.put failed")));
 
       // Close down the new_stream at this point in order to conserve
       // handles.  Note that we don't need the SPIPE connection
@@ -123,4 +124,6 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
     }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index 0f51b3253bb..b7b94179cb6 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_HAS_THREADS)
+
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Thread_Manager.h"
 
-#if defined (ACE_HAS_THREADS)
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_UPIPE_Acceptor
@@ -84,10 +86,14 @@ private:
   ACE_Message_Block mb_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UPIPE_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_UPIPE_ACCEPTOR_H */
diff --git a/ace/UPIPE_Acceptor.inl b/ace/UPIPE_Acceptor.inl
index 0e28e250ab0..731d6be4a6c 100644
--- a/ace/UPIPE_Acceptor.inl
+++ b/ace/UPIPE_Acceptor.inl
@@ -1,9 +1,14 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE int
 ACE_UPIPE_Acceptor::remove (void)
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::remove");
   return this->ACE_SPIPE_Acceptor::remove ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h
index 2b4d3040527..75f948c6bf5 100644
--- a/ace/UPIPE_Addr.h
+++ b/ace/UPIPE_Addr.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,6 +13,7 @@
 
 #ifndef ACE_UPIPE_ADDR_H
 #define ACE_UPIPE_ADDR_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/SPIPE_Addr.h"
@@ -22,7 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef ACE_SPIPE_Addr ACE_UPIPE_Addr;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_UPIPE_ADDR_H */
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index 455d982e993..ba0b4592d2f 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -1,4 +1,3 @@
-// UPIPE_Connector.cpp
 // $Id$
 
 #include "ace/UPIPE_Connector.h"
@@ -7,12 +6,16 @@ ACE_RCSID(ace, UPIPE_Connector, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
+#include "ace/Handle_Ops.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stropts.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/UPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector)
 
 void
@@ -89,7 +92,10 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
         // connection anymore since we're linked via the Message_Queue
         // now.
         new_stream.ACE_SPIPE::close ();
-      return result;
+      return static_cast<int> (result);
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index b98ab643c92..c2778f82a11 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,10 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SPIPE_Stream.h"
-
 #if defined (ACE_HAS_THREADS)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_UPIPE_Connector
  *
@@ -102,10 +102,14 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UPIPE_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_UPIPE_CONNECTOR_H */
diff --git a/ace/UPIPE_Connector.inl b/ace/UPIPE_Connector.inl
index 980d8a28164..b45134f1067 100644
--- a/ace/UPIPE_Connector.inl
+++ b/ace/UPIPE_Connector.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Creates a Local ACE_UPIPE.
 ACE_INLINE
 ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
@@ -13,7 +16,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
 {
   ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector");
   if (this->connect (new_stream, addr, timeout, local_sap,
-		     reuse_addr, flags, perms) == -1
+                     reuse_addr, flags, perms) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("address %s, %p\n"),
@@ -22,9 +25,10 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
 }
 
 ACE_INLINE int
-ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
+ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE /* handle */)
 {
-  ACE_UNUSED_ARG (handle);
   // Nothing to do here since the handle is not a socket
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index 4df8d5fc547..53b170d23cd 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -1,17 +1,18 @@
-// UPIPE_Stream.cpp
 // $Id$
 
 #include "ace/UPIPE_Stream.h"
-#include "ace/OS_NS_string.h"
 
 ACE_RCSID(ace, UPIPE_Stream, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
+#include "ace/OS_NS_string.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/UPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Stream)
 
@@ -225,5 +226,6 @@ ACE_UPIPE_Stream::recv_n (char *buf,
   return bytes_read;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h
index f9002d2c255..98e31cf3349 100644
--- a/ace/UPIPE_Stream.h
+++ b/ace/UPIPE_Stream.h
@@ -22,14 +22,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_HAS_THREADS)
+
 #include "ace/SPIPE.h"
 #include "ace/Message_Queue.h"
 #include "ace/UPIPE_Addr.h"
 
-#if defined (ACE_HAS_THREADS)
-
-// Use a typedef to make life easier later on.
-typedef ACE_Stream<ACE_SYNCH> MT_Stream;
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_UPIPE_Stream
@@ -42,6 +41,8 @@ public:
   friend class ACE_UPIPE_Acceptor;
   friend class ACE_UPIPE_Connector;
 
+  typedef ACE_Stream<ACE_SYNCH> MT_Stream;
+
   // = Initialization and Termination.
 
   ACE_UPIPE_Stream (void);
@@ -127,10 +128,14 @@ private:
 #endif /* ACE_MT_SAFE */
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UPIPE_Stream.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_THREADS */
+
 #include /**/ "ace/post.h"
+
 #endif /*ACE_UPIPE_STREAM_H */
diff --git a/ace/UPIPE_Stream.inl b/ace/UPIPE_Stream.inl
index 9bd3912d1ba..3a33d287b0b 100644
--- a/ace/UPIPE_Stream.inl
+++ b/ace/UPIPE_Stream.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE ACE_HANDLE
 ACE_UPIPE_Stream::get_handle (void) const
 {
@@ -8,3 +11,4 @@ ACE_UPIPE_Stream::get_handle (void) const
   return this->ACE_SPIPE::get_handle ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/UUID.cpp b/ace/UUID.cpp
index 0873cc7d903..1a4d0386d40 100644
--- a/ace/UUID.cpp
+++ b/ace/UUID.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_Utils
 {
 
@@ -369,8 +371,8 @@ namespace ACE_Utils
     u_char cseqHAV;
     {
       ACE_GUARD (ACE_SYNCH_MUTEX, mon, *lock_);
-      uuid.clockSeqLow (uuid_state_.clockSequence & 0xFF);
-      cseqHAV = (uuid_state_.clockSequence & 0x3f00) >> 8;
+      uuid.clockSeqLow (static_cast<u_char> (uuid_state_.clockSequence & 0xFF));
+      cseqHAV = static_cast<u_char> ((uuid_state_.clockSequence & 0x3f00) >> 8);
       uuid_state_.timestamp = timestamp;
     }
 
@@ -409,27 +411,19 @@ namespace ACE_Utils
   void
   UUID_Generator::get_timestamp (UUID_time& timestamp)
   {
+    ACE_GUARD (ACE_SYNCH_MUTEX, mon, *lock_);
+
     this->get_systemtime(timestamp);
 
-    /// Account for the clock being set back. Increment the clock
-    /// sequence.
+    // Account for the clock being set back. Increment the clock /
+    // sequence.
     if (timestamp <= timeLast_)
-      {
-        {
-          ACE_GUARD (ACE_SYNCH_MUTEX, mon, *lock_);
-          uuid_state_.clockSequence = (uuid_state_.clockSequence + 1) & ACE_UUID_CLOCK_SEQ_MASK;
-        }
-      }
+      uuid_state_.clockSequence = static_cast<u_char> ((uuid_state_.clockSequence + 1) & ACE_UUID_CLOCK_SEQ_MASK);
 
-    /// If the system time ticked since the last UUID was generated. Set
-    /// the clock sequence back.
+    // If the system time ticked since the last UUID was
+    // generated. Set / the clock sequence back.
     else if (timestamp > timeLast_)
-      {
-        {
-          ACE_GUARD (ACE_SYNCH_MUTEX, mon, *lock_);
-          uuid_state_.clockSequence = 0;
-        }
-      }
+      uuid_state_.clockSequence = 0;
 
     timeLast_ = timestamp;
   }
@@ -479,11 +473,9 @@ namespace ACE_Utils
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> *
   ACE_Singleton<ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/UUID.h b/ace/UUID.h
index 9882c24cef5..9a1a9cce956 100644
--- a/ace/UUID.h
+++ b/ace/UUID.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file  UUID.h
@@ -24,6 +25,8 @@
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_Utils
 {
   /// Class to hold a MAC address
@@ -215,10 +218,12 @@ namespace ACE_Utils
     int destroy_lock_;
   };
 
-  typedef ACE_Singleton <UUID_Generator, ACE_SYNCH_MUTEX> UUID_GENERATOR;
+  typedef ACE_Singleton<UUID_Generator, ACE_SYNCH_MUTEX> UUID_GENERATOR;
 
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UUID.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/UUID.inl b/ace/UUID.inl
index 0bd9fc053c6..7eb8dd323de 100644
--- a/ace/UUID.inl
+++ b/ace/UUID.inl
@@ -1,5 +1,8 @@
-//$Id$
 // -*- C++ -*-
+//
+//$Id$
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils
 {
@@ -194,3 +197,5 @@ namespace ACE_Utils
 //    return false;
 //  }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Unbounded_Queue.cpp b/ace/Unbounded_Queue.cpp
index 332fddb4428..cde3e6679b6 100644
--- a/ace/Unbounded_Queue.cpp
+++ b/ace/Unbounded_Queue.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_UNBOUNDED_QUEUE_C
-#define ACE_UNBOUNDED_QUEUE_C
+#ifndef ACE_UNBOUNDED_QUEUE_CPP
+#define ACE_UNBOUNDED_QUEUE_CPP
 
 #include "ace/Unbounded_Queue.h"
 
@@ -17,7 +17,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/os_include/os_errno.h"
 
-ACE_RCSID(ace, Unbounded_Queue, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Queue)
 
@@ -134,7 +134,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void)
                              this->allocator_->free,
                              ACE_Node,
                              <T>);
-      this->cur_size_--;
+      --this->cur_size_;
       // @@ Doesnt make sense to have this check since
       // this will always be true.
       //   ACE_ASSERT (this->cur_size_ >= 0);
@@ -174,7 +174,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
   // just a pointer to the dummy node.
   this->head_->next_ = temp;
 
-  this->cur_size_++;
+  ++this->cur_size_;
   return 0;
 }
 
@@ -201,7 +201,7 @@ ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
   // Point the head to the new dummy node.
   this->head_ = temp;
 
-  this->cur_size_++;
+  ++this->cur_size_;
   return 0;
 }
 
@@ -429,4 +429,6 @@ ACE_Unbounded_Queue_Iterator<T>::next (T *&item)
     }
 }
 
-#endif /* ACE_UNBOUNDED_QUEUE_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_UNBOUNDED_QUEUE_CPP */
diff --git a/ace/Unbounded_Queue.h b/ace/Unbounded_Queue.h
index fca8b344d30..39314168da8 100644
--- a/ace/Unbounded_Queue.h
+++ b/ace/Unbounded_Queue.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,8 @@
 // For size_t under Chorus
 #include "ace/os_include/os_stddef.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Allocator;
 
 template <class T>
@@ -278,6 +280,8 @@ protected:
   ACE_Allocator *allocator_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Unbounded_Queue.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Unbounded_Queue.inl b/ace/Unbounded_Queue.inl
index ea552e7d3d8..35bb7fb9cdf 100644
--- a/ace/Unbounded_Queue.inl
+++ b/ace/Unbounded_Queue.inl
@@ -1,5 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE size_t
 ACE_Unbounded_Queue<T>::size (void) const
 {
@@ -19,3 +23,5 @@ ACE_Unbounded_Queue<T>::is_full (void) const
   //  ACE_TRACE ("ACE_Unbounded_Queue<T>::is_full");
   return 0; // We should implement a "node of last resort for this..."
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp
index 54ffa30a0f2..c3a444ccd8a 100644
--- a/ace/Unbounded_Set.cpp
+++ b/ace/Unbounded_Set.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_UNBOUNDED_SET_C
-#define ACE_UNBOUNDED_SET_C
+#ifndef ACE_UNBOUNDED_SET_CPP
+#define ACE_UNBOUNDED_SET_CPP
 
 #include "ace/Unbounded_Set.h"
 #include "ace/Malloc_Base.h"
@@ -15,7 +15,7 @@
 #include "ace/Unbounded_Set.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Unbounded_Set, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set)
 
@@ -46,7 +46,7 @@ ACE_Unbounded_Set<T>::insert_tail (const T &item)
   // Point the head to the new dummy node.
   this->head_ = temp;
 
-  this->cur_size_++;
+  ++this->cur_size_;
   return 0;
 }
 
@@ -107,7 +107,7 @@ ACE_Unbounded_Set<T>::delete_nodes (void)
                              this->allocator_->free,
                              ACE_Node,
                              <T>);
-      this->cur_size_--;
+      --this->cur_size_;
     }
 
   // Reset the list to be a circular list with just a dummy node.
@@ -227,7 +227,7 @@ ACE_Unbounded_Set<T>::remove (const T &item)
       ACE_Node<T> *temp = curr->next_;
       // Skip over the node that we're deleting.
       curr->next_ = temp->next_;
-      this->cur_size_--;
+      --this->cur_size_;
       ACE_DES_FREE_TEMPLATE (temp,
                              this->allocator_->free,
                              ACE_Node,
@@ -440,11 +440,13 @@ ACE_Unbounded_Set_Const_Iterator<T>::operator* (void)
   //ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator<T>::operator*");
   T *retv = 0;
 
-  int result = this->next (retv);
+  int const result = this->next (retv);
   ACE_ASSERT (result != 0);
   ACE_UNUSED_ARG (result);
 
   return *retv;
 }
 
-#endif /* ACE_UNBOUNDED_SET_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_UNBOUNDED_SET_CPP */
diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h
index d4f2a957cdd..8cddab86f12 100644
--- a/ace/Unbounded_Set.h
+++ b/ace/Unbounded_Set.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_Allocator;
 
 /**
@@ -96,8 +98,8 @@ public:
 
   // = Iteration methods.
 
-  /// Pass back the <next_item> that hasn't been seen in the Set.
-  /// Returns 0 when all items have been seen, else 1.
+  /// Pass back the @a next_item that hasn't been seen in the Set.
+  /// @return Returns 0 when all items have been seen, else 1.
   int next (T *&next_item);
 
   /// Move forward by one element in the set.  Returns 0 when all the
@@ -299,6 +301,8 @@ private:
   ACE_Allocator *allocator_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Unbounded_Set.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Unbounded_Set.inl b/ace/Unbounded_Set.inl
index 9aad60c4a08..363fe6e4a6d 100644
--- a/ace/Unbounded_Set.inl
+++ b/ace/Unbounded_Set.inl
@@ -1,8 +1,11 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T> ACE_INLINE int
 ACE_Unbounded_Set<T>::is_empty (void) const
 {
@@ -16,3 +19,5 @@ ACE_Unbounded_Set<T>::is_full (void) const
   ACE_TRACE ("ACE_Unbounded_Set<T>::is_full");
   return 0; // We should implement a "node of last resort for this..."
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Value_Ptr.h b/ace/Value_Ptr.h
index 4c05f288409..70570f9c34b 100644
--- a/ace/Value_Ptr.h
+++ b/ace/Value_Ptr.h
@@ -16,8 +16,12 @@
 #ifndef ACE_VALUE_PTR_H
 #define ACE_VALUE_PTR_H
 
+#include "ace/config-lite.h"
+
 #include <algorithm>
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   /**
@@ -158,4 +162,6 @@ namespace ACE
 
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_VALUE_PTR_H */
diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp
index 2dcbd96f67c..adf9727c6ff 100644
--- a/ace/Vector_T.cpp
+++ b/ace/Vector_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef ACE_VECTOR_T_C
-#define ACE_VECTOR_T_C
+#ifndef ACE_VECTOR_T_CPP
+#define ACE_VECTOR_T_CPP
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -13,13 +13,13 @@
 #include "ace/Vector_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Vector_T, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Vector)
 
 template <class T, size_t DEFAULT_SIZE>
 void ACE_Vector<T, DEFAULT_SIZE>::resize (const size_t new_size,
-					  const T& t)
+                                          const T& t)
 {
   ACE_Array<T>::size (new_size);
   if (new_size > length_)
@@ -101,9 +101,9 @@ int compare(const ACE_Vector<T>& v1,
       //     cout<<", V2["<<i<<"]="<<v2[i];
       //     cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl;
       if (v1[i] != v2[i])
-	{
-	  return false;
-	}
+        {
+          return false;
+        }
     }
   //  cout<<"compare() ====================>"<<endl;
   return true;
@@ -111,9 +111,9 @@ int compare(const ACE_Vector<T>& v1,
 
 template<class T>
 int partial_compare(const ACE_Vector<T>& v1,
-		    const ACE_Vector<T>& v2,
-		    const size_t from_ndx,
-		    const size_t to_ndx)
+                    const ACE_Vector<T>& v2,
+                    const size_t from_ndx,
+                    const size_t to_ndx)
 {
   size_t last1 = v1.size () - 1;
   size_t last2 = v2.size () - 1;
@@ -132,9 +132,9 @@ int partial_compare(const ACE_Vector<T>& v1,
       //     cout<<", V2["<<i<<"]="<<v2[i];
       //     cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl;
       if (v1[i] != v2[i])
-	{
-	  return false;
-	}
+        {
+          return false;
+        }
     }
   //  cout<<"partial_compare() ====================>"<<endl;
   return true;
@@ -160,4 +160,6 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::next (T *&item)
     }
 }
 
-#endif /* ACE_VECTOR_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_VECTOR_T_CPP */
diff --git a/ace/Vector_T.h b/ace/Vector_T.h
index c6e5b60b074..b82ea62b90e 100644
--- a/ace/Vector_T.h
+++ b/ace/Vector_T.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /*
  * Default size for an ACE_Vector.
  */
-const size_t ACE_VECTOR_DEFAULT_SIZE = 32;
+static const size_t ACE_VECTOR_DEFAULT_SIZE = 32;
 
 // Forward declaration.
 template <class T, size_t DEFAULT_SIZE> class ACE_Vector_Iterator;
@@ -83,7 +85,7 @@ public:
    *              default ACE allocator is used
    */
   ACE_Vector (const size_t init_size = DEFAULT_SIZE,
-	      ACE_Allocator* alloc = 0);
+              ACE_Allocator* alloc = 0);
 
   /**
    * Destructor.
@@ -128,7 +130,7 @@ public:
    *          initialization clause for this parameter).
    */
   void resize (const size_t new_size,
-	       const T& t);
+               const T& t);
 
   /**
    * Appends a new element to the vector ("push back").  If the
@@ -222,9 +224,9 @@ protected:
  */
 template<class T>
 int compare (const ACE_Vector<T>& v1,
-	      const ACE_Vector<T>& v2,
-	      const size_t from_ndx,
-	      const size_t to_ndx);
+              const ACE_Vector<T>& v2,
+              const size_t from_ndx,
+              const size_t to_ndx);
 
 /**
  * Does a partial comparison of two vectors in the range of
@@ -244,9 +246,9 @@ int compare (const ACE_Vector<T>& v1,
 
 template<class T>
 int partial_compare (const ACE_Vector<T>& v1,
-		      const ACE_Vector<T>& v2,
-		      const size_t from_ndx,
-		      const size_t to_ndx);
+                      const ACE_Vector<T>& v2,
+                      const size_t from_ndx,
+                      const size_t to_ndx);
 #endif /* 0 */
 // ****************************************************************
 
@@ -293,6 +295,8 @@ private:
   ACE_Vector<T, DEFAULT_SIZE> &vector_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/Vector_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Vector_T.inl b/ace/Vector_T.inl
index a936c2bfe4d..aef981b447d 100644
--- a/ace/Vector_T.inl
+++ b/ace/Vector_T.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE
 ACE_Vector<T, DEFAULT_SIZE>::ACE_Vector (const size_t init_size,
-					 ACE_Allocator* alloc)
+                                         ACE_Allocator* alloc)
   : ACE_Array<T> (init_size == 0 ? DEFAULT_SIZE : init_size, alloc)
 {
   length_ = 0;
@@ -88,3 +91,5 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::done (void) const
 
   return this->current_ >= vector_.size ();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Version.h b/ace/Version.h
index 0c8ed950821..5db74f85f8f 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -1,7 +1,10 @@
+// -*- C++ -*-
 // $Id$
-// This is an automatically generated file.
+
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.
 
 #define ACE_MAJOR_VERSION 5
-#define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 7
-#define ACE_VERSION "5.4.7"
+#define ACE_MINOR_VERSION 5
+#define ACE_BETA_VERSION 1
+#define ACE_VERSION "5.5.1"
+
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 2b3e3b86df5..ac4d9f88023 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -18,6 +18,8 @@ ACE_RCSID(ace, WFMO_Reactor, "$Id$")
 
 #include "ace/Auto_Ptr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_WFMO_Reactor_Handler_Repository::ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor)
   : wfmo_reactor_ (wfmo_reactor)
 {
@@ -192,7 +194,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
 
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
-  size_t original_handle_count = this->handles_to_be_deleted_;
+  size_t const original_handle_count = this->handles_to_be_deleted_;
   int result = 0;
   size_t i;
 
@@ -2391,7 +2393,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
       else
         {
           ACE_Notification_Buffer *buffer =
-            (ACE_Notification_Buffer *) mb->base ();
+            reinterpret_cast <ACE_Notification_Buffer *> (mb->base ());
 
           // If eh == 0 then we've got major problems!  Otherwise, we
           // need to dispatch the appropriate handle_* method on the
@@ -2555,7 +2557,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
 
   for (index = 0; index < queue_size; ++index)
     {
-      ACE_Message_Block  *mb;
+      ACE_Message_Block *mb = 0;
       if (-1 == this->message_queue_.dequeue_head (mb))
         return -1;        // This shouldn't happen...
 
@@ -2604,7 +2606,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
   queue_size  = local_queue.message_count ();
   for (index = 0; index < queue_size; ++index)
     {
-      ACE_Message_Block  *mb;
+      ACE_Message_Block  *mb = 0;
       if (-1 == local_queue.dequeue_head (mb))
         {
           ACE_ASSERT (0);
@@ -2676,28 +2678,22 @@ ACE_WFMO_Reactor::resumable_handler (void)
 // No-op WinSOCK2 methods to help WFMO_Reactor compile
 #if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
 int
-WSAEventSelect (SOCKET s,
-                WSAEVENT hEventObject,
-                long lNetworkEvents)
+WSAEventSelect (SOCKET /* s */,
+                WSAEVENT /* hEventObject */,
+                long /* lNetworkEvents */)
 {
-  ACE_UNUSED_ARG (s);
-  ACE_UNUSED_ARG (hEventObject);
-  ACE_UNUSED_ARG (lNetworkEvents);
-
   return -1;
 }
 
 int
-WSAEnumNetworkEvents (SOCKET s,
-                      WSAEVENT hEventObject,
-                      LPWSANETWORKEVENTS lpNetworkEvents)
+WSAEnumNetworkEvents (SOCKET /* s */,
+                      WSAEVENT /* hEventObject */,
+                      LPWSANETWORKEVENTS /* lpNetworkEvents */)
 {
-  ACE_UNUSED_ARG (s);
-  ACE_UNUSED_ARG (hEventObject);
-  ACE_UNUSED_ARG (lpNetworkEvents);
-
   return -1;
 }
 #endif /* !defined ACE_HAS_WINSOCK2 */
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 7be1525ea8a..8e3cdb4cc28 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -73,6 +73,10 @@ int WSAEnumNetworkEvents (SOCKET s,
 
 #endif /* !defined ACE_HAS_WINSOCK2 */
 
+class ACE_WFMO_Reactor_Test;  // Must be out of versioned namespace.
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward decl.
 class ACE_WFMO_Reactor;
 class ACE_Handle_Set;
@@ -93,8 +97,8 @@ public:
 /**
  * @class ACE_WFMO_Reactor_Handler_Repository
  *
- * @brief Used to map <ACE_HANDLE>s onto the appropriate
- * <ACE_Event_Handler> * and other information.
+ * @brief Used to map ACE_HANDLEs onto the appropriate
+ * ACE_Event_Handler * and other information.
  */
 class ACE_Export ACE_WFMO_Reactor_Handler_Repository
 {
@@ -304,7 +308,7 @@ public:
 
   // = Search structure operations.
 
-  /// Bind the <ACE_Event_Handler *> to the <ACE_HANDLE>. This is for
+  /// Bind the <ACE_Event_Handler *> to the ACE_HANDLE. This is for
   /// the simple event entry.
   int bind (ACE_HANDLE, ACE_Event_Handler *);
 
@@ -317,7 +321,7 @@ public:
               ACE_HANDLE event_handle,
               int delete_event);
 
-  /// Remove the binding of <ACE_HANDLE> in accordance with the <mask>.
+  /// Remove the binding of ACE_HANDLE in accordance with the <mask>.
   int unbind (ACE_HANDLE,
               ACE_Reactor_Mask mask);
 
@@ -338,12 +342,12 @@ public:
   /// Maximum ACE_HANDLE value, plus 1.
   DWORD max_handlep1 (void) const;
 
-  /// Pointer to the beginning of the current array of <ACE_HANDLE>
+  /// Pointer to the beginning of the current array of ACE_HANDLE
   /// *'s.
   ACE_HANDLE *handles (void) const;
 
   /// Pointer to the beginning of the current array of
-  /// <ACE_Event_Handler> *'s.
+  /// ACE_Event_Handler *'s.
   Current_Info *current_info (void) const;
 
   /// Check if changes to the handle set are required.
@@ -393,15 +397,15 @@ public:
   /// current_suspended_info_ from to_be_added_info_
   int make_changes_in_to_be_added_infos (void);
 
-  /// Removes the <ACE_Event_Handler> at <slot> from the table.
+  /// Removes the ACE_Event_Handler at <slot> from the table.
   int remove_handler_i (size_t slot,
                         ACE_Reactor_Mask mask);
 
-  /// Removes the <ACE_Event_Handler> at <slot> from the table.
+  /// Removes the ACE_Event_Handler at <slot> from the table.
   int remove_suspended_handler_i (size_t slot,
                                   ACE_Reactor_Mask mask);
 
-  /// Removes the <ACE_Event_Handler> at <slot> from the table.
+  /// Removes the ACE_Event_Handler at <slot> from the table.
   int remove_to_be_added_handler_i (size_t slot,
                                     ACE_Reactor_Mask to_be_removed_masks);
 
@@ -477,7 +481,7 @@ protected:
  * @class ACE_WFMO_Reactor_Notify
  *
  * @brief Unblock the <ACE_WFMO_Reactor> from its event loop, passing
- * it an optional <ACE_Event_Handler> to dispatch.
+ * it an optional ACE_Event_Handler to dispatch.
  *
  * This implementation is necessary for cases where the
  * <ACE_WFMO_Reactor> is run in a multi-threaded program.  In
@@ -485,7 +489,7 @@ protected:
  * <WaitForMultipleObjects> when updates occur other than in the
  * main <ACE_WFMO_Reactor> thread.  To do this, we signal an
  * auto-reset event the <ACE_WFMO_Reactor> is listening on.  If
- * an <ACE_Event_Handler> and <ACE_Reactor_Mask> is passed to
+ * an ACE_Event_Handler and <ACE_Reactor_Mask> is passed to
  * <notify>, the appropriate <handle_*> method is dispatched.
  */
 class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify
@@ -505,7 +509,7 @@ 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
+   * 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> ==
    * 0, the caller will block until action is possible, else will wait
@@ -564,7 +568,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. If <eh> == 0, all notifications for all
+   * ACE_Event_Handler object. If <eh> == 0, all notifications for all
    * handlers are removed (but not any notifications posted just to wake up
    * the reactor itself). Returns the number of notifications purged.
    * Returns -1 on error.
@@ -732,7 +736,7 @@ public:
    *
    * <WaitForMultipleObjects> is used as the demultiplexing call
    *
-   * Returns the total number of I/O and timer <ACE_Event_Handler>s
+   * Returns the total number of I/O and timer ACE_Event_Handlers
    * that were dispatched, 0 if the <max_wait_time> elapsed without
    * dispatching any handlers, or -1 if an error occurs.
    *
@@ -775,7 +779,7 @@ public:
   // = Register and remove Handlers.
 
   /**
-   * Register an <ACE_Event_Handler> <event_handler>.  Since no Event
+   * Register an ACE_Event_Handler <event_handler>.  Since no Event
    * Mask is passed through this interface, it is assumed that the
    * <handle> being passed in is an event handle and when the event
    * becomes signaled, <WFMO_Reactor> will call handle_signal on
@@ -787,7 +791,7 @@ public:
                                 ACE_HANDLE event_handle = ACE_INVALID_HANDLE);
 
   /**
-   * Register an <ACE_Event_Handler> <event_handle>.  <mask> specifies
+   * Register an ACE_Event_Handler <event_handle>.  <mask> specifies
    * the network events that the <event_handler> is interested in.  If
    * <io_handle> == <ACE_INVALID_HANDLE> the <ACE_WFMO_Reactor> will
    * call the <get_handle> method of <event_handler> to extract the
@@ -1059,7 +1063,7 @@ public:
 
   /**
    * Purge any notifications pending in this reactor for the specified
-   * <ACE_Event_Handler> object. Returns the number of notifications
+   * ACE_Event_Handler object. Returns the number of notifications
    * purged. Returns -1 on error.
    */
   virtual int purge_pending_notifications (ACE_Event_Handler * = 0,
@@ -1342,6 +1346,8 @@ private:
   ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/WFMO_Reactor.inl b/ace/WFMO_Reactor.inl
index e8893728b3a..bbfdcef7deb 100644
--- a/ace/WFMO_Reactor.inl
+++ b/ace/WFMO_Reactor.inl
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Handle_Set.h"
@@ -6,16 +7,15 @@
 #include "ace/Thread.h"
 #include "ace/OS_NS_errno.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /************************************************************/
 
 ACE_INLINE int
-ACE_Wakeup_All_Threads_Handler::handle_signal (int signum,
-                                               siginfo_t *siginfo,
+ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */,
+                                               siginfo_t * /* siginfo */,
                                                ucontext_t *)
 {
-  ACE_UNUSED_ARG (signum);
-  ACE_UNUSED_ARG (siginfo);
-
   // This will get called when <WFMO_Reactor->wakeup_all_threads_> event
   // is signaled. There is nothing to be done here.
   //  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%t) waking up to get updated handle set info\n")));
@@ -432,9 +432,9 @@ ACE_WFMO_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_, -1);
 
   int changes_required = 0;
-  int result = this->unbind_i (handle,
-                               mask,
-                               changes_required);
+  int const result = this->unbind_i (handle,
+                                     mask,
+                                     changes_required);
 
   if (changes_required)
     // Wake up all threads in WaitForMultipleObjects so that they can
@@ -685,7 +685,7 @@ ACE_WFMO_Reactor::suspend_handler (ACE_HANDLE handle)
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   int changes_required = 0;
-  int result =
+  int const result =
     this->handler_rep_.suspend_handler_i (handle,
                                           changes_required);
 
@@ -1168,3 +1168,5 @@ ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void)
 }
 
 #endif /* ACE_WIN32 */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp
index 39e72b6f575..afe50d51c05 100644
--- a/ace/WIN32_Asynch_IO.cpp
+++ b/ace/WIN32_Asynch_IO.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (ace,
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_socket.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 size_t
 ACE_WIN32_Asynch_Result::bytes_transferred (void) const
 {
@@ -166,7 +168,7 @@ ACE_WIN32_Asynch_Operation::cancel (void)
 {
 #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
     && (   (defined (_MSC_VER)) \
-        || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) \
+        || (defined (__BORLANDC__)) \
         || (defined (__MINGW32)))
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
@@ -175,7 +177,7 @@ ACE_WIN32_Asynch_Operation::cancel (void)
   // @@ This API returns 0 on failure. So, I am returning -1 in that
   //    case. Is that right? (Alex).
 
-  int result = (int) ::CancelIo (this->handle_);
+  int const result = (int) ::CancelIo (this->handle_);
 
   if (result == 0)
     // Couldnt cancel the operations.
@@ -411,7 +413,7 @@ ACE_WIN32_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
                   -1);
 
   // Shared read
-  int return_val = this->shared_read (result);
+  int const return_val = this->shared_read (result);
 
   // Upon errors
   if (return_val == -1)
@@ -468,7 +470,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
 
         // Increment iovec counter if there's more to do.
         if (msg_space > 0)
-          iovcnt++;
+          ++iovcnt;
       }
     if (msg_space > 0)       // Ran out of iovecs before msg_space exhausted
       {
@@ -594,6 +596,8 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
   switch (errno)
     {
     case ERROR_IO_PENDING:
+      /* FALLTHRU */
+    case ERROR_MORE_DATA:
       // The IO will complete proactively: the OVERLAPPED will still
       // get queued.
       return 0;
@@ -2575,8 +2579,6 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
         }
       return 1 ;  // connect finished
     }
-
-  ACE_NOTREACHED (return 0);
 }
 
 
@@ -3336,15 +3338,15 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
                   -1);
 
   // do the scatter/gather recv
-  int initiate_result = ACE_OS::recvfrom (result->handle (),
-                                          iov,
-                                          iovcnt,
-                                          number_of_bytes_recvd,
-                                          result->flags_,
-                                          result->saddr (),
-                                          &(result->addr_len_),
-                                          result,
-                                          0);
+  ssize_t initiate_result = ACE_OS::recvfrom (result->handle (),
+                                              iov,
+                                              iovcnt,
+                                              number_of_bytes_recvd,
+                                              result->flags_,
+                                              result->saddr (),
+                                              &(result->addr_len_),
+                                              result,
+                                              0);
   if (initiate_result == SOCKET_ERROR)
   {
     // If initiate failed, check for a bad error.
@@ -3663,15 +3665,15 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 
   // do the scatter/gather send
 
-  int initiate_result = ACE_OS::sendto (result->handle (),
-                                        iov,
-                                        iovcnt,
-                                        number_of_bytes_sent,
-                                        result->flags_,
-                                        (sockaddr *) addr.get_addr (),
-                                        addr.get_size(),
-                                        result,
-                                        0);
+  ssize_t initiate_result = ACE_OS::sendto (result->handle (),
+                                            iov,
+                                            iovcnt,
+                                            number_of_bytes_sent,
+                                            result->flags_,
+                                            (sockaddr *) addr.get_addr (),
+                                            addr.get_size(),
+                                            result,
+                                            0);
 
 
   if (initiate_result == SOCKET_ERROR)
@@ -3748,26 +3750,6 @@ ACE_WIN32_Asynch_Write_Dgram::ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Map_Entry<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *>;
-template class ACE_Map_Manager<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Const_Iterator_Base<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Const_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>;
-
-#elif  defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Const_Iterator_Base<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Const_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_WIN32_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index f8683a7c24d..298563c7d88 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -41,6 +41,8 @@
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declaration
 class ACE_WIN32_Proactor;
 
@@ -689,7 +691,7 @@ public:
   /**
   * Same as above but with scatter support, through chaining of
   * composite message blocks using the continuation field.
-  * NOTE: Each data block payload must be at least the size of a
+  * @note Each data block payload must be at least the size of a
   * system memory page and must be aligned on a system memory page
   * size boundary
   */
@@ -896,7 +898,7 @@ public:
   /**
   * Same as above but with gather support, through chaining of
   * composite message blocks using the continuation field.
-  * NOTE: Each data block payload must be at least the size of a
+  * @note Each data block payload must be at least the size of a
   * system memory page and must be aligned on a system memory page
   * size boundary
   */
@@ -1927,6 +1929,8 @@ protected:
   ACE_WIN32_Asynch_Write_Dgram (void);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 #include /**/ "ace/post.h"
 #endif /* ACE_WIN32_ASYNCH_IO_H */
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index 56bd9ceb779..7ace0d987b0 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -12,6 +12,8 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_WIN32_Wakeup_Completion
  *
@@ -19,7 +21,7 @@
  * ACE_Proactor interface to wake up all the threads blocking
  * for completions.
  */
-class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result
+class ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result
 {
 
 public:
@@ -85,11 +87,7 @@ ACE_WIN32_Proactor::close (void)
         {
           ACE_OVERLAPPED *overlapped = 0;
           u_long bytes_transferred = 0;
-#if defined (ACE_WIN64)
           ULONG_PTR completion_key = 0;
-#else
-          ULONG completion_key = 0;
-#endif /* ACE_WIN64 */
 
           // Get the next asynchronous operation that completes
           BOOL res = ::GetQueuedCompletionStatus
@@ -120,11 +118,7 @@ int
 ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
                                      const void *completion_key)
 {
-#if defined (ACE_WIN64)
   ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
-#else
-  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
-#endif /* ACE_WIN64 */
 
   // No locking is needed here as no state changes.
   ACE_HANDLE cp = ::CreateIoCompletionPort (handle,
@@ -568,11 +562,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
 {
   ACE_OVERLAPPED *overlapped = 0;
   u_long bytes_transferred = 0;
-#if defined (ACE_WIN64)
-          ULONG_PTR completion_key = 0;
-#else
-          ULONG completion_key = 0;
-#endif /* ACE_WIN64 */
+  ULONG_PTR completion_key = 0;
 
   // Get the next asynchronous operation that completes
   BOOL result = ::GetQueuedCompletionStatus (this->completion_port_,
@@ -685,11 +675,8 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
       bytes_transferred = static_cast<DWORD> (result->bytes_transferred ());
       completion_key = result->completion_key();
     }
-#if defined (ACE_WIN64)
+
   ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
-#else
-  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
-#endif /* ACE_WIN64 */
 
   // Post a completion
   if (::PostQueuedCompletionStatus (this->completion_port_, // completion port
@@ -710,7 +697,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
     }
 
   // If Proactor event is valid, signal it
-  if (handle != ACE_INVALID_HANDLE 
+  if (handle != ACE_INVALID_HANDLE
       && handle != 0)
     ACE_OS::event_signal (&handle);
 
@@ -812,4 +799,6 @@ ACE_WIN32_Wakeup_Completion::complete (size_t       /* bytes_transferred */,
     handler->handle_wakeup ();
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index 27d78888459..fc4fd7312de 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -34,6 +34,8 @@
 #include "ace/Asynch_Pseudo_Task.h"
 #include "ace/Auto_Event.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_WIN32_Asynch_Result;
 class ACE_WIN32_Proactor_Timer_Handler;
@@ -65,7 +67,7 @@ public:
   /// This method adds the @a handle to the I/O completion port. This
   /// function is a no-op function for Unix systems.
   virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key);
+                               const void *completion_key);
 
   /**
    * Dispatch a single set of events.  If @a wait_time elapses before
@@ -235,7 +237,7 @@ protected:
 
   /// Called when object is removed from the ACE_Reactor.
   virtual int handle_close (ACE_HANDLE handle,
-			    ACE_Reactor_Mask close_mask);
+                            ACE_Reactor_Mask close_mask);
 
   /**
    * Dispatch a single set of events.  If @a milli_seconds elapses
@@ -247,9 +249,9 @@ protected:
   /// Protect against structured exceptions caused by user code when
   /// dispatching handles.
   void application_specific_code (ACE_WIN32_Asynch_Result *asynch_result,
-				  size_t bytes_transferred,
-				  const void *completion_key,
-				  u_long error);
+                                  size_t bytes_transferred,
+                                  const void *completion_key,
+                                  u_long error);
 
   /**
    * Post @a how_many completions to the completion port so that all
@@ -291,7 +293,7 @@ protected:
  * called, the <handler>'s handle_timeout method will be
  * called.
  */
-class ACE_Export ACE_WIN32_Asynch_Timer : public ACE_WIN32_Asynch_Result
+class ACE_WIN32_Asynch_Timer : public ACE_WIN32_Asynch_Result
 {
   /// The factory method for this class is with the POSIX_Proactor
   /// class.
@@ -316,6 +318,8 @@ protected:
   ACE_Time_Value time_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_WIN32 */
 #include /**/ "ace/post.h"
 #endif /* ACE_PROACTOR_H */
diff --git a/ace/XML_Svc_Conf.cpp b/ace/XML_Svc_Conf.cpp
index 76300b641d7..b81c9162076 100644
--- a/ace/XML_Svc_Conf.cpp
+++ b/ace/XML_Svc_Conf.cpp
@@ -3,7 +3,13 @@
 #include "ace/XML_Svc_Conf.h"
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 0)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
diff --git a/ace/XML_Svc_Conf.h b/ace/XML_Svc_Conf.h
index c05e63babfd..a91594b6075 100644
--- a/ace/XML_Svc_Conf.h
+++ b/ace/XML_Svc_Conf.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,6 +23,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if (ACE_USES_CLASSIC_SVC_CONF==0)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_XML_Svc_Conf
  *
@@ -52,6 +55,9 @@ public:
 
   virtual int parse_string (const ACE_TCHAR str[]) = 0;
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
 
 #include /**/ "ace/post.h"
diff --git a/ace/XTI_ATM_Mcast.cpp b/ace/XTI_ATM_Mcast.cpp
index a4524e248f9..854e2a36489 100644
--- a/ace/XTI_ATM_Mcast.cpp
+++ b/ace/XTI_ATM_Mcast.cpp
@@ -1,4 +1,3 @@
-// XTI_ATM_Mcast.cpp
 // $Id$
 
 #include "ace/XTI_ATM_Mcast.h"
@@ -11,6 +10,8 @@ ACE_RCSID(ace, XTI_ATM_Mcast, "$Id$")
 #include "ace/XTI_ATM_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast)
 
 void
@@ -30,8 +31,8 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void)
 
 int
 ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream &current_stream,
-			     const ACE_Addr &remote_sap,
-			     ACE_INT32 leaf_id,
+                             const ACE_Addr &remote_sap,
+                             ACE_INT32 leaf_id,
                              ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_XTI_ATM_Mcast::add_leaf");
@@ -48,8 +49,7 @@ ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream &current_stream,
       // Check for asynchronous event
       if (t_errno == TLOOK)
         {
-          int event;
-          event = ACE_OS::t_look(current_stream.get_handle());
+          int const event = ACE_OS::t_look(current_stream.get_handle());
           if (event != TNODATA && event != T_DATA)
             return -1;
           else
@@ -65,4 +65,6 @@ ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream &current_stream,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_XTI_ATM */
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index ea2ba46739f..357af246784 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "ace/TLI_Connector.h"
 #include "ace/ATM_Addr.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_XTI_ATM_Mcast
  *
@@ -122,10 +124,14 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/XTI_ATM_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_XTI_ATM */
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_XTI_ATM_MCAST_H */
diff --git a/ace/XTI_ATM_Mcast.inl b/ace/XTI_ATM_Mcast.inl
index 895f37f30ff..b062f8423b2 100644
--- a/ace/XTI_ATM_Mcast.inl
+++ b/ace/XTI_ATM_Mcast.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// XTI_ATM_Mcast.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
@@ -60,3 +61,5 @@ ACE_XTI_ATM_Mcast::connect (ACE_TLI_Stream &new_stream,
                                     udata,
                                     opt);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 6fb2c898ba3..ab4612c9472 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -7,13 +7,15 @@
 
 ACE_RCSID(ace, XtReactor, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
 
 // Must be called with lock held
 ACE_XtReactor::ACE_XtReactor (XtAppContext context,
-			      size_t size,
-			      int restart,
-			      ACE_Sig_Handler *h)
+                              size_t size,
+                              int restart,
+                              ACE_Sig_Handler *h)
   : ACE_Select_Reactor (size, restart, h),
     context_ (context),
     ids_ (0),
@@ -53,7 +55,7 @@ ACE_XtReactor::~ACE_XtReactor (void)
 
 int
 ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-					 ACE_Time_Value *max_wait_time)
+                                         ACE_Time_Value *max_wait_time)
 {
   ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events");
   int nfound;
@@ -67,8 +69,8 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
       handle_set.wr_mask_ = this->wait_set_.wr_mask_;
       handle_set.ex_mask_ = this->wait_set_.ex_mask_;
       nfound = XtWaitForMultipleEvents (width,
-					handle_set,
-					max_wait_time);
+                                        handle_set,
+                                        max_wait_time);
 
     } while (nfound == -1 && this->handle_error () > 0);
 
@@ -101,8 +103,8 @@ ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId * /* id */)
 
 void
 ACE_XtReactor::InputCallbackProc (XtPointer closure,
-				  int *source,
-				  XtInputId *)
+                                  int *source,
+                                  XtInputId *)
 {
   ACE_XtReactor *self = (ACE_XtReactor *) closure;
   ACE_HANDLE handle = (ACE_HANDLE) *source;
@@ -123,9 +125,9 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure,
     wait_set.ex_mask_.set_bit (handle);
 
   int result = ACE_OS::select (*source + 1,
-			       wait_set.rd_mask_,
-			       wait_set.wr_mask_,
-			       wait_set.ex_mask_, &zero);
+                               wait_set.rd_mask_,
+                               wait_set.wr_mask_,
+                               wait_set.ex_mask_, &zero);
 
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
@@ -133,11 +135,11 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure,
   if (result > 0)
     {
       if (wait_set.rd_mask_.is_set (handle))
-	dispatch_set.rd_mask_.set_bit (handle);
+        dispatch_set.rd_mask_.set_bit (handle);
       if (wait_set.wr_mask_.is_set (handle))
-	dispatch_set.wr_mask_.set_bit (handle);
+        dispatch_set.wr_mask_.set_bit (handle);
       if (wait_set.ex_mask_.is_set (handle))
-	dispatch_set.ex_mask_.set_bit (handle);
+        dispatch_set.ex_mask_.set_bit (handle);
 
       self->dispatch (1, dispatch_set);
     }
@@ -145,8 +147,8 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure,
 
 int
 ACE_XtReactor::XtWaitForMultipleEvents (int width,
-					ACE_Select_Reactor_Handle_Set &wait_set,
-					ACE_Time_Value *)
+                                        ACE_Select_Reactor_Handle_Set &wait_set,
+                                        ACE_Time_Value *)
 {
   // Make sure we have a valid context
   ACE_ASSERT (this->context_ != 0);
@@ -155,10 +157,10 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width,
   ACE_Select_Reactor_Handle_Set temp_set = wait_set;
 
   if (ACE_OS::select (width,
-		      temp_set.rd_mask_,
-		      temp_set.wr_mask_,
-		      temp_set.ex_mask_,
-		      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+                      temp_set.rd_mask_,
+                      temp_set.wr_mask_,
+                      temp_set.ex_mask_,
+                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
     return -1; // Bad file arguments...
 
   // Instead of waiting using <select>, just use the Xt mechanism to
@@ -173,10 +175,10 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width,
   // Now actually read the result needed by the <Select_Reactor> using
   // <select>.
   return ACE_OS::select (width,
-			 wait_set.rd_mask_,
-			 wait_set.wr_mask_,
-			 wait_set.ex_mask_,
-			 (ACE_Time_Value *) &ACE_Time_Value::zero);
+                         wait_set.rd_mask_,
+                         wait_set.wr_mask_,
+                         wait_set.ex_mask_,
+                         (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
 XtAppContext
@@ -193,8 +195,8 @@ ACE_XtReactor::context (XtAppContext context)
 
 int
 ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_XtReactor::register_handler_i");
 
@@ -263,10 +265,10 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
       XtID->next_ = this->ids_;
       XtID->handle_ = handle;
       XtID->id_ = ::XtAppAddInput (this->context_,
-				  (int) handle,
-				  (XtPointer) condition,
-				  InputCallbackProc,
-				  (XtPointer) this);
+                                  (int) handle,
+                                  (XtPointer) condition,
+                                  InputCallbackProc,
+                                  (XtPointer) this);
       this->ids_ = XtID;
     }
   return 0;
@@ -274,8 +276,8 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
 
 int
 ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
+                                   ACE_Event_Handler *handler,
+                                   ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::register_handler_i (handles,
                                                  handler,
@@ -284,7 +286,7 @@ ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
 
 int
 ACE_XtReactor::remove_handler_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_XtReactor::remove_handler_i");
 
@@ -339,10 +341,10 @@ ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
 
 int
 ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles,
-				 ACE_Reactor_Mask mask)
+                                 ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::remove_handler_i (handles,
-					       mask);
+                                               mask);
 }
 
 // The following functions ensure that there is an Xt timeout for the
@@ -376,7 +378,7 @@ ACE_XtReactor::reset_timer_interval
   ACE_TRACE ("ACE_XtReactor::reset_timer_interval");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
 
-  int result = ACE_Select_Reactor::timer_queue_->reset_interval
+  int const result = ACE_Select_Reactor::timer_queue_->reset_interval
     (timer_id,
      interval);
 
@@ -393,15 +395,15 @@ long
 ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler,
                 const void *arg,
                 const ACE_Time_Value &delay,
-			       const ACE_Time_Value &interval)
+                               const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_XtReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
 
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
+  long const result = ACE_Select_Reactor::schedule_timer (event_handler,
+                                                          arg,
+                                                          delay,
+                                                          interval);
   if (result == -1)
     return -1;
   else
@@ -413,12 +415,12 @@ ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler,
 
 int
 ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
-			     int dont_call_handle_close)
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (handler,
-					dont_call_handle_close) == -1)
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -429,14 +431,14 @@ ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
 
 int
 ACE_XtReactor::cancel_timer (long timer_id,
-			     const void **arg,
-			     int dont_call_handle_close)
+                             const void **arg,
+                             int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (timer_id,
-					arg,
-					dont_call_handle_close) == -1)
+                                        arg,
+                                        dont_call_handle_close) == -1)
     return -1;
   else
     {
@@ -445,3 +447,4 @@ ACE_XtReactor::cancel_timer (long timer_id,
     }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index e51fc87722e..fdd0ccae273 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author Eric C. Newton's <ecn@clark.net>
+ *  @author Eric C. Newton <ecn@clark.net>
  *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -29,6 +29,8 @@
 #include /**/ <X11/Intrinsic.h>
 //#undef String
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_XtReactorID
  *
@@ -131,5 +133,8 @@ private:
   ACE_XtReactor &operator = (const ACE_XtReactor &);
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
+
 #endif /* ACE_XTREACTOR_H */
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 0f5930d7149..2df2829bd3a 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -1,21 +1,12 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, pkgconfig {
+project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig {
   avoids       = ace_for_tao
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
 
-  // Old OS files.  put these back and remove the OS_NS*, Cleanup.cpp, and
-  // Object_Manager_Base.cpp to improve compile times at the cost of
-  // footprint. dhinton
-  //OS.cpp
-  //OS_Dirent.cpp
-  //OS_Memory.cpp
-  //OS_String.cpp
-  //Synch.cpp
-
   Source_Files(ACE_COMPONENTS) {
     ACE.cpp
     ACE_crc_ccitt.cpp
@@ -24,7 +15,9 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Active_Map_Manager.cpp
     Addr.cpp
     Arg_Shifter.cpp
+    ARGV.cpp
     Argv_Type_Converter.cpp
+    Assert.cpp
     Asynch_IO.cpp
     Asynch_IO_Impl.cpp
     Asynch_Pseudo_Task.cpp
@@ -54,10 +47,9 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Configuration.cpp
     Configuration_Import_Export.cpp
     Connection_Recycling_Strategy.cpp
-    Container_Instantiations.cpp
     Containers.cpp
-    Countdown_Time.cpp
     Copy_Disabled.cpp
+    Countdown_Time.cpp
     Date_Time.cpp
     DEV.cpp
     DEV_Addr.cpp
@@ -88,7 +80,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     gethrtime.cpp
     Handle_Ops.cpp
     Handle_Set.cpp
-    Hash_Map_Manager.cpp
     Hashable.cpp
     High_Res_Timer.cpp
     ICMP_Socket.cpp
@@ -117,7 +108,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     LSOCK_Stream.cpp
     Malloc.cpp
     Malloc_Allocator.cpp
-    Malloc_Instantiations.cpp
     Manual_Event.cpp
     MEM_Acceptor.cpp
     MEM_Addr.cpp
@@ -129,7 +119,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Message_Block.cpp
     Message_Queue.cpp
     Method_Request.cpp
-    Metrics_Cache.cpp
     MMAP_Memory_Pool.cpp
     Msg_WFMO_Reactor.cpp
     Multihomed_INET_Addr.cpp
@@ -138,7 +127,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Obchunk.cpp
     Object_Manager.cpp
     Object_Manager_Base.cpp
-    Obstack.cpp
     OS_Errno.cpp
     OS_Log_Msg_Attributes.cpp
     OS_main.cpp
@@ -163,6 +151,7 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     OS_NS_sys_msg.cpp
     OS_NS_sys_resource.cpp
     OS_NS_sys_select.cpp
+    OS_NS_sys_sendfile.cpp
     OS_NS_sys_shm.cpp
     OS_NS_sys_socket.cpp
     OS_NS_sys_stat.cpp
@@ -208,7 +197,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Sample_History.cpp
     Sbrk_Memory_Pool.cpp
     Sched_Params.cpp
-    Select_Reactor.cpp
     Select_Reactor_Base.cpp
     Semaphore.cpp
     Shared_Memory.cpp
@@ -345,7 +333,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     TSS_T.cpp
     Task_Ex_T.cpp
     Task_T.cpp
-    Template_Instantiations.cpp
     Test_and_Set.cpp
     Timeprobe_T.cpp
     Timer_Hash_T.cpp
@@ -367,9 +354,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Guard_T.inl
     Handle_Gobbler.inl
     Lock_Adapter_T.inl
-    OS.inl
-    OS_Memory.inl
-    OS_String.inl
     Refcounted_Auto_Ptr.inl
     Reverse_Lock_T.inl
     Swap.inl
@@ -387,6 +371,7 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Exception_Macros.h
     Global_Macros.h
     Guard_T.h
+    Hash_Map_Manager.h
     Handle_Gobbler.h
     If_Then_Else.h
     IO_Cntl_Msg.h
@@ -423,14 +408,17 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     Synch_Traits.h
     TSS_T.h
     Timer_Queuefwd.h
+    Truncate.h
     UPIPE_Addr.h
     Value_Ptr.h
     Version.h
+    Versioned_Namespace.h
     ace_wchar.h
     config-WinCE.h
     config-all.h
     config-borland-common.h
     config-lite.h
+    config-macros.h
     config-minimal.h
     config-win32-borland.h
     config-win32-common.h
diff --git a/ace/ace.mwc b/ace/ace.mwc
index dadb95c37fd..60eecba03e4 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -1,13 +1,10 @@
 //  -*- MPC -*-
+//
 // $Id$
 
 workspace {
   ace.mpc
   ace_for_tao.mpc
-  ace_memory_for_tao.mpc
-  ace_reactor_for_tao.mpc
-  ace_sockets_for_tao.mpc
-  ace_threads_for_tao.mpc
   ace_flreactor.mpc
   ace_qtreactor.mpc
   ace_tkreactor.mpc
diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc
index 580aab1a4d9..1e7a3704833 100644
--- a/ace/ace_for_tao.mpc
+++ b/ace/ace_for_tao.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
+project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig {
   requires     = ace_for_tao
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE_FOR_TAO
@@ -14,10 +14,14 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     Addr.cpp
     Arg_Shifter.cpp
     Argv_Type_Converter.cpp
+    Assert.cpp
     Atomic_Op.cpp
     Auto_Event.cpp
+    Barrier.cpp             // Required by orbsvcs/tests/Notify/lib
     Base_Thread_Adapter.cpp
+    Basic_Stats.cpp         // Required by ace/Stats
     Basic_Types.cpp
+    Capabilities.cpp        // Required by TAO/orbsvcs/examples/ImR/Advanced
     CDR_Base.cpp
     CDR_Stream.cpp
     CDR_Size.cpp
@@ -29,10 +33,14 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     Condition_Thread_Mutex.cpp
     Countdown_Time.cpp
     Copy_Disabled.cpp
+    Dirent.cpp // Required by TAO_IDL
+    Dirent_Selector.cpp
     Dump.cpp
     Dynamic.cpp
     Event.cpp
     Event_Handler.cpp
+    FILE.cpp
+    FILE_Addr.cpp
     Flag_Manip.cpp
     Framework_Component.cpp
     Functor.cpp
@@ -41,6 +49,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     Handle_Ops.cpp
     Handle_Set.cpp
     Hashable.cpp
+    High_Res_Timer.cpp  // Required by orbsvcs/tests/Notify/lib
     INET_Addr.cpp
     Init_ACE.cpp
     IO_SAP.cpp
@@ -68,7 +77,6 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     Obchunk.cpp
     Object_Manager.cpp
     Object_Manager_Base.cpp
-    Obstack.cpp
     OS_Errno.cpp
     OS_Log_Msg_Attributes.cpp
     OS_main.cpp
@@ -109,6 +117,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     OS_TLI.cpp
     Parse_Node.cpp
     Pipe.cpp
+    Process.cpp
     Reactor.cpp
     Reactor_Impl.cpp
     Reactor_Notification_Strategy.cpp
@@ -119,7 +128,6 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     RW_Mutex.cpp
     RW_Thread_Mutex.cpp
     Sched_Params.cpp
-    Select_Reactor.cpp
     Select_Reactor_Base.cpp
     Signal.cpp
     SOCK.cpp
@@ -127,9 +135,16 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     Sock_Connect.cpp
     SOCK_Connector.cpp
     SOCK_Dgram.cpp
+    SOCK_Dgram_Mcast.cpp
     SOCK_IO.cpp
     SOCK_Stream.cpp
+    SPIPE.cpp
+    SPIPE_Acceptor.cpp
+    SPIPE_Connector.cpp
+    SPIPE_Addr.cpp
+    SPIPE_Stream.cpp
     SString.cpp
+    Stats.cpp            // Required by orbsvcs/tests/Notify
     String_Base_Const.cpp
     Synch_Options.cpp
     Task.cpp
@@ -158,10 +173,13 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
     }
 
     // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(vc6,vc71,vc8,bmake) {
+    conditional(vc6,vc71,vc8,nmake,bmake) {
+      ACE_crc32.cpp  // Required by SV_Semaphore_Simple
       Semaphore.cpp
       Process_Mutex.cpp
       WFMO_Reactor.cpp
+      SV_Semaphore_Simple.cpp
+      SV_Semaphore_Complex.cpp
     }
   }
 
diff --git a/ace/ace_memory_for_tao.mpc b/ace/ace_memory_for_tao.mpc
deleted file mode 100644
index 9d85e39e1e1..00000000000
--- a/ace/ace_memory_for_tao.mpc
+++ /dev/null
@@ -1,75 +0,0 @@
-//  -*- MPC -*-
-//
-// $Id$
-
-project(ACE_Memory_FOR_TAO) : acedefaults, core, pkgconfig, ace_for_tao, acethreadslib_for_tao {
-
-  requires     = ace_for_tao
-  libout       = $(ACE_ROOT)/lib
-  sharedname   = ACE_Memory_FOR_TAO
-  dynamicflags = ACE_MEMORY_BUILD_DLL
-
-  Source_Files(ACE_COMPONENTS) {
-    Based_Pointer_Repository.cpp
-    MEM_Acceptor.cpp
-    MEM_Addr.cpp
-    MEM_Connector.cpp
-    MEM_IO.cpp          // Requires ACE_Process_{Mutex,Semaphore}
-    MEM_SAP.cpp
-    MEM_Stream.cpp
-    MMAP_Memory_Pool.cpp
-    Mem_Map.cpp
-    PI_Malloc.cpp
-    Pagefile_Memory_Pool.cpp
-    SV_Shared_Memory.cpp
-    Sbrk_Memory_Pool.cpp
-    Shared_Memory.cpp
-    Shared_Memory_MM.cpp
-    Shared_Memory_Pool.cpp
-    Shared_Memory_SV.cpp
-  }
-
-  Inline_Files {
-    Based_Pointer_Repository.inl
-    MEM_Acceptor.inl
-    MEM_Addr.inl
-    MEM_Connector.inl
-    MEM_IO.inl
-    MEM_SAP.inl
-    MEM_Stream.inl
-    MMAP_Memory_Pool.inl
-    Mem_Map.inl
-    PI_Malloc.inl
-    Pagefile_Memory_Pool.inl
-    SV_Shared_Memory.inl
-    Sbrk_Memory_Pool.inl
-    Shared_Memory.inl
-    Shared_Memory_MM.inl
-    Shared_Memory_Pool.inl
-    Shared_Memory_SV.inl
-  }
-
-  Header_Files {
-    Based_Pointer_Repository.h
-    MEM_Acceptor.h
-    MEM_Addr.h
-    MEM_Connector.h
-    MEM_IO.h
-    MEM_SAP.h
-    MEM_Stream.h
-    MMAP_Memory_Pool.h
-    Mem_Map.h
-    PI_Malloc.h
-    Pagefile_Memory_Pool.h
-    SV_Shared_Memory.h
-    Sbrk_Memory_Pool.h
-    Shared_Memory.h
-    Shared_Memory_MM.h
-    Shared_Memory_Pool.h
-    Shared_Memory_SV.h
-  }
-
-  Pkgconfig_Files {
-     ACE_Memory_FOR_TAO.pc.in
-  }
-}
diff --git a/ace/ace_reactor_for_tao.mpc b/ace/ace_reactor_for_tao.mpc
deleted file mode 100644
index a4dfcad0260..00000000000
--- a/ace/ace_reactor_for_tao.mpc
+++ /dev/null
@@ -1,30 +0,0 @@
-//  -*- MPC -*-
-//
-// $Id$
-
-project(ACE_Reactor_FOR_TAO) : acedefaults, core, pkgconfig, ace_for_tao {
-
-  requires     = ace_for_tao
-  libout       = $(ACE_ROOT)/lib
-  sharedname   = ACE_Reactor_FOR_TAO
-  dynamicflags = ACE_REACTOR_BUILD_DLL
-
-  Source_Files(ACE_COMPONENTS) {
-    Msg_WFMO_Reactor.cpp
-    Priority_Reactor.cpp
-  }
-
-  Inline_Files {
-    Msg_WFMO_Reactor.inl
-    Priority_Reactor.inl
-  }
-
-  Header_Files {
-    Msg_WFMO_Reactor.h
-    Priority_Reactor.h
-  }
-
-  Pkgconfig_Files {
-     ACE_Reactor_FOR_TAO.pc.in
-  }
-}
diff --git a/ace/ace_sockets_for_tao.mpc b/ace/ace_sockets_for_tao.mpc
deleted file mode 100644
index 991138c0361..00000000000
--- a/ace/ace_sockets_for_tao.mpc
+++ /dev/null
@@ -1,63 +0,0 @@
-//  -*- MPC -*-
-//
-// $Id$
-
-project(ACE_Sockets_FOR_TAO) : acedefaults, core, pkgconfig, ace_for_tao {
-
-  requires     = ace_for_tao
-  libout       = $(ACE_ROOT)/lib
-  sharedname   = ACE_Sockets_FOR_TAO
-  dynamicflags = ACE_SOCKETS_BUILD_DLL
-
-  Source_Files(ACE_COMPONENTS) {
-    LSOCK.cpp
-    LSOCK_Acceptor.cpp
-    LSOCK_CODgram.cpp
-    LSOCK_Connector.cpp
-    LSOCK_Dgram.cpp
-    LSOCK_Stream.cpp
-    Multihomed_INET_Addr.cpp
-    SOCK_CODgram.cpp
-    SOCK_Dgram_Bcast.cpp
-    SOCK_Dgram_Mcast.cpp
-    SOCK_SEQPACK_Acceptor.cpp
-    SOCK_SEQPACK_Association.cpp
-    SOCK_SEQPACK_Connector.cpp
-  }
-
-  Inline_Files {
-    LSOCK.inl
-    LSOCK_Acceptor.inl
-    LSOCK_CODgram.inl
-    LSOCK_Connector.inl
-    LSOCK_Dgram.inl
-    LSOCK_Stream.inl
-    Multihomed_INET_Addr.inl
-    SOCK_CODgram.inl
-    SOCK_Dgram_Bcast.inl
-    SOCK_Dgram_Mcast.inl
-    SOCK_SEQPACK_Acceptor.inl
-    SOCK_SEQPACK_Association.inl
-    SOCK_SEQPACK_Connector.inl
-  }
-
-  Header_Files {
-    LSOCK.h
-    LSOCK_Acceptor.h
-    LSOCK_CODgram.h
-    LSOCK_Connector.h
-    LSOCK_Dgram.h
-    LSOCK_Stream.h
-    Multihomed_INET_Addr.h
-    SOCK_CODgram.h
-    SOCK_Dgram_Bcast.h
-    SOCK_Dgram_Mcast.h
-    SOCK_SEQPACK_Acceptor.h
-    SOCK_SEQPACK_Association.h
-    SOCK_SEQPACK_Connector.h
-  }
-
-  Pkgconfig_Files {
-     ACE_Sockets_FOR_TAO.pc.in
-  }
-}
diff --git a/ace/ace_threads_for_tao.mpc b/ace/ace_threads_for_tao.mpc
deleted file mode 100644
index 5ebb279bcbf..00000000000
--- a/ace/ace_threads_for_tao.mpc
+++ /dev/null
@@ -1,69 +0,0 @@
-//  -*- MPC -*-
-//
-// $Id$
-
-project(ACE_Threads_FOR_TAO) : acedefaults, core, pkgconfig, ace_for_tao {
-
-  requires     = ace_for_tao
-  libout       = $(ACE_ROOT)/lib
-  sharedname   = ACE_Threads_FOR_TAO
-  dynamicflags = ACE_THREADS_BUILD_DLL
-
-  Source_Files(ACE_COMPONENTS) {
-    Activation_Queue.cpp
-    Barrier.cpp
-    File_Lock.cpp
-    Method_Request.cpp
-    Process.cpp
-    Process_Manager.cpp
-    Process_Semaphore.cpp
-    RW_Process_Mutex.cpp
-    Thread_Semaphore.cpp
-
-    // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(!vc6,!vc71,!vc8,!bmake) {
-      Semaphore.cpp
-      Process_Mutex.cpp
-    }
-  }
-
-  Inline_Files {
-    Activation_Queue.inl
-    Barrier.inl
-    File_Lock.inl
-    Method_Request.inl
-    Process.inl
-    Process_Manager.inl
-    Process_Semaphore.inl
-    RW_Process_Mutex.inl
-    Thread_Semaphore.inl
-
-    // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(!vc6,!vc71,!vc8,!bmake) {
-      Semaphore.inl
-      Process_Mutex.inl
-    }
-  }
-
-  Header_Files {
-    Activation_Queue.h
-    Barrier.h
-    File_Lock.h
-    Method_Request.h
-    Process.h
-    Process_Manager.h
-    Process_Semaphore.h
-    RW_Process_Mutex.h
-    Thread_Semaphore.h
-
-    // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(!vc6,!vc71,!vc8,!bmake) {
-      Semaphore.h
-      Process_Mutex.h
-    }
-  }
-
-  Pkgconfig_Files {
-     ACE_Threads_FOR_TAO.pc.in
-  }
-}
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h
index 32cfaafc838..740100eb671 100644
--- a/ace/ace_wchar.h
+++ b/ace/ace_wchar.h
@@ -107,7 +107,6 @@ using std::size_t;
 
 #endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */
 
-// ACE_TCHAR Macros
 #if defined (ACE_USES_WCHAR)
   typedef wchar_t ACE_TCHAR;
   typedef char ACE_ANTI_TCHAR;
@@ -119,9 +118,9 @@ using std::size_t;
 #endif /* ACE_USES_WCHAR */
 
 #if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  // Via compiler, sys headers, config-platform.h, 
+  // Via compiler, sys headers, config-platform.h,
   // or this header we have a wchar_t
-  #define ACE_HAS_WCHAR 
+  #define ACE_HAS_WCHAR
   #undef ACE_LACKS_WCHAR_T
   // The wchar type is simpley wchar_t
   #define ACE_WCHAR_T wchar_t
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index e7611412a77..2b06b24ee43 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -69,22 +69,13 @@
 
 #define ACE_USES_WINCE_SEMA_SIMULATION
 
-#define ACE_LACKS_IOSTREAM_TOTALLY
-#define ACE_LACKS_ACE_IOSTREAM
-#define ACE_LACKS_AUTO_PTR
-
-#if defined (ACE_HAS_STRICT)
-# undef ACE_HAS_STRICT
-#endif  // ACE_HAS_STRICT
-#define ACE_HAS_STRICT 1
-
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
 // FILE stuff isn't always defined in CE
-#ifndef _FILE_DEFINED
+#if (_MSC_VER < 1400) && !defined (_FILE_DEFINED)
   typedef void FILE;
 # define _FILE_DEFINED
-#endif  // _FILE_DEFINED
+#endif  /* _MSC_VER < 1400 && !_FILE_DEFINED */
 
 // This was defined in previous versions of CE, but not 2.11
 #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION
@@ -173,6 +164,9 @@
 #define ACE_LACKS_SOCKET_BUFSIZ
 #define ACE_LACKS_ISATTY
 #define ACE_LACKS_STRERROR
+#define ACE_LACKS_SYSTEM
+#define ACE_LACKS_SIGACTION
+#define ACE_LACKS_PIPE
 
 #define ACE_LACKS_CUSERID
 #define ACE_LACKS_CHDIR
@@ -182,6 +176,8 @@
 #define ACE_LACKS_READLINK
 #define ACE_LACKS_SWAB
 #define ACE_LACKS_TEMPNAM
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETPROTOBYNAME
 
 #if defined (_WIN32_WCE_EMULATION)
 // @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl)
@@ -189,36 +185,19 @@
 # define ACE_LACKS_QSORT
 #endif  // _WIN32_WCE_EMULATION
 
-// @@ Followings are used to keep existing programs happy.
-
-#define ostream FILE
-# if !defined (BUFSIZ)
+#if !defined (BUFSIZ)
 #  define BUFSIZ 1024
-#endif  // BUFSIZ
+#endif
 
 typedef void (__cdecl * __sighandler_t)(int); // keep Signal compilation happy
 typedef long off_t;
 
 #define ACE_LACKS_MALLOC_H      // We do have malloc.h, but don't use it.
 
-//#if (UNDER_CE < 300)  // from prior ACE porting effort; left for future reference
-//#define ACE_LACKS_STRPBRK
-//#define ACE_LACKS_STRSPN
-//#define ACE_LACKS_STRTOD
-//#define ACE_LACKS_STRTOL
-//#define ACE_LACKS_STRTOUL
-//#endif // UNDER_CE < 300
-
 #define ACE_HAS_WINCE_BROKEN_ERRNO
 
 #define ACE_HAS_STRDUP_EMULATION
 
-// CE doesn't have <sys/types.h> instead <types.h>
-#define ACE_HAS_FLAT_TYPES_H
-
-// @@ This needs to be defined and initialized as a static. (Singleton?)
-#define ACE_DEFAULT_LOG_STREAM 0
-
 // WinCE can't do fixed addresses for memory-mapped files.
 #if defined (ACE_DEFAULT_BASE_ADDR)
 #  undef ACE_DEFAULT_BASE_ADDR
@@ -227,9 +206,8 @@ typedef long off_t;
 
 #define ACE_HAS_TSS_EMULATION
 
-// Not sure if this is true for all versions.  dhinton
+// This is still true up thru VC8...
 #define ACE_LACKS_ERRNO_H
-#define ACE_LACKS_TIME_H
 #define ACE_LACKS_SIGNAL_H
 #define ACE_LACKS_SYS_STAT_H
 
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 8d700706e7b..ad23c397ec6 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -54,12 +54,24 @@
 #  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 #    define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
 #    define ACE_HAS_TYPENAME_KEYWORD
+     // When using -qtempinc, we don't need to see template implementation
+     // source (though we do need a pragma to find the correct source file).
+     // However, without -qtempinc (either -qnotempinc or -qtemplateregistry)
+     // we do need to see the source.
+#    if defined (__TEMPINC__)
+#      if !defined ACE_TEMPLATES_REQUIRE_PRAGMA
+#        define ACE_TEMPLATES_REQUIRE_PRAGMA
+#      endif
+#    else
+#      if !defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#        define ACE_TEMPLATES_REQUIRE_SOURCE
+#      endif
+#    endif /* __TEMPINC__ */
+
 #    undef WIFEXITED
 #    undef WEXITSTATUS
+
 #    if (__IBMCPP__ >= 500)  /* Visual Age C++ 5 */
-#      if !defined (ACE_HAS_USING_KEYWORD)
-#        define ACE_HAS_USING_KEYWORD            1
-#      endif /* ACE_HAS_USING_KEYWORD */
 #      define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #    endif /* __IBMCPP__ >= 500 */
@@ -86,7 +98,9 @@
 # endif /* !ACE_MT_SAFE */
 
 #else  /* ! __xlC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-aix-4.x.h
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#    error unsupported compiler in ace/config-aix-4.x.h
+#  endif  /* __cplusplus */
 #endif /* ! __xlC__ && ! __GNUG__ */
 
 
@@ -168,6 +182,7 @@
 #define ACE_HAS_H_ERRNO
 
 #define ACE_LACKS_STDINT_H
+#define ACE_LACKS_SYS_SYSCTL_H
 
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
@@ -214,7 +229,7 @@
 #endif /* ACE_AIX_VERS >= 403 */
 
 #define ACE_HAS_SIGWAIT
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_STRBUF_T
 
 // Compiler supports stropts.h
diff --git a/ace/config-all.h b/ace/config-all.h
index dba2349c254..3763d81dc8f 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -23,23 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// ============================================================================
-// UNICODE macros (to be added later)
-// ============================================================================
-
-// Get the unicode (i.e. ACE_TCHAR) defines
-# include "ace/ace_wchar.h"
-
-# if defined (VXWORKS)
-#   if defined (ghs)
-    // GreenHills 1.8.8 needs the stdarg.h #include before the #include of
-    // vxWorks.h.
-    // Also, be sure that these #includes come _after_ the key_t typedef, and
-    // before the #include of time.h.
-#     include "ace/os_include/os_stdarg.h"
-#   endif /* ghs */
-# endif /* VXWORKS */
-
 // This is used to indicate that a platform doesn't support a
 // particular feature.
 #if defined ACE_HAS_VERBOSE_NOTSUP
diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h
index f53afcff76e..ab35738edca 100644
--- a/ace/config-borland-common.h
+++ b/ace/config-borland-common.h
@@ -56,14 +56,13 @@
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
 # define ACE_HAS_TYPENAME_KEYWORD 1
 # define ACE_HAS_USER_MODE_MASKS 1
-# define ACE_HAS_USING_KEYWORD 1
 # define ACE_LACKS_ACE_IOSTREAM 1
-# define ACE_LACKS_INLINE_ASSEMBLY 1
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_NATIVE_STRPTIME 1
 # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
 # define ACE_LACKS_PRAGMA_ONCE 1
-# define ACE_NEW_THROWS_EXCEPTIONS 1
+# define ACE_HAS_NEW_NOTHROW
+# define ACE_TEMPLATES_REQUIRE_SOURCE 1
 # define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
 # define ACE_UINT64_FORMAT_SPECIFIER_A "%Lu"
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 2081c84d0a2..5fa091bfff2 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -38,7 +38,9 @@
 # define ACE_LACKS_ACE_IOSTREAM  /* MVME lacks signed and unsigned char */
 # define ACE_LACKS_FLOATING_POINT
 #else  /* ! __GNUG__ && ! ghs */
-# error unsupported compiler for ACE on Chorus
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#   error unsupported compiler for ACE on Chorus
+#  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! ghs */
 
 // OS-specific configuration
@@ -88,6 +90,7 @@
 #define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_TSS_EMULATION
+#define ACE_LACKS_ALARM
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_FORK
 #define ACE_LACKS_GETHOSTENT
@@ -96,6 +99,14 @@
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
 #define ACE_LACKS_MEMORY_H
@@ -112,12 +123,18 @@
 #define ACE_LACKS_SIGSET
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYS_MSG_H
+#define ACE_LACKS_SYSTEM
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_UNAME
 #define ACE_LACKS_WRITEV
 #define ACE_LACKS_WAIT
 #define ACE_PAGE_SIZE 4096
+#define ACE_LACKS_KILL
+#define ACE_LACKS_SIGACTION
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETPROTOBYNAME
 
 // Chorus has syslog, but doesn't have setlogmask()
 #define ACE_LACKS_SETLOGMASK
diff --git a/ace/config-cray.h b/ace/config-cray.h
index e4c18486f09..4ebb1ad830a 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -46,8 +46,6 @@
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
-#define ACE_HAS_USING_KEYWORD
-
 #define ACE_HAS_SSIZE_T
 
 #define ACE_HAS_SYSV_IPC
@@ -87,7 +85,7 @@
 #define ACE_HAS_POSIX_NONBLOCK
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #define ACE_HAS_DIRENT
 
@@ -95,7 +93,7 @@
 
 #define ACE_HAS_IP_MULTICAST
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index d118b6bb3f6..f4549840c55 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -37,7 +37,6 @@
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
 #   define ACE_HAS_TYPENAME_KEYWORD
-#   define ACE_HAS_USING_KEYWORD
 
 #   define ACE_ENDLESS_LOOP \
       unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break;
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index db16c7e3d6c..32537d1375c 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -33,8 +33,6 @@
 #define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T
 #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE <CLASS, LOCK>;
 
-#define ACE_LACKS_SYSTIME_H
-
 #define ACE_HAS_SELECT_H
 
 #define ACE_LACKS_PRAGMA_ONCE
@@ -56,7 +54,9 @@
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 #else
-# error unsupported compiler in ace/config-cygwin32.h
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#   error unsupported compiler in ace/config-cygwin32.h
+#  endif  /* __cplusplus */
 #endif /* __GNUG__ */
 
 #define ACE_HAS_VOIDPTR_SOCKOPT 1
@@ -100,7 +100,7 @@
 #define ACE_HAS_BIG_FD_SET
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535
 
@@ -122,6 +122,7 @@
 
 #define ACE_HAS_DIRENT
 #define ACE_HAS_STRPTIME
+#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 
 #define ACE_LACKS_MKFIFO
 #define ACE_LACKS_SIGINFO_H
@@ -136,9 +137,10 @@
 #define ACE_LACKS_ITOW 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
-#define ACE_LACKS_READDIR_R
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_RWLOCK_T 1
+#define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_SYS_SYSCTL_H
 
 #define ACE_LACKS_FGETWS 1
 #define ACE_LACKS_FPUTWS 1
@@ -155,6 +157,8 @@
 
 #define ACE_HAS_POSIX_SEM
 
+#define ACE_HAS_P_READ_WRITE
+
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 
 // Cygwin DLL suffix is .dll
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index a12225b5dc6..4ac2079a768 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -38,7 +38,7 @@
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
@@ -167,7 +167,6 @@
 #define _DGUX_SOURCE
 // #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 #define ACE_HAS_UCONTEXT_T
-#define ACE_LACKS_SYSTIME_H
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_LACKS_MADVISE
 
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index ae662587d6b..67b028c3bf4 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -41,7 +41,7 @@
 //#define ACE_HAS_REENTRANT_FUNCTIONS
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
@@ -187,7 +187,6 @@
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #define ACE_HAS_UCONTEXT_T
-#define ACE_LACKS_SYSTIME_H
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_LACKS_MADVISE
 
diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h
index d60eb0d5955..bb80a9c2b87 100644
--- a/ace/config-doxygen.h
+++ b/ace/config-doxygen.h
@@ -16,7 +16,7 @@
 #define ACE_CONFIG_DOXYGEN_H
 
 /// Make sure that we always turn inlining on.
-#defind __ACE_INLINE__
+#define __ACE_INLINE__
 
 /// Make all the emulation versions of string operations visible
 // #define ACE_LACKS_WCSTOK
@@ -97,9 +97,6 @@
 /// Generate strptime documentation
 #define ACE_HAS_STRPTIME
 
-/// Doxygen is capable of parsing using
-#define ACE_HAS_USING_KEYWORD
-
 /// Generate icmp documentation
 #define ACE_HAS_ICMP_SUPPORT 1
 
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index fd1afe17751..e4bd5543a7c 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -103,15 +103,15 @@ extern "C" { char * cuserid (char *s); }
 // Platform defines struct timespec but not timespec_t
 #define ACE_LACKS_TIMESPEC_T
 
-#define ACE_LACKS_SYSTIME_H
-
 #if (__FreeBSD_version < 501000)
 #define ACE_LACKS_STDINT_H
 #endif
 
+#define ACE_HAS_SYSCTL
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 0428cf5f65f..0886e0442a0 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -16,7 +16,6 @@
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
-#define ACE_HAS_USING_KEYWORD
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #define ACE_TEMPLATES_REQUIRE_SOURCE
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 32c62e416a6..2003350903b 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -98,10 +98,6 @@
 // Compiler supports the 'typename' qualifier.
 #  define ACE_HAS_TYPENAME_KEYWORD
 
-// This is legit for A.01.12 and probably at least as far back as A.01.07.
-// Before that, not sure.  But you shouldn't be there anyway ;-)
-#  define ACE_HAS_USING_KEYWORD
-
 // Platform lacks streambuf "linebuffered ()".
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index b67a98b60ae..7c6e7f00de9 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -145,6 +145,10 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 #define ACE_DLL_SUFFIX      ".sl"
 #define ACE_LD_SEARCH_PATH  "SHLIB_PATH"
 
+// lacks setegid and seteuid
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETEUID
+
 //////////////////////////////////////////////////////////////////////////
 //
 // STREAMS information
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index ddc86e1ae7c..c40ada25f69 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -114,18 +114,16 @@
 // used as formal arguments to a template class.
 #    define ACE_HAS_TEMPLATE_TYPEDEFS
 
-// This is legit for A.03.05 - not sure A.03.04, but it should be.
-#    define ACE_HAS_USING_KEYWORD
-
 #    define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
 // Platform lacks streambuf "linebuffered ()".
 #    define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 
 // Lack of (and broken) support for placement operator delete is a known
-// bug by HP, at least as of aC++ A.03.10. It may be fixed later, and if so
-// this would change to be a #if against an appropriate value of __HP_aCC
-#    define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
+// bug by HP, up until aC++ A.03.55.02.
+#    if (__HP_aCC < 35502)
+#      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
+#    endif /* __HP_aCC < 35502 */
 
 // Compiler's 'new' throws exceptions on failure, regardless of whether or
 // not exception handling is enabled in the compiler options. Fortunately,
@@ -274,6 +272,10 @@
 
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
+// At least for 11iv2, lacks perfect filtering.
+#if (HPUX_VERS >= 1123) && !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING)
+# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
+#endif
 
 /* Platform defines MAP_FAILED as a long constant. */
 #define ACE_HAS_LONG_MAP_FAILED 1
@@ -396,6 +398,13 @@
 // dlopen() takes a char* instead of const char*
 #define ACE_HAS_CHARPTR_DL
 
+// lacks setegid and seteuid
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETEUID
+
+#define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_SYS_SYSCTL_H
+
 // Shared library name/path components
 #define ACE_DLL_SUFFIX  ".sl"
 #if defined (__LP64__)
@@ -488,7 +497,7 @@
 #define ACE_HAS_POSIX_SEM
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-icc-common.h b/ace/config-icc-common.h
index c52b7192188..6a37c13690e 100644
--- a/ace/config-icc-common.h
+++ b/ace/config-icc-common.h
@@ -12,11 +12,24 @@
 # define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
-# define ACE_HAS_USING_KEYWORD
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_HAS_STRING_CLASS
 
+#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
+#  undef ACE_HAS_CUSTOM_EXPORT_MACROS
+#else
+#  ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
+#    define ACE_HAS_CUSTOM_EXPORT_MACROS
+#  endif  /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
+#  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
+#  define ACE_Proper_Import_Flag
+#  define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
+#  define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>;
+#  define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
+#  define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
+#endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
+
 // __EXCEPTIONS is defined with -fexceptions, the egcs default.  It
 // is not defined with -fno-exceptions, the ACE default for g++.
 // ACE_HAS_EXCEPTIONS is defined in
@@ -50,9 +63,5 @@
 
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
-# if defined (ACE_HAS_EXCEPTIONS)
-#   define ACE_NEW_THROWS_EXCEPTIONS
-# endif /* ACE_HAS_EXCEPTIONS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_LINUX_ICC_COMMON_H */
diff --git a/ace/config-integritySCA.h b/ace/config-integritySCA.h
index 3ea3325057a..4e68818b99b 100644
--- a/ace/config-integritySCA.h
+++ b/ace/config-integritySCA.h
@@ -18,6 +18,14 @@
 #define ACE_LACKS_SETREUID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETSID
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+
 #ifndef ACE_HAS_EXCEPTIONS
   #define ACE_HAS_EXCEPTIONS
 #endif
@@ -27,7 +35,6 @@
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS
 #define TAO_USE_SEQUENCE_TEMPLATES
-#define ACE_HAS_USING_KEYWORD
 #define ACE_NEEDS_FUNC_DEFINITIONS
 #define _REENTRANT
 #define ACE_MT_SAFE 1
@@ -109,9 +116,12 @@
 #define ACE_LACKS_PID_STUFF
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_IPC_H
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_UNAME
 #define ACE_LACKS_UMASK
 #define ACE_LACKS_ISATTY
 #define ACE_LACKS_GETOPT
@@ -130,6 +140,8 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_WRITEV
 #define ACE_LACKS_READV
+#define ACE_LACKS_SYSCONF
+#define ACE_LACKS_GETOPT
 /* below refers to fcntl style locking */
 #define ACE_LACKS_FILELOCKS
 
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index a3034d95583..c9f3cc99773 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -16,7 +16,6 @@
 
 #define ACE_SIZEOF_LONG_DOUBLE 8
 
-#define ACE_LACKS_SYSTIME_H
 // Platform supports getpagesize() call.
 #define ACE_HAS_GETPAGESIZE
 #define IRIX5
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index 8be382ce9f4..b1a4e4cb13c 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -17,14 +17,12 @@
 #define ACE_SIZEOF_LONG_DOUBLE 8
 
 #define ACE_LACKS_STDINT_H
-#define ACE_LACKS_SYSTIME_H
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 // Platform supports getpagesize() call.
 #define ACE_HAS_GETPAGESIZE
 
-#define ACE_LACKS_SYSTIME_H
 #define ACE_HAS_SIGWAIT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h
index c42bc6f83f2..904054c97d0 100644
--- a/ace/config-irix6.x-common.h
+++ b/ace/config-irix6.x-common.h
@@ -158,7 +158,6 @@
 
 // Platform supports POSIX timers via timestruc_t.
 #define ACE_HAS_POSIX_TIME
-#define ACE_LACKS_SYSTIME_H
 
 //**************************************************************
 
@@ -184,7 +183,7 @@
 #define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // IRIX 6.5 supports AIO
 #define ACE_HAS_AIO_CALLS
diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h
deleted file mode 100644
index fba9cbafdea..00000000000
--- a/ace/config-irix6.x-kcc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running Irix 6.5 platform using the KAI C++ compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-kcc-common.h"
-#include "ace/config-irix6.x-common.h"
-
-// Denotes that GNU has cstring.h as standard
-// which redefines memchr()
-#define ACE_HAS_GNU_CSTRING_H
-
-// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_IRIX_53_SIGNALS
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform supports sys_siglist array.
-//#define ACE_HAS_SYS_SIGLIST
-
-// This gets defined in config-irix6.x-common.h, but kcc does support this.
-#undef ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-
-// Shift this --- otherwise, it lands on top of libKCC.
-#define ACE_DEFAULT_BASE_ADDR ((char*) 0x0500000)
-
-// kcc 4.0d miscompiles memchr_emulation on irix at +K3 optimization.
-// So just use the library version instead.
-#define ACE_HAS_MEMCHR
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 0af266cd458..16e7d5e04fe 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -17,7 +17,6 @@
 #if _COMPILER_VERSION >= 720
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_HAS_USING_KEYWORD
 # ifdef _STANDARD_C_PLUS_PLUS
 #   define ACE_HAS_TYPENAME_KEYWORD
 # endif /* _STANDARD_C_PLUS_PLUS */
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index 13eeea19663..8b290109a96 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -50,8 +50,6 @@
 // Compiler doesn't support static data member templates.
 //#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 
-#define ACE_HAS_USING_KEYWORD
-
 // Define this if you want to use the standard C++ library
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define ACE_HAS_STRING_CLASS
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 224cd7cd533..7323735b3de 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -110,18 +110,17 @@
 // macros to make prototypes visible.
 # define ACE_LACKS_GETPGID_PROTOTYPE
 
-// NOTE:  the following defines are necessary with glibc 2.0 (0.961212-5)
+// @note  the following defines are necessary with glibc 2.0 (0.961212-5)
 //        on Alpha.  I assume that they're necessary on Intel as well,
 //        but that may depend on the version of glibc that is used.
 //# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C
 # define ACE_HAS_VOIDPTR_SOCKOPT
-# define ACE_LACKS_SYSTIME_H
 
 // Don't define _POSIX_SOURCE in ACE to make strtok() prototype
 // visible.  ACE shouldn't depend on feature test macros to make
 // prototypes visible.
 # define ACE_LACKS_STRTOK_R_PROTOTYPE
-// NOTE:  end of glibc 2.0 (0.961212-5)-specific configuration.
+// @note  end of glibc 2.0 (0.961212-5)-specific configuration.
 
 // These macros determined by reading <stdio.h> on RH 7.1 and glibc's
 // <features.h>.
@@ -174,11 +173,14 @@
 #if (__GLIBC__  > 2)  || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)
 # define ACE_HAS_ISASTREAM_PROTO
 # define ACE_HAS_PTHREAD_SIGMASK_PROTO
+# define ACE_HAS_CPU_SET_T
 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */
 
 // Then the compiler specific parts
 
-#if defined (__GNUG__)
+#if defined (__INTEL_COMPILER)
+# include "ace/config-icc-common.h"
+#elif defined (__GNUG__)
   // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
   // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
@@ -197,8 +199,6 @@
 #elif defined (__DECCXX)
 # define ACE_CONFIG_INCLUDE_CXX_COMMON
 # include "ace/config-cxx-common.h"
-#elif defined (__INTEL_COMPILER)
-# include "ace/config-icc-common.h"
 #elif defined (__BORLANDC__)
 # undef ACE_HAS_LLSEEK
 # undef ACE_HAS_LSEEK64
@@ -215,8 +215,19 @@
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_LACKS_SWAB
 # undef ACE_HAS_CLOCK_GETTIME
+#elif defined (__GNUC__)
+/**
+ * GNU C compiler.
+ *
+ * We need to recognize the GNU C compiler since TAO has at least one
+ * C source header and file
+ * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly
+ * include this
+ */
 #else  /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__ && !__PGI */
-# error unsupported compiler in ace/config-linux-common.h
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#    error unsupported compiler in ace/config-linux-common.h
+#  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __KCC */
 
 // Completely common part  :-) 
@@ -226,6 +237,8 @@
 
 # define ACE_HAS_SIGSUSPEND
 
+# define ACE_HAS_UALARM
+
 #if __GLIBC__ >= 2
 #ifndef ACE_HAS_POSIX_REALTIME_SIGNALS
 #define ACE_HAS_POSIX_REALTIME_SIGNALS
@@ -393,6 +406,9 @@
 // Platform has POSIX terminal interface.
 #define ACE_HAS_TERMIOS
 
+// Linux implements sendfile().
+#define ACE_HAS_SENDFILE
+
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
 // the sockaddr_in::sin_zero field by evaluation of the kernel
diff --git a/ace/config-lite.h b/ace/config-lite.h
index abe7440b607..117933cbe61 100644
--- a/ace/config-lite.h
+++ b/ace/config-lite.h
@@ -21,356 +21,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config.h"
+#include "ace/config-macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality
-// so if it isn't set, set it. Capabilities and differences between
-// XTI and TLI favor XTI, but when deciding to do anything, as opposed to
-// ACE_NOTSUP_RETURN for example, ACE_HAS_TLI is the deciding factor.
-#if !defined (ACE_HAS_TLI)
-#  if defined (ACE_HAS_XTI)
-#    define ACE_HAS_TLI
-#  endif /* ACE_HAS_XTI */
-#endif /* ACE_HAS_TLI */
-
-#define ACE_BITS_PER_ULONG (8 * sizeof (u_long))
-
-#if !defined (ACE_OSTREAM_TYPE)
-# if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-#   define ACE_OSTREAM_TYPE FILE
-# else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-#   define ACE_OSTREAM_TYPE ostream
-# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-#endif /* ! ACE_OSTREAM_TYPE */
-
-#if !defined (ACE_DEFAULT_LOG_STREAM)
-# if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-#   define ACE_DEFAULT_LOG_STREAM 0
-# else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-#   define ACE_DEFAULT_LOG_STREAM (&cerr)
-# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-#endif /* ! ACE_DEFAULT_LOG_STREAM */
-
-// These two are only for backward compatibility. You should avoid
-// using them if not necessary.
-# define ACE_SYNCH_1 ACE_SYNCH_DECL
-# define ACE_SYNCH_2 ACE_SYNCH_USE
-
-// For Win32 compatibility...
-# if !defined (ACE_WSOCK_VERSION)
-#   define ACE_WSOCK_VERSION 0, 0
-# endif /* ACE_WSOCK_VERSION */
-
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#   define ACE_MT(X) X
-#   if !defined (_REENTRANT)
-#     define _REENTRANT
-#   endif /* _REENTRANT */
-# else
-#   define ACE_MT(X)
-# endif /* ACE_MT_SAFE */
-
-# if defined (ACE_HAS_PURIFY)
-#   define ACE_INITIALIZE_MEMORY_BEFORE_USE
-# endif /* ACE_HAS_PURIFY */
-
-# if defined (ACE_HAS_VALGRIND)
-#   define ACE_INITIALIZE_MEMORY_BEFORE_USE
-# endif /* ACE_HAS_VALGRIND */
-
-# if defined (ACE_HAS_USING_KEYWORD)
-#   define ACE_USING using
-# else
-#   define ACE_USING
-# endif /* ACE_HAS_USING_KEYWORD */
-
-# if defined (ACE_HAS_TYPENAME_KEYWORD)
-#   define ACE_TYPENAME typename
-# else
-#   define ACE_TYPENAME
-# endif /* ACE_HAS_TYPENAME_KEYWORD */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-/**
- * @deprecated The @c ACE_TEMPLATE_SPECIALIZATION and
- *             @c ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION macros are
- *             deprecated.  Use standard C++ template specialization
- *             syntax instead.
- */
-# define ACE_TEMPLATE_SPECIALIZATION template<>
-# define ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-#endif /* !ACE_LACKS_DEPRECATED_MACROS */
-
-// =========================================================================
-// Perfect Multicast filting refers to RFC 3376, where a socket is only
-// delivered dgrams for groups joined even if it didn't bind the group
-// address.  We turn this option off by default, although most OS's
-// except for Windows and Solaris probably lack perfect filtering.
-// =========================================================================
-
-# if !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING)
-#   define ACE_LACKS_PERFECT_MULTICAST_FILTERING 0
-# endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */
-
-// =========================================================================
-// Enable/Disable Features By Default
-// =========================================================================
-
-# if !defined (ACE_HAS_POSITION_INDEPENDENT_POINTERS)
-#   define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
-# endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */
-
-# if !defined (ACE_HAS_PROCESS_SPAWN)
-#   if !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) || defined (ACE_WINCE) || defined (ACE_OPENVMS) || defined (CHORUS)
-#     define ACE_HAS_PROCESS_SPAWN 1
-#   endif
-# endif /* ACE_HAS_PROCESS_SPAWN */
-
-# if !defined (ACE_HAS_DYNAMIC_LINKING)
-#   if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) || defined (__hpux)
-#     define ACE_HAS_DYNAMIC_LINKING 1
-#   endif
-# endif /* ACE_HAS_DYNAMIC_LINKING */
-
-# if defined (ACE_USES_FIFO_SEM)
-#   if defined (ACE_HAS_POSIX_SEM) || defined (ACE_LACKS_MKFIFO) || defined (ACE_LACKS_FCNTL)
-#     undef ACE_USES_FIFO_SEM
-#   endif
-# endif /* ACE_USES_FIFO_SEM */
-
-// =========================================================================
-// RCSID Macros
-// =========================================================================
-
-// By default, DO NOT include RCS Id strings in object code.
-#if ! defined (ACE_USE_RCSID)
-#  define ACE_USE_RCSID 0
-#endif /* #if ! defined (ACE_USE_RCSID) */
-
-#if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0))
-#  if ! defined (ACE_RCSID)
-
-   // This hack has the following purposes:
-   // 1. To define the RCS id string variable as a static char*, so
-   //    that there won't be any duplicate extern symbols at link
-   //    time.
-   // 2. To have a RCS id string variable with a unique name for each
-   //    file.
-   // 3. To avoid warnings of the type "variable declared and never
-   //    used".
-
-#    define ACE_RCSID(path, file, id) \
-      static inline const char* get_rcsid_ ## path ## _ ## file (const char*) \
-      { \
-        return id ; \
-      } \
-      static const char* rcsid_ ## path ## _ ## file = \
-        get_rcsid_ ## path ## _ ## file ( rcsid_ ## path ## _ ## file ) ;
-
-#  endif /* #if ! defined (ACE_RCSID) */
-#else
-
-   // RCS id strings are not wanted.
-#  if defined (ACE_RCSID)
-#    undef ACE_RCSID
-#  endif /* #if defined (ACE_RCSID) */
-#  define ACE_RCSID(path, file, id) /* noop */
-#endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */
-
-// =========================================================================
-// INLINE macros
-//
-// These macros handle all the inlining of code via the .i or .inl files
-// =========================================================================
-
-#if defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE)
-#  define ACE_NO_INLINE
-#endif /* defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) */
-
-// ACE inlining has been explicitly disabled.  Implement
-// internally within ACE by undefining __ACE_INLINE__.
-#if defined (ACE_NO_INLINE)
-#  undef __ACE_INLINE__
-#endif /* ! ACE_NO_INLINE */
-
-#if defined (__ACE_INLINE__)
-#  define ACE_INLINE inline
-#  if !defined (ACE_HAS_INLINED_OSCALLS)
-#    define ACE_HAS_INLINED_OSCALLS
-#  endif /* !ACE_HAS_INLINED_OSCALLS */
-#else
-#  define ACE_INLINE
-#endif /* __ACE_INLINE__ */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  // =========================================================================
-  // EXPLICIT macro
-  // =========================================================================
-
-  /**
-   * @deprecated explicit is deprecated.  ACE requires C++
-   *             "explicit" keyword support.
-   */
-  # define ACE_EXPLICIT explicit
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  // =========================================================================
-  // MUTABLE macro
-  // =========================================================================
-
-  /**
-   * @deprecated ACE_MUTABLE is deprecated.  ACE requires C++ "mutable"
-   *             keyword support.
-   */
-  # define ACE_MUTABLE mutable
-  # define ACE_CONST_WHEN_MUTABLE const
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
-// ============================================================================
-// EXPORT macros
-//
-// Since Win32 DLL's do not export all symbols by default, they must be
-// explicitly exported (which is done by *_Export macros).
-// ============================================================================
-
-// Win32 should have already defined the macros in config-win32-common.h
-#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS)
-#  define ACE_Proper_Export_Flag
-#  define ACE_Proper_Import_Flag
-#  define ACE_EXPORT_SINGLETON_DECLARATION(T)
-#  define ACE_IMPORT_SINGLETON_DECLARATION(T)
-#  define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#else
-// An export macro should at the very least have been defined.
-
-#  ifndef ACE_Proper_Import_Flag
-#    define ACE_Proper_Import_Flag
-#  endif  /* !ACE_Proper_Import_Flag */
-
-#  ifndef ACE_EXPORT_SINGLETON_DECLARATION
-#    define ACE_EXPORT_SINGLETON_DECLARATION(T)
-#  endif  /* !ACE_EXPORT_SINGLETON_DECLARATION */
-
-#  ifndef ACE_IMPORT_SINGLETON_DECLARATION
-#    define ACE_IMPORT_SINGLETON_DECLARATION(T)
-#  endif  /* !ACE_IMPORT_SINGLETON_DECLARATION */
-
-#  ifndef ACE_EXPORT_SINGLETON_DECLARE
-#    define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif  /* !ACE_EXPORT_SINGLETON_DECLARE */
-
-#  ifndef ACE_IMPORT_SINGLETON_DECLARE
-#    define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif  /* !ACE_IMPORT_SINGLETON_DECLARE */
-
-#endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
-
-// This is a whim of mine -- that instead of annotating a class with
-// ACE_Export in its declaration, we make the declaration near the TOP
-// of the file with ACE_DECLARE_EXPORT.
-// TS = type specifier (e.g., class, struct, int, etc.)
-// ID = identifier
-// So, how do you use it?  Most of the time, just use ...
-// ACE_DECLARE_EXPORT(class, someobject);
-// If there are global functions to be exported, then use ...
-// ACE_DECLARE_EXPORT(void, globalfunction) (int, ...);
-// Someday, when template libraries are supported, we made need ...
-// ACE_DECLARE_EXPORT(template class, sometemplate) <class TYPE, class LOCK>;
-# define ACE_DECLARE_EXPORT(TS,ID) TS ACE_Export ID
-
-// ============================================================================
-// Cast macros
-//
-// These macros are used to choose between the old cast style and the new
-// *_cast<> operators
-// ============================================================================
-
-#   define ACE_sap_any_cast(TYPE)                                      reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any))
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  /**
-   * @deprecated ACE_{static,reinterpret,dynamic,const}_cast@<@> is
-   *             deprecated.  Directly use standard C++ casts instead.
-   */
-  #   define ACE_static_cast(TYPE, EXPR)                                 static_cast<TYPE> (EXPR)
-  #   define ACE_static_cast_1_ptr(TYPE, T1, EXPR)                       static_cast<TYPE<T1> *> (EXPR)
-  #   define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> *> (EXPR)
-  #   define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> *> (EXPR)
-  #   define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-  #   define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-  #   define ACE_static_cast_1_ref(TYPE, T1, EXPR)                       static_cast<TYPE<T1> &> (EXPR)
-  #   define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR)                   static_cast<TYPE<T1, T2> &> (EXPR)
-  #   define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR)               static_cast<TYPE<T1, T2, T3> &> (EXPR)
-  #   define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)           static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-  #   define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)       static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
-  #   define ACE_const_cast(TYPE, EXPR)                                  const_cast<TYPE> (EXPR)
-  #   define ACE_const_cast_1_ptr(TYPE, T1, EXPR)                        const_cast<TYPE<T1> *> (EXPR)
-  #   define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> *> (EXPR)
-  #   define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> *> (EXPR)
-  #   define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-  #   define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-  #   define ACE_const_cast_1_ref(TYPE, T1, EXPR)                        const_cast<TYPE<T1> &> (EXPR)
-  #   define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR)                    const_cast<TYPE<T1, T2> &> (EXPR)
-  #   define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR)                const_cast<TYPE<T1, T2, T3> &> (EXPR)
-  #   define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)            const_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-  #   define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)        const_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
-  #   define ACE_reinterpret_cast(TYPE, EXPR)                            reinterpret_cast<TYPE> (EXPR)
-  #   define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> *> (EXPR)
-  #   define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> *> (EXPR)
-  #   define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> *> (EXPR)
-  #   define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-  #   define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-  #   define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR)                  reinterpret_cast<TYPE<T1> &> (EXPR)
-  #   define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR)              reinterpret_cast<TYPE<T1, T2> &> (EXPR)
-  #   define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR)          reinterpret_cast<TYPE<T1, T2, T3> &> (EXPR)
-  #   define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)      reinterpret_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-  #   define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)  reinterpret_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-
-  #   if defined (ACE_LACKS_RTTI)
-  #     define ACE_dynamic_cast(TYPE, EXPR)                              static_cast<TYPE> (EXPR)
-  #     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    static_cast<TYPE<T1> *> (EXPR)
-  #     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> *> (EXPR)
-  #     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> *> (EXPR)
-  #     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-  #     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-  #     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    static_cast<TYPE<T1> &> (EXPR)
-  #     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                static_cast<TYPE<T1, T2> &> (EXPR)
-  #     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            static_cast<TYPE<T1, T2, T3> &> (EXPR)
-  #     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-  #     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-  #   else  /* ! ACE_LACKS_RTTI */
-  #     define ACE_dynamic_cast(TYPE, EXPR)                              dynamic_cast<TYPE> (EXPR)
-  #     define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> *> (EXPR)
-  #     define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> *> (EXPR)
-  #     define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> *> (EXPR)
-  #     define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
-  #     define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
-  #     define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                    dynamic_cast<TYPE<T1> &> (EXPR)
-  #     define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                dynamic_cast<TYPE<T1, T2> &> (EXPR)
-  #     define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)            dynamic_cast<TYPE<T1, T2, T3> &> (EXPR)
-  #     define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)        dynamic_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
-  #     define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)    dynamic_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
-  #   endif /* ! ACE_LACKS_RTTI */
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
-# if !defined (ACE_CAST_CONST)
-    // Sun CC 4.2, for example, requires const in reinterpret casts of
-    // data members in const member functions.  But, other compilers
-    // complain about the useless const.  This keeps everyone happy.
-#   if defined (__SUNPRO_CC)
-#     define ACE_CAST_CONST const
-#   else  /* ! __SUNPRO_CC */
-#     define ACE_CAST_CONST
-#   endif /* ! __SUNPRO_CC */
-# endif /* ! ACE_CAST_CONST */
+// Empty ACE_OS namespace to help identify compiler errors more
+// easily.      -- @@ Do we really need this?
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace ACE_OS {}
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ============================================================================
 // UNICODE macros (to be added later)
@@ -380,118 +41,16 @@
 # include "ace/ace_wchar.h"
 
 // ============================================================================
-// Compiler Silencing macros
-//
-// Some compilers complain about parameters that are not used.  This macro
-// should keep them quiet.
-// ============================================================================
-
-#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM)
-// Some compilers complain about "statement with no effect" with (a).
-// This eliminates the warnings, and no code is generated for the null
-// conditional statement.  NOTE: that may only be true if -O is enabled,
-// such as with GreenHills (ghs) 1.8.8.
-# define ACE_UNUSED_ARG(a) do {/* null */} while (&a == 0)
-#elif defined (__DMC__)
-  #define ACE_UNUSED_ID(identifier)
-  template <class T>
-  inline void ACE_UNUSED_ARG(const T& ACE_UNUSED_ID(t)) { }
-#else /* ghs || __GNUC__ || ..... */
-# define ACE_UNUSED_ARG(a) (a)
-#endif /* ghs || __GNUC__ || ..... */
-
-#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM)
-# define ACE_NOTREACHED(a)
-#else  /* __sgi || ghs || ..... */
-# define ACE_NOTREACHED(a) a
-#endif /* __sgi || ghs || ..... */
-
-// ============================================================================
-// ACE_ALLOC_HOOK* macros
-//
-// Macros to declare and define class-specific allocation operators.
-// ============================================================================
-
-# if defined (ACE_HAS_ALLOC_HOOKS)
-#   define ACE_ALLOC_HOOK_DECLARE \
-  void *operator new (size_t bytes); \
-  void operator delete (void *ptr);
-
-  // Note that these are just place holders for now.  Some day they
-  // may be be replaced by <ACE_Malloc>.
-#   define ACE_ALLOC_HOOK_DEFINE(CLASS) \
-  void *CLASS::operator new (size_t bytes) { return ::new char[bytes]; } \
-  void CLASS::operator delete (void *ptr) { delete [] ((char *) ptr); }
-# else
-#   define ACE_ALLOC_HOOK_DECLARE struct __Ace {} /* Just need a dummy... */
-#   define ACE_ALLOC_HOOK_DEFINE(CLASS)
-# endif /* ACE_HAS_ALLOC_HOOKS */
-
-// ============================================================================
-/**
- * ACE_OSCALL* macros
- *
- * @deprecated ACE_OSCALL_RETURN and ACE_OSCALL should not be used.
- *             Please restart system calls in your application code.
- *             See the @c sigaction(2) man page for documentation
- *             regarding enabling restartable system calls across
- *             signals via the @c SA_RESTART flag.
- *
- * The following two macros used ensure that system calls are properly
- * restarted (if necessary) when interrupts occur.  However, that
- * capability was never enabled by any of our supported platforms.
- * In fact, some parts of ACE would not function properly when that
- * ability was enabled.  Furthermore, they assumed that ability to
- * restart system calls was determined statically.  That assumption
- * does not hold for modern platforms, where that ability is
- * determined dynamically at run-time.
- */
-// ============================================================================
-
-#define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \
-  do \
-    return (TYPE) (X); \
-  while (0)
-#define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \
-  do \
-    RESULT = (TYPE) (X); \
-  while (0)
-
-#if defined (ACE_WIN32)
-#   if defined (__BORLANDC__) && (__BORLANDC__ <= 0x550)
-#   define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \
-  do { \
-    TYPE ace_result_; \
-    TYPE ace_local_result_ = (TYPE) X; \
-    ace_result_ = ace_local_result_; \
-    if (ace_result_ == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
-    return ace_result_; \
-  } while (0)
-#   else
-#     define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \
-  do { \
-    TYPE ace_result_ = (TYPE) X; \
-    if (ace_result_ == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
-    return ace_result_; \
-  } while (0)
-#   endif /* defined (__BORLANDC__) && (__BORLANDC__ <= 0x550) */
-#   define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \
-  do { \
-    RESULT = (TYPE) X; \
-    if (RESULT == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
-  } while (0)
-#endif  /* ACE_WIN32 */
-
-// ============================================================================
 // at_exit declarations
 // ============================================================================
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Marker for cleanup, used by ACE_Exit_Info.
 extern int ace_exit_hook_marker;
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // For use by <ACE_OS::exit>.
 extern "C"
 {
@@ -512,6 +71,8 @@ typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* throw () */;
 // log_msg declarations
 // ============================================================================
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
 typedef int (*ACE_SEH_EXCEPT_HANDLER)(void *);
 // Prototype of win32 structured exception handler functions.
@@ -536,149 +97,7 @@ typedef void (*ACE_SYNC_LOG_MSG_HOOK) (const ACE_TCHAR *prog_name);
 
 typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (void);
 
-// ============================================================================
-// Fundamental types
-// ============================================================================
-
-#if defined (ACE_WIN32)
-
-typedef HANDLE ACE_HANDLE;
-typedef SOCKET ACE_SOCKET;
-# define ACE_INVALID_HANDLE INVALID_HANDLE_VALUE
-
-#else /* ! ACE_WIN32 */
-
-typedef int ACE_HANDLE;
-typedef ACE_HANDLE ACE_SOCKET;
-# define ACE_INVALID_HANDLE -1
-
-#endif /* ACE_WIN32 */
-
-// Define the type that's returned from the platform's native thread
-// functions. ACE_THR_FUNC_RETURN is the type defined as the thread
-// function's return type, except when the thread function doesn't return
-// anything (pSoS). The ACE_THR_FUNC_NO_RETURN_VAL macro is used to
-// indicate that the actual thread function doesn't return anything. The
-// rest of ACE uses a real type so there's no a ton of conditional code
-// everywhere to deal with the possibility of no return type.
-# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
-# include /**/ <taskLib.h>
-typedef int ACE_THR_FUNC_RETURN;
-# elif defined (ACE_PSOS)
-typedef int ACE_THR_FUNC_RETURN;
-// pSOS task functions don't really return anything... this just makes it
-// easier to deal with declaring variables internally in ACE.
-# elif defined (ACE_WIN32)
-typedef DWORD ACE_THR_FUNC_RETURN;
-# else
-typedef void* ACE_THR_FUNC_RETURN;
-# endif /* VXWORKS */
-typedef ACE_THR_FUNC_RETURN (*ACE_THR_FUNC)(void *);
-
-extern "C" {
-typedef void (*ACE_THR_C_DEST)(void *);
-}
-typedef void (*ACE_THR_DEST)(void *);
-
-// Now some platforms have special requirements...
-# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
-typedef FUNCPTR ACE_THR_FUNC_INTERNAL;  // where typedef int (*FUNCPTR) (...)
-# elif defined (ACE_PSOS)
-typedef void (*ACE_THR_FUNC_INTERNAL)(void *);
-# else
-typedef ACE_THR_FUNC ACE_THR_FUNC_INTERNAL;
-# endif /* VXWORKS */
-
-extern "C"
-{
-# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
-typedef FUNCPTR ACE_THR_C_FUNC;  // where typedef int (*FUNCPTR) (...)
-# elif defined (ACE_PSOS)
-// needed to handle task entry point type inconsistencies in pSOS+
-typedef void (*PSOS_TASK_ENTRY_POINT)();
-typedef void (*ACE_THR_C_FUNC)(void *);
-# else
-typedef ACE_THR_FUNC_RETURN (*ACE_THR_C_FUNC)(void *);
-# endif /* VXWORKS */
-}
-
-// ============================================================================
-// Macros for controlling the lifetimes of dlls loaded by ACE_DLL--including
-// all dlls loaded via the ACE Service Config framework.
-//
-// Please don't change these values or add new ones wantonly, since we use
-// the ACE_BIT_ENABLED, etc..., macros to test them.
-// ============================================================================
-
-// Per-process policy that unloads dlls eagerly.
-#define ACE_DLL_UNLOAD_POLICY_PER_PROCESS 0
-// Apply policy on a per-dll basis.  If the dll doesn't use one of the macros
-// below, the current per-process policy will be used.
-#define ACE_DLL_UNLOAD_POLICY_PER_DLL 1
-// Don't unload dll when refcount reaches zero, i.e., wait for either an
-// explicit unload request or program exit.
-#define ACE_DLL_UNLOAD_POLICY_LAZY 2
-// Default policy allows dlls to control their own destinies, but will
-// unload those that don't make a choice eagerly.
-#define ACE_DLL_UNLOAD_POLICY_DEFAULT ACE_DLL_UNLOAD_POLICY_PER_DLL
-
-// Add this macro you one of your cpp file in your dll.  X should
-// be either ACE_DLL_UNLOAD_POLICY_DEFAULT or ACE_DLL_UNLOAD_POLICY_LAZY.
-#define ACE_DLL_UNLOAD_POLICY(CLS,X) \
-extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \
-  { return X;}
-
-// ============================================================================
-// ACE_USES_CLASSIC_SVC_CONF macro
-// ============================================================================
-
-// For now, default is to use the classic svc.conf format.
-#if !defined (ACE_USES_CLASSIC_SVC_CONF)
-# if defined (ACE_HAS_CLASSIC_SVC_CONF) && defined (ACE_HAS_XML_SVC_CONF)
-#   error You can only use either CLASSIC or XML svc.conf, not both.
-# endif
-// Change the ACE_HAS_XML_SVC_CONF to ACE_HAS_CLASSIC_SVC_CONF when
-// we switch ACE to use XML svc.conf as default format.
-# if defined (ACE_HAS_XML_SVC_CONF)
-#   define ACE_USES_CLASSIC_SVC_CONF 0
-# else
-#   define ACE_USES_CLASSIC_SVC_CONF 1
-# endif /* ACE_HAS_XML_SVC_CONF */
-#endif /* ACE_USES_CLASSIC_SVC_CONF */
-
-// ============================================================================
-// Default svc.conf file extension.
-// ============================================================================
-#if defined (ACE_USES_CLASSIC_SVC_CONF) && (ACE_USES_CLASSIC_SVC_CONF == 1)
-# define ACE_DEFAULT_SVC_CONF_EXT   ".conf"
-#else
-# define ACE_DEFAULT_SVC_CONF_EXT   ".conf.xml"
-#endif /* ACE_USES_CLASSIC_SVC_CONF && ACE_USES_CLASSIC_SVC_CONF == 1 */
-
-// ============================================================================
-// Miscellaneous macros
-// ============================================================================
-
-#if defined (ACE_USES_EXPLICIT_STD_NAMESPACE)
-#  define ACE_STD_NAMESPACE std
-#else
-#  define ACE_STD_NAMESPACE
-#endif
-
-// empty ACE_OS namespace to help identify compiler errors more easily.
-namespace ACE_OS {}
-#if !defined (ACE_OS_String)
-#  define ACE_OS_String ACE_OS
-#endif /* ACE_OS_String */
-#if !defined (ACE_OS_Memory)
-#  define ACE_OS_Memory ACE_OS
-#endif /* ACE_OS_Memory */
-#if !defined (ACE_OS_Dirent)
-#  define ACE_OS_Dirent ACE_OS
-#endif /* ACE_OS_Dirent */
-#if !defined (ACE_OS_TLI)
-#  define ACE_OS_TLI ACE_OS
-#endif /* ACE_OS_TLI */
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index b2d723daa10..6f837b09f50 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -3,13 +3,6 @@
 // The following configuration file is designed to work for LynxOS,
 // version 3.0.0 and later, using the GNU g++ compiler.
 
-// Note on why ACE_HAS_POSIX_SEM is not #defined:
-// ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition
-// variables to be used.  But, they don't appear to be intended to be
-// used between processes.  Without ACE_HAS_POSIX_SEM, ACE uses
-// semaphores for all synchronization.  Those can be used between
-// processes
-
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 #include /**/ "ace/pre.h"
@@ -48,6 +41,8 @@
 #define ACE_HAS_ALLOCA
 #define ACE_HAS_ALLOCA_H
 #define ACE_HAS_AUTOMATIC_INIT_FINI
+#define ACE_HAS_CHARPTR_SHMAT
+#define ACE_HAS_CHARPTR_SHMDT
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_CLOCK_SETTIME
 #define ACE_HAS_CPLUSPLUS_HEADERS
@@ -58,7 +53,6 @@
 #define ACE_HAS_GPERF
 #define ACE_HAS_ICMP_SUPPORT 1
 #define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_LYNXOS_BROKEN_MMAP
 #define ACE_HAS_LYNXOS_SIGNALS
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
@@ -70,8 +64,8 @@
 #define ACE_HAS_NONCONST_SETRLIMIT
 #define ACE_HAS_NONCONST_WRITEV
 #define ACE_HAS_POSIX_NONBLOCK
+#define ACE_HAS_POSIX_REALTIME_SIGNALS
 #define ACE_HAS_POSIX_TIME
-#define ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_HAS_SCANDIR
 #define ACE_HAS_SEMUN
@@ -90,7 +84,6 @@
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_DLFCN_H
 #define ACE_LACKS_GETOPT_PROTOTYPE
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_INET_ATON_PROTOTYPE
@@ -102,14 +95,13 @@
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SCANDIR_PROTOTYPE
-#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETEUID
 #define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SI_ADDR
 #define ACE_LACKS_STRCASECMP_PROTOTYPE
 #define ACE_LACKS_STRNCASECMP_PROTOTYPE
 #define ACE_LACKS_SWAB_PROTOTYPE
 #define ACE_LACKS_SYS_SELECT_H
-#define ACE_LACKS_TCP_NODELAY
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_WCHAR_H
@@ -139,15 +131,11 @@
 #define ACE_LACKS_FPUTWS
 #define ACE_LACKS_WCSICMP
 #define ACE_LACKS_WCSNICMP
+#define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_USECONDS_T
 #define ACE_MALLOC_ALIGN 8
-#define ACE_SCANDIR_CMP_USES_VOIDPTR
-
-// Don't use MAP_FIXED, at least for now.
-#define ACE_MAP_FIXED 0
-// LynxOS, through 3.0.0, does not support MAP_PRIVATE, so map it to
-// MAP_SHARED.
-#define ACE_MAP_PRIVATE ACE_MAP_SHARED
 #define ACE_PAGE_SIZE 4096
+#define ACE_SCANDIR_CMP_USES_VOIDPTR
 
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
@@ -175,8 +163,6 @@
 # define ACE_LACKS_SETDETACH
 # define ACE_LACKS_THREAD_PROCESS_SCOPING
 # define ACE_LACKS_THREAD_STACK_ADDR
-  // This gets around Lynx broken macro calls resulting in "::0"
-# define _POSIX_THREADS_CALLS
 #endif /* ACE_MT_SAFE */
 
 #define ACE_HAS_AIO_CALLS
@@ -190,11 +176,6 @@
 
 #define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1
 
-// Looks like the modern compilers  have support for namespaces. Or
-// rather we dont support any compiler without this support. Need to
-// get this macro off of ACE.
-#define ACE_HAS_USING_KEYWORD
-
 #if __GNUC__ == 2  &&  __GNUC_MINOR__ == 9
   // config-g++-common.h defines these incorrectly for LynxOS 3.x
   // with G++ version 2.9-gnupro-98r2
@@ -203,6 +184,10 @@
 # undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #endif /* __GNUC__ == 2  &&  __GNUC_MINOR__ == 9 */
 
+#if __GNUC__ < 3
+# define ACE_LACKS_NUMERIC_LIMITS
+#endif /* __GNUC__ < 3 */
+
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
 # define ACE_USE_RCSID 0
@@ -212,16 +197,40 @@
 #define __NO_INCLUDE_WARN__
 
 #if ACE_LYNXOS_MAJOR > 3 /* LynxOS 4.x */
+# define ACE_HAS_POSIX_SEM
   // "changes signedness" error (OS.i and many other files)
 # define ACE_HAS_SOCKLEN_T
   // LSOCK.cpp uses a macro from param.h, not included
 # define ALIGNBYTES (sizeof(int) - 1)
 # define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
 #else /* LynxOS 3.x */
+  // Note on why ACE_HAS_POSIX_SEM is not #defined:
+  // ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition
+  // variables to be used.  But, they don't appear to be intended to be
+  // used between processes.  Without ACE_HAS_POSIX_SEM, ACE uses
+  // semaphores for all synchronization.  Those can be used between
+  // processes
+  //# define ACE_HAS_POSIX_SEM
+
+  // Don't use MAP_FIXED, at least for now.
+# define ACE_MAP_FIXED 0
+  // LynxOS, through 3.0.0, does not support MAP_PRIVATE,
+  // so map it to MAP_SHARED.
+# define ACE_MAP_PRIVATE ACE_MAP_SHARED
+
+  // This gets around Lynx broken macro calls resulting in "::0"
+# define _POSIX_THREADS_CALLS
+
+# define ACE_HAS_LYNXOS_BROKEN_MMAP
 # define ACE_HAS_POLL
 # define ACE_LACKS_AUTO_PTR
+# define ACE_LACKS_DLFCN_H
+# define ACE_LACKS_SETPGID
 # define ACE_LACKS_SETREGID
 # define ACE_LACKS_SETREUID
+# define ACE_LACKS_SETUID
+# define ACE_LACKS_SI_ADDR
+# define ACE_LACKS_TCP_NODELAY
 #endif /* ACE_LYNXOS_MAJOR > 3 */
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h
index e308cc09f05..c8308edb975 100644
--- a/ace/config-macosx-panther.h
+++ b/ace/config-macosx-panther.h
@@ -18,6 +18,7 @@
 
 #define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
 #define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
+#define ACE_LACKS_SUSECONDS_T
 
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
@@ -81,7 +82,8 @@
 
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
@@ -149,11 +151,9 @@
 #endif /* ! ACE_MT_SAFE */
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_DIRENT
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_SEARCH_H
 
@@ -162,7 +162,7 @@
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-macosx-tiger.h b/ace/config-macosx-tiger.h
index 9484e261304..5b897b6d9ba 100644
--- a/ace/config-macosx-tiger.h
+++ b/ace/config-macosx-tiger.h
@@ -14,14 +14,22 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
-#undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+// #undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
 #define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
 #define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 
-// Proper size of long double on both G4/G5 is 16
-#define ACE_SIZEOF_LONG_DOUBLE 16
+#if !defined (ACE_SIZEOF_LONG_DOUBLE)
+# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
+   // Size of long double in GCC 3.3 is 8.
+#  define ACE_SIZEOF_LONG_DOUBLE 8
+# else // Else, the compiler is GCC4
+   // For GCC4, the size is 16.
+#  define ACE_SIZEOF_LONG_DOUBLE 16
+# endif // GCC 3.3
+#endif // ACE_SIZEOF_LONG_DOUBLE
 
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
@@ -40,7 +48,19 @@
 #define ACE_HAS_MEMCHR
 
 #define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_WCHAR_H
+
+// Wcharness....
+//#define ACE_LACKS_WCHAR_H
+#define ACE_HAS_WCHAR
+#define ACE_SIZEOF_WCHAR 4
+
+
+#define ACE_HAS_3_PARAM_WCSTOK
+#define ACE_LACKS_ITOW
+#define ACE_LACKS_WCSICMP
+#define ACE_LACKS_WCSNICMP
+#define ACE_LACKS_WCSDUP
+// #define ACE_LACKS_WCSLEN
 
 // Mac lacks the following pthread features
 #define ACE_LACKS_MUTEXATTR_PSHARED
@@ -55,6 +75,8 @@
 //Platform/compiler has the sigwait(2) prototype
 #define ACE_HAS_SIGWAIT
 
+#define ACE_HAS_AIO_CALLS
+
 //Platform supports sigsuspend()
 #define ACE_HAS_SIGSUSPEND
 
@@ -89,7 +111,7 @@
 
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
@@ -160,11 +182,9 @@
 #endif /* ! ACE_MT_SAFE */
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_DIRENT
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_SEARCH_H
 
@@ -173,7 +193,7 @@
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index ec570d4001d..a6d1f1d7521 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -64,6 +64,8 @@
 
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 
+#define ACE_HAS_SYSCTL
+
 //?
 #define ACE_LACKS_SIGSET
 
@@ -83,7 +85,7 @@
 
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 //#define ACE_HAS_SYSV_IPC
@@ -151,11 +153,9 @@
 #endif /* ! ACE_MT_SAFE */
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_DIRENT
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_SEARCH_H
 
@@ -163,7 +163,7 @@
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SIGINFO_T
diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h
index 111d711c394..afaf665c383 100644
--- a/ace/config-mit-pthread.h
+++ b/ace/config-mit-pthread.h
@@ -18,7 +18,6 @@
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
 #define ACE_LACKS_PTHREAD_CANCEL
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_SIGWAIT
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 //#define ACE_LACKS_THREAD_STACK_ADDR
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index f3982f72e7b..7f490764501 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -61,7 +61,7 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_C_FUNC
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRERROR
@@ -93,7 +93,6 @@
 #define ACE_LACKS_SETSCHED
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_NETINET_TCP_H
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 821ab46c4c1..d92e16c32e4 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -51,7 +51,8 @@
 #define ACE_HAS_SIGWAIT 1
 #define ACE_HAS_SIG_ATOMIC_T 1
 #define ACE_HAS_SIG_C_FUNC 1
-#define ACE_HAS_SIN_LEN 1
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN 1
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN 1
 #define ACE_HAS_SNPRINTF 1
 #define ACE_HAS_SOCKADDR_MSG_NAME 1
 #define ACE_HAS_SOCKLEN_T 1
@@ -70,6 +71,7 @@
 #define ACE_HAS_SYS_SIGLIST 1
 #define ACE_HAS_SYS_SOCKIO_H 1
 #define ACE_HAS_SYS_SYSCALL_H 1
+#define ACE_HAS_SYSCTL
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
 #define ACE_HAS_TERMIOS 1
@@ -80,7 +82,6 @@
 #define ACE_HAS_TYPENAME_KEYWORD 1
 #define ACE_HAS_UALARM 1
 #define ACE_HAS_UCONTEXT_T 1
-#define ACE_HAS_USING_KEYWORD 1
 #define ACE_HAS_VOIDPTR_MMAP 1
 #define ACE_HAS_VOIDPTR_SOCKOPT 1
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1
diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h
index 37c066f3382..ff5de9d77dd 100644
--- a/ace/config-openbsd.h
+++ b/ace/config-openbsd.h
@@ -97,15 +97,14 @@
 // Platform defines struct timespec but not timespec_t
 #define ACE_LACKS_TIMESPEC_T
 
-#define ACE_LACKS_SYSTIME_H
-
 #define ACE_LACKS_STDINT_H
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_WCHAR_H
 
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
@@ -177,6 +176,8 @@
 // Platform provides <sys/filio.h> header.
 #define ACE_HAS_SYS_FILIO_H
 
+#define ACE_HAS_SYSCTL
+
 // Platform/compiler supports timezone * as second parameter to gettimeofday().
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
@@ -222,7 +223,7 @@
 #endif /* ! ACE_HAD_THREADS */
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // OpenBSD actually has the clearerr call, but it causes a
 // bogus compiler syntax error.
diff --git a/ace/config-openvms.h b/ace/config-openvms.h
index 759f338f113..2b62888e805 100644
--- a/ace/config-openvms.h
+++ b/ace/config-openvms.h
@@ -266,10 +266,6 @@
                                         functions.*/
 #define ACE_HAS_UALARM 1
                                         /*Platform supports ualarm()*/
-#define ACE_HAS_USING_KEYWORD 1
-                                        /*Compiler supports the new
-                                        using keyword for C++
-                                        namespaces.*/
 #define ACE_HAS_VOIDPTR_MMAP 1
                                         /*Platform requires void * for
                                         mmap().*/
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
deleted file mode 100644
index b5369247a2d..00000000000
--- a/ace/config-osf1-3.2.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for OSF1 3.2
-// platforms with the DEC 5.1 C++ compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include /**/ "ace/pre.h"
-
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_RWLOCK_T
-// DF: this platform uses Digital's CXX compiler
-#define DEC_CXX
-
-// DF: DEC's CXX supports explicit template specialization.
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// DF: 3.2 has getpgid but no prototype defined anywhere.  So we cheat
-// and declare it here.
-extern "C" pid_t getpgid (pid_t);
-
-// DF: ACE_HAS_STRING_CLASS seems the right thing to do...
-#define ACE_HAS_STRING_CLASS
-
-// DF: Seems apropriate since this is a new compiler...
-#if !defined (__ACE_INLINE__)
-# define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#define ACE_HAS_BROKEN_MSG_H
-#define ACE_LACKS_SYSV_MSQ_PROTOS
-
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// Platform supports <sys/procfs.h>
-#define ACE_HAS_PROC_FS
-
-#define ACE_HAS_UALARM
-
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to schmidt@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
-
-// Platform lacks support for stack address information
-#define ACE_LACKS_THREAD_STACK_ADDR
-
-// Platform lacks thread process scoping
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-
-// Platform has non-POSIX setkind and other functions.
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_HAS_SETKIND_NP
-
-// Platform supports POSIX.1b clock_gettime ()
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CLOCK_SETTIME
-
-// Platform defines MAP_FAILED as a long constant.
-#define ACE_HAS_LONG_MAP_FAILED
-
-// Platform's implementation of sendmsg() has a non-const msgheader parameter.
-#define ACE_HAS_NONCONST_SENDMSG
-
-// Platform's implementation of writev() has a non-const iovec parameter.
-#define ACE_HAS_NONCONST_WRITEV
-
-// Platform's implementation of setlrmit() has a non-const rlimit parameter.
-#define ACE_HAS_NONCONST_SETRLIMIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYS_SYSCALL_H
-
-// Compiler/platform correctly calls init()/fini().
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Platform supports C++ headers
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Platform supports the OSF ACE_TLI timod STREAMS module.
-#define ACE_HAS_OSF_TIMOD_H
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
-
-// Platform defines struct timespec in <sys/timers.h>
-#define ACE_HAS_BROKEN_POSIX_TIME
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-// ACE supports POSIX Pthreads. OSF/1 3.2 has draft 4
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_DRAFT4
-#define ACE_HAS_THREAD_SELF
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Added 6/13/95, 1 line
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_UCONTEXT_T
-
-// Compiler/platform has ssize_t.
-#define ACE_HAS_SSIZE_T
-
-// Compiler/platform supports struct strbuf.
-#define ACE_HAS_STRBUF_T
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
-
-// Platform has 64bit longs and 32bit ints...
-#define ACE_SIZEOF_LONG 8
-
-// Platform supports STREAM pipes.
-// #define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Platform support OSF1 gettimeofday
-#define ACE_HAS_OSF1_GETTIMEOFDAY
-
-// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_SVR4_SIGNAL_T
-
-// Compiler/platform has strerror().
-#define ACE_HAS_STRERROR
-
-// ACE supports threads.
-#define ACE_HAS_THREADS
-
-// Platform supports ACE_TLI tiuser header.
-#define ACE_HAS_TIUSER_H
-
-// Platform supports ACE_TLI timod STREAMS module.
-// #define ACE_HAS_TIMOD_H
-
-// Platform provides ACE_TLI function prototypes.
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform supports ACE_TLI.
-#define ACE_HAS_TLI
-
-// Compile using multi-thread libraries.
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 8192
-#define ACE_HAS_GETPAGESIZE
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index af0b4545ff9..2be213db3af 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -1,13 +1,13 @@
 /* -*- C++ -*- */
 // $Id$
 
-// NOTE:  if you are using Digital UNIX V4.0f or later, you must
+// @note If you are using Digital UNIX V4.0f or later, you must
 // use config-tru64.h instead of directly using this config file.
 
 // The following configuration file is designed to work for the
 // Digital UNIX V4.0a through V4.0d with either the GNU g++, DEC
-// cxx 5.4 and later, Rational RCC (2.4.1) compilers, or KAI 3.3
-// compilers.  It is configured to use the IEEE Std 1003.1c-1995,
+// cxx 5.4 and later, Rational RCC (2.4.1) compilers/
+// It is configured to use the IEEE Std 1003.1c-1995,
 // POSIX System Application Program Interface, or DCE threads (with
 // cxx only); it automatically selects the proper thread interface
 // depending on whether the cxx -pthread or -threads option was
@@ -64,12 +64,13 @@
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_HAS_TYPENAME_KEYWORD
-# define ACE_HAS_USING_KEYWORD
 #elif defined (__KCC)
 # define ACE_HAS_STRING_CLASS
 # include "ace/config-kcc-common.h"
 #else
-# error unsupported compiler on Digital Unix
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#   error unsupported compiler on Digital Unix
+#  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ && !_KCC */
 
 #if (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500)
@@ -138,6 +139,7 @@
 #define ACE_HAS_LONG_MAP_FAILED
 #define ACE_HAS_MSG
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
+#define ACE_HAS_NONCONST_SENDMSG
 #define ACE_HAS_OSF1_GETTIMEOFDAY
 #define ACE_HAS_OSF_TIMOD_H
 #define ACE_HAS_POLL
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index 9427fa7962b..8e827eabea3 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -34,8 +34,24 @@
 #define ACE_USE_RCSID 0
 #endif /* #if !defined (ACE_USE_RCSID) */
 
+#define ACE_LACKS_ENV
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+
 #define ACE_LACKS_ASSERT_MACRO
+#define ACE_LACKS_KILL
+#define ACE_LACKS_SIGACTION
 
+#define ACE_LACKS_GETOPT
+#define ACE_LACKS_SYSCONF
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_LACKS_SIGSET
@@ -44,8 +60,13 @@
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_TRUNCATE
 #define ACE_LACKS_PRAGMA_ONCE
+#define ACE_LACKS_SYSTEM
 #define ACE_NLOGGING
 #define ACE_NDEBUG
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETHOSTBYNAME
 
 #define ACE_PSOS_LACKS_PREPC
 
@@ -66,6 +87,8 @@
 # define ACE_LACKS_TELLDIR
 # define ACE_LACKS_SEEKDIR
 # define ACE_LACKS_REWINDDIR
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
 
 # define ACE_THREADS_DONT_INHERIT_LOG_MSG
 
@@ -213,8 +236,6 @@
 
 #define ACE_LACKS_UNIX_SIGNALS
 
-// #define ACE_LACKS_SYSTIME_H
-
 // @todo: (dhinton) Not sure about this, but the following was in ace/OS_String.h
 // #if !defined (ACE_PSOS_DIAB_MIPS)
 //  # include /**/ <stdlib.h>
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index a73d96aecdf..213a0193dc4 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -41,6 +41,31 @@
 # define ACE_HAS_EXCEPTIONS
 #endif /* __GNUG__ */
 
+#define ACE_LACKS_ENV
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+#define ACE_LACKS_SYSTEM
+#define ACE_LACKS_KILL
+#define ACE_LACKS_SIGACTION
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETHOSTBYNAME
+
+#define ACE_LACKS_GETOPT
+#define ACE_LACKS_SYSCONF
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_PSOS_LACKS_PREPC
@@ -226,7 +251,6 @@
 #define ACE_THREADS_LACK_SHARED_SOCKETS
 
 // #define ACE_MALLOC_ALIGN 8
-// #define ACE_LACKS_SYSTIME_H
 
 #define ACE_PAGE_SIZE 4096
 
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index f7a4b804164..6e7ba0e87ad 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -15,12 +15,17 @@
 # undef __ACE_INLINE__
 #endif /* __ACE_INLINE__ */
 
+#define ACE_LACKS_ENV
+#define ACE_LACKS_ALARM
 #define ACE_LACKS_ISATTY
 #define ACE_LACKS_UMASK
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_LACKS_DIFFTIME
 #define ACE_LACKS_DUP2
+#define ACE_LACKS_SYSTEM
+#define ACE_LACKS_KILL
+#define ACE_LACKS_SIGACTION
 
 #define ACE_LACKS_FCNTL
 
@@ -36,7 +41,27 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETHOSTBYNAME
+
 #define ACE_PSOS_LACKS_PREPC
+#define ACE_LACKS_SYSCONF
 
 #define ACE_PSOS_HAS_TIME
 
@@ -159,6 +184,7 @@
 
 #define ACE_LACKS_LONGLONG_T
 
+#define ACE_LACKS_GETOPT
 #define ACE_LACKS_LSTAT
 
 #define ACE_LACKS_MADVISE
@@ -205,8 +231,6 @@
 
 #define ACE_LACKS_UNIX_SIGNALS
 
-// #define ACE_LACKS_SYSTIME_H
-
 #define ACE_PAGE_SIZE 4096
 
 #define ACE_PSOS_CANT_USE_SYS_TYPES
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index 02c510f016d..ae9d9649a98 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -19,9 +19,13 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
+#define ACE_LACKS_ENV
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_HAS_STRDUP_EMULATION
+#define ACE_LACKS_SYSTEM
+#define ACE_LACKS_KILL
+#define ACE_LACKS_SIGACTION
 
 #define ACE_HAS_IP_MULTICAST
 
@@ -43,14 +47,29 @@
 #define ACE_LACKS_HRTIME_T
 #define ACE_LACKS_UMASK
 
-// #define ACE_LACKS_EVENT_T
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETHOSTBYNAME
 
 #define ACE_HAS_VERBOSE_NOTSUP
 
 #define ACE_LACKS_MEMORY_H
 
-// #define ACE_LACKS_MALLOC_H
-
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETPROTOBYNUMBER
 #define ACE_LACKS_MMAP
 
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
@@ -173,8 +192,8 @@
 #define ACE_LACKS_UCONTEXT_H
 
 #define ACE_LACKS_UNIX_SIGNALS
-
-// #define ACE_LACKS_SYSTIME_H
+#define ACE_LACKS_SYSCONF
+#define ACE_LACKS_GETOPT
 
 #define ACE_PAGE_SIZE 4096
 
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 703edc1c950..3642dc93460 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -53,17 +53,21 @@
 #endif /* __GNUG__ */
 
 #define ACE_HAS_IP_MULTICAST
+#define ACE_LACKS_ENV
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_HAS_CPLUSPLUS_HEADERS
-
-// #define ACE_LACKS_U_LONG_LONG
+#define ACE_LACKS_SYSTEM
+#define ACE_LACKS_KILL
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETHOSTBYNAME
 
 #define ACE_LACKS_HRTIME_T
 
-// #define ACE_LACKS_EVENT_T
-
 #define ACE_HAS_VERBOSE_NOTSUP
+#define ACE_LACKS_SIGACTION
 
 #define ACE_LACKS_MEMORY_H
 
@@ -82,6 +86,20 @@
 
 #define ACE_LACKS_FORK
 
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_PIPE
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETPGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
 
 // rename the main entry point
 #define ACE_MAIN extern "C" void root
@@ -217,8 +235,7 @@
 #define ACE_LACKS_UNIX_SIGNALS
 
 #define ACE_LACKS_UTSNAME_T
-
-// #define ACE_LACKS_SYSTIME_H
+#define ACE_LACKS_UNAME
 
 #define ACE_PAGE_SIZE 4096
 
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
index d041a02cf20..32549c1aa87 100644
--- a/ace/config-qnx-neutrino.h
+++ b/ace/config-qnx-neutrino.h
@@ -75,7 +75,6 @@
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
@@ -84,7 +83,7 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_MACROS
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRERROR
@@ -120,7 +119,6 @@
 #define ACE_LACKS_STREAM_MODULES
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_TCP_NODELAY
diff --git a/ace/config-qnx-rtp-62x.h b/ace/config-qnx-rtp-62x.h
index 49f31b6cda1..a54bc100225 100644
--- a/ace/config-qnx-rtp-62x.h
+++ b/ace/config-qnx-rtp-62x.h
@@ -14,6 +14,7 @@
 //                ACE_HAS Section
 /////////////////////////////////////////////////////////////////
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#define ACE_HAS_3_PARAM_WCSTOK
 #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
@@ -41,7 +42,6 @@
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
@@ -51,7 +51,7 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_MACROS
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SNPRINTF
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
@@ -92,7 +92,6 @@
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_SYS_SHM_H
diff --git a/ace/config-qnx-rtp-pre62x.h b/ace/config-qnx-rtp-pre62x.h
index 0d3a64cd7f8..46734ef8670 100644
--- a/ace/config-qnx-rtp-pre62x.h
+++ b/ace/config-qnx-rtp-pre62x.h
@@ -42,7 +42,6 @@
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
@@ -51,7 +50,7 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIG_MACROS
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 // #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
@@ -96,7 +95,6 @@
 #define ACE_LACKS_STREAM_MODULES
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_SYSV_SHMEM
 //#define ACE_LACKS_TCP_NODELAY  // Based on the  QNX RTP documentation, this option seems to
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index 7917c0c6dfd..81cb8778a8f 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -38,7 +38,9 @@
 # define ACE_CONFIG_INCLUDE_CXX_COMMON
 # include "ace/config-cxx-common.h"
 #else  /* ! __GNUG__ && ! __KCC && !__DECCXX */
-# error unsupported compiler in ace/config-linux-common.h
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#   error unsupported compiler in ace/config-rtems.h
+#  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __KCC */
 
 // Completely common part :-)
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index c938cf165cb..55cbe40d5a0 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -52,7 +52,7 @@
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -118,7 +118,6 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_UCONTEXT_T
 
-#define ACE_LACKS_SYSTIME_H
 #define ACE_HAS_INLINED_OSCALLS
 
 #define ACE_HAS_STRBUF_T
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 34687bfb369..c155651a29a 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -36,7 +36,7 @@
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
 // Platform has POSIX terminal interface.
-#define ACE_HAS_TERMIOS 
+#define ACE_HAS_TERMIOS
 
 // Compiler/platform contains the <sys/syscall.h> file.
 //#define ACE_HAS_SYS_SYSCALL_H
@@ -88,7 +88,6 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_UCONTEXT_T
 
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_STRCASECMP
 
 // #define      ACE_HAS_POSIX_TIME
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 29e62b6dc69..76eb7d0e0e5 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -22,7 +22,6 @@
 
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 2783cd42875..ea612d66b70 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -16,7 +16,6 @@
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_CHARPTR_SPRINTF
-#define ACE_LACKS_SYSTIME_H
 #define ACE_HAS_UNION_WAIT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index f3ed77a046d..034b6011315 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -8,14 +8,12 @@
 #define ACE_CONFIG_H
 #include /**/ "ace/pre.h"
 
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
 
 #define ACE_HAS_CHARPTR_SPRINTF
-// #define ACE_HAS_UNION_WAIT
 
 // Maximum compensation (10 ms) for early return from timed ::select ().
 #if !defined (ACE_TIMER_SKEW)
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 7dbd005d6cf..df0d32c6e0e 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -38,8 +38,7 @@
     // If -compat=4 is turned on, the old 4.2 settings for iostreams are used,
     // but the newer, explicit instantiation is used (above)
 #   if (__SUNPRO_CC_COMPAT >= 5)
-#     define ACE_HAS_USING_KEYWORD
-#       define ACE_HAS_TEMPLATE_TYPEDEFS
+#     define ACE_HAS_TEMPLATE_TYPEDEFS
 #     define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #     define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #     define ACE_HAS_THR_C_DEST
@@ -83,6 +82,29 @@
     /* If you want to disable threading with Sun CC, remove -mt
        from your CFLAGS, e.g., using make threads=0. */
 
+
+// Take advantage of Sun Studio 8 (Sun C++ 5.5) or better symbol
+// visibility to generate improved shared library binaries.
+#  if (__SUNPRO_CC > 0x540)
+
+#    if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
+#     undef ACE_HAS_CUSTOM_EXPORT_MACROS
+#    else
+#      ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
+#        define ACE_HAS_CUSTOM_EXPORT_MACROS
+#      endif  /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
+#      define ACE_Proper_Export_Flag __symbolic
+#      define ACE_Proper_Import_Flag __global
+
+#      define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
+#      define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>;
+
+// #      define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T
+// #      define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE<CLASS, LOCK>;
+
+#    endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
+#  endif  /* __SUNPRO_CC > 0x540 (> Sun C++ 5.4) */
+
 #elif defined (__GNUG__)
   // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
   // this must appear before its #include.
@@ -125,23 +147,21 @@
   // IOStream_Test never halts with Green Hills 1.8.9.
 # define ACE_LACKS_ACE_IOSTREAM
 
-#elif defined (__KCC) /* KAI compiler */
-
-# include "ace/config-kcc-common.h"
-
 #else  /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
-# error unsupported compiler in ace/config-sunos5.5.h
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#    error unsupported compiler in ace/config-sunos5.5.h
+#  endif /* __cplusplus */
 #endif /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
 
 #if !defined (__ACE_INLINE__)
-// NOTE:  if you have link problems with undefined inline template
+// @note If you have link problems with undefined inline template
 // functions with Sun C++, be sure that the #define of __ACE_INLINE__
 // below is not commented out.
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
 // Platform supports the POSIX regular expression library.
-// NOTE:  please comment out the ACE_HAS_REGEX #define if you
+// @note Please comment out the ACE_HAS_REGEX #define if you
 // have link problems with g++ or egcs on SunOS 5.5.
 #define ACE_HAS_REGEX
 
@@ -258,6 +278,11 @@
 
 // SunOS 5.5.x does not support mkstemp
 #define ACE_LACKS_MKSTEMP
+#define ACE_LACKS_SYS_SYSCTL_H
+
+#if !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4))
+#  define ACE_HAS_CHARPTR_SHMDT
+#endif
 
 // Platform has posix getpwnam_r
 #if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE - 0 >= 199506L) || \
diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h
index 8a846c577ef..c0904971830 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -54,9 +54,6 @@
 #ifndef ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_TYPENAME_KEYWORD                1
 #endif /* ACE_HAS_TYPENAME_KEYWORD */
-#ifndef ACE_HAS_USING_KEYWORD
-#define ACE_HAS_USING_KEYWORD                   1
-#endif /* ACE_HAS_USING_KEYWORD */
 #ifndef ACE_HAS_THR_C_DEST
 #define ACE_HAS_THR_C_DEST                      1
 #endif /* ACE_HAS_THR_C_DEST */
diff --git a/ace/config-sunos5.8.h b/ace/config-sunos5.8.h
index 423fb1de7c4..3d87e08d32b 100644
--- a/ace/config-sunos5.8.h
+++ b/ace/config-sunos5.8.h
@@ -19,6 +19,8 @@
 #  define ACE_HAS_TIMEZONE
 #endif
 
+#define ACE_HAS_SENDFILE
+
 // The range of thread priorities for 5.8 differs from 5.7 in the
 // minimum priority for the SCHED_OTHER policy (i.e.,
 // ACE_THR_PRI_OTHER_MIN)
diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h
index 814a85ac625..fe35e30ba68 100644
--- a/ace/config-tandem-nsk-mips-v2.h
+++ b/ace/config-tandem-nsk-mips-v2.h
@@ -28,7 +28,7 @@
 
 // Use all available T1248 thread aware wrapper functions for providing
 // non-blocking I/O.
-// [Note: this causes a significant performance degradation]
+// [@note this causes a significant performance degradation]
 //#define ACE_TANDEM_T1248_PTHREADS_ALL_IO_WRAPPERS
 
 
@@ -316,9 +316,6 @@ extern int cma_sigwait  (sigset_t *);
 // Platform lacks malloc.h
 #define ACE_LACKS_MALLOC_H
 
-// <time.h> doesn't automatically #include /**/ <sys/time.h>
-#define ACE_LACKS_SYSTIME_H
-
 // Platform lacks the siginfo.h include file
 #define ACE_LACKS_SIGINFO_H
 
@@ -403,9 +400,6 @@ extern int cma_sigwait  (sigset_t *);
 // Following will not be needed if use standard c library (G06.20 and later)
 #define ACE_LACKS_SIGNED_CHAR
 
-// Compiler supports the new using keyword for C++ namespaces.
-#define ACE_HAS_USING_KEYWORD
-
 //=========================================================================
 // Build options
 //=========================================================================
diff --git a/ace/config-tandem-nsk-mips-v3.h b/ace/config-tandem-nsk-mips-v3.h
index b4a4805b988..c98533aff5d 100644
--- a/ace/config-tandem-nsk-mips-v3.h
+++ b/ace/config-tandem-nsk-mips-v3.h
@@ -330,9 +330,6 @@ extern int cma_sigwait  (sigset_t *);
 // Platform lacks malloc.h
 #define ACE_LACKS_MALLOC_H
 
-// <time.h> doesn't automatically #include /**/ <sys/time.h>
-#define ACE_LACKS_SYSTIME_H
-
 // Platform lacks the siginfo.h include file
 #define ACE_LACKS_SIGINFO_H
 
@@ -421,9 +418,6 @@ extern int cma_sigwait  (sigset_t *);
 // Following will not be needed if use standard c library (G06.20 and later)
 #define ACE_LACKS_SIGNED_CHAR
 
-// Compiler supports the new using keyword for C++ namespaces.
-#define ACE_HAS_USING_KEYWORD
-
 // Compiler supports the typename keyword for templates
 #define ACE_HAS_TYPENAME_KEYWORD
 
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index c74cf133d1e..7b2867a0fda 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -184,8 +184,6 @@
 #define ACE_LACKS_MADVISE
 //Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS)
 #define ACE_LACKS_STRCASECMP
-//<time.h> doesn't automatically #include /**/ <sys/time.h>
-#define ACE_LACKS_SYSTIME_H
 
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index df7e073deee..23af0e4cf8e 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -27,14 +27,9 @@
     Interface wide-character
     classification.*/
 # endif /* DIGITAL_UNIX >= 0x500 */
-# if DIGITAL_UNIX >= 0x40D
-#   define ACE_LACKS_SYSTIME_H
-# endif /* DIGITAL_UNIX >= 0x40D */
 # if DIGITAL_UNIX >= 0x40E
 #   define ACE_LACKS_STDINT_H
 # endif /* DIGITAL_UNIX >= 0x40E */
-#else  /* ! DIGITAL_UNIX */
-# include "ace/config-osf1-3.2.h"
 #endif /* ! DIGITAL_UNIX */
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index f4b3960d65e..32536ce3003 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -25,7 +25,6 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-#define ACE_LACKS_SYSTIME_H
 // ualarm is only in BSD compatibility lib, but no header is provided
 // #define ACE_HAS_UALARM
 #define ACE_HAS_SIZET_SOCKET_LEN
diff --git a/ace/config-unixware-7.1.0.h b/ace/config-unixware-7.1.0.h
index ea92a0a0393..667b93db8b0 100644
--- a/ace/config-unixware-7.1.0.h
+++ b/ace/config-unixware-7.1.0.h
@@ -171,9 +171,6 @@
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM 1
 
-/* Platform has pthread_sigmask() defined. */
-#define ACE_HAS_PTHREAD_SIGMASK 1
-
 /* Platform will recurse infinitely on thread exits from TSS cleanup routines
    (e.g., AIX) */
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1
@@ -209,7 +206,7 @@
 #define ACE_HAS_SIG_ATOMIC_T 1
 
 /* Platform supports new BSD inet_addr len field. */
-#define ACE_HAS_SIN_LEN 1
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN 1
 
 /* OS/compiler uses size_t * rather than int * for socket lengths */
 #define ACE_HAS_SIZET_SOCKET_LEN 1
@@ -342,9 +339,6 @@
 /* Platform needs to #include <sched.h> to get thread scheduling defs. */
 #define ACE_NEEDS_SCHED_H 1
 
-/* <time.h> doesn't automatically #include <sys/time.h> */
-#define ACE_LACKS_SYSTIME_H 1
-
 /*********************************************************************/
 /* Compiler's template mechanim must see source code (i.e., .cpp files).  This
    is used for GNU G++. */
diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h
index 9481dc88a2c..f449152026d 100644
--- a/ace/config-unixware-7.1.0.udk.h
+++ b/ace/config-unixware-7.1.0.udk.h
@@ -223,9 +223,6 @@
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM
 
-/* Platform has pthread_sigmask() defined. */
-#define ACE_HAS_PTHREAD_SIGMASK
-
 /* Platform will recurse infinitely on thread exits from TSS cleanup routines
    (e.g., AIX) */
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
@@ -261,7 +258,7 @@
 #define ACE_HAS_SIG_ATOMIC_T
 
 /* Platform supports new BSD inet_addr len field. */
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 
 /* OS/compiler uses size_t * rather than int * for socket lengths */
 #define ACE_HAS_SIZET_SOCKET_LEN
@@ -366,9 +363,6 @@
 /* Compiler supports the C++ typename keyword */
 #define ACE_HAS_TYPENAME_KEYWORD 1
 
-/* Compiler supports the new using keyword for C++ namespaces. */
-#define ACE_HAS_USING_KEYWORD 1
-
 /* Prints out console message in ACE_NOTSUP.  Useful for tracking down origin
    of ACE_NOTSUP. */
 /* #undef ACE_HAS_VERBOSE_NOTSUP */
@@ -417,9 +411,6 @@
 /* Platform needs to #include <sched.h> to get thread scheduling defs. */
 #define ACE_NEEDS_SCHED_H 1
 
-/* <time.h> doesn't automatically #include <sys/time.h> */
-#define ACE_LACKS_SYSTIME_H 1
-
 /* Turns off the LM_DEBUG and LM_ERROR logging macros... */
 /* #undef ACE_NLOGGING */
 
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 1d78f5df97c..146c5d65e86 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -95,12 +95,12 @@
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0
 
-# define ACE_HAS_USING_KEYWORD
-
 # define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #else  /* ! __GNUG__ && ! ghs && !__DCC__ */
-# error unsupported compiler on VxWorks
+#  ifdef __cplusplus  /* Let it slide for C compilers. */
+#    error unsupported compiler on VxWorks
+#  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! ghs */
 
 // OS-specific configuration
@@ -152,6 +152,9 @@
 #define ACE_LACKS_FPUTWS
 #define ACE_LACKS_FSYNC
 #define ACE_LACKS_GETHOSTENT
+#define ACE_LACKS_GETOPT
+#define ACE_LACKS_GETPID
+#define ACE_LACKS_GETPPID
 #define ACE_LACKS_GETSERVBYNAME
 #define ACE_LACKS_KEY_T
 #define ACE_LACKS_LSTAT
@@ -164,6 +167,11 @@
 #define ACE_LACKS_MMAP
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MSYNC
+#define ACE_LACKS_NUMERIC_LIMITS
+#define ACE_LACKS_GETPROTOBYNAME
+#define ACE_LACKS_GETPROTOBYNUMBER
+#define ACE_LACKS_GETHOSTBYADDR
+#define ACE_LACKS_GETHOSTBYNAME
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_PWD_FUNCTIONS
@@ -182,7 +190,8 @@
 #define ACE_LACKS_STRCASECMP
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
+#define ACE_LACKS_SYSCONF
+#define ACE_LACKS_SYS_SYSCTL_H
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_TELLDIR
 #define ACE_LACKS_TEMPNAM
@@ -191,11 +200,15 @@
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_UMASK
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_UNAME
 #define ACE_LACKS_NATIVE_STRPTIME
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
 #define ACE_LACKS_WCTYPE_H
 #define ACE_LACKS_DUP2
+#define ACE_LACKS_DUP
+#define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_USECONDS_T
 #define ACE_PAGE_SIZE 4096
 #define ACE_THR_PRI_FIFO_DEF 101
 #define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
@@ -205,6 +218,21 @@
 # define ACE_VXWORKS_SPARE spare4
 #endif /* ! ACE_VXWORKS_SPARE */
 
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETPGID
+#define ACE_LACKS_SETREGID
+#define ACE_LACKS_SETREUID
+#define ACE_LACKS_SETSID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETGID
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_SETGID
+#define ACE_LACKS_GETPGID
+
+#define ACE_LACKS_PIPE
 #define ACE_LACKS_STDINT_H
 #define ACE_LACKS_INTTYPES_H
 #define ACE_LACKS_UNISTD_H
@@ -224,6 +252,7 @@
 #define ACE_LACKS_STRINGS_H
 #define ACE_LACKS_TERMIOS_H
 #define ACE_LACKS_POLL_H
+#define ACE_LACKS_WCTYPE_H
 
 // Not sure if these should always be defined.
 #define ACE_LACKS_SYS_UN_H
@@ -252,7 +281,11 @@
 #define ACE_LACKS_WCSTOL
 #define ACE_LACKS_WCSTOUL
 #define ACE_LACKS_WCSDUP
+
 #define ACE_LACKS_SYMLINKS
+#define ACE_LACKS_FGETWC
+#define ACE_LACKS_FGETWS
+#define ACE_LACKS_FPUTWS
 
 // It is possible to enable pthread support with VxWorks, when the user decides
 // to use this, we need some more defines
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 6f87f84ffc2..91b81ece8a1 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -67,11 +67,20 @@
 #define ACE_LACKS_NET_IF_H
 #define ACE_LACKS_SYS_IPC_H
 #define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_STDINT_H
-#define ACE_LACKS_DIRENT_H
 #define ACE_LACKS_SYS_IOCTL_H
 #define ACE_LACKS_STROPTS_H
 
+#undef ACE_LACKS_STRUCT_DIR
+#undef ACE_LACKS_CLOSEDIR
+#undef ACE_LACKS_OPENDIR
+#undef ACE_LACKS_READDIR
+#undef ACE_LACKS_REWINDDIR
+
+#define ACE_HAS_WOPENDIR
+#define ACE_HAS_WCLOSEDIR
+#define ACE_HAS_WREADDIR
+#define ACE_HAS_WREWINDDIR
+
 #define ACE_LACKS_STRRECVFD
 #define ACE_USES_EXPLICIT_STD_NAMESPACE
 
@@ -86,8 +95,19 @@
 # endif /* !_MT && !ACE_HAS_WINCE */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if (__BORLANDC__ < 0x570)
+#if (__BORLANDC__ < 0x580)
 # define ACE_LACKS_INTPTR_T
+# define ACE_HAS_NONCONST_SWAB
+# define ACE_HAS_NONCONST_FDOPEN
+#endif
+
+#define ACE_HAS_NONCONST_TEMPNAM
+
+// The Borland compiler can't handle assembly in inline methods or
+// templates (E2211). When we build for pentium optimized and we are inlining
+// then we disable inline assembly
+#if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__)
+# define ACE_LACKS_INLINE_ASSEMBLY
 #endif
 
 #if (__BORLANDC__ >= 0x600)
@@ -104,7 +124,6 @@
 # define ACE_STRCASECMP_EQUIVALENT ::stricmp
 # define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
 # define ACE_HAS_ITOA 1
-# define ACE_HAS_NONCONST_SWAB
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 7b171b5d98d..bc8964d2ab9 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -232,12 +232,23 @@
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
 #define ACE_LACKS_SETSID
+#define ACE_LACKS_SETEGID
+#define ACE_LACKS_SETUID
+#define ACE_LACKS_SETEUID
+#define ACE_LACKS_GETGID
+#define ACE_LACKS_GETEGID
+#define ACE_LACKS_GETUID
+#define ACE_LACKS_GETEUID
+#define ACE_LACKS_SETGID
 
 /* LACKS miscellaneous */
+#define ACE_LACKS_ALARM
 #define ACE_LACKS_ARPA_INET_H
 #define ACE_LACKS_DUP2
 #define ACE_LACKS_FORK
 #define ACE_LACKS_GETHOSTENT
+#define ACE_LACKS_GETOPT
+#define ACE_LACKS_KILL
 #define ACE_LACKS_INET_ATON
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MKFIFO
@@ -247,16 +258,22 @@
 #define ACE_LACKS_READLINK
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_SBRK
+#define ACE_LACKS_SCHED_H
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SIGACTION
 #define ACE_LACKS_SIGSET
 #define ACE_LACKS_SOCKETPAIR
+#define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_USECONDS_T
 #define ACE_LACKS_SYS_PARAM_H
+#define ACE_LACKS_SYS_SYSCTL_H
+#define ACE_LACKS_SYSCONF
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_UNISTD_H
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UNIX_SYSLOG
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_UNAME
 #define ACE_LACKS_WAIT
 
 #define ACE_HAS_SNPRINTF
diff --git a/ace/config-win32-dmc.h b/ace/config-win32-dmc.h
index 3b330431fed..fa623098e74 100644
--- a/ace/config-win32-dmc.h
+++ b/ace/config-win32-dmc.h
@@ -59,10 +59,8 @@
 # define ACE_HAS_TYPENAME_KEYWORD 1
 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 # define ACE_HAS_USER_MODE_MASKS 1
-# define ACE_HAS_USING_KEYWORD 1
 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_NATIVE_STRPTIME 1
-//# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
 //# define ACE_LACKS_PRAGMA_ONCE 1
 //# define ACE_NEW_THROWS_EXCEPTIONS 1
 # define ACE_SIZEOF_LONG_DOUBLE 10
@@ -94,6 +92,7 @@
 #define ACE_LACKS_UNISTD_H
 #define ACE_LACKS_TERMIOS_H
 #define ACE_LACKS_ACE_IOSTREAM
+#define ACE_HAS_NONCONST_TEMPNAM
 
 // Typedefs which we expect DMC to do, but they don't do that
 typedef long o_uid_t;
diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h
index 8d43e1ab9fd..e4c2ef327f4 100644
--- a/ace/config-win32-ghs.h
+++ b/ace/config-win32-ghs.h
@@ -66,11 +66,9 @@
 # define ACE_HAS_TYPENAME_KEYWORD 1
 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 # define ACE_HAS_USER_MODE_MASKS 1
-# define ACE_HAS_USING_KEYWORD 1
 # define ACE_LACKS_ACE_IOSTREAM 1
 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_NATIVE_STRPTIME 1
-//# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
 //# define ACE_LACKS_PRAGMA_ONCE 1
 # define ACE_LACKS_STRRECVFD 1
 //# define ACE_NEW_THROWS_EXCEPTIONS 1
diff --git a/ace/config-win32-interix.h b/ace/config-win32-interix.h
index 9d9f25ee7a3..53ace409799 100644
--- a/ace/config-win32-interix.h
+++ b/ace/config-win32-interix.h
@@ -60,10 +60,9 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_POSIX_TIME                  // Supports POSIX timers via struct timespec.
 #define ACE_LACKS_TIMESPEC_T                // Defines struct timespec but not timespec_t.
-#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SETSCHED
-#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_RTLD_LAZY_V
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_GETRUSAGE
diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h
index d8675574213..c49dcd97115 100644
--- a/ace/config-win32-mingw.h
+++ b/ace/config-win32-mingw.h
@@ -81,6 +81,7 @@
 #define ACE_LACKS_SYS_SEM_H
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_SYS_IOCTL_H
+#define ACE_HAS_NONCONST_WCSDUP
 
 // We trust the user: He must have used -mpentiumpro or -mpentium
 // if that is what he wants.
diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h
index 842e7c91b5d..221a4989d43 100644
--- a/ace/config-win32-msvc-6.h
+++ b/ace/config-win32-msvc-6.h
@@ -44,7 +44,6 @@
 // Keywords
 
 # define ACE_HAS_TYPENAME_KEYWORD
-# define ACE_HAS_USING_KEYWORD
 
 // No support for member templates.
 #define ACE_LACKS_MEMBER_TEMPLATES
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index e1c57096a6a..2fbae1e20aa 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -38,11 +38,9 @@
 #endif
 
 #define ACE_HAS_TYPENAME_KEYWORD
-#define ACE_HAS_USING_KEYWORD
 
 #define ACE_HAS_ITOA
 
-#define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
 #define ACE_ITOA_EQUIVALENT ::_itoa
@@ -63,9 +61,7 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-#if (_MSC_VER >= 1310)
-#  define ACE_HAS_TEMPLATE_TYPEDEFS
-#endif
+#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index bdad809bff9..897bf4b44f4 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -32,17 +32,10 @@
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #endif
 
-// Win64 SDK compiler claims std::auto_ptr<>::reset not available.
-#if defined (_WIN64) || defined (WIN64)
-#define ACE_AUTO_PTR_LACKS_RESET
-#endif
-
 #define ACE_HAS_TYPENAME_KEYWORD
-#define ACE_HAS_USING_KEYWORD
 
 #define ACE_HAS_ITOA
 
-#define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
 #define ACE_ITOA_EQUIVALENT ::_itoa
@@ -50,15 +43,13 @@
 #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
 #define ACE_WCSDUP_EQUIVALENT ::_wcsdup
 
-//#if defined (_WIN32_WCE) && (_WIN32_WCE < 0x500)
-//#  define ACE_LACKS_RTTI
-//#else
-#  define ACE_HAS_EXCEPTIONS
+#define ACE_HAS_EXCEPTIONS
+#define ACE_HAS_NEW_NOTHROW
+
 // Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will.
 #  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501)
 #    define ACE_HAS_SIG_ATOMIC_T
 #  endif /* !Win CE 5.0 or less */
-//#endif /* _WIN32_WCE && _WIN32_WCE < 500 */
 
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRPTIME
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index dd280d0cfaf..d9168124756 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -67,13 +67,10 @@
 
 #if (_MSC_VER >= 1400)
 # include "ace/config-win32-msvc-8.h"
-#elif (_MSC_VER >= 1300)
+#elif (_MSC_VER >= 1310)
 # include "ace/config-win32-msvc-7.h"
-// FUZZ: disable check_for_msc_ver
-#elif (_MSC_VER >= 1200)
-# include "ace/config-win32-msvc-6.h"
 #else
-# error This version of Microsoft Visual C++ not supported.
+# error This version of Microsoft Visual C++ is not supported.
 #endif
 
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index cf20e3e2496..1a3ac304e0c 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -52,7 +52,6 @@
 #define ACE_LACKS_MKTEMP
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define NSIG 23 /* Maximum no. of signals + 1 */
-#define ACE_HAS_BROKEN_NESTED_TEMPLATES 1
 #define ACE_HAS_CPLUSPLUS_HEADERS 1
 #define ACE_HAS_EXCEPTIONS 1
 #define ACE_HAS_GNU_CSTRING_H 1
@@ -66,7 +65,6 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
 #define ACE_HAS_TYPENAME_KEYWORD 1
-#define ACE_HAS_USING_KEYWORD 1
 #define ACE_LACKS_ACE_IOSTREAM 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 #define ACE_LACKS_NATIVE_STRPTIME 1
diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp
index b242ef2db27..74dbb62b689 100644
--- a/ace/gethrtime.cpp
+++ b/ace/gethrtime.cpp
@@ -10,12 +10,15 @@
 ACE_RCSID(ace, gethrtime, "$Id$")
 
 #if defined (ghs) && (defined (i386) || defined(__i386__))
+
+#include "ace/OS_NS_time.h"
+
 extern "C"
 ACE_hrtime_t
-ACE_gethrtime (void)
+ACE_GETHRTIME_NAME (void)
 {
 #if defined (ACE_HAS_PENTIUM)
-  // ACE_TRACE ("ACE_gethrtime");
+  // ACE_TRACE ("ACE_GETHRTIME_NAME");
 
 #if defined (ACE_LACKS_LONGLONG_T)
   double now;
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index 75550a57c16..4da758caa8f 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -42,10 +42,10 @@
 #if defined (ACE_HAS_STANDARD_CPP_LIBRARY)  && \
     (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 
-# if !defined (ACE_USES_OLD_IOSTREAMS) 
+# if !defined (ACE_USES_OLD_IOSTREAMS)
 #   include /**/ <iosfwd>
 # else
-  // NOTE: If these forward declarations don't work (e.g. aren't
+  // @note If these forward declarations don't work (e.g. aren't
   //       portable), we may have to include "ace/streams.h" as a last
   //       resort.  Doing so would defeat the purpose of this header,
   //       unfortunately.
diff --git a/ace/os_include/os_dirent.h b/ace/os_include/os_dirent.h
index 9564634348e..fc2bcb18575 100644
--- a/ace/os_include/os_dirent.h
+++ b/ace/os_include/os_dirent.h
@@ -27,7 +27,7 @@
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_limits.h"
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include "ace/os_include/os_unistd.h"  // VxWorks needs this to compile
 #endif /* VXWORKS */
 
@@ -70,6 +70,8 @@ struct dirent {
   ACE_TCHAR *d_name;
 };
 
+#define ACE_DIRENT dirent
+
 struct ACE_DIR {
   /// The name of the directory we are looking into
   ACE_TCHAR *directory_name_;
@@ -78,7 +80,7 @@ struct ACE_DIR {
   HANDLE current_handle_;
 
   /// The struct for the results
-  dirent *dirent_;
+  ACE_DIRENT *dirent_;
 
   /// The struct for intermediate results.
   ACE_TEXT_WIN32_FIND_DATA fdata_;
@@ -97,9 +99,16 @@ struct ACE_DIR
   /// The directory entry
   struct dirent   dirent;
 };
+
+#define ACE_DIRENT dirent
+
+#elif defined (ACE_WIN32) && (__BORLANDC__) && defined (ACE_USES_WCHAR)
+#define ACE_DIRENT wdirent
+typedef wDIR ACE_DIR;
 #else
+#define ACE_DIRENT dirent
 typedef DIR ACE_DIR;
-# endif /* ACE_LACKS_STRUCT_DIR */
+#endif /* ACE_LACKS_STRUCT_DIR */
 
 #if defined rewinddir
 # undef rewinddir
@@ -111,7 +120,7 @@ int scandir (const char *,
              int (*) (const struct dirent *),
              int (*) (const void *, const void *));
 #endif /* ACE_LACKS_SCANDIR_PROTOTYPE */
-    
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/os_dlfcn.h b/ace/os_include/os_dlfcn.h
index 91864eae5e0..bda2ca52acc 100644
--- a/ace/os_include/os_dlfcn.h
+++ b/ace/os_include/os_dlfcn.h
@@ -42,7 +42,7 @@
 #  endif /* (g++ || HP aC++) vs. HP C++ */
 #endif /* __hpux */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 #  include /**/ <loadLib.h> /* for module load */
 #  include /**/ <unldLib.h> /* for module unload */
 #  include /**/ <symLib.h> /* for findSymbol  */
diff --git a/ace/os_include/os_errno.h b/ace/os_include/os_errno.h
index e633a7a4fb9..b55cc024d31 100644
--- a/ace/os_include/os_errno.h
+++ b/ace/os_include/os_errno.h
@@ -29,9 +29,9 @@
 #endif /* !ACE_LACKS_ERRNO_H */
 
 // Needed for VxWorks to pickup errnoSet()
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 #include /**/ <errnoLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_fcntl.h b/ace/os_include/os_fcntl.h
index 0d456c06043..275d131bb8f 100644
--- a/ace/os_include/os_fcntl.h
+++ b/ace/os_include/os_fcntl.h
@@ -31,10 +31,10 @@
 # include /**/ <fcntl.h>
 #endif /* !ACE_LACKS_FCNTL_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 // for creat(), open()
 #  include /**/ <ioLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_limits.h b/ace/os_include/os_limits.h
index 27be31af2b4..17dba75622a 100644
--- a/ace/os_include/os_limits.h
+++ b/ace/os_include/os_limits.h
@@ -35,11 +35,10 @@
 #  include /**/ <sys/param.h>
 #endif /* ACE_LACKS_SYS_PARAM_H */
 
-// On VxWorks _POSIX_TIMER_MAX is defined in time.h, report this to WindRiver
-// support.
-#if defined (VXWORKS)
+// On VxWorks 5.5.1 _POSIX_TIMER_MAX is defined in time.h
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <time.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
@@ -103,6 +102,12 @@ extern "C"
 #  define ACE_IOV_MAX IOV_MAX
 #endif /* ACE_IOV_MAX */
 
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620)
+#  if defined (PIPE_BUF) && (PIPE_BUF == -1)
+#    undef PIPE_BUF
+#  endif
+#endif /* ACE_VXWORKS == 0x620 */
+
 #if !defined (PIPE_BUF)
 #  define PIPE_BUF 5120
 #endif /* PIPE_BUF */
diff --git a/ace/os_include/os_netdb.h b/ace/os_include/os_netdb.h
index fb220a0b518..b02ff121d63 100644
--- a/ace/os_include/os_netdb.h
+++ b/ace/os_include/os_netdb.h
@@ -39,9 +39,9 @@
 #  endif /* ACE_HAS_STL_QUEUE_CONFLICT */
 #endif /* !ACE_LACKS_NETDB_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <hostLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
@@ -49,9 +49,7 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-// VxWorks does define these, at least on a Sun cross compile, so this
-// may need to be added back for windows.
-#if defined (ACE_PSOS) //|| defined (VXWORKS)
+#if defined (ACE_PSOS)
    struct  hostent {
      char    *h_name;        /* official name of host */
      char    **h_aliases;    /* alias list */
diff --git a/ace/os_include/os_sched.h b/ace/os_include/os_sched.h
index ad5f0b2c4d6..4a536703218 100644
--- a/ace/os_include/os_sched.h
+++ b/ace/os_include/os_sched.h
@@ -36,6 +36,14 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+#if !defined (__cpu_set_t_defined) || !defined (ACE_HAS_CPU_SET_T)
+#  define ACE_CPU_SETSIZE 1024
+   typedef struct
+   {
+     ACE_UINT32 bit_array_[ACE_CPU_SETSIZE / (8 * sizeof (ACE_UINT32))];
+   } cpu_set_t;
+#endif /* !ACE_HAS_CPU_SET_T || !__cpu_set_t_defined */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/os_semaphore.h b/ace/os_include/os_semaphore.h
index a1905169249..a703c55d368 100644
--- a/ace/os_include/os_semaphore.h
+++ b/ace/os_include/os_semaphore.h
@@ -58,6 +58,14 @@ extern "C"
      /// remember if we need to delete <sema_> or not.
      int new_sema_;
 #  endif /* ACE_LACKS_NAMED_POSIX_SEM */
+
+#  if !defined (ACE_HAS_POSIX_SEM_TIMEOUT)
+     /// Serialize access to internal state.
+     ACE_mutex_t lock_;                     
+
+     /// Block until there are no waiters.
+     ACE_cond_t count_nonzero_;
+#  endif /* !ACE_HAS_POSIX_SEM_TIMEOUT */
    } ACE_sema_t;
 #endif /* ACE_HAS_POSIX_SEM */
 
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index 058fa57fcb5..a38dcbfe754 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -48,9 +48,9 @@
 #  endif /* ACE_LACKS_SIGINFO_H */
 #endif /* ACE_HAS_SIGINFO_T */
 
-#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) && !defined (__RTP__)
 #  include /**/ <sigLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // should this be extern "C" {}?
 #if defined (CHORUS)
diff --git a/ace/os_include/os_stdio.h b/ace/os_include/os_stdio.h
index 95ff455e14c..1a977f784d9 100644
--- a/ace/os_include/os_stdio.h
+++ b/ace/os_include/os_stdio.h
@@ -32,12 +32,15 @@
 #  include /**/ <stdio.h>
 #endif /* !ACE_LACKS_STDIO_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 // for remove(), rename()
 #  include /**/ <ioLib.h>
 // for remCurIdGet()
 #  include /**/ <remLib.h>
-#endif /* VXWORKS */
+#  if defined (__RTP__) && (ACE_VXWORKS == 0x620)
+#    define L_cuserid       _PARM_L_cuserid
+#  endif
+#endif /* ACE_VXWORKS */
 
 // Undefine "functions" that may be implemented as macros.
 #ifdef fgetc
diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h
index 5bcb77f430c..91324a4f890 100644
--- a/ace/os_include/os_stdlib.h
+++ b/ace/os_include/os_stdlib.h
@@ -35,7 +35,7 @@
 #  include /**/ <stdlib.h>
 #endif /* !ACE_LACKS_STDLIB_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (__RTP__)
 #  include /**/ <envLib.h>
 #endif /* VXWORKS */
 
diff --git a/ace/os_include/os_string.h b/ace/os_include/os_string.h
index 2af1d2901f8..8fc7d30bb40 100644
--- a/ace/os_include/os_string.h
+++ b/ace/os_include/os_string.h
@@ -59,7 +59,7 @@ extern "C"
   char *strtok_r (char *s, const char *delim, char **save_ptr);
 #endif  /* ACE_LACKS_STRTOK_R_PROTOTYPE */
 
-#if defined (__BORLANDC__)
+#if defined (__BORLANDC__) && (__BORLANDC__ < 0x560)
 #  define _stricmp stricmp
 #  define _strnicmp strnicmp
 #endif /* __BORLANDC__ */
diff --git a/ace/os_include/os_stropts.h b/ace/os_include/os_stropts.h
index e28b672f560..b63cf5d964a 100644
--- a/ace/os_include/os_stropts.h
+++ b/ace/os_include/os_stropts.h
@@ -72,10 +72,10 @@
 #  endif /* AIX */
 #endif /* ACE_HAS_STREAMS */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 // for ioctl()
 #  include /**/ <ioLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index 78300ba24be..a6a4fabe69e 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -53,6 +53,24 @@ using std::timezone;
 using std::difftime;
 # endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */
 
+# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS)
+// Definition per POSIX.
+typedef struct timespec
+{
+  /// Seconds
+  time_t tv_sec;
+  /// Nanoseconds
+  long tv_nsec;
+} timespec_t;
+# elif defined (ACE_HAS_BROKEN_POSIX_TIME)
+// OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs
+#   include /**/ <sys/timers.h>
+# endif /* !ACE_HAS_POSIX_TIME */
+
+# if defined(ACE_LACKS_TIMESPEC_T)
+typedef struct timespec timespec_t;
+# endif /* ACE_LACKS_TIMESPEC_T */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index 8a9324cd741..a60a3b18595 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -44,13 +44,15 @@
 #  include /**/ <unistd.h>
 #endif /* !ACE_LACKS_UNISTD_H */
 
-#if defined (VXWORKS)
-// for unlink(), close(), read(), write(), lseek(), chdir(), getcwd(),
-// getwd(), and isatty()
-#  include /**/ <ioLib.h>
+#if defined (ACE_VXWORKS)
+#  if !defined (__RTP__)
+    // for unlink(), close(), read(), write(), lseek(), chdir(), getcwd(),
+   // getwd(), and isatty()
+   #  include /**/ <ioLib.h>
+#  endif
 // for gethostname()
 #  include /**/ <hostLib.h>
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
@@ -134,11 +136,11 @@ extern "C"
 #endif  /* _LARGEFILE64_SOURCE */
 
 #if defined (__BORLANDC__)
-#  define _chdir chdir
-#  undef _access
-#  define _access access
 #  if (__BORLANDC__ <= 0x540)
 #    define _getcwd getcwd
+#    define _chdir chdir
+#    undef _access
+#    define _access access
 #  endif
 #  define _isatty isatty
 #endif /* __BORLANDC__ */
@@ -169,11 +171,11 @@ extern "C"
 #if defined (ACE_LACKS_SWAB_PROTOTYPE)
   void swab(const void *, void *, ssize_t);
 #endif /* ACE_LACKS_SWAB_PROTOTYPE */
-  
+
 #if defined (ACE_LACKS_GETOPT_PROTOTYPE)
   int getopt(int, char * const [], const char *);
 #endif /* ACE_LACKS_GETOPT_PROTOTYPE */
-  
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h
index 6ccb58d548f..fea2f3e5a5e 100644
--- a/ace/os_include/sys/os_mman.h
+++ b/ace/os_include/sys/os_mman.h
@@ -110,6 +110,10 @@ PAGE_NOCACHE  */
 #   define MS_SYNC 0x0
 # endif /* !MS_SYNC */
 
+#if defined (ACE_LACKS_MADVISE_PROTOTYPE)
+  int madvise(caddr_t, size_t, int);
+#endif
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/sys/os_select.h b/ace/os_include/sys/os_select.h
index f8da718e6a9..b2a09b3f34d 100644
--- a/ace/os_include/sys/os_select.h
+++ b/ace/os_include/sys/os_select.h
@@ -32,7 +32,7 @@
 #  include /**/ <sys/select.h>
 #endif /* !ACE_LACKS_SYS_SELECT_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && defined (ACE_LACKS_SYS_SELECT_H)
 #  include /**/ <selectLib.h>
 #endif /* VXWORKS */
 
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index c2000721289..422ed15dec7 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -36,7 +36,7 @@
 #  endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */
 #endif /* !ACE_LACKS_SYS_SOCKET_H */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 #  include /**/ <sockLib.h>
 #endif /* VXWORKS */
 
diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h
index 536d1ce8ff0..605148b3b52 100644
--- a/ace/os_include/sys/os_stat.h
+++ b/ace/os_include/sys/os_stat.h
@@ -130,8 +130,10 @@ extern "C"
 #  if (__BORLANDC__ <= 0x540)
 #    define _stat stat
 #  endif
-#  define _umask umask
-#  define _fstat fstat
+#  if (__BORLANDC__ < 0x560)
+#    define _umask umask
+#    define _fstat fstat
+#  endif
 #endif /* __BORLANDC__ */
 
 #if defined (ACE_PSOS_SNARFS_HEADER_INFO)
diff --git a/ace/os_include/sys/os_time.h b/ace/os_include/sys/os_time.h
index 4fb260bcd7e..7f65f5cb568 100644
--- a/ace/os_include/sys/os_time.h
+++ b/ace/os_include/sys/os_time.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    os_time.h
+ *  @file os_time.h
  *
  *  time types
  *
@@ -30,6 +30,10 @@
 #  include /**/ <sys/time.h>
 #endif /* !ACE_LACKS_SYS_TIME_H */
 
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620)
+#  include /**/ <time.h> // VxWorks 6.2 defined timeval in time.h
+#endif
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/sys/os_timeb.h b/ace/os_include/sys/os_timeb.h
index c3b3559269b..2495097d344 100644
--- a/ace/os_include/sys/os_timeb.h
+++ b/ace/os_include/sys/os_timeb.h
@@ -36,7 +36,7 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (__BORLANDC__)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x560)
 #  define _ftime ftime
 #  define _timeb timeb
 #endif /* __BORLANDC__ */
diff --git a/ace/os_include/sys/os_types.h b/ace/os_include/sys/os_types.h
index da7cb514c75..fcc3610b074 100644
--- a/ace/os_include/sys/os_types.h
+++ b/ace/os_include/sys/os_types.h
@@ -76,21 +76,25 @@ typedef double ACE_timer_t;
    typedef unsigned int dev_t;
 #endif /* ACE_HAS_WINCE */
 
-/* This should work for linux, solaris 5.6 and above, IRIX, OSF */
-#if defined (ACE_HAS_LLSEEK) || defined (ACE_HAS_LSEEK64)
-#  if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
-     typedef off_t ACE_LOFF_T;
-#  elif defined (__sgi) || defined (AIX) || defined (HPUX) \
-    || defined (__QNX__)
-     typedef off64_t ACE_LOFF_T;
-#  elif defined (__sun)
-     typedef offset_t ACE_LOFF_T;
-#  elif defined (WIN32) //Add by Nick Lin -- for win32 llseek
-     typedef __int64  ACE_LOFF_T;  //Add by Nick Lin -- for win32 llseek
-#  else
-     typedef loff_t ACE_LOFF_T;
-#  endif
-#endif /* ACE_HAS_LLSEEK || ACE_HAS_LSEEK64 */
+#if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
+   typedef off_t ACE_LOFF_T;
+#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__)
+   typedef off_t ACE_LOFF_T;
+#elif defined (__sgi) || defined (AIX) || defined (HPUX) || defined (__QNX__)
+   typedef off64_t ACE_LOFF_T;
+#elif defined (__sun)
+   typedef offset_t ACE_LOFF_T;
+#elif defined (WIN32)
+   typedef __int64  ACE_LOFF_T;
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620)
+   typedef long long ACE_LOFF_T;
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x551)
+   typedef long long ACE_LOFF_T;
+#elif defined (ACE_LYNXOS_MAJOR)
+   typedef long long ACE_LOFF_T;
+#else
+   typedef loff_t ACE_LOFF_T;
+#endif
 
 #if defined (ACE_WIN32)
 #  if !defined (__BORLANDC__)
@@ -133,6 +137,14 @@ typedef double ACE_timer_t;
    typedef int ACE_exitcode;
 #endif /* ACE_WIN32 */
 
+#if defined (ACE_LACKS_SUSECONDS_T)
+  typedef long suseconds_t;
+#endif
+
+#if defined (ACE_LACKS_USECONDS_T)
+  typedef unsigned long useconds_t;
+#endif
+
 #if defined (ACE_WIN32) && !defined(__MINGW32__)
    typedef long pid_t;
 #elif defined (ACE_PSOS) && (!defined (ACE_PSOSIM) && defined (ACE_PSOS_CANT_USE_SYS_TYPES))
diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h
index 1b2e5aca9ef..a9bf2457dc1 100644
--- a/ace/os_include/sys/os_un.h
+++ b/ace/os_include/sys/os_un.h
@@ -36,12 +36,12 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x600)
 struct sockaddr_un {
   short sun_family;    // AF_UNIX.
   char  sun_path[108]; // path name.
 };
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 
 #ifdef __cplusplus
diff --git a/ace/post.h b/ace/post.h
index 748605d7012..e39a3f9fa24 100644
--- a/ace/post.h
+++ b/ace/post.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -9,11 +9,9 @@
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
  *
  *  This file restores the original alignment rules.
- *
  */
 //=============================================================================
 
-
 // No header guard
 #if defined (_MSC_VER)
 # pragma pack (pop)
diff --git a/ace/pre.h b/ace/pre.h
index 5645562c8e9..8a7d7774c64 100644
--- a/ace/pre.h
+++ b/ace/pre.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -10,11 +10,9 @@
  *
  *  This file saves the original alignment rules and changes the alignment
  *  boundary to ACE's default.
- *
  */
 //=============================================================================
 
-
 // No header guard
 #if defined (_MSC_VER)
 # pragma warning (disable:4103)
diff --git a/ace/svcconf.mpb b/ace/svcconf.mpb
index ff8a4a1f017..7627592eb7c 100644
--- a/ace/svcconf.mpb
+++ b/ace/svcconf.mpb
@@ -14,11 +14,14 @@ feature(ace_svcconf) {
     Service_Object.cpp
     Service_Repository.cpp
     Service_Types.cpp
-    Service_Templates.cpp
     Shared_Object.cpp
-    Svc_Conf_l.cpp
+    Svc_Conf_Lexer.cpp
     Svc_Conf_y.cpp
-    Svc_Conf_Lexer_Guard.cpp
+    Encoding_Converter.cpp
+    Encoding_Converter_Factory.cpp
+    UTF8_Encoding_Converter.cpp
+    UTF16_Encoding_Converter.cpp
+    UTF32_Encoding_Converter.cpp
     XML_Svc_Conf.cpp
   }
 
@@ -50,55 +53,5 @@ feature(ace_svcconf) {
     "	@echo 'ERROR: You must use bison 1.35 or higher to process this file'"
     "	@/bin/false"
     "endif"
-
-    "Svc_Conf_l.cpp: Svc_Conf.l"
-    "ifeq ($(notdir $(LEX)), flex)"
-    "	echo '#define YY_NO_UNPUT' > $@"
-    "	echo >> $@"
-    "	echo '#include \"ace/Object_Manager.h\"' >> $@"
-    "	echo '#include \"ace/Guard_T.h\"' >> $@"
-    "	echo '#include \"ace/Recursive_Thread_Mutex.h\"' >> $@"
-    "	echo '#include \"ace/Synch_Traits.h\"' >> $@"
-    "	echo '#include \"ace/OS_NS_ctype.h\"' >> $@"
-    "	echo '#include \"ace/OS_NS_string.h\"' >> $@"
-    "	$(LEX) -L -t -I Svc_Conf.l >> $@"
-    "	echo '#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */' >> $@"
-    "	sed -e 's/yy/ace_yy/g' \\"
-    "       -e 's/YY/ACE_YY/g' \\"
-    "       -e 's@#define unput.*@#if (ACE_USES_CLASSIC_SVC_CONF == 1)@' \\"
-    "       -e 's/typedef unsigned char/typedef char/g' \\"
-    "       -e 's/	/        /g' \\"
-    "       -e 's/^char /ACE_TCHAR /g' \\"
-    "       -e 's/ char / ACE_TCHAR /g' \\"
-    "       -e 's/(char/(ACE_TCHAR/g' \\"
-    "       -e 's/ NULL/ 0/g' \\"
-    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
-    "       -e 's/->ace_yylineno/->yylineno/g' \\"
-    "       -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
-    "       -e 's/exit(/ACE_OS::exit(/g' \\"
-    "       -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
-    "       -e 's/int isatty/int nop_isatty/g' \\"
-    "       -e 's/realloc( (ACE_TCHAR \\*) ptr/realloc( (char *) ptr/g' \\"
-    "       -e 's/unsigned ACE_TCHAR/unsigned char/g' \\"
-    "       -e 's/ACE_TCHAR msg\\[\\]/char msg[]/g' \\"
-    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
-    "       -e 's/if[ ]*([ ]*num_to_read/if ( num_to_read * sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's/b->ace_yy_buf_size + 2/(&) * sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's@= ACE_YY_READ_BUF_SIZE@& / sizeof (ACE_TCHAR)@g' \\"
-    "       -e 's/ace_yy_flex_alloc( n /&* sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
-    "       -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
-    "       -e 's@#include <stdlib\.h>@#include \"ace/OS_NS_stdlib.h\"@' \\"
-    "       -e 's@#include <@#include /**/ <@' \\"
-    "       -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
-    "	cp /tmp/$@ $@"
-    "	patch < ../etc/Svc_Conf_l.cpp.diff"
-    "	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig"
-    "else"
-    "	@echo 'ERROR: You must use flex 2.5.4 or higher to process this file'"
-    "	@/bin/false"
-    "endif"
-
   }
-
 }
diff --git a/apps/Gateway/Gateway/Config_Files.cpp b/apps/Gateway/Gateway/Config_Files.cpp
index bc236ca7708..12328282242 100644
--- a/apps/Gateway/Gateway/Config_Files.cpp
+++ b/apps/Gateway/Gateway/Config_Files.cpp
@@ -213,10 +213,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 #endif /* DEBUGGING */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class File_Parser<Connection_Config_Info>;
-template class File_Parser<Consumer_Config_Info>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate File_Parser<Connection_Config_Info>
-#pragma instantiate File_Parser<Consumer_Config_Info>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/Gateway/Gateway/Connection_Handler.cpp b/apps/Gateway/Gateway/Connection_Handler.cpp
index 1e603dc73b7..ff93886c187 100644
--- a/apps/Gateway/Gateway/Connection_Handler.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler.cpp
@@ -86,7 +86,7 @@ Connection_Handler::connection_role (void) const
 // Sets the timeout delay.
 
 void
-Connection_Handler::timeout (int to)
+Connection_Handler::timeout (long to)
 {
   if (to > this->max_timeout_)
     to = this->max_timeout_;
@@ -98,10 +98,10 @@ Connection_Handler::timeout (int to)
 // backoff.  Returns the original timeout (i.e., before the
 // re-calculation).
 
-int
+long
 Connection_Handler::timeout (void)
 {
-  int old_timeout = this->timeout_;
+  long old_timeout = this->timeout_;
   this->timeout_ *= 2;
 
   if (this->timeout_ > this->max_timeout_)
@@ -113,14 +113,14 @@ Connection_Handler::timeout (void)
 // Sets the max timeout delay.
 
 void
-Connection_Handler::max_timeout (int mto)
+Connection_Handler::max_timeout (long mto)
 {
   this->max_timeout_ = mto;
 }
 
 // Gets the max timeout delay.
 
-int
+long
 Connection_Handler::max_timeout (void) const
 {
   return this->max_timeout_;
@@ -151,7 +151,7 @@ Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
   ACE_DEBUG ((LM_DEBUG,
 	      "(%t) shutting down %s Connection_Handler %d on handle %d\n",
 	      this->connection_role () == 'C' ? "Consumer" : "Supplier",
-	      this->connection_id (), 
+	      this->connection_id (),
               this->get_handle ()));
 
   // Restart the connection, if possible.
@@ -270,24 +270,3 @@ Connection_Handler_Factory::make_connection_handler (const Connection_Config_Inf
   return connection_handler;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<Event_Key, Consumer_Dispatch_Set *>;
-template class ACE_Map_Iterator_Base<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
-template class ACE_Map_Iterator<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
-template class ACE_Map_Reverse_Iterator<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
-template class ACE_Map_Manager<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#if defined (ACE_HAS_THREADS)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>;
-#endif /* ACE_HAS_THREADS */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<Event_Key, Consumer_Dispatch_Set *>
-#pragma instantiate ACE_Map_Iterator<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Manager<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/Gateway/Gateway/Connection_Handler.h b/apps/Gateway/Gateway/Connection_Handler.h
index 3003a81874e..a8a72830135 100644
--- a/apps/Gateway/Gateway/Connection_Handler.h
+++ b/apps/Gateway/Gateway/Connection_Handler.h
@@ -79,12 +79,12 @@ public:
   CONNECTION_ID connection_id (void) const;
 
   // = Set/get the current retry timeout delay.
-  void timeout (int);
-  int timeout (void);
+  void timeout (long);
+  long timeout (void);
 
   // = Set/get the maximum retry timeout delay.
-  void max_timeout (int);
-  int max_timeout (void) const;
+  void max_timeout (long);
+  long max_timeout (void) const;
 
   // = Set/get proxy role (i.e., 'S' for Supplier and 'C' for Consumer
   // (necessary for error checking).
@@ -124,10 +124,10 @@ protected:
   State state_;
   // The current state of the proxy.
 
-  int timeout_;
+  long timeout_;
   // Amount of time to wait between reconnection attempts.
 
-  int max_timeout_;
+  long max_timeout_;
   // Maximum amount of time to wait between reconnection attempts.
 
   char connection_role_;
diff --git a/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp b/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
index 90c251ae8cc..7790fb83d08 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp
@@ -54,9 +54,3 @@ Connection_Handler_Acceptor::Connection_Handler_Acceptor (Event_Channel &ec,
   this->connection_config_info_.priority_ = 1;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
index 6382ed80220..368ad14f373 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
@@ -58,12 +58,3 @@ Connection_Handler_Connector::initiate_connection (Connection_Handler *connectio
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<Connection_Handler>;
-template class ACE_Connector<Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<Connection_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<Connection_Handler>
-#pragma instantiate ACE_Connector<Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Connection_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 13a4251e6a2..beb35c1856e 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -250,8 +250,8 @@ Event_Channel::initiate_connection_connection (Connection_Handler *connection_ha
 int
 Event_Channel::complete_connection_connection (Connection_Handler *connection_handler)
 {
-  int option = connection_handler->connection_role () == 'S' 
-    ? SO_RCVBUF 
+  int option = connection_handler->connection_role () == 'S'
+    ? SO_RCVBUF
     : SO_SNDBUF;
   int socket_queue_size =
     Options::instance ()->socket_queue_size ();
@@ -305,10 +305,11 @@ Event_Channel::reinitiate_connection_connection (Connection_Handler *connection_
                   connection_handler->connection_id ()));
 
       // Reschedule ourselves to try and connect again.
+      ACE_Time_Value const timeout (connection_handler->timeout ());
       if (ACE_Reactor::instance ()->schedule_timer
           (connection_handler,
            0,
-           connection_handler->timeout ()) == -1)
+           timeout) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%t) %p\n",
                            "schedule_timer"),
@@ -367,9 +368,10 @@ Event_Channel::initiate_acceptors (void)
 {
   if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR))
     {
-    
+      ACE_INET_Addr
+        consumer_addr (Options::instance ()->consumer_acceptor_port ());
       if (this->consumer_acceptor_.open
-          (Options::instance ()->consumer_acceptor_port (),
+          (consumer_addr,
            ACE_Reactor::instance (),
            Options::instance ()->blocking_semantics ()) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -383,8 +385,10 @@ Event_Channel::initiate_acceptors (void)
     }
   if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR))
     {
-    if(this->supplier_acceptor_.open
-          (Options::instance ()->supplier_acceptor_port (),
+      ACE_INET_Addr
+        supplier_addr (Options::instance ()->supplier_acceptor_port ());
+      if (this->supplier_acceptor_.open
+          (supplier_addr,
            ACE_Reactor::instance (),
            Options::instance ()->blocking_semantics ()) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -582,20 +586,3 @@ Event_Channel::open (void *)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-template class ACE_Map_Entry<ACE_INT32, Connection_Handler *>;
-template class ACE_Map_Iterator<ACE_INT32, Connection_Handler *, MAP_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_INT32, Connection_Handler *, MAP_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_INT32, Connection_Handler *, MAP_MUTEX>;
-template class ACE_Map_Manager<ACE_INT32, Connection_Handler *, MAP_MUTEX>;
-template class ACE_Unbounded_Set_Iterator<Connection_Handler *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Entry<ACE_INT32, Connection_Handler *>
-#pragma instantiate ACE_Map_Iterator<ACE_INT32, Connection_Handler *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_INT32, Connection_Handler *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_INT32, Connection_Handler *, MAP_MUTEX>
-#pragma instantiate ACE_Map_Manager<ACE_INT32, Connection_Handler *, MAP_MUTEX>
-#pragma instantiate ACE_Unbounded_Set_Iterator<Connection_Handler *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp
index bbe748a0cd4..0fac7b5085c 100644
--- a/apps/Gateway/Gateway/Gateway.cpp
+++ b/apps/Gateway/Gateway/Gateway.cpp
@@ -110,9 +110,10 @@ Gateway::init (int argc, ACE_TCHAR *argv[])
 
   if (Options::instance ()->performance_window () > 0)
     {
+      ACE_Time_Value const performance_time (Options::instance ()->performance_window ());
       if (ACE_Reactor::instance ()->schedule_timer
           (&this->event_channel_, 0,
-           Options::instance ()->performance_window ()) == -1)
+           performance_time) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%t) %p\n"),
                     ACE_TEXT ("schedule_timer")));
@@ -337,10 +338,3 @@ Gateway::parse_consumer_config_file (void)
 
 ACE_SVC_FACTORY_DEFINE (Gateway)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<Connection_Handler *>;
-template class ACE_Unbounded_Set<Connection_Handler *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<Connection_Handler *>
-#pragma instantiate ACE_Unbounded_Set<Connection_Handler *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp
index 99d00e120bf..1408e5f4e41 100644
--- a/apps/Gateway/Gateway/Options.cpp
+++ b/apps/Gateway/Gateway/Options.cpp
@@ -89,7 +89,7 @@ Options::locking_strategy (ACE_Lock_Adapter<ACE_SYNCH_MUTEX> *ls)
   this->locking_strategy_ = ls;
 }
 
-int
+long
 Options::performance_window (void) const
 {
   return this->performance_window_;
diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h
index b5971b35c88..56f7c95e7e7 100644
--- a/apps/Gateway/Gateway/Options.h
+++ b/apps/Gateway/Gateway/Options.h
@@ -75,7 +75,7 @@ public:
   // Set the locking strategy used for serializing access to the
   // reference count in <ACE_Message_Block>.
 
-  int performance_window (void) const;
+  long performance_window (void) const;
   // Number of seconds after connection establishment to report
   // throughput.
 
@@ -143,7 +143,7 @@ private:
   // no locking strategy and we're using a REACTIVE concurrency
   // strategy.
 
-  int performance_window_;
+  long performance_window_;
   // Number of seconds after connection establishment to report
   // throughput.
 
diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index 074d1479c61..437d39f1611 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -888,16 +888,3 @@ Peer_Factory::init (int argc, ACE_TCHAR *argv[])
 
 ACE_SVC_FACTORY_DEFINE (Peer_Factory)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Connector_Base<Peer_Handler>;
-template class ACE_Connector<Peer_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Peer_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Connector_Base<Peer_Handler>
-#pragma instantiate ACE_Connector<Peer_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Peer_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index c0a72a198bb..11d67ef52cd 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,15 +1,37 @@
+Mon Feb  6 01:00:55 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * server/HTTP_Server.h
+        
+          Surrounded a proactor forward declaration with versioned
+          namespace macros.
+
+Thu Jan  5 00:42:28 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+        
+          Untabify.
+          Delete-trailing-whitespace.
+
+Wed Jan  4 22:57:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Added "Local Variables" section defining "add-log-time-format"
+          to a really ugly lambda expression that formats changelog
+          timestamps in UTC and works with both GNU Emacs and XEmacs.
+
 Fri Apr 22 21:42:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* server/HTTP_Helpers.cpp (HTTP_mktime):
+        * server/HTTP_Helpers.cpp (HTTP_mktime):
 
-	  Made rfc1123_date, rfc850_date and asctime_date strings into
-	  string literals.  Allows g++ format specifier argument checking
-	  to work, and addresses a related g++ 4.0 warning.
+          Made rfc1123_date, rfc850_date and asctime_date strings into
+          string literals.  Allows g++ format specifier argument checking
+          to work, and addresses a related g++ 4.0 warning.
 
-	* server/IO.h (~JAWS_IO_Handler):
-	* server/IO.cpp (~JAWS_IO_Handler):
+        * server/IO.h (~JAWS_IO_Handler):
+        * server/IO.cpp (~JAWS_IO_Handler):
 
-	  Added virtual destructor to silence g++ 4.0 warnings.
+          Added virtual destructor to silence g++ 4.0 warnings.
 
 Thu Aug 26 08:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -20,73 +42,73 @@ Thu Aug 26 08:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Feb 25 18:58:26 2003  Carlos O'Ryan  <coryan@atdesk.com>
 
-	* clients/WebSTONE/src/cgi-send:
-	  Removed pre-compiled binary for MIPS (R3000 of all things!)
+        * clients/WebSTONE/src/cgi-send:
+          Removed pre-compiled binary for MIPS (R3000 of all things!)
 
 Wed Dec 26 09:35:35 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* clients/Blobby/Options.cpp
-	  server/HTTP_Server.cpp
-	  stress_testing/benchd.cpp
-	  JAWS2/JAWS/Server.cpp: Replaced all uses of getopt.optarg
-	  with getopt.opt_arg().
+        * clients/Blobby/Options.cpp
+          server/HTTP_Server.cpp
+          stress_testing/benchd.cpp
+          JAWS2/JAWS/Server.cpp: Replaced all uses of getopt.optarg
+          with getopt.opt_arg().
 
 Thu Dec  6 09:00:31 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* clients/Caching/http_client.cpp (main): Make sure to remove the
-	  trailing '\n' so the example works properly.  Thanks to Andrey
- 	  Shkinev <andreyshkinev@rogers.com> for reporting this.
+        * clients/Caching/http_client.cpp (main): Make sure to remove the
+          trailing '\n' so the example works properly.  Thanks to Andrey
+          Shkinev <andreyshkinev@rogers.com> for reporting this.
 
 Wed Nov 14 16:21:46 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* clients/Blobby/Blob.{h,cpp},
-	* clients/Blobby/Blob_Handler.{h,cpp},
-	* clients/Blobby/blobby.{h,cpp},
-	* clients/Blobby/Options.{h,cpp}:
-	  Fixed the code to be Unicode-compliant.  Thanks to Johnny
- 	  Willemsen for contributing this.
+        * clients/Blobby/Blob.{h,cpp},
+        * clients/Blobby/Blob_Handler.{h,cpp},
+        * clients/Blobby/blobby.{h,cpp},
+        * clients/Blobby/Options.{h,cpp}:
+          Fixed the code to be Unicode-compliant.  Thanks to Johnny
+          Willemsen for contributing this.
 
 Fri Aug 24 18:39:39 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* server/HTTP_Response.cpp (normal_response),
-	* server/HTTP_Helpers.cpp (HTTP_decode_base64): Use delete [] buf
-	  rather than delete buf.  Thanks to Don Hinton for reporting
- 	  this.
+        * server/HTTP_Response.cpp (normal_response),
+        * server/HTTP_Helpers.cpp (HTTP_decode_base64): Use delete [] buf
+          rather than delete buf.  Thanks to Don Hinton for reporting
+          this.
 
 Thu Aug 16 09:57:15 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* */Makefile: Updated dependencies.
+        * */Makefile: Updated dependencies.
 
 Mon Aug 13 14:04:44 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* Applied the following fixes courtesy of Blair Zajac
- 	  <blair@gps.caltech.edu>:
+        * Applied the following fixes courtesy of Blair Zajac
+          <blair@gps.caltech.edu>:
 
-	  1) Allow a static libHTTPU.a to be built when
+          1) Allow a static libHTTPU.a to be built when
              "make static_libs_only=1" is used.
 
           2) When I try to build both JAWS and JAWS2 with the same
              ACE_ROOT, the libJAWS.* that is built and installed first
-	     prevents the other JAWS from properly compiling.  This
-	     resolves this problem by renaming the JAWS2 library to
-	     libJAWS2.*.
+             prevents the other JAWS from properly compiling.  This
+             resolves this problem by renaming the JAWS2 library to
+             libJAWS2.*.
 
           3) The JAWS2 subdirectory is now descended into by
-	     apps/Makefile.
+             apps/Makefile.
 
           4) The Makefile in JAWS2 now descends into HTTPU and JAWS to
              build those libraries.
 
 Tue Jun 12 20:35:26 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
-	* clients/Blobby/Blob_Handler.cpp:
+        * clients/Blobby/Blob_Handler.cpp:
 
-	  Fixed a size_t printf to make gcc happy on IA-64 Linux.
+          Fixed a size_t printf to make gcc happy on IA-64 Linux.
 
 Sun Feb 18 09:33:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* server/IO.cpp (handle): Added a const to the handle() method
-	  to make compilers happy.  Thanks to Kitty for reporting this.
+        * server/IO.cpp (handle): Added a const to the handle() method
+          to make compilers happy.  Thanks to Kitty for reporting this.
 
 Mon Jun 12 14:22:35 PDT 2000 James Hu <jxh@entera.com>
 
@@ -192,18 +214,18 @@ Wed Mar 22 12:36:00 2000  James Hu  <jxh@cs.wustl.edu>
 
 Tue Sep 21 11:47:00 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* server/HTTP_Server.cpp (init):
+        * server/HTTP_Server.cpp (init):
 
-	  Changed cast style to make gcc 2.95.1 happy.  Thanks to Jeffrey
-	  Franks <Jeffrey_Franks@i-o.com> for reporting the problems.
+          Changed cast style to make gcc 2.95.1 happy.  Thanks to Jeffrey
+          Franks <Jeffrey_Franks@i-o.com> for reporting the problems.
 
 Tue Aug 31 05:10:32 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* server/HTTP_Handler.cpp (destroy_http_handler): Switched
-	  the order in which handler and io were deleted since the current
- 	  order seems to destroy handler first, which is problematic since
- 	  io is contained within handler!  Thanks to Yosi Sarusi
- 	  <yosi@appstream.com> for reporting this.
+        * server/HTTP_Handler.cpp (destroy_http_handler): Switched
+          the order in which handler and io were deleted since the current
+          order seems to destroy handler first, which is problematic since
+          io is contained within handler!  Thanks to Yosi Sarusi
+          <yosi@appstream.com> for reporting this.
 
 Wed Aug 18 16:00:46 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -950,3 +972,9 @@ Tue May 20 22:49:24 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
         * test_JAWS_File.cpp: A test program written to see if the new
           virtual filesystem works the way I expect it to.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/apps/JAWS/clients/Blobby/Blob.cpp b/apps/JAWS/clients/Blobby/Blob.cpp
index b29004ae960..3bd237c7a9c 100644
--- a/apps/JAWS/clients/Blobby/Blob.cpp
+++ b/apps/JAWS/clients/Blobby/Blob.cpp
@@ -75,12 +75,3 @@ ACE_Blob::close (void)
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<ACE_Blob_Handler>;
-template class ACE_Connector<ACE_Blob_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<ACE_Blob_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<ACE_Blob_Handler>
-#pragma instantiate ACE_Connector<ACE_Blob_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<ACE_Blob_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 0c62f0fe78c..0c5fd166d04 100644
--- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -100,7 +100,7 @@ ACE_Blob_Reader::send_request (void)
 
   // Check to see if the request is too big
   if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
-                         + ACE_OS::strlen (filename_) 
+                         + ACE_OS::strlen (filename_)
                          + ACE_OS::strlen (request_suffix_) + 4))
     ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
 
@@ -343,8 +343,3 @@ ACE_Blob_Writer::receive_reply (void)
   ACE_NOTREACHED(return 0);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/clients/Caching/Local_Locator.cpp b/apps/JAWS/clients/Caching/Local_Locator.cpp
index 5c084bd783a..c4502c1bc87 100644
--- a/apps/JAWS/clients/Caching/Local_Locator.cpp
+++ b/apps/JAWS/clients/Caching/Local_Locator.cpp
@@ -21,13 +21,13 @@ ACE_URL_Local_Locator::url_query (const ACE_URL_Locator::ACE_Selection_Criteria
   ACE_URL_Record *item = 0;
 
   ACE_NEW_RETURN (offer, ACE_URL_Offer_Seq (how_many), -1);
-  
+
   if (how >= ACE_URL_Locator::INVALID_SELECTION)
     {
       errno = ACE_URL_Locator::INVALID_ARGUMENT;
       return -1;
     }
-  
+
   num_query = 0;
   for (ACE_Unbounded_Set_Iterator<ACE_URL_Record> iter (this->repository_);
        iter.next (item) != 0;
@@ -75,7 +75,7 @@ ACE_URL_Local_Locator::export_offer (ACE_URL_Offer *offer,
 
   // First check if we have registered this URL already.
   for (ACE_Unbounded_Set_Iterator<ACE_URL_Record> iter (this->repository_);
-       iter.next (item) != 0; 
+       iter.next (item) != 0;
        iter.advance ())
     if (*item->offer_->url () == *offer->url ())
       {
@@ -99,7 +99,7 @@ int
 ACE_URL_Local_Locator::withdraw_offer (const ACE_WString &offer_id)
 {
   ACE_URL_Record *item = 0;
-  
+
   // Iterate thru repository and remove offer with <offer_id>.
   for (ACE_Unbounded_Set_Iterator<ACE_URL_Record> iter (this->repository_);
        iter.next (item) != 0;
@@ -124,7 +124,7 @@ ACE_URL_Local_Locator::describe_offer (const ACE_WString &offer_id,
 				       ACE_URL_Offer *offer)
 {
   ACE_URL_Record *item = 0;
-  
+
   // Iterate thru the repository and produce a copy of offer's
   // description.
   for (ACE_Unbounded_Set_Iterator<ACE_URL_Record> iter (this->repository_);
@@ -161,7 +161,7 @@ ACE_URL_Local_Locator::modify_offer (const ACE_WString &offer_id,
 	}
       if (offer_id == *item->id_)
 	target = item;
-    }	  
+    }
 
   if (target != 0)		// Aha, we found a target to work on
     {
@@ -169,7 +169,7 @@ ACE_URL_Local_Locator::modify_offer (const ACE_WString &offer_id,
 	{
 	  // We need to make a copy of the original property sequence
 	  // so if any error occurs, we can revert our change easily.
-	  
+
 	  // First we need to calculate the maximum number of perperties.
 	  int psize = target->offer_->url_properties ().size ();
 	  if (del != 0)
@@ -195,7 +195,7 @@ ACE_URL_Local_Locator::modify_offer (const ACE_WString &offer_id,
 	      // Argh, this is really a stupid design.
 	      // Go thru every property we want to delete
 	      for (size_t i = 0; i < del->size () && sz > 0; i++)
-		// For earch, go thru our property sequence and 
+		// For earch, go thru our property sequence and
 		// search for the property.
 		for (size_t j = 0; j < sz; j++)
 		  if ((*del)[i].name () == working[j].name ())
@@ -245,13 +245,4 @@ ACE_URL_Local_Locator::modify_offer (const ACE_WString &offer_id,
   return -1;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<ACE_URL_Record>;
-template class ACE_Unbounded_Set_Iterator<ACE_URL_Record>;
-template class ACE_Node<ACE_URL_Record>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set<ACE_URL_Record>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_URL_Record>
-#pragma instantiate ACE_Node<ACE_URL_Record>
-#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_LOCAL_LOCATOR_C */
diff --git a/apps/JAWS/clients/Caching/URL_Properties.cpp b/apps/JAWS/clients/Caching/URL_Properties.cpp
index 40688bfe169..6568fb0ff8d 100644
--- a/apps/JAWS/clients/Caching/URL_Properties.cpp
+++ b/apps/JAWS/clients/Caching/URL_Properties.cpp
@@ -136,27 +136,4 @@ ACE_URL_Offer::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<ACE_URL_Property>;
-template class ACE_Array<ACE_URL_Property>;
-template class ACE_Array_Base<ACE_URL_Offer>;
-template class ACE_Array<ACE_URL_Offer>;
-template size_t ace_array_size (ACE_Array<ACE_URL_Property> &);
-template size_t ace_array_encode (void *, ACE_Array<ACE_URL_Property> &);
-template size_t ace_array_decode (void *, ACE_Array<ACE_URL_Property> &);
-template size_t ace_array_size (ACE_Array<ACE_URL_Offer> &);
-template size_t ace_array_encode (void *, ACE_Array<ACE_URL_Offer> &);
-template size_t ace_array_decode (void *, ACE_Array<ACE_URL_Offer> &);
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<ACE_URL_Property>
-#pragma instantiate ACE_Array<ACE_URL_Property>
-#pragma instantiate ACE_Array_Base<ACE_URL_Offer>
-#pragma instantiate ACE_Array<ACE_URL_Offer>
-#pragma instantiate size_t ace_array_size (ACE_Array<ACE_URL_Property> &)
-#pragma instantiate size_t ace_array_encode (void *, ACE_Array<ACE_URL_Property> &)
-#pragma instantiate size_t ace_array_decode (void *, ACE_Array<ACE_URL_Property> &)
-#pragma instantiate size_t ace_array_size (ACE_Array<ACE_URL_Offer> &)
-#pragma instantiate size_t ace_array_encode (void *, ACE_Array<ACE_URL_Offer> &)
-#pragma instantiate size_t ace_array_decode (void *, ACE_Array<ACE_URL_Offer> &)
-#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_URL_PROPERTIES_C */
diff --git a/apps/JAWS/clients/Caching/caching.mpc b/apps/JAWS/clients/Caching/caching.mpc
index 214d284fa85..fce9d81df4f 100644
--- a/apps/JAWS/clients/Caching/caching.mpc
+++ b/apps/JAWS/clients/Caching/caching.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(http_client) : aceexe {
+  avoids   += ace_for_tao
   requires += ace_filecache
 
   Source_Files {
diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp
index 366e3546aa1..cb8d0290937 100644
--- a/apps/JAWS/clients/Caching/http_handler.cpp
+++ b/apps/JAWS/clients/Caching/http_handler.cpp
@@ -236,14 +236,3 @@ HTTP_Connector::parseurl (const char *url,
   return status;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<HTTP_Handler>;
-template class ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<HTTP_Handler>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<HTTP_Handler>
-#pragma instantiate ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<HTTP_Handler>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/server/HTTP_Handler.cpp b/apps/JAWS/server/HTTP_Handler.cpp
index c90e7a11fa0..277cfb11f3a 100644
--- a/apps/JAWS/server/HTTP_Handler.cpp
+++ b/apps/JAWS/server/HTTP_Handler.cpp
@@ -261,6 +261,29 @@ Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler,
   delete &handler;
 }
 
+//-------------SYNCH IO no Cache
+
+HTTP_Handler *
+No_Cache_Synch_HTTP_Handler_Factory::create_http_handler (void)
+{
+  JAWS_Synch_IO_No_Cache *io;
+  ACE_NEW_RETURN (io, JAWS_Synch_IO_No_Cache, 0);
+  HTTP_Handler *handler;
+  ACE_NEW_RETURN (handler, HTTP_Handler (*io, *this), 0);
+
+  return handler;
+}
+
+void
+No_Cache_Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler,
+														   JAWS_IO &io)
+{
+  delete &io;
+  delete &handler;
+}
+
+//----------------
+
 // This only works on Win32
 #if defined (ACE_WIN32)
 void
diff --git a/apps/JAWS/server/HTTP_Handler.h b/apps/JAWS/server/HTTP_Handler.h
index 0a61ae88782..f7eb9b9a693 100644
--- a/apps/JAWS/server/HTTP_Handler.h
+++ b/apps/JAWS/server/HTTP_Handler.h
@@ -47,11 +47,13 @@ class HTTP_Handler : protected JAWS_IO_Handler
 {
   // Friend I/O classes. Can call protected methods.
   friend class JAWS_Synch_IO;
+  friend class JAWS_Synch_IO_No_Cache;
   friend class JAWS_Asynch_IO;
 
   // Factories
   friend class Asynch_HTTP_Handler_Factory;
   friend class Synch_HTTP_Handler_Factory;
+  friend class No_Cache_Synch_HTTP_Handler_Factory;
 
 public:
   virtual void open (ACE_HANDLE handle,
@@ -163,6 +165,29 @@ public:
   // the protocol
 };
 
+//--------------Added a factory for SYNCH IO without caching
+
+class No_Cache_Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory
+  // = TITLE
+  //
+  //     This class is used to create new HTTP handlers that will use
+  //     Synch IO without caching
+  //
+  // = DESCRIPTION
+{
+public:
+  HTTP_Handler *create_http_handler (void);
+  // This creates a new HTTP_Handler
+
+  void destroy_http_handler (HTTP_Handler &handler,
+                             JAWS_IO &io);
+  // The HTTP handler will call this method from HTTP_Handler::done to
+  // tell the factory to reap up the handler as it is now done with
+  // the protocol
+};
+
+//--------------
+
 #if defined (ACE_WIN32)
 class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Service_Handler
   // = TITLE
diff --git a/apps/JAWS/server/HTTP_Request.h b/apps/JAWS/server/HTTP_Request.h
index 3a3bed182fe..3581d802540 100644
--- a/apps/JAWS/server/HTTP_Request.h
+++ b/apps/JAWS/server/HTTP_Request.h
@@ -18,8 +18,6 @@
 #ifndef HTTP_REQUEST_H
 #define HTTP_REQUEST_H
 
-class ACE_Message_Block;
-
 #include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -28,6 +26,10 @@ class ACE_Message_Block;
 
 #include "Parse_Headers.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class HTTP_Request
   // = TITLE
   //     This parses the client request of an HTTP transaction.
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 36a521004ae..0f22cc78d7c 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -10,6 +10,7 @@
 #include "ace/LOCK_SOCK_Acceptor.h"
 #include "ace/Proactor.h"
 #include "ace/Signal.h"
+#include "ace/Auto_Ptr.h"
 
 #include "IO.h"
 #include "HTTP_Server.h"
@@ -46,8 +47,9 @@ HTTP_Server::parse_args (int argc, ACE_TCHAR *argv[])
   this->threads_ = 0;
   this->backlog_ = 0;
   this->throttle_ = 0;
+  this->caching_ = true;
 
-  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:c:"));
 
   while ((c = get_opt ()) != -1)
     switch (c)
@@ -97,6 +99,12 @@ HTTP_Server::parse_args (int argc, ACE_TCHAR *argv[])
       case 'b':
 	this->backlog_ = ACE_OS::atoi (get_opt.opt_arg ());
 	break;
+	  case 'c':
+		  if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("NO_CACHE")) == 0)
+			  this->caching_ = false;
+		  else
+			  this->caching_ = true;
+		  break;
       default:
 	break;
       }
@@ -130,6 +138,22 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[])
   // Parse arguments which sets the initial state.
   this->parse_args (argc, argv);
 
+  //If the IO strategy is synchronous (SYNCH case), then choose a handler
+  //factory based on the desired caching scheme
+  HTTP_Handler_Factory *f = 0;
+
+  if (this->strategy_ != (JAWS::JAWS_POOL | JAWS::JAWS_ASYNCH))
+	  if (this->caching_)
+		  ACE_NEW_RETURN (f, Synch_HTTP_Handler_Factory (), -1);
+	  else
+		  ACE_NEW_RETURN (f, No_Cache_Synch_HTTP_Handler_Factory (), -1);
+
+  //NOTE: At this point f better not be a NULL pointer,
+  //so please do not change the ACE_NEW_RETURN macros unless
+  //you know what you are doing
+  ACE_Auto_Ptr<HTTP_Handler_Factory> factory (f);
+
+
   // Choose what concurrency strategy to run.
   switch (this->strategy_)
     {
@@ -137,11 +161,11 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[])
       return this->asynch_thread_pool ();
 
     case (JAWS::JAWS_PER_REQUEST | JAWS::JAWS_SYNCH) :
-      return this->thread_per_request ();
+      return this->thread_per_request (*factory.get ());
 
     case (JAWS::JAWS_POOL | JAWS::JAWS_SYNCH) :
     default:
-      return this->synch_thread_pool ();
+      return this->synch_thread_pool (*factory.get ());
     }
 
   ACE_NOTREACHED (return 0);
@@ -156,7 +180,7 @@ HTTP_Server::fini (void)
 
 
 int
-HTTP_Server::synch_thread_pool (void)
+HTTP_Server::synch_thread_pool (HTTP_Handler_Factory &factory)
 {
   // Main thread opens the acceptor
   if (this->acceptor_.open (ACE_INET_Addr (this->port_), 1,
@@ -165,7 +189,7 @@ HTTP_Server::synch_thread_pool (void)
                        ACE_TEXT ("HTTP_Acceptor::open")), -1);
 
   // Create a pool of threads to handle incoming connections.
-  Synch_Thread_Pool_Task t (this->acceptor_, this->tm_, this->threads_);
+  Synch_Thread_Pool_Task t (this->acceptor_, this->tm_, this->threads_, factory);
 
   this->tm_.wait ();
   return 0;
@@ -173,9 +197,11 @@ HTTP_Server::synch_thread_pool (void)
 
 Synch_Thread_Pool_Task::Synch_Thread_Pool_Task (HTTP_Acceptor &acceptor,
                                                 ACE_Thread_Manager &tm,
-                                                int threads)
+                                                int threads,
+												HTTP_Handler_Factory &factory)
   : ACE_Task<ACE_NULL_SYNCH> (&tm),
-    acceptor_ (acceptor)
+    acceptor_ (acceptor),
+	factory_ (factory)
 {
   if (this->activate (THR_DETACHED | THR_NEW_LWP, threads) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
@@ -186,7 +212,7 @@ int
 Synch_Thread_Pool_Task::svc (void)
 {
   // Creates a factory of HTTP_Handlers binding to synchronous I/O strategy
-  Synch_HTTP_Handler_Factory factory;
+  //Synch_HTTP_Handler_Factory factory;
 
   for (;;)
     {
@@ -203,7 +229,7 @@ Synch_Thread_Pool_Task::svc (void)
                       -1);
 
       // Create an HTTP Handler to handle this request
-      HTTP_Handler *handler = factory.create_http_handler ();
+      HTTP_Handler *handler = this->factory_.create_http_handler ();
       handler->open (stream.get_handle (), *mb);
       // Handler is destroyed when the I/O puts the Handler into the
       // done state.
@@ -217,7 +243,7 @@ Synch_Thread_Pool_Task::svc (void)
 }
 
 int
-HTTP_Server::thread_per_request (void)
+HTTP_Server::thread_per_request (HTTP_Handler_Factory &factory)
 {
   int grp_id = -1;
 
@@ -244,7 +270,8 @@ HTTP_Server::thread_per_request (void)
       // Pass grp_id as a constructor param instead of into open.
       ACE_NEW_RETURN (t, Thread_Per_Request_Task (stream.get_handle (),
                                                   this->tm_,
-                                                  grp_id),
+                                                  grp_id,
+												  factory),
                       -1);
 
 
@@ -267,11 +294,13 @@ HTTP_Server::thread_per_request (void)
 }
 
 Thread_Per_Request_Task::Thread_Per_Request_Task (ACE_HANDLE handle,
-						  ACE_Thread_Manager &tm,
-                                                  int &grp_id)
+												  ACE_Thread_Manager &tm,
+                                                  int &grp_id,
+												  HTTP_Handler_Factory &factory)
   : ACE_Task<ACE_NULL_SYNCH> (&tm),
     handle_ (handle),
-    grp_id_ (grp_id)
+    grp_id_ (grp_id),
+	factory_ (factory)
 {
 }
 
@@ -303,8 +332,8 @@ Thread_Per_Request_Task::svc (void)
   ACE_Message_Block *mb;
   ACE_NEW_RETURN (mb, ACE_Message_Block (HTTP_Handler::MAX_REQUEST_SIZE + 1),
                   -1);
-  Synch_HTTP_Handler_Factory factory;
-  HTTP_Handler *handler = factory.create_http_handler ();
+  //Synch_HTTP_Handler_Factory factory;
+  HTTP_Handler *handler = this->factory_.create_http_handler ();
   handler->open (this->handle_, *mb);
   mb->release ();
   return 0;
@@ -400,8 +429,3 @@ ACE_STATIC_SVC_DEFINE (HTTP_Server, ACE_TEXT ("HTTP_Server"), ACE_SVC_OBJ_T,
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ, 0)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index 8d39e193642..9e8534c4cbd 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -35,8 +35,10 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Global_Macros.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Forward declaration.
 class ACE_Proactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_THREAD_SAFE_ACCEPT)
 typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX> HTTP_SOCK_Acceptor;
@@ -61,13 +63,13 @@ public:
   // Exit hooks
 
 protected:
-  virtual int thread_per_request (void);
+  virtual int thread_per_request (HTTP_Handler_Factory &factory);
   // Thread Per Request implementation
 
   virtual int asynch_thread_pool (void);
   // Asynch Thread Pool implementation
 
-  virtual int synch_thread_pool (void);
+  virtual int synch_thread_pool (HTTP_Handler_Factory &factory);
   // Synch Thread Pool implementation
 
 private:
@@ -78,6 +80,7 @@ private:
   int strategy_;
   int backlog_;
   int throttle_;
+  bool caching_;
   ACE_Thread_Manager tm_;
   HTTP_Acceptor acceptor_;
 };
@@ -88,15 +91,18 @@ class Synch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
   //
   // = DESCRIPTION
   //     Describe this and the others below.
+  //	 NOTE: this class was modified to make caching disabling possible
 {
 public:
   Synch_Thread_Pool_Task (HTTP_Acceptor &acceptor,
                           ACE_Thread_Manager &tm,
-                          int threads);
+                          int threads,
+						  HTTP_Handler_Factory &factory);
   virtual int svc (void);
 
 private:
   HTTP_Acceptor &acceptor_;
+  HTTP_Handler_Factory &factory_;
 };
 
 class Thread_Per_Request_Task : public ACE_Task<ACE_NULL_SYNCH>
@@ -106,11 +112,13 @@ class Thread_Per_Request_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = DESCRIPTION
   //     Spawns a new thread for every new incoming connection.  The
   //     handle below is the socket stream of the incoming connection.
+  //	 NOTE: this class was modified to make caching disabling possible
 {
 public:
   Thread_Per_Request_Task (ACE_HANDLE handle,
                            ACE_Thread_Manager &tm,
-                           int &grp_id);
+                           int &grp_id,
+						   HTTP_Handler_Factory &factory);
   virtual int open (void *args = 0);
   virtual int close (u_long);
   virtual int svc (void);
@@ -118,6 +126,7 @@ public:
 private:
   ACE_HANDLE handle_;
   int &grp_id_;
+  HTTP_Handler_Factory &factory_;
 };
 
 // This only works on Win32
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 34d8ddd0acd..e08b7d89f64 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -10,6 +10,10 @@
 #include "IO.h"
 #include "HTTP_Helpers.h"
 
+#include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_stat.h"
+#include "ace/Auto_Ptr.h"
 
 ACE_RCSID (server,
            IO,
@@ -418,8 +422,149 @@ JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &resu
 
 #endif /* ACE_WIN32 */
 
-// #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// template class ACE_Singleton<JAWS_VFS, ACE_SYNCH_MUTEX>;
-// #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// #pragma instantiate ACE_Singleton<JAWS_VFS, ACE_SYNCH_MUTEX>
-// #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+//-------------------Adding SYNCH IO no Caching
+
+JAWS_Synch_IO_No_Cache::JAWS_Synch_IO_No_Cache (void)
+  : handle_ (ACE_INVALID_HANDLE)
+{
+}
+
+JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache (void)
+{
+  ACE_OS::closesocket (this->handle_);
+}
+
+ACE_HANDLE
+JAWS_Synch_IO_No_Cache::handle (void) const
+{
+  return this->handle_;
+}
+
+void
+JAWS_Synch_IO_No_Cache::handle (ACE_HANDLE handle)
+{
+  this->handle_ = handle;
+}
+
+void
+JAWS_Synch_IO_No_Cache::read (ACE_Message_Block &mb,
+                     int size)
+{
+  ACE_SOCK_Stream stream;
+  stream.set_handle (this->handle_);
+  int result = stream.recv (mb.wr_ptr (), size);
+
+  if (result <= 0)
+    this->handler_->read_error ();
+  else
+    {
+      mb.wr_ptr (result);
+      this->handler_->read_complete (mb);
+    }
+}
+
+void
+JAWS_Synch_IO_No_Cache::receive_file (const char *filename,
+                                      void *initial_data,
+                                      int initial_data_length,
+                                      int entire_length)
+{
+  //ugly hack to send HTTP_Status_Code::STATUS_FORBIDDEN
+  this->handler_->receive_file_error (5);
+
+  //To get rid of warnings on some platforms
+  //NOTE: this function is necessary because the base class
+  //version of the function is pure virtual
+  ACE_UNUSED_ARG (filename);
+  ACE_UNUSED_ARG (initial_data);
+  ACE_UNUSED_ARG (initial_data_length);
+  ACE_UNUSED_ARG (entire_length);
+}
+
+void
+JAWS_Synch_IO_No_Cache::transmit_file (const char *filename,
+                     const char *header,
+                     int header_size,
+                     const char *trailer,
+                     int trailer_size)
+{
+  int result = 0;
+
+  // Can we access the file?
+  if (ACE_OS::access (filename, R_OK) == -1)
+  {
+    //ugly hack to send in HTTP_Status_Code::STATUS_NOT_FOUND
+    result = ACE_Filecache_Handle::ACE_ACCESS_FAILED;
+    this->handler_->transmit_file_error (result);
+    return;
+  }
+
+  ACE_stat stat;
+
+  // Can we stat the file?
+  if (ACE_OS::stat (filename, &stat) == -1)
+  {
+    //ugly hack to send HTTP_Status_Code::STATUS_FORBIDDEN
+    result = ACE_Filecache_Handle::ACE_STAT_FAILED;
+      this->handler_->transmit_file_error (result);
+    return;
+  }
+
+  ssize_t size = stat.st_size;
+
+  // Can we open the file?
+  ACE_HANDLE handle = ACE_OS::open (filename, O_RDONLY);
+  if (handle == ACE_INVALID_HANDLE)
+  {
+    //ugly hack to send HTTP_Status_Code::STATUS_FORBIDDEN
+    result = ACE_Filecache_Handle::ACE_OPEN_FAILED;
+      this->handler_->transmit_file_error (result);
+    return;
+  }
+
+  char* f = new char[size];
+  auto_ptr<char> file (f);
+
+  ACE_OS::read_n (handle, f, size);
+
+  ACE_SOCK_Stream stream;
+  stream.set_handle (this->handle_);
+
+  if ((stream.send_n (header, header_size) == header_size)
+      && (stream.send_n (f, size) == size)
+      && (stream.send_n (trailer, trailer_size) == trailer_size))
+      this->handler_->transmit_file_complete ();
+  else
+  {
+    //ugly hack to default to HTTP_Status_Code::STATUS_INTERNAL_SERVER_ERROR
+    result = -1;
+    this->handler_->transmit_file_error (result);
+    return;
+  }
+}
+
+void
+JAWS_Synch_IO_No_Cache::send_confirmation_message (const char *buffer,
+                           int length)
+{
+  this->send_message (buffer, length);
+  this->handler_->confirmation_message_complete ();
+}
+
+void
+JAWS_Synch_IO_No_Cache::send_error_message (const char *buffer,
+                        int length)
+{
+  this->send_message (buffer, length);
+  this->handler_->error_message_complete ();
+}
+
+void
+JAWS_Synch_IO_No_Cache::send_message (const char *buffer,
+                    int length)
+{
+  ACE_SOCK_Stream stream;
+  stream.set_handle (this->handle_);
+  stream.send_n (buffer, length);
+}
+
diff --git a/apps/JAWS/server/IO.h b/apps/JAWS/server/IO.h
index 95777d11a66..fd5ae0d64b2 100644
--- a/apps/JAWS/server/IO.h
+++ b/apps/JAWS/server/IO.h
@@ -18,9 +18,6 @@
 #ifndef JAWS_IO_H
 #define JAWS_IO_H
 
-class ACE_Message_Block;
-class JAWS_IO_Handler;
-
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -29,6 +26,13 @@ class JAWS_IO_Handler;
 
 #include "ace/Asynch_IO.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+class JAWS_IO_Handler;
+
+
 class JAWS_IO
   // = TITLE
   //
@@ -231,5 +235,62 @@ protected:
 };
 
 #endif /* ACE_WIN32 */
+
+
+//-------------------Adding SYNCH IO no Caching
+
+class JAWS_Synch_IO_No_Cache : public JAWS_IO
+  // = TITLE
+  //
+  //     This class defines the interface for a Synchronous I/O class,
+  //   however in this class we do not use any caching.
+  //
+  // = DESCRIPTION
+  //
+  //   Wondering how this is useful?
+  //   The ACE_Filecache ACE_NOMAP option is broken and even if it were not, there
+  //   are other use cases in which we want to avoid caching altogether. For example,
+  //   we use JAWS in conjunction with the CIAO Repository Manager, however the two
+  //   do not have any explicit knowledge of each other. Therefore if the RM tried
+  //   to remove a package and its files from disk, its operation would [partially]
+  //   fail if JAWS still holds some of the files in its cache.
+  //
+{
+public:
+  JAWS_Synch_IO_No_Cache (void);
+
+  ~JAWS_Synch_IO_No_Cache (void);
+
+  virtual void handle (ACE_HANDLE h);
+  virtual ACE_HANDLE handle (void) const;
+
+  void read (ACE_Message_Block& mb, int size);
+
+  void transmit_file (const char *filename,
+                      const char *header,
+                      int header_size,
+                      const char *trailer,
+                      int trailer_size);
+
+  void receive_file (const char *filename,
+                     void *initial_data,
+                     int initial_data_length,
+                     int entire_length);
+
+  void send_confirmation_message (const char *buffer,
+                                  int length);
+
+  void send_error_message (const char *buffer,
+                           int length);
+
+protected:
+  virtual void send_message (const char *buffer,
+                             int length);
+
+  ACE_HANDLE handle_;
+};
+
+//-------------------
+
 #endif /* JAWS_IO_H */
 
diff --git a/apps/JAWS/server/README b/apps/JAWS/server/README
index 4fab66d703d..27f0a0e3a8d 100644
--- a/apps/JAWS/server/README
+++ b/apps/JAWS/server/README
@@ -21,6 +21,8 @@ CONTENTS
 
 4. Acknowledgements
 
+5. New additions
+
 ------------
 1. Compiling
 ------------
@@ -199,3 +201,28 @@ James Hu <jxh@cs.wustl.edu>
 	Tim Harrison			For his comments, advice, and
 					help in designing the IO
 					mechanism used by JAWS.
+
+-----------------------
+5. Additions
+-----------------------
+
+The need arose to have JAWS not perform any file caching. We added this
+functionality and provided a new cmd line option -c with params NO_CACHE/CACHE.
+
+This capability is to be used with the RepositoryManager in CIAO.
+
+In its current design the RepositoryManager (RM) need a collocated HTTP server. 
+When RM istalls packages, it unpacks them so that the separate files are accessible to
+ZIP unaware entities like JAWS. JAWS is used to serve the libraries in the package to the
+various deamons that might be interested in them, e.g. the NodeApplicationManager.
+
+The problem with using file caching reveals itself during the deletePackage operation of 
+the RM. When the RM attempts to delete a file which was previously accessed via JAWS a 
+is currently in the file cache the call fails and the file remains on the filesystem 
+indefinitely. If the file is cached with a ACE_NOMAP option is is not stored in a file
+map and it is deleted upon server termination. The OS handles that. Althoguh this might
+or might not be OK (depending on how it scales) there is an additional problem because 
+JAWS and the ACE_Filecache_Handle class used do not provide enough functionality to deal
+with the ACE_NOMAP case. I believe that ACE_NOMAP option was probably never used.
+
+To overcome the above problems we added the no caching functionality in JAWS.
diff --git a/apps/JAWS/server/server.mpc b/apps/JAWS/server/server.mpc
index 1785965f478..a79e488cf83 100644
--- a/apps/JAWS/server/server.mpc
+++ b/apps/JAWS/server/server.mpc
@@ -2,10 +2,11 @@
 // $Id$
 
 project(JAWS) : acelib {
-  sharedname = JAWS
+  sharedname   = JAWS
   dynamicflags = ACE_BUILD_SVC_DLL
   requires    += ace_filecache
-  avoids += uses_wchar
+  avoids      += uses_wchar
+  avoids      += ace_for_tao
 
   Source_Files {
     HTTP_Server.cpp
@@ -27,9 +28,9 @@ project(JAWS_server) : aceexe {
   libs  += JAWS
   requires += ace_filecache
   avoids += uses_wchar
+  avoids += ace_for_tao
 
   Source_Files {
     main.cpp
   }
 }
-
diff --git a/apps/JAWS/server/svc.conf b/apps/JAWS/server/svc.conf
index 5f34c06aaa1..fdba6ab9c76 100644
--- a/apps/JAWS/server/svc.conf
+++ b/apps/JAWS/server/svc.conf
@@ -14,6 +14,7 @@
 #	= SYNCH
 #	= ASYNCH
 # -b	backlog value for listen ()
+# -c  caching: NO_CACHE or CACHE
 #
 #
 # Thread Pool, 20 unbound threads
@@ -21,6 +22,10 @@
 static HTTP_Server "HTTP_Server -p 5432 -n 20 -i SYNCH -t POOL -b 50 -f THR_NEW_LWP"
 #
 #
+# Start a baseline server without caching
+#static HTTP_Server "HTTP_Server -p 5432 -n 20 -i SYNCH -t POOL -b 50 -f THR_NEW_LWP -c NO_CACHE"
+#
+#
 # Thread Pool, 40 threads
 #static HTTP_Server "HTTP_Server -p 5432 -n 40 -i SYNCH -t POOL -b 50 -f THR_NEW_LWP -f THR_BOUND"
 #
diff --git a/apps/JAWS2/HTTPU/http_headers.cpp b/apps/JAWS2/HTTPU/http_headers.cpp
index 41aadd09824..370835ff294 100644
--- a/apps/JAWS2/HTTPU/http_headers.cpp
+++ b/apps/JAWS2/HTTPU/http_headers.cpp
@@ -143,19 +143,3 @@ HTTP_Headers::value_reset (void)
 #   include "HTTPU/http_headers.i"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>;
-template class ACE_RB_Tree_Iterator_Base<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/HTTPU/http_status.cpp b/apps/JAWS2/HTTPU/http_status.cpp
index 07009659fb7..5abc2313fec 100644
--- a/apps/JAWS2/HTTPU/http_status.cpp
+++ b/apps/JAWS2/HTTPU/http_status.cpp
@@ -79,9 +79,3 @@ HTTP_SCode::~HTTP_SCode (void)
 #   include "HTTPU/http_status.i"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<HTTP_SCode, ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<HTTP_SCode, ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/Cache_Manager.cpp b/apps/JAWS2/JAWS/Cache_Manager.cpp
index b6f2397fd1c..23d8ca1b1ce 100644
--- a/apps/JAWS2/JAWS/Cache_Manager.cpp
+++ b/apps/JAWS2/JAWS/Cache_Manager.cpp
@@ -94,95 +94,3 @@ JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s)
   ++*(this->c_);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String,
-                                                 JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_Manager<JAWS_Strdup_String,
-                                       JAWS_Cache_Object *,
-                                       JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Hash<JAWS_Strdup_String,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                   JAWS_Referenced_Cache_Object_Factory,
-                                   JAWS_String_Hash_Functor,
-                                   JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                              JAWS_Referenced_Cache_Object_Factory,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                 JAWS_Referenced_Cache_Object_Factory,
-                                 JAWS_String_Hash_Functor,
-                                 JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                   JAWS_Counted_Cache_Object_Factory,
-                                   JAWS_String_Hash_Functor,
-                                   JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                              JAWS_Counted_Cache_Object_Factory,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                 JAWS_Counted_Cache_Object_Factory,
-                                 JAWS_String_Hash_Functor,
-                                 JAWS_String_Equal_Functor>;
-template class ACE_Singleton<JAWS_Referenced_Cache_Object_Factory,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Counted_Cache_Object_Factory,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Referenced_Cache_Manager,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Counted_Cache_Manager,
-                             ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, \
-                                             JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String, \
-                                                      JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_Manager<JAWS_Strdup_String, \
-                                            JAWS_Cache_Object *, \
-                                            JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Hash<JAWS_Strdup_String, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \
-                                        ACE_Referenced_Cache_Object_Factory, \
-                                        JAWS_String_Hash_Functor, \
-                                        JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \
-                                   JAWS_Referenced_Cache_Object_Factory, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \
-                                      JAWS_Referenced_Cache_Object_Factory, \
-                                      JAWS_String_Hash_Functor, \
-                                      JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \
-                                        JAWS_Counted_Cache_Object_Factory, \
-                                        JAWS_String_Hash_Functor, \
-                                        JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \
-                                   JAWS_Counted_Cache_Object_Factory, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \
-                                      JAWS_Counted_Cache_Object_Factory, \
-                                      JAWS_String_Hash_Functor, \
-                                      JAWS_String_Equal_Functor>
-#pragma instantiate ACE_Singleton<JAWS_Referenced_Cache_Object_Factory, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_Counted_Cache_Object_Factory, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Referenced_Cache_Manager, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Counted_Cache_Manager, \
-                                  ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/Cache_Object.cpp b/apps/JAWS2/JAWS/Cache_Object.cpp
index 651e2bc5bd9..011f94182cd 100644
--- a/apps/JAWS2/JAWS/Cache_Object.cpp
+++ b/apps/JAWS2/JAWS/Cache_Object.cpp
@@ -289,13 +289,3 @@ JAWS_Counted_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj)
   ACE_DES_FREE (cco, this->allocator_->free, JAWS_Counted_Cache_Object);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// These are only specialized with ACE_HAS_THREADS.
-template class ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// These are only specialized with ACE_HAS_THREADS.
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/apps/JAWS2/JAWS/Cache_Object.h b/apps/JAWS2/JAWS/Cache_Object.h
index 06f442c549f..9988379742f 100644
--- a/apps/JAWS2/JAWS/Cache_Object.h
+++ b/apps/JAWS2/JAWS/Cache_Object.h
@@ -13,7 +13,9 @@
 #include "ace/RW_Thread_Mutex.h"
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 
 // Cache bucket -- use Hash_Bucket to hold cacheable objects.
diff --git a/apps/JAWS2/JAWS/Concurrency.cpp b/apps/JAWS2/JAWS/Concurrency.cpp
index 34b0d94149f..036585d4c9e 100644
--- a/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/apps/JAWS2/JAWS/Concurrency.cpp
@@ -338,12 +338,3 @@ JAWS_Thread_Per_Task::activate_hook (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Dispatcher, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Thread_Pool_Task, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Thread_Per_Task, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Dispatcher, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_Thread_Pool_Task, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_Thread_Per_Task, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/Filecache.cpp b/apps/JAWS2/JAWS/Filecache.cpp
index 3e1eb1f6102..b5de6c4d3ae 100644
--- a/apps/JAWS2/JAWS/Filecache.cpp
+++ b/apps/JAWS2/JAWS/Filecache.cpp
@@ -92,45 +92,3 @@ JAWS_Cached_FILE::mmap (void)
   return (this->data () == 0 ? 0 : this->data ()->mem_map ());
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                    JAWS_Referenced_Filecache_Factory,
-                                    JAWS_String_Hash_Functor,
-                                    JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                    JAWS_Counted_Filecache_Factory,
-                                    JAWS_String_Hash_Functor,
-                                    JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                               JAWS_Referenced_Filecache_Factory,
-                               JAWS_String_Hash_Functor,
-                               JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                               JAWS_Counted_Filecache_Factory,
-                               JAWS_String_Hash_Functor,
-                               JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                  JAWS_Referenced_Filecache_Factory,
-                                  JAWS_String_Hash_Functor,
-                                  JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                  JAWS_Counted_Filecache_Factory,
-                                  JAWS_String_Hash_Functor,
-                                  JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Proxy<char const *,
-                                JAWS_FILE,
-                                JAWS_Referenced_Filecache_Manager>;
-template class JAWS_Cache_Proxy<char const *,
-                                JAWS_FILE,
-                                JAWS_Counted_Filecache_Manager>;
-template class ACE_Singleton<JAWS_Referenced_Filecache_Manager,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Counted_Filecache_Manager,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Referenced_Filecache_Factory,
-                             ACE_Thread_Mutex>;
-template class ACE_Singleton<JAWS_Counted_Filecache_Factory, ACE_Thread_Mutex>;
-
-#endif
diff --git a/apps/JAWS2/JAWS/Headers.cpp b/apps/JAWS2/JAWS/Headers.cpp
index 53c4f97523a..26f51a89970 100644
--- a/apps/JAWS2/JAWS/Headers.cpp
+++ b/apps/JAWS2/JAWS/Headers.cpp
@@ -1,6 +1,7 @@
 /* $Id$ */
 
 #include "JAWS/Headers.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
@@ -158,10 +159,3 @@ JAWS_Headers::remove_all (const char *const &header_name)
   while (! done);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_DLList<JAWS_Header_Data>;
-template class ACE_DLList_Iterator<JAWS_Header_Data>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_DLList<JAWS_Header_Data>
-#pragma instantiate ACE_DLList_Iterator<JAWS_Header_Data>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/IO.cpp b/apps/JAWS2/JAWS/IO.cpp
index ee8a1eb1343..bdf3ae290b8 100644
--- a/apps/JAWS2/JAWS/IO.cpp
+++ b/apps/JAWS2/JAWS/IO.cpp
@@ -3,9 +3,11 @@
 #include "ace/Message_Block.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Filecache.h"
+#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_sys_socket.h"
+#include "ace/Min_Max.h"
 
 #include "JAWS/JAWS.h"
 #include "JAWS/Data_Block.h"
@@ -15,6 +17,8 @@
 #include "JAWS/IO_Acceptor.h"
 #include "JAWS/Filecache.h"
 
+#include "ace/Asynch_IO.h"  //for ACE_Asynch_Write_Stream
+
 // #include "HTTP_Helpers.h"
 
 ACE_RCSID(JAWS, IO, "$Id$")
@@ -552,7 +556,7 @@ void
 JAWS_Asynch_IO::send_message (JAWS_IO_Handler *ioh,
                               const char *buffer,
                               unsigned int length,
-                              int act)
+                              long act)
 {
   ioh->idle ();
 
@@ -590,17 +594,3 @@ JAWS_Asynch2_IO::accept (JAWS_IO_Handler *,
 
 #endif /* ACE_WIN32 */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>;
-  #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
-  template class ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>;
-  template class ACE_Singleton<JAWS_Asynch2_IO, ACE_SYNCH_MUTEX>;
-  #endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)*/
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
-  #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
-  #pragma instantiate  ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>
-  #pragma instantiate  ACE_Singleton<JAWS_Asynch2_IO, ACE_SYNCH_MUTEX>
-  #endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)*/
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/IO.h b/apps/JAWS2/JAWS/IO.h
index c0b167e3cda..840ff327380 100644
--- a/apps/JAWS2/JAWS/IO.h
+++ b/apps/JAWS2/JAWS/IO.h
@@ -18,10 +18,6 @@
 #ifndef JAWS_IO_H
 #define JAWS_IO_H
 
-class ACE_Message_Block;
-class JAWS_IO_Handler;
-class JAWS_IO_Acceptor;
-
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -35,6 +31,15 @@ class JAWS_IO_Acceptor;
 
 #include "JAWS/Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+class JAWS_IO_Handler;
+class JAWS_IO_Acceptor;
+
+
+
 class JAWS_Export JAWS_IO
   // = TITLE
   //
@@ -233,7 +238,7 @@ protected:
   virtual void send_message (JAWS_IO_Handler *ioh,
                              const char *buffer,
                              unsigned int length,
-                             int act);
+                             long act);
 };
 
 typedef ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>
diff --git a/apps/JAWS2/JAWS/IO_Acceptor.cpp b/apps/JAWS2/JAWS/IO_Acceptor.cpp
index e8aefec3fb2..40740c370b3 100644
--- a/apps/JAWS2/JAWS/IO_Acceptor.cpp
+++ b/apps/JAWS2/JAWS/IO_Acceptor.cpp
@@ -194,21 +194,3 @@ JAWS_IO_Asynch_Acceptor::close (void)
 #endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
-template class ACE_Asynch_Acceptor<JAWS_Asynch_Handler>;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
-template class ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>;
-template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
-template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
-#pragma instantiate ACE_Asynch_Acceptor<JAWS_Asynch_Handler>
-#pragma instantiate  ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
-#pragma instantiate  ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/IO_Acceptor.h b/apps/JAWS2/JAWS/IO_Acceptor.h
index 78e861ec12e..e18bcd55c30 100644
--- a/apps/JAWS2/JAWS/IO_Acceptor.h
+++ b/apps/JAWS2/JAWS/IO_Acceptor.h
@@ -21,8 +21,10 @@
 #include "JAWS/IO_Handler.h"
 
 // Forward declaration.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Proactor;
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (JAWS_HAS_THREAD_SAFE_ACCEPT)
 typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX> JAWS_IO_SOCK_Acceptor;
diff --git a/apps/JAWS2/JAWS/IO_Handler.cpp b/apps/JAWS2/JAWS/IO_Handler.cpp
index 595885c3686..fe957a82103 100644
--- a/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -501,11 +501,3 @@ JAWS_Asynch_Handler::handler (void)
 
 #endif /* ACE_WIN32 */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Asynch_IO_Handler_Factory, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_Asynch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/IO_Handler.h b/apps/JAWS2/JAWS/IO_Handler.h
index ab81bfd42e1..7420a8825c8 100644
--- a/apps/JAWS2/JAWS/IO_Handler.h
+++ b/apps/JAWS2/JAWS/IO_Handler.h
@@ -40,7 +40,9 @@ class JAWS_Data_Block;
 class JAWS_Pipeline_Handler;
 class JAWS_Waiter;
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class JAWS_Export JAWS_Abstract_IO_Handler
   // = TITLE
diff --git a/apps/JAWS2/JAWS/Parse_Headers.cpp b/apps/JAWS2/JAWS/Parse_Headers.cpp
index 4f3ff515cb4..798b720685e 100644
--- a/apps/JAWS2/JAWS/Parse_Headers.cpp
+++ b/apps/JAWS2/JAWS/Parse_Headers.cpp
@@ -2,6 +2,7 @@
 
 #include "JAWS/Parse_Headers.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 
 #define ACCESSOR(T,C,x) \
 T C :: x (void) const { return this-> x##_; }\
@@ -435,8 +436,3 @@ ACCESSOR(int,JAWS_Header_Info,end_of_line)
 ACCESSOR(int,JAWS_Header_Info,end_of_headers)
 ACCESSOR(int,JAWS_Header_Info,status)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Singleton<JAWS_Parse_Headers, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate  ACE_Singleton<JAWS_Parse_Headers, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index 0616e600800..e40809887c5 100644
--- a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -202,12 +202,3 @@ JAWS_Pipeline_Done_Task::handle_put (JAWS_Data_Block *, ACE_Time_Value *)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>;
-template class ACE_Singleton<JAWS_Pipeline_Accept_Task, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Pipeline_Done_Task, ACE_SYNCH_NULL_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-#pragma instantiate ACE_Singleton<JAWS_Pipeline_Accept_Task, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_Pipeline_Done_Task, ACE_SYNCH_NULL_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/Server.cpp b/apps/JAWS2/JAWS/Server.cpp
index c179bc60021..e65ca3b57d3 100644
--- a/apps/JAWS2/JAWS/Server.cpp
+++ b/apps/JAWS2/JAWS/Server.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/config-lite.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Get_Opt.h"
 
 #if (ACE_NTRACE != 1)
diff --git a/apps/JAWS2/JAWS/Waiter.cpp b/apps/JAWS2/JAWS/Waiter.cpp
index e636ebb61ab..17a9826f1e2 100644
--- a/apps/JAWS2/JAWS/Waiter.cpp
+++ b/apps/JAWS2/JAWS/Waiter.cpp
@@ -62,12 +62,3 @@ JAWS_Waiter::wait_for_completion (int i)
   return ioh;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class JAWS_Assoc_Array<JAWS_Thread_ID, JAWS_IO_Handler *>;
-template class JAWS_Assoc_Array_Iterator<JAWS_Thread_ID, JAWS_IO_Handler *>;
-template class ACE_Singleton<JAWS_Waiter, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate JAWS_Assoc_Array<JAWS_Thread_ID, JAWS_IO_Handler *>
-#pragma instantiate JAWS_Assoc_Array_Iterator<JAWS_Thread_ID, JAWS_IO_Handler *>
-#pragme instantiate ACE_Singleton<JAWS_Waiter, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS2/JAWS/jaws2.mpc b/apps/JAWS2/JAWS/jaws2.mpc
index 1079809a40c..a7d5754b11a 100644
--- a/apps/JAWS2/JAWS/jaws2.mpc
+++ b/apps/JAWS2/JAWS/jaws2.mpc
@@ -4,7 +4,7 @@
 project(JAWS2) : acelib {
     sharedname = JAWS2
     dynamicflags = JAWS_BUILD_DLL
-    avoids += uses_wchar
+    avoids += uses_wchar ace_for_tao
     includes += ..
     Source_Files {
         Assoc_Array.cpp
diff --git a/apps/JAWS3/bench/rqfiles.cpp b/apps/JAWS3/bench/rqfiles.cpp
index 6c90f26a8f5..e6f88417a4d 100644
--- a/apps/JAWS3/bench/rqfiles.cpp
+++ b/apps/JAWS3/bench/rqfiles.cpp
@@ -38,7 +38,7 @@ public:
 
         if (--number_of_outstanding_requests == 0)
           ACE_Reactor::instance ()->end_event_loop ();
-  
+
         return -1;
       }
     return 0;
@@ -228,7 +228,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ::fclose (fp);
 
   requests = (char **) ::malloc (number_of_urls * sizeof (char *));
-  
+
   // Read in the file list and create requests
 
   int i = 0;
@@ -259,14 +259,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector <HTTP_Sink_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Svc_Tuple<HTTP_Sink_Svc_Handler>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<HTTP_Sink_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<HTTP_Sink_Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
-template class ACE_Select_Reactor_T<ACE_Select_Reactor_Noop_Token>;
-template class ACE_Lock_Adapter<ACE_Select_Reactor_Noop_Token>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS3/jaws3/Config_File.cpp b/apps/JAWS3/jaws3/Config_File.cpp
index 5793aa60dc5..cf8ab94d3a4 100644
--- a/apps/JAWS3/jaws3/Config_File.cpp
+++ b/apps/JAWS3/jaws3/Config_File.cpp
@@ -263,7 +263,7 @@ void
 JAWS_Config_File_Impl::dump (void)
 {
   JAWS_SYMBOL_TABLE_ITERATOR iter (*this->symbols_);
-  JAWS_SYMBOL_TABLE_ENTRY *entry;
+  JAWS_SYMBOL_TABLE_ENTRY *entry = 0;
 
   while (iter.next (entry))
     {
@@ -302,7 +302,3 @@ JAWS_Config_File::dump (void)
   this->impl_->dump ();
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS3/jaws3/Reactive_IO.cpp b/apps/JAWS3/jaws3/Reactive_IO.cpp
index 6917832124e..ead383efa24 100644
--- a/apps/JAWS3/jaws3/Reactive_IO.cpp
+++ b/apps/JAWS3/jaws3/Reactive_IO.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/ACE.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Reactor.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp
index 4d51c3fab9c..c28a9019318 100644
--- a/apps/JAWS3/jaws3/Templates.cpp
+++ b/apps/JAWS3/jaws3/Templates.cpp
@@ -55,50 +55,7 @@
 #define ACE_TQIT_R \
         ACE_Timer_Queue_Iterator_T<ACE_WHEEL_TEMPLATE_ARGS_R>
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>;
-template class ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, int>;
-template class ACE_Node<void *>;
-template class ACE_Unbounded_Queue<void *>;
-template class ACE_Unbounded_Queue_Iterator<void *>;
-template class ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Reactive_IO, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_IO, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_TPR_Concurrency, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Concurrency, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Options, ACE_SYNCH_MUTEX>;
-template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
-template class ACE_Select_Reactor_T<ACE_Select_Reactor_Noop_Token>;
-template class ACE_Lock_Adapter<ACE_Select_Reactor_Noop_Token>;
-template class ACE_EHHTU_RW;
-template class ACE_EHHTU_R;
-template class ACE_TWT_RW;
-template class ACE_TWT_R;
-template class ACE_TWIT_RW;
-template class ACE_TWIT_R;
-template class ACE_TQT_RW;
-template class ACE_TQT_R;
-template class ACE_TQIT_RW;
-template class ACE_TQIT_R;
-template class ACE_Thread_Timer_Queue_Adapter< ACE_TWT_RW >;
-template class ACE_Thread_Timer_Queue_Adapter< ACE_TWT_R >;
-template class ACE_Singleton<JAWS_Timer, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Task_Timer, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Signal_Task, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<ACE_Message_Block, ACE_SYNCH_NULL_MUTEX>;
-template class JAWS_SYMBOL_TABLE_ENTRY;
-template class JAWS_SYMBOL_TABLE_BASE;
-template class JAWS_SYMBOL_TABLE_ITERATOR_BASE;
-template class JAWS_SYMBOL_TABLE_ITERATOR;
-template class JAWS_SYMBOL_TABLE_REVERSE_ITERATOR;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex> *ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex>::singleton_;
 template ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex>::singleton_;
 template ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex>::singleton_;
@@ -112,4 +69,4 @@ template ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<
 template ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex>::singleton_;
 template ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex>::singleton_;
 template ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/apps/JAWS3/jaws3/jaws3.mpc b/apps/JAWS3/jaws3/jaws3.mpc
index 39670f1c384..eaa9ecd0196 100644
--- a/apps/JAWS3/jaws3/jaws3.mpc
+++ b/apps/JAWS3/jaws3/jaws3.mpc
@@ -5,6 +5,7 @@ project(JAWS3) : acelib {
     sharedname = JAWS3
     dynamicflags = JAWS_BUILD_DLL
     avoids += uses_wchar
+    avoids += ace_for_tao
     includes += ..
     Source_Files {
         Asynch_IO.cpp
@@ -70,6 +71,7 @@ project(JAWS3) : acelib {
 
 project(JAWS3_server) : aceexe {
     avoids += uses_wchar
+    avoids += ace_for_tao
     includes += ..
     exename = main
     after += JAWS3
diff --git a/apps/JAWS3/small/SS_Templates.cpp b/apps/JAWS3/small/SS_Templates.cpp
index 9dfc787a4b5..df34eb4eabd 100644
--- a/apps/JAWS3/small/SS_Templates.cpp
+++ b/apps/JAWS3/small/SS_Templates.cpp
@@ -11,13 +11,3 @@
 #include "SS_State_ERROR.h"
 #include "SS_State_DONE.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<TeraSS_Service_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Singleton<TeraSS_State_READ, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<TeraSS_State_PARSE, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<TeraSS_State_WRITE, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<TeraSS_State_ERROR, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<TeraSS_State_DONE, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog
index 9f36a64b805..2d2b707b4e0 100644
--- a/apps/drwho/ChangeLog
+++ b/apps/drwho/ChangeLog
@@ -1,39 +1,68 @@
+Thu Jan  5 00:43:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Untabify.
+          Delete-trailing-whitespace.
+
+Wed Jan  4 22:57:37 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ChangeLog:
+
+          Added "Local Variables" section defining "add-log-time-format"
+          to a really ugly lambda expression that formats changelog
+          timestamps in UTC and works with both GNU Emacs and XEmacs.
+
+Mon Nov 28 07:24:01 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * drwho.mpc:
+
+          Added missing "avoid += ace_for_tao" for "server" project.
+
+Sat Nov 26 06:58:23 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * drwho.mpc:
+
+          Added "avoids += ace_for_tao" since this project requires
+          features of ACE not found in the ace_for_tao subset.  Addresses
+          build errors.
+
 Sat Apr 30 08:16:42 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* Select_Manager.cpp:
+        * Select_Manager.cpp:
 
-	  Fixed syntax error due to missing ACE_RCSID macro definition.
+          Fixed syntax error due to missing ACE_RCSID macro definition.
 
 Fri Apr 29 23:54:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* Comm_Manager.h:
-	* Select_Manager.h:
+        * Comm_Manager.h:
+        * Select_Manager.h:
 
-	  Added virtual destructor to silence g++ 4.0 warnings.
+          Added virtual destructor to silence g++ 4.0 warnings.
 
-	* Comm_Manager.cpp:
-	* Select_Manager.cpp:
+        * Comm_Manager.cpp:
+        * Select_Manager.cpp:
 
-	  New files containing virtual destructor definition.
+          New files containing virtual destructor definition.
 
-	* Makefile.am:
-	* drwho.mpc:
+        * Makefile.am:
+        * drwho.mpc:
 
-	  Added new Comm_Manager.cpp and Select_Manager.cpp files to the
-	  source file list.
+          Added new Comm_Manager.cpp and Select_Manager.cpp files to the
+          source file list.
 
 Sat Feb 17 08:33:06 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* File_Manager.cpp: Fixed several unreachable statements.
+        * File_Manager.cpp: Fixed several unreachable statements.
 
 Thu Feb 15 06:00:12 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* server.cpp: Renamed tstamp to time_stamp to avoid conflicts with
-	  the pre-processor on the Forte 5.2 compiler.  Thanks to Mike
- 	  Curtis for reporting this.
+        * server.cpp: Renamed tstamp to time_stamp to avoid conflicts with
+          the pre-processor on the Forte 5.2 compiler.  Thanks to Mike
+          Curtis for reporting this.
 
-	* File_Manager.cpp: Fixed "unreachable code" errors reported by
-	  Compaq C++.
+        * File_Manager.cpp: Fixed "unreachable code" errors reported by
+          Compaq C++.
 
 Thu Nov 16 17:58:10 2000  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -362,3 +391,9 @@ Wed Sep  4 10:14:51 1991  Douglas C. Schmidt  (schmidt at net4.ics.uci.edu)
           * Add timeout stuff in case hosts are down!
           * Talk to support about making a standard daemon.
           * Fix the problem with returning the number of friends.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 5f138fe70fc..74aa7fbb7a0 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -165,16 +165,7 @@ File_Manager::open_friends_file (const char *filename)
   return this->number_of_friends;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Singleton<File_Manager,ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Singleton<File_Manager,ACE_Null_Mutex>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<File_Manager, ACE_Null_Mutex> *
   ACE_Singleton<File_Manager, ACE_Null_Mutex>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/apps/drwho/drwho.mpc b/apps/drwho/drwho.mpc
index 75362c9be14..ca623976a94 100644
--- a/apps/drwho/drwho.mpc
+++ b/apps/drwho/drwho.mpc
@@ -3,7 +3,7 @@
 
 project(*-client) : aceexe {
   requires += rwho
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   Source_Files {
     Comm_Manager.cpp
     Select_Manager.cpp
@@ -49,7 +49,7 @@ project(*-client) : aceexe {
 
 project(*-server) : aceexe {
   requires += rwho
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   Source_Files {
     Comm_Manager.cpp
     Select_Manager.cpp
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index fd084d500d3..600cde48a9d 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,3 +1,28 @@
+Tue Mar 14 21:08:12 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
+
+        * apps/gperf/src/Gen_Perf.cpp
+        * apps/gperf/src/Key_List.cpp
+        * apps/gperf/src/List_Node.cpp
+        * apps/gperf/src/Options.cpp
+          Updated these files to solve the warnings when setting up "VC level 4 warnings"
+          on Windows. These warnings include "unreachable code", "assignment within
+          conditional expression", "conversion from some type to another type, possible
+          loss of data", "local variable may be used without having been initialized" and
+          so on.
+          Thanks to Lukas Gruetzmacher <gruetzmacher at ais-dresden dot de> for 
+          motivating the fix to these "VC level 4 warnings".
+
+Wed Jan  4 22:55:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+         * ChangeLog:
+
+          Untabify.
+          Delete-trailing-whitespace.
+
+          Added "Local Variables" section defining "add-log-time-format"
+          to a really ugly lambda expression that formats changelog
+          timestamps in UTC and works with both GNU Emacs and XEmacs.
+
 Mon Oct  3 13:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * src/Key_List.cpp:
@@ -2073,3 +2098,9 @@ Thu Jan  5 22:46:34 1989  Doug Schmidt  (schmidt at siam.ics.uci.edu)
         * Added a check in Key_List::Output for the special case where
           the keys used are 1,$.  It is possible to generate more
           efficient C code in this case.
+	
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index 9f74ede4861..36574c83758 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -6,9 +6,23 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/./MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/./MPC/templates -type automake -noreldefs ACE.mwc
+
 
 SUBDIRS = \
+        . \
         src \
         tests
 
+## Makefile.gperf_docs.am
+
+man_MANS = gperf.1
+
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/src/Gen_Perf.cpp b/apps/gperf/src/Gen_Perf.cpp
index da925e89b63..88c362e0218 100644
--- a/apps/gperf/src/Gen_Perf.cpp
+++ b/apps/gperf/src/Gen_Perf.cpp
@@ -102,7 +102,7 @@ Gen_Perf::sort_set (char *union_set, int len)
            curr--)
         union_set[curr] = union_set[curr - 1];
 
-      union_set[curr] = tmp;
+      union_set[curr] = static_cast<char> (tmp);
     }
 }
 
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index 61b91f403c7..e954c075e8a 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -137,7 +137,7 @@ Key_List::special_input (char delimiter)
           delete [] buf;
           buf = temp;
         }
-      buf[i] = c;
+      buf[i] = static_cast<char> (c);
     }
 
   return 0;
@@ -256,7 +256,7 @@ Key_List::read_keys (void)
                                                         delimiter))),
                           -1);
           for (temp = this->head;
-               (buffer = input.read ('\n'))
+               (0 != (buffer = input.read ('\n')))
                  && ACE_OS::strcmp (buffer, "%%");
                temp = temp->next)
             {
diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp
index 38c12201403..e3ef88ed7e0 100644
--- a/apps/gperf/src/List_Node.cpp
+++ b/apps/gperf/src/List_Node.cpp
@@ -42,7 +42,7 @@ List_Node::sort (char *base, int len)
     {
       char curr, tmp;
 
-      for (curr = i + 1, tmp = base[curr];
+      for (curr = static_cast<char> (i + 1), tmp = base[curr];
            curr > 0 && tmp < base[curr-1];
            curr--)
         base[curr] = base[curr - 1];
@@ -81,7 +81,7 @@ List_Node::List_Node (char *k, int len)
   if (option[STRCASECMP])
     for (char *p = k; *p; p++)
       if (isupper (*p))
-        *p = tolower (*p);
+        *p = static_cast<char> (tolower (*p));
 
   if (option[ALLCHARS])         // Use all the character position in the KEY.
     for (; *k; k++, ptr++)
diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp
index 7e2bd2cce77..d433bbc8c9b 100644
--- a/apps/gperf/src/Options.cpp
+++ b/apps/gperf/src/Options.cpp
@@ -129,7 +129,7 @@ Options::key_sort (char *base, int len)
           // Oh no, a duplicate!!!
           return 0;
 
-      base[curr] = tmp;
+      base[curr] = static_cast<char> (tmp);
     }
 
   return 1;
@@ -523,7 +523,7 @@ Options::parse_args (int argc, char *argv[])
                                        usage),
                                       -1);
                   else
-                    *l_key_pos = value;;
+                    *l_key_pos = static_cast<char> (value);
 
                 *l_key_pos = EOS;
 
diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp
index 07b6eed28e6..9d638725a10 100644
--- a/apps/mkcsregdb/mkcsregdb.cpp
+++ b/apps/mkcsregdb/mkcsregdb.cpp
@@ -243,7 +243,7 @@ csdb_generator::init_output (const char *srcfile)
   fprintf (outf_," * mkcsregdb. The source is in $ACE_ROOT/apps/mkcsregdb. It will generate a new\n");
   fprintf (outf_," * copy of this file, with the registry_db_ array properly initialized.\n */\n");
   fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\n%s\n%s\n{\n",
-           "ACE_Codeset_Registry::registry_entry",
+           "ACE_Codeset_Registry::registry_entry const",
            "ACE_Codeset_Registry::registry_db_[] =");
   return 0;
 }
@@ -286,7 +286,7 @@ csdb_generator::fini_output (const char *tgt)
   sprintf (target,"%s/ace/%s",ace_src_,tgt);
   if (count_ == 0)
     write_dummy_entry();
-  fprintf (outf_,"\n};\n\nsize_t ACE_Codeset_Registry::num_registry_entries_ = %d;\n\n",count_);
+  fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\n",count_);
   fclose (outf_);
   ACE_stat buf;
   if (ACE_OS::stat (target,&buf) == 0)
diff --git a/apps/soreduce/Obj_Module.h b/apps/soreduce/Obj_Module.h
index 1f74031a719..1836b75e7ec 100644
--- a/apps/soreduce/Obj_Module.h
+++ b/apps/soreduce/Obj_Module.h
@@ -22,7 +22,9 @@
 
 #include "Sig_List.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Obj_Module {
 public:
diff --git a/apps/soreduce/soreduce.mpc b/apps/soreduce/soreduce.mpc
index 18f2e917796..2fe7cc27101 100644
--- a/apps/soreduce/soreduce.mpc
+++ b/apps/soreduce/soreduce.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(soreduce) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = soreduce
   Source_Files {
     Signature.cpp
diff --git a/bin/ChangeLogEditor/ChangeLogEdit.pm b/bin/ChangeLogEditor/ChangeLogEdit.pm
index 16587eb03dc..b7831ae2e5b 100644
--- a/bin/ChangeLogEditor/ChangeLogEdit.pm
+++ b/bin/ChangeLogEditor/ChangeLogEdit.pm
@@ -95,8 +95,8 @@ sub edit {
       }
     }
     else {
-      $error = "Unable to generate a list of modified files\n" .
-               'Could this be a cvs problem?';
+      $error = "Either there are no modified/removed files files or " .
+               "there is a revision\ncontrol system problem.";
     }
   }
   else {
diff --git a/bin/ChangeLogEditor/ChangeLogEntry.pm b/bin/ChangeLogEditor/ChangeLogEntry.pm
index 12675cf5d1a..2028dec1874 100644
--- a/bin/ChangeLogEditor/ChangeLogEntry.pm
+++ b/bin/ChangeLogEditor/ChangeLogEntry.pm
@@ -13,7 +13,7 @@ package ChangeLogEntry;
 use strict;
 use File::Basename;
 
-use FileLocator;
+use FileLocatorFactory;
 
 # ************************************************************
 # Subroutine Section
@@ -83,12 +83,12 @@ sub sortFileList {
 sub create {
   my($self)  = shift;
   my(@dirs)  = @_;
-  my($fl)    = new FileLocator();
+  my($fl)    = FileLocatorFactory::create();
   my($modif,
      $remov,
      $confl,
      $unknown) = $fl->locate(@dirs);
-  my($entry) = scalar(localtime());
+  my($entry) = scalar(gmtime());
 
   if (defined $$confl[0]) {
     $entry = "ERROR: The following files have conflicts:\n";
@@ -99,8 +99,9 @@ sub create {
   else {
     my($prefix) = '        * ';
 
-    ## Remove the timezone
-    $entry =~ s/(:\d\d\s+)(.*)(\d\d\d\d)$/$1$3/;
+    ## Correct the timezone (if there is any)
+    my($tz) = 'UTC';
+    $entry =~ s/(:\d\d\s+)(.*)(\d\d\d\d)$/$1$tz $3/;
 
     ## Add the name and email address
     $entry .= "  $self->{'name'}  <$self->{'email'}>\n\n";
diff --git a/bin/ChangeLogEditor/FileLocator.pm b/bin/ChangeLogEditor/FileLocator.pm
index 2d4e8c0b8fc..7b768863a22 100644
--- a/bin/ChangeLogEditor/FileLocator.pm
+++ b/bin/ChangeLogEditor/FileLocator.pm
@@ -1,7 +1,7 @@
 package FileLocator;
 
 # ************************************************************
-# Description   : Use CVS to determine the list of modified files.
+# Description   : Base class for file locators.
 # Author        : Chad Elliott
 # Create Date   : 6/18/2002
 # ************************************************************
@@ -28,93 +28,12 @@ sub new {
 sub locate {
   my($self)      = shift;
   my(@dirs)      = @_;
-  my($fh)        = new FileHandle();
   my(@modified)  = ();
   my(@removed)   = ();
   my(@conflicts) = ();
   my(@unknown)   = ();
-  my($cvsroot)   = $self->obtainCVSROOT();
-  my($nul)       = ($^O eq 'MSWin32' ? 'nul' : '/dev/null');
-
-  if (open($fh, 'cvs -q ' . (defined $cvsroot ? "-d $cvsroot " : '') .
-                "-n update @dirs 2> $nul |")) {
-    while(<$fh>) {
-      my($line) = $_;
-      if ($line =~ /^[AM]\s+(.*)/) {
-        push(@modified, $1);
-      }
-      elsif ($line =~ /^[R]\s+(.*)/) {
-        push(@removed, $1);
-      }
-      elsif ($line =~ /^[C]\s+(.*)/) {
-        push(@conflicts, $1);
-      }
-      elsif ($line =~ /^[\?]\s+(.*)/) {
-        push(@unknown, $1);
-      }
-    }
-    close($fh);
-  }
   return \@modified, \@removed, \@conflicts, \@unknown;
 }
 
 
-sub obtainCVSROOT {
-  my($self)  = shift;
-  my($fh)    = new FileHandle();
-  my($croot) = undef;
-
-  if (open($fh, 'CVS/Root')) {
-    while(<$fh>) {
-      my($line) = $_;
-      $line =~ s/\s+$//;
-      if ($line =~ /^:pserver/ || $line =~ /^:ext/) {
-        if (defined $ENV{CVSROOT} && $line eq $ENV{CVSROOT}) {
-          last;
-        }
-        else {
-          my($check) = $line;
-          $check =~ s/:\w+\@/:\@/;
-          $check =~ s/\.\w+\.\w+:/:/;
-          my($clen) = length($check);
-          foreach my $key (keys %ENV) {
-            my($echeck) = $ENV{$key};
-            $echeck =~ s/:\w+\@/:\@/;
-            $echeck =~ s/\.\w+\.\w+:/:/;
-            if ($check eq $echeck) {
-              $croot = $ENV{$key};
-              last;
-            }
-            else {
-              my($len) = length($echeck);
-              if ($len > 0 &&
-                  substr($check, $clen - $len, $len) eq $echeck) {
-                $croot = $ENV{$key};
-                last;
-              }
-            }
-          }
-          if (defined $croot) {
-            last;
-          }
-        }
-        if (!defined $croot) {
-          $croot = $line;
-        }
-      }
-      else {
-        $croot = $line;
-        last;
-      }
-    }
-    close($fh);
-  }
-  else {
-    $croot = $ENV{CVSROOT};
-  }
-
-  return $croot;
-}
-
-
 1;
diff --git a/bin/DependencyGenerator/GNUObjectGenerator.pm b/bin/DependencyGenerator/GNUObjectGenerator.pm
index a1058f05da8..a7c5bdbf5ef 100644
--- a/bin/DependencyGenerator/GNUObjectGenerator.pm
+++ b/bin/DependencyGenerator/GNUObjectGenerator.pm
@@ -22,16 +22,16 @@ use vars qw(@ISA);
 
 sub process {
   my($noext)   = $_[1];
-  my($objects) = [];
+  my(@objects) = ();
   $noext =~ s/\.[^\.]+$//o;
 
   foreach my $dirs (qw(VDIR VSHDIR)) {
     foreach my $ext (qw(SOEXT OBJEXT)) {
-      push @{$objects}, '$('.$dirs.')'.$noext.'.$('.$ext.')';
+      push(@objects, '$('.$dirs.')'.$noext.'.$('.$ext.')');
     }
   }
 
-  return $objects;
+  return \@objects;
 }
 
 
diff --git a/bin/DependencyGenerator/MakeObjectGenerator.pm b/bin/DependencyGenerator/MakeObjectGenerator.pm
index 5bc4c3d8edd..67e5cf174b8 100644
--- a/bin/DependencyGenerator/MakeObjectGenerator.pm
+++ b/bin/DependencyGenerator/MakeObjectGenerator.pm
@@ -22,7 +22,7 @@ use vars qw(@ISA);
 
 sub process {
   my($noext)   = $_[1];
-  my($objects) = [];
+  my(@objects) = ();
   my(@exts)    = ('o');
   my(@dirs)    = (defined $ENV{VDIR} ? $ENV{VDIR} : '');
   $noext =~ s/\.[^\.]+$//o;
@@ -36,11 +36,11 @@ sub process {
 
   foreach my $dirs (@dirs) {
     foreach my $ext (@exts) {
-      push(@$objects, "$dirs$noext.$ext");
+      push(@objects, "$dirs$noext.$ext");
     }
   }
 
-  return $objects;
+  return \@objects;
 }
 
 
diff --git a/bin/FOCUS/ChangeLog b/bin/FOCUS/ChangeLog
index 30ac9d1bef6..b5323e5e749 100644
--- a/bin/FOCUS/ChangeLog
+++ b/bin/FOCUS/ChangeLog
@@ -1,3 +1,18 @@
+Fri Nov 18 17:05:49 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * specializations/Reactor_Family/Select_Reactor_ST.spl:
+        * specializations/Reactor_Family/Select_Reactor_MT.spl:
+
+          Reverted the include file in ace/Select_Reactor_T.inl as g++ 4.0
+          seems to balk when this is not there. This does not seem to
+          happen with g++ 3.2 or later versions
+
+Thu Oct 27 09:47:32 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * specializations/iiop.spl:
+
+          Updated specializations file based on changes made to ACE+TAO
+
 Thu Sep 29 15:57:36 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
         * FOCUS.pl:
diff --git a/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl b/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl
index c209dc90f6c..d0da22a42f9 100644
--- a/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl
+++ b/bin/FOCUS/specializations/Protocol_Family/IIOP/iiop.spl
@@ -316,7 +316,8 @@ TAO_Connection_Handler::TAO_Connection_Handler (
 
   // Put ourselves in the connection wait state as soon as we get
   // created
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_WAIT);
+  this->state_changed (TAO_LF_Event::LFS_CONNECTION_WAIT,
+                       this->orb_core_->leader_follower ());
 }
  </data>
 </add>
@@ -430,7 +431,6 @@ TAO_Connection_Handler::TAO_Connection_Handler (
 <substitute match-line="yes">
  <search>: TAO_Acceptor \(IOP::TAG_INTERNET_IOP\),</search>
  <replace>: tag_ (IOP::TAG_INTERNET_IOP),
-            lite_flag_ (0)
  </replace>
 </substitute>
 
@@ -708,7 +708,6 @@ TAO_Connection_Handler::TAO_Connection_Handler (
  <search>: TAO_Connector \(IOP::TAG_INTERNET_IOP\)</search>
  <replace>: active_connect_strategy_ (0)
           , tag_ (IOP::TAG_INTERNET_IOP)
-          , lite_flag_ (0)
           , orb_core_ (0)
  </replace>
 </substitute>
diff --git a/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl b/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl
index c7541cc6915..6d4ecf6609b 100644
--- a/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl
+++ b/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_MT.spl
@@ -156,11 +156,13 @@ virtual int register_handler (ACE_HANDLE handle,
 
 </file>
 
+<!-- 
 <file name="Select_Reactor_T.inl">
 
 <remove>#include "ace/Reactor.h"</remove>
 
 </file>
+-->
 
 <file name="Reactor.h">
 
diff --git a/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl b/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl
index 13e72307183..145136455a2 100644
--- a/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl
+++ b/bin/FOCUS/specializations/Reactor_Family/Select_Reactor_ST.spl
@@ -131,11 +131,13 @@ virtual int register_handler (ACE_HANDLE handle,
 
 </file>
 
+<!-- 
 <file name="Select_Reactor_T.inl">
 
 <remove>#include "ace/Reactor.h"</remove>
 
 </file>
+-->
 
 <!-- Transformations to Reactor_Token_T.h -->
 <file name="Reactor_Token_T.h">
diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README
index 092e3ceb358..0b5da7554f3 100644
--- a/bin/MakeProjectCreator/README
+++ b/bin/MakeProjectCreator/README
@@ -29,6 +29,10 @@ NOTE: Within the GNUACE project type, setting sharedname to empty and
 setting staticname to the static library name will result in a project
 that will generate only static libraries.
 
+The default generation mode for the GNUACE project type is named targets.
+The environment variable MPC_GNUACE_DIRECTORY_DEPS can be set to get the
+directory based build that was used up until April of 2006.
+
 For more information about MPC, see the README and USAGE files in the
 MPC directory.
 
diff --git a/bin/MakeProjectCreator/config/ace_fl.mpb b/bin/MakeProjectCreator/config/ace_fl.mpb
index 057d699ab66..315e3f9499e 100644
--- a/bin/MakeProjectCreator/config/ace_fl.mpb
+++ b/bin/MakeProjectCreator/config/ace_fl.mpb
@@ -15,4 +15,15 @@ project : ace_x11, ace_gl {
   specific(vc8,vc71,vc7,vc6) {
      libs += fltkdll
   }
+
+  specific(automake) {
+     // ACE_FLTK_* macros contain X11 settings
+     compile_flags -= $(ACE_X11_CPPFLAGS)
+     linkflags -= $(ACE_X11_LDFLAGS)
+     pure_libs -= $(ACE_X11_LIBS)
+
+     compile_flags += $(ACE_FLTK_CPPFLAGS)
+     linkflags += $(ACE_FLTK_LDFLAGS)
+     pure_libs += $(ACE_FLTK_LIBS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb
index 6c199111514..5b66aa7f68f 100644
--- a/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -9,4 +9,20 @@ project: qt {
     LIBS += $(PLATFORM_QT_LIBS)
     LDFLAGS += $(PLATFORM_QT_LDFLAGS)
   }
+
+  specific(automake) {
+    includes -= $(QTDIR)/include
+    libpaths -= $(QTDIR)/lib
+    macros   -= QT_THREAD_SUPPORT
+    lit_libs -= qt-mt$(QT_VERSION)
+
+    compile_flags += $(ACE_QT_CPPFLAGS)
+    linkflags += $(ACE_QT_LDFLAGS)
+    pure_libs += $(ACE_QT_LIBS)
+  }
+
+  specific(vc6, vc7, vc71, vc8, nmake) {
+    lit_libs -= qt-mt$(QT_VERSION)
+    pure_libs += $(PLATFORM_QT_LIBS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/ace_tk.mpb b/bin/MakeProjectCreator/config/ace_tk.mpb
index 39c9327073c..10493bbf4ea 100644
--- a/bin/MakeProjectCreator/config/ace_tk.mpb
+++ b/bin/MakeProjectCreator/config/ace_tk.mpb
@@ -10,4 +10,10 @@ project {
     LIBS += $(PLATFORM_TCL_LIBS) $(PLATFORM_TK_LIBS)
     LDFLAGS += $(PLATFORM_TCL_LDFLAGS) $(PLATFORM_TK_LDFLAGS)
   }
+
+  specific(automake) {
+    compile_flags += $(ACE_TK_CPPFLAGS) $(ACE_TCL_CPPFLAGS)
+    linkflags += $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
+    pure_libs += $(ACE_TK_LIBS) $(ACE_TCL_LIBS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/ace_x11.mpb b/bin/MakeProjectCreator/config/ace_x11.mpb
index 700f331fc79..0b2f478acc2 100644
--- a/bin/MakeProjectCreator/config/ace_x11.mpb
+++ b/bin/MakeProjectCreator/config/ace_x11.mpb
@@ -13,4 +13,10 @@ project {
 	LIBS += $(PLATFORM_X11_LIBS)
 	LDFLAGS += $(PLATFORM_X11_LDFLAGS)
   }
+
+  specific(automake) {
+	compile_flags += $(ACE_X11_CPPFLAGS)
+	linkflags += $(ACE_X11_LDFLAGS)
+	pure_libs += $(ACE_X11_LIBS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/ace_xt.mpb b/bin/MakeProjectCreator/config/ace_xt.mpb
index 6202ca1c473..78152e14cc1 100644
--- a/bin/MakeProjectCreator/config/ace_xt.mpb
+++ b/bin/MakeProjectCreator/config/ace_xt.mpb
@@ -11,4 +11,10 @@ project: ace_x11 {
 	LIBS += $(PLATFORM_XT_LIBS) $(PLATFORM_X11_LIBS)
 	LDFLAGS += $(PLATFORM_XT_LDFLAGS) $(PLATFORM_X11_LDFLAGS)
   }
+
+  specific(automake) {
+	compile_flags += $(ACE_XT_CPPFLAGS)
+	linkflags += $(ACE_XT_LDFLAGS)
+	pure_libs += $(ACE_XT_LIBS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index c0342e19177..e6f5fc5f01f 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: zzip, ipv6 {
+project: zlib, zzip, ipv6 {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
@@ -17,4 +17,9 @@ project: zzip, ipv6 {
     am_version = @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
     includes += $(ACE_BUILDDIR)
   }
+
+  specific(vc8) {
+    // Enable structured exception handling
+    ExceptionHandling = 2
+  }
 }
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index 0e75bbcf3a1..cfd59d40b8d 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, acenosubsets, ace_for_tao {
+project: acedefaults, acenosubsets, ace_for_tao, versioned_namespace {
 
 }
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index aba02c877ca..c1be0ca8fc3 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, acenosubsets, ace_for_tao, pkgconfig {
+project: acedefaults, acenosubsets, ace_for_tao, versioned_namespace, pkgconfig {
   libout    = $(ACE_ROOT)/lib
 
   specific(automake) {
diff --git a/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb b/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb
deleted file mode 100644
index 150837a66c2..00000000000
--- a/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-
-feature(ace_for_tao) {
-
-  after    += ACE_Memory_FOR_TAO
-  libs     += ACE_Memory_FOR_TAO
-
-}
diff --git a/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb b/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb
deleted file mode 100644
index 6196abac31a..00000000000
--- a/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-
-feature(ace_for_tao) {
-
-  after    += ACE_Reactor_FOR_TAO
-  libs     += ACE_Reactor_FOR_TAO
-
-}
diff --git a/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb b/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb
deleted file mode 100644
index 6e499cc334b..00000000000
--- a/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-
-feature(ace_for_tao) {
-
-  after    += ACE_Sockets_FOR_TAO
-  libs     += ACE_Sockets_FOR_TAO
-
-}
diff --git a/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb b/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb
deleted file mode 100644
index 9a9516fe510..00000000000
--- a/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-
-feature(ace_for_tao) {
-
-  after    += ACE_Threads_FOR_TAO
-  libs     += ACE_Threads_FOR_TAO
-
-}
diff --git a/bin/MakeProjectCreator/config/acexml.mpb b/bin/MakeProjectCreator/config/acexml.mpb
index caf428e3353..7097de92b92 100644
--- a/bin/MakeProjectCreator/config/acexml.mpb
+++ b/bin/MakeProjectCreator/config/acexml.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project {
+  avoids   += ace_for_tao
   after    += ACEXML_Parser ACEXML
   libs     += ACEXML_Parser ACEXML
   includes += $(ACE_ROOT)/ACEXML/common
diff --git a/bin/MakeProjectCreator/config/automake.features b/bin/MakeProjectCreator/config/automake.features
index fb2cd1d6d07..4798bf6a418 100644
--- a/bin/MakeProjectCreator/config/automake.features
+++ b/bin/MakeProjectCreator/config/automake.features
@@ -10,6 +10,8 @@ qos=0
 
 gl=1
 x11=1
+athena=1
+motif=1
 
 fl=1
 ace_flreactor=1
diff --git a/bin/MakeProjectCreator/config/avstreams.mpb b/bin/MakeProjectCreator/config/avstreams.mpb
index 6c340ccded6..b48daeacc30 100644
--- a/bin/MakeProjectCreator/config/avstreams.mpb
+++ b/bin/MakeProjectCreator/config/avstreams.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project: property, naming, qos {
+project: property_serv, naming, qos {
+  avoids    += ace_for_tao
   after     += AV
   libs      += TAO_AV
   tagchecks += AV
diff --git a/bin/MakeProjectCreator/config/boost_unit_test.mpb b/bin/MakeProjectCreator/config/boost_unit_test.mpb
deleted file mode 100644
index 7838b8a1ead..00000000000
--- a/bin/MakeProjectCreator/config/boost_unit_test.mpb
+++ /dev/null
@@ -1,11 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  requires += boost
-  verbatim(gnuace,local) {
-    CPPFLAGS += $(PLATFORM_BOOST_CPPFLAGS)
-    LDFLAGS  += $(PLATFORM_BOOST_LDFLAGS)
-    LDLIBS   += $(PLATFORM_BOOST_UTF_LIBS)
-  }
-}
diff --git a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
index f1e5eb3ff64..9cabf46cf83 100644
--- a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_server_dnc, portableserver, ciao_deployment_svnt {
+project : portableserver, ciao_server_dnc, ciao_events_dnc {
   after    += CIAO_DnC_Container
   libs     += CIAO_DnC_Container
 }
diff --git a/bin/MakeProjectCreator/config/ciao_config_handlers.mpb b/bin/MakeProjectCreator/config/ciao_config_handlers.mpb
index c9b61487df9..7575a2d8a51 100644
--- a/bin/MakeProjectCreator/config/ciao_config_handlers.mpb
+++ b/bin/MakeProjectCreator/config/ciao_config_handlers.mpb
@@ -2,6 +2,12 @@
 // $Id$
 
 project : ciao_xml_utils, dynamicany, typecodefactory {
-  after += XSC_Config_Handlers
-  libs += XSC_DynAny_Handler XSC_Config_Handlers XSC_XML_Handlers RT_CCM_Config_Handlers
-}
\ No newline at end of file
+  verbatim(gnuace, macros) {
+   override no_hidden_visibility = 1
+  }
+  after += XSC_DynAny_Handler XSC_Config_Handlers XSC_XML_Handlers RT_CCM_Config_Handlers CIAO_Events_Handlers Package_Config_Handlers
+  libs  += XSC_DynAny_Handler XSC_Config_Handlers XSC_XML_Handlers RT_CCM_Config_Handlers CIAO_Events_Handlers Package_Config_Handlers
+}
+
+
+
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index ae995bc1548..9b2102955d8 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_client_dnc {
+project : ciao_client_dnc, ciao_events_base_dnc {
   after += Deployment_stub
   libs  += CIAO_Deployment_stub
   includes += $(CIAO_ROOT)/DAnCE
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 3b41eff3ea4..0ea0c5e2275 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_deployment_stub, portableserver {
+project : ciao_deployment_stub, portableserver, ciao_events_dnc {
   after += Deployment_svnt
-  libs  += CIAO_Deployment_svnt 
-  includes += $(CIAO_ROOT)/DAnCE/ciao 
+  libs  += CIAO_Deployment_svnt
+  includes += $(CIAO_ROOT)/DAnCE/ciao
   idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
 }
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index 85e55f2567b..6bc5c8d52a0 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -1,27 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_component_dnc, ciao_deployment_svnt, utils, naming {
+project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming {
   after += CIAO_DnC_Server
   libs  += CIAO_DnC_Server
-
-  // Set the cidl compiler and flags as template values
-  specific {
-    cidlc      = $(CIAO_ROOT)/bin/cidlc
-    cidlc_dep  = $(CIAO_ROOT)/bin/cidlc
-    cidlc_flags = -I $(CIAO_ROOT) -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
-  }
-
-  Define_Custom(CIDL) {
-    automatic         = 0
-    dependent         = $(CIDLC_DEP)
-    command           = $(CIDLC)
-    commandflags      = $(CIDLC_FLAGS)
-    inputext          = .cidl
-    source_outputext  = _svnt.cpp
-    header_outputext  = _svnt.h
-    generic_outputext = E.idl
-    keyword cidlflags = commandflags
-  }
-
 }
diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
index 37cc21b79e5..380c9d22c90 100644
--- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_client_dnc, ciao_deployment_svnt, utils, naming {
+project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc {
   after += CIAO_DnC_Server
   libs  += CIAO_DnC_Server
 }
diff --git a/bin/MakeProjectCreator/config/ciao_xml_utils.mpb b/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
index d597fd6e9e6..1167281994f 100644
--- a/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
+++ b/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
@@ -1,9 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : xerces {
+project : xerces, exceptions {
   includes += $(CIAO_ROOT)/tools
   after += CIAO_XML_Utils
-  requires += exceptions
   libs += CIAO_XML_Utils
-}
\ No newline at end of file
+}
diff --git a/bin/MakeProjectCreator/config/cidlc.mpb b/bin/MakeProjectCreator/config/cidlc.mpb
index 4596ff385e7..38fa6d65e0d 100644
--- a/bin/MakeProjectCreator/config/cidlc.mpb
+++ b/bin/MakeProjectCreator/config/cidlc.mpb
@@ -1,21 +1,15 @@
 // $Id$
 
-project: boost_base {
-  requires += cidl exceptions
+project: boost_filesystem, boost_regex, exceptions {
+  requires += cidl
   includes += $(CIAO_ROOT) $(CIAO_ROOT)/CCF $(ACE_ROOT)/contrib/utility
   libpaths += $(CIAO_ROOT)/CCF/CCF $(ACE_ROOT)/lib
 
-  specific(vc71, vc8) {
+  specific(nmake, vc71, vc8) {
     compile_flags += /wd4290 /wd4800 /wd4250 /wd4355
   }
 
   verbatim(gnuace, top) {
     include $(CIAO_ROOT)/CCF/Config.rules
   }
-
-  verbatim(gnuace, local) {
-    LIBS += $(BOOST_LD_FLAGS)	\
-            -lboost_regex 	\
-            -lboost_filesystem
-  }
 }
diff --git a/bin/MakeProjectCreator/config/concurrency.mpb b/bin/MakeProjectCreator/config/concurrency.mpb
index fbde851c1ba..7f93021e1a1 100644
--- a/bin/MakeProjectCreator/config/concurrency.mpb
+++ b/bin/MakeProjectCreator/config/concurrency.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver {
+project : orbsvcslib {
   after     += CosConcurrency
   libs      += TAO_CosConcurrency
   tagchecks += Concurrency
diff --git a/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
index 031be774f43..72855e6ced4 100644
--- a/bin/MakeProjectCreator/config/dseventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : orbsvcslib, dslogadmin, event {
-  after      += DsEventLogAdmin
-  libs       += TAO_DsEventLogAdmin
+  after     += DsEventLogAdmin
+  libs      += TAO_DsEventLogAdmin
+  tagchecks += EventLog
 }
diff --git a/bin/MakeProjectCreator/config/dslogadmin.mpb b/bin/MakeProjectCreator/config/dslogadmin.mpb
index 94516c7133f..0207a0450ff 100644
--- a/bin/MakeProjectCreator/config/dslogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dslogadmin.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : orbsvcslib {
-  after      += DsLogAdmin
-  libs       += TAO_DsLogAdmin
+  after     += DsLogAdmin
+  libs      += TAO_DsLogAdmin
+  tagchecks += Log
 }
diff --git a/bin/MakeProjectCreator/config/etcl.mpb b/bin/MakeProjectCreator/config/etcl.mpb
index 4b68ef4e524..95e84d4ee9a 100644
--- a/bin/MakeProjectCreator/config/etcl.mpb
+++ b/bin/MakeProjectCreator/config/etcl.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : taolib {
-  after   += ETCL
-  libs    += TAO_ETCL
+  after     += ETCL
+  libs      += TAO_ETCL
+  tagchecks += Notify
 }
diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb
index 10968e61645..36f868262fe 100644
--- a/bin/MakeProjectCreator/config/event.mpb
+++ b/bin/MakeProjectCreator/config/event.mpb
@@ -4,4 +4,5 @@
 project : orbsvcslib, ec_use_typed_events, minimum_corba {
   after     += CosEvent
   libs      += TAO_CosEvent
+  tagchecks += CosEvent
 }
diff --git a/bin/MakeProjectCreator/config/event_serv.mpb b/bin/MakeProjectCreator/config/event_serv.mpb
index 597dd33abb9..1c536f434b5 100644
--- a/bin/MakeProjectCreator/config/event_serv.mpb
+++ b/bin/MakeProjectCreator/config/event_serv.mpb
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging, naming, svc_utils, minimum_corba {
+project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, minimum_corba {
   after     += CosEvent_Serv
   libs      += TAO_CosEvent_Serv
-  tagchecks += CosEvent
 }
diff --git a/bin/MakeProjectCreator/config/ftclientorb.mpb b/bin/MakeProjectCreator/config/ftclientorb.mpb
index f3f70ab90dd..126330da041 100644
--- a/bin/MakeProjectCreator/config/ftclientorb.mpb
+++ b/bin/MakeProjectCreator/config/ftclientorb.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : ftorbutils, pi, interceptors {
+  avoids    += ace_for_tao      // Requires ace/UUID
   after     += FT_ClientORB
   libs      += TAO_FT_ClientORB
   requires  += ace_uuid
diff --git a/bin/MakeProjectCreator/config/ftrteventchannel.mpb b/bin/MakeProjectCreator/config/ftrteventchannel.mpb
index 36b2fb92a02..ca9cfdc46f7 100644
--- a/bin/MakeProjectCreator/config/ftrteventchannel.mpb
+++ b/bin/MakeProjectCreator/config/ftrteventchannel.mpb
@@ -5,4 +5,5 @@ project : ftrtevent, utils, corba_messaging, pi_server {
   after     += FTRT_EventChannel
   libs      += TAO_FTRT_EventChannel
   includes  += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel
+  tagchecks += FTRT_EventChannel
 }
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index 8dec860188a..0de66665428 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -40,7 +40,9 @@ boost         = 0
 wince         = 0
 uses_wchar    = 0
 ziparchive    = 0
-negotiate_codesets = 0
+negotiate_codesets  = 0
+versioned_namespace = 0
+vcl           = 0
 
 // Features for various GUI libraries
 
diff --git a/bin/MakeProjectCreator/config/global.mpb b/bin/MakeProjectCreator/config/global.mpb
deleted file mode 100644
index cd6b5992ac2..00000000000
--- a/bin/MakeProjectCreator/config/global.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  libout   = .
-  libpaths = .
-}
diff --git a/bin/MakeProjectCreator/config/htbp.mpb b/bin/MakeProjectCreator/config/htbp.mpb
index 3b81e61a600..60c9236de26 100644
--- a/bin/MakeProjectCreator/config/htbp.mpb
+++ b/bin/MakeProjectCreator/config/htbp.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : acelib {
+  avoids   += ace_for_tao   // Requires ACE_Configuration_Heap
   after    += HTBP
   libs     += ACE_HTBP
   includes += $(ACE_ROOT)/protocols
diff --git a/bin/MakeProjectCreator/config/htiop.mpb b/bin/MakeProjectCreator/config/htiop.mpb
index dee18841dde..cbeec43da74 100644
--- a/bin/MakeProjectCreator/config/htiop.mpb
+++ b/bin/MakeProjectCreator/config/htiop.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : htbp {
-  after  += HTIOP
-  libs   += TAO_HTIOP
+  after     += HTIOP
+  libs      += TAO_HTIOP
+  tagchecks += HTIOP
 }
diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb
index c8494b989b0..a580d2d0660 100644
--- a/bin/MakeProjectCreator/config/ifrservice.mpb
+++ b/bin/MakeProjectCreator/config/ifrservice.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : iortable, svc_utils, typecodefactory, pi_server, minimum_corba {
+  avoids    += ace_for_tao    // Requires ace/Configuration
   after     += IFRService
   libs      += TAO_IFRService
   tagchecks += IFRService
diff --git a/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb b/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
index 68d73e46d75..7974628140c 100644
--- a/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
+++ b/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
@@ -5,4 +5,8 @@ project: codecfactory, rtcorba, kokyu, rtscheduling {
   after   += Kokyu_DSRT_Schedulers
   libs    += Kokyu_DSRT_Schedulers
   includes += $(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
+
+  specific(automake) {
+   includes += $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  }
 }
diff --git a/bin/MakeProjectCreator/config/messaging.mpb b/bin/MakeProjectCreator/config/messaging.mpb
index 886265898a4..2de4ac8046c 100644
--- a/bin/MakeProjectCreator/config/messaging.mpb
+++ b/bin/MakeProjectCreator/config/messaging.mpb
@@ -1,7 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : valuetype, portableserver, pi, corba_messaging {
+project : valuetype, portableserver, pi, corba_messaging, messaging_optional {
   after    += Messaging
-  libs     += TAO_Messaging
 }
diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb
index 807f3a0c35f..a1f4d3b6014 100644
--- a/bin/MakeProjectCreator/config/naming.mpb
+++ b/bin/MakeProjectCreator/config/naming.mpb
@@ -4,4 +4,5 @@
 project : orbsvcslib {
   after     += CosNaming
   libs      += TAO_CosNaming
+  tagchecks += Naming
 }
diff --git a/bin/MakeProjectCreator/config/naming_serv.mpb b/bin/MakeProjectCreator/config/naming_serv.mpb
index 7d94f96732f..7b1e8caf783 100644
--- a/bin/MakeProjectCreator/config/naming_serv.mpb
+++ b/bin/MakeProjectCreator/config/naming_serv.mpb
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, naming_skel, iortable, messaging, svc_utils {
+project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils {
+  avoids    += ace_for_tao        // Requires MMAP_Memory_Pool
   after     += CosNaming_Serv
   libs      += TAO_CosNaming_Serv
-  tagchecks += Naming
 }
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index 402df15a2e4..4893c915927 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -4,4 +4,5 @@
 project : orbsvcslib, event {
   after     += CosNotification
   libs      += TAO_CosNotification
+  tagchecks += Notify
 }
diff --git a/bin/MakeProjectCreator/config/notification_serv.mpb b/bin/MakeProjectCreator/config/notification_serv.mpb
index a4c1bb6c002..08198cb5825 100644
--- a/bin/MakeProjectCreator/config/notification_serv.mpb
+++ b/bin/MakeProjectCreator/config/notification_serv.mpb
@@ -4,5 +4,4 @@
 project : orbsvcslib, svc_utils, notification_skel, etcl, dynamicany {
   after     += CosNotification_Serv
   libs      += TAO_CosNotification_Serv
-  tagchecks += Notify
 }
diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb
index 103e053d505..be766db59e0 100644
--- a/bin/MakeProjectCreator/config/notifytest.mpb
+++ b/bin/MakeProjectCreator/config/notifytest.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: orbsvcsexe, notification, notification_skel, notification_serv, naming, svc_utils {
+project: orbsvcsexe, notification, notification_skel, notification_serv, naming, svc_utils, event_serv, ifr_client, dynamicinterface, messaging, pi, codecfactory, valuetype {
   after    += NotifyTests_Lib
   libs     += TAO_NotifyTests
   includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib
diff --git a/bin/MakeProjectCreator/config/property.mpb b/bin/MakeProjectCreator/config/property.mpb
index e8cd2200480..a2e1c197764 100644
--- a/bin/MakeProjectCreator/config/property.mpb
+++ b/bin/MakeProjectCreator/config/property.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver {
+project : orbsvcslib {
   after     += CosProperty
   libs      += TAO_CosProperty
   tagchecks += Property
diff --git a/bin/MakeProjectCreator/config/rmcast.mpb b/bin/MakeProjectCreator/config/rmcast.mpb
index 9459bcc79ce..ac9427c3d2a 100644
--- a/bin/MakeProjectCreator/config/rmcast.mpb
+++ b/bin/MakeProjectCreator/config/rmcast.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : acelib, threads {
+  avoids   += ace_for_tao
   after    += RMCast
   libs     += ACE_RMCast
   includes += $(ACE_ROOT)/protocols
diff --git a/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
index 91125e0fdc8..12251e5c162 100644
--- a/bin/MakeProjectCreator/config/rtcorbacommon.mpb
+++ b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
@@ -4,5 +4,10 @@
 project : portableserver, minimum_corba {
   after    += RTCORBA_Common
   libs     += RTCORBA_Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  }
+
   includes += ../Common
 }
diff --git a/bin/MakeProjectCreator/config/rtevent_serv.mpb b/bin/MakeProjectCreator/config/rtevent_serv.mpb
index 9cbd6c5e452..60a356c41cc 100644
--- a/bin/MakeProjectCreator/config/rtevent_serv.mpb
+++ b/bin/MakeProjectCreator/config/rtevent_serv.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project : orbsvcslib, rtevent_skel  {
+  avoids    += ace_for_tao  // Requires ACE_crc32
   after     += RTEvent_Serv
   libs      += TAO_RTEvent_Serv
-  tagchecks += RTEvent
 }
diff --git a/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
index 38908e7f305..4150b18e7e7 100644
--- a/bin/MakeProjectCreator/config/rteventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : dslogadmin_serv, rtevent, rtsched {
-  after      += RTEventLogAdmin
-  libs       += TAO_RTEventLogAdmin
+project : orbsvcslib, dslogadmin, rtevent {
+  after     += RTEventLogAdmin
+  libs      += TAO_RTEventLogAdmin
+  tagchecks += RTEventLog
 }
diff --git a/bin/MakeProjectCreator/config/rtkokyuevent.mpb b/bin/MakeProjectCreator/config/rtkokyuevent.mpb
index f752031bde0..a57c8b8017c 100644
--- a/bin/MakeProjectCreator/config/rtkokyuevent.mpb
+++ b/bin/MakeProjectCreator/config/rtkokyuevent.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : rtevent, rtsched, kokyu {
-  after   += RTKokyuEvent
-  libs    += TAO_RTKokyuEvent
+  after     += RTKokyuEvent
+  libs      += TAO_RTKokyuEvent
+  tagchecks += RTKokyuEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtnotify.mpb b/bin/MakeProjectCreator/config/rtnotify.mpb
index 847b9deaad5..1a04eb83922 100644
--- a/bin/MakeProjectCreator/config/rtnotify.mpb
+++ b/bin/MakeProjectCreator/config/rtnotify.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project : notification_serv, rtcorba {
-  after += RT_Notification
-  libs  += TAO_RT_Notification
+  after     += RT_Notification
+  libs      += TAO_RT_Notification
+  tagchecks += RT_Notify
 }
diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb
index 41af3660e61..8a192c2d077 100644
--- a/bin/MakeProjectCreator/config/security.mpb
+++ b/bin/MakeProjectCreator/config/security.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib {
+project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi {
   after     += Security
   libs      += TAO_Security
   tagchecks += Security
diff --git a/bin/MakeProjectCreator/config/ssl.mpb b/bin/MakeProjectCreator/config/ssl.mpb
index 2b3ba326a8f..f0dfa798e7b 100644
--- a/bin/MakeProjectCreator/config/ssl.mpb
+++ b/bin/MakeProjectCreator/config/ssl.mpb
@@ -5,6 +5,7 @@
 // by creating a new xyzssl.mpb similar to openssl.mpb. 
 // You would then derive the following project from this base.
 project : acelib, ace_openssl {
+  avoids     += ace_for_tao   // Requires ACE asynch streams
   after      += SSL 
   libs       += ACE_SSL
   requires   += ssl
diff --git a/bin/MakeProjectCreator/config/ssliop.mpb b/bin/MakeProjectCreator/config/ssliop.mpb
index e73be56e997..3ccf7b3e877 100644
--- a/bin/MakeProjectCreator/config/ssliop.mpb
+++ b/bin/MakeProjectCreator/config/ssliop.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: interceptors, security, portableserver, ssl {
+project: interceptors, security, portableserver, ssl, pi_server {
     after     += SSLIOP
     libs      += TAO_SSLIOP
     tagchecks += SSLIOP
diff --git a/bin/MakeProjectCreator/config/strategies.mpb b/bin/MakeProjectCreator/config/strategies.mpb
index d5e01739d73..c087499d5fd 100644
--- a/bin/MakeProjectCreator/config/strategies.mpb
+++ b/bin/MakeProjectCreator/config/strategies.mpb
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 project : taolib, anytypecode {
+  avoids  += ace_for_tao     // Requires Unix domain sockets and MEM stuff
   after   += Strategies
   libs    += TAO_Strategies
 }
diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb
index 18b0da61641..6ad0a79c75d 100644
--- a/bin/MakeProjectCreator/config/taodefaults.mpb
+++ b/bin/MakeProjectCreator/config/taodefaults.mpb
@@ -11,3 +11,9 @@ project {
     includes += $(TAO_BUILDDIR)
   }
 }
+
+// If the corba_messaging feature is disabled, then we need
+// to add the TAO_HAS_CORBA_MESSAGING=0 macro onto the command line.
+feature(!corba_messaging) {
+  macros += TAO_HAS_CORBA_MESSAGING=0
+}
\ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/tmcast.mpb b/bin/MakeProjectCreator/config/tmcast.mpb
index 124a243dd1f..4283f27902f 100644
--- a/bin/MakeProjectCreator/config/tmcast.mpb
+++ b/bin/MakeProjectCreator/config/tmcast.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project: acelib, exceptions, threads {
+  avoids   += ace_for_tao
   after    += TMCast
   libs     += ACE_TMCast
   includes += $(ACE_ROOT)/protocols
diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb
index d5cb48b46e4..63db829c0cd 100644
--- a/bin/MakeProjectCreator/config/trading.mpb
+++ b/bin/MakeProjectCreator/config/trading.mpb
@@ -4,4 +4,5 @@
 project : orbsvcslib {
   after     += CosTrading 
   libs      += TAO_CosTrading
+  tagchecks += Trader
 }
diff --git a/bin/MakeProjectCreator/config/trading_serv.mpb b/bin/MakeProjectCreator/config/trading_serv.mpb
index 1cb8109e4b8..2b2f3988b3d 100644
--- a/bin/MakeProjectCreator/config/trading_serv.mpb
+++ b/bin/MakeProjectCreator/config/trading_serv.mpb
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, trading_skel, dynamicany, svc_utils {
+project : orbsvcslib, trading_skel, dynamicany, svc_utils, iortable {
   after     += CosTrading_Serv
   libs      += TAO_CosTrading_Serv
-  tagchecks += Trader
 }
diff --git a/bin/MakeProjectCreator/config/winregistry.mpb b/bin/MakeProjectCreator/config/winregistry.mpb
index 53a75c703e6..4ccdb55836f 100644
--- a/bin/MakeProjectCreator/config/winregistry.mpb
+++ b/bin/MakeProjectCreator/config/winregistry.mpb
@@ -2,5 +2,6 @@
 // $Id$
 
 feature(winregistry) {
+  avoids   += ace_for_tao
   requires += winregistry
 }
diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
index 2c45a070d29..167c91ac295 100644
--- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
@@ -13,10 +13,11 @@ package BorlandProjectCreator;
 use strict;
 
 use ProjectCreator;
+use WinProjectBase;
 use File::Basename;
 
 use vars qw(@ISA);
-@ISA = qw(ProjectCreator);
+@ISA = qw(WinProjectBase ProjectCreator);
 
 # ************************************************************
 # Subroutine Section
diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
index 95dbd88478e..5b4eab604d1 100644
--- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
@@ -116,7 +116,7 @@ sub write_comps {
   my($projects) = $self->get_projects();
   my($pjs)      = $self->get_project_info();
   my(%targnum)  = ();
-  my(@list)     = $self->number_target_deps($projects, $pjs, \%targnum);
+  my(@list)     = $self->number_target_deps($projects, $pjs, \%targnum, 0);
   my($crlf)     = $self->crlf();
   my(@ltargets) = @targets;
 
diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index d716f565e40..4445ef417ec 100644
--- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -52,7 +52,6 @@ sub fill_value {
   my($self)  = shift;
   my($name)  = shift;
   my($value) = undef;
-  my($names) = $self->{'source_files'};
 
   if ($name eq 'mpc_files') {
     my(@mpc_files) = $self->list_mpc_files($self->get_inheritance_tree());
@@ -60,15 +59,10 @@ sub fill_value {
   }
   elsif ($name eq 'vpath') {
     my(%vpath) = ();
-    foreach my $name (keys %$names) {
-      my($comps) = $$names{$name};
-      foreach my $key (keys %$comps) {
-        foreach my $item (@{$$comps{$key}}) {
-          my($dname) = $self->relative($self->mpc_dirname($item));
-          if ($dname ne '.') {
-            $vpath{$dname} = 1;
-          }
-        }
+    foreach my $item ($self->get_component_list('source_files')) {
+      my($dname) = $self->relative($self->mpc_dirname($item));
+      if ($dname ne '.') {
+        $vpath{$dname} = 1;
       }
     }
     my($str) = join(':', keys %vpath);
diff --git a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index 22dfd779021..59e7988b9e8 100644
--- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -76,8 +76,10 @@ sub write_comps {
   my($crlf)    = $self->crlf();
   my(%targnum) = ();
   my($pjs)     = $self->get_project_info();
+  my($named)   = !defined $ENV{MPC_GNUACE_DIRECTORY_DEPS};
   my(@list)    = $self->number_target_deps($self->get_projects(),
-                                           $pjs, \%targnum);
+                                           $pjs, \%targnum,
+                                           $named ? 0 : 1);
 
   ## Print out some preliminary information
   print $fh $crlf,
@@ -87,7 +89,7 @@ sub write_comps {
             "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf",
             $crlf;
 
-  if (defined $ENV{MPC_GNUACE_NAMED_TARGETS}) {
+  if ($named) {
     $self->write_named_targets($fh, $crlf, \%targnum, \@list);
   }
   else {
@@ -236,7 +238,8 @@ sub write_named_targets {
   ## Print out each target separately
   foreach my $project (@$list) {
     my($dname) = $self->mpc_dirname($project);
-    print $fh $crlf, $$trans{$project}, ':';
+    print $fh $crlf, '.PHONY: ', $$trans{$project},
+              $crlf, $$trans{$project}, ':';
     if (defined $$targnum{$project}) {
       foreach my $number (@{$$targnum{$project}}) {
         print $fh " $$trans{$$list[$number]}";
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 31d33b1fdfc..1e3cef6caa8 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -22,6 +22,9 @@ OBJFILES = \
 <%if(libpaths)%>
 
 LFLAGS = \
+<%if(linkflags)%>
+        <%linkflags%> \
+<%endif%>
 <%if(StackReserveSize)%>
         /S:<%StackReserveSize%> \
 <%endif%>
@@ -54,6 +57,14 @@ RESDIR = <%rcdir%>
 <%if(resource_files)%>
 
 RESOURCE =<%foreach(resource_files)%> $(OBJDIR)\<%basenoextension(resource_file)%>.res<%endfor%>
+
+<%if(includes)%>
+RC_FLAGS = \
+<%foreach(includes)%>
+        -i"<%include%>"<%fornotlast(" \\")%>
+<%endfor%>
+<%endif%>
+
 <%endif%>
 
 !ifdef STATIC
@@ -80,6 +91,9 @@ CFLAGS = \
 #	-D<%pch_define%> \
 <%endfor%>
 <%endif%>
+<%if(compile_flags)%>
+        <%compile_flags%> \
+<%endif%>
 <%foreach(macros)%>
 	-D<%macro%> \
 <%endfor%>
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 76e809f17ee..d0619672ee8 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -19,8 +19,9 @@ BIN_UNCHECKED    = <%if(targetoutdir)%><%targetoutdir%><%endif%><%exename%>
 <%if(staticname)%>
 
 ## LIB may be set to empty later on in this file
-LIB_UNCHECKED    = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%staticname%>.a
+LIB_UNCHECKED    = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%libname_prefix%><%staticname%>.a
 LIB              = $(LIB_UNCHECKED)
+LIB_NAME         = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%libname_prefix%><%staticname%>
 <%if(!sharedname)%>
 static_libs_only = 1
 <%endif%>
@@ -28,7 +29,7 @@ static_libs_only = 1
 <%if(sharedname)%>
 
 ## SHLIB may be set to empty later on in this file
-SHLIB_UNCHECKED  = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%sharedname%>.$(SOEXT)
+SHLIB_UNCHECKED  = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%libname_prefix%><%sharedname%>.$(SOEXT)
 SHLIB            = $(SHLIB_UNCHECKED)
 <%endif%>
 <%if(tao || ciao)%>
@@ -68,10 +69,10 @@ FILES = \
 XERCESLIB ?= <%xerceslib%>
 <%endif%>
 <%if(exename)%>
-LDLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
+LDLIBS =<%foreach(libs)%> -l<%libname_prefix%><%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
 <%else%>
 <%if(sharedname)%>
-ACE_SHLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
+ACE_SHLIBS =<%foreach(libs)%> -l<%libname_prefix%><%lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
 <%endif%>
 <%endif%>
 <%if(tao_idl)%>
@@ -94,6 +95,12 @@ CIDLC_FLAGS = <%cidlc_flags%>
 <%endif%>
 
 <%if(exename)%>
+PRJ_TYPE = rtp
+<%else%>
+PRJ_TYPE = library
+<%endif%>
+
+<%if(exename)%>
 <%if(install)%>
 INSBIN ?= <%install%>
 <%endif%>
@@ -153,6 +160,13 @@ RESOURCES += \
 <%foreach(resource_files)%>
   <%resource_file%><%fornotlast(" \\")%>
 <%endfor%>
+<%if(includes)%>
+
+RCFLAGS = \
+<%foreach(includes)%>
+        --include-dir=<%include%><%fornotlast(" \\")%>
+<%endfor%>
+<%endif%>
 endif
 
 <%endif%>
@@ -180,7 +194,7 @@ else
   ifeq ($(findstring k, $(MAKEFLAGS)),k)
     LIBCHECK = 1
   else
-    LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>)
+    LIBCHECK ?= $(filter-out $(foreach lib,<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>)
     ifeq ($(LIBCHECK),)
       LIBCHECK = 1
     endif
@@ -365,34 +379,35 @@ include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE)
 endif
 
 <%foreach(source_files)%>
-<%if(dirname(source_file) && !contains(source_file, \.\./))%>
-<%if(starts_with(source_file, \$) || !ends_with(source_file, \.cpp))%>
-<%if(ends_with(source_file, \.c))%>
+<%if(flag_overrides(source_file, buildflags))%>
 $(VDIR)<%noextension(source_file)%>.$(OBJEXT): <%source_file%>
 	@$(MKDIR) $(VDIR)<%dirname(source_file)%>
-	$(COMPILE.c) $(ACE_USE_PCH_OPT) $(CC_OUTPUT_FLAG) $@ $<
+	<%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%flag_overrides(source_file, buildflags)%> $(ACE_USE_PCH_OPT) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
 ifneq ($(VSHDIR), $(VDIR))
 $(VSHDIR)<%noextension(source_file)%>.$(OBJEXT): <%source_file%>
 	@$(MKDIR) $(VSHDIR)<%dirname(source_file)%>
-	$(COMPILE.c) $(ACE_USE_PCH_OPT) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
+	<%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%flag_overrides(source_file, buildflags)%> $(ACE_USE_PCH_OPT) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 endif
+
 <%else%>
+<%if(dirname(source_file) && !contains(source_file, \.\./))%>
+<%if(starts_with(source_file, \$) || !ends_with(source_file, \.cpp))%>
 $(VDIR)<%noextension(source_file)%>.$(OBJEXT): <%source_file%>
 	@$(MKDIR) $(VDIR)<%dirname(source_file)%>
-	$(COMPILE.cc) $(ACE_USE_PCH_OPT) $(CC_OUTPUT_FLAG) $@ $<
+	<%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(ACE_USE_PCH_OPT) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
 ifneq ($(VSHDIR), $(VDIR))
 $(VSHDIR)<%noextension(source_file)%>.$(OBJEXT): <%source_file%>
 	@$(MKDIR) $(VSHDIR)<%dirname(source_file)%>
-	$(COMPILE.cc) $(ACE_USE_PCH_OPT) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
+	<%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(ACE_USE_PCH_OPT) $(PIC) $(CC_OUTPUT_FLAG) $@ $<
 endif
-<%endif%>
 
 <%endif%>
 <%endif%>
+<%endif%>
 <%endfor%>
 <%if(libpaths)%>
 ifeq ($(VXWORKSLINK),true)
@@ -566,9 +581,9 @@ endif
 
 <%endif%>
 <%if(idl_files)%>
-<%if(source_files)%>
 ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%>
 idl_stubs: $(ADDITIONAL_IDL_TARGETS)
+<%if(source_files)%>
 
 # This assignment forces make to run the idl_stubs
 # target before building any of the source files.
@@ -593,7 +608,9 @@ endif
 ifneq ($(VXWORKSLINK),true)
 <%if(libs && libpaths)%>
 ifeq ($(static_libs_only), 1)
-  DEPLIBS = $(foreach lib, <%libs%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a)))
+  ifeq ($(use_dep_libs), 1)
+    DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a)))
+  endif
 endif
 
 <%endif%>
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index e7bb3fe63df..224afc65bfd 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -112,7 +112,9 @@ sub Executable
         $executable = PerlACE::Process::Normalize_Executable_Name ($executable);
     }
     else {
-        $executable = $executable.".EXE";
+        if ($executable !~ m/.EXE$/i) {
+            $executable = $executable.".EXE";
+        }
         $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
     }
     
@@ -276,7 +278,7 @@ sub Spawn ()
 
     if ($status != $STILL_ACTIVE) {
         print STDERR "ERROR: Spawn failed for <", $self->CommandLine (), ">\n";
-        exit $status;
+        return -1;
     }
 
     $self->{RUNNING} = 1;
diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
index d326ec01db6..21e22e1f287 100644
--- a/bin/PerlACE/Run_Test.pm
+++ b/bin/PerlACE/Run_Test.pm
@@ -21,7 +21,7 @@ if (!defined $svcconf_ext) {
 }
 
 # Default timeout.  NSCORBA needs more time for process start up.
-$wait_interval_for_process_creation = ($^O eq "nonstop_kernel") ? 10 : ($PerlACE::VxWorks_Test ? 60 : 5);
+$wait_interval_for_process_creation = ($^O eq "nonstop_kernel") ? 10 : (($^O eq "lynxos") ? 12 : ($PerlACE::VxWorks_Test ? 60 : 5));
 
 # Turn on autoflush
 $| = 1;
@@ -51,6 +51,11 @@ sub VX_HostFile($)
     return $ENV{"HOST_ROOT"}."/".$file;
 }
 
+# Returns a random port within the range of 10002 - 32767
+sub random_port {
+  return (int(rand($$)) % 22766) + 10002;
+}
+
 # Returns a unique id, uid for unix, last digit of IP for NT
 sub uniqueid
 {
@@ -150,14 +155,7 @@ sub add_path {
   my $name   = shift;
   my $value  = shift;
   if (defined $ENV{$name}) {
-    # $Config{'path_sep'} gives '/' or '\'  we want ':' or ';'
-    #$ENV{$name} .= $Config{'path_sep'} . $value
-    if ($^O eq "MSWin32") {
-      $ENV{$name} .= ';' . $value
-    }
-    else {
-      $ENV{$name} .= ';' . $value
-    }
+    $ENV{$name} .= ($^O eq 'MSWin32' ? ';' : ':') . $value
   }
   else {
     $ENV{$name} = $value;
diff --git a/bin/auto_run_tests.pl b/bin/auto_run_tests.pl
index 57431af787b..3a9f72f8d2c 100755
--- a/bin/auto_run_tests.pl
+++ b/bin/auto_run_tests.pl
@@ -105,17 +105,17 @@ foreach my $test_lst (@file_list) {
         }
 
         chdir ($ACE_ROOT."/$directory")
-            || die "Error: Cannot chdir to $ACE_ROOT/$directory";
+            || print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory" || next;
 
         if ($program =~ /(.*?) (.*)/) {
             if (! -e $1) {
-                print STDERR "Error: $directory.$1 does not exist\n";
+                print STDERR "ERROR: $directory.$1 does not exist\n";
                 next;
               }
           }
         else {
             if (! -e $program) {
-                print STDERR "Error: $directory.$program does not exist\n";
+                print STDERR "ERROR: $directory.$program does not exist\n";
                 next;
               }
           }
diff --git a/bin/ciao_tests.lst b/bin/ciao_tests.lst
index 11e3b9314bf..56dab5ab5ac 100644
--- a/bin/ciao_tests.lst
+++ b/bin/ciao_tests.lst
@@ -7,7 +7,8 @@
 #
 # Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST
 #
-TAO/CIAO/examples/Hello/descriptors/run_test.pl: Exceptions !STATIC !MINIMUM
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: Exceptions !STATIC !MINIMUM
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: Exceptions !STATIC !MINIMUM
-TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: Exceptions !STATIC !MINIMUM
+TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !NOXERCES !ACE_FOR_TAO
+TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !NOXERCES
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: !STATIC !MINIMUM
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: !STATIC !MINIMUM
+TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: !STATIC !MINIMUM
diff --git a/bin/cle.pl b/bin/cle.pl
index f72bf44674e..03f8785f7cd 100755
--- a/bin/cle.pl
+++ b/bin/cle.pl
@@ -11,6 +11,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use strict;
 use Cwd;
 use File::Basename;
+use Sys::Hostname;
 
 if ( $^O eq 'VMS' ) {
   require VMS::Filespec;
@@ -110,10 +111,9 @@ sub getExecutePath {
 
 sub getDefaultDomain {
   my($domain) = undef;
-  my($host)   = `hostname`;
+  my($host)   = hostname();
 
   if (defined $host) {
-    chop($host);
     ## First try the hostname
     if ($host =~ /[^\.]+\.(.*)/) {
       $domain = $1;
@@ -270,7 +270,8 @@ my($status, $error, $unknown) = $editor->edit($file, @dirs);
 if (defined $unknown) {
   my(@uarray) = @$unknown;
   if ($#uarray >= 0) {
-    print "WARNING: The following files are unknown to CVS:\n";
+    print "WARNING: The following files are unknown to the ",
+          "revsion control system:\n";
     foreach my $unk (@uarray) {
       print "$unk\n";
     }
diff --git a/bin/depgen.pl b/bin/depgen.pl
index fc16d03fe7e..5cb652475e6 100755
--- a/bin/depgen.pl
+++ b/bin/depgen.pl
@@ -108,7 +108,8 @@ sub usageAndExit {
         "Usage: $base [-D<MACRO>[=VALUE]] [-I<include dir>] [-A] " .
         "[-R <VARNAME>]\n" .
         "       " . (" " x length($base)) .
-        " [-e <file>] [-f <output file>] [-t <type>] [-n] <files...>\n" .
+        " [-e <file>] [-f <output file>] [-i] [-t <type>] [-n]\n" .
+        "       " . (" " x length($base)) . " <files...>\n" .
         "\n" .
         "-D   This option sets a macro to an optional value.\n" .
         "-I   The -I option adds an include directory.\n" .
@@ -119,6 +120,7 @@ sub usageAndExit {
         "itself.\n" .
         "-f   Specifies the output file.  This file will be edited if it " .
         "already\n     exists.\n" .
+        "-i   Do not print an error if no source files are provided.\n" .
         "-n   Do not include inline files (ending in .i or .inl) in the " .
         "dependencies.\n" .
         "-t   Use specified type (";
@@ -169,7 +171,7 @@ my(@ipaths)   = ();
 my(%replace)  = ();
 my(%exclude)  = ();
 my($output)   = '-';
-
+my($needsrc)  = 1;
 
 if (defined $ENV{ACE_ROOT} && !defined $ENV{TAO_ROOT}) {
   $ENV{TAO_ROOT} = "$ENV{ACE_ROOT}/TAO";
@@ -221,6 +223,9 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
       usageAndExit($base, 'Invalid use of -f');
     }
   }
+  elsif ($arg eq '-i') {
+    $needsrc = undef;
+  }
   elsif ($arg eq '-n') {
     $noinline = 1;
   }
@@ -247,7 +252,9 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
 }
 
 if (!defined $files[0]) {
-  usageAndExit($base, 'No files specified');
+  if ($needsrc) {
+    usageAndExit($base, 'No files specified');
+  }
 }
 
 my($editor) = new DependencyEditor();
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index b05f09d9fd6..1f22a071d3e 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -208,7 +208,7 @@ sub check_for_id_string ()
     }
 }
 
-# check for _MSC_VER >= 1200
+# check for _MSC_VER
 sub check_for_msc_ver_string ()
 {
     print "Running _MSC_VER check\n";
@@ -225,14 +225,26 @@ sub check_for_msc_ver_string ()
                 if (/FUZZ\: enable check_for_msc_ver/) {
                     $disable = 0;
                 }
+                if ($disable == 0 and /\_MSC_VER \<= 1200/) {
+                    $found = 1;
+                    $mscline = $.;
+                }
                 if ($disable == 0 and /\_MSC_VER \>= 1200/) {
                     $found = 1;
                     $mscline = $.;
                 }
+                if ($disable == 0 and /\_MSC_VER \< 1300/) {
+                    $found = 1;
+                    $mscline = $.;
+                }
+                if ($disable == 0 and /\_MSC_VER \<= 1300/) {
+                    $found = 1;
+                    $mscline = $.;
+                }
             }
             close (FILE);
             if ($found == 1) {
-               print_error ("$file:$mscline: Incorrect _MSC_VER >= 1200 found");
+               print_error ("$file:$mscline: Incorrect _MSC_VER check found");
             }
         }
         else {
@@ -708,7 +720,7 @@ sub check_for_push_and_pop ()
             close (FILE);
 
             if ($disable == 0 && $push_count != $pop_count) {
-                print_error ("$file:$.: #pragma warning(push)/(pop) mismatch");
+                print_error ("$file: #pragma warning(push)/(pop) mismatch");
             }
         }
         else {
@@ -717,6 +729,43 @@ sub check_for_push_and_pop ()
     }
 }
 
+# This test verifies that the same number of
+# "ACE_VERSIONED_NAMESPACE_BEGIN_DECL" and
+# "ACE_END_VERSIONED_NAMESPACE_DECL" macros are used in a given
+# source file.
+sub check_for_versioned_namespace_begin_end ()
+{
+  print "Running versioned namespace begin/end test\n";
+  foreach $file (@files_cpp, @files_inl, @files_h) {
+    my $begin_count = 0;
+    my $end_count = 0;
+    if (open (FILE, $file)) {
+      print "Looking at file $file\n" if $opt_d;
+      while (<FILE>) {
+        if (/^\s*\w+_BEGIN_VERSIONED_NAMESPACE_DECL/) {
+          ++$begin_count;
+        }
+        if (/^\s*\w+_END_VERSIONED_NAMESPACE_DECL/) {
+          ++$end_count;
+        }
+        if ($begin_count > $end_count and /^\s*#\s*include\s*/) {
+          print_error ("$file:$.: #include directive within Versioned namespace block");
+        }
+      }
+
+      close (FILE);
+
+      if ($begin_count != $end_count) {
+        print_error ("$file: Versioned namespace begin($begin_count)/end($end_count) mismatch");
+      }
+    }
+    else {
+      print STDERR "Error: Could not open $file\n";
+    }
+  }
+}
+
+
 # Check doxygen @file comments
 sub check_for_mismatched_filename ()
 {
@@ -1104,6 +1153,26 @@ sub check_for_changelog_errors ()
     }
 }
 
+sub check_for_deprecated_macros ()
+{
+    print "Running deprecated macros check\n";
+    foreach $file (@files_cpp, @files_inl, @files_h) {
+        if (open (FILE, $file)) {
+
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                # Check for ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION usage.
+                if (m/ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION\)/) {
+                    print_error ("$file:$.: ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION found.");
+                }
+            }
+            close (FILE);
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
 # This test checks for ptr_arith_t usage in source code.  ptr_arith_t
 # is non-portable.  Use ptrdiff_t instead.
 sub check_for_ptr_arith_t ()
@@ -1237,24 +1306,44 @@ sub check_for_non_bool_operators ()
 sub check_for_long_file_names ()
 {
     my $max_filename = 50;
-    my $max_mpc_filename = $max_filename - 20;
+    my $max_mpc_projectname = $max_filename - 12; ## GNUmakefile.[project_name]
     print "Running file names check\n";
 
     foreach $file (@files_cpp, @files_inl, @files_h, @files_html,
                    @files_dsp, @files_dsw, @files_gnu, @files_idl,
                    @files_pl, @files_changelog, @files_makefile,
-                   @files_bor ) {
+                   @files_bor, @files_mpc) {
         if ( length( basename($file) ) >= $max_filename )
         {
-            print_error ("File name $file exceeds $max_filename chars.");
+            print_error ("File name $file meets or exceeds $max_filename chars.");
         }
     }
-    foreach $file (@files_mpc) {
-        if ( length( basename($file) ) >= $max_mpc_filename )
-        {
-            print_warning ("File name $file exceeds $max_mpc_filename chars.");
+    foreach $file (grep(/\.mpc$/, @files_mpc)) {
+      if (open(FH, $file)) {
+        my($blen) = length(basename($file)) - 4; ## .mpc
+        while(<FH>) {
+          if (/project\s*(:.*)\s*{/) {
+            if ($blen >= $max_mpc_projectname) {
+              print_warning ("File name $file meets or exceeds $max_mpc_projectname chars.");
+            }
+          }
+          elsif (/project\s*\(([^\)]+)\)/) {
+            my($name) = $1;
+            if ($name =~ /\*/) {
+              my($length) = length($name) + (($name =~ tr/*//) * $blen);
+              if ($length >= $max_mpc_projectname) {
+                print_warning ("Project name ($name) from $file will meet or exceed $max_mpc_projectname chars when expanded by MPC.");
+              }
+            }
+            else {
+              if (length($name) >= $max_mpc_projectname) {
+                print_warning ("Project name ($name) from $file meets or exceeds $max_mpc_projectname chars.");
+              }
+            }
+          }
         }
-
+        close(FH);
+      }
     }
 }
 
@@ -1311,6 +1400,7 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
            check_for_tchar
            check_for_pre_and_post
            check_for_push_and_pop
+           check_for_versioned_namespace_begin_end
            check_for_mismatched_filename
            check_for_bad_run_test
            check_for_absolute_ace_wrappers
@@ -1350,6 +1440,7 @@ if ($opt_t) {
 print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
+check_for_deprecated_macros () if ($opt_l > 1 );
 check_for_refcountservantbase () if ($opt_l > 1 );
 check_for_msc_ver_string () if ($opt_l >= 3);
 check_for_empty_inline_files () if ($opt_l >= 1);
@@ -1369,6 +1460,7 @@ check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
 check_for_pre_and_post () if ($opt_l >= 4);
 check_for_push_and_pop () if ($opt_l >= 4);
+check_for_versioned_namespace_begin_end () if ($opt_l >= 4);
 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);
@@ -1381,6 +1473,7 @@ check_for_include () if ($opt_l >= 5);
 check_for_non_bool_operators () if ($opt_l > 2);
 check_for_long_file_names () if ($opt_l > 1 );
 
+
 print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n";
 
 exit (1) if $errors > 0;
diff --git a/bin/generate_compile_stats.sh b/bin/generate_compile_stats.sh
index ce665365f80..7f3fdf353b7 100755
--- a/bin/generate_compile_stats.sh
+++ b/bin/generate_compile_stats.sh
@@ -126,7 +126,7 @@ strip_date ()
 
 ###############################################################################
 #
-# parse 
+# parse
 #
 # Parse the commandline and validate the inputs
 #
@@ -169,7 +169,7 @@ parse ()
     METRIC="Compilation"
   fi
   echo "metric = ($METRIC)"
-  
+
   # set the date from command line
   if [ $# -gt 4 ]; then
     DATE=$5
@@ -221,7 +221,7 @@ gen_chart ()
     set xtics rotate
     set xlabel 'Date (YYYY/MM/DD)' 0,-3
     set ylabel "${YLABEL}"
-    set terminal png small color
+    set terminal png small size 800,600 color
     set yrange [$low:$high]
     set output ".metrics/images/${object}_${TYPE}.png"
     set title "${object//___//}"
@@ -343,7 +343,7 @@ composite_list ()
           DIR=""
           break
         fi
-          
+
         if [ $INDEX -eq 3 ]; then
           DIR="${i%?}"                        # strip off last "'"
           DIR="${DIR#*$ACE_ROOT/}"            # strip off $ACE_ROOT
@@ -448,7 +448,7 @@ library_list ()
         continue
       fi
 
-      # not a "make" line, so process it here.  We are interested in the 
+      # not a "make" line, so process it here.  We are interested in the
       # 3rd, and last,  token, i.e., lib*.a
       let INDEX="$INDEX+1"
       if [ $INDEX -eq 3 ]; then
@@ -544,7 +544,7 @@ footprint ()
       if [ "$TYPE" = "LIB" ]; then
         fpath=${FILE%/*}
         # now, do the same for all the objects in the file (if any)
-        size $FILE | 
+        size $FILE |
         grep -v text |
         awk '{print $4 " : " $6}' | process_included $fpath $lpath $FILE
       fi
@@ -572,7 +572,7 @@ process_included ()
   LIBRARY="${LIBRARY#*$ACE_ROOT/}"    # strip off $ACE_ROOT
   LIBRARY="${LIBRARY//\//___}"        # replace "/" with "___"
   echo -n  "$LIBRARY : " >> .metrics/size_composites.txt
- 
+
   while read size colon file; do
     FILE=$fpath/$file
     OUTFILE="${FILE#*$ACE_ROOT/}"      # strip off $ACE_ROOT
@@ -582,7 +582,7 @@ process_included ()
 
     # add the object
     echo -n "$OUTFILE " >> .metrics/size_composites.txt
-    
+
   done
   # add newline
   echo "" >> .metrics/size_composites.txt
@@ -707,7 +707,7 @@ create_images ()
 create_index_page ()
 {
   local TYPE="$1"
-  local TITLE="$TYPE metrics for ACE+TAO"
+  local TITLE="$TYPE metrics for ACE+TAO+CIAO"
 
   echo "<html>"
   echo "<head><title>$TITLE</title></head>"
@@ -721,24 +721,32 @@ create_index_page ()
   echo "<br><center><h1>$TITLE</h1></center><br><hr>"
   echo '<p>One of the goals of the PCES-TENA project is to decrease compile times.
            In order to track our progress, metrics are gathered nightly on all
-           objects in the ACE+TAO distribution and displayed here.'
+           objects in the ACE+TAO+CIAO distribution and displayed here.'
   echo '<ul>'
   echo "<li><a href=\"ace_${TYPE}.html\">ACE</a>"
   echo "<li><a href=\"tao_${TYPE}.html\">TAO</a>"
+  echo "<li><a href=\"ciao_${TYPE}.html\">CIAO</a>"
   echo '</ul>'
   echo '<hr>'
 
-  echo '<P>All the experiments run on a dual Pentium 4 @2.4Ghz, with
-      512Mb of RAM.  The machine is running Linux (Redhat 8.1),
-      and we use gcc-3.2 to compile ACE+TAO.
-    </P>'
+  echo '<P>All the experiments run on the system described below. '
+  echo 'The machine is running Linux ('
+
+  cat /etc/SuSE-release
+
+  echo '), and we use GCC '
+
+  /usr/bin/gcc -dumpversion > .metrics/gccversion.txt 2>&1
+  cat .metrics/gccversion.txt
 
-  echo '<TABLE border="2"><TBODY><TR><TD>ACE+TAO Configuration</TD><TD>config.h</TD></TR>'
+  echo ' to compile ACE+TAO+CIAO. </P>'
+
+  echo '<TABLE border="2"><TBODY><TR><TD>ACE+TAO+CIAO Configuration</TD><TD>config.h</TD></TR>'
   echo '<TR><TD colspan="2"><PRE>'
 
   cat $ACE_ROOT/ace/config.h
 
-  echo '</PRE></TD></TR><TR><TD>ACE+TAO Configuration</TD><TD>platform_macros.GNU</TD></TR>'
+  echo '</PRE></TD></TR><TR><TD>ACE+TAO+CIAO Configuration</TD><TD>platform_macros.GNU</TD></TR>'
   echo '<TR><TD colspan="2"><PRE>'
 
   cat $ACE_ROOT/include/makeinclude/platform_macros.GNU
@@ -780,11 +788,12 @@ create_index_page ()
 ###############################################################################
 create_page ()
 {
-  # always strip off "TAO___"
+  # always strip off "TAO___" / "CIAO___"
   local BASE=$1
   local TYPE=$2
   local EXT=""
   local BASE_NAME=${BASE#TAO___}
+  local BASE_NAME=${BASE#CIAO___}
   local TITLE="${TYPE} metrics for ${BASE_NAME//___//}"
 
   if [ "$TYPE" = "Compilation" ]; then
@@ -809,11 +818,11 @@ create_page ()
   if [ -e ".metrics/images/${BASE}_${TYPE}.png" ]; then
     echo '<DIV align="center"><P>'
     echo "<IMG alt=\"$BASE\" border=0 src=\"images/${BASE}_${TYPE}.png\""
-    echo 'width="640" height="480"></P></DIV>'
+    echo 'width="800" height="600"></P></DIV>'
   fi
 
   echo "<br><hr><br>"
-  echo "<center><h2>Detail</h2></center>"
+  echo "<center><h2>Detail (${DATE})</h2></center>"
 
   echo '<TABLE border="2"><TBODY><TR><TD rowspan=2><b>Object</b></TD>'
   echo '<TD colspan="3"; align=center><b>Last Compile</b></TD></TR>'
@@ -826,6 +835,8 @@ create_page ()
       if [ -e ".metrics/${i}_${TYPE}.html" ]; then
         # strip off "TAO___" if it exists
         NAME=${i#TAO___}
+        # strip off "CIAO___" if it exists
+        NAME=${i#CIAO___}
         echo "<a href=\"${i}_${TYPE}.html\">${NAME//___//}</a>"
       elif [ -e ".metrics/images/${i}_${TYPE}.png" ]; then
         # since you'll only have images if it's a composite, strip off the
@@ -859,6 +870,13 @@ create_page ()
       let VAL_INT="$VAL_TMP/10"
       let VAL_TENTH="$VAL_TMP-($VAL_INT*10)"
       echo "<TD align=right>${VAL_SIGN}${VAL_INT}.${VAL_TENTH}</TD></TR>"
+    else
+      echo '<TR><TD>'
+      echo "${i}"
+      echo '</TD><TD>'
+      echo '?'
+      echo "</TD><TD align=right>?</TD>"
+      echo "<TD align=right>?</TD></TR>"
     fi
   done # for
   echo '</TBODY></TABLE>'
@@ -904,6 +922,7 @@ create_html ()
   local ALL_BASE=""
   local ACE_OBJS=""
   local TAO_OBJS=""
+  local CIAO_OBJS=""
 
   while read base colon files; do
     # create individual page for app/lib
@@ -911,7 +930,9 @@ create_html ()
     sort_list ${files} | create_page ${base} ${TYPE} \
       > .metrics/${base}_${TYPE}.html
     cp .metrics/${base}_${TYPE}.html $DEST/${base}_${TYPE}.html
-    if [ "${base}" != "${base#TAO}" ]; then
+    if [ "${base}" != "${base#TAO___CIAO}" ]; then
+      CIAO_OBJS="${CIAO_OBJS} ${base}"
+    elif [ "${base}" != "${base#TAO}" ]; then
       TAO_OBJS="${TAO_OBJS} ${base}"
     else
       ACE_OBJS="${ACE_OBJS} ${base}"
@@ -932,6 +953,10 @@ create_html ()
     name="tao_${TYPE}.html"
     sort_list ${TAO_OBJS} | create_page "TAO" ${TYPE} > .metrics/${name}
     cp .metrics/${name} ${DEST}/${name}
+
+    name="ciao_${TYPE}.html"
+    sort_list ${CIAO_OBJS} | create_page "CIAO" ${TYPE} > .metrics/${name}
+    cp .metrics/${name} ${DEST}/${name}
   fi
 }
 
@@ -985,15 +1010,15 @@ elif [ "$METRIC" = "Footprint" ]; then
   # Run size on the executables and append results to *.size file.
   cat .metrics/composites.txt | footprint
 
-  # Run size on the libraries and append results to *.size for the 
+  # Run size on the libraries and append results to *.size for the
   # library and each contained object.
-  # It also creates .metrics/size_composites.txt based on size output for 
+  # It also creates .metrics/size_composites.txt based on size output for
   # libraries with entries like this:
   # ace___libACE.a : ace___ACE.o ace___Addr.o
   cat .metrics/libraries.txt | footprint LIB
 
   # Add executables to .metrics/size_composites.txt based on output
-  # from the map files (created with LDFLAGS=-Xlinker -M -Xlinker 
+  # from the map files (created with LDFLAGS=-Xlinker -M -Xlinker
   # -Map -Xlinker $(@).map).  Find the map files of we want based on
   # entries in .metrics/composites.txt.
   cat .metrics/composites.txt | create_size_composites
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index a2d42cb2c39..7349f816e4c 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -15,13 +15,13 @@ use Getopt::Std;
 
 $flags = join (" ", @ARGV);
 
-if (!getopts ('df:hs') || $opt_h) {
+if (!getopts ('df:hsn') || $opt_h) {
     print STDERR
-          "generate_export_file.pl [-d] [-f dependency] [-s] library_name\n",
+          "generate_export_file.pl [-d] [-f dependency] [-n] library_name\n",
           "\n",
           "    -d         Turn on debug mode\n",
           "    -f         Adds a dependency to another *_HAS_DLL macro\n",
-          "    -s         Add in ACE_AS_STATIC_LIBS check\n",
+          "    -n         Do not add in ACE_AS_STATIC_LIBS check\n",
           "\n",
           "generate_export_file creates the *_export files that are used\n",
           "in exporting of symbols for DLLs (and not exporting them when\n",
@@ -39,8 +39,8 @@ if (defined $opt_d) {
         print STDERR "Dependency to $opt_f\n";
     }
 
-    if (defined $opt_s) {
-        print STDERR "ACE_AS_STATIC_LIBS turned on\n";
+    if (defined $opt_n) {
+        print STDERR "ACE_AS_STATIC_LIBS turned off\n";
     }
 }
 
@@ -72,7 +72,7 @@ $prologue = '
 ##############################################################################
 # Static Stuff
 
-if (defined $opt_s)
+if (!defined $opt_n)
 {
     $static_stuff = "
 #if defined (ACE_AS_STATIC_LIBS) && !defined (-UC-_HAS_DLL)
diff --git a/bin/generate_footprint_chart.sh b/bin/generate_footprint_chart.sh
index 4aac776be70..49b783dde0a 100755
--- a/bin/generate_footprint_chart.sh
+++ b/bin/generate_footprint_chart.sh
@@ -8,7 +8,7 @@ gnuplot <<_EOF_ >/dev/null 2>&1
   set timefmt '%Y/%m/%d-%H:%M'
   set xlabel 'Date (MM/DD)'
   set ylabel 'Size (KBytes)'
-  set terminal png small color
+  set terminal png small size 800,600 color
   set output "$2"
   plot '$1' using 1:(\$2/1024.0) title '$3' w l
   exit
diff --git a/bin/generate_performance_chart.sh b/bin/generate_performance_chart.sh
index 4bdab1d4432..ebff5f13c96 100755
--- a/bin/generate_performance_chart.sh
+++ b/bin/generate_performance_chart.sh
@@ -8,7 +8,7 @@ gnuplot <<_EOF_ >/dev/null 2>&1
     set timefmt '%Y/%m/%d-%H:%M'
     set xlabel 'Date (YYYYMMDD)'
     set ylabel 'Throughput (Requests/Second)'
-    set terminal png small color
+    set terminal png small size 800,600 color
     set yrange [4000:25000]
     set output "$2"
     plot '$1' using 1:2 title '$3' w l
diff --git a/bin/generate_rel_manpages b/bin/generate_rel_manpages
index 06cc14b943e..f95ec731ef4 100755
--- a/bin/generate_rel_manpages
+++ b/bin/generate_rel_manpages
@@ -13,9 +13,9 @@ require Cwd;
 ##########
 my $hostname;
 chomp ($hostname = $ENV{'HOSTNAME'}  ||  `uname -n`);
-unless ("$hostname" eq 'tao') {
+unless ("$hostname" eq 'naboo') {
   #### For efficiency sake . . .
-  die "$0: must run on host tao.dre.vanderbilt.edu\n";
+  die "$0: must run on host naboo.dre.vanderbilt.edu\n";
 }
 my  $perl_path = '/usr/bin/perl';
 
@@ -30,7 +30,7 @@ my $dot_path = '/usr/bin';
 
 my  $doxy_path = '/usr/bin';
 
-my $doxy_version = '1.4.1';
+my $doxy_version = '1.4.6-4';
 
 &can_run($doxy_path.'/doxygen --version | grep '.$doxy_version.' >/dev/null') ||
   die "$0: doxygen path or version incorrect, please fix the script\n";
diff --git a/bin/generate_topinfo_charts.sh b/bin/generate_topinfo_charts.sh
index 5785ceeb049..09e2f0a1f51 100755
--- a/bin/generate_topinfo_charts.sh
+++ b/bin/generate_topinfo_charts.sh
@@ -8,7 +8,7 @@ gnuplot <<_EOF_ >/dev/null 2>&1
   set timefmt '%Y/%m/%d-%H:%M'
   set xlabel 'Date (MM/DD)'
   set ylabel 'Size (KBytes) $4'
-  set terminal png small color
+  set terminal png small size 800,600 color
   set output "$2"
   plot '$1' using 1:2 title '$3' w l
   exit
diff --git a/bin/make_release b/bin/make_release
index 183af2ed167..a0c73c050c7 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -578,8 +578,9 @@ sub update_version_files () {
         die "$0: unable to open ciao/Version.h\n";
 
       print CIAO_VERSION_H
-        "// \$Id\$\n" .
-        "// This is an automatically generated file.\n\n" .
+        "// -*- C++ -*-\n" .
+        "// \$Id\$\n\n" .
+        "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" .
         "\#define CIAO_MAJOR_VERSION ${major_version}\n" .
         "\#define CIAO_MINOR_VERSION ${minor_version}\n" .
         "\#define CIAO_BETA_VERSION ${beta_version}\n" .
@@ -605,8 +606,9 @@ sub update_version_files () {
         die "$0: unable to open tao/Version.h\n";
 
       print TAO_VERSION_H
-        "// \$Id\$\n" .
-        "// This is an automatically generated file.\n\n" .
+        "// -*- C++ -*-\n" .
+        "// \$Id\$\n\n" .
+        "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" .
         "\#define TAO_MAJOR_VERSION ${major_version}\n" .
         "\#define TAO_MINOR_VERSION ${minor_version}\n" .
         "\#define TAO_BETA_VERSION ${beta_version}\n" .
@@ -628,12 +630,14 @@ sub update_version_files () {
         die "$0: unable to open ace/Version.h\n";
 
       print ACE_VERSION_H
-        "// \$Id\$\n" .
-        "// This is an automatically generated file.\n\n" .
+        "// -*- C++ -*-\n" .
+        "// \$Id\$\n\n" .
+        "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" .
         "\#define ACE_MAJOR_VERSION ${major_version}\n" .
         "\#define ACE_MINOR_VERSION ${minor_version}\n" .
         "\#define ACE_BETA_VERSION ${beta_version}\n" .
-        "\#define ACE_VERSION \"${version}\"\n";
+        "\#define ACE_VERSION \"${version}\"\n\n";
+##	"\#include \"ace/Versioned_Namespace.h\"\n";
 
       close ACE_VERSION_H;
     }
@@ -771,10 +775,6 @@ sub diff () {
 ########
 sub generate_makefiles () {
 
-    # At this point, the only mwc/mpc files are in ace and tests. When more
-    # are available, this needs to be updated, maybe by cycling through
-    # all non-TAO directories looking for mwc (or mpc?) files.
-    #
     # 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
@@ -784,26 +784,40 @@ sub generate_makefiles () {
     my $here = Cwd::getcwd();
 
     print "My current wok in generate makefiles $here \n";
-    my $exclude_option = '-exclude TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc';
+    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/TAOACE.mwc ';
+        '-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+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\'';
+    my $ce_option = '-name_modifier *_WinCE -features "uses_wchar=1,wince=1" '.$tmp_ce;
+
     &ex ("cd ACE_wrappers; \
           bin/mwc.pl $exclude_option $mpc_option; \
           find ./ -name 'GNUmake*' | /usr/bin/xargs chmod 0644");
 
     &ex ("cd ACE_wrappers; \
+          bin/mwc.pl -type vc8 $mpc_option $exclude_option $vc8_option; \
+          bin/mwc.pl -type vc8 $mpc_option $exclude_option $ce_option; \
           bin/mwc.pl -type vc71 $mpc_option $exclude_option; \
-          bin/mwc.pl -type vc6  $mpc_option $exclude_option; \
           bin/mwc.pl -type borland  $mpc_option $exclude_option; \
-          bin/mwc.pl -type vc6 $static_option; \
           bin/mwc.pl -type vc71 $static_option; \
           find ./ -name '*.ds[p,w]' | /usr/bin/xargs chmod 0644;\
           find ./ -name '*.bor' | /usr/bin/xargs chmod 0644;\
diff --git a/bin/mpc.pl b/bin/mpc.pl
index 56dd7152891..1fa9409d274 100755
--- a/bin/mpc.pl
+++ b/bin/mpc.pl
@@ -13,16 +13,17 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 # ******************************************************************
 
 use strict;
-use Cwd;
 use Config;
+use FindBin;
+use File::Spec;
 use File::Basename;
 
-if ( $^O eq 'VMS' ) {
-  require VMS::Filespec;
-  import VMS::Filespec qw(unixpath);
+my($basePath) = $FindBin::Bin;
+if ($^O eq 'VMS') {
+  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+  $basePath = VMS::Filespec::unixify($basePath);
 }
-
-my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+$basePath .= '/MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -65,58 +66,6 @@ sub getBasePath {
   return $mpcpath;
 }
 
-
-sub which {
-  my($prog) = shift;
-  my($exec) = $prog;
-
-  if (defined $ENV{'PATH'}) {
-    my($part)   = '';
-    my($envSep) = $Config{'path_sep'};
-    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-      $part .= "/$prog";
-      if ( -x $part ) {
-        $exec = $part;
-        last;
-      }
-    }
-  }
-
-  return $exec;
-}
-
-
-sub getExecutePath {
-  my($prog) = shift;
-  my($loc)  = '';
-
-  if ($prog ne basename($prog)) {
-    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
-    if ($prog =~ /^[\/\\]/ ||
-        $prog =~ /^[A-Za-z]:[\/\\]?/) {
-      $loc = $dir;
-    }
-    else {
-      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
-    }
-  }
-  else {
-    $loc = dirname(which($prog));
-    if ($^O eq 'VMS') {
-      $loc = unixpath($loc);
-    }
-  }
-
-  $loc =~ s/\/\.$//;
-
-  if ($loc eq '.') {
-    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
-  }
-
-  return $loc;
-}
-
-
 # ************************************************************
 # Main Section
 # ************************************************************
@@ -128,9 +77,11 @@ my($driver) = new MPC();
 my($creators) = $driver->getCreatorList();
 unshift(@$creators, @creators);
 
-## Add the mpc path to the include paths
-unshift(@ARGV, '-include', "$mpcpath/config",
-               '-include', "$mpcpath/templates");
+## Add the mpc path to the include paths, but preserve
+## the original @ARGV as it is included in the output of
+## most of the workspace creators.
+my(@args) = ('-include', "$mpcpath/config",
+             '-include', "$mpcpath/templates", @ARGV);
 
 ## Execute the driver
-exit($driver->execute($basePath, basename($0), \@ARGV));
+exit($driver->execute($basePath, basename($0), \@args));
diff --git a/bin/msvc_cidlc.pl b/bin/msvc_cidlc.pl
index fd171aba381..3d7283b3385 100755
--- a/bin/msvc_cidlc.pl
+++ b/bin/msvc_cidlc.pl
@@ -97,6 +97,7 @@ sub Build_All ()
             return if $Status != 0 && !$Ignore_errors;
         }
     }
+    print STDERR "ERROR: No configurations have been build\n" if ($count == 0);
 }
 
 
diff --git a/bin/msvc_static_compile.pl b/bin/msvc_static_compile.pl
index 38531cb0563..1580302d28e 100755
--- a/bin/msvc_static_compile.pl
+++ b/bin/msvc_static_compile.pl
@@ -115,6 +115,24 @@ sub Find_Sln (@)
     return @array;
 }
 
+sub Rename_Files ($$)
+{
+  my ($target) = shift;
+  my ($newext) = shift;
+  my (@array)  = ();
+
+  sub wanted_file {
+    my ($text) = shift;
+    my ($next) = shift;
+    if ($File::Find::name =~ /^(.*)$text$/i) {
+      my ($newname) = $1 . $next;
+      rename ($File::Find::name, $newname);
+    }
+  }
+
+  find (sub { wanted_file ($target, $newext) }, $ACE_ROOT);
+}
+
 # Only builds the core libraries.
 sub Build_Core ()
 {
@@ -138,9 +156,9 @@ sub Build_Core ()
 
         foreach $test ($config_list->valid_entries ()) {
           if ($mod_name) {
-            @plist = split(/\//, $test);
+            @plist = split (/\//, $test);
             $fname = pop @plist;
-	    $fname_mod = $name_mod;
+            $fname_mod = $name_mod;
             $fname_mod =~ s/\*/$fname/;
 	    push @plist,($fname_mod);
             push (@core_list, join('/', @plist) . $proj_ext);
@@ -350,7 +368,36 @@ if ($#directories < 0) {
 
 print "msvc_static_compile: Begin\n";
 print STDERR "Beginning Core Build\n" if ($print_status == 1);
-Build_Core if (!$use_custom_dir || $build_core_only);
+if (!$use_custom_dir || $build_core_only) {
+  if ($vc7) {
+    ## devenv is too smart for it's own good.  When a .vcproj is specified,
+    ## as is done when building the CORE, it will find the solution to which
+    ## the .vcproj belongs and begin to build additional portions of the
+    ## solution.  This is not what we want as dependencies are not set up
+    ## between library projects.
+    my($sln) = '.sln';
+    my($core_sln) = $sln . '.build_core';
+
+    Rename_Files ($sln, $core_sln);
+
+    foreach my $sig ('INT', 'TERM') {
+      $SIG{$sig} = sub { print STDERR "Renaming solution files, please be patient...\n";
+                         Rename_Files ($core_sln, $sln);
+                         exit(1); };
+    }
+
+    Build_Core ();
+
+    Rename_Files ($core_sln, $sln);
+
+    foreach my $sig ('INT', 'TERM') {
+      $SIG{$sig} = 'DEFAULT';
+    }
+  }
+  else {
+    Build_Core ();
+  }
+}
 print STDERR "Beginning Full Build\n" if ($print_status == 1);
 if ( $vc7 ) {
     Build_All_VC7 if !$build_core_only;
diff --git a/bin/msvc_static_order.lst b/bin/msvc_static_order.lst
index 5d16dba9bf3..27aee364e50 100644
--- a/bin/msvc_static_order.lst
+++ b/bin/msvc_static_order.lst
@@ -33,16 +33,20 @@ TAO/tao/Utils
 TAO/tao/RTScheduler
 TAO/tao/IFR_Client
 TAO/tao/TypeCodeFactory
+TAO/tao/ImR_Client
 TAO/orbsvcs/orbsvcs/Svc_Utils
 TAO/orbsvcs/orbsvcs/CosNaming_IDL
 TAO/orbsvcs/orbsvcs/CosNaming
-TAO/orbsvcs/orbsvcs/CosNaming_Serv
 TAO/orbsvcs/orbsvcs/CosNaming_Skel
+TAO/orbsvcs/orbsvcs/CosNaming_Serv
+TAO/orbsvcs/orbsvcs/CosProperty_IDL
 TAO/orbsvcs/orbsvcs/CosProperty
+TAO/orbsvcs/orbsvcs/CosProperty_Skel
+TAO/orbsvcs/orbsvcs/CosProperty_Serv
 TAO/orbsvcs/orbsvcs/CosTrading_IDL
 TAO/orbsvcs/orbsvcs/CosTrading
-TAO/orbsvcs/orbsvcs/CosTrading_Serv
 TAO/orbsvcs/orbsvcs/CosTrading_Skel
+TAO/orbsvcs/orbsvcs/CosTrading_Serv
 TAO/orbsvcs/orbsvcs/HTIOP
 TAO/orbsvcs/orbsvcs/AV
 TAO/orbsvcs/orbsvcs/ETCL
@@ -52,11 +56,15 @@ TAO/orbsvcs/orbsvcs/RTEvent_Skel
 TAO/orbsvcs/orbsvcs/RTEvent_Serv
 TAO/orbsvcs/orbsvcs/RTSched
 TAO/orbsvcs/orbsvcs/RTSchedEvent
+TAO/orbsvcs/orbsvcs/CosEvent_IDL
 TAO/orbsvcs/orbsvcs/CosEvent
-TAO/orbsvcs/orbsvcs/CosEvent_Serv
 TAO/orbsvcs/orbsvcs/CosEvent_Skel
+TAO/orbsvcs/orbsvcs/CosEvent_Serv
 TAO/orbsvcs/orbsvcs/RTKokyuEvent
+TAO/orbsvcs/orbsvcs/CosConcurrency_IDL
 TAO/orbsvcs/orbsvcs/CosConcurrency
+TAO/orbsvcs/orbsvcs/CosConcurrency_Skel
+TAO/orbsvcs/orbsvcs/CosConcurrency_Serv
 TAO/orbsvcs/orbsvcs/CosLifeCycle
 TAO/orbsvcs/orbsvcs/CosTime
 TAO/orbsvcs/orbsvcs/CosNotification_IDL
@@ -86,6 +94,10 @@ TAO/orbsvcs/orbsvcs/CosLoadBalancing
 TAO/orbsvcs/orbsvcs/IFRService
 TAO/orbsvcs/orbsvcs/RTCORBAEvent
 TAO/orbsvcs/orbsvcs/RT_Notification
+TAO/orbsvcs/orbsvcs/RTEventLogAdmin_IDL
+TAO/orbsvcs/orbsvcs/RTEventLogAdmin
+TAO/orbsvcs/orbsvcs/RTEventLogAdmin_Skel
+TAO/orbsvcs/orbsvcs/RTEventLogAdmin_Serv
 TAO/orbsvcs/orbsvcs/Security
 TAO/orbsvcs/Naming_Service/Naming_Service
 TAO/orbsvcs/ImplRepo_Service/ImR_Activator_IDL
@@ -97,11 +109,13 @@ TAO/orbsvcs/ImplRepo_Service/ImR_Locator_Service
 TAO/orbsvcs/ImplRepo_Service/tao_imr
 TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib
 TAO/orbsvcs/orbsvcs/FTRT_ClientORB
+TAO/orbsvcs/tests/Concurrency/CC_client
 TAO/orbsvcs/tests/Event/lib/Event_Test_Lib
 TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib
 TAO/orbsvcs/tests/Trading/Trading_Test_Lib
 TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib
 TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf
+TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib
 TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib
 TAO/tests/Collocation/Collocation_Test_Stub
 TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib
@@ -110,6 +124,7 @@ TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib
 TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common
 tests/Test_Output
 tests/DLL_Test_Parent
+TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib
 performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib
 examples/Service_Configurator/Misc/Service_Configurator_Misc_Timer
 examples/Timer_Queue/Timer_Queue_Library
diff --git a/bin/mwc.pl b/bin/mwc.pl
index 688d278b513..13dd157f7ef 100755
--- a/bin/mwc.pl
+++ b/bin/mwc.pl
@@ -13,16 +13,17 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 # ******************************************************************
 
 use strict;
-use Cwd;
 use Config;
+use FindBin;
+use File::Spec;
 use File::Basename;
 
-if ( $^O eq 'VMS' ) {
-  require VMS::Filespec;
-  import VMS::Filespec qw(unixpath);
+my($basePath) = $FindBin::Bin;
+if ($^O eq 'VMS') {
+  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+  $basePath = VMS::Filespec::unixify($basePath);
 }
-
-my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
+$basePath .= '/MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -65,58 +66,6 @@ sub getBasePath {
   return $mpcpath;
 }
 
-
-sub which {
-  my($prog) = shift;
-  my($exec) = $prog;
-
-  if (defined $ENV{'PATH'}) {
-    my($part)   = '';
-    my($envSep) = $Config{'path_sep'};
-    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-      $part .= "/$prog";
-      if ( -x $part ) {
-        $exec = $part;
-        last;
-      }
-    }
-  }
-
-  return $exec;
-}
-
-
-sub getExecutePath {
-  my($prog) = shift;
-  my($loc)  = '';
-
-  if ($prog ne basename($prog)) {
-    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
-    if ($prog =~ /^[\/\\]/ ||
-        $prog =~ /^[A-Za-z]:[\/\\]?/) {
-      $loc = $dir;
-    }
-    else {
-      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
-    }
-  }
-  else {
-    $loc = dirname(which($prog));
-    if ($^O eq 'VMS') {
-      $loc = unixpath($loc);
-    }
-  }
-
-  $loc =~ s/\/\.$//;
-
-  if ($loc eq '.') {
-    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
-  }
-
-  return $loc;
-}
-
-
 # ************************************************************
 # Main Section
 # ************************************************************
@@ -128,9 +77,11 @@ my($driver) = new MWC();
 my($creators) = $driver->getCreatorList();
 unshift(@$creators, @creators);
 
-## Add the mpc path to the include paths
-unshift(@ARGV, '-include', "$mpcpath/config",
-               '-include', "$mpcpath/templates");
+## Add the mpc path to the include paths, but preserve
+## the original @ARGV as it is included in the output of
+## most of the workspace creators.
+my(@args) = ('-include', "$mpcpath/config",
+             '-include', "$mpcpath/templates", @ARGV);
 
 ## Execute the driver
-exit($driver->execute($basePath, basename($0), \@ARGV));
+exit($driver->execute($basePath, basename($0), \@args));
diff --git a/bin/performance_stats.sh b/bin/performance_stats.sh
index 6625ce7277e..85143de5d71 100755
--- a/bin/performance_stats.sh
+++ b/bin/performance_stats.sh
@@ -42,9 +42,9 @@ sleep 10
 )
 if grep -q 'Total throughput: ' Default.log; then
   (
-    echo -n $DATE " "; 
+    echo -n $DATE " ";
     awk '/^Total throughput:/ {print $3}' Default.log
-  ) >> Default.txt 
+  ) >> Default.txt
 fi
 
 /bin/sync
@@ -57,9 +57,9 @@ sleep 2
        ./default_configuration.pl -t $i > $DEST/source/Sequence_Default_${i}.log 2>&1
        if grep -q 'Total throughput: ' $DEST/source/Sequence_Default_${i}.log; then
          (
-           echo -n $DATE " "; 
+           echo -n $DATE " ";
            awk '/^Total throughput:/ {print $3}' $DEST/source/Sequence_Default_${i}.log
-         ) >> $DEST/source/Sequence_Default_${i}.txt 
+         ) >> $DEST/source/Sequence_Default_${i}.txt
        fi
      )
    done
@@ -75,9 +75,9 @@ for i in $COMMON_TESTS; do
   )
   if grep -q 'Total throughput: ' ${i}.log; then
     (
-       echo -n $DATE " "; 
+       echo -n $DATE " ";
        awk '/^Total throughput:/ {print $3}' $DEST/source/${i}.log
-    ) >> ${i}.txt 
+    ) >> ${i}.txt
   fi
 done
 
@@ -89,12 +89,12 @@ for i in $SEQUENCE_TESTS; do
      for j in $SEQ_TEST_TYPE; do
          (
              ./run_test.pl -t $j > $DEST/source/Sequence_${i}_${j}.log 2>&1
-             
+
              if grep -q 'Total throughput: ' $DEST/source/Sequence_${i}_${j}.log; then
                  (
-                     echo -n $DATE " "; 
+                     echo -n $DATE " ";
                      awk '/^Total throughput:/ {print $3}' $DEST/source/Sequence_${i}_${j}.log
-                 ) >> $DEST/source/Sequence_${i}_${j}.txt 
+                 ) >> $DEST/source/Sequence_${i}_${j}.txt
              fi
          )
      done
@@ -131,9 +131,10 @@ gnuplot <<_EOF_ >/dev/null 2>&1
     set xlabel 'Date (YYYYMMDD)'
     set ylabel 'Throughput (Requests/Second)'
     set yrange [0:]
-    set terminal png small color
+    set terminal png small size 800,600 color
     set output "/dev/null"
-    plot 'DII.txt' using 1:2 title 'DII' w l
+    plot 'AMI.txt' using 1:2 title 'AMI' w l
+    replot 'DII.txt' using 1:2 title 'DII' w l
     replot 'DSI.txt' using 1:2 title 'DSI' w l
     replot 'Deferred.txt' using 1:2 title 'Deferred' w l
     replot 'Single_Threaded.txt' using 1:2 title 'Single_Threaded' w l
@@ -153,9 +154,10 @@ gnuplot <<_EOF_ >/dev/null 2>&1
     set xlabel 'Date (YYYYMMDD)'
     set ylabel 'Throughput (Requests/Second)'
     set yrange [0:35000]
-    set terminal png small color
+    set terminal png small size 800,600 color
     set output "/dev/null"
-    plot 'DII.txt' using 1:2 title 'DII' w l
+    plot 'AMI.txt' using 1:2 title 'AMI' w l
+    replot 'DII.txt' using 1:2 title 'DII' w l
     replot 'DSI.txt' using 1:2 title 'DSI' w l
     replot 'Deferred.txt' using 1:2 title 'Deferred' w l
     replot 'Single_Threaded.txt' using 1:2 title 'Single_Threaded' w l
@@ -186,9 +188,12 @@ fi
 cd $DEST/data
 /bin/uname -a > uname.txt
 /usr/bin/gcc -v > gcc.txt 2>&1
+/usr/bin/gcc -dumpversion > gccversion.txt 2>&1
 /lib/libc.so.6 | sed -e 's/</\&lt;/g' -e 's/>/\&gt;/g' > libc.txt
 cat /proc/cpuinfo > cpuinfo.txt
 cat /proc/meminfo > meminfo.txt
+cat /etc/SuSE-release > linuxversion.txt
 
 cat $ACE_ROOT/ace/config.h > config.h.txt
 cat $ACE_ROOT/include/makeinclude/platform_macros.GNU > platform_macros.GNU.txt
+cp $ACE_ROOT/html/Stats/* $DEST
diff --git a/bin/perltest2cpp.pl b/bin/perltest2cpp.pl
deleted file mode 100755
index 1533f945618..00000000000
--- a/bin/perltest2cpp.pl
+++ /dev/null
@@ -1,2251 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# ******************************************************************
-#      Author: Chad Elliott (elliott_c@ociweb.com)
-#        Date: 4/4/2001
-#         $Id$
-# Description: Generate run_test.cpp from run_test.pl for VxWorks
-# ******************************************************************
-
-# ******************************************************************
-# Pragma Section
-# ******************************************************************
-
-use strict;
-use FileHandle;
-use File::Basename;
-
-# ******************************************************************
-# Data Section
-# ******************************************************************
-
-my($firstExecutable) = 1;
-my($needMain)        = 0;
-my($indent)          = 0;
-my($pindent)         = 0;
-my($taodebug)        = undef;
-my(@cppheader)       = ();
-my(@cppsubs)         = ();
-my(@cppbody)         = ();
-my(@subs)            = ();
-my($timefactor)      = 2;
-my($insub)           = 0;
-my($indsc)           = 0;
-my(%argsList)        = ();
-my($shortString)     = 256;
-my($unknownArgCount) = 20;
-my($defaultTimeout)  = 60;
-my($status)          = 0;
-my($lineCount)       = 0;
-my($needReadLine)    = 1;
-my($needReadFile)    = 1;
-my(%timeoutVars)     = ();
-
-my($UNDEFINED_VARIABLE)    = 1;
-my($UNKNOWN_VARIABLE_TYPE) = 2;
-my($UNSUPPORTED_CONSTRUCT) = 3;
-
-# ******************************************************************
-# Subroutine Section
-# ******************************************************************
-
-sub generateError {
-  my($error) = shift;
-  my($extra) = shift;
-  if ($error == $UNDEFINED_VARIABLE) {
-    print STDERR "Error: Undefined variable ($extra) at line $lineCount\n";
-    $status++;
-  }
-  elsif ($error == $UNKNOWN_VARIABLE_TYPE) {
-    print STDERR "Error: Unknown variable type " .
-                 "for ($extra) at line $lineCount\n";
-    $status++;
-  }
-  elsif ($error == $UNSUPPORTED_CONSTRUCT) {
-    print STDERR "Error: Unsupported construct ($extra) at line $lineCount\n";
-    $status++;
-  }
-}
-
-
-sub getIndent {
-  if ($pindent != $indent) {
-    my($str) = " " x ($pindent * 2);
-    $pindent = $indent;
-    return $str;
-  }
-  return " " x ($indent * 2);
-}
-
-
-sub concatenate {
-  my($value)    = shift;
-  my($length)   = length($value);
-  my($indouble) = 0;
-  my($insingle) = 0;
-
-  for(my $i = 0; $i < $length; $i++) {
-    my($ch) = substr($value, $i, 1);
-    if (!$insingle && $ch eq '"') {
-      $indouble ^= 1;
-    }
-    elsif (!$indouble && $ch eq '\'') {
-      $insingle ^= 1;
-    }
-    elsif ($ch eq '.' && !$indouble && !$insingle) {
-      my($rc) = undef;
-      my($lc) = $i;
-      for($i++; $i < $length; $i++) {
-        my($a) = substr($value, $i, 1);
-        if ($a !~ /\s/) {
-          if ($a eq '\'' || $a eq '"') {
-            $rc = $i + 1;
-          }
-          elsif ($a eq '$') {
-            $rc = $i;
-          }
-          last;
-        }
-      }
-      for($lc--; $lc >= 0; $lc--) {
-        my($a) = substr($value, $lc, 1);
-        if ($a !~ /\s/) {
-          if ($a ne '\'' && $a ne '"') {
-            $lc++;
-          }
-          last;
-        }
-      }
-      if (defined $rc) {
-        my($rold) = substr($value, $rc - 1, 1);
-        my($lold) = substr($value, $lc, 1);
-
-        substr($value, $lc, $rc - $lc) = "";
-        $length = length($value);
-        my($front) = substr($value, 0, $lc);
-        my($back)  = substr($value, $lc);
-        if ($lold eq '"') {
-          if ($rold eq '"') {
-            $indouble ^= 1;
-          }
-          else {
-            if ($back !~ /\"/) {
-              $indouble = 1;
-            }
-          }
-        }
-        elsif ($lold =~ /\s/ && $rold eq '"' && $front =~ /\"/) {
-          $indouble ^= 1;
-        }
-        elsif ($lold eq '\'') {
-          if ($rold eq '\'') {
-            $insingle ^= 1;
-          }
-          else {
-            if ($back !~ /\'/) {
-              $insingle = 1;
-            }
-          }
-        }
-        elsif ($lold =~ /\s/ && $rold eq '\'' && $front =~ /\'/) {
-          $insingle ^= 1;
-        }
-
-        if ($back =~ /^([\$\@][^\s;]+)/) {
-          my($target) = $1;
-          if ($indouble) {
-            $back =~ s/[\$\@][^\s;]+/$target\"/;
-          }
-          elsif ($insingle) {
-            $back =~ s/[\$\@][^\s;]+/$target\'/;
-          }
-          $value = $front . $back;
-          $length++;
-        }
-
-        $i = $lc - 1;
-#########################################################
-# Fix for $debug = $debug . " -d";
-#########################################################
-        if (!$indouble && !$insingle &&
-            substr($value, 0, $i) !~ /$rold/) {
-          for(my $j = $i; $j >= 0; $j--) {
-            my($ich) = substr($value, $j, 1);
-            if ($ich eq '$') {
-              substr($value, $j, 1) = "$rold\$";
-              $i++;
-              if ($rold eq '"') {
-                $indouble ^= 1;
-              }
-              else {
-                $insingle ^= 1;
-              }
-              last;
-            }
-          }
-        }
-#########################################################
-      }
-    }
-  }
-
-  if ($indouble || $insingle) {
-    print "DEBUG1: $value\n" .
-          "        indouble = $indouble insingle = $insingle\n\n";
-  }
-
-  return $value;
-}
-
-
-sub typeToCPPType {
-  my($str) = shift;
-  if ($str eq "%d") {
-    return "int";
-  }
-  if ($str eq "%f") {
-    return "float";
-  }
-  if ($str eq "%s") {
-    return "char";
-  }
-  return "void";
-}
-
-my(@mainList) = ();
-sub getMainList {
-  if (!defined $mainList[0]) {
-    my($fh) = new FileHandle();
-    if (open($fh, "GNUmakefile")) {
-      my($line) = "";
-      while(<$fh>) {
-        $line .= $_;
-        if ($line =~ /\\\s*$/) {
-          $line =~ s/\\\s*$//;
-        }
-        else {
-          if ($line =~ /BIN(_UNCHECKED|2)?\s*[\+]?=/ &&
-              $line !~ /\$\(/ && $line !~ /run_test/) {
-            if ($line =~ /\s*=\s*(.*)/) {
-              my($bins) = $1;
-              if ($bins =~ /patsubst/) {
-                ## TBD: Fix for pattern substitution
-              }
-              else {
-                foreach my $main (split(/\s+/, $bins)) {
-                  $main =~ s/\-/_/g;
-                  push(@mainList, $main . "_main");
-                }
-              }
-            }
-          }
-          $line = "";
-        }
-      }
-      close($fh);
-    }
-  }
-  return @mainList;
-}
-
-
-my(%declared) = ("!" => "%s");
-my(%decscope) = ("!" => -1);
-sub addParameterToCurrentSub {
-  my($var)  = shift;
-  my($type) = shift;
-  if (!defined $type) {
-    $type = "char*";
-  }
-
-  for(my $i = $#cppsubs; $i >= 0; $i--) {
-    if ($cppsubs[$i] =~ /\/\*params\*\//) {
-      if ($cppsubs[$i] =~ /\(\/\*params/) {
-        $cppsubs[$i] =~ s/\/\*params/$type $var \/\*params/;
-      }
-      else {
-        $cppsubs[$i] =~ s/\/\*params/, $type $var \/\*params/;
-      }
-      $declared{$var} = "%s";
-      $decscope{$var} = $indent;
-      last;
-    }
-  }
-}
-
-
-sub getTop {
-  my($os) = "OSNAME";
-  my($top) = "// \$Id\$\n\n" .
-             "#include <ace/OS.h>\n" .
-             "#include <ace/Get_Opt.h>\n" .
-             "#include <tao/debug.h>\n" .
-             "#include <tests/TestUtils/TestCombinedThreads.h>\n\n" .
-             "static const char* $os = \"VxWorks\";\n\n";
-
-  $declared{$os} = "%s";
-  $decscope{$os} = -1;
-
-  foreach my $main (getMainList()) {
-    $top .= "TEST_MAIN_FUNC_DECLARE($main);\n";
-  }
-  $top .= "\n" .
-          "static int\nunlocated_main(int, char**)\n" .
-          "{\n" .
-          "  ACE_OS::printf(\"Translation of this module did \"\n" .
-          "                 \"not work.  Please check the code.\\n\");\n" .
-          "  return 0;\n" .
-          "}\n\n\n" .
-
-          "TEST_MAIN_TYPE_FUNC\n" .
-          "translateStringToMainFunction(const char* string)\n" .
-          "{\n" .
-          "  ACE_UNUSED_ARG(string);\n";
-  foreach my $main (getMainList()) {
-    my($stripped) = $main;
-    $stripped =~ s/_main//;
-    $top .= "  if (ACE_OS_String::strcmp(string, \"$stripped\") == 0) {\n" .
-            "    return $main;\n" .
-            "  }\n";
-  }
-  $top .= "  return unlocated_main;\n" .
-          "}\n\n";
-
-  return $top;
-}
-
-
-sub incrementIndent {
-  $pindent = $indent;
-  $indent++;
-}
-
-
-sub decrementIndent {
-  $indent--;
-  foreach my $key (keys %decscope) {
-    if ($decscope{$key} > $indent) {
-      delete $declared{$key};
-      delete $decscope{$key};
-    }
-  }
-  $pindent = $indent;
-}
-
-sub getMainBeginning {
-  return "\n\nint main(int argc, char* argv[])\n" .
-         "{\n" .
-         "  // Silence the compiler\n" .
-         "  ACE_UNUSED_ARG(argc);\n" .
-         "  ACE_UNUSED_ARG(argv);\n" .
-         "  ACE_UNUSED_ARG(OSNAME);\n" .
-         "  translateStringToMainFunction(\"\");\n\n";
-}
-
-
-sub getMainEnding {
-  my($ending) = "  return 0;\n}\n\n";
-  decrementIndent();
-  return $ending;
-}
-
-
-my($currentBuild) = "";
-sub buildLine {
-  my($line)     = shift;
-  my($length)   = length($line);
-  my($previous) = "";
-  my($insideDouble) = 0;
-  my($insideSingle) = 0;
-  my($copy)         = "";
-
-  $currentBuild .= $line;
-  for(my $i = 0; $i < $length; $i++) {
-    my($ch) = substr($line, $i, 1);
-    if ($previous ne '\\') {
-      if (!$insideSingle && $ch eq '"') {
-        $insideDouble ^= 1;
-      }
-      elsif (!$insideDouble && $ch eq '\'') {
-        $insideSingle ^= 1;
-      }
-    }
-
-    if (($ch eq ';' || $ch eq '{' || $ch eq '}') &&
-        (!$insideDouble && !$insideSingle)) {
-      $copy = $currentBuild;
-      $currentBuild = "";
-      last;
-    }
-    $previous = $ch;
-  }
-
-  return $copy;
-}
-
-
-sub stringToArray {
-  my($str)      = shift;
-  my(@array)    = ();
-  my($length)   = length($str);
-  my($previous) = 0;
-  for(my $i = 0; $i < $length; $i++) {
-    my($ch) = substr($str, $i, 1);
-    if ($ch =~ /\s/) {
-      push(@array, substr($str, $previous, $i - $previous));
-      $previous = $i;
-      while(substr($str, $i, 1) =~ /\s/) {
-        $i++;
-      }
-      push(@array, substr($str, $previous, $i - $previous));
-      $previous = $i;
-    }
-  }
-  push(@array, substr($str, $previous));
-  return @array;
-}
-
-
-sub lineNeedsToSplit {
-  my($line) = shift;
-  if ($line =~ /ACE_OS/) {
-    if ($line =~ /(ACE_OS.*\((\w+),\s*)(.*)(\);)/ &&
-        $line !~ /argv\[[^\]]+\]/) {
-      return $1, $2, $3, $4;
-    }
-  }
-  elsif ($line =~ /(.*\s+(\w+)\[.*\]\s+=\s+)(.*)(;)$/) {
-    return $1, $2, $3, $4;
-  }
-  return undef;
-}
-
-
-my($genstr) = 0;
-sub splitProcessArguments {
-  my($av)     = shift;
-  my($line)   = shift;
-  my($assign) = shift;
-  my($argcount) = 0;
-  my(@array) = stringToArray($av);
-  my($stillString) = 0;
-  my($needACE) = 1;
-  my($needClosing) = 0;
-  my($stored) = "";
-
-  for(my $a = 0; $a <= $#array; $a++) {
-    $array[$a] =~ s/^[\"\']//;
-    $array[$a] =~ s/[\"\']$//;
-    if ($array[$a] =~ /\"\s*$/ || $array[$a] eq "") {
-    }
-    else {
-      my($needQuotes) = 1;
-      $argcount++;
-      if ($array[$a] =~ /\$/) {
-        $needQuotes = 0;
-        if ($array[$a] !~ /^\$/) {
-          ## Part string, part variable
-          my($foo) = $array[$a];
-          $foo =~ /([^\$]+)(\$\w+)/;
-          my($p1) = $1;
-          my($source) = $2;
-          $p1 =~ s/^\"//;
-          $stillString = 1;
-          splice(@array, $a + 1, 1, $source);
-          $array[$a] = $p1;
-        }
-        else {
-          $stillString = 0;
-          $needACE = 1;
-        }
-      }
-      else {
-        $stillString = 1;
-      }
-      $array[$a] =~ s/[\$\"\']//g;
-      if ($needACE) {
-        if ($needClosing) {
-          if ($stored ne "") {
-            $$line .= $stored;
-            $stored = "";
-          }
-          $$line .= "\");\n" . (" " x (2 * $indent));
-        }
-        setNeedMain();
-        $stored = "ACE_OS_String::strcat($assign, ";
-        if ($needQuotes) {
-          $stored .= "\"";
-        }
-        $needACE = 0;
-        $needClosing = 0;
-      }
-      if ($stored ne "") {
-        if (defined $declared{$array[$a]} &&
-            $declared{$array[$a]} ne "%s") {
-          my($newstr) = "char genstr$genstr" . "[64] = \"\";\n" .
-                        getIndent() .
-                        "ACE_OS::sprintf(genstr$genstr, \"%d\", " .
-                        "$array[$a]);\n";
-          $stored = "$newstr$stored";
-          $array[$a] = "genstr$genstr";
-          $genstr++;
-        }
-        $$line .= $stored;
-        $stored = "";
-      }
-      if ($stillString) {
-        $$line .= "$array[$a]";
-        $needClosing = 1;
-      }
-      else {
-        $$line .= "$array[$a]);\n" . (" " x (2 * $indent));
-        if ($a != $#array) {
-          setNeedMain();
-          $stored = "ACE_OS_String::strcat($assign, \"";
-          $stillString = 1;
-          $needACE = 0;
-          $needClosing = 1;
-        }
-        else {
-          $needClosing = 0;
-        }
-      }
-    }
-  }
-  if ($needClosing) {
-    if ($stored ne "") {
-      $$line .= $stored;
-      $stored = "";
-    }
-    $$line .= "\");\n";
-  }
-  return $argcount;
-}
-
-
-my($gencount) = 0;
-sub splitArguments {
-  my($av)       = shift;
-  my($line)     = shift;
-  my($sep)      = shift;
-  my($argcount) = 0;
-  my(@array)    = ();
-  if (defined $sep) {
-    @array = split($sep, $av);
-    for(my $i = 0; $i <= $#array; $i++) {
-      $array[$i] =~ s/^\s+//;
-      $array[$i] =~ s/\s+$//;
-      if ($array[$i] eq "") {
-        splice(@array, $i, 1);
-      }
-    }
-  }
-  else {
-    @array = split(/\s+/, $av);
-  }
-  for(my $a = 0; $a <= $#array; $a++) {
-    if ($array[$a] =~ /-ORBDebugLevel/i) {
-      $a++;
-      $array[$a] =~ s/[\$\"\']//g;
-      if (defined $declared{$array[$a]} &&
-          $declared{$array[$a]} eq "%d") {
-        $taodebug = $array[$a];
-      }
-      elsif ($array[$a] =~ /^[-+]?\d+$/) {
-        $taodebug = $array[$a];
-      }
-      else {
-        $taodebug = "ACE_OS::atoi(\"$array[$a]\")";
-      }
-    }
-    elsif ($array[$a] eq '"') {
-    }
-    else {
-      my($needQuotes) = 1;
-      $argcount++;
-      if ($array[$a] =~ /\$/) {
-        $needQuotes = 0;
-        if ($array[$a] !~ /^\$/) {
-          ## Part string, part variable
-          my($foo) = $array[$a];
-          $foo =~ /([^\$]+)\$(\w+)/;
-          my($p1) = $1;
-          my($source) = $2;
-          $p1 =~ s/^\"//;
-          my($old) = $$line;
-          my($str) = "gen_partial$gencount";
-          $$line = "char $str" . "[BUFSIZ] = \"$p1\";\n" .
-                   (" " x (2 * $indent));
-          if (defined $declared{$source} && $declared{$source} eq "%s") {
-            setNeedMain();
-            $$line .= "ACE_OS_String::strcat($str";
-          }
-          elsif (defined $declared{$source} && $declared{$source} eq "%d") {
-            setNeedMain();
-            $$line .= "char gen_partial" . ($gencount + 1) .
-                      "[$shortString] = \"\";\n" .
-                      (" " x (2 * $indent)) .
-                      "ACE_OS::sprintf(gen_partial" . ($gencount + 1) .
-                      ", \"%d\", $source);\n" . (" " x (2 * $indent)) .
-                      "ACE_OS_String::strcat($str";
-            $gencount++;
-            $source = "gen_partial$gencount";
-          }
-          else {
-            $$line .= "// *** Unknown source type for: ";
-            generateError($UNKNOWN_VARIABLE_TYPE, $source);
-          }
-          $$line .= ", $source);\n" . (" " x (2 * $indent)) . $old;
-          $array[$a] = $str;
-          $gencount++;
-        }
-      }
-      $array[$a] =~ s/[\$\"\']//g;
-      if ($needQuotes) {
-        $array[$a] = "\"$array[$a]\"";
-      }
-      $$line .= "$array[$a], ";
-    }
-  }
-  return $argcount;
-}
-
-sub handleAssignment {
-  my($line)   = shift;
-  my($concat) = (/\$(\w+)\s*\.=\s*(.*);/);
-
-  if ($line =~ /\$(\w+)\s*[\.]?=\s*(.*);/) {
-    ## Regular assignment
-    my($var) = $1;
-    my($val) = $2;
-
-    if ($val =~ /time/) {
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%d";
-        $decscope{$var} = $indent;
-        $line = "time_t ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = time(NULL);";
-    }
-    elsif ($val =~ /^new\s+([\w:]+)\s*\((.*)\)/) {
-      my($params) = $2;
-      if ($1 eq "PerlACE::Process") {
-        if (!defined $declared{$var}) {
-          $declared{$var} = 0;
-        }
-        else {
-          $declared{$var}++;
-        }
-        if ($params =~ /.*\s*(,\s*.*)?/) {
-          my($mv) = undef;
-          my($av) = "";
-          if ($params =~ /(.*)\s*,\s*([\"\$].*)/) {
-            $mv = $1;
-            $av = $2;
-          }
-          elsif ($params =~ /(.*)/) {
-            $mv = $1;
-          }
-#if ($av eq "") {
-#  print "DEBUG4: '$mv' '$av'\n";
-#}
-          my($argcount) = 1;
-          my($argvar) = $var;
-          if ($declared{$argvar} != 0) {
-            $argvar .= $declared{$argvar};
-          }
-          $line = "char* $argvar" . "Args[] = { ";
-          if ($mv =~ /\$(\w+)/) {
-            $mv = $1;
-          }
-          $line .= "$mv, ";
-          my($arguments) = "";
-          splitArguments($av, \$arguments);
-          ## Determine if the result of splitArguments
-          ## should be added to $argcount
-          $argsList{$var} = $argcount;
-
-          ## Is there a splitable variable in the argument list?
-          my($resplit) = 1;
-          if ($arguments =~ /^\w+,\s*$/ || $arguments =~ /,\s*\w+\s*,/) {
-            my(@arr) = split(/\n/, $arguments);
-            foreach my $test (split(",", $arr[$#arr])) {
-              $test =~ s/^\s+//;
-              $test =~ s/\s+$//;
-              if (defined $declared{$test} && $declared{$test} eq "%s" &&
-                  $test !~ /ior/ && $test !~ /conf/ && $test !~ /gen_/) {
-                $resplit = 0;
-                last;
-              }
-            }
-            if (!$resplit) {
-              $line =~ s/\[\]/\[$unknownArgCount\]/;
-              $line .= "0 };\n";
-              for(my $l = 0; $l < $#arr; $l++) {
-                if ($l == 0) {
-                  $line .= (" " x (2 * $indent));
-                }
-                $line .= "$arr[$l]\n";
-              }
-              $arguments = $arr[$#arr];
-              $arguments =~ s/^(\w)/\$$1/;
-              $arguments =~ s/,\s*(\w)/, \$$1/g;
-              $line .= (" " x (2 * $indent)) .
-                       handleArguments($line, $var, $arguments, ",");
-            }
-          }
-          if ($resplit) {
-            splitArguments($av, \$line);
-            $line .= "0 };\n";
-          }
-
-          $line .= (" " x (2 * $indent)) .
-                   ($declared{$var} > 0 ? "$var = TAO_TestCombinedThreads" :
-                                          "TAO_TestCombinedThreads $var") .
-                   "(" .
-                   ($mv =~ /\"(.*)\"/ ? $mv = "$1" ."_main" :
-                                        "translateStringToMainFunction($mv)") .
-                   ", $argvar" . "Args);";
-        }
-        if (!$insub && $line =~ /ACE_OS/) {
-          setNeedMain();
-        }
-      }
-    }
-    elsif ($val =~ /->/) {
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%d";
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = ";
-      if ($val =~ /Spawn/) {
-        my($wait) = "";
-        if ($val =~ /\((.*)\)/) {
-          my($tout) = $1;
-          if ($tout =~ /^\d+$/ && $tout > $defaultTimeout) {
-            $defaultTimeout = $tout;
-          }
-          $wait = "($tout * $timefactor)";
-        }
-        my($spvar, $spval) = handleSpawn($val);
-        $line = "$spvar$spval\n" . (" " x (2 * $indent)) .
-                $line . "$spvar.wait($wait);";
-      }
-      elsif ($val =~ /[\$]?([\w\[\]\$]+)->WaitKill/) {
-        my($var)  = $1;
-        my($ovar) = $var;
-        my($op)   = ".";
-        my($tfix) = $var;
-        $var =~ s/\$//g;
-        $tfix =~ s/\[.*//;
-        if ($var =~ /\[/) {
-          $ovar =~ s/[\[\]\$]//g;
-          $op = "->";
-        }
-#        elsif ($declared{$tfix} != 0) {
-#          $var .= $declared{$tfix};
-#        }
-        handleWaitKill($val, $ovar);
-        $line .= "$var$op" . "wait($ovar" . "Timeout);";
-      }
-      elsif ($val =~ /WaitKill/) {
-        handleWaitKill($val);
-        $line .= "0;";
-      }
-    }
-    elsif ($val =~ /[\"\']([^\"\']+)?[\"\']/ || $val =~ /(\w+)\[([^\]]+)\]/) {
-      my($value) = "";
-      my($needQuotes) = 1;
-      if ($val =~ /[\"\'](.*)[\"\']/) {
-# Quoted double quotes don't work with this regexp 8/21/2001
-#      $val =~ /[\"\']([^\"\']+)[\"\']/) {
-        $value = $1;
-      }
-      elsif ($val =~ /(\w+)\[([^\]]+)\]/) {
-        $value = $1 . "[$2]";
-        $needQuotes = 0;
-      }
-
-      my($pre) = "";
-      my($post) = "";
-      my($edit) = $val;
-      $edit =~ s/\\\"//g;
-      $edit =~ s/\\\'//g;
-      my($fch) = substr($edit, 0, 1);
-
-      if (($fch eq '"' || $fch eq '\'') && $edit =~ /$fch$/) {
-      }
-      elsif ($edit =~ /(\w+)\s+[\"\'][^\"\']+[\"\']/) {
-        $pre = "$1 ";
-      }
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%s";
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-        if ($pre ne "") {
-          $post = "[BUFSIZ]";
-        }
-        else {
-          $post = "[$shortString]";
-        }
-        $line .= "$var$post = ";
-        if ($needQuotes) {
-          $line .= "$pre\"$value\";";
-        }
-        else {
-          if (defined $declared{$value} && $declared{$value} ne "%s") {
-            $line .= "\"\"; ACE_OS::sprintf($var, \"$declared{$value}\", $value);";
-          }
-          else {
-            $line .= "\"\"; ACE_OS_String::strcpy($var, $value);";
-          }
-        }
-      }
-      else {
-        if (defined $declared{$var} && $declared{$var} eq "%d") {
-          $line = "$var = ACE_OS::atoi($pre";
-        }
-        elsif (defined $declared{$var} && $declared{$var} eq "%f") {
-          $line = "$var = ACE_OS::atof($pre";
-        }
-        else {
-          setNeedMain();
-          $line = "ACE_OS_String::str" . ($concat ? "cat" : "cpy") .
-                  "($var, $pre";
-        }
-        if ($needQuotes) {
-          $line .= "\"$value\");";
-        }
-        else {
-          $line .= "$value);";
-        }
-      }
-
-      if ($line =~ /[^\\]\$/) {
-        my($left, $var, $right, $end) = lineNeedsToSplit($line);
-        if (defined $left) {
-          my($newStr) = "";
-
-          setNeedMain();
-          splitProcessArguments($right, \$newStr, $var);
-          $line = ($left =~ /strcat/ ? "" :
-                            $left . "\"\"$end\n" . (" " x (2 * $indent))) .
-                  $newStr;
-        }
-        else {
-          $line =~ s/\$//g;
-        }
-      }
-    }
-    elsif ($val =~ /^[+\-\d]+$/) {
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%d";
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = $val;";
-    }
-    elsif ($val =~ /^[+\-\d\.]+$/) {
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%f";
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = $val;";
-    }
-    elsif ($val =~ /TAO_TestCombinedThreads.*[+\-\d]+/) {
-      if (!defined $declared{$var}) {
-        $declared{$var} = "%d";
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = $val;";
-    }
-    elsif ($val =~ /shift/) {
-      $line = "// Parameters converted from: $var = $val;";
-      if ($insub) {
-        addParameterToCurrentSub($var);
-      }
-    }
-    elsif ($val =~ /[+\-\d\s\w]+/) {  ## Come up with a better regexp
-                                      ## for var to var assignment
-      ## Strip of \* from FILE handles
-      $val =~ s/\\\*//g;
-
-      $val =~ s/\$//g;
-      my($type) = "%d";
-      my($vtype) = $declared{$val};
-
-      if (!defined $vtype) {
-        $vtype = $type;
-      }
-
-      if (!defined $declared{$var}) {
-        $declared{$var} = $vtype;
-        $decscope{$var} = ($firstExecutable ? -1 : $indent);
-        $line = ($firstExecutable && !$insub ? "static " : "") .
-                typeToCPPType($declared{$var}) . " ";
-      }
-      else {
-        $line = "";
-      }
-
-      if (defined $vtype && $type ne $vtype) {
-        if ($type eq "%d") {
-          $line .= "$var = ";
-          if ($vtype eq "%s") {
-            $line .= "ACE_OS::atoi(";
-          }
-          elsif ($vtype eq "%f") {
-            $line .= "int(";
-          }
-          else {
-            $line .= "(";
-          }
-        }
-        elsif ($type eq "%s") {
-          $line .= "ACE_OS::sprintf($var, \"$vtype\", ";
-        }
-        elsif ($type eq "%f") {
-          $line .= "$var = ";
-          if ($vtype eq "%s") {
-            $line .= "ACE_OS::atof(";
-          }
-          elsif ($vtype eq "%d") {
-            $line .= "float(";
-          }
-          else {
-            $line .= "(";
-          }
-        }
-        else {
-          $line .= "$var = (";
-        }
-      }
-      else {
-        $line .= "$var = ";
-      }
-      $line .= $val;
-      if (defined $vtype && $type ne $vtype) {
-        $line .= ")";
-      }
-      $line .= ";";
-    }
-    else {
-      if (!$declared{$var}) {
-        $declared{$var} = "%x";
-        $decscope{$var} = $indent;
-        $line = "// Assignment:  ";
-      }
-      else {
-        $line = "";
-      }
-      $line .= "$var = $val;";
-    }
-  }
-  elsif ($line =~ /\@(\w+)\s*=\s*(.*);/) {
-    my($var) = $1;
-    my($val) = $2;
-    my($arrtype) = "char*";
-    my($count) = 0;
-
-    $val =~ s/^\(//;
-    $val =~ s/\)$//;
-
-    ## This is horrible code - CAE
-    ## By convention only, the processes are called SV and CL.
-    if ($var =~ /^[A-Z]+$/) {
-      $arrtype = "TAO_TestCombinedThreads*";
-    }
-
-    if (!$declared{$var}) {
-      $declared{$var} = "%s";
-      $decscope{$var} = $indent;
-
-      $line = "$arrtype $var\[\] = { ";
-      foreach my $v (split(/,/, $val)) {
-        $v =~ s/^\s+//;
-        $v =~ s/\s+$//;
-        my($embedded) = handleEmbeddedVar($v);
-        if ($v ne $embedded) {
-          $v = "gen_partial$gencount";
-          $line = ($count != 0 ? getIndent() : "") .
-                  "static char $v" . "[BUFSIZ] = \"\";\n" .
-                  (" " x (2 * $indent)) .
-                  "ACE_OS::sprintf($v, $embedded);\n" . $line;
-          if ($count != 0) {
-            $v = ", $v";
-          }
-          $gencount++;
-        }
-        else {
-          if ($count != 0) {
-            $line .= getIndent();
-            $v = ", $v";
-          }
-        }
-        ##
-        $line .= $v;
-        $count++;
-      }
-      if ($count == 0) {
-        $line = "$arrtype $var" . "[256] = { 0 };";
-        $declared{$var} = "%x";
-      }
-      else {
-        $line .= " };\n" .
-                 (" " x (2 * $indent)) .
-                 "int $var" . "_length = $count;\n" .
-                 (" " x (2 * $indent)) .
-                 "ACE_UNUSED_ARG($var" . "_length);";
-        $declared{$var . "_length"} = "%d";
-        $decscope{$var . "_length"} = $indent;
-      }
-    }
-    else {
-      $line = "";
-      foreach my $v (split(/,/, $val)) {
-        $v =~ s/^\s+//;
-        $v =~ s/\s+$//;
-        my($embedded) = handleEmbeddedVar($v);
-        if ($v ne $embedded) {
-          $v = "gen_partial$gencount";
-          $line = ($count != 0 ? getIndent() : "") .
-                  "static char $v" . "[BUFSIZ] = \"\";\n" .
-                  (" " x (2 * $indent)) .
-                  "ACE_OS::sprintf($v, $embedded);\n" . $line;
-          $gencount++;
-        }
-        if ($count != 0) {
-          $line .= getIndent();
-        }
-        ##
-        $line .= $var . "[$count] = $v;\n";
-        $count++;
-      }
-    }
-  }
-  elsif ($line =~ /\$(\w+)\s*(\[[^\]]+\])\s*([\.]?=)\s*(.*);/) {
-    my($name)  = $1;
-    my($index) = $2;
-    my($op)    = $3;
-    my($value) = $4;
-    my($fake)  = handleAssignment("\$$name $op $value;");
-
-    $index =~ s/\$//g;
-    if ($fake =~ /TAO_TestCombinedThreads/) {
-      $line = $fake;
-      $line =~ s/\w+\s+=/$name$index = new/;
-      ## Need to reset this because of the above call to handleAssignemnt
-      $declared{$name} = "%x";
-    }
-    elsif ($fake =~ /$name[\s,=]+(.*)[\);]+/) {
-      $value = $1;
-      $value =~ s/\)$//;
-      $line = "$name$index $op $value;";
-    }
-    else {
-      $line = "// Unconverted Assignment: $line";
-      generateError($UNSUPPORTED_CONSTRUCT, "assignment");
-    }
-  }
-  else {
-    $line = "// Unsupported Assignment: $line";
-    generateError($UNSUPPORTED_CONSTRUCT, "assignment");
-  }
-  return $line;
-}
-
-
-sub setNeedMain {
-  if ($firstExecutable && !$insub) {
-    $needMain = 1;
-    $firstExecutable = 0;
-    incrementIndent();
-    ## Fix up so the first line in main() is properly indented
-    $pindent = $indent;
-  }
-}
-
-
-my($foreachcount) = 0;
-sub handleForeach {
-  my($line) = shift;
-  setNeedMain();
-
-  incrementIndent();
-
-  my($newline) = "{ // Unsupported foreach";
-  if ($line =~ /foreach\s+\$(\w+)\s*\((.*)\)/) {
-
-    my($var)       = $1;
-    my($var_count) = $var . "_count";
-    my($arg)       = $2;
-
-    $newline = "for(int $var_count = ";
-    if ($arg =~ /\@ARGV/) {
-      $newline .= "1; $var_count < argc; $var_count++) {\n" .
-                  (" " x (2 * $indent)) .
-                  "char* $var = argv[$var_count];";
-      $declared{$var} = "%s";
-      $decscope{$var} = $indent;
-    }
-    else {
-      $arg =~ s/\@//;
-      if ($arg !~ /^\w+$/) {
-        my($arrtype) = "char*";
-        my($avar) = "gen_foreach$foreachcount";
-        $foreachcount++;
-        if (!$declared{$avar}) {
-          $declared{$avar} = "%s";
-          $decscope{$avar} = $indent;
-        }
-        my($dcount) = $arg;
-        $dcount =~ s/[^,]//g;
-        $newline = "$arrtype $avar\[\] = { $arg };\n" .
-                   (" " x (2 * ($indent - 1))) . "int $avar" .
-                   "_length = " . (length($dcount) + 1) . ";\n" .
-                   (" " x (2 * ($indent - 1))) . $newline;
-        $arg = $avar;
-      }
-      $newline .= "0; $var_count < $arg" . "_length; $var_count++) {\n" .
-                  (" " x (2 * $indent)) .
-                  "char* $var = $arg" . "[$var_count];";
-      $declared{$var} = "%s";
-      $decscope{$var} = $indent;
-    }
-  }
-  else {
-    generateError($UNSUPPORTED_CONSTRUCT, "foreach");
-  }
-
-  return $newline;
-}
-
-
-sub handleFor {
-  my($line) = shift;
-  setNeedMain();
-
-  my($newline) = "{ // Unsupported for";
-  if ($line =~ /for\s*\(\$(\w+)/) {
-    $newline = $line;
-    if (!defined $declared{$1}) {
-      $declared{$1} = "%d";
-      $decscope{$1} = $indent;
-      $newline = typeToCPPType($declared{$1}) .
-                 " $1;\n" . (" " x (2 * $indent)) . $newline;
-    }
-    $newline =~ s/\$//g;
-  }
-  else {
-    generateError($UNSUPPORTED_CONSTRUCT, "for");
-  }
-
-  if ($newline =~ /argc/ && $newline =~ /=\s*0\s*;/) {
-    $newline =~ s/=\s*0\s*;/= 1;/;
-  }
-
-  incrementIndent();
-
-  return $newline;
-}
-
-
-sub convertFILEtoInt {
-  my($name) = shift;
-  $name =~ s/STDIN/fileno(stdin)/g;
-  $name =~ s/STDOUT/fileno(stdout)/g;
-  $name =~ s/STDERR/fileno(stderr)/g;
-  return $name;
-}
-
-my($genopen) = 0;
-sub handleOpen {
-  my($line)   = shift;
-  my($fromIf) = shift;
-  my($above)  = undef;
-  $fromIf = (defined $fromIf ? $fromIf : 0);
-
-  if ($line =~ /(.*(!)?)open\s*\((.*),\s*(.*)\)(.*)/) {
-    my($before) = $1;
-    my($fh)     = $3;
-    my($file)   = $4;
-    my($after)  = $5;
-    my($newline) = "";
-
-    $fh = convertFILEtoInt($fh);
-    ## Dup'ing
-    if ($file =~ /\"\>\&(.*)\"/) {
-      my($other) = convertFILEtoInt($1);
-      if ($fh =~ /fileno/) {
-        $newline = "ACE_OS::dup2($fh, $other)";
-      }
-      else {
-        if (!defined $declared{$fh}) {
-          $declared{$fh} = "%d";
-          $decscope{$fh} = $indent - ($fromIf ? 1 : 0);
-          $newline = "int ";
-        }
-        $newline .= "$fh = ACE_OS::dup($other)";
-      }
-    }
-    ## Regular open (write)
-    elsif ($file =~ /\">(.*)\"/) {
-      my($other) = $1;
-      $other =~ s/\$//g;
-      my($name) = "genopen$genopen";
-      if ($fh =~ /fileno/) {
-        $genopen++;
-        $newline = "ACE_OS::dup2($fh, $name)";
-      }
-      else {
-        $name = $fh;
-        $newline = $name;
-      }
-      $above = (defined $declared{$name} ? "" : "int ") .
-               "$name = " .
-               "ACE_OS::open($other, O_WRONLY|O_CREAT, " .
-               "S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);\n";
-      if (!defined $declared{$name}) {
-        $declared{$name} = "%d";
-        $decscope{$name} = $indent - ($fromIf ? 1 : 0);
-      }
-    }
-    ## Regular open (read)
-    elsif ($file =~ /(.*)/) {
-      my($other) = $1;
-      $other =~ s/\$//g;
-      $other =~ s/[\"\']//g;
-      $other =~ s/\<//g;
-      my($name) = $fh;
-      $newline = $name;
-      $above = (defined $declared{$name} ? "" : "int ") .
-               "$name = " .
-               "ACE_OS::open($other, O_RDONLY);\n";
-      if (!defined $declared{$name}) {
-        $declared{$name} = "%d";
-        $decscope{$name} = $indent - ($fromIf ? 1 : 0);
-      }
-    }
-    $line = (!$fromIf && defined $above ? $above : "") .
-            "$before$newline$after";
-  }
-  else {
-    generateError($UNSUPPORTED_CONSTRUCT, "open");
-  }
-  return $line, $above;
-}
-
-sub handleIf {
-  my($line)  = shift;
-  setNeedMain();
-
-  my($newline) = $line;
-  $newline =~ s/if\s*\(.*/if \(/;
-
-  my($conditions)  = undef;
-  if ($line =~ /if\s*\((.+)\)\s*{/) {
-    $conditions = $1;
-  }
-
-  if ($line =~ /elsif/) {
-    $newline =~ s/elsif/else if/;
-  }
-  if ($line !~ /}.*{/) {
-    incrementIndent();
-  }
-
-  foreach my $inside (split(/(\&\&|\|\|)/, $conditions)) {
-    if ($inside eq '&&' || $inside eq '||') {
-      $newline .= " $inside ";
-    }
-#    elsif ($inside =~ /\$\^O\s+[nltgeq]+\s+[\"\']MSWin32[\"\']/) {
-#      $newline .= "0";
-#    }
-    elsif ($inside =~ /open\s*\(.*\)/) {
-      my($above) = undef;
-      ($inside, $above) = handleOpen($inside, 1);
-      if (defined $above) {
-        $newline = $above . getIndent() . $newline;
-      }
-      $newline .= " $inside ";
-    }
-    elsif ($inside =~ /(.*)\s+([nltgeq]+)\s+(.*)/) {
-      my($left)     = $1;
-      my($op)       = $2;
-      my($right)    = $3;
-      my($var)      = undef;
-      my($constant) = undef;
-
-      if ($left =~ /\$(\w+)/) {
-        $var = $1;
-      }
-      elsif ($right =~ /\$(\w+)/) {
-        $var = $1;
-      }
-      if ($left =~ /\$?(\w+\[[^\]]+\])/) {
-        $var = $1;
-        $var =~ s/\$//g;
-      }
-      elsif ($right =~ /\$?(\w+\[[^\]]+\])/) {
-        $var = $1;
-        $var =~ s/\$//g;
-      }
-
-      if ($left =~ /\"[^\"]*\"/) {
-        $constant = $left;
-      }
-      elsif ($right =~ /\"[^\"]*\"/) {
-        $constant = $right;
-      }
-      if ($left =~ /\'([^\']*)\'/) {
-        $constant = "\"$1\"";
-      }
-      elsif ($right =~ /\'([^\']*)\'/) {
-        $constant = "\"$1\"";
-      }
-      if (defined $var && defined $constant) {
-        my($check) = undef;
-        if ($op eq 'eq') {
-          $check = "== 0";
-        }
-        elsif ($op eq 'ne') {
-          $check = "!= 0";
-        }
-        elsif ($op eq 'lt') {
-          $check = "< 0";
-        }
-        elsif ($op eq 'le') {
-          $check = "<= 0";
-        }
-        elsif ($op eq 'gt') {
-          $check = "> 0";
-        }
-        elsif ($op eq 'ge') {
-          $check = ">= 0";
-        }
-
-        $inside =~ s/.*\s+$op\s+.*/\($var != 0 && ACE_OS_String::strcmp\($var, $constant\) $check\)/;
-        $newline .= "$inside";
-      }
-    }
-    elsif ($inside =~ /([^!<=]+)\s*([!<>=]+)\s*([^!<>=]+)/) {
-      my($left)     = $1;
-      my($op)       = $2;
-      my($right)    = $3;
-      my($var)      = undef;
-      my($constant) = undef;
-
-      $left =~ s/\s+$//;
-      $right =~ s/^\s+//;
-
-      if ($left =~ /\$(\w+)/) {
-        $var = $left;
-        $var =~ s/\$//g;
-      }
-      elsif ($left =~ /\'([^\']+)\'/) {
-        $var = "\"$1\"";
-      }
-      else {
-        $var = $left;
-      }
-
-      if ($right =~ /\$(\w+)/) {
-        $constant = $1;
-      }
-      elsif ($right =~ /\'([^\']+)\'/) {
-        $constant = "\"$1\"";
-      }
-      else {
-        $constant = $right;
-      }
-
-      if ($var =~ /Spawn/) {
-        my($wait) = "";
-        if ($var =~ /\((.*)\)/) {
-          my($tout) = $1;
-          if ($tout =~ /^\d+$/ && $tout > $defaultTimeout) {
-            $defaultTimeout = $tout;
-          }
-          $wait = "($tout * $timefactor)";
-        }
-        my($spvar, $spval) = handleSpawn($var);
-        $newline = "$spvar$spval\n" . (" " x (2 * ($indent - 1))) .
-                $newline;
-        $var = "$spvar.wait($wait)";
-      }
-      elsif ($var =~ /[\$]?([\w\[\]\$]+)->WaitKill/) {
-        my($wvar) = $1;
-        my($ovar) = $wvar;
-        my($iop)   = ".";
-        my($tfix) = $wvar;
-        $wvar =~ s/\$//g;
-        $tfix =~ s/\[.*//;
-        if ($wvar =~ /\[/) {
-          $ovar =~ s/[\[\]\$]//g;
-          $iop = "->";
-        }
-#        if (defined $declared{$wvar} && $declared{$wvar} != 0) {
-#          $wvar .= $declared{$wvar};
-#        }
-        handleWaitKill($var, $ovar);
-        $var = "$wvar$iop" . "wait($ovar" . "Timeout)";
-      }
-
-      $newline .= "$var $op $constant";
-    }
-    elsif ($inside =~ /testGetopts/) {
-      $newline .= $inside;
-    }
-    elsif ($inside =~ /(.*)defined\s+\$([^\)]+)/) {
-      my($op)  = $1;
-      my($var) = $2;
-      $newline .= ($op ne "" ? "$op(" : "") .
-                  $var . "[0] != '\\0'" . ($op ne "" ? ")" : "");
-    }
-    elsif ($inside =~ /(!)?(.*)/) {
-      my($op) = $1;
-      my($right) = $2;
-      $right =~ s/\$//g;
-      $inside = (defined $op ? $op : "") . $right;
-      $newline .= "$inside";
-    }
-    else {
-      $newline .= "/*$inside*/0";
-    }
-  }
-  $newline .= ") {";
-
-  return $newline;
-}
-
-
-my($argindexcount) = 0;
-my($azlengthcount) = 0;
-my($genargcount)   = 0;
-sub handleArguments {
-  my($line) = shift;
-  my($var)  = shift;
-  my($args) = shift;
-  my($sep)  = shift;
-  my($newline) = "// Arguments: $line";
-  my($ok) = 0;
-
-  if (defined $var && defined $args) {
-    $ok = 1;
-  }
-  elsif ($line =~ /\$(\w+)->Arguments\s*\((.*)\)/) {
-    $ok = 1;
-    $var = $1;
-    $args = $2;
-  }
-
-  if ($ok) {
-    my($argline) = "";
-    my($argcount) = splitArguments($args, \$argline, $sep);
-    $argline .= "0";
-    my(@lines) = split(/\n/, $argline);
-    $newline = "int argindex$argindexcount = " .
-               (defined $argsList{$var} ? "$argsList{$var}" :
-                                         "1 /*undefined*/") . ";\n";
-    for(my $i = 0; $i <= $#lines; $i++) {
-      if ($i == $#lines) {
-        my($current) = 0;
-        my($varargs) = $var . "Args";
-        foreach my $newarg (split(/,/, $lines[$i])) {
-          $newarg =~ s/^\s+//;
-          $newarg =~ s/\s+$//;
-          if (defined $declared{$newarg} && $declared{$newarg} eq "%s" &&
-              $newarg !~ /ior/ && $newarg !~ /conf/ && $newarg !~ /gen_/) {
-            $current = $unknownArgCount;
-            $newline .= (" " x (2 * $indent)) . $varargs .
-                        "[argindex$argindexcount" . "++] = $newarg;\n" .
-                        (" " x (2 * $indent)) . "int azlength$azlengthcount = ACE_OS::strlen($newarg);\n" .
-                        (" " x (2 * $indent)) . "for(int az = 0; az < azlength$azlengthcount; az++) {\n" .
-                        (" " x (2 * $indent)) . "  if (isspace($newarg" . "[az])) {\n" .
-                        (" " x (2 * $indent)) . "    $newarg" . "[az] = '\\0';\n" .
-                        (" " x (2 * $indent)) . "    for(;ACE_OS_String::ace_isspace($newarg" . "[az]); az++);\n" .
-                        (" " x (2 * $indent)) . "    $varargs" . "[argindex$argindexcount" . "++] = $newarg + az + 1;\n" .
-                        (" " x (2 * $indent)) . "  }\n" .
-                        (" " x (2 * $indent)) . "}\n";
-            $azlengthcount++;
-          }
-          elsif (defined $declared{$newarg} && $declared{$newarg} eq "%d") {
-            $newline .= (" " x (2 * $indent)) .
-                        "char gen_args$genargcount" . "[$shortString] = \"\";\n" .
-                        (" " x (2 * $indent)) .
-                        "ACE_OS::sprintf(gen_args$genargcount, \"%d\", $newarg);\n" .
-                        (" " x (2 * $indent)) .
-                        $varargs . "[argindex$argindexcount" .
-                        "++] = gen_args$genargcount;\n";
-            $genargcount++;
-            $current++;
-          }
-          else {
-            $newline .= (" " x (2 * $indent)) .
-                        $varargs . "[argindex$argindexcount" .
-                        "++] = $newarg;\n";
-            $current++;
-          }
-        }
-        $argindexcount++;
-        my($foundInBody) = 0;
-        for(my $i = $#cppbody; $i >= 0; $i--) {
-          if ($cppbody[$i] =~ /char\* $varargs\[(.*)\]/) {
-            my($index) = $1;
-            my($max) = $argsList{$var} + $current;
-            if (!defined $index || defined $index &&
-                ($index eq "" || ($index =~ /^\d+$/ && $index < $max))) {
-              $cppbody[$i] =~ s/$varargs\[.*\]/$varargs\[$max\]/;
-              $foundInBody = 1;
-              last;
-            }
-          }
-        }
-        for(my $i = $#cppheader; $i >= 0; $i--) {
-          if ($cppheader[$i] =~ /char\* $varargs\[(.*)\]/) {
-            my($index) = $1;
-            my($max) = $argsList{$var} + $current;
-            if (!defined $index || defined $index &&
-                ($index eq "" || ($index =~ /^\d+$/ && $index < $max))) {
-              $cppheader[$i] =~ s/$varargs\[.*\]/$varargs\[$max\]/;
-              last;
-            }
-          }
-        }
-      }
-      else {
-        $newline .= "$lines[$i]\n";
-      }
-    }
-  }
-  return $newline;
-}
-
-
-sub handleWhile {
-  my($line) = shift;
-  generateError($UNSUPPORTED_CONSTRUCT, "while");
-  return "while(0) {";
-}
-
-
-sub handleKeyword {
-  my($key)  = shift;
-  my($line) = shift;
-  setNeedMain();
-  $line =~ s/\$(\w+)/$1/;
-  if ($line =~ /$key\s*[^(]/) {
-    if ($line =~ /[\(\)]+/) {
-      $line =~ s/$key\s*/ACE_OS::$key/;
-    }
-    else {
-      $line =~ s/$key\s*/ACE_OS::$key\(/;
-      $line =~ s/;/\);/;
-    }
-  }
-  else {
-    $line = "ACE_OS::$line";
-  }
-  return $line;
-}
-
-
-sub handlePrint {
-  my($line) = shift;
-  setNeedMain();
-
-  my($stream) = undef;
-  my($value)  = undef;
-  if ($line =~ /print\s+(\w+)\s+(.+);/) {
-    $stream = lc($1);
-    $value = $2;
-  }
-  elsif ($line =~ /print\s+(.+);/) {
-    $value = $1;
-  }
-
-  $value = handleEmbeddedVar($value);
-
-  if (defined $stream) {
-    $line = "ACE_OS::fprintf($stream, $value);";
-  }
-  else {
-    $line = "ACE_OS::printf($value);";
-  }
-
-  return $line;
-}
-
-
-sub handleSpawn {
-  my($line) = shift;
-  setNeedMain();
-  my(@parts) = ();
-  if ($line =~ /([\w\[\$\]]+)->Spawn[\w]*\s*\(([^\)]*)\)/) {
-    if (defined $taodebug) {
-      my($part) = (" " x (2 * $indent)) . "TAO_debug_level = $taodebug;\n";
-      if ($insub) {
-        push(@cppsubs, $part);
-      }
-      else {
-        push(@cppbody, $part);
-      }
-      $taodebug = undef;
-    }
-    my($var)     = $1;
-    my($timeout) = $2;
-    $var =~ s/\$//g;
-
-#    if (defined $declared{$var} && $declared{$var} != 0) {
-#      $var .= $declared{$var};
-#    }
-    if ($timeout =~ /^\d+$/ && $timeout > $defaultTimeout) {
-      $defaultTimeout = $timeout;
-    }
-    my($time) = ($timeout ne "" ? "($timeout * $timefactor)" : "");
-    if ($time eq "") {
-      my($varfix) = $var;
-      $varfix =~ s/[\[\]]+//g;
-      $time = "$varfix" . "Timeout";
-    }
-    my($typeCheck) = $var;
-    $typeCheck =~ s/\[.*//;
-    @parts = ($var, ($declared{$typeCheck} eq "%x" ?
-                                 "->" : ".") . "run($time);");
-  }
-  return @parts;
-}
-
-
-sub handleWaitKill {
-  my($line) = shift;
-  my($var)  = shift;
-  setNeedMain();
-
-  if (!defined $var) {
-    if ($line =~ /(\w+)->.*Kill\s*\(([\w\$]*)\)/) {
-      $var = $1;
-    }
-  }
-  if ($line =~ /->.*Kill\s*\(([\w\$]*)\)/) {
-    my($time) = $var . "Timeout";
-    my($tout) = $1;
-    if ($tout =~ /^\d+$/ && $tout > $defaultTimeout) {
-      $defaultTimeout = $tout;
-    }
-    if (!defined $declared{$time}) {
-      $timeoutVars{$time} = $tout;
-      $declared{$time} = "%d";
-      $decscope{$time} = -1;
-    }
-  }
-}
-
-
-sub handleSubroutine {
-  my($line) = shift;
-  incrementIndent();
-
-  if ($line =~ /sub\s+(\w+)\s*(\(.*\))?\{/) {
-    $insub = 1;
-    $indsc = $indent - 1;
-    $line = "void $1(/*params*/) {";
-    push(@subs, $1);
-  }
-  else {
-    $line = "// Subroutine call??? $line";
-  }
-  return $line;
-}
-
-
-my($firstSplit) = 1;
-sub handleSplit {
-  my($line) = shift;
-  if ($firstSplit) {
-    $firstSplit = 0;
-    push(@cppheader, "void split(char** arr, int& length, const char* delim, char* str)\n" .
-                     "{\n" .
-                     "  int slength     = strlen(str);\n" .
-                     "  int delimLength = strlen(delim);\n" .
-                     "  int previous    = 0;\n" .
-                     "  int index       = 0;\n" .
-                     "  for(int i = 0; i <= slength; i++) {\n" .
-                     "    if (str[i] == '\\0' || strncmp(str + i, delim, delimLength) == 0) {\n" .
-                     "      arr[index++] = str + previous;\n" .
-                     "      str[i] = '\\0';\n" .
-                     "      i += delimLength;\n" .
-                     "      previous = i;\n" .
-                     "    }\n" .
-                     "  }\n" .
-                     "  length = index;\n" .
-                     "}\n" .
-                     "\n" .
-                     "void split(char** arr, int& length, char delim, char* str)\n" .
-                     "{\n" .
-                     "  char delimStr[2] = \"\\0\";\n" .
-                     "  delimStr[0] = delim;\n" .
-                     "  split(arr, length, delimStr, str);\n" .
-                     "}\n\n");
-  }
-
-  if ($line =~ /\@(\w+)\s*=\s*split\s*\((.*)\)/) {
-    my($var) = $1;
-    my($params) = $2;
-    $params =~ s/\$//g;
-    $params =~ s/^\/([^\/]+)\//\'$1\'/;
-    $line = "split($var, $var" . "_length, $params);";
-  }
-  else {
-    $line = "// Unhandled split: $line";
-  }
-  return $line;
-}
-
-
-sub handleLocal {
-  my($line) = shift;
-  if ($line =~ /local\s*\((.*)\)/) {
-    my($list) = $1;
-    foreach my $var (split(/,/, $list)) {
-      $var =~ s/^\s+//;
-      $var =~ s/\s+//;
-      $var = handleAssignment($var . " = \"\";");
-      if ($var !~ /^static/) {
-        $var = "static $var";
-      }
-      push(@cppheader, "$var\n");
-    }
-  }
-}
-
-my($firstGetopts) = 1;
-sub handleGetopts {
-  my($line) = shift;
-  my(%vars) = ();
-
-  $line =~ s/\'/\"/g;
-  if ($line =~ /getopts\s*\(([^\)]+)\)/) {
-    my($param) = $1;
-    my($length) = length($param);
-    my($current) = "";
-    for(my $i = 0; $i < $length; $i++) {
-      my($ch) = substr($param, $i, 1);
-      if ($ch  ne '"') {
-        if ($ch eq ':') {
-          $vars{$current} = 1;
-        }
-        else {
-          $current = $ch;
-          $vars{$current} = 0;
-        }
-      }
-    }
-  }
-
-  if ($firstGetopts) {
-    push(@cppsubs, "int testGetopts(int argc, char* argv[], const char* str)\n" .
-                   "{\n" .
-                   "  ACE_Get_Opt get_opts(argc, argv, str);\n" .
-                   "  int status = 1;\n" .
-                   "  for(int c = 0; c != -1; c = get_opts()) {\n" .
-                   "    switch(c) {\n" .
-                   "      case 0:\n" .
-                   "        break;\n");
-    foreach my $key (keys %vars) {
-      push(@cppsubs, "      case '$key':\n");
-      if ($vars{$key} == 0) {
-        push(@cppsubs, "        ACE_OS_String::strcpy(opt_$key, \"1\");");
-      }
-      else {
-        push(@cppsubs, "        ACE_OS_String::strcpy(opt_$key, get_opts.optarg);\n");
-      }
-      push(@cppsubs, "        break;\n");
-    }
-    push(@cppsubs, "      default:\n" .
-                   "        status = 0;\n" .
-                   "        break;\n" .
-                   "    }\n" .
-                   "  }\n" .
-                   "  return status;\n" .
-                   "}\n\n");
-  }
-
-  $line =~ s/getopts\s*\(/testGetopts\(argc, argv, /g;
-  $firstGetopts = 0;
-  return $line;
-}
-
-
-sub handleEmbeddedVar {
-  my($value)   = shift;
-
-  while ($value =~ /\$(\w+)\[([\$]?\w+)\]/) {
-    my($param) = $1;
-    my($index) = $2;
-    $index =~ s/\$//;
-    $value =~ s/([^\\])\$\w+\[[\$]?\w+\]/$1$declared{$param}/;
-    $value .= ", $param" . "[$index]";
-  }
-  while ($value =~ /\.\s*([\$\"\']+)/) {
-    my($param) = $1;
-    $param =~ s/\$//;
-    $value =~ s/\.\s*[\$\"\']+/ \"%s\"/;
-    $value .= ", $param";
-    $value =~ s/\"\s*\.\s*\"//;
-    $value =~ s/\"\s+\"//;
-  }
-  while ($value =~ /[^\\]\$(\w+)/) {
-    my($param) = $1;
-
-    ## Perl Script Error
-    if (!defined $declared{$param}) {
-      generateError($UNDEFINED_VARIABLE, $param);
-      $value =~ s/([^\\])\$\w+/$1%x/;
-    }
-    else {
-      $value =~ s/([^\\])\$\w+/$1$declared{$param}/;
-    }
-    $value .= ", $param";
-  }
-#  my($length) = length($value);
-#  my($prev)   = "";
-#  for(my $i = 0; $i < $length; $i++) {
-#    my($ch) = substr($value, $i, 1);
-#    if ($prev ne '\\' && $ch eq '$') {
-#      ## TBD?
-#    }
-#    $prev = $ch;
-#  }
-  return $value;
-}
-
-
-my($subcallcount) = 0;
-sub handleSubCall {
-  my($line) = shift;
-  my($newline) = "// Sub Call:";
-  if ($line =~ /(\"[^\"]+\")/) {
-    my($orig) = $1;
-    my($str)  = handleEmbeddedVar($orig);
-    if ($orig ne $str) {
-      $newline = "char gen_subcall$subcallcount" . "[$shortString] = \"\";\n" .
-                 (" " x (2 * $indent)) .
-                 "ACE_OS::sprintf(gen_subcall$subcallcount, $str);\n";
-      $line =~ s/\"[^\"]+\"/gen_subcall$subcallcount/;
-      $line = $newline . (" " x (2 * $indent)) . $line;
-      $subcallcount++;
-    }
-  }
-  else {
-    $line =~ s/\$//g;
-  }
-  return $line;
-}
-
-sub convertAngleToRead {
-  my($line) = shift;
-  my($length)   = length($line);
-  my($indouble) = 0;
-  my($insingle) = 0;
-  my($inangle)  = 0;
-
-  for(my $i = 0; $i < $length; $i++) {
-    my($ch) = substr($line, $i, 1);
-    if (!$insingle && $ch eq '"') {
-      $indouble ^= 1;
-    }
-    elsif (!$indouble && $ch eq '\'') {
-      $insingle ^= 1;
-    }
-    elsif ($ch eq '<' && !$indouble && !$insingle) {
-      $inangle = $i;
-    }
-    elsif ($ch eq '>' && $inangle && !$indouble && !$insingle) {
-      my($func) = "read_line";
-      if ($line =~ /while/) {
-        if ($needReadLine) {
-          push(@cppsubs, "static char* read_line (int fd)\n" .
-                         "{\n" .
-                         "  static const size_t blen = 2048;\n" .
-                         "  static char buffer[blen];\n" .
-                         "\n" .
-                         "  buffer[0] = '\\0';\n" .
-                         "  off_t current = lseek(fd, 0, SEEK_CUR);\n" .
-                         "  ssize_t amount = read (fd, buffer, blen);\n" .
-                         "  if (amount > 0)\n" .
-                         "    {\n" .
-                         "      for(ssize_t i = 0; i < amount; i++)\n" .
-                         "        {\n" .
-                         "          if (buffer[i] == '\\n')\n" .
-                         "            {\n" .
-                         "              buffer[i + 1] = '\\0';\n" .
-                         "              lseek (fd, current + i + 1, SEEK_SET);\n" .
-                         "              break;\n" .
-                         "            }\n" .
-                         "        }\n" .
-                         "    }\n" .
-                         "\n" .
-                         "  return buffer;\n" .
-                         "}\n" .
-                         "\n" .
-                         "\n");
-          $needReadLine = 0;
-        }
-      }
-      else {
-        $func = "read_file";
-        if ($needReadFile) {
-          push(@cppsubs, "static char* read_file (int fd)\n" .
-                         "{\n" .
-                         "  static const size_t blen = 5120;\n" .
-                         "  static char buffer[blen];\n" .
-                         "\n" .
-                         "  buffer[0] = '\\0';\n" .
-                         "  ssize_t amount = read (fd, buffer, blen);\n" .
-                         "  if (amount > 0)\n" .
-                         "    buffer[amount] = '\\0';\n" .
-                         "\n" .
-                         "  return buffer;\n" .
-                         "}\n");
-          $needReadFile = 0;
-        }
-      }
-      substr($line, $i, 1) = ")";
-      substr($line, $inangle, 1) = "$func(";
-      $inangle = 0;
-      $length = length($line);
-      $i += length($func);
-    }
-  }
-
-  return $line;
-}
-
-
-sub usageAndExit {
-  my($str) = shift;
-  if (defined $str) {
-    print "$str\n";
-  }
-  print "Usage: " . basename($0) . " [-t <time factor>] <input> <output>\n\n" .
-        "       -t <time factor>   The multiple to be applied to " .
-        "each timeout value.\n" .
-        "       <input>            Input perl script.\n" .
-        "       <output>           Output c++ file.\n";
-  exit(0);
-}
-
-# ******************************************************************
-# Main Section
-# ******************************************************************
-
-my($ifile)   = "run_test.pl";
-my($ofile)   = "-";
-
-while(1) {
-  if ($ARGV[0] eq "-h") {
-    usageAndExit();
-  }
-  elsif ($ARGV[0] eq "-t") {
-    shift(@ARGV);
-    $timefactor = $ARGV[0];
-    if (!defined $timefactor || $timefactor !~ /^\d+$/) {
-      usageAndExit("Invalid timeout factor");
-    }
-  }
-  elsif ($ARGV[0] =~ /^\-/) {
-    usageAndExit("Unknown option: $ARGV[0]");
-  }
-  else {
-    last;
-  }
-  shift(@ARGV);
-}
-
-if (defined $ARGV[0]) {
-  $ifile = $ARGV[0];
-}
-if (defined $ARGV[1]) {
-  $ofile = $ARGV[1];
-}
-
-my($fh) = new FileHandle();
-if (open($fh, $ifile)) {
-  my($oh) = new FileHandle();
-  if (open($oh, ">$ofile")) {
-    my($line)      = "";
-    my($inspect)   = "";
-    my($hostValue) = "localhost";
-
-    push(@cppheader, getTop());
-    while(<$fh>) {
-      my($injected) = undef;
-      my($output)   = undef;
-      $line = $_;
-      $lineCount++;
-
-      ## For now, comment out anything using $ENV{} or
-      ## PerlACE::check_n_cleanup_files
-      if ($line =~ /\$ENV/ ||
-          $line =~ /PerlACE::check_n_cleanup_files/) {
-        $line = "## $line";
-      }
-
-      ## Convert die's
-      if ($line =~ /(.*)\s+(or|and)\s+die\s*(.*);/) {
-        my($left)  = $1;
-        my($op)    = $2;
-        my($right) = $3;
-        $line = "if (" . ($op eq "or" ? "!" : "") . "$left) {\n";
-        $right =~ s/\((.*)\)/$1/;
-        my($space) = getIndent();
-        $injected = "$space  ACE_OS::fprintf(stderr, $right);\n" .
-                    "$space  exit(1);\n" .
-                    "$space}\n";
-      }
-
-      ## Convert $^O to $OSNAME
-      $line =~ s/\$\^O/\$OSNAME/g;
-
-      $line =~ s/^\s+//g;
-      $line =~ s/[^\$\\]#.*//g;
-      $line =~ s/^#.*//;
-      $line =~ s/\s+$//g;
-
-      ## PerlACE transform
-      $line =~ s/PerlACE::LocalFile\s*\((.*)\)/FULL_PATH $1/g;
-      $line =~ s/PerlACE::waitforfile_timed/TAO_TestCombinedThreads::waitForFileTimed/g;
-      $line =~ s/TAO_TestCombinedThreads::waitForFileTimed\s*\(([^,]+),([^\)]+)\)/TAO_TestCombinedThreads::waitForFileTimed \($1, \($2 * $timefactor\)\)/;
-      $line =~ s/PerlACE::uniqueid\s*/TAO_TestCombinedThreads::getRandomPortBase/g;
-
-      ## time transform
-      $line =~ s/time/time_variable/g;
-
-      ## main arguments transform
-      $line =~ s/\$#ARGV/\(argc - 1\)/g;
-      $line =~ s/\$ARGV\[([^\]]+)\]/argv\[$1\]/g;
-      if ($line =~ /argv\[(\d+)\]/) {
-        my($val) = $1 + 1;
-        $line =~ s/argv\[\d+\]/argv\[$val\]/;
-      }
-
-      ## TARGETHOSTNAME transform
-      if ($line =~ /\$TARGETHOSTNAME\s*=\s*\"(.*)\"/) {
-        $hostValue = $1;
-        $line = "";
-      }
-      $line =~ s/\$TARGETHOSTNAME/$hostValue/g;
-
-      $inspect = concatenate(buildLine($line));
-
-      if ($inspect =~ /getopts/) {
-        $inspect = handleGetopts($inspect);
-      }
-
-      if ($inspect eq "") {
-        $output = "";
-      }
-      elsif ($inspect =~ /^eval\s+/) {
-      }
-      elsif ($inspect =~ /^use\s+/) {
-      }
-      elsif ($inspect =~ /^require\s+/) {
-      }
-      elsif ($inspect =~ /split\s*\(/) {
-        $output = handleSplit($inspect);
-      }
-      elsif ($inspect =~ /^(my\s+)?[\$\%\@]\w+(\s*\[[\$\w]+\])?\s*(\.)?=/) {
-        $output = handleAssignment($inspect);
-      }
-      elsif ($inspect =~ /^foreach\s+/) {
-        $output = handleForeach($inspect);
-      }
-      elsif ($inspect =~ /^for\s+/) {
-        $output = handleFor($inspect);
-      }
-      elsif ($inspect =~ /^while\s+/) {
-        $output = handleWhile($inspect);
-      }
-      elsif ($inspect =~ /^if\s*\(/ || $inspect =~ /[}]?\s*elsif\s*\(/) {
-        $output = handleIf($inspect);
-      }
-      elsif ($inspect =~ /else/) {
-        $output = $inspect;
-        if ($inspect =~ /}/) {
-          decrementIndent();
-        }
-        if ($inspect =~ /{/) {
-          incrementIndent();
-        }
-      }
-      elsif ($inspect =~ /}/) {
-        $output = $inspect;
-        decrementIndent();
-      }
-      elsif ($inspect =~ /\$(\w+)\+\+/) {
-        $output = $inspect;
-        $output =~ s/\$//g;
-      }
-      elsif ($inspect =~ /^exit/) {
-        if ($inspect =~ /exit(\s*\(\s*\))?;/) {
-          $inspect = "exit(0);";
-        }
-        $output = handleKeyword("exit", $inspect);
-      }
-      elsif ($inspect =~ /^unlink/) {
-        $output = handleKeyword("unlink", $inspect);
-      }
-      elsif ($inspect =~ /^sleep/) {
-        $output = handleKeyword("sleep", $inspect);
-      }
-      elsif ($inspect =~ /^close/) {
-        $output = handleKeyword("close", $inspect);
-      }
-      elsif ($inspect =~ /^print[\s\(]/) {
-        $output = handlePrint($inspect);
-      }
-      elsif ($inspect =~ /\->Spawn/) {
-        my(@parts) = handleSpawn($inspect);
-        $output = "$parts[0]$parts[1]";
-      }
-      elsif ($inspect =~ /->WaitKill/) {
-        handleWaitKill($inspect);
-      }
-      elsif ($inspect =~ /->Kill/) {
-        handleWaitKill($inspect);
-      }
-      elsif ($inspect =~ /->Arguments/) {
-        $output = handleArguments($inspect);
-      }
-      elsif ($inspect =~ /local\s*\(/) {
-        handleLocal($inspect);
-      }
-      elsif ($inspect =~ /sub\s+\w+\s*/) {
-        $output = handleSubroutine($inspect);
-      }
-      elsif ($inspect =~ /open\s*\(/) {
-        my(@parts) = handleOpen($inspect);
-        $output = $parts[0];
-      }
-      else {
-        if ($inspect ne "") {
-          my($needError) = 1;
-          $output = "// Needs to be implemented: $inspect";
-          foreach my $sub (@subs) {
-            if ($inspect =~ /$sub/) {
-              $output = handleSubCall($inspect);
-              $needError = 0;
-              last;
-            }
-          }
-          if ($needError) {
-            generateError($UNSUPPORTED_CONSTRUCT, $inspect);
-          }
-        }
-      }
-
-      if (defined $output) {
-        ## Post-processing
-        $output = convertFILEtoInt($output);
-        $output = convertAngleToRead($output);
-
-        if ($needMain) {
-          push(@cppbody, getMainBeginning());
-          if (defined $injected) {
-            push(@cppbody, $injected);
-            decrementIndent();
-          }
-          $needMain = 0;
-        }
-        if ($output =~ /}\s*elsif/) {
-          decrementIndent();
-        }
-        my($part) = ($output ne "" ? getIndent() : "") . "$output\n";
-        if ($insub) {
-          push(@cppsubs, $part);
-          if (defined $injected) {
-            push(@cppsubs, $injected);
-            decrementIndent();
-          }
-        }
-        else {
-          if (!$firstExecutable) {
-            push(@cppbody, $part);
-            if (defined $injected) {
-              push(@cppbody, $injected);
-              decrementIndent();
-            }
-          }
-          else {
-            push(@cppheader, $part);
-            if (defined $injected) {
-              push(@cppheader, $injected);
-              decrementIndent();
-            }
-          }
-        }
-        if ($insub == 1 && $indent == $indsc) {
-          $insub = 0;
-        }
-        if ($output =~ /}\s*elsif/) {
-          $indent++;
-        }
-      }
-    }
-    push(@cppbody, getMainEnding());
-
-    ## Put in the definition of the timeout's now that
-    ## the defaultTimeout is as large as it's going to get.
-    foreach my $timeout (sort keys %timeoutVars) {
-      my($val) = ($timeoutVars{$timeout} eq "" ? $defaultTimeout :
-                                                 $timeoutVars{$timeout});
-      unshift(@cppbody, "static int $timeout = ($val * $timefactor);\n");
-    }
-
-    foreach my $line (@cppheader, @cppsubs, @cppbody) {
-      print $oh $line;
-    }
-  }
-  else {
-    print STDERR "Unable to open $ofile for output\n";
-    $status++;
-  }
-  close($fh);
-}
-else {
-  print STDERR "Unable to open $ifile for input\n";
-  $status++;
-}
-
-## Remove the file if there was an error
-if ($status) {
-  unlink($ofile);
-}
-
-exit($status);
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index 9c6d77417f2..c0d88be1c7f 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -13,18 +13,21 @@ TAO/tests/Param_Test/run_test.pl: !MINIMUM
 TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM
 TAO/tests/AMI/run_test.pl: !MINIMUM
 TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !ST
-TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM
+TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86
+TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Collocation/run_test.pl:
 TAO/tests/Collocation_Tests/run_test.pl: !ST
 TAO/tests/Collocation_Opportunities/run_test.pl: !ST
 TAO/tests/Collocation_Oneway_Tests/run_test.pl: !ST !NO_MESSAGING
 TAO/tests/Collocation_Exception_Test/run_test.pl: !ST
+TAO/tests/CollocationLockup/run_test.pl: !ST !DISABLE_ToFix_LynxOS_x86
 TAO/tests/OctetSeq/run_test.pl:
 TAO/tests/OctetSeq/run_test1.pl: !STATIC
 TAO/tests/OctetSeq/run_test2.pl: !STATIC
-TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR
+TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/BiDirectional/run_test_ipv6.pl: IPV6 !MINIMUM !GIOP10 !DISABLE_BIDIR
-TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !VxWorks !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR
+TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/BiDirectional_DelayedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/Leader_Followers/run_test.pl: !ST
 TAO/tests/Leader_Followers/run_test_mt.pl: !ST
 TAO/tests/Multiple_Inheritance/run_test.pl:
@@ -32,30 +35,44 @@ TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM
 TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !ST !DISABLE_INTERCEPTORS
 TAO/tests/Bug_1568_Regression/run_test.pl: !NO_MESSAGING
 TAO/tests/Bug_1670_Regression/run_test.pl: !NO_MESSAGING
-TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM
+TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !ST
 TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !ST !Win32
 TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !ST !Win32 !IRIX
-TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !ST
+TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/Bug_1551_Regression/run_test.pl: !VxWorks !MINIMUM !ST !IRIX
+TAO/tests/Bug_1676_Regression/run_test.pl:
+TAO/tests/Bug_2084_Regression/run_test.pl: !ST
+TAO/tests/Bug_2134_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2174_Regression/run_test.pl: !MINIMUM
 TAO/tests/Bug_2183_Regression/run_test.pl:
+TAO/tests/Bug_2186_Regression/run_test.pl: !MINIMUM
+TAO/tests/Bug_2201_Regression/run_test.pl:
 TAO/tests/Bug_2234_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Bug_2289_Regression/run_test.pl:
+TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/tests/Bug_2328_Regression/run_test.pl:
+TAO/tests/Bug_2345_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/tests/Bug_2349_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_x86
+TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !ST
+TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM
+TAO/tests/Bug_2494_Regression/run_test.pl: !ST
+TAO/tests/Bug_2503_Regression/run_test.pl: !ST
 TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !IPV6
 TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !IPV6
-TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !ST
-TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC
+TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM
 TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM  !ST
-TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !ST
+TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM
-TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks  !MINIMUM !ST !IPV6
+TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks  !MINIMUM !ST !IPV6 !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !IPV6
@@ -66,17 +83,17 @@ TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
 TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC
 TAO/tests/OBV/Any/run_test.pl:
-TAO/tests/OBV/Collocated/Forward/run_test.pl: !ST
+TAO/tests/OBV/Collocated/Forward/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/OBV/Factory/run_test.pl:
 TAO/tests/OBV/Forward/run_test.pl:
 TAO/tests/OBV/TC_Alignment/run_test.pl:
 TAO/tests/OBV/ValueBox/run_test.pl:
 TAO/tests/Hello/run_test.pl:
 TAO/tests/IPV6/run_test.pl: IPV6
-TAO/tests/AlternateIIOP/run_test.pl:
+TAO/tests/AlternateIIOP/run_test.pl: !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Cache_Growth_Test/run_test.pl:
 TAO/tests/Muxing/run_test.pl: !ST
-TAO/tests/Muxed_GIOP_Versions/run_test.pl: !VxWorks !ST
+TAO/tests/Muxed_GIOP_Versions/run_test.pl: !VxWorks !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/MT_Client/run_test.pl: !ST
 TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 !DISABLE_BIDIR
 TAO/tests/File_IO/run_test.pl: !ST !MINIMUM
@@ -84,11 +101,11 @@ TAO/tests/MT_Server/run_test.pl: !ST
 TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM
 TAO/tests/Connect_Strategy_Test/run_test.pl:
 # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
-TAO/tests/Server_Leaks/run_test.pl:
+TAO/tests/Server_Leaks/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 TAO/tests/Smart_Proxies/Policy/run_test.pl: !VxWorks
 TAO/tests/Smart_Proxies/run_test.pl:
 TAO/tests/Smart_Proxies/dtor/run_test.pl:
-TAO/tests/Stack_Recursion/run_test.pl: !ST
+TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC
 TAO/tests/Faults/run_test.pl: !VxWorks !MINIMUM !ST
 TAO/tests/CallbackTest/run_test.pl: !MINIMUM
 TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM
@@ -160,12 +177,14 @@ TAO/tests/Multiple/run_test.pl: !VxWorks !SUNCC5_1
 TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !ST
 TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
+TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
 TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
 TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !GIOP10
 TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !HAS_EXTENDED_FT_INTERCEPTORS
 TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
@@ -173,6 +192,10 @@ TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl: !MINIMUM !DISABLE_INT
 TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Slot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/ORT/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Object_Loader/run_test.pl: !VxWorks !STATIC
 TAO/tests/Two_Objects/run_test.pl: !ST
@@ -186,3 +209,31 @@ TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
 TAO/tests/CodeSets/simple/run_test.pl: !VxWorks !GIOP10 !STATIC
 TAO/tests/Hang_Shutdown/run_test.pl: !ST
 TAO/tests/Any/Recursive/run_test.pl:
+TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl collocated: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_orbthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_servants: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_csdthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote_big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl collocated: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_orbthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_servants: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_csdthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl remote_big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl collocated: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_orbthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_servants: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_csdthreads: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl remote_big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl big: !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !VxWorks
+TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !VxWorks
+TAO/tests/Permanent_Forward/run_test.pl:
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index 632b74d01a8..77f2b48b244 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -1,4 +1,3 @@
-
 # $Id$
 #
 # This is the list of run_test.pl's that need to be run by
@@ -10,23 +9,23 @@
 #
 # NOTE: This file contains examples and other service level test  for
 # TAO's. Please do not include regular tests here.
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !MINIMUM !ST !Win32
+TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MINIMUM !ST !Win32
 #TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !ST !STATIC !Win32
 TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32
 TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32
-TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32
-TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32
-TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !ST !Win32
-TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !Win32
-TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !Win32
-TAO/performance-tests/Latency/Deferred/run_test.pl: !MINIMUM !Win32
-TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32
-TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32
-TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32
-TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST !Win32
-TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !Win32
-TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !Win32
-TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Latency/AMI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !ST !Win32
+TAO/performance-tests/Latency/DSI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32
+TAO/performance-tests/Latency/DII/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32
+TAO/performance-tests/Latency/Deferred/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32
+TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC
+TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC
 TAO/performance-tests/Throughput/run_test.pl: !Win32
 TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32
 TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !Win32
@@ -48,42 +47,48 @@ TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING
 TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING
 TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32
 TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32
-TAO/examples/Quoter/run_test.pl: !MINIMUM !Win32
+TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32
 TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1
 TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP
 TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP
-TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !Win32
-TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
-TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM
+TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
 #TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM
 #TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
-TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl: !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM !NO_IFR
-TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !MINIMUM !NO_MESSAGING
+TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !LynxOS !MINIMUM !NO_MESSAGING
 TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !NO_IFR
 TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !NO_MESSAGING
 TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM
+TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !ST !NO_MESSAGING
 TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !STATIC !SUNCC5_1
+TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !STATIC
 TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING
-TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING
-TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM
+TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC
+TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !ACE_FOR_TAO
 TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !SUNCC5_1
 TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM
 TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !STATIC
+TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM
 TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
@@ -91,6 +96,7 @@ TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTOR
 TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:  !MINIMUM !NO_IFR !STATIC
 TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:  !MINIMUM !NO_IFR
 TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:  !MINIMUM !NO_IFR
+TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:  !MINIMUM !NO_IFR
 TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:  !MINIMUM !NO_IFR
 TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:  !MINIMUM !NO_IFR
 TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM
@@ -98,53 +104,54 @@ TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM Win32
-TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM
+TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC
 TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM
+TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC
 TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM
 TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !STATIC !ST
-TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM
-TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !IRIX
-TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !NO_IFR
+TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !IRIX !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
+TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86
+TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO
 TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC
 TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC
-TAO/orbsvcs/tests/EC_Mcast/run_test.pl: !NO_MCAST !NO_MESSAGING
+TAO/orbsvcs/tests/EC_Mcast/run_test.pl: !NO_MCAST !NO_MESSAGING !DISABLE_ToFix_LynxOS_PPC
 # 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
+TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
 #HANGS TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane
 #HANGS'TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir
-TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC
-TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC
-TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC
-TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC
-TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC
-TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC
+TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS
+#Bug 1647. run_test_harsh.pl takes 5 minutes; but there aren't many SSL builds
+TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 !NO_MCAST
 # The following 2 tests use dynamic loading to change the default reactor on Windows
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC
-TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !NO_LOADAVG
-TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !ST
-TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS  !STATIC !ST
-TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST
-TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING
-TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING
-TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING
+TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !NO_LOADAVG !DISABLE_ToFix_LynxOS_x86
+TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO
+TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS  !STATIC !ST !ACE_FOR_TAO
+TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO
+TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
+TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO
+TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO
 TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !MINIMUM
diff --git a/configure.ac b/configure.ac
index 8fef664dc15..376d524eef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,6 +208,18 @@ dnl Determine which subsets to build
 dnl This is done using the autoconf "--enable-foobar" mechanism.
 ACE_CHECK_SUBSETS
 
+dnl Some of the third party libraries (X11, openssl, etc.) depend on 
+dnl other libraries.  Check for those before the processing --enable
+dnl options.
+
+dnl Check if the socket library is available
+AC_SEARCH_LIBS([socket],[socket],,,[-lnsl])
+
+dnl Check for gethostbyname in -lnsl since some platforms (e.g. Solaris)
+dnl put it there.
+AC_SEARCH_LIBS([gethostbyname],[nsl],,)
+
+
 dnl Add --{enable,disable,with,without}-feature options.
 ACE_CONFIGURATION_OPTIONS
 ACE_COMPILATION_OPTIONS
@@ -235,9 +247,6 @@ dnl Platform specific libraries needed for ACE's autoconf tests
 dnl that currently do not have tests themselves.
 dnl Platform specific flags
 case "$host" in
-  *freebsd*)
-    LIBS="$LIBS -lcompat"
-    ;;
   *osf3.2*)
     LIBS="$LIBS -lmach -lsys5 -lcxx -lc"
     ;;
@@ -312,19 +321,10 @@ AC_SEARCH_LIBS([dlopen],[dl svld],[ace_has_svr4_dynamic_linking=yes],
    AC_CHECK_LIB([dld],[shl_get],,)
   ])
 
-dnl Check if the socket library is available
-AC_SEARCH_LIBS([socket],[socket],,,[-lnsl])
-
-dnl Check for gethostbyname in -lnsl since some platforms (e.g. Solaris)
-dnl put it there.
-AC_SEARCH_LIBS([gethostbyname],[nsl],,)
-
 dnl Check for getservbyname in -lxnet since some platforms (e.g. Solaris)
 dnl may put it there.
 AC_SEARCH_LIBS([getservbyname],[socket xnet],,[AC_DEFINE([ACE_LACKS_GETSERVBYNAME])],[-lnsl])
 
-ACE_CHECK_LACKS_FUNCS(inet_aton)
-
 dnl Check for compile() regex function in -lgen.  Solaris, for example,
 dnl may put it there.
 AC_SEARCH_LIBS([compile],[gen],,)
@@ -600,6 +600,8 @@ ACE_CHECK_LACKS_HEADERS(fcntl.h)
 
 ACE_CHECK_HAS_HEADERS(pthread_np.h)
 
+ACE_CHECK_LACKS_HEADERS(sched.h)
+
 ACE_CHECK_LACKS_HEADERS(search.h)
 
 ACE_CHECK_HAS_HEADERS(select.h)
@@ -648,10 +650,22 @@ ACE_CHECK_LACKS_HEADERS(sys/socket.h)
 
 ACE_CHECK_LACKS_HEADERS(sys/stat.h)
 
-ACE_CHECK_LACKS_HEADERS(sys/time.h)
-
+dnl Test for <sys/types.h> out of alphabetical order, since it must
+dnl be (conditionally) #included in other feature tests.
 ACE_CHECK_LACKS_HEADERS(sys/types.h)
 
+ACE_CHECK_LACKS_HEADERS(sys/sysctl.h, [], [], 
+[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifndef ACE_LACKS_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+])
+
+ACE_CHECK_LACKS_HEADERS(sys/time.h)
+
 ACE_CHECK_LACKS_HEADERS(sys/uio.h)
 
 ACE_CHECK_LACKS_HEADERS(sys/un.h)
@@ -907,16 +921,6 @@ AS_IF([test "$ace_has_xti" = yes || test "$ace_has_tli" = yes],
 
  ],[])
 
-AC_CHECK_HEADER([sys/time.h],
-  [
-   dnl This is a weak test.
-   AC_EGREP_HEADER([sys/time.h],[time.h],
-     ,
-      [
-       AC_DEFINE([ACE_LACKS_SYSTIME_H])
-      ])
-  ],)
-
 dnl See the notes about ACE_LACKS_MMAP in the functions section of this
 dnl configure script.
 dnl                       -Ossama
@@ -1069,17 +1073,6 @@ ACE_CACHE_CHECK([for old malloc() prototype],
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
 
-dnl Check for getopt() prototype
-AC_CHECK_DECL([getopt],
-              [],
-              [AC_DEFINE([ACE_LACKS_GETOPT_PROTOTYPE], 1,
-                         [Define to 1 if platform lacks the declaration
-                         of getopt().])],
-              [#include <stdlib.h>
-              #ifndef ACE_LACKS_UNISTD_H
-              # include <unistd.h>
-              #endif])
-
 dnl Check for *_timedwait() prototypes
 dnl TODO: We only check for one of the *_timedwait() prototypes.
 dnl       Is this enough?
@@ -1091,22 +1084,6 @@ AC_CHECK_DECL([recv_timedwait],
               [#include <pthread.h>
 	       #include <fcntl.h>])
 
-dnl Check for ualarm prototype
-AC_CHECK_DECL([ualarm],
-              [],
-	      [AC_DEFINE([ACE_LACKS_UALARM_PROTOTYPE], 1,
-	                 [Define to 1 if platform lacks the declaration
-			 of ualarm().])],
-              [#include <unistd.h>])
-
-dnl Check for getrusage prototype in sys/resource.h
-AC_CHECK_DECL([getrusage],
-	      [AC_DEFINE([ACE_HAS_GETRUSAGE_PROTOTYPE], 1,
-			 [Define to 1 if platform has the declaration
-			 of getrusage().])],
-	      [],
-	      [#include <sys/resource.h>])
-
 dnl Check for {get,set}rlimit prototypes
 AC_CHECK_DECL([getrlimit],[],[],[#include <sys/resource.h>])
 AC_CHECK_DECL([setrlimit],[],[],[#include <sys/resource.h>])
@@ -1150,6 +1127,16 @@ dnl AC_CHECK_TYPE([off64_t],[long long])
 
 dnl Specific typedef checks
 dnl TODO: Check whether these typedefs can be defined somewhere else.
+AC_CHECK_TYPE([cpu_set_t],
+	      [AC_DEFINE([ACE_HAS_CPU_SET_T], 1,
+			 [Define to 1 if the system has the type `cpu_set_t'.])],
+	      [],
+	      [
+#if !defined(ACE_LACKS_SCHED_H)
+#include <sched.h>
+#endif
+	      ])
+
 AC_CHECK_TYPE([idtype_t],
 	      [AC_DEFINE([ACE_HAS_IDTYPE_T], 1,
 			 [Define to 1 if the system has the type `idtype_t'.])],
@@ -1182,6 +1169,19 @@ AC_CHECK_TYPE([ssize_t],
 	      [],
 	      [#include <sys/types.h>])
 
+AC_CHECK_TYPE([suseconds_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_SUSECONDS_T], 1,
+			 [Define to 1 if the system lacks the type 'suseconds_t'.])],
+	      [#include <sys/types.h>])
+
+AC_CHECK_TYPE([useconds_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_USECONDS_T], 1,
+			 [Define to 1 if the system lacks the type 'useconds_t'.])],
+	      [#include <sys/types.h>])
+
+
 dnl Some platforms define ucontext_t in <sys/ucontext.h>, but ACE
 dnl doesn't explicitly include that header.  However, it is very
 dnl likely that <signal.h> does, either directly or indirectly.
@@ -1393,11 +1393,10 @@ ACE_CACHE_CHECK([for POSIX timer structure],
  [ace_cv_lib_posix_timer_struct],
  [
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
+#if !defined(ACE_LACKS_SYS_TIME_H)
 # include <sys/time.h>
 #endif
+#include <time.h>
         ]],[[
          timespec sr;
         ]])],[
@@ -1408,10 +1407,6 @@ ACE_CACHE_CHECK([for POSIX timer structure],
          AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
            [[
 #include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
            ]],
            [[
             timestruc_t sr;
@@ -1469,10 +1464,6 @@ ACE_CACHE_CHECK([for timespec_t],
     [ace_cv_lib_posix_timespec_t],[
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
         ]],[[
          timespec_t tt;
         ]])],[
@@ -1512,10 +1503,6 @@ ACE_CACHE_CHECK([for broken struct timespec members],
   [
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
         ]],[[
          timespec sr;
          sr.ts_sec  = 0;
@@ -1572,22 +1559,30 @@ if test "$ace_cv_struct_siginfo_t" = yes; then
 fi dnl test "$ace_cv_struct_siginfo_t" = yes
 
 dnl Check for sin_len member in struct sockaddr_in
-ACE_CACHE_CHECK([for sin_len member in struct sockaddr_in],
-    [ace_cv_lib_has_sin_len],[
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
+		[AC_DEFINE([ACE_HAS_SOCKADDR_IN_SIN_LEN], 1,
+		           [Define to 1 if `sin_len' is a member of `sockaddr_in'.])],
+		[],
+		[
 #ifndef ACE_LACKS_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <sys/socket.h>
 #include <netinet/in.h>
-          ]],[[
-           sockaddr_in ace_sin;
-           ace_sin.sin_len = sizeof(ace_sin);
-          ]])],[
-           ace_cv_lib_has_sin_len=yes
-          ],[
-           ace_cv_lib_has_sin_len=no
-          ])
-],[AC_DEFINE([ACE_HAS_SIN_LEN])],)
+		])
+
+dnl Check for sin6_len member in struct sockaddr_in6
+AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
+		[AC_DEFINE([ACE_HAS_SOCKADDR_IN6_SIN6_LEN], 1,
+		           [Define to 1 if `sin6_len' is a member of `sockaddr_in6'.])],
+		[],
+		[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+		])
 
 dnl Check for sys_siglist
 dnl TODO: Check whether this variable can be defined somewhere else.
@@ -1947,6 +1942,17 @@ AC_CHECK_TYPE([uint64_t],
 #include <inttypes.h>
 #endif])
 
+AC_CACHE_CHECK([for std::numeric_limits<>],
+[ace_func_numeric_limits],
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <limits>],
+		  [return std::numeric_limits<int>::max();])],
+		  [ace_cv_func_numeric_limits=yes],
+		  [ace_cv_func_numeric_limits=no])])
+if test $ace_cv_func_numeric_limits = no; then
+  AC_DEFINE([ACE_LACKS_NUMERIC_LIMITS], 1,
+	    [Define to 1 if platfom lacks std::numeric_limits<>.])
+fi
+
 
 dnl Other checks
 
@@ -3305,6 +3311,13 @@ AC_CACHE_SAVE
 
 dnl SECTION 10: checks for library functions
 
+ACE_FUNC_STRCASECMP
+ACE_FUNC_STRNCASECMP
+ACE_FUNC_STRDUP
+ACE_FUNC_WCSCASECMP
+ACE_FUNC_WCSNCASECMP
+ACE_FUNC_WCSDUP
+
 if test "$ace_user_enable_alloca" = yes; then
   AC_FUNC_ALLOCA
   if test "$ac_cv_header_alloca_h" = yes; then
@@ -3423,13 +3436,32 @@ esac
 
 ACE_CHECK_LACKS_FUNCS(access)
 
+ACE_CHECK_LACKS_FUNCS(alarm)
+
 ACE_CHECK_LACKS_FUNCS(bsearch)
 
+ACE_CHECK_LACKS_FUNCS(chdir)
+
 ACE_CHECK_HAS_FUNCS(clock_gettime clock_settime nanosleep)
 
 ACE_CHECK_LACKS_FUNCS(difftime)
 
-ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fsync)
+ACE_CHECK_LACKS_FUNCS(dup)
+
+ACE_CHECK_LACKS_FUNCS(dup2)
+
+dnl ACE uses execv, execvp and execve, so we don't bother to check
+dnl for the others (e.g. execl, execlp, execle)
+AC_CHECK_FUNC(execv)
+AC_CHECK_FUNC(execvp)
+AC_CHECK_FUNC(execve)
+if test "$ac_cv_func_execv" != yes &&
+   test "$ac_cv_func_execvp" != yes &&
+   test "$ac_cv_func_execve" != yes; then
+  AC_DEFINE([ACE_LACKS_EXEC])
+fi
+
+ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fork fsync)
 
 ACE_CHECK_LACKS_FUNCS(gethostent)
 
@@ -3439,16 +3471,201 @@ ACE_CHECK_LACKS_FUNCS(getipnodebyname)
 
 ACE_CHECK_HAS_FUNCS(getifaddrs)
 
+ACE_CHECK_LACKS_FUNCS(getegid geteuid getgid)
+
+ACE_CHECK_LACKS_FUNCS(getopt)
+if test $ac_cv_func_getopt = yes; then
+    AC_CHECK_DECL([getopt],
+		  [],
+		  [AC_DEFINE([ACE_LACKS_GETOPT_PROTOTYPE], 1,
+			     [Define to 1 if platform lacks the declaration
+			     of getopt().])],
+		  [#include <stdlib.h>
+		  #ifndef ACE_LACKS_UNISTD_H
+		  # include <unistd.h>
+		  #endif])
+fi
+
+AC_CHECK_FUNC([getpagesize],
+  [AC_DEFINE([ACE_HAS_GETPAGESIZE])],
+  [AC_DEFINE([ACE_PAGE_SIZE], [4096])])
+
+ACE_CHECK_LACKS_FUNCS(getpid)
+
+ACE_CHECK_LACKS_FUNCS([getpgid])
+if test "$ac_cv_func_getpgid" = yes; then
+  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+  dnl needed to make the getpgid() prototype visible.
+  ACE_CACHE_CHECK([for getpgid prototype],
+    [ace_cv_lib_has_getpgid_prototype],
+    [
+     ace_save_CPPFLAGS="$CPPFLAGS"
+     ace_no_xopen="-U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+     AC_EGREP_HEADER([[^_]+getpgid], [unistd.h],
+       [
+        ace_cv_lib_has_getpgid_prototype=yes
+       ],
+       [
+        ace_cv_lib_has_getpgid_prototype=no
+       ])
+     dnl Reset the compiler flags
+     CPPFLAGS="$ace_save_CPPFLAGS"
+    ],, [AC_DEFINE([ACE_LACKS_GETPGID_PROTOTYPE])])
+  AH_TEMPLATE([ACE_LACKS_GETPGID_PROTOTYPE],
+  [Define to 1 if platform lacks getpgid() declaration in <unistd.h>.])
+fi
+
+ACE_CHECK_LACKS_FUNCS(getppid)
+
+ACE_CHECK_HAS_FUNCS(getrusage)
+if test $ac_cv_func_getrusage = yes; then
+    AC_CHECK_DECL([getrusage],
+		  [AC_DEFINE([ACE_HAS_GETRUSAGE_PROTOTYPE], 1,
+			     [Define to 1 if platform has the declaration
+			     of getrusage().])],
+		  [],
+		  [#include <sys/resource.h>])
+fi
+
+ACE_CHECK_LACKS_FUNCS(getuid)
+
+ACE_CHECK_LACKS_FUNCS(inet_aton)
+
+ACE_CHECK_LACKS_FUNCS(isatty)
+
 ACE_CHECK_HAS_FUNCS(itoa)
 
+dnl Check for 64 bit llseek() or lseek64()
+case "$host" in
+  *UnixWare7*)
+    dnl Skip the check
+    ;;
+  *)
+    ACE_CHECK_LSEEK64
+    ;;
+esac
+
+ACE_CHECK_LACKS_FUNCS(kill)
+
+ACE_CHECK_LACKS_FUNCS(lstat)
+
+ACE_CHECK_LACKS_FUNCS(madvise)
+if test $ac_cv_func_madvise = yes; then
+    AC_CHECK_DECL([madvise],
+		  [],
+		  [AC_DEFINE([ACE_LACKS_MADVISE_PROTOTYPE], 1,
+			     [Define to 1 if platform lacks the declaration
+			     of madvise().])],
+		  [
+#if !defined(ACE_LACKS_SYS_TYPES_H)
+# include <sys/types.h>
+#endif
+#include <sys/mman.h>
+		  ])
+fi
+
+ACE_CHECK_HAS_FUNCS(memchr)
+
+ACE_CHECK_LACKS_FUNCS(mkfifo mkstemp mktemp)
+
+ACE_CHECK_LACKS_FUNCS(msync mprotect)
+
+ACE_CHECK_LACKS_FUNCS(pipe)
+
 ACE_CHECK_LACKS_FUNCS(qsort)
 
+ACE_CHECK_LACKS_FUNCS(setegid seteuid setgid)
+
+ACE_CHECK_LACKS_FUNCS([setpgid])
+if test "$ac_cv_func_setpgid" = yes; then
+  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+  dnl needed to make the setpgid() prototype visible.
+  ACE_CACHE_CHECK([for setpgid prototype],
+    [ace_cv_lib_has_setpgid_prototype],
+    [
+     ace_save_CPPFLAGS="$CPPFLAGS"
+     ace_no_xopen="-U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+     AC_EGREP_HEADER([[^_]+setpgid], [unistd.h],
+       [
+        ace_cv_lib_has_setpgid_prototype=yes
+       ],
+       [
+        ace_cv_lib_has_setpgid_prototype=no
+       ])
+     dnl Reset the compiler flags
+     CPPFLAGS="$ace_save_CPPFLAGS"
+    ],, [AC_DEFINE([ACE_LACKS_SETPGID_PROTOTYPE])])
+  AH_TEMPLATE([ACE_LACKS_SETPGID_PROTOTYPE],
+  [Define to 1 if platform lacks setpgid() declaration in <unistd.h>.])
+fi
+
+ACE_CHECK_LACKS_FUNCS([setregid])
+if test "$ac_cv_func_setregid" = yes; then
+  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+  dnl needed to make the setregid() prototype visible.
+  ACE_CACHE_CHECK([for setregid prototype],
+    [ace_cv_lib_has_setregid_prototype],
+    [
+     ace_save_CPPFLAGS="$CPPFLAGS"
+     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+     AC_EGREP_HEADER([[^_]+setregid], [unistd.h],
+       [
+        ace_cv_lib_has_setregid_prototype=yes
+       ],
+       [
+        ace_cv_lib_has_setregid_prototype=no
+       ])
+     dnl Reset the compiler flags
+     CPPFLAGS="$ace_save_CPPFLAGS"
+    ],, [AC_DEFINE([ACE_LACKS_SETREGID_PROTOTYPE])])
+  AH_TEMPLATE([ACE_LACKS_SETREGID_PROTOTYPE],
+  [Define to 1 if platform lacks setregid() declaration in <unistd.h>.])
+fi
+
+ACE_CHECK_LACKS_FUNCS([setreuid])
+if test "$ac_cv_func_setreuid" = yes; then
+  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
+  dnl needed to make the setreuid() prototype visible.
+  ACE_CACHE_CHECK([for setreuid prototype],
+    [ace_cv_lib_has_setreuid_prototype],
+    [
+     ace_save_CPPFLAGS="$CPPFLAGS"
+     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
+     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
+     AC_EGREP_HEADER([[^_]+setreuid], [unistd.h],
+       [
+        ace_cv_lib_has_setreuid_prototype=yes
+       ],
+       [
+        ace_cv_lib_has_setreuid_prototype=no
+       ])
+     dnl Reset the compiler flags
+     CPPFLAGS="$ace_save_CPPFLAGS"
+    ],, [AC_DEFINE([ACE_LACKS_SETREUID_PROTOTYPE])])
+  AH_TEMPLATE([ACE_LACKS_SETREUID_PROTOTYPE],
+  [Define to 1 if platform lacks setreuid() declaration in <unistd.h>.])
+fi
+
+ACE_CHECK_LACKS_FUNCS(setsid setuid)
+
+ACE_CHECK_LACKS_FUNCS(sigaction)
+
 ACE_CHECK_HAS_FUNCS(strnlen)
 
+ACE_CHECK_LACKS_FUNCS(strchr)
+
+# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR 
+# feature test macros are currently used.
+ACE_CHECK_HAS_FUNCS(strerror)
 ACE_CHECK_LACKS_FUNCS(strerror)
 
 ACE_CHECK_LACKS_FUNCS(strpbrk)
 
+ACE_CHECK_LACKS_FUNCS(strrchr)
+
 ACE_CHECK_LACKS_FUNCS(strspn)
 
 ACE_CHECK_LACKS_FUNCS(strtod)
@@ -3458,9 +3675,9 @@ ACE_CHECK_LACKS_FUNCS(strtol)
 ACE_CHECK_LACKS_FUNCS(strtoul)
 
 # swab() comes in a number of forms:
-#   swab (const void*, void*, ssize_t) is POSIX, XPG4, SUS, SUSv2 standard.
-#   swab (const char*, char*, ssize_t) is SVID third edition.
-#   swab (char*, char*, ssize_t) is on some odd platforms like Windows.
+#   swab (const void*, void*, size_t) is POSIX, XPG4, SUS, SUSv2 standard.
+#   swab (const char*, char*, size_t) is SVID third edition.
+#   swab (char*, char*, size_t) is on some odd platforms like Windows.
 # So, if swab() is available, figure out which of the three variants it is.
 # The second and third have ACE config settings.
 ACE_CHECK_LACKS_FUNCS([swab],
@@ -3506,16 +3723,18 @@ swab (src, dst, 2);
     ],
 )
 
-dnl ACE uses execv, execvp and execve, so we don't bother to check
-dnl for the others (e.g. execl, execlp, execle)
-AC_CHECK_FUNC(execv)
-AC_CHECK_FUNC(execvp)
-AC_CHECK_FUNC(execve)
-if test "$ac_cv_func_execv" != yes &&
-   test "$ac_cv_func_execvp" != yes &&
-   test "$ac_cv_func_execve" != yes; then
-  AC_DEFINE([ACE_LACKS_EXEC])
-fi
+ACE_CHECK_LACKS_FUNCS(sysconf)
+
+ACE_CHECK_HAS_FUNCS(sysctl)
+
+AC_CHECK_FUNC([sysinfo],
+  [
+   if test "$ac_cv_header_sys_systeminfo_h" = yes; then
+     AC_DEFINE([ACE_HAS_SYSINFO])
+   fi
+  ],)
+
+ACE_CHECK_LACKS_FUNCS(system)
 
 AC_CHECK_FUNC([getmsg],
   [
@@ -3565,16 +3784,6 @@ main ()
 
 AC_CHECK_FUNC([gethostbyaddr],,)
 
-dnl Check for 64 bit llseek() or lseek64()
-case "$host" in
-  *UnixWare7*)
-    dnl Skip the check
-    ;;
-  *)
-    ACE_CHECK_LSEEK64
-    ;;
-esac
-
 AC_CHECK_FUNC([bind],
   [
    ACE_CACHE_CHECK([if bind() will select the port if it is zero],
@@ -3703,17 +3912,11 @@ AC_CHECK_FUNC([pread],
 
 ACE_CHECK_LACKS_FUNCS(readv writev)
 
-AC_CHECK_FUNC([set_t_errno], [AC_DEFINE([ACE_HAS_SET_T_ERRNO])],)
+ACE_CHECK_HAS_FUNCS(set_t_errno)
 
 ACE_CHECK_HAS_FUNCS(sigsuspend sigtimedwait)
 
-ACE_CHECK_LACKS_FUNCS(socketpair strcasecmp)
-
-AC_CHECK_FUNC([strdup],
-  ,
-  [AC_DEFINE([ACE_HAS_STRDUP_EMULATION])])
-
-ACE_CHECK_LACKS_FUNCS(strrchr)
+ACE_CHECK_LACKS_FUNCS(socketpair)
 
 AC_CHECK_FUNC([strptime],
   [
@@ -3741,8 +3944,6 @@ AC_CHECK_FUNC([strptime],
    AC_DEFINE([ACE_LACKS_NATIVE_STRPTIME])
   ])
 
-ACE_CHECK_HAS_FUNCS(memchr)
-
 if test "$ac_cv_type_wchar_t" = yes; then
   AC_CHECK_FUNC([wcslen],
     [AC_DEFINE([ACE_HAS_XPG4_MULTIBYTE_CHAR])],)
@@ -3750,8 +3951,6 @@ fi
 
 ACE_CHECK_LACKS_FUNCS(syscall)
 
-ACE_CHECK_HAS_FUNCS(ualarm)
-
 AC_CHECK_FUNC([alarm],,)
 AC_CHECK_FUNC([signal],,)
 
@@ -3760,8 +3959,6 @@ if test "$ac_cv_func_alarm" != yes &&
   AC_DEFINE([ACE_LACKS_UNIX_SIGNALS])
 fi
 
-ACE_CHECK_LACKS_FUNCS(fork)
-
 AC_CHECK_FUNC([getrlimit])
 AC_CHECK_FUNC([setrlimit])
 if test "$ac_cv_func_getrlimit" != yes ||
@@ -3769,102 +3966,7 @@ if test "$ac_cv_func_getrlimit" != yes ||
   AC_DEFINE([ACE_LACKS_RLIMIT])
 fi
 
-AC_CHECK_FUNC([sysinfo],
-  [
-   if test "$ac_cv_header_sys_systeminfo_h" = yes; then
-     AC_DEFINE([ACE_HAS_SYSINFO])
-   fi
-  ],)
-
-ACE_CHECK_HAS_FUNCS(strerror)
-
-ACE_CHECK_LACKS_FUNCS(lstat readlink rename recvmsg sendmsg)
-
-ACE_CHECK_HAS_FUNCS(getrusage)
-
-ACE_CHECK_LACKS_FUNCS([getpgid])
-if test "$ac_cv_func_getpgid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the getpgid() prototype visible.
-  ACE_CACHE_CHECK([for getpgid prototype],
-    [ace_cv_lib_has_getpgid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+getpgid], [unistd.h],
-       [
-        ace_cv_lib_has_getpgid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_getpgid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_GETPGID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_GETPGID_PROTOTYPE],
-  [Define to 1 if platform lacks getpgid() declaration in <unistd.h>.])
-fi
-
-ACE_CHECK_LACKS_FUNCS(getppid)
-
-ACE_CHECK_LACKS_FUNCS([setregid])
-if test "$ac_cv_func_setregid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the setregid() prototype visible.
-  ACE_CACHE_CHECK([for setregid prototype],
-    [ace_cv_lib_has_setregid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+setregid], [unistd.h],
-       [
-        ace_cv_lib_has_setregid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_setregid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_SETREGID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_SETREGID_PROTOTYPE],
-  [Define to 1 if platform lacks setregid() declaration in <unistd.h>.])
-fi
-
-ACE_CHECK_LACKS_FUNCS([setreuid])
-if test "$ac_cv_func_setreuid" = yes; then
-  dnl Check if _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED macros are
-  dnl needed to make the setreuid() prototype visible.
-  ACE_CACHE_CHECK([for setreuid prototype],
-    [ace_cv_lib_has_setreuid_prototype],
-    [
-     ace_save_CPPFLAGS="$CPPFLAGS"
-     ace_no_xopen="-U_BSD_SOURCE -U_XOPEN_SOURCE -U_XOPEN_SOURCE_EXTENDED"
-     CPPFLAGS="$CPPFLAGS $ace_no_xopen"
-     AC_EGREP_HEADER([[^_]+setreuid], [unistd.h],
-       [
-        ace_cv_lib_has_setreuid_prototype=yes
-       ],
-       [
-        ace_cv_lib_has_setreuid_prototype=no
-       ])
-     dnl Reset the compiler flags
-     CPPFLAGS="$ace_save_CPPFLAGS"
-    ],, [AC_DEFINE([ACE_LACKS_SETREUID_PROTOTYPE])])
-  AH_TEMPLATE([ACE_LACKS_SETREUID_PROTOTYPE],
-  [Define to 1 if platform lacks setreuid() declaration in <unistd.h>.])
-fi
-
-AC_CHECK_FUNC([getpagesize],
-  [AC_DEFINE([ACE_HAS_GETPAGESIZE])],
-  [AC_DEFINE([ACE_PAGE_SIZE], [4096])])
-
-ACE_CHECK_LACKS_FUNCS(msync mprotect mkfifo)
-
-ACE_CHECK_LACKS_FUNCS(mkstemp mktemp)
-
-ACE_CHECK_LACKS_FUNCS(madvise)
+ACE_CHECK_LACKS_FUNCS(readlink rename recvmsg sendmsg)
 
 if test "$ac_cv_header_sys_priocntl_h" = yes; then
   AC_CHECK_FUNC([priocntl],
@@ -3896,12 +3998,26 @@ fi dnl test "$ac_cv_header_sys_priocntl_h" = yes
 dnl FIXME:  How do we check for a working sbrk()?  Do we need to?
 ACE_CHECK_LACKS_FUNCS(sbrk)
 
-ACE_CHECK_HAS_FUNCS(vfwprintf vswprintf)
-
-ACE_CHECK_LACKS_FUNCS(fgetws fputws itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcsicmp wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
+ACE_CHECK_HAS_FUNCS(ualarm)
+if test $ac_cv_func_ualarm = yes; then
+    AC_CHECK_DECL([ualarm],
+		  [],
+		  [AC_DEFINE([ACE_LACKS_UALARM_PROTOTYPE], 1,
+			     [Define to 1 if platform lacks the declaration
+			     of ualarm().])],
+		  [#include <unistd.h>])
+fi
 
 ACE_CHECK_LACKS_FUNCS(umask)
 
+ACE_CHECK_LACKS_FUNCS(uname)
+
+ACE_CHECK_LACKS_FUNCS(unlink)
+
+ACE_CHECK_HAS_FUNCS(vfwprintf vswprintf)
+
+ACE_CHECK_LACKS_FUNCS(fgetws fputws itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
+
 if test "$ac_cv_func_wcstok" = yes; then
 dnl The wcstok() function varies with standards. Check which one we have.
 AC_MSG_CHECKING([for 2- or 3-param wcstok])
@@ -3916,7 +4032,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
            wchar_t *p = wcstok (str, delim, &ptr);
           ]])],
           [
-           AC_DEFINE([ACE_HAS_3_PARAM_WCSTOK])
+           AC_DEFINE([ACE_HAS_3_PARAM_WCSTOK], 1,
+		     [Define to 1 if platform has 3 parameter wcstok()])
            AC_MSG_RESULT([3])
           ],
           [
@@ -4050,8 +4167,15 @@ WE_HAVE_SHARED_POSIX_SEMAPHORES
     [
      AC_DEFINE([ACE_HAS_POSIX_SEM])
 
-     AC_CHECK_FUNC([sem_open],
-       [
+     AC_CHECK_FUNC([sem_open])
+     AC_CHECK_FUNC([sem_close])
+     AC_CHECK_FUNC([sem_unlink])
+     if test "$ac_cv_func_sem_open" = no ||
+        test "$ac_cv_func_sem_close" = no ||
+        test "$ac_cv_func_sem_unlink" = no; then
+
+        AC_DEFINE([ACE_LACKS_NAMED_POSIX_SEM])
+     else
         dnl Check if it works!  For example, in glibc 2.x sem_open exists
         dnl but it appears to be a stub.  However, it isn't listed as a
         dnl stub in <gnu/stubs.h> so the configure script thinks it is
@@ -4099,10 +4223,7 @@ main ()
               ace_cv_sem_open_works=yes
              ])
           ],, [AC_DEFINE([ACE_LACKS_NAMED_POSIX_SEM])])
-       ],
-       [
-        AC_DEFINE([ACE_LACKS_NAMED_POSIX_SEM])
-       ])
+       fi
     ],)
 
 fi dnl check for POSIX Semaphore functions
@@ -4309,6 +4430,104 @@ dnl Check for Unix98 pthreads extensions
 
   ACE_CHECK_HAS_FUNCS(pthread_continue pthread_continue_np pthread_resume_np pthread_suspend pthread_suspend_np)
   ACE_CHECK_HAS_FUNCS(pthread_getconcurrency pthread_setconcurrency)
+  ACE_CHECK_HAS_FUNCS(pthread_attr_setcreatesuspend_np)
+
+  ACE_CHECK_HAS_FUNCS(pthread_getaffinity_np pthread_setaffinity_np)
+
+dnl Linux's sched_{set,get}affinity interface has changed three times:
+dnl
+dnl In glibc 2.3.2, it was: 
+dnl
+dnl   int sched_setaffinity(pid_t __pid, 
+dnl                         unsigned int __len, unsigned long * __mask);
+dnl
+dnl In glibc 2.3.3, it was changed to:
+dnl
+dnl   int sched_setaffinity(pid_t __pid, const cpu_set_t* __mask);
+dnl
+dnl And in glibc ?.?.?, it was changed again to:
+dnl
+dnl   int sched_setaffinity(pid_t __pid, size_t __cpusetsize, 
+dnl                         const cpu_set_t* __cpuset);
+dnl
+dnl The following feature tests attempt to determine which (if any)
+dnl version is supported by the system.  A further complication is
+dnl that the C library may support one version, the kernel may not,
+dnl and vice versa.
+dnl
+dnl As of this writing, ACE's ACE_OS::sched_setaffinity() wrapper
+dnl facade implementation only supports the latter two varients.  So
+dnl if the system doesn't define cpu_set_t, we simply avoid checking
+dnl for sched_setaffinity().  No attempt is made to verify C library /
+dnl kernel consistency.
+dnl
+dnl The "right" thing to do is to implement something similar to the
+dnl PLPA (Portable Linux Processor Affinity) Library, converting the
+dnl arguments and invoking the syscall directly (instead of calling
+dnl the C library wrapper).
+dnl
+
+if test "$ac_cv_type_cpu_set_t" = yes; then
+
+  ACE_CHECK_HAS_FUNCS(sched_getaffinity)
+if test "$ac_cv_func_sched_getaffinity" = yes; then
+dnl The sched_getaffinity() function varies between linux versions
+dnl Check which one we have.
+AC_MSG_CHECKING([for 2- or 3-param sched_getaffinity])
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+          [[
+#if !defined(ACE_LACKS_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+#if !defined(ACE_LACKS_SCHED_H)
+#include <sched.h>
+#endif
+          ]],
+          [[
+	   pid_t pid;
+	   cpu_set_t cpuset;
+           sched_getaffinity(pid, sizeof(cpuset), &cpuset);
+          ]])],
+          [
+           AC_MSG_RESULT([3])
+          ],
+          [
+           AC_MSG_RESULT([2])
+           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_GETAFFINITY], 1, 
+		     [Define to 1 if platform has 2 parameter sched_getaffinity()])
+          ])
+fi dnl test "$ac_cv_func_sched_getaffinity" = yes
+
+  ACE_CHECK_HAS_FUNCS(sched_setaffinity)
+if test "$ac_cv_func_sched_setaffinity" = yes; then
+dnl The sched_setaffinity() function varies between linux versions
+dnl Check which one we have.
+AC_MSG_CHECKING([for 2- or 3-param sched_setaffinity])
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+          [[
+#if !defined(ACE_LACKS_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+#if !defined(ACE_LACKS_SCHED_H)
+#include <sched.h>
+#endif
+          ]],
+          [[
+	   pid_t pid;
+	   cpu_set_t cpuset;
+           sched_setaffinity(pid, sizeof(cpuset), &cpuset);
+          ]])],
+          [
+           AC_MSG_RESULT([3])
+          ],
+          [
+           AC_MSG_RESULT([2])
+           AC_DEFINE([ACE_HAS_2_PARAM_SCHED_SETAFFINITY], 1, 
+		     [Define to 1 if platform has 2 parameter sched_setaffinity()])
+          ])
+fi dnl test "$ac_cv_func_sched_setaffinity" = yes
+
+fi dnl test "$ac_cv_type_cpu_set_t" = yes
 
   AC_CHECK_FUNC([pthread_rwlock_init],,)
   AC_CHECK_FUNC([pthread_rwlock_destroy],,)
@@ -5785,35 +6004,76 @@ AC_CACHE_CHECK([if msgrcv() takes a void* second argument],
   ])
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
-dnl TODO: This doesn't work.
-dnl The linux compiler issues a warning regarding the invalid void*
-dnl conversion.
-dnl
-dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
-dnl                                 -Ossama
-ACE_CONVERT_WARNINGS_TO_ERRORS(
-[
-dnl Check if shmat() takes a void* second argument
-AC_CACHE_CHECK([if shmat() takes a void* second argument],
-  [ace_cv_lib_posix_shmat_voidp_2],[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-# include <sys/ipc.h>
-# include <sys/shm.h>
-      ]], [[
-       int shmid = 0;
-       void* shmaddr = 0;
-       int shmflg = 0;
-       shmat(shmid, shmaddr, shmflg);
-      ]])],[
-       ace_cv_lib_posix_shmat_voidp_2=yes
-      ],[
-       ace_cv_lib_posix_shmat_voidp_2=no
+
+if test "$ac_cv_func_shmat" = yes; then
+    dnl TODO: This doesn't work.
+    dnl The linux compiler issues a warning regarding the invalid void*
+    dnl conversion.
+    dnl
+    dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
+    dnl                                 -Ossama
+    ACE_CONVERT_WARNINGS_TO_ERRORS(
+    [
+    dnl Check if shmat() takes a void* second argument
+    AC_CACHE_CHECK([if shmat() takes a void* second argument],
+      [ace_cv_lib_posix_shmat_voidp_2],[
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+           #ifndef ACE_LACKS_SYS_TYPES_H
+           # include <sys/types.h>
+           #endif
+           # include <sys/ipc.h>
+           # include <sys/shm.h>
+          ]], [[
+           int shmid = 0;
+           void* shmaddr = 0;
+           int shmflg = 0;
+           shmat(shmid, shmaddr, shmflg);
+          ]])],[
+           ace_cv_lib_posix_shmat_voidp_2=yes
+          ],[
+           ace_cv_lib_posix_shmat_voidp_2=no
+          ])
       ])
-  ])
-]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
+    ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
+    if test "$ace_cv_lib_posix_shmat_voidp_2" = no; then
+       AC_DEFINE([ACE_HAS_CHARPTR_SHMAT], 1,
+                 [Define to 1 if arg 2 of 'shmat' is char *'])
+    fi
+fi
+
+if test "$ac_cv_func_shmdt" = yes; then
+    dnl TODO: This doesn't work.
+    dnl The linux compiler issues a warning regarding the invalid void*
+    dnl conversion.
+    dnl
+    dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
+    dnl                                 -Ossama
+    ACE_CONVERT_WARNINGS_TO_ERRORS(
+    [
+    dnl Check if shmdt() takes a void* second argument
+    AC_CACHE_CHECK([if shmdt() takes a void* argument],
+      [ace_cv_lib_posix_shmdt_voidp],[
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+           #ifndef ACE_LACKS_SYS_TYPES_H
+           # include <sys/types.h>
+           #endif
+           # include <sys/ipc.h>
+           # include <sys/shm.h>
+          ]], [[
+           void* shmaddr = 0;
+           shmdt(shmaddr);
+          ]])],[
+           ace_cv_lib_posix_shmdt_voidp=yes
+          ],[
+           ace_cv_lib_posix_shmdt_voidp=no
+          ])
+      ])
+    ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
+    if test "$ace_cv_lib_posix_shmdt_voidp" = no; then
+       AC_DEFINE([ACE_HAS_CHARPTR_SHMDT], 1,
+                 [Define to 1 if arg 1 of 'shmdt' is char *'])
+    fi
+fi
 
 dnl TODO: This doesn't work.
 dnl The linux compiler issues a warning regarding the invalid void*
@@ -5943,10 +6203,6 @@ if test "$ace_cv_lib_voidptr_gettimeofday" = yes ||
      AC_EGREP_CPP([gettimeofday],
        [
 #include <time.h>
-
-#ifdef ACE_LACKS_SYSTIME_H
-# include <sys/time.h>
-#endif
        ],
        [
 dnl We have a gettimeofday prototype
@@ -5985,10 +6241,6 @@ if test "$ac_cv_func_ctime_r" = yes; then
 #endif
 
 #include <time.h>
-
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
        ]], [[
         const time_t *t = 0;
         char *buf;
@@ -6169,10 +6421,6 @@ ACE_CACHE_CHECK([for ctime() macro],
      [
 #include <time.h>
 
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-
 #if defined (ctime)
   ACE_CTIME_MACRO
 #endif
@@ -6198,10 +6446,6 @@ ACE_CACHE_CHECK([for reentrant function macros],
 
 #include <time.h>
 
-#if defined(ACE_LACKS_SYSTIME_H)
-# include <sys/time.h>
-#endif
-
 #if !defined (ACE_LACKS_PWD_H)
 # include <pwd.h>
 #endif
@@ -6827,7 +7071,8 @@ dnl   test "$ac_cv_func_pthread_getspecific" = yes &&
    test "$ac_cv_func_pthread_kill" = yes; then
   ace_has_pthreads=yes
   AC_MSG_RESULT([POSIX Threads Draft 4])
-  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT4])
+  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT4], 1,
+            [Platform supports POSIX Threads .4a Draft 4])
 dnl Check if we have Pthreads Draft 6
 elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
@@ -6839,7 +7084,8 @@ elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ac_cv_func_pthread_setintrtype" = yes; then
   ace_has_pthreads=yes
   AC_MSG_RESULT([POSIX Threads Draft 6])
-  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT6])
+  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT6], 1,
+            [Platform supports POSIX Threads .4a Draft 6])
 dnl Check if we have Pthreads Draft 7
 elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
@@ -6852,7 +7098,8 @@ elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ace_has_sched_yield" != yes; then
   ace_has_pthreads=yes
   AC_MSG_RESULT([POSIX Threads Draft 7])
-  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT7])
+  AC_DEFINE([ACE_HAS_PTHREADS_DRAFT7], 1,
+            [Platform supports POSIX Threads .1c Draft 7])
 dnl Check if we have Pthreads Draft Standard
 elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ac_cv_func_pthread_mutexattr_destroy" = yes &&
@@ -6865,7 +7112,8 @@ elif test "$ac_cv_func_pthread_mutexattr_init" = yes &&
    test "$ace_has_sched_yield" = yes; then
   ace_has_pthreads=yes
   AC_MSG_RESULT([POSIX Threads Draft Standard])
-  AC_DEFINE([ACE_HAS_PTHREADS_STD])
+  AC_DEFINE([ACE_HAS_PTHREADS_STD], 1,
+            [Platform supports POSIX.1c-1995 threads])
 else
   ace_has_pthreads=no
   AC_MSG_RESULT([none])
@@ -7612,98 +7860,6 @@ AC_CONFIG_FILES([
   apps/soreduce/Makefile
   bin/Makefile
   bin/PerlACE/Makefile
-  examples/Makefile
-  examples/APG/Makefile
-  examples/APG/Active_Objects/Makefile
-  examples/APG/Config/Makefile
-  examples/APG/Containers/Makefile
-  examples/APG/Logging/Makefile
-  examples/APG/Misc_IPC/Makefile
-  examples/APG/Naming/Makefile
-  examples/APG/Proactor/Makefile
-  examples/APG/Processes/Makefile
-  examples/APG/Reactor/Makefile
-  examples/APG/Shared_Memory/Makefile
-  examples/APG/Signals/Makefile
-  examples/APG/Sockets/Makefile
-  examples/APG/Streams/Makefile
-  examples/APG/Svc_Config/Makefile
-  examples/APG/ThreadManagement/Makefile
-  examples/APG/ThreadPools/Makefile
-  examples/APG/ThreadSafety/Makefile
-  examples/APG/Threads/Makefile
-  examples/APG/Timers/Makefile
-  examples/ASX/Makefile
-  examples/ASX/CCM_App/Makefile
-  examples/ASX/Message_Queue/Makefile
-  examples/Bounded_Packet_Relay/Makefile
-  examples/C++NPv1/Makefile
-  examples/C++NPv2/Makefile
-  examples/Connection/Makefile
-  examples/Connection/blocking/Makefile
-  examples/Connection/misc/Makefile
-  examples/Connection/non_blocking/Makefile
-  examples/DLL/Makefile
-  examples/Export/Makefile
-  examples/IOStream/Makefile
-  examples/IOStream/client/Makefile
-  examples/IOStream/server/Makefile
-  examples/IPC_SAP/Makefile
-  examples/IPC_SAP/ATM_SAP/Makefile
-  examples/IPC_SAP/DEV_SAP/Makefile
-  examples/IPC_SAP/DEV_SAP/reader/Makefile
-  examples/IPC_SAP/DEV_SAP/writer/Makefile
-  examples/IPC_SAP/FIFO_SAP/Makefile
-  examples/IPC_SAP/FILE_SAP/Makefile
-  examples/IPC_SAP/SOCK_SAP/Makefile
-  examples/IPC_SAP/SPIPE_SAP/Makefile
-  examples/IPC_SAP/SSL_SAP/Makefile
-  examples/IPC_SAP/TLI_SAP/Makefile
-  examples/IPC_SAP/UPIPE_SAP/Makefile
-  examples/Log_Msg/Makefile
-  examples/Logger/Makefile
-  examples/Logger/Acceptor-server/Makefile
-  examples/Logger/client/Makefile
-  examples/Logger/simple-server/Makefile
-  examples/Mem_Map/Makefile
-  examples/Mem_Map/IO-tests/Makefile
-  examples/Mem_Map/file-reverse/Makefile
-  examples/Misc/Makefile
-  examples/NT_Service/Makefile
-  examples/Naming/Makefile
-  examples/OS/Makefile
-  examples/OS/Process/Makefile
-  examples/QOS/Makefile
-  examples/QOS/Change_Receiver_FlowSpec/Makefile
-  examples/QOS/Change_Sender_TSpec/Makefile
-  examples/QOS/Diffserv/Makefile
-  examples/QOS/Simple/Makefile
-  examples/Reactor/Makefile
-  examples/Reactor/Dgram/Makefile
-  examples/Reactor/FIFO/Makefile
-  examples/Reactor/Misc/Makefile
-  examples/Reactor/Multicast/Makefile
-  examples/Reactor/Ntalker/Makefile
-  examples/Reactor/Proactor/Makefile
-  examples/Reactor/WFMO_Reactor/Makefile
-  examples/Registry/Makefile
-  examples/Service_Configurator/Makefile
-  examples/Service_Configurator/IPC-tests/Makefile
-  examples/Service_Configurator/IPC-tests/client/Makefile
-  examples/Service_Configurator/IPC-tests/server/Makefile
-  examples/Service_Configurator/Misc/Makefile
-  examples/Shared_Malloc/Makefile
-  examples/Shared_Memory/Makefile
-  examples/Smart_Pointers/Makefile
-  examples/Synch/Makefile
-  examples/System_V_IPC/Makefile
-  examples/System_V_IPC/SV_Message_Queues/Makefile
-  examples/System_V_IPC/SV_Semaphores/Makefile
-  examples/TMCast/Makefile
-  examples/TMCast/Member/Makefile
-  examples/Threads/Makefile
-  examples/Timer_Queue/Makefile
-  examples/Web_Crawler/Makefile
   netsvcs/Makefile
   netsvcs/lib/Makefile
   netsvcs/clients/Makefile
@@ -7712,18 +7868,6 @@ AC_CONFIG_FILES([
   netsvcs/clients/Naming/Client/Makefile
   netsvcs/clients/Naming/Dump_Restore/Makefile
   netsvcs/servers/Makefile
-  performance-tests/Makefile
-  performance-tests/Misc/Makefile
-  performance-tests/SCTP/Makefile
-  performance-tests/Server_Concurrency/Makefile
-  performance-tests/Server_Concurrency/Leader_Follower/Makefile
-  performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
-  performance-tests/Synch-Benchmarks/Makefile
-  performance-tests/Synch-Benchmarks/Synch_Lib/Makefile
-  performance-tests/Synch-Benchmarks/Base_Test/Makefile
-  performance-tests/Synch-Benchmarks/Perf_Test/Makefile
-  performance-tests/TCP/Makefile
-  performance-tests/UDP/Makefile
   protocols/Makefile
   protocols/ace/Makefile
   protocols/ace/HTBP/Makefile
@@ -7732,18 +7876,134 @@ AC_CONFIG_FILES([
   protocols/examples/Makefile
   protocols/examples/RMCast/Makefile
   protocols/examples/RMCast/Send_Msg/Makefile
-  tests/Makefile
-  tests/HTBP/Makefile
-  tests/HTBP/Reactor_Tests/Makefile
-  tests/HTBP/Send_Large_Msg/Makefile
-  tests/HTBP/Send_Recv_Tests/Makefile
-  tests/HTBP/ping/Makefile
-  tests/SSL/Makefile
   websvcs/Makefile
   websvcs/lib/Makefile
   websvcs/tests/Makefile
 ])
 
+dnl Configure examples if configured...
+if test $ace_build_examples = yes; then
+  AC_CONFIG_FILES([
+    examples/Makefile
+    examples/APG/Makefile
+    examples/APG/Active_Objects/Makefile
+    examples/APG/Config/Makefile
+    examples/APG/Containers/Makefile
+    examples/APG/Logging/Makefile
+    examples/APG/Misc_IPC/Makefile
+    examples/APG/Naming/Makefile
+    examples/APG/Proactor/Makefile
+    examples/APG/Processes/Makefile
+    examples/APG/Reactor/Makefile
+    examples/APG/Shared_Memory/Makefile
+    examples/APG/Signals/Makefile
+    examples/APG/Sockets/Makefile
+    examples/APG/Streams/Makefile
+    examples/APG/Svc_Config/Makefile
+    examples/APG/ThreadManagement/Makefile
+    examples/APG/ThreadPools/Makefile
+    examples/APG/ThreadSafety/Makefile
+    examples/APG/Threads/Makefile
+    examples/APG/Timers/Makefile
+    examples/ASX/Makefile
+    examples/ASX/CCM_App/Makefile
+    examples/ASX/Message_Queue/Makefile
+    examples/Bounded_Packet_Relay/Makefile
+    examples/C++NPv1/Makefile
+    examples/C++NPv2/Makefile
+    examples/Connection/Makefile
+    examples/Connection/blocking/Makefile
+    examples/Connection/misc/Makefile
+    examples/Connection/non_blocking/Makefile
+    examples/DLL/Makefile
+    examples/Export/Makefile
+    examples/IOStream/Makefile
+    examples/IOStream/client/Makefile
+    examples/IOStream/server/Makefile
+    examples/IPC_SAP/Makefile
+    examples/IPC_SAP/ATM_SAP/Makefile
+    examples/IPC_SAP/DEV_SAP/Makefile
+    examples/IPC_SAP/DEV_SAP/reader/Makefile
+    examples/IPC_SAP/DEV_SAP/writer/Makefile
+    examples/IPC_SAP/FIFO_SAP/Makefile
+    examples/IPC_SAP/FILE_SAP/Makefile
+    examples/IPC_SAP/SOCK_SAP/Makefile
+    examples/IPC_SAP/SPIPE_SAP/Makefile
+    examples/IPC_SAP/SSL_SAP/Makefile
+    examples/IPC_SAP/TLI_SAP/Makefile
+    examples/IPC_SAP/UPIPE_SAP/Makefile
+    examples/Log_Msg/Makefile
+    examples/Logger/Makefile
+    examples/Logger/Acceptor-server/Makefile
+    examples/Logger/client/Makefile
+    examples/Logger/simple-server/Makefile
+    examples/Mem_Map/Makefile
+    examples/Mem_Map/IO-tests/Makefile
+    examples/Mem_Map/file-reverse/Makefile
+    examples/Misc/Makefile
+    examples/NT_Service/Makefile
+    examples/Naming/Makefile
+    examples/OS/Makefile
+    examples/OS/Process/Makefile
+    examples/QOS/Makefile
+    examples/QOS/Change_Receiver_FlowSpec/Makefile
+    examples/QOS/Change_Sender_TSpec/Makefile
+    examples/QOS/Diffserv/Makefile
+    examples/QOS/Simple/Makefile
+    examples/Reactor/Makefile
+    examples/Reactor/Dgram/Makefile
+    examples/Reactor/FIFO/Makefile
+    examples/Reactor/Misc/Makefile
+    examples/Reactor/Multicast/Makefile
+    examples/Reactor/Ntalker/Makefile
+    examples/Reactor/Proactor/Makefile
+    examples/Reactor/WFMO_Reactor/Makefile
+    examples/Registry/Makefile
+    examples/Service_Configurator/Makefile
+    examples/Service_Configurator/IPC-tests/Makefile
+    examples/Service_Configurator/IPC-tests/client/Makefile
+    examples/Service_Configurator/IPC-tests/server/Makefile
+    examples/Service_Configurator/Misc/Makefile
+    examples/Shared_Malloc/Makefile
+    examples/Shared_Memory/Makefile
+    examples/Smart_Pointers/Makefile
+    examples/Synch/Makefile
+    examples/System_V_IPC/Makefile
+    examples/System_V_IPC/SV_Message_Queues/Makefile
+    examples/System_V_IPC/SV_Semaphores/Makefile
+    examples/TMCast/Makefile
+    examples/TMCast/Member/Makefile
+    examples/Threads/Makefile
+    examples/Timer_Queue/Makefile
+    examples/Web_Crawler/Makefile
+  ])
+fi
+
+dnl Configure examples if configured...
+if test $ace_build_tests = yes; then
+  AC_CONFIG_FILES([
+    performance-tests/Makefile
+    performance-tests/Misc/Makefile
+    performance-tests/SCTP/Makefile
+    performance-tests/Server_Concurrency/Makefile
+    performance-tests/Server_Concurrency/Leader_Follower/Makefile
+    performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
+    performance-tests/Synch-Benchmarks/Makefile
+    performance-tests/Synch-Benchmarks/Synch_Lib/Makefile
+    performance-tests/Synch-Benchmarks/Base_Test/Makefile
+    performance-tests/Synch-Benchmarks/Perf_Test/Makefile
+    performance-tests/TCP/Makefile
+    performance-tests/UDP/Makefile
+    tests/Makefile
+    tests/HTBP/Makefile
+    tests/HTBP/Reactor_Tests/Makefile
+    tests/HTBP/Send_Large_Msg/Makefile
+    tests/HTBP/Send_Recv_Tests/Makefile
+    tests/HTBP/ping/Makefile
+    tests/SSL/Makefile
+  ])
+fi
+
 dnl Configure subdirectories if they are present.
 if test -d $srcdir/ACEXML; then
   AC_CONFIG_FILES([
diff --git a/docs/ACE-bug-process.html b/docs/ACE-bug-process.html
index 7cec4bfa66c..ec3699165ec 100644
--- a/docs/ACE-bug-process.html
+++ b/docs/ACE-bug-process.html
@@ -1,44 +1,50 @@
 <!-- $Id$ -->
 
 <HTML>
-    <TITLE>ACE+TAO Bug Fixing Policies</TITLE>
+    <TITLE>ACE, TAO, and CIAO Bug Fixing Policies</TITLE>
   <BODY text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
 
 <HR>
-<H3>ACE+TAO Bug Fixing Policies</H3>
+<H3>ACE, TAO, and CIAO Bug Fixing Policies</H3>
 
-As <A HREF="http://www.dre.vanderbilt.edu/ACE">ACE</A>,and <A
-HREF="http://www.dre.vanderbilt.edu/TAO">TAO</A> have grown in
-popularity the volume of mail on the
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">ACE+TAO users  
-mailing list</A> and USENET newsgroup <A
+As <A HREF="http://www.dre.vanderbilt.edu/ACE/">ACE</A>, <A
+HREF="http://www.dre.vanderbilt.edu/TAO/">TAO</A>, and <A
+HREF="http://www.dre.vanderbilt.edu/CIAO/">CIAO</A> have grown in
+popularity the volume of mail on the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">mailing
+lists</A> and USENET newsgroup <A
 HREF="news:comp.soft-sys.ace">comp.soft-sys.ace</A> has grown
 considerably.  While this increase is healthy, and a natural
-consequence of the larger number of ACE and TAO users, it is straining
-the resources of the DOC <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE-members.html">research
+consequence of the larger number of ACE, TAO, and CIAO users, it is
+straining the resources of the researchers in the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-members-i.html">DOC
 group</A> at <A
 HREF="http://www.cs.wustl.edu/~schmidt/doc-center.html">Washington
 University</A>, <A HREF="http://zen.uci.edu">UC Irvine</A> and <A
-HREF="http://www.dre.vanderbilt.edu"> ISIS</A> to
-respond to all the traffic immediately.  Moreover, our prompt bug
-fixes may actually be discouraging the creation of a larger community
-of users who have deep knowledge of how ACE and TAO work and can help
-provide bug fixes and new features. <P>
-
-For us to continue supporting ACE and TAO effectively and to allow the
-ACE and TAO user community to evolve, please make it a point to abide
-by the following policies:
+HREF="http://www.dre.vanderbilt.edu">ISIS</A> to respond to all the
+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
+support companies</A> who have deep knowledge of how ACE, TAO, and
+CIAO work and can help provide bug fixes and new features. <P>
+
+To ensure the continued growth and maturation of ACE, TAO, and CIAO,
+and to allow the user and vendor communities to evolve, please make it
+a point to abide by the following policies:
 
 <UL>
 
-<LI> All bug reports to the ACE+TAO <A
+<LI> All bug reports to the <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">mailing
 lists</A> should be submitted using the appropriate bug report form in
 <A HREF="../PROBLEM-REPORT-FORM">$ACE_ROOT/PROBLEM-REPORT-FORM</A>
-(for ACE) or <A
+(for ACE), <A
 HREF="../TAO/PROBLEM-REPORT-FORM">$TAO_ROOT/PROBLEM-REPORT-FORM</A>
-(for TAO).  Please use these forms since bug reports that are not
+(for TAO), <A
+HREF="../TAO/CIAO/PROBLEM-REPORT-FORM">$CIAO_ROOT/PROBLEM-REPORT-FORM</A>
+(for CIAO).  Please use these forms since bug reports that are not
 submitted in this form are likely to fall through the cracks.  Here is
 our policy for addressing these bug reports: <P>
 
@@ -50,43 +56,40 @@ our work we will respond to it in a very timely manner.  Please
 contact <A HREF="mailto:schmidt@cs.wustl.edu">me</A> if you'd like to
 become a sponsor. <P>
 
-<LI> If it's a bug report along with a fix we will also apply this
-in a timely manner. In general, people who submit good bug
-    reports with fixes tend to get much better help from the core DOC
-    group team, irrespective of whether they are sponsors or not since
-    they are helping our overall effort move ahead. <P>
+<LI> If it's a bug report along with a fix we will try to apply this
+in a timely manner. In general, people who submit good bug reports
+with fixes tend to get much better help from the core DOC group team,
+irrespective of whether they are sponsors or not since they are
+helping our overall effort move ahead. <P>
 
-<LI> If it's a bug report that will prevent ACE or TAO from working on
-a major platform used by our sponsors we'll try to fix it as time
-permits. <P>
+<LI> If it's a bug report that prevents ACE, TAO, or CIAO from working
+on a major platform used by ourselves or our sponsors we'll try to fix
+it as time permits. <P>
 
 </OL>
 
 <LI> You should also consider entering your bug report into our <A
-HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">bug tracking database</A>
-so that it's archived for future processing.  We try to address these
-bugs as time permits, but may not get to them for a while unless it
-affects our work or the work of our sponsors.  If you'd like an
-immediate response, please contact <A
-HREF="mailto:schmidt@cs.wustl.edu">me</A> about becoming a sponsor or
-contact one of the companies that provides <A
-HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">
-commercial support</A> for ACE+TAO. <P>
+HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">bug tracking
+database</A> so that it's archived for future processing.  As usual,
+we try to address these bugs as time permits, but may not get to them
+for a while unless it affects our work or the work of our
+sponsors. <P>
 
 We encourage bug reports for those without support to be posted
 initially to the <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">ACE users</A>
-(<A HREF="mailto:ace-users@cs.wustl.edu">ace-users@cs.wustl.edu</A>)
-or <A HREF="http://www.cs.wustl.edu/~schmidt/TAO-mail.html">TAO
+(<A HREF="mailto:ace-users@cs.wustl.edu">ace-users@cs.wustl.edu</A>),
+<A HREF="http://www.cs.wustl.edu/~schmidt/TAO-mail.html">TAO users</A>
+(<A HREF="mailto:tao-users@cs.wustl.edu">tao-users@cs.wustl.edu</A>),
+and <A HREF="http://www.cs.wustl.edu/~schmidt/CIAO-mail.html">CIAO
 users</A> (<A
-HREF="mailto:tao-users@cs.wustl.edu">tao-users@cs.wustl.edu</A>)
-mailing lists, where the ACE+TAO user community may already have
-developed, or have an interest in developing, a solution.  While the
-core ACE+TAO development team participates in this mailing list, we
-can not guarantee responses to all postings. <P>
+HREF="mailto:ciao-users@cs.wustl.edu">ciao-users@cs.wustl.edu</A>)
+mailing lists, where the open-source user community may already have
+developed, or have an interest in developing, a solution.  <P>
 
-<LI> If you post something and don't get a reply, please do
-    the following:<P>
+<LI> While the core DOC group development team participates in this
+mailing list, we cannot response to all postings.  Therefore, if you
+post something and don't get a reply, please do the following:<P>
 
 <UL>
 <LI>
@@ -95,41 +98,73 @@ can not guarantee responses to all postings. <P>
     HREF="http://groups.google.com/groups?q=comp.soft-sys.ace&ie=UTF-8&oe=UTF-8&hl=en">comp.soft-sys.ace</A> newsgroup to see if your posting is visible. <P>
 
 <LI> If it's not visible, please make sure you're 
-  <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">subscribed to the mailing
+  <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">subscribed
+to the mailing
   list(s)</A> you sent the report to since we have a "members only" posting
   requirement to minimize spam. <P>
 
 <LI> If it is visible and you haven't received a reply this probably means
   that either no one knows the answer or no one has time to answer it.
   As always, if you need more predictable help please contact one of 
-  <A HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">commercial support</a> companies for ACE+TAO.<P>  
+  <A
+HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">commercial
+support</a> companies for ACE+TAO.<P>
 
 </UL>
 
 <LI> If you find a problem with a version of TAO that was released by
     <A HREF="http://www.theaceorb.com/">OCI</A> then please report it
     to <A
-    HREF="mailto:taosupport@ociweb.com">taosupport@ociweb.com</A> since
-    their version of TAO is somewhat different from the DOC group's
+    HREF="mailto:taosupport@ociweb.com">taosupport@ociweb.com</A>
+    since their version of TAO is different from the DOC group's
     version of TAO and thus they provide their own support. <P>
 
-<LI> If it's a general question about how to use ACE or TAO feature
-we'll try to respond as time permits, though we will also rely on the
-experience of the ACE and TAO user community to field these types of
-questions, as well.  If you have a question about TAO, you should
-first check out the TAO <A HREf="http://www.theaceorb.com/faq/">online
-FAQ</A> to see if your question has already been answered.  If you
-require consulting support for ACE and/or TAO, please contact one of
-the companies that provides <A
-HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">commercial support</A> for ACE+TAO.<P>
+<LI> If it's a general question about how to use ACE, TAO, or CIAO
+feature we'll try to respond as time permits, though we will also rely
+on the experience of the open-source user community to field these
+types of questions, as well.  You should first check out the <A
+HREf="http://www.theaceorb.com/faq/">online FAQ</A> to see if your
+question has already been answered.  If you require consulting support
+for ACE, TAO, or CIAO, please contact one of the companies that
+provides <A
+HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">commercial
+support</A>.<P>
 
 </UL>
 
-Naturally, we encourage other ACE+TAO users to continue to help
-provide fixes and advice in response to postings on the ACE and TAO
-mailing list.  But please be sensitive to the fact that the core team
-is <EM>very</EM> busy so we simply don't have time to address problems
-reported by non-sponsors. <P>
+Naturally, we encourage other ACE, TAO, and CIAO users to continue to
+help provide fixes and advice in response to postings on the mailing
+lists and newsgroup.  If you have a patch that fixes a problem you've
+found with our software here's the process for submitting it:
+
+<OL>
+<LI> Use the latest contents of our CVS repository, i.e., what's available from <P>
+
+  <A HREF="http://cvs.doc.wustl.edu/">http://cvs.doc.wustl.edu/</A> <P>
+  
+<LI> Create a ``unified diff'' and put this into Bugzilla at <P>
+
+  <A HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">http://deuce.doc.wustl.edu/bugzilla/index.cgi</A> <P>
+
+  and send an email to the appropriate <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">mailing
+list(s)</A> and/or <A HREF="news:comp.soft-sys.ace">newsgroup</A>
+newsgroup summarizing what the problem was and you've done to fix the
+problem, i.e., use the <A HREF="../ChangeLog"</A>ChangeLog</A>
+format. <P>
+  
+<LI> Ideally, you could also create (or augment) a test program that
+  validates your patch and integrate it into the <A
+HREF="../tests">ACE_ROOT/tests</A> directory. <P> </OL>
+
+Please be sensitive to the fact that the core <A
+HREF="http://www.dre.vanderbilt.edu/">DOC group</A> team is
+<EM>very</EM> busy, so we often don't have time to address problems
+reported by non-sponsors.  If you'd like an immediate response, please
+contact <A HREF="mailto:schmidt@cs.wustl.edu">me</A> about becoming a
+sponsor or contact one of the companies that provides <A
+HREF="http://www.cs.wustl.edu/~schmidt/commercial-support.html">
+commercial support</A> for ACE, TAO, and CIAO. <P>
 
 <HR><P>
 Back to the <A
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index ec975667c53..4dcb5145dc9 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -3,7 +3,7 @@
 <html>
   <head>
     <title>ACE Software Development Guidelines</title>
-    <link rev=made href="mailto:levine@cs.wustl.edu">
+    <link rev=made href="mailto:ace-users@cs.wustl.edu">
   </head>
 
 <body text = "#000000"
@@ -35,7 +35,12 @@ bgcolor="#ffffff">
     <li>Do not end text lines with spaces.  Emacs users can add this to
         their <strong>.emacs</strong>:
 
-        <pre>(setq-default nuke-trailing-whitespace-p t)</pre><p>
+        <pre>(setq-default nuke-trailing-whitespace-p t)</pre>
+
+        <strong>Note for Microsoft Visual Studio .NET Users:</strong>
+        <p>There is a macro project <code>(ace_guidelines.vsmacros)</code>
+        located in <code>$ACE_ROOT/docs</code> that replaces tabs with spaces
+        and removes trailing spaces each time you save a file.</p>
 
     <li>Try to limit the length of source code lines to less than 80
         characters.  Users with 14 inch monitors appreciate it when
@@ -173,6 +178,13 @@ bgcolor="#ffffff">
         manual</a>.
         For an example header file using Doxygen-style comments,
         please refer to <a href="../ace/ACE.h">ACE.h</a>.<p>
+
+    <LI>All binary options for ACE and TAO should be specified in
+        terms of the integral values 0 and 1, rather than "true" and
+        "false" or "yes" and "no".  All TAO options should be
+        documented in the <A HREF="../TAO/docs/Options.html">online
+        TAO options document</A>. <P>.
+
   </ul>
 
   <li><strong>Preprocessor</strong><p>
@@ -236,6 +248,8 @@ not defined.  The correct way to write that guard is:
 #if defined (__FreeBSD__)  &&  __FreeBSD__ &lt; 3
 </pre>
 
+If using g++, problems like this can be flagged as a warning by using the "<code>-Wundef</code>" command line option.
+
     <li>Try to centralize <code>#ifdef</code>s with <code>typedef</code>s
         and <code>#define</code>s.  For example, use this:
         <pre>
@@ -905,13 +919,133 @@ Foo::bar ()
   <li><strong>Compilation</strong><p>
   <ul>
     <li>Whenever you add a new test or example to ACE or TAO, make
-        sure that you modify the Makefile or project file in the
-        parent directory.  This will make sure that your code gets
-        compiled on a regular basis.  In some cases, this also applies
-        to MSVC project files.<p>
+        sure that you modify the MPC file in the parent directory.
+      This will make sure that your code gets compiled on a
+      regular basis.<p>
   </ul><p>
 </ul>
 
+<hr>
+<h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a>
+  Shared Libary Guidelines</h3>
+    <ul>
+      <li>
+        <p>
+          Create a separate export macro for each dynamic library.  A
+          header file containing the export macro and additional
+          support macros should be generated by using the <a
+            href="../bin/generate_export_file.pl">ACE_wrappers/bin/generate_export_file.pl</a> Perl script.
+          </p>
+      </li>
+      <li>
+        <p>
+          Make sure that your classes, structures and free functions
+          are annotated with this export macro.  The only exceptions
+          are pure template classes, structures and free functions.
+        </p>
+        <p>
+          Only classes (and structures, free functions, etc) that are
+          part of the library public interface must be exported
+          (e.g. declared with an export macro).  Those that are only
+          meant to be used internally need not be exported,
+          particularly for g++ <code>&gt;=</code>4.0  since doing so
+          defeats some neat optimizations.  Here's a common case in
+          where an export macro is generally used unnecessarily:
+        </p>
+        <blockquote>
+          <pre>
+class FooExport Foo
+{
+public:
+  virtual void kung_fu () = 0;
+};
+
+class FooExport Bar : public Foo
+{
+public:
+  virtual void kung_fu ()  { ... }
+};
+
+class FooExport FooFactory
+{
+public:
+  Foo * make_foo ()
+    {
+      // Assume that this implementation is hidden from
+      // the application and is consequently out of line.
+      return new Bar();
+    }
+};
+          </pre>
+        </blockquote>
+        <p>
+          Here the application is only meant to invoke operations
+          through a pointer or reference to the abstract base class
+          "<code>Foo</code>" created by the "<code>FooFactory</code>",
+          not the "<code>Bar</code>" subclass.  In this case,
+          exporting "<code>Bar</code>" is unnecessary.  If your
+          concrete class is meant to be used outside of the shared
+          library (e.g. as a template parameter, within a
+          <code>dynamic_cast&lt;&gt;</code>, etc) you must then export
+          it.  Otherwise, avoid doing so if you can.
+        </p>
+      </li>
+      <li>
+        <p>
+          Make sure that you specify that you are creating a dynamic
+          library in your <a href="../MPC/README">MPC</a> file by adding
+          a <code>sharedname</code> tag.
+        </p>
+      </li>
+      <li>
+        <p>
+          Make sure that you add the <code>FOO_BUILD_DLL</code>
+          preprocessor symbol to the <code>dynamicflags</code> of the
+          MPC project that is used to build a library.  Note that the
+          export files are setup such that when this macro is defined,
+          the symbols are exported, otherwise they are imported.  The
+          default behaviour is to set up for import so that clients of
+          your library don't need to worry about arcane build flags
+          like <code>FOO_BUILD_DLL</code> in their build setup.  This
+          ties back to the first item.
+        </p>
+      </li>
+      <li>
+        <p>
+          When you specify the order of libraries to link to, make
+          sure that the dependent libraries come after the libraries
+          which depend on them, i.e., your link line should always
+          contain <code>-lDependsOnFoo -lFoo</code>.  Note that this
+          is not a requirement on GNU/Linux but linkers on other
+          platforms are not as forgiving.
+        </p>
+      </li>
+      <li>
+        <p>
+          Use the <code>ACE_SINGLETON_DECLARE</code> macro to declare
+          a class as a singleton.  Declare exported (i.e. default
+          visibility)  singleton templates prior to typedefs that
+          reference them.  This prevents g++ 4.0 from silently making
+          their visibility hidden (see <a
+            href="http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2260">Bug 2260</a> for details).
+        </p>
+      </li>
+      <li>
+        <p>
+          Avoid inlining virtual functions in classes that must be
+          exported since doing so can cause RTTI related problems
+          (e.g. <code>dynamic_cast&lt;&gt; failures</code>) when using
+          g++ &gt;= 4.0 due to our use of that compiler's "visibility
+          attribute" support that is tied in to the export macros.
+          This includes virtual destructors automatically created by
+          the compiler when you don't declare one.  Make sure you
+          define a no-op out-of-line virtual destructor if your base
+          class has a virtual destructor since you may otherwise run
+          into the mentioned RTTI problems.
+        </p>
+      </li>
+    </ul>
+
 
 <hr>
 <h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a>
@@ -1169,7 +1303,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 <hr><p>
   <font size=-1>
 <!-- hhmts start -->
-Last modified: Tue Sep 20 14:06:27 CDT 2005
+Last modified: Wed Nov 23 11:00:44 CST 2005
 <!-- hhmts end -->
   </font><p>
 
diff --git a/docs/ACE-lessons.html b/docs/ACE-lessons.html
index b9cca0bd7cf..4448644ae68 100644
--- a/docs/ACE-lessons.html
+++ b/docs/ACE-lessons.html
@@ -191,7 +191,7 @@ prerequisites -- </EM></B><P>
   labor" who can be replaced easily.  I suspect that over time,
   companies who respect and reward their high quality software
   developers will increasingly outperform those who don't. <P>
-</OL>
+</UL>
    
 <P><HR><P>
 <H3>Concluding Remarks</H3>  
diff --git a/docs/CE-status.txt b/docs/CE-status.txt
index f3f77f1c32c..3b618df0980 100644
--- a/docs/CE-status.txt
+++ b/docs/CE-status.txt
@@ -1,12 +1,12 @@
 /**
 @page wince ACE on Windows CE status
 
-Last updated Tuesday 04-March-2003 by Steve Huston <shuston@riverace.com>
+Last updated Tuesday 15-November-2005 by Steve Huston <shuston@riverace.com>
 
 @subsection ce_status Status
 
-As of ACE 5.3, Riverace supports ACE on Windows CE 3 with the
-PocketPC 2002 SDK and on Windows CE 4 with the Standard SDK.
+As of ACE 5.5, Riverace supports ACE on Windows CE building with Microsoft
+Visual Studio 2005 and targeting the Pocket PC 2003 SDK and Windows Mobile 5.
 OCI supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK.
 Contact the individual support provider for complete information regarding
 these platforms as well as the supported hardware targets.
@@ -23,6 +23,16 @@ Developers working with sources checked out from CVS must generate the
 project and workspace files locally using MPC. The autobuild system's
 generate_makefile and generate_workspace commands can be used for this.
 
+@subsection ce_vc8 Visual Studio 2005 Projects
+
+The ACE release process generates the needed Visual Studio 2005 solution and
+project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to
+distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and
+Visual Studio 2003 projects (ACE.vcproj). The files are generated with
+the "Pocket PC 2003 SDK (ARMV4)" and "Windows Mobile 5.0 Pocket PC SDK
+(ARMV4I)" platforms defined. To add additional platforms, the files must be
+regenerated using MPC.
+
 @subsection ce_wchar Unicode/WChar
 
 ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned
@@ -38,4 +48,4 @@ copy the test files to a PocketPC device, run the test, and copy the log
 files back to the build machine for analysis and reporting to the
 scoreboard.
 
-*/
\ No newline at end of file
+*/
diff --git a/docs/index.html b/docs/index.html
index b80733cb6be..18de311d5c7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -20,12 +20,11 @@ ask. <P>
 
 <ul>
   <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Overview of ACE</a> -
-      The top level view.
+      a high-level view.
   <li><A
       HREF="http://www.cs.wustl.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>.
   <li><A
-      HREF="http://www.flyingdonkey.com/ace/">Chinese translation for
-      much ACE documentation</a>.
+      HREF="http://www.flyingdonkey.com/ace/">Translations for much of the ACE documentation</a>.
   <LI><A HREF="http://www.cs.wustl.edu/~schmidt/ACE/">Books on ACE</A>.
 </ul>
 
@@ -60,8 +59,8 @@ ask. <P>
 <h3>Bug Reports</h3>
 
 <ul>
-  <li><a href="ACE-bug-process.html">ACE+TAO Bug Fixing Policies</a> - Our policies for
-      handling bug reports.
+  <li><a href="ACE-bug-process.html">Bug Fixing Policies</a> - Our policies for
+      handling bug reports about ACE, TAO, and CIAO.
   <li><a href="usage-bugzilla.html">Bug Tracking System</a> - Short description of our
       Bugzilla bug tracking system.
 </ul>
@@ -73,13 +72,14 @@ 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 library.
+      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 code.
+  <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.
   <li><a href="exceptions.html">Exception Macros</a> - How to use the ACE TRY
-      macros properly.
+      macros properly (note that these macros are now deprecated).
 
 </ul>
 
@@ -91,6 +91,8 @@ ask. <P>
   <li><a href="ACE-lessons.html">Lessons</a> - Lessons we have learned while
       building ACE.
   <li><a href="ACE-SSL.html">ACE+SSL</a> - What is ACE+SSL and how to get it.
+  <li><a href="Symbol_Versioning.html">Symbol versioning</a> - How to do symbol versioning
+      with ACE+TAO.
   <li><a href="CE-status.txt">CE-status.txt</a> - The status of ACE on Windows CE.
   <li><a href="../ACEXML/docs/readme.txt">ACEXML</a> - A SAX2-based XML parser ACE uses and provides.
 </ul>
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
deleted file mode 100644
index 4b6f1ece873..00000000000
--- a/etc/Svc_Conf_l.cpp.diff
+++ /dev/null
@@ -1,154 +0,0 @@
---- Svc_Conf_l.cpp.old	Tue Mar  1 10:03:28 2005
-+++ Svc_Conf_l.cpp	Tue Mar  1 10:18:29 2005
-@@ -625,9 +625,21 @@
-                         ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                 result = n; \
-                 } \
--        else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
-+        else \
-+                { \
-+                errno = 0; \
-+                while ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
-                   && ferror( ace_yyin ) ) \
--                ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
-+                        { \
-+                        if (errno != EINTR) \
-+                                { \
-+                                ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+                                break; \
-+                                } \
-+                        errno = 0; \
-+                        clearerr(ace_yyin); \
-+                        } \
-+                }
- #endif
- 
- /* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
-@@ -679,8 +691,12 @@
-         register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
-         register int ace_yy_act;
- 
-+        ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
-+                                  ace_mon,
-+                                  *ACE_Static_Object_Lock::instance (),
-+                                  -1));
- 
--
-+        ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
- 
-         if ( ace_yy_init )
-                 {
-@@ -774,71 +790,71 @@
- case 2:
- ACE_YY_RULE_SETUP
- { return token (ACE_DYNAMIC); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 3:
- ACE_YY_RULE_SETUP
- { return token (ACE_STATIC); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 4:
- ACE_YY_RULE_SETUP
- { return token (ACE_SUSPEND); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 5:
- ACE_YY_RULE_SETUP
- { return token (ACE_RESUME); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 6:
- ACE_YY_RULE_SETUP
- { return token (ACE_REMOVE); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 7:
- ACE_YY_RULE_SETUP
- { return token (ACE_USTREAM); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 8:
- ACE_YY_RULE_SETUP
- { return token (ACE_MODULE_T); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 9:
- ACE_YY_RULE_SETUP
- { return token (ACE_SVC_OBJ_T); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 10:
- ACE_YY_RULE_SETUP
- { return token (ACE_STREAM_T); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 11:
- ACE_YY_RULE_SETUP
- { return token (ACE_ACTIVE); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 12:
- ACE_YY_RULE_SETUP
- { return token (ACE_INACTIVE); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 13:
- ACE_YY_RULE_SETUP
- { return token (':'); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 14:
- ACE_YY_RULE_SETUP
- { return token ('*'); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 15:
- ACE_YY_RULE_SETUP
- { return token ('('); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 16:
- ACE_YY_RULE_SETUP
- { return token (')'); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 17:
- ACE_YY_RULE_SETUP
- { return token ('{'); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 18:
- ACE_YY_RULE_SETUP
- { return token ('}'); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 19:
- ACE_YY_RULE_SETUP
- {
-@@ -852,21 +868,21 @@
-                         ace_yyleng -= 1;
-                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
-                         return token (ACE_STRING); }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 20:
- ACE_YY_RULE_SETUP
- {
-                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                         return token (ACE_IDENT);
-                       }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 21:
- ACE_YY_RULE_SETUP
- {
-                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                         return token (ACE_PATHNAME);
-                       }
--        ACE_YY_BREAK
-+        //ACE_YY_BREAK
- case 22:
- ACE_YY_RULE_SETUP
- ; /* EMPTY */
diff --git a/etc/ace.doxygen b/etc/ace.doxygen
index fd88b2e507a..f16d2ce8aab 100644
--- a/etc/ace.doxygen
+++ b/etc/ace.doxygen
@@ -86,7 +86,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -158,6 +158,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -168,4 +169,4 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
diff --git a/etc/ace_man.doxygen b/etc/ace_man.doxygen
index 286a1e2d9f1..8841d1aa765 100644
--- a/etc/ace_man.doxygen
+++ b/etc/ace_man.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -146,6 +146,7 @@ COLLABORATION_GRAPH   = NO
 INCLUDE_GRAPH         = NO
 INCLUDED_BY_GRAPH     = NO
 GRAPHICAL_HIERARCHY   = NO
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
diff --git a/etc/ace_qos.doxygen b/etc/ace_qos.doxygen
index b1e2189c720..6f3439d18c4 100644
--- a/etc/ace_qos.doxygen
+++ b/etc/ace_qos.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -146,6 +146,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +157,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/ace_rmcast.doxygen b/etc/ace_rmcast.doxygen
index eb05f0645c1..a0906aaea5b 100644
--- a/etc/ace_rmcast.doxygen
+++ b/etc/ace_rmcast.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -146,6 +146,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +157,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/ace_ssl.doxygen b/etc/ace_ssl.doxygen
index 1914c8d6883..2d0ba3d84e1 100644
--- a/etc/ace_ssl.doxygen
+++ b/etc/ace_ssl.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -146,6 +146,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +157,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/acexml.doxygen b/etc/acexml.doxygen
index 4cdfe131ce6..84e0424d468 100644
--- a/etc/acexml.doxygen
+++ b/etc/acexml.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -146,6 +146,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +157,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/ciao.doxygen b/etc/ciao.doxygen
index 57fc2ca49ff..c48519e6603 100644
--- a/etc/ciao.doxygen
+++ b/etc/ciao.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO . ACEXML
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER \
                         CIAO_NAMESPACE
 
 #---------------------------------------------------------------------------
@@ -158,6 +165,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -168,5 +176,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/ciao_DAnCE.doxygen b/etc/ciao_DAnCE.doxygen
index f42796fbf8c..6b981867db9 100644
--- a/etc/ciao_DAnCE.doxygen
+++ b/etc/ciao_DAnCE.doxygen
@@ -75,7 +75,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -119,27 +119,34 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO . ACEXML TAO/tao/IORTable
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER \
                         CIAO_NAMESPACE
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../../../ace \
-                        html/tao/TAO.tag=../../.. \
-                        html/ace/ssl/ACE_SSL.tag=../../../../ace/ssl \
-                        html/tao/portableserver/TAO_PortableServer.tag=../../../portableserver \
-                        html/tao/iortable/TAO_IORTable.tag=../../../iortable \
-                        html/tao/rtcorba/TAO_RTCORBA.tag=../../../rtcorba \
-                        html/tao/security/TAO_Security.tag=../../../security \
-                        html/acexml/ACEXML.tag=../../../../acexml \
-                        html/tao/rtportableserver/TAO_RTPortableServer.tag=../../../rtportableserver \
-                        html/tao/cosnaming/TAO_CosNaming.tag=../../../cosnaming \
-                        html/tao/ifr/TAO_IFR.tag=../../../ifr
+TAGFILES              = html/ace/ACE.tag=../../../ace \
+                        html/tao/TAO.tag=../.. \
+                        html/ace/ssl/ACE_SSL.tag=../../../ace/ssl \
+                        html/tao/portableserver/TAO_PortableServer.tag=../../portableserver \
+                        html/tao/iortable/TAO_IORTable.tag=../../iortable \
+                        html/tao/rtcorba/TAO_RTCORBA.tag=../../rtcorba \
+                        html/tao/security/TAO_Security.tag=../../security \
+                        html/acexml/ACEXML.tag=../../../acexml \
+                        html/tao/rtportableserver/TAO_RTPortableServer.tag=../../rtportableserver \
+                        html/tao/cosnaming/TAO_CosNaming.tag=../../cosnaming \
+                        html/tao/ifr/TAO_IFR.tag=../../ifr
 GENERATE_TAGFILE      = html/tao/ciao/DAnCE.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
@@ -157,6 +164,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -167,4 +175,4 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
diff --git a/etc/ciao_config_handlers.doxygen b/etc/ciao_config_handlers.doxygen
index f6a690b87b1..89edd752249 100644
--- a/etc/ciao_config_handlers.doxygen
+++ b/etc/ciao_config_handlers.doxygen
@@ -75,7 +75,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -119,10 +119,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO . ACEXML TAO/tao/IORTable TAO/CIAO/tools/Config_Handlers
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER \
                         CIAO_NAMESPACE
 
 #---------------------------------------------------------------------------
@@ -157,6 +164,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -167,5 +175,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao.doxygen b/etc/tao.doxygen
index a1b094b5be6..457356e0a71 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -123,7 +123,14 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 			ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -147,6 +154,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -157,5 +165,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_anytypecode.doxygen b/etc/tao_anytypecode.doxygen
index d91a789b2f5..dd0c9a3c974 100644
--- a/etc/tao_anytypecode.doxygen
+++ b/etc/tao_anytypecode.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
index 55bd43a7090..c3bf46b6afe 100644
--- a/etc/tao_av.doxygen
+++ b/etc/tao_av.doxygen
@@ -79,7 +79,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -123,9 +123,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -151,6 +159,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -161,5 +170,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_cosevent.doxygen b/etc/tao_cosevent.doxygen
index b5221c38d5a..d8eeeebdac1 100644
--- a/etc/tao_cosevent.doxygen
+++ b/etc/tao_cosevent.doxygen
@@ -79,7 +79,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -123,9 +123,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -152,6 +160,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -162,5 +171,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_cosnaming.doxygen b/etc/tao_cosnaming.doxygen
index e37dc985d3a..24941b5cec4 100644
--- a/etc/tao_cosnaming.doxygen
+++ b/etc/tao_cosnaming.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -121,9 +121,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +156,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +167,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_cosnotification.doxygen b/etc/tao_cosnotification.doxygen
index 825abb9e60c..3bb1ad7c09d 100644
--- a/etc/tao_cosnotification.doxygen
+++ b/etc/tao_cosnotification.doxygen
@@ -53,8 +53,11 @@ INPUT                 = \
 	TAO/orbsvcs/orbsvcs/CosNotifyFilter.idl \
 	TAO/orbsvcs/orbsvcs/CosNotifyComm.idl \
 	TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl \
-	TAO/orbsvcs/orbsvcs/Notify
-FILE_PATTERNS         = *.cpp *.h CEC_*.i CEC_*.inl CEC_*.pidl *.idl
+        TAO/orbsvcs/orbsvcs/Notify \
+        TAO/orbsvcs/orbsvcs/Notify/Any \
+        TAO/orbsvcs/orbsvcs/Notify/Sequence \
+        TAO/orbsvcs/orbsvcs/Notify/Structured
+FILE_PATTERNS         = *.cpp *.h *.i *.inl *.idl
 RECURSIVE             =
 EXCLUDE               =
 EXCLUDE_PATTERNS      =
@@ -81,7 +84,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -125,9 +128,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -155,6 +166,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -165,5 +177,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_costime.doxygen b/etc/tao_costime.doxygen
index 392c1bcb6d4..745aca15640 100644
--- a/etc/tao_costime.doxygen
+++ b/etc/tao_costime.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -121,9 +121,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -149,6 +157,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -159,5 +168,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_costrader.doxygen b/etc/tao_costrader.doxygen
index 6a7af78162e..548efc9cd75 100644
--- a/etc/tao_costrader.doxygen
+++ b/etc/tao_costrader.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -124,9 +124,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -152,6 +160,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -162,5 +171,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen
index 1242141103b..d41e719ee46 100644
--- a/etc/tao_dynamicany.doxygen
+++ b/etc/tao_dynamicany.doxygen
@@ -1,3 +1,4 @@
+
 # Doxyfile 1.1.5
 #
 # $Id$
@@ -76,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +121,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -147,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -157,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen
index 6249d6c5913..9b58fff353a 100644
--- a/etc/tao_dynamicinterface.doxygen
+++ b/etc/tao_dynamicinterface.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -147,6 +154,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -157,5 +165,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen
index 767f6bcb293..0d2c93f6d4e 100644
--- a/etc/tao_esf.doxygen
+++ b/etc/tao_esf.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,9 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +156,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +167,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_ifr.doxygen b/etc/tao_ifr.doxygen
index 8e7f91df830..90b9c3a15db 100644
--- a/etc/tao_ifr.doxygen
+++ b/etc/tao_ifr.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -151,6 +158,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -161,5 +169,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_implrepo.doxygen b/etc/tao_implrepo.doxygen
index abef8c6f381..0d3257b0583 100644
--- a/etc/tao_implrepo.doxygen
+++ b/etc/tao_implrepo.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,9 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -149,6 +157,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -159,5 +168,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen
index ceb37a681ea..b1c3f27b035 100644
--- a/etc/tao_iormanip.doxygen
+++ b/etc/tao_iormanip.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen
index 3ae785b6abc..2b0083dddc8 100644
--- a/etc/tao_iortable.doxygen
+++ b/etc/tao_iortable.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_pi.doxygen b/etc/tao_pi.doxygen
index 680c07aa7a6..8d73a63172d 100644
--- a/etc/tao_pi.doxygen
+++ b/etc/tao_pi.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_pi_server.doxygen b/etc/tao_pi_server.doxygen
index d16b7edd6fc..150e54a021d 100644
--- a/etc/tao_pi_server.doxygen
+++ b/etc/tao_pi_server.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_portablegroup.doxygen b/etc/tao_portablegroup.doxygen
index e43483a91d0..6fa89afafe4 100644
--- a/etc/tao_portablegroup.doxygen
+++ b/etc/tao_portablegroup.doxygen
@@ -79,7 +79,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -123,9 +123,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -151,6 +159,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -161,5 +170,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen
index 6077b14b5f9..329860ed9a2 100644
--- a/etc/tao_portableserver.doxygen
+++ b/etc/tao_portableserver.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_pss.doxygen b/etc/tao_pss.doxygen
index 26e69b5387f..511c3feaeb5 100644
--- a/etc/tao_pss.doxygen
+++ b/etc/tao_pss.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,9 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +156,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +167,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_rtcorba.doxygen b/etc/tao_rtcorba.doxygen
index e28699ebea5..d33ebb30d10 100644
--- a/etc/tao_rtcorba.doxygen
+++ b/etc/tao_rtcorba.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen
index c7bb0bc3b8b..87a0535ea76 100644
--- a/etc/tao_rtevent.doxygen
+++ b/etc/tao_rtevent.doxygen
@@ -85,7 +85,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -129,9 +129,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO/orbsvcs TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -158,6 +166,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -168,5 +177,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_rtportableserver.doxygen b/etc/tao_rtportableserver.doxygen
index c92a6f6b57b..1d2218e55a3 100644
--- a/etc/tao_rtportableserver.doxygen
+++ b/etc/tao_rtportableserver.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,10 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
                         ACE_THROW_SPEC \
-                        TAO_NAMESPACE
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -148,6 +155,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -158,5 +166,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_security.doxygen b/etc/tao_security.doxygen
index fa14a015d52..025be9c8b58 100644
--- a/etc/tao_security.doxygen
+++ b/etc/tao_security.doxygen
@@ -81,7 +81,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -125,9 +125,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -153,6 +161,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -163,5 +172,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_smartproxies.doxygen b/etc/tao_smartproxies.doxygen
index 3c56862a1bc..ddf874a22d1 100644
--- a/etc/tao_smartproxies.doxygen
+++ b/etc/tao_smartproxies.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,9 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -146,6 +154,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +165,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_ssliop.doxygen b/etc/tao_ssliop.doxygen
index 1563a5e34d7..284c6d47f15 100644
--- a/etc/tao_ssliop.doxygen
+++ b/etc/tao_ssliop.doxygen
@@ -81,7 +81,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -125,9 +125,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -154,6 +162,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -164,5 +173,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/etc/tao_strategies.doxygen b/etc/tao_strategies.doxygen
index 92386ba148a..7916be772d0 100644
--- a/etc/tao_strategies.doxygen
+++ b/etc/tao_strategies.doxygen
@@ -76,7 +76,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
+GENERATE_HTMLHELP     = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -120,9 +120,17 @@ SEARCH_INCLUDES       = YES
 INCLUDE_PATH          = TAO .
 PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
+                        ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-			ACE_THROW_SPEC
+                        ACE_THROW_SPEC \
+                        ACE_ENV_ARG_DECL_NOT_USED \
+                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
+                        ACE_ENV_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_DECL \
+                        ACE_ENV_SINGLE_ARG_PARAMETER \
+                        ACE_ENV_ARG_PARAMETER
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
@@ -146,6 +154,7 @@ COLLABORATION_GRAPH   = YES
 INCLUDE_GRAPH         = YES
 INCLUDED_BY_GRAPH     = YES
 GRAPHICAL_HIERARCHY   = YES
+DOT_MULTI_TARGETS     = YES
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 DOT_PATH              =
@@ -156,5 +165,5 @@ MAX_DOT_GRAPH_HEIGHT  = 1024
 # Configuration::addtions related to the search engine
 #---------------------------------------------------------------------------
 
-SEARCHENGINE          = NO
+SEARCHENGINE          = YES
 
diff --git a/examples/APG/Active_Objects/AO.cpp b/examples/APG/Active_Objects/AO.cpp
index 8a50e491162..b84a017d590 100644
--- a/examples/APG/Active_Objects/AO.cpp
+++ b/examples/APG/Active_Objects/AO.cpp
@@ -173,26 +173,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 6
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Future<int>;
-template class ACE_Future_Rep<int>;
-template class ACE_Future_Observer<int>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<int> *>;
-template class ACE_Node<ACE_Future_Observer<int> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>;
-template class ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>;
-template class ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Future<int>
-#pragma instantiate ACE_Future_Rep<int>
-#pragma instantiate ACE_Future_Observer<int>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/Active_Objects/AO2.cpp b/examples/APG/Active_Objects/AO2.cpp
index a3246b660e0..04553c8e1b8 100644
--- a/examples/APG/Active_Objects/AO2.cpp
+++ b/examples/APG/Active_Objects/AO2.cpp
@@ -183,26 +183,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 2
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Future<int>;
-template class ACE_Future_Rep<int>;
-template class ACE_Future_Observer<int>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<int> *>;
-template class ACE_Node<ACE_Future_Observer<int> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>;
-template class ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>;
-template class ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Future<int>
-#pragma instantiate ACE_Future_Rep<int>
-#pragma instantiate ACE_Future_Observer<int>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/Active_Objects/active_objects.mpc b/examples/APG/Active_Objects/active_objects.mpc
index 262ae418a65..44fe88bfd30 100644
--- a/examples/APG/Active_Objects/active_objects.mpc
+++ b/examples/APG/Active_Objects/active_objects.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(AO) : aceexe {
+  avoids += ace_for_tao
   exename = AO
   Source_Files {
     AO.cpp
@@ -9,6 +10,7 @@ project(AO) : aceexe {
 }
 
 project(AO2) : aceexe {
+  avoids += ace_for_tao
   exename = AO2
   Source_Files {
     AO2.cpp
diff --git a/examples/APG/Config/config.mpc b/examples/APG/Config/config.mpc
index bd2aa0fcb99..5b705d144bc 100644
--- a/examples/APG/Config/config.mpc
+++ b/examples/APG/Config/config.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*HA Status) : aceexe {
+  avoids += ace_for_tao
   exename = HA_Status
   Source_Files {
     HA_Status.cpp
diff --git a/examples/APG/Containers/Allocator.cpp b/examples/APG/Containers/Allocator.cpp
index 9f9fe92d2cc..847235a3061 100644
--- a/examples/APG/Containers/Allocator.cpp
+++ b/examples/APG/Containers/Allocator.cpp
@@ -91,18 +91,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return se.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Cached_Allocator<ACE_Null_Mutex>;
-template class ACE_Unbounded_Stack<DataElement>;
-template class ACE_Node<DataElement>;
-template class ACE_Cached_Mem_Pool_Node<char>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<char> >;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<char>,ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Cached_Allocator<ACE_Null_Mutex>
-#pragma instantiate ACE_Unbounded_Stack<DataElement>
-#pragma instantiate ACE_Node<DataElement>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<char>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<char> >
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<char>,ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/Array.cpp b/examples/APG/Containers/Array.cpp
index 834f595303b..1ffb19f22e9 100644
--- a/examples/APG/Containers/Array.cpp
+++ b/examples/APG/Containers/Array.cpp
@@ -39,12 +39,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 1
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array <DataElement*>;
-template class ACE_Array_Base<DataElement*>;
-template class ACE_Array_Iterator<DataElement*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array <DataElement*>
-#pragma instantiate ACE_Array_Base<DataElement*>
-#pragma instantiate ACE_Array_Iterator<DataElement*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/DLList.cpp b/examples/APG/Containers/DLList.cpp
index db3ec870d58..8c93e5b4039 100644
--- a/examples/APG/Containers/DLList.cpp
+++ b/examples/APG/Containers/DLList.cpp
@@ -114,16 +114,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return test.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_DLList <DataElement>;
-template class ACE_DLList_Iterator <DataElement>;
-template class ACE_DLList_Reverse_Iterator <DataElement>;
-template class ACE_Double_Linked_List<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_DLList <DataElement>
-#pragma instantiate ACE_DLList_Iterator <DataElement*>
-#pragma instantiate ACE_DLList_Reverse_Iterator <DataElement*>
-#pragma instantiate ACE_Double_Linked_List<ACE_DLList_Node>;
-#pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/Hash_Map.cpp b/examples/APG/Containers/Hash_Map.cpp
index a81dbd47061..1b2d4ee4634 100644
--- a/examples/APG/Containers/Hash_Map.cpp
+++ b/examples/APG/Containers/Hash_Map.cpp
@@ -116,19 +116,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return me.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Hash_Map <int, DataElement>
-;
-template class ACE_Hash_Map_Manager_Ex<int, DataElement, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>
-;
-template class ACE_Hash_Map_Entry<int, DataElement>
-;
-template class ACE_Hash_Map_Iterator_Base_Ex<int, DataElement, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>
-;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Hash_Map <int, DataElement*>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, DataElement, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Entry<int, DataElement>;
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, DataElement, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
-
diff --git a/examples/APG/Containers/Hash_Map_Hash.cpp b/examples/APG/Containers/Hash_Map_Hash.cpp
index 4971954e212..faad3c72585 100644
--- a/examples/APG/Containers/Hash_Map_Hash.cpp
+++ b/examples/APG/Containers/Hash_Map_Hash.cpp
@@ -109,18 +109,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return me.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager_Ex<KeyType, DataElement, ACE_Hash<KeyType>, ACE_Equal_To<KeyType>, ACE_Null_Mutex>;
-template class Hash_Map <KeyType, DataElement>;
-template class ACE_Hash_Map_Entry<KeyType,DataElement>;
-template class ACE_Hash_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<KeyType, DataElement, ACE_Hash<KeyType>, ACE_Equal_To<KeyType>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Hash_Map <KeyType, DataElement>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<KeyType, DataElement,ACE_Hash<KeyType>, ACE_Equal_To<KeyType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<KeyType,DataElement>
-#pragma instantiate ACE_Hash_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KeyType, DataElement, ACE_Hash<KeyType>, ACE_Equal_To<KeyType>, ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/Hash_Map_Hash.h b/examples/APG/Containers/Hash_Map_Hash.h
index 3d3a76178f0..a125f9ee7e6 100644
--- a/examples/APG/Containers/Hash_Map_Hash.h
+++ b/examples/APG/Containers/Hash_Map_Hash.h
@@ -21,6 +21,8 @@ private:
   int val_;
 };
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Specialize the hash functor.
 template<>
 class ACE_Hash<KeyType>
@@ -47,6 +49,9 @@ public:
     return (val1 == val2);
   }
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Listing 1
 
 #endif /* __HASH_MAP_HASH_H_ */
diff --git a/examples/APG/Containers/Map_Manager.cpp b/examples/APG/Containers/Map_Manager.cpp
index 4dce09fd2a0..6673204fcc4 100644
--- a/examples/APG/Containers/Map_Manager.cpp
+++ b/examples/APG/Containers/Map_Manager.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/Log_Msg.h"
 #include "ace/Map_Manager.h"
 #include "ace/Synch.h"
 #include "DataElement.h"
@@ -114,22 +115,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return  me.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Entry<KeyType,DataElement>
-;
-template class ACE_Map_Iterator_Base<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<KeyType,DataElement>
-#pragma instantiate ACE_Map_Iterator_Base<KeyType,DataElement,ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/APG/Containers/Map_Manager_Specialization.cpp b/examples/APG/Containers/Map_Manager_Specialization.cpp
index 82a536c33a4..fc9c00d86f0 100644
--- a/examples/APG/Containers/Map_Manager_Specialization.cpp
+++ b/examples/APG/Containers/Map_Manager_Specialization.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/Log_Msg.h"
 #include "ace/Map_Manager.h"
 #include "ace/Synch.h" // Needed for the lock.
 #include "DataElement.h"
@@ -150,21 +151,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return  me.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Entry<KeyType,DataElement>
-;
-template class ACE_Map_Iterator_Base<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-;
-template class ACE_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<KeyType,DataElement,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<KeyType,DataElement>
-#pragma instantiate ACE_Map_Iterator_Base<KeyType,DataElement,ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Containers/Queues.cpp b/examples/APG/Containers/Queues.cpp
index 857dc554f8d..ca945169ed4 100644
--- a/examples/APG/Containers/Queues.cpp
+++ b/examples/APG/Containers/Queues.cpp
@@ -71,7 +71,7 @@ int QueueExample::runStackUnboundedQueue (void)
        !iter.done ();
        iter.advance ())
     {
-      DataElement *elem;
+      DataElement *elem = 0;
       iter.next (elem);
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d:"), elem->getData ()));
     }
@@ -97,7 +97,7 @@ int QueueExample::runHeapUnboundedQueue (void)
        !iter.done ();
        iter.advance ())
     {
-      DataElement **elem;
+      DataElement **elem = 0;
       iter.next(elem);
       ACE_DEBUG
         ((LM_DEBUG, ACE_TEXT ("%d:"), (*elem)->getData ()));
@@ -113,18 +113,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return que.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<DataElement>;
-template class ACE_Node<DataElement*>;
-template class ACE_Unbounded_Queue<DataElement*>;
-template class ACE_Unbounded_Queue_Iterator<DataElement*>;
-template class ACE_Unbounded_Queue<DataElement>;
-template class ACE_Unbounded_Queue_Iterator<DataElement>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<DataElement>
-#pragma instantiate ACE_Node<DataElement*>
-#pragma instantiate ACE_Unbounded_Queue<DataElement*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<DataElement*>
-#pragma instantiate ACE_Unbounded_Queue<DataElement>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<DataElement>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/RB_Tree.cpp b/examples/APG/Containers/RB_Tree.cpp
index 09e4bf36308..187332a31d8 100644
--- a/examples/APG/Containers/RB_Tree.cpp
+++ b/examples/APG/Containers/RB_Tree.cpp
@@ -133,26 +133,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return te.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_RB_Tree <int, DataElement*,
-ACE_Less_Than<int>, ACE_Null_Mutex>
-;
-template class Tree <int, DataElement*>
-;
-template class ACE_RB_Tree_Iterator_Base<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Iterator<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Reverse_Iterator<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Node<int, DataElement*>
-;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_RB_Tree <int, DataElement*,ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_Less_Than <int>
-#pragma instantiate Tree <int, DataElement*>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<int, DataElement*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/RB_Tree_Functors.cpp b/examples/APG/Containers/RB_Tree_Functors.cpp
index 06753d5fc68..cb71fd75d79 100644
--- a/examples/APG/Containers/RB_Tree_Functors.cpp
+++ b/examples/APG/Containers/RB_Tree_Functors.cpp
@@ -55,7 +55,7 @@ int Tree_Example::run ()
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using find: \n")));
   for (int j = 0; j < 100; j++)
     {
-      DataElement* d;
+      DataElement* d = 0;
       int result = tree_.find (j, d);
       if (result != 0)
         {
@@ -132,25 +132,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return te.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_RB_Tree <KeyType, DataElement*,
-ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-;
-template class Tree <KeyType, DataElement*>
-;
-template class ACE_RB_Tree_Iterator_Base<KeyType, DataElement*, ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Iterator<KeyType, DataElement*, ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Reverse_Iterator<KeyType, DataElement*, ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-;
-template class ACE_RB_Tree_Node<KeyType, DataElement*>
-;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_RB_Tree <KeyType, DataElement*,ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-#pragma instantiate Tree <KeyType, DataElement*>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<KeyType, DataElement*, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<KeyType, DataElement*, ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<KeyType, DataElement*, ACE_Less_Than<KeyType>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<KeyType, DataElement*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/RB_Tree_Functors.h b/examples/APG/Containers/RB_Tree_Functors.h
index 75fb33a69d8..010fb5fda62 100644
--- a/examples/APG/Containers/RB_Tree_Functors.h
+++ b/examples/APG/Containers/RB_Tree_Functors.h
@@ -20,6 +20,8 @@ private:
   int val_;
 };
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<>
 class ACE_Less_Than<KeyType>
 {
@@ -27,6 +29,9 @@ public:
   int operator() (const KeyType k1, const KeyType k2)
   { return k1 < k2; }
 };
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // Listing 1
 
 #endif /* __RB_TREE_FUNCTORS_H_ */
diff --git a/examples/APG/Containers/Sets.cpp b/examples/APG/Containers/Sets.cpp
index 992546708e7..3eaec6f7bec 100644
--- a/examples/APG/Containers/Sets.cpp
+++ b/examples/APG/Containers/Sets.cpp
@@ -121,14 +121,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   se.run ();
   return 0;
 }
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<DataElement*>;
-template class ACE_Unbounded_Set_Iterator<DataElement*>;
-template class ACE_Bounded_Set<DataElement>;
-template class ACE_Node<DataElement*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set<DataElement*>
-#pragma instantitate ACE_Unbounded_Set_Iterator<DataElement*>
-#pragma instantiate ACE_Bounded_Set<DataElement>
-#pragma instantiate ACE_Node<DataElement*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/Stacks.cpp b/examples/APG/Containers/Stacks.cpp
index 17b98e93bf6..b02a243ab92 100644
--- a/examples/APG/Containers/Stacks.cpp
+++ b/examples/APG/Containers/Stacks.cpp
@@ -128,7 +128,7 @@ int StackExample::runUnboundedStack (void)
   ACE_Unbounded_Stack_Iterator<DataElement*> iter (ustack);
   for (iter.first (); !iter.done (); iter.advance ())
     {
-      DataElement** elem;
+      DataElement** elem = 0;
       iter.next (elem);
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d:"),
                   (*elem)->getData ()));
@@ -145,18 +145,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return se.run ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Bounded_Stack<DataElement>;
-template class ACE_Bounded_Stack<DataElement*>;
-template class ACE_Fixed_Stack<DataElement*, 100>;
-template class ACE_Node<DataElement*>;
-template class ACE_Unbounded_Stack<DataElement*>;
-template class ACE_Unbounded_Stack_Iterator<DataElement*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Bounded_Stack<DataElement>
-#pragma instantiate ACE_Bounded_Stack<DataElement*>
-#pragma instantiate ACE_Fixed_Stack<DataElement*, 100>
-#pragma instantiate ACE_Node<DataElement*>
-#pragma instantiate ACE_Unbounded_Stack<DataElement*>
-#pragma instantiate ACE_Unbounded_Stack_Iterator<DataElement*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Containers/containers.mpc b/examples/APG/Containers/containers.mpc
index 2bdb1e527d7..d08ef9133aa 100644
--- a/examples/APG/Containers/containers.mpc
+++ b/examples/APG/Containers/containers.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(DLList) : aceexe {
+  avoids += ace_for_tao
   exename = DLList
   Source_Files {
     DLList.cpp
diff --git a/examples/APG/Logging/Callback-2.h b/examples/APG/Logging/Callback-2.h
index 3a3d27f6296..27cbdcd0ab7 100644
--- a/examples/APG/Logging/Callback-2.h
+++ b/examples/APG/Logging/Callback-2.h
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef APG_CALLBACK2_H
+#define APG_CALLBACK2_H
+
 #include "ace/OS_NS_time.h"
 #include "ace/streams.h"
 #include "ace/Log_Msg_Callback.h"
@@ -38,3 +41,4 @@ public:
     }
 };
 
+#endif /* APG_CALLBACK2_H */
diff --git a/examples/APG/Logging/Callback-3.h b/examples/APG/Logging/Callback-3.h
index da852cb847c..22824fad382 100644
--- a/examples/APG/Logging/Callback-3.h
+++ b/examples/APG/Logging/Callback-3.h
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef APG_CALLBACK3_H
+#define APG_CALLBACK3_H
+
 #include "ace/streams.h"
 #include "ace/Log_Msg.h"
 #include "ace/Log_Msg_Callback.h"
@@ -39,8 +42,13 @@ public:
     {
       if (!this->logger_)
 	{
+#  if defined (ACE_LACKS_IOSTREAM_TOTALLY)
+	  log_record.print
+            (ACE_TEXT (""), ACE_Log_Msg::VERBOSE, stderr);
+#  else
 	  log_record.print
             (ACE_TEXT (""), ACE_Log_Msg::VERBOSE, cerr);
+#  endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 	  return;
 	}
 
@@ -57,3 +65,5 @@ public:
 private:
   ACE_SOCK_Stream *logger_;
 };
+
+#endif /* APG_CALLBACK3_H */
diff --git a/examples/APG/Logging/Callback.h b/examples/APG/Logging/Callback.h
index 264c99bd9c1..86dff9ea826 100644
--- a/examples/APG/Logging/Callback.h
+++ b/examples/APG/Logging/Callback.h
@@ -1,5 +1,8 @@
 // $Id$
 
+#ifndef APG_CALLBACK_H
+#define APG_CALLBACK_H
+
 #include "ace/streams.h"
 #include "ace/Log_Msg.h"
 #include "ace/Log_Msg_Callback.h"
@@ -9,7 +12,14 @@ class Callback : public ACE_Log_Msg_Callback
 {
 public:
   void log (ACE_Log_Record &log_record) {
+#  if defined (ACE_LACKS_IOSTREAM_TOTALLY)
+    log_record.print (ACE_TEXT (""), 0, stderr);
+    log_record.print (ACE_TEXT (""), ACE_Log_Msg::VERBOSE, stderr);
+#  else
     log_record.print (ACE_TEXT (""), 0, cerr);
     log_record.print (ACE_TEXT (""), ACE_Log_Msg::VERBOSE, cerr);
+#  endif /* ACE_LACKS_IOSTREAM_TOTALLY */
   }
 };
+
+#endif /* APG_CALLBACK_H */
diff --git a/examples/APG/Logging/LogManager.h b/examples/APG/Logging/LogManager.h
index 7ffe5a05743..2cf8c7f7d48 100644
--- a/examples/APG/Logging/LogManager.h
+++ b/examples/APG/Logging/LogManager.h
@@ -5,9 +5,6 @@
 #include "ace/Singleton.h"
 #include "ace/Log_Msg.h"
 #include "ace/Log_Msg_Callback.h"
-#if (defined (_MSC_VER) && (_MSC_VER < 1300))
-#include <fstream>
-#endif
 
 #ifndef LOG_MANAGER_H
 #define LOG_MANAGER_H
diff --git a/examples/APG/Logging/Use_LogManager.cpp b/examples/APG/Logging/Use_LogManager.cpp
index ddcbb758f87..76de7b7fb56 100644
--- a/examples/APG/Logging/Use_LogManager.cpp
+++ b/examples/APG/Logging/Use_LogManager.cpp
@@ -26,12 +26,8 @@ void foo (void)
 // Listing 1
 
 // Listing 2 code/ch03
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
- template class ACE_Singleton<LogManager, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<LogManager, ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<LogManager, ACE_Null_Mutex> *
   ACE_Singleton<LogManager, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 // Listing 2
diff --git a/examples/APG/Logging/Use_Multiple_Sinks.cpp b/examples/APG/Logging/Use_Multiple_Sinks.cpp
index b2d3daec06c..352a598b4e2 100644
--- a/examples/APG/Logging/Use_Multiple_Sinks.cpp
+++ b/examples/APG/Logging/Use_Multiple_Sinks.cpp
@@ -2,9 +2,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/streams.h"
-#if (defined (_MSC_VER) && (_MSC_VER < 1300))
-#include <fstream>
-#endif
+
 int ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   // Output to default destination (stderr)
diff --git a/examples/APG/Logging/Use_Ostream.cpp b/examples/APG/Logging/Use_Ostream.cpp
index 7187ef563f1..28a2fefcc1c 100644
--- a/examples/APG/Logging/Use_Ostream.cpp
+++ b/examples/APG/Logging/Use_Ostream.cpp
@@ -2,9 +2,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/streams.h"
-#if (defined (_MSC_VER) && (_MSC_VER < 1300))
-#include <fstream>
-#endif
+
 void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/APG/Misc_IPC/misc_ipc.mpc b/examples/APG/Misc_IPC/misc_ipc.mpc
index d720f15999b..47e1c34758b 100644
--- a/examples/APG/Misc_IPC/misc_ipc.mpc
+++ b/examples/APG/Misc_IPC/misc_ipc.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(UDP Broadcast) : aceexe {
+  avoids += ace_for_tao
   exename = UDP_Broadcast
   Source_Files {
     UDP_Broadcast.cpp
@@ -16,6 +17,7 @@ project(UDP Multicast) : aceexe {
 }
 
 project(UDP Unicast) : aceexe {
+  avoids += ace_for_tao
   exename = UDP_Unicast
   Source_Files {
     UDP_Unicast.cpp
diff --git a/examples/APG/Naming/Graph.cpp b/examples/APG/Naming/Graph.cpp
index 79d0def14f3..62ca52afd0d 100644
--- a/examples/APG/Naming/Graph.cpp
+++ b/examples/APG/Naming/Graph.cpp
@@ -5,10 +5,6 @@
 
 void Graph::graph (char *filename, Graphable_Element_List &data)
 {
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  ACE_UNUSED_ARG (filename);
-  ACE_UNUSED_ARG (data);
-#else
   data.sort ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Save graph to %C\n"), filename));
@@ -48,5 +44,4 @@ void Graph::graph (char *filename, Graphable_Element_List &data)
         }
       ACE_DEBUG ((LM_INFO, ACE_TEXT ("\n")));
     }
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 }
diff --git a/examples/APG/Naming/Graphable_Element.cpp b/examples/APG/Naming/Graphable_Element.cpp
index 6b5d6c755e6..c3ff6ee7b41 100644
--- a/examples/APG/Naming/Graphable_Element.cpp
+++ b/examples/APG/Naming/Graphable_Element.cpp
@@ -2,12 +2,3 @@
 
 #include "Graphable_Element.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class _List_base<Graphable_Element, allocator<Graphable_Element> >;
-template void list<Graphable_Element, allocator<Graphable_Element> >::sort(void);
-template void list<Graphable_Element, allocator<Graphable_Element> >::merge(list<Graphable_Element, allocator<Graphable_Element> > &);
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-pragma instantiate _List_base<Graphable_Element, allocator<Graphable_Element> >;
-pragma instantiate list<Graphable_Element, allocator<Graphable_Element> >::sort(void);
-pragma instantiate list<Graphable_Element, allocator<Graphable_Element> >::merge(list<Graphable_Element, allocator<Graphable_Element> > &);
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Naming/Temperature_Grapher.cpp b/examples/APG/Naming/Temperature_Grapher.cpp
index 4f1ef1bcff1..e11367af4a0 100644
--- a/examples/APG/Naming/Temperature_Grapher.cpp
+++ b/examples/APG/Naming/Temperature_Grapher.cpp
@@ -54,7 +54,6 @@ void Temperature_Grapher::update_graph (void)
     }
   // Listing 4
 
-#if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
   // Listing 5 code/ch21
   Graphable_Element_List graphable;
   ACE_BINDING_ITERATOR set_iterator (set);
@@ -79,5 +78,4 @@ void Temperature_Grapher::update_graph (void)
   this->naming_context_.rebind ("lastGraphed",
                                 lastUpdate->int_value ());
   // Listing 6
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 }
diff --git a/examples/APG/Naming/naming.mpc b/examples/APG/Naming/naming.mpc
index 5c32cb1d641..fda823954fc 100644
--- a/examples/APG/Naming/naming.mpc
+++ b/examples/APG/Naming/naming.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Netlocal) : aceexe {
+  avoids += ace_for_tao
   exename = Netlocal
   Source_Files {
     Netlocal.cpp
@@ -10,6 +11,7 @@ project(Netlocal) : aceexe {
 }
 
 project(Netlocal Reader) : aceexe {
+  avoids += ace_for_tao
   exename = Netlocal_reader
   Source_Files {
     Netlocal_reader.cpp
@@ -19,6 +21,7 @@ project(Netlocal Reader) : aceexe {
 }
 
 project(Nodelocal) : aceexe {
+  avoids += ace_for_tao
   exename = Nodelocal
   Source_Files {
     Nodelocal.cpp
@@ -27,6 +30,7 @@ project(Nodelocal) : aceexe {
 }
 
 project(Nodelocal Shared) : aceexe {
+  avoids += ace_for_tao
   exename = Nodelocal_shared
   Source_Files {
     Nodelocal_shared.cpp
@@ -35,6 +39,7 @@ project(Nodelocal Shared) : aceexe {
 }
 
 project(Nodelocal Shared Reader) : aceexe {
+  avoids += ace_for_tao
   exename = Nodelocal_shared_reader
   Source_Files {
     Nodelocal_shared_reader.cpp
diff --git a/examples/APG/Proactor/HA_Proactive_Status.cpp b/examples/APG/Proactor/HA_Proactive_Status.cpp
index e64656398ba..9d9b9dfb0e5 100644
--- a/examples/APG/Proactor/HA_Proactive_Status.cpp
+++ b/examples/APG/Proactor/HA_Proactive_Status.cpp
@@ -149,12 +149,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Asynch_Acceptor<HA_Proactive_Service>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Asynch_Acceptor<HA_Proactive_Service>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
-
 #else
 
 int
diff --git a/examples/APG/Proactor/proactor.mpc b/examples/APG/Proactor/proactor.mpc
index 2d3237b176a..85ef950ae66 100644
--- a/examples/APG/Proactor/proactor.mpc
+++ b/examples/APG/Proactor/proactor.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(HA Proactive Status) : aceexe {
+  avoids += ace_for_tao
   exename = HA_Proactive_Status
   Source_Files {
     HA_Proactive_Status.cpp
diff --git a/examples/APG/Processes/Process_Mutex.cpp b/examples/APG/Processes/Process_Mutex.cpp
index a10078ad2ac..2afb89803b9 100644
--- a/examples/APG/Processes/Process_Mutex.cpp
+++ b/examples/APG/Processes/Process_Mutex.cpp
@@ -55,7 +55,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else              // Run as the parent.
     {
       ACE_Process_Options options;
-      options.command_line ("%s a", argv[0]);
+      options.command_line (ACE_TEXT ("%s a"), argv[0]);
       ACE_Process processa, processb;
 
       pid_t pida = processa.spawn (options);
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index 6d727ea77db..0776a44a8ec 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -75,7 +75,7 @@ private:
   {
     ACE_TRACE ("Manager::prepare");
 
-    options.command_line ("%s 1", this->programName_);
+    options.command_line (ACE_TEXT ("%s 1"), this->programName_);
     if (this->setStdHandles (options) == -1 ||
         this->setEnvVariable (options) == -1)
       return -1;
diff --git a/examples/APG/Processes/processes.mpc b/examples/APG/Processes/processes.mpc
index 91c0e28c935..a7cb01040bb 100644
--- a/examples/APG/Processes/processes.mpc
+++ b/examples/APG/Processes/processes.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Process Manager Death) : aceexe {
+  avoids += ace_for_tao
   exename = Process_Manager_Death
   Source_Files {
     Process_Manager_Death.cpp
@@ -9,6 +10,7 @@ project(Process Manager Death) : aceexe {
 }
 
 project(Process Manager Spawn) : aceexe {
+  avoids += ace_for_tao
   exename = Process_Manager_Spawn
   Source_Files {
     Process_Manager_Spawn.cpp
@@ -16,6 +18,7 @@ project(Process Manager Spawn) : aceexe {
 }
 
 project(Process Mutex) : aceexe {
+  avoids += ace_for_tao
   exename = Process_Mutex
   Source_Files {
     Process_Mutex.cpp
@@ -23,6 +26,7 @@ project(Process Mutex) : aceexe {
 }
 
 project(Spawn) : aceexe {
+  avoids += ace_for_tao
   exename = Spawn
   Source_Files {
     Spawn.cpp
diff --git a/examples/APG/Reactor/Client.cpp b/examples/APG/Reactor/Client.cpp
index 520b17f7ef1..b2773bbf7f3 100644
--- a/examples/APG/Reactor/Client.cpp
+++ b/examples/APG/Reactor/Client.cpp
@@ -115,15 +115,4 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 // Listing 6
 
 // Listing 7 code/ch07
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector<Client, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector_Base<Client>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Client>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Connector<Client, ACE_SOCK_CONNECTOR>
-# pragma instantiate ACE_Connector_Base<Client>
-# pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-# pragma instantiate ACE_NonBlocking_Connect_Handler<Client>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 // Listing 7
diff --git a/examples/APG/Reactor/HAStatus-AC.cpp b/examples/APG/Reactor/HAStatus-AC.cpp
index 24861113f85..c99a1c5036c 100644
--- a/examples/APG/Reactor/HAStatus-AC.cpp
+++ b/examples/APG/Reactor/HAStatus-AC.cpp
@@ -136,12 +136,4 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 // Listing 2
 
 // Listing 8 code/ch07
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<ClientService, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<ClientService, ACE_SOCK_ACCEPTOR>
-#pragma instantiate \
-   ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 // Listing 8
diff --git a/examples/APG/Shared_Memory/Hash_Map.cpp b/examples/APG/Shared_Memory/Hash_Map.cpp
index 3ca3fff4362..b8d73e0045c 100644
--- a/examples/APG/Shared_Memory/Hash_Map.cpp
+++ b/examples/APG/Shared_Memory/Hash_Map.cpp
@@ -19,22 +19,22 @@ typedef ACE_Allocator_Adapter<ACE_Malloc_T <ACE_MMAP_MEMORY_POOL,
                                             ACE_Process_Mutex,
                                             ACE_Control_Block>
                              > ALLOCATOR;
-typedef ACE_Hash_Map_With_Allocator<int, Record> MAP;
+typedef ACE_Hash_Map_With_Allocator<int, Record> HASH_MAP;
 
 ACE_Process_Mutex coordMutex("Coord-Mutex");
 // Listing 1
 
 // Listing 2 code/ch17
-MAP* smap (ALLOCATOR *shmem_allocator)
+HASH_MAP* smap (ALLOCATOR *shmem_allocator)
 {
   void *db = 0;
   if (shmem_allocator->find (MAP_NAME, db) == 0)
-    return (MAP *) db;
-  size_t hash_table_size = sizeof (MAP);
+    return (HASH_MAP *) db;
+  size_t hash_table_size = sizeof (HASH_MAP);
   void *hash_map = shmem_allocator->malloc (hash_table_size);
   if (hash_map == 0)
     return 0;
-  new (hash_map) MAP (hash_table_size, shmem_allocator);
+  new (hash_map) HASH_MAP (hash_table_size, shmem_allocator);
   if (shmem_allocator->bind (MAP_NAME, hash_map) == -1)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
@@ -42,11 +42,11 @@ MAP* smap (ALLOCATOR *shmem_allocator)
       shmem_allocator->remove ();
       return 0;
     }
-  return (MAP*)hash_map;
+  return (HASH_MAP*)hash_map;
 }
 // Listing 2
 // Listing 6 code/ch17
-int processRecords (MAP *map, ALLOCATOR *shmem_allocator)
+int processRecords (HASH_MAP *map, ALLOCATOR *shmem_allocator)
 {
   ACE_TRACE ("processRecords");
 
@@ -58,7 +58,7 @@ int processRecords (MAP *map, ALLOCATOR *shmem_allocator)
   int *todelete = new int[mapLength];
   int i = 0;
 
-  for (MAP::iterator iter = map->begin ();
+  for (HASH_MAP::iterator iter = map->begin ();
       iter != map->end ();
       iter++)
     {
@@ -105,7 +105,7 @@ int processRecords (MAP *map, ALLOCATOR *shmem_allocator)
 }
 // Listing 6
 // Listing 4 code/ch17
-int addRecords(MAP *map, ALLOCATOR *shmem_allocator)
+int addRecords(HASH_MAP *map, ALLOCATOR *shmem_allocator)
 {
   ACE_TRACE ("addRecords");
 
@@ -151,7 +151,7 @@ int handle_child (void)
                              &options),
                   -1);
 
-  MAP *map = smap (shmem_allocator);
+  HASH_MAP *map = smap (shmem_allocator);
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Map has %d entries\n"),
@@ -182,7 +182,7 @@ int handle_parent (ACE_TCHAR *cmdLine)
      ALLOCATOR (BACKING_STORE, BACKING_STORE, &options),
      -1);
 
-  MAP *map = smap (shmem_allocator);
+  HASH_MAP *map = smap (shmem_allocator);
 
   ACE_Process processa, processb;
   ACE_Process_Options poptions;
@@ -248,30 +248,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 // Listing 3
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Allocator_Adapter<ACE_Malloc_T<ACE_MMAP_MEMORY_POOL,ACE_Process_Mutex,ACE_Control_Block> >;
-template class ACE_Hash_Map_Entry<int,Record>;
-template class ACE_Hash_Map_Manager_Ex<int,Record,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<int,Record,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_With_Allocator<int,Record>;
-// The following instantiation is in ace/System_Time.cpp:
-// template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL,ACE_Process_Mutex,ACE_Control_Block>;
-template class ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-template class ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc_T<ACE_MMAP_MEMORY_POOL,ACE_Process_Mutex,ACE_Control_Block> >
-#pragma instantiate ACE_Hash_Map_Entry<int,Record>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int,Record,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int,Record,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_With_Allocator<int,Record>
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL,ACE_Process_Mutex,ACE_Control_Block>
-// The following instantiation is in ace/System_Time.cpp:
-// #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Shared_Memory/Malloc.cpp b/examples/APG/Shared_Memory/Malloc.cpp
index 0eb7a79780c..7f1ef3a3579 100644
--- a/examples/APG/Shared_Memory/Malloc.cpp
+++ b/examples/APG/Shared_Memory/Malloc.cpp
@@ -111,18 +111,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *[])
 }
 // Listing 4
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// The following instantiation is in ace/System_Time.cpp:
-// template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-template class ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// The following instantiation is in ace/System_Time.cpp:
-// #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Shared_Memory/PI_Malloc.cpp b/examples/APG/Shared_Memory/PI_Malloc.cpp
index 42673c72b63..2d31ba96f35 100644
--- a/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -138,13 +138,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *[])
 }
 // Listing 3
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>;
-template class ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>;
-template class ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>
-#pragma instantiate ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>
-#pragma instantiate ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/APG/Shared_Memory/Pool_Growth.cpp b/examples/APG/Shared_Memory/Pool_Growth.cpp
index 836058ad641..c354b098242 100644
--- a/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -259,16 +259,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >;
-template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>;
-template class ACE_Node<Record>;
-template class ACE_Unbounded_Queue<Record>;
-template class ACE_Unbounded_Queue_Iterator<Record>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >
-#pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Node<Record>
-#pragma instantiate ACE_Unbounded_Queue<Record>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Record>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Shared_Memory/shared_memory.mpc b/examples/APG/Shared_Memory/shared_memory.mpc
index 3e6c3729b17..2cf2400ef8e 100644
--- a/examples/APG/Shared_Memory/shared_memory.mpc
+++ b/examples/APG/Shared_Memory/shared_memory.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Hash Map) : aceexe {
+  avoids += ace_for_tao
   exename = Hash_Map
   Source_Files {
     Hash_Map.cpp
@@ -9,6 +10,7 @@ project(*Hash Map) : aceexe {
 }
 
 project(Malloc) : aceexe {
+  avoids += ace_for_tao
   exename = Malloc
   Source_Files {
     Malloc.cpp
@@ -16,6 +18,7 @@ project(Malloc) : aceexe {
 }
 
 project(Mem Map) : aceexe {
+  avoids += ace_for_tao
   exename = Mem_Map
   Source_Files {
     Mem_Map.cpp
@@ -23,6 +26,7 @@ project(Mem Map) : aceexe {
 }
 
 project(PI Malloc) : aceexe {
+  avoids += ace_for_tao
   exename = PI_Malloc
   Source_Files {
     PI_Malloc.cpp
@@ -30,6 +34,7 @@ project(PI Malloc) : aceexe {
 }
 
 project(Pool Growth) : aceexe {
+  avoids += ace_for_tao
   exename = Pool_Growth
   Source_Files {
     Pool_Growth.cpp
diff --git a/examples/APG/Streams/BasicTask.h b/examples/APG/Streams/BasicTask.h
index 86ac180925f..edebc397998 100644
--- a/examples/APG/Streams/BasicTask.h
+++ b/examples/APG/Streams/BasicTask.h
@@ -54,14 +54,13 @@ public:
         // Listing 1021 code/ch18
         if (message->msg_type () == ACE_Message_Block::MB_HANGUP)
           {
-            if (this->putq (message->duplicate ()) == -1)
+            if (this->putq (message) == -1)
               {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("%p\n"),
-                                   ACE_TEXT ("Task::svc() putq")),
-                                  -1);
+                ACE_ERROR ((LM_ERROR,
+                            ACE_TEXT ("%p\n"),
+                            ACE_TEXT ("Task::svc() putq")));
+                message->release ();
               }
-            message->release ();
             break;
           }
         // Listing 1021
@@ -84,14 +83,14 @@ public:
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("BasicTask::svc() - ")
                     ACE_TEXT ("Continue to next stage\n" )));
-
-        if (this->next_step (message->duplicate ()) < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("%p\n"),
-                             ACE_TEXT ("put_next failed")),
-                            -1);
-
-        message->release ();
+        if (this->next_step (message) < 0)
+          {
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("put_next failed")));
+            message->release ();
+            break;
+          }
         // Listing 1023
       }
 
@@ -107,15 +106,15 @@ public:
       {
         ACE_Message_Block *hangup = new ACE_Message_Block ();
         hangup->msg_type (ACE_Message_Block::MB_HANGUP);
-        if (this->putq (hangup->duplicate ()) == -1)
+        if (this->putq (hangup) == -1)
           {
+            hangup->release ();
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("%p\n"),
                                ACE_TEXT ("Task::close() putq")),
                               -1);
           }
 
-        hangup->release ();
         rval = this->wait ();
       }
 
@@ -127,7 +126,7 @@ public:
 protected:
   virtual int next_step (ACE_Message_Block *message_block)
   {
-    return this->put_next (message_block->duplicate ());
+    return this->put_next (message_block);
   }
   // Listing 105
 
diff --git a/examples/APG/Streams/EndTask.h b/examples/APG/Streams/EndTask.h
index 62b4093f975..a42eca655d9 100644
--- a/examples/APG/Streams/EndTask.h
+++ b/examples/APG/Streams/EndTask.h
@@ -5,8 +5,7 @@
 #define END_TASK_H
 
 // Listing 1 code/ch18
-class EndTask : public BasicTask
-{
+class EndTask : public BasicTask {
 protected:
   virtual int process (Message *)
   {
@@ -14,11 +13,12 @@ protected:
     return 0;
   }
 
-  virtual int next_step (ACE_Message_Block *)
+  virtual int next_step (ACE_Message_Block *mb)
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("EndTask::next_step() - ")
                 ACE_TEXT ("end of the line.\n")));
+    mb->release ();
     return 0;
   }
 };
diff --git a/examples/APG/Streams/streams.mpc b/examples/APG/Streams/streams.mpc
index 3b180f448a3..df74b446031 100644
--- a/examples/APG/Streams/streams.mpc
+++ b/examples/APG/Streams/streams.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Answerer) : aceexe {
+  avoids   += ace_for_tao
   exename   = Answerer
   requires += threads
   Source_Files {
diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
index edc3c03b630..990ab0906b4 100644
--- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
@@ -111,10 +111,3 @@ HA_Status::info (ACE_TCHAR **str, size_t len) const
 ACE_FACTORY_DEFINE (HASTATUS, HA_Status)
 // Listing 4
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Acceptor<ClientHandler, ACE_SOCK_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#  pragma instantiate ACE_Acceptor<ClientHandler, ACE_SOCK_ACCEPTOR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp
index c9dbfbeb961..09f2d75fd59 100644
--- a/examples/APG/Svc_Config/HA_Status_Static.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Static.cpp
@@ -119,10 +119,3 @@ ACE_STATIC_SVC_DEFINE (HA_Status_Descriptor,
 ACE_STATIC_SVC_REQUIRE (HA_Status_Descriptor)
 // Listing 4
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Acceptor<ClientHandler, ACE_SOCK_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#  pragma instantiate ACE_Acceptor<ClientHandler, ACE_SOCK_ACCEPTOR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Svc_Config/svc_config.mpc b/examples/APG/Svc_Config/svc_config.mpc
index 933842648e5..ddc33b97c53 100644
--- a/examples/APG/Svc_Config/svc_config.mpc
+++ b/examples/APG/Svc_Config/svc_config.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*HA Status) : acelib {
+  avoids       += ace_for_tao
   sharedname   = HA_Status
   dynamicflags = HASTATUS_BUILD_DLL
   Source_Files {
@@ -10,6 +11,7 @@ project(*HA Status) : acelib {
 }
 
 project(HA Configurable Server Dynamic) : aceexe {
+  avoids += ace_for_tao
   exename = HA_Configurable_Server_Dynamic
   Source_Files {
     HA_Configurable_Server_Dynamic.cpp
@@ -17,6 +19,7 @@ project(HA Configurable Server Dynamic) : aceexe {
 }
 
 project(HA Configurable Server Static) : aceexe {
+  avoids += ace_for_tao
   exename = HA_Configurable_Server_Static
   Source_Files {
     HA_Configurable_Server_Static.cpp
diff --git a/examples/APG/ThreadManagement/Async_Cancel.cpp b/examples/APG/ThreadManagement/Async_Cancel.cpp
index 6e05d65ec0b..5d5d5fcf0e8 100644
--- a/examples/APG/ThreadManagement/Async_Cancel.cpp
+++ b/examples/APG/ThreadManagement/Async_Cancel.cpp
@@ -53,12 +53,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 2
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task<ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-pragma instantiate ACE_Task<ACE_MT_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else  /* ACE_HAS_PTHREADS */
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/examples/APG/ThreadManagement/Coop_Cancel.cpp b/examples/APG/ThreadManagement/Coop_Cancel.cpp
index c013975ba1e..4a7714cf14b 100644
--- a/examples/APG/ThreadManagement/Coop_Cancel.cpp
+++ b/examples/APG/ThreadManagement/Coop_Cancel.cpp
@@ -24,7 +24,7 @@ public:
         if (mgr->testcancel (mgr->thr_self ()))
           return 0;
 
-        ACE_Message_Block *mb;
+        ACE_Message_Block *mb = 0;
         ACE_Time_Value tv (0, 1000);
         tv += ACE_OS::time (0);
         int result = this->getq (mb, &tv);
diff --git a/examples/APG/ThreadManagement/Priorities.cpp b/examples/APG/ThreadManagement/Priorities.cpp
index 06021432291..3a80a613714 100644
--- a/examples/APG/ThreadManagement/Priorities.cpp
+++ b/examples/APG/ThreadManagement/Priorities.cpp
@@ -21,7 +21,7 @@ public:
                 name_));
 
     ACE_OS::sleep (2);
-    ACE_Message_Block *mb;
+    ACE_Message_Block *mb = 0;
     while (this->getq (mb) != -1)
       {
         if (mb->msg_type () == ACE_Message_Block::MB_BREAK)
diff --git a/examples/APG/ThreadManagement/Signals.cpp b/examples/APG/ThreadManagement/Signals.cpp
index 19b7e72e495..1e8777acc9f 100644
--- a/examples/APG/ThreadManagement/Signals.cpp
+++ b/examples/APG/ThreadManagement/Signals.cpp
@@ -33,7 +33,7 @@ public:
 
     while (1)
       {
-        ACE_Message_Block* mb;
+        ACE_Message_Block* mb = 0;
         ACE_Time_Value tv (0, 1000);
         tv += ACE_OS::time (0);
         int result = this->getq (mb, &tv);
@@ -78,11 +78,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 // Listing 2
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task<ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-pragma instantiate ACE_Task<ACE_MT_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #else
 #include "ace/OS_main.h"
diff --git a/examples/APG/ThreadManagement/Signals2.cpp b/examples/APG/ThreadManagement/Signals2.cpp
index 114695592bc..f8bdf5e8bb5 100644
--- a/examples/APG/ThreadManagement/Signals2.cpp
+++ b/examples/APG/ThreadManagement/Signals2.cpp
@@ -33,7 +33,7 @@ public:
 
     while (1)
       {
-        ACE_Message_Block* mb;
+        ACE_Message_Block* mb = 0;
         ACE_Time_Value tv (0, 1000);
         tv += ACE_OS::time (0);
 
@@ -83,12 +83,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 1
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task<ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-pragma instantiate ACE_Task<ACE_MT_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadManagement/Start_Hook.cpp b/examples/APG/ThreadManagement/Start_Hook.cpp
index c1d9916d578..1c4ad0794b7 100644
--- a/examples/APG/ThreadManagement/Start_Hook.cpp
+++ b/examples/APG/ThreadManagement/Start_Hook.cpp
@@ -58,8 +58,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 2
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS<SecurityContext>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<SecurityContext>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/ThreadPools/Futures.cpp b/examples/APG/ThreadPools/Futures.cpp
index a57677d1f46..361a8bb43a2 100644
--- a/examples/APG/ThreadPools/Futures.cpp
+++ b/examples/APG/ThreadPools/Futures.cpp
@@ -308,30 +308,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 5
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Condition<ACE_Thread_Mutex>;
-template class ACE_Future<ACE_String_Base<char>*>;
-template class ACE_Future_Observer<ACE_String_Base<char>*>;
-template class ACE_Future_Rep<ACE_String_Base<char>*>;
-template class ACE_Node<Worker*>;
-template class ACE_Node<ACE_Future_Observer<ACE_String_Base<char>*>*>;
-template class ACE_Unbounded_Queue<Worker*>;
-template class ACE_Unbounded_Queue_Iterator<Worker*>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<ACE_String_Base<char>*>*>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<ACE_String_Base<char>*>*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Future<ACE_String_Base<char>*>
-#pragma instantiate ACE_Future_Observer<ACE_String_Base<char>*>
-#pragma instantiate ACE_Future_Rep<ACE_String_Base<char>*>
-#pragma instantiate ACE_Node<Worker*>
-#pragma instantiate ACE_Node<ACE_Future_Observer<ACE_String_Base<char>*>*>
-#pragma instantiate ACE_Unbounded_Queue<Worker*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Worker*>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<ACE_String_Base<char>*>*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<ACE_String_Base<char>*>*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadPools/LF_ThreadPool.cpp b/examples/APG/ThreadPools/LF_ThreadPool.cpp
index 2e85ed41b3c..820e74c36e8 100644
--- a/examples/APG/ThreadPools/LF_ThreadPool.cpp
+++ b/examples/APG/ThreadPools/LF_ThreadPool.cpp
@@ -239,18 +239,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Condition<ACE_Thread_Mutex>;
-template class ACE_Node<Follower*>;
-template class ACE_Unbounded_Queue<Follower*>;
-template class ACE_Unbounded_Queue_Iterator<Follower*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Node<Follower*>
-#pragma instantiate ACE_Unbounded_Queue<Follower*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Follower*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadPools/Request_Handler.h b/examples/APG/ThreadPools/Request_Handler.h
index c534fd57670..9965fb7a30e 100644
--- a/examples/APG/ThreadPools/Request_Handler.h
+++ b/examples/APG/ThreadPools/Request_Handler.h
@@ -10,7 +10,10 @@
 
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Stream.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Thread_Manager;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Request_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
   {
diff --git a/examples/APG/ThreadPools/TP_Reactor.cpp b/examples/APG/ThreadPools/TP_Reactor.cpp
index ff9e11012db..9c82907a8e6 100644
--- a/examples/APG/ThreadPools/TP_Reactor.cpp
+++ b/examples/APG/ThreadPools/TP_Reactor.cpp
@@ -256,24 +256,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 // Listing 1
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<Request_Handler>;
-template class ACE_Creation_Strategy<Request_Handler>;
-template class ACE_Scheduling_Strategy<Request_Handler>;
-template class ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate  ACE_Concurrency_Strategy<Request_Handler>
-#pragma instantiate  ACE_Creation_Strategy<Request_Handler>
-#pragma instantiate  ACE_Scheduling_Strategy<Request_Handler>
-#pragma instantiate  ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate  ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate  ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadPools/ThreadPool.cpp b/examples/APG/ThreadPools/ThreadPool.cpp
index 92b8146a9e5..684762efcbf 100644
--- a/examples/APG/ThreadPools/ThreadPool.cpp
+++ b/examples/APG/ThreadPools/ThreadPool.cpp
@@ -258,18 +258,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Condition<ACE_Thread_Mutex>;
-template class ACE_Node<Worker*>;
-template class ACE_Unbounded_Queue<Worker*>;
-template class ACE_Unbounded_Queue_Iterator<Worker*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Node<Worker*>
-#pragma instantiate ACE_Unbounded_Queue<Worker*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Worker*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadPools/threadpools.mpc b/examples/APG/ThreadPools/threadpools.mpc
index 1855f7b40a2..1bb9a860920 100644
--- a/examples/APG/ThreadPools/threadpools.mpc
+++ b/examples/APG/ThreadPools/threadpools.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Futures) : aceexe {
+  avoids += ace_for_tao
   exename = Futures
   Source_Files {
     Futures.cpp
diff --git a/examples/APG/ThreadSafety/Atomic_Op.cpp b/examples/APG/ThreadSafety/Atomic_Op.cpp
index f09a65d6d90..d315d433a66 100644
--- a/examples/APG/ThreadSafety/Atomic_Op.cpp
+++ b/examples/APG/ThreadSafety/Atomic_Op.cpp
@@ -56,7 +56,7 @@ public:
   {
     return (item == MAX_PROD);
   }
-    
+
 private:
   int * buf_;
   SafeUInt& in_;
@@ -93,7 +93,7 @@ public:
 
     return 0;
   }
-    
+
   int check_termination (int item)
   {
     return (item == MAX_PROD);
@@ -125,14 +125,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 4
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>;
-template class ACE_Atomic_Op<ACE_Null_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>;
-template class ACE_Atomic_Op_Ex<ACE_Null_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_Null_Mutex, unsigned int>
-#pragma instantiate ACE_Atomic_Op<ACE_Null_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Null_Mutex, unsigned int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Null_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/ThreadSafety/RW_Lock.cpp b/examples/APG/ThreadSafety/RW_Lock.cpp
index 3e2fd4c9f17..83f1287bbdb 100644
--- a/examples/APG/ThreadSafety/RW_Lock.cpp
+++ b/examples/APG/ThreadSafety/RW_Lock.cpp
@@ -126,12 +126,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_DLList<Device>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_DLList<Device>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadSafety/TSS.cpp b/examples/APG/ThreadSafety/TSS.cpp
index 81553c8e8b3..8cc875cb3ee 100644
--- a/examples/APG/ThreadSafety/TSS.cpp
+++ b/examples/APG/ThreadSafety/TSS.cpp
@@ -62,20 +62,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS<ClientContext>;
-template class ACE_Hash_Map_Entry<const char*,void*>;
-template class ACE_Hash_Map_Manager<const char *,void*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<const char*,void*,ACE_Hash<const char*>,ACE_Equal_To<const char*>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char*,void*,ACE_Hash<const char*>, ACE_Equal_To<const char*>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<ClientContext>
-#pragma instantiate ACE_Hash_Map_Entry<const char*,void*>
-#pragma instantiate ACE_Hash_Map_Manager<const char *,void*,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char*,void*,ACE_Hash<const char*>,ACE_Equal_To<const char*>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char*,void*,ACE_Hash<const char*>, ACE_Equal_To<const char*>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/ThreadSafety/Tokens_Deadlock.cpp b/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
index 8e1e254684a..f6c6d22491f 100644
--- a/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
+++ b/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
@@ -12,12 +12,12 @@ class ThreadOne : public ACE_Task_Base
 public:
   virtual int svc (void)
   {
-    ACE_Local_Mutex mutex1 ("resource1",
+    ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex1.acquire ();
     ACE_OS::sleep (2);
-    ACE_Local_Mutex mutex2 ("resource2", 0, 1);
+    ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"), 0, 1);
     mutex2.acquire ();
     return 0;
   }
@@ -28,12 +28,12 @@ class ThreadTwo : public ACE_Task_Base
 public:
   virtual int svc (void)
   {
-    ACE_Local_Mutex mutex2 ("resource2",
+    ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex2.acquire ();
     ACE_OS::sleep (2);
-    ACE_Local_Mutex mutex1 ("resource1",
+    ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex1.acquire ();
diff --git a/examples/APG/ThreadSafety/threadsafety.mpc b/examples/APG/ThreadSafety/threadsafety.mpc
index 84c7d614ad6..3598d274917 100644
--- a/examples/APG/ThreadSafety/threadsafety.mpc
+++ b/examples/APG/ThreadSafety/threadsafety.mpc
@@ -23,6 +23,7 @@ project(Mutex) : aceexe {
 }
 
 project(RW Lock) : aceexe {
+  avoids += ace_for_tao
   exename = RW_Lock
   Source_Files {
     RW_Lock.cpp
@@ -30,6 +31,7 @@ project(RW Lock) : aceexe {
 }
 
 project(Semaphore) : aceexe {
+  avoids += ace_for_tao
   exename = Semaphore
   Source_Files {
     Semaphore.cpp
diff --git a/examples/APG/Threads/Condition_Variables.cpp b/examples/APG/Threads/Condition_Variables.cpp
index 579d655cca6..ccb29895032 100644
--- a/examples/APG/Threads/Condition_Variables.cpp
+++ b/examples/APG/Threads/Condition_Variables.cpp
@@ -56,7 +56,7 @@ HA_CommandHandler::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) Handler Thread running\n")));
-    
+
   for (int i = 0; i < NUM_USES; i++)
     {
       this->mutex_.acquire ();
@@ -72,11 +72,11 @@ HA_CommandHandler::svc (void)
 
       this->waitCond_.signal ();
     }
-    
+
   return 0;
 }
 // Listing 2
-int 
+int
 HA_Device_Repository::update_device (int device_id)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Updating device %d\n"),
@@ -105,12 +105,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 3
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Condition<ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/Threads/Message_Queue.cpp b/examples/APG/Threads/Message_Queue.cpp
index dfecc8cfcfb..3544d6bcefa 100644
--- a/examples/APG/Threads/Message_Queue.cpp
+++ b/examples/APG/Threads/Message_Queue.cpp
@@ -166,14 +166,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Message_Receiver, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Message_Receiver, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 #include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/examples/APG/Timers/Alarm.cpp b/examples/APG/Timers/Alarm.cpp
index e66f1ed0465..c12d39b367d 100644
--- a/examples/APG/Timers/Alarm.cpp
+++ b/examples/APG/Timers/Alarm.cpp
@@ -24,7 +24,7 @@ public:
     ACE_ASSERT ((*val) == id_);
 
     ACE_UNUSED_ARG (val);
- 
+
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Timer expired\n")));
     return 0;
   }
@@ -39,7 +39,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   // Create the timer such that it blocks all signals
   // when it goes off.
   Timer timer;
-  
+
   // Schedule a timer to go off 2 seconds later and then
   // after every 4 seconds.
   CB cb (1);
@@ -48,15 +48,10 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_Time_Value repeat (4);
   initial += ACE_OS::gettimeofday ();
   timer.schedule (&cb, &arg, initial, repeat);
-  
+
   while (1)      // Don't let the main thread exit.
     ACE_OS::sleep (2);
   ACE_NOTREACHED (return 0);     // Not reached.
 }
 // Listing 2
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Async_Timer_Queue_Adapter<ACE_Timer_Heap>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Async_Timer_Queue_Adapter<ACE_Timer_Heap>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Timers/PTimerDispatcher.cpp b/examples/APG/Timers/PTimerDispatcher.cpp
index 3198b167725..405c5771789 100644
--- a/examples/APG/Timers/PTimerDispatcher.cpp
+++ b/examples/APG/Timers/PTimerDispatcher.cpp
@@ -63,11 +63,7 @@ PTimer_Dispatcher::reset_interval (long timer_id,
   return timer_queue_->reset_interval (timer_id, interval);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <PTimer_Dispatcher, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <PTimer_Dispatcher, ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<PTimer_Dispatcher, ACE_Null_Mutex> *
       ACE_Singleton<PTimer_Dispatcher, ACE_Null_Mutex>::singleton_;
-# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+# endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/APG/Timers/Task.cpp b/examples/APG/Timers/Task.cpp
index cf2a87bae2d..4774eb1444f 100644
--- a/examples/APG/Timers/Task.cpp
+++ b/examples/APG/Timers/Task.cpp
@@ -71,8 +71,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 3
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/APG/Timers/TimerDispatcher.cpp b/examples/APG/Timers/TimerDispatcher.cpp
index b93bd0b2fc5..818d762b738 100644
--- a/examples/APG/Timers/TimerDispatcher.cpp
+++ b/examples/APG/Timers/TimerDispatcher.cpp
@@ -67,11 +67,7 @@ Timer_Dispatcher::reset_interval (long timer_id,
   return timer_queue_->reset_interval(timer_id, interval);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <Timer_Dispatcher, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <Timer_Dispatcher, ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex> *
       ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex>::singleton_;
-# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+# endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/APG/Timers/Timers.cpp b/examples/APG/Timers/Timers.cpp
index 4a95e0d4315..761f03a650c 100644
--- a/examples/APG/Timers/Timers.cpp
+++ b/examples/APG/Timers/Timers.cpp
@@ -33,14 +33,15 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
   CB cb[10];
   long args[10];
-  for (int i = 0; i < 10 ; i++)
+  for (long i = 0; i < 10 ; i++)
     {
+      ACE_Time_Value const timeout (i);
       long timerID =
         Timer::instance ()->schedule
           (&cb[i],
            &args[i],
            timer_queue->gettimeofday () + (ACE_Time_Value)5,
-           i);
+           timeout);
 
       // Set the timerID state variable of the handler.
       cb[i].setID (timerID);
diff --git a/examples/APG/Timers/Upcall.cpp b/examples/APG/Timers/Upcall.cpp
index 1d4b0dbb844..cb00ae6113a 100644
--- a/examples/APG/Timers/Upcall.cpp
+++ b/examples/APG/Timers/Upcall.cpp
@@ -8,7 +8,7 @@
 // Listing 2 code/ch20
 // The signature of this method changed at ACE 5.4. The 'recurring_timer'
 // parameter was added.
-int 
+int
 UpcallHandler::timeout (PTimerQueue &,
                         PCB *handler,
                         const void *arg,
@@ -160,8 +160,8 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   tv += 20L;
 
   // Schedule two different timers to go off.
-  PTimer::instance ()->schedule (&cb1, &arg1, tv, 1);
-  PTimer::instance ()->schedule (&cb2, &arg2, tv, 2);
+  PTimer::instance ()->schedule (&cb1, &arg1, tv, ACE_Time_Value (1));
+  PTimer::instance ()->schedule (&cb2, &arg2, tv, ACE_Time_Value (2));
 
   // Run the timer event loop forever.
   PTimer::instance ()->wait_for_event ();
@@ -170,26 +170,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 // Listing 3
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Free_List<ACE_Timer_Node_T<PCB*> >;
-template class ACE_Locked_Free_List<ACE_Timer_Node_T<PCB*>, ACE_Null_Mutex>;
-template class ACE_Timer_Node_T<PCB*>;
-template class ACE_Timer_Heap_T<PCB*, UpcallHandler, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_Iterator_T<PCB*, UpcallHandler, ACE_Null_Mutex>;
-template class ACE_Timer_Queue_T<PCB*, UpcallHandler, ACE_Null_Mutex>;
-template class ACE_Timer_Queue_Iterator_T<PCB*, UpcallHandler, ACE_Null_Mutex>;
-template class ACE_Node<ACE_Timer_Node_T<PCB*>*>;
-template class ACE_Unbounded_Set<ACE_Timer_Node_T<PCB*>*>;
-template class ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<PCB*>*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Free_List<ACE_Timer_Node_T<PCB*> >
-#pragma instantiate ACE_Locked_Free_List<ACE_Timer_Node_T<PCB*>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Node_T<PCB*>
-#pragma instantiate ACE_Timer_Heap_T<PCB*, UpcallHandler, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_Iterator_T<PCB*, UpcallHandler, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_T<PCB*, UpcallHandler, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_Iterator_T<PCB*, UpcallHandler, ACE_Null_Mutex>
-#pragma instantiate ACE_Node<ACE_Timer_Node_T<PCB*>*>
-#pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<PCB*>*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<PCB*>*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/examples/ASX/Event_Server/Event_Server/Event.mpc b/examples/ASX/Event_Server/Event_Server/Event.mpc
index 7c31c7f1a5a..f99e912ce04 100644
--- a/examples/ASX/Event_Server/Event_Server/Event.mpc
+++ b/examples/ASX/Event_Server/Event_Server/Event.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server) : aceexe {
+  avoids += ace_for_tao
   exename = Event_Server
   Source_Files {
     Consumer_Router.cpp
diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h
index 7be5ec0a3cc..96e2cad3627 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/examples/ASX/Event_Server/Event_Server/Options.h
@@ -116,8 +116,6 @@ private:
   static Options *instance_;
   // Static Singleton.
 
-  friend class ACE_Shutup_GPlusPlus;
-  // Turn off g++ warning...
 };
 
 #include "Options.i"
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index 8d376f27b4b..cb82eec16df 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -107,7 +107,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
       if (this->acceptor ().get_local_addr (addr) != -1)
 	ACE_DEBUG ((LM_DEBUG,
 		    ACE_TEXT ("(%t) initializing %C on port = %d, handle = %d, this = %u\n"),
-		    addr.get_port_number () == Options::instance ()->supplier_port () 
+		    addr.get_port_number () == Options::instance ()->supplier_port ()
                     ? "Supplier_Handler" : "Consumer_Handler",
 		    addr.get_port_number (),
 		    this->acceptor().get_handle (),
@@ -250,7 +250,7 @@ Peer_Handler::open (void *)
   // Insert outselves into the routing map.
   else if (this->peer_router_context_->bind_peer (this->get_handle (),
                                                   this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("bind_peer")),
                       -1);
@@ -285,7 +285,7 @@ Peer_Handler::handle_input (ACE_HANDLE h)
                                   db->size ());
 
   if (n == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p"),
                        ACE_TEXT ("recv failed")),
                       -1);
@@ -300,7 +300,7 @@ Peer_Handler::handle_input (ACE_HANDLE h)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) shutting down handle %d\n"), h));
       // Instruct the <ACE_Reactor> to deregister us by returning -1.
-      return -1; 
+      return -1;
     }
   else
     {
@@ -411,7 +411,7 @@ Peer_Handler::svc (void)
 
           // We do not need to be deregistered by reactor
 	  // as we were not registered at all.
-	  return -1; 
+	  return -1;
 	}
       else
 	{
@@ -433,20 +433,3 @@ Peer_Handler::svc (void)
 #endif /* 0 */
 #endif /* _PEER_ROUTER_C */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Map_Entry<ROUTING_KEY, Peer_Handler *>;
-template class ACE_Map_Iterator_Base<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Map_Entry<ROUTING_KEY, Peer_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp
index bb1a89445df..12b2339c8f9 100644
--- a/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -3,7 +3,6 @@
 // Main driver program for the event server example.
 
 #include "ace/OS_main.h"
-#include "ace/Stream.h"
 #include "ace/Service_Config.h"
 #include "ace/OS_NS_unistd.h"
 #include "Options.h"
@@ -11,6 +10,7 @@
 #include "Event_Analyzer.h"
 #include "Supplier_Router.h"
 #include "ace/Signal.h"
+#include "ace/Stream.h"
 
 ACE_RCSID (Event_Server,
            event_server,
@@ -20,10 +20,12 @@ ACE_RCSID (Event_Server,
 typedef ACE_Stream<ACE_SYNCH> MT_Stream;
 typedef ACE_Module<ACE_SYNCH> MT_Module;
 
+
 class Event_Server : public ACE_Sig_Adapter
 {
   // = TITLE
   //     Run the logic for the <Event_Server>.
+
   //
   // = DESCRIPTION
   //     In addition to packaging the <Event_Server> components, this
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index d0f9accec78..c1da28ddb74 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -236,14 +236,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<Event_Transceiver>;
-template class ACE_Connector<Event_Transceiver, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Event_Transceiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<Event_Transceiver>
-#pragma instantiate ACE_Connector<Event_Transceiver, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Event_Transceiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index cc96c58c137..b9c9c0cf2bd 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -135,26 +135,4 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
   return ACE_OS::strlen (mod_name);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Consumer_Handler, ACE_UPIPE_ACCEPTOR>;
-template class Acceptor_Factory<Consumer_Handler, CONSUMER_KEY>;
-template class Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>;
-template class Peer_Router<Consumer_Handler, CONSUMER_KEY>;
-template class ACE_Map_Entry<CONSUMER_KEY, Consumer_Handler *>;
-template class ACE_Map_Iterator_Base<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Reverse_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Consumer_Handler, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate Acceptor_Factory<Consumer_Handler, CONSUMER_KEY>
-#pragma instantiate Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>
-#pragma instantiate Peer_Router<Consumer_Handler, CONSUMER_KEY>
-#pragma instantiate ACE_Map_Entry<CONSUMER_KEY, Consumer_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Manager<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 73fe806780a..8b4a53d6331 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -134,35 +134,4 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
   return ACE_OS::strlen (mod_name);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY>;
-template class ACE_Acceptor<Supplier_Handler, ACE_UPIPE_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_MT_SYNCH>;
-template class Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>;
-template class Peer_Router<Supplier_Handler, SUPPLIER_KEY>;
-template class ACE_Map_Entry<SUPPLIER_KEY, Supplier_Handler *>;
-template class ACE_Map_Iterator_Base<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Reverse_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
-template class ACE_Guard<ACE_RW_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY>
-#pragma instantiate ACE_Acceptor<Supplier_Handler, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_MT_SYNCH>
-#pragma instantiate Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>
-#pragma instantiate Peer_Router<Supplier_Handler, SUPPLIER_KEY>
-#pragma instantiate ACE_Map_Entry<SUPPLIER_KEY, Supplier_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Guard<ACE_RW_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc b/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
index b272b2465bf..a4c93dc1fdb 100644
--- a/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
+++ b/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server) : aceexe {
+  avoids += ace_for_tao
   exename = UPIPE_Event_Server
   Source_Files {
     Consumer_Router.cpp
diff --git a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
index 1e8bfc77d94..a2f179a5348 100644
--- a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
+++ b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
@@ -768,42 +768,3 @@ Thread_Bounded_Packet_Relay_Driver::run (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Thread_Timer_Queue_Adapter<Timer_Heap>;
-template class Bounded_Packet_Relay_Driver<Thread_Timer_Queue>;
-template class ACE_Command_Callback<User_Input_Task, User_Input_Task::ACTION>;
-template class ACE_Command_Callback<BPR_Handler_Base, BPR_Handler_Base::ACTION>;
-template class ACE_Command_Callback<Send_Handler, Send_Handler::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
-#pragma instantiate Bounded_Packet_Relay_Driver<Thread_Timer_Queue>
-#pragma instantiate ACE_Command_Callback<User_Input_Task, User_Input_Task::ACTION>
-#pragma instantiate ACE_Command_Callback<BPR_Handler_Base, BPR_Handler_Base::ACTION>
-#pragma instantiate ACE_Command_Callback<Send_Handler, Send_Handler::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-// These templates will specialized in libACE.* if the platforms does
-// not define ACE_MT_SAFE.
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Thread_Condition<ACE_Thread_Mutex>;
-template class ACE_Condition<ACE_Thread_Mutex>;
-template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>;
-template class ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Unbounded_Queue <ACE_Command_Base*>;
-template class ACE_Node <ACE_Command_Base *>;
-template class ACE_Unbounded_Queue_Iterator <ACE_Command_Base *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Thread_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_MT_SAFE */
diff --git a/examples/Bounded_Packet_Relay/bpr_thread.cpp b/examples/Bounded_Packet_Relay/bpr_thread.cpp
index bc6f0f607aa..0a564ecd2a5 100644
--- a/examples/Bounded_Packet_Relay/bpr_thread.cpp
+++ b/examples/Bounded_Packet_Relay/bpr_thread.cpp
@@ -120,12 +120,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   // All dynamically allocated memory is released when main() returns.
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <THREAD_BOUNDED_PACKET_RELAY_DRIVER>;
-template class ACE_Auto_Basic_Ptr <THREAD_BOUNDED_PACKET_RELAY_DRIVER>;
-template class ACE_Command_Callback <Bounded_Packet_Relay, Bounded_Packet_Relay::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <THREAD_BOUNDED_PACKET_RELAY_DRIVER>
-#pragma instantiate ACE_Auto_Basic_Ptr <THREAD_BOUNDED_PACKET_RELAY_DRIVER>
-#pragma instantiate ACE_Command_Callback <Bounded_Packet_Relay, Bounded_Packet_Relay::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv1/C++NPv1.mpc b/examples/C++NPv1/C++NPv1.mpc
index f7d3f626ff4..2cc6967e831 100644
--- a/examples/C++NPv1/C++NPv1.mpc
+++ b/examples/C++NPv1/C++NPv1.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(*Iterative_Logging_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = iterative_logging_server
   Source_Files {
     Iterative_Logging_Server.cpp
@@ -20,7 +20,7 @@ project(*Logging_Client) : aceexe {
 }
 
 project(*PPC_Logging_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = ppc_logging_server
   Source_Files {
     Process_Per_Connection_Logging_Server.cpp
@@ -30,7 +30,7 @@ project(*PPC_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = reactive_logging_server
   Source_Files {
     Reactive_Logging_Server.cpp
@@ -40,7 +40,7 @@ project(*Reactive_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server_Ex) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = reactive_logging_server_ex
   Source_Files {
     Reactive_Logging_Server_Ex.cpp
@@ -50,7 +50,7 @@ project(*Reactive_Logging_Server_Ex) : aceexe {
 }
 
 project(*RTTPC_Logging_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = RTTPC_logging_server
   Source_Files {
     RT_Thread_Per_Connection_Logging_Server.cpp
@@ -60,7 +60,7 @@ project(*RTTPC_Logging_Server) : aceexe {
 }
 
 project(*TPC_Logging_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = tpc_logging_server
   Source_Files {
     Thread_Per_Connection_Logging_Server.cpp
diff --git a/examples/C++NPv1/Iterative_Logging_Server.h b/examples/C++NPv1/Iterative_Logging_Server.h
index c58edc16ecb..f811f98c7ce 100644
--- a/examples/C++NPv1/Iterative_Logging_Server.h
+++ b/examples/C++NPv1/Iterative_Logging_Server.h
@@ -14,7 +14,9 @@
 #include "Logging_Handler.h"
 #include "Logging_Server.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Stream;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Iterative_Logging_Server : public Logging_Server
 {
diff --git a/examples/C++NPv1/Logging_Handler.h b/examples/C++NPv1/Logging_Handler.h
index 80de5ebac51..6e0004212b3 100644
--- a/examples/C++NPv1/Logging_Handler.h
+++ b/examples/C++NPv1/Logging_Handler.h
@@ -10,7 +10,9 @@
 #include "ace/FILE_IO.h"
 #include "ace/SOCK_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Logging_Handler
 {
diff --git a/examples/C++NPv1/Logging_Server.h b/examples/C++NPv1/Logging_Server.h
index 1fd03bac775..2c8624a11cb 100644
--- a/examples/C++NPv1/Logging_Server.h
+++ b/examples/C++NPv1/Logging_Server.h
@@ -10,7 +10,9 @@
 #include "ace/FILE_IO.h"
 #include "ace/SOCK_Acceptor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_SOCK_Stream;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Logging_Server
 {
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index 2984d558eb5..577e606ed8f 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -132,9 +132,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return ACE_Thread_Manager::instance ()->wait ();
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
index e735fb24183..08f29422bed 100644
--- a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
@@ -20,19 +20,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<ACE_HANDLE, ACE_FILE_IO *>;
-template class ACE_Hash_Map_Manager<ACE_HANDLE, ACE_FILE_IO *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<ACE_HANDLE, ACE_FILE_IO *>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_HANDLE, ACE_FILE_IO *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index d1c0a0b3021..493628ab436 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -93,9 +93,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return ACE_Thread_Manager::instance ()->wait ();
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index 4a0cde2e8ee..dd70afabcf2 100644
--- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -207,7 +207,7 @@ int AC_Output_Handler::svc () {
     }
     if (message_index >= ACE_IOV_MAX ||
         (ACE_OS::gettimeofday () - time_of_last_send
-         >= FLUSH_TIMEOUT)) {
+         >= ACE_Time_Value(FLUSH_TIMEOUT))) {
       if (send (chunk, message_index) == -1) break;
       time_of_last_send = ACE_OS::gettimeofday ();
     }
diff --git a/examples/C++NPv2/C++NPv2.mpc b/examples/C++NPv2/C++NPv2.mpc
index ca1b40b4034..675db6f9929 100644
--- a/examples/C++NPv2/C++NPv2.mpc
+++ b/examples/C++NPv2/C++NPv2.mpc
@@ -29,7 +29,7 @@ project(*AIO_CLD) : acelib, ssl {
 }
 
 project(*CLD) : acelib {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   sharedname = CLD
   dynamicflags = CLD_BUILD_DLL
   Source_Files {
@@ -50,6 +50,7 @@ project(*Configurable_Log_Server) : aceexe {
 }
 
 project(*Display_Logfile) : aceexe {
+  avoids += ace_for_tao
   exename = display_logfile
   Source_Files {
     display_logfile.cpp
@@ -57,7 +58,7 @@ project(*Display_Logfile) : aceexe {
 }
 
 project(*Reactor_Log_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -69,7 +70,7 @@ project(*Reactor_Log_Server) : aceexe {
 }
 
 project(*Select_Reactor_Log_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = select_reactor_logging_server
   specific(gnuace) {
     after += *Reactor_Log_Server
@@ -84,7 +85,7 @@ project(*Select_Reactor_Log_Server) : aceexe {
 }
 
 project(*SLD) : acelib {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   sharedname = SLD
   dynamicflags = SLD_BUILD_DLL
   specific(gnuace) {
@@ -99,7 +100,7 @@ project(*SLD) : acelib {
 }
 
 project(*SLDex) : acelib {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   sharedname = SLDex
   dynamicflags = SLDEX_BUILD_DLL
   specific(gnuace) {
@@ -124,7 +125,7 @@ project(*SR_Configurable_Log_Server) : aceexe {
 }
 
 project(*TP_Reactor_Log_Server) : aceexe {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = tp_reactor_logging_server
   specific(gnuace) {
     after += *Reactor_Log_Server
@@ -152,7 +153,7 @@ project(*TPCLS) : acelib, ssl {
 }
 
 project(*TPLS) : acelib {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   sharedname = TPLS
   dynamicflags = TPLS_BUILD_DLL
   specific(gnuace) {
@@ -167,7 +168,7 @@ project(*TPLS) : acelib {
 }
 
 project(*WFMO_Reactor_Log_Server) : aceexe, wfmo {
-  avoids += uses_wchar
+  avoids += uses_wchar ace_for_tao
   exename = wfmo_reactor_logging_server
   specific(gnuace) {
     after += *Reactor_Log_Server
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index b4802b0acb7..1bc2b5ea1d8 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -177,7 +177,7 @@ ACE_THR_FUNC_RETURN CLD_Handler::forward () {
     }
     if (message_index >= ACE_IOV_MAX ||
         (ACE_OS::gettimeofday () - time_of_last_send
-         >= FLUSH_TIMEOUT)) {
+         >= ACE_Time_Value(FLUSH_TIMEOUT))) {
       if (send (chunk, message_index) == -1) break;
       time_of_last_send = ACE_OS::gettimeofday ();
     }
diff --git a/examples/C++NPv2/Logging_Handler.h b/examples/C++NPv2/Logging_Handler.h
index e92a89a8147..41945c3a182 100644
--- a/examples/C++NPv2/Logging_Handler.h
+++ b/examples/C++NPv2/Logging_Handler.h
@@ -10,7 +10,9 @@
 #include "ace/FILE_IO.h"
 #include "ace/SOCK_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Logging_Handler
 {
diff --git a/examples/C++NPv2/Makefile.am b/examples/C++NPv2/Makefile.am
index f4dee7f146a..2a3b2ebbb46 100644
--- a/examples/C++NPv2/Makefile.am
+++ b/examples/C++NPv2/Makefile.am
@@ -138,7 +138,7 @@ display_logfile_SOURCES = \
   Logging_Event_Handler.h \
   Logging_Event_Handler_Ex.h \
   Logging_Handler.h \
-  Reactor_Logging_Server.h \
+  Reactor_Logging_Server_T.h \
   Reactor_Logging_Server_Adapter.h \
   SLDEX_export.h \
   SLD_export.h \
@@ -170,7 +170,7 @@ reactor_logging_server_SOURCES = \
   Logging_Event_Handler.h \
   Logging_Event_Handler_Ex.h \
   Logging_Handler.h \
-  Reactor_Logging_Server.h
+  Reactor_Logging_Server_T.h
 
 reactor_logging_server_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -251,7 +251,7 @@ sr_configurable_logging_server_SOURCES = \
   Logging_Event_Handler.h \
   Logging_Event_Handler_Ex.h \
   Logging_Handler.h \
-  Reactor_Logging_Server.h \
+  Reactor_Logging_Server_T.h \
   Reactor_Logging_Server_Adapter.h \
   SLDEX_export.h \
   SLD_export.h \
diff --git a/examples/C++NPv2/README b/examples/C++NPv2/README
index 58a1f31a728..a2d8759dd80 100644
--- a/examples/C++NPv2/README
+++ b/examples/C++NPv2/README
@@ -31,7 +31,7 @@ Chapter 3       Logging_Acceptor.cpp
                 Logging_Handler.cpp
                 Logging_Handler.h
                 Reactor_Logging_Server.cpp
-                Reactor_Logging_Server.h
+                Reactor_Logging_Server_T.h
                 Reactor_Logging_Server_T.cpp
 
 Chapter 4       Select_Reactor_Logging_Server.cpp
diff --git a/examples/C++NPv2/Reactor_Logging_Server.cpp b/examples/C++NPv2/Reactor_Logging_Server.cpp
index 4b8d1b7690a..269e158d243 100644
--- a/examples/C++NPv2/Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Reactor_Logging_Server.cpp
@@ -4,7 +4,7 @@
 ** Copyright 2002 Addison Wesley. All Rights Reserved.
 */
 
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 #include "Logging_Acceptor_Ex.h"
 #include "ace/Log_Msg.h"
 
@@ -27,8 +27,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server<Logging_Acceptor_Ex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server<Logging_Acceptor_Ex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv2/Reactor_Logging_Server.h b/examples/C++NPv2/Reactor_Logging_Server.h
deleted file mode 100644
index 6b50860892b..00000000000
--- a/examples/C++NPv2/Reactor_Logging_Server.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-** $Id$
-**
-** Copyright 2002 Addison Wesley. All Rights Reserved.
-*/
-
-#ifndef _REACTOR_LOGGING_SERVER_H
-#define _REACTOR_LOGGING_SERVER_H
-
-#include "ace/ACE.h"
-#include "ace/Reactor.h"
-
-template <class ACCEPTOR>
-class Reactor_Logging_Server : public ACCEPTOR
-{
-public:
-  Reactor_Logging_Server (int argc, char *argv[],
-                          ACE_Reactor *reactor);
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Reactor_Logging_Server_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reactor_Logging_Server_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* _REACTOR_LOGGING_SERVER_H */
diff --git a/examples/C++NPv2/Reactor_Logging_Server_Adapter.h b/examples/C++NPv2/Reactor_Logging_Server_Adapter.h
index 181d35a8b7d..aeda81205ab 100644
--- a/examples/C++NPv2/Reactor_Logging_Server_Adapter.h
+++ b/examples/C++NPv2/Reactor_Logging_Server_Adapter.h
@@ -8,7 +8,7 @@
 #define _REACTOR_LOGGING_SERVER_ADAPTER_H
 
 #include "ace/Service_Object.h"
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 
 template <class ACCEPTOR>
 class Reactor_Logging_Server_Adapter : public ACE_Service_Object {
diff --git a/examples/C++NPv2/SLD.cpp b/examples/C++NPv2/SLD.cpp
index abea1c1dad4..3aef89d0df6 100644
--- a/examples/C++NPv2/SLD.cpp
+++ b/examples/C++NPv2/SLD.cpp
@@ -15,9 +15,3 @@ typedef Reactor_Logging_Server_Adapter<Logging_Acceptor>
 
 ACE_FACTORY_DEFINE (SLD, Server_Logging_Daemon)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server_Adapter<Logging_Acceptor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server_Adapter<Logging_Acceptor>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/C++NPv2/SLDex.cpp b/examples/C++NPv2/SLDex.cpp
index 1ce99f950da..fbaf7cb3111 100644
--- a/examples/C++NPv2/SLDex.cpp
+++ b/examples/C++NPv2/SLDex.cpp
@@ -15,9 +15,3 @@ typedef Reactor_Logging_Server_Adapter<Logging_Acceptor_Ex>
 
 ACE_FACTORY_DEFINE (SLDEX, Server_Logging_Daemon_Ex)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server_Adapter<Logging_Acceptor_Ex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server_Adapter<Logging_Acceptor_Ex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
index e6f200b00e5..2361ad8d871 100644
--- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
@@ -19,7 +19,7 @@
 #  include <string>
 #endif
 
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 #include "Logging_Acceptor_Ex.h"
 
 typedef Reactor_Logging_Server<Logging_Acceptor_Ex>
@@ -103,8 +103,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return ACE_Thread_Manager::instance ()->wait ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server<Logging_Acceptor_Ex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server<Logging_Acceptor_Ex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv2/TPC_Logging_Server.cpp b/examples/C++NPv2/TPC_Logging_Server.cpp
index c001f25c453..b6ce76e1d40 100644
--- a/examples/C++NPv2/TPC_Logging_Server.cpp
+++ b/examples/C++NPv2/TPC_Logging_Server.cpp
@@ -104,8 +104,3 @@ typedef Reactor_Logging_Server_Adapter<TPC_Logging_Acceptor>
 
 ACE_FACTORY_DEFINE (TPCLS, TPC_Logging_Server)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server_Adapter<TPC_Logging_Acceptor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server_Adapter<TPC_Logging_Acceptor>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv2/TP_Logging_Server.cpp b/examples/C++NPv2/TP_Logging_Server.cpp
index b591ef425b7..7342cf4c757 100644
--- a/examples/C++NPv2/TP_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Logging_Server.cpp
@@ -62,13 +62,9 @@ int TP_Logging_Task::svc () {
 
 ACE_FACTORY_DEFINE (TPLS, TP_Logging_Server)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server<TP_Logging_Acceptor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server<TP_Logging_Acceptor>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<TP_Logging_Task, ACE_Null_Mutex> *
   ACE_Singleton<TP_Logging_Task, ACE_Null_Mutex>::singleton_;
 template ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_Null_Mutex> *
   ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/C++NPv2/TP_Logging_Server.h b/examples/C++NPv2/TP_Logging_Server.h
index 4e669e6558d..cb98be5e353 100644
--- a/examples/C++NPv2/TP_Logging_Server.h
+++ b/examples/C++NPv2/TP_Logging_Server.h
@@ -13,7 +13,7 @@
 #include "ace/Task.h"
 #include "Logging_Acceptor.h"
 #include "Logging_Event_Handler.h"
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 #include "TPLS_export.h"
 
 class TP_Logging_Task : public ACE_Task<ACE_SYNCH> {
diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
index 2480061556e..41d363af060 100644
--- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
@@ -20,7 +20,7 @@
 #  include <string>
 #endif
 
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 #include "Logging_Acceptor_Ex.h"
 
 typedef Reactor_Logging_Server<Logging_Acceptor_Ex>
@@ -115,8 +115,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return ACE_Thread_Manager::instance ()->wait ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Reactor_Logging_Server<Logging_Acceptor_Ex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Reactor_Logging_Server<Logging_Acceptor_Ex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
index ea908b57e74..46fff8bf083 100644
--- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
@@ -13,7 +13,7 @@
 #include "ace/Thread_Manager.h"
 #include "ace/OS_NS_string.h"
 
-#include "Reactor_Logging_Server.h"
+#include "Reactor_Logging_Server_T.h"
 #include "Logging_Acceptor_Ex.h"
 #include "Logging_Event_Handler_Ex.h"
 
diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp
index 08fec02f40d..d884662090d 100644
--- a/examples/C++NPv2/display_logfile.cpp
+++ b/examples/C++NPv2/display_logfile.cpp
@@ -24,12 +24,13 @@ class Logrec_Module : public ACE_Module<ACE_SYNCH>
 {
 public:
   Logrec_Module (const ACE_TCHAR *name)
-    : ACE_Module<ACE_SYNCH>
-                    (name,
-                     &task_, // Initialize writer-side task.
-                     0,      // Ignore reader-side task.
-                     0,
-                     ACE_Module<ACE_SYNCH>::M_DELETE_READER) {}
+  {
+    this->open (name,
+		&task_, // Initialize writer-side task.
+		0,      // Ignore reader-side task.
+		0,
+		ACE_Module<ACE_SYNCH>::M_DELETE_READER);
+  }
 private:
   TASK task_;
 };
@@ -194,13 +195,14 @@ class Logrec_Reader_Module : public ACE_Module<ACE_SYNCH>
 {
 public:
   Logrec_Reader_Module (const ACE_TString &filename)
-    : ACE_Module<ACE_SYNCH>
-                    (ACE_TEXT ("Logrec Reader"),
-                     &task_, // Initialize writer-side.
-                     0,      // Ignore reader-side.
-                     0,
-                     ACE_Module<ACE_SYNCH>::M_DELETE_READER),
-      task_ (filename) {}
+    : task_ (filename)
+  {
+    this->open (ACE_TEXT ("Logrec Reader"),
+                &task_, // Initialize writer-side.
+                0,      // Ignore reader-side.
+                0,
+                ACE_Module<ACE_SYNCH>::M_DELETE_READER);
+  }
 private:
   Logrec_Reader task_;
 };
@@ -357,8 +359,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 1;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/blocking/Connection_Blocking.mpc b/examples/Connection/blocking/Connection_Blocking.mpc
index 01cf9ceaf10..758e2bfbf95 100644
--- a/examples/Connection/blocking/Connection_Blocking.mpc
+++ b/examples/Connection/blocking/Connection_Blocking.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*acceptor) : aceexe {
+  avoids += ace_for_tao
   exename = acceptor
   Source_Files {
     SPIPE-acceptor.cpp
@@ -10,6 +11,7 @@ project(*acceptor) : aceexe {
 }
 
 project(*connector) : aceexe {
+  avoids += ace_for_tao
   exename = connector
   Source_Files {
     SPIPE-connector.cpp
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 47489d48c12..85f8acc6156 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -219,16 +219,6 @@ IPC_Server::svc (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Concurrency_Strategy<Svc_Handler>;
-template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Concurrency_Strategy<Svc_Handler>
-#pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
 #endif /* SPIPE_ACCEPTOR_C */
 
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index f3c0cf61266..9b2ea043c77 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -217,15 +217,3 @@ IPC_Client::parse_args (int argc, ACE_TCHAR *argv[])
 
 #endif /* SPIPE_CONNECTOR */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<Peer_Handler>;
-template class ACE_Connector<Peer_Handler, ACE_SPIPE_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Peer_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<Peer_Handler>
-#pragma instantiate ACE_Connector<Peer_Handler, ACE_SPIPE_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Peer_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index 5129fc7cb92..9e2b1577405 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -224,10 +224,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/misc/Connection_Misc.mpc b/examples/Connection/misc/Connection_Misc.mpc
index 8e10826ad51..a960e604338 100644
--- a/examples/Connection/misc/Connection_Misc.mpc
+++ b/examples/Connection/misc/Connection_Misc.mpc
@@ -9,8 +9,9 @@ project (*Handler) : aceexe {
 }
 
 project (*test_upipe) : aceexe {
+  avoids += ace_for_tao
   exename = test_upipe
   Source_Files {
     test_upipe.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 6db23223d6b..bc786f428fe 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -17,32 +17,6 @@ ACE_RCSID(misc, test_upipe, "$Id$")
 
 #include "test_upipe.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Accept_Strategy<Server_Service, ACE_UPIPE_ACCEPTOR>;
-template class ACE_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<Server_Service>;
-template class ACE_Connector_Base<Client_Service>;
-template class ACE_Connector<Client_Service, ACE_UPIPE_CONNECTOR>;
-template class ACE_Creation_Strategy<Server_Service>;
-template class ACE_Scheduling_Strategy<Server_Service>;
-template class ACE_Strategy_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Client_Service>;
-template class ACE_Thread_Strategy<Server_Service>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Accept_Strategy<Server_Service, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<Server_Service>
-#pragma instantiate ACE_Connector_Base<Client_Service>
-#pragma instantiate ACE_Connector<Client_Service, ACE_UPIPE_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<Server_Service>
-#pragma instantiate ACE_Scheduling_Strategy<Server_Service>
-#pragma instantiate ACE_Strategy_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Client_Service>
-#pragma instantiate ACE_Thread_Strategy<Server_Service>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 class Server : public ACE_Strategy_Acceptor <Server_Service, ACE_UPIPE_ACCEPTOR>
 {
   // = TITLE
diff --git a/examples/Connection/misc/test_upipe.h b/examples/Connection/misc/test_upipe.h
index 9c3b50bc1c3..89349760e9c 100644
--- a/examples/Connection/misc/test_upipe.h
+++ b/examples/Connection/misc/test_upipe.h
@@ -34,7 +34,7 @@ public:
       ssize_t n;
 
       while ((n = this->peer ().recv (buf, sizeof buf)) > 0)
-	::write (1, buf, n);
+        ::write (1, buf, n);
 
       return 0;
     }
@@ -66,7 +66,7 @@ public:
       ssize_t n;
 
       while ((n = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0)
-	this->peer ().send (buf, n);
+        this->peer ().send (buf, n);
 
       this->peer ().close ();
       return 0;
diff --git a/examples/Connection/non_blocking/Connection_Non_Blocking.mpc b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
index 1b56fdc76f8..de9ecaea5e0 100644
--- a/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
+++ b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc
@@ -18,6 +18,7 @@ project (*SockServer) : aceexe {
 }
 
 project (*LSockClient) : aceexe {
+  avoids += ace_for_tao
   exename = lsock_client
   Source_Files {
     CPP-connector.cpp
@@ -26,6 +27,7 @@ project (*LSockClient) : aceexe {
 }
 
 project (*LSockServer) : aceexe {
+  avoids += ace_for_tao
   exename = lsock_server
   Source_Files {
     CPP-acceptor.cpp
@@ -63,4 +65,4 @@ project (*TLIServer) : aceexe {
     CPP-acceptor.cpp
     test_tli_acceptor.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
index c79ab0f3740..cdfcfe5e65c 100644
--- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
@@ -46,19 +46,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_acceptor.svc ();
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Concurrency_Strategy<SVC_HANDLER>;
-template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-template class IPC_Server<SVC_HANDLER, ACE_LSOCK_ACCEPTOR>;
-template class Svc_Handler<ACE_LSOCK_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Concurrency_Strategy<SVC_HANDLER>
-#pragma instantiate ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate IPC_Server<SVC_HANDLER, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate Svc_Handler<ACE_LSOCK_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp
index cb6b1328975..486fda797e8 100644
--- a/examples/Connection/non_blocking/test_lsock_connector.cpp
+++ b/examples/Connection/non_blocking/test_lsock_connector.cpp
@@ -43,20 +43,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_connector.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<PEER_HANDLER>;
-template class ACE_Connector<PEER_HANDLER, ACE_LSOCK_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<PEER_HANDLER>;
-template class IPC_Client<PEER_HANDLER, ACE_LSOCK_CONNECTOR>;
-template class Peer_Handler<ACE_LSOCK_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<PEER_HANDLER>
-#pragma instantiate ACE_Connector<PEER_HANDLER, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<PEER_HANDLER>
-#pragma instantiate IPC_Client<PEER_HANDLER, ACE_LSOCK_CONNECTOR>
-#pragma instantiate Peer_Handler<ACE_LSOCK_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Connection/non_blocking/test_sock_acceptor.cpp b/examples/Connection/non_blocking/test_sock_acceptor.cpp
index 9cf756e5c17..6a9b9fcdcbb 100644
--- a/examples/Connection/non_blocking/test_sock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_sock_acceptor.cpp
@@ -32,17 +32,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_acceptor.svc ();
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Concurrency_Strategy<SVC_HANDLER>;
-template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class IPC_Server<SVC_HANDLER, ACE_SOCK_ACCEPTOR>;
-template class Svc_Handler<ACE_SOCK_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Concurrency_Strategy<SVC_HANDLER>
-#pragma instantiate ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate IPC_Server<SVC_HANDLER, ACE_SOCK_ACCEPTOR>
-#pragma instantiate Svc_Handler<ACE_SOCK_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/non_blocking/test_sock_connector.cpp b/examples/Connection/non_blocking/test_sock_connector.cpp
index 50c7931cbf4..66d53e1f0b2 100644
--- a/examples/Connection/non_blocking/test_sock_connector.cpp
+++ b/examples/Connection/non_blocking/test_sock_connector.cpp
@@ -47,18 +47,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_connector.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<PEER_HANDLER>;
-template class ACE_Connector<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<PEER_HANDLER>;
-template class IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
-template class Peer_Handler<ACE_SOCK_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<PEER_HANDLER>
-#pragma instantiate ACE_Connector<PEER_HANDLER, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<PEER_HANDLER>
-#pragma instantiate IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR>
-#pragma instantiate Peer_Handler<ACE_SOCK_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/non_blocking/test_spipe_acceptor.cpp b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
index c0d137f626a..ed33bb31683 100644
--- a/examples/Connection/non_blocking/test_spipe_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
@@ -34,19 +34,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_acceptor.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Concurrency_Strategy<SVC_HANDLER>;
-template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
-template class IPC_Server<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>;
-template class Svc_Handler<ACE_SPIPE_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Concurrency_Strategy<SVC_HANDLER>
-#pragma instantiate ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate IPC_Server<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>
-#pragma instantiate Svc_Handler<ACE_SPIPE_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Connection/non_blocking/test_spipe_connector.cpp b/examples/Connection/non_blocking/test_spipe_connector.cpp
index 2b777ffe334..fd5641f482d 100644
--- a/examples/Connection/non_blocking/test_spipe_connector.cpp
+++ b/examples/Connection/non_blocking/test_spipe_connector.cpp
@@ -29,22 +29,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_connector.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<PEER_HANDLER>;
-template class ACE_Connector<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<PEER_HANDLER>;
-template class IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
-template class Peer_Handler<ACE_SPIPE_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<PEER_HANDLER>
-#pragma instantiate ACE_Connector<PEER_HANDLER, ACE_SPIPE_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<PEER_HANDLER>
-#pragma instantiate IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR>
-#pragma instantiate Peer_Handler<ACE_SPIPE_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Connection/non_blocking/test_tli_acceptor.cpp b/examples/Connection/non_blocking/test_tli_acceptor.cpp
index ccff6bc8134..270f4cc3c47 100644
--- a/examples/Connection/non_blocking/test_tli_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_tli_acceptor.cpp
@@ -31,20 +31,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_acceptor.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Concurrency_Strategy<SVC_HANDLER>;
-template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_TLI_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_NULL_SYNCH>;
-template class IPC_Server<SVC_HANDLER, ACE_TLI_ACCEPTOR>;
-template class Svc_Handler<ACE_TLI_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Concurrency_Strategy<SVC_HANDLER>
-#pragma instantiate ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_TLI_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_TLI_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate IPC_Server<SVC_HANDLER, ACE_TLI_ACCEPTOR>
-#pragma instantiate Svc_Handler<ACE_TLI_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index 9b46c130cbb..eb8bdf23c3f 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -29,22 +29,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return peer_connector.svc ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<PEER_HANDLER>;
-template class ACE_Connector<PEER_HANDLER, ACE_TLI_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<PEER_HANDLER>;
-template class IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR>;
-template class Peer_Handler<ACE_TLI_STREAM>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<PEER_HANDLER>
-#pragma instantiate ACE_Connector<PEER_HANDLER, ACE_TLI_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_TLI_STREAM, ACE_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<PEER_HANDLER>
-#pragma instantiate IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR>
-#pragma instantiate Peer_Handler<ACE_TLI_STREAM>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/DLL/Newsweek.cpp b/examples/DLL/Newsweek.cpp
index 5bb26def20e..5a48690b350 100644
--- a/examples/DLL/Newsweek.cpp
+++ b/examples/DLL/Newsweek.cpp
@@ -27,11 +27,18 @@ Newsweek::operator new (size_t bytes, const ACE_nothrow_t&)
 {
   return ::new (ACE_nothrow) char[bytes];
 }
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+void
+Newsweek::operator delete (void *p, const ACE_nothrow_t&) throw ()
+{
+  delete [] static_cast <char *> (p);
+}
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
 void
 Newsweek::operator delete (void *ptr)
 {
-  delete [] ((char *) ptr);
+  delete [] static_cast <char *> (ptr);
 }
 
 // Returns the Newsweek class pointer.
@@ -42,7 +49,7 @@ extern "C" ACE_Svc_Export Magazine *create_magazine (void);
 Magazine *
 create_magazine (void)
 {
-  Magazine *mag;
+  Magazine *mag = 0;
   ACE_NEW_RETURN (mag, Newsweek, 0);
   return mag;
 }
diff --git a/examples/DLL/Newsweek.h b/examples/DLL/Newsweek.h
index 9f53b8c190a..79355e74cbd 100644
--- a/examples/DLL/Newsweek.h
+++ b/examples/DLL/Newsweek.h
@@ -49,6 +49,9 @@ public:
 #if defined (ACE_HAS_NEW_NOTHROW)
   // Overloaded new operator, nothrow_t variant.
   void *operator new (size_t bytes, const ACE_nothrow_t&);
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
   void operator delete (void *ptr);
 };
diff --git a/examples/DLL/Today.cpp b/examples/DLL/Today.cpp
index 036a7c82ccc..b80bfff2b0a 100644
--- a/examples/DLL/Today.cpp
+++ b/examples/DLL/Today.cpp
@@ -28,11 +28,18 @@ Today::operator new (size_t bytes, const ACE_nothrow_t&)
 {
   return ::new (ACE_nothrow) char[bytes];
 }
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+void
+Today::operator delete (void *p, const ACE_nothrow_t&) throw ()
+{
+  delete [] static_cast <char *> (p);
+}
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
 void
 Today::operator delete (void *ptr)
 {
-  delete [] ((char *) ptr);
+  delete [] static_cast <char *> (ptr);
 }
 
 // Returns the pointer to the Today class.
@@ -42,7 +49,7 @@ extern "C" ACE_Svc_Export Magazine *create_magazine (void);
 
 Magazine *create_magazine (void)
 {
-  Magazine *mag;
+  Magazine *mag = 0;
   ACE_NEW_RETURN (mag, Today, 0);
   return mag;
 }
diff --git a/examples/DLL/Today.h b/examples/DLL/Today.h
index 19cce2317b5..00c2d4b9c04 100644
--- a/examples/DLL/Today.h
+++ b/examples/DLL/Today.h
@@ -50,6 +50,9 @@ public:
 #if defined (ACE_HAS_NEW_NOTHROW)
   // Overloaded new operator, nothrow_t variant.
   void *operator new (size_t bytes, const ACE_nothrow_t&);
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
   void operator delete (void *ptr);
 };
diff --git a/examples/DLL/test_dll.cpp b/examples/DLL/test_dll.cpp
index fce379da943..10dbcbddaa4 100644
--- a/examples/DLL/test_dll.cpp
+++ b/examples/DLL/test_dll.cpp
@@ -72,8 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <Magazine>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <Magazine>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Export/dll.cpp b/examples/Export/dll.cpp
index 7e2f969c3fa..07705db9d59 100644
--- a/examples/Export/dll.cpp
+++ b/examples/Export/dll.cpp
@@ -10,7 +10,7 @@ test_function ()
   return RETVAL;
 }
 
-int 
+int
 test_class::method ()
 {
   return RETVAL;
@@ -22,10 +22,6 @@ get_dll_singleton ()
   return TEST_SINGLETON::instance ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<test_class,ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<test_class,ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<test_class, ACE_Null_Mutex> *ACE_Singleton<test_class, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/IOStream/client/iostream_client.cpp b/examples/IOStream/client/iostream_client.cpp
index 609e335c5d5..e8ddedf9b44 100644
--- a/examples/IOStream/client/iostream_client.cpp
+++ b/examples/IOStream/client/iostream_client.cpp
@@ -69,14 +69,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
-#if !defined (ACE_LACKS_ACE_IOSTREAM)
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_IOStream <ACE_SOCK_Stream>;
-template class ACE_Streambuf_T <ACE_SOCK_Stream>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_IOStream <ACE_SOCK_Stream>
-#pragma instantiate ACE_Streambuf_T <ACE_SOCK_Stream>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* !ACE_LACKS_ACE_IOSTREAM */
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index 0fc83436f69..656b432a579 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -130,18 +130,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   return 0;
 }
 
-
-#if !defined (ACE_LACKS_ACE_IOSTREAM)
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor <Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_IOStream <ACE_SOCK_Stream>;
-template class ACE_Streambuf_T <ACE_SOCK_Stream>;
-template class ACE_Svc_Handler <ACE_SOCK_IOSTREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor <Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_IOStream <ACE_SOCK_Stream>
-#pragma instantiate ACE_Streambuf_T <ACE_SOCK_Stream>
-#pragma instantiate ACE_Svc_Handler <ACE_SOCK_IOSTREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* !ACE_LACKS_ACE_IOSTREAM */
diff --git a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
index a213dbd8942..a6535c82e82 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
+++ b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = reader
   Source_Files {
     reader.cpp
diff --git a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
index a6f81429dc4..b0ecbc77c4d 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
+++ b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
@@ -2,7 +2,6 @@
 
 #include "ace/DEV_Addr.h"
 #include "ace/DEV_Connector.h"
-#include "ace/DEV_IO.h"
 #include "ace/TTY_IO.h"
 
 ACE_RCSID(reader, reader, "$Id$")
@@ -27,13 +26,22 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_TTY_IO::Serial_Params myparams;
   myparams.baudrate = 9600;
-  myparams.parityenb = 1;
+  myparams.xonlim = 0;
+  myparams.xofflim = 0;
+  myparams.readmincharacters = 0;
+  myparams.readtimeoutmsec = 10000;
+  myparams.parityenb = true;
   myparams.paritymode = "EVEN";
+  myparams.ctsenb = false;
+  myparams.rtsenb = false;
+  myparams.xinenb = false;
+  myparams.xoutenb = false;
+  myparams.modem = false;
+  myparams.rcvenb = true;
+  myparams.dsrenb = false;
+  myparams.dtrdisable = false;
   myparams.databits = 8;
   myparams.stopbits = 1;
-  myparams.readtimeoutmsec = 10000;
-  myparams.ctsenb = 0;
-  myparams.rcvenb = 1;
 
   if (read_dev.control (ACE_TTY_IO::SETPARAMS,
                         &myparams) == -1)
diff --git a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
index dc5d3c39ad7..75486584b6d 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
+++ b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = writer
   Source_Files {
     writer.cpp
diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
index b22b40dfe05..0071d709954 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
+++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
@@ -25,13 +25,22 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_TTY_IO::Serial_Params myparams;
   myparams.baudrate = 9600;
-  myparams.parityenb = 1;
+  myparams.xonlim = 0;
+  myparams.xofflim = 0;
+  myparams.readmincharacters = 0;
+  myparams.readtimeoutmsec = 10000;
+  myparams.parityenb = true;
   myparams.paritymode = "EVEN";
+  myparams.ctsenb = false;
+  myparams.rtsenb = false;
+  myparams.xinenb = false;
+  myparams.xoutenb = false;
+  myparams.modem = false;
+  myparams.rcvenb = true;
+  myparams.dsrenb = false;
+  myparams.dtrdisable = false;
   myparams.databits = 8;
   myparams.stopbits = 1;
-  myparams.readtimeoutmsec = 200;
-  myparams.ctsenb = 0;
-  myparams.rcvenb = 1;
 
   if (write_dev.control (ACE_TTY_IO::SETPARAMS,
                          &myparams) == -1)
diff --git a/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
index 7d836016858..1e6d04447e5 100644
--- a/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
+++ b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client) : aceexe {
+  avoids += ace_for_tao
   exename = FIFO-client
   Source_Files {
     FIFO-client.cpp
@@ -9,6 +10,7 @@ project(*client) : aceexe {
 }
 
 project(*server) : aceexe {
+  avoids += ace_for_tao
   exename = FIFO-server
   Source_Files {
     FIFO-server.cpp
@@ -30,6 +32,7 @@ project(*Msg_Server) : aceexe {
 }
 
 project(*test) : aceexe {
+  avoids += ace_for_tao
   exename = FIFO-test
   Source_Files {
     FIFO-test.cpp
diff --git a/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
index 634c32de441..24f9a2b3a61 100644
--- a/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
+++ b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = client
   Source_Files {
     client.cpp
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 4d43a474c56..e91668e205f 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -418,11 +418,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 3399229e37d..46dd0049da2 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -576,13 +576,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return server.handle_events ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
index e7ebe811fd2..59c4beaa487 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
@@ -51,6 +51,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
index 6ea1307c4fb..814280a515c 100644
--- a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+++ b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
@@ -23,6 +23,7 @@ project(*CPP_inclient) : aceexe {
 }
 
 project(*CPP_inserver) : aceexe {
+  avoids += ace_for_tao
   exename = CPP-inserver
   Source_Files {
     CPP-inserver.cpp
@@ -30,6 +31,7 @@ project(*CPP_inserver) : aceexe {
 }
 
 project(*CPP_memclient) : aceexe {
+  avoids += ace_for_tao
   exename = CPP-memclient
   Source_Files {
     CPP-memclient.cpp
@@ -37,6 +39,7 @@ project(*CPP_memclient) : aceexe {
 }
 
 project(*CPP_memserver) : aceexe {
+  avoids += ace_for_tao
   exename = CPP-memserver
   Source_Files {
     CPP-memserver.cpp
@@ -44,6 +47,7 @@ project(*CPP_memserver) : aceexe {
 }
 
 project(*FD_unclient) : aceexe {
+  avoids += ace_for_tao
   exename = FD-unclient
   Source_Files {
     FD-unclient.cpp
@@ -51,6 +55,7 @@ project(*FD_unclient) : aceexe {
 }
 
 project(*CPP_unclient) : aceexe {
+  avoids += ace_for_tao
   exename = CPP-unclient
   Source_Files {
     CPP-unclient.cpp
@@ -58,6 +63,7 @@ project(*CPP_unclient) : aceexe {
 }
 
 project(*CPP_unserver) : aceexe {
+  avoids += ace_for_tao
   exename = CPP-unserver
   Source_Files {
     CPP-unserver.cpp
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index 0008c4a1b58..e6778984b40 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -375,8 +375,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 6a6166ee1b8..7ab033550d1 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -416,8 +416,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index b09bf3ad326..e1a9177e56b 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -604,10 +604,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return server.handle_events ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
index 00ab3fe7e83..23a53a7e7c7 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
@@ -5,6 +5,7 @@
 // single-threaded concurrent server.  This server program can be
 // driven by the oneway test mode of SSL-client.cpp.
 
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Time_Value.h"
 #include "ace/SSL/SSL_SOCK_Acceptor.h"
diff --git a/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
index cb90595e2ae..d34d8671735 100644
--- a/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
+++ b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*ex1) : aceexe {
+  avoids += ace_for_tao
   exename = ex1
   Source_Files {
     ex1.cpp
@@ -9,6 +10,7 @@ project(*ex1) : aceexe {
 }
 
 project(*ex2) : aceexe {
+  avoids += ace_for_tao
   exename = ex2
   Source_Files {
     ex2.cpp
@@ -16,6 +18,7 @@ project(*ex2) : aceexe {
 }
 
 project(*ex3) : aceexe {
+  avoids += ace_for_tao
   exename = ex3
   Source_Files {
     ex3.cpp
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 425f040ccf5..ea265241bcf 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -231,25 +231,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Logging_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
-template class ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>;
-template class ACE_Singleton<Options, ACE_Null_Mutex>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Logging_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
-#pragma instantiate ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
 template ACE_Singleton<Options, ACE_Null_Mutex> *
   ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
 template ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index eb87b2bef7b..7420aeb637e 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -79,11 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/Map_Manager/test_hash_map_manager.cpp b/examples/Map_Manager/test_hash_map_manager.cpp
index 882ba564d30..91e08e5c58c 100644
--- a/examples/Map_Manager/test_hash_map_manager.cpp
+++ b/examples/Map_Manager/test_hash_map_manager.cpp
@@ -78,31 +78,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Entry<ACE_TString, ACE_TString>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if defined(ACE_HAS_THREADS)
-#pragma instantiate ACE_Guard<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>
-#endif /* ACE_HAS_THREADS */
-
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, ACE_TString>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_TString, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_SYNCH_RW_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
index ca6b8ee6622..6e2bcc9f3aa 100644
--- a/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
+++ b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
-}
\ No newline at end of file
+  avoids += ace_for_tao
+}
diff --git a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
index d648c60da40..368866edb73 100644
--- a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
+++ b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = file-reverse
-}
\ No newline at end of file
+}
diff --git a/examples/Misc/Misc.mpc b/examples/Misc/Misc.mpc
index 86d377dc224..b0ed858efbd 100644
--- a/examples/Misc/Misc.mpc
+++ b/examples/Misc/Misc.mpc
@@ -16,6 +16,7 @@ project(*test_get_opt) : aceexe {
 }
 
 project(*test_profile_timer) : aceexe {
+  avoids += ace_for_tao
   exename = test_profile_timer
   Source_Files {
     test_profile_timer.cpp
diff --git a/examples/Misc/test_dump.cpp b/examples/Misc/test_dump.cpp
index 1d908ba7505..bbffe66a2bf 100644
--- a/examples/Misc/test_dump.cpp
+++ b/examples/Misc/test_dump.cpp
@@ -31,13 +31,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dumpable_Adapter<SOCK_Stream>;
-template class ACE_Dumpable_Adapter<SOCK>;
-template class ACE_Dumpable_Adapter<SOCK_Acceptor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dumpable_Adapter<SOCK_Stream>
-#pragma instantiate ACE_Dumpable_Adapter<SOCK>
-#pragma instantiate ACE_Dumpable_Adapter<SOCK_Acceptor>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/Misc/test_set.cpp b/examples/Misc/test_set.cpp
index b5c81d64bc8..4b60d3b4b11 100644
--- a/examples/Misc/test_set.cpp
+++ b/examples/Misc/test_set.cpp
@@ -55,10 +55,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<int>;
-template class ACE_Unbounded_Set_Iterator<int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set<int>
-#pragma instantiate ACE_Unbounded_Set_Iterator<int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/NT_Service/NT_Service.mpc b/examples/NT_Service/NT_Service.mpc
index 2adfe6f6feb..4fdbe054dfe 100644
--- a/examples/NT_Service/NT_Service.mpc
+++ b/examples/NT_Service/NT_Service.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe, winregistry {
+  avoids += wince
   exename = main
 }
diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp
index 2c0093a7f6b..5f10e209df1 100644
--- a/examples/NT_Service/main.cpp
+++ b/examples/NT_Service/main.cpp
@@ -254,8 +254,3 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   return PROCESS::instance ()->run (argc, argv);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Process, ACE_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Process, ACE_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/NT_Service/ntsvc.cpp b/examples/NT_Service/ntsvc.cpp
index 8d16df53e0a..f21dec5dad7 100644
--- a/examples/NT_Service/ntsvc.cpp
+++ b/examples/NT_Service/ntsvc.cpp
@@ -27,11 +27,11 @@ Service::Service (void)
   reactor (ACE_Reactor::instance ());
 }
 
-Service::~Service (void) 
-{ 
-  if (ACE_Reactor::instance ()->cancel_timer(this) == -1) 
+Service::~Service (void)
+{
+  if (ACE_Reactor::instance ()->cancel_timer(this) == -1)
     ACE_ERROR ((LM_ERROR,
-                "Service::~Service failed to cancel_timer.\n")); 
+                "Service::~Service failed to cancel_timer.\n"));
 }
 
 // This method is called when the service gets a control request.  It
@@ -111,8 +111,3 @@ Service::svc (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Service, ACE_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Service, ACE_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Naming/Naming.mpc b/examples/Naming/Naming.mpc
index 4d97e9282e8..f8365ffe07d 100644
--- a/examples/Naming/Naming.mpc
+++ b/examples/Naming/Naming.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*multiple_contexts) : aceexe {
+  avoids += ace_for_tao
   exename = multiple_contexts
   Source_Files {
     test_multiple_contexts.cpp
@@ -9,6 +10,7 @@ project(*multiple_contexts) : aceexe {
 }
 
 project(*non_existent) : aceexe {
+  avoids += ace_for_tao
   exename = non_existent
   Source_Files {
     test_non_existent.cpp
@@ -16,6 +18,7 @@ project(*non_existent) : aceexe {
 }
 
 project(*writers) : aceexe {
+  avoids += ace_for_tao
   exename = writers
   Source_Files {
     test_writers.cpp
@@ -23,6 +26,7 @@ project(*writers) : aceexe {
 }
 
 project(*open) : aceexe {
+  avoids += ace_for_tao
   exename = open
   Source_Files {
     test_open.cpp
diff --git a/examples/OS/Process/OS_Process.mpc b/examples/OS/Process/OS_Process.mpc
index 6e40f8dfcd9..082f7133301 100644
--- a/examples/OS/Process/OS_Process.mpc
+++ b/examples/OS/Process/OS_Process.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*imore) : aceexe {
+  avoids += ace_for_tao
   exename = imore
   Source_Files {
     imore.cpp
diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp
index d9b645a3925..3740725a690 100644
--- a/examples/OS/Process/imore.cpp
+++ b/examples/OS/Process/imore.cpp
@@ -37,7 +37,7 @@
 ACE_RCSID(Process, imore, "$Id$")
 
 #if defined (ACE_WIN32)
-static const char * executable = "MORE.COM";
+static const ACE_TCHAR *executable = ACE_TEXT("MORE.COM");
 static const ACE_TCHAR *rendezvous_dir = ACE_TEXT("c:/temp");
 static const ACE_TCHAR *rendezvous_pfx = ACE_TEXT("imore");
 #else
diff --git a/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
index fbaed5667e6..20c03f40fa6 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp
@@ -97,18 +97,3 @@ Fill_ACE_QoS::map (void)
   return this->flow_spec_map_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
index fbaed5667e6..20c03f40fa6 100644
--- a/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
+++ b/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp
@@ -97,18 +97,3 @@ Fill_ACE_QoS::map (void)
   return this->flow_spec_map_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/QOS/Diffserv/QOS_Diffserv.mpc b/examples/QOS/Diffserv/QOS_Diffserv.mpc
index 0b4258f9de1..3e66fbee34a 100644
--- a/examples/QOS/Diffserv/QOS_Diffserv.mpc
+++ b/examples/QOS/Diffserv/QOS_Diffserv.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client) : aceexe, qos {
+  avoids += ace_for_tao
   exename = client
   requires += qos
   Source_Files {
diff --git a/examples/QOS/Simple/Fill_ACE_QoS.cpp b/examples/QOS/Simple/Fill_ACE_QoS.cpp
index fbaed5667e6..20c03f40fa6 100644
--- a/examples/QOS/Simple/Fill_ACE_QoS.cpp
+++ b/examples/QOS/Simple/Fill_ACE_QoS.cpp
@@ -97,18 +97,3 @@ Fill_ACE_QoS::map (void)
   return this->flow_spec_map_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Reactor/Dgram/Reactor_Dgram.mpc b/examples/Reactor/Dgram/Reactor_Dgram.mpc
index 419261076cd..1040aedc184 100644
--- a/examples/Reactor/Dgram/Reactor_Dgram.mpc
+++ b/examples/Reactor/Dgram/Reactor_Dgram.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*CO) : aceexe {
+  avoids += ace_for_tao
   exename = codgram
   Source_Files {
     CODgram.cpp
diff --git a/examples/Reactor/FIFO/Reactor_FIFO.mpc b/examples/Reactor/FIFO/Reactor_FIFO.mpc
index 6beaee6489b..072ec5412b8 100644
--- a/examples/Reactor/FIFO/Reactor_FIFO.mpc
+++ b/examples/Reactor/FIFO/Reactor_FIFO.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client) : aceexe {
+  avoids += ace_for_tao
   exename = client
   Source_Files {
    client.cpp
@@ -9,6 +10,7 @@ project(*client) : aceexe {
 }
 
 project(*server) : aceexe {
+  avoids += ace_for_tao
   exename = server
   Source_Files {
    server.cpp
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index 69705eee06a..e276791fc47 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -29,8 +29,8 @@ class Thread_Handler : public ACE_Event_Handler
   //   thread exits it notifies the ACE_Reactor in the main thread
   //   using the ACE_Reactor's notification mechanism.
 public:
-  Thread_Handler (int delay,
-                  int interval,
+  Thread_Handler (long delay,
+                  long interval,
                   size_t n_threads,
                   size_t max_iterations);
   // Constructor.
@@ -109,8 +109,9 @@ Thread_Handler::~Thread_Handler (void)
   ACE_Reactor::instance ()->cancel_timer (this);
 }
 
-Thread_Handler::Thread_Handler (int delay,
-				int interval,
+Thread_Handler::Thread_Handler (
+        long delay,
+        long interval,
 				size_t n_threads,
         size_t max_iterations)
     : iterations_ (max_iterations)
@@ -290,8 +291,7 @@ Thread_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 }
 
 int
-Thread_Handler::handle_timeout (const ACE_Time_Value &time,
-				const void *)
+Thread_Handler::handle_timeout (const ACE_Time_Value &time, const void *)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) received timeout at (%u, %u), iterations = %d\n",
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index bedfe046738..803b98c24cd 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -48,12 +48,6 @@
 #  include "ace/Thread.h"
 #endif
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 ACE_RCSID(Misc, pingpong, "$Id$")
 
 class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
@@ -197,7 +191,7 @@ Ping_Pong::handle_timeout (const ACE_Time_Value &,
 static ACE_TCHAR *string_name;
 
 // Wait for 10 seconds and then shut down.
-static const int SHUTDOWN_TIME = 10;
+static const ACE_Time_Value SHUTDOWN_TIME (10);
 
 static void
 run_svc (ACE_HANDLE handle)
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index 621e5f72f1c..6badd849757 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -151,7 +151,7 @@ Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
       ACE_Reactor::end_event_loop ();
       break;
     default:
-      ACE_ASSERT (!"invalid signal");
+      ACE_ERROR_RETURN ((LM_ERROR, "invalid signal"), -1);
       break;
       /* NOTREACHED */
     }
diff --git a/examples/Reactor/Misc/test_event_handler_t.cpp b/examples/Reactor/Misc/test_event_handler_t.cpp
index 6a68bd9a9e3..4261859784e 100644
--- a/examples/Reactor/Misc/test_event_handler_t.cpp
+++ b/examples/Reactor/Misc/test_event_handler_t.cpp
@@ -38,15 +38,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  // The explicit instantiation is necessary with g++ 2.91.66 with
-  // -frepo, because it misses it.
-template class ACE_Event_Handler_T<ACE_Test_Sig_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Event_Handler_T<ACE_Test_Sig_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index 4c129e486bf..1676703118e 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -185,14 +185,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Reactor/Misc/test_signals_1.cpp b/examples/Reactor/Misc/test_signals_1.cpp
index 8b4ae6f0d96..b0410f572c1 100644
--- a/examples/Reactor/Misc/test_signals_1.cpp
+++ b/examples/Reactor/Misc/test_signals_1.cpp
@@ -64,7 +64,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Time_Value period (ACE_DEFAULT_TIMEOUT);
 
   if (argc > 1)
-    period.set (ACE_OS::atoi (argv[1]));
+    period.set (ACE_OS::atoi (argv[1]), 0);
 
   // Set up the periodic interval timer.
   if (ACE_Reactor::instance ()->schedule_timer
diff --git a/examples/Reactor/Proactor/Proactor.mpc b/examples/Reactor/Proactor/Proactor.mpc
index 038babf2a74..c2c52207ca1 100644
--- a/examples/Reactor/Proactor/Proactor.mpc
+++ b/examples/Reactor/Proactor/Proactor.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*cancel) : aceexe {
+  avoids += ace_for_tao
   exename = test_cancel
   Source_Files {
     test_cancel.cpp
@@ -9,6 +10,7 @@ project(*cancel) : aceexe {
 }
 
 project(*end_event_loops) : aceexe {
+  avoids += ace_for_tao
   exename = test_end_event_loop
   Source_Files {
     test_end_event_loop.cpp
@@ -16,6 +18,7 @@ project(*end_event_loops) : aceexe {
 }
 
 project(*multiple_loops) : aceexe {
+  avoids += ace_for_tao
   exename = test_multiple_loops
   Source_Files {
     test_multiple_loops.cpp
@@ -23,6 +26,7 @@ project(*multiple_loops) : aceexe {
 }
 
 project(*post_completions) : aceexe {
+  avoids += ace_for_tao
   exename = test_post_completions
   Source_Files {
     post_completions.cpp
@@ -30,6 +34,7 @@ project(*post_completions) : aceexe {
 }
 
 project(*proactor) : aceexe {
+  avoids += ace_for_tao
   exename = test_proactor
   Source_Files {
     test_proactor.cpp
@@ -37,6 +42,7 @@ project(*proactor) : aceexe {
 }
 
 project(*timeout) : aceexe {
+  avoids += ace_for_tao
   exename = test_timeout
   Source_Files {
     test_timeout.cpp
@@ -44,6 +50,7 @@ project(*timeout) : aceexe {
 }
 
 project(*udp_proactor) : aceexe {
+  avoids += ace_for_tao
   exename = test_udp_proactor
   Source_Files {
     test_udp_proactor.cpp
diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp
index 9a19ebafd2a..636f2c7f3fa 100644
--- a/examples/Reactor/Proactor/post_completions.cpp
+++ b/examples/Reactor/Proactor/post_completions.cpp
@@ -292,16 +292,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task <ACE_NULL_SYNCH>;
-template class ACE_Atomic_Op <ACE_Thread_Mutex, size_t>;
-template class ACE_Atomic_Op_Ex <ACE_Thread_Mutex, size_t>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Task <ACE_NULL_SYNCH>
-#pragma instantiate ACE_Atomic_Op <ACE_Thread_Mutex, size_t>
-#pragma instantiate ACE_Atomic_Op_Ex <ACE_Thread_Mutex, size_t>
-#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
-
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp
index 21749d71f17..c225af561b0 100644
--- a/examples/Reactor/Proactor/test_cancel.cpp
+++ b/examples/Reactor/Proactor/test_cancel.cpp
@@ -233,12 +233,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Asynch_Acceptor<Receiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
 
 int
diff --git a/examples/Reactor/Proactor/test_end_event_loop.cpp b/examples/Reactor/Proactor/test_end_event_loop.cpp
index 945a7f5cff3..964088ad629 100644
--- a/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -154,12 +154,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task <ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Task <ACE_NULL_SYNCH>
-#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
-
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 99ac5b9d604..1d0951658f4 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -666,12 +666,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Asynch_Acceptor<Receiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
 
 int
diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp
index 7ee9e005a1b..2fac76990d5 100644
--- a/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/examples/Reactor/Proactor/test_proactor2.cpp
@@ -805,11 +805,4 @@ int PrintSigMask ()
   return 0;
 }
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Asynch_Acceptor<Receiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
diff --git a/examples/Reactor/Proactor/test_proactor3.cpp b/examples/Reactor/Proactor/test_proactor3.cpp
index 83c8060118e..dc5bfa128d5 100644
--- a/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/examples/Reactor/Proactor/test_proactor3.cpp
@@ -861,10 +861,4 @@ print_sigmask (void)
 }
 #endif /* 0 */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Asynch_Acceptor<Receiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 28d40cad510..ab15f33dc5a 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -116,14 +116,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>;
-template class ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index ce054ec04af..bc80e1bebe1 100644
--- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -229,7 +229,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
       // Setup a timer for the task
       if (ACE_Reactor::instance ()->schedule_timer (&task,
                                                     (void *)((size_t)i),
-                                                    0) == -1)
+                                                    ACE_Time_Value::zero) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
 
       for (int i = 0; i < number_of_handles_to_signal; i++)
diff --git a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
index 43d1e7ff0ff..eec632ee696 100644
--- a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
+++ b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
@@ -9,6 +9,7 @@ project(*Abandoned): aceexe, wfmo {
 }
 
 project(*APC): aceexe, wfmo {
+  avoids += wince
   exename = apc
   Source_Files {
     APC.cpp
@@ -72,6 +73,7 @@ project(*Registration): aceexe, wfmo {
 }
 
 project(*Registry_Changes): aceexe, wfmo {
+  avoids += ace_for_tao wince
   exename = registry_changes
   Source_Files {
     Registry_Changes.cpp
@@ -93,6 +95,7 @@ project(*Suspended_Removals): aceexe, wfmo {
 }
 
 project(*Talker): aceexe, wfmo {
+  avoids += ace_for_tao wince
   exename = talker
   Source_Files {
     Talker.cpp
@@ -107,6 +110,7 @@ project(*Timeouts): aceexe, wfmo {
 }
 
 project(*Window_Messages): aceexe, wfmo {
+  avoids += ace_for_tao wince
   exename = window_messages
   Source_Files {
     Window_Messages.cpp
diff --git a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
index 9ae5d7fdf78..f5a1994168c 100644
--- a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
+++ b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
@@ -26,6 +26,7 @@
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/Reactor.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, Window_Messages, "$Id$")
 
diff --git a/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc b/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
index 11fa3ae9fe7..6876c4aac4d 100644
--- a/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
+++ b/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc
@@ -2,18 +2,21 @@
 // $Id$
 
 project(*loc dgram) : aceexe {
+  avoids += ace_for_tao
   exename = local_dgram_test
   Source_Files {
     local_dgram_client_test.cpp
   }
 }
 project(*loc fifo) : aceexe {
+  avoids += ace_for_tao
   exename = local_fifo_test
   Source_Files {
     local_fifo_client_test.cpp
   }
 }
 project(*loc pipe) : aceexe {
+  avoids += ace_for_tao
   exename = local_pipe_test
   Source_Files {
     local_pipe_client_test.cpp
@@ -26,12 +29,14 @@ project(*loc spipe) : aceexe {
   }
 }
 project(*loc stream) : aceexe {
+  avoids += ace_for_tao
   exename = local_stream_test
   Source_Files {
     local_stream_client_test.cpp
   }
 }
 project(*rem dgram) : aceexe {
+  avoids += ace_for_tao
   exename = remote_dgram_test
   Source_Files {
     remote_dgram_client_test.cpp
@@ -44,6 +49,7 @@ project(*rem svc dir) : aceexe {
   }
 }
 project(*rem stream) : aceexe {
+  avoids += ace_for_tao
   exename = remote_stream_test
   Source_Files {
     remote_stream_client_test.cpp
@@ -56,6 +62,7 @@ project(*rem thr_stream) : aceexe {
   }
 }
 project(*bcast) : aceexe {
+  avoids += ace_for_tao
   exename = remote_broadcast_test
   Source_Files {
     broadcast_client_test.cpp
diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
index 76c9cbeaa62..e90890fddc1 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
@@ -78,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 		       "in local_fifo_client_test\n",
                        rendezvous_fifo),
                       -1);
-  void *cp;
+  void *cp = 0;
   ACE_Mem_Map mmap (file_name);
 
   if (mmap (cp) == -1)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
index 26ece126384..5ee3361da62 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
@@ -63,7 +63,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   parse_args (argc, argv);
 
   ACE_SOCK_Dgram sd (ACE_Addr::sap_any);
-  void *cp;
+  void *cp = 0;
   ACE_INET_Addr sa (port_number, host_name);
 
   ACE_Mem_Map mmap (file_name);
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
index 61192f2f469..12f3941de51 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
@@ -65,7 +65,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   parse_args (argc, argv);
   ACE_INET_Addr sa (port_number, host_name);
-  void *cp;
+  void *cp = 0;
   char buf[BUFSIZ];
   int n;
   ACE_SOCK_CODgram dc;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index f2f32b273ce..0a15478caed 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -191,32 +191,5 @@ typedef Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR> HANDLE_THR_ACCEPTOR;
 HANDLE_THR_ACCEPTOR remote_thr_stream;
 ACE_Service_Object_Type rts (&remote_thr_stream, ACE_TEXT("Remote_Thr_Stream"));
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Accept_Strategy<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<CLI_STREAM>;
-template class ACE_Creation_Strategy<CLI_STREAM>;
-template class ACE_Scheduling_Strategy<CLI_STREAM>;
-template class ACE_Strategy_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Svc_Handler<THR_STREAM, ACE_MT_SYNCH>;
-template class ACE_Thread_Strategy<CLI_STREAM>;
-template class CLI_Stream <THR_STREAM>;
-template class Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Creation_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Scheduling_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Strategy_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<THR_STREAM, ACE_MT_SYNCH>
-#pragma instantiate ACE_Thread_Strategy<CLI_STREAM>
-#pragma instantiate CLI_Stream <THR_STREAM>
-#pragma instantiate Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#elif defined (AIX) && (defined (__IBMCPP__) && (__IBMCPP__ >= 500))
-// This works around a bug in Visual Age C++ template auto-instantiate.
-template CLI_Stream<THR_STREAM>::CLI_Stream(ACE_Thread_Manager*);
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_HANDLE_THR_STREAM_C */
diff --git a/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc b/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
index f8dfd26377b..c44b40c6e32 100644
--- a/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
+++ b/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Lib) : acelib {
+  avoids    += ace_for_tao
   sharedname = IPC_Tests_Server
   dynamicflags += ACE_BUILD_SVC_DLL
   Source_Files {
@@ -19,6 +20,7 @@ project(*Lib) : acelib {
 }
 
 project(*test) : aceexe {
+  avoids    += ace_for_tao
   exename = server_test
   after  += Svc_Cfg_IPC_Server_Lib
   libs   += IPC_Tests_Server
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp
index 66628fb3ef6..4499d9fa11b 100644
--- a/examples/Shared_Malloc/Malloc.cpp
+++ b/examples/Shared_Malloc/Malloc.cpp
@@ -67,65 +67,3 @@ Malloc::instance (void)
   return Malloc::instance_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Allocator_Adapter<M_ALLOCATOR>;
-#if !defined (ACE_LACKS_SBRK)
-template class ACE_Allocator_Adapter<SB_ALLOCATOR>;
-template class ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-template class ACE_Malloc_T <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
-#endif /* ! ACE_LACKS_SBRK */
-#if !defined (ACE_LACKS_SYSV_SHMEM)
-template class ACE_Allocator_Adapter<SP_ALLOCATOR>;
-template class ACE_Allocator_Adapter<ST_ALLOCATOR>;
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
-
-template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>;
-template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>;
-#if !defined (ACE_HAS_THREADS) && !defined(ACE_HAS_STD_TEMPLATE_SPECIALIZATION)
-template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-#endif /* ! ACE_HAS_THREADS && ! ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
-
-#if defined (ACE_LACKS_SYSV_SHMEM)
-
-#else
-template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex>;
-template class ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-template class ACE_Malloc_T <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>;
-template class ACE_Malloc_T <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
-#endif /* ACE_LACKS_SYSV_SHMEM */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Allocator_Adapter<L_ALLOCATOR>
-#pragma instantiate ACE_Allocator_Adapter<M_ALLOCATOR>
-#if !defined (ACE_LACKS_SBRK)
-#pragma instantiate ACE_Allocator_Adapter<SB_ALLOCATOR>
-#pragma instantiate ACE_Malloc <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Malloc_T <ACE_SBRK_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
-#if !defined (ACE_LACKS_SBRK)
-#pragma instantiate ACE_Allocator_Adapter<SP_ALLOCATOR>
-#endif /* ! ACE_LACKS_SYSV_SHMEM */
-#pragma instantiate ACE_Allocator_Adapter<ST_ALLOCATOR>
-#pragma instantiate ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>
-#pragma instantiate ACE_Malloc_T <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Read_Guard<ACE_Process_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Process_Mutex>
-#if !defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX>
-#endif /* ! ACE_HAS_THREADS */
-
-#if defined (ACE_LACKS_SYSV_SHMEM)
-#pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
-#else
-#pragma instantiate ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex>
-#pragma instantiate ACE_Malloc <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Malloc_T <ACE_SHARED_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_T <ACE_SHARED_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
-#endif /* ACE_LACKS_SYSV_SHMEM */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Shared_Malloc/Malloc.h b/examples/Shared_Malloc/Malloc.h
index 6b315cd3797..c88cead8bfb 100644
--- a/examples/Shared_Malloc/Malloc.h
+++ b/examples/Shared_Malloc/Malloc.h
@@ -10,7 +10,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class Malloc
   // = TITLE
diff --git a/examples/Shared_Malloc/Shared_Malloc.mpc b/examples/Shared_Malloc/Shared_Malloc.mpc
index f4102049f59..42753246815 100644
--- a/examples/Shared_Malloc/Shared_Malloc.mpc
+++ b/examples/Shared_Malloc/Shared_Malloc.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = malloc
   Source_Files {
     Malloc.cpp
@@ -10,6 +11,7 @@ project : aceexe {
   }
 }
 project(*multiple) : aceexe {
+  avoids += ace_for_tao
   exename = multiple
   Source_Files {
     Malloc.cpp
@@ -18,12 +20,14 @@ project(*multiple) : aceexe {
   }
 }
 project(*persistence) : aceexe {
+  avoids += ace_for_tao
   exename = persistence
   Source_Files {
     test_persistence.cpp
   }
 }
 project(*posind) : aceexe {
+  avoids += ace_for_tao
   exename = posind
   Source_Files {
     Malloc.cpp
diff --git a/examples/Shared_Malloc/test_multiple_mallocs.cpp b/examples/Shared_Malloc/test_multiple_mallocs.cpp
index 3f35daa9d26..1638a762060 100644
--- a/examples/Shared_Malloc/test_multiple_mallocs.cpp
+++ b/examples/Shared_Malloc/test_multiple_mallocs.cpp
@@ -123,14 +123,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <ACE_Allocator_Adapter<TEST_MALLOC> >;
-template class ACE_Auto_Basic_Ptr<ACE_Allocator_Adapter<TEST_MALLOC> >;
-template class auto_ptr <TEST_MALLOC>;
-template class ACE_Auto_Basic_Ptr<TEST_MALLOC>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <ACE_Allocator_Adapter<TEST_MALLOC> >
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Allocator_Adapter<TEST_MALLOC> >
-#pragma instantiate auto_ptr <TEST_MALLOC>
-#pragma instantiate ACE_Auto_Basic_Ptr<TEST_MALLOC>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 682ed8a5943..8c3df750853 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -69,9 +69,18 @@ public:
   {
     return shmem_allocator->malloc (sizeof (Employee));
   }
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+  void operator delete (void *p, const ACE_nothrow_t&) throw ()
+  {
+    shmem_allocator->free (p);
+  }
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif
 
-  void operator delete (void *pointer) { shmem_allocator->free (pointer); }
+  void operator delete (void *pointer)
+  {
+    shmem_allocator->free (pointer);
+  }
 
 private:
   char *name_;
@@ -199,7 +208,7 @@ GUI_Handler::insert_employee (const char *name,
 int
 GUI_Handler::find_employee (const char *name)
 {
-  void *temp;
+  void *temp = 0;
 
   if (shmem_allocator->find (name,
                              temp) == 0)
@@ -263,7 +272,7 @@ GUI_Handler::list_employees (void)
 int
 GUI_Handler::delete_employee (const char *name)
 {
-  void *temp;
+  void *temp = 0;
 
   if (shmem_allocator->unbind (name,
                                temp) == 0)
@@ -339,18 +348,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// The following instantiation is in ace/System_Time.cpp:
-// template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
-template class ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-template class ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// The following instantiation is in ace/System_Time.cpp:
-// #pragma instantiate ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_LIFO_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
-#pragma instantiate ACE_Malloc_FIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_LIFO_Iterator_T <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index c41e9d143bb..c6d3111e06f 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -188,26 +188,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer<Test_Data>;
-template class ACE_Based_Pointer_Basic<Test_Data>;
-template class ACE_Based_Pointer_Basic<long>;
-template class ACE_Based_Pointer_Basic<Long_Test>;
-template class ACE_Based_Pointer<Long_Test>;
-template class auto_ptr <TEST_MALLOC>;
-template class ACE_Auto_Basic_Ptr<TEST_MALLOC>;
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer<Test_Data>
-#pragma instantiate ACE_Based_Pointer_Basic<Test_Data>
-#pragma instantiate ACE_Based_Pointer_Basic<long>
-#pragma instantiate ACE_Based_Pointer_Basic<Long_Test>
-#pragma instantiate ACE_Based_Pointer_Basic<Long>
-#pragma instantiate auto_ptr <TEST_MALLOC>
-#pragma instantiate ACE_Auto_Basic_Ptr<TEST_MALLOC>
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Shared_Memory/Shared_Memory.mpc b/examples/Shared_Memory/Shared_Memory.mpc
index 5c566e1d690..f0ee256597b 100644
--- a/examples/Shared_Memory/Shared_Memory.mpc
+++ b/examples/Shared_Memory/Shared_Memory.mpc
@@ -2,12 +2,14 @@
 // $Id$
 
 project(*MM) : aceexe {
+  avoids += ace_for_tao
   exename = testmm
   Source_Files {
     test_MM.cpp
   }
 }
 project(*SV) : aceexe {
+  avoids += ace_for_tao
   exename = testsv
   Source_Files {
     test_SV.cpp
diff --git a/examples/Smart_Pointers/gadget_test.cpp b/examples/Smart_Pointers/gadget_test.cpp
index 74df2248dc3..94c17b2a556 100644
--- a/examples/Smart_Pointers/gadget_test.cpp
+++ b/examples/Smart_Pointers/gadget_test.cpp
@@ -49,23 +49,4 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Bound_Ptr_Counter<ACE_SYNCH_MUTEX>;
-template class ACE_Strong_Bound_Ptr<Gadget, ACE_SYNCH_MUTEX>;
-template class ACE_Weak_Bound_Ptr<Gadget, ACE_SYNCH_MUTEX>;
-template class ACE_Strong_Bound_Ptr<Gadget_Part, ACE_SYNCH_MUTEX>;
-template class ACE_Weak_Bound_Ptr<Gadget_Part, ACE_SYNCH_MUTEX>;
-template class ACE_Node<Gadget_Part_var>;
-template class ACE_Unbounded_Queue<Gadget_Part_var>;
-template class ACE_Unbounded_Queue_Iterator<Gadget_Part_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Bound_Ptr_Counter<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Strong_Bound_Ptr<Gadget, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Weak_Bound_Ptr<Gadget, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Strong_Bound_Ptr<Gadget_Part, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Weak_Bound_Ptr<Gadget_Part, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Node<Gadget_Part_var>
-#pragma instantiate ACE_Unbounded_Queue<Gadget_Part_var>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Gadget_Part_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/examples/Smart_Pointers/widget_test.cpp b/examples/Smart_Pointers/widget_test.cpp
index 978b33d5bec..4fc8b5824a2 100644
--- a/examples/Smart_Pointers/widget_test.cpp
+++ b/examples/Smart_Pointers/widget_test.cpp
@@ -49,30 +49,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<Widget>;
-template class auto_ptr<Widget>;
-template class ACE_Auto_Basic_Ptr<Widget_Part>;
-template class auto_ptr<Widget_Part>;
-template class ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX>;
-template class ACE_Node<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >;
-template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >;
-template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >;
-template class ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex>;
-template class ACE_Node<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >;
-template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >;
-template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<Widget>
-#pragma instantiate auto_ptr<Widget>
-#pragma instantiate ACE_Auto_Basic_Ptr<Widget_Part>
-#pragma instantiate auto_ptr<Widget_Part>
-#pragma instantiate ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex>
-#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >
-#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_Null_Mutex> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Synch/Synch.mpc b/examples/Synch/Synch.mpc
index 5e8c6c115af..024e8459803 100644
--- a/examples/Synch/Synch.mpc
+++ b/examples/Synch/Synch.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = proc_sema
 }
diff --git a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
index 0795ff7443e..62cb7a0a819 100644
--- a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
+++ b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc
@@ -2,24 +2,28 @@
 // $Id$
 
 project(*MQ Client) : aceexe {
+  avoids += ace_for_tao
   exename = mqclient
   Source_Files {
     MQ_Client.cpp
   }
 }
 project(*MQ Server) : aceexe {
+  avoids += ace_for_tao
   exename = mqserver
   Source_Files {
     MQ_Server.cpp
   }
 }
 project(*TMQ Client) : aceexe {
+  avoids += ace_for_tao
   exename = tmqclient
   Source_Files {
     TMQ_Client.cpp
   }
 }
 project(*TMQ Server) : aceexe {
+  avoids += ace_for_tao
   exename = tmqserver
   Source_Files {
     TMQ_Server.cpp
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
index 055f93223c3..d48939845d5 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
@@ -50,11 +50,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Typed_SV_Message_Queue<Message_Data>;
-template class ACE_Typed_SV_Message<Message_Data>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Typed_SV_Message_Queue<Message_Data>
-#pragma instantiate ACE_Typed_SV_Message<Message_Data>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
index 0b54eb3e0f1..bda5e1bafa6 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
@@ -65,14 +65,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_NOTREACHED (return 0;)
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Typed_SV_Message_Queue<Message_Data>;
-template class ACE_Typed_SV_Message<Message_Data>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Typed_SV_Message_Queue<Message_Data>
-#pragma instantiate ACE_Typed_SV_Message<Message_Data>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
index fd2e931886f..647e4a4cf5a 100644
--- a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
+++ b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc
@@ -2,12 +2,14 @@
 // $Id$
 
 project(*1) : aceexe {
+  avoids += ace_for_tao
   exename = sem1
   Source_Files {
     Semaphores_1.cpp
   }
 }
 project(*2) : aceexe {
+  avoids += ace_for_tao
   exename = sem2
   Source_Files {
     Semaphores_2.cpp
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
index e8910459cb3..581dff8f7f6 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
@@ -92,22 +92,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 #endif /* ACE_HAS_SYSV_IPC */
 
-#if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Guard<ACE_SV_Semaphore_Simple>;
-template class ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>;
-template class ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>;
-template class ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>;
-template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>;
-template class ACE_Write_Guard<ACE_SV_Semaphore_Simple>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Guard<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Read_Guard<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Write_Guard<ACE_SV_Semaphore_Simple>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_SYSV_IPC */
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
index d109d170029..933bd09a3bf 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
@@ -108,22 +108,3 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 #endif /* ACE_HAS_SYSV_IPC */
 
-#if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
-
-# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Guard<ACE_SV_Semaphore_Simple>;
-template class ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>;
-template class ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>;
-template class ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>;
-template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>;
-template class ACE_Write_Guard<ACE_SV_Semaphore_Simple>;
-# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Guard<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>
-#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Read_Guard<ACE_SV_Semaphore_Simple>
-#pragma instantiate ACE_Write_Guard<ACE_SV_Semaphore_Simple>
-# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_SYSV_IPC */
diff --git a/examples/Threads/Threads.mpc b/examples/Threads/Threads.mpc
index 2ce2c2497f2..2c57feda243 100644
--- a/examples/Threads/Threads.mpc
+++ b/examples/Threads/Threads.mpc
@@ -26,12 +26,14 @@ project(*cancel) : aceexe {
   }
 }
 project(*future1) : aceexe {
+  avoids += ace_for_tao
   exename = future1
   Source_Files {
     future1.cpp
   }
 }
 project(*future2) : aceexe {
+  avoids += ace_for_tao
   exename = future2
   Source_Files {
     future2.cpp
@@ -44,12 +46,14 @@ project(*manual_event) : aceexe {
   }
 }
 project(*process_mutex) : aceexe {
+  avoids += ace_for_tao
   exename = process_mutex
   Source_Files {
     process_mutex.cpp
   }
 }
 project(*process_semaphore) : aceexe {
+  avoids += ace_for_tao
   exename = process_semaphore
   Source_Files {
     process_semaphore.cpp
diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp
index 29e923180e6..e568ffe84d1 100644
--- a/examples/Threads/auto_event.cpp
+++ b/examples/Threads/auto_event.cpp
@@ -104,14 +104,10 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex> *
   ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 
 #else
diff --git a/examples/Threads/barrier2.cpp b/examples/Threads/barrier2.cpp
index 7d37abaf79b..cd322b82856 100644
--- a/examples/Threads/barrier2.cpp
+++ b/examples/Threads/barrier2.cpp
@@ -118,7 +118,7 @@ template <class BARRIER> int
 Worker_Task<BARRIER>::service (ACE_Message_Block *mb,
                                int iter)
 {
-  int length = mb->length ();
+  size_t length = mb->length ();
 
   if (length > 0)
     {
@@ -162,7 +162,7 @@ Worker_Task<BARRIER>::svc (void)
 	  break;
 	}
 
-      int length = mb->length ();
+      size_t length = mb->length ();
       this->service (mb,iter);
 
       if (length == 0)
@@ -223,7 +223,7 @@ Worker_Task<BARRIER>::input (ACE_Message_Block *mb)
   char str[] = "kalle";
   ACE_OS::strcpy (mb->rd_ptr (), str);
 
-  int n = ACE_OS::strlen (str);
+  size_t n = ACE_OS::strlen (str);
 
   if (l == 1000)
     n = 1;
@@ -306,11 +306,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Worker_Task<ACE_Null_Barrier>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Worker_Task<ACE_Null_Barrier>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp
index 187c5c94cf1..7b95e549431 100644
--- a/examples/Threads/future1.cpp
+++ b/examples/Threads/future1.cpp
@@ -394,39 +394,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Future<const char *>;
-template class ACE_Future<u_long>;
-template class ACE_Future_Rep<const char *>;
-template class ACE_Future_Rep<u_long>;
-template class auto_ptr<ACE_Method_Request>;
-template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<const char *> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<const char *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const char *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Future<const char *>
-#pragma instantiate ACE_Future<u_long>
-#pragma instantiate ACE_Future_Rep<const char *>
-#pragma instantiate ACE_Future_Rep<u_long>
-#pragma instantiate auto_ptr<ACE_Method_Request>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp
index 4e14e03f177..4bb9519ca28 100644
--- a/examples/Threads/future2.cpp
+++ b/examples/Threads/future2.cpp
@@ -515,39 +515,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Future<char *>;
-template class ACE_Future<u_long>;
-template class ACE_Future_Rep<char *>;
-template class ACE_Future_Rep<u_long>;
-template class auto_ptr<ACE_Method_Request>;
-template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<char *> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<char *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<char *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Future<char *>
-#pragma instantiate ACE_Future<u_long>
-#pragma instantiate ACE_Future_Rep<char *>
-#pragma instantiate ACE_Future_Rep<u_long>
-#pragma instantiate auto_ptr<ACE_Method_Request>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/manual_event.cpp b/examples/Threads/manual_event.cpp
index c6eebe9727a..c168c384191 100644
--- a/examples/Threads/manual_event.cpp
+++ b/examples/Threads/manual_event.cpp
@@ -104,14 +104,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp
index 3bcbbd9071a..b8a523cc827 100644
--- a/examples/Threads/reader_writer.cpp
+++ b/examples/Threads/reader_writer.cpp
@@ -178,20 +178,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_RW_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index c1e796736ad..03f6e816572 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -53,11 +53,11 @@ public:
 size_t Test_Task::current_count_ = 0;
 size_t Test_Task::done_cnt_ = 0;
 
-static ACE_Thread_Mutex lock_;
+static ACE_Thread_Mutex Lock;
 
 Test_Task::Test_Task (void)
 {
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
+  ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
 
   this->handled_ = 0;
   Test_Task::current_count_++;
@@ -68,7 +68,7 @@ Test_Task::Test_Task (void)
 
 Test_Task::~Test_Task (void)
 {
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
+  ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock);
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Test_Task destroyed, current_count_ = %d\n"),
@@ -85,7 +85,7 @@ Test_Task::open (void *args)
 int
 Test_Task::close (u_long)
 {
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
 
   Test_Task::current_count_--;
   ACE_DEBUG ((LM_DEBUG,
@@ -110,7 +110,7 @@ Test_Task::svc (void)
 
       if (r_->notify (this, ACE_Event_Handler::READ_MASK) == -1)
 	{
-	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
 
 	  ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("Test_Task: error %p!\n"),
@@ -130,7 +130,7 @@ Test_Task::handle_input (ACE_HANDLE)
 
   if (this->handled_ == NUM_INVOCATIONS)
     {
-      ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
+      ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Lock, -1);
       Test_Task::done_cnt_++;
       ACE_DEBUG ((LM_DEBUG,
 		  ACE_TEXT (" (%t) Test_Task: handle_input done_cnt_ = %d.\n"),
diff --git a/examples/Threads/task_two.cpp b/examples/Threads/task_two.cpp
index 56c19769b69..7243ac5b1c3 100644
--- a/examples/Threads/task_two.cpp
+++ b/examples/Threads/task_two.cpp
@@ -137,15 +137,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/thread_specific.cpp b/examples/Threads/thread_specific.cpp
index 5fdd9a5471c..04cb3d94627 100644
--- a/examples/Threads/thread_specific.cpp
+++ b/examples/Threads/thread_specific.cpp
@@ -217,13 +217,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS<Errno>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<Errno>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Threads/tss1.cpp b/examples/Threads/tss1.cpp
index 7b0a525039d..783d4dc5b7a 100644
--- a/examples/Threads/tss1.cpp
+++ b/examples/Threads/tss1.cpp
@@ -108,14 +108,6 @@ int Tester<ACE_SYNCH_USE>::close (u_long)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS<Errno>;
-template class Tester<ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<Errno>
-#pragma instantiate Tester<ACE_MT_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/examples/Threads/tss2.cpp b/examples/Threads/tss2.cpp
index 7df77f1f536..0c7fb9ac3ee 100644
--- a/examples/Threads/tss2.cpp
+++ b/examples/Threads/tss2.cpp
@@ -174,31 +174,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Token, int>;
-template class ACE_Atomic_Op<ACE_Token, int>;
-template class ACE_Guard<ACE_Token>;
-template class ACE_TSS<TSS_Data>;
-template class ACE_TSS<TSS_Obj>;
-template class ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Token, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Token, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Token, int>
-#pragma instantiate ACE_Guard<ACE_Token>
-#pragma instantiate ACE_TSS<TSS_Data>
-#pragma instantiate ACE_TSS<TSS_Obj>
-#pragma instantiate ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX> *
   ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 #else
 
diff --git a/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
index 49d7973676a..18d12b8017a 100644
--- a/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Async_Timer_Queue_Test.cpp
@@ -25,16 +25,6 @@
 
 #include "Async_Timer_Queue_Test.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Async_Timer_Queue_Adapter<ACE_Timer_Heap>;
-template class Command<Async_Timer_Queue, Async_Timer_Queue::ACTION>;
-template class Timer_Queue_Test_Driver<Async_Timer_Queue *, Async_Timer_Queue, Async_Timer_Queue::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Async_Timer_Queue_Adapter<ACE_Timer_Heap>
-#pragma instantiate Command<Async_Timer_Queue, Async_Timer_Queue::ACTION>
-#pragma instantiate Timer_Queue_Test_Driver<Async_Timer_Queue *, Async_Timer_Queue, Async_Timer_Queue::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 ACE_RCSID(Timer_Queue, Async_Timer_Queue_Test, "$Id$")
 
 // Hook method that is called to handle the expiration of a timer.
diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
index d48694dc72b..c3526e8daf9 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
@@ -25,14 +25,6 @@
 #include "Driver.h"
 #include "Reactor_Timer_Queue_Test.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Timer_Queue_Test_Driver <ACE_Timer_Heap, Input_Handler, Input_Handler::ACTION>;
-template class Command<Input_Handler, Input_Handler::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Timer_Queue_Test_Driver <ACE_Timer_Heap, Input_Handler, Input_Handler::ACTION>
-#pragma instantiate Command<Input_Handler, Input_Handler::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 ACE_RCSID(Timer_Queue, Reactor_Timer_Queue_Test, "$Id$")
 
 void
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index ceafaef5fe9..d9cf88ff5ee 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -29,43 +29,6 @@
 #include "ace/Condition_T.h"
 #include "ace/Thread_Mutex.h"
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Thread_Timer_Queue_Adapter<Timer_Heap>;
-template class Timer_Queue_Test_Driver<Thread_Timer_Queue,
-                                       Input_Task,
-                                       Input_Task::ACTION>;
-template class Command<Input_Task, Input_Task::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
-#pragma instantiate Timer_Queue_Test_Driver<Thread_Timer_Queue, \
-                                           Input_Task, \
-                                           Input_Task::ACTION>
-#pragma instantiate Command<Input_Task, Input_Task::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-// These templates will specialized in libACE.* if the platforms does
-// not define ACE_MT_SAFE.
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Thread_Condition<ACE_Thread_Mutex>;
-template class ACE_Condition<ACE_Thread_Mutex>;
-template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>;
-template class ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Thread_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
-#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_MT_SAFE */
-
 ACE_RCSID(Timer_Queue, Thread_Timer_Queue_Test, "$Id$")
 
 // Administrivia methods...
diff --git a/examples/Timer_Queue/main_async.cpp b/examples/Timer_Queue/main_async.cpp
index 7cb90111fde..8c21c4fcdd2 100644
--- a/examples/Timer_Queue/main_async.cpp
+++ b/examples/Timer_Queue/main_async.cpp
@@ -55,12 +55,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return driver->run_test ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <ASYNC_TIMER_QUEUE_TEST_DRIVER>;
-template class ACE_Auto_Basic_Ptr <ASYNC_TIMER_QUEUE_TEST_DRIVER>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <ASYNC_TIMER_QUEUE_TEST_DRIVER>
-#pragma instantiate ACE_Auto_Basic_Ptr <ASYNC_TIMER_QUEUE_TEST_DRIVER>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/examples/Timer_Queue/main_reactor.cpp b/examples/Timer_Queue/main_reactor.cpp
index 76088bc5287..9ce80093bd9 100644
--- a/examples/Timer_Queue/main_reactor.cpp
+++ b/examples/Timer_Queue/main_reactor.cpp
@@ -55,16 +55,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return driver->run_test ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <REACTOR_TIMER_QUEUE_TEST_DRIVER>;
-template class ACE_Auto_Basic_Ptr <REACTOR_TIMER_QUEUE_TEST_DRIVER>;
-template class Timer_Queue_Test_Driver<ACE_Timer_Heap *,
-                                       Input_Handler,
-                                       Input_Handler::ACTION>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <REACTOR_TIMER_QUEUE_TEST_DRIVER>
-#pragma instantiate ACE_Auto_Basic_Ptr <REACTOR_TIMER_QUEUE_TEST_DRIVER>
-#pragma instantiate Timer_Queue_Test_Driver<ACE_Timer_Heap *, \
-                                       Input_Handler, \
-                                       Input_Handler::ACTION>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Timer_Queue/main_thread.cpp b/examples/Timer_Queue/main_thread.cpp
index 3f8aba5866e..7287e0ed263 100644
--- a/examples/Timer_Queue/main_thread.cpp
+++ b/examples/Timer_Queue/main_thread.cpp
@@ -56,10 +56,3 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return driver->run_test ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr <THREAD_TIMER_QUEUE_TEST_DRIVER>;
-template class ACE_Auto_Basic_Ptr <THREAD_TIMER_QUEUE_TEST_DRIVER>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr <THREAD_TIMER_QUEUE_TEST_DRIVER>
-#pragma instantiate ACE_Auto_Basic_Ptr <THREAD_TIMER_QUEUE_TEST_DRIVER>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Web_Crawler/Command_Processor.cpp b/examples/Web_Crawler/Command_Processor.cpp
index 5eb86be49f2..afe234926d3 100644
--- a/examples/Web_Crawler/Command_Processor.cpp
+++ b/examples/Web_Crawler/Command_Processor.cpp
@@ -123,16 +123,6 @@ Command_Processor::insert (Command *command)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_Null_Mutex>;
-template class ACE_Node<Command *>;
-template class ACE_Unbounded_Queue_Iterator<Command *>;
-template class ACE_Unbounded_Queue<Command *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
-#pragma instantiate ACE_Node<Command *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Command *>
-#pragma instantiate ACE_Unbounded_Queue<Command *>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Options, ACE_Null_Mutex> *ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/examples/Web_Crawler/URL_Status.h b/examples/Web_Crawler/URL_Status.h
index c6b56042b24..672c5e4f240 100644
--- a/examples/Web_Crawler/URL_Status.h
+++ b/examples/Web_Crawler/URL_Status.h
@@ -39,9 +39,9 @@ public:
     STATUS_BAD_REQUEST = 400,
     STATUS_UNAUTHORIZED = 401,
     STATUS_FORBIDDEN = 403,
-    STATUS_NOT_FOUND = 404,
+    STATUS_ITEM_NOT_FOUND = 404,
     STATUS_INTERNAL_SERVER_ERROR = 500,
-    STATUS_NOT_IMPLEMENTED = 501,
+    STATUS_OP_NOT_IMPLEMENTED = 501,
     STATUS_BAD_GATEWAY = 502,
     STATUS_SERVICE_UNAVAILABLE = 503,
     STATUS_INSUFFICIENT_DATA = 399
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
index 58667666258..b4cd8138212 100644
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ b/examples/Web_Crawler/URL_Visitor.cpp
@@ -237,154 +237,6 @@ URL_Visitor::~URL_Visitor (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  // The explicit instantiations are necessary with g++ 2.91.66
-  // with -frepo, because it misses some of them.
-
-template class ACE_Equal_To<ACE_URL_Addr>;
-template class ACE_Hash<ACE_URL_Addr>;
-
-template class ACE_Hash_Map_Manager<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_URL_Addr, URL_Status>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_NOOP_Creation_Strategy<Client_Svc_Handler>;
-template class ACE_Concurrency_Strategy<Client_Svc_Handler>;
-template class ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector_Base<Client_Svc_Handler>;
-template class ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Creation_Strategy<Client_Svc_Handler>;
-template class ACE_Hash_Map_Entry<ACE_ADDR, Client_Svc_Handler *>;
-template class ACE_Hash<ACE_ADDR>;
-template class ACE_Equal_To<ACE_ADDR>;
-template class ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>;
-template class ACE_Recycling_Strategy<Client_Svc_Handler>;
-template class ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<Client_Svc_Handler>;
-
-
-template class ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>;
-template class ACE_Reference_Pair<ACE_ADDR, Client_Svc_Handler *>;
-template class ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-// = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
-
-template class ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
-
-template class ACE_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
-
-template class ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
-
-template class ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
-
-template class ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Equal_To<ACE_URL_Addr>
-#pragma instantiate ACE_Hash<ACE_URL_Addr>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_URL_Addr, URL_Status>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector_Base<Client_Svc_Handler>
-#pragma instantiate ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, Client_Svc_Handler *>
-#pragma instantiate ACE_Hash<ACE_ADDR>
-#pragma instantiate ACE_Equal_To<ACE_ADDR>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Recycling_Strategy<Client_Svc_Handler>
-#pragma instantiate ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Client_Svc_Handler>
-
-#pragma instantiate ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<ACE_ADDR, Client_Svc_Handler *>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-// = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
-
-#pragma instantiate ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
-
-#pragma instantiate ACE_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
-
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
-
-#pragma instantiate ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 URL_Validation_Visitor::URL_Validation_Visitor (void)
 {
   ACE_NEW (this->caching_connect_strategy_,
diff --git a/examples/Web_Crawler/Web_Crawler.mpc b/examples/Web_Crawler/Web_Crawler.mpc
index a7df4bfef17..7750d7cbd5d 100644
--- a/examples/Web_Crawler/Web_Crawler.mpc
+++ b/examples/Web_Crawler/Web_Crawler.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = main
 }
diff --git a/examples/Web_Crawler/main.cpp b/examples/Web_Crawler/main.cpp
index ba5d37d71a8..1735f811b78 100644
--- a/examples/Web_Crawler/main.cpp
+++ b/examples/Web_Crawler/main.cpp
@@ -27,15 +27,16 @@ ACE_RCSID(Web_Crawler, main, "$Id$")
 void sig_handler (int)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "aborting!\n"));
+              ACE_TEXT ("aborting!\n")));
   ACE_OS::abort ();
 }
 
 int 
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+#if !defined (ACE_HAS_WINCE)
   ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE);
-
+#endif
   Web_Crawler crawler;
   
   if (crawler.open (argc, argv) == -1)
diff --git a/html/Stats/configuration.shtml b/html/Stats/configuration.shtml
index 1ba6da71250..daaaa988774 100644
--- a/html/Stats/configuration.shtml
+++ b/html/Stats/configuration.shtml
@@ -11,9 +11,11 @@
 
     <!--#include file="navigation.html"-->
 
-    <P>All the experiments run on a dual Xeaon @2.40GHz, with
-      1Gb of RAM.  The machine is running Linux (SuSE 8.2),
-      and we use gcc-3.3 to compile ACE+TAO, with static libraries
+    <P>All the experiments run the system described below.
+      The machine is running Linux
+      (<!--#include file="data/linuxversion.txt"-->),
+      and we use GCC (<!--#include file="data/gccversion.txt"-->),
+      to compile ACE+TAO, with static libraries
       and optimizations enabled.
     </P>
 
diff --git a/html/Stats/detailed_footprint.shtml b/html/Stats/detailed_footprint.shtml
index c1640148e6c..723c4a438ac 100644
--- a/html/Stats/detailed_footprint.shtml
+++ b/html/Stats/detailed_footprint.shtml
@@ -1,7 +1,7 @@
 <HTML>
 <head>
 <meta http-equiv="refresh" content="0; URL=http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/FP_Metrics/metrics/">
-<title>Footprint Metrics for ACE+TAO Page</title>
+<title>Footprint Metrics for ACE+TAO+CIAO Page</title>
 <LINK REL="STYLESHEET" TYPE="text/css" HREF="pagestyle.css">
 </head>
 <body>
diff --git a/html/Stats/footprint.shtml b/html/Stats/footprint.shtml
index b7f8bd44c5e..5498c7a1254 100644
--- a/html/Stats/footprint.shtml
+++ b/html/Stats/footprint.shtml
@@ -32,6 +32,7 @@
    <UL>
    <LI><a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/FP_Metrics/metrics/ace_Footprint.html">ACE</a>
    <LI><a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/FP_Metrics/metrics/tao_Footprint.html">TAO</a>
+   <LI><a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/FP_Metrics/metrics/ciao_Footprint.html">CIAO</a>
    </UL>
 
 </LI> </UL>
diff --git a/html/Stats/performance.shtml b/html/Stats/performance.shtml
index 90a900a3047..9de7384f4ef 100644
--- a/html/Stats/performance.shtml
+++ b/html/Stats/performance.shtml
@@ -20,7 +20,7 @@
   <P><HR>
   <BODY>
 
-    
+
     <P>
       Results for the performance experiments in
       <CODE>$ACE_ROOT/TAO/performance-tests/Latency</CODE>.
@@ -30,7 +30,7 @@
       <P>
 	<IMG alt="All Invocation Modes and Configurations" border=0
 	  src="images/CORBA.png"
-	  width="640" height="480">
+    width="800" height="600">
       </P>
     </DIV>
     <HR>
diff --git a/html/Stats/simple_footprint.shtml b/html/Stats/simple_footprint.shtml
index fbdb5fda785..fbf7831d619 100644
--- a/html/Stats/simple_footprint.shtml
+++ b/html/Stats/simple_footprint.shtml
@@ -9,7 +9,7 @@
   <BODY>
 
     <!--#include file="navigation.html"-->
-    
+
     <DIV align="center">
       <P>
 	<TABLE BORDER="2">
@@ -233,20 +233,35 @@
 	  </TD>
 	</TR>
 	<TR>
-	  <TD>libTAO_SmartProxies</TD>
-	    <TD><A HREF="images/libTAO_SmartProxies.a_size.png">
-		<IMG ALT="libTAO_SmartProxies.a_size" SRC="images/thumbnails/libTAO_SmartProxies.a_size.png">
+    <TD>libTAO_PI</TD>
+      <TD><A HREF="images/libTAO_PI.a_size.png">
+    <IMG ALT="libTAO_PI.a_size" SRC="images/thumbnails/libTAO_PI.a_size.png">
 		</A>
 	    </TD>
 	  <TD>
 	      <PRE>
-<!--#include file="data/LAST_libTAO_SmartProxies.a_size.txt" -->
+<!--#include file="data/LAST_libTAO_PI.a_size.txt" -->
 	      </PRE>
 	  </TD>
 	  <TD>
-	    <A HREF="data/libTAO_SmartProxies.a_size.txt">[Download]</A>
+      <A HREF="data/libTAO_PI.a_size.txt">[Download]</A>
 	  </TD>
 	</TR>
+  <TR>
+    <TD>libTAO_PI_Server</TD>
+      <TD><A HREF="images/libTAO_PI_Server.a_size.png">
+    <IMG ALT="libTAO_PI_Server.a_size" SRC="images/thumbnails/libTAO_PI_Server.a_size.png">
+    </A>
+      </TD>
+    <TD>
+        <PRE>
+<!--#include file="data/LAST_libTAO_PI_Server.a_size.txt" -->
+        </PRE>
+    </TD>
+    <TD>
+      <A HREF="data/libTAO_PI_Server.a_size.txt">[Download]</A>
+    </TD>
+  </TR>
 	<TR>
 	  <TD>libTAO_RTCORBA</TD>
 	    <TD><A HREF="images/libTAO_RTCORBA.a_size.png">
diff --git a/html/index.html b/html/index.html
index 935d3a50e49..4160b9807f2 100644
--- a/html/index.html
+++ b/html/index.html
@@ -1,209 +1,207 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-	<!-- $Id$ -->
-	<head>
-		<title>ACE+TAO+CIAO Documentation</title>
-		<LINK href="doxygen.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-		<CENTER>
-			<h1>ACE+TAO+CIAO Documentation</h1>
-		</CENTER>
-		<P>Documentation is separated by components:
-		</P>
-		<UL>
-			<LI>
-				<P><A HREF="ace/index.html"> The ACE library </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="acexml/index.html"> The ACEXML library </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="ace/ssl/index.html">ACE SSL Adapters </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="ace/rmcast/index.html">ACE Reliable Multicast components </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="ace/QoS/index.html">ACE Components for QoS-enabled networking APIs. </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/index.html"> The TAO library and components </A>
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/portableserver/index.html">TAO_PortableServer: </A>TAO's Portable 
-					Object Adapter
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/dynamicany/index.html">TAO_DynamicAny: </A>TAO's implementation of 
-					Dynamic Anys.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/dynamicinterface/index.html">TAO_DynamicInterface: </A>TAO's 
-					implementation of DII/DSI.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/smartproxies/index.html">TAO_SmartProxies: </A>TAO's smart proxies 
-					support library.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/iormanipulation/index.html">TAO_IORManipulation: </A>TAO extension 
-					to manipulate IORs.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/iortable/index.html">TAO_IORTable: </A>TAO's ad-hoc adapter for 
-					simple Object Keys.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/strategies/index.html">TAO_Strategies: </A>Additional configuration 
-					options and protocols for TAO.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/rtportableserver/index.html">TAO_RTPortableServer: </A>The Portable 
-					Object Adapter with RT-CORBA support
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/rtcorba/index.html">TAO_RTCORBA: </A>Additional components to 
-					support RT-CORBA
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/pi/index.html">TAO_PI: </A>TAO Client Portable Interceptor support
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/pi_server/index.html">TAO_PI_Server: </A>TAO Server Portable Interceptor support
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/anytypecode/index.html">TAO_AnyTypeCode: </A>TAO AnyTypeCode support
-				</P>
-			</LI>
-		</UL>
-		<hr>
-		<UL>
-			<LI>
-				<P><A HREF="tao/implrepo_service/index.html"> Implementation Repository: </A>TAO's 
-					object activation daemon.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/esf/index.html">TAO_ESF: </A>TAO's Event Service Framework, a 
-					collection of template classes used to implement TAO Event Services.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/rtevent/index.html">TAO_RTEvent: </A>TAO's RT Event Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/cosevent/index.html">TAO_CosEvent: </A>TAO's COS Event Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/cosnaming/index.html">TAO_CosNaming: </A>TAO's COS Naming Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/cosnotification/index.html">TAO_CosNotification: </A>TAO's COS 
-					Notification Service implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/costime/index.html">TAO_CosTime: </A>TAO's COS Time Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/costrader/index.html">TAO_CosTrader: </A>TAO's COS Trader Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/av/index.html">TAO_AV: </A>TAO's Audio/Video Streaming Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/security/index.html">TAO_Security: </A>TAO's CORBA Security Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ssliop/index.html">TAO_SSLIOP: </A>TAO's SSLIOP protocol 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/portablegroup/index.html">TAO_PortableGroup: </A>TAO's 
-					PortableGroup implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/pss/index.html">TAO_PSS: </A>TAO's Persistent State Service 
-					implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ifr/index.html">TAO_IFR: </A>TAO's Interface Repository Service 
-					implementation.
-				</P>
-			</LI>
-		</UL>
-		<!--The following is CIAO replated-->
-		<hr>
-		<UL>
-			<LI>
-				<P><A HREF="tao/ciao/ciao/index.html"> CIAO: </A>CIAO's core implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/tools/assembly_deployer/index.html">Assembly_Deployer: </A>CIAO's 
-					assembly deployer/manager implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/tools/serveractivator/index.html">ServerActivator: </A>CIAO's 
-					ServerActivator implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/tools/daemon/index.html">Daemon: </A>CIAO's per-host daemon 
-					prcess implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/tools/componentserver/index.html">ComponentServer: </A>CIAO's 
-					component server implementation.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/tools/xml_helpers/index.html">XML_HELPERS: </A>XML helper 
-					classes to aid the parsing and manupilation of XML files.
-				</P>
-			</LI>
-			<LI>
-				<P><A HREF="tao/ciao/dance/index.html">DAnCE: </A>CIAO's Deployment and 
-					Configuration Engine.
-				</P>
-			</LI>
-		</UL>
-	</body>
+<!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">
+<!-- $Id$ -->
+
+<head>
+  <title>ACE+TAO+CIAO Documentation</title>
+  <link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+  <center>
+    <h1>ACE+TAO+CIAO Documentation</h1>
+  </center>
+
+  <p>Documentation is separated by components:</p>
+
+  <ul>
+    <li>
+      <p><a href="ace/index.html">The ACE library</a></p>
+    </li>
+
+    <li>
+      <p><a href="acexml/index.html">The ACEXML library</a></p>
+    </li>
+
+    <li>
+      <p><a href="ace/ssl/index.html">ACE SSL Adapters</a></p>
+    </li>
+
+    <li>
+      <p><a href="ace/rmcast/index.html">ACE Reliable Multicast
+      components</a></p>
+    </li>
+
+    <li>
+      <p><a href="ace/QoS/index.html">ACE Components for
+      QoS-enabled networking APIs.</a></p>
+    </li>
+
+    <li>
+      <p><a href="tao/index.html">The TAO library and
+      components</a></p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/portableserver/index.html">TAO_PortableServer:</a> TAO's
+      Portable Object Adapter</p>
+    </li>
+
+    <li>
+      <p><a href="tao/dynamicany/index.html">TAO_DynamicAny:</a>
+      TAO's implementation of Dynamic Anys.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/dynamicinterface/index.html">TAO_DynamicInterface:</a>
+      TAO's implementation of DII/DSI.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/smartproxies/index.html">TAO_SmartProxies:</a> TAO's
+      smart proxies support library.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/iormanipulation/index.html">TAO_IORManipulation:</a> TAO
+      extension to manipulate IORs.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/iortable/index.html">TAO_IORTable:</a> TAO's
+      ad-hoc adapter for simple Object Keys.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/strategies/index.html">TAO_Strategies:</a>
+      Additional configuration options and protocols for TAO.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/rtportableserver/index.html">TAO_RTPortableServer:</a>
+      The Portable Object Adapter with RT-CORBA support</p>
+    </li>
+
+    <li>
+      <p><a href="tao/rtcorba/index.html">TAO_RTCORBA:</a>
+      Additional components to support RT-CORBA</p>
+    </li>
+
+    <li>
+      <p><a href="tao/pi/index.html">TAO_PI:</a> TAO Client
+      Portable Interceptor support</p>
+    </li>
+
+    <li>
+      <p><a href="tao/pi_server/index.html">TAO_PI_Server:</a> TAO
+      Server Portable Interceptor support</p>
+    </li>
+
+    <li>
+      <p><a href="tao/anytypecode/index.html">TAO_AnyTypeCode:</a>
+      TAO AnyTypeCode support</p>
+    </li>
+  </ul>
+  <hr />
+
+  <ul>
+    <li>
+      <p><a href="tao/implrepo_service/index.html">Implementation
+      Repository:</a> TAO's object activation daemon.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/esf/index.html">TAO_ESF:</a> TAO's Event
+      Service Framework, a collection of template classes used to
+      implement TAO Event Services.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/rtevent/index.html">TAO_RTEvent:</a> TAO's RT
+      Event Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/cosevent/index.html">TAO_CosEvent:</a> TAO's
+      COS Event Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/cosnaming/index.html">TAO_CosNaming:</a>
+      TAO's COS Naming Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/cosnotification/index.html">TAO_CosNotification:</a>
+      TAO's COS Notification Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/costime/index.html">TAO_CosTime:</a> TAO's
+      COS Time Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/costrader/index.html">TAO_CosTrader:</a>
+      TAO's COS Trader Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/av/index.html">TAO_AV:</a> TAO's Audio/Video
+      Streaming Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/security/index.html">TAO_Security:</a> TAO's
+      CORBA Security Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/ssliop/index.html">TAO_SSLIOP:</a> TAO's
+      SSLIOP protocol implementation.</p>
+    </li>
+
+    <li>
+      <p><a href=
+      "tao/portablegroup/index.html">TAO_PortableGroup:</a> TAO's
+      PortableGroup implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/pss/index.html">TAO_PSS:</a> TAO's Persistent
+      State Service implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/ifr/index.html">TAO_IFR:</a> TAO's Interface
+      Repository Service implementation.</p>
+    </li>
+  </ul><!--The following is CIAO replated-->
+  <hr />
+
+  <ul>
+    <li>
+      <p><a href="tao/ciao/ciao/index.html">CIAO:</a> CIAO's core
+      implementation.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/ciao/dance/index.html">DAnCE:</a> CIAO's
+      Deployment and Configuration Engine.</p>
+    </li>
+
+    <li>
+      <p><a href="tao/ciao/tools/config_handlers/index.html">Config Handlers:</a> CIAO's
+      Config Handlers.</p>
+    </li>
+  </ul>
+</body>
 </html>
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index fd51d933706..7bfded1e82d 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -113,6 +113,6 @@ USE_FULL_PATH = 1
 
 .rc.res:
 	@$(MAKE_OBJDIR)
-	$(RC) -fo$@ $<
+        $(RC) $(RC_FLAGS) -fo$@ $<
 
 .autodepend
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index aeb65a595c6..3387e6e5cf5 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -43,7 +43,7 @@ $(TARGET): $(OBJFILES) $(RESOURCE)
 	@$(MAKE_BINDIR)
 	$(LD) @&&!
 	$(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) +
-	$(EXE_STARTUP_OBJ) $(LIBFILES) $(OBJFILES),	+
+	$(EXE_STARTUP_OBJ) $(PACKAGES) $(LIBFILES) $(OBJFILES),    +
 	$(TARGET),, +
 	$(COMMON_LIBS),, +
 	$(RESOURCE)
@@ -109,6 +109,6 @@ USE_FULL_PATH = 1
 
 .rc.res:
 	@$(MAKE_OBJDIR)
-	$(RC) -fo$@ $<
+        $(RC) $(RC_FLAGS) -fo$@ $<
 
 .autodepend
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index ad8c71d6c2f..87c4cf21f47 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -9,6 +9,7 @@
 # DEBUG - if defined means building with debug information
 # UNICODE - if defined means building unicode
 # CBX - if defined means building with the new CBuilderX preview compiler
+# CPU_FLAG - if defined the flag for CPU optimization
 #
 # Outputs:
 # ~~~~~~~~
@@ -33,6 +34,9 @@
 #
 
 # Get the BCBVER and VCLVER, if it is not set, we default to BCB6.
+!if $(BCBVER) == 8
+VCLVER =
+!else
 !if $(BCBVER) == 6
 VCLVER =
 !else
@@ -42,8 +46,8 @@ VCLVER = 50
 !if $(BCBVER) == 4
 VCLVER = 40
 !else
-BCBVER = 6
-VCLVER =
+!error BCBVER must be explicitly set as environment variable or is set to a not supported value.
+!endif
 !endif
 !endif
 !endif
@@ -75,6 +79,15 @@ RC = brcc32
 #
 # Common flags
 #
+!ifndef $(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+!ifdef CPU_FLAG
+CPU_CFLAG = $(CPU_FLAG)
+!else
+CPU_CFLAG =
+!endif
 
 !ifdef DEBUG
 !ifdef CBX
@@ -82,7 +95,7 @@ DEBUG_CFLAGS = -v -y -Od -vi- -k -D_DEBUG -DACE_NO_INLINE=1
 DEBUG_LFLAGS = -v
 !else
 DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1
-DEBUG_LFLAGS = -v
+DEBUG_LFLAGS = -v -L$(BCB)\lib\debug
 !endif
 !else
 !if $(BCBVER) == 6 || $(BCBVER) == 5
@@ -90,7 +103,7 @@ DEBUG_CFLAGS = -OS -Ov -Og -DNDEBUG
 !else
 DEBUG_CFLAGS = -O2 -DNDEBUG
 !endif
-DEBUG_LFLAGS =
+DEBUG_LFLAGS = -L$(BCB)\lib\release
 !endif
 
 !ifdef STATIC
@@ -120,7 +133,11 @@ DEFINES_CFLAGS =
 QUIET_CFLAGS =
 MISC_CFLAGS =
 !else
+!ifdef VCL
+DEFINES_CFLAGS = -DWIN32
+!else
 DEFINES_CFLAGS = -DWIN32;_NO_VCL
+!endif
 QUIET_CFLAGS = -q
 MISC_CFLAGS =
 !endif
@@ -129,9 +146,15 @@ DECORATOR_CFLAGS = -DACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\"$(LIB_DECORATOR)\")
 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
 	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
 	$(MISC_CFLAGS) $(CODEGUARD_CFLAGS) $(UNICODE_CFLAGS) \
-	$(DECORATOR_CFLAGS) $(PCH_CFLAGS)
+        $(DECORATOR_CFLAGS) $(PCH_CFLAGS) $(CPU_CFLAG)
 
-COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
+COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn -L$(BCB)\lib -L$(BCB)\lib\psdk
+
+!ifdef VCL
+PACKAGES = rtl.bpi vcl.bpi vclx.bpi vcljpg.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi \
+    vcldb.bpi bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi \
+    nmfast.bpi dclocx.bpi
+!endif
 
 #
 # DLL specific flags
@@ -152,10 +175,18 @@ DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT)
 EXE_CFLAGS =
 EXE_LFLAGS = -Tpe
 !ifdef UNICODE
+!ifdef VCL
+EXE_STARTUP_OBJ = c0w32w.$(OBJ_EXT)
+!else
 EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT)
+!endif
+!else
+!ifdef VCL
+EXE_STARTUP_OBJ = c0w32.$(OBJ_EXT)
 !else
 EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT)
 !endif
+!endif
 
 #
 # Static lib specific flags
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index 0980618f6ac..c2493199884 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -3,8 +3,8 @@
 # This file is for use with AIX 4.3 and up, using either of the IBM
 # compilers (IBM C/C++ 3.6.6 or Visual Age C++ 5 or 6 batch compiler).
 # If you wish to use the CSet++ compiler, please use platform_aix4_cset++.GNU.
-# Note that as of ACE 6.0, the only supported compiler from IBM will
-# be Visual Age C++ 5 (batch mode only) and up.
+# Note that as of ACE 5.4, the only supported compilers from IBM are
+# Visual Age C++ 6 and up.
 
 debug ?= 1
 distrib ?= 0
@@ -30,7 +30,7 @@ endif
 # from the vacpp compiler newsgroup.
 # It relies on the preprocessor defining __xlC__ to the proper version
 # number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -1;$(RM) testxlCvers.cpp)
+XLCVERSION := $(shell echo "__xlC__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -n 1;$(RM) testxlCvers.cpp)
 #XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1')
 #ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
 
@@ -102,24 +102,40 @@ ifeq ($(XLCVERSION),0x0306)
 # template instances in rules.lib.GNU.
   ibmcxx_build = 1
   rtti = 0
-else    # Visual Age 5 and 6
-  SHR_FILTER=$(ACE_ROOT)/bin/aix_shr
+else    # Visual Age 5 and up
   ifeq ($(XLCVERSION),0x0500)
+    SHR_FILTER=$(ACE_ROOT)/bin/aix_shr
     TEMPINCDIR  = tempinc
-    CCFLAGS    += -qflag=w:w -qonce -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_PRAGMA
+    CCFLAGS    += -qflag=w:w -qonce -qtempinc=$(TEMPINCDIR)
   else
     ifeq ($(XLCVERSION),0x0600)
-      TEMPINCDIR = tempinc
-      # This is just for the workaround for aio, above. Without it, the compiler
-      # warns that __C99_RESTRICT is reserved. When that workaround is gone, this
-      # ifeq can be removed also. -qflag=w:w is what we want in the end.
+      # This is just for the workaround for aio, above. Without it, the
+      # compiler warns that __C99_RESTRICT is reserved. When that workaround
+      # is gone, this ifeq can be removed also. -qflag=w:w is what we want
+      # in the end.
+      CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
       ifeq (502,$(AIX_VERS))
-        CCFLAGS    += -qflag=e:e -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_SOURCE
+        CCFLAGS    += -qflag=e:e
       else
-        CCFLAGS    += -qflag=w:w -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_SOURCE
+        CCFLAGS    += -qflag=w:w
       endif
     else
-      CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
+      ifeq ($(XLCVERSION),0x0700)
+        CCFLAGS += -qflag=w:w
+	ifeq ($(templates),manual)
+	  CCFLAGS += -qnotempinc -qnotemplateregistry
+        else
+          CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
+        endif
+	# According to documentation, default is -qeh, which is equivalent
+	# to -qeh=v5.  Apparently 6.0 fixed some problems with nested
+	# try-catch blocks.
+	ifeq ($(exceptions),1)
+	  CCFLAGS     += -qeh=v6
+	endif
+      else
+        CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
+      endif
     endif
   endif
   DLD         = $(CXX) -qmkshrobj
@@ -129,14 +145,14 @@ else    # Visual Age 5 and 6
     CCFLAGS += -q64 -qwarn64
     ARFLAGS := -X64 $(ARFLAGS)
 
-    # This option results in a crash of TAO when building 64bit with Visual Age 6. No idea
-    # why but don't use it when using Visual Age 6.
+    # This option results in a crash of TAO when building 64bit with
+    # Visual Age 6. No idea why but don't use it when using Visual Age 6.
     ifneq ($(XLCVERSION),0x0600)
-      CCFLAGS += -qstaticinline
+     # CCFLAGS += -qstaticinline
     endif
   else
     # Using 32bit the staticinline option works.
-    CCFLAGS += -qstaticinline
+    #CCFLAGS += -qstaticinline
   endif
   CCFLAGS += -qfuncsect
 endif
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index eebdde865bd..3309743947f 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -26,10 +26,10 @@ versioned_so ?= 0
 # 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)))
+HPUX_VERS       := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
-CC		= /bin/cc
-CXX		= aCC
+CC              = /bin/cc
+CXX             = aCC
 
 # Determine compiler version
 CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
@@ -57,6 +57,10 @@ ifeq (1,$(stdcpplib))
     # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
     # as support call 3201224717. (Steve Huston, 23-Nov-2002)
     CCFLAGS += +W930
+    # aCC 3.31 has poor member template support.
+    ifeq (31,$(CXXMINORVERS))
+      CCFLAGS += -DACE_LACKS_MEMBER_TEMPLATES
+    endif
   endif
 # Compile errors using -AA and +noeh together - HP problem report
 # JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001.
@@ -138,35 +142,35 @@ endif
 ifeq ($(word 2,$(HPVERS_WORDS)), 10)
 CCFLAGS         += +W495,667,829,908
 endif
-DCCFLAGS	+= -g
-DLD		= $(CXX) $(CCFLAGS)
-LD		= $(CXX)
-OCCFLAGS	= -O
-PIC		= +Z
+DCCFLAGS        += -g
+DLD             = $(CXX) $(CCFLAGS)
+LD              = $(CXX)
+OCCFLAGS        = -O
+PIC             = +Z
 
 PRELIB          = $(COMPILE.cc) $^
 AR              = /usr/ccs/bin/ar
-ARFLAGS		= ruv
-RANLIB		= echo
-LDFLAGS		= -Wl,+s -z
-SOFLAGS		+= -b
+ARFLAGS         = ruv
+RANLIB          = echo
+LDFLAGS         = -Wl,+s -z
+SOFLAGS         += -b
 
 ifeq ($(distrib),1)
 
 ifeq ($(word 2,$(HPVERS_WORDS)), 10)
-SOFLAGS		+= -Wl,-x -Wl,+h/usr/lib/$(@F)
+SOFLAGS         += -Wl,-x -Wl,+h/usr/lib/$(@F)
 else
 ifeq ($(buildbits),32)
-SOFLAGS		+= -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib
+SOFLAGS         += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib
 endif
 ifeq ($(buildbits),64)
-SOFLAGS		+= -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64
+SOFLAGS         += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64
 endif
 endif
 
 endif
 
-SOEXT		= sl
+SOEXT           = sl
 
 ifeq ($(buildbits),32)
   ifeq ($(itanium),1)
@@ -186,7 +190,7 @@ ifeq ($(buildbits),64)
       CCFLAGS += +DA2.0 +DS2.0
     endif
   endif
-LDFLAGS		+= -Wl,+vnocompatwarnings
+LDFLAGS         += -Wl,+vnocompatwarnings
 else
   ifneq ($(itanium),1)
     # HP aCC on Itanium doesn't support this option, defaults to 32bit then.
@@ -210,14 +214,14 @@ ifeq ($(word 2,$(HPVERS_WORDS)), 11)
       LIBS += -L./ -lpthread
     endif
   endif
-  LIBS		+= -lxti -lrt -ldld
+  LIBS          += -lxti -lrt -ldld
 
 else
 
   # 10.x:
-  LIBS		+= -lxti -ldld
+  LIBS          += -lxti -ldld
   ifeq ($(threads),1)
-    LIBS		+= -lcma
+    LIBS                += -lcma
   endif
 
 endif
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index e9386a019ab..1de4ed8047c 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -100,6 +100,10 @@ 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
+endif
+
 PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include
 PLATFORM_QT_LIBS ?= -lqt-mt
 PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index 337b898abe9..0516a9deeaf 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -1,14 +1,12 @@
 # $Id$
 
-# According to Roger Tragin <r.tragin@computer.org>, this file
-# should allow ACE to be built on Linux, using the Intel compiler.
-#
-# This is just a copy of platform_linux.GNU, with a few things changed.
+# This file should allow ACE to be built on Linux, using the Intel compiler.
 
 exceptions ?= 1
 debug ?= 1
-optimize ?= 0
+optimize ?= 1
 threads ?= 1
+no_hidden_visibility ?= 1
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXt
@@ -69,6 +67,9 @@ endif
 ifeq (9.0,$(findstring 9.0,$(CXX_VERSION)))
   CFLAGS += -wd1684
 endif
+ifeq (9.1,$(findstring 9.1,$(CXX_VERSION)))
+  CFLAGS += -wd1684
+endif
 
 ifeq ($(inline),0)
   CPPFLAGS += -fno-inline
@@ -97,14 +98,20 @@ PLATFORM_QT_LIBS ?= -lqt-mt
 PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib
 
 OCFLAGS += -O3
-ifneq ($(SYSARCH),ia64)
-  OCFLAGS += -axK
-endif
 
 # Disable floating point optimizer solves problem with
-# min/max float values in the TAO_IDL compiler
+# min/max float values in the TAO_IDL compiler tests
+# If these options are not passed we can get overflows
+# when testing min/max
 ifeq ($(SYSARCH),ia64)
   CPPFLAGS += -mp
+else
+  CPPFLAGS += -fp-model double
+endif
+
+ifeq ($(optimize),0)
+  # Disable all optimizing in code
+  CPPFLAGS += -O0
 endif
 
 PIC     = -fPIC
@@ -119,9 +126,16 @@ PRELIB  = @true
 ifeq ($(shared_libs), 1)
   ifneq ($static_libs_only), 1)
     LDFLAGS += -Wl,-E
+
+    ifneq ($(no_hidden_visibility),1)
+      CCFLAGS += -fvisibility=hidden
+    else
+      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+    endif # no_hidden_visibility
   endif
 endif
 
+
 # Added line below to support "Executable Shared Object" files (as
 # needed by the service configurator).
 # Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 375ee16063e..5b54bcdc6b8 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -67,10 +67,12 @@ endif # ! LynxOS
 LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}')
 LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}')
 
-# LynxOS 3.x does not support shared libraries
+# LynxOS 3.x does not support shared libraries or native exceptions
 ifeq ($(LYNXOS_MAJOR),3)
   shared_libs_only =
   static_libs_only = 1
+  exceptions = 0
+  debug ?= 0
 endif
 
 ifeq ($(shared_libs_only),1)
@@ -93,25 +95,33 @@ PLATFORM_XT_LIBS=-lXm -lXt
 PLATFORM_XT_LDFLAGS=
 
 PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lXpm -lXext -lX11 -lSM -lICE
+PLATFORM_X11_LIBS=-lXpm -lXmu -lXext -lX11 -lSM -lICE
 PLATFORM_X11_LDFLAGS=
 
-ifeq ($(LYNXOS_MAJOR),4)
-  PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
-  PLATFORM_TCL_LIBS=-ltcl8.4
-  PLATFORM_TCL_LDFLAGS=
+PLATFORM_TCL_CPPFLAGS=
+PLATFORM_TCL_LIBS=
+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_LDFLAGS=
-endif
+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
+  CFLAGS  += -mthreads
+  SOFLAGS += -mthreads
 endif
 
 ifeq ($(shared_libs),1)
-  CFLAGS  += -mshared
+  CFLAGS  += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
+  CFLAGS  += -DACE_HAS_BROKEN_THREAD_KEYFREE
+  SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
+  LIBS    += -ldl
+else
+  LIBS    += -lnetinet -lnsl
 endif
 
 CC              = gcc
@@ -122,7 +132,6 @@ DCFLAGS         += -g
 PIC             = -fPIC
 DLD             = $(CXX)
 LD              = $(CXX)
-LIBS            += -lnetinet -lnsl
 OCFLAGS         += -O2
 AR              = ar
 ARFLAGS         = ruv
diff --git a/include/makeinclude/platform_macosx_tiger_gcc4.GNU b/include/makeinclude/platform_macosx_tiger_gcc4.GNU
deleted file mode 100644
index 231342ff49c..00000000000
--- a/include/makeinclude/platform_macosx_tiger_gcc4.GNU
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-# platform_macosx.GNU
-# support for Mac OS X 10.4 (Tiger)
-
-ifndef exceptions
-  exceptions = 1
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-ifeq (,$(ssl))
-  ssl = 1
-endif
-ifeq (,$(versioned_so))
-  versioned_so = 0
-endif
-with_ld = macosx
-
-pipes ?= 1
-
-CC              = gcc
-CXX             = g++
-CFLAGS          += -Wall -Wpointer-arith -Wno-long-double  
-
-DCFLAGS         += -g
-DLD             = g++
-DLD				= $(CXX)
-LD				= $(CXX)
-#LIBS += -lstdc++.6 -lSystem -lSystemStubs
-
-OCFLAGS		   += -O2 -mcpu=G3 -mtune=G4
-RANLIB          = ranlib
-SOEXT			= dylib
-SOFLAGS		   += -dynamiclib
-SOBUILD			= -o $(VSHDIR)$*.dylib $<
-
-# Test for template instantiation, add to SOFLAGS if versioned_so set, 
-# add -E to LDFLAGS if using GNU ld
-#
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
-LDFLAGS         += -flat_namespace 
-CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)
diff --git a/include/makeinclude/platform_osf1_4.x_g++.GNU b/include/makeinclude/platform_osf1_4.x_g++.GNU
index d4af6cba618..0a3b841d4cd 100644
--- a/include/makeinclude/platform_osf1_4.x_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.x_g++.GNU
@@ -1,7 +1,7 @@
 # $Id$
 
 # This platform macros file is intended to work with Digital UNIX 4.x
-# (OSF/1 4.x) and GCC in version 2.7.2.1 (or newer).
+# (OSF/1 4.x) and GCC in version 2.9.6 or newer
 debug ?= 1
 exceptions ?= 1
 rtti ?= 1
@@ -31,4 +31,4 @@ PRELIB          = @true
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
-CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG) -fno-strict-prototypes
+CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 06291eeba06..22250c022b9 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -4,11 +4,6 @@
 
 # SunOS 5.x (Solaris 2.x) with g++
 
-# NOTE: with g++ 2.8.0, you'll need to disable optimization in order to
-#       instantiate ACE_Map_Manager (ace/Map_Manager.cpp).  The easiest
-#       way to do that is to set "optimize = 0", either below or on
-#       your make command line.
-
 # NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as,
 #       if you want -gstabs+ and -pipe support.
 
@@ -46,11 +41,11 @@ PIC             = -fPIC
 AR              = ar
 ARFLAGS         = ruv
 RANLIB          = @true
-SOFLAGS         += -G $(CPPFLAGS)
+SOFLAGS         += -shared $(CPPFLAGS)
 SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB          = @true
 
-# Test for template instantiation, add to SOFLAGS if SONAME set, 
+# Test for template instantiation, add to SOFLAGS if SONAME set,
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index c7b291061cc..8035d4a86ac 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -48,6 +48,7 @@ threads ?= 1
 versioned_so ?= 1
 tk_reactor ?= 0
 ace_with_x11 ?= 0
+no_hidden_visibility ?= 1
 
 PLATFORM_TK_CPPFLAGS=
 PLATFORM_TK_LIBS=-ltk -ltcl
@@ -65,7 +66,13 @@ endif # threads
 CC              = cc
 CXX             = CC
 
-CC_VERSION = $(shell $(CXX) -V 2>&1)
+CC_VERSION := $(shell $(CXX) -V 2>&1)
+
+### CC 5.4 provides insufficient preprocessor output (at 111715-17 2005/10/13)
+### We need to use cc instead - see bugzilla #2478.
+ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION)))
+  ACE_CC_PREPROCESSOR = cc
+endif
 
 ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION)))
   PLATFORM_STLPORT_CPPFLAGS = -library=stlport4
@@ -228,6 +235,24 @@ ifeq (0,$(exceptions))
   endif
 endif # ! exceptions
 
+ifeq ($(shared_libs), 1)
+  ifneq ($(static_libs_only), 1)
+
+   # Sun Studio 8 or better has version greater than 5.3.
+    SUN_STUDIO_8_OR_BETTER := $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 53; then echo 1; else echo 0; fi)
+
+    # Take advantage of Sun Studio 8 (v5.5) symbol scopes to
+    # generate improved shared library binaries.
+    ifeq ($(SUN_STUDIO_8_OR_BETTER),1)
+      ifneq ($(no_hidden_visibility),1)
+        CCFLAGS += -xldscope=hidden
+      else
+        CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+      endif # no_hidden_visibility
+    endif # Sun Studio 8 (C++ 5.5) or better.
+  endif # static_libs_only
+endif # shared_libs
+
 LD              = $(CXX)
 ifeq ($(distrib),0)
   LDFLAGS       += -R $(ACE_ROOT)/lib -R./
diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU
index 7d3dbf5bd9e..aa660e49100 100644
--- a/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -85,6 +85,7 @@ ifeq ("$(TOOL)","gnu")
 endif
 
 PRJ_TYPE = vxApp
+TARGET_DIR = $(WIND_BASE)/target/h
 TGT_DIR = $(WIND_BASE)/target
 
 ifeq ($(CPU),)
@@ -94,6 +95,10 @@ else
   override CPU := $(CPU)
 endif
 
+ifeq ($(findstring PPC, $(CPU)), PPC)
+  CCFLAGS += -mlongcall
+endif
+
 ifeq ($(shared_libs),1)
   SHARED_LIBS = 1
 endif
@@ -139,11 +144,10 @@ ifneq ($(VX_LIB_BUILD),1)
   endif
 endif
 
-include $(TGT_DIR)/h/make/defs.default
-##include $(TGT_DIR)/h/make/defs.link
-include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE)
-include $(TGT_DIR)/h/make/defs.$(PRJ_TYPE)
-include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
+include $(TARGET_DIR)/make/defs.default
+include $(TARGET_DIR)/make/defs.$(WIND_HOST_TYPE)
+include $(TARGET_DIR)/make/defs.$(PRJ_TYPE)
+include $(TARGET_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 
 ## make sure we don't use that stupid, crippled vxrm.bat script.
 override RM=rm -f
@@ -226,6 +230,7 @@ else
 endif
 else
 ifeq ("$(TOOL)","gnu")
+C++FLAGS += -ftemplate-depth-34
 ifeq ($(exceptions),1)
   C++FLAGS += -fexceptions
 else
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index d28c043615f..d23c82b5571 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -339,15 +339,15 @@ endif # shared_libs
 
 CLEANUP_OBJS += $(addsuffix .o, $(addprefix $(VDIR),$(CLEANUP_BIN)))
 
-ifdef SRC
-  CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(SRC))))
-endif # SRC
+ifdef OBJS
+  CLEANUP_OBJS += $(addprefix $(VDIR), $(OBJS))
+endif # OBJS
 ifneq ($(CLEANUP_BIN),)
   CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(CLEANUP_BIN))))
 endif # CLEANUP_BIN
-ifdef LSRC
-  CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VSHDIR),$(basename $(LSRC))))
-endif # LSRC
+ifdef VSHOBJS
+  CLEANUP_OBJS += $(VSHOBJS)
+endif # VSHOBJS
 
 clean.local: makefile_name.local
 ifdef DO_CLEANUP
@@ -356,7 +356,7 @@ ifdef DO_CLEANUP
 	GNUmakefile.old core-r $(CLEANUP_DIRS) \
 	cxx_repository ptrepository ti_files \
 	gcctemp.c gcctemp so_locations *.ics \
-	templateregistry ir.out core.* $(CLEANUP_OBJS)
+	templateregistry templateregistry.* ir.out core.* *.core $(CLEANUP_OBJS)
 endif # DO_CLEANUP
 
 realclean.local: clean.local deinstall.local clean_idl_stubs.local
@@ -412,6 +412,14 @@ endif
 
 DEPGEN ?= $(ACE_ROOT)/bin/depgen.pl
 
+# Use findstring just in case the script was preceded by /usr/bin/perl
+ifeq ($(findstring depgen.pl, $(notdir $(DEPGEN))), depgen.pl)
+  DEPEND_CMD_ARGS += -i
+  ifeq ($(inline), 0)
+    DEPEND_CMD_ARGS += -n
+  endif
+endif
+
 depend.local: $(MAKEFILE) idl_stubs.local
 	@$(RM) $(DEPENDENCY_FILE).old
 	@cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 3d446c0703d..631514f5796 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -50,6 +50,9 @@
 #  static_link      Link only static libs to executables, e.g., uses "-static"
 #                   flag with the GNU ld linker.
 #  threads          Build with thread support.
+#  ace_for_tao      Build "ace_for_tao" subset.  Primarily useful for
+#                   reducing the size of the ACE shared library when
+#                   using TAO.
 #  xt               Build with Xt (X11 Toolkit) support.
 #  fl               Build with FlTk (Fast Light Toolkit) support.
 #  tk               Build with Tk (Tcl/Tk) support.
@@ -284,16 +287,14 @@ ifeq ($(threads),0)
 endif # threads
 
 ####
-#### Defaults are exceptions off (0), fast off (0), rtti on (1), and
+#### Defaults are exceptions on (1), fast off (0), rtti on (1), and
 #### versioned_so on (1).
 ####
-exceptions ?= 0
-
+exceptions ?= 1
 fast ?= 0
-
 rtti ?= 1
-
 versioned_so ?= 1
+use_dep_libs ?= 1
 
 SOVERSION ?=
 SONAME ?=
@@ -338,7 +339,10 @@ INSMAN          ?= $(ACE_ROOT)/man
 ifeq (,$(findstring -L$(ACE_ROOT)/ace,$(LDFLAGS)))
   LDFLAGS         += -L$(ACE_ROOT)/ace -L./
 endif
-LEX             ?= flex
+
+ifeq (default,$(origin LEX))
+LEX = flex
+endif
 
 EXEEXT ?=
 
@@ -370,7 +374,9 @@ ACELIB ?= -lACE
 
 # NOTE: VLDLIBS is defined below, in case it is overridden for static-
 #       or shared-only builds.
-YACC          ?= bison
+ifeq (default,$(origin YACC))
+YACC = bison
+endif
 
 #----------------------------------------------------------------------------
 #      Platform-dependent macros that require platform_macros.GNU.
@@ -438,6 +444,17 @@ ifeq ($(threads),0)
   override threads =
 endif # threads
 
+# ace_for_tao subsetting is disabled by default.
+ace_for_tao ?=
+ifeq ($(ace_for_tao),0)
+  override ace_for_tao =
+endif # ace_for_tao
+
+ifneq ($(ace_for_tao),)
+  ACE_MAKE_OPTIONS += ace_for_tao
+endif # ace_for_tao
+
+
 ifeq ($(xt),0)
   override xt =
 endif # xt
@@ -547,15 +564,14 @@ 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
+    # Don't do a thing..
+  else
+    CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS)
+    LDFLAGS  += $(PLATFORM_SSL_LDFLAGS)
+    LIBS     += $(PLATFORM_SSL_LIBS)
+    ACE_MAKE_OPTIONS += ssl
   endif
 endif
-
 ec_typed_events ?= 1
 
 ifeq ($(exceptions),0)
@@ -783,6 +799,7 @@ ace_svcconf   ?= 1
 ace_uuid      ?= 1
 ace_filecache ?= 1
 acexml        ?= 1
+xerces        ?= 1
 
 #----------------------------------------------------------------------------
 #      Conditional macro definitions
@@ -799,7 +816,7 @@ COMPILE.c       = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc      = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c
 RC ?=
 
-COMPILE.rc      = $(RC)
+COMPILE.rc      = $(RC) $(RCFLAGS)
 COMPILE-NO_DASH_G.cc = `echo $(COMPILE.cc) | sed 's/-g //'`
 # 960905 Marius Kjeldahl <marius@funcom.com>
 # Added the line below to be used for compiling executable shared objects
diff --git a/m4/ace.m4 b/m4/ace.m4
index e68f1970ab5..adcf51836df 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -24,6 +24,8 @@ dnl Macros that add ACE configuration options to a `configure' script.
 dnl ACE_CONFIGURATION_OPTIONS
 AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
 [
+ AM_CONDITIONAL([BUILD_ACE_FOR_TAO], false)
+
  AC_ARG_ENABLE([ace-codecs],
   AS_HELP_STRING(--enable-ace-codecs,build ACE with codecs support [[[yes]]]),
   [
@@ -458,21 +460,15 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
  ACE_ENABLE_TK_REACTOR
  ACE_ENABLE_XT_REACTOR
 
- AC_ARG_WITH([gperf],
-  AS_HELP_STRING(--with-gperf,compile the gperf program [[[yes]]]),
+ AC_ARG_ENABLE([gperf],
+  AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]),
   [
-   case "${withval}" in
+   case "${enableval}" in
     yes)
-      ace_user_with_gperf=yes
-      AC_DEFINE([ACE_HAS_GPERF])
-      AS_IF([test -n "$GPERF"],
-        [
-         AC_MSG_WARN([gperf program already exists])
-         AC_MSG_WARN([existing gperf may be overwritten during installation])
-        ],[])
+      ace_user_enable_gperf=yes
       ;;
     no)
-      ace_user_with_gperf=no
+      ace_user_enable_gperf=no
       ;;
     *)
       AC_MSG_ERROR([bad value ${withval} for --with-gperf])
@@ -480,15 +476,17 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    esac
   ],
   [
-   ace_user_with_gperf=yes
+   ace_user_enable_gperf=yes
+  ])
+ if test "$ace_user_enable_gperf" = yes; then
    AC_DEFINE([ACE_HAS_GPERF])
    AS_IF([test -n "$GPERF"],
     [
      AC_MSG_WARN([gperf program already exists])
      AC_MSG_WARN([existing gperf may be overwritten during installation])
     ],[])
-  ])
- AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
+ fi 
+ AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_enable_gperf = Xyes])
 
  ACE_ENABLE_QOS
  ACE_ENABLE_SSL
@@ -551,7 +549,51 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    ace_user_enable_reentrant_funcs=yes
   ])
 
+ AC_ARG_ENABLE([ace-examples],
+  AS_HELP_STRING(--enable-ace-examples,build ACE examples [[[yes]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_build_examples=yes
+      ;;
+    no)
+      ace_build_examples=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-examples])
+      ;;
+   esac
+  ],
+  [
+   ace_build_examples=yes
+  ])
+  AM_CONDITIONAL([BUILD_EXAMPLES], [test X$ace_build_examples = Xyes])
 
+ AC_ARG_ENABLE([ace-tests],
+  AS_HELP_STRING(--enable-ace-tests,build ACE tests [[[yes]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_build_tests=yes
+      ;;
+    no)
+      ace_build_tests=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-ace-tests])
+      ;;
+   esac
+  ],
+  [
+   ace_build_tests=yes
+  ])
+ AM_CONDITIONAL([BUILD_TESTS], [test X$ace_build_tests = Xyes])
+
+ ACE_ENABLE_CDR_SWAP_ON_READ
+ ACE_ENABLE_CDR_SWAP_ON_WRITE
+ ACE_ENABLE_CDR_ALIGNMENT
+ ACE_ENABLE_STRDUP_EMULATION
+ ACE_ENABLE_WCSDUP_EMULATION
 ])
 
 
@@ -859,6 +901,131 @@ dnl    fi
 
 ])
 
+# ACE_ENABLE_CDR_SWAP_ON_READ
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_CDR_SWAP_ON_READ],
+[AC_ARG_ENABLE([ace-cdr-swap-on-read],
+               AS_HELP_STRING([--enable-ace-cdr-swap-on-read],
+                              [configure CDR to support swap on read [[yes]]]),
+	       [case "${enableval}" in
+		 yes)
+		  ace_user_cdr_swap_on_read=yes
+		  ;;
+		 no)
+		  ace_user_cdr_swap_on_read=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-cdr-swap-on-read)
+		  ;;
+		esac],[
+		  ace_user_cdr_swap_on_read=yes
+		])
+if test X$ace_user_cdr_swap_on_read = Xno; then
+  AC_DEFINE(ACE_DISABLE_SWAP_ON_READ, 1,
+	    [Define to 1 to disable swapping swapping CDR on read])
+fi
+])
+
+# ACE_ENABLE_CDR_SWAP_ON_WRITE
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_CDR_SWAP_ON_WRITE],
+[AC_ARG_ENABLE([ace-cdr-swap-on-write],
+               AS_HELP_STRING([--enable-ace-cdr-swap-on-write],
+                              [configure CDR to support swap on write [[no]]]),
+	       [case "${enableval}" in
+		 yes)
+		  ace_user_cdr_swap_on_write=yes
+		  ;;
+		 no)
+		  ace_user_cdr_swap_on_write=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-cdr-swap-on-write)
+		  ;;
+		esac],[
+		  ace_user_cdr_swap_on_write=no
+		])
+if test X$ace_user_cdr_swap_on_write = Xyes; then
+  AC_DEFINE(ACE_ENABLE_SWAP_ON_WRITE, 1,
+	    [Define to 1 to enable swapping swapping CDR on write])
+fi
+])
+
+# ACE_ENABLE_CDR_ALIGNMENT
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_CDR_ALIGNMENT],
+[AC_ARG_ENABLE([ace-cdr-alignment],
+               AS_HELP_STRING([--enable-ace-cdr-alignment],
+                              [configure CDR to require aligned access [[yes]]]),
+	       [case "${enableval}" in
+		 yes)
+		  ace_user_cdr_alignment=yes
+		  ;;
+		 no)
+		  ace_user_cdr_alignment=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-cdr-alignment)
+		  ;;
+		esac],[
+		  ace_user_cdr_alignment=yes
+		])
+if test X$ace_user_cdr_alignment = Xno; then
+  AC_DEFINE(ACE_LACKS_CDR_ALIGNMENT, 1,
+	    [Define to 1 to support unaligned CDR])
+fi
+])
+
+# ACE_ENABLE_STRDUP_EMULATION
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_STRDUP_EMULATION],
+[AC_ARG_ENABLE([ace-strdup-emulation],
+               AS_HELP_STRING([--enable-ace-strdup-emulation],
+                              [use ACE's strdup emulation [[no]]]),
+	       [case "${enableval}" in
+		 yes)
+		  ace_user_strdup_emulation=yes
+		  ;;
+		 no)
+		  ace_user_strdup_emulation=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-strdup-emulation)
+		  ;;
+		esac],[
+		  ace_user_strdup_emulation=no
+		])
+if test X$ace_user_strdup_emulation = Xyes; then
+  AC_DEFINE(ACE_HAS_STRDUP_EMULATION, 1,
+	    [Define to 1 use ACE's strdup() emulation])
+fi
+])
+
+# ACE_ENABLE_WCSDUP_EMULATION
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_WCSDUP_EMULATION],
+[AC_ARG_ENABLE([ace-wcsdup-emulation],
+               AS_HELP_STRING([--enable-ace-wcsdup-emulation],
+                              [use ACE's wcsdup emulation [[no]]]),
+	       [case "${enableval}" in
+		 yes)
+		  ace_user_wcsdup_emulation=yes
+		  ;;
+		 no)
+		  ace_user_wcsdup_emulation=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${enableval} for --enable-ace-wcsdup-emulation)
+		  ;;
+		esac],[
+		  ace_user_wcsdup_emulation=no
+		])
+if test X$ace_user_wcsdup_emulation = Xyes; then
+  AC_DEFINE(ACE_HAS_WCSDUP_EMULATION, 1,
+	    [Define to 1 use ACE's wcsdup() emulation])
+fi
+])
+
 AC_DEFUN([ACE_ENABLE_QOS],
 [AC_ARG_ENABLE([qos],
 	       AS_HELP_STRING([--enable-qos],
@@ -929,7 +1096,6 @@ AM_CONDITIONAL([BUILD_ACEXML], [test X$ace_user_enable_acexml = Xyes])
 # Find OpenGL Libraries, flags, etc.
 AC_DEFUN([ACE_PATH_GL],
 [
-AM_CONDITIONAL([BUILD_GL], [false])
 ])
 
 
@@ -938,6 +1104,28 @@ AM_CONDITIONAL([BUILD_GL], [false])
 # Find FL/TK Libraries, flags, etc.
 AC_DEFUN([ACE_PATH_FL],
 [AC_REQUIRE([ACE_PATH_GL])
+ AC_ARG_WITH([fltkconfig],
+ AS_HELP_STRING([--with-fltkconfig=DIR],
+                [path to fltk-config [[automatic]]]),
+ [ ac_fltkconfig_dir="${withval}" ])
+ if test X"${ac_fltkconfig_dir}" = X; then
+   AC_PATH_PROG([FLTKCONFIG], [fltk-config], [])
+ else
+   AC_MSG_CHECKING([whether fltk-config exists in ${ac_fltkconfig_dir}])
+   if test -f "${ac_fltkconfig_dir}/fltk-config"; then
+     FLTKCONFIG="${ac_fltkconfig_dir}/fltk-config"
+     AC_MSG_RESULT([yes])
+   else
+     AC_MSG_RESULT([no])
+   fi
+ fi
+ if test X"${FLTKCONFIG}" != X; then
+   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null`
+   ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null`
+
+   AC_SUBST(ACE_FLTK_CPPFLAGS)
+   AC_SUBST(ACE_FLTK_LIBS)
+ fi
 ])
 
 
@@ -946,14 +1134,126 @@ AC_DEFUN([ACE_PATH_FL],
 # Find Qt Libraries, flags, etc.
 AC_DEFUN([ACE_PATH_QT],
 [
+ ac_qt_found=no
+ PKG_CHECK_MODULES([Qt], [qt-mt],
+                   [ac_qt_found=yes],
+                   [AC_MSG_RESULT([not found])])
+ if test X"${ac_qt_found}" = Xyes; then
+   ACE_QT_CPPFLAGS="${Qt_CFLAGS}"
+   ACE_QT_LIBS="${Qt_LIBS}"
+   AC_SUBST(ACE_QT_CPPFLAGS)
+   AC_SUBST(ACE_QT_LIBS)
+
+   AS_IF([test -n "$QTDIR"],
+         [],
+         [QTDIR=`$PKG_CONFIG --variable=prefix qt-mt 2>/dev/null`])
+   AC_SUBST(QTDIR)
+ fi
+])
+
+
+# ACE_PATH_TCL
+#---------------------------------------------------------------------------
+# Find Tcl Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_TCL], 
+[AC_ARG_WITH([tclconfig],
+ AS_HELP_STRING([--with-tclconfig=DIR],
+                [path to tclConfig.sh [[automatic]]]),
+ [ ac_tclconfig_dir="${withval}" ])
+ if test X"${ac_tclconfig_dir}" = X; then
+   AC_PATH_PROG([TCLCONFIG], [tclConfig.sh], [],
+                [${PATH}:/usr/local/lib:/usr/pkg/lib:/usr/lib/tcl8.4:/usr/lib/tcl8.3:/usr/lib])
+ else
+  AC_MSG_CHECKING([whether tclConfig.sh exists in ${ac_tclconfig_dir}])
+   if test -f "${ac_tclconfig_dir}/tclConfig.sh"; then
+     TCLCONFIG="${ac_tclconfig_dir}/tclConfig.sh"
+     AC_MSG_RESULT([yes])
+   else
+     AC_MSG_RESULT([no])
+   fi
+ fi
+ if test X"${TCLCONFIG}" != X; then
+   . ${TCLCONFIG}
+
+   ACE_TCL_CPPFLAGS="${TCL_INCLUDE_SPEC}"
+   eval "ACE_TCL_LIBS=\"${TCL_LIB_SPEC}\""
+
+   AC_SUBST(ACE_TCL_CPPFLAGS)
+   AC_SUBST(ACE_TCL_LIBS)
+ fi
 ])
 
 
 # ACE_PATH_TK
 #---------------------------------------------------------------------------
 # Find Tk Libraries, flags, etc.
-AC_DEFUN([ACE_PATH_TK],
-[
+AC_DEFUN([ACE_PATH_TK], 
+[AC_REQUIRE([ACE_PATH_TCL])
+ AC_ARG_WITH([tkconfig],
+ AS_HELP_STRING([--with-tkconfig=DIR],
+                [path to tkConfig.sh [[automatic]]]),
+ [ ac_tkconfig_dir="${withval}" ])
+ if test X"${ac_tkconfig_dir}" = X; then
+   AC_PATH_PROG([TKCONFIG], [tkConfig.sh], [],
+                [${PATH}:/usr/local/lib:/usr/pkg/lib:/usr/lib/tk8.4:/usr/lib/tk8.3:/usr/lib])
+ else
+   AC_MSG_CHECKING([whether tkConfig.sh exists in ${ac_tkconfig_dir}])
+   if test -f "${ac_tkconfig_dir}/tkConfig.sh"; then
+     TKCONFIG="${ac_tkconfig_dir}/tkConfig.sh"
+     AC_MSG_RESULT([yes])
+   else
+     AC_MSG_RESULT([no])
+   fi
+ fi
+ if test X"${TKCONFIG}" != X; then
+   . ${TKCONFIG}
+
+   ACE_TK_CPPFLAGS="${TK_INCLUDE_SPEC} ${TK_XINCLUDES}"
+   ACE_TK_LIBS="${TK_LIB_SPEC} ${TK_XLIBSW}"
+
+   AC_SUBST(ACE_TK_CPPFLAGS)
+   AC_SUBST(ACE_TK_LIBS)
+ fi
+])
+
+
+# ACE_PATH_XT
+#---------------------------------------------------------------------------
+# Find Xt libraries, flags, etc.
+AC_DEFUN([ACE_PATH_XT],
+[AC_REQUIRE([ACE_PATH_X11])
+
+if test "$no_x" != yes; then
+   ACE_XT_CPPFLAGS=""
+   ACE_XT_LDFLAGS=""
+   ACE_XT_LIBS="-lXt"
+
+   AC_SUBST(ACE_XT_CPPFLAGS)
+   AC_SUBST(ACE_XT_LDFLAGS)
+   AC_SUBST(ACE_XT_LIBS)
+fi
+AM_CONDITIONAL([BUILD_ATHENA], true)
+AM_CONDITIONAL([BUILD_MOTIF], false)
+])
+
+
+# ACE_PATH_X11
+#---------------------------------------------------------------------------
+# Find X11 libraries, flags, etc.
+AC_DEFUN([ACE_PATH_X11],
+[AC_REQUIRE([AC_PATH_XTRA])
+
+if test "$no_x" != yes; then
+   ACE_X11_CPPFLAGS="${X_CFLAGS}"
+   ACE_X11_LDFLAGS="${X_LIBS}"
+   ACE_X11_LIBS="${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}"
+
+   AC_SUBST(ACE_X11_CPPFLAGS)
+   AC_SUBST(ACE_X11_LDFLAGS)
+   AC_SUBST(ACE_X11_LIBS)
+fi
+
+AM_CONDITIONAL([BUILD_X11], [test X$no_x != Xyes])
 ])
 
 
@@ -961,16 +1261,17 @@ AC_DEFUN([ACE_PATH_TK],
 #---------------------------------------------------------------------------
 AC_DEFUN([ACE_ENABLE_FL_REACTOR],
 [AC_REQUIRE([ACE_PATH_FL])
+AC_REQUIRE([ACE_PATH_X11])
 AC_ARG_ENABLE([fl-reactor],
   	       AS_HELP_STRING([--enable-fl-reactor],
 		              [build support for the FlReactor [[no]]]),
                [case "${enableval}" in
                  yes)
-		  AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
-		  ace_user_enable_fl_reactor=yes
+                  AS_IF([test X"${FLTKCONFIG}" != X],
+                        [ace_user_enable_fl_reactor=yes],
+                        [AC_MSG_ERROR([ACE_FlReactor cannot be enabled: fltk-config not found.])])
 		  ;;
 		no)
-		  AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
 		  ace_user_enable_fl_reactor=no
 		  ;;
 		*)
@@ -980,11 +1281,12 @@ AC_ARG_ENABLE([fl-reactor],
                 [
                  ace_user_enable_fl_reactor=no
                 ])
-AM_CONDITIONAL([BUILD_FL], [test X$ace_enable_fl_reactor = Xyes])
+AM_CONDITIONAL([BUILD_GL], [test X$ace_user_enable_fl_reactor = Xyes])
+AM_CONDITIONAL([BUILD_FL], [test X$ace_user_enable_fl_reactor = Xyes])
 AM_CONDITIONAL([BUILD_ACE_FLREACTOR],
-               [test X$ace_enable_fl_reactor = Xyes])
+               [test X$ace_user_enable_fl_reactor = Xyes])
 AM_CONDITIONAL([BUILD_TAO_FLRESOURCE],
-               [test X$ace_enable_fl_reactor = Xyes])
+               [test X$ace_user_enable_fl_reactor = Xyes])
 ])
 
 
@@ -997,11 +1299,11 @@ AC_ARG_ENABLE([qt-reactor],
 		              [build support for the QtReactor [[no]]]),
                [case "${enableval}" in
                  yes)
-		  AC_MSG_ERROR([--enable-qt-reactor currently unimplemented])
-		  ace_user_enable_qt_reactor=yes
+                  AS_IF([test X"${ac_qt_found}" = Xyes],
+                        [ace_user_enable_qt_reactor=yes],
+                        [AC_MSG_ERROR([ACE_QtReactor cannot be enabled: Qt not found.])])
 		  ;;
 		no)
-		  AC_MSG_ERROR([--enable-qt-reactor currently unimplemented])
 		  ace_user_enable_qt_reactor=no
 		  ;;
 		*)
@@ -1011,11 +1313,11 @@ AC_ARG_ENABLE([qt-reactor],
                 [
                  ace_user_enable_qt_reactor=no
                 ])
-AM_CONDITIONAL([BUILD_QT], [test X$ace_enable_qt_reactor = Xyes])
+AM_CONDITIONAL([BUILD_QT], [test X$ace_user_enable_qt_reactor = Xyes])
 AM_CONDITIONAL([BUILD_ACE_QTREACTOR],
-               [test X$ace_enable_qt_reactor = Xyes])
+               [test X$ace_user_enable_qt_reactor = Xyes])
 AM_CONDITIONAL([BUILD_TAO_QTRESOURCE],
-               [test X$ace_enable_qt_reactor = Xyes])
+               [test X$ace_user_enable_qt_reactor = Xyes])
 ])
 
 
@@ -1028,11 +1330,13 @@ AC_ARG_ENABLE([tk-reactor],
 		              [build support for the TkReactor [[no]]]),
                [case "${enableval}" in
                  yes)
-		  AC_MSG_ERROR([--enable-tk-reactor currently unimplemented])
-		  ace_user_enable_tk_reactor=yes
+                  AS_IF([test X"${TCLCONFIG}" != X],
+                        [AS_IF([test X"${TKCONFIG}" != X],
+                               [ace_user_enable_tk_reactor=yes],
+                               [AC_MSG_ERROR([ACE_TkReactor cannot be enabled: tkConfig not found.])])],
+                        [AC_MSG_ERROR([ACE_TkReactor cannot be enabled: tclConfig not found.])])
 		  ;;
 		no)
-		  AC_MSG_ERROR([--enable-tk-reactor currently unimplemented])
 		  ace_user_enable_tk_reactor=no
 		  ;;
 		*)
@@ -1042,38 +1346,35 @@ AC_ARG_ENABLE([tk-reactor],
                 [
                  ace_user_enable_tk_reactor=no
                 ])
-AM_CONDITIONAL([BUILD_TK], [test X$ace_enable_tk_reactor = Xyes])
+AM_CONDITIONAL([BUILD_TK], [test X$ace_user_enable_tk_reactor = Xyes])
 AM_CONDITIONAL([BUILD_ACE_TKREACTOR],
-               [test X$ace_enable_tk_reactor = Xyes])
+               [test X$ace_user_enable_tk_reactor = Xyes])
 AM_CONDITIONAL([BUILD_TAO_TKRESOURCE],
-               [test X$ace_enable_tk_reactor = Xyes])
+               [test X$ace_user_enable_tk_reactor = Xyes])
 ])
 
 
 # ACE_ENABLE_XT_REACTOR
 #---------------------------------------------------------------------------
 AC_DEFUN([ACE_ENABLE_XT_REACTOR],
-[AC_ARG_ENABLE([xt-reactor],
+[AC_REQUIRE([ACE_PATH_XT])
+AC_ARG_ENABLE([xt-reactor],
                AS_HELP_STRING([--enable-xt-reactor],
                               [build support for the XtReactor [[no]]]),
                [case "${enableval}" in
                  yes)
-                  AC_PATH_XTRA
 dnl Here, if X isn't found or the user sets "--without-x" on the command
 dnl line, then "no_x" is set to "yes."
                   AS_IF([test "$no_x" != yes],
-                        [
-		          ACE_XLIBS="-lX11 -lXt"
+			[
                           ace_user_enable_xt_reactor=yes
                         ],[
-                          ACE_XLIBS=""
                           ace_user_enable_xt_reactor=no
                           AC_MSG_WARN([X was not found or it was disabled.])
                           AC_MSG_WARN([ACE_XtReactor will not be enabled.])
                         ])
                   ;;
                  no)
-                  ACE_XLIBS=""
                   ace_user_enable_xt_reactor=no
                   ;;
                  *)
@@ -1081,13 +1382,11 @@ dnl line, then "no_x" is set to "yes."
 		  ;;
                 esac],
 		[
-                  ACE_XLIBS=""
                   ace_user_enable_xt_reactor=no
 		])
-AM_CONDITIONAL([BUILD_X11], [test X$ace_enable_xt_reactor = Xyes])
-AM_CONDITIONAL([BUILD_XT], [test X$ace_enable_xt_reactor = Xyes])
+AM_CONDITIONAL([BUILD_XT], [test X$ace_user_enable_xt_reactor = Xyes])
 AM_CONDITIONAL([BUILD_ACE_XTREACTOR],
-               [test X$ace_enable_xt_reactor = Xyes])
+               [test X$ace_user_enable_xt_reactor = Xyes])
 AM_CONDITIONAL([BUILD_TAO_XTRESOURCE],
-               [test X$ace_enable_xt_reactor = Xyes])
+               [test X$ace_user_enable_xt_reactor = Xyes])
 ])
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index b608971969f..f23fbb68d35 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -600,171 +600,3 @@ dnl mismatched parentheses.
 dnl   checks for structures
 
 dnl   checks for system services
-
-
-dnl *********************** SPECIAL SECTION *******************************
-dnl
-dnl This section contains my own *re*implementation of the functionality
-dnl provided by some tests/macros found in GNU Autoconf since the ones found
-dnl in Autoconf don't appear to work as expected.
-dnl
-dnl dnl                -Ossama Othman <ossama@debian.org>
-dnl dnl
-dnl dnl The copyright for the following macros is listed below.
-dnl dnl Note that all macros listed prior to this section are copyrighted
-dnl dnl by Ossama Othman, not the Free Software Foundation.  Nevertheless,
-dnl dnl all software found in this file is free software.  Please read the
-dnl dnl distribution terms found at the top of this file and the ones below.
-
-dnl dnl Parameterized macros.
-dnl dnl Requires GNU m4.
-dnl dnl This file is part of Autoconf.
-dnl dnl Copyright (C) 1992, 93, 94, 95, 96, 1998 Free Software Foundation, Inc.
-dnl dnl
-dnl dnl This program is free software; you can redistribute it and/or modify
-dnl dnl it under the terms of the GNU General Public License as published by
-dnl dnl the Free Software Foundation; either version 2, or (at your option)
-dnl dnl any later version.
-dnl dnl
-dnl dnl This program is distributed in the hope that it will be useful,
-dnl dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl dnl GNU General Public License for more details.
-dnl dnl
-dnl dnl You should have received a copy of the GNU General Public License
-dnl dnl along with this program; if not, write to the Free Software
-dnl dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl dnl 02111-1307, USA.
-dnl dnl
-dnl dnl As a special exception, the Free Software Foundation gives unlimited
-dnl dnl permission to copy, distribute and modify the configure scripts that
-dnl dnl are the output of Autoconf.  You need not follow the terms of the GNU
-dnl dnl General Public License when using or distributing such scripts, even
-dnl dnl though portions of the text of Autoconf appear in them.  The GNU
-dnl dnl General Public License (GPL) does govern all other use of the material
-dnl dnl that constitutes the Autoconf program.
-dnl dnl
-dnl dnl Certain portions of the Autoconf source text are designed to be copied
-dnl dnl (in certain cases, depending on the input) into the output of
-dnl dnl Autoconf.  We call these the "data" portions.  The rest of the Autoconf
-dnl dnl source text consists of comments plus executable code that decides which
-dnl dnl of the data portions to output in any given case.  We call these
-dnl dnl comments and executable code the "non-data" portions.  Autoconf never
-dnl dnl copies any of the non-data portions into its output.
-dnl dnl
-dnl dnl This special exception to the GPL applies to versions of Autoconf
-dnl dnl released by the Free Software Foundation.  When you make and
-dnl dnl distribute a modified version of Autoconf, you may extend this special
-dnl dnl exception to the GPL to apply to your modified version as well, *unless*
-dnl dnl your modified version has the potential to copy into its output some
-dnl dnl of the text that was the non-data portion of the version that you started
-dnl dnl with.  (In other words, unless your change moves or copies text from
-dnl dnl the non-data portions to the data portions.)  If your modification has
-dnl dnl such potential, you must delete any notice of this special exception
-dnl dnl to the GPL from your modified version.
-dnl dnl
-dnl dnl Written by David MacKenzie, with help from
-dnl dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
-dnl dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
-
-
-dnl dnl Usage: ACE_SEARCH_LIBS(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
-dnl dnl                        [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
-dnl dnl Search for a library defining FUNCTION, if it's not already available.
-dnl AC_DEFUN([ACE_SEARCH_LIBS],
-dnl [
-dnl  AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
-dnl    [
-dnl     ac_func_search_save_LIBS="$LIBS"
-
-dnl     ac_cv_search_$1="no"
-
-dnl     ACE_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-
-dnl     test "$ac_cv_search_$1" = "no" && for i in $2; do
-dnl       LIBS="-l$i $5 $ac_func_search_save_LIBS"
-dnl       ACE_TRY_LINK_FUNC([$1],
-dnl         [
-dnl          ac_cv_search_$1="-l$i"
-dnl          break
-dnl         ])
-dnl     done
-
-dnl     LIBS="$ac_func_search_save_LIBS"
-dnl    ])
-
-dnl   if test "$ac_cv_search_$1" != "no"; then
-dnl     test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-dnl     $3
-dnl   else :
-dnl     $4
-dnl   fi
-dnl ])
-
-dnl dnl Usage: ACE_TRY_LINK_FUNC(FUNCTION,[, ACTION-IF-FOUND
-dnl dnl                          [, ACTION-IF-NOT-FOUND])
-dnl dnl Search for a library defining FUNCTION, if it's not already available.
-dnl AC_DEFUN([ACE_TRY_LINK_FUNC],
-dnl [
-dnl AC_LINK_IFELSE([AC_LANG_PROGRAM([[dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl dnl which includes <sys/select.h> which contains a prototype for
-dnl dnl select.  Similarly for bzero.
-dnl /* System header to define __stub macros and hopefully few prototypes,
-dnl     which can conflict with char $1(); below.  */
-dnl #include <assert.h>
-dnl /* Override any gcc2 internal prototype to avoid an error.  */
-dnl ifelse(AC_LANG, C++, #ifdef __cplusplus
-dnl extern "C"
-dnl #endif
-dnl )dnl
-dnl /* We use char because int might match the return type of a gcc2
-dnl     builtin and then its argument prototype would still apply.  */
-dnl char $1();
-dnl ]], [[
-dnl /* The GNU C library defines this for functions which it implements
-dnl     to always fail with ENOSYS.  Some functions are actually named
-dnl     something starting with __ and the normal name is an alias.  */
-dnl #if defined (__stub_$1) || defined (__stub___$1)
-dnl choke me
-dnl #else
-dnl $1();
-dnl #endif
-dnl ]])],[$2],[$3])
-dnl ])
-
-dnl AC_DEFUN([ACE_SYS_RESTARTABLE_SYSCALLS],
-dnl [AC_REQUIRE([AC_HEADER_SYS_WAIT])
-dnl AC_CHECK_HEADERS([unistd.h])
-dnl AC_CACHE_CHECK([for restartable system calls, ac_cv_sys_restartable_syscalls],
-dnl [AC_RUN_IFELSE([AC_LANG_SOURCE([[/* Exit 0 (true) if wait returns something other than -1,
-dnl    i.e. the pid of the child, which means that wait was restarted
-dnl    after getting the signal.  */
-dnl #include <sys/types.h>
-dnl #include <signal.h>
-dnl #if HAVE_UNISTD_H
-dnl # include <unistd.h>
-dnl #endif
-dnl #if HAVE_SYS_WAIT_H
-dnl # include <sys/wait.h>
-dnl #endif
-
-dnl /* Some platforms explicitly require an extern "C" signal handler
-dnl    when using C++. */
-dnl #ifdef __cplusplus
-dnl extern "C"
-dnl #endif
-dnl void ucatch (int) { }
-
-dnl main () {
-dnl   int i = fork (), status;
-dnl   if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); }
-dnl   signal (SIGINT, ucatch);
-dnl   status = wait(&i);
-dnl   if (status == -1) wait(&i);
-dnl   exit (status == -1);
-dnl }
-dnl ]])],[ac_cv_sys_restartable_syscalls=yes],[ac_cv_sys_restartable_syscalls=no],[])])
-dnl if test $ac_cv_sys_restartable_syscalls = yes; then
-dnl   AC_DEFINE([HAVE_RESTARTABLE_SYSCALLS])
-dnl fi
-dnl ])
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index 763b6713525..57ed77b1e87 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -177,16 +177,6 @@ dnl @todo Clean up / consolidate these conditionals
      esac
      ;;
    *freebsd*)
-     case "$CXX" in
-       *)
-         if test "$GXX" = yes; then
-           CXXFLAGS="$CXXFLAGS"
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -w -fno-strict-prototypes"
-           DCXXFLAGS=""
-           OCXXFLAGS=""
-         fi
-         ;;
-     esac
      ;;
    *hpux*)
      # In case anything here or in the config depends on OS
@@ -367,42 +357,113 @@ dnl @todo Clean up / consolidate these conditionals
      ;;
  esac
 
- dnl Additional flags
+ dnl Warning flags
+ if test "$GCC" = yes; then
+   ACE_CFLAGS="$ACE_CFLAGS -W -Wall -Wpointer-arith"
+ fi
  if test "$GXX" = yes; then
    ACE_CXXFLAGS="$ACE_CXXFLAGS -W -Wall -Wpointer-arith"
+ fi
 
-   dnl Take advantage of visibility attributes when using g++ 4.0 or
-   dnl better.
-   if test "$ACE_GXX_MAJOR_VERSION" -ge 4; then
-     case "$host_os" in
-       darwin*)
-	 ;; 
-     
+ dnl Symbol Visibility flags
+ dnl Take advantage of visibility attributes when using g++ 4.0 or
+ dnl better.
+ if test "$GXX" = yes; then
+   dnl As of this writing, there are symbol visibility issues on some
+   dnl platforms.  The --disable-symbol-visibility option is intended
+   dnl to allow users to explicitly disable symbol visibility support
+   dnl in the cases where it does not work (or does not work properly),
+   dnl but the feature test selects it anyway.
+
+   AC_ARG_ENABLE([symbol-visibility],
+     AS_HELP_STRING([--enable-symbol-visibility],
+		    [build with gcc symbol visibility attributes [[[no]]]]),
+     [
+      case "${enableval}" in
+       yes)
+	 ace_user_symbol_visibility=yes
+	 ;;
+       no)
+	 ace_user_symbol_visibility=no
+	 ;;
        *)
-	 AC_MSG_NOTICE([enabling GNU G++ visibility attribute support])
-	 ACE_GXX_VISIBILITY_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
-	 ACE_CXXFLAGS="$ACE_CXXFLAGS $ACE_GXX_VISIBILITY_FLAGS"
-	 AC_DEFINE([ACE_HAS_CUSTOM_EXPORT_MACROS])
-	 AC_DEFINE([ACE_Proper_Export_Flag],
-		   [__attribute__ ((visibility("default")))])
+	 AC_MSG_ERROR([bad value ${enableval} for --enable-symbol-visibility])
 	 ;;
-     esac
-   else
-     case `$CXX --version` in
-       2.9*)
-         if test "$ace_user_enable_exceptions" != yes; then
-           ACE_CXXFLAGS="$ACE_CXXFLAGS -fcheck-new"
-         fi
-         ;;
-     esac
+      esac
+     ],
+     [
+      ace_user_enable_symbol_visibility=no
+     ])
+
+   if test "$ace_user_enable_symbol_visibility" = yes; then
+     ACE_CHECK_CXXFLAGS([fvisibility=hidden],
+			[
+       ACE_CXXFLAGS="$ACE_CXXFLAGS -fvisibility=hidden"
+       AC_DEFINE([ACE_HAS_CUSTOM_EXPORT_MACROS])
+       AC_DEFINE([ACE_Proper_Export_Flag],
+		 [__attribute__ ((visibility("default")))])
+			])
+     ACE_CHECK_CXXFLAGS([fvisibility-inlines-hidden],
+			[
+       ACE_CXXFLAGS="$ACE_CXXFLAGS -fvisibility-inlines-hidden"
+			])
    fi
+ fi
+ 
+ dnl Additional flags
+ if test "$GXX" = yes; then
+   case `$CXX --version` in
+     2.9*)
+       if test "$ace_user_enable_exceptions" != yes; then
+	 ACE_CXXFLAGS="$ACE_CXXFLAGS -fcheck-new"
+       fi
+       ;;
+   esac
 
 dnl    if test "$ace_user_enable_repo" = no; then
 dnl      ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-implicit-templates"
 dnl    fi
  fi
+])
 
- if test "$GCC" = yes; then
-   ACE_CFLAGS="$ACE_CFLAGS -W -Wall -Wpointer-arith"
- fi
+AC_DEFUN([ACE_CHECK_CFLAGS],
+[
+AS_VAR_PUSHDEF([VAR],'ace_cv_cflag_$1')
+AC_MSG_CHECKING([whether $CC supports -$1])
+AC_LANG_SAVE
+AC_LANG([C])
+ace_save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -$1"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0])],[VAR=yes],[VAR=no])
+CFLAGS=$ace_save_CFLAGS
+AC_LANG_RESTORE
+if test $VAR = yes; then
+  AC_MSG_RESULT([yes])
+  $2
+else
+  AC_MSG_RESULT([no])
+  $3
+fi
+AS_VAR_POPDEF([VAR])
+])
+
+AC_DEFUN([ACE_CHECK_CXXFLAGS],
+[
+AS_VAR_PUSHDEF([VAR],'ace_cv_cxxflag_$1')
+AC_MSG_CHECKING([whether $CXX supports -$1])
+AC_LANG_SAVE
+AC_LANG([C++])
+ace_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS -$1"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0])],[VAR=yes],[VAR=no])
+CXXFLAGS=$ace_save_CXXFLAGS
+AC_LANG_RESTORE
+if test $VAR = yes; then
+  AC_MSG_RESULT([yes])
+  $2
+else
+  AC_MSG_RESULT([no])
+  $3
+fi
+AS_VAR_POPDEF([VAR])
 ])
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 2f396d0c9aa..c6ba34238e6 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -528,17 +528,6 @@ AH_TEMPLATE([ACE_HAS_POWERPC_TIMER],
 
 AH_TEMPLATE([ACE_HAS_PRUSAGE_T],[Platform supports the prusage_t struct])
 
-AH_TEMPLATE([ACE_HAS_PTHREADS_DRAFT4],
-[Platform supports POSIX Threads .4a Draft 4])
-
-AH_TEMPLATE([ACE_HAS_PTHREADS_DRAFT6],
-[Platform supports POSIX Threads .4a Draft 6])
-
-AH_TEMPLATE([ACE_HAS_PTHREADS_DRAFT7],a
-[Platform supports POSIX Threads .1c Draft 7])
-
-AH_TEMPLATE([ACE_HAS_PTHREADS_STD],[Platform supports POSIX.1c-1995 threads])
-
 AH_TEMPLATE([ACE_HAS_PTHREADS_UNIX98_EXT],
 [Platform has the UNIX98 extensions to Pthreads (rwlocks)])
 
@@ -613,9 +602,6 @@ AH_TEMPLATE([ACE_HAS_REGEX],
 AH_TEMPLATE([ACE_HAS_SEMUN],
 [Compiler/platform defines a union semun for SysV shared memory ])
 
-AH_TEMPLATE([ACE_HAS_SET_T_ERRNO],
-[Platform has a function to set t_errno (e.g., Tandem).])
-
 AH_TEMPLATE([ACE_HAS_SHM_OPEN],[Platform has shm_open()])
 
 AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG],
@@ -632,8 +618,6 @@ AH_TEMPLATE([ACE_HAS_SIGNAL_OBJECT_AND_WAIT],
 AH_TEMPLATE([ACE_HAS_SIG_C_FUNC],
 [Compiler requires extern "C" functions for signals.])
 
-AH_TEMPLATE([ACE_HAS_SIN_LEN],[Platform supports new BSD inet_addr len field.])
-
 AH_TEMPLATE([ACE_HAS_SIZET_SOCKET_LEN],
 [OS/compiler uses size_t * rather than int * for socket lengths])
 
@@ -654,9 +638,6 @@ AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY],
 
 AH_TEMPLATE([ACE_HAS_STRBUF_T],[Compiler/platform supports struct strbuf])
 
-AH_TEMPLATE([ACE_HAS_STRDUP_EMULATION],
-[Platform/compiler lacks strdup() (e.g., VxWorks, Chorus, WinCE)])
-
 AH_TEMPLATE([ACE_HAS_STRPTIME],[Compile ACE_OS::strptime() wrapper into ACE.])
 
 AH_TEMPLATE([ACE_HAS_STREAMS],[Platform supports STREAMS])
@@ -1016,9 +997,6 @@ AH_TEMPLATE([ACE_LACKS_UNIX_SIGNALS],
 AH_TEMPLATE([ACE_LACKS_UTSNAME_T],
 [Platform lacks struct utsname (e.g., Win32 and VxWorks)])
 
-AH_TEMPLATE([ACE_HAS_3_PARAM_WCSTOK],
-[Platform's wcstok() takes 3 arguments])
-
 AH_TEMPLATE([ACE_LACKS_WILDCARD_BIND],
 [The bind() call will not select the port if it's 0.])
 
@@ -1048,9 +1026,6 @@ AH_TEMPLATE([ACE_NEEDS_REGEXPR_H],
 AH_TEMPLATE([ACE_NEEDS_SCHED_H],
 [Platform needs to #include <sched.h> to get thread scheduling defs.])
 
-AH_TEMPLATE([ACE_LACKS_SYSTIME_H],
-[<time.h> doesn't automatically #include <sys/time.h>])
-
 AH_TEMPLATE([ACE_NEW_THROWS_EXCEPTIONS],
 [Compiler's 'new' throws exception on failure (ANSI C++ behavior).])
 
diff --git a/m4/tls.m4 b/m4/tls.m4
index 1c16f4c22ac..f1c47e33051 100644
--- a/m4/tls.m4
+++ b/m4/tls.m4
@@ -69,7 +69,9 @@ AC_DEFUN([ACE_CHECK_TLS],
  dnl library.
  ace_save_LIBS="$LIBS"
  ace_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ace_TLS_CPPFLAGS"
  ace_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $ace_TLS_LDFLAGS"
 
  dnl ---------------------------------------------------------
 
@@ -112,9 +114,9 @@ SSL_shutdown (ssl);
     ace_kerberos_dir=""
     for ace_kerberos in /usr /usr/local; do
      ace_kerberos_dir="${ace_kerberos}/kerberos/include"
-     ace_TLS_CPPFLAGS="-I${ace_kerberos_dir}"
+     ace_kerberos_CPPFLAGS="-I${ace_kerberos_dir}"
 
-     CPPFLAGS="$ace_TLS_CPPFLAGS $ace_save_CPPFLAGS"
+     CPPFLAGS="$ace_save_CPPFLAGS $ace_TLS_CPPFLAGS $ace_kerberos_CPPFLAGS"
 
      AC_COMPILE_IFELSE([
        AC_LANG_PROGRAM([
@@ -156,7 +158,7 @@ SSL_shutdown (ssl);
         AC_SUBST([ACE_KERBEROS_INCLUDES],[.])
        ],
        [
-        AC_SUBST([ACE_TLS_CPPFLAGS],[-I${ac_cv_kerberos_dir}])
+        ace_TLS_CPPFLAGS="$ace_TLS_CPPFLAGS -I${ac_cv_kerberos_dir}"
         AC_SUBST([ACE_KERBEROS_INCLUDES],[$ac_cv_kerberos_dir])
        ])
 
diff --git a/netsvcs/clients/Logger/Logger.mpc b/netsvcs/clients/Logger/Logger.mpc
index 7bc656320f1..e4dbe0a0046 100644
--- a/netsvcs/clients/Logger/Logger.mpc
+++ b/netsvcs/clients/Logger/Logger.mpc
@@ -2,7 +2,8 @@
 // $Id$
 
 project(direct logging) : aceexe {
-  exename = direct_logging
+  avoids  += ace_for_tao
+  exename  = direct_logging
   libs    += netsvcs
   after   += netsvcs
   Source_Files {
@@ -11,7 +12,8 @@ project(direct logging) : aceexe {
 }
 
 project(indirect logging) : aceexe {
-  exename = indirect_logging
+  avoids  += ace_for_tao
+  exename  = indirect_logging
   libs    += netsvcs
   after   += netsvcs
   Source_Files {
diff --git a/netsvcs/clients/Naming/Client/Client.mpc b/netsvcs/clients/Naming/Client/Client.mpc
index 29eb2271c7a..54d828b8774 100644
--- a/netsvcs/clients/Naming/Client/Client.mpc
+++ b/netsvcs/clients/Naming/Client/Client.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Netsvsc_Client_Test_Lib): acelib {
+  avoids       += ace_for_tao
   sharedname    = Client_Test
   dynamicflags += ACE_CLIENT_TEST_BUILD_DLL
   Source_Files {
@@ -10,9 +11,10 @@ project(Netsvsc_Client_Test_Lib): acelib {
 }
 
 project(Netsvcs_Client_Test) : aceexe {
+  avoids += ace_for_tao
   exename = main
-  libs    += Client_Test
-  after   += Client_Test Netsvsc_Client_Test_Lib
+  libs   += Client_Test
+  after  += Client_Test Netsvsc_Client_Test_Lib
   Source_Files {
     main.cpp
   }
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index a57a7cea5eb..1357af3a6cd 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -371,8 +371,8 @@ Client_Test::list_options (void)
                   this->name_options_->nameserver_port ()));
       break;
     default:
-      assert (!"shouldn't occur!\n");
-      /* NOTREACHED */
+      ACE_ERROR ((LM_ERROR, "ERROR: shouldn't occur!\n"));
+      break;
     }
   ACE_DEBUG ((LM_DEBUG,
               "  *** Namespace directory is %s ***\n",
@@ -649,8 +649,3 @@ Client_Test::find (const char *key)
     }
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Service<ACE_Naming_Context>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<ACE_Naming_Context>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc
index 54b1a657c19..c88bb05e2e2 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(Netsvcs_Dump_Restore_Lib): acelib {
+  avoids       += ace_for_tao
   sharedname    = Dump_Restore
   dynamicflags += ACE_BUILD_SVC_DLL
   Source_Files {
@@ -10,7 +11,8 @@ project(Netsvcs_Dump_Restore_Lib): acelib {
 }
 
 project(Netsvcs_Dump_Restore) : aceexe {
-  exename = main
+  avoids  += ace_for_tao
+  exename  = main
   libs    += Dump_Restore
   after   += Netsvcs_Dump_Restore_Lib
   Source_Files {
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index 251bd7c9687..f8a5e18a5a1 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -355,25 +355,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   return st.open (argc, argv);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<STDIN_Token::TID, ACE_Token_Collection *>;
-template class ACE_Map_Manager<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<STDIN_Token::TID, ACE_Token_Collection *>
-#pragma instantiate ACE_Map_Manager<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else
-int 
+int
 ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, 
+  ACE_ERROR_RETURN ((LM_ERROR,
 		     "threads or ACE_HAS_TOKENS_LIBRARY not supported on this platform\n"), -1);
 }
 #endif /* ACE_HAS_THREADS && ACE_HAS_TOKENS_LIBRARY */
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 21128fa0dab..6e90646b786 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -228,9 +228,9 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 
           int remainder = length - retrieved;
 
-          int secondtry = ACE_OS::recv (handle,
-                                        ((char *) &log_record) + retrieved,
-                                        remainder);
+          ssize_t secondtry = ACE_OS::recv (handle,
+                                            ((char *) &log_record) + retrieved,
+                                            remainder);
           if (secondtry != remainder)
             {
               ACE_ERROR ((LM_ERROR,
@@ -553,10 +553,3 @@ ACE_Client_Logging_Acceptor::resume (void)
 
 ACE_SVC_FACTORY_DEFINE (ACE_Client_Logging_Acceptor)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<ACE_Client_Logging_Handler, LOGGING_ACCEPTOR>;
-template class ACE_Svc_Handler<LOGGING_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<ACE_Client_Logging_Handler, LOGGING_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<LOGGING_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 8dc5e4ef65b..40c1899a67f 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -14,28 +14,10 @@ ACE_RCSID(lib,
           Name_Handler,
           "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Accept_Strategy<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<ACE_Name_Handler>;
-template class ACE_Creation_Strategy<ACE_Name_Handler>;
-template class ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler>;
-template class ACE_Scheduling_Strategy<ACE_Name_Handler>;
-template class ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Accept_Strategy<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<ACE_Name_Handler>
-#pragma instantiate ACE_Creation_Strategy<ACE_Name_Handler>
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<ACE_Name_Handler>
-#pragma instantiate ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> *
       ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 // Simple macro that does bitwise AND -- useful in table lookup
 #define ACE_TABLE_MAP(INDEX, MASK) (INDEX & MASK)
diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp
index d8f22a0cbdb..29e10ff4f77 100644
--- a/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/netsvcs/lib/Server_Logging_Handler.cpp
@@ -16,227 +16,7 @@ ACE_RCSID(lib, Server_Logging_Handler, "$Id$")
 ACE_SVC_FACTORY_DEFINE (ACE_Server_Logging_Acceptor)
 ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Log_Message_Receiver_Impl<ACE_NULL_SYNCH>;
-#if defined (ACE_HAS_THREADS)
-#if !defined (ACE_HAS_MACOSX_DYLIB)
-template class Static_Log_Message_Receiver<ACE_NULL_SYNCH>;
-#endif
-template class ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Creation_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Scheduling_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Strategy_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver,
-                                             Null_Synch_Static_Receiver,
-                                             ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >;
-template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>;
-template class ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>;
-#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  template class Base_Optimizer<Null_Synch_Static_Receiver, ACE_CString>;
-  template class Base_Optimizer<Null_Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >;
-#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-#endif /* ACE_HAS_THREADS */
-
-#if !defined (ACE_HAS_MACOSX_DYLIB)
-template class Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>;
-#endif
-template class Log_Message_Receiver<ACE_LOGGER_SYNCH>;
-template class ACE_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-
-template class ACE_Accept_Strategy<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-
-template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
-template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Receiver>;
-template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Receiver>;
-
-template class ACE_Creation_Strategy<Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
-template class ACE_Creation_Strategy<Synch_Logging_Handler_Receiver>;
-template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Receiver>;
-
-template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver>;
-
-template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
-template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver>;
-
-template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Static_Receiver>;
-template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Receiver>;
-template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
-template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Receiver>;
-
-template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-
-template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver,
-                                            Synch_Static_Receiver,
-                                            ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >;
-template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver,
-                                             Synch_Static_Receiver,
-                                             ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >;
-template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver,
-                                             Synch_Receiver,
-                                             ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >;
-template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver,
-                                             Synch_Receiver,
-                                             ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >;
-
-template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>;
-template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>;
-#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  template class Base_Optimizer<Synch_Static_Receiver, ACE_CString>;
-  template class Base_Optimizer<Synch_Receiver, ACE_CString>;
-  template class Base_Optimizer<Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >;
-  template class Base_Optimizer<Synch_Static_Receiver, ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >;
-  template class Base_Optimizer<Synch_Receiver, ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >;
-  template class Base_Optimizer<Synch_Receiver, ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >;
-#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-
-  #if defined (ACE_HAS_THREADS)
-  template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, u_long>;
-  template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>;
-  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>;
-  template class Log_Message_Receiver_Impl<ACE_MT_SYNCH>;
-  template class ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_SYNCH>;
-  #endif /* ACE_HAS_THREADS */
-
-template class ACE_Server_Logging_Handler<Synch_Static_Receiver>;
-template class ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>;
-template class ACE_Server_Logging_Handler<Synch_Receiver>;
-template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>;
-
-  #if defined (ACE_HAS_TLI)
-  // NOTE: The following line is not used with the #if 1 // !defined
-  // (ACE_HAS_TLI) override in Server_Logging_Handler_T.h:
-  //    template class ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_NULL_SYNCH>;
-  // else if ! ACE_HAS_TLI, LOGGING_PEER_STREAM is ACE_SOCK_STREAM,
-  // and the specialization would be
-  //   template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-  // That specialization is in TS_Server_Handler.cpp, so we don't need it
-  // here.
-  #endif /* ACE_HAS_TLI */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Log_Message_Receiver_Impl<ACE_NULL_SYNCH>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate Static_Log_Message_Receiver<ACE_NULL_SYNCH>
-#pragma instantiate ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<Null_Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Creation_Strategy<Null_Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Scheduling_Strategy<Null_Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Strategy_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver, \
-                                             Null_Synch_Static_Receiver, \
-                                             ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >
-#pragma instantiate ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>
-#pragma instantiate ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>
-#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  #pragma instantiate Base_Optimizer<Null_Synch_Static_Receiver, ACE_CString>
-  #pragma instantiate Base_Optimizer<Null_Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >
-#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-#endif /* ACE_HAS_THREADS */
-
-#pragma instantiate Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>
-#pragma instantiate Log_Message_Receiver<ACE_LOGGER_SYNCH>
-#pragma instantiate ACE_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-
-#pragma instantiate ACE_Accept_Strategy<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-
-#pragma instantiate ACE_Concurrency_Strategy<Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Concurrency_Strategy<Synch_Logging_Handler_Receiver>
-#pragma instantiate ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Receiver>
-
-#pragma instantiate ACE_Creation_Strategy<Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Creation_Strategy<Synch_Logging_Handler_Receiver>
-#pragma instantiate ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Receiver>
-
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver>
-
-#pragma instantiate ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver>
-
-#pragma instantiate ACE_Scheduling_Strategy<Synch_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Scheduling_Strategy<Synch_Logging_Handler_Receiver>
-#pragma instantiate ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>
-#pragma instantiate ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Receiver>
-
-#pragma instantiate ACE_Strategy_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>
-
-#pragma instantiate ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver, \
-                                            Synch_Static_Receiver, \
-                                            ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >
-#pragma instantiate ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver, \
-                                             Synch_Static_Receiver, \
-                                             ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >
-#pragma instantiate ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver, \
-                                             Synch_Receiver, \
-                                             ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >
-#pragma instantiate ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver, \
-                                             Synch_Receiver, \
-                                             ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >
-
-#pragma instantiate ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>
-#pragma instantiate ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>
-#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  #pragma instantiate Base_Optimizer<Synch_Static_Receiver, ACE_CString>
-  #pragma instantiate Base_Optimizer<Synch_Receiver, ACE_CString>
-  #pragma instantiate Base_Optimizer<Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >
-  #pragma instantiate Base_Optimizer<Synch_Static_Receiver, ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >
-  #pragma instantiate Base_Optimizer<Synch_Receiver, ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >
-  #pragma instantiate Base_Optimizer<Synch_Receiver, ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >
-#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-
-  #if defined (ACE_HAS_THREADS)
-  #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, u_long>
-  #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, u_long>
-  #pragma instantiate ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>
-  #pragma instantiate ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>
-  #pragma instantiate Log_Message_Receiver_Impl<ACE_MT_SYNCH>
-  #pragma instantiate ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_SYNCH>
-  #endif /* ACE_HAS_THREADS */
-
-#pragma instantiate ACE_Server_Logging_Handler<Synch_Static_Receiver>
-#pragma instantiate ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>
-#pragma instantiate ACE_Server_Logging_Handler<Synch_Receiver>
-#pragma instantiate ACE_Thr_Server_Logging_Handler<Synch_Receiver>
-
-  #if defined (ACE_HAS_TLI)
-  // NOTE: The following line is not used with the #if 1 // !defined
-  // (ACE_HAS_TLI) override in Server_Logging_Handler_T.h:
-  //   #pragma instantiate ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_NULL_SYNCH>
-  // else if ! ACE_HAS_TLI, LOGGING_PEER_STREAM is ACE_SOCK_STREAM,
-  // and the specialization would be
-  //   #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-  // That specialization is in TS_Server_Handler.cpp, so we don't need it
-  // here.
-  #endif /* ACE_HAS_TLI */
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM,
                                       u_long,
                                       ACE_NULL_SYNCH,
@@ -245,6 +25,6 @@ template ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM,
                                u_long,
                                ACE_NULL_SYNCH,
                                Null_Synch_Static_Receiver>::request_count_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 #endif /* ACE_SERVER_LOGGING_HANDLER_C */
 
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 2f1569c531b..572c56af965 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -42,7 +42,7 @@ ACE_TS_Clerk_Handler::state (void)
 
 // Sets the timeout delay.
 void
-ACE_TS_Clerk_Handler::timeout (int to)
+ACE_TS_Clerk_Handler::timeout (long to)
 {
   ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
   if (to > this->max_timeout_)
@@ -54,11 +54,11 @@ ACE_TS_Clerk_Handler::timeout (int to)
 // Recalculate the current retry timeout delay using exponential
 // backoff.  Returns the original timeout (i.e., before the
 // recalculation).
-int
+long
 ACE_TS_Clerk_Handler::timeout (void)
 {
   ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
-  int old_timeout = this->timeout_;
+  long old_timeout = this->timeout_;
   this->timeout_ *= 2;
 
   if (this->timeout_ > this->max_timeout_)
@@ -77,14 +77,14 @@ ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 
 // Set the max timeout delay.
 void
-ACE_TS_Clerk_Handler::max_timeout (int mto)
+ACE_TS_Clerk_Handler::max_timeout (long mto)
 {
   ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
   this->max_timeout_ = mto;
 }
 
 // Gets the max timeout delay.
-int
+long
 ACE_TS_Clerk_Handler::max_timeout (void)
 {
   ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
@@ -165,8 +165,9 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void)
                   ACE_TEXT ("(%t) Scheduling reinitiation of connection\n")));
 
       // Reschedule ourselves to try and connect again.
+      ACE_Time_Value const timeout (this->timeout ());
       if (ACE_Reactor::instance ()->schedule_timer (this, 0,
-                                                    this->timeout ()) == -1)
+                                                    timeout) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                            ACE_TEXT ("schedule_timer")), -1);
     }
@@ -529,9 +530,10 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
           // Reschedule ourselves to try and connect again.
           if (synch_options[ACE_Synch_Options::USE_REACTOR])
             {
+              ACE_Time_Value const handler_timeout (handler->timeout ());
               if (ACE_Reactor::instance ()->schedule_timer (handler,
                                                             0,
-                                                            handler->timeout ()) == -1)
+                                                            handler_timeout) == -1)
                 ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                                    ACE_TEXT ("schedule_timer")), -1);
             }
@@ -626,18 +628,3 @@ ACE_TS_Clerk_Processor::resume (void)
 
 ACE_SVC_FACTORY_DEFINE (ACE_TS_Clerk_Processor)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<ACE_TS_Clerk_Handler>;
-template class ACE_Connector<ACE_TS_Clerk_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Node<ACE_TS_Clerk_Handler *>;
-template class ACE_NonBlocking_Connect_Handler<ACE_TS_Clerk_Handler>;
-template class ACE_Unbounded_Set<ACE_TS_Clerk_Handler *>;
-template class ACE_Unbounded_Set_Iterator<ACE_TS_Clerk_Handler *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<ACE_TS_Clerk_Handler>
-#pragma instantiate ACE_Connector<ACE_TS_Clerk_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Node<ACE_TS_Clerk_Handler *>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<ACE_TS_Clerk_Handler>
-#pragma instantiate ACE_Unbounded_Set<ACE_TS_Clerk_Handler *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_TS_Clerk_Handler *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index cfa92bcfc97..b322e82eef8 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -86,12 +86,12 @@ public:
   void state (State);
 
   // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
+  long timeout (void);
+  void timeout (long);
 
   // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
+  long max_timeout (void);
+  void max_timeout (long);
 
   /// Activate this instance of the <ACE_TS_Clerk_Handler>
   /// (called by the <ACE_TS_Clerk_Processor>).
@@ -145,10 +145,10 @@ private:
   State state_;
 
   /// Amount of time to wait between reconnection attempts
-  int timeout_;
+  long timeout_;
 
   /// Maximum amount of time to wait between reconnection attempts
-  int max_timeout_;
+  long max_timeout_;
 
   /// Remote Addr used for connecting to the server
   ACE_INET_Addr remote_addr_;
@@ -241,7 +241,7 @@ private:
   long timer_id_;
 
   /// Time period for updating system time
-  int timeout_;
+  long timeout_;
 
   /// Pool name for backing store
   ACE_TCHAR poolname_[MAXNAMLEN + 1];
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index 192ed50efc2..9e7cd78ea4c 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -11,32 +11,6 @@
 
 ACE_RCSID(lib, TS_Server_Handler, "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Accept_Strategy<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<ACE_TS_Server_Handler>;
-template class ACE_Creation_Strategy<ACE_TS_Server_Handler>;
-template class ACE_Schedule_All_Reactive_Strategy<ACE_TS_Server_Handler>;
-template class ACE_Scheduling_Strategy<ACE_TS_Server_Handler>;
-template class ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
-#if defined (ACE_HAS_STREAM_PIPES)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-// #else the instantiation in is Client_Logging_Handler.cpp
-#endif /* ACE_HAS_STREAM_PIPES */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Accept_Strategy<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<ACE_TS_Server_Handler>
-#pragma instantiate ACE_Creation_Strategy<ACE_TS_Server_Handler>
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<ACE_TS_Server_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<ACE_TS_Server_Handler>
-#pragma instantiate ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>
-#if defined (ACE_HAS_STREAM_PIPES)
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-// #else the instantiation in is Client_Logging_Handler.cpp
-#endif /* ACE_HAS_STREAM_PIPES */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 int
 ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
@@ -136,7 +110,7 @@ ACE_TS_Server_Handler::open (void *)
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("get_remote_addr")),
                       -1);
-  
+
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) accepted connection from host %s on fd %d\n"),
               client_addr.get_host_name (),
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index 043c0772fec..885ec72d52a 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -14,33 +14,14 @@ ACE_RCSID (lib,
            Token_Handler,
            "$Id$")
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<ACE_Token_Handler>;
-template class ACE_Creation_Strategy<ACE_Token_Handler>;
-template class ACE_Schedule_All_Reactive_Strategy<ACE_Token_Handler>;
-template class ACE_Scheduling_Strategy<ACE_Token_Handler>;
-template class ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<ACE_Token_Handler>
-#pragma instantiate ACE_Creation_Strategy<ACE_Token_Handler>
-#pragma instantiate ACE_Schedule_All_Reactive_Strategy<ACE_Token_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<ACE_Token_Handler>
-#pragma instantiate ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 int
-ACE_Token_Acceptor::parse_args (int argc, char *argv[])
+ACE_Token_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Token_Acceptor::parse_args");
 
   u_short svc_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open ("Token Service");
+  ACE_LOG_MSG->open (ACE_TEXT ("Token Service"));
 
   ACE_Get_Arg_Opt get_opt (argc, argv, "p:", 0);
 
@@ -53,8 +34,8 @@ ACE_Token_Acceptor::parse_args (int argc, char *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "%n:\n[-p server-port]\n%a", 1),
-                           -1);
+                             ACE_TEXT ("%n:\n[-p server-port]\n"), 1),
+                            -1);
         }
     }
 
@@ -63,7 +44,7 @@ ACE_Token_Acceptor::parse_args (int argc, char *argv[])
 }
 
 int
-ACE_Token_Acceptor::init (int argc, char *argv[])
+ACE_Token_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Token_Acceptor::init");
 
@@ -76,9 +57,10 @@ ACE_Token_Acceptor::init (int argc, char *argv[])
   if (this->open (this->service_addr_, ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy_,
-                  "Token Server", "ACE token service") == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%n: %p on port %d\n",
-                       "acceptor::open failed",
+                  ACE_TEXT ("Token Server"),
+                  ACE_TEXT ("ACE token service")) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%n: %p on port %d\n"),
+                       ACE_TEXT ("acceptor::open failed"),
                        this->service_addr_.get_port_number ()), -1);
 
   // Ignore SIGPIPE so that each <SVC_HANDLER> can handle this on its
@@ -89,12 +71,13 @@ ACE_Token_Acceptor::init (int argc, char *argv[])
   ACE_INET_Addr server_addr;
 
   if (this->acceptor ().get_local_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
+    ACE_ERROR_RETURN
+      ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get_remote_addr")), -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting up Token Server at port %d on handle %d\n",
-             server_addr.get_port_number (),
-             this->acceptor ().get_handle ()));
+              ACE_TEXT ("starting up Token Server at port %d on handle %d\n"),
+              server_addr.get_port_number (),
+              this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -132,8 +115,8 @@ ACE_Token_Handler::send_reply (ACE_UINT32 err)
 
   if (n != (ssize_t) len)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p, expected len = %d, actual len = %d\n",
-                      "send failed", len, n), -1);
+                       ACE_TEXT ("%p, expected len = %d, actual len = %d\n"),
+                       ACE_TEXT ("send failed"), len, n), -1);
   else
     return 0;
 }
@@ -169,7 +152,8 @@ ACE_Token_Handler::acquire (ACE_Token_Proxy *proxy)
             (this, (void *) proxy, request_options_.timeout ());
           if (timeout_id_ == -1)
             {
-              ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
+              ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                          ACE_TEXT ("schedule_timer")));
               return this->send_reply (errno);
             }
         }
@@ -255,7 +239,8 @@ ACE_Token_Handler::renew (ACE_Token_Proxy *proxy)
             (this, 0, request_options_.timeout ());
           if (timeout_id_ == -1)
             {
-              ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
+              ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                          ACE_TEXT ("schedule_timer")));
               return this->send_reply (ACE_LOG_MSG->errnum ());
             }
         }
@@ -276,7 +261,9 @@ ACE_Token_Handler::remove (ACE_Token_Proxy * /* proxy */)
   ACE_DEBUG ((LM_DEBUG, "in remove for client id = %s\n",
              proxy->client_id ()));
 #endif /* 0 */
-  ACE_ERROR ((LM_ERROR, "sorry: ACE_Token_Handler::remove() is not implemented"));
+  ACE_ERROR
+    ((LM_ERROR,
+      ACE_TEXT ("sorry: ACE_Token_Handler::remove() is not implemented")));
 
   return this->send_reply (ENOTSUP);
 }
@@ -329,14 +316,14 @@ ACE_Token_Handler::get_proxy (void)
 
       // Put the new_proxy in this client_id's collection.
       if (collection_.insert (*proxy) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "insert failed\n"), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("insert failed\n")), 0);
 
       // Delete our copy (one was created in the collection).
       delete proxy;
       proxy = collection_.is_member (token_request_.token_name ());
 
       if (proxy == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "is_member failed\n"), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("is_member failed\n")), 0);
 
       // Set the client_id (it was set to 1 since we're
       // single-threaded.
@@ -406,7 +393,7 @@ ACE_Token_Handler::dispatch (void)
     case ACE_Token_Request::REMOVE:
       return this->remove (proxy);
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "invalid type = %d\n",
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("invalid type = %d\n"),
                         this->token_request_.operation_type ()), -1);
       /* NOTREACHED */
     }
@@ -432,8 +419,8 @@ ACE_Token_Handler::recv_request (void)
     case -1:
       /* FALLTHROUGH */
     default:
-      ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n",
-                 "recv failed", n, sizeof (ACE_UINT32)));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
+                  ACE_TEXT ("recv failed"), n, sizeof (ACE_UINT32)));
       /* FALLTHROUGH */
     case 0:
       // We've shutdown unexpectedly, let's abandon the connection.
@@ -448,7 +435,7 @@ ACE_Token_Handler::recv_request (void)
         // Do a sanity check on the length of the message.
         if (length > (ssize_t) sizeof this->token_request_)
           {
-            ACE_ERROR ((LM_ERROR, "length %d too long\n", length));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("length %d too long\n"), length));
             return this->abandon (1);
           }
 
@@ -461,15 +448,16 @@ ACE_Token_Handler::recv_request (void)
         // Subtract off the size of the part we skipped over...
         if (n != (length - (ssize_t) sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n",
-                       "invalid length", length, n));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"),
+                        ACE_TEXT ("invalid length"), length, n));
             return this->abandon (1);
           }
 
         // Decode the request into host byte order.
         if (this->token_request_.decode () == -1)
           {
-            ACE_ERROR ((LM_ERROR, "%p\n", "decode failed"));
+            ACE_ERROR
+              ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")));
             return this->abandon (1);
           }
 
@@ -545,7 +533,7 @@ ACE_Token_Handler::abandon (int send_error)
 // ************************************************************
 // ************************************************************
 
-ACE_TS_Mutex::ACE_TS_Mutex (const char *name,
+ACE_TS_Mutex::ACE_TS_Mutex (const ACE_TCHAR *name,
                             ACE_Token_Handler *th)
 : ACE_Local_Mutex (name, 0, 1), // The 1 is debug.
   th_ (th)
@@ -589,7 +577,7 @@ ACE_TS_Mutex::clone (void) const
 
 // ************************************************************
 
-ACE_TS_RLock::ACE_TS_RLock (const char *name,
+ACE_TS_RLock::ACE_TS_RLock (const ACE_TCHAR *name,
                             ACE_Token_Handler *th)
 : ACE_Local_RLock (name, 0, 1), // The 1 is debug.
   th_ (th)
@@ -634,7 +622,7 @@ ACE_TS_RLock::clone (void) const
 
 // ************************************************************
 
-ACE_TS_WLock::ACE_TS_WLock (const char *name,
+ACE_TS_WLock::ACE_TS_WLock (const ACE_TCHAR *name,
                             ACE_Token_Handler *th)
 : ACE_Local_WLock (name, 0, 1), // The 1 is debug.
   th_ (th)
diff --git a/netsvcs/lib/Token_Handler.h b/netsvcs/lib/Token_Handler.h
index 1cbb6b3d2ef..519965be182 100644
--- a/netsvcs/lib/Token_Handler.h
+++ b/netsvcs/lib/Token_Handler.h
@@ -162,7 +162,7 @@ class ACE_TS_Mutex : public ACE_Local_Mutex
 
 public:
   /// Creation.
-  ACE_TS_Mutex (const char *name,
+  ACE_TS_Mutex (const ACE_TCHAR *name,
                 ACE_Token_Handler *th);
 
 protected:
@@ -197,7 +197,7 @@ class ACE_TS_RLock : public ACE_Local_RLock
 {
 public:
   /// Creation.
-  ACE_TS_RLock (const char *name,
+  ACE_TS_RLock (const ACE_TCHAR *name,
                 ACE_Token_Handler *th);
 
 protected:
@@ -232,7 +232,7 @@ class ACE_TS_WLock : public ACE_Local_WLock
 {
 public:
   /// Creation.
-  ACE_TS_WLock (const char *name,
+  ACE_TS_WLock (const ACE_TCHAR *name,
                 ACE_Token_Handler *th);
 
 protected:
@@ -268,10 +268,10 @@ class ACE_Token_Acceptor : public ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_S
 {
 public:
   /// Dynamic linking hook.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Parse svc.conf arguments.
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
   /// The scheduling strategy is designed for Reactive services.
diff --git a/netsvcs/lib/lib.mpc b/netsvcs/lib/lib.mpc
index ff262f00ff2..d1e2f34a9fa 100644
--- a/netsvcs/lib/lib.mpc
+++ b/netsvcs/lib/lib.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(netsvcs): acelib {
+  avoids       += ace_for_tao
   sharedname    = netsvcs
   dynamicflags += ACE_NETSVCS_BUILD_DLL
   Source_Files {
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index b134b8db7c7..6707845c5d3 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           ACE_TCHAR *l_argv[3];
           ACE_TCHAR name_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_NAME_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_NAME_SERVER_PORT_STR);
 
           l_argv[0] = name_port;
           l_argv[1] = 0;
@@ -54,7 +54,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               1);
 
           ACE_TCHAR time_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TIME_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_TIME_SERVER_PORT_STR);
           l_argv[0] = time_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
@@ -79,7 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
           ACE_TCHAR token_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_TOKEN_SERVER_PORT_STR);
           l_argv[0] = token_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
@@ -92,7 +92,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
           ACE_TCHAR thr_logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR);
           l_argv[0] = thr_logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_5 =
@@ -105,7 +105,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               1);
 
           ACE_TCHAR logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_LOGGING_SERVER_PORT_STR);
           l_argv[0] = logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_6 =
diff --git a/netsvcs/servers/servers.mpc b/netsvcs/servers/servers.mpc
index 7ceba68ce63..7cbbee9e5b2 100644
--- a/netsvcs/servers/servers.mpc
+++ b/netsvcs/servers/servers.mpc
@@ -2,9 +2,10 @@
 // $Id$
 
 project(Netsvcs_server) : aceexe {
-  exename = main
-  libs    += netsvcs
-  after   += netsvcs
+  avoids   += ace_for_tao
+  exename  = main
+  libs     += netsvcs
+  after    += netsvcs
   includes += $(ACE_ROOT)/netsvcs/lib
   Source_Files {
     main.cpp
diff --git a/netsvcs/servers/svc.conf b/netsvcs/servers/svc.conf
index d3fb7c95f58..94462ea04b0 100644
--- a/netsvcs/servers/svc.conf
+++ b/netsvcs/servers/svc.conf
@@ -10,7 +10,7 @@
 
 dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-w -s foobar -f STDERR|OSTREAM|VERBOSE"
 dynamic Time_Service Service_Object * netsvcs:_make_ACE_TS_Server_Acceptor() "-p 20222"
-dynamic Name_Server Service_Object * netsvcs:_make_ACE_Name_Acceptor() "-p 20012"
+dynamic Name_Server Service_Object * netsvcs:_make_ACE_Name_Acceptor() "-p 20006"
 # This service is disabled by default -- only enable it ACE is compiled with ACE_HAS_TOKENS_LIBRARY.
 # dynamic Token_Service Service_Object * netsvcs:_make_ACE_Token_Acceptor() "-p 20202"
 dynamic Server_Logging_Service Service_Object * netsvcs:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
diff --git a/netsvcs/servers/svc.conf.xml b/netsvcs/servers/svc.conf.xml
index 6657e500089..3519594ce5c 100644
--- a/netsvcs/servers/svc.conf.xml
+++ b/netsvcs/servers/svc.conf.xml
@@ -16,7 +16,7 @@
    <initializer path="netsvcs" init="_make_ACE_TS_Server_Acceptor" params="-p 20222"/>
  </dynamic>
  <dynamic id="Name_Server" type="Service_Object">
-   <initializer path="netsvcs" init="_make_ACE_Name_Acceptor" params="-p 20012"/>
+   <initializer path="netsvcs" init="_make_ACE_Name_Acceptor" params="-p 20006"/>
  </dynamic>
  <!--  This service is disabled by default -- only enable it ACE is compiled with ACE_HAS_TOKENS_LIBRARY. -->
  <!--  dynamic Token_Service Service_Object * netsvcs:_make_ACE_Token_Acceptor() "-p 20202" -->
diff --git a/performance-tests/Misc/Misc.mpc b/performance-tests/Misc/Misc.mpc
index 5c2aa3ec7d5..3bffd12d021 100644
--- a/performance-tests/Misc/Misc.mpc
+++ b/performance-tests/Misc/Misc.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*basic_perf) : aceexe {
+  avoids += ace_for_tao
   exename = basic_perf
   Source_Files {
     basic_func.cpp
@@ -10,6 +11,7 @@ project(*basic_perf) : aceexe {
 }
 
 project(*childbirth_time) : aceexe {
+  avoids += ace_for_tao
   exename = childbirth_time
   Source_Files {
     childbirth_time.cpp
@@ -17,6 +19,7 @@ project(*childbirth_time) : aceexe {
 }
 
 project(*context_switch_time) : aceexe {
+  avoids += ace_for_tao
   exename = context_switch_time
   Source_Files {
     context_switch_time.cpp
@@ -24,6 +27,7 @@ project(*context_switch_time) : aceexe {
 }
 
 project(*test_mutex) : aceexe {
+  avoids += ace_for_tao
   exename = test_mutex
   Source_Files {
     test_mutex.cpp
@@ -31,6 +35,7 @@ project(*test_mutex) : aceexe {
 }
 
 project(*test_naming) : aceexe {
+  avoids += ace_for_tao
   exename = test_naming
   Source_Files {
     test_naming.cpp
@@ -38,6 +43,7 @@ project(*test_naming) : aceexe {
 }
 
 project(*test_singleton) : aceexe {
+  avoids += ace_for_tao
   exename = test_singleton
   Source_Files {
     test_singleton.cpp
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index 8707bce198e..b497ab004d1 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -75,9 +75,9 @@ ACE_RCSID(Misc, childbirth_time, "$Id$")
 
 #define MAX_NO_ITERATION  10000
 #if defined (ACE_WIN32)
-#define SUBPROGRAM "date.exe"
+#define SUBPROGRAM ACE_TEXT ("date.exe")
 #else
-#define SUBPROGRAM "date"
+#define SUBPROGRAM ACE_TEXT ("date")
 #endif
 
 size_t MULTIPLY_FACTOR = 10;
diff --git a/performance-tests/Misc/test_singleton.cpp b/performance-tests/Misc/test_singleton.cpp
index b888f21d276..68d01388766 100644
--- a/performance-tests/Misc/test_singleton.cpp
+++ b/performance-tests/Misc/test_singleton.cpp
@@ -163,14 +163,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX>
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX> *
   ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 
 #else
diff --git a/performance-tests/SCTP/SCTP.mpc b/performance-tests/SCTP/SCTP.mpc
index 91e7b815f4d..cba52013c32 100644
--- a/performance-tests/SCTP/SCTP.mpc
+++ b/performance-tests/SCTP/SCTP.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*SOCK_STREAM_clt) : aceexe {
+  avoids += ace_for_tao
   exename = SOCK_STREAM_clt
   source_files {
     SOCK_STREAM_clt.cpp
@@ -26,6 +27,7 @@ project(*SOCK_STREAM_srv) : aceexe {
 }
 
 project(*SOCK_SEQPACK_clt) : aceexe {
+  avoids += ace_for_tao
   exename = SOCK_SEQPACK_clt
   source_files {
     SOCK_SEQPACK_clt.cpp
@@ -42,6 +44,7 @@ project(*SOCK_SEQPACK_clt) : aceexe {
 }
 
 project(*SOCK_SEQPACK_srv) : aceexe {
+  avoids += ace_for_tao
   exename = SOCK_SEQPACK_srv
   source_files {
     SOCK_SEQPACK_srv.cpp
@@ -50,6 +53,7 @@ project(*SOCK_SEQPACK_srv) : aceexe {
 }
 
 project(*SOCK_SEQPACK_Association_Test) : aceexe {
+  avoids += ace_for_tao
   exename = SOCK_SEQPACK_Association_Test
   source_files {
     SOCK_SEQPACK_Association_Test.cpp
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
index d4a5ce02924..90e800b468a 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
+++ b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = leader_follower
   source_files {
     leader_follower.cpp
@@ -9,6 +10,7 @@ project : aceexe {
 }
 
 project(*RT_CORBA) : aceexe {
+  avoids += ace_for_tao
   exename = RT_CORBA_Leader_Follower
   source_files {
     RT_CORBA_Leader_Follower.cpp
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 239fc1f622e..098407be216 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -555,7 +555,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
      "(%P|%t) Throughput is [%f] \n",
-     elapsed_time_per_invocation)); 
+     elapsed_time_per_invocation));
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Throughput is [%f] \n",
@@ -574,18 +574,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #else /*ACE_HAS_THREADS*/
 
 int
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
index d916bb820ac..12566016d17 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = workers
   source_files {
     workers.cpp
@@ -9,6 +10,7 @@ project : aceexe {
 }
 
 project(*RTCorba) : aceexe {
+  avoids += ace_for_tao
   exename = RT_CORBA_Workers
   source_files {
     RT_CORBA_Workers.cpp
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 83a75a2fd52..c6ad34f828d 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -412,14 +412,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return result;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
index 3f34fc753a9..5e056bcf881 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
@@ -2,8 +2,9 @@
 // $Id$
 
 project : acelib {
+  avoids   += ace_for_tao
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
   includes += ..
-}
\ No newline at end of file
+}
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index 307f093c4fa..162f60943f6 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -202,46 +202,4 @@ typedef Baseline_Lock_Test<ACE_Token> Baseline_Token_Test;
 ACE_SVC_FACTORY_DECLARE (Baseline_Token_Test)
 ACE_SVC_FACTORY_DEFINE (Baseline_Token_Test)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Baseline_Lock_Test<ACE_Thread_Mutex>;
-template class Baseline_Lock_Test<ACE_Process_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Process_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Thread_Mutex>;
-template class Baseline_Lock_Test<ACE_Null_Mutex>;
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> >;
-template class Baseline_Lock_Test<ACE_Recursive_Thread_Mutex>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> >;
-template class ACE_Lock_Adapter<ACE_RW_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> >;
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> >;
-template class Baseline_Lock_Test<ACE_Semaphore>;
-template class Baseline_Lock_Test<ACE_Process_Semaphore>;
-template class Baseline_Lock_Test<ACE_Null_Semaphore>;
-template class Baseline_Lock_Test<ACE_Token>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Baseline_Lock_Test<ACE_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_Process_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Process_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_Null_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> >
-#pragma instantiate Baseline_Lock_Test<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> >
-#pragma instantiate ACE_Lock_Adapter<ACE_RW_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> >
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> >
-#pragma instantiate Baseline_Lock_Test<ACE_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Process_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Null_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Token>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif  /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index f62eed366c7..9a5dfdf354f 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -467,15 +467,3 @@ Performance_Test_Options::print_results (void)
 }
 #endif /* ACE_HAS_THREADS */
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>;
-#endif /* ACE_MT_SAFE */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>
-#endif /* ACE_MT_SAFE */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
index 3f34fc753a9..1c6fd932a6b 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : acelib {
+  avoids   += ace_for_tao
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
index 4a72ec2ac90..d438e9ac3f4 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
@@ -29,9 +29,4 @@ Adaptive_Mutex_Test::init (int, ACE_TCHAR *[])
 ACE_SVC_FACTORY_DECLARE (Adaptive_Mutex_Test)
 ACE_SVC_FACTORY_DEFINE  (Adaptive_Mutex_Test)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
index a439127e9c4..cc49bf1b698 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
@@ -30,9 +30,4 @@ Adaptive_Recursive_Lock_Test::init (int, ACE_TCHAR *[])
 ACE_SVC_FACTORY_DECLARE (Adaptive_Recursive_Lock_Test)
 ACE_SVC_FACTORY_DEFINE  (Adaptive_Recursive_Lock_Test)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
index 605d4ffb338..2644aef7415 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
@@ -35,9 +35,4 @@ Adaptive_Sema_Test::init (int, ACE_TCHAR *[])
 ACE_SVC_FACTORY_DECLARE (Adaptive_Sema_Test)
 ACE_SVC_FACTORY_DEFINE  (Adaptive_Sema_Test)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_Semaphore>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Lock_Adapter<ACE_Semaphore>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
index 720e5fb8b29..48c2ec20cd0 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp
@@ -91,15 +91,5 @@ Thr_ID::thr_id (int i)
   this->thr_id_ = i;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_TSS<Thr_ID>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_TSS<Thr_ID>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_PTHREADS || ACE_HAS_DCETHREADS || VXWORKS */
 #endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/TCP/TCP.mpc b/performance-tests/TCP/TCP.mpc
index e2244fe35a3..09cb362e007 100644
--- a/performance-tests/TCP/TCP.mpc
+++ b/performance-tests/TCP/TCP.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = tcp_test
 }
diff --git a/performance-tests/UDP/UDP.mpc b/performance-tests/UDP/UDP.mpc
index 355aba0d9db..19928979e7b 100644
--- a/performance-tests/UDP/UDP.mpc
+++ b/performance-tests/UDP/UDP.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  avoids += ace_for_tao
   exename = udp_test
   verbatim(gnuace, local) {
     LDLIBS += $(MATHLIB)
diff --git a/protocols/ace/HTBP/HTBP.mpc b/protocols/ace/HTBP/HTBP.mpc
index 873b59ecaae..ada3fc8530d 100644
--- a/protocols/ace/HTBP/HTBP.mpc
+++ b/protocols/ace/HTBP/HTBP.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(HTBP) : acelib, core {
+  avoids      += ace_for_tao
   sharedname   = ACE_HTBP
   dynamicflags = HTBP_BUILD_DLL
 
diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp
index b44e2f0711a..1ee03ce991d 100644
--- a/protocols/ace/HTBP/HTBP_Addr.cpp
+++ b/protocols/ace/HTBP/HTBP_Addr.cpp
@@ -7,8 +7,10 @@ ACE_RCSID (HTBP,
            ACE_HTBP_Addr,
            "$Id$")
 
-  // Constructor
-  ACE::HTBP::Addr::Addr ()
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Constructor
+ACE::HTBP::Addr::Addr ()
 {
 }
 
@@ -87,3 +89,5 @@ ACE::HTBP::Addr::string_to_addr (const char address[])
     //  this->htid_ = address;
     //  return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Addr.h b/protocols/ace/HTBP/HTBP_Addr.h
index 3cbbaa397f7..14241b3c3b6 100644
--- a/protocols/ace/HTBP/HTBP_Addr.h
+++ b/protocols/ace/HTBP/HTBP_Addr.h
@@ -24,6 +24,8 @@
 #include "ace/Synch.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -83,5 +85,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_ADDR_H */
diff --git a/protocols/ace/HTBP/HTBP_Channel.cpp b/protocols/ace/HTBP/HTBP_Channel.cpp
index 10bbd507206..064312377ba 100644
--- a/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -22,6 +22,8 @@
 #include "ace/Reactor.h"
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initialization and termination methods.
 /// Constructor.
 ACE::HTBP::Channel::Channel (ACE::HTBP::Session *s)
@@ -531,3 +533,5 @@ ACE::HTBP::Channel::get_filter ()
   int inside = (this->session_ != 0);
   return factory->get_filter (inside);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Channel.h b/protocols/ace/HTBP/HTBP_Channel.h
index 3109ed656eb..b33d446e40b 100644
--- a/protocols/ace/HTBP/HTBP_Channel.h
+++ b/protocols/ace/HTBP/HTBP_Channel.h
@@ -26,6 +26,7 @@
 #include "HTBP_Filter.h"
 #include "HTBP_Notifier.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -269,6 +270,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Channel.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Channel.inl b/protocols/ace/HTBP/HTBP_Channel.inl
index 70fc4834842..7df1ba8f16e 100644
--- a/protocols/ace/HTBP/HTBP_Channel.inl
+++ b/protocols/ace/HTBP/HTBP_Channel.inl
@@ -1,8 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE::HTBP::Channel.i
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Session *
@@ -120,3 +120,5 @@ ACE::HTBP::Channel::set_handle (ACE_HANDLE h)
     return;
   this->ace_stream_.set_handle (h);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Environment.cpp b/protocols/ace/HTBP/HTBP_Environment.cpp
index 60d3b017f17..bd14abcce3d 100644
--- a/protocols/ace/HTBP/HTBP_Environment.cpp
+++ b/protocols/ace/HTBP/HTBP_Environment.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (HTBP,
        	   ACE_HTBP_Environment,
 	   "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Environment::Environment (ACE_Configuration *config,
                                      int using_registry,
                                      const ACE_TCHAR *persistent_file)
@@ -195,3 +197,5 @@ ACE::HTBP::Environment::export_config (const ACE_TCHAR *filename)
 {
   return this->imp_exp_->export_config (filename);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Environment.h b/protocols/ace/HTBP/HTBP_Environment.h
index 2f4cc90a5ac..894a376457a 100644
--- a/protocols/ace/HTBP/HTBP_Environment.h
+++ b/protocols/ace/HTBP/HTBP_Environment.h
@@ -15,6 +15,7 @@
 #include "ace/Configuration_Import_Export.h"
 #include "ace/Singleton.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -103,5 +104,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_ENVIRONMENT_H */
diff --git a/protocols/ace/HTBP/HTBP_Filter.cpp b/protocols/ace/HTBP/HTBP_Filter.cpp
index 2571199ef2d..2ac714b8904 100644
--- a/protocols/ace/HTBP/HTBP_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter.cpp
@@ -1,4 +1,3 @@
-// ACE_HTBP_Filter.cpp
 // $Id$
 
 #include "ace/Log_Msg.h"
@@ -10,7 +9,9 @@
 #include "HTBP_Filter.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Filter,"$ID: $")
+ACE_RCSID(HTBP,ACE_HTBP_Filter,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Filter::Filter (void)
   :http_code_ (0)
@@ -52,3 +53,5 @@ ACE::HTBP::Filter::header_complete (ACE::HTBP::Channel *ch)
     }
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Filter.h b/protocols/ace/HTBP/HTBP_Filter.h
index 9548f377d1b..ebc9ebb895f 100644
--- a/protocols/ace/HTBP/HTBP_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 
 #include "HTBP_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -92,6 +94,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Filter.inl b/protocols/ace/HTBP/HTBP_Filter.inl
index 224b7e02699..c648393daa4 100644
--- a/protocols/ace/HTBP/HTBP_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Filter.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ssize_t
@@ -58,3 +59,5 @@ ACE::HTBP::Filter::http_code (void)
 {
   return this->http_code_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
index 8c42584d143..bd9e9751b6d 100644
--- a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID (ACE_HTBP_Filter_Factory, HTBP, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Filter_Factory::Filter_Factory ()
 {
 }
@@ -39,6 +41,8 @@ ACE::HTBP::Filter_Factory::init (int /* argc */,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (ACE_HTBP_Filter_Factory,
                        ACE_TEXT ("Filter_Factory"),
                        ACE_SVC_OBJ_T,
@@ -50,8 +54,3 @@ ACE_STATIC_SVC_DEFINE (ACE_HTBP_Filter_Factory,
 ACE_FACTORY_NAMESPACE_DEFINE (HTBP, ACE_HTBP_Filter_Factory,
                               ACE::HTBP::Filter_Factory)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Service<ACE::HTBP::Filter_Factory>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<ACE::HTBP::Filter_Factory>
-#endif
diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.h b/protocols/ace/HTBP/HTBP_Filter_Factory.h
index 84f32000664..0681055b679 100644
--- a/protocols/ace/HTBP/HTBP_Filter_Factory.h
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -57,6 +59,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (HTBP, ACE_HTBP_Filter_Factory)
 ACE_FACTORY_DECLARE (HTBP, ACE_HTBP_Filter_Factory)
 
diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
index 1138c7bfe34..85e2931c0ec 100644
--- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
@@ -13,6 +13,8 @@ ACE_RCSID(HTBP,
           ACE_HTBP_ID_Requestor,
           "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_TString ACE::HTBP::ID_Requestor::htid_;
 ACE_SYNCH_MUTEX ACE::HTBP::ID_Requestor::htid_lock_;
 
@@ -63,7 +65,7 @@ ACE::HTBP::ID_Requestor::connect_to_server (ACE_SOCK_Stream *cli_stream)
       host_ = url_.substr(host_start,port_sep - host_start);
     }
 
-  ACE_INET_Addr remote_addr (port_, host_.c_str());
+  ACE_INET_Addr remote_addr (static_cast<u_short> (port_), host_.c_str());
   ACE_SOCK_Connector con;
   if (con.connect (*cli_stream,
                    remote_addr) == -1)
@@ -133,3 +135,5 @@ ACE::HTBP::ID_Requestor::get_HTID ()
     }
   return htid;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.h b/protocols/ace/HTBP/HTBP_ID_Requestor.h
index e6cdd87fb1d..b885f07cae5 100644
--- a/protocols/ace/HTBP/HTBP_ID_Requestor.h
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.h
@@ -13,6 +13,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_SOCK_Stream;
 
@@ -54,5 +56,8 @@ namespace ACE
 
   }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* HTID_REQUESTOR_H */
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index 4a75ac6ffc6..acb019ce2bb 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -12,7 +12,9 @@
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$ID:$")
+ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ssize_t
 ACE::HTBP::Inside_Squid_Filter::send_data_trailer (ACE::HTBP::Channel *ch)
@@ -230,3 +232,5 @@ ACE::HTBP::Inside_Squid_Filter::recv_ack (ACE::HTBP::Channel *ch)
   errno = ch->consume_error () ? EINVAL : EWOULDBLOCK;
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 142607aa49f..e60a682d81f 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 #include "HTBP_Export.h"
 #include "HTBP_Filter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -79,6 +81,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
index d9c4618537e..e8b08950ce6 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Inside_Squid_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Inside_Squid_Filter::~Inside_Squid_Filter (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Notifier.cpp b/protocols/ace/HTBP/HTBP_Notifier.cpp
index 631ea2728b0..70a6df54023 100644
--- a/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -14,6 +14,8 @@
 #include "HTBP_Session.h"
 #include "ace/Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Notifier::Notifier (ACE::HTBP::Channel *s)
   : channel_(s)
 {
@@ -80,3 +82,5 @@ ACE::HTBP::Notifier::get_handle(void) const
 {
   return this->channel_->ace_stream().get_handle();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Notifier.h b/protocols/ace/HTBP/HTBP_Notifier.h
index f0ef01b1f25..0c9dcffa2ed 100644
--- a/protocols/ace/HTBP/HTBP_Notifier.h
+++ b/protocols/ace/HTBP/HTBP_Notifier.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 
 #include "HTBP_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -46,5 +48,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_NOTIFIER_H */
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
index 3c035b8dcde..05e79083794 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
@@ -14,6 +14,8 @@ ACE_RCSID(HTBP,
           ACE_HTBP_Outside_Squid_Filter,
           "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ssize_t
 ACE::HTBP::Outside_Squid_Filter::recv_data_header (ACE::HTBP::Channel *ch)
 {
@@ -190,3 +192,5 @@ ACE::HTBP::Outside_Squid_Filter::recv_ack (ACE::HTBP::Channel *)
 {
   return 1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index 5f0c820fccd..92008c3a8b6 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
@@ -21,6 +21,8 @@
 #include "HTBP_Export.h"
 #include "HTBP_Filter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -74,6 +76,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Outside_Squid_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
index 351c6e53856..e0659ae5e13 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Outside_Squid_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Outside_Squid_Filter::~Outside_Squid_Filter (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp
index ffeaeac68ec..37e7258f3b7 100644
--- a/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/protocols/ace/HTBP/HTBP_Session.cpp
@@ -13,7 +13,9 @@
 #include "HTBP_Session.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Session," $")
+ACE_RCSID(HTBP,HTBP_Session,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_;
 ACE_UINT32 ACE::HTBP::Session::last_session_id_ = 0;
@@ -44,7 +46,7 @@ ACE::HTBP::Session::remove_session (ACE::HTBP::Session *s)
 int
 ACE::HTBP::Session::find_session (const ACE::HTBP::Session_Id_t &sid, ACE::HTBP::Session *&out)
 {
-  ACE::HTBP::Session::Map_Entry *e;
+  ACE::HTBP::Session::Map_Entry *e = 0;
   if (session_map_.find (sid,e) == -1)
     {
       out = 0;
@@ -284,18 +286,4 @@ ACE::HTBP::Session::stream (ACE::HTBP::Stream *s)
   this->stream_ = s;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager_Ex<ACE::HTBP::Session_Id_t, ACE::HTBP::Session*, ACE_Hash<ACE::HTBP::Session_Id_t>,ACE_Equal_To<ACE::HTBP::Session_Id_t>,ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager<ACE::HTBP::Session_Id_t, ACE::HTBP::Session*, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Entry<ACE::HTBP::Session_Id_t, ACE::HTBP::Session*>;
-template class ACE_Hash<ACE::HTBP::Session_Id_t>;
-template class ACE_Equal_To<ACE::HTBP::Session_Id_t>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE::HTBP::Session_Id_t, ACE::HTBP::Session*, ACE_Hash<ACE::HTBP::Session_Id_t>,ACE_Equal_To<ACE::HTBP::Session_Id_t>,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager <ACE::HTBP::Session_Id_t, ACE::HTBP::Session*, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry <ACE::HTBP::Session_Id_t, ACE::HTBP::Session*>
-#pragma instantiate ACE_Hash<ACE::HTBP::Session_Id_t>;
-
-#pragma instantiate ACE_Equal_To<ACE::HTBP::Session_Id_t>
-#endif
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Session.h b/protocols/ace/HTBP/HTBP_Session.h
index 9c162849215..5b46c6e86b3 100644
--- a/protocols/ace/HTBP/HTBP_Session.h
+++ b/protocols/ace/HTBP/HTBP_Session.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 
 #include "HTBP_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_HTBP_Filter;
 class ACE_Event_Handler;
@@ -185,6 +187,9 @@ namespace ACE
     };
   }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Session.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Session.inl b/protocols/ace/HTBP/HTBP_Session.inl
index fb5c337826c..06c510650c9 100644
--- a/protocols/ace/HTBP/HTBP_Session.inl
+++ b/protocols/ace/HTBP/HTBP_Session.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 ACE::HTBP::Session::reconnect ()
@@ -107,3 +110,5 @@ ACE::HTBP::Session_Id_t::operator ==(const ACE::HTBP::Session_Id_t &other) const
           (this->local_ == other.local_) &&
           (this->peer_ == other.peer_));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Stream.cpp b/protocols/ace/HTBP/HTBP_Stream.cpp
index f351993369a..c0913569af0 100644
--- a/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Message_Block.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Initialization and termination methods.
 /// Constructor.
@@ -322,5 +323,6 @@ ACE::HTBP::Stream::get_handle (void) const
 void
 ACE::HTBP::Stream::set_handle (ACE_HANDLE )
 {
-  // no-op
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Stream.h b/protocols/ace/HTBP/HTBP_Stream.h
index e950939469e..0527ab06632 100644
--- a/protocols/ace/HTBP/HTBP_Stream.h
+++ b/protocols/ace/HTBP/HTBP_Stream.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "HTBP_Filter.h"
 #include "HTBP_Notifier.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -283,5 +285,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_STREAM_H */
diff --git a/protocols/ace/RMCast/Acknowledge.cpp b/protocols/ace/RMCast/Acknowledge.cpp
index e4416eedec3..b647a255dad 100644
--- a/protocols/ace/RMCast/Acknowledge.cpp
+++ b/protocols/ace/RMCast/Acknowledge.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Time_Value.h"     // ACE_Time_Value
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdlib.h"   // abort
 #include "ace/OS_NS_sys_time.h" // gettimeofday
 
 #include "Acknowledge.h"
@@ -151,7 +152,7 @@ namespace ACE_RMCast
           if (cond_.wait (&time) == -1)
           {
             if (errno != ETIME)
-              abort ();
+              ACE_OS::abort ();
             else
               break;
           }
diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp
index 3a9fdaea2b3..e3379ac1893 100644
--- a/protocols/ace/RMCast/Link.cpp
+++ b/protocols/ace/RMCast/Link.cpp
@@ -3,6 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ace/Time_Value.h"        // ACE_Time_Value
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_sys_socket.h"
 
 #include "Link.h"
@@ -53,8 +55,8 @@ namespace ACE_RMCast
                          reinterpret_cast<sockaddr*> (addr_.get_addr ()),
                          addr_.get_addr_size ()) == -1)
     {
-      perror ("connect: ");
-      abort ();
+      ACE_OS::perror ("connect: ");
+      ACE_OS::abort ();
     }
 
 
@@ -161,7 +163,7 @@ namespace ACE_RMCast
                     (*i).ext_id_, (*i).int_id_->size ()));
       }
 
-      abort ();
+      ACE_OS::abort ();
     }
 
     ssock_.send (os.buffer (), os.length (), addr_);
@@ -216,7 +218,7 @@ namespace ACE_RMCast
         if (r == -1)
         {
           if (errno != ETIME)
-            abort ();
+            ACE_OS::abort ();
         }
         else
         {
@@ -307,7 +309,7 @@ namespace ACE_RMCast
         else
           {
             //cerr << 0 << "unknown profile id " << hdr.id () << endl;
-            abort ();
+            ACE_OS::abort ();
           }
       }
 
@@ -325,6 +327,6 @@ namespace ACE_RMCast
   void Link::
   recv (Message_ptr)
   {
-    abort ();
+    ACE_OS::abort ();
   }
 }
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index cfc1c88914b..1a121915c62 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -35,7 +35,8 @@ libACE_RMCast_la_SOURCES = \
   Retransmit.cpp \
   Simulator.cpp \
   Socket.cpp \
-  Stack.cpp
+  Stack.cpp \
+  Template_Instantiations.cpp
 
 libACE_RMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h
index 314f69676cb..c0e2797b732 100644
--- a/protocols/ace/RMCast/Protocol.h
+++ b/protocols/ace/RMCast/Protocol.h
@@ -17,6 +17,7 @@
 #include "ace/Null_Mutex.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
 
 #include "Bits.h"
 
@@ -239,7 +240,7 @@ namespace ACE_RMCast
   class Message;
 
   typedef
-  ACE_Refcounted_Auto_Ptr<Message, ACE_Null_Mutex>
+  ACE_Refcounted_Auto_Ptr<Message, Mutex>
   Message_ptr;
 
   class Message
@@ -308,7 +309,7 @@ namespace ACE_RMCast
     Profile const*
     find (u16 id) const
     {
-      Profiles::ENTRY* e;
+      Profiles::ENTRY* e = 0;
 
       if (profiles_.find (id, e) == -1) return 0;
 
@@ -633,7 +634,7 @@ namespace ACE_RMCast
     size (size_t s)
     {
       if (s > capacity_)
-        abort ();
+        ACE_OS::abort ();
 
       size_ = s;
 
diff --git a/protocols/ace/RMCast/RMCast.mpc b/protocols/ace/RMCast/RMCast.mpc
index bc743edc147..f77bd4d942c 100644
--- a/protocols/ace/RMCast/RMCast.mpc
+++ b/protocols/ace/RMCast/RMCast.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(RMCast) : acelib, core, threads {
+  avoids = ace_for_tao
   sharedname   = ACE_RMCast
   dynamicflags = ACE_RMCAST_BUILD_DLL
 
diff --git a/protocols/ace/RMCast/Reassemble.cpp b/protocols/ace/RMCast/Reassemble.cpp
index 6d94a3d3cbf..9fa3e0d0167 100644
--- a/protocols/ace/RMCast/Reassemble.cpp
+++ b/protocols/ace/RMCast/Reassemble.cpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "Reassemble.h"
+#include "ace/OS_NS_stdlib.h"
 
 /*
 #include <iostream>
@@ -55,7 +56,7 @@ namespace ACE_RMCast
           //
 
           if (part->num () == 1)
-            abort ();
+            ACE_OS::abort ();
 
 
           Data const* data = static_cast<Data const*> (m->find (Data::id));
@@ -78,7 +79,7 @@ namespace ACE_RMCast
             // Reassembly is complete.
             //
             if (part->total_size () != new_data->size ())
-              abort ();
+              ACE_OS::abort ();
 
             Message_ptr new_msg (new Message ());
 
@@ -101,7 +102,7 @@ namespace ACE_RMCast
         // and forward it up.
         //
         if (map_.find (from, e) != -1)
-          abort ();
+          ACE_OS::abort ();
 
         in_->recv (m);
       }
diff --git a/protocols/ace/RMCast/Retransmit.cpp b/protocols/ace/RMCast/Retransmit.cpp
index a2f8dd96adc..b968908f82b 100644
--- a/protocols/ace/RMCast/Retransmit.cpp
+++ b/protocols/ace/RMCast/Retransmit.cpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "ace/Time_Value.h"     // ACE_Time_Value
+#include "ace/OS_NS_stdlib.h"   // abort
 #include "ace/OS_NS_sys_time.h" // gettimeofday
 
 #include "Retransmit.h"
@@ -144,7 +145,7 @@ namespace ACE_RMCast
         if (cond_.wait (&time) == -1)
         {
           if (errno != ETIME)
-            abort ();
+            ACE_OS::abort ();
           else
             break;
         }
diff --git a/protocols/ace/RMCast/Simulator.cpp b/protocols/ace/RMCast/Simulator.cpp
index 8b024d1d299..ca6d81d47e4 100644
--- a/protocols/ace/RMCast/Simulator.cpp
+++ b/protocols/ace/RMCast/Simulator.cpp
@@ -21,7 +21,7 @@ namespace ACE_RMCast
     out_->send (m);
     return;
 
-    int r (rand ());
+    /*int r (rand ());
 
     if ((r % 3) == 0) return;
 
@@ -35,6 +35,6 @@ namespace ACE_RMCast
     else
     {
       hold_ = m;
-    }
+    }*/
   }
 }
diff --git a/protocols/ace/RMCast/Socket.cpp b/protocols/ace/RMCast/Socket.cpp
index 448d4692e81..8f433f7c6ed 100644
--- a/protocols/ace/RMCast/Socket.cpp
+++ b/protocols/ace/RMCast/Socket.cpp
@@ -3,6 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ace/OS_Memory.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h" // gettimeofday
@@ -183,7 +185,7 @@ namespace ACE_RMCast
       Message_ptr m;
 
       if (queue_.dequeue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
 
       if (queue_.is_empty ())
@@ -196,8 +198,8 @@ namespace ACE_RMCast
 
               if (signal_pipe_.recv (&c, 1) != 1)
                 {
-                  perror ("read: ");
-                  abort ();
+                  ACE_OS::perror ("read: ");
+                  ACE_OS::abort ();
                 }
             }
         }
@@ -252,10 +254,10 @@ namespace ACE_RMCast
       Message_ptr m;
 
       if (queue_.dequeue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
       if (queue_.enqueue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
       if (m->find (NoData::id) != 0)
         {
@@ -315,7 +317,7 @@ namespace ACE_RMCast
                   if (signal_pipe_.send (&c, 1) != 1)
                     {
                       // perror ("write: ");
-                      abort ();
+                      ACE_OS::abort ();
                     }
                 }
 
diff --git a/protocols/ace/RMCast/Template_Instantiations.cpp b/protocols/ace/RMCast/Template_Instantiations.cpp
new file mode 100644
index 00000000000..262a8e5b36a
--- /dev/null
+++ b/protocols/ace/RMCast/Template_Instantiations.cpp
@@ -0,0 +1,128 @@
+// $Id$
+
+// Note: this file is here only until support for explicit template
+// instantiations is removed from ACE, after ACE 5.5 is released.
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# include "ace/Array_Base.h"
+# include "ace/Condition_T.h"
+# include "ace/Functor_T.h"
+# include "ace/Hash_Map_Manager.h"
+# include "ace/INET_Addr.h"
+# include "ace/Refcounted_Auto_Ptr.h"
+# include "ace/Thread_Mutex.h"
+# include "ace/Unbounded_Queue.h"
+# include "ace/Vector_T.h"
+
+# include "Acknowledge.h"
+# include "Protocol.h"
+# include "Retransmit.h"
+
+#endif
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Array_Base<unsigned char>;
+template class ACE_Array_Base<ACE_RMCast::u64>;
+template class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Condition<ACE_Thread_Mutex>;
+template class ACE_Equal_To<ACE_INET_Addr>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr>;
+template class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr>;
+template class ACE_Hash_Map_Entry<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex> >;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::u64>;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex> >;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue>;
+template class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>;
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NAK, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NRTM, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Vector<unsigned char>;
+template class ACE_Vector<ACE_RMCast::u64>;
+template class ACE_Vector_Iterator<unsigned char>;
+template class ACE_Vector_Iterator<ACE_RMCast::u64>;
+template class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate class ACE_Array_Base<unsigned char>
+# pragma instantiate class ACE_Array_Base<ACE_RMCast::u64>
+# pragma instantiate class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Condition<ACE_Thread_Mutex>
+# pragma instantiate class ACE_Equal_To<ACE_INET_Addr>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr>
+# pragma instantiate class ACE_Hash_Map_Entry<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::u64>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue>
+# pragma instantiate class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NAK, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NRTM, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Vector<unsigned char>
+# pragma instantiate class ACE_Vector<ACE_RMCast::u64>
+# pragma instantiate class ACE_Vector_Iterator<unsigned char>
+# pragma instantiate class ACE_Vector_Iterator<ACE_RMCast::u64>
+# pragma instantiate class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+
+#elif defined (__HP_aCC)
+// Make aC++ stop complaining about an empty translation unit
+static int shut_up_aCC = 0;
+#endif
diff --git a/protocols/ace/TMCast/FaultDetector.hpp b/protocols/ace/TMCast/FaultDetector.hpp
index c3de622806d..49ffcdd174c 100644
--- a/protocols/ace/TMCast/FaultDetector.hpp
+++ b/protocols/ace/TMCast/FaultDetector.hpp
@@ -10,7 +10,7 @@ namespace ACE_TMCast
   {
   public:
     FaultDetector ()
-        : silence_period_ (-1)
+        : alone_ (true), silence_period_ (-1)
     {
     }
 
@@ -21,13 +21,16 @@ namespace ACE_TMCast
     void
     insync ()
     {
+      if (alone_)
+        alone_ = false;
+	
       silence_period_ = 0;
     }
 
     void
     outsync ()
     {
-      if (++silence_period_ >= Protocol::FATAL_SILENCE_FRAME)
+      if (!alone_ && ++silence_period_ >= Protocol::FATAL_SILENCE_FRAME)
       {
         // cerr << "Silence period has been passed." << endl;
         // cerr << "Decalring the node failed." << endl;
@@ -36,6 +39,7 @@ namespace ACE_TMCast
     }
 
   private:
+    bool alone_; // true if we haven't heard from any members yet.
     short silence_period_;
   };
 }
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
index 464533bec2f..29187838a85 100644
--- a/protocols/ace/TMCast/Group.cpp
+++ b/protocols/ace/TMCast/Group.cpp
@@ -8,6 +8,7 @@
 
 // OS primitives
 #include <ace/OS.h>
+#include <ace/OS_NS_stdlib.h>
 #include <ace/Synch.h>
 #include <ace/Time_Value.h>
 #include <ace/SOCK_Dgram_Mcast.h>
@@ -83,7 +84,7 @@ namespace ACE_TMCast
                               this,
                               THR_JOINABLE,
                               &unused,
-                              &thread_) != 0) ::abort ();
+                              &thread_) != 0) ACE_OS::abort ();
     }
 
     virtual ~Scheduler ()
@@ -94,7 +95,7 @@ namespace ACE_TMCast
         in_control_.push (MessagePtr (new Terminate));
       }
 
-      if (ACE_OS::thr_join (thread_, 0) != 0) ::abort ();
+      if (ACE_OS::thr_join (thread_, 0) != 0) ACE_OS::abort ();
 
       // cerr << "Scheduler is down." << endl;
     }
@@ -201,7 +202,7 @@ namespace ACE_TMCast
                 {
                   // cerr << "unknown message type from link listener: "
                   //      << typeid (*m).name () << endl;
-                  abort ();
+                  ACE_OS::abort ();
                 }
               }
 
@@ -396,7 +397,7 @@ namespace ACE_TMCast
             //     << "unexpected message " << typeid (*m).name ()
             //     << " " << typeid (Aborted).name () << endl;
 
-            abort ();
+            ACE_OS::abort ();
           }
         }
 
@@ -439,7 +440,7 @@ namespace ACE_TMCast
             // cerr << "recv: group-scheduler messaging protocol violation. "
             //     << "unexpected message " << typeid (*m).name () << endl;
 
-            abort ();
+            ACE_OS::abort ();
           }
         }
 
diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp
index 1dea811cd39..983f7828f3e 100644
--- a/protocols/ace/TMCast/LinkListener.hpp
+++ b/protocols/ace/TMCast/LinkListener.hpp
@@ -4,6 +4,7 @@
 
 // OS primitives
 #include <ace/OS_NS_string.h>
+#include <ace/OS_NS_stdlib.h>
 #include <ace/Synch.h>
 #include <ace/SOCK_Dgram_Mcast.h>
 #include <ace/Refcounted_Auto_Ptr.h>
@@ -80,7 +81,7 @@ namespace ACE_TMCast
                               this,
                               THR_JOINABLE,
                               &unused,
-                              &thread_) != 0) ::abort ();
+                              &thread_) != 0) ACE_OS::abort ();
     }
 
     ~LinkListener ()
@@ -91,7 +92,7 @@ namespace ACE_TMCast
         control_.push (MessagePtr (new Terminate));
       }
 
-      if (ACE_OS::thr_join (thread_, 0) != 0) ::abort ();
+      if (ACE_OS::thr_join (thread_, 0) != 0) ACE_OS::abort ();
 
       // cerr << "Link listener is down." << endl;
     }
diff --git a/protocols/ace/TMCast/MTQueue.hpp b/protocols/ace/TMCast/MTQueue.hpp
index 47fafa943c1..2eb128823fe 100644
--- a/protocols/ace/TMCast/MTQueue.hpp
+++ b/protocols/ace/TMCast/MTQueue.hpp
@@ -127,7 +127,7 @@ namespace ACE_TMCast
              !i.done ();
              i.advance ())
         {
-          ConditionalType** c;
+          ConditionalType** c = 0;
 
           i.next (c);
 
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index 3a1f1e54ea9..3338e4a8f64 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -25,7 +25,8 @@ libACE_TMCast_la_CPPFLAGS = \
 libACE_TMCast_la_SOURCES = \
   Group.cpp \
   MTQueue.cpp \
-  Protocol.cpp
+  Protocol.cpp \
+  Template_Instantiations.cpp
 
 libACE_TMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
diff --git a/protocols/ace/TMCast/TMCast.mpc b/protocols/ace/TMCast/TMCast.mpc
index 963396adc6d..1ff937a0a1a 100644
--- a/protocols/ace/TMCast/TMCast.mpc
+++ b/protocols/ace/TMCast/TMCast.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : acelib, core, exceptions, threads {
+  avoids = ace_for_tao
   sharedname    = ACE_TMCast
   dynamicflags += TMCAST_BUILD_DLL
 
diff --git a/protocols/ace/TMCast/Template_Instantiations.cpp b/protocols/ace/TMCast/Template_Instantiations.cpp
new file mode 100644
index 00000000000..62e9b24a8bc
--- /dev/null
+++ b/protocols/ace/TMCast/Template_Instantiations.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+// Note: this file is here only until support for explicit template
+// instantiations is removed from ACE, after ACE 5.5 is released.
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# include "ace/Null_Mutex.h"
+# include "ace/Refcounted_Auto_Ptr.h"
+
+# include "TransactionController.hpp"
+
+#endif
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Recv, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Send, ACE_Null_Mutex>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Recv, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Send, ACE_Null_Mutex>
+
+#elif defined (__HP_aCC)
+// Make aC++ stop complaining about an empty translation unit
+static int shut_up_aCC = 0;
+#endif
diff --git a/protocols/ace/TMCast/TransactionController.hpp b/protocols/ace/TMCast/TransactionController.hpp
index cbeb0f5a7c9..6b0d4281655 100644
--- a/protocols/ace/TMCast/TransactionController.hpp
+++ b/protocols/ace/TMCast/TransactionController.hpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/Synch.h"
 #include "ace/Refcounted_Auto_Ptr.h"
 
@@ -352,7 +353,7 @@ namespace ACE_TMCast
           // cerr << "Expecting Send but received " << typeid (*m).name ()
           //      << endl;
 
-          ::abort ();
+          ACE_OS::abort ();
         }
 
         current_.id++;
diff --git a/protocols/examples/RMCast/Send_Msg/Send_Msg.mpc b/protocols/examples/RMCast/Send_Msg/Send_Msg.mpc
index 12bd8174c4b..981df7ec8a7 100644
--- a/protocols/examples/RMCast/Send_Msg/Send_Msg.mpc
+++ b/protocols/examples/RMCast/Send_Msg/Send_Msg.mpc
@@ -2,12 +2,14 @@
 // $Id$
 
 project(*Sender) : aceexe, exceptions, rmcast {
+  avoids = ace_for_tao
   exename = sender
   Source_Files {
     Sender.cpp
   }
 }
 project(*Receiver) : aceexe, exceptions, rmcast {
+  avoids = ace_for_tao
   exename = receiver
   Source_Files {
     Receiver.cpp
diff --git a/protocols/tests/RMCast/RMCast.mpc b/protocols/tests/RMCast/RMCast.mpc
index 12bd8174c4b..ebf0d96af3c 100644
--- a/protocols/tests/RMCast/RMCast.mpc
+++ b/protocols/tests/RMCast/RMCast.mpc
@@ -2,12 +2,14 @@
 // $Id$
 
 project(*Sender) : aceexe, exceptions, rmcast {
+  avoids  = ace_for_tao
   exename = sender
   Source_Files {
     Sender.cpp
   }
 }
 project(*Receiver) : aceexe, exceptions, rmcast {
+  avoids  = ace_for_tao
   exename = receiver
   Source_Files {
     Receiver.cpp
diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp
index ce2fa29cb5b..2af15dfb66d 100644
--- a/tests/Barrier_Test.cpp
+++ b/tests/Barrier_Test.cpp
@@ -45,7 +45,7 @@ struct Tester_Args
 // for all other threads to complete this iteration.
 
 static void *
-tester (Tester_Args *args)
+wait_tester (Tester_Args *args)
 {
   for (int iterations = 1;
        iterations <= args->n_iterations_;
@@ -55,12 +55,30 @@ tester (Tester_Args *args)
                   iterations));
 
       // Block until all other threads have waited, then continue.
-      args->tester_barrier_.wait ();
+      if (args->tester_barrier_.wait () != 0)
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
+                    ACE_TEXT ("wait failed")));
     }
 
   return 0;
 }
 
+// Wait on the barrier, expecting it to be shut down before completing
+// the wait.
+
+static void *
+shut_tester (Tester_Args *args)
+{
+  if (args->tester_barrier_.wait () == 0)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("(%t) wait succeeded, should have shut down\n")));
+  else if (errno != ESHUTDOWN)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("(%t) wait failed, expecting ESHUTDOWN, %p\n"),
+                ACE_TEXT ("got")));
+  return 0;
+}
+
 #endif /* ACE_HAS_THREADS */
 
 int
@@ -85,7 +103,7 @@ run_main (int, ACE_TCHAR *[])
 
       if (ACE_Thread_Manager::instance ()->spawn_n
           (n_threads,
-           (ACE_THR_FUNC) tester,
+           (ACE_THR_FUNC) wait_tester,
            (void *) &args,
            THR_NEW_LWP | THR_JOINABLE) == -1)
 
@@ -95,6 +113,21 @@ run_main (int, ACE_TCHAR *[])
       ACE_Thread_Manager::instance ()->wait ();
     }
 
+  // Now test ACE_Barrier shutdown. Set up a barrier for n_threads, and start
+  // n_threads - 1 threads to wait, then shut the barrier down.
+  ACE_Barrier shut_barrier (n_threads);
+  Tester_Args shut_args (shut_barrier, 1);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting shutdown test threads\n")));
+  if (ACE_Thread_Manager::instance ()->spawn_n
+      (n_threads - 1,
+       (ACE_THR_FUNC) shut_tester,
+       (void *) &shut_args,
+       THR_NEW_LWP | THR_JOINABLE) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n")), 1);
+
+  shut_barrier.shutdown ();
+  ACE_Thread_Manager::instance ()->wait ();
+
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("test done\n")));
 #else
   ACE_ERROR ((LM_INFO,
diff --git a/tests/Based_Pointer_Test.cpp b/tests/Based_Pointer_Test.cpp
index a141a864e54..143511170ac 100644
--- a/tests/Based_Pointer_Test.cpp
+++ b/tests/Based_Pointer_Test.cpp
@@ -409,6 +409,17 @@ run_main (int, ACE_TCHAR *[])
     ACE_END_TEST;
     return retval == 0 ? 0 : 1;
 }
+
+# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>;
+
+# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#  pragma instantiate class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>
+
+# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else /* ! ACE_HAS_POSITION_INDEPENDENT_POINTERS */
 // Nothing to test !
 int
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 4c2198b3485..7602eb1a8c9 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -131,17 +131,17 @@ run_main (int, ACE_TCHAR *[])
   errors += check (ACE_TEXT ("sizeof (ACE_UINT64) is %u%s"),
                    sizeof (ACE_UINT64), 8);
 
-  // ACE assumes sizeof (ptr_arith_t) == sizeof (void*)
-  if (sizeof (ptr_arith_t) == sizeof (void *))
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sizeof (ptr_arith_t) == sizeof (void*)\n")));
+  // ACE assumes sizeof (ptrdiff_t) == sizeof (void*)
+  if (sizeof (ptrdiff_t) == sizeof (void *))
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sizeof (ptrdiff_t) == sizeof (void*)\n")));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("sizeof (ptr_arith_t) != sizeof (void*)\n")));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("sizeof (ptrdiff_t) != sizeof (void*)\n")));
 
-  // ACE assumes sizeof (ptr_arith_t) >= sizeof (a_function_pointer)
-  if (sizeof (ptr_arith_t) >= sizeof (a_function_pointer))
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sizeof (ptr_arith_t) >= sizeof (a_function_pointer)\n")));
+  // ACE assumes sizeof (ptrdiff_t) >= sizeof (a_function_pointer)
+  if (sizeof (ptrdiff_t) >= sizeof (a_function_pointer))
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sizeof (ptrdiff_t) >= sizeof (a_function_pointer)\n")));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("sizeof (ptr_arith_t) < sizeof (a_function_pointer)\n")));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("sizeof (ptrdiff_t) < sizeof (a_function_pointer)\n")));
 
 #if defined (ACE_LITTLE_ENDIAN)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("little endian\n")));
diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp
index 282b0f928fc..dde6d876f4c 100644
--- a/tests/Buffer_Stream_Test.cpp
+++ b/tests/Buffer_Stream_Test.cpp
@@ -113,7 +113,7 @@ Common_Task::close (u_long exit_status)
 int
 Supplier::svc (void)
 {
-  ACE_Message_Block *mb;
+  ACE_Message_Block *mb = 0;
 
   // Send one message for each letter of the alphabet, then send an empty
   // message to mark the end.
@@ -161,7 +161,7 @@ Consumer::svc (void)
   ACE_Message_Block *mb = 0;
   int result;
   const char *c = ACE_ALPHABET;
-  char *output;
+  char *output = 0;
 
   // Keep looping, reading a message out of the queue, until we
   // timeout or get a message with a length == 0, which signals us to
@@ -169,14 +169,14 @@ Consumer::svc (void)
 
   for (;;)
     {
-      this->timeout_.sec (ACE_OS::time (0) + 4); // Wait for upto 4 seconds
+      this->timeout_.set (ACE_OS::time (0) + 4, 0); // Wait for upto 4 seconds
 
       result = this->getq (mb, &this->timeout_);
 
       if (result == -1)
         break;
 
-      size_t length = mb->length ();
+      size_t const length = mb->length ();
 
       if (length > 0)
         {
@@ -208,8 +208,8 @@ run_main (int, ACE_TCHAR *[])
 #if defined (ACE_HAS_THREADS)
   // Control hierachically-related active objects.
   MT_Stream stream;
-  MT_Module *cm;
-  MT_Module *sm;
+  MT_Module *cm = 0;
+  MT_Module *sm = 0;
 
   // Allocate the Consumer and Supplier modules.
   ACE_NEW_RETURN (cm, MT_Module (ACE_TEXT ("Consumer"), new Consumer), -1);
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 79bf3c0509a..c47495ee4de 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -196,7 +196,7 @@ run_test (int write_file,
       output_cdr << cdr_test;
 
       // Output the data to cout.
-#if defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       // Since CE does not have ostream, ace_file_stream and output_file() cannot
       // be used.  Just use 'hard-coded' file name here.
       (*ACE_CE_OSTREAM::instance()).open(ACE_TEXT("\\Log\\CDR_File_Test.txt"));
@@ -295,7 +295,7 @@ run_test (int write_file,
       // <CDR_Test> object.
       input_cdr >> temp;
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       (*ACE_CE_OSTREAM::instance()) << temp;
 #else
       *ace_file_stream::instance ()->output_file () << temp;
diff --git a/tests/CE_fostream.cpp b/tests/CE_fostream.cpp
index 7ebb9b168d7..45641fb6e77 100644
--- a/tests/CE_fostream.cpp
+++ b/tests/CE_fostream.cpp
@@ -2,8 +2,8 @@
 
 #include "CE_fostream.h"
 
-// This is CE only.
-#if defined (ACE_HAS_WINCE)
+// This is CE only, prior to availability of iostreams (VC 8).
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 ACE_CE_fostream* ACE_CE_fostream::instance_ = 0;
 
@@ -146,4 +146,4 @@ ACE_CE_fostream& ACE_CE_fostream::operator << (const void* v)
     return *this;
 }
 
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAMS_TOTALLY */
diff --git a/tests/CE_fostream.h b/tests/CE_fostream.h
index b488aaba3b1..9d84d7fc2be 100644
--- a/tests/CE_fostream.h
+++ b/tests/CE_fostream.h
@@ -21,7 +21,7 @@
 
 #include "ace/config-all.h"
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 #include "ace/Null_Mutex.h"
 #include "ace/Singleton.h"
@@ -101,5 +101,5 @@ private:
 
 typedef ACE_Singleton<ACE_CE_fostream, ACE_Null_Mutex> ACE_CE_OSTREAM;
 
-#endif  // ACE_HAS_WINCE
-#endif  // ACE_CE_fostream_h
+#endif  /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAM_TOTALLY */
+#endif  /* ACE_CE_fostream_h */
diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp
index 87ed155dcc9..4e1af9eb76c 100644
--- a/tests/DLL_Test_Impl.cpp
+++ b/tests/DLL_Test_Impl.cpp
@@ -70,6 +70,16 @@ Hello_Impl::operator new (size_t bytes, const ACE_nothrow_t &nt)
   ACE_DEBUG ((LM_INFO, "Hello_Impl::new\n"));
   return ::new (nt) char[bytes];
 }
+
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+void
+Hello_Impl::operator delete (void *ptr, const ACE_nothrow_t&) throw ()
+{
+  ACE_DEBUG ((LM_INFO, "Hello_Impl::delete\n"));
+  ::delete [] static_cast<char *> (ptr);
+}
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
+
 #endif /* ACE_HAS_NEW_NOTHROW */
 
 void
@@ -133,5 +143,5 @@ dynamic_cast_test (Parent *target)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dynamic_cast_test: parent %@; child %@\n"),
               target, c));
   return target == c ? 0 : -1;
-}  
+}
 #endif /* !ACE_LACKS_RTTI */
diff --git a/tests/DLL_Test_Impl.h b/tests/DLL_Test_Impl.h
index bf16bdd5c48..9ef3fb887a8 100644
--- a/tests/DLL_Test_Impl.h
+++ b/tests/DLL_Test_Impl.h
@@ -56,6 +56,9 @@ public:
 #if defined (ACE_HAS_NEW_NOTHROW)
   /// Overloaded new operator, nothrow_t variant.
   void *operator new (size_t bytes, const ACE_nothrow_t &nt);
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
+  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 #endif /* ACE_HAS_NEW_NOTHROW */
 
   void operator delete (void *ptr);
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index 3b8ac8f53fc..21260c33d55 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -19,7 +19,7 @@
 #include "test_config.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
 
 typedef ACE_TCHAR *ACE_STRING;
 typedef ACE_DLList<ACE_STRING> STRLIST;
diff --git a/tests/Dev_Poll_Reactor_Test.cpp b/tests/Dev_Poll_Reactor_Test.cpp
index be103246c93..2b48767b875 100644
--- a/tests/Dev_Poll_Reactor_Test.cpp
+++ b/tests/Dev_Poll_Reactor_Test.cpp
@@ -203,14 +203,13 @@ Server::Server (void)
 int
 Server::handle_input (ACE_HANDLE /* handle */)
 {
-  char buffer[BUFSIZ] = { 0 };
-
+  char buffer[BUFSIZ+1] = { 0 };    // Insure a trailing nul
   ssize_t bytes_read = 0;
 
   char * const begin = buffer;
   char * const end   = buffer + BUFSIZ;
 
-  for (char * buf = begin; buf != end; buf += bytes_read)
+  for (char * buf = begin; buf < end; buf += bytes_read)
     {
       // Keep reading until it is no longer possible to do so.
       //
@@ -218,7 +217,7 @@ Server::handle_input (ACE_HANDLE /* handle */)
       // mechanism may have a "state change" interface (as opposed to
       // "state monitoring"), in which case a "speculative" read is
       // done.
-      bytes_read = this->peer ().recv (buf, BUFSIZ - bytes_read);
+      bytes_read = this->peer ().recv (buf, end - buf);
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("****** bytes_read = %d\n"),
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index 8b42ebd0ca0..d8353bc3bae 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -10,7 +10,7 @@
 //
 // = DESCRIPTION
 //     This is a test of the opendir and readdir emulation provided by the
-//     class ACE_OS_Dirent.  It is used to ensure that the emulation code
+//     class ACE_Dirent.  It is used to ensure that the emulation code
 //     works properly on platforms that don't support this capability
 //     natively.  As the emulation code is not compiled in other
 //     platforms, this test also ensures that there is no impact to
@@ -37,7 +37,7 @@ ACE_RCSID (tests,
            "$Id Dirent_Test.cpp,v 4.10 2003/05/18 19:17:34 dhinton Exp$")
 
 
-#if defined (VXWORKS) || defined(CHORUS)
+#if defined (ACE_VXWORKS) || defined(CHORUS)
 #define TEST_DIR "log"
 #define DIR_DOT "."
 #define DIR_DOT_DOT ".."
@@ -61,13 +61,13 @@ static const int RECURSION_INDENT = 3;
 static int entrycount = 0;
 
 static int
-selector (const dirent *d)
+selector (const ACE_DIRENT *d)
 {
   return ACE_OS::strcmp (d->d_name, TEST_ENTRY) == 0;
 }
 
 static int
-comparator (const dirent **d1, const dirent **d2)
+comparator (const ACE_DIRENT **d1, const ACE_DIRENT **d2)
 {
   return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name);
 }
@@ -121,7 +121,7 @@ dirent_test (void)
 {
   ACE_Dirent dir (ACE_TEXT (TEST_DIR));
 
-  for (dirent *directory;
+  for (ACE_DIRENT *directory;
        (directory = dir.read ()) != 0;
        entrycount++)
     ACE_DEBUG ((LM_DEBUG,
@@ -192,15 +192,15 @@ dirent_count (const ACE_TCHAR *dir_path,
 
   int entry_count = 0;
 
-  for (dirent *directory; (directory = dir.read ()) != 0;)
+  for (ACE_DIRENT *directory; (directory = dir.read ()) != 0;)
     {
       // Skip the ".." and "." files.
       if (ACE_OS::strcmp (directory->d_name, DIR_DOT) == 0
           || ACE_OS::strcmp (directory->d_name, DIR_DOT_DOT) == 0)
         continue;
-      entry_count++;
+      ++entry_count;
 
-#if !defined (ACE_LACKS_STRUCT_DIR)
+#if !defined (ACE_LACKS_STRUCT_DIR) && !defined (__BORLANDC__)
       ACE_OS::strncpy (tname,
                        ACE_TEXT_TO_TCHAR_IN (directory->d_name),
                        maxnamlen);
@@ -220,7 +220,7 @@ dirent_count (const ACE_TCHAR *dir_path,
       switch (stat_buf.st_mode & S_IFMT)
         {
         case S_IFREG: // Either a regular file or an executable.
-          file_count++;
+          ++file_count;
           break;
 
         case S_IFLNK: // Either a file or directory link, so let's find out.
@@ -232,9 +232,9 @@ dirent_count (const ACE_TCHAR *dir_path,
 
           if ((stat_buf.st_mode & S_IFMT) == S_IFDIR)
             // Don't recurse through symbolic directory links!
-            dir_count++;
+            ++dir_count;
           else
-            file_count++;
+            ++file_count;
           break;
 
         case S_IFDIR:
@@ -255,7 +255,7 @@ dirent_count (const ACE_TCHAR *dir_path,
                   tname,
                   local_file_count,
                   local_dir_count));
-              dir_count++;
+              ++dir_count;
 
 #if !defined (ACE_LACKS_CHDIR)
 # if defined (ACE_VXWORKS)
diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp
index 28ef6c0fe51..888a945ab4c 100644
--- a/tests/Future_Set_Test.cpp
+++ b/tests/Future_Set_Test.cpp
@@ -453,22 +453,26 @@ run_main (int, ACE_TCHAR *[])
   ACE_NEW_RETURN (andres,
                   Prime_Scheduler (ACE_TEXT ("andres")),
                   -1);
-  ACE_ASSERT (andres->open () != -1);
+  int result = andres->open ();
+  ACE_ASSERT (result != -1);
   ACE_NEW_RETURN (peter,
                   Prime_Scheduler (ACE_TEXT ("peter")),
                   -1);
-  ACE_ASSERT (peter->open () != -1);
+  result = peter->open ();
+  ACE_ASSERT (result != -1);
   ACE_NEW_RETURN (helmut,
                   Prime_Scheduler (ACE_TEXT ("helmut")),
                   -1);
-  ACE_ASSERT (helmut->open () != -1);
+  result = helmut->open ();
+  ACE_ASSERT (result != -1);
 
   // Matias passes all asynchronous method calls on to Andres...
   ACE_NEW_RETURN (matias,
                   Prime_Scheduler (ACE_TEXT ("matias"),
                                    andres),
                   -1);
-  ACE_ASSERT (matias->open () != -1);
+  result = matias->open ();
+  ACE_ASSERT (result != -1);
 
   ACE_Future<u_long> fresulta;
   ACE_Future<u_long> fresultb;
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 92e90561a02..2a3c8b664bb 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -424,22 +424,26 @@ run_main (int, ACE_TCHAR *[])
   ACE_NEW_RETURN (andres,
                   Prime_Scheduler (ACE_TEXT ("andres")),
                   -1);
-  ACE_ASSERT (andres->open () != -1);
+  int result = andres->open ();
+  ACE_ASSERT (result != -1);
   ACE_NEW_RETURN (peter,
                   Prime_Scheduler (ACE_TEXT ("peter")),
                   -1);
-  ACE_ASSERT (peter->open () != -1);
+  result = peter->open ();
+  ACE_ASSERT (result != -1);
   ACE_NEW_RETURN (helmut,
                   Prime_Scheduler (ACE_TEXT ("helmut")),
                   -1);
-  ACE_ASSERT (helmut->open () != -1);
+  result = helmut->open ();
+  ACE_ASSERT (result != -1);
 
   // Matias passes all asynchronous method calls on to Andres...
   ACE_NEW_RETURN (matias,
                   Prime_Scheduler (ACE_TEXT ("matias"),
                                    andres),
                   -1);
-  ACE_ASSERT (matias->open () != -1);
+  result = matias->open ();
+  ACE_ASSERT (result != -1);
 
   for (int i = 0; i < n_loops; i++)
     {
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index 26a41c0cd98..d5cbac6a890 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -161,7 +161,7 @@ run_test (void)
 
   // Let's test the iterator while we are at it.
   {
-    HASH_STRING_ENTRY *entry;
+    HASH_STRING_ENTRY *entry = 0;
     size_t i = 0;
 
     for (HASH_STRING_ITER hash_iter (hash);
@@ -179,7 +179,7 @@ run_test (void)
 
   // And now test the const iterator
   {
-    HASH_STRING_ENTRY *entry;
+    HASH_STRING_ENTRY *entry = 0;
     size_t i = 0;
 
     for (HASH_STRING_CONST_ITER hash_iter (hash);
@@ -213,7 +213,7 @@ run_test (void)
 
   // Let's test the iterator backwards.
   {
-    HASH_STRING_ENTRY *entry;
+    HASH_STRING_ENTRY *entry = 0;
     size_t i = 0;
 
     for (HASH_STRING_REVERSE_ITER hash_iter (hash);
diff --git a/tests/Lazy_Map_Manager_Test.cpp b/tests/Lazy_Map_Manager_Test.cpp
index d1b43d7d47f..0d6627d0d72 100644
--- a/tests/Lazy_Map_Manager_Test.cpp
+++ b/tests/Lazy_Map_Manager_Test.cpp
@@ -25,20 +25,20 @@
 ACE_RCSID(tests, Map_Manager_Test, "$Id$")
 
 // Simple map manager.
-typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> MAP;
+typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> LAZY_MAP;
 
 // Displaying the contents of a map manager.
 
 void
-display_map (MAP &map)
+display_map (LAZY_MAP &map)
 {
   {
     // Simple iteration printing the entries.
-    for (MAP::iterator iter = map.begin ();
+    for (LAZY_MAP::iterator iter = map.begin ();
          iter != map.end ();
          ++iter)
       {
-        MAP::ENTRY &entry = *iter;
+        LAZY_MAP::ENTRY &entry = *iter;
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%d "),
                     entry.int_id_));
@@ -49,11 +49,11 @@ display_map (MAP &map)
 
   {
     // Simple reverse iteration printing the entries.
-    for (MAP::reverse_iterator iter = map.rbegin ();
+    for (LAZY_MAP::reverse_iterator iter = map.rbegin ();
          iter != map.rend ();
          ++iter)
       {
-        MAP::ENTRY &entry = *iter;
+        LAZY_MAP::ENTRY &entry = *iter;
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%d "),
                     entry.int_id_));
@@ -73,7 +73,7 @@ void
 map_test (void)
 {
   // Map of size 3.
-  MAP map (3);
+  LAZY_MAP map (3);
   int i = 0;
 
   // Insert a few entries.
@@ -111,11 +111,11 @@ map_test (void)
   // Remove middle one.
   {
     // Deletion while iterating.
-    for (MAP::iterator iter = map.begin ();
+    for (LAZY_MAP::iterator iter = map.begin ();
          iter != map.end ();
          ++iter)
     {
-      MAP::ENTRY &entry = *iter;
+      LAZY_MAP::ENTRY &entry = *iter;
       if (entry.int_id_ == 1)
         map.unbind (1);
     }
@@ -126,11 +126,11 @@ map_test (void)
   // Remove the entry on one end.
   {
     // Deletion while iterating.
-    for (MAP::iterator iter = map.begin ();
+    for (LAZY_MAP::iterator iter = map.begin ();
          iter != map.end ();
          ++iter)
       {
-        MAP::ENTRY &entry = *iter;
+        LAZY_MAP::ENTRY &entry = *iter;
         if (entry.int_id_ == 0)
           map.unbind (0);
       }
@@ -141,11 +141,11 @@ map_test (void)
   // Remove the entry on the other end.
   {
     // Deletion while iterating.
-    for (MAP::iterator iter = map.begin ();
+    for (LAZY_MAP::iterator iter = map.begin ();
          iter != map.end ();
          ++iter)
       {
-        MAP::ENTRY &entry = *iter;
+        LAZY_MAP::ENTRY &entry = *iter;
         if (entry.int_id_ == 2)
           map.unbind (2);
       }
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index a6f0123f59b..5633691b0a8 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -308,8 +308,8 @@ test_reactive (const ACE_TCHAR *prog,
                   ACE_TEXT ("Reactor::run_event_loop timeout\n")));
       status = 1;
     }
-
-  ACE_DEBUG ((LM_DEBUG, "Reactor::run_event_loop finished\n"));
+  else
+    ACE_DEBUG ((LM_DEBUG, "Reactor::run_event_loop finished\n"));
 
 #if defined (_TEST_USES_THREADS)
   if (ACE_Thread_Manager::instance ()->wait () == -1)
@@ -403,11 +403,11 @@ test_concurrent (const ACE_TCHAR *prog,
     ACE_DEBUG ((LM_DEBUG, "Reactor::run_event_loop finished\n"));
 
 #if defined (_TEST_USES_THREADS)
-  // We need to call this method if we use the
-  // ACE_Thread_Strategy<Echo_Handler>.
-  ACE_Thread_Manager::instance ()->wait ();
+  if (ACE_Thread_Manager::instance ()->wait () == -1)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("wait ()")));
 #else
-  ACE_Process_Manager::instance ()->wait ();
+  if (ACE_Process_Manager::instance ()->wait () == -1)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("wait ()")));
 #endif /* _TEST_USES_THREADS */
 
   if (acceptor.close () == -1)
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index 0cb9bab0827..dd44f380df0 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -63,8 +63,7 @@ client (void *arg)
   ACE_Time_Value *timeout = &tv;
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
 
-  ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) client: Connecting...\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client: Connecting...\n")));
   // Initiate timed connection with server.
 
   // Attempt a timed connect to the server.
@@ -74,24 +73,24 @@ client (void *arg)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) %p\n"),
-      ACE_TEXT ("client: Connection timed out.")));
+                  ACE_TEXT ("client: Connection timed out.")));
       return 0;
     }
 
   if (cli_stream.get_local_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("client: get_local_addr")),
+                       ACE_TEXT ("client: get_local_addr")),
                       0);
 
   ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) client: Connected at %d\n"),
+              ACE_TEXT ("(%P|%t) client: Connected at %d\n"),
               client_addr.get_port_number ()));
 
   if (cli_stream.disable (ACE_NONBLOCK) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("client: disable")));
+                ACE_TEXT ("client: disable")));
 
   // Send data to server (correctly handles "incomplete writes").
 
@@ -100,26 +99,43 @@ client (void *arg)
   for (const char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (cli_stream.send_n (c, 1) == -1)
       {
-      ACE_ERROR ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) (%d) %p\n"), errno,
-        ACE_TEXT ("client: send_n")));
+        // 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.
+        // 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
+          {
+            ACE_DEBUG
+              ((LM_DEBUG,
+                ACE_TEXT ("(%P|%t) client: Connection refused (delayed)\n")));
+            cli_stream.close ();
+            return 0;
+          }
+
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) (errno %d) %p\n"), errno,
+                    ACE_TEXT ("client: send_n")));
         ACE_ERROR ((LM_ERROR, "client: Closing stream.\n"));
         cli_stream.close();
         return 0;
       }
 
   ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) client: Closing writer...\n")));
+              ACE_TEXT ("(%P|%t) client: Closing writer...\n")));
 
   // Explicitly close the writer-side of the connection.
   if (cli_stream.close_writer () == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("client: close_writer")));
+                ACE_TEXT ("client: close_writer")));
   char buf[1];
 
   ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) client: Waiting for server handshake...\n")));
+              ACE_TEXT ("(%P|%t) client: Waiting for server handshake...\n")));
 
   // Wait for handshake with server.
   if (cli_stream.recv_n (buf, 1) != 1)
@@ -127,14 +143,15 @@ client (void *arg)
                 ACE_TEXT ("(%P|%t) %p\n"),
     ACE_TEXT ("client: recv_n")));
 
-  ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P|%t) client: Handshake received. Closing stream.\n")));
+  ACE_DEBUG
+    ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) client: Handshake received. Closing stream.\n")));
 
   // Close the connection completely.
   if (cli_stream.close () == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("client: close")));
+                ACE_TEXT ("client: close")));
   return 0;
 }
 
@@ -147,7 +164,7 @@ server (void *arg)
   if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("server: enable acceptor")));
+                ACE_TEXT ("server: enable acceptor")));
 
   // Keep these objects out here to prevent excessive constructor
   // calls...
@@ -173,7 +190,7 @@ server (void *arg)
       handle_set.reset ();
       handle_set.set_bit (peer_acceptor->get_handle ());
 
-    ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Waiting for connection...\n"));
+      ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Waiting for connection...\n"));
 
       int select_width;
 #  if defined (ACE_WIN64)
@@ -183,26 +200,28 @@ server (void *arg)
 #  else
       select_width = int (peer_acceptor->get_handle ()) + 1;
 #  endif /* ACE_WIN64 */
-    int result = ACE_OS::select (select_width, handle_set, 0, 0, &tv);
+      int result = ACE_OS::select (select_width, handle_set, 0, 0, &tv);
       ACE_ASSERT (tv == def_timeout);
 
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
-      ACE_TEXT ("server: select acceptor")),
+                           ACE_TEXT ("server: select acceptor")),
                           0);
       else if (result == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("(%P|%t) server: Test finished.\n")));
-      // The meaning of the backlog parameter for listen() varies by platform. For
-      // some reason lost to history, the specified value is typically 
-      // backlog * 1.5, backlog * 1.5 + 1, or event taken literally as on Windows.
-      // We'll accept any number less than backlog * 2 as valid.
-      if (num_clients_connected >= BACKLOG * 2)
-        ACE_ERROR((LM_ERROR,
-          "(%P|%t) server: Incorrect # client connections. Expected:%d-%d Actual:%d\n",
-          BACKLOG, BACKLOG * 2, num_clients_connected));
+                      ACE_TEXT ("(%P|%t) server: Test finished.\n")));
+          // The meaning of the backlog parameter for listen() varies by
+          // platform. For some reason lost to history, the specified value
+          // is typically backlog * 1.5, backlog * 1.5 + 1, or event taken
+          // literally as on Windows. We'll accept any number less than
+          // backlog * 2 as valid.
+          if (num_clients_connected >= BACKLOG * 2)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) server: Incorrect # client ")
+                        ACE_TEXT ("connections. Expected:%d-%d Actual:%d\n"),
+                        BACKLOG, BACKLOG * 2, num_clients_connected));
           return 0;
         }
 
@@ -214,9 +233,10 @@ server (void *arg)
         {
           const char *t = ACE_ALPHABET;
 
-      ++num_clients_connected;
+          ++num_clients_connected;
 
           ACE_DEBUG ((LM_DEBUG,
+
         ACE_TEXT ("(%P|%t) server: Client %s connected from %d\n"),
                       ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()),
                       cli_addr.get_port_number ()));
@@ -225,14 +245,14 @@ server (void *arg)
           if (new_stream.enable (ACE_NONBLOCK) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("(%P|%t) %p\n"),
-        ACE_TEXT ("server: enable non blocking i/o")),
+                               ACE_TEXT ("server: enable non blocking i/o")),
                               0);
           handle_set.reset ();
           handle_set.set_bit (new_stream.get_handle ());
 
           // Read data from client (terminate on error).
-      ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("(%P|%t) server: Waiting for data...\n")));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) server: Waiting for data...\n")));
 
           for (ssize_t r_bytes; ;)
             {
@@ -252,7 +272,7 @@ server (void *arg)
                                    ACE_TEXT ("select")),
                                   0);
 
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Receiving data...\n"));
+              ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Receiving data...\n"));
 
               while ((r_bytes = new_stream.recv (buf, 1)) > 0)
                 {
@@ -260,39 +280,42 @@ server (void *arg)
                   t++;
                 }
 
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Received data.\n"));
+              ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Received data.\n"));
 
               if (r_bytes == 0)
                 {
                   // Handshake back with client.
-                  ACE_DEBUG ((LM_DEBUG,
-            ACE_TEXT ("(%P|%t) server: Connection closed by client.\n")));
+                  ACE_DEBUG
+                    ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) server: Connection closed by client.\n")));
 
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Sending handshake.\n"));
+                  ACE_DEBUG
+                    ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) server: Sending handshake.\n")));
 
                   if (new_stream.send_n ("", 1) != 1)
                     ACE_ERROR ((LM_ERROR,
                                 ACE_TEXT ("(%P|%t) %p\n"),
-            ACE_TEXT ("server: send_n")));
+                                ACE_TEXT ("server: send_n")));
 
-          ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Closing stream.\n"));
+                  ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Closing stream.\n"));
 
                   // Close endpoint.
                   if (new_stream.close () == -1)
                     ACE_ERROR ((LM_ERROR,
                                 ACE_TEXT ("(%P|%t) %p\n"),
-            ACE_TEXT ("server: close")));
+                                ACE_TEXT ("server: close")));
                   break;
                 }
               else if (r_bytes == -1)
                 {
                   if (errno == EWOULDBLOCK || errno == EAGAIN)
                     ACE_DEBUG ((LM_DEBUG,
-            ACE_TEXT ("(%P|%t) server: (EWOULDBLOCK) Waiting for more data...\n")));
+                                ACE_TEXT ("(%P|%t) server: (EWOULDBLOCK) Waiting for more data...\n")));
                   else
                     ACE_ERROR_RETURN ((LM_ERROR,
                                        ACE_TEXT ("(%P|%t) %p\n"),
-            ACE_TEXT ("server: recv_n")),
+                                       ACE_TEXT ("server: recv_n")),
                                       0);
                 }
             }
@@ -301,11 +324,11 @@ server (void *arg)
         {
           if (errno == EWOULDBLOCK)
             ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT ("(%P|%t) server: No more connections pending.\n")));
+                        ACE_TEXT ("(%P|%t) server: No more connections pending.\n")));
           else
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
-        ACE_TEXT ("server: accept")));
+                        ACE_TEXT ("server: accept")));
         }
     }
   ACE_NOTREACHED (return 0);
@@ -327,7 +350,7 @@ spawn (int num_clients)
       || peer_acceptor.get_local_addr (server_addr) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("(%P|%t) %p\n"),
-    ACE_TEXT ("spawn: open")));
+                ACE_TEXT ("spawn: open")));
   else
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -341,8 +364,8 @@ spawn (int num_clients)
             {
             case -1:
               ACE_ERROR ((LM_ERROR,
-          "(%P|%t) %p\n", "spawn: fork failed"));
-        i = num_clients;
+                          ACE_TEXT ("(%P|%t) %p\n"), "spawn: fork failed"));
+              i = num_clients;
               // Break out of 'for' loop.
               break;
             case 0:
@@ -361,11 +384,11 @@ spawn (int num_clients)
       // Reap the child pids.
       for (pid_t pid; (pid = ACE_OS::wait ()) != -1; )
         ACE_DEBUG ((LM_DEBUG,
-      "(%P|%t) spawn: reaping pid %d\n", pid));
+                    ACE_TEXT ("(%P|%t) spawn: reaping pid %d\n"), pid));
 
 #elif defined (ACE_HAS_THREADS)
 
-    ACE_DEBUG((LM_DEBUG, "Spawning server...\n"));
+      ACE_DEBUG((LM_DEBUG, "Spawning server...\n"));
 
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (server),
@@ -373,33 +396,34 @@ spawn (int num_clients)
            THR_BOUND | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
-      ACE_TEXT ("spawn: failed"),
+                    ACE_TEXT ("spawn: failed"),
                     1));
 
-    ACE_DEBUG((LM_DEBUG, "Spawning %d clients...\n", num_clients));
+      ACE_DEBUG((LM_DEBUG, "Spawning %d clients...\n", num_clients));
 
       if (ACE_Thread_Manager::instance ()->spawn_n
-      (num_clients,
+          (num_clients,
            ACE_THR_FUNC (client),
            (void *) &server_addr,
            THR_BOUND | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
-      ACE_TEXT ("spawn: failed 2"),
+                    ACE_TEXT ("spawn: failed 2"),
                     1));
 
-    ACE_DEBUG((LM_DEBUG, "Waiting for threads to finish...\n"));
+      ACE_DEBUG((LM_DEBUG, "Waiting for threads to finish...\n"));
 
       // Wait for the threads to exit.
       ACE_Thread_Manager::instance ()->wait ();
 #else
       ACE_ERROR ((LM_INFO,
                   ACE_TEXT ("(%P|%t) ")
-      ACE_TEXT ("spawn: only one thread may be run")
+                  ACE_TEXT ("spawn: only one thread may be run")
                   ACE_TEXT (" in a process on this platform\n")));
 #endif /* !ACE_LACKS_FORK */
 
-    ACE_DEBUG((LM_DEBUG, "Threads complete. Closing Acceptor.\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Threads complete. Closing Acceptor.\n")));
 
       peer_acceptor.close ();
     }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b938b17723..9bc4dccb510 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ./bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/./MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/./MPC/templates -type automake -noreldefs ACE.mwc
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -20,6 +20,9 @@ SUBDIRS = \
 ## Makefile.Test_Output.am
 
 noinst_SCRIPTS = run_test.pl run_test.lst
+dist_check_SCRIPTS = run_test.pl run_test.lst
+TESTS = $(noinst_PROGRAMS)
+TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t
 
 noinst_LTLIBRARIES = libTest_Output.la
 
@@ -186,31 +189,18 @@ Barrier_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Based_Pointer_Test.am
-noinst_PROGRAMS += Based_Pointer_Test
-
-Based_Pointer_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Based_Pointer_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Based_Pointer_Test.cpp
-
-Based_Pointer_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.Based_Pointer_Test_Lib.am
 
-noinst_LTLIBRARIES += libBased_Pointer_Test.la
+if !BUILD_ACE_FOR_TAO
 
-libBased_Pointer_Test_la_CPPFLAGS = \
+noinst_LTLIBRARIES += libBased_Pointer_Test_Lib.la
+
+libBased_Pointer_Test_Lib_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_SVC_BUILD_DLL
 
-libBased_Pointer_Test_la_SOURCES = \
+libBased_Pointer_Test_Lib_la_SOURCES = \
   Based_Pointer_Test_Lib.cpp
 
 noinst_HEADERS += \
@@ -259,6 +249,27 @@ noinst_HEADERS += \
   Upgradable_RW_Test.h \
   test_config.h
 
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Based_Pointer_Test.am
+
+if !BUILD_ACE_FOR_TAO
+noinst_PROGRAMS += Based_Pointer_Test
+
+Based_Pointer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Based_Pointer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Based_Pointer_Test.cpp
+
+Based_Pointer_Test_LDADD = \
+  libTest_Output.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Basic_Types_Test.am
 noinst_PROGRAMS += Basic_Types_Test
 
@@ -275,6 +286,8 @@ Basic_Types_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Bound_Ptr_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Bound_Ptr_Test
 
 Bound_Ptr_Test_CPPFLAGS = \
@@ -290,6 +303,8 @@ Bound_Ptr_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Buffer_Stream_Test.am
 noinst_PROGRAMS += Buffer_Stream_Test
 
@@ -321,6 +336,8 @@ Bug_1576_Regression_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.CDR_Array_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += CDR_Array_Test
 
 CDR_Array_Test_CPPFLAGS = \
@@ -335,7 +352,11 @@ CDR_Array_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.CDR_File_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += CDR_File_Test
 
 CDR_File_Test_CPPFLAGS = \
@@ -352,6 +373,8 @@ CDR_File_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.CDR_Test.am
 noinst_PROGRAMS += CDR_Test
 
@@ -384,6 +407,8 @@ Cache_Map_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Cached_Accept_Conn_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Cached_Accept_Conn_Test
 
 Cached_Accept_Conn_Test_CPPFLAGS = \
@@ -399,7 +424,11 @@ Cached_Accept_Conn_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Cached_Allocator_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Cached_Allocator_Test
 
 Cached_Allocator_Test_CPPFLAGS = \
@@ -414,7 +443,11 @@ Cached_Allocator_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Cached_Conn_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Cached_Conn_Test
 
 Cached_Conn_Test_CPPFLAGS = \
@@ -430,7 +463,11 @@ Cached_Conn_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Capabilities_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Capabilities_Test
 
 Capabilities_Test_CPPFLAGS = \
@@ -445,9 +482,12 @@ Capabilities_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Codecs_Test.am
 
 if BUILD_ACE_CODECS
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Codecs_Test
 
 Codecs_Test_CPPFLAGS = \
@@ -462,6 +502,7 @@ Codecs_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_CODECS
 
 ## Makefile.Collection_Test.am
@@ -481,6 +522,8 @@ Collection_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Config_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Config_Test
 
 Config_Test_CPPFLAGS = \
@@ -496,7 +539,11 @@ Config_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Conn_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Conn_Test
 
 Conn_Test_CPPFLAGS = \
@@ -512,58 +559,62 @@ Conn_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.DLL_Test.am
-noinst_PROGRAMS += DLL_Test
+endif !BUILD_ACE_FOR_TAO
 
-DLL_Test_CPPFLAGS = \
+## Makefile.DLL_Test_Parent_Lib.am
+
+noinst_LTLIBRARIES += libDLL_Test_Parent.la
+
+libDLL_Test_Parent_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  -DDLL_TEST_PARENT_BUILD_DLL
 
-DLL_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  DLL_Test.cpp \
-  DLL_Test.h
+libDLL_Test_Parent_la_SOURCES = \
+  DLL_Test_Parent.cpp
 
-DLL_Test_LDADD = \
-  libDLL_Test.la \
-  libDLL_Test_Parent.la \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+noinst_HEADERS += \
+  DLL_Test_Parent.h \
+  DLL_Test_Parent_Export.h \
+  test_config.h
 
 ## Makefile.DLL_Test_Lib.am
 
-noinst_LTLIBRARIES += libDLL_Test.la
+noinst_LTLIBRARIES += libDLL_Test_Lib.la
 
-libDLL_Test_la_CPPFLAGS = \
+libDLL_Test_Lib_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_SVC_BUILD_DLL
 
-libDLL_Test_la_SOURCES = \
+libDLL_Test_Lib_la_SOURCES = \
   DLL_Test_Impl.cpp
 
 noinst_HEADERS += \
   DLL_Test_Impl.h \
   test_config.h
 
-## Makefile.DLL_Test_Parent_Lib.am
-
-noinst_LTLIBRARIES += libDLL_Test_Parent.la
+## Makefile.DLL_Test.am
+noinst_PROGRAMS += DLL_Test
 
-libDLL_Test_Parent_la_CPPFLAGS = \
+DLL_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -DDLL_TEST_PARENT_BUILD_DLL
+  -I$(ACE_BUILDDIR)
 
-libDLL_Test_Parent_la_SOURCES = \
-  DLL_Test_Parent.cpp
+DLL_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  DLL_Test.cpp \
+  DLL_Test.h
 
-noinst_HEADERS += \
-  DLL_Test_Parent.h \
-  DLL_Test_Parent_Export.h \
-  test_config.h
+DLL_Test_LDADD = \
+  libDLL_Test_Lib.la \
+  libDLL_Test_Parent.la \
+  libTest_Output.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.DLList_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += DLList_Test
 
 DLList_Test_CPPFLAGS = \
@@ -578,7 +629,11 @@ DLList_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Date_Time_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Date_Time_Test
 
 Date_Time_Test_CPPFLAGS = \
@@ -593,6 +648,8 @@ Date_Time_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Dev_Poll_Reactor_Test.am
 noinst_PROGRAMS += Dev_Poll_Reactor_Test
 
@@ -669,6 +726,8 @@ Env_Value_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.FIFO_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += FIFO_Test
 
 FIFO_Test_CPPFLAGS = \
@@ -683,6 +742,8 @@ FIFO_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.FlReactor_Test.am
 
 if BUILD_ACE_FLREACTOR
@@ -694,16 +755,21 @@ noinst_PROGRAMS += FlReactor_Test
 
 FlReactor_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  $(ACE_FLTK_CPPFLAGS)
 
 FlReactor_Test_SOURCES = \
   $(ACE_ROOT)/tests/Main.cpp \
   FlReactor_Test.cpp
 
+FlReactor_Test_LDFLAGS = \
+ $(ACE_FLTK_LDFLAGS)
+
 FlReactor_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
   libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_FLTK_LIBS)
 
 endif BUILD_X11
 endif BUILD_GL
@@ -743,6 +809,8 @@ Framework_Component_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Future_Set_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Future_Set_Test
 
 Future_Set_Test_CPPFLAGS = \
@@ -757,7 +825,11 @@ Future_Set_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Future_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Future_Test
 
 Future_Test_CPPFLAGS = \
@@ -772,6 +844,8 @@ Future_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Get_Opt_Test.am
 noinst_PROGRAMS += Get_Opt_Test
 
@@ -788,6 +862,8 @@ Get_Opt_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Handle_Set_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Handle_Set_Test
 
 Handle_Set_Test_CPPFLAGS = \
@@ -802,6 +878,8 @@ Handle_Set_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Hash_Map_Bucket_Iterator_Test.am
 noinst_PROGRAMS += Hash_Map_Bucket_Iterator_Test
 
@@ -833,6 +911,8 @@ Hash_Map_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.High_Res_Timer_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += High_Res_Timer_Test
 
 High_Res_Timer_Test_CPPFLAGS = \
@@ -847,6 +927,8 @@ High_Res_Timer_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.INET_Addr_Test.am
 noinst_PROGRAMS += INET_Addr_Test
 
@@ -908,6 +990,8 @@ Lazy_Map_Manager_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Log_Msg_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Log_Msg_Test
 
 Log_Msg_Test_CPPFLAGS = \
@@ -922,6 +1006,8 @@ Log_Msg_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Logging_Strategy_Test.am
 noinst_PROGRAMS += Logging_Strategy_Test
 
@@ -938,6 +1024,8 @@ Logging_Strategy_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.MEM_Stream_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += MEM_Stream_Test
 
 MEM_Stream_Test_CPPFLAGS = \
@@ -953,7 +1041,11 @@ MEM_Stream_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.MM_Shared_Memory_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += MM_Shared_Memory_Test
 
 MM_Shared_Memory_Test_CPPFLAGS = \
@@ -968,6 +1060,8 @@ MM_Shared_Memory_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.MT_Reactor_Timer_Test.am
 noinst_PROGRAMS += MT_Reactor_Timer_Test
 
@@ -1045,6 +1139,8 @@ MT_SOCK_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Malloc_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Malloc_Test
 
 Malloc_Test_CPPFLAGS = \
@@ -1060,6 +1156,8 @@ Malloc_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Manual_Event_Test.am
 noinst_PROGRAMS += Manual_Event_Test
 
@@ -1076,6 +1174,8 @@ Manual_Event_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Map_Manager_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Map_Manager_Test
 
 Map_Manager_Test_CPPFLAGS = \
@@ -1090,7 +1190,11 @@ Map_Manager_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Map_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Map_Test
 
 Map_Test_CPPFLAGS = \
@@ -1106,6 +1210,8 @@ Map_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Max_Default_Port_Test.am
 noinst_PROGRAMS += Max_Default_Port_Test
 
@@ -1138,6 +1244,8 @@ Max_Default_Port_Test_IPV6_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Mem_Map_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Mem_Map_Test
 
 Mem_Map_Test_CPPFLAGS = \
@@ -1152,7 +1260,11 @@ Mem_Map_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Memcpy_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Memcpy_Test
 
 Memcpy_Test_CPPFLAGS = \
@@ -1167,7 +1279,11 @@ Memcpy_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Message_Block_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Message_Block_Test
 
 Message_Block_Test_CPPFLAGS = \
@@ -1182,6 +1298,8 @@ Message_Block_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Message_Queue_Notifications_Test.am
 noinst_PROGRAMS += Message_Queue_Notifications_Test
 
@@ -1198,6 +1316,8 @@ Message_Queue_Notifications_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Message_Queue_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Message_Queue_Test
 
 Message_Queue_Test_CPPFLAGS = \
@@ -1212,7 +1332,11 @@ Message_Queue_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Message_Queue_Test_Ex.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Message_Queue_Test_Ex
 
 Message_Queue_Test_Ex_CPPFLAGS = \
@@ -1228,6 +1352,8 @@ Message_Queue_Test_Ex_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Multicast_Test.am
 noinst_PROGRAMS += Multicast_Test
 
@@ -1259,6 +1385,8 @@ Multicast_Test_IPV6_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Multihomed_INET_Addr_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Multihomed_INET_Addr_Test
 
 Multihomed_INET_Addr_Test_CPPFLAGS = \
@@ -1273,7 +1401,11 @@ Multihomed_INET_Addr_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Multihomed_INET_Addr_Test_IPV6.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Multihomed_INET_Addr_Test_IPV6
 
 Multihomed_INET_Addr_Test_IPV6_CPPFLAGS = \
@@ -1288,9 +1420,12 @@ Multihomed_INET_Addr_Test_IPV6_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Naming_Test.am
 
 if BUILD_ACE_OTHER
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Naming_Test
 
 Naming_Test_CPPFLAGS = \
@@ -1305,6 +1440,7 @@ Naming_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_OTHER
 
 ## Makefile.Network_Adapters_Test.am
@@ -1355,6 +1491,8 @@ NonBlocking_Conn_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Notify_Performance_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Notify_Performance_Test
 
 Notify_Performance_Test_CPPFLAGS = \
@@ -1369,6 +1507,8 @@ Notify_Performance_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.OS_Test.am
 noinst_PROGRAMS += OS_Test
 
@@ -1460,6 +1600,8 @@ Priority_Buffer_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Priority_Reactor_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Priority_Reactor_Test
 
 Priority_Reactor_Test_CPPFLAGS = \
@@ -1475,6 +1617,8 @@ Priority_Reactor_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Priority_Task_Test.am
 noinst_PROGRAMS += Priority_Task_Test
 
@@ -1491,6 +1635,8 @@ Priority_Task_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Proactor_Scatter_Gather_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Proactor_Scatter_Gather_Test
 
 Proactor_Scatter_Gather_Test_CPPFLAGS = \
@@ -1505,7 +1651,11 @@ Proactor_Scatter_Gather_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Proactor_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Proactor_Test
 
 Proactor_Test_CPPFLAGS = \
@@ -1521,7 +1671,11 @@ Proactor_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Proactor_Test_IPV6.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Proactor_Test_IPV6
 
 Proactor_Test_IPV6_CPPFLAGS = \
@@ -1536,7 +1690,11 @@ Proactor_Test_IPV6_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Proactor_Timer_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Proactor_Timer_Test
 
 Proactor_Timer_Test_CPPFLAGS = \
@@ -1551,7 +1709,11 @@ Proactor_Timer_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Process_Manager_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Process_Manager_Test
 
 Process_Manager_Test_CPPFLAGS = \
@@ -1566,6 +1728,8 @@ Process_Manager_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Process_Manual_Event_Test.am
 noinst_PROGRAMS += Process_Manual_Event_Test
 
@@ -1582,6 +1746,8 @@ Process_Manual_Event_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Process_Mutex_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Process_Mutex_Test
 
 Process_Mutex_Test_CPPFLAGS = \
@@ -1596,7 +1762,11 @@ Process_Mutex_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Process_Semaphore_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Process_Semaphore_Test
 
 Process_Semaphore_Test_CPPFLAGS = \
@@ -1611,7 +1781,11 @@ Process_Semaphore_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Process_Strategy_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Process_Strategy_Test
 
 Process_Strategy_Test_CPPFLAGS = \
@@ -1627,6 +1801,8 @@ Process_Strategy_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.QtReactor_Test.am
 
 if BUILD_ACE_QTREACTOR
@@ -1646,8 +1822,7 @@ noinst_PROGRAMS += QtReactor_Test
 QtReactor_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
-  -I$(QTDIR)/include \
-  -DQT_THREAD_SUPPORT
+  $(ACE_QT_CPPFLAGS)
 
 QtReactor_Test_SOURCES = \
   $(ACE_ROOT)/tests/Main.cpp \
@@ -1655,11 +1830,14 @@ QtReactor_Test_SOURCES = \
   QtReactor_Test_moc.cpp \
   QtReactor_Test.h
 
+QtReactor_Test_LDFLAGS = \
+ $(ACE_QT_LDFLAGS)
+
 QtReactor_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la \
-  -lqt-mt
+  $(ACE_QT_LIBS)
 
 endif BUILD_QT
 endif BUILD_ACE_QTREACTOR
@@ -1726,6 +1904,8 @@ Reactor_Notification_Queue_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Notify_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Reactor_Notify_Test
 
 Reactor_Notify_Test_CPPFLAGS = \
@@ -1740,7 +1920,11 @@ Reactor_Notify_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Reactor_Performance_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Reactor_Performance_Test
 
 Reactor_Performance_Test_CPPFLAGS = \
@@ -1756,6 +1940,8 @@ Reactor_Performance_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Reactor_Registration_Test.am
 noinst_PROGRAMS += Reactor_Registration_Test
 
@@ -1772,6 +1958,8 @@ Reactor_Registration_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Reactor_Timer_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Reactor_Timer_Test
 
 Reactor_Timer_Test_CPPFLAGS = \
@@ -1786,6 +1974,8 @@ Reactor_Timer_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Reactors_Test.am
 noinst_PROGRAMS += Reactors_Test
 
@@ -1862,6 +2052,8 @@ Recursive_Mutex_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Refcounted_Auto_Ptr_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Refcounted_Auto_Ptr_Test
 
 Refcounted_Auto_Ptr_Test_CPPFLAGS = \
@@ -1877,6 +2069,8 @@ Refcounted_Auto_Ptr_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Reference_Counted_Event_Handler_Test.am
 noinst_PROGRAMS += Reference_Counted_Event_Handler_Test
 
@@ -1923,6 +2117,8 @@ SOCK_Connector_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_Dgram_Bcast_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SOCK_Dgram_Bcast_Test
 
 SOCK_Dgram_Bcast_Test_CPPFLAGS = \
@@ -1937,6 +2133,8 @@ SOCK_Dgram_Bcast_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.SOCK_Dgram_Test.am
 noinst_PROGRAMS += SOCK_Dgram_Test
 
@@ -1953,6 +2151,8 @@ SOCK_Dgram_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SOCK_SEQPACK_SCTP_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SOCK_SEQPACK_SCTP_Test
 
 SOCK_SEQPACK_SCTP_Test_CPPFLAGS = \
@@ -1967,6 +2167,8 @@ SOCK_SEQPACK_SCTP_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.SOCK_Send_Recv_Test.am
 noinst_PROGRAMS += SOCK_Send_Recv_Test
 
@@ -2028,6 +2230,8 @@ SOCK_Test_IPv6_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SPIPE_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SPIPE_Test
 
 SPIPE_Test_CPPFLAGS = \
@@ -2042,6 +2246,8 @@ SPIPE_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.SString_Test.am
 noinst_PROGRAMS += SString_Test
 
@@ -2058,6 +2264,8 @@ SString_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.SV_Shared_Memory_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SV_Shared_Memory_Test
 
 SV_Shared_Memory_Test_CPPFLAGS = \
@@ -2072,7 +2280,11 @@ SV_Shared_Memory_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Semaphore_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Semaphore_Test
 
 Semaphore_Test_CPPFLAGS = \
@@ -2087,6 +2299,8 @@ Semaphore_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Service_Config_DLL.am
 
 noinst_LTLIBRARIES += libService_Config_DLL.la
@@ -2164,6 +2378,8 @@ Simple_Message_Block_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Svc_Handler_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Svc_Handler_Test
 
 Svc_Handler_Test_CPPFLAGS = \
@@ -2178,7 +2394,11 @@ Svc_Handler_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.TP_Reactor_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += TP_Reactor_Test
 
 TP_Reactor_Test_CPPFLAGS = \
@@ -2194,6 +2414,8 @@ TP_Reactor_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.TSS_Static_Test.am
 noinst_PROGRAMS += TSS_Static_Test
 
@@ -2416,6 +2638,8 @@ Timer_Queue_Reference_Counting_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Timer_Queue_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Timer_Queue_Test
 
 Timer_Queue_Test_CPPFLAGS = \
@@ -2430,6 +2654,8 @@ Timer_Queue_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.TkReactor_Test.am
 
 if BUILD_ACE_TKREACTOR
@@ -2439,16 +2665,23 @@ noinst_PROGRAMS += TkReactor_Test
 
 TkReactor_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
+  -I$(ACE_BUILDDIR) \
+  $(ACE_TK_CPPFLAGS) \
+  $(ACE_TCL_CPPFLAGS)
 
 TkReactor_Test_SOURCES = \
   $(ACE_ROOT)/tests/Main.cpp \
   TkReactor_Test.cpp
 
+TkReactor_Test_LDFLAGS = \
+ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
+
 TkReactor_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \
   libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  $(ACE_TK_LIBS) \
+  $(ACE_TCL_LIBS)
 
 endif BUILD_TK
 endif BUILD_ACE_TKREACTOR
@@ -2488,6 +2721,8 @@ Tokens_Test_LDADD = \
 endif BUILD_ACE_TOKEN
 
 ## Makefile.UPIPE_SAP_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += UPIPE_SAP_Test
 
 UPIPE_SAP_Test_CPPFLAGS = \
@@ -2502,9 +2737,12 @@ UPIPE_SAP_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.UUIDTest.am
 
 if BUILD_ACE_UUID
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += UUIDTest
 
 UUIDTest_CPPFLAGS = \
@@ -2519,6 +2757,7 @@ UUIDTest_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACE_UUID
 
 ## Makefile.Unbounded_Set_Test.am
@@ -2537,6 +2776,8 @@ Unbounded_Set_Test_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.Upgradable_RW_Test.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += Upgradable_RW_Test
 
 Upgradable_RW_Test_CPPFLAGS = \
@@ -2552,6 +2793,8 @@ Upgradable_RW_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Makefile.Vector_Test.am
 noinst_PROGRAMS += Vector_Test
 
@@ -2582,6 +2825,76 @@ WFMO_Reactor_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+## Makefile.XtAthenaReactor_Test.am
+
+if BUILD_ACE_XTREACTOR
+if BUILD_ATHENA
+if BUILD_X11
+if BUILD_XT
+
+noinst_PROGRAMS += XtAthenaReactor_Test
+
+XtAthenaReactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  $(ACE_X11_CPPFLAGS) \
+  $(ACE_XT_CPPFLAGS)
+
+XtAthenaReactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  XtAthenaReactor_Test.cpp
+
+XtAthenaReactor_Test_LDFLAGS = \
+ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
+
+XtAthenaReactor_Test_LDADD = \
+  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
+  libTest_Output.la \
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  -lXaw \
+  $(ACE_XT_LIBS) \
+  $(ACE_X11_LIBS)
+
+endif BUILD_XT
+endif BUILD_X11
+endif BUILD_ATHENA
+endif BUILD_ACE_XTREACTOR
+
+## Makefile.XtMotifReactor_Test.am
+
+if BUILD_ACE_XTREACTOR
+if BUILD_MOTIF
+if BUILD_X11
+if BUILD_XT
+
+noinst_PROGRAMS += XtMotifReactor_Test
+
+XtMotifReactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  $(ACE_X11_CPPFLAGS) \
+  $(ACE_XT_CPPFLAGS)
+
+XtMotifReactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  XtMotifReactor_Test.cpp
+
+XtMotifReactor_Test_LDFLAGS = \
+ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
+
+XtMotifReactor_Test_LDADD = \
+  $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
+  libTest_Output.la \
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  -lXm \
+  $(ACE_XT_LIBS) \
+  $(ACE_X11_LIBS)
+
+endif BUILD_XT
+endif BUILD_X11
+endif BUILD_MOTIF
+endif BUILD_ACE_XTREACTOR
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index 9a8a634662f..8fb46dd983a 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -28,7 +28,7 @@ ACE_RCSID(tests, Map_Test, "$Id$")
 typedef size_t VALUE;
 
 // Generic map type.
-typedef ACE_Map<KEY, VALUE> MAP;
+typedef ACE_Map<KEY, VALUE> TEST_MAP;
 
 // Manager Manager adapter.
 typedef ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator> MAP_MANAGER_ADAPTER;
@@ -40,7 +40,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>,
 typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER;
 
 static void
-functionality_test (MAP &map,
+functionality_test (TEST_MAP &map,
                     size_t iterations)
 {
   size_t counter;
@@ -78,13 +78,13 @@ functionality_test (MAP &map,
   // Forward iteration...
   {
     counter = 0;
-    MAP::iterator end = map.end ();
+    TEST_MAP::iterator end = map.end ();
 
-    for (MAP::iterator iter = map.begin ();
+    for (TEST_MAP::iterator iter = map.begin ();
          iter != end;
          ++iter, ++counter)
       {
-        MAP::value_type entry = *iter;
+        TEST_MAP::value_type entry = *iter;
 
         // Recover original key.
         KEY original_key;
@@ -116,14 +116,14 @@ functionality_test (MAP &map,
   // Reverse iteration...
   {
     counter = iterations;
-    MAP::reverse_iterator end = map.rend ();
+    TEST_MAP::reverse_iterator end = map.rend ();
 
-    for (MAP::reverse_iterator iter = map.rbegin ();
+    for (TEST_MAP::reverse_iterator iter = map.rbegin ();
          iter != end;
          ++iter)
       {
         --counter;
-        MAP::value_type entry = *iter;
+        TEST_MAP::value_type entry = *iter;
 
         // Recover original key.
         KEY original_key;
@@ -175,7 +175,7 @@ functionality_test (MAP &map,
 }
 
 static void
-insert_test (MAP &map,
+insert_test (TEST_MAP &map,
              size_t iterations,
              KEY *keys)
 {
@@ -190,7 +190,7 @@ insert_test (MAP &map,
 }
 
 static void
-find_test (MAP &map,
+find_test (TEST_MAP &map,
            size_t iterations,
            KEY *keys)
 {
@@ -204,7 +204,7 @@ find_test (MAP &map,
 }
 
 static void
-unbind_test (MAP &map,
+unbind_test (TEST_MAP &map,
              size_t iterations,
              KEY *keys)
 {
@@ -219,8 +219,8 @@ unbind_test (MAP &map,
 }
 
 static void
-performance_test (void (*ptf) (MAP &, size_t, KEY *),
-                  MAP &map,
+performance_test (void (*ptf) (TEST_MAP &, size_t, KEY *),
+                  TEST_MAP &map,
                   size_t iterations,
                   KEY *keys,
                   size_t table_size,
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 57ac4740792..dd42dd8f61f 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -101,9 +101,11 @@ Worker_Task::svc (void)
 
   for (int count = 0; ; count++)
     {
-      ACE_Message_Block *mb;
+      ACE_Message_Block *mb = 0;
 
-      ACE_ASSERT (this->msg_queue ()->dequeue_head (mb) != -1);
+      int dequeue_results = this->msg_queue ()->dequeue_head (mb);
+
+      ACE_ASSERT (dequeue_results != -1);
 
       size_t length = mb->length ();
 
@@ -113,7 +115,10 @@ Worker_Task::svc (void)
       // contents (i.e., the Data_Block portion), it just makes a copy
       // of the header and reference counts the data.
       if (this->next () != 0)
-        ACE_ASSERT (this->put_next (mb->duplicate ()) != -1);
+        {
+          int duplicate_result = this->put_next (mb->duplicate ());
+        ACE_ASSERT (duplicate_result != -1);
+        }
 
       // If there's no next() Task to send to, then we'll consume the
       // message here.
@@ -143,10 +148,13 @@ Worker_Task::svc (void)
               // threads.
               dup->msg_priority (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY + 1);
 
-              ACE_ASSERT (this->msg_queue ()->enqueue_prio
+              int enqueue_prio_result =
+                   this->msg_queue ()->enqueue_prio
                           (dup,
                            // Don't block indefinitely if we flow control...
-                           (ACE_Time_Value *) &ACE_Time_Value::zero) != -1);
+                           (ACE_Time_Value *) &ACE_Time_Value::zero);
+
+              ACE_ASSERT (enqueue_prio_result != -1);
             }
 
           ACE_DEBUG ((LM_DEBUG,
@@ -156,8 +164,11 @@ Worker_Task::svc (void)
           // Dequeue the same <current_count> duplicates.
           for (i = current_count; i > 0; i--)
             {
-              ACE_ASSERT (this->msg_queue ()->dequeue_head (dup) != -1);
+              int deqresult = this->msg_queue ()->dequeue_head (dup);
+              ACE_ASSERT (deqresult != -1);
+              //ACE_ASSERT (this->msg_queue ()->dequeue_head (dup) != -1);
               ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (dup->rd_ptr ())));
+
               ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), dup->rd_ptr ()) == 0);
               ACE_ASSERT (dup->msg_priority () == ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY + 1);
               dup->release ();
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 62863c99d1e..fc2b16b0d43 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -183,6 +183,98 @@ iterator_test (void)
 #if defined (ACE_HAS_THREADS)
 
 static int
+chained_block_test (void)
+{
+
+  QUEUE q;
+  const char * s = "123456789";      // Will be length 10 when copied to block
+  const size_t slen = 10;
+  const size_t num_blks = 10;
+  ACE_Message_Block b[num_blks];
+  size_t i;
+  int status = 0;
+
+  for (i = 0; i < num_blks; ++i)
+    {
+      b[i].init (slen);
+      b[i].copy (s);
+    }
+
+  // Test enqueueing single and chained blocks and be sure they end up with
+  // the proper enqueued block count and sizes. Then be sure they are dequeued
+  // in the proper order.
+  b[0].next (&b[1]);
+  b[1].next (&b[2]);
+  // b[3] and b[4] are unchained.
+  b[5].next (&b[6]);
+  b[6].next (&b[7]);
+  b[7].next (&b[8]);
+  // b[9] is unchained
+  q.enqueue_tail (&b[3]);
+  q.enqueue_tail (&b[4]);
+  int num = q.enqueue_head (&b[0]);
+  if (num != 5)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Chained enqueue expected 5; has %d\n"),
+                  num));
+      status = -1;
+    }
+  num = q.enqueue_tail (&b[5]);
+  if (num != 9)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Chained enqueue expected 9; has %d\n"),
+                  num));
+      status = -1;
+    }
+  num = q.enqueue_tail (&b[9]);
+  if (num != 10)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Chained enqueue expected 10; has %d\n"),
+                  num));
+      status = -1;
+    }
+  size_t msgs, bytes;
+  msgs = q.message_count ();
+  bytes = q.message_bytes ();
+  if (msgs != 10 || bytes != 100)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("Chained enqueue totals: %d msgs, %d bytes; ")
+                  ACE_TEXT ("should be 10 msgs, 100 bytes\n"),
+                  (int)msgs, (int)bytes));
+      status = -1;
+    }
+
+  // Now see if we can dequeue them, checking the order.
+  ACE_Time_Value nowait (ACE_OS::gettimeofday ());
+  ACE_Message_Block *bp;
+  int qstat;
+  for (i = 0; i < num_blks; ++i)
+    {
+      qstat = q.dequeue_head (bp, &nowait);
+      if (qstat == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Checking chained blocks, pass %d: %p\n"),
+                      (int)i, ACE_TEXT ("dequeue_head")));
+          status = -1;
+        }
+      else if (bp != &b[i])
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Checking chained blocks, pass %d: ")
+                      ACE_TEXT ("block out of order\n"),
+                      (int)i));
+          status = -1;
+        }
+    }
+
+  if (status == 0)
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Chained block test OK\n")));
+  return status;
+}
+
+static int
 single_thread_performance_test (int queue_type = 0)
 {
   const char test_message[] =
@@ -562,6 +654,9 @@ run_main (int argc, ACE_TCHAR *argv[])
     status = timeout_test ();
 
   if (status == 0)
+    status = chained_block_test ();
+
+  if (status == 0)
     status = single_thread_performance_test ();
 
 # if defined (VXWORKS) || (defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0))
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index 8c40a7c16c7..c436cd9cbbf 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -65,7 +65,8 @@ test_bind (ACE_Naming_Context &ns_context)
       ACE_NS_WString w_value (value);
 
       ACE_OS::sprintf (type, "%s%d", "type", array [i]);
-      ACE_ASSERT (ns_context.bind (w_name, w_value, type) != -1);
+      int bind_result = ns_context.bind (w_name, w_value, type);
+      ACE_ASSERT (bind_result != -1);
     }
 }
 
@@ -79,7 +80,10 @@ test_find_failure (ACE_Naming_Context &ns_context)
 
   // Do the finds.
   for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
-    ACE_ASSERT (ns_context.resolve (w_name, w_value, l_type) == -1);
+    {
+      int resolve = ns_context.resolve (w_name, w_value, l_type);
+      ACE_ASSERT (resolve == -1);
+    }
 }
 
 static void
@@ -98,7 +102,8 @@ test_rebind (ACE_Naming_Context &ns_context)
       ACE_NS_WString w_value (value);
 
       ACE_OS::sprintf (type, "%s%d", "type", -array[i]);
-      ACE_ASSERT (ns_context.rebind (w_name, w_value, type) != -1);
+      int rebind = ns_context.rebind (w_name, w_value, type);
+      ACE_ASSERT (rebind != -1);
     }
 }
 
@@ -113,7 +118,8 @@ test_unbind (ACE_Naming_Context &ns_context)
     {
       ACE_OS::sprintf (name, "%s%d", "name", array[i]);
       ACE_NS_WString w_name (name);
-      ACE_ASSERT (ns_context.unbind (w_name) != -1);
+      int unbind = ns_context.unbind (w_name);
+      ACE_ASSERT (unbind != -1);
     }
 }
 
@@ -147,7 +153,8 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
       char *type_out = 0;
       ACE_NS_WString val (temp_val);
 
-      ACE_ASSERT (ns_context.resolve (w_name, w_value, type_out) == result);
+      int resolve_result = ns_context.resolve (w_name, w_value, type_out);
+      ACE_ASSERT (resolve_result == result);
 
       char *l_value = w_value.char_rep ();
 
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp
index bd661d52f0a..866ce0cd03d 100644
--- a/tests/OS_Test.cpp
+++ b/tests/OS_Test.cpp
@@ -13,6 +13,7 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_stdlib.h"
@@ -22,7 +23,6 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_errno.h"
-#include "test_config.h"
 
 ACE_RCSID(tests, OS_Test, "$Id$")
 
diff --git a/tests/Object_Manager_Test.cpp b/tests/Object_Manager_Test.cpp
index d89cc47e558..79cd94c8ccd 100644
--- a/tests/Object_Manager_Test.cpp
+++ b/tests/Object_Manager_Test.cpp
@@ -18,6 +18,7 @@
 
 #include "test_config.h"
 #include "ace/Object_Manager.h"
+#include "ace/OS_Memory.h"
 #include "ace/ACE.h"
 
 ACE_RCSID(tests, Object_Manager_Test, "$Id$")
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index 47dda893c3a..e942fc598fd 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -27,8 +27,13 @@
 
 ACE_RCSID(tests, Pipe_Test, "$Id$")
 
+// Indicates whether we should close the pipe or not.
 static int close_pipe = 1;
+
+// Indicates whether we're running as the child or the parent.
 static int child_process = 0;
+
+// Number of iterations to run the test.
 static int iterations = ACE_MAX_ITERATIONS;
 
 // Explain usage and exit.
@@ -42,6 +47,7 @@ print_usage_and_die (void)
 }
 
 // Parse the command-line arguments and set options.
+
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
@@ -67,14 +73,19 @@ parse_args (int argc, ACE_TCHAR *argv[])
   }
 }
 
+// Consolidate the ACE_Pipe initializations.
+
 static void
 open (ACE_Pipe &pipe,
       const char *name)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("opening %C\n"), name));
-  ACE_ASSERT (pipe.open () != -1);
-  ACE_ASSERT (pipe.read_handle () != ACE_INVALID_HANDLE
-              && pipe.write_handle () != ACE_INVALID_HANDLE);
+  int result = pipe.open ();
+
+  ACE_ASSERT (result != -1);
+  result = pipe.read_handle () != ACE_INVALID_HANDLE
+    && pipe.write_handle () != ACE_INVALID_HANDLE;
+  ACE_ASSERT (result == 1);
 
   if (close_pipe)
     pipe.close ();
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 44bc283d160..a463a264871 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -1362,7 +1362,7 @@ Client::initiate_read_stream (void)
   static const size_t complete_message_length =
     ACE_OS::strlen (complete_message);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0,
@@ -1923,18 +1923,18 @@ run_main (int argc, ACE_TCHAR *argv[])
 template class ACE_Asynch_Acceptor<Server>;
 template class ACE_Asynch_Connector<Client>;
 template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
 template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, unsigned long>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Asynch_Acceptor<Server>
 #pragma instantiate ACE_Asynch_Connector<Client>
 #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t
 #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, unsigned long>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp
index e24403b6e9b..1c3deec2eb8 100644
--- a/tests/Proactor_Test_IPV6.cpp
+++ b/tests/Proactor_Test_IPV6.cpp
@@ -1970,18 +1970,18 @@ run_main (int argc, ACE_TCHAR *argv[])
 template class ACE_Asynch_Acceptor<Server>;
 template class ACE_Asynch_Connector<Client>;
 template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
 template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
-template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, unsigned long>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Asynch_Acceptor<Server>
 #pragma instantiate ACE_Asynch_Connector<Client>
 #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t>
 #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, unsigned long>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/tests/Process_Manual_Event_Test.cpp b/tests/Process_Manual_Event_Test.cpp
index b03c1457364..bd7255912f2 100644
--- a/tests/Process_Manual_Event_Test.cpp
+++ b/tests/Process_Manual_Event_Test.cpp
@@ -92,7 +92,7 @@ acquire_release (void)
           event_ping.signal ();
 
           if (event_pong.wait ())
-            ACE_DEBUG ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P) %p\n"),
                         ACE_TEXT ("Failed acquiring pong")));
           else
@@ -109,12 +109,14 @@ acquire_release (void)
       wait.sec (wait.sec () + 3); // timeout in 3 secs
 
       if (event_pong.wait (&wait))
-        if (errno != ETIME)
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P) %p, but expected ETIME\n"),
-                      ACE_TEXT ("event_pong.wait()")));
+        {
+          if (errno != ETIME)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P) %p, but expected ETIME\n"),
+                        ACE_TEXT ("event_pong.wait()")));
+        }
       else
-        ACE_DEBUG ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P) Acquired pong without release()\n")));
 
       event_ping.signal ();   // release waiting parent before timeout
@@ -124,7 +126,7 @@ acquire_release (void)
       for (i = 0; i < iterations; ++i)
         {
           if (event_ping.wait ())
-            ACE_DEBUG ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P) %p\n"),
                         ACE_TEXT ("Failed acquiring ping")));
           else
@@ -149,8 +151,8 @@ acquire_release (void)
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P) %p but should be ETIME\n"),
                         ACE_TEXT ("Acquire pong")));
-          else
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) Acquire pong timed out\n")));
+
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) Acquire pong timed out\n")));
         }
     }
 }
@@ -185,13 +187,18 @@ run_main (int argc, ACE_TCHAR *argv[])
   else
     {
       ACE_START_TEST (ACE_TEXT ("Process_Manual_Event_Test"));
+#if defined (ACE_WIN32)
+      const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" -c -i %d");
+#elif !defined (ACE_USES_WCHAR)
+const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s -c -i %d");
+#else
+const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%ls -c -i %d");
+#endif
+
       ACE_Process_Options options;
-      options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
-                            ACE_TEXT ("Process_Manual_Event_Test")
-                            ACE_PLATFORM_EXE_SUFFIX
-                            ACE_TEXT (" -c -i %d"),
+      options.command_line (cmdline_format,
+                            argv[0],
                             iterations);
-
       // Spawn a child process that will contend for the
       // lock.
       ACE_Process child;
@@ -208,7 +215,8 @@ run_main (int argc, ACE_TCHAR *argv[])
 
       ACE_exitcode child_status;
       // Wait for the child processes we created to exit.
-      ACE_ASSERT (child.wait (&child_status) != -1);
+      int wait_result = child.wait (&child_status);
+      ACE_ASSERT (wait_result != -1);
       if (child_status == 0)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Child %d finished ok\n"),
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index be450c39eb0..09d704e9079 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -89,7 +89,8 @@ acquire_release (void)
   ACE_OS::strncat (mutex_check, ACE_TEXT ("_checker"), MAXPATHLEN);
 
   // Grab the lock
-  ACE_ASSERT (mutex.acquire () == 0);
+  int mutex_acq = mutex.acquire ();
+  ACE_ASSERT (mutex_acq == 0);
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P) Mutex acquired %s\n"),
@@ -120,7 +121,8 @@ acquire_release (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P) Releasing the mutex %s\n"),
                   mutex_name));
-      ACE_ASSERT (mutex.release () == 0);
+      int mutex_release = mutex.release ();
+      ACE_ASSERT (mutex_release == 0);
     }
 }
 
@@ -189,7 +191,8 @@ run_main (int argc, ACE_TCHAR *argv[])
         {
           ACE_exitcode child_status;
           // Wait for the child processes we created to exit.
-          ACE_ASSERT (children[i].wait (&child_status) != -1);
+          int wait_result = children[i].wait (&child_status);
+          ACE_ASSERT (wait_result != -1);
           if (child_status == 0)
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("Child %d finished ok\n"),
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 3f61e0981e2..ced790b6020 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -586,7 +586,7 @@ client (void *arg)
 
   command = "read";
   command_len = ACE_OS::strlen (command);
-  int bytes_read = 0;
+  ssize_t bytes_read = 0;
 
   if (connector.connect (stream, server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Process_Strategy_Test.h b/tests/Process_Strategy_Test.h
index de6586d5688..9278e37404a 100644
--- a/tests/Process_Strategy_Test.h
+++ b/tests/Process_Strategy_Test.h
@@ -30,9 +30,6 @@
 #include "ace/Svc_Handler.h"
 #include "ace/Strategies_T.h"
 
-// Forward decl.
-class ACE_Thread_Manager;
-
 class Counting_Service : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   // = TITLE
   //     Reads and increments the count in a shared file.
diff --git a/tests/RMCast/.cvsignore b/tests/RMCast/.cvsignore
deleted file mode 100644
index b9a09c88cd2..00000000000
--- a/tests/RMCast/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-RMCast_Fragment_Test
-RMCast_Fragment_Test
-RMCast_Membership_Test
-RMCast_Membership_Test
-RMCast_Reassembly_Test
-RMCast_Reassembly_Test
-RMCast_Reordering_Test
-RMCast_Reordering_Test
-RMCast_Retransmission_Test
-RMCast_Retransmission_Test
-RMCast_UDP_Best_Effort_Test
-RMCast_UDP_Best_Effort_Test
diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp
index e40ed4ba685..91dfd8ad060 100644
--- a/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/tests/Reactor_Dispatch_Order_Test.cpp
@@ -65,16 +65,25 @@ Handler::Handler (ACE_Reactor &reactor)
     dispatch_order_ (1)
 {
   // Create the pipe.
-  int result
-    = this->pipe_.open ();
-  ACE_ASSERT (result == 0);
-
-  // Register for all events.
-  result =
-    this->reactor ()->register_handler (this->pipe_.read_handle (),
-                                        this,
-                                        ACE_Event_Handler::ALL_EVENTS_MASK);
-  ACE_ASSERT (result == 0);
+  bool ok = true;
+  if (0 != this->pipe_.open ())
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("pipe")));
+      ok = false;
+    }
+  else
+    {
+      // Register for all events.
+      if (0 != this->reactor ()->register_handler
+                 (this->pipe_.read_handle (),
+                  this,
+                  ACE_Event_Handler::ALL_EVENTS_MASK))
+        {
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("register")));
+          ok = false;
+        }
+    }
+  ACE_ASSERT (ok);
 }
 
 Handler::~Handler (void)
@@ -86,10 +95,13 @@ int
 Handler::handle_timeout (const ACE_Time_Value &,
                          const void *)
 {
-  ACE_ASSERT (this->dispatch_order_++ == 1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Handler::handle_timeout\n"));
+  int me = this->dispatch_order_++;
+  if (me != 1)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("handle_timeout should be #1; it's %d\n"),
+                me));
+  else
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Handler::handle_timeout\n")));
 
   return 0;
 }
@@ -97,10 +109,13 @@ Handler::handle_timeout (const ACE_Time_Value &,
 int
 Handler::handle_output (ACE_HANDLE)
 {
-  ACE_ASSERT (this->dispatch_order_++ == 2);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Handler::handle_output\n"));
+  int me = this->dispatch_order_++;
+  if (me != 2)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("handle_output should be #2; it's %d\n"),
+                me));
+  else
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Handler::handle_output\n")));
 
 #if defined (__OpenBSD__) || defined (ACE_VXWORKS) || defined (__Lynx__)
   // All that we need written has been written, so don't
@@ -116,13 +131,14 @@ Handler::handle_output (ACE_HANDLE)
 int
 Handler::handle_input (ACE_HANDLE fd)
 {
-  ACE_ASSERT (this->dispatch_order_++ == 3);
+  int me = this->dispatch_order_++;
+  if (me != 3)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("handle_timeout should be #3; it's %d\n"),
+                me));
 
   char buffer[BUFSIZ];
-  ssize_t result =
-    ACE::recv (fd,
-               buffer,
-               sizeof buffer);
+  ssize_t result = ACE::recv (fd, buffer, sizeof buffer);
 
   ACE_ASSERT (result == ssize_t (ACE_OS::strlen (message)));
   buffer[result] = '\0';
@@ -145,7 +161,7 @@ test_reactor_dispatch_order (ACE_Reactor &reactor)
   Handler handler (reactor);
 
   // This should trigger a call to <handle_input>.
-  int result =
+  ssize_t result =
     ACE::send_n (handler.pipe_.write_handle (),
                  message,
                  ACE_OS::strlen (message));
@@ -174,7 +190,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_Select_Reactor select_reactor_impl;
   ACE_Reactor select_reactor (&select_reactor_impl);
-
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ACE_Select_Reactor\n")));
   test_reactor_dispatch_order (select_reactor);
 
   // WinCE can't do the necessary Winsock 2 things for WFMO_Reactor.
@@ -182,7 +198,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_WFMO_Reactor wfmo_reactor_impl;
   ACE_Reactor wfmo_reactor (&wfmo_reactor_impl);
-
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ACE_WFMO_Reactor\n")));
   test_reactor_dispatch_order (wfmo_reactor);
 
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 866952f45b6..4733c30ec42 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -186,13 +186,13 @@ client (void *arg)
   int i;
 
   // Automagic memory cleanup.
-  Write_Handler **temp_writers;
+  Write_Handler **temp_writers = 0;
   ACE_NEW_RETURN (temp_writers,
                   Write_Handler *[opt_nconnections],
                   0);
   ACE_Auto_Basic_Array_Ptr <Write_Handler *> writers (temp_writers);
 
-  ACE_TCHAR *temp_failed;
+  ACE_TCHAR *temp_failed = 0;
   ACE_NEW_RETURN (temp_failed,
                   ACE_TCHAR[opt_nconnections],
                   0);
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index e62871e37bf..dac6cb25142 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -104,7 +104,9 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv,
     {
       int result = ACE_Reactor::instance ()->reset_timer_interval (this->timer_id (),
                                                                    ACE_Time_Value (count + 1));
-      ACE_ASSERT (result != -1);
+      if (result == -1)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("Error resetting timer interval\n")));
     }
   count += (1 + odd);
   return 0;
@@ -198,7 +200,9 @@ test_canceling_odd_timers (void)
       {
         int result =
           ACE_Reactor::instance ()->cancel_timer (rt[j].timer_id ());
-        ACE_ASSERT (result != -1);
+        if (result == -1)
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Error cancelling timer\n")));
       }
 
   while (!done)
diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp
index 381a9c8176c..2fab565a5d5 100644
--- a/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -238,11 +238,12 @@ reference_counted_event_handler_test_1 (ACE_Reactor *reactor)
 
   if (test_timers)
     {
+      ACE_Time_Value const one_second (1);
       long timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
       result =
@@ -254,14 +255,15 @@ reference_counted_event_handler_test_1 (ACE_Reactor *reactor)
       timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
+      ACE_Time_Value const two_second (2);
       timer_id =
         reactor->schedule_timer (handler,
                                  two_second_timeout,
-                                 2);
+                                 two_second);
       ACE_ASSERT (result != -1);
 
       events += 3;
@@ -279,6 +281,7 @@ reference_counted_event_handler_test_2 (ACE_Reactor *reactor)
 {
   int events = 0;
   int result = 0;
+  ACE_Time_Value const one_second (1);
 
   if (test_find)
     {
@@ -358,8 +361,8 @@ reference_counted_event_handler_test_2 (ACE_Reactor *reactor)
       long timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
       result =
@@ -379,14 +382,15 @@ reference_counted_event_handler_test_2 (ACE_Reactor *reactor)
       long timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
+      ACE_Time_Value const two_second (2);
       timer_id =
         reactor->schedule_timer (handler,
                                  two_second_timeout,
-                                 2);
+                                 two_second);
       ACE_ASSERT (result != -1);
 
       events += 3;
@@ -560,6 +564,7 @@ simple_event_handler (ACE_Reactor *reactor)
 {
   int events = 0;
   int result = 0;
+  ACE_Time_Value const one_second (1);
 
   if (test_find)
     {
@@ -641,8 +646,8 @@ simple_event_handler (ACE_Reactor *reactor)
       long timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
       result =
@@ -661,14 +666,15 @@ simple_event_handler (ACE_Reactor *reactor)
       long timer_id =
         reactor->schedule_timer (handler,
                                  one_second_timeout,
-                                 1,
-                                 1);
+                                 one_second,
+                                 one_second);
       ACE_ASSERT (timer_id != -1);
 
+      ACE_Time_Value const two_second (2);
       timer_id =
         reactor->schedule_timer (handler,
                                  two_second_timeout,
-                                 2);
+                                 two_second);
       ACE_ASSERT (result != -1);
 
       events += 3;
diff --git a/tests/SSL/Makefile.am b/tests/SSL/Makefile.am
index 4a67fb3cbe3..d4dcc3ab929 100644
--- a/tests/SSL/Makefile.am
+++ b/tests/SSL/Makefile.am
@@ -20,8 +20,7 @@ noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test
 Thread_Pool_Reactor_SSL_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
-  -I$(SSL_ROOT)/include \
-  -I/usr/kerberos/include \
+  @ACE_TLS_CPPFLAGS@ \
   -DACE_HAS_SSL=1
 
 Thread_Pool_Reactor_SSL_Test_SOURCES = \
@@ -30,7 +29,7 @@ Thread_Pool_Reactor_SSL_Test_SOURCES = \
   Thread_Pool_Reactor_SSL_Test.h
 
 Thread_Pool_Reactor_SSL_Test_LDADD = \
- $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la -lssl -lcrypto
+ $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la @ACE_TLS_LDFLAGS@ @ACE_TLS_LIBS@
 
 endif BUILD_SSL
 
diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index 38cf478564c..6a9a8ebf740 100644
--- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -88,7 +88,7 @@ static int req_delay = 50;
 static void
 parse_arg (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
 
   int c;
 
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index 265d690fbf7..a6be520d300 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -130,7 +130,7 @@ run_main (int, ACE_TCHAR *[])
 
   {
     /* Set #2 */
-    ACE_CString s0 ("hello", 0, 0);
+    ACE_CString s0 = "hello";
     ACE_CString s1 ("hello", 0, 0);
     ACE_CString s2 ("world", 0, 0);
     ACE_CString s3 ("ll", 0, 0);
diff --git a/tests/Service_Config_Test.UTF-16.conf b/tests/Service_Config_Test.UTF-16.conf
index e5d36fd215f..fee216c95f9 100644
--- a/tests/Service_Config_Test.UTF-16.conf
+++ b/tests/Service_Config_Test.UTF-16.conf
diff --git a/tests/Service_Config_Test.WCHAR_T.conf b/tests/Service_Config_Test.WCHAR_T.conf
index a36db0600c9..81f6e1fe4d6 100644
--- a/tests/Service_Config_Test.WCHAR_T.conf
+++ b/tests/Service_Config_Test.WCHAR_T.conf
diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp
index c1414ee8472..076e64ce2d3 100644
--- a/tests/Sigset_Ops_Test.cpp
+++ b/tests/Sigset_Ops_Test.cpp
@@ -32,7 +32,7 @@ siglistset (sigset_t x, int *sigset, int can_miss = 0)
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Signal (s) in the set = %08x:\n"), x)) ;
 
-  for (int i = 1; i < ACE_NSIG; i++) 
+  for (int i = 1; i < ACE_NSIG; i++)
     {
       result = ACE_OS::sigismember (&x, i);
 
@@ -42,18 +42,18 @@ siglistset (sigset_t x, int *sigset, int can_miss = 0)
           empty = 0 ;
         }
       else if (can_miss)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      ACE_TEXT ("Be careful... Signal %d is not valid\n"),
-		      i));
-	  result = 1;
-	}
+        {
+          ACE_DEBUG ((LM_DEBUG,
+            ACE_TEXT ("Be careful... Signal %d is not valid\n"),
+            i));
+          result = 1;
+        }
       ACE_ASSERT ((sigset [i] ? result > 0 : result <= 0)) ;
     }
 
-  if (empty) 
+  if (empty)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Empty!!\n\n"))) ;
-  else 
+  else
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\n"))) ;
 }
 
@@ -82,7 +82,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_OS::sigfillset (&x) ;
 
   // fill the comparison set
-  for (i = 0 ; i < ACE_NSIG ; i++) 
+  for (i = 0 ; i < ACE_NSIG ; i++)
     sigset [i] = 1 ;
 
   // There's no guarantee that the valid signals are sequential without
@@ -97,7 +97,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_OS::sigemptyset (&x) ;
 
   // empty the comparison set
-  for (i = 0 ; i < ACE_NSIG ; i++) 
+  for (i = 0 ; i < ACE_NSIG ; i++)
     sigset [i] = 0 ;
 
   siglistset (x, sigset) ;
@@ -123,12 +123,12 @@ run_main (int, ACE_TCHAR *[])
   siglistset (x, sigset) ;
 
   // Now testing out of bound signal
-  if (ACE_OS::sigismember (&x, ACE_NSIG) >= 0) 
+  if (ACE_OS::sigismember (&x, ACE_NSIG) >= 0)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Platform doesn't check for valid signal number.\n")));
       status = 1;
     }
-  else if (ACE_OS::last_error () != EINVAL) 
+  else if (ACE_OS::last_error () != EINVAL)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), ACE_TEXT ("Expected status EINVAL; got")));
       status = 1;
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index 2fb5c9ced47..10732e68c3b 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -89,11 +89,11 @@ handler (int /* signum */)
 static void *
 worker (int iterations)
 {
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %s: stack size is %u\n"),
               ACE_OS::thr_self (),
               ACE_OS::thr_min_stack ()));
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
   // Cache this thread's ID.
@@ -283,7 +283,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
-#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
+#if defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *thread_name;
   ACE_NEW_RETURN (thread_name,
@@ -313,23 +313,23 @@ run_main (int, ACE_TCHAR *[])
 
       stack_size[i] = 40000;
     }
-#endif /* VXWORKS && !ACE_HAS_PTHREADS */
+#endif /* ACE_VXWORKS && !ACE_HAS_PTHREADS */
 
   int grp_id = thr_mgr->spawn_n
                  (
-#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
+#if defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)
                   thread_name,
-#endif /* VXWORKS && !ACE_HAS_PTHREADS */
+#endif /* ACE_VXWORKS && !ACE_HAS_PTHREADS */
                   n_threads,
                   (ACE_THR_FUNC) worker,
                   reinterpret_cast <void *> (n_iterations),
                   THR_BOUND
-#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
+#if defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)
                   , ACE_DEFAULT_THREAD_PRIORITY
                   , -1
                   , 0
                   , stack_size
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
                   );
 
   ACE_ASSERT (grp_id != -1);
@@ -414,7 +414,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) main thread finished\n")));
 
-#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
+#if defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)
   for (i = 0; i < n_threads - 1; ++i)
     {
       delete [] thread_name[i];
@@ -423,7 +423,7 @@ run_main (int, ACE_TCHAR *[])
     }
   delete [] thread_name;
   delete [] stack_size;
-#endif /* VXWORKS && !ACE_HAS_PTHREADS */
+#endif /* ACE_VXWORKS && !ACE_HAS_PTHREADS */
 
   delete thread_start;
   thread_start = 0;
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index a201efaf3ee..f6a649aa8ab 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -123,7 +123,7 @@ Thread_Pool::svc (void)
 
   for (int count = 1; ; count++)
     {
-      ACE_Message_Block *mb;
+      ACE_Message_Block *mb = 0;
 
       int result = this->getq (mb);
 
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index 4f7f7c5fc44..13fd8fe3bda 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -49,6 +49,17 @@ 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 */
+
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
 static
 u_long
@@ -237,24 +248,32 @@ run_main (int, ACE_TCHAR *[])
   tv1 *= -10.0;
   ACE_ASSERT (tv1.sec () == tv2.sec () && tv1.usec () == tv2.usec ());
 
+#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
+
   // test results near limits
-  tv1.set ((ACE_INT32_MAX >> 1), 499999);
-  tv2.set ((-(ACE_INT32_MAX >> 1) << 1), -999998);
+  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 ());
-  tv1.set (ACE_INT32_MAX >> 1, 499999);
-  tv2.set (((ACE_INT32_MAX >> 1) << 1), 999998);
+  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 ());
 
   // test saturated result
-  tv1.set (ACE_INT32_MAX - 1, 499999);
-  tv2.set (ACE_INT32_MAX, 999999);
-  tv1 *= ACE_INT32_MAX;
+  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 ());
-  tv1.set (ACE_INT32_MAX - 1, 499999);
-  tv2.set (ACE_INT32_MIN, -999999);
-  tv1 *= ACE_INT32_MIN;
+  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 ());
 
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index 9a1845bb8b9..1f04dbd7cf5 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -34,6 +34,7 @@
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Containers_T.h"
 
 ACE_RCSID(tests, Timer_Queue_Test, "$Id$")
 
@@ -475,6 +476,65 @@ test_performance (ACE_Timer_Queue *tq,
   delete [] times;
 }
 
+// This test function was contributed with Bugzilla #2447 to test validity
+// of ACE_Timer_Heap timer IDs around the boundary of having to enlarge
+// the heap.
+static void
+test_unique_timer_heap_ids (void)
+{
+  Example_Handler eh;
+  ACE_Timer_Heap timer_heap (44);
+  ACE_Time_Value anytime(1);
+  ACE_Bounded_Set<long> timer_ids (max_iterations);
+  long timer_id = -1;
+  bool all_unique = true;
+
+  for (int i = 0; i < 100; ++i)
+    {
+      timer_id = timer_heap.schedule (&eh, 0, anytime);
+      if (timer_id == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Schedule timer %d %p\n"),
+                      i,
+                      ACE_TEXT ("test_unique_timer_heap_ids")));
+          continue;
+        }
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Schedule timer %d. Timer id = %d\n"),
+                  i,
+                  timer_id));
+      if (1 == timer_ids.insert (timer_id))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Pass %d, id %d is not unique\n"),
+                      i,
+                      timer_id));
+          all_unique = false;
+        }
+
+      if (i == 0 || i == 1 || i == 47 || i == 48)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("Free Timer %d. Timer Id = %d\n"),
+                      i,
+                      timer_id));
+          timer_heap.cancel (timer_id);
+          if (timer_id == -1)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("Failed to cancel timer")));
+
+          timer_ids.remove (timer_id);
+        }
+    }
+
+  if (all_unique)
+    ACE_DEBUG ((LM_INFO, ACE_TEXT ("All timer ids were unique.\n")));
+
+  return;
+}
+
 class Timer_Queue_Stack
 {
   // = TITLE
@@ -600,9 +660,20 @@ run_main (int argc, ACE_TCHAR *argv[])
       tq_ptr = tq_ptr->next_;
       delete temp;
     }
-
   delete [] timer_ids;
 
+  ACE_DEBUG
+    ((LM_DEBUG,
+      ACE_TEXT ("**** starting unique IDs test for ACE_Timer_Heap\n")));
+  test_unique_timer_heap_ids ();
+
   ACE_END_TEST;
   return 0;
 }
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Bounded_Set<long>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Bounded_Set<long>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/makeicc.pl b/tests/makeicc.pl
deleted file mode 100755
index c9e9a42ec86..00000000000
--- a/tests/makeicc.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-@ls = `ls -1 *.cpp`;
-$allicc = "icc.bat";
-
-foreach $tmp (@ls)
-{
-	($a1, $a2) = split("cpp",$tmp);
-	$tmp2 = "$a1\icc";
-
-open(T,"> $a1\icc");
-	print T "// \$Id\$\n";
-	print T "\n";
-	print T "include \"vacpp_setup.icc\"\n";
-	print T "option\n";
-        print T "    link(libSearchPath, platformLibSearchPath),\n";
-	print T "    incl(searchPath, \"..\"),\n";
-	print T "    link(linkWithMultiThreadLib,yes),\n";
-	print T "    link(debug)\n";
-	print T "    {\n";
-	chop($a1);
-	print T "	target type (exe) \"$a1\"\n";
-	print T "	{\n";
-	print T "	   source type (cpp) \"$a1\.cpp\"\n";
-        print T '	   if ($__IBMCPP__ >= 500) {' . "\n";
-        print T "	     option macros(global) {\n";
-        print T "	       source type (hpp) \"test_config.h\"\n";
-        print T "	     }\n";
-        print T "	     source type (cpp) \"test_config.h\"\n";
-        print T "	     source type (cpp) \"../ace/Singleton.cpp\"\n";
-        print T "	   }\n";
-        print T "	   source type (lib) platformLinkLibs\n";
-	print T "	}\n";
-	print T "    }\n";
-close T;
-
-open(ALLICC,">> $allicc");
-	print ALLICC "vacbld -SEV=E $a1\.icc\n";
-close ALLICC;
-	print "$a1\n";
-}
-
diff --git a/tests/run_test.lst b/tests/run_test.lst
index 39dee224e43..6637d0ca75d 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -21,145 +21,147 @@ Arg_Shifter_Test
 Array_Map_Test
 Atomic_Op_Test
 Auto_Event_Test
-Auto_IncDec_Test
-Barrier_Test
-Based_Pointer_Test: !STATIC !VxWorks
+Auto_IncDec_Test: !DISABLE_ToFix_LynxOS_PPC
+Barrier_Test: !DISABLE_ToFix_LynxOS_PPC
+Based_Pointer_Test: !DISABLE_ToFix_LynxOS_PPC !STATIC !VxWorks !ACE_FOR_TAO
 Basic_Types_Test
-Bound_Ptr_Test
-Buffer_Stream_Test
+Bound_Ptr_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
+Buffer_Stream_Test: !DISABLE_ToFix_LynxOS_PPC
 Bug_1576_Regression_Test
-CDR_Array_Test
-CDR_File_Test
+Bug_2497_Regression_Test
+CDR_Array_Test: !ACE_FOR_TAO
+CDR_File_Test: !ACE_FOR_TAO
 CDR_Test
 Cache_Map_Manager_Test
-Cached_Accept_Conn_Test: !VxWorks
-Cached_Allocator_Test
-Cached_Conn_Test: !VxWorks
-Capabilities_Test
-Codecs_Test
+Cached_Accept_Conn_Test: !VxWorks !ACE_FOR_TAO
+Cached_Allocator_Test: !ACE_FOR_TAO
+Cached_Conn_Test: !VxWorks !ACE_FOR_TAO
+Capabilities_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+Codecs_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
 Collection_Test
-Config_Test: !LynxOS !VxWorks
-Conn_Test: !chorus
+Config_Test: !LynxOS !VxWorks !ACE_FOR_TAO
+Conn_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !chorus !ACE_FOR_TAO
 DLL_Test: !Unicos !STATIC !KCC_Linux
-DLList_Test
-Date_Time_Test
+DLList_Test: !ACE_FOR_TAO
+Date_Time_Test: !ACE_FOR_TAO
 Dev_Poll_Reactor_Test: !nsk
 Dirent_Test
 Dynamic_Priority_Test
 Enum_Interfaces_Test: !LynxOS
 Env_Value_Test: !chorus !WinCE
-FIFO_Test
-Framework_Component_Test: !STATIC !LynxOS !nsk
-Future_Set_Test: !nsk
-Future_Test: !nsk
+FIFO_Test: !ACE_FOR_TAO
+Framework_Component_Test: !STATIC !nsk
+Future_Set_Test: !DISABLE_ToFix_LynxOS_PPC !nsk !ACE_FOR_TAO
+Future_Test: !DISABLE_ToFix_LynxOS_PPC !nsk !ACE_FOR_TAO
 Get_Opt_Test
-Handle_Set_Test
+Handle_Set_Test: !ACE_FOR_TAO
 Hash_Map_Bucket_Iterator_Test
 Hash_Map_Manager_Test
-High_Res_Timer_Test
+High_Res_Timer_Test: !ACE_FOR_TAO
 INET_Addr_Test
 IOStream_Test
 Lazy_Map_Manager_Test
-Log_Msg_Test: !LynxOS
-Logging_Strategy_Test: !STATIC !ST
-Manual_Event_Test
-MEM_Stream_Test: !VxWorks !LynxOS !nsk
-MM_Shared_Memory_Test: !chorus !Unicos !VxWorks !nsk
-MT_Reactor_Timer_Test
-MT_Reactor_Upcall_Test: !nsk
-MT_Reference_Counted_Event_Handler_Test
-MT_Reference_Counted_Notify_Test
-MT_SOCK_Test: !chorus !LynxOS
-Malloc_Test: !VxWorks !LynxOS
-Map_Manager_Test
-Map_Test
-Max_Default_Port_Test: !ST
-Mem_Map_Test: !chorus !Unicos !VxWorks !nsk
-Memcpy_Test
-Message_Block_Test: !chorus
-Message_Queue_Notifications_Test
-Message_Queue_Test: !chorus
-Message_Queue_Test_Ex: !chorus
-Multicast_Test: !ST !NO_MCAST !nsk
-Multihomed_INET_Addr_Test
-Naming_Test: !chorus !LynxOS !Unicos !VxWorks !nsk
-Network_Adapters_Test
+Log_Msg_Test: !LynxOS !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
+MM_Shared_Memory_Test: !chorus !Unicos !VxWorks !nsk !ACE_FOR_TAO
+MT_Reactor_Timer_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+MT_Reactor_Upcall_Test: !DISABLE_ToFix_LynxOS_PPC !nsk
+MT_Reference_Counted_Event_Handler_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86
+MT_Reference_Counted_Notify_Test: !DISABLE_ToFix_LynxOS_PPC
+MT_SOCK_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !chorus
+Malloc_Test: !VxWorks !LynxOS !ACE_FOR_TAO
+Map_Manager_Test: !ACE_FOR_TAO
+Map_Test: !ACE_FOR_TAO
+Max_Default_Port_Test: !DISABLE_ToFix_LynxOS_PPC !ST
+Mem_Map_Test: !chorus !Unicos !VxWorks !nsk !ACE_FOR_TAO
+Memcpy_Test: !ACE_FOR_TAO
+Message_Block_Test: !DISABLE_ToFix_LynxOS_PPC !chorus !ACE_FOR_TAO
+Message_Queue_Notifications_Test: !DISABLE_ToFix_LynxOS_PPC
+Message_Queue_Test: !chorus !ACE_FOR_TAO
+Message_Queue_Test_Ex: !chorus !ACE_FOR_TAO
+Multicast_Test: !ST !NO_MCAST !nsk !LynxOS
+Multihomed_INET_Addr_Test: !ACE_FOR_TAO
+Naming_Test: !chorus !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
-Notify_Performance_Test: !nsk
+Notify_Performance_Test: !nsk !ACE_FOR_TAO
 OS_Test
 Object_Manager_Test
 Obstack_Test
 OrdMultiSet_Test
 Pipe_Test: !chorus !VxWorks
 Priority_Buffer_Test
-Priority_Reactor_Test: !chorus
-Priority_Task_Test: !Unicos
-Proactor_Scatter_Gather_Test: !chorus !VxWorks !LynxOS !nsk
-Proactor_Test: !chorus !VxWorks !LynxOS !nsk
-Proactor_Timer_Test: !chorus !VxWorks !LynxOS !nsk
-Process_Manager_Test: !chorus !VxWorks
-Process_Manual_Event_Test: !HPUX !chorus !VxWorks !LynxOS
-Process_Mutex_Test: !chorus !VxWorks !LynxOS
-Process_Semaphore_Test: !chorus !VxWorks !LynxOS
+Priority_Reactor_Test: !DISABLE_ToFix_LynxOS_PPC !chorus !ACE_FOR_TAO
+Priority_Task_Test: !DISABLE_ToFix_LynxOS_PPC !Unicos
+Proactor_Scatter_Gather_Test: !chorus !VxWorks !nsk !ACE_FOR_TAO
+Proactor_Test: !chorus !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO
+Proactor_Timer_Test: !chorus !VxWorks !nsk !ACE_FOR_TAO
+Process_Manager_Test: !chorus !VxWorks !ACE_FOR_TAO
+Process_Manual_Event_Test: !HPUX !chorus !VxWorks !ACE_FOR_TAO
+Process_Mutex_Test: !chorus !VxWorks !ACE_FOR_TAO
+Process_Semaphore_Test: !chorus !VxWorks !ACE_FOR_TAO
 RB_Tree_Test
 Reactor_Dispatch_Order_Test
-Reactor_Exceptions_Test
-Reactor_Notify_Test: !ST
+Reactor_Exceptions_Test: !DISABLE_ToFix_LynxOS_PPC
+Reactor_Notify_Test: !DISABLE_ToFix_LynxOS_PPC !ST !ACE_FOR_TAO
 Reactor_Notification_Queue_Test
-Reactor_Performance_Test: !chorus
+Reactor_Performance_Test: !DISABLE_ToFix_LynxOS_PPC !chorus !ACE_FOR_TAO
 Reactor_Registration_Test
-Reactor_Timer_Test
-Reactors_Test
-Reader_Writer_Test
-Recursive_Condition_Test: !ST
-Recursive_Mutex_Test: !ST
-Refcounted_Auto_Ptr_Test
+Reactor_Timer_Test: !ACE_FOR_TAO
+Reactors_Test: !DISABLE_ToFix_LynxOS_PPC
+Reader_Writer_Test: !DISABLE_ToFix_LynxOS_PPC
+Recursive_Condition_Test: !DISABLE_ToFix_LynxOS_PPC !ST
+Recursive_Mutex_Test: !DISABLE_ToFix_LynxOS_PPC !ST
+Refcounted_Auto_Ptr_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
 Reference_Counted_Event_Handler_Test
 Reverse_Lock_Test
 SOCK_Connector_Test
-SOCK_Send_Recv_Test: !LynxOS
+SOCK_Send_Recv_Test
 SOCK_Test: !chorus
-SPIPE_Test: !VxWorks !nsk
-SString_Test
-SV_Shared_Memory_Test: !MSVC !Unicos !VxWorks !RH_7.1 !nsk
-Semaphore_Test
-Service_Config_Test: !STATIC !LynxOS
+SPIPE_Test: !VxWorks !nsk !ACE_FOR_TAO
+SString_Test: !ACE_FOR_TAO
+SV_Shared_Memory_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MSVC !Unicos !VxWorks !RH_7.1 !nsk !ACE_FOR_TAO
+Semaphore_Test: !ACE_FOR_TAO
+Service_Config_Test: !DISABLE_ToFix_LynxOS_PPC !STATIC
 Sigset_Ops_Test
 Simple_Message_Block_Test: !chorus
-Svc_Handler_Test
-TP_Reactor_Test: !LynxOS
-TSS_Test
+Svc_Handler_Test: !ACE_FOR_TAO
+TP_Reactor_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+TSS_Test: !DISABLE_ToFix_LynxOS_PPC
 TSS_Static_Test
-Task_Test
-Task_Ex_Test
-Thread_Manager_Test: !Unicos
-Thread_Mutex_Test: !chorus
-Thread_Pool_Reactor_Resume_Test: !ST
-Thread_Pool_Reactor_Test
-Thread_Pool_Test
+Task_Test: !DISABLE_ToFix_LynxOS_PPC
+Task_Ex_Test: !DISABLE_ToFix_LynxOS_PPC
+Thread_Manager_Test: !DISABLE_ToFix_LynxOS_PPC !Unicos
+Thread_Mutex_Test: !DISABLE_ToFix_LynxOS_PPC !chorus
+Thread_Pool_Reactor_Resume_Test: !DISABLE_ToFix_LynxOS_PPC !ST
+Thread_Pool_Reactor_Test: !DISABLE_ToFix_LynxOS_PPC
+Thread_Pool_Test: !DISABLE_ToFix_LynxOS_PPC
 Time_Service_Test: !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos
 Time_Value_Test
 Timeprobe_Test
-Timer_Cancellation_Test
+Timer_Cancellation_Test: !DISABLE_ToFix_LynxOS_PPC
 Timer_Queue_Reference_Counting_Test
-Timer_Queue_Test
-Token_Strategy_Test: !ST !nsk
+Timer_Queue_Test: !ACE_FOR_TAO
+Token_Strategy_Test: !DISABLE_ToFix_LynxOS_PPC !ST !nsk
 Tokens_Test: MSVC !DISABLED TOKEN !chorus !Unicos
-UPIPE_SAP_Test: !VxWorks !nsk
+UPIPE_SAP_Test: !VxWorks !nsk !ACE_FOR_TAO
 Unbounded_Set_Test
-Upgradable_RW_Test: !chorus
+Upgradable_RW_Test: !chorus !ACE_FOR_TAO
 Vector_Test
 WFMO_Reactor_Test: !nsk
 INET_Addr_Test_IPV6: !nsk
 Max_Default_Port_Test_IPV6: !nsk
-Multicast_Test_IPV6: !NO_MCAST !nsk
+Multicast_Test_IPV6: !NO_MCAST !nsk !ACE_FOR_TAO
 Multihomed_INET_Addr_Test_IPV6: !nsk
-Proactor_Test_IPV6: !nsk
+Proactor_Test_IPV6: !nsk !ACE_FOR_TAO !BAD_AIO
 SOCK_Send_Recv_Test_IPV6
 SOCK_Dgram_Test
-SOCK_Dgram_Bcast_Test
-SOCK_SEQPACK_SCTP_Test: !MSVC !nsk
+SOCK_Dgram_Bcast_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
+SOCK_SEQPACK_SCTP_Test: !MSVC !nsk !ACE_FOR_TAO
 SOCK_Test_IPv6: !nsk
-Process_Strategy_Test: !chorus !VxWorks
-Recursive_Condition_Bug_Test: !ST
+Process_Strategy_Test: !chorus !VxWorks !LynxOS !ACE_FOR_TAO
+Recursive_Condition_Bug_Test: !DISABLE_ToFix_LynxOS_PPC !ST
+UnloadLibACE: !STATIC
diff --git a/tests/test_config.h b/tests/test_config.h
index a4ce5eb0b2c..21ff4cdf67c 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -19,6 +19,9 @@
 #ifndef ACE_TEST_CONFIG_H
 #define ACE_TEST_CONFIG_H
 
+// This first #undef protects against command-line definitions.
+#undef ACE_NDEBUG
+
 #include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -30,8 +33,6 @@
 #undef ACE_NLOGGING
 #endif /* ACE_NLOGGING */
 
-// This first #undef protects against command-line definitions.
-#undef ACE_NDEBUG
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Log_Msg.h"
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 8b4c35d7576..684141b2069 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -17,6 +17,12 @@ project(Test_Output) : acelib, script {
     run_test.pl
     run_test.lst
   }
+
+  verbatim(automake,local) {
+dist_check_SCRIPTS = run_test.pl run_test.lst
+TESTS = $(noinst_PROGRAMS)
+TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t
+  }
 }
 
 project(Framework Component DLL) : acelib {
@@ -65,6 +71,7 @@ project(DLL Test Lib) : acelib, dll_test_parent_lib {
 }
 
 project(Based Pointer Test Lib) : acelib {
+  avoids      += ace_for_tao
   sharedname   = Based_Pointer_Test_Lib
   dynamicflags = ACE_SVC_BUILD_DLL
 
@@ -168,6 +175,7 @@ project(Basic Types Test) : acetest {
 }
 
 project(Bound Ptr Test) : acetest {
+  avoids += ace_for_tao
   exename = Bound_Ptr_Test
   Source_Files {
     Bound_Ptr_Test.cpp
@@ -188,6 +196,13 @@ project(Bug_1576_Regression_Test) : acetest {
   }
 }
 
+project(Bug_2497_Regression_Test) : acetest {
+  exename = Bug_2497_Regression_Test
+  Source_Files {
+    Bug_2497_Regression_Test.cpp
+  }
+}
+
 project(Cache Map Manager Test) : acetest {
   exename = Cache_Map_Manager_Test
   Source_Files {
@@ -196,6 +211,7 @@ project(Cache Map Manager Test) : acetest {
 }
 
 project(Memcpy_Test) : acetest {
+  avoids += ace_for_tao
   exename = Memcpy_Test
   Source_Files {
     Memcpy_Test.cpp
@@ -203,6 +219,7 @@ project(Memcpy_Test) : acetest {
 }
 
 project(Cached Accept Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Accept_Conn_Test
   Source_Files {
     Cached_Accept_Conn_Test.cpp
@@ -210,6 +227,7 @@ project(Cached Accept Conn Test) : acetest {
 }
 
 project(Cached Allocator Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Allocator_Test
   Source_Files {
     Cached_Allocator_Test.cpp
@@ -217,6 +235,7 @@ project(Cached Allocator Test) : acetest {
 }
 
 project(Cached Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Conn_Test
   Source_Files {
     Cached_Conn_Test.cpp
@@ -224,6 +243,7 @@ project(Cached Conn Test) : acetest {
 }
 
 project(Capabilities Test) : acetest {
+  avoids += ace_for_tao
   exename = Capabilities_Test
   Source_Files {
     Capabilities_Test.cpp
@@ -231,6 +251,7 @@ project(Capabilities Test) : acetest {
 }
 
 project(CDR File Test) : acetest {
+  avoids += ace_for_tao
   exename = CDR_File_Test
   Source_Files {
     CDR_File_Test.cpp
@@ -253,6 +274,7 @@ project(Collection Test) : acetest {
 }
 
 project(Config Test) : acetest {
+  avoids += ace_for_tao
   exename = Config_Test
   Source_Files {
     Config_Test.cpp
@@ -264,6 +286,7 @@ project(Config Test) : acetest {
 }
 
 project(Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Conn_Test
   Source_Files {
     Conn_Test.cpp
@@ -271,6 +294,7 @@ project(Conn Test) : acetest {
 }
 
 project(Date Time Test) : acetest {
+  avoids += ace_for_tao
   exename = Date_Time_Test
   Source_Files {
     Date_Time_Test.cpp
@@ -285,6 +309,7 @@ project(Dev Poll Reactor Test) : acetest {
 }
 
 project(Dirent Test) : acetest {
+
   exename = Dirent_Test
   Source_Files {
     Dirent_Test.cpp
@@ -292,6 +317,7 @@ project(Dirent Test) : acetest {
 }
 
 project(DLList Test) : acetest {
+  avoids += ace_for_tao
   exename = DLList_Test
   Source_Files {
     DLList_Test.cpp
@@ -322,6 +348,7 @@ project(Env Value Test) : acetest {
 }
 
 project(Future Test) : acetest {
+  avoids += ace_for_tao
   exename = Future_Test
   Source_Files {
     Future_Test.cpp
@@ -329,6 +356,7 @@ project(Future Test) : acetest {
 }
 
 project(Future Set Test) : acetest {
+  avoids += ace_for_tao
   exename = Future_Set_Test
   Source_Files {
     Future_Set_Test.cpp
@@ -343,6 +371,7 @@ project(Get Opt Test) : acetest {
 }
 
 project(Handle Set Test) : acetest {
+  avoids += ace_for_tao
   exename = Handle_Set_Test
   Source_Files {
     Handle_Set_Test.cpp
@@ -350,6 +379,7 @@ project(Handle Set Test) : acetest {
 }
 
 project(High Res Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = High_Res_Timer_Test
   Source_Files {
     High_Res_Timer_Test.cpp
@@ -392,6 +422,7 @@ project(Lazy Map Manager Test) : acetest {
 }
 
 project(Log Msg Test) : acetest {
+  avoids += ace_for_tao
   exename = Log_Msg_Test
   Source_Files {
     Log_Msg_Test.cpp
@@ -406,6 +437,7 @@ project(Logging Strategy Test) : acetest {
 }
 
 project(Malloc Test) : acetest {
+  avoids += ace_for_tao
   exename = Malloc_Test
   Source_Files {
     Malloc_Test.cpp
@@ -420,6 +452,7 @@ project(Manual_Event Test) : acetest {
 }
 
 project(Map Test) : acetest {
+  avoids += ace_for_tao
   exename = Map_Test
   Source_Files {
     Map_Test.cpp
@@ -427,6 +460,7 @@ project(Map Test) : acetest {
 }
 
 project(Map Manager Test) : acetest {
+  avoids += ace_for_tao
   exename = Map_Manager_Test
   Source_Files {
     Map_Manager_Test.cpp
@@ -441,6 +475,7 @@ project(Max Default Port Test) : acetest {
 }
 
 project(MEM Stream Test) : acetest {
+  avoids += ace_for_tao
   exename = MEM_Stream_Test
   Source_Files {
     MEM_Stream_Test.cpp
@@ -448,6 +483,7 @@ project(MEM Stream Test) : acetest {
 }
 
 project(Mem Map Test) : acetest {
+  avoids += ace_for_tao
   exename = Mem_Map_Test
   Source_Files {
     Mem_Map_Test.cpp
@@ -455,6 +491,7 @@ project(Mem Map Test) : acetest {
 }
 
 project(MM Shared Memory Test) : acetest {
+  avoids += ace_for_tao
   exename = MM_Shared_Memory_Test
   Source_Files {
     MM_Shared_Memory_Test.cpp
@@ -483,6 +520,7 @@ project(MT SOCK Test) : acetest {
 }
 
 project(Message Block Test) : acetest {
+  avoids += ace_for_tao
   exename = Message_Block_Test
   Source_Files {
     Message_Block_Test.cpp
@@ -490,6 +528,7 @@ project(Message Block Test) : acetest {
 }
 
 project(Message Queue Test) : acetest {
+  avoids += ace_for_tao
   exename = Message_Queue_Test
   Source_Files {
     Message_Queue_Test.cpp
@@ -497,6 +536,7 @@ project(Message Queue Test) : acetest {
 }
 
 project(Message Queue Test Ex) : acetest {
+  avoids += ace_for_tao
   exename = Message_Queue_Test_Ex
   Source_Files {
     Message_Queue_Test_Ex.cpp
@@ -518,6 +558,7 @@ project(Multicast Test) : acetest {
 }
 
 project(Multihomed INET Addr Test) : acetest {
+  avoids += ace_for_tao
   exename = Multihomed_INET_Addr_Test
   Source_Files {
     Multihomed_INET_Addr_Test.cpp
@@ -539,6 +580,7 @@ project(New Fail Test) : acetest {
 }
 
 project(Notify Performance Test) : acetest {
+  avoids += ace_for_tao
   exename = Notify_Performance_Test
   Source_Files {
     Notify_Performance_Test.cpp
@@ -574,6 +616,7 @@ project(OS Test) : acetest {
 }
 
 project(Proactor Scatter Gather Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Scatter_Gather_Test
   Source_Files {
     Proactor_Scatter_Gather_Test.cpp
@@ -581,6 +624,7 @@ project(Proactor Scatter Gather Test) : acetest {
 }
 
 project(Proactor Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Test
   Source_Files {
     Proactor_Test.cpp
@@ -588,6 +632,7 @@ project(Proactor Test) : acetest {
 }
 
 project(Proactor Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Timer_Test
   Source_Files {
     Proactor_Timer_Test.cpp
@@ -602,6 +647,7 @@ project(Process Manual Event Test) : acetest {
 }
 
 project(Process Mutex Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Mutex_Test
   Source_Files {
     Process_Mutex_Test.cpp
@@ -609,6 +655,7 @@ project(Process Mutex Test) : acetest {
 }
 
 project(Process Semaphore Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Semaphore_Test
   Source_Files {
     Process_Semaphore_Test.cpp
@@ -616,6 +663,7 @@ project(Process Semaphore Test) : acetest {
 }
 
 project(Process Strategy Test) : acetest {
+  avoids += ace_for_tao    // Requires ace/File_Lock
   exename = Process_Strategy_Test
   Source_Files {
     Process_Strategy_Test.cpp
@@ -644,6 +692,7 @@ project(Priority Task Test) : acetest {
 }
 
 project(Priority Reactor Test) : acetest {
+  avoids += ace_for_tao
   exename = Priority_Reactor_Test
   Source_Files {
     Priority_Reactor_Test.cpp
@@ -651,6 +700,7 @@ project(Priority Reactor Test) : acetest {
 }
 
 project(Process Manager Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Manager_Test
   Source_Files {
     Process_Manager_Test.cpp
@@ -686,6 +736,7 @@ project(Reactor Exceptions Test) : acetest {
 }
 
 project(Reactor Notify Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Notify_Test
   Source_Files {
     Reactor_Notify_Test.cpp
@@ -707,6 +758,7 @@ project(Reactor Dispatch Order Test) : acetest {
 }
 
 project(Reactor Performance Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Performance_Test
   Source_Files {
     Reactor_Performance_Test.cpp
@@ -714,6 +766,7 @@ project(Reactor Performance Test) : acetest {
 }
 
 project(Reactor Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Timer_Test
   Source_Files {
     Reactor_Timer_Test.cpp
@@ -749,6 +802,7 @@ project(Recursive Mutex Test) : acetest {
 }
 
 project(Refcounted Auto Ptr Test) : acetest {
+  avoids += ace_for_tao
   exename = Refcounted_Auto_Ptr_Test
   Source_Files {
     Refcounted_Auto_Ptr_Test.cpp
@@ -763,6 +817,7 @@ project(Reverse Lock Test) : acetest {
 }
 
 project(Semaphore Test) : acetest {
+  avoids += ace_for_tao
   exename = Semaphore_Test
   Source_Files {
     Semaphore_Test.cpp
@@ -819,6 +874,7 @@ project(SOCK Send Recv Test) : acetest {
 }
 
 project(SPIPE Test) : acetest {
+  avoids += ace_for_tao
   exename = SPIPE_Test
   Source_Files {
     SPIPE_Test.cpp
@@ -833,6 +889,7 @@ project(SString Test) : acetest {
 }
 
 project(SV Shared Memory Test) : acetest {
+  avoids += ace_for_tao
   exename = SV_Shared_Memory_Test
   Source_Files {
     SV_Shared_Memory_Test.cpp
@@ -840,6 +897,7 @@ project(SV Shared Memory Test) : acetest {
 }
 
 project(Svc Handler Test) : acetest {
+  avoids += ace_for_tao
   exename = Svc_Handler_Test
   Source_Files {
     Svc_Handler_Test.cpp
@@ -903,6 +961,7 @@ project(Time Value Test) : acetest {
 }
 
 project(Timer Queue Test) : acetest {
+  avoids += ace_for_tao
   exename = Timer_Queue_Test
   Source_Files {
     Timer_Queue_Test.cpp
@@ -917,6 +976,7 @@ project(Token Strategy Test) : acetest {
 }
 
 project(TP Reactor Test) : acetest {
+  avoids += ace_for_tao
   exename = TP_Reactor_Test
   Source_Files {
     TP_Reactor_Test.cpp
@@ -945,6 +1005,7 @@ project(Vector Test) : acetest {
 }
 
 project(UPIPE SAP Test) : acetest {
+  avoids += ace_for_tao
   exename = UPIPE_SAP_Test
   Source_Files {
     UPIPE_SAP_Test.cpp
@@ -952,6 +1013,7 @@ project(UPIPE SAP Test) : acetest {
 }
 
 project(Upgradable RW Test) : acetest {
+  avoids += ace_for_tao
   exename = Upgradable_RW_Test
   Source_Files {
     Upgradable_RW_Test.cpp
@@ -959,6 +1021,7 @@ project(Upgradable RW Test) : acetest {
 }
 
 project(Naming Test) : acetest {
+  avoids   += ace_for_tao
   exename   = Naming_Test
   requires += ace_other
 
@@ -1017,6 +1080,7 @@ project(TkReactor Test) : acetest,ace_tkreactor {
 }
 
 project(Codecs Test) : acetest {
+  avoids   += ace_for_tao
   exename   = Codecs_Test
   requires += ace_codecs
 
@@ -1035,6 +1099,7 @@ project(Tokens Test) : acetest {
 }
 
 project(CDR Array Test) : acetest {
+  avoids += ace_for_tao
   exename = CDR_Array_Test
   Source_Files {
     CDR_Array_Test.cpp
@@ -1058,6 +1123,7 @@ project(Framework Component Test) : acetest {
 }
 
 project(FIFO Test) : acetest {
+  avoids += ace_for_tao
   exename = FIFO_Test
   Source_Files {
     FIFO_Test.cpp
@@ -1139,6 +1205,7 @@ project(Reactor Registration Test) : acetest {
 }
 
 project(UUIDTest) : acetest {
+  avoids   += ace_for_tao
   exename   = UUIDTest
   requires += ace_uuid
   Source_Files {
@@ -1175,13 +1242,15 @@ project(Multicast Test IPV6) : acetest {
 }
 
 project(Multihomed INET Addr Test IPV6) : acetest {
-  exename =   Multihomed_INET_Addr_Test_IPV6
+  avoids += ace_for_tao
+  exename = Multihomed_INET_Addr_Test_IPV6
   Source_Files {
   Multihomed_INET_Addr_Test_IPV6.cpp
   }
 }
 
 project(Proactor Test IPV6) : acetest {
+  avoids += ace_for_tao
   exename =  Proactor_Test_IPV6
   Source_Files {
    Proactor_Test_IPV6.cpp
@@ -1203,6 +1272,7 @@ project(SOCK Test IPv6) : acetest {
 }
 
 project(SOCK_Dgram_Bcast_Test) : acetest {
+  avoids += ace_for_tao
   exename = SOCK_Dgram_Bcast_Test
   Source_Files {
   	SOCK_Dgram_Bcast_Test.cpp
@@ -1210,6 +1280,7 @@ project(SOCK_Dgram_Bcast_Test) : acetest {
 }
 
 project(SOCK_SEQPACK_SCTP_Test) : acetest {
+  avoids += ace_for_tao
   exename = SOCK_SEQPACK_SCTP_Test
   Source_Files {
   	SOCK_SEQPACK_SCTP_Test.cpp
@@ -1228,6 +1299,7 @@ project(QtReactor Test) : acetest, ace_qtreactor {
 }
 
 project(Based Pointer Test) : acetest {
+  avoids += ace_for_tao
   after  += Based_Pointer_Test_Lib
   exename = Based_Pointer_Test
   Source_Files {
@@ -1241,3 +1313,13 @@ project(WChar_Conversion) : acetest {
     WChar_Conversion.cpp
   }
 }
+
+project(Library Unload) {
+  exename = UnloadLibACE
+  staticflags += ACE_AS_STATIC_LIBS
+  Source_Files {
+    Unload_libACE.cpp
+  }
+  Resource_Files {
+  }
+}